From 09f8a2d1dc6be07c5c86b2f0789c6c00c805ac31 Mon Sep 17 00:00:00 2001
From: nby <nby.comptes@outlook.com>
Date: Mon, 4 Oct 2021 22:35:13 +0200
Subject: [PATCH 01/25] [BLD]  Add gitignore

---
 .gitignore                                    |   7 +
 .../OpenDis.Demo/obj/x86/Debug/App.g.i.cs     |  68 -----
 ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6446 -> 0 bytes
 .../obj/x86/Debug/MainWindow.g.i.cs           | 234 ------------------
 ...gnTimeResolveAssemblyReferencesInput.cache | Bin 5767 -> 0 bytes
 5 files changed, 7 insertions(+), 302 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 CsharpDis6/OpenDis.Demo/obj/x86/Debug/App.g.i.cs
 delete mode 100644 CsharpDis6/OpenDis.Demo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
 delete mode 100644 CsharpDis6/OpenDis.Demo/obj/x86/Debug/MainWindow.g.i.cs
 delete mode 100644 CsharpDis6/OpenDis/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aab5d79
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+obj/
+bin/
+x86/
+v16/
+Release/
+*.cache
+*.i.cs
diff --git a/CsharpDis6/OpenDis.Demo/obj/x86/Debug/App.g.i.cs b/CsharpDis6/OpenDis.Demo/obj/x86/Debug/App.g.i.cs
deleted file mode 100644
index fe82268..0000000
--- a/CsharpDis6/OpenDis.Demo/obj/x86/Debug/App.g.i.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma checksum "..\..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AD751E87B884BF2956E97D7D533B3ABE"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace OpenDis.Demo {
-    
-    
-    /// <summary>
-    /// App
-    /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    public partial class App : System.Windows.Application {
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public void InitializeComponent() {
-            
-            #line 4 "..\..\..\App.xaml"
-            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
-            
-            #line default
-            #line hidden
-        }
-        
-        /// <summary>
-        /// Application Entry Point.
-        /// </summary>
-        [System.STAThreadAttribute()]
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public static void Main() {
-            OpenDis.Demo.App app = new OpenDis.Demo.App();
-            app.InitializeComponent();
-            app.Run();
-        }
-    }
-}
-
diff --git a/CsharpDis6/OpenDis.Demo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CsharpDis6/OpenDis.Demo/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 42afc614c41a20ac96471fe17ed962d879a7bf44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6446
zcmeHL+fo}x5S2iz5!i`E9Be~uuM_72Q8p-mxm0*C5;#<Bhmus_Dwe{d-IkcJnw4i}
z0Y$}AJ|tg|$|ok>D`^E7a2_NT4-7>!%%v}9d#1Z57LUbZ|6-%R)NT(TabI&s`pPeB
zYm2LZc?BJ~+_$oRwd#wF+*;b)0;#w!Rx&eI_>(rXfu{orD*^&7nU^*<gObOcU!h*~
z4?wJxW@gLt<%M!4<Ic~pSvEu>7cY^t8gS1gc^g85^lRIa)oLKEJd+!u7HBn&n;$aI
z^N+xNp%he0UVZIYgCMQc9bBFDMVVLDxd-D86E1g|hW1JtRg>kw^VTJ+!jUfz+EYbV
z!nu2A=GJ}BMSCC9V3ElR=xAFZC@IiykcoQ6E5etMgEB)XHiXisUq`zp<LRpxHQ6<n
z-scyyc=W;e>0PFWb}D^N%^a8DXkT(rcWbU@vH(mv`<qPftI?YD%LoV=F(#qHm6r9+
zd=l-@K!{D?zSFj!Vmf|q>a{QU0m!Ep59he5d8|$X&u?t`)ns$yrt}?9%9k%tS+3Cp
z^sv?zaPxuCyb7%?=Q%Y&QO1BVXc)2B0Md9oPQOV18Y<M4hAO%kej`Vd(^xM-faH$#
z3K4jh+1a^b33~Mw^8(mpT)z7$T3XPOi%Qz8D#w=|FLlnz-2Xl%3kz)CnSY*Hnw^80
z#iiZ!ReD@gReOQMZg*k5=Ir9}8yD?`7e%M37tF7@Pj&eKQKpa_L^6_0P<Mz3-n6mg
zEhIENO#dW_j36;aiDW$vLL0ZSzuL&RqRnyvbB!Y=!H)6)+j_HBjKXaC5HHYlJ4UzS
z@!Ii;aR>Qqzg)J9P_5a&)j(iu**lzTcdZ;$ecLbnZXYi`w{uVmDo7Ou;UY$kJSg8g
zjIx3}ltF^Ph+{d-*@xsOr0}Omrp_wUPJTkAFh)`ITxl707neVw<z}S3IcGK}&DL5Y
zg^Loj+Ze;%AnIm(hMf@_vSw#yGfT;P_<xGfC76xRkt8hF^9)LS5*8doia-xFypNrq
zKZXH{#so@Z0$>+FYYbD$!ptS?7!Q!cVRqTZMHNhl%rHMPzeByI><AUJ1wXOqe5T0C
zvmeYRQ-~j7V>iw3?6R_jeI{$6K@U;3=)LTANDgIApv<|;5wlBNoN}0!TZKC(`-9Y`
z1ck?hQDTzCq%xHK1<G#p9;wr^qpuq(@CX%n-+Kk3ysKsRV-)*myl--IOf!oJo|8^V
z5d!d}uK<LK(3v+;tk*aDN#fJK8v2%1y%66oQEaVmhQ4h{{R*W9eU<u(i}#_y&-#P&
zHW#jcq*j><Z;}Ls>YMzs7b)OPe%Y<McbAeMV-KtTsv6o;{0|u3J8Zr>;mkjYC`x=-
zz~5Bo^xk&qLqae7{+gFQJG;Zf$*<9&+AT$e3cWxY-yq3%|MpK&5flpe7CVV`d^(I%
zJrq_+XEdP#iCQWwlCWb;A$icqUifNxVoc-gSmPHiG(F#~OME27Gjd{lkK+@K;>B-t
z^%EnF^W7-9en38V8hLg^RRX=?ofsAlO<$f*H>)s8s+$#9iprJ{n;)^mx)1)j!Xrh+
c6t!C+@Fbbq;NLfw$j2V-Z!VGOA$E84KZK-lRsaA1

diff --git a/CsharpDis6/OpenDis.Demo/obj/x86/Debug/MainWindow.g.i.cs b/CsharpDis6/OpenDis.Demo/obj/x86/Debug/MainWindow.g.i.cs
deleted file mode 100644
index e51d433..0000000
--- a/CsharpDis6/OpenDis.Demo/obj/x86/Debug/MainWindow.g.i.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "82DFBDDFBC29EF428350DE84095F598B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using OpenDis.Demo;
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace OpenDis.Demo {
-    
-    
-    /// <summary>
-    /// MainWindow
-    /// </summary>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 4 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal OpenDis.Demo.MainWindow mainWindow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 54 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Primitives.ToggleButton toggleEntityTree;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 55 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Primitives.ToggleButton toggleEntityGrid;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 58 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Primitives.ToggleButton toggleCet2006;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 59 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Primitives.ToggleButton toggleCet2010;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 62 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TreeView treeViewEntityTypes;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 63 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid dataGridEntityTypes;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 114 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Primitives.ToggleButton toggleAggregate2006;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 115 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Primitives.ToggleButton toggleAggregate2010;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TreeView treeViewAggregateTypes;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 126 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TreeView treeViewEnumerations;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/OpenDis.Demo;component/mainwindow.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\MainWindow.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.mainWindow = ((OpenDis.Demo.MainWindow)(target));
-            return;
-            case 2:
-            this.toggleEntityTree = ((System.Windows.Controls.Primitives.ToggleButton)(target));
-            
-            #line 54 "..\..\..\MainWindow.xaml"
-            this.toggleEntityTree.Click += new System.Windows.RoutedEventHandler(this.toggleEntityTree_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.toggleEntityGrid = ((System.Windows.Controls.Primitives.ToggleButton)(target));
-            
-            #line 55 "..\..\..\MainWindow.xaml"
-            this.toggleEntityGrid.Click += new System.Windows.RoutedEventHandler(this.toggleEntityGrid_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this.toggleCet2006 = ((System.Windows.Controls.Primitives.ToggleButton)(target));
-            
-            #line 58 "..\..\..\MainWindow.xaml"
-            this.toggleCet2006.Click += new System.Windows.RoutedEventHandler(this.toggleCet2006_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            this.toggleCet2010 = ((System.Windows.Controls.Primitives.ToggleButton)(target));
-            
-            #line 59 "..\..\..\MainWindow.xaml"
-            this.toggleCet2010.Click += new System.Windows.RoutedEventHandler(this.toggleCet2010_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this.treeViewEntityTypes = ((System.Windows.Controls.TreeView)(target));
-            return;
-            case 7:
-            this.dataGridEntityTypes = ((System.Windows.Controls.DataGrid)(target));
-            return;
-            case 8:
-            this.toggleAggregate2006 = ((System.Windows.Controls.Primitives.ToggleButton)(target));
-            
-            #line 114 "..\..\..\MainWindow.xaml"
-            this.toggleAggregate2006.Click += new System.Windows.RoutedEventHandler(this.toggleAggregate2006_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 9:
-            this.toggleAggregate2010 = ((System.Windows.Controls.Primitives.ToggleButton)(target));
-            
-            #line 115 "..\..\..\MainWindow.xaml"
-            this.toggleAggregate2010.Click += new System.Windows.RoutedEventHandler(this.toggleAggregate2010_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 10:
-            this.treeViewAggregateTypes = ((System.Windows.Controls.TreeView)(target));
-            return;
-            case 11:
-            this.treeViewEnumerations = ((System.Windows.Controls.TreeView)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/CsharpDis6/OpenDis/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CsharpDis6/OpenDis/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 52acc8e54227e017495f90a2110f553059d01b66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5767
zcmeHLZBH9V5VpZwFoYJ<lqArkmo#caYMt!xj>HFI;{-KHk!{gRoJH1mW3%O6+}%B}
zi})@51yz4yJ9D;=mk_6wIEfEl%j5OT&d%)I+|IL`NG1}Af3VRnwYwuo?04J}zVsW)
z*yA!_PDKSa_l<(@y1utl+|KHIASCy_&3w)XKUuvHI4TgZ=|P|bbF%twP<OcX6LhNn
z5qO*R++t(7vD(Pz?d2R>WMgD<?Gu(>1>CX8-j1h0_^n?AYqdZaWhQpKR-oi8DnDe7
z<DY=NB_+6Zr?cHw;E`8y3P%@wufdxo?!c_YJe%80L4PE1<$NP>oRVNJocQ9XFRHRS
z%I;l~m3+s>^*$zMm5C;(NUajoC8+l}iG0SJo-d#X4ThoE@uWik&b{kS{9^E+?sVOu
z_xbfxJo<=#QA>Alol;$Kv&aQl$`>5ubjwyuRDcQVaF?k=IoT3^0|P>fm=VzAQi;yF
zJdNv6KoOfmy^CwVFzM_S(L3McM<AYD&n|M=a#)89URCVn)qGcRSNIl4>5DCNmMdHW
zW>`-J>~i2K?m|!H>P+3BNNq$L)wD!n1Zgsvq%YDx$0{AEz{M29XJjc#8sjy1Ah>0`
z#Rz=J@9z&7f?2)CoB(zi7av|mLn}&fubI_dY5Bt8_4D^+=|8_FtE+6;T3*SoFD^lD
zZM~Kq<i{;_HI6vcZZ@p9e7a<En4)oHQS>&&G5IaesT+QQ2q~mTkxZmh)Ey&&J8dF;
z2MMvq=}(%-1QKl$NkY4e<ke}pS7$aVh%!!?05d`YrtyBe8Wq^=F>amNes%6u;_ddC
zHih$)UvHRIa9ifjE%30a92_t8yQW|N&1|o&m_?`uO{5YlZxzc$8KmzVM^K;)4G`dA
znK3M89YXpGa`H<gbC><-BOdZcn@0IG$@R!leM!q8Hx<ffus4d<wXd)<K`di2x0qi~
z-^2eI3K~UE`x;5gupLJuJd-k@4H=3hMM}GmWOcv-x4pmx!NS^Q7C^ns<yK4!l+l*9
z_TYaj=W~(r!_O#}+6BL*_hPPZdCciZE{%|_&7tzs0d5~b$B^EUHjm>D3L7TY_$God
zJ;Y@Ca}3&o89fxe_uvt?Tu6{8=9g2&q&S=X+8c)T8#Gdn!AJxR1cY`Tp&b>Uog!1r
zAW{K!j&eiGkK<ioXqgi9TeMS)Z-rz+M-wbQ6TiAn7_ld4rV+21x7_=kY^7*V92W98
zYVEL)-_!x4M&(F5z~hxG#||X_1I7=IyT^N!{GE#Sx{psv!($L#Y<%*>7DwLSa*VlO
z8y`<U#f0j&3?V|g>e0SKQoi|pH$!MMH1G^NsS@7NBnfziaP*QVghZ)jLNtmU?Rz8-
zP7Bvw51na0pmgT+4fhn?lavJBM&Ubhraedg+-ddt%aG2Qwt(`RK)5e(o~hF^J0WO9
zmnCP~kH}gW0IurXy8wDKgk{6fWU&)R><P|NyAuYQOi>&CYq)8A?lyF|X+$?%waI@0
D)9-ZT


From a07d08cdf29ec33136594276159ee4c87ff28a1d Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sat, 9 Oct 2021 10:02:17 +0200
Subject: [PATCH 02/25] [BLD] Add an empty solution

---
 OpenDis.sln | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 OpenDis.sln

diff --git a/OpenDis.sln b/OpenDis.sln
new file mode 100644
index 0000000..22c11f0
--- /dev/null
+++ b/OpenDis.sln
@@ -0,0 +1,13 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31727.386
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4E0885B8-C82C-47CC-B3D4-9E09D28C4C26}
+	EndGlobalSection
+EndGlobal

From 54045d339d156b382e88906b7e67b0814fdbf790 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sat, 9 Oct 2021 10:07:36 +0200
Subject: [PATCH 03/25] [BLD] Move to a sub-folder CSharpDis6

---
 .../CsharpDis6}/EspduReceiver/EspduReceiver.cs      |   0
 .../EspduReceiver/OpenDis.EspduReceiver.csproj      |   0
 .../EspduReceiver/Properties/AssemblyInfo.cs        |   0
 .../CsharpDis6}/EspduSender/EspduSender.cs          |   0
 .../EspduSender/OpenDis.EspduSender.csproj          |   0
 .../EspduSender/Properties/AssemblyInfo.cs          |   0
 .../CsharpDis6}/OpenDis.Demo/App.xaml               |   0
 .../CsharpDis6}/OpenDis.Demo/App.xaml.cs            |   0
 .../CsharpDis6}/OpenDis.Demo/MainWindow.xaml        |   0
 .../CsharpDis6}/OpenDis.Demo/MainWindow.xaml.cs     |   0
 .../CsharpDis6}/OpenDis.Demo/OpenDis.Demo.csproj    |   0
 .../OpenDis.Demo/Properties/AssemblyInfo.cs         |   0
 .../OpenDis.Demo/Properties/Resources.Designer.cs   |   0
 .../OpenDis.Demo/Properties/Resources.resx          |   0
 .../OpenDis.Demo/Properties/Settings.Designer.cs    |   0
 .../OpenDis.Demo/Properties/Settings.settings       |   0
 .../OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe  | Bin
 .../bin/Debug/OpenDis.Demo.vshost.exe.manifest      |   0
 .../x86/Debug/OpenDis.Demo_MarkupCompile.i.cache    |   0
 .../obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref |   0
 {CsharpDis6 => Libs/CsharpDis6}/OpenDis.sln         |   0
 {CsharpDis6 => Libs/CsharpDis6}/OpenDis.suo         | Bin
 .../CsharpDis6}/OpenDis/Core/CetBase.cs             |   0
 .../CsharpDis6}/OpenDis/Core/DisTime.cs             |   0
 .../CsharpDis6}/OpenDis/Core/EndianTypes.cs         |   0
 .../CsharpDis6}/OpenDis/Core/EnumHelper.cs          |   0
 .../OpenDis/Core/EnumNotFoundException.cs           |   0
 .../CsharpDis6}/OpenDis/Core/ICetItem.cs            |   0
 .../CsharpDis6}/OpenDis/Core/IPdu.cs                |   0
 .../OpenDis/Core/InternetDomainCodeAttribute.cs     |   0
 .../CsharpDis6}/OpenDis/Core/PduBase.cs             |   0
 .../OpenDis/Core/PduExceptionEventArgs.cs           |   0
 .../CsharpDis6}/OpenDis/Core/PduFactory.cs          |   0
 .../CsharpDis6}/OpenDis/Dis1995/EntityID.cs         |   0
 .../OpenDis/Dis1995/Generated/AcknowledgePdu.cs     |   0
 .../OpenDis/Dis1995/Generated/ActionRequestPdu.cs   |   0
 .../OpenDis/Dis1995/Generated/ActionResponsePdu.cs  |   0
 .../Dis1995/Generated/AngularVelocityVector.cs      |   0
 .../OpenDis/Dis1995/Generated/AntennaLocation.cs    |   0
 .../Dis1995/Generated/ArticulationParameter.cs      |   0
 .../OpenDis/Dis1995/Generated/BeamAntennaPattern.cs |   0
 .../OpenDis/Dis1995/Generated/BurstDescriptor.cs    |   0
 .../OpenDis/Dis1995/Generated/ClockTime.cs          |   0
 .../OpenDis/Dis1995/Generated/CollisionPdu.cs       |   0
 .../OpenDis/Dis1995/Generated/CommentPdu.cs         |   0
 .../OpenDis/Dis1995/Generated/CreateEntityPdu.cs    |   0
 .../OpenDis/Dis1995/Generated/DataPdu.cs            |   0
 .../OpenDis/Dis1995/Generated/DataQueryPdu.cs       |   0
 .../Dis1995/Generated/DeadReckoningParameter.cs     |   0
 .../OpenDis/Dis1995/Generated/DesignatorPdu.cs      |   0
 .../OpenDis/Dis1995/Generated/DetonationPdu.cs      |   0
 .../Dis1995/Generated/DistributedEmissionsPdu.cs    |   0
 .../OpenDis/Dis1995/Generated/EightByteChunk.cs     |   0
 .../Dis1995/Generated/ElectronicEmmisionsPdu.cs     |   0
 .../OpenDis/Dis1995/Generated/EmitterSystem.cs      |   0
 .../OpenDis/Dis1995/Generated/EntityID.cs           |   0
 .../Dis1995/Generated/EntityInformationPdu.cs       |   0
 .../OpenDis/Dis1995/Generated/EntityStatePdu.cs     |   0
 .../OpenDis/Dis1995/Generated/EntityType.cs         |   0
 .../OpenDis/Dis1995/Generated/EventID.cs            |   0
 .../OpenDis/Dis1995/Generated/EventReportPdu.cs     |   0
 .../OpenDis/Dis1995/Generated/FirePdu.cs            |   0
 .../OpenDis/Dis1995/Generated/FixedDatum.cs         |   0
 .../Dis1995/Generated/FundamentalParameterData.cs   |   0
 .../OpenDis/Dis1995/Generated/LogisticsPdu.cs       |   0
 .../OpenDis/Dis1995/Generated/ModulationType.cs     |   0
 .../OpenDis/Dis1995/Generated/Orientation.cs        |   0
 .../CsharpDis6}/OpenDis/Dis1995/Generated/Pdu.cs    |   0
 .../Dis1995/Generated/RadioCommunicationsPdu.cs     |   0
 .../OpenDis/Dis1995/Generated/RadioEntityType.cs    |   0
 .../OpenDis/Dis1995/Generated/ReceiverPdu.cs        |   0
 .../OpenDis/Dis1995/Generated/RemoveEntityPdu.cs    |   0
 .../OpenDis/Dis1995/Generated/RepairCompletePdu.cs  |   0
 .../OpenDis/Dis1995/Generated/RepairResponsePdu.cs  |   0
 .../OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs  |   0
 .../OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs   |   0
 .../Dis1995/Generated/ResupplyReceivedPdu.cs        |   0
 .../OpenDis/Dis1995/Generated/ServiceRequestPdu.cs  |   0
 .../OpenDis/Dis1995/Generated/SetDataPdu.cs         |   0
 .../OpenDis/Dis1995/Generated/SignalPdu.cs          |   0
 .../OpenDis/Dis1995/Generated/SimulationAddress.cs  |   0
 .../Dis1995/Generated/SimulationManagementPdu.cs    |   0
 .../Generated/SphericalHarmonicAntennaPattern.cs    |   0
 .../OpenDis/Dis1995/Generated/StartResumePdu.cs     |   0
 .../OpenDis/Dis1995/Generated/StopFreezePdu.cs      |   0
 .../OpenDis/Dis1995/Generated/SupplyQuantity.cs     |   0
 .../OpenDis/Dis1995/Generated/TransmitterPdu.cs     |   0
 .../OpenDis/Dis1995/Generated/VariableDatum.cs      |   0
 .../OpenDis/Dis1995/Generated/Vector3Double.cs      |   0
 .../OpenDis/Dis1995/Generated/Vector3Float.cs       |   0
 .../OpenDis/Dis1995/Generated/Warfare.cs            |   0
 .../CsharpDis6}/OpenDis/Dis1995/PduFactory.cs       |   0
 .../CsharpDis6}/OpenDis/Dis1995/Vector3Double.cs    |   0
 .../CsharpDis6}/OpenDis/Dis1995/Vector3Float.cs     |   0
 .../CsharpDis6}/OpenDis/Dis1998/EntityID.cs         |   0
 .../OpenDis/Dis1998/Generated/AcknowledgePdu.cs     |   0
 .../Dis1998/Generated/AcknowledgeReliablePdu.cs     |   0
 .../OpenDis/Dis1998/Generated/AcousticBeamData.cs   |   0
 .../Generated/AcousticBeamFundamentalParameter.cs   |   0
 .../OpenDis/Dis1998/Generated/AcousticEmitter.cs    |   0
 .../Dis1998/Generated/AcousticEmitterSystem.cs      |   0
 .../Dis1998/Generated/AcousticEmitterSystemData.cs  |   0
 .../OpenDis/Dis1998/Generated/ActionRequestPdu.cs   |   0
 .../Dis1998/Generated/ActionRequestReliablePdu.cs   |   0
 .../OpenDis/Dis1998/Generated/ActionResponsePdu.cs  |   0
 .../Dis1998/Generated/ActionResponseReliablePdu.cs  |   0
 .../OpenDis/Dis1998/Generated/AggregateID.cs        |   0
 .../OpenDis/Dis1998/Generated/AggregateMarking.cs   |   0
 .../OpenDis/Dis1998/Generated/AggregateStatePdu.cs  |   0
 .../OpenDis/Dis1998/Generated/AggregateType.cs      |   0
 .../Dis1998/Generated/AngularVelocityVector.cs      |   0
 .../OpenDis/Dis1998/Generated/AntennaLocation.cs    |   0
 .../OpenDis/Dis1998/Generated/ApaData.cs            |   0
 .../Dis1998/Generated/ArealObjectStatePdu.cs        |   0
 .../Dis1998/Generated/ArticulationParameter.cs      |   0
 .../OpenDis/Dis1998/Generated/BeamAntennaPattern.cs |   0
 .../OpenDis/Dis1998/Generated/BeamData.cs           |   0
 .../OpenDis/Dis1998/Generated/BurstDescriptor.cs    |   0
 .../OpenDis/Dis1998/Generated/ClockTime.cs          |   0
 .../Dis1998/Generated/CollisionElasticPdu.cs        |   0
 .../OpenDis/Dis1998/Generated/CollisionPdu.cs       |   0
 .../OpenDis/Dis1998/Generated/CommentPdu.cs         |   0
 .../OpenDis/Dis1998/Generated/CommentReliablePdu.cs |   0
 .../OpenDis/Dis1998/Generated/CreateEntityPdu.cs    |   0
 .../Dis1998/Generated/CreateEntityReliablePdu.cs    |   0
 .../OpenDis/Dis1998/Generated/DataPdu.cs            |   0
 .../OpenDis/Dis1998/Generated/DataQueryPdu.cs       |   0
 .../Dis1998/Generated/DataQueryReliablePdu.cs       |   0
 .../OpenDis/Dis1998/Generated/DataReliablePdu.cs    |   0
 .../Dis1998/Generated/DeadReckoningParameter.cs     |   0
 .../OpenDis/Dis1998/Generated/DesignatorPdu.cs      |   0
 .../OpenDis/Dis1998/Generated/DetonationPdu.cs      |   0
 .../Generated/DistributedEmissionsFamilyPdu.cs      |   0
 .../OpenDis/Dis1998/Generated/EightByteChunk.cs     |   0
 .../Dis1998/Generated/ElectronicEmissionBeamData.cs |   0
 .../Generated/ElectronicEmissionSystemData.cs       |   0
 .../Dis1998/Generated/ElectronicEmissionsPdu.cs     |   0
 .../OpenDis/Dis1998/Generated/EmitterSystem.cs      |   0
 .../OpenDis/Dis1998/Generated/EntityID.cs           |   0
 .../Dis1998/Generated/EntityInformationFamilyPdu.cs |   0
 .../Dis1998/Generated/EntityManagementFamilyPdu.cs  |   0
 .../OpenDis/Dis1998/Generated/EntityStatePdu.cs     |   0
 .../Dis1998/Generated/EntityStateUpdatePdu.cs       |   0
 .../OpenDis/Dis1998/Generated/EntityType.cs         |   0
 .../OpenDis/Dis1998/Generated/Environment.cs        |   0
 .../Dis1998/Generated/EnvironmentalProcessPdu.cs    |   0
 .../OpenDis/Dis1998/Generated/EventID.cs            |   0
 .../OpenDis/Dis1998/Generated/EventReportPdu.cs     |   0
 .../Dis1998/Generated/EventReportReliablePdu.cs     |   0
 .../OpenDis/Dis1998/Generated/FastEntityStatePdu.cs |   0
 .../OpenDis/Dis1998/Generated/FirePdu.cs            |   0
 .../OpenDis/Dis1998/Generated/FixedDatum.cs         |   0
 .../OpenDis/Dis1998/Generated/FourByteChunk.cs      |   0
 .../Dis1998/Generated/FundamentalParameterData.cs   |   0
 .../Generated/FundamentalParameterDataIff.cs        |   0
 .../OpenDis/Dis1998/Generated/GridAxisRecord.cs     |   0
 .../Generated/GridAxisRecordRepresentation0.cs      |   0
 .../Generated/GridAxisRecordRepresentation1.cs      |   0
 .../Generated/GridAxisRecordRepresentation2.cs      |   0
 .../OpenDis/Dis1998/Generated/GriddedDataPdu.cs     |   0
 .../Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs     |   0
 .../Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs     |   0
 .../OpenDis/Dis1998/Generated/IffFundamentalData.cs |   0
 .../Generated/IntercomCommunicationsParameters.cs   |   0
 .../OpenDis/Dis1998/Generated/IntercomControlPdu.cs |   0
 .../OpenDis/Dis1998/Generated/IntercomSignalPdu.cs  |   0
 .../OpenDis/Dis1998/Generated/IsGroupOfPdu.cs       |   0
 .../OpenDis/Dis1998/Generated/IsPartOfPdu.cs        |   0
 .../OpenDis/Dis1998/Generated/LayerHeader.cs        |   0
 .../Dis1998/Generated/LinearObjectStatePdu.cs       |   0
 .../Dis1998/Generated/LinearSegmentParameter.cs     |   0
 .../OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs |   0
 .../OpenDis/Dis1998/Generated/Marking.cs            |   0
 .../OpenDis/Dis1998/Generated/MinefieldDataPdu.cs   |   0
 .../OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs |   0
 .../OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs  |   0
 .../Dis1998/Generated/MinefieldResponseNackPdu.cs   |   0
 .../OpenDis/Dis1998/Generated/MinefieldStatePdu.cs  |   0
 .../OpenDis/Dis1998/Generated/ModulationType.cs     |   0
 .../OpenDis/Dis1998/Generated/NamedLocation.cs      |   0
 .../OpenDis/Dis1998/Generated/ObjectType.cs         |   0
 .../OpenDis/Dis1998/Generated/OneByteChunk.cs       |   0
 .../OpenDis/Dis1998/Generated/Orientation.cs        |   0
 .../CsharpDis6}/OpenDis/Dis1998/Generated/Pdu.cs    |   0
 .../OpenDis/Dis1998/Generated/PduContainer.cs       |   0
 .../CsharpDis6}/OpenDis/Dis1998/Generated/Point.cs  |   0
 .../Dis1998/Generated/PointObjectStatePdu.cs        |   0
 .../Dis1998/Generated/PropulsionSystemData.cs       |   0
 .../Generated/RadioCommunicationsFamilyPdu.cs       |   0
 .../OpenDis/Dis1998/Generated/RadioEntityType.cs    |   0
 .../OpenDis/Dis1998/Generated/ReceiverPdu.cs        |   0
 .../Dis1998/Generated/RecordQueryReliablePdu.cs     |   0
 .../OpenDis/Dis1998/Generated/RecordSet.cs          |   0
 .../OpenDis/Dis1998/Generated/Relationship.cs       |   0
 .../OpenDis/Dis1998/Generated/RemoveEntityPdu.cs    |   0
 .../Dis1998/Generated/RemoveEntityReliablePdu.cs    |   0
 .../OpenDis/Dis1998/Generated/RepairCompletePdu.cs  |   0
 .../OpenDis/Dis1998/Generated/RepairResponsePdu.cs  |   0
 .../OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs  |   0
 .../OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs   |   0
 .../Dis1998/Generated/ResupplyReceivedPdu.cs        |   0
 .../OpenDis/Dis1998/Generated/SeesPdu.cs            |   0
 .../OpenDis/Dis1998/Generated/ServiceRequestPdu.cs  |   0
 .../OpenDis/Dis1998/Generated/SetDataPdu.cs         |   0
 .../OpenDis/Dis1998/Generated/SetDataReliablePdu.cs |   0
 .../Dis1998/Generated/SetRecordReliablePdu.cs       |   0
 .../OpenDis/Dis1998/Generated/ShaftRPMs.cs          |   0
 .../OpenDis/Dis1998/Generated/SignalPdu.cs          |   0
 .../OpenDis/Dis1998/Generated/SimulationAddress.cs  |   0
 .../Generated/SimulationManagementFamilyPdu.cs      |   0
 .../SimulationManagementWithReliabilityFamilyPdu.cs |   0
 .../OpenDis/Dis1998/Generated/SixByteChunk.cs       |   0
 .../Generated/SphericalHarmonicAntennaPattern.cs    |   0
 .../OpenDis/Dis1998/Generated/StartResumePdu.cs     |   0
 .../Dis1998/Generated/StartResumeReliablePdu.cs     |   0
 .../OpenDis/Dis1998/Generated/StopFreezePdu.cs      |   0
 .../Dis1998/Generated/StopFreezeReliablePdu.cs      |   0
 .../OpenDis/Dis1998/Generated/SupplyQuantity.cs     |   0
 .../Generated/SyntheticEnvironmentFamilyPdu.cs      |   0
 .../OpenDis/Dis1998/Generated/SystemID.cs           |   0
 .../OpenDis/Dis1998/Generated/TrackJamTarget.cs     |   0
 .../Dis1998/Generated/TransferControlRequestPdu.cs  |   0
 .../OpenDis/Dis1998/Generated/TransmitterPdu.cs     |   0
 .../OpenDis/Dis1998/Generated/TwoByteChunk.cs       |   0
 .../CsharpDis6}/OpenDis/Dis1998/Generated/UaPdu.cs  |   0
 .../OpenDis/Dis1998/Generated/VariableDatum.cs      |   0
 .../OpenDis/Dis1998/Generated/Vector3Double.cs      |   0
 .../OpenDis/Dis1998/Generated/Vector3Float.cs       |   0
 .../Dis1998/Generated/VectoringNozzleSystemData.cs  |   0
 .../OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs   |   0
 .../CsharpDis6}/OpenDis/Dis1998/PduFactory.cs       |   0
 .../CsharpDis6}/OpenDis/Dis1998/Vector3Double.cs    |   0
 .../CsharpDis6}/OpenDis/Dis1998/Vector3Float.cs     |   0
 .../OpenDis/Enumerations/Cet2006/AggregateTypes.xml |   0
 .../OpenDis/Enumerations/Cet2006/Category.cs        |   0
 .../CsharpDis6}/OpenDis/Enumerations/Cet2006/Cet.cs |   0
 .../OpenDis/Enumerations/Cet2006/CetFactory.cs      |   0
 .../OpenDis/Enumerations/Cet2006/CetItem.cs         |   0
 .../OpenDis/Enumerations/Cet2006/Entity.cs          |   0
 .../OpenDis/Enumerations/Cet2006/EntityTypes.xml    |   0
 .../OpenDis/Enumerations/Cet2006/Extra.cs           |   0
 .../OpenDis/Enumerations/Cet2006/GenericEntry.cs    |   0
 .../OpenDis/Enumerations/Cet2006/GenericTable.cs    |   0
 .../OpenDis/Enumerations/Cet2006/Specific.cs        |   0
 .../OpenDis/Enumerations/Cet2006/Subcategory.cs     |   0
 .../OpenDis/Enumerations/Cet2006/cet.xsd            |   0
 .../OpenDis/Enumerations/Cet2010/AggregateTypes.xml |   0
 .../OpenDis/Enumerations/Cet2010/Category.cs        |   0
 .../OpenDis/Enumerations/Cet2010/CategoryRange.cs   |   0
 .../CsharpDis6}/OpenDis/Enumerations/Cet2010/Cet.cs |   0
 .../OpenDis/Enumerations/Cet2010/CetFactory.cs      |   0
 .../OpenDis/Enumerations/Cet2010/CetItem.cs         |   0
 .../CsharpDis6}/OpenDis/Enumerations/Cet2010/Cr.cs  |   0
 .../OpenDis/Enumerations/Cet2010/CrRange.cs         |   0
 .../OpenDis/Enumerations/Cet2010/Entity.cs          |   0
 .../OpenDis/Enumerations/Cet2010/EntityTypes.xml    |   0
 .../OpenDis/Enumerations/Cet2010/Extra.cs           |   0
 .../OpenDis/Enumerations/Cet2010/ExtraRange.cs      |   0
 .../OpenDis/Enumerations/Cet2010/GenericEntry.cs    |   0
 .../Enumerations/Cet2010/GenericEntryDescription.cs |   0
 .../Enumerations/Cet2010/GenericEntryRange.cs       |   0
 .../Enumerations/Cet2010/GenericEntrySingle.cs      |   0
 .../Enumerations/Cet2010/GenericEntryStatus.cs      |   0
 .../Enumerations/Cet2010/GenericEntryString.cs      |   0
 .../OpenDis/Enumerations/Cet2010/GenericTable.cs    |   0
 .../Cet2010/ICategoryOrCategoryRange.cs             |   0
 .../Enumerations/Cet2010/IExtraOrExtraRange.cs      |   0
 .../OpenDis/Enumerations/Cet2010/IGenericEntry.cs   |   0
 .../Cet2010/IGenericEntryDescription.cs             |   0
 .../Cet2010/ISpecificOrSpecificRange.cs             |   0
 .../Cet2010/ISubcategoryOrSubcategoryRange.cs       |   0
 .../OpenDis/Enumerations/Cet2010/Specific.cs        |   0
 .../OpenDis/Enumerations/Cet2010/SpecificRange.cs   |   0
 .../OpenDis/Enumerations/Cet2010/Subcategory.cs     |   0
 .../Enumerations/Cet2010/SubcategoryRange.cs        |   0
 .../OpenDis/Enumerations/Cet2010/cet.xsd            |   0
 .../CsharpDis6}/OpenDis/Enumerations/Country.cs     |   0
 .../DistributedEmission.Iff/InformationLayers.cs    |   0
 .../LayerSpecificInformation.cs                     |   0
 .../DistributedEmission.Iff/SystemMode.cs           |   0
 .../DistributedEmission.Iff/SystemName.cs           |   0
 .../DistributedEmission.Iff/SystemStatus.cs         |   0
 .../DistributedEmission.Iff/SystemType.cs           |   0
 .../Type1AlternateParameter4.cs                     |   0
 .../DistributedEmission.Iff/Type1ChangeOptions.cs   |   0
 .../DistributedEmission.Iff/Type1Modifier.cs        |   0
 .../Type1OperationalParameter1.cs                   |   0
 .../Type1OperationalParameter2.cs                   |   0
 .../Type1Parameter1Mode1CodeStatus.cs               |   0
 .../Type1Parameter2Mode2CodeStatus.cs               |   0
 .../Type1Parameter3Mode3CodeStatus.cs               |   0
 .../Type1Parameter4Mode4CodeStatus.cs               |   0
 .../Type1Parameter5ModeCCodeStatus.cs               |   0
 .../Type1Parameter6ModeSCodeStatus.cs               |   0
 .../Type2AlternateParameter4.cs                     |   0
 .../DistributedEmission.Iff/Type2ChangeOptions.cs   |   0
 .../Type2OperationalParameter1.cs                   |   0
 .../Type2OperationalParameter2.cs                   |   0
 .../Type2Parameter1Mode1InterrogatorStatus.cs       |   0
 .../Type2Parameter2Mode2InterrogatorStatus.cs       |   0
 .../Type2Parameter3Mode3InterrogatorStatus.cs       |   0
 .../Type2Parameter4Mode4InterrogatorStatus.cs       |   0
 .../Type2Parameter5ModeCInterrogatorStatus.cs       |   0
 .../Type2Parameter6ModeSCodeStatus.cs               |   0
 .../DistributedEmission.Iff/Type3ChangeOptions.cs   |   0
 .../Type3OperationalParameter1.cs                   |   0
 .../Type3OperationalParameter2.cs                   |   0
 .../Type3Parameter1Mode1CodeStatus.cs               |   0
 .../Type3Parameter2Mode2CodeStatus.cs               |   0
 .../Type3Parameter3Mode3CodeStatus.cs               |   0
 .../Type3Parameter4Mode4CodeStatus.cs               |   0
 .../Type3Parameter5ModeCCodeStatus.cs               |   0
 .../Type3Parameter6Mode1CodeStatus.cs               |   0
 .../DistributedEmission.Iff/Type4ChangeOptions.cs   |   0
 .../Type4OperationalParameter1.cs                   |   0
 .../Type4OperationalParameter2.cs                   |   0
 .../DistributedEmission.Iff/Type4Parameter1.cs      |   0
 .../DistributedEmission.Iff/Type4Parameter2.cs      |   0
 .../DistributedEmission.Iff/Type4Parameter3.cs      |   0
 .../DistributedEmission.Iff/Type4Parameter4.cs      |   0
 .../DistributedEmission.Iff/Type4Parameter5.cs      |   0
 .../DistributedEmission.Iff/Type4Parameter6.cs      |   0
 .../DistributedEmission.Iff/Type5ChangeOptions.cs   |   0
 .../Type5OperationalParameter1.cs                   |   0
 .../Type5OperationalParameter2.cs                   |   0
 .../Type5Parameter1RRBResponse.cs                   |   0
 .../ActiveEmissionParameterIndex.cs                 |   0
 .../AdditionalPassiveActivityParameterIndex.cs      |   0
 .../EmitterFunction.cs                              |   0
 .../PassiveParameterIndex.cs                        |   0
 .../PropulsionPlantConfiguration.cs                 |   0
 .../ScanPattern.cs                                  |   0
 .../StateChangeUpdateIndicator.cs                   |   0
 .../SystemName.cs                                   |   0
 .../DistributedEmission/AircraftEnginePower.cs      |   0
 .../DistributedEmission/DesignatorCode.cs           |   0
 .../DistributedEmission/DesignatorCodeName.cs       |   0
 .../DistributedEmission/ElectromagneticEmitters.cs  |   0
 .../DistributedEmission/EmissionBeamFunction.cs     |   0
 .../DistributedEmission/EmissionFunction.cs         |   0
 .../DistributedEmission/HelicopterEnginePower.cs    |   0
 .../DistributedEmission/HighDensityTrackOrJam.cs    |   0
 .../DistributedEmission/StateUpdateIndicator.cs     |   0
 .../DistributedEmission/TankEnginePower.cs          |   0
 .../Entity.Information.Minefield/Appearance.cs      |   0
 .../Entity.Information.Minefield/DataFilter.cs      |   0
 .../Entity.Information.Minefield/FlirSensor.cs      |   0
 .../Entity.Information.Minefield/Fusing.cs          |   0
 .../Entity.Information.Minefield/LaserSensor.cs     |   0
 .../Entity.Information.Minefield/MagneticSensor.cs  |   0
 .../MultispectralSensor.cs                          |   0
 .../Entity.Information.Minefield/OpticalSensor.cs   |   0
 .../Entity.Information.Minefield/PaintScheme.cs     |   0
 .../Entity.Information.Minefield/PhysicalSensor.cs  |   0
 .../Entity.Information.Minefield/ProtocolMode.cs    |   0
 .../Entity.Information.Minefield/RadarSensor.cs     |   0
 .../Entity.Information.Minefield/SensorTypes.cs     |   0
 .../Entity.Information.Minefield/SonarSensor.cs     |   0
 .../Entity.Information/EntityCollisionType.cs       |   0
 .../Entity.Management/AggregateFormation.cs         |   0
 .../Enumerations/Entity.Management/AggregateKind.cs |   0
 .../Entity.Management/AggregateSpecific.cs          |   0
 .../Entity.Management/AggregateState.cs             |   0
 .../Entity.Management/AggregateSubcategory.cs       |   0
 .../GroupOfGroupedEntityCategory.cs                 |   0
 .../Entity.Management/GroupOfRestStatus.cs          |   0
 .../Enumerations/Entity.Management/PartOfNature.cs  |   0
 .../Entity.Management/PartOfPosition.cs             |   0
 .../Entity.Management/PartOfStationName.cs          |   0
 .../Enumerations/Entity.Management/TransferType.cs  |   0
 .../EntityState.Appearance/AirPlatformAppearance.cs |   0
 .../EntityState.Appearance/CulturalAppearance.cs    |   0
 .../EnvironmentalAppearance.cs                      |   0
 .../LandPlatformAppearance.cs                       |   0
 .../EntityState.Appearance/LifeFormAppearance.cs    |   0
 .../EntityState.Appearance/MunitionAppearance.cs    |   0
 .../SensorEmitterAppearance.cs                      |   0
 .../SpacePlatformAppearance.cs                      |   0
 .../SubsurfacePlatformAppearance.cs                 |   0
 .../SurfacePlatformAppearance.cs                    |   0
 .../EntityState.Marking/ArmyMarkingCompany.cs       |   0
 .../ArmyMarkingDivisionCorpsDesignation.cs          |   0
 .../ArmyMarkingHighLevelUnitFor1stCavalry.cs        |   0
 .../ArmyMarkingHighLevelUnitFor1stInfantry.cs       |   0
 .../EntityState.Marking/ArmyMarkingMarkingCodes.cs  |   0
 .../EntityState.Marking/ArmyMarkingPlatoon.cs       |   0
 .../EntityState.Marking/ArmyMarkingPlatoonCodes.cs  |   0
 .../EntityState.Marking/ArmyMarkingVehicle.cs       |   0
 .../EntityState.Marking/DigitChevronMarkingCodes.cs |   0
 .../EntityState.Marking/EntityMarkingText.cs        |   0
 .../Enumerations/EntityState.Type/AirPlatform.cs    |   0
 .../CISWeaponsForLifeFormsSubcategory.cs            |   0
 .../Enumerations/EntityState.Type/EntityKind.cs     |   0
 .../EntityState.Type/EnvironmentalSubcategory.cs    |   0
 .../EntityState.Type/ExpendableAirCategory.cs       |   0
 .../ExpendableSubsurfaceCategory.cs                 |   0
 .../EntityState.Type/ExpendableSurfaceCategory.cs   |   0
 .../EntityState.Type/FrenchWeaponsForLifeForms.cs   |   0
 .../EntityState.Type/GermanWeaponsForLifeForms.cs   |   0
 .../Enumerations/EntityState.Type/LandPlatform.cs   |   0
 .../Enumerations/EntityState.Type/Munition.cs       |   0
 .../EntityState.Type/MunitionCategory.cs            |   0
 .../Enumerations/EntityState.Type/Platform.cs       |   0
 .../Enumerations/EntityState.Type/RadioCategory.cs  |   0
 .../EntityState.Type/RadioNomenclature.cs           |   0
 .../EntityState.Type/RadioNomenclatureVersion.cs    |   0
 .../EntityState.Type/SensorEmitterCategory.cs       |   0
 .../Enumerations/EntityState.Type/SpacePlatform.cs  |   0
 .../EntityState.Type/SubsufracePlatform.cs          |   0
 .../EntityState.Type/SurfacePlatform.cs             |   0
 .../EntityState.Type/UKWeaponsForLifeForms.cs       |   0
 .../EntityState.Type/USWeaponsForLifeForms.cs       |   0
 .../EntityState/ArticulatedPartIndex.cs             |   0
 .../EntityState/ArticulatedPartOffset.cs            |   0
 .../Enumerations/EntityState/AttachedParts.cs       |   0
 .../EntityState/DeadReckoningAlgorithm.cs           |   0
 .../Enumerations/EntityState/EntityCapabilities.cs  |   0
 .../Enumerations/EntityState/EntityForceId.cs       |   0
 .../EntityState/ParameterTypeDesignator.cs          |   0
 .../Environment.Gridded/ConstantGrid.cs             |   0
 .../Environment.Gridded/CoordinateSystem.cs         |   0
 .../Environment.Gridded/DataRepresentationType.cs   |   0
 .../AirBurstAndGroundBurst.cs                       |   0
 .../ArealObjectStatePDUModificationField.cs         |   0
 .../Enumerations/Environment.ObjectState/Crater.cs  |   0
 .../Environment.ObjectState/ExhaustSmoke.cs         |   0
 .../Environment.ObjectState/GeneralAppearance.cs    |   0
 .../LinearObjectStatePDUModificationField.cs        |   0
 ...tisVehicleDefiladeAndInfantryFightingPosition.cs |   0
 .../Environment.ObjectState/Minefield.cs            |   0
 .../Environment.ObjectState/MinefieldLaneMarker.cs  |   0
 .../Environment.ObjectState/ObjectKind.cs           |   0
 .../PointObjectStatePDUModificationField.cs         |   0
 .../Environment.ObjectState/RibbonBridge.cs         |   0
 .../TankDitchAndConcertinaWire.cs                   |   0
 .../Environment.Process/EnvironmentStatus.cs        |   0
 .../EnvironmentalProcessTypesForGeometryRecord.cs   |   0
 .../EnvironmentalProcessTypesForStateRecord.cs      |   0
 .../Logistics/AuxilaryCraftRepairCode.cs            |   0
 .../Enumerations/Logistics/DriveTrainRepairCode.cs  |   0
 .../Enumerations/Logistics/ElectronicsRepairCode.cs |   0
 .../Enumerations/Logistics/FuelSystemRepairCode.cs  |   0
 .../Enumerations/Logistics/GeneralRepairCode.cs     |   0
 .../Logistics/HullAirframeBodyRepairCode.cs         |   0
 .../Logistics/HydraulicSystemsAndActuators.cs       |   0
 .../InterfacesWithEnvironmentRepairCode.cs          |   0
 .../Enumerations/Logistics/LifeSupportRepairCode.cs |   0
 .../Enumerations/Logistics/ResponseResultCode.cs    |   0
 .../Enumerations/Logistics/ServiceRequestType.cs    |   0
 .../Enumerations/Logistics/WeaponRepairCode.cs      |   0
 .../CsharpDis6}/OpenDis/Enumerations/PduType.cs     |   0
 .../OpenDis/Enumerations/ProtocolFamily.cs          |   0
 .../OpenDis/Enumerations/ProtocolVersion.cs         |   0
 .../OpenDis/Enumerations/Radio.Intercom/Command.cs  |   0
 .../Radio.Intercom/CommunicationsType.cs            |   0
 .../Enumerations/Radio.Intercom/ControlType.cs      |   0
 .../Radio.Intercom/DestinationLineStateCommand.cs   |   0
 .../Enumerations/Radio.Intercom/RecordType.cs       |   0
 .../Radio.Intercom/TransmitLineState.cs             |   0
 .../Radio.Transmitter/AntennaPatternType.cs         |   0
 .../Enumerations/Radio.Transmitter/ClearChannel.cs  |   0
 .../Enumerations/Radio.Transmitter/CryptoSystem.cs  |   0
 ...ailedModulationForAmplitudeAndAngleModulation.cs |   0
 .../DetailedModulationForAmplitudeModulation.cs     |   0
 .../DetailedModulationForAngleModulation.cs         |   0
 .../DetailedModulationForCarrierPhaseShift.cs       |   0
 .../DetailedModulationForCombinationModulation.cs   |   0
 .../DetailedModulationForPulseModulation.cs         |   0
 .../DetailedModulationForUnmodulatedModulation.cs   |   0
 .../Enumerations/Radio.Transmitter/InputSource.cs   |   0
 .../Radio.Transmitter/JtidsSynchronizationState.cs  |   0
 .../JtidsTransmittingTerminalPrimaryMode.cs         |   0
 .../JtidsTransmittingTerminalSecondaryMode.cs       |   0
 .../Radio.Transmitter/MajorModulation.cs            |   0
 .../Radio.Transmitter/RadioSignalEncoding.cs        |   0
 .../Radio.Transmitter/ReferenceSystem.cs            |   0
 .../Radio.Transmitter/SpreadSpectrum.cs             |   0
 .../Radio.Transmitter/StartOfMessage.cs             |   0
 .../Enumerations/Radio.Transmitter/TDLType.cs       |   0
 .../Enumerations/Radio.Transmitter/TransmitState.cs |   0
 .../TransmitterModulationSystemType.cs              |   0
 .../UserProtocolIdentificationNumber.cs             |   0
 .../OpenDis/Enumerations/Radio/ReceiverState.cs     |   0
 .../SimulationManagement/AcknowledgeFlag.cs         |   0
 .../Enumerations/SimulationManagement/ActionId.cs   |   0
 .../ActionResponseRequestStatus.cs                  |   0
 .../DatumSpecificationRecord.cs                     |   0
 .../Enumerations/SimulationManagement/EventType.cs  |   0
 .../SimulationManagement/FrozenBehavior.cs          |   0
 .../RequiredReliabilityService.cs                   |   0
 .../SimulationManagement/ResponseFlag.cs            |   0
 .../SimulationManagement/StopFreezeReason.cs        |   0
 .../Enumerations/Warfare/DetonationResult.cs        |   0
 .../OpenDis/Enumerations/Warfare/Fuse.cs            |   0
 .../OpenDis/Enumerations/Warfare/Warhead.cs         |   0
 .../OpenDis/FxCop OpenDis Analysis.FxCop            |   0
 .../CsharpDis6}/OpenDis/FxCopCustomDictionary.xml   |   0
 .../CsharpDis6}/OpenDis/OpenDis.build.bat           |   0
 .../CsharpDis6}/OpenDis/OpenDis.build.csproj        |   0
 .../CsharpDis6}/OpenDis/OpenDis.csproj              |   0
 .../CsharpDis6}/OpenDis/OpenDis.csproj.user         |   0
 .../CsharpDis6}/OpenDis/Properties/AssemblyInfo.cs  |   0
 .../CsharpDis6}/OpenDis/Properties/Version.cs       |   0
 .../CsharpDis6}/OpenDis/Settings.StyleCop           |   0
 .../OpenDis/Utilities/ChunkConverters.cs            |   0
 .../CsharpDis6}/OpenDis/Utilities/Conversion.cs     |   0
 .../OpenDis/Utilities/CoordinateConversions.cs      |   0
 .../OpenDis/Utilities/DataInputStream.cs            |   0
 .../OpenDis/Utilities/DataOutputStream.cs           |   0
 .../CsharpDis6}/OpenDis/Utilities/DataStream.cs     |   0
 .../CsharpDis6}/OpenDis/Utilities/PDUProcessor.cs   |   0
 {CsharpDis6 => Libs/CsharpDis6}/OpenDis/key.snk     | Bin
 512 files changed, 0 insertions(+), 0 deletions(-)
 rename {CsharpDis6 => Libs/CsharpDis6}/EspduReceiver/EspduReceiver.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/EspduReceiver/OpenDis.EspduReceiver.csproj (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/EspduReceiver/Properties/AssemblyInfo.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/EspduSender/EspduSender.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/EspduSender/OpenDis.EspduSender.csproj (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/EspduSender/Properties/AssemblyInfo.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/App.xaml (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/App.xaml.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/MainWindow.xaml (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/MainWindow.xaml.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/OpenDis.Demo.csproj (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/Properties/AssemblyInfo.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/Properties/Resources.Designer.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/Properties/Resources.resx (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/Properties/Settings.Designer.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/Properties/Settings.settings (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.sln (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis.suo (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/CetBase.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/DisTime.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/EndianTypes.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/EnumHelper.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/EnumNotFoundException.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/ICetItem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/IPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/InternetDomainCodeAttribute.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/PduBase.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/PduExceptionEventArgs.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Core/PduFactory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/EntityID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/AcknowledgePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ActionRequestPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ActionResponsePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/AngularVelocityVector.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/AntennaLocation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ArticulationParameter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/BurstDescriptor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ClockTime.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/CollisionPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/CommentPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/CreateEntityPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/DataPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/DataQueryPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/DesignatorPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/DetonationPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EightByteChunk.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EmitterSystem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EntityID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EntityInformationPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EntityStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EntityType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EventID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/EventReportPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/FirePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/FixedDatum.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/FundamentalParameterData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/LogisticsPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ModulationType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/Orientation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/Pdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/RadioEntityType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ReceiverPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/RepairCompletePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/RepairResponsePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/SetDataPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/SignalPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/SimulationAddress.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/StartResumePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/StopFreezePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/SupplyQuantity.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/TransmitterPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/VariableDatum.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/Vector3Double.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/Vector3Float.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Generated/Warfare.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/PduFactory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Vector3Double.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1995/Vector3Float.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/EntityID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AcknowledgePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AcousticBeamData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AcousticEmitter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ActionRequestPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ActionResponsePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AggregateID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AggregateMarking.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AggregateStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AggregateType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AngularVelocityVector.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/AntennaLocation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ApaData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ArticulationParameter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/BeamData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/BurstDescriptor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ClockTime.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/CollisionPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/CommentPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/CommentReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/CreateEntityPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DataPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DataQueryPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DataReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DesignatorPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DetonationPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EightByteChunk.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EmitterSystem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EntityID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EntityStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EntityType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Environment.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EventID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EventReportPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/FirePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/FixedDatum.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/FourByteChunk.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/FundamentalParameterData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/GridAxisRecord.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/GriddedDataPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IffFundamentalData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IntercomControlPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/IsPartOfPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/LayerHeader.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Marking.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ModulationType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/NamedLocation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ObjectType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/OneByteChunk.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Orientation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Pdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/PduContainer.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Point.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/PropulsionSystemData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RadioEntityType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ReceiverPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RecordSet.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Relationship.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RepairCompletePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/RepairResponsePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SeesPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SetDataPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/ShaftRPMs.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SignalPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SimulationAddress.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SixByteChunk.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/StartResumePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/StopFreezePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SupplyQuantity.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/SystemID.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/TrackJamTarget.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/TransmitterPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/TwoByteChunk.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/UaPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/VariableDatum.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Vector3Double.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/Vector3Float.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/PduFactory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Vector3Double.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Dis1998/Vector3Float.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/AggregateTypes.xml (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/Category.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/Cet.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/CetFactory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/CetItem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/Entity.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/EntityTypes.xml (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/Extra.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/GenericEntry.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/GenericTable.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/Specific.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/Subcategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2006/cet.xsd (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/AggregateTypes.xml (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/Category.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/CategoryRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/Cet.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/CetFactory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/CetItem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/Cr.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/CrRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/Entity.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/EntityTypes.xml (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/Extra.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/ExtraRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/GenericEntry.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/GenericEntryString.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/GenericTable.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/IGenericEntry.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/Specific.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/SpecificRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/Subcategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Cet2010/cet.xsd (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Country.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/AggregateKind.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/AggregateState.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/PartOfNature.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Entity.Management/TransferType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/EntityKind.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/Munition.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/Platform.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState/AttachedParts.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState/EntityCapabilities.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState/EntityForceId.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/Crater.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/ResponseResultCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/ServiceRequestType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/PduType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/ProtocolFamily.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/ProtocolVersion.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Intercom/Command.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Intercom/ControlType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Intercom/RecordType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Radio/ReceiverState.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/ActionId.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/EventType.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Warfare/DetonationResult.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Warfare/Fuse.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Enumerations/Warfare/Warhead.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/FxCop OpenDis Analysis.FxCop (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/FxCopCustomDictionary.xml (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/OpenDis.build.bat (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/OpenDis.build.csproj (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/OpenDis.csproj (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/OpenDis.csproj.user (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Properties/AssemblyInfo.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Properties/Version.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Settings.StyleCop (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Utilities/ChunkConverters.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Utilities/Conversion.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Utilities/CoordinateConversions.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Utilities/DataInputStream.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Utilities/DataOutputStream.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Utilities/DataStream.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/Utilities/PDUProcessor.cs (100%)
 rename {CsharpDis6 => Libs/CsharpDis6}/OpenDis/key.snk (100%)

diff --git a/CsharpDis6/EspduReceiver/EspduReceiver.cs b/Libs/CsharpDis6/EspduReceiver/EspduReceiver.cs
similarity index 100%
rename from CsharpDis6/EspduReceiver/EspduReceiver.cs
rename to Libs/CsharpDis6/EspduReceiver/EspduReceiver.cs
diff --git a/CsharpDis6/EspduReceiver/OpenDis.EspduReceiver.csproj b/Libs/CsharpDis6/EspduReceiver/OpenDis.EspduReceiver.csproj
similarity index 100%
rename from CsharpDis6/EspduReceiver/OpenDis.EspduReceiver.csproj
rename to Libs/CsharpDis6/EspduReceiver/OpenDis.EspduReceiver.csproj
diff --git a/CsharpDis6/EspduReceiver/Properties/AssemblyInfo.cs b/Libs/CsharpDis6/EspduReceiver/Properties/AssemblyInfo.cs
similarity index 100%
rename from CsharpDis6/EspduReceiver/Properties/AssemblyInfo.cs
rename to Libs/CsharpDis6/EspduReceiver/Properties/AssemblyInfo.cs
diff --git a/CsharpDis6/EspduSender/EspduSender.cs b/Libs/CsharpDis6/EspduSender/EspduSender.cs
similarity index 100%
rename from CsharpDis6/EspduSender/EspduSender.cs
rename to Libs/CsharpDis6/EspduSender/EspduSender.cs
diff --git a/CsharpDis6/EspduSender/OpenDis.EspduSender.csproj b/Libs/CsharpDis6/EspduSender/OpenDis.EspduSender.csproj
similarity index 100%
rename from CsharpDis6/EspduSender/OpenDis.EspduSender.csproj
rename to Libs/CsharpDis6/EspduSender/OpenDis.EspduSender.csproj
diff --git a/CsharpDis6/EspduSender/Properties/AssemblyInfo.cs b/Libs/CsharpDis6/EspduSender/Properties/AssemblyInfo.cs
similarity index 100%
rename from CsharpDis6/EspduSender/Properties/AssemblyInfo.cs
rename to Libs/CsharpDis6/EspduSender/Properties/AssemblyInfo.cs
diff --git a/CsharpDis6/OpenDis.Demo/App.xaml b/Libs/CsharpDis6/OpenDis.Demo/App.xaml
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/App.xaml
rename to Libs/CsharpDis6/OpenDis.Demo/App.xaml
diff --git a/CsharpDis6/OpenDis.Demo/App.xaml.cs b/Libs/CsharpDis6/OpenDis.Demo/App.xaml.cs
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/App.xaml.cs
rename to Libs/CsharpDis6/OpenDis.Demo/App.xaml.cs
diff --git a/CsharpDis6/OpenDis.Demo/MainWindow.xaml b/Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/MainWindow.xaml
rename to Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml
diff --git a/CsharpDis6/OpenDis.Demo/MainWindow.xaml.cs b/Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml.cs
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/MainWindow.xaml.cs
rename to Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml.cs
diff --git a/CsharpDis6/OpenDis.Demo/OpenDis.Demo.csproj b/Libs/CsharpDis6/OpenDis.Demo/OpenDis.Demo.csproj
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/OpenDis.Demo.csproj
rename to Libs/CsharpDis6/OpenDis.Demo/OpenDis.Demo.csproj
diff --git a/CsharpDis6/OpenDis.Demo/Properties/AssemblyInfo.cs b/Libs/CsharpDis6/OpenDis.Demo/Properties/AssemblyInfo.cs
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/Properties/AssemblyInfo.cs
rename to Libs/CsharpDis6/OpenDis.Demo/Properties/AssemblyInfo.cs
diff --git a/CsharpDis6/OpenDis.Demo/Properties/Resources.Designer.cs b/Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.Designer.cs
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/Properties/Resources.Designer.cs
rename to Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.Designer.cs
diff --git a/CsharpDis6/OpenDis.Demo/Properties/Resources.resx b/Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.resx
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/Properties/Resources.resx
rename to Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.resx
diff --git a/CsharpDis6/OpenDis.Demo/Properties/Settings.Designer.cs b/Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.Designer.cs
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/Properties/Settings.Designer.cs
rename to Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.Designer.cs
diff --git a/CsharpDis6/OpenDis.Demo/Properties/Settings.settings b/Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.settings
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/Properties/Settings.settings
rename to Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.settings
diff --git a/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe b/Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe
rename to Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe
diff --git a/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest b/Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest
rename to Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest
diff --git a/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache b/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache
rename to Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache
diff --git a/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref b/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref
similarity index 100%
rename from CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref
rename to Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref
diff --git a/CsharpDis6/OpenDis.sln b/Libs/CsharpDis6/OpenDis.sln
similarity index 100%
rename from CsharpDis6/OpenDis.sln
rename to Libs/CsharpDis6/OpenDis.sln
diff --git a/CsharpDis6/OpenDis.suo b/Libs/CsharpDis6/OpenDis.suo
similarity index 100%
rename from CsharpDis6/OpenDis.suo
rename to Libs/CsharpDis6/OpenDis.suo
diff --git a/CsharpDis6/OpenDis/Core/CetBase.cs b/Libs/CsharpDis6/OpenDis/Core/CetBase.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/CetBase.cs
rename to Libs/CsharpDis6/OpenDis/Core/CetBase.cs
diff --git a/CsharpDis6/OpenDis/Core/DisTime.cs b/Libs/CsharpDis6/OpenDis/Core/DisTime.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/DisTime.cs
rename to Libs/CsharpDis6/OpenDis/Core/DisTime.cs
diff --git a/CsharpDis6/OpenDis/Core/EndianTypes.cs b/Libs/CsharpDis6/OpenDis/Core/EndianTypes.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/EndianTypes.cs
rename to Libs/CsharpDis6/OpenDis/Core/EndianTypes.cs
diff --git a/CsharpDis6/OpenDis/Core/EnumHelper.cs b/Libs/CsharpDis6/OpenDis/Core/EnumHelper.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/EnumHelper.cs
rename to Libs/CsharpDis6/OpenDis/Core/EnumHelper.cs
diff --git a/CsharpDis6/OpenDis/Core/EnumNotFoundException.cs b/Libs/CsharpDis6/OpenDis/Core/EnumNotFoundException.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/EnumNotFoundException.cs
rename to Libs/CsharpDis6/OpenDis/Core/EnumNotFoundException.cs
diff --git a/CsharpDis6/OpenDis/Core/ICetItem.cs b/Libs/CsharpDis6/OpenDis/Core/ICetItem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/ICetItem.cs
rename to Libs/CsharpDis6/OpenDis/Core/ICetItem.cs
diff --git a/CsharpDis6/OpenDis/Core/IPdu.cs b/Libs/CsharpDis6/OpenDis/Core/IPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/IPdu.cs
rename to Libs/CsharpDis6/OpenDis/Core/IPdu.cs
diff --git a/CsharpDis6/OpenDis/Core/InternetDomainCodeAttribute.cs b/Libs/CsharpDis6/OpenDis/Core/InternetDomainCodeAttribute.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/InternetDomainCodeAttribute.cs
rename to Libs/CsharpDis6/OpenDis/Core/InternetDomainCodeAttribute.cs
diff --git a/CsharpDis6/OpenDis/Core/PduBase.cs b/Libs/CsharpDis6/OpenDis/Core/PduBase.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/PduBase.cs
rename to Libs/CsharpDis6/OpenDis/Core/PduBase.cs
diff --git a/CsharpDis6/OpenDis/Core/PduExceptionEventArgs.cs b/Libs/CsharpDis6/OpenDis/Core/PduExceptionEventArgs.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/PduExceptionEventArgs.cs
rename to Libs/CsharpDis6/OpenDis/Core/PduExceptionEventArgs.cs
diff --git a/CsharpDis6/OpenDis/Core/PduFactory.cs b/Libs/CsharpDis6/OpenDis/Core/PduFactory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Core/PduFactory.cs
rename to Libs/CsharpDis6/OpenDis/Core/PduFactory.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/EntityID.cs b/Libs/CsharpDis6/OpenDis/Dis1995/EntityID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/EntityID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/EntityID.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/AcknowledgePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AcknowledgePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/AcknowledgePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/AcknowledgePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ActionRequestPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionRequestPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ActionRequestPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionRequestPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ActionResponsePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionResponsePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ActionResponsePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionResponsePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/AngularVelocityVector.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AngularVelocityVector.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/AngularVelocityVector.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/AngularVelocityVector.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/AntennaLocation.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AntennaLocation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/AntennaLocation.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/AntennaLocation.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ArticulationParameter.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ArticulationParameter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ArticulationParameter.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ArticulationParameter.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/BurstDescriptor.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/BurstDescriptor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/BurstDescriptor.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/BurstDescriptor.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ClockTime.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ClockTime.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ClockTime.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ClockTime.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/CollisionPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CollisionPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/CollisionPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/CollisionPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/CommentPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CommentPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/CommentPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/CommentPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/CreateEntityPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CreateEntityPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/CreateEntityPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/CreateEntityPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/DataPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/DataPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/DataQueryPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataQueryPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/DataQueryPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataQueryPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/DesignatorPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DesignatorPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/DesignatorPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/DesignatorPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/DetonationPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DetonationPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/DetonationPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/DetonationPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EightByteChunk.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EightByteChunk.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EightByteChunk.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EightByteChunk.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EmitterSystem.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EmitterSystem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EmitterSystem.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EmitterSystem.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EntityID.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EntityID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityID.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EntityInformationPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityInformationPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EntityInformationPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityInformationPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EntityStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EntityStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EntityType.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EntityType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityType.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EventID.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EventID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventID.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/EventReportPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventReportPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/EventReportPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventReportPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/FirePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FirePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/FirePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/FirePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/FixedDatum.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FixedDatum.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/FixedDatum.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/FixedDatum.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/FundamentalParameterData.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FundamentalParameterData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/FundamentalParameterData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/FundamentalParameterData.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/LogisticsPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/LogisticsPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/LogisticsPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/LogisticsPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ModulationType.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ModulationType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ModulationType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ModulationType.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/Orientation.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Orientation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/Orientation.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/Orientation.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/Pdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Pdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/Pdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/Pdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/RadioEntityType.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioEntityType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/RadioEntityType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioEntityType.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ReceiverPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ReceiverPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ReceiverPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ReceiverPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/RepairCompletePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairCompletePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/RepairCompletePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairCompletePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/RepairResponsePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairResponsePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/RepairResponsePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairResponsePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/SetDataPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SetDataPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/SetDataPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/SetDataPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/SignalPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SignalPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/SignalPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/SignalPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/SimulationAddress.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationAddress.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/SimulationAddress.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationAddress.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/StartResumePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/StartResumePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/StartResumePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/StartResumePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/StopFreezePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/StopFreezePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/StopFreezePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/StopFreezePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/SupplyQuantity.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SupplyQuantity.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/SupplyQuantity.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/SupplyQuantity.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/TransmitterPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/TransmitterPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/TransmitterPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/TransmitterPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/VariableDatum.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/VariableDatum.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/VariableDatum.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/VariableDatum.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Double.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Double.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/Vector3Double.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Double.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Float.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Float.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/Vector3Float.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Float.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Generated/Warfare.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Warfare.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Generated/Warfare.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Generated/Warfare.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/PduFactory.cs b/Libs/CsharpDis6/OpenDis/Dis1995/PduFactory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/PduFactory.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/PduFactory.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Vector3Double.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Vector3Double.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Vector3Double.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Vector3Double.cs
diff --git a/CsharpDis6/OpenDis/Dis1995/Vector3Float.cs b/Libs/CsharpDis6/OpenDis/Dis1995/Vector3Float.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1995/Vector3Float.cs
rename to Libs/CsharpDis6/OpenDis/Dis1995/Vector3Float.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/EntityID.cs b/Libs/CsharpDis6/OpenDis/Dis1998/EntityID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/EntityID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/EntityID.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitter.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitter.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitter.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponsePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponsePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ActionResponsePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponsePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AggregateID.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AggregateID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateID.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AggregateMarking.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateMarking.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AggregateMarking.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateMarking.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AggregateStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AggregateStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AggregateType.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AggregateType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateType.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AngularVelocityVector.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AngularVelocityVector.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AngularVelocityVector.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AngularVelocityVector.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/AntennaLocation.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AntennaLocation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/AntennaLocation.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/AntennaLocation.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ApaData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ApaData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ApaData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ApaData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ArticulationParameter.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArticulationParameter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ArticulationParameter.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArticulationParameter.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/BeamData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/BeamData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/BurstDescriptor.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BurstDescriptor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/BurstDescriptor.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/BurstDescriptor.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ClockTime.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ClockTime.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ClockTime.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ClockTime.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/CollisionPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/CollisionPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/CommentPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/CommentPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/CommentReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/CommentReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DataPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DataPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DataQueryPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DataReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DataReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DesignatorPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DesignatorPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DesignatorPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DesignatorPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DetonationPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DetonationPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DetonationPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DetonationPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EightByteChunk.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EightByteChunk.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EightByteChunk.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EightByteChunk.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EmitterSystem.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EmitterSystem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EmitterSystem.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EmitterSystem.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EntityID.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EntityID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityID.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EntityStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EntityStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EntityType.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EntityType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityType.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Environment.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Environment.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Environment.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Environment.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EventID.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EventID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventID.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EventReportPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EventReportPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/FirePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FirePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/FirePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/FirePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/FixedDatum.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FixedDatum.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/FixedDatum.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/FixedDatum.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/FourByteChunk.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FourByteChunk.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/FourByteChunk.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/FourByteChunk.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecord.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecord.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecord.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecord.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/GriddedDataPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GriddedDataPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/GriddedDataPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/GriddedDataPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IffFundamentalData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffFundamentalData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IffFundamentalData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffFundamentalData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IntercomControlPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomControlPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IntercomControlPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomControlPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/IsPartOfPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsPartOfPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/IsPartOfPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsPartOfPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/LayerHeader.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LayerHeader.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/LayerHeader.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/LayerHeader.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Marking.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Marking.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Marking.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Marking.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ModulationType.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ModulationType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ModulationType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ModulationType.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/NamedLocation.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/NamedLocation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/NamedLocation.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/NamedLocation.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ObjectType.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ObjectType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ObjectType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ObjectType.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/OneByteChunk.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/OneByteChunk.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/OneByteChunk.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/OneByteChunk.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Orientation.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Orientation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Orientation.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Orientation.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Pdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Pdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Pdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Pdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/PduContainer.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PduContainer.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/PduContainer.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/PduContainer.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Point.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Point.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Point.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Point.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/PropulsionSystemData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PropulsionSystemData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/PropulsionSystemData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/PropulsionSystemData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RadioEntityType.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioEntityType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RadioEntityType.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioEntityType.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ReceiverPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ReceiverPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ReceiverPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ReceiverPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RecordSet.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordSet.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RecordSet.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordSet.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Relationship.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Relationship.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Relationship.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Relationship.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RepairCompletePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairCompletePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RepairCompletePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairCompletePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/RepairResponsePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairResponsePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/RepairResponsePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairResponsePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SeesPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SeesPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SeesPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SeesPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SetDataPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SetDataPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/ShaftRPMs.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ShaftRPMs.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/ShaftRPMs.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/ShaftRPMs.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SignalPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SignalPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SignalPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SignalPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SimulationAddress.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationAddress.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SimulationAddress.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationAddress.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SixByteChunk.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SixByteChunk.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SixByteChunk.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SixByteChunk.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/StartResumePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/StartResumePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/StopFreezePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SupplyQuantity.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SupplyQuantity.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SupplyQuantity.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SupplyQuantity.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/SystemID.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SystemID.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/SystemID.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/SystemID.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/TrackJamTarget.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TrackJamTarget.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/TrackJamTarget.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/TrackJamTarget.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/TransmitterPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransmitterPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/TransmitterPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransmitterPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/TwoByteChunk.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TwoByteChunk.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/TwoByteChunk.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/TwoByteChunk.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/UaPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/UaPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/UaPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/UaPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/VariableDatum.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/VariableDatum.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/VariableDatum.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/VariableDatum.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Double.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Double.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Vector3Double.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Double.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Float.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Float.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/Vector3Float.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Float.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/PduFactory.cs b/Libs/CsharpDis6/OpenDis/Dis1998/PduFactory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/PduFactory.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/PduFactory.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Vector3Double.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Vector3Double.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Vector3Double.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Vector3Double.cs
diff --git a/CsharpDis6/OpenDis/Dis1998/Vector3Float.cs b/Libs/CsharpDis6/OpenDis/Dis1998/Vector3Float.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Dis1998/Vector3Float.cs
rename to Libs/CsharpDis6/OpenDis/Dis1998/Vector3Float.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/AggregateTypes.xml b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/AggregateTypes.xml
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/AggregateTypes.xml
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/AggregateTypes.xml
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/Category.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Category.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/Category.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Category.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/Cet.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Cet.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/Cet.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Cet.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/CetFactory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetFactory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/CetFactory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetFactory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/CetItem.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetItem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/CetItem.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetItem.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/Entity.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Entity.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/Entity.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Entity.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/EntityTypes.xml b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/EntityTypes.xml
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/EntityTypes.xml
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/EntityTypes.xml
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/Extra.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Extra.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/Extra.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Extra.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericEntry.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericEntry.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/GenericEntry.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericEntry.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericTable.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericTable.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/GenericTable.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericTable.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/Specific.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Specific.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/Specific.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Specific.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/Subcategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Subcategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/Subcategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Subcategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2006/cet.xsd b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/cet.xsd
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2006/cet.xsd
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/cet.xsd
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/AggregateTypes.xml b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/AggregateTypes.xml
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/AggregateTypes.xml
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/AggregateTypes.xml
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/Category.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Category.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/Category.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Category.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/CategoryRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CategoryRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/CategoryRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CategoryRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/Cet.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cet.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/Cet.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cet.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/CetFactory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetFactory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/CetFactory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetFactory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/CetItem.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetItem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/CetItem.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetItem.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/Cr.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cr.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/Cr.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cr.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/CrRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CrRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/CrRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CrRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/Entity.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Entity.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/Entity.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Entity.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/EntityTypes.xml b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/EntityTypes.xml
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/EntityTypes.xml
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/EntityTypes.xml
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/Extra.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Extra.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/Extra.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Extra.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/ExtraRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ExtraRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/ExtraRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ExtraRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntry.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntry.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntry.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntry.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryString.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryString.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryString.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryString.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericTable.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericTable.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/GenericTable.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericTable.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntry.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntry.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntry.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntry.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/Specific.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Specific.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/Specific.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Specific.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/SpecificRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SpecificRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/SpecificRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SpecificRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/Subcategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Subcategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/Subcategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Subcategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Cet2010/cet.xsd b/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/cet.xsd
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Cet2010/cet.xsd
rename to Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/cet.xsd
diff --git a/CsharpDis6/OpenDis/Enumerations/Country.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Country.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Country.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Country.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs b/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateKind.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateKind.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateKind.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateKind.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateState.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateState.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateState.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateState.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfNature.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfNature.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfNature.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfNature.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Entity.Management/TransferType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/TransferType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Entity.Management/TransferType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/TransferType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EntityKind.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EntityKind.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/EntityKind.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EntityKind.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Munition.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Munition.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/Munition.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Munition.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Platform.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Platform.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/Platform.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Platform.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState/AttachedParts.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/AttachedParts.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState/AttachedParts.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState/AttachedParts.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState/EntityCapabilities.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityCapabilities.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState/EntityCapabilities.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityCapabilities.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState/EntityForceId.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityForceId.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState/EntityForceId.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityForceId.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs b/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Crater.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Crater.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Crater.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Crater.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/ResponseResultCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ResponseResultCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/ResponseResultCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ResponseResultCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/ServiceRequestType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ServiceRequestType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/ServiceRequestType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ServiceRequestType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/PduType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/PduType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/PduType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/PduType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/ProtocolFamily.cs b/Libs/CsharpDis6/OpenDis/Enumerations/ProtocolFamily.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/ProtocolFamily.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/ProtocolFamily.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/ProtocolVersion.cs b/Libs/CsharpDis6/OpenDis/Enumerations/ProtocolVersion.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/ProtocolVersion.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/ProtocolVersion.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/Command.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/Command.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Intercom/Command.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/Command.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/ControlType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/ControlType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Intercom/ControlType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/ControlType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/RecordType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/RecordType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Intercom/RecordType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/RecordType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Radio/ReceiverState.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Radio/ReceiverState.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Radio/ReceiverState.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Radio/ReceiverState.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionId.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionId.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionId.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionId.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/EventType.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/EventType.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/EventType.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/EventType.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs b/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Warfare/DetonationResult.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/DetonationResult.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Warfare/DetonationResult.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Warfare/DetonationResult.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Warfare/Fuse.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Fuse.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Warfare/Fuse.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Fuse.cs
diff --git a/CsharpDis6/OpenDis/Enumerations/Warfare/Warhead.cs b/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Warhead.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Enumerations/Warfare/Warhead.cs
rename to Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Warhead.cs
diff --git a/CsharpDis6/OpenDis/FxCop OpenDis Analysis.FxCop b/Libs/CsharpDis6/OpenDis/FxCop OpenDis Analysis.FxCop
similarity index 100%
rename from CsharpDis6/OpenDis/FxCop OpenDis Analysis.FxCop
rename to Libs/CsharpDis6/OpenDis/FxCop OpenDis Analysis.FxCop
diff --git a/CsharpDis6/OpenDis/FxCopCustomDictionary.xml b/Libs/CsharpDis6/OpenDis/FxCopCustomDictionary.xml
similarity index 100%
rename from CsharpDis6/OpenDis/FxCopCustomDictionary.xml
rename to Libs/CsharpDis6/OpenDis/FxCopCustomDictionary.xml
diff --git a/CsharpDis6/OpenDis/OpenDis.build.bat b/Libs/CsharpDis6/OpenDis/OpenDis.build.bat
similarity index 100%
rename from CsharpDis6/OpenDis/OpenDis.build.bat
rename to Libs/CsharpDis6/OpenDis/OpenDis.build.bat
diff --git a/CsharpDis6/OpenDis/OpenDis.build.csproj b/Libs/CsharpDis6/OpenDis/OpenDis.build.csproj
similarity index 100%
rename from CsharpDis6/OpenDis/OpenDis.build.csproj
rename to Libs/CsharpDis6/OpenDis/OpenDis.build.csproj
diff --git a/CsharpDis6/OpenDis/OpenDis.csproj b/Libs/CsharpDis6/OpenDis/OpenDis.csproj
similarity index 100%
rename from CsharpDis6/OpenDis/OpenDis.csproj
rename to Libs/CsharpDis6/OpenDis/OpenDis.csproj
diff --git a/CsharpDis6/OpenDis/OpenDis.csproj.user b/Libs/CsharpDis6/OpenDis/OpenDis.csproj.user
similarity index 100%
rename from CsharpDis6/OpenDis/OpenDis.csproj.user
rename to Libs/CsharpDis6/OpenDis/OpenDis.csproj.user
diff --git a/CsharpDis6/OpenDis/Properties/AssemblyInfo.cs b/Libs/CsharpDis6/OpenDis/Properties/AssemblyInfo.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Properties/AssemblyInfo.cs
rename to Libs/CsharpDis6/OpenDis/Properties/AssemblyInfo.cs
diff --git a/CsharpDis6/OpenDis/Properties/Version.cs b/Libs/CsharpDis6/OpenDis/Properties/Version.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Properties/Version.cs
rename to Libs/CsharpDis6/OpenDis/Properties/Version.cs
diff --git a/CsharpDis6/OpenDis/Settings.StyleCop b/Libs/CsharpDis6/OpenDis/Settings.StyleCop
similarity index 100%
rename from CsharpDis6/OpenDis/Settings.StyleCop
rename to Libs/CsharpDis6/OpenDis/Settings.StyleCop
diff --git a/CsharpDis6/OpenDis/Utilities/ChunkConverters.cs b/Libs/CsharpDis6/OpenDis/Utilities/ChunkConverters.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Utilities/ChunkConverters.cs
rename to Libs/CsharpDis6/OpenDis/Utilities/ChunkConverters.cs
diff --git a/CsharpDis6/OpenDis/Utilities/Conversion.cs b/Libs/CsharpDis6/OpenDis/Utilities/Conversion.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Utilities/Conversion.cs
rename to Libs/CsharpDis6/OpenDis/Utilities/Conversion.cs
diff --git a/CsharpDis6/OpenDis/Utilities/CoordinateConversions.cs b/Libs/CsharpDis6/OpenDis/Utilities/CoordinateConversions.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Utilities/CoordinateConversions.cs
rename to Libs/CsharpDis6/OpenDis/Utilities/CoordinateConversions.cs
diff --git a/CsharpDis6/OpenDis/Utilities/DataInputStream.cs b/Libs/CsharpDis6/OpenDis/Utilities/DataInputStream.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Utilities/DataInputStream.cs
rename to Libs/CsharpDis6/OpenDis/Utilities/DataInputStream.cs
diff --git a/CsharpDis6/OpenDis/Utilities/DataOutputStream.cs b/Libs/CsharpDis6/OpenDis/Utilities/DataOutputStream.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Utilities/DataOutputStream.cs
rename to Libs/CsharpDis6/OpenDis/Utilities/DataOutputStream.cs
diff --git a/CsharpDis6/OpenDis/Utilities/DataStream.cs b/Libs/CsharpDis6/OpenDis/Utilities/DataStream.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Utilities/DataStream.cs
rename to Libs/CsharpDis6/OpenDis/Utilities/DataStream.cs
diff --git a/CsharpDis6/OpenDis/Utilities/PDUProcessor.cs b/Libs/CsharpDis6/OpenDis/Utilities/PDUProcessor.cs
similarity index 100%
rename from CsharpDis6/OpenDis/Utilities/PDUProcessor.cs
rename to Libs/CsharpDis6/OpenDis/Utilities/PDUProcessor.cs
diff --git a/CsharpDis6/OpenDis/key.snk b/Libs/CsharpDis6/OpenDis/key.snk
similarity index 100%
rename from CsharpDis6/OpenDis/key.snk
rename to Libs/CsharpDis6/OpenDis/key.snk

From 924bb259bdd87dd7ec386f761aa1daba324cc2f6 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sat, 9 Oct 2021 10:08:36 +0200
Subject: [PATCH 04/25] [BLD] Move to a sub-folder CSharpDis7

---
 {CSharpDis7 => Libs/CSharpDis7}/AcknowledgePdu.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/AcknowledgeReliablePdu.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/AcousticEmitter.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/ActionRequestPdu.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/ActionRequestReliablePdu.cs       | 0
 {CSharpDis7 => Libs/CSharpDis7}/ActionResponsePdu.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/ActionResponseReliablePdu.cs      | 0
 {CSharpDis7 => Libs/CSharpDis7}/AggregateIdentifier.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/AggregateMarking.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/AggregateType.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/AngleDeception.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/AngularVelocityVector.cs          | 0
 {CSharpDis7 => Libs/CSharpDis7}/AntennaLocation.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/ArealObjectStatePdu.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/ArticulatedParts.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/Association.cs                    | 0
 {CSharpDis7 => Libs/CSharpDis7}/AttachedParts.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/Attribute.cs                      | 0
 {CSharpDis7 => Libs/CSharpDis7}/AttributePdu.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/BeamAntennaPattern.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/BeamData.cs                       | 0
 {CSharpDis7 => Libs/CSharpDis7}/BeamStatus.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/BlankingSector.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/ChangeOptions.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/ClockTime.cs                      | 0
 {CSharpDis7 => Libs/CSharpDis7}/CollisionElasticPdu.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/CollisionPdu.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/CommentPdu.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/CommentReliablePdu.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/CommunicationsNodeID.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/CreateEntityPdu.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/CreateEntityReliablePdu.cs        | 0
 {CSharpDis7 => Libs/CSharpDis7}/DataPdu.cs                        | 0
 {CSharpDis7 => Libs/CSharpDis7}/DataQueryDatumSpecification.cs    | 0
 {CSharpDis7 => Libs/CSharpDis7}/DataQueryPdu.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/DataQueryReliablePdu.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/DataReliablePdu.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/DatumSpecification.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/DeadReckoningParameters.cs        | 0
 {CSharpDis7 => Libs/CSharpDis7}/DesignatorPdu.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/DetonationPdu.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyAreaAimpoint.cs     | 0
 {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyDamage.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyFirePdu.cs          | 0
 .../CSharpDis7}/DirectedEnergyPrecisionAimpoint.cs                | 0
 .../CSharpDis7}/DirectedEnergyTargetEnergyDeposition.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/DistributedEmissionsFamilyPdu.cs  | 0
 {CSharpDis7 => Libs/CSharpDis7}/EEFundamentalParameterData.cs     | 0
 {CSharpDis7 => Libs/CSharpDis7}/EightByteChunk.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/ElectronicEmissionsPdu.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/EmitterSystem.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/EngineFuel.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/EngineFuelReload.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityAssociation.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityDamageStatusPdu.cs          | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityID.cs                       | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityInformationFamilyPdu.cs     | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityManagementFamilyPdu.cs      | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityMarking.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityStatePdu.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityStateUpdatePdu.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityType.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/EntityTypeVP.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/Environment.cs                    | 0
 {CSharpDis7 => Libs/CSharpDis7}/EnvironmentGeneral.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/EnvironmentType.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/EulerAngles.cs                    | 0
 {CSharpDis7 => Libs/CSharpDis7}/EventIdentifier.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/EventIdentifierLiveEntity.cs      | 0
 {CSharpDis7 => Libs/CSharpDis7}/EventReportPdu.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/EventReportReliablePdu.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/Expendable.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/ExpendableDescriptor.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/ExpendableReload.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/ExplosionDescriptor.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/FalseTargetsAttribute.cs          | 0
 {CSharpDis7 => Libs/CSharpDis7}/FastEntityStatePdu.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/FirePdu.cs                        | 0
 {CSharpDis7 => Libs/CSharpDis7}/FixedDatum.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/FourByteChunk.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/FundamentalOperationalData.cs     | 0
 {CSharpDis7 => Libs/CSharpDis7}/GridAxis.cs                       | 0
 {CSharpDis7 => Libs/CSharpDis7}/GroupIdentifier.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/IFFFundamentalParameterData.cs    | 0
 {CSharpDis7 => Libs/CSharpDis7}/IOCommunicationsNode.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/IOEffect.cs                       | 0
 {CSharpDis7 => Libs/CSharpDis7}/IffDataSpecification.cs           | 0
 .../CSharpDis7}/IntercomCommunicationsParameters.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/IntercomIdentifier.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/IntercomSignalPdu.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/IsPartOfPdu.cs                    | 0
 {CSharpDis7 => Libs/CSharpDis7}/JammingTechnique.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/LaunchedMunitionRecord.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/LayerHeader.cs                    | 0
 {CSharpDis7 => Libs/CSharpDis7}/LinearObjectStatePdu.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/LinearSegmentParameter.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/LiveEntityIdentifier.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/LiveEntityPdu.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/LiveSimulationAddress.cs          | 0
 {CSharpDis7 => Libs/CSharpDis7}/LogisticsFamilyPdu.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/MineEntityIdentifier.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/MinefieldFamilyPdu.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/MinefieldIdentifier.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/MinefieldResponseNackPdu.cs       | 0
 {CSharpDis7 => Libs/CSharpDis7}/MinefieldStatePdu.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/ModulationParameters.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/ModulationType.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/Munition.cs                       | 0
 {CSharpDis7 => Libs/CSharpDis7}/MunitionDescriptor.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/MunitionReload.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/NamedLocationIdentification.cs    | 0
 {CSharpDis7 => Libs/CSharpDis7}/ObjectIdentifier.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/ObjectType.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/OneByteChunk.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/OwnershipStatus.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/Pdu.cs                            | 0
 {CSharpDis7 => Libs/CSharpDis7}/PduContainer.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/PduHeader.cs                      | 0
 {CSharpDis7 => Libs/CSharpDis7}/PduStatus.cs                      | 0
 {CSharpDis7 => Libs/CSharpDis7}/PduSuperclass.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/PointObjectStatePdu.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/PropulsionSystemData.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/RadioCommunicationsFamilyPdu.cs   | 0
 {CSharpDis7 => Libs/CSharpDis7}/RadioIdentifier.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/RadioType.cs                      | 0
 {CSharpDis7 => Libs/CSharpDis7}/ReceiverPdu.cs                    | 0
 {CSharpDis7 => Libs/CSharpDis7}/RecordQueryReliablePdu.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/RecordQuerySpecification.cs       | 0
 {CSharpDis7 => Libs/CSharpDis7}/RecordSpecification.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/RecordSpecificationElement.cs     | 0
 {CSharpDis7 => Libs/CSharpDis7}/Relationship.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/RemoveEntityPdu.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/RemoveEntityReliablePdu.cs        | 0
 {CSharpDis7 => Libs/CSharpDis7}/RepairCompletePdu.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/RepairResponsePdu.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/ResupplyOfferPdu.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/ResupplyReceivedPdu.cs            | 0
 {CSharpDis7 => Libs/CSharpDis7}/SecondaryOperationalData.cs       | 0
 {CSharpDis7 => Libs/CSharpDis7}/SeesPdu.cs                        | 0
 {CSharpDis7 => Libs/CSharpDis7}/Sensor.cs                         | 0
 {CSharpDis7 => Libs/CSharpDis7}/SeparationVP.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/ServiceRequestPdu.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/SetDataPdu.cs                     | 0
 {CSharpDis7 => Libs/CSharpDis7}/SetDataReliablePdu.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/SimulationAddress.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/SimulationIdentifier.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/SimulationManagementFamilyPdu.cs  | 0
 {CSharpDis7 => Libs/CSharpDis7}/SimulationManagementPduHeader.cs  | 0
 .../CSharpDis7}/SimulationManagementWithReliabilityFamilyPdu.cs   | 0
 {CSharpDis7 => Libs/CSharpDis7}/StandardVariableSpecification.cs  | 0
 {CSharpDis7 => Libs/CSharpDis7}/StartResumePdu.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/StartResumeReliablePdu.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/StopFreezePdu.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/StopFreezeReliablePdu.cs          | 0
 {CSharpDis7 => Libs/CSharpDis7}/StorageFuel.cs                    | 0
 {CSharpDis7 => Libs/CSharpDis7}/StorageFuelReload.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/SupplyQuantity.cs                 | 0
 {CSharpDis7 => Libs/CSharpDis7}/SyntheticEnvironmentFamilyPdu.cs  | 0
 {CSharpDis7 => Libs/CSharpDis7}/SystemIdentifier.cs               | 0
 {CSharpDis7 => Libs/CSharpDis7}/TotalRecordSets.cs                | 0
 {CSharpDis7 => Libs/CSharpDis7}/TrackJamData.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/TwoByteChunk.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/UAFundamentalParameter.cs         | 0
 {CSharpDis7 => Libs/CSharpDis7}/UaPdu.cs                          | 0
 {CSharpDis7 => Libs/CSharpDis7}/UnattachedIdentifier.cs           | 0
 {CSharpDis7 => Libs/CSharpDis7}/UnsignedDISInteger.cs             | 0
 {CSharpDis7 => Libs/CSharpDis7}/VariableDatum.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/VariableParameter.cs              | 0
 {CSharpDis7 => Libs/CSharpDis7}/VariableTransmitterParameters.cs  | 0
 {CSharpDis7 => Libs/CSharpDis7}/Vector2Float.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/Vector3Double.cs                  | 0
 {CSharpDis7 => Libs/CSharpDis7}/Vector3Float.cs                   | 0
 {CSharpDis7 => Libs/CSharpDis7}/VectoringNozzleSystem.cs          | 0
 {CSharpDis7 => Libs/CSharpDis7}/WarfareFamilyPdu.cs               | 0
 174 files changed, 0 insertions(+), 0 deletions(-)
 rename {CSharpDis7 => Libs/CSharpDis7}/AcknowledgePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AcknowledgeReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AcousticEmitter.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ActionRequestPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ActionRequestReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ActionResponsePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ActionResponseReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AggregateIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AggregateMarking.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AggregateType.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AngleDeception.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AngularVelocityVector.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AntennaLocation.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ArealObjectStatePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ArticulatedParts.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Association.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AttachedParts.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Attribute.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/AttributePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/BeamAntennaPattern.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/BeamData.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/BeamStatus.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/BlankingSector.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ChangeOptions.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ClockTime.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/CollisionElasticPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/CollisionPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/CommentPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/CommentReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/CommunicationsNodeID.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/CreateEntityPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/CreateEntityReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DataPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DataQueryDatumSpecification.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DataQueryPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DataQueryReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DataReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DatumSpecification.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DeadReckoningParameters.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DesignatorPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DetonationPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyAreaAimpoint.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyDamage.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyFirePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyPrecisionAimpoint.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DirectedEnergyTargetEnergyDeposition.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/DistributedEmissionsFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EEFundamentalParameterData.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EightByteChunk.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ElectronicEmissionsPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EmitterSystem.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EngineFuel.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EngineFuelReload.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityAssociation.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityDamageStatusPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityID.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityInformationFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityManagementFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityMarking.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityStatePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityStateUpdatePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityType.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EntityTypeVP.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Environment.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EnvironmentGeneral.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EnvironmentType.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EulerAngles.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EventIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EventIdentifierLiveEntity.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EventReportPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/EventReportReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Expendable.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ExpendableDescriptor.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ExpendableReload.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ExplosionDescriptor.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/FalseTargetsAttribute.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/FastEntityStatePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/FirePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/FixedDatum.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/FourByteChunk.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/FundamentalOperationalData.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/GridAxis.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/GroupIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IFFFundamentalParameterData.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IOCommunicationsNode.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IOEffect.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IffDataSpecification.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IntercomCommunicationsParameters.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IntercomIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IntercomSignalPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/IsPartOfPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/JammingTechnique.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LaunchedMunitionRecord.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LayerHeader.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LinearObjectStatePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LinearSegmentParameter.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LiveEntityIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LiveEntityPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LiveSimulationAddress.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/LogisticsFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/MineEntityIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/MinefieldFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/MinefieldIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/MinefieldResponseNackPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/MinefieldStatePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ModulationParameters.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ModulationType.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Munition.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/MunitionDescriptor.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/MunitionReload.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/NamedLocationIdentification.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ObjectIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ObjectType.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/OneByteChunk.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/OwnershipStatus.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Pdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/PduContainer.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/PduHeader.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/PduStatus.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/PduSuperclass.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/PointObjectStatePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/PropulsionSystemData.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RadioCommunicationsFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RadioIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RadioType.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ReceiverPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RecordQueryReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RecordQuerySpecification.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RecordSpecification.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RecordSpecificationElement.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Relationship.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RemoveEntityPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RemoveEntityReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RepairCompletePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/RepairResponsePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ResupplyOfferPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ResupplyReceivedPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SecondaryOperationalData.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SeesPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Sensor.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SeparationVP.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/ServiceRequestPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SetDataPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SetDataReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SimulationAddress.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SimulationIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SimulationManagementFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SimulationManagementPduHeader.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SimulationManagementWithReliabilityFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/StandardVariableSpecification.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/StartResumePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/StartResumeReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/StopFreezePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/StopFreezeReliablePdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/StorageFuel.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/StorageFuelReload.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SupplyQuantity.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SyntheticEnvironmentFamilyPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/SystemIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/TotalRecordSets.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/TrackJamData.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/TwoByteChunk.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/UAFundamentalParameter.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/UaPdu.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/UnattachedIdentifier.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/UnsignedDISInteger.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/VariableDatum.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/VariableParameter.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/VariableTransmitterParameters.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Vector2Float.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Vector3Double.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/Vector3Float.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/VectoringNozzleSystem.cs (100%)
 rename {CSharpDis7 => Libs/CSharpDis7}/WarfareFamilyPdu.cs (100%)

diff --git a/CSharpDis7/AcknowledgePdu.cs b/Libs/CSharpDis7/AcknowledgePdu.cs
similarity index 100%
rename from CSharpDis7/AcknowledgePdu.cs
rename to Libs/CSharpDis7/AcknowledgePdu.cs
diff --git a/CSharpDis7/AcknowledgeReliablePdu.cs b/Libs/CSharpDis7/AcknowledgeReliablePdu.cs
similarity index 100%
rename from CSharpDis7/AcknowledgeReliablePdu.cs
rename to Libs/CSharpDis7/AcknowledgeReliablePdu.cs
diff --git a/CSharpDis7/AcousticEmitter.cs b/Libs/CSharpDis7/AcousticEmitter.cs
similarity index 100%
rename from CSharpDis7/AcousticEmitter.cs
rename to Libs/CSharpDis7/AcousticEmitter.cs
diff --git a/CSharpDis7/ActionRequestPdu.cs b/Libs/CSharpDis7/ActionRequestPdu.cs
similarity index 100%
rename from CSharpDis7/ActionRequestPdu.cs
rename to Libs/CSharpDis7/ActionRequestPdu.cs
diff --git a/CSharpDis7/ActionRequestReliablePdu.cs b/Libs/CSharpDis7/ActionRequestReliablePdu.cs
similarity index 100%
rename from CSharpDis7/ActionRequestReliablePdu.cs
rename to Libs/CSharpDis7/ActionRequestReliablePdu.cs
diff --git a/CSharpDis7/ActionResponsePdu.cs b/Libs/CSharpDis7/ActionResponsePdu.cs
similarity index 100%
rename from CSharpDis7/ActionResponsePdu.cs
rename to Libs/CSharpDis7/ActionResponsePdu.cs
diff --git a/CSharpDis7/ActionResponseReliablePdu.cs b/Libs/CSharpDis7/ActionResponseReliablePdu.cs
similarity index 100%
rename from CSharpDis7/ActionResponseReliablePdu.cs
rename to Libs/CSharpDis7/ActionResponseReliablePdu.cs
diff --git a/CSharpDis7/AggregateIdentifier.cs b/Libs/CSharpDis7/AggregateIdentifier.cs
similarity index 100%
rename from CSharpDis7/AggregateIdentifier.cs
rename to Libs/CSharpDis7/AggregateIdentifier.cs
diff --git a/CSharpDis7/AggregateMarking.cs b/Libs/CSharpDis7/AggregateMarking.cs
similarity index 100%
rename from CSharpDis7/AggregateMarking.cs
rename to Libs/CSharpDis7/AggregateMarking.cs
diff --git a/CSharpDis7/AggregateType.cs b/Libs/CSharpDis7/AggregateType.cs
similarity index 100%
rename from CSharpDis7/AggregateType.cs
rename to Libs/CSharpDis7/AggregateType.cs
diff --git a/CSharpDis7/AngleDeception.cs b/Libs/CSharpDis7/AngleDeception.cs
similarity index 100%
rename from CSharpDis7/AngleDeception.cs
rename to Libs/CSharpDis7/AngleDeception.cs
diff --git a/CSharpDis7/AngularVelocityVector.cs b/Libs/CSharpDis7/AngularVelocityVector.cs
similarity index 100%
rename from CSharpDis7/AngularVelocityVector.cs
rename to Libs/CSharpDis7/AngularVelocityVector.cs
diff --git a/CSharpDis7/AntennaLocation.cs b/Libs/CSharpDis7/AntennaLocation.cs
similarity index 100%
rename from CSharpDis7/AntennaLocation.cs
rename to Libs/CSharpDis7/AntennaLocation.cs
diff --git a/CSharpDis7/ArealObjectStatePdu.cs b/Libs/CSharpDis7/ArealObjectStatePdu.cs
similarity index 100%
rename from CSharpDis7/ArealObjectStatePdu.cs
rename to Libs/CSharpDis7/ArealObjectStatePdu.cs
diff --git a/CSharpDis7/ArticulatedParts.cs b/Libs/CSharpDis7/ArticulatedParts.cs
similarity index 100%
rename from CSharpDis7/ArticulatedParts.cs
rename to Libs/CSharpDis7/ArticulatedParts.cs
diff --git a/CSharpDis7/Association.cs b/Libs/CSharpDis7/Association.cs
similarity index 100%
rename from CSharpDis7/Association.cs
rename to Libs/CSharpDis7/Association.cs
diff --git a/CSharpDis7/AttachedParts.cs b/Libs/CSharpDis7/AttachedParts.cs
similarity index 100%
rename from CSharpDis7/AttachedParts.cs
rename to Libs/CSharpDis7/AttachedParts.cs
diff --git a/CSharpDis7/Attribute.cs b/Libs/CSharpDis7/Attribute.cs
similarity index 100%
rename from CSharpDis7/Attribute.cs
rename to Libs/CSharpDis7/Attribute.cs
diff --git a/CSharpDis7/AttributePdu.cs b/Libs/CSharpDis7/AttributePdu.cs
similarity index 100%
rename from CSharpDis7/AttributePdu.cs
rename to Libs/CSharpDis7/AttributePdu.cs
diff --git a/CSharpDis7/BeamAntennaPattern.cs b/Libs/CSharpDis7/BeamAntennaPattern.cs
similarity index 100%
rename from CSharpDis7/BeamAntennaPattern.cs
rename to Libs/CSharpDis7/BeamAntennaPattern.cs
diff --git a/CSharpDis7/BeamData.cs b/Libs/CSharpDis7/BeamData.cs
similarity index 100%
rename from CSharpDis7/BeamData.cs
rename to Libs/CSharpDis7/BeamData.cs
diff --git a/CSharpDis7/BeamStatus.cs b/Libs/CSharpDis7/BeamStatus.cs
similarity index 100%
rename from CSharpDis7/BeamStatus.cs
rename to Libs/CSharpDis7/BeamStatus.cs
diff --git a/CSharpDis7/BlankingSector.cs b/Libs/CSharpDis7/BlankingSector.cs
similarity index 100%
rename from CSharpDis7/BlankingSector.cs
rename to Libs/CSharpDis7/BlankingSector.cs
diff --git a/CSharpDis7/ChangeOptions.cs b/Libs/CSharpDis7/ChangeOptions.cs
similarity index 100%
rename from CSharpDis7/ChangeOptions.cs
rename to Libs/CSharpDis7/ChangeOptions.cs
diff --git a/CSharpDis7/ClockTime.cs b/Libs/CSharpDis7/ClockTime.cs
similarity index 100%
rename from CSharpDis7/ClockTime.cs
rename to Libs/CSharpDis7/ClockTime.cs
diff --git a/CSharpDis7/CollisionElasticPdu.cs b/Libs/CSharpDis7/CollisionElasticPdu.cs
similarity index 100%
rename from CSharpDis7/CollisionElasticPdu.cs
rename to Libs/CSharpDis7/CollisionElasticPdu.cs
diff --git a/CSharpDis7/CollisionPdu.cs b/Libs/CSharpDis7/CollisionPdu.cs
similarity index 100%
rename from CSharpDis7/CollisionPdu.cs
rename to Libs/CSharpDis7/CollisionPdu.cs
diff --git a/CSharpDis7/CommentPdu.cs b/Libs/CSharpDis7/CommentPdu.cs
similarity index 100%
rename from CSharpDis7/CommentPdu.cs
rename to Libs/CSharpDis7/CommentPdu.cs
diff --git a/CSharpDis7/CommentReliablePdu.cs b/Libs/CSharpDis7/CommentReliablePdu.cs
similarity index 100%
rename from CSharpDis7/CommentReliablePdu.cs
rename to Libs/CSharpDis7/CommentReliablePdu.cs
diff --git a/CSharpDis7/CommunicationsNodeID.cs b/Libs/CSharpDis7/CommunicationsNodeID.cs
similarity index 100%
rename from CSharpDis7/CommunicationsNodeID.cs
rename to Libs/CSharpDis7/CommunicationsNodeID.cs
diff --git a/CSharpDis7/CreateEntityPdu.cs b/Libs/CSharpDis7/CreateEntityPdu.cs
similarity index 100%
rename from CSharpDis7/CreateEntityPdu.cs
rename to Libs/CSharpDis7/CreateEntityPdu.cs
diff --git a/CSharpDis7/CreateEntityReliablePdu.cs b/Libs/CSharpDis7/CreateEntityReliablePdu.cs
similarity index 100%
rename from CSharpDis7/CreateEntityReliablePdu.cs
rename to Libs/CSharpDis7/CreateEntityReliablePdu.cs
diff --git a/CSharpDis7/DataPdu.cs b/Libs/CSharpDis7/DataPdu.cs
similarity index 100%
rename from CSharpDis7/DataPdu.cs
rename to Libs/CSharpDis7/DataPdu.cs
diff --git a/CSharpDis7/DataQueryDatumSpecification.cs b/Libs/CSharpDis7/DataQueryDatumSpecification.cs
similarity index 100%
rename from CSharpDis7/DataQueryDatumSpecification.cs
rename to Libs/CSharpDis7/DataQueryDatumSpecification.cs
diff --git a/CSharpDis7/DataQueryPdu.cs b/Libs/CSharpDis7/DataQueryPdu.cs
similarity index 100%
rename from CSharpDis7/DataQueryPdu.cs
rename to Libs/CSharpDis7/DataQueryPdu.cs
diff --git a/CSharpDis7/DataQueryReliablePdu.cs b/Libs/CSharpDis7/DataQueryReliablePdu.cs
similarity index 100%
rename from CSharpDis7/DataQueryReliablePdu.cs
rename to Libs/CSharpDis7/DataQueryReliablePdu.cs
diff --git a/CSharpDis7/DataReliablePdu.cs b/Libs/CSharpDis7/DataReliablePdu.cs
similarity index 100%
rename from CSharpDis7/DataReliablePdu.cs
rename to Libs/CSharpDis7/DataReliablePdu.cs
diff --git a/CSharpDis7/DatumSpecification.cs b/Libs/CSharpDis7/DatumSpecification.cs
similarity index 100%
rename from CSharpDis7/DatumSpecification.cs
rename to Libs/CSharpDis7/DatumSpecification.cs
diff --git a/CSharpDis7/DeadReckoningParameters.cs b/Libs/CSharpDis7/DeadReckoningParameters.cs
similarity index 100%
rename from CSharpDis7/DeadReckoningParameters.cs
rename to Libs/CSharpDis7/DeadReckoningParameters.cs
diff --git a/CSharpDis7/DesignatorPdu.cs b/Libs/CSharpDis7/DesignatorPdu.cs
similarity index 100%
rename from CSharpDis7/DesignatorPdu.cs
rename to Libs/CSharpDis7/DesignatorPdu.cs
diff --git a/CSharpDis7/DetonationPdu.cs b/Libs/CSharpDis7/DetonationPdu.cs
similarity index 100%
rename from CSharpDis7/DetonationPdu.cs
rename to Libs/CSharpDis7/DetonationPdu.cs
diff --git a/CSharpDis7/DirectedEnergyAreaAimpoint.cs b/Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
similarity index 100%
rename from CSharpDis7/DirectedEnergyAreaAimpoint.cs
rename to Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
diff --git a/CSharpDis7/DirectedEnergyDamage.cs b/Libs/CSharpDis7/DirectedEnergyDamage.cs
similarity index 100%
rename from CSharpDis7/DirectedEnergyDamage.cs
rename to Libs/CSharpDis7/DirectedEnergyDamage.cs
diff --git a/CSharpDis7/DirectedEnergyFirePdu.cs b/Libs/CSharpDis7/DirectedEnergyFirePdu.cs
similarity index 100%
rename from CSharpDis7/DirectedEnergyFirePdu.cs
rename to Libs/CSharpDis7/DirectedEnergyFirePdu.cs
diff --git a/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs b/Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
similarity index 100%
rename from CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
rename to Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
diff --git a/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs b/Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
similarity index 100%
rename from CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
rename to Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
diff --git a/CSharpDis7/DistributedEmissionsFamilyPdu.cs b/Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/DistributedEmissionsFamilyPdu.cs
rename to Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
diff --git a/CSharpDis7/EEFundamentalParameterData.cs b/Libs/CSharpDis7/EEFundamentalParameterData.cs
similarity index 100%
rename from CSharpDis7/EEFundamentalParameterData.cs
rename to Libs/CSharpDis7/EEFundamentalParameterData.cs
diff --git a/CSharpDis7/EightByteChunk.cs b/Libs/CSharpDis7/EightByteChunk.cs
similarity index 100%
rename from CSharpDis7/EightByteChunk.cs
rename to Libs/CSharpDis7/EightByteChunk.cs
diff --git a/CSharpDis7/ElectronicEmissionsPdu.cs b/Libs/CSharpDis7/ElectronicEmissionsPdu.cs
similarity index 100%
rename from CSharpDis7/ElectronicEmissionsPdu.cs
rename to Libs/CSharpDis7/ElectronicEmissionsPdu.cs
diff --git a/CSharpDis7/EmitterSystem.cs b/Libs/CSharpDis7/EmitterSystem.cs
similarity index 100%
rename from CSharpDis7/EmitterSystem.cs
rename to Libs/CSharpDis7/EmitterSystem.cs
diff --git a/CSharpDis7/EngineFuel.cs b/Libs/CSharpDis7/EngineFuel.cs
similarity index 100%
rename from CSharpDis7/EngineFuel.cs
rename to Libs/CSharpDis7/EngineFuel.cs
diff --git a/CSharpDis7/EngineFuelReload.cs b/Libs/CSharpDis7/EngineFuelReload.cs
similarity index 100%
rename from CSharpDis7/EngineFuelReload.cs
rename to Libs/CSharpDis7/EngineFuelReload.cs
diff --git a/CSharpDis7/EntityAssociation.cs b/Libs/CSharpDis7/EntityAssociation.cs
similarity index 100%
rename from CSharpDis7/EntityAssociation.cs
rename to Libs/CSharpDis7/EntityAssociation.cs
diff --git a/CSharpDis7/EntityDamageStatusPdu.cs b/Libs/CSharpDis7/EntityDamageStatusPdu.cs
similarity index 100%
rename from CSharpDis7/EntityDamageStatusPdu.cs
rename to Libs/CSharpDis7/EntityDamageStatusPdu.cs
diff --git a/CSharpDis7/EntityID.cs b/Libs/CSharpDis7/EntityID.cs
similarity index 100%
rename from CSharpDis7/EntityID.cs
rename to Libs/CSharpDis7/EntityID.cs
diff --git a/CSharpDis7/EntityInformationFamilyPdu.cs b/Libs/CSharpDis7/EntityInformationFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/EntityInformationFamilyPdu.cs
rename to Libs/CSharpDis7/EntityInformationFamilyPdu.cs
diff --git a/CSharpDis7/EntityManagementFamilyPdu.cs b/Libs/CSharpDis7/EntityManagementFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/EntityManagementFamilyPdu.cs
rename to Libs/CSharpDis7/EntityManagementFamilyPdu.cs
diff --git a/CSharpDis7/EntityMarking.cs b/Libs/CSharpDis7/EntityMarking.cs
similarity index 100%
rename from CSharpDis7/EntityMarking.cs
rename to Libs/CSharpDis7/EntityMarking.cs
diff --git a/CSharpDis7/EntityStatePdu.cs b/Libs/CSharpDis7/EntityStatePdu.cs
similarity index 100%
rename from CSharpDis7/EntityStatePdu.cs
rename to Libs/CSharpDis7/EntityStatePdu.cs
diff --git a/CSharpDis7/EntityStateUpdatePdu.cs b/Libs/CSharpDis7/EntityStateUpdatePdu.cs
similarity index 100%
rename from CSharpDis7/EntityStateUpdatePdu.cs
rename to Libs/CSharpDis7/EntityStateUpdatePdu.cs
diff --git a/CSharpDis7/EntityType.cs b/Libs/CSharpDis7/EntityType.cs
similarity index 100%
rename from CSharpDis7/EntityType.cs
rename to Libs/CSharpDis7/EntityType.cs
diff --git a/CSharpDis7/EntityTypeVP.cs b/Libs/CSharpDis7/EntityTypeVP.cs
similarity index 100%
rename from CSharpDis7/EntityTypeVP.cs
rename to Libs/CSharpDis7/EntityTypeVP.cs
diff --git a/CSharpDis7/Environment.cs b/Libs/CSharpDis7/Environment.cs
similarity index 100%
rename from CSharpDis7/Environment.cs
rename to Libs/CSharpDis7/Environment.cs
diff --git a/CSharpDis7/EnvironmentGeneral.cs b/Libs/CSharpDis7/EnvironmentGeneral.cs
similarity index 100%
rename from CSharpDis7/EnvironmentGeneral.cs
rename to Libs/CSharpDis7/EnvironmentGeneral.cs
diff --git a/CSharpDis7/EnvironmentType.cs b/Libs/CSharpDis7/EnvironmentType.cs
similarity index 100%
rename from CSharpDis7/EnvironmentType.cs
rename to Libs/CSharpDis7/EnvironmentType.cs
diff --git a/CSharpDis7/EulerAngles.cs b/Libs/CSharpDis7/EulerAngles.cs
similarity index 100%
rename from CSharpDis7/EulerAngles.cs
rename to Libs/CSharpDis7/EulerAngles.cs
diff --git a/CSharpDis7/EventIdentifier.cs b/Libs/CSharpDis7/EventIdentifier.cs
similarity index 100%
rename from CSharpDis7/EventIdentifier.cs
rename to Libs/CSharpDis7/EventIdentifier.cs
diff --git a/CSharpDis7/EventIdentifierLiveEntity.cs b/Libs/CSharpDis7/EventIdentifierLiveEntity.cs
similarity index 100%
rename from CSharpDis7/EventIdentifierLiveEntity.cs
rename to Libs/CSharpDis7/EventIdentifierLiveEntity.cs
diff --git a/CSharpDis7/EventReportPdu.cs b/Libs/CSharpDis7/EventReportPdu.cs
similarity index 100%
rename from CSharpDis7/EventReportPdu.cs
rename to Libs/CSharpDis7/EventReportPdu.cs
diff --git a/CSharpDis7/EventReportReliablePdu.cs b/Libs/CSharpDis7/EventReportReliablePdu.cs
similarity index 100%
rename from CSharpDis7/EventReportReliablePdu.cs
rename to Libs/CSharpDis7/EventReportReliablePdu.cs
diff --git a/CSharpDis7/Expendable.cs b/Libs/CSharpDis7/Expendable.cs
similarity index 100%
rename from CSharpDis7/Expendable.cs
rename to Libs/CSharpDis7/Expendable.cs
diff --git a/CSharpDis7/ExpendableDescriptor.cs b/Libs/CSharpDis7/ExpendableDescriptor.cs
similarity index 100%
rename from CSharpDis7/ExpendableDescriptor.cs
rename to Libs/CSharpDis7/ExpendableDescriptor.cs
diff --git a/CSharpDis7/ExpendableReload.cs b/Libs/CSharpDis7/ExpendableReload.cs
similarity index 100%
rename from CSharpDis7/ExpendableReload.cs
rename to Libs/CSharpDis7/ExpendableReload.cs
diff --git a/CSharpDis7/ExplosionDescriptor.cs b/Libs/CSharpDis7/ExplosionDescriptor.cs
similarity index 100%
rename from CSharpDis7/ExplosionDescriptor.cs
rename to Libs/CSharpDis7/ExplosionDescriptor.cs
diff --git a/CSharpDis7/FalseTargetsAttribute.cs b/Libs/CSharpDis7/FalseTargetsAttribute.cs
similarity index 100%
rename from CSharpDis7/FalseTargetsAttribute.cs
rename to Libs/CSharpDis7/FalseTargetsAttribute.cs
diff --git a/CSharpDis7/FastEntityStatePdu.cs b/Libs/CSharpDis7/FastEntityStatePdu.cs
similarity index 100%
rename from CSharpDis7/FastEntityStatePdu.cs
rename to Libs/CSharpDis7/FastEntityStatePdu.cs
diff --git a/CSharpDis7/FirePdu.cs b/Libs/CSharpDis7/FirePdu.cs
similarity index 100%
rename from CSharpDis7/FirePdu.cs
rename to Libs/CSharpDis7/FirePdu.cs
diff --git a/CSharpDis7/FixedDatum.cs b/Libs/CSharpDis7/FixedDatum.cs
similarity index 100%
rename from CSharpDis7/FixedDatum.cs
rename to Libs/CSharpDis7/FixedDatum.cs
diff --git a/CSharpDis7/FourByteChunk.cs b/Libs/CSharpDis7/FourByteChunk.cs
similarity index 100%
rename from CSharpDis7/FourByteChunk.cs
rename to Libs/CSharpDis7/FourByteChunk.cs
diff --git a/CSharpDis7/FundamentalOperationalData.cs b/Libs/CSharpDis7/FundamentalOperationalData.cs
similarity index 100%
rename from CSharpDis7/FundamentalOperationalData.cs
rename to Libs/CSharpDis7/FundamentalOperationalData.cs
diff --git a/CSharpDis7/GridAxis.cs b/Libs/CSharpDis7/GridAxis.cs
similarity index 100%
rename from CSharpDis7/GridAxis.cs
rename to Libs/CSharpDis7/GridAxis.cs
diff --git a/CSharpDis7/GroupIdentifier.cs b/Libs/CSharpDis7/GroupIdentifier.cs
similarity index 100%
rename from CSharpDis7/GroupIdentifier.cs
rename to Libs/CSharpDis7/GroupIdentifier.cs
diff --git a/CSharpDis7/IFFFundamentalParameterData.cs b/Libs/CSharpDis7/IFFFundamentalParameterData.cs
similarity index 100%
rename from CSharpDis7/IFFFundamentalParameterData.cs
rename to Libs/CSharpDis7/IFFFundamentalParameterData.cs
diff --git a/CSharpDis7/IOCommunicationsNode.cs b/Libs/CSharpDis7/IOCommunicationsNode.cs
similarity index 100%
rename from CSharpDis7/IOCommunicationsNode.cs
rename to Libs/CSharpDis7/IOCommunicationsNode.cs
diff --git a/CSharpDis7/IOEffect.cs b/Libs/CSharpDis7/IOEffect.cs
similarity index 100%
rename from CSharpDis7/IOEffect.cs
rename to Libs/CSharpDis7/IOEffect.cs
diff --git a/CSharpDis7/IffDataSpecification.cs b/Libs/CSharpDis7/IffDataSpecification.cs
similarity index 100%
rename from CSharpDis7/IffDataSpecification.cs
rename to Libs/CSharpDis7/IffDataSpecification.cs
diff --git a/CSharpDis7/IntercomCommunicationsParameters.cs b/Libs/CSharpDis7/IntercomCommunicationsParameters.cs
similarity index 100%
rename from CSharpDis7/IntercomCommunicationsParameters.cs
rename to Libs/CSharpDis7/IntercomCommunicationsParameters.cs
diff --git a/CSharpDis7/IntercomIdentifier.cs b/Libs/CSharpDis7/IntercomIdentifier.cs
similarity index 100%
rename from CSharpDis7/IntercomIdentifier.cs
rename to Libs/CSharpDis7/IntercomIdentifier.cs
diff --git a/CSharpDis7/IntercomSignalPdu.cs b/Libs/CSharpDis7/IntercomSignalPdu.cs
similarity index 100%
rename from CSharpDis7/IntercomSignalPdu.cs
rename to Libs/CSharpDis7/IntercomSignalPdu.cs
diff --git a/CSharpDis7/IsPartOfPdu.cs b/Libs/CSharpDis7/IsPartOfPdu.cs
similarity index 100%
rename from CSharpDis7/IsPartOfPdu.cs
rename to Libs/CSharpDis7/IsPartOfPdu.cs
diff --git a/CSharpDis7/JammingTechnique.cs b/Libs/CSharpDis7/JammingTechnique.cs
similarity index 100%
rename from CSharpDis7/JammingTechnique.cs
rename to Libs/CSharpDis7/JammingTechnique.cs
diff --git a/CSharpDis7/LaunchedMunitionRecord.cs b/Libs/CSharpDis7/LaunchedMunitionRecord.cs
similarity index 100%
rename from CSharpDis7/LaunchedMunitionRecord.cs
rename to Libs/CSharpDis7/LaunchedMunitionRecord.cs
diff --git a/CSharpDis7/LayerHeader.cs b/Libs/CSharpDis7/LayerHeader.cs
similarity index 100%
rename from CSharpDis7/LayerHeader.cs
rename to Libs/CSharpDis7/LayerHeader.cs
diff --git a/CSharpDis7/LinearObjectStatePdu.cs b/Libs/CSharpDis7/LinearObjectStatePdu.cs
similarity index 100%
rename from CSharpDis7/LinearObjectStatePdu.cs
rename to Libs/CSharpDis7/LinearObjectStatePdu.cs
diff --git a/CSharpDis7/LinearSegmentParameter.cs b/Libs/CSharpDis7/LinearSegmentParameter.cs
similarity index 100%
rename from CSharpDis7/LinearSegmentParameter.cs
rename to Libs/CSharpDis7/LinearSegmentParameter.cs
diff --git a/CSharpDis7/LiveEntityIdentifier.cs b/Libs/CSharpDis7/LiveEntityIdentifier.cs
similarity index 100%
rename from CSharpDis7/LiveEntityIdentifier.cs
rename to Libs/CSharpDis7/LiveEntityIdentifier.cs
diff --git a/CSharpDis7/LiveEntityPdu.cs b/Libs/CSharpDis7/LiveEntityPdu.cs
similarity index 100%
rename from CSharpDis7/LiveEntityPdu.cs
rename to Libs/CSharpDis7/LiveEntityPdu.cs
diff --git a/CSharpDis7/LiveSimulationAddress.cs b/Libs/CSharpDis7/LiveSimulationAddress.cs
similarity index 100%
rename from CSharpDis7/LiveSimulationAddress.cs
rename to Libs/CSharpDis7/LiveSimulationAddress.cs
diff --git a/CSharpDis7/LogisticsFamilyPdu.cs b/Libs/CSharpDis7/LogisticsFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/LogisticsFamilyPdu.cs
rename to Libs/CSharpDis7/LogisticsFamilyPdu.cs
diff --git a/CSharpDis7/MineEntityIdentifier.cs b/Libs/CSharpDis7/MineEntityIdentifier.cs
similarity index 100%
rename from CSharpDis7/MineEntityIdentifier.cs
rename to Libs/CSharpDis7/MineEntityIdentifier.cs
diff --git a/CSharpDis7/MinefieldFamilyPdu.cs b/Libs/CSharpDis7/MinefieldFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/MinefieldFamilyPdu.cs
rename to Libs/CSharpDis7/MinefieldFamilyPdu.cs
diff --git a/CSharpDis7/MinefieldIdentifier.cs b/Libs/CSharpDis7/MinefieldIdentifier.cs
similarity index 100%
rename from CSharpDis7/MinefieldIdentifier.cs
rename to Libs/CSharpDis7/MinefieldIdentifier.cs
diff --git a/CSharpDis7/MinefieldResponseNackPdu.cs b/Libs/CSharpDis7/MinefieldResponseNackPdu.cs
similarity index 100%
rename from CSharpDis7/MinefieldResponseNackPdu.cs
rename to Libs/CSharpDis7/MinefieldResponseNackPdu.cs
diff --git a/CSharpDis7/MinefieldStatePdu.cs b/Libs/CSharpDis7/MinefieldStatePdu.cs
similarity index 100%
rename from CSharpDis7/MinefieldStatePdu.cs
rename to Libs/CSharpDis7/MinefieldStatePdu.cs
diff --git a/CSharpDis7/ModulationParameters.cs b/Libs/CSharpDis7/ModulationParameters.cs
similarity index 100%
rename from CSharpDis7/ModulationParameters.cs
rename to Libs/CSharpDis7/ModulationParameters.cs
diff --git a/CSharpDis7/ModulationType.cs b/Libs/CSharpDis7/ModulationType.cs
similarity index 100%
rename from CSharpDis7/ModulationType.cs
rename to Libs/CSharpDis7/ModulationType.cs
diff --git a/CSharpDis7/Munition.cs b/Libs/CSharpDis7/Munition.cs
similarity index 100%
rename from CSharpDis7/Munition.cs
rename to Libs/CSharpDis7/Munition.cs
diff --git a/CSharpDis7/MunitionDescriptor.cs b/Libs/CSharpDis7/MunitionDescriptor.cs
similarity index 100%
rename from CSharpDis7/MunitionDescriptor.cs
rename to Libs/CSharpDis7/MunitionDescriptor.cs
diff --git a/CSharpDis7/MunitionReload.cs b/Libs/CSharpDis7/MunitionReload.cs
similarity index 100%
rename from CSharpDis7/MunitionReload.cs
rename to Libs/CSharpDis7/MunitionReload.cs
diff --git a/CSharpDis7/NamedLocationIdentification.cs b/Libs/CSharpDis7/NamedLocationIdentification.cs
similarity index 100%
rename from CSharpDis7/NamedLocationIdentification.cs
rename to Libs/CSharpDis7/NamedLocationIdentification.cs
diff --git a/CSharpDis7/ObjectIdentifier.cs b/Libs/CSharpDis7/ObjectIdentifier.cs
similarity index 100%
rename from CSharpDis7/ObjectIdentifier.cs
rename to Libs/CSharpDis7/ObjectIdentifier.cs
diff --git a/CSharpDis7/ObjectType.cs b/Libs/CSharpDis7/ObjectType.cs
similarity index 100%
rename from CSharpDis7/ObjectType.cs
rename to Libs/CSharpDis7/ObjectType.cs
diff --git a/CSharpDis7/OneByteChunk.cs b/Libs/CSharpDis7/OneByteChunk.cs
similarity index 100%
rename from CSharpDis7/OneByteChunk.cs
rename to Libs/CSharpDis7/OneByteChunk.cs
diff --git a/CSharpDis7/OwnershipStatus.cs b/Libs/CSharpDis7/OwnershipStatus.cs
similarity index 100%
rename from CSharpDis7/OwnershipStatus.cs
rename to Libs/CSharpDis7/OwnershipStatus.cs
diff --git a/CSharpDis7/Pdu.cs b/Libs/CSharpDis7/Pdu.cs
similarity index 100%
rename from CSharpDis7/Pdu.cs
rename to Libs/CSharpDis7/Pdu.cs
diff --git a/CSharpDis7/PduContainer.cs b/Libs/CSharpDis7/PduContainer.cs
similarity index 100%
rename from CSharpDis7/PduContainer.cs
rename to Libs/CSharpDis7/PduContainer.cs
diff --git a/CSharpDis7/PduHeader.cs b/Libs/CSharpDis7/PduHeader.cs
similarity index 100%
rename from CSharpDis7/PduHeader.cs
rename to Libs/CSharpDis7/PduHeader.cs
diff --git a/CSharpDis7/PduStatus.cs b/Libs/CSharpDis7/PduStatus.cs
similarity index 100%
rename from CSharpDis7/PduStatus.cs
rename to Libs/CSharpDis7/PduStatus.cs
diff --git a/CSharpDis7/PduSuperclass.cs b/Libs/CSharpDis7/PduSuperclass.cs
similarity index 100%
rename from CSharpDis7/PduSuperclass.cs
rename to Libs/CSharpDis7/PduSuperclass.cs
diff --git a/CSharpDis7/PointObjectStatePdu.cs b/Libs/CSharpDis7/PointObjectStatePdu.cs
similarity index 100%
rename from CSharpDis7/PointObjectStatePdu.cs
rename to Libs/CSharpDis7/PointObjectStatePdu.cs
diff --git a/CSharpDis7/PropulsionSystemData.cs b/Libs/CSharpDis7/PropulsionSystemData.cs
similarity index 100%
rename from CSharpDis7/PropulsionSystemData.cs
rename to Libs/CSharpDis7/PropulsionSystemData.cs
diff --git a/CSharpDis7/RadioCommunicationsFamilyPdu.cs b/Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/RadioCommunicationsFamilyPdu.cs
rename to Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
diff --git a/CSharpDis7/RadioIdentifier.cs b/Libs/CSharpDis7/RadioIdentifier.cs
similarity index 100%
rename from CSharpDis7/RadioIdentifier.cs
rename to Libs/CSharpDis7/RadioIdentifier.cs
diff --git a/CSharpDis7/RadioType.cs b/Libs/CSharpDis7/RadioType.cs
similarity index 100%
rename from CSharpDis7/RadioType.cs
rename to Libs/CSharpDis7/RadioType.cs
diff --git a/CSharpDis7/ReceiverPdu.cs b/Libs/CSharpDis7/ReceiverPdu.cs
similarity index 100%
rename from CSharpDis7/ReceiverPdu.cs
rename to Libs/CSharpDis7/ReceiverPdu.cs
diff --git a/CSharpDis7/RecordQueryReliablePdu.cs b/Libs/CSharpDis7/RecordQueryReliablePdu.cs
similarity index 100%
rename from CSharpDis7/RecordQueryReliablePdu.cs
rename to Libs/CSharpDis7/RecordQueryReliablePdu.cs
diff --git a/CSharpDis7/RecordQuerySpecification.cs b/Libs/CSharpDis7/RecordQuerySpecification.cs
similarity index 100%
rename from CSharpDis7/RecordQuerySpecification.cs
rename to Libs/CSharpDis7/RecordQuerySpecification.cs
diff --git a/CSharpDis7/RecordSpecification.cs b/Libs/CSharpDis7/RecordSpecification.cs
similarity index 100%
rename from CSharpDis7/RecordSpecification.cs
rename to Libs/CSharpDis7/RecordSpecification.cs
diff --git a/CSharpDis7/RecordSpecificationElement.cs b/Libs/CSharpDis7/RecordSpecificationElement.cs
similarity index 100%
rename from CSharpDis7/RecordSpecificationElement.cs
rename to Libs/CSharpDis7/RecordSpecificationElement.cs
diff --git a/CSharpDis7/Relationship.cs b/Libs/CSharpDis7/Relationship.cs
similarity index 100%
rename from CSharpDis7/Relationship.cs
rename to Libs/CSharpDis7/Relationship.cs
diff --git a/CSharpDis7/RemoveEntityPdu.cs b/Libs/CSharpDis7/RemoveEntityPdu.cs
similarity index 100%
rename from CSharpDis7/RemoveEntityPdu.cs
rename to Libs/CSharpDis7/RemoveEntityPdu.cs
diff --git a/CSharpDis7/RemoveEntityReliablePdu.cs b/Libs/CSharpDis7/RemoveEntityReliablePdu.cs
similarity index 100%
rename from CSharpDis7/RemoveEntityReliablePdu.cs
rename to Libs/CSharpDis7/RemoveEntityReliablePdu.cs
diff --git a/CSharpDis7/RepairCompletePdu.cs b/Libs/CSharpDis7/RepairCompletePdu.cs
similarity index 100%
rename from CSharpDis7/RepairCompletePdu.cs
rename to Libs/CSharpDis7/RepairCompletePdu.cs
diff --git a/CSharpDis7/RepairResponsePdu.cs b/Libs/CSharpDis7/RepairResponsePdu.cs
similarity index 100%
rename from CSharpDis7/RepairResponsePdu.cs
rename to Libs/CSharpDis7/RepairResponsePdu.cs
diff --git a/CSharpDis7/ResupplyOfferPdu.cs b/Libs/CSharpDis7/ResupplyOfferPdu.cs
similarity index 100%
rename from CSharpDis7/ResupplyOfferPdu.cs
rename to Libs/CSharpDis7/ResupplyOfferPdu.cs
diff --git a/CSharpDis7/ResupplyReceivedPdu.cs b/Libs/CSharpDis7/ResupplyReceivedPdu.cs
similarity index 100%
rename from CSharpDis7/ResupplyReceivedPdu.cs
rename to Libs/CSharpDis7/ResupplyReceivedPdu.cs
diff --git a/CSharpDis7/SecondaryOperationalData.cs b/Libs/CSharpDis7/SecondaryOperationalData.cs
similarity index 100%
rename from CSharpDis7/SecondaryOperationalData.cs
rename to Libs/CSharpDis7/SecondaryOperationalData.cs
diff --git a/CSharpDis7/SeesPdu.cs b/Libs/CSharpDis7/SeesPdu.cs
similarity index 100%
rename from CSharpDis7/SeesPdu.cs
rename to Libs/CSharpDis7/SeesPdu.cs
diff --git a/CSharpDis7/Sensor.cs b/Libs/CSharpDis7/Sensor.cs
similarity index 100%
rename from CSharpDis7/Sensor.cs
rename to Libs/CSharpDis7/Sensor.cs
diff --git a/CSharpDis7/SeparationVP.cs b/Libs/CSharpDis7/SeparationVP.cs
similarity index 100%
rename from CSharpDis7/SeparationVP.cs
rename to Libs/CSharpDis7/SeparationVP.cs
diff --git a/CSharpDis7/ServiceRequestPdu.cs b/Libs/CSharpDis7/ServiceRequestPdu.cs
similarity index 100%
rename from CSharpDis7/ServiceRequestPdu.cs
rename to Libs/CSharpDis7/ServiceRequestPdu.cs
diff --git a/CSharpDis7/SetDataPdu.cs b/Libs/CSharpDis7/SetDataPdu.cs
similarity index 100%
rename from CSharpDis7/SetDataPdu.cs
rename to Libs/CSharpDis7/SetDataPdu.cs
diff --git a/CSharpDis7/SetDataReliablePdu.cs b/Libs/CSharpDis7/SetDataReliablePdu.cs
similarity index 100%
rename from CSharpDis7/SetDataReliablePdu.cs
rename to Libs/CSharpDis7/SetDataReliablePdu.cs
diff --git a/CSharpDis7/SimulationAddress.cs b/Libs/CSharpDis7/SimulationAddress.cs
similarity index 100%
rename from CSharpDis7/SimulationAddress.cs
rename to Libs/CSharpDis7/SimulationAddress.cs
diff --git a/CSharpDis7/SimulationIdentifier.cs b/Libs/CSharpDis7/SimulationIdentifier.cs
similarity index 100%
rename from CSharpDis7/SimulationIdentifier.cs
rename to Libs/CSharpDis7/SimulationIdentifier.cs
diff --git a/CSharpDis7/SimulationManagementFamilyPdu.cs b/Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/SimulationManagementFamilyPdu.cs
rename to Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
diff --git a/CSharpDis7/SimulationManagementPduHeader.cs b/Libs/CSharpDis7/SimulationManagementPduHeader.cs
similarity index 100%
rename from CSharpDis7/SimulationManagementPduHeader.cs
rename to Libs/CSharpDis7/SimulationManagementPduHeader.cs
diff --git a/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs b/Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
rename to Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
diff --git a/CSharpDis7/StandardVariableSpecification.cs b/Libs/CSharpDis7/StandardVariableSpecification.cs
similarity index 100%
rename from CSharpDis7/StandardVariableSpecification.cs
rename to Libs/CSharpDis7/StandardVariableSpecification.cs
diff --git a/CSharpDis7/StartResumePdu.cs b/Libs/CSharpDis7/StartResumePdu.cs
similarity index 100%
rename from CSharpDis7/StartResumePdu.cs
rename to Libs/CSharpDis7/StartResumePdu.cs
diff --git a/CSharpDis7/StartResumeReliablePdu.cs b/Libs/CSharpDis7/StartResumeReliablePdu.cs
similarity index 100%
rename from CSharpDis7/StartResumeReliablePdu.cs
rename to Libs/CSharpDis7/StartResumeReliablePdu.cs
diff --git a/CSharpDis7/StopFreezePdu.cs b/Libs/CSharpDis7/StopFreezePdu.cs
similarity index 100%
rename from CSharpDis7/StopFreezePdu.cs
rename to Libs/CSharpDis7/StopFreezePdu.cs
diff --git a/CSharpDis7/StopFreezeReliablePdu.cs b/Libs/CSharpDis7/StopFreezeReliablePdu.cs
similarity index 100%
rename from CSharpDis7/StopFreezeReliablePdu.cs
rename to Libs/CSharpDis7/StopFreezeReliablePdu.cs
diff --git a/CSharpDis7/StorageFuel.cs b/Libs/CSharpDis7/StorageFuel.cs
similarity index 100%
rename from CSharpDis7/StorageFuel.cs
rename to Libs/CSharpDis7/StorageFuel.cs
diff --git a/CSharpDis7/StorageFuelReload.cs b/Libs/CSharpDis7/StorageFuelReload.cs
similarity index 100%
rename from CSharpDis7/StorageFuelReload.cs
rename to Libs/CSharpDis7/StorageFuelReload.cs
diff --git a/CSharpDis7/SupplyQuantity.cs b/Libs/CSharpDis7/SupplyQuantity.cs
similarity index 100%
rename from CSharpDis7/SupplyQuantity.cs
rename to Libs/CSharpDis7/SupplyQuantity.cs
diff --git a/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs b/Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
rename to Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
diff --git a/CSharpDis7/SystemIdentifier.cs b/Libs/CSharpDis7/SystemIdentifier.cs
similarity index 100%
rename from CSharpDis7/SystemIdentifier.cs
rename to Libs/CSharpDis7/SystemIdentifier.cs
diff --git a/CSharpDis7/TotalRecordSets.cs b/Libs/CSharpDis7/TotalRecordSets.cs
similarity index 100%
rename from CSharpDis7/TotalRecordSets.cs
rename to Libs/CSharpDis7/TotalRecordSets.cs
diff --git a/CSharpDis7/TrackJamData.cs b/Libs/CSharpDis7/TrackJamData.cs
similarity index 100%
rename from CSharpDis7/TrackJamData.cs
rename to Libs/CSharpDis7/TrackJamData.cs
diff --git a/CSharpDis7/TwoByteChunk.cs b/Libs/CSharpDis7/TwoByteChunk.cs
similarity index 100%
rename from CSharpDis7/TwoByteChunk.cs
rename to Libs/CSharpDis7/TwoByteChunk.cs
diff --git a/CSharpDis7/UAFundamentalParameter.cs b/Libs/CSharpDis7/UAFundamentalParameter.cs
similarity index 100%
rename from CSharpDis7/UAFundamentalParameter.cs
rename to Libs/CSharpDis7/UAFundamentalParameter.cs
diff --git a/CSharpDis7/UaPdu.cs b/Libs/CSharpDis7/UaPdu.cs
similarity index 100%
rename from CSharpDis7/UaPdu.cs
rename to Libs/CSharpDis7/UaPdu.cs
diff --git a/CSharpDis7/UnattachedIdentifier.cs b/Libs/CSharpDis7/UnattachedIdentifier.cs
similarity index 100%
rename from CSharpDis7/UnattachedIdentifier.cs
rename to Libs/CSharpDis7/UnattachedIdentifier.cs
diff --git a/CSharpDis7/UnsignedDISInteger.cs b/Libs/CSharpDis7/UnsignedDISInteger.cs
similarity index 100%
rename from CSharpDis7/UnsignedDISInteger.cs
rename to Libs/CSharpDis7/UnsignedDISInteger.cs
diff --git a/CSharpDis7/VariableDatum.cs b/Libs/CSharpDis7/VariableDatum.cs
similarity index 100%
rename from CSharpDis7/VariableDatum.cs
rename to Libs/CSharpDis7/VariableDatum.cs
diff --git a/CSharpDis7/VariableParameter.cs b/Libs/CSharpDis7/VariableParameter.cs
similarity index 100%
rename from CSharpDis7/VariableParameter.cs
rename to Libs/CSharpDis7/VariableParameter.cs
diff --git a/CSharpDis7/VariableTransmitterParameters.cs b/Libs/CSharpDis7/VariableTransmitterParameters.cs
similarity index 100%
rename from CSharpDis7/VariableTransmitterParameters.cs
rename to Libs/CSharpDis7/VariableTransmitterParameters.cs
diff --git a/CSharpDis7/Vector2Float.cs b/Libs/CSharpDis7/Vector2Float.cs
similarity index 100%
rename from CSharpDis7/Vector2Float.cs
rename to Libs/CSharpDis7/Vector2Float.cs
diff --git a/CSharpDis7/Vector3Double.cs b/Libs/CSharpDis7/Vector3Double.cs
similarity index 100%
rename from CSharpDis7/Vector3Double.cs
rename to Libs/CSharpDis7/Vector3Double.cs
diff --git a/CSharpDis7/Vector3Float.cs b/Libs/CSharpDis7/Vector3Float.cs
similarity index 100%
rename from CSharpDis7/Vector3Float.cs
rename to Libs/CSharpDis7/Vector3Float.cs
diff --git a/CSharpDis7/VectoringNozzleSystem.cs b/Libs/CSharpDis7/VectoringNozzleSystem.cs
similarity index 100%
rename from CSharpDis7/VectoringNozzleSystem.cs
rename to Libs/CSharpDis7/VectoringNozzleSystem.cs
diff --git a/CSharpDis7/WarfareFamilyPdu.cs b/Libs/CSharpDis7/WarfareFamilyPdu.cs
similarity index 100%
rename from CSharpDis7/WarfareFamilyPdu.cs
rename to Libs/CSharpDis7/WarfareFamilyPdu.cs

From 8e8462a52de0887ee50c139cb97b6824082e32a6 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sat, 9 Oct 2021 10:10:00 +0200
Subject: [PATCH 05/25] [BLD] Move all samples to a dedicated directory

---
 .../bin/Debug/OpenDis.Demo.vshost.exe         | Bin 11600 -> 0 bytes
 .../Debug/OpenDis.Demo.vshost.exe.manifest    |  11 -
 .../Debug/OpenDis.Demo_MarkupCompile.i.cache  |  20 -
 .../Debug/OpenDis.Demo_MarkupCompile.i.lref   |   4 -
 .../EspduReceiver/EspduReceiver.cs            | 350 +++++++--------
 .../OpenDis.EspduReceiver.csproj              | 124 +++---
 .../EspduReceiver/Properties/AssemblyInfo.cs  |  72 +--
 .../EspduSender/EspduSender.cs                | 418 +++++++++---------
 .../EspduSender/OpenDis.EspduSender.csproj    | 124 +++---
 .../EspduSender/Properties/AssemblyInfo.cs    |  72 +--
 .../OpenDis.Demo/App.xaml                     |  16 +-
 .../OpenDis.Demo/App.xaml.cs                  |  32 +-
 .../OpenDis.Demo/MainWindow.xaml              | 262 +++++------
 .../OpenDis.Demo/MainWindow.xaml.cs           | 294 ++++++------
 .../OpenDis.Demo/OpenDis.Demo.csproj          | 216 ++++-----
 .../OpenDis.Demo/Properties/AssemblyInfo.cs   | 110 ++---
 .../Properties/Resources.Designer.cs          | 142 +++---
 .../OpenDis.Demo/Properties/Resources.resx    | 232 +++++-----
 .../Properties/Settings.Designer.cs           |  60 +--
 .../OpenDis.Demo/Properties/Settings.settings |  12 +-
 20 files changed, 1268 insertions(+), 1303 deletions(-)
 delete mode 100644 Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe
 delete mode 100644 Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest
 delete mode 100644 Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache
 delete mode 100644 Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref
 rename {Libs/CsharpDis6 => Samples}/EspduReceiver/EspduReceiver.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/EspduReceiver/OpenDis.EspduReceiver.csproj (97%)
 rename {Libs/CsharpDis6 => Samples}/EspduReceiver/Properties/AssemblyInfo.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/EspduSender/EspduSender.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/EspduSender/OpenDis.EspduSender.csproj (97%)
 rename {Libs/CsharpDis6 => Samples}/EspduSender/Properties/AssemblyInfo.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/App.xaml (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/App.xaml.cs (94%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/MainWindow.xaml (98%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/MainWindow.xaml.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/OpenDis.Demo.csproj (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/Properties/AssemblyInfo.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/Properties/Resources.Designer.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/Properties/Resources.resx (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/Properties/Settings.Designer.cs (97%)
 rename {Libs/CsharpDis6 => Samples}/OpenDis.Demo/Properties/Settings.settings (97%)

diff --git a/Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe b/Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe
deleted file mode 100644
index bb84a51ac4f20534146c09f2fd9c928d15a903b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11600
zcmeG?2~<<bvVD`V$S$Cw0tQ(G#BjqRAcE|IvIiMOP(!#tBqT8jK@^ouKm}1$Tt*Rb
z8^HwyML`rDbyUD@+!e*qnNi$##Swqq%jz=o=A8fkyz~EgjkmhHy1Tl%s=B(mV?e|b
zL`MiQ;QRCmq5Y7P$&G@44bq@lV@Qn#s_N5Zv>)?tG75|5OPOMcC{DsnWb(K|p-9Gz
zCYX{WA(Jm;dIfQqiJ};SrLL}G(n&hl8zFy;j>apOj_;bS1<^27Oc^0Hz(7W(Czb%1
z@VUW90w!d%4!)s8@lWO`4L-o%@Fz33`3PxI|9bMyD%lrO3DBh`b_0^65V}%-gn|b^
zWm*RtcF<41tL^XP%x>1H-pWw-?KO@iBWB8={z?S^v{7pXzI!Jo%+8WXB|Jb<ytzR^
z5k3w0dL=gy2unf;M9`5G8Obv#1EdRIujGc1N3SYXJV(kE63H74DIjEokX;{yRH-^O
z8`+G4nH{2~Dt`e!ym>h<s#5Wh{iYWvx8H5Sc2P)xB%~ynMkw4dp2d9JZ?SRq$qyBy
zYpoVOdo0=4_GSvcwKXGEv)*fp$n0YEtBjC_S$j9xmMyi5JK>zz%$;+6FHiiU_~N3I
z3EN^9UtHuj{7z%|8vGH<%)(m1Ea7<jtnF`V4IC8vT7{3}OfQHvq?yC2RV<6lL4hh(
z22>^jMXH#Y>ya2$DiaMPF|c+I&NvSYVbqF9*~#r#ILj8dWjm251tb7C6J%*T7omHQ
z|3QZ`M<(G5<D_Jd7SIQ2qQ(<A=suLe+K}<s34UIXzk~W{a;%3y6b*GUK@}Sd9D;}u
zYBRM(z$Q8S;Epy*ZNMASfse$)bdXd!IaEXwQ3xm{3rz=j5Um4vj>5b{zd>0OBcT-q
z$5D_+!Bh&aq+kUFn<&Vjy~Gre83lc5<X9dB*V0mHil~WJLkmK8fMrGWjKU10*U(f@
z0(~f$U@kqGu1G-*R6~^?03^BXkR~Zr4AVjb&`^*gSv$uhThsNXQtP=&)rt@Sv@p~c
zO-0&hAix1&f+Vz{Fl-7sQP7=&eiRI$;3NuiDafbb3<{=DFdg6kw16rv1*n2n1Jp;`
z01gEWkeJ;RJb+fwub@+CAN?jefEws6=o)$jWfu5`G>nD5M>aGT=)?fZgOM>nV`Kqv
zI0bDf=!~2J<B7rns-j<E>||60WgZ0+&<Q9@(M5o>DGHhBHk2136`;HfS<u{2IdH&8
zBemU;NI4EeS|HQjjtT4ZBVE17zGu)#O7ftp?$p%}5TgS`F-Zc#70IRXBB{*QhDFRI
zkhf4KNeLG5g)$Vt=Sf6TQLKy=&X*=}1sqvY3}3|Zh0b8;!4eUVkV;XalqZr1_|b@y
zB9#$|C@6Y5!IL2tPbQL}04`tH*}w`-63Y0A1S_17NckcmkU(KvNgN^bfpdXK7D*D^
zWw3>!lVrq~L;Qp?LLw4#2#K5zlOj)1BCy1d77#r{JpDO<77O@Xp{xhn!4xZ$h!p@=
zFfDSIN{Pg1K}r~3)_Zst+KZ6#Bz!U1wTDViV=OmGAajRFq+hp^({qI>UpIiLVv=~h
zxay+kDH5kh_;K;yXzG;G*Tj7I0^&~_{e-b1Ng|izo-6pOSGO>vq9h3^M-Ep;2n2i?
z;VA;Ob9u6_h6EBx&>#pUI*0gkg>gyTxL$JaT8kGU;HGf+ao-Tzcp`=5x@Rq2jC5KA
zDL81CbnCa%R49SU_|be|v6omoM|<(PaYE7-c~ay>L?^|?aX&MN4jh;n*m;M|z$BDt
zLV?wpRH>I1yLLe*EkY6~5>Aj35>FW2!};IZ6RZg`l4U+2WpPr3Jg{aVFJ1yBKdala
z!{Q|bH-_8;-f}`H`;N<(`ErFZ0s_H?nELq^^AiFst^h{IAPxchk}HJW2r40D)L?1|
zN5+-NKyKu|BH5O9=>_$oO%{WM1RNkt$|LX>+U#yGW4SL{W#Dq<^-?pWTs<o?e4t&+
z0_Xto7s41!4AUS1O#wjP5VEM8R)S2x{iGqZ9LOk={srox9CtS9lSrqobiVDoV>_=s
z+sMi))7<${{lWc@(;pS&e4xt(nf|K_4fi<zzUJDcn@5`0To|ciL|dXN8T~$O#k^y8
zlC=s>C?yA3+_%vvY*l!4@4iv}=BM|c$3*(8Ejv=a+B_=Ss*JEQXuIqpixQ3a_4(W>
zyEKm#xtQrM)b=Fwn2Ghv>;fV#EMt&fQn_Nx)Omd`sf+@qw7IY%8d=~wU}z94&^xT#
z?O1hMy$gBFV<=2Rx4X%UFBOAX2ZDn_3e*V(5c0klQtL7p%59=S80yz;986D<L@bg}
zCWhb~Kqfs+=AjnM4u8t*aHvcYV}rACglsXyI=YS7)43NN7SmlIU{c;f%9MceC2}H$
z)xioI?}|@YY=qP?q)cG|3+D!g6bRu6h(wSjhD>8eMaINL%0wc8G%|*e$MEHmK74Q%
z!Aa2qJ`Z*(ODar2$dFuS7_I+z60R6Fg7-`wLHR_mTT!wUQ^u&61Y`_zfv7uESG-PI
zL=b$z5K9F^02Rvd;_$Xby>8#V-GB3vXN;}hekVw2b}%EC!sUQGG$K1h+L_tfM2e!P
zOCtHUjw8EKEOAUULMMT4SGq-(nO(Kd^R74+p{XEA@0kR39#JP2L9k*3WE=-K98<(}
zqe}k)-;w}E#jg-2r+wZ^?F0lS_7$G&N8TMKx*>Foia|&WS+)ZhjyMosg(Ghi3MD_V
zlt8Ha0ra7)2BA8})Ao*tk&JOg@{U+nBp*Xj>4<!&-Pl<tGcWispvpxOpu>k4odB9b
z6pKVuFB2+W3WHWIV5QK`MKb6of?7waV3?3D4|tM6FFxSozD0@ZgTuNz{_IdRDFbAO
z)M2bA&`X3r0!GVV7PvbAj0da~>bA%RB0vJogpW-A5a@S}5mS7nfE2jYc(OeJxZnXV
z<Y*DBL<WXV&LBZz3ie)s7d3y^%DrF)DK(Z4eS5F-ulO1L8I5qDApt5qGGfC@S=46>
z&=#?g6V$=wK<XGvN?b;b6T&(Ky;k#A^QHk645R_4A2o_xqZp-7T8IPb$$<VgSo`0X
z2Mc<;!~6osNnLhOky15MGUUqS0ApZg(soGQ1$Fi$HBa*1B}=kKYV@ylDL|$`BN%9i
zfNB!RUe;^%-`1r$>;MbkDI7SI!WeQ^CS`v~K!cP!6Ls~m0g03HCzBh+@8@%Usja`(
zRUhEh9p)q@kq8zn0BMtae6H~x8XbD4CjSrk|1SY%$D7f!QUCv!`kxhkEdlC{lSV^$
z#(*)3eJrzmv)`&?O0<%U0XU$nXc)#;#rr5K4A-F31}PvsUQuPZBF4Zn9B3G$Bm$p^
z+xEg};-+*Al`u;U)AZq(Ape5E<&Z}jc}SDTg)8}o8}*{e(B;nwSKrv~9H~AQdwjF4
zytOrcZE;D4HXF}iOv5wi{v~u8Mx&{)%KP37{uH^cp}uRh0dOQ{563MO=@S^LIzzi}
z*-Ueu1(WUM<nTp=&0-tk`W>CW9mBJY@F8S7T}Q7cHV+lSJGOh0EM6pm>nUzHKpl6$
z9c>`lvT>V;0qSfUsM-S(QUsnti42G+>d+=|*gAM$lA^MX%6D98JY3pjA|YD~*C3Hf
zI!d8LOrl5_)5VyI&Yv)5j2m?@HmHX&^2W*}Z{k3e8SLqfXJA8d^=>_4m;$0_V49#^
zOof(#VW>J~&gG~|Z>JyZwzIFlH?{XmuKzHk_$TifPtW_@znJ%9f`4fAtJSn01FrfB
ztW8{r!)J`EReh`HB{h53l@(|NA2%KTqU3jV<00qWP1>SYpB?DEdD*xjtD7pVhyFNj
zM5^doKSSp{CoQMuI*V7a&Lc3JPwm5ex9k;QIcq=E?BUJJcpq7ko;81Q#f$yRH=cFe
z5<Gvvu$;hV{0(w>b>h8C`l0N{0;jDkyEj#=T`F^;m(Gk`yGp8_z3auXm&^k}+WEW&
zt7|si1E186D{>Cz=$(lTNh#Zrb28j@eMWGuP+_<Ik=Z77p|LKj0~?3WwH0QKRXksO
zZd^7^n2k2o=iKJdz&x>y>1}xWTU-akX<*7w!&MZO!KM`yl<0Iky_CdajPx~l`pPt|
z$>+pR`I2Jekh!{h0v3O2*dY1m?JYwS9YKpmkIwCT-t`Ud(QP+eljKnc!#*(-a5`kT
z0g2FH^k?Wc8k~_M@#J04uOACs6XM0%=*4@6tCG!{3<hkY>|R?3Oanu+%XiKlXZGUE
z!9ZE*#9=baq{{4%<^IcOqJRgdAL`xYAJ-^NeM$2?aXP2*9jEc=`nqt@GoIHrFZ877
z<eE$R`&HKuR9}AOy5SCsIZq#Nk!~-z<+Rvk)%1goi5GHr8GpR};4;6@(%icCJE+#~
z<=fQvTG}jyhZaT4JQB=jR67>5D5;-{if^h*b5Dr<p|-kqvEAtxbgk4`uP?NC+@9Tj
z=g#)_H@7dTSBfte-VNI4SeiQGqRS0C)o2IW`t<3>3*JQX3MwLMovuvFn~*ig_O<h>
zk_@%dsf#MDsyA$ID8J6!cNiZypQ)>Ec`)>qd&?C3ZlO6p=ZN^1ms`uvq<Ki>8sKAQ
zfscvq^f6rQtSjXuHGA(P1@JTf#$8Q194GKG4mLJ+xQ!F(aM-wQcNI_1{9o}n>XhMt
zUu6UY1&4MyDEgl`sDJ5u>hJ|0yd^(y5{efDA>;Z(7Y$r?PjYj7DP5Xj_FIuQ;#||u
z&=`HjptkO<NB+u-e>e`hci{cqM?Z7vhf99GoD>l0v+ePeXBU3qPaY&~t<=wFG+B6+
z#7wd_Toon!sa($~gE+SJV0lvRz}B3Vx@ML0%;cLcIyz<Dtu(u&_kQ?;3#a-=gc-e9
znV*ww(f-QM>bFJj7-Qx%H5C<RtIweSa;{y?!~WBi{bQOJd#lWOb7lOF$<O2xgJk15
z3+#{SN9_rwj~|<;v~@!6D#f%d={v##uclvaJM2-<J~Tmn^(Bs<HvaI}&AF*lj?IeD
z%~7s$;FmnKG09VY`2M19P0Jrmt(*FF`kr@q`s;7|o}OLoI8#A-a<I+!Qwy^v>{?KB
zV)bs>V(P#!&?I*~Y-FW0>YOq#X6WJl)4sj!y~u4pgyDia<4z?GCHC32@iLisl(jWa
zB48zUKl$@SiPqu-K8dx4=Na<-T59ddf#ZY)DBQQpJ7O4PG(HM<?5g9mY^zR!$;rvz
zB1lMjQIdVJp(yWTPR}gYQGedvSL7kT>RG=3gh!hRVYf4>Vg|mrXkTWV<X(G|!|$WS
zt3sF>H8ZMCy}ER7;eB(l^wQ%yM`u5I9&Q(rmhn*QiiF;(9r&nOJ#V&GkQz7Xqj0TK
z^O@lhdg@LU(>`AR#3-X}yxO*SV{P4$>0!?7srRge4bKBC^<NmuXJ_v^k#l*s<>T#*
z8uj<q&%1y2ewHLGLr-XVvUo++Aj2b~WjCU?92uXm<J4o9!n=E{%V#A!#Z5=EGuF|y
zZt+(5nR(n=G4x1|>N(wwQ*TObBqI$!owPV^5*ifid&<CI+i^1|esJK{M@JO}EXm;K
zM%NQfeACkVxuvdelsS$I0`Id9ywCg&@1r$cb#+iZGA-|W!+XfYS#hObi0q#~d#G4v
zBsiau@M>vi=Rmq1C#e1#Vx2JfMM)~-!tV!vGuFB3ApEfFq{p}!dMD5Lx^n8<%5`h3
zY-+WGLQiHscD23c$1XJAw=||@NN`ro(edZ!DZG1{bZF5}KU~_$7st*V7JGkR_0#zW
znx2$>)ZU~zX{d$uS+{H9jKT7~i7|=e!frG_zjb(h=1*z2=lRndmcOnqRt`6eAKP@T
zULI*ZXP+sfDtz*Eecq?E)X`5aF-!xTl4VL!M<cIhJ6I*1(r7hw>XRyOUndaGYI)>Z
zu(EiD##GB7z36E+#TPOIhYyX6_g-|%I!h~f&-=ZD@&!*!zt?%!pmk-w#;XjubmWN@
zvq~GMDLzuD$hNJ1w|sJzd)CDH%Y_v~tb7|qYdu@0-=Al;IHAMeWMJmtnN7asag_gW
zL_1oFeLAlk{V+0wLA}Bq(fz<ND-YO}kIybRxVCk>v%BYsbNImS0lGAXnxP6jvn0VS
z#1pxH9tnLFM)iuE;l!sL)bfD7?4zl{wS5<F;3{Dnd1CMUr_!*xF?|$9eA*wvnXmuY
zX=(MwaMfFR`<w@#|FC`Qsp{P!MuSDl{J9DA(xE<&1yzZuL-+gqob@ta^N`ZQkw+fR
zeISnVUSD{j@l5mL`a6d$n^GU0+G%qs=RgDR*vRvGMu+9MoYzzimKGc3UahLq4$FJB
z_9!uKjk(#{X$v)-f6^gl`qrM^kvS@;B6{L2{J{e!gS!h}Tz5);uVa)Klg3kI6unqO
z^R%ArlUwtNc8z#H?$&j>Y+0p(P_1#@O>=Il@ACm``x-gY^mDc=9xt-l|Et>xj!WIP
z1-I_UI^@3^TC}#YA~`H%)Mbg+9^*IQpvu5O6?TP3ipxh(;ZdJ2UDH1o9)0Bq$neM!
zq9J>5O*U-GN0Gr1RM}(|Pp|wZ!lPlhDV(<uEg1?u`Qms&!t~;JGrc*1qa55FZAOfA
zbaWr#<l|(+HpPv}j&vRUo{Jp0rV;SNUZR-U`P1mX45wD4t1vzELS|iC@%a0XH*?N^
z&?wMpEpsr}mbV84m&;dLE*smjEu2sLb@|+Y`8Vdxc$$Q6)Ord&h_=soHvD{Q;hE(F
z)@?Xm^ZxDJX6~I4xZzr}5%Mv=`4lbQd3Axq)yAhU&rbgFkNB1sF$Le>|55w>#zR?u
zTwZiW!KDt92M?pa%c}05oj>hRl!evkvztGzim*2b>R<18)sQ>JWn^WzZolLe&RT7#
zV%aZI4&}pYc~-u<=@ae>TDJ{fk)NwEcO%-IY@)QvQcT}(X|iO^t>dLb#~=2eq?jBg
z@vLx-X<nA4JaJ$9gB-s;BP%Q4*>0QbUz#${W|D<Q@!r=hql?Ep@^S7RPW41i<|}d!
z)0`h(UtTlEN3*Tr)!cQT&VLpuebZz7cOoU3RLtZ4k3>pclw{v_*5rdhcl@VV|HTHR
zycK$~{f}QR<i?)1xEpbx31!S35P95Wl6LJ6ZxgQMwC6YMl@A#_^v&Blr>hRQV}l%a
z_&OAc+Zt`Rn&<6T-6zvAudYnGW7+4IMM1Y$jagZ3r=8xa)ogIHCgyBlu(SWdj{}=c
zcU~&WX&ry;*JtnD2Si~HzssE?pY^M#J%_n{+1k7{ho=rI>4%%Nl+NWYHL$Sw(QnBp
z&&&l+Ze7Z34zjX${@vXjD?@6kFE0BHKI4%;yW-`D{3we%hw|qw?I*9A_Ca@8nMj-G
zVLoxxLgz(p_o|OK7JjGi6P{4eP#6%dfKI=|-Mj;D56rE5t@W&V&~0<Ws*o4SEoOIX
z`=o2%G#qu#o1MW(0gsgg&sKPP&cE@>MpNl^k?eUsD@or(o=%<5Y<=i#wO)^B40xI9
zd0bOvYv8?G`+?W!9>`$BRsYAMOGaLJDR*7+<oO}tnCGi>mp%W0d-Wor22q<`$)Gg7
zKl^2B1Kb=sBlyp*1HDZPo{$(B7^<@0ds1VI&%VctZnxQM6_;AD?KkZ_-IB+AQuFR-
z*T@4KKV+yLG;cjqr21gk0kg5c?SFGQ<n|fweswbh4H26)JXa(nu06ZYl)v*rL}^Zh
z&gdJvH+UGLrs@Hl8Tf?b`jKVh-@I(mPQIQP?m3~&FmC<DJ-ct4kE|OtaiqqT9oE}U
zW~v)sHxApbIwL#4G4p9~!NnCWZ>1q0uRBF8snjVnaH&pIK9b_#y4rru^YJE+h7&5x
zs9AY=_}k`&Dd{i6GvD}@ZFQneOa0+~>&jEiPnP;qT3sG&zv|har+8omHf8dz22H=;
z|G3?jRGN1{Sif4WDVp0bTj*@RtN(<Rt5>Vr;u|t(L+}jR;2s?)vNLFEfKvX)jqS?=
z5R9$oSXSzMt1XGb^?I14vsJq*N*EYgw<#&GH6f<Q$^Y@lcCfQ2-!H#3w9<rCH;b1j
z8aT;!aNRdrx(`0DT-Mt}AXXwxL@!{VjP3PmN?xL&?WzTX7N5B0^JwLyKbl3K-0oIa
zCwx52)jO#4d-RAmW1o0@*D{5*=k&p4k=iSi-4DtKMzp*OW!19>tVGuOHLi0kD!oT#
zDkga({4jf8)|P2o8}DIStxW-pd_APHW6y?rQ=9OU`%I(z6l^RuzPlq2jlZ((H}0Xz
zol`F;9lGF}@iatK!0=jeLS@HJSJ!c7;z64O-#&Dg&#>pd-(SCc=u5RdrFLto)@OT1
zr0ohy+M*GwvZH-+f&1KvF_Z3;<d=)2S$5NW6{;NO92lKB=fkP0BFl=DNegd|?}wF5
i=|7!t9v-_%&j`7^yW++uEc||o`Vcp}eroAdT=ZYuH5X+7

diff --git a/Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest b/Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest
deleted file mode 100644
index f96b1d6..0000000
--- a/Libs/CsharpDis6/OpenDis.Demo/bin/Debug/OpenDis.Demo.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
diff --git a/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache b/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache
deleted file mode 100644
index 5aea8fe..0000000
--- a/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.cache
+++ /dev/null
@@ -1,20 +0,0 @@
-OpenDis.Demo
-
-
-winexe
-C#
-.cs
-G:\Temp\OpenDis_v4\OpenDis.Demo\obj\x86\Debug\
-OpenDis.Demo
-none
-false
-DEBUG;TRACE
-G:\Temp\OpenDis_v4\OpenDis.Demo\App.xaml
-11151548125
-
-61412217032
-13151655058
-MainWindow.xaml;
-
-True
-
diff --git a/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref b/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref
deleted file mode 100644
index d143884..0000000
--- a/Libs/CsharpDis6/OpenDis.Demo/obj/x86/Debug/OpenDis.Demo_MarkupCompile.i.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-FG:\Temp\OpenDis_v4\OpenDis.Demo\MainWindow.xaml
-
diff --git a/Libs/CsharpDis6/EspduReceiver/EspduReceiver.cs b/Samples/EspduReceiver/EspduReceiver.cs
similarity index 97%
rename from Libs/CsharpDis6/EspduReceiver/EspduReceiver.cs
rename to Samples/EspduReceiver/EspduReceiver.cs
index 0b6f61f..0f68af7 100644
--- a/Libs/CsharpDis6/EspduReceiver/EspduReceiver.cs
+++ b/Samples/EspduReceiver/EspduReceiver.cs
@@ -1,175 +1,175 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.IO;
-using System.Threading;
-using OpenDis.Dis1998;
-using OpenDis.Core;
-using OpenDis.Enumerations;
-
-namespace EspduReceiver
-{
-    class EspduReceiver
-    {
-        private static IPAddress mcastAddress;
-        private static int mcastPort, broadcastPort;
-        private static Socket mcastSocket;
-        private static MulticastOption mcastOption;
-        private static EndPoint remoteEP;
-
-        private static void MulticastOptionProperties()
-        {
-            Console.WriteLine("Current multicast group is: " + mcastOption.Group);
-            Console.WriteLine("Current multicast local address is: " + mcastOption.LocalAddress);
-        }
-
-        private static void StartMulticast()
-        {
-            try
-            {                
-                mcastSocket = new Socket(AddressFamily.InterNetwork,
-                                         SocketType.Dgram,
-                                         ProtocolType.Udp);
-
-                //Console.Write("Enter the local IP address: ");  //In case multiple NICs
-                //IPAddress localIPAddr = IPAddress.Parse(Console.ReadLine());
-                //IPAddress localIPAddr = IPAddress.Parse("x.x.x.x");  //Easier than entering each time
-
-                IPAddress localIPAddr = IPAddress.Any;  //Easiest
-                                
-                EndPoint localEP = (EndPoint)new IPEndPoint(localIPAddr, 0);
-
-                try
-                {
-                    mcastSocket.Bind(localEP);
-                }
-                catch (System.Net.Sockets.SocketException e)   //If port busy
-                {
-                    Console.WriteLine(e.ToString());
-                    mcastSocket.Close();
-                    Console.Write("Unable to Bind port ---->   HIT ENTER TO EXIT");
-                    Console.ReadLine();
-                    System.Environment.Exit(1);                   
-                }
-
-                // Define a MulticastOption object specifying the multicast group 
-                // address and the local IPAddress.
-                // The multicast group address is the same as the address used by the server.
-                mcastOption = new MulticastOption(mcastAddress, localIPAddr);
-
-                mcastSocket.SetSocketOption(SocketOptionLevel.IP,
-                                            SocketOptionName.AddMembership,
-                                            mcastOption);
-
-
-                // Display MulticastOption properties.
-                MulticastOptionProperties();
-
-                //remoteEP = new IPEndPoint(mcastAddress, mcastPort);
-                remoteEP = (EndPoint)new IPEndPoint(IPAddress.Any, mcastPort);  //Good for general Multicast 
-
-            }
-
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-
-        private static void StartBroadcast()
-        {
-            try
-            {        
-                remoteEP = (EndPoint)new IPEndPoint(IPAddress.Any, broadcastPort);  
-
-                mcastSocket = new Socket(AddressFamily.InterNetwork,
-                                         SocketType.Dgram,
-                                         ProtocolType.Udp);
-
-                mcastSocket.ExclusiveAddressUse = false;
-
-                mcastSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-
-                mcastSocket.Bind(remoteEP);
-
-                Console.WriteLine("Receive Broadcat UDP on Port: " + broadcastPort);
-                Console.WriteLine("----------------------------" );
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-                Console.Write("Error ---->   HIT ENTER TO EXIT");
-                Console.ReadLine();
-            }
-        }
-
-        private static void ReceiveBroadcastMessages()
-        {
-            bool done = false;
-            byte[] bytes = new Byte[10000];
-            int length = 0;            
-            
-            PduProcessor pduProcessor = new PduProcessor();  //PduProcessor could use some work and move towards all static methods (PduXmlDecode is instance method)
-            pduProcessor.Endian = Endian.Big;   //DIS use Big Endian format
-            List<object> pduList;
-
-            try
-            {
-                while (!done)
-                {
-                    Console.WriteLine("Waiting for  packets.......");
-                    Console.WriteLine("Enter ^C to terminate.");
-
-                    length = mcastSocket.ReceiveFrom(bytes, ref remoteEP);
-
-                    Console.WriteLine("Received broadcast from {0} :\n Bytes:{1}\n", remoteEP.ToString(),length);
-                    Console.WriteLine("________________________________\n");
-
-                    //Decode only 1 PDU
-                    //Pdu pdu = PduProcessor.ConvertByteArrayToPdu1998(bytes[2], bytes, Endian.Big);                    
-                    //Console.WriteLine("Received PDU Info {0} :\n ", pduProcessor.XmlDecodePdu(pdu));
-                    //Console.WriteLine("*******************************\n");
-
-                    //Could be many PDU received in datagram packet so be safe and get list
-                    
-                    pduList = pduProcessor.ProcessPdu(bytes, Endian.Big); 
-                    Console.WriteLine("Received PDU List Size:[{0}]\n ", pduList.Count);
-                    Console.WriteLine("________________________________\n");
-                    foreach (object pduObj in pduList)
-                    {                            
-                        //Both of below work fine
-                        //Console.WriteLine("Received PDU List Info {0} :\n ", PduProcessor.DecodePdu(pduObj).ToString());
-                        Console.WriteLine("Received PDU List XML Info {0} :\n ", pduProcessor.XmlDecodePdu(pduObj));
-                        Console.WriteLine("*******************************\n");
-                    }
-                    
-
-                }
-
-                mcastSocket.Close();
-            }
-
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-
-        static void Main(string[] args)
-        {
-            mcastAddress = IPAddress.Parse("239.1.2.3");            
-            mcastPort = 62040;
-            broadcastPort = 62040;  //3000 is default for DisMapper / VBS
-
-            // Start a multicast or broadcast.
-            //StartMulticast();  // Mulicast only
-            StartBroadcast(); //Works with DisMapper and EspduSender when they are set to 'Broadcast'           
-
-            // Process Incomming messages.
-            ReceiveBroadcastMessages();
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.IO;
+using System.Threading;
+using OpenDis.Dis1998;
+using OpenDis.Core;
+using OpenDis.Enumerations;
+
+namespace EspduReceiver
+{
+    class EspduReceiver
+    {
+        private static IPAddress mcastAddress;
+        private static int mcastPort, broadcastPort;
+        private static Socket mcastSocket;
+        private static MulticastOption mcastOption;
+        private static EndPoint remoteEP;
+
+        private static void MulticastOptionProperties()
+        {
+            Console.WriteLine("Current multicast group is: " + mcastOption.Group);
+            Console.WriteLine("Current multicast local address is: " + mcastOption.LocalAddress);
+        }
+
+        private static void StartMulticast()
+        {
+            try
+            {                
+                mcastSocket = new Socket(AddressFamily.InterNetwork,
+                                         SocketType.Dgram,
+                                         ProtocolType.Udp);
+
+                //Console.Write("Enter the local IP address: ");  //In case multiple NICs
+                //IPAddress localIPAddr = IPAddress.Parse(Console.ReadLine());
+                //IPAddress localIPAddr = IPAddress.Parse("x.x.x.x");  //Easier than entering each time
+
+                IPAddress localIPAddr = IPAddress.Any;  //Easiest
+                                
+                EndPoint localEP = (EndPoint)new IPEndPoint(localIPAddr, 0);
+
+                try
+                {
+                    mcastSocket.Bind(localEP);
+                }
+                catch (System.Net.Sockets.SocketException e)   //If port busy
+                {
+                    Console.WriteLine(e.ToString());
+                    mcastSocket.Close();
+                    Console.Write("Unable to Bind port ---->   HIT ENTER TO EXIT");
+                    Console.ReadLine();
+                    System.Environment.Exit(1);                   
+                }
+
+                // Define a MulticastOption object specifying the multicast group 
+                // address and the local IPAddress.
+                // The multicast group address is the same as the address used by the server.
+                mcastOption = new MulticastOption(mcastAddress, localIPAddr);
+
+                mcastSocket.SetSocketOption(SocketOptionLevel.IP,
+                                            SocketOptionName.AddMembership,
+                                            mcastOption);
+
+
+                // Display MulticastOption properties.
+                MulticastOptionProperties();
+
+                //remoteEP = new IPEndPoint(mcastAddress, mcastPort);
+                remoteEP = (EndPoint)new IPEndPoint(IPAddress.Any, mcastPort);  //Good for general Multicast 
+
+            }
+
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+        private static void StartBroadcast()
+        {
+            try
+            {        
+                remoteEP = (EndPoint)new IPEndPoint(IPAddress.Any, broadcastPort);  
+
+                mcastSocket = new Socket(AddressFamily.InterNetwork,
+                                         SocketType.Dgram,
+                                         ProtocolType.Udp);
+
+                mcastSocket.ExclusiveAddressUse = false;
+
+                mcastSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+
+                mcastSocket.Bind(remoteEP);
+
+                Console.WriteLine("Receive Broadcat UDP on Port: " + broadcastPort);
+                Console.WriteLine("----------------------------" );
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                Console.Write("Error ---->   HIT ENTER TO EXIT");
+                Console.ReadLine();
+            }
+        }
+
+        private static void ReceiveBroadcastMessages()
+        {
+            bool done = false;
+            byte[] bytes = new Byte[10000];
+            int length = 0;            
+            
+            PduProcessor pduProcessor = new PduProcessor();  //PduProcessor could use some work and move towards all static methods (PduXmlDecode is instance method)
+            pduProcessor.Endian = Endian.Big;   //DIS use Big Endian format
+            List<object> pduList;
+
+            try
+            {
+                while (!done)
+                {
+                    Console.WriteLine("Waiting for  packets.......");
+                    Console.WriteLine("Enter ^C to terminate.");
+
+                    length = mcastSocket.ReceiveFrom(bytes, ref remoteEP);
+
+                    Console.WriteLine("Received broadcast from {0} :\n Bytes:{1}\n", remoteEP.ToString(),length);
+                    Console.WriteLine("________________________________\n");
+
+                    //Decode only 1 PDU
+                    //Pdu pdu = PduProcessor.ConvertByteArrayToPdu1998(bytes[2], bytes, Endian.Big);                    
+                    //Console.WriteLine("Received PDU Info {0} :\n ", pduProcessor.XmlDecodePdu(pdu));
+                    //Console.WriteLine("*******************************\n");
+
+                    //Could be many PDU received in datagram packet so be safe and get list
+                    
+                    pduList = pduProcessor.ProcessPdu(bytes, Endian.Big); 
+                    Console.WriteLine("Received PDU List Size:[{0}]\n ", pduList.Count);
+                    Console.WriteLine("________________________________\n");
+                    foreach (object pduObj in pduList)
+                    {                            
+                        //Both of below work fine
+                        //Console.WriteLine("Received PDU List Info {0} :\n ", PduProcessor.DecodePdu(pduObj).ToString());
+                        Console.WriteLine("Received PDU List XML Info {0} :\n ", pduProcessor.XmlDecodePdu(pduObj));
+                        Console.WriteLine("*******************************\n");
+                    }
+                    
+
+                }
+
+                mcastSocket.Close();
+            }
+
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+        static void Main(string[] args)
+        {
+            mcastAddress = IPAddress.Parse("239.1.2.3");            
+            mcastPort = 62040;
+            broadcastPort = 62040;  //3000 is default for DisMapper / VBS
+
+            // Start a multicast or broadcast.
+            //StartMulticast();  // Mulicast only
+            StartBroadcast(); //Works with DisMapper and EspduSender when they are set to 'Broadcast'           
+
+            // Process Incomming messages.
+            ReceiveBroadcastMessages();
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/EspduReceiver/OpenDis.EspduReceiver.csproj b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
similarity index 97%
rename from Libs/CsharpDis6/EspduReceiver/OpenDis.EspduReceiver.csproj
rename to Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
index 359f94d..63684e3 100644
--- a/Libs/CsharpDis6/EspduReceiver/OpenDis.EspduReceiver.csproj
+++ b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{70F94942-1466-4E6C-A2A3-89DB19C20159}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EspduReceiver</RootNamespace>
-    <AssemblyName>EspduReceiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EspduReceiver.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
-      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
-      <Name>OpenDis</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{70F94942-1466-4E6C-A2A3-89DB19C20159}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>EspduReceiver</RootNamespace>
+    <AssemblyName>EspduReceiver</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="EspduReceiver.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
+      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
+      <Name>OpenDis</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/EspduReceiver/Properties/AssemblyInfo.cs b/Samples/EspduReceiver/Properties/AssemblyInfo.cs
similarity index 97%
rename from Libs/CsharpDis6/EspduReceiver/Properties/AssemblyInfo.cs
rename to Samples/EspduReceiver/Properties/AssemblyInfo.cs
index aebf68e..d9985b5 100644
--- a/Libs/CsharpDis6/EspduReceiver/Properties/AssemblyInfo.cs
+++ b/Samples/EspduReceiver/Properties/AssemblyInfo.cs
@@ -1,36 +1,36 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("EspduReceiver")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EspduReceiver")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b895fb76-1cfa-4ca3-a2ca-6eb63c18250f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("EspduReceiver")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("EspduReceiver")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b895fb76-1cfa-4ca3-a2ca-6eb63c18250f")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Libs/CsharpDis6/EspduSender/EspduSender.cs b/Samples/EspduSender/EspduSender.cs
similarity index 97%
rename from Libs/CsharpDis6/EspduSender/EspduSender.cs
rename to Samples/EspduSender/EspduSender.cs
index e6ffe60..f5982dd 100644
--- a/Libs/CsharpDis6/EspduSender/EspduSender.cs
+++ b/Samples/EspduSender/EspduSender.cs
@@ -1,210 +1,210 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.IO;
-using System.Threading;
-using OpenDis.Dis1998;
-using OpenDis.Core;
-using OpenDis.Enumerations;
-
-namespace EspduSender
-{
-    class EspduSender
-    {
-        private static IPAddress mcastAddress;
-        private static int mcastPort, broadcastPort;
-        private static Socket mcastSocket;
-        private static MulticastOption mcastOption;
-        private static IPEndPoint endPoint;
-
-        private static void MulticastOptionProperties()
-        {
-            Console.WriteLine("Current multicast group is: " + mcastOption.Group);
-            Console.WriteLine("Current multicast local address is: " + mcastOption.LocalAddress);
-        }
-
-        private static void JoinMulticast()
-        {
-            try
-            {
-                mcastSocket = new Socket(AddressFamily.InterNetwork,
-                                         SocketType.Dgram,
-                                         ProtocolType.Udp);
-
-                //Console.Write("Enter the local IP address: ");  //In case multiple NICs
-
-                //IPAddress localIPAddr = IPAddress.Parse(Console.ReadLine());
-                IPAddress localIPAddr = IPAddress.Any;
-
-                IPEndPoint localEP = new IPEndPoint(localIPAddr, 0);  //Don't need to fully join, so can use on same computer as port already in use by receive.
-
-                mcastSocket.Bind(localEP);
-
-                // Define a MulticastOption object specifying the multicast group 
-                // address and the local IPAddress.
-                // The multicast group address is the same as the address used by the server.
-                mcastOption = new MulticastOption(mcastAddress, localIPAddr);
-
-                mcastSocket.SetSocketOption(SocketOptionLevel.IP,
-                                            SocketOptionName.AddMembership,
-                                            mcastOption);
-
-                endPoint = new IPEndPoint(mcastAddress, mcastPort);
-
-                // Display MulticastOption properties.
-                MulticastOptionProperties();
-            }
-
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-
-        private static void StartMulticast()
-        {
-            try
-            {
-                mcastSocket = new Socket(AddressFamily.InterNetwork,
-                                         SocketType.Dgram,
-                                         ProtocolType.Udp);
-
-                //Console.Write("Enter the local IP address: ");
-
-                //IPAddress localIPAddr = IPAddress.Parse(Console.ReadLine());
-                IPAddress localIPAddr = IPAddress.Parse("172.19.36.86");
-
-                //IPAddress localIP = IPAddress.Any;
-                EndPoint localEP = (EndPoint)new IPEndPoint(localIPAddr, mcastPort);
-
-                mcastSocket.Bind(localEP);
-
-                // Define a MulticastOption object specifying the multicast group 
-                // address and the local IPAddress.
-                // The multicast group address is the same as the address used by the server.
-                mcastOption = new MulticastOption(mcastAddress, localIPAddr);
-
-                mcastSocket.SetSocketOption(SocketOptionLevel.IP,
-                                            SocketOptionName.AddMembership,
-                                            mcastOption);
-
-                endPoint = new IPEndPoint(mcastAddress, mcastPort);
-
-                // Display MulticastOption properties.
-                MulticastOptionProperties();
-            }
-
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-
-        private static void StartBroadcast()  //Used to connect to DISMap or other broadcast receivers
-        {
-            try
-            {
-                mcastSocket = new Socket(AddressFamily.InterNetwork,
-                                         SocketType.Dgram,
-                                         ProtocolType.Udp);                
-
-                // Define a BroadcastOption object 
-                mcastSocket.SetSocketOption(SocketOptionLevel.Socket,
-                                            SocketOptionName.Broadcast,
-                                            1);
-                IPAddress localIPAddr = IPAddress.Parse("172.19.36.255");
-
-                endPoint = new IPEndPoint(IPAddress.Broadcast, broadcastPort);
-                //endPoint = new IPEndPoint(localIPAddr, broadcastPort);
-            }
-
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-
-        private static void SendMessages(byte[] buf)
-        {   
-            try
-            {
-                //Send multicast packets to the listener.                
-                mcastSocket.SendTo(buf, endPoint);
-
-                Console.WriteLine("Sent multicast packets......./n");
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-
-
-        static void Main(string[] args)
-        {
-            mcastAddress = IPAddress.Parse("239.1.2.3");
-            mcastPort = 62040;
-            broadcastPort = 62040;  //3000 for DisMapper default
-            OpenDis.Dis1998.EntityStatePdu espdu = new OpenDis.Dis1998.EntityStatePdu();  //Could use factory but easier this way
-            
-            //Alcatraz
-            double lat = 37.827;
-            double lon = -122.425;
-
-            // Configure socket.
-            //JoinMulticast();   //Used to talk to C# receiver.  No need to connect as we are just sending multicast
-            //StartMulticast();  //Least preffered
-            StartBroadcast();      //Used for DisMapper      
-
-            //Setup EntityState PDU 
-            espdu.ExerciseID = 1;
-            EntityID eid = espdu.EntityID;
-            eid.Site = 0;
-            eid.Application = 1;
-            eid.Entity = 2;
-            // Set the entity type. SISO has a big list of enumerations, so that by
-            // specifying various numbers we can say this is an M1A2 American tank,
-            // the USS Enterprise, and so on. We'll make this a tank. There is a 
-            // separate project elsehwhere in this project that implements DIS 
-            // enumerations in C++ and Java, but to keep things simple we just use
-            // numbers here.
-            EntityType entityType = espdu.EntityType;
-            entityType.EntityKind = 1;      // Platform (vs lifeform, munition, sensor, etc.)
-            entityType.Country = 255;              // USA
-            entityType.Domain = 1;          // Land (vs air, surface, subsurface, space)
-            entityType.Category = 1;        // Tank
-            entityType.Subcategory = 1;     // M1 Abrams
-            entityType.Specific = 3;            // M1A2 Abrams
-
-            for (int i = 0; i < 100; i++)
-            {  
-                lon = lon + (i / 1000.0);
-
-                double[] disCoordinates = CoordinateConversions.getXYZfromLatLonDegrees(lat, lon, 0.0);
-
-                Vector3Double location = espdu.EntityLocation;
-                location.X = disCoordinates[0];
-                location.Y = disCoordinates[1];
-                location.Z = disCoordinates[2];
-                espdu.Timestamp = DisTime.DisRelativeTimestamp;
-
-                //Prepare output
-                DataOutputStream dos = new DataOutputStream(Endian.Big);
-                espdu.MarshalAutoLengthSet(dos);
-
-                // Transmit broadcast messages
-                SendMessages(dos.ConvertToBytes());
-                Console.Write("Message sent with TimeStamp [{0}] Time Of[{1}]", espdu.Timestamp, (espdu.Timestamp >> 1));
-
-                //Thread.Sleep(1000);
-                Console.Write("Hit Enter for Next PDU.  Ctrl-C to Exit");
-                Console.ReadLine();
-            }
-
-            mcastSocket.Close();
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.IO;
+using System.Threading;
+using OpenDis.Dis1998;
+using OpenDis.Core;
+using OpenDis.Enumerations;
+
+namespace EspduSender
+{
+    class EspduSender
+    {
+        private static IPAddress mcastAddress;
+        private static int mcastPort, broadcastPort;
+        private static Socket mcastSocket;
+        private static MulticastOption mcastOption;
+        private static IPEndPoint endPoint;
+
+        private static void MulticastOptionProperties()
+        {
+            Console.WriteLine("Current multicast group is: " + mcastOption.Group);
+            Console.WriteLine("Current multicast local address is: " + mcastOption.LocalAddress);
+        }
+
+        private static void JoinMulticast()
+        {
+            try
+            {
+                mcastSocket = new Socket(AddressFamily.InterNetwork,
+                                         SocketType.Dgram,
+                                         ProtocolType.Udp);
+
+                //Console.Write("Enter the local IP address: ");  //In case multiple NICs
+
+                //IPAddress localIPAddr = IPAddress.Parse(Console.ReadLine());
+                IPAddress localIPAddr = IPAddress.Any;
+
+                IPEndPoint localEP = new IPEndPoint(localIPAddr, 0);  //Don't need to fully join, so can use on same computer as port already in use by receive.
+
+                mcastSocket.Bind(localEP);
+
+                // Define a MulticastOption object specifying the multicast group 
+                // address and the local IPAddress.
+                // The multicast group address is the same as the address used by the server.
+                mcastOption = new MulticastOption(mcastAddress, localIPAddr);
+
+                mcastSocket.SetSocketOption(SocketOptionLevel.IP,
+                                            SocketOptionName.AddMembership,
+                                            mcastOption);
+
+                endPoint = new IPEndPoint(mcastAddress, mcastPort);
+
+                // Display MulticastOption properties.
+                MulticastOptionProperties();
+            }
+
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+        private static void StartMulticast()
+        {
+            try
+            {
+                mcastSocket = new Socket(AddressFamily.InterNetwork,
+                                         SocketType.Dgram,
+                                         ProtocolType.Udp);
+
+                //Console.Write("Enter the local IP address: ");
+
+                //IPAddress localIPAddr = IPAddress.Parse(Console.ReadLine());
+                IPAddress localIPAddr = IPAddress.Parse("172.19.36.86");
+
+                //IPAddress localIP = IPAddress.Any;
+                EndPoint localEP = (EndPoint)new IPEndPoint(localIPAddr, mcastPort);
+
+                mcastSocket.Bind(localEP);
+
+                // Define a MulticastOption object specifying the multicast group 
+                // address and the local IPAddress.
+                // The multicast group address is the same as the address used by the server.
+                mcastOption = new MulticastOption(mcastAddress, localIPAddr);
+
+                mcastSocket.SetSocketOption(SocketOptionLevel.IP,
+                                            SocketOptionName.AddMembership,
+                                            mcastOption);
+
+                endPoint = new IPEndPoint(mcastAddress, mcastPort);
+
+                // Display MulticastOption properties.
+                MulticastOptionProperties();
+            }
+
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+        private static void StartBroadcast()  //Used to connect to DISMap or other broadcast receivers
+        {
+            try
+            {
+                mcastSocket = new Socket(AddressFamily.InterNetwork,
+                                         SocketType.Dgram,
+                                         ProtocolType.Udp);                
+
+                // Define a BroadcastOption object 
+                mcastSocket.SetSocketOption(SocketOptionLevel.Socket,
+                                            SocketOptionName.Broadcast,
+                                            1);
+                IPAddress localIPAddr = IPAddress.Parse("172.19.36.255");
+
+                endPoint = new IPEndPoint(IPAddress.Broadcast, broadcastPort);
+                //endPoint = new IPEndPoint(localIPAddr, broadcastPort);
+            }
+
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+        private static void SendMessages(byte[] buf)
+        {   
+            try
+            {
+                //Send multicast packets to the listener.                
+                mcastSocket.SendTo(buf, endPoint);
+
+                Console.WriteLine("Sent multicast packets......./n");
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+        }
+
+
+        static void Main(string[] args)
+        {
+            mcastAddress = IPAddress.Parse("239.1.2.3");
+            mcastPort = 62040;
+            broadcastPort = 62040;  //3000 for DisMapper default
+            OpenDis.Dis1998.EntityStatePdu espdu = new OpenDis.Dis1998.EntityStatePdu();  //Could use factory but easier this way
+            
+            //Alcatraz
+            double lat = 37.827;
+            double lon = -122.425;
+
+            // Configure socket.
+            //JoinMulticast();   //Used to talk to C# receiver.  No need to connect as we are just sending multicast
+            //StartMulticast();  //Least preffered
+            StartBroadcast();      //Used for DisMapper      
+
+            //Setup EntityState PDU 
+            espdu.ExerciseID = 1;
+            EntityID eid = espdu.EntityID;
+            eid.Site = 0;
+            eid.Application = 1;
+            eid.Entity = 2;
+            // Set the entity type. SISO has a big list of enumerations, so that by
+            // specifying various numbers we can say this is an M1A2 American tank,
+            // the USS Enterprise, and so on. We'll make this a tank. There is a 
+            // separate project elsehwhere in this project that implements DIS 
+            // enumerations in C++ and Java, but to keep things simple we just use
+            // numbers here.
+            EntityType entityType = espdu.EntityType;
+            entityType.EntityKind = 1;      // Platform (vs lifeform, munition, sensor, etc.)
+            entityType.Country = 255;              // USA
+            entityType.Domain = 1;          // Land (vs air, surface, subsurface, space)
+            entityType.Category = 1;        // Tank
+            entityType.Subcategory = 1;     // M1 Abrams
+            entityType.Specific = 3;            // M1A2 Abrams
+
+            for (int i = 0; i < 100; i++)
+            {  
+                lon = lon + (i / 1000.0);
+
+                double[] disCoordinates = CoordinateConversions.getXYZfromLatLonDegrees(lat, lon, 0.0);
+
+                Vector3Double location = espdu.EntityLocation;
+                location.X = disCoordinates[0];
+                location.Y = disCoordinates[1];
+                location.Z = disCoordinates[2];
+                espdu.Timestamp = DisTime.DisRelativeTimestamp;
+
+                //Prepare output
+                DataOutputStream dos = new DataOutputStream(Endian.Big);
+                espdu.MarshalAutoLengthSet(dos);
+
+                // Transmit broadcast messages
+                SendMessages(dos.ConvertToBytes());
+                Console.Write("Message sent with TimeStamp [{0}] Time Of[{1}]", espdu.Timestamp, (espdu.Timestamp >> 1));
+
+                //Thread.Sleep(1000);
+                Console.Write("Hit Enter for Next PDU.  Ctrl-C to Exit");
+                Console.ReadLine();
+            }
+
+            mcastSocket.Close();
+        }
+    }
 }
\ No newline at end of file
diff --git a/Libs/CsharpDis6/EspduSender/OpenDis.EspduSender.csproj b/Samples/EspduSender/OpenDis.EspduSender.csproj
similarity index 97%
rename from Libs/CsharpDis6/EspduSender/OpenDis.EspduSender.csproj
rename to Samples/EspduSender/OpenDis.EspduSender.csproj
index e002aea..e521ff6 100644
--- a/Libs/CsharpDis6/EspduSender/OpenDis.EspduSender.csproj
+++ b/Samples/EspduSender/OpenDis.EspduSender.csproj
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EspduSender</RootNamespace>
-    <AssemblyName>EspduSender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EspduSender.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
-      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
-      <Name>OpenDis</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>EspduSender</RootNamespace>
+    <AssemblyName>EspduSender</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="EspduSender.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
+      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
+      <Name>OpenDis</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/EspduSender/Properties/AssemblyInfo.cs b/Samples/EspduSender/Properties/AssemblyInfo.cs
similarity index 97%
rename from Libs/CsharpDis6/EspduSender/Properties/AssemblyInfo.cs
rename to Samples/EspduSender/Properties/AssemblyInfo.cs
index 36bafe1..52e76c6 100644
--- a/Libs/CsharpDis6/EspduSender/Properties/AssemblyInfo.cs
+++ b/Samples/EspduSender/Properties/AssemblyInfo.cs
@@ -1,36 +1,36 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("EspduSender")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EspduSender")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fa71ba03-ced4-4464-bcd3-b05ddf61f29f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("EspduSender")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("EspduSender")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fa71ba03-ced4-4464-bcd3-b05ddf61f29f")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Libs/CsharpDis6/OpenDis.Demo/App.xaml b/Samples/OpenDis.Demo/App.xaml
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/App.xaml
rename to Samples/OpenDis.Demo/App.xaml
index 66eed85..7b6b1f6 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/App.xaml
+++ b/Samples/OpenDis.Demo/App.xaml
@@ -1,8 +1,8 @@
-<Application x:Class="OpenDis.Demo.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
-</Application>
+<Application x:Class="OpenDis.Demo.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/Libs/CsharpDis6/OpenDis.Demo/App.xaml.cs b/Samples/OpenDis.Demo/App.xaml.cs
similarity index 94%
rename from Libs/CsharpDis6/OpenDis.Demo/App.xaml.cs
rename to Samples/OpenDis.Demo/App.xaml.cs
index f8ebf2a..601d51b 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/App.xaml.cs
+++ b/Samples/OpenDis.Demo/App.xaml.cs
@@ -1,16 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Windows;
-
-namespace OpenDis.Demo
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace OpenDis.Demo
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml b/Samples/OpenDis.Demo/MainWindow.xaml
similarity index 98%
rename from Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml
rename to Samples/OpenDis.Demo/MainWindow.xaml
index bcc2511..1bd69ea 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml
+++ b/Samples/OpenDis.Demo/MainWindow.xaml
@@ -1,131 +1,131 @@
-<Window x:Class="OpenDis.Demo.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:local="clr-namespace:OpenDis.Demo" x:Name="mainWindow"
-        Title="MainWindow" Height="350" Width="525">
-    <Window.Resources>
-        <DataTemplate x:Key="tempdt">
-            <TextBlock Text="{Binding Path=Description}" />
-        </DataTemplate>
-        <HierarchicalDataTemplate x:Key="ExtrasTemplate" ItemsSource="{Binding Extras}" ItemTemplate="{StaticResource tempdt}">
-            <TextBlock Text="{Binding Path=Description}" />
-        </HierarchicalDataTemplate>
-        <HierarchicalDataTemplate x:Key="SpecificTemplate" ItemsSource="{Binding Specifices}" ItemTemplate="{StaticResource ExtrasTemplate}">
-            <TextBlock Text="{Binding Path=Description}" />
-        </HierarchicalDataTemplate>
-        <HierarchicalDataTemplate x:Key="SubcategoryTemplate" ItemsSource="{Binding Subcategories}" ItemTemplate="{StaticResource SpecificTemplate}">
-            <TextBlock Text="{Binding Path=Description}" />
-        </HierarchicalDataTemplate>
-        <HierarchicalDataTemplate x:Key="cet" ItemsSource="{Binding Categories}" ItemTemplate="{StaticResource SubcategoryTemplate}">
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <TextBlock Text="{Binding Path=Kind}" VerticalAlignment="Center" />
-                <Label Content=" / " />
-                <TextBlock Text="{Binding Path=Domain}" VerticalAlignment="Center" />
-                <Label Content=" / " />
-                <TextBlock Text="{Binding Path=Country}" VerticalAlignment="Center" />
-            </StackPanel>
-        </HierarchicalDataTemplate>
-        <DataTemplate x:Key="Evemplate">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Path=Value}" />
-                <TextBlock Text=" - " />
-                <TextBlock Text="{Binding Path=Name}" />
-            </StackPanel>
-        </DataTemplate>
-        <HierarchicalDataTemplate x:Key="Eemplate" ItemsSource="{Binding Values}" ItemTemplate="{StaticResource Evemplate}">
-            <TextBlock Text="{Binding Path=Name}" />
-        </HierarchicalDataTemplate>
-        <HierarchicalDataTemplate x:Key="enums" ItemsSource="{Binding Enums}" ItemTemplate="{StaticResource Eemplate}">
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <TextBlock Text="{Binding Path=Namespace}" VerticalAlignment="Center" />
-            </StackPanel>
-        </HierarchicalDataTemplate>
-    </Window.Resources>
-    <Grid>
-        <TabControl>
-            <TabItem Header="Entity types">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <ToolBarTray>
-                        <ToolBar Grid.Row="0"  HorizontalAlignment="Stretch">
-                            <ToggleButton IsChecked="True" x:Name="toggleEntityTree" Click="toggleEntityTree_Click">Tree</ToggleButton>
-                            <ToggleButton x:Name="toggleEntityGrid" Click="toggleEntityGrid_Click" IsChecked="False">Grid</ToggleButton>
-                            <Separator />
-                            <Label Content="CET Version:" />
-                            <ToggleButton IsChecked="True" x:Name="toggleCet2006" Click="toggleCet2006_Click">2006 R35</ToggleButton>
-                            <ToggleButton x:Name="toggleCet2010" Click="toggleCet2010_Click" IsChecked="False">2010 RC3</ToggleButton>
-                        </ToolBar>
-                    </ToolBarTray>
-                    <TreeView Visibility="Visible" Grid.Row="1" HorizontalAlignment="Stretch" Name="treeViewEntityTypes" VerticalAlignment="Stretch" ItemsSource="{Binding}" ItemTemplate="{StaticResource cet}"/>
-                    <DataGrid Visibility="Hidden" Grid.Row="1" Name="dataGridEntityTypes" AutoGenerateColumns="False" ItemsSource="{Binding Mode=OneWay}" IsReadOnly="True" CanUserSortColumns="False">
-                        <DataGrid.GroupStyle>
-                            <GroupStyle>
-                                <GroupStyle.HeaderTemplate>
-                                    <DataTemplate>
-                                        <StackPanel>
-                                            <TextBlock Text="{Binding Path=Name}" />
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </GroupStyle.HeaderTemplate>
-                                <GroupStyle.ContainerStyle>
-                                    <Style TargetType="{x:Type GroupItem}">
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate TargetType="{x:Type GroupItem}">
-                                                    <Expander>
-                                                        <Expander.Header>
-                                                            <TextBlock Text="{Binding Path=Name}" />
-                                                        </Expander.Header>
-                                                        <ItemsPresenter />
-                                                    </Expander>
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </GroupStyle.ContainerStyle>
-                            </GroupStyle>
-                        </DataGrid.GroupStyle>
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="Country" Binding="{Binding Country}" />
-                            <DataGridTextColumn Header="Domain" Binding="{Binding Domain}" />
-                            <DataGridTextColumn Header="Kind" Binding="{Binding Kind}" />
-                            <DataGridTextColumn Header="Category" Binding="{Binding Category}" />
-                            <DataGridTextColumn Header="Subcategory" Binding="{Binding Subcategory}" />
-                            <DataGridTextColumn Header="Specific" Binding="{Binding Specific}" />
-                            <DataGridTextColumn Header="Extra" Binding="{Binding Extra}" />
-                            <DataGridTextColumn Header="Range" Binding="{Binding Id2}" />
-                            <DataGridTextColumn Header="Description" Binding="{Binding Description}" />
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </Grid>
-            </TabItem>
-            <TabItem Header="Aggregate types">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <ToolBarTray>
-                        <ToolBar Grid.Row="0"  HorizontalAlignment="Stretch">
-                            <Label Content="CET Version:" />
-                            <ToggleButton IsChecked="True" x:Name="toggleAggregate2006" Click="toggleAggregate2006_Click">2006 R35</ToggleButton>
-                            <ToggleButton x:Name="toggleAggregate2010" Click="toggleAggregate2010_Click" IsChecked="False">2010 RC3</ToggleButton>
-                        </ToolBar>
-                    </ToolBarTray>
-                    <TreeView Grid.Row="1" HorizontalAlignment="Stretch" Name="treeViewAggregateTypes" VerticalAlignment="Stretch" ItemsSource="{Binding}" ItemTemplate="{StaticResource cet}"/>
-                </Grid>
-            </TabItem>
-            <TabItem Header="Enumerations">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <TreeView Grid.Row="0" HorizontalAlignment="Stretch" Name="treeViewEnumerations" VerticalAlignment="Stretch" ItemsSource="{Binding}" ItemTemplate="{StaticResource enums}"/>
-                </Grid>
-            </TabItem>
-        </TabControl>
-    </Grid>
-</Window>
+<Window x:Class="OpenDis.Demo.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:OpenDis.Demo" x:Name="mainWindow"
+        Title="MainWindow" Height="350" Width="525">
+    <Window.Resources>
+        <DataTemplate x:Key="tempdt">
+            <TextBlock Text="{Binding Path=Description}" />
+        </DataTemplate>
+        <HierarchicalDataTemplate x:Key="ExtrasTemplate" ItemsSource="{Binding Extras}" ItemTemplate="{StaticResource tempdt}">
+            <TextBlock Text="{Binding Path=Description}" />
+        </HierarchicalDataTemplate>
+        <HierarchicalDataTemplate x:Key="SpecificTemplate" ItemsSource="{Binding Specifices}" ItemTemplate="{StaticResource ExtrasTemplate}">
+            <TextBlock Text="{Binding Path=Description}" />
+        </HierarchicalDataTemplate>
+        <HierarchicalDataTemplate x:Key="SubcategoryTemplate" ItemsSource="{Binding Subcategories}" ItemTemplate="{StaticResource SpecificTemplate}">
+            <TextBlock Text="{Binding Path=Description}" />
+        </HierarchicalDataTemplate>
+        <HierarchicalDataTemplate x:Key="cet" ItemsSource="{Binding Categories}" ItemTemplate="{StaticResource SubcategoryTemplate}">
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <TextBlock Text="{Binding Path=Kind}" VerticalAlignment="Center" />
+                <Label Content=" / " />
+                <TextBlock Text="{Binding Path=Domain}" VerticalAlignment="Center" />
+                <Label Content=" / " />
+                <TextBlock Text="{Binding Path=Country}" VerticalAlignment="Center" />
+            </StackPanel>
+        </HierarchicalDataTemplate>
+        <DataTemplate x:Key="Evemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding Path=Value}" />
+                <TextBlock Text=" - " />
+                <TextBlock Text="{Binding Path=Name}" />
+            </StackPanel>
+        </DataTemplate>
+        <HierarchicalDataTemplate x:Key="Eemplate" ItemsSource="{Binding Values}" ItemTemplate="{StaticResource Evemplate}">
+            <TextBlock Text="{Binding Path=Name}" />
+        </HierarchicalDataTemplate>
+        <HierarchicalDataTemplate x:Key="enums" ItemsSource="{Binding Enums}" ItemTemplate="{StaticResource Eemplate}">
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <TextBlock Text="{Binding Path=Namespace}" VerticalAlignment="Center" />
+            </StackPanel>
+        </HierarchicalDataTemplate>
+    </Window.Resources>
+    <Grid>
+        <TabControl>
+            <TabItem Header="Entity types">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <ToolBarTray>
+                        <ToolBar Grid.Row="0"  HorizontalAlignment="Stretch">
+                            <ToggleButton IsChecked="True" x:Name="toggleEntityTree" Click="toggleEntityTree_Click">Tree</ToggleButton>
+                            <ToggleButton x:Name="toggleEntityGrid" Click="toggleEntityGrid_Click" IsChecked="False">Grid</ToggleButton>
+                            <Separator />
+                            <Label Content="CET Version:" />
+                            <ToggleButton IsChecked="True" x:Name="toggleCet2006" Click="toggleCet2006_Click">2006 R35</ToggleButton>
+                            <ToggleButton x:Name="toggleCet2010" Click="toggleCet2010_Click" IsChecked="False">2010 RC3</ToggleButton>
+                        </ToolBar>
+                    </ToolBarTray>
+                    <TreeView Visibility="Visible" Grid.Row="1" HorizontalAlignment="Stretch" Name="treeViewEntityTypes" VerticalAlignment="Stretch" ItemsSource="{Binding}" ItemTemplate="{StaticResource cet}"/>
+                    <DataGrid Visibility="Hidden" Grid.Row="1" Name="dataGridEntityTypes" AutoGenerateColumns="False" ItemsSource="{Binding Mode=OneWay}" IsReadOnly="True" CanUserSortColumns="False">
+                        <DataGrid.GroupStyle>
+                            <GroupStyle>
+                                <GroupStyle.HeaderTemplate>
+                                    <DataTemplate>
+                                        <StackPanel>
+                                            <TextBlock Text="{Binding Path=Name}" />
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </GroupStyle.HeaderTemplate>
+                                <GroupStyle.ContainerStyle>
+                                    <Style TargetType="{x:Type GroupItem}">
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="{x:Type GroupItem}">
+                                                    <Expander>
+                                                        <Expander.Header>
+                                                            <TextBlock Text="{Binding Path=Name}" />
+                                                        </Expander.Header>
+                                                        <ItemsPresenter />
+                                                    </Expander>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </GroupStyle.ContainerStyle>
+                            </GroupStyle>
+                        </DataGrid.GroupStyle>
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="Country" Binding="{Binding Country}" />
+                            <DataGridTextColumn Header="Domain" Binding="{Binding Domain}" />
+                            <DataGridTextColumn Header="Kind" Binding="{Binding Kind}" />
+                            <DataGridTextColumn Header="Category" Binding="{Binding Category}" />
+                            <DataGridTextColumn Header="Subcategory" Binding="{Binding Subcategory}" />
+                            <DataGridTextColumn Header="Specific" Binding="{Binding Specific}" />
+                            <DataGridTextColumn Header="Extra" Binding="{Binding Extra}" />
+                            <DataGridTextColumn Header="Range" Binding="{Binding Id2}" />
+                            <DataGridTextColumn Header="Description" Binding="{Binding Description}" />
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </Grid>
+            </TabItem>
+            <TabItem Header="Aggregate types">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <ToolBarTray>
+                        <ToolBar Grid.Row="0"  HorizontalAlignment="Stretch">
+                            <Label Content="CET Version:" />
+                            <ToggleButton IsChecked="True" x:Name="toggleAggregate2006" Click="toggleAggregate2006_Click">2006 R35</ToggleButton>
+                            <ToggleButton x:Name="toggleAggregate2010" Click="toggleAggregate2010_Click" IsChecked="False">2010 RC3</ToggleButton>
+                        </ToolBar>
+                    </ToolBarTray>
+                    <TreeView Grid.Row="1" HorizontalAlignment="Stretch" Name="treeViewAggregateTypes" VerticalAlignment="Stretch" ItemsSource="{Binding}" ItemTemplate="{StaticResource cet}"/>
+                </Grid>
+            </TabItem>
+            <TabItem Header="Enumerations">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <TreeView Grid.Row="0" HorizontalAlignment="Stretch" Name="treeViewEnumerations" VerticalAlignment="Stretch" ItemsSource="{Binding}" ItemTemplate="{StaticResource enums}"/>
+                </Grid>
+            </TabItem>
+        </TabControl>
+    </Grid>
+</Window>
diff --git a/Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml.cs b/Samples/OpenDis.Demo/MainWindow.xaml.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml.cs
rename to Samples/OpenDis.Demo/MainWindow.xaml.cs
index 0afc086..db23d0c 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/MainWindow.xaml.cs
+++ b/Samples/OpenDis.Demo/MainWindow.xaml.cs
@@ -1,147 +1,147 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using OpenDis.Core;
-using Cet2006 = OpenDis.Enumerations.Cet2006;
-using Cet2010 = OpenDis.Enumerations.Cet2010;
-
-namespace OpenDis.Demo
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        private static Cet2006.Cet cet2006EntityTypes = Cet2006.CetFactory.CreateEntityTypes();
-        private static Cet2006.Cet cet2006AggregateTypes = Cet2006.CetFactory.CreateAggregateTypes();
-        private static Cet2010.Cet cet2010EntityTypes = Cet2010.CetFactory.CreateEntityTypes();
-        private static Cet2010.Cet cet2010AggregateTypes = Cet2010.CetFactory.CreateAggregateTypes();
-
-        private static List<ICetItem> cet2006EntityTypesList;
-        private static List<ICetItem> cet2010EntityTypesList;
-
-        private static IEnumerable enumerations;
-
-        private static ListCollectionView cet2006View;
-        private static ListCollectionView cet2010View;
-
-        public static string GetDescription<T>(T value)
-        {
-            return "";
-        }
-
-        static MainWindow()
-        {
-            GetDescription<Orientation>(Orientation.Vertical);
-
-            cet2006EntityTypes = Cet2006.CetFactory.CreateEntityTypes();
-            cet2006AggregateTypes = Cet2006.CetFactory.CreateAggregateTypes();
-            cet2010EntityTypes = Cet2010.CetFactory.CreateEntityTypes();
-            cet2010AggregateTypes = Cet2010.CetFactory.CreateAggregateTypes();
-
-            cet2006EntityTypesList = Cet2006.CetFactory.Transform(cet2006EntityTypes);
-            cet2010EntityTypesList = Cet2010.CetFactory.Transform(cet2010EntityTypes);
-
-            cet2006View = new ListCollectionView(cet2006EntityTypesList);
-            cet2006View.GroupDescriptions.Add(new PropertyGroupDescription("Country"));
-
-            cet2010View = new ListCollectionView(cet2010EntityTypesList);
-            cet2010View.GroupDescriptions.Add(new PropertyGroupDescription("Country"));
-            
-            IEnumerable<Type> types = from a in 
-                                          Assembly.GetAssembly(typeof(IPdu)).GetTypes() 
-                                      where a.IsEnum && a.Namespace.Contains("Enumerations") 
-                                      select a;
-            enumerations =
-                from n in
-                    (from m in types select m.Namespace).Distinct<string>()
-                select new
-                {
-                    Namespace = n,
-                    Enums = from t in types
-                            select new
-                            {
-                                Name = t.Name,
-                                Values = from r in Enum.GetNames(t) select new { Name = r, Value = Convert.ChangeType(Enum.Parse(t, r), Enum.GetUnderlyingType(t)) }
-                            }
-                };
-        }
-
-        public MainWindow()
-        {
-            InitializeComponent();
-
-            treeViewEntityTypes.DataContext = cet2006EntityTypes.Entities;
-            dataGridEntityTypes.DataContext = cet2006View;
-            treeViewAggregateTypes.DataContext =  cet2006AggregateTypes.Entities;
-            this.treeViewEnumerations.DataContext = enumerations;
-        }
-
-        private void toggleEntityGrid_Click(object sender, RoutedEventArgs e)
-        {
-            this.toggleEntityTree.IsChecked = false;
-            this.toggleEntityGrid.IsChecked = true;
-            this.treeViewEntityTypes.Visibility = Visibility.Hidden;
-            this.dataGridEntityTypes.Visibility = Visibility.Visible;
-        }
-
-        private void toggleEntityTree_Click(object sender, RoutedEventArgs e)
-        {
-            this.toggleEntityTree.IsChecked = true;
-            this.toggleEntityGrid.IsChecked = false;
-            this.treeViewEntityTypes.Visibility = Visibility.Visible;
-            this.dataGridEntityTypes.Visibility = Visibility.Hidden;
-        }
-
-        private void toggleCet2010_Click(object sender, RoutedEventArgs e)
-        {
-            Cursor = Cursors.Wait;
-            treeViewEntityTypes.DataContext = cet2010EntityTypes.Entities;
-            dataGridEntityTypes.DataContext = cet2010View;
-            this.toggleCet2010.IsChecked = true;
-            this.toggleCet2006.IsChecked = false;
-            Cursor = Cursors.Arrow;
-        }
-
-        private void toggleCet2006_Click(object sender, RoutedEventArgs e)
-        {
-            Cursor = Cursors.Wait;
-            treeViewEntityTypes.DataContext = cet2006EntityTypes.Entities;
-            dataGridEntityTypes.DataContext = cet2006View;
-            this.toggleCet2010.IsChecked = false;
-            this.toggleCet2006.IsChecked = true;
-            Cursor = Cursors.Arrow; 
-        }
-
-        private void toggleAggregate2010_Click(object sender, RoutedEventArgs e)
-        {
-            Cursor = Cursors.Wait;
-            treeViewAggregateTypes.DataContext = cet2010AggregateTypes.Entities;
-            this.toggleAggregate2010.IsChecked = true;
-            this.toggleAggregate2006.IsChecked = false;
-            Cursor = Cursors.Arrow;
-        }
-
-        private void toggleAggregate2006_Click(object sender, RoutedEventArgs e)
-        {
-            Cursor = Cursors.Wait;
-            treeViewAggregateTypes.DataContext = cet2006AggregateTypes.Entities;
-            this.toggleAggregate2010.IsChecked = false;
-            this.toggleAggregate2006.IsChecked = true;
-            Cursor = Cursors.Arrow;
-        }
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using OpenDis.Core;
+using Cet2006 = OpenDis.Enumerations.Cet2006;
+using Cet2010 = OpenDis.Enumerations.Cet2010;
+
+namespace OpenDis.Demo
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        private static Cet2006.Cet cet2006EntityTypes = Cet2006.CetFactory.CreateEntityTypes();
+        private static Cet2006.Cet cet2006AggregateTypes = Cet2006.CetFactory.CreateAggregateTypes();
+        private static Cet2010.Cet cet2010EntityTypes = Cet2010.CetFactory.CreateEntityTypes();
+        private static Cet2010.Cet cet2010AggregateTypes = Cet2010.CetFactory.CreateAggregateTypes();
+
+        private static List<ICetItem> cet2006EntityTypesList;
+        private static List<ICetItem> cet2010EntityTypesList;
+
+        private static IEnumerable enumerations;
+
+        private static ListCollectionView cet2006View;
+        private static ListCollectionView cet2010View;
+
+        public static string GetDescription<T>(T value)
+        {
+            return "";
+        }
+
+        static MainWindow()
+        {
+            GetDescription<Orientation>(Orientation.Vertical);
+
+            cet2006EntityTypes = Cet2006.CetFactory.CreateEntityTypes();
+            cet2006AggregateTypes = Cet2006.CetFactory.CreateAggregateTypes();
+            cet2010EntityTypes = Cet2010.CetFactory.CreateEntityTypes();
+            cet2010AggregateTypes = Cet2010.CetFactory.CreateAggregateTypes();
+
+            cet2006EntityTypesList = Cet2006.CetFactory.Transform(cet2006EntityTypes);
+            cet2010EntityTypesList = Cet2010.CetFactory.Transform(cet2010EntityTypes);
+
+            cet2006View = new ListCollectionView(cet2006EntityTypesList);
+            cet2006View.GroupDescriptions.Add(new PropertyGroupDescription("Country"));
+
+            cet2010View = new ListCollectionView(cet2010EntityTypesList);
+            cet2010View.GroupDescriptions.Add(new PropertyGroupDescription("Country"));
+            
+            IEnumerable<Type> types = from a in 
+                                          Assembly.GetAssembly(typeof(IPdu)).GetTypes() 
+                                      where a.IsEnum && a.Namespace.Contains("Enumerations") 
+                                      select a;
+            enumerations =
+                from n in
+                    (from m in types select m.Namespace).Distinct<string>()
+                select new
+                {
+                    Namespace = n,
+                    Enums = from t in types
+                            select new
+                            {
+                                Name = t.Name,
+                                Values = from r in Enum.GetNames(t) select new { Name = r, Value = Convert.ChangeType(Enum.Parse(t, r), Enum.GetUnderlyingType(t)) }
+                            }
+                };
+        }
+
+        public MainWindow()
+        {
+            InitializeComponent();
+
+            treeViewEntityTypes.DataContext = cet2006EntityTypes.Entities;
+            dataGridEntityTypes.DataContext = cet2006View;
+            treeViewAggregateTypes.DataContext =  cet2006AggregateTypes.Entities;
+            this.treeViewEnumerations.DataContext = enumerations;
+        }
+
+        private void toggleEntityGrid_Click(object sender, RoutedEventArgs e)
+        {
+            this.toggleEntityTree.IsChecked = false;
+            this.toggleEntityGrid.IsChecked = true;
+            this.treeViewEntityTypes.Visibility = Visibility.Hidden;
+            this.dataGridEntityTypes.Visibility = Visibility.Visible;
+        }
+
+        private void toggleEntityTree_Click(object sender, RoutedEventArgs e)
+        {
+            this.toggleEntityTree.IsChecked = true;
+            this.toggleEntityGrid.IsChecked = false;
+            this.treeViewEntityTypes.Visibility = Visibility.Visible;
+            this.dataGridEntityTypes.Visibility = Visibility.Hidden;
+        }
+
+        private void toggleCet2010_Click(object sender, RoutedEventArgs e)
+        {
+            Cursor = Cursors.Wait;
+            treeViewEntityTypes.DataContext = cet2010EntityTypes.Entities;
+            dataGridEntityTypes.DataContext = cet2010View;
+            this.toggleCet2010.IsChecked = true;
+            this.toggleCet2006.IsChecked = false;
+            Cursor = Cursors.Arrow;
+        }
+
+        private void toggleCet2006_Click(object sender, RoutedEventArgs e)
+        {
+            Cursor = Cursors.Wait;
+            treeViewEntityTypes.DataContext = cet2006EntityTypes.Entities;
+            dataGridEntityTypes.DataContext = cet2006View;
+            this.toggleCet2010.IsChecked = false;
+            this.toggleCet2006.IsChecked = true;
+            Cursor = Cursors.Arrow; 
+        }
+
+        private void toggleAggregate2010_Click(object sender, RoutedEventArgs e)
+        {
+            Cursor = Cursors.Wait;
+            treeViewAggregateTypes.DataContext = cet2010AggregateTypes.Entities;
+            this.toggleAggregate2010.IsChecked = true;
+            this.toggleAggregate2006.IsChecked = false;
+            Cursor = Cursors.Arrow;
+        }
+
+        private void toggleAggregate2006_Click(object sender, RoutedEventArgs e)
+        {
+            Cursor = Cursors.Wait;
+            treeViewAggregateTypes.DataContext = cet2006AggregateTypes.Entities;
+            this.toggleAggregate2010.IsChecked = false;
+            this.toggleAggregate2006.IsChecked = true;
+            Cursor = Cursors.Arrow;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis.Demo/OpenDis.Demo.csproj b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/OpenDis.Demo.csproj
rename to Samples/OpenDis.Demo/OpenDis.Demo.csproj
index 25352fc..e69fe66 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/OpenDis.Demo.csproj
+++ b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenDis.Demo</RootNamespace>
-    <AssemblyName>OpenDis.Demo</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
-      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
-      <Name>OpenDis</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenDis.Demo</RootNamespace>
+    <AssemblyName>OpenDis.Demo</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
+      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
+      <Name>OpenDis</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis.Demo/Properties/AssemblyInfo.cs b/Samples/OpenDis.Demo/Properties/AssemblyInfo.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/Properties/AssemblyInfo.cs
rename to Samples/OpenDis.Demo/Properties/AssemblyInfo.cs
index 2ccdf9f..6b2a115 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/Properties/AssemblyInfo.cs
+++ b/Samples/OpenDis.Demo/Properties/AssemblyInfo.cs
@@ -1,55 +1,55 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenDis.Demo")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("OpenDis.Demo")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenDis.Demo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("OpenDis.Demo")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.Designer.cs b/Samples/OpenDis.Demo/Properties/Resources.Designer.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.Designer.cs
rename to Samples/OpenDis.Demo/Properties/Resources.Designer.cs
index 3c8a087..ddeb03b 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.Designer.cs
+++ b/Samples/OpenDis.Demo/Properties/Resources.Designer.cs
@@ -1,71 +1,71 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenDis.Demo.Properties
-{
-
-
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
-        }
-
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenDis.Demo.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
-                return resourceCulture;
-            }
-            set
-            {
-                resourceCulture = value;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenDis.Demo.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenDis.Demo.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.resx b/Samples/OpenDis.Demo/Properties/Resources.resx
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.resx
rename to Samples/OpenDis.Demo/Properties/Resources.resx
index ffecec8..af7dbeb 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/Properties/Resources.resx
+++ b/Samples/OpenDis.Demo/Properties/Resources.resx
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.Designer.cs b/Samples/OpenDis.Demo/Properties/Settings.Designer.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.Designer.cs
rename to Samples/OpenDis.Demo/Properties/Settings.Designer.cs
index 5429c3f..00f6e1d 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.Designer.cs
+++ b/Samples/OpenDis.Demo/Properties/Settings.Designer.cs
@@ -1,30 +1,30 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenDis.Demo.Properties
-{
-
-
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
-                return defaultInstance;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenDis.Demo.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.settings b/Samples/OpenDis.Demo/Properties/Settings.settings
similarity index 97%
rename from Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.settings
rename to Samples/OpenDis.Demo/Properties/Settings.settings
index 8f2fd95..033d7a5 100644
--- a/Libs/CsharpDis6/OpenDis.Demo/Properties/Settings.settings
+++ b/Samples/OpenDis.Demo/Properties/Settings.settings
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
 </SettingsFile>
\ No newline at end of file

From 32fcbf868c48a4611974e845985471556164afee Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sat, 9 Oct 2021 13:25:31 +0200
Subject: [PATCH 06/25] [BLD] Re-organize all the repo

---
 .vs/OpenDis/DesignTimeBuild/.dtbcache.v2      |   Bin 0 -> 84205 bytes
 Libs/CSharpDis7/AcknowledgePdu.cs             |   414 -
 Libs/CSharpDis7/AcknowledgeReliablePdu.cs     |   345 -
 Libs/CSharpDis7/AcousticEmitter.cs            |   341 -
 Libs/CSharpDis7/ActionRequestPdu.cs           |   588 -
 Libs/CSharpDis7/ActionRequestReliablePdu.cs   |   615 -
 Libs/CSharpDis7/ActionResponsePdu.cs          |   588 -
 Libs/CSharpDis7/ActionResponseReliablePdu.cs  |   519 -
 Libs/CSharpDis7/AggregateIdentifier.cs        |   312 -
 Libs/CSharpDis7/AggregateMarking.cs           |   335 -
 Libs/CSharpDis7/AggregateType.cs              |   463 -
 Libs/CSharpDis7/AngleDeception.cs             |   661 -
 Libs/CSharpDis7/AngularVelocityVector.cs      |   341 -
 Libs/CSharpDis7/AntennaLocation.cs            |   315 -
 Libs/CSharpDis7/ArealObjectStatePdu.cs        |   685 -
 Libs/CSharpDis7/ArticulatedParts.cs           |   405 -
 Libs/CSharpDis7/Association.cs                |   367 -
 Libs/CSharpDis7/AttachedParts.cs              |   405 -
 Libs/CSharpDis7/Attribute.cs                  |   323 -
 Libs/CSharpDis7/AttributePdu.cs               |   539 -
 Libs/CSharpDis7/BeamAntennaPattern.cs         |   538 -
 Libs/CSharpDis7/BeamData.cs                   |   405 -
 Libs/CSharpDis7/BeamStatus.cs                 |   277 -
 Libs/CSharpDis7/BlankingSector.cs             |   505 -
 Libs/CSharpDis7/ChangeOptions.cs              |   245 -
 Libs/CSharpDis7/ClockTime.cs                  |   309 -
 Libs/CSharpDis7/CollisionElasticPdu.cs        |   745 -
 Libs/CSharpDis7/CollisionPdu.cs               |   519 -
 Libs/CSharpDis7/CommentPdu.cs                 |   455 -
 Libs/CSharpDis7/CommentReliablePdu.cs         |   455 -
 Libs/CSharpDis7/CommunicationsNodeID.cs       |   300 -
 Libs/CSharpDis7/CreateEntityPdu.cs            |   350 -
 Libs/CSharpDis7/CreateEntityReliablePdu.cs    |   377 -
 Libs/CSharpDis7/DataPdu.cs                    |   519 -
 .../CSharpDis7/DataQueryDatumSpecification.cs |   451 -
 Libs/CSharpDis7/DataQueryPdu.cs               |   519 -
 Libs/CSharpDis7/DataQueryReliablePdu.cs       |   615 -
 Libs/CSharpDis7/DataReliablePdu.cs            |   583 -
 Libs/CSharpDis7/DatumSpecification.cs         |   451 -
 Libs/CSharpDis7/DeadReckoningParameters.cs    |   404 -
 Libs/CSharpDis7/DesignatorPdu.cs              |   646 -
 Libs/CSharpDis7/DetonationPdu.cs              |   625 -
 Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs |   547 -
 Libs/CSharpDis7/DirectedEnergyDamage.cs       |   635 -
 Libs/CSharpDis7/DirectedEnergyFirePdu.cs      |   809 -
 .../DirectedEnergyPrecisionAimpoint.cs        |   674 -
 .../DirectedEnergyTargetEnergyDeposition.cs   |   344 -
 .../DistributedEmissionsFamilyPdu.cs          |   248 -
 Libs/CSharpDis7/EEFundamentalParameterData.cs |   405 -
 Libs/CSharpDis7/EightByteChunk.cs             |   303 -
 Libs/CSharpDis7/ElectronicEmissionsPdu.cs     |   620 -
 Libs/CSharpDis7/EmitterSystem.cs              |   341 -
 Libs/CSharpDis7/EngineFuel.cs                 |   405 -
 Libs/CSharpDis7/EngineFuelReload.cs           |   469 -
 Libs/CSharpDis7/EntityAssociation.cs          |   536 -
 Libs/CSharpDis7/EntityDamageStatusPdu.cs      |   451 -
 Libs/CSharpDis7/EntityID.cs                   |   312 -
 Libs/CSharpDis7/EntityInformationFamilyPdu.cs |   248 -
 Libs/CSharpDis7/EntityManagementFamilyPdu.cs  |   248 -
 Libs/CSharpDis7/EntityMarking.cs              |   335 -
 Libs/CSharpDis7/EntityStatePdu.cs             |   721 -
 Libs/CSharpDis7/EntityStateUpdatePdu.cs       |   557 -
 Libs/CSharpDis7/EntityType.cs                 |   463 -
 Libs/CSharpDis7/EntityTypeVP.cs               |   408 -
 Libs/CSharpDis7/Environment.cs                |   373 -
 Libs/CSharpDis7/EnvironmentGeneral.cs         |   437 -
 Libs/CSharpDis7/EnvironmentType.cs            |   463 -
 Libs/CSharpDis7/EulerAngles.cs                |   323 -
 Libs/CSharpDis7/EventIdentifier.cs            |   306 -
 Libs/CSharpDis7/EventIdentifierLiveEntity.cs  |   323 -
 Libs/CSharpDis7/EventReportPdu.cs             |   519 -
 Libs/CSharpDis7/EventReportReliablePdu.cs     |   519 -
 Libs/CSharpDis7/Expendable.cs                 |   384 -
 Libs/CSharpDis7/ExpendableDescriptor.cs       |   312 -
 Libs/CSharpDis7/ExpendableReload.cs           |   410 -
 Libs/CSharpDis7/ExplosionDescriptor.cs        |   376 -
 Libs/CSharpDis7/FalseTargetsAttribute.cs      |   609 -
 Libs/CSharpDis7/FastEntityStatePdu.cs         |  1590 -
 Libs/CSharpDis7/FirePdu.cs                    |   488 -
 Libs/CSharpDis7/FixedDatum.cs                 |   309 -
 Libs/CSharpDis7/FourByteChunk.cs              |   303 -
 Libs/CSharpDis7/FundamentalOperationalData.cs |   565 -
 Libs/CSharpDis7/GridAxis.cs                   |   469 -
 Libs/CSharpDis7/GroupIdentifier.cs            |   312 -
 .../CSharpDis7/IFFFundamentalParameterData.cs |   495 -
 Libs/CSharpDis7/IOCommunicationsNode.cs       |   404 -
 Libs/CSharpDis7/IOEffect.cs                   |   482 -
 Libs/CSharpDis7/IffDataSpecification.cs       |   280 -
 .../IntercomCommunicationsParameters.cs       |   341 -
 Libs/CSharpDis7/IntercomIdentifier.cs         |   349 -
 Libs/CSharpDis7/IntercomSignalPdu.cs          |   525 -
 Libs/CSharpDis7/IsPartOfPdu.cs                |   458 -
 Libs/CSharpDis7/JammingTechnique.cs           |   349 -
 Libs/CSharpDis7/LaunchedMunitionRecord.cs     |   437 -
 Libs/CSharpDis7/LayerHeader.cs                |   335 -
 Libs/CSharpDis7/LinearObjectStatePdu.cs       |   589 -
 Libs/CSharpDis7/LinearSegmentParameter.cs     |   571 -
 Libs/CSharpDis7/LiveEntityIdentifier.cs       |   312 -
 Libs/CSharpDis7/LiveEntityPdu.cs              |   301 -
 Libs/CSharpDis7/LiveSimulationAddress.cs      |   309 -
 Libs/CSharpDis7/LogisticsFamilyPdu.cs         |   248 -
 Libs/CSharpDis7/MineEntityIdentifier.cs       |   312 -
 Libs/CSharpDis7/MinefieldFamilyPdu.cs         |   248 -
 Libs/CSharpDis7/MinefieldIdentifier.cs        |   312 -
 Libs/CSharpDis7/MinefieldResponseNackPdu.cs   |   453 -
 Libs/CSharpDis7/MinefieldStatePdu.cs          |   723 -
 Libs/CSharpDis7/ModulationParameters.cs       |   245 -
 Libs/CSharpDis7/ModulationType.cs             |   373 -
 Libs/CSharpDis7/Munition.cs                   |   408 -
 Libs/CSharpDis7/MunitionDescriptor.cs         |   408 -
 Libs/CSharpDis7/MunitionReload.cs             |   440 -
 .../CSharpDis7/NamedLocationIdentification.cs |   309 -
 Libs/CSharpDis7/ObjectIdentifier.cs           |   312 -
 Libs/CSharpDis7/ObjectType.cs                 |   373 -
 Libs/CSharpDis7/OneByteChunk.cs               |   303 -
 Libs/CSharpDis7/OwnershipStatus.cs            |   344 -
 Libs/CSharpDis7/Pdu.cs                        |   301 -
 Libs/CSharpDis7/PduContainer.cs               |   348 -
 Libs/CSharpDis7/PduHeader.cs                  |   501 -
 Libs/CSharpDis7/PduStatus.cs                  |   277 -
 Libs/CSharpDis7/PduSuperclass.cs              |   437 -
 Libs/CSharpDis7/PointObjectStatePdu.cs        |   652 -
 Libs/CSharpDis7/PropulsionSystemData.cs       |   309 -
 .../RadioCommunicationsFamilyPdu.cs           |   316 -
 Libs/CSharpDis7/RadioIdentifier.cs            |   373 -
 Libs/CSharpDis7/RadioType.cs                  |   457 -
 Libs/CSharpDis7/ReceiverPdu.cs                |   412 -
 Libs/CSharpDis7/RecordQueryReliablePdu.cs     |   544 -
 Libs/CSharpDis7/RecordQuerySpecification.cs   |   345 -
 Libs/CSharpDis7/RecordSpecification.cs        |   348 -
 Libs/CSharpDis7/RecordSpecificationElement.cs |   437 -
 Libs/CSharpDis7/Relationship.cs               |   309 -
 Libs/CSharpDis7/RemoveEntityPdu.cs            |   350 -
 Libs/CSharpDis7/RemoveEntityReliablePdu.cs    |   377 -
 Libs/CSharpDis7/RepairCompletePdu.cs          |   382 -
 Libs/CSharpDis7/RepairResponsePdu.cs          |   414 -
 Libs/CSharpDis7/ResupplyOfferPdu.cs           |   485 -
 Libs/CSharpDis7/ResupplyReceivedPdu.cs        |   485 -
 Libs/CSharpDis7/SecondaryOperationalData.cs   |   341 -
 Libs/CSharpDis7/SeesPdu.cs                    |   586 -
 Libs/CSharpDis7/Sensor.cs                     |   437 -
 Libs/CSharpDis7/SeparationVP.cs               |   472 -
 Libs/CSharpDis7/ServiceRequestPdu.cs          |   479 -
 Libs/CSharpDis7/SetDataPdu.cs                 |   519 -
 Libs/CSharpDis7/SetDataReliablePdu.cs         |   583 -
 Libs/CSharpDis7/SimulationAddress.cs          |   309 -
 Libs/CSharpDis7/SimulationIdentifier.cs       |   312 -
 .../SimulationManagementFamilyPdu.cs          |   318 -
 .../SimulationManagementPduHeader.cs          |   349 -
 ...ationManagementWithReliabilityFamilyPdu.cs |   318 -
 .../StandardVariableSpecification.cs          |   348 -
 Libs/CSharpDis7/StartResumePdu.cs             |   419 -
 Libs/CSharpDis7/StartResumeReliablePdu.cs     |   446 -
 Libs/CSharpDis7/StopFreezePdu.cs              |   481 -
 Libs/CSharpDis7/StopFreezeReliablePdu.cs      |   444 -
 Libs/CSharpDis7/StorageFuel.cs                |   405 -
 Libs/CSharpDis7/StorageFuelReload.cs          |   501 -
 Libs/CSharpDis7/SupplyQuantity.cs             |   312 -
 .../SyntheticEnvironmentFamilyPdu.cs          |   248 -
 Libs/CSharpDis7/SystemIdentifier.cs           |   376 -
 Libs/CSharpDis7/TotalRecordSets.cs            |   309 -
 Libs/CSharpDis7/TrackJamData.cs               |   344 -
 Libs/CSharpDis7/TwoByteChunk.cs               |   303 -
 Libs/CSharpDis7/UAFundamentalParameter.cs     |   437 -
 Libs/CSharpDis7/UaPdu.cs                      |   756 -
 Libs/CSharpDis7/UnattachedIdentifier.cs       |   312 -
 Libs/CSharpDis7/UnsignedDISInteger.cs         |   277 -
 Libs/CSharpDis7/VariableDatum.cs              |   373 -
 Libs/CSharpDis7/VariableParameter.cs          |   405 -
 .../VariableTransmitterParameters.cs          |   309 -
 Libs/CSharpDis7/Vector2Float.cs               |   309 -
 Libs/CSharpDis7/Vector3Double.cs              |   341 -
 Libs/CSharpDis7/Vector3Float.cs               |   341 -
 Libs/CSharpDis7/VectoringNozzleSystem.cs      |   309 -
 Libs/CSharpDis7/WarfareFamilyPdu.cs           |   318 -
 Libs/CsharpDis6/{OpenDis => }/Core/CetBase.cs |    72 +-
 Libs/CsharpDis6/{OpenDis => }/Core/DisTime.cs |     0
 .../{OpenDis => }/Core/EndianTypes.cs         |   116 +-
 .../{OpenDis => }/Core/EnumHelper.cs          |   434 +-
 .../Core/EnumNotFoundException.cs             |   164 +-
 .../CsharpDis6/{OpenDis => }/Core/ICetItem.cs |   130 +-
 Libs/CsharpDis6/{OpenDis => }/Core/IPdu.cs    |    68 +-
 .../Core/InternetDomainCodeAttribute.cs       |   150 +-
 Libs/CsharpDis6/{OpenDis => }/Core/PduBase.cs |    50 +-
 .../Core/PduExceptionEventArgs.cs             |    44 +-
 .../{OpenDis => }/Core/PduFactory.cs          |   100 +-
 .../{OpenDis => }/Dis1995/EntityID.cs         |    30 +-
 .../Dis1995/Generated/AcknowledgePdu.cs       |   736 +-
 .../Dis1995/Generated/ActionRequestPdu.cs     |  1096 +-
 .../Dis1995/Generated/ActionResponsePdu.cs    |  1096 +-
 .../Generated/AngularVelocityVector.cs        |   728 +-
 .../Dis1995/Generated/AntennaLocation.cs      |   676 +-
 .../Generated/ArticulationParameter.cs        |   826 +-
 .../Dis1995/Generated/BeamAntennaPattern.cs   |  1030 +-
 .../Dis1995/Generated/BurstDescriptor.cs      |   862 +-
 .../Dis1995/Generated/ClockTime.cs            |   664 +-
 .../Dis1995/Generated/CollisionPdu.cs         |  1084 +-
 .../Dis1995/Generated/CommentPdu.cs           |   968 +-
 .../Dis1995/Generated/CreateEntityPdu.cs      |   608 +-
 .../Dis1995/Generated/DataPdu.cs              |  1096 +-
 .../Dis1995/Generated/DataQueryPdu.cs         |  1096 +-
 .../Generated/DeadReckoningParameter.cs       |   862 +-
 .../Dis1995/Generated/DesignatorPdu.cs        |  1338 +-
 .../Dis1995/Generated/DetonationPdu.cs        |  1228 +-
 .../Generated/DistributedEmissionsPdu.cs      |   542 +-
 .../Dis1995/Generated/EightByteChunk.cs       |   648 +-
 .../Generated/ElectronicEmmisionsPdu.cs       |  1470 +-
 .../Dis1995/Generated/EmitterSystem.cs        |   728 +-
 .../Dis1995/Generated/EntityID.cs             |   728 +-
 .../Dis1995/Generated/EntityInformationPdu.cs |   542 +-
 .../Dis1995/Generated/EntityStatePdu.cs       |  1548 +-
 .../Dis1995/Generated/EntityType.cs           |   978 +-
 .../Dis1995/Generated/EventID.cs              |   728 +-
 .../Dis1995/Generated/EventReportPdu.cs       |  1096 +-
 .../Dis1995/Generated/FirePdu.cs              |  1016 +-
 .../Dis1995/Generated/FixedDatum.cs           |   664 +-
 .../Generated/FundamentalParameterData.cs     |  1176 +-
 .../Dis1995/Generated/LogisticsPdu.cs         |   542 +-
 .../Dis1995/Generated/ModulationType.cs       |   792 +-
 .../Dis1995/Generated/Orientation.cs          |   710 +-
 .../{OpenDis => }/Dis1995/Generated/Pdu.cs    |   984 +-
 .../Generated/RadioCommunicationsPdu.cs       |   678 +-
 .../Dis1995/Generated/RadioEntityType.cs      |   978 +-
 .../Dis1995/Generated/ReceiverPdu.cs          |   870 +-
 .../Dis1995/Generated/RemoveEntityPdu.cs      |   608 +-
 .../Dis1995/Generated/RepairCompletePdu.cs    |   810 +-
 .../Dis1995/Generated/RepairResponsePdu.cs    |   874 +-
 .../Dis1995/Generated/ResupplyCancelPdu.cs    |   682 +-
 .../Dis1995/Generated/ResupplyOfferPdu.cs     |  1016 +-
 .../Dis1995/Generated/ResupplyReceivedPdu.cs  |  1016 +-
 .../Dis1995/Generated/ServiceRequestPdu.cs    |  1016 +-
 .../Dis1995/Generated/SetDataPdu.cs           |  1096 +-
 .../Dis1995/Generated/SignalPdu.cs            |   864 +-
 .../Dis1995/Generated/SimulationAddress.cs    |   664 +-
 .../Generated/SimulationManagementPdu.cs      |   682 +-
 .../SphericalHarmonicAntennaPattern.cs        |   594 +-
 .../Dis1995/Generated/StartResumePdu.cs       |   746 +-
 .../Dis1995/Generated/StopFreezePdu.cs        |   870 +-
 .../Dis1995/Generated/SupplyQuantity.cs       |   670 +-
 .../Dis1995/Generated/TransmitterPdu.cs       |  1950 +-
 .../Dis1995/Generated/VariableDatum.cs        |   812 +-
 .../Dis1995/Generated/Vector3Double.cs        |   728 +-
 .../Dis1995/Generated/Vector3Float.cs         |   728 +-
 .../Dis1995/Generated/Warfare.cs              |   682 +-
 .../{OpenDis => }/Dis1995/PduFactory.cs       |   244 +-
 .../{OpenDis => }/Dis1995/Vector3Double.cs    |    38 +-
 .../{OpenDis => }/Dis1995/Vector3Float.cs     |    38 +-
 .../{OpenDis => }/Dis1998/EntityID.cs         |    42 +-
 .../Dis1998/Generated/AcknowledgePdu.cs       |   736 +-
 .../Generated/AcknowledgeReliablePdu.cs       |   736 +-
 .../Dis1998/Generated/AcousticBeamData.cs     |   798 +-
 .../AcousticBeamFundamentalParameter.cs       |   920 +-
 .../Dis1998/Generated/AcousticEmitter.cs      |   728 +-
 .../Generated/AcousticEmitterSystem.cs        |   728 +-
 .../Generated/AcousticEmitterSystemData.cs    |  1016 +-
 .../Dis1998/Generated/ActionRequestPdu.cs     |  1096 +-
 .../Generated/ActionRequestReliablePdu.cs     |  1288 +-
 .../Dis1998/Generated/ActionResponsePdu.cs    |  1096 +-
 .../Generated/ActionResponseReliablePdu.cs    |  1096 +-
 .../Dis1998/Generated/AggregateID.cs          |   728 +-
 .../Dis1998/Generated/AggregateMarking.cs     |   718 +-
 .../Dis1998/Generated/AggregateStatePdu.cs    |  2360 +-
 .../Dis1998/Generated/AggregateType.cs        |   978 +-
 .../Generated/AngularVelocityVector.cs        |   728 +-
 .../Dis1998/Generated/AntennaLocation.cs      |   676 +-
 .../Dis1998/Generated/ApaData.cs              |   664 +-
 .../Dis1998/Generated/ArealObjectStatePdu.cs  |  1364 +-
 .../Generated/ArticulationParameter.cs        |   826 +-
 .../Dis1998/Generated/BeamAntennaPattern.cs   |  1030 +-
 .../Dis1998/Generated/BeamData.cs             |   856 +-
 .../Dis1998/Generated/BurstDescriptor.cs      |   862 +-
 .../Dis1998/Generated/ClockTime.cs            |   664 +-
 .../Dis1998/Generated/CollisionElasticPdu.cs  |  1536 +-
 .../Dis1998/Generated/CollisionPdu.cs         |  1084 +-
 .../Dis1998/Generated/CommentPdu.cs           |   968 +-
 .../Dis1998/Generated/CommentReliablePdu.cs   |   968 +-
 .../Dis1998/Generated/CreateEntityPdu.cs      |   608 +-
 .../Generated/CreateEntityReliablePdu.cs      |   800 +-
 .../Dis1998/Generated/DataPdu.cs              |  1096 +-
 .../Dis1998/Generated/DataQueryPdu.cs         |  1096 +-
 .../Dis1998/Generated/DataQueryReliablePdu.cs |  1288 +-
 .../Dis1998/Generated/DataReliablePdu.cs      |  1224 +-
 .../Generated/DeadReckoningParameter.cs       |   862 +-
 .../Dis1998/Generated/DesignatorPdu.cs        |  1338 +-
 .../Dis1998/Generated/DetonationPdu.cs        |  1296 +-
 .../DistributedEmissionsFamilyPdu.cs          |   542 +-
 .../Dis1998/Generated/EightByteChunk.cs       |   648 +-
 .../Generated/ElectronicEmissionBeamData.cs   |  1266 +-
 .../Generated/ElectronicEmissionSystemData.cs |  1016 +-
 .../Generated/ElectronicEmissionsPdu.cs       |  1024 +-
 .../Dis1998/Generated/EmitterSystem.cs        |   728 +-
 .../Dis1998/Generated/EntityID.cs             |   728 +-
 .../Generated/EntityInformationFamilyPdu.cs   |   542 +-
 .../Generated/EntityManagementFamilyPdu.cs    |   542 +-
 .../Dis1998/Generated/EntityStatePdu.cs       |  1500 +-
 .../Dis1998/Generated/EntityStateUpdatePdu.cs |  1160 +-
 .../Dis1998/Generated/EntityType.cs           |   978 +-
 .../Dis1998/Generated/Environment.cs          |   920 +-
 .../Generated/EnvironmentalProcessPdu.cs      |  1088 +-
 .../Dis1998/Generated/EventID.cs              |   728 +-
 .../Dis1998/Generated/EventReportPdu.cs       |  1096 +-
 .../Generated/EventReportReliablePdu.cs       |  1096 +-
 .../Dis1998/Generated/FastEntityStatePdu.cs   |  3278 +-
 .../Dis1998/Generated/FirePdu.cs              |  1016 +-
 .../Dis1998/Generated/FixedDatum.cs           |   664 +-
 .../Dis1998/Generated/FourByteChunk.cs        |   648 +-
 .../Generated/FundamentalParameterData.cs     |  1176 +-
 .../Generated/FundamentalParameterDataIff.cs  |  1048 +-
 .../Dis1998/Generated/GridAxisRecord.cs       |   664 +-
 .../GridAxisRecordRepresentation0.cs          |   692 +-
 .../GridAxisRecordRepresentation1.cs          |   860 +-
 .../GridAxisRecordRepresentation2.cs          |   732 +-
 .../Dis1998/Generated/GriddedDataPdu.cs       |  1606 +-
 .../Generated/IffAtcNavAidsLayer1Pdu.cs       |   958 +-
 .../Generated/IffAtcNavAidsLayer2Pdu.cs       |   888 +-
 .../Dis1998/Generated/IffFundamentalData.cs   |  1176 +-
 .../IntercomCommunicationsParameters.cs       |   728 +-
 .../Dis1998/Generated/IntercomControlPdu.cs   |  1406 +-
 .../Dis1998/Generated/IntercomSignalPdu.cs    |  1106 +-
 .../Dis1998/Generated/IsGroupOfPdu.cs         |  1082 +-
 .../Dis1998/Generated/IsPartOfPdu.cs          |   962 +-
 .../Dis1998/Generated/LayerHeader.cs          |   728 +-
 .../Dis1998/Generated/LinearObjectStatePdu.cs |  1230 +-
 .../Generated/LinearSegmentParameter.cs       |  1130 +-
 .../Dis1998/Generated/LogisticsFamilyPdu.cs   |   542 +-
 .../Dis1998/Generated/Marking.cs              |   718 +-
 .../Dis1998/Generated/MinefieldDataPdu.cs     |  1630 +-
 .../Dis1998/Generated/MinefieldFamilyPdu.cs   |   542 +-
 .../Dis1998/Generated/MinefieldQueryPdu.cs    |  1368 +-
 .../Generated/MinefieldResponseNackPdu.cs     |   958 +-
 .../Dis1998/Generated/MinefieldStatePdu.cs    |  1504 +-
 .../Dis1998/Generated/ModulationType.cs       |   792 +-
 .../Dis1998/Generated/NamedLocation.cs        |   664 +-
 .../Dis1998/Generated/ObjectType.cs           |   856 +-
 .../Dis1998/Generated/OneByteChunk.cs         |   648 +-
 .../Dis1998/Generated/Orientation.cs          |   710 +-
 .../{OpenDis => }/Dis1998/Generated/Pdu.cs    |   984 +-
 .../Dis1998/Generated/PduContainer.cs         |   748 +-
 .../{OpenDis => }/Dis1998/Generated/Point.cs  |   664 +-
 .../Dis1998/Generated/PointObjectStatePdu.cs  |  1350 +-
 .../Dis1998/Generated/PropulsionSystemData.cs |   664 +-
 .../Generated/RadioCommunicationsFamilyPdu.cs |   678 +-
 .../Dis1998/Generated/RadioEntityType.cs      |   914 +-
 .../Dis1998/Generated/ReceiverPdu.cs          |   870 +-
 .../Generated/RecordQueryReliablePdu.cs       |  1140 +-
 .../Dis1998/Generated/RecordSet.cs            |   920 +-
 .../Dis1998/Generated/Relationship.cs         |   664 +-
 .../Dis1998/Generated/RemoveEntityPdu.cs      |   608 +-
 .../Generated/RemoveEntityReliablePdu.cs      |   800 +-
 .../Dis1998/Generated/RepairCompletePdu.cs    |   810 +-
 .../Dis1998/Generated/RepairResponsePdu.cs    |   874 +-
 .../Dis1998/Generated/ResupplyCancelPdu.cs    |   682 +-
 .../Dis1998/Generated/ResupplyOfferPdu.cs     |  1016 +-
 .../Dis1998/Generated/ResupplyReceivedPdu.cs  |  1016 +-
 .../Dis1998/Generated/SeesPdu.cs              |  1230 +-
 .../Dis1998/Generated/ServiceRequestPdu.cs    |  1016 +-
 .../Dis1998/Generated/SetDataPdu.cs           |  1096 +-
 .../Dis1998/Generated/SetDataReliablePdu.cs   |  1224 +-
 .../Dis1998/Generated/SetRecordReliablePdu.cs |  1012 +-
 .../Dis1998/Generated/ShaftRPMs.cs            |   728 +-
 .../Dis1998/Generated/SignalPdu.cs            |   968 +-
 .../Dis1998/Generated/SimulationAddress.cs    |   664 +-
 .../SimulationManagementFamilyPdu.cs          |   682 +-
 ...ationManagementWithReliabilityFamilyPdu.cs |   682 +-
 .../Dis1998/Generated/SixByteChunk.cs         |   648 +-
 .../SphericalHarmonicAntennaPattern.cs        |   594 +-
 .../Dis1998/Generated/StartResumePdu.cs       |   746 +-
 .../Generated/StartResumeReliablePdu.cs       |   938 +-
 .../Dis1998/Generated/StopFreezePdu.cs        |   870 +-
 .../Generated/StopFreezeReliablePdu.cs        |   934 +-
 .../Dis1998/Generated/SupplyQuantity.cs       |   670 +-
 .../SyntheticEnvironmentFamilyPdu.cs          |   542 +-
 .../Dis1998/Generated/SystemID.cs             |   792 +-
 .../Dis1998/Generated/TrackJamTarget.cs       |   734 +-
 .../Generated/TransferControlRequestPdu.cs    |  1154 +-
 .../Dis1998/Generated/TransmitterPdu.cs       |  1952 +-
 .../Dis1998/Generated/TwoByteChunk.cs         |   648 +-
 .../{OpenDis => }/Dis1998/Generated/UaPdu.cs  |  1570 +-
 .../Dis1998/Generated/VariableDatum.cs        |   812 +-
 .../Dis1998/Generated/Vector3Double.cs        |   728 +-
 .../Dis1998/Generated/Vector3Float.cs         |   728 +-
 .../Generated/VectoringNozzleSystemData.cs    |   664 +-
 .../Dis1998/Generated/WarfareFamilyPdu.cs     |   682 +-
 .../{OpenDis => }/Dis1998/PduFactory.cs       |   478 +-
 .../{OpenDis => }/Dis1998/Vector3Double.cs    |    38 +-
 .../{OpenDis => }/Dis1998/Vector3Float.cs     |    38 +-
 .../Enumerations/Cet2006/AggregateTypes.xml   |    30 +-
 .../Enumerations/Cet2006/Category.cs          |   168 +-
 .../{OpenDis => }/Enumerations/Cet2006/Cet.cs |    82 +-
 .../Enumerations/Cet2006/CetFactory.cs        |   248 +-
 .../Enumerations/Cet2006/CetItem.cs           |   298 +-
 .../Enumerations/Cet2006/Entity.cs            |   562 +-
 .../Enumerations/Cet2006/EntityTypes.xml      | 30510 +++++++--------
 .../Enumerations/Cet2006/Extra.cs             |   124 +-
 .../Enumerations/Cet2006/GenericEntry.cs      |   354 +-
 .../Enumerations/Cet2006/GenericTable.cs      |   354 +-
 .../Enumerations/Cet2006/Specific.cs          |   244 +-
 .../Enumerations/Cet2006/Subcategory.cs       |   244 +-
 .../Enumerations/Cet2006/cet.xsd              |     0
 .../Enumerations/Cet2010/AggregateTypes.xml   |    32 +-
 .../Enumerations/Cet2010/Category.cs          |   190 +-
 .../Enumerations/Cet2010/CategoryRange.cs     |   190 +-
 .../{OpenDis => }/Enumerations/Cet2010/Cet.cs |    88 +-
 .../Enumerations/Cet2010/CetFactory.cs        |   250 +-
 .../Enumerations/Cet2010/CetItem.cs           |   298 +-
 .../{OpenDis => }/Enumerations/Cet2010/Cr.cs  |   186 +-
 .../Enumerations/Cet2010/CrRange.cs           |   186 +-
 .../Enumerations/Cet2010/Entity.cs            |   438 +-
 .../Enumerations/Cet2010/EntityTypes.xml      | 32170 ++++++++--------
 .../Enumerations/Cet2010/Extra.cs             |   140 +-
 .../Enumerations/Cet2010/ExtraRange.cs        |   140 +-
 .../Enumerations/Cet2010/GenericEntry.cs      |   774 +-
 .../Cet2010/GenericEntryDescription.cs        |   210 +-
 .../Enumerations/Cet2010/GenericEntryRange.cs |   150 +-
 .../Cet2010/GenericEntrySingle.cs             |   104 +-
 .../Cet2010/GenericEntryStatus.cs             |    46 +-
 .../Cet2010/GenericEntryString.cs             |    94 +-
 .../Enumerations/Cet2010/GenericTable.cs      |   582 +-
 .../Cet2010/ICategoryOrCategoryRange.cs       |    24 +-
 .../Cet2010/IExtraOrExtraRange.cs             |    24 +-
 .../Enumerations/Cet2010/IGenericEntry.cs     |    44 +-
 .../Cet2010/IGenericEntryDescription.cs       |    22 +-
 .../Cet2010/ISpecificOrSpecificRange.cs       |    24 +-
 .../Cet2010/ISubcategoryOrSubcategoryRange.cs |    24 +-
 .../Enumerations/Cet2010/Specific.cs          |   190 +-
 .../Enumerations/Cet2010/SpecificRange.cs     |   190 +-
 .../Enumerations/Cet2010/Subcategory.cs       |   190 +-
 .../Enumerations/Cet2010/SubcategoryRange.cs  |   190 +-
 .../Enumerations/Cet2010/cet.xsd              |     0
 .../{OpenDis => }/Enumerations/Country.cs     |  6468 ++--
 .../InformationLayers.cs                      |   100 +-
 .../LayerSpecificInformation.cs               |    78 +-
 .../DistributedEmission.Iff/SystemMode.cs     |    78 +-
 .../DistributedEmission.Iff/SystemName.cs     |   258 +-
 .../DistributedEmission.Iff/SystemStatus.cs   |   220 +-
 .../DistributedEmission.Iff/SystemType.cs     |   178 +-
 .../Type1AlternateParameter4.cs               |   138 +-
 .../Type1ChangeOptions.cs                     |   120 +-
 .../DistributedEmission.Iff/Type1Modifier.cs  |   140 +-
 .../Type1OperationalParameter1.cs             |    78 +-
 .../Type1OperationalParameter2.cs             |    78 +-
 .../Type1Parameter1Mode1CodeStatus.cs         |   722 +-
 .../Type1Parameter2Mode2CodeStatus.cs         |   798 +-
 .../Type1Parameter3Mode3CodeStatus.cs         |   798 +-
 .../Type1Parameter4Mode4CodeStatus.cs         |   726 +-
 .../Type1Parameter5ModeCCodeStatus.cs         |   806 +-
 .../Type1Parameter6ModeSCodeStatus.cs         |   140 +-
 .../Type2AlternateParameter4.cs               |   138 +-
 .../Type2ChangeOptions.cs                     |   120 +-
 .../Type2OperationalParameter1.cs             |    78 +-
 .../Type2OperationalParameter2.cs             |    78 +-
 .../Type2Parameter1Mode1InterrogatorStatus.cs |   120 +-
 .../Type2Parameter2Mode2InterrogatorStatus.cs |   120 +-
 .../Type2Parameter3Mode3InterrogatorStatus.cs |   120 +-
 .../Type2Parameter4Mode4InterrogatorStatus.cs |   726 +-
 .../Type2Parameter5ModeCInterrogatorStatus.cs |   120 +-
 .../Type2Parameter6ModeSCodeStatus.cs         |   140 +-
 .../Type3ChangeOptions.cs                     |    80 +-
 .../Type3OperationalParameter1.cs             |    78 +-
 .../Type3OperationalParameter2.cs             |    78 +-
 .../Type3Parameter1Mode1CodeStatus.cs         |   120 +-
 .../Type3Parameter2Mode2CodeStatus.cs         |   120 +-
 .../Type3Parameter3Mode3CodeStatus.cs         |   120 +-
 .../Type3Parameter4Mode4CodeStatus.cs         |   120 +-
 .../Type3Parameter5ModeCCodeStatus.cs         |   120 +-
 .../Type3Parameter6Mode1CodeStatus.cs         |   120 +-
 .../Type4ChangeOptions.cs                     |    80 +-
 .../Type4OperationalParameter1.cs             |    78 +-
 .../Type4OperationalParameter2.cs             |    78 +-
 .../Type4Parameter1.cs                        |   120 +-
 .../Type4Parameter2.cs                        |   120 +-
 .../Type4Parameter3.cs                        |   120 +-
 .../Type4Parameter4.cs                        |   120 +-
 .../Type4Parameter5.cs                        |   120 +-
 .../Type4Parameter6.cs                        |   120 +-
 .../Type5ChangeOptions.cs                     |    80 +-
 .../Type5OperationalParameter1.cs             |    78 +-
 .../Type5OperationalParameter2.cs             |    78 +-
 .../Type5Parameter1RRBResponse.cs             |   844 +-
 .../ActiveEmissionParameterIndex.cs           |    78 +-
 ...AdditionalPassiveActivityParameterIndex.cs |   104 +-
 .../EmitterFunction.cs                        |   158 +-
 .../PassiveParameterIndex.cs                  |    78 +-
 .../PropulsionPlantConfiguration.cs           |   636 +-
 .../ScanPattern.cs                            |   178 +-
 .../StateChangeUpdateIndicator.cs             |    98 +-
 .../SystemName.cs                             |   258 +-
 .../AircraftEnginePower.cs                    |   158 +-
 .../DistributedEmission/DesignatorCode.cs     |    78 +-
 .../DistributedEmission/DesignatorCodeName.cs |    78 +-
 .../ElectromagneticEmitters.cs                | 23678 ++++++------
 .../EmissionBeamFunction.cs                   |   418 +-
 .../DistributedEmission/EmissionFunction.cs   |  1418 +-
 .../HelicopterEnginePower.cs                  |   118 +-
 .../HighDensityTrackOrJam.cs                  |    98 +-
 .../StateUpdateIndicator.cs                   |    98 +-
 .../DistributedEmission/TankEnginePower.cs    |   118 +-
 .../Appearance.cs                             |   746 +-
 .../DataFilter.cs                             |   280 +-
 .../FlirSensor.cs                             |   258 +-
 .../Entity.Information.Minefield/Fusing.cs    |   746 +-
 .../LaserSensor.cs                            |    98 +-
 .../MagneticSensor.cs                         |   138 +-
 .../MultispectralSensor.cs                    |    78 +-
 .../OpticalSensor.cs                          |   298 +-
 .../PaintScheme.cs                            |   756 +-
 .../PhysicalSensor.cs                         |   118 +-
 .../ProtocolMode.cs                           |   496 +-
 .../RadarSensor.cs                            |   178 +-
 .../SensorTypes.cs                            |   238 +-
 .../SonarSensor.cs                            |    78 +-
 .../Entity.Information/EntityCollisionType.cs |    98 +-
 .../Entity.Management/AggregateFormation.cs   |   178 +-
 .../Entity.Management/AggregateKind.cs        |   178 +-
 .../Entity.Management/AggregateSpecific.cs    |    98 +-
 .../Entity.Management/AggregateState.cs       |   178 +-
 .../Entity.Management/AggregateSubcategory.cs |   518 +-
 .../GroupOfGroupedEntityCategory.cs           |   258 +-
 .../Entity.Management/GroupOfRestStatus.cs    |   238 +-
 .../Entity.Management/PartOfNature.cs         |   278 +-
 .../Entity.Management/PartOfPosition.cs       |   118 +-
 .../Entity.Management/PartOfStationName.cs    |   398 +-
 .../Entity.Management/TransferType.cs         |   218 +-
 .../AirPlatformAppearance.cs                  |  1856 +-
 .../CulturalAppearance.cs                     |  1156 +-
 .../EnvironmentalAppearance.cs                |   766 +-
 .../LandPlatformAppearance.cs                 |  2536 +-
 .../LifeFormAppearance.cs                     |  1726 +-
 .../MunitionAppearance.cs                     |  1186 +-
 .../SensorEmitterAppearance.cs                |  1846 +-
 .../SpacePlatformAppearance.cs                |  1076 +-
 .../SubsurfacePlatformAppearance.cs           |  1266 +-
 .../SurfacePlatformAppearance.cs              |  1426 +-
 .../EntityState.Marking/ArmyMarkingCompany.cs |   398 +-
 .../ArmyMarkingDivisionCorpsDesignation.cs    |   138 +-
 .../ArmyMarkingHighLevelUnitFor1stCavalry.cs  |   838 +-
 .../ArmyMarkingHighLevelUnitFor1stInfantry.cs |   818 +-
 .../ArmyMarkingMarkingCodes.cs                |   598 +-
 .../EntityState.Marking/ArmyMarkingPlatoon.cs |   258 +-
 .../ArmyMarkingPlatoonCodes.cs                |   178 +-
 .../EntityState.Marking/ArmyMarkingVehicle.cs |   278 +-
 .../DigitChevronMarkingCodes.cs               |   718 +-
 .../EntityState.Marking/EntityMarkingText.cs  |   118 +-
 .../EntityState.Type/AirPlatform.cs           |   418 +-
 .../CISWeaponsForLifeFormsSubcategory.cs      |   998 +-
 .../EntityState.Type/EntityKind.cs            |   258 +-
 .../EnvironmentalSubcategory.cs               |   178 +-
 .../EntityState.Type/ExpendableAirCategory.cs |   198 +-
 .../ExpendableSubsurfaceCategory.cs           |   118 +-
 .../ExpendableSurfaceCategory.cs              |   138 +-
 .../FrenchWeaponsForLifeForms.cs              |   218 +-
 .../GermanWeaponsForLifeForms.cs              |   238 +-
 .../EntityState.Type/LandPlatform.cs          |   878 +-
 .../Enumerations/EntityState.Type/Munition.cs |   318 +-
 .../EntityState.Type/MunitionCategory.cs      |   138 +-
 .../Enumerations/EntityState.Type/Platform.cs |   178 +-
 .../EntityState.Type/RadioCategory.cs         |   478 +-
 .../EntityState.Type/RadioNomenclature.cs     |   158 +-
 .../RadioNomenclatureVersion.cs               |   138 +-
 .../EntityState.Type/SensorEmitterCategory.cs |   398 +-
 .../EntityState.Type/SpacePlatform.cs         |   138 +-
 .../EntityState.Type/SubsufracePlatform.cs    |   218 +-
 .../EntityState.Type/SurfacePlatform.cs       |   718 +-
 .../EntityState.Type/UKWeaponsForLifeForms.cs |   298 +-
 .../EntityState.Type/USWeaponsForLifeForms.cs |  2498 +-
 .../EntityState/ArticulatedPartIndex.cs       |  2838 +-
 .../EntityState/ArticulatedPartOffset.cs      |   378 +-
 .../Enumerations/EntityState/AttachedParts.cs | 20538 +++++-----
 .../EntityState/DeadReckoningAlgorithm.cs     |   258 +-
 .../EntityState/EntityCapabilities.cs         |   160 +-
 .../Enumerations/EntityState/EntityForceId.cs |   678 +-
 .../EntityState/ParameterTypeDesignator.cs    |    98 +-
 .../Environment.Gridded/ConstantGrid.cs       |    98 +-
 .../Environment.Gridded/CoordinateSystem.cs   |   138 +-
 .../DataRepresentationType.cs                 |   118 +-
 .../AirBurstAndGroundBurst.cs                 |   658 +-
 .../ArealObjectStatePDUModificationField.cs   |    80 +-
 .../Environment.ObjectState/Crater.cs         |   444 +-
 .../Environment.ObjectState/ExhaustSmoke.cs   |   624 +-
 .../GeneralAppearance.cs                      |   864 +-
 .../LinearObjectStatePDUModificationField.cs  |   100 +-
 ...icleDefiladeAndInfantryFightingPosition.cs |   506 +-
 .../Environment.ObjectState/Minefield.cs      |   544 +-
 .../MinefieldLaneMarker.cs                    |   506 +-
 .../Environment.ObjectState/ObjectKind.cs     |   218 +-
 .../PointObjectStatePDUModificationField.cs   |   100 +-
 .../Environment.ObjectState/RibbonBridge.cs   |   444 +-
 .../TankDitchAndConcertinaWire.cs             |   624 +-
 .../Environment.Process/EnvironmentStatus.cs  |   100 +-
 ...ironmentalProcessTypesForGeometryRecord.cs |   398 +-
 ...EnvironmentalProcessTypesForStateRecord.cs |    98 +-
 .../Logistics/AuxilaryCraftRepairCode.cs      |   118 +-
 .../Logistics/DriveTrainRepairCode.cs         |   358 +-
 .../Logistics/ElectronicsRepairCode.cs        |   538 +-
 .../Logistics/FuelSystemRepairCode.cs         |   138 +-
 .../Logistics/GeneralRepairCode.cs            |    98 +-
 .../Logistics/HullAirframeBodyRepairCode.cs   |   178 +-
 .../Logistics/HydraulicSystemsAndActuators.cs |   178 +-
 .../InterfacesWithEnvironmentRepairCode.cs    |   158 +-
 .../Logistics/LifeSupportRepairCode.cs        |   198 +-
 .../Logistics/ResponseResultCode.cs           |   158 +-
 .../Logistics/ServiceRequestType.cs           |   118 +-
 .../Logistics/WeaponRepairCode.cs             |   298 +-
 .../{OpenDis => }/Enumerations/PduType.cs     |  1418 +-
 .../Enumerations/ProtocolFamily.cs            |   338 +-
 .../Enumerations/ProtocolVersion.cs           |   208 +-
 .../Enumerations/Radio.Intercom/Command.cs    |   198 +-
 .../Radio.Intercom/CommunicationsType.cs      |   144 +-
 .../Radio.Intercom/ControlType.cs             |   164 +-
 .../DestinationLineStateCommand.cs            |   138 +-
 .../Enumerations/Radio.Intercom/RecordType.cs |   118 +-
 .../Radio.Intercom/TransmitLineState.cs       |   118 +-
 .../Radio.Transmitter/AntennaPatternType.cs   |   118 +-
 .../Radio.Transmitter/ClearChannel.cs         |    98 +-
 .../Radio.Transmitter/CryptoSystem.cs         |   158 +-
 ...odulationForAmplitudeAndAngleModulation.cs |    98 +-
 ...etailedModulationForAmplitudeModulation.cs |   278 +-
 .../DetailedModulationForAngleModulation.cs   |   138 +-
 .../DetailedModulationForCarrierPhaseShift.cs |    78 +-
 ...ailedModulationForCombinationModulation.cs |    98 +-
 .../DetailedModulationForPulseModulation.cs   |   138 +-
 ...ailedModulationForUnmodulatedModulation.cs |    98 +-
 .../Radio.Transmitter/InputSource.cs          |   258 +-
 .../JtidsSynchronizationState.cs              |    98 +-
 .../JtidsTransmittingTerminalPrimaryMode.cs   |    98 +-
 .../JtidsTransmittingTerminalSecondaryMode.cs |   138 +-
 .../Radio.Transmitter/MajorModulation.cs      |   218 +-
 .../Radio.Transmitter/RadioSignalEncoding.cs  |   626 +-
 .../Radio.Transmitter/ReferenceSystem.cs      |    98 +-
 .../Radio.Transmitter/SpreadSpectrum.cs       |   120 +-
 .../Radio.Transmitter/StartOfMessage.cs       |    98 +-
 .../Enumerations/Radio.Transmitter/TDLType.cs |  1518 +-
 .../Radio.Transmitter/TransmitState.cs        |   118 +-
 .../TransmitterModulationSystemType.cs        |   238 +-
 .../UserProtocolIdentificationNumber.cs       |   618 +-
 .../Enumerations/Radio/ReceiverState.cs       |   118 +-
 .../SimulationManagement/AcknowledgeFlag.cs   |   158 +-
 .../SimulationManagement/ActionId.cs          |  1038 +-
 .../ActionResponseRequestStatus.cs            |   338 +-
 .../DatumSpecificationRecord.cs               | 14658 +++----
 .../SimulationManagement/EventType.cs         |   378 +-
 .../SimulationManagement/FrozenBehavior.cs    |   120 +-
 .../RequiredReliabilityService.cs             |    98 +-
 .../SimulationManagement/ResponseFlag.cs      |   118 +-
 .../SimulationManagement/StopFreezeReason.cs  |   238 +-
 .../Enumerations/Warfare/DetonationResult.cs  |   738 +-
 .../Enumerations/Warfare/Fuse.cs              |  1978 +-
 .../Enumerations/Warfare/Warhead.cs           |  1418 +-
 .../FxCop OpenDis Analysis.FxCop              | 14646 +++----
 .../{OpenDis => }/FxCopCustomDictionary.xml   |    50 +-
 Libs/CsharpDis6/OpenDis.csproj                |     9 +
 .../{OpenDis => }/OpenDis.csproj.user         |    11 +-
 Libs/CsharpDis6/OpenDis.sln                   |    47 -
 Libs/CsharpDis6/OpenDis.suo                   |   Bin 286208 -> 0 bytes
 Libs/CsharpDis6/OpenDis/OpenDis.build.bat     |     2 -
 Libs/CsharpDis6/OpenDis/OpenDis.build.csproj  |    12 -
 Libs/CsharpDis6/OpenDis/OpenDis.csproj        |   826 -
 .../OpenDis/Properties/AssemblyInfo.cs        |    25 -
 Libs/CsharpDis6/OpenDis/Properties/Version.cs |     4 -
 .../{OpenDis => }/Settings.StyleCop           |   288 +-
 .../Utilities/ChunkConverters.cs              |   652 +-
 .../{OpenDis => }/Utilities/Conversion.cs     |   220 +-
 .../Utilities/CoordinateConversions.cs        |   284 +-
 .../Utilities/DataInputStream.cs              |   640 +-
 .../Utilities/DataOutputStream.cs             |   648 +-
 .../{OpenDis => }/Utilities/DataStream.cs     |   392 +-
 .../{OpenDis => }/Utilities/PDUProcessor.cs   |  1330 +-
 Libs/CsharpDis6/{OpenDis => }/key.snk         |   Bin
 OpenDis.sln                                   |    69 +
 .../OpenDis.EspduReceiver.csproj              |    64 +-
 .../EspduReceiver/Properties/AssemblyInfo.cs  |    36 -
 .../EspduSender/OpenDis.EspduSender.csproj    |    64 +-
 Samples/OpenDis.Demo/OpenDis.Demo.csproj      |     7 +-
 673 files changed, 207532 insertions(+), 282462 deletions(-)
 create mode 100644 .vs/OpenDis/DesignTimeBuild/.dtbcache.v2
 delete mode 100644 Libs/CSharpDis7/AcknowledgePdu.cs
 delete mode 100644 Libs/CSharpDis7/AcknowledgeReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/AcousticEmitter.cs
 delete mode 100644 Libs/CSharpDis7/ActionRequestPdu.cs
 delete mode 100644 Libs/CSharpDis7/ActionRequestReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/ActionResponsePdu.cs
 delete mode 100644 Libs/CSharpDis7/ActionResponseReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/AggregateIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/AggregateMarking.cs
 delete mode 100644 Libs/CSharpDis7/AggregateType.cs
 delete mode 100644 Libs/CSharpDis7/AngleDeception.cs
 delete mode 100644 Libs/CSharpDis7/AngularVelocityVector.cs
 delete mode 100644 Libs/CSharpDis7/AntennaLocation.cs
 delete mode 100644 Libs/CSharpDis7/ArealObjectStatePdu.cs
 delete mode 100644 Libs/CSharpDis7/ArticulatedParts.cs
 delete mode 100644 Libs/CSharpDis7/Association.cs
 delete mode 100644 Libs/CSharpDis7/AttachedParts.cs
 delete mode 100644 Libs/CSharpDis7/Attribute.cs
 delete mode 100644 Libs/CSharpDis7/AttributePdu.cs
 delete mode 100644 Libs/CSharpDis7/BeamAntennaPattern.cs
 delete mode 100644 Libs/CSharpDis7/BeamData.cs
 delete mode 100644 Libs/CSharpDis7/BeamStatus.cs
 delete mode 100644 Libs/CSharpDis7/BlankingSector.cs
 delete mode 100644 Libs/CSharpDis7/ChangeOptions.cs
 delete mode 100644 Libs/CSharpDis7/ClockTime.cs
 delete mode 100644 Libs/CSharpDis7/CollisionElasticPdu.cs
 delete mode 100644 Libs/CSharpDis7/CollisionPdu.cs
 delete mode 100644 Libs/CSharpDis7/CommentPdu.cs
 delete mode 100644 Libs/CSharpDis7/CommentReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/CommunicationsNodeID.cs
 delete mode 100644 Libs/CSharpDis7/CreateEntityPdu.cs
 delete mode 100644 Libs/CSharpDis7/CreateEntityReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/DataPdu.cs
 delete mode 100644 Libs/CSharpDis7/DataQueryDatumSpecification.cs
 delete mode 100644 Libs/CSharpDis7/DataQueryPdu.cs
 delete mode 100644 Libs/CSharpDis7/DataQueryReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/DataReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/DatumSpecification.cs
 delete mode 100644 Libs/CSharpDis7/DeadReckoningParameters.cs
 delete mode 100644 Libs/CSharpDis7/DesignatorPdu.cs
 delete mode 100644 Libs/CSharpDis7/DetonationPdu.cs
 delete mode 100644 Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
 delete mode 100644 Libs/CSharpDis7/DirectedEnergyDamage.cs
 delete mode 100644 Libs/CSharpDis7/DirectedEnergyFirePdu.cs
 delete mode 100644 Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
 delete mode 100644 Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
 delete mode 100644 Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/EEFundamentalParameterData.cs
 delete mode 100644 Libs/CSharpDis7/EightByteChunk.cs
 delete mode 100644 Libs/CSharpDis7/ElectronicEmissionsPdu.cs
 delete mode 100644 Libs/CSharpDis7/EmitterSystem.cs
 delete mode 100644 Libs/CSharpDis7/EngineFuel.cs
 delete mode 100644 Libs/CSharpDis7/EngineFuelReload.cs
 delete mode 100644 Libs/CSharpDis7/EntityAssociation.cs
 delete mode 100644 Libs/CSharpDis7/EntityDamageStatusPdu.cs
 delete mode 100644 Libs/CSharpDis7/EntityID.cs
 delete mode 100644 Libs/CSharpDis7/EntityInformationFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/EntityManagementFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/EntityMarking.cs
 delete mode 100644 Libs/CSharpDis7/EntityStatePdu.cs
 delete mode 100644 Libs/CSharpDis7/EntityStateUpdatePdu.cs
 delete mode 100644 Libs/CSharpDis7/EntityType.cs
 delete mode 100644 Libs/CSharpDis7/EntityTypeVP.cs
 delete mode 100644 Libs/CSharpDis7/Environment.cs
 delete mode 100644 Libs/CSharpDis7/EnvironmentGeneral.cs
 delete mode 100644 Libs/CSharpDis7/EnvironmentType.cs
 delete mode 100644 Libs/CSharpDis7/EulerAngles.cs
 delete mode 100644 Libs/CSharpDis7/EventIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/EventIdentifierLiveEntity.cs
 delete mode 100644 Libs/CSharpDis7/EventReportPdu.cs
 delete mode 100644 Libs/CSharpDis7/EventReportReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/Expendable.cs
 delete mode 100644 Libs/CSharpDis7/ExpendableDescriptor.cs
 delete mode 100644 Libs/CSharpDis7/ExpendableReload.cs
 delete mode 100644 Libs/CSharpDis7/ExplosionDescriptor.cs
 delete mode 100644 Libs/CSharpDis7/FalseTargetsAttribute.cs
 delete mode 100644 Libs/CSharpDis7/FastEntityStatePdu.cs
 delete mode 100644 Libs/CSharpDis7/FirePdu.cs
 delete mode 100644 Libs/CSharpDis7/FixedDatum.cs
 delete mode 100644 Libs/CSharpDis7/FourByteChunk.cs
 delete mode 100644 Libs/CSharpDis7/FundamentalOperationalData.cs
 delete mode 100644 Libs/CSharpDis7/GridAxis.cs
 delete mode 100644 Libs/CSharpDis7/GroupIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/IFFFundamentalParameterData.cs
 delete mode 100644 Libs/CSharpDis7/IOCommunicationsNode.cs
 delete mode 100644 Libs/CSharpDis7/IOEffect.cs
 delete mode 100644 Libs/CSharpDis7/IffDataSpecification.cs
 delete mode 100644 Libs/CSharpDis7/IntercomCommunicationsParameters.cs
 delete mode 100644 Libs/CSharpDis7/IntercomIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/IntercomSignalPdu.cs
 delete mode 100644 Libs/CSharpDis7/IsPartOfPdu.cs
 delete mode 100644 Libs/CSharpDis7/JammingTechnique.cs
 delete mode 100644 Libs/CSharpDis7/LaunchedMunitionRecord.cs
 delete mode 100644 Libs/CSharpDis7/LayerHeader.cs
 delete mode 100644 Libs/CSharpDis7/LinearObjectStatePdu.cs
 delete mode 100644 Libs/CSharpDis7/LinearSegmentParameter.cs
 delete mode 100644 Libs/CSharpDis7/LiveEntityIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/LiveEntityPdu.cs
 delete mode 100644 Libs/CSharpDis7/LiveSimulationAddress.cs
 delete mode 100644 Libs/CSharpDis7/LogisticsFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/MineEntityIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/MinefieldFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/MinefieldIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/MinefieldResponseNackPdu.cs
 delete mode 100644 Libs/CSharpDis7/MinefieldStatePdu.cs
 delete mode 100644 Libs/CSharpDis7/ModulationParameters.cs
 delete mode 100644 Libs/CSharpDis7/ModulationType.cs
 delete mode 100644 Libs/CSharpDis7/Munition.cs
 delete mode 100644 Libs/CSharpDis7/MunitionDescriptor.cs
 delete mode 100644 Libs/CSharpDis7/MunitionReload.cs
 delete mode 100644 Libs/CSharpDis7/NamedLocationIdentification.cs
 delete mode 100644 Libs/CSharpDis7/ObjectIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/ObjectType.cs
 delete mode 100644 Libs/CSharpDis7/OneByteChunk.cs
 delete mode 100644 Libs/CSharpDis7/OwnershipStatus.cs
 delete mode 100644 Libs/CSharpDis7/Pdu.cs
 delete mode 100644 Libs/CSharpDis7/PduContainer.cs
 delete mode 100644 Libs/CSharpDis7/PduHeader.cs
 delete mode 100644 Libs/CSharpDis7/PduStatus.cs
 delete mode 100644 Libs/CSharpDis7/PduSuperclass.cs
 delete mode 100644 Libs/CSharpDis7/PointObjectStatePdu.cs
 delete mode 100644 Libs/CSharpDis7/PropulsionSystemData.cs
 delete mode 100644 Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/RadioIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/RadioType.cs
 delete mode 100644 Libs/CSharpDis7/ReceiverPdu.cs
 delete mode 100644 Libs/CSharpDis7/RecordQueryReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/RecordQuerySpecification.cs
 delete mode 100644 Libs/CSharpDis7/RecordSpecification.cs
 delete mode 100644 Libs/CSharpDis7/RecordSpecificationElement.cs
 delete mode 100644 Libs/CSharpDis7/Relationship.cs
 delete mode 100644 Libs/CSharpDis7/RemoveEntityPdu.cs
 delete mode 100644 Libs/CSharpDis7/RemoveEntityReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/RepairCompletePdu.cs
 delete mode 100644 Libs/CSharpDis7/RepairResponsePdu.cs
 delete mode 100644 Libs/CSharpDis7/ResupplyOfferPdu.cs
 delete mode 100644 Libs/CSharpDis7/ResupplyReceivedPdu.cs
 delete mode 100644 Libs/CSharpDis7/SecondaryOperationalData.cs
 delete mode 100644 Libs/CSharpDis7/SeesPdu.cs
 delete mode 100644 Libs/CSharpDis7/Sensor.cs
 delete mode 100644 Libs/CSharpDis7/SeparationVP.cs
 delete mode 100644 Libs/CSharpDis7/ServiceRequestPdu.cs
 delete mode 100644 Libs/CSharpDis7/SetDataPdu.cs
 delete mode 100644 Libs/CSharpDis7/SetDataReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/SimulationAddress.cs
 delete mode 100644 Libs/CSharpDis7/SimulationIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/SimulationManagementPduHeader.cs
 delete mode 100644 Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/StandardVariableSpecification.cs
 delete mode 100644 Libs/CSharpDis7/StartResumePdu.cs
 delete mode 100644 Libs/CSharpDis7/StartResumeReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/StopFreezePdu.cs
 delete mode 100644 Libs/CSharpDis7/StopFreezeReliablePdu.cs
 delete mode 100644 Libs/CSharpDis7/StorageFuel.cs
 delete mode 100644 Libs/CSharpDis7/StorageFuelReload.cs
 delete mode 100644 Libs/CSharpDis7/SupplyQuantity.cs
 delete mode 100644 Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
 delete mode 100644 Libs/CSharpDis7/SystemIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/TotalRecordSets.cs
 delete mode 100644 Libs/CSharpDis7/TrackJamData.cs
 delete mode 100644 Libs/CSharpDis7/TwoByteChunk.cs
 delete mode 100644 Libs/CSharpDis7/UAFundamentalParameter.cs
 delete mode 100644 Libs/CSharpDis7/UaPdu.cs
 delete mode 100644 Libs/CSharpDis7/UnattachedIdentifier.cs
 delete mode 100644 Libs/CSharpDis7/UnsignedDISInteger.cs
 delete mode 100644 Libs/CSharpDis7/VariableDatum.cs
 delete mode 100644 Libs/CSharpDis7/VariableParameter.cs
 delete mode 100644 Libs/CSharpDis7/VariableTransmitterParameters.cs
 delete mode 100644 Libs/CSharpDis7/Vector2Float.cs
 delete mode 100644 Libs/CSharpDis7/Vector3Double.cs
 delete mode 100644 Libs/CSharpDis7/Vector3Float.cs
 delete mode 100644 Libs/CSharpDis7/VectoringNozzleSystem.cs
 delete mode 100644 Libs/CSharpDis7/WarfareFamilyPdu.cs
 rename Libs/CsharpDis6/{OpenDis => }/Core/CetBase.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/DisTime.cs (100%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/EndianTypes.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/EnumHelper.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/EnumNotFoundException.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/ICetItem.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/IPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/InternetDomainCodeAttribute.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/PduBase.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/PduExceptionEventArgs.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Core/PduFactory.cs (92%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/EntityID.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/AcknowledgePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ActionRequestPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ActionResponsePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/AngularVelocityVector.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/AntennaLocation.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ArticulationParameter.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/BeamAntennaPattern.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/BurstDescriptor.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ClockTime.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/CollisionPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/CommentPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/CreateEntityPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/DataPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/DataQueryPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/DeadReckoningParameter.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/DesignatorPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/DetonationPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/DistributedEmissionsPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EightByteChunk.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ElectronicEmmisionsPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EmitterSystem.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EntityID.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EntityInformationPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EntityStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EntityType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EventID.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/EventReportPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/FirePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/FixedDatum.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/FundamentalParameterData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/LogisticsPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ModulationType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/Orientation.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/Pdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/RadioCommunicationsPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/RadioEntityType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ReceiverPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/RemoveEntityPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/RepairCompletePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/RepairResponsePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ResupplyCancelPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ResupplyOfferPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ResupplyReceivedPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/ServiceRequestPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/SetDataPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/SignalPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/SimulationAddress.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/SimulationManagementPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/StartResumePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/StopFreezePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/SupplyQuantity.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/TransmitterPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/VariableDatum.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/Vector3Double.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/Vector3Float.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Generated/Warfare.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/PduFactory.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Vector3Double.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1995/Vector3Float.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/EntityID.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AcknowledgePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AcknowledgeReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AcousticBeamData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AcousticBeamFundamentalParameter.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AcousticEmitter.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AcousticEmitterSystem.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AcousticEmitterSystemData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ActionRequestPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ActionRequestReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ActionResponsePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ActionResponseReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AggregateID.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AggregateMarking.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AggregateStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AggregateType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AngularVelocityVector.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/AntennaLocation.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ApaData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ArealObjectStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ArticulationParameter.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/BeamAntennaPattern.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/BeamData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/BurstDescriptor.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ClockTime.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/CollisionElasticPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/CollisionPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/CommentPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/CommentReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/CreateEntityPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/CreateEntityReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DataPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DataQueryPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DataQueryReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DataReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DeadReckoningParameter.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DesignatorPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DetonationPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EightByteChunk.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ElectronicEmissionBeamData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ElectronicEmissionSystemData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ElectronicEmissionsPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EmitterSystem.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EntityID.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EntityInformationFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EntityManagementFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EntityStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EntityStateUpdatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EntityType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Environment.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EnvironmentalProcessPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EventID.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EventReportPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/EventReportReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/FastEntityStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/FirePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/FixedDatum.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/FourByteChunk.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/FundamentalParameterData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/FundamentalParameterDataIff.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/GridAxisRecord.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/GridAxisRecordRepresentation0.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/GridAxisRecordRepresentation1.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/GridAxisRecordRepresentation2.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/GriddedDataPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IffFundamentalData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IntercomCommunicationsParameters.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IntercomControlPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IntercomSignalPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IsGroupOfPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/IsPartOfPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/LayerHeader.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/LinearObjectStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/LinearSegmentParameter.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/LogisticsFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Marking.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/MinefieldDataPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/MinefieldFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/MinefieldQueryPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/MinefieldResponseNackPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/MinefieldStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ModulationType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/NamedLocation.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ObjectType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/OneByteChunk.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Orientation.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Pdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/PduContainer.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Point.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/PointObjectStatePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/PropulsionSystemData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RadioEntityType.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ReceiverPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RecordQueryReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RecordSet.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Relationship.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RemoveEntityPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RemoveEntityReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RepairCompletePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/RepairResponsePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ResupplyCancelPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ResupplyOfferPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ResupplyReceivedPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SeesPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ServiceRequestPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SetDataPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SetDataReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SetRecordReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/ShaftRPMs.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SignalPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SimulationAddress.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SimulationManagementFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SixByteChunk.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/StartResumePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/StartResumeReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/StopFreezePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/StopFreezeReliablePdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SupplyQuantity.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/SystemID.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/TrackJamTarget.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/TransferControlRequestPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/TransmitterPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/TwoByteChunk.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/UaPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/VariableDatum.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Vector3Double.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/Vector3Float.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/VectoringNozzleSystemData.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Generated/WarfareFamilyPdu.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/PduFactory.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Vector3Double.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Dis1998/Vector3Float.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/AggregateTypes.xml (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/Category.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/Cet.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/CetFactory.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/CetItem.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/Entity.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/EntityTypes.xml (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/Extra.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/GenericEntry.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/GenericTable.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/Specific.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/Subcategory.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2006/cet.xsd (100%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/AggregateTypes.xml (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/Category.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/CategoryRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/Cet.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/CetFactory.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/CetItem.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/Cr.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/CrRange.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/Entity.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/EntityTypes.xml (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/Extra.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/ExtraRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/GenericEntry.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/GenericEntryDescription.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/GenericEntryRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/GenericEntrySingle.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/GenericEntryStatus.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/GenericEntryString.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/GenericTable.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/ICategoryOrCategoryRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/IExtraOrExtraRange.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/IGenericEntry.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/IGenericEntryDescription.cs (95%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/ISpecificOrSpecificRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/Specific.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/SpecificRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/Subcategory.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/SubcategoryRange.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Cet2010/cet.xsd (100%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Country.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/InformationLayers.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/SystemMode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/SystemName.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/SystemStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/SystemType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1Modifier.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/AircraftEnginePower.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/DesignatorCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/DesignatorCodeName.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/ElectromagneticEmitters.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/EmissionBeamFunction.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/EmissionFunction.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/HelicopterEnginePower.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/StateUpdateIndicator.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/DistributedEmission/TankEnginePower.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/Appearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/DataFilter.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/FlirSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/Fusing.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/LaserSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/MagneticSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/OpticalSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/PaintScheme.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/ProtocolMode.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/RadarSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/SensorTypes.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information.Minefield/SonarSensor.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Information/EntityCollisionType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/AggregateFormation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/AggregateKind.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/AggregateSpecific.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/AggregateState.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/AggregateSubcategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/GroupOfRestStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/PartOfNature.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/PartOfPosition.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/PartOfStationName.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Entity.Management/TransferType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/CulturalAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/LifeFormAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/MunitionAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Marking/EntityMarkingText.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/AirPlatform.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/EntityKind.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/ExpendableAirCategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/LandPlatform.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/Munition.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/MunitionCategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/Platform.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/RadioCategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/RadioNomenclature.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/SensorEmitterCategory.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/SpacePlatform.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/SubsufracePlatform.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/SurfacePlatform.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState/ArticulatedPartIndex.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState/ArticulatedPartOffset.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState/AttachedParts.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState/DeadReckoningAlgorithm.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState/EntityCapabilities.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState/EntityForceId.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/EntityState/ParameterTypeDesignator.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.Gridded/ConstantGrid.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.Gridded/CoordinateSystem.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.Gridded/DataRepresentationType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/Crater.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/ExhaustSmoke.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/GeneralAppearance.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/Minefield.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/ObjectKind.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/RibbonBridge.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.Process/EnvironmentStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/AuxilaryCraftRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/DriveTrainRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/ElectronicsRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/FuelSystemRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/GeneralRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/HullAirframeBodyRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/HydraulicSystemsAndActuators.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/LifeSupportRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/ResponseResultCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/ServiceRequestType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Logistics/WeaponRepairCode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/PduType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/ProtocolFamily.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/ProtocolVersion.cs (89%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Intercom/Command.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Intercom/CommunicationsType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Intercom/ControlType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Intercom/RecordType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Intercom/TransmitLineState.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/AntennaPatternType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/ClearChannel.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/CryptoSystem.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/InputSource.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/MajorModulation.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/ReferenceSystem.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/SpreadSpectrum.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/StartOfMessage.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/TDLType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/TransmitState.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Radio/ReceiverState.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/AcknowledgeFlag.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/ActionId.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/DatumSpecificationRecord.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/EventType.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/FrozenBehavior.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/RequiredReliabilityService.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/ResponseFlag.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/SimulationManagement/StopFreezeReason.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Warfare/DetonationResult.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Warfare/Fuse.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Enumerations/Warfare/Warhead.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/FxCop OpenDis Analysis.FxCop (97%)
 rename Libs/CsharpDis6/{OpenDis => }/FxCopCustomDictionary.xml (96%)
 create mode 100644 Libs/CsharpDis6/OpenDis.csproj
 rename Libs/CsharpDis6/{OpenDis => }/OpenDis.csproj.user (50%)
 delete mode 100644 Libs/CsharpDis6/OpenDis.sln
 delete mode 100644 Libs/CsharpDis6/OpenDis.suo
 delete mode 100644 Libs/CsharpDis6/OpenDis/OpenDis.build.bat
 delete mode 100644 Libs/CsharpDis6/OpenDis/OpenDis.build.csproj
 delete mode 100644 Libs/CsharpDis6/OpenDis/OpenDis.csproj
 delete mode 100644 Libs/CsharpDis6/OpenDis/Properties/AssemblyInfo.cs
 delete mode 100644 Libs/CsharpDis6/OpenDis/Properties/Version.cs
 rename Libs/CsharpDis6/{OpenDis => }/Settings.StyleCop (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Utilities/ChunkConverters.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Utilities/Conversion.cs (98%)
 rename Libs/CsharpDis6/{OpenDis => }/Utilities/CoordinateConversions.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Utilities/DataInputStream.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Utilities/DataOutputStream.cs (96%)
 rename Libs/CsharpDis6/{OpenDis => }/Utilities/DataStream.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/Utilities/PDUProcessor.cs (97%)
 rename Libs/CsharpDis6/{OpenDis => }/key.snk (100%)
 delete mode 100644 Samples/EspduReceiver/Properties/AssemblyInfo.cs

diff --git a/.vs/OpenDis/DesignTimeBuild/.dtbcache.v2 b/.vs/OpenDis/DesignTimeBuild/.dtbcache.v2
new file mode 100644
index 0000000000000000000000000000000000000000..67a8723c82645f90697b0d236a68e4f4a091bd8e
GIT binary patch
literal 84205
zcmd6Q349!7{r)WXePg)_C8b<#bEi#;71A7S=oPX_%dt=<yOU(;UhL5}90DRDA|fCn
zA|fIpA|fIpA|fIpA|fIpA|fIpBJ!>yA|mpC-fL&xnRk<PJCol(pU;zbci(5;_xpX1
z?|aO9ynh?RFm~#;hD)R8Y-(R{jxlpdDVa)inej2JE1M~r$xNZ&%omeps@p7@#<sm?
zs$dy=_2;u^Sn*<SGBaxBbNOVZXdJho%^d0ISkPoP$J;wv;;pR<hFcdbuv!<kx5TXx
zYq+hkxx*T18#bGp+ZML9w6|MUd)vr@1qrjM#cCfhjTtoVq6m6*shBGjm*%sjoDuC_
z6caxeV*OUWkd0+?R%U)8S(qO$jG6gdY(;Xo5L=BOyYXA0n22SE&xkR-Vi~L0R^RCM
ztWTs;#x})#$*L*n;bdmwpm%o(!s6N*3K%=Pel@mXzjp_rn9;e#X=99cu@oN7o9S7-
z$&^)?btH<zQL&ZDcs^UmjudCDNft_GYF4yZN+h$f=EkOuSXVZkE@hI%@z}~JD>kvN
zQa*2Gim@d~p~|E6l$Xua3(qykza+jE&HSiUEEog9M{OK3N#w>3mFQ=8Wm72><)PeQ
z7De3Z8nfc-`!Xnd-Buwvni)){Eo1h8Rmi3`Se=D}l^#xw51>3l(YRG`kxun05=&%@
zD15P;8DC#;rN^qC!LDrHs_)F@>Jd^5r4!{dk58hgx}=ZN(#^`swj-?SMZKQ$W{DJC
z%)+T}oHwhhlq#0;*5Zs+D(219yjlIF;Z!od+!`OuuD3FahZ|c)+C~<RG&LpK8qF5d
z*!AoIb0f|7Rc6{c*BA{!6JCCnn1y5<1p?aBI(V9+jMv{$s|l%7zn~_)hC^0_>Tr@)
z2aotrp@wV;BOlf#GcC>a{rO}%Sxj!Q3M?N^b#(ChJBrj^yoLhHhIApG&8L#XOzP$G
zn<HZ@tx8i$>xB!=ws_lurjC|YtFgVqI5998QHcvhGm|j$2`1($*AI@Q&Gk)FlQbS*
zINa1SG7?WTClZOaCgZfgB#n+2idLH1A==hkn~F@{LEq1g)U}s^Q-YRyNofQ|n3vxZ
zgvjEz8szn*@)<$PE7}<}eFYf6Oq@5BEX7Y3;_E3jXyY^R>%!EATEQW|3PH%73{&nt
zbYF_*aEiA@>--wjR~SL)5^9NBmCY=*GFBd~E6omFiE=1GXtO@doQdYFIEEa_vn*~x
zO-<goI6>%>30|LcE}KDbcx5(WrRqB~nQYN4vg%KBC{a<V8Z8K|@*!(Q2ZdhE#`Kzb
zsE&41ZnImOhDTc3+ZLFKmIbX=OPdi~_f9V|&8HK!UXJv&w}@fqP0t1tK6JRPL}y_<
z!|g(qyzx+j&@LTv$@BDJ<JxR;^>c&JDHpO%gX1|m>$1Vh7p*+A<0E>t6k-sXnZaw8
z8A*<o^338fRn}Hiarrp1PuU9i`Zj_0ERh8m?ekuN>{*K69C>T6_rZ-cDk&<4)2m!R
zIFe31WxZpfz<Z6f4Up48?p~wocSr8pQ#kOR7L$+ui(18=O+_n1XR!FtL-w@v6i1ud
zb0P5Z!bGLXFUt%4AqYtW@2z(y&CyJ@P)x?zm<f|v@gh%l*<05#99?QJLsrlh(Jd*P
zm}XY-6j5b;zCq{^czdNtS;?Ddwv>-^b1B=aiHJ35<{O=7!^|Bz5h~_X`!XY0mQR)@
zpFF%8^zyZ3!Oi$-<i%?O%vg&Vzv})$=n=dHu9UVyeYA)P^+DJIUgjzmSW5{)n~h<X
zwn5Cht<5LV<6|nVNMcS719?{J(wbbV!Vf~vP;K5|Hk;yQPiOO(ZxA{JJ}==mWh{qW
z=1$H_RN(}nPpB4w>VsFftgM}?D{I_82tA@f*CE=0>Ekjx^3~qU3VamNoi{hiw3VX>
z@mnqOdSBU%1f8BzUeCZfCX0no$MJTwsJ)jJ4_u4!jG4wH=s+n`#G6}IvQLsKsD44n
ze|pgJ_h$2H6MfvyLZ*oczeWh}_NYN}Uk@s9JGnHK9i~&Ze8k^nrY!mjj9YwZC#!I3
z(8t$v3Va4bm6ci>IfJ421R;AW=u)IeSnnCJ4vP|1jTD4NfsX|HR?~TdTps;bx_D$s
zK3hyBSp|_JK`o;eUA(g(fzL8~B&9`5&N8cBK}a9?Jgh2WJskvz0!0;(^RQJ}j!w0=
z)q#&LJkp+=%u%&i@sgtpJ;l*x>TRI6e60z(_Cr*f6)Qxx^sTN%N^gH7aQg}=J!MDQ
zSH&j?*#mFu6bb9Q^H@kznJJKMT@_9c`UKuysIod;JXVfmdr^%PghpYs7p~H^)+}N{
zD<4z4+6zA;2wej2nIqx*@InHM6BE&5HgAq{%Orc|e(xZ(7z@EFt+dkF{P;>Um$MQy
z?Rn?$w2Gao_Ys27Bo=}u{mGn=e!!8Q{TPJAVbt%TOxnz#=p=X=M~ivOOnd9MmK20W
zfxp98k<6UQq?hk7=np|inh3hIFiCqh$*wCe^Cyc^<Mj+egTPyACM0$Nm{=&CVu>zW
zYQ-lA*#qxuGYL;9S^4qGLND3ZR=t9d{^X#`4zH^$$@@i#;Xl<Nt#1ZkZP3!LviJhh
zl|oc}cjTOUZ{OSV4BUQGIhPfSd|AD;-||OC;;HxOy%Gmr1Ep~F#}_d8b<ag8J~hbh
zD;0s;KPjQ|Vnf<LuV)Y%gi>Bsnn`Z@+~tM-7=*-u_ZVri(ybh9+e(QpI%I`L_89%%
zHE7|RfeU<8&cw8e8?$+A$QfZ1qf!$&D%Vqj&?b~p)GuEMxJwcJF$jqRZ#!w?dd7mX
z?Nq&jkUsF4bSmP2b!N#bh$SO(Cf)7v|E=Uv3mXKmwT{(Wx8%|z2+2dS^-(LoAsM&&
zv)B~Mq<7nTw`UC+_*$#LSE$j#5zWTeV-F7#UhZpf{a%CIK3f?|4`Hn}+?7gV(Jzx+
z_R*>26`vYp_oaE@vuQ%YWtN$+^3EO@riGkMtHP;4A75UCVtJ6_SZ=e)Uw@@X4U+qE
zBJf!=k;<|HxJr|pHPbR`(8ZSvp|oB|Y^jU;EsLr|5Yh+VTPUUJW*%;YD!m2qqa*Ru
zM^)ap4#C@gDe)TYrp}5NzZKi>@pLq(eUufr?O#1i&otoMb!c&sw%_%85ON1TyN5mG
zbO$@_8{_nY9G&ZSY>%A1uSN<&qri8hx`d?}A$O!YKL;Uo;A>AD@#=f9yPCCMa_x!7
zF9`VqU)}4GvA%Bw+fwLk;gG9)Cn5%+S>UUCy#lXDj*b;KTJ%55CHV$>0$vb$1>Rn}
z<yE&O$o5*x2tt>@*Co0nU1=4~1l=k^E5BTqsPPX%k1+GZGkDhIiNgp&m%!J0xYC?%
zIrA(el50JxvVzbl@O}!N6QlbT3YZ<B0}fWmWIx608H5HQ<cgyK|Fn|5+T*G?xl)A{
zgiaym3SSFfC0Dp-5E>MMe)}O;oYG}#c(<JwQyqo+p-jOX;jiqI;?2k;+#vKTPMd!G
z<en~;V`ogJpdbgKVc;vaWv<XxN3PfwzXc(0;IsTvUXNLpv;2PVAhZa+*DO|QFT;^J
za!E*~*R1*lA%EbrS2CIVaDq-go2yiNT8iZCRTWMU`g|~~dhXRn=-_=5Q}opM$sY?s
z>(J^F#K&odIHZivym;%9<6VOmzWKYr=e%S&Tam5wY~&jo)vE^SeKU5!_W?w0UnM7t
zXcemT%sie!Xb^ngUkC{!z>cqRhR&6~zmDPPQu};fXzjhK3*UwUOULVnx4o}Mb~LPg
zzAx|-dSsPQg{~~IkSFw1rv;(aH07H!(A4(R)Fg1oL1-BK_(xZV>Q7Ab1sav{Pc>E$
zItAVflCO2^yHaK{%`2De1$q2}kU#KJ=g62J&lR&cNH#Y%Uf-D-&EhTgm{3Ssi^<4A
zXc%~@(+k~I;LFHlsjJEgLZ`q_jM7WnlZj^&a;1tqF=}FJ5ZX;snRJYsVhQ#7IpiQT
zJS*tFx?boL+ZsE%aE4TJBpJu10d7okqMtssM}p8c@OPpW(P_U>z7v%{IucL459M9A
z8ThC|3P+bwW#Y-4$(txSs_=U|TGZZ83cOca5tDteuysHh2idFDGJ?=0@G%BDI&^gs
zf60sG0n7%-F^1RE(O}ADD*Q7Fg^=#UT;v!}^{PR7-xx3O*%EqsNqwb(>B7;N{n(Vk
zO_ZE1slsvesl9FlzV1qul^Q0w?n?0qLiWJd4JZ;;+a+F&6of{B+gnB00$ujT>bJDF
ze(xHz@Xg``ckaJvqM4YLVQAF*YY;MrQ?CcC(NfCHdpA2N_1e#=K_8!;3ce(bVSgO!
z1b2;@nT#clE~=CypLY#fOhZYkh)FF|r6kE;YmnKO@`3LY9hB15uf{>BDYjXZ)nd6%
zR7VIxli=-ZMUz3Zu)a`Fk69c^Wj8Wy<hm?J8<iA<MuE>#c!i~<O3qSv{DP1_@EJdk
zjNUd+&iGZQ)u5HHmWN)>l&zZ8%9$k9ppnl81l~(`WdN%~N-y2(8H5HQS}`teKTf}^
zV#ORn5SoNp=W(DGUt^-F^VBa0`2$~#k2CJD0D~=$<--iQo5t<oNIvC}-mrH?b?|)<
zx8y6banJ05TmE|H?PxLO5t7e31-_PdjhQN0gQc7}Pe-ohb$)iFrfJ_YmD_uKQU|`5
zSq>fKUS@n(<(%3rL*5ytz-uR!lkR06Dkf8MyO^w<9zRF^+Dk{^Yi@AeR3f{PS4_F)
zM*QZ;JM}v0P4B?Vg?!5-%LTsIBB$4O1U^?v<zxpOxaUgck3mQrc$-g!<0~>XD*(No
zjs{aM%f4Pq;HTYEAu$E#dGjw%yY=}xI!wKMd&^DW^I25N6T7o<EWz;XBUF4G*=tY#
zz-=LuFr8AQm$uO37lizwlpn|`i;(DRxyz5@8-xyl&t0)}?l+5Ltg|a;94fyCA#>n6
z4=U1mO1|8Apz#kvkKoQk5)CH3>xU)#D%TH=q*JyszIPb%`cu4fpgZKS-rsloX|r*d
z?jluwi?8dF)Wg`36dN$>A777&|85Ic_9k$XYErpM^#Bo8FYcqY==l#$l*Yc!U6rnj
zRE@1WF&8mMY*@0QrCctHTXYhG?3UR|IGw4aSul3ZSVi0;X<=>&moOT;)+3-<^itAU
z?5o?iN%h57$G2I1mVI^mD$nA+NA=lecgW54`06~1PO#gTeRcaPA-5pp?cfVbjC*aV
zD)f^~!p@AD8b1r`wOpA{b<JoYv7X&V+uGO^izd96*4E>vn7Fn#R$m{(rUM?d>uy{6
zMu$aNNaD&4etYdIt5}hOmCvf@=?5IYFX9=ZT*=ax-Iz&Xsbs;JDLlH+>fxL#;V&+M
zC>S_<mR%Ao3U7k1@n@_1oRaBEU|Gs5<xb05yhY0ajBQ!dYaH&8E!w?Y8{2-W?heP$
zUV+T+;&!PtYtjp~CuZal!^W%$Z_cKSgGCA>fgJ%|QtT;qSGa!Ku_2R<XX%|%#tsc7
zw%205v10?yd&DUYiTTDX_-{1xnMF+t8=L0gUo-tDJ~cNswi`P&jFeI-?3*1c;4{5%
zCV?wv=NfxASowSwH(FCuvM86w#*U(~eFF=u&G>7iAz_UqGuEQPfzGa;W4e2m3@tqd
z)sLcWT_bh6RuA-a_V<fl)~y~`w-i4N_6)c@o7Oc}^Jvn0G*^3~d0o{fn)N}oR12y_
z3Ch@$Ck1SE3iA+jtFiIE1{`UJh9GYxaBaJp8C^7zpWi!R?A|bjeU-ExWpm>j%(=!H
z4U9*x%U)EsMMZwHJF@GHV#slMZ>gr{tj@?zW2`K~u+>EW!FNe?oiQAWn(`87o|IN7
zaiDc{U&&l&tPdp`@upV2Pr1$*3o|m;HOO_w#xP?N?FZ_<_X6WOBQ;$Sv*N#Dx?-!`
z|H}*Kv?Z@|RWFZt({w59x>T3Pe0I1oSG)U`M}FQkMowSOdTz1}%diVGLAx@p3xZk6
zo=%NDm%j2OKWiG3+*w@9<34v9<5q4^<<V!tjox+ZDUUDIW}(Zu!?ex_r%|mGV}AQ+
z$c+H4pRTJzLvHI>Z1kV+!q1RXlSLeUBj>)b3`GTFUU9Kzoskc-8o1-FT!L9=gj(~J
zI4gGqMk|+A)*0tam&)|ed(X|1VU1Zt?Q|>eS~47V^{FJY_qN75<HM2ZN^QE1vdYbh
z(^$+a_a4?6p?2fkIgO<Oam!u8!x=DY${3AV><*|iP7gDunUM^&4V5?Iv6u>B>LO$E
z_K0$!Myg(i$2%qIFk^JzVaKBjwMM8HoGCZb)fu7o_SBeJ`56y0Vb%E5^FZp1P>0L7
zeTEKX^1h4NLLNPN;$>+Z>fpr_q3iA-7I&y~1D?2D_mkBb@h}S(B4*l!T3Zl_H#I}G
z3u=7I?Ok<7sP$Bh*=y~?uBWa<c3p^7XN20cL1oS5Rdq%w<YMc)N{SccWXRE0E`|!f
zBxx^e;#!6};FrtF>WnkPOiUJyXDd<2%{GftE{x|X8P2O6(Q#(+DVGz~8KYsQsdJxD
zoskGLBD{H@hWbWhkr(-dTr?_C$$fbtmwp+a`_`N~BUI}}qm<X&gxo05sQmZSgghz1
zBGq0eGYttVZ+;26S4?&Eb}K?1($NUrx2)6|p+{FaY=HGlLv4eoc5+j_yw4=$d2SY^
za{<XTm^Ew@a4vcXd6J51hxl|?eN02iLClx~<(G1VJS-N9%G)R02^?yd!V@p6BH^|g
zuEYAmZWCoxt{Wyou8pp%A9#Nz)ZrnPyj8u(A>=hHuBcg=33cYt6`8y!A>?;J-Wa`C
z8-)B0$Q!-q{(+Efkvn$fmVl7oJ-Om_pXfh*+Io9Jq0SGwwDq5rAF^ent7g4t+SeH&
ztLsF`Ke-N}pEh-!tzvb?`Juj8l&64-1<1PN-Rq1C{%=HZoxmRQYD1X{tc?hD-cZKm
zeVGw%!z9iOb)7{Xa)(%|={+`^CGe%wQk=X|3z0kreTO_F;7SMA`P(6nmSv>QaoJ%T
zE>XVRCtQc!9BPljWyNcHtd-o($j`!7&yTJ%LS0`f^H&wYnZf(NNPy|>lV~%a?q>|Y
zlV6#paZWT2yMc6~tbPb_$lW5n2;!9BIwREez52K-hb>M+o!3j?E%FzK+N|ki(4C1J
z^0aS75SH+vc9tqpA*r2nW<zdSDv`1eu47?CZbZd|ta5~F$Q=ba2b|C1-Y|ApNyyzo
z<)lh1uyGxe8uE;=8Z#@pq0V`!@p*guq1GBD>dI-Mbs=q76z_alq)rzk)P*iAF8_g>
zyzvh=X)8w`x{uEcJ83JCvSJ(R3KQoLI`x#wke7Wp(W<9KPD6jr8#PPgP`mHm7`?_J
zT)R{$OgyF4Wg(%yb#&=nIsGu?1ykNA<#B~|MyT^Gu4v`if+4>K#QJpQG{BIjHI(Qo
zNBD*OF2^}qkDG;1SNhOH=9no6wV=>gJjdLHJku$T(3yr5tPICPeNRhcnWmL{G%D{&
zZXs{Dp;4-{JgiKHx@?)osT`FSvaw|GsmGg5L#iTHnXvpovXDD*OiOuySjaCZowz*t
z7|!}x*Qs3GtZa`HWQI$lb8%)0`>==}G-D2@EMvEZ5o{GSQ_0cHqPC`H97~hU6_e@Y
zS=M}GPD8d-Tr}x%JoD)KPAwC^$5!Lqt?p!DKF+$KvOofUu+t)(e3Lix<HoM+oEw}d
zMvuUmZ|vMqDvq=xxLm2o#KjeW>0~BZC??}`jXfIZ0WdhOy@1mp7IonGsWlDqbSQo{
z&&2Y|W4jV7qx9UNL{B1F%;vE%6{q^tTkH!D#`tK&8*tSlWu|bLl$5a$8>Z35cqB1-
zfYl0XgOys>wyxV6F-xhUB1xU`F-Mf@=h{p`hyYI1sxvP9KM)3Mjg)h}>Wm#R*IOtw
z)yE6Q?p@iu73;E!>{PnS4=8hk=;~3%-i*<cNhHk-ePdprKkg-dETxxOsT?d0e#7Bh
z2&yMjO0UWmd$XlXqGwawLVd_)sP`VsyAM(I6|FS=1qWK;0rp-iV->rzX)~E&2a^?X
zb<uFC$fDnclll`S`Un>nU!=G^Qv6Vfi=CIynICn@3GZI)oX+OQX&8G$xu%YeHi%lp
zS-gGSOcwcLrHscq<LhxGRmw_?S|av2Iug}SEUgr@!>iK@I7*@*gF9No%do3C)>t^d
z39|7OR8+phbljqq$(XdeD$`gOA}$z<<GK$@p@XBe1(QHSJi;I163a|?;(la=3eyfA
z%Q#KcOG^1d5r=!l^GVzy$bviAA6yrdSTBpwp&Eaj)|RBENTk~#I!c<Ja4HBINxE=6
zVA0|^DOd;jgQ45?g|9{q>dTh*3(8zg0Jvpj04J4YGuSn&Bx9Y9TtI_hB4I>;T23(w
zilh8IO*k;yydos9{;EJzsvts~?PvGkIIrT8@uJl=R?4iWIjqs6hb~;pLyLG%8bP{3
z)W}E|eW4JD88HMnQxmJJ4jon1J2R5ar`_7><Yys8i^xu)q^3OZjHYIYDyYe6R{N_~
zY34h?4vG_TXoBcX<|mM#H@V45pv07z37hX%xfg~HwJcMl=M#$h#*T}Cz?#ChB0I`j
z=LvEaQ|O`sOT}mTqg|a((m16h*w4=p8f!|$0Itx<V#Q3lgo43>kkV*s93!jwpb-a^
z#Y&>5AtKd<W2Lhj)S9a?oX9LQi7rMO2h&#yMpYgbSh)?XmRG=;qp9&O6X)EegmfCa
zj*u8{^$5<+6SO1!X)0+#-GpFjA{Or^)Rsb1!f}#`%UWryYLwa*DY-79WLlJ#&O{<l
z--DpwX{<}M!s9E#Tz0nAuV^$kh9k3ax4|+qpQiT1-%e=iG-`7m=g=0gB3Pu1#>_;E
z*<5elvd)qmT|g`|PAHkoNKlP5BsPn~ZC3Tz)|fc?8-4dm71l_^o86Y~YzagfnWo+f
zPA?87EmpBbYt8(KiBoqFz`im?A(*QxQmLiB7-z@_yzz+MOS`W3(jJ?r_aZ8O71Dr(
zGk2k`NI6j@RC2aN#}TxbAPrg@7qc2oXA5a^2y>u&Of))_C3-Uxu$-o;zPcbvGbRPs
z>PL;IT0w<<S4D8qJgFwCqmHf^CattQSkCi=D-5g>?&xUV8bxEt8#|polCjdvucwE7
zAW3xsN}9Xr6_r98p=^Y7*)vJ^RSA!GG~L}-(HJYNoGG(Rm|w*gy}uM+{O^`tC)p(3
zV0WncZm{V5c!^RvO_8qNOLhmM^pZ6?((@cyPpt=oHdH@RL4`?DLXu2D5v_|#ardXi
z5I{rlls}DfnvS<<WR&1s-E&Wvn#`tYSzSHq>+YtD?xs7s3dIwbMt(~5urvm;d$NAN
z61%1E_p2OFzrWdUxbTaw-`{Jdlc{l$IHK)yhwJbCH~0f~_x|~K!fnen>iZv%9mA%n
zgwD+~O=)U-G&V&s&6K05WW1}%t(;CLJ^*n>7)nZM3@s1O>GLRjUCR2#C7OcA17$X7
zD3|aJVU(O=;YlN^vFtsW4M_~q*v%eD5>2ggG0+p_t6fCV(9|mbkVp|{gOx!SjZSHb
zAav!xA$jVI#)S03Ou5pdx?ui+mRm4&prt81m}1H+<6TW-t?Piu^4RDv!qw<~BO|nQ
zYD&k_d@|9wDOtb(Ae&E6lBPndBqTPv<w$il(rT>X88&mbnejAFpg@9+Xr<}Z<UjQ9
zEXG%v8#<GT!U}WT$~RRnEPiscAZrQ>$gV_}S)=JzvT4G2HtiXv$`Ljj<><mkFC)($
zqbHqvhE49`Cc{^TSDHq)udp<qE#+2^2%R()xUYbLe{muPOG3W8mS&5_px_;#W#;`|
z8%^eLYSbEKBRH8LG+a%3RHhpgv!}5du1=$-Z@CiUjU=rUoe7cUMiX0wro^V{gjR^|
z23}L2D?AJ;*+_pCE+`Q>F;TGY-l3)z`)61*_J*E>kZ^ZbHT^4|VbZv3iqGndrPwS@
z@zKxZxXY?gSQ9*a@H(c5iF7{6dw}1@^|KxFC>@%<CiC+bI!*aRtCK6G=metL$ZPrq
zn%O0#IA}U&)#sSp$>5n|(o_v@m06kcv|D0g#S<J%IObny)zPFaLf~^_W62z)=;Zd#
zX=$480T;_7mZl6(Gy|rJPiM+xy{KL%z^FO{riNE_224lu%z$YuO4PDs?@^=XMDt_r
z_|*9^jm;4RPr_=7Fo?W-c&M79feUg*iUa*CSu3OS*UZT&LRaS6Tyt`o23$8Mr__~B
ze|^?Hvo={A<65!nCY2yGB|Dnjq!=YJ|EFj$<@rD5Dc}5`rjo)o%Sl2{PH2p<Z?aG`
z)^|9b@HCb`>YG^9Wy^S`IA&q&?do_dX{s5vaI>hqiEyV3J%Dxn@n(9EU3^8&iDsz6
zCNwesOiemEFY45kMj8JEs3x-qH)fU0)-(}AvPsuuK(+Z(w{pJOOpO@cc}<P_oPwFF
zRoS!7N?B?{qv@20`Bo)o#KdcR3<l9Z@!B5qi7F;uD?XJ8-dXg`ww32i0DWVQONkc5
zx-ixo6)%<#)H8U4QdiB>CDkF-IP#78!CC?zY|%0_Q}4g2m}evK!?fOP&X|_%B7Z+V
zA#0G%5!0yj$-yqB7)iz{W41Q7XlWR)m?~+e38tx0N!2<2U|fs=ENEf!XcC{&swO`7
zoH+40M<)IOdO_IRZ%xk8hw~NjG&u*tggHn3WzK0zkMyoYp~*LJyt&(;)xyn^@Ac8Q
zquF@Wqz_aiIC@fQ6t$U`pDA!LKrXQscPd=$sA4nR6Q)9?^fqcG?US{6bzXj&M7KVc
zL#y-5sc`j0w$Gi&G-ay@;ih@=qRJDp)~(LVPZd!X=oNL<LOkSD$;xy3dMSga((9F!
zj7mTnD}YkzijszPq*h87sS?}_m5EhG!fJIW9_S`{r%>xL)qurDm6Zr=49<$zaZ`Gf
z@uhmMaH#yvQwo7MV01&=<~~D*p7fd4&4`B%d3p8O9O>lHb!urs*-f1(x>AVFdCIwm
zRx0bFDap!0pqr0It<`L)7|W5isXvS4OkyU2S>Yv9e+&yNc~kCMrNO4vwlEAf&DJ}0
zIVx$^M9W1JUH;}|TrJ@=({P%%Je(F9PRo{u(@Mi>-STkSXgFP49?k+9PE-wN>V>^|
ziwk?Rudq+O#5D&{YPDgoQoCx(rMB5qYT4XrK8v@}*}PMFYYC5+-r&OHr8v0ocxetU
zJYK5x;Z42vJNcn2-BUNjEn84FTLLJX+AucLqPBR-rdrddo~BMXTV_$6aJI~%I^k@Y
zMRmg2GK=bj!^)he<(hh#Yu$n}*BU^X(}uyy+`=i_!&axv(VkB&57r!GORX`oPFgLZ
zw$&Qrg3ap|wrxSlXbYfZXv1LnH1!s{%_$iJ154!OJWYq_q@`;pld$p|(XY;T#`(%S
zY)L3$Q7u+Yu*Kk&u=~K=L<2pora%+exr4zz?Fl2?4Hk<9yAS-~Pi{UnLW@Nnc+Csx
z`JBRvTI3Yc`K78UDV-Ns{n!*$#1tzwF_rk3fF|YSd8|=28aJ`YqOx=1gj&?39Vo2f
zrz0Z1lmxj;S7q~U7M(Q(IbOh)8##!aw9dymllgcaZ#;T3qj-_npWVoZSCft-WBk5%
zDl2VvX)>zw51L`Q=NT#FF_Y;T6Kj*w<|sA~(ftf;vjQ7Fwom@Bs6ur8le=I}I>3&}
z%IAJ+(z%Bic1b1U*c)i&J!v|HN3pM?+sYJBA=yiV)p@)&ph-KqmaHgg3Q^0X=`(0%
z)_WvXi;bAMbkBoS-p$8wvo;nl&=vMn&dqp`t|q|sH%O+<e6Tl_#8ID_0<R>heiMq?
zTPlc&Lp3=kd}syTZ|Ov*memQLTq#Pc^RPPhocLjEZcG+(bO(=#-M&&=wXZc{2y}`C
zYxtdKH$&-uEGj5Q<6{<|irNgN`^Ux$YP4#ppHO7j>0&mXP0?Yyztm6oC{_`eu58*2
zU3mi0xhai3nJ~^M+EG`Ws`>LjDc%57*7(ZlH`NY_=bSZ*u}-;Yn;+CDnpJgfe}bo$
zCo^oVnzo|oqLK5SGzZj4=m}zB=7&C^O$BW<&P+6Y?gNUQ^2a1rVll@`aDO>*PoJMm
zJ@GucWkqM&qJEM{(f`2Ou2q;^<y$)@OAgNO&%%I<Y?@3g{sff>56A{_GO^gZU%V@p
zCFuPcHF$<N)|oc+==~JwoVfEVO*vf!^*!AMdxRcSN_|w9X}(8YFVelwFP@6vE6hw{
z3nX8W9I<H4Q6-;}(krn?j^>N{=#-S^Rz-AFYI#0~>tgj<cTFYH@IIwb!j`0Jf#{kd
zU(Q7*3PD%Vc?e=TVXQNs9v7eKram*nwq!4@D!%5q?&Jox9|9Z0a|PMs6jiHla{^k1
zo)tSgU<g@?;?Ptmc9|Q@6n_nV{1yg<t`Wu+JS<&fSv6fM$&=u%&t@emEgo4u$l9z(
z#dEaV&YHZ<igb-NmW=b)y4B5&%*pQLXtLNfW^KS4cdx4IdmnDl)pX*&iRakCd9YUV
zs%90nhHfiIZJRo>b4SA1U47BDmPr?vqDV+XQE<JBq+!gRI7S|*Y-Ow46&9gl3qA2v
z&j$YJCY%qFpi44f$=xkqbtCF|&anyZ$8}vwo)5mqnLXKzXR*^W6Ccy0FiqA;;$4cv
zOw3G`XXj6xCGHl3Mx`!m@Rb5-<|(yl;*cfPod}bJE{!-1UDvR?(weWHb*-3bo>&^j
zUzNpL@Hk9?=%Y+h0)5Y{;YY+!@g^yON}J|Rfl1Vgy4x}ukFHbXN(NR=N9cX&?zGeO
zy_AQP)@};w3@xuxx+Y16A)U>j@l}-&Eg{BYbf>nJpdG%-9A4GZ=6wQN(+hlgQ`OQI
z>ns*c4B1!=%&u20J(!1a9dXf_!lE`TB4rZ|RkKo#Ud)_1Oc$CadD~H49A3>}SL0S+
z)d2|0z!=hmpH)IFj%?-m@ZOuI&UPuf(FU7YVwlY<6w&(9?=%;@!ztYpSo@u%s~Gqy
z4f>SV8u_21^A+lL9x5$;*4rU;o^>s+r!5oPB-)ut(6LA+!M@Sw)frM(6H%``@7@2}
zJ%n*G)<eYE*rAv1(4e7tb5Ji$7iK^C%uDt3a>w4YY0Siq@Mt=_p6TqhGWuASTG*T5
z?ewqo7&ZN){!KAe^j$Z#;IgA#IA5i67>QL7eHfe}l}wol3ppY?aJ}?k6-*Mjhj89X
zs+YGiBS!PU+Z~(a5wuqp?dIsFUaJ)co;kAHF|{J(+wxH*NvBpM29m?W*~}7DJH9H@
z+t<=7O=laslg0QLQXN${ZoxEW%(Xa&g(lpps+lRaKEe!D!maFwq!p3&;Felw3(*bd
zOZ{nh%eN>zW}TeCygk;6Ah_R?okH#wjy}tmWU1w+vMDRpS=xl+mmfz}#D)WL_6eW(
zQtPnu2)h^^qyHq1F5qXSaK1Vj<nWz6z1XzqexO<ey(KHfjiSm|`@l{FqJpbrwfH#X
zWu;UKRuC<F+FFuLAe-DGsjaT-sqsV}N4+KET&@Dj4PIK6=!*x|%BkI7=Q*~}f)0QS
zbccki*r?G~OFB9lpc@9TS5|#M9e_CT$rpZf&rJ&Nn0U@qW2;+WWJ{thes#j;9TioM
z8A{Q{l6M)%!K#OtQ{^k=X`N8lFUvVsS2yr*B>>i8tY@i-y_INg)99D8mPReu8lH2+
zkd#eT(Dw-2`XIS#lkDN5mq6_Xot>dA1*@qp(bR5<=UHB(Wi)CJ!$V~=ZFt*MiGwDf
zTE6)cl88nXXBE1SRg>|kRnGrZ7Y>)q(|3UxD@9|Ol+P|yae6QVnp|^B)oo#`AWpbL
zr$L+<1dG{;vzC&@5^DoH>2htym&%~di}+=pI7~Gx^?mYG!}80ttQI}H%skG_%J+}q
zZBBG7Il}h+sg33oB|;$^76mT={ra)5(v#*jNi~#7^K5nJFU>)9r0mzRFN4!VqwJ<a
zN>@8Be){o6YzmK#V^mKMmOG2pKUVkX!;|GOd$>|0(aRcS2bR)iJefvAi1cKgfXQ;W
zYB;#{B#S8$CnTMPstACZy3#x&n^&_@ZRGtaz<%Ky$9pnybinymgvnyURg@N;4RH-Q
zbcV+*TogwKm<jqerkLj^&`tUT-CehOWF-y)GkKp(X9wMJ40f-O_DO9B{ff)SD%q_r
zPpJL?Orn#-++N8z)h?qyh#|atl?_y1!oq19a=3%*+J<>|S>1HN!id4bvlHnmvZ^Lq
zw~f+$1ZZ!{9Q9Y8Do@cSh!1epIrRzXPFLZ~lJY)E?aOFGz%aCwmapho{c}2~YLlUT
zoE;D%lV6>O(eiuq*|V(75^K!dkmMusV-@?WeTZ&eM28-yXwq}W*tS&B-=V3hR+TCN
z@E!j$Bh*T%eZ;*H)GY8>adoSS*fNO84|yyP@2XLm4pNkoOe`2+21)HPNnf~QsG#)m
z15ik@$$(CZ#5xNFD?OYVr^_X%-@YzCS10SBp`w^ZiLpaGF&4rRil{5BQ#-@u%RK1r
zdm37u+e1!c@MqZxpG+BtLnke`i7&#Kuo<42s_$xcesr|r?TVQ`?0D?&JlEen1f}S`
zOQJ|*htEK=;@s>Q*5|a<H^%B$^$gO(eDUUMo=|%626)uV)WKvGKkk&NJI@yY*7Rkt
zf`}c4EuWDox{v!D?753p4K*!jY%`7<?r3dlY&V-47ml>FTW#^-1szsvdq-<~OH*50
zN5{gBmiETsh3#z}t*r}3nwwi%7g&kbMC-!#c)ZbSZ(3*^I^ika>`d+>8>VoAH)9TX
z55=ygVm%*2VQO&FleUkn8iqHCR&_6mA&bsH+fj)1qfljID4?172_$K}FlOd+u@%YT
zLaYnB-Sasl^nw_AHEJG;EMVFkR5fOLQh9aXTw>TbsA|a6cjvysa%-HILSy${bgfeS
z3q5e&*aHV-U|pJ-q8l@*)iZYDyQrD(4!syrvQOI&WV6NYWZu{TONy)v2AIZ<mAh$-
zoneSzDmPe^u_OK=S+I}S*afB&ryC289e4{<95-grnIU%iFHgcsH2ZlxoS^ph_|RAR
zhL`S=XpkP3)>%LUmoT<R|7QcH<BXj#s$s`0qp}-2N4u9-B-)9tUE&J_j9q)_0D5CK
zzn<z!l_+FW8>|FOb=ufo)HY*B9Bsd{n=$sNbUr8r!5Vw^p!LM07tBpIM_YpePdNI~
z*kKtK|L|1BEyhW_a582{i_R0jA^^=jC!U>PEV9_aO;z7bT=Xf$*`6;Tu#DYh+a-PW
z?kn`sQ3%e!PK~ovq)F0=mZJc%wqc>|DpH6R^I`$%gr!j_bDa6@)s@YS59J24Fjrz0
z&Dcd28?FXw0%rOwV^1zVo!_HJ$<P9}kMfh0X$Sedu{BPPFnXp~n_NaqIn6&_$e|$Z
zXz;&1;OxAOVeA6z3hV~#4(tK!3G4;z4eSH#3%n1Q0qh6t4;(;UgmEC;gMgX9!N4H^
z4R023C{PE?1`Y$}0EYud07n8x0Y?LK0UG{1U_MX}Gysi26A(c>&BASgyEVSk=jk()
zN58j<?`?3m!}kSnsT>Od%54WIcPsdHz+D8;aF2mY|NcGOFo^LX5+PfWt;sh3-ivH|
zW#kI7T_@R|>_E07I|4hAoyjg_SF)RpFT0aH$ev^`viFsdPm+DEjQsaAWZxw=d7o{Q
z8Dw9Z>}Oa0@Rj|M{RQCwvcF2$Ul0xygoDU|D&asum?;PclbI@ErXU<52(!o`D&Y`8
zI8+eo$e}9XP(he22#1l`Dq*%D%n^jc$sCn1M-Yw>gd@ojD&Yu0I7$$XCP%4+qXc2D
zAj~6kRl;0Bm@f$RWWGw6F9;2S&`26oLW3YQ2|_bzQVC6h&>{$}q(vpP2tu16EFf(v
zp-m7L3PL+ss1g<mLWdwMA{{EBLlBM;g!hwURKhWWuvid2Ko+Zn#e#6GARI@IRSCxm
zLZ=`sA)P9rQxLiYp__E6gf2no5rkgSqY`=qVW}W2BTH4nQbFhwgyTt{O6U`W<$|z+
zELRE31!1KitRgE_!b(9{EeQQ&wMtkm2qy@_069S=oFE8MK^P=al@Jw#AwgI}hE&3k
zAgmRH6UkbYuvQRG5`>e<Nh;waK{!PaV&oK+aEc(DDhQ{MQ&qyLg0M~yPABVB!a6}P
z1!0(&D!~+lxF94*TqVQ>!4iZKVyOg65Jm-IjEt&;Q9(!w!Wkr~5|V<jUJz1by-HXw
z2x&pckhDrj3qn>9awMw~vVw4?AmquJD&b5)C<sE46jVY%5K4lufs|B2Nf0&)!X~m&
zC2SOgaX~nXjH`rkK{#6w&LL;3gtG<VTtWCCIaei|D+uQa!ujMpm2jRQTp$P^A{VHH
z3k2apLHIDaP$gU_2p0*$N61Ag;UYn}SP(u+E>;N_3&JIW@G)|UO1MN2E)|52lS@^?
zrGjvoAbf&crV=g_gv$ltljL%haJe8{AqZEJD^$W2f^d}}e2QG960Q=2s|DfH<Z6|0
zwIEz02%jO>sDx_-;aWlXEV))CTq_9I3Bu>dbt>UHLAYKJK2NS!3D*n44TA6ma)U~^
zK@e^fgfEgCRl<#eaFZZ>iQJ?TZW4r>1>wu&W|eTWAlxDdUm>@sgj)pRRzdhGxm6|H
zDhRg;!q>=cD&aOkxLpvwPHtBTw+q4@g76J;hf26Z5bhL&Z<0Gz!kvO}mmqwL+@%uk
z5`?=2;oIbHm2kHp+#?9zA@`_+dj#QLLHI7YS0&sl2=@uX_sD%J;XXmQUl6`e?pF!-
z3&I0}@B{LIN_apJ9u$Nhk_T17gM#poApD3tq!Jzygog#;$K+v^@US2}A_zYrkEn!4
z1mRIZ_$hf*B|It!j|sxh$YUzuF+q4-5PnV`R|$^`!V`k<3-W|YctQ}K6og-rCso3e
zg7B0e{E9rK5}p!-rv>5H<Y|@gv>-eq2)`lEsDx((;aNfWEqPWYJSzy#3BvElb1LCE
zL3myeeovlP3C|0{3xe<m@`6fuK@eUPgg=rORl<vc@RA_>iM*r|UJ`_t1>w)+WtH%<
zAiN?7e<81^gjWRNRYCYGc~vF6DhRI$!r#biD&aLjcwG?wPF`0DuM5H(f<VX{D&Y-5
zC=0?rNLeM61;G}Ce-c|IaDSV;DG2`}Z>oehMF?*R!oSH|D&Z|bcv}$uL*7;iZwtaZ
zg79DRj!Jk(5Z)Dp|B-i9!n=a-9w(HI2zgIsyvG^kNJLP!ir}-tq2JkGd2319CW6l@
z3Ew$sTS?k3Qr^}>!go&EUXpf*l(+Yg@ST%(l%$;^<sCgFeCMQ{C25yPd1ns^-#KYl
zN!l$^-ql0GcTU<}lJ<y{clVI+os;&Iq`e~LJv}6R=cK(QX`e`WZx0FIIcZ->dS9fx
zuZM*1oHRp{_KTEfcu4rpN&8FE0g>|l9umHD(t(n6P^5gIhlKB(G*glej+AG5Nchf4
zhe*<_Ncj*C3Ew&CP)Vwbln?cg@ST%pOVVMH@@x+Y-#KZHBpn_p&+(A(os*7`q$4Bc
zBRnL0=cJ<~>F7xLC=UtWIccsW&5M-hdPw-rN%JMCK2o0VA>lhGHAqrpq}<>k;X5Za
zNm6s9+~gtQJ14bBQfs8#;vwNXC$&k^f=Ic|L&A4XS|~~Fk@7+h3Ew%XLy{In${ijO
zzH`zslJx#a`4|rg-#KZqBz+)KUhE;^J0~40NykOX$9hQk&Pkn;v?NmQ^pNnKle#3S
zJ5uiQkno+8dL*egQtt7P@ST&EMlfMmUdI0SvH!>8{}tusk*@NJNO>i`e5SlA(p_F1
zDfh!UAyOWI6OEJy;S5E}Yv8Pnluv|nQlxw`oKqs@7@Sih<<s!=mF0Dj9vlD2_T|&*
zr_<>tlSMVm{>Sm3PFMEYbfR*9IQ!e=KsX25WG0-MHaP^&AvQS_&Y?D$4QIAZ=D?X_
zlOy09VUwfa9A%TaaOT=%KAibBX@JvUlO{M#Hfe#=Vv{yFZ8lj5XQ53x;B?sJ7&yn+
zWHFq@HaQl~u{P<1(`l0~I9)dBfzxA?rEr$oqz_J?O_sx1Zj+U8R@!7WoYgit0nQ0F
ziNcB6WC+fXP1eF$Ym<}UoMe+z;GANUQ{kLylXY;`*~Eln+9VDqZW9ZRWs^}jqc%yx
zN!nyRob@(I!%5pD3ny!nGvS<RlLDNAO-gV|HrWVgqfN%)jN9aFIA`1BTsY_2<UBa%
z+2jH^7ue)NI2YRFA~+Y><YG7%+vE~Bm)PV|IG5VwGB}sn<Z?Kd+vEy3SJ>n#I9J)^
zYB*Qh<Qh2F*yLI`*V^PdIM><adN|kH<OVo5*yKhyH`?STI5*kkW;i$7<Q6!$*yL6?
zx7y@3IJep4b~v}&<PJD@*yK()ciQAGICt6PZa8<_<Q_Qp*yLU~_uAw>IQQA)emM8r
z<N-Jj*yKSt58C7*I1kz6VK@)l<PkWJ*yK?-kJ{uhIFH%naX63L<Ow)W*yKq#Puk=u
zI8WK+X*f^Y<QX{6*yLF_&)VcUIM3PSc{tD8<OMh{*yKexFWTfKI4{}cWjHU}<P|ut
z*yL3>uiE4_IIr2{bvUov<PA7)*rW`nY!e%fjgA(aH*NA3oVRT9Hk`L@@(!GLZ1OIg
zcWv?>ocC<>S9<9`8+{af*cu<Ur60D%hwbSHbTH7Lzz1|9&}YC0bQI7pzz1{&(Dvg4
z8ho_x_<%+oZ8$!l;YK@+4``gx7UKgNV6?aRfJPQ=Dn6hgMZ1X)Xe`k-;sY8)w14=3
zMh|TqKA>SkJBANvywFzR0~#o_NBDq72yG5NprJv#f)8j+(01Sh8Vs}#_<%+MZ2&&N
z@WamI1B^RtIX=LE!(QV9j5KUAKEM#e?&1TCEo>`3z@Wl@;scB(Y$QIwFv1Sv1B_oe
z0i#2$+)^9=$`*bZp>}DMS)?)cKZ*aJB0DUz?eZBB`hPw9pJM;hjFQ3scdy#2oQ)h;
z&H-lvd7uCkffBF**a&O_#(}edvw?GfbAb;6=K<#f7XTjuE(AUdTm*asxES~-a0&1+
z;8Nh@z-7QEfXjhT0#^W60#^Z_0<H!=4O|0!2DldZEN~t0IpBKW^S}+j7l0dqF9J6K
zUjl9hz6{&~d<D1__$qK4@HOCe;OoF0z&C(9fo}qL0p9}d2EGm41AGU#7x*r4AMick
ze&GAS1Hcb}2Z0{~4*@>{9tM64JOca#cog_4@EGtj;BnyRz!ShPfG2@p0#5<I0-gqb
z4Lk$<26z_uE$|%hJK%ZX_rMFlAAlEuKLRfSe*#_x{tUbV`~`Rw_$%-l@HgOf;P1d2
z00GLtKL8u}C-5flFW@cU-@x0ze}H#@{{rs<{{!9wjIE9<M}Vz>t$}TTZGr88?SUPD
z9f6&Ioq=6|U4h+z-GM!TJ%PP|y@7pzeS!A@Gl2bo{ec631A&8pnZUuoA;2u)P@oQ&
z4IBo{0S*U_0FDHX0*(ge0`q|RKt0d^Gy+XPGtdIG0&TzoU?I>BbO4KhV}SPqi-8XS
z#{$Ozoxl>H3+M)VfL>rJungz}jt7<lD}a^2DquCx51arD08wBN7y{M+Yk?DilYo<f
zQ-Bz7DsURG4mce!fngvHBmfH-0Y-r_APJlStOrs+8pr@yAP1ZY<beWE1WLdLU?Z>z
z7zfS*&IZl_&ILXQoCll_TmXCsxDfa-a1rnk;9}sTz$L)PfJ=do1D64x04@hU30whO
z30wty3b-2hG;j^@8Q@yrv%q!0=YZ>h&jU9AUjS|dz6jg|d<nQ2_%d({@D<=z;H$uG
zz}JA=fv*F10N()a1ilH}1$+y*8~8SG5AYq}Uf{dHeZcpC`+@HR4*)*^9t3^}JOum*
zco_IG@Cfh|;8EbGz+=GAfX9KK15W_I0G<SX2|NY-3V0g$HSi4Z8{k>sx4?72?||ol
z-vciIe*j(t{s_DT{0Vp&_%rYd@E71!;IF`Iz~6w^fxiQ900bxl{{U>@pTL{Izks)Z
ze*<p={{h|s{tLVd{112!Ft$eh2etyX2DSmV1-1jW2X+8<1a<;;26h2<1$F~=2lfE=
z1oi^<2KE8=1>OhD0QLj+2Mz!Z1P%gb0tW+!0JDHYfjVF|a2PNLI2<?vI1)GtI2xD>
z%md~F^*{sA2s8oBKnu_cv;hl%g+M#d0W1QJ0p1TR20j2B3mgY@0!x4{pd07`dV!_D
zGN2DQ9#{^n09FF4fYm@hZ~`y@M1etI2v`HG1x^G`0!{`_0b;<Zz-hob;B>$QhJiSc
z04!hx7zM_FBya|>9!LRcAOmE99B?L(2MRzDC;=OQjld>g95@R&8#o6z7x*A>9&kQz
z0q`N<Lg2%|MZiaZi-C^<mjE9FE(JagTn2msxE%N-a0PHBa24<=;A-I0z%{^UfNO!z
z0@neb1Fi=?58MEJ0k{$PB5)J%CE#Y@%fKzbSAbiAuL8FLUjuFjz7E_0d;_=>_$F`{
z@GanO;M>4Gz;}Rqf$swM0pA1e2fhzH0Q>-W5cnbR5bz`5Vc^HWBfw99M}eOLj{!de
z9tVC7JOTUycoO&}@D%VX;A!C3z%#&afM<c<0?z@z1D*$d54-^U0eBJkBk&UNC*Wn^
z&%i6dUw~JEzXGoTe*<0z{tmnW5TFeF1F(UA0&fEU0^S1t4ZIEf2Y3hgFYqq#Kj1yU
O*ar1~o8!(u|NjBA<!xI4

literal 0
HcmV?d00001

diff --git a/Libs/CSharpDis7/AcknowledgePdu.cs b/Libs/CSharpDis7/AcknowledgePdu.cs
deleted file mode 100644
index 7897ac4..0000000
--- a/Libs/CSharpDis7/AcknowledgePdu.cs
+++ /dev/null
@@ -1,414 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.6. Acknowledge the receipt of a start/resume, stop/freeze, or RemoveEntityPDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class AcknowledgePdu : SimulationManagementFamilyPdu, IEquatable<AcknowledgePdu>
-    {
-        /// <summary>
-        /// Identifier for originating entity(or simulation)
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the receiving entity(or simulation)
-        /// </summary>
-        private EntityID _receivingID = new EntityID();
-
-        /// <summary>
-        /// type of message being acknowledged
-        /// </summary>
-        private ushort _acknowledgeFlag;
-
-        /// <summary>
-        /// Whether or not the receiving entity was able to comply with the request
-        /// </summary>
-        private ushort _responseFlag;
-
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcknowledgePdu"/> class.
-        /// </summary>
-        public AcknowledgePdu()
-        {
-            PduType = (byte)15;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcknowledgePdu left, AcknowledgePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcknowledgePdu left, AcknowledgePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += 2;  // this._acknowledgeFlag
-            marshalSize += 2;  // this._responseFlag
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for originating entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the receiving entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
-        public EntityID ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of message being acknowledged
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
-        public ushort AcknowledgeFlag
-        {
-            get
-            {
-                return this._acknowledgeFlag;
-            }
-
-            set
-            {
-                this._acknowledgeFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Whether or not the receiving entity was able to comply with the request
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
-        public ushort ResponseFlag
-        {
-            get
-            {
-                return this._responseFlag;
-            }
-
-            set
-            {
-                this._responseFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
-                    dos.WriteUnsignedShort((ushort)this._responseFlag);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._acknowledgeFlag = dis.ReadUnsignedShort();
-                    this._responseFlag = dis.ReadUnsignedShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcknowledgePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
-                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</AcknowledgePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcknowledgePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcknowledgePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._acknowledgeFlag != obj._acknowledgeFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._responseFlag != obj._responseFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AcknowledgeReliablePdu.cs b/Libs/CSharpDis7/AcknowledgeReliablePdu.cs
deleted file mode 100644
index 515cd4d..0000000
--- a/Libs/CSharpDis7/AcknowledgeReliablePdu.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity or remove enitty (reliable) pdus. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcknowledgeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<AcknowledgeReliablePdu>
-    {
-        /// <summary>
-        /// ack flags
-        /// </summary>
-        private ushort _acknowledgeFlag;
-
-        /// <summary>
-        /// response flags
-        /// </summary>
-        private ushort _responseFlag;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcknowledgeReliablePdu"/> class.
-        /// </summary>
-        public AcknowledgeReliablePdu()
-        {
-            PduType = (byte)55;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._acknowledgeFlag
-            marshalSize += 2;  // this._responseFlag
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ack flags
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
-        public ushort AcknowledgeFlag
-        {
-            get
-            {
-                return this._acknowledgeFlag;
-            }
-
-            set
-            {
-                this._acknowledgeFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the response flags
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
-        public ushort ResponseFlag
-        {
-            get
-            {
-                return this._responseFlag;
-            }
-
-            set
-            {
-                this._responseFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
-                    dos.WriteUnsignedShort((ushort)this._responseFlag);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._acknowledgeFlag = dis.ReadUnsignedShort();
-                    this._responseFlag = dis.ReadUnsignedShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcknowledgeReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
-                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</AcknowledgeReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcknowledgeReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcknowledgeReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._acknowledgeFlag != obj._acknowledgeFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._responseFlag != obj._responseFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AcousticEmitter.cs b/Libs/CSharpDis7/AcousticEmitter.cs
deleted file mode 100644
index ea7d371..0000000
--- a/Libs/CSharpDis7/AcousticEmitter.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  information about a specific UA emmtter. Section 6.2.2.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcousticEmitter
-    {
-        /// <summary>
-        /// the system for a particular UA emitter, and an enumeration
-        /// </summary>
-        private ushort _acousticName;
-
-        /// <summary>
-        /// The function of the acoustic system
-        /// </summary>
-        private byte _function;
-
-        /// <summary>
-        /// The UA emitter identification number relative to a specific system
-        /// </summary>
-        private byte _acousticIdNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcousticEmitter"/> class.
-        /// </summary>
-        public AcousticEmitter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcousticEmitter left, AcousticEmitter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcousticEmitter left, AcousticEmitter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._acousticName
-            marshalSize += 1;  // this._function
-            marshalSize += 1;  // this._acousticIdNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the system for a particular UA emitter, and an enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acousticName")]
-        public ushort AcousticName
-        {
-            get
-            {
-                return this._acousticName;
-            }
-
-            set
-            {
-                this._acousticName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The function of the acoustic system
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "function")]
-        public byte Function
-        {
-            get
-            {
-                return this._function;
-            }
-
-            set
-            {
-                this._function = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The UA emitter identification number relative to a specific system
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "acousticIdNumber")]
-        public byte AcousticIdNumber
-        {
-            get
-            {
-                return this._acousticIdNumber;
-            }
-
-            set
-            {
-                this._acousticIdNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._acousticName);
-                    dos.WriteUnsignedByte((byte)this._function);
-                    dos.WriteUnsignedByte((byte)this._acousticIdNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._acousticName = dis.ReadUnsignedShort();
-                    this._function = dis.ReadUnsignedByte();
-                    this._acousticIdNumber = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcousticEmitter>");
-            try
-            {
-                sb.AppendLine("<acousticName type=\"ushort\">" + this._acousticName.ToString(CultureInfo.InvariantCulture) + "</acousticName>");
-                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
-                sb.AppendLine("<acousticIdNumber type=\"byte\">" + this._acousticIdNumber.ToString(CultureInfo.InvariantCulture) + "</acousticIdNumber>");
-                sb.AppendLine("</AcousticEmitter>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcousticEmitter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcousticEmitter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._acousticName != obj._acousticName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._function != obj._function)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._acousticIdNumber != obj._acousticIdNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._acousticName.GetHashCode();
-            result = GenerateHash(result) ^ this._function.GetHashCode();
-            result = GenerateHash(result) ^ this._acousticIdNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ActionRequestPdu.cs b/Libs/CSharpDis7/ActionRequestPdu.cs
deleted file mode 100644
index 4622583..0000000
--- a/Libs/CSharpDis7/ActionRequestPdu.cs
+++ /dev/null
@@ -1,588 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.7. Request from simulation manager to a managed entity to perform a specified action. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionRequestPdu : SimulationManagementFamilyPdu, IEquatable<ActionRequestPdu>
-    {
-        /// <summary>
-        /// Identifier for originating entity(or simulation)
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the receiving entity(or simulation)
-        /// </summary>
-        private EntityID _receivingID = new EntityID();
-
-        /// <summary>
-        /// identifies the request being made by the simulaton manager
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// identifies the particular action being requested(see Section 7 of SISO-REF-010).
-        /// </summary>
-        private uint _actionID;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionRequestPdu"/> class.
-        /// </summary>
-        public ActionRequestPdu()
-        {
-            PduType = (byte)16;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionRequestPdu left, ActionRequestPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionRequestPdu left, ActionRequestPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._actionID
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for originating entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the receiving entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
-        public EntityID ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifies the request being made by the simulaton manager
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifies the particular action being requested(see Section 7 of SISO-REF-010).
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
-        public uint ActionID
-        {
-            get
-            {
-                return this._actionID;
-            }
-
-            set
-            {
-                this._actionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._actionID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._actionID = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionRequestPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionRequestPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionRequestPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionRequestPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._actionID != obj._actionID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._actionID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ActionRequestReliablePdu.cs b/Libs/CSharpDis7/ActionRequestReliablePdu.cs
deleted file mode 100644
index 0538f7a..0000000
--- a/Libs/CSharpDis7/ActionRequestReliablePdu.cs
+++ /dev/null
@@ -1,615 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.6: request from a simulation manager to a managed entity to perform a specified action. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionRequestReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionRequestReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _actionID;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionRequestReliablePdu"/> class.
-        /// </summary>
-        public ActionRequestReliablePdu()
-        {
-            PduType = (byte)56;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._actionID
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
-        public uint ActionID
-        {
-            get
-            {
-                return this._actionID;
-            }
-
-            set
-            {
-                this._actionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._actionID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._actionID = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionRequestReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionRequestReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionRequestReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionRequestReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._actionID != obj._actionID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._actionID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ActionResponsePdu.cs b/Libs/CSharpDis7/ActionResponsePdu.cs
deleted file mode 100644
index 2a7fcd5..0000000
--- a/Libs/CSharpDis7/ActionResponsePdu.cs
+++ /dev/null
@@ -1,588 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.8. response to an action request PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionResponsePdu : SimulationManagementFamilyPdu, IEquatable<ActionResponsePdu>
-    {
-        /// <summary>
-        /// Identifier for originating entity(or simulation)
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the receiving entity(or simulation)
-        /// </summary>
-        private EntityID _receivingID = new EntityID();
-
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Status of response
-        /// </summary>
-        private uint _requestStatus;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionResponsePdu"/> class.
-        /// </summary>
-        public ActionResponsePdu()
-        {
-            PduType = (byte)17;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionResponsePdu left, ActionResponsePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionResponsePdu left, ActionResponsePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._requestStatus
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for originating entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the receiving entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
-        public EntityID ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Status of response
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestStatus")]
-        public uint RequestStatus
-        {
-            get
-            {
-                return this._requestStatus;
-            }
-
-            set
-            {
-                this._requestStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._requestStatus);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requestStatus = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionResponsePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requestStatus type=\"uint\">" + this._requestStatus.ToString(CultureInfo.InvariantCulture) + "</requestStatus>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionResponsePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionResponsePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionResponsePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestStatus != obj._requestStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ActionResponseReliablePdu.cs b/Libs/CSharpDis7/ActionResponseReliablePdu.cs
deleted file mode 100644
index e6d6197..0000000
--- a/Libs/CSharpDis7/ActionResponseReliablePdu.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionResponseReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionResponseReliablePdu>
-    {
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// status of response
-        /// </summary>
-        private uint _responseStatus;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionResponseReliablePdu"/> class.
-        /// </summary>
-        public ActionResponseReliablePdu()
-        {
-            PduType = (byte)57;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._responseStatus
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the status of response
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "responseStatus")]
-        public uint ResponseStatus
-        {
-            get
-            {
-                return this._responseStatus;
-            }
-
-            set
-            {
-                this._responseStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._responseStatus);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._responseStatus = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionResponseReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<responseStatus type=\"uint\">" + this._responseStatus.ToString(CultureInfo.InvariantCulture) + "</responseStatus>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionResponseReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionResponseReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionResponseReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._responseStatus != obj._responseStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._responseStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AggregateIdentifier.cs b/Libs/CSharpDis7/AggregateIdentifier.cs
deleted file mode 100644
index 4d02b8a..0000000
--- a/Libs/CSharpDis7/AggregateIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of each aggrgate in an exercise is specified by an aggregate identifier record. The aggregate ID is not an entity and shall not be treated as such. Section 6.2.3.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class AggregateIdentifier
-    {
-        /// <summary>
-        /// Simulation address, ie site and application, the first two fields of the entity ID
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// the aggregate ID
-        /// </summary>
-        private ushort _aggregateID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AggregateIdentifier"/> class.
-        /// </summary>
-        public AggregateIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AggregateIdentifier left, AggregateIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AggregateIdentifier left, AggregateIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._aggregateID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Simulation address, ie site and application, the first two fields of the entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the aggregate ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "aggregateID")]
-        public ushort AggregateID
-        {
-            get
-            {
-                return this._aggregateID;
-            }
-
-            set
-            {
-                this._aggregateID = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._aggregateID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._aggregateID = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AggregateIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<aggregateID type=\"ushort\">" + this._aggregateID.ToString(CultureInfo.InvariantCulture) + "</aggregateID>");
-                sb.AppendLine("</AggregateIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AggregateIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AggregateIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._aggregateID != obj._aggregateID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._aggregateID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AggregateMarking.cs b/Libs/CSharpDis7/AggregateMarking.cs
deleted file mode 100644
index 0bebe1a..0000000
--- a/Libs/CSharpDis7/AggregateMarking.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Specifies the character set used in the first byte, followed by up to 31 characters of text data. Section 6.2.4. 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AggregateMarking
-    {
-        /// <summary>
-        /// The character set
-        /// </summary>
-        private byte _characterSet;
-
-        /// <summary>
-        /// The characters
-        /// </summary>
-        private byte[] _characters = new byte[31];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AggregateMarking"/> class.
-        /// </summary>
-        public AggregateMarking()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AggregateMarking left, AggregateMarking right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AggregateMarking left, AggregateMarking right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._characterSet
-            marshalSize += 31 * 1;  // _characters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The character set
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
-        public byte CharacterSet
-        {
-            get
-            {
-                return this._characterSet;
-            }
-
-            set
-            {
-                this._characterSet = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The characters
-        /// </summary>
-        [XmlArray(ElementName = "characters")]
-        public byte[] Characters
-        {
-            get
-            {
-                return this._characters;
-            }
-
-            set
-            {
-                this._characters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._characterSet);
-
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        dos.WriteUnsignedByte(this._characters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._characterSet = dis.ReadUnsignedByte();
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        this._characters[idx] = dis.ReadUnsignedByte();
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AggregateMarking>");
-            try
-            {
-                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
-                for (int idx = 0; idx < this._characters.Length; idx++)
-                {
-                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</AggregateMarking>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AggregateMarking;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AggregateMarking obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._characterSet != obj._characterSet)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._characters.Length != 31) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 31; idx++)
-                {
-                    if (this._characters[idx] != obj._characters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
-
-            for (int idx = 0; idx < 31; idx++)
-            {
-                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AggregateType.cs b/Libs/CSharpDis7/AggregateType.cs
deleted file mode 100644
index 9caa34b..0000000
--- a/Libs/CSharpDis7/AggregateType.cs
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Identifies the type and organization of an aggregate. Section 6.2.5
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AggregateType
-    {
-        /// <summary>
-        /// Grouping criterion used to group the aggregate. Enumeration from EBV document
-        /// </summary>
-        private byte _aggregateKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply.
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AggregateType"/> class.
-        /// </summary>
-        public AggregateType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AggregateType left, AggregateType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AggregateType left, AggregateType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._aggregateKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Grouping criterion used to group the aggregate. Enumeration from EBV document
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "aggregateKind")]
-        public byte AggregateKind
-        {
-            get
-            {
-                return this._aggregateKind;
-            }
-
-            set
-            {
-                this._aggregateKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._aggregateKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._aggregateKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AggregateType>");
-            try
-            {
-                sb.AppendLine("<aggregateKind type=\"byte\">" + this._aggregateKind.ToString(CultureInfo.InvariantCulture) + "</aggregateKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("</AggregateType>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AggregateType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AggregateType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._aggregateKind != obj._aggregateKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._aggregateKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AngleDeception.cs b/Libs/CSharpDis7/AngleDeception.cs
deleted file mode 100644
index 9cd9d41..0000000
--- a/Libs/CSharpDis7/AngleDeception.cs
+++ /dev/null
@@ -1,661 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The Angle Deception attribute record may be used to communicate discrete values that are associated with angle deception jamming that cannot be referenced to an emitter mode. The values provided in the record records (provided in the associated Electromagnetic Emission PDU). (The victim radar beams are those that are targeted by the jammer.) Section 6.2.12.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AngleDeception
-    {
-        private uint _recordType = 3501;
-
-        private ushort _recordLength = 48;
-
-        private ushort _padding;
-
-        private byte _emitterNumber;
-
-        private byte _beamNumber;
-
-        private byte _stateIndicator;
-
-        private uint _padding2;
-
-        private float _azimuthOffset;
-
-        private float _azimuthWidth;
-
-        private float _azimuthPullRate;
-
-        private float _azimuthPullAcceleration;
-
-        private float _elevationOffset;
-
-        private float _elevationWidth;
-
-        private float _elevationPullRate;
-
-        private float _elevationPullAcceleration;
-
-        private uint _padding3;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AngleDeception"/> class.
-        /// </summary>
-        public AngleDeception()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AngleDeception left, AngleDeception right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AngleDeception left, AngleDeception right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 2;  // this._padding
-            marshalSize += 1;  // this._emitterNumber
-            marshalSize += 1;  // this._beamNumber
-            marshalSize += 1;  // this._stateIndicator
-            marshalSize += 4;  // this._padding2
-            marshalSize += 4;  // this._azimuthOffset
-            marshalSize += 4;  // this._azimuthWidth
-            marshalSize += 4;  // this._azimuthPullRate
-            marshalSize += 4;  // this._azimuthPullAcceleration
-            marshalSize += 4;  // this._elevationOffset
-            marshalSize += 4;  // this._elevationWidth
-            marshalSize += 4;  // this._elevationPullRate
-            marshalSize += 4;  // this._elevationPullAcceleration
-            marshalSize += 4;  // this._padding3
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
-        public byte EmitterNumber
-        {
-            get
-            {
-                return this._emitterNumber;
-            }
-
-            set
-            {
-                this._emitterNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
-        public byte BeamNumber
-        {
-            get
-            {
-                return this._beamNumber;
-            }
-
-            set
-            {
-                this._beamNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "stateIndicator")]
-        public byte StateIndicator
-        {
-            get
-            {
-                return this._stateIndicator;
-            }
-
-            set
-            {
-                this._stateIndicator = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "padding2")]
-        public uint Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "azimuthOffset")]
-        public float AzimuthOffset
-        {
-            get
-            {
-                return this._azimuthOffset;
-            }
-
-            set
-            {
-                this._azimuthOffset = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "azimuthWidth")]
-        public float AzimuthWidth
-        {
-            get
-            {
-                return this._azimuthWidth;
-            }
-
-            set
-            {
-                this._azimuthWidth = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "azimuthPullRate")]
-        public float AzimuthPullRate
-        {
-            get
-            {
-                return this._azimuthPullRate;
-            }
-
-            set
-            {
-                this._azimuthPullRate = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "azimuthPullAcceleration")]
-        public float AzimuthPullAcceleration
-        {
-            get
-            {
-                return this._azimuthPullAcceleration;
-            }
-
-            set
-            {
-                this._azimuthPullAcceleration = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "elevationOffset")]
-        public float ElevationOffset
-        {
-            get
-            {
-                return this._elevationOffset;
-            }
-
-            set
-            {
-                this._elevationOffset = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "elevationWidth")]
-        public float ElevationWidth
-        {
-            get
-            {
-                return this._elevationWidth;
-            }
-
-            set
-            {
-                this._elevationWidth = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "elevationPullRate")]
-        public float ElevationPullRate
-        {
-            get
-            {
-                return this._elevationPullRate;
-            }
-
-            set
-            {
-                this._elevationPullRate = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "elevationPullAcceleration")]
-        public float ElevationPullAcceleration
-        {
-            get
-            {
-                return this._elevationPullAcceleration;
-            }
-
-            set
-            {
-                this._elevationPullAcceleration = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "padding3")]
-        public uint Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    dos.WriteUnsignedByte((byte)this._emitterNumber);
-                    dos.WriteUnsignedByte((byte)this._beamNumber);
-                    dos.WriteUnsignedByte((byte)this._stateIndicator);
-                    dos.WriteUnsignedInt((uint)this._padding2);
-                    dos.WriteFloat((float)this._azimuthOffset);
-                    dos.WriteFloat((float)this._azimuthWidth);
-                    dos.WriteFloat((float)this._azimuthPullRate);
-                    dos.WriteFloat((float)this._azimuthPullAcceleration);
-                    dos.WriteFloat((float)this._elevationOffset);
-                    dos.WriteFloat((float)this._elevationWidth);
-                    dos.WriteFloat((float)this._elevationPullRate);
-                    dos.WriteFloat((float)this._elevationPullAcceleration);
-                    dos.WriteUnsignedInt((uint)this._padding3);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                    this._emitterNumber = dis.ReadUnsignedByte();
-                    this._beamNumber = dis.ReadUnsignedByte();
-                    this._stateIndicator = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedInt();
-                    this._azimuthOffset = dis.ReadFloat();
-                    this._azimuthWidth = dis.ReadFloat();
-                    this._azimuthPullRate = dis.ReadFloat();
-                    this._azimuthPullAcceleration = dis.ReadFloat();
-                    this._elevationOffset = dis.ReadFloat();
-                    this._elevationWidth = dis.ReadFloat();
-                    this._elevationPullRate = dis.ReadFloat();
-                    this._elevationPullAcceleration = dis.ReadFloat();
-                    this._padding3 = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AngleDeception>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
-                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
-                sb.AppendLine("<stateIndicator type=\"byte\">" + this._stateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateIndicator>");
-                sb.AppendLine("<padding2 type=\"uint\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<azimuthOffset type=\"float\">" + this._azimuthOffset.ToString(CultureInfo.InvariantCulture) + "</azimuthOffset>");
-                sb.AppendLine("<azimuthWidth type=\"float\">" + this._azimuthWidth.ToString(CultureInfo.InvariantCulture) + "</azimuthWidth>");
-                sb.AppendLine("<azimuthPullRate type=\"float\">" + this._azimuthPullRate.ToString(CultureInfo.InvariantCulture) + "</azimuthPullRate>");
-                sb.AppendLine("<azimuthPullAcceleration type=\"float\">" + this._azimuthPullAcceleration.ToString(CultureInfo.InvariantCulture) + "</azimuthPullAcceleration>");
-                sb.AppendLine("<elevationOffset type=\"float\">" + this._elevationOffset.ToString(CultureInfo.InvariantCulture) + "</elevationOffset>");
-                sb.AppendLine("<elevationWidth type=\"float\">" + this._elevationWidth.ToString(CultureInfo.InvariantCulture) + "</elevationWidth>");
-                sb.AppendLine("<elevationPullRate type=\"float\">" + this._elevationPullRate.ToString(CultureInfo.InvariantCulture) + "</elevationPullRate>");
-                sb.AppendLine("<elevationPullAcceleration type=\"float\">" + this._elevationPullAcceleration.ToString(CultureInfo.InvariantCulture) + "</elevationPullAcceleration>");
-                sb.AppendLine("<padding3 type=\"uint\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                sb.AppendLine("</AngleDeception>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AngleDeception;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AngleDeception obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterNumber != obj._emitterNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamNumber != obj._beamNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateIndicator != obj._stateIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthOffset != obj._azimuthOffset)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthWidth != obj._azimuthWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthPullRate != obj._azimuthPullRate)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthPullAcceleration != obj._azimuthPullAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._elevationOffset != obj._elevationOffset)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._elevationWidth != obj._elevationWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._elevationPullRate != obj._elevationPullRate)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._elevationPullAcceleration != obj._elevationPullAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._stateIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthOffset.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthPullRate.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthPullAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._elevationOffset.GetHashCode();
-            result = GenerateHash(result) ^ this._elevationWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._elevationPullRate.GetHashCode();
-            result = GenerateHash(result) ^ this._elevationPullAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AngularVelocityVector.cs b/Libs/CSharpDis7/AngularVelocityVector.cs
deleted file mode 100644
index 94e683c..0000000
--- a/Libs/CSharpDis7/AngularVelocityVector.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Angular velocity measured in radians per second out each of the entity's own coordinate axes. Order of measurement is angular velocity around the x, y, and z axis of the entity. The positive direction is determined by the right hand rule. Section 6.2.7
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AngularVelocityVector
-    {
-        /// <summary>
-        /// velocity about the x axis
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// velocity about the y axis
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// velocity about the zaxis
-        /// </summary>
-        private float _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AngularVelocityVector"/> class.
-        /// </summary>
-        public AngularVelocityVector()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AngularVelocityVector left, AngularVelocityVector right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AngularVelocityVector left, AngularVelocityVector right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            marshalSize += 4;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the x axis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the y axis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the zaxis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "z")]
-        public float Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                    dos.WriteFloat((float)this._z);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                    this._z = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AngularVelocityVector>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</AngularVelocityVector>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AngularVelocityVector;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AngularVelocityVector obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AntennaLocation.cs b/Libs/CSharpDis7/AntennaLocation.cs
deleted file mode 100644
index 295c55f..0000000
--- a/Libs/CSharpDis7/AntennaLocation.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. Section 6.2.8
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class AntennaLocation
-    {
-        /// <summary>
-        /// Location of the radiating portion of the antenna in world    coordinates
-        /// </summary>
-        private Vector3Double _antennaLocation = new Vector3Double();
-
-        /// <summary>
-        /// Location of the radiating portion of the antenna     in entity coordinates
-        /// </summary>
-        private Vector3Float _relativeAntennaLocation = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AntennaLocation"/> class.
-        /// </summary>
-        public AntennaLocation()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AntennaLocation left, AntennaLocation right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AntennaLocation left, AntennaLocation right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
-            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of the radiating portion of the antenna in world    coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
-        public Vector3Double AntennaLocation_
-        {
-            get
-            {
-                return this._antennaLocation;
-            }
-
-            set
-            {
-                this._antennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of the radiating portion of the antenna     in entity coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
-        public Vector3Float RelativeAntennaLocation
-        {
-            get
-            {
-                return this._relativeAntennaLocation;
-            }
-
-            set
-            {
-                this._relativeAntennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._antennaLocation.Marshal(dos);
-                    this._relativeAntennaLocation.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._antennaLocation.Unmarshal(dis);
-                    this._relativeAntennaLocation.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AntennaLocation>");
-            try
-            {
-                sb.AppendLine("<antennaLocation>");
-                this._antennaLocation.Reflection(sb);
-                sb.AppendLine("</antennaLocation>");
-                sb.AppendLine("<relativeAntennaLocation>");
-                this._relativeAntennaLocation.Reflection(sb);
-                sb.AppendLine("</relativeAntennaLocation>");
-                sb.AppendLine("</AntennaLocation>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AntennaLocation;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AntennaLocation obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._antennaLocation.Equals(obj._antennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ArealObjectStatePdu.cs b/Libs/CSharpDis7/ArealObjectStatePdu.cs
deleted file mode 100644
index 5745e61..0000000
--- a/Libs/CSharpDis7/ArealObjectStatePdu.cs
+++ /dev/null
@@ -1,685 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information about the addition/modification of an oobject that is geometrically anchored to the terrain with a set of three or more points that come to a closure. Section 7.10.6 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(SimulationAddress))]
-    [XmlInclude(typeof(Vector3Double))]
-    public partial class ArealObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<ArealObjectStatePdu>
-    {
-        /// <summary>
-        /// Object in synthetic environment
-        /// </summary>
-        private EntityID _objectID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _referencedObjectID = new EntityID();
-
-        /// <summary>
-        /// unique update number of each state transition of an object
-        /// </summary>
-        private ushort _updateNumber;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// modifications enumeration
-        /// </summary>
-        private byte _modifications;
-
-        /// <summary>
-        /// Object type
-        /// </summary>
-        private EntityType _objectType = new EntityType();
-
-        /// <summary>
-        /// Object appearance
-        /// </summary>
-        private uint _specificObjectAppearance;
-
-        /// <summary>
-        /// Object appearance
-        /// </summary>
-        private ushort _generalObjectAppearance;
-
-        /// <summary>
-        /// Number of points
-        /// </summary>
-        private ushort _numberOfPoints;
-
-        /// <summary>
-        /// requesterID
-        /// </summary>
-        private SimulationAddress _requesterID = new SimulationAddress();
-
-        /// <summary>
-        /// receiver ID
-        /// </summary>
-        private SimulationAddress _receivingID = new SimulationAddress();
-
-        /// <summary>
-        /// location of object
-        /// </summary>
-        private List<Vector3Double> _objectLocation = new List<Vector3Double>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArealObjectStatePdu"/> class.
-        /// </summary>
-        public ArealObjectStatePdu()
-        {
-            PduType = (byte)45;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ArealObjectStatePdu left, ArealObjectStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ArealObjectStatePdu left, ArealObjectStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
-            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
-            marshalSize += 2;  // this._updateNumber
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._modifications
-            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
-            marshalSize += 4;  // this._specificObjectAppearance
-            marshalSize += 2;  // this._generalObjectAppearance
-            marshalSize += 2;  // this._numberOfPoints
-            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            for (int idx = 0; idx < this._objectLocation.Count; idx++)
-            {
-                Vector3Double listElement = (Vector3Double)this._objectLocation[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object in synthetic environment
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
-        public EntityID ObjectID
-        {
-            get
-            {
-                return this._objectID;
-            }
-
-            set
-            {
-                this._objectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
-        public EntityID ReferencedObjectID
-        {
-            get
-            {
-                return this._referencedObjectID;
-            }
-
-            set
-            {
-                this._referencedObjectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique update number of each state transition of an object
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
-        public ushort UpdateNumber
-        {
-            get
-            {
-                return this._updateNumber;
-            }
-
-            set
-            {
-                this._updateNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the modifications enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
-        public byte Modifications
-        {
-            get
-            {
-                return this._modifications;
-            }
-
-            set
-            {
-                this._modifications = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object type
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "objectType")]
-        public EntityType ObjectType
-        {
-            get
-            {
-                return this._objectType;
-            }
-
-            set
-            {
-                this._objectType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object appearance
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "specificObjectAppearance")]
-        public uint SpecificObjectAppearance
-        {
-            get
-            {
-                return this._specificObjectAppearance;
-            }
-
-            set
-            {
-                this._specificObjectAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object appearance
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "generalObjectAppearance")]
-        public ushort GeneralObjectAppearance
-        {
-            get
-            {
-                return this._generalObjectAppearance;
-            }
-
-            set
-            {
-                this._generalObjectAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPoints method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPoints")]
-        public ushort NumberOfPoints
-        {
-            get
-            {
-                return this._numberOfPoints;
-            }
-
-            set
-            {
-                this._numberOfPoints = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the requesterID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
-        public SimulationAddress RequesterID
-        {
-            get
-            {
-                return this._requesterID;
-            }
-
-            set
-            {
-                this._requesterID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receiver ID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
-        public SimulationAddress ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of object
-        /// </summary>
-        [XmlElement(ElementName = "objectLocationList", Type = typeof(List<Vector3Double>))]
-        public List<Vector3Double> ObjectLocation
-        {
-            get
-            {
-                return this._objectLocation;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._objectID.Marshal(dos);
-                    this._referencedObjectID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._updateNumber);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._modifications);
-                    this._objectType.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._specificObjectAppearance);
-                    dos.WriteUnsignedShort((ushort)this._generalObjectAppearance);
-                    dos.WriteUnsignedShort((ushort)this._objectLocation.Count);
-                    this._requesterID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-
-                    for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                    {
-                        Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
-                        aVector3Double.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._objectID.Unmarshal(dis);
-                    this._referencedObjectID.Unmarshal(dis);
-                    this._updateNumber = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._modifications = dis.ReadUnsignedByte();
-                    this._objectType.Unmarshal(dis);
-                    this._specificObjectAppearance = dis.ReadUnsignedInt();
-                    this._generalObjectAppearance = dis.ReadUnsignedShort();
-                    this._numberOfPoints = dis.ReadUnsignedShort();
-                    this._requesterID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    for (int idx = 0; idx < this.NumberOfPoints; idx++)
-                    {
-                        Vector3Double anX = new Vector3Double();
-                        anX.Unmarshal(dis);
-                        this._objectLocation.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ArealObjectStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<objectID>");
-                this._objectID.Reflection(sb);
-                sb.AppendLine("</objectID>");
-                sb.AppendLine("<referencedObjectID>");
-                this._referencedObjectID.Reflection(sb);
-                sb.AppendLine("</referencedObjectID>");
-                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
-                sb.AppendLine("<objectType>");
-                this._objectType.Reflection(sb);
-                sb.AppendLine("</objectType>");
-                sb.AppendLine("<specificObjectAppearance type=\"uint\">" + this._specificObjectAppearance.ToString(CultureInfo.InvariantCulture) + "</specificObjectAppearance>");
-                sb.AppendLine("<generalObjectAppearance type=\"ushort\">" + this._generalObjectAppearance.ToString(CultureInfo.InvariantCulture) + "</generalObjectAppearance>");
-                sb.AppendLine("<objectLocation type=\"ushort\">" + this._objectLocation.Count.ToString(CultureInfo.InvariantCulture) + "</objectLocation>");
-                sb.AppendLine("<requesterID>");
-                this._requesterID.Reflection(sb);
-                sb.AppendLine("</requesterID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                {
-                    sb.AppendLine("<objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Double\">");
-                    Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
-                    aVector3Double.Reflection(sb);
-                    sb.AppendLine("</objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ArealObjectStatePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ArealObjectStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ArealObjectStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._objectID.Equals(obj._objectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._updateNumber != obj._updateNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modifications != obj._modifications)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectType.Equals(obj._objectType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specificObjectAppearance != obj._specificObjectAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._generalObjectAppearance != obj._generalObjectAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPoints != obj._numberOfPoints)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requesterID.Equals(obj._requesterID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._objectLocation.Count != obj._objectLocation.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                {
-                    if (!this._objectLocation[idx].Equals(obj._objectLocation[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._objectID.GetHashCode();
-            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
-            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._modifications.GetHashCode();
-            result = GenerateHash(result) ^ this._objectType.GetHashCode();
-            result = GenerateHash(result) ^ this._specificObjectAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._generalObjectAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPoints.GetHashCode();
-            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-
-            if (this._objectLocation.Count > 0)
-            {
-                for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._objectLocation[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ArticulatedParts.cs b/Libs/CSharpDis7/ArticulatedParts.cs
deleted file mode 100644
index 2276f66..0000000
--- a/Libs/CSharpDis7/ArticulatedParts.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  articulated parts for movable parts and a combination of moveable/attached parts of an entity. Section 6.2.93.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ArticulatedParts
-    {
-        /// <summary>
-        /// the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        private byte _recordType;
-
-        /// <summary>
-        /// indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change 
-        /// </summary>
-        private byte _changeIndicator;
-
-        /// <summary>
-        /// the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
-        /// </summary>
-        private ushort _partAttachedTo;
-
-        /// <summary>
-        /// the type of parameter represented, 32 bit enumeration
-        /// </summary>
-        private uint _parameterType;
-
-        /// <summary>
-        /// The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
-        /// </summary>
-        private ulong _parameterValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArticulatedParts"/> class.
-        /// </summary>
-        public ArticulatedParts()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ArticulatedParts left, ArticulatedParts right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ArticulatedParts left, ArticulatedParts right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._recordType
-            marshalSize += 1;  // this._changeIndicator
-            marshalSize += 2;  // this._partAttachedTo
-            marshalSize += 4;  // this._parameterType
-            marshalSize += 8;  // this._parameterValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
-        public byte RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
-        public byte ChangeIndicator
-        {
-            get
-            {
-                return this._changeIndicator;
-            }
-
-            set
-            {
-                this._changeIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
-        public ushort PartAttachedTo
-        {
-            get
-            {
-                return this._partAttachedTo;
-            }
-
-            set
-            {
-                this._partAttachedTo = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the type of parameter represented, 32 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "parameterType")]
-        public uint ParameterType
-        {
-            get
-            {
-                return this._parameterType;
-            }
-
-            set
-            {
-                this._parameterType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
-        /// </summary>
-        [XmlElement(Type = typeof(ulong), ElementName = "parameterValue")]
-        public ulong ParameterValue
-        {
-            get
-            {
-                return this._parameterValue;
-            }
-
-            set
-            {
-                this._parameterValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._recordType);
-                    dos.WriteUnsignedByte((byte)this._changeIndicator);
-                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
-                    dos.WriteUnsignedInt((uint)this._parameterType);
-                    dos.WriteUnsignedLong((ulong)this._parameterValue);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedByte();
-                    this._changeIndicator = dis.ReadUnsignedByte();
-                    this._partAttachedTo = dis.ReadUnsignedShort();
-                    this._parameterType = dis.ReadUnsignedInt();
-                    this._parameterValue = dis.ReadUnsignedLong();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ArticulatedParts>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
-                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
-                sb.AppendLine("<parameterType type=\"uint\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
-                sb.AppendLine("<parameterValue type=\"ulong\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
-                sb.AppendLine("</ArticulatedParts>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ArticulatedParts;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ArticulatedParts obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._changeIndicator != obj._changeIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._partAttachedTo != obj._partAttachedTo)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterType != obj._parameterType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterValue != obj._parameterValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Association.cs b/Libs/CSharpDis7/Association.cs
deleted file mode 100644
index 9e03f80..0000000
--- a/Libs/CSharpDis7/Association.cs
+++ /dev/null
@@ -1,367 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// An entity's associations with other entities and/or locations. For each association, this record shall specify the type of the association, the associated entity's EntityID and/or the associated location's world coordinates. This record may be used (optionally) in a transfer transaction to send internal state data from the divesting simulation to the acquiring simulation (see 5.9.4). This record may also be used for other purposes. Section 6.2.10
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Vector3Double))]
-    public partial class Association
-    {
-        private byte _associationType;
-
-        private byte _padding4;
-
-        /// <summary>
-        /// identity of associated entity. If none, NO_SPECIFIC_ENTITY
-        /// </summary>
-        private EntityID _associatedEntityID = new EntityID();
-
-        /// <summary>
-        /// location, in world coordinates
-        /// </summary>
-        private Vector3Double _associatedLocation = new Vector3Double();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Association"/> class.
-        /// </summary>
-        public Association()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Association left, Association right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Association left, Association right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._associationType
-            marshalSize += 1;  // this._padding4
-            marshalSize += this._associatedEntityID.GetMarshalledSize();  // this._associatedEntityID
-            marshalSize += this._associatedLocation.GetMarshalledSize();  // this._associatedLocation
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "associationType")]
-        public byte AssociationType
-        {
-            get
-            {
-                return this._associationType;
-            }
-
-            set
-            {
-                this._associationType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "padding4")]
-        public byte Padding4
-        {
-            get
-            {
-                return this._padding4;
-            }
-
-            set
-            {
-                this._padding4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the identity of associated entity. If none, NO_SPECIFIC_ENTITY
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "associatedEntityID")]
-        public EntityID AssociatedEntityID
-        {
-            get
-            {
-                return this._associatedEntityID;
-            }
-
-            set
-            {
-                this._associatedEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location, in world coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "associatedLocation")]
-        public Vector3Double AssociatedLocation
-        {
-            get
-            {
-                return this._associatedLocation;
-            }
-
-            set
-            {
-                this._associatedLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._associationType);
-                    dos.WriteUnsignedByte((byte)this._padding4);
-                    this._associatedEntityID.Marshal(dos);
-                    this._associatedLocation.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._associationType = dis.ReadUnsignedByte();
-                    this._padding4 = dis.ReadUnsignedByte();
-                    this._associatedEntityID.Unmarshal(dis);
-                    this._associatedLocation.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Association>");
-            try
-            {
-                sb.AppendLine("<associationType type=\"byte\">" + this._associationType.ToString(CultureInfo.InvariantCulture) + "</associationType>");
-                sb.AppendLine("<padding4 type=\"byte\">" + this._padding4.ToString(CultureInfo.InvariantCulture) + "</padding4>");
-                sb.AppendLine("<associatedEntityID>");
-                this._associatedEntityID.Reflection(sb);
-                sb.AppendLine("</associatedEntityID>");
-                sb.AppendLine("<associatedLocation>");
-                this._associatedLocation.Reflection(sb);
-                sb.AppendLine("</associatedLocation>");
-                sb.AppendLine("</Association>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Association;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Association obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._associationType != obj._associationType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding4 != obj._padding4)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._associatedEntityID.Equals(obj._associatedEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._associatedLocation.Equals(obj._associatedLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._associationType.GetHashCode();
-            result = GenerateHash(result) ^ this._padding4.GetHashCode();
-            result = GenerateHash(result) ^ this._associatedEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._associatedLocation.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AttachedParts.cs b/Libs/CSharpDis7/AttachedParts.cs
deleted file mode 100644
index 3e41b87..0000000
--- a/Libs/CSharpDis7/AttachedParts.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Removable parts that may be attached to an entity.  Section 6.2.93.3
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AttachedParts
-    {
-        /// <summary>
-        /// the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        private byte _recordType = 1;
-
-        /// <summary>
-        /// 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram
-        /// </summary>
-        private byte _detachedIndicator;
-
-        /// <summary>
-        /// the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
-        /// </summary>
-        private ushort _partAttachedTo;
-
-        /// <summary>
-        /// The location or station to which the part is attached
-        /// </summary>
-        private uint _parameterType;
-
-        /// <summary>
-        /// The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
-        /// </summary>
-        private ulong _parameterValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AttachedParts"/> class.
-        /// </summary>
-        public AttachedParts()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AttachedParts left, AttachedParts right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AttachedParts left, AttachedParts right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._recordType
-            marshalSize += 1;  // this._detachedIndicator
-            marshalSize += 2;  // this._partAttachedTo
-            marshalSize += 4;  // this._parameterType
-            marshalSize += 8;  // this._parameterValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
-        public byte RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "detachedIndicator")]
-        public byte DetachedIndicator
-        {
-            get
-            {
-                return this._detachedIndicator;
-            }
-
-            set
-            {
-                this._detachedIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
-        public ushort PartAttachedTo
-        {
-            get
-            {
-                return this._partAttachedTo;
-            }
-
-            set
-            {
-                this._partAttachedTo = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The location or station to which the part is attached
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "parameterType")]
-        public uint ParameterType
-        {
-            get
-            {
-                return this._parameterType;
-            }
-
-            set
-            {
-                this._parameterType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
-        /// </summary>
-        [XmlElement(Type = typeof(ulong), ElementName = "parameterValue")]
-        public ulong ParameterValue
-        {
-            get
-            {
-                return this._parameterValue;
-            }
-
-            set
-            {
-                this._parameterValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._recordType);
-                    dos.WriteUnsignedByte((byte)this._detachedIndicator);
-                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
-                    dos.WriteUnsignedInt((uint)this._parameterType);
-                    dos.WriteUnsignedLong((ulong)this._parameterValue);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedByte();
-                    this._detachedIndicator = dis.ReadUnsignedByte();
-                    this._partAttachedTo = dis.ReadUnsignedShort();
-                    this._parameterType = dis.ReadUnsignedInt();
-                    this._parameterValue = dis.ReadUnsignedLong();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AttachedParts>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<detachedIndicator type=\"byte\">" + this._detachedIndicator.ToString(CultureInfo.InvariantCulture) + "</detachedIndicator>");
-                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
-                sb.AppendLine("<parameterType type=\"uint\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
-                sb.AppendLine("<parameterValue type=\"ulong\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
-                sb.AppendLine("</AttachedParts>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AttachedParts;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AttachedParts obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._detachedIndicator != obj._detachedIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._partAttachedTo != obj._partAttachedTo)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterType != obj._parameterType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterValue != obj._parameterValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._detachedIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Attribute.cs b/Libs/CSharpDis7/Attribute.cs
deleted file mode 100644
index af8503c..0000000
--- a/Libs/CSharpDis7/Attribute.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Used to convey information for one or more attributes. Attributes conform to the standard variable record format of 6.2.82. Section 6.2.11
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Attribute
-    {
-        private uint _recordType;
-
-        private byte _recordLength;
-
-        private ulong _recordSpecificFields;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Attribute"/> class.
-        /// </summary>
-        public Attribute()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Attribute left, Attribute right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Attribute left, Attribute right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 1;  // this._recordLength
-            marshalSize += 8;  // this._recordSpecificFields
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "recordLength")]
-        public byte RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ulong), ElementName = "recordSpecificFields")]
-        public ulong RecordSpecificFields
-        {
-            get
-            {
-                return this._recordSpecificFields;
-            }
-
-            set
-            {
-                this._recordSpecificFields = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedByte((byte)this._recordLength);
-                    dos.WriteUnsignedLong((ulong)this._recordSpecificFields);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedByte();
-                    this._recordSpecificFields = dis.ReadUnsignedLong();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Attribute>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"byte\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<recordSpecificFields type=\"ulong\">" + this._recordSpecificFields.ToString(CultureInfo.InvariantCulture) + "</recordSpecificFields>");
-                sb.AppendLine("</Attribute>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Attribute;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Attribute obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSpecificFields != obj._recordSpecificFields)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._recordSpecificFields.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/AttributePdu.cs b/Libs/CSharpDis7/AttributePdu.cs
deleted file mode 100644
index 466a155..0000000
--- a/Libs/CSharpDis7/AttributePdu.cs
+++ /dev/null
@@ -1,539 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information about individual attributes for a particular entity, other object, or event may be communicated using an Attribute PDU. The Attribute PDU shall not be used to exchange data available in any other PDU except where explicitly mentioned in the PDU issuance instructions within this standard. See 5.3.6 for the information requirements and issuance and receipt rules for this PDU. Section 7.2.6. INCOMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class AttributePdu : EntityInformationFamilyPdu, IEquatable<AttributePdu>
-    {
-        /// <summary>
-        /// This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79).
-        /// </summary>
-        private SimulationAddress _originatingSimulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private int _padding1;
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private short _padding2;
-
-        /// <summary>
-        /// This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration.
-        /// </summary>
-        private byte _attributeRecordPduType;
-
-        /// <summary>
-        /// This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration.
-        /// </summary>
-        private byte _attributeRecordProtocolVersion;
-
-        /// <summary>
-        /// This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration.
-        /// </summary>
-        private uint _masterAttributeRecordType;
-
-        /// <summary>
-        /// This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration.
-        /// </summary>
-        private byte _actionCode;
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private byte _padding3;
-
-        /// <summary>
-        /// This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer.
-        /// </summary>
-        private ushort _numberAttributeRecordSet;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AttributePdu"/> class.
-        /// </summary>
-        public AttributePdu()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AttributePdu left, AttributePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AttributePdu left, AttributePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingSimulationAddress.GetMarshalledSize();  // this._originatingSimulationAddress
-            marshalSize += 4;  // this._padding1
-            marshalSize += 2;  // this._padding2
-            marshalSize += 1;  // this._attributeRecordPduType
-            marshalSize += 1;  // this._attributeRecordProtocolVersion
-            marshalSize += 4;  // this._masterAttributeRecordType
-            marshalSize += 1;  // this._actionCode
-            marshalSize += 1;  // this._padding3
-            marshalSize += 2;  // this._numberAttributeRecordSet
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79).
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "originatingSimulationAddress")]
-        public SimulationAddress OriginatingSimulationAddress
-        {
-            get
-            {
-                return this._originatingSimulationAddress;
-            }
-
-            set
-            {
-                this._originatingSimulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "padding1")]
-        public int Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding2")]
-        public short Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "attributeRecordPduType")]
-        public byte AttributeRecordPduType
-        {
-            get
-            {
-                return this._attributeRecordPduType;
-            }
-
-            set
-            {
-                this._attributeRecordPduType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "attributeRecordProtocolVersion")]
-        public byte AttributeRecordProtocolVersion
-        {
-            get
-            {
-                return this._attributeRecordProtocolVersion;
-            }
-
-            set
-            {
-                this._attributeRecordProtocolVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "masterAttributeRecordType")]
-        public uint MasterAttributeRecordType
-        {
-            get
-            {
-                return this._masterAttributeRecordType;
-            }
-
-            set
-            {
-                this._masterAttributeRecordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "actionCode")]
-        public byte ActionCode
-        {
-            get
-            {
-                return this._actionCode;
-            }
-
-            set
-            {
-                this._actionCode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding3")]
-        public byte Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberAttributeRecordSet")]
-        public ushort NumberAttributeRecordSet
-        {
-            get
-            {
-                return this._numberAttributeRecordSet;
-            }
-
-            set
-            {
-                this._numberAttributeRecordSet = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingSimulationAddress.Marshal(dos);
-                    dos.WriteInt((int)this._padding1);
-                    dos.WriteShort((short)this._padding2);
-                    dos.WriteUnsignedByte((byte)this._attributeRecordPduType);
-                    dos.WriteUnsignedByte((byte)this._attributeRecordProtocolVersion);
-                    dos.WriteUnsignedInt((uint)this._masterAttributeRecordType);
-                    dos.WriteUnsignedByte((byte)this._actionCode);
-                    dos.WriteByte((byte)this._padding3);
-                    dos.WriteUnsignedShort((ushort)this._numberAttributeRecordSet);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingSimulationAddress.Unmarshal(dis);
-                    this._padding1 = dis.ReadInt();
-                    this._padding2 = dis.ReadShort();
-                    this._attributeRecordPduType = dis.ReadUnsignedByte();
-                    this._attributeRecordProtocolVersion = dis.ReadUnsignedByte();
-                    this._masterAttributeRecordType = dis.ReadUnsignedInt();
-                    this._actionCode = dis.ReadUnsignedByte();
-                    this._padding3 = dis.ReadByte();
-                    this._numberAttributeRecordSet = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AttributePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingSimulationAddress>");
-                this._originatingSimulationAddress.Reflection(sb);
-                sb.AppendLine("</originatingSimulationAddress>");
-                sb.AppendLine("<padding1 type=\"int\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"short\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<attributeRecordPduType type=\"byte\">" + this._attributeRecordPduType.ToString(CultureInfo.InvariantCulture) + "</attributeRecordPduType>");
-                sb.AppendLine("<attributeRecordProtocolVersion type=\"byte\">" + this._attributeRecordProtocolVersion.ToString(CultureInfo.InvariantCulture) + "</attributeRecordProtocolVersion>");
-                sb.AppendLine("<masterAttributeRecordType type=\"uint\">" + this._masterAttributeRecordType.ToString(CultureInfo.InvariantCulture) + "</masterAttributeRecordType>");
-                sb.AppendLine("<actionCode type=\"byte\">" + this._actionCode.ToString(CultureInfo.InvariantCulture) + "</actionCode>");
-                sb.AppendLine("<padding3 type=\"byte\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                sb.AppendLine("<numberAttributeRecordSet type=\"ushort\">" + this._numberAttributeRecordSet.ToString(CultureInfo.InvariantCulture) + "</numberAttributeRecordSet>");
-                sb.AppendLine("</AttributePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AttributePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AttributePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingSimulationAddress.Equals(obj._originatingSimulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._attributeRecordPduType != obj._attributeRecordPduType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._attributeRecordProtocolVersion != obj._attributeRecordProtocolVersion)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._masterAttributeRecordType != obj._masterAttributeRecordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._actionCode != obj._actionCode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberAttributeRecordSet != obj._numberAttributeRecordSet)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingSimulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._attributeRecordPduType.GetHashCode();
-            result = GenerateHash(result) ^ this._attributeRecordProtocolVersion.GetHashCode();
-            result = GenerateHash(result) ^ this._masterAttributeRecordType.GetHashCode();
-            result = GenerateHash(result) ^ this._actionCode.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-            result = GenerateHash(result) ^ this._numberAttributeRecordSet.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/BeamAntennaPattern.cs b/Libs/CSharpDis7/BeamAntennaPattern.cs
deleted file mode 100644
index 8787d61..0000000
--- a/Libs/CSharpDis7/BeamAntennaPattern.cs
+++ /dev/null
@@ -1,538 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Used when the antenna pattern type field has a value of 1. Specifies the direction, pattern, and polarization of radiation from an antenna. Section 6.2.9.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EulerAngles))]
-    public partial class BeamAntennaPattern
-    {
-        /// <summary>
-        /// The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record.
-        /// </summary>
-        private EulerAngles _beamDirection = new EulerAngles();
-
-        private float _azimuthBeamwidth;
-
-        private float _elevationBeamwidth;
-
-        private float _referenceSystem;
-
-        private byte _padding1;
-
-        private ushort _padding2;
-
-        /// <summary>
-        /// This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna. 
-        /// </summary>
-        private float _ez = 0.0;
-
-        /// <summary>
-        /// This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna.
-        /// </summary>
-        private float _ex = 0.0;
-
-        /// <summary>
-        /// This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI
-        /// </summary>
-        private float _phase = 0.0;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding3;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BeamAntennaPattern"/> class.
-        /// </summary>
-        public BeamAntennaPattern()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BeamAntennaPattern left, BeamAntennaPattern right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BeamAntennaPattern left, BeamAntennaPattern right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._beamDirection.GetMarshalledSize();  // this._beamDirection
-            marshalSize += 4;  // this._azimuthBeamwidth
-            marshalSize += 4;  // this._elevationBeamwidth
-            marshalSize += 4;  // this._referenceSystem
-            marshalSize += 1;  // this._padding1
-            marshalSize += 2;  // this._padding2
-            marshalSize += 4;  // this._ez
-            marshalSize += 4;  // this._ex
-            marshalSize += 4;  // this._phase
-            marshalSize += 4;  // this._padding3
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record.
-        /// </summary>
-        [XmlElement(Type = typeof(EulerAngles), ElementName = "beamDirection")]
-        public EulerAngles BeamDirection
-        {
-            get
-            {
-                return this._beamDirection;
-            }
-
-            set
-            {
-                this._beamDirection = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "azimuthBeamwidth")]
-        public float AzimuthBeamwidth
-        {
-            get
-            {
-                return this._azimuthBeamwidth;
-            }
-
-            set
-            {
-                this._azimuthBeamwidth = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "elevationBeamwidth")]
-        public float ElevationBeamwidth
-        {
-            get
-            {
-                return this._elevationBeamwidth;
-            }
-
-            set
-            {
-                this._elevationBeamwidth = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "referenceSystem")]
-        public float ReferenceSystem
-        {
-            get
-            {
-                return this._referenceSystem;
-            }
-
-            set
-            {
-                this._referenceSystem = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
-        public ushort Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna. 
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "ez")]
-        public float Ez
-        {
-            get
-            {
-                return this._ez;
-            }
-
-            set
-            {
-                this._ez = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "ex")]
-        public float Ex
-        {
-            get
-            {
-                return this._ex;
-            }
-
-            set
-            {
-                this._ex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "phase")]
-        public float Phase
-        {
-            get
-            {
-                return this._phase;
-            }
-
-            set
-            {
-                this._phase = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding3")]
-        public uint Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._beamDirection.Marshal(dos);
-                    dos.WriteFloat((float)this._azimuthBeamwidth);
-                    dos.WriteFloat((float)this._elevationBeamwidth);
-                    dos.WriteFloat((float)this._referenceSystem);
-                    dos.WriteUnsignedByte((byte)this._padding1);
-                    dos.WriteUnsignedShort((ushort)this._padding2);
-                    dos.WriteFloat((float)this._ez);
-                    dos.WriteFloat((float)this._ex);
-                    dos.WriteFloat((float)this._phase);
-                    dos.WriteUnsignedInt((uint)this._padding3);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamDirection.Unmarshal(dis);
-                    this._azimuthBeamwidth = dis.ReadFloat();
-                    this._elevationBeamwidth = dis.ReadFloat();
-                    this._referenceSystem = dis.ReadFloat();
-                    this._padding1 = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedShort();
-                    this._ez = dis.ReadFloat();
-                    this._ex = dis.ReadFloat();
-                    this._phase = dis.ReadFloat();
-                    this._padding3 = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BeamAntennaPattern>");
-            try
-            {
-                sb.AppendLine("<beamDirection>");
-                this._beamDirection.Reflection(sb);
-                sb.AppendLine("</beamDirection>");
-                sb.AppendLine("<azimuthBeamwidth type=\"float\">" + this._azimuthBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthBeamwidth>");
-                sb.AppendLine("<elevationBeamwidth type=\"float\">" + this._elevationBeamwidth.ToString(CultureInfo.InvariantCulture) + "</elevationBeamwidth>");
-                sb.AppendLine("<referenceSystem type=\"float\">" + this._referenceSystem.ToString(CultureInfo.InvariantCulture) + "</referenceSystem>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<ez type=\"float\">" + this._ez.ToString(CultureInfo.InvariantCulture) + "</ez>");
-                sb.AppendLine("<ex type=\"float\">" + this._ex.ToString(CultureInfo.InvariantCulture) + "</ex>");
-                sb.AppendLine("<phase type=\"float\">" + this._phase.ToString(CultureInfo.InvariantCulture) + "</phase>");
-                sb.AppendLine("<padding3 type=\"uint\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                sb.AppendLine("</BeamAntennaPattern>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BeamAntennaPattern;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BeamAntennaPattern obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._beamDirection.Equals(obj._beamDirection))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthBeamwidth != obj._azimuthBeamwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._elevationBeamwidth != obj._elevationBeamwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._referenceSystem != obj._referenceSystem)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ez != obj._ez)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ex != obj._ex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phase != obj._phase)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamDirection.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthBeamwidth.GetHashCode();
-            result = GenerateHash(result) ^ this._elevationBeamwidth.GetHashCode();
-            result = GenerateHash(result) ^ this._referenceSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._ez.GetHashCode();
-            result = GenerateHash(result) ^ this._ex.GetHashCode();
-            result = GenerateHash(result) ^ this._phase.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/BeamData.cs b/Libs/CSharpDis7/BeamData.cs
deleted file mode 100644
index ccbe7a7..0000000
--- a/Libs/CSharpDis7/BeamData.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Describes the scan volue of an emitter beam. Section 6.2.13.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class BeamData
-    {
-        /// <summary>
-        /// Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume
-        /// </summary>
-        private float _beamAzimuthCenter;
-
-        /// <summary>
-        /// Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        private float _beamAzimuthSweep;
-
-        /// <summary>
-        /// Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        private float _beamElevationCenter;
-
-        /// <summary>
-        /// Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        private float _beamElevationSweep;
-
-        /// <summary>
-        /// allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        private float _beamSweepSync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BeamData"/> class.
-        /// </summary>
-        public BeamData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BeamData left, BeamData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BeamData left, BeamData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._beamAzimuthCenter
-            marshalSize += 4;  // this._beamAzimuthSweep
-            marshalSize += 4;  // this._beamElevationCenter
-            marshalSize += 4;  // this._beamElevationSweep
-            marshalSize += 4;  // this._beamSweepSync
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
-        public float BeamAzimuthCenter
-        {
-            get
-            {
-                return this._beamAzimuthCenter;
-            }
-
-            set
-            {
-                this._beamAzimuthCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
-        public float BeamAzimuthSweep
-        {
-            get
-            {
-                return this._beamAzimuthSweep;
-            }
-
-            set
-            {
-                this._beamAzimuthSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
-        public float BeamElevationCenter
-        {
-            get
-            {
-                return this._beamElevationCenter;
-            }
-
-            set
-            {
-                this._beamElevationCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
-        public float BeamElevationSweep
-        {
-            get
-            {
-                return this._beamElevationSweep;
-            }
-
-            set
-            {
-                this._beamElevationSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
-        public float BeamSweepSync
-        {
-            get
-            {
-                return this._beamSweepSync;
-            }
-
-            set
-            {
-                this._beamSweepSync = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._beamAzimuthCenter);
-                    dos.WriteFloat((float)this._beamAzimuthSweep);
-                    dos.WriteFloat((float)this._beamElevationCenter);
-                    dos.WriteFloat((float)this._beamElevationSweep);
-                    dos.WriteFloat((float)this._beamSweepSync);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamAzimuthCenter = dis.ReadFloat();
-                    this._beamAzimuthSweep = dis.ReadFloat();
-                    this._beamElevationCenter = dis.ReadFloat();
-                    this._beamElevationSweep = dis.ReadFloat();
-                    this._beamSweepSync = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BeamData>");
-            try
-            {
-                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
-                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
-                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
-                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
-                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
-                sb.AppendLine("</BeamData>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BeamData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BeamData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationCenter != obj._beamElevationCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationSweep != obj._beamElevationSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamSweepSync != obj._beamSweepSync)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/BeamStatus.cs b/Libs/CSharpDis7/BeamStatus.cs
deleted file mode 100644
index 44d9960..0000000
--- a/Libs/CSharpDis7/BeamStatus.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information related to the status of a beam. This is contained in the beam status field of the electromagnitec emission PDU. The first bit determines whether the beam is active (0) or deactivated (1).
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class BeamStatus
-    {
-        /// <summary>
-        /// First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding.
-        /// </summary>
-        private byte _beamState;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BeamStatus"/> class.
-        /// </summary>
-        public BeamStatus()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BeamStatus left, BeamStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BeamStatus left, BeamStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._beamState
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamState")]
-        public byte BeamState
-        {
-            get
-            {
-                return this._beamState;
-            }
-
-            set
-            {
-                this._beamState = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._beamState);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamState = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BeamStatus>");
-            try
-            {
-                sb.AppendLine("<beamState type=\"byte\">" + this._beamState.ToString(CultureInfo.InvariantCulture) + "</beamState>");
-                sb.AppendLine("</BeamStatus>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BeamStatus;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BeamStatus obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._beamState != obj._beamState)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamState.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/BlankingSector.cs b/Libs/CSharpDis7/BlankingSector.cs
deleted file mode 100644
index f257d78..0000000
--- a/Libs/CSharpDis7/BlankingSector.cs
+++ /dev/null
@@ -1,505 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The Blanking Sector attribute record may be used to convey persistent areas within a scan volume where emitter power for a specific active emitter beam is reduced to an insignificant value. Section 6.2.12
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class BlankingSector
-    {
-        private uint _recordType = 3500;
-
-        private ushort _recordLength;
-
-        private byte _emitterNumber;
-
-        private byte _beamNumber;
-
-        private byte _stateIndicator;
-
-        private float _leftAzimuth;
-
-        private float _rightAzimuth;
-
-        private float _lowerElevation;
-
-        private float _upperElevation;
-
-        private float _residualPower;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlankingSector"/> class.
-        /// </summary>
-        public BlankingSector()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BlankingSector left, BlankingSector right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BlankingSector left, BlankingSector right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 1;  // this._emitterNumber
-            marshalSize += 1;  // this._beamNumber
-            marshalSize += 1;  // this._stateIndicator
-            marshalSize += 4;  // this._leftAzimuth
-            marshalSize += 4;  // this._rightAzimuth
-            marshalSize += 4;  // this._lowerElevation
-            marshalSize += 4;  // this._upperElevation
-            marshalSize += 4;  // this._residualPower
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
-        public byte EmitterNumber
-        {
-            get
-            {
-                return this._emitterNumber;
-            }
-
-            set
-            {
-                this._emitterNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
-        public byte BeamNumber
-        {
-            get
-            {
-                return this._beamNumber;
-            }
-
-            set
-            {
-                this._beamNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "stateIndicator")]
-        public byte StateIndicator
-        {
-            get
-            {
-                return this._stateIndicator;
-            }
-
-            set
-            {
-                this._stateIndicator = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "leftAzimuth")]
-        public float LeftAzimuth
-        {
-            get
-            {
-                return this._leftAzimuth;
-            }
-
-            set
-            {
-                this._leftAzimuth = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "rightAzimuth")]
-        public float RightAzimuth
-        {
-            get
-            {
-                return this._rightAzimuth;
-            }
-
-            set
-            {
-                this._rightAzimuth = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "lowerElevation")]
-        public float LowerElevation
-        {
-            get
-            {
-                return this._lowerElevation;
-            }
-
-            set
-            {
-                this._lowerElevation = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "upperElevation")]
-        public float UpperElevation
-        {
-            get
-            {
-                return this._upperElevation;
-            }
-
-            set
-            {
-                this._upperElevation = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "residualPower")]
-        public float ResidualPower
-        {
-            get
-            {
-                return this._residualPower;
-            }
-
-            set
-            {
-                this._residualPower = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedByte((byte)this._emitterNumber);
-                    dos.WriteUnsignedByte((byte)this._beamNumber);
-                    dos.WriteUnsignedByte((byte)this._stateIndicator);
-                    dos.WriteFloat((float)this._leftAzimuth);
-                    dos.WriteFloat((float)this._rightAzimuth);
-                    dos.WriteFloat((float)this._lowerElevation);
-                    dos.WriteFloat((float)this._upperElevation);
-                    dos.WriteFloat((float)this._residualPower);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._emitterNumber = dis.ReadUnsignedByte();
-                    this._beamNumber = dis.ReadUnsignedByte();
-                    this._stateIndicator = dis.ReadUnsignedByte();
-                    this._leftAzimuth = dis.ReadFloat();
-                    this._rightAzimuth = dis.ReadFloat();
-                    this._lowerElevation = dis.ReadFloat();
-                    this._upperElevation = dis.ReadFloat();
-                    this._residualPower = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BlankingSector>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
-                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
-                sb.AppendLine("<stateIndicator type=\"byte\">" + this._stateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateIndicator>");
-                sb.AppendLine("<leftAzimuth type=\"float\">" + this._leftAzimuth.ToString(CultureInfo.InvariantCulture) + "</leftAzimuth>");
-                sb.AppendLine("<rightAzimuth type=\"float\">" + this._rightAzimuth.ToString(CultureInfo.InvariantCulture) + "</rightAzimuth>");
-                sb.AppendLine("<lowerElevation type=\"float\">" + this._lowerElevation.ToString(CultureInfo.InvariantCulture) + "</lowerElevation>");
-                sb.AppendLine("<upperElevation type=\"float\">" + this._upperElevation.ToString(CultureInfo.InvariantCulture) + "</upperElevation>");
-                sb.AppendLine("<residualPower type=\"float\">" + this._residualPower.ToString(CultureInfo.InvariantCulture) + "</residualPower>");
-                sb.AppendLine("</BlankingSector>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BlankingSector;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BlankingSector obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterNumber != obj._emitterNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamNumber != obj._beamNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateIndicator != obj._stateIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._leftAzimuth != obj._leftAzimuth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._rightAzimuth != obj._rightAzimuth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._lowerElevation != obj._lowerElevation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._upperElevation != obj._upperElevation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._residualPower != obj._residualPower)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._stateIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._leftAzimuth.GetHashCode();
-            result = GenerateHash(result) ^ this._rightAzimuth.GetHashCode();
-            result = GenerateHash(result) ^ this._lowerElevation.GetHashCode();
-            result = GenerateHash(result) ^ this._upperElevation.GetHashCode();
-            result = GenerateHash(result) ^ this._residualPower.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ChangeOptions.cs b/Libs/CSharpDis7/ChangeOptions.cs
deleted file mode 100644
index 92faa76..0000000
--- a/Libs/CSharpDis7/ChangeOptions.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// This is wrong and breaks serialization. See section 6.2.15 aka B.2.41
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ChangeOptions
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChangeOptions"/> class.
-        /// </summary>
-        public ChangeOptions()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ChangeOptions left, ChangeOptions right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ChangeOptions left, ChangeOptions right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ChangeOptions>");
-            try
-            {
-                sb.AppendLine("</ChangeOptions>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ChangeOptions;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ChangeOptions obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ClockTime.cs b/Libs/CSharpDis7/ClockTime.cs
deleted file mode 100644
index a7348fd..0000000
--- a/Libs/CSharpDis7/ClockTime.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Time measurements that exceed one hour are represented by this record. The first field is the hours since the unix epoch (Jan 1 1970, used by most Unix systems and java) and the second field the timestamp units since the top of the hour. Section 6.2.16
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ClockTime
-    {
-        /// <summary>
-        /// Hours in UTC
-        /// </summary>
-        private uint _hour;
-
-        /// <summary>
-        /// Time past the hour
-        /// </summary>
-        private uint _timePastHour;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ClockTime"/> class.
-        /// </summary>
-        public ClockTime()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ClockTime left, ClockTime right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ClockTime left, ClockTime right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._hour
-            marshalSize += 4;  // this._timePastHour
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Hours in UTC
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "hour")]
-        public uint Hour
-        {
-            get
-            {
-                return this._hour;
-            }
-
-            set
-            {
-                this._hour = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Time past the hour
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timePastHour")]
-        public uint TimePastHour
-        {
-            get
-            {
-                return this._timePastHour;
-            }
-
-            set
-            {
-                this._timePastHour = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._hour);
-                    dos.WriteUnsignedInt((uint)this._timePastHour);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._hour = dis.ReadUnsignedInt();
-                    this._timePastHour = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ClockTime>");
-            try
-            {
-                sb.AppendLine("<hour type=\"uint\">" + this._hour.ToString(CultureInfo.InvariantCulture) + "</hour>");
-                sb.AppendLine("<timePastHour type=\"uint\">" + this._timePastHour.ToString(CultureInfo.InvariantCulture) + "</timePastHour>");
-                sb.AppendLine("</ClockTime>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ClockTime;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ClockTime obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._hour != obj._hour)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timePastHour != obj._timePastHour)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._hour.GetHashCode();
-            result = GenerateHash(result) ^ this._timePastHour.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/CollisionElasticPdu.cs b/Libs/CSharpDis7/CollisionElasticPdu.cs
deleted file mode 100644
index 892252d..0000000
--- a/Libs/CSharpDis7/CollisionElasticPdu.cs
+++ /dev/null
@@ -1,745 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. Section 7.2.4. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventIdentifier))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class CollisionElasticPdu : EntityInformationFamilyPdu, IEquatable<CollisionElasticPdu>
-    {
-        /// <summary>
-        /// This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28)
-        /// </summary>
-        private EntityID _issuingEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        private EntityID _collidingEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
-        /// </summary>
-        private EventIdentifier _collisionEventID = new EventIdentifier();
-
-        /// <summary>
-        /// some padding
-        /// </summary>
-        private short _pad;
-
-        /// <summary>
-        /// This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]
-        /// </summary>
-        private Vector3Float _contactVelocity = new Vector3Float();
-
-        /// <summary>
-        /// This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms
-        /// </summary>
-        private float _mass;
-
-        /// <summary>
-        /// This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
-        /// </summary>
-        private Vector3Float _locationOfImpact = new Vector3Float();
-
-        /// <summary>
-        /// These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4)
-        /// </summary>
-        private float _collisionIntermediateResultXX;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionIntermediateResultXY;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionIntermediateResultXZ;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionIntermediateResultYY;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionIntermediateResultYZ;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionIntermediateResultZZ;
-
-        /// <summary>
-        /// This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
-        /// </summary>
-        private Vector3Float _unitSurfaceNormal = new Vector3Float();
-
-        /// <summary>
-        /// This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may “tune” their collision interactions.
-        /// </summary>
-        private float _coefficientOfRestitution;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollisionElasticPdu"/> class.
-        /// </summary>
-        public CollisionElasticPdu()
-        {
-            PduType = (byte)66;
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CollisionElasticPdu left, CollisionElasticPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CollisionElasticPdu left, CollisionElasticPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
-            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
-            marshalSize += this._collisionEventID.GetMarshalledSize();  // this._collisionEventID
-            marshalSize += 2;  // this._pad
-            marshalSize += this._contactVelocity.GetMarshalledSize();  // this._contactVelocity
-            marshalSize += 4;  // this._mass
-            marshalSize += this._locationOfImpact.GetMarshalledSize();  // this._locationOfImpact
-            marshalSize += 4;  // this._collisionIntermediateResultXX
-            marshalSize += 4;  // this._collisionIntermediateResultXY
-            marshalSize += 4;  // this._collisionIntermediateResultXZ
-            marshalSize += 4;  // this._collisionIntermediateResultYY
-            marshalSize += 4;  // this._collisionIntermediateResultYZ
-            marshalSize += 4;  // this._collisionIntermediateResultZZ
-            marshalSize += this._unitSurfaceNormal.GetMarshalledSize();  // this._unitSurfaceNormal
-            marshalSize += 4;  // this._coefficientOfRestitution
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
-        public EntityID IssuingEntityID
-        {
-            get
-            {
-                return this._issuingEntityID;
-            }
-
-            set
-            {
-                this._issuingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
-        public EntityID CollidingEntityID
-        {
-            get
-            {
-                return this._collidingEntityID;
-            }
-
-            set
-            {
-                this._collidingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
-        /// </summary>
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "collisionEventID")]
-        public EventIdentifier CollisionEventID
-        {
-            get
-            {
-                return this._collisionEventID;
-            }
-
-            set
-            {
-                this._collisionEventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the some padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "pad")]
-        public short Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "contactVelocity")]
-        public Vector3Float ContactVelocity
-        {
-            get
-            {
-                return this._contactVelocity;
-            }
-
-            set
-            {
-                this._contactVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "mass")]
-        public float Mass
-        {
-            get
-            {
-                return this._mass;
-            }
-
-            set
-            {
-                this._mass = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "locationOfImpact")]
-        public Vector3Float LocationOfImpact
-        {
-            get
-            {
-                return this._locationOfImpact;
-            }
-
-            set
-            {
-                this._locationOfImpact = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4)
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultXX")]
-        public float CollisionIntermediateResultXX
-        {
-            get
-            {
-                return this._collisionIntermediateResultXX;
-            }
-
-            set
-            {
-                this._collisionIntermediateResultXX = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultXY")]
-        public float CollisionIntermediateResultXY
-        {
-            get
-            {
-                return this._collisionIntermediateResultXY;
-            }
-
-            set
-            {
-                this._collisionIntermediateResultXY = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultXZ")]
-        public float CollisionIntermediateResultXZ
-        {
-            get
-            {
-                return this._collisionIntermediateResultXZ;
-            }
-
-            set
-            {
-                this._collisionIntermediateResultXZ = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultYY")]
-        public float CollisionIntermediateResultYY
-        {
-            get
-            {
-                return this._collisionIntermediateResultYY;
-            }
-
-            set
-            {
-                this._collisionIntermediateResultYY = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultYZ")]
-        public float CollisionIntermediateResultYZ
-        {
-            get
-            {
-                return this._collisionIntermediateResultYZ;
-            }
-
-            set
-            {
-                this._collisionIntermediateResultYZ = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultZZ")]
-        public float CollisionIntermediateResultZZ
-        {
-            get
-            {
-                return this._collisionIntermediateResultZZ;
-            }
-
-            set
-            {
-                this._collisionIntermediateResultZZ = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "unitSurfaceNormal")]
-        public Vector3Float UnitSurfaceNormal
-        {
-            get
-            {
-                return this._unitSurfaceNormal;
-            }
-
-            set
-            {
-                this._unitSurfaceNormal = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may “tune” their collision interactions.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "coefficientOfRestitution")]
-        public float CoefficientOfRestitution
-        {
-            get
-            {
-                return this._coefficientOfRestitution;
-            }
-
-            set
-            {
-                this._coefficientOfRestitution = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Marshal(dos);
-                    this._collidingEntityID.Marshal(dos);
-                    this._collisionEventID.Marshal(dos);
-                    dos.WriteShort((short)this._pad);
-                    this._contactVelocity.Marshal(dos);
-                    dos.WriteFloat((float)this._mass);
-                    this._locationOfImpact.Marshal(dos);
-                    dos.WriteFloat((float)this._collisionIntermediateResultXX);
-                    dos.WriteFloat((float)this._collisionIntermediateResultXY);
-                    dos.WriteFloat((float)this._collisionIntermediateResultXZ);
-                    dos.WriteFloat((float)this._collisionIntermediateResultYY);
-                    dos.WriteFloat((float)this._collisionIntermediateResultYZ);
-                    dos.WriteFloat((float)this._collisionIntermediateResultZZ);
-                    this._unitSurfaceNormal.Marshal(dos);
-                    dos.WriteFloat((float)this._coefficientOfRestitution);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Unmarshal(dis);
-                    this._collidingEntityID.Unmarshal(dis);
-                    this._collisionEventID.Unmarshal(dis);
-                    this._pad = dis.ReadShort();
-                    this._contactVelocity.Unmarshal(dis);
-                    this._mass = dis.ReadFloat();
-                    this._locationOfImpact.Unmarshal(dis);
-                    this._collisionIntermediateResultXX = dis.ReadFloat();
-                    this._collisionIntermediateResultXY = dis.ReadFloat();
-                    this._collisionIntermediateResultXZ = dis.ReadFloat();
-                    this._collisionIntermediateResultYY = dis.ReadFloat();
-                    this._collisionIntermediateResultYZ = dis.ReadFloat();
-                    this._collisionIntermediateResultZZ = dis.ReadFloat();
-                    this._unitSurfaceNormal.Unmarshal(dis);
-                    this._coefficientOfRestitution = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CollisionElasticPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<issuingEntityID>");
-                this._issuingEntityID.Reflection(sb);
-                sb.AppendLine("</issuingEntityID>");
-                sb.AppendLine("<collidingEntityID>");
-                this._collidingEntityID.Reflection(sb);
-                sb.AppendLine("</collidingEntityID>");
-                sb.AppendLine("<collisionEventID>");
-                this._collisionEventID.Reflection(sb);
-                sb.AppendLine("</collisionEventID>");
-                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                sb.AppendLine("<contactVelocity>");
-                this._contactVelocity.Reflection(sb);
-                sb.AppendLine("</contactVelocity>");
-                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
-                sb.AppendLine("<locationOfImpact>");
-                this._locationOfImpact.Reflection(sb);
-                sb.AppendLine("</locationOfImpact>");
-                sb.AppendLine("<collisionIntermediateResultXX type=\"float\">" + this._collisionIntermediateResultXX.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultXX>");
-                sb.AppendLine("<collisionIntermediateResultXY type=\"float\">" + this._collisionIntermediateResultXY.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultXY>");
-                sb.AppendLine("<collisionIntermediateResultXZ type=\"float\">" + this._collisionIntermediateResultXZ.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultXZ>");
-                sb.AppendLine("<collisionIntermediateResultYY type=\"float\">" + this._collisionIntermediateResultYY.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultYY>");
-                sb.AppendLine("<collisionIntermediateResultYZ type=\"float\">" + this._collisionIntermediateResultYZ.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultYZ>");
-                sb.AppendLine("<collisionIntermediateResultZZ type=\"float\">" + this._collisionIntermediateResultZZ.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultZZ>");
-                sb.AppendLine("<unitSurfaceNormal>");
-                this._unitSurfaceNormal.Reflection(sb);
-                sb.AppendLine("</unitSurfaceNormal>");
-                sb.AppendLine("<coefficientOfRestitution type=\"float\">" + this._coefficientOfRestitution.ToString(CultureInfo.InvariantCulture) + "</coefficientOfRestitution>");
-                sb.AppendLine("</CollisionElasticPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CollisionElasticPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CollisionElasticPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._collisionEventID.Equals(obj._collisionEventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._contactVelocity.Equals(obj._contactVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._mass != obj._mass)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationOfImpact.Equals(obj._locationOfImpact))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionIntermediateResultXX != obj._collisionIntermediateResultXX)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionIntermediateResultXY != obj._collisionIntermediateResultXY)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionIntermediateResultXZ != obj._collisionIntermediateResultXZ)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionIntermediateResultYY != obj._collisionIntermediateResultYY)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionIntermediateResultYZ != obj._collisionIntermediateResultYZ)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionIntermediateResultZZ != obj._collisionIntermediateResultZZ)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._unitSurfaceNormal.Equals(obj._unitSurfaceNormal))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._coefficientOfRestitution != obj._coefficientOfRestitution)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionEventID.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-            result = GenerateHash(result) ^ this._contactVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._mass.GetHashCode();
-            result = GenerateHash(result) ^ this._locationOfImpact.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionIntermediateResultXX.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionIntermediateResultXY.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionIntermediateResultXZ.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionIntermediateResultYY.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionIntermediateResultYZ.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionIntermediateResultZZ.GetHashCode();
-            result = GenerateHash(result) ^ this._unitSurfaceNormal.GetHashCode();
-            result = GenerateHash(result) ^ this._coefficientOfRestitution.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/CollisionPdu.cs b/Libs/CSharpDis7/CollisionPdu.cs
deleted file mode 100644
index c4d4e5a..0000000
--- a/Libs/CSharpDis7/CollisionPdu.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.2.3 Collisions between entities shall be communicated by issuing a Collision PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventIdentifier))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class CollisionPdu : EntityInformationFamilyPdu, IEquatable<CollisionPdu>
-    {
-        /// <summary>
-        /// This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        private EntityID _issuingEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        private EntityID _collidingEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
-        /// </summary>
-        private EventIdentifier _eventID = new EventIdentifier();
-
-        /// <summary>
-        /// This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations
-        /// </summary>
-        private byte _collisionType;
-
-        /// <summary>
-        /// some padding
-        /// </summary>
-        private byte _pad;
-
-        /// <summary>
-        /// This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)].
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms.
-        /// </summary>
-        private float _mass;
-
-        /// <summary>
-        /// This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollisionPdu"/> class.
-        /// </summary>
-        public CollisionPdu()
-        {
-            PduType = (byte)4;
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CollisionPdu left, CollisionPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CollisionPdu left, CollisionPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
-            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._collisionType
-            marshalSize += 1;  // this._pad
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += 4;  // this._mass
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
-        public EntityID IssuingEntityID
-        {
-            get
-            {
-                return this._issuingEntityID;
-            }
-
-            set
-            {
-                this._issuingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
-        public EntityID CollidingEntityID
-        {
-            get
-            {
-                return this._collidingEntityID;
-            }
-
-            set
-            {
-                this._collidingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
-        /// </summary>
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
-        public EventIdentifier EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "collisionType")]
-        public byte CollisionType
-        {
-            get
-            {
-                return this._collisionType;
-            }
-
-            set
-            {
-                this._collisionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the some padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad")]
-        public byte Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)].
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "mass")]
-        public float Mass
-        {
-            get
-            {
-                return this._mass;
-            }
-
-            set
-            {
-                this._mass = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Marshal(dos);
-                    this._collidingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._collisionType);
-                    dos.WriteByte((byte)this._pad);
-                    this._velocity.Marshal(dos);
-                    dos.WriteFloat((float)this._mass);
-                    this._location.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Unmarshal(dis);
-                    this._collidingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._collisionType = dis.ReadUnsignedByte();
-                    this._pad = dis.ReadByte();
-                    this._velocity.Unmarshal(dis);
-                    this._mass = dis.ReadFloat();
-                    this._location.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CollisionPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<issuingEntityID>");
-                this._issuingEntityID.Reflection(sb);
-                sb.AppendLine("</issuingEntityID>");
-                sb.AppendLine("<collidingEntityID>");
-                this._collidingEntityID.Reflection(sb);
-                sb.AppendLine("</collidingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<collisionType type=\"byte\">" + this._collisionType.ToString(CultureInfo.InvariantCulture) + "</collisionType>");
-                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                sb.AppendLine("</CollisionPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CollisionPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CollisionPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionType != obj._collisionType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._mass != obj._mass)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionType.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._mass.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/CommentPdu.cs b/Libs/CSharpDis7/CommentPdu.cs
deleted file mode 100644
index 1e6645a..0000000
--- a/Libs/CSharpDis7/CommentPdu.cs
+++ /dev/null
@@ -1,455 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Arbitrary messages can be entered into the data stream via use of this PDU. Section 7.5.13 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class CommentPdu : SimulationManagementFamilyPdu, IEquatable<CommentPdu>
-    {
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommentPdu"/> class.
-        /// </summary>
-        public CommentPdu()
-        {
-            PduType = (byte)22;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CommentPdu left, CommentPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CommentPdu left, CommentPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CommentPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</CommentPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CommentPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CommentPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/CommentReliablePdu.cs b/Libs/CSharpDis7/CommentReliablePdu.cs
deleted file mode 100644
index 51b5b58..0000000
--- a/Libs/CSharpDis7/CommentReliablePdu.cs
+++ /dev/null
@@ -1,455 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual intervention     to fix padding in variable datums. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class CommentReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CommentReliablePdu>
-    {
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommentReliablePdu"/> class.
-        /// </summary>
-        public CommentReliablePdu()
-        {
-            PduType = (byte)62;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CommentReliablePdu left, CommentReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CommentReliablePdu left, CommentReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CommentReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</CommentReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CommentReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CommentReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/CommunicationsNodeID.cs b/Libs/CSharpDis7/CommunicationsNodeID.cs
deleted file mode 100644
index 4d76215..0000000
--- a/Libs/CSharpDis7/CommunicationsNodeID.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Identity of a communications node. Section 6.2.49.4
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class CommunicationsNodeID
-    {
-        private EntityID _entityID = new EntityID();
-
-        private ushort _elementID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommunicationsNodeID"/> class.
-        /// </summary>
-        public CommunicationsNodeID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CommunicationsNodeID left, CommunicationsNodeID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CommunicationsNodeID left, CommunicationsNodeID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 2;  // this._elementID
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "elementID")]
-        public ushort ElementID
-        {
-            get
-            {
-                return this._elementID;
-            }
-
-            set
-            {
-                this._elementID = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._elementID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._elementID = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CommunicationsNodeID>");
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<elementID type=\"ushort\">" + this._elementID.ToString(CultureInfo.InvariantCulture) + "</elementID>");
-                sb.AppendLine("</CommunicationsNodeID>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CommunicationsNodeID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CommunicationsNodeID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._elementID != obj._elementID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._elementID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/CreateEntityPdu.cs b/Libs/CSharpDis7/CreateEntityPdu.cs
deleted file mode 100644
index f8a1a5d..0000000
--- a/Libs/CSharpDis7/CreateEntityPdu.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.2. Create a new entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class CreateEntityPdu : SimulationManagementFamilyPdu, IEquatable<CreateEntityPdu>
-    {
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private EntityID _receivingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the request.  See 6.2.75
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateEntityPdu"/> class.
-        /// </summary>
-        public CreateEntityPdu()
-        {
-            PduType = (byte)11;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CreateEntityPdu left, CreateEntityPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CreateEntityPdu left, CreateEntityPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
-        public EntityID ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request.  See 6.2.75
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CreateEntityPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</CreateEntityPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CreateEntityPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CreateEntityPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/CreateEntityReliablePdu.cs b/Libs/CSharpDis7/CreateEntityReliablePdu.cs
deleted file mode 100644
index b5ab76f..0000000
--- a/Libs/CSharpDis7/CreateEntityReliablePdu.cs
+++ /dev/null
@@ -1,377 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.1: creation of an entity , reliable. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class CreateEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CreateEntityReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateEntityReliablePdu"/> class.
-        /// </summary>
-        public CreateEntityReliablePdu()
-        {
-            PduType = (byte)51;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CreateEntityReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</CreateEntityReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CreateEntityReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CreateEntityReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DataPdu.cs b/Libs/CSharpDis7/DataPdu.cs
deleted file mode 100644
index 5586918..0000000
--- a/Libs/CSharpDis7/DataPdu.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu. Section 7.5.11 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataPdu : SimulationManagementFamilyPdu, IEquatable<DataPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataPdu"/> class.
-        /// </summary>
-        public DataPdu()
-        {
-            PduType = (byte)20;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataPdu left, DataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataPdu left, DataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DataQueryDatumSpecification.cs b/Libs/CSharpDis7/DataQueryDatumSpecification.cs
deleted file mode 100644
index d2d4ef0..0000000
--- a/Libs/CSharpDis7/DataQueryDatumSpecification.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// List of fixed and variable datum records. Section 6.2.18 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(UnsignedDISInteger))]
-    [XmlInclude(typeof(UnsignedDISInteger))]
-    public partial class DataQueryDatumSpecification
-    {
-        /// <summary>
-        /// Number of fixed datums
-        /// </summary>
-        private uint _numberOfFixedDatums;
-
-        /// <summary>
-        /// Number of variable datums
-        /// </summary>
-        private uint _numberOfVariableDatums;
-
-        /// <summary>
-        /// variable length list fixed datum IDs
-        /// </summary>
-        private List<UnsignedDISInteger> _fixedDatumIDList = new List<UnsignedDISInteger>();
-
-        /// <summary>
-        /// variable length list variable datum IDs
-        /// </summary>
-        private List<UnsignedDISInteger> _variableDatumIDList = new List<UnsignedDISInteger>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataQueryDatumSpecification"/> class.
-        /// </summary>
-        public DataQueryDatumSpecification()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataQueryDatumSpecification left, DataQueryDatumSpecification right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataQueryDatumSpecification left, DataQueryDatumSpecification right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._numberOfFixedDatums
-            marshalSize += 4;  // this._numberOfVariableDatums
-            for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-            {
-                UnsignedDISInteger listElement = (UnsignedDISInteger)this._fixedDatumIDList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-            {
-                UnsignedDISInteger listElement = (UnsignedDISInteger)this._variableDatumIDList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatums method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatums")]
-        public uint NumberOfFixedDatums
-        {
-            get
-            {
-                return this._numberOfFixedDatums;
-            }
-
-            set
-            {
-                this._numberOfFixedDatums = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatums method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatums")]
-        public uint NumberOfVariableDatums
-        {
-            get
-            {
-                return this._numberOfVariableDatums;
-            }
-
-            set
-            {
-                this._numberOfVariableDatums = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list fixed datum IDs
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumIDListList", Type = typeof(List<UnsignedDISInteger>))]
-        public List<UnsignedDISInteger> FixedDatumIDList
-        {
-            get
-            {
-                return this._fixedDatumIDList;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list variable datum IDs
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumIDListList", Type = typeof(List<UnsignedDISInteger>))]
-        public List<UnsignedDISInteger> VariableDatumIDList
-        {
-            get
-            {
-                return this._variableDatumIDList;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatumIDList.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumIDList.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                    {
-                        UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._fixedDatumIDList[idx];
-                        aUnsignedDISInteger.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                    {
-                        UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._variableDatumIDList[idx];
-                        aUnsignedDISInteger.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfFixedDatums = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatums = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatums; idx++)
-                    {
-                        UnsignedDISInteger anX = new UnsignedDISInteger();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumIDList.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatums; idx++)
-                    {
-                        UnsignedDISInteger anX = new UnsignedDISInteger();
-                        anX.Unmarshal(dis);
-                        this._variableDatumIDList.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataQueryDatumSpecification>");
-            try
-            {
-                sb.AppendLine("<fixedDatumIDList type=\"uint\">" + this._fixedDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumIDList>");
-                sb.AppendLine("<variableDatumIDList type=\"uint\">" + this._variableDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumIDList>");
-                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"UnsignedDISInteger\">");
-                    UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._fixedDatumIDList[idx];
-                    aUnsignedDISInteger.Reflection(sb);
-                    sb.AppendLine("</fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"UnsignedDISInteger\">");
-                    UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._variableDatumIDList[idx];
-                    aUnsignedDISInteger.Reflection(sb);
-                    sb.AppendLine("</variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataQueryDatumSpecification>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataQueryDatumSpecification;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataQueryDatumSpecification obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._numberOfFixedDatums != obj._numberOfFixedDatums)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatums != obj._numberOfVariableDatums)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumIDList.Count != obj._fixedDatumIDList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                {
-                    if (!this._fixedDatumIDList[idx].Equals(obj._fixedDatumIDList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumIDList.Count != obj._variableDatumIDList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                {
-                    if (!this._variableDatumIDList[idx].Equals(obj._variableDatumIDList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfFixedDatums.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatums.GetHashCode();
-
-            if (this._fixedDatumIDList.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumIDList[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumIDList.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumIDList[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DataQueryPdu.cs b/Libs/CSharpDis7/DataQueryPdu.cs
deleted file mode 100644
index 619fb99..0000000
--- a/Libs/CSharpDis7/DataQueryPdu.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.9. Request for data from an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataQueryPdu : SimulationManagementFamilyPdu, IEquatable<DataQueryPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// time issues between issues of Data PDUs. Zero means send once only.
-        /// </summary>
-        private uint _timeInterval;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataQueryPdu"/> class.
-        /// </summary>
-        public DataQueryPdu()
-        {
-            PduType = (byte)18;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataQueryPdu left, DataQueryPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataQueryPdu left, DataQueryPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._timeInterval
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time issues between issues of Data PDUs. Zero means send once only.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
-        public uint TimeInterval
-        {
-            get
-            {
-                return this._timeInterval;
-            }
-
-            set
-            {
-                this._timeInterval = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._timeInterval);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._timeInterval = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataQueryPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataQueryPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataQueryPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataQueryPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timeInterval != obj._timeInterval)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DataQueryReliablePdu.cs b/Libs/CSharpDis7/DataQueryReliablePdu.cs
deleted file mode 100644
index 715efb2..0000000
--- a/Libs/CSharpDis7/DataQueryReliablePdu.cs
+++ /dev/null
@@ -1,615 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.8: request for data from an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataQueryReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// time interval between issuing data query PDUs
-        /// </summary>
-        private uint _timeInterval;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataQueryReliablePdu"/> class.
-        /// </summary>
-        public DataQueryReliablePdu()
-        {
-            PduType = (byte)58;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataQueryReliablePdu left, DataQueryReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataQueryReliablePdu left, DataQueryReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._timeInterval
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time interval between issuing data query PDUs
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
-        public uint TimeInterval
-        {
-            get
-            {
-                return this._timeInterval;
-            }
-
-            set
-            {
-                this._timeInterval = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._timeInterval);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._timeInterval = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataQueryReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataQueryReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataQueryReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataQueryReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timeInterval != obj._timeInterval)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DataReliablePdu.cs b/Libs/CSharpDis7/DataReliablePdu.cs
deleted file mode 100644
index 02100a4..0000000
--- a/Libs/CSharpDis7/DataReliablePdu.cs
+++ /dev/null
@@ -1,583 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. Needs manual intervention      to fix padding on variable datums. UNFINSIHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataReliablePdu>
-    {
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataReliablePdu"/> class.
-        /// </summary>
-        public DataReliablePdu()
-        {
-            PduType = (byte)60;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataReliablePdu left, DataReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataReliablePdu left, DataReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DatumSpecification.cs b/Libs/CSharpDis7/DatumSpecification.cs
deleted file mode 100644
index 815c1e4..0000000
--- a/Libs/CSharpDis7/DatumSpecification.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// List of fixed and variable datum records. Section 6.2.19 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DatumSpecification
-    {
-        /// <summary>
-        /// Number of fixed datums
-        /// </summary>
-        private uint _numberOfFixedDatums;
-
-        /// <summary>
-        /// Number of variable datums
-        /// </summary>
-        private uint _numberOfVariableDatums;
-
-        /// <summary>
-        /// variable length list fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatumIDList = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list variable datums
-        /// </summary>
-        private List<VariableDatum> _variableDatumIDList = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatumSpecification"/> class.
-        /// </summary>
-        public DatumSpecification()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DatumSpecification left, DatumSpecification right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DatumSpecification left, DatumSpecification right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._numberOfFixedDatums
-            marshalSize += 4;  // this._numberOfVariableDatums
-            for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumIDList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumIDList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatums method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatums")]
-        public uint NumberOfFixedDatums
-        {
-            get
-            {
-                return this._numberOfFixedDatums;
-            }
-
-            set
-            {
-                this._numberOfFixedDatums = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatums method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatums")]
-        public uint NumberOfVariableDatums
-        {
-            get
-            {
-                return this._numberOfVariableDatums;
-            }
-
-            set
-            {
-                this._numberOfVariableDatums = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumIDListList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumIDList
-        {
-            get
-            {
-                return this._fixedDatumIDList;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list variable datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumIDListList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumIDList
-        {
-            get
-            {
-                return this._variableDatumIDList;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatumIDList.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumIDList.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumIDList[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumIDList[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfFixedDatums = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatums = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatums; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumIDList.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatums; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumIDList.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DatumSpecification>");
-            try
-            {
-                sb.AppendLine("<fixedDatumIDList type=\"uint\">" + this._fixedDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumIDList>");
-                sb.AppendLine("<variableDatumIDList type=\"uint\">" + this._variableDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumIDList>");
-                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumIDList[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumIDList[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DatumSpecification>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DatumSpecification;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DatumSpecification obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._numberOfFixedDatums != obj._numberOfFixedDatums)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatums != obj._numberOfVariableDatums)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumIDList.Count != obj._fixedDatumIDList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                {
-                    if (!this._fixedDatumIDList[idx].Equals(obj._fixedDatumIDList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumIDList.Count != obj._variableDatumIDList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                {
-                    if (!this._variableDatumIDList[idx].Equals(obj._variableDatumIDList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfFixedDatums.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatums.GetHashCode();
-
-            if (this._fixedDatumIDList.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumIDList[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumIDList.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumIDList[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DeadReckoningParameters.cs b/Libs/CSharpDis7/DeadReckoningParameters.cs
deleted file mode 100644
index 2e66b03..0000000
--- a/Libs/CSharpDis7/DeadReckoningParameters.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Not specified in the standard. This is used by the ESPDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class DeadReckoningParameters
-    {
-        /// <summary>
-        /// Algorithm to use in computing dead reckoning. See EBV doc.
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// Dead reckoning parameters. Contents depends on algorithm.
-        /// </summary>
-        private byte[] _parameters = new byte[15];
-
-        /// <summary>
-        /// Linear acceleration of the entity
-        /// </summary>
-        private Vector3Float _entityLinearAcceleration = new Vector3Float();
-
-        /// <summary>
-        /// Angular velocity of the entity
-        /// </summary>
-        private Vector3Float _entityAngularVelocity = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeadReckoningParameters"/> class.
-        /// </summary>
-        public DeadReckoningParameters()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DeadReckoningParameters left, DeadReckoningParameters right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DeadReckoningParameters left, DeadReckoningParameters right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 15 * 1;  // _parameters
-            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
-            marshalSize += this._entityAngularVelocity.GetMarshalledSize();  // this._entityAngularVelocity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Algorithm to use in computing dead reckoning. See EBV doc.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Dead reckoning parameters. Contents depends on algorithm.
-        /// </summary>
-        [XmlArray(ElementName = "parameters")]
-        public byte[] Parameters
-        {
-            get
-            {
-                return this._parameters;
-            }
-
-            set
-            {
-                this._parameters = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the Linear acceleration of the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
-        public Vector3Float EntityLinearAcceleration
-        {
-            get
-            {
-                return this._entityLinearAcceleration;
-            }
-
-            set
-            {
-                this._entityLinearAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Angular velocity of the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityAngularVelocity")]
-        public Vector3Float EntityAngularVelocity
-        {
-            get
-            {
-                return this._entityAngularVelocity;
-            }
-
-            set
-            {
-                this._entityAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
-
-                    for (int idx = 0; idx < this._parameters.Length; idx++)
-                    {
-                        dos.WriteUnsignedByte(this._parameters[idx]);
-                    }
-                    this._entityLinearAcceleration.Marshal(dos);
-                    this._entityAngularVelocity.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
-                    for (int idx = 0; idx < this._parameters.Length; idx++)
-                    {
-                        this._parameters[idx] = dis.ReadUnsignedByte();
-                    }
-                    this._entityLinearAcceleration.Unmarshal(dis);
-                    this._entityAngularVelocity.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DeadReckoningParameters>");
-            try
-            {
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                for (int idx = 0; idx < this._parameters.Length; idx++)
-                {
-                    sb.AppendLine("<parameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._parameters[idx] + "</parameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<entityLinearAcceleration>");
-                this._entityLinearAcceleration.Reflection(sb);
-                sb.AppendLine("</entityLinearAcceleration>");
-                sb.AppendLine("<entityAngularVelocity>");
-                this._entityAngularVelocity.Reflection(sb);
-                sb.AppendLine("</entityAngularVelocity>");
-                sb.AppendLine("</DeadReckoningParameters>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DeadReckoningParameters;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DeadReckoningParameters obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._parameters.Length != 15) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 15; idx++)
-                {
-                    if (this._parameters[idx] != obj._parameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityAngularVelocity.Equals(obj._entityAngularVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-
-            for (int idx = 0; idx < 15; idx++)
-            {
-                result = GenerateHash(result) ^ this._parameters[idx].GetHashCode();
-            }
-            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAngularVelocity.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DesignatorPdu.cs b/Libs/CSharpDis7/DesignatorPdu.cs
deleted file mode 100644
index d7ecdd2..0000000
--- a/Libs/CSharpDis7/DesignatorPdu.cs
+++ /dev/null
@@ -1,646 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.7.2. Handles designating operations. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    public partial class DesignatorPdu : DistributedEmissionsFamilyPdu, IEquatable<DesignatorPdu>
-    {
-        /// <summary>
-        /// ID of the entity designating
-        /// </summary>
-        private EntityID _designatingEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
-        /// </summary>
-        private ushort _codeName;
-
-        /// <summary>
-        /// ID of the entity being designated
-        /// </summary>
-        private EntityID _designatedEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall identify the designator code being used by the designating entity 
-        /// </summary>
-        private ushort _designatorCode;
-
-        /// <summary>
-        /// This field shall identify the designator output power in watts
-        /// </summary>
-        private float _designatorPower;
-
-        /// <summary>
-        /// This field shall identify the designator wavelength in units of microns
-        /// </summary>
-        private float _designatorWavelength;
-
-        /// <summary>
-        /// designtor spot wrt the designated entity
-        /// </summary>
-        private Vector3Float _designatorSpotWrtDesignated = new Vector3Float();
-
-        /// <summary>
-        /// designtor spot wrt the designated entity
-        /// </summary>
-        private Vector3Double _designatorSpotLocation = new Vector3Double();
-
-        /// <summary>
-        /// Dead reckoning algorithm
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// linear accelleration of entity
-        /// </summary>
-        private Vector3Float _entityLinearAcceleration = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DesignatorPdu"/> class.
-        /// </summary>
-        public DesignatorPdu()
-        {
-            PduType = (byte)24;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DesignatorPdu left, DesignatorPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DesignatorPdu left, DesignatorPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._designatingEntityID.GetMarshalledSize();  // this._designatingEntityID
-            marshalSize += 2;  // this._codeName
-            marshalSize += this._designatedEntityID.GetMarshalledSize();  // this._designatedEntityID
-            marshalSize += 2;  // this._designatorCode
-            marshalSize += 4;  // this._designatorPower
-            marshalSize += 4;  // this._designatorWavelength
-            marshalSize += this._designatorSpotWrtDesignated.GetMarshalledSize();  // this._designatorSpotWrtDesignated
-            marshalSize += this._designatorSpotLocation.GetMarshalledSize();  // this._designatorSpotLocation
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity designating
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "designatingEntityID")]
-        public EntityID DesignatingEntityID
-        {
-            get
-            {
-                return this._designatingEntityID;
-            }
-
-            set
-            {
-                this._designatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "codeName")]
-        public ushort CodeName
-        {
-            get
-            {
-                return this._codeName;
-            }
-
-            set
-            {
-                this._codeName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity being designated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "designatedEntityID")]
-        public EntityID DesignatedEntityID
-        {
-            get
-            {
-                return this._designatedEntityID;
-            }
-
-            set
-            {
-                this._designatedEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator code being used by the designating entity 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "designatorCode")]
-        public ushort DesignatorCode
-        {
-            get
-            {
-                return this._designatorCode;
-            }
-
-            set
-            {
-                this._designatorCode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator output power in watts
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "designatorPower")]
-        public float DesignatorPower
-        {
-            get
-            {
-                return this._designatorPower;
-            }
-
-            set
-            {
-                this._designatorPower = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator wavelength in units of microns
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "designatorWavelength")]
-        public float DesignatorWavelength
-        {
-            get
-            {
-                return this._designatorWavelength;
-            }
-
-            set
-            {
-                this._designatorWavelength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the designtor spot wrt the designated entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "designatorSpotWrtDesignated")]
-        public Vector3Float DesignatorSpotWrtDesignated
-        {
-            get
-            {
-                return this._designatorSpotWrtDesignated;
-            }
-
-            set
-            {
-                this._designatorSpotWrtDesignated = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the designtor spot wrt the designated entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "designatorSpotLocation")]
-        public Vector3Double DesignatorSpotLocation
-        {
-            get
-            {
-                return this._designatorSpotLocation;
-            }
-
-            set
-            {
-                this._designatorSpotLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Dead reckoning algorithm
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the linear accelleration of entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
-        public Vector3Float EntityLinearAcceleration
-        {
-            get
-            {
-                return this._entityLinearAcceleration;
-            }
-
-            set
-            {
-                this._entityLinearAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._designatingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._codeName);
-                    this._designatedEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._designatorCode);
-                    dos.WriteFloat((float)this._designatorPower);
-                    dos.WriteFloat((float)this._designatorWavelength);
-                    this._designatorSpotWrtDesignated.Marshal(dos);
-                    this._designatorSpotLocation.Marshal(dos);
-                    dos.WriteByte((byte)this._deadReckoningAlgorithm);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                    this._entityLinearAcceleration.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._designatingEntityID.Unmarshal(dis);
-                    this._codeName = dis.ReadUnsignedShort();
-                    this._designatedEntityID.Unmarshal(dis);
-                    this._designatorCode = dis.ReadUnsignedShort();
-                    this._designatorPower = dis.ReadFloat();
-                    this._designatorWavelength = dis.ReadFloat();
-                    this._designatorSpotWrtDesignated.Unmarshal(dis);
-                    this._designatorSpotLocation.Unmarshal(dis);
-                    this._deadReckoningAlgorithm = dis.ReadByte();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._padding2 = dis.ReadByte();
-                    this._entityLinearAcceleration.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DesignatorPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<designatingEntityID>");
-                this._designatingEntityID.Reflection(sb);
-                sb.AppendLine("</designatingEntityID>");
-                sb.AppendLine("<codeName type=\"ushort\">" + this._codeName.ToString(CultureInfo.InvariantCulture) + "</codeName>");
-                sb.AppendLine("<designatedEntityID>");
-                this._designatedEntityID.Reflection(sb);
-                sb.AppendLine("</designatedEntityID>");
-                sb.AppendLine("<designatorCode type=\"ushort\">" + this._designatorCode.ToString(CultureInfo.InvariantCulture) + "</designatorCode>");
-                sb.AppendLine("<designatorPower type=\"float\">" + this._designatorPower.ToString(CultureInfo.InvariantCulture) + "</designatorPower>");
-                sb.AppendLine("<designatorWavelength type=\"float\">" + this._designatorWavelength.ToString(CultureInfo.InvariantCulture) + "</designatorWavelength>");
-                sb.AppendLine("<designatorSpotWrtDesignated>");
-                this._designatorSpotWrtDesignated.Reflection(sb);
-                sb.AppendLine("</designatorSpotWrtDesignated>");
-                sb.AppendLine("<designatorSpotLocation>");
-                this._designatorSpotLocation.Reflection(sb);
-                sb.AppendLine("</designatorSpotLocation>");
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<entityLinearAcceleration>");
-                this._entityLinearAcceleration.Reflection(sb);
-                sb.AppendLine("</entityLinearAcceleration>");
-                sb.AppendLine("</DesignatorPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DesignatorPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DesignatorPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._designatingEntityID.Equals(obj._designatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._codeName != obj._codeName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatedEntityID.Equals(obj._designatedEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorCode != obj._designatorCode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorPower != obj._designatorPower)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorWavelength != obj._designatorWavelength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatorSpotWrtDesignated.Equals(obj._designatorSpotWrtDesignated))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatorSpotLocation.Equals(obj._designatorSpotLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._designatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._codeName.GetHashCode();
-            result = GenerateHash(result) ^ this._designatedEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorCode.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorPower.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorWavelength.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorSpotWrtDesignated.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorSpotLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DetonationPdu.cs b/Libs/CSharpDis7/DetonationPdu.cs
deleted file mode 100644
index 7fa0ebe..0000000
--- a/Libs/CSharpDis7/DetonationPdu.cs
+++ /dev/null
@@ -1,625 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Detonation or impact of munitions, as well as, non-munition explosions, the burst or initial bloom of chaff, and the ignition of a flare shall be indicated. Section 7.3.3  COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventIdentifier))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(MunitionDescriptor))]
-    [XmlInclude(typeof(VariableParameter))]
-    public partial class DetonationPdu : WarfareFamilyPdu, IEquatable<DetonationPdu>
-    {
-        /// <summary>
-        /// ID of the expendable entity, Section 7.3.3 
-        /// </summary>
-        private EntityID _explodingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event, Section 7.3.3
-        /// </summary>
-        private EventIdentifier _eventID = new EventIdentifier();
-
-        /// <summary>
-        /// velocity of the munition immediately before detonation/impact, Section 7.3.3 
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// location of the munition detonation, the expendable detonation, Section 7.3.3 
-        /// </summary>
-        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
-
-        /// <summary>
-        /// Describes the detonation represented, Section 7.3.3 
-        /// </summary>
-        private MunitionDescriptor _descriptor = new MunitionDescriptor();
-
-        /// <summary>
-        /// Velocity of the ammunition, Section 7.3.3 
-        /// </summary>
-        private Vector3Float _locationOfEntityCoordinates = new Vector3Float();
-
-        /// <summary>
-        /// result of the detonation, Section 7.3.3 
-        /// </summary>
-        private byte _detonationResult;
-
-        /// <summary>
-        /// How many articulation parameters we have, Section 7.3.3 
-        /// </summary>
-        private byte _numberOfVariableParameters;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad;
-
-        /// <summary>
-        /// specify the parameter values for each Variable Parameter record, Section 7.3.3 
-        /// </summary>
-        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DetonationPdu"/> class.
-        /// </summary>
-        public DetonationPdu()
-        {
-            PduType = (byte)3;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DetonationPdu left, DetonationPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DetonationPdu left, DetonationPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._explodingEntityID.GetMarshalledSize();  // this._explodingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
-            marshalSize += this._descriptor.GetMarshalledSize();  // this._descriptor
-            marshalSize += this._locationOfEntityCoordinates.GetMarshalledSize();  // this._locationOfEntityCoordinates
-            marshalSize += 1;  // this._detonationResult
-            marshalSize += 1;  // this._numberOfVariableParameters
-            marshalSize += 2;  // this._pad
-            for (int idx = 0; idx < this._variableParameters.Count; idx++)
-            {
-                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the expendable entity, Section 7.3.3 
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "explodingEntityID")]
-        public EntityID ExplodingEntityID
-        {
-            get
-            {
-                return this._explodingEntityID;
-            }
-
-            set
-            {
-                this._explodingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event, Section 7.3.3
-        /// </summary>
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
-        public EventIdentifier EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity of the munition immediately before detonation/impact, Section 7.3.3 
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of the munition detonation, the expendable detonation, Section 7.3.3 
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
-        public Vector3Double LocationInWorldCoordinates
-        {
-            get
-            {
-                return this._locationInWorldCoordinates;
-            }
-
-            set
-            {
-                this._locationInWorldCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the detonation represented, Section 7.3.3 
-        /// </summary>
-        [XmlElement(Type = typeof(MunitionDescriptor), ElementName = "descriptor")]
-        public MunitionDescriptor Descriptor
-        {
-            get
-            {
-                return this._descriptor;
-            }
-
-            set
-            {
-                this._descriptor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Velocity of the ammunition, Section 7.3.3 
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "locationOfEntityCoordinates")]
-        public Vector3Float LocationOfEntityCoordinates
-        {
-            get
-            {
-                return this._locationOfEntityCoordinates;
-            }
-
-            set
-            {
-                this._locationOfEntityCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the result of the detonation, Section 7.3.3 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "detonationResult")]
-        public byte DetonationResult
-        {
-            get
-            {
-                return this._detonationResult;
-            }
-
-            set
-            {
-                this._detonationResult = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
-        public byte NumberOfVariableParameters
-        {
-            get
-            {
-                return this._numberOfVariableParameters;
-            }
-
-            set
-            {
-                this._numberOfVariableParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad")]
-        public ushort Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specify the parameter values for each Variable Parameter record, Section 7.3.3 
-        /// </summary>
-        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
-        public List<VariableParameter> VariableParameters
-        {
-            get
-            {
-                return this._variableParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._explodingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    this._velocity.Marshal(dos);
-                    this._locationInWorldCoordinates.Marshal(dos);
-                    this._descriptor.Marshal(dos);
-                    this._locationOfEntityCoordinates.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._detonationResult);
-                    dos.WriteUnsignedByte((byte)this._variableParameters.Count);
-                    dos.WriteUnsignedShort((ushort)this._pad);
-
-                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                    {
-                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                        aVariableParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._explodingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._velocity.Unmarshal(dis);
-                    this._locationInWorldCoordinates.Unmarshal(dis);
-                    this._descriptor.Unmarshal(dis);
-                    this._locationOfEntityCoordinates.Unmarshal(dis);
-                    this._detonationResult = dis.ReadUnsignedByte();
-                    this._numberOfVariableParameters = dis.ReadUnsignedByte();
-                    this._pad = dis.ReadUnsignedShort();
-                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
-                    {
-                        VariableParameter anX = new VariableParameter();
-                        anX.Unmarshal(dis);
-                        this._variableParameters.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DetonationPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<explodingEntityID>");
-                this._explodingEntityID.Reflection(sb);
-                sb.AppendLine("</explodingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<locationInWorldCoordinates>");
-                this._locationInWorldCoordinates.Reflection(sb);
-                sb.AppendLine("</locationInWorldCoordinates>");
-                sb.AppendLine("<descriptor>");
-                this._descriptor.Reflection(sb);
-                sb.AppendLine("</descriptor>");
-                sb.AppendLine("<locationOfEntityCoordinates>");
-                this._locationOfEntityCoordinates.Reflection(sb);
-                sb.AppendLine("</locationOfEntityCoordinates>");
-                sb.AppendLine("<detonationResult type=\"byte\">" + this._detonationResult.ToString(CultureInfo.InvariantCulture) + "</detonationResult>");
-                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
-                sb.AppendLine("<pad type=\"ushort\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
-                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                    aVariableParameter.Reflection(sb);
-                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DetonationPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DetonationPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DetonationPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._explodingEntityID.Equals(obj._explodingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._descriptor.Equals(obj._descriptor))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationOfEntityCoordinates.Equals(obj._locationOfEntityCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._detonationResult != obj._detonationResult)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameters.Count != obj._variableParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._explodingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._descriptor.GetHashCode();
-            result = GenerateHash(result) ^ this._locationOfEntityCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._detonationResult.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-
-            if (this._variableParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs b/Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
deleted file mode 100644
index aed713a..0000000
--- a/Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
+++ /dev/null
@@ -1,547 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// DE Precision Aimpoint Record. NOT COMPLETE. Section 6.2.21.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(BeamAntennaPattern))]
-    [XmlInclude(typeof(DirectedEnergyTargetEnergyDeposition))]
-    public partial class DirectedEnergyAreaAimpoint
-    {
-        /// <summary>
-        /// Type of Record
-        /// </summary>
-        private uint _recordType = 4001;
-
-        /// <summary>
-        /// Length of Record
-        /// </summary>
-        private ushort _recordLength;
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// Number of beam antenna pattern records
-        /// </summary>
-        private ushort _beamAntennaPatternRecordCount;
-
-        /// <summary>
-        /// Number of DE target energy depositon records
-        /// </summary>
-        private ushort _directedEnergyTargetEnergyDepositionRecordCount;
-
-        /// <summary>
-        /// list of beam antenna records. See 6.2.9.2
-        /// </summary>
-        private List<BeamAntennaPattern> _beamAntennaParameterList = new List<BeamAntennaPattern>();
-
-        /// <summary>
-        /// list of DE target deposition records. See 6.2.21.4
-        /// </summary>
-        private List<DirectedEnergyTargetEnergyDeposition> _directedEnergyTargetEnergyDepositionRecordList = new List<DirectedEnergyTargetEnergyDeposition>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DirectedEnergyAreaAimpoint"/> class.
-        /// </summary>
-        public DirectedEnergyAreaAimpoint()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DirectedEnergyAreaAimpoint left, DirectedEnergyAreaAimpoint right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DirectedEnergyAreaAimpoint left, DirectedEnergyAreaAimpoint right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 2;  // this._padding
-            marshalSize += 2;  // this._beamAntennaPatternRecordCount
-            marshalSize += 2;  // this._directedEnergyTargetEnergyDepositionRecordCount
-            for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
-            {
-                BeamAntennaPattern listElement = (BeamAntennaPattern)this._beamAntennaParameterList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
-            {
-                DirectedEnergyTargetEnergyDeposition listElement = (DirectedEnergyTargetEnergyDeposition)this._directedEnergyTargetEnergyDepositionRecordList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of Record
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length of Record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getbeamAntennaPatternRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "beamAntennaPatternRecordCount")]
-        public ushort BeamAntennaPatternRecordCount
-        {
-            get
-            {
-                return this._beamAntennaPatternRecordCount;
-            }
-
-            set
-            {
-                this._beamAntennaPatternRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getdirectedEnergyTargetEnergyDepositionRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "directedEnergyTargetEnergyDepositionRecordCount")]
-        public ushort DirectedEnergyTargetEnergyDepositionRecordCount
-        {
-            get
-            {
-                return this._directedEnergyTargetEnergyDepositionRecordCount;
-            }
-
-            set
-            {
-                this._directedEnergyTargetEnergyDepositionRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the list of beam antenna records. See 6.2.9.2
-        /// </summary>
-        [XmlElement(ElementName = "beamAntennaParameterListList", Type = typeof(List<BeamAntennaPattern>))]
-        public List<BeamAntennaPattern> BeamAntennaParameterList
-        {
-            get
-            {
-                return this._beamAntennaParameterList;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the list of DE target deposition records. See 6.2.21.4
-        /// </summary>
-        [XmlElement(ElementName = "directedEnergyTargetEnergyDepositionRecordListList", Type = typeof(List<DirectedEnergyTargetEnergyDeposition>))]
-        public List<DirectedEnergyTargetEnergyDeposition> DirectedEnergyTargetEnergyDepositionRecordList
-        {
-            get
-            {
-                return this._directedEnergyTargetEnergyDepositionRecordList;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    dos.WriteUnsignedShort((ushort)this._beamAntennaParameterList.Count);
-                    dos.WriteUnsignedShort((ushort)this._directedEnergyTargetEnergyDepositionRecordList.Count);
-
-                    for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
-                    {
-                        BeamAntennaPattern aBeamAntennaPattern = (BeamAntennaPattern)this._beamAntennaParameterList[idx];
-                        aBeamAntennaPattern.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
-                    {
-                        DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = (DirectedEnergyTargetEnergyDeposition)this._directedEnergyTargetEnergyDepositionRecordList[idx];
-                        aDirectedEnergyTargetEnergyDeposition.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                    this._beamAntennaPatternRecordCount = dis.ReadUnsignedShort();
-                    this._directedEnergyTargetEnergyDepositionRecordCount = dis.ReadUnsignedShort();
-                    for (int idx = 0; idx < this.BeamAntennaPatternRecordCount; idx++)
-                    {
-                        BeamAntennaPattern anX = new BeamAntennaPattern();
-                        anX.Unmarshal(dis);
-                        this._beamAntennaParameterList.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.DirectedEnergyTargetEnergyDepositionRecordCount; idx++)
-                    {
-                        DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
-                        anX.Unmarshal(dis);
-                        this._directedEnergyTargetEnergyDepositionRecordList.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DirectedEnergyAreaAimpoint>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<beamAntennaParameterList type=\"ushort\">" + this._beamAntennaParameterList.Count.ToString(CultureInfo.InvariantCulture) + "</beamAntennaParameterList>");
-                sb.AppendLine("<directedEnergyTargetEnergyDepositionRecordList type=\"ushort\">" + this._directedEnergyTargetEnergyDepositionRecordList.Count.ToString(CultureInfo.InvariantCulture) + "</directedEnergyTargetEnergyDepositionRecordList>");
-                for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
-                {
-                    sb.AppendLine("<beamAntennaParameterList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"BeamAntennaPattern\">");
-                    BeamAntennaPattern aBeamAntennaPattern = (BeamAntennaPattern)this._beamAntennaParameterList[idx];
-                    aBeamAntennaPattern.Reflection(sb);
-                    sb.AppendLine("</beamAntennaParameterList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
-                {
-                    sb.AppendLine("<directedEnergyTargetEnergyDepositionRecordList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"DirectedEnergyTargetEnergyDeposition\">");
-                    DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = (DirectedEnergyTargetEnergyDeposition)this._directedEnergyTargetEnergyDepositionRecordList[idx];
-                    aDirectedEnergyTargetEnergyDeposition.Reflection(sb);
-                    sb.AppendLine("</directedEnergyTargetEnergyDepositionRecordList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DirectedEnergyAreaAimpoint>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DirectedEnergyAreaAimpoint;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DirectedEnergyAreaAimpoint obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAntennaPatternRecordCount != obj._beamAntennaPatternRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._directedEnergyTargetEnergyDepositionRecordCount != obj._directedEnergyTargetEnergyDepositionRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAntennaParameterList.Count != obj._beamAntennaParameterList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
-                {
-                    if (!this._beamAntennaParameterList[idx].Equals(obj._beamAntennaParameterList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._directedEnergyTargetEnergyDepositionRecordList.Count != obj._directedEnergyTargetEnergyDepositionRecordList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
-                {
-                    if (!this._directedEnergyTargetEnergyDepositionRecordList[idx].Equals(obj._directedEnergyTargetEnergyDepositionRecordList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._beamAntennaPatternRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._directedEnergyTargetEnergyDepositionRecordCount.GetHashCode();
-
-            if (this._beamAntennaParameterList.Count > 0)
-            {
-                for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._beamAntennaParameterList[idx].GetHashCode();
-                }
-            }
-
-            if (this._directedEnergyTargetEnergyDepositionRecordList.Count > 0)
-            {
-                for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._directedEnergyTargetEnergyDepositionRecordList[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DirectedEnergyDamage.cs b/Libs/CSharpDis7/DirectedEnergyDamage.cs
deleted file mode 100644
index 8d88db1..0000000
--- a/Libs/CSharpDis7/DirectedEnergyDamage.cs
+++ /dev/null
@@ -1,635 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Damage sustained by an entity due to directed energy. Location of the damage based on a relative x,y,z location from the center of the entity. Section 6.2.17.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(EventIdentifier))]
-    public partial class DirectedEnergyDamage
-    {
-        /// <summary>
-        /// DE Record Type.
-        /// </summary>
-        private uint _recordType = 4500;
-
-        /// <summary>
-        /// DE Record Length (bytes).
-        /// </summary>
-        private ushort _recordLength = 40;
-
-        /// <summary>
-        /// padding.
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// location of damage, relative to center of entity
-        /// </summary>
-        private Vector3Float _damageLocation = new Vector3Float();
-
-        /// <summary>
-        /// Size of damaged area, in meters.
-        /// </summary>
-        private float _damageDiameter;
-
-        /// <summary>
-        /// average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15
-        /// </summary>
-        private float _temperature = -273.15;
-
-        /// <summary>
-        /// enumeration
-        /// </summary>
-        private byte _componentIdentification;
-
-        /// <summary>
-        /// enumeration
-        /// </summary>
-        private byte _componentDamageStatus;
-
-        /// <summary>
-        /// enumeration
-        /// </summary>
-        private byte _componentVisualDamageStatus;
-
-        /// <summary>
-        /// enumeration
-        /// </summary>
-        private byte _componentVisualSmokeColor;
-
-        /// <summary>
-        /// For any component damage resulting this field shall be set to the fire event ID from that PDU.
-        /// </summary>
-        private EventIdentifier _fireEventID = new EventIdentifier();
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DirectedEnergyDamage"/> class.
-        /// </summary>
-        public DirectedEnergyDamage()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DirectedEnergyDamage left, DirectedEnergyDamage right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DirectedEnergyDamage left, DirectedEnergyDamage right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 2;  // this._padding
-            marshalSize += this._damageLocation.GetMarshalledSize();  // this._damageLocation
-            marshalSize += 4;  // this._damageDiameter
-            marshalSize += 4;  // this._temperature
-            marshalSize += 1;  // this._componentIdentification
-            marshalSize += 1;  // this._componentDamageStatus
-            marshalSize += 1;  // this._componentVisualDamageStatus
-            marshalSize += 1;  // this._componentVisualSmokeColor
-            marshalSize += this._fireEventID.GetMarshalledSize();  // this._fireEventID
-            marshalSize += 2;  // this._padding2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the DE Record Type.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the DE Record Length (bytes).
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of damage, relative to center of entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "damageLocation")]
-        public Vector3Float DamageLocation
-        {
-            get
-            {
-                return this._damageLocation;
-            }
-
-            set
-            {
-                this._damageLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Size of damaged area, in meters.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "damageDiameter")]
-        public float DamageDiameter
-        {
-            get
-            {
-                return this._damageDiameter;
-            }
-
-            set
-            {
-                this._damageDiameter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "temperature")]
-        public float Temperature
-        {
-            get
-            {
-                return this._temperature;
-            }
-
-            set
-            {
-                this._temperature = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "componentIdentification")]
-        public byte ComponentIdentification
-        {
-            get
-            {
-                return this._componentIdentification;
-            }
-
-            set
-            {
-                this._componentIdentification = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "componentDamageStatus")]
-        public byte ComponentDamageStatus
-        {
-            get
-            {
-                return this._componentDamageStatus;
-            }
-
-            set
-            {
-                this._componentDamageStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "componentVisualDamageStatus")]
-        public byte ComponentVisualDamageStatus
-        {
-            get
-            {
-                return this._componentVisualDamageStatus;
-            }
-
-            set
-            {
-                this._componentVisualDamageStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "componentVisualSmokeColor")]
-        public byte ComponentVisualSmokeColor
-        {
-            get
-            {
-                return this._componentVisualSmokeColor;
-            }
-
-            set
-            {
-                this._componentVisualSmokeColor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the For any component damage resulting this field shall be set to the fire event ID from that PDU.
-        /// </summary>
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "fireEventID")]
-        public EventIdentifier FireEventID
-        {
-            get
-            {
-                return this._fireEventID;
-            }
-
-            set
-            {
-                this._fireEventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
-        public ushort Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    this._damageLocation.Marshal(dos);
-                    dos.WriteFloat((float)this._damageDiameter);
-                    dos.WriteFloat((float)this._temperature);
-                    dos.WriteUnsignedByte((byte)this._componentIdentification);
-                    dos.WriteUnsignedByte((byte)this._componentDamageStatus);
-                    dos.WriteUnsignedByte((byte)this._componentVisualDamageStatus);
-                    dos.WriteUnsignedByte((byte)this._componentVisualSmokeColor);
-                    this._fireEventID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding2);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                    this._damageLocation.Unmarshal(dis);
-                    this._damageDiameter = dis.ReadFloat();
-                    this._temperature = dis.ReadFloat();
-                    this._componentIdentification = dis.ReadUnsignedByte();
-                    this._componentDamageStatus = dis.ReadUnsignedByte();
-                    this._componentVisualDamageStatus = dis.ReadUnsignedByte();
-                    this._componentVisualSmokeColor = dis.ReadUnsignedByte();
-                    this._fireEventID.Unmarshal(dis);
-                    this._padding2 = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DirectedEnergyDamage>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<damageLocation>");
-                this._damageLocation.Reflection(sb);
-                sb.AppendLine("</damageLocation>");
-                sb.AppendLine("<damageDiameter type=\"float\">" + this._damageDiameter.ToString(CultureInfo.InvariantCulture) + "</damageDiameter>");
-                sb.AppendLine("<temperature type=\"float\">" + this._temperature.ToString(CultureInfo.InvariantCulture) + "</temperature>");
-                sb.AppendLine("<componentIdentification type=\"byte\">" + this._componentIdentification.ToString(CultureInfo.InvariantCulture) + "</componentIdentification>");
-                sb.AppendLine("<componentDamageStatus type=\"byte\">" + this._componentDamageStatus.ToString(CultureInfo.InvariantCulture) + "</componentDamageStatus>");
-                sb.AppendLine("<componentVisualDamageStatus type=\"byte\">" + this._componentVisualDamageStatus.ToString(CultureInfo.InvariantCulture) + "</componentVisualDamageStatus>");
-                sb.AppendLine("<componentVisualSmokeColor type=\"byte\">" + this._componentVisualSmokeColor.ToString(CultureInfo.InvariantCulture) + "</componentVisualSmokeColor>");
-                sb.AppendLine("<fireEventID>");
-                this._fireEventID.Reflection(sb);
-                sb.AppendLine("</fireEventID>");
-                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("</DirectedEnergyDamage>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DirectedEnergyDamage;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DirectedEnergyDamage obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._damageLocation.Equals(obj._damageLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._damageDiameter != obj._damageDiameter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._temperature != obj._temperature)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._componentIdentification != obj._componentIdentification)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._componentDamageStatus != obj._componentDamageStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._componentVisualDamageStatus != obj._componentVisualDamageStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._componentVisualSmokeColor != obj._componentVisualSmokeColor)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._fireEventID.Equals(obj._fireEventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._damageLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._damageDiameter.GetHashCode();
-            result = GenerateHash(result) ^ this._temperature.GetHashCode();
-            result = GenerateHash(result) ^ this._componentIdentification.GetHashCode();
-            result = GenerateHash(result) ^ this._componentDamageStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._componentVisualDamageStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._componentVisualSmokeColor.GetHashCode();
-            result = GenerateHash(result) ^ this._fireEventID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DirectedEnergyFirePdu.cs b/Libs/CSharpDis7/DirectedEnergyFirePdu.cs
deleted file mode 100644
index 4ce5f99..0000000
--- a/Libs/CSharpDis7/DirectedEnergyFirePdu.cs
+++ /dev/null
@@ -1,809 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Firing of a directed energy weapon shall be communicated by issuing a Directed Energy Fire PDU Section 7.3.4  COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(ClockTime))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(StandardVariableSpecification))]
-    public partial class DirectedEnergyFirePdu : WarfareFamilyPdu, IEquatable<DirectedEnergyFirePdu>
-    {
-        /// <summary>
-        /// Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4 
-        /// </summary>
-        private EntityType _munitionType = new EntityType();
-
-        /// <summary>
-        /// Field shall indicate the simulation time at start of the shot, Section 7.3.4 
-        /// </summary>
-        private ClockTime _shotStartTime = new ClockTime();
-
-        /// <summary>
-        /// Field shall indicate the current cumulative duration of the shot, Section 7.3.4 
-        /// </summary>
-        private float _commulativeShotTime;
-
-        /// <summary>
-        /// Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4 
-        /// </summary>
-        private Vector3Float _ApertureEmitterLocation = new Vector3Float();
-
-        /// <summary>
-        /// Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4 
-        /// </summary>
-        private float _apertureDiameter;
-
-        /// <summary>
-        /// Field shall identify the emissions wavelength in units of meters, Section 7.3.4 
-        /// </summary>
-        private float _wavelength;
-
-        /// <summary>
-        /// Field shall identify the current peak irradiance of emissions in units of Watts per square meter, Section 7.3.4 
-        /// </summary>
-        private float _peakIrradiance;
-
-        /// <summary>
-        /// field shall identify the current pulse repetition frequency in units of cycles per second (Hertz), Section 7.3.4 
-        /// </summary>
-        private float _pulseRepetitionFrequency;
-
-        /// <summary>
-        /// field shall identify the pulse width emissions in units of seconds, Section 7.3.4
-        /// </summary>
-        private int _pulseWidth;
-
-        /// <summary>
-        /// 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4 
-        /// </summary>
-        private int _flags;
-
-        /// <summary>
-        /// Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4 
-        /// </summary>
-        private byte _pulseShape;
-
-        /// <summary>
-        /// padding, Section 7.3.4 
-        /// </summary>
-        private byte _padding1;
-
-        /// <summary>
-        /// padding, Section 7.3.4 
-        /// </summary>
-        private uint _padding2;
-
-        /// <summary>
-        /// padding, Section 7.3.4 
-        /// </summary>
-        private ushort _padding3;
-
-        /// <summary>
-        /// Field shall specify the number of DE records, Section 7.3.4 
-        /// </summary>
-        private ushort _numberOfDERecords;
-
-        /// <summary>
-        /// Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4
-        /// </summary>
-        private List<StandardVariableSpecification> _dERecords = new List<StandardVariableSpecification>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DirectedEnergyFirePdu"/> class.
-        /// </summary>
-        public DirectedEnergyFirePdu()
-        {
-            PduType = (byte)68;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DirectedEnergyFirePdu left, DirectedEnergyFirePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DirectedEnergyFirePdu left, DirectedEnergyFirePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
-            marshalSize += this._shotStartTime.GetMarshalledSize();  // this._shotStartTime
-            marshalSize += 4;  // this._commulativeShotTime
-            marshalSize += this._ApertureEmitterLocation.GetMarshalledSize();  // this._ApertureEmitterLocation
-            marshalSize += 4;  // this._apertureDiameter
-            marshalSize += 4;  // this._wavelength
-            marshalSize += 4;  // this._peakIrradiance
-            marshalSize += 4;  // this._pulseRepetitionFrequency
-            marshalSize += 4;  // this._pulseWidth
-            marshalSize += 4;  // this._flags
-            marshalSize += 1;  // this._pulseShape
-            marshalSize += 1;  // this._padding1
-            marshalSize += 4;  // this._padding2
-            marshalSize += 2;  // this._padding3
-            marshalSize += 2;  // this._numberOfDERecords
-            for (int idx = 0; idx < this._dERecords.Count; idx++)
-            {
-                StandardVariableSpecification listElement = (StandardVariableSpecification)this._dERecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
-        public EntityType MunitionType
-        {
-            get
-            {
-                return this._munitionType;
-            }
-
-            set
-            {
-                this._munitionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall indicate the simulation time at start of the shot, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "shotStartTime")]
-        public ClockTime ShotStartTime
-        {
-            get
-            {
-                return this._shotStartTime;
-            }
-
-            set
-            {
-                this._shotStartTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall indicate the current cumulative duration of the shot, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "commulativeShotTime")]
-        public float CommulativeShotTime
-        {
-            get
-            {
-                return this._commulativeShotTime;
-            }
-
-            set
-            {
-                this._commulativeShotTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "ApertureEmitterLocation")]
-        public Vector3Float ApertureEmitterLocation
-        {
-            get
-            {
-                return this._ApertureEmitterLocation;
-            }
-
-            set
-            {
-                this._ApertureEmitterLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "apertureDiameter")]
-        public float ApertureDiameter
-        {
-            get
-            {
-                return this._apertureDiameter;
-            }
-
-            set
-            {
-                this._apertureDiameter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall identify the emissions wavelength in units of meters, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "wavelength")]
-        public float Wavelength
-        {
-            get
-            {
-                return this._wavelength;
-            }
-
-            set
-            {
-                this._wavelength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall identify the current peak irradiance of emissions in units of Watts per square meter, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "peakIrradiance")]
-        public float PeakIrradiance
-        {
-            get
-            {
-                return this._peakIrradiance;
-            }
-
-            set
-            {
-                this._peakIrradiance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the field shall identify the current pulse repetition frequency in units of cycles per second (Hertz), Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
-        public float PulseRepetitionFrequency
-        {
-            get
-            {
-                return this._pulseRepetitionFrequency;
-            }
-
-            set
-            {
-                this._pulseRepetitionFrequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the field shall identify the pulse width emissions in units of seconds, Section 7.3.4
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "pulseWidth")]
-        public int PulseWidth
-        {
-            get
-            {
-                return this._pulseWidth;
-            }
-
-            set
-            {
-                this._pulseWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "flags")]
-        public int Flags
-        {
-            get
-            {
-                return this._flags;
-            }
-
-            set
-            {
-                this._flags = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pulseShape")]
-        public byte PulseShape
-        {
-            get
-            {
-                return this._pulseShape;
-            }
-
-            set
-            {
-                this._pulseShape = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding2")]
-        public uint Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding, Section 7.3.4 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding3")]
-        public ushort Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfDERecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDERecords")]
-        public ushort NumberOfDERecords
-        {
-            get
-            {
-                return this._numberOfDERecords;
-            }
-
-            set
-            {
-                this._numberOfDERecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4
-        /// </summary>
-        [XmlElement(ElementName = "dERecordsList", Type = typeof(List<StandardVariableSpecification>))]
-        public List<StandardVariableSpecification> DERecords
-        {
-            get
-            {
-                return this._dERecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionType.Marshal(dos);
-                    this._shotStartTime.Marshal(dos);
-                    dos.WriteFloat((float)this._commulativeShotTime);
-                    this._ApertureEmitterLocation.Marshal(dos);
-                    dos.WriteFloat((float)this._apertureDiameter);
-                    dos.WriteFloat((float)this._wavelength);
-                    dos.WriteFloat((float)this._peakIrradiance);
-                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
-                    dos.WriteInt((int)this._pulseWidth);
-                    dos.WriteInt((int)this._flags);
-                    dos.WriteByte((byte)this._pulseShape);
-                    dos.WriteUnsignedByte((byte)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._padding2);
-                    dos.WriteUnsignedShort((ushort)this._padding3);
-                    dos.WriteUnsignedShort((ushort)this._dERecords.Count);
-
-                    for (int idx = 0; idx < this._dERecords.Count; idx++)
-                    {
-                        StandardVariableSpecification aStandardVariableSpecification = (StandardVariableSpecification)this._dERecords[idx];
-                        aStandardVariableSpecification.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionType.Unmarshal(dis);
-                    this._shotStartTime.Unmarshal(dis);
-                    this._commulativeShotTime = dis.ReadFloat();
-                    this._ApertureEmitterLocation.Unmarshal(dis);
-                    this._apertureDiameter = dis.ReadFloat();
-                    this._wavelength = dis.ReadFloat();
-                    this._peakIrradiance = dis.ReadFloat();
-                    this._pulseRepetitionFrequency = dis.ReadFloat();
-                    this._pulseWidth = dis.ReadInt();
-                    this._flags = dis.ReadInt();
-                    this._pulseShape = dis.ReadByte();
-                    this._padding1 = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedInt();
-                    this._padding3 = dis.ReadUnsignedShort();
-                    this._numberOfDERecords = dis.ReadUnsignedShort();
-                    for (int idx = 0; idx < this.NumberOfDERecords; idx++)
-                    {
-                        StandardVariableSpecification anX = new StandardVariableSpecification();
-                        anX.Unmarshal(dis);
-                        this._dERecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DirectedEnergyFirePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<munitionType>");
-                this._munitionType.Reflection(sb);
-                sb.AppendLine("</munitionType>");
-                sb.AppendLine("<shotStartTime>");
-                this._shotStartTime.Reflection(sb);
-                sb.AppendLine("</shotStartTime>");
-                sb.AppendLine("<commulativeShotTime type=\"float\">" + this._commulativeShotTime.ToString(CultureInfo.InvariantCulture) + "</commulativeShotTime>");
-                sb.AppendLine("<ApertureEmitterLocation>");
-                this._ApertureEmitterLocation.Reflection(sb);
-                sb.AppendLine("</ApertureEmitterLocation>");
-                sb.AppendLine("<apertureDiameter type=\"float\">" + this._apertureDiameter.ToString(CultureInfo.InvariantCulture) + "</apertureDiameter>");
-                sb.AppendLine("<wavelength type=\"float\">" + this._wavelength.ToString(CultureInfo.InvariantCulture) + "</wavelength>");
-                sb.AppendLine("<peakIrradiance type=\"float\">" + this._peakIrradiance.ToString(CultureInfo.InvariantCulture) + "</peakIrradiance>");
-                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
-                sb.AppendLine("<pulseWidth type=\"int\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
-                sb.AppendLine("<flags type=\"int\">" + this._flags.ToString(CultureInfo.InvariantCulture) + "</flags>");
-                sb.AppendLine("<pulseShape type=\"byte\">" + this._pulseShape.ToString(CultureInfo.InvariantCulture) + "</pulseShape>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"uint\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<padding3 type=\"ushort\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                sb.AppendLine("<dERecords type=\"ushort\">" + this._dERecords.Count.ToString(CultureInfo.InvariantCulture) + "</dERecords>");
-                for (int idx = 0; idx < this._dERecords.Count; idx++)
-                {
-                    sb.AppendLine("<dERecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"StandardVariableSpecification\">");
-                    StandardVariableSpecification aStandardVariableSpecification = (StandardVariableSpecification)this._dERecords[idx];
-                    aStandardVariableSpecification.Reflection(sb);
-                    sb.AppendLine("</dERecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DirectedEnergyFirePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DirectedEnergyFirePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DirectedEnergyFirePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._munitionType.Equals(obj._munitionType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._shotStartTime.Equals(obj._shotStartTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._commulativeShotTime != obj._commulativeShotTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._ApertureEmitterLocation.Equals(obj._ApertureEmitterLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._apertureDiameter != obj._apertureDiameter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._wavelength != obj._wavelength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._peakIrradiance != obj._peakIrradiance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseWidth != obj._pulseWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._flags != obj._flags)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseShape != obj._pulseShape)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfDERecords != obj._numberOfDERecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dERecords.Count != obj._dERecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._dERecords.Count; idx++)
-                {
-                    if (!this._dERecords[idx].Equals(obj._dERecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
-            result = GenerateHash(result) ^ this._shotStartTime.GetHashCode();
-            result = GenerateHash(result) ^ this._commulativeShotTime.GetHashCode();
-            result = GenerateHash(result) ^ this._ApertureEmitterLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._apertureDiameter.GetHashCode();
-            result = GenerateHash(result) ^ this._wavelength.GetHashCode();
-            result = GenerateHash(result) ^ this._peakIrradiance.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._flags.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseShape.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfDERecords.GetHashCode();
-
-            if (this._dERecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._dERecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._dERecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs b/Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
deleted file mode 100644
index 1eeda49..0000000
--- a/Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
+++ /dev/null
@@ -1,674 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// DE Precision Aimpoint Record. Section 6.2.21.3
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(EntityID))]
-    public partial class DirectedEnergyPrecisionAimpoint
-    {
-        /// <summary>
-        /// Type of Record
-        /// </summary>
-        private uint _recordType = 4000;
-
-        /// <summary>
-        /// Length of Record
-        /// </summary>
-        private ushort _recordLength = 88;
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// Position of Target Spot in World Coordinates.
-        /// </summary>
-        private Vector3Double _targetSpotLocation = new Vector3Double();
-
-        /// <summary>
-        /// Position (meters) of Target Spot relative to Entity Position.
-        /// </summary>
-        private Vector3Float _targetSpotEntityLocation = new Vector3Float();
-
-        /// <summary>
-        /// Velocity (meters/sec) of Target Spot.
-        /// </summary>
-        private Vector3Float _targetSpotVelocity = new Vector3Float();
-
-        /// <summary>
-        /// Acceleration (meters/sec/sec) of Target Spot.
-        /// </summary>
-        private Vector3Float _targetSpotAcceleration = new Vector3Float();
-
-        /// <summary>
-        /// Unique ID of the target entity.
-        /// </summary>
-        private EntityID _targetEntityID = new EntityID();
-
-        /// <summary>
-        /// Target Component ID ENUM, same as in DamageDescriptionRecord.
-        /// </summary>
-        private byte _targetComponentID;
-
-        /// <summary>
-        /// Spot Shape ENUM.
-        /// </summary>
-        private byte _SpotShape;
-
-        /// <summary>
-        /// Beam Spot Cross Section Semi-Major Axis.
-        /// </summary>
-        private float _BeamSpotXSecSemiMajorAxis;
-
-        /// <summary>
-        /// Beam Spot Cross Section Semi-Major Axis.
-        /// </summary>
-        private float _BeamSpotCrossSectionSemiMinorAxis;
-
-        /// <summary>
-        /// Beam Spot Cross Section Orientation Angle.
-        /// </summary>
-        private float _BeamSpotCrossSectionOrientAngle;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DirectedEnergyPrecisionAimpoint"/> class.
-        /// </summary>
-        public DirectedEnergyPrecisionAimpoint()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DirectedEnergyPrecisionAimpoint left, DirectedEnergyPrecisionAimpoint right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DirectedEnergyPrecisionAimpoint left, DirectedEnergyPrecisionAimpoint right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 2;  // this._padding
-            marshalSize += this._targetSpotLocation.GetMarshalledSize();  // this._targetSpotLocation
-            marshalSize += this._targetSpotEntityLocation.GetMarshalledSize();  // this._targetSpotEntityLocation
-            marshalSize += this._targetSpotVelocity.GetMarshalledSize();  // this._targetSpotVelocity
-            marshalSize += this._targetSpotAcceleration.GetMarshalledSize();  // this._targetSpotAcceleration
-            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
-            marshalSize += 1;  // this._targetComponentID
-            marshalSize += 1;  // this._SpotShape
-            marshalSize += 4;  // this._BeamSpotXSecSemiMajorAxis
-            marshalSize += 4;  // this._BeamSpotCrossSectionSemiMinorAxis
-            marshalSize += 4;  // this._BeamSpotCrossSectionOrientAngle
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of Record
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length of Record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Position of Target Spot in World Coordinates.
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "targetSpotLocation")]
-        public Vector3Double TargetSpotLocation
-        {
-            get
-            {
-                return this._targetSpotLocation;
-            }
-
-            set
-            {
-                this._targetSpotLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Position (meters) of Target Spot relative to Entity Position.
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "targetSpotEntityLocation")]
-        public Vector3Float TargetSpotEntityLocation
-        {
-            get
-            {
-                return this._targetSpotEntityLocation;
-            }
-
-            set
-            {
-                this._targetSpotEntityLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Velocity (meters/sec) of Target Spot.
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "targetSpotVelocity")]
-        public Vector3Float TargetSpotVelocity
-        {
-            get
-            {
-                return this._targetSpotVelocity;
-            }
-
-            set
-            {
-                this._targetSpotVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Acceleration (meters/sec/sec) of Target Spot.
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "targetSpotAcceleration")]
-        public Vector3Float TargetSpotAcceleration
-        {
-            get
-            {
-                return this._targetSpotAcceleration;
-            }
-
-            set
-            {
-                this._targetSpotAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Unique ID of the target entity.
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
-        public EntityID TargetEntityID
-        {
-            get
-            {
-                return this._targetEntityID;
-            }
-
-            set
-            {
-                this._targetEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Target Component ID ENUM, same as in DamageDescriptionRecord.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "targetComponentID")]
-        public byte TargetComponentID
-        {
-            get
-            {
-                return this._targetComponentID;
-            }
-
-            set
-            {
-                this._targetComponentID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Spot Shape ENUM.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "SpotShape")]
-        public byte SpotShape
-        {
-            get
-            {
-                return this._SpotShape;
-            }
-
-            set
-            {
-                this._SpotShape = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Beam Spot Cross Section Semi-Major Axis.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "BeamSpotXSecSemiMajorAxis")]
-        public float BeamSpotXSecSemiMajorAxis
-        {
-            get
-            {
-                return this._BeamSpotXSecSemiMajorAxis;
-            }
-
-            set
-            {
-                this._BeamSpotXSecSemiMajorAxis = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Beam Spot Cross Section Semi-Major Axis.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "BeamSpotCrossSectionSemiMinorAxis")]
-        public float BeamSpotCrossSectionSemiMinorAxis
-        {
-            get
-            {
-                return this._BeamSpotCrossSectionSemiMinorAxis;
-            }
-
-            set
-            {
-                this._BeamSpotCrossSectionSemiMinorAxis = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Beam Spot Cross Section Orientation Angle.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "BeamSpotCrossSectionOrientAngle")]
-        public float BeamSpotCrossSectionOrientAngle
-        {
-            get
-            {
-                return this._BeamSpotCrossSectionOrientAngle;
-            }
-
-            set
-            {
-                this._BeamSpotCrossSectionOrientAngle = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    this._targetSpotLocation.Marshal(dos);
-                    this._targetSpotEntityLocation.Marshal(dos);
-                    this._targetSpotVelocity.Marshal(dos);
-                    this._targetSpotAcceleration.Marshal(dos);
-                    this._targetEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._targetComponentID);
-                    dos.WriteUnsignedByte((byte)this._SpotShape);
-                    dos.WriteFloat((float)this._BeamSpotXSecSemiMajorAxis);
-                    dos.WriteFloat((float)this._BeamSpotCrossSectionSemiMinorAxis);
-                    dos.WriteFloat((float)this._BeamSpotCrossSectionOrientAngle);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                    this._targetSpotLocation.Unmarshal(dis);
-                    this._targetSpotEntityLocation.Unmarshal(dis);
-                    this._targetSpotVelocity.Unmarshal(dis);
-                    this._targetSpotAcceleration.Unmarshal(dis);
-                    this._targetEntityID.Unmarshal(dis);
-                    this._targetComponentID = dis.ReadUnsignedByte();
-                    this._SpotShape = dis.ReadUnsignedByte();
-                    this._BeamSpotXSecSemiMajorAxis = dis.ReadFloat();
-                    this._BeamSpotCrossSectionSemiMinorAxis = dis.ReadFloat();
-                    this._BeamSpotCrossSectionOrientAngle = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DirectedEnergyPrecisionAimpoint>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<targetSpotLocation>");
-                this._targetSpotLocation.Reflection(sb);
-                sb.AppendLine("</targetSpotLocation>");
-                sb.AppendLine("<targetSpotEntityLocation>");
-                this._targetSpotEntityLocation.Reflection(sb);
-                sb.AppendLine("</targetSpotEntityLocation>");
-                sb.AppendLine("<targetSpotVelocity>");
-                this._targetSpotVelocity.Reflection(sb);
-                sb.AppendLine("</targetSpotVelocity>");
-                sb.AppendLine("<targetSpotAcceleration>");
-                this._targetSpotAcceleration.Reflection(sb);
-                sb.AppendLine("</targetSpotAcceleration>");
-                sb.AppendLine("<targetEntityID>");
-                this._targetEntityID.Reflection(sb);
-                sb.AppendLine("</targetEntityID>");
-                sb.AppendLine("<targetComponentID type=\"byte\">" + this._targetComponentID.ToString(CultureInfo.InvariantCulture) + "</targetComponentID>");
-                sb.AppendLine("<SpotShape type=\"byte\">" + this._SpotShape.ToString(CultureInfo.InvariantCulture) + "</SpotShape>");
-                sb.AppendLine("<BeamSpotXSecSemiMajorAxis type=\"float\">" + this._BeamSpotXSecSemiMajorAxis.ToString(CultureInfo.InvariantCulture) + "</BeamSpotXSecSemiMajorAxis>");
-                sb.AppendLine("<BeamSpotCrossSectionSemiMinorAxis type=\"float\">" + this._BeamSpotCrossSectionSemiMinorAxis.ToString(CultureInfo.InvariantCulture) + "</BeamSpotCrossSectionSemiMinorAxis>");
-                sb.AppendLine("<BeamSpotCrossSectionOrientAngle type=\"float\">" + this._BeamSpotCrossSectionOrientAngle.ToString(CultureInfo.InvariantCulture) + "</BeamSpotCrossSectionOrientAngle>");
-                sb.AppendLine("</DirectedEnergyPrecisionAimpoint>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DirectedEnergyPrecisionAimpoint;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DirectedEnergyPrecisionAimpoint obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetSpotLocation.Equals(obj._targetSpotLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetSpotEntityLocation.Equals(obj._targetSpotEntityLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetSpotVelocity.Equals(obj._targetSpotVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetSpotAcceleration.Equals(obj._targetSpotAcceleration))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetEntityID.Equals(obj._targetEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._targetComponentID != obj._targetComponentID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._SpotShape != obj._SpotShape)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._BeamSpotXSecSemiMajorAxis != obj._BeamSpotXSecSemiMajorAxis)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._BeamSpotCrossSectionSemiMinorAxis != obj._BeamSpotCrossSectionSemiMinorAxis)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._BeamSpotCrossSectionOrientAngle != obj._BeamSpotCrossSectionOrientAngle)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._targetSpotLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._targetSpotEntityLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._targetSpotVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._targetSpotAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._targetComponentID.GetHashCode();
-            result = GenerateHash(result) ^ this._SpotShape.GetHashCode();
-            result = GenerateHash(result) ^ this._BeamSpotXSecSemiMajorAxis.GetHashCode();
-            result = GenerateHash(result) ^ this._BeamSpotCrossSectionSemiMinorAxis.GetHashCode();
-            result = GenerateHash(result) ^ this._BeamSpotCrossSectionOrientAngle.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs b/Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
deleted file mode 100644
index 1b0a133..0000000
--- a/Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// DE energy depostion properties for a target entity. Section 6.2.21.4
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class DirectedEnergyTargetEnergyDeposition
-    {
-        /// <summary>
-        /// Unique ID of the target entity.
-        /// </summary>
-        private EntityID _targetEntityID = new EntityID();
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// Peak irrandiance
-        /// </summary>
-        private float _peakIrradiance;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DirectedEnergyTargetEnergyDeposition"/> class.
-        /// </summary>
-        public DirectedEnergyTargetEnergyDeposition()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DirectedEnergyTargetEnergyDeposition left, DirectedEnergyTargetEnergyDeposition right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DirectedEnergyTargetEnergyDeposition left, DirectedEnergyTargetEnergyDeposition right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
-            marshalSize += 2;  // this._padding
-            marshalSize += 4;  // this._peakIrradiance
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Unique ID of the target entity.
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
-        public EntityID TargetEntityID
-        {
-            get
-            {
-                return this._targetEntityID;
-            }
-
-            set
-            {
-                this._targetEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Peak irrandiance
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "peakIrradiance")]
-        public float PeakIrradiance
-        {
-            get
-            {
-                return this._peakIrradiance;
-            }
-
-            set
-            {
-                this._peakIrradiance = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._targetEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    dos.WriteFloat((float)this._peakIrradiance);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._targetEntityID.Unmarshal(dis);
-                    this._padding = dis.ReadUnsignedShort();
-                    this._peakIrradiance = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DirectedEnergyTargetEnergyDeposition>");
-            try
-            {
-                sb.AppendLine("<targetEntityID>");
-                this._targetEntityID.Reflection(sb);
-                sb.AppendLine("</targetEntityID>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<peakIrradiance type=\"float\">" + this._peakIrradiance.ToString(CultureInfo.InvariantCulture) + "</peakIrradiance>");
-                sb.AppendLine("</DirectedEnergyTargetEnergyDeposition>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DirectedEnergyTargetEnergyDeposition;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DirectedEnergyTargetEnergyDeposition obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._targetEntityID.Equals(obj._targetEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._peakIrradiance != obj._peakIrradiance)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._peakIrradiance.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs b/Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
deleted file mode 100644
index 1afa67b..0000000
--- a/Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.7. Electronic Emissions. Abstract superclass for distirubted emissions PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class DistributedEmissionsFamilyPdu : Pdu, IEquatable<DistributedEmissionsFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DistributedEmissionsFamilyPdu"/> class.
-        /// </summary>
-        public DistributedEmissionsFamilyPdu()
-        {
-            ProtocolFamily = (byte)6;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DistributedEmissionsFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</DistributedEmissionsFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DistributedEmissionsFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DistributedEmissionsFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EEFundamentalParameterData.cs b/Libs/CSharpDis7/EEFundamentalParameterData.cs
deleted file mode 100644
index d6d6483..0000000
--- a/Libs/CSharpDis7/EEFundamentalParameterData.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Contains electromagnetic emmission regeneration parameters that are variable throught a scenario. Section 6.2.22.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EEFundamentalParameterData
-    {
-        /// <summary>
-        /// center frequency of the emission in hertz.
-        /// </summary>
-        private float _frequency;
-
-        /// <summary>
-        /// Bandwidth of the frequencies corresponding to the fequency field.
-        /// </summary>
-        private float _frequencyRange;
-
-        /// <summary>
-        /// Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power.
-        /// </summary>
-        private float _effectiveRadiatedPower;
-
-        /// <summary>
-        /// Average repetition frequency of the emission in hertz.
-        /// </summary>
-        private float _pulseRepetitionFrequency;
-
-        /// <summary>
-        /// Average pulse width  of the emission in microseconds.
-        /// </summary>
-        private float _pulseWidth;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EEFundamentalParameterData"/> class.
-        /// </summary>
-        public EEFundamentalParameterData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EEFundamentalParameterData left, EEFundamentalParameterData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EEFundamentalParameterData left, EEFundamentalParameterData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._frequency
-            marshalSize += 4;  // this._frequencyRange
-            marshalSize += 4;  // this._effectiveRadiatedPower
-            marshalSize += 4;  // this._pulseRepetitionFrequency
-            marshalSize += 4;  // this._pulseWidth
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the center frequency of the emission in hertz.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequency")]
-        public float Frequency
-        {
-            get
-            {
-                return this._frequency;
-            }
-
-            set
-            {
-                this._frequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Bandwidth of the frequencies corresponding to the fequency field.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequencyRange")]
-        public float FrequencyRange
-        {
-            get
-            {
-                return this._frequencyRange;
-            }
-
-            set
-            {
-                this._frequencyRange = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "effectiveRadiatedPower")]
-        public float EffectiveRadiatedPower
-        {
-            get
-            {
-                return this._effectiveRadiatedPower;
-            }
-
-            set
-            {
-                this._effectiveRadiatedPower = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Average repetition frequency of the emission in hertz.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
-        public float PulseRepetitionFrequency
-        {
-            get
-            {
-                return this._pulseRepetitionFrequency;
-            }
-
-            set
-            {
-                this._pulseRepetitionFrequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Average pulse width  of the emission in microseconds.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
-        public float PulseWidth
-        {
-            get
-            {
-                return this._pulseWidth;
-            }
-
-            set
-            {
-                this._pulseWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._frequency);
-                    dos.WriteFloat((float)this._frequencyRange);
-                    dos.WriteFloat((float)this._effectiveRadiatedPower);
-                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
-                    dos.WriteFloat((float)this._pulseWidth);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._frequency = dis.ReadFloat();
-                    this._frequencyRange = dis.ReadFloat();
-                    this._effectiveRadiatedPower = dis.ReadFloat();
-                    this._pulseRepetitionFrequency = dis.ReadFloat();
-                    this._pulseWidth = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EEFundamentalParameterData>");
-            try
-            {
-                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
-                sb.AppendLine("<frequencyRange type=\"float\">" + this._frequencyRange.ToString(CultureInfo.InvariantCulture) + "</frequencyRange>");
-                sb.AppendLine("<effectiveRadiatedPower type=\"float\">" + this._effectiveRadiatedPower.ToString(CultureInfo.InvariantCulture) + "</effectiveRadiatedPower>");
-                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
-                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
-                sb.AppendLine("</EEFundamentalParameterData>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EEFundamentalParameterData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EEFundamentalParameterData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._frequency != obj._frequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frequencyRange != obj._frequencyRange)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._effectiveRadiatedPower != obj._effectiveRadiatedPower)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseWidth != obj._pulseWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._frequency.GetHashCode();
-            result = GenerateHash(result) ^ this._frequencyRange.GetHashCode();
-            result = GenerateHash(result) ^ this._effectiveRadiatedPower.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EightByteChunk.cs b/Libs/CSharpDis7/EightByteChunk.cs
deleted file mode 100644
index 188fa8d..0000000
--- a/Libs/CSharpDis7/EightByteChunk.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// 64 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EightByteChunk
-    {
-        /// <summary>
-        /// Eight bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[8];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EightByteChunk"/> class.
-        /// </summary>
-        public EightByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EightByteChunk left, EightByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EightByteChunk left, EightByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 8 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Eight bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EightByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</EightByteChunk>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EightByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EightByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 8) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 8; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-
-            for (int idx = 0; idx < 8; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ElectronicEmissionsPdu.cs b/Libs/CSharpDis7/ElectronicEmissionsPdu.cs
deleted file mode 100644
index 35133a0..0000000
--- a/Libs/CSharpDis7/ElectronicEmissionsPdu.cs
+++ /dev/null
@@ -1,620 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be communicated using an Electromagnetic Emission PDU. NOT COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventIdentifier))]
-    [XmlInclude(typeof(EmitterSystem))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class ElectronicEmissionsPdu : DistributedEmissionsFamilyPdu, IEquatable<ElectronicEmissionsPdu>
-    {
-        /// <summary>
-        /// ID of the entity emitting
-        /// </summary>
-        private EntityID _emittingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventIdentifier _eventID = new EventIdentifier();
-
-        /// <summary>
-        /// This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
-        /// </summary>
-        private byte _stateUpdateIndicator;
-
-        /// <summary>
-        /// This field shall specify the number of emission systems being described in the current PDU.
-        /// </summary>
-        private byte _numberOfSystems;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _paddingForEmissionsPdu;
-
-        /// <summary>
-        ///  this field shall specify the length of this emitter system's data in 32-bit words.
-        /// </summary>
-        private byte _systemDataLength;
-
-        /// <summary>
-        /// the number of beams being described in the current PDU for the emitter system being described. 
-        /// </summary>
-        private byte _numberOfBeams;
-
-        /// <summary>
-        ///  information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23).
-        /// </summary>
-        private EmitterSystem _emitterSystem = new EmitterSystem();
-
-        /// <summary>
-        /// the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// Electronic emmissions systems THIS IS WRONG. It has the WRONG class type and will cause problems in any marshalling.
-        /// </summary>
-        private List<Vector3Float> _systems = new List<Vector3Float>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ElectronicEmissionsPdu"/> class.
-        /// </summary>
-        public ElectronicEmissionsPdu()
-        {
-            PduType = (byte)23;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._stateUpdateIndicator
-            marshalSize += 1;  // this._numberOfSystems
-            marshalSize += 2;  // this._paddingForEmissionsPdu
-            marshalSize += 1;  // this._systemDataLength
-            marshalSize += 1;  // this._numberOfBeams
-            marshalSize += this._emitterSystem.GetMarshalledSize();  // this._emitterSystem
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            for (int idx = 0; idx < this._systems.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._systems[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity emitting
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
-        public EntityID EmittingEntityID
-        {
-            get
-            {
-                return this._emittingEntityID;
-            }
-
-            set
-            {
-                this._emittingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
-        public EventIdentifier EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "stateUpdateIndicator")]
-        public byte StateUpdateIndicator
-        {
-            get
-            {
-                return this._stateUpdateIndicator;
-            }
-
-            set
-            {
-                this._stateUpdateIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSystems")]
-        public byte NumberOfSystems
-        {
-            get
-            {
-                return this._numberOfSystems;
-            }
-
-            set
-            {
-                this._numberOfSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "paddingForEmissionsPdu")]
-        public ushort PaddingForEmissionsPdu
-        {
-            get
-            {
-                return this._paddingForEmissionsPdu;
-            }
-
-            set
-            {
-                this._paddingForEmissionsPdu = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  this field shall specify the length of this emitter system's data in 32-bit words.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "systemDataLength")]
-        public byte SystemDataLength
-        {
-            get
-            {
-                return this._systemDataLength;
-            }
-
-            set
-            {
-                this._systemDataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the number of beams being described in the current PDU for the emitter system being described. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
-        public byte NumberOfBeams
-        {
-            get
-            {
-                return this._numberOfBeams;
-            }
-
-            set
-            {
-                this._numberOfBeams = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23).
-        /// </summary>
-        [XmlElement(Type = typeof(EmitterSystem), ElementName = "emitterSystem")]
-        public EmitterSystem EmitterSystem
-        {
-            get
-            {
-                return this._emitterSystem;
-            }
-
-            set
-            {
-                this._emitterSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Electronic emmissions systems THIS IS WRONG. It has the WRONG class type and will cause problems in any marshalling.
-        /// </summary>
-        [XmlElement(ElementName = "systemsList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> Systems
-        {
-            get
-            {
-                return this._systems;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._stateUpdateIndicator);
-                    dos.WriteUnsignedByte((byte)this._systems.Count);
-                    dos.WriteUnsignedShort((ushort)this._paddingForEmissionsPdu);
-                    dos.WriteUnsignedByte((byte)this._systemDataLength);
-                    dos.WriteUnsignedByte((byte)this._numberOfBeams);
-                    this._emitterSystem.Marshal(dos);
-                    this._location.Marshal(dos);
-
-                    for (int idx = 0; idx < this._systems.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._systems[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._stateUpdateIndicator = dis.ReadUnsignedByte();
-                    this._numberOfSystems = dis.ReadUnsignedByte();
-                    this._paddingForEmissionsPdu = dis.ReadUnsignedShort();
-                    this._systemDataLength = dis.ReadUnsignedByte();
-                    this._numberOfBeams = dis.ReadUnsignedByte();
-                    this._emitterSystem.Unmarshal(dis);
-                    this._location.Unmarshal(dis);
-                    for (int idx = 0; idx < this.NumberOfSystems; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._systems.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ElectronicEmissionsPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<emittingEntityID>");
-                this._emittingEntityID.Reflection(sb);
-                sb.AppendLine("</emittingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<stateUpdateIndicator type=\"byte\">" + this._stateUpdateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateUpdateIndicator>");
-                sb.AppendLine("<systems type=\"byte\">" + this._systems.Count.ToString(CultureInfo.InvariantCulture) + "</systems>");
-                sb.AppendLine("<paddingForEmissionsPdu type=\"ushort\">" + this._paddingForEmissionsPdu.ToString(CultureInfo.InvariantCulture) + "</paddingForEmissionsPdu>");
-                sb.AppendLine("<systemDataLength type=\"byte\">" + this._systemDataLength.ToString(CultureInfo.InvariantCulture) + "</systemDataLength>");
-                sb.AppendLine("<numberOfBeams type=\"byte\">" + this._numberOfBeams.ToString(CultureInfo.InvariantCulture) + "</numberOfBeams>");
-                sb.AppendLine("<emitterSystem>");
-                this._emitterSystem.Reflection(sb);
-                sb.AppendLine("</emitterSystem>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                for (int idx = 0; idx < this._systems.Count; idx++)
-                {
-                    sb.AppendLine("<systems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._systems[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</systems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ElectronicEmissionsPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ElectronicEmissionsPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ElectronicEmissionsPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateUpdateIndicator != obj._stateUpdateIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSystems != obj._numberOfSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._paddingForEmissionsPdu != obj._paddingForEmissionsPdu)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systemDataLength != obj._systemDataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfBeams != obj._numberOfBeams)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._emitterSystem.Equals(obj._emitterSystem))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systems.Count != obj._systems.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._systems.Count; idx++)
-                {
-                    if (!this._systems[idx].Equals(obj._systems[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._stateUpdateIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSystems.GetHashCode();
-            result = GenerateHash(result) ^ this._paddingForEmissionsPdu.GetHashCode();
-            result = GenerateHash(result) ^ this._systemDataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-
-            if (this._systems.Count > 0)
-            {
-                for (int idx = 0; idx < this._systems.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._systems[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EmitterSystem.cs b/Libs/CSharpDis7/EmitterSystem.cs
deleted file mode 100644
index 102f3f9..0000000
--- a/Libs/CSharpDis7/EmitterSystem.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// This field shall specify information about a particular emitter system. Section 6.2.23.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EmitterSystem
-    {
-        /// <summary>
-        /// Name of the emitter, 16 bit enumeration
-        /// </summary>
-        private ushort _emitterName;
-
-        /// <summary>
-        /// function of the emitter, 8 bit enumeration
-        /// </summary>
-        private byte _function;
-
-        /// <summary>
-        /// emitter ID, 8 bit enumeration
-        /// </summary>
-        private byte _emitterIdNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmitterSystem"/> class.
-        /// </summary>
-        public EmitterSystem()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EmitterSystem left, EmitterSystem right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EmitterSystem left, EmitterSystem right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._emitterName
-            marshalSize += 1;  // this._function
-            marshalSize += 1;  // this._emitterIdNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Name of the emitter, 16 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "emitterName")]
-        public ushort EmitterName
-        {
-            get
-            {
-                return this._emitterName;
-            }
-
-            set
-            {
-                this._emitterName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the function of the emitter, 8 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "function")]
-        public byte Function
-        {
-            get
-            {
-                return this._function;
-            }
-
-            set
-            {
-                this._function = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the emitter ID, 8 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "emitterIdNumber")]
-        public byte EmitterIdNumber
-        {
-            get
-            {
-                return this._emitterIdNumber;
-            }
-
-            set
-            {
-                this._emitterIdNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._emitterName);
-                    dos.WriteUnsignedByte((byte)this._function);
-                    dos.WriteUnsignedByte((byte)this._emitterIdNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._emitterName = dis.ReadUnsignedShort();
-                    this._function = dis.ReadUnsignedByte();
-                    this._emitterIdNumber = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EmitterSystem>");
-            try
-            {
-                sb.AppendLine("<emitterName type=\"ushort\">" + this._emitterName.ToString(CultureInfo.InvariantCulture) + "</emitterName>");
-                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
-                sb.AppendLine("<emitterIdNumber type=\"byte\">" + this._emitterIdNumber.ToString(CultureInfo.InvariantCulture) + "</emitterIdNumber>");
-                sb.AppendLine("</EmitterSystem>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EmitterSystem;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EmitterSystem obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._emitterName != obj._emitterName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._function != obj._function)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterIdNumber != obj._emitterIdNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._emitterName.GetHashCode();
-            result = GenerateHash(result) ^ this._function.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterIdNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EngineFuel.cs b/Libs/CSharpDis7/EngineFuel.cs
deleted file mode 100644
index ee06643..0000000
--- a/Libs/CSharpDis7/EngineFuel.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information about an entity's engine fuel. Section 6.2.24.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EngineFuel
-    {
-        /// <summary>
-        /// Fuel quantity, units specified by next field
-        /// </summary>
-        private uint _fuelQuantity;
-
-        /// <summary>
-        /// Units in which the fuel is measured
-        /// </summary>
-        private byte _fuelMeasurementUnits;
-
-        /// <summary>
-        /// Type of fuel
-        /// </summary>
-        private byte _fuelType;
-
-        /// <summary>
-        /// Location of fuel as related to entity. See section 14 of EBV document
-        /// </summary>
-        private byte _fuelLocation;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EngineFuel"/> class.
-        /// </summary>
-        public EngineFuel()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EngineFuel left, EngineFuel right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EngineFuel left, EngineFuel right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._fuelQuantity
-            marshalSize += 1;  // this._fuelMeasurementUnits
-            marshalSize += 1;  // this._fuelType
-            marshalSize += 1;  // this._fuelLocation
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Fuel quantity, units specified by next field
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fuelQuantity")]
-        public uint FuelQuantity
-        {
-            get
-            {
-                return this._fuelQuantity;
-            }
-
-            set
-            {
-                this._fuelQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Units in which the fuel is measured
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurementUnits")]
-        public byte FuelMeasurementUnits
-        {
-            get
-            {
-                return this._fuelMeasurementUnits;
-            }
-
-            set
-            {
-                this._fuelMeasurementUnits = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of fuel
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelType")]
-        public byte FuelType
-        {
-            get
-            {
-                return this._fuelType;
-            }
-
-            set
-            {
-                this._fuelType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of fuel as related to entity. See section 14 of EBV document
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
-        public byte FuelLocation
-        {
-            get
-            {
-                return this._fuelLocation;
-            }
-
-            set
-            {
-                this._fuelLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fuelQuantity);
-                    dos.WriteUnsignedByte((byte)this._fuelMeasurementUnits);
-                    dos.WriteUnsignedByte((byte)this._fuelType);
-                    dos.WriteUnsignedByte((byte)this._fuelLocation);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._fuelQuantity = dis.ReadUnsignedInt();
-                    this._fuelMeasurementUnits = dis.ReadUnsignedByte();
-                    this._fuelType = dis.ReadUnsignedByte();
-                    this._fuelLocation = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EngineFuel>");
-            try
-            {
-                sb.AppendLine("<fuelQuantity type=\"uint\">" + this._fuelQuantity.ToString(CultureInfo.InvariantCulture) + "</fuelQuantity>");
-                sb.AppendLine("<fuelMeasurementUnits type=\"byte\">" + this._fuelMeasurementUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurementUnits>");
-                sb.AppendLine("<fuelType type=\"byte\">" + this._fuelType.ToString(CultureInfo.InvariantCulture) + "</fuelType>");
-                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</EngineFuel>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EngineFuel;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EngineFuel obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._fuelQuantity != obj._fuelQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelMeasurementUnits != obj._fuelMeasurementUnits)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelType != obj._fuelType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelLocation != obj._fuelLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._fuelQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelMeasurementUnits.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelType.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EngineFuelReload.cs b/Libs/CSharpDis7/EngineFuelReload.cs
deleted file mode 100644
index 9685423..0000000
--- a/Libs/CSharpDis7/EngineFuelReload.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// For each type or location of engine fuell, this record specifies the type, location, fuel measurement units, and reload quantity and maximum quantity. Section 6.2.25.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EngineFuelReload
-    {
-        /// <summary>
-        /// standard quantity of fuel loaded
-        /// </summary>
-        private uint _standardQuantity;
-
-        /// <summary>
-        /// maximum quantity of fuel loaded
-        /// </summary>
-        private uint _maximumQuantity;
-
-        /// <summary>
-        /// seconds normally required to to reload standard qty
-        /// </summary>
-        private uint _standardQuantityReloadTime;
-
-        /// <summary>
-        /// seconds normally required to to reload maximum qty
-        /// </summary>
-        private uint _maximumQuantityReloadTime;
-
-        /// <summary>
-        /// Units of measure
-        /// </summary>
-        private byte _fuelMeasurmentUnits;
-
-        /// <summary>
-        /// fuel  location as related to the entity
-        /// </summary>
-        private byte _fuelLocation;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EngineFuelReload"/> class.
-        /// </summary>
-        public EngineFuelReload()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EngineFuelReload left, EngineFuelReload right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EngineFuelReload left, EngineFuelReload right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._standardQuantity
-            marshalSize += 4;  // this._maximumQuantity
-            marshalSize += 4;  // this._standardQuantityReloadTime
-            marshalSize += 4;  // this._maximumQuantityReloadTime
-            marshalSize += 1;  // this._fuelMeasurmentUnits
-            marshalSize += 1;  // this._fuelLocation
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the standard quantity of fuel loaded
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "standardQuantity")]
-        public uint StandardQuantity
-        {
-            get
-            {
-                return this._standardQuantity;
-            }
-
-            set
-            {
-                this._standardQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum quantity of fuel loaded
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantity")]
-        public uint MaximumQuantity
-        {
-            get
-            {
-                return this._maximumQuantity;
-            }
-
-            set
-            {
-                this._maximumQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the seconds normally required to to reload standard qty
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "standardQuantityReloadTime")]
-        public uint StandardQuantityReloadTime
-        {
-            get
-            {
-                return this._standardQuantityReloadTime;
-            }
-
-            set
-            {
-                this._standardQuantityReloadTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the seconds normally required to to reload maximum qty
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantityReloadTime")]
-        public uint MaximumQuantityReloadTime
-        {
-            get
-            {
-                return this._maximumQuantityReloadTime;
-            }
-
-            set
-            {
-                this._maximumQuantityReloadTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Units of measure
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurmentUnits")]
-        public byte FuelMeasurmentUnits
-        {
-            get
-            {
-                return this._fuelMeasurmentUnits;
-            }
-
-            set
-            {
-                this._fuelMeasurmentUnits = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the fuel  location as related to the entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
-        public byte FuelLocation
-        {
-            get
-            {
-                return this._fuelLocation;
-            }
-
-            set
-            {
-                this._fuelLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._standardQuantity);
-                    dos.WriteUnsignedInt((uint)this._maximumQuantity);
-                    dos.WriteUnsignedInt((uint)this._standardQuantityReloadTime);
-                    dos.WriteUnsignedInt((uint)this._maximumQuantityReloadTime);
-                    dos.WriteUnsignedByte((byte)this._fuelMeasurmentUnits);
-                    dos.WriteUnsignedByte((byte)this._fuelLocation);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._standardQuantity = dis.ReadUnsignedInt();
-                    this._maximumQuantity = dis.ReadUnsignedInt();
-                    this._standardQuantityReloadTime = dis.ReadUnsignedInt();
-                    this._maximumQuantityReloadTime = dis.ReadUnsignedInt();
-                    this._fuelMeasurmentUnits = dis.ReadUnsignedByte();
-                    this._fuelLocation = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EngineFuelReload>");
-            try
-            {
-                sb.AppendLine("<standardQuantity type=\"uint\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
-                sb.AppendLine("<maximumQuantity type=\"uint\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
-                sb.AppendLine("<standardQuantityReloadTime type=\"uint\">" + this._standardQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</standardQuantityReloadTime>");
-                sb.AppendLine("<maximumQuantityReloadTime type=\"uint\">" + this._maximumQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</maximumQuantityReloadTime>");
-                sb.AppendLine("<fuelMeasurmentUnits type=\"byte\">" + this._fuelMeasurmentUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurmentUnits>");
-                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</EngineFuelReload>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EngineFuelReload;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EngineFuelReload obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._standardQuantity != obj._standardQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumQuantity != obj._maximumQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._standardQuantityReloadTime != obj._standardQuantityReloadTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumQuantityReloadTime != obj._maximumQuantityReloadTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelMeasurmentUnits != obj._fuelMeasurmentUnits)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelLocation != obj._fuelLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._standardQuantityReloadTime.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumQuantityReloadTime.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelMeasurmentUnits.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityAssociation.cs b/Libs/CSharpDis7/EntityAssociation.cs
deleted file mode 100644
index 4e89f43..0000000
--- a/Libs/CSharpDis7/EntityAssociation.cs
+++ /dev/null
@@ -1,536 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Association or disassociation of two entities.  Section 6.2.93.4
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class EntityAssociation
-    {
-        /// <summary>
-        /// the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        private byte _recordType = 2;
-
-        /// <summary>
-        /// Indicates if this VP has changed since last issuance
-        /// </summary>
-        private byte _changeIndicator;
-
-        /// <summary>
-        /// Indicates association status between two entities; 8 bit enum
-        /// </summary>
-        private byte _associationStatus;
-
-        /// <summary>
-        /// Type of association; 8 bit enum
-        /// </summary>
-        private byte _associationType;
-
-        /// <summary>
-        /// Object ID of entity associated with this entity
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// Station location on one's own entity. EBV doc.
-        /// </summary>
-        private ushort _owsSttionLocation;
-
-        /// <summary>
-        /// Type of physical connection. EBV doc
-        /// </summary>
-        private ushort _physicalConnectionType;
-
-        /// <summary>
-        /// Type of member the entity is within th egroup
-        /// </summary>
-        private byte _groupMemberType;
-
-        /// <summary>
-        /// Group if any to which the entity belongs
-        /// </summary>
-        private ushort _groupNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityAssociation"/> class.
-        /// </summary>
-        public EntityAssociation()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityAssociation left, EntityAssociation right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityAssociation left, EntityAssociation right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._recordType
-            marshalSize += 1;  // this._changeIndicator
-            marshalSize += 1;  // this._associationStatus
-            marshalSize += 1;  // this._associationType
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 2;  // this._owsSttionLocation
-            marshalSize += 2;  // this._physicalConnectionType
-            marshalSize += 1;  // this._groupMemberType
-            marshalSize += 2;  // this._groupNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
-        public byte RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Indicates if this VP has changed since last issuance
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
-        public byte ChangeIndicator
-        {
-            get
-            {
-                return this._changeIndicator;
-            }
-
-            set
-            {
-                this._changeIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Indicates association status between two entities; 8 bit enum
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "associationStatus")]
-        public byte AssociationStatus
-        {
-            get
-            {
-                return this._associationStatus;
-            }
-
-            set
-            {
-                this._associationStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of association; 8 bit enum
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "associationType")]
-        public byte AssociationType
-        {
-            get
-            {
-                return this._associationType;
-            }
-
-            set
-            {
-                this._associationType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object ID of entity associated with this entity
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Station location on one's own entity. EBV doc.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "owsSttionLocation")]
-        public ushort OwsSttionLocation
-        {
-            get
-            {
-                return this._owsSttionLocation;
-            }
-
-            set
-            {
-                this._owsSttionLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of physical connection. EBV doc
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "physicalConnectionType")]
-        public ushort PhysicalConnectionType
-        {
-            get
-            {
-                return this._physicalConnectionType;
-            }
-
-            set
-            {
-                this._physicalConnectionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of member the entity is within th egroup
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "groupMemberType")]
-        public byte GroupMemberType
-        {
-            get
-            {
-                return this._groupMemberType;
-            }
-
-            set
-            {
-                this._groupMemberType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Group if any to which the entity belongs
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "groupNumber")]
-        public ushort GroupNumber
-        {
-            get
-            {
-                return this._groupNumber;
-            }
-
-            set
-            {
-                this._groupNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._recordType);
-                    dos.WriteUnsignedByte((byte)this._changeIndicator);
-                    dos.WriteUnsignedByte((byte)this._associationStatus);
-                    dos.WriteUnsignedByte((byte)this._associationType);
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._owsSttionLocation);
-                    dos.WriteUnsignedShort((ushort)this._physicalConnectionType);
-                    dos.WriteUnsignedByte((byte)this._groupMemberType);
-                    dos.WriteUnsignedShort((ushort)this._groupNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedByte();
-                    this._changeIndicator = dis.ReadUnsignedByte();
-                    this._associationStatus = dis.ReadUnsignedByte();
-                    this._associationType = dis.ReadUnsignedByte();
-                    this._entityID.Unmarshal(dis);
-                    this._owsSttionLocation = dis.ReadUnsignedShort();
-                    this._physicalConnectionType = dis.ReadUnsignedShort();
-                    this._groupMemberType = dis.ReadUnsignedByte();
-                    this._groupNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityAssociation>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
-                sb.AppendLine("<associationStatus type=\"byte\">" + this._associationStatus.ToString(CultureInfo.InvariantCulture) + "</associationStatus>");
-                sb.AppendLine("<associationType type=\"byte\">" + this._associationType.ToString(CultureInfo.InvariantCulture) + "</associationType>");
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<owsSttionLocation type=\"ushort\">" + this._owsSttionLocation.ToString(CultureInfo.InvariantCulture) + "</owsSttionLocation>");
-                sb.AppendLine("<physicalConnectionType type=\"ushort\">" + this._physicalConnectionType.ToString(CultureInfo.InvariantCulture) + "</physicalConnectionType>");
-                sb.AppendLine("<groupMemberType type=\"byte\">" + this._groupMemberType.ToString(CultureInfo.InvariantCulture) + "</groupMemberType>");
-                sb.AppendLine("<groupNumber type=\"ushort\">" + this._groupNumber.ToString(CultureInfo.InvariantCulture) + "</groupNumber>");
-                sb.AppendLine("</EntityAssociation>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityAssociation;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityAssociation obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._changeIndicator != obj._changeIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._associationStatus != obj._associationStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._associationType != obj._associationType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._owsSttionLocation != obj._owsSttionLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._physicalConnectionType != obj._physicalConnectionType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._groupMemberType != obj._groupMemberType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._groupNumber != obj._groupNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._associationStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._associationType.GetHashCode();
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._owsSttionLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._physicalConnectionType.GetHashCode();
-            result = GenerateHash(result) ^ this._groupMemberType.GetHashCode();
-            result = GenerateHash(result) ^ this._groupNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityDamageStatusPdu.cs b/Libs/CSharpDis7/EntityDamageStatusPdu.cs
deleted file mode 100644
index 061469b..0000000
--- a/Libs/CSharpDis7/EntityDamageStatusPdu.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// shall be used to communicate detailed damage information sustained by an entity regardless of the source of the damage Section 7.3.5  COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(DirectedEnergyDamage))]
-    public partial class EntityDamageStatusPdu : WarfareFamilyPdu, IEquatable<EntityDamageStatusPdu>
-    {
-        /// <summary>
-        /// Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 COMPLETE
-        /// </summary>
-        private EntityID _damagedEntityID = new EntityID();
-
-        /// <summary>
-        /// Padding.
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// Padding.
-        /// </summary>
-        private ushort _padding2;
-
-        /// <summary>
-        /// field shall specify the number of Damage Description records, Section 7.3.5
-        /// </summary>
-        private ushort _numberOfDamageDescription;
-
-        /// <summary>
-        /// Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5
-        /// </summary>
-        private List<DirectedEnergyDamage> _damageDescriptionRecords = new List<DirectedEnergyDamage>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityDamageStatusPdu"/> class.
-        /// </summary>
-        public EntityDamageStatusPdu()
-        {
-            PduType = (byte)69;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityDamageStatusPdu left, EntityDamageStatusPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityDamageStatusPdu left, EntityDamageStatusPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._damagedEntityID.GetMarshalledSize();  // this._damagedEntityID
-            marshalSize += 2;  // this._padding1
-            marshalSize += 2;  // this._padding2
-            marshalSize += 2;  // this._numberOfDamageDescription
-            for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
-            {
-                DirectedEnergyDamage listElement = (DirectedEnergyDamage)this._damageDescriptionRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 COMPLETE
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "damagedEntityID")]
-        public EntityID DamagedEntityID
-        {
-            get
-            {
-                return this._damagedEntityID;
-            }
-
-            set
-            {
-                this._damagedEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
-        public ushort Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfDamageDescription method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDamageDescription")]
-        public ushort NumberOfDamageDescription
-        {
-            get
-            {
-                return this._numberOfDamageDescription;
-            }
-
-            set
-            {
-                this._numberOfDamageDescription = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5
-        /// </summary>
-        [XmlElement(ElementName = "damageDescriptionRecordsList", Type = typeof(List<DirectedEnergyDamage>))]
-        public List<DirectedEnergyDamage> DamageDescriptionRecords
-        {
-            get
-            {
-                return this._damageDescriptionRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._damagedEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteUnsignedShort((ushort)this._padding2);
-                    dos.WriteUnsignedShort((ushort)this._damageDescriptionRecords.Count);
-
-                    for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
-                    {
-                        DirectedEnergyDamage aDirectedEnergyDamage = (DirectedEnergyDamage)this._damageDescriptionRecords[idx];
-                        aDirectedEnergyDamage.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._damagedEntityID.Unmarshal(dis);
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._padding2 = dis.ReadUnsignedShort();
-                    this._numberOfDamageDescription = dis.ReadUnsignedShort();
-                    for (int idx = 0; idx < this.NumberOfDamageDescription; idx++)
-                    {
-                        DirectedEnergyDamage anX = new DirectedEnergyDamage();
-                        anX.Unmarshal(dis);
-                        this._damageDescriptionRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityDamageStatusPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<damagedEntityID>");
-                this._damagedEntityID.Reflection(sb);
-                sb.AppendLine("</damagedEntityID>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<damageDescriptionRecords type=\"ushort\">" + this._damageDescriptionRecords.Count.ToString(CultureInfo.InvariantCulture) + "</damageDescriptionRecords>");
-                for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
-                {
-                    sb.AppendLine("<damageDescriptionRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"DirectedEnergyDamage\">");
-                    DirectedEnergyDamage aDirectedEnergyDamage = (DirectedEnergyDamage)this._damageDescriptionRecords[idx];
-                    aDirectedEnergyDamage.Reflection(sb);
-                    sb.AppendLine("</damageDescriptionRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EntityDamageStatusPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityDamageStatusPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityDamageStatusPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._damagedEntityID.Equals(obj._damagedEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfDamageDescription != obj._numberOfDamageDescription)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._damageDescriptionRecords.Count != obj._damageDescriptionRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
-                {
-                    if (!this._damageDescriptionRecords[idx].Equals(obj._damageDescriptionRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._damagedEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfDamageDescription.GetHashCode();
-
-            if (this._damageDescriptionRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._damageDescriptionRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityID.cs b/Libs/CSharpDis7/EntityID.cs
deleted file mode 100644
index dcada8d..0000000
--- a/Libs/CSharpDis7/EntityID.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Entity Identifier. Unique ID for entities in the world. Consists of an simulation address and a entity number. Section 6.2.28.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class EntityID
-    {
-        /// <summary>
-        /// Site and application IDs
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// Entity number
-        /// </summary>
-        private ushort _entityNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityID"/> class.
-        /// </summary>
-        public EntityID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityID left, EntityID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityID left, EntityID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._entityNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Site and application IDs
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "entityNumber")]
-        public ushort EntityNumber
-        {
-            get
-            {
-                return this._entityNumber;
-            }
-
-            set
-            {
-                this._entityNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._entityNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._entityNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityID>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<entityNumber type=\"ushort\">" + this._entityNumber.ToString(CultureInfo.InvariantCulture) + "</entityNumber>");
-                sb.AppendLine("</EntityID>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityNumber != obj._entityNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._entityNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityInformationFamilyPdu.cs b/Libs/CSharpDis7/EntityInformationFamilyPdu.cs
deleted file mode 100644
index 1670732..0000000
--- a/Libs/CSharpDis7/EntityInformationFamilyPdu.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs. This should be abstract. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityInformationFamilyPdu : Pdu, IEquatable<EntityInformationFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityInformationFamilyPdu"/> class.
-        /// </summary>
-        public EntityInformationFamilyPdu()
-        {
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityInformationFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</EntityInformationFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityInformationFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityInformationFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityManagementFamilyPdu.cs b/Libs/CSharpDis7/EntityManagementFamilyPdu.cs
deleted file mode 100644
index b7473c8..0000000
--- a/Libs/CSharpDis7/EntityManagementFamilyPdu.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Managment of grouping of PDUs, and more. Section 7.8
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityManagementFamilyPdu : Pdu, IEquatable<EntityManagementFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityManagementFamilyPdu"/> class.
-        /// </summary>
-        public EntityManagementFamilyPdu()
-        {
-            ProtocolFamily = (byte)7;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityManagementFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</EntityManagementFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityManagementFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityManagementFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityMarking.cs b/Libs/CSharpDis7/EntityMarking.cs
deleted file mode 100644
index daa8304..0000000
--- a/Libs/CSharpDis7/EntityMarking.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Specifies the character set used inthe first byte, followed by 11 characters of text data. Section 6.29
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityMarking
-    {
-        /// <summary>
-        /// The character set
-        /// </summary>
-        private byte _characterSet;
-
-        /// <summary>
-        /// The characters
-        /// </summary>
-        private byte[] _characters = new byte[11];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityMarking"/> class.
-        /// </summary>
-        public EntityMarking()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityMarking left, EntityMarking right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityMarking left, EntityMarking right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._characterSet
-            marshalSize += 11 * 1;  // _characters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The character set
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
-        public byte CharacterSet
-        {
-            get
-            {
-                return this._characterSet;
-            }
-
-            set
-            {
-                this._characterSet = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The characters
-        /// </summary>
-        [XmlArray(ElementName = "characters")]
-        public byte[] Characters
-        {
-            get
-            {
-                return this._characters;
-            }
-
-            set
-            {
-                this._characters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._characterSet);
-
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        dos.WriteByte(this._characters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._characterSet = dis.ReadUnsignedByte();
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        this._characters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityMarking>");
-            try
-            {
-                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
-                for (int idx = 0; idx < this._characters.Length; idx++)
-                {
-                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</EntityMarking>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityMarking;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityMarking obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._characterSet != obj._characterSet)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._characters.Length != 11) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 11; idx++)
-                {
-                    if (this._characters[idx] != obj._characters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
-
-            for (int idx = 0; idx < 11; idx++)
-            {
-                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityStatePdu.cs b/Libs/CSharpDis7/EntityStatePdu.cs
deleted file mode 100644
index e98b77d..0000000
--- a/Libs/CSharpDis7/EntityStatePdu.cs
+++ /dev/null
@@ -1,721 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Represents the postion and state of one entity in the world. Section 7.2.2. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(EulerAngles))]
-    [XmlInclude(typeof(DeadReckoningParameters))]
-    [XmlInclude(typeof(EntityMarking))]
-    [XmlInclude(typeof(VariableParameter))]
-    public partial class EntityStatePdu : EntityInformationFamilyPdu, IEquatable<EntityStatePdu>
-    {
-        /// <summary>
-        /// Unique ID for an entity that is tied to this state information
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// What force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        private byte _forceId;
-
-        /// <summary>
-        /// How many variable parameters are in the variable length list. In earlier versions of DIS these were known as articulation parameters
-        /// </summary>
-        private byte _numberOfVariableParameters;
-
-        /// <summary>
-        /// Describes the type of entity in the world
-        /// </summary>
-        private EntityType _entityType = new EntityType();
-
-        private EntityType _alternativeEntityType = new EntityType();
-
-        /// <summary>
-        /// Describes the speed of the entity in the world
-        /// </summary>
-        private Vector3Float _entityLinearVelocity = new Vector3Float();
-
-        /// <summary>
-        /// describes the location of the entity in the world
-        /// </summary>
-        private Vector3Double _entityLocation = new Vector3Double();
-
-        /// <summary>
-        /// describes the orientation of the entity, in euler angles
-        /// </summary>
-        private EulerAngles _entityOrientation = new EulerAngles();
-
-        /// <summary>
-        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        private uint _entityAppearance;
-
-        /// <summary>
-        /// parameters used for dead reckoning
-        /// </summary>
-        private DeadReckoningParameters _deadReckoningParameters = new DeadReckoningParameters();
-
-        /// <summary>
-        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        private EntityMarking _marking = new EntityMarking();
-
-        /// <summary>
-        /// a series of bit flags
-        /// </summary>
-        private uint _capabilities;
-
-        /// <summary>
-        /// variable length list of variable parameters. In earlier DIS versions this was articulation parameters.
-        /// </summary>
-        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityStatePdu"/> class.
-        /// </summary>
-        public EntityStatePdu()
-        {
-            PduType = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityStatePdu left, EntityStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityStatePdu left, EntityStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 1;  // this._forceId
-            marshalSize += 1;  // this._numberOfVariableParameters
-            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
-            marshalSize += this._alternativeEntityType.GetMarshalledSize();  // this._alternativeEntityType
-            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
-            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
-            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
-            marshalSize += 4;  // this._entityAppearance
-            marshalSize += this._deadReckoningParameters.GetMarshalledSize();  // this._deadReckoningParameters
-            marshalSize += this._marking.GetMarshalledSize();  // this._marking
-            marshalSize += 4;  // this._capabilities
-            for (int idx = 0; idx < this._variableParameters.Count; idx++)
-            {
-                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Unique ID for an entity that is tied to this state information
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the What force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
-        public byte ForceId
-        {
-            get
-            {
-                return this._forceId;
-            }
-
-            set
-            {
-                this._forceId = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
-        public byte NumberOfVariableParameters
-        {
-            get
-            {
-                return this._numberOfVariableParameters;
-            }
-
-            set
-            {
-                this._numberOfVariableParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the type of entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
-        public EntityType EntityType
-        {
-            get
-            {
-                return this._entityType;
-            }
-
-            set
-            {
-                this._entityType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(EntityType), ElementName = "alternativeEntityType")]
-        public EntityType AlternativeEntityType
-        {
-            get
-            {
-                return this._alternativeEntityType;
-            }
-
-            set
-            {
-                this._alternativeEntityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the speed of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
-        public Vector3Float EntityLinearVelocity
-        {
-            get
-            {
-                return this._entityLinearVelocity;
-            }
-
-            set
-            {
-                this._entityLinearVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the location of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
-        public Vector3Double EntityLocation
-        {
-            get
-            {
-                return this._entityLocation;
-            }
-
-            set
-            {
-                this._entityLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the orientation of the entity, in euler angles
-        /// </summary>
-        [XmlElement(Type = typeof(EulerAngles), ElementName = "entityOrientation")]
-        public EulerAngles EntityOrientation
-        {
-            get
-            {
-                return this._entityOrientation;
-            }
-
-            set
-            {
-                this._entityOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "entityAppearance")]
-        public uint EntityAppearance
-        {
-            get
-            {
-                return this._entityAppearance;
-            }
-
-            set
-            {
-                this._entityAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameters used for dead reckoning
-        /// </summary>
-        [XmlElement(Type = typeof(DeadReckoningParameters), ElementName = "deadReckoningParameters")]
-        public DeadReckoningParameters DeadReckoningParameters
-        {
-            get
-            {
-                return this._deadReckoningParameters;
-            }
-
-            set
-            {
-                this._deadReckoningParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        [XmlElement(Type = typeof(EntityMarking), ElementName = "marking")]
-        public EntityMarking Marking
-        {
-            get
-            {
-                return this._marking;
-            }
-
-            set
-            {
-                this._marking = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "capabilities")]
-        public uint Capabilities
-        {
-            get
-            {
-                return this._capabilities;
-            }
-
-            set
-            {
-                this._capabilities = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable parameters. In earlier DIS versions this was articulation parameters.
-        /// </summary>
-        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
-        public List<VariableParameter> VariableParameters
-        {
-            get
-            {
-                return this._variableParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._forceId);
-                    dos.WriteUnsignedByte((byte)this._variableParameters.Count);
-                    this._entityType.Marshal(dos);
-                    this._alternativeEntityType.Marshal(dos);
-                    this._entityLinearVelocity.Marshal(dos);
-                    this._entityLocation.Marshal(dos);
-                    this._entityOrientation.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._entityAppearance);
-                    this._deadReckoningParameters.Marshal(dos);
-                    this._marking.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._capabilities);
-
-                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                    {
-                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                        aVariableParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._forceId = dis.ReadUnsignedByte();
-                    this._numberOfVariableParameters = dis.ReadUnsignedByte();
-                    this._entityType.Unmarshal(dis);
-                    this._alternativeEntityType.Unmarshal(dis);
-                    this._entityLinearVelocity.Unmarshal(dis);
-                    this._entityLocation.Unmarshal(dis);
-                    this._entityOrientation.Unmarshal(dis);
-                    this._entityAppearance = dis.ReadUnsignedInt();
-                    this._deadReckoningParameters.Unmarshal(dis);
-                    this._marking.Unmarshal(dis);
-                    this._capabilities = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
-                    {
-                        VariableParameter anX = new VariableParameter();
-                        anX.Unmarshal(dis);
-                        this._variableParameters.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
-                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
-                sb.AppendLine("<entityType>");
-                this._entityType.Reflection(sb);
-                sb.AppendLine("</entityType>");
-                sb.AppendLine("<alternativeEntityType>");
-                this._alternativeEntityType.Reflection(sb);
-                sb.AppendLine("</alternativeEntityType>");
-                sb.AppendLine("<entityLinearVelocity>");
-                this._entityLinearVelocity.Reflection(sb);
-                sb.AppendLine("</entityLinearVelocity>");
-                sb.AppendLine("<entityLocation>");
-                this._entityLocation.Reflection(sb);
-                sb.AppendLine("</entityLocation>");
-                sb.AppendLine("<entityOrientation>");
-                this._entityOrientation.Reflection(sb);
-                sb.AppendLine("</entityOrientation>");
-                sb.AppendLine("<entityAppearance type=\"uint\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
-                sb.AppendLine("<deadReckoningParameters>");
-                this._deadReckoningParameters.Reflection(sb);
-                sb.AppendLine("</deadReckoningParameters>");
-                sb.AppendLine("<marking>");
-                this._marking.Reflection(sb);
-                sb.AppendLine("</marking>");
-                sb.AppendLine("<capabilities type=\"uint\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
-                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                    aVariableParameter.Reflection(sb);
-                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EntityStatePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceId != obj._forceId)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityType.Equals(obj._entityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._alternativeEntityType.Equals(obj._alternativeEntityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLocation.Equals(obj._entityLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityOrientation.Equals(obj._entityOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityAppearance != obj._entityAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._deadReckoningParameters.Equals(obj._deadReckoningParameters))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._marking.Equals(obj._marking))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._capabilities != obj._capabilities)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameters.Count != obj._variableParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._forceId.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._entityType.GetHashCode();
-            result = GenerateHash(result) ^ this._alternativeEntityType.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._marking.GetHashCode();
-            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
-
-            if (this._variableParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityStateUpdatePdu.cs b/Libs/CSharpDis7/EntityStateUpdatePdu.cs
deleted file mode 100644
index 5d4e53d..0000000
--- a/Libs/CSharpDis7/EntityStateUpdatePdu.cs
+++ /dev/null
@@ -1,557 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. Section 7.2.5. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(EulerAngles))]
-    [XmlInclude(typeof(VariableParameter))]
-    public partial class EntityStateUpdatePdu : EntityInformationFamilyPdu, IEquatable<EntityStateUpdatePdu>
-    {
-        /// <summary>
-        /// This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private byte _padding1;
-
-        /// <summary>
-        /// This field shall specify the number of variable parameters present. This field shall be represented by an 8-bit unsigned integer (see Annex I).
-        /// </summary>
-        private byte _numberOfVariableParameters;
-
-        /// <summary>
-        /// This field shall specify an entity’s linear velocity. The coordinate system for an entity’s linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]).
-        /// </summary>
-        private Vector3Float _entityLinearVelocity = new Vector3Float();
-
-        /// <summary>
-        /// This field shall specify an entity’s physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97).
-        /// </summary>
-        private Vector3Double _entityLocation = new Vector3Double();
-
-        /// <summary>
-        /// This field shall specify an entity’s orientation and shall be represented by an Euler Angles record (see 6.2.33).
-        /// </summary>
-        private EulerAngles _entityOrientation = new EulerAngles();
-
-        /// <summary>
-        /// This field shall specify the dynamic changes to the entity’s appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26).
-        /// </summary>
-        private uint _entityAppearance;
-
-        /// <summary>
-        /// This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I).
-        /// </summary>
-        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityStateUpdatePdu"/> class.
-        /// </summary>
-        public EntityStateUpdatePdu()
-        {
-            PduType = (byte)67;
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 1;  // this._padding1
-            marshalSize += 1;  // this._numberOfVariableParameters
-            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
-            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
-            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
-            marshalSize += 4;  // this._entityAppearance
-            for (int idx = 0; idx < this._variableParameters.Count; idx++)
-            {
-                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
-        public byte NumberOfVariableParameters
-        {
-            get
-            {
-                return this._numberOfVariableParameters;
-            }
-
-            set
-            {
-                this._numberOfVariableParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify an entity’s linear velocity. The coordinate system for an entity’s linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]).
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
-        public Vector3Float EntityLinearVelocity
-        {
-            get
-            {
-                return this._entityLinearVelocity;
-            }
-
-            set
-            {
-                this._entityLinearVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify an entity’s physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97).
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
-        public Vector3Double EntityLocation
-        {
-            get
-            {
-                return this._entityLocation;
-            }
-
-            set
-            {
-                this._entityLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify an entity’s orientation and shall be represented by an Euler Angles record (see 6.2.33).
-        /// </summary>
-        [XmlElement(Type = typeof(EulerAngles), ElementName = "entityOrientation")]
-        public EulerAngles EntityOrientation
-        {
-            get
-            {
-                return this._entityOrientation;
-            }
-
-            set
-            {
-                this._entityOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the dynamic changes to the entity’s appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26).
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "entityAppearance")]
-        public uint EntityAppearance
-        {
-            get
-            {
-                return this._entityAppearance;
-            }
-
-            set
-            {
-                this._entityAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I).
-        /// </summary>
-        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
-        public List<VariableParameter> VariableParameters
-        {
-            get
-            {
-                return this._variableParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteByte((byte)this._padding1);
-                    dos.WriteUnsignedByte((byte)this._variableParameters.Count);
-                    this._entityLinearVelocity.Marshal(dos);
-                    this._entityLocation.Marshal(dos);
-                    this._entityOrientation.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._entityAppearance);
-
-                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                    {
-                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                        aVariableParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._padding1 = dis.ReadByte();
-                    this._numberOfVariableParameters = dis.ReadUnsignedByte();
-                    this._entityLinearVelocity.Unmarshal(dis);
-                    this._entityLocation.Unmarshal(dis);
-                    this._entityOrientation.Unmarshal(dis);
-                    this._entityAppearance = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
-                    {
-                        VariableParameter anX = new VariableParameter();
-                        anX.Unmarshal(dis);
-                        this._variableParameters.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityStateUpdatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
-                sb.AppendLine("<entityLinearVelocity>");
-                this._entityLinearVelocity.Reflection(sb);
-                sb.AppendLine("</entityLinearVelocity>");
-                sb.AppendLine("<entityLocation>");
-                this._entityLocation.Reflection(sb);
-                sb.AppendLine("</entityLocation>");
-                sb.AppendLine("<entityOrientation>");
-                this._entityOrientation.Reflection(sb);
-                sb.AppendLine("</entityOrientation>");
-                sb.AppendLine("<entityAppearance type=\"uint\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
-                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                    aVariableParameter.Reflection(sb);
-                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EntityStateUpdatePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityStateUpdatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityStateUpdatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLocation.Equals(obj._entityLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityOrientation.Equals(obj._entityOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityAppearance != obj._entityAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameters.Count != obj._variableParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
-
-            if (this._variableParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityType.cs b/Libs/CSharpDis7/EntityType.cs
deleted file mode 100644
index b47ca07..0000000
--- a/Libs/CSharpDis7/EntityType.cs
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc. Section 6.2.30
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL.
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityType"/> class.
-        /// </summary>
-        public EntityType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityType left, EntityType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityType left, EntityType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("</EntityType>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EntityTypeVP.cs b/Libs/CSharpDis7/EntityTypeVP.cs
deleted file mode 100644
index 7d6b6c8..0000000
--- a/Libs/CSharpDis7/EntityTypeVP.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Association or disassociation of two entities.  Section 6.2.93.5
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class EntityTypeVP
-    {
-        /// <summary>
-        /// the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        private byte _recordType = 3;
-
-        /// <summary>
-        /// Indicates if this VP has changed since last issuance
-        /// </summary>
-        private byte _changeIndicator;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        private EntityType _entityType = new EntityType();
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityTypeVP"/> class.
-        /// </summary>
-        public EntityTypeVP()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityTypeVP left, EntityTypeVP right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityTypeVP left, EntityTypeVP right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._recordType
-            marshalSize += 1;  // this._changeIndicator
-            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
-            marshalSize += 2;  // this._padding
-            marshalSize += 4;  // this._padding1
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
-        public byte RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Indicates if this VP has changed since last issuance
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
-        public byte ChangeIndicator
-        {
-            get
-            {
-                return this._changeIndicator;
-            }
-
-            set
-            {
-                this._changeIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
-        public EntityType EntityType
-        {
-            get
-            {
-                return this._entityType;
-            }
-
-            set
-            {
-                this._entityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._recordType);
-                    dos.WriteUnsignedByte((byte)this._changeIndicator);
-                    this._entityType.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedByte();
-                    this._changeIndicator = dis.ReadUnsignedByte();
-                    this._entityType.Unmarshal(dis);
-                    this._padding = dis.ReadUnsignedShort();
-                    this._padding1 = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityTypeVP>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
-                sb.AppendLine("<entityType>");
-                this._entityType.Reflection(sb);
-                sb.AppendLine("</entityType>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("</EntityTypeVP>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityTypeVP;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityTypeVP obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._changeIndicator != obj._changeIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityType.Equals(obj._entityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._entityType.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Environment.cs b/Libs/CSharpDis7/Environment.cs
deleted file mode 100644
index 1e12306..0000000
--- a/Libs/CSharpDis7/Environment.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Incomplete environment record; requires hand coding to fix. Section 6.2.31.1
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Environment
-    {
-        /// <summary>
-        /// type
-        /// </summary>
-        private uint _environmentType;
-
-        /// <summary>
-        /// length, in bits, of the record
-        /// </summary>
-        private ushort _length;
-
-        /// <summary>
-        /// identifies the sequntially numbered record index
-        /// </summary>
-        private byte _index;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Environment"/> class.
-        /// </summary>
-        public Environment()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Environment left, Environment right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Environment left, Environment right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._environmentType
-            marshalSize += 2;  // this._length
-            marshalSize += 1;  // this._index
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the type
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "environmentType")]
-        public uint EnvironmentType
-        {
-            get
-            {
-                return this._environmentType;
-            }
-
-            set
-            {
-                this._environmentType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length, in bits, of the record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "length")]
-        public ushort Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifies the sequntially numbered record index
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "index")]
-        public byte Index
-        {
-            get
-            {
-                return this._index;
-            }
-
-            set
-            {
-                this._index = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._environmentType);
-                    dos.WriteUnsignedShort((ushort)this._length);
-                    dos.WriteUnsignedByte((byte)this._index);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._environmentType = dis.ReadUnsignedInt();
-                    this._length = dis.ReadUnsignedShort();
-                    this._index = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Environment>");
-            try
-            {
-                sb.AppendLine("<environmentType type=\"uint\">" + this._environmentType.ToString(CultureInfo.InvariantCulture) + "</environmentType>");
-                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("<index type=\"byte\">" + this._index.ToString(CultureInfo.InvariantCulture) + "</index>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</Environment>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Environment;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Environment obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._environmentType != obj._environmentType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._index != obj._index)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-            result = GenerateHash(result) ^ this._index.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EnvironmentGeneral.cs b/Libs/CSharpDis7/EnvironmentGeneral.cs
deleted file mode 100644
index 1724b06..0000000
--- a/Libs/CSharpDis7/EnvironmentGeneral.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. NOTE: this class requires hand coding. 6.2.31
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EnvironmentGeneral
-    {
-        /// <summary>
-        /// Record type
-        /// </summary>
-        private uint _environmentType;
-
-        /// <summary>
-        /// length, in bits
-        /// </summary>
-        private byte _length;
-
-        /// <summary>
-        /// Identify the sequentially numbered record index
-        /// </summary>
-        private byte _index;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding1;
-
-        /// <summary>
-        /// Geometry or state record
-        /// </summary>
-        private byte _geometry;
-
-        /// <summary>
-        /// padding to bring the total size up to a 64 bit boundry
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnvironmentGeneral"/> class.
-        /// </summary>
-        public EnvironmentGeneral()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EnvironmentGeneral left, EnvironmentGeneral right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EnvironmentGeneral left, EnvironmentGeneral right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._environmentType
-            marshalSize += 1;  // this._length
-            marshalSize += 1;  // this._index
-            marshalSize += 1;  // this._padding1
-            marshalSize += 1;  // this._geometry
-            marshalSize += 1;  // this._padding2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Record type
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "environmentType")]
-        public uint EnvironmentType
-        {
-            get
-            {
-                return this._environmentType;
-            }
-
-            set
-            {
-                this._environmentType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length, in bits
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "length")]
-        public byte Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identify the sequentially numbered record index
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "index")]
-        public byte Index
-        {
-            get
-            {
-                return this._index;
-            }
-
-            set
-            {
-                this._index = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Geometry or state record
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "geometry")]
-        public byte Geometry
-        {
-            get
-            {
-                return this._geometry;
-            }
-
-            set
-            {
-                this._geometry = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding to bring the total size up to a 64 bit boundry
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._environmentType);
-                    dos.WriteUnsignedByte((byte)this._length);
-                    dos.WriteUnsignedByte((byte)this._index);
-                    dos.WriteUnsignedByte((byte)this._padding1);
-                    dos.WriteUnsignedByte((byte)this._geometry);
-                    dos.WriteUnsignedByte((byte)this._padding2);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._environmentType = dis.ReadUnsignedInt();
-                    this._length = dis.ReadUnsignedByte();
-                    this._index = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadUnsignedByte();
-                    this._geometry = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EnvironmentGeneral>");
-            try
-            {
-                sb.AppendLine("<environmentType type=\"uint\">" + this._environmentType.ToString(CultureInfo.InvariantCulture) + "</environmentType>");
-                sb.AppendLine("<length type=\"byte\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("<index type=\"byte\">" + this._index.ToString(CultureInfo.InvariantCulture) + "</index>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<geometry type=\"byte\">" + this._geometry.ToString(CultureInfo.InvariantCulture) + "</geometry>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("</EnvironmentGeneral>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EnvironmentGeneral;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EnvironmentGeneral obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._environmentType != obj._environmentType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._index != obj._index)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._geometry != obj._geometry)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-            result = GenerateHash(result) ^ this._index.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._geometry.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EnvironmentType.cs b/Libs/CSharpDis7/EnvironmentType.cs
deleted file mode 100644
index 94072fb..0000000
--- a/Libs/CSharpDis7/EnvironmentType.cs
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Description of environmental data in environmental process and gridded data PDUs. Section 6.2.32
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EnvironmentType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// class of environmental entity
-        /// </summary>
-        private ushort _entityClass;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnvironmentType"/> class.
-        /// </summary>
-        public EnvironmentType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EnvironmentType left, EnvironmentType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EnvironmentType left, EnvironmentType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._entityClass
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the class of environmental entity
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "entityClass")]
-        public ushort EntityClass
-        {
-            get
-            {
-                return this._entityClass;
-            }
-
-            set
-            {
-                this._entityClass = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._entityClass);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._entityClass = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EnvironmentType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<entityClass type=\"ushort\">" + this._entityClass.ToString(CultureInfo.InvariantCulture) + "</entityClass>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("</EnvironmentType>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EnvironmentType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EnvironmentType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityClass != obj._entityClass)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._entityClass.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EulerAngles.cs b/Libs/CSharpDis7/EulerAngles.cs
deleted file mode 100644
index 16d7243..0000000
--- a/Libs/CSharpDis7/EulerAngles.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians. Section 6.2.33
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EulerAngles
-    {
-        private float _psi;
-
-        private float _theta;
-
-        private float _phi;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EulerAngles"/> class.
-        /// </summary>
-        public EulerAngles()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EulerAngles left, EulerAngles right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EulerAngles left, EulerAngles right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._psi
-            marshalSize += 4;  // this._theta
-            marshalSize += 4;  // this._phi
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "psi")]
-        public float Psi
-        {
-            get
-            {
-                return this._psi;
-            }
-
-            set
-            {
-                this._psi = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "theta")]
-        public float Theta
-        {
-            get
-            {
-                return this._theta;
-            }
-
-            set
-            {
-                this._theta = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "phi")]
-        public float Phi
-        {
-            get
-            {
-                return this._phi;
-            }
-
-            set
-            {
-                this._phi = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._psi);
-                    dos.WriteFloat((float)this._theta);
-                    dos.WriteFloat((float)this._phi);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._psi = dis.ReadFloat();
-                    this._theta = dis.ReadFloat();
-                    this._phi = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EulerAngles>");
-            try
-            {
-                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
-                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
-                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
-                sb.AppendLine("</EulerAngles>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EulerAngles;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EulerAngles obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._psi != obj._psi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._theta != obj._theta)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phi != obj._phi)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._psi.GetHashCode();
-            result = GenerateHash(result) ^ this._theta.GetHashCode();
-            result = GenerateHash(result) ^ this._phi.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EventIdentifier.cs b/Libs/CSharpDis7/EventIdentifier.cs
deleted file mode 100644
index 7be27fa..0000000
--- a/Libs/CSharpDis7/EventIdentifier.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Identifies an event in the world. Use this format for every PDU EXCEPT the LiveEntityPdu. Section 6.2.34.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class EventIdentifier
-    {
-        /// <summary>
-        /// Site and application IDs
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        private ushort _eventNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventIdentifier"/> class.
-        /// </summary>
-        public EventIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventIdentifier left, EventIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventIdentifier left, EventIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._eventNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Site and application IDs
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
-        public ushort EventNumber
-        {
-            get
-            {
-                return this._eventNumber;
-            }
-
-            set
-            {
-                this._eventNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._eventNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._eventNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
-                sb.AppendLine("</EventIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._eventNumber != obj._eventNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EventIdentifierLiveEntity.cs b/Libs/CSharpDis7/EventIdentifierLiveEntity.cs
deleted file mode 100644
index 7d9bf3e..0000000
--- a/Libs/CSharpDis7/EventIdentifierLiveEntity.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. Section 6.2.34.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EventIdentifierLiveEntity
-    {
-        private byte _siteNumber;
-
-        private byte _applicationNumber;
-
-        private ushort _eventNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventIdentifierLiveEntity"/> class.
-        /// </summary>
-        public EventIdentifierLiveEntity()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventIdentifierLiveEntity left, EventIdentifierLiveEntity right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventIdentifierLiveEntity left, EventIdentifierLiveEntity right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._siteNumber
-            marshalSize += 1;  // this._applicationNumber
-            marshalSize += 2;  // this._eventNumber
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "siteNumber")]
-        public byte SiteNumber
-        {
-            get
-            {
-                return this._siteNumber;
-            }
-
-            set
-            {
-                this._siteNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "applicationNumber")]
-        public byte ApplicationNumber
-        {
-            get
-            {
-                return this._applicationNumber;
-            }
-
-            set
-            {
-                this._applicationNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
-        public ushort EventNumber
-        {
-            get
-            {
-                return this._eventNumber;
-            }
-
-            set
-            {
-                this._eventNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._siteNumber);
-                    dos.WriteUnsignedByte((byte)this._applicationNumber);
-                    dos.WriteUnsignedShort((ushort)this._eventNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._siteNumber = dis.ReadUnsignedByte();
-                    this._applicationNumber = dis.ReadUnsignedByte();
-                    this._eventNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventIdentifierLiveEntity>");
-            try
-            {
-                sb.AppendLine("<siteNumber type=\"byte\">" + this._siteNumber.ToString(CultureInfo.InvariantCulture) + "</siteNumber>");
-                sb.AppendLine("<applicationNumber type=\"byte\">" + this._applicationNumber.ToString(CultureInfo.InvariantCulture) + "</applicationNumber>");
-                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
-                sb.AppendLine("</EventIdentifierLiveEntity>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventIdentifierLiveEntity;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventIdentifierLiveEntity obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._siteNumber != obj._siteNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._applicationNumber != obj._applicationNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._eventNumber != obj._eventNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._siteNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._applicationNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EventReportPdu.cs b/Libs/CSharpDis7/EventReportPdu.cs
deleted file mode 100644
index 84d3bfa..0000000
--- a/Libs/CSharpDis7/EventReportPdu.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Reports occurance of a significant event to the simulation manager. Section 7.5.12. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class EventReportPdu : SimulationManagementFamilyPdu, IEquatable<EventReportPdu>
-    {
-        /// <summary>
-        /// Type of event
-        /// </summary>
-        private uint _eventType;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventReportPdu"/> class.
-        /// </summary>
-        public EventReportPdu()
-        {
-            PduType = (byte)21;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventReportPdu left, EventReportPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventReportPdu left, EventReportPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._eventType
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of event
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "eventType")]
-        public uint EventType
-        {
-            get
-            {
-                return this._eventType;
-            }
-
-            set
-            {
-                this._eventType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._eventType);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._eventType = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventReportPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<eventType type=\"uint\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EventReportPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventReportPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventReportPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._eventType != obj._eventType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._eventType.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/EventReportReliablePdu.cs b/Libs/CSharpDis7/EventReportReliablePdu.cs
deleted file mode 100644
index a2c1d50..0000000
--- a/Libs/CSharpDis7/EventReportReliablePdu.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.11: reports the occurance of a significatnt event to the simulation manager. Needs manual     intervention to fix padding in variable datums. UNFINISHED.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class EventReportReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<EventReportReliablePdu>
-    {
-        /// <summary>
-        /// Event type
-        /// </summary>
-        private ushort _eventType;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _pad1;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventReportReliablePdu"/> class.
-        /// </summary>
-        public EventReportReliablePdu()
-        {
-            PduType = (byte)61;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventReportReliablePdu left, EventReportReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventReportReliablePdu left, EventReportReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._eventType
-            marshalSize += 4;  // this._pad1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Event type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
-        public ushort EventType
-        {
-            get
-            {
-                return this._eventType;
-            }
-
-            set
-            {
-                this._eventType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "pad1")]
-        public uint Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._eventType);
-                    dos.WriteUnsignedInt((uint)this._pad1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._eventType = dis.ReadUnsignedShort();
-                    this._pad1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventReportReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
-                sb.AppendLine("<pad1 type=\"uint\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EventReportReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventReportReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventReportReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._eventType != obj._eventType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._eventType.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Expendable.cs b/Libs/CSharpDis7/Expendable.cs
deleted file mode 100644
index 7b8aeaa..0000000
--- a/Libs/CSharpDis7/Expendable.cs
+++ /dev/null
@@ -1,384 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// An entity's expendable (chaff, flares, etc) information. Section 6.2.36
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class Expendable
-    {
-        /// <summary>
-        /// Type of expendable
-        /// </summary>
-        private EntityType _expendable = new EntityType();
-
-        private uint _station;
-
-        private ushort _quantity;
-
-        private byte _expendableStatus;
-
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Expendable"/> class.
-        /// </summary>
-        public Expendable()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Expendable left, Expendable right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Expendable left, Expendable right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._expendable.GetMarshalledSize();  // this._expendable
-            marshalSize += 4;  // this._station
-            marshalSize += 2;  // this._quantity
-            marshalSize += 1;  // this._expendableStatus
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of expendable
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "expendable")]
-        public EntityType Expendable_
-        {
-            get
-            {
-                return this._expendable;
-            }
-
-            set
-            {
-                this._expendable = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "station")]
-        public uint Station
-        {
-            get
-            {
-                return this._station;
-            }
-
-            set
-            {
-                this._station = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
-        public ushort Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "expendableStatus")]
-        public byte ExpendableStatus
-        {
-            get
-            {
-                return this._expendableStatus;
-            }
-
-            set
-            {
-                this._expendableStatus = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._expendable.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._station);
-                    dos.WriteUnsignedShort((ushort)this._quantity);
-                    dos.WriteUnsignedByte((byte)this._expendableStatus);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._expendable.Unmarshal(dis);
-                    this._station = dis.ReadUnsignedInt();
-                    this._quantity = dis.ReadUnsignedShort();
-                    this._expendableStatus = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Expendable>");
-            try
-            {
-                sb.AppendLine("<expendable>");
-                this._expendable.Reflection(sb);
-                sb.AppendLine("</expendable>");
-                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
-                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("<expendableStatus type=\"byte\">" + this._expendableStatus.ToString(CultureInfo.InvariantCulture) + "</expendableStatus>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</Expendable>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Expendable;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Expendable obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._expendable.Equals(obj._expendable))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._station != obj._station)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._expendableStatus != obj._expendableStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._expendable.GetHashCode();
-            result = GenerateHash(result) ^ this._station.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-            result = GenerateHash(result) ^ this._expendableStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ExpendableDescriptor.cs b/Libs/CSharpDis7/ExpendableDescriptor.cs
deleted file mode 100644
index 0949309..0000000
--- a/Libs/CSharpDis7/ExpendableDescriptor.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Burst of chaff or expendible device. Section 6.2.20.4
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class ExpendableDescriptor
-    {
-        /// <summary>
-        /// Type of the object that exploded
-        /// </summary>
-        private EntityType _expendableType = new EntityType();
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private long _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExpendableDescriptor"/> class.
-        /// </summary>
-        public ExpendableDescriptor()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ExpendableDescriptor left, ExpendableDescriptor right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ExpendableDescriptor left, ExpendableDescriptor right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._expendableType.GetMarshalledSize();  // this._expendableType
-            marshalSize += 8;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of the object that exploded
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "expendableType")]
-        public EntityType ExpendableType
-        {
-            get
-            {
-                return this._expendableType;
-            }
-
-            set
-            {
-                this._expendableType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(long), ElementName = "padding")]
-        public long Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._expendableType.Marshal(dos);
-                    dos.WriteLong((long)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._expendableType.Unmarshal(dis);
-                    this._padding = dis.ReadLong();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ExpendableDescriptor>");
-            try
-            {
-                sb.AppendLine("<expendableType>");
-                this._expendableType.Reflection(sb);
-                sb.AppendLine("</expendableType>");
-                sb.AppendLine("<padding type=\"long\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</ExpendableDescriptor>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ExpendableDescriptor;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ExpendableDescriptor obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._expendableType.Equals(obj._expendableType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._expendableType.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ExpendableReload.cs b/Libs/CSharpDis7/ExpendableReload.cs
deleted file mode 100644
index 4e12354..0000000
--- a/Libs/CSharpDis7/ExpendableReload.cs
+++ /dev/null
@@ -1,410 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// An entity's expendable (chaff, flares, etc) information. Section 6.2.37
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class ExpendableReload
-    {
-        /// <summary>
-        /// Type of expendable
-        /// </summary>
-        private EntityType _expendable = new EntityType();
-
-        private uint _station;
-
-        private ushort _standardQuantity;
-
-        private ushort _maximumQuantity;
-
-        private uint _standardQuantityReloadTime;
-
-        private uint _maximumQuantityReloadTime;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExpendableReload"/> class.
-        /// </summary>
-        public ExpendableReload()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ExpendableReload left, ExpendableReload right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ExpendableReload left, ExpendableReload right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._expendable.GetMarshalledSize();  // this._expendable
-            marshalSize += 4;  // this._station
-            marshalSize += 2;  // this._standardQuantity
-            marshalSize += 2;  // this._maximumQuantity
-            marshalSize += 4;  // this._standardQuantityReloadTime
-            marshalSize += 4;  // this._maximumQuantityReloadTime
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of expendable
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "expendable")]
-        public EntityType Expendable
-        {
-            get
-            {
-                return this._expendable;
-            }
-
-            set
-            {
-                this._expendable = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "station")]
-        public uint Station
-        {
-            get
-            {
-                return this._station;
-            }
-
-            set
-            {
-                this._station = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "standardQuantity")]
-        public ushort StandardQuantity
-        {
-            get
-            {
-                return this._standardQuantity;
-            }
-
-            set
-            {
-                this._standardQuantity = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "maximumQuantity")]
-        public ushort MaximumQuantity
-        {
-            get
-            {
-                return this._maximumQuantity;
-            }
-
-            set
-            {
-                this._maximumQuantity = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "standardQuantityReloadTime")]
-        public uint StandardQuantityReloadTime
-        {
-            get
-            {
-                return this._standardQuantityReloadTime;
-            }
-
-            set
-            {
-                this._standardQuantityReloadTime = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantityReloadTime")]
-        public uint MaximumQuantityReloadTime
-        {
-            get
-            {
-                return this._maximumQuantityReloadTime;
-            }
-
-            set
-            {
-                this._maximumQuantityReloadTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._expendable.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._station);
-                    dos.WriteUnsignedShort((ushort)this._standardQuantity);
-                    dos.WriteUnsignedShort((ushort)this._maximumQuantity);
-                    dos.WriteUnsignedInt((uint)this._standardQuantityReloadTime);
-                    dos.WriteUnsignedInt((uint)this._maximumQuantityReloadTime);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._expendable.Unmarshal(dis);
-                    this._station = dis.ReadUnsignedInt();
-                    this._standardQuantity = dis.ReadUnsignedShort();
-                    this._maximumQuantity = dis.ReadUnsignedShort();
-                    this._standardQuantityReloadTime = dis.ReadUnsignedInt();
-                    this._maximumQuantityReloadTime = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ExpendableReload>");
-            try
-            {
-                sb.AppendLine("<expendable>");
-                this._expendable.Reflection(sb);
-                sb.AppendLine("</expendable>");
-                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
-                sb.AppendLine("<standardQuantity type=\"ushort\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
-                sb.AppendLine("<maximumQuantity type=\"ushort\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
-                sb.AppendLine("<standardQuantityReloadTime type=\"uint\">" + this._standardQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</standardQuantityReloadTime>");
-                sb.AppendLine("<maximumQuantityReloadTime type=\"uint\">" + this._maximumQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</maximumQuantityReloadTime>");
-                sb.AppendLine("</ExpendableReload>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ExpendableReload;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ExpendableReload obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._expendable.Equals(obj._expendable))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._station != obj._station)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._standardQuantity != obj._standardQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumQuantity != obj._maximumQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._standardQuantityReloadTime != obj._standardQuantityReloadTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumQuantityReloadTime != obj._maximumQuantityReloadTime)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._expendable.GetHashCode();
-            result = GenerateHash(result) ^ this._station.GetHashCode();
-            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._standardQuantityReloadTime.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumQuantityReloadTime.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ExplosionDescriptor.cs b/Libs/CSharpDis7/ExplosionDescriptor.cs
deleted file mode 100644
index 41e58e6..0000000
--- a/Libs/CSharpDis7/ExplosionDescriptor.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Explosion of a non-munition. Section 6.2.20.3
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class ExplosionDescriptor
-    {
-        /// <summary>
-        /// Type of the object that exploded. See 6.2.30
-        /// </summary>
-        private EntityType _explodingObject = new EntityType();
-
-        /// <summary>
-        /// Material that exploded. Can be grain dust, tnt, gasoline, etc.
-        /// </summary>
-        private ushort _explosiveMaterial;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// Force of explosion, in equivalent KG of TNT
-        /// </summary>
-        private float _explosiveForce;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExplosionDescriptor"/> class.
-        /// </summary>
-        public ExplosionDescriptor()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ExplosionDescriptor left, ExplosionDescriptor right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ExplosionDescriptor left, ExplosionDescriptor right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._explodingObject.GetMarshalledSize();  // this._explodingObject
-            marshalSize += 2;  // this._explosiveMaterial
-            marshalSize += 2;  // this._padding
-            marshalSize += 4;  // this._explosiveForce
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of the object that exploded. See 6.2.30
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "explodingObject")]
-        public EntityType ExplodingObject
-        {
-            get
-            {
-                return this._explodingObject;
-            }
-
-            set
-            {
-                this._explodingObject = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Material that exploded. Can be grain dust, tnt, gasoline, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "explosiveMaterial")]
-        public ushort ExplosiveMaterial
-        {
-            get
-            {
-                return this._explosiveMaterial;
-            }
-
-            set
-            {
-                this._explosiveMaterial = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Force of explosion, in equivalent KG of TNT
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "explosiveForce")]
-        public float ExplosiveForce
-        {
-            get
-            {
-                return this._explosiveForce;
-            }
-
-            set
-            {
-                this._explosiveForce = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._explodingObject.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._explosiveMaterial);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    dos.WriteFloat((float)this._explosiveForce);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._explodingObject.Unmarshal(dis);
-                    this._explosiveMaterial = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                    this._explosiveForce = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ExplosionDescriptor>");
-            try
-            {
-                sb.AppendLine("<explodingObject>");
-                this._explodingObject.Reflection(sb);
-                sb.AppendLine("</explodingObject>");
-                sb.AppendLine("<explosiveMaterial type=\"ushort\">" + this._explosiveMaterial.ToString(CultureInfo.InvariantCulture) + "</explosiveMaterial>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<explosiveForce type=\"float\">" + this._explosiveForce.ToString(CultureInfo.InvariantCulture) + "</explosiveForce>");
-                sb.AppendLine("</ExplosionDescriptor>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ExplosionDescriptor;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ExplosionDescriptor obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._explodingObject.Equals(obj._explodingObject))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._explosiveMaterial != obj._explosiveMaterial)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._explosiveForce != obj._explosiveForce)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._explodingObject.GetHashCode();
-            result = GenerateHash(result) ^ this._explosiveMaterial.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._explosiveForce.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/FalseTargetsAttribute.cs b/Libs/CSharpDis7/FalseTargetsAttribute.cs
deleted file mode 100644
index 35534c4..0000000
--- a/Libs/CSharpDis7/FalseTargetsAttribute.cs
+++ /dev/null
@@ -1,609 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The False Targets attribute record shall be used to communicate discrete values that are associated with false targets jamming that cannot be referenced to an emitter mode. The values provided in the False Targets attri- bute record shall be considered valid only for the victim radar beams listed in the jamming beam's Track/Jam Data records (provided in the associated Electromagnetic Emission PDU). Section 6.2.12.3
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FalseTargetsAttribute
-    {
-        private uint _recordType = 3502;
-
-        private ushort _recordLength = 40;
-
-        private ushort _padding;
-
-        private byte _emitterNumber;
-
-        private byte _beamNumber;
-
-        private byte _stateIndicator;
-
-        private byte _padding2;
-
-        private float _falseTargetCount;
-
-        private float _walkSpeed;
-
-        private float _walkAcceleration;
-
-        private float _maximumWalkDistance;
-
-        private float _keepTime;
-
-        private float _echoSpacing;
-
-        private uint _padding3;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FalseTargetsAttribute"/> class.
-        /// </summary>
-        public FalseTargetsAttribute()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FalseTargetsAttribute left, FalseTargetsAttribute right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FalseTargetsAttribute left, FalseTargetsAttribute right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 2;  // this._padding
-            marshalSize += 1;  // this._emitterNumber
-            marshalSize += 1;  // this._beamNumber
-            marshalSize += 1;  // this._stateIndicator
-            marshalSize += 1;  // this._padding2
-            marshalSize += 4;  // this._falseTargetCount
-            marshalSize += 4;  // this._walkSpeed
-            marshalSize += 4;  // this._walkAcceleration
-            marshalSize += 4;  // this._maximumWalkDistance
-            marshalSize += 4;  // this._keepTime
-            marshalSize += 4;  // this._echoSpacing
-            marshalSize += 4;  // this._padding3
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
-        public byte EmitterNumber
-        {
-            get
-            {
-                return this._emitterNumber;
-            }
-
-            set
-            {
-                this._emitterNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
-        public byte BeamNumber
-        {
-            get
-            {
-                return this._beamNumber;
-            }
-
-            set
-            {
-                this._beamNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "stateIndicator")]
-        public byte StateIndicator
-        {
-            get
-            {
-                return this._stateIndicator;
-            }
-
-            set
-            {
-                this._stateIndicator = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "falseTargetCount")]
-        public float FalseTargetCount
-        {
-            get
-            {
-                return this._falseTargetCount;
-            }
-
-            set
-            {
-                this._falseTargetCount = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "walkSpeed")]
-        public float WalkSpeed
-        {
-            get
-            {
-                return this._walkSpeed;
-            }
-
-            set
-            {
-                this._walkSpeed = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "walkAcceleration")]
-        public float WalkAcceleration
-        {
-            get
-            {
-                return this._walkAcceleration;
-            }
-
-            set
-            {
-                this._walkAcceleration = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "maximumWalkDistance")]
-        public float MaximumWalkDistance
-        {
-            get
-            {
-                return this._maximumWalkDistance;
-            }
-
-            set
-            {
-                this._maximumWalkDistance = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "keepTime")]
-        public float KeepTime
-        {
-            get
-            {
-                return this._keepTime;
-            }
-
-            set
-            {
-                this._keepTime = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "echoSpacing")]
-        public float EchoSpacing
-        {
-            get
-            {
-                return this._echoSpacing;
-            }
-
-            set
-            {
-                this._echoSpacing = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "padding3")]
-        public uint Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    dos.WriteUnsignedByte((byte)this._emitterNumber);
-                    dos.WriteUnsignedByte((byte)this._beamNumber);
-                    dos.WriteUnsignedByte((byte)this._stateIndicator);
-                    dos.WriteUnsignedByte((byte)this._padding2);
-                    dos.WriteFloat((float)this._falseTargetCount);
-                    dos.WriteFloat((float)this._walkSpeed);
-                    dos.WriteFloat((float)this._walkAcceleration);
-                    dos.WriteFloat((float)this._maximumWalkDistance);
-                    dos.WriteFloat((float)this._keepTime);
-                    dos.WriteFloat((float)this._echoSpacing);
-                    dos.WriteUnsignedInt((uint)this._padding3);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                    this._emitterNumber = dis.ReadUnsignedByte();
-                    this._beamNumber = dis.ReadUnsignedByte();
-                    this._stateIndicator = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedByte();
-                    this._falseTargetCount = dis.ReadFloat();
-                    this._walkSpeed = dis.ReadFloat();
-                    this._walkAcceleration = dis.ReadFloat();
-                    this._maximumWalkDistance = dis.ReadFloat();
-                    this._keepTime = dis.ReadFloat();
-                    this._echoSpacing = dis.ReadFloat();
-                    this._padding3 = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FalseTargetsAttribute>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
-                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
-                sb.AppendLine("<stateIndicator type=\"byte\">" + this._stateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateIndicator>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<falseTargetCount type=\"float\">" + this._falseTargetCount.ToString(CultureInfo.InvariantCulture) + "</falseTargetCount>");
-                sb.AppendLine("<walkSpeed type=\"float\">" + this._walkSpeed.ToString(CultureInfo.InvariantCulture) + "</walkSpeed>");
-                sb.AppendLine("<walkAcceleration type=\"float\">" + this._walkAcceleration.ToString(CultureInfo.InvariantCulture) + "</walkAcceleration>");
-                sb.AppendLine("<maximumWalkDistance type=\"float\">" + this._maximumWalkDistance.ToString(CultureInfo.InvariantCulture) + "</maximumWalkDistance>");
-                sb.AppendLine("<keepTime type=\"float\">" + this._keepTime.ToString(CultureInfo.InvariantCulture) + "</keepTime>");
-                sb.AppendLine("<echoSpacing type=\"float\">" + this._echoSpacing.ToString(CultureInfo.InvariantCulture) + "</echoSpacing>");
-                sb.AppendLine("<padding3 type=\"uint\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                sb.AppendLine("</FalseTargetsAttribute>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FalseTargetsAttribute;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FalseTargetsAttribute obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterNumber != obj._emitterNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamNumber != obj._beamNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateIndicator != obj._stateIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._falseTargetCount != obj._falseTargetCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._walkSpeed != obj._walkSpeed)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._walkAcceleration != obj._walkAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumWalkDistance != obj._maximumWalkDistance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._keepTime != obj._keepTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._echoSpacing != obj._echoSpacing)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._stateIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._falseTargetCount.GetHashCode();
-            result = GenerateHash(result) ^ this._walkSpeed.GetHashCode();
-            result = GenerateHash(result) ^ this._walkAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumWalkDistance.GetHashCode();
-            result = GenerateHash(result) ^ this._keepTime.GetHashCode();
-            result = GenerateHash(result) ^ this._echoSpacing.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/FastEntityStatePdu.cs b/Libs/CSharpDis7/FastEntityStatePdu.cs
deleted file mode 100644
index 4c45e08..0000000
--- a/Libs/CSharpDis7/FastEntityStatePdu.cs
+++ /dev/null
@@ -1,1590 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(VariableParameter))]
-    public partial class FastEntityStatePdu : EntityInformationFamilyPdu, IEquatable<FastEntityStatePdu>
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// the entity ID
-        /// </summary>
-        private ushort _entity;
-
-        /// <summary>
-        /// what force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        private byte _forceId;
-
-        /// <summary>
-        /// How many variable (nee articulation) parameters are in the variable length list
-        /// </summary>
-        private byte _numberOfVariableParameters;
-
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _altEntityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _altDomain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _altCountry;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _altCategory;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _altSubcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _altSpecific;
-
-        private byte _altExtra;
-
-        /// <summary>
-        /// X velo
-        /// </summary>
-        private float _xVelocity;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _yVelocity;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _zVelocity;
-
-        /// <summary>
-        /// X value
-        /// </summary>
-        private double _xLocation;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private double _yLocation;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private double _zLocation;
-
-        private float _psi;
-
-        private float _theta;
-
-        private float _phi;
-
-        /// <summary>
-        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        private int _entityAppearance;
-
-        /// <summary>
-        /// enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        private byte[] _otherParameters = new byte[15];
-
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _xAcceleration;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _yAcceleration;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _zAcceleration;
-
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _xAngularVelocity;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _yAngularVelocity;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _zAngularVelocity;
-
-        /// <summary>
-        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        private byte[] _marking = new byte[12];
-
-        /// <summary>
-        /// a series of bit flags
-        /// </summary>
-        private int _capabilities;
-
-        /// <summary>
-        /// variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters
-        /// </summary>
-        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FastEntityStatePdu"/> class.
-        /// </summary>
-        public FastEntityStatePdu()
-        {
-            PduType = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FastEntityStatePdu left, FastEntityStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FastEntityStatePdu left, FastEntityStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            marshalSize += 2;  // this._entity
-            marshalSize += 1;  // this._forceId
-            marshalSize += 1;  // this._numberOfVariableParameters
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            marshalSize += 1;  // this._altEntityKind
-            marshalSize += 1;  // this._altDomain
-            marshalSize += 2;  // this._altCountry
-            marshalSize += 1;  // this._altCategory
-            marshalSize += 1;  // this._altSubcategory
-            marshalSize += 1;  // this._altSpecific
-            marshalSize += 1;  // this._altExtra
-            marshalSize += 4;  // this._xVelocity
-            marshalSize += 4;  // this._yVelocity
-            marshalSize += 4;  // this._zVelocity
-            marshalSize += 8;  // this._xLocation
-            marshalSize += 8;  // this._yLocation
-            marshalSize += 8;  // this._zLocation
-            marshalSize += 4;  // this._psi
-            marshalSize += 4;  // this._theta
-            marshalSize += 4;  // this._phi
-            marshalSize += 4;  // this._entityAppearance
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 15 * 1;  // _otherParameters
-            marshalSize += 4;  // this._xAcceleration
-            marshalSize += 4;  // this._yAcceleration
-            marshalSize += 4;  // this._zAcceleration
-            marshalSize += 4;  // this._xAngularVelocity
-            marshalSize += 4;  // this._yAngularVelocity
-            marshalSize += 4;  // this._zAngularVelocity
-            marshalSize += 12 * 1;  // _marking
-            marshalSize += 4;  // this._capabilities
-            for (int idx = 0; idx < this._variableParameters.Count; idx++)
-            {
-                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
-        public ushort Entity
-        {
-            get
-            {
-                return this._entity;
-            }
-
-            set
-            {
-                this._entity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the what force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
-        public byte ForceId
-        {
-            get
-            {
-                return this._forceId;
-            }
-
-            set
-            {
-                this._forceId = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
-        public byte NumberOfVariableParameters
-        {
-            get
-            {
-                return this._numberOfVariableParameters;
-            }
-
-            set
-            {
-                this._numberOfVariableParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altEntityKind")]
-        public byte AltEntityKind
-        {
-            get
-            {
-                return this._altEntityKind;
-            }
-
-            set
-            {
-                this._altEntityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altDomain")]
-        public byte AltDomain
-        {
-            get
-            {
-                return this._altDomain;
-            }
-
-            set
-            {
-                this._altDomain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "altCountry")]
-        public ushort AltCountry
-        {
-            get
-            {
-                return this._altCountry;
-            }
-
-            set
-            {
-                this._altCountry = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altCategory")]
-        public byte AltCategory
-        {
-            get
-            {
-                return this._altCategory;
-            }
-
-            set
-            {
-                this._altCategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altSubcategory")]
-        public byte AltSubcategory
-        {
-            get
-            {
-                return this._altSubcategory;
-            }
-
-            set
-            {
-                this._altSubcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altSpecific")]
-        public byte AltSpecific
-        {
-            get
-            {
-                return this._altSpecific;
-            }
-
-            set
-            {
-                this._altSpecific = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "altExtra")]
-        public byte AltExtra
-        {
-            get
-            {
-                return this._altExtra;
-            }
-
-            set
-            {
-                this._altExtra = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the X velo
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "xVelocity")]
-        public float XVelocity
-        {
-            get
-            {
-                return this._xVelocity;
-            }
-
-            set
-            {
-                this._xVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "yVelocity")]
-        public float YVelocity
-        {
-            get
-            {
-                return this._yVelocity;
-            }
-
-            set
-            {
-                this._yVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "zVelocity")]
-        public float ZVelocity
-        {
-            get
-            {
-                return this._zVelocity;
-            }
-
-            set
-            {
-                this._zVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "xLocation")]
-        public double XLocation
-        {
-            get
-            {
-                return this._xLocation;
-            }
-
-            set
-            {
-                this._xLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "yLocation")]
-        public double YLocation
-        {
-            get
-            {
-                return this._yLocation;
-            }
-
-            set
-            {
-                this._yLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "zLocation")]
-        public double ZLocation
-        {
-            get
-            {
-                return this._zLocation;
-            }
-
-            set
-            {
-                this._zLocation = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "psi")]
-        public float Psi
-        {
-            get
-            {
-                return this._psi;
-            }
-
-            set
-            {
-                this._psi = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "theta")]
-        public float Theta
-        {
-            get
-            {
-                return this._theta;
-            }
-
-            set
-            {
-                this._theta = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(float), ElementName = "phi")]
-        public float Phi
-        {
-            get
-            {
-                return this._phi;
-            }
-
-            set
-            {
-                this._phi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
-        public int EntityAppearance
-        {
-            get
-            {
-                return this._entityAppearance;
-            }
-
-            set
-            {
-                this._entityAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "xAcceleration")]
-        public float XAcceleration
-        {
-            get
-            {
-                return this._xAcceleration;
-            }
-
-            set
-            {
-                this._xAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "yAcceleration")]
-        public float YAcceleration
-        {
-            get
-            {
-                return this._yAcceleration;
-            }
-
-            set
-            {
-                this._yAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "zAcceleration")]
-        public float ZAcceleration
-        {
-            get
-            {
-                return this._zAcceleration;
-            }
-
-            set
-            {
-                this._zAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "xAngularVelocity")]
-        public float XAngularVelocity
-        {
-            get
-            {
-                return this._xAngularVelocity;
-            }
-
-            set
-            {
-                this._xAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "yAngularVelocity")]
-        public float YAngularVelocity
-        {
-            get
-            {
-                return this._yAngularVelocity;
-            }
-
-            set
-            {
-                this._yAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "zAngularVelocity")]
-        public float ZAngularVelocity
-        {
-            get
-            {
-                return this._zAngularVelocity;
-            }
-
-            set
-            {
-                this._zAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        [XmlArray(ElementName = "marking")]
-        public byte[] Marking
-        {
-            get
-            {
-                return this._marking;
-            }
-
-            set
-            {
-                this._marking = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
-        public int Capabilities
-        {
-            get
-            {
-                return this._capabilities;
-            }
-
-            set
-            {
-                this._capabilities = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters
-        /// </summary>
-        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
-        public List<VariableParameter> VariableParameters
-        {
-            get
-            {
-                return this._variableParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                    dos.WriteUnsignedShort((ushort)this._entity);
-                    dos.WriteUnsignedByte((byte)this._forceId);
-                    dos.WriteByte((byte)this._variableParameters.Count);
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                    dos.WriteUnsignedByte((byte)this._altEntityKind);
-                    dos.WriteUnsignedByte((byte)this._altDomain);
-                    dos.WriteUnsignedShort((ushort)this._altCountry);
-                    dos.WriteUnsignedByte((byte)this._altCategory);
-                    dos.WriteUnsignedByte((byte)this._altSubcategory);
-                    dos.WriteUnsignedByte((byte)this._altSpecific);
-                    dos.WriteUnsignedByte((byte)this._altExtra);
-                    dos.WriteFloat((float)this._xVelocity);
-                    dos.WriteFloat((float)this._yVelocity);
-                    dos.WriteFloat((float)this._zVelocity);
-                    dos.WriteDouble((double)this._xLocation);
-                    dos.WriteDouble((double)this._yLocation);
-                    dos.WriteDouble((double)this._zLocation);
-                    dos.WriteFloat((float)this._psi);
-                    dos.WriteFloat((float)this._theta);
-                    dos.WriteFloat((float)this._phi);
-                    dos.WriteInt((int)this._entityAppearance);
-                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                    dos.WriteFloat((float)this._xAcceleration);
-                    dos.WriteFloat((float)this._yAcceleration);
-                    dos.WriteFloat((float)this._zAcceleration);
-                    dos.WriteFloat((float)this._xAngularVelocity);
-                    dos.WriteFloat((float)this._yAngularVelocity);
-                    dos.WriteFloat((float)this._zAngularVelocity);
-
-                    for (int idx = 0; idx < this._marking.Length; idx++)
-                    {
-                        dos.WriteByte(this._marking[idx]);
-                    }
-                    dos.WriteInt((int)this._capabilities);
-
-                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                    {
-                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                        aVariableParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                    this._entity = dis.ReadUnsignedShort();
-                    this._forceId = dis.ReadUnsignedByte();
-                    this._numberOfVariableParameters = dis.ReadByte();
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                    this._altEntityKind = dis.ReadUnsignedByte();
-                    this._altDomain = dis.ReadUnsignedByte();
-                    this._altCountry = dis.ReadUnsignedShort();
-                    this._altCategory = dis.ReadUnsignedByte();
-                    this._altSubcategory = dis.ReadUnsignedByte();
-                    this._altSpecific = dis.ReadUnsignedByte();
-                    this._altExtra = dis.ReadUnsignedByte();
-                    this._xVelocity = dis.ReadFloat();
-                    this._yVelocity = dis.ReadFloat();
-                    this._zVelocity = dis.ReadFloat();
-                    this._xLocation = dis.ReadDouble();
-                    this._yLocation = dis.ReadDouble();
-                    this._zLocation = dis.ReadDouble();
-                    this._psi = dis.ReadFloat();
-                    this._theta = dis.ReadFloat();
-                    this._phi = dis.ReadFloat();
-                    this._entityAppearance = dis.ReadInt();
-                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                    this._xAcceleration = dis.ReadFloat();
-                    this._yAcceleration = dis.ReadFloat();
-                    this._zAcceleration = dis.ReadFloat();
-                    this._xAngularVelocity = dis.ReadFloat();
-                    this._yAngularVelocity = dis.ReadFloat();
-                    this._zAngularVelocity = dis.ReadFloat();
-                    for (int idx = 0; idx < this._marking.Length; idx++)
-                    {
-                        this._marking[idx] = dis.ReadByte();
-                    }
-                    this._capabilities = dis.ReadInt();
-                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
-                    {
-                        VariableParameter anX = new VariableParameter();
-                        anX.Unmarshal(dis);
-                        this._variableParameters.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FastEntityStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
-                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
-                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("<altEntityKind type=\"byte\">" + this._altEntityKind.ToString(CultureInfo.InvariantCulture) + "</altEntityKind>");
-                sb.AppendLine("<altDomain type=\"byte\">" + this._altDomain.ToString(CultureInfo.InvariantCulture) + "</altDomain>");
-                sb.AppendLine("<altCountry type=\"ushort\">" + this._altCountry.ToString(CultureInfo.InvariantCulture) + "</altCountry>");
-                sb.AppendLine("<altCategory type=\"byte\">" + this._altCategory.ToString(CultureInfo.InvariantCulture) + "</altCategory>");
-                sb.AppendLine("<altSubcategory type=\"byte\">" + this._altSubcategory.ToString(CultureInfo.InvariantCulture) + "</altSubcategory>");
-                sb.AppendLine("<altSpecific type=\"byte\">" + this._altSpecific.ToString(CultureInfo.InvariantCulture) + "</altSpecific>");
-                sb.AppendLine("<altExtra type=\"byte\">" + this._altExtra.ToString(CultureInfo.InvariantCulture) + "</altExtra>");
-                sb.AppendLine("<xVelocity type=\"float\">" + this._xVelocity.ToString(CultureInfo.InvariantCulture) + "</xVelocity>");
-                sb.AppendLine("<yVelocity type=\"float\">" + this._yVelocity.ToString(CultureInfo.InvariantCulture) + "</yVelocity>");
-                sb.AppendLine("<zVelocity type=\"float\">" + this._zVelocity.ToString(CultureInfo.InvariantCulture) + "</zVelocity>");
-                sb.AppendLine("<xLocation type=\"double\">" + this._xLocation.ToString(CultureInfo.InvariantCulture) + "</xLocation>");
-                sb.AppendLine("<yLocation type=\"double\">" + this._yLocation.ToString(CultureInfo.InvariantCulture) + "</yLocation>");
-                sb.AppendLine("<zLocation type=\"double\">" + this._zLocation.ToString(CultureInfo.InvariantCulture) + "</zLocation>");
-                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
-                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
-                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
-                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<xAcceleration type=\"float\">" + this._xAcceleration.ToString(CultureInfo.InvariantCulture) + "</xAcceleration>");
-                sb.AppendLine("<yAcceleration type=\"float\">" + this._yAcceleration.ToString(CultureInfo.InvariantCulture) + "</yAcceleration>");
-                sb.AppendLine("<zAcceleration type=\"float\">" + this._zAcceleration.ToString(CultureInfo.InvariantCulture) + "</zAcceleration>");
-                sb.AppendLine("<xAngularVelocity type=\"float\">" + this._xAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</xAngularVelocity>");
-                sb.AppendLine("<yAngularVelocity type=\"float\">" + this._yAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</yAngularVelocity>");
-                sb.AppendLine("<zAngularVelocity type=\"float\">" + this._zAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</zAngularVelocity>");
-                for (int idx = 0; idx < this._marking.Length; idx++)
-                {
-                    sb.AppendLine("<marking" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._marking[idx] + "</marking" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
-                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
-                    aVariableParameter.Reflection(sb);
-                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</FastEntityStatePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FastEntityStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FastEntityStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entity != obj._entity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceId != obj._forceId)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altEntityKind != obj._altEntityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altDomain != obj._altDomain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altCountry != obj._altCountry)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altCategory != obj._altCategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altSubcategory != obj._altSubcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altSpecific != obj._altSpecific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altExtra != obj._altExtra)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._xVelocity != obj._xVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yVelocity != obj._yVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zVelocity != obj._zVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._xLocation != obj._xLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yLocation != obj._yLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zLocation != obj._zLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._psi != obj._psi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._theta != obj._theta)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phi != obj._phi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityAppearance != obj._entityAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._otherParameters.Length != 15) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 15; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._xAcceleration != obj._xAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yAcceleration != obj._yAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zAcceleration != obj._zAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._xAngularVelocity != obj._xAngularVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yAngularVelocity != obj._yAngularVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zAngularVelocity != obj._zAngularVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._marking.Length != 12) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 12; idx++)
-                {
-                    if (this._marking[idx] != obj._marking[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._capabilities != obj._capabilities)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameters.Count != obj._variableParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-            result = GenerateHash(result) ^ this._entity.GetHashCode();
-            result = GenerateHash(result) ^ this._forceId.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-            result = GenerateHash(result) ^ this._altEntityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._altDomain.GetHashCode();
-            result = GenerateHash(result) ^ this._altCountry.GetHashCode();
-            result = GenerateHash(result) ^ this._altCategory.GetHashCode();
-            result = GenerateHash(result) ^ this._altSubcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._altSpecific.GetHashCode();
-            result = GenerateHash(result) ^ this._altExtra.GetHashCode();
-            result = GenerateHash(result) ^ this._xVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._yVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._zVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._xLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._yLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._zLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._psi.GetHashCode();
-            result = GenerateHash(result) ^ this._theta.GetHashCode();
-            result = GenerateHash(result) ^ this._phi.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-
-            for (int idx = 0; idx < 15; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-            result = GenerateHash(result) ^ this._xAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._yAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._zAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._xAngularVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._yAngularVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._zAngularVelocity.GetHashCode();
-
-            for (int idx = 0; idx < 12; idx++)
-            {
-                result = GenerateHash(result) ^ this._marking[idx].GetHashCode();
-            }
-            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
-
-            if (this._variableParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/FirePdu.cs b/Libs/CSharpDis7/FirePdu.cs
deleted file mode 100644
index 9f8490e..0000000
--- a/Libs/CSharpDis7/FirePdu.cs
+++ /dev/null
@@ -1,488 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  The firing of a weapon or expendable shall be communicated by issuing a Fire PDU. Sectioin 7.3.2. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventIdentifier))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(MunitionDescriptor))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class FirePdu : WarfareFamilyPdu, IEquatable<FirePdu>
-    {
-        /// <summary>
-        /// This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        private EntityID _munitionExpendibleID = new EntityID();
-
-        /// <summary>
-        /// This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34).
-        /// </summary>
-        private EventIdentifier _eventID = new EventIdentifier();
-
-        /// <summary>
-        /// This field shall identify the fire mission (see 5.4.3.3). This field shall be representedby a 32-bit unsigned integer.
-        /// </summary>
-        private uint _fireMissionIndex;
-
-        /// <summary>
-        /// This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97).
-        /// </summary>
-        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
-
-        /// <summary>
-        /// This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4).
-        /// </summary>
-        private MunitionDescriptor _descriptor = new MunitionDescriptor();
-
-        /// <summary>
-        /// This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)].
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// This field shall specify the range that an entity’s fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero.
-        /// </summary>
-        private float _range;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FirePdu"/> class.
-        /// </summary>
-        public FirePdu()
-        {
-            PduType = (byte)2;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FirePdu left, FirePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FirePdu left, FirePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._munitionExpendibleID.GetMarshalledSize();  // this._munitionExpendibleID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 4;  // this._fireMissionIndex
-            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
-            marshalSize += this._descriptor.GetMarshalledSize();  // this._descriptor
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += 4;  // this._range
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28).
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "munitionExpendibleID")]
-        public EntityID MunitionExpendibleID
-        {
-            get
-            {
-                return this._munitionExpendibleID;
-            }
-
-            set
-            {
-                this._munitionExpendibleID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34).
-        /// </summary>
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
-        public EventIdentifier EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the fire mission (see 5.4.3.3). This field shall be representedby a 32-bit unsigned integer.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fireMissionIndex")]
-        public uint FireMissionIndex
-        {
-            get
-            {
-                return this._fireMissionIndex;
-            }
-
-            set
-            {
-                this._fireMissionIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97).
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
-        public Vector3Double LocationInWorldCoordinates
-        {
-            get
-            {
-                return this._locationInWorldCoordinates;
-            }
-
-            set
-            {
-                this._locationInWorldCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4).
-        /// </summary>
-        [XmlElement(Type = typeof(MunitionDescriptor), ElementName = "descriptor")]
-        public MunitionDescriptor Descriptor
-        {
-            get
-            {
-                return this._descriptor;
-            }
-
-            set
-            {
-                this._descriptor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)].
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the range that an entity’s fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "range")]
-        public float Range
-        {
-            get
-            {
-                return this._range;
-            }
-
-            set
-            {
-                this._range = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionExpendibleID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._fireMissionIndex);
-                    this._locationInWorldCoordinates.Marshal(dos);
-                    this._descriptor.Marshal(dos);
-                    this._velocity.Marshal(dos);
-                    dos.WriteFloat((float)this._range);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionExpendibleID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._fireMissionIndex = dis.ReadUnsignedInt();
-                    this._locationInWorldCoordinates.Unmarshal(dis);
-                    this._descriptor.Unmarshal(dis);
-                    this._velocity.Unmarshal(dis);
-                    this._range = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FirePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<munitionExpendibleID>");
-                this._munitionExpendibleID.Reflection(sb);
-                sb.AppendLine("</munitionExpendibleID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<fireMissionIndex type=\"uint\">" + this._fireMissionIndex.ToString(CultureInfo.InvariantCulture) + "</fireMissionIndex>");
-                sb.AppendLine("<locationInWorldCoordinates>");
-                this._locationInWorldCoordinates.Reflection(sb);
-                sb.AppendLine("</locationInWorldCoordinates>");
-                sb.AppendLine("<descriptor>");
-                this._descriptor.Reflection(sb);
-                sb.AppendLine("</descriptor>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<range type=\"float\">" + this._range.ToString(CultureInfo.InvariantCulture) + "</range>");
-                sb.AppendLine("</FirePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FirePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FirePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._munitionExpendibleID.Equals(obj._munitionExpendibleID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fireMissionIndex != obj._fireMissionIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._descriptor.Equals(obj._descriptor))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._range != obj._range)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._munitionExpendibleID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._fireMissionIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._descriptor.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._range.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/FixedDatum.cs b/Libs/CSharpDis7/FixedDatum.cs
deleted file mode 100644
index 8c840dc..0000000
--- a/Libs/CSharpDis7/FixedDatum.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Fixed Datum Record. Section 6.2.38
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FixedDatum
-    {
-        /// <summary>
-        /// ID of the fixed datum, an enumeration
-        /// </summary>
-        private uint _fixedDatumID;
-
-        /// <summary>
-        /// Value for the fixed datum
-        /// </summary>
-        private uint _fixedDatumValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FixedDatum"/> class.
-        /// </summary>
-        public FixedDatum()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FixedDatum left, FixedDatum right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FixedDatum left, FixedDatum right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._fixedDatumID
-            marshalSize += 4;  // this._fixedDatumValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the fixed datum, an enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumID")]
-        public uint FixedDatumID
-        {
-            get
-            {
-                return this._fixedDatumID;
-            }
-
-            set
-            {
-                this._fixedDatumID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Value for the fixed datum
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumValue")]
-        public uint FixedDatumValue
-        {
-            get
-            {
-                return this._fixedDatumValue;
-            }
-
-            set
-            {
-                this._fixedDatumValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatumID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumValue);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._fixedDatumID = dis.ReadUnsignedInt();
-                    this._fixedDatumValue = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FixedDatum>");
-            try
-            {
-                sb.AppendLine("<fixedDatumID type=\"uint\">" + this._fixedDatumID.ToString(CultureInfo.InvariantCulture) + "</fixedDatumID>");
-                sb.AppendLine("<fixedDatumValue type=\"uint\">" + this._fixedDatumValue.ToString(CultureInfo.InvariantCulture) + "</fixedDatumValue>");
-                sb.AppendLine("</FixedDatum>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FixedDatum;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FixedDatum obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._fixedDatumID != obj._fixedDatumID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumValue != obj._fixedDatumValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._fixedDatumID.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/FourByteChunk.cs b/Libs/CSharpDis7/FourByteChunk.cs
deleted file mode 100644
index b459c13..0000000
--- a/Libs/CSharpDis7/FourByteChunk.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// 32 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FourByteChunk
-    {
-        /// <summary>
-        /// four bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[4];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FourByteChunk"/> class.
-        /// </summary>
-        public FourByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FourByteChunk left, FourByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FourByteChunk left, FourByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the four bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FourByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</FourByteChunk>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FourByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FourByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 4) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 4; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-
-            for (int idx = 0; idx < 4; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/FundamentalOperationalData.cs b/Libs/CSharpDis7/FundamentalOperationalData.cs
deleted file mode 100644
index 64f43b3..0000000
--- a/Libs/CSharpDis7/FundamentalOperationalData.cs
+++ /dev/null
@@ -1,565 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Basic operational data for IFF. Section 6.2.40.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FundamentalOperationalData
-    {
-        /// <summary>
-        /// system status
-        /// </summary>
-        private byte _systemStatus;
-
-        /// <summary>
-        /// data field 1
-        /// </summary>
-        private byte _dataField1;
-
-        /// <summary>
-        /// eight boolean fields
-        /// </summary>
-        private byte _informationLayers;
-
-        /// <summary>
-        /// enumeration
-        /// </summary>
-        private byte _dataField2;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter1;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter2;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter3;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter4;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter5;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter6;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FundamentalOperationalData"/> class.
-        /// </summary>
-        public FundamentalOperationalData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FundamentalOperationalData left, FundamentalOperationalData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FundamentalOperationalData left, FundamentalOperationalData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._systemStatus
-            marshalSize += 1;  // this._dataField1
-            marshalSize += 1;  // this._informationLayers
-            marshalSize += 1;  // this._dataField2
-            marshalSize += 2;  // this._parameter1
-            marshalSize += 2;  // this._parameter2
-            marshalSize += 2;  // this._parameter3
-            marshalSize += 2;  // this._parameter4
-            marshalSize += 2;  // this._parameter5
-            marshalSize += 2;  // this._parameter6
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the system status
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "systemStatus")]
-        public byte SystemStatus
-        {
-            get
-            {
-                return this._systemStatus;
-            }
-
-            set
-            {
-                this._systemStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the data field 1
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "dataField1")]
-        public byte DataField1
-        {
-            get
-            {
-                return this._dataField1;
-            }
-
-            set
-            {
-                this._dataField1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the eight boolean fields
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "informationLayers")]
-        public byte InformationLayers
-        {
-            get
-            {
-                return this._informationLayers;
-            }
-
-            set
-            {
-                this._informationLayers = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "dataField2")]
-        public byte DataField2
-        {
-            get
-            {
-                return this._dataField2;
-            }
-
-            set
-            {
-                this._dataField2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter1")]
-        public ushort Parameter1
-        {
-            get
-            {
-                return this._parameter1;
-            }
-
-            set
-            {
-                this._parameter1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter2")]
-        public ushort Parameter2
-        {
-            get
-            {
-                return this._parameter2;
-            }
-
-            set
-            {
-                this._parameter2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter3")]
-        public ushort Parameter3
-        {
-            get
-            {
-                return this._parameter3;
-            }
-
-            set
-            {
-                this._parameter3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter4")]
-        public ushort Parameter4
-        {
-            get
-            {
-                return this._parameter4;
-            }
-
-            set
-            {
-                this._parameter4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter5")]
-        public ushort Parameter5
-        {
-            get
-            {
-                return this._parameter5;
-            }
-
-            set
-            {
-                this._parameter5 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter6")]
-        public ushort Parameter6
-        {
-            get
-            {
-                return this._parameter6;
-            }
-
-            set
-            {
-                this._parameter6 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._systemStatus);
-                    dos.WriteUnsignedByte((byte)this._dataField1);
-                    dos.WriteUnsignedByte((byte)this._informationLayers);
-                    dos.WriteUnsignedByte((byte)this._dataField2);
-                    dos.WriteUnsignedShort((ushort)this._parameter1);
-                    dos.WriteUnsignedShort((ushort)this._parameter2);
-                    dos.WriteUnsignedShort((ushort)this._parameter3);
-                    dos.WriteUnsignedShort((ushort)this._parameter4);
-                    dos.WriteUnsignedShort((ushort)this._parameter5);
-                    dos.WriteUnsignedShort((ushort)this._parameter6);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._systemStatus = dis.ReadUnsignedByte();
-                    this._dataField1 = dis.ReadUnsignedByte();
-                    this._informationLayers = dis.ReadUnsignedByte();
-                    this._dataField2 = dis.ReadUnsignedByte();
-                    this._parameter1 = dis.ReadUnsignedShort();
-                    this._parameter2 = dis.ReadUnsignedShort();
-                    this._parameter3 = dis.ReadUnsignedShort();
-                    this._parameter4 = dis.ReadUnsignedShort();
-                    this._parameter5 = dis.ReadUnsignedShort();
-                    this._parameter6 = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FundamentalOperationalData>");
-            try
-            {
-                sb.AppendLine("<systemStatus type=\"byte\">" + this._systemStatus.ToString(CultureInfo.InvariantCulture) + "</systemStatus>");
-                sb.AppendLine("<dataField1 type=\"byte\">" + this._dataField1.ToString(CultureInfo.InvariantCulture) + "</dataField1>");
-                sb.AppendLine("<informationLayers type=\"byte\">" + this._informationLayers.ToString(CultureInfo.InvariantCulture) + "</informationLayers>");
-                sb.AppendLine("<dataField2 type=\"byte\">" + this._dataField2.ToString(CultureInfo.InvariantCulture) + "</dataField2>");
-                sb.AppendLine("<parameter1 type=\"ushort\">" + this._parameter1.ToString(CultureInfo.InvariantCulture) + "</parameter1>");
-                sb.AppendLine("<parameter2 type=\"ushort\">" + this._parameter2.ToString(CultureInfo.InvariantCulture) + "</parameter2>");
-                sb.AppendLine("<parameter3 type=\"ushort\">" + this._parameter3.ToString(CultureInfo.InvariantCulture) + "</parameter3>");
-                sb.AppendLine("<parameter4 type=\"ushort\">" + this._parameter4.ToString(CultureInfo.InvariantCulture) + "</parameter4>");
-                sb.AppendLine("<parameter5 type=\"ushort\">" + this._parameter5.ToString(CultureInfo.InvariantCulture) + "</parameter5>");
-                sb.AppendLine("<parameter6 type=\"ushort\">" + this._parameter6.ToString(CultureInfo.InvariantCulture) + "</parameter6>");
-                sb.AppendLine("</FundamentalOperationalData>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FundamentalOperationalData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FundamentalOperationalData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._systemStatus != obj._systemStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataField1 != obj._dataField1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._informationLayers != obj._informationLayers)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataField2 != obj._dataField2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter1 != obj._parameter1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter2 != obj._parameter2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter3 != obj._parameter3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter4 != obj._parameter4)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter5 != obj._parameter5)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter6 != obj._parameter6)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._systemStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._dataField1.GetHashCode();
-            result = GenerateHash(result) ^ this._informationLayers.GetHashCode();
-            result = GenerateHash(result) ^ this._dataField2.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter1.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter2.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter3.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter4.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter5.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter6.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/GridAxis.cs b/Libs/CSharpDis7/GridAxis.cs
deleted file mode 100644
index 661f51d..0000000
--- a/Libs/CSharpDis7/GridAxis.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Grid axis record for fixed data. Section 6.2.41
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class GridAxis
-    {
-        /// <summary>
-        /// coordinate of the grid origin or initial value
-        /// </summary>
-        private double _domainInitialXi;
-
-        /// <summary>
-        /// coordinate of the endpoint or final value
-        /// </summary>
-        private double _domainFinalXi;
-
-        /// <summary>
-        /// The number of grid points along the Xi domain axis for the enviornmental state data
-        /// </summary>
-        private ushort _domainPointsXi;
-
-        /// <summary>
-        /// interleaf factor along the domain axis.
-        /// </summary>
-        private byte _interleafFactor;
-
-        /// <summary>
-        /// type of grid axis
-        /// </summary>
-        private byte _axisType;
-
-        /// <summary>
-        /// Number of grid locations along Xi axis
-        /// </summary>
-        private ushort _numberOfPointsOnXiAxis;
-
-        /// <summary>
-        /// initial grid point for the current pdu
-        /// </summary>
-        private ushort _initialIndex;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GridAxis"/> class.
-        /// </summary>
-        public GridAxis()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GridAxis left, GridAxis right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GridAxis left, GridAxis right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 8;  // this._domainInitialXi
-            marshalSize += 8;  // this._domainFinalXi
-            marshalSize += 2;  // this._domainPointsXi
-            marshalSize += 1;  // this._interleafFactor
-            marshalSize += 1;  // this._axisType
-            marshalSize += 2;  // this._numberOfPointsOnXiAxis
-            marshalSize += 2;  // this._initialIndex
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the coordinate of the grid origin or initial value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "domainInitialXi")]
-        public double DomainInitialXi
-        {
-            get
-            {
-                return this._domainInitialXi;
-            }
-
-            set
-            {
-                this._domainInitialXi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the coordinate of the endpoint or final value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "domainFinalXi")]
-        public double DomainFinalXi
-        {
-            get
-            {
-                return this._domainFinalXi;
-            }
-
-            set
-            {
-                this._domainFinalXi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The number of grid points along the Xi domain axis for the enviornmental state data
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "domainPointsXi")]
-        public ushort DomainPointsXi
-        {
-            get
-            {
-                return this._domainPointsXi;
-            }
-
-            set
-            {
-                this._domainPointsXi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the interleaf factor along the domain axis.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "interleafFactor")]
-        public byte InterleafFactor
-        {
-            get
-            {
-                return this._interleafFactor;
-            }
-
-            set
-            {
-                this._interleafFactor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of grid axis
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "axisType")]
-        public byte AxisType
-        {
-            get
-            {
-                return this._axisType;
-            }
-
-            set
-            {
-                this._axisType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of grid locations along Xi axis
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPointsOnXiAxis")]
-        public ushort NumberOfPointsOnXiAxis
-        {
-            get
-            {
-                return this._numberOfPointsOnXiAxis;
-            }
-
-            set
-            {
-                this._numberOfPointsOnXiAxis = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the initial grid point for the current pdu
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "initialIndex")]
-        public ushort InitialIndex
-        {
-            get
-            {
-                return this._initialIndex;
-            }
-
-            set
-            {
-                this._initialIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteDouble((double)this._domainInitialXi);
-                    dos.WriteDouble((double)this._domainFinalXi);
-                    dos.WriteUnsignedShort((ushort)this._domainPointsXi);
-                    dos.WriteUnsignedByte((byte)this._interleafFactor);
-                    dos.WriteUnsignedByte((byte)this._axisType);
-                    dos.WriteUnsignedShort((ushort)this._numberOfPointsOnXiAxis);
-                    dos.WriteUnsignedShort((ushort)this._initialIndex);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._domainInitialXi = dis.ReadDouble();
-                    this._domainFinalXi = dis.ReadDouble();
-                    this._domainPointsXi = dis.ReadUnsignedShort();
-                    this._interleafFactor = dis.ReadUnsignedByte();
-                    this._axisType = dis.ReadUnsignedByte();
-                    this._numberOfPointsOnXiAxis = dis.ReadUnsignedShort();
-                    this._initialIndex = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<GridAxis>");
-            try
-            {
-                sb.AppendLine("<domainInitialXi type=\"double\">" + this._domainInitialXi.ToString(CultureInfo.InvariantCulture) + "</domainInitialXi>");
-                sb.AppendLine("<domainFinalXi type=\"double\">" + this._domainFinalXi.ToString(CultureInfo.InvariantCulture) + "</domainFinalXi>");
-                sb.AppendLine("<domainPointsXi type=\"ushort\">" + this._domainPointsXi.ToString(CultureInfo.InvariantCulture) + "</domainPointsXi>");
-                sb.AppendLine("<interleafFactor type=\"byte\">" + this._interleafFactor.ToString(CultureInfo.InvariantCulture) + "</interleafFactor>");
-                sb.AppendLine("<axisType type=\"byte\">" + this._axisType.ToString(CultureInfo.InvariantCulture) + "</axisType>");
-                sb.AppendLine("<numberOfPointsOnXiAxis type=\"ushort\">" + this._numberOfPointsOnXiAxis.ToString(CultureInfo.InvariantCulture) + "</numberOfPointsOnXiAxis>");
-                sb.AppendLine("<initialIndex type=\"ushort\">" + this._initialIndex.ToString(CultureInfo.InvariantCulture) + "</initialIndex>");
-                sb.AppendLine("</GridAxis>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as GridAxis;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GridAxis obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._domainInitialXi != obj._domainInitialXi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domainFinalXi != obj._domainFinalXi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domainPointsXi != obj._domainPointsXi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._interleafFactor != obj._interleafFactor)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._axisType != obj._axisType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPointsOnXiAxis != obj._numberOfPointsOnXiAxis)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._initialIndex != obj._initialIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._domainInitialXi.GetHashCode();
-            result = GenerateHash(result) ^ this._domainFinalXi.GetHashCode();
-            result = GenerateHash(result) ^ this._domainPointsXi.GetHashCode();
-            result = GenerateHash(result) ^ this._interleafFactor.GetHashCode();
-            result = GenerateHash(result) ^ this._axisType.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPointsOnXiAxis.GetHashCode();
-            result = GenerateHash(result) ^ this._initialIndex.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/GroupIdentifier.cs b/Libs/CSharpDis7/GroupIdentifier.cs
deleted file mode 100644
index 02bc7a2..0000000
--- a/Libs/CSharpDis7/GroupIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Unique designation of a group of entities contained in the isGroupOfPdu. Represents a group of entities rather than a single entity. Section 6.2.43
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class GroupIdentifier
-    {
-        /// <summary>
-        /// Simulation address (site and application number)
-        /// </summary>
-        private EntityType _simulationAddress = new EntityType();
-
-        /// <summary>
-        /// group number
-        /// </summary>
-        private ushort _groupNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GroupIdentifier"/> class.
-        /// </summary>
-        public GroupIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GroupIdentifier left, GroupIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GroupIdentifier left, GroupIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._groupNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Simulation address (site and application number)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "simulationAddress")]
-        public EntityType SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the group number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "groupNumber")]
-        public ushort GroupNumber
-        {
-            get
-            {
-                return this._groupNumber;
-            }
-
-            set
-            {
-                this._groupNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._groupNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._groupNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<GroupIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<groupNumber type=\"ushort\">" + this._groupNumber.ToString(CultureInfo.InvariantCulture) + "</groupNumber>");
-                sb.AppendLine("</GroupIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as GroupIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GroupIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._groupNumber != obj._groupNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._groupNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IFFFundamentalParameterData.cs b/Libs/CSharpDis7/IFFFundamentalParameterData.cs
deleted file mode 100644
index 05c8e57..0000000
--- a/Libs/CSharpDis7/IFFFundamentalParameterData.cs
+++ /dev/null
@@ -1,495 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Fundamental IFF atc data. Section 6.2.45
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class IFFFundamentalParameterData
-    {
-        /// <summary>
-        /// ERP
-        /// </summary>
-        private float _erp;
-
-        /// <summary>
-        /// frequency
-        /// </summary>
-        private float _frequency;
-
-        /// <summary>
-        /// pgrf
-        /// </summary>
-        private float _pgrf;
-
-        /// <summary>
-        /// Pulse width
-        /// </summary>
-        private float _pulseWidth;
-
-        /// <summary>
-        /// Burst length
-        /// </summary>
-        private uint _burstLength;
-
-        /// <summary>
-        /// Applicable modes enumeration
-        /// </summary>
-        private byte _applicableModes;
-
-        /// <summary>
-        /// System-specific data
-        /// </summary>
-        private byte[] _systemSpecificData = new byte[3];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IFFFundamentalParameterData"/> class.
-        /// </summary>
-        public IFFFundamentalParameterData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IFFFundamentalParameterData left, IFFFundamentalParameterData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IFFFundamentalParameterData left, IFFFundamentalParameterData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._erp
-            marshalSize += 4;  // this._frequency
-            marshalSize += 4;  // this._pgrf
-            marshalSize += 4;  // this._pulseWidth
-            marshalSize += 4;  // this._burstLength
-            marshalSize += 1;  // this._applicableModes
-            marshalSize += 3 * 1;  // _systemSpecificData
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ERP
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "erp")]
-        public float Erp
-        {
-            get
-            {
-                return this._erp;
-            }
-
-            set
-            {
-                this._erp = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the frequency
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequency")]
-        public float Frequency
-        {
-            get
-            {
-                return this._frequency;
-            }
-
-            set
-            {
-                this._frequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the pgrf
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pgrf")]
-        public float Pgrf
-        {
-            get
-            {
-                return this._pgrf;
-            }
-
-            set
-            {
-                this._pgrf = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Pulse width
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
-        public float PulseWidth
-        {
-            get
-            {
-                return this._pulseWidth;
-            }
-
-            set
-            {
-                this._pulseWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Burst length
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "burstLength")]
-        public uint BurstLength
-        {
-            get
-            {
-                return this._burstLength;
-            }
-
-            set
-            {
-                this._burstLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Applicable modes enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "applicableModes")]
-        public byte ApplicableModes
-        {
-            get
-            {
-                return this._applicableModes;
-            }
-
-            set
-            {
-                this._applicableModes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the System-specific data
-        /// </summary>
-        [XmlArray(ElementName = "systemSpecificData")]
-        public byte[] SystemSpecificData
-        {
-            get
-            {
-                return this._systemSpecificData;
-            }
-
-            set
-            {
-                this._systemSpecificData = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._erp);
-                    dos.WriteFloat((float)this._frequency);
-                    dos.WriteFloat((float)this._pgrf);
-                    dos.WriteFloat((float)this._pulseWidth);
-                    dos.WriteUnsignedInt((uint)this._burstLength);
-                    dos.WriteUnsignedByte((byte)this._applicableModes);
-
-                    for (int idx = 0; idx < this._systemSpecificData.Length; idx++)
-                    {
-                        dos.WriteUnsignedByte(this._systemSpecificData[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._erp = dis.ReadFloat();
-                    this._frequency = dis.ReadFloat();
-                    this._pgrf = dis.ReadFloat();
-                    this._pulseWidth = dis.ReadFloat();
-                    this._burstLength = dis.ReadUnsignedInt();
-                    this._applicableModes = dis.ReadUnsignedByte();
-                    for (int idx = 0; idx < this._systemSpecificData.Length; idx++)
-                    {
-                        this._systemSpecificData[idx] = dis.ReadUnsignedByte();
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IFFFundamentalParameterData>");
-            try
-            {
-                sb.AppendLine("<erp type=\"float\">" + this._erp.ToString(CultureInfo.InvariantCulture) + "</erp>");
-                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
-                sb.AppendLine("<pgrf type=\"float\">" + this._pgrf.ToString(CultureInfo.InvariantCulture) + "</pgrf>");
-                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
-                sb.AppendLine("<burstLength type=\"uint\">" + this._burstLength.ToString(CultureInfo.InvariantCulture) + "</burstLength>");
-                sb.AppendLine("<applicableModes type=\"byte\">" + this._applicableModes.ToString(CultureInfo.InvariantCulture) + "</applicableModes>");
-                for (int idx = 0; idx < this._systemSpecificData.Length; idx++)
-                {
-                    sb.AppendLine("<systemSpecificData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._systemSpecificData[idx] + "</systemSpecificData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</IFFFundamentalParameterData>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IFFFundamentalParameterData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IFFFundamentalParameterData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._erp != obj._erp)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frequency != obj._frequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pgrf != obj._pgrf)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseWidth != obj._pulseWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._burstLength != obj._burstLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._applicableModes != obj._applicableModes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._systemSpecificData.Length != 3) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 3; idx++)
-                {
-                    if (this._systemSpecificData[idx] != obj._systemSpecificData[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._erp.GetHashCode();
-            result = GenerateHash(result) ^ this._frequency.GetHashCode();
-            result = GenerateHash(result) ^ this._pgrf.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._burstLength.GetHashCode();
-            result = GenerateHash(result) ^ this._applicableModes.GetHashCode();
-
-            for (int idx = 0; idx < 3; idx++)
-            {
-                result = GenerateHash(result) ^ this._systemSpecificData[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IOCommunicationsNode.cs b/Libs/CSharpDis7/IOCommunicationsNode.cs
deleted file mode 100644
index 9fcd7c4..0000000
--- a/Libs/CSharpDis7/IOCommunicationsNode.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// A communications node that is part of a simulted communcations network. Section 6.2.49.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class IOCommunicationsNode
-    {
-        private uint _recordType = 5501;
-
-        private ushort _recordLength = 16;
-
-        private byte _communcationsNodeType;
-
-        private byte _padding;
-
-        private EntityID _communicationsNode = new EntityID();
-
-        private ushort _elementID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IOCommunicationsNode"/> class.
-        /// </summary>
-        public IOCommunicationsNode()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IOCommunicationsNode left, IOCommunicationsNode right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IOCommunicationsNode left, IOCommunicationsNode right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 1;  // this._communcationsNodeType
-            marshalSize += 1;  // this._padding
-            marshalSize += this._communicationsNode.GetMarshalledSize();  // this._communicationsNode
-            marshalSize += 2;  // this._elementID
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "communcationsNodeType")]
-        public byte CommuncationsNodeType
-        {
-            get
-            {
-                return this._communcationsNodeType;
-            }
-
-            set
-            {
-                this._communcationsNodeType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(EntityID), ElementName = "communicationsNode")]
-        public EntityID CommunicationsNode
-        {
-            get
-            {
-                return this._communicationsNode;
-            }
-
-            set
-            {
-                this._communicationsNode = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "elementID")]
-        public ushort ElementID
-        {
-            get
-            {
-                return this._elementID;
-            }
-
-            set
-            {
-                this._elementID = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedByte((byte)this._communcationsNodeType);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                    this._communicationsNode.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._elementID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._communcationsNodeType = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                    this._communicationsNode.Unmarshal(dis);
-                    this._elementID = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IOCommunicationsNode>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<communcationsNodeType type=\"byte\">" + this._communcationsNodeType.ToString(CultureInfo.InvariantCulture) + "</communcationsNodeType>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<communicationsNode>");
-                this._communicationsNode.Reflection(sb);
-                sb.AppendLine("</communicationsNode>");
-                sb.AppendLine("<elementID type=\"ushort\">" + this._elementID.ToString(CultureInfo.InvariantCulture) + "</elementID>");
-                sb.AppendLine("</IOCommunicationsNode>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IOCommunicationsNode;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IOCommunicationsNode obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._communcationsNodeType != obj._communcationsNodeType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._communicationsNode.Equals(obj._communicationsNode))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._elementID != obj._elementID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._communcationsNodeType.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._communicationsNode.GetHashCode();
-            result = GenerateHash(result) ^ this._elementID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IOEffect.cs b/Libs/CSharpDis7/IOEffect.cs
deleted file mode 100644
index 326dd68..0000000
--- a/Libs/CSharpDis7/IOEffect.cs
+++ /dev/null
@@ -1,482 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Effect of IO on an entity. Section 6.2.49.3
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class IOEffect
-    {
-        private uint _recordType = 5500;
-
-        private ushort _recordLength = 16;
-
-        private byte _ioStatus;
-
-        private byte _ioLinkType;
-
-        private EntityID _ioEffect = new EntityID();
-
-        private byte _ioEffectDutyCycle;
-
-        private ushort _ioEffectDuration;
-
-        private ushort _ioProcess;
-
-        private ushort _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IOEffect"/> class.
-        /// </summary>
-        public IOEffect()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IOEffect left, IOEffect right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IOEffect left, IOEffect right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 1;  // this._ioStatus
-            marshalSize += 1;  // this._ioLinkType
-            marshalSize += this._ioEffect.GetMarshalledSize();  // this._ioEffect
-            marshalSize += 1;  // this._ioEffectDutyCycle
-            marshalSize += 2;  // this._ioEffectDuration
-            marshalSize += 2;  // this._ioProcess
-            marshalSize += 2;  // this._padding
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "ioStatus")]
-        public byte IoStatus
-        {
-            get
-            {
-                return this._ioStatus;
-            }
-
-            set
-            {
-                this._ioStatus = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "ioLinkType")]
-        public byte IoLinkType
-        {
-            get
-            {
-                return this._ioLinkType;
-            }
-
-            set
-            {
-                this._ioLinkType = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(EntityID), ElementName = "ioEffect")]
-        public EntityID IoEffect
-        {
-            get
-            {
-                return this._ioEffect;
-            }
-
-            set
-            {
-                this._ioEffect = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "ioEffectDutyCycle")]
-        public byte IoEffectDutyCycle
-        {
-            get
-            {
-                return this._ioEffectDutyCycle;
-            }
-
-            set
-            {
-                this._ioEffectDutyCycle = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "ioEffectDuration")]
-        public ushort IoEffectDuration
-        {
-            get
-            {
-                return this._ioEffectDuration;
-            }
-
-            set
-            {
-                this._ioEffectDuration = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "ioProcess")]
-        public ushort IoProcess
-        {
-            get
-            {
-                return this._ioProcess;
-            }
-
-            set
-            {
-                this._ioProcess = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedByte((byte)this._ioStatus);
-                    dos.WriteUnsignedByte((byte)this._ioLinkType);
-                    this._ioEffect.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._ioEffectDutyCycle);
-                    dos.WriteUnsignedShort((ushort)this._ioEffectDuration);
-                    dos.WriteUnsignedShort((ushort)this._ioProcess);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._ioStatus = dis.ReadUnsignedByte();
-                    this._ioLinkType = dis.ReadUnsignedByte();
-                    this._ioEffect.Unmarshal(dis);
-                    this._ioEffectDutyCycle = dis.ReadUnsignedByte();
-                    this._ioEffectDuration = dis.ReadUnsignedShort();
-                    this._ioProcess = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IOEffect>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<ioStatus type=\"byte\">" + this._ioStatus.ToString(CultureInfo.InvariantCulture) + "</ioStatus>");
-                sb.AppendLine("<ioLinkType type=\"byte\">" + this._ioLinkType.ToString(CultureInfo.InvariantCulture) + "</ioLinkType>");
-                sb.AppendLine("<ioEffect>");
-                this._ioEffect.Reflection(sb);
-                sb.AppendLine("</ioEffect>");
-                sb.AppendLine("<ioEffectDutyCycle type=\"byte\">" + this._ioEffectDutyCycle.ToString(CultureInfo.InvariantCulture) + "</ioEffectDutyCycle>");
-                sb.AppendLine("<ioEffectDuration type=\"ushort\">" + this._ioEffectDuration.ToString(CultureInfo.InvariantCulture) + "</ioEffectDuration>");
-                sb.AppendLine("<ioProcess type=\"ushort\">" + this._ioProcess.ToString(CultureInfo.InvariantCulture) + "</ioProcess>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</IOEffect>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IOEffect;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IOEffect obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ioStatus != obj._ioStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ioLinkType != obj._ioLinkType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._ioEffect.Equals(obj._ioEffect))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ioEffectDutyCycle != obj._ioEffectDutyCycle)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ioEffectDuration != obj._ioEffectDuration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ioProcess != obj._ioProcess)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._ioStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._ioLinkType.GetHashCode();
-            result = GenerateHash(result) ^ this._ioEffect.GetHashCode();
-            result = GenerateHash(result) ^ this._ioEffectDutyCycle.GetHashCode();
-            result = GenerateHash(result) ^ this._ioEffectDuration.GetHashCode();
-            result = GenerateHash(result) ^ this._ioProcess.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IffDataSpecification.cs b/Libs/CSharpDis7/IffDataSpecification.cs
deleted file mode 100644
index 74e753d..0000000
--- a/Libs/CSharpDis7/IffDataSpecification.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Requires hand coding to be useful. Section 6.2.44
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class IffDataSpecification
-    {
-        /// <summary>
-        /// Number of iff records
-        /// </summary>
-        private EntityType _numberOfIffDataRecords = new EntityType();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IffDataSpecification"/> class.
-        /// </summary>
-        public IffDataSpecification()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IffDataSpecification left, IffDataSpecification right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IffDataSpecification left, IffDataSpecification right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._numberOfIffDataRecords.GetMarshalledSize();  // this._numberOfIffDataRecords
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of iff records
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "numberOfIffDataRecords")]
-        public EntityType NumberOfIffDataRecords
-        {
-            get
-            {
-                return this._numberOfIffDataRecords;
-            }
-
-            set
-            {
-                this._numberOfIffDataRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._numberOfIffDataRecords.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfIffDataRecords.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IffDataSpecification>");
-            try
-            {
-                sb.AppendLine("<numberOfIffDataRecords>");
-                this._numberOfIffDataRecords.Reflection(sb);
-                sb.AppendLine("</numberOfIffDataRecords>");
-                sb.AppendLine("</IffDataSpecification>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IffDataSpecification;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IffDataSpecification obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._numberOfIffDataRecords.Equals(obj._numberOfIffDataRecords))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfIffDataRecords.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IntercomCommunicationsParameters.cs b/Libs/CSharpDis7/IntercomCommunicationsParameters.cs
deleted file mode 100644
index bfb68d8..0000000
--- a/Libs/CSharpDis7/IntercomCommunicationsParameters.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Intercom communcations parameters. Section 6.2.47.  This requires hand coding
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class IntercomCommunicationsParameters
-    {
-        /// <summary>
-        /// Type of intercom parameters record
-        /// </summary>
-        private ushort _recordType;
-
-        /// <summary>
-        /// length of record
-        /// </summary>
-        private ushort _recordLength;
-
-        /// <summary>
-        /// This is a placeholder.
-        /// </summary>
-        private uint _recordSpecificField;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IntercomCommunicationsParameters"/> class.
-        /// </summary>
-        public IntercomCommunicationsParameters()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 4;  // this._recordSpecificField
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of intercom parameters record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordType")]
-        public ushort RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length of record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This is a placeholder.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordSpecificField")]
-        public uint RecordSpecificField
-        {
-            get
-            {
-                return this._recordSpecificField;
-            }
-
-            set
-            {
-                this._recordSpecificField = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedInt((uint)this._recordSpecificField);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedShort();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._recordSpecificField = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IntercomCommunicationsParameters>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"ushort\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<recordSpecificField type=\"uint\">" + this._recordSpecificField.ToString(CultureInfo.InvariantCulture) + "</recordSpecificField>");
-                sb.AppendLine("</IntercomCommunicationsParameters>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IntercomCommunicationsParameters;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IntercomCommunicationsParameters obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSpecificField != obj._recordSpecificField)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._recordSpecificField.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IntercomIdentifier.cs b/Libs/CSharpDis7/IntercomIdentifier.cs
deleted file mode 100644
index 68a1a3b..0000000
--- a/Libs/CSharpDis7/IntercomIdentifier.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Unique designation of an attached or unattached intercom in an event or exercirse. Section 6.2.48
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class IntercomIdentifier
-    {
-        private ushort _siteNumber;
-
-        private ushort _applicationNumber;
-
-        private ushort _referenceNumber;
-
-        private ushort _intercomNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IntercomIdentifier"/> class.
-        /// </summary>
-        public IntercomIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IntercomIdentifier left, IntercomIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IntercomIdentifier left, IntercomIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._siteNumber
-            marshalSize += 2;  // this._applicationNumber
-            marshalSize += 2;  // this._referenceNumber
-            marshalSize += 2;  // this._intercomNumber
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "siteNumber")]
-        public ushort SiteNumber
-        {
-            get
-            {
-                return this._siteNumber;
-            }
-
-            set
-            {
-                this._siteNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "applicationNumber")]
-        public ushort ApplicationNumber
-        {
-            get
-            {
-                return this._applicationNumber;
-            }
-
-            set
-            {
-                this._applicationNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
-        public ushort ReferenceNumber
-        {
-            get
-            {
-                return this._referenceNumber;
-            }
-
-            set
-            {
-                this._referenceNumber = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "intercomNumber")]
-        public ushort IntercomNumber
-        {
-            get
-            {
-                return this._intercomNumber;
-            }
-
-            set
-            {
-                this._intercomNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._siteNumber);
-                    dos.WriteUnsignedShort((ushort)this._applicationNumber);
-                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
-                    dos.WriteUnsignedShort((ushort)this._intercomNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._siteNumber = dis.ReadUnsignedShort();
-                    this._applicationNumber = dis.ReadUnsignedShort();
-                    this._referenceNumber = dis.ReadUnsignedShort();
-                    this._intercomNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IntercomIdentifier>");
-            try
-            {
-                sb.AppendLine("<siteNumber type=\"ushort\">" + this._siteNumber.ToString(CultureInfo.InvariantCulture) + "</siteNumber>");
-                sb.AppendLine("<applicationNumber type=\"ushort\">" + this._applicationNumber.ToString(CultureInfo.InvariantCulture) + "</applicationNumber>");
-                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
-                sb.AppendLine("<intercomNumber type=\"ushort\">" + this._intercomNumber.ToString(CultureInfo.InvariantCulture) + "</intercomNumber>");
-                sb.AppendLine("</IntercomIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IntercomIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IntercomIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._siteNumber != obj._siteNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._applicationNumber != obj._applicationNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._referenceNumber != obj._referenceNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._intercomNumber != obj._intercomNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._siteNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._applicationNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._intercomNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IntercomSignalPdu.cs b/Libs/CSharpDis7/IntercomSignalPdu.cs
deleted file mode 100644
index e4e952e..0000000
--- a/Libs/CSharpDis7/IntercomSignalPdu.cs
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Actual transmission of intercome voice data. Section 7.7.5. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(OneByteChunk))]
-    public partial class IntercomSignalPdu : RadioCommunicationsFamilyPdu, IEquatable<IntercomSignalPdu>
-    {
-        /// <summary>
-        /// entity ID
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// ID of communications device
-        /// </summary>
-        private ushort _communicationsDeviceID;
-
-        /// <summary>
-        /// encoding scheme
-        /// </summary>
-        private ushort _encodingScheme;
-
-        /// <summary>
-        /// tactical data link type
-        /// </summary>
-        private ushort _tdlType;
-
-        /// <summary>
-        /// sample rate
-        /// </summary>
-        private uint _sampleRate;
-
-        /// <summary>
-        /// data length
-        /// </summary>
-        private ushort _dataLength;
-
-        /// <summary>
-        /// samples
-        /// </summary>
-        private ushort _samples;
-
-        /// <summary>
-        /// data bytes
-        /// </summary>
-        private byte[] _data; 
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IntercomSignalPdu"/> class.
-        /// </summary>
-        public IntercomSignalPdu()
-        {
-            PduType = (byte)31;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IntercomSignalPdu left, IntercomSignalPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IntercomSignalPdu left, IntercomSignalPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 2;  // this._communicationsDeviceID
-            marshalSize += 2;  // this._encodingScheme
-            marshalSize += 2;  // this._tdlType
-            marshalSize += 4;  // this._sampleRate
-            marshalSize += 2;  // this._dataLength
-            marshalSize += 2;  // this._samples
-            marshalSize += this._data.Length;
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of communications device
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "communicationsDeviceID")]
-        public ushort CommunicationsDeviceID
-        {
-            get
-            {
-                return this._communicationsDeviceID;
-            }
-
-            set
-            {
-                this._communicationsDeviceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the encoding scheme
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
-        public ushort EncodingScheme
-        {
-            get
-            {
-                return this._encodingScheme;
-            }
-
-            set
-            {
-                this._encodingScheme = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tactical data link type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
-        public ushort TdlType
-        {
-            get
-            {
-                return this._tdlType;
-            }
-
-            set
-            {
-                this._tdlType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the sample rate
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
-        public uint SampleRate
-        {
-            get
-            {
-                return this._sampleRate;
-            }
-
-            set
-            {
-                this._sampleRate = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getdataLength method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "dataLength")]
-        public ushort DataLength
-        {
-            get
-            {
-                return this._dataLength;
-            }
-
-            set
-            {
-                this._dataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the samples
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "samples")]
-        public ushort Samples
-        {
-            get
-            {
-                return this._samples;
-            }
-
-            set
-            {
-                this._samples = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the data bytes
-        /// </summary>
-        [XmlElement(ElementName = "dataList", DataType = "hexBinary")]
-        public byte[] Data
-        {
-            get
-            {
-                return this._data;
-            }
-
-            set
-            {
-                this._data = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._communicationsDeviceID);
-                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
-                    dos.WriteUnsignedShort((ushort)this._tdlType);
-                    dos.WriteUnsignedInt((uint)this._sampleRate);
-                    dos.WriteUnsignedShort((ushort)this._data.Length);
-                    dos.WriteUnsignedShort((ushort)this._samples);
-                    dos.WriteByte (this._data);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._communicationsDeviceID = dis.ReadUnsignedShort();
-                    this._encodingScheme = dis.ReadUnsignedShort();
-                    this._tdlType = dis.ReadUnsignedShort();
-                    this._sampleRate = dis.ReadUnsignedInt();
-                    this._dataLength = dis.ReadUnsignedShort();
-                    this._samples = dis.ReadUnsignedShort();
-                    this._data = dis.ReadByteArray(this._dataLength);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IntercomSignalPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<communicationsDeviceID type=\"ushort\">" + this._communicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</communicationsDeviceID>");
-                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
-                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
-                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
-                sb.AppendLine("<data type=\"ushort\">" + this._data.Length.ToString(CultureInfo.InvariantCulture) + "</data>");
-                sb.AppendLine("<samples type=\"ushort\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
-                sb.AppendLine("<data type=\"byte[]\">");
-                foreach (byte b in this._data)
-                {
-                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
-                }
-
-                sb.AppendLine("</data>");
-
-                sb.AppendLine("</IntercomSignalPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IntercomSignalPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IntercomSignalPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._communicationsDeviceID != obj._communicationsDeviceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._encodingScheme != obj._encodingScheme)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._tdlType != obj._tdlType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sampleRate != obj._sampleRate)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataLength != obj._dataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._samples != obj._samples)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._data.Equals(obj._data))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._communicationsDeviceID.GetHashCode();
-            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
-            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
-            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
-            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._samples.GetHashCode();
-
-            if (this._data.Length > 0)
-            {
-                for (int idx = 0; idx < this._data.Length; idx++)
-                {
-                    result = GenerateHash(result) ^ this._data[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/IsPartOfPdu.cs b/Libs/CSharpDis7/IsPartOfPdu.cs
deleted file mode 100644
index de30790..0000000
--- a/Libs/CSharpDis7/IsPartOfPdu.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  The joining of two or more simulation entities is communicated by this PDU. Section 7.8.5 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Relationship))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(NamedLocationIdentification))]
-    [XmlInclude(typeof(EntityType))]
-    public partial class IsPartOfPdu : EntityManagementFamilyPdu, IEquatable<IsPartOfPdu>
-    {
-        /// <summary>
-        /// ID of entity originating PDU
-        /// </summary>
-        private EntityID _orginatingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of entity receiving PDU
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// relationship of joined parts
-        /// </summary>
-        private Relationship _relationship = new Relationship();
-
-        /// <summary>
-        /// location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
-        /// </summary>
-        private Vector3Float _partLocation = new Vector3Float();
-
-        /// <summary>
-        /// named location
-        /// </summary>
-        private NamedLocationIdentification _namedLocationID = new NamedLocationIdentification();
-
-        /// <summary>
-        /// entity type
-        /// </summary>
-        private EntityType _partEntityType = new EntityType();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IsPartOfPdu"/> class.
-        /// </summary>
-        public IsPartOfPdu()
-        {
-            PduType = (byte)36;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IsPartOfPdu left, IsPartOfPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IsPartOfPdu left, IsPartOfPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._relationship.GetMarshalledSize();  // this._relationship
-            marshalSize += this._partLocation.GetMarshalledSize();  // this._partLocation
-            marshalSize += this._namedLocationID.GetMarshalledSize();  // this._namedLocationID
-            marshalSize += this._partEntityType.GetMarshalledSize();  // this._partEntityType
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity originating PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
-        public EntityID OrginatingEntityID
-        {
-            get
-            {
-                return this._orginatingEntityID;
-            }
-
-            set
-            {
-                this._orginatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity receiving PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the relationship of joined parts
-        /// </summary>
-        [XmlElement(Type = typeof(Relationship), ElementName = "relationship")]
-        public Relationship Relationship
-        {
-            get
-            {
-                return this._relationship;
-            }
-
-            set
-            {
-                this._relationship = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "partLocation")]
-        public Vector3Float PartLocation
-        {
-            get
-            {
-                return this._partLocation;
-            }
-
-            set
-            {
-                this._partLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the named location
-        /// </summary>
-        [XmlElement(Type = typeof(NamedLocationIdentification), ElementName = "namedLocationID")]
-        public NamedLocationIdentification NamedLocationID
-        {
-            get
-            {
-                return this._namedLocationID;
-            }
-
-            set
-            {
-                this._namedLocationID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the entity type
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "partEntityType")]
-        public EntityType PartEntityType
-        {
-            get
-            {
-                return this._partEntityType;
-            }
-
-            set
-            {
-                this._partEntityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Marshal(dos);
-                    this._receivingEntityID.Marshal(dos);
-                    this._relationship.Marshal(dos);
-                    this._partLocation.Marshal(dos);
-                    this._namedLocationID.Marshal(dos);
-                    this._partEntityType.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Unmarshal(dis);
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._relationship.Unmarshal(dis);
-                    this._partLocation.Unmarshal(dis);
-                    this._namedLocationID.Unmarshal(dis);
-                    this._partEntityType.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IsPartOfPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<orginatingEntityID>");
-                this._orginatingEntityID.Reflection(sb);
-                sb.AppendLine("</orginatingEntityID>");
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<relationship>");
-                this._relationship.Reflection(sb);
-                sb.AppendLine("</relationship>");
-                sb.AppendLine("<partLocation>");
-                this._partLocation.Reflection(sb);
-                sb.AppendLine("</partLocation>");
-                sb.AppendLine("<namedLocationID>");
-                this._namedLocationID.Reflection(sb);
-                sb.AppendLine("</namedLocationID>");
-                sb.AppendLine("<partEntityType>");
-                this._partEntityType.Reflection(sb);
-                sb.AppendLine("</partEntityType>");
-                sb.AppendLine("</IsPartOfPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IsPartOfPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IsPartOfPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._relationship.Equals(obj._relationship))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._partLocation.Equals(obj._partLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._namedLocationID.Equals(obj._namedLocationID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._partEntityType.Equals(obj._partEntityType))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._relationship.GetHashCode();
-            result = GenerateHash(result) ^ this._partLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._namedLocationID.GetHashCode();
-            result = GenerateHash(result) ^ this._partEntityType.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/JammingTechnique.cs b/Libs/CSharpDis7/JammingTechnique.cs
deleted file mode 100644
index bed5994..0000000
--- a/Libs/CSharpDis7/JammingTechnique.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Jamming technique. Section 6.2.50
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class JammingTechnique
-    {
-        private byte _kind;
-
-        private byte _category;
-
-        private byte _subcategory;
-
-        private byte _specific;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JammingTechnique"/> class.
-        /// </summary>
-        public JammingTechnique()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(JammingTechnique left, JammingTechnique right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(JammingTechnique left, JammingTechnique right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._kind
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "kind")]
-        public byte Kind
-        {
-            get
-            {
-                return this._kind;
-            }
-
-            set
-            {
-                this._kind = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._kind);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._kind = dis.ReadUnsignedByte();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<JammingTechnique>");
-            try
-            {
-                sb.AppendLine("<kind type=\"byte\">" + this._kind.ToString(CultureInfo.InvariantCulture) + "</kind>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("</JammingTechnique>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as JammingTechnique;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(JammingTechnique obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._kind != obj._kind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._kind.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LaunchedMunitionRecord.cs b/Libs/CSharpDis7/LaunchedMunitionRecord.cs
deleted file mode 100644
index 8bbb052..0000000
--- a/Libs/CSharpDis7/LaunchedMunitionRecord.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Identity of a communications node. Section 6.2.51
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EventIdentifier))]
-    [XmlInclude(typeof(Vector3Double))]
-    public partial class LaunchedMunitionRecord
-    {
-        private EventIdentifier _fireEventID = new EventIdentifier();
-
-        private ushort _padding;
-
-        private EventIdentifier _firingEntityID = new EventIdentifier();
-
-        private ushort _padding2;
-
-        private EventIdentifier _targetEntityID = new EventIdentifier();
-
-        private ushort _padding3;
-
-        private Vector3Double _targetLocation = new Vector3Double();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LaunchedMunitionRecord"/> class.
-        /// </summary>
-        public LaunchedMunitionRecord()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LaunchedMunitionRecord left, LaunchedMunitionRecord right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LaunchedMunitionRecord left, LaunchedMunitionRecord right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._fireEventID.GetMarshalledSize();  // this._fireEventID
-            marshalSize += 2;  // this._padding
-            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
-            marshalSize += 2;  // this._padding2
-            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
-            marshalSize += 2;  // this._padding3
-            marshalSize += this._targetLocation.GetMarshalledSize();  // this._targetLocation
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "fireEventID")]
-        public EventIdentifier FireEventID
-        {
-            get
-            {
-                return this._fireEventID;
-            }
-
-            set
-            {
-                this._fireEventID = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "firingEntityID")]
-        public EventIdentifier FiringEntityID
-        {
-            get
-            {
-                return this._firingEntityID;
-            }
-
-            set
-            {
-                this._firingEntityID = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
-        public ushort Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "targetEntityID")]
-        public EventIdentifier TargetEntityID
-        {
-            get
-            {
-                return this._targetEntityID;
-            }
-
-            set
-            {
-                this._targetEntityID = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(ushort), ElementName = "padding3")]
-        public ushort Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "targetLocation")]
-        public Vector3Double TargetLocation
-        {
-            get
-            {
-                return this._targetLocation;
-            }
-
-            set
-            {
-                this._targetLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._fireEventID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                    this._firingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding2);
-                    this._targetEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding3);
-                    this._targetLocation.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._fireEventID.Unmarshal(dis);
-                    this._padding = dis.ReadUnsignedShort();
-                    this._firingEntityID.Unmarshal(dis);
-                    this._padding2 = dis.ReadUnsignedShort();
-                    this._targetEntityID.Unmarshal(dis);
-                    this._padding3 = dis.ReadUnsignedShort();
-                    this._targetLocation.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LaunchedMunitionRecord>");
-            try
-            {
-                sb.AppendLine("<fireEventID>");
-                this._fireEventID.Reflection(sb);
-                sb.AppendLine("</fireEventID>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("<firingEntityID>");
-                this._firingEntityID.Reflection(sb);
-                sb.AppendLine("</firingEntityID>");
-                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<targetEntityID>");
-                this._targetEntityID.Reflection(sb);
-                sb.AppendLine("</targetEntityID>");
-                sb.AppendLine("<padding3 type=\"ushort\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                sb.AppendLine("<targetLocation>");
-                this._targetLocation.Reflection(sb);
-                sb.AppendLine("</targetLocation>");
-                sb.AppendLine("</LaunchedMunitionRecord>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LaunchedMunitionRecord;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LaunchedMunitionRecord obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._fireEventID.Equals(obj._fireEventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._firingEntityID.Equals(obj._firingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetEntityID.Equals(obj._targetEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetLocation.Equals(obj._targetLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._fireEventID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-            result = GenerateHash(result) ^ this._targetLocation.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LayerHeader.cs b/Libs/CSharpDis7/LayerHeader.cs
deleted file mode 100644
index aedfeaf..0000000
--- a/Libs/CSharpDis7/LayerHeader.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The identification of the additional information layer number, layer-specific information, and the length of the layer. Section 6.2.52
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class LayerHeader
-    {
-        private byte _layerNumber;
-
-        /// <summary>
-        /// field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number.
-        /// </summary>
-        private byte _layerSpecificInformation;
-
-        /// <summary>
-        /// This field shall specify the length in octets of the layer, including the Layer Header record
-        /// </summary>
-        private ushort _length;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LayerHeader"/> class.
-        /// </summary>
-        public LayerHeader()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LayerHeader left, LayerHeader right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LayerHeader left, LayerHeader right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._layerNumber
-            marshalSize += 1;  // this._layerSpecificInformation
-            marshalSize += 2;  // this._length
-            return marshalSize;
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "layerNumber")]
-        public byte LayerNumber
-        {
-            get
-            {
-                return this._layerNumber;
-            }
-
-            set
-            {
-                this._layerNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "layerSpecificInformation")]
-        public byte LayerSpecificInformation
-        {
-            get
-            {
-                return this._layerSpecificInformation;
-            }
-
-            set
-            {
-                this._layerSpecificInformation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the length in octets of the layer, including the Layer Header record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "length")]
-        public ushort Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._layerNumber);
-                    dos.WriteUnsignedByte((byte)this._layerSpecificInformation);
-                    dos.WriteUnsignedShort((ushort)this._length);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._layerNumber = dis.ReadUnsignedByte();
-                    this._layerSpecificInformation = dis.ReadUnsignedByte();
-                    this._length = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LayerHeader>");
-            try
-            {
-                sb.AppendLine("<layerNumber type=\"byte\">" + this._layerNumber.ToString(CultureInfo.InvariantCulture) + "</layerNumber>");
-                sb.AppendLine("<layerSpecificInformation type=\"byte\">" + this._layerSpecificInformation.ToString(CultureInfo.InvariantCulture) + "</layerSpecificInformation>");
-                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("</LayerHeader>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LayerHeader;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LayerHeader obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._layerNumber != obj._layerNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._layerSpecificInformation != obj._layerSpecificInformation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._layerNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._layerSpecificInformation.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LinearObjectStatePdu.cs b/Libs/CSharpDis7/LinearObjectStatePdu.cs
deleted file mode 100644
index d73ebc9..0000000
--- a/Libs/CSharpDis7/LinearObjectStatePdu.cs
+++ /dev/null
@@ -1,589 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// : Information abut the addition or modification of a synthecic enviroment object that      is anchored to the terrain with a single point and has size or orientation. Section 7.10.5 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SimulationAddress))]
-    [XmlInclude(typeof(ObjectType))]
-    [XmlInclude(typeof(LinearSegmentParameter))]
-    public partial class LinearObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<LinearObjectStatePdu>
-    {
-        /// <summary>
-        /// Object in synthetic environment
-        /// </summary>
-        private EntityID _objectID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _referencedObjectID = new EntityID();
-
-        /// <summary>
-        /// unique update number of each state transition of an object
-        /// </summary>
-        private ushort _updateNumber;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// number of linear segment parameters
-        /// </summary>
-        private byte _numberOfSegments;
-
-        /// <summary>
-        /// requesterID
-        /// </summary>
-        private SimulationAddress _requesterID = new SimulationAddress();
-
-        /// <summary>
-        /// receiver ID
-        /// </summary>
-        private SimulationAddress _receivingID = new SimulationAddress();
-
-        /// <summary>
-        /// Object type
-        /// </summary>
-        private ObjectType _objectType = new ObjectType();
-
-        /// <summary>
-        /// Linear segment parameters
-        /// </summary>
-        private List<LinearSegmentParameter> _linearSegmentParameters = new List<LinearSegmentParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinearObjectStatePdu"/> class.
-        /// </summary>
-        public LinearObjectStatePdu()
-        {
-            PduType = (byte)44;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LinearObjectStatePdu left, LinearObjectStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LinearObjectStatePdu left, LinearObjectStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
-            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
-            marshalSize += 2;  // this._updateNumber
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._numberOfSegments
-            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
-            for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-            {
-                LinearSegmentParameter listElement = (LinearSegmentParameter)this._linearSegmentParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object in synthetic environment
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
-        public EntityID ObjectID
-        {
-            get
-            {
-                return this._objectID;
-            }
-
-            set
-            {
-                this._objectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
-        public EntityID ReferencedObjectID
-        {
-            get
-            {
-                return this._referencedObjectID;
-            }
-
-            set
-            {
-                this._referencedObjectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique update number of each state transition of an object
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
-        public ushort UpdateNumber
-        {
-            get
-            {
-                return this._updateNumber;
-            }
-
-            set
-            {
-                this._updateNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSegments method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSegments")]
-        public byte NumberOfSegments
-        {
-            get
-            {
-                return this._numberOfSegments;
-            }
-
-            set
-            {
-                this._numberOfSegments = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the requesterID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
-        public SimulationAddress RequesterID
-        {
-            get
-            {
-                return this._requesterID;
-            }
-
-            set
-            {
-                this._requesterID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receiver ID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
-        public SimulationAddress ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object type
-        /// </summary>
-        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
-        public ObjectType ObjectType
-        {
-            get
-            {
-                return this._objectType;
-            }
-
-            set
-            {
-                this._objectType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Linear segment parameters
-        /// </summary>
-        [XmlElement(ElementName = "linearSegmentParametersList", Type = typeof(List<LinearSegmentParameter>))]
-        public List<LinearSegmentParameter> LinearSegmentParameters
-        {
-            get
-            {
-                return this._linearSegmentParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._objectID.Marshal(dos);
-                    this._referencedObjectID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._updateNumber);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._linearSegmentParameters.Count);
-                    this._requesterID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    this._objectType.Marshal(dos);
-
-                    for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                    {
-                        LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
-                        aLinearSegmentParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._objectID.Unmarshal(dis);
-                    this._referencedObjectID.Unmarshal(dis);
-                    this._updateNumber = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._numberOfSegments = dis.ReadUnsignedByte();
-                    this._requesterID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._objectType.Unmarshal(dis);
-                    for (int idx = 0; idx < this.NumberOfSegments; idx++)
-                    {
-                        LinearSegmentParameter anX = new LinearSegmentParameter();
-                        anX.Unmarshal(dis);
-                        this._linearSegmentParameters.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LinearObjectStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<objectID>");
-                this._objectID.Reflection(sb);
-                sb.AppendLine("</objectID>");
-                sb.AppendLine("<referencedObjectID>");
-                this._referencedObjectID.Reflection(sb);
-                sb.AppendLine("</referencedObjectID>");
-                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<linearSegmentParameters type=\"byte\">" + this._linearSegmentParameters.Count.ToString(CultureInfo.InvariantCulture) + "</linearSegmentParameters>");
-                sb.AppendLine("<requesterID>");
-                this._requesterID.Reflection(sb);
-                sb.AppendLine("</requesterID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<objectType>");
-                this._objectType.Reflection(sb);
-                sb.AppendLine("</objectType>");
-                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                {
-                    sb.AppendLine("<linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"LinearSegmentParameter\">");
-                    LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
-                    aLinearSegmentParameter.Reflection(sb);
-                    sb.AppendLine("</linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</LinearObjectStatePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LinearObjectStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LinearObjectStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._objectID.Equals(obj._objectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._updateNumber != obj._updateNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSegments != obj._numberOfSegments)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requesterID.Equals(obj._requesterID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectType.Equals(obj._objectType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._linearSegmentParameters.Count != obj._linearSegmentParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                {
-                    if (!this._linearSegmentParameters[idx].Equals(obj._linearSegmentParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._objectID.GetHashCode();
-            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
-            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSegments.GetHashCode();
-            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._objectType.GetHashCode();
-
-            if (this._linearSegmentParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._linearSegmentParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LinearSegmentParameter.cs b/Libs/CSharpDis7/LinearSegmentParameter.cs
deleted file mode 100644
index 7e037b5..0000000
--- a/Libs/CSharpDis7/LinearSegmentParameter.cs
+++ /dev/null
@@ -1,571 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The specification of an individual segment of a linear segment synthetic environment object in a Linear Object State PDU Section 6.2.53
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(EulerAngles))]
-    public partial class LinearSegmentParameter
-    {
-        /// <summary>
-        /// the individual segment of the linear segment 
-        /// </summary>
-        private byte _segmentNumber;
-
-        /// <summary>
-        ///  whether a modification has been made to the point object’s location or orientation
-        /// </summary>
-        private byte _segmentModification;
-
-        /// <summary>
-        /// general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010.
-        /// </summary>
-        private ushort _generalSegmentAppearance;
-
-        /// <summary>
-        /// This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations.
-        /// </summary>
-        private ushort _specificSegmentAppearance;
-
-        /// <summary>
-        /// This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record 
-        /// </summary>
-        private Vector3Double _segmentLocation = new Vector3Double();
-
-        /// <summary>
-        /// orientation of the linear segment about the segment location and shall be represented by a Euler Angles record 
-        /// </summary>
-        private EulerAngles _segmentOrientation = new EulerAngles();
-
-        /// <summary>
-        /// length of the linear segment, in meters, extending in the positive X direction
-        /// </summary>
-        private ushort _segmentLength;
-
-        /// <summary>
-        /// The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction.
-        /// </summary>
-        private ushort _segmentWidth;
-
-        /// <summary>
-        /// The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer.
-        /// </summary>
-        private ushort _segmentHeight;
-
-        /// <summary>
-        /// The depth of the linear segment, in meters, below ground level 
-        /// </summary>
-        private ushort _segmentDepth;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinearSegmentParameter"/> class.
-        /// </summary>
-        public LinearSegmentParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LinearSegmentParameter left, LinearSegmentParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LinearSegmentParameter left, LinearSegmentParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._segmentNumber
-            marshalSize += 1;  // this._segmentModification
-            marshalSize += 2;  // this._generalSegmentAppearance
-            marshalSize += 2;  // this._specificSegmentAppearance
-            marshalSize += this._segmentLocation.GetMarshalledSize();  // this._segmentLocation
-            marshalSize += this._segmentOrientation.GetMarshalledSize();  // this._segmentOrientation
-            marshalSize += 2;  // this._segmentLength
-            marshalSize += 2;  // this._segmentWidth
-            marshalSize += 2;  // this._segmentHeight
-            marshalSize += 2;  // this._segmentDepth
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the individual segment of the linear segment 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "segmentNumber")]
-        public byte SegmentNumber
-        {
-            get
-            {
-                return this._segmentNumber;
-            }
-
-            set
-            {
-                this._segmentNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  whether a modification has been made to the point object’s location or orientation
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "segmentModification")]
-        public byte SegmentModification
-        {
-            get
-            {
-                return this._segmentModification;
-            }
-
-            set
-            {
-                this._segmentModification = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "generalSegmentAppearance")]
-        public ushort GeneralSegmentAppearance
-        {
-            get
-            {
-                return this._generalSegmentAppearance;
-            }
-
-            set
-            {
-                this._generalSegmentAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "specificSegmentAppearance")]
-        public ushort SpecificSegmentAppearance
-        {
-            get
-            {
-                return this._specificSegmentAppearance;
-            }
-
-            set
-            {
-                this._specificSegmentAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record 
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "segmentLocation")]
-        public Vector3Double SegmentLocation
-        {
-            get
-            {
-                return this._segmentLocation;
-            }
-
-            set
-            {
-                this._segmentLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the orientation of the linear segment about the segment location and shall be represented by a Euler Angles record 
-        /// </summary>
-        [XmlElement(Type = typeof(EulerAngles), ElementName = "segmentOrientation")]
-        public EulerAngles SegmentOrientation
-        {
-            get
-            {
-                return this._segmentOrientation;
-            }
-
-            set
-            {
-                this._segmentOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length of the linear segment, in meters, extending in the positive X direction
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentLength")]
-        public ushort SegmentLength
-        {
-            get
-            {
-                return this._segmentLength;
-            }
-
-            set
-            {
-                this._segmentLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentWidth")]
-        public ushort SegmentWidth
-        {
-            get
-            {
-                return this._segmentWidth;
-            }
-
-            set
-            {
-                this._segmentWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentHeight")]
-        public ushort SegmentHeight
-        {
-            get
-            {
-                return this._segmentHeight;
-            }
-
-            set
-            {
-                this._segmentHeight = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The depth of the linear segment, in meters, below ground level 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentDepth")]
-        public ushort SegmentDepth
-        {
-            get
-            {
-                return this._segmentDepth;
-            }
-
-            set
-            {
-                this._segmentDepth = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._segmentNumber);
-                    dos.WriteUnsignedByte((byte)this._segmentModification);
-                    dos.WriteUnsignedShort((ushort)this._generalSegmentAppearance);
-                    dos.WriteUnsignedShort((ushort)this._specificSegmentAppearance);
-                    this._segmentLocation.Marshal(dos);
-                    this._segmentOrientation.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._segmentLength);
-                    dos.WriteUnsignedShort((ushort)this._segmentWidth);
-                    dos.WriteUnsignedShort((ushort)this._segmentHeight);
-                    dos.WriteUnsignedShort((ushort)this._segmentDepth);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._segmentNumber = dis.ReadUnsignedByte();
-                    this._segmentModification = dis.ReadUnsignedByte();
-                    this._generalSegmentAppearance = dis.ReadUnsignedShort();
-                    this._specificSegmentAppearance = dis.ReadUnsignedShort();
-                    this._segmentLocation.Unmarshal(dis);
-                    this._segmentOrientation.Unmarshal(dis);
-                    this._segmentLength = dis.ReadUnsignedShort();
-                    this._segmentWidth = dis.ReadUnsignedShort();
-                    this._segmentHeight = dis.ReadUnsignedShort();
-                    this._segmentDepth = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LinearSegmentParameter>");
-            try
-            {
-                sb.AppendLine("<segmentNumber type=\"byte\">" + this._segmentNumber.ToString(CultureInfo.InvariantCulture) + "</segmentNumber>");
-                sb.AppendLine("<segmentModification type=\"byte\">" + this._segmentModification.ToString(CultureInfo.InvariantCulture) + "</segmentModification>");
-                sb.AppendLine("<generalSegmentAppearance type=\"ushort\">" + this._generalSegmentAppearance.ToString(CultureInfo.InvariantCulture) + "</generalSegmentAppearance>");
-                sb.AppendLine("<specificSegmentAppearance type=\"ushort\">" + this._specificSegmentAppearance.ToString(CultureInfo.InvariantCulture) + "</specificSegmentAppearance>");
-                sb.AppendLine("<segmentLocation>");
-                this._segmentLocation.Reflection(sb);
-                sb.AppendLine("</segmentLocation>");
-                sb.AppendLine("<segmentOrientation>");
-                this._segmentOrientation.Reflection(sb);
-                sb.AppendLine("</segmentOrientation>");
-                sb.AppendLine("<segmentLength type=\"ushort\">" + this._segmentLength.ToString(CultureInfo.InvariantCulture) + "</segmentLength>");
-                sb.AppendLine("<segmentWidth type=\"ushort\">" + this._segmentWidth.ToString(CultureInfo.InvariantCulture) + "</segmentWidth>");
-                sb.AppendLine("<segmentHeight type=\"ushort\">" + this._segmentHeight.ToString(CultureInfo.InvariantCulture) + "</segmentHeight>");
-                sb.AppendLine("<segmentDepth type=\"ushort\">" + this._segmentDepth.ToString(CultureInfo.InvariantCulture) + "</segmentDepth>");
-                sb.AppendLine("</LinearSegmentParameter>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LinearSegmentParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LinearSegmentParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._segmentNumber != obj._segmentNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentModification != obj._segmentModification)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._generalSegmentAppearance != obj._generalSegmentAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specificSegmentAppearance != obj._specificSegmentAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._segmentLocation.Equals(obj._segmentLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._segmentOrientation.Equals(obj._segmentOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentLength != obj._segmentLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentWidth != obj._segmentWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentHeight != obj._segmentHeight)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentDepth != obj._segmentDepth)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._segmentNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentModification.GetHashCode();
-            result = GenerateHash(result) ^ this._generalSegmentAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._specificSegmentAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentLength.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentHeight.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentDepth.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LiveEntityIdentifier.cs b/Libs/CSharpDis7/LiveEntityIdentifier.cs
deleted file mode 100644
index 0e93889..0000000
--- a/Libs/CSharpDis7/LiveEntityIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of each entity in an event or exercise that is contained in a Live Entity PDU. Section 6.2.54 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(LiveSimulationAddress))]
-    public partial class LiveEntityIdentifier
-    {
-        /// <summary>
-        /// Live Simulation Address record (see 6.2.55) 
-        /// </summary>
-        private LiveSimulationAddress _liveSimulationAddress = new LiveSimulationAddress();
-
-        /// <summary>
-        /// Live entity number 
-        /// </summary>
-        private ushort _entityNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LiveEntityIdentifier"/> class.
-        /// </summary>
-        public LiveEntityIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LiveEntityIdentifier left, LiveEntityIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LiveEntityIdentifier left, LiveEntityIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._liveSimulationAddress.GetMarshalledSize();  // this._liveSimulationAddress
-            marshalSize += 2;  // this._entityNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Live Simulation Address record (see 6.2.55) 
-        /// </summary>
-        [XmlElement(Type = typeof(LiveSimulationAddress), ElementName = "liveSimulationAddress")]
-        public LiveSimulationAddress LiveSimulationAddress
-        {
-            get
-            {
-                return this._liveSimulationAddress;
-            }
-
-            set
-            {
-                this._liveSimulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Live entity number 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "entityNumber")]
-        public ushort EntityNumber
-        {
-            get
-            {
-                return this._entityNumber;
-            }
-
-            set
-            {
-                this._entityNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._liveSimulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._entityNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._liveSimulationAddress.Unmarshal(dis);
-                    this._entityNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LiveEntityIdentifier>");
-            try
-            {
-                sb.AppendLine("<liveSimulationAddress>");
-                this._liveSimulationAddress.Reflection(sb);
-                sb.AppendLine("</liveSimulationAddress>");
-                sb.AppendLine("<entityNumber type=\"ushort\">" + this._entityNumber.ToString(CultureInfo.InvariantCulture) + "</entityNumber>");
-                sb.AppendLine("</LiveEntityIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LiveEntityIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LiveEntityIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._liveSimulationAddress.Equals(obj._liveSimulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityNumber != obj._entityNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._liveSimulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._entityNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LiveEntityPdu.cs b/Libs/CSharpDis7/LiveEntityPdu.cs
deleted file mode 100644
index 3affe6b..0000000
--- a/Libs/CSharpDis7/LiveEntityPdu.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The live entity PDUs have a header with some different field names, but the same length. Section 9.3.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class LiveEntityPdu : PduSuperclass, IEquatable<LiveEntityPdu>
-    {
-        /// <summary>
-        /// Subprotocol used to decode the PDU. Section 13 of EBV.
-        /// </summary>
-        private ushort _subprotocolNumber;
-
-        /// <summary>
-        /// zero-filled array of padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LiveEntityPdu"/> class.
-        /// </summary>
-        public LiveEntityPdu()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LiveEntityPdu left, LiveEntityPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LiveEntityPdu left, LiveEntityPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._subprotocolNumber
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Subprotocol used to decode the PDU. Section 13 of EBV.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "subprotocolNumber")]
-        public ushort SubprotocolNumber
-        {
-            get
-            {
-                return this._subprotocolNumber;
-            }
-
-            set
-            {
-                this._subprotocolNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the zero-filled array of padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._subprotocolNumber);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._subprotocolNumber = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LiveEntityPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<subprotocolNumber type=\"ushort\">" + this._subprotocolNumber.ToString(CultureInfo.InvariantCulture) + "</subprotocolNumber>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</LiveEntityPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LiveEntityPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LiveEntityPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._subprotocolNumber != obj._subprotocolNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._subprotocolNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LiveSimulationAddress.cs b/Libs/CSharpDis7/LiveSimulationAddress.cs
deleted file mode 100644
index bde7892..0000000
--- a/Libs/CSharpDis7/LiveSimulationAddress.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// A simulation's designation associated with all Live Entity IDs contained in Live Entity PDUs. Section 6.2.55 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class LiveSimulationAddress
-    {
-        /// <summary>
-        /// facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation.
-        /// </summary>
-        private byte _liveSiteNumber;
-
-        /// <summary>
-        /// An application associated with a live site is termed a live application. Each live application participating in an event 
-        /// </summary>
-        private ushort _liveApplicationNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LiveSimulationAddress"/> class.
-        /// </summary>
-        public LiveSimulationAddress()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LiveSimulationAddress left, LiveSimulationAddress right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LiveSimulationAddress left, LiveSimulationAddress right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._liveSiteNumber
-            marshalSize += 2;  // this._liveApplicationNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "liveSiteNumber")]
-        public byte LiveSiteNumber
-        {
-            get
-            {
-                return this._liveSiteNumber;
-            }
-
-            set
-            {
-                this._liveSiteNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the An application associated with a live site is termed a live application. Each live application participating in an event 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "liveApplicationNumber")]
-        public ushort LiveApplicationNumber
-        {
-            get
-            {
-                return this._liveApplicationNumber;
-            }
-
-            set
-            {
-                this._liveApplicationNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._liveSiteNumber);
-                    dos.WriteUnsignedShort((ushort)this._liveApplicationNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._liveSiteNumber = dis.ReadUnsignedByte();
-                    this._liveApplicationNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LiveSimulationAddress>");
-            try
-            {
-                sb.AppendLine("<liveSiteNumber type=\"byte\">" + this._liveSiteNumber.ToString(CultureInfo.InvariantCulture) + "</liveSiteNumber>");
-                sb.AppendLine("<liveApplicationNumber type=\"ushort\">" + this._liveApplicationNumber.ToString(CultureInfo.InvariantCulture) + "</liveApplicationNumber>");
-                sb.AppendLine("</LiveSimulationAddress>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LiveSimulationAddress;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LiveSimulationAddress obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._liveSiteNumber != obj._liveSiteNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._liveApplicationNumber != obj._liveApplicationNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._liveSiteNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._liveApplicationNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/LogisticsFamilyPdu.cs b/Libs/CSharpDis7/LogisticsFamilyPdu.cs
deleted file mode 100644
index 08d35a9..0000000
--- a/Libs/CSharpDis7/LogisticsFamilyPdu.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Abstract superclass for logistics PDUs. Section 7.4 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class LogisticsFamilyPdu : Pdu, IEquatable<LogisticsFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LogisticsFamilyPdu"/> class.
-        /// </summary>
-        public LogisticsFamilyPdu()
-        {
-            ProtocolFamily = (byte)3;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LogisticsFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</LogisticsFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LogisticsFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LogisticsFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/MineEntityIdentifier.cs b/Libs/CSharpDis7/MineEntityIdentifier.cs
deleted file mode 100644
index ed07d91..0000000
--- a/Libs/CSharpDis7/MineEntityIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of a mine contained in the Minefield Data PDU. No espdus are issued for mine entities.  Section 6.2.56 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class MineEntityIdentifier
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        private ushort _mineEntityNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MineEntityIdentifier"/> class.
-        /// </summary>
-        public MineEntityIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MineEntityIdentifier left, MineEntityIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MineEntityIdentifier left, MineEntityIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._mineEntityNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the 
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "mineEntityNumber")]
-        public ushort MineEntityNumber
-        {
-            get
-            {
-                return this._mineEntityNumber;
-            }
-
-            set
-            {
-                this._mineEntityNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._mineEntityNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._mineEntityNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MineEntityIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<mineEntityNumber type=\"ushort\">" + this._mineEntityNumber.ToString(CultureInfo.InvariantCulture) + "</mineEntityNumber>");
-                sb.AppendLine("</MineEntityIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MineEntityIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MineEntityIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._mineEntityNumber != obj._mineEntityNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._mineEntityNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/MinefieldFamilyPdu.cs b/Libs/CSharpDis7/MinefieldFamilyPdu.cs
deleted file mode 100644
index 222ae64..0000000
--- a/Libs/CSharpDis7/MinefieldFamilyPdu.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Abstract superclass for PDUs relating to minefields. Section 7.9
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class MinefieldFamilyPdu : Pdu, IEquatable<MinefieldFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldFamilyPdu"/> class.
-        /// </summary>
-        public MinefieldFamilyPdu()
-        {
-            ProtocolFamily = (byte)8;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</MinefieldFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/MinefieldIdentifier.cs b/Libs/CSharpDis7/MinefieldIdentifier.cs
deleted file mode 100644
index 31a9856..0000000
--- a/Libs/CSharpDis7/MinefieldIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of a minefield Section 6.2.57 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class MinefieldIdentifier
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        private ushort _minefieldNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldIdentifier"/> class.
-        /// </summary>
-        public MinefieldIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldIdentifier left, MinefieldIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldIdentifier left, MinefieldIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._minefieldNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the 
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "minefieldNumber")]
-        public ushort MinefieldNumber
-        {
-            get
-            {
-                return this._minefieldNumber;
-            }
-
-            set
-            {
-                this._minefieldNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._minefieldNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._minefieldNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<minefieldNumber type=\"ushort\">" + this._minefieldNumber.ToString(CultureInfo.InvariantCulture) + "</minefieldNumber>");
-                sb.AppendLine("</MinefieldIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._minefieldNumber != obj._minefieldNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/MinefieldResponseNackPdu.cs b/Libs/CSharpDis7/MinefieldResponseNackPdu.cs
deleted file mode 100644
index 0a3d64e..0000000
--- a/Libs/CSharpDis7/MinefieldResponseNackPdu.cs
+++ /dev/null
@@ -1,453 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// proivde the means to request a retransmit of a minefield data pdu. Section 7.9.5 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EightByteChunk))]
-    public partial class MinefieldResponseNackPdu : MinefieldFamilyPdu, IEquatable<MinefieldResponseNackPdu>
-    {
-        /// <summary>
-        /// Minefield ID
-        /// </summary>
-        private EntityID _minefieldID = new EntityID();
-
-        /// <summary>
-        /// entity ID making the request
-        /// </summary>
-        private EntityID _requestingEntityID = new EntityID();
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private byte _requestID;
-
-        /// <summary>
-        /// how many pdus were missing
-        /// </summary>
-        private byte _numberOfMissingPdus;
-
-        /// <summary>
-        /// PDU sequence numbers that were missing
-        /// </summary>
-        private List<EightByteChunk> _missingPduSequenceNumbers = new List<EightByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldResponseNackPdu"/> class.
-        /// </summary>
-        public MinefieldResponseNackPdu()
-        {
-            PduType = (byte)40;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
-            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
-            marshalSize += 1;  // this._requestID
-            marshalSize += 1;  // this._numberOfMissingPdus
-            for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-            {
-                EightByteChunk listElement = (EightByteChunk)this._missingPduSequenceNumbers[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
-        public EntityID MinefieldID
-        {
-            get
-            {
-                return this._minefieldID;
-            }
-
-            set
-            {
-                this._minefieldID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the entity ID making the request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
-        public EntityID RequestingEntityID
-        {
-            get
-            {
-                return this._requestingEntityID;
-            }
-
-            set
-            {
-                this._requestingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
-        public byte RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfMissingPdus method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfMissingPdus")]
-        public byte NumberOfMissingPdus
-        {
-            get
-            {
-                return this._numberOfMissingPdus;
-            }
-
-            set
-            {
-                this._numberOfMissingPdus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the PDU sequence numbers that were missing
-        /// </summary>
-        [XmlElement(ElementName = "missingPduSequenceNumbersList", Type = typeof(List<EightByteChunk>))]
-        public List<EightByteChunk> MissingPduSequenceNumbers
-        {
-            get
-            {
-                return this._missingPduSequenceNumbers;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._minefieldID.Marshal(dos);
-                    this._requestingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._missingPduSequenceNumbers.Count);
-
-                    for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                    {
-                        EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
-                        aEightByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._minefieldID.Unmarshal(dis);
-                    this._requestingEntityID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedByte();
-                    this._numberOfMissingPdus = dis.ReadUnsignedByte();
-                    for (int idx = 0; idx < this.NumberOfMissingPdus; idx++)
-                    {
-                        EightByteChunk anX = new EightByteChunk();
-                        anX.Unmarshal(dis);
-                        this._missingPduSequenceNumbers.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldResponseNackPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<minefieldID>");
-                this._minefieldID.Reflection(sb);
-                sb.AppendLine("</minefieldID>");
-                sb.AppendLine("<requestingEntityID>");
-                this._requestingEntityID.Reflection(sb);
-                sb.AppendLine("</requestingEntityID>");
-                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<missingPduSequenceNumbers type=\"byte\">" + this._missingPduSequenceNumbers.Count.ToString(CultureInfo.InvariantCulture) + "</missingPduSequenceNumbers>");
-                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                {
-                    sb.AppendLine("<missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
-                    EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
-                    aEightByteChunk.Reflection(sb);
-                    sb.AppendLine("</missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</MinefieldResponseNackPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldResponseNackPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldResponseNackPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._minefieldID.Equals(obj._minefieldID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfMissingPdus != obj._numberOfMissingPdus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._missingPduSequenceNumbers.Count != obj._missingPduSequenceNumbers.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                {
-                    if (!this._missingPduSequenceNumbers[idx].Equals(obj._missingPduSequenceNumbers[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfMissingPdus.GetHashCode();
-
-            if (this._missingPduSequenceNumbers.Count > 0)
-            {
-                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._missingPduSequenceNumbers[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/MinefieldStatePdu.cs b/Libs/CSharpDis7/MinefieldStatePdu.cs
deleted file mode 100644
index 7ba480f..0000000
--- a/Libs/CSharpDis7/MinefieldStatePdu.cs
+++ /dev/null
@@ -1,723 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// information about the complete minefield. The minefield presence, perimiter, etc. Section 7.9.2 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(MinefieldIdentifier))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(EulerAngles))]
-    [XmlInclude(typeof(Vector2Float))]
-    [XmlInclude(typeof(EntityType))]
-    public partial class MinefieldStatePdu : MinefieldFamilyPdu, IEquatable<MinefieldStatePdu>
-    {
-        /// <summary>
-        /// Minefield ID
-        /// </summary>
-        private MinefieldIdentifier _minefieldID = new MinefieldIdentifier();
-
-        /// <summary>
-        /// Minefield sequence
-        /// </summary>
-        private ushort _minefieldSequence;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// Number of permieter points
-        /// </summary>
-        private byte _numberOfPerimeterPoints;
-
-        /// <summary>
-        /// type of minefield
-        /// </summary>
-        private EntityType _minefieldType = new EntityType();
-
-        /// <summary>
-        /// how many mine types
-        /// </summary>
-        private ushort _numberOfMineTypes;
-
-        /// <summary>
-        /// location of center of minefield in world coords
-        /// </summary>
-        private Vector3Double _minefieldLocation = new Vector3Double();
-
-        /// <summary>
-        /// orientation of minefield
-        /// </summary>
-        private EulerAngles _minefieldOrientation = new EulerAngles();
-
-        /// <summary>
-        /// appearance bitflags
-        /// </summary>
-        private ushort _appearance;
-
-        /// <summary>
-        /// protocolMode. First two bits are the protocol mode, 14 bits reserved.
-        /// </summary>
-        private ushort _protocolMode;
-
-        /// <summary>
-        /// perimeter points for the minefield
-        /// </summary>
-        private List<Vector2Float> _perimeterPoints = new List<Vector2Float>();
-
-        /// <summary>
-        /// Type of mines
-        /// </summary>
-        private List<EntityType> _mineType = new List<EntityType>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldStatePdu"/> class.
-        /// </summary>
-        public MinefieldStatePdu()
-        {
-            PduType = (byte)37;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldStatePdu left, MinefieldStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldStatePdu left, MinefieldStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
-            marshalSize += 2;  // this._minefieldSequence
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._numberOfPerimeterPoints
-            marshalSize += this._minefieldType.GetMarshalledSize();  // this._minefieldType
-            marshalSize += 2;  // this._numberOfMineTypes
-            marshalSize += this._minefieldLocation.GetMarshalledSize();  // this._minefieldLocation
-            marshalSize += this._minefieldOrientation.GetMarshalledSize();  // this._minefieldOrientation
-            marshalSize += 2;  // this._appearance
-            marshalSize += 2;  // this._protocolMode
-            for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-            {
-                Vector2Float listElement = (Vector2Float)this._perimeterPoints[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._mineType.Count; idx++)
-            {
-                EntityType listElement = (EntityType)this._mineType[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield ID
-        /// </summary>
-        [XmlElement(Type = typeof(MinefieldIdentifier), ElementName = "minefieldID")]
-        public MinefieldIdentifier MinefieldID
-        {
-            get
-            {
-                return this._minefieldID;
-            }
-
-            set
-            {
-                this._minefieldID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield sequence
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "minefieldSequence")]
-        public ushort MinefieldSequence
-        {
-            get
-            {
-                return this._minefieldSequence;
-            }
-
-            set
-            {
-                this._minefieldSequence = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPerimeterPoints method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfPerimeterPoints")]
-        public byte NumberOfPerimeterPoints
-        {
-            get
-            {
-                return this._numberOfPerimeterPoints;
-            }
-
-            set
-            {
-                this._numberOfPerimeterPoints = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of minefield
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "minefieldType")]
-        public EntityType MinefieldType
-        {
-            get
-            {
-                return this._minefieldType;
-            }
-
-            set
-            {
-                this._minefieldType = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfMineTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfMineTypes")]
-        public ushort NumberOfMineTypes
-        {
-            get
-            {
-                return this._numberOfMineTypes;
-            }
-
-            set
-            {
-                this._numberOfMineTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of center of minefield in world coords
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "minefieldLocation")]
-        public Vector3Double MinefieldLocation
-        {
-            get
-            {
-                return this._minefieldLocation;
-            }
-
-            set
-            {
-                this._minefieldLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the orientation of minefield
-        /// </summary>
-        [XmlElement(Type = typeof(EulerAngles), ElementName = "minefieldOrientation")]
-        public EulerAngles MinefieldOrientation
-        {
-            get
-            {
-                return this._minefieldOrientation;
-            }
-
-            set
-            {
-                this._minefieldOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the appearance bitflags
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "appearance")]
-        public ushort Appearance
-        {
-            get
-            {
-                return this._appearance;
-            }
-
-            set
-            {
-                this._appearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the protocolMode. First two bits are the protocol mode, 14 bits reserved.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "protocolMode")]
-        public ushort ProtocolMode
-        {
-            get
-            {
-                return this._protocolMode;
-            }
-
-            set
-            {
-                this._protocolMode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the perimeter points for the minefield
-        /// </summary>
-        [XmlElement(ElementName = "perimeterPointsList", Type = typeof(List<Vector2Float>))]
-        public List<Vector2Float> PerimeterPoints
-        {
-            get
-            {
-                return this._perimeterPoints;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of mines
-        /// </summary>
-        [XmlElement(ElementName = "mineTypeList", Type = typeof(List<EntityType>))]
-        public List<EntityType> MineType
-        {
-            get
-            {
-                return this._mineType;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._minefieldID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._minefieldSequence);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._perimeterPoints.Count);
-                    this._minefieldType.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._mineType.Count);
-                    this._minefieldLocation.Marshal(dos);
-                    this._minefieldOrientation.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._appearance);
-                    dos.WriteUnsignedShort((ushort)this._protocolMode);
-
-                    for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                    {
-                        Vector2Float aVector2Float = (Vector2Float)this._perimeterPoints[idx];
-                        aVector2Float.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._mineType.Count; idx++)
-                    {
-                        EntityType aEntityType = (EntityType)this._mineType[idx];
-                        aEntityType.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._minefieldID.Unmarshal(dis);
-                    this._minefieldSequence = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._numberOfPerimeterPoints = dis.ReadUnsignedByte();
-                    this._minefieldType.Unmarshal(dis);
-                    this._numberOfMineTypes = dis.ReadUnsignedShort();
-                    this._minefieldLocation.Unmarshal(dis);
-                    this._minefieldOrientation.Unmarshal(dis);
-                    this._appearance = dis.ReadUnsignedShort();
-                    this._protocolMode = dis.ReadUnsignedShort();
-                    for (int idx = 0; idx < this.NumberOfPerimeterPoints; idx++)
-                    {
-                        Vector2Float anX = new Vector2Float();
-                        anX.Unmarshal(dis);
-                        this._perimeterPoints.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfMineTypes; idx++)
-                    {
-                        EntityType anX = new EntityType();
-                        anX.Unmarshal(dis);
-                        this._mineType.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<minefieldID>");
-                this._minefieldID.Reflection(sb);
-                sb.AppendLine("</minefieldID>");
-                sb.AppendLine("<minefieldSequence type=\"ushort\">" + this._minefieldSequence.ToString(CultureInfo.InvariantCulture) + "</minefieldSequence>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<perimeterPoints type=\"byte\">" + this._perimeterPoints.Count.ToString(CultureInfo.InvariantCulture) + "</perimeterPoints>");
-                sb.AppendLine("<minefieldType>");
-                this._minefieldType.Reflection(sb);
-                sb.AppendLine("</minefieldType>");
-                sb.AppendLine("<mineType type=\"ushort\">" + this._mineType.Count.ToString(CultureInfo.InvariantCulture) + "</mineType>");
-                sb.AppendLine("<minefieldLocation>");
-                this._minefieldLocation.Reflection(sb);
-                sb.AppendLine("</minefieldLocation>");
-                sb.AppendLine("<minefieldOrientation>");
-                this._minefieldOrientation.Reflection(sb);
-                sb.AppendLine("</minefieldOrientation>");
-                sb.AppendLine("<appearance type=\"ushort\">" + this._appearance.ToString(CultureInfo.InvariantCulture) + "</appearance>");
-                sb.AppendLine("<protocolMode type=\"ushort\">" + this._protocolMode.ToString(CultureInfo.InvariantCulture) + "</protocolMode>");
-                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                {
-                    sb.AppendLine("<perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector2Float\">");
-                    Vector2Float aVector2Float = (Vector2Float)this._perimeterPoints[idx];
-                    aVector2Float.Reflection(sb);
-                    sb.AppendLine("</perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._mineType.Count; idx++)
-                {
-                    sb.AppendLine("<mineType" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
-                    EntityType aEntityType = (EntityType)this._mineType[idx];
-                    aEntityType.Reflection(sb);
-                    sb.AppendLine("</mineType" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</MinefieldStatePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._minefieldID.Equals(obj._minefieldID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._minefieldSequence != obj._minefieldSequence)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPerimeterPoints != obj._numberOfPerimeterPoints)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._minefieldType.Equals(obj._minefieldType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfMineTypes != obj._numberOfMineTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._minefieldLocation.Equals(obj._minefieldLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._minefieldOrientation.Equals(obj._minefieldOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._appearance != obj._appearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._protocolMode != obj._protocolMode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._perimeterPoints.Count != obj._perimeterPoints.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                {
-                    if (!this._perimeterPoints[idx].Equals(obj._perimeterPoints[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._mineType.Count != obj._mineType.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._mineType.Count; idx++)
-                {
-                    if (!this._mineType[idx].Equals(obj._mineType[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldSequence.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPerimeterPoints.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldType.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfMineTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._appearance.GetHashCode();
-            result = GenerateHash(result) ^ this._protocolMode.GetHashCode();
-
-            if (this._perimeterPoints.Count > 0)
-            {
-                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._perimeterPoints[idx].GetHashCode();
-                }
-            }
-
-            if (this._mineType.Count > 0)
-            {
-                for (int idx = 0; idx < this._mineType.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._mineType[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ModulationParameters.cs b/Libs/CSharpDis7/ModulationParameters.cs
deleted file mode 100644
index 1604180..0000000
--- a/Libs/CSharpDis7/ModulationParameters.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Modulation parameters associated with a specific radio system. INCOMPLETE. 6.2.58 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ModulationParameters
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModulationParameters"/> class.
-        /// </summary>
-        public ModulationParameters()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ModulationParameters left, ModulationParameters right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ModulationParameters left, ModulationParameters right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ModulationParameters>");
-            try
-            {
-                sb.AppendLine("</ModulationParameters>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ModulationParameters;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ModulationParameters obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ModulationType.cs b/Libs/CSharpDis7/ModulationType.cs
deleted file mode 100644
index c0357e3..0000000
--- a/Libs/CSharpDis7/ModulationType.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information about the type of modulation used for radio transmission. 6.2.59 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ModulationType
-    {
-        /// <summary>
-        /// This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bt field.
-        /// </summary>
-        private ushort _spreadSpectrum;
-
-        /// <summary>
-        /// the major classification of the modulation type. 
-        /// </summary>
-        private ushort _majorModulation;
-
-        /// <summary>
-        /// provide certain detailed information depending upon the major modulation type
-        /// </summary>
-        private ushort _detail;
-
-        /// <summary>
-        /// the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system.
-        /// </summary>
-        private ushort _radioSystem;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModulationType"/> class.
-        /// </summary>
-        public ModulationType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ModulationType left, ModulationType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ModulationType left, ModulationType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._spreadSpectrum
-            marshalSize += 2;  // this._majorModulation
-            marshalSize += 2;  // this._detail
-            marshalSize += 2;  // this._radioSystem
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bt field.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "spreadSpectrum")]
-        public ushort SpreadSpectrum
-        {
-            get
-            {
-                return this._spreadSpectrum;
-            }
-
-            set
-            {
-                this._spreadSpectrum = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the major classification of the modulation type. 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "majorModulation")]
-        public ushort MajorModulation
-        {
-            get
-            {
-                return this._majorModulation;
-            }
-
-            set
-            {
-                this._majorModulation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the provide certain detailed information depending upon the major modulation type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "detail")]
-        public ushort Detail
-        {
-            get
-            {
-                return this._detail;
-            }
-
-            set
-            {
-                this._detail = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "radioSystem")]
-        public ushort RadioSystem
-        {
-            get
-            {
-                return this._radioSystem;
-            }
-
-            set
-            {
-                this._radioSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._spreadSpectrum);
-                    dos.WriteUnsignedShort((ushort)this._majorModulation);
-                    dos.WriteUnsignedShort((ushort)this._detail);
-                    dos.WriteUnsignedShort((ushort)this._radioSystem);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._spreadSpectrum = dis.ReadUnsignedShort();
-                    this._majorModulation = dis.ReadUnsignedShort();
-                    this._detail = dis.ReadUnsignedShort();
-                    this._radioSystem = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ModulationType>");
-            try
-            {
-                sb.AppendLine("<spreadSpectrum type=\"ushort\">" + this._spreadSpectrum.ToString(CultureInfo.InvariantCulture) + "</spreadSpectrum>");
-                sb.AppendLine("<majorModulation type=\"ushort\">" + this._majorModulation.ToString(CultureInfo.InvariantCulture) + "</majorModulation>");
-                sb.AppendLine("<detail type=\"ushort\">" + this._detail.ToString(CultureInfo.InvariantCulture) + "</detail>");
-                sb.AppendLine("<radioSystem type=\"ushort\">" + this._radioSystem.ToString(CultureInfo.InvariantCulture) + "</radioSystem>");
-                sb.AppendLine("</ModulationType>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ModulationType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ModulationType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._spreadSpectrum != obj._spreadSpectrum)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._majorModulation != obj._majorModulation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._detail != obj._detail)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._radioSystem != obj._radioSystem)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._spreadSpectrum.GetHashCode();
-            result = GenerateHash(result) ^ this._majorModulation.GetHashCode();
-            result = GenerateHash(result) ^ this._detail.GetHashCode();
-            result = GenerateHash(result) ^ this._radioSystem.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Munition.cs b/Libs/CSharpDis7/Munition.cs
deleted file mode 100644
index 329ed6c..0000000
--- a/Libs/CSharpDis7/Munition.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// An entity's munition (e.g., bomb, missile) information shall be represented by one or more Munition records. For each type or location of munition, this record shall specify the type, location, quantity and status of munitions that an entity contains. Section 6.2.60 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class Munition
-    {
-        /// <summary>
-        ///  This field shall identify the entity type of the munition. See section 6.2.30.
-        /// </summary>
-        private EntityType _munitionType = new EntityType();
-
-        /// <summary>
-        /// the station or launcher to which the munition is assigned. See Annex I
-        /// </summary>
-        private uint _station;
-
-        /// <summary>
-        /// the quantity remaining of this munition.
-        /// </summary>
-        private ushort _quantity;
-
-        /// <summary>
-        ///  the status of the munition. It shall be represented by an 8-bit enumeration. 
-        /// </summary>
-        private byte _munitionStatus;
-
-        /// <summary>
-        /// padding 
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Munition"/> class.
-        /// </summary>
-        public Munition()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Munition left, Munition right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Munition left, Munition right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
-            marshalSize += 4;  // this._station
-            marshalSize += 2;  // this._quantity
-            marshalSize += 1;  // this._munitionStatus
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the  This field shall identify the entity type of the munition. See section 6.2.30.
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
-        public EntityType MunitionType
-        {
-            get
-            {
-                return this._munitionType;
-            }
-
-            set
-            {
-                this._munitionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the station or launcher to which the munition is assigned. See Annex I
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "station")]
-        public uint Station
-        {
-            get
-            {
-                return this._station;
-            }
-
-            set
-            {
-                this._station = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the quantity remaining of this munition.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
-        public ushort Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  the status of the munition. It shall be represented by an 8-bit enumeration. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "munitionStatus")]
-        public byte MunitionStatus
-        {
-            get
-            {
-                return this._munitionStatus;
-            }
-
-            set
-            {
-                this._munitionStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionType.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._station);
-                    dos.WriteUnsignedShort((ushort)this._quantity);
-                    dos.WriteUnsignedByte((byte)this._munitionStatus);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionType.Unmarshal(dis);
-                    this._station = dis.ReadUnsignedInt();
-                    this._quantity = dis.ReadUnsignedShort();
-                    this._munitionStatus = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Munition>");
-            try
-            {
-                sb.AppendLine("<munitionType>");
-                this._munitionType.Reflection(sb);
-                sb.AppendLine("</munitionType>");
-                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
-                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("<munitionStatus type=\"byte\">" + this._munitionStatus.ToString(CultureInfo.InvariantCulture) + "</munitionStatus>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</Munition>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Munition;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Munition obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._munitionType.Equals(obj._munitionType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._station != obj._station)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._munitionStatus != obj._munitionStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
-            result = GenerateHash(result) ^ this._station.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-            result = GenerateHash(result) ^ this._munitionStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/MunitionDescriptor.cs b/Libs/CSharpDis7/MunitionDescriptor.cs
deleted file mode 100644
index 6d4ba12..0000000
--- a/Libs/CSharpDis7/MunitionDescriptor.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Represents the firing or detonation of a munition. Section 6.2.20.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class MunitionDescriptor
-    {
-        /// <summary>
-        /// What munition was used in the burst
-        /// </summary>
-        private EntityType _munitionType = new EntityType();
-
-        /// <summary>
-        /// type of warhead
-        /// </summary>
-        private ushort _warhead;
-
-        /// <summary>
-        /// type of fuse used
-        /// </summary>
-        private ushort _fuse;
-
-        /// <summary>
-        /// how many of the munition were fired
-        /// </summary>
-        private ushort _quantity;
-
-        /// <summary>
-        /// rate at which the munition was fired
-        /// </summary>
-        private ushort _rate;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MunitionDescriptor"/> class.
-        /// </summary>
-        public MunitionDescriptor()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MunitionDescriptor left, MunitionDescriptor right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MunitionDescriptor left, MunitionDescriptor right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
-            marshalSize += 2;  // this._warhead
-            marshalSize += 2;  // this._fuse
-            marshalSize += 2;  // this._quantity
-            marshalSize += 2;  // this._rate
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the What munition was used in the burst
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
-        public EntityType MunitionType
-        {
-            get
-            {
-                return this._munitionType;
-            }
-
-            set
-            {
-                this._munitionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of warhead
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "warhead")]
-        public ushort Warhead
-        {
-            get
-            {
-                return this._warhead;
-            }
-
-            set
-            {
-                this._warhead = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of fuse used
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "fuse")]
-        public ushort Fuse
-        {
-            get
-            {
-                return this._fuse;
-            }
-
-            set
-            {
-                this._fuse = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many of the munition were fired
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
-        public ushort Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the rate at which the munition was fired
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "rate")]
-        public ushort Rate
-        {
-            get
-            {
-                return this._rate;
-            }
-
-            set
-            {
-                this._rate = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionType.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._warhead);
-                    dos.WriteUnsignedShort((ushort)this._fuse);
-                    dos.WriteUnsignedShort((ushort)this._quantity);
-                    dos.WriteUnsignedShort((ushort)this._rate);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionType.Unmarshal(dis);
-                    this._warhead = dis.ReadUnsignedShort();
-                    this._fuse = dis.ReadUnsignedShort();
-                    this._quantity = dis.ReadUnsignedShort();
-                    this._rate = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MunitionDescriptor>");
-            try
-            {
-                sb.AppendLine("<munitionType>");
-                this._munitionType.Reflection(sb);
-                sb.AppendLine("</munitionType>");
-                sb.AppendLine("<warhead type=\"ushort\">" + this._warhead.ToString(CultureInfo.InvariantCulture) + "</warhead>");
-                sb.AppendLine("<fuse type=\"ushort\">" + this._fuse.ToString(CultureInfo.InvariantCulture) + "</fuse>");
-                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("<rate type=\"ushort\">" + this._rate.ToString(CultureInfo.InvariantCulture) + "</rate>");
-                sb.AppendLine("</MunitionDescriptor>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MunitionDescriptor;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MunitionDescriptor obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._munitionType.Equals(obj._munitionType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._warhead != obj._warhead)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuse != obj._fuse)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._rate != obj._rate)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
-            result = GenerateHash(result) ^ this._warhead.GetHashCode();
-            result = GenerateHash(result) ^ this._fuse.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-            result = GenerateHash(result) ^ this._rate.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/MunitionReload.cs b/Libs/CSharpDis7/MunitionReload.cs
deleted file mode 100644
index e946bd3..0000000
--- a/Libs/CSharpDis7/MunitionReload.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// indicate weapons (munitions) previously communicated via the Munition record. Section 6.2.61 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class MunitionReload
-    {
-        /// <summary>
-        ///  This field shall identify the entity type of the munition. See section 6.2.30.
-        /// </summary>
-        private EntityType _munitionType = new EntityType();
-
-        /// <summary>
-        /// the station or launcher to which the munition is assigned. See Annex I
-        /// </summary>
-        private uint _station;
-
-        /// <summary>
-        /// the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified.
-        /// </summary>
-        private ushort _standardQuantity;
-
-        /// <summary>
-        /// the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified 
-        /// </summary>
-        private ushort _maximumQuantity;
-
-        /// <summary>
-        /// the station name within the host at which the part entity is located.
-        /// </summary>
-        private ushort _stationName;
-
-        /// <summary>
-        /// the number of the particular wing station, cargo hold etc., at which the part is attached.
-        /// </summary>
-        private ushort _stationNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MunitionReload"/> class.
-        /// </summary>
-        public MunitionReload()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MunitionReload left, MunitionReload right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MunitionReload left, MunitionReload right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
-            marshalSize += 4;  // this._station
-            marshalSize += 2;  // this._standardQuantity
-            marshalSize += 2;  // this._maximumQuantity
-            marshalSize += 2;  // this._stationName
-            marshalSize += 2;  // this._stationNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the  This field shall identify the entity type of the munition. See section 6.2.30.
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
-        public EntityType MunitionType
-        {
-            get
-            {
-                return this._munitionType;
-            }
-
-            set
-            {
-                this._munitionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the station or launcher to which the munition is assigned. See Annex I
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "station")]
-        public uint Station
-        {
-            get
-            {
-                return this._station;
-            }
-
-            set
-            {
-                this._station = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "standardQuantity")]
-        public ushort StandardQuantity
-        {
-            get
-            {
-                return this._standardQuantity;
-            }
-
-            set
-            {
-                this._standardQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "maximumQuantity")]
-        public ushort MaximumQuantity
-        {
-            get
-            {
-                return this._maximumQuantity;
-            }
-
-            set
-            {
-                this._maximumQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the station name within the host at which the part entity is located.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "stationName")]
-        public ushort StationName
-        {
-            get
-            {
-                return this._stationName;
-            }
-
-            set
-            {
-                this._stationName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the number of the particular wing station, cargo hold etc., at which the part is attached.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "stationNumber")]
-        public ushort StationNumber
-        {
-            get
-            {
-                return this._stationNumber;
-            }
-
-            set
-            {
-                this._stationNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionType.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._station);
-                    dos.WriteUnsignedShort((ushort)this._standardQuantity);
-                    dos.WriteUnsignedShort((ushort)this._maximumQuantity);
-                    dos.WriteUnsignedShort((ushort)this._stationName);
-                    dos.WriteUnsignedShort((ushort)this._stationNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionType.Unmarshal(dis);
-                    this._station = dis.ReadUnsignedInt();
-                    this._standardQuantity = dis.ReadUnsignedShort();
-                    this._maximumQuantity = dis.ReadUnsignedShort();
-                    this._stationName = dis.ReadUnsignedShort();
-                    this._stationNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MunitionReload>");
-            try
-            {
-                sb.AppendLine("<munitionType>");
-                this._munitionType.Reflection(sb);
-                sb.AppendLine("</munitionType>");
-                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
-                sb.AppendLine("<standardQuantity type=\"ushort\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
-                sb.AppendLine("<maximumQuantity type=\"ushort\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
-                sb.AppendLine("<stationName type=\"ushort\">" + this._stationName.ToString(CultureInfo.InvariantCulture) + "</stationName>");
-                sb.AppendLine("<stationNumber type=\"ushort\">" + this._stationNumber.ToString(CultureInfo.InvariantCulture) + "</stationNumber>");
-                sb.AppendLine("</MunitionReload>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MunitionReload;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MunitionReload obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._munitionType.Equals(obj._munitionType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._station != obj._station)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._standardQuantity != obj._standardQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumQuantity != obj._maximumQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stationName != obj._stationName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stationNumber != obj._stationNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
-            result = GenerateHash(result) ^ this._station.GetHashCode();
-            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._stationName.GetHashCode();
-            result = GenerateHash(result) ^ this._stationNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/NamedLocationIdentification.cs b/Libs/CSharpDis7/NamedLocationIdentification.cs
deleted file mode 100644
index 78f943b..0000000
--- a/Libs/CSharpDis7/NamedLocationIdentification.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information about the discrete positional relationship of the part entity with respect to the its host entity Section 6.2.62 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class NamedLocationIdentification
-    {
-        /// <summary>
-        /// the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part’s location data fields. This field shall be specified by a 16-bit enumeration 
-        /// </summary>
-        private ushort _stationName;
-
-        /// <summary>
-        /// the number of the particular wing station, cargo hold etc., at which the part is attached. 
-        /// </summary>
-        private ushort _stationNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NamedLocationIdentification"/> class.
-        /// </summary>
-        public NamedLocationIdentification()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(NamedLocationIdentification left, NamedLocationIdentification right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(NamedLocationIdentification left, NamedLocationIdentification right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._stationName
-            marshalSize += 2;  // this._stationNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part’s location data fields. This field shall be specified by a 16-bit enumeration 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "stationName")]
-        public ushort StationName
-        {
-            get
-            {
-                return this._stationName;
-            }
-
-            set
-            {
-                this._stationName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the number of the particular wing station, cargo hold etc., at which the part is attached. 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "stationNumber")]
-        public ushort StationNumber
-        {
-            get
-            {
-                return this._stationNumber;
-            }
-
-            set
-            {
-                this._stationNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._stationName);
-                    dos.WriteUnsignedShort((ushort)this._stationNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._stationName = dis.ReadUnsignedShort();
-                    this._stationNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<NamedLocationIdentification>");
-            try
-            {
-                sb.AppendLine("<stationName type=\"ushort\">" + this._stationName.ToString(CultureInfo.InvariantCulture) + "</stationName>");
-                sb.AppendLine("<stationNumber type=\"ushort\">" + this._stationNumber.ToString(CultureInfo.InvariantCulture) + "</stationNumber>");
-                sb.AppendLine("</NamedLocationIdentification>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as NamedLocationIdentification;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(NamedLocationIdentification obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._stationName != obj._stationName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stationNumber != obj._stationNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._stationName.GetHashCode();
-            result = GenerateHash(result) ^ this._stationNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ObjectIdentifier.cs b/Libs/CSharpDis7/ObjectIdentifier.cs
deleted file mode 100644
index 0bc1a50..0000000
--- a/Libs/CSharpDis7/ObjectIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of an environmental object. Section 6.2.63
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class ObjectIdentifier
-    {
-        /// <summary>
-        ///  Simulation Address
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// 
-        /// </summary>
-        private ushort _objectNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectIdentifier"/> class.
-        /// </summary>
-        public ObjectIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ObjectIdentifier left, ObjectIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ObjectIdentifier left, ObjectIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._objectNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the  Simulation Address
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "objectNumber")]
-        public ushort ObjectNumber
-        {
-            get
-            {
-                return this._objectNumber;
-            }
-
-            set
-            {
-                this._objectNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._objectNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._objectNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ObjectIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<objectNumber type=\"ushort\">" + this._objectNumber.ToString(CultureInfo.InvariantCulture) + "</objectNumber>");
-                sb.AppendLine("</ObjectIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ObjectIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ObjectIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._objectNumber != obj._objectNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._objectNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ObjectType.cs b/Libs/CSharpDis7/ObjectType.cs
deleted file mode 100644
index 037f713..0000000
--- a/Libs/CSharpDis7/ObjectType.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of an environmental object. Section 6.2.64
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ObjectType
-    {
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private byte _objectKind;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectType"/> class.
-        /// </summary>
-        public ObjectType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ObjectType left, ObjectType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ObjectType left, ObjectType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._domain
-            marshalSize += 1;  // this._objectKind
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "objectKind")]
-        public byte ObjectKind
-        {
-            get
-            {
-                return this._objectKind;
-            }
-
-            set
-            {
-                this._objectKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedByte((byte)this._objectKind);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._domain = dis.ReadUnsignedByte();
-                    this._objectKind = dis.ReadUnsignedByte();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ObjectType>");
-            try
-            {
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<objectKind type=\"byte\">" + this._objectKind.ToString(CultureInfo.InvariantCulture) + "</objectKind>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("</ObjectType>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ObjectType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ObjectType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._objectKind != obj._objectKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._objectKind.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/OneByteChunk.cs b/Libs/CSharpDis7/OneByteChunk.cs
deleted file mode 100644
index 6b45bd8..0000000
--- a/Libs/CSharpDis7/OneByteChunk.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// 8 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class OneByteChunk
-    {
-        /// <summary>
-        /// one byte of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[1];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OneByteChunk"/> class.
-        /// </summary>
-        public OneByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(OneByteChunk left, OneByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(OneByteChunk left, OneByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the one byte of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<OneByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</OneByteChunk>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as OneByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(OneByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 1) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 1; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-
-            for (int idx = 0; idx < 1; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/OwnershipStatus.cs b/Libs/CSharpDis7/OwnershipStatus.cs
deleted file mode 100644
index d14ac6c..0000000
--- a/Libs/CSharpDis7/OwnershipStatus.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// used to convey entity and conflict status information associated with transferring ownership of an entity. Section 6.2.65
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class OwnershipStatus
-    {
-        /// <summary>
-        /// EntityID
-        /// </summary>
-        private EntityID _entityId = new EntityID();
-
-        /// <summary>
-        /// The ownership and/or ownership conflict status of the entity represented by the Entity ID field.
-        /// </summary>
-        private byte _ownershipStatus;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OwnershipStatus"/> class.
-        /// </summary>
-        public OwnershipStatus()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(OwnershipStatus left, OwnershipStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(OwnershipStatus left, OwnershipStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
-            marshalSize += 1;  // this._ownershipStatus
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the EntityID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
-        public EntityID EntityId
-        {
-            get
-            {
-                return this._entityId;
-            }
-
-            set
-            {
-                this._entityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The ownership and/or ownership conflict status of the entity represented by the Entity ID field.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "ownershipStatus")]
-        public byte OwnershipStatus_
-        {
-            get
-            {
-                return this._ownershipStatus;
-            }
-
-            set
-            {
-                this._ownershipStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityId.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._ownershipStatus);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityId.Unmarshal(dis);
-                    this._ownershipStatus = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<OwnershipStatus>");
-            try
-            {
-                sb.AppendLine("<entityId>");
-                this._entityId.Reflection(sb);
-                sb.AppendLine("</entityId>");
-                sb.AppendLine("<ownershipStatus type=\"byte\">" + this._ownershipStatus.ToString(CultureInfo.InvariantCulture) + "</ownershipStatus>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</OwnershipStatus>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as OwnershipStatus;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(OwnershipStatus obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._entityId.Equals(obj._entityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ownershipStatus != obj._ownershipStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityId.GetHashCode();
-            result = GenerateHash(result) ^ this._ownershipStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Pdu.cs b/Libs/CSharpDis7/Pdu.cs
deleted file mode 100644
index d6e238c..0000000
--- a/Libs/CSharpDis7/Pdu.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Adds some fields to the the classic PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Pdu : PduSuperclass, IEquatable<Pdu>
-    {
-        /// <summary>
-        /// PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
-        /// </summary>
-        private byte _pduStatus;
-
-        /// <summary>
-        /// zero-filled array of padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pdu"/> class.
-        /// </summary>
-        public Pdu()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Pdu left, Pdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Pdu left, Pdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._pduStatus
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduStatus")]
-        public byte PduStatus
-        {
-            get
-            {
-                return this._pduStatus;
-            }
-
-            set
-            {
-                this._pduStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the zero-filled array of padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._pduStatus);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._pduStatus = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Pdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<pduStatus type=\"byte\">" + this._pduStatus.ToString(CultureInfo.InvariantCulture) + "</pduStatus>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</Pdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Pdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Pdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._pduStatus != obj._pduStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._pduStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/PduContainer.cs b/Libs/CSharpDis7/PduContainer.cs
deleted file mode 100644
index 75a0ccc..0000000
--- a/Libs/CSharpDis7/PduContainer.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Used for XML compatability. A container that holds PDUs
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Pdu))]
-    public partial class PduContainer
-    {
-        /// <summary>
-        /// Number of PDUs in the container list
-        /// </summary>
-        private int _numberOfPdus;
-
-        /// <summary>
-        /// record sets
-        /// </summary>
-        private List<Pdu> _pdus = new List<Pdu>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PduContainer"/> class.
-        /// </summary>
-        public PduContainer()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PduContainer left, PduContainer right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PduContainer left, PduContainer right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._numberOfPdus
-            for (int idx = 0; idx < this._pdus.Count; idx++)
-            {
-                Pdu listElement = (Pdu)this._pdus[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPdus method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "numberOfPdus")]
-        public int NumberOfPdus
-        {
-            get
-            {
-                return this._numberOfPdus;
-            }
-
-            set
-            {
-                this._numberOfPdus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the record sets
-        /// </summary>
-        [XmlElement(ElementName = "pdusList", Type = typeof(List<Pdu>))]
-        public List<Pdu> Pdus
-        {
-            get
-            {
-                return this._pdus;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteInt((int)this._pdus.Count);
-
-                    for (int idx = 0; idx < this._pdus.Count; idx++)
-                    {
-                        Pdu aPdu = (Pdu)this._pdus[idx];
-                        aPdu.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfPdus = dis.ReadInt();
-                    for (int idx = 0; idx < this.NumberOfPdus; idx++)
-                    {
-                        Pdu anX = new Pdu();
-                        anX.Unmarshal(dis);
-                        this._pdus.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PduContainer>");
-            try
-            {
-                sb.AppendLine("<pdus type=\"int\">" + this._pdus.Count.ToString(CultureInfo.InvariantCulture) + "</pdus>");
-                for (int idx = 0; idx < this._pdus.Count; idx++)
-                {
-                    sb.AppendLine("<pdus" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Pdu\">");
-                    Pdu aPdu = (Pdu)this._pdus[idx];
-                    aPdu.Reflection(sb);
-                    sb.AppendLine("</pdus" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</PduContainer>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PduContainer;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PduContainer obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._numberOfPdus != obj._numberOfPdus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pdus.Count != obj._pdus.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._pdus.Count; idx++)
-                {
-                    if (!this._pdus[idx].Equals(obj._pdus[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfPdus.GetHashCode();
-
-            if (this._pdus.Count > 0)
-            {
-                for (int idx = 0; idx < this._pdus.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._pdus[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/PduHeader.cs b/Libs/CSharpDis7/PduHeader.cs
deleted file mode 100644
index 11ee605..0000000
--- a/Libs/CSharpDis7/PduHeader.cs
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Not used. The PDU Header Record is directly incoroporated into the PDU class. Here for completness only. Section 6.2.66
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class PduHeader
-    {
-        /// <summary>
-        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
-        /// </summary>
-        private byte _protocolVersion = 7;
-
-        /// <summary>
-        /// Exercise ID
-        /// </summary>
-        private byte _exerciseID;
-
-        /// <summary>
-        /// Type of pdu, unique for each PDU class
-        /// </summary>
-        private byte _pduType;
-
-        /// <summary>
-        /// value that refers to the protocol family, eg SimulationManagement, etc
-        /// </summary>
-        private byte _protocolFamily;
-
-        /// <summary>
-        /// Timestamp value
-        /// </summary>
-        private uint _timestamp;
-
-        /// <summary>
-        /// Length, in bytes, of the PDU. Changed name from length to avoid use of Hibernate QL reserved word.
-        /// </summary>
-        private byte _pduLength;
-
-        /// <summary>
-        /// PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
-        /// </summary>
-        private ushort _pduStatus;
-
-        /// <summary>
-        /// zero filled array of padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PduHeader"/> class.
-        /// </summary>
-        public PduHeader()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PduHeader left, PduHeader right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PduHeader left, PduHeader right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._protocolVersion
-            marshalSize += 1;  // this._exerciseID
-            marshalSize += 1;  // this._pduType
-            marshalSize += 1;  // this._protocolFamily
-            marshalSize += 4;  // this._timestamp
-            marshalSize += 1;  // this._pduLength
-            marshalSize += 2;  // this._pduStatus
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
-        public byte ProtocolVersion
-        {
-            get
-            {
-                return this._protocolVersion;
-            }
-
-            set
-            {
-                this._protocolVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Exercise ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
-        public byte ExerciseID
-        {
-            get
-            {
-                return this._exerciseID;
-            }
-
-            set
-            {
-                this._exerciseID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of pdu, unique for each PDU class
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
-        public byte PduType
-        {
-            get
-            {
-                return this._pduType;
-            }
-
-            set
-            {
-                this._pduType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, etc
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
-        public byte ProtocolFamily
-        {
-            get
-            {
-                return this._protocolFamily;
-            }
-
-            set
-            {
-                this._protocolFamily = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Timestamp value
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
-        public uint Timestamp
-        {
-            get
-            {
-                return this._timestamp;
-            }
-
-            set
-            {
-                this._timestamp = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length, in bytes, of the PDU. Changed name from length to avoid use of Hibernate QL reserved word.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduLength")]
-        public byte PduLength
-        {
-            get
-            {
-                return this._pduLength;
-            }
-
-            set
-            {
-                this._pduLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pduStatus")]
-        public ushort PduStatus
-        {
-            get
-            {
-                return this._pduStatus;
-            }
-
-            set
-            {
-                this._pduStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the zero filled array of padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._protocolVersion);
-                    dos.WriteUnsignedByte((byte)this._exerciseID);
-                    dos.WriteUnsignedByte((byte)this._pduType);
-                    dos.WriteUnsignedByte((byte)this._protocolFamily);
-                    dos.WriteUnsignedInt((uint)this._timestamp);
-                    dos.WriteUnsignedByte((byte)this._pduLength);
-                    dos.WriteUnsignedShort((ushort)this._pduStatus);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._protocolVersion = dis.ReadUnsignedByte();
-                    this._exerciseID = dis.ReadUnsignedByte();
-                    this._pduType = dis.ReadUnsignedByte();
-                    this._protocolFamily = dis.ReadUnsignedByte();
-                    this._timestamp = dis.ReadUnsignedInt();
-                    this._pduLength = dis.ReadUnsignedByte();
-                    this._pduStatus = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PduHeader>");
-            try
-            {
-                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
-                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
-                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
-                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
-                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
-                sb.AppendLine("<pduLength type=\"byte\">" + this._pduLength.ToString(CultureInfo.InvariantCulture) + "</pduLength>");
-                sb.AppendLine("<pduStatus type=\"ushort\">" + this._pduStatus.ToString(CultureInfo.InvariantCulture) + "</pduStatus>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</PduHeader>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PduHeader;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PduHeader obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._protocolVersion != obj._protocolVersion)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._exerciseID != obj._exerciseID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduType != obj._pduType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._protocolFamily != obj._protocolFamily)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timestamp != obj._timestamp)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduLength != obj._pduLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduStatus != obj._pduStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
-            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
-            result = GenerateHash(result) ^ this._pduType.GetHashCode();
-            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
-            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
-            result = GenerateHash(result) ^ this._pduLength.GetHashCode();
-            result = GenerateHash(result) ^ this._pduStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/PduStatus.cs b/Libs/CSharpDis7/PduStatus.cs
deleted file mode 100644
index f028bca..0000000
--- a/Libs/CSharpDis7/PduStatus.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// PDU Status. These are a series of bit fields. Represented here as just a byte. Section 6.2.67
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class PduStatus
-    {
-        /// <summary>
-        /// Bit fields
-        /// </summary>
-        private byte _pduStatus;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PduStatus"/> class.
-        /// </summary>
-        public PduStatus()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PduStatus left, PduStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PduStatus left, PduStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._pduStatus
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Bit fields
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduStatus")]
-        public byte PduStatus_
-        {
-            get
-            {
-                return this._pduStatus;
-            }
-
-            set
-            {
-                this._pduStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._pduStatus);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._pduStatus = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PduStatus>");
-            try
-            {
-                sb.AppendLine("<pduStatus type=\"byte\">" + this._pduStatus.ToString(CultureInfo.InvariantCulture) + "</pduStatus>");
-                sb.AppendLine("</PduStatus>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PduStatus;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PduStatus obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._pduStatus != obj._pduStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._pduStatus.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/PduSuperclass.cs b/Libs/CSharpDis7/PduSuperclass.cs
deleted file mode 100644
index ba223c8..0000000
--- a/Libs/CSharpDis7/PduSuperclass.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The superclass for all PDUs, including classic and Live Entity (LE) PDUs. This incorporates the PduHeader record, section 7.2.2
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class PduSuperclass
-    {
-        /// <summary>
-        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
-        /// </summary>
-        private byte _protocolVersion = 7;
-
-        /// <summary>
-        /// Exercise ID
-        /// </summary>
-        private byte _exerciseID;
-
-        /// <summary>
-        /// Type of pdu, unique for each PDU class
-        /// </summary>
-        private byte _pduType;
-
-        /// <summary>
-        /// value that refers to the protocol family, eg SimulationManagement, et
-        /// </summary>
-        private byte _protocolFamily;
-
-        /// <summary>
-        /// Timestamp value
-        /// </summary>
-        private uint _timestamp;
-
-        /// <summary>
-        /// Length, in bytes, of the PDU
-        /// </summary>
-        private ushort _length;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PduSuperclass"/> class.
-        /// </summary>
-        public PduSuperclass()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PduSuperclass left, PduSuperclass right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PduSuperclass left, PduSuperclass right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._protocolVersion
-            marshalSize += 1;  // this._exerciseID
-            marshalSize += 1;  // this._pduType
-            marshalSize += 1;  // this._protocolFamily
-            marshalSize += 4;  // this._timestamp
-            marshalSize += 2;  // this._length
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
-        public byte ProtocolVersion
-        {
-            get
-            {
-                return this._protocolVersion;
-            }
-
-            set
-            {
-                this._protocolVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Exercise ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
-        public byte ExerciseID
-        {
-            get
-            {
-                return this._exerciseID;
-            }
-
-            set
-            {
-                this._exerciseID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of pdu, unique for each PDU class
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
-        public byte PduType
-        {
-            get
-            {
-                return this._pduType;
-            }
-
-            set
-            {
-                this._pduType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, et
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
-        public byte ProtocolFamily
-        {
-            get
-            {
-                return this._protocolFamily;
-            }
-
-            set
-            {
-                this._protocolFamily = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Timestamp value
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
-        public uint Timestamp
-        {
-            get
-            {
-                return this._timestamp;
-            }
-
-            set
-            {
-                this._timestamp = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length, in bytes, of the PDU
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "length")]
-        public ushort Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._protocolVersion);
-                    dos.WriteUnsignedByte((byte)this._exerciseID);
-                    dos.WriteUnsignedByte((byte)this._pduType);
-                    dos.WriteUnsignedByte((byte)this._protocolFamily);
-                    dos.WriteUnsignedInt((uint)this._timestamp);
-                    dos.WriteUnsignedShort((ushort)this._length);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._protocolVersion = dis.ReadUnsignedByte();
-                    this._exerciseID = dis.ReadUnsignedByte();
-                    this._pduType = dis.ReadUnsignedByte();
-                    this._protocolFamily = dis.ReadUnsignedByte();
-                    this._timestamp = dis.ReadUnsignedInt();
-                    this._length = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PduSuperclass>");
-            try
-            {
-                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
-                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
-                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
-                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
-                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
-                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("</PduSuperclass>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PduSuperclass;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PduSuperclass obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._protocolVersion != obj._protocolVersion)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._exerciseID != obj._exerciseID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduType != obj._pduType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._protocolFamily != obj._protocolFamily)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timestamp != obj._timestamp)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
-            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
-            result = GenerateHash(result) ^ this._pduType.GetHashCode();
-            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
-            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/PointObjectStatePdu.cs b/Libs/CSharpDis7/PointObjectStatePdu.cs
deleted file mode 100644
index 963ea88..0000000
--- a/Libs/CSharpDis7/PointObjectStatePdu.cs
+++ /dev/null
@@ -1,652 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// : Inormation abut the addition or modification of a synthecic enviroment object that is anchored to the terrain with a single point. Section 7.10.4 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(ObjectType))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(EulerAngles))]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class PointObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<PointObjectStatePdu>
-    {
-        /// <summary>
-        /// Object in synthetic environment
-        /// </summary>
-        private EntityID _objectID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _referencedObjectID = new EntityID();
-
-        /// <summary>
-        /// unique update number of each state transition of an object
-        /// </summary>
-        private ushort _updateNumber;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// modifications
-        /// </summary>
-        private byte _modifications;
-
-        /// <summary>
-        /// Object type
-        /// </summary>
-        private ObjectType _objectType = new ObjectType();
-
-        /// <summary>
-        /// Object location
-        /// </summary>
-        private Vector3Double _objectLocation = new Vector3Double();
-
-        /// <summary>
-        /// Object orientation
-        /// </summary>
-        private EulerAngles _objectOrientation = new EulerAngles();
-
-        /// <summary>
-        /// Object apperance
-        /// </summary>
-        private double _objectAppearance;
-
-        /// <summary>
-        /// requesterID
-        /// </summary>
-        private SimulationAddress _requesterID = new SimulationAddress();
-
-        /// <summary>
-        /// receiver ID
-        /// </summary>
-        private SimulationAddress _receivingID = new SimulationAddress();
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _pad2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PointObjectStatePdu"/> class.
-        /// </summary>
-        public PointObjectStatePdu()
-        {
-            PduType = (byte)43;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PointObjectStatePdu left, PointObjectStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PointObjectStatePdu left, PointObjectStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
-            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
-            marshalSize += 2;  // this._updateNumber
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._modifications
-            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
-            marshalSize += this._objectLocation.GetMarshalledSize();  // this._objectLocation
-            marshalSize += this._objectOrientation.GetMarshalledSize();  // this._objectOrientation
-            marshalSize += 8;  // this._objectAppearance
-            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += 4;  // this._pad2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object in synthetic environment
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
-        public EntityID ObjectID
-        {
-            get
-            {
-                return this._objectID;
-            }
-
-            set
-            {
-                this._objectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
-        public EntityID ReferencedObjectID
-        {
-            get
-            {
-                return this._referencedObjectID;
-            }
-
-            set
-            {
-                this._referencedObjectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique update number of each state transition of an object
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
-        public ushort UpdateNumber
-        {
-            get
-            {
-                return this._updateNumber;
-            }
-
-            set
-            {
-                this._updateNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the modifications
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
-        public byte Modifications
-        {
-            get
-            {
-                return this._modifications;
-            }
-
-            set
-            {
-                this._modifications = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object type
-        /// </summary>
-        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
-        public ObjectType ObjectType
-        {
-            get
-            {
-                return this._objectType;
-            }
-
-            set
-            {
-                this._objectType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object location
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "objectLocation")]
-        public Vector3Double ObjectLocation
-        {
-            get
-            {
-                return this._objectLocation;
-            }
-
-            set
-            {
-                this._objectLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object orientation
-        /// </summary>
-        [XmlElement(Type = typeof(EulerAngles), ElementName = "objectOrientation")]
-        public EulerAngles ObjectOrientation
-        {
-            get
-            {
-                return this._objectOrientation;
-            }
-
-            set
-            {
-                this._objectOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object apperance
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "objectAppearance")]
-        public double ObjectAppearance
-        {
-            get
-            {
-                return this._objectAppearance;
-            }
-
-            set
-            {
-                this._objectAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the requesterID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
-        public SimulationAddress RequesterID
-        {
-            get
-            {
-                return this._requesterID;
-            }
-
-            set
-            {
-                this._requesterID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receiver ID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
-        public SimulationAddress ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "pad2")]
-        public uint Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._objectID.Marshal(dos);
-                    this._referencedObjectID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._updateNumber);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._modifications);
-                    this._objectType.Marshal(dos);
-                    this._objectLocation.Marshal(dos);
-                    this._objectOrientation.Marshal(dos);
-                    dos.WriteDouble((double)this._objectAppearance);
-                    this._requesterID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._pad2);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._objectID.Unmarshal(dis);
-                    this._referencedObjectID.Unmarshal(dis);
-                    this._updateNumber = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._modifications = dis.ReadUnsignedByte();
-                    this._objectType.Unmarshal(dis);
-                    this._objectLocation.Unmarshal(dis);
-                    this._objectOrientation.Unmarshal(dis);
-                    this._objectAppearance = dis.ReadDouble();
-                    this._requesterID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._pad2 = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PointObjectStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<objectID>");
-                this._objectID.Reflection(sb);
-                sb.AppendLine("</objectID>");
-                sb.AppendLine("<referencedObjectID>");
-                this._referencedObjectID.Reflection(sb);
-                sb.AppendLine("</referencedObjectID>");
-                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
-                sb.AppendLine("<objectType>");
-                this._objectType.Reflection(sb);
-                sb.AppendLine("</objectType>");
-                sb.AppendLine("<objectLocation>");
-                this._objectLocation.Reflection(sb);
-                sb.AppendLine("</objectLocation>");
-                sb.AppendLine("<objectOrientation>");
-                this._objectOrientation.Reflection(sb);
-                sb.AppendLine("</objectOrientation>");
-                sb.AppendLine("<objectAppearance type=\"double\">" + this._objectAppearance.ToString(CultureInfo.InvariantCulture) + "</objectAppearance>");
-                sb.AppendLine("<requesterID>");
-                this._requesterID.Reflection(sb);
-                sb.AppendLine("</requesterID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<pad2 type=\"uint\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("</PointObjectStatePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PointObjectStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PointObjectStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._objectID.Equals(obj._objectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._updateNumber != obj._updateNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modifications != obj._modifications)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectType.Equals(obj._objectType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectLocation.Equals(obj._objectLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectOrientation.Equals(obj._objectOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._objectAppearance != obj._objectAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requesterID.Equals(obj._requesterID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._objectID.GetHashCode();
-            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
-            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._modifications.GetHashCode();
-            result = GenerateHash(result) ^ this._objectType.GetHashCode();
-            result = GenerateHash(result) ^ this._objectLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._objectOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._objectAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/PropulsionSystemData.cs b/Libs/CSharpDis7/PropulsionSystemData.cs
deleted file mode 100644
index b7360e5..0000000
--- a/Libs/CSharpDis7/PropulsionSystemData.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// contains information describing the propulsion systems of the entity. This information shall be provided for each active propulsion system defined. Section 6.2.68
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class PropulsionSystemData
-    {
-        /// <summary>
-        /// powerSetting
-        /// </summary>
-        private float _powerSetting;
-
-        /// <summary>
-        /// engine RPMs
-        /// </summary>
-        private float _engineRpm;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropulsionSystemData"/> class.
-        /// </summary>
-        public PropulsionSystemData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PropulsionSystemData left, PropulsionSystemData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PropulsionSystemData left, PropulsionSystemData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._powerSetting
-            marshalSize += 4;  // this._engineRpm
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the powerSetting
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "powerSetting")]
-        public float PowerSetting
-        {
-            get
-            {
-                return this._powerSetting;
-            }
-
-            set
-            {
-                this._powerSetting = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the engine RPMs
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "engineRpm")]
-        public float EngineRpm
-        {
-            get
-            {
-                return this._engineRpm;
-            }
-
-            set
-            {
-                this._engineRpm = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._powerSetting);
-                    dos.WriteFloat((float)this._engineRpm);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._powerSetting = dis.ReadFloat();
-                    this._engineRpm = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PropulsionSystemData>");
-            try
-            {
-                sb.AppendLine("<powerSetting type=\"float\">" + this._powerSetting.ToString(CultureInfo.InvariantCulture) + "</powerSetting>");
-                sb.AppendLine("<engineRpm type=\"float\">" + this._engineRpm.ToString(CultureInfo.InvariantCulture) + "</engineRpm>");
-                sb.AppendLine("</PropulsionSystemData>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PropulsionSystemData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PropulsionSystemData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._powerSetting != obj._powerSetting)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._engineRpm != obj._engineRpm)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._powerSetting.GetHashCode();
-            result = GenerateHash(result) ^ this._engineRpm.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs b/Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
deleted file mode 100644
index ed02477..0000000
--- a/Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Abstract superclass for radio communications PDUs. Section 7.7
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RadioCommunicationsFamilyPdu : Pdu, IEquatable<RadioCommunicationsFamilyPdu>
-    {
-        /// <summary>
-        /// ID of the entitythat is the source of the communication
-        /// </summary>
-        private EntityID _entityId = new EntityID();
-
-        /// <summary>
-        /// particular radio within an entity
-        /// </summary>
-        private ushort _radioId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioCommunicationsFamilyPdu"/> class.
-        /// </summary>
-        public RadioCommunicationsFamilyPdu()
-        {
-            ProtocolFamily = (byte)4;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
-            marshalSize += 2;  // this._radioId
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entitythat is the source of the communication
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
-        public EntityID EntityId
-        {
-            get
-            {
-                return this._entityId;
-            }
-
-            set
-            {
-                this._entityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the particular radio within an entity
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "radioId")]
-        public ushort RadioId
-        {
-            get
-            {
-                return this._radioId;
-            }
-
-            set
-            {
-                this._radioId = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityId.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._radioId);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityId.Unmarshal(dis);
-                    this._radioId = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RadioCommunicationsFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityId>");
-                this._entityId.Reflection(sb);
-                sb.AppendLine("</entityId>");
-                sb.AppendLine("<radioId type=\"ushort\">" + this._radioId.ToString(CultureInfo.InvariantCulture) + "</radioId>");
-                sb.AppendLine("</RadioCommunicationsFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RadioCommunicationsFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioCommunicationsFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityId.Equals(obj._entityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._radioId != obj._radioId)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityId.GetHashCode();
-            result = GenerateHash(result) ^ this._radioId.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RadioIdentifier.cs b/Libs/CSharpDis7/RadioIdentifier.cs
deleted file mode 100644
index 1b543c9..0000000
--- a/Libs/CSharpDis7/RadioIdentifier.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of an attached or unattached radio in an event or exercise Section 6.2.69
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RadioIdentifier
-    {
-        /// <summary>
-        ///  site
-        /// </summary>
-        private ushort _siteNumber;
-
-        /// <summary>
-        /// application number
-        /// </summary>
-        private ushort _applicationNumber;
-
-        /// <summary>
-        ///  reference number
-        /// </summary>
-        private ushort _referenceNumber;
-
-        /// <summary>
-        ///  Radio number
-        /// </summary>
-        private ushort _radioNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioIdentifier"/> class.
-        /// </summary>
-        public RadioIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioIdentifier left, RadioIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioIdentifier left, RadioIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._siteNumber
-            marshalSize += 2;  // this._applicationNumber
-            marshalSize += 2;  // this._referenceNumber
-            marshalSize += 2;  // this._radioNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the  site
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "siteNumber")]
-        public ushort SiteNumber
-        {
-            get
-            {
-                return this._siteNumber;
-            }
-
-            set
-            {
-                this._siteNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the application number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "applicationNumber")]
-        public ushort ApplicationNumber
-        {
-            get
-            {
-                return this._applicationNumber;
-            }
-
-            set
-            {
-                this._applicationNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  reference number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
-        public ushort ReferenceNumber
-        {
-            get
-            {
-                return this._referenceNumber;
-            }
-
-            set
-            {
-                this._referenceNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  Radio number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "radioNumber")]
-        public ushort RadioNumber
-        {
-            get
-            {
-                return this._radioNumber;
-            }
-
-            set
-            {
-                this._radioNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._siteNumber);
-                    dos.WriteUnsignedShort((ushort)this._applicationNumber);
-                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
-                    dos.WriteUnsignedShort((ushort)this._radioNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._siteNumber = dis.ReadUnsignedShort();
-                    this._applicationNumber = dis.ReadUnsignedShort();
-                    this._referenceNumber = dis.ReadUnsignedShort();
-                    this._radioNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RadioIdentifier>");
-            try
-            {
-                sb.AppendLine("<siteNumber type=\"ushort\">" + this._siteNumber.ToString(CultureInfo.InvariantCulture) + "</siteNumber>");
-                sb.AppendLine("<applicationNumber type=\"ushort\">" + this._applicationNumber.ToString(CultureInfo.InvariantCulture) + "</applicationNumber>");
-                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
-                sb.AppendLine("<radioNumber type=\"ushort\">" + this._radioNumber.ToString(CultureInfo.InvariantCulture) + "</radioNumber>");
-                sb.AppendLine("</RadioIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RadioIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._siteNumber != obj._siteNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._applicationNumber != obj._applicationNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._referenceNumber != obj._referenceNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._radioNumber != obj._radioNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._siteNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._applicationNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._radioNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RadioType.cs b/Libs/CSharpDis7/RadioType.cs
deleted file mode 100644
index 77f87f1..0000000
--- a/Libs/CSharpDis7/RadioType.cs
+++ /dev/null
@@ -1,457 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Identifies the type of radio. Section 6.2.70
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RadioType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _subcategory;
-
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioType"/> class.
-        /// </summary>
-        public RadioType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioType left, RadioType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioType left, RadioType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RadioType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("</RadioType>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RadioType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ReceiverPdu.cs b/Libs/CSharpDis7/ReceiverPdu.cs
deleted file mode 100644
index 169879d..0000000
--- a/Libs/CSharpDis7/ReceiverPdu.cs
+++ /dev/null
@@ -1,412 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Communication of a receiver state. Section 7.7.4 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class ReceiverPdu : RadioCommunicationsFamilyPdu, IEquatable<ReceiverPdu>
-    {
-        /// <summary>
-        /// encoding scheme used, and enumeration
-        /// </summary>
-        private ushort _receiverState;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// received power
-        /// </summary>
-        private float _receivedPoser;
-
-        /// <summary>
-        /// ID of transmitter
-        /// </summary>
-        private EntityID _transmitterEntityId = new EntityID();
-
-        /// <summary>
-        /// ID of transmitting radio
-        /// </summary>
-        private ushort _transmitterRadioId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReceiverPdu"/> class.
-        /// </summary>
-        public ReceiverPdu()
-        {
-            PduType = (byte)27;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ReceiverPdu left, ReceiverPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ReceiverPdu left, ReceiverPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._receiverState
-            marshalSize += 2;  // this._padding1
-            marshalSize += 4;  // this._receivedPoser
-            marshalSize += this._transmitterEntityId.GetMarshalledSize();  // this._transmitterEntityId
-            marshalSize += 2;  // this._transmitterRadioId
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the encoding scheme used, and enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "receiverState")]
-        public ushort ReceiverState
-        {
-            get
-            {
-                return this._receiverState;
-            }
-
-            set
-            {
-                this._receiverState = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the received power
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "receivedPoser")]
-        public float ReceivedPoser
-        {
-            get
-            {
-                return this._receivedPoser;
-            }
-
-            set
-            {
-                this._receivedPoser = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of transmitter
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "transmitterEntityId")]
-        public EntityID TransmitterEntityId
-        {
-            get
-            {
-                return this._transmitterEntityId;
-            }
-
-            set
-            {
-                this._transmitterEntityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of transmitting radio
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "transmitterRadioId")]
-        public ushort TransmitterRadioId
-        {
-            get
-            {
-                return this._transmitterRadioId;
-            }
-
-            set
-            {
-                this._transmitterRadioId = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._receiverState);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteFloat((float)this._receivedPoser);
-                    this._transmitterEntityId.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._transmitterRadioId);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receiverState = dis.ReadUnsignedShort();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._receivedPoser = dis.ReadFloat();
-                    this._transmitterEntityId.Unmarshal(dis);
-                    this._transmitterRadioId = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ReceiverPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receiverState type=\"ushort\">" + this._receiverState.ToString(CultureInfo.InvariantCulture) + "</receiverState>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<receivedPoser type=\"float\">" + this._receivedPoser.ToString(CultureInfo.InvariantCulture) + "</receivedPoser>");
-                sb.AppendLine("<transmitterEntityId>");
-                this._transmitterEntityId.Reflection(sb);
-                sb.AppendLine("</transmitterEntityId>");
-                sb.AppendLine("<transmitterRadioId type=\"ushort\">" + this._transmitterRadioId.ToString(CultureInfo.InvariantCulture) + "</transmitterRadioId>");
-                sb.AppendLine("</ReceiverPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ReceiverPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ReceiverPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._receiverState != obj._receiverState)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._receivedPoser != obj._receivedPoser)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._transmitterEntityId.Equals(obj._transmitterEntityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitterRadioId != obj._transmitterRadioId)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receiverState.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._receivedPoser.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitterEntityId.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitterRadioId.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RecordQueryReliablePdu.cs b/Libs/CSharpDis7/RecordQueryReliablePdu.cs
deleted file mode 100644
index 2406e53..0000000
--- a/Libs/CSharpDis7/RecordQueryReliablePdu.cs
+++ /dev/null
@@ -1,544 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.13: A request for one or more records of data from an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FourByteChunk))]
-    public partial class RecordQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RecordQueryReliablePdu>
-    {
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding. The spec is unclear and contradictory here.
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// event type
-        /// </summary>
-        private ushort _eventType;
-
-        /// <summary>
-        /// time
-        /// </summary>
-        private uint _time;
-
-        /// <summary>
-        /// numberOfRecords
-        /// </summary>
-        private uint _numberOfRecords;
-
-        /// <summary>
-        /// record IDs
-        /// </summary>
-        private List<FourByteChunk> _recordIDs = new List<FourByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RecordQueryReliablePdu"/> class.
-        /// </summary>
-        public RecordQueryReliablePdu()
-        {
-            PduType = (byte)63;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 2;  // this._eventType
-            marshalSize += 4;  // this._time
-            marshalSize += 4;  // this._numberOfRecords
-            for (int idx = 0; idx < this._recordIDs.Count; idx++)
-            {
-                FourByteChunk listElement = (FourByteChunk)this._recordIDs[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding. The spec is unclear and contradictory here.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the event type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
-        public ushort EventType
-        {
-            get
-            {
-                return this._eventType;
-            }
-
-            set
-            {
-                this._eventType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "time")]
-        public uint Time
-        {
-            get
-            {
-                return this._time;
-            }
-
-            set
-            {
-                this._time = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecords")]
-        public uint NumberOfRecords
-        {
-            get
-            {
-                return this._numberOfRecords;
-            }
-
-            set
-            {
-                this._numberOfRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the record IDs
-        /// </summary>
-        [XmlElement(ElementName = "recordIDsList", Type = typeof(List<FourByteChunk>))]
-        public List<FourByteChunk> RecordIDs
-        {
-            get
-            {
-                return this._recordIDs;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedShort((ushort)this._eventType);
-                    dos.WriteUnsignedInt((uint)this._time);
-                    dos.WriteUnsignedInt((uint)this._recordIDs.Count);
-
-                    for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                    {
-                        FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
-                        aFourByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._eventType = dis.ReadUnsignedShort();
-                    this._time = dis.ReadUnsignedInt();
-                    this._numberOfRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfRecords; idx++)
-                    {
-                        FourByteChunk anX = new FourByteChunk();
-                        anX.Unmarshal(dis);
-                        this._recordIDs.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RecordQueryReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
-                sb.AppendLine("<time type=\"uint\">" + this._time.ToString(CultureInfo.InvariantCulture) + "</time>");
-                sb.AppendLine("<recordIDs type=\"uint\">" + this._recordIDs.Count.ToString(CultureInfo.InvariantCulture) + "</recordIDs>");
-                for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                {
-                    sb.AppendLine("<recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
-                    FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
-                    aFourByteChunk.Reflection(sb);
-                    sb.AppendLine("</recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</RecordQueryReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RecordQueryReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RecordQueryReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._eventType != obj._eventType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._time != obj._time)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfRecords != obj._numberOfRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordIDs.Count != obj._recordIDs.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                {
-                    if (!this._recordIDs[idx].Equals(obj._recordIDs[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._eventType.GetHashCode();
-            result = GenerateHash(result) ^ this._time.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfRecords.GetHashCode();
-
-            if (this._recordIDs.Count > 0)
-            {
-                for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._recordIDs[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RecordQuerySpecification.cs b/Libs/CSharpDis7/RecordQuerySpecification.cs
deleted file mode 100644
index 095e8b5..0000000
--- a/Libs/CSharpDis7/RecordQuerySpecification.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The identification of the records being queried 6.2.71
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FourByteChunk))]
-    public partial class RecordQuerySpecification
-    {
-        private uint _numberOfRecords;
-
-        /// <summary>
-        /// variable length list of 32 bit records
-        /// </summary>
-        private List<FourByteChunk> _records = new List<FourByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RecordQuerySpecification"/> class.
-        /// </summary>
-        public RecordQuerySpecification()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RecordQuerySpecification left, RecordQuerySpecification right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RecordQuerySpecification left, RecordQuerySpecification right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._numberOfRecords
-            for (int idx = 0; idx < this._records.Count; idx++)
-            {
-                FourByteChunk listElement = (FourByteChunk)this._records[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecords")]
-        public uint NumberOfRecords
-        {
-            get
-            {
-                return this._numberOfRecords;
-            }
-
-            set
-            {
-                this._numberOfRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of 32 bit records
-        /// </summary>
-        [XmlElement(ElementName = "recordsList", Type = typeof(List<FourByteChunk>))]
-        public List<FourByteChunk> Records
-        {
-            get
-            {
-                return this._records;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._records.Count);
-
-                    for (int idx = 0; idx < this._records.Count; idx++)
-                    {
-                        FourByteChunk aFourByteChunk = (FourByteChunk)this._records[idx];
-                        aFourByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfRecords; idx++)
-                    {
-                        FourByteChunk anX = new FourByteChunk();
-                        anX.Unmarshal(dis);
-                        this._records.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RecordQuerySpecification>");
-            try
-            {
-                sb.AppendLine("<records type=\"uint\">" + this._records.Count.ToString(CultureInfo.InvariantCulture) + "</records>");
-                for (int idx = 0; idx < this._records.Count; idx++)
-                {
-                    sb.AppendLine("<records" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
-                    FourByteChunk aFourByteChunk = (FourByteChunk)this._records[idx];
-                    aFourByteChunk.Reflection(sb);
-                    sb.AppendLine("</records" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</RecordQuerySpecification>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RecordQuerySpecification;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RecordQuerySpecification obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._numberOfRecords != obj._numberOfRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._records.Count != obj._records.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._records.Count; idx++)
-                {
-                    if (!this._records[idx].Equals(obj._records[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfRecords.GetHashCode();
-
-            if (this._records.Count > 0)
-            {
-                for (int idx = 0; idx < this._records.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._records[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RecordSpecification.cs b/Libs/CSharpDis7/RecordSpecification.cs
deleted file mode 100644
index b8404bc..0000000
--- a/Libs/CSharpDis7/RecordSpecification.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// This record shall specify the number of record sets contained in the Record Specification record and the record details. Section 6.2.72.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(RecordSpecificationElement))]
-    public partial class RecordSpecification
-    {
-        /// <summary>
-        /// The number of record sets
-        /// </summary>
-        private uint _numberOfRecordSets;
-
-        /// <summary>
-        /// variable length list record specifications.
-        /// </summary>
-        private List<RecordSpecificationElement> _recordSets = new List<RecordSpecificationElement>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RecordSpecification"/> class.
-        /// </summary>
-        public RecordSpecification()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RecordSpecification left, RecordSpecification right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RecordSpecification left, RecordSpecification right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._numberOfRecordSets
-            for (int idx = 0; idx < this._recordSets.Count; idx++)
-            {
-                RecordSpecificationElement listElement = (RecordSpecificationElement)this._recordSets[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfRecordSets method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecordSets")]
-        public uint NumberOfRecordSets
-        {
-            get
-            {
-                return this._numberOfRecordSets;
-            }
-
-            set
-            {
-                this._numberOfRecordSets = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list record specifications.
-        /// </summary>
-        [XmlElement(ElementName = "recordSetsList", Type = typeof(List<RecordSpecificationElement>))]
-        public List<RecordSpecificationElement> RecordSets
-        {
-            get
-            {
-                return this._recordSets;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordSets.Count);
-
-                    for (int idx = 0; idx < this._recordSets.Count; idx++)
-                    {
-                        RecordSpecificationElement aRecordSpecificationElement = (RecordSpecificationElement)this._recordSets[idx];
-                        aRecordSpecificationElement.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfRecordSets = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfRecordSets; idx++)
-                    {
-                        RecordSpecificationElement anX = new RecordSpecificationElement();
-                        anX.Unmarshal(dis);
-                        this._recordSets.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RecordSpecification>");
-            try
-            {
-                sb.AppendLine("<recordSets type=\"uint\">" + this._recordSets.Count.ToString(CultureInfo.InvariantCulture) + "</recordSets>");
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    sb.AppendLine("<recordSets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"RecordSpecificationElement\">");
-                    RecordSpecificationElement aRecordSpecificationElement = (RecordSpecificationElement)this._recordSets[idx];
-                    aRecordSpecificationElement.Reflection(sb);
-                    sb.AppendLine("</recordSets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</RecordSpecification>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RecordSpecification;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RecordSpecification obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._numberOfRecordSets != obj._numberOfRecordSets)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSets.Count != obj._recordSets.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    if (!this._recordSets[idx].Equals(obj._recordSets[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfRecordSets.GetHashCode();
-
-            if (this._recordSets.Count > 0)
-            {
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._recordSets[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RecordSpecificationElement.cs b/Libs/CSharpDis7/RecordSpecificationElement.cs
deleted file mode 100644
index 67f348d..0000000
--- a/Libs/CSharpDis7/RecordSpecificationElement.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Synthetic record, made up from section 6.2.72. This is used to acheive a repeating variable list element.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RecordSpecificationElement
-    {
-        /// <summary>
-        /// the data structure used to convey the parameter values of the record for each record. 32 bit enumeration.
-        /// </summary>
-        private uint _recordID;
-
-        /// <summary>
-        /// the serial number of the first record in the block of records
-        /// </summary>
-        private uint _recordSetSerialNumber;
-
-        /// <summary>
-        ///  the length, in bits, of the record. Note, bits, not bytes.
-        /// </summary>
-        private ushort _recordLength;
-
-        /// <summary>
-        ///  the number of records included in the record set 
-        /// </summary>
-        private ushort _recordCount;
-
-        /// <summary>
-        /// the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. ^^^This is wrong--variable sized data records, bit values. THis MUST be patched after generation.
-        /// </summary>
-        private ushort _recordValues;
-
-        /// <summary>
-        /// Padding of 0 to 31 unused bits as required for 32-bit alignment of the Record Set field. ^^^This is wrong--variable sized padding. MUST be patched post-code generation
-        /// </summary>
-        private byte _pad4;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RecordSpecificationElement"/> class.
-        /// </summary>
-        public RecordSpecificationElement()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RecordSpecificationElement left, RecordSpecificationElement right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RecordSpecificationElement left, RecordSpecificationElement right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordID
-            marshalSize += 4;  // this._recordSetSerialNumber
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 2;  // this._recordCount
-            marshalSize += 2;  // this._recordValues
-            marshalSize += 1;  // this._pad4
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the data structure used to convey the parameter values of the record for each record. 32 bit enumeration.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordID")]
-        public uint RecordID
-        {
-            get
-            {
-                return this._recordID;
-            }
-
-            set
-            {
-                this._recordID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the serial number of the first record in the block of records
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordSetSerialNumber")]
-        public uint RecordSetSerialNumber
-        {
-            get
-            {
-                return this._recordSetSerialNumber;
-            }
-
-            set
-            {
-                this._recordSetSerialNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  the length, in bits, of the record. Note, bits, not bytes.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  the number of records included in the record set 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordCount")]
-        public ushort RecordCount
-        {
-            get
-            {
-                return this._recordCount;
-            }
-
-            set
-            {
-                this._recordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. ^^^This is wrong--variable sized data records, bit values. THis MUST be patched after generation.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordValues")]
-        public ushort RecordValues
-        {
-            get
-            {
-                return this._recordValues;
-            }
-
-            set
-            {
-                this._recordValues = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding of 0 to 31 unused bits as required for 32-bit alignment of the Record Set field. ^^^This is wrong--variable sized padding. MUST be patched post-code generation
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad4")]
-        public byte Pad4
-        {
-            get
-            {
-                return this._pad4;
-            }
-
-            set
-            {
-                this._pad4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordID);
-                    dos.WriteUnsignedInt((uint)this._recordSetSerialNumber);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedShort((ushort)this._recordCount);
-                    dos.WriteUnsignedShort((ushort)this._recordValues);
-                    dos.WriteUnsignedByte((byte)this._pad4);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordID = dis.ReadUnsignedInt();
-                    this._recordSetSerialNumber = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._recordCount = dis.ReadUnsignedShort();
-                    this._recordValues = dis.ReadUnsignedShort();
-                    this._pad4 = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RecordSpecificationElement>");
-            try
-            {
-                sb.AppendLine("<recordID type=\"uint\">" + this._recordID.ToString(CultureInfo.InvariantCulture) + "</recordID>");
-                sb.AppendLine("<recordSetSerialNumber type=\"uint\">" + this._recordSetSerialNumber.ToString(CultureInfo.InvariantCulture) + "</recordSetSerialNumber>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<recordCount type=\"ushort\">" + this._recordCount.ToString(CultureInfo.InvariantCulture) + "</recordCount>");
-                sb.AppendLine("<recordValues type=\"ushort\">" + this._recordValues.ToString(CultureInfo.InvariantCulture) + "</recordValues>");
-                sb.AppendLine("<pad4 type=\"byte\">" + this._pad4.ToString(CultureInfo.InvariantCulture) + "</pad4>");
-                sb.AppendLine("</RecordSpecificationElement>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RecordSpecificationElement;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RecordSpecificationElement obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordID != obj._recordID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSetSerialNumber != obj._recordSetSerialNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordCount != obj._recordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordValues != obj._recordValues)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad4 != obj._pad4)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordID.GetHashCode();
-            result = GenerateHash(result) ^ this._recordSetSerialNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._recordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._recordValues.GetHashCode();
-            result = GenerateHash(result) ^ this._pad4.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Relationship.cs b/Libs/CSharpDis7/Relationship.cs
deleted file mode 100644
index 025cc14..0000000
--- a/Libs/CSharpDis7/Relationship.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The relationship of the part entity to its host entity. Section 6.2.73.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Relationship
-    {
-        /// <summary>
-        /// the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration
-        /// </summary>
-        private ushort _nature;
-
-        /// <summary>
-        /// the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration
-        /// </summary>
-        private ushort _position;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Relationship"/> class.
-        /// </summary>
-        public Relationship()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Relationship left, Relationship right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Relationship left, Relationship right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._nature
-            marshalSize += 2;  // this._position
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "nature")]
-        public ushort Nature
-        {
-            get
-            {
-                return this._nature;
-            }
-
-            set
-            {
-                this._nature = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "position")]
-        public ushort Position
-        {
-            get
-            {
-                return this._position;
-            }
-
-            set
-            {
-                this._position = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._nature);
-                    dos.WriteUnsignedShort((ushort)this._position);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._nature = dis.ReadUnsignedShort();
-                    this._position = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Relationship>");
-            try
-            {
-                sb.AppendLine("<nature type=\"ushort\">" + this._nature.ToString(CultureInfo.InvariantCulture) + "</nature>");
-                sb.AppendLine("<position type=\"ushort\">" + this._position.ToString(CultureInfo.InvariantCulture) + "</position>");
-                sb.AppendLine("</Relationship>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Relationship;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Relationship obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._nature != obj._nature)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._position != obj._position)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._nature.GetHashCode();
-            result = GenerateHash(result) ^ this._position.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RemoveEntityPdu.cs b/Libs/CSharpDis7/RemoveEntityPdu.cs
deleted file mode 100644
index fa02d58..0000000
--- a/Libs/CSharpDis7/RemoveEntityPdu.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.3 The removal of an entity from an exercise shall be communicated with a Remove Entity PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RemoveEntityPdu : SimulationManagementFamilyPdu, IEquatable<RemoveEntityPdu>
-    {
-        /// <summary>
-        /// Identifier for originating entity(or simulation)
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the receiving entity(or simulation)
-        /// </summary>
-        private EntityID _receivingID = new EntityID();
-
-        /// <summary>
-        /// This field shall identify the specific and unique start/resume request being made by the SM
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RemoveEntityPdu"/> class.
-        /// </summary>
-        public RemoveEntityPdu()
-        {
-            PduType = (byte)12;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RemoveEntityPdu left, RemoveEntityPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RemoveEntityPdu left, RemoveEntityPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for originating entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the receiving entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
-        public EntityID ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the specific and unique start/resume request being made by the SM
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RemoveEntityPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</RemoveEntityPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RemoveEntityPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RemoveEntityPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RemoveEntityReliablePdu.cs b/Libs/CSharpDis7/RemoveEntityReliablePdu.cs
deleted file mode 100644
index 836e9ff..0000000
--- a/Libs/CSharpDis7/RemoveEntityReliablePdu.cs
+++ /dev/null
@@ -1,377 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.2: Removal of an entity , reliable. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RemoveEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RemoveEntityReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RemoveEntityReliablePdu"/> class.
-        /// </summary>
-        public RemoveEntityReliablePdu()
-        {
-            PduType = (byte)52;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RemoveEntityReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</RemoveEntityReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RemoveEntityReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RemoveEntityReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RepairCompletePdu.cs b/Libs/CSharpDis7/RepairCompletePdu.cs
deleted file mode 100644
index 59999d3..0000000
--- a/Libs/CSharpDis7/RepairCompletePdu.cs
+++ /dev/null
@@ -1,382 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.4.6. Service Request PDU is received and repair is complete. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RepairCompletePdu : LogisticsFamilyPdu, IEquatable<RepairCompletePdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service.  See 6.2.28
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying.  See 6.2.28
-        /// </summary>
-        private EntityID _repairingEntityID = new EntityID();
-
-        /// <summary>
-        /// Enumeration for type of repair.  See 6.2.74
-        /// </summary>
-        private ushort _repair;
-
-        /// <summary>
-        /// padding, number prevents conflict with superclass ivar name
-        /// </summary>
-        private short _padding4;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RepairCompletePdu"/> class.
-        /// </summary>
-        public RepairCompletePdu()
-        {
-            PduType = (byte)9;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RepairCompletePdu left, RepairCompletePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RepairCompletePdu left, RepairCompletePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
-            marshalSize += 2;  // this._repair
-            marshalSize += 2;  // this._padding4
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service.  See 6.2.28
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying.  See 6.2.28
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
-        public EntityID RepairingEntityID
-        {
-            get
-            {
-                return this._repairingEntityID;
-            }
-
-            set
-            {
-                this._repairingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Enumeration for type of repair.  See 6.2.74
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "repair")]
-        public ushort Repair
-        {
-            get
-            {
-                return this._repair;
-            }
-
-            set
-            {
-                this._repair = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding, number prevents conflict with superclass ivar name
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding4")]
-        public short Padding4
-        {
-            get
-            {
-                return this._padding4;
-            }
-
-            set
-            {
-                this._padding4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._repairingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._repair);
-                    dos.WriteShort((short)this._padding4);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._repairingEntityID.Unmarshal(dis);
-                    this._repair = dis.ReadUnsignedShort();
-                    this._padding4 = dis.ReadShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RepairCompletePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<repairingEntityID>");
-                this._repairingEntityID.Reflection(sb);
-                sb.AppendLine("</repairingEntityID>");
-                sb.AppendLine("<repair type=\"ushort\">" + this._repair.ToString(CultureInfo.InvariantCulture) + "</repair>");
-                sb.AppendLine("<padding4 type=\"short\">" + this._padding4.ToString(CultureInfo.InvariantCulture) + "</padding4>");
-                sb.AppendLine("</RepairCompletePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RepairCompletePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RepairCompletePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._repair != obj._repair)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding4 != obj._padding4)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repair.GetHashCode();
-            result = GenerateHash(result) ^ this._padding4.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/RepairResponsePdu.cs b/Libs/CSharpDis7/RepairResponsePdu.cs
deleted file mode 100644
index 3976fa1..0000000
--- a/Libs/CSharpDis7/RepairResponsePdu.cs
+++ /dev/null
@@ -1,414 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.4.7. Sent after repair complete PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RepairResponsePdu : LogisticsFamilyPdu, IEquatable<RepairResponsePdu>
-    {
-        /// <summary>
-        /// Entity that requested repairs.  See 6.2.28
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is repairing.  See 6.2.28
-        /// </summary>
-        private EntityID _repairingEntityID = new EntityID();
-
-        /// <summary>
-        /// Result of repair operation
-        /// </summary>
-        private byte _repairResult;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RepairResponsePdu"/> class.
-        /// </summary>
-        public RepairResponsePdu()
-        {
-            PduType = (byte)10;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RepairResponsePdu left, RepairResponsePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RepairResponsePdu left, RepairResponsePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
-            marshalSize += 1;  // this._repairResult
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that requested repairs.  See 6.2.28
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is repairing.  See 6.2.28
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
-        public EntityID RepairingEntityID
-        {
-            get
-            {
-                return this._repairingEntityID;
-            }
-
-            set
-            {
-                this._repairingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Result of repair operation
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "repairResult")]
-        public byte RepairResult
-        {
-            get
-            {
-                return this._repairResult;
-            }
-
-            set
-            {
-                this._repairResult = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._repairingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._repairResult);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._repairingEntityID.Unmarshal(dis);
-                    this._repairResult = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RepairResponsePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<repairingEntityID>");
-                this._repairingEntityID.Reflection(sb);
-                sb.AppendLine("</repairingEntityID>");
-                sb.AppendLine("<repairResult type=\"byte\">" + this._repairResult.ToString(CultureInfo.InvariantCulture) + "</repairResult>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("</RepairResponsePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RepairResponsePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RepairResponsePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._repairResult != obj._repairResult)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairResult.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ResupplyOfferPdu.cs b/Libs/CSharpDis7/ResupplyOfferPdu.cs
deleted file mode 100644
index 52bc92d..0000000
--- a/Libs/CSharpDis7/ResupplyOfferPdu.cs
+++ /dev/null
@@ -1,485 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information used to communicate the offer of supplies by a supplying entity to a receiving entity. Section 7.4.3 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ResupplyOfferPdu : LogisticsFamilyPdu, IEquatable<ResupplyOfferPdu>
-    {
-        /// <summary>
-        /// Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Identifies the Entity and respective Entity ID Record that is supplying  (see 6.2.28), Section 7.4.3
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// How many supplies types are being offered, Section 7.4.3
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding2;
-
-        /// <summary>
-        /// A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3
-        /// </summary>
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyOfferPdu"/> class.
-        /// </summary>
-        public ResupplyOfferPdu()
-        {
-            PduType = (byte)6;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyOfferPdu left, ResupplyOfferPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyOfferPdu left, ResupplyOfferPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 1;  // this._padding1
-            marshalSize += 2;  // this._padding2
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifies the Entity and respective Entity ID Record that is supplying  (see 6.2.28), Section 7.4.3
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding2")]
-        public short Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteByte((byte)this._padding1);
-                    dos.WriteShort((short)this._padding2);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadByte();
-                    this._padding2 = dis.ReadShort();
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyOfferPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"short\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ResupplyOfferPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyOfferPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyOfferPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ResupplyReceivedPdu.cs b/Libs/CSharpDis7/ResupplyReceivedPdu.cs
deleted file mode 100644
index db6d460..0000000
--- a/Libs/CSharpDis7/ResupplyReceivedPdu.cs
+++ /dev/null
@@ -1,485 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.4.4. Receipt of supplies is communicated by issuing Resupply Received PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ResupplyReceivedPdu : LogisticsFamilyPdu, IEquatable<ResupplyReceivedPdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service.  Shall be represented by Entity Identifier record (see 6.2.28)
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying.  Shall be represented by Entity Identifier record (see 6.2.28)
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// How many supplies are taken by receiving entity
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// Type and amount of supplies for each specified supply type.  See 6.2.85 for supply quantity record.
-        /// </summary>
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyReceivedPdu"/> class.
-        /// </summary>
-        public ResupplyReceivedPdu()
-        {
-            PduType = (byte)7;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service.  Shall be represented by Entity Identifier record (see 6.2.28)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying.  Shall be represented by Entity Identifier record (see 6.2.28)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type and amount of supplies for each specified supply type.  See 6.2.85 for supply quantity record.
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyReceivedPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ResupplyReceivedPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyReceivedPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyReceivedPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SecondaryOperationalData.cs b/Libs/CSharpDis7/SecondaryOperationalData.cs
deleted file mode 100644
index 8c65209..0000000
--- a/Libs/CSharpDis7/SecondaryOperationalData.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Additional operational data for an IFF emitting system and the number of IFF Fundamental Parameter Data records Section 6.2.76.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SecondaryOperationalData
-    {
-        /// <summary>
-        /// additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
-        /// </summary>
-        private byte _operationalData1;
-
-        /// <summary>
-        /// additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
-        /// </summary>
-        private byte _operationalData2;
-
-        /// <summary>
-        /// the number of IFF Fundamental Parameter Data records that follow
-        /// </summary>
-        private ushort _numberOfIFFFundamentalParameterRecords;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SecondaryOperationalData"/> class.
-        /// </summary>
-        public SecondaryOperationalData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SecondaryOperationalData left, SecondaryOperationalData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SecondaryOperationalData left, SecondaryOperationalData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._operationalData1
-            marshalSize += 1;  // this._operationalData2
-            marshalSize += 2;  // this._numberOfIFFFundamentalParameterRecords
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "operationalData1")]
-        public byte OperationalData1
-        {
-            get
-            {
-                return this._operationalData1;
-            }
-
-            set
-            {
-                this._operationalData1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "operationalData2")]
-        public byte OperationalData2
-        {
-            get
-            {
-                return this._operationalData2;
-            }
-
-            set
-            {
-                this._operationalData2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the number of IFF Fundamental Parameter Data records that follow
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfIFFFundamentalParameterRecords")]
-        public ushort NumberOfIFFFundamentalParameterRecords
-        {
-            get
-            {
-                return this._numberOfIFFFundamentalParameterRecords;
-            }
-
-            set
-            {
-                this._numberOfIFFFundamentalParameterRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._operationalData1);
-                    dos.WriteUnsignedByte((byte)this._operationalData2);
-                    dos.WriteUnsignedShort((ushort)this._numberOfIFFFundamentalParameterRecords);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._operationalData1 = dis.ReadUnsignedByte();
-                    this._operationalData2 = dis.ReadUnsignedByte();
-                    this._numberOfIFFFundamentalParameterRecords = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SecondaryOperationalData>");
-            try
-            {
-                sb.AppendLine("<operationalData1 type=\"byte\">" + this._operationalData1.ToString(CultureInfo.InvariantCulture) + "</operationalData1>");
-                sb.AppendLine("<operationalData2 type=\"byte\">" + this._operationalData2.ToString(CultureInfo.InvariantCulture) + "</operationalData2>");
-                sb.AppendLine("<numberOfIFFFundamentalParameterRecords type=\"ushort\">" + this._numberOfIFFFundamentalParameterRecords.ToString(CultureInfo.InvariantCulture) + "</numberOfIFFFundamentalParameterRecords>");
-                sb.AppendLine("</SecondaryOperationalData>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SecondaryOperationalData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SecondaryOperationalData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._operationalData1 != obj._operationalData1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._operationalData2 != obj._operationalData2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfIFFFundamentalParameterRecords != obj._numberOfIFFFundamentalParameterRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._operationalData1.GetHashCode();
-            result = GenerateHash(result) ^ this._operationalData2.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfIFFFundamentalParameterRecords.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SeesPdu.cs b/Libs/CSharpDis7/SeesPdu.cs
deleted file mode 100644
index 75bc0ff..0000000
--- a/Libs/CSharpDis7/SeesPdu.cs
+++ /dev/null
@@ -1,586 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  SEES PDU, supplemental emissions entity state information. Section 7.6.6 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(PropulsionSystemData))]
-    [XmlInclude(typeof(VectoringNozzleSystem))]
-    public partial class SeesPdu : DistributedEmissionsFamilyPdu, IEquatable<SeesPdu>
-    {
-        /// <summary>
-        /// Originating entity ID
-        /// </summary>
-        private EntityID _orginatingEntityID = new EntityID();
-
-        /// <summary>
-        /// IR Signature representation index
-        /// </summary>
-        private ushort _infraredSignatureRepresentationIndex;
-
-        /// <summary>
-        /// acoustic Signature representation index
-        /// </summary>
-        private ushort _acousticSignatureRepresentationIndex;
-
-        /// <summary>
-        /// radar cross section representation index
-        /// </summary>
-        private ushort _radarCrossSectionSignatureRepresentationIndex;
-
-        /// <summary>
-        /// how many propulsion systems
-        /// </summary>
-        private ushort _numberOfPropulsionSystems;
-
-        /// <summary>
-        /// how many vectoring nozzle systems
-        /// </summary>
-        private ushort _numberOfVectoringNozzleSystems;
-
-        /// <summary>
-        /// variable length list of propulsion system data
-        /// </summary>
-        private List<PropulsionSystemData> _propulsionSystemData = new List<PropulsionSystemData>();
-
-        /// <summary>
-        /// variable length list of vectoring system data
-        /// </summary>
-        private List<VectoringNozzleSystem> _vectoringSystemData = new List<VectoringNozzleSystem>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SeesPdu"/> class.
-        /// </summary>
-        public SeesPdu()
-        {
-            PduType = (byte)30;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SeesPdu left, SeesPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SeesPdu left, SeesPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
-            marshalSize += 2;  // this._infraredSignatureRepresentationIndex
-            marshalSize += 2;  // this._acousticSignatureRepresentationIndex
-            marshalSize += 2;  // this._radarCrossSectionSignatureRepresentationIndex
-            marshalSize += 2;  // this._numberOfPropulsionSystems
-            marshalSize += 2;  // this._numberOfVectoringNozzleSystems
-            for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-            {
-                PropulsionSystemData listElement = (PropulsionSystemData)this._propulsionSystemData[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-            {
-                VectoringNozzleSystem listElement = (VectoringNozzleSystem)this._vectoringSystemData[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Originating entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
-        public EntityID OrginatingEntityID
-        {
-            get
-            {
-                return this._orginatingEntityID;
-            }
-
-            set
-            {
-                this._orginatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the IR Signature representation index
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "infraredSignatureRepresentationIndex")]
-        public ushort InfraredSignatureRepresentationIndex
-        {
-            get
-            {
-                return this._infraredSignatureRepresentationIndex;
-            }
-
-            set
-            {
-                this._infraredSignatureRepresentationIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the acoustic Signature representation index
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acousticSignatureRepresentationIndex")]
-        public ushort AcousticSignatureRepresentationIndex
-        {
-            get
-            {
-                return this._acousticSignatureRepresentationIndex;
-            }
-
-            set
-            {
-                this._acousticSignatureRepresentationIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the radar cross section representation index
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "radarCrossSectionSignatureRepresentationIndex")]
-        public ushort RadarCrossSectionSignatureRepresentationIndex
-        {
-            get
-            {
-                return this._radarCrossSectionSignatureRepresentationIndex;
-            }
-
-            set
-            {
-                this._radarCrossSectionSignatureRepresentationIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPropulsionSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPropulsionSystems")]
-        public ushort NumberOfPropulsionSystems
-        {
-            get
-            {
-                return this._numberOfPropulsionSystems;
-            }
-
-            set
-            {
-                this._numberOfPropulsionSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVectoringNozzleSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfVectoringNozzleSystems")]
-        public ushort NumberOfVectoringNozzleSystems
-        {
-            get
-            {
-                return this._numberOfVectoringNozzleSystems;
-            }
-
-            set
-            {
-                this._numberOfVectoringNozzleSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of propulsion system data
-        /// </summary>
-        [XmlElement(ElementName = "propulsionSystemDataList", Type = typeof(List<PropulsionSystemData>))]
-        public List<PropulsionSystemData> PropulsionSystemData
-        {
-            get
-            {
-                return this._propulsionSystemData;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of vectoring system data
-        /// </summary>
-        [XmlElement(ElementName = "vectoringSystemDataList", Type = typeof(List<VectoringNozzleSystem>))]
-        public List<VectoringNozzleSystem> VectoringSystemData
-        {
-            get
-            {
-                return this._vectoringSystemData;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._infraredSignatureRepresentationIndex);
-                    dos.WriteUnsignedShort((ushort)this._acousticSignatureRepresentationIndex);
-                    dos.WriteUnsignedShort((ushort)this._radarCrossSectionSignatureRepresentationIndex);
-                    dos.WriteUnsignedShort((ushort)this._propulsionSystemData.Count);
-                    dos.WriteUnsignedShort((ushort)this._vectoringSystemData.Count);
-
-                    for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                    {
-                        PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
-                        aPropulsionSystemData.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                    {
-                        VectoringNozzleSystem aVectoringNozzleSystem = (VectoringNozzleSystem)this._vectoringSystemData[idx];
-                        aVectoringNozzleSystem.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Unmarshal(dis);
-                    this._infraredSignatureRepresentationIndex = dis.ReadUnsignedShort();
-                    this._acousticSignatureRepresentationIndex = dis.ReadUnsignedShort();
-                    this._radarCrossSectionSignatureRepresentationIndex = dis.ReadUnsignedShort();
-                    this._numberOfPropulsionSystems = dis.ReadUnsignedShort();
-                    this._numberOfVectoringNozzleSystems = dis.ReadUnsignedShort();
-                    for (int idx = 0; idx < this.NumberOfPropulsionSystems; idx++)
-                    {
-                        PropulsionSystemData anX = new PropulsionSystemData();
-                        anX.Unmarshal(dis);
-                        this._propulsionSystemData.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVectoringNozzleSystems; idx++)
-                    {
-                        VectoringNozzleSystem anX = new VectoringNozzleSystem();
-                        anX.Unmarshal(dis);
-                        this._vectoringSystemData.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SeesPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<orginatingEntityID>");
-                this._orginatingEntityID.Reflection(sb);
-                sb.AppendLine("</orginatingEntityID>");
-                sb.AppendLine("<infraredSignatureRepresentationIndex type=\"ushort\">" + this._infraredSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</infraredSignatureRepresentationIndex>");
-                sb.AppendLine("<acousticSignatureRepresentationIndex type=\"ushort\">" + this._acousticSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</acousticSignatureRepresentationIndex>");
-                sb.AppendLine("<radarCrossSectionSignatureRepresentationIndex type=\"ushort\">" + this._radarCrossSectionSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</radarCrossSectionSignatureRepresentationIndex>");
-                sb.AppendLine("<propulsionSystemData type=\"ushort\">" + this._propulsionSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</propulsionSystemData>");
-                sb.AppendLine("<vectoringSystemData type=\"ushort\">" + this._vectoringSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</vectoringSystemData>");
-                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                {
-                    sb.AppendLine("<propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"PropulsionSystemData\">");
-                    PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
-                    aPropulsionSystemData.Reflection(sb);
-                    sb.AppendLine("</propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                {
-                    sb.AppendLine("<vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VectoringNozzleSystem\">");
-                    VectoringNozzleSystem aVectoringNozzleSystem = (VectoringNozzleSystem)this._vectoringSystemData[idx];
-                    aVectoringNozzleSystem.Reflection(sb);
-                    sb.AppendLine("</vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SeesPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SeesPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SeesPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._infraredSignatureRepresentationIndex != obj._infraredSignatureRepresentationIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._acousticSignatureRepresentationIndex != obj._acousticSignatureRepresentationIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._radarCrossSectionSignatureRepresentationIndex != obj._radarCrossSectionSignatureRepresentationIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPropulsionSystems != obj._numberOfPropulsionSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVectoringNozzleSystems != obj._numberOfVectoringNozzleSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._propulsionSystemData.Count != obj._propulsionSystemData.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                {
-                    if (!this._propulsionSystemData[idx].Equals(obj._propulsionSystemData[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._vectoringSystemData.Count != obj._vectoringSystemData.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                {
-                    if (!this._vectoringSystemData[idx].Equals(obj._vectoringSystemData[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._infraredSignatureRepresentationIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._acousticSignatureRepresentationIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._radarCrossSectionSignatureRepresentationIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPropulsionSystems.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVectoringNozzleSystems.GetHashCode();
-
-            if (this._propulsionSystemData.Count > 0)
-            {
-                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._propulsionSystemData[idx].GetHashCode();
-                }
-            }
-
-            if (this._vectoringSystemData.Count > 0)
-            {
-                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._vectoringSystemData[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Sensor.cs b/Libs/CSharpDis7/Sensor.cs
deleted file mode 100644
index e6efef8..0000000
--- a/Libs/CSharpDis7/Sensor.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// An entity's sensor information.  Section 6.2.77.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Sensor
-    {
-        /// <summary>
-        ///  the source of the Sensor Type field 
-        /// </summary>
-        private byte _sensorTypeSource;
-
-        /// <summary>
-        /// the on/off status of the sensor
-        /// </summary>
-        private byte _sensorOnOffStatus;
-
-        /// <summary>
-        /// the sensor type and shall be represented by a 16-bit enumeration. 
-        /// </summary>
-        private ushort _sensorType;
-
-        /// <summary>
-        ///  the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part
-        /// </summary>
-        private uint _station;
-
-        /// <summary>
-        /// quantity of the sensor 
-        /// </summary>
-        private ushort _quantity;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Sensor"/> class.
-        /// </summary>
-        public Sensor()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Sensor left, Sensor right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Sensor left, Sensor right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._sensorTypeSource
-            marshalSize += 1;  // this._sensorOnOffStatus
-            marshalSize += 2;  // this._sensorType
-            marshalSize += 4;  // this._station
-            marshalSize += 2;  // this._quantity
-            marshalSize += 2;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the  the source of the Sensor Type field 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "sensorTypeSource")]
-        public byte SensorTypeSource
-        {
-            get
-            {
-                return this._sensorTypeSource;
-            }
-
-            set
-            {
-                this._sensorTypeSource = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the on/off status of the sensor
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "sensorOnOffStatus")]
-        public byte SensorOnOffStatus
-        {
-            get
-            {
-                return this._sensorOnOffStatus;
-            }
-
-            set
-            {
-                this._sensorOnOffStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the sensor type and shall be represented by a 16-bit enumeration. 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "sensorType")]
-        public ushort SensorType
-        {
-            get
-            {
-                return this._sensorType;
-            }
-
-            set
-            {
-                this._sensorType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "station")]
-        public uint Station
-        {
-            get
-            {
-                return this._station;
-            }
-
-            set
-            {
-                this._station = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the quantity of the sensor 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
-        public ushort Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._sensorTypeSource);
-                    dos.WriteUnsignedByte((byte)this._sensorOnOffStatus);
-                    dos.WriteUnsignedShort((ushort)this._sensorType);
-                    dos.WriteUnsignedInt((uint)this._station);
-                    dos.WriteUnsignedShort((ushort)this._quantity);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._sensorTypeSource = dis.ReadUnsignedByte();
-                    this._sensorOnOffStatus = dis.ReadUnsignedByte();
-                    this._sensorType = dis.ReadUnsignedShort();
-                    this._station = dis.ReadUnsignedInt();
-                    this._quantity = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Sensor>");
-            try
-            {
-                sb.AppendLine("<sensorTypeSource type=\"byte\">" + this._sensorTypeSource.ToString(CultureInfo.InvariantCulture) + "</sensorTypeSource>");
-                sb.AppendLine("<sensorOnOffStatus type=\"byte\">" + this._sensorOnOffStatus.ToString(CultureInfo.InvariantCulture) + "</sensorOnOffStatus>");
-                sb.AppendLine("<sensorType type=\"ushort\">" + this._sensorType.ToString(CultureInfo.InvariantCulture) + "</sensorType>");
-                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
-                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</Sensor>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Sensor;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Sensor obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._sensorTypeSource != obj._sensorTypeSource)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sensorOnOffStatus != obj._sensorOnOffStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sensorType != obj._sensorType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._station != obj._station)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._sensorTypeSource.GetHashCode();
-            result = GenerateHash(result) ^ this._sensorOnOffStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._sensorType.GetHashCode();
-            result = GenerateHash(result) ^ this._station.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SeparationVP.cs b/Libs/CSharpDis7/SeparationVP.cs
deleted file mode 100644
index 00a6a2f..0000000
--- a/Libs/CSharpDis7/SeparationVP.cs
+++ /dev/null
@@ -1,472 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Physical separation of an entity from another entity.  Section 6.2.93.6
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SeparationVP
-    {
-        /// <summary>
-        /// the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        private byte _recordType = 4;
-
-        /// <summary>
-        /// Reason for separation. EBV
-        /// </summary>
-        private byte _reasonForSeparation;
-
-        /// <summary>
-        /// Whether the entity existed prior to separation EBV
-        /// </summary>
-        private byte _preEntityIndicator;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding1;
-
-        /// <summary>
-        /// ID of parent
-        /// </summary>
-        private EntityID _parentEntityID = new EntityID();
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding2;
-
-        /// <summary>
-        /// Station separated from
-        /// </summary>
-        private uint _stationLocation;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SeparationVP"/> class.
-        /// </summary>
-        public SeparationVP()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SeparationVP left, SeparationVP right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SeparationVP left, SeparationVP right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._recordType
-            marshalSize += 1;  // this._reasonForSeparation
-            marshalSize += 1;  // this._preEntityIndicator
-            marshalSize += 1;  // this._padding1
-            marshalSize += this._parentEntityID.GetMarshalledSize();  // this._parentEntityID
-            marshalSize += 2;  // this._padding2
-            marshalSize += 4;  // this._stationLocation
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
-        public byte RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Reason for separation. EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "reasonForSeparation")]
-        public byte ReasonForSeparation
-        {
-            get
-            {
-                return this._reasonForSeparation;
-            }
-
-            set
-            {
-                this._reasonForSeparation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Whether the entity existed prior to separation EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "preEntityIndicator")]
-        public byte PreEntityIndicator
-        {
-            get
-            {
-                return this._preEntityIndicator;
-            }
-
-            set
-            {
-                this._preEntityIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of parent
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "parentEntityID")]
-        public EntityID ParentEntityID
-        {
-            get
-            {
-                return this._parentEntityID;
-            }
-
-            set
-            {
-                this._parentEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
-        public ushort Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Station separated from
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "stationLocation")]
-        public uint StationLocation
-        {
-            get
-            {
-                return this._stationLocation;
-            }
-
-            set
-            {
-                this._stationLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._recordType);
-                    dos.WriteUnsignedByte((byte)this._reasonForSeparation);
-                    dos.WriteUnsignedByte((byte)this._preEntityIndicator);
-                    dos.WriteUnsignedByte((byte)this._padding1);
-                    this._parentEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._padding2);
-                    dos.WriteUnsignedInt((uint)this._stationLocation);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedByte();
-                    this._reasonForSeparation = dis.ReadUnsignedByte();
-                    this._preEntityIndicator = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadUnsignedByte();
-                    this._parentEntityID.Unmarshal(dis);
-                    this._padding2 = dis.ReadUnsignedShort();
-                    this._stationLocation = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SeparationVP>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<reasonForSeparation type=\"byte\">" + this._reasonForSeparation.ToString(CultureInfo.InvariantCulture) + "</reasonForSeparation>");
-                sb.AppendLine("<preEntityIndicator type=\"byte\">" + this._preEntityIndicator.ToString(CultureInfo.InvariantCulture) + "</preEntityIndicator>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<parentEntityID>");
-                this._parentEntityID.Reflection(sb);
-                sb.AppendLine("</parentEntityID>");
-                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<stationLocation type=\"uint\">" + this._stationLocation.ToString(CultureInfo.InvariantCulture) + "</stationLocation>");
-                sb.AppendLine("</SeparationVP>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SeparationVP;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SeparationVP obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._reasonForSeparation != obj._reasonForSeparation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._preEntityIndicator != obj._preEntityIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._parentEntityID.Equals(obj._parentEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stationLocation != obj._stationLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._reasonForSeparation.GetHashCode();
-            result = GenerateHash(result) ^ this._preEntityIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._parentEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._stationLocation.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/ServiceRequestPdu.cs b/Libs/CSharpDis7/ServiceRequestPdu.cs
deleted file mode 100644
index 3740c90..0000000
--- a/Libs/CSharpDis7/ServiceRequestPdu.cs
+++ /dev/null
@@ -1,479 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Service Request PDU shall be used to communicate information associated with                            one entity requesting a service from another). Section 7.4.2 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ServiceRequestPdu : LogisticsFamilyPdu, IEquatable<ServiceRequestPdu>
-    {
-        /// <summary>
-        /// Entity that is requesting service (see 6.2.28), Section 7.4.2
-        /// </summary>
-        private EntityID _requestingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is providing the service (see 6.2.28), Section 7.4.2
-        /// </summary>
-        private EntityID _servicingEntityID = new EntityID();
-
-        /// <summary>
-        /// Type of service requested, Section 7.4.2
-        /// </summary>
-        private byte _serviceTypeRequested;
-
-        /// <summary>
-        /// How many requested, Section 7.4.2
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _serviceRequestPadding;
-
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceRequestPdu"/> class.
-        /// </summary>
-        public ServiceRequestPdu()
-        {
-            PduType = (byte)5;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ServiceRequestPdu left, ServiceRequestPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ServiceRequestPdu left, ServiceRequestPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
-            marshalSize += this._servicingEntityID.GetMarshalledSize();  // this._servicingEntityID
-            marshalSize += 1;  // this._serviceTypeRequested
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._serviceRequestPadding
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is requesting service (see 6.2.28), Section 7.4.2
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
-        public EntityID RequestingEntityID
-        {
-            get
-            {
-                return this._requestingEntityID;
-            }
-
-            set
-            {
-                this._requestingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is providing the service (see 6.2.28), Section 7.4.2
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "servicingEntityID")]
-        public EntityID ServicingEntityID
-        {
-            get
-            {
-                return this._servicingEntityID;
-            }
-
-            set
-            {
-                this._servicingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of service requested, Section 7.4.2
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "serviceTypeRequested")]
-        public byte ServiceTypeRequested
-        {
-            get
-            {
-                return this._serviceTypeRequested;
-            }
-
-            set
-            {
-                this._serviceTypeRequested = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "serviceRequestPadding")]
-        public short ServiceRequestPadding
-        {
-            get
-            {
-                return this._serviceRequestPadding;
-            }
-
-            set
-            {
-                this._serviceRequestPadding = value;
-            }
-        }
-
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._requestingEntityID.Marshal(dos);
-                    this._servicingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._serviceTypeRequested);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._serviceRequestPadding);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestingEntityID.Unmarshal(dis);
-                    this._servicingEntityID.Unmarshal(dis);
-                    this._serviceTypeRequested = dis.ReadUnsignedByte();
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._serviceRequestPadding = dis.ReadShort();
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ServiceRequestPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestingEntityID>");
-                this._requestingEntityID.Reflection(sb);
-                sb.AppendLine("</requestingEntityID>");
-                sb.AppendLine("<servicingEntityID>");
-                this._servicingEntityID.Reflection(sb);
-                sb.AppendLine("</servicingEntityID>");
-                sb.AppendLine("<serviceTypeRequested type=\"byte\">" + this._serviceTypeRequested.ToString(CultureInfo.InvariantCulture) + "</serviceTypeRequested>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<serviceRequestPadding type=\"short\">" + this._serviceRequestPadding.ToString(CultureInfo.InvariantCulture) + "</serviceRequestPadding>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ServiceRequestPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ServiceRequestPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ServiceRequestPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._servicingEntityID.Equals(obj._servicingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._serviceTypeRequested != obj._serviceTypeRequested)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._serviceRequestPadding != obj._serviceRequestPadding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._servicingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._serviceTypeRequested.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._serviceRequestPadding.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SetDataPdu.cs b/Libs/CSharpDis7/SetDataPdu.cs
deleted file mode 100644
index 906bc69..0000000
--- a/Libs/CSharpDis7/SetDataPdu.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.10. Change state information with the data contained in this. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class SetDataPdu : SimulationManagementFamilyPdu, IEquatable<SetDataPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetDataPdu"/> class.
-        /// </summary>
-        public SetDataPdu()
-        {
-            PduType = (byte)19;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SetDataPdu left, SetDataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SetDataPdu left, SetDataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SetDataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SetDataPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SetDataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SetDataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SetDataReliablePdu.cs b/Libs/CSharpDis7/SetDataReliablePdu.cs
deleted file mode 100644
index af94644..0000000
--- a/Libs/CSharpDis7/SetDataReliablePdu.cs
+++ /dev/null
@@ -1,583 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.9: initializing or chaning internal state information, reliable. Needs manual intervention to fix     padding on variable datums. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class SetDataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<SetDataReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetDataReliablePdu"/> class.
-        /// </summary>
-        public SetDataReliablePdu()
-        {
-            PduType = (byte)59;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SetDataReliablePdu left, SetDataReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SetDataReliablePdu left, SetDataReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SetDataReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SetDataReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SetDataReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SetDataReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SimulationAddress.cs b/Libs/CSharpDis7/SimulationAddress.cs
deleted file mode 100644
index d63c7e4..0000000
--- a/Libs/CSharpDis7/SimulationAddress.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// A Simulation Address record shall consist of the Site Identification number and the Application Identification number. Section 6.2.79 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SimulationAddress
-    {
-        /// <summary>
-        /// A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event. 
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data.
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationAddress"/> class.
-        /// </summary>
-        public SimulationAddress()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationAddress left, SimulationAddress right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationAddress left, SimulationAddress right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event. 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationAddress>");
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("</SimulationAddress>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationAddress;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationAddress obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SimulationIdentifier.cs b/Libs/CSharpDis7/SimulationIdentifier.cs
deleted file mode 100644
index c43cb1a..0000000
--- a/Libs/CSharpDis7/SimulationIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of a simulation when using the 48-bit identifier format shall be specified by the Sim- ulation Identifier record. The reason that the 48-bit format is required in addition to the 32-bit simulation address format that actually identifies a specific simulation is because some 48-bit identifier fields in PDUs may contain either an Object Identifier, such as an Entity ID, or a Simulation Identifier. Section 6.2.80
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class SimulationIdentifier
-    {
-        /// <summary>
-        /// Simulation address 
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// This field shall be set to zero as there is no reference number associated with a Simulation Identifier.
-        /// </summary>
-        private ushort _referenceNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationIdentifier"/> class.
-        /// </summary>
-        public SimulationIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationIdentifier left, SimulationIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationIdentifier left, SimulationIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._referenceNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Simulation address 
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall be set to zero as there is no reference number associated with a Simulation Identifier.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
-        public ushort ReferenceNumber
-        {
-            get
-            {
-                return this._referenceNumber;
-            }
-
-            set
-            {
-                this._referenceNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._referenceNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
-                sb.AppendLine("</SimulationIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._referenceNumber != obj._referenceNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SimulationManagementFamilyPdu.cs b/Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
deleted file mode 100644
index 81b653d..0000000
--- a/Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5 Abstract superclass for PDUs relating to the simulation itself. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SimulationManagementFamilyPdu : Pdu, IEquatable<SimulationManagementFamilyPdu>
-    {
-        /// <summary>
-        /// Entity that is sending message
-        /// </summary>
-        private EntityID _originatingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is intended to receive message
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationManagementFamilyPdu"/> class.
-        /// </summary>
-        public SimulationManagementFamilyPdu()
-        {
-            ProtocolFamily = (byte)5;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is sending message
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
-        public EntityID OriginatingEntityID
-        {
-            get
-            {
-                return this._originatingEntityID;
-            }
-
-            set
-            {
-                this._originatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is intended to receive message
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Marshal(dos);
-                    this._receivingEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Unmarshal(dis);
-                    this._receivingEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationManagementFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingEntityID>");
-                this._originatingEntityID.Reflection(sb);
-                sb.AppendLine("</originatingEntityID>");
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("</SimulationManagementFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationManagementFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationManagementFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SimulationManagementPduHeader.cs b/Libs/CSharpDis7/SimulationManagementPduHeader.cs
deleted file mode 100644
index 863e4f3..0000000
--- a/Libs/CSharpDis7/SimulationManagementPduHeader.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// First part of a simulation management (SIMAN) PDU and SIMAN-Reliability (SIMAN-R) PDU. Sectionn 6.2.81
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(PduHeader))]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SimulationManagementPduHeader
-    {
-        /// <summary>
-        /// Conventional PDU header
-        /// </summary>
-        private PduHeader _pduHeader = new PduHeader();
-
-        /// <summary>
-        /// IDs the simulation or entity, etiehr a simulation or an entity. Either 6.2.80 or 6.2.28
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4
-        /// </summary>
-        private EntityID _recevingID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationManagementPduHeader"/> class.
-        /// </summary>
-        public SimulationManagementPduHeader()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationManagementPduHeader left, SimulationManagementPduHeader right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationManagementPduHeader left, SimulationManagementPduHeader right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._pduHeader.GetMarshalledSize();  // this._pduHeader
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._recevingID.GetMarshalledSize();  // this._recevingID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Conventional PDU header
-        /// </summary>
-        [XmlElement(Type = typeof(PduHeader), ElementName = "pduHeader")]
-        public PduHeader PduHeader
-        {
-            get
-            {
-                return this._pduHeader;
-            }
-
-            set
-            {
-                this._pduHeader = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the IDs the simulation or entity, etiehr a simulation or an entity. Either 6.2.80 or 6.2.28
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "recevingID")]
-        public EntityID RecevingID
-        {
-            get
-            {
-                return this._recevingID;
-            }
-
-            set
-            {
-                this._recevingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._pduHeader.Marshal(dos);
-                    this._originatingID.Marshal(dos);
-                    this._recevingID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._pduHeader.Unmarshal(dis);
-                    this._originatingID.Unmarshal(dis);
-                    this._recevingID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationManagementPduHeader>");
-            try
-            {
-                sb.AppendLine("<pduHeader>");
-                this._pduHeader.Reflection(sb);
-                sb.AppendLine("</pduHeader>");
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<recevingID>");
-                this._recevingID.Reflection(sb);
-                sb.AppendLine("</recevingID>");
-                sb.AppendLine("</SimulationManagementPduHeader>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationManagementPduHeader;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationManagementPduHeader obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._pduHeader.Equals(obj._pduHeader))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._recevingID.Equals(obj._recevingID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._pduHeader.GetHashCode();
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._recevingID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs b/Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
deleted file mode 100644
index f21b6d3..0000000
--- a/Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12: Abstract superclass for reliable simulation management PDUs
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SimulationManagementWithReliabilityFamilyPdu : Pdu, IEquatable<SimulationManagementWithReliabilityFamilyPdu>
-    {
-        /// <summary>
-        /// Object originatig the request
-        /// </summary>
-        private EntityID _originatingEntityID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationManagementWithReliabilityFamilyPdu"/> class.
-        /// </summary>
-        public SimulationManagementWithReliabilityFamilyPdu()
-        {
-            ProtocolFamily = (byte)10;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object originatig the request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
-        public EntityID OriginatingEntityID
-        {
-            get
-            {
-                return this._originatingEntityID;
-            }
-
-            set
-            {
-                this._originatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Marshal(dos);
-                    this._receivingEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Unmarshal(dis);
-                    this._receivingEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationManagementWithReliabilityFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingEntityID>");
-                this._originatingEntityID.Reflection(sb);
-                sb.AppendLine("</originatingEntityID>");
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("</SimulationManagementWithReliabilityFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationManagementWithReliabilityFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationManagementWithReliabilityFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/StandardVariableSpecification.cs b/Libs/CSharpDis7/StandardVariableSpecification.cs
deleted file mode 100644
index 831a909..0000000
--- a/Libs/CSharpDis7/StandardVariableSpecification.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Does not work, and causes failure in anything it is embedded in. Section 6.2.82
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationManagementPduHeader))]
-    public partial class StandardVariableSpecification
-    {
-        /// <summary>
-        /// Number of static variable records
-        /// </summary>
-        private ushort _numberOfStandardVariableRecords;
-
-        /// <summary>
-        /// variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded.
-        /// </summary>
-        private List<SimulationManagementPduHeader> _standardVariables = new List<SimulationManagementPduHeader>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StandardVariableSpecification"/> class.
-        /// </summary>
-        public StandardVariableSpecification()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StandardVariableSpecification left, StandardVariableSpecification right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StandardVariableSpecification left, StandardVariableSpecification right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._numberOfStandardVariableRecords
-            for (int idx = 0; idx < this._standardVariables.Count; idx++)
-            {
-                SimulationManagementPduHeader listElement = (SimulationManagementPduHeader)this._standardVariables[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfStandardVariableRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfStandardVariableRecords")]
-        public ushort NumberOfStandardVariableRecords
-        {
-            get
-            {
-                return this._numberOfStandardVariableRecords;
-            }
-
-            set
-            {
-                this._numberOfStandardVariableRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded.
-        /// </summary>
-        [XmlElement(ElementName = "standardVariablesList", Type = typeof(List<SimulationManagementPduHeader>))]
-        public List<SimulationManagementPduHeader> StandardVariables
-        {
-            get
-            {
-                return this._standardVariables;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._standardVariables.Count);
-
-                    for (int idx = 0; idx < this._standardVariables.Count; idx++)
-                    {
-                        SimulationManagementPduHeader aSimulationManagementPduHeader = (SimulationManagementPduHeader)this._standardVariables[idx];
-                        aSimulationManagementPduHeader.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfStandardVariableRecords = dis.ReadUnsignedShort();
-                    for (int idx = 0; idx < this.NumberOfStandardVariableRecords; idx++)
-                    {
-                        SimulationManagementPduHeader anX = new SimulationManagementPduHeader();
-                        anX.Unmarshal(dis);
-                        this._standardVariables.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StandardVariableSpecification>");
-            try
-            {
-                sb.AppendLine("<standardVariables type=\"ushort\">" + this._standardVariables.Count.ToString(CultureInfo.InvariantCulture) + "</standardVariables>");
-                for (int idx = 0; idx < this._standardVariables.Count; idx++)
-                {
-                    sb.AppendLine("<standardVariables" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SimulationManagementPduHeader\">");
-                    SimulationManagementPduHeader aSimulationManagementPduHeader = (SimulationManagementPduHeader)this._standardVariables[idx];
-                    aSimulationManagementPduHeader.Reflection(sb);
-                    sb.AppendLine("</standardVariables" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</StandardVariableSpecification>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StandardVariableSpecification;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StandardVariableSpecification obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._numberOfStandardVariableRecords != obj._numberOfStandardVariableRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._standardVariables.Count != obj._standardVariables.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._standardVariables.Count; idx++)
-                {
-                    if (!this._standardVariables[idx].Equals(obj._standardVariables[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfStandardVariableRecords.GetHashCode();
-
-            if (this._standardVariables.Count > 0)
-            {
-                for (int idx = 0; idx < this._standardVariables.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._standardVariables[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/StartResumePdu.cs b/Libs/CSharpDis7/StartResumePdu.cs
deleted file mode 100644
index 988dd1e..0000000
--- a/Libs/CSharpDis7/StartResumePdu.cs
+++ /dev/null
@@ -1,419 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.4. Start or resume an exercise. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StartResumePdu : SimulationManagementFamilyPdu, IEquatable<StartResumePdu>
-    {
-        /// <summary>
-        /// Identifier for originating entity(or simulation)
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the receiving entity(or simulation)
-        /// </summary>
-        private EntityID _receivingID = new EntityID();
-
-        /// <summary>
-        /// This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16).
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16)
-        /// </summary>
-        private ClockTime _simulationTime = new ClockTime();
-
-        /// <summary>
-        /// Identifier for the specific and unique start/resume request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartResumePdu"/> class.
-        /// </summary>
-        public StartResumePdu()
-        {
-            PduType = (byte)13;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StartResumePdu left, StartResumePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StartResumePdu left, StartResumePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for originating entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the receiving entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
-        public EntityID ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16).
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16)
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
-        public ClockTime SimulationTime
-        {
-            get
-            {
-                return this._simulationTime;
-            }
-
-            set
-            {
-                this._simulationTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the specific and unique start/resume request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    this._realWorldTime.Marshal(dos);
-                    this._simulationTime.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._realWorldTime.Unmarshal(dis);
-                    this._simulationTime.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StartResumePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<simulationTime>");
-                this._simulationTime.Reflection(sb);
-                sb.AppendLine("</simulationTime>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StartResumePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StartResumePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StartResumePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._simulationTime.Equals(obj._simulationTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/StartResumeReliablePdu.cs b/Libs/CSharpDis7/StartResumeReliablePdu.cs
deleted file mode 100644
index 9f1cdb3..0000000
--- a/Libs/CSharpDis7/StartResumeReliablePdu.cs
+++ /dev/null
@@ -1,446 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.3: Start resume simulation, relaible. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StartResumeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StartResumeReliablePdu>
-    {
-        /// <summary>
-        /// time in real world for this operation to happen
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// time in simulation for the simulation to resume
-        /// </summary>
-        private ClockTime _simulationTime = new ClockTime();
-
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartResumeReliablePdu"/> class.
-        /// </summary>
-        public StartResumeReliablePdu()
-        {
-            PduType = (byte)53;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StartResumeReliablePdu left, StartResumeReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StartResumeReliablePdu left, StartResumeReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the time in real world for this operation to happen
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time in simulation for the simulation to resume
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
-        public ClockTime SimulationTime
-        {
-            get
-            {
-                return this._simulationTime;
-            }
-
-            set
-            {
-                this._simulationTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    this._simulationTime.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._simulationTime.Unmarshal(dis);
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StartResumeReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<simulationTime>");
-                this._simulationTime.Reflection(sb);
-                sb.AppendLine("</simulationTime>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StartResumeReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StartResumeReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StartResumeReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._simulationTime.Equals(obj._simulationTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/StopFreezePdu.cs b/Libs/CSharpDis7/StopFreezePdu.cs
deleted file mode 100644
index c779db0..0000000
--- a/Libs/CSharpDis7/StopFreezePdu.cs
+++ /dev/null
@@ -1,481 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 7.5.5. Stop or freeze an enity (or exercise). COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StopFreezePdu : SimulationManagementFamilyPdu, IEquatable<StopFreezePdu>
-    {
-        /// <summary>
-        /// Identifier for originating entity(or simulation)
-        /// </summary>
-        private EntityID _originatingID = new EntityID();
-
-        /// <summary>
-        /// Identifier for the receiving entity(or simulation)
-        /// </summary>
-        private EntityID _receivingID = new EntityID();
-
-        /// <summary>
-        /// real-world(UTC) time at which the entity shall stop or freeze in the exercise
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration
-        /// </summary>
-        private byte _reason;
-
-        /// <summary>
-        /// Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants
-        /// </summary>
-        private byte _frozenBehavior;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StopFreezePdu"/> class.
-        /// </summary>
-        public StopFreezePdu()
-        {
-            PduType = (byte)14;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StopFreezePdu left, StopFreezePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StopFreezePdu left, StopFreezePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += 1;  // this._reason
-            marshalSize += 1;  // this._frozenBehavior
-            marshalSize += 2;  // this._padding1
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for originating entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
-        public EntityID OriginatingID
-        {
-            get
-            {
-                return this._originatingID;
-            }
-
-            set
-            {
-                this._originatingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the receiving entity(or simulation)
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
-        public EntityID ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the real-world(UTC) time at which the entity shall stop or freeze in the exercise
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "reason")]
-        public byte Reason
-        {
-            get
-            {
-                return this._reason;
-            }
-
-            set
-            {
-                this._reason = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
-        public byte FrozenBehavior
-        {
-            get
-            {
-                return this._frozenBehavior;
-            }
-
-            set
-            {
-                this._frozenBehavior = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    this._realWorldTime.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._reason);
-                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._realWorldTime.Unmarshal(dis);
-                    this._reason = dis.ReadUnsignedByte();
-                    this._frozenBehavior = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StopFreezePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingID>");
-                this._originatingID.Reflection(sb);
-                sb.AppendLine("</originatingID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
-                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StopFreezePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StopFreezePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StopFreezePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingID.Equals(obj._originatingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._reason != obj._reason)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frozenBehavior != obj._frozenBehavior)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._reason.GetHashCode();
-            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/StopFreezeReliablePdu.cs b/Libs/CSharpDis7/StopFreezeReliablePdu.cs
deleted file mode 100644
index c3b7535..0000000
--- a/Libs/CSharpDis7/StopFreezeReliablePdu.cs
+++ /dev/null
@@ -1,444 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StopFreezeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StopFreezeReliablePdu>
-    {
-        /// <summary>
-        /// time in real world for this operation to happen
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// Reason for stopping/freezing simulation
-        /// </summary>
-        private byte _reason;
-
-        /// <summary>
-        /// internal behvior of the simulation while frozen
-        /// </summary>
-        private byte _frozenBehavior;
-
-        /// <summary>
-        /// reliablity level
-        /// </summary>
-        private byte _requiredReliablityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad1;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StopFreezeReliablePdu"/> class.
-        /// </summary>
-        public StopFreezeReliablePdu()
-        {
-            PduType = (byte)54;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += 1;  // this._reason
-            marshalSize += 1;  // this._frozenBehavior
-            marshalSize += 1;  // this._requiredReliablityService
-            marshalSize += 1;  // this._pad1
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the time in real world for this operation to happen
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Reason for stopping/freezing simulation
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "reason")]
-        public byte Reason
-        {
-            get
-            {
-                return this._reason;
-            }
-
-            set
-            {
-                this._reason = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the internal behvior of the simulation while frozen
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
-        public byte FrozenBehavior
-        {
-            get
-            {
-                return this._frozenBehavior;
-            }
-
-            set
-            {
-                this._frozenBehavior = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the reliablity level
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliablityService")]
-        public byte RequiredReliablityService
-        {
-            get
-            {
-                return this._requiredReliablityService;
-            }
-
-            set
-            {
-                this._requiredReliablityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad1")]
-        public byte Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._reason);
-                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
-                    dos.WriteUnsignedByte((byte)this._requiredReliablityService);
-                    dos.WriteUnsignedByte((byte)this._pad1);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._reason = dis.ReadUnsignedByte();
-                    this._frozenBehavior = dis.ReadUnsignedByte();
-                    this._requiredReliablityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StopFreezeReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
-                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
-                sb.AppendLine("<requiredReliablityService type=\"byte\">" + this._requiredReliablityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliablityService>");
-                sb.AppendLine("<pad1 type=\"byte\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StopFreezeReliablePdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StopFreezeReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StopFreezeReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._reason != obj._reason)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frozenBehavior != obj._frozenBehavior)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliablityService != obj._requiredReliablityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._reason.GetHashCode();
-            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliablityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/StorageFuel.cs b/Libs/CSharpDis7/StorageFuel.cs
deleted file mode 100644
index 2f24cd2..0000000
--- a/Libs/CSharpDis7/StorageFuel.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Information about an entity's engine fuel. Section 6.2.83.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class StorageFuel
-    {
-        /// <summary>
-        /// Fuel quantity, units specified by next field
-        /// </summary>
-        private uint _fuelQuantity;
-
-        /// <summary>
-        /// Units in which the fuel is measured
-        /// </summary>
-        private byte _fuelMeasurementUnits;
-
-        /// <summary>
-        /// Type of fuel
-        /// </summary>
-        private byte _fuelType;
-
-        /// <summary>
-        /// Location of fuel as related to entity. See section 14 of EBV document
-        /// </summary>
-        private byte _fuelLocation;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StorageFuel"/> class.
-        /// </summary>
-        public StorageFuel()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StorageFuel left, StorageFuel right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StorageFuel left, StorageFuel right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._fuelQuantity
-            marshalSize += 1;  // this._fuelMeasurementUnits
-            marshalSize += 1;  // this._fuelType
-            marshalSize += 1;  // this._fuelLocation
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Fuel quantity, units specified by next field
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fuelQuantity")]
-        public uint FuelQuantity
-        {
-            get
-            {
-                return this._fuelQuantity;
-            }
-
-            set
-            {
-                this._fuelQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Units in which the fuel is measured
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurementUnits")]
-        public byte FuelMeasurementUnits
-        {
-            get
-            {
-                return this._fuelMeasurementUnits;
-            }
-
-            set
-            {
-                this._fuelMeasurementUnits = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of fuel
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelType")]
-        public byte FuelType
-        {
-            get
-            {
-                return this._fuelType;
-            }
-
-            set
-            {
-                this._fuelType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of fuel as related to entity. See section 14 of EBV document
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
-        public byte FuelLocation
-        {
-            get
-            {
-                return this._fuelLocation;
-            }
-
-            set
-            {
-                this._fuelLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fuelQuantity);
-                    dos.WriteUnsignedByte((byte)this._fuelMeasurementUnits);
-                    dos.WriteUnsignedByte((byte)this._fuelType);
-                    dos.WriteUnsignedByte((byte)this._fuelLocation);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._fuelQuantity = dis.ReadUnsignedInt();
-                    this._fuelMeasurementUnits = dis.ReadUnsignedByte();
-                    this._fuelType = dis.ReadUnsignedByte();
-                    this._fuelLocation = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StorageFuel>");
-            try
-            {
-                sb.AppendLine("<fuelQuantity type=\"uint\">" + this._fuelQuantity.ToString(CultureInfo.InvariantCulture) + "</fuelQuantity>");
-                sb.AppendLine("<fuelMeasurementUnits type=\"byte\">" + this._fuelMeasurementUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurementUnits>");
-                sb.AppendLine("<fuelType type=\"byte\">" + this._fuelType.ToString(CultureInfo.InvariantCulture) + "</fuelType>");
-                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</StorageFuel>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StorageFuel;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StorageFuel obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._fuelQuantity != obj._fuelQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelMeasurementUnits != obj._fuelMeasurementUnits)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelType != obj._fuelType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelLocation != obj._fuelLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._fuelQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelMeasurementUnits.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelType.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/StorageFuelReload.cs b/Libs/CSharpDis7/StorageFuelReload.cs
deleted file mode 100644
index 1f94c9f..0000000
--- a/Libs/CSharpDis7/StorageFuelReload.cs
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// For each type or location of Storage Fuel, this record shall specify the type, location, fuel measure- ment units, reload quantity and maximum quantity for storage fuel either for the whole entity or a specific storage fuel location (tank). Section 6.2.84.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class StorageFuelReload
-    {
-        /// <summary>
-        ///  the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity.
-        /// </summary>
-        private uint _standardQuantity;
-
-        /// <summary>
-        /// the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type.
-        /// </summary>
-        private uint _maximumQuantity;
-
-        /// <summary>
-        /// the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity.
-        /// </summary>
-        private byte _standardQuantityReloadTime;
-
-        /// <summary>
-        /// the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity.
-        /// </summary>
-        private byte _maximumQuantityReloadTime;
-
-        /// <summary>
-        /// the fuel measurement units. Enumeration
-        /// </summary>
-        private byte _fuelMeasurementUnits;
-
-        /// <summary>
-        /// Fuel type. Enumeration
-        /// </summary>
-        private byte _fuelType;
-
-        /// <summary>
-        /// Location of fuel as related to entity. See section 14 of EBV document
-        /// </summary>
-        private byte _fuelLocation;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StorageFuelReload"/> class.
-        /// </summary>
-        public StorageFuelReload()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StorageFuelReload left, StorageFuelReload right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StorageFuelReload left, StorageFuelReload right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._standardQuantity
-            marshalSize += 4;  // this._maximumQuantity
-            marshalSize += 1;  // this._standardQuantityReloadTime
-            marshalSize += 1;  // this._maximumQuantityReloadTime
-            marshalSize += 1;  // this._fuelMeasurementUnits
-            marshalSize += 1;  // this._fuelType
-            marshalSize += 1;  // this._fuelLocation
-            marshalSize += 1;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the  the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "standardQuantity")]
-        public uint StandardQuantity
-        {
-            get
-            {
-                return this._standardQuantity;
-            }
-
-            set
-            {
-                this._standardQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantity")]
-        public uint MaximumQuantity
-        {
-            get
-            {
-                return this._maximumQuantity;
-            }
-
-            set
-            {
-                this._maximumQuantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "standardQuantityReloadTime")]
-        public byte StandardQuantityReloadTime
-        {
-            get
-            {
-                return this._standardQuantityReloadTime;
-            }
-
-            set
-            {
-                this._standardQuantityReloadTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "maximumQuantityReloadTime")]
-        public byte MaximumQuantityReloadTime
-        {
-            get
-            {
-                return this._maximumQuantityReloadTime;
-            }
-
-            set
-            {
-                this._maximumQuantityReloadTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the fuel measurement units. Enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurementUnits")]
-        public byte FuelMeasurementUnits
-        {
-            get
-            {
-                return this._fuelMeasurementUnits;
-            }
-
-            set
-            {
-                this._fuelMeasurementUnits = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fuel type. Enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelType")]
-        public byte FuelType
-        {
-            get
-            {
-                return this._fuelType;
-            }
-
-            set
-            {
-                this._fuelType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of fuel as related to entity. See section 14 of EBV document
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
-        public byte FuelLocation
-        {
-            get
-            {
-                return this._fuelLocation;
-            }
-
-            set
-            {
-                this._fuelLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding")]
-        public byte Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._standardQuantity);
-                    dos.WriteUnsignedInt((uint)this._maximumQuantity);
-                    dos.WriteUnsignedByte((byte)this._standardQuantityReloadTime);
-                    dos.WriteUnsignedByte((byte)this._maximumQuantityReloadTime);
-                    dos.WriteUnsignedByte((byte)this._fuelMeasurementUnits);
-                    dos.WriteUnsignedByte((byte)this._fuelType);
-                    dos.WriteUnsignedByte((byte)this._fuelLocation);
-                    dos.WriteUnsignedByte((byte)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._standardQuantity = dis.ReadUnsignedInt();
-                    this._maximumQuantity = dis.ReadUnsignedInt();
-                    this._standardQuantityReloadTime = dis.ReadUnsignedByte();
-                    this._maximumQuantityReloadTime = dis.ReadUnsignedByte();
-                    this._fuelMeasurementUnits = dis.ReadUnsignedByte();
-                    this._fuelType = dis.ReadUnsignedByte();
-                    this._fuelLocation = dis.ReadUnsignedByte();
-                    this._padding = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StorageFuelReload>");
-            try
-            {
-                sb.AppendLine("<standardQuantity type=\"uint\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
-                sb.AppendLine("<maximumQuantity type=\"uint\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
-                sb.AppendLine("<standardQuantityReloadTime type=\"byte\">" + this._standardQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</standardQuantityReloadTime>");
-                sb.AppendLine("<maximumQuantityReloadTime type=\"byte\">" + this._maximumQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</maximumQuantityReloadTime>");
-                sb.AppendLine("<fuelMeasurementUnits type=\"byte\">" + this._fuelMeasurementUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurementUnits>");
-                sb.AppendLine("<fuelType type=\"byte\">" + this._fuelType.ToString(CultureInfo.InvariantCulture) + "</fuelType>");
-                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
-                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</StorageFuelReload>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StorageFuelReload;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StorageFuelReload obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._standardQuantity != obj._standardQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumQuantity != obj._maximumQuantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._standardQuantityReloadTime != obj._standardQuantityReloadTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._maximumQuantityReloadTime != obj._maximumQuantityReloadTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelMeasurementUnits != obj._fuelMeasurementUnits)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelType != obj._fuelType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuelLocation != obj._fuelLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
-            result = GenerateHash(result) ^ this._standardQuantityReloadTime.GetHashCode();
-            result = GenerateHash(result) ^ this._maximumQuantityReloadTime.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelMeasurementUnits.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelType.GetHashCode();
-            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SupplyQuantity.cs b/Libs/CSharpDis7/SupplyQuantity.cs
deleted file mode 100644
index 5d564b5..0000000
--- a/Libs/CSharpDis7/SupplyQuantity.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  A supply, and the amount of that supply. Section 6.2.85
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class SupplyQuantity
-    {
-        /// <summary>
-        /// Type of supply
-        /// </summary>
-        private EntityType _supplyType = new EntityType();
-
-        /// <summary>
-        /// the number of units of a supply type. 
-        /// </summary>
-        private float _quantity;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SupplyQuantity"/> class.
-        /// </summary>
-        public SupplyQuantity()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SupplyQuantity left, SupplyQuantity right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SupplyQuantity left, SupplyQuantity right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._supplyType.GetMarshalledSize();  // this._supplyType
-            marshalSize += 4;  // this._quantity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of supply
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "supplyType")]
-        public EntityType SupplyType
-        {
-            get
-            {
-                return this._supplyType;
-            }
-
-            set
-            {
-                this._supplyType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the number of units of a supply type. 
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "quantity")]
-        public float Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._supplyType.Marshal(dos);
-                    dos.WriteFloat((float)this._quantity);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._supplyType.Unmarshal(dis);
-                    this._quantity = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SupplyQuantity>");
-            try
-            {
-                sb.AppendLine("<supplyType>");
-                this._supplyType.Reflection(sb);
-                sb.AppendLine("</supplyType>");
-                sb.AppendLine("<quantity type=\"float\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("</SupplyQuantity>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SupplyQuantity;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SupplyQuantity obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._supplyType.Equals(obj._supplyType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._supplyType.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs b/Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
deleted file mode 100644
index b9c288d..0000000
--- a/Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Section 5.3.11: Abstract superclass for synthetic environment PDUs
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SyntheticEnvironmentFamilyPdu : Pdu, IEquatable<SyntheticEnvironmentFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SyntheticEnvironmentFamilyPdu"/> class.
-        /// </summary>
-        public SyntheticEnvironmentFamilyPdu()
-        {
-            ProtocolFamily = (byte)9;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SyntheticEnvironmentFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</SyntheticEnvironmentFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SyntheticEnvironmentFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SyntheticEnvironmentFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/SystemIdentifier.cs b/Libs/CSharpDis7/SystemIdentifier.cs
deleted file mode 100644
index db1c2a6..0000000
--- a/Libs/CSharpDis7/SystemIdentifier.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The ID of the IFF emitting system. NOT COMPLETE. Section 6.2.86
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ChangeOptions))]
-    public partial class SystemIdentifier
-    {
-        /// <summary>
-        /// general type of emitting system, an enumeration
-        /// </summary>
-        private ushort _systemType;
-
-        /// <summary>
-        /// named type of system, an enumeration
-        /// </summary>
-        private ushort _systemName;
-
-        /// <summary>
-        /// mode of operation for the system, an enumeration
-        /// </summary>
-        private ushort _systemMode;
-
-        /// <summary>
-        /// status of this PDU, see section 6.2.15
-        /// </summary>
-        private ChangeOptions _changeOptions = new ChangeOptions();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SystemIdentifier"/> class.
-        /// </summary>
-        public SystemIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SystemIdentifier left, SystemIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SystemIdentifier left, SystemIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._systemType
-            marshalSize += 2;  // this._systemName
-            marshalSize += 2;  // this._systemMode
-            marshalSize += this._changeOptions.GetMarshalledSize();  // this._changeOptions
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the general type of emitting system, an enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "systemType")]
-        public ushort SystemType
-        {
-            get
-            {
-                return this._systemType;
-            }
-
-            set
-            {
-                this._systemType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the named type of system, an enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "systemName")]
-        public ushort SystemName
-        {
-            get
-            {
-                return this._systemName;
-            }
-
-            set
-            {
-                this._systemName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the mode of operation for the system, an enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "systemMode")]
-        public ushort SystemMode
-        {
-            get
-            {
-                return this._systemMode;
-            }
-
-            set
-            {
-                this._systemMode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the status of this PDU, see section 6.2.15
-        /// </summary>
-        [XmlElement(Type = typeof(ChangeOptions), ElementName = "changeOptions")]
-        public ChangeOptions ChangeOptions
-        {
-            get
-            {
-                return this._changeOptions;
-            }
-
-            set
-            {
-                this._changeOptions = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._systemType);
-                    dos.WriteUnsignedShort((ushort)this._systemName);
-                    dos.WriteUnsignedShort((ushort)this._systemMode);
-                    this._changeOptions.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._systemType = dis.ReadUnsignedShort();
-                    this._systemName = dis.ReadUnsignedShort();
-                    this._systemMode = dis.ReadUnsignedShort();
-                    this._changeOptions.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SystemIdentifier>");
-            try
-            {
-                sb.AppendLine("<systemType type=\"ushort\">" + this._systemType.ToString(CultureInfo.InvariantCulture) + "</systemType>");
-                sb.AppendLine("<systemName type=\"ushort\">" + this._systemName.ToString(CultureInfo.InvariantCulture) + "</systemName>");
-                sb.AppendLine("<systemMode type=\"ushort\">" + this._systemMode.ToString(CultureInfo.InvariantCulture) + "</systemMode>");
-                sb.AppendLine("<changeOptions>");
-                this._changeOptions.Reflection(sb);
-                sb.AppendLine("</changeOptions>");
-                sb.AppendLine("</SystemIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SystemIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SystemIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._systemType != obj._systemType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systemName != obj._systemName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systemMode != obj._systemMode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._changeOptions.Equals(obj._changeOptions))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._systemType.GetHashCode();
-            result = GenerateHash(result) ^ this._systemName.GetHashCode();
-            result = GenerateHash(result) ^ this._systemMode.GetHashCode();
-            result = GenerateHash(result) ^ this._changeOptions.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/TotalRecordSets.cs b/Libs/CSharpDis7/TotalRecordSets.cs
deleted file mode 100644
index a7d9d4f..0000000
--- a/Libs/CSharpDis7/TotalRecordSets.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Total number of record sets contained in a logical set of one or more PDUs. Used to transfer ownership, etc Section 6.2.88
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class TotalRecordSets
-    {
-        /// <summary>
-        /// Total number of record sets
-        /// </summary>
-        private ushort _totalRecordSets;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TotalRecordSets"/> class.
-        /// </summary>
-        public TotalRecordSets()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TotalRecordSets left, TotalRecordSets right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TotalRecordSets left, TotalRecordSets right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._totalRecordSets
-            marshalSize += 2;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Total number of record sets
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "totalRecordSets")]
-        public ushort TotalRecordSets_
-        {
-            get
-            {
-                return this._totalRecordSets;
-            }
-
-            set
-            {
-                this._totalRecordSets = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
-        public ushort Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._totalRecordSets);
-                    dos.WriteUnsignedShort((ushort)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._totalRecordSets = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TotalRecordSets>");
-            try
-            {
-                sb.AppendLine("<totalRecordSets type=\"ushort\">" + this._totalRecordSets.ToString(CultureInfo.InvariantCulture) + "</totalRecordSets>");
-                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</TotalRecordSets>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TotalRecordSets;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TotalRecordSets obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._totalRecordSets != obj._totalRecordSets)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._totalRecordSets.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/TrackJamData.cs b/Libs/CSharpDis7/TrackJamData.cs
deleted file mode 100644
index da7cf75..0000000
--- a/Libs/CSharpDis7/TrackJamData.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Track-Jam data Section 6.2.89
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class TrackJamData
-    {
-        /// <summary>
-        /// the entity tracked or illumated, or an emitter beam targeted with jamming
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// Emitter system associated with the entity
-        /// </summary>
-        private byte _emitterNumber;
-
-        /// <summary>
-        /// Beam associated with the entity
-        /// </summary>
-        private byte _beamNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TrackJamData"/> class.
-        /// </summary>
-        public TrackJamData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TrackJamData left, TrackJamData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TrackJamData left, TrackJamData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 1;  // this._emitterNumber
-            marshalSize += 1;  // this._beamNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the entity tracked or illumated, or an emitter beam targeted with jamming
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Emitter system associated with the entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
-        public byte EmitterNumber
-        {
-            get
-            {
-                return this._emitterNumber;
-            }
-
-            set
-            {
-                this._emitterNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Beam associated with the entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
-        public byte BeamNumber
-        {
-            get
-            {
-                return this._beamNumber;
-            }
-
-            set
-            {
-                this._beamNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._emitterNumber);
-                    dos.WriteUnsignedByte((byte)this._beamNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._emitterNumber = dis.ReadUnsignedByte();
-                    this._beamNumber = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TrackJamData>");
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
-                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
-                sb.AppendLine("</TrackJamData>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TrackJamData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TrackJamData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterNumber != obj._emitterNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamNumber != obj._beamNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/TwoByteChunk.cs b/Libs/CSharpDis7/TwoByteChunk.cs
deleted file mode 100644
index a92f68a..0000000
--- a/Libs/CSharpDis7/TwoByteChunk.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// 16 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class TwoByteChunk
-    {
-        /// <summary>
-        /// two bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[2];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TwoByteChunk"/> class.
-        /// </summary>
-        public TwoByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TwoByteChunk left, TwoByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TwoByteChunk left, TwoByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the two bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TwoByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</TwoByteChunk>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TwoByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TwoByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 2) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 2; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-
-            for (int idx = 0; idx < 2; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/UAFundamentalParameter.cs b/Libs/CSharpDis7/UAFundamentalParameter.cs
deleted file mode 100644
index f70d8c4..0000000
--- a/Libs/CSharpDis7/UAFundamentalParameter.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Regeneration parameters for active emission systems that are variable throughout a scenario. Section 6.2.90
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class UAFundamentalParameter
-    {
-        /// <summary>
-        /// Which database record shall be used. An enumeration from EBV document
-        /// </summary>
-        private ushort _activeEmissionParameterIndex;
-
-        /// <summary>
-        /// The type of scan pattern, If not used, zero. An enumeration from EBV document
-        /// </summary>
-        private ushort _scanPattern;
-
-        /// <summary>
-        /// center azimuth bearing of th emain beam. In radians.
-        /// </summary>
-        private float _beamCenterAzimuthHorizontal;
-
-        /// <summary>
-        /// Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians.
-        /// </summary>
-        private float _azimuthalBeamwidthHorizontal;
-
-        /// <summary>
-        /// center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians.
-        /// </summary>
-        private float _beamCenterDepressionElevation;
-
-        /// <summary>
-        /// vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians.
-        /// </summary>
-        private float _beamwidthDownElevation;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UAFundamentalParameter"/> class.
-        /// </summary>
-        public UAFundamentalParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(UAFundamentalParameter left, UAFundamentalParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(UAFundamentalParameter left, UAFundamentalParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._activeEmissionParameterIndex
-            marshalSize += 2;  // this._scanPattern
-            marshalSize += 4;  // this._beamCenterAzimuthHorizontal
-            marshalSize += 4;  // this._azimuthalBeamwidthHorizontal
-            marshalSize += 4;  // this._beamCenterDepressionElevation
-            marshalSize += 4;  // this._beamwidthDownElevation
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Which database record shall be used. An enumeration from EBV document
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "activeEmissionParameterIndex")]
-        public ushort ActiveEmissionParameterIndex
-        {
-            get
-            {
-                return this._activeEmissionParameterIndex;
-            }
-
-            set
-            {
-                this._activeEmissionParameterIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The type of scan pattern, If not used, zero. An enumeration from EBV document
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "scanPattern")]
-        public ushort ScanPattern
-        {
-            get
-            {
-                return this._scanPattern;
-            }
-
-            set
-            {
-                this._scanPattern = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the center azimuth bearing of th emain beam. In radians.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamCenterAzimuthHorizontal")]
-        public float BeamCenterAzimuthHorizontal
-        {
-            get
-            {
-                return this._beamCenterAzimuthHorizontal;
-            }
-
-            set
-            {
-                this._beamCenterAzimuthHorizontal = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "azimuthalBeamwidthHorizontal")]
-        public float AzimuthalBeamwidthHorizontal
-        {
-            get
-            {
-                return this._azimuthalBeamwidthHorizontal;
-            }
-
-            set
-            {
-                this._azimuthalBeamwidthHorizontal = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamCenterDepressionElevation")]
-        public float BeamCenterDepressionElevation
-        {
-            get
-            {
-                return this._beamCenterDepressionElevation;
-            }
-
-            set
-            {
-                this._beamCenterDepressionElevation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamwidthDownElevation")]
-        public float BeamwidthDownElevation
-        {
-            get
-            {
-                return this._beamwidthDownElevation;
-            }
-
-            set
-            {
-                this._beamwidthDownElevation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._activeEmissionParameterIndex);
-                    dos.WriteUnsignedShort((ushort)this._scanPattern);
-                    dos.WriteFloat((float)this._beamCenterAzimuthHorizontal);
-                    dos.WriteFloat((float)this._azimuthalBeamwidthHorizontal);
-                    dos.WriteFloat((float)this._beamCenterDepressionElevation);
-                    dos.WriteFloat((float)this._beamwidthDownElevation);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._activeEmissionParameterIndex = dis.ReadUnsignedShort();
-                    this._scanPattern = dis.ReadUnsignedShort();
-                    this._beamCenterAzimuthHorizontal = dis.ReadFloat();
-                    this._azimuthalBeamwidthHorizontal = dis.ReadFloat();
-                    this._beamCenterDepressionElevation = dis.ReadFloat();
-                    this._beamwidthDownElevation = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<UAFundamentalParameter>");
-            try
-            {
-                sb.AppendLine("<activeEmissionParameterIndex type=\"ushort\">" + this._activeEmissionParameterIndex.ToString(CultureInfo.InvariantCulture) + "</activeEmissionParameterIndex>");
-                sb.AppendLine("<scanPattern type=\"ushort\">" + this._scanPattern.ToString(CultureInfo.InvariantCulture) + "</scanPattern>");
-                sb.AppendLine("<beamCenterAzimuthHorizontal type=\"float\">" + this._beamCenterAzimuthHorizontal.ToString(CultureInfo.InvariantCulture) + "</beamCenterAzimuthHorizontal>");
-                sb.AppendLine("<azimuthalBeamwidthHorizontal type=\"float\">" + this._azimuthalBeamwidthHorizontal.ToString(CultureInfo.InvariantCulture) + "</azimuthalBeamwidthHorizontal>");
-                sb.AppendLine("<beamCenterDepressionElevation type=\"float\">" + this._beamCenterDepressionElevation.ToString(CultureInfo.InvariantCulture) + "</beamCenterDepressionElevation>");
-                sb.AppendLine("<beamwidthDownElevation type=\"float\">" + this._beamwidthDownElevation.ToString(CultureInfo.InvariantCulture) + "</beamwidthDownElevation>");
-                sb.AppendLine("</UAFundamentalParameter>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as UAFundamentalParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(UAFundamentalParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._activeEmissionParameterIndex != obj._activeEmissionParameterIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._scanPattern != obj._scanPattern)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamCenterAzimuthHorizontal != obj._beamCenterAzimuthHorizontal)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthalBeamwidthHorizontal != obj._azimuthalBeamwidthHorizontal)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamCenterDepressionElevation != obj._beamCenterDepressionElevation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamwidthDownElevation != obj._beamwidthDownElevation)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._activeEmissionParameterIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._scanPattern.GetHashCode();
-            result = GenerateHash(result) ^ this._beamCenterAzimuthHorizontal.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthalBeamwidthHorizontal.GetHashCode();
-            result = GenerateHash(result) ^ this._beamCenterDepressionElevation.GetHashCode();
-            result = GenerateHash(result) ^ this._beamwidthDownElevation.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/UaPdu.cs b/Libs/CSharpDis7/UaPdu.cs
deleted file mode 100644
index 95784b1..0000000
--- a/Libs/CSharpDis7/UaPdu.cs
+++ /dev/null
@@ -1,756 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    ///  Information about underwater acoustic emmissions. This requires manual cleanup.  The beam data records should ALL be a the finish, rather than attached to each emitter system. Section 7.6.4. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventIdentifier))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class UaPdu : DistributedEmissionsFamilyPdu, IEquatable<UaPdu>
-    {
-        /// <summary>
-        /// ID of the entity that is the source of the emission
-        /// </summary>
-        private EntityID _emittingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventIdentifier _eventID = new EventIdentifier();
-
-        /// <summary>
-        /// This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
-        /// </summary>
-        private byte _stateChangeIndicator;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad;
-
-        /// <summary>
-        /// This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
-        /// </summary>
-        private ushort _passiveParameterIndex;
-
-        /// <summary>
-        /// This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
-        /// </summary>
-        private byte _propulsionPlantConfiguration;
-
-        /// <summary>
-        ///  This field shall represent the number of shafts on a platform
-        /// </summary>
-        private byte _numberOfShafts;
-
-        /// <summary>
-        /// This field shall indicate the number of APAs described in the current UA PDU
-        /// </summary>
-        private byte _numberOfAPAs;
-
-        /// <summary>
-        /// This field shall specify the number of UA emitter systems being described in the current UA PDU
-        /// </summary>
-        private byte _numberOfUAEmitterSystems;
-
-        /// <summary>
-        /// shaft RPM values. THIS IS WRONG. It has the wrong class in the list.
-        /// </summary>
-        private List<Vector3Float> _shaftRPMs = new List<Vector3Float>();
-
-        /// <summary>
-        /// apaData. THIS IS WRONG. It has the worng class in the list.
-        /// </summary>
-        private List<Vector3Float> _apaData = new List<Vector3Float>();
-
-        /// <summary>
-        /// THIS IS WRONG. It has the wrong class in the list.
-        /// </summary>
-        private List<Vector3Float> _emitterSystems = new List<Vector3Float>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UaPdu"/> class.
-        /// </summary>
-        public UaPdu()
-        {
-            PduType = (byte)29;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(UaPdu left, UaPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(UaPdu left, UaPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._stateChangeIndicator
-            marshalSize += 1;  // this._pad
-            marshalSize += 2;  // this._passiveParameterIndex
-            marshalSize += 1;  // this._propulsionPlantConfiguration
-            marshalSize += 1;  // this._numberOfShafts
-            marshalSize += 1;  // this._numberOfAPAs
-            marshalSize += 1;  // this._numberOfUAEmitterSystems
-            for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._shaftRPMs[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._apaData.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._apaData[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._emitterSystems[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that is the source of the emission
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
-        public EntityID EmittingEntityID
-        {
-            get
-            {
-                return this._emittingEntityID;
-            }
-
-            set
-            {
-                this._emittingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
-        public EventIdentifier EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "stateChangeIndicator")]
-        public byte StateChangeIndicator
-        {
-            get
-            {
-                return this._stateChangeIndicator;
-            }
-
-            set
-            {
-                this._stateChangeIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad")]
-        public byte Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "passiveParameterIndex")]
-        public ushort PassiveParameterIndex
-        {
-            get
-            {
-                return this._passiveParameterIndex;
-            }
-
-            set
-            {
-                this._passiveParameterIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "propulsionPlantConfiguration")]
-        public byte PropulsionPlantConfiguration
-        {
-            get
-            {
-                return this._propulsionPlantConfiguration;
-            }
-
-            set
-            {
-                this._propulsionPlantConfiguration = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfShafts method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfShafts")]
-        public byte NumberOfShafts
-        {
-            get
-            {
-                return this._numberOfShafts;
-            }
-
-            set
-            {
-                this._numberOfShafts = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfAPAs method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfAPAs")]
-        public byte NumberOfAPAs
-        {
-            get
-            {
-                return this._numberOfAPAs;
-            }
-
-            set
-            {
-                this._numberOfAPAs = value;
-            }
-        }
-
-        /// <summary>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfUAEmitterSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfUAEmitterSystems")]
-        public byte NumberOfUAEmitterSystems
-        {
-            get
-            {
-                return this._numberOfUAEmitterSystems;
-            }
-
-            set
-            {
-                this._numberOfUAEmitterSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the shaft RPM values. THIS IS WRONG. It has the wrong class in the list.
-        /// </summary>
-        [XmlElement(ElementName = "shaftRPMsList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> ShaftRPMs
-        {
-            get
-            {
-                return this._shaftRPMs;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the apaData. THIS IS WRONG. It has the worng class in the list.
-        /// </summary>
-        [XmlElement(ElementName = "apaDataList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> ApaData
-        {
-            get
-            {
-                return this._apaData;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the THIS IS WRONG. It has the wrong class in the list.
-        /// </summary>
-        [XmlElement(ElementName = "emitterSystemsList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> EmitterSystems
-        {
-            get
-            {
-                return this._emitterSystems;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteByte((byte)this._stateChangeIndicator);
-                    dos.WriteByte((byte)this._pad);
-                    dos.WriteUnsignedShort((ushort)this._passiveParameterIndex);
-                    dos.WriteUnsignedByte((byte)this._propulsionPlantConfiguration);
-                    dos.WriteUnsignedByte((byte)this._shaftRPMs.Count);
-                    dos.WriteUnsignedByte((byte)this._apaData.Count);
-                    dos.WriteUnsignedByte((byte)this._emitterSystems.Count);
-
-                    for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._shaftRPMs[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._apaData.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._apaData[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._emitterSystems[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._stateChangeIndicator = dis.ReadByte();
-                    this._pad = dis.ReadByte();
-                    this._passiveParameterIndex = dis.ReadUnsignedShort();
-                    this._propulsionPlantConfiguration = dis.ReadUnsignedByte();
-                    this._numberOfShafts = dis.ReadUnsignedByte();
-                    this._numberOfAPAs = dis.ReadUnsignedByte();
-                    this._numberOfUAEmitterSystems = dis.ReadUnsignedByte();
-                    for (int idx = 0; idx < this.NumberOfShafts; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._shaftRPMs.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfAPAs; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._apaData.Add(anX);
-                    };
-
-                    for (int idx = 0; idx < this.NumberOfUAEmitterSystems; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._emitterSystems.Add(anX);
-                    };
-
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<UaPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<emittingEntityID>");
-                this._emittingEntityID.Reflection(sb);
-                sb.AppendLine("</emittingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<stateChangeIndicator type=\"byte\">" + this._stateChangeIndicator.ToString(CultureInfo.InvariantCulture) + "</stateChangeIndicator>");
-                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                sb.AppendLine("<passiveParameterIndex type=\"ushort\">" + this._passiveParameterIndex.ToString(CultureInfo.InvariantCulture) + "</passiveParameterIndex>");
-                sb.AppendLine("<propulsionPlantConfiguration type=\"byte\">" + this._propulsionPlantConfiguration.ToString(CultureInfo.InvariantCulture) + "</propulsionPlantConfiguration>");
-                sb.AppendLine("<shaftRPMs type=\"byte\">" + this._shaftRPMs.Count.ToString(CultureInfo.InvariantCulture) + "</shaftRPMs>");
-                sb.AppendLine("<apaData type=\"byte\">" + this._apaData.Count.ToString(CultureInfo.InvariantCulture) + "</apaData>");
-                sb.AppendLine("<emitterSystems type=\"byte\">" + this._emitterSystems.Count.ToString(CultureInfo.InvariantCulture) + "</emitterSystems>");
-                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                {
-                    sb.AppendLine("<shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._shaftRPMs[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._apaData.Count; idx++)
-                {
-                    sb.AppendLine("<apaData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._apaData[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</apaData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                {
-                    sb.AppendLine("<emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._emitterSystems[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</UaPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as UaPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(UaPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateChangeIndicator != obj._stateChangeIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._passiveParameterIndex != obj._passiveParameterIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._propulsionPlantConfiguration != obj._propulsionPlantConfiguration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfShafts != obj._numberOfShafts)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfAPAs != obj._numberOfAPAs)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfUAEmitterSystems != obj._numberOfUAEmitterSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._shaftRPMs.Count != obj._shaftRPMs.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                {
-                    if (!this._shaftRPMs[idx].Equals(obj._shaftRPMs[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._apaData.Count != obj._apaData.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._apaData.Count; idx++)
-                {
-                    if (!this._apaData[idx].Equals(obj._apaData[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._emitterSystems.Count != obj._emitterSystems.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                {
-                    if (!this._emitterSystems[idx].Equals(obj._emitterSystems[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._stateChangeIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-            result = GenerateHash(result) ^ this._passiveParameterIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._propulsionPlantConfiguration.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfShafts.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfAPAs.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfUAEmitterSystems.GetHashCode();
-
-            if (this._shaftRPMs.Count > 0)
-            {
-                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._shaftRPMs[idx].GetHashCode();
-                }
-            }
-
-            if (this._apaData.Count > 0)
-            {
-                for (int idx = 0; idx < this._apaData.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._apaData[idx].GetHashCode();
-                }
-            }
-
-            if (this._emitterSystems.Count > 0)
-            {
-                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._emitterSystems[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/UnattachedIdentifier.cs b/Libs/CSharpDis7/UnattachedIdentifier.cs
deleted file mode 100644
index 7c6c000..0000000
--- a/Libs/CSharpDis7/UnattachedIdentifier.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// The unique designation of one or more unattached radios in an event or exercise Section 6.2.91
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class UnattachedIdentifier
-    {
-        /// <summary>
-        /// See 6.2.79
-        /// </summary>
-        private SimulationAddress _simulationAddress = new SimulationAddress();
-
-        /// <summary>
-        /// Reference number
-        /// </summary>
-        private ushort _referenceNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UnattachedIdentifier"/> class.
-        /// </summary>
-        public UnattachedIdentifier()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(UnattachedIdentifier left, UnattachedIdentifier right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(UnattachedIdentifier left, UnattachedIdentifier right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
-            marshalSize += 2;  // this._referenceNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the See 6.2.79
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
-        public SimulationAddress SimulationAddress
-        {
-            get
-            {
-                return this._simulationAddress;
-            }
-
-            set
-            {
-                this._simulationAddress = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Reference number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
-        public ushort ReferenceNumber
-        {
-            get
-            {
-                return this._referenceNumber;
-            }
-
-            set
-            {
-                this._referenceNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._simulationAddress.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._simulationAddress.Unmarshal(dis);
-                    this._referenceNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<UnattachedIdentifier>");
-            try
-            {
-                sb.AppendLine("<simulationAddress>");
-                this._simulationAddress.Reflection(sb);
-                sb.AppendLine("</simulationAddress>");
-                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
-                sb.AppendLine("</UnattachedIdentifier>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as UnattachedIdentifier;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(UnattachedIdentifier obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._simulationAddress.Equals(obj._simulationAddress))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._referenceNumber != obj._referenceNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
-            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/UnsignedDISInteger.cs b/Libs/CSharpDis7/UnsignedDISInteger.cs
deleted file mode 100644
index a09f68f..0000000
--- a/Libs/CSharpDis7/UnsignedDISInteger.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// container class not in specification
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class UnsignedDISInteger
-    {
-        /// <summary>
-        /// unsigned integer
-        /// </summary>
-        private uint _val;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UnsignedDISInteger"/> class.
-        /// </summary>
-        public UnsignedDISInteger()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(UnsignedDISInteger left, UnsignedDISInteger right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(UnsignedDISInteger left, UnsignedDISInteger right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._val
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the unsigned integer
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "val")]
-        public uint Val
-        {
-            get
-            {
-                return this._val;
-            }
-
-            set
-            {
-                this._val = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._val);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._val = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<UnsignedDISInteger>");
-            try
-            {
-                sb.AppendLine("<val type=\"uint\">" + this._val.ToString(CultureInfo.InvariantCulture) + "</val>");
-                sb.AppendLine("</UnsignedDISInteger>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as UnsignedDISInteger;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(UnsignedDISInteger obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._val != obj._val)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._val.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/VariableDatum.cs b/Libs/CSharpDis7/VariableDatum.cs
deleted file mode 100644
index 0b26932..0000000
--- a/Libs/CSharpDis7/VariableDatum.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// the variable datum type, the datum length, and the value for that variable datum type. NOT COMPLETE. Section 6.2.92
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class VariableDatum
-    {
-        /// <summary>
-        /// Type of variable datum to be transmitted. 32 bit enumeration defined in EBV
-        /// </summary>
-        private uint _variableDatumID;
-
-        /// <summary>
-        /// Length, in bits, of the variable datum.
-        /// </summary>
-        private uint _variableDatumLength;
-
-        /// <summary>
-        /// Variable datum. This can be any number of bits long, depending on the datum.
-        /// </summary>
-        private uint _variableDatumBits;
-
-        /// <summary>
-        /// padding to put the record on a 64 bit boundary
-        /// </summary>
-        private uint _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VariableDatum"/> class.
-        /// </summary>
-        public VariableDatum()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(VariableDatum left, VariableDatum right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(VariableDatum left, VariableDatum right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._variableDatumID
-            marshalSize += 4;  // this._variableDatumLength
-            marshalSize += 4;  // this._variableDatumBits
-            marshalSize += 4;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of variable datum to be transmitted. 32 bit enumeration defined in EBV
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumID")]
-        public uint VariableDatumID
-        {
-            get
-            {
-                return this._variableDatumID;
-            }
-
-            set
-            {
-                this._variableDatumID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length, in bits, of the variable datum.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumLength")]
-        public uint VariableDatumLength
-        {
-            get
-            {
-                return this._variableDatumLength;
-            }
-
-            set
-            {
-                this._variableDatumLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable datum. This can be any number of bits long, depending on the datum.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumBits")]
-        public uint VariableDatumBits
-        {
-            get
-            {
-                return this._variableDatumBits;
-            }
-
-            set
-            {
-                this._variableDatumBits = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding to put the record on a 64 bit boundary
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding")]
-        public uint Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._variableDatumID);
-                    dos.WriteUnsignedInt((uint)this._variableDatumLength);
-                    dos.WriteUnsignedInt((uint)this._variableDatumBits);
-                    dos.WriteUnsignedInt((uint)this._padding);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._variableDatumID = dis.ReadUnsignedInt();
-                    this._variableDatumLength = dis.ReadUnsignedInt();
-                    this._variableDatumBits = dis.ReadUnsignedInt();
-                    this._padding = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<VariableDatum>");
-            try
-            {
-                sb.AppendLine("<variableDatumID type=\"uint\">" + this._variableDatumID.ToString(CultureInfo.InvariantCulture) + "</variableDatumID>");
-                sb.AppendLine("<variableDatumLength type=\"uint\">" + this._variableDatumLength.ToString(CultureInfo.InvariantCulture) + "</variableDatumLength>");
-                sb.AppendLine("<variableDatumBits type=\"uint\">" + this._variableDatumBits.ToString(CultureInfo.InvariantCulture) + "</variableDatumBits>");
-                sb.AppendLine("<padding type=\"uint\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</VariableDatum>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as VariableDatum;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(VariableDatum obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._variableDatumID != obj._variableDatumID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumLength != obj._variableDatumLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumBits != obj._variableDatumBits)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._variableDatumID.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumLength.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumBits.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/VariableParameter.cs b/Libs/CSharpDis7/VariableParameter.cs
deleted file mode 100644
index b589e23..0000000
--- a/Libs/CSharpDis7/VariableParameter.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// specification of additional information associated with an entity or detonation, not otherwise accounted for in a PDU 6.2.93.1
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class VariableParameter
-    {
-        /// <summary>
-        /// the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        private byte _recordType;
-
-        /// <summary>
-        /// Variable parameter data fields. Two doubles minus one byte
-        /// </summary>
-        private double _variableParameterFields1;
-
-        /// <summary>
-        /// Variable parameter data fields. 
-        /// </summary>
-        private uint _variableParameterFields2;
-
-        /// <summary>
-        /// Variable parameter data fields. 
-        /// </summary>
-        private ushort _variableParameterFields3;
-
-        /// <summary>
-        /// Variable parameter data fields. 
-        /// </summary>
-        private byte _variableParameterFields4;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VariableParameter"/> class.
-        /// </summary>
-        public VariableParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(VariableParameter left, VariableParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(VariableParameter left, VariableParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._recordType
-            marshalSize += 8;  // this._variableParameterFields1
-            marshalSize += 4;  // this._variableParameterFields2
-            marshalSize += 2;  // this._variableParameterFields3
-            marshalSize += 1;  // this._variableParameterFields4
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
-        public byte RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable parameter data fields. Two doubles minus one byte
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "variableParameterFields1")]
-        public double VariableParameterFields1
-        {
-            get
-            {
-                return this._variableParameterFields1;
-            }
-
-            set
-            {
-                this._variableParameterFields1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable parameter data fields. 
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "variableParameterFields2")]
-        public uint VariableParameterFields2
-        {
-            get
-            {
-                return this._variableParameterFields2;
-            }
-
-            set
-            {
-                this._variableParameterFields2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable parameter data fields. 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "variableParameterFields3")]
-        public ushort VariableParameterFields3
-        {
-            get
-            {
-                return this._variableParameterFields3;
-            }
-
-            set
-            {
-                this._variableParameterFields3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Variable parameter data fields. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "variableParameterFields4")]
-        public byte VariableParameterFields4
-        {
-            get
-            {
-                return this._variableParameterFields4;
-            }
-
-            set
-            {
-                this._variableParameterFields4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._recordType);
-                    dos.WriteDouble((double)this._variableParameterFields1);
-                    dos.WriteUnsignedInt((uint)this._variableParameterFields2);
-                    dos.WriteUnsignedShort((ushort)this._variableParameterFields3);
-                    dos.WriteUnsignedByte((byte)this._variableParameterFields4);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedByte();
-                    this._variableParameterFields1 = dis.ReadDouble();
-                    this._variableParameterFields2 = dis.ReadUnsignedInt();
-                    this._variableParameterFields3 = dis.ReadUnsignedShort();
-                    this._variableParameterFields4 = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<VariableParameter>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<variableParameterFields1 type=\"double\">" + this._variableParameterFields1.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields1>");
-                sb.AppendLine("<variableParameterFields2 type=\"uint\">" + this._variableParameterFields2.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields2>");
-                sb.AppendLine("<variableParameterFields3 type=\"ushort\">" + this._variableParameterFields3.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields3>");
-                sb.AppendLine("<variableParameterFields4 type=\"byte\">" + this._variableParameterFields4.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields4>");
-                sb.AppendLine("</VariableParameter>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as VariableParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(VariableParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameterFields1 != obj._variableParameterFields1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameterFields2 != obj._variableParameterFields2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameterFields3 != obj._variableParameterFields3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableParameterFields4 != obj._variableParameterFields4)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._variableParameterFields1.GetHashCode();
-            result = GenerateHash(result) ^ this._variableParameterFields2.GetHashCode();
-            result = GenerateHash(result) ^ this._variableParameterFields3.GetHashCode();
-            result = GenerateHash(result) ^ this._variableParameterFields4.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/VariableTransmitterParameters.cs b/Libs/CSharpDis7/VariableTransmitterParameters.cs
deleted file mode 100644
index 26f8411..0000000
--- a/Libs/CSharpDis7/VariableTransmitterParameters.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Relates to radios. NOT COMPLETE. Section 6.2.94
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class VariableTransmitterParameters
-    {
-        /// <summary>
-        /// Type of VTP. Enumeration from EBV
-        /// </summary>
-        private uint _recordType = 4;
-
-        /// <summary>
-        /// Length, in bytes
-        /// </summary>
-        private uint _recordLength = 4;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VariableTransmitterParameters"/> class.
-        /// </summary>
-        public VariableTransmitterParameters()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(VariableTransmitterParameters left, VariableTransmitterParameters right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(VariableTransmitterParameters left, VariableTransmitterParameters right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordType
-            marshalSize += 4;  // this._recordLength
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of VTP. Enumeration from EBV
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
-        public uint RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length, in bytes
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordLength")]
-        public uint RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordType);
-                    dos.WriteUnsignedInt((uint)this._recordLength);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<VariableTransmitterParameters>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"uint\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("</VariableTransmitterParameters>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as VariableTransmitterParameters;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(VariableTransmitterParameters obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Vector2Float.cs b/Libs/CSharpDis7/Vector2Float.cs
deleted file mode 100644
index 2184d38..0000000
--- a/Libs/CSharpDis7/Vector2Float.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Two floating point values, x, y
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Vector2Float
-    {
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Vector2Float"/> class.
-        /// </summary>
-        public Vector2Float()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Vector2Float left, Vector2Float right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Vector2Float left, Vector2Float right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Vector2Float>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("</Vector2Float>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Vector2Float;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Vector2Float obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Vector3Double.cs b/Libs/CSharpDis7/Vector3Double.cs
deleted file mode 100644
index 8784efa..0000000
--- a/Libs/CSharpDis7/Vector3Double.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Three double precision floating point values, x, y, and z. Used for world coordinates Section 6.2.97.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Vector3Double
-    {
-        /// <summary>
-        /// X value
-        /// </summary>
-        private double _x;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private double _y;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private double _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Vector3Double"/> class.
-        /// </summary>
-        public Vector3Double()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Vector3Double left, Vector3Double right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Vector3Double left, Vector3Double right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 8;  // this._x
-            marshalSize += 8;  // this._y
-            marshalSize += 8;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "x")]
-        public double X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "y")]
-        public double Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "z")]
-        public double Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteDouble((double)this._x);
-                    dos.WriteDouble((double)this._y);
-                    dos.WriteDouble((double)this._z);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadDouble();
-                    this._y = dis.ReadDouble();
-                    this._z = dis.ReadDouble();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Vector3Double>");
-            try
-            {
-                sb.AppendLine("<x type=\"double\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"double\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"double\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</Vector3Double>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Vector3Double;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Vector3Double obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/Vector3Float.cs b/Libs/CSharpDis7/Vector3Float.cs
deleted file mode 100644
index 82689bc..0000000
--- a/Libs/CSharpDis7/Vector3Float.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Three floating point values, x, y, and z. Section 6.2.95
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Vector3Float
-    {
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Vector3Float"/> class.
-        /// </summary>
-        public Vector3Float()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Vector3Float left, Vector3Float right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Vector3Float left, Vector3Float right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            marshalSize += 4;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "z")]
-        public float Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                    dos.WriteFloat((float)this._z);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                    this._z = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Vector3Float>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</Vector3Float>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Vector3Float;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Vector3Float obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/VectoringNozzleSystem.cs b/Libs/CSharpDis7/VectoringNozzleSystem.cs
deleted file mode 100644
index 5bd7e4d..0000000
--- a/Libs/CSharpDis7/VectoringNozzleSystem.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// Operational data for describing the vectoring nozzle systems Section 6.2.96
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class VectoringNozzleSystem
-    {
-        /// <summary>
-        /// In degrees
-        /// </summary>
-        private float _horizontalDeflectionAngle;
-
-        /// <summary>
-        /// In degrees
-        /// </summary>
-        private float _verticalDeflectionAngle;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VectoringNozzleSystem"/> class.
-        /// </summary>
-        public VectoringNozzleSystem()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(VectoringNozzleSystem left, VectoringNozzleSystem right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(VectoringNozzleSystem left, VectoringNozzleSystem right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._horizontalDeflectionAngle
-            marshalSize += 4;  // this._verticalDeflectionAngle
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the In degrees
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "horizontalDeflectionAngle")]
-        public float HorizontalDeflectionAngle
-        {
-            get
-            {
-                return this._horizontalDeflectionAngle;
-            }
-
-            set
-            {
-                this._horizontalDeflectionAngle = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the In degrees
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "verticalDeflectionAngle")]
-        public float VerticalDeflectionAngle
-        {
-            get
-            {
-                return this._verticalDeflectionAngle;
-            }
-
-            set
-            {
-                this._verticalDeflectionAngle = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event Action<Exception> Exception;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void OnException(Exception e)
-        {
-            if (this.Exception != null)
-            {
-                this.Exception(e);
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._horizontalDeflectionAngle);
-                    dos.WriteFloat((float)this._verticalDeflectionAngle);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._horizontalDeflectionAngle = dis.ReadFloat();
-                    this._verticalDeflectionAngle = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<VectoringNozzleSystem>");
-            try
-            {
-                sb.AppendLine("<horizontalDeflectionAngle type=\"float\">" + this._horizontalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</horizontalDeflectionAngle>");
-                sb.AppendLine("<verticalDeflectionAngle type=\"float\">" + this._verticalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</verticalDeflectionAngle>");
-                sb.AppendLine("</VectoringNozzleSystem>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as VectoringNozzleSystem;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(VectoringNozzleSystem obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._horizontalDeflectionAngle != obj._horizontalDeflectionAngle)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._verticalDeflectionAngle != obj._verticalDeflectionAngle)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._horizontalDeflectionAngle.GetHashCode();
-            result = GenerateHash(result) ^ this._verticalDeflectionAngle.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CSharpDis7/WarfareFamilyPdu.cs b/Libs/CSharpDis7/WarfareFamilyPdu.cs
deleted file mode 100644
index 86a8974..0000000
--- a/Libs/CSharpDis7/WarfareFamilyPdu.cs
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using DISnet.DataStreamUtilities;
-
-namespace DISnet
-{
-    /// <summary>
-    /// abstract superclass for fire and detonation pdus that have shared information. Section 7.3 COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class WarfareFamilyPdu : Pdu, IEquatable<WarfareFamilyPdu>
-    {
-        /// <summary>
-        /// ID of the entity that shot
-        /// </summary>
-        private EntityID _firingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of the entity that is being shot at
-        /// </summary>
-        private EntityID _targetEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WarfareFamilyPdu"/> class.
-        /// </summary>
-        public WarfareFamilyPdu()
-        {
-            ProtocolFamily = (byte)2;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(WarfareFamilyPdu left, WarfareFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(WarfareFamilyPdu left, WarfareFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
-            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that shot
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "firingEntityID")]
-        public EntityID FiringEntityID
-        {
-            get
-            {
-                return this._firingEntityID;
-            }
-
-            set
-            {
-                this._firingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that is being shot at
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
-        public EntityID TargetEntityID
-        {
-            get
-            {
-                return this._targetEntityID;
-            }
-
-            set
-            {
-                this._targetEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._firingEntityID.Marshal(dos);
-                    this._targetEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._firingEntityID.Unmarshal(dis);
-                    this._targetEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<WarfareFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<firingEntityID>");
-                this._firingEntityID.Reflection(sb);
-                sb.AppendLine("</firingEntityID>");
-                sb.AppendLine("<targetEntityID>");
-                this._targetEntityID.Reflection(sb);
-                sb.AppendLine("</targetEntityID>");
-                sb.AppendLine("</WarfareFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-#if DEBUG
-                    Trace.WriteLine(e);
-                    Trace.Flush();
-#endif
-                    this.OnException(e);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as WarfareFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(WarfareFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._firingEntityID.Equals(obj._firingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetEntityID.Equals(obj._targetEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
diff --git a/Libs/CsharpDis6/OpenDis/Core/CetBase.cs b/Libs/CsharpDis6/Core/CetBase.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Core/CetBase.cs
rename to Libs/CsharpDis6/Core/CetBase.cs
index 703f80b..edae72c 100644
--- a/Libs/CsharpDis6/OpenDis/Core/CetBase.cs
+++ b/Libs/CsharpDis6/Core/CetBase.cs
@@ -1,37 +1,37 @@
-using System;
-
-namespace OpenDis.Core
-{
-    public class CetBase
-    {
-        /// <summary>
-        /// Verifies the string if it contains only numerical characters (0-9).
-        /// </summary>
-        /// <param name="value">The value to be verified.</param>
-        /// <param name="allowNullOrEmpty">if set to <c>true</c> allow null or empty value does not result
-        /// in an exception.</param>
-        /// <exception cref="ArgumentNullException">When the <c>allowNullOrEmpty</c> is false and value is
-        /// null or empty.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">When the value is not null or empty and contains 
-        /// non-numerical character.</exception>
-        protected void VerifyNumericString(string value, bool allowNullOrEmpty)
-        {
-            if (!allowNullOrEmpty &&
-                string.IsNullOrEmpty(value))
-            {
-                throw new ArgumentNullException("Value must be greater or equal to 0.");
-            }
-
-            if (value != null)
-            {
-                for (int i = 0; i < value.Length; i++)
-                {
-                    if (value[i] < '0' || value[i] > '9')
-                    {
-                        throw new ArgumentOutOfRangeException("Value must be greater or equal to 0.");
-                    }
-                }
-            }
-        }
-    }
+using System;
+
+namespace OpenDis.Core
+{
+    public class CetBase
+    {
+        /// <summary>
+        /// Verifies the string if it contains only numerical characters (0-9).
+        /// </summary>
+        /// <param name="value">The value to be verified.</param>
+        /// <param name="allowNullOrEmpty">if set to <c>true</c> allow null or empty value does not result
+        /// in an exception.</param>
+        /// <exception cref="ArgumentNullException">When the <c>allowNullOrEmpty</c> is false and value is
+        /// null or empty.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">When the value is not null or empty and contains 
+        /// non-numerical character.</exception>
+        protected void VerifyNumericString(string value, bool allowNullOrEmpty)
+        {
+            if (!allowNullOrEmpty &&
+                string.IsNullOrEmpty(value))
+            {
+                throw new ArgumentNullException("Value must be greater or equal to 0.");
+            }
+
+            if (value != null)
+            {
+                for (int i = 0; i < value.Length; i++)
+                {
+                    if (value[i] < '0' || value[i] > '9')
+                    {
+                        throw new ArgumentOutOfRangeException("Value must be greater or equal to 0.");
+                    }
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Core/DisTime.cs b/Libs/CsharpDis6/Core/DisTime.cs
similarity index 100%
rename from Libs/CsharpDis6/OpenDis/Core/DisTime.cs
rename to Libs/CsharpDis6/Core/DisTime.cs
diff --git a/Libs/CsharpDis6/OpenDis/Core/EndianTypes.cs b/Libs/CsharpDis6/Core/EndianTypes.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Core/EndianTypes.cs
rename to Libs/CsharpDis6/Core/EndianTypes.cs
index 3ed4160..86e011c 100644
--- a/Libs/CsharpDis6/OpenDis/Core/EndianTypes.cs
+++ b/Libs/CsharpDis6/Core/EndianTypes.cs
@@ -1,58 +1,58 @@
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenDis.Core
-{
-    /// <summary>
-    /// Known endian types
-    /// </summary>
-    public enum Endian
-    {
-        /// <summary>
-        /// Little endian
-        /// </summary>
-        Little = 1,
-
-        /// <summary>
-        /// Big endian
-        /// </summary>
-        Big = 0,
-    }
-}
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenDis.Core
+{
+    /// <summary>
+    /// Known endian types
+    /// </summary>
+    public enum Endian
+    {
+        /// <summary>
+        /// Little endian
+        /// </summary>
+        Little = 1,
+
+        /// <summary>
+        /// Big endian
+        /// </summary>
+        Big = 0,
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/EnumHelper.cs b/Libs/CsharpDis6/Core/EnumHelper.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Core/EnumHelper.cs
rename to Libs/CsharpDis6/Core/EnumHelper.cs
index eabb5dd..2cfc332 100644
--- a/Libs/CsharpDis6/OpenDis/Core/EnumHelper.cs
+++ b/Libs/CsharpDis6/Core/EnumHelper.cs
@@ -1,217 +1,217 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using OpenDis.Core;
-using System.Collections.Generic;
-
-namespace OpenDis.Core
-{
-    public static class EnumHelper
-    {
-		#region Static methods (7) 
-
-        public static bool EnumerationForValueExists<T>(int number)
-        {
-            return Enum.IsDefined(typeof(T), number);
-        }
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>the description</returns>
-        /// <exception cref="InvalidOperationException">if the type parameter is not enum.</exception>
-        public static string GetDescription<T>(T value)
-        {
-            string retVal = string.Empty;
-
-            DescriptionAttribute attr = GetEnumValueAttribute<DescriptionAttribute, T>(value);
-
-            if (attr != null)
-            {
-                retVal = attr.Description;
-            }
-
-            return retVal; 
-        }
-
-        /// <summary>
-        /// Returns an Enumeration Type from a number passed in
-        /// </summary>
-        /// <typeparam name="T">Enumeration Type</typeparam>
-        /// <param name="number">Enumeration value</param>
-        /// <returns>Enumeration of that value</returns>
-        /// <exception cref="EnumNotFoundException">if the nuber (parameter) 
-        /// value is not found in the enum definition</exception>
-        public static T GetEnumerationForValue<T>(int number)
-        {
-            if (Enum.IsDefined(typeof(T), number) == true)
-            {
-                return (T)Enum.ToObject(typeof(T), number);
-            }
-            else
-            {
-                throw new EnumNotFoundException(string.Format("No enumeration found for value {0} of enumeration {1}", number, typeof(T).Name), typeof(T));
-            }
-        }
-
-        /// <summary>
-        /// Gets the attribute of the enumeration value.
-        /// </summary>
-        /// <typeparam name="T">Attribute type.</typeparam>
-        /// <typeparam name="U">Enumeration type</typeparam>
-        /// <param name="value">The value.</param>
-        /// <returns>The instance of the attribute or null if the attribute is not found</returns>
-        public static T GetEnumValueAttribute<T, U>(U value)
-        {
-            Type t = typeof(U);
-
-            if (t.IsEnum)
-            {
-                if (value != null)
-                {
-                    FieldInfo fieldInfo = typeof(U).GetField(Enum.GetName(typeof(U), value));
-
-                    if (fieldInfo != null)
-                    {
-                        object[] attributes = fieldInfo.GetCustomAttributes(typeof(T), false);
-
-                        if (attributes != null &&
-                           attributes.Length > 0)
-                        {
-                            return (T)attributes[0];
-                        }
-                    }
-                }
-            }
-            else
-            {
-                throw new ArgumentException("Type must be an enum.");
-            }
-
-            return default(T);
-        }
-
-        /// <summary>
-        /// Gets the attribute of the enumeration value.
-        /// </summary>
-        /// <typeparam name="T">Attribute type.</typeparam>
-        /// <typeparam name="U">Enumeration type</typeparam>
-        /// <param name="value">The value.</param>
-        /// <returns>The instance of the attribute or null if the attribute is not found</returns>
-        public static IEnumerable<T> GetEnumValueAttributes<T, U>(U value)
-        {
-            Type t = typeof(U);
-
-            if (t.IsEnum)
-            {
-                if (value != null)
-                {
-                    FieldInfo fieldInfo = typeof(U).GetField(Enum.GetName(typeof(U), value));
-
-                    if (fieldInfo != null)
-                    {
-                        object[] attributes = fieldInfo.GetCustomAttributes(typeof(T), false);
-                        
-                        if (attributes != null &&
-                           attributes.Length > 0)
-                        {
-                            return attributes.Cast<T>(); ;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                throw new ArgumentException("Type must be an enum.");
-            }
-
-            return new T[0];
-        }
-
-        /// <summary>
-        /// Returns the Description associated with the enumeration
-        /// </summary>
-        /// <typeparam name="T">The enum type</typeparam>
-        /// <param name="value">The enumeration object which has the attribute.</param>
-        /// <returns>
-        /// The description string of the attribute or string.empty
-        /// </returns>
-        public static string GetInternetDomainCode<T>(T value)
-        {
-            string retVal = string.Empty;
-
-            InternetDomainCodeAttribute attr = GetEnumValueAttribute<InternetDomainCodeAttribute, T>(value);
-
-            if (attr != null)
-            {
-                retVal = attr.InternetDomainCode;
-            }
-
-            return retVal;
-        }
-
-        /// <summary>
-        /// Parses the specified name.
-        /// </summary>
-        /// <typeparam name="T">The enum type</typeparam>
-        /// <param name="value">The string value.</param>
-        /// <returns>Enum value.</returns>
-        public static T Parse<T>(string value)
-        {
-            return (T)Enum.Parse(typeof(T), value);
-        }
-
-        /// <summary>
-        /// Parses the specified value.
-        /// </summary>
-        /// <typeparam name="T">The enum type</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
-        /// <returns>Enum value.</returns>
-        public static T Parse<T>(string value, bool ignoreCase)
-        {
-            return (T)Enum.Parse(typeof(T), value, ignoreCase);
-        }
-
-		#endregion Static methods 
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using OpenDis.Core;
+using System.Collections.Generic;
+
+namespace OpenDis.Core
+{
+    public static class EnumHelper
+    {
+		#region Static methods (7) 
+
+        public static bool EnumerationForValueExists<T>(int number)
+        {
+            return Enum.IsDefined(typeof(T), number);
+        }
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>the description</returns>
+        /// <exception cref="InvalidOperationException">if the type parameter is not enum.</exception>
+        public static string GetDescription<T>(T value)
+        {
+            string retVal = string.Empty;
+
+            DescriptionAttribute attr = GetEnumValueAttribute<DescriptionAttribute, T>(value);
+
+            if (attr != null)
+            {
+                retVal = attr.Description;
+            }
+
+            return retVal; 
+        }
+
+        /// <summary>
+        /// Returns an Enumeration Type from a number passed in
+        /// </summary>
+        /// <typeparam name="T">Enumeration Type</typeparam>
+        /// <param name="number">Enumeration value</param>
+        /// <returns>Enumeration of that value</returns>
+        /// <exception cref="EnumNotFoundException">if the nuber (parameter) 
+        /// value is not found in the enum definition</exception>
+        public static T GetEnumerationForValue<T>(int number)
+        {
+            if (Enum.IsDefined(typeof(T), number) == true)
+            {
+                return (T)Enum.ToObject(typeof(T), number);
+            }
+            else
+            {
+                throw new EnumNotFoundException(string.Format("No enumeration found for value {0} of enumeration {1}", number, typeof(T).Name), typeof(T));
+            }
+        }
+
+        /// <summary>
+        /// Gets the attribute of the enumeration value.
+        /// </summary>
+        /// <typeparam name="T">Attribute type.</typeparam>
+        /// <typeparam name="U">Enumeration type</typeparam>
+        /// <param name="value">The value.</param>
+        /// <returns>The instance of the attribute or null if the attribute is not found</returns>
+        public static T GetEnumValueAttribute<T, U>(U value)
+        {
+            Type t = typeof(U);
+
+            if (t.IsEnum)
+            {
+                if (value != null)
+                {
+                    FieldInfo fieldInfo = typeof(U).GetField(Enum.GetName(typeof(U), value));
+
+                    if (fieldInfo != null)
+                    {
+                        object[] attributes = fieldInfo.GetCustomAttributes(typeof(T), false);
+
+                        if (attributes != null &&
+                           attributes.Length > 0)
+                        {
+                            return (T)attributes[0];
+                        }
+                    }
+                }
+            }
+            else
+            {
+                throw new ArgumentException("Type must be an enum.");
+            }
+
+            return default(T);
+        }
+
+        /// <summary>
+        /// Gets the attribute of the enumeration value.
+        /// </summary>
+        /// <typeparam name="T">Attribute type.</typeparam>
+        /// <typeparam name="U">Enumeration type</typeparam>
+        /// <param name="value">The value.</param>
+        /// <returns>The instance of the attribute or null if the attribute is not found</returns>
+        public static IEnumerable<T> GetEnumValueAttributes<T, U>(U value)
+        {
+            Type t = typeof(U);
+
+            if (t.IsEnum)
+            {
+                if (value != null)
+                {
+                    FieldInfo fieldInfo = typeof(U).GetField(Enum.GetName(typeof(U), value));
+
+                    if (fieldInfo != null)
+                    {
+                        object[] attributes = fieldInfo.GetCustomAttributes(typeof(T), false);
+                        
+                        if (attributes != null &&
+                           attributes.Length > 0)
+                        {
+                            return attributes.Cast<T>(); ;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                throw new ArgumentException("Type must be an enum.");
+            }
+
+            return new T[0];
+        }
+
+        /// <summary>
+        /// Returns the Description associated with the enumeration
+        /// </summary>
+        /// <typeparam name="T">The enum type</typeparam>
+        /// <param name="value">The enumeration object which has the attribute.</param>
+        /// <returns>
+        /// The description string of the attribute or string.empty
+        /// </returns>
+        public static string GetInternetDomainCode<T>(T value)
+        {
+            string retVal = string.Empty;
+
+            InternetDomainCodeAttribute attr = GetEnumValueAttribute<InternetDomainCodeAttribute, T>(value);
+
+            if (attr != null)
+            {
+                retVal = attr.InternetDomainCode;
+            }
+
+            return retVal;
+        }
+
+        /// <summary>
+        /// Parses the specified name.
+        /// </summary>
+        /// <typeparam name="T">The enum type</typeparam>
+        /// <param name="value">The string value.</param>
+        /// <returns>Enum value.</returns>
+        public static T Parse<T>(string value)
+        {
+            return (T)Enum.Parse(typeof(T), value);
+        }
+
+        /// <summary>
+        /// Parses the specified value.
+        /// </summary>
+        /// <typeparam name="T">The enum type</typeparam>
+        /// <param name="value">The value.</param>
+        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
+        /// <returns>Enum value.</returns>
+        public static T Parse<T>(string value, bool ignoreCase)
+        {
+            return (T)Enum.Parse(typeof(T), value, ignoreCase);
+        }
+
+		#endregion Static methods 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/EnumNotFoundException.cs b/Libs/CsharpDis6/Core/EnumNotFoundException.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Core/EnumNotFoundException.cs
rename to Libs/CsharpDis6/Core/EnumNotFoundException.cs
index c55472a..472e6be 100644
--- a/Libs/CsharpDis6/OpenDis/Core/EnumNotFoundException.cs
+++ b/Libs/CsharpDis6/Core/EnumNotFoundException.cs
@@ -1,82 +1,82 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Text;
-
-namespace OpenDis.Core
-{
-    public class EnumNotFoundException : Exception
-    {
-		#region Constructors (5) 
-
-        public EnumNotFoundException(string message, Exception exception)
-            : base(message, exception)
-        {
-        }
-
-        private EnumNotFoundException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-
-        public EnumNotFoundException(string message, Type enumType)
-            : base(message)
-        {
-            this.EnumType = enumType;
-        }
-
-        public EnumNotFoundException(string message)
-            : base(message)
-        {
-        }
-
-        public EnumNotFoundException()
-        {
-        }
-
-		#endregion Constructors 
-
-		#region Properties (1) 
-
-        public Type EnumType { get; private set; }
-
-		#endregion Properties 
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace OpenDis.Core
+{
+    public class EnumNotFoundException : Exception
+    {
+		#region Constructors (5) 
+
+        public EnumNotFoundException(string message, Exception exception)
+            : base(message, exception)
+        {
+        }
+
+        private EnumNotFoundException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        public EnumNotFoundException(string message, Type enumType)
+            : base(message)
+        {
+            this.EnumType = enumType;
+        }
+
+        public EnumNotFoundException(string message)
+            : base(message)
+        {
+        }
+
+        public EnumNotFoundException()
+        {
+        }
+
+		#endregion Constructors 
+
+		#region Properties (1) 
+
+        public Type EnumType { get; private set; }
+
+		#endregion Properties 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/ICetItem.cs b/Libs/CsharpDis6/Core/ICetItem.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Core/ICetItem.cs
rename to Libs/CsharpDis6/Core/ICetItem.cs
index 0f2bab6..9886e8e 100644
--- a/Libs/CsharpDis6/OpenDis/Core/ICetItem.cs
+++ b/Libs/CsharpDis6/Core/ICetItem.cs
@@ -1,65 +1,65 @@
-using System;
-using OpenDis.Enumerations;
-using OpenDis.Enumerations.EntityState.Type;
-namespace OpenDis.Core
-{
-    /// <summary>
-    /// Interface for tabelaric representation of comprehensive entity-type tables
-    /// </summary>
-    public interface ICetItem : IComparable<ICetItem>, IComparable
-    {
-        /// <summary>
-        /// Gets or sets the category.
-        /// </summary>
-        /// <value>The category.</value>
-        byte Category { get; set; }
-
-        /// <summary>
-        /// Gets or sets the country.
-        /// </summary>
-        /// <value>The country.</value>
-        Country Country { get; set; }
-
-        /// <summary>
-        /// Gets or sets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        string Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the domain.
-        /// </summary>
-        /// <value>The domain.</value>
-        byte Domain { get; set; }
-
-        /// <summary>
-        /// Gets or sets the extra.
-        /// </summary>
-        /// <value>The extra.</value>
-        byte? Extra { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum value of the range.
-        /// </summary>
-        /// <value>The maximum value of the range.</value>
-        uint? Maximum { get; set; }
-
-        /// <summary>
-        /// Gets or sets the kind.
-        /// </summary>
-        /// <value>The kind.</value>
-        EntityKind Kind { get; set; }
-
-        /// <summary>
-        /// Gets or sets the specific.
-        /// </summary>
-        /// <value>The specific.</value>
-        byte? Specific { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subcategory.
-        /// </summary>
-        /// <value>The subcategory.</value>
-        byte? Subcategory { get; set; }
-    }
-}
+using System;
+using OpenDis.Enumerations;
+using OpenDis.Enumerations.EntityState.Type;
+namespace OpenDis.Core
+{
+    /// <summary>
+    /// Interface for tabelaric representation of comprehensive entity-type tables
+    /// </summary>
+    public interface ICetItem : IComparable<ICetItem>, IComparable
+    {
+        /// <summary>
+        /// Gets or sets the category.
+        /// </summary>
+        /// <value>The category.</value>
+        byte Category { get; set; }
+
+        /// <summary>
+        /// Gets or sets the country.
+        /// </summary>
+        /// <value>The country.</value>
+        Country Country { get; set; }
+
+        /// <summary>
+        /// Gets or sets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        string Description { get; set; }
+
+        /// <summary>
+        /// Gets or sets the domain.
+        /// </summary>
+        /// <value>The domain.</value>
+        byte Domain { get; set; }
+
+        /// <summary>
+        /// Gets or sets the extra.
+        /// </summary>
+        /// <value>The extra.</value>
+        byte? Extra { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range.
+        /// </summary>
+        /// <value>The maximum value of the range.</value>
+        uint? Maximum { get; set; }
+
+        /// <summary>
+        /// Gets or sets the kind.
+        /// </summary>
+        /// <value>The kind.</value>
+        EntityKind Kind { get; set; }
+
+        /// <summary>
+        /// Gets or sets the specific.
+        /// </summary>
+        /// <value>The specific.</value>
+        byte? Specific { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subcategory.
+        /// </summary>
+        /// <value>The subcategory.</value>
+        byte? Subcategory { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/IPdu.cs b/Libs/CsharpDis6/Core/IPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Core/IPdu.cs
rename to Libs/CsharpDis6/Core/IPdu.cs
index aaef12b..44da9f4 100644
--- a/Libs/CsharpDis6/OpenDis/Core/IPdu.cs
+++ b/Libs/CsharpDis6/Core/IPdu.cs
@@ -1,34 +1,34 @@
-using System;
-
-namespace OpenDis.Core
-{
-    public interface IPdu
-    {
-        /// <summary>
-        /// Marshal the data to the DataOutputStream. Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        void Marshal(OpenDis.Core.DataOutputStream dos);
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        void Reflection(System.Text.StringBuilder sb);
-
-        /// <summary>
-        /// Unmarshal the data from the DataInputStream.
-        /// </summary>
-        /// <param name="dis">The dis input stream.</param>
-        void Unmarshal(OpenDis.Core.DataInputStream dis);
-
-        /// <summary>
-        /// Raised when exception occurs while processing PDU.
-        /// </summary>
-        event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-    }
-}
+using System;
+
+namespace OpenDis.Core
+{
+    public interface IPdu
+    {
+        /// <summary>
+        /// Marshal the data to the DataOutputStream. Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        void Marshal(OpenDis.Core.DataOutputStream dos);
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        void Reflection(System.Text.StringBuilder sb);
+
+        /// <summary>
+        /// Unmarshal the data from the DataInputStream.
+        /// </summary>
+        /// <param name="dis">The dis input stream.</param>
+        void Unmarshal(OpenDis.Core.DataInputStream dis);
+
+        /// <summary>
+        /// Raised when exception occurs while processing PDU.
+        /// </summary>
+        event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/InternetDomainCodeAttribute.cs b/Libs/CsharpDis6/Core/InternetDomainCodeAttribute.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Core/InternetDomainCodeAttribute.cs
rename to Libs/CsharpDis6/Core/InternetDomainCodeAttribute.cs
index 7370146..fdbac5f 100644
--- a/Libs/CsharpDis6/OpenDis/Core/InternetDomainCodeAttribute.cs
+++ b/Libs/CsharpDis6/Core/InternetDomainCodeAttribute.cs
@@ -1,75 +1,75 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-
-namespace OpenDis.Core
-{
-    [AttributeUsage(AttributeTargets.Field, Inherited = true)]
-    public sealed class InternetDomainCodeAttribute : Attribute
-    {
-		#region Fields (1) 
-
-        private string internetDomainCode;
-
-		#endregion Fields 
-
-		#region Constructors (1) 
-
-        public InternetDomainCodeAttribute(string internetDomainCode)
-        { 
-            this.internetDomainCode = internetDomainCode;
-        }
-
-		#endregion Constructors 
-
-		#region Properties (1) 
-
-        public string InternetDomainCode
-        {
-            get
-            {
-                return this.internetDomainCode;
-            }
-        }
-
-		#endregion Properties 
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+
+namespace OpenDis.Core
+{
+    [AttributeUsage(AttributeTargets.Field, Inherited = true)]
+    public sealed class InternetDomainCodeAttribute : Attribute
+    {
+		#region Fields (1) 
+
+        private string internetDomainCode;
+
+		#endregion Fields 
+
+		#region Constructors (1) 
+
+        public InternetDomainCodeAttribute(string internetDomainCode)
+        { 
+            this.internetDomainCode = internetDomainCode;
+        }
+
+		#endregion Constructors 
+
+		#region Properties (1) 
+
+        public string InternetDomainCode
+        {
+            get
+            {
+                return this.internetDomainCode;
+            }
+        }
+
+		#endregion Properties 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/PduBase.cs b/Libs/CsharpDis6/Core/PduBase.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Core/PduBase.cs
rename to Libs/CsharpDis6/Core/PduBase.cs
index d38422d..4fabbe9 100644
--- a/Libs/CsharpDis6/OpenDis/Core/PduBase.cs
+++ b/Libs/CsharpDis6/Core/PduBase.cs
@@ -1,25 +1,25 @@
-using System;
-
-namespace OpenDis.Core
-{
-    public abstract class PduBase
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether exceptions caught in PDU classes are written via <see cref="System.Diagnostics.Trace"/> instrumetnation infrastructure.
-        /// </summary>
-        /// <value><c>true</c> if caught exceptions are traced; otherwise, <c>false</c>.</value>
-        public static bool TraceExceptions { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether exceptions caught in PDU classes are rethrown.
-        /// </summary>
-        /// <value><c>true</c> if caught exceptions are rethrown; otherwise, <c>false</c>.</value>
-        public static bool ThrowExceptions { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether exceptions caught in PDU classes fire <see cref="IPdu.ExceptionOccured"/> event.
-        /// </summary>
-        /// <value><c>true</c> if events are fired when exception is caught; otherwise, <c>false</c>.</value>
-        public static bool FireExceptionEvents { get; set; }
-    }
-}
+using System;
+
+namespace OpenDis.Core
+{
+    public abstract class PduBase
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether exceptions caught in PDU classes are written via <see cref="System.Diagnostics.Trace"/> instrumetnation infrastructure.
+        /// </summary>
+        /// <value><c>true</c> if caught exceptions are traced; otherwise, <c>false</c>.</value>
+        public static bool TraceExceptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether exceptions caught in PDU classes are rethrown.
+        /// </summary>
+        /// <value><c>true</c> if caught exceptions are rethrown; otherwise, <c>false</c>.</value>
+        public static bool ThrowExceptions { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether exceptions caught in PDU classes fire <see cref="IPdu.ExceptionOccured"/> event.
+        /// </summary>
+        /// <value><c>true</c> if events are fired when exception is caught; otherwise, <c>false</c>.</value>
+        public static bool FireExceptionEvents { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/PduExceptionEventArgs.cs b/Libs/CsharpDis6/Core/PduExceptionEventArgs.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Core/PduExceptionEventArgs.cs
rename to Libs/CsharpDis6/Core/PduExceptionEventArgs.cs
index 5a81bcc..73b7ad4 100644
--- a/Libs/CsharpDis6/OpenDis/Core/PduExceptionEventArgs.cs
+++ b/Libs/CsharpDis6/Core/PduExceptionEventArgs.cs
@@ -1,22 +1,22 @@
-using System;
-
-namespace OpenDis.Core
-{
-    public class PduExceptionEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PduExceptionEventArgs"/> class.
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        public PduExceptionEventArgs(Exception e)
-        {
-            this.Exception = e;
-        }
-
-        /// <summary>
-        /// Gets or sets the exception.
-        /// </summary>
-        /// <value>The exception.</value>
-        public Exception Exception { get; set; }
-    }
-}
+using System;
+
+namespace OpenDis.Core
+{
+    public class PduExceptionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PduExceptionEventArgs"/> class.
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        public PduExceptionEventArgs(Exception e)
+        {
+            this.Exception = e;
+        }
+
+        /// <summary>
+        /// Gets or sets the exception.
+        /// </summary>
+        /// <value>The exception.</value>
+        public Exception Exception { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Core/PduFactory.cs b/Libs/CsharpDis6/Core/PduFactory.cs
similarity index 92%
rename from Libs/CsharpDis6/OpenDis/Core/PduFactory.cs
rename to Libs/CsharpDis6/Core/PduFactory.cs
index e90c8b5..9f096b0 100644
--- a/Libs/CsharpDis6/OpenDis/Core/PduFactory.cs
+++ b/Libs/CsharpDis6/Core/PduFactory.cs
@@ -1,48 +1,52 @@
-using System;
-using OpenDis.Enumerations;
-using Dis1995 = OpenDis.Dis1995;
-using Dis1998 = OpenDis.Dis1998;
-
-namespace OpenDis.Core
-{
-    public static class PduFactory
-    {
-        /// <summary>
-        /// Creates the PDU. Supported protocol versions are IEEE 1278.1-1995 and IEEE 1278.1A-1998.
-        /// </summary>
-        /// <param name="type">The type of PDU to be created.</param>
-        /// <param name="version">The protocol version.</param>
-        /// <returns>
-        /// Returns the corresponding PDU instance or null if type equals 0.
-        /// </returns>
-        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
-        /// <exception cref="ArgumentException">if the protocol version is not supported</exception>
-        public static IPdu CreatePdu(byte type, ProtocolVersion version)
-        {
-            return CreatePdu((PduType)type, version);
-        }
-
-        /// <summary>
-        /// Creates the PDU. Supported protocol versions are IEEE 1278.1-1995 and IEEE 1278.1A-1998.
-        /// </summary>
-        /// <param name="type">The type of PDU to be created.</param>
-        /// <returns>
-        /// Returns the corresponding PDU instance or null if PduType.Other is specified.
-        /// </returns>
-        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
-        /// <exception cref="ArgumentException">if the protocol version is not supported</exception>
-        public static IPdu CreatePdu(PduType type, ProtocolVersion version)
-        {
-            if (version == ProtocolVersion.Ieee1278_1_1995)
-            {
-                return Dis1995.PduFactory.CreatePdu(type);
-            }
-            else if (version == ProtocolVersion.Ieee1278_1A_1998)
-            {
-                return Dis1998.PduFactory.CreatePdu(type);
-            }
-
-            throw new ArgumentException("Unsupported protocol version.");
-        }
-    }
-}
+using System;
+using OpenDis.Enumerations;
+using Dis1995 = OpenDis.Dis1995;
+using Dis1998 = OpenDis.Dis1998;
+
+namespace OpenDis.Core
+{
+    public static class PduFactory
+    {
+        /// <summary>
+        /// Creates the PDU. Supported protocol versions are IEEE 1278.1-1995 and IEEE 1278.1A-1998.
+        /// </summary>
+        /// <param name="type">The type of PDU to be created.</param>
+        /// <param name="version">The protocol version.</param>
+        /// <returns>
+        /// Returns the corresponding PDU instance or null if type equals 0.
+        /// </returns>
+        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
+        /// <exception cref="ArgumentException">if the protocol version is not supported</exception>
+        public static IPdu CreatePdu(byte type, ProtocolVersion version)
+        {
+            return CreatePdu((PduType)type, version);
+        }
+
+        /// <summary>
+        /// Creates the PDU. Supported protocol versions are IEEE 1278.1-1995 and IEEE 1278.1A-1998.
+        /// </summary>
+        /// <param name="type">The type of PDU to be created.</param>
+        /// <returns>
+        /// Returns the corresponding PDU instance or null if PduType.Other is specified.
+        /// </returns>
+        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
+        /// <exception cref="ArgumentException">if the protocol version is not supported</exception>
+        public static IPdu CreatePdu(PduType type, ProtocolVersion version)
+        {
+            if (version == ProtocolVersion.Ieee1278_1_1995)
+            {
+                return Dis1995.PduFactory.CreatePdu(type);
+            }
+            else if (version == ProtocolVersion.Ieee1278_1A_1998)
+            {
+                return Dis1998.PduFactory.CreatePdu(type);
+            }
+            else if (version == ProtocolVersion.Ieee1278_1_2012)
+            {
+                return Dis1998.PduFactory.CreatePdu(type);
+            }
+
+            throw new ArgumentException("Unsupported protocol version.");
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/EntityID.cs b/Libs/CsharpDis6/Dis1995/EntityID.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Dis1995/EntityID.cs
rename to Libs/CsharpDis6/Dis1995/EntityID.cs
index 5ae486a..cc74fd3 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/EntityID.cs
+++ b/Libs/CsharpDis6/Dis1995/EntityID.cs
@@ -1,15 +1,15 @@
-using System;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
-    /// </summary>
-    public partial class EntityID
-    {
-        public override string ToString()
-        {
-            return string.Format("{0:00}{1:00}{2:00}", this.Site, this.Application, this.Entity);
-        }
-    }
-}
+using System;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
+    /// </summary>
+    public partial class EntityID
+    {
+        public override string ToString()
+        {
+            return string.Format("{0:00}{1:00}{2:00}", this.Site, this.Application, this.Entity);
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AcknowledgePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/AcknowledgePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/AcknowledgePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/AcknowledgePdu.cs
index 9717f55..dbd3124 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AcknowledgePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/AcknowledgePdu.cs
@@ -1,368 +1,368 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.5. Acknowledge the receiptof a start/resume, stop/freeze, or RemoveEntityPDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcknowledgePdu : SimulationManagementPdu, IEquatable<AcknowledgePdu>
-    {
-        /// <summary>
-        /// type of message being acknowledged
-        /// </summary>
-        private ushort _acknowledgeFlag;
-
-        /// <summary>
-        /// Whether or not the receiving entity was able to comply with the request
-        /// </summary>
-        private ushort _responseFlag;
-
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcknowledgePdu"/> class.
-        /// </summary>
-        public AcknowledgePdu()
-        {
-            PduType = (byte)15;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcknowledgePdu left, AcknowledgePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcknowledgePdu left, AcknowledgePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._acknowledgeFlag
-            marshalSize += 2;  // this._responseFlag
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the type of message being acknowledged
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
-        public ushort AcknowledgeFlag
-        {
-            get
-            {
-                return this._acknowledgeFlag;
-            }
-
-            set
-            {
-                this._acknowledgeFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Whether or not the receiving entity was able to comply with the request
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
-        public ushort ResponseFlag
-        {
-            get
-            {
-                return this._responseFlag;
-            }
-
-            set
-            {
-                this._responseFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
-                    dos.WriteUnsignedShort((ushort)this._responseFlag);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._acknowledgeFlag = dis.ReadUnsignedShort();
-                    this._responseFlag = dis.ReadUnsignedShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcknowledgePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
-                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</AcknowledgePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcknowledgePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcknowledgePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._acknowledgeFlag != obj._acknowledgeFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._responseFlag != obj._responseFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.5. Acknowledge the receiptof a start/resume, stop/freeze, or RemoveEntityPDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcknowledgePdu : SimulationManagementPdu, IEquatable<AcknowledgePdu>
+    {
+        /// <summary>
+        /// type of message being acknowledged
+        /// </summary>
+        private ushort _acknowledgeFlag;
+
+        /// <summary>
+        /// Whether or not the receiving entity was able to comply with the request
+        /// </summary>
+        private ushort _responseFlag;
+
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcknowledgePdu"/> class.
+        /// </summary>
+        public AcknowledgePdu()
+        {
+            PduType = (byte)15;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcknowledgePdu left, AcknowledgePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcknowledgePdu left, AcknowledgePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._acknowledgeFlag
+            marshalSize += 2;  // this._responseFlag
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the type of message being acknowledged
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
+        public ushort AcknowledgeFlag
+        {
+            get
+            {
+                return this._acknowledgeFlag;
+            }
+
+            set
+            {
+                this._acknowledgeFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Whether or not the receiving entity was able to comply with the request
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
+        public ushort ResponseFlag
+        {
+            get
+            {
+                return this._responseFlag;
+            }
+
+            set
+            {
+                this._responseFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
+                    dos.WriteUnsignedShort((ushort)this._responseFlag);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._acknowledgeFlag = dis.ReadUnsignedShort();
+                    this._responseFlag = dis.ReadUnsignedShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcknowledgePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
+                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</AcknowledgePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcknowledgePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcknowledgePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._acknowledgeFlag != obj._acknowledgeFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._responseFlag != obj._responseFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionRequestPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ActionRequestPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionRequestPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ActionRequestPdu.cs
index c1931a0..ce24460 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionRequestPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ActionRequestPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.6. Request from simulation manager to an entity
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionRequestPdu : SimulationManagementPdu, IEquatable<ActionRequestPdu>
-    {
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// identifies the action being requested
-        /// </summary>
-        private uint _actionID;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _fixedDatumRecordCount;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _variableDatumRecordCount;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionRequestPdu"/> class.
-        /// </summary>
-        public ActionRequestPdu()
-        {
-            PduType = (byte)16;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionRequestPdu left, ActionRequestPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionRequestPdu left, ActionRequestPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._actionID
-            marshalSize += 4;  // this._fixedDatumRecordCount
-            marshalSize += 4;  // this._variableDatumRecordCount
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifies the action being requested
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
-        public uint ActionID
-        {
-            get
-            {
-                return this._actionID;
-            }
-
-            set
-            {
-                this._actionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
-        public uint FixedDatumRecordCount
-        {
-            get
-            {
-                return this._fixedDatumRecordCount;
-            }
-
-            set
-            {
-                this._fixedDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
-        public uint VariableDatumRecordCount
-        {
-            get
-            {
-                return this._variableDatumRecordCount;
-            }
-
-            set
-            {
-                this._variableDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._actionID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._actionID = dis.ReadUnsignedInt();
-                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
-                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionRequestPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionRequestPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionRequestPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionRequestPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._actionID != obj._actionID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._actionID.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.6. Request from simulation manager to an entity
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionRequestPdu : SimulationManagementPdu, IEquatable<ActionRequestPdu>
+    {
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// identifies the action being requested
+        /// </summary>
+        private uint _actionID;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _fixedDatumRecordCount;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _variableDatumRecordCount;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionRequestPdu"/> class.
+        /// </summary>
+        public ActionRequestPdu()
+        {
+            PduType = (byte)16;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionRequestPdu left, ActionRequestPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionRequestPdu left, ActionRequestPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._actionID
+            marshalSize += 4;  // this._fixedDatumRecordCount
+            marshalSize += 4;  // this._variableDatumRecordCount
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifies the action being requested
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
+        public uint ActionID
+        {
+            get
+            {
+                return this._actionID;
+            }
+
+            set
+            {
+                this._actionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
+        public uint FixedDatumRecordCount
+        {
+            get
+            {
+                return this._fixedDatumRecordCount;
+            }
+
+            set
+            {
+                this._fixedDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
+        public uint VariableDatumRecordCount
+        {
+            get
+            {
+                return this._variableDatumRecordCount;
+            }
+
+            set
+            {
+                this._variableDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._actionID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._actionID = dis.ReadUnsignedInt();
+                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
+                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionRequestPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionRequestPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionRequestPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionRequestPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._actionID != obj._actionID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._actionID.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionResponsePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ActionResponsePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionResponsePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ActionResponsePdu.cs
index 9e51049..6d24a53 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ActionResponsePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ActionResponsePdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.7. response to an action request PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionResponsePdu : SimulationManagementPdu, IEquatable<ActionResponsePdu>
-    {
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Status of response
-        /// </summary>
-        private uint _requestStatus;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _fixedDatumRecordCount;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _variableDatumRecordCount;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionResponsePdu"/> class.
-        /// </summary>
-        public ActionResponsePdu()
-        {
-            PduType = (byte)17;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionResponsePdu left, ActionResponsePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionResponsePdu left, ActionResponsePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._requestStatus
-            marshalSize += 4;  // this._fixedDatumRecordCount
-            marshalSize += 4;  // this._variableDatumRecordCount
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Status of response
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestStatus")]
-        public uint RequestStatus
-        {
-            get
-            {
-                return this._requestStatus;
-            }
-
-            set
-            {
-                this._requestStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
-        public uint FixedDatumRecordCount
-        {
-            get
-            {
-                return this._fixedDatumRecordCount;
-            }
-
-            set
-            {
-                this._fixedDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
-        public uint VariableDatumRecordCount
-        {
-            get
-            {
-                return this._variableDatumRecordCount;
-            }
-
-            set
-            {
-                this._variableDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._requestStatus);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requestStatus = dis.ReadUnsignedInt();
-                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
-                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionResponsePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requestStatus type=\"uint\">" + this._requestStatus.ToString(CultureInfo.InvariantCulture) + "</requestStatus>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionResponsePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionResponsePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionResponsePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestStatus != obj._requestStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.7. response to an action request PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionResponsePdu : SimulationManagementPdu, IEquatable<ActionResponsePdu>
+    {
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Status of response
+        /// </summary>
+        private uint _requestStatus;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _fixedDatumRecordCount;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _variableDatumRecordCount;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionResponsePdu"/> class.
+        /// </summary>
+        public ActionResponsePdu()
+        {
+            PduType = (byte)17;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionResponsePdu left, ActionResponsePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionResponsePdu left, ActionResponsePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._requestStatus
+            marshalSize += 4;  // this._fixedDatumRecordCount
+            marshalSize += 4;  // this._variableDatumRecordCount
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Status of response
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestStatus")]
+        public uint RequestStatus
+        {
+            get
+            {
+                return this._requestStatus;
+            }
+
+            set
+            {
+                this._requestStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
+        public uint FixedDatumRecordCount
+        {
+            get
+            {
+                return this._fixedDatumRecordCount;
+            }
+
+            set
+            {
+                this._fixedDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
+        public uint VariableDatumRecordCount
+        {
+            get
+            {
+                return this._variableDatumRecordCount;
+            }
+
+            set
+            {
+                this._variableDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._requestStatus);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requestStatus = dis.ReadUnsignedInt();
+                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
+                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionResponsePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requestStatus type=\"uint\">" + this._requestStatus.ToString(CultureInfo.InvariantCulture) + "</requestStatus>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionResponsePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionResponsePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionResponsePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestStatus != obj._requestStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AngularVelocityVector.cs b/Libs/CsharpDis6/Dis1995/Generated/AngularVelocityVector.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/AngularVelocityVector.cs
rename to Libs/CsharpDis6/Dis1995/Generated/AngularVelocityVector.cs
index c7e305e..c108d40 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AngularVelocityVector.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/AngularVelocityVector.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// 5.2.2: angular velocity measured in radians per second out each of the entity's own coordinate axes.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AngularVelocityVector
-    {
-        /// <summary>
-        /// velocity about the x axis
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// velocity about the y axis
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// velocity about the zaxis
-        /// </summary>
-        private float _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AngularVelocityVector"/> class.
-        /// </summary>
-        public AngularVelocityVector()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AngularVelocityVector left, AngularVelocityVector right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AngularVelocityVector left, AngularVelocityVector right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            marshalSize += 4;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the x axis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the y axis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the zaxis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "z")]
-        public float Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                    dos.WriteFloat((float)this._z);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                    this._z = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AngularVelocityVector>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</AngularVelocityVector>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AngularVelocityVector;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AngularVelocityVector obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// 5.2.2: angular velocity measured in radians per second out each of the entity's own coordinate axes.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AngularVelocityVector
+    {
+        /// <summary>
+        /// velocity about the x axis
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// velocity about the y axis
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// velocity about the zaxis
+        /// </summary>
+        private float _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AngularVelocityVector"/> class.
+        /// </summary>
+        public AngularVelocityVector()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AngularVelocityVector left, AngularVelocityVector right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AngularVelocityVector left, AngularVelocityVector right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            marshalSize += 4;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the x axis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the y axis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the zaxis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "z")]
+        public float Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                    dos.WriteFloat((float)this._z);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                    this._z = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AngularVelocityVector>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</AngularVelocityVector>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AngularVelocityVector;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AngularVelocityVector obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AntennaLocation.cs b/Libs/CsharpDis6/Dis1995/Generated/AntennaLocation.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/AntennaLocation.cs
rename to Libs/CsharpDis6/Dis1995/Generated/AntennaLocation.cs
index d7a06bb..4551387 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/AntennaLocation.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/AntennaLocation.cs
@@ -1,338 +1,338 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// 5.2.3: location of the radiating portion of the antenna, specified in world coordinates and         entity coordinates.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class AntennaLocation
-    {
-        /// <summary>
-        /// Location of the radiating portion of the antenna in world    coordinates
-        /// </summary>
-        private Vector3Double _antennaLocation = new Vector3Double();
-
-        /// <summary>
-        /// Location of the radiating portion of the antenna     in entity coordinates
-        /// </summary>
-        private Vector3Float _relativeAntennaLocation = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AntennaLocation"/> class.
-        /// </summary>
-        public AntennaLocation()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AntennaLocation left, AntennaLocation right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AntennaLocation left, AntennaLocation right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
-            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of the radiating portion of the antenna in world    coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
-        public Vector3Double AntennaLocation_
-        {
-            get
-            {
-                return this._antennaLocation;
-            }
-
-            set
-            {
-                this._antennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of the radiating portion of the antenna     in entity coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
-        public Vector3Float RelativeAntennaLocation
-        {
-            get
-            {
-                return this._relativeAntennaLocation;
-            }
-
-            set
-            {
-                this._relativeAntennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._antennaLocation.Marshal(dos);
-                    this._relativeAntennaLocation.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._antennaLocation.Unmarshal(dis);
-                    this._relativeAntennaLocation.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AntennaLocation>");
-            try
-            {
-                sb.AppendLine("<antennaLocation>");
-                this._antennaLocation.Reflection(sb);
-                sb.AppendLine("</antennaLocation>");
-                sb.AppendLine("<relativeAntennaLocation>");
-                this._relativeAntennaLocation.Reflection(sb);
-                sb.AppendLine("</relativeAntennaLocation>");
-                sb.AppendLine("</AntennaLocation>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AntennaLocation;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AntennaLocation obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._antennaLocation.Equals(obj._antennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// 5.2.3: location of the radiating portion of the antenna, specified in world coordinates and         entity coordinates.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class AntennaLocation
+    {
+        /// <summary>
+        /// Location of the radiating portion of the antenna in world    coordinates
+        /// </summary>
+        private Vector3Double _antennaLocation = new Vector3Double();
+
+        /// <summary>
+        /// Location of the radiating portion of the antenna     in entity coordinates
+        /// </summary>
+        private Vector3Float _relativeAntennaLocation = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AntennaLocation"/> class.
+        /// </summary>
+        public AntennaLocation()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AntennaLocation left, AntennaLocation right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AntennaLocation left, AntennaLocation right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
+            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of the radiating portion of the antenna in world    coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
+        public Vector3Double AntennaLocation_
+        {
+            get
+            {
+                return this._antennaLocation;
+            }
+
+            set
+            {
+                this._antennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of the radiating portion of the antenna     in entity coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
+        public Vector3Float RelativeAntennaLocation
+        {
+            get
+            {
+                return this._relativeAntennaLocation;
+            }
+
+            set
+            {
+                this._relativeAntennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._antennaLocation.Marshal(dos);
+                    this._relativeAntennaLocation.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._antennaLocation.Unmarshal(dis);
+                    this._relativeAntennaLocation.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AntennaLocation>");
+            try
+            {
+                sb.AppendLine("<antennaLocation>");
+                this._antennaLocation.Reflection(sb);
+                sb.AppendLine("</antennaLocation>");
+                sb.AppendLine("<relativeAntennaLocation>");
+                this._relativeAntennaLocation.Reflection(sb);
+                sb.AppendLine("</relativeAntennaLocation>");
+                sb.AppendLine("</AntennaLocation>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AntennaLocation;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AntennaLocation obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._antennaLocation.Equals(obj._antennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ArticulationParameter.cs b/Libs/CsharpDis6/Dis1995/Generated/ArticulationParameter.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ArticulationParameter.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ArticulationParameter.cs
index d53533f..c259f9e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ArticulationParameter.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ArticulationParameter.cs
@@ -1,413 +1,413 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.5. Articulation parameters for  movable parts and attached parts of an entity. Specifes wether or not a change has occured,  the part identifcation of the articulated part to which it is attached, and the type and value of each parameter.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ArticulationParameter
-    {
-        private byte _parameterTypeDesignator;
-
-        private byte _changeIndicator;
-
-        private ushort _partAttachedTo;
-
-        private int _parameterType;
-
-        private double _parameterValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArticulationParameter"/> class.
-        /// </summary>
-        public ArticulationParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ArticulationParameter left, ArticulationParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ArticulationParameter left, ArticulationParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._parameterTypeDesignator
-            marshalSize += 1;  // this._changeIndicator
-            marshalSize += 2;  // this._partAttachedTo
-            marshalSize += 4;  // this._parameterType
-            marshalSize += 8;  // this._parameterValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the parameterTypeDesignator
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "parameterTypeDesignator")]
-        public byte ParameterTypeDesignator
-        {
-            get
-            {
-                return this._parameterTypeDesignator;
-            }
-
-            set
-            {
-                this._parameterTypeDesignator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the changeIndicator
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
-        public byte ChangeIndicator
-        {
-            get
-            {
-                return this._changeIndicator;
-            }
-
-            set
-            {
-                this._changeIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the partAttachedTo
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
-        public ushort PartAttachedTo
-        {
-            get
-            {
-                return this._partAttachedTo;
-            }
-
-            set
-            {
-                this._partAttachedTo = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameterType
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "parameterType")]
-        public int ParameterType
-        {
-            get
-            {
-                return this._parameterType;
-            }
-
-            set
-            {
-                this._parameterType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameterValue
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "parameterValue")]
-        public double ParameterValue
-        {
-            get
-            {
-                return this._parameterValue;
-            }
-
-            set
-            {
-                this._parameterValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._parameterTypeDesignator);
-                    dos.WriteUnsignedByte((byte)this._changeIndicator);
-                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
-                    dos.WriteInt((int)this._parameterType);
-                    dos.WriteDouble((double)this._parameterValue);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._parameterTypeDesignator = dis.ReadUnsignedByte();
-                    this._changeIndicator = dis.ReadUnsignedByte();
-                    this._partAttachedTo = dis.ReadUnsignedShort();
-                    this._parameterType = dis.ReadInt();
-                    this._parameterValue = dis.ReadDouble();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ArticulationParameter>");
-            try
-            {
-                sb.AppendLine("<parameterTypeDesignator type=\"byte\">" + this._parameterTypeDesignator.ToString(CultureInfo.InvariantCulture) + "</parameterTypeDesignator>");
-                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
-                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
-                sb.AppendLine("<parameterType type=\"int\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
-                sb.AppendLine("<parameterValue type=\"double\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
-                sb.AppendLine("</ArticulationParameter>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ArticulationParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ArticulationParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._parameterTypeDesignator != obj._parameterTypeDesignator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._changeIndicator != obj._changeIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._partAttachedTo != obj._partAttachedTo)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterType != obj._parameterType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterValue != obj._parameterValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._parameterTypeDesignator.GetHashCode();
-            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.5. Articulation parameters for  movable parts and attached parts of an entity. Specifes wether or not a change has occured,  the part identifcation of the articulated part to which it is attached, and the type and value of each parameter.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ArticulationParameter
+    {
+        private byte _parameterTypeDesignator;
+
+        private byte _changeIndicator;
+
+        private ushort _partAttachedTo;
+
+        private int _parameterType;
+
+        private double _parameterValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArticulationParameter"/> class.
+        /// </summary>
+        public ArticulationParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ArticulationParameter left, ArticulationParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ArticulationParameter left, ArticulationParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._parameterTypeDesignator
+            marshalSize += 1;  // this._changeIndicator
+            marshalSize += 2;  // this._partAttachedTo
+            marshalSize += 4;  // this._parameterType
+            marshalSize += 8;  // this._parameterValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the parameterTypeDesignator
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "parameterTypeDesignator")]
+        public byte ParameterTypeDesignator
+        {
+            get
+            {
+                return this._parameterTypeDesignator;
+            }
+
+            set
+            {
+                this._parameterTypeDesignator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the changeIndicator
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
+        public byte ChangeIndicator
+        {
+            get
+            {
+                return this._changeIndicator;
+            }
+
+            set
+            {
+                this._changeIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the partAttachedTo
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
+        public ushort PartAttachedTo
+        {
+            get
+            {
+                return this._partAttachedTo;
+            }
+
+            set
+            {
+                this._partAttachedTo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameterType
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "parameterType")]
+        public int ParameterType
+        {
+            get
+            {
+                return this._parameterType;
+            }
+
+            set
+            {
+                this._parameterType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameterValue
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "parameterValue")]
+        public double ParameterValue
+        {
+            get
+            {
+                return this._parameterValue;
+            }
+
+            set
+            {
+                this._parameterValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._parameterTypeDesignator);
+                    dos.WriteUnsignedByte((byte)this._changeIndicator);
+                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
+                    dos.WriteInt((int)this._parameterType);
+                    dos.WriteDouble((double)this._parameterValue);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._parameterTypeDesignator = dis.ReadUnsignedByte();
+                    this._changeIndicator = dis.ReadUnsignedByte();
+                    this._partAttachedTo = dis.ReadUnsignedShort();
+                    this._parameterType = dis.ReadInt();
+                    this._parameterValue = dis.ReadDouble();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ArticulationParameter>");
+            try
+            {
+                sb.AppendLine("<parameterTypeDesignator type=\"byte\">" + this._parameterTypeDesignator.ToString(CultureInfo.InvariantCulture) + "</parameterTypeDesignator>");
+                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
+                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
+                sb.AppendLine("<parameterType type=\"int\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
+                sb.AppendLine("<parameterValue type=\"double\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
+                sb.AppendLine("</ArticulationParameter>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ArticulationParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ArticulationParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._parameterTypeDesignator != obj._parameterTypeDesignator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._changeIndicator != obj._changeIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._partAttachedTo != obj._partAttachedTo)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterType != obj._parameterType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterValue != obj._parameterValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._parameterTypeDesignator.GetHashCode();
+            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs b/Libs/CsharpDis6/Dis1995/Generated/BeamAntennaPattern.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs
rename to Libs/CsharpDis6/Dis1995/Generated/BeamAntennaPattern.cs
index 2b36f6e..617b0c9 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/BeamAntennaPattern.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/BeamAntennaPattern.cs
@@ -1,515 +1,515 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. Specifies           the direction, patter, and polarization of radiation from an antenna.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Orientation))]
-    public partial class BeamAntennaPattern
-    {
-        /// <summary>
-        /// The rotation that transformst he reference coordinate sytem     into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
-        /// </summary>
-        private Orientation _beamDirection = new Orientation();
-
-        private float _azimuthBeamwidth;
-
-        private float _referenceSystem;
-
-        private short _padding1;
-
-        private byte _padding2;
-
-        /// <summary>
-        /// Magnigute of the z-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        private float _ez;
-
-        /// <summary>
-        /// Magnigute of the x-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        private float _ex;
-
-        /// <summary>
-        /// THe phase angle between Ez and Ex in radians.
-        /// </summary>
-        private float _phase;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BeamAntennaPattern"/> class.
-        /// </summary>
-        public BeamAntennaPattern()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BeamAntennaPattern left, BeamAntennaPattern right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BeamAntennaPattern left, BeamAntennaPattern right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._beamDirection.GetMarshalledSize();  // this._beamDirection
-            marshalSize += 4;  // this._azimuthBeamwidth
-            marshalSize += 4;  // this._referenceSystem
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            marshalSize += 4;  // this._ez
-            marshalSize += 4;  // this._ex
-            marshalSize += 4;  // this._phase
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The rotation that transformst he reference coordinate sytem     into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "beamDirection")]
-        public Orientation BeamDirection
-        {
-            get
-            {
-                return this._beamDirection;
-            }
-
-            set
-            {
-                this._beamDirection = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the azimuthBeamwidth
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "azimuthBeamwidth")]
-        public float AzimuthBeamwidth
-        {
-            get
-            {
-                return this._azimuthBeamwidth;
-            }
-
-            set
-            {
-                this._azimuthBeamwidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the referenceSystem
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "referenceSystem")]
-        public float ReferenceSystem
-        {
-            get
-            {
-                return this._referenceSystem;
-            }
-
-            set
-            {
-                this._referenceSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding1
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding2
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Magnigute of the z-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "ez")]
-        public float Ez
-        {
-            get
-            {
-                return this._ez;
-            }
-
-            set
-            {
-                this._ez = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Magnigute of the x-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "ex")]
-        public float Ex
-        {
-            get
-            {
-                return this._ex;
-            }
-
-            set
-            {
-                this._ex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the THe phase angle between Ez and Ex in radians.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "phase")]
-        public float Phase
-        {
-            get
-            {
-                return this._phase;
-            }
-
-            set
-            {
-                this._phase = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._beamDirection.Marshal(dos);
-                    dos.WriteFloat((float)this._azimuthBeamwidth);
-                    dos.WriteFloat((float)this._referenceSystem);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                    dos.WriteFloat((float)this._ez);
-                    dos.WriteFloat((float)this._ex);
-                    dos.WriteFloat((float)this._phase);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamDirection.Unmarshal(dis);
-                    this._azimuthBeamwidth = dis.ReadFloat();
-                    this._referenceSystem = dis.ReadFloat();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-                    this._ez = dis.ReadFloat();
-                    this._ex = dis.ReadFloat();
-                    this._phase = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BeamAntennaPattern>");
-            try
-            {
-                sb.AppendLine("<beamDirection>");
-                this._beamDirection.Reflection(sb);
-                sb.AppendLine("</beamDirection>");
-                sb.AppendLine("<azimuthBeamwidth type=\"float\">" + this._azimuthBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthBeamwidth>");
-                sb.AppendLine("<referenceSystem type=\"float\">" + this._referenceSystem.ToString(CultureInfo.InvariantCulture) + "</referenceSystem>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<ez type=\"float\">" + this._ez.ToString(CultureInfo.InvariantCulture) + "</ez>");
-                sb.AppendLine("<ex type=\"float\">" + this._ex.ToString(CultureInfo.InvariantCulture) + "</ex>");
-                sb.AppendLine("<phase type=\"float\">" + this._phase.ToString(CultureInfo.InvariantCulture) + "</phase>");
-                sb.AppendLine("</BeamAntennaPattern>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BeamAntennaPattern;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BeamAntennaPattern obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._beamDirection.Equals(obj._beamDirection))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthBeamwidth != obj._azimuthBeamwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._referenceSystem != obj._referenceSystem)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ez != obj._ez)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ex != obj._ex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phase != obj._phase)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamDirection.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthBeamwidth.GetHashCode();
-            result = GenerateHash(result) ^ this._referenceSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._ez.GetHashCode();
-            result = GenerateHash(result) ^ this._ex.GetHashCode();
-            result = GenerateHash(result) ^ this._phase.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. Specifies           the direction, patter, and polarization of radiation from an antenna.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Orientation))]
+    public partial class BeamAntennaPattern
+    {
+        /// <summary>
+        /// The rotation that transformst he reference coordinate sytem     into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
+        /// </summary>
+        private Orientation _beamDirection = new Orientation();
+
+        private float _azimuthBeamwidth;
+
+        private float _referenceSystem;
+
+        private short _padding1;
+
+        private byte _padding2;
+
+        /// <summary>
+        /// Magnigute of the z-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        private float _ez;
+
+        /// <summary>
+        /// Magnigute of the x-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        private float _ex;
+
+        /// <summary>
+        /// THe phase angle between Ez and Ex in radians.
+        /// </summary>
+        private float _phase;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BeamAntennaPattern"/> class.
+        /// </summary>
+        public BeamAntennaPattern()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BeamAntennaPattern left, BeamAntennaPattern right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BeamAntennaPattern left, BeamAntennaPattern right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._beamDirection.GetMarshalledSize();  // this._beamDirection
+            marshalSize += 4;  // this._azimuthBeamwidth
+            marshalSize += 4;  // this._referenceSystem
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            marshalSize += 4;  // this._ez
+            marshalSize += 4;  // this._ex
+            marshalSize += 4;  // this._phase
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The rotation that transformst he reference coordinate sytem     into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "beamDirection")]
+        public Orientation BeamDirection
+        {
+            get
+            {
+                return this._beamDirection;
+            }
+
+            set
+            {
+                this._beamDirection = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the azimuthBeamwidth
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "azimuthBeamwidth")]
+        public float AzimuthBeamwidth
+        {
+            get
+            {
+                return this._azimuthBeamwidth;
+            }
+
+            set
+            {
+                this._azimuthBeamwidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the referenceSystem
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "referenceSystem")]
+        public float ReferenceSystem
+        {
+            get
+            {
+                return this._referenceSystem;
+            }
+
+            set
+            {
+                this._referenceSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding1
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding2
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Magnigute of the z-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "ez")]
+        public float Ez
+        {
+            get
+            {
+                return this._ez;
+            }
+
+            set
+            {
+                this._ez = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Magnigute of the x-component in beam coordinates at some arbitrary      single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "ex")]
+        public float Ex
+        {
+            get
+            {
+                return this._ex;
+            }
+
+            set
+            {
+                this._ex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the THe phase angle between Ez and Ex in radians.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "phase")]
+        public float Phase
+        {
+            get
+            {
+                return this._phase;
+            }
+
+            set
+            {
+                this._phase = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._beamDirection.Marshal(dos);
+                    dos.WriteFloat((float)this._azimuthBeamwidth);
+                    dos.WriteFloat((float)this._referenceSystem);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                    dos.WriteFloat((float)this._ez);
+                    dos.WriteFloat((float)this._ex);
+                    dos.WriteFloat((float)this._phase);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamDirection.Unmarshal(dis);
+                    this._azimuthBeamwidth = dis.ReadFloat();
+                    this._referenceSystem = dis.ReadFloat();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+                    this._ez = dis.ReadFloat();
+                    this._ex = dis.ReadFloat();
+                    this._phase = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BeamAntennaPattern>");
+            try
+            {
+                sb.AppendLine("<beamDirection>");
+                this._beamDirection.Reflection(sb);
+                sb.AppendLine("</beamDirection>");
+                sb.AppendLine("<azimuthBeamwidth type=\"float\">" + this._azimuthBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthBeamwidth>");
+                sb.AppendLine("<referenceSystem type=\"float\">" + this._referenceSystem.ToString(CultureInfo.InvariantCulture) + "</referenceSystem>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<ez type=\"float\">" + this._ez.ToString(CultureInfo.InvariantCulture) + "</ez>");
+                sb.AppendLine("<ex type=\"float\">" + this._ex.ToString(CultureInfo.InvariantCulture) + "</ex>");
+                sb.AppendLine("<phase type=\"float\">" + this._phase.ToString(CultureInfo.InvariantCulture) + "</phase>");
+                sb.AppendLine("</BeamAntennaPattern>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BeamAntennaPattern;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BeamAntennaPattern obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._beamDirection.Equals(obj._beamDirection))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthBeamwidth != obj._azimuthBeamwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._referenceSystem != obj._referenceSystem)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ez != obj._ez)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ex != obj._ex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phase != obj._phase)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamDirection.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthBeamwidth.GetHashCode();
+            result = GenerateHash(result) ^ this._referenceSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._ez.GetHashCode();
+            result = GenerateHash(result) ^ this._ex.GetHashCode();
+            result = GenerateHash(result) ^ this._phase.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/BurstDescriptor.cs b/Libs/CsharpDis6/Dis1995/Generated/BurstDescriptor.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/BurstDescriptor.cs
rename to Libs/CsharpDis6/Dis1995/Generated/BurstDescriptor.cs
index 886ac7c..4b6e145 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/BurstDescriptor.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/BurstDescriptor.cs
@@ -1,431 +1,431 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.7. Specifies the type of muntion fired, the type of warhead, the         type of fuse, the number of rounds fired, and the rate at which the roudns are fired in         rounds per minute.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class BurstDescriptor
-    {
-        /// <summary>
-        /// What munition was used in the burst
-        /// </summary>
-        private EntityType _munition = new EntityType();
-
-        /// <summary>
-        /// type of warhead
-        /// </summary>
-        private ushort _warhead;
-
-        /// <summary>
-        /// type of fuse used
-        /// </summary>
-        private ushort _fuse;
-
-        /// <summary>
-        /// how many of the munition were fired
-        /// </summary>
-        private ushort _quantity;
-
-        /// <summary>
-        /// rate at which the munition was fired
-        /// </summary>
-        private ushort _rate;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BurstDescriptor"/> class.
-        /// </summary>
-        public BurstDescriptor()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BurstDescriptor left, BurstDescriptor right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BurstDescriptor left, BurstDescriptor right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._munition.GetMarshalledSize();  // this._munition
-            marshalSize += 2;  // this._warhead
-            marshalSize += 2;  // this._fuse
-            marshalSize += 2;  // this._quantity
-            marshalSize += 2;  // this._rate
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the What munition was used in the burst
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "munition")]
-        public EntityType Munition
-        {
-            get
-            {
-                return this._munition;
-            }
-
-            set
-            {
-                this._munition = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of warhead
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "warhead")]
-        public ushort Warhead
-        {
-            get
-            {
-                return this._warhead;
-            }
-
-            set
-            {
-                this._warhead = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of fuse used
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "fuse")]
-        public ushort Fuse
-        {
-            get
-            {
-                return this._fuse;
-            }
-
-            set
-            {
-                this._fuse = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many of the munition were fired
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
-        public ushort Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the rate at which the munition was fired
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "rate")]
-        public ushort Rate
-        {
-            get
-            {
-                return this._rate;
-            }
-
-            set
-            {
-                this._rate = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._munition.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._warhead);
-                    dos.WriteUnsignedShort((ushort)this._fuse);
-                    dos.WriteUnsignedShort((ushort)this._quantity);
-                    dos.WriteUnsignedShort((ushort)this._rate);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._munition.Unmarshal(dis);
-                    this._warhead = dis.ReadUnsignedShort();
-                    this._fuse = dis.ReadUnsignedShort();
-                    this._quantity = dis.ReadUnsignedShort();
-                    this._rate = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BurstDescriptor>");
-            try
-            {
-                sb.AppendLine("<munition>");
-                this._munition.Reflection(sb);
-                sb.AppendLine("</munition>");
-                sb.AppendLine("<warhead type=\"ushort\">" + this._warhead.ToString(CultureInfo.InvariantCulture) + "</warhead>");
-                sb.AppendLine("<fuse type=\"ushort\">" + this._fuse.ToString(CultureInfo.InvariantCulture) + "</fuse>");
-                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("<rate type=\"ushort\">" + this._rate.ToString(CultureInfo.InvariantCulture) + "</rate>");
-                sb.AppendLine("</BurstDescriptor>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BurstDescriptor;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BurstDescriptor obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._munition.Equals(obj._munition))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._warhead != obj._warhead)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuse != obj._fuse)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._rate != obj._rate)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._munition.GetHashCode();
-            result = GenerateHash(result) ^ this._warhead.GetHashCode();
-            result = GenerateHash(result) ^ this._fuse.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-            result = GenerateHash(result) ^ this._rate.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.7. Specifies the type of muntion fired, the type of warhead, the         type of fuse, the number of rounds fired, and the rate at which the roudns are fired in         rounds per minute.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class BurstDescriptor
+    {
+        /// <summary>
+        /// What munition was used in the burst
+        /// </summary>
+        private EntityType _munition = new EntityType();
+
+        /// <summary>
+        /// type of warhead
+        /// </summary>
+        private ushort _warhead;
+
+        /// <summary>
+        /// type of fuse used
+        /// </summary>
+        private ushort _fuse;
+
+        /// <summary>
+        /// how many of the munition were fired
+        /// </summary>
+        private ushort _quantity;
+
+        /// <summary>
+        /// rate at which the munition was fired
+        /// </summary>
+        private ushort _rate;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BurstDescriptor"/> class.
+        /// </summary>
+        public BurstDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BurstDescriptor left, BurstDescriptor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BurstDescriptor left, BurstDescriptor right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._munition.GetMarshalledSize();  // this._munition
+            marshalSize += 2;  // this._warhead
+            marshalSize += 2;  // this._fuse
+            marshalSize += 2;  // this._quantity
+            marshalSize += 2;  // this._rate
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the What munition was used in the burst
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "munition")]
+        public EntityType Munition
+        {
+            get
+            {
+                return this._munition;
+            }
+
+            set
+            {
+                this._munition = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of warhead
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "warhead")]
+        public ushort Warhead
+        {
+            get
+            {
+                return this._warhead;
+            }
+
+            set
+            {
+                this._warhead = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of fuse used
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "fuse")]
+        public ushort Fuse
+        {
+            get
+            {
+                return this._fuse;
+            }
+
+            set
+            {
+                this._fuse = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many of the munition were fired
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
+        public ushort Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rate at which the munition was fired
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "rate")]
+        public ushort Rate
+        {
+            get
+            {
+                return this._rate;
+            }
+
+            set
+            {
+                this._rate = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._munition.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._warhead);
+                    dos.WriteUnsignedShort((ushort)this._fuse);
+                    dos.WriteUnsignedShort((ushort)this._quantity);
+                    dos.WriteUnsignedShort((ushort)this._rate);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._munition.Unmarshal(dis);
+                    this._warhead = dis.ReadUnsignedShort();
+                    this._fuse = dis.ReadUnsignedShort();
+                    this._quantity = dis.ReadUnsignedShort();
+                    this._rate = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BurstDescriptor>");
+            try
+            {
+                sb.AppendLine("<munition>");
+                this._munition.Reflection(sb);
+                sb.AppendLine("</munition>");
+                sb.AppendLine("<warhead type=\"ushort\">" + this._warhead.ToString(CultureInfo.InvariantCulture) + "</warhead>");
+                sb.AppendLine("<fuse type=\"ushort\">" + this._fuse.ToString(CultureInfo.InvariantCulture) + "</fuse>");
+                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("<rate type=\"ushort\">" + this._rate.ToString(CultureInfo.InvariantCulture) + "</rate>");
+                sb.AppendLine("</BurstDescriptor>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BurstDescriptor;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BurstDescriptor obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._munition.Equals(obj._munition))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._warhead != obj._warhead)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuse != obj._fuse)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._rate != obj._rate)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._munition.GetHashCode();
+            result = GenerateHash(result) ^ this._warhead.GetHashCode();
+            result = GenerateHash(result) ^ this._fuse.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+            result = GenerateHash(result) ^ this._rate.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ClockTime.cs b/Libs/CsharpDis6/Dis1995/Generated/ClockTime.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ClockTime.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ClockTime.cs
index a4a1806..de25b84 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ClockTime.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ClockTime.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.8. Time measurements that exceed one hour. Hours is the number of           hours since January 1, 1970, UTC
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ClockTime
-    {
-        /// <summary>
-        /// Hours in UTC
-        /// </summary>
-        private int _hour;
-
-        /// <summary>
-        /// Time past the hour
-        /// </summary>
-        private uint _timePastHour;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ClockTime"/> class.
-        /// </summary>
-        public ClockTime()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ClockTime left, ClockTime right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ClockTime left, ClockTime right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._hour
-            marshalSize += 4;  // this._timePastHour
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Hours in UTC
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "hour")]
-        public int Hour
-        {
-            get
-            {
-                return this._hour;
-            }
-
-            set
-            {
-                this._hour = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Time past the hour
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timePastHour")]
-        public uint TimePastHour
-        {
-            get
-            {
-                return this._timePastHour;
-            }
-
-            set
-            {
-                this._timePastHour = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteInt((int)this._hour);
-                    dos.WriteUnsignedInt((uint)this._timePastHour);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._hour = dis.ReadInt();
-                    this._timePastHour = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ClockTime>");
-            try
-            {
-                sb.AppendLine("<hour type=\"int\">" + this._hour.ToString(CultureInfo.InvariantCulture) + "</hour>");
-                sb.AppendLine("<timePastHour type=\"uint\">" + this._timePastHour.ToString(CultureInfo.InvariantCulture) + "</timePastHour>");
-                sb.AppendLine("</ClockTime>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ClockTime;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ClockTime obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._hour != obj._hour)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timePastHour != obj._timePastHour)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._hour.GetHashCode();
-            result = GenerateHash(result) ^ this._timePastHour.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.8. Time measurements that exceed one hour. Hours is the number of           hours since January 1, 1970, UTC
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ClockTime
+    {
+        /// <summary>
+        /// Hours in UTC
+        /// </summary>
+        private int _hour;
+
+        /// <summary>
+        /// Time past the hour
+        /// </summary>
+        private uint _timePastHour;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClockTime"/> class.
+        /// </summary>
+        public ClockTime()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ClockTime left, ClockTime right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ClockTime left, ClockTime right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._hour
+            marshalSize += 4;  // this._timePastHour
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Hours in UTC
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "hour")]
+        public int Hour
+        {
+            get
+            {
+                return this._hour;
+            }
+
+            set
+            {
+                this._hour = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Time past the hour
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timePastHour")]
+        public uint TimePastHour
+        {
+            get
+            {
+                return this._timePastHour;
+            }
+
+            set
+            {
+                this._timePastHour = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteInt((int)this._hour);
+                    dos.WriteUnsignedInt((uint)this._timePastHour);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._hour = dis.ReadInt();
+                    this._timePastHour = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ClockTime>");
+            try
+            {
+                sb.AppendLine("<hour type=\"int\">" + this._hour.ToString(CultureInfo.InvariantCulture) + "</hour>");
+                sb.AppendLine("<timePastHour type=\"uint\">" + this._timePastHour.ToString(CultureInfo.InvariantCulture) + "</timePastHour>");
+                sb.AppendLine("</ClockTime>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ClockTime;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ClockTime obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._hour != obj._hour)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timePastHour != obj._timePastHour)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._hour.GetHashCode();
+            result = GenerateHash(result) ^ this._timePastHour.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CollisionPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/CollisionPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/CollisionPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/CollisionPdu.cs
index b78fd98..a6db5cd 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CollisionPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/CollisionPdu.cs
@@ -1,542 +1,542 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.3.2. Information about a collision
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class CollisionPdu : EntityInformationPdu, IEquatable<CollisionPdu>
-    {
-        /// <summary>
-        /// ID of the entity that issued the collision PDU
-        /// </summary>
-        private EntityID _issuingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of entity that has collided with the issuing entity ID
-        /// </summary>
-        private EntityID _collidingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private byte _collisionType;
-
-        /// <summary>
-        /// some padding
-        /// </summary>
-        private byte _pad;
-
-        /// <summary>
-        /// velocity at collision
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// mass of issuing entity
-        /// </summary>
-        private float _mass;
-
-        /// <summary>
-        /// Location with respect to entity the issuing entity collided with
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollisionPdu"/> class.
-        /// </summary>
-        public CollisionPdu()
-        {
-            PduType = (byte)4;
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CollisionPdu left, CollisionPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CollisionPdu left, CollisionPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
-            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._collisionType
-            marshalSize += 1;  // this._pad
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += 4;  // this._mass
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that issued the collision PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
-        public EntityID IssuingEntityID
-        {
-            get
-            {
-                return this._issuingEntityID;
-            }
-
-            set
-            {
-                this._issuingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity that has collided with the issuing entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
-        public EntityID CollidingEntityID
-        {
-            get
-            {
-                return this._collidingEntityID;
-            }
-
-            set
-            {
-                this._collidingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "collisionType")]
-        public byte CollisionType
-        {
-            get
-            {
-                return this._collisionType;
-            }
-
-            set
-            {
-                this._collisionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the some padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad")]
-        public byte Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity at collision
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the mass of issuing entity
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "mass")]
-        public float Mass
-        {
-            get
-            {
-                return this._mass;
-            }
-
-            set
-            {
-                this._mass = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location with respect to entity the issuing entity collided with
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Marshal(dos);
-                    this._collidingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._collisionType);
-                    dos.WriteByte((byte)this._pad);
-                    this._velocity.Marshal(dos);
-                    dos.WriteFloat((float)this._mass);
-                    this._location.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Unmarshal(dis);
-                    this._collidingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._collisionType = dis.ReadUnsignedByte();
-                    this._pad = dis.ReadByte();
-                    this._velocity.Unmarshal(dis);
-                    this._mass = dis.ReadFloat();
-                    this._location.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CollisionPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<issuingEntityID>");
-                this._issuingEntityID.Reflection(sb);
-                sb.AppendLine("</issuingEntityID>");
-                sb.AppendLine("<collidingEntityID>");
-                this._collidingEntityID.Reflection(sb);
-                sb.AppendLine("</collidingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<collisionType type=\"byte\">" + this._collisionType.ToString(CultureInfo.InvariantCulture) + "</collisionType>");
-                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                sb.AppendLine("</CollisionPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CollisionPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CollisionPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionType != obj._collisionType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._mass != obj._mass)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionType.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._mass.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.3.2. Information about a collision
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class CollisionPdu : EntityInformationPdu, IEquatable<CollisionPdu>
+    {
+        /// <summary>
+        /// ID of the entity that issued the collision PDU
+        /// </summary>
+        private EntityID _issuingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of entity that has collided with the issuing entity ID
+        /// </summary>
+        private EntityID _collidingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private byte _collisionType;
+
+        /// <summary>
+        /// some padding
+        /// </summary>
+        private byte _pad;
+
+        /// <summary>
+        /// velocity at collision
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// mass of issuing entity
+        /// </summary>
+        private float _mass;
+
+        /// <summary>
+        /// Location with respect to entity the issuing entity collided with
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollisionPdu"/> class.
+        /// </summary>
+        public CollisionPdu()
+        {
+            PduType = (byte)4;
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CollisionPdu left, CollisionPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CollisionPdu left, CollisionPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
+            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._collisionType
+            marshalSize += 1;  // this._pad
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += 4;  // this._mass
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that issued the collision PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
+        public EntityID IssuingEntityID
+        {
+            get
+            {
+                return this._issuingEntityID;
+            }
+
+            set
+            {
+                this._issuingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity that has collided with the issuing entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
+        public EntityID CollidingEntityID
+        {
+            get
+            {
+                return this._collidingEntityID;
+            }
+
+            set
+            {
+                this._collidingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "collisionType")]
+        public byte CollisionType
+        {
+            get
+            {
+                return this._collisionType;
+            }
+
+            set
+            {
+                this._collisionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the some padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad")]
+        public byte Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity at collision
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mass of issuing entity
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "mass")]
+        public float Mass
+        {
+            get
+            {
+                return this._mass;
+            }
+
+            set
+            {
+                this._mass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location with respect to entity the issuing entity collided with
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Marshal(dos);
+                    this._collidingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._collisionType);
+                    dos.WriteByte((byte)this._pad);
+                    this._velocity.Marshal(dos);
+                    dos.WriteFloat((float)this._mass);
+                    this._location.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Unmarshal(dis);
+                    this._collidingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._collisionType = dis.ReadUnsignedByte();
+                    this._pad = dis.ReadByte();
+                    this._velocity.Unmarshal(dis);
+                    this._mass = dis.ReadFloat();
+                    this._location.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CollisionPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<issuingEntityID>");
+                this._issuingEntityID.Reflection(sb);
+                sb.AppendLine("</issuingEntityID>");
+                sb.AppendLine("<collidingEntityID>");
+                this._collidingEntityID.Reflection(sb);
+                sb.AppendLine("</collidingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<collisionType type=\"byte\">" + this._collisionType.ToString(CultureInfo.InvariantCulture) + "</collisionType>");
+                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                sb.AppendLine("</CollisionPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CollisionPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CollisionPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionType != obj._collisionType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._mass != obj._mass)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionType.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._mass.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CommentPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/CommentPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/CommentPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/CommentPdu.cs
index 2529aa1..f4d4f23 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CommentPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/CommentPdu.cs
@@ -1,484 +1,484 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.12. Arbitrary messages can be entered into the data stream via use of this PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class CommentPdu : SimulationManagementPdu, IEquatable<CommentPdu>
-    {
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _fixedDatumRecordCount;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _variableDatumRecordCount;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommentPdu"/> class.
-        /// </summary>
-        public CommentPdu()
-        {
-            PduType = (byte)22;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CommentPdu left, CommentPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CommentPdu left, CommentPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._fixedDatumRecordCount
-            marshalSize += 4;  // this._variableDatumRecordCount
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
-        public uint FixedDatumRecordCount
-        {
-            get
-            {
-                return this._fixedDatumRecordCount;
-            }
-
-            set
-            {
-                this._fixedDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
-        public uint VariableDatumRecordCount
-        {
-            get
-            {
-                return this._variableDatumRecordCount;
-            }
-
-            set
-            {
-                this._variableDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
-                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CommentPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</CommentPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CommentPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CommentPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.12. Arbitrary messages can be entered into the data stream via use of this PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class CommentPdu : SimulationManagementPdu, IEquatable<CommentPdu>
+    {
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _fixedDatumRecordCount;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _variableDatumRecordCount;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommentPdu"/> class.
+        /// </summary>
+        public CommentPdu()
+        {
+            PduType = (byte)22;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CommentPdu left, CommentPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CommentPdu left, CommentPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._fixedDatumRecordCount
+            marshalSize += 4;  // this._variableDatumRecordCount
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
+        public uint FixedDatumRecordCount
+        {
+            get
+            {
+                return this._fixedDatumRecordCount;
+            }
+
+            set
+            {
+                this._fixedDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
+        public uint VariableDatumRecordCount
+        {
+            get
+            {
+                return this._variableDatumRecordCount;
+            }
+
+            set
+            {
+                this._variableDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
+                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CommentPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</CommentPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CommentPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CommentPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CreateEntityPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/CreateEntityPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/CreateEntityPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/CreateEntityPdu.cs
index 6d454da..e19230d 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/CreateEntityPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/CreateEntityPdu.cs
@@ -1,304 +1,304 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.1. Create a new entity
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class CreateEntityPdu : SimulationManagementPdu, IEquatable<CreateEntityPdu>
-    {
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateEntityPdu"/> class.
-        /// </summary>
-        public CreateEntityPdu()
-        {
-            PduType = (byte)11;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CreateEntityPdu left, CreateEntityPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CreateEntityPdu left, CreateEntityPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CreateEntityPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</CreateEntityPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CreateEntityPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CreateEntityPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.1. Create a new entity
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class CreateEntityPdu : SimulationManagementPdu, IEquatable<CreateEntityPdu>
+    {
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateEntityPdu"/> class.
+        /// </summary>
+        public CreateEntityPdu()
+        {
+            PduType = (byte)11;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CreateEntityPdu left, CreateEntityPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CreateEntityPdu left, CreateEntityPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CreateEntityPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</CreateEntityPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CreateEntityPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CreateEntityPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/DataPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/DataPdu.cs
index e9d77d0..044222c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/DataPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.10. Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataPdu : SimulationManagementPdu, IEquatable<DataPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _fixedDatumRecordCount;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _variableDatumRecordCount;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataPdu"/> class.
-        /// </summary>
-        public DataPdu()
-        {
-            PduType = (byte)20;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataPdu left, DataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataPdu left, DataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._fixedDatumRecordCount
-            marshalSize += 4;  // this._variableDatumRecordCount
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
-        public uint FixedDatumRecordCount
-        {
-            get
-            {
-                return this._fixedDatumRecordCount;
-            }
-
-            set
-            {
-                this._fixedDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
-        public uint VariableDatumRecordCount
-        {
-            get
-            {
-                return this._variableDatumRecordCount;
-            }
-
-            set
-            {
-                this._variableDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
-                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.10. Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataPdu : SimulationManagementPdu, IEquatable<DataPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _fixedDatumRecordCount;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _variableDatumRecordCount;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataPdu"/> class.
+        /// </summary>
+        public DataPdu()
+        {
+            PduType = (byte)20;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataPdu left, DataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataPdu left, DataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._fixedDatumRecordCount
+            marshalSize += 4;  // this._variableDatumRecordCount
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
+        public uint FixedDatumRecordCount
+        {
+            get
+            {
+                return this._fixedDatumRecordCount;
+            }
+
+            set
+            {
+                this._fixedDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
+        public uint VariableDatumRecordCount
+        {
+            get
+            {
+                return this._variableDatumRecordCount;
+            }
+
+            set
+            {
+                this._variableDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
+                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataQueryPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/DataQueryPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataQueryPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/DataQueryPdu.cs
index 9539bb1..d8131dd 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DataQueryPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/DataQueryPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.8. Request for data from an entity
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataQueryPdu : SimulationManagementPdu, IEquatable<DataQueryPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// time issues between issues of Data PDUs. Zero means send once only.
-        /// </summary>
-        private uint _timeInterval;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _fixedDatumRecordCount;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _variableDatumRecordCount;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataQueryPdu"/> class.
-        /// </summary>
-        public DataQueryPdu()
-        {
-            PduType = (byte)18;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataQueryPdu left, DataQueryPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataQueryPdu left, DataQueryPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._timeInterval
-            marshalSize += 4;  // this._fixedDatumRecordCount
-            marshalSize += 4;  // this._variableDatumRecordCount
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time issues between issues of Data PDUs. Zero means send once only.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
-        public uint TimeInterval
-        {
-            get
-            {
-                return this._timeInterval;
-            }
-
-            set
-            {
-                this._timeInterval = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
-        public uint FixedDatumRecordCount
-        {
-            get
-            {
-                return this._fixedDatumRecordCount;
-            }
-
-            set
-            {
-                this._fixedDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
-        public uint VariableDatumRecordCount
-        {
-            get
-            {
-                return this._variableDatumRecordCount;
-            }
-
-            set
-            {
-                this._variableDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._timeInterval);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._timeInterval = dis.ReadUnsignedInt();
-                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
-                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataQueryPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataQueryPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataQueryPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataQueryPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timeInterval != obj._timeInterval)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.8. Request for data from an entity
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataQueryPdu : SimulationManagementPdu, IEquatable<DataQueryPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// time issues between issues of Data PDUs. Zero means send once only.
+        /// </summary>
+        private uint _timeInterval;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _fixedDatumRecordCount;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _variableDatumRecordCount;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataQueryPdu"/> class.
+        /// </summary>
+        public DataQueryPdu()
+        {
+            PduType = (byte)18;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataQueryPdu left, DataQueryPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataQueryPdu left, DataQueryPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._timeInterval
+            marshalSize += 4;  // this._fixedDatumRecordCount
+            marshalSize += 4;  // this._variableDatumRecordCount
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time issues between issues of Data PDUs. Zero means send once only.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
+        public uint TimeInterval
+        {
+            get
+            {
+                return this._timeInterval;
+            }
+
+            set
+            {
+                this._timeInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
+        public uint FixedDatumRecordCount
+        {
+            get
+            {
+                return this._fixedDatumRecordCount;
+            }
+
+            set
+            {
+                this._fixedDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
+        public uint VariableDatumRecordCount
+        {
+            get
+            {
+                return this._variableDatumRecordCount;
+            }
+
+            set
+            {
+                this._variableDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._timeInterval);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._timeInterval = dis.ReadUnsignedInt();
+                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
+                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataQueryPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataQueryPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataQueryPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataQueryPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timeInterval != obj._timeInterval)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs b/Libs/CsharpDis6/Dis1995/Generated/DeadReckoningParameter.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs
rename to Libs/CsharpDis6/Dis1995/Generated/DeadReckoningParameter.cs
index 3eeb7df..e9f3bb3 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DeadReckoningParameter.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/DeadReckoningParameter.cs
@@ -1,431 +1,431 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// represents values used in dead reckoning algorithms
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class DeadReckoningParameter
-    {
-        /// <summary>
-        /// enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        private byte[] _otherParameters = new byte[15];
-
-        /// <summary>
-        /// Linear acceleration of the entity
-        /// </summary>
-        private Vector3Float _entityLinearAcceleration = new Vector3Float();
-
-        /// <summary>
-        /// angular velocity of the entity
-        /// </summary>
-        private Vector3Float _entityAngularVelocity = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeadReckoningParameter"/> class.
-        /// </summary>
-        public DeadReckoningParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DeadReckoningParameter left, DeadReckoningParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DeadReckoningParameter left, DeadReckoningParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 15 * 1;  // _otherParameters
-            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
-            marshalSize += this._entityAngularVelocity.GetMarshalledSize();  // this._entityAngularVelocity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the Linear acceleration of the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
-        public Vector3Float EntityLinearAcceleration
-        {
-            get
-            {
-                return this._entityLinearAcceleration;
-            }
-
-            set
-            {
-                this._entityLinearAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the angular velocity of the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityAngularVelocity")]
-        public Vector3Float EntityAngularVelocity
-        {
-            get
-            {
-                return this._entityAngularVelocity;
-            }
-
-            set
-            {
-                this._entityAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-
-                    this._entityLinearAcceleration.Marshal(dos);
-                    this._entityAngularVelocity.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-
-                    this._entityLinearAcceleration.Unmarshal(dis);
-                    this._entityAngularVelocity.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DeadReckoningParameter>");
-            try
-            {
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<entityLinearAcceleration>");
-                this._entityLinearAcceleration.Reflection(sb);
-                sb.AppendLine("</entityLinearAcceleration>");
-                sb.AppendLine("<entityAngularVelocity>");
-                this._entityAngularVelocity.Reflection(sb);
-                sb.AppendLine("</entityAngularVelocity>");
-                sb.AppendLine("</DeadReckoningParameter>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DeadReckoningParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DeadReckoningParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._otherParameters.Length != 15) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 15; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityAngularVelocity.Equals(obj._entityAngularVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-
-            for (int idx = 0; idx < 15; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAngularVelocity.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// represents values used in dead reckoning algorithms
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class DeadReckoningParameter
+    {
+        /// <summary>
+        /// enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        private byte[] _otherParameters = new byte[15];
+
+        /// <summary>
+        /// Linear acceleration of the entity
+        /// </summary>
+        private Vector3Float _entityLinearAcceleration = new Vector3Float();
+
+        /// <summary>
+        /// angular velocity of the entity
+        /// </summary>
+        private Vector3Float _entityAngularVelocity = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeadReckoningParameter"/> class.
+        /// </summary>
+        public DeadReckoningParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DeadReckoningParameter left, DeadReckoningParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DeadReckoningParameter left, DeadReckoningParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 15 * 1;  // _otherParameters
+            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
+            marshalSize += this._entityAngularVelocity.GetMarshalledSize();  // this._entityAngularVelocity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the Linear acceleration of the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
+        public Vector3Float EntityLinearAcceleration
+        {
+            get
+            {
+                return this._entityLinearAcceleration;
+            }
+
+            set
+            {
+                this._entityLinearAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the angular velocity of the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityAngularVelocity")]
+        public Vector3Float EntityAngularVelocity
+        {
+            get
+            {
+                return this._entityAngularVelocity;
+            }
+
+            set
+            {
+                this._entityAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+
+                    this._entityLinearAcceleration.Marshal(dos);
+                    this._entityAngularVelocity.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+
+                    this._entityLinearAcceleration.Unmarshal(dis);
+                    this._entityAngularVelocity.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DeadReckoningParameter>");
+            try
+            {
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<entityLinearAcceleration>");
+                this._entityLinearAcceleration.Reflection(sb);
+                sb.AppendLine("</entityLinearAcceleration>");
+                sb.AppendLine("<entityAngularVelocity>");
+                this._entityAngularVelocity.Reflection(sb);
+                sb.AppendLine("</entityAngularVelocity>");
+                sb.AppendLine("</DeadReckoningParameter>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DeadReckoningParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DeadReckoningParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._otherParameters.Length != 15) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 15; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityAngularVelocity.Equals(obj._entityAngularVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+
+            for (int idx = 0; idx < 15; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAngularVelocity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DesignatorPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/DesignatorPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/DesignatorPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/DesignatorPdu.cs
index 2de5816..2421885 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DesignatorPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/DesignatorPdu.cs
@@ -1,669 +1,669 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.7.2. Handles designating operations
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    public partial class DesignatorPdu : DistributedEmissionsPdu, IEquatable<DesignatorPdu>
-    {
-        /// <summary>
-        /// ID of the entity designating
-        /// </summary>
-        private EntityID _designatingEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
-        /// </summary>
-        private ushort _codeName;
-
-        /// <summary>
-        /// ID of the entity being designated
-        /// </summary>
-        private EntityID _designatedEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall identify the designator code being used by the designating entity 
-        /// </summary>
-        private ushort _designatorCode;
-
-        /// <summary>
-        /// This field shall identify the designator output power in watts
-        /// </summary>
-        private float _designatorPower;
-
-        /// <summary>
-        /// This field shall identify the designator wavelength in units of microns
-        /// </summary>
-        private float _designatorWavelength;
-
-        /// <summary>
-        /// designtor spot wrt the designated entity
-        /// </summary>
-        private Vector3Float _designatorSpotWrtDesignated = new Vector3Float();
-
-        /// <summary>
-        /// designtor spot wrt the designated entity
-        /// </summary>
-        private Vector3Double _designatorSpotLocation = new Vector3Double();
-
-        /// <summary>
-        /// Dead reckoning algorithm
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// linear accelleration of entity
-        /// </summary>
-        private Vector3Float _entityLinearAcceleration = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DesignatorPdu"/> class.
-        /// </summary>
-        public DesignatorPdu()
-        {
-            PduType = (byte)24;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DesignatorPdu left, DesignatorPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DesignatorPdu left, DesignatorPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._designatingEntityID.GetMarshalledSize();  // this._designatingEntityID
-            marshalSize += 2;  // this._codeName
-            marshalSize += this._designatedEntityID.GetMarshalledSize();  // this._designatedEntityID
-            marshalSize += 2;  // this._designatorCode
-            marshalSize += 4;  // this._designatorPower
-            marshalSize += 4;  // this._designatorWavelength
-            marshalSize += this._designatorSpotWrtDesignated.GetMarshalledSize();  // this._designatorSpotWrtDesignated
-            marshalSize += this._designatorSpotLocation.GetMarshalledSize();  // this._designatorSpotLocation
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity designating
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "designatingEntityID")]
-        public EntityID DesignatingEntityID
-        {
-            get
-            {
-                return this._designatingEntityID;
-            }
-
-            set
-            {
-                this._designatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "codeName")]
-        public ushort CodeName
-        {
-            get
-            {
-                return this._codeName;
-            }
-
-            set
-            {
-                this._codeName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity being designated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "designatedEntityID")]
-        public EntityID DesignatedEntityID
-        {
-            get
-            {
-                return this._designatedEntityID;
-            }
-
-            set
-            {
-                this._designatedEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator code being used by the designating entity 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "designatorCode")]
-        public ushort DesignatorCode
-        {
-            get
-            {
-                return this._designatorCode;
-            }
-
-            set
-            {
-                this._designatorCode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator output power in watts
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "designatorPower")]
-        public float DesignatorPower
-        {
-            get
-            {
-                return this._designatorPower;
-            }
-
-            set
-            {
-                this._designatorPower = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator wavelength in units of microns
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "designatorWavelength")]
-        public float DesignatorWavelength
-        {
-            get
-            {
-                return this._designatorWavelength;
-            }
-
-            set
-            {
-                this._designatorWavelength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the designtor spot wrt the designated entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "designatorSpotWrtDesignated")]
-        public Vector3Float DesignatorSpotWrtDesignated
-        {
-            get
-            {
-                return this._designatorSpotWrtDesignated;
-            }
-
-            set
-            {
-                this._designatorSpotWrtDesignated = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the designtor spot wrt the designated entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "designatorSpotLocation")]
-        public Vector3Double DesignatorSpotLocation
-        {
-            get
-            {
-                return this._designatorSpotLocation;
-            }
-
-            set
-            {
-                this._designatorSpotLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Dead reckoning algorithm
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the linear accelleration of entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
-        public Vector3Float EntityLinearAcceleration
-        {
-            get
-            {
-                return this._entityLinearAcceleration;
-            }
-
-            set
-            {
-                this._entityLinearAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._designatingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._codeName);
-                    this._designatedEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._designatorCode);
-                    dos.WriteFloat((float)this._designatorPower);
-                    dos.WriteFloat((float)this._designatorWavelength);
-                    this._designatorSpotWrtDesignated.Marshal(dos);
-                    this._designatorSpotLocation.Marshal(dos);
-                    dos.WriteByte((byte)this._deadReckoningAlgorithm);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                    this._entityLinearAcceleration.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._designatingEntityID.Unmarshal(dis);
-                    this._codeName = dis.ReadUnsignedShort();
-                    this._designatedEntityID.Unmarshal(dis);
-                    this._designatorCode = dis.ReadUnsignedShort();
-                    this._designatorPower = dis.ReadFloat();
-                    this._designatorWavelength = dis.ReadFloat();
-                    this._designatorSpotWrtDesignated.Unmarshal(dis);
-                    this._designatorSpotLocation.Unmarshal(dis);
-                    this._deadReckoningAlgorithm = dis.ReadByte();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._padding2 = dis.ReadByte();
-                    this._entityLinearAcceleration.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DesignatorPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<designatingEntityID>");
-                this._designatingEntityID.Reflection(sb);
-                sb.AppendLine("</designatingEntityID>");
-                sb.AppendLine("<codeName type=\"ushort\">" + this._codeName.ToString(CultureInfo.InvariantCulture) + "</codeName>");
-                sb.AppendLine("<designatedEntityID>");
-                this._designatedEntityID.Reflection(sb);
-                sb.AppendLine("</designatedEntityID>");
-                sb.AppendLine("<designatorCode type=\"ushort\">" + this._designatorCode.ToString(CultureInfo.InvariantCulture) + "</designatorCode>");
-                sb.AppendLine("<designatorPower type=\"float\">" + this._designatorPower.ToString(CultureInfo.InvariantCulture) + "</designatorPower>");
-                sb.AppendLine("<designatorWavelength type=\"float\">" + this._designatorWavelength.ToString(CultureInfo.InvariantCulture) + "</designatorWavelength>");
-                sb.AppendLine("<designatorSpotWrtDesignated>");
-                this._designatorSpotWrtDesignated.Reflection(sb);
-                sb.AppendLine("</designatorSpotWrtDesignated>");
-                sb.AppendLine("<designatorSpotLocation>");
-                this._designatorSpotLocation.Reflection(sb);
-                sb.AppendLine("</designatorSpotLocation>");
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<entityLinearAcceleration>");
-                this._entityLinearAcceleration.Reflection(sb);
-                sb.AppendLine("</entityLinearAcceleration>");
-                sb.AppendLine("</DesignatorPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DesignatorPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DesignatorPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._designatingEntityID.Equals(obj._designatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._codeName != obj._codeName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatedEntityID.Equals(obj._designatedEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorCode != obj._designatorCode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorPower != obj._designatorPower)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorWavelength != obj._designatorWavelength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatorSpotWrtDesignated.Equals(obj._designatorSpotWrtDesignated))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatorSpotLocation.Equals(obj._designatorSpotLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._designatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._codeName.GetHashCode();
-            result = GenerateHash(result) ^ this._designatedEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorCode.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorPower.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorWavelength.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorSpotWrtDesignated.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorSpotLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.7.2. Handles designating operations
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    public partial class DesignatorPdu : DistributedEmissionsPdu, IEquatable<DesignatorPdu>
+    {
+        /// <summary>
+        /// ID of the entity designating
+        /// </summary>
+        private EntityID _designatingEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
+        /// </summary>
+        private ushort _codeName;
+
+        /// <summary>
+        /// ID of the entity being designated
+        /// </summary>
+        private EntityID _designatedEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall identify the designator code being used by the designating entity 
+        /// </summary>
+        private ushort _designatorCode;
+
+        /// <summary>
+        /// This field shall identify the designator output power in watts
+        /// </summary>
+        private float _designatorPower;
+
+        /// <summary>
+        /// This field shall identify the designator wavelength in units of microns
+        /// </summary>
+        private float _designatorWavelength;
+
+        /// <summary>
+        /// designtor spot wrt the designated entity
+        /// </summary>
+        private Vector3Float _designatorSpotWrtDesignated = new Vector3Float();
+
+        /// <summary>
+        /// designtor spot wrt the designated entity
+        /// </summary>
+        private Vector3Double _designatorSpotLocation = new Vector3Double();
+
+        /// <summary>
+        /// Dead reckoning algorithm
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// linear accelleration of entity
+        /// </summary>
+        private Vector3Float _entityLinearAcceleration = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DesignatorPdu"/> class.
+        /// </summary>
+        public DesignatorPdu()
+        {
+            PduType = (byte)24;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DesignatorPdu left, DesignatorPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DesignatorPdu left, DesignatorPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._designatingEntityID.GetMarshalledSize();  // this._designatingEntityID
+            marshalSize += 2;  // this._codeName
+            marshalSize += this._designatedEntityID.GetMarshalledSize();  // this._designatedEntityID
+            marshalSize += 2;  // this._designatorCode
+            marshalSize += 4;  // this._designatorPower
+            marshalSize += 4;  // this._designatorWavelength
+            marshalSize += this._designatorSpotWrtDesignated.GetMarshalledSize();  // this._designatorSpotWrtDesignated
+            marshalSize += this._designatorSpotLocation.GetMarshalledSize();  // this._designatorSpotLocation
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity designating
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "designatingEntityID")]
+        public EntityID DesignatingEntityID
+        {
+            get
+            {
+                return this._designatingEntityID;
+            }
+
+            set
+            {
+                this._designatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "codeName")]
+        public ushort CodeName
+        {
+            get
+            {
+                return this._codeName;
+            }
+
+            set
+            {
+                this._codeName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity being designated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "designatedEntityID")]
+        public EntityID DesignatedEntityID
+        {
+            get
+            {
+                return this._designatedEntityID;
+            }
+
+            set
+            {
+                this._designatedEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator code being used by the designating entity 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "designatorCode")]
+        public ushort DesignatorCode
+        {
+            get
+            {
+                return this._designatorCode;
+            }
+
+            set
+            {
+                this._designatorCode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator output power in watts
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "designatorPower")]
+        public float DesignatorPower
+        {
+            get
+            {
+                return this._designatorPower;
+            }
+
+            set
+            {
+                this._designatorPower = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator wavelength in units of microns
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "designatorWavelength")]
+        public float DesignatorWavelength
+        {
+            get
+            {
+                return this._designatorWavelength;
+            }
+
+            set
+            {
+                this._designatorWavelength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the designtor spot wrt the designated entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "designatorSpotWrtDesignated")]
+        public Vector3Float DesignatorSpotWrtDesignated
+        {
+            get
+            {
+                return this._designatorSpotWrtDesignated;
+            }
+
+            set
+            {
+                this._designatorSpotWrtDesignated = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the designtor spot wrt the designated entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "designatorSpotLocation")]
+        public Vector3Double DesignatorSpotLocation
+        {
+            get
+            {
+                return this._designatorSpotLocation;
+            }
+
+            set
+            {
+                this._designatorSpotLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Dead reckoning algorithm
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the linear accelleration of entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
+        public Vector3Float EntityLinearAcceleration
+        {
+            get
+            {
+                return this._entityLinearAcceleration;
+            }
+
+            set
+            {
+                this._entityLinearAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._designatingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._codeName);
+                    this._designatedEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._designatorCode);
+                    dos.WriteFloat((float)this._designatorPower);
+                    dos.WriteFloat((float)this._designatorWavelength);
+                    this._designatorSpotWrtDesignated.Marshal(dos);
+                    this._designatorSpotLocation.Marshal(dos);
+                    dos.WriteByte((byte)this._deadReckoningAlgorithm);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                    this._entityLinearAcceleration.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._designatingEntityID.Unmarshal(dis);
+                    this._codeName = dis.ReadUnsignedShort();
+                    this._designatedEntityID.Unmarshal(dis);
+                    this._designatorCode = dis.ReadUnsignedShort();
+                    this._designatorPower = dis.ReadFloat();
+                    this._designatorWavelength = dis.ReadFloat();
+                    this._designatorSpotWrtDesignated.Unmarshal(dis);
+                    this._designatorSpotLocation.Unmarshal(dis);
+                    this._deadReckoningAlgorithm = dis.ReadByte();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._padding2 = dis.ReadByte();
+                    this._entityLinearAcceleration.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DesignatorPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<designatingEntityID>");
+                this._designatingEntityID.Reflection(sb);
+                sb.AppendLine("</designatingEntityID>");
+                sb.AppendLine("<codeName type=\"ushort\">" + this._codeName.ToString(CultureInfo.InvariantCulture) + "</codeName>");
+                sb.AppendLine("<designatedEntityID>");
+                this._designatedEntityID.Reflection(sb);
+                sb.AppendLine("</designatedEntityID>");
+                sb.AppendLine("<designatorCode type=\"ushort\">" + this._designatorCode.ToString(CultureInfo.InvariantCulture) + "</designatorCode>");
+                sb.AppendLine("<designatorPower type=\"float\">" + this._designatorPower.ToString(CultureInfo.InvariantCulture) + "</designatorPower>");
+                sb.AppendLine("<designatorWavelength type=\"float\">" + this._designatorWavelength.ToString(CultureInfo.InvariantCulture) + "</designatorWavelength>");
+                sb.AppendLine("<designatorSpotWrtDesignated>");
+                this._designatorSpotWrtDesignated.Reflection(sb);
+                sb.AppendLine("</designatorSpotWrtDesignated>");
+                sb.AppendLine("<designatorSpotLocation>");
+                this._designatorSpotLocation.Reflection(sb);
+                sb.AppendLine("</designatorSpotLocation>");
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<entityLinearAcceleration>");
+                this._entityLinearAcceleration.Reflection(sb);
+                sb.AppendLine("</entityLinearAcceleration>");
+                sb.AppendLine("</DesignatorPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DesignatorPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DesignatorPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._designatingEntityID.Equals(obj._designatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._codeName != obj._codeName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatedEntityID.Equals(obj._designatedEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorCode != obj._designatorCode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorPower != obj._designatorPower)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorWavelength != obj._designatorWavelength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatorSpotWrtDesignated.Equals(obj._designatorSpotWrtDesignated))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatorSpotLocation.Equals(obj._designatorSpotLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._designatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._codeName.GetHashCode();
+            result = GenerateHash(result) ^ this._designatedEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorCode.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorPower.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorWavelength.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorSpotWrtDesignated.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorSpotLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DetonationPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/DetonationPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/DetonationPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/DetonationPdu.cs
index b427d28..6cd5d87 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DetonationPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/DetonationPdu.cs
@@ -1,614 +1,614 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.4.2. Information about Stuff Exploding
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(BurstDescriptor))]
-    [XmlInclude(typeof(ArticulationParameter))]
-    public partial class DetonationPdu : Warfare, IEquatable<DetonationPdu>
-    {
-        /// <summary>
-        /// ID of muntion that was fired
-        /// </summary>
-        private EntityID _munitionID = new EntityID();
-
-        /// <summary>
-        /// ID firing event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// ID firing event
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// where the detonation is, in world coordinates
-        /// </summary>
-        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
-
-        /// <summary>
-        /// Describes munition used
-        /// </summary>
-        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
-
-        /// <summary>
-        /// result of the explosion
-        /// </summary>
-        private byte _detonationResult;
-
-        /// <summary>
-        /// How many articulation parameters we have
-        /// </summary>
-        private byte _numberOfArticulationParameters;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _pad;
-
-        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DetonationPdu"/> class.
-        /// </summary>
-        public DetonationPdu()
-        {
-            PduType = (byte)3;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DetonationPdu left, DetonationPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DetonationPdu left, DetonationPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
-            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
-            marshalSize += 1;  // this._detonationResult
-            marshalSize += 1;  // this._numberOfArticulationParameters
-            marshalSize += 2;  // this._pad
-            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-            {
-                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of muntion that was fired
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
-        public EntityID MunitionID
-        {
-            get
-            {
-                return this._munitionID;
-            }
-
-            set
-            {
-                this._munitionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID firing event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID firing event
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the where the detonation is, in world coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
-        public Vector3Double LocationInWorldCoordinates
-        {
-            get
-            {
-                return this._locationInWorldCoordinates;
-            }
-
-            set
-            {
-                this._locationInWorldCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes munition used
-        /// </summary>
-        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
-        public BurstDescriptor BurstDescriptor
-        {
-            get
-            {
-                return this._burstDescriptor;
-            }
-
-            set
-            {
-                this._burstDescriptor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the result of the explosion
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "detonationResult")]
-        public byte DetonationResult
-        {
-            get
-            {
-                return this._detonationResult;
-            }
-
-            set
-            {
-                this._detonationResult = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many articulation parameters we have
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
-        public byte NumberOfArticulationParameters
-        {
-            get
-            {
-                return this._numberOfArticulationParameters;
-            }
-
-            set
-            {
-                this._numberOfArticulationParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "pad")]
-        public short Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the articulationParameters
-        /// </summary>
-        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
-        public List<ArticulationParameter> ArticulationParameters
-        {
-            get
-            {
-                return this._articulationParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    this._velocity.Marshal(dos);
-                    this._locationInWorldCoordinates.Marshal(dos);
-                    this._burstDescriptor.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._detonationResult);
-                    dos.WriteUnsignedByte((byte)this._articulationParameters.Count);
-                    dos.WriteShort((short)this._pad);
-
-                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                    {
-                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                        aArticulationParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._velocity.Unmarshal(dis);
-                    this._locationInWorldCoordinates.Unmarshal(dis);
-                    this._burstDescriptor.Unmarshal(dis);
-                    this._detonationResult = dis.ReadUnsignedByte();
-                    this._numberOfArticulationParameters = dis.ReadUnsignedByte();
-                    this._pad = dis.ReadShort();
-
-                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
-                    {
-                        ArticulationParameter anX = new ArticulationParameter();
-                        anX.Unmarshal(dis);
-                        this._articulationParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DetonationPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<munitionID>");
-                this._munitionID.Reflection(sb);
-                sb.AppendLine("</munitionID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<locationInWorldCoordinates>");
-                this._locationInWorldCoordinates.Reflection(sb);
-                sb.AppendLine("</locationInWorldCoordinates>");
-                sb.AppendLine("<burstDescriptor>");
-                this._burstDescriptor.Reflection(sb);
-                sb.AppendLine("</burstDescriptor>");
-                sb.AppendLine("<detonationResult type=\"byte\">" + this._detonationResult.ToString(CultureInfo.InvariantCulture) + "</detonationResult>");
-                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
-                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
-                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                    aArticulationParameter.Reflection(sb);
-                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DetonationPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DetonationPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DetonationPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._munitionID.Equals(obj._munitionID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._detonationResult != obj._detonationResult)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._articulationParameters.Count != obj._articulationParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
-            result = GenerateHash(result) ^ this._detonationResult.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-
-            if (this._articulationParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.4.2. Information about Stuff Exploding
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(BurstDescriptor))]
+    [XmlInclude(typeof(ArticulationParameter))]
+    public partial class DetonationPdu : Warfare, IEquatable<DetonationPdu>
+    {
+        /// <summary>
+        /// ID of muntion that was fired
+        /// </summary>
+        private EntityID _munitionID = new EntityID();
+
+        /// <summary>
+        /// ID firing event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// ID firing event
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// where the detonation is, in world coordinates
+        /// </summary>
+        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
+
+        /// <summary>
+        /// Describes munition used
+        /// </summary>
+        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
+
+        /// <summary>
+        /// result of the explosion
+        /// </summary>
+        private byte _detonationResult;
+
+        /// <summary>
+        /// How many articulation parameters we have
+        /// </summary>
+        private byte _numberOfArticulationParameters;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _pad;
+
+        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DetonationPdu"/> class.
+        /// </summary>
+        public DetonationPdu()
+        {
+            PduType = (byte)3;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DetonationPdu left, DetonationPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DetonationPdu left, DetonationPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
+            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
+            marshalSize += 1;  // this._detonationResult
+            marshalSize += 1;  // this._numberOfArticulationParameters
+            marshalSize += 2;  // this._pad
+            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+            {
+                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of muntion that was fired
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
+        public EntityID MunitionID
+        {
+            get
+            {
+                return this._munitionID;
+            }
+
+            set
+            {
+                this._munitionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID firing event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID firing event
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the where the detonation is, in world coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
+        public Vector3Double LocationInWorldCoordinates
+        {
+            get
+            {
+                return this._locationInWorldCoordinates;
+            }
+
+            set
+            {
+                this._locationInWorldCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes munition used
+        /// </summary>
+        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
+        public BurstDescriptor BurstDescriptor
+        {
+            get
+            {
+                return this._burstDescriptor;
+            }
+
+            set
+            {
+                this._burstDescriptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the result of the explosion
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "detonationResult")]
+        public byte DetonationResult
+        {
+            get
+            {
+                return this._detonationResult;
+            }
+
+            set
+            {
+                this._detonationResult = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many articulation parameters we have
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
+        public byte NumberOfArticulationParameters
+        {
+            get
+            {
+                return this._numberOfArticulationParameters;
+            }
+
+            set
+            {
+                this._numberOfArticulationParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "pad")]
+        public short Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the articulationParameters
+        /// </summary>
+        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
+        public List<ArticulationParameter> ArticulationParameters
+        {
+            get
+            {
+                return this._articulationParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    this._velocity.Marshal(dos);
+                    this._locationInWorldCoordinates.Marshal(dos);
+                    this._burstDescriptor.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._detonationResult);
+                    dos.WriteUnsignedByte((byte)this._articulationParameters.Count);
+                    dos.WriteShort((short)this._pad);
+
+                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                    {
+                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                        aArticulationParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._velocity.Unmarshal(dis);
+                    this._locationInWorldCoordinates.Unmarshal(dis);
+                    this._burstDescriptor.Unmarshal(dis);
+                    this._detonationResult = dis.ReadUnsignedByte();
+                    this._numberOfArticulationParameters = dis.ReadUnsignedByte();
+                    this._pad = dis.ReadShort();
+
+                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
+                    {
+                        ArticulationParameter anX = new ArticulationParameter();
+                        anX.Unmarshal(dis);
+                        this._articulationParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DetonationPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<munitionID>");
+                this._munitionID.Reflection(sb);
+                sb.AppendLine("</munitionID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<locationInWorldCoordinates>");
+                this._locationInWorldCoordinates.Reflection(sb);
+                sb.AppendLine("</locationInWorldCoordinates>");
+                sb.AppendLine("<burstDescriptor>");
+                this._burstDescriptor.Reflection(sb);
+                sb.AppendLine("</burstDescriptor>");
+                sb.AppendLine("<detonationResult type=\"byte\">" + this._detonationResult.ToString(CultureInfo.InvariantCulture) + "</detonationResult>");
+                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
+                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
+                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                    aArticulationParameter.Reflection(sb);
+                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DetonationPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DetonationPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DetonationPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._munitionID.Equals(obj._munitionID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._detonationResult != obj._detonationResult)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._articulationParameters.Count != obj._articulationParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
+            result = GenerateHash(result) ^ this._detonationResult.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+
+            if (this._articulationParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/DistributedEmissionsPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/DistributedEmissionsPdu.cs
index 6e20847..6bf9644 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/DistributedEmissionsPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/DistributedEmissionsPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.7. Electronic Emmisions
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class DistributedEmissionsPdu : Pdu, IEquatable<DistributedEmissionsPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DistributedEmissionsPdu"/> class.
-        /// </summary>
-        public DistributedEmissionsPdu()
-        {
-            ProtocolFamily = (byte)6;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DistributedEmissionsPdu left, DistributedEmissionsPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DistributedEmissionsPdu left, DistributedEmissionsPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DistributedEmissionsPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</DistributedEmissionsPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DistributedEmissionsPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DistributedEmissionsPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.7. Electronic Emmisions
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class DistributedEmissionsPdu : Pdu, IEquatable<DistributedEmissionsPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DistributedEmissionsPdu"/> class.
+        /// </summary>
+        public DistributedEmissionsPdu()
+        {
+            ProtocolFamily = (byte)6;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DistributedEmissionsPdu left, DistributedEmissionsPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DistributedEmissionsPdu left, DistributedEmissionsPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DistributedEmissionsPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</DistributedEmissionsPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DistributedEmissionsPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DistributedEmissionsPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EightByteChunk.cs b/Libs/CsharpDis6/Dis1995/Generated/EightByteChunk.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EightByteChunk.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EightByteChunk.cs
index 73f015d..74b03bc 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EightByteChunk.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EightByteChunk.cs
@@ -1,324 +1,324 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// 64 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EightByteChunk
-    {
-        /// <summary>
-        /// Eight bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[8];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EightByteChunk"/> class.
-        /// </summary>
-        public EightByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EightByteChunk left, EightByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EightByteChunk left, EightByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 8 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Eight bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EightByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</EightByteChunk>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EightByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EightByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 8) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 8; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            for (int idx = 0; idx < 8; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// 64 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EightByteChunk
+    {
+        /// <summary>
+        /// Eight bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[8];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EightByteChunk"/> class.
+        /// </summary>
+        public EightByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EightByteChunk left, EightByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EightByteChunk left, EightByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 8 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Eight bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EightByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</EightByteChunk>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EightByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EightByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 8) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 8; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            for (int idx = 0; idx < 8; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ElectronicEmmisionsPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ElectronicEmmisionsPdu.cs
index f9fdf10..8a9b2a6 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ElectronicEmmisionsPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ElectronicEmmisionsPdu.cs
@@ -1,735 +1,735 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be com-  municated using an Electromagnetic Emission PDU.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(EmitterSystem))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(FundamentalParameterData))]
-    public partial class ElectronicEmmisionsPdu : DistributedEmissionsPdu, IEquatable<ElectronicEmmisionsPdu>
-    {
-        /// <summary>
-        /// ID of the entity emitting
-        /// </summary>
-        private EntityID _emittingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// This field shall be used to indicate if the data in the PDU represents a state  update or just data that has changed since issuance of the last Electromagnetic Emission PDU [rela-  tive to the identified entity and emission system(s)].
-        /// </summary>
-        private byte _stateUpdateIndicator;
-
-        /// <summary>
-        /// This field shall specify the number of emission systems being described in the  current PDU.
-        /// </summary>
-        private byte _numberOfSystems;
-
-        /// <summary>
-        /// padding.
-        /// </summary>
-        private ushort _emissionsPadding;
-
-        /// <summary>
-        /// This field shall specify the length of this emitter system�s data (including  beam data and its track/jam information) in 32-bit words. The length shall include the System  Data Length field. 
-        /// </summary>
-        private byte _systemDataLength;
-
-        /// <summary>
-        /// This field shall specify the number of beams being described in the current  PDU for the system being described. 
-        /// </summary>
-        private byte _numberOfBeams;
-
-        /// <summary>
-        /// padding.
-        /// </summary>
-        private ushort _emissionsPadding2;
-
-        /// <summary>
-        /// This field shall specify information about a particular emitter system
-        /// </summary>
-        private EmitterSystem _emitterSystem = new EmitterSystem();
-
-        /// <summary>
-        /// Location with respect to the entity
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// This field shall specify the length of this beam�s data (including track/  jam information) in 32-bit words. The length shall include the Beam Data Length field 
-        /// </summary>
-        private byte _beamDataLength;
-
-        /// <summary>
-        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
-        /// </summary>
-        private byte _beamIdNumber;
-
-        /// <summary>
-        /// This field shall specify a Beam Parameter Index number that shall  be used by receiving entities in conjunction with the Emitter Name field to provide a  pointer to the stored database parameters required to regenerate the beam. 
-        /// </summary>
-        private ushort _beamParameterIndex;
-
-        /// <summary>
-        /// Fundamental parameter data such as frequency range, beam sweep, etc.
-        /// </summary>
-        private FundamentalParameterData _fundamentalParameterData = new FundamentalParameterData();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ElectronicEmmisionsPdu"/> class.
-        /// </summary>
-        public ElectronicEmmisionsPdu()
-        {
-            PduType = (byte)23;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ElectronicEmmisionsPdu left, ElectronicEmmisionsPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ElectronicEmmisionsPdu left, ElectronicEmmisionsPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._stateUpdateIndicator
-            marshalSize += 1;  // this._numberOfSystems
-            marshalSize += 2;  // this._emissionsPadding
-            marshalSize += 1;  // this._systemDataLength
-            marshalSize += 1;  // this._numberOfBeams
-            marshalSize += 2;  // this._emissionsPadding2
-            marshalSize += this._emitterSystem.GetMarshalledSize();  // this._emitterSystem
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            marshalSize += 1;  // this._beamDataLength
-            marshalSize += 1;  // this._beamIdNumber
-            marshalSize += 2;  // this._beamParameterIndex
-            marshalSize += this._fundamentalParameterData.GetMarshalledSize();  // this._fundamentalParameterData
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity emitting
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
-        public EntityID EmittingEntityID
-        {
-            get
-            {
-                return this._emittingEntityID;
-            }
-
-            set
-            {
-                this._emittingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall be used to indicate if the data in the PDU represents a state  update or just data that has changed since issuance of the last Electromagnetic Emission PDU [rela-  tive to the identified entity and emission system(s)].
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "stateUpdateIndicator")]
-        public byte StateUpdateIndicator
-        {
-            get
-            {
-                return this._stateUpdateIndicator;
-            }
-
-            set
-            {
-                this._stateUpdateIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the number of emission systems being described in the  current PDU.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSystems")]
-        public byte NumberOfSystems
-        {
-            get
-            {
-                return this._numberOfSystems;
-            }
-
-            set
-            {
-                this._numberOfSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "emissionsPadding")]
-        public ushort EmissionsPadding
-        {
-            get
-            {
-                return this._emissionsPadding;
-            }
-
-            set
-            {
-                this._emissionsPadding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the length of this emitter system�s data (including  beam data and its track/jam information) in 32-bit words. The length shall include the System  Data Length field. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "systemDataLength")]
-        public byte SystemDataLength
-        {
-            get
-            {
-                return this._systemDataLength;
-            }
-
-            set
-            {
-                this._systemDataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the number of beams being described in the current  PDU for the system being described. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
-        public byte NumberOfBeams
-        {
-            get
-            {
-                return this._numberOfBeams;
-            }
-
-            set
-            {
-                this._numberOfBeams = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "emissionsPadding2")]
-        public ushort EmissionsPadding2
-        {
-            get
-            {
-                return this._emissionsPadding2;
-            }
-
-            set
-            {
-                this._emissionsPadding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify information about a particular emitter system
-        /// </summary>
-        [XmlElement(Type = typeof(EmitterSystem), ElementName = "emitterSystem")]
-        public EmitterSystem EmitterSystem
-        {
-            get
-            {
-                return this._emitterSystem;
-            }
-
-            set
-            {
-                this._emitterSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location with respect to the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the length of this beam�s data (including track/  jam information) in 32-bit words. The length shall include the Beam Data Length field 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamDataLength")]
-        public byte BeamDataLength
-        {
-            get
-            {
-                return this._beamDataLength;
-            }
-
-            set
-            {
-                this._beamDataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamIdNumber")]
-        public byte BeamIdNumber
-        {
-            get
-            {
-                return this._beamIdNumber;
-            }
-
-            set
-            {
-                this._beamIdNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify a Beam Parameter Index number that shall  be used by receiving entities in conjunction with the Emitter Name field to provide a  pointer to the stored database parameters required to regenerate the beam. 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "beamParameterIndex")]
-        public ushort BeamParameterIndex
-        {
-            get
-            {
-                return this._beamParameterIndex;
-            }
-
-            set
-            {
-                this._beamParameterIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fundamental parameter data such as frequency range, beam sweep, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(FundamentalParameterData), ElementName = "fundamentalParameterData")]
-        public FundamentalParameterData FundamentalParameterData
-        {
-            get
-            {
-                return this._fundamentalParameterData;
-            }
-
-            set
-            {
-                this._fundamentalParameterData = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._stateUpdateIndicator);
-                    dos.WriteUnsignedByte((byte)this._numberOfSystems);
-                    dos.WriteUnsignedShort((ushort)this._emissionsPadding);
-                    dos.WriteUnsignedByte((byte)this._systemDataLength);
-                    dos.WriteUnsignedByte((byte)this._numberOfBeams);
-                    dos.WriteUnsignedShort((ushort)this._emissionsPadding2);
-                    this._emitterSystem.Marshal(dos);
-                    this._location.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._beamDataLength);
-                    dos.WriteUnsignedByte((byte)this._beamIdNumber);
-                    dos.WriteUnsignedShort((ushort)this._beamParameterIndex);
-                    this._fundamentalParameterData.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._stateUpdateIndicator = dis.ReadUnsignedByte();
-                    this._numberOfSystems = dis.ReadUnsignedByte();
-                    this._emissionsPadding = dis.ReadUnsignedShort();
-                    this._systemDataLength = dis.ReadUnsignedByte();
-                    this._numberOfBeams = dis.ReadUnsignedByte();
-                    this._emissionsPadding2 = dis.ReadUnsignedShort();
-                    this._emitterSystem.Unmarshal(dis);
-                    this._location.Unmarshal(dis);
-                    this._beamDataLength = dis.ReadUnsignedByte();
-                    this._beamIdNumber = dis.ReadUnsignedByte();
-                    this._beamParameterIndex = dis.ReadUnsignedShort();
-                    this._fundamentalParameterData.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ElectronicEmmisionsPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<emittingEntityID>");
-                this._emittingEntityID.Reflection(sb);
-                sb.AppendLine("</emittingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<stateUpdateIndicator type=\"byte\">" + this._stateUpdateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateUpdateIndicator>");
-                sb.AppendLine("<numberOfSystems type=\"byte\">" + this._numberOfSystems.ToString(CultureInfo.InvariantCulture) + "</numberOfSystems>");
-                sb.AppendLine("<emissionsPadding type=\"ushort\">" + this._emissionsPadding.ToString(CultureInfo.InvariantCulture) + "</emissionsPadding>");
-                sb.AppendLine("<systemDataLength type=\"byte\">" + this._systemDataLength.ToString(CultureInfo.InvariantCulture) + "</systemDataLength>");
-                sb.AppendLine("<numberOfBeams type=\"byte\">" + this._numberOfBeams.ToString(CultureInfo.InvariantCulture) + "</numberOfBeams>");
-                sb.AppendLine("<emissionsPadding2 type=\"ushort\">" + this._emissionsPadding2.ToString(CultureInfo.InvariantCulture) + "</emissionsPadding2>");
-                sb.AppendLine("<emitterSystem>");
-                this._emitterSystem.Reflection(sb);
-                sb.AppendLine("</emitterSystem>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                sb.AppendLine("<beamDataLength type=\"byte\">" + this._beamDataLength.ToString(CultureInfo.InvariantCulture) + "</beamDataLength>");
-                sb.AppendLine("<beamIdNumber type=\"byte\">" + this._beamIdNumber.ToString(CultureInfo.InvariantCulture) + "</beamIdNumber>");
-                sb.AppendLine("<beamParameterIndex type=\"ushort\">" + this._beamParameterIndex.ToString(CultureInfo.InvariantCulture) + "</beamParameterIndex>");
-                sb.AppendLine("<fundamentalParameterData>");
-                this._fundamentalParameterData.Reflection(sb);
-                sb.AppendLine("</fundamentalParameterData>");
-                sb.AppendLine("</ElectronicEmmisionsPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ElectronicEmmisionsPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ElectronicEmmisionsPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateUpdateIndicator != obj._stateUpdateIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSystems != obj._numberOfSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emissionsPadding != obj._emissionsPadding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systemDataLength != obj._systemDataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfBeams != obj._numberOfBeams)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emissionsPadding2 != obj._emissionsPadding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._emitterSystem.Equals(obj._emitterSystem))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamDataLength != obj._beamDataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamIdNumber != obj._beamIdNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamParameterIndex != obj._beamParameterIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._fundamentalParameterData.Equals(obj._fundamentalParameterData))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._stateUpdateIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSystems.GetHashCode();
-            result = GenerateHash(result) ^ this._emissionsPadding.GetHashCode();
-            result = GenerateHash(result) ^ this._systemDataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
-            result = GenerateHash(result) ^ this._emissionsPadding2.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-            result = GenerateHash(result) ^ this._beamDataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._beamIdNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._beamParameterIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._fundamentalParameterData.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be com-  municated using an Electromagnetic Emission PDU.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(EmitterSystem))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(FundamentalParameterData))]
+    public partial class ElectronicEmmisionsPdu : DistributedEmissionsPdu, IEquatable<ElectronicEmmisionsPdu>
+    {
+        /// <summary>
+        /// ID of the entity emitting
+        /// </summary>
+        private EntityID _emittingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// This field shall be used to indicate if the data in the PDU represents a state  update or just data that has changed since issuance of the last Electromagnetic Emission PDU [rela-  tive to the identified entity and emission system(s)].
+        /// </summary>
+        private byte _stateUpdateIndicator;
+
+        /// <summary>
+        /// This field shall specify the number of emission systems being described in the  current PDU.
+        /// </summary>
+        private byte _numberOfSystems;
+
+        /// <summary>
+        /// padding.
+        /// </summary>
+        private ushort _emissionsPadding;
+
+        /// <summary>
+        /// This field shall specify the length of this emitter system�s data (including  beam data and its track/jam information) in 32-bit words. The length shall include the System  Data Length field. 
+        /// </summary>
+        private byte _systemDataLength;
+
+        /// <summary>
+        /// This field shall specify the number of beams being described in the current  PDU for the system being described. 
+        /// </summary>
+        private byte _numberOfBeams;
+
+        /// <summary>
+        /// padding.
+        /// </summary>
+        private ushort _emissionsPadding2;
+
+        /// <summary>
+        /// This field shall specify information about a particular emitter system
+        /// </summary>
+        private EmitterSystem _emitterSystem = new EmitterSystem();
+
+        /// <summary>
+        /// Location with respect to the entity
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// This field shall specify the length of this beam�s data (including track/  jam information) in 32-bit words. The length shall include the Beam Data Length field 
+        /// </summary>
+        private byte _beamDataLength;
+
+        /// <summary>
+        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
+        /// </summary>
+        private byte _beamIdNumber;
+
+        /// <summary>
+        /// This field shall specify a Beam Parameter Index number that shall  be used by receiving entities in conjunction with the Emitter Name field to provide a  pointer to the stored database parameters required to regenerate the beam. 
+        /// </summary>
+        private ushort _beamParameterIndex;
+
+        /// <summary>
+        /// Fundamental parameter data such as frequency range, beam sweep, etc.
+        /// </summary>
+        private FundamentalParameterData _fundamentalParameterData = new FundamentalParameterData();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ElectronicEmmisionsPdu"/> class.
+        /// </summary>
+        public ElectronicEmmisionsPdu()
+        {
+            PduType = (byte)23;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ElectronicEmmisionsPdu left, ElectronicEmmisionsPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ElectronicEmmisionsPdu left, ElectronicEmmisionsPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._stateUpdateIndicator
+            marshalSize += 1;  // this._numberOfSystems
+            marshalSize += 2;  // this._emissionsPadding
+            marshalSize += 1;  // this._systemDataLength
+            marshalSize += 1;  // this._numberOfBeams
+            marshalSize += 2;  // this._emissionsPadding2
+            marshalSize += this._emitterSystem.GetMarshalledSize();  // this._emitterSystem
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            marshalSize += 1;  // this._beamDataLength
+            marshalSize += 1;  // this._beamIdNumber
+            marshalSize += 2;  // this._beamParameterIndex
+            marshalSize += this._fundamentalParameterData.GetMarshalledSize();  // this._fundamentalParameterData
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity emitting
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
+        public EntityID EmittingEntityID
+        {
+            get
+            {
+                return this._emittingEntityID;
+            }
+
+            set
+            {
+                this._emittingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall be used to indicate if the data in the PDU represents a state  update or just data that has changed since issuance of the last Electromagnetic Emission PDU [rela-  tive to the identified entity and emission system(s)].
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "stateUpdateIndicator")]
+        public byte StateUpdateIndicator
+        {
+            get
+            {
+                return this._stateUpdateIndicator;
+            }
+
+            set
+            {
+                this._stateUpdateIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the number of emission systems being described in the  current PDU.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSystems")]
+        public byte NumberOfSystems
+        {
+            get
+            {
+                return this._numberOfSystems;
+            }
+
+            set
+            {
+                this._numberOfSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "emissionsPadding")]
+        public ushort EmissionsPadding
+        {
+            get
+            {
+                return this._emissionsPadding;
+            }
+
+            set
+            {
+                this._emissionsPadding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the length of this emitter system�s data (including  beam data and its track/jam information) in 32-bit words. The length shall include the System  Data Length field. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "systemDataLength")]
+        public byte SystemDataLength
+        {
+            get
+            {
+                return this._systemDataLength;
+            }
+
+            set
+            {
+                this._systemDataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the number of beams being described in the current  PDU for the system being described. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
+        public byte NumberOfBeams
+        {
+            get
+            {
+                return this._numberOfBeams;
+            }
+
+            set
+            {
+                this._numberOfBeams = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "emissionsPadding2")]
+        public ushort EmissionsPadding2
+        {
+            get
+            {
+                return this._emissionsPadding2;
+            }
+
+            set
+            {
+                this._emissionsPadding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify information about a particular emitter system
+        /// </summary>
+        [XmlElement(Type = typeof(EmitterSystem), ElementName = "emitterSystem")]
+        public EmitterSystem EmitterSystem
+        {
+            get
+            {
+                return this._emitterSystem;
+            }
+
+            set
+            {
+                this._emitterSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location with respect to the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the length of this beam�s data (including track/  jam information) in 32-bit words. The length shall include the Beam Data Length field 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamDataLength")]
+        public byte BeamDataLength
+        {
+            get
+            {
+                return this._beamDataLength;
+            }
+
+            set
+            {
+                this._beamDataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter  system.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamIdNumber")]
+        public byte BeamIdNumber
+        {
+            get
+            {
+                return this._beamIdNumber;
+            }
+
+            set
+            {
+                this._beamIdNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify a Beam Parameter Index number that shall  be used by receiving entities in conjunction with the Emitter Name field to provide a  pointer to the stored database parameters required to regenerate the beam. 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "beamParameterIndex")]
+        public ushort BeamParameterIndex
+        {
+            get
+            {
+                return this._beamParameterIndex;
+            }
+
+            set
+            {
+                this._beamParameterIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fundamental parameter data such as frequency range, beam sweep, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(FundamentalParameterData), ElementName = "fundamentalParameterData")]
+        public FundamentalParameterData FundamentalParameterData
+        {
+            get
+            {
+                return this._fundamentalParameterData;
+            }
+
+            set
+            {
+                this._fundamentalParameterData = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._stateUpdateIndicator);
+                    dos.WriteUnsignedByte((byte)this._numberOfSystems);
+                    dos.WriteUnsignedShort((ushort)this._emissionsPadding);
+                    dos.WriteUnsignedByte((byte)this._systemDataLength);
+                    dos.WriteUnsignedByte((byte)this._numberOfBeams);
+                    dos.WriteUnsignedShort((ushort)this._emissionsPadding2);
+                    this._emitterSystem.Marshal(dos);
+                    this._location.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._beamDataLength);
+                    dos.WriteUnsignedByte((byte)this._beamIdNumber);
+                    dos.WriteUnsignedShort((ushort)this._beamParameterIndex);
+                    this._fundamentalParameterData.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._stateUpdateIndicator = dis.ReadUnsignedByte();
+                    this._numberOfSystems = dis.ReadUnsignedByte();
+                    this._emissionsPadding = dis.ReadUnsignedShort();
+                    this._systemDataLength = dis.ReadUnsignedByte();
+                    this._numberOfBeams = dis.ReadUnsignedByte();
+                    this._emissionsPadding2 = dis.ReadUnsignedShort();
+                    this._emitterSystem.Unmarshal(dis);
+                    this._location.Unmarshal(dis);
+                    this._beamDataLength = dis.ReadUnsignedByte();
+                    this._beamIdNumber = dis.ReadUnsignedByte();
+                    this._beamParameterIndex = dis.ReadUnsignedShort();
+                    this._fundamentalParameterData.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ElectronicEmmisionsPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<emittingEntityID>");
+                this._emittingEntityID.Reflection(sb);
+                sb.AppendLine("</emittingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<stateUpdateIndicator type=\"byte\">" + this._stateUpdateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateUpdateIndicator>");
+                sb.AppendLine("<numberOfSystems type=\"byte\">" + this._numberOfSystems.ToString(CultureInfo.InvariantCulture) + "</numberOfSystems>");
+                sb.AppendLine("<emissionsPadding type=\"ushort\">" + this._emissionsPadding.ToString(CultureInfo.InvariantCulture) + "</emissionsPadding>");
+                sb.AppendLine("<systemDataLength type=\"byte\">" + this._systemDataLength.ToString(CultureInfo.InvariantCulture) + "</systemDataLength>");
+                sb.AppendLine("<numberOfBeams type=\"byte\">" + this._numberOfBeams.ToString(CultureInfo.InvariantCulture) + "</numberOfBeams>");
+                sb.AppendLine("<emissionsPadding2 type=\"ushort\">" + this._emissionsPadding2.ToString(CultureInfo.InvariantCulture) + "</emissionsPadding2>");
+                sb.AppendLine("<emitterSystem>");
+                this._emitterSystem.Reflection(sb);
+                sb.AppendLine("</emitterSystem>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                sb.AppendLine("<beamDataLength type=\"byte\">" + this._beamDataLength.ToString(CultureInfo.InvariantCulture) + "</beamDataLength>");
+                sb.AppendLine("<beamIdNumber type=\"byte\">" + this._beamIdNumber.ToString(CultureInfo.InvariantCulture) + "</beamIdNumber>");
+                sb.AppendLine("<beamParameterIndex type=\"ushort\">" + this._beamParameterIndex.ToString(CultureInfo.InvariantCulture) + "</beamParameterIndex>");
+                sb.AppendLine("<fundamentalParameterData>");
+                this._fundamentalParameterData.Reflection(sb);
+                sb.AppendLine("</fundamentalParameterData>");
+                sb.AppendLine("</ElectronicEmmisionsPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ElectronicEmmisionsPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ElectronicEmmisionsPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateUpdateIndicator != obj._stateUpdateIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSystems != obj._numberOfSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emissionsPadding != obj._emissionsPadding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systemDataLength != obj._systemDataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfBeams != obj._numberOfBeams)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emissionsPadding2 != obj._emissionsPadding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._emitterSystem.Equals(obj._emitterSystem))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamDataLength != obj._beamDataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamIdNumber != obj._beamIdNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamParameterIndex != obj._beamParameterIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._fundamentalParameterData.Equals(obj._fundamentalParameterData))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._stateUpdateIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSystems.GetHashCode();
+            result = GenerateHash(result) ^ this._emissionsPadding.GetHashCode();
+            result = GenerateHash(result) ^ this._systemDataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
+            result = GenerateHash(result) ^ this._emissionsPadding2.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+            result = GenerateHash(result) ^ this._beamDataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._beamIdNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._beamParameterIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._fundamentalParameterData.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EmitterSystem.cs b/Libs/CsharpDis6/Dis1995/Generated/EmitterSystem.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EmitterSystem.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EmitterSystem.cs
index 10a96e4..8daf5f9 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EmitterSystem.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EmitterSystem.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.11. This field shall specify information about a particular emitter system
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EmitterSystem
-    {
-        /// <summary>
-        /// Name of the emitter, 16 bit enumeration
-        /// </summary>
-        private ushort _emitterName;
-
-        /// <summary>
-        /// function of the emitter, 8 bit enumeration
-        /// </summary>
-        private byte _function;
-
-        /// <summary>
-        /// emitter ID, 8 bit enumeration
-        /// </summary>
-        private byte _emitterIdNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmitterSystem"/> class.
-        /// </summary>
-        public EmitterSystem()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EmitterSystem left, EmitterSystem right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EmitterSystem left, EmitterSystem right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._emitterName
-            marshalSize += 1;  // this._function
-            marshalSize += 1;  // this._emitterIdNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Name of the emitter, 16 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "emitterName")]
-        public ushort EmitterName
-        {
-            get
-            {
-                return this._emitterName;
-            }
-
-            set
-            {
-                this._emitterName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the function of the emitter, 8 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "function")]
-        public byte Function
-        {
-            get
-            {
-                return this._function;
-            }
-
-            set
-            {
-                this._function = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the emitter ID, 8 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "emitterIdNumber")]
-        public byte EmitterIdNumber
-        {
-            get
-            {
-                return this._emitterIdNumber;
-            }
-
-            set
-            {
-                this._emitterIdNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._emitterName);
-                    dos.WriteUnsignedByte((byte)this._function);
-                    dos.WriteUnsignedByte((byte)this._emitterIdNumber);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._emitterName = dis.ReadUnsignedShort();
-                    this._function = dis.ReadUnsignedByte();
-                    this._emitterIdNumber = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EmitterSystem>");
-            try
-            {
-                sb.AppendLine("<emitterName type=\"ushort\">" + this._emitterName.ToString(CultureInfo.InvariantCulture) + "</emitterName>");
-                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
-                sb.AppendLine("<emitterIdNumber type=\"byte\">" + this._emitterIdNumber.ToString(CultureInfo.InvariantCulture) + "</emitterIdNumber>");
-                sb.AppendLine("</EmitterSystem>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EmitterSystem;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EmitterSystem obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._emitterName != obj._emitterName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._function != obj._function)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterIdNumber != obj._emitterIdNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._emitterName.GetHashCode();
-            result = GenerateHash(result) ^ this._function.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterIdNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.11. This field shall specify information about a particular emitter system
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EmitterSystem
+    {
+        /// <summary>
+        /// Name of the emitter, 16 bit enumeration
+        /// </summary>
+        private ushort _emitterName;
+
+        /// <summary>
+        /// function of the emitter, 8 bit enumeration
+        /// </summary>
+        private byte _function;
+
+        /// <summary>
+        /// emitter ID, 8 bit enumeration
+        /// </summary>
+        private byte _emitterIdNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmitterSystem"/> class.
+        /// </summary>
+        public EmitterSystem()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EmitterSystem left, EmitterSystem right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EmitterSystem left, EmitterSystem right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._emitterName
+            marshalSize += 1;  // this._function
+            marshalSize += 1;  // this._emitterIdNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Name of the emitter, 16 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "emitterName")]
+        public ushort EmitterName
+        {
+            get
+            {
+                return this._emitterName;
+            }
+
+            set
+            {
+                this._emitterName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the function of the emitter, 8 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "function")]
+        public byte Function
+        {
+            get
+            {
+                return this._function;
+            }
+
+            set
+            {
+                this._function = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the emitter ID, 8 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "emitterIdNumber")]
+        public byte EmitterIdNumber
+        {
+            get
+            {
+                return this._emitterIdNumber;
+            }
+
+            set
+            {
+                this._emitterIdNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._emitterName);
+                    dos.WriteUnsignedByte((byte)this._function);
+                    dos.WriteUnsignedByte((byte)this._emitterIdNumber);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._emitterName = dis.ReadUnsignedShort();
+                    this._function = dis.ReadUnsignedByte();
+                    this._emitterIdNumber = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EmitterSystem>");
+            try
+            {
+                sb.AppendLine("<emitterName type=\"ushort\">" + this._emitterName.ToString(CultureInfo.InvariantCulture) + "</emitterName>");
+                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
+                sb.AppendLine("<emitterIdNumber type=\"byte\">" + this._emitterIdNumber.ToString(CultureInfo.InvariantCulture) + "</emitterIdNumber>");
+                sb.AppendLine("</EmitterSystem>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EmitterSystem;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EmitterSystem obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._emitterName != obj._emitterName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._function != obj._function)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterIdNumber != obj._emitterIdNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._emitterName.GetHashCode();
+            result = GenerateHash(result) ^ this._function.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterIdNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityID.cs b/Libs/CsharpDis6/Dis1995/Generated/EntityID.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityID.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EntityID.cs
index 695f5ac..4d1a0af 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityID.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EntityID.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all  other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityID
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// the entity ID
-        /// </summary>
-        private ushort _entity;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityID"/> class.
-        /// </summary>
-        public EntityID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityID left, EntityID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityID left, EntityID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            marshalSize += 2;  // this._entity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
-        public ushort Entity
-        {
-            get
-            {
-                return this._entity;
-            }
-
-            set
-            {
-                this._entity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                    dos.WriteUnsignedShort((ushort)this._entity);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                    this._entity = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityID>");
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
-                sb.AppendLine("</EntityID>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entity != obj._entity)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-            result = GenerateHash(result) ^ this._entity.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all  other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityID
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// the entity ID
+        /// </summary>
+        private ushort _entity;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityID"/> class.
+        /// </summary>
+        public EntityID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityID left, EntityID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityID left, EntityID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            marshalSize += 2;  // this._entity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
+        public ushort Entity
+        {
+            get
+            {
+                return this._entity;
+            }
+
+            set
+            {
+                this._entity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                    dos.WriteUnsignedShort((ushort)this._entity);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                    this._entity = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityID>");
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
+                sb.AppendLine("</EntityID>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entity != obj._entity)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+            result = GenerateHash(result) ^ this._entity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityInformationPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/EntityInformationPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityInformationPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EntityInformationPdu.cs
index 45da503..49461c4 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityInformationPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EntityInformationPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.3. Common superclass for EntityState and Collision PDUs. This should be abstract.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityInformationPdu : Pdu, IEquatable<EntityInformationPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityInformationPdu"/> class.
-        /// </summary>
-        public EntityInformationPdu()
-        {
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityInformationPdu left, EntityInformationPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityInformationPdu left, EntityInformationPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityInformationPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</EntityInformationPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityInformationPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityInformationPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.3. Common superclass for EntityState and Collision PDUs. This should be abstract.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityInformationPdu : Pdu, IEquatable<EntityInformationPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityInformationPdu"/> class.
+        /// </summary>
+        public EntityInformationPdu()
+        {
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityInformationPdu left, EntityInformationPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityInformationPdu left, EntityInformationPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityInformationPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</EntityInformationPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityInformationPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityInformationPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityStatePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/EntityStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityStatePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EntityStatePdu.cs
index 19340ef..6efe3e8 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EntityStatePdu.cs
@@ -1,774 +1,774 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.3.1. Represents the postion and state of one entity in the world
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Orientation))]
-    [XmlInclude(typeof(DeadReckoningParameter))]
-    [XmlInclude(typeof(ArticulationParameter))]
-    public partial class EntityStatePdu : EntityInformationPdu, IEquatable<EntityStatePdu>
-    {
-        /// <summary>
-        /// Unique ID for an entity that is tied to this state information
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        private byte _forceId;
-
-        /// <summary>
-        /// How many articulation parameters are in the variable length list
-        /// </summary>
-        private byte _articulationParameterCount;
-
-        /// <summary>
-        /// Describes the type of entity in the world
-        /// </summary>
-        private EntityType _entityType = new EntityType();
-
-        private EntityType _alternativeEntityType = new EntityType();
-
-        /// <summary>
-        /// Describes the speed of the entity in the world
-        /// </summary>
-        private Vector3Float _entityLinearVelocity = new Vector3Float();
-
-        /// <summary>
-        /// describes the location of the entity in the world
-        /// </summary>
-        private Vector3Double _entityLocation = new Vector3Double();
-
-        /// <summary>
-        /// describes the orientation of the entity, in euler angles
-        /// </summary>
-        private Orientation _entityOrientation = new Orientation();
-
-        /// <summary>
-        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        private int _entityAppearance;
-
-        /// <summary>
-        /// parameters used for dead reckoning
-        /// </summary>
-        private DeadReckoningParameter _deadReckoningParameters = new DeadReckoningParameter();
-
-        /// <summary>
-        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        private byte[] _marking = new byte[12];
-
-        /// <summary>
-        /// a series of bit flags
-        /// </summary>
-        private int _capabilities;
-
-        /// <summary>
-        /// variable length list of articulation parameters
-        /// </summary>
-        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityStatePdu"/> class.
-        /// </summary>
-        public EntityStatePdu()
-        {
-            PduType = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityStatePdu left, EntityStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityStatePdu left, EntityStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 1;  // this._forceId
-            marshalSize += 1;  // this._articulationParameterCount
-            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
-            marshalSize += this._alternativeEntityType.GetMarshalledSize();  // this._alternativeEntityType
-            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
-            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
-            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
-            marshalSize += 4;  // this._entityAppearance
-            marshalSize += this._deadReckoningParameters.GetMarshalledSize();  // this._deadReckoningParameters
-            marshalSize += 12 * 1;  // _marking
-            marshalSize += 4;  // this._capabilities
-            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-            {
-                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Unique ID for an entity that is tied to this state information
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the forceId
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
-        public byte ForceId
-        {
-            get
-            {
-                return this._forceId;
-            }
-
-            set
-            {
-                this._forceId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many articulation parameters are in the variable length list
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getarticulationParameterCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "articulationParameterCount")]
-        public byte ArticulationParameterCount
-        {
-            get
-            {
-                return this._articulationParameterCount;
-            }
-
-            set
-            {
-                this._articulationParameterCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the type of entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
-        public EntityType EntityType
-        {
-            get
-            {
-                return this._entityType;
-            }
-
-            set
-            {
-                this._entityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the alternativeEntityType
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "alternativeEntityType")]
-        public EntityType AlternativeEntityType
-        {
-            get
-            {
-                return this._alternativeEntityType;
-            }
-
-            set
-            {
-                this._alternativeEntityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the speed of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
-        public Vector3Float EntityLinearVelocity
-        {
-            get
-            {
-                return this._entityLinearVelocity;
-            }
-
-            set
-            {
-                this._entityLinearVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the location of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
-        public Vector3Double EntityLocation
-        {
-            get
-            {
-                return this._entityLocation;
-            }
-
-            set
-            {
-                this._entityLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the orientation of the entity, in euler angles
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "entityOrientation")]
-        public Orientation EntityOrientation
-        {
-            get
-            {
-                return this._entityOrientation;
-            }
-
-            set
-            {
-                this._entityOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
-        public int EntityAppearance
-        {
-            get
-            {
-                return this._entityAppearance;
-            }
-
-            set
-            {
-                this._entityAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameters used for dead reckoning
-        /// </summary>
-        [XmlElement(Type = typeof(DeadReckoningParameter), ElementName = "deadReckoningParameters")]
-        public DeadReckoningParameter DeadReckoningParameters
-        {
-            get
-            {
-                return this._deadReckoningParameters;
-            }
-
-            set
-            {
-                this._deadReckoningParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        [XmlArray(ElementName = "marking")]
-        public byte[] Marking
-        {
-            get
-            {
-                return this._marking;
-            }
-
-            set
-            {
-                this._marking = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
-        public int Capabilities
-        {
-            get
-            {
-                return this._capabilities;
-            }
-
-            set
-            {
-                this._capabilities = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of articulation parameters
-        /// </summary>
-        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
-        public List<ArticulationParameter> ArticulationParameters
-        {
-            get
-            {
-                return this._articulationParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._forceId);
-                    dos.WriteByte((byte)this._articulationParameters.Count);
-                    this._entityType.Marshal(dos);
-                    this._alternativeEntityType.Marshal(dos);
-                    this._entityLinearVelocity.Marshal(dos);
-                    this._entityLocation.Marshal(dos);
-                    this._entityOrientation.Marshal(dos);
-                    dos.WriteInt((int)this._entityAppearance);
-                    this._deadReckoningParameters.Marshal(dos);
-
-                    for (int idx = 0; idx < this._marking.Length; idx++)
-                    {
-                        dos.WriteByte(this._marking[idx]);
-                    }
-
-                    dos.WriteInt((int)this._capabilities);
-
-                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                    {
-                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                        aArticulationParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._forceId = dis.ReadUnsignedByte();
-                    this._articulationParameterCount = dis.ReadByte();
-                    this._entityType.Unmarshal(dis);
-                    this._alternativeEntityType.Unmarshal(dis);
-                    this._entityLinearVelocity.Unmarshal(dis);
-                    this._entityLocation.Unmarshal(dis);
-                    this._entityOrientation.Unmarshal(dis);
-                    this._entityAppearance = dis.ReadInt();
-                    this._deadReckoningParameters.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this._marking.Length; idx++)
-                    {
-                        this._marking[idx] = dis.ReadByte();
-                    }
-
-                    this._capabilities = dis.ReadInt();
-
-                    for (int idx = 0; idx < this.ArticulationParameterCount; idx++)
-                    {
-                        ArticulationParameter anX = new ArticulationParameter();
-                        anX.Unmarshal(dis);
-                        this._articulationParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
-                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
-                sb.AppendLine("<entityType>");
-                this._entityType.Reflection(sb);
-                sb.AppendLine("</entityType>");
-                sb.AppendLine("<alternativeEntityType>");
-                this._alternativeEntityType.Reflection(sb);
-                sb.AppendLine("</alternativeEntityType>");
-                sb.AppendLine("<entityLinearVelocity>");
-                this._entityLinearVelocity.Reflection(sb);
-                sb.AppendLine("</entityLinearVelocity>");
-                sb.AppendLine("<entityLocation>");
-                this._entityLocation.Reflection(sb);
-                sb.AppendLine("</entityLocation>");
-                sb.AppendLine("<entityOrientation>");
-                this._entityOrientation.Reflection(sb);
-                sb.AppendLine("</entityOrientation>");
-                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
-                sb.AppendLine("<deadReckoningParameters>");
-                this._deadReckoningParameters.Reflection(sb);
-                sb.AppendLine("</deadReckoningParameters>");
-                for (int idx = 0; idx < this._marking.Length; idx++)
-                {
-                    sb.AppendLine("<marking" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._marking[idx] + "</marking" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
-                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                    aArticulationParameter.Reflection(sb);
-                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EntityStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceId != obj._forceId)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._articulationParameterCount != obj._articulationParameterCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityType.Equals(obj._entityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._alternativeEntityType.Equals(obj._alternativeEntityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLocation.Equals(obj._entityLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityOrientation.Equals(obj._entityOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityAppearance != obj._entityAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._deadReckoningParameters.Equals(obj._deadReckoningParameters))
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._marking.Length != 12) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 12; idx++)
-                {
-                    if (this._marking[idx] != obj._marking[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._capabilities != obj._capabilities)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._articulationParameters.Count != obj._articulationParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._forceId.GetHashCode();
-            result = GenerateHash(result) ^ this._articulationParameterCount.GetHashCode();
-            result = GenerateHash(result) ^ this._entityType.GetHashCode();
-            result = GenerateHash(result) ^ this._alternativeEntityType.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningParameters.GetHashCode();
-
-            for (int idx = 0; idx < 12; idx++)
-            {
-                result = GenerateHash(result) ^ this._marking[idx].GetHashCode();
-            }
-
-            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
-
-            if (this._articulationParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.3.1. Represents the postion and state of one entity in the world
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Orientation))]
+    [XmlInclude(typeof(DeadReckoningParameter))]
+    [XmlInclude(typeof(ArticulationParameter))]
+    public partial class EntityStatePdu : EntityInformationPdu, IEquatable<EntityStatePdu>
+    {
+        /// <summary>
+        /// Unique ID for an entity that is tied to this state information
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        private byte _forceId;
+
+        /// <summary>
+        /// How many articulation parameters are in the variable length list
+        /// </summary>
+        private byte _articulationParameterCount;
+
+        /// <summary>
+        /// Describes the type of entity in the world
+        /// </summary>
+        private EntityType _entityType = new EntityType();
+
+        private EntityType _alternativeEntityType = new EntityType();
+
+        /// <summary>
+        /// Describes the speed of the entity in the world
+        /// </summary>
+        private Vector3Float _entityLinearVelocity = new Vector3Float();
+
+        /// <summary>
+        /// describes the location of the entity in the world
+        /// </summary>
+        private Vector3Double _entityLocation = new Vector3Double();
+
+        /// <summary>
+        /// describes the orientation of the entity, in euler angles
+        /// </summary>
+        private Orientation _entityOrientation = new Orientation();
+
+        /// <summary>
+        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        private int _entityAppearance;
+
+        /// <summary>
+        /// parameters used for dead reckoning
+        /// </summary>
+        private DeadReckoningParameter _deadReckoningParameters = new DeadReckoningParameter();
+
+        /// <summary>
+        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        private byte[] _marking = new byte[12];
+
+        /// <summary>
+        /// a series of bit flags
+        /// </summary>
+        private int _capabilities;
+
+        /// <summary>
+        /// variable length list of articulation parameters
+        /// </summary>
+        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityStatePdu"/> class.
+        /// </summary>
+        public EntityStatePdu()
+        {
+            PduType = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityStatePdu left, EntityStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityStatePdu left, EntityStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 1;  // this._forceId
+            marshalSize += 1;  // this._articulationParameterCount
+            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
+            marshalSize += this._alternativeEntityType.GetMarshalledSize();  // this._alternativeEntityType
+            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
+            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
+            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
+            marshalSize += 4;  // this._entityAppearance
+            marshalSize += this._deadReckoningParameters.GetMarshalledSize();  // this._deadReckoningParameters
+            marshalSize += 12 * 1;  // _marking
+            marshalSize += 4;  // this._capabilities
+            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+            {
+                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Unique ID for an entity that is tied to this state information
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the forceId
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
+        public byte ForceId
+        {
+            get
+            {
+                return this._forceId;
+            }
+
+            set
+            {
+                this._forceId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many articulation parameters are in the variable length list
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getarticulationParameterCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "articulationParameterCount")]
+        public byte ArticulationParameterCount
+        {
+            get
+            {
+                return this._articulationParameterCount;
+            }
+
+            set
+            {
+                this._articulationParameterCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the type of entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
+        public EntityType EntityType
+        {
+            get
+            {
+                return this._entityType;
+            }
+
+            set
+            {
+                this._entityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the alternativeEntityType
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "alternativeEntityType")]
+        public EntityType AlternativeEntityType
+        {
+            get
+            {
+                return this._alternativeEntityType;
+            }
+
+            set
+            {
+                this._alternativeEntityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the speed of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
+        public Vector3Float EntityLinearVelocity
+        {
+            get
+            {
+                return this._entityLinearVelocity;
+            }
+
+            set
+            {
+                this._entityLinearVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the location of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
+        public Vector3Double EntityLocation
+        {
+            get
+            {
+                return this._entityLocation;
+            }
+
+            set
+            {
+                this._entityLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the orientation of the entity, in euler angles
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "entityOrientation")]
+        public Orientation EntityOrientation
+        {
+            get
+            {
+                return this._entityOrientation;
+            }
+
+            set
+            {
+                this._entityOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
+        public int EntityAppearance
+        {
+            get
+            {
+                return this._entityAppearance;
+            }
+
+            set
+            {
+                this._entityAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameters used for dead reckoning
+        /// </summary>
+        [XmlElement(Type = typeof(DeadReckoningParameter), ElementName = "deadReckoningParameters")]
+        public DeadReckoningParameter DeadReckoningParameters
+        {
+            get
+            {
+                return this._deadReckoningParameters;
+            }
+
+            set
+            {
+                this._deadReckoningParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        [XmlArray(ElementName = "marking")]
+        public byte[] Marking
+        {
+            get
+            {
+                return this._marking;
+            }
+
+            set
+            {
+                this._marking = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
+        public int Capabilities
+        {
+            get
+            {
+                return this._capabilities;
+            }
+
+            set
+            {
+                this._capabilities = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of articulation parameters
+        /// </summary>
+        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
+        public List<ArticulationParameter> ArticulationParameters
+        {
+            get
+            {
+                return this._articulationParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._forceId);
+                    dos.WriteByte((byte)this._articulationParameters.Count);
+                    this._entityType.Marshal(dos);
+                    this._alternativeEntityType.Marshal(dos);
+                    this._entityLinearVelocity.Marshal(dos);
+                    this._entityLocation.Marshal(dos);
+                    this._entityOrientation.Marshal(dos);
+                    dos.WriteInt((int)this._entityAppearance);
+                    this._deadReckoningParameters.Marshal(dos);
+
+                    for (int idx = 0; idx < this._marking.Length; idx++)
+                    {
+                        dos.WriteByte(this._marking[idx]);
+                    }
+
+                    dos.WriteInt((int)this._capabilities);
+
+                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                    {
+                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                        aArticulationParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._forceId = dis.ReadUnsignedByte();
+                    this._articulationParameterCount = dis.ReadByte();
+                    this._entityType.Unmarshal(dis);
+                    this._alternativeEntityType.Unmarshal(dis);
+                    this._entityLinearVelocity.Unmarshal(dis);
+                    this._entityLocation.Unmarshal(dis);
+                    this._entityOrientation.Unmarshal(dis);
+                    this._entityAppearance = dis.ReadInt();
+                    this._deadReckoningParameters.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this._marking.Length; idx++)
+                    {
+                        this._marking[idx] = dis.ReadByte();
+                    }
+
+                    this._capabilities = dis.ReadInt();
+
+                    for (int idx = 0; idx < this.ArticulationParameterCount; idx++)
+                    {
+                        ArticulationParameter anX = new ArticulationParameter();
+                        anX.Unmarshal(dis);
+                        this._articulationParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
+                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
+                sb.AppendLine("<entityType>");
+                this._entityType.Reflection(sb);
+                sb.AppendLine("</entityType>");
+                sb.AppendLine("<alternativeEntityType>");
+                this._alternativeEntityType.Reflection(sb);
+                sb.AppendLine("</alternativeEntityType>");
+                sb.AppendLine("<entityLinearVelocity>");
+                this._entityLinearVelocity.Reflection(sb);
+                sb.AppendLine("</entityLinearVelocity>");
+                sb.AppendLine("<entityLocation>");
+                this._entityLocation.Reflection(sb);
+                sb.AppendLine("</entityLocation>");
+                sb.AppendLine("<entityOrientation>");
+                this._entityOrientation.Reflection(sb);
+                sb.AppendLine("</entityOrientation>");
+                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
+                sb.AppendLine("<deadReckoningParameters>");
+                this._deadReckoningParameters.Reflection(sb);
+                sb.AppendLine("</deadReckoningParameters>");
+                for (int idx = 0; idx < this._marking.Length; idx++)
+                {
+                    sb.AppendLine("<marking" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._marking[idx] + "</marking" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
+                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                    aArticulationParameter.Reflection(sb);
+                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EntityStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceId != obj._forceId)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._articulationParameterCount != obj._articulationParameterCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityType.Equals(obj._entityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._alternativeEntityType.Equals(obj._alternativeEntityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLocation.Equals(obj._entityLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityOrientation.Equals(obj._entityOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityAppearance != obj._entityAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._deadReckoningParameters.Equals(obj._deadReckoningParameters))
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._marking.Length != 12) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 12; idx++)
+                {
+                    if (this._marking[idx] != obj._marking[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._capabilities != obj._capabilities)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._articulationParameters.Count != obj._articulationParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._forceId.GetHashCode();
+            result = GenerateHash(result) ^ this._articulationParameterCount.GetHashCode();
+            result = GenerateHash(result) ^ this._entityType.GetHashCode();
+            result = GenerateHash(result) ^ this._alternativeEntityType.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningParameters.GetHashCode();
+
+            for (int idx = 0; idx < 12; idx++)
+            {
+                result = GenerateHash(result) ^ this._marking[idx].GetHashCode();
+            }
+
+            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
+
+            if (this._articulationParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityType.cs b/Libs/CsharpDis6/Dis1995/Generated/EntityType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityType.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EntityType.cs
index ed3094a..fdc937b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EntityType.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EntityType.cs
@@ -1,489 +1,489 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.16. Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityType"/> class.
-        /// </summary>
-        public EntityType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityType left, EntityType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityType left, EntityType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the extra
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("</EntityType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.16. Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityType"/> class.
+        /// </summary>
+        public EntityType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityType left, EntityType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityType left, EntityType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the extra
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("</EntityType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventID.cs b/Libs/CsharpDis6/Dis1995/Generated/EventID.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventID.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EventID.cs
index 6a91db4..b20d071 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventID.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EventID.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.18. Identifies a unique event in a simulation via the combination of three values
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EventID
-    {
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// the number of the event
-        /// </summary>
-        private ushort _eventNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventID"/> class.
-        /// </summary>
-        public EventID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventID left, EventID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventID left, EventID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._application
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._eventNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the number of the event
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
-        public ushort EventNumber
-        {
-            get
-            {
-                return this._eventNumber;
-            }
-
-            set
-            {
-                this._eventNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._application);
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._eventNumber);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._application = dis.ReadUnsignedShort();
-                    this._site = dis.ReadUnsignedShort();
-                    this._eventNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventID>");
-            try
-            {
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
-                sb.AppendLine("</EventID>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._eventNumber != obj._eventNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.18. Identifies a unique event in a simulation via the combination of three values
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EventID
+    {
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// the number of the event
+        /// </summary>
+        private ushort _eventNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventID"/> class.
+        /// </summary>
+        public EventID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventID left, EventID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventID left, EventID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._application
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._eventNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the number of the event
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
+        public ushort EventNumber
+        {
+            get
+            {
+                return this._eventNumber;
+            }
+
+            set
+            {
+                this._eventNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._application);
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._eventNumber);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._application = dis.ReadUnsignedShort();
+                    this._site = dis.ReadUnsignedShort();
+                    this._eventNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventID>");
+            try
+            {
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
+                sb.AppendLine("</EventID>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._eventNumber != obj._eventNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventReportPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/EventReportPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventReportPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/EventReportPdu.cs
index ea9df59..5cddc46 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/EventReportPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/EventReportPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.11. Reports occurance of a significant event to the simulation manager
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class EventReportPdu : SimulationManagementPdu, IEquatable<EventReportPdu>
-    {
-        /// <summary>
-        /// Type of event
-        /// </summary>
-        private uint _eventType;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _fixedDatumRecordCount;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _variableDatumRecordCount;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventReportPdu"/> class.
-        /// </summary>
-        public EventReportPdu()
-        {
-            PduType = (byte)21;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventReportPdu left, EventReportPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventReportPdu left, EventReportPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._eventType
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._fixedDatumRecordCount
-            marshalSize += 4;  // this._variableDatumRecordCount
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of event
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "eventType")]
-        public uint EventType
-        {
-            get
-            {
-                return this._eventType;
-            }
-
-            set
-            {
-                this._eventType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
-        public uint FixedDatumRecordCount
-        {
-            get
-            {
-                return this._fixedDatumRecordCount;
-            }
-
-            set
-            {
-                this._fixedDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
-        public uint VariableDatumRecordCount
-        {
-            get
-            {
-                return this._variableDatumRecordCount;
-            }
-
-            set
-            {
-                this._variableDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._eventType);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._eventType = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
-                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventReportPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<eventType type=\"uint\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EventReportPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventReportPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventReportPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._eventType != obj._eventType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._eventType.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.11. Reports occurance of a significant event to the simulation manager
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class EventReportPdu : SimulationManagementPdu, IEquatable<EventReportPdu>
+    {
+        /// <summary>
+        /// Type of event
+        /// </summary>
+        private uint _eventType;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _fixedDatumRecordCount;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _variableDatumRecordCount;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventReportPdu"/> class.
+        /// </summary>
+        public EventReportPdu()
+        {
+            PduType = (byte)21;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventReportPdu left, EventReportPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventReportPdu left, EventReportPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._eventType
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._fixedDatumRecordCount
+            marshalSize += 4;  // this._variableDatumRecordCount
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of event
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "eventType")]
+        public uint EventType
+        {
+            get
+            {
+                return this._eventType;
+            }
+
+            set
+            {
+                this._eventType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
+        public uint FixedDatumRecordCount
+        {
+            get
+            {
+                return this._fixedDatumRecordCount;
+            }
+
+            set
+            {
+                this._fixedDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
+        public uint VariableDatumRecordCount
+        {
+            get
+            {
+                return this._variableDatumRecordCount;
+            }
+
+            set
+            {
+                this._variableDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._eventType);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._eventType = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
+                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventReportPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<eventType type=\"uint\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EventReportPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventReportPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventReportPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._eventType != obj._eventType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._eventType.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FirePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/FirePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/FirePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/FirePdu.cs
index 52472c1..e29c7b2 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FirePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/FirePdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Sectioin 5.3.4.1. Information about someone firing something
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(BurstDescriptor))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class FirePdu : Warfare, IEquatable<FirePdu>
-    {
-        /// <summary>
-        /// ID of the munition that is being shot
-        /// </summary>
-        private EntityID _munitionID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        private int _fireMissionIndex;
-
-        /// <summary>
-        /// location of the firing event
-        /// </summary>
-        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
-
-        /// <summary>
-        /// Describes munitions used in the firing event
-        /// </summary>
-        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
-
-        /// <summary>
-        /// Velocity of the ammunition
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// range to the target
-        /// </summary>
-        private float _range;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FirePdu"/> class.
-        /// </summary>
-        public FirePdu()
-        {
-            PduType = (byte)2;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FirePdu left, FirePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FirePdu left, FirePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 4;  // this._fireMissionIndex
-            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
-            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += 4;  // this._range
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the munition that is being shot
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
-        public EntityID MunitionID
-        {
-            get
-            {
-                return this._munitionID;
-            }
-
-            set
-            {
-                this._munitionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the fireMissionIndex
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "fireMissionIndex")]
-        public int FireMissionIndex
-        {
-            get
-            {
-                return this._fireMissionIndex;
-            }
-
-            set
-            {
-                this._fireMissionIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of the firing event
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
-        public Vector3Double LocationInWorldCoordinates
-        {
-            get
-            {
-                return this._locationInWorldCoordinates;
-            }
-
-            set
-            {
-                this._locationInWorldCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes munitions used in the firing event
-        /// </summary>
-        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
-        public BurstDescriptor BurstDescriptor
-        {
-            get
-            {
-                return this._burstDescriptor;
-            }
-
-            set
-            {
-                this._burstDescriptor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Velocity of the ammunition
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the range to the target
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "range")]
-        public float Range
-        {
-            get
-            {
-                return this._range;
-            }
-
-            set
-            {
-                this._range = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteInt((int)this._fireMissionIndex);
-                    this._locationInWorldCoordinates.Marshal(dos);
-                    this._burstDescriptor.Marshal(dos);
-                    this._velocity.Marshal(dos);
-                    dos.WriteFloat((float)this._range);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._fireMissionIndex = dis.ReadInt();
-                    this._locationInWorldCoordinates.Unmarshal(dis);
-                    this._burstDescriptor.Unmarshal(dis);
-                    this._velocity.Unmarshal(dis);
-                    this._range = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FirePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<munitionID>");
-                this._munitionID.Reflection(sb);
-                sb.AppendLine("</munitionID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<fireMissionIndex type=\"int\">" + this._fireMissionIndex.ToString(CultureInfo.InvariantCulture) + "</fireMissionIndex>");
-                sb.AppendLine("<locationInWorldCoordinates>");
-                this._locationInWorldCoordinates.Reflection(sb);
-                sb.AppendLine("</locationInWorldCoordinates>");
-                sb.AppendLine("<burstDescriptor>");
-                this._burstDescriptor.Reflection(sb);
-                sb.AppendLine("</burstDescriptor>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<range type=\"float\">" + this._range.ToString(CultureInfo.InvariantCulture) + "</range>");
-                sb.AppendLine("</FirePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FirePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FirePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._munitionID.Equals(obj._munitionID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fireMissionIndex != obj._fireMissionIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._range != obj._range)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._fireMissionIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._range.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Sectioin 5.3.4.1. Information about someone firing something
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(BurstDescriptor))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class FirePdu : Warfare, IEquatable<FirePdu>
+    {
+        /// <summary>
+        /// ID of the munition that is being shot
+        /// </summary>
+        private EntityID _munitionID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        private int _fireMissionIndex;
+
+        /// <summary>
+        /// location of the firing event
+        /// </summary>
+        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
+
+        /// <summary>
+        /// Describes munitions used in the firing event
+        /// </summary>
+        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
+
+        /// <summary>
+        /// Velocity of the ammunition
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// range to the target
+        /// </summary>
+        private float _range;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FirePdu"/> class.
+        /// </summary>
+        public FirePdu()
+        {
+            PduType = (byte)2;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FirePdu left, FirePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FirePdu left, FirePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 4;  // this._fireMissionIndex
+            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
+            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += 4;  // this._range
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the munition that is being shot
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
+        public EntityID MunitionID
+        {
+            get
+            {
+                return this._munitionID;
+            }
+
+            set
+            {
+                this._munitionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the fireMissionIndex
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "fireMissionIndex")]
+        public int FireMissionIndex
+        {
+            get
+            {
+                return this._fireMissionIndex;
+            }
+
+            set
+            {
+                this._fireMissionIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of the firing event
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
+        public Vector3Double LocationInWorldCoordinates
+        {
+            get
+            {
+                return this._locationInWorldCoordinates;
+            }
+
+            set
+            {
+                this._locationInWorldCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes munitions used in the firing event
+        /// </summary>
+        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
+        public BurstDescriptor BurstDescriptor
+        {
+            get
+            {
+                return this._burstDescriptor;
+            }
+
+            set
+            {
+                this._burstDescriptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Velocity of the ammunition
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the range to the target
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "range")]
+        public float Range
+        {
+            get
+            {
+                return this._range;
+            }
+
+            set
+            {
+                this._range = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteInt((int)this._fireMissionIndex);
+                    this._locationInWorldCoordinates.Marshal(dos);
+                    this._burstDescriptor.Marshal(dos);
+                    this._velocity.Marshal(dos);
+                    dos.WriteFloat((float)this._range);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._fireMissionIndex = dis.ReadInt();
+                    this._locationInWorldCoordinates.Unmarshal(dis);
+                    this._burstDescriptor.Unmarshal(dis);
+                    this._velocity.Unmarshal(dis);
+                    this._range = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FirePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<munitionID>");
+                this._munitionID.Reflection(sb);
+                sb.AppendLine("</munitionID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<fireMissionIndex type=\"int\">" + this._fireMissionIndex.ToString(CultureInfo.InvariantCulture) + "</fireMissionIndex>");
+                sb.AppendLine("<locationInWorldCoordinates>");
+                this._locationInWorldCoordinates.Reflection(sb);
+                sb.AppendLine("</locationInWorldCoordinates>");
+                sb.AppendLine("<burstDescriptor>");
+                this._burstDescriptor.Reflection(sb);
+                sb.AppendLine("</burstDescriptor>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<range type=\"float\">" + this._range.ToString(CultureInfo.InvariantCulture) + "</range>");
+                sb.AppendLine("</FirePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FirePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FirePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._munitionID.Equals(obj._munitionID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fireMissionIndex != obj._fireMissionIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._range != obj._range)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._fireMissionIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._range.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FixedDatum.cs b/Libs/CsharpDis6/Dis1995/Generated/FixedDatum.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/FixedDatum.cs
rename to Libs/CsharpDis6/Dis1995/Generated/FixedDatum.cs
index 2622206..4246664 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FixedDatum.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/FixedDatum.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.18. Fixed Datum Record
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FixedDatum
-    {
-        /// <summary>
-        /// ID of the fixed datum
-        /// </summary>
-        private uint _fixedDatumID;
-
-        /// <summary>
-        /// Value for the fixed datum
-        /// </summary>
-        private uint _fixedDatumValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FixedDatum"/> class.
-        /// </summary>
-        public FixedDatum()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FixedDatum left, FixedDatum right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FixedDatum left, FixedDatum right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._fixedDatumID
-            marshalSize += 4;  // this._fixedDatumValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the fixed datum
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumID")]
-        public uint FixedDatumID
-        {
-            get
-            {
-                return this._fixedDatumID;
-            }
-
-            set
-            {
-                this._fixedDatumID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Value for the fixed datum
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumValue")]
-        public uint FixedDatumValue
-        {
-            get
-            {
-                return this._fixedDatumValue;
-            }
-
-            set
-            {
-                this._fixedDatumValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatumID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumValue);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._fixedDatumID = dis.ReadUnsignedInt();
-                    this._fixedDatumValue = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FixedDatum>");
-            try
-            {
-                sb.AppendLine("<fixedDatumID type=\"uint\">" + this._fixedDatumID.ToString(CultureInfo.InvariantCulture) + "</fixedDatumID>");
-                sb.AppendLine("<fixedDatumValue type=\"uint\">" + this._fixedDatumValue.ToString(CultureInfo.InvariantCulture) + "</fixedDatumValue>");
-                sb.AppendLine("</FixedDatum>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FixedDatum;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FixedDatum obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._fixedDatumID != obj._fixedDatumID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumValue != obj._fixedDatumValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._fixedDatumID.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.18. Fixed Datum Record
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FixedDatum
+    {
+        /// <summary>
+        /// ID of the fixed datum
+        /// </summary>
+        private uint _fixedDatumID;
+
+        /// <summary>
+        /// Value for the fixed datum
+        /// </summary>
+        private uint _fixedDatumValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FixedDatum"/> class.
+        /// </summary>
+        public FixedDatum()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FixedDatum left, FixedDatum right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FixedDatum left, FixedDatum right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._fixedDatumID
+            marshalSize += 4;  // this._fixedDatumValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the fixed datum
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumID")]
+        public uint FixedDatumID
+        {
+            get
+            {
+                return this._fixedDatumID;
+            }
+
+            set
+            {
+                this._fixedDatumID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Value for the fixed datum
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumValue")]
+        public uint FixedDatumValue
+        {
+            get
+            {
+                return this._fixedDatumValue;
+            }
+
+            set
+            {
+                this._fixedDatumValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatumID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumValue);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._fixedDatumID = dis.ReadUnsignedInt();
+                    this._fixedDatumValue = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FixedDatum>");
+            try
+            {
+                sb.AppendLine("<fixedDatumID type=\"uint\">" + this._fixedDatumID.ToString(CultureInfo.InvariantCulture) + "</fixedDatumID>");
+                sb.AppendLine("<fixedDatumValue type=\"uint\">" + this._fixedDatumValue.ToString(CultureInfo.InvariantCulture) + "</fixedDatumValue>");
+                sb.AppendLine("</FixedDatum>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FixedDatum;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FixedDatum obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._fixedDatumID != obj._fixedDatumID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumValue != obj._fixedDatumValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._fixedDatumID.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FundamentalParameterData.cs b/Libs/CsharpDis6/Dis1995/Generated/FundamentalParameterData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/FundamentalParameterData.cs
rename to Libs/CsharpDis6/Dis1995/Generated/FundamentalParameterData.cs
index 73eb03c..a893a74 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/FundamentalParameterData.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/FundamentalParameterData.cs
@@ -1,588 +1,588 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.22. Contains electromagnetic emmision regineratin parameters that are        variable throughout a scenario dependent on the actions of the participants in the simulation. Also provides basic parametric data that may be used to support low-fidelity simulations.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FundamentalParameterData
-    {
-        /// <summary>
-        /// center frequency of the emission in hertz.
-        /// </summary>
-        private float _frequency;
-
-        /// <summary>
-        /// Bandwidth of the frequencies corresponding to the fequency field.
-        /// </summary>
-        private float _frequencyRange;
-
-        /// <summary>
-        /// Effective radiated power for the emission in DdBm. For a      radar noise jammer, indicates the peak of the transmitted power.
-        /// </summary>
-        private float _effectiveRadiatedPower;
-
-        /// <summary>
-        /// Average repetition frequency of the emission in hertz.
-        /// </summary>
-        private float _pulseRepetitionFrequency;
-
-        /// <summary>
-        /// Average pulse width  of the emission in microseconds.
-        /// </summary>
-        private float _pusleWidth;
-
-        /// <summary>
-        /// Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
-        /// </summary>
-        private float _beamAzimuthCenter;
-
-        /// <summary>
-        /// Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        private float _beamAzimuthSweep;
-
-        /// <summary>
-        /// Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        private float _beamElevationCenter;
-
-        /// <summary>
-        /// Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        private float _beamElevationSweep;
-
-        /// <summary>
-        /// allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        private float _beamSweepSync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FundamentalParameterData"/> class.
-        /// </summary>
-        public FundamentalParameterData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FundamentalParameterData left, FundamentalParameterData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FundamentalParameterData left, FundamentalParameterData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._frequency
-            marshalSize += 4;  // this._frequencyRange
-            marshalSize += 4;  // this._effectiveRadiatedPower
-            marshalSize += 4;  // this._pulseRepetitionFrequency
-            marshalSize += 4;  // this._pusleWidth
-            marshalSize += 4;  // this._beamAzimuthCenter
-            marshalSize += 4;  // this._beamAzimuthSweep
-            marshalSize += 4;  // this._beamElevationCenter
-            marshalSize += 4;  // this._beamElevationSweep
-            marshalSize += 4;  // this._beamSweepSync
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the center frequency of the emission in hertz.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequency")]
-        public float Frequency
-        {
-            get
-            {
-                return this._frequency;
-            }
-
-            set
-            {
-                this._frequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Bandwidth of the frequencies corresponding to the fequency field.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequencyRange")]
-        public float FrequencyRange
-        {
-            get
-            {
-                return this._frequencyRange;
-            }
-
-            set
-            {
-                this._frequencyRange = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Effective radiated power for the emission in DdBm. For a      radar noise jammer, indicates the peak of the transmitted power.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "effectiveRadiatedPower")]
-        public float EffectiveRadiatedPower
-        {
-            get
-            {
-                return this._effectiveRadiatedPower;
-            }
-
-            set
-            {
-                this._effectiveRadiatedPower = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Average repetition frequency of the emission in hertz.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
-        public float PulseRepetitionFrequency
-        {
-            get
-            {
-                return this._pulseRepetitionFrequency;
-            }
-
-            set
-            {
-                this._pulseRepetitionFrequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Average pulse width  of the emission in microseconds.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pusleWidth")]
-        public float PusleWidth
-        {
-            get
-            {
-                return this._pusleWidth;
-            }
-
-            set
-            {
-                this._pusleWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
-        public float BeamAzimuthCenter
-        {
-            get
-            {
-                return this._beamAzimuthCenter;
-            }
-
-            set
-            {
-                this._beamAzimuthCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
-        public float BeamAzimuthSweep
-        {
-            get
-            {
-                return this._beamAzimuthSweep;
-            }
-
-            set
-            {
-                this._beamAzimuthSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
-        public float BeamElevationCenter
-        {
-            get
-            {
-                return this._beamElevationCenter;
-            }
-
-            set
-            {
-                this._beamElevationCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
-        public float BeamElevationSweep
-        {
-            get
-            {
-                return this._beamElevationSweep;
-            }
-
-            set
-            {
-                this._beamElevationSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
-        public float BeamSweepSync
-        {
-            get
-            {
-                return this._beamSweepSync;
-            }
-
-            set
-            {
-                this._beamSweepSync = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._frequency);
-                    dos.WriteFloat((float)this._frequencyRange);
-                    dos.WriteFloat((float)this._effectiveRadiatedPower);
-                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
-                    dos.WriteFloat((float)this._pusleWidth);
-                    dos.WriteFloat((float)this._beamAzimuthCenter);
-                    dos.WriteFloat((float)this._beamAzimuthSweep);
-                    dos.WriteFloat((float)this._beamElevationCenter);
-                    dos.WriteFloat((float)this._beamElevationSweep);
-                    dos.WriteFloat((float)this._beamSweepSync);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._frequency = dis.ReadFloat();
-                    this._frequencyRange = dis.ReadFloat();
-                    this._effectiveRadiatedPower = dis.ReadFloat();
-                    this._pulseRepetitionFrequency = dis.ReadFloat();
-                    this._pusleWidth = dis.ReadFloat();
-                    this._beamAzimuthCenter = dis.ReadFloat();
-                    this._beamAzimuthSweep = dis.ReadFloat();
-                    this._beamElevationCenter = dis.ReadFloat();
-                    this._beamElevationSweep = dis.ReadFloat();
-                    this._beamSweepSync = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FundamentalParameterData>");
-            try
-            {
-                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
-                sb.AppendLine("<frequencyRange type=\"float\">" + this._frequencyRange.ToString(CultureInfo.InvariantCulture) + "</frequencyRange>");
-                sb.AppendLine("<effectiveRadiatedPower type=\"float\">" + this._effectiveRadiatedPower.ToString(CultureInfo.InvariantCulture) + "</effectiveRadiatedPower>");
-                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
-                sb.AppendLine("<pusleWidth type=\"float\">" + this._pusleWidth.ToString(CultureInfo.InvariantCulture) + "</pusleWidth>");
-                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
-                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
-                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
-                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
-                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
-                sb.AppendLine("</FundamentalParameterData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FundamentalParameterData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FundamentalParameterData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._frequency != obj._frequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frequencyRange != obj._frequencyRange)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._effectiveRadiatedPower != obj._effectiveRadiatedPower)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pusleWidth != obj._pusleWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationCenter != obj._beamElevationCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationSweep != obj._beamElevationSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamSweepSync != obj._beamSweepSync)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._frequency.GetHashCode();
-            result = GenerateHash(result) ^ this._frequencyRange.GetHashCode();
-            result = GenerateHash(result) ^ this._effectiveRadiatedPower.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
-            result = GenerateHash(result) ^ this._pusleWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.22. Contains electromagnetic emmision regineratin parameters that are        variable throughout a scenario dependent on the actions of the participants in the simulation. Also provides basic parametric data that may be used to support low-fidelity simulations.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FundamentalParameterData
+    {
+        /// <summary>
+        /// center frequency of the emission in hertz.
+        /// </summary>
+        private float _frequency;
+
+        /// <summary>
+        /// Bandwidth of the frequencies corresponding to the fequency field.
+        /// </summary>
+        private float _frequencyRange;
+
+        /// <summary>
+        /// Effective radiated power for the emission in DdBm. For a      radar noise jammer, indicates the peak of the transmitted power.
+        /// </summary>
+        private float _effectiveRadiatedPower;
+
+        /// <summary>
+        /// Average repetition frequency of the emission in hertz.
+        /// </summary>
+        private float _pulseRepetitionFrequency;
+
+        /// <summary>
+        /// Average pulse width  of the emission in microseconds.
+        /// </summary>
+        private float _pusleWidth;
+
+        /// <summary>
+        /// Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
+        /// </summary>
+        private float _beamAzimuthCenter;
+
+        /// <summary>
+        /// Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        private float _beamAzimuthSweep;
+
+        /// <summary>
+        /// Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        private float _beamElevationCenter;
+
+        /// <summary>
+        /// Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        private float _beamElevationSweep;
+
+        /// <summary>
+        /// allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        private float _beamSweepSync;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FundamentalParameterData"/> class.
+        /// </summary>
+        public FundamentalParameterData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FundamentalParameterData left, FundamentalParameterData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FundamentalParameterData left, FundamentalParameterData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._frequency
+            marshalSize += 4;  // this._frequencyRange
+            marshalSize += 4;  // this._effectiveRadiatedPower
+            marshalSize += 4;  // this._pulseRepetitionFrequency
+            marshalSize += 4;  // this._pusleWidth
+            marshalSize += 4;  // this._beamAzimuthCenter
+            marshalSize += 4;  // this._beamAzimuthSweep
+            marshalSize += 4;  // this._beamElevationCenter
+            marshalSize += 4;  // this._beamElevationSweep
+            marshalSize += 4;  // this._beamSweepSync
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the center frequency of the emission in hertz.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequency")]
+        public float Frequency
+        {
+            get
+            {
+                return this._frequency;
+            }
+
+            set
+            {
+                this._frequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Bandwidth of the frequencies corresponding to the fequency field.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequencyRange")]
+        public float FrequencyRange
+        {
+            get
+            {
+                return this._frequencyRange;
+            }
+
+            set
+            {
+                this._frequencyRange = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Effective radiated power for the emission in DdBm. For a      radar noise jammer, indicates the peak of the transmitted power.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "effectiveRadiatedPower")]
+        public float EffectiveRadiatedPower
+        {
+            get
+            {
+                return this._effectiveRadiatedPower;
+            }
+
+            set
+            {
+                this._effectiveRadiatedPower = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Average repetition frequency of the emission in hertz.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
+        public float PulseRepetitionFrequency
+        {
+            get
+            {
+                return this._pulseRepetitionFrequency;
+            }
+
+            set
+            {
+                this._pulseRepetitionFrequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Average pulse width  of the emission in microseconds.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pusleWidth")]
+        public float PusleWidth
+        {
+            get
+            {
+                return this._pusleWidth;
+            }
+
+            set
+            {
+                this._pusleWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
+        public float BeamAzimuthCenter
+        {
+            get
+            {
+                return this._beamAzimuthCenter;
+            }
+
+            set
+            {
+                this._beamAzimuthCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
+        public float BeamAzimuthSweep
+        {
+            get
+            {
+                return this._beamAzimuthSweep;
+            }
+
+            set
+            {
+                this._beamAzimuthSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
+        public float BeamElevationCenter
+        {
+            get
+            {
+                return this._beamElevationCenter;
+            }
+
+            set
+            {
+                this._beamElevationCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
+        public float BeamElevationSweep
+        {
+            get
+            {
+                return this._beamElevationSweep;
+            }
+
+            set
+            {
+                this._beamElevationSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
+        public float BeamSweepSync
+        {
+            get
+            {
+                return this._beamSweepSync;
+            }
+
+            set
+            {
+                this._beamSweepSync = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._frequency);
+                    dos.WriteFloat((float)this._frequencyRange);
+                    dos.WriteFloat((float)this._effectiveRadiatedPower);
+                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
+                    dos.WriteFloat((float)this._pusleWidth);
+                    dos.WriteFloat((float)this._beamAzimuthCenter);
+                    dos.WriteFloat((float)this._beamAzimuthSweep);
+                    dos.WriteFloat((float)this._beamElevationCenter);
+                    dos.WriteFloat((float)this._beamElevationSweep);
+                    dos.WriteFloat((float)this._beamSweepSync);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._frequency = dis.ReadFloat();
+                    this._frequencyRange = dis.ReadFloat();
+                    this._effectiveRadiatedPower = dis.ReadFloat();
+                    this._pulseRepetitionFrequency = dis.ReadFloat();
+                    this._pusleWidth = dis.ReadFloat();
+                    this._beamAzimuthCenter = dis.ReadFloat();
+                    this._beamAzimuthSweep = dis.ReadFloat();
+                    this._beamElevationCenter = dis.ReadFloat();
+                    this._beamElevationSweep = dis.ReadFloat();
+                    this._beamSweepSync = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FundamentalParameterData>");
+            try
+            {
+                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
+                sb.AppendLine("<frequencyRange type=\"float\">" + this._frequencyRange.ToString(CultureInfo.InvariantCulture) + "</frequencyRange>");
+                sb.AppendLine("<effectiveRadiatedPower type=\"float\">" + this._effectiveRadiatedPower.ToString(CultureInfo.InvariantCulture) + "</effectiveRadiatedPower>");
+                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
+                sb.AppendLine("<pusleWidth type=\"float\">" + this._pusleWidth.ToString(CultureInfo.InvariantCulture) + "</pusleWidth>");
+                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
+                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
+                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
+                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
+                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
+                sb.AppendLine("</FundamentalParameterData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FundamentalParameterData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FundamentalParameterData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._frequency != obj._frequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frequencyRange != obj._frequencyRange)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._effectiveRadiatedPower != obj._effectiveRadiatedPower)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pusleWidth != obj._pusleWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationCenter != obj._beamElevationCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationSweep != obj._beamElevationSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamSweepSync != obj._beamSweepSync)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._frequency.GetHashCode();
+            result = GenerateHash(result) ^ this._frequencyRange.GetHashCode();
+            result = GenerateHash(result) ^ this._effectiveRadiatedPower.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
+            result = GenerateHash(result) ^ this._pusleWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/LogisticsPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/LogisticsPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/LogisticsPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/LogisticsPdu.cs
index 1cca11c..7bcabf1 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/LogisticsPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/LogisticsPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.5. Abstract superclass for logistics PDUs
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class LogisticsPdu : Pdu, IEquatable<LogisticsPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LogisticsPdu"/> class.
-        /// </summary>
-        public LogisticsPdu()
-        {
-            ProtocolFamily = (byte)3;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LogisticsPdu left, LogisticsPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LogisticsPdu left, LogisticsPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LogisticsPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</LogisticsPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LogisticsPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LogisticsPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.5. Abstract superclass for logistics PDUs
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class LogisticsPdu : Pdu, IEquatable<LogisticsPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogisticsPdu"/> class.
+        /// </summary>
+        public LogisticsPdu()
+        {
+            ProtocolFamily = (byte)3;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LogisticsPdu left, LogisticsPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LogisticsPdu left, LogisticsPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LogisticsPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</LogisticsPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LogisticsPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LogisticsPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ModulationType.cs b/Libs/CsharpDis6/Dis1995/Generated/ModulationType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ModulationType.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ModulationType.cs
index 1133dcd..dbd36ad 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ModulationType.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ModulationType.cs
@@ -1,396 +1,396 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Radio modulation
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ModulationType
-    {
-        /// <summary>
-        /// spread spectrum, 16 bit boolean array
-        /// </summary>
-        private ushort _spreadSpectrum;
-
-        /// <summary>
-        /// major
-        /// </summary>
-        private ushort _major;
-
-        /// <summary>
-        /// detail
-        /// </summary>
-        private ushort _detail;
-
-        /// <summary>
-        /// system
-        /// </summary>
-        private ushort _system;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModulationType"/> class.
-        /// </summary>
-        public ModulationType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ModulationType left, ModulationType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ModulationType left, ModulationType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._spreadSpectrum
-            marshalSize += 2;  // this._major
-            marshalSize += 2;  // this._detail
-            marshalSize += 2;  // this._system
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the spread spectrum, 16 bit boolean array
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "spreadSpectrum")]
-        public ushort SpreadSpectrum
-        {
-            get
-            {
-                return this._spreadSpectrum;
-            }
-
-            set
-            {
-                this._spreadSpectrum = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the major
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "major")]
-        public ushort Major
-        {
-            get
-            {
-                return this._major;
-            }
-
-            set
-            {
-                this._major = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the detail
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "detail")]
-        public ushort Detail
-        {
-            get
-            {
-                return this._detail;
-            }
-
-            set
-            {
-                this._detail = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the system
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "system")]
-        public ushort System_
-        {
-            get
-            {
-                return this._system;
-            }
-
-            set
-            {
-                this._system = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._spreadSpectrum);
-                    dos.WriteUnsignedShort((ushort)this._major);
-                    dos.WriteUnsignedShort((ushort)this._detail);
-                    dos.WriteUnsignedShort((ushort)this._system);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._spreadSpectrum = dis.ReadUnsignedShort();
-                    this._major = dis.ReadUnsignedShort();
-                    this._detail = dis.ReadUnsignedShort();
-                    this._system = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ModulationType>");
-            try
-            {
-                sb.AppendLine("<spreadSpectrum type=\"ushort\">" + this._spreadSpectrum.ToString(CultureInfo.InvariantCulture) + "</spreadSpectrum>");
-                sb.AppendLine("<major type=\"ushort\">" + this._major.ToString(CultureInfo.InvariantCulture) + "</major>");
-                sb.AppendLine("<detail type=\"ushort\">" + this._detail.ToString(CultureInfo.InvariantCulture) + "</detail>");
-                sb.AppendLine("<system type=\"ushort\">" + this._system.ToString(CultureInfo.InvariantCulture) + "</system>");
-                sb.AppendLine("</ModulationType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ModulationType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ModulationType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._spreadSpectrum != obj._spreadSpectrum)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._major != obj._major)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._detail != obj._detail)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._system != obj._system)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._spreadSpectrum.GetHashCode();
-            result = GenerateHash(result) ^ this._major.GetHashCode();
-            result = GenerateHash(result) ^ this._detail.GetHashCode();
-            result = GenerateHash(result) ^ this._system.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Radio modulation
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ModulationType
+    {
+        /// <summary>
+        /// spread spectrum, 16 bit boolean array
+        /// </summary>
+        private ushort _spreadSpectrum;
+
+        /// <summary>
+        /// major
+        /// </summary>
+        private ushort _major;
+
+        /// <summary>
+        /// detail
+        /// </summary>
+        private ushort _detail;
+
+        /// <summary>
+        /// system
+        /// </summary>
+        private ushort _system;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModulationType"/> class.
+        /// </summary>
+        public ModulationType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ModulationType left, ModulationType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ModulationType left, ModulationType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._spreadSpectrum
+            marshalSize += 2;  // this._major
+            marshalSize += 2;  // this._detail
+            marshalSize += 2;  // this._system
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the spread spectrum, 16 bit boolean array
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "spreadSpectrum")]
+        public ushort SpreadSpectrum
+        {
+            get
+            {
+                return this._spreadSpectrum;
+            }
+
+            set
+            {
+                this._spreadSpectrum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the major
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "major")]
+        public ushort Major
+        {
+            get
+            {
+                return this._major;
+            }
+
+            set
+            {
+                this._major = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the detail
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "detail")]
+        public ushort Detail
+        {
+            get
+            {
+                return this._detail;
+            }
+
+            set
+            {
+                this._detail = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the system
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "system")]
+        public ushort System_
+        {
+            get
+            {
+                return this._system;
+            }
+
+            set
+            {
+                this._system = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._spreadSpectrum);
+                    dos.WriteUnsignedShort((ushort)this._major);
+                    dos.WriteUnsignedShort((ushort)this._detail);
+                    dos.WriteUnsignedShort((ushort)this._system);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._spreadSpectrum = dis.ReadUnsignedShort();
+                    this._major = dis.ReadUnsignedShort();
+                    this._detail = dis.ReadUnsignedShort();
+                    this._system = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ModulationType>");
+            try
+            {
+                sb.AppendLine("<spreadSpectrum type=\"ushort\">" + this._spreadSpectrum.ToString(CultureInfo.InvariantCulture) + "</spreadSpectrum>");
+                sb.AppendLine("<major type=\"ushort\">" + this._major.ToString(CultureInfo.InvariantCulture) + "</major>");
+                sb.AppendLine("<detail type=\"ushort\">" + this._detail.ToString(CultureInfo.InvariantCulture) + "</detail>");
+                sb.AppendLine("<system type=\"ushort\">" + this._system.ToString(CultureInfo.InvariantCulture) + "</system>");
+                sb.AppendLine("</ModulationType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ModulationType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ModulationType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._spreadSpectrum != obj._spreadSpectrum)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._major != obj._major)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._detail != obj._detail)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._system != obj._system)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._spreadSpectrum.GetHashCode();
+            result = GenerateHash(result) ^ this._major.GetHashCode();
+            result = GenerateHash(result) ^ this._detail.GetHashCode();
+            result = GenerateHash(result) ^ this._system.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Orientation.cs b/Libs/CsharpDis6/Dis1995/Generated/Orientation.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/Orientation.cs
rename to Libs/CsharpDis6/Dis1995/Generated/Orientation.cs
index 0d53662..c6fe174 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Orientation.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/Orientation.cs
@@ -1,355 +1,355 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.17. Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Orientation
-    {
-        private float _psi;
-
-        private float _theta;
-
-        private float _phi;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Orientation"/> class.
-        /// </summary>
-        public Orientation()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Orientation left, Orientation right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Orientation left, Orientation right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._psi
-            marshalSize += 4;  // this._theta
-            marshalSize += 4;  // this._phi
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the psi
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "psi")]
-        public float Psi
-        {
-            get
-            {
-                return this._psi;
-            }
-
-            set
-            {
-                this._psi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the theta
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "theta")]
-        public float Theta
-        {
-            get
-            {
-                return this._theta;
-            }
-
-            set
-            {
-                this._theta = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the phi
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "phi")]
-        public float Phi
-        {
-            get
-            {
-                return this._phi;
-            }
-
-            set
-            {
-                this._phi = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._psi);
-                    dos.WriteFloat((float)this._theta);
-                    dos.WriteFloat((float)this._phi);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._psi = dis.ReadFloat();
-                    this._theta = dis.ReadFloat();
-                    this._phi = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Orientation>");
-            try
-            {
-                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
-                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
-                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
-                sb.AppendLine("</Orientation>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Orientation;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Orientation obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._psi != obj._psi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._theta != obj._theta)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phi != obj._phi)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._psi.GetHashCode();
-            result = GenerateHash(result) ^ this._theta.GetHashCode();
-            result = GenerateHash(result) ^ this._phi.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.17. Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Orientation
+    {
+        private float _psi;
+
+        private float _theta;
+
+        private float _phi;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Orientation"/> class.
+        /// </summary>
+        public Orientation()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Orientation left, Orientation right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Orientation left, Orientation right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._psi
+            marshalSize += 4;  // this._theta
+            marshalSize += 4;  // this._phi
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the psi
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "psi")]
+        public float Psi
+        {
+            get
+            {
+                return this._psi;
+            }
+
+            set
+            {
+                this._psi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the theta
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "theta")]
+        public float Theta
+        {
+            get
+            {
+                return this._theta;
+            }
+
+            set
+            {
+                this._theta = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the phi
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "phi")]
+        public float Phi
+        {
+            get
+            {
+                return this._phi;
+            }
+
+            set
+            {
+                this._phi = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._psi);
+                    dos.WriteFloat((float)this._theta);
+                    dos.WriteFloat((float)this._phi);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._psi = dis.ReadFloat();
+                    this._theta = dis.ReadFloat();
+                    this._phi = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Orientation>");
+            try
+            {
+                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
+                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
+                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
+                sb.AppendLine("</Orientation>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Orientation;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Orientation obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._psi != obj._psi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._theta != obj._theta)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phi != obj._phi)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._psi.GetHashCode();
+            result = GenerateHash(result) ^ this._theta.GetHashCode();
+            result = GenerateHash(result) ^ this._phi.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Pdu.cs b/Libs/CsharpDis6/Dis1995/Generated/Pdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/Pdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/Pdu.cs
index 7552217..997673a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Pdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/Pdu.cs
@@ -1,492 +1,492 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// The superclass for all PDUs. This incorporates the PduHeader record, section 5.2.29.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Pdu : PduBase, IPdu
-    {
-        /// <summary>
-        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998.
-        /// </summary>
-        private byte _protocolVersion = 5;
-
-        /// <summary>
-        /// Exercise ID
-        /// </summary>
-        private byte _exerciseID;
-
-        /// <summary>
-        /// Type of pdu, unique for each PDU class
-        /// </summary>
-        private byte _pduType;
-
-        /// <summary>
-        /// value that refers to the protocol family, eg SimulationManagement, et
-        /// </summary>
-        private byte _protocolFamily;
-
-        /// <summary>
-        /// Timestamp value
-        /// </summary>
-        private uint _timestamp;
-
-        /// <summary>
-        /// Length, in bytes, of the PDU
-        /// </summary>
-        private ushort _length;
-
-        /// <summary>
-        /// zero-filled array of padding
-        /// </summary>
-        private short _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pdu"/> class.
-        /// </summary>
-        public Pdu()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Pdu left, Pdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Pdu left, Pdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._protocolVersion
-            marshalSize += 1;  // this._exerciseID
-            marshalSize += 1;  // this._pduType
-            marshalSize += 1;  // this._protocolFamily
-            marshalSize += 4;  // this._timestamp
-            marshalSize += 2;  // this._length
-            marshalSize += 2;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
-        public byte ProtocolVersion
-        {
-            get
-            {
-                return this._protocolVersion;
-            }
-
-            set
-            {
-                this._protocolVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Exercise ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
-        public byte ExerciseID
-        {
-            get
-            {
-                return this._exerciseID;
-            }
-
-            set
-            {
-                this._exerciseID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of pdu, unique for each PDU class
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
-        public byte PduType
-        {
-            get
-            {
-                return this._pduType;
-            }
-
-            set
-            {
-                this._pduType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, et
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
-        public byte ProtocolFamily
-        {
-            get
-            {
-                return this._protocolFamily;
-            }
-
-            set
-            {
-                this._protocolFamily = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Timestamp value
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
-        public uint Timestamp
-        {
-            get
-            {
-                return this._timestamp;
-            }
-
-            set
-            {
-                this._timestamp = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length, in bytes, of the PDU
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "length")]
-        public ushort Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the zero-filled array of padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding")]
-        public short Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._protocolVersion);
-                    dos.WriteUnsignedByte((byte)this._exerciseID);
-                    dos.WriteUnsignedByte((byte)this._pduType);
-                    dos.WriteUnsignedByte((byte)this._protocolFamily);
-                    dos.WriteUnsignedInt((uint)this._timestamp);
-                    dos.WriteUnsignedShort((ushort)this._length);
-                    dos.WriteShort((short)this._padding);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._protocolVersion = dis.ReadUnsignedByte();
-                    this._exerciseID = dis.ReadUnsignedByte();
-                    this._pduType = dis.ReadUnsignedByte();
-                    this._protocolFamily = dis.ReadUnsignedByte();
-                    this._timestamp = dis.ReadUnsignedInt();
-                    this._length = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Pdu>");
-            try
-            {
-                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
-                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
-                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
-                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
-                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
-                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("<padding type=\"short\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</Pdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Pdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Pdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._protocolVersion != obj._protocolVersion)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._exerciseID != obj._exerciseID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduType != obj._pduType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._protocolFamily != obj._protocolFamily)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timestamp != obj._timestamp)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
-            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
-            result = GenerateHash(result) ^ this._pduType.GetHashCode();
-            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
-            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// The superclass for all PDUs. This incorporates the PduHeader record, section 5.2.29.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Pdu : PduBase, IPdu
+    {
+        /// <summary>
+        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998.
+        /// </summary>
+        private byte _protocolVersion = 5;
+
+        /// <summary>
+        /// Exercise ID
+        /// </summary>
+        private byte _exerciseID;
+
+        /// <summary>
+        /// Type of pdu, unique for each PDU class
+        /// </summary>
+        private byte _pduType;
+
+        /// <summary>
+        /// value that refers to the protocol family, eg SimulationManagement, et
+        /// </summary>
+        private byte _protocolFamily;
+
+        /// <summary>
+        /// Timestamp value
+        /// </summary>
+        private uint _timestamp;
+
+        /// <summary>
+        /// Length, in bytes, of the PDU
+        /// </summary>
+        private ushort _length;
+
+        /// <summary>
+        /// zero-filled array of padding
+        /// </summary>
+        private short _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pdu"/> class.
+        /// </summary>
+        public Pdu()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Pdu left, Pdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Pdu left, Pdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._protocolVersion
+            marshalSize += 1;  // this._exerciseID
+            marshalSize += 1;  // this._pduType
+            marshalSize += 1;  // this._protocolFamily
+            marshalSize += 4;  // this._timestamp
+            marshalSize += 2;  // this._length
+            marshalSize += 2;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
+        public byte ProtocolVersion
+        {
+            get
+            {
+                return this._protocolVersion;
+            }
+
+            set
+            {
+                this._protocolVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Exercise ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
+        public byte ExerciseID
+        {
+            get
+            {
+                return this._exerciseID;
+            }
+
+            set
+            {
+                this._exerciseID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of pdu, unique for each PDU class
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
+        public byte PduType
+        {
+            get
+            {
+                return this._pduType;
+            }
+
+            set
+            {
+                this._pduType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, et
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
+        public byte ProtocolFamily
+        {
+            get
+            {
+                return this._protocolFamily;
+            }
+
+            set
+            {
+                this._protocolFamily = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Timestamp value
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
+        public uint Timestamp
+        {
+            get
+            {
+                return this._timestamp;
+            }
+
+            set
+            {
+                this._timestamp = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length, in bytes, of the PDU
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "length")]
+        public ushort Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the zero-filled array of padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding")]
+        public short Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._protocolVersion);
+                    dos.WriteUnsignedByte((byte)this._exerciseID);
+                    dos.WriteUnsignedByte((byte)this._pduType);
+                    dos.WriteUnsignedByte((byte)this._protocolFamily);
+                    dos.WriteUnsignedInt((uint)this._timestamp);
+                    dos.WriteUnsignedShort((ushort)this._length);
+                    dos.WriteShort((short)this._padding);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._protocolVersion = dis.ReadUnsignedByte();
+                    this._exerciseID = dis.ReadUnsignedByte();
+                    this._pduType = dis.ReadUnsignedByte();
+                    this._protocolFamily = dis.ReadUnsignedByte();
+                    this._timestamp = dis.ReadUnsignedInt();
+                    this._length = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Pdu>");
+            try
+            {
+                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
+                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
+                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
+                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
+                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
+                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("<padding type=\"short\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</Pdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Pdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Pdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._protocolVersion != obj._protocolVersion)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._exerciseID != obj._exerciseID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduType != obj._pduType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._protocolFamily != obj._protocolFamily)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timestamp != obj._timestamp)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
+            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
+            result = GenerateHash(result) ^ this._pduType.GetHashCode();
+            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
+            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/RadioCommunicationsPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/RadioCommunicationsPdu.cs
index 9867fd2..e0bfb44 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioCommunicationsPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/RadioCommunicationsPdu.cs
@@ -1,339 +1,339 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.8. Abstract superclass for radio communications PDUs.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RadioCommunicationsPdu : Pdu, IEquatable<RadioCommunicationsPdu>
-    {
-        /// <summary>
-        /// ID of the entitythat is the source of the communication
-        /// </summary>
-        private EntityID _entityId = new EntityID();
-
-        /// <summary>
-        /// particular radio within an entity
-        /// </summary>
-        private ushort _radioId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioCommunicationsPdu"/> class.
-        /// </summary>
-        public RadioCommunicationsPdu()
-        {
-            ProtocolFamily = (byte)4;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioCommunicationsPdu left, RadioCommunicationsPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioCommunicationsPdu left, RadioCommunicationsPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
-            marshalSize += 2;  // this._radioId
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entitythat is the source of the communication
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
-        public EntityID EntityId
-        {
-            get
-            {
-                return this._entityId;
-            }
-
-            set
-            {
-                this._entityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the particular radio within an entity
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "radioId")]
-        public ushort RadioId
-        {
-            get
-            {
-                return this._radioId;
-            }
-
-            set
-            {
-                this._radioId = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityId.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._radioId);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityId.Unmarshal(dis);
-                    this._radioId = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RadioCommunicationsPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityId>");
-                this._entityId.Reflection(sb);
-                sb.AppendLine("</entityId>");
-                sb.AppendLine("<radioId type=\"ushort\">" + this._radioId.ToString(CultureInfo.InvariantCulture) + "</radioId>");
-                sb.AppendLine("</RadioCommunicationsPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RadioCommunicationsPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioCommunicationsPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityId.Equals(obj._entityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._radioId != obj._radioId)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityId.GetHashCode();
-            result = GenerateHash(result) ^ this._radioId.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.8. Abstract superclass for radio communications PDUs.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RadioCommunicationsPdu : Pdu, IEquatable<RadioCommunicationsPdu>
+    {
+        /// <summary>
+        /// ID of the entitythat is the source of the communication
+        /// </summary>
+        private EntityID _entityId = new EntityID();
+
+        /// <summary>
+        /// particular radio within an entity
+        /// </summary>
+        private ushort _radioId;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioCommunicationsPdu"/> class.
+        /// </summary>
+        public RadioCommunicationsPdu()
+        {
+            ProtocolFamily = (byte)4;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioCommunicationsPdu left, RadioCommunicationsPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioCommunicationsPdu left, RadioCommunicationsPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
+            marshalSize += 2;  // this._radioId
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entitythat is the source of the communication
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
+        public EntityID EntityId
+        {
+            get
+            {
+                return this._entityId;
+            }
+
+            set
+            {
+                this._entityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the particular radio within an entity
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "radioId")]
+        public ushort RadioId
+        {
+            get
+            {
+                return this._radioId;
+            }
+
+            set
+            {
+                this._radioId = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityId.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._radioId);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityId.Unmarshal(dis);
+                    this._radioId = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RadioCommunicationsPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityId>");
+                this._entityId.Reflection(sb);
+                sb.AppendLine("</entityId>");
+                sb.AppendLine("<radioId type=\"ushort\">" + this._radioId.ToString(CultureInfo.InvariantCulture) + "</radioId>");
+                sb.AppendLine("</RadioCommunicationsPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RadioCommunicationsPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioCommunicationsPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityId.Equals(obj._entityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._radioId != obj._radioId)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityId.GetHashCode();
+            result = GenerateHash(result) ^ this._radioId.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioEntityType.cs b/Libs/CsharpDis6/Dis1995/Generated/RadioEntityType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioEntityType.cs
rename to Libs/CsharpDis6/Dis1995/Generated/RadioEntityType.cs
index 2bd679a..c4b918c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RadioEntityType.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/RadioEntityType.cs
@@ -1,489 +1,489 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.25. Identifies the type of radio
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RadioEntityType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _nomenclatureVersion;
-
-        private ushort _nomenclature;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioEntityType"/> class.
-        /// </summary>
-        public RadioEntityType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioEntityType left, RadioEntityType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioEntityType left, RadioEntityType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._nomenclatureVersion
-            marshalSize += 2;  // this._nomenclature
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "nomenclatureVersion")]
-        public byte NomenclatureVersion
-        {
-            get
-            {
-                return this._nomenclatureVersion;
-            }
-
-            set
-            {
-                this._nomenclatureVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the nomenclature
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "nomenclature")]
-        public ushort Nomenclature
-        {
-            get
-            {
-                return this._nomenclature;
-            }
-
-            set
-            {
-                this._nomenclature = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._nomenclatureVersion);
-                    dos.WriteUnsignedShort((ushort)this._nomenclature);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._nomenclatureVersion = dis.ReadUnsignedByte();
-                    this._nomenclature = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RadioEntityType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<nomenclatureVersion type=\"byte\">" + this._nomenclatureVersion.ToString(CultureInfo.InvariantCulture) + "</nomenclatureVersion>");
-                sb.AppendLine("<nomenclature type=\"ushort\">" + this._nomenclature.ToString(CultureInfo.InvariantCulture) + "</nomenclature>");
-                sb.AppendLine("</RadioEntityType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RadioEntityType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioEntityType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._nomenclatureVersion != obj._nomenclatureVersion)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._nomenclature != obj._nomenclature)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._nomenclatureVersion.GetHashCode();
-            result = GenerateHash(result) ^ this._nomenclature.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.25. Identifies the type of radio
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RadioEntityType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _nomenclatureVersion;
+
+        private ushort _nomenclature;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioEntityType"/> class.
+        /// </summary>
+        public RadioEntityType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioEntityType left, RadioEntityType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioEntityType left, RadioEntityType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._nomenclatureVersion
+            marshalSize += 2;  // this._nomenclature
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "nomenclatureVersion")]
+        public byte NomenclatureVersion
+        {
+            get
+            {
+                return this._nomenclatureVersion;
+            }
+
+            set
+            {
+                this._nomenclatureVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the nomenclature
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "nomenclature")]
+        public ushort Nomenclature
+        {
+            get
+            {
+                return this._nomenclature;
+            }
+
+            set
+            {
+                this._nomenclature = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._nomenclatureVersion);
+                    dos.WriteUnsignedShort((ushort)this._nomenclature);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._nomenclatureVersion = dis.ReadUnsignedByte();
+                    this._nomenclature = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RadioEntityType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<nomenclatureVersion type=\"byte\">" + this._nomenclatureVersion.ToString(CultureInfo.InvariantCulture) + "</nomenclatureVersion>");
+                sb.AppendLine("<nomenclature type=\"ushort\">" + this._nomenclature.ToString(CultureInfo.InvariantCulture) + "</nomenclature>");
+                sb.AppendLine("</RadioEntityType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RadioEntityType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioEntityType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._nomenclatureVersion != obj._nomenclatureVersion)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._nomenclature != obj._nomenclature)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._nomenclatureVersion.GetHashCode();
+            result = GenerateHash(result) ^ this._nomenclature.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ReceiverPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ReceiverPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ReceiverPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ReceiverPdu.cs
index 1cd0e58..21b1890 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ReceiverPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ReceiverPdu.cs
@@ -1,435 +1,435 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.8.3. Communication of a receiver state.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class ReceiverPdu : RadioCommunicationsPdu, IEquatable<ReceiverPdu>
-    {
-        /// <summary>
-        /// encoding scheme used, and enumeration
-        /// </summary>
-        private ushort _receiverState;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// received power
-        /// </summary>
-        private float _receivedPoser;
-
-        /// <summary>
-        /// ID of transmitter
-        /// </summary>
-        private EntityID _transmitterEntityId = new EntityID();
-
-        /// <summary>
-        /// ID of transmitting radio
-        /// </summary>
-        private ushort _transmitterRadioId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReceiverPdu"/> class.
-        /// </summary>
-        public ReceiverPdu()
-        {
-            PduType = (byte)27;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ReceiverPdu left, ReceiverPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ReceiverPdu left, ReceiverPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._receiverState
-            marshalSize += 2;  // this._padding1
-            marshalSize += 4;  // this._receivedPoser
-            marshalSize += this._transmitterEntityId.GetMarshalledSize();  // this._transmitterEntityId
-            marshalSize += 2;  // this._transmitterRadioId
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the encoding scheme used, and enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "receiverState")]
-        public ushort ReceiverState
-        {
-            get
-            {
-                return this._receiverState;
-            }
-
-            set
-            {
-                this._receiverState = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the received power
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "receivedPoser")]
-        public float ReceivedPoser
-        {
-            get
-            {
-                return this._receivedPoser;
-            }
-
-            set
-            {
-                this._receivedPoser = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of transmitter
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "transmitterEntityId")]
-        public EntityID TransmitterEntityId
-        {
-            get
-            {
-                return this._transmitterEntityId;
-            }
-
-            set
-            {
-                this._transmitterEntityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of transmitting radio
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "transmitterRadioId")]
-        public ushort TransmitterRadioId
-        {
-            get
-            {
-                return this._transmitterRadioId;
-            }
-
-            set
-            {
-                this._transmitterRadioId = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._receiverState);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteFloat((float)this._receivedPoser);
-                    this._transmitterEntityId.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._transmitterRadioId);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receiverState = dis.ReadUnsignedShort();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._receivedPoser = dis.ReadFloat();
-                    this._transmitterEntityId.Unmarshal(dis);
-                    this._transmitterRadioId = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ReceiverPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receiverState type=\"ushort\">" + this._receiverState.ToString(CultureInfo.InvariantCulture) + "</receiverState>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<receivedPoser type=\"float\">" + this._receivedPoser.ToString(CultureInfo.InvariantCulture) + "</receivedPoser>");
-                sb.AppendLine("<transmitterEntityId>");
-                this._transmitterEntityId.Reflection(sb);
-                sb.AppendLine("</transmitterEntityId>");
-                sb.AppendLine("<transmitterRadioId type=\"ushort\">" + this._transmitterRadioId.ToString(CultureInfo.InvariantCulture) + "</transmitterRadioId>");
-                sb.AppendLine("</ReceiverPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ReceiverPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ReceiverPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._receiverState != obj._receiverState)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._receivedPoser != obj._receivedPoser)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._transmitterEntityId.Equals(obj._transmitterEntityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitterRadioId != obj._transmitterRadioId)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receiverState.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._receivedPoser.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitterEntityId.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitterRadioId.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.8.3. Communication of a receiver state.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class ReceiverPdu : RadioCommunicationsPdu, IEquatable<ReceiverPdu>
+    {
+        /// <summary>
+        /// encoding scheme used, and enumeration
+        /// </summary>
+        private ushort _receiverState;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// received power
+        /// </summary>
+        private float _receivedPoser;
+
+        /// <summary>
+        /// ID of transmitter
+        /// </summary>
+        private EntityID _transmitterEntityId = new EntityID();
+
+        /// <summary>
+        /// ID of transmitting radio
+        /// </summary>
+        private ushort _transmitterRadioId;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReceiverPdu"/> class.
+        /// </summary>
+        public ReceiverPdu()
+        {
+            PduType = (byte)27;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ReceiverPdu left, ReceiverPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ReceiverPdu left, ReceiverPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._receiverState
+            marshalSize += 2;  // this._padding1
+            marshalSize += 4;  // this._receivedPoser
+            marshalSize += this._transmitterEntityId.GetMarshalledSize();  // this._transmitterEntityId
+            marshalSize += 2;  // this._transmitterRadioId
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding scheme used, and enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "receiverState")]
+        public ushort ReceiverState
+        {
+            get
+            {
+                return this._receiverState;
+            }
+
+            set
+            {
+                this._receiverState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the received power
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "receivedPoser")]
+        public float ReceivedPoser
+        {
+            get
+            {
+                return this._receivedPoser;
+            }
+
+            set
+            {
+                this._receivedPoser = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of transmitter
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "transmitterEntityId")]
+        public EntityID TransmitterEntityId
+        {
+            get
+            {
+                return this._transmitterEntityId;
+            }
+
+            set
+            {
+                this._transmitterEntityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of transmitting radio
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "transmitterRadioId")]
+        public ushort TransmitterRadioId
+        {
+            get
+            {
+                return this._transmitterRadioId;
+            }
+
+            set
+            {
+                this._transmitterRadioId = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._receiverState);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteFloat((float)this._receivedPoser);
+                    this._transmitterEntityId.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._transmitterRadioId);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receiverState = dis.ReadUnsignedShort();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._receivedPoser = dis.ReadFloat();
+                    this._transmitterEntityId.Unmarshal(dis);
+                    this._transmitterRadioId = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ReceiverPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receiverState type=\"ushort\">" + this._receiverState.ToString(CultureInfo.InvariantCulture) + "</receiverState>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<receivedPoser type=\"float\">" + this._receivedPoser.ToString(CultureInfo.InvariantCulture) + "</receivedPoser>");
+                sb.AppendLine("<transmitterEntityId>");
+                this._transmitterEntityId.Reflection(sb);
+                sb.AppendLine("</transmitterEntityId>");
+                sb.AppendLine("<transmitterRadioId type=\"ushort\">" + this._transmitterRadioId.ToString(CultureInfo.InvariantCulture) + "</transmitterRadioId>");
+                sb.AppendLine("</ReceiverPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ReceiverPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ReceiverPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._receiverState != obj._receiverState)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._receivedPoser != obj._receivedPoser)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._transmitterEntityId.Equals(obj._transmitterEntityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitterRadioId != obj._transmitterRadioId)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receiverState.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._receivedPoser.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitterEntityId.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitterRadioId.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/RemoveEntityPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/RemoveEntityPdu.cs
index de12c63..7c11457 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RemoveEntityPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/RemoveEntityPdu.cs
@@ -1,304 +1,304 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.2. Remove an entity
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RemoveEntityPdu : SimulationManagementPdu, IEquatable<RemoveEntityPdu>
-    {
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RemoveEntityPdu"/> class.
-        /// </summary>
-        public RemoveEntityPdu()
-        {
-            PduType = (byte)12;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RemoveEntityPdu left, RemoveEntityPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RemoveEntityPdu left, RemoveEntityPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RemoveEntityPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</RemoveEntityPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RemoveEntityPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RemoveEntityPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.2. Remove an entity
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RemoveEntityPdu : SimulationManagementPdu, IEquatable<RemoveEntityPdu>
+    {
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveEntityPdu"/> class.
+        /// </summary>
+        public RemoveEntityPdu()
+        {
+            PduType = (byte)12;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RemoveEntityPdu left, RemoveEntityPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RemoveEntityPdu left, RemoveEntityPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RemoveEntityPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</RemoveEntityPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RemoveEntityPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RemoveEntityPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairCompletePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/RepairCompletePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairCompletePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/RepairCompletePdu.cs
index 6949caa..5a42e21 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairCompletePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/RepairCompletePdu.cs
@@ -1,405 +1,405 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.5.5. Repair is complete
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RepairCompletePdu : LogisticsPdu, IEquatable<RepairCompletePdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _repairingEntityID = new EntityID();
-
-        /// <summary>
-        /// Enumeration for type of repair
-        /// </summary>
-        private ushort _repair;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RepairCompletePdu"/> class.
-        /// </summary>
-        public RepairCompletePdu()
-        {
-            PduType = (byte)9;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RepairCompletePdu left, RepairCompletePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RepairCompletePdu left, RepairCompletePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
-            marshalSize += 2;  // this._repair
-            marshalSize += 2;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
-        public EntityID RepairingEntityID
-        {
-            get
-            {
-                return this._repairingEntityID;
-            }
-
-            set
-            {
-                this._repairingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Enumeration for type of repair
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "repair")]
-        public ushort Repair
-        {
-            get
-            {
-                return this._repair;
-            }
-
-            set
-            {
-                this._repair = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding")]
-        public short Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._repairingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._repair);
-                    dos.WriteShort((short)this._padding);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._repairingEntityID.Unmarshal(dis);
-                    this._repair = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RepairCompletePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<repairingEntityID>");
-                this._repairingEntityID.Reflection(sb);
-                sb.AppendLine("</repairingEntityID>");
-                sb.AppendLine("<repair type=\"ushort\">" + this._repair.ToString(CultureInfo.InvariantCulture) + "</repair>");
-                sb.AppendLine("<padding type=\"short\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</RepairCompletePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RepairCompletePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RepairCompletePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._repair != obj._repair)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repair.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.5.5. Repair is complete
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RepairCompletePdu : LogisticsPdu, IEquatable<RepairCompletePdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _repairingEntityID = new EntityID();
+
+        /// <summary>
+        /// Enumeration for type of repair
+        /// </summary>
+        private ushort _repair;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RepairCompletePdu"/> class.
+        /// </summary>
+        public RepairCompletePdu()
+        {
+            PduType = (byte)9;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RepairCompletePdu left, RepairCompletePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RepairCompletePdu left, RepairCompletePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
+            marshalSize += 2;  // this._repair
+            marshalSize += 2;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
+        public EntityID RepairingEntityID
+        {
+            get
+            {
+                return this._repairingEntityID;
+            }
+
+            set
+            {
+                this._repairingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Enumeration for type of repair
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "repair")]
+        public ushort Repair
+        {
+            get
+            {
+                return this._repair;
+            }
+
+            set
+            {
+                this._repair = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding")]
+        public short Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._repairingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._repair);
+                    dos.WriteShort((short)this._padding);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._repairingEntityID.Unmarshal(dis);
+                    this._repair = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RepairCompletePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<repairingEntityID>");
+                this._repairingEntityID.Reflection(sb);
+                sb.AppendLine("</repairingEntityID>");
+                sb.AppendLine("<repair type=\"ushort\">" + this._repair.ToString(CultureInfo.InvariantCulture) + "</repair>");
+                sb.AppendLine("<padding type=\"short\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</RepairCompletePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RepairCompletePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RepairCompletePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._repair != obj._repair)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repair.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairResponsePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/RepairResponsePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairResponsePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/RepairResponsePdu.cs
index 6c69c14..6bea994 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/RepairResponsePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/RepairResponsePdu.cs
@@ -1,437 +1,437 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.5.6. Sent after repair conplete PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RepairResponsePdu : LogisticsPdu, IEquatable<RepairResponsePdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _repairingEntityID = new EntityID();
-
-        /// <summary>
-        /// Result of repair operation
-        /// </summary>
-        private byte _repairResult;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RepairResponsePdu"/> class.
-        /// </summary>
-        public RepairResponsePdu()
-        {
-            PduType = (byte)10;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RepairResponsePdu left, RepairResponsePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RepairResponsePdu left, RepairResponsePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
-            marshalSize += 1;  // this._repairResult
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
-        public EntityID RepairingEntityID
-        {
-            get
-            {
-                return this._repairingEntityID;
-            }
-
-            set
-            {
-                this._repairingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Result of repair operation
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "repairResult")]
-        public byte RepairResult
-        {
-            get
-            {
-                return this._repairResult;
-            }
-
-            set
-            {
-                this._repairResult = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._repairingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._repairResult);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._repairingEntityID.Unmarshal(dis);
-                    this._repairResult = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RepairResponsePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<repairingEntityID>");
-                this._repairingEntityID.Reflection(sb);
-                sb.AppendLine("</repairingEntityID>");
-                sb.AppendLine("<repairResult type=\"byte\">" + this._repairResult.ToString(CultureInfo.InvariantCulture) + "</repairResult>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("</RepairResponsePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RepairResponsePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RepairResponsePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._repairResult != obj._repairResult)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairResult.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.5.6. Sent after repair conplete PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RepairResponsePdu : LogisticsPdu, IEquatable<RepairResponsePdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _repairingEntityID = new EntityID();
+
+        /// <summary>
+        /// Result of repair operation
+        /// </summary>
+        private byte _repairResult;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RepairResponsePdu"/> class.
+        /// </summary>
+        public RepairResponsePdu()
+        {
+            PduType = (byte)10;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RepairResponsePdu left, RepairResponsePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RepairResponsePdu left, RepairResponsePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
+            marshalSize += 1;  // this._repairResult
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
+        public EntityID RepairingEntityID
+        {
+            get
+            {
+                return this._repairingEntityID;
+            }
+
+            set
+            {
+                this._repairingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Result of repair operation
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "repairResult")]
+        public byte RepairResult
+        {
+            get
+            {
+                return this._repairResult;
+            }
+
+            set
+            {
+                this._repairResult = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._repairingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._repairResult);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._repairingEntityID.Unmarshal(dis);
+                    this._repairResult = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RepairResponsePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<repairingEntityID>");
+                this._repairingEntityID.Reflection(sb);
+                sb.AppendLine("</repairingEntityID>");
+                sb.AppendLine("<repairResult type=\"byte\">" + this._repairResult.ToString(CultureInfo.InvariantCulture) + "</repairResult>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("</RepairResponsePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RepairResponsePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RepairResponsePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._repairResult != obj._repairResult)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairResult.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ResupplyCancelPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ResupplyCancelPdu.cs
index a090dd7..9627e0e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyCancelPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ResupplyCancelPdu.cs
@@ -1,341 +1,341 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.5.4. Cancel of resupply by either the receiving or supplying entity
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class ResupplyCancelPdu : LogisticsPdu, IEquatable<ResupplyCancelPdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyCancelPdu"/> class.
-        /// </summary>
-        public ResupplyCancelPdu()
-        {
-            PduType = (byte)8;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyCancelPdu left, ResupplyCancelPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyCancelPdu left, ResupplyCancelPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyCancelPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("</ResupplyCancelPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyCancelPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyCancelPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.5.4. Cancel of resupply by either the receiving or supplying entity
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class ResupplyCancelPdu : LogisticsPdu, IEquatable<ResupplyCancelPdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyCancelPdu"/> class.
+        /// </summary>
+        public ResupplyCancelPdu()
+        {
+            PduType = (byte)8;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyCancelPdu left, ResupplyCancelPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyCancelPdu left, ResupplyCancelPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyCancelPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("</ResupplyCancelPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyCancelPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyCancelPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ResupplyOfferPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ResupplyOfferPdu.cs
index b85e3fb..1811317 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyOfferPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ResupplyOfferPdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.5.2. Information about a request for supplies
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ResupplyOfferPdu : LogisticsPdu, IEquatable<ResupplyOfferPdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// how many supplies are being offered
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyOfferPdu"/> class.
-        /// </summary>
-        public ResupplyOfferPdu()
-        {
-            PduType = (byte)6;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyOfferPdu left, ResupplyOfferPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyOfferPdu left, ResupplyOfferPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many supplies are being offered
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the supplies
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyOfferPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ResupplyOfferPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyOfferPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyOfferPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.5.2. Information about a request for supplies
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ResupplyOfferPdu : LogisticsPdu, IEquatable<ResupplyOfferPdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// how many supplies are being offered
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyOfferPdu"/> class.
+        /// </summary>
+        public ResupplyOfferPdu()
+        {
+            PduType = (byte)6;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyOfferPdu left, ResupplyOfferPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyOfferPdu left, ResupplyOfferPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many supplies are being offered
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the supplies
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyOfferPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ResupplyOfferPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyOfferPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyOfferPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ResupplyReceivedPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ResupplyReceivedPdu.cs
index 49ca659..ec39047 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ResupplyReceivedPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ResupplyReceivedPdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.5.3. Receipt of supplies is communiated
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ResupplyReceivedPdu : LogisticsPdu, IEquatable<ResupplyReceivedPdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// how many supplies are being offered
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyReceivedPdu"/> class.
-        /// </summary>
-        public ResupplyReceivedPdu()
-        {
-            PduType = (byte)7;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many supplies are being offered
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the supplies
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyReceivedPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ResupplyReceivedPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyReceivedPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyReceivedPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.5.3. Receipt of supplies is communiated
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ResupplyReceivedPdu : LogisticsPdu, IEquatable<ResupplyReceivedPdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// how many supplies are being offered
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyReceivedPdu"/> class.
+        /// </summary>
+        public ResupplyReceivedPdu()
+        {
+            PduType = (byte)7;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many supplies are being offered
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the supplies
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyReceivedPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ResupplyReceivedPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyReceivedPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyReceivedPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/ServiceRequestPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/ServiceRequestPdu.cs
index 3877693..4150574 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/ServiceRequestPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/ServiceRequestPdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.5.1. Information about a request for supplies
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ServiceRequestPdu : LogisticsPdu, IEquatable<ServiceRequestPdu>
-    {
-        /// <summary>
-        /// Entity that is requesting service
-        /// </summary>
-        private EntityID _requestingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is providing the service
-        /// </summary>
-        private EntityID _servicingEntityID = new EntityID();
-
-        /// <summary>
-        /// type of service requested
-        /// </summary>
-        private byte _serviceTypeRequested;
-
-        /// <summary>
-        /// How many requested
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _serviceRequestPadding;
-
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceRequestPdu"/> class.
-        /// </summary>
-        public ServiceRequestPdu()
-        {
-            PduType = (byte)5;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ServiceRequestPdu left, ServiceRequestPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ServiceRequestPdu left, ServiceRequestPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
-            marshalSize += this._servicingEntityID.GetMarshalledSize();  // this._servicingEntityID
-            marshalSize += 1;  // this._serviceTypeRequested
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._serviceRequestPadding
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is requesting service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
-        public EntityID RequestingEntityID
-        {
-            get
-            {
-                return this._requestingEntityID;
-            }
-
-            set
-            {
-                this._requestingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is providing the service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "servicingEntityID")]
-        public EntityID ServicingEntityID
-        {
-            get
-            {
-                return this._servicingEntityID;
-            }
-
-            set
-            {
-                this._servicingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of service requested
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "serviceTypeRequested")]
-        public byte ServiceTypeRequested
-        {
-            get
-            {
-                return this._serviceTypeRequested;
-            }
-
-            set
-            {
-                this._serviceTypeRequested = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many requested
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "serviceRequestPadding")]
-        public short ServiceRequestPadding
-        {
-            get
-            {
-                return this._serviceRequestPadding;
-            }
-
-            set
-            {
-                this._serviceRequestPadding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the supplies
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._requestingEntityID.Marshal(dos);
-                    this._servicingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._serviceTypeRequested);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._serviceRequestPadding);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestingEntityID.Unmarshal(dis);
-                    this._servicingEntityID.Unmarshal(dis);
-                    this._serviceTypeRequested = dis.ReadUnsignedByte();
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._serviceRequestPadding = dis.ReadShort();
-
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ServiceRequestPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestingEntityID>");
-                this._requestingEntityID.Reflection(sb);
-                sb.AppendLine("</requestingEntityID>");
-                sb.AppendLine("<servicingEntityID>");
-                this._servicingEntityID.Reflection(sb);
-                sb.AppendLine("</servicingEntityID>");
-                sb.AppendLine("<serviceTypeRequested type=\"byte\">" + this._serviceTypeRequested.ToString(CultureInfo.InvariantCulture) + "</serviceTypeRequested>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<serviceRequestPadding type=\"short\">" + this._serviceRequestPadding.ToString(CultureInfo.InvariantCulture) + "</serviceRequestPadding>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ServiceRequestPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ServiceRequestPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ServiceRequestPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._servicingEntityID.Equals(obj._servicingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._serviceTypeRequested != obj._serviceTypeRequested)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._serviceRequestPadding != obj._serviceRequestPadding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._servicingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._serviceTypeRequested.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._serviceRequestPadding.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.5.1. Information about a request for supplies
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ServiceRequestPdu : LogisticsPdu, IEquatable<ServiceRequestPdu>
+    {
+        /// <summary>
+        /// Entity that is requesting service
+        /// </summary>
+        private EntityID _requestingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is providing the service
+        /// </summary>
+        private EntityID _servicingEntityID = new EntityID();
+
+        /// <summary>
+        /// type of service requested
+        /// </summary>
+        private byte _serviceTypeRequested;
+
+        /// <summary>
+        /// How many requested
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _serviceRequestPadding;
+
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServiceRequestPdu"/> class.
+        /// </summary>
+        public ServiceRequestPdu()
+        {
+            PduType = (byte)5;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ServiceRequestPdu left, ServiceRequestPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ServiceRequestPdu left, ServiceRequestPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
+            marshalSize += this._servicingEntityID.GetMarshalledSize();  // this._servicingEntityID
+            marshalSize += 1;  // this._serviceTypeRequested
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._serviceRequestPadding
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is requesting service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
+        public EntityID RequestingEntityID
+        {
+            get
+            {
+                return this._requestingEntityID;
+            }
+
+            set
+            {
+                this._requestingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is providing the service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "servicingEntityID")]
+        public EntityID ServicingEntityID
+        {
+            get
+            {
+                return this._servicingEntityID;
+            }
+
+            set
+            {
+                this._servicingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of service requested
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "serviceTypeRequested")]
+        public byte ServiceTypeRequested
+        {
+            get
+            {
+                return this._serviceTypeRequested;
+            }
+
+            set
+            {
+                this._serviceTypeRequested = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many requested
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "serviceRequestPadding")]
+        public short ServiceRequestPadding
+        {
+            get
+            {
+                return this._serviceRequestPadding;
+            }
+
+            set
+            {
+                this._serviceRequestPadding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the supplies
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._requestingEntityID.Marshal(dos);
+                    this._servicingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._serviceTypeRequested);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._serviceRequestPadding);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestingEntityID.Unmarshal(dis);
+                    this._servicingEntityID.Unmarshal(dis);
+                    this._serviceTypeRequested = dis.ReadUnsignedByte();
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._serviceRequestPadding = dis.ReadShort();
+
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ServiceRequestPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestingEntityID>");
+                this._requestingEntityID.Reflection(sb);
+                sb.AppendLine("</requestingEntityID>");
+                sb.AppendLine("<servicingEntityID>");
+                this._servicingEntityID.Reflection(sb);
+                sb.AppendLine("</servicingEntityID>");
+                sb.AppendLine("<serviceTypeRequested type=\"byte\">" + this._serviceTypeRequested.ToString(CultureInfo.InvariantCulture) + "</serviceTypeRequested>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<serviceRequestPadding type=\"short\">" + this._serviceRequestPadding.ToString(CultureInfo.InvariantCulture) + "</serviceRequestPadding>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ServiceRequestPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ServiceRequestPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ServiceRequestPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._servicingEntityID.Equals(obj._servicingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._serviceTypeRequested != obj._serviceTypeRequested)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._serviceRequestPadding != obj._serviceRequestPadding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._servicingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._serviceTypeRequested.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._serviceRequestPadding.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SetDataPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/SetDataPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/SetDataPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/SetDataPdu.cs
index 48fc12b..288c3a9 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SetDataPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/SetDataPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6.9. Change state information with the data contained in this
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class SetDataPdu : SimulationManagementPdu, IEquatable<SetDataPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _fixedDatumRecordCount;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _variableDatumRecordCount;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetDataPdu"/> class.
-        /// </summary>
-        public SetDataPdu()
-        {
-            PduType = (byte)19;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SetDataPdu left, SetDataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SetDataPdu left, SetDataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._fixedDatumRecordCount
-            marshalSize += 4;  // this._variableDatumRecordCount
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
-        public uint FixedDatumRecordCount
-        {
-            get
-            {
-                return this._fixedDatumRecordCount;
-            }
-
-            set
-            {
-                this._fixedDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
-        public uint VariableDatumRecordCount
-        {
-            get
-            {
-                return this._variableDatumRecordCount;
-            }
-
-            set
-            {
-                this._variableDatumRecordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
-                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SetDataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SetDataPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SetDataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SetDataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6.9. Change state information with the data contained in this
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class SetDataPdu : SimulationManagementPdu, IEquatable<SetDataPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _fixedDatumRecordCount;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _variableDatumRecordCount;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetDataPdu"/> class.
+        /// </summary>
+        public SetDataPdu()
+        {
+            PduType = (byte)19;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SetDataPdu left, SetDataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SetDataPdu left, SetDataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._fixedDatumRecordCount
+            marshalSize += 4;  // this._variableDatumRecordCount
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getfixedDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumRecordCount")]
+        public uint FixedDatumRecordCount
+        {
+            get
+            {
+                return this._fixedDatumRecordCount;
+            }
+
+            set
+            {
+                this._fixedDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumRecordCount")]
+        public uint VariableDatumRecordCount
+        {
+            get
+            {
+                return this._variableDatumRecordCount;
+            }
+
+            set
+            {
+                this._variableDatumRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._fixedDatumRecordCount = dis.ReadUnsignedInt();
+                    this._variableDatumRecordCount = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.FixedDatumRecordCount; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.VariableDatumRecordCount; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SetDataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SetDataPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SetDataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SetDataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecordCount != obj._fixedDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumRecordCount != obj._variableDatumRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumRecordCount.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SignalPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/SignalPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/SignalPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/SignalPdu.cs
index 763b7b8..0b5796b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SignalPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/SignalPdu.cs
@@ -1,432 +1,432 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU requires        manually written code to comnplete.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SignalPdu : RadioCommunicationsPdu, IEquatable<SignalPdu>
-    {
-        /// <summary>
-        /// encoding scheme used, and enumeration
-        /// </summary>
-        private ushort _encodingScheme;
-
-        /// <summary>
-        /// tdl type
-        /// </summary>
-        private ushort _tdlType;
-
-        /// <summary>
-        /// sample rate
-        /// </summary>
-        private uint _sampleRate;
-
-        /// <summary>
-        /// length od data
-        /// </summary>
-        private short _dataLength;
-
-        /// <summary>
-        /// number of samples
-        /// </summary>
-        private short _samples;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignalPdu"/> class.
-        /// </summary>
-        public SignalPdu()
-        {
-            PduType = (byte)26;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SignalPdu left, SignalPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SignalPdu left, SignalPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._encodingScheme
-            marshalSize += 2;  // this._tdlType
-            marshalSize += 4;  // this._sampleRate
-            marshalSize += 2;  // this._dataLength
-            marshalSize += 2;  // this._samples
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the encoding scheme used, and enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
-        public ushort EncodingScheme
-        {
-            get
-            {
-                return this._encodingScheme;
-            }
-
-            set
-            {
-                this._encodingScheme = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tdl type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
-        public ushort TdlType
-        {
-            get
-            {
-                return this._tdlType;
-            }
-
-            set
-            {
-                this._tdlType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the sample rate
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
-        public uint SampleRate
-        {
-            get
-            {
-                return this._sampleRate;
-            }
-
-            set
-            {
-                this._sampleRate = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length od data
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "dataLength")]
-        public short DataLength
-        {
-            get
-            {
-                return this._dataLength;
-            }
-
-            set
-            {
-                this._dataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of samples
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "samples")]
-        public short Samples
-        {
-            get
-            {
-                return this._samples;
-            }
-
-            set
-            {
-                this._samples = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
-                    dos.WriteUnsignedShort((ushort)this._tdlType);
-                    dos.WriteUnsignedInt((uint)this._sampleRate);
-                    dos.WriteShort((short)this._dataLength);
-                    dos.WriteShort((short)this._samples);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._encodingScheme = dis.ReadUnsignedShort();
-                    this._tdlType = dis.ReadUnsignedShort();
-                    this._sampleRate = dis.ReadUnsignedInt();
-                    this._dataLength = dis.ReadShort();
-                    this._samples = dis.ReadShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SignalPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
-                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
-                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
-                sb.AppendLine("<dataLength type=\"short\">" + this._dataLength.ToString(CultureInfo.InvariantCulture) + "</dataLength>");
-                sb.AppendLine("<samples type=\"short\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
-                sb.AppendLine("</SignalPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SignalPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SignalPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._encodingScheme != obj._encodingScheme)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._tdlType != obj._tdlType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sampleRate != obj._sampleRate)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataLength != obj._dataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._samples != obj._samples)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
-            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
-            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
-            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._samples.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU requires        manually written code to comnplete.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SignalPdu : RadioCommunicationsPdu, IEquatable<SignalPdu>
+    {
+        /// <summary>
+        /// encoding scheme used, and enumeration
+        /// </summary>
+        private ushort _encodingScheme;
+
+        /// <summary>
+        /// tdl type
+        /// </summary>
+        private ushort _tdlType;
+
+        /// <summary>
+        /// sample rate
+        /// </summary>
+        private uint _sampleRate;
+
+        /// <summary>
+        /// length od data
+        /// </summary>
+        private short _dataLength;
+
+        /// <summary>
+        /// number of samples
+        /// </summary>
+        private short _samples;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SignalPdu"/> class.
+        /// </summary>
+        public SignalPdu()
+        {
+            PduType = (byte)26;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SignalPdu left, SignalPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SignalPdu left, SignalPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._encodingScheme
+            marshalSize += 2;  // this._tdlType
+            marshalSize += 4;  // this._sampleRate
+            marshalSize += 2;  // this._dataLength
+            marshalSize += 2;  // this._samples
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding scheme used, and enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
+        public ushort EncodingScheme
+        {
+            get
+            {
+                return this._encodingScheme;
+            }
+
+            set
+            {
+                this._encodingScheme = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tdl type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
+        public ushort TdlType
+        {
+            get
+            {
+                return this._tdlType;
+            }
+
+            set
+            {
+                this._tdlType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the sample rate
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
+        public uint SampleRate
+        {
+            get
+            {
+                return this._sampleRate;
+            }
+
+            set
+            {
+                this._sampleRate = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length od data
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "dataLength")]
+        public short DataLength
+        {
+            get
+            {
+                return this._dataLength;
+            }
+
+            set
+            {
+                this._dataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of samples
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "samples")]
+        public short Samples
+        {
+            get
+            {
+                return this._samples;
+            }
+
+            set
+            {
+                this._samples = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
+                    dos.WriteUnsignedShort((ushort)this._tdlType);
+                    dos.WriteUnsignedInt((uint)this._sampleRate);
+                    dos.WriteShort((short)this._dataLength);
+                    dos.WriteShort((short)this._samples);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._encodingScheme = dis.ReadUnsignedShort();
+                    this._tdlType = dis.ReadUnsignedShort();
+                    this._sampleRate = dis.ReadUnsignedInt();
+                    this._dataLength = dis.ReadShort();
+                    this._samples = dis.ReadShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SignalPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
+                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
+                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
+                sb.AppendLine("<dataLength type=\"short\">" + this._dataLength.ToString(CultureInfo.InvariantCulture) + "</dataLength>");
+                sb.AppendLine("<samples type=\"short\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
+                sb.AppendLine("</SignalPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SignalPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SignalPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._encodingScheme != obj._encodingScheme)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._tdlType != obj._tdlType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sampleRate != obj._sampleRate)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataLength != obj._dataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._samples != obj._samples)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
+            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
+            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
+            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._samples.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationAddress.cs b/Libs/CsharpDis6/Dis1995/Generated/SimulationAddress.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationAddress.cs
rename to Libs/CsharpDis6/Dis1995/Generated/SimulationAddress.cs
index 182bcd2..e5b9918 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationAddress.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/SimulationAddress.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.14.1. A Simulation Address  record shall consist of the Site Identification number and the Application Identification number.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SimulationAddress
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationAddress"/> class.
-        /// </summary>
-        public SimulationAddress()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationAddress left, SimulationAddress right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationAddress left, SimulationAddress right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationAddress>");
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("</SimulationAddress>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationAddress;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationAddress obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.14.1. A Simulation Address  record shall consist of the Site Identification number and the Application Identification number.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SimulationAddress
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationAddress"/> class.
+        /// </summary>
+        public SimulationAddress()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationAddress left, SimulationAddress right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationAddress left, SimulationAddress right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationAddress>");
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("</SimulationAddress>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationAddress;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationAddress obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/SimulationManagementPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/SimulationManagementPdu.cs
index d6ec467..f94b66f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SimulationManagementPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/SimulationManagementPdu.cs
@@ -1,341 +1,341 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.6. Abstract superclass for PDUs relating to the simulation itself
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SimulationManagementPdu : Pdu, IEquatable<SimulationManagementPdu>
-    {
-        /// <summary>
-        /// Entity that is sending message
-        /// </summary>
-        private EntityID _originatingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is intended to receive message
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationManagementPdu"/> class.
-        /// </summary>
-        public SimulationManagementPdu()
-        {
-            ProtocolFamily = (byte)5;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationManagementPdu left, SimulationManagementPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationManagementPdu left, SimulationManagementPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is sending message
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
-        public EntityID OriginatingEntityID
-        {
-            get
-            {
-                return this._originatingEntityID;
-            }
-
-            set
-            {
-                this._originatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is intended to receive message
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Marshal(dos);
-                    this._receivingEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Unmarshal(dis);
-                    this._receivingEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationManagementPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingEntityID>");
-                this._originatingEntityID.Reflection(sb);
-                sb.AppendLine("</originatingEntityID>");
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("</SimulationManagementPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationManagementPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationManagementPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.6. Abstract superclass for PDUs relating to the simulation itself
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SimulationManagementPdu : Pdu, IEquatable<SimulationManagementPdu>
+    {
+        /// <summary>
+        /// Entity that is sending message
+        /// </summary>
+        private EntityID _originatingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is intended to receive message
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationManagementPdu"/> class.
+        /// </summary>
+        public SimulationManagementPdu()
+        {
+            ProtocolFamily = (byte)5;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationManagementPdu left, SimulationManagementPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationManagementPdu left, SimulationManagementPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is sending message
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
+        public EntityID OriginatingEntityID
+        {
+            get
+            {
+                return this._originatingEntityID;
+            }
+
+            set
+            {
+                this._originatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is intended to receive message
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Marshal(dos);
+                    this._receivingEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Unmarshal(dis);
+                    this._receivingEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationManagementPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingEntityID>");
+                this._originatingEntityID.Reflection(sb);
+                sb.AppendLine("</originatingEntityID>");
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("</SimulationManagementPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationManagementPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationManagementPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs b/Libs/CsharpDis6/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
rename to Libs/CsharpDis6/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
index 9c35051..321c490 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/SphericalHarmonicAntennaPattern.cs
@@ -1,297 +1,297 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is of value 2.         Specified the direction and radiation pattern from a radio transmitter's antenna.        NOTE: this class must be hand-coded to clean up some implementation details.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SphericalHarmonicAntennaPattern
-    {
-        private byte _order;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SphericalHarmonicAntennaPattern"/> class.
-        /// </summary>
-        public SphericalHarmonicAntennaPattern()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._order
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the order
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "order")]
-        public byte Order
-        {
-            get
-            {
-                return this._order;
-            }
-
-            set
-            {
-                this._order = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteByte((byte)this._order);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._order = dis.ReadByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SphericalHarmonicAntennaPattern>");
-            try
-            {
-                sb.AppendLine("<order type=\"byte\">" + this._order.ToString(CultureInfo.InvariantCulture) + "</order>");
-                sb.AppendLine("</SphericalHarmonicAntennaPattern>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SphericalHarmonicAntennaPattern;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SphericalHarmonicAntennaPattern obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._order != obj._order)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._order.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is of value 2.         Specified the direction and radiation pattern from a radio transmitter's antenna.        NOTE: this class must be hand-coded to clean up some implementation details.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SphericalHarmonicAntennaPattern
+    {
+        private byte _order;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SphericalHarmonicAntennaPattern"/> class.
+        /// </summary>
+        public SphericalHarmonicAntennaPattern()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._order
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the order
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "order")]
+        public byte Order
+        {
+            get
+            {
+                return this._order;
+            }
+
+            set
+            {
+                this._order = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteByte((byte)this._order);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._order = dis.ReadByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SphericalHarmonicAntennaPattern>");
+            try
+            {
+                sb.AppendLine("<order type=\"byte\">" + this._order.ToString(CultureInfo.InvariantCulture) + "</order>");
+                sb.AppendLine("</SphericalHarmonicAntennaPattern>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SphericalHarmonicAntennaPattern;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SphericalHarmonicAntennaPattern obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._order != obj._order)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._order.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/StartResumePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/StartResumePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/StartResumePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/StartResumePdu.cs
index a95d2a7..ad7bc45 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/StartResumePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/StartResumePdu.cs
@@ -1,373 +1,373 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.6.3. Start or resume an exercise
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StartResumePdu : SimulationManagementPdu, IEquatable<StartResumePdu>
-    {
-        /// <summary>
-        /// UTC time at which the simulation shall start or resume
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// Simulation clock time at which the simulation shall start or resume
-        /// </summary>
-        private ClockTime _simulationTime = new ClockTime();
-
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartResumePdu"/> class.
-        /// </summary>
-        public StartResumePdu()
-        {
-            PduType = (byte)13;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StartResumePdu left, StartResumePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StartResumePdu left, StartResumePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the UTC time at which the simulation shall start or resume
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Simulation clock time at which the simulation shall start or resume
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
-        public ClockTime SimulationTime
-        {
-            get
-            {
-                return this._simulationTime;
-            }
-
-            set
-            {
-                this._simulationTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    this._simulationTime.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._simulationTime.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StartResumePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<simulationTime>");
-                this._simulationTime.Reflection(sb);
-                sb.AppendLine("</simulationTime>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StartResumePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StartResumePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StartResumePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._simulationTime.Equals(obj._simulationTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.6.3. Start or resume an exercise
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StartResumePdu : SimulationManagementPdu, IEquatable<StartResumePdu>
+    {
+        /// <summary>
+        /// UTC time at which the simulation shall start or resume
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// Simulation clock time at which the simulation shall start or resume
+        /// </summary>
+        private ClockTime _simulationTime = new ClockTime();
+
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartResumePdu"/> class.
+        /// </summary>
+        public StartResumePdu()
+        {
+            PduType = (byte)13;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StartResumePdu left, StartResumePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StartResumePdu left, StartResumePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the UTC time at which the simulation shall start or resume
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Simulation clock time at which the simulation shall start or resume
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
+        public ClockTime SimulationTime
+        {
+            get
+            {
+                return this._simulationTime;
+            }
+
+            set
+            {
+                this._simulationTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    this._simulationTime.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._simulationTime.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StartResumePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<simulationTime>");
+                this._simulationTime.Reflection(sb);
+                sb.AppendLine("</simulationTime>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StartResumePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StartResumePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StartResumePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._simulationTime.Equals(obj._simulationTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/StopFreezePdu.cs b/Libs/CsharpDis6/Dis1995/Generated/StopFreezePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/StopFreezePdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/StopFreezePdu.cs
index 978e163..f8a7dc7 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/StopFreezePdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/StopFreezePdu.cs
@@ -1,435 +1,435 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.3.4. Stop or freeze an exercise
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StopFreezePdu : SimulationManagementPdu, IEquatable<StopFreezePdu>
-    {
-        /// <summary>
-        /// UTC time at which the simulation shall stop or freeze
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// Reason the simulation was stopped or frozen
-        /// </summary>
-        private byte _reason;
-
-        /// <summary>
-        /// Internal behavior of the simulation and its appearance while frozento the other participants
-        /// </summary>
-        private byte _frozenBehavior;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StopFreezePdu"/> class.
-        /// </summary>
-        public StopFreezePdu()
-        {
-            PduType = (byte)14;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StopFreezePdu left, StopFreezePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StopFreezePdu left, StopFreezePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += 1;  // this._reason
-            marshalSize += 1;  // this._frozenBehavior
-            marshalSize += 2;  // this._padding1
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the UTC time at which the simulation shall stop or freeze
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Reason the simulation was stopped or frozen
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "reason")]
-        public byte Reason
-        {
-            get
-            {
-                return this._reason;
-            }
-
-            set
-            {
-                this._reason = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Internal behavior of the simulation and its appearance while frozento the other participants
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
-        public byte FrozenBehavior
-        {
-            get
-            {
-                return this._frozenBehavior;
-            }
-
-            set
-            {
-                this._frozenBehavior = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._reason);
-                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._reason = dis.ReadUnsignedByte();
-                    this._frozenBehavior = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StopFreezePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
-                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StopFreezePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StopFreezePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StopFreezePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._reason != obj._reason)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frozenBehavior != obj._frozenBehavior)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._reason.GetHashCode();
-            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.3.4. Stop or freeze an exercise
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StopFreezePdu : SimulationManagementPdu, IEquatable<StopFreezePdu>
+    {
+        /// <summary>
+        /// UTC time at which the simulation shall stop or freeze
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// Reason the simulation was stopped or frozen
+        /// </summary>
+        private byte _reason;
+
+        /// <summary>
+        /// Internal behavior of the simulation and its appearance while frozento the other participants
+        /// </summary>
+        private byte _frozenBehavior;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StopFreezePdu"/> class.
+        /// </summary>
+        public StopFreezePdu()
+        {
+            PduType = (byte)14;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StopFreezePdu left, StopFreezePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StopFreezePdu left, StopFreezePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += 1;  // this._reason
+            marshalSize += 1;  // this._frozenBehavior
+            marshalSize += 2;  // this._padding1
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the UTC time at which the simulation shall stop or freeze
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Reason the simulation was stopped or frozen
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "reason")]
+        public byte Reason
+        {
+            get
+            {
+                return this._reason;
+            }
+
+            set
+            {
+                this._reason = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Internal behavior of the simulation and its appearance while frozento the other participants
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
+        public byte FrozenBehavior
+        {
+            get
+            {
+                return this._frozenBehavior;
+            }
+
+            set
+            {
+                this._frozenBehavior = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._reason);
+                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._reason = dis.ReadUnsignedByte();
+                    this._frozenBehavior = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StopFreezePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
+                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StopFreezePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StopFreezePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StopFreezePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._reason != obj._reason)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frozenBehavior != obj._frozenBehavior)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._reason.GetHashCode();
+            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SupplyQuantity.cs b/Libs/CsharpDis6/Dis1995/Generated/SupplyQuantity.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/SupplyQuantity.cs
rename to Libs/CsharpDis6/Dis1995/Generated/SupplyQuantity.cs
index 121427a..7daadc2 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/SupplyQuantity.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/SupplyQuantity.cs
@@ -1,335 +1,335 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.30. A supply, and the amount of that supply. Similar to an entity kind but with the addition of a quantity.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SupplyQuantity
-    {
-        /// <summary>
-        /// Type of supply
-        /// </summary>
-        private EntityID _supplyType = new EntityID();
-
-        /// <summary>
-        /// quantity to be supplied
-        /// </summary>
-        private byte _quantity;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SupplyQuantity"/> class.
-        /// </summary>
-        public SupplyQuantity()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SupplyQuantity left, SupplyQuantity right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SupplyQuantity left, SupplyQuantity right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._supplyType.GetMarshalledSize();  // this._supplyType
-            marshalSize += 1;  // this._quantity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of supply
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyType")]
-        public EntityID SupplyType
-        {
-            get
-            {
-                return this._supplyType;
-            }
-
-            set
-            {
-                this._supplyType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the quantity to be supplied
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "quantity")]
-        public byte Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._supplyType.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._quantity);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._supplyType.Unmarshal(dis);
-                    this._quantity = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SupplyQuantity>");
-            try
-            {
-                sb.AppendLine("<supplyType>");
-                this._supplyType.Reflection(sb);
-                sb.AppendLine("</supplyType>");
-                sb.AppendLine("<quantity type=\"byte\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("</SupplyQuantity>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SupplyQuantity;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SupplyQuantity obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._supplyType.Equals(obj._supplyType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._supplyType.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.30. A supply, and the amount of that supply. Similar to an entity kind but with the addition of a quantity.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SupplyQuantity
+    {
+        /// <summary>
+        /// Type of supply
+        /// </summary>
+        private EntityID _supplyType = new EntityID();
+
+        /// <summary>
+        /// quantity to be supplied
+        /// </summary>
+        private byte _quantity;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SupplyQuantity"/> class.
+        /// </summary>
+        public SupplyQuantity()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SupplyQuantity left, SupplyQuantity right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SupplyQuantity left, SupplyQuantity right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._supplyType.GetMarshalledSize();  // this._supplyType
+            marshalSize += 1;  // this._quantity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of supply
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyType")]
+        public EntityID SupplyType
+        {
+            get
+            {
+                return this._supplyType;
+            }
+
+            set
+            {
+                this._supplyType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the quantity to be supplied
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "quantity")]
+        public byte Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._supplyType.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._quantity);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._supplyType.Unmarshal(dis);
+                    this._quantity = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SupplyQuantity>");
+            try
+            {
+                sb.AppendLine("<supplyType>");
+                this._supplyType.Reflection(sb);
+                sb.AppendLine("</supplyType>");
+                sb.AppendLine("<quantity type=\"byte\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("</SupplyQuantity>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SupplyQuantity;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SupplyQuantity obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._supplyType.Equals(obj._supplyType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._supplyType.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/TransmitterPdu.cs b/Libs/CsharpDis6/Dis1995/Generated/TransmitterPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/TransmitterPdu.cs
rename to Libs/CsharpDis6/Dis1995/Generated/TransmitterPdu.cs
index 8aa92ce..fb4cc90 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/TransmitterPdu.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/TransmitterPdu.cs
@@ -1,975 +1,975 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU requires        manually written code to complete.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(RadioEntityType))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(ModulationType))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class TransmitterPdu : RadioCommunicationsPdu, IEquatable<TransmitterPdu>
-    {
-        /// <summary>
-        /// linear accelleration of entity
-        /// </summary>
-        private RadioEntityType _radioEntityType = new RadioEntityType();
-
-        /// <summary>
-        /// transmit state
-        /// </summary>
-        private byte _transmitState;
-
-        /// <summary>
-        /// input source
-        /// </summary>
-        private byte _inputSource;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// Location of antenna
-        /// </summary>
-        private Vector3Double _antennaLocation = new Vector3Double();
-
-        /// <summary>
-        /// relative location of antenna
-        /// </summary>
-        private Vector3Double _relativeAntennaLocation = new Vector3Double();
-
-        /// <summary>
-        /// atenna pattern type
-        /// </summary>
-        private ushort _antennaPatternType;
-
-        /// <summary>
-        /// atenna pattern length
-        /// </summary>
-        private ushort _antennaPatternCount;
-
-        /// <summary>
-        /// frequency
-        /// </summary>
-        private double _frequency;
-
-        /// <summary>
-        /// transmit frequency Bandwidth
-        /// </summary>
-        private float _transmitFrequencyBandwidth;
-
-        /// <summary>
-        /// transmission power
-        /// </summary>
-        private float _power;
-
-        /// <summary>
-        /// modulation
-        /// </summary>
-        private ModulationType _modulationType = new ModulationType();
-
-        /// <summary>
-        /// crypto system enumeration
-        /// </summary>
-        private ushort _cryptoSystem;
-
-        /// <summary>
-        /// crypto system key identifer
-        /// </summary>
-        private ushort _cryptoKeyId;
-
-        /// <summary>
-        /// how many modulation parameters we have
-        /// </summary>
-        private byte _modulationParameterCount;
-
-        /// <summary>
-        /// padding2
-        /// </summary>
-        private ushort _padding2;
-
-        /// <summary>
-        /// padding3
-        /// </summary>
-        private byte _padding3;
-
-        /// <summary>
-        /// variable length list of modulation parameters
-        /// </summary>
-        private List<Vector3Float> _modulationParametersList = new List<Vector3Float>();
-
-        /// <summary>
-        /// variable length list of antenna pattern records
-        /// </summary>
-        private List<Vector3Float> _antennaPatternList = new List<Vector3Float>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransmitterPdu"/> class.
-        /// </summary>
-        public TransmitterPdu()
-        {
-            PduType = (byte)25;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TransmitterPdu left, TransmitterPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TransmitterPdu left, TransmitterPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._radioEntityType.GetMarshalledSize();  // this._radioEntityType
-            marshalSize += 1;  // this._transmitState
-            marshalSize += 1;  // this._inputSource
-            marshalSize += 2;  // this._padding1
-            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
-            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
-            marshalSize += 2;  // this._antennaPatternType
-            marshalSize += 2;  // this._antennaPatternCount
-            marshalSize += 8;  // this._frequency
-            marshalSize += 4;  // this._transmitFrequencyBandwidth
-            marshalSize += 4;  // this._power
-            marshalSize += this._modulationType.GetMarshalledSize();  // this._modulationType
-            marshalSize += 2;  // this._cryptoSystem
-            marshalSize += 2;  // this._cryptoKeyId
-            marshalSize += 1;  // this._modulationParameterCount
-            marshalSize += 2;  // this._padding2
-            marshalSize += 1;  // this._padding3
-            for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._modulationParametersList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._antennaPatternList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the linear accelleration of entity
-        /// </summary>
-        [XmlElement(Type = typeof(RadioEntityType), ElementName = "radioEntityType")]
-        public RadioEntityType RadioEntityType
-        {
-            get
-            {
-                return this._radioEntityType;
-            }
-
-            set
-            {
-                this._radioEntityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the transmit state
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "transmitState")]
-        public byte TransmitState
-        {
-            get
-            {
-                return this._transmitState;
-            }
-
-            set
-            {
-                this._transmitState = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the input source
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "inputSource")]
-        public byte InputSource
-        {
-            get
-            {
-                return this._inputSource;
-            }
-
-            set
-            {
-                this._inputSource = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of antenna
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
-        public Vector3Double AntennaLocation
-        {
-            get
-            {
-                return this._antennaLocation;
-            }
-
-            set
-            {
-                this._antennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the relative location of antenna
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "relativeAntennaLocation")]
-        public Vector3Double RelativeAntennaLocation
-        {
-            get
-            {
-                return this._relativeAntennaLocation;
-            }
-
-            set
-            {
-                this._relativeAntennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the atenna pattern type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternType")]
-        public ushort AntennaPatternType
-        {
-            get
-            {
-                return this._antennaPatternType;
-            }
-
-            set
-            {
-                this._antennaPatternType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the atenna pattern length
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getantennaPatternCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternCount")]
-        public ushort AntennaPatternCount
-        {
-            get
-            {
-                return this._antennaPatternCount;
-            }
-
-            set
-            {
-                this._antennaPatternCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the frequency
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "frequency")]
-        public double Frequency
-        {
-            get
-            {
-                return this._frequency;
-            }
-
-            set
-            {
-                this._frequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the transmit frequency Bandwidth
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "transmitFrequencyBandwidth")]
-        public float TransmitFrequencyBandwidth
-        {
-            get
-            {
-                return this._transmitFrequencyBandwidth;
-            }
-
-            set
-            {
-                this._transmitFrequencyBandwidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the transmission power
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "power")]
-        public float Power
-        {
-            get
-            {
-                return this._power;
-            }
-
-            set
-            {
-                this._power = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the modulation
-        /// </summary>
-        [XmlElement(Type = typeof(ModulationType), ElementName = "modulationType")]
-        public ModulationType ModulationType
-        {
-            get
-            {
-                return this._modulationType;
-            }
-
-            set
-            {
-                this._modulationType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the crypto system enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "cryptoSystem")]
-        public ushort CryptoSystem
-        {
-            get
-            {
-                return this._cryptoSystem;
-            }
-
-            set
-            {
-                this._cryptoSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the crypto system key identifer
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "cryptoKeyId")]
-        public ushort CryptoKeyId
-        {
-            get
-            {
-                return this._cryptoKeyId;
-            }
-
-            set
-            {
-                this._cryptoKeyId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many modulation parameters we have
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getmodulationParameterCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "modulationParameterCount")]
-        public byte ModulationParameterCount
-        {
-            get
-            {
-                return this._modulationParameterCount;
-            }
-
-            set
-            {
-                this._modulationParameterCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding2
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
-        public ushort Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding3
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding3")]
-        public byte Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of modulation parameters
-        /// </summary>
-        [XmlElement(ElementName = "modulationParametersListList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> ModulationParametersList
-        {
-            get
-            {
-                return this._modulationParametersList;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of antenna pattern records
-        /// </summary>
-        [XmlElement(ElementName = "antennaPatternListList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> AntennaPatternList
-        {
-            get
-            {
-                return this._antennaPatternList;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._radioEntityType.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._transmitState);
-                    dos.WriteUnsignedByte((byte)this._inputSource);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    this._antennaLocation.Marshal(dos);
-                    this._relativeAntennaLocation.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._antennaPatternType);
-                    dos.WriteUnsignedShort((ushort)this._antennaPatternList.Count);
-                    dos.WriteDouble((double)this._frequency);
-                    dos.WriteFloat((float)this._transmitFrequencyBandwidth);
-                    dos.WriteFloat((float)this._power);
-                    this._modulationType.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._cryptoSystem);
-                    dos.WriteUnsignedShort((ushort)this._cryptoKeyId);
-                    dos.WriteUnsignedByte((byte)this._modulationParametersList.Count);
-                    dos.WriteUnsignedShort((ushort)this._padding2);
-                    dos.WriteUnsignedByte((byte)this._padding3);
-
-                    for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._radioEntityType.Unmarshal(dis);
-                    this._transmitState = dis.ReadUnsignedByte();
-                    this._inputSource = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._antennaLocation.Unmarshal(dis);
-                    this._relativeAntennaLocation.Unmarshal(dis);
-                    this._antennaPatternType = dis.ReadUnsignedShort();
-                    this._antennaPatternCount = dis.ReadUnsignedShort();
-                    this._frequency = dis.ReadDouble();
-                    this._transmitFrequencyBandwidth = dis.ReadFloat();
-                    this._power = dis.ReadFloat();
-                    this._modulationType.Unmarshal(dis);
-                    this._cryptoSystem = dis.ReadUnsignedShort();
-                    this._cryptoKeyId = dis.ReadUnsignedShort();
-                    this._modulationParameterCount = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedShort();
-                    this._padding3 = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.ModulationParameterCount; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._modulationParametersList.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.AntennaPatternCount; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._antennaPatternList.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TransmitterPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<radioEntityType>");
-                this._radioEntityType.Reflection(sb);
-                sb.AppendLine("</radioEntityType>");
-                sb.AppendLine("<transmitState type=\"byte\">" + this._transmitState.ToString(CultureInfo.InvariantCulture) + "</transmitState>");
-                sb.AppendLine("<inputSource type=\"byte\">" + this._inputSource.ToString(CultureInfo.InvariantCulture) + "</inputSource>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<antennaLocation>");
-                this._antennaLocation.Reflection(sb);
-                sb.AppendLine("</antennaLocation>");
-                sb.AppendLine("<relativeAntennaLocation>");
-                this._relativeAntennaLocation.Reflection(sb);
-                sb.AppendLine("</relativeAntennaLocation>");
-                sb.AppendLine("<antennaPatternType type=\"ushort\">" + this._antennaPatternType.ToString(CultureInfo.InvariantCulture) + "</antennaPatternType>");
-                sb.AppendLine("<antennaPatternList type=\"ushort\">" + this._antennaPatternList.Count.ToString(CultureInfo.InvariantCulture) + "</antennaPatternList>");
-                sb.AppendLine("<frequency type=\"double\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
-                sb.AppendLine("<transmitFrequencyBandwidth type=\"float\">" + this._transmitFrequencyBandwidth.ToString(CultureInfo.InvariantCulture) + "</transmitFrequencyBandwidth>");
-                sb.AppendLine("<power type=\"float\">" + this._power.ToString(CultureInfo.InvariantCulture) + "</power>");
-                sb.AppendLine("<modulationType>");
-                this._modulationType.Reflection(sb);
-                sb.AppendLine("</modulationType>");
-                sb.AppendLine("<cryptoSystem type=\"ushort\">" + this._cryptoSystem.ToString(CultureInfo.InvariantCulture) + "</cryptoSystem>");
-                sb.AppendLine("<cryptoKeyId type=\"ushort\">" + this._cryptoKeyId.ToString(CultureInfo.InvariantCulture) + "</cryptoKeyId>");
-                sb.AppendLine("<modulationParametersList type=\"byte\">" + this._modulationParametersList.Count.ToString(CultureInfo.InvariantCulture) + "</modulationParametersList>");
-                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<padding3 type=\"byte\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                {
-                    sb.AppendLine("<modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                {
-                    sb.AppendLine("<antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</TransmitterPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TransmitterPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TransmitterPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._radioEntityType.Equals(obj._radioEntityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitState != obj._transmitState)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._inputSource != obj._inputSource)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._antennaLocation.Equals(obj._antennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._antennaPatternType != obj._antennaPatternType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._antennaPatternCount != obj._antennaPatternCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frequency != obj._frequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitFrequencyBandwidth != obj._transmitFrequencyBandwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._power != obj._power)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._modulationType.Equals(obj._modulationType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._cryptoSystem != obj._cryptoSystem)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._cryptoKeyId != obj._cryptoKeyId)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modulationParameterCount != obj._modulationParameterCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modulationParametersList.Count != obj._modulationParametersList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                {
-                    if (!this._modulationParametersList[idx].Equals(obj._modulationParametersList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._antennaPatternList.Count != obj._antennaPatternList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                {
-                    if (!this._antennaPatternList[idx].Equals(obj._antennaPatternList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._radioEntityType.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitState.GetHashCode();
-            result = GenerateHash(result) ^ this._inputSource.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._antennaPatternType.GetHashCode();
-            result = GenerateHash(result) ^ this._antennaPatternCount.GetHashCode();
-            result = GenerateHash(result) ^ this._frequency.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitFrequencyBandwidth.GetHashCode();
-            result = GenerateHash(result) ^ this._power.GetHashCode();
-            result = GenerateHash(result) ^ this._modulationType.GetHashCode();
-            result = GenerateHash(result) ^ this._cryptoSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._cryptoKeyId.GetHashCode();
-            result = GenerateHash(result) ^ this._modulationParameterCount.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-
-            if (this._modulationParametersList.Count > 0)
-            {
-                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._modulationParametersList[idx].GetHashCode();
-                }
-            }
-
-            if (this._antennaPatternList.Count > 0)
-            {
-                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._antennaPatternList[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU requires        manually written code to complete.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(RadioEntityType))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(ModulationType))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class TransmitterPdu : RadioCommunicationsPdu, IEquatable<TransmitterPdu>
+    {
+        /// <summary>
+        /// linear accelleration of entity
+        /// </summary>
+        private RadioEntityType _radioEntityType = new RadioEntityType();
+
+        /// <summary>
+        /// transmit state
+        /// </summary>
+        private byte _transmitState;
+
+        /// <summary>
+        /// input source
+        /// </summary>
+        private byte _inputSource;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// Location of antenna
+        /// </summary>
+        private Vector3Double _antennaLocation = new Vector3Double();
+
+        /// <summary>
+        /// relative location of antenna
+        /// </summary>
+        private Vector3Double _relativeAntennaLocation = new Vector3Double();
+
+        /// <summary>
+        /// atenna pattern type
+        /// </summary>
+        private ushort _antennaPatternType;
+
+        /// <summary>
+        /// atenna pattern length
+        /// </summary>
+        private ushort _antennaPatternCount;
+
+        /// <summary>
+        /// frequency
+        /// </summary>
+        private double _frequency;
+
+        /// <summary>
+        /// transmit frequency Bandwidth
+        /// </summary>
+        private float _transmitFrequencyBandwidth;
+
+        /// <summary>
+        /// transmission power
+        /// </summary>
+        private float _power;
+
+        /// <summary>
+        /// modulation
+        /// </summary>
+        private ModulationType _modulationType = new ModulationType();
+
+        /// <summary>
+        /// crypto system enumeration
+        /// </summary>
+        private ushort _cryptoSystem;
+
+        /// <summary>
+        /// crypto system key identifer
+        /// </summary>
+        private ushort _cryptoKeyId;
+
+        /// <summary>
+        /// how many modulation parameters we have
+        /// </summary>
+        private byte _modulationParameterCount;
+
+        /// <summary>
+        /// padding2
+        /// </summary>
+        private ushort _padding2;
+
+        /// <summary>
+        /// padding3
+        /// </summary>
+        private byte _padding3;
+
+        /// <summary>
+        /// variable length list of modulation parameters
+        /// </summary>
+        private List<Vector3Float> _modulationParametersList = new List<Vector3Float>();
+
+        /// <summary>
+        /// variable length list of antenna pattern records
+        /// </summary>
+        private List<Vector3Float> _antennaPatternList = new List<Vector3Float>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TransmitterPdu"/> class.
+        /// </summary>
+        public TransmitterPdu()
+        {
+            PduType = (byte)25;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TransmitterPdu left, TransmitterPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TransmitterPdu left, TransmitterPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._radioEntityType.GetMarshalledSize();  // this._radioEntityType
+            marshalSize += 1;  // this._transmitState
+            marshalSize += 1;  // this._inputSource
+            marshalSize += 2;  // this._padding1
+            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
+            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
+            marshalSize += 2;  // this._antennaPatternType
+            marshalSize += 2;  // this._antennaPatternCount
+            marshalSize += 8;  // this._frequency
+            marshalSize += 4;  // this._transmitFrequencyBandwidth
+            marshalSize += 4;  // this._power
+            marshalSize += this._modulationType.GetMarshalledSize();  // this._modulationType
+            marshalSize += 2;  // this._cryptoSystem
+            marshalSize += 2;  // this._cryptoKeyId
+            marshalSize += 1;  // this._modulationParameterCount
+            marshalSize += 2;  // this._padding2
+            marshalSize += 1;  // this._padding3
+            for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._modulationParametersList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._antennaPatternList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the linear accelleration of entity
+        /// </summary>
+        [XmlElement(Type = typeof(RadioEntityType), ElementName = "radioEntityType")]
+        public RadioEntityType RadioEntityType
+        {
+            get
+            {
+                return this._radioEntityType;
+            }
+
+            set
+            {
+                this._radioEntityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the transmit state
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "transmitState")]
+        public byte TransmitState
+        {
+            get
+            {
+                return this._transmitState;
+            }
+
+            set
+            {
+                this._transmitState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the input source
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "inputSource")]
+        public byte InputSource
+        {
+            get
+            {
+                return this._inputSource;
+            }
+
+            set
+            {
+                this._inputSource = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of antenna
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
+        public Vector3Double AntennaLocation
+        {
+            get
+            {
+                return this._antennaLocation;
+            }
+
+            set
+            {
+                this._antennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the relative location of antenna
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "relativeAntennaLocation")]
+        public Vector3Double RelativeAntennaLocation
+        {
+            get
+            {
+                return this._relativeAntennaLocation;
+            }
+
+            set
+            {
+                this._relativeAntennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the atenna pattern type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternType")]
+        public ushort AntennaPatternType
+        {
+            get
+            {
+                return this._antennaPatternType;
+            }
+
+            set
+            {
+                this._antennaPatternType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the atenna pattern length
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getantennaPatternCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternCount")]
+        public ushort AntennaPatternCount
+        {
+            get
+            {
+                return this._antennaPatternCount;
+            }
+
+            set
+            {
+                this._antennaPatternCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the frequency
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "frequency")]
+        public double Frequency
+        {
+            get
+            {
+                return this._frequency;
+            }
+
+            set
+            {
+                this._frequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the transmit frequency Bandwidth
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "transmitFrequencyBandwidth")]
+        public float TransmitFrequencyBandwidth
+        {
+            get
+            {
+                return this._transmitFrequencyBandwidth;
+            }
+
+            set
+            {
+                this._transmitFrequencyBandwidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the transmission power
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "power")]
+        public float Power
+        {
+            get
+            {
+                return this._power;
+            }
+
+            set
+            {
+                this._power = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modulation
+        /// </summary>
+        [XmlElement(Type = typeof(ModulationType), ElementName = "modulationType")]
+        public ModulationType ModulationType
+        {
+            get
+            {
+                return this._modulationType;
+            }
+
+            set
+            {
+                this._modulationType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the crypto system enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "cryptoSystem")]
+        public ushort CryptoSystem
+        {
+            get
+            {
+                return this._cryptoSystem;
+            }
+
+            set
+            {
+                this._cryptoSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the crypto system key identifer
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "cryptoKeyId")]
+        public ushort CryptoKeyId
+        {
+            get
+            {
+                return this._cryptoKeyId;
+            }
+
+            set
+            {
+                this._cryptoKeyId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many modulation parameters we have
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getmodulationParameterCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "modulationParameterCount")]
+        public byte ModulationParameterCount
+        {
+            get
+            {
+                return this._modulationParameterCount;
+            }
+
+            set
+            {
+                this._modulationParameterCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding2
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
+        public ushort Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding3
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding3")]
+        public byte Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of modulation parameters
+        /// </summary>
+        [XmlElement(ElementName = "modulationParametersListList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> ModulationParametersList
+        {
+            get
+            {
+                return this._modulationParametersList;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of antenna pattern records
+        /// </summary>
+        [XmlElement(ElementName = "antennaPatternListList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> AntennaPatternList
+        {
+            get
+            {
+                return this._antennaPatternList;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._radioEntityType.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._transmitState);
+                    dos.WriteUnsignedByte((byte)this._inputSource);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    this._antennaLocation.Marshal(dos);
+                    this._relativeAntennaLocation.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._antennaPatternType);
+                    dos.WriteUnsignedShort((ushort)this._antennaPatternList.Count);
+                    dos.WriteDouble((double)this._frequency);
+                    dos.WriteFloat((float)this._transmitFrequencyBandwidth);
+                    dos.WriteFloat((float)this._power);
+                    this._modulationType.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._cryptoSystem);
+                    dos.WriteUnsignedShort((ushort)this._cryptoKeyId);
+                    dos.WriteUnsignedByte((byte)this._modulationParametersList.Count);
+                    dos.WriteUnsignedShort((ushort)this._padding2);
+                    dos.WriteUnsignedByte((byte)this._padding3);
+
+                    for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._radioEntityType.Unmarshal(dis);
+                    this._transmitState = dis.ReadUnsignedByte();
+                    this._inputSource = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._antennaLocation.Unmarshal(dis);
+                    this._relativeAntennaLocation.Unmarshal(dis);
+                    this._antennaPatternType = dis.ReadUnsignedShort();
+                    this._antennaPatternCount = dis.ReadUnsignedShort();
+                    this._frequency = dis.ReadDouble();
+                    this._transmitFrequencyBandwidth = dis.ReadFloat();
+                    this._power = dis.ReadFloat();
+                    this._modulationType.Unmarshal(dis);
+                    this._cryptoSystem = dis.ReadUnsignedShort();
+                    this._cryptoKeyId = dis.ReadUnsignedShort();
+                    this._modulationParameterCount = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedShort();
+                    this._padding3 = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.ModulationParameterCount; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._modulationParametersList.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.AntennaPatternCount; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._antennaPatternList.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TransmitterPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<radioEntityType>");
+                this._radioEntityType.Reflection(sb);
+                sb.AppendLine("</radioEntityType>");
+                sb.AppendLine("<transmitState type=\"byte\">" + this._transmitState.ToString(CultureInfo.InvariantCulture) + "</transmitState>");
+                sb.AppendLine("<inputSource type=\"byte\">" + this._inputSource.ToString(CultureInfo.InvariantCulture) + "</inputSource>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<antennaLocation>");
+                this._antennaLocation.Reflection(sb);
+                sb.AppendLine("</antennaLocation>");
+                sb.AppendLine("<relativeAntennaLocation>");
+                this._relativeAntennaLocation.Reflection(sb);
+                sb.AppendLine("</relativeAntennaLocation>");
+                sb.AppendLine("<antennaPatternType type=\"ushort\">" + this._antennaPatternType.ToString(CultureInfo.InvariantCulture) + "</antennaPatternType>");
+                sb.AppendLine("<antennaPatternList type=\"ushort\">" + this._antennaPatternList.Count.ToString(CultureInfo.InvariantCulture) + "</antennaPatternList>");
+                sb.AppendLine("<frequency type=\"double\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
+                sb.AppendLine("<transmitFrequencyBandwidth type=\"float\">" + this._transmitFrequencyBandwidth.ToString(CultureInfo.InvariantCulture) + "</transmitFrequencyBandwidth>");
+                sb.AppendLine("<power type=\"float\">" + this._power.ToString(CultureInfo.InvariantCulture) + "</power>");
+                sb.AppendLine("<modulationType>");
+                this._modulationType.Reflection(sb);
+                sb.AppendLine("</modulationType>");
+                sb.AppendLine("<cryptoSystem type=\"ushort\">" + this._cryptoSystem.ToString(CultureInfo.InvariantCulture) + "</cryptoSystem>");
+                sb.AppendLine("<cryptoKeyId type=\"ushort\">" + this._cryptoKeyId.ToString(CultureInfo.InvariantCulture) + "</cryptoKeyId>");
+                sb.AppendLine("<modulationParametersList type=\"byte\">" + this._modulationParametersList.Count.ToString(CultureInfo.InvariantCulture) + "</modulationParametersList>");
+                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<padding3 type=\"byte\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                {
+                    sb.AppendLine("<modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                {
+                    sb.AppendLine("<antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</TransmitterPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TransmitterPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TransmitterPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._radioEntityType.Equals(obj._radioEntityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitState != obj._transmitState)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._inputSource != obj._inputSource)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._antennaLocation.Equals(obj._antennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._antennaPatternType != obj._antennaPatternType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._antennaPatternCount != obj._antennaPatternCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frequency != obj._frequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitFrequencyBandwidth != obj._transmitFrequencyBandwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._power != obj._power)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._modulationType.Equals(obj._modulationType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._cryptoSystem != obj._cryptoSystem)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._cryptoKeyId != obj._cryptoKeyId)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modulationParameterCount != obj._modulationParameterCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modulationParametersList.Count != obj._modulationParametersList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                {
+                    if (!this._modulationParametersList[idx].Equals(obj._modulationParametersList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._antennaPatternList.Count != obj._antennaPatternList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                {
+                    if (!this._antennaPatternList[idx].Equals(obj._antennaPatternList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._radioEntityType.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitState.GetHashCode();
+            result = GenerateHash(result) ^ this._inputSource.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._antennaPatternType.GetHashCode();
+            result = GenerateHash(result) ^ this._antennaPatternCount.GetHashCode();
+            result = GenerateHash(result) ^ this._frequency.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitFrequencyBandwidth.GetHashCode();
+            result = GenerateHash(result) ^ this._power.GetHashCode();
+            result = GenerateHash(result) ^ this._modulationType.GetHashCode();
+            result = GenerateHash(result) ^ this._cryptoSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._cryptoKeyId.GetHashCode();
+            result = GenerateHash(result) ^ this._modulationParameterCount.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+
+            if (this._modulationParametersList.Count > 0)
+            {
+                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._modulationParametersList[idx].GetHashCode();
+                }
+            }
+
+            if (this._antennaPatternList.Count > 0)
+            {
+                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._antennaPatternList[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/VariableDatum.cs b/Libs/CsharpDis6/Dis1995/Generated/VariableDatum.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/VariableDatum.cs
rename to Libs/CsharpDis6/Dis1995/Generated/VariableDatum.cs
index 134b599..6ee155a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/VariableDatum.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/VariableDatum.cs
@@ -1,406 +1,406 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.32. Variable Datum Record
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EightByteChunk))]
-    public partial class VariableDatum
-    {
-        /// <summary>
-        /// ID of the variable datum
-        /// </summary>
-        private uint _variableDatumID;
-
-        /// <summary>
-        /// length of the variable datums
-        /// </summary>
-        private uint _variableDatumLength;
-
-        /// <summary>
-        /// variable length list of 64-bit datums
-        /// </summary>
-        private List<EightByteChunk> _variableDatums = new List<EightByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VariableDatum"/> class.
-        /// </summary>
-        public VariableDatum()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(VariableDatum left, VariableDatum right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(VariableDatum left, VariableDatum right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._variableDatumID
-            marshalSize += 4;  // this._variableDatumLength
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                EightByteChunk listElement = (EightByteChunk)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the variable datum
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumID")]
-        public uint VariableDatumID
-        {
-            get
-            {
-                return this._variableDatumID;
-            }
-
-            set
-            {
-                this._variableDatumID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length of the variable datums
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getvariableDatumLength method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumLength")]
-        public uint VariableDatumLength
-        {
-            get
-            {
-                return this._variableDatumLength;
-            }
-
-            set
-            {
-                this._variableDatumLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of 64-bit datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<EightByteChunk>))]
-        public List<EightByteChunk> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._variableDatumID);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
-                        aEightByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._variableDatumID = dis.ReadUnsignedInt();
-                    this._variableDatumLength = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.VariableDatumLength; idx++)
-                    {
-                        EightByteChunk anX = new EightByteChunk();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<VariableDatum>");
-            try
-            {
-                sb.AppendLine("<variableDatumID type=\"uint\">" + this._variableDatumID.ToString(CultureInfo.InvariantCulture) + "</variableDatumID>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
-                    EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
-                    aEightByteChunk.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</VariableDatum>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as VariableDatum;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(VariableDatum obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._variableDatumID != obj._variableDatumID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumLength != obj._variableDatumLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._variableDatumID.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumLength.GetHashCode();
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.32. Variable Datum Record
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EightByteChunk))]
+    public partial class VariableDatum
+    {
+        /// <summary>
+        /// ID of the variable datum
+        /// </summary>
+        private uint _variableDatumID;
+
+        /// <summary>
+        /// length of the variable datums
+        /// </summary>
+        private uint _variableDatumLength;
+
+        /// <summary>
+        /// variable length list of 64-bit datums
+        /// </summary>
+        private List<EightByteChunk> _variableDatums = new List<EightByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VariableDatum"/> class.
+        /// </summary>
+        public VariableDatum()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(VariableDatum left, VariableDatum right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(VariableDatum left, VariableDatum right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._variableDatumID
+            marshalSize += 4;  // this._variableDatumLength
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                EightByteChunk listElement = (EightByteChunk)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the variable datum
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumID")]
+        public uint VariableDatumID
+        {
+            get
+            {
+                return this._variableDatumID;
+            }
+
+            set
+            {
+                this._variableDatumID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length of the variable datums
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getvariableDatumLength method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumLength")]
+        public uint VariableDatumLength
+        {
+            get
+            {
+                return this._variableDatumLength;
+            }
+
+            set
+            {
+                this._variableDatumLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of 64-bit datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<EightByteChunk>))]
+        public List<EightByteChunk> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._variableDatumID);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
+                        aEightByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._variableDatumID = dis.ReadUnsignedInt();
+                    this._variableDatumLength = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.VariableDatumLength; idx++)
+                    {
+                        EightByteChunk anX = new EightByteChunk();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<VariableDatum>");
+            try
+            {
+                sb.AppendLine("<variableDatumID type=\"uint\">" + this._variableDatumID.ToString(CultureInfo.InvariantCulture) + "</variableDatumID>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
+                    EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
+                    aEightByteChunk.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</VariableDatum>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as VariableDatum;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(VariableDatum obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._variableDatumID != obj._variableDatumID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumLength != obj._variableDatumLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._variableDatumID.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumLength.GetHashCode();
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Double.cs b/Libs/CsharpDis6/Dis1995/Generated/Vector3Double.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Double.cs
rename to Libs/CsharpDis6/Dis1995/Generated/Vector3Double.cs
index 10e1cbf..e982a55 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Double.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/Vector3Double.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.34. Three double precision floating point values, x, y, and z
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Vector3Double
-    {
-        /// <summary>
-        /// X value
-        /// </summary>
-        private double _x;
-
-        /// <summary>
-        /// Y value
-        /// </summary>
-        private double _y;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private double _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Vector3Double"/> class.
-        /// </summary>
-        public Vector3Double()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Vector3Double left, Vector3Double right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Vector3Double left, Vector3Double right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 8;  // this._x
-            marshalSize += 8;  // this._y
-            marshalSize += 8;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "x")]
-        public double X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Y value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "y")]
-        public double Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "z")]
-        public double Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteDouble((double)this._x);
-                    dos.WriteDouble((double)this._y);
-                    dos.WriteDouble((double)this._z);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadDouble();
-                    this._y = dis.ReadDouble();
-                    this._z = dis.ReadDouble();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Vector3Double>");
-            try
-            {
-                sb.AppendLine("<x type=\"double\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"double\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"double\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</Vector3Double>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Vector3Double;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Vector3Double obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.34. Three double precision floating point values, x, y, and z
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Vector3Double
+    {
+        /// <summary>
+        /// X value
+        /// </summary>
+        private double _x;
+
+        /// <summary>
+        /// Y value
+        /// </summary>
+        private double _y;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private double _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Vector3Double"/> class.
+        /// </summary>
+        public Vector3Double()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Vector3Double left, Vector3Double right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Vector3Double left, Vector3Double right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 8;  // this._x
+            marshalSize += 8;  // this._y
+            marshalSize += 8;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "x")]
+        public double X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Y value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "y")]
+        public double Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "z")]
+        public double Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteDouble((double)this._x);
+                    dos.WriteDouble((double)this._y);
+                    dos.WriteDouble((double)this._z);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadDouble();
+                    this._y = dis.ReadDouble();
+                    this._z = dis.ReadDouble();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Vector3Double>");
+            try
+            {
+                sb.AppendLine("<x type=\"double\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"double\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"double\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</Vector3Double>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Vector3Double;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Vector3Double obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Float.cs b/Libs/CsharpDis6/Dis1995/Generated/Vector3Float.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Float.cs
rename to Libs/CsharpDis6/Dis1995/Generated/Vector3Float.cs
index 5cc6eac..6c9a9e4 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Vector3Float.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/Vector3Float.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.2.33. Three floating point values, x, y, and z
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Vector3Float
-    {
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Vector3Float"/> class.
-        /// </summary>
-        public Vector3Float()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Vector3Float left, Vector3Float right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Vector3Float left, Vector3Float right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            marshalSize += 4;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "z")]
-        public float Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                    dos.WriteFloat((float)this._z);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                    this._z = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Vector3Float>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</Vector3Float>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Vector3Float;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Vector3Float obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.2.33. Three floating point values, x, y, and z
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Vector3Float
+    {
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Vector3Float"/> class.
+        /// </summary>
+        public Vector3Float()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Vector3Float left, Vector3Float right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Vector3Float left, Vector3Float right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            marshalSize += 4;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "z")]
+        public float Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                    dos.WriteFloat((float)this._z);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                    this._z = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Vector3Float>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</Vector3Float>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Vector3Float;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Vector3Float obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Warfare.cs b/Libs/CsharpDis6/Dis1995/Generated/Warfare.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Generated/Warfare.cs
rename to Libs/CsharpDis6/Dis1995/Generated/Warfare.cs
index 6f08683..070201c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Generated/Warfare.cs
+++ b/Libs/CsharpDis6/Dis1995/Generated/Warfare.cs
@@ -1,341 +1,341 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Section 5.3.4. abstract superclass for fire and detonation pdus that have shared information
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class Warfare : Pdu, IEquatable<Warfare>
-    {
-        /// <summary>
-        /// ID of the entity that shot
-        /// </summary>
-        private EntityID _firingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of the entity that is being shot at
-        /// </summary>
-        private EntityID _targetEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Warfare"/> class.
-        /// </summary>
-        public Warfare()
-        {
-            ProtocolFamily = (byte)2;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Warfare left, Warfare right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Warfare left, Warfare right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
-            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that shot
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "firingEntityID")]
-        public EntityID FiringEntityID
-        {
-            get
-            {
-                return this._firingEntityID;
-            }
-
-            set
-            {
-                this._firingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that is being shot at
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
-        public EntityID TargetEntityID
-        {
-            get
-            {
-                return this._targetEntityID;
-            }
-
-            set
-            {
-                this._targetEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._firingEntityID.Marshal(dos);
-                    this._targetEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._firingEntityID.Unmarshal(dis);
-                    this._targetEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Warfare>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<firingEntityID>");
-                this._firingEntityID.Reflection(sb);
-                sb.AppendLine("</firingEntityID>");
-                sb.AppendLine("<targetEntityID>");
-                this._targetEntityID.Reflection(sb);
-                sb.AppendLine("</targetEntityID>");
-                sb.AppendLine("</Warfare>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Warfare;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Warfare obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._firingEntityID.Equals(obj._firingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetEntityID.Equals(obj._targetEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Section 5.3.4. abstract superclass for fire and detonation pdus that have shared information
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class Warfare : Pdu, IEquatable<Warfare>
+    {
+        /// <summary>
+        /// ID of the entity that shot
+        /// </summary>
+        private EntityID _firingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of the entity that is being shot at
+        /// </summary>
+        private EntityID _targetEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Warfare"/> class.
+        /// </summary>
+        public Warfare()
+        {
+            ProtocolFamily = (byte)2;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Warfare left, Warfare right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Warfare left, Warfare right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
+            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that shot
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "firingEntityID")]
+        public EntityID FiringEntityID
+        {
+            get
+            {
+                return this._firingEntityID;
+            }
+
+            set
+            {
+                this._firingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that is being shot at
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
+        public EntityID TargetEntityID
+        {
+            get
+            {
+                return this._targetEntityID;
+            }
+
+            set
+            {
+                this._targetEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._firingEntityID.Marshal(dos);
+                    this._targetEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._firingEntityID.Unmarshal(dis);
+                    this._targetEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Warfare>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<firingEntityID>");
+                this._firingEntityID.Reflection(sb);
+                sb.AppendLine("</firingEntityID>");
+                sb.AppendLine("<targetEntityID>");
+                this._targetEntityID.Reflection(sb);
+                sb.AppendLine("</targetEntityID>");
+                sb.AppendLine("</Warfare>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Warfare;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Warfare obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._firingEntityID.Equals(obj._firingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetEntityID.Equals(obj._targetEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/PduFactory.cs b/Libs/CsharpDis6/Dis1995/PduFactory.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1995/PduFactory.cs
rename to Libs/CsharpDis6/Dis1995/PduFactory.cs
index b4d8bb4..649b4ab 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/PduFactory.cs
+++ b/Libs/CsharpDis6/Dis1995/PduFactory.cs
@@ -1,122 +1,122 @@
-using System;
-using OpenDis.Core;
-using OpenDis.Enumerations;
-
-namespace OpenDis.Dis1995
-{
-    internal static class PduFactory
-    {
-        /// <summary>
-        /// Creates the PDU.
-        /// </summary>
-        /// <param name="type">The type of PDU to be created.</param>
-        /// <returns>Returns the corresponding PDU instance or null if type equals 0.</returns>
-        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
-        public static IPdu CreatePdu(byte type)
-        {
-            return CreatePdu((PduType)type);
-        }
-        
-        /// <summary>
-        /// Creates the PDU.
-        /// </summary>
-        /// <param name="type">The type of PDU to be created.</param>
-        /// <returns>Returns the corresponding PDU instance or null if PduType.Other is specified.</returns>
-        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
-        public static IPdu CreatePdu(PduType type)
-        {
-            IPdu pdu = null;
-
-            switch (type)
-            {
-                case PduType.Other:
-                    pdu = new Pdu();
-                    break;
-                case PduType.EntityState:
-                    pdu = new EntityStatePdu();
-                    break;
-                case PduType.Fire:
-                    pdu = new FirePdu();
-                    break;
-                case PduType.Detonation:
-                    pdu = new DetonationPdu();
-                    break;
-                case PduType.Collision:
-                    pdu = new CollisionPdu();
-                    break;
-                case PduType.ServiceRequest:
-                    pdu = new ServiceRequestPdu();
-                    break;
-                case PduType.ResupplyOffer:
-                    pdu = new ResupplyOfferPdu();
-                    break;
-                case PduType.ResupplyReceived:
-                    pdu = new ResupplyReceivedPdu();
-                    break;
-                case PduType.ResupplyCancel:
-                    pdu = new ResupplyCancelPdu();
-                    break;
-                case PduType.RepairComplete:
-                    pdu = new RepairCompletePdu();
-                    break;
-                case PduType.RepairResponse:
-                    pdu = new RepairResponsePdu();
-                    break;
-                case PduType.CreateEntity:
-                    pdu = new CreateEntityPdu();
-                    break;
-                case PduType.RemoveEntity:
-                    pdu = new RemoveEntityPdu();
-                    break;
-                case PduType.StartResume:
-                    pdu = new StartResumePdu();
-                    break;
-                case PduType.StopFreeze:
-                    pdu = new StopFreezePdu();
-                    break;
-                case PduType.Acknowledge:
-                    pdu = new AcknowledgePdu();
-                    break;
-                case PduType.ActionRequest:
-                    pdu = new ActionRequestPdu();
-                    break;
-                case PduType.ActionResponse:
-                    pdu = new ActionResponsePdu();
-                    break;
-                case PduType.DataQuery:
-                    pdu = new DataQueryPdu();
-                    break;
-                case PduType.SetData:
-                    pdu = new SetDataPdu();
-                    break;
-                case PduType.Data:
-                    pdu = new DataPdu();
-                    break;
-                case PduType.EventReport:
-                    pdu = new EventReportPdu();
-                    break;
-                case PduType.Comment:
-                    pdu = new CommentPdu();
-                    break;
-                case PduType.ElectromagneticEmission:
-                    throw new NotImplementedException();
-                case PduType.Designator:
-                    pdu = new DesignatorPdu();
-                    break;
-                case PduType.Transmitter:
-                    pdu = new TransmitterPdu();
-                    break;
-                case PduType.Signal:
-                    pdu = new SignalPdu();
-                    break;
-                case PduType.Receiver:
-                    pdu = new ReceiverPdu();
-                    break;
-                default:
-                    throw new NotImplementedException();
-            }
-
-            return pdu;
-        }
-    }
-}
+using System;
+using OpenDis.Core;
+using OpenDis.Enumerations;
+
+namespace OpenDis.Dis1995
+{
+    internal static class PduFactory
+    {
+        /// <summary>
+        /// Creates the PDU.
+        /// </summary>
+        /// <param name="type">The type of PDU to be created.</param>
+        /// <returns>Returns the corresponding PDU instance or null if type equals 0.</returns>
+        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
+        public static IPdu CreatePdu(byte type)
+        {
+            return CreatePdu((PduType)type);
+        }
+        
+        /// <summary>
+        /// Creates the PDU.
+        /// </summary>
+        /// <param name="type">The type of PDU to be created.</param>
+        /// <returns>Returns the corresponding PDU instance or null if PduType.Other is specified.</returns>
+        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
+        public static IPdu CreatePdu(PduType type)
+        {
+            IPdu pdu = null;
+
+            switch (type)
+            {
+                case PduType.Other:
+                    pdu = new Pdu();
+                    break;
+                case PduType.EntityState:
+                    pdu = new EntityStatePdu();
+                    break;
+                case PduType.Fire:
+                    pdu = new FirePdu();
+                    break;
+                case PduType.Detonation:
+                    pdu = new DetonationPdu();
+                    break;
+                case PduType.Collision:
+                    pdu = new CollisionPdu();
+                    break;
+                case PduType.ServiceRequest:
+                    pdu = new ServiceRequestPdu();
+                    break;
+                case PduType.ResupplyOffer:
+                    pdu = new ResupplyOfferPdu();
+                    break;
+                case PduType.ResupplyReceived:
+                    pdu = new ResupplyReceivedPdu();
+                    break;
+                case PduType.ResupplyCancel:
+                    pdu = new ResupplyCancelPdu();
+                    break;
+                case PduType.RepairComplete:
+                    pdu = new RepairCompletePdu();
+                    break;
+                case PduType.RepairResponse:
+                    pdu = new RepairResponsePdu();
+                    break;
+                case PduType.CreateEntity:
+                    pdu = new CreateEntityPdu();
+                    break;
+                case PduType.RemoveEntity:
+                    pdu = new RemoveEntityPdu();
+                    break;
+                case PduType.StartResume:
+                    pdu = new StartResumePdu();
+                    break;
+                case PduType.StopFreeze:
+                    pdu = new StopFreezePdu();
+                    break;
+                case PduType.Acknowledge:
+                    pdu = new AcknowledgePdu();
+                    break;
+                case PduType.ActionRequest:
+                    pdu = new ActionRequestPdu();
+                    break;
+                case PduType.ActionResponse:
+                    pdu = new ActionResponsePdu();
+                    break;
+                case PduType.DataQuery:
+                    pdu = new DataQueryPdu();
+                    break;
+                case PduType.SetData:
+                    pdu = new SetDataPdu();
+                    break;
+                case PduType.Data:
+                    pdu = new DataPdu();
+                    break;
+                case PduType.EventReport:
+                    pdu = new EventReportPdu();
+                    break;
+                case PduType.Comment:
+                    pdu = new CommentPdu();
+                    break;
+                case PduType.ElectromagneticEmission:
+                    throw new NotImplementedException();
+                case PduType.Designator:
+                    pdu = new DesignatorPdu();
+                    break;
+                case PduType.Transmitter:
+                    pdu = new TransmitterPdu();
+                    break;
+                case PduType.Signal:
+                    pdu = new SignalPdu();
+                    break;
+                case PduType.Receiver:
+                    pdu = new ReceiverPdu();
+                    break;
+                default:
+                    throw new NotImplementedException();
+            }
+
+            return pdu;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Vector3Double.cs b/Libs/CsharpDis6/Dis1995/Vector3Double.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Vector3Double.cs
rename to Libs/CsharpDis6/Dis1995/Vector3Double.cs
index d1ac111..ad6dc3d 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Vector3Double.cs
+++ b/Libs/CsharpDis6/Dis1995/Vector3Double.cs
@@ -1,19 +1,19 @@
-using System;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Three floating point values, x, y, and z.
-    /// </summary>
-    public partial class Vector3Double
-    {
-        /// <summary>
-        /// Calculates the length of the vector.
-        /// </summary>
-        /// <returns>The length of a vector.</returns>
-        public double CalculateLength()
-        {
-            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
-        }
-    }
-}
+using System;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Three floating point values, x, y, and z.
+    /// </summary>
+    public partial class Vector3Double
+    {
+        /// <summary>
+        /// Calculates the length of the vector.
+        /// </summary>
+        /// <returns>The length of a vector.</returns>
+        public double CalculateLength()
+        {
+            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1995/Vector3Float.cs b/Libs/CsharpDis6/Dis1995/Vector3Float.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Dis1995/Vector3Float.cs
rename to Libs/CsharpDis6/Dis1995/Vector3Float.cs
index 7baaa33..90af941 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1995/Vector3Float.cs
+++ b/Libs/CsharpDis6/Dis1995/Vector3Float.cs
@@ -1,19 +1,19 @@
-using System;
-
-namespace OpenDis.Dis1995
-{
-    /// <summary>
-    /// Three floating point values, x, y, and z.
-    /// </summary>
-    public partial class Vector3Float
-    {
-        /// <summary>
-        /// Calculates the length of the vector.
-        /// </summary>
-        /// <returns>The length of a vector.</returns>
-        public double CalculateLength()
-        {
-            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
-        }
-    }
-}
+using System;
+
+namespace OpenDis.Dis1995
+{
+    /// <summary>
+    /// Three floating point values, x, y, and z.
+    /// </summary>
+    public partial class Vector3Float
+    {
+        /// <summary>
+        /// Calculates the length of the vector.
+        /// </summary>
+        /// <returns>The length of a vector.</returns>
+        public double CalculateLength()
+        {
+            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/EntityID.cs b/Libs/CsharpDis6/Dis1998/EntityID.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Dis1998/EntityID.cs
rename to Libs/CsharpDis6/Dis1998/EntityID.cs
index 4c09732..131efac 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/EntityID.cs
+++ b/Libs/CsharpDis6/Dis1998/EntityID.cs
@@ -1,21 +1,21 @@
-using System;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
-    /// </summary>
-    public partial class EntityID
-    {
-        /// <summary>
-        /// Returns a <see cref="System.String"/> that represents this instance.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="System.String"/> that represents this instance.
-        /// </returns>
-        public override string ToString()
-        {
-            return string.Format("{0:00}{1:00}{2:00}", this.Site, this.Application, this.Entity);
-        }
-    }
-}
+using System;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
+    /// </summary>
+    public partial class EntityID
+    {
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public override string ToString()
+        {
+            return string.Format("{0:00}{1:00}{2:00}", this.Site, this.Application, this.Entity);
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/AcknowledgePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AcknowledgePdu.cs
index f143b2d..2fbd054 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AcknowledgePdu.cs
@@ -1,368 +1,368 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.5. Acknowledge the receiptof a start/resume, stop/freeze, or RemoveEntityPDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcknowledgePdu : SimulationManagementFamilyPdu, IEquatable<AcknowledgePdu>
-    {
-        /// <summary>
-        /// type of message being acknowledged
-        /// </summary>
-        private ushort _acknowledgeFlag;
-
-        /// <summary>
-        /// Whether or not the receiving entity was able to comply with the request
-        /// </summary>
-        private ushort _responseFlag;
-
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcknowledgePdu"/> class.
-        /// </summary>
-        public AcknowledgePdu()
-        {
-            PduType = (byte)15;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcknowledgePdu left, AcknowledgePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcknowledgePdu left, AcknowledgePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._acknowledgeFlag
-            marshalSize += 2;  // this._responseFlag
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the type of message being acknowledged
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
-        public ushort AcknowledgeFlag
-        {
-            get
-            {
-                return this._acknowledgeFlag;
-            }
-
-            set
-            {
-                this._acknowledgeFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Whether or not the receiving entity was able to comply with the request
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
-        public ushort ResponseFlag
-        {
-            get
-            {
-                return this._responseFlag;
-            }
-
-            set
-            {
-                this._responseFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
-                    dos.WriteUnsignedShort((ushort)this._responseFlag);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._acknowledgeFlag = dis.ReadUnsignedShort();
-                    this._responseFlag = dis.ReadUnsignedShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcknowledgePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
-                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</AcknowledgePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcknowledgePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcknowledgePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._acknowledgeFlag != obj._acknowledgeFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._responseFlag != obj._responseFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.5. Acknowledge the receiptof a start/resume, stop/freeze, or RemoveEntityPDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcknowledgePdu : SimulationManagementFamilyPdu, IEquatable<AcknowledgePdu>
+    {
+        /// <summary>
+        /// type of message being acknowledged
+        /// </summary>
+        private ushort _acknowledgeFlag;
+
+        /// <summary>
+        /// Whether or not the receiving entity was able to comply with the request
+        /// </summary>
+        private ushort _responseFlag;
+
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcknowledgePdu"/> class.
+        /// </summary>
+        public AcknowledgePdu()
+        {
+            PduType = (byte)15;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcknowledgePdu left, AcknowledgePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcknowledgePdu left, AcknowledgePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._acknowledgeFlag
+            marshalSize += 2;  // this._responseFlag
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the type of message being acknowledged
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
+        public ushort AcknowledgeFlag
+        {
+            get
+            {
+                return this._acknowledgeFlag;
+            }
+
+            set
+            {
+                this._acknowledgeFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Whether or not the receiving entity was able to comply with the request
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
+        public ushort ResponseFlag
+        {
+            get
+            {
+                return this._responseFlag;
+            }
+
+            set
+            {
+                this._responseFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
+                    dos.WriteUnsignedShort((ushort)this._responseFlag);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._acknowledgeFlag = dis.ReadUnsignedShort();
+                    this._responseFlag = dis.ReadUnsignedShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcknowledgePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
+                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</AcknowledgePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcknowledgePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcknowledgePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._acknowledgeFlag != obj._acknowledgeFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._responseFlag != obj._responseFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/AcknowledgeReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AcknowledgeReliablePdu.cs
index 81f6738..1d787f6 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcknowledgeReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AcknowledgeReliablePdu.cs
@@ -1,368 +1,368 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity or remove enitty (reliable) pdus. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcknowledgeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<AcknowledgeReliablePdu>
-    {
-        /// <summary>
-        /// ack flags
-        /// </summary>
-        private ushort _acknowledgeFlag;
-
-        /// <summary>
-        /// response flags
-        /// </summary>
-        private ushort _responseFlag;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcknowledgeReliablePdu"/> class.
-        /// </summary>
-        public AcknowledgeReliablePdu()
-        {
-            PduType = (byte)55;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._acknowledgeFlag
-            marshalSize += 2;  // this._responseFlag
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ack flags
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
-        public ushort AcknowledgeFlag
-        {
-            get
-            {
-                return this._acknowledgeFlag;
-            }
-
-            set
-            {
-                this._acknowledgeFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the response flags
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
-        public ushort ResponseFlag
-        {
-            get
-            {
-                return this._responseFlag;
-            }
-
-            set
-            {
-                this._responseFlag = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
-                    dos.WriteUnsignedShort((ushort)this._responseFlag);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._acknowledgeFlag = dis.ReadUnsignedShort();
-                    this._responseFlag = dis.ReadUnsignedShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcknowledgeReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
-                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</AcknowledgeReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcknowledgeReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcknowledgeReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._acknowledgeFlag != obj._acknowledgeFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._responseFlag != obj._responseFlag)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity or remove enitty (reliable) pdus. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcknowledgeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<AcknowledgeReliablePdu>
+    {
+        /// <summary>
+        /// ack flags
+        /// </summary>
+        private ushort _acknowledgeFlag;
+
+        /// <summary>
+        /// response flags
+        /// </summary>
+        private ushort _responseFlag;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcknowledgeReliablePdu"/> class.
+        /// </summary>
+        public AcknowledgeReliablePdu()
+        {
+            PduType = (byte)55;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._acknowledgeFlag
+            marshalSize += 2;  // this._responseFlag
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ack flags
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
+        public ushort AcknowledgeFlag
+        {
+            get
+            {
+                return this._acknowledgeFlag;
+            }
+
+            set
+            {
+                this._acknowledgeFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the response flags
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
+        public ushort ResponseFlag
+        {
+            get
+            {
+                return this._responseFlag;
+            }
+
+            set
+            {
+                this._responseFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
+                    dos.WriteUnsignedShort((ushort)this._responseFlag);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._acknowledgeFlag = dis.ReadUnsignedShort();
+                    this._responseFlag = dis.ReadUnsignedShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcknowledgeReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
+                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</AcknowledgeReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcknowledgeReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcknowledgeReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._acknowledgeFlag != obj._acknowledgeFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._responseFlag != obj._responseFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamData.cs b/Libs/CsharpDis6/Dis1998/Generated/AcousticBeamData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AcousticBeamData.cs
index 2e7951a..a85b9ec 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AcousticBeamData.cs
@@ -1,399 +1,399 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Used in UA PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(AcousticBeamFundamentalParameter))]
-    public partial class AcousticBeamData
-    {
-        /// <summary>
-        /// beam data length
-        /// </summary>
-        private ushort _beamDataLength;
-
-        /// <summary>
-        /// beamIDNumber
-        /// </summary>
-        private byte _beamIDNumber;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad2;
-
-        /// <summary>
-        /// fundamental data parameters
-        /// </summary>
-        private AcousticBeamFundamentalParameter _fundamentalDataParameters = new AcousticBeamFundamentalParameter();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcousticBeamData"/> class.
-        /// </summary>
-        public AcousticBeamData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcousticBeamData left, AcousticBeamData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcousticBeamData left, AcousticBeamData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._beamDataLength
-            marshalSize += 1;  // this._beamIDNumber
-            marshalSize += 2;  // this._pad2
-            marshalSize += this._fundamentalDataParameters.GetMarshalledSize();  // this._fundamentalDataParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the beam data length
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "beamDataLength")]
-        public ushort BeamDataLength
-        {
-            get
-            {
-                return this._beamDataLength;
-            }
-
-            set
-            {
-                this._beamDataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the beamIDNumber
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamIDNumber")]
-        public byte BeamIDNumber
-        {
-            get
-            {
-                return this._beamIDNumber;
-            }
-
-            set
-            {
-                this._beamIDNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
-        public ushort Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the fundamental data parameters
-        /// </summary>
-        [XmlElement(Type = typeof(AcousticBeamFundamentalParameter), ElementName = "fundamentalDataParameters")]
-        public AcousticBeamFundamentalParameter FundamentalDataParameters
-        {
-            get
-            {
-                return this._fundamentalDataParameters;
-            }
-
-            set
-            {
-                this._fundamentalDataParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._beamDataLength);
-                    dos.WriteUnsignedByte((byte)this._beamIDNumber);
-                    dos.WriteUnsignedShort((ushort)this._pad2);
-                    this._fundamentalDataParameters.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamDataLength = dis.ReadUnsignedShort();
-                    this._beamIDNumber = dis.ReadUnsignedByte();
-                    this._pad2 = dis.ReadUnsignedShort();
-                    this._fundamentalDataParameters.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcousticBeamData>");
-            try
-            {
-                sb.AppendLine("<beamDataLength type=\"ushort\">" + this._beamDataLength.ToString(CultureInfo.InvariantCulture) + "</beamDataLength>");
-                sb.AppendLine("<beamIDNumber type=\"byte\">" + this._beamIDNumber.ToString(CultureInfo.InvariantCulture) + "</beamIDNumber>");
-                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<fundamentalDataParameters>");
-                this._fundamentalDataParameters.Reflection(sb);
-                sb.AppendLine("</fundamentalDataParameters>");
-                sb.AppendLine("</AcousticBeamData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcousticBeamData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcousticBeamData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._beamDataLength != obj._beamDataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamIDNumber != obj._beamIDNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._fundamentalDataParameters.Equals(obj._fundamentalDataParameters))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamDataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._beamIDNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._fundamentalDataParameters.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Used in UA PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(AcousticBeamFundamentalParameter))]
+    public partial class AcousticBeamData
+    {
+        /// <summary>
+        /// beam data length
+        /// </summary>
+        private ushort _beamDataLength;
+
+        /// <summary>
+        /// beamIDNumber
+        /// </summary>
+        private byte _beamIDNumber;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad2;
+
+        /// <summary>
+        /// fundamental data parameters
+        /// </summary>
+        private AcousticBeamFundamentalParameter _fundamentalDataParameters = new AcousticBeamFundamentalParameter();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcousticBeamData"/> class.
+        /// </summary>
+        public AcousticBeamData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcousticBeamData left, AcousticBeamData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcousticBeamData left, AcousticBeamData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._beamDataLength
+            marshalSize += 1;  // this._beamIDNumber
+            marshalSize += 2;  // this._pad2
+            marshalSize += this._fundamentalDataParameters.GetMarshalledSize();  // this._fundamentalDataParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the beam data length
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "beamDataLength")]
+        public ushort BeamDataLength
+        {
+            get
+            {
+                return this._beamDataLength;
+            }
+
+            set
+            {
+                this._beamDataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the beamIDNumber
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamIDNumber")]
+        public byte BeamIDNumber
+        {
+            get
+            {
+                return this._beamIDNumber;
+            }
+
+            set
+            {
+                this._beamIDNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
+        public ushort Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the fundamental data parameters
+        /// </summary>
+        [XmlElement(Type = typeof(AcousticBeamFundamentalParameter), ElementName = "fundamentalDataParameters")]
+        public AcousticBeamFundamentalParameter FundamentalDataParameters
+        {
+            get
+            {
+                return this._fundamentalDataParameters;
+            }
+
+            set
+            {
+                this._fundamentalDataParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._beamDataLength);
+                    dos.WriteUnsignedByte((byte)this._beamIDNumber);
+                    dos.WriteUnsignedShort((ushort)this._pad2);
+                    this._fundamentalDataParameters.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamDataLength = dis.ReadUnsignedShort();
+                    this._beamIDNumber = dis.ReadUnsignedByte();
+                    this._pad2 = dis.ReadUnsignedShort();
+                    this._fundamentalDataParameters.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcousticBeamData>");
+            try
+            {
+                sb.AppendLine("<beamDataLength type=\"ushort\">" + this._beamDataLength.ToString(CultureInfo.InvariantCulture) + "</beamDataLength>");
+                sb.AppendLine("<beamIDNumber type=\"byte\">" + this._beamIDNumber.ToString(CultureInfo.InvariantCulture) + "</beamIDNumber>");
+                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<fundamentalDataParameters>");
+                this._fundamentalDataParameters.Reflection(sb);
+                sb.AppendLine("</fundamentalDataParameters>");
+                sb.AppendLine("</AcousticBeamData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcousticBeamData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcousticBeamData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._beamDataLength != obj._beamDataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamIDNumber != obj._beamIDNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._fundamentalDataParameters.Equals(obj._fundamentalDataParameters))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamDataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._beamIDNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._fundamentalDataParameters.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs b/Libs/CsharpDis6/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
index 2b34247..0229463 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AcousticBeamFundamentalParameter.cs
@@ -1,460 +1,460 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Used in UaPdu
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcousticBeamFundamentalParameter
-    {
-        /// <summary>
-        /// parameter index
-        /// </summary>
-        private ushort _activeEmissionParameterIndex;
-
-        /// <summary>
-        /// scan pattern
-        /// </summary>
-        private ushort _scanPattern;
-
-        /// <summary>
-        /// beam center azimuth
-        /// </summary>
-        private float _beamCenterAzimuth;
-
-        /// <summary>
-        /// azimuthal beamwidth
-        /// </summary>
-        private float _azimuthalBeamwidth;
-
-        /// <summary>
-        /// beam center
-        /// </summary>
-        private float _beamCenterDE;
-
-        /// <summary>
-        /// DE beamwidth (vertical beamwidth)
-        /// </summary>
-        private float _deBeamwidth;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcousticBeamFundamentalParameter"/> class.
-        /// </summary>
-        public AcousticBeamFundamentalParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcousticBeamFundamentalParameter left, AcousticBeamFundamentalParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcousticBeamFundamentalParameter left, AcousticBeamFundamentalParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._activeEmissionParameterIndex
-            marshalSize += 2;  // this._scanPattern
-            marshalSize += 4;  // this._beamCenterAzimuth
-            marshalSize += 4;  // this._azimuthalBeamwidth
-            marshalSize += 4;  // this._beamCenterDE
-            marshalSize += 4;  // this._deBeamwidth
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter index
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "activeEmissionParameterIndex")]
-        public ushort ActiveEmissionParameterIndex
-        {
-            get
-            {
-                return this._activeEmissionParameterIndex;
-            }
-
-            set
-            {
-                this._activeEmissionParameterIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the scan pattern
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "scanPattern")]
-        public ushort ScanPattern
-        {
-            get
-            {
-                return this._scanPattern;
-            }
-
-            set
-            {
-                this._scanPattern = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the beam center azimuth
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamCenterAzimuth")]
-        public float BeamCenterAzimuth
-        {
-            get
-            {
-                return this._beamCenterAzimuth;
-            }
-
-            set
-            {
-                this._beamCenterAzimuth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the azimuthal beamwidth
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "azimuthalBeamwidth")]
-        public float AzimuthalBeamwidth
-        {
-            get
-            {
-                return this._azimuthalBeamwidth;
-            }
-
-            set
-            {
-                this._azimuthalBeamwidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the beam center
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamCenterDE")]
-        public float BeamCenterDE
-        {
-            get
-            {
-                return this._beamCenterDE;
-            }
-
-            set
-            {
-                this._beamCenterDE = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the DE beamwidth (vertical beamwidth)
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "deBeamwidth")]
-        public float DeBeamwidth
-        {
-            get
-            {
-                return this._deBeamwidth;
-            }
-
-            set
-            {
-                this._deBeamwidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._activeEmissionParameterIndex);
-                    dos.WriteUnsignedShort((ushort)this._scanPattern);
-                    dos.WriteFloat((float)this._beamCenterAzimuth);
-                    dos.WriteFloat((float)this._azimuthalBeamwidth);
-                    dos.WriteFloat((float)this._beamCenterDE);
-                    dos.WriteFloat((float)this._deBeamwidth);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._activeEmissionParameterIndex = dis.ReadUnsignedShort();
-                    this._scanPattern = dis.ReadUnsignedShort();
-                    this._beamCenterAzimuth = dis.ReadFloat();
-                    this._azimuthalBeamwidth = dis.ReadFloat();
-                    this._beamCenterDE = dis.ReadFloat();
-                    this._deBeamwidth = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcousticBeamFundamentalParameter>");
-            try
-            {
-                sb.AppendLine("<activeEmissionParameterIndex type=\"ushort\">" + this._activeEmissionParameterIndex.ToString(CultureInfo.InvariantCulture) + "</activeEmissionParameterIndex>");
-                sb.AppendLine("<scanPattern type=\"ushort\">" + this._scanPattern.ToString(CultureInfo.InvariantCulture) + "</scanPattern>");
-                sb.AppendLine("<beamCenterAzimuth type=\"float\">" + this._beamCenterAzimuth.ToString(CultureInfo.InvariantCulture) + "</beamCenterAzimuth>");
-                sb.AppendLine("<azimuthalBeamwidth type=\"float\">" + this._azimuthalBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthalBeamwidth>");
-                sb.AppendLine("<beamCenterDE type=\"float\">" + this._beamCenterDE.ToString(CultureInfo.InvariantCulture) + "</beamCenterDE>");
-                sb.AppendLine("<deBeamwidth type=\"float\">" + this._deBeamwidth.ToString(CultureInfo.InvariantCulture) + "</deBeamwidth>");
-                sb.AppendLine("</AcousticBeamFundamentalParameter>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcousticBeamFundamentalParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcousticBeamFundamentalParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._activeEmissionParameterIndex != obj._activeEmissionParameterIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._scanPattern != obj._scanPattern)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamCenterAzimuth != obj._beamCenterAzimuth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthalBeamwidth != obj._azimuthalBeamwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamCenterDE != obj._beamCenterDE)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._deBeamwidth != obj._deBeamwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._activeEmissionParameterIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._scanPattern.GetHashCode();
-            result = GenerateHash(result) ^ this._beamCenterAzimuth.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthalBeamwidth.GetHashCode();
-            result = GenerateHash(result) ^ this._beamCenterDE.GetHashCode();
-            result = GenerateHash(result) ^ this._deBeamwidth.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Used in UaPdu
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcousticBeamFundamentalParameter
+    {
+        /// <summary>
+        /// parameter index
+        /// </summary>
+        private ushort _activeEmissionParameterIndex;
+
+        /// <summary>
+        /// scan pattern
+        /// </summary>
+        private ushort _scanPattern;
+
+        /// <summary>
+        /// beam center azimuth
+        /// </summary>
+        private float _beamCenterAzimuth;
+
+        /// <summary>
+        /// azimuthal beamwidth
+        /// </summary>
+        private float _azimuthalBeamwidth;
+
+        /// <summary>
+        /// beam center
+        /// </summary>
+        private float _beamCenterDE;
+
+        /// <summary>
+        /// DE beamwidth (vertical beamwidth)
+        /// </summary>
+        private float _deBeamwidth;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcousticBeamFundamentalParameter"/> class.
+        /// </summary>
+        public AcousticBeamFundamentalParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcousticBeamFundamentalParameter left, AcousticBeamFundamentalParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcousticBeamFundamentalParameter left, AcousticBeamFundamentalParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._activeEmissionParameterIndex
+            marshalSize += 2;  // this._scanPattern
+            marshalSize += 4;  // this._beamCenterAzimuth
+            marshalSize += 4;  // this._azimuthalBeamwidth
+            marshalSize += 4;  // this._beamCenterDE
+            marshalSize += 4;  // this._deBeamwidth
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter index
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "activeEmissionParameterIndex")]
+        public ushort ActiveEmissionParameterIndex
+        {
+            get
+            {
+                return this._activeEmissionParameterIndex;
+            }
+
+            set
+            {
+                this._activeEmissionParameterIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the scan pattern
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "scanPattern")]
+        public ushort ScanPattern
+        {
+            get
+            {
+                return this._scanPattern;
+            }
+
+            set
+            {
+                this._scanPattern = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the beam center azimuth
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamCenterAzimuth")]
+        public float BeamCenterAzimuth
+        {
+            get
+            {
+                return this._beamCenterAzimuth;
+            }
+
+            set
+            {
+                this._beamCenterAzimuth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the azimuthal beamwidth
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "azimuthalBeamwidth")]
+        public float AzimuthalBeamwidth
+        {
+            get
+            {
+                return this._azimuthalBeamwidth;
+            }
+
+            set
+            {
+                this._azimuthalBeamwidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the beam center
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamCenterDE")]
+        public float BeamCenterDE
+        {
+            get
+            {
+                return this._beamCenterDE;
+            }
+
+            set
+            {
+                this._beamCenterDE = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the DE beamwidth (vertical beamwidth)
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "deBeamwidth")]
+        public float DeBeamwidth
+        {
+            get
+            {
+                return this._deBeamwidth;
+            }
+
+            set
+            {
+                this._deBeamwidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._activeEmissionParameterIndex);
+                    dos.WriteUnsignedShort((ushort)this._scanPattern);
+                    dos.WriteFloat((float)this._beamCenterAzimuth);
+                    dos.WriteFloat((float)this._azimuthalBeamwidth);
+                    dos.WriteFloat((float)this._beamCenterDE);
+                    dos.WriteFloat((float)this._deBeamwidth);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._activeEmissionParameterIndex = dis.ReadUnsignedShort();
+                    this._scanPattern = dis.ReadUnsignedShort();
+                    this._beamCenterAzimuth = dis.ReadFloat();
+                    this._azimuthalBeamwidth = dis.ReadFloat();
+                    this._beamCenterDE = dis.ReadFloat();
+                    this._deBeamwidth = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcousticBeamFundamentalParameter>");
+            try
+            {
+                sb.AppendLine("<activeEmissionParameterIndex type=\"ushort\">" + this._activeEmissionParameterIndex.ToString(CultureInfo.InvariantCulture) + "</activeEmissionParameterIndex>");
+                sb.AppendLine("<scanPattern type=\"ushort\">" + this._scanPattern.ToString(CultureInfo.InvariantCulture) + "</scanPattern>");
+                sb.AppendLine("<beamCenterAzimuth type=\"float\">" + this._beamCenterAzimuth.ToString(CultureInfo.InvariantCulture) + "</beamCenterAzimuth>");
+                sb.AppendLine("<azimuthalBeamwidth type=\"float\">" + this._azimuthalBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthalBeamwidth>");
+                sb.AppendLine("<beamCenterDE type=\"float\">" + this._beamCenterDE.ToString(CultureInfo.InvariantCulture) + "</beamCenterDE>");
+                sb.AppendLine("<deBeamwidth type=\"float\">" + this._deBeamwidth.ToString(CultureInfo.InvariantCulture) + "</deBeamwidth>");
+                sb.AppendLine("</AcousticBeamFundamentalParameter>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcousticBeamFundamentalParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcousticBeamFundamentalParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._activeEmissionParameterIndex != obj._activeEmissionParameterIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._scanPattern != obj._scanPattern)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamCenterAzimuth != obj._beamCenterAzimuth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthalBeamwidth != obj._azimuthalBeamwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamCenterDE != obj._beamCenterDE)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._deBeamwidth != obj._deBeamwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._activeEmissionParameterIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._scanPattern.GetHashCode();
+            result = GenerateHash(result) ^ this._beamCenterAzimuth.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthalBeamwidth.GetHashCode();
+            result = GenerateHash(result) ^ this._beamCenterDE.GetHashCode();
+            result = GenerateHash(result) ^ this._deBeamwidth.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitter.cs b/Libs/CsharpDis6/Dis1998/Generated/AcousticEmitter.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitter.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AcousticEmitter.cs
index 96e6329..a353d23 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitter.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AcousticEmitter.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.35. information about a specific UA emmtter
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcousticEmitter
-    {
-        /// <summary>
-        /// the system for a particular UA emitter, and an enumeration
-        /// </summary>
-        private ushort _acousticName;
-
-        /// <summary>
-        /// The function of the acoustic system
-        /// </summary>
-        private byte _function;
-
-        /// <summary>
-        /// The UA emitter identification number relative to a specific system
-        /// </summary>
-        private byte _acousticIdNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcousticEmitter"/> class.
-        /// </summary>
-        public AcousticEmitter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcousticEmitter left, AcousticEmitter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcousticEmitter left, AcousticEmitter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._acousticName
-            marshalSize += 1;  // this._function
-            marshalSize += 1;  // this._acousticIdNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the the system for a particular UA emitter, and an enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acousticName")]
-        public ushort AcousticName
-        {
-            get
-            {
-                return this._acousticName;
-            }
-
-            set
-            {
-                this._acousticName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The function of the acoustic system
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "function")]
-        public byte Function
-        {
-            get
-            {
-                return this._function;
-            }
-
-            set
-            {
-                this._function = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The UA emitter identification number relative to a specific system
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "acousticIdNumber")]
-        public byte AcousticIdNumber
-        {
-            get
-            {
-                return this._acousticIdNumber;
-            }
-
-            set
-            {
-                this._acousticIdNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._acousticName);
-                    dos.WriteUnsignedByte((byte)this._function);
-                    dos.WriteUnsignedByte((byte)this._acousticIdNumber);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._acousticName = dis.ReadUnsignedShort();
-                    this._function = dis.ReadUnsignedByte();
-                    this._acousticIdNumber = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcousticEmitter>");
-            try
-            {
-                sb.AppendLine("<acousticName type=\"ushort\">" + this._acousticName.ToString(CultureInfo.InvariantCulture) + "</acousticName>");
-                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
-                sb.AppendLine("<acousticIdNumber type=\"byte\">" + this._acousticIdNumber.ToString(CultureInfo.InvariantCulture) + "</acousticIdNumber>");
-                sb.AppendLine("</AcousticEmitter>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcousticEmitter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcousticEmitter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._acousticName != obj._acousticName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._function != obj._function)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._acousticIdNumber != obj._acousticIdNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._acousticName.GetHashCode();
-            result = GenerateHash(result) ^ this._function.GetHashCode();
-            result = GenerateHash(result) ^ this._acousticIdNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.35. information about a specific UA emmtter
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcousticEmitter
+    {
+        /// <summary>
+        /// the system for a particular UA emitter, and an enumeration
+        /// </summary>
+        private ushort _acousticName;
+
+        /// <summary>
+        /// The function of the acoustic system
+        /// </summary>
+        private byte _function;
+
+        /// <summary>
+        /// The UA emitter identification number relative to a specific system
+        /// </summary>
+        private byte _acousticIdNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcousticEmitter"/> class.
+        /// </summary>
+        public AcousticEmitter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcousticEmitter left, AcousticEmitter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcousticEmitter left, AcousticEmitter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._acousticName
+            marshalSize += 1;  // this._function
+            marshalSize += 1;  // this._acousticIdNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the system for a particular UA emitter, and an enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acousticName")]
+        public ushort AcousticName
+        {
+            get
+            {
+                return this._acousticName;
+            }
+
+            set
+            {
+                this._acousticName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The function of the acoustic system
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "function")]
+        public byte Function
+        {
+            get
+            {
+                return this._function;
+            }
+
+            set
+            {
+                this._function = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The UA emitter identification number relative to a specific system
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "acousticIdNumber")]
+        public byte AcousticIdNumber
+        {
+            get
+            {
+                return this._acousticIdNumber;
+            }
+
+            set
+            {
+                this._acousticIdNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._acousticName);
+                    dos.WriteUnsignedByte((byte)this._function);
+                    dos.WriteUnsignedByte((byte)this._acousticIdNumber);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._acousticName = dis.ReadUnsignedShort();
+                    this._function = dis.ReadUnsignedByte();
+                    this._acousticIdNumber = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcousticEmitter>");
+            try
+            {
+                sb.AppendLine("<acousticName type=\"ushort\">" + this._acousticName.ToString(CultureInfo.InvariantCulture) + "</acousticName>");
+                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
+                sb.AppendLine("<acousticIdNumber type=\"byte\">" + this._acousticIdNumber.ToString(CultureInfo.InvariantCulture) + "</acousticIdNumber>");
+                sb.AppendLine("</AcousticEmitter>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcousticEmitter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcousticEmitter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._acousticName != obj._acousticName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._function != obj._function)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._acousticIdNumber != obj._acousticIdNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._acousticName.GetHashCode();
+            result = GenerateHash(result) ^ this._function.GetHashCode();
+            result = GenerateHash(result) ^ this._acousticIdNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs b/Libs/CsharpDis6/Dis1998/Generated/AcousticEmitterSystem.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AcousticEmitterSystem.cs
index f068b81..8b60099 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystem.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AcousticEmitterSystem.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.3.35: Information about a particular UA emitter shall be represented using an Acoustic Emitter System record. This record shall consist of three fields: Acoustic Name, Function, and Acoustic ID Number
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AcousticEmitterSystem
-    {
-        /// <summary>
-        /// This field shall specify the system for a particular UA emitter.
-        /// </summary>
-        private ushort _acousticName;
-
-        /// <summary>
-        /// This field shall describe the function of the acoustic system. 
-        /// </summary>
-        private byte _acousticFunction;
-
-        /// <summary>
-        /// This field shall specify the UA emitter identification number relative to a specific system. This field shall be represented by an 8-bit unsigned integer. This field allows the differentiation of multiple systems on an entity, even if in some instances two or more of the systems may be identical UA emitter types. Numbering of systems shall begin with the value 1. 
-        /// </summary>
-        private byte _acousticID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcousticEmitterSystem"/> class.
-        /// </summary>
-        public AcousticEmitterSystem()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcousticEmitterSystem left, AcousticEmitterSystem right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcousticEmitterSystem left, AcousticEmitterSystem right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._acousticName
-            marshalSize += 1;  // this._acousticFunction
-            marshalSize += 1;  // this._acousticID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the system for a particular UA emitter.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acousticName")]
-        public ushort AcousticName
-        {
-            get
-            {
-                return this._acousticName;
-            }
-
-            set
-            {
-                this._acousticName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall describe the function of the acoustic system. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "acousticFunction")]
-        public byte AcousticFunction
-        {
-            get
-            {
-                return this._acousticFunction;
-            }
-
-            set
-            {
-                this._acousticFunction = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the UA emitter identification number relative to a specific system. This field shall be represented by an 8-bit unsigned integer. This field allows the differentiation of multiple systems on an entity, even if in some instances two or more of the systems may be identical UA emitter types. Numbering of systems shall begin with the value 1. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "acousticID")]
-        public byte AcousticID
-        {
-            get
-            {
-                return this._acousticID;
-            }
-
-            set
-            {
-                this._acousticID = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._acousticName);
-                    dos.WriteUnsignedByte((byte)this._acousticFunction);
-                    dos.WriteUnsignedByte((byte)this._acousticID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._acousticName = dis.ReadUnsignedShort();
-                    this._acousticFunction = dis.ReadUnsignedByte();
-                    this._acousticID = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcousticEmitterSystem>");
-            try
-            {
-                sb.AppendLine("<acousticName type=\"ushort\">" + this._acousticName.ToString(CultureInfo.InvariantCulture) + "</acousticName>");
-                sb.AppendLine("<acousticFunction type=\"byte\">" + this._acousticFunction.ToString(CultureInfo.InvariantCulture) + "</acousticFunction>");
-                sb.AppendLine("<acousticID type=\"byte\">" + this._acousticID.ToString(CultureInfo.InvariantCulture) + "</acousticID>");
-                sb.AppendLine("</AcousticEmitterSystem>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcousticEmitterSystem;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcousticEmitterSystem obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._acousticName != obj._acousticName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._acousticFunction != obj._acousticFunction)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._acousticID != obj._acousticID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._acousticName.GetHashCode();
-            result = GenerateHash(result) ^ this._acousticFunction.GetHashCode();
-            result = GenerateHash(result) ^ this._acousticID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.3.35: Information about a particular UA emitter shall be represented using an Acoustic Emitter System record. This record shall consist of three fields: Acoustic Name, Function, and Acoustic ID Number
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcousticEmitterSystem
+    {
+        /// <summary>
+        /// This field shall specify the system for a particular UA emitter.
+        /// </summary>
+        private ushort _acousticName;
+
+        /// <summary>
+        /// This field shall describe the function of the acoustic system. 
+        /// </summary>
+        private byte _acousticFunction;
+
+        /// <summary>
+        /// This field shall specify the UA emitter identification number relative to a specific system. This field shall be represented by an 8-bit unsigned integer. This field allows the differentiation of multiple systems on an entity, even if in some instances two or more of the systems may be identical UA emitter types. Numbering of systems shall begin with the value 1. 
+        /// </summary>
+        private byte _acousticID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcousticEmitterSystem"/> class.
+        /// </summary>
+        public AcousticEmitterSystem()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcousticEmitterSystem left, AcousticEmitterSystem right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcousticEmitterSystem left, AcousticEmitterSystem right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._acousticName
+            marshalSize += 1;  // this._acousticFunction
+            marshalSize += 1;  // this._acousticID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the system for a particular UA emitter.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acousticName")]
+        public ushort AcousticName
+        {
+            get
+            {
+                return this._acousticName;
+            }
+
+            set
+            {
+                this._acousticName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall describe the function of the acoustic system. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "acousticFunction")]
+        public byte AcousticFunction
+        {
+            get
+            {
+                return this._acousticFunction;
+            }
+
+            set
+            {
+                this._acousticFunction = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the UA emitter identification number relative to a specific system. This field shall be represented by an 8-bit unsigned integer. This field allows the differentiation of multiple systems on an entity, even if in some instances two or more of the systems may be identical UA emitter types. Numbering of systems shall begin with the value 1. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "acousticID")]
+        public byte AcousticID
+        {
+            get
+            {
+                return this._acousticID;
+            }
+
+            set
+            {
+                this._acousticID = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._acousticName);
+                    dos.WriteUnsignedByte((byte)this._acousticFunction);
+                    dos.WriteUnsignedByte((byte)this._acousticID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._acousticName = dis.ReadUnsignedShort();
+                    this._acousticFunction = dis.ReadUnsignedByte();
+                    this._acousticID = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcousticEmitterSystem>");
+            try
+            {
+                sb.AppendLine("<acousticName type=\"ushort\">" + this._acousticName.ToString(CultureInfo.InvariantCulture) + "</acousticName>");
+                sb.AppendLine("<acousticFunction type=\"byte\">" + this._acousticFunction.ToString(CultureInfo.InvariantCulture) + "</acousticFunction>");
+                sb.AppendLine("<acousticID type=\"byte\">" + this._acousticID.ToString(CultureInfo.InvariantCulture) + "</acousticID>");
+                sb.AppendLine("</AcousticEmitterSystem>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcousticEmitterSystem;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcousticEmitterSystem obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._acousticName != obj._acousticName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._acousticFunction != obj._acousticFunction)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._acousticID != obj._acousticID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._acousticName.GetHashCode();
+            result = GenerateHash(result) ^ this._acousticFunction.GetHashCode();
+            result = GenerateHash(result) ^ this._acousticID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs b/Libs/CsharpDis6/Dis1998/Generated/AcousticEmitterSystemData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AcousticEmitterSystemData.cs
index 2a53953..0a7ec1b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AcousticEmitterSystemData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AcousticEmitterSystemData.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Used in the UA pdu; ties together an emmitter and a location. This requires manual cleanup; the beam data should not be attached to each emitter system.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(AcousticEmitterSystem))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(AcousticBeamData))]
-    public partial class AcousticEmitterSystemData
-    {
-        /// <summary>
-        /// Length of emitter system data
-        /// </summary>
-        private byte _emitterSystemDataLength;
-
-        /// <summary>
-        /// Number of beams
-        /// </summary>
-        private byte _numberOfBeams;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad2;
-
-        /// <summary>
-        /// This field shall specify the system for a particular UA emitter.
-        /// </summary>
-        private AcousticEmitterSystem _acousticEmitterSystem = new AcousticEmitterSystem();
-
-        /// <summary>
-        /// Represents the location wrt the entity
-        /// </summary>
-        private Vector3Float _emitterLocation = new Vector3Float();
-
-        /// <summary>
-        /// For each beam in numberOfBeams, an emitter system. This is not right--the beam records need to be at the end of the PDU, rather than attached to each system.
-        /// </summary>
-        private List<AcousticBeamData> _beamRecords = new List<AcousticBeamData>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AcousticEmitterSystemData"/> class.
-        /// </summary>
-        public AcousticEmitterSystemData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AcousticEmitterSystemData left, AcousticEmitterSystemData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AcousticEmitterSystemData left, AcousticEmitterSystemData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._emitterSystemDataLength
-            marshalSize += 1;  // this._numberOfBeams
-            marshalSize += 2;  // this._pad2
-            marshalSize += this._acousticEmitterSystem.GetMarshalledSize();  // this._acousticEmitterSystem
-            marshalSize += this._emitterLocation.GetMarshalledSize();  // this._emitterLocation
-            for (int idx = 0; idx < this._beamRecords.Count; idx++)
-            {
-                AcousticBeamData listElement = (AcousticBeamData)this._beamRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Length of emitter system data
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "emitterSystemDataLength")]
-        public byte EmitterSystemDataLength
-        {
-            get
-            {
-                return this._emitterSystemDataLength;
-            }
-
-            set
-            {
-                this._emitterSystemDataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of beams
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfBeams method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
-        public byte NumberOfBeams
-        {
-            get
-            {
-                return this._numberOfBeams;
-            }
-
-            set
-            {
-                this._numberOfBeams = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
-        public ushort Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the system for a particular UA emitter.
-        /// </summary>
-        [XmlElement(Type = typeof(AcousticEmitterSystem), ElementName = "acousticEmitterSystem")]
-        public AcousticEmitterSystem AcousticEmitterSystem
-        {
-            get
-            {
-                return this._acousticEmitterSystem;
-            }
-
-            set
-            {
-                this._acousticEmitterSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Represents the location wrt the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "emitterLocation")]
-        public Vector3Float EmitterLocation
-        {
-            get
-            {
-                return this._emitterLocation;
-            }
-
-            set
-            {
-                this._emitterLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the For each beam in numberOfBeams, an emitter system. This is not right--the beam records need to be at the end of the PDU, rather than attached to each system.
-        /// </summary>
-        [XmlElement(ElementName = "beamRecordsList", Type = typeof(List<AcousticBeamData>))]
-        public List<AcousticBeamData> BeamRecords
-        {
-            get
-            {
-                return this._beamRecords;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._emitterSystemDataLength);
-                    dos.WriteUnsignedByte((byte)this._beamRecords.Count);
-                    dos.WriteUnsignedShort((ushort)this._pad2);
-                    this._acousticEmitterSystem.Marshal(dos);
-                    this._emitterLocation.Marshal(dos);
-
-                    for (int idx = 0; idx < this._beamRecords.Count; idx++)
-                    {
-                        AcousticBeamData aAcousticBeamData = (AcousticBeamData)this._beamRecords[idx];
-                        aAcousticBeamData.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._emitterSystemDataLength = dis.ReadUnsignedByte();
-                    this._numberOfBeams = dis.ReadUnsignedByte();
-                    this._pad2 = dis.ReadUnsignedShort();
-                    this._acousticEmitterSystem.Unmarshal(dis);
-                    this._emitterLocation.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this.NumberOfBeams; idx++)
-                    {
-                        AcousticBeamData anX = new AcousticBeamData();
-                        anX.Unmarshal(dis);
-                        this._beamRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AcousticEmitterSystemData>");
-            try
-            {
-                sb.AppendLine("<emitterSystemDataLength type=\"byte\">" + this._emitterSystemDataLength.ToString(CultureInfo.InvariantCulture) + "</emitterSystemDataLength>");
-                sb.AppendLine("<beamRecords type=\"byte\">" + this._beamRecords.Count.ToString(CultureInfo.InvariantCulture) + "</beamRecords>");
-                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<acousticEmitterSystem>");
-                this._acousticEmitterSystem.Reflection(sb);
-                sb.AppendLine("</acousticEmitterSystem>");
-                sb.AppendLine("<emitterLocation>");
-                this._emitterLocation.Reflection(sb);
-                sb.AppendLine("</emitterLocation>");
-                for (int idx = 0; idx < this._beamRecords.Count; idx++)
-                {
-                    sb.AppendLine("<beamRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"AcousticBeamData\">");
-                    AcousticBeamData aAcousticBeamData = (AcousticBeamData)this._beamRecords[idx];
-                    aAcousticBeamData.Reflection(sb);
-                    sb.AppendLine("</beamRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</AcousticEmitterSystemData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AcousticEmitterSystemData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AcousticEmitterSystemData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._emitterSystemDataLength != obj._emitterSystemDataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfBeams != obj._numberOfBeams)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._acousticEmitterSystem.Equals(obj._acousticEmitterSystem))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._emitterLocation.Equals(obj._emitterLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamRecords.Count != obj._beamRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._beamRecords.Count; idx++)
-                {
-                    if (!this._beamRecords[idx].Equals(obj._beamRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._emitterSystemDataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._acousticEmitterSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterLocation.GetHashCode();
-
-            if (this._beamRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._beamRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._beamRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Used in the UA pdu; ties together an emmitter and a location. This requires manual cleanup; the beam data should not be attached to each emitter system.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(AcousticEmitterSystem))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(AcousticBeamData))]
+    public partial class AcousticEmitterSystemData
+    {
+        /// <summary>
+        /// Length of emitter system data
+        /// </summary>
+        private byte _emitterSystemDataLength;
+
+        /// <summary>
+        /// Number of beams
+        /// </summary>
+        private byte _numberOfBeams;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad2;
+
+        /// <summary>
+        /// This field shall specify the system for a particular UA emitter.
+        /// </summary>
+        private AcousticEmitterSystem _acousticEmitterSystem = new AcousticEmitterSystem();
+
+        /// <summary>
+        /// Represents the location wrt the entity
+        /// </summary>
+        private Vector3Float _emitterLocation = new Vector3Float();
+
+        /// <summary>
+        /// For each beam in numberOfBeams, an emitter system. This is not right--the beam records need to be at the end of the PDU, rather than attached to each system.
+        /// </summary>
+        private List<AcousticBeamData> _beamRecords = new List<AcousticBeamData>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcousticEmitterSystemData"/> class.
+        /// </summary>
+        public AcousticEmitterSystemData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcousticEmitterSystemData left, AcousticEmitterSystemData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcousticEmitterSystemData left, AcousticEmitterSystemData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._emitterSystemDataLength
+            marshalSize += 1;  // this._numberOfBeams
+            marshalSize += 2;  // this._pad2
+            marshalSize += this._acousticEmitterSystem.GetMarshalledSize();  // this._acousticEmitterSystem
+            marshalSize += this._emitterLocation.GetMarshalledSize();  // this._emitterLocation
+            for (int idx = 0; idx < this._beamRecords.Count; idx++)
+            {
+                AcousticBeamData listElement = (AcousticBeamData)this._beamRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Length of emitter system data
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "emitterSystemDataLength")]
+        public byte EmitterSystemDataLength
+        {
+            get
+            {
+                return this._emitterSystemDataLength;
+            }
+
+            set
+            {
+                this._emitterSystemDataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of beams
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfBeams method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
+        public byte NumberOfBeams
+        {
+            get
+            {
+                return this._numberOfBeams;
+            }
+
+            set
+            {
+                this._numberOfBeams = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
+        public ushort Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the system for a particular UA emitter.
+        /// </summary>
+        [XmlElement(Type = typeof(AcousticEmitterSystem), ElementName = "acousticEmitterSystem")]
+        public AcousticEmitterSystem AcousticEmitterSystem
+        {
+            get
+            {
+                return this._acousticEmitterSystem;
+            }
+
+            set
+            {
+                this._acousticEmitterSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Represents the location wrt the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "emitterLocation")]
+        public Vector3Float EmitterLocation
+        {
+            get
+            {
+                return this._emitterLocation;
+            }
+
+            set
+            {
+                this._emitterLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the For each beam in numberOfBeams, an emitter system. This is not right--the beam records need to be at the end of the PDU, rather than attached to each system.
+        /// </summary>
+        [XmlElement(ElementName = "beamRecordsList", Type = typeof(List<AcousticBeamData>))]
+        public List<AcousticBeamData> BeamRecords
+        {
+            get
+            {
+                return this._beamRecords;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._emitterSystemDataLength);
+                    dos.WriteUnsignedByte((byte)this._beamRecords.Count);
+                    dos.WriteUnsignedShort((ushort)this._pad2);
+                    this._acousticEmitterSystem.Marshal(dos);
+                    this._emitterLocation.Marshal(dos);
+
+                    for (int idx = 0; idx < this._beamRecords.Count; idx++)
+                    {
+                        AcousticBeamData aAcousticBeamData = (AcousticBeamData)this._beamRecords[idx];
+                        aAcousticBeamData.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._emitterSystemDataLength = dis.ReadUnsignedByte();
+                    this._numberOfBeams = dis.ReadUnsignedByte();
+                    this._pad2 = dis.ReadUnsignedShort();
+                    this._acousticEmitterSystem.Unmarshal(dis);
+                    this._emitterLocation.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this.NumberOfBeams; idx++)
+                    {
+                        AcousticBeamData anX = new AcousticBeamData();
+                        anX.Unmarshal(dis);
+                        this._beamRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcousticEmitterSystemData>");
+            try
+            {
+                sb.AppendLine("<emitterSystemDataLength type=\"byte\">" + this._emitterSystemDataLength.ToString(CultureInfo.InvariantCulture) + "</emitterSystemDataLength>");
+                sb.AppendLine("<beamRecords type=\"byte\">" + this._beamRecords.Count.ToString(CultureInfo.InvariantCulture) + "</beamRecords>");
+                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<acousticEmitterSystem>");
+                this._acousticEmitterSystem.Reflection(sb);
+                sb.AppendLine("</acousticEmitterSystem>");
+                sb.AppendLine("<emitterLocation>");
+                this._emitterLocation.Reflection(sb);
+                sb.AppendLine("</emitterLocation>");
+                for (int idx = 0; idx < this._beamRecords.Count; idx++)
+                {
+                    sb.AppendLine("<beamRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"AcousticBeamData\">");
+                    AcousticBeamData aAcousticBeamData = (AcousticBeamData)this._beamRecords[idx];
+                    aAcousticBeamData.Reflection(sb);
+                    sb.AppendLine("</beamRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</AcousticEmitterSystemData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcousticEmitterSystemData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcousticEmitterSystemData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._emitterSystemDataLength != obj._emitterSystemDataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfBeams != obj._numberOfBeams)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._acousticEmitterSystem.Equals(obj._acousticEmitterSystem))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._emitterLocation.Equals(obj._emitterLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamRecords.Count != obj._beamRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._beamRecords.Count; idx++)
+                {
+                    if (!this._beamRecords[idx].Equals(obj._beamRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._emitterSystemDataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._acousticEmitterSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterLocation.GetHashCode();
+
+            if (this._beamRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._beamRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._beamRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ActionRequestPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ActionRequestPdu.cs
index d793ece..3ecc730 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ActionRequestPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.6. Request from simulation manager to an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionRequestPdu : SimulationManagementFamilyPdu, IEquatable<ActionRequestPdu>
-    {
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// identifies the action being requested
-        /// </summary>
-        private uint _actionID;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionRequestPdu"/> class.
-        /// </summary>
-        public ActionRequestPdu()
-        {
-            PduType = (byte)16;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionRequestPdu left, ActionRequestPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionRequestPdu left, ActionRequestPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._actionID
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the identifies the action being requested
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
-        public uint ActionID
-        {
-            get
-            {
-                return this._actionID;
-            }
-
-            set
-            {
-                this._actionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._actionID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._actionID = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionRequestPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionRequestPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionRequestPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionRequestPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._actionID != obj._actionID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._actionID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.6. Request from simulation manager to an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionRequestPdu : SimulationManagementFamilyPdu, IEquatable<ActionRequestPdu>
+    {
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// identifies the action being requested
+        /// </summary>
+        private uint _actionID;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionRequestPdu"/> class.
+        /// </summary>
+        public ActionRequestPdu()
+        {
+            PduType = (byte)16;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionRequestPdu left, ActionRequestPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionRequestPdu left, ActionRequestPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._actionID
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifies the action being requested
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
+        public uint ActionID
+        {
+            get
+            {
+                return this._actionID;
+            }
+
+            set
+            {
+                this._actionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._actionID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._actionID = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionRequestPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionRequestPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionRequestPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionRequestPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._actionID != obj._actionID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._actionID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ActionRequestReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ActionRequestReliablePdu.cs
index 089559e..83214d4 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionRequestReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ActionRequestReliablePdu.cs
@@ -1,644 +1,644 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.6: request from a simulation manager to a managed entity to perform a specified action. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionRequestReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionRequestReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _actionID;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionRequestReliablePdu"/> class.
-        /// </summary>
-        public ActionRequestReliablePdu()
-        {
-            PduType = (byte)56;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._actionID
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
-        public uint ActionID
-        {
-            get
-            {
-                return this._actionID;
-            }
-
-            set
-            {
-                this._actionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._actionID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._actionID = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionRequestReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionRequestReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionRequestReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionRequestReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._actionID != obj._actionID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._actionID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.6: request from a simulation manager to a managed entity to perform a specified action. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionRequestReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionRequestReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _actionID;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionRequestReliablePdu"/> class.
+        /// </summary>
+        public ActionRequestReliablePdu()
+        {
+            PduType = (byte)56;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._actionID
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
+        public uint ActionID
+        {
+            get
+            {
+                return this._actionID;
+            }
+
+            set
+            {
+                this._actionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._actionID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._actionID = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionRequestReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionRequestReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionRequestReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionRequestReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._actionID != obj._actionID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._actionID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponsePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ActionResponsePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponsePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ActionResponsePdu.cs
index ea70bfa..1307a23 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponsePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ActionResponsePdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.7. response to an action request PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionResponsePdu : SimulationManagementFamilyPdu, IEquatable<ActionResponsePdu>
-    {
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Status of response
-        /// </summary>
-        private uint _requestStatus;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionResponsePdu"/> class.
-        /// </summary>
-        public ActionResponsePdu()
-        {
-            PduType = (byte)17;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionResponsePdu left, ActionResponsePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionResponsePdu left, ActionResponsePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._requestStatus
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Status of response
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestStatus")]
-        public uint RequestStatus
-        {
-            get
-            {
-                return this._requestStatus;
-            }
-
-            set
-            {
-                this._requestStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._requestStatus);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requestStatus = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionResponsePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requestStatus type=\"uint\">" + this._requestStatus.ToString(CultureInfo.InvariantCulture) + "</requestStatus>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionResponsePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionResponsePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionResponsePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestStatus != obj._requestStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.7. response to an action request PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionResponsePdu : SimulationManagementFamilyPdu, IEquatable<ActionResponsePdu>
+    {
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Status of response
+        /// </summary>
+        private uint _requestStatus;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionResponsePdu"/> class.
+        /// </summary>
+        public ActionResponsePdu()
+        {
+            PduType = (byte)17;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionResponsePdu left, ActionResponsePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionResponsePdu left, ActionResponsePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._requestStatus
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Status of response
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestStatus")]
+        public uint RequestStatus
+        {
+            get
+            {
+                return this._requestStatus;
+            }
+
+            set
+            {
+                this._requestStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._requestStatus);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requestStatus = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionResponsePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requestStatus type=\"uint\">" + this._requestStatus.ToString(CultureInfo.InvariantCulture) + "</requestStatus>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionResponsePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionResponsePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionResponsePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestStatus != obj._requestStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ActionResponseReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ActionResponseReliablePdu.cs
index 6686d5b..3e77978 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ActionResponseReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ActionResponseReliablePdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class ActionResponseReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionResponseReliablePdu>
-    {
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// status of response
-        /// </summary>
-        private uint _responseStatus;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ActionResponseReliablePdu"/> class.
-        /// </summary>
-        public ActionResponseReliablePdu()
-        {
-            PduType = (byte)57;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._responseStatus
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the status of response
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "responseStatus")]
-        public uint ResponseStatus
-        {
-            get
-            {
-                return this._responseStatus;
-            }
-
-            set
-            {
-                this._responseStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._responseStatus);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._responseStatus = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ActionResponseReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<responseStatus type=\"uint\">" + this._responseStatus.ToString(CultureInfo.InvariantCulture) + "</responseStatus>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ActionResponseReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ActionResponseReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ActionResponseReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._responseStatus != obj._responseStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._responseStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionResponseReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionResponseReliablePdu>
+    {
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// status of response
+        /// </summary>
+        private uint _responseStatus;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionResponseReliablePdu"/> class.
+        /// </summary>
+        public ActionResponseReliablePdu()
+        {
+            PduType = (byte)57;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._responseStatus
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the status of response
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "responseStatus")]
+        public uint ResponseStatus
+        {
+            get
+            {
+                return this._responseStatus;
+            }
+
+            set
+            {
+                this._responseStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._responseStatus);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._responseStatus = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionResponseReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<responseStatus type=\"uint\">" + this._responseStatus.ToString(CultureInfo.InvariantCulture) + "</responseStatus>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionResponseReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionResponseReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionResponseReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._responseStatus != obj._responseStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._responseStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateID.cs b/Libs/CsharpDis6/Dis1998/Generated/AggregateID.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateID.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AggregateID.cs
index 25ffbc1..c0296c6 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateID.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AggregateID.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.36. Each agregate in a given simulation app is given an aggregate identifier number unique for all other aggregates in that app and in that exercise. The id is valid for the duration of the the exercise.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AggregateID
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// the aggregate ID
-        /// </summary>
-        private ushort _aggregateID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AggregateID"/> class.
-        /// </summary>
-        public AggregateID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AggregateID left, AggregateID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AggregateID left, AggregateID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            marshalSize += 2;  // this._aggregateID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the aggregate ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "aggregateID")]
-        public ushort AggregateID_
-        {
-            get
-            {
-                return this._aggregateID;
-            }
-
-            set
-            {
-                this._aggregateID = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                    dos.WriteUnsignedShort((ushort)this._aggregateID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                    this._aggregateID = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AggregateID>");
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("<aggregateID type=\"ushort\">" + this._aggregateID.ToString(CultureInfo.InvariantCulture) + "</aggregateID>");
-                sb.AppendLine("</AggregateID>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AggregateID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AggregateID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._aggregateID != obj._aggregateID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-            result = GenerateHash(result) ^ this._aggregateID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.36. Each agregate in a given simulation app is given an aggregate identifier number unique for all other aggregates in that app and in that exercise. The id is valid for the duration of the the exercise.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AggregateID
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// the aggregate ID
+        /// </summary>
+        private ushort _aggregateID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AggregateID"/> class.
+        /// </summary>
+        public AggregateID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AggregateID left, AggregateID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AggregateID left, AggregateID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            marshalSize += 2;  // this._aggregateID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the aggregate ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "aggregateID")]
+        public ushort AggregateID_
+        {
+            get
+            {
+                return this._aggregateID;
+            }
+
+            set
+            {
+                this._aggregateID = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                    dos.WriteUnsignedShort((ushort)this._aggregateID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                    this._aggregateID = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AggregateID>");
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("<aggregateID type=\"ushort\">" + this._aggregateID.ToString(CultureInfo.InvariantCulture) + "</aggregateID>");
+                sb.AppendLine("</AggregateID>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AggregateID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AggregateID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._aggregateID != obj._aggregateID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+            result = GenerateHash(result) ^ this._aggregateID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateMarking.cs b/Libs/CsharpDis6/Dis1998/Generated/AggregateMarking.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateMarking.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AggregateMarking.cs
index ee45e0f..5c9c56c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateMarking.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AggregateMarking.cs
@@ -1,359 +1,359 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.37. Specifies the character set used inthe first byte, followed by up to 31 characters of text data.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AggregateMarking
-    {
-        /// <summary>
-        /// The character set
-        /// </summary>
-        private byte _characterSet;
-
-        /// <summary>
-        /// The characters
-        /// </summary>
-        private byte[] _characters = new byte[31];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AggregateMarking"/> class.
-        /// </summary>
-        public AggregateMarking()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AggregateMarking left, AggregateMarking right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AggregateMarking left, AggregateMarking right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._characterSet
-            marshalSize += 31 * 1;  // _characters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The character set
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
-        public byte CharacterSet
-        {
-            get
-            {
-                return this._characterSet;
-            }
-
-            set
-            {
-                this._characterSet = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The characters
-        /// </summary>
-        [XmlArray(ElementName = "characters")]
-        public byte[] Characters
-        {
-            get
-            {
-                return this._characters;
-            }
-
-            set
-            {
-                this._characters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._characterSet);
-
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        dos.WriteByte(this._characters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._characterSet = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        this._characters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AggregateMarking>");
-            try
-            {
-                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
-                for (int idx = 0; idx < this._characters.Length; idx++)
-                {
-                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</AggregateMarking>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AggregateMarking;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AggregateMarking obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._characterSet != obj._characterSet)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._characters.Length != 31) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 31; idx++)
-                {
-                    if (this._characters[idx] != obj._characters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
-
-            for (int idx = 0; idx < 31; idx++)
-            {
-                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.37. Specifies the character set used inthe first byte, followed by up to 31 characters of text data.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AggregateMarking
+    {
+        /// <summary>
+        /// The character set
+        /// </summary>
+        private byte _characterSet;
+
+        /// <summary>
+        /// The characters
+        /// </summary>
+        private byte[] _characters = new byte[31];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AggregateMarking"/> class.
+        /// </summary>
+        public AggregateMarking()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AggregateMarking left, AggregateMarking right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AggregateMarking left, AggregateMarking right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._characterSet
+            marshalSize += 31 * 1;  // _characters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The character set
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
+        public byte CharacterSet
+        {
+            get
+            {
+                return this._characterSet;
+            }
+
+            set
+            {
+                this._characterSet = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The characters
+        /// </summary>
+        [XmlArray(ElementName = "characters")]
+        public byte[] Characters
+        {
+            get
+            {
+                return this._characters;
+            }
+
+            set
+            {
+                this._characters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._characterSet);
+
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        dos.WriteByte(this._characters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._characterSet = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        this._characters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AggregateMarking>");
+            try
+            {
+                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
+                for (int idx = 0; idx < this._characters.Length; idx++)
+                {
+                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</AggregateMarking>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AggregateMarking;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AggregateMarking obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._characterSet != obj._characterSet)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._characters.Length != 31) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 31; idx++)
+                {
+                    if (this._characters[idx] != obj._characters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
+
+            for (int idx = 0; idx < 31; idx++)
+            {
+                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateStatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/AggregateStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateStatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AggregateStatePdu.cs
index b438dc6..49a4497 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AggregateStatePdu.cs
@@ -1,1180 +1,1180 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.9.1 informationa bout aggregating entities anc communicating information about the aggregated entities.        requires manual intervention to fix the padding between entityID lists and silent aggregate sysem lists--this padding        is dependent on how many entityIDs there are, and needs to be on a 32 bit word boundary. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(AggregateMarking))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Orientation))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(AggregateID))]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class AggregateStatePdu : EntityManagementFamilyPdu, IEquatable<AggregateStatePdu>
-    {
-        /// <summary>
-        /// ID of aggregated entities
-        /// </summary>
-        private EntityID _aggregateID = new EntityID();
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// state of aggregate
-        /// </summary>
-        private byte _aggregateState;
-
-        /// <summary>
-        /// entity type of the aggregated entities
-        /// </summary>
-        private EntityType _aggregateType = new EntityType();
-
-        /// <summary>
-        /// formation of aggregated entities
-        /// </summary>
-        private uint _formation;
-
-        /// <summary>
-        /// marking for aggregate; first char is charset type, rest is char data
-        /// </summary>
-        private AggregateMarking _aggregateMarking = new AggregateMarking();
-
-        /// <summary>
-        /// dimensions of bounding box for the aggregated entities, origin at the center of mass
-        /// </summary>
-        private Vector3Float _dimensions = new Vector3Float();
-
-        /// <summary>
-        /// orientation of the bounding box
-        /// </summary>
-        private Orientation _orientation = new Orientation();
-
-        /// <summary>
-        /// center of mass of the aggregation
-        /// </summary>
-        private Vector3Double _centerOfMass = new Vector3Double();
-
-        /// <summary>
-        /// velocity of aggregation
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// number of aggregates
-        /// </summary>
-        private ushort _numberOfDisAggregates;
-
-        /// <summary>
-        /// number of entities
-        /// </summary>
-        private ushort _numberOfDisEntities;
-
-        /// <summary>
-        /// number of silent aggregate types
-        /// </summary>
-        private ushort _numberOfSilentAggregateTypes;
-
-        /// <summary>
-        /// number of silent entity types
-        /// </summary>
-        private ushort _numberOfSilentEntityTypes;
-
-        /// <summary>
-        /// aggregates  list
-        /// </summary>
-        private List<AggregateID> _aggregateIDList = new List<AggregateID>();
-
-        /// <summary>
-        /// entity ID list
-        /// </summary>
-        private List<EntityID> _entityIDList = new List<EntityID>();
-
-        /// <summary>
-        /// ^^^padding to put the start of the next list on a 32 bit boundary. This needs to be fixed
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// silent entity types
-        /// </summary>
-        private List<EntityType> _silentAggregateSystemList = new List<EntityType>();
-
-        /// <summary>
-        /// silent entity types
-        /// </summary>
-        private List<EntityType> _silentEntitySystemList = new List<EntityType>();
-
-        /// <summary>
-        /// number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variableDatums
-        /// </summary>
-        private List<VariableDatum> _variableDatumList = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AggregateStatePdu"/> class.
-        /// </summary>
-        public AggregateStatePdu()
-        {
-            PduType = (byte)33;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AggregateStatePdu left, AggregateStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AggregateStatePdu left, AggregateStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._aggregateID.GetMarshalledSize();  // this._aggregateID
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._aggregateState
-            marshalSize += this._aggregateType.GetMarshalledSize();  // this._aggregateType
-            marshalSize += 4;  // this._formation
-            marshalSize += this._aggregateMarking.GetMarshalledSize();  // this._aggregateMarking
-            marshalSize += this._dimensions.GetMarshalledSize();  // this._dimensions
-            marshalSize += this._orientation.GetMarshalledSize();  // this._orientation
-            marshalSize += this._centerOfMass.GetMarshalledSize();  // this._centerOfMass
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += 2;  // this._numberOfDisAggregates
-            marshalSize += 2;  // this._numberOfDisEntities
-            marshalSize += 2;  // this._numberOfSilentAggregateTypes
-            marshalSize += 2;  // this._numberOfSilentEntityTypes
-            for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
-            {
-                AggregateID listElement = (AggregateID)this._aggregateIDList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._entityIDList.Count; idx++)
-            {
-                EntityID listElement = (EntityID)this._entityIDList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            marshalSize += 1;  // this._pad2
-            for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
-            {
-                EntityType listElement = (EntityType)this._silentAggregateSystemList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
-            {
-                EntityType listElement = (EntityType)this._silentEntitySystemList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._variableDatumList.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of aggregated entities
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "aggregateID")]
-        public EntityID AggregateID
-        {
-            get
-            {
-                return this._aggregateID;
-            }
-
-            set
-            {
-                this._aggregateID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the state of aggregate
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "aggregateState")]
-        public byte AggregateState
-        {
-            get
-            {
-                return this._aggregateState;
-            }
-
-            set
-            {
-                this._aggregateState = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the entity type of the aggregated entities
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "aggregateType")]
-        public EntityType AggregateType
-        {
-            get
-            {
-                return this._aggregateType;
-            }
-
-            set
-            {
-                this._aggregateType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the formation of aggregated entities
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "formation")]
-        public uint Formation
-        {
-            get
-            {
-                return this._formation;
-            }
-
-            set
-            {
-                this._formation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the marking for aggregate; first char is charset type, rest is char data
-        /// </summary>
-        [XmlElement(Type = typeof(AggregateMarking), ElementName = "aggregateMarking")]
-        public AggregateMarking AggregateMarking
-        {
-            get
-            {
-                return this._aggregateMarking;
-            }
-
-            set
-            {
-                this._aggregateMarking = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the dimensions of bounding box for the aggregated entities, origin at the center of mass
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "dimensions")]
-        public Vector3Float Dimensions
-        {
-            get
-            {
-                return this._dimensions;
-            }
-
-            set
-            {
-                this._dimensions = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the orientation of the bounding box
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "orientation")]
-        public Orientation Orientation
-        {
-            get
-            {
-                return this._orientation;
-            }
-
-            set
-            {
-                this._orientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the center of mass of the aggregation
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "centerOfMass")]
-        public Vector3Double CenterOfMass
-        {
-            get
-            {
-                return this._centerOfMass;
-            }
-
-            set
-            {
-                this._centerOfMass = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity of aggregation
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of aggregates
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfDisAggregates method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDisAggregates")]
-        public ushort NumberOfDisAggregates
-        {
-            get
-            {
-                return this._numberOfDisAggregates;
-            }
-
-            set
-            {
-                this._numberOfDisAggregates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of entities
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfDisEntities method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDisEntities")]
-        public ushort NumberOfDisEntities
-        {
-            get
-            {
-                return this._numberOfDisEntities;
-            }
-
-            set
-            {
-                this._numberOfDisEntities = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of silent aggregate types
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSilentAggregateTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfSilentAggregateTypes")]
-        public ushort NumberOfSilentAggregateTypes
-        {
-            get
-            {
-                return this._numberOfSilentAggregateTypes;
-            }
-
-            set
-            {
-                this._numberOfSilentAggregateTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of silent entity types
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSilentEntityTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfSilentEntityTypes")]
-        public ushort NumberOfSilentEntityTypes
-        {
-            get
-            {
-                return this._numberOfSilentEntityTypes;
-            }
-
-            set
-            {
-                this._numberOfSilentEntityTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the aggregates  list
-        /// </summary>
-        [XmlElement(ElementName = "aggregateIDListList", Type = typeof(List<AggregateID>))]
-        public List<AggregateID> AggregateIDList
-        {
-            get
-            {
-                return this._aggregateIDList;
-            }
-        }
-
-        /// <summary>
-        /// Gets the entity ID list
-        /// </summary>
-        [XmlElement(ElementName = "entityIDListList", Type = typeof(List<EntityID>))]
-        public List<EntityID> EntityIDList
-        {
-            get
-            {
-                return this._entityIDList;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ^^^padding to put the start of the next list on a 32 bit boundary. This needs to be fixed
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the silent entity types
-        /// </summary>
-        [XmlElement(ElementName = "silentAggregateSystemListList", Type = typeof(List<EntityType>))]
-        public List<EntityType> SilentAggregateSystemList
-        {
-            get
-            {
-                return this._silentAggregateSystemList;
-            }
-        }
-
-        /// <summary>
-        /// Gets the silent entity types
-        /// </summary>
-        [XmlElement(ElementName = "silentEntitySystemListList", Type = typeof(List<EntityType>))]
-        public List<EntityType> SilentEntitySystemList
-        {
-            get
-            {
-                return this._silentEntitySystemList;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variableDatums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumListList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumList
-        {
-            get
-            {
-                return this._variableDatumList;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._aggregateID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._aggregateState);
-                    this._aggregateType.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._formation);
-                    this._aggregateMarking.Marshal(dos);
-                    this._dimensions.Marshal(dos);
-                    this._orientation.Marshal(dos);
-                    this._centerOfMass.Marshal(dos);
-                    this._velocity.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._aggregateIDList.Count);
-                    dos.WriteUnsignedShort((ushort)this._entityIDList.Count);
-                    dos.WriteUnsignedShort((ushort)this._silentAggregateSystemList.Count);
-                    dos.WriteUnsignedShort((ushort)this._silentEntitySystemList.Count);
-
-                    for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
-                    {
-                        AggregateID aAggregateID = (AggregateID)this._aggregateIDList[idx];
-                        aAggregateID.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._entityIDList.Count; idx++)
-                    {
-                        EntityID aEntityID = (EntityID)this._entityIDList[idx];
-                        aEntityID.Marshal(dos);
-                    }
-
-                    dos.WriteUnsignedByte((byte)this._pad2);
-
-                    for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
-                    {
-                        EntityType aEntityType = (EntityType)this._silentAggregateSystemList[idx];
-                        aEntityType.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
-                    {
-                        EntityType aEntityType = (EntityType)this._silentEntitySystemList[idx];
-                        aEntityType.Marshal(dos);
-                    }
-
-                    dos.WriteUnsignedInt((uint)this._variableDatumList.Count);
-
-                    for (int idx = 0; idx < this._variableDatumList.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumList[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._aggregateID.Unmarshal(dis);
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._aggregateState = dis.ReadUnsignedByte();
-                    this._aggregateType.Unmarshal(dis);
-                    this._formation = dis.ReadUnsignedInt();
-                    this._aggregateMarking.Unmarshal(dis);
-                    this._dimensions.Unmarshal(dis);
-                    this._orientation.Unmarshal(dis);
-                    this._centerOfMass.Unmarshal(dis);
-                    this._velocity.Unmarshal(dis);
-                    this._numberOfDisAggregates = dis.ReadUnsignedShort();
-                    this._numberOfDisEntities = dis.ReadUnsignedShort();
-                    this._numberOfSilentAggregateTypes = dis.ReadUnsignedShort();
-                    this._numberOfSilentEntityTypes = dis.ReadUnsignedShort();
-
-                    for (int idx = 0; idx < this.NumberOfDisAggregates; idx++)
-                    {
-                        AggregateID anX = new AggregateID();
-                        anX.Unmarshal(dis);
-                        this._aggregateIDList.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfDisEntities; idx++)
-                    {
-                        EntityID anX = new EntityID();
-                        anX.Unmarshal(dis);
-                        this._entityIDList.Add(anX);
-                    }
-
-                    this._pad2 = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.NumberOfSilentAggregateTypes; idx++)
-                    {
-                        EntityType anX = new EntityType();
-                        anX.Unmarshal(dis);
-                        this._silentAggregateSystemList.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfSilentEntityTypes; idx++)
-                    {
-                        EntityType anX = new EntityType();
-                        anX.Unmarshal(dis);
-                        this._silentEntitySystemList.Add(anX);
-                    }
-
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumList.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AggregateStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<aggregateID>");
-                this._aggregateID.Reflection(sb);
-                sb.AppendLine("</aggregateID>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<aggregateState type=\"byte\">" + this._aggregateState.ToString(CultureInfo.InvariantCulture) + "</aggregateState>");
-                sb.AppendLine("<aggregateType>");
-                this._aggregateType.Reflection(sb);
-                sb.AppendLine("</aggregateType>");
-                sb.AppendLine("<formation type=\"uint\">" + this._formation.ToString(CultureInfo.InvariantCulture) + "</formation>");
-                sb.AppendLine("<aggregateMarking>");
-                this._aggregateMarking.Reflection(sb);
-                sb.AppendLine("</aggregateMarking>");
-                sb.AppendLine("<dimensions>");
-                this._dimensions.Reflection(sb);
-                sb.AppendLine("</dimensions>");
-                sb.AppendLine("<orientation>");
-                this._orientation.Reflection(sb);
-                sb.AppendLine("</orientation>");
-                sb.AppendLine("<centerOfMass>");
-                this._centerOfMass.Reflection(sb);
-                sb.AppendLine("</centerOfMass>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<aggregateIDList type=\"ushort\">" + this._aggregateIDList.Count.ToString(CultureInfo.InvariantCulture) + "</aggregateIDList>");
-                sb.AppendLine("<entityIDList type=\"ushort\">" + this._entityIDList.Count.ToString(CultureInfo.InvariantCulture) + "</entityIDList>");
-                sb.AppendLine("<silentAggregateSystemList type=\"ushort\">" + this._silentAggregateSystemList.Count.ToString(CultureInfo.InvariantCulture) + "</silentAggregateSystemList>");
-                sb.AppendLine("<silentEntitySystemList type=\"ushort\">" + this._silentEntitySystemList.Count.ToString(CultureInfo.InvariantCulture) + "</silentEntitySystemList>");
-                for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
-                {
-                    sb.AppendLine("<aggregateIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"AggregateID\">");
-                    AggregateID aAggregateID = (AggregateID)this._aggregateIDList[idx];
-                    aAggregateID.Reflection(sb);
-                    sb.AppendLine("</aggregateIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._entityIDList.Count; idx++)
-                {
-                    sb.AppendLine("<entityIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityID\">");
-                    EntityID aEntityID = (EntityID)this._entityIDList[idx];
-                    aEntityID.Reflection(sb);
-                    sb.AppendLine("</entityIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
-                {
-                    sb.AppendLine("<silentAggregateSystemList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
-                    EntityType aEntityType = (EntityType)this._silentAggregateSystemList[idx];
-                    aEntityType.Reflection(sb);
-                    sb.AppendLine("</silentAggregateSystemList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
-                {
-                    sb.AppendLine("<silentEntitySystemList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
-                    EntityType aEntityType = (EntityType)this._silentEntitySystemList[idx];
-                    aEntityType.Reflection(sb);
-                    sb.AppendLine("</silentEntitySystemList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("<variableDatumList type=\"uint\">" + this._variableDatumList.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumList>");
-                for (int idx = 0; idx < this._variableDatumList.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumList[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</AggregateStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AggregateStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AggregateStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._aggregateID.Equals(obj._aggregateID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._aggregateState != obj._aggregateState)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._aggregateType.Equals(obj._aggregateType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._formation != obj._formation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._aggregateMarking.Equals(obj._aggregateMarking))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._dimensions.Equals(obj._dimensions))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._orientation.Equals(obj._orientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._centerOfMass.Equals(obj._centerOfMass))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfDisAggregates != obj._numberOfDisAggregates)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfDisEntities != obj._numberOfDisEntities)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSilentAggregateTypes != obj._numberOfSilentAggregateTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSilentEntityTypes != obj._numberOfSilentEntityTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._aggregateIDList.Count != obj._aggregateIDList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
-                {
-                    if (!this._aggregateIDList[idx].Equals(obj._aggregateIDList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._entityIDList.Count != obj._entityIDList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._entityIDList.Count; idx++)
-                {
-                    if (!this._entityIDList[idx].Equals(obj._entityIDList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._silentAggregateSystemList.Count != obj._silentAggregateSystemList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
-                {
-                    if (!this._silentAggregateSystemList[idx].Equals(obj._silentAggregateSystemList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._silentEntitySystemList.Count != obj._silentEntitySystemList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
-                {
-                    if (!this._silentEntitySystemList[idx].Equals(obj._silentEntitySystemList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumList.Count != obj._variableDatumList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumList.Count; idx++)
-                {
-                    if (!this._variableDatumList[idx].Equals(obj._variableDatumList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._aggregateID.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._aggregateState.GetHashCode();
-            result = GenerateHash(result) ^ this._aggregateType.GetHashCode();
-            result = GenerateHash(result) ^ this._formation.GetHashCode();
-            result = GenerateHash(result) ^ this._aggregateMarking.GetHashCode();
-            result = GenerateHash(result) ^ this._dimensions.GetHashCode();
-            result = GenerateHash(result) ^ this._orientation.GetHashCode();
-            result = GenerateHash(result) ^ this._centerOfMass.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfDisAggregates.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfDisEntities.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSilentAggregateTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSilentEntityTypes.GetHashCode();
-
-            if (this._aggregateIDList.Count > 0)
-            {
-                for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._aggregateIDList[idx].GetHashCode();
-                }
-            }
-
-            if (this._entityIDList.Count > 0)
-            {
-                for (int idx = 0; idx < this._entityIDList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._entityIDList[idx].GetHashCode();
-                }
-            }
-
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-
-            if (this._silentAggregateSystemList.Count > 0)
-            {
-                for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._silentAggregateSystemList[idx].GetHashCode();
-                }
-            }
-
-            if (this._silentEntitySystemList.Count > 0)
-            {
-                for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._silentEntitySystemList[idx].GetHashCode();
-                }
-            }
-
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._variableDatumList.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumList[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.9.1 informationa bout aggregating entities anc communicating information about the aggregated entities.        requires manual intervention to fix the padding between entityID lists and silent aggregate sysem lists--this padding        is dependent on how many entityIDs there are, and needs to be on a 32 bit word boundary. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(AggregateMarking))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Orientation))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(AggregateID))]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class AggregateStatePdu : EntityManagementFamilyPdu, IEquatable<AggregateStatePdu>
+    {
+        /// <summary>
+        /// ID of aggregated entities
+        /// </summary>
+        private EntityID _aggregateID = new EntityID();
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// state of aggregate
+        /// </summary>
+        private byte _aggregateState;
+
+        /// <summary>
+        /// entity type of the aggregated entities
+        /// </summary>
+        private EntityType _aggregateType = new EntityType();
+
+        /// <summary>
+        /// formation of aggregated entities
+        /// </summary>
+        private uint _formation;
+
+        /// <summary>
+        /// marking for aggregate; first char is charset type, rest is char data
+        /// </summary>
+        private AggregateMarking _aggregateMarking = new AggregateMarking();
+
+        /// <summary>
+        /// dimensions of bounding box for the aggregated entities, origin at the center of mass
+        /// </summary>
+        private Vector3Float _dimensions = new Vector3Float();
+
+        /// <summary>
+        /// orientation of the bounding box
+        /// </summary>
+        private Orientation _orientation = new Orientation();
+
+        /// <summary>
+        /// center of mass of the aggregation
+        /// </summary>
+        private Vector3Double _centerOfMass = new Vector3Double();
+
+        /// <summary>
+        /// velocity of aggregation
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// number of aggregates
+        /// </summary>
+        private ushort _numberOfDisAggregates;
+
+        /// <summary>
+        /// number of entities
+        /// </summary>
+        private ushort _numberOfDisEntities;
+
+        /// <summary>
+        /// number of silent aggregate types
+        /// </summary>
+        private ushort _numberOfSilentAggregateTypes;
+
+        /// <summary>
+        /// number of silent entity types
+        /// </summary>
+        private ushort _numberOfSilentEntityTypes;
+
+        /// <summary>
+        /// aggregates  list
+        /// </summary>
+        private List<AggregateID> _aggregateIDList = new List<AggregateID>();
+
+        /// <summary>
+        /// entity ID list
+        /// </summary>
+        private List<EntityID> _entityIDList = new List<EntityID>();
+
+        /// <summary>
+        /// ^^^padding to put the start of the next list on a 32 bit boundary. This needs to be fixed
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// silent entity types
+        /// </summary>
+        private List<EntityType> _silentAggregateSystemList = new List<EntityType>();
+
+        /// <summary>
+        /// silent entity types
+        /// </summary>
+        private List<EntityType> _silentEntitySystemList = new List<EntityType>();
+
+        /// <summary>
+        /// number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variableDatums
+        /// </summary>
+        private List<VariableDatum> _variableDatumList = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AggregateStatePdu"/> class.
+        /// </summary>
+        public AggregateStatePdu()
+        {
+            PduType = (byte)33;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AggregateStatePdu left, AggregateStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AggregateStatePdu left, AggregateStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._aggregateID.GetMarshalledSize();  // this._aggregateID
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._aggregateState
+            marshalSize += this._aggregateType.GetMarshalledSize();  // this._aggregateType
+            marshalSize += 4;  // this._formation
+            marshalSize += this._aggregateMarking.GetMarshalledSize();  // this._aggregateMarking
+            marshalSize += this._dimensions.GetMarshalledSize();  // this._dimensions
+            marshalSize += this._orientation.GetMarshalledSize();  // this._orientation
+            marshalSize += this._centerOfMass.GetMarshalledSize();  // this._centerOfMass
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += 2;  // this._numberOfDisAggregates
+            marshalSize += 2;  // this._numberOfDisEntities
+            marshalSize += 2;  // this._numberOfSilentAggregateTypes
+            marshalSize += 2;  // this._numberOfSilentEntityTypes
+            for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
+            {
+                AggregateID listElement = (AggregateID)this._aggregateIDList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._entityIDList.Count; idx++)
+            {
+                EntityID listElement = (EntityID)this._entityIDList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            marshalSize += 1;  // this._pad2
+            for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
+            {
+                EntityType listElement = (EntityType)this._silentAggregateSystemList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
+            {
+                EntityType listElement = (EntityType)this._silentEntitySystemList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._variableDatumList.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of aggregated entities
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "aggregateID")]
+        public EntityID AggregateID
+        {
+            get
+            {
+                return this._aggregateID;
+            }
+
+            set
+            {
+                this._aggregateID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the state of aggregate
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "aggregateState")]
+        public byte AggregateState
+        {
+            get
+            {
+                return this._aggregateState;
+            }
+
+            set
+            {
+                this._aggregateState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the entity type of the aggregated entities
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "aggregateType")]
+        public EntityType AggregateType
+        {
+            get
+            {
+                return this._aggregateType;
+            }
+
+            set
+            {
+                this._aggregateType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the formation of aggregated entities
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "formation")]
+        public uint Formation
+        {
+            get
+            {
+                return this._formation;
+            }
+
+            set
+            {
+                this._formation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the marking for aggregate; first char is charset type, rest is char data
+        /// </summary>
+        [XmlElement(Type = typeof(AggregateMarking), ElementName = "aggregateMarking")]
+        public AggregateMarking AggregateMarking
+        {
+            get
+            {
+                return this._aggregateMarking;
+            }
+
+            set
+            {
+                this._aggregateMarking = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the dimensions of bounding box for the aggregated entities, origin at the center of mass
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "dimensions")]
+        public Vector3Float Dimensions
+        {
+            get
+            {
+                return this._dimensions;
+            }
+
+            set
+            {
+                this._dimensions = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the orientation of the bounding box
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "orientation")]
+        public Orientation Orientation
+        {
+            get
+            {
+                return this._orientation;
+            }
+
+            set
+            {
+                this._orientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the center of mass of the aggregation
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "centerOfMass")]
+        public Vector3Double CenterOfMass
+        {
+            get
+            {
+                return this._centerOfMass;
+            }
+
+            set
+            {
+                this._centerOfMass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity of aggregation
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of aggregates
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfDisAggregates method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDisAggregates")]
+        public ushort NumberOfDisAggregates
+        {
+            get
+            {
+                return this._numberOfDisAggregates;
+            }
+
+            set
+            {
+                this._numberOfDisAggregates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of entities
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfDisEntities method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDisEntities")]
+        public ushort NumberOfDisEntities
+        {
+            get
+            {
+                return this._numberOfDisEntities;
+            }
+
+            set
+            {
+                this._numberOfDisEntities = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of silent aggregate types
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSilentAggregateTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfSilentAggregateTypes")]
+        public ushort NumberOfSilentAggregateTypes
+        {
+            get
+            {
+                return this._numberOfSilentAggregateTypes;
+            }
+
+            set
+            {
+                this._numberOfSilentAggregateTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of silent entity types
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSilentEntityTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfSilentEntityTypes")]
+        public ushort NumberOfSilentEntityTypes
+        {
+            get
+            {
+                return this._numberOfSilentEntityTypes;
+            }
+
+            set
+            {
+                this._numberOfSilentEntityTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the aggregates  list
+        /// </summary>
+        [XmlElement(ElementName = "aggregateIDListList", Type = typeof(List<AggregateID>))]
+        public List<AggregateID> AggregateIDList
+        {
+            get
+            {
+                return this._aggregateIDList;
+            }
+        }
+
+        /// <summary>
+        /// Gets the entity ID list
+        /// </summary>
+        [XmlElement(ElementName = "entityIDListList", Type = typeof(List<EntityID>))]
+        public List<EntityID> EntityIDList
+        {
+            get
+            {
+                return this._entityIDList;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ^^^padding to put the start of the next list on a 32 bit boundary. This needs to be fixed
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the silent entity types
+        /// </summary>
+        [XmlElement(ElementName = "silentAggregateSystemListList", Type = typeof(List<EntityType>))]
+        public List<EntityType> SilentAggregateSystemList
+        {
+            get
+            {
+                return this._silentAggregateSystemList;
+            }
+        }
+
+        /// <summary>
+        /// Gets the silent entity types
+        /// </summary>
+        [XmlElement(ElementName = "silentEntitySystemListList", Type = typeof(List<EntityType>))]
+        public List<EntityType> SilentEntitySystemList
+        {
+            get
+            {
+                return this._silentEntitySystemList;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variableDatums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumListList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumList
+        {
+            get
+            {
+                return this._variableDatumList;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._aggregateID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._aggregateState);
+                    this._aggregateType.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._formation);
+                    this._aggregateMarking.Marshal(dos);
+                    this._dimensions.Marshal(dos);
+                    this._orientation.Marshal(dos);
+                    this._centerOfMass.Marshal(dos);
+                    this._velocity.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._aggregateIDList.Count);
+                    dos.WriteUnsignedShort((ushort)this._entityIDList.Count);
+                    dos.WriteUnsignedShort((ushort)this._silentAggregateSystemList.Count);
+                    dos.WriteUnsignedShort((ushort)this._silentEntitySystemList.Count);
+
+                    for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
+                    {
+                        AggregateID aAggregateID = (AggregateID)this._aggregateIDList[idx];
+                        aAggregateID.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._entityIDList.Count; idx++)
+                    {
+                        EntityID aEntityID = (EntityID)this._entityIDList[idx];
+                        aEntityID.Marshal(dos);
+                    }
+
+                    dos.WriteUnsignedByte((byte)this._pad2);
+
+                    for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
+                    {
+                        EntityType aEntityType = (EntityType)this._silentAggregateSystemList[idx];
+                        aEntityType.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
+                    {
+                        EntityType aEntityType = (EntityType)this._silentEntitySystemList[idx];
+                        aEntityType.Marshal(dos);
+                    }
+
+                    dos.WriteUnsignedInt((uint)this._variableDatumList.Count);
+
+                    for (int idx = 0; idx < this._variableDatumList.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumList[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._aggregateID.Unmarshal(dis);
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._aggregateState = dis.ReadUnsignedByte();
+                    this._aggregateType.Unmarshal(dis);
+                    this._formation = dis.ReadUnsignedInt();
+                    this._aggregateMarking.Unmarshal(dis);
+                    this._dimensions.Unmarshal(dis);
+                    this._orientation.Unmarshal(dis);
+                    this._centerOfMass.Unmarshal(dis);
+                    this._velocity.Unmarshal(dis);
+                    this._numberOfDisAggregates = dis.ReadUnsignedShort();
+                    this._numberOfDisEntities = dis.ReadUnsignedShort();
+                    this._numberOfSilentAggregateTypes = dis.ReadUnsignedShort();
+                    this._numberOfSilentEntityTypes = dis.ReadUnsignedShort();
+
+                    for (int idx = 0; idx < this.NumberOfDisAggregates; idx++)
+                    {
+                        AggregateID anX = new AggregateID();
+                        anX.Unmarshal(dis);
+                        this._aggregateIDList.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfDisEntities; idx++)
+                    {
+                        EntityID anX = new EntityID();
+                        anX.Unmarshal(dis);
+                        this._entityIDList.Add(anX);
+                    }
+
+                    this._pad2 = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.NumberOfSilentAggregateTypes; idx++)
+                    {
+                        EntityType anX = new EntityType();
+                        anX.Unmarshal(dis);
+                        this._silentAggregateSystemList.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfSilentEntityTypes; idx++)
+                    {
+                        EntityType anX = new EntityType();
+                        anX.Unmarshal(dis);
+                        this._silentEntitySystemList.Add(anX);
+                    }
+
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumList.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AggregateStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<aggregateID>");
+                this._aggregateID.Reflection(sb);
+                sb.AppendLine("</aggregateID>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<aggregateState type=\"byte\">" + this._aggregateState.ToString(CultureInfo.InvariantCulture) + "</aggregateState>");
+                sb.AppendLine("<aggregateType>");
+                this._aggregateType.Reflection(sb);
+                sb.AppendLine("</aggregateType>");
+                sb.AppendLine("<formation type=\"uint\">" + this._formation.ToString(CultureInfo.InvariantCulture) + "</formation>");
+                sb.AppendLine("<aggregateMarking>");
+                this._aggregateMarking.Reflection(sb);
+                sb.AppendLine("</aggregateMarking>");
+                sb.AppendLine("<dimensions>");
+                this._dimensions.Reflection(sb);
+                sb.AppendLine("</dimensions>");
+                sb.AppendLine("<orientation>");
+                this._orientation.Reflection(sb);
+                sb.AppendLine("</orientation>");
+                sb.AppendLine("<centerOfMass>");
+                this._centerOfMass.Reflection(sb);
+                sb.AppendLine("</centerOfMass>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<aggregateIDList type=\"ushort\">" + this._aggregateIDList.Count.ToString(CultureInfo.InvariantCulture) + "</aggregateIDList>");
+                sb.AppendLine("<entityIDList type=\"ushort\">" + this._entityIDList.Count.ToString(CultureInfo.InvariantCulture) + "</entityIDList>");
+                sb.AppendLine("<silentAggregateSystemList type=\"ushort\">" + this._silentAggregateSystemList.Count.ToString(CultureInfo.InvariantCulture) + "</silentAggregateSystemList>");
+                sb.AppendLine("<silentEntitySystemList type=\"ushort\">" + this._silentEntitySystemList.Count.ToString(CultureInfo.InvariantCulture) + "</silentEntitySystemList>");
+                for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
+                {
+                    sb.AppendLine("<aggregateIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"AggregateID\">");
+                    AggregateID aAggregateID = (AggregateID)this._aggregateIDList[idx];
+                    aAggregateID.Reflection(sb);
+                    sb.AppendLine("</aggregateIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._entityIDList.Count; idx++)
+                {
+                    sb.AppendLine("<entityIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityID\">");
+                    EntityID aEntityID = (EntityID)this._entityIDList[idx];
+                    aEntityID.Reflection(sb);
+                    sb.AppendLine("</entityIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
+                {
+                    sb.AppendLine("<silentAggregateSystemList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
+                    EntityType aEntityType = (EntityType)this._silentAggregateSystemList[idx];
+                    aEntityType.Reflection(sb);
+                    sb.AppendLine("</silentAggregateSystemList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
+                {
+                    sb.AppendLine("<silentEntitySystemList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
+                    EntityType aEntityType = (EntityType)this._silentEntitySystemList[idx];
+                    aEntityType.Reflection(sb);
+                    sb.AppendLine("</silentEntitySystemList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("<variableDatumList type=\"uint\">" + this._variableDatumList.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumList>");
+                for (int idx = 0; idx < this._variableDatumList.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumList[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</AggregateStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AggregateStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AggregateStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._aggregateID.Equals(obj._aggregateID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._aggregateState != obj._aggregateState)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._aggregateType.Equals(obj._aggregateType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._formation != obj._formation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._aggregateMarking.Equals(obj._aggregateMarking))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._dimensions.Equals(obj._dimensions))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._orientation.Equals(obj._orientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._centerOfMass.Equals(obj._centerOfMass))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfDisAggregates != obj._numberOfDisAggregates)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfDisEntities != obj._numberOfDisEntities)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSilentAggregateTypes != obj._numberOfSilentAggregateTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSilentEntityTypes != obj._numberOfSilentEntityTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._aggregateIDList.Count != obj._aggregateIDList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
+                {
+                    if (!this._aggregateIDList[idx].Equals(obj._aggregateIDList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._entityIDList.Count != obj._entityIDList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._entityIDList.Count; idx++)
+                {
+                    if (!this._entityIDList[idx].Equals(obj._entityIDList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._silentAggregateSystemList.Count != obj._silentAggregateSystemList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
+                {
+                    if (!this._silentAggregateSystemList[idx].Equals(obj._silentAggregateSystemList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._silentEntitySystemList.Count != obj._silentEntitySystemList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
+                {
+                    if (!this._silentEntitySystemList[idx].Equals(obj._silentEntitySystemList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumList.Count != obj._variableDatumList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumList.Count; idx++)
+                {
+                    if (!this._variableDatumList[idx].Equals(obj._variableDatumList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._aggregateID.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._aggregateState.GetHashCode();
+            result = GenerateHash(result) ^ this._aggregateType.GetHashCode();
+            result = GenerateHash(result) ^ this._formation.GetHashCode();
+            result = GenerateHash(result) ^ this._aggregateMarking.GetHashCode();
+            result = GenerateHash(result) ^ this._dimensions.GetHashCode();
+            result = GenerateHash(result) ^ this._orientation.GetHashCode();
+            result = GenerateHash(result) ^ this._centerOfMass.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfDisAggregates.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfDisEntities.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSilentAggregateTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSilentEntityTypes.GetHashCode();
+
+            if (this._aggregateIDList.Count > 0)
+            {
+                for (int idx = 0; idx < this._aggregateIDList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._aggregateIDList[idx].GetHashCode();
+                }
+            }
+
+            if (this._entityIDList.Count > 0)
+            {
+                for (int idx = 0; idx < this._entityIDList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._entityIDList[idx].GetHashCode();
+                }
+            }
+
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+
+            if (this._silentAggregateSystemList.Count > 0)
+            {
+                for (int idx = 0; idx < this._silentAggregateSystemList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._silentAggregateSystemList[idx].GetHashCode();
+                }
+            }
+
+            if (this._silentEntitySystemList.Count > 0)
+            {
+                for (int idx = 0; idx < this._silentEntitySystemList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._silentEntitySystemList[idx].GetHashCode();
+                }
+            }
+
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._variableDatumList.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumList[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateType.cs b/Libs/CsharpDis6/Dis1998/Generated/AggregateType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateType.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AggregateType.cs
index b86272e..2a46fdb 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AggregateType.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AggregateType.cs
@@ -1,489 +1,489 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.38. Identifies the type of aggregate including kind of entity, domain (surface, subsurface, air, etc) country, category, etc.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AggregateType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _aggregateKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AggregateType"/> class.
-        /// </summary>
-        public AggregateType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AggregateType left, AggregateType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AggregateType left, AggregateType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._aggregateKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "aggregateKind")]
-        public byte AggregateKind
-        {
-            get
-            {
-                return this._aggregateKind;
-            }
-
-            set
-            {
-                this._aggregateKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the extra
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._aggregateKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._aggregateKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AggregateType>");
-            try
-            {
-                sb.AppendLine("<aggregateKind type=\"byte\">" + this._aggregateKind.ToString(CultureInfo.InvariantCulture) + "</aggregateKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("</AggregateType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AggregateType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AggregateType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._aggregateKind != obj._aggregateKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._aggregateKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.38. Identifies the type of aggregate including kind of entity, domain (surface, subsurface, air, etc) country, category, etc.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AggregateType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _aggregateKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AggregateType"/> class.
+        /// </summary>
+        public AggregateType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AggregateType left, AggregateType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AggregateType left, AggregateType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._aggregateKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "aggregateKind")]
+        public byte AggregateKind
+        {
+            get
+            {
+                return this._aggregateKind;
+            }
+
+            set
+            {
+                this._aggregateKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the extra
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._aggregateKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._aggregateKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AggregateType>");
+            try
+            {
+                sb.AppendLine("<aggregateKind type=\"byte\">" + this._aggregateKind.ToString(CultureInfo.InvariantCulture) + "</aggregateKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("</AggregateType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AggregateType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AggregateType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._aggregateKind != obj._aggregateKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._aggregateKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AngularVelocityVector.cs b/Libs/CsharpDis6/Dis1998/Generated/AngularVelocityVector.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AngularVelocityVector.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AngularVelocityVector.cs
index 1a6c274..324db8b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AngularVelocityVector.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AngularVelocityVector.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.2: angular velocity measured in radians per second out each of the entity's own coordinate axes.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class AngularVelocityVector
-    {
-        /// <summary>
-        /// velocity about the x axis
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// velocity about the y axis
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// velocity about the zaxis
-        /// </summary>
-        private float _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AngularVelocityVector"/> class.
-        /// </summary>
-        public AngularVelocityVector()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AngularVelocityVector left, AngularVelocityVector right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AngularVelocityVector left, AngularVelocityVector right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            marshalSize += 4;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the x axis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the y axis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity about the zaxis
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "z")]
-        public float Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                    dos.WriteFloat((float)this._z);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                    this._z = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AngularVelocityVector>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</AngularVelocityVector>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AngularVelocityVector;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AngularVelocityVector obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.2: angular velocity measured in radians per second out each of the entity's own coordinate axes.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AngularVelocityVector
+    {
+        /// <summary>
+        /// velocity about the x axis
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// velocity about the y axis
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// velocity about the zaxis
+        /// </summary>
+        private float _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AngularVelocityVector"/> class.
+        /// </summary>
+        public AngularVelocityVector()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AngularVelocityVector left, AngularVelocityVector right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AngularVelocityVector left, AngularVelocityVector right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            marshalSize += 4;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the x axis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the y axis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the zaxis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "z")]
+        public float Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                    dos.WriteFloat((float)this._z);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                    this._z = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AngularVelocityVector>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</AngularVelocityVector>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AngularVelocityVector;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AngularVelocityVector obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AntennaLocation.cs b/Libs/CsharpDis6/Dis1998/Generated/AntennaLocation.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/AntennaLocation.cs
rename to Libs/CsharpDis6/Dis1998/Generated/AntennaLocation.cs
index 96ed0ad..d6945ac 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/AntennaLocation.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/AntennaLocation.cs
@@ -1,338 +1,338 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.3: location of the radiating portion of the antenna, specified in world coordinates and         entity coordinates.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class AntennaLocation
-    {
-        /// <summary>
-        /// Location of the radiating portion of the antenna in world   coordinates
-        /// </summary>
-        private Vector3Double _antennaLocation = new Vector3Double();
-
-        /// <summary>
-        /// Location of the radiating portion of the antenna    in entity coordinates
-        /// </summary>
-        private Vector3Float _relativeAntennaLocation = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AntennaLocation"/> class.
-        /// </summary>
-        public AntennaLocation()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AntennaLocation left, AntennaLocation right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AntennaLocation left, AntennaLocation right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
-            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of the radiating portion of the antenna in world   coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
-        public Vector3Double AntennaLocation_
-        {
-            get
-            {
-                return this._antennaLocation;
-            }
-
-            set
-            {
-                this._antennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of the radiating portion of the antenna    in entity coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
-        public Vector3Float RelativeAntennaLocation
-        {
-            get
-            {
-                return this._relativeAntennaLocation;
-            }
-
-            set
-            {
-                this._relativeAntennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._antennaLocation.Marshal(dos);
-                    this._relativeAntennaLocation.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._antennaLocation.Unmarshal(dis);
-                    this._relativeAntennaLocation.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<AntennaLocation>");
-            try
-            {
-                sb.AppendLine("<antennaLocation>");
-                this._antennaLocation.Reflection(sb);
-                sb.AppendLine("</antennaLocation>");
-                sb.AppendLine("<relativeAntennaLocation>");
-                this._relativeAntennaLocation.Reflection(sb);
-                sb.AppendLine("</relativeAntennaLocation>");
-                sb.AppendLine("</AntennaLocation>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as AntennaLocation;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AntennaLocation obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._antennaLocation.Equals(obj._antennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.3: location of the radiating portion of the antenna, specified in world coordinates and         entity coordinates.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class AntennaLocation
+    {
+        /// <summary>
+        /// Location of the radiating portion of the antenna in world   coordinates
+        /// </summary>
+        private Vector3Double _antennaLocation = new Vector3Double();
+
+        /// <summary>
+        /// Location of the radiating portion of the antenna    in entity coordinates
+        /// </summary>
+        private Vector3Float _relativeAntennaLocation = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AntennaLocation"/> class.
+        /// </summary>
+        public AntennaLocation()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AntennaLocation left, AntennaLocation right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AntennaLocation left, AntennaLocation right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
+            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of the radiating portion of the antenna in world   coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
+        public Vector3Double AntennaLocation_
+        {
+            get
+            {
+                return this._antennaLocation;
+            }
+
+            set
+            {
+                this._antennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of the radiating portion of the antenna    in entity coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
+        public Vector3Float RelativeAntennaLocation
+        {
+            get
+            {
+                return this._relativeAntennaLocation;
+            }
+
+            set
+            {
+                this._relativeAntennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._antennaLocation.Marshal(dos);
+                    this._relativeAntennaLocation.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._antennaLocation.Unmarshal(dis);
+                    this._relativeAntennaLocation.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AntennaLocation>");
+            try
+            {
+                sb.AppendLine("<antennaLocation>");
+                this._antennaLocation.Reflection(sb);
+                sb.AppendLine("</antennaLocation>");
+                sb.AppendLine("<relativeAntennaLocation>");
+                this._relativeAntennaLocation.Reflection(sb);
+                sb.AppendLine("</relativeAntennaLocation>");
+                sb.AppendLine("</AntennaLocation>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AntennaLocation;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AntennaLocation obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._antennaLocation.Equals(obj._antennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ApaData.cs b/Libs/CsharpDis6/Dis1998/Generated/ApaData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ApaData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ApaData.cs
index 1f1e5ef..b63527d 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ApaData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ApaData.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Used in UA PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ApaData
-    {
-        /// <summary>
-        /// Index of APA parameter
-        /// </summary>
-        private ushort _parameterIndex;
-
-        /// <summary>
-        /// Index of APA parameter
-        /// </summary>
-        private short _parameterValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ApaData"/> class.
-        /// </summary>
-        public ApaData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ApaData left, ApaData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ApaData left, ApaData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._parameterIndex
-            marshalSize += 2;  // this._parameterValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Index of APA parameter
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameterIndex")]
-        public ushort ParameterIndex
-        {
-            get
-            {
-                return this._parameterIndex;
-            }
-
-            set
-            {
-                this._parameterIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Index of APA parameter
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "parameterValue")]
-        public short ParameterValue
-        {
-            get
-            {
-                return this._parameterValue;
-            }
-
-            set
-            {
-                this._parameterValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._parameterIndex);
-                    dos.WriteShort((short)this._parameterValue);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._parameterIndex = dis.ReadUnsignedShort();
-                    this._parameterValue = dis.ReadShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ApaData>");
-            try
-            {
-                sb.AppendLine("<parameterIndex type=\"ushort\">" + this._parameterIndex.ToString(CultureInfo.InvariantCulture) + "</parameterIndex>");
-                sb.AppendLine("<parameterValue type=\"short\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
-                sb.AppendLine("</ApaData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ApaData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ApaData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._parameterIndex != obj._parameterIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterValue != obj._parameterValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._parameterIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Used in UA PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ApaData
+    {
+        /// <summary>
+        /// Index of APA parameter
+        /// </summary>
+        private ushort _parameterIndex;
+
+        /// <summary>
+        /// Index of APA parameter
+        /// </summary>
+        private short _parameterValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApaData"/> class.
+        /// </summary>
+        public ApaData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ApaData left, ApaData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ApaData left, ApaData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._parameterIndex
+            marshalSize += 2;  // this._parameterValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Index of APA parameter
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameterIndex")]
+        public ushort ParameterIndex
+        {
+            get
+            {
+                return this._parameterIndex;
+            }
+
+            set
+            {
+                this._parameterIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Index of APA parameter
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "parameterValue")]
+        public short ParameterValue
+        {
+            get
+            {
+                return this._parameterValue;
+            }
+
+            set
+            {
+                this._parameterValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._parameterIndex);
+                    dos.WriteShort((short)this._parameterValue);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._parameterIndex = dis.ReadUnsignedShort();
+                    this._parameterValue = dis.ReadShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ApaData>");
+            try
+            {
+                sb.AppendLine("<parameterIndex type=\"ushort\">" + this._parameterIndex.ToString(CultureInfo.InvariantCulture) + "</parameterIndex>");
+                sb.AppendLine("<parameterValue type=\"short\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
+                sb.AppendLine("</ApaData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ApaData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ApaData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._parameterIndex != obj._parameterIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterValue != obj._parameterValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._parameterIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ArealObjectStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ArealObjectStatePdu.cs
index 5e06897..f419f91 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArealObjectStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ArealObjectStatePdu.cs
@@ -1,682 +1,682 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.11.5: Information about the addition/modification of an oobject that is geometrically      achored to the terrain with a set of three or more points that come to a closure. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(SixByteChunk))]
-    [XmlInclude(typeof(SimulationAddress))]
-    [XmlInclude(typeof(Vector3Double))]
-    public partial class ArealObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<ArealObjectStatePdu>
-    {
-        /// <summary>
-        /// Object in synthetic environment
-        /// </summary>
-        private EntityID _objectID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _referencedObjectID = new EntityID();
-
-        /// <summary>
-        /// unique update number of each state transition of an object
-        /// </summary>
-        private ushort _updateNumber;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// modifications enumeration
-        /// </summary>
-        private byte _modifications;
-
-        /// <summary>
-        /// Object type
-        /// </summary>
-        private EntityType _objectType = new EntityType();
-
-        /// <summary>
-        /// Object appearance
-        /// </summary>
-        private SixByteChunk _objectAppearance = new SixByteChunk();
-
-        /// <summary>
-        /// Number of points
-        /// </summary>
-        private ushort _numberOfPoints;
-
-        /// <summary>
-        /// requesterID
-        /// </summary>
-        private SimulationAddress _requesterID = new SimulationAddress();
-
-        /// <summary>
-        /// receiver ID
-        /// </summary>
-        private SimulationAddress _receivingID = new SimulationAddress();
-
-        /// <summary>
-        /// location of object
-        /// </summary>
-        private List<Vector3Double> _objectLocation = new List<Vector3Double>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArealObjectStatePdu"/> class.
-        /// </summary>
-        public ArealObjectStatePdu()
-        {
-            PduType = (byte)45;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ArealObjectStatePdu left, ArealObjectStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ArealObjectStatePdu left, ArealObjectStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
-            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
-            marshalSize += 2;  // this._updateNumber
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._modifications
-            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
-            marshalSize += this._objectAppearance.GetMarshalledSize();  // this._objectAppearance
-            marshalSize += 2;  // this._numberOfPoints
-            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            for (int idx = 0; idx < this._objectLocation.Count; idx++)
-            {
-                Vector3Double listElement = (Vector3Double)this._objectLocation[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object in synthetic environment
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
-        public EntityID ObjectID
-        {
-            get
-            {
-                return this._objectID;
-            }
-
-            set
-            {
-                this._objectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
-        public EntityID ReferencedObjectID
-        {
-            get
-            {
-                return this._referencedObjectID;
-            }
-
-            set
-            {
-                this._referencedObjectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique update number of each state transition of an object
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
-        public ushort UpdateNumber
-        {
-            get
-            {
-                return this._updateNumber;
-            }
-
-            set
-            {
-                this._updateNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the modifications enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
-        public byte Modifications
-        {
-            get
-            {
-                return this._modifications;
-            }
-
-            set
-            {
-                this._modifications = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object type
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "objectType")]
-        public EntityType ObjectType
-        {
-            get
-            {
-                return this._objectType;
-            }
-
-            set
-            {
-                this._objectType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object appearance
-        /// </summary>
-        [XmlElement(Type = typeof(SixByteChunk), ElementName = "objectAppearance")]
-        public SixByteChunk ObjectAppearance
-        {
-            get
-            {
-                return this._objectAppearance;
-            }
-
-            set
-            {
-                this._objectAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of points
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPoints method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPoints")]
-        public ushort NumberOfPoints
-        {
-            get
-            {
-                return this._numberOfPoints;
-            }
-
-            set
-            {
-                this._numberOfPoints = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the requesterID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
-        public SimulationAddress RequesterID
-        {
-            get
-            {
-                return this._requesterID;
-            }
-
-            set
-            {
-                this._requesterID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receiver ID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
-        public SimulationAddress ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the location of object
-        /// </summary>
-        [XmlElement(ElementName = "objectLocationList", Type = typeof(List<Vector3Double>))]
-        public List<Vector3Double> ObjectLocation
-        {
-            get
-            {
-                return this._objectLocation;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._objectID.Marshal(dos);
-                    this._referencedObjectID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._updateNumber);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._modifications);
-                    this._objectType.Marshal(dos);
-                    this._objectAppearance.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._objectLocation.Count);
-                    this._requesterID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-
-                    for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                    {
-                        Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
-                        aVector3Double.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._objectID.Unmarshal(dis);
-                    this._referencedObjectID.Unmarshal(dis);
-                    this._updateNumber = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._modifications = dis.ReadUnsignedByte();
-                    this._objectType.Unmarshal(dis);
-                    this._objectAppearance.Unmarshal(dis);
-                    this._numberOfPoints = dis.ReadUnsignedShort();
-                    this._requesterID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this.NumberOfPoints; idx++)
-                    {
-                        Vector3Double anX = new Vector3Double();
-                        anX.Unmarshal(dis);
-                        this._objectLocation.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ArealObjectStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<objectID>");
-                this._objectID.Reflection(sb);
-                sb.AppendLine("</objectID>");
-                sb.AppendLine("<referencedObjectID>");
-                this._referencedObjectID.Reflection(sb);
-                sb.AppendLine("</referencedObjectID>");
-                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
-                sb.AppendLine("<objectType>");
-                this._objectType.Reflection(sb);
-                sb.AppendLine("</objectType>");
-                sb.AppendLine("<objectAppearance>");
-                this._objectAppearance.Reflection(sb);
-                sb.AppendLine("</objectAppearance>");
-                sb.AppendLine("<objectLocation type=\"ushort\">" + this._objectLocation.Count.ToString(CultureInfo.InvariantCulture) + "</objectLocation>");
-                sb.AppendLine("<requesterID>");
-                this._requesterID.Reflection(sb);
-                sb.AppendLine("</requesterID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                {
-                    sb.AppendLine("<objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Double\">");
-                    Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
-                    aVector3Double.Reflection(sb);
-                    sb.AppendLine("</objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ArealObjectStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ArealObjectStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ArealObjectStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._objectID.Equals(obj._objectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._updateNumber != obj._updateNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modifications != obj._modifications)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectType.Equals(obj._objectType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectAppearance.Equals(obj._objectAppearance))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPoints != obj._numberOfPoints)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requesterID.Equals(obj._requesterID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._objectLocation.Count != obj._objectLocation.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                {
-                    if (!this._objectLocation[idx].Equals(obj._objectLocation[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._objectID.GetHashCode();
-            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
-            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._modifications.GetHashCode();
-            result = GenerateHash(result) ^ this._objectType.GetHashCode();
-            result = GenerateHash(result) ^ this._objectAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPoints.GetHashCode();
-            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-
-            if (this._objectLocation.Count > 0)
-            {
-                for (int idx = 0; idx < this._objectLocation.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._objectLocation[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.11.5: Information about the addition/modification of an oobject that is geometrically      achored to the terrain with a set of three or more points that come to a closure. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(SixByteChunk))]
+    [XmlInclude(typeof(SimulationAddress))]
+    [XmlInclude(typeof(Vector3Double))]
+    public partial class ArealObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<ArealObjectStatePdu>
+    {
+        /// <summary>
+        /// Object in synthetic environment
+        /// </summary>
+        private EntityID _objectID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _referencedObjectID = new EntityID();
+
+        /// <summary>
+        /// unique update number of each state transition of an object
+        /// </summary>
+        private ushort _updateNumber;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// modifications enumeration
+        /// </summary>
+        private byte _modifications;
+
+        /// <summary>
+        /// Object type
+        /// </summary>
+        private EntityType _objectType = new EntityType();
+
+        /// <summary>
+        /// Object appearance
+        /// </summary>
+        private SixByteChunk _objectAppearance = new SixByteChunk();
+
+        /// <summary>
+        /// Number of points
+        /// </summary>
+        private ushort _numberOfPoints;
+
+        /// <summary>
+        /// requesterID
+        /// </summary>
+        private SimulationAddress _requesterID = new SimulationAddress();
+
+        /// <summary>
+        /// receiver ID
+        /// </summary>
+        private SimulationAddress _receivingID = new SimulationAddress();
+
+        /// <summary>
+        /// location of object
+        /// </summary>
+        private List<Vector3Double> _objectLocation = new List<Vector3Double>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArealObjectStatePdu"/> class.
+        /// </summary>
+        public ArealObjectStatePdu()
+        {
+            PduType = (byte)45;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ArealObjectStatePdu left, ArealObjectStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ArealObjectStatePdu left, ArealObjectStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
+            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
+            marshalSize += 2;  // this._updateNumber
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._modifications
+            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
+            marshalSize += this._objectAppearance.GetMarshalledSize();  // this._objectAppearance
+            marshalSize += 2;  // this._numberOfPoints
+            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            for (int idx = 0; idx < this._objectLocation.Count; idx++)
+            {
+                Vector3Double listElement = (Vector3Double)this._objectLocation[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object in synthetic environment
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
+        public EntityID ObjectID
+        {
+            get
+            {
+                return this._objectID;
+            }
+
+            set
+            {
+                this._objectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
+        public EntityID ReferencedObjectID
+        {
+            get
+            {
+                return this._referencedObjectID;
+            }
+
+            set
+            {
+                this._referencedObjectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique update number of each state transition of an object
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
+        public ushort UpdateNumber
+        {
+            get
+            {
+                return this._updateNumber;
+            }
+
+            set
+            {
+                this._updateNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modifications enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
+        public byte Modifications
+        {
+            get
+            {
+                return this._modifications;
+            }
+
+            set
+            {
+                this._modifications = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object type
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "objectType")]
+        public EntityType ObjectType
+        {
+            get
+            {
+                return this._objectType;
+            }
+
+            set
+            {
+                this._objectType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object appearance
+        /// </summary>
+        [XmlElement(Type = typeof(SixByteChunk), ElementName = "objectAppearance")]
+        public SixByteChunk ObjectAppearance
+        {
+            get
+            {
+                return this._objectAppearance;
+            }
+
+            set
+            {
+                this._objectAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of points
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPoints method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPoints")]
+        public ushort NumberOfPoints
+        {
+            get
+            {
+                return this._numberOfPoints;
+            }
+
+            set
+            {
+                this._numberOfPoints = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the requesterID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
+        public SimulationAddress RequesterID
+        {
+            get
+            {
+                return this._requesterID;
+            }
+
+            set
+            {
+                this._requesterID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receiver ID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
+        public SimulationAddress ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the location of object
+        /// </summary>
+        [XmlElement(ElementName = "objectLocationList", Type = typeof(List<Vector3Double>))]
+        public List<Vector3Double> ObjectLocation
+        {
+            get
+            {
+                return this._objectLocation;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._objectID.Marshal(dos);
+                    this._referencedObjectID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._updateNumber);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._modifications);
+                    this._objectType.Marshal(dos);
+                    this._objectAppearance.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._objectLocation.Count);
+                    this._requesterID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+
+                    for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                    {
+                        Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
+                        aVector3Double.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._objectID.Unmarshal(dis);
+                    this._referencedObjectID.Unmarshal(dis);
+                    this._updateNumber = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._modifications = dis.ReadUnsignedByte();
+                    this._objectType.Unmarshal(dis);
+                    this._objectAppearance.Unmarshal(dis);
+                    this._numberOfPoints = dis.ReadUnsignedShort();
+                    this._requesterID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this.NumberOfPoints; idx++)
+                    {
+                        Vector3Double anX = new Vector3Double();
+                        anX.Unmarshal(dis);
+                        this._objectLocation.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ArealObjectStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<objectID>");
+                this._objectID.Reflection(sb);
+                sb.AppendLine("</objectID>");
+                sb.AppendLine("<referencedObjectID>");
+                this._referencedObjectID.Reflection(sb);
+                sb.AppendLine("</referencedObjectID>");
+                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
+                sb.AppendLine("<objectType>");
+                this._objectType.Reflection(sb);
+                sb.AppendLine("</objectType>");
+                sb.AppendLine("<objectAppearance>");
+                this._objectAppearance.Reflection(sb);
+                sb.AppendLine("</objectAppearance>");
+                sb.AppendLine("<objectLocation type=\"ushort\">" + this._objectLocation.Count.ToString(CultureInfo.InvariantCulture) + "</objectLocation>");
+                sb.AppendLine("<requesterID>");
+                this._requesterID.Reflection(sb);
+                sb.AppendLine("</requesterID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                {
+                    sb.AppendLine("<objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Double\">");
+                    Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
+                    aVector3Double.Reflection(sb);
+                    sb.AppendLine("</objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ArealObjectStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ArealObjectStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ArealObjectStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._objectID.Equals(obj._objectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._updateNumber != obj._updateNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modifications != obj._modifications)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectType.Equals(obj._objectType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectAppearance.Equals(obj._objectAppearance))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPoints != obj._numberOfPoints)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requesterID.Equals(obj._requesterID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._objectLocation.Count != obj._objectLocation.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                {
+                    if (!this._objectLocation[idx].Equals(obj._objectLocation[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._objectID.GetHashCode();
+            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
+            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._modifications.GetHashCode();
+            result = GenerateHash(result) ^ this._objectType.GetHashCode();
+            result = GenerateHash(result) ^ this._objectAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPoints.GetHashCode();
+            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+
+            if (this._objectLocation.Count > 0)
+            {
+                for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._objectLocation[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArticulationParameter.cs b/Libs/CsharpDis6/Dis1998/Generated/ArticulationParameter.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArticulationParameter.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ArticulationParameter.cs
index cd036ca..e40e079 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ArticulationParameter.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ArticulationParameter.cs
@@ -1,413 +1,413 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.5. Articulation parameters for movable parts and attached parts of an entity. Specifes wether or not a change has occured,  the part identifcation of the articulated part to which it is attached, and the type and value of each parameter.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ArticulationParameter
-    {
-        private byte _parameterTypeDesignator;
-
-        private byte _changeIndicator;
-
-        private ushort _partAttachedTo;
-
-        private int _parameterType;
-
-        private double _parameterValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArticulationParameter"/> class.
-        /// </summary>
-        public ArticulationParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ArticulationParameter left, ArticulationParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ArticulationParameter left, ArticulationParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._parameterTypeDesignator
-            marshalSize += 1;  // this._changeIndicator
-            marshalSize += 2;  // this._partAttachedTo
-            marshalSize += 4;  // this._parameterType
-            marshalSize += 8;  // this._parameterValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the parameterTypeDesignator
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "parameterTypeDesignator")]
-        public byte ParameterTypeDesignator
-        {
-            get
-            {
-                return this._parameterTypeDesignator;
-            }
-
-            set
-            {
-                this._parameterTypeDesignator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the changeIndicator
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
-        public byte ChangeIndicator
-        {
-            get
-            {
-                return this._changeIndicator;
-            }
-
-            set
-            {
-                this._changeIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the partAttachedTo
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
-        public ushort PartAttachedTo
-        {
-            get
-            {
-                return this._partAttachedTo;
-            }
-
-            set
-            {
-                this._partAttachedTo = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameterType
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "parameterType")]
-        public int ParameterType
-        {
-            get
-            {
-                return this._parameterType;
-            }
-
-            set
-            {
-                this._parameterType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameterValue
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "parameterValue")]
-        public double ParameterValue
-        {
-            get
-            {
-                return this._parameterValue;
-            }
-
-            set
-            {
-                this._parameterValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._parameterTypeDesignator);
-                    dos.WriteUnsignedByte((byte)this._changeIndicator);
-                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
-                    dos.WriteInt((int)this._parameterType);
-                    dos.WriteDouble((double)this._parameterValue);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._parameterTypeDesignator = dis.ReadUnsignedByte();
-                    this._changeIndicator = dis.ReadUnsignedByte();
-                    this._partAttachedTo = dis.ReadUnsignedShort();
-                    this._parameterType = dis.ReadInt();
-                    this._parameterValue = dis.ReadDouble();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ArticulationParameter>");
-            try
-            {
-                sb.AppendLine("<parameterTypeDesignator type=\"byte\">" + this._parameterTypeDesignator.ToString(CultureInfo.InvariantCulture) + "</parameterTypeDesignator>");
-                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
-                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
-                sb.AppendLine("<parameterType type=\"int\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
-                sb.AppendLine("<parameterValue type=\"double\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
-                sb.AppendLine("</ArticulationParameter>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ArticulationParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ArticulationParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._parameterTypeDesignator != obj._parameterTypeDesignator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._changeIndicator != obj._changeIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._partAttachedTo != obj._partAttachedTo)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterType != obj._parameterType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameterValue != obj._parameterValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._parameterTypeDesignator.GetHashCode();
-            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
-            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.5. Articulation parameters for movable parts and attached parts of an entity. Specifes wether or not a change has occured,  the part identifcation of the articulated part to which it is attached, and the type and value of each parameter.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ArticulationParameter
+    {
+        private byte _parameterTypeDesignator;
+
+        private byte _changeIndicator;
+
+        private ushort _partAttachedTo;
+
+        private int _parameterType;
+
+        private double _parameterValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArticulationParameter"/> class.
+        /// </summary>
+        public ArticulationParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ArticulationParameter left, ArticulationParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ArticulationParameter left, ArticulationParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._parameterTypeDesignator
+            marshalSize += 1;  // this._changeIndicator
+            marshalSize += 2;  // this._partAttachedTo
+            marshalSize += 4;  // this._parameterType
+            marshalSize += 8;  // this._parameterValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the parameterTypeDesignator
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "parameterTypeDesignator")]
+        public byte ParameterTypeDesignator
+        {
+            get
+            {
+                return this._parameterTypeDesignator;
+            }
+
+            set
+            {
+                this._parameterTypeDesignator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the changeIndicator
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
+        public byte ChangeIndicator
+        {
+            get
+            {
+                return this._changeIndicator;
+            }
+
+            set
+            {
+                this._changeIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the partAttachedTo
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
+        public ushort PartAttachedTo
+        {
+            get
+            {
+                return this._partAttachedTo;
+            }
+
+            set
+            {
+                this._partAttachedTo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameterType
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "parameterType")]
+        public int ParameterType
+        {
+            get
+            {
+                return this._parameterType;
+            }
+
+            set
+            {
+                this._parameterType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameterValue
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "parameterValue")]
+        public double ParameterValue
+        {
+            get
+            {
+                return this._parameterValue;
+            }
+
+            set
+            {
+                this._parameterValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._parameterTypeDesignator);
+                    dos.WriteUnsignedByte((byte)this._changeIndicator);
+                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
+                    dos.WriteInt((int)this._parameterType);
+                    dos.WriteDouble((double)this._parameterValue);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._parameterTypeDesignator = dis.ReadUnsignedByte();
+                    this._changeIndicator = dis.ReadUnsignedByte();
+                    this._partAttachedTo = dis.ReadUnsignedShort();
+                    this._parameterType = dis.ReadInt();
+                    this._parameterValue = dis.ReadDouble();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ArticulationParameter>");
+            try
+            {
+                sb.AppendLine("<parameterTypeDesignator type=\"byte\">" + this._parameterTypeDesignator.ToString(CultureInfo.InvariantCulture) + "</parameterTypeDesignator>");
+                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
+                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
+                sb.AppendLine("<parameterType type=\"int\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
+                sb.AppendLine("<parameterValue type=\"double\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
+                sb.AppendLine("</ArticulationParameter>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ArticulationParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ArticulationParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._parameterTypeDesignator != obj._parameterTypeDesignator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._changeIndicator != obj._changeIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._partAttachedTo != obj._partAttachedTo)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterType != obj._parameterType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterValue != obj._parameterValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._parameterTypeDesignator.GetHashCode();
+            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs b/Libs/CsharpDis6/Dis1998/Generated/BeamAntennaPattern.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs
rename to Libs/CsharpDis6/Dis1998/Generated/BeamAntennaPattern.cs
index f7048cd..53935f1 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamAntennaPattern.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/BeamAntennaPattern.cs
@@ -1,515 +1,515 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. Specifies           the direction, patter, and polarization of radiation from an antenna.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Orientation))]
-    public partial class BeamAntennaPattern
-    {
-        /// <summary>
-        /// The rotation that transformst he reference coordinate sytem    into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
-        /// </summary>
-        private Orientation _beamDirection = new Orientation();
-
-        private float _azimuthBeamwidth;
-
-        private float _referenceSystem;
-
-        private short _padding1;
-
-        private byte _padding2;
-
-        /// <summary>
-        /// Magnigute of the z-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        private float _ez;
-
-        /// <summary>
-        /// Magnigute of the x-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        private float _ex;
-
-        /// <summary>
-        /// THe phase angle between Ez and Ex in radians.
-        /// </summary>
-        private float _phase;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BeamAntennaPattern"/> class.
-        /// </summary>
-        public BeamAntennaPattern()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BeamAntennaPattern left, BeamAntennaPattern right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BeamAntennaPattern left, BeamAntennaPattern right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._beamDirection.GetMarshalledSize();  // this._beamDirection
-            marshalSize += 4;  // this._azimuthBeamwidth
-            marshalSize += 4;  // this._referenceSystem
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            marshalSize += 4;  // this._ez
-            marshalSize += 4;  // this._ex
-            marshalSize += 4;  // this._phase
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The rotation that transformst he reference coordinate sytem    into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "beamDirection")]
-        public Orientation BeamDirection
-        {
-            get
-            {
-                return this._beamDirection;
-            }
-
-            set
-            {
-                this._beamDirection = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the azimuthBeamwidth
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "azimuthBeamwidth")]
-        public float AzimuthBeamwidth
-        {
-            get
-            {
-                return this._azimuthBeamwidth;
-            }
-
-            set
-            {
-                this._azimuthBeamwidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the referenceSystem
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "referenceSystem")]
-        public float ReferenceSystem
-        {
-            get
-            {
-                return this._referenceSystem;
-            }
-
-            set
-            {
-                this._referenceSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding1
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding2
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Magnigute of the z-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "ez")]
-        public float Ez
-        {
-            get
-            {
-                return this._ez;
-            }
-
-            set
-            {
-                this._ez = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Magnigute of the x-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "ex")]
-        public float Ex
-        {
-            get
-            {
-                return this._ex;
-            }
-
-            set
-            {
-                this._ex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the THe phase angle between Ez and Ex in radians.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "phase")]
-        public float Phase
-        {
-            get
-            {
-                return this._phase;
-            }
-
-            set
-            {
-                this._phase = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._beamDirection.Marshal(dos);
-                    dos.WriteFloat((float)this._azimuthBeamwidth);
-                    dos.WriteFloat((float)this._referenceSystem);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                    dos.WriteFloat((float)this._ez);
-                    dos.WriteFloat((float)this._ex);
-                    dos.WriteFloat((float)this._phase);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamDirection.Unmarshal(dis);
-                    this._azimuthBeamwidth = dis.ReadFloat();
-                    this._referenceSystem = dis.ReadFloat();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-                    this._ez = dis.ReadFloat();
-                    this._ex = dis.ReadFloat();
-                    this._phase = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BeamAntennaPattern>");
-            try
-            {
-                sb.AppendLine("<beamDirection>");
-                this._beamDirection.Reflection(sb);
-                sb.AppendLine("</beamDirection>");
-                sb.AppendLine("<azimuthBeamwidth type=\"float\">" + this._azimuthBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthBeamwidth>");
-                sb.AppendLine("<referenceSystem type=\"float\">" + this._referenceSystem.ToString(CultureInfo.InvariantCulture) + "</referenceSystem>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<ez type=\"float\">" + this._ez.ToString(CultureInfo.InvariantCulture) + "</ez>");
-                sb.AppendLine("<ex type=\"float\">" + this._ex.ToString(CultureInfo.InvariantCulture) + "</ex>");
-                sb.AppendLine("<phase type=\"float\">" + this._phase.ToString(CultureInfo.InvariantCulture) + "</phase>");
-                sb.AppendLine("</BeamAntennaPattern>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BeamAntennaPattern;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BeamAntennaPattern obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._beamDirection.Equals(obj._beamDirection))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._azimuthBeamwidth != obj._azimuthBeamwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._referenceSystem != obj._referenceSystem)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ez != obj._ez)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._ex != obj._ex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phase != obj._phase)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamDirection.GetHashCode();
-            result = GenerateHash(result) ^ this._azimuthBeamwidth.GetHashCode();
-            result = GenerateHash(result) ^ this._referenceSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._ez.GetHashCode();
-            result = GenerateHash(result) ^ this._ex.GetHashCode();
-            result = GenerateHash(result) ^ this._phase.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.4.2. Used when the antenna pattern type field has a value of 1. Specifies           the direction, patter, and polarization of radiation from an antenna.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Orientation))]
+    public partial class BeamAntennaPattern
+    {
+        /// <summary>
+        /// The rotation that transformst he reference coordinate sytem    into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
+        /// </summary>
+        private Orientation _beamDirection = new Orientation();
+
+        private float _azimuthBeamwidth;
+
+        private float _referenceSystem;
+
+        private short _padding1;
+
+        private byte _padding2;
+
+        /// <summary>
+        /// Magnigute of the z-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        private float _ez;
+
+        /// <summary>
+        /// Magnigute of the x-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        private float _ex;
+
+        /// <summary>
+        /// THe phase angle between Ez and Ex in radians.
+        /// </summary>
+        private float _phase;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BeamAntennaPattern"/> class.
+        /// </summary>
+        public BeamAntennaPattern()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BeamAntennaPattern left, BeamAntennaPattern right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BeamAntennaPattern left, BeamAntennaPattern right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._beamDirection.GetMarshalledSize();  // this._beamDirection
+            marshalSize += 4;  // this._azimuthBeamwidth
+            marshalSize += 4;  // this._referenceSystem
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            marshalSize += 4;  // this._ez
+            marshalSize += 4;  // this._ex
+            marshalSize += 4;  // this._phase
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The rotation that transformst he reference coordinate sytem    into the beam coordinate system. Either world coordinates or entity coordinates may be used as the     reference coordinate system, as specified by teh reference system field of the antenna pattern record.
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "beamDirection")]
+        public Orientation BeamDirection
+        {
+            get
+            {
+                return this._beamDirection;
+            }
+
+            set
+            {
+                this._beamDirection = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the azimuthBeamwidth
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "azimuthBeamwidth")]
+        public float AzimuthBeamwidth
+        {
+            get
+            {
+                return this._azimuthBeamwidth;
+            }
+
+            set
+            {
+                this._azimuthBeamwidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the referenceSystem
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "referenceSystem")]
+        public float ReferenceSystem
+        {
+            get
+            {
+                return this._referenceSystem;
+            }
+
+            set
+            {
+                this._referenceSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding1
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding2
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Magnigute of the z-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "ez")]
+        public float Ez
+        {
+            get
+            {
+                return this._ez;
+            }
+
+            set
+            {
+                this._ez = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Magnigute of the x-component in beam coordinates at some arbitrary     single point in the mainbeam      and in the far field of the antenna.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "ex")]
+        public float Ex
+        {
+            get
+            {
+                return this._ex;
+            }
+
+            set
+            {
+                this._ex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the THe phase angle between Ez and Ex in radians.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "phase")]
+        public float Phase
+        {
+            get
+            {
+                return this._phase;
+            }
+
+            set
+            {
+                this._phase = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._beamDirection.Marshal(dos);
+                    dos.WriteFloat((float)this._azimuthBeamwidth);
+                    dos.WriteFloat((float)this._referenceSystem);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                    dos.WriteFloat((float)this._ez);
+                    dos.WriteFloat((float)this._ex);
+                    dos.WriteFloat((float)this._phase);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamDirection.Unmarshal(dis);
+                    this._azimuthBeamwidth = dis.ReadFloat();
+                    this._referenceSystem = dis.ReadFloat();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+                    this._ez = dis.ReadFloat();
+                    this._ex = dis.ReadFloat();
+                    this._phase = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BeamAntennaPattern>");
+            try
+            {
+                sb.AppendLine("<beamDirection>");
+                this._beamDirection.Reflection(sb);
+                sb.AppendLine("</beamDirection>");
+                sb.AppendLine("<azimuthBeamwidth type=\"float\">" + this._azimuthBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthBeamwidth>");
+                sb.AppendLine("<referenceSystem type=\"float\">" + this._referenceSystem.ToString(CultureInfo.InvariantCulture) + "</referenceSystem>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<ez type=\"float\">" + this._ez.ToString(CultureInfo.InvariantCulture) + "</ez>");
+                sb.AppendLine("<ex type=\"float\">" + this._ex.ToString(CultureInfo.InvariantCulture) + "</ex>");
+                sb.AppendLine("<phase type=\"float\">" + this._phase.ToString(CultureInfo.InvariantCulture) + "</phase>");
+                sb.AppendLine("</BeamAntennaPattern>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BeamAntennaPattern;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BeamAntennaPattern obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._beamDirection.Equals(obj._beamDirection))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthBeamwidth != obj._azimuthBeamwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._referenceSystem != obj._referenceSystem)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ez != obj._ez)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ex != obj._ex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phase != obj._phase)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamDirection.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthBeamwidth.GetHashCode();
+            result = GenerateHash(result) ^ this._referenceSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._ez.GetHashCode();
+            result = GenerateHash(result) ^ this._ex.GetHashCode();
+            result = GenerateHash(result) ^ this._phase.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamData.cs b/Libs/CsharpDis6/Dis1998/Generated/BeamData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/BeamData.cs
index ecea170..715c79e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BeamData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/BeamData.cs
@@ -1,428 +1,428 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.39. Specification of the data necessary to describe the scan volume of an emitter.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class BeamData
-    {
-        /// <summary>
-        /// Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
-        /// </summary>
-        private float _beamAzimuthCenter;
-
-        /// <summary>
-        /// Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        private float _beamAzimuthSweep;
-
-        /// <summary>
-        /// Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        private float _beamElevationCenter;
-
-        /// <summary>
-        /// Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        private float _beamElevationSweep;
-
-        /// <summary>
-        /// allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        private float _beamSweepSync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BeamData"/> class.
-        /// </summary>
-        public BeamData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BeamData left, BeamData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BeamData left, BeamData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._beamAzimuthCenter
-            marshalSize += 4;  // this._beamAzimuthSweep
-            marshalSize += 4;  // this._beamElevationCenter
-            marshalSize += 4;  // this._beamElevationSweep
-            marshalSize += 4;  // this._beamSweepSync
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
-        public float BeamAzimuthCenter
-        {
-            get
-            {
-                return this._beamAzimuthCenter;
-            }
-
-            set
-            {
-                this._beamAzimuthCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
-        public float BeamAzimuthSweep
-        {
-            get
-            {
-                return this._beamAzimuthSweep;
-            }
-
-            set
-            {
-                this._beamAzimuthSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
-        public float BeamElevationCenter
-        {
-            get
-            {
-                return this._beamElevationCenter;
-            }
-
-            set
-            {
-                this._beamElevationCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
-        public float BeamElevationSweep
-        {
-            get
-            {
-                return this._beamElevationSweep;
-            }
-
-            set
-            {
-                this._beamElevationSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
-        public float BeamSweepSync
-        {
-            get
-            {
-                return this._beamSweepSync;
-            }
-
-            set
-            {
-                this._beamSweepSync = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._beamAzimuthCenter);
-                    dos.WriteFloat((float)this._beamAzimuthSweep);
-                    dos.WriteFloat((float)this._beamElevationCenter);
-                    dos.WriteFloat((float)this._beamElevationSweep);
-                    dos.WriteFloat((float)this._beamSweepSync);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamAzimuthCenter = dis.ReadFloat();
-                    this._beamAzimuthSweep = dis.ReadFloat();
-                    this._beamElevationCenter = dis.ReadFloat();
-                    this._beamElevationSweep = dis.ReadFloat();
-                    this._beamSweepSync = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BeamData>");
-            try
-            {
-                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
-                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
-                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
-                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
-                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
-                sb.AppendLine("</BeamData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BeamData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BeamData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationCenter != obj._beamElevationCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationSweep != obj._beamElevationSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamSweepSync != obj._beamSweepSync)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.39. Specification of the data necessary to describe the scan volume of an emitter.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class BeamData
+    {
+        /// <summary>
+        /// Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
+        /// </summary>
+        private float _beamAzimuthCenter;
+
+        /// <summary>
+        /// Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        private float _beamAzimuthSweep;
+
+        /// <summary>
+        /// Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        private float _beamElevationCenter;
+
+        /// <summary>
+        /// Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        private float _beamElevationSweep;
+
+        /// <summary>
+        /// allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        private float _beamSweepSync;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BeamData"/> class.
+        /// </summary>
+        public BeamData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BeamData left, BeamData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BeamData left, BeamData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._beamAzimuthCenter
+            marshalSize += 4;  // this._beamAzimuthSweep
+            marshalSize += 4;  // this._beamElevationCenter
+            marshalSize += 4;  // this._beamElevationSweep
+            marshalSize += 4;  // this._beamSweepSync
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
+        public float BeamAzimuthCenter
+        {
+            get
+            {
+                return this._beamAzimuthCenter;
+            }
+
+            set
+            {
+                this._beamAzimuthCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
+        public float BeamAzimuthSweep
+        {
+            get
+            {
+                return this._beamAzimuthSweep;
+            }
+
+            set
+            {
+                this._beamAzimuthSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
+        public float BeamElevationCenter
+        {
+            get
+            {
+                return this._beamElevationCenter;
+            }
+
+            set
+            {
+                this._beamElevationCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
+        public float BeamElevationSweep
+        {
+            get
+            {
+                return this._beamElevationSweep;
+            }
+
+            set
+            {
+                this._beamElevationSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
+        public float BeamSweepSync
+        {
+            get
+            {
+                return this._beamSweepSync;
+            }
+
+            set
+            {
+                this._beamSweepSync = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._beamAzimuthCenter);
+                    dos.WriteFloat((float)this._beamAzimuthSweep);
+                    dos.WriteFloat((float)this._beamElevationCenter);
+                    dos.WriteFloat((float)this._beamElevationSweep);
+                    dos.WriteFloat((float)this._beamSweepSync);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamAzimuthCenter = dis.ReadFloat();
+                    this._beamAzimuthSweep = dis.ReadFloat();
+                    this._beamElevationCenter = dis.ReadFloat();
+                    this._beamElevationSweep = dis.ReadFloat();
+                    this._beamSweepSync = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BeamData>");
+            try
+            {
+                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
+                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
+                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
+                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
+                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
+                sb.AppendLine("</BeamData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BeamData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BeamData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationCenter != obj._beamElevationCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationSweep != obj._beamElevationSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamSweepSync != obj._beamSweepSync)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BurstDescriptor.cs b/Libs/CsharpDis6/Dis1998/Generated/BurstDescriptor.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/BurstDescriptor.cs
rename to Libs/CsharpDis6/Dis1998/Generated/BurstDescriptor.cs
index 754dac1..1a7f02f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/BurstDescriptor.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/BurstDescriptor.cs
@@ -1,431 +1,431 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.7. Specifies the type of muntion fired, the type of warhead, the         type of fuse, the number of rounds fired, and the rate at which the roudns are fired in         rounds per minute.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class BurstDescriptor
-    {
-        /// <summary>
-        /// What munition was used in the burst
-        /// </summary>
-        private EntityType _munition = new EntityType();
-
-        /// <summary>
-        /// type of warhead
-        /// </summary>
-        private ushort _warhead;
-
-        /// <summary>
-        /// type of fuse used
-        /// </summary>
-        private ushort _fuse;
-
-        /// <summary>
-        /// how many of the munition were fired
-        /// </summary>
-        private ushort _quantity;
-
-        /// <summary>
-        /// rate at which the munition was fired
-        /// </summary>
-        private ushort _rate;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BurstDescriptor"/> class.
-        /// </summary>
-        public BurstDescriptor()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(BurstDescriptor left, BurstDescriptor right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(BurstDescriptor left, BurstDescriptor right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._munition.GetMarshalledSize();  // this._munition
-            marshalSize += 2;  // this._warhead
-            marshalSize += 2;  // this._fuse
-            marshalSize += 2;  // this._quantity
-            marshalSize += 2;  // this._rate
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the What munition was used in the burst
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "munition")]
-        public EntityType Munition
-        {
-            get
-            {
-                return this._munition;
-            }
-
-            set
-            {
-                this._munition = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of warhead
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "warhead")]
-        public ushort Warhead
-        {
-            get
-            {
-                return this._warhead;
-            }
-
-            set
-            {
-                this._warhead = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of fuse used
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "fuse")]
-        public ushort Fuse
-        {
-            get
-            {
-                return this._fuse;
-            }
-
-            set
-            {
-                this._fuse = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many of the munition were fired
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
-        public ushort Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the rate at which the munition was fired
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "rate")]
-        public ushort Rate
-        {
-            get
-            {
-                return this._rate;
-            }
-
-            set
-            {
-                this._rate = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._munition.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._warhead);
-                    dos.WriteUnsignedShort((ushort)this._fuse);
-                    dos.WriteUnsignedShort((ushort)this._quantity);
-                    dos.WriteUnsignedShort((ushort)this._rate);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._munition.Unmarshal(dis);
-                    this._warhead = dis.ReadUnsignedShort();
-                    this._fuse = dis.ReadUnsignedShort();
-                    this._quantity = dis.ReadUnsignedShort();
-                    this._rate = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<BurstDescriptor>");
-            try
-            {
-                sb.AppendLine("<munition>");
-                this._munition.Reflection(sb);
-                sb.AppendLine("</munition>");
-                sb.AppendLine("<warhead type=\"ushort\">" + this._warhead.ToString(CultureInfo.InvariantCulture) + "</warhead>");
-                sb.AppendLine("<fuse type=\"ushort\">" + this._fuse.ToString(CultureInfo.InvariantCulture) + "</fuse>");
-                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("<rate type=\"ushort\">" + this._rate.ToString(CultureInfo.InvariantCulture) + "</rate>");
-                sb.AppendLine("</BurstDescriptor>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as BurstDescriptor;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(BurstDescriptor obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._munition.Equals(obj._munition))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._warhead != obj._warhead)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fuse != obj._fuse)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._rate != obj._rate)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._munition.GetHashCode();
-            result = GenerateHash(result) ^ this._warhead.GetHashCode();
-            result = GenerateHash(result) ^ this._fuse.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-            result = GenerateHash(result) ^ this._rate.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.7. Specifies the type of muntion fired, the type of warhead, the         type of fuse, the number of rounds fired, and the rate at which the roudns are fired in         rounds per minute.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class BurstDescriptor
+    {
+        /// <summary>
+        /// What munition was used in the burst
+        /// </summary>
+        private EntityType _munition = new EntityType();
+
+        /// <summary>
+        /// type of warhead
+        /// </summary>
+        private ushort _warhead;
+
+        /// <summary>
+        /// type of fuse used
+        /// </summary>
+        private ushort _fuse;
+
+        /// <summary>
+        /// how many of the munition were fired
+        /// </summary>
+        private ushort _quantity;
+
+        /// <summary>
+        /// rate at which the munition was fired
+        /// </summary>
+        private ushort _rate;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BurstDescriptor"/> class.
+        /// </summary>
+        public BurstDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BurstDescriptor left, BurstDescriptor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BurstDescriptor left, BurstDescriptor right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._munition.GetMarshalledSize();  // this._munition
+            marshalSize += 2;  // this._warhead
+            marshalSize += 2;  // this._fuse
+            marshalSize += 2;  // this._quantity
+            marshalSize += 2;  // this._rate
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the What munition was used in the burst
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "munition")]
+        public EntityType Munition
+        {
+            get
+            {
+                return this._munition;
+            }
+
+            set
+            {
+                this._munition = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of warhead
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "warhead")]
+        public ushort Warhead
+        {
+            get
+            {
+                return this._warhead;
+            }
+
+            set
+            {
+                this._warhead = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of fuse used
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "fuse")]
+        public ushort Fuse
+        {
+            get
+            {
+                return this._fuse;
+            }
+
+            set
+            {
+                this._fuse = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many of the munition were fired
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
+        public ushort Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rate at which the munition was fired
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "rate")]
+        public ushort Rate
+        {
+            get
+            {
+                return this._rate;
+            }
+
+            set
+            {
+                this._rate = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._munition.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._warhead);
+                    dos.WriteUnsignedShort((ushort)this._fuse);
+                    dos.WriteUnsignedShort((ushort)this._quantity);
+                    dos.WriteUnsignedShort((ushort)this._rate);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._munition.Unmarshal(dis);
+                    this._warhead = dis.ReadUnsignedShort();
+                    this._fuse = dis.ReadUnsignedShort();
+                    this._quantity = dis.ReadUnsignedShort();
+                    this._rate = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BurstDescriptor>");
+            try
+            {
+                sb.AppendLine("<munition>");
+                this._munition.Reflection(sb);
+                sb.AppendLine("</munition>");
+                sb.AppendLine("<warhead type=\"ushort\">" + this._warhead.ToString(CultureInfo.InvariantCulture) + "</warhead>");
+                sb.AppendLine("<fuse type=\"ushort\">" + this._fuse.ToString(CultureInfo.InvariantCulture) + "</fuse>");
+                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("<rate type=\"ushort\">" + this._rate.ToString(CultureInfo.InvariantCulture) + "</rate>");
+                sb.AppendLine("</BurstDescriptor>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BurstDescriptor;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BurstDescriptor obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._munition.Equals(obj._munition))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._warhead != obj._warhead)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuse != obj._fuse)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._rate != obj._rate)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._munition.GetHashCode();
+            result = GenerateHash(result) ^ this._warhead.GetHashCode();
+            result = GenerateHash(result) ^ this._fuse.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+            result = GenerateHash(result) ^ this._rate.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ClockTime.cs b/Libs/CsharpDis6/Dis1998/Generated/ClockTime.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ClockTime.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ClockTime.cs
index 0824678..27814d2 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ClockTime.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ClockTime.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.8. Time measurements that exceed one hour. Hours is the number of           hours since January 1, 1970, UTC
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ClockTime
-    {
-        /// <summary>
-        /// Hours in UTC
-        /// </summary>
-        private int _hour;
-
-        /// <summary>
-        /// Time past the hour
-        /// </summary>
-        private uint _timePastHour;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ClockTime"/> class.
-        /// </summary>
-        public ClockTime()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ClockTime left, ClockTime right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ClockTime left, ClockTime right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._hour
-            marshalSize += 4;  // this._timePastHour
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Hours in UTC
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "hour")]
-        public int Hour
-        {
-            get
-            {
-                return this._hour;
-            }
-
-            set
-            {
-                this._hour = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Time past the hour
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timePastHour")]
-        public uint TimePastHour
-        {
-            get
-            {
-                return this._timePastHour;
-            }
-
-            set
-            {
-                this._timePastHour = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteInt((int)this._hour);
-                    dos.WriteUnsignedInt((uint)this._timePastHour);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._hour = dis.ReadInt();
-                    this._timePastHour = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ClockTime>");
-            try
-            {
-                sb.AppendLine("<hour type=\"int\">" + this._hour.ToString(CultureInfo.InvariantCulture) + "</hour>");
-                sb.AppendLine("<timePastHour type=\"uint\">" + this._timePastHour.ToString(CultureInfo.InvariantCulture) + "</timePastHour>");
-                sb.AppendLine("</ClockTime>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ClockTime;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ClockTime obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._hour != obj._hour)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timePastHour != obj._timePastHour)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._hour.GetHashCode();
-            result = GenerateHash(result) ^ this._timePastHour.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.8. Time measurements that exceed one hour. Hours is the number of           hours since January 1, 1970, UTC
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ClockTime
+    {
+        /// <summary>
+        /// Hours in UTC
+        /// </summary>
+        private int _hour;
+
+        /// <summary>
+        /// Time past the hour
+        /// </summary>
+        private uint _timePastHour;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClockTime"/> class.
+        /// </summary>
+        public ClockTime()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ClockTime left, ClockTime right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ClockTime left, ClockTime right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._hour
+            marshalSize += 4;  // this._timePastHour
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Hours in UTC
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "hour")]
+        public int Hour
+        {
+            get
+            {
+                return this._hour;
+            }
+
+            set
+            {
+                this._hour = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Time past the hour
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timePastHour")]
+        public uint TimePastHour
+        {
+            get
+            {
+                return this._timePastHour;
+            }
+
+            set
+            {
+                this._timePastHour = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteInt((int)this._hour);
+                    dos.WriteUnsignedInt((uint)this._timePastHour);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._hour = dis.ReadInt();
+                    this._timePastHour = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ClockTime>");
+            try
+            {
+                sb.AppendLine("<hour type=\"int\">" + this._hour.ToString(CultureInfo.InvariantCulture) + "</hour>");
+                sb.AppendLine("<timePastHour type=\"uint\">" + this._timePastHour.ToString(CultureInfo.InvariantCulture) + "</timePastHour>");
+                sb.AppendLine("</ClockTime>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ClockTime;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ClockTime obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._hour != obj._hour)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timePastHour != obj._timePastHour)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._hour.GetHashCode();
+            result = GenerateHash(result) ^ this._timePastHour.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/CollisionElasticPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/CollisionElasticPdu.cs
index f6e15a8..f770a85 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionElasticPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/CollisionElasticPdu.cs
@@ -1,768 +1,768 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.3.3.3. Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class CollisionElasticPdu : EntityInformationFamilyPdu, IEquatable<CollisionElasticPdu>
-    {
-        /// <summary>
-        /// ID of the entity that issued the collision PDU
-        /// </summary>
-        private EntityID _issuingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of entity that has collided with the issuing entity ID
-        /// </summary>
-        private EntityID _collidingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _collisionEventID = new EventID();
-
-        /// <summary>
-        /// some padding
-        /// </summary>
-        private short _pad;
-
-        /// <summary>
-        /// velocity at collision
-        /// </summary>
-        private Vector3Float _contactVelocity = new Vector3Float();
-
-        /// <summary>
-        /// mass of issuing entity
-        /// </summary>
-        private float _mass;
-
-        /// <summary>
-        /// Location with respect to entity the issuing entity collided with
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionResultXX;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionResultXY;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionResultXZ;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionResultYY;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionResultYZ;
-
-        /// <summary>
-        /// tensor values
-        /// </summary>
-        private float _collisionResultZZ;
-
-        /// <summary>
-        /// This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates.
-        /// </summary>
-        private Vector3Float _unitSurfaceNormal = new Vector3Float();
-
-        /// <summary>
-        /// This field shall represent the degree to which energy is conserved in a collision
-        /// </summary>
-        private float _coefficientOfRestitution;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollisionElasticPdu"/> class.
-        /// </summary>
-        public CollisionElasticPdu()
-        {
-            PduType = (byte)66;
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CollisionElasticPdu left, CollisionElasticPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CollisionElasticPdu left, CollisionElasticPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
-            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
-            marshalSize += this._collisionEventID.GetMarshalledSize();  // this._collisionEventID
-            marshalSize += 2;  // this._pad
-            marshalSize += this._contactVelocity.GetMarshalledSize();  // this._contactVelocity
-            marshalSize += 4;  // this._mass
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            marshalSize += 4;  // this._collisionResultXX
-            marshalSize += 4;  // this._collisionResultXY
-            marshalSize += 4;  // this._collisionResultXZ
-            marshalSize += 4;  // this._collisionResultYY
-            marshalSize += 4;  // this._collisionResultYZ
-            marshalSize += 4;  // this._collisionResultZZ
-            marshalSize += this._unitSurfaceNormal.GetMarshalledSize();  // this._unitSurfaceNormal
-            marshalSize += 4;  // this._coefficientOfRestitution
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that issued the collision PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
-        public EntityID IssuingEntityID
-        {
-            get
-            {
-                return this._issuingEntityID;
-            }
-
-            set
-            {
-                this._issuingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity that has collided with the issuing entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
-        public EntityID CollidingEntityID
-        {
-            get
-            {
-                return this._collidingEntityID;
-            }
-
-            set
-            {
-                this._collidingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "collisionEventID")]
-        public EventID CollisionEventID
-        {
-            get
-            {
-                return this._collisionEventID;
-            }
-
-            set
-            {
-                this._collisionEventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the some padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "pad")]
-        public short Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity at collision
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "contactVelocity")]
-        public Vector3Float ContactVelocity
-        {
-            get
-            {
-                return this._contactVelocity;
-            }
-
-            set
-            {
-                this._contactVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the mass of issuing entity
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "mass")]
-        public float Mass
-        {
-            get
-            {
-                return this._mass;
-            }
-
-            set
-            {
-                this._mass = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location with respect to entity the issuing entity collided with
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionResultXX")]
-        public float CollisionResultXX
-        {
-            get
-            {
-                return this._collisionResultXX;
-            }
-
-            set
-            {
-                this._collisionResultXX = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionResultXY")]
-        public float CollisionResultXY
-        {
-            get
-            {
-                return this._collisionResultXY;
-            }
-
-            set
-            {
-                this._collisionResultXY = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionResultXZ")]
-        public float CollisionResultXZ
-        {
-            get
-            {
-                return this._collisionResultXZ;
-            }
-
-            set
-            {
-                this._collisionResultXZ = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionResultYY")]
-        public float CollisionResultYY
-        {
-            get
-            {
-                return this._collisionResultYY;
-            }
-
-            set
-            {
-                this._collisionResultYY = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionResultYZ")]
-        public float CollisionResultYZ
-        {
-            get
-            {
-                return this._collisionResultYZ;
-            }
-
-            set
-            {
-                this._collisionResultYZ = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tensor values
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "collisionResultZZ")]
-        public float CollisionResultZZ
-        {
-            get
-            {
-                return this._collisionResultZZ;
-            }
-
-            set
-            {
-                this._collisionResultZZ = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates.
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "unitSurfaceNormal")]
-        public Vector3Float UnitSurfaceNormal
-        {
-            get
-            {
-                return this._unitSurfaceNormal;
-            }
-
-            set
-            {
-                this._unitSurfaceNormal = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall represent the degree to which energy is conserved in a collision
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "coefficientOfRestitution")]
-        public float CoefficientOfRestitution
-        {
-            get
-            {
-                return this._coefficientOfRestitution;
-            }
-
-            set
-            {
-                this._coefficientOfRestitution = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Marshal(dos);
-                    this._collidingEntityID.Marshal(dos);
-                    this._collisionEventID.Marshal(dos);
-                    dos.WriteShort((short)this._pad);
-                    this._contactVelocity.Marshal(dos);
-                    dos.WriteFloat((float)this._mass);
-                    this._location.Marshal(dos);
-                    dos.WriteFloat((float)this._collisionResultXX);
-                    dos.WriteFloat((float)this._collisionResultXY);
-                    dos.WriteFloat((float)this._collisionResultXZ);
-                    dos.WriteFloat((float)this._collisionResultYY);
-                    dos.WriteFloat((float)this._collisionResultYZ);
-                    dos.WriteFloat((float)this._collisionResultZZ);
-                    this._unitSurfaceNormal.Marshal(dos);
-                    dos.WriteFloat((float)this._coefficientOfRestitution);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Unmarshal(dis);
-                    this._collidingEntityID.Unmarshal(dis);
-                    this._collisionEventID.Unmarshal(dis);
-                    this._pad = dis.ReadShort();
-                    this._contactVelocity.Unmarshal(dis);
-                    this._mass = dis.ReadFloat();
-                    this._location.Unmarshal(dis);
-                    this._collisionResultXX = dis.ReadFloat();
-                    this._collisionResultXY = dis.ReadFloat();
-                    this._collisionResultXZ = dis.ReadFloat();
-                    this._collisionResultYY = dis.ReadFloat();
-                    this._collisionResultYZ = dis.ReadFloat();
-                    this._collisionResultZZ = dis.ReadFloat();
-                    this._unitSurfaceNormal.Unmarshal(dis);
-                    this._coefficientOfRestitution = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CollisionElasticPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<issuingEntityID>");
-                this._issuingEntityID.Reflection(sb);
-                sb.AppendLine("</issuingEntityID>");
-                sb.AppendLine("<collidingEntityID>");
-                this._collidingEntityID.Reflection(sb);
-                sb.AppendLine("</collidingEntityID>");
-                sb.AppendLine("<collisionEventID>");
-                this._collisionEventID.Reflection(sb);
-                sb.AppendLine("</collisionEventID>");
-                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                sb.AppendLine("<contactVelocity>");
-                this._contactVelocity.Reflection(sb);
-                sb.AppendLine("</contactVelocity>");
-                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                sb.AppendLine("<collisionResultXX type=\"float\">" + this._collisionResultXX.ToString(CultureInfo.InvariantCulture) + "</collisionResultXX>");
-                sb.AppendLine("<collisionResultXY type=\"float\">" + this._collisionResultXY.ToString(CultureInfo.InvariantCulture) + "</collisionResultXY>");
-                sb.AppendLine("<collisionResultXZ type=\"float\">" + this._collisionResultXZ.ToString(CultureInfo.InvariantCulture) + "</collisionResultXZ>");
-                sb.AppendLine("<collisionResultYY type=\"float\">" + this._collisionResultYY.ToString(CultureInfo.InvariantCulture) + "</collisionResultYY>");
-                sb.AppendLine("<collisionResultYZ type=\"float\">" + this._collisionResultYZ.ToString(CultureInfo.InvariantCulture) + "</collisionResultYZ>");
-                sb.AppendLine("<collisionResultZZ type=\"float\">" + this._collisionResultZZ.ToString(CultureInfo.InvariantCulture) + "</collisionResultZZ>");
-                sb.AppendLine("<unitSurfaceNormal>");
-                this._unitSurfaceNormal.Reflection(sb);
-                sb.AppendLine("</unitSurfaceNormal>");
-                sb.AppendLine("<coefficientOfRestitution type=\"float\">" + this._coefficientOfRestitution.ToString(CultureInfo.InvariantCulture) + "</coefficientOfRestitution>");
-                sb.AppendLine("</CollisionElasticPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CollisionElasticPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CollisionElasticPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._collisionEventID.Equals(obj._collisionEventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._contactVelocity.Equals(obj._contactVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._mass != obj._mass)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionResultXX != obj._collisionResultXX)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionResultXY != obj._collisionResultXY)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionResultXZ != obj._collisionResultXZ)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionResultYY != obj._collisionResultYY)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionResultYZ != obj._collisionResultYZ)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionResultZZ != obj._collisionResultZZ)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._unitSurfaceNormal.Equals(obj._unitSurfaceNormal))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._coefficientOfRestitution != obj._coefficientOfRestitution)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionEventID.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-            result = GenerateHash(result) ^ this._contactVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._mass.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionResultXX.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionResultXY.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionResultXZ.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionResultYY.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionResultYZ.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionResultZZ.GetHashCode();
-            result = GenerateHash(result) ^ this._unitSurfaceNormal.GetHashCode();
-            result = GenerateHash(result) ^ this._coefficientOfRestitution.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.3.3.3. Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class CollisionElasticPdu : EntityInformationFamilyPdu, IEquatable<CollisionElasticPdu>
+    {
+        /// <summary>
+        /// ID of the entity that issued the collision PDU
+        /// </summary>
+        private EntityID _issuingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of entity that has collided with the issuing entity ID
+        /// </summary>
+        private EntityID _collidingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _collisionEventID = new EventID();
+
+        /// <summary>
+        /// some padding
+        /// </summary>
+        private short _pad;
+
+        /// <summary>
+        /// velocity at collision
+        /// </summary>
+        private Vector3Float _contactVelocity = new Vector3Float();
+
+        /// <summary>
+        /// mass of issuing entity
+        /// </summary>
+        private float _mass;
+
+        /// <summary>
+        /// Location with respect to entity the issuing entity collided with
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionResultXX;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionResultXY;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionResultXZ;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionResultYY;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionResultYZ;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionResultZZ;
+
+        /// <summary>
+        /// This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates.
+        /// </summary>
+        private Vector3Float _unitSurfaceNormal = new Vector3Float();
+
+        /// <summary>
+        /// This field shall represent the degree to which energy is conserved in a collision
+        /// </summary>
+        private float _coefficientOfRestitution;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollisionElasticPdu"/> class.
+        /// </summary>
+        public CollisionElasticPdu()
+        {
+            PduType = (byte)66;
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CollisionElasticPdu left, CollisionElasticPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CollisionElasticPdu left, CollisionElasticPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
+            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
+            marshalSize += this._collisionEventID.GetMarshalledSize();  // this._collisionEventID
+            marshalSize += 2;  // this._pad
+            marshalSize += this._contactVelocity.GetMarshalledSize();  // this._contactVelocity
+            marshalSize += 4;  // this._mass
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            marshalSize += 4;  // this._collisionResultXX
+            marshalSize += 4;  // this._collisionResultXY
+            marshalSize += 4;  // this._collisionResultXZ
+            marshalSize += 4;  // this._collisionResultYY
+            marshalSize += 4;  // this._collisionResultYZ
+            marshalSize += 4;  // this._collisionResultZZ
+            marshalSize += this._unitSurfaceNormal.GetMarshalledSize();  // this._unitSurfaceNormal
+            marshalSize += 4;  // this._coefficientOfRestitution
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that issued the collision PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
+        public EntityID IssuingEntityID
+        {
+            get
+            {
+                return this._issuingEntityID;
+            }
+
+            set
+            {
+                this._issuingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity that has collided with the issuing entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
+        public EntityID CollidingEntityID
+        {
+            get
+            {
+                return this._collidingEntityID;
+            }
+
+            set
+            {
+                this._collidingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "collisionEventID")]
+        public EventID CollisionEventID
+        {
+            get
+            {
+                return this._collisionEventID;
+            }
+
+            set
+            {
+                this._collisionEventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the some padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "pad")]
+        public short Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity at collision
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "contactVelocity")]
+        public Vector3Float ContactVelocity
+        {
+            get
+            {
+                return this._contactVelocity;
+            }
+
+            set
+            {
+                this._contactVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mass of issuing entity
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "mass")]
+        public float Mass
+        {
+            get
+            {
+                return this._mass;
+            }
+
+            set
+            {
+                this._mass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location with respect to entity the issuing entity collided with
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionResultXX")]
+        public float CollisionResultXX
+        {
+            get
+            {
+                return this._collisionResultXX;
+            }
+
+            set
+            {
+                this._collisionResultXX = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionResultXY")]
+        public float CollisionResultXY
+        {
+            get
+            {
+                return this._collisionResultXY;
+            }
+
+            set
+            {
+                this._collisionResultXY = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionResultXZ")]
+        public float CollisionResultXZ
+        {
+            get
+            {
+                return this._collisionResultXZ;
+            }
+
+            set
+            {
+                this._collisionResultXZ = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionResultYY")]
+        public float CollisionResultYY
+        {
+            get
+            {
+                return this._collisionResultYY;
+            }
+
+            set
+            {
+                this._collisionResultYY = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionResultYZ")]
+        public float CollisionResultYZ
+        {
+            get
+            {
+                return this._collisionResultYZ;
+            }
+
+            set
+            {
+                this._collisionResultYZ = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionResultZZ")]
+        public float CollisionResultZZ
+        {
+            get
+            {
+                return this._collisionResultZZ;
+            }
+
+            set
+            {
+                this._collisionResultZZ = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates.
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "unitSurfaceNormal")]
+        public Vector3Float UnitSurfaceNormal
+        {
+            get
+            {
+                return this._unitSurfaceNormal;
+            }
+
+            set
+            {
+                this._unitSurfaceNormal = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall represent the degree to which energy is conserved in a collision
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "coefficientOfRestitution")]
+        public float CoefficientOfRestitution
+        {
+            get
+            {
+                return this._coefficientOfRestitution;
+            }
+
+            set
+            {
+                this._coefficientOfRestitution = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Marshal(dos);
+                    this._collidingEntityID.Marshal(dos);
+                    this._collisionEventID.Marshal(dos);
+                    dos.WriteShort((short)this._pad);
+                    this._contactVelocity.Marshal(dos);
+                    dos.WriteFloat((float)this._mass);
+                    this._location.Marshal(dos);
+                    dos.WriteFloat((float)this._collisionResultXX);
+                    dos.WriteFloat((float)this._collisionResultXY);
+                    dos.WriteFloat((float)this._collisionResultXZ);
+                    dos.WriteFloat((float)this._collisionResultYY);
+                    dos.WriteFloat((float)this._collisionResultYZ);
+                    dos.WriteFloat((float)this._collisionResultZZ);
+                    this._unitSurfaceNormal.Marshal(dos);
+                    dos.WriteFloat((float)this._coefficientOfRestitution);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Unmarshal(dis);
+                    this._collidingEntityID.Unmarshal(dis);
+                    this._collisionEventID.Unmarshal(dis);
+                    this._pad = dis.ReadShort();
+                    this._contactVelocity.Unmarshal(dis);
+                    this._mass = dis.ReadFloat();
+                    this._location.Unmarshal(dis);
+                    this._collisionResultXX = dis.ReadFloat();
+                    this._collisionResultXY = dis.ReadFloat();
+                    this._collisionResultXZ = dis.ReadFloat();
+                    this._collisionResultYY = dis.ReadFloat();
+                    this._collisionResultYZ = dis.ReadFloat();
+                    this._collisionResultZZ = dis.ReadFloat();
+                    this._unitSurfaceNormal.Unmarshal(dis);
+                    this._coefficientOfRestitution = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CollisionElasticPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<issuingEntityID>");
+                this._issuingEntityID.Reflection(sb);
+                sb.AppendLine("</issuingEntityID>");
+                sb.AppendLine("<collidingEntityID>");
+                this._collidingEntityID.Reflection(sb);
+                sb.AppendLine("</collidingEntityID>");
+                sb.AppendLine("<collisionEventID>");
+                this._collisionEventID.Reflection(sb);
+                sb.AppendLine("</collisionEventID>");
+                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                sb.AppendLine("<contactVelocity>");
+                this._contactVelocity.Reflection(sb);
+                sb.AppendLine("</contactVelocity>");
+                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                sb.AppendLine("<collisionResultXX type=\"float\">" + this._collisionResultXX.ToString(CultureInfo.InvariantCulture) + "</collisionResultXX>");
+                sb.AppendLine("<collisionResultXY type=\"float\">" + this._collisionResultXY.ToString(CultureInfo.InvariantCulture) + "</collisionResultXY>");
+                sb.AppendLine("<collisionResultXZ type=\"float\">" + this._collisionResultXZ.ToString(CultureInfo.InvariantCulture) + "</collisionResultXZ>");
+                sb.AppendLine("<collisionResultYY type=\"float\">" + this._collisionResultYY.ToString(CultureInfo.InvariantCulture) + "</collisionResultYY>");
+                sb.AppendLine("<collisionResultYZ type=\"float\">" + this._collisionResultYZ.ToString(CultureInfo.InvariantCulture) + "</collisionResultYZ>");
+                sb.AppendLine("<collisionResultZZ type=\"float\">" + this._collisionResultZZ.ToString(CultureInfo.InvariantCulture) + "</collisionResultZZ>");
+                sb.AppendLine("<unitSurfaceNormal>");
+                this._unitSurfaceNormal.Reflection(sb);
+                sb.AppendLine("</unitSurfaceNormal>");
+                sb.AppendLine("<coefficientOfRestitution type=\"float\">" + this._coefficientOfRestitution.ToString(CultureInfo.InvariantCulture) + "</coefficientOfRestitution>");
+                sb.AppendLine("</CollisionElasticPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CollisionElasticPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CollisionElasticPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._collisionEventID.Equals(obj._collisionEventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._contactVelocity.Equals(obj._contactVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._mass != obj._mass)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionResultXX != obj._collisionResultXX)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionResultXY != obj._collisionResultXY)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionResultXZ != obj._collisionResultXZ)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionResultYY != obj._collisionResultYY)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionResultYZ != obj._collisionResultYZ)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionResultZZ != obj._collisionResultZZ)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._unitSurfaceNormal.Equals(obj._unitSurfaceNormal))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._coefficientOfRestitution != obj._coefficientOfRestitution)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionEventID.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+            result = GenerateHash(result) ^ this._contactVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._mass.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionResultXX.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionResultXY.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionResultXZ.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionResultYY.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionResultYZ.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionResultZZ.GetHashCode();
+            result = GenerateHash(result) ^ this._unitSurfaceNormal.GetHashCode();
+            result = GenerateHash(result) ^ this._coefficientOfRestitution.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/CollisionPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/CollisionPdu.cs
index b078537..f9f8ab8 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CollisionPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/CollisionPdu.cs
@@ -1,542 +1,542 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.3.2. Information about a collision. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class CollisionPdu : EntityInformationFamilyPdu, IEquatable<CollisionPdu>
-    {
-        /// <summary>
-        /// ID of the entity that issued the collision PDU
-        /// </summary>
-        private EntityID _issuingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of entity that has collided with the issuing entity ID
-        /// </summary>
-        private EntityID _collidingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private byte _collisionType;
-
-        /// <summary>
-        /// some padding
-        /// </summary>
-        private byte _pad;
-
-        /// <summary>
-        /// velocity at collision
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// mass of issuing entity
-        /// </summary>
-        private float _mass;
-
-        /// <summary>
-        /// Location with respect to entity the issuing entity collided with
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollisionPdu"/> class.
-        /// </summary>
-        public CollisionPdu()
-        {
-            PduType = (byte)4;
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CollisionPdu left, CollisionPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CollisionPdu left, CollisionPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
-            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._collisionType
-            marshalSize += 1;  // this._pad
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += 4;  // this._mass
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that issued the collision PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
-        public EntityID IssuingEntityID
-        {
-            get
-            {
-                return this._issuingEntityID;
-            }
-
-            set
-            {
-                this._issuingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity that has collided with the issuing entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
-        public EntityID CollidingEntityID
-        {
-            get
-            {
-                return this._collidingEntityID;
-            }
-
-            set
-            {
-                this._collidingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "collisionType")]
-        public byte CollisionType
-        {
-            get
-            {
-                return this._collisionType;
-            }
-
-            set
-            {
-                this._collisionType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the some padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad")]
-        public byte Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the velocity at collision
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the mass of issuing entity
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "mass")]
-        public float Mass
-        {
-            get
-            {
-                return this._mass;
-            }
-
-            set
-            {
-                this._mass = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location with respect to entity the issuing entity collided with
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Marshal(dos);
-                    this._collidingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._collisionType);
-                    dos.WriteByte((byte)this._pad);
-                    this._velocity.Marshal(dos);
-                    dos.WriteFloat((float)this._mass);
-                    this._location.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._issuingEntityID.Unmarshal(dis);
-                    this._collidingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._collisionType = dis.ReadUnsignedByte();
-                    this._pad = dis.ReadByte();
-                    this._velocity.Unmarshal(dis);
-                    this._mass = dis.ReadFloat();
-                    this._location.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CollisionPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<issuingEntityID>");
-                this._issuingEntityID.Reflection(sb);
-                sb.AppendLine("</issuingEntityID>");
-                sb.AppendLine("<collidingEntityID>");
-                this._collidingEntityID.Reflection(sb);
-                sb.AppendLine("</collidingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<collisionType type=\"byte\">" + this._collisionType.ToString(CultureInfo.InvariantCulture) + "</collisionType>");
-                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                sb.AppendLine("</CollisionPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CollisionPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CollisionPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._collisionType != obj._collisionType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._mass != obj._mass)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._collisionType.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._mass.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.3.2. Information about a collision. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class CollisionPdu : EntityInformationFamilyPdu, IEquatable<CollisionPdu>
+    {
+        /// <summary>
+        /// ID of the entity that issued the collision PDU
+        /// </summary>
+        private EntityID _issuingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of entity that has collided with the issuing entity ID
+        /// </summary>
+        private EntityID _collidingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private byte _collisionType;
+
+        /// <summary>
+        /// some padding
+        /// </summary>
+        private byte _pad;
+
+        /// <summary>
+        /// velocity at collision
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// mass of issuing entity
+        /// </summary>
+        private float _mass;
+
+        /// <summary>
+        /// Location with respect to entity the issuing entity collided with
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollisionPdu"/> class.
+        /// </summary>
+        public CollisionPdu()
+        {
+            PduType = (byte)4;
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CollisionPdu left, CollisionPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CollisionPdu left, CollisionPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
+            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._collisionType
+            marshalSize += 1;  // this._pad
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += 4;  // this._mass
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that issued the collision PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
+        public EntityID IssuingEntityID
+        {
+            get
+            {
+                return this._issuingEntityID;
+            }
+
+            set
+            {
+                this._issuingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity that has collided with the issuing entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
+        public EntityID CollidingEntityID
+        {
+            get
+            {
+                return this._collidingEntityID;
+            }
+
+            set
+            {
+                this._collidingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "collisionType")]
+        public byte CollisionType
+        {
+            get
+            {
+                return this._collisionType;
+            }
+
+            set
+            {
+                this._collisionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the some padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad")]
+        public byte Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity at collision
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mass of issuing entity
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "mass")]
+        public float Mass
+        {
+            get
+            {
+                return this._mass;
+            }
+
+            set
+            {
+                this._mass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location with respect to entity the issuing entity collided with
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Marshal(dos);
+                    this._collidingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._collisionType);
+                    dos.WriteByte((byte)this._pad);
+                    this._velocity.Marshal(dos);
+                    dos.WriteFloat((float)this._mass);
+                    this._location.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Unmarshal(dis);
+                    this._collidingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._collisionType = dis.ReadUnsignedByte();
+                    this._pad = dis.ReadByte();
+                    this._velocity.Unmarshal(dis);
+                    this._mass = dis.ReadFloat();
+                    this._location.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CollisionPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<issuingEntityID>");
+                this._issuingEntityID.Reflection(sb);
+                sb.AppendLine("</issuingEntityID>");
+                sb.AppendLine("<collidingEntityID>");
+                this._collidingEntityID.Reflection(sb);
+                sb.AppendLine("</collidingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<collisionType type=\"byte\">" + this._collisionType.ToString(CultureInfo.InvariantCulture) + "</collisionType>");
+                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                sb.AppendLine("</CollisionPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CollisionPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CollisionPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionType != obj._collisionType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._mass != obj._mass)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionType.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._mass.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/CommentPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/CommentPdu.cs
index 0c3cb2c..5e8770f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/CommentPdu.cs
@@ -1,484 +1,484 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.12. Arbitrary messages can be entered into the data stream via use of this PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class CommentPdu : SimulationManagementFamilyPdu, IEquatable<CommentPdu>
-    {
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommentPdu"/> class.
-        /// </summary>
-        public CommentPdu()
-        {
-            PduType = (byte)22;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CommentPdu left, CommentPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CommentPdu left, CommentPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CommentPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</CommentPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CommentPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CommentPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.12. Arbitrary messages can be entered into the data stream via use of this PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class CommentPdu : SimulationManagementFamilyPdu, IEquatable<CommentPdu>
+    {
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommentPdu"/> class.
+        /// </summary>
+        public CommentPdu()
+        {
+            PduType = (byte)22;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CommentPdu left, CommentPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CommentPdu left, CommentPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CommentPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</CommentPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CommentPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CommentPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/CommentReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/CommentReliablePdu.cs
index 3708581..6c145d5 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CommentReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/CommentReliablePdu.cs
@@ -1,484 +1,484 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual intervention     to fix padding in variable datums. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class CommentReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CommentReliablePdu>
-    {
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommentReliablePdu"/> class.
-        /// </summary>
-        public CommentReliablePdu()
-        {
-            PduType = (byte)62;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CommentReliablePdu left, CommentReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CommentReliablePdu left, CommentReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CommentReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</CommentReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CommentReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CommentReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual intervention     to fix padding in variable datums. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class CommentReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CommentReliablePdu>
+    {
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommentReliablePdu"/> class.
+        /// </summary>
+        public CommentReliablePdu()
+        {
+            PduType = (byte)62;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CommentReliablePdu left, CommentReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CommentReliablePdu left, CommentReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CommentReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</CommentReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CommentReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CommentReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/CreateEntityPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/CreateEntityPdu.cs
index 129f462..2ccb2f3 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/CreateEntityPdu.cs
@@ -1,304 +1,304 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.1. Create a new entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class CreateEntityPdu : SimulationManagementFamilyPdu, IEquatable<CreateEntityPdu>
-    {
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateEntityPdu"/> class.
-        /// </summary>
-        public CreateEntityPdu()
-        {
-            PduType = (byte)11;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CreateEntityPdu left, CreateEntityPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CreateEntityPdu left, CreateEntityPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CreateEntityPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</CreateEntityPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CreateEntityPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CreateEntityPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.1. Create a new entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class CreateEntityPdu : SimulationManagementFamilyPdu, IEquatable<CreateEntityPdu>
+    {
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateEntityPdu"/> class.
+        /// </summary>
+        public CreateEntityPdu()
+        {
+            PduType = (byte)11;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CreateEntityPdu left, CreateEntityPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CreateEntityPdu left, CreateEntityPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CreateEntityPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</CreateEntityPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CreateEntityPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CreateEntityPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/CreateEntityReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/CreateEntityReliablePdu.cs
index 13a336d..4c69893 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/CreateEntityReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/CreateEntityReliablePdu.cs
@@ -1,400 +1,400 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.1: creation of an entity , reliable. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class CreateEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CreateEntityReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreateEntityReliablePdu"/> class.
-        /// </summary>
-        public CreateEntityReliablePdu()
-        {
-            PduType = (byte)51;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<CreateEntityReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</CreateEntityReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as CreateEntityReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CreateEntityReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.1: creation of an entity , reliable. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class CreateEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CreateEntityReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateEntityReliablePdu"/> class.
+        /// </summary>
+        public CreateEntityReliablePdu()
+        {
+            PduType = (byte)51;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CreateEntityReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</CreateEntityReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CreateEntityReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CreateEntityReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/DataPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DataPdu.cs
index 3bc9dc2..e99226f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DataPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.10. Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataPdu : SimulationManagementFamilyPdu, IEquatable<DataPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataPdu"/> class.
-        /// </summary>
-        public DataPdu()
-        {
-            PduType = (byte)20;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataPdu left, DataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataPdu left, DataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.10. Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataPdu : SimulationManagementFamilyPdu, IEquatable<DataPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataPdu"/> class.
+        /// </summary>
+        public DataPdu()
+        {
+            PduType = (byte)20;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataPdu left, DataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataPdu left, DataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/DataQueryPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DataQueryPdu.cs
index fdcc595..d8abd40 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DataQueryPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.8. Request for data from an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataQueryPdu : SimulationManagementFamilyPdu, IEquatable<DataQueryPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// time issues between issues of Data PDUs. Zero means send once only.
-        /// </summary>
-        private uint _timeInterval;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataQueryPdu"/> class.
-        /// </summary>
-        public DataQueryPdu()
-        {
-            PduType = (byte)18;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataQueryPdu left, DataQueryPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataQueryPdu left, DataQueryPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._timeInterval
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time issues between issues of Data PDUs. Zero means send once only.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
-        public uint TimeInterval
-        {
-            get
-            {
-                return this._timeInterval;
-            }
-
-            set
-            {
-                this._timeInterval = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._timeInterval);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._timeInterval = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataQueryPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataQueryPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataQueryPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataQueryPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timeInterval != obj._timeInterval)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.8. Request for data from an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataQueryPdu : SimulationManagementFamilyPdu, IEquatable<DataQueryPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// time issues between issues of Data PDUs. Zero means send once only.
+        /// </summary>
+        private uint _timeInterval;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataQueryPdu"/> class.
+        /// </summary>
+        public DataQueryPdu()
+        {
+            PduType = (byte)18;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataQueryPdu left, DataQueryPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataQueryPdu left, DataQueryPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._timeInterval
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time issues between issues of Data PDUs. Zero means send once only.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
+        public uint TimeInterval
+        {
+            get
+            {
+                return this._timeInterval;
+            }
+
+            set
+            {
+                this._timeInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._timeInterval);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._timeInterval = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataQueryPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataQueryPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataQueryPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataQueryPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timeInterval != obj._timeInterval)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/DataQueryReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DataQueryReliablePdu.cs
index fb68637..33948d8 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataQueryReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DataQueryReliablePdu.cs
@@ -1,644 +1,644 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.8: request for data from an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataQueryReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// time interval between issuing data query PDUs
-        /// </summary>
-        private uint _timeInterval;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataQueryReliablePdu"/> class.
-        /// </summary>
-        public DataQueryReliablePdu()
-        {
-            PduType = (byte)58;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataQueryReliablePdu left, DataQueryReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataQueryReliablePdu left, DataQueryReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._timeInterval
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time interval between issuing data query PDUs
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
-        public uint TimeInterval
-        {
-            get
-            {
-                return this._timeInterval;
-            }
-
-            set
-            {
-                this._timeInterval = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._timeInterval);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._timeInterval = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataQueryReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataQueryReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataQueryReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataQueryReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timeInterval != obj._timeInterval)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.8: request for data from an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataQueryReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// time interval between issuing data query PDUs
+        /// </summary>
+        private uint _timeInterval;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataQueryReliablePdu"/> class.
+        /// </summary>
+        public DataQueryReliablePdu()
+        {
+            PduType = (byte)58;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataQueryReliablePdu left, DataQueryReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataQueryReliablePdu left, DataQueryReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._timeInterval
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time interval between issuing data query PDUs
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
+        public uint TimeInterval
+        {
+            get
+            {
+                return this._timeInterval;
+            }
+
+            set
+            {
+                this._timeInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._timeInterval);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._timeInterval = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataQueryReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataQueryReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataQueryReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataQueryReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timeInterval != obj._timeInterval)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/DataReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DataReliablePdu.cs
index 5dc6182..01c754c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DataReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DataReliablePdu.cs
@@ -1,612 +1,612 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. Needs manual intervention      to fix padding on variable datums. UNFINSIHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class DataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataReliablePdu>
-    {
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataReliablePdu"/> class.
-        /// </summary>
-        public DataReliablePdu()
-        {
-            PduType = (byte)60;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DataReliablePdu left, DataReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DataReliablePdu left, DataReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DataReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DataReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DataReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DataReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. Needs manual intervention      to fix padding on variable datums. UNFINSIHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataReliablePdu>
+    {
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataReliablePdu"/> class.
+        /// </summary>
+        public DataReliablePdu()
+        {
+            PduType = (byte)60;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataReliablePdu left, DataReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataReliablePdu left, DataReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs b/Libs/CsharpDis6/Dis1998/Generated/DeadReckoningParameter.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DeadReckoningParameter.cs
index 448747a..7c5160a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DeadReckoningParameter.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DeadReckoningParameter.cs
@@ -1,431 +1,431 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// represents values used in dead reckoning algorithms
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class DeadReckoningParameter
-    {
-        /// <summary>
-        /// enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        private byte[] _otherParameters = new byte[15];
-
-        /// <summary>
-        /// Linear acceleration of the entity
-        /// </summary>
-        private Vector3Float _entityLinearAcceleration = new Vector3Float();
-
-        /// <summary>
-        /// angular velocity of the entity
-        /// </summary>
-        private Vector3Float _entityAngularVelocity = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeadReckoningParameter"/> class.
-        /// </summary>
-        public DeadReckoningParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DeadReckoningParameter left, DeadReckoningParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DeadReckoningParameter left, DeadReckoningParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 15 * 1;  // _otherParameters
-            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
-            marshalSize += this._entityAngularVelocity.GetMarshalledSize();  // this._entityAngularVelocity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the Linear acceleration of the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
-        public Vector3Float EntityLinearAcceleration
-        {
-            get
-            {
-                return this._entityLinearAcceleration;
-            }
-
-            set
-            {
-                this._entityLinearAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the angular velocity of the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityAngularVelocity")]
-        public Vector3Float EntityAngularVelocity
-        {
-            get
-            {
-                return this._entityAngularVelocity;
-            }
-
-            set
-            {
-                this._entityAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-
-                    this._entityLinearAcceleration.Marshal(dos);
-                    this._entityAngularVelocity.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-
-                    this._entityLinearAcceleration.Unmarshal(dis);
-                    this._entityAngularVelocity.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DeadReckoningParameter>");
-            try
-            {
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<entityLinearAcceleration>");
-                this._entityLinearAcceleration.Reflection(sb);
-                sb.AppendLine("</entityLinearAcceleration>");
-                sb.AppendLine("<entityAngularVelocity>");
-                this._entityAngularVelocity.Reflection(sb);
-                sb.AppendLine("</entityAngularVelocity>");
-                sb.AppendLine("</DeadReckoningParameter>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DeadReckoningParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DeadReckoningParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._otherParameters.Length != 15) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 15; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityAngularVelocity.Equals(obj._entityAngularVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-
-            for (int idx = 0; idx < 15; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAngularVelocity.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// represents values used in dead reckoning algorithms
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class DeadReckoningParameter
+    {
+        /// <summary>
+        /// enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        private byte[] _otherParameters = new byte[15];
+
+        /// <summary>
+        /// Linear acceleration of the entity
+        /// </summary>
+        private Vector3Float _entityLinearAcceleration = new Vector3Float();
+
+        /// <summary>
+        /// angular velocity of the entity
+        /// </summary>
+        private Vector3Float _entityAngularVelocity = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeadReckoningParameter"/> class.
+        /// </summary>
+        public DeadReckoningParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DeadReckoningParameter left, DeadReckoningParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DeadReckoningParameter left, DeadReckoningParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 15 * 1;  // _otherParameters
+            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
+            marshalSize += this._entityAngularVelocity.GetMarshalledSize();  // this._entityAngularVelocity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the Linear acceleration of the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
+        public Vector3Float EntityLinearAcceleration
+        {
+            get
+            {
+                return this._entityLinearAcceleration;
+            }
+
+            set
+            {
+                this._entityLinearAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the angular velocity of the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityAngularVelocity")]
+        public Vector3Float EntityAngularVelocity
+        {
+            get
+            {
+                return this._entityAngularVelocity;
+            }
+
+            set
+            {
+                this._entityAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+
+                    this._entityLinearAcceleration.Marshal(dos);
+                    this._entityAngularVelocity.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+
+                    this._entityLinearAcceleration.Unmarshal(dis);
+                    this._entityAngularVelocity.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DeadReckoningParameter>");
+            try
+            {
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<entityLinearAcceleration>");
+                this._entityLinearAcceleration.Reflection(sb);
+                sb.AppendLine("</entityLinearAcceleration>");
+                sb.AppendLine("<entityAngularVelocity>");
+                this._entityAngularVelocity.Reflection(sb);
+                sb.AppendLine("</entityAngularVelocity>");
+                sb.AppendLine("</DeadReckoningParameter>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DeadReckoningParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DeadReckoningParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._otherParameters.Length != 15) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 15; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityAngularVelocity.Equals(obj._entityAngularVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+
+            for (int idx = 0; idx < 15; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAngularVelocity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DesignatorPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/DesignatorPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DesignatorPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DesignatorPdu.cs
index 33ea1ed..6bb28b3 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DesignatorPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DesignatorPdu.cs
@@ -1,669 +1,669 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.7.2. Handles designating operations. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    public partial class DesignatorPdu : DistributedEmissionsFamilyPdu, IEquatable<DesignatorPdu>
-    {
-        /// <summary>
-        /// ID of the entity designating
-        /// </summary>
-        private EntityID _designatingEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
-        /// </summary>
-        private ushort _codeName;
-
-        /// <summary>
-        /// ID of the entity being designated
-        /// </summary>
-        private EntityID _designatedEntityID = new EntityID();
-
-        /// <summary>
-        /// This field shall identify the designator code being used by the designating entity 
-        /// </summary>
-        private ushort _designatorCode;
-
-        /// <summary>
-        /// This field shall identify the designator output power in watts
-        /// </summary>
-        private float _designatorPower;
-
-        /// <summary>
-        /// This field shall identify the designator wavelength in units of microns
-        /// </summary>
-        private float _designatorWavelength;
-
-        /// <summary>
-        /// designtor spot wrt the designated entity
-        /// </summary>
-        private Vector3Float _designatorSpotWrtDesignated = new Vector3Float();
-
-        /// <summary>
-        /// designtor spot wrt the designated entity
-        /// </summary>
-        private Vector3Double _designatorSpotLocation = new Vector3Double();
-
-        /// <summary>
-        /// Dead reckoning algorithm
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// linear accelleration of entity
-        /// </summary>
-        private Vector3Float _entityLinearAcceleration = new Vector3Float();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DesignatorPdu"/> class.
-        /// </summary>
-        public DesignatorPdu()
-        {
-            PduType = (byte)24;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DesignatorPdu left, DesignatorPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DesignatorPdu left, DesignatorPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._designatingEntityID.GetMarshalledSize();  // this._designatingEntityID
-            marshalSize += 2;  // this._codeName
-            marshalSize += this._designatedEntityID.GetMarshalledSize();  // this._designatedEntityID
-            marshalSize += 2;  // this._designatorCode
-            marshalSize += 4;  // this._designatorPower
-            marshalSize += 4;  // this._designatorWavelength
-            marshalSize += this._designatorSpotWrtDesignated.GetMarshalledSize();  // this._designatorSpotWrtDesignated
-            marshalSize += this._designatorSpotLocation.GetMarshalledSize();  // this._designatorSpotLocation
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity designating
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "designatingEntityID")]
-        public EntityID DesignatingEntityID
-        {
-            get
-            {
-                return this._designatingEntityID;
-            }
-
-            set
-            {
-                this._designatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "codeName")]
-        public ushort CodeName
-        {
-            get
-            {
-                return this._codeName;
-            }
-
-            set
-            {
-                this._codeName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity being designated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "designatedEntityID")]
-        public EntityID DesignatedEntityID
-        {
-            get
-            {
-                return this._designatedEntityID;
-            }
-
-            set
-            {
-                this._designatedEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator code being used by the designating entity 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "designatorCode")]
-        public ushort DesignatorCode
-        {
-            get
-            {
-                return this._designatorCode;
-            }
-
-            set
-            {
-                this._designatorCode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator output power in watts
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "designatorPower")]
-        public float DesignatorPower
-        {
-            get
-            {
-                return this._designatorPower;
-            }
-
-            set
-            {
-                this._designatorPower = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the designator wavelength in units of microns
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "designatorWavelength")]
-        public float DesignatorWavelength
-        {
-            get
-            {
-                return this._designatorWavelength;
-            }
-
-            set
-            {
-                this._designatorWavelength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the designtor spot wrt the designated entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "designatorSpotWrtDesignated")]
-        public Vector3Float DesignatorSpotWrtDesignated
-        {
-            get
-            {
-                return this._designatorSpotWrtDesignated;
-            }
-
-            set
-            {
-                this._designatorSpotWrtDesignated = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the designtor spot wrt the designated entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "designatorSpotLocation")]
-        public Vector3Double DesignatorSpotLocation
-        {
-            get
-            {
-                return this._designatorSpotLocation;
-            }
-
-            set
-            {
-                this._designatorSpotLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Dead reckoning algorithm
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the linear accelleration of entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
-        public Vector3Float EntityLinearAcceleration
-        {
-            get
-            {
-                return this._entityLinearAcceleration;
-            }
-
-            set
-            {
-                this._entityLinearAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._designatingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._codeName);
-                    this._designatedEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._designatorCode);
-                    dos.WriteFloat((float)this._designatorPower);
-                    dos.WriteFloat((float)this._designatorWavelength);
-                    this._designatorSpotWrtDesignated.Marshal(dos);
-                    this._designatorSpotLocation.Marshal(dos);
-                    dos.WriteByte((byte)this._deadReckoningAlgorithm);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                    this._entityLinearAcceleration.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._designatingEntityID.Unmarshal(dis);
-                    this._codeName = dis.ReadUnsignedShort();
-                    this._designatedEntityID.Unmarshal(dis);
-                    this._designatorCode = dis.ReadUnsignedShort();
-                    this._designatorPower = dis.ReadFloat();
-                    this._designatorWavelength = dis.ReadFloat();
-                    this._designatorSpotWrtDesignated.Unmarshal(dis);
-                    this._designatorSpotLocation.Unmarshal(dis);
-                    this._deadReckoningAlgorithm = dis.ReadByte();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._padding2 = dis.ReadByte();
-                    this._entityLinearAcceleration.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DesignatorPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<designatingEntityID>");
-                this._designatingEntityID.Reflection(sb);
-                sb.AppendLine("</designatingEntityID>");
-                sb.AppendLine("<codeName type=\"ushort\">" + this._codeName.ToString(CultureInfo.InvariantCulture) + "</codeName>");
-                sb.AppendLine("<designatedEntityID>");
-                this._designatedEntityID.Reflection(sb);
-                sb.AppendLine("</designatedEntityID>");
-                sb.AppendLine("<designatorCode type=\"ushort\">" + this._designatorCode.ToString(CultureInfo.InvariantCulture) + "</designatorCode>");
-                sb.AppendLine("<designatorPower type=\"float\">" + this._designatorPower.ToString(CultureInfo.InvariantCulture) + "</designatorPower>");
-                sb.AppendLine("<designatorWavelength type=\"float\">" + this._designatorWavelength.ToString(CultureInfo.InvariantCulture) + "</designatorWavelength>");
-                sb.AppendLine("<designatorSpotWrtDesignated>");
-                this._designatorSpotWrtDesignated.Reflection(sb);
-                sb.AppendLine("</designatorSpotWrtDesignated>");
-                sb.AppendLine("<designatorSpotLocation>");
-                this._designatorSpotLocation.Reflection(sb);
-                sb.AppendLine("</designatorSpotLocation>");
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<entityLinearAcceleration>");
-                this._entityLinearAcceleration.Reflection(sb);
-                sb.AppendLine("</entityLinearAcceleration>");
-                sb.AppendLine("</DesignatorPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DesignatorPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DesignatorPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._designatingEntityID.Equals(obj._designatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._codeName != obj._codeName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatedEntityID.Equals(obj._designatedEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorCode != obj._designatorCode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorPower != obj._designatorPower)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._designatorWavelength != obj._designatorWavelength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatorSpotWrtDesignated.Equals(obj._designatorSpotWrtDesignated))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._designatorSpotLocation.Equals(obj._designatorSpotLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._designatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._codeName.GetHashCode();
-            result = GenerateHash(result) ^ this._designatedEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorCode.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorPower.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorWavelength.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorSpotWrtDesignated.GetHashCode();
-            result = GenerateHash(result) ^ this._designatorSpotLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.7.2. Handles designating operations. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    public partial class DesignatorPdu : DistributedEmissionsFamilyPdu, IEquatable<DesignatorPdu>
+    {
+        /// <summary>
+        /// ID of the entity designating
+        /// </summary>
+        private EntityID _designatingEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
+        /// </summary>
+        private ushort _codeName;
+
+        /// <summary>
+        /// ID of the entity being designated
+        /// </summary>
+        private EntityID _designatedEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall identify the designator code being used by the designating entity 
+        /// </summary>
+        private ushort _designatorCode;
+
+        /// <summary>
+        /// This field shall identify the designator output power in watts
+        /// </summary>
+        private float _designatorPower;
+
+        /// <summary>
+        /// This field shall identify the designator wavelength in units of microns
+        /// </summary>
+        private float _designatorWavelength;
+
+        /// <summary>
+        /// designtor spot wrt the designated entity
+        /// </summary>
+        private Vector3Float _designatorSpotWrtDesignated = new Vector3Float();
+
+        /// <summary>
+        /// designtor spot wrt the designated entity
+        /// </summary>
+        private Vector3Double _designatorSpotLocation = new Vector3Double();
+
+        /// <summary>
+        /// Dead reckoning algorithm
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// linear accelleration of entity
+        /// </summary>
+        private Vector3Float _entityLinearAcceleration = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DesignatorPdu"/> class.
+        /// </summary>
+        public DesignatorPdu()
+        {
+            PduType = (byte)24;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DesignatorPdu left, DesignatorPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DesignatorPdu left, DesignatorPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._designatingEntityID.GetMarshalledSize();  // this._designatingEntityID
+            marshalSize += 2;  // this._codeName
+            marshalSize += this._designatedEntityID.GetMarshalledSize();  // this._designatedEntityID
+            marshalSize += 2;  // this._designatorCode
+            marshalSize += 4;  // this._designatorPower
+            marshalSize += 4;  // this._designatorWavelength
+            marshalSize += this._designatorSpotWrtDesignated.GetMarshalledSize();  // this._designatorSpotWrtDesignated
+            marshalSize += this._designatorSpotLocation.GetMarshalledSize();  // this._designatorSpotLocation
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity designating
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "designatingEntityID")]
+        public EntityID DesignatingEntityID
+        {
+            get
+            {
+                return this._designatingEntityID;
+            }
+
+            set
+            {
+                this._designatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "codeName")]
+        public ushort CodeName
+        {
+            get
+            {
+                return this._codeName;
+            }
+
+            set
+            {
+                this._codeName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity being designated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "designatedEntityID")]
+        public EntityID DesignatedEntityID
+        {
+            get
+            {
+                return this._designatedEntityID;
+            }
+
+            set
+            {
+                this._designatedEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator code being used by the designating entity 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "designatorCode")]
+        public ushort DesignatorCode
+        {
+            get
+            {
+                return this._designatorCode;
+            }
+
+            set
+            {
+                this._designatorCode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator output power in watts
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "designatorPower")]
+        public float DesignatorPower
+        {
+            get
+            {
+                return this._designatorPower;
+            }
+
+            set
+            {
+                this._designatorPower = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator wavelength in units of microns
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "designatorWavelength")]
+        public float DesignatorWavelength
+        {
+            get
+            {
+                return this._designatorWavelength;
+            }
+
+            set
+            {
+                this._designatorWavelength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the designtor spot wrt the designated entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "designatorSpotWrtDesignated")]
+        public Vector3Float DesignatorSpotWrtDesignated
+        {
+            get
+            {
+                return this._designatorSpotWrtDesignated;
+            }
+
+            set
+            {
+                this._designatorSpotWrtDesignated = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the designtor spot wrt the designated entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "designatorSpotLocation")]
+        public Vector3Double DesignatorSpotLocation
+        {
+            get
+            {
+                return this._designatorSpotLocation;
+            }
+
+            set
+            {
+                this._designatorSpotLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Dead reckoning algorithm
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the linear accelleration of entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
+        public Vector3Float EntityLinearAcceleration
+        {
+            get
+            {
+                return this._entityLinearAcceleration;
+            }
+
+            set
+            {
+                this._entityLinearAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._designatingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._codeName);
+                    this._designatedEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._designatorCode);
+                    dos.WriteFloat((float)this._designatorPower);
+                    dos.WriteFloat((float)this._designatorWavelength);
+                    this._designatorSpotWrtDesignated.Marshal(dos);
+                    this._designatorSpotLocation.Marshal(dos);
+                    dos.WriteByte((byte)this._deadReckoningAlgorithm);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                    this._entityLinearAcceleration.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._designatingEntityID.Unmarshal(dis);
+                    this._codeName = dis.ReadUnsignedShort();
+                    this._designatedEntityID.Unmarshal(dis);
+                    this._designatorCode = dis.ReadUnsignedShort();
+                    this._designatorPower = dis.ReadFloat();
+                    this._designatorWavelength = dis.ReadFloat();
+                    this._designatorSpotWrtDesignated.Unmarshal(dis);
+                    this._designatorSpotLocation.Unmarshal(dis);
+                    this._deadReckoningAlgorithm = dis.ReadByte();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._padding2 = dis.ReadByte();
+                    this._entityLinearAcceleration.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DesignatorPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<designatingEntityID>");
+                this._designatingEntityID.Reflection(sb);
+                sb.AppendLine("</designatingEntityID>");
+                sb.AppendLine("<codeName type=\"ushort\">" + this._codeName.ToString(CultureInfo.InvariantCulture) + "</codeName>");
+                sb.AppendLine("<designatedEntityID>");
+                this._designatedEntityID.Reflection(sb);
+                sb.AppendLine("</designatedEntityID>");
+                sb.AppendLine("<designatorCode type=\"ushort\">" + this._designatorCode.ToString(CultureInfo.InvariantCulture) + "</designatorCode>");
+                sb.AppendLine("<designatorPower type=\"float\">" + this._designatorPower.ToString(CultureInfo.InvariantCulture) + "</designatorPower>");
+                sb.AppendLine("<designatorWavelength type=\"float\">" + this._designatorWavelength.ToString(CultureInfo.InvariantCulture) + "</designatorWavelength>");
+                sb.AppendLine("<designatorSpotWrtDesignated>");
+                this._designatorSpotWrtDesignated.Reflection(sb);
+                sb.AppendLine("</designatorSpotWrtDesignated>");
+                sb.AppendLine("<designatorSpotLocation>");
+                this._designatorSpotLocation.Reflection(sb);
+                sb.AppendLine("</designatorSpotLocation>");
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<entityLinearAcceleration>");
+                this._entityLinearAcceleration.Reflection(sb);
+                sb.AppendLine("</entityLinearAcceleration>");
+                sb.AppendLine("</DesignatorPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DesignatorPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DesignatorPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._designatingEntityID.Equals(obj._designatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._codeName != obj._codeName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatedEntityID.Equals(obj._designatedEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorCode != obj._designatorCode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorPower != obj._designatorPower)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorWavelength != obj._designatorWavelength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatorSpotWrtDesignated.Equals(obj._designatorSpotWrtDesignated))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatorSpotLocation.Equals(obj._designatorSpotLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._designatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._codeName.GetHashCode();
+            result = GenerateHash(result) ^ this._designatedEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorCode.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorPower.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorWavelength.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorSpotWrtDesignated.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorSpotLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DetonationPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/DetonationPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DetonationPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DetonationPdu.cs
index d681aab..e897b20 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DetonationPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DetonationPdu.cs
@@ -1,648 +1,648 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.4.2. Information about stuff exploding. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(BurstDescriptor))]
-    [XmlInclude(typeof(ArticulationParameter))]
-    public partial class DetonationPdu : WarfareFamilyPdu, IEquatable<DetonationPdu>
-    {
-        /// <summary>
-        /// ID of muntion that was fired
-        /// </summary>
-        private EntityID _munitionID = new EntityID();
-
-        /// <summary>
-        /// ID firing event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// ID firing event
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// where the detonation is, in world coordinates
-        /// </summary>
-        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
-
-        /// <summary>
-        /// Describes munition used
-        /// </summary>
-        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
-
-        /// <summary>
-        /// location of the detonation or impact in the target entity's coordinate system. This information should be used for damage assessment.
-        /// </summary>
-        private Vector3Float _locationInEntityCoordinates = new Vector3Float();
-
-        /// <summary>
-        /// result of the explosion
-        /// </summary>
-        private byte _detonationResult;
-
-        /// <summary>
-        /// How many articulation parameters we have
-        /// </summary>
-        private byte _numberOfArticulationParameters;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _pad;
-
-        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DetonationPdu"/> class.
-        /// </summary>
-        public DetonationPdu()
-        {
-            PduType = (byte)3;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DetonationPdu left, DetonationPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DetonationPdu left, DetonationPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
-            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
-            marshalSize += this._locationInEntityCoordinates.GetMarshalledSize();  // this._locationInEntityCoordinates
-            marshalSize += 1;  // this._detonationResult
-            marshalSize += 1;  // this._numberOfArticulationParameters
-            marshalSize += 2;  // this._pad
-            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-            {
-                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of muntion that was fired
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
-        public EntityID MunitionID
-        {
-            get
-            {
-                return this._munitionID;
-            }
-
-            set
-            {
-                this._munitionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID firing event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID firing event
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the where the detonation is, in world coordinates
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
-        public Vector3Double LocationInWorldCoordinates
-        {
-            get
-            {
-                return this._locationInWorldCoordinates;
-            }
-
-            set
-            {
-                this._locationInWorldCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes munition used
-        /// </summary>
-        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
-        public BurstDescriptor BurstDescriptor
-        {
-            get
-            {
-                return this._burstDescriptor;
-            }
-
-            set
-            {
-                this._burstDescriptor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of the detonation or impact in the target entity's coordinate system. This information should be used for damage assessment.
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "locationInEntityCoordinates")]
-        public Vector3Float LocationInEntityCoordinates
-        {
-            get
-            {
-                return this._locationInEntityCoordinates;
-            }
-
-            set
-            {
-                this._locationInEntityCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the result of the explosion
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "detonationResult")]
-        public byte DetonationResult
-        {
-            get
-            {
-                return this._detonationResult;
-            }
-
-            set
-            {
-                this._detonationResult = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many articulation parameters we have
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
-        public byte NumberOfArticulationParameters
-        {
-            get
-            {
-                return this._numberOfArticulationParameters;
-            }
-
-            set
-            {
-                this._numberOfArticulationParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "pad")]
-        public short Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the articulationParameters
-        /// </summary>
-        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
-        public List<ArticulationParameter> ArticulationParameters
-        {
-            get
-            {
-                return this._articulationParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    this._velocity.Marshal(dos);
-                    this._locationInWorldCoordinates.Marshal(dos);
-                    this._burstDescriptor.Marshal(dos);
-                    this._locationInEntityCoordinates.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._detonationResult);
-                    dos.WriteUnsignedByte((byte)this._articulationParameters.Count);
-                    dos.WriteShort((short)this._pad);
-
-                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                    {
-                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                        aArticulationParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._velocity.Unmarshal(dis);
-                    this._locationInWorldCoordinates.Unmarshal(dis);
-                    this._burstDescriptor.Unmarshal(dis);
-                    this._locationInEntityCoordinates.Unmarshal(dis);
-                    this._detonationResult = dis.ReadUnsignedByte();
-                    this._numberOfArticulationParameters = dis.ReadUnsignedByte();
-                    this._pad = dis.ReadShort();
-
-                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
-                    {
-                        ArticulationParameter anX = new ArticulationParameter();
-                        anX.Unmarshal(dis);
-                        this._articulationParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DetonationPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<munitionID>");
-                this._munitionID.Reflection(sb);
-                sb.AppendLine("</munitionID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<locationInWorldCoordinates>");
-                this._locationInWorldCoordinates.Reflection(sb);
-                sb.AppendLine("</locationInWorldCoordinates>");
-                sb.AppendLine("<burstDescriptor>");
-                this._burstDescriptor.Reflection(sb);
-                sb.AppendLine("</burstDescriptor>");
-                sb.AppendLine("<locationInEntityCoordinates>");
-                this._locationInEntityCoordinates.Reflection(sb);
-                sb.AppendLine("</locationInEntityCoordinates>");
-                sb.AppendLine("<detonationResult type=\"byte\">" + this._detonationResult.ToString(CultureInfo.InvariantCulture) + "</detonationResult>");
-                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
-                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
-                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                    aArticulationParameter.Reflection(sb);
-                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</DetonationPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DetonationPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DetonationPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._munitionID.Equals(obj._munitionID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationInEntityCoordinates.Equals(obj._locationInEntityCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._detonationResult != obj._detonationResult)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._articulationParameters.Count != obj._articulationParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
-            result = GenerateHash(result) ^ this._locationInEntityCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._detonationResult.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-
-            if (this._articulationParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.4.2. Information about stuff exploding. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(BurstDescriptor))]
+    [XmlInclude(typeof(ArticulationParameter))]
+    public partial class DetonationPdu : WarfareFamilyPdu, IEquatable<DetonationPdu>
+    {
+        /// <summary>
+        /// ID of muntion that was fired
+        /// </summary>
+        private EntityID _munitionID = new EntityID();
+
+        /// <summary>
+        /// ID firing event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// ID firing event
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// where the detonation is, in world coordinates
+        /// </summary>
+        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
+
+        /// <summary>
+        /// Describes munition used
+        /// </summary>
+        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
+
+        /// <summary>
+        /// location of the detonation or impact in the target entity's coordinate system. This information should be used for damage assessment.
+        /// </summary>
+        private Vector3Float _locationInEntityCoordinates = new Vector3Float();
+
+        /// <summary>
+        /// result of the explosion
+        /// </summary>
+        private byte _detonationResult;
+
+        /// <summary>
+        /// How many articulation parameters we have
+        /// </summary>
+        private byte _numberOfArticulationParameters;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _pad;
+
+        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DetonationPdu"/> class.
+        /// </summary>
+        public DetonationPdu()
+        {
+            PduType = (byte)3;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DetonationPdu left, DetonationPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DetonationPdu left, DetonationPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
+            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
+            marshalSize += this._locationInEntityCoordinates.GetMarshalledSize();  // this._locationInEntityCoordinates
+            marshalSize += 1;  // this._detonationResult
+            marshalSize += 1;  // this._numberOfArticulationParameters
+            marshalSize += 2;  // this._pad
+            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+            {
+                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of muntion that was fired
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
+        public EntityID MunitionID
+        {
+            get
+            {
+                return this._munitionID;
+            }
+
+            set
+            {
+                this._munitionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID firing event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID firing event
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the where the detonation is, in world coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
+        public Vector3Double LocationInWorldCoordinates
+        {
+            get
+            {
+                return this._locationInWorldCoordinates;
+            }
+
+            set
+            {
+                this._locationInWorldCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes munition used
+        /// </summary>
+        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
+        public BurstDescriptor BurstDescriptor
+        {
+            get
+            {
+                return this._burstDescriptor;
+            }
+
+            set
+            {
+                this._burstDescriptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of the detonation or impact in the target entity's coordinate system. This information should be used for damage assessment.
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "locationInEntityCoordinates")]
+        public Vector3Float LocationInEntityCoordinates
+        {
+            get
+            {
+                return this._locationInEntityCoordinates;
+            }
+
+            set
+            {
+                this._locationInEntityCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the result of the explosion
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "detonationResult")]
+        public byte DetonationResult
+        {
+            get
+            {
+                return this._detonationResult;
+            }
+
+            set
+            {
+                this._detonationResult = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many articulation parameters we have
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
+        public byte NumberOfArticulationParameters
+        {
+            get
+            {
+                return this._numberOfArticulationParameters;
+            }
+
+            set
+            {
+                this._numberOfArticulationParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "pad")]
+        public short Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the articulationParameters
+        /// </summary>
+        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
+        public List<ArticulationParameter> ArticulationParameters
+        {
+            get
+            {
+                return this._articulationParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    this._velocity.Marshal(dos);
+                    this._locationInWorldCoordinates.Marshal(dos);
+                    this._burstDescriptor.Marshal(dos);
+                    this._locationInEntityCoordinates.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._detonationResult);
+                    dos.WriteUnsignedByte((byte)this._articulationParameters.Count);
+                    dos.WriteShort((short)this._pad);
+
+                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                    {
+                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                        aArticulationParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._velocity.Unmarshal(dis);
+                    this._locationInWorldCoordinates.Unmarshal(dis);
+                    this._burstDescriptor.Unmarshal(dis);
+                    this._locationInEntityCoordinates.Unmarshal(dis);
+                    this._detonationResult = dis.ReadUnsignedByte();
+                    this._numberOfArticulationParameters = dis.ReadUnsignedByte();
+                    this._pad = dis.ReadShort();
+
+                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
+                    {
+                        ArticulationParameter anX = new ArticulationParameter();
+                        anX.Unmarshal(dis);
+                        this._articulationParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DetonationPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<munitionID>");
+                this._munitionID.Reflection(sb);
+                sb.AppendLine("</munitionID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<locationInWorldCoordinates>");
+                this._locationInWorldCoordinates.Reflection(sb);
+                sb.AppendLine("</locationInWorldCoordinates>");
+                sb.AppendLine("<burstDescriptor>");
+                this._burstDescriptor.Reflection(sb);
+                sb.AppendLine("</burstDescriptor>");
+                sb.AppendLine("<locationInEntityCoordinates>");
+                this._locationInEntityCoordinates.Reflection(sb);
+                sb.AppendLine("</locationInEntityCoordinates>");
+                sb.AppendLine("<detonationResult type=\"byte\">" + this._detonationResult.ToString(CultureInfo.InvariantCulture) + "</detonationResult>");
+                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
+                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
+                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                    aArticulationParameter.Reflection(sb);
+                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DetonationPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DetonationPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DetonationPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._munitionID.Equals(obj._munitionID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationInEntityCoordinates.Equals(obj._locationInEntityCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._detonationResult != obj._detonationResult)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._articulationParameters.Count != obj._articulationParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
+            result = GenerateHash(result) ^ this._locationInEntityCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._detonationResult.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+
+            if (this._articulationParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
index 963ee06..cf9748d 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/DistributedEmissionsFamilyPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.7. Electronic Emissions. Abstract superclass for distirubted emissions PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class DistributedEmissionsFamilyPdu : Pdu, IEquatable<DistributedEmissionsFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DistributedEmissionsFamilyPdu"/> class.
-        /// </summary>
-        public DistributedEmissionsFamilyPdu()
-        {
-            ProtocolFamily = (byte)6;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<DistributedEmissionsFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</DistributedEmissionsFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as DistributedEmissionsFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(DistributedEmissionsFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.7. Electronic Emissions. Abstract superclass for distirubted emissions PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class DistributedEmissionsFamilyPdu : Pdu, IEquatable<DistributedEmissionsFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DistributedEmissionsFamilyPdu"/> class.
+        /// </summary>
+        public DistributedEmissionsFamilyPdu()
+        {
+            ProtocolFamily = (byte)6;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DistributedEmissionsFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</DistributedEmissionsFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DistributedEmissionsFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DistributedEmissionsFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EightByteChunk.cs b/Libs/CsharpDis6/Dis1998/Generated/EightByteChunk.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EightByteChunk.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EightByteChunk.cs
index a3bfe4f..5337424 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EightByteChunk.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EightByteChunk.cs
@@ -1,324 +1,324 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 64 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EightByteChunk
-    {
-        /// <summary>
-        /// Eight bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[8];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EightByteChunk"/> class.
-        /// </summary>
-        public EightByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EightByteChunk left, EightByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EightByteChunk left, EightByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 8 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Eight bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EightByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</EightByteChunk>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EightByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EightByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 8) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 8; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            for (int idx = 0; idx < 8; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 64 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EightByteChunk
+    {
+        /// <summary>
+        /// Eight bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[8];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EightByteChunk"/> class.
+        /// </summary>
+        public EightByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EightByteChunk left, EightByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EightByteChunk left, EightByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 8 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Eight bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EightByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</EightByteChunk>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EightByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EightByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 8) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 8; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            for (int idx = 0; idx < 8; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs b/Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionBeamData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionBeamData.cs
index 5efd4a6..75eff7e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionBeamData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionBeamData.cs
@@ -1,633 +1,633 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Description of one electronic emission beam
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FundamentalParameterData))]
-    [XmlInclude(typeof(TrackJamTarget))]
-    public partial class ElectronicEmissionBeamData
-    {
-        /// <summary>
-        /// This field shall specify the length of this beams data in 32 bit words
-        /// </summary>
-        private byte _beamDataLength;
-
-        /// <summary>
-        /// This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system.
-        /// </summary>
-        private byte _beamIDNumber;
-
-        /// <summary>
-        /// This field shall specify a Beam Parameter Index number that shall be used by receiving entities in conjunction with the Emitter Name field to provide a pointer to the stored database parameters required to regenerate the beam. 
-        /// </summary>
-        private ushort _beamParameterIndex;
-
-        /// <summary>
-        /// Fundamental parameter data such as frequency range, beam sweep, etc.
-        /// </summary>
-        private FundamentalParameterData _fundamentalParameterData = new FundamentalParameterData();
-
-        /// <summary>
-        /// beam function of a particular beam
-        /// </summary>
-        private byte _beamFunction;
-
-        /// <summary>
-        /// Number of track/jam targets
-        /// </summary>
-        private byte _numberOfTrackJamTargets;
-
-        /// <summary>
-        /// wheher or not the receiving simulation apps can assume all the targets in the scan pattern are being tracked/jammed
-        /// </summary>
-        private byte _highDensityTrackJam;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad4;
-
-        /// <summary>
-        /// identify jamming techniques used
-        /// </summary>
-        private uint _jammingModeSequence;
-
-        /// <summary>
-        /// variable length list of track/jam targets
-        /// </summary>
-        private List<TrackJamTarget> _trackJamTargets = new List<TrackJamTarget>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ElectronicEmissionBeamData"/> class.
-        /// </summary>
-        public ElectronicEmissionBeamData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ElectronicEmissionBeamData left, ElectronicEmissionBeamData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ElectronicEmissionBeamData left, ElectronicEmissionBeamData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._beamDataLength
-            marshalSize += 1;  // this._beamIDNumber
-            marshalSize += 2;  // this._beamParameterIndex
-            marshalSize += this._fundamentalParameterData.GetMarshalledSize();  // this._fundamentalParameterData
-            marshalSize += 1;  // this._beamFunction
-            marshalSize += 1;  // this._numberOfTrackJamTargets
-            marshalSize += 1;  // this._highDensityTrackJam
-            marshalSize += 1;  // this._pad4
-            marshalSize += 4;  // this._jammingModeSequence
-            for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
-            {
-                TrackJamTarget listElement = (TrackJamTarget)this._trackJamTargets[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the length of this beams data in 32 bit words
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamDataLength")]
-        public byte BeamDataLength
-        {
-            get
-            {
-                return this._beamDataLength;
-            }
-
-            set
-            {
-                this._beamDataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamIDNumber")]
-        public byte BeamIDNumber
-        {
-            get
-            {
-                return this._beamIDNumber;
-            }
-
-            set
-            {
-                this._beamIDNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify a Beam Parameter Index number that shall be used by receiving entities in conjunction with the Emitter Name field to provide a pointer to the stored database parameters required to regenerate the beam. 
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "beamParameterIndex")]
-        public ushort BeamParameterIndex
-        {
-            get
-            {
-                return this._beamParameterIndex;
-            }
-
-            set
-            {
-                this._beamParameterIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fundamental parameter data such as frequency range, beam sweep, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(FundamentalParameterData), ElementName = "fundamentalParameterData")]
-        public FundamentalParameterData FundamentalParameterData
-        {
-            get
-            {
-                return this._fundamentalParameterData;
-            }
-
-            set
-            {
-                this._fundamentalParameterData = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the beam function of a particular beam
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamFunction")]
-        public byte BeamFunction
-        {
-            get
-            {
-                return this._beamFunction;
-            }
-
-            set
-            {
-                this._beamFunction = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of track/jam targets
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfTrackJamTargets method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfTrackJamTargets")]
-        public byte NumberOfTrackJamTargets
-        {
-            get
-            {
-                return this._numberOfTrackJamTargets;
-            }
-
-            set
-            {
-                this._numberOfTrackJamTargets = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the wheher or not the receiving simulation apps can assume all the targets in the scan pattern are being tracked/jammed
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "highDensityTrackJam")]
-        public byte HighDensityTrackJam
-        {
-            get
-            {
-                return this._highDensityTrackJam;
-            }
-
-            set
-            {
-                this._highDensityTrackJam = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad4")]
-        public byte Pad4
-        {
-            get
-            {
-                return this._pad4;
-            }
-
-            set
-            {
-                this._pad4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the identify jamming techniques used
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "jammingModeSequence")]
-        public uint JammingModeSequence
-        {
-            get
-            {
-                return this._jammingModeSequence;
-            }
-
-            set
-            {
-                this._jammingModeSequence = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of track/jam targets
-        /// </summary>
-        [XmlElement(ElementName = "trackJamTargetsList", Type = typeof(List<TrackJamTarget>))]
-        public List<TrackJamTarget> TrackJamTargets
-        {
-            get
-            {
-                return this._trackJamTargets;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._beamDataLength);
-                    dos.WriteUnsignedByte((byte)this._beamIDNumber);
-                    dos.WriteUnsignedShort((ushort)this._beamParameterIndex);
-                    this._fundamentalParameterData.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._beamFunction);
-                    dos.WriteUnsignedByte((byte)this._trackJamTargets.Count);
-                    dos.WriteUnsignedByte((byte)this._highDensityTrackJam);
-                    dos.WriteUnsignedByte((byte)this._pad4);
-                    dos.WriteUnsignedInt((uint)this._jammingModeSequence);
-
-                    for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
-                    {
-                        TrackJamTarget aTrackJamTarget = (TrackJamTarget)this._trackJamTargets[idx];
-                        aTrackJamTarget.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._beamDataLength = dis.ReadUnsignedByte();
-                    this._beamIDNumber = dis.ReadUnsignedByte();
-                    this._beamParameterIndex = dis.ReadUnsignedShort();
-                    this._fundamentalParameterData.Unmarshal(dis);
-                    this._beamFunction = dis.ReadUnsignedByte();
-                    this._numberOfTrackJamTargets = dis.ReadUnsignedByte();
-                    this._highDensityTrackJam = dis.ReadUnsignedByte();
-                    this._pad4 = dis.ReadUnsignedByte();
-                    this._jammingModeSequence = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfTrackJamTargets; idx++)
-                    {
-                        TrackJamTarget anX = new TrackJamTarget();
-                        anX.Unmarshal(dis);
-                        this._trackJamTargets.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ElectronicEmissionBeamData>");
-            try
-            {
-                sb.AppendLine("<beamDataLength type=\"byte\">" + this._beamDataLength.ToString(CultureInfo.InvariantCulture) + "</beamDataLength>");
-                sb.AppendLine("<beamIDNumber type=\"byte\">" + this._beamIDNumber.ToString(CultureInfo.InvariantCulture) + "</beamIDNumber>");
-                sb.AppendLine("<beamParameterIndex type=\"ushort\">" + this._beamParameterIndex.ToString(CultureInfo.InvariantCulture) + "</beamParameterIndex>");
-                sb.AppendLine("<fundamentalParameterData>");
-                this._fundamentalParameterData.Reflection(sb);
-                sb.AppendLine("</fundamentalParameterData>");
-                sb.AppendLine("<beamFunction type=\"byte\">" + this._beamFunction.ToString(CultureInfo.InvariantCulture) + "</beamFunction>");
-                sb.AppendLine("<trackJamTargets type=\"byte\">" + this._trackJamTargets.Count.ToString(CultureInfo.InvariantCulture) + "</trackJamTargets>");
-                sb.AppendLine("<highDensityTrackJam type=\"byte\">" + this._highDensityTrackJam.ToString(CultureInfo.InvariantCulture) + "</highDensityTrackJam>");
-                sb.AppendLine("<pad4 type=\"byte\">" + this._pad4.ToString(CultureInfo.InvariantCulture) + "</pad4>");
-                sb.AppendLine("<jammingModeSequence type=\"uint\">" + this._jammingModeSequence.ToString(CultureInfo.InvariantCulture) + "</jammingModeSequence>");
-                for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
-                {
-                    sb.AppendLine("<trackJamTargets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TrackJamTarget\">");
-                    TrackJamTarget aTrackJamTarget = (TrackJamTarget)this._trackJamTargets[idx];
-                    aTrackJamTarget.Reflection(sb);
-                    sb.AppendLine("</trackJamTargets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ElectronicEmissionBeamData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ElectronicEmissionBeamData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ElectronicEmissionBeamData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._beamDataLength != obj._beamDataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamIDNumber != obj._beamIDNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamParameterIndex != obj._beamParameterIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._fundamentalParameterData.Equals(obj._fundamentalParameterData))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamFunction != obj._beamFunction)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfTrackJamTargets != obj._numberOfTrackJamTargets)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._highDensityTrackJam != obj._highDensityTrackJam)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad4 != obj._pad4)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._jammingModeSequence != obj._jammingModeSequence)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._trackJamTargets.Count != obj._trackJamTargets.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
-                {
-                    if (!this._trackJamTargets[idx].Equals(obj._trackJamTargets[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._beamDataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._beamIDNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._beamParameterIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._fundamentalParameterData.GetHashCode();
-            result = GenerateHash(result) ^ this._beamFunction.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfTrackJamTargets.GetHashCode();
-            result = GenerateHash(result) ^ this._highDensityTrackJam.GetHashCode();
-            result = GenerateHash(result) ^ this._pad4.GetHashCode();
-            result = GenerateHash(result) ^ this._jammingModeSequence.GetHashCode();
-
-            if (this._trackJamTargets.Count > 0)
-            {
-                for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._trackJamTargets[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Description of one electronic emission beam
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FundamentalParameterData))]
+    [XmlInclude(typeof(TrackJamTarget))]
+    public partial class ElectronicEmissionBeamData
+    {
+        /// <summary>
+        /// This field shall specify the length of this beams data in 32 bit words
+        /// </summary>
+        private byte _beamDataLength;
+
+        /// <summary>
+        /// This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system.
+        /// </summary>
+        private byte _beamIDNumber;
+
+        /// <summary>
+        /// This field shall specify a Beam Parameter Index number that shall be used by receiving entities in conjunction with the Emitter Name field to provide a pointer to the stored database parameters required to regenerate the beam. 
+        /// </summary>
+        private ushort _beamParameterIndex;
+
+        /// <summary>
+        /// Fundamental parameter data such as frequency range, beam sweep, etc.
+        /// </summary>
+        private FundamentalParameterData _fundamentalParameterData = new FundamentalParameterData();
+
+        /// <summary>
+        /// beam function of a particular beam
+        /// </summary>
+        private byte _beamFunction;
+
+        /// <summary>
+        /// Number of track/jam targets
+        /// </summary>
+        private byte _numberOfTrackJamTargets;
+
+        /// <summary>
+        /// wheher or not the receiving simulation apps can assume all the targets in the scan pattern are being tracked/jammed
+        /// </summary>
+        private byte _highDensityTrackJam;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad4;
+
+        /// <summary>
+        /// identify jamming techniques used
+        /// </summary>
+        private uint _jammingModeSequence;
+
+        /// <summary>
+        /// variable length list of track/jam targets
+        /// </summary>
+        private List<TrackJamTarget> _trackJamTargets = new List<TrackJamTarget>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ElectronicEmissionBeamData"/> class.
+        /// </summary>
+        public ElectronicEmissionBeamData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ElectronicEmissionBeamData left, ElectronicEmissionBeamData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ElectronicEmissionBeamData left, ElectronicEmissionBeamData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._beamDataLength
+            marshalSize += 1;  // this._beamIDNumber
+            marshalSize += 2;  // this._beamParameterIndex
+            marshalSize += this._fundamentalParameterData.GetMarshalledSize();  // this._fundamentalParameterData
+            marshalSize += 1;  // this._beamFunction
+            marshalSize += 1;  // this._numberOfTrackJamTargets
+            marshalSize += 1;  // this._highDensityTrackJam
+            marshalSize += 1;  // this._pad4
+            marshalSize += 4;  // this._jammingModeSequence
+            for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
+            {
+                TrackJamTarget listElement = (TrackJamTarget)this._trackJamTargets[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the length of this beams data in 32 bit words
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamDataLength")]
+        public byte BeamDataLength
+        {
+            get
+            {
+                return this._beamDataLength;
+            }
+
+            set
+            {
+                this._beamDataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamIDNumber")]
+        public byte BeamIDNumber
+        {
+            get
+            {
+                return this._beamIDNumber;
+            }
+
+            set
+            {
+                this._beamIDNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify a Beam Parameter Index number that shall be used by receiving entities in conjunction with the Emitter Name field to provide a pointer to the stored database parameters required to regenerate the beam. 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "beamParameterIndex")]
+        public ushort BeamParameterIndex
+        {
+            get
+            {
+                return this._beamParameterIndex;
+            }
+
+            set
+            {
+                this._beamParameterIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fundamental parameter data such as frequency range, beam sweep, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(FundamentalParameterData), ElementName = "fundamentalParameterData")]
+        public FundamentalParameterData FundamentalParameterData
+        {
+            get
+            {
+                return this._fundamentalParameterData;
+            }
+
+            set
+            {
+                this._fundamentalParameterData = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the beam function of a particular beam
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamFunction")]
+        public byte BeamFunction
+        {
+            get
+            {
+                return this._beamFunction;
+            }
+
+            set
+            {
+                this._beamFunction = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of track/jam targets
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfTrackJamTargets method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfTrackJamTargets")]
+        public byte NumberOfTrackJamTargets
+        {
+            get
+            {
+                return this._numberOfTrackJamTargets;
+            }
+
+            set
+            {
+                this._numberOfTrackJamTargets = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wheher or not the receiving simulation apps can assume all the targets in the scan pattern are being tracked/jammed
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "highDensityTrackJam")]
+        public byte HighDensityTrackJam
+        {
+            get
+            {
+                return this._highDensityTrackJam;
+            }
+
+            set
+            {
+                this._highDensityTrackJam = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad4")]
+        public byte Pad4
+        {
+            get
+            {
+                return this._pad4;
+            }
+
+            set
+            {
+                this._pad4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the identify jamming techniques used
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "jammingModeSequence")]
+        public uint JammingModeSequence
+        {
+            get
+            {
+                return this._jammingModeSequence;
+            }
+
+            set
+            {
+                this._jammingModeSequence = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of track/jam targets
+        /// </summary>
+        [XmlElement(ElementName = "trackJamTargetsList", Type = typeof(List<TrackJamTarget>))]
+        public List<TrackJamTarget> TrackJamTargets
+        {
+            get
+            {
+                return this._trackJamTargets;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._beamDataLength);
+                    dos.WriteUnsignedByte((byte)this._beamIDNumber);
+                    dos.WriteUnsignedShort((ushort)this._beamParameterIndex);
+                    this._fundamentalParameterData.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._beamFunction);
+                    dos.WriteUnsignedByte((byte)this._trackJamTargets.Count);
+                    dos.WriteUnsignedByte((byte)this._highDensityTrackJam);
+                    dos.WriteUnsignedByte((byte)this._pad4);
+                    dos.WriteUnsignedInt((uint)this._jammingModeSequence);
+
+                    for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
+                    {
+                        TrackJamTarget aTrackJamTarget = (TrackJamTarget)this._trackJamTargets[idx];
+                        aTrackJamTarget.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamDataLength = dis.ReadUnsignedByte();
+                    this._beamIDNumber = dis.ReadUnsignedByte();
+                    this._beamParameterIndex = dis.ReadUnsignedShort();
+                    this._fundamentalParameterData.Unmarshal(dis);
+                    this._beamFunction = dis.ReadUnsignedByte();
+                    this._numberOfTrackJamTargets = dis.ReadUnsignedByte();
+                    this._highDensityTrackJam = dis.ReadUnsignedByte();
+                    this._pad4 = dis.ReadUnsignedByte();
+                    this._jammingModeSequence = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfTrackJamTargets; idx++)
+                    {
+                        TrackJamTarget anX = new TrackJamTarget();
+                        anX.Unmarshal(dis);
+                        this._trackJamTargets.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ElectronicEmissionBeamData>");
+            try
+            {
+                sb.AppendLine("<beamDataLength type=\"byte\">" + this._beamDataLength.ToString(CultureInfo.InvariantCulture) + "</beamDataLength>");
+                sb.AppendLine("<beamIDNumber type=\"byte\">" + this._beamIDNumber.ToString(CultureInfo.InvariantCulture) + "</beamIDNumber>");
+                sb.AppendLine("<beamParameterIndex type=\"ushort\">" + this._beamParameterIndex.ToString(CultureInfo.InvariantCulture) + "</beamParameterIndex>");
+                sb.AppendLine("<fundamentalParameterData>");
+                this._fundamentalParameterData.Reflection(sb);
+                sb.AppendLine("</fundamentalParameterData>");
+                sb.AppendLine("<beamFunction type=\"byte\">" + this._beamFunction.ToString(CultureInfo.InvariantCulture) + "</beamFunction>");
+                sb.AppendLine("<trackJamTargets type=\"byte\">" + this._trackJamTargets.Count.ToString(CultureInfo.InvariantCulture) + "</trackJamTargets>");
+                sb.AppendLine("<highDensityTrackJam type=\"byte\">" + this._highDensityTrackJam.ToString(CultureInfo.InvariantCulture) + "</highDensityTrackJam>");
+                sb.AppendLine("<pad4 type=\"byte\">" + this._pad4.ToString(CultureInfo.InvariantCulture) + "</pad4>");
+                sb.AppendLine("<jammingModeSequence type=\"uint\">" + this._jammingModeSequence.ToString(CultureInfo.InvariantCulture) + "</jammingModeSequence>");
+                for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
+                {
+                    sb.AppendLine("<trackJamTargets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TrackJamTarget\">");
+                    TrackJamTarget aTrackJamTarget = (TrackJamTarget)this._trackJamTargets[idx];
+                    aTrackJamTarget.Reflection(sb);
+                    sb.AppendLine("</trackJamTargets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ElectronicEmissionBeamData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ElectronicEmissionBeamData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ElectronicEmissionBeamData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._beamDataLength != obj._beamDataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamIDNumber != obj._beamIDNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamParameterIndex != obj._beamParameterIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._fundamentalParameterData.Equals(obj._fundamentalParameterData))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamFunction != obj._beamFunction)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfTrackJamTargets != obj._numberOfTrackJamTargets)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._highDensityTrackJam != obj._highDensityTrackJam)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad4 != obj._pad4)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._jammingModeSequence != obj._jammingModeSequence)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._trackJamTargets.Count != obj._trackJamTargets.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
+                {
+                    if (!this._trackJamTargets[idx].Equals(obj._trackJamTargets[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamDataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._beamIDNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._beamParameterIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._fundamentalParameterData.GetHashCode();
+            result = GenerateHash(result) ^ this._beamFunction.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfTrackJamTargets.GetHashCode();
+            result = GenerateHash(result) ^ this._highDensityTrackJam.GetHashCode();
+            result = GenerateHash(result) ^ this._pad4.GetHashCode();
+            result = GenerateHash(result) ^ this._jammingModeSequence.GetHashCode();
+
+            if (this._trackJamTargets.Count > 0)
+            {
+                for (int idx = 0; idx < this._trackJamTargets.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._trackJamTargets[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs b/Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionSystemData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionSystemData.cs
index e676463..f2df330 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionSystemData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionSystemData.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Data about one electronic system
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EmitterSystem))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(ElectronicEmissionBeamData))]
-    public partial class ElectronicEmissionSystemData
-    {
-        /// <summary>
-        /// This field shall specify the length of this emitter system?s data (including beam data and its track/jam information) in 32-bit words. The length shall include the System Data Length field. 
-        /// </summary>
-        private byte _systemDataLength;
-
-        /// <summary>
-        /// This field shall specify the number of beams being described in the current PDU for the system being described. 
-        /// </summary>
-        private byte _numberOfBeams;
-
-        /// <summary>
-        /// padding.
-        /// </summary>
-        private ushort _emissionsPadding2;
-
-        /// <summary>
-        /// This field shall specify information about a particular emitter system
-        /// </summary>
-        private EmitterSystem _emitterSystem = new EmitterSystem();
-
-        /// <summary>
-        /// Location with respect to the entity
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// variable length list of beam data records
-        /// </summary>
-        private List<ElectronicEmissionBeamData> _beamDataRecords = new List<ElectronicEmissionBeamData>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ElectronicEmissionSystemData"/> class.
-        /// </summary>
-        public ElectronicEmissionSystemData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ElectronicEmissionSystemData left, ElectronicEmissionSystemData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ElectronicEmissionSystemData left, ElectronicEmissionSystemData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._systemDataLength
-            marshalSize += 1;  // this._numberOfBeams
-            marshalSize += 2;  // this._emissionsPadding2
-            marshalSize += this._emitterSystem.GetMarshalledSize();  // this._emitterSystem
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
-            {
-                ElectronicEmissionBeamData listElement = (ElectronicEmissionBeamData)this._beamDataRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the length of this emitter system?s data (including beam data and its track/jam information) in 32-bit words. The length shall include the System Data Length field. 
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "systemDataLength")]
-        public byte SystemDataLength
-        {
-            get
-            {
-                return this._systemDataLength;
-            }
-
-            set
-            {
-                this._systemDataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the number of beams being described in the current PDU for the system being described. 
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfBeams method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
-        public byte NumberOfBeams
-        {
-            get
-            {
-                return this._numberOfBeams;
-            }
-
-            set
-            {
-                this._numberOfBeams = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "emissionsPadding2")]
-        public ushort EmissionsPadding2
-        {
-            get
-            {
-                return this._emissionsPadding2;
-            }
-
-            set
-            {
-                this._emissionsPadding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify information about a particular emitter system
-        /// </summary>
-        [XmlElement(Type = typeof(EmitterSystem), ElementName = "emitterSystem")]
-        public EmitterSystem EmitterSystem
-        {
-            get
-            {
-                return this._emitterSystem;
-            }
-
-            set
-            {
-                this._emitterSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location with respect to the entity
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of beam data records
-        /// </summary>
-        [XmlElement(ElementName = "beamDataRecordsList", Type = typeof(List<ElectronicEmissionBeamData>))]
-        public List<ElectronicEmissionBeamData> BeamDataRecords
-        {
-            get
-            {
-                return this._beamDataRecords;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._systemDataLength);
-                    dos.WriteUnsignedByte((byte)this._beamDataRecords.Count);
-                    dos.WriteUnsignedShort((ushort)this._emissionsPadding2);
-                    this._emitterSystem.Marshal(dos);
-                    this._location.Marshal(dos);
-
-                    for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
-                    {
-                        ElectronicEmissionBeamData aElectronicEmissionBeamData = (ElectronicEmissionBeamData)this._beamDataRecords[idx];
-                        aElectronicEmissionBeamData.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._systemDataLength = dis.ReadUnsignedByte();
-                    this._numberOfBeams = dis.ReadUnsignedByte();
-                    this._emissionsPadding2 = dis.ReadUnsignedShort();
-                    this._emitterSystem.Unmarshal(dis);
-                    this._location.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this.NumberOfBeams; idx++)
-                    {
-                        ElectronicEmissionBeamData anX = new ElectronicEmissionBeamData();
-                        anX.Unmarshal(dis);
-                        this._beamDataRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ElectronicEmissionSystemData>");
-            try
-            {
-                sb.AppendLine("<systemDataLength type=\"byte\">" + this._systemDataLength.ToString(CultureInfo.InvariantCulture) + "</systemDataLength>");
-                sb.AppendLine("<beamDataRecords type=\"byte\">" + this._beamDataRecords.Count.ToString(CultureInfo.InvariantCulture) + "</beamDataRecords>");
-                sb.AppendLine("<emissionsPadding2 type=\"ushort\">" + this._emissionsPadding2.ToString(CultureInfo.InvariantCulture) + "</emissionsPadding2>");
-                sb.AppendLine("<emitterSystem>");
-                this._emitterSystem.Reflection(sb);
-                sb.AppendLine("</emitterSystem>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
-                {
-                    sb.AppendLine("<beamDataRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ElectronicEmissionBeamData\">");
-                    ElectronicEmissionBeamData aElectronicEmissionBeamData = (ElectronicEmissionBeamData)this._beamDataRecords[idx];
-                    aElectronicEmissionBeamData.Reflection(sb);
-                    sb.AppendLine("</beamDataRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ElectronicEmissionSystemData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ElectronicEmissionSystemData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ElectronicEmissionSystemData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._systemDataLength != obj._systemDataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfBeams != obj._numberOfBeams)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emissionsPadding2 != obj._emissionsPadding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._emitterSystem.Equals(obj._emitterSystem))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamDataRecords.Count != obj._beamDataRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
-                {
-                    if (!this._beamDataRecords[idx].Equals(obj._beamDataRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._systemDataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
-            result = GenerateHash(result) ^ this._emissionsPadding2.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-
-            if (this._beamDataRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._beamDataRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Data about one electronic system
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EmitterSystem))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(ElectronicEmissionBeamData))]
+    public partial class ElectronicEmissionSystemData
+    {
+        /// <summary>
+        /// This field shall specify the length of this emitter system?s data (including beam data and its track/jam information) in 32-bit words. The length shall include the System Data Length field. 
+        /// </summary>
+        private byte _systemDataLength;
+
+        /// <summary>
+        /// This field shall specify the number of beams being described in the current PDU for the system being described. 
+        /// </summary>
+        private byte _numberOfBeams;
+
+        /// <summary>
+        /// padding.
+        /// </summary>
+        private ushort _emissionsPadding2;
+
+        /// <summary>
+        /// This field shall specify information about a particular emitter system
+        /// </summary>
+        private EmitterSystem _emitterSystem = new EmitterSystem();
+
+        /// <summary>
+        /// Location with respect to the entity
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// variable length list of beam data records
+        /// </summary>
+        private List<ElectronicEmissionBeamData> _beamDataRecords = new List<ElectronicEmissionBeamData>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ElectronicEmissionSystemData"/> class.
+        /// </summary>
+        public ElectronicEmissionSystemData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ElectronicEmissionSystemData left, ElectronicEmissionSystemData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ElectronicEmissionSystemData left, ElectronicEmissionSystemData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._systemDataLength
+            marshalSize += 1;  // this._numberOfBeams
+            marshalSize += 2;  // this._emissionsPadding2
+            marshalSize += this._emitterSystem.GetMarshalledSize();  // this._emitterSystem
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
+            {
+                ElectronicEmissionBeamData listElement = (ElectronicEmissionBeamData)this._beamDataRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the length of this emitter system?s data (including beam data and its track/jam information) in 32-bit words. The length shall include the System Data Length field. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "systemDataLength")]
+        public byte SystemDataLength
+        {
+            get
+            {
+                return this._systemDataLength;
+            }
+
+            set
+            {
+                this._systemDataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the number of beams being described in the current PDU for the system being described. 
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfBeams method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
+        public byte NumberOfBeams
+        {
+            get
+            {
+                return this._numberOfBeams;
+            }
+
+            set
+            {
+                this._numberOfBeams = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "emissionsPadding2")]
+        public ushort EmissionsPadding2
+        {
+            get
+            {
+                return this._emissionsPadding2;
+            }
+
+            set
+            {
+                this._emissionsPadding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify information about a particular emitter system
+        /// </summary>
+        [XmlElement(Type = typeof(EmitterSystem), ElementName = "emitterSystem")]
+        public EmitterSystem EmitterSystem
+        {
+            get
+            {
+                return this._emitterSystem;
+            }
+
+            set
+            {
+                this._emitterSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location with respect to the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of beam data records
+        /// </summary>
+        [XmlElement(ElementName = "beamDataRecordsList", Type = typeof(List<ElectronicEmissionBeamData>))]
+        public List<ElectronicEmissionBeamData> BeamDataRecords
+        {
+            get
+            {
+                return this._beamDataRecords;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._systemDataLength);
+                    dos.WriteUnsignedByte((byte)this._beamDataRecords.Count);
+                    dos.WriteUnsignedShort((ushort)this._emissionsPadding2);
+                    this._emitterSystem.Marshal(dos);
+                    this._location.Marshal(dos);
+
+                    for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
+                    {
+                        ElectronicEmissionBeamData aElectronicEmissionBeamData = (ElectronicEmissionBeamData)this._beamDataRecords[idx];
+                        aElectronicEmissionBeamData.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._systemDataLength = dis.ReadUnsignedByte();
+                    this._numberOfBeams = dis.ReadUnsignedByte();
+                    this._emissionsPadding2 = dis.ReadUnsignedShort();
+                    this._emitterSystem.Unmarshal(dis);
+                    this._location.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this.NumberOfBeams; idx++)
+                    {
+                        ElectronicEmissionBeamData anX = new ElectronicEmissionBeamData();
+                        anX.Unmarshal(dis);
+                        this._beamDataRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ElectronicEmissionSystemData>");
+            try
+            {
+                sb.AppendLine("<systemDataLength type=\"byte\">" + this._systemDataLength.ToString(CultureInfo.InvariantCulture) + "</systemDataLength>");
+                sb.AppendLine("<beamDataRecords type=\"byte\">" + this._beamDataRecords.Count.ToString(CultureInfo.InvariantCulture) + "</beamDataRecords>");
+                sb.AppendLine("<emissionsPadding2 type=\"ushort\">" + this._emissionsPadding2.ToString(CultureInfo.InvariantCulture) + "</emissionsPadding2>");
+                sb.AppendLine("<emitterSystem>");
+                this._emitterSystem.Reflection(sb);
+                sb.AppendLine("</emitterSystem>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
+                {
+                    sb.AppendLine("<beamDataRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ElectronicEmissionBeamData\">");
+                    ElectronicEmissionBeamData aElectronicEmissionBeamData = (ElectronicEmissionBeamData)this._beamDataRecords[idx];
+                    aElectronicEmissionBeamData.Reflection(sb);
+                    sb.AppendLine("</beamDataRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ElectronicEmissionSystemData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ElectronicEmissionSystemData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ElectronicEmissionSystemData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._systemDataLength != obj._systemDataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfBeams != obj._numberOfBeams)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emissionsPadding2 != obj._emissionsPadding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._emitterSystem.Equals(obj._emitterSystem))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamDataRecords.Count != obj._beamDataRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
+                {
+                    if (!this._beamDataRecords[idx].Equals(obj._beamDataRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._systemDataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
+            result = GenerateHash(result) ^ this._emissionsPadding2.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+
+            if (this._beamDataRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._beamDataRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._beamDataRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionsPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionsPdu.cs
index fc003cc..5c61000 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ElectronicEmissionsPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ElectronicEmissionsPdu.cs
@@ -1,512 +1,512 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be communicated using an Electromagnetic Emission PDU. COMPLETE (I think)
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(ElectronicEmissionSystemData))]
-    public partial class ElectronicEmissionsPdu : DistributedEmissionsFamilyPdu, IEquatable<ElectronicEmissionsPdu>
-    {
-        /// <summary>
-        /// ID of the entity emitting
-        /// </summary>
-        private EntityID _emittingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
-        /// </summary>
-        private byte _stateUpdateIndicator;
-
-        /// <summary>
-        /// This field shall specify the number of emission systems being described in the current PDU.
-        /// </summary>
-        private byte _numberOfSystems;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _paddingForEmissionsPdu;
-
-        /// <summary>
-        /// Electronic emmissions systems
-        /// </summary>
-        private List<ElectronicEmissionSystemData> _systems = new List<ElectronicEmissionSystemData>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ElectronicEmissionsPdu"/> class.
-        /// </summary>
-        public ElectronicEmissionsPdu()
-        {
-            PduType = (byte)23;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._stateUpdateIndicator
-            marshalSize += 1;  // this._numberOfSystems
-            marshalSize += 2;  // this._paddingForEmissionsPdu
-            for (int idx = 0; idx < this._systems.Count; idx++)
-            {
-                ElectronicEmissionSystemData listElement = (ElectronicEmissionSystemData)this._systems[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity emitting
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
-        public EntityID EmittingEntityID
-        {
-            get
-            {
-                return this._emittingEntityID;
-            }
-
-            set
-            {
-                this._emittingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "stateUpdateIndicator")]
-        public byte StateUpdateIndicator
-        {
-            get
-            {
-                return this._stateUpdateIndicator;
-            }
-
-            set
-            {
-                this._stateUpdateIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the number of emission systems being described in the current PDU.
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSystems")]
-        public byte NumberOfSystems
-        {
-            get
-            {
-                return this._numberOfSystems;
-            }
-
-            set
-            {
-                this._numberOfSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "paddingForEmissionsPdu")]
-        public ushort PaddingForEmissionsPdu
-        {
-            get
-            {
-                return this._paddingForEmissionsPdu;
-            }
-
-            set
-            {
-                this._paddingForEmissionsPdu = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Electronic emmissions systems
-        /// </summary>
-        [XmlElement(ElementName = "systemsList", Type = typeof(List<ElectronicEmissionSystemData>))]
-        public List<ElectronicEmissionSystemData> Systems
-        {
-            get
-            {
-                return this._systems;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._stateUpdateIndicator);
-                    dos.WriteUnsignedByte((byte)this._systems.Count);
-                    dos.WriteUnsignedShort((ushort)this._paddingForEmissionsPdu);
-
-                    for (int idx = 0; idx < this._systems.Count; idx++)
-                    {
-                        ElectronicEmissionSystemData aElectronicEmissionSystemData = (ElectronicEmissionSystemData)this._systems[idx];
-                        aElectronicEmissionSystemData.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._stateUpdateIndicator = dis.ReadUnsignedByte();
-                    this._numberOfSystems = dis.ReadUnsignedByte();
-                    this._paddingForEmissionsPdu = dis.ReadUnsignedShort();
-
-                    for (int idx = 0; idx < this.NumberOfSystems; idx++)
-                    {
-                        ElectronicEmissionSystemData anX = new ElectronicEmissionSystemData();
-                        anX.Unmarshal(dis);
-                        this._systems.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ElectronicEmissionsPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<emittingEntityID>");
-                this._emittingEntityID.Reflection(sb);
-                sb.AppendLine("</emittingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<stateUpdateIndicator type=\"byte\">" + this._stateUpdateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateUpdateIndicator>");
-                sb.AppendLine("<systems type=\"byte\">" + this._systems.Count.ToString(CultureInfo.InvariantCulture) + "</systems>");
-                sb.AppendLine("<paddingForEmissionsPdu type=\"ushort\">" + this._paddingForEmissionsPdu.ToString(CultureInfo.InvariantCulture) + "</paddingForEmissionsPdu>");
-                for (int idx = 0; idx < this._systems.Count; idx++)
-                {
-                    sb.AppendLine("<systems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ElectronicEmissionSystemData\">");
-                    ElectronicEmissionSystemData aElectronicEmissionSystemData = (ElectronicEmissionSystemData)this._systems[idx];
-                    aElectronicEmissionSystemData.Reflection(sb);
-                    sb.AppendLine("</systems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ElectronicEmissionsPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ElectronicEmissionsPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ElectronicEmissionsPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateUpdateIndicator != obj._stateUpdateIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSystems != obj._numberOfSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._paddingForEmissionsPdu != obj._paddingForEmissionsPdu)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systems.Count != obj._systems.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._systems.Count; idx++)
-                {
-                    if (!this._systems[idx].Equals(obj._systems[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._stateUpdateIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSystems.GetHashCode();
-            result = GenerateHash(result) ^ this._paddingForEmissionsPdu.GetHashCode();
-
-            if (this._systems.Count > 0)
-            {
-                for (int idx = 0; idx < this._systems.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._systems[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be communicated using an Electromagnetic Emission PDU. COMPLETE (I think)
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(ElectronicEmissionSystemData))]
+    public partial class ElectronicEmissionsPdu : DistributedEmissionsFamilyPdu, IEquatable<ElectronicEmissionsPdu>
+    {
+        /// <summary>
+        /// ID of the entity emitting
+        /// </summary>
+        private EntityID _emittingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
+        /// </summary>
+        private byte _stateUpdateIndicator;
+
+        /// <summary>
+        /// This field shall specify the number of emission systems being described in the current PDU.
+        /// </summary>
+        private byte _numberOfSystems;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _paddingForEmissionsPdu;
+
+        /// <summary>
+        /// Electronic emmissions systems
+        /// </summary>
+        private List<ElectronicEmissionSystemData> _systems = new List<ElectronicEmissionSystemData>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ElectronicEmissionsPdu"/> class.
+        /// </summary>
+        public ElectronicEmissionsPdu()
+        {
+            PduType = (byte)23;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._stateUpdateIndicator
+            marshalSize += 1;  // this._numberOfSystems
+            marshalSize += 2;  // this._paddingForEmissionsPdu
+            for (int idx = 0; idx < this._systems.Count; idx++)
+            {
+                ElectronicEmissionSystemData listElement = (ElectronicEmissionSystemData)this._systems[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity emitting
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
+        public EntityID EmittingEntityID
+        {
+            get
+            {
+                return this._emittingEntityID;
+            }
+
+            set
+            {
+                this._emittingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "stateUpdateIndicator")]
+        public byte StateUpdateIndicator
+        {
+            get
+            {
+                return this._stateUpdateIndicator;
+            }
+
+            set
+            {
+                this._stateUpdateIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the number of emission systems being described in the current PDU.
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSystems")]
+        public byte NumberOfSystems
+        {
+            get
+            {
+                return this._numberOfSystems;
+            }
+
+            set
+            {
+                this._numberOfSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "paddingForEmissionsPdu")]
+        public ushort PaddingForEmissionsPdu
+        {
+            get
+            {
+                return this._paddingForEmissionsPdu;
+            }
+
+            set
+            {
+                this._paddingForEmissionsPdu = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Electronic emmissions systems
+        /// </summary>
+        [XmlElement(ElementName = "systemsList", Type = typeof(List<ElectronicEmissionSystemData>))]
+        public List<ElectronicEmissionSystemData> Systems
+        {
+            get
+            {
+                return this._systems;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._stateUpdateIndicator);
+                    dos.WriteUnsignedByte((byte)this._systems.Count);
+                    dos.WriteUnsignedShort((ushort)this._paddingForEmissionsPdu);
+
+                    for (int idx = 0; idx < this._systems.Count; idx++)
+                    {
+                        ElectronicEmissionSystemData aElectronicEmissionSystemData = (ElectronicEmissionSystemData)this._systems[idx];
+                        aElectronicEmissionSystemData.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._stateUpdateIndicator = dis.ReadUnsignedByte();
+                    this._numberOfSystems = dis.ReadUnsignedByte();
+                    this._paddingForEmissionsPdu = dis.ReadUnsignedShort();
+
+                    for (int idx = 0; idx < this.NumberOfSystems; idx++)
+                    {
+                        ElectronicEmissionSystemData anX = new ElectronicEmissionSystemData();
+                        anX.Unmarshal(dis);
+                        this._systems.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ElectronicEmissionsPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<emittingEntityID>");
+                this._emittingEntityID.Reflection(sb);
+                sb.AppendLine("</emittingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<stateUpdateIndicator type=\"byte\">" + this._stateUpdateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateUpdateIndicator>");
+                sb.AppendLine("<systems type=\"byte\">" + this._systems.Count.ToString(CultureInfo.InvariantCulture) + "</systems>");
+                sb.AppendLine("<paddingForEmissionsPdu type=\"ushort\">" + this._paddingForEmissionsPdu.ToString(CultureInfo.InvariantCulture) + "</paddingForEmissionsPdu>");
+                for (int idx = 0; idx < this._systems.Count; idx++)
+                {
+                    sb.AppendLine("<systems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ElectronicEmissionSystemData\">");
+                    ElectronicEmissionSystemData aElectronicEmissionSystemData = (ElectronicEmissionSystemData)this._systems[idx];
+                    aElectronicEmissionSystemData.Reflection(sb);
+                    sb.AppendLine("</systems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ElectronicEmissionsPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ElectronicEmissionsPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ElectronicEmissionsPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateUpdateIndicator != obj._stateUpdateIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSystems != obj._numberOfSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._paddingForEmissionsPdu != obj._paddingForEmissionsPdu)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systems.Count != obj._systems.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._systems.Count; idx++)
+                {
+                    if (!this._systems[idx].Equals(obj._systems[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._stateUpdateIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSystems.GetHashCode();
+            result = GenerateHash(result) ^ this._paddingForEmissionsPdu.GetHashCode();
+
+            if (this._systems.Count > 0)
+            {
+                for (int idx = 0; idx < this._systems.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._systems[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EmitterSystem.cs b/Libs/CsharpDis6/Dis1998/Generated/EmitterSystem.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EmitterSystem.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EmitterSystem.cs
index 2b383d4..546f326 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EmitterSystem.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EmitterSystem.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.11. This field shall specify information about a particular emitter system
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EmitterSystem
-    {
-        /// <summary>
-        /// Name of the emitter, 16 bit enumeration
-        /// </summary>
-        private ushort _emitterName;
-
-        /// <summary>
-        /// function of the emitter, 8 bit enumeration
-        /// </summary>
-        private byte _function;
-
-        /// <summary>
-        /// emitter ID, 8 bit enumeration
-        /// </summary>
-        private byte _emitterIdNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmitterSystem"/> class.
-        /// </summary>
-        public EmitterSystem()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EmitterSystem left, EmitterSystem right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EmitterSystem left, EmitterSystem right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._emitterName
-            marshalSize += 1;  // this._function
-            marshalSize += 1;  // this._emitterIdNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Name of the emitter, 16 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "emitterName")]
-        public ushort EmitterName
-        {
-            get
-            {
-                return this._emitterName;
-            }
-
-            set
-            {
-                this._emitterName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the function of the emitter, 8 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "function")]
-        public byte Function
-        {
-            get
-            {
-                return this._function;
-            }
-
-            set
-            {
-                this._function = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the emitter ID, 8 bit enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "emitterIdNumber")]
-        public byte EmitterIdNumber
-        {
-            get
-            {
-                return this._emitterIdNumber;
-            }
-
-            set
-            {
-                this._emitterIdNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._emitterName);
-                    dos.WriteUnsignedByte((byte)this._function);
-                    dos.WriteUnsignedByte((byte)this._emitterIdNumber);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._emitterName = dis.ReadUnsignedShort();
-                    this._function = dis.ReadUnsignedByte();
-                    this._emitterIdNumber = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EmitterSystem>");
-            try
-            {
-                sb.AppendLine("<emitterName type=\"ushort\">" + this._emitterName.ToString(CultureInfo.InvariantCulture) + "</emitterName>");
-                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
-                sb.AppendLine("<emitterIdNumber type=\"byte\">" + this._emitterIdNumber.ToString(CultureInfo.InvariantCulture) + "</emitterIdNumber>");
-                sb.AppendLine("</EmitterSystem>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EmitterSystem;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EmitterSystem obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._emitterName != obj._emitterName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._function != obj._function)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterIdNumber != obj._emitterIdNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._emitterName.GetHashCode();
-            result = GenerateHash(result) ^ this._function.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterIdNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.11. This field shall specify information about a particular emitter system
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EmitterSystem
+    {
+        /// <summary>
+        /// Name of the emitter, 16 bit enumeration
+        /// </summary>
+        private ushort _emitterName;
+
+        /// <summary>
+        /// function of the emitter, 8 bit enumeration
+        /// </summary>
+        private byte _function;
+
+        /// <summary>
+        /// emitter ID, 8 bit enumeration
+        /// </summary>
+        private byte _emitterIdNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmitterSystem"/> class.
+        /// </summary>
+        public EmitterSystem()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EmitterSystem left, EmitterSystem right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EmitterSystem left, EmitterSystem right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._emitterName
+            marshalSize += 1;  // this._function
+            marshalSize += 1;  // this._emitterIdNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Name of the emitter, 16 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "emitterName")]
+        public ushort EmitterName
+        {
+            get
+            {
+                return this._emitterName;
+            }
+
+            set
+            {
+                this._emitterName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the function of the emitter, 8 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "function")]
+        public byte Function
+        {
+            get
+            {
+                return this._function;
+            }
+
+            set
+            {
+                this._function = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the emitter ID, 8 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "emitterIdNumber")]
+        public byte EmitterIdNumber
+        {
+            get
+            {
+                return this._emitterIdNumber;
+            }
+
+            set
+            {
+                this._emitterIdNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._emitterName);
+                    dos.WriteUnsignedByte((byte)this._function);
+                    dos.WriteUnsignedByte((byte)this._emitterIdNumber);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._emitterName = dis.ReadUnsignedShort();
+                    this._function = dis.ReadUnsignedByte();
+                    this._emitterIdNumber = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EmitterSystem>");
+            try
+            {
+                sb.AppendLine("<emitterName type=\"ushort\">" + this._emitterName.ToString(CultureInfo.InvariantCulture) + "</emitterName>");
+                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
+                sb.AppendLine("<emitterIdNumber type=\"byte\">" + this._emitterIdNumber.ToString(CultureInfo.InvariantCulture) + "</emitterIdNumber>");
+                sb.AppendLine("</EmitterSystem>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EmitterSystem;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EmitterSystem obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._emitterName != obj._emitterName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._function != obj._function)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterIdNumber != obj._emitterIdNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._emitterName.GetHashCode();
+            result = GenerateHash(result) ^ this._function.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterIdNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityID.cs b/Libs/CsharpDis6/Dis1998/Generated/EntityID.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityID.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EntityID.cs
index 176d96f..d75576b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityID.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EntityID.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityID
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// the entity ID
-        /// </summary>
-        private ushort _entity;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityID"/> class.
-        /// </summary>
-        public EntityID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityID left, EntityID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityID left, EntityID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            marshalSize += 2;  // this._entity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
-        public ushort Entity
-        {
-            get
-            {
-                return this._entity;
-            }
-
-            set
-            {
-                this._entity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                    dos.WriteUnsignedShort((ushort)this._entity);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                    this._entity = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityID>");
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
-                sb.AppendLine("</EntityID>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entity != obj._entity)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-            result = GenerateHash(result) ^ this._entity.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Each entity in a given DIS simulation application shall be given an entity identifier number unique to all other entities in that application. This identifier number is valid for the duration of the exercise; however,  entity identifier numbers may be reused when all possible numbers have been exhausted. No entity shall  have an entity identifier number of NO_ENTITY, ALL_ENTITIES, or RQST_ASSIGN_ID. The entity iden-  tifier number need not be registered or retained for future exercises. The entity identifier number shall be  specified by a 16-bit unsigned integer.  An entity identifier number equal to zero with valid site and application identification shall address a  simulation application. An entity identifier number equal to ALL_ENTITIES shall mean all entities within  the specified site and application. An entity identifier number equal to RQST_ASSIGN_ID allows the  receiver of the create entity to define the entity identifier number of the new entity.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityID
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// the entity ID
+        /// </summary>
+        private ushort _entity;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityID"/> class.
+        /// </summary>
+        public EntityID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityID left, EntityID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityID left, EntityID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            marshalSize += 2;  // this._entity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
+        public ushort Entity
+        {
+            get
+            {
+                return this._entity;
+            }
+
+            set
+            {
+                this._entity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                    dos.WriteUnsignedShort((ushort)this._entity);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                    this._entity = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityID>");
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
+                sb.AppendLine("</EntityID>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entity != obj._entity)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+            result = GenerateHash(result) ^ this._entity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/EntityInformationFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EntityInformationFamilyPdu.cs
index c7c29ae..6b053c7 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityInformationFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EntityInformationFamilyPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs. This should be abstract. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityInformationFamilyPdu : Pdu, IEquatable<EntityInformationFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityInformationFamilyPdu"/> class.
-        /// </summary>
-        public EntityInformationFamilyPdu()
-        {
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityInformationFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</EntityInformationFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityInformationFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityInformationFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs. This should be abstract. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityInformationFamilyPdu : Pdu, IEquatable<EntityInformationFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityInformationFamilyPdu"/> class.
+        /// </summary>
+        public EntityInformationFamilyPdu()
+        {
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityInformationFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</EntityInformationFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityInformationFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityInformationFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/EntityManagementFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EntityManagementFamilyPdu.cs
index 8e2dce0..c17dadd 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityManagementFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EntityManagementFamilyPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.9. Common superclass for EntityManagment PDUs, including aggregate state, isGroupOf, TransferControLRequest, and isPartOf
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityManagementFamilyPdu : Pdu, IEquatable<EntityManagementFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityManagementFamilyPdu"/> class.
-        /// </summary>
-        public EntityManagementFamilyPdu()
-        {
-            ProtocolFamily = (byte)7;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityManagementFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</EntityManagementFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityManagementFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityManagementFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.9. Common superclass for EntityManagment PDUs, including aggregate state, isGroupOf, TransferControLRequest, and isPartOf
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityManagementFamilyPdu : Pdu, IEquatable<EntityManagementFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityManagementFamilyPdu"/> class.
+        /// </summary>
+        public EntityManagementFamilyPdu()
+        {
+            ProtocolFamily = (byte)7;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityManagementFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</EntityManagementFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityManagementFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityManagementFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/EntityStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EntityStatePdu.cs
index d44fd87..9b11a07 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EntityStatePdu.cs
@@ -1,750 +1,750 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.3.1. Represents the postion and state of one entity in the world. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Orientation))]
-    [XmlInclude(typeof(DeadReckoningParameter))]
-    [XmlInclude(typeof(Marking))]
-    [XmlInclude(typeof(ArticulationParameter))]
-    public partial class EntityStatePdu : EntityInformationFamilyPdu, IEquatable<EntityStatePdu>
-    {
-        /// <summary>
-        /// Unique ID for an entity that is tied to this state information
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// What force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        private byte _forceId;
-
-        /// <summary>
-        /// How many articulation parameters are in the variable length list
-        /// </summary>
-        private byte _numberOfArticulationParameters;
-
-        /// <summary>
-        /// Describes the type of entity in the world
-        /// </summary>
-        private EntityType _entityType = new EntityType();
-
-        private EntityType _alternativeEntityType = new EntityType();
-
-        /// <summary>
-        /// Describes the speed of the entity in the world
-        /// </summary>
-        private Vector3Float _entityLinearVelocity = new Vector3Float();
-
-        /// <summary>
-        /// describes the location of the entity in the world
-        /// </summary>
-        private Vector3Double _entityLocation = new Vector3Double();
-
-        /// <summary>
-        /// describes the orientation of the entity, in euler angles
-        /// </summary>
-        private Orientation _entityOrientation = new Orientation();
-
-        /// <summary>
-        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        private int _entityAppearance;
-
-        /// <summary>
-        /// parameters used for dead reckoning
-        /// </summary>
-        private DeadReckoningParameter _deadReckoningParameters = new DeadReckoningParameter();
-
-        /// <summary>
-        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        private Marking _marking = new Marking();
-
-        /// <summary>
-        /// a series of bit flags
-        /// </summary>
-        private int _capabilities;
-
-        /// <summary>
-        /// variable length list of articulation parameters
-        /// </summary>
-        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityStatePdu"/> class.
-        /// </summary>
-        public EntityStatePdu()
-        {
-            PduType = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityStatePdu left, EntityStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityStatePdu left, EntityStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 1;  // this._forceId
-            marshalSize += 1;  // this._numberOfArticulationParameters
-            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
-            marshalSize += this._alternativeEntityType.GetMarshalledSize();  // this._alternativeEntityType
-            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
-            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
-            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
-            marshalSize += 4;  // this._entityAppearance
-            marshalSize += this._deadReckoningParameters.GetMarshalledSize();  // this._deadReckoningParameters
-            marshalSize += this._marking.GetMarshalledSize();  // this._marking
-            marshalSize += 4;  // this._capabilities
-            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-            {
-                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Unique ID for an entity that is tied to this state information
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the What force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
-        public byte ForceId
-        {
-            get
-            {
-                return this._forceId;
-            }
-
-            set
-            {
-                this._forceId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many articulation parameters are in the variable length list
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
-        public byte NumberOfArticulationParameters
-        {
-            get
-            {
-                return this._numberOfArticulationParameters;
-            }
-
-            set
-            {
-                this._numberOfArticulationParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the type of entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
-        public EntityType EntityType
-        {
-            get
-            {
-                return this._entityType;
-            }
-
-            set
-            {
-                this._entityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the alternativeEntityType
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "alternativeEntityType")]
-        public EntityType AlternativeEntityType
-        {
-            get
-            {
-                return this._alternativeEntityType;
-            }
-
-            set
-            {
-                this._alternativeEntityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the speed of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
-        public Vector3Float EntityLinearVelocity
-        {
-            get
-            {
-                return this._entityLinearVelocity;
-            }
-
-            set
-            {
-                this._entityLinearVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the location of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
-        public Vector3Double EntityLocation
-        {
-            get
-            {
-                return this._entityLocation;
-            }
-
-            set
-            {
-                this._entityLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the orientation of the entity, in euler angles
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "entityOrientation")]
-        public Orientation EntityOrientation
-        {
-            get
-            {
-                return this._entityOrientation;
-            }
-
-            set
-            {
-                this._entityOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
-        public int EntityAppearance
-        {
-            get
-            {
-                return this._entityAppearance;
-            }
-
-            set
-            {
-                this._entityAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameters used for dead reckoning
-        /// </summary>
-        [XmlElement(Type = typeof(DeadReckoningParameter), ElementName = "deadReckoningParameters")]
-        public DeadReckoningParameter DeadReckoningParameters
-        {
-            get
-            {
-                return this._deadReckoningParameters;
-            }
-
-            set
-            {
-                this._deadReckoningParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Marking), ElementName = "marking")]
-        public Marking Marking
-        {
-            get
-            {
-                return this._marking;
-            }
-
-            set
-            {
-                this._marking = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
-        public int Capabilities
-        {
-            get
-            {
-                return this._capabilities;
-            }
-
-            set
-            {
-                this._capabilities = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of articulation parameters
-        /// </summary>
-        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
-        public List<ArticulationParameter> ArticulationParameters
-        {
-            get
-            {
-                return this._articulationParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._forceId);
-                    dos.WriteByte((byte)this._articulationParameters.Count);
-                    this._entityType.Marshal(dos);
-                    this._alternativeEntityType.Marshal(dos);
-                    this._entityLinearVelocity.Marshal(dos);
-                    this._entityLocation.Marshal(dos);
-                    this._entityOrientation.Marshal(dos);
-                    dos.WriteInt((int)this._entityAppearance);
-                    this._deadReckoningParameters.Marshal(dos);
-                    this._marking.Marshal(dos);
-                    dos.WriteInt((int)this._capabilities);
-
-                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                    {
-                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                        aArticulationParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._forceId = dis.ReadUnsignedByte();
-                    this._numberOfArticulationParameters = dis.ReadByte();
-                    this._entityType.Unmarshal(dis);
-                    this._alternativeEntityType.Unmarshal(dis);
-                    this._entityLinearVelocity.Unmarshal(dis);
-                    this._entityLocation.Unmarshal(dis);
-                    this._entityOrientation.Unmarshal(dis);
-                    this._entityAppearance = dis.ReadInt();
-                    this._deadReckoningParameters.Unmarshal(dis);
-                    this._marking.Unmarshal(dis);
-                    this._capabilities = dis.ReadInt();
-
-                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
-                    {
-                        ArticulationParameter anX = new ArticulationParameter();
-                        anX.Unmarshal(dis);
-                        this._articulationParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
-                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
-                sb.AppendLine("<entityType>");
-                this._entityType.Reflection(sb);
-                sb.AppendLine("</entityType>");
-                sb.AppendLine("<alternativeEntityType>");
-                this._alternativeEntityType.Reflection(sb);
-                sb.AppendLine("</alternativeEntityType>");
-                sb.AppendLine("<entityLinearVelocity>");
-                this._entityLinearVelocity.Reflection(sb);
-                sb.AppendLine("</entityLinearVelocity>");
-                sb.AppendLine("<entityLocation>");
-                this._entityLocation.Reflection(sb);
-                sb.AppendLine("</entityLocation>");
-                sb.AppendLine("<entityOrientation>");
-                this._entityOrientation.Reflection(sb);
-                sb.AppendLine("</entityOrientation>");
-                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
-                sb.AppendLine("<deadReckoningParameters>");
-                this._deadReckoningParameters.Reflection(sb);
-                sb.AppendLine("</deadReckoningParameters>");
-                sb.AppendLine("<marking>");
-                this._marking.Reflection(sb);
-                sb.AppendLine("</marking>");
-                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
-                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                    aArticulationParameter.Reflection(sb);
-                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EntityStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceId != obj._forceId)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityType.Equals(obj._entityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._alternativeEntityType.Equals(obj._alternativeEntityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLocation.Equals(obj._entityLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityOrientation.Equals(obj._entityOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityAppearance != obj._entityAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._deadReckoningParameters.Equals(obj._deadReckoningParameters))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._marking.Equals(obj._marking))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._capabilities != obj._capabilities)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._articulationParameters.Count != obj._articulationParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._forceId.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._entityType.GetHashCode();
-            result = GenerateHash(result) ^ this._alternativeEntityType.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._marking.GetHashCode();
-            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
-
-            if (this._articulationParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.3.1. Represents the postion and state of one entity in the world. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Orientation))]
+    [XmlInclude(typeof(DeadReckoningParameter))]
+    [XmlInclude(typeof(Marking))]
+    [XmlInclude(typeof(ArticulationParameter))]
+    public partial class EntityStatePdu : EntityInformationFamilyPdu, IEquatable<EntityStatePdu>
+    {
+        /// <summary>
+        /// Unique ID for an entity that is tied to this state information
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// What force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        private byte _forceId;
+
+        /// <summary>
+        /// How many articulation parameters are in the variable length list
+        /// </summary>
+        private byte _numberOfArticulationParameters;
+
+        /// <summary>
+        /// Describes the type of entity in the world
+        /// </summary>
+        private EntityType _entityType = new EntityType();
+
+        private EntityType _alternativeEntityType = new EntityType();
+
+        /// <summary>
+        /// Describes the speed of the entity in the world
+        /// </summary>
+        private Vector3Float _entityLinearVelocity = new Vector3Float();
+
+        /// <summary>
+        /// describes the location of the entity in the world
+        /// </summary>
+        private Vector3Double _entityLocation = new Vector3Double();
+
+        /// <summary>
+        /// describes the orientation of the entity, in euler angles
+        /// </summary>
+        private Orientation _entityOrientation = new Orientation();
+
+        /// <summary>
+        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        private int _entityAppearance;
+
+        /// <summary>
+        /// parameters used for dead reckoning
+        /// </summary>
+        private DeadReckoningParameter _deadReckoningParameters = new DeadReckoningParameter();
+
+        /// <summary>
+        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        private Marking _marking = new Marking();
+
+        /// <summary>
+        /// a series of bit flags
+        /// </summary>
+        private int _capabilities;
+
+        /// <summary>
+        /// variable length list of articulation parameters
+        /// </summary>
+        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityStatePdu"/> class.
+        /// </summary>
+        public EntityStatePdu()
+        {
+            PduType = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityStatePdu left, EntityStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityStatePdu left, EntityStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 1;  // this._forceId
+            marshalSize += 1;  // this._numberOfArticulationParameters
+            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
+            marshalSize += this._alternativeEntityType.GetMarshalledSize();  // this._alternativeEntityType
+            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
+            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
+            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
+            marshalSize += 4;  // this._entityAppearance
+            marshalSize += this._deadReckoningParameters.GetMarshalledSize();  // this._deadReckoningParameters
+            marshalSize += this._marking.GetMarshalledSize();  // this._marking
+            marshalSize += 4;  // this._capabilities
+            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+            {
+                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Unique ID for an entity that is tied to this state information
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the What force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
+        public byte ForceId
+        {
+            get
+            {
+                return this._forceId;
+            }
+
+            set
+            {
+                this._forceId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many articulation parameters are in the variable length list
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
+        public byte NumberOfArticulationParameters
+        {
+            get
+            {
+                return this._numberOfArticulationParameters;
+            }
+
+            set
+            {
+                this._numberOfArticulationParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the type of entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
+        public EntityType EntityType
+        {
+            get
+            {
+                return this._entityType;
+            }
+
+            set
+            {
+                this._entityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the alternativeEntityType
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "alternativeEntityType")]
+        public EntityType AlternativeEntityType
+        {
+            get
+            {
+                return this._alternativeEntityType;
+            }
+
+            set
+            {
+                this._alternativeEntityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the speed of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
+        public Vector3Float EntityLinearVelocity
+        {
+            get
+            {
+                return this._entityLinearVelocity;
+            }
+
+            set
+            {
+                this._entityLinearVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the location of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
+        public Vector3Double EntityLocation
+        {
+            get
+            {
+                return this._entityLocation;
+            }
+
+            set
+            {
+                this._entityLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the orientation of the entity, in euler angles
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "entityOrientation")]
+        public Orientation EntityOrientation
+        {
+            get
+            {
+                return this._entityOrientation;
+            }
+
+            set
+            {
+                this._entityOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
+        public int EntityAppearance
+        {
+            get
+            {
+                return this._entityAppearance;
+            }
+
+            set
+            {
+                this._entityAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameters used for dead reckoning
+        /// </summary>
+        [XmlElement(Type = typeof(DeadReckoningParameter), ElementName = "deadReckoningParameters")]
+        public DeadReckoningParameter DeadReckoningParameters
+        {
+            get
+            {
+                return this._deadReckoningParameters;
+            }
+
+            set
+            {
+                this._deadReckoningParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Marking), ElementName = "marking")]
+        public Marking Marking
+        {
+            get
+            {
+                return this._marking;
+            }
+
+            set
+            {
+                this._marking = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
+        public int Capabilities
+        {
+            get
+            {
+                return this._capabilities;
+            }
+
+            set
+            {
+                this._capabilities = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of articulation parameters
+        /// </summary>
+        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
+        public List<ArticulationParameter> ArticulationParameters
+        {
+            get
+            {
+                return this._articulationParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._forceId);
+                    dos.WriteByte((byte)this._articulationParameters.Count);
+                    this._entityType.Marshal(dos);
+                    this._alternativeEntityType.Marshal(dos);
+                    this._entityLinearVelocity.Marshal(dos);
+                    this._entityLocation.Marshal(dos);
+                    this._entityOrientation.Marshal(dos);
+                    dos.WriteInt((int)this._entityAppearance);
+                    this._deadReckoningParameters.Marshal(dos);
+                    this._marking.Marshal(dos);
+                    dos.WriteInt((int)this._capabilities);
+
+                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                    {
+                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                        aArticulationParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._forceId = dis.ReadUnsignedByte();
+                    this._numberOfArticulationParameters = dis.ReadByte();
+                    this._entityType.Unmarshal(dis);
+                    this._alternativeEntityType.Unmarshal(dis);
+                    this._entityLinearVelocity.Unmarshal(dis);
+                    this._entityLocation.Unmarshal(dis);
+                    this._entityOrientation.Unmarshal(dis);
+                    this._entityAppearance = dis.ReadInt();
+                    this._deadReckoningParameters.Unmarshal(dis);
+                    this._marking.Unmarshal(dis);
+                    this._capabilities = dis.ReadInt();
+
+                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
+                    {
+                        ArticulationParameter anX = new ArticulationParameter();
+                        anX.Unmarshal(dis);
+                        this._articulationParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
+                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
+                sb.AppendLine("<entityType>");
+                this._entityType.Reflection(sb);
+                sb.AppendLine("</entityType>");
+                sb.AppendLine("<alternativeEntityType>");
+                this._alternativeEntityType.Reflection(sb);
+                sb.AppendLine("</alternativeEntityType>");
+                sb.AppendLine("<entityLinearVelocity>");
+                this._entityLinearVelocity.Reflection(sb);
+                sb.AppendLine("</entityLinearVelocity>");
+                sb.AppendLine("<entityLocation>");
+                this._entityLocation.Reflection(sb);
+                sb.AppendLine("</entityLocation>");
+                sb.AppendLine("<entityOrientation>");
+                this._entityOrientation.Reflection(sb);
+                sb.AppendLine("</entityOrientation>");
+                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
+                sb.AppendLine("<deadReckoningParameters>");
+                this._deadReckoningParameters.Reflection(sb);
+                sb.AppendLine("</deadReckoningParameters>");
+                sb.AppendLine("<marking>");
+                this._marking.Reflection(sb);
+                sb.AppendLine("</marking>");
+                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
+                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                    aArticulationParameter.Reflection(sb);
+                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EntityStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceId != obj._forceId)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityType.Equals(obj._entityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._alternativeEntityType.Equals(obj._alternativeEntityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLocation.Equals(obj._entityLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityOrientation.Equals(obj._entityOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityAppearance != obj._entityAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._deadReckoningParameters.Equals(obj._deadReckoningParameters))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._marking.Equals(obj._marking))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._capabilities != obj._capabilities)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._articulationParameters.Count != obj._articulationParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._forceId.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._entityType.GetHashCode();
+            result = GenerateHash(result) ^ this._alternativeEntityType.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._marking.GetHashCode();
+            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
+
+            if (this._articulationParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/EntityStateUpdatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EntityStateUpdatePdu.cs
index e2e89a7..6e3d137 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityStateUpdatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EntityStateUpdatePdu.cs
@@ -1,580 +1,580 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.3.3.4. Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Orientation))]
-    [XmlInclude(typeof(ArticulationParameter))]
-    public partial class EntityStateUpdatePdu : EntityInformationFamilyPdu, IEquatable<EntityStateUpdatePdu>
-    {
-        /// <summary>
-        /// This field shall identify the entity issuing the PDU
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private byte _padding1;
-
-        /// <summary>
-        /// How many articulation parameters are in the variable length list
-        /// </summary>
-        private byte _numberOfArticulationParameters;
-
-        /// <summary>
-        /// Describes the speed of the entity in the world
-        /// </summary>
-        private Vector3Float _entityLinearVelocity = new Vector3Float();
-
-        /// <summary>
-        /// describes the location of the entity in the world
-        /// </summary>
-        private Vector3Double _entityLocation = new Vector3Double();
-
-        /// <summary>
-        /// describes the orientation of the entity, in euler angles
-        /// </summary>
-        private Orientation _entityOrientation = new Orientation();
-
-        /// <summary>
-        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        private int _entityAppearance;
-
-        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityStateUpdatePdu"/> class.
-        /// </summary>
-        public EntityStateUpdatePdu()
-        {
-            PduType = (byte)67;
-            ProtocolFamily = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 1;  // this._padding1
-            marshalSize += 1;  // this._numberOfArticulationParameters
-            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
-            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
-            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
-            marshalSize += 4;  // this._entityAppearance
-            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-            {
-                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall identify the entity issuing the PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many articulation parameters are in the variable length list
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
-        public byte NumberOfArticulationParameters
-        {
-            get
-            {
-                return this._numberOfArticulationParameters;
-            }
-
-            set
-            {
-                this._numberOfArticulationParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes the speed of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
-        public Vector3Float EntityLinearVelocity
-        {
-            get
-            {
-                return this._entityLinearVelocity;
-            }
-
-            set
-            {
-                this._entityLinearVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the location of the entity in the world
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
-        public Vector3Double EntityLocation
-        {
-            get
-            {
-                return this._entityLocation;
-            }
-
-            set
-            {
-                this._entityLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the describes the orientation of the entity, in euler angles
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "entityOrientation")]
-        public Orientation EntityOrientation
-        {
-            get
-            {
-                return this._entityOrientation;
-            }
-
-            set
-            {
-                this._entityOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
-        public int EntityAppearance
-        {
-            get
-            {
-                return this._entityAppearance;
-            }
-
-            set
-            {
-                this._entityAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the articulationParameters
-        /// </summary>
-        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
-        public List<ArticulationParameter> ArticulationParameters
-        {
-            get
-            {
-                return this._articulationParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteByte((byte)this._padding1);
-                    dos.WriteUnsignedByte((byte)this._articulationParameters.Count);
-                    this._entityLinearVelocity.Marshal(dos);
-                    this._entityLocation.Marshal(dos);
-                    this._entityOrientation.Marshal(dos);
-                    dos.WriteInt((int)this._entityAppearance);
-
-                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                    {
-                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                        aArticulationParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._padding1 = dis.ReadByte();
-                    this._numberOfArticulationParameters = dis.ReadUnsignedByte();
-                    this._entityLinearVelocity.Unmarshal(dis);
-                    this._entityLocation.Unmarshal(dis);
-                    this._entityOrientation.Unmarshal(dis);
-                    this._entityAppearance = dis.ReadInt();
-
-                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
-                    {
-                        ArticulationParameter anX = new ArticulationParameter();
-                        anX.Unmarshal(dis);
-                        this._articulationParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityStateUpdatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
-                sb.AppendLine("<entityLinearVelocity>");
-                this._entityLinearVelocity.Reflection(sb);
-                sb.AppendLine("</entityLinearVelocity>");
-                sb.AppendLine("<entityLocation>");
-                this._entityLocation.Reflection(sb);
-                sb.AppendLine("</entityLocation>");
-                sb.AppendLine("<entityOrientation>");
-                this._entityOrientation.Reflection(sb);
-                sb.AppendLine("</entityOrientation>");
-                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
-                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                    aArticulationParameter.Reflection(sb);
-                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EntityStateUpdatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityStateUpdatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityStateUpdatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityLocation.Equals(obj._entityLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._entityOrientation.Equals(obj._entityOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityAppearance != obj._entityAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._articulationParameters.Count != obj._articulationParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
-
-            if (this._articulationParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.3.3.4. Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Orientation))]
+    [XmlInclude(typeof(ArticulationParameter))]
+    public partial class EntityStateUpdatePdu : EntityInformationFamilyPdu, IEquatable<EntityStateUpdatePdu>
+    {
+        /// <summary>
+        /// This field shall identify the entity issuing the PDU
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private byte _padding1;
+
+        /// <summary>
+        /// How many articulation parameters are in the variable length list
+        /// </summary>
+        private byte _numberOfArticulationParameters;
+
+        /// <summary>
+        /// Describes the speed of the entity in the world
+        /// </summary>
+        private Vector3Float _entityLinearVelocity = new Vector3Float();
+
+        /// <summary>
+        /// describes the location of the entity in the world
+        /// </summary>
+        private Vector3Double _entityLocation = new Vector3Double();
+
+        /// <summary>
+        /// describes the orientation of the entity, in euler angles
+        /// </summary>
+        private Orientation _entityOrientation = new Orientation();
+
+        /// <summary>
+        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        private int _entityAppearance;
+
+        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityStateUpdatePdu"/> class.
+        /// </summary>
+        public EntityStateUpdatePdu()
+        {
+            PduType = (byte)67;
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 1;  // this._padding1
+            marshalSize += 1;  // this._numberOfArticulationParameters
+            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
+            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
+            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
+            marshalSize += 4;  // this._entityAppearance
+            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+            {
+                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the entity issuing the PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many articulation parameters are in the variable length list
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
+        public byte NumberOfArticulationParameters
+        {
+            get
+            {
+                return this._numberOfArticulationParameters;
+            }
+
+            set
+            {
+                this._numberOfArticulationParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the speed of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
+        public Vector3Float EntityLinearVelocity
+        {
+            get
+            {
+                return this._entityLinearVelocity;
+            }
+
+            set
+            {
+                this._entityLinearVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the location of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
+        public Vector3Double EntityLocation
+        {
+            get
+            {
+                return this._entityLocation;
+            }
+
+            set
+            {
+                this._entityLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the orientation of the entity, in euler angles
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "entityOrientation")]
+        public Orientation EntityOrientation
+        {
+            get
+            {
+                return this._entityOrientation;
+            }
+
+            set
+            {
+                this._entityOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
+        public int EntityAppearance
+        {
+            get
+            {
+                return this._entityAppearance;
+            }
+
+            set
+            {
+                this._entityAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the articulationParameters
+        /// </summary>
+        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
+        public List<ArticulationParameter> ArticulationParameters
+        {
+            get
+            {
+                return this._articulationParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteByte((byte)this._padding1);
+                    dos.WriteUnsignedByte((byte)this._articulationParameters.Count);
+                    this._entityLinearVelocity.Marshal(dos);
+                    this._entityLocation.Marshal(dos);
+                    this._entityOrientation.Marshal(dos);
+                    dos.WriteInt((int)this._entityAppearance);
+
+                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                    {
+                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                        aArticulationParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._padding1 = dis.ReadByte();
+                    this._numberOfArticulationParameters = dis.ReadUnsignedByte();
+                    this._entityLinearVelocity.Unmarshal(dis);
+                    this._entityLocation.Unmarshal(dis);
+                    this._entityOrientation.Unmarshal(dis);
+                    this._entityAppearance = dis.ReadInt();
+
+                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
+                    {
+                        ArticulationParameter anX = new ArticulationParameter();
+                        anX.Unmarshal(dis);
+                        this._articulationParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityStateUpdatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
+                sb.AppendLine("<entityLinearVelocity>");
+                this._entityLinearVelocity.Reflection(sb);
+                sb.AppendLine("</entityLinearVelocity>");
+                sb.AppendLine("<entityLocation>");
+                this._entityLocation.Reflection(sb);
+                sb.AppendLine("</entityLocation>");
+                sb.AppendLine("<entityOrientation>");
+                this._entityOrientation.Reflection(sb);
+                sb.AppendLine("</entityOrientation>");
+                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
+                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                    aArticulationParameter.Reflection(sb);
+                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EntityStateUpdatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityStateUpdatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityStateUpdatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLocation.Equals(obj._entityLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityOrientation.Equals(obj._entityOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityAppearance != obj._entityAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._articulationParameters.Count != obj._articulationParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
+
+            if (this._articulationParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityType.cs b/Libs/CsharpDis6/Dis1998/Generated/EntityType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityType.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EntityType.cs
index ffe987c..27e5791 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EntityType.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EntityType.cs
@@ -1,489 +1,489 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.16. Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EntityType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityType"/> class.
-        /// </summary>
-        public EntityType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EntityType left, EntityType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EntityType left, EntityType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the extra
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EntityType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("</EntityType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EntityType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EntityType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.16. Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityType"/> class.
+        /// </summary>
+        public EntityType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityType left, EntityType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityType left, EntityType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the extra
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("</EntityType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Environment.cs b/Libs/CsharpDis6/Dis1998/Generated/Environment.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Environment.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Environment.cs
index e76cd55..772c048 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Environment.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Environment.cs
@@ -1,460 +1,460 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.40. Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. NOTE: this class requires hand coding.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Environment
-    {
-        /// <summary>
-        /// Record type
-        /// </summary>
-        private uint _environmentType;
-
-        /// <summary>
-        /// length, in bits
-        /// </summary>
-        private byte _length;
-
-        /// <summary>
-        /// Identify the sequentially numbered record index
-        /// </summary>
-        private byte _index;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding1;
-
-        /// <summary>
-        /// Geometry or state record
-        /// </summary>
-        private byte _geometry;
-
-        /// <summary>
-        /// padding to bring the total size up to a 64 bit boundry
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Environment"/> class.
-        /// </summary>
-        public Environment()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Environment left, Environment right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Environment left, Environment right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._environmentType
-            marshalSize += 1;  // this._length
-            marshalSize += 1;  // this._index
-            marshalSize += 1;  // this._padding1
-            marshalSize += 1;  // this._geometry
-            marshalSize += 1;  // this._padding2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Record type
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "environmentType")]
-        public uint EnvironmentType
-        {
-            get
-            {
-                return this._environmentType;
-            }
-
-            set
-            {
-                this._environmentType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length, in bits
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "length")]
-        public byte Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identify the sequentially numbered record index
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "index")]
-        public byte Index
-        {
-            get
-            {
-                return this._index;
-            }
-
-            set
-            {
-                this._index = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
-        public byte Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Geometry or state record
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "geometry")]
-        public byte Geometry
-        {
-            get
-            {
-                return this._geometry;
-            }
-
-            set
-            {
-                this._geometry = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding to bring the total size up to a 64 bit boundry
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._environmentType);
-                    dos.WriteUnsignedByte((byte)this._length);
-                    dos.WriteUnsignedByte((byte)this._index);
-                    dos.WriteUnsignedByte((byte)this._padding1);
-                    dos.WriteUnsignedByte((byte)this._geometry);
-                    dos.WriteUnsignedByte((byte)this._padding2);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._environmentType = dis.ReadUnsignedInt();
-                    this._length = dis.ReadUnsignedByte();
-                    this._index = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadUnsignedByte();
-                    this._geometry = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Environment>");
-            try
-            {
-                sb.AppendLine("<environmentType type=\"uint\">" + this._environmentType.ToString(CultureInfo.InvariantCulture) + "</environmentType>");
-                sb.AppendLine("<length type=\"byte\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("<index type=\"byte\">" + this._index.ToString(CultureInfo.InvariantCulture) + "</index>");
-                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<geometry type=\"byte\">" + this._geometry.ToString(CultureInfo.InvariantCulture) + "</geometry>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("</Environment>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Environment;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Environment obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._environmentType != obj._environmentType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._index != obj._index)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._geometry != obj._geometry)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-            result = GenerateHash(result) ^ this._index.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._geometry.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.40. Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. NOTE: this class requires hand coding.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Environment
+    {
+        /// <summary>
+        /// Record type
+        /// </summary>
+        private uint _environmentType;
+
+        /// <summary>
+        /// length, in bits
+        /// </summary>
+        private byte _length;
+
+        /// <summary>
+        /// Identify the sequentially numbered record index
+        /// </summary>
+        private byte _index;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding1;
+
+        /// <summary>
+        /// Geometry or state record
+        /// </summary>
+        private byte _geometry;
+
+        /// <summary>
+        /// padding to bring the total size up to a 64 bit boundry
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Environment"/> class.
+        /// </summary>
+        public Environment()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Environment left, Environment right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Environment left, Environment right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._environmentType
+            marshalSize += 1;  // this._length
+            marshalSize += 1;  // this._index
+            marshalSize += 1;  // this._padding1
+            marshalSize += 1;  // this._geometry
+            marshalSize += 1;  // this._padding2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Record type
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "environmentType")]
+        public uint EnvironmentType
+        {
+            get
+            {
+                return this._environmentType;
+            }
+
+            set
+            {
+                this._environmentType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length, in bits
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "length")]
+        public byte Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identify the sequentially numbered record index
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "index")]
+        public byte Index
+        {
+            get
+            {
+                return this._index;
+            }
+
+            set
+            {
+                this._index = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Geometry or state record
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "geometry")]
+        public byte Geometry
+        {
+            get
+            {
+                return this._geometry;
+            }
+
+            set
+            {
+                this._geometry = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding to bring the total size up to a 64 bit boundry
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._environmentType);
+                    dos.WriteUnsignedByte((byte)this._length);
+                    dos.WriteUnsignedByte((byte)this._index);
+                    dos.WriteUnsignedByte((byte)this._padding1);
+                    dos.WriteUnsignedByte((byte)this._geometry);
+                    dos.WriteUnsignedByte((byte)this._padding2);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._environmentType = dis.ReadUnsignedInt();
+                    this._length = dis.ReadUnsignedByte();
+                    this._index = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadUnsignedByte();
+                    this._geometry = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Environment>");
+            try
+            {
+                sb.AppendLine("<environmentType type=\"uint\">" + this._environmentType.ToString(CultureInfo.InvariantCulture) + "</environmentType>");
+                sb.AppendLine("<length type=\"byte\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("<index type=\"byte\">" + this._index.ToString(CultureInfo.InvariantCulture) + "</index>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<geometry type=\"byte\">" + this._geometry.ToString(CultureInfo.InvariantCulture) + "</geometry>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("</Environment>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Environment;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Environment obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._environmentType != obj._environmentType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._index != obj._index)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._geometry != obj._geometry)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+            result = GenerateHash(result) ^ this._index.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._geometry.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/EnvironmentalProcessPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EnvironmentalProcessPdu.cs
index 62ddf63..2f4d15e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EnvironmentalProcessPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EnvironmentalProcessPdu.cs
@@ -1,544 +1,544 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.11.1: Information about environmental effects and processes. This requires manual cleanup. the environmental        record is variable, as is the padding. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Environment))]
-    public partial class EnvironmentalProcessPdu : SyntheticEnvironmentFamilyPdu, IEquatable<EnvironmentalProcessPdu>
-    {
-        /// <summary>
-        /// Environmental process ID
-        /// </summary>
-        private EntityID _environementalProcessID = new EntityID();
-
-        /// <summary>
-        /// Environment type
-        /// </summary>
-        private EntityType _environmentType = new EntityType();
-
-        /// <summary>
-        /// model type
-        /// </summary>
-        private byte _modelType;
-
-        /// <summary>
-        /// Environment status
-        /// </summary>
-        private byte _environmentStatus;
-
-        /// <summary>
-        /// number of environment records 
-        /// </summary>
-        private byte _numberOfEnvironmentRecords;
-
-        /// <summary>
-        /// PDU sequence number for the environmentla process if pdu sequencing required
-        /// </summary>
-        private ushort _sequenceNumber;
-
-        /// <summary>
-        /// environemt records
-        /// </summary>
-        private List<Environment> _environmentRecords = new List<Environment>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnvironmentalProcessPdu"/> class.
-        /// </summary>
-        public EnvironmentalProcessPdu()
-        {
-            PduType = (byte)41;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EnvironmentalProcessPdu left, EnvironmentalProcessPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EnvironmentalProcessPdu left, EnvironmentalProcessPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._environementalProcessID.GetMarshalledSize();  // this._environementalProcessID
-            marshalSize += this._environmentType.GetMarshalledSize();  // this._environmentType
-            marshalSize += 1;  // this._modelType
-            marshalSize += 1;  // this._environmentStatus
-            marshalSize += 1;  // this._numberOfEnvironmentRecords
-            marshalSize += 2;  // this._sequenceNumber
-            for (int idx = 0; idx < this._environmentRecords.Count; idx++)
-            {
-                Environment listElement = (Environment)this._environmentRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Environmental process ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "environementalProcessID")]
-        public EntityID EnvironementalProcessID
-        {
-            get
-            {
-                return this._environementalProcessID;
-            }
-
-            set
-            {
-                this._environementalProcessID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Environment type
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "environmentType")]
-        public EntityType EnvironmentType
-        {
-            get
-            {
-                return this._environmentType;
-            }
-
-            set
-            {
-                this._environmentType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the model type
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "modelType")]
-        public byte ModelType
-        {
-            get
-            {
-                return this._modelType;
-            }
-
-            set
-            {
-                this._modelType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Environment status
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "environmentStatus")]
-        public byte EnvironmentStatus
-        {
-            get
-            {
-                return this._environmentStatus;
-            }
-
-            set
-            {
-                this._environmentStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of environment records 
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfEnvironmentRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfEnvironmentRecords")]
-        public byte NumberOfEnvironmentRecords
-        {
-            get
-            {
-                return this._numberOfEnvironmentRecords;
-            }
-
-            set
-            {
-                this._numberOfEnvironmentRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the PDU sequence number for the environmentla process if pdu sequencing required
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "sequenceNumber")]
-        public ushort SequenceNumber
-        {
-            get
-            {
-                return this._sequenceNumber;
-            }
-
-            set
-            {
-                this._sequenceNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the environemt records
-        /// </summary>
-        [XmlElement(ElementName = "environmentRecordsList", Type = typeof(List<Environment>))]
-        public List<Environment> EnvironmentRecords
-        {
-            get
-            {
-                return this._environmentRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._environementalProcessID.Marshal(dos);
-                    this._environmentType.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._modelType);
-                    dos.WriteUnsignedByte((byte)this._environmentStatus);
-                    dos.WriteUnsignedByte((byte)this._environmentRecords.Count);
-                    dos.WriteUnsignedShort((ushort)this._sequenceNumber);
-
-                    for (int idx = 0; idx < this._environmentRecords.Count; idx++)
-                    {
-                        Environment aEnvironment = (Environment)this._environmentRecords[idx];
-                        aEnvironment.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._environementalProcessID.Unmarshal(dis);
-                    this._environmentType.Unmarshal(dis);
-                    this._modelType = dis.ReadUnsignedByte();
-                    this._environmentStatus = dis.ReadUnsignedByte();
-                    this._numberOfEnvironmentRecords = dis.ReadUnsignedByte();
-                    this._sequenceNumber = dis.ReadUnsignedShort();
-
-                    for (int idx = 0; idx < this.NumberOfEnvironmentRecords; idx++)
-                    {
-                        Environment anX = new Environment();
-                        anX.Unmarshal(dis);
-                        this._environmentRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EnvironmentalProcessPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<environementalProcessID>");
-                this._environementalProcessID.Reflection(sb);
-                sb.AppendLine("</environementalProcessID>");
-                sb.AppendLine("<environmentType>");
-                this._environmentType.Reflection(sb);
-                sb.AppendLine("</environmentType>");
-                sb.AppendLine("<modelType type=\"byte\">" + this._modelType.ToString(CultureInfo.InvariantCulture) + "</modelType>");
-                sb.AppendLine("<environmentStatus type=\"byte\">" + this._environmentStatus.ToString(CultureInfo.InvariantCulture) + "</environmentStatus>");
-                sb.AppendLine("<environmentRecords type=\"byte\">" + this._environmentRecords.Count.ToString(CultureInfo.InvariantCulture) + "</environmentRecords>");
-                sb.AppendLine("<sequenceNumber type=\"ushort\">" + this._sequenceNumber.ToString(CultureInfo.InvariantCulture) + "</sequenceNumber>");
-                for (int idx = 0; idx < this._environmentRecords.Count; idx++)
-                {
-                    sb.AppendLine("<environmentRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Environment\">");
-                    Environment aEnvironment = (Environment)this._environmentRecords[idx];
-                    aEnvironment.Reflection(sb);
-                    sb.AppendLine("</environmentRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EnvironmentalProcessPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EnvironmentalProcessPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EnvironmentalProcessPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._environementalProcessID.Equals(obj._environementalProcessID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._environmentType.Equals(obj._environmentType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modelType != obj._modelType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._environmentStatus != obj._environmentStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfEnvironmentRecords != obj._numberOfEnvironmentRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sequenceNumber != obj._sequenceNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._environmentRecords.Count != obj._environmentRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._environmentRecords.Count; idx++)
-                {
-                    if (!this._environmentRecords[idx].Equals(obj._environmentRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._environementalProcessID.GetHashCode();
-            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
-            result = GenerateHash(result) ^ this._modelType.GetHashCode();
-            result = GenerateHash(result) ^ this._environmentStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfEnvironmentRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._sequenceNumber.GetHashCode();
-
-            if (this._environmentRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._environmentRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._environmentRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.11.1: Information about environmental effects and processes. This requires manual cleanup. the environmental        record is variable, as is the padding. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Environment))]
+    public partial class EnvironmentalProcessPdu : SyntheticEnvironmentFamilyPdu, IEquatable<EnvironmentalProcessPdu>
+    {
+        /// <summary>
+        /// Environmental process ID
+        /// </summary>
+        private EntityID _environementalProcessID = new EntityID();
+
+        /// <summary>
+        /// Environment type
+        /// </summary>
+        private EntityType _environmentType = new EntityType();
+
+        /// <summary>
+        /// model type
+        /// </summary>
+        private byte _modelType;
+
+        /// <summary>
+        /// Environment status
+        /// </summary>
+        private byte _environmentStatus;
+
+        /// <summary>
+        /// number of environment records 
+        /// </summary>
+        private byte _numberOfEnvironmentRecords;
+
+        /// <summary>
+        /// PDU sequence number for the environmentla process if pdu sequencing required
+        /// </summary>
+        private ushort _sequenceNumber;
+
+        /// <summary>
+        /// environemt records
+        /// </summary>
+        private List<Environment> _environmentRecords = new List<Environment>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnvironmentalProcessPdu"/> class.
+        /// </summary>
+        public EnvironmentalProcessPdu()
+        {
+            PduType = (byte)41;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EnvironmentalProcessPdu left, EnvironmentalProcessPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EnvironmentalProcessPdu left, EnvironmentalProcessPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._environementalProcessID.GetMarshalledSize();  // this._environementalProcessID
+            marshalSize += this._environmentType.GetMarshalledSize();  // this._environmentType
+            marshalSize += 1;  // this._modelType
+            marshalSize += 1;  // this._environmentStatus
+            marshalSize += 1;  // this._numberOfEnvironmentRecords
+            marshalSize += 2;  // this._sequenceNumber
+            for (int idx = 0; idx < this._environmentRecords.Count; idx++)
+            {
+                Environment listElement = (Environment)this._environmentRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Environmental process ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "environementalProcessID")]
+        public EntityID EnvironementalProcessID
+        {
+            get
+            {
+                return this._environementalProcessID;
+            }
+
+            set
+            {
+                this._environementalProcessID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Environment type
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "environmentType")]
+        public EntityType EnvironmentType
+        {
+            get
+            {
+                return this._environmentType;
+            }
+
+            set
+            {
+                this._environmentType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the model type
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "modelType")]
+        public byte ModelType
+        {
+            get
+            {
+                return this._modelType;
+            }
+
+            set
+            {
+                this._modelType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Environment status
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "environmentStatus")]
+        public byte EnvironmentStatus
+        {
+            get
+            {
+                return this._environmentStatus;
+            }
+
+            set
+            {
+                this._environmentStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of environment records 
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfEnvironmentRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfEnvironmentRecords")]
+        public byte NumberOfEnvironmentRecords
+        {
+            get
+            {
+                return this._numberOfEnvironmentRecords;
+            }
+
+            set
+            {
+                this._numberOfEnvironmentRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the PDU sequence number for the environmentla process if pdu sequencing required
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "sequenceNumber")]
+        public ushort SequenceNumber
+        {
+            get
+            {
+                return this._sequenceNumber;
+            }
+
+            set
+            {
+                this._sequenceNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the environemt records
+        /// </summary>
+        [XmlElement(ElementName = "environmentRecordsList", Type = typeof(List<Environment>))]
+        public List<Environment> EnvironmentRecords
+        {
+            get
+            {
+                return this._environmentRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._environementalProcessID.Marshal(dos);
+                    this._environmentType.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._modelType);
+                    dos.WriteUnsignedByte((byte)this._environmentStatus);
+                    dos.WriteUnsignedByte((byte)this._environmentRecords.Count);
+                    dos.WriteUnsignedShort((ushort)this._sequenceNumber);
+
+                    for (int idx = 0; idx < this._environmentRecords.Count; idx++)
+                    {
+                        Environment aEnvironment = (Environment)this._environmentRecords[idx];
+                        aEnvironment.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._environementalProcessID.Unmarshal(dis);
+                    this._environmentType.Unmarshal(dis);
+                    this._modelType = dis.ReadUnsignedByte();
+                    this._environmentStatus = dis.ReadUnsignedByte();
+                    this._numberOfEnvironmentRecords = dis.ReadUnsignedByte();
+                    this._sequenceNumber = dis.ReadUnsignedShort();
+
+                    for (int idx = 0; idx < this.NumberOfEnvironmentRecords; idx++)
+                    {
+                        Environment anX = new Environment();
+                        anX.Unmarshal(dis);
+                        this._environmentRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EnvironmentalProcessPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<environementalProcessID>");
+                this._environementalProcessID.Reflection(sb);
+                sb.AppendLine("</environementalProcessID>");
+                sb.AppendLine("<environmentType>");
+                this._environmentType.Reflection(sb);
+                sb.AppendLine("</environmentType>");
+                sb.AppendLine("<modelType type=\"byte\">" + this._modelType.ToString(CultureInfo.InvariantCulture) + "</modelType>");
+                sb.AppendLine("<environmentStatus type=\"byte\">" + this._environmentStatus.ToString(CultureInfo.InvariantCulture) + "</environmentStatus>");
+                sb.AppendLine("<environmentRecords type=\"byte\">" + this._environmentRecords.Count.ToString(CultureInfo.InvariantCulture) + "</environmentRecords>");
+                sb.AppendLine("<sequenceNumber type=\"ushort\">" + this._sequenceNumber.ToString(CultureInfo.InvariantCulture) + "</sequenceNumber>");
+                for (int idx = 0; idx < this._environmentRecords.Count; idx++)
+                {
+                    sb.AppendLine("<environmentRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Environment\">");
+                    Environment aEnvironment = (Environment)this._environmentRecords[idx];
+                    aEnvironment.Reflection(sb);
+                    sb.AppendLine("</environmentRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EnvironmentalProcessPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EnvironmentalProcessPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EnvironmentalProcessPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._environementalProcessID.Equals(obj._environementalProcessID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._environmentType.Equals(obj._environmentType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modelType != obj._modelType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._environmentStatus != obj._environmentStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfEnvironmentRecords != obj._numberOfEnvironmentRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sequenceNumber != obj._sequenceNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._environmentRecords.Count != obj._environmentRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._environmentRecords.Count; idx++)
+                {
+                    if (!this._environmentRecords[idx].Equals(obj._environmentRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._environementalProcessID.GetHashCode();
+            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
+            result = GenerateHash(result) ^ this._modelType.GetHashCode();
+            result = GenerateHash(result) ^ this._environmentStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfEnvironmentRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._sequenceNumber.GetHashCode();
+
+            if (this._environmentRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._environmentRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._environmentRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventID.cs b/Libs/CsharpDis6/Dis1998/Generated/EventID.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventID.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EventID.cs
index ed21810..f0bb11a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventID.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EventID.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.18. Identifies a unique event in a simulation via the combination of three values
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class EventID
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// the number of the event
-        /// </summary>
-        private ushort _eventNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventID"/> class.
-        /// </summary>
-        public EventID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventID left, EventID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventID left, EventID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            marshalSize += 2;  // this._eventNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the number of the event
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
-        public ushort EventNumber
-        {
-            get
-            {
-                return this._eventNumber;
-            }
-
-            set
-            {
-                this._eventNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                    dos.WriteUnsignedShort((ushort)this._eventNumber);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                    this._eventNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventID>");
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
-                sb.AppendLine("</EventID>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._eventNumber != obj._eventNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.18. Identifies a unique event in a simulation via the combination of three values
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EventID
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// the number of the event
+        /// </summary>
+        private ushort _eventNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventID"/> class.
+        /// </summary>
+        public EventID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventID left, EventID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventID left, EventID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            marshalSize += 2;  // this._eventNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the number of the event
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
+        public ushort EventNumber
+        {
+            get
+            {
+                return this._eventNumber;
+            }
+
+            set
+            {
+                this._eventNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                    dos.WriteUnsignedShort((ushort)this._eventNumber);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                    this._eventNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventID>");
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
+                sb.AppendLine("</EventID>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._eventNumber != obj._eventNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/EventReportPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EventReportPdu.cs
index ac1ce02..11a664f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EventReportPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.11. Reports occurance of a significant event to the simulation manager. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class EventReportPdu : SimulationManagementFamilyPdu, IEquatable<EventReportPdu>
-    {
-        /// <summary>
-        /// Type of event
-        /// </summary>
-        private uint _eventType;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventReportPdu"/> class.
-        /// </summary>
-        public EventReportPdu()
-        {
-            PduType = (byte)21;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventReportPdu left, EventReportPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventReportPdu left, EventReportPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._eventType
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of event
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "eventType")]
-        public uint EventType
-        {
-            get
-            {
-                return this._eventType;
-            }
-
-            set
-            {
-                this._eventType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._eventType);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._eventType = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventReportPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<eventType type=\"uint\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EventReportPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventReportPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventReportPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._eventType != obj._eventType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._eventType.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.11. Reports occurance of a significant event to the simulation manager. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class EventReportPdu : SimulationManagementFamilyPdu, IEquatable<EventReportPdu>
+    {
+        /// <summary>
+        /// Type of event
+        /// </summary>
+        private uint _eventType;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventReportPdu"/> class.
+        /// </summary>
+        public EventReportPdu()
+        {
+            PduType = (byte)21;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventReportPdu left, EventReportPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventReportPdu left, EventReportPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._eventType
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of event
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "eventType")]
+        public uint EventType
+        {
+            get
+            {
+                return this._eventType;
+            }
+
+            set
+            {
+                this._eventType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._eventType);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._eventType = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventReportPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<eventType type=\"uint\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EventReportPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventReportPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventReportPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._eventType != obj._eventType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._eventType.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/EventReportReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/EventReportReliablePdu.cs
index e5c3f9d..3b41a92 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/EventReportReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/EventReportReliablePdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.11: reports the occurance of a significatnt event to the simulation manager. Needs manual     intervention to fix padding in variable datums. UNFINISHED.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class EventReportReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<EventReportReliablePdu>
-    {
-        /// <summary>
-        /// Event type
-        /// </summary>
-        private ushort _eventType;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _pad1;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventReportReliablePdu"/> class.
-        /// </summary>
-        public EventReportReliablePdu()
-        {
-            PduType = (byte)61;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EventReportReliablePdu left, EventReportReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EventReportReliablePdu left, EventReportReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._eventType
-            marshalSize += 4;  // this._pad1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Event type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
-        public ushort EventType
-        {
-            get
-            {
-                return this._eventType;
-            }
-
-            set
-            {
-                this._eventType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "pad1")]
-        public uint Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._eventType);
-                    dos.WriteUnsignedInt((uint)this._pad1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._eventType = dis.ReadUnsignedShort();
-                    this._pad1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<EventReportReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
-                sb.AppendLine("<pad1 type=\"uint\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</EventReportReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as EventReportReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EventReportReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._eventType != obj._eventType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._eventType.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.11: reports the occurance of a significatnt event to the simulation manager. Needs manual     intervention to fix padding in variable datums. UNFINISHED.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class EventReportReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<EventReportReliablePdu>
+    {
+        /// <summary>
+        /// Event type
+        /// </summary>
+        private ushort _eventType;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _pad1;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventReportReliablePdu"/> class.
+        /// </summary>
+        public EventReportReliablePdu()
+        {
+            PduType = (byte)61;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventReportReliablePdu left, EventReportReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventReportReliablePdu left, EventReportReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._eventType
+            marshalSize += 4;  // this._pad1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Event type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
+        public ushort EventType
+        {
+            get
+            {
+                return this._eventType;
+            }
+
+            set
+            {
+                this._eventType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "pad1")]
+        public uint Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._eventType);
+                    dos.WriteUnsignedInt((uint)this._pad1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._eventType = dis.ReadUnsignedShort();
+                    this._pad1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventReportReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
+                sb.AppendLine("<pad1 type=\"uint\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EventReportReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventReportReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventReportReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._eventType != obj._eventType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._eventType.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/FastEntityStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/FastEntityStatePdu.cs
index 4026a64..85686b7 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FastEntityStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/FastEntityStatePdu.cs
@@ -1,1639 +1,1639 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.3.1. Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ArticulationParameter))]
-    public partial class FastEntityStatePdu : EntityInformationFamilyPdu, IEquatable<FastEntityStatePdu>
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// the entity ID
-        /// </summary>
-        private ushort _entity;
-
-        /// <summary>
-        /// what force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        private byte _forceId;
-
-        /// <summary>
-        /// How many articulation parameters are in the variable length list
-        /// </summary>
-        private byte _numberOfArticulationParameters;
-
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _specific;
-
-        private byte _extra;
-
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _altEntityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _altDomain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _altCountry;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _altCategory;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _altSubcategory;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _altSpecific;
-
-        private byte _altExtra;
-
-        /// <summary>
-        /// X velo
-        /// </summary>
-        private float _xVelocity;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _yVelocity;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _zVelocity;
-
-        /// <summary>
-        /// X value
-        /// </summary>
-        private double _xLocation;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private double _yLocation;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private double _zLocation;
-
-        private float _psi;
-
-        private float _theta;
-
-        private float _phi;
-
-        /// <summary>
-        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        private int _entityAppearance;
-
-        /// <summary>
-        /// enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        private byte _deadReckoningAlgorithm;
-
-        /// <summary>
-        /// other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        private byte[] _otherParameters = new byte[15];
-
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _xAcceleration;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _yAcceleration;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _zAcceleration;
-
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _xAngularVelocity;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _yAngularVelocity;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _zAngularVelocity;
-
-        /// <summary>
-        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        private byte[] _marking = new byte[12];
-
-        /// <summary>
-        /// a series of bit flags
-        /// </summary>
-        private int _capabilities;
-
-        /// <summary>
-        /// variable length list of articulation parameters
-        /// </summary>
-        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FastEntityStatePdu"/> class.
-        /// </summary>
-        public FastEntityStatePdu()
-        {
-            PduType = (byte)1;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FastEntityStatePdu left, FastEntityStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FastEntityStatePdu left, FastEntityStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            marshalSize += 2;  // this._entity
-            marshalSize += 1;  // this._forceId
-            marshalSize += 1;  // this._numberOfArticulationParameters
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            marshalSize += 1;  // this._specific
-            marshalSize += 1;  // this._extra
-            marshalSize += 1;  // this._altEntityKind
-            marshalSize += 1;  // this._altDomain
-            marshalSize += 2;  // this._altCountry
-            marshalSize += 1;  // this._altCategory
-            marshalSize += 1;  // this._altSubcategory
-            marshalSize += 1;  // this._altSpecific
-            marshalSize += 1;  // this._altExtra
-            marshalSize += 4;  // this._xVelocity
-            marshalSize += 4;  // this._yVelocity
-            marshalSize += 4;  // this._zVelocity
-            marshalSize += 8;  // this._xLocation
-            marshalSize += 8;  // this._yLocation
-            marshalSize += 8;  // this._zLocation
-            marshalSize += 4;  // this._psi
-            marshalSize += 4;  // this._theta
-            marshalSize += 4;  // this._phi
-            marshalSize += 4;  // this._entityAppearance
-            marshalSize += 1;  // this._deadReckoningAlgorithm
-            marshalSize += 15 * 1;  // _otherParameters
-            marshalSize += 4;  // this._xAcceleration
-            marshalSize += 4;  // this._yAcceleration
-            marshalSize += 4;  // this._zAcceleration
-            marshalSize += 4;  // this._xAngularVelocity
-            marshalSize += 4;  // this._yAngularVelocity
-            marshalSize += 4;  // this._zAngularVelocity
-            marshalSize += 12 * 1;  // _marking
-            marshalSize += 4;  // this._capabilities
-            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-            {
-                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the the entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
-        public ushort Entity
-        {
-            get
-            {
-                return this._entity;
-            }
-
-            set
-            {
-                this._entity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the what force this entity is affiliated with, eg red, blue, neutral, etc
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
-        public byte ForceId
-        {
-            get
-            {
-                return this._forceId;
-            }
-
-            set
-            {
-                this._forceId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many articulation parameters are in the variable length list
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
-        public byte NumberOfArticulationParameters
-        {
-            get
-            {
-                return this._numberOfArticulationParameters;
-            }
-
-            set
-            {
-                this._numberOfArticulationParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "specific")]
-        public byte Specific
-        {
-            get
-            {
-                return this._specific;
-            }
-
-            set
-            {
-                this._specific = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the extra
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "extra")]
-        public byte Extra
-        {
-            get
-            {
-                return this._extra;
-            }
-
-            set
-            {
-                this._extra = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altEntityKind")]
-        public byte AltEntityKind
-        {
-            get
-            {
-                return this._altEntityKind;
-            }
-
-            set
-            {
-                this._altEntityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altDomain")]
-        public byte AltDomain
-        {
-            get
-            {
-                return this._altDomain;
-            }
-
-            set
-            {
-                this._altDomain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "altCountry")]
-        public ushort AltCountry
-        {
-            get
-            {
-                return this._altCountry;
-            }
-
-            set
-            {
-                this._altCountry = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altCategory")]
-        public byte AltCategory
-        {
-            get
-            {
-                return this._altCategory;
-            }
-
-            set
-            {
-                this._altCategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altSubcategory")]
-        public byte AltSubcategory
-        {
-            get
-            {
-                return this._altSubcategory;
-            }
-
-            set
-            {
-                this._altSubcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altSpecific")]
-        public byte AltSpecific
-        {
-            get
-            {
-                return this._altSpecific;
-            }
-
-            set
-            {
-                this._altSpecific = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the altExtra
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "altExtra")]
-        public byte AltExtra
-        {
-            get
-            {
-                return this._altExtra;
-            }
-
-            set
-            {
-                this._altExtra = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the X velo
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "xVelocity")]
-        public float XVelocity
-        {
-            get
-            {
-                return this._xVelocity;
-            }
-
-            set
-            {
-                this._xVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "yVelocity")]
-        public float YVelocity
-        {
-            get
-            {
-                return this._yVelocity;
-            }
-
-            set
-            {
-                this._yVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "zVelocity")]
-        public float ZVelocity
-        {
-            get
-            {
-                return this._zVelocity;
-            }
-
-            set
-            {
-                this._zVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "xLocation")]
-        public double XLocation
-        {
-            get
-            {
-                return this._xLocation;
-            }
-
-            set
-            {
-                this._xLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "yLocation")]
-        public double YLocation
-        {
-            get
-            {
-                return this._yLocation;
-            }
-
-            set
-            {
-                this._yLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "zLocation")]
-        public double ZLocation
-        {
-            get
-            {
-                return this._zLocation;
-            }
-
-            set
-            {
-                this._zLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the psi
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "psi")]
-        public float Psi
-        {
-            get
-            {
-                return this._psi;
-            }
-
-            set
-            {
-                this._psi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the theta
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "theta")]
-        public float Theta
-        {
-            get
-            {
-                return this._theta;
-            }
-
-            set
-            {
-                this._theta = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the phi
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "phi")]
-        public float Phi
-        {
-            get
-            {
-                return this._phi;
-            }
-
-            set
-            {
-                this._phi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
-        public int EntityAppearance
-        {
-            get
-            {
-                return this._entityAppearance;
-            }
-
-            set
-            {
-                this._entityAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration of what dead reckoning algorighm to use
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
-        public byte DeadReckoningAlgorithm
-        {
-            get
-            {
-                return this._deadReckoningAlgorithm;
-            }
-
-            set
-            {
-                this._deadReckoningAlgorithm = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the other parameters to use in the dead reckoning algorithm
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "xAcceleration")]
-        public float XAcceleration
-        {
-            get
-            {
-                return this._xAcceleration;
-            }
-
-            set
-            {
-                this._xAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "yAcceleration")]
-        public float YAcceleration
-        {
-            get
-            {
-                return this._yAcceleration;
-            }
-
-            set
-            {
-                this._yAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "zAcceleration")]
-        public float ZAcceleration
-        {
-            get
-            {
-                return this._zAcceleration;
-            }
-
-            set
-            {
-                this._zAcceleration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "xAngularVelocity")]
-        public float XAngularVelocity
-        {
-            get
-            {
-                return this._xAngularVelocity;
-            }
-
-            set
-            {
-                this._xAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "yAngularVelocity")]
-        public float YAngularVelocity
-        {
-            get
-            {
-                return this._yAngularVelocity;
-            }
-
-            set
-            {
-                this._yAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "zAngularVelocity")]
-        public float ZAngularVelocity
-        {
-            get
-            {
-                return this._zAngularVelocity;
-            }
-
-            set
-            {
-                this._zAngularVelocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
-        /// </summary>
-        [XmlArray(ElementName = "marking")]
-        public byte[] Marking
-        {
-            get
-            {
-                return this._marking;
-            }
-
-            set
-            {
-                this._marking = value;
-            }
-}
-
-        /// <summary>
-        /// Gets or sets the a series of bit flags
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
-        public int Capabilities
-        {
-            get
-            {
-                return this._capabilities;
-            }
-
-            set
-            {
-                this._capabilities = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of articulation parameters
-        /// </summary>
-        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
-        public List<ArticulationParameter> ArticulationParameters
-        {
-            get
-            {
-                return this._articulationParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                    dos.WriteUnsignedShort((ushort)this._entity);
-                    dos.WriteUnsignedByte((byte)this._forceId);
-                    dos.WriteByte((byte)this._articulationParameters.Count);
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                    dos.WriteUnsignedByte((byte)this._specific);
-                    dos.WriteUnsignedByte((byte)this._extra);
-                    dos.WriteUnsignedByte((byte)this._altEntityKind);
-                    dos.WriteUnsignedByte((byte)this._altDomain);
-                    dos.WriteUnsignedShort((ushort)this._altCountry);
-                    dos.WriteUnsignedByte((byte)this._altCategory);
-                    dos.WriteUnsignedByte((byte)this._altSubcategory);
-                    dos.WriteUnsignedByte((byte)this._altSpecific);
-                    dos.WriteUnsignedByte((byte)this._altExtra);
-                    dos.WriteFloat((float)this._xVelocity);
-                    dos.WriteFloat((float)this._yVelocity);
-                    dos.WriteFloat((float)this._zVelocity);
-                    dos.WriteDouble((double)this._xLocation);
-                    dos.WriteDouble((double)this._yLocation);
-                    dos.WriteDouble((double)this._zLocation);
-                    dos.WriteFloat((float)this._psi);
-                    dos.WriteFloat((float)this._theta);
-                    dos.WriteFloat((float)this._phi);
-                    dos.WriteInt((int)this._entityAppearance);
-                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-
-                    dos.WriteFloat((float)this._xAcceleration);
-                    dos.WriteFloat((float)this._yAcceleration);
-                    dos.WriteFloat((float)this._zAcceleration);
-                    dos.WriteFloat((float)this._xAngularVelocity);
-                    dos.WriteFloat((float)this._yAngularVelocity);
-                    dos.WriteFloat((float)this._zAngularVelocity);
-
-                    for (int idx = 0; idx < this._marking.Length; idx++)
-                    {
-                        dos.WriteByte(this._marking[idx]);
-                    }
-
-                    dos.WriteInt((int)this._capabilities);
-
-                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                    {
-                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                        aArticulationParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                    this._entity = dis.ReadUnsignedShort();
-                    this._forceId = dis.ReadUnsignedByte();
-                    this._numberOfArticulationParameters = dis.ReadByte();
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                    this._specific = dis.ReadUnsignedByte();
-                    this._extra = dis.ReadUnsignedByte();
-                    this._altEntityKind = dis.ReadUnsignedByte();
-                    this._altDomain = dis.ReadUnsignedByte();
-                    this._altCountry = dis.ReadUnsignedShort();
-                    this._altCategory = dis.ReadUnsignedByte();
-                    this._altSubcategory = dis.ReadUnsignedByte();
-                    this._altSpecific = dis.ReadUnsignedByte();
-                    this._altExtra = dis.ReadUnsignedByte();
-                    this._xVelocity = dis.ReadFloat();
-                    this._yVelocity = dis.ReadFloat();
-                    this._zVelocity = dis.ReadFloat();
-                    this._xLocation = dis.ReadDouble();
-                    this._yLocation = dis.ReadDouble();
-                    this._zLocation = dis.ReadDouble();
-                    this._psi = dis.ReadFloat();
-                    this._theta = dis.ReadFloat();
-                    this._phi = dis.ReadFloat();
-                    this._entityAppearance = dis.ReadInt();
-                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-
-                    this._xAcceleration = dis.ReadFloat();
-                    this._yAcceleration = dis.ReadFloat();
-                    this._zAcceleration = dis.ReadFloat();
-                    this._xAngularVelocity = dis.ReadFloat();
-                    this._yAngularVelocity = dis.ReadFloat();
-                    this._zAngularVelocity = dis.ReadFloat();
-
-                    for (int idx = 0; idx < this._marking.Length; idx++)
-                    {
-                        this._marking[idx] = dis.ReadByte();
-                    }
-
-                    this._capabilities = dis.ReadInt();
-
-                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
-                    {
-                        ArticulationParameter anX = new ArticulationParameter();
-                        anX.Unmarshal(dis);
-                        this._articulationParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FastEntityStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
-                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
-                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
-                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
-                sb.AppendLine("<altEntityKind type=\"byte\">" + this._altEntityKind.ToString(CultureInfo.InvariantCulture) + "</altEntityKind>");
-                sb.AppendLine("<altDomain type=\"byte\">" + this._altDomain.ToString(CultureInfo.InvariantCulture) + "</altDomain>");
-                sb.AppendLine("<altCountry type=\"ushort\">" + this._altCountry.ToString(CultureInfo.InvariantCulture) + "</altCountry>");
-                sb.AppendLine("<altCategory type=\"byte\">" + this._altCategory.ToString(CultureInfo.InvariantCulture) + "</altCategory>");
-                sb.AppendLine("<altSubcategory type=\"byte\">" + this._altSubcategory.ToString(CultureInfo.InvariantCulture) + "</altSubcategory>");
-                sb.AppendLine("<altSpecific type=\"byte\">" + this._altSpecific.ToString(CultureInfo.InvariantCulture) + "</altSpecific>");
-                sb.AppendLine("<altExtra type=\"byte\">" + this._altExtra.ToString(CultureInfo.InvariantCulture) + "</altExtra>");
-                sb.AppendLine("<xVelocity type=\"float\">" + this._xVelocity.ToString(CultureInfo.InvariantCulture) + "</xVelocity>");
-                sb.AppendLine("<yVelocity type=\"float\">" + this._yVelocity.ToString(CultureInfo.InvariantCulture) + "</yVelocity>");
-                sb.AppendLine("<zVelocity type=\"float\">" + this._zVelocity.ToString(CultureInfo.InvariantCulture) + "</zVelocity>");
-                sb.AppendLine("<xLocation type=\"double\">" + this._xLocation.ToString(CultureInfo.InvariantCulture) + "</xLocation>");
-                sb.AppendLine("<yLocation type=\"double\">" + this._yLocation.ToString(CultureInfo.InvariantCulture) + "</yLocation>");
-                sb.AppendLine("<zLocation type=\"double\">" + this._zLocation.ToString(CultureInfo.InvariantCulture) + "</zLocation>");
-                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
-                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
-                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
-                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
-                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<xAcceleration type=\"float\">" + this._xAcceleration.ToString(CultureInfo.InvariantCulture) + "</xAcceleration>");
-                sb.AppendLine("<yAcceleration type=\"float\">" + this._yAcceleration.ToString(CultureInfo.InvariantCulture) + "</yAcceleration>");
-                sb.AppendLine("<zAcceleration type=\"float\">" + this._zAcceleration.ToString(CultureInfo.InvariantCulture) + "</zAcceleration>");
-                sb.AppendLine("<xAngularVelocity type=\"float\">" + this._xAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</xAngularVelocity>");
-                sb.AppendLine("<yAngularVelocity type=\"float\">" + this._yAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</yAngularVelocity>");
-                sb.AppendLine("<zAngularVelocity type=\"float\">" + this._zAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</zAngularVelocity>");
-                for (int idx = 0; idx < this._marking.Length; idx++)
-                {
-                    sb.AppendLine("<marking" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._marking[idx] + "</marking" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
-                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
-                    aArticulationParameter.Reflection(sb);
-                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</FastEntityStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FastEntityStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FastEntityStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entity != obj._entity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceId != obj._forceId)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._specific != obj._specific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._extra != obj._extra)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altEntityKind != obj._altEntityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altDomain != obj._altDomain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altCountry != obj._altCountry)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altCategory != obj._altCategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altSubcategory != obj._altSubcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altSpecific != obj._altSpecific)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._altExtra != obj._altExtra)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._xVelocity != obj._xVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yVelocity != obj._yVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zVelocity != obj._zVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._xLocation != obj._xLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yLocation != obj._yLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zLocation != obj._zLocation)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._psi != obj._psi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._theta != obj._theta)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phi != obj._phi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._entityAppearance != obj._entityAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._otherParameters.Length != 15) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 15; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._xAcceleration != obj._xAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yAcceleration != obj._yAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zAcceleration != obj._zAcceleration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._xAngularVelocity != obj._xAngularVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._yAngularVelocity != obj._yAngularVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._zAngularVelocity != obj._zAngularVelocity)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._marking.Length != 12) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 12; idx++)
-                {
-                    if (this._marking[idx] != obj._marking[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._capabilities != obj._capabilities)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._articulationParameters.Count != obj._articulationParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-            result = GenerateHash(result) ^ this._entity.GetHashCode();
-            result = GenerateHash(result) ^ this._forceId.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._specific.GetHashCode();
-            result = GenerateHash(result) ^ this._extra.GetHashCode();
-            result = GenerateHash(result) ^ this._altEntityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._altDomain.GetHashCode();
-            result = GenerateHash(result) ^ this._altCountry.GetHashCode();
-            result = GenerateHash(result) ^ this._altCategory.GetHashCode();
-            result = GenerateHash(result) ^ this._altSubcategory.GetHashCode();
-            result = GenerateHash(result) ^ this._altSpecific.GetHashCode();
-            result = GenerateHash(result) ^ this._altExtra.GetHashCode();
-            result = GenerateHash(result) ^ this._xVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._yVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._zVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._xLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._yLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._zLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._psi.GetHashCode();
-            result = GenerateHash(result) ^ this._theta.GetHashCode();
-            result = GenerateHash(result) ^ this._phi.GetHashCode();
-            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
-
-            for (int idx = 0; idx < 15; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            result = GenerateHash(result) ^ this._xAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._yAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._zAcceleration.GetHashCode();
-            result = GenerateHash(result) ^ this._xAngularVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._yAngularVelocity.GetHashCode();
-            result = GenerateHash(result) ^ this._zAngularVelocity.GetHashCode();
-
-            for (int idx = 0; idx < 12; idx++)
-            {
-                result = GenerateHash(result) ^ this._marking[idx].GetHashCode();
-            }
-
-            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
-
-            if (this._articulationParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.3.1. Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ArticulationParameter))]
+    public partial class FastEntityStatePdu : EntityInformationFamilyPdu, IEquatable<FastEntityStatePdu>
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// the entity ID
+        /// </summary>
+        private ushort _entity;
+
+        /// <summary>
+        /// what force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        private byte _forceId;
+
+        /// <summary>
+        /// How many articulation parameters are in the variable length list
+        /// </summary>
+        private byte _numberOfArticulationParameters;
+
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _altEntityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _altDomain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _altCountry;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _altCategory;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _altSubcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _altSpecific;
+
+        private byte _altExtra;
+
+        /// <summary>
+        /// X velo
+        /// </summary>
+        private float _xVelocity;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _yVelocity;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _zVelocity;
+
+        /// <summary>
+        /// X value
+        /// </summary>
+        private double _xLocation;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private double _yLocation;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private double _zLocation;
+
+        private float _psi;
+
+        private float _theta;
+
+        private float _phi;
+
+        /// <summary>
+        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        private int _entityAppearance;
+
+        /// <summary>
+        /// enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        private byte[] _otherParameters = new byte[15];
+
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _xAcceleration;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _yAcceleration;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _zAcceleration;
+
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _xAngularVelocity;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _yAngularVelocity;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _zAngularVelocity;
+
+        /// <summary>
+        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        private byte[] _marking = new byte[12];
+
+        /// <summary>
+        /// a series of bit flags
+        /// </summary>
+        private int _capabilities;
+
+        /// <summary>
+        /// variable length list of articulation parameters
+        /// </summary>
+        private List<ArticulationParameter> _articulationParameters = new List<ArticulationParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FastEntityStatePdu"/> class.
+        /// </summary>
+        public FastEntityStatePdu()
+        {
+            PduType = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FastEntityStatePdu left, FastEntityStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FastEntityStatePdu left, FastEntityStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            marshalSize += 2;  // this._entity
+            marshalSize += 1;  // this._forceId
+            marshalSize += 1;  // this._numberOfArticulationParameters
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            marshalSize += 1;  // this._altEntityKind
+            marshalSize += 1;  // this._altDomain
+            marshalSize += 2;  // this._altCountry
+            marshalSize += 1;  // this._altCategory
+            marshalSize += 1;  // this._altSubcategory
+            marshalSize += 1;  // this._altSpecific
+            marshalSize += 1;  // this._altExtra
+            marshalSize += 4;  // this._xVelocity
+            marshalSize += 4;  // this._yVelocity
+            marshalSize += 4;  // this._zVelocity
+            marshalSize += 8;  // this._xLocation
+            marshalSize += 8;  // this._yLocation
+            marshalSize += 8;  // this._zLocation
+            marshalSize += 4;  // this._psi
+            marshalSize += 4;  // this._theta
+            marshalSize += 4;  // this._phi
+            marshalSize += 4;  // this._entityAppearance
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 15 * 1;  // _otherParameters
+            marshalSize += 4;  // this._xAcceleration
+            marshalSize += 4;  // this._yAcceleration
+            marshalSize += 4;  // this._zAcceleration
+            marshalSize += 4;  // this._xAngularVelocity
+            marshalSize += 4;  // this._yAngularVelocity
+            marshalSize += 4;  // this._zAngularVelocity
+            marshalSize += 12 * 1;  // _marking
+            marshalSize += 4;  // this._capabilities
+            for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+            {
+                ArticulationParameter listElement = (ArticulationParameter)this._articulationParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
+        public ushort Entity
+        {
+            get
+            {
+                return this._entity;
+            }
+
+            set
+            {
+                this._entity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the what force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
+        public byte ForceId
+        {
+            get
+            {
+                return this._forceId;
+            }
+
+            set
+            {
+                this._forceId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many articulation parameters are in the variable length list
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfArticulationParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfArticulationParameters")]
+        public byte NumberOfArticulationParameters
+        {
+            get
+            {
+                return this._numberOfArticulationParameters;
+            }
+
+            set
+            {
+                this._numberOfArticulationParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the extra
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altEntityKind")]
+        public byte AltEntityKind
+        {
+            get
+            {
+                return this._altEntityKind;
+            }
+
+            set
+            {
+                this._altEntityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altDomain")]
+        public byte AltDomain
+        {
+            get
+            {
+                return this._altDomain;
+            }
+
+            set
+            {
+                this._altDomain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "altCountry")]
+        public ushort AltCountry
+        {
+            get
+            {
+                return this._altCountry;
+            }
+
+            set
+            {
+                this._altCountry = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altCategory")]
+        public byte AltCategory
+        {
+            get
+            {
+                return this._altCategory;
+            }
+
+            set
+            {
+                this._altCategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altSubcategory")]
+        public byte AltSubcategory
+        {
+            get
+            {
+                return this._altSubcategory;
+            }
+
+            set
+            {
+                this._altSubcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altSpecific")]
+        public byte AltSpecific
+        {
+            get
+            {
+                return this._altSpecific;
+            }
+
+            set
+            {
+                this._altSpecific = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the altExtra
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altExtra")]
+        public byte AltExtra
+        {
+            get
+            {
+                return this._altExtra;
+            }
+
+            set
+            {
+                this._altExtra = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the X velo
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "xVelocity")]
+        public float XVelocity
+        {
+            get
+            {
+                return this._xVelocity;
+            }
+
+            set
+            {
+                this._xVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "yVelocity")]
+        public float YVelocity
+        {
+            get
+            {
+                return this._yVelocity;
+            }
+
+            set
+            {
+                this._yVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "zVelocity")]
+        public float ZVelocity
+        {
+            get
+            {
+                return this._zVelocity;
+            }
+
+            set
+            {
+                this._zVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "xLocation")]
+        public double XLocation
+        {
+            get
+            {
+                return this._xLocation;
+            }
+
+            set
+            {
+                this._xLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "yLocation")]
+        public double YLocation
+        {
+            get
+            {
+                return this._yLocation;
+            }
+
+            set
+            {
+                this._yLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "zLocation")]
+        public double ZLocation
+        {
+            get
+            {
+                return this._zLocation;
+            }
+
+            set
+            {
+                this._zLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the psi
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "psi")]
+        public float Psi
+        {
+            get
+            {
+                return this._psi;
+            }
+
+            set
+            {
+                this._psi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the theta
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "theta")]
+        public float Theta
+        {
+            get
+            {
+                return this._theta;
+            }
+
+            set
+            {
+                this._theta = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the phi
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "phi")]
+        public float Phi
+        {
+            get
+            {
+                return this._phi;
+            }
+
+            set
+            {
+                this._phi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
+        public int EntityAppearance
+        {
+            get
+            {
+                return this._entityAppearance;
+            }
+
+            set
+            {
+                this._entityAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "xAcceleration")]
+        public float XAcceleration
+        {
+            get
+            {
+                return this._xAcceleration;
+            }
+
+            set
+            {
+                this._xAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "yAcceleration")]
+        public float YAcceleration
+        {
+            get
+            {
+                return this._yAcceleration;
+            }
+
+            set
+            {
+                this._yAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "zAcceleration")]
+        public float ZAcceleration
+        {
+            get
+            {
+                return this._zAcceleration;
+            }
+
+            set
+            {
+                this._zAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "xAngularVelocity")]
+        public float XAngularVelocity
+        {
+            get
+            {
+                return this._xAngularVelocity;
+            }
+
+            set
+            {
+                this._xAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "yAngularVelocity")]
+        public float YAngularVelocity
+        {
+            get
+            {
+                return this._yAngularVelocity;
+            }
+
+            set
+            {
+                this._yAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "zAngularVelocity")]
+        public float ZAngularVelocity
+        {
+            get
+            {
+                return this._zAngularVelocity;
+            }
+
+            set
+            {
+                this._zAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        [XmlArray(ElementName = "marking")]
+        public byte[] Marking
+        {
+            get
+            {
+                return this._marking;
+            }
+
+            set
+            {
+                this._marking = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
+        public int Capabilities
+        {
+            get
+            {
+                return this._capabilities;
+            }
+
+            set
+            {
+                this._capabilities = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of articulation parameters
+        /// </summary>
+        [XmlElement(ElementName = "articulationParametersList", Type = typeof(List<ArticulationParameter>))]
+        public List<ArticulationParameter> ArticulationParameters
+        {
+            get
+            {
+                return this._articulationParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                    dos.WriteUnsignedShort((ushort)this._entity);
+                    dos.WriteUnsignedByte((byte)this._forceId);
+                    dos.WriteByte((byte)this._articulationParameters.Count);
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                    dos.WriteUnsignedByte((byte)this._altEntityKind);
+                    dos.WriteUnsignedByte((byte)this._altDomain);
+                    dos.WriteUnsignedShort((ushort)this._altCountry);
+                    dos.WriteUnsignedByte((byte)this._altCategory);
+                    dos.WriteUnsignedByte((byte)this._altSubcategory);
+                    dos.WriteUnsignedByte((byte)this._altSpecific);
+                    dos.WriteUnsignedByte((byte)this._altExtra);
+                    dos.WriteFloat((float)this._xVelocity);
+                    dos.WriteFloat((float)this._yVelocity);
+                    dos.WriteFloat((float)this._zVelocity);
+                    dos.WriteDouble((double)this._xLocation);
+                    dos.WriteDouble((double)this._yLocation);
+                    dos.WriteDouble((double)this._zLocation);
+                    dos.WriteFloat((float)this._psi);
+                    dos.WriteFloat((float)this._theta);
+                    dos.WriteFloat((float)this._phi);
+                    dos.WriteInt((int)this._entityAppearance);
+                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+
+                    dos.WriteFloat((float)this._xAcceleration);
+                    dos.WriteFloat((float)this._yAcceleration);
+                    dos.WriteFloat((float)this._zAcceleration);
+                    dos.WriteFloat((float)this._xAngularVelocity);
+                    dos.WriteFloat((float)this._yAngularVelocity);
+                    dos.WriteFloat((float)this._zAngularVelocity);
+
+                    for (int idx = 0; idx < this._marking.Length; idx++)
+                    {
+                        dos.WriteByte(this._marking[idx]);
+                    }
+
+                    dos.WriteInt((int)this._capabilities);
+
+                    for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                    {
+                        ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                        aArticulationParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                    this._entity = dis.ReadUnsignedShort();
+                    this._forceId = dis.ReadUnsignedByte();
+                    this._numberOfArticulationParameters = dis.ReadByte();
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                    this._altEntityKind = dis.ReadUnsignedByte();
+                    this._altDomain = dis.ReadUnsignedByte();
+                    this._altCountry = dis.ReadUnsignedShort();
+                    this._altCategory = dis.ReadUnsignedByte();
+                    this._altSubcategory = dis.ReadUnsignedByte();
+                    this._altSpecific = dis.ReadUnsignedByte();
+                    this._altExtra = dis.ReadUnsignedByte();
+                    this._xVelocity = dis.ReadFloat();
+                    this._yVelocity = dis.ReadFloat();
+                    this._zVelocity = dis.ReadFloat();
+                    this._xLocation = dis.ReadDouble();
+                    this._yLocation = dis.ReadDouble();
+                    this._zLocation = dis.ReadDouble();
+                    this._psi = dis.ReadFloat();
+                    this._theta = dis.ReadFloat();
+                    this._phi = dis.ReadFloat();
+                    this._entityAppearance = dis.ReadInt();
+                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+
+                    this._xAcceleration = dis.ReadFloat();
+                    this._yAcceleration = dis.ReadFloat();
+                    this._zAcceleration = dis.ReadFloat();
+                    this._xAngularVelocity = dis.ReadFloat();
+                    this._yAngularVelocity = dis.ReadFloat();
+                    this._zAngularVelocity = dis.ReadFloat();
+
+                    for (int idx = 0; idx < this._marking.Length; idx++)
+                    {
+                        this._marking[idx] = dis.ReadByte();
+                    }
+
+                    this._capabilities = dis.ReadInt();
+
+                    for (int idx = 0; idx < this.NumberOfArticulationParameters; idx++)
+                    {
+                        ArticulationParameter anX = new ArticulationParameter();
+                        anX.Unmarshal(dis);
+                        this._articulationParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FastEntityStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
+                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
+                sb.AppendLine("<articulationParameters type=\"byte\">" + this._articulationParameters.Count.ToString(CultureInfo.InvariantCulture) + "</articulationParameters>");
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("<altEntityKind type=\"byte\">" + this._altEntityKind.ToString(CultureInfo.InvariantCulture) + "</altEntityKind>");
+                sb.AppendLine("<altDomain type=\"byte\">" + this._altDomain.ToString(CultureInfo.InvariantCulture) + "</altDomain>");
+                sb.AppendLine("<altCountry type=\"ushort\">" + this._altCountry.ToString(CultureInfo.InvariantCulture) + "</altCountry>");
+                sb.AppendLine("<altCategory type=\"byte\">" + this._altCategory.ToString(CultureInfo.InvariantCulture) + "</altCategory>");
+                sb.AppendLine("<altSubcategory type=\"byte\">" + this._altSubcategory.ToString(CultureInfo.InvariantCulture) + "</altSubcategory>");
+                sb.AppendLine("<altSpecific type=\"byte\">" + this._altSpecific.ToString(CultureInfo.InvariantCulture) + "</altSpecific>");
+                sb.AppendLine("<altExtra type=\"byte\">" + this._altExtra.ToString(CultureInfo.InvariantCulture) + "</altExtra>");
+                sb.AppendLine("<xVelocity type=\"float\">" + this._xVelocity.ToString(CultureInfo.InvariantCulture) + "</xVelocity>");
+                sb.AppendLine("<yVelocity type=\"float\">" + this._yVelocity.ToString(CultureInfo.InvariantCulture) + "</yVelocity>");
+                sb.AppendLine("<zVelocity type=\"float\">" + this._zVelocity.ToString(CultureInfo.InvariantCulture) + "</zVelocity>");
+                sb.AppendLine("<xLocation type=\"double\">" + this._xLocation.ToString(CultureInfo.InvariantCulture) + "</xLocation>");
+                sb.AppendLine("<yLocation type=\"double\">" + this._yLocation.ToString(CultureInfo.InvariantCulture) + "</yLocation>");
+                sb.AppendLine("<zLocation type=\"double\">" + this._zLocation.ToString(CultureInfo.InvariantCulture) + "</zLocation>");
+                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
+                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
+                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
+                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<xAcceleration type=\"float\">" + this._xAcceleration.ToString(CultureInfo.InvariantCulture) + "</xAcceleration>");
+                sb.AppendLine("<yAcceleration type=\"float\">" + this._yAcceleration.ToString(CultureInfo.InvariantCulture) + "</yAcceleration>");
+                sb.AppendLine("<zAcceleration type=\"float\">" + this._zAcceleration.ToString(CultureInfo.InvariantCulture) + "</zAcceleration>");
+                sb.AppendLine("<xAngularVelocity type=\"float\">" + this._xAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</xAngularVelocity>");
+                sb.AppendLine("<yAngularVelocity type=\"float\">" + this._yAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</yAngularVelocity>");
+                sb.AppendLine("<zAngularVelocity type=\"float\">" + this._zAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</zAngularVelocity>");
+                for (int idx = 0; idx < this._marking.Length; idx++)
+                {
+                    sb.AppendLine("<marking" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._marking[idx] + "</marking" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    sb.AppendLine("<articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ArticulationParameter\">");
+                    ArticulationParameter aArticulationParameter = (ArticulationParameter)this._articulationParameters[idx];
+                    aArticulationParameter.Reflection(sb);
+                    sb.AppendLine("</articulationParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</FastEntityStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FastEntityStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FastEntityStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entity != obj._entity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceId != obj._forceId)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfArticulationParameters != obj._numberOfArticulationParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altEntityKind != obj._altEntityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altDomain != obj._altDomain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altCountry != obj._altCountry)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altCategory != obj._altCategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altSubcategory != obj._altSubcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altSpecific != obj._altSpecific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altExtra != obj._altExtra)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._xVelocity != obj._xVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yVelocity != obj._yVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zVelocity != obj._zVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._xLocation != obj._xLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yLocation != obj._yLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zLocation != obj._zLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._psi != obj._psi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._theta != obj._theta)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phi != obj._phi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityAppearance != obj._entityAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._otherParameters.Length != 15) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 15; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._xAcceleration != obj._xAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yAcceleration != obj._yAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zAcceleration != obj._zAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._xAngularVelocity != obj._xAngularVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yAngularVelocity != obj._yAngularVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zAngularVelocity != obj._zAngularVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._marking.Length != 12) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 12; idx++)
+                {
+                    if (this._marking[idx] != obj._marking[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._capabilities != obj._capabilities)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._articulationParameters.Count != obj._articulationParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    if (!this._articulationParameters[idx].Equals(obj._articulationParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+            result = GenerateHash(result) ^ this._entity.GetHashCode();
+            result = GenerateHash(result) ^ this._forceId.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfArticulationParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+            result = GenerateHash(result) ^ this._altEntityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._altDomain.GetHashCode();
+            result = GenerateHash(result) ^ this._altCountry.GetHashCode();
+            result = GenerateHash(result) ^ this._altCategory.GetHashCode();
+            result = GenerateHash(result) ^ this._altSubcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._altSpecific.GetHashCode();
+            result = GenerateHash(result) ^ this._altExtra.GetHashCode();
+            result = GenerateHash(result) ^ this._xVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._yVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._zVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._xLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._yLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._zLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._psi.GetHashCode();
+            result = GenerateHash(result) ^ this._theta.GetHashCode();
+            result = GenerateHash(result) ^ this._phi.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+
+            for (int idx = 0; idx < 15; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            result = GenerateHash(result) ^ this._xAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._yAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._zAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._xAngularVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._yAngularVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._zAngularVelocity.GetHashCode();
+
+            for (int idx = 0; idx < 12; idx++)
+            {
+                result = GenerateHash(result) ^ this._marking[idx].GetHashCode();
+            }
+
+            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
+
+            if (this._articulationParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._articulationParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._articulationParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FirePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/FirePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/FirePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/FirePdu.cs
index dbdc568..1dd8de6 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FirePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/FirePdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Sectioin 5.3.4.1. Information about someone firing something. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(BurstDescriptor))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class FirePdu : WarfareFamilyPdu, IEquatable<FirePdu>
-    {
-        /// <summary>
-        /// ID of the munition that is being shot
-        /// </summary>
-        private EntityID _munitionID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        private int _fireMissionIndex;
-
-        /// <summary>
-        /// location of the firing event
-        /// </summary>
-        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
-
-        /// <summary>
-        /// Describes munitions used in the firing event
-        /// </summary>
-        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
-
-        /// <summary>
-        /// Velocity of the ammunition
-        /// </summary>
-        private Vector3Float _velocity = new Vector3Float();
-
-        /// <summary>
-        /// range to the target
-        /// </summary>
-        private float _range;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FirePdu"/> class.
-        /// </summary>
-        public FirePdu()
-        {
-            PduType = (byte)2;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FirePdu left, FirePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FirePdu left, FirePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 4;  // this._fireMissionIndex
-            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
-            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
-            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
-            marshalSize += 4;  // this._range
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the munition that is being shot
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
-        public EntityID MunitionID
-        {
-            get
-            {
-                return this._munitionID;
-            }
-
-            set
-            {
-                this._munitionID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the fireMissionIndex
-        /// </summary>
-        [XmlElement(Type = typeof(int), ElementName = "fireMissionIndex")]
-        public int FireMissionIndex
-        {
-            get
-            {
-                return this._fireMissionIndex;
-            }
-
-            set
-            {
-                this._fireMissionIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of the firing event
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
-        public Vector3Double LocationInWorldCoordinates
-        {
-            get
-            {
-                return this._locationInWorldCoordinates;
-            }
-
-            set
-            {
-                this._locationInWorldCoordinates = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Describes munitions used in the firing event
-        /// </summary>
-        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
-        public BurstDescriptor BurstDescriptor
-        {
-            get
-            {
-                return this._burstDescriptor;
-            }
-
-            set
-            {
-                this._burstDescriptor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Velocity of the ammunition
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
-        public Vector3Float Velocity
-        {
-            get
-            {
-                return this._velocity;
-            }
-
-            set
-            {
-                this._velocity = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the range to the target
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "range")]
-        public float Range
-        {
-            get
-            {
-                return this._range;
-            }
-
-            set
-            {
-                this._range = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._munitionID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteInt((int)this._fireMissionIndex);
-                    this._locationInWorldCoordinates.Marshal(dos);
-                    this._burstDescriptor.Marshal(dos);
-                    this._velocity.Marshal(dos);
-                    dos.WriteFloat((float)this._range);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._munitionID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._fireMissionIndex = dis.ReadInt();
-                    this._locationInWorldCoordinates.Unmarshal(dis);
-                    this._burstDescriptor.Unmarshal(dis);
-                    this._velocity.Unmarshal(dis);
-                    this._range = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FirePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<munitionID>");
-                this._munitionID.Reflection(sb);
-                sb.AppendLine("</munitionID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<fireMissionIndex type=\"int\">" + this._fireMissionIndex.ToString(CultureInfo.InvariantCulture) + "</fireMissionIndex>");
-                sb.AppendLine("<locationInWorldCoordinates>");
-                this._locationInWorldCoordinates.Reflection(sb);
-                sb.AppendLine("</locationInWorldCoordinates>");
-                sb.AppendLine("<burstDescriptor>");
-                this._burstDescriptor.Reflection(sb);
-                sb.AppendLine("</burstDescriptor>");
-                sb.AppendLine("<velocity>");
-                this._velocity.Reflection(sb);
-                sb.AppendLine("</velocity>");
-                sb.AppendLine("<range type=\"float\">" + this._range.ToString(CultureInfo.InvariantCulture) + "</range>");
-                sb.AppendLine("</FirePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FirePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FirePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._munitionID.Equals(obj._munitionID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fireMissionIndex != obj._fireMissionIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._velocity.Equals(obj._velocity))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._range != obj._range)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._fireMissionIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
-            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
-            result = GenerateHash(result) ^ this._velocity.GetHashCode();
-            result = GenerateHash(result) ^ this._range.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Sectioin 5.3.4.1. Information about someone firing something. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(BurstDescriptor))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class FirePdu : WarfareFamilyPdu, IEquatable<FirePdu>
+    {
+        /// <summary>
+        /// ID of the munition that is being shot
+        /// </summary>
+        private EntityID _munitionID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        private int _fireMissionIndex;
+
+        /// <summary>
+        /// location of the firing event
+        /// </summary>
+        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
+
+        /// <summary>
+        /// Describes munitions used in the firing event
+        /// </summary>
+        private BurstDescriptor _burstDescriptor = new BurstDescriptor();
+
+        /// <summary>
+        /// Velocity of the ammunition
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// range to the target
+        /// </summary>
+        private float _range;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FirePdu"/> class.
+        /// </summary>
+        public FirePdu()
+        {
+            PduType = (byte)2;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FirePdu left, FirePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FirePdu left, FirePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._munitionID.GetMarshalledSize();  // this._munitionID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 4;  // this._fireMissionIndex
+            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
+            marshalSize += this._burstDescriptor.GetMarshalledSize();  // this._burstDescriptor
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += 4;  // this._range
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the munition that is being shot
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "munitionID")]
+        public EntityID MunitionID
+        {
+            get
+            {
+                return this._munitionID;
+            }
+
+            set
+            {
+                this._munitionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the fireMissionIndex
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "fireMissionIndex")]
+        public int FireMissionIndex
+        {
+            get
+            {
+                return this._fireMissionIndex;
+            }
+
+            set
+            {
+                this._fireMissionIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of the firing event
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
+        public Vector3Double LocationInWorldCoordinates
+        {
+            get
+            {
+                return this._locationInWorldCoordinates;
+            }
+
+            set
+            {
+                this._locationInWorldCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes munitions used in the firing event
+        /// </summary>
+        [XmlElement(Type = typeof(BurstDescriptor), ElementName = "burstDescriptor")]
+        public BurstDescriptor BurstDescriptor
+        {
+            get
+            {
+                return this._burstDescriptor;
+            }
+
+            set
+            {
+                this._burstDescriptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Velocity of the ammunition
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the range to the target
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "range")]
+        public float Range
+        {
+            get
+            {
+                return this._range;
+            }
+
+            set
+            {
+                this._range = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteInt((int)this._fireMissionIndex);
+                    this._locationInWorldCoordinates.Marshal(dos);
+                    this._burstDescriptor.Marshal(dos);
+                    this._velocity.Marshal(dos);
+                    dos.WriteFloat((float)this._range);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._fireMissionIndex = dis.ReadInt();
+                    this._locationInWorldCoordinates.Unmarshal(dis);
+                    this._burstDescriptor.Unmarshal(dis);
+                    this._velocity.Unmarshal(dis);
+                    this._range = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FirePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<munitionID>");
+                this._munitionID.Reflection(sb);
+                sb.AppendLine("</munitionID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<fireMissionIndex type=\"int\">" + this._fireMissionIndex.ToString(CultureInfo.InvariantCulture) + "</fireMissionIndex>");
+                sb.AppendLine("<locationInWorldCoordinates>");
+                this._locationInWorldCoordinates.Reflection(sb);
+                sb.AppendLine("</locationInWorldCoordinates>");
+                sb.AppendLine("<burstDescriptor>");
+                this._burstDescriptor.Reflection(sb);
+                sb.AppendLine("</burstDescriptor>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<range type=\"float\">" + this._range.ToString(CultureInfo.InvariantCulture) + "</range>");
+                sb.AppendLine("</FirePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FirePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FirePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._munitionID.Equals(obj._munitionID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fireMissionIndex != obj._fireMissionIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._burstDescriptor.Equals(obj._burstDescriptor))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._range != obj._range)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._munitionID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._fireMissionIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._burstDescriptor.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._range.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FixedDatum.cs b/Libs/CsharpDis6/Dis1998/Generated/FixedDatum.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/FixedDatum.cs
rename to Libs/CsharpDis6/Dis1998/Generated/FixedDatum.cs
index 18b7d26..d46cb3c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FixedDatum.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/FixedDatum.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.18. Fixed Datum Record
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FixedDatum
-    {
-        /// <summary>
-        /// ID of the fixed datum
-        /// </summary>
-        private uint _fixedDatumID;
-
-        /// <summary>
-        /// Value for the fixed datum
-        /// </summary>
-        private uint _fixedDatumValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FixedDatum"/> class.
-        /// </summary>
-        public FixedDatum()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FixedDatum left, FixedDatum right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FixedDatum left, FixedDatum right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._fixedDatumID
-            marshalSize += 4;  // this._fixedDatumValue
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the fixed datum
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumID")]
-        public uint FixedDatumID
-        {
-            get
-            {
-                return this._fixedDatumID;
-            }
-
-            set
-            {
-                this._fixedDatumID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Value for the fixed datum
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumValue")]
-        public uint FixedDatumValue
-        {
-            get
-            {
-                return this._fixedDatumValue;
-            }
-
-            set
-            {
-                this._fixedDatumValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._fixedDatumID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumValue);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._fixedDatumID = dis.ReadUnsignedInt();
-                    this._fixedDatumValue = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FixedDatum>");
-            try
-            {
-                sb.AppendLine("<fixedDatumID type=\"uint\">" + this._fixedDatumID.ToString(CultureInfo.InvariantCulture) + "</fixedDatumID>");
-                sb.AppendLine("<fixedDatumValue type=\"uint\">" + this._fixedDatumValue.ToString(CultureInfo.InvariantCulture) + "</fixedDatumValue>");
-                sb.AppendLine("</FixedDatum>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FixedDatum;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FixedDatum obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._fixedDatumID != obj._fixedDatumID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumValue != obj._fixedDatumValue)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._fixedDatumID.GetHashCode();
-            result = GenerateHash(result) ^ this._fixedDatumValue.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.18. Fixed Datum Record
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FixedDatum
+    {
+        /// <summary>
+        /// ID of the fixed datum
+        /// </summary>
+        private uint _fixedDatumID;
+
+        /// <summary>
+        /// Value for the fixed datum
+        /// </summary>
+        private uint _fixedDatumValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FixedDatum"/> class.
+        /// </summary>
+        public FixedDatum()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FixedDatum left, FixedDatum right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FixedDatum left, FixedDatum right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._fixedDatumID
+            marshalSize += 4;  // this._fixedDatumValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the fixed datum
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumID")]
+        public uint FixedDatumID
+        {
+            get
+            {
+                return this._fixedDatumID;
+            }
+
+            set
+            {
+                this._fixedDatumID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Value for the fixed datum
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumValue")]
+        public uint FixedDatumValue
+        {
+            get
+            {
+                return this._fixedDatumValue;
+            }
+
+            set
+            {
+                this._fixedDatumValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatumID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumValue);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._fixedDatumID = dis.ReadUnsignedInt();
+                    this._fixedDatumValue = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FixedDatum>");
+            try
+            {
+                sb.AppendLine("<fixedDatumID type=\"uint\">" + this._fixedDatumID.ToString(CultureInfo.InvariantCulture) + "</fixedDatumID>");
+                sb.AppendLine("<fixedDatumValue type=\"uint\">" + this._fixedDatumValue.ToString(CultureInfo.InvariantCulture) + "</fixedDatumValue>");
+                sb.AppendLine("</FixedDatum>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FixedDatum;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FixedDatum obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._fixedDatumID != obj._fixedDatumID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumValue != obj._fixedDatumValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._fixedDatumID.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FourByteChunk.cs b/Libs/CsharpDis6/Dis1998/Generated/FourByteChunk.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/FourByteChunk.cs
rename to Libs/CsharpDis6/Dis1998/Generated/FourByteChunk.cs
index 9ac11f2..65ba936 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FourByteChunk.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/FourByteChunk.cs
@@ -1,324 +1,324 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 32 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FourByteChunk
-    {
-        /// <summary>
-        /// four bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[4];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FourByteChunk"/> class.
-        /// </summary>
-        public FourByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FourByteChunk left, FourByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FourByteChunk left, FourByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the four bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FourByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</FourByteChunk>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FourByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FourByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 4) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 4; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            for (int idx = 0; idx < 4; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 32 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FourByteChunk
+    {
+        /// <summary>
+        /// four bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[4];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FourByteChunk"/> class.
+        /// </summary>
+        public FourByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FourByteChunk left, FourByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FourByteChunk left, FourByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the four bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FourByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</FourByteChunk>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FourByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FourByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 4) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 4; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            for (int idx = 0; idx < 4; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterData.cs b/Libs/CsharpDis6/Dis1998/Generated/FundamentalParameterData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/FundamentalParameterData.cs
index 0a1f3ac..7c5813a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/FundamentalParameterData.cs
@@ -1,588 +1,588 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.22. Contains electromagnetic emmision regineratin parameters that are        variable throughout a scenario dependent on the actions of the participants in the simulation. Also provides basic parametric data that may be used to support low-fidelity simulations.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FundamentalParameterData
-    {
-        /// <summary>
-        /// center frequency of the emission in hertz.
-        /// </summary>
-        private float _frequency;
-
-        /// <summary>
-        /// Bandwidth of the frequencies corresponding to the fequency field.
-        /// </summary>
-        private float _frequencyRange;
-
-        /// <summary>
-        /// Effective radiated power for the emission in DdBm. For a     radar noise jammer, indicates the peak of the transmitted power.
-        /// </summary>
-        private float _effectiveRadiatedPower;
-
-        /// <summary>
-        /// Average repetition frequency of the emission in hertz.
-        /// </summary>
-        private float _pulseRepetitionFrequency;
-
-        /// <summary>
-        /// Average pulse width  of the emission in microseconds.
-        /// </summary>
-        private float _pulseWidth;
-
-        /// <summary>
-        /// Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
-        /// </summary>
-        private float _beamAzimuthCenter;
-
-        /// <summary>
-        /// Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        private float _beamAzimuthSweep;
-
-        /// <summary>
-        /// Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        private float _beamElevationCenter;
-
-        /// <summary>
-        /// Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        private float _beamElevationSweep;
-
-        /// <summary>
-        /// allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        private float _beamSweepSync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FundamentalParameterData"/> class.
-        /// </summary>
-        public FundamentalParameterData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FundamentalParameterData left, FundamentalParameterData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FundamentalParameterData left, FundamentalParameterData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._frequency
-            marshalSize += 4;  // this._frequencyRange
-            marshalSize += 4;  // this._effectiveRadiatedPower
-            marshalSize += 4;  // this._pulseRepetitionFrequency
-            marshalSize += 4;  // this._pulseWidth
-            marshalSize += 4;  // this._beamAzimuthCenter
-            marshalSize += 4;  // this._beamAzimuthSweep
-            marshalSize += 4;  // this._beamElevationCenter
-            marshalSize += 4;  // this._beamElevationSweep
-            marshalSize += 4;  // this._beamSweepSync
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the center frequency of the emission in hertz.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequency")]
-        public float Frequency
-        {
-            get
-            {
-                return this._frequency;
-            }
-
-            set
-            {
-                this._frequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Bandwidth of the frequencies corresponding to the fequency field.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequencyRange")]
-        public float FrequencyRange
-        {
-            get
-            {
-                return this._frequencyRange;
-            }
-
-            set
-            {
-                this._frequencyRange = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Effective radiated power for the emission in DdBm. For a     radar noise jammer, indicates the peak of the transmitted power.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "effectiveRadiatedPower")]
-        public float EffectiveRadiatedPower
-        {
-            get
-            {
-                return this._effectiveRadiatedPower;
-            }
-
-            set
-            {
-                this._effectiveRadiatedPower = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Average repetition frequency of the emission in hertz.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
-        public float PulseRepetitionFrequency
-        {
-            get
-            {
-                return this._pulseRepetitionFrequency;
-            }
-
-            set
-            {
-                this._pulseRepetitionFrequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Average pulse width  of the emission in microseconds.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
-        public float PulseWidth
-        {
-            get
-            {
-                return this._pulseWidth;
-            }
-
-            set
-            {
-                this._pulseWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
-        public float BeamAzimuthCenter
-        {
-            get
-            {
-                return this._beamAzimuthCenter;
-            }
-
-            set
-            {
-                this._beamAzimuthCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
-        public float BeamAzimuthSweep
-        {
-            get
-            {
-                return this._beamAzimuthSweep;
-            }
-
-            set
-            {
-                this._beamAzimuthSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation center to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
-        public float BeamElevationCenter
-        {
-            get
-            {
-                return this._beamElevationCenter;
-            }
-
-            set
-            {
-                this._beamElevationCenter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
-        public float BeamElevationSweep
-        {
-            get
-            {
-                return this._beamElevationSweep;
-            }
-
-            set
-            {
-                this._beamElevationSweep = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
-        public float BeamSweepSync
-        {
-            get
-            {
-                return this._beamSweepSync;
-            }
-
-            set
-            {
-                this._beamSweepSync = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._frequency);
-                    dos.WriteFloat((float)this._frequencyRange);
-                    dos.WriteFloat((float)this._effectiveRadiatedPower);
-                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
-                    dos.WriteFloat((float)this._pulseWidth);
-                    dos.WriteFloat((float)this._beamAzimuthCenter);
-                    dos.WriteFloat((float)this._beamAzimuthSweep);
-                    dos.WriteFloat((float)this._beamElevationCenter);
-                    dos.WriteFloat((float)this._beamElevationSweep);
-                    dos.WriteFloat((float)this._beamSweepSync);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._frequency = dis.ReadFloat();
-                    this._frequencyRange = dis.ReadFloat();
-                    this._effectiveRadiatedPower = dis.ReadFloat();
-                    this._pulseRepetitionFrequency = dis.ReadFloat();
-                    this._pulseWidth = dis.ReadFloat();
-                    this._beamAzimuthCenter = dis.ReadFloat();
-                    this._beamAzimuthSweep = dis.ReadFloat();
-                    this._beamElevationCenter = dis.ReadFloat();
-                    this._beamElevationSweep = dis.ReadFloat();
-                    this._beamSweepSync = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FundamentalParameterData>");
-            try
-            {
-                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
-                sb.AppendLine("<frequencyRange type=\"float\">" + this._frequencyRange.ToString(CultureInfo.InvariantCulture) + "</frequencyRange>");
-                sb.AppendLine("<effectiveRadiatedPower type=\"float\">" + this._effectiveRadiatedPower.ToString(CultureInfo.InvariantCulture) + "</effectiveRadiatedPower>");
-                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
-                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
-                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
-                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
-                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
-                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
-                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
-                sb.AppendLine("</FundamentalParameterData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FundamentalParameterData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FundamentalParameterData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._frequency != obj._frequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frequencyRange != obj._frequencyRange)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._effectiveRadiatedPower != obj._effectiveRadiatedPower)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseWidth != obj._pulseWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationCenter != obj._beamElevationCenter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamElevationSweep != obj._beamElevationSweep)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamSweepSync != obj._beamSweepSync)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._frequency.GetHashCode();
-            result = GenerateHash(result) ^ this._frequencyRange.GetHashCode();
-            result = GenerateHash(result) ^ this._effectiveRadiatedPower.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
-            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
-            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.22. Contains electromagnetic emmision regineratin parameters that are        variable throughout a scenario dependent on the actions of the participants in the simulation. Also provides basic parametric data that may be used to support low-fidelity simulations.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FundamentalParameterData
+    {
+        /// <summary>
+        /// center frequency of the emission in hertz.
+        /// </summary>
+        private float _frequency;
+
+        /// <summary>
+        /// Bandwidth of the frequencies corresponding to the fequency field.
+        /// </summary>
+        private float _frequencyRange;
+
+        /// <summary>
+        /// Effective radiated power for the emission in DdBm. For a     radar noise jammer, indicates the peak of the transmitted power.
+        /// </summary>
+        private float _effectiveRadiatedPower;
+
+        /// <summary>
+        /// Average repetition frequency of the emission in hertz.
+        /// </summary>
+        private float _pulseRepetitionFrequency;
+
+        /// <summary>
+        /// Average pulse width  of the emission in microseconds.
+        /// </summary>
+        private float _pulseWidth;
+
+        /// <summary>
+        /// Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
+        /// </summary>
+        private float _beamAzimuthCenter;
+
+        /// <summary>
+        /// Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        private float _beamAzimuthSweep;
+
+        /// <summary>
+        /// Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        private float _beamElevationCenter;
+
+        /// <summary>
+        /// Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        private float _beamElevationSweep;
+
+        /// <summary>
+        /// allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        private float _beamSweepSync;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FundamentalParameterData"/> class.
+        /// </summary>
+        public FundamentalParameterData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FundamentalParameterData left, FundamentalParameterData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FundamentalParameterData left, FundamentalParameterData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._frequency
+            marshalSize += 4;  // this._frequencyRange
+            marshalSize += 4;  // this._effectiveRadiatedPower
+            marshalSize += 4;  // this._pulseRepetitionFrequency
+            marshalSize += 4;  // this._pulseWidth
+            marshalSize += 4;  // this._beamAzimuthCenter
+            marshalSize += 4;  // this._beamAzimuthSweep
+            marshalSize += 4;  // this._beamElevationCenter
+            marshalSize += 4;  // this._beamElevationSweep
+            marshalSize += 4;  // this._beamSweepSync
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the center frequency of the emission in hertz.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequency")]
+        public float Frequency
+        {
+            get
+            {
+                return this._frequency;
+            }
+
+            set
+            {
+                this._frequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Bandwidth of the frequencies corresponding to the fequency field.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequencyRange")]
+        public float FrequencyRange
+        {
+            get
+            {
+                return this._frequencyRange;
+            }
+
+            set
+            {
+                this._frequencyRange = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Effective radiated power for the emission in DdBm. For a     radar noise jammer, indicates the peak of the transmitted power.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "effectiveRadiatedPower")]
+        public float EffectiveRadiatedPower
+        {
+            get
+            {
+                return this._effectiveRadiatedPower;
+            }
+
+            set
+            {
+                this._effectiveRadiatedPower = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Average repetition frequency of the emission in hertz.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
+        public float PulseRepetitionFrequency
+        {
+            get
+            {
+                return this._pulseRepetitionFrequency;
+            }
+
+            set
+            {
+                this._pulseRepetitionFrequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Average pulse width  of the emission in microseconds.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
+        public float PulseWidth
+        {
+            get
+            {
+                return this._pulseWidth;
+            }
+
+            set
+            {
+                this._pulseWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles     to describe the scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
+        public float BeamAzimuthCenter
+        {
+            get
+            {
+                return this._beamAzimuthCenter;
+            }
+
+            set
+            {
+                this._beamAzimuthCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
+        public float BeamAzimuthSweep
+        {
+            get
+            {
+                return this._beamAzimuthSweep;
+            }
+
+            set
+            {
+                this._beamAzimuthSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
+        public float BeamElevationCenter
+        {
+            get
+            {
+                return this._beamElevationCenter;
+            }
+
+            set
+            {
+                this._beamElevationCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
+        public float BeamElevationSweep
+        {
+            get
+            {
+                return this._beamElevationSweep;
+            }
+
+            set
+            {
+                this._beamElevationSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to     that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
+        public float BeamSweepSync
+        {
+            get
+            {
+                return this._beamSweepSync;
+            }
+
+            set
+            {
+                this._beamSweepSync = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._frequency);
+                    dos.WriteFloat((float)this._frequencyRange);
+                    dos.WriteFloat((float)this._effectiveRadiatedPower);
+                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
+                    dos.WriteFloat((float)this._pulseWidth);
+                    dos.WriteFloat((float)this._beamAzimuthCenter);
+                    dos.WriteFloat((float)this._beamAzimuthSweep);
+                    dos.WriteFloat((float)this._beamElevationCenter);
+                    dos.WriteFloat((float)this._beamElevationSweep);
+                    dos.WriteFloat((float)this._beamSweepSync);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._frequency = dis.ReadFloat();
+                    this._frequencyRange = dis.ReadFloat();
+                    this._effectiveRadiatedPower = dis.ReadFloat();
+                    this._pulseRepetitionFrequency = dis.ReadFloat();
+                    this._pulseWidth = dis.ReadFloat();
+                    this._beamAzimuthCenter = dis.ReadFloat();
+                    this._beamAzimuthSweep = dis.ReadFloat();
+                    this._beamElevationCenter = dis.ReadFloat();
+                    this._beamElevationSweep = dis.ReadFloat();
+                    this._beamSweepSync = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FundamentalParameterData>");
+            try
+            {
+                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
+                sb.AppendLine("<frequencyRange type=\"float\">" + this._frequencyRange.ToString(CultureInfo.InvariantCulture) + "</frequencyRange>");
+                sb.AppendLine("<effectiveRadiatedPower type=\"float\">" + this._effectiveRadiatedPower.ToString(CultureInfo.InvariantCulture) + "</effectiveRadiatedPower>");
+                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
+                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
+                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
+                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
+                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
+                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
+                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
+                sb.AppendLine("</FundamentalParameterData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FundamentalParameterData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FundamentalParameterData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._frequency != obj._frequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frequencyRange != obj._frequencyRange)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._effectiveRadiatedPower != obj._effectiveRadiatedPower)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseWidth != obj._pulseWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationCenter != obj._beamElevationCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationSweep != obj._beamElevationSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamSweepSync != obj._beamSweepSync)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._frequency.GetHashCode();
+            result = GenerateHash(result) ^ this._frequencyRange.GetHashCode();
+            result = GenerateHash(result) ^ this._effectiveRadiatedPower.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs b/Libs/CsharpDis6/Dis1998/Generated/FundamentalParameterDataIff.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs
rename to Libs/CsharpDis6/Dis1998/Generated/FundamentalParameterDataIff.cs
index a91518c..a37383c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/FundamentalParameterDataIff.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/FundamentalParameterDataIff.cs
@@ -1,524 +1,524 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.45. Fundamental IFF atc data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class FundamentalParameterDataIff
-    {
-        /// <summary>
-        /// ERP
-        /// </summary>
-        private float _erp;
-
-        /// <summary>
-        /// frequency
-        /// </summary>
-        private float _frequency;
-
-        /// <summary>
-        /// pgrf
-        /// </summary>
-        private float _pgrf;
-
-        /// <summary>
-        /// Pulse width
-        /// </summary>
-        private float _pulseWidth;
-
-        /// <summary>
-        /// Burst length
-        /// </summary>
-        private uint _burstLength;
-
-        /// <summary>
-        /// Applicable modes enumeration
-        /// </summary>
-        private byte _applicableModes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad2;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad3;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FundamentalParameterDataIff"/> class.
-        /// </summary>
-        public FundamentalParameterDataIff()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(FundamentalParameterDataIff left, FundamentalParameterDataIff right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(FundamentalParameterDataIff left, FundamentalParameterDataIff right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._erp
-            marshalSize += 4;  // this._frequency
-            marshalSize += 4;  // this._pgrf
-            marshalSize += 4;  // this._pulseWidth
-            marshalSize += 4;  // this._burstLength
-            marshalSize += 1;  // this._applicableModes
-            marshalSize += 2;  // this._pad2
-            marshalSize += 1;  // this._pad3
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ERP
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "erp")]
-        public float Erp
-        {
-            get
-            {
-                return this._erp;
-            }
-
-            set
-            {
-                this._erp = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the frequency
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "frequency")]
-        public float Frequency
-        {
-            get
-            {
-                return this._frequency;
-            }
-
-            set
-            {
-                this._frequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the pgrf
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pgrf")]
-        public float Pgrf
-        {
-            get
-            {
-                return this._pgrf;
-            }
-
-            set
-            {
-                this._pgrf = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Pulse width
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
-        public float PulseWidth
-        {
-            get
-            {
-                return this._pulseWidth;
-            }
-
-            set
-            {
-                this._pulseWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Burst length
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "burstLength")]
-        public uint BurstLength
-        {
-            get
-            {
-                return this._burstLength;
-            }
-
-            set
-            {
-                this._burstLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Applicable modes enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "applicableModes")]
-        public byte ApplicableModes
-        {
-            get
-            {
-                return this._applicableModes;
-            }
-
-            set
-            {
-                this._applicableModes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
-        public ushort Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad3")]
-        public byte Pad3
-        {
-            get
-            {
-                return this._pad3;
-            }
-
-            set
-            {
-                this._pad3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._erp);
-                    dos.WriteFloat((float)this._frequency);
-                    dos.WriteFloat((float)this._pgrf);
-                    dos.WriteFloat((float)this._pulseWidth);
-                    dos.WriteUnsignedInt((uint)this._burstLength);
-                    dos.WriteUnsignedByte((byte)this._applicableModes);
-                    dos.WriteUnsignedShort((ushort)this._pad2);
-                    dos.WriteUnsignedByte((byte)this._pad3);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._erp = dis.ReadFloat();
-                    this._frequency = dis.ReadFloat();
-                    this._pgrf = dis.ReadFloat();
-                    this._pulseWidth = dis.ReadFloat();
-                    this._burstLength = dis.ReadUnsignedInt();
-                    this._applicableModes = dis.ReadUnsignedByte();
-                    this._pad2 = dis.ReadUnsignedShort();
-                    this._pad3 = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<FundamentalParameterDataIff>");
-            try
-            {
-                sb.AppendLine("<erp type=\"float\">" + this._erp.ToString(CultureInfo.InvariantCulture) + "</erp>");
-                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
-                sb.AppendLine("<pgrf type=\"float\">" + this._pgrf.ToString(CultureInfo.InvariantCulture) + "</pgrf>");
-                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
-                sb.AppendLine("<burstLength type=\"uint\">" + this._burstLength.ToString(CultureInfo.InvariantCulture) + "</burstLength>");
-                sb.AppendLine("<applicableModes type=\"byte\">" + this._applicableModes.ToString(CultureInfo.InvariantCulture) + "</applicableModes>");
-                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<pad3 type=\"byte\">" + this._pad3.ToString(CultureInfo.InvariantCulture) + "</pad3>");
-                sb.AppendLine("</FundamentalParameterDataIff>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as FundamentalParameterDataIff;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(FundamentalParameterDataIff obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._erp != obj._erp)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frequency != obj._frequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pgrf != obj._pgrf)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pulseWidth != obj._pulseWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._burstLength != obj._burstLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._applicableModes != obj._applicableModes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad3 != obj._pad3)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._erp.GetHashCode();
-            result = GenerateHash(result) ^ this._frequency.GetHashCode();
-            result = GenerateHash(result) ^ this._pgrf.GetHashCode();
-            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._burstLength.GetHashCode();
-            result = GenerateHash(result) ^ this._applicableModes.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._pad3.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.45. Fundamental IFF atc data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FundamentalParameterDataIff
+    {
+        /// <summary>
+        /// ERP
+        /// </summary>
+        private float _erp;
+
+        /// <summary>
+        /// frequency
+        /// </summary>
+        private float _frequency;
+
+        /// <summary>
+        /// pgrf
+        /// </summary>
+        private float _pgrf;
+
+        /// <summary>
+        /// Pulse width
+        /// </summary>
+        private float _pulseWidth;
+
+        /// <summary>
+        /// Burst length
+        /// </summary>
+        private uint _burstLength;
+
+        /// <summary>
+        /// Applicable modes enumeration
+        /// </summary>
+        private byte _applicableModes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad2;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad3;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FundamentalParameterDataIff"/> class.
+        /// </summary>
+        public FundamentalParameterDataIff()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FundamentalParameterDataIff left, FundamentalParameterDataIff right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FundamentalParameterDataIff left, FundamentalParameterDataIff right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._erp
+            marshalSize += 4;  // this._frequency
+            marshalSize += 4;  // this._pgrf
+            marshalSize += 4;  // this._pulseWidth
+            marshalSize += 4;  // this._burstLength
+            marshalSize += 1;  // this._applicableModes
+            marshalSize += 2;  // this._pad2
+            marshalSize += 1;  // this._pad3
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ERP
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "erp")]
+        public float Erp
+        {
+            get
+            {
+                return this._erp;
+            }
+
+            set
+            {
+                this._erp = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the frequency
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequency")]
+        public float Frequency
+        {
+            get
+            {
+                return this._frequency;
+            }
+
+            set
+            {
+                this._frequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pgrf
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pgrf")]
+        public float Pgrf
+        {
+            get
+            {
+                return this._pgrf;
+            }
+
+            set
+            {
+                this._pgrf = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Pulse width
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
+        public float PulseWidth
+        {
+            get
+            {
+                return this._pulseWidth;
+            }
+
+            set
+            {
+                this._pulseWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Burst length
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "burstLength")]
+        public uint BurstLength
+        {
+            get
+            {
+                return this._burstLength;
+            }
+
+            set
+            {
+                this._burstLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Applicable modes enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "applicableModes")]
+        public byte ApplicableModes
+        {
+            get
+            {
+                return this._applicableModes;
+            }
+
+            set
+            {
+                this._applicableModes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
+        public ushort Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad3")]
+        public byte Pad3
+        {
+            get
+            {
+                return this._pad3;
+            }
+
+            set
+            {
+                this._pad3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._erp);
+                    dos.WriteFloat((float)this._frequency);
+                    dos.WriteFloat((float)this._pgrf);
+                    dos.WriteFloat((float)this._pulseWidth);
+                    dos.WriteUnsignedInt((uint)this._burstLength);
+                    dos.WriteUnsignedByte((byte)this._applicableModes);
+                    dos.WriteUnsignedShort((ushort)this._pad2);
+                    dos.WriteUnsignedByte((byte)this._pad3);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._erp = dis.ReadFloat();
+                    this._frequency = dis.ReadFloat();
+                    this._pgrf = dis.ReadFloat();
+                    this._pulseWidth = dis.ReadFloat();
+                    this._burstLength = dis.ReadUnsignedInt();
+                    this._applicableModes = dis.ReadUnsignedByte();
+                    this._pad2 = dis.ReadUnsignedShort();
+                    this._pad3 = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FundamentalParameterDataIff>");
+            try
+            {
+                sb.AppendLine("<erp type=\"float\">" + this._erp.ToString(CultureInfo.InvariantCulture) + "</erp>");
+                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
+                sb.AppendLine("<pgrf type=\"float\">" + this._pgrf.ToString(CultureInfo.InvariantCulture) + "</pgrf>");
+                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
+                sb.AppendLine("<burstLength type=\"uint\">" + this._burstLength.ToString(CultureInfo.InvariantCulture) + "</burstLength>");
+                sb.AppendLine("<applicableModes type=\"byte\">" + this._applicableModes.ToString(CultureInfo.InvariantCulture) + "</applicableModes>");
+                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<pad3 type=\"byte\">" + this._pad3.ToString(CultureInfo.InvariantCulture) + "</pad3>");
+                sb.AppendLine("</FundamentalParameterDataIff>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FundamentalParameterDataIff;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FundamentalParameterDataIff obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._erp != obj._erp)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frequency != obj._frequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pgrf != obj._pgrf)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseWidth != obj._pulseWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._burstLength != obj._burstLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._applicableModes != obj._applicableModes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad3 != obj._pad3)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._erp.GetHashCode();
+            result = GenerateHash(result) ^ this._frequency.GetHashCode();
+            result = GenerateHash(result) ^ this._pgrf.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._burstLength.GetHashCode();
+            result = GenerateHash(result) ^ this._applicableModes.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._pad3.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecord.cs b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecord.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecord.cs
rename to Libs/CsharpDis6/Dis1998/Generated/GridAxisRecord.cs
index b6ebc0f..acd0f6a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecord.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecord.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.44: Grid data record, a common abstract superclass for several subtypes 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class GridAxisRecord
-    {
-        /// <summary>
-        /// type of environmental sample
-        /// </summary>
-        private ushort _sampleType;
-
-        /// <summary>
-        /// value that describes data representation
-        /// </summary>
-        private ushort _dataRepresentation;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GridAxisRecord"/> class.
-        /// </summary>
-        public GridAxisRecord()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GridAxisRecord left, GridAxisRecord right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GridAxisRecord left, GridAxisRecord right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._sampleType
-            marshalSize += 2;  // this._dataRepresentation
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the type of environmental sample
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "sampleType")]
-        public ushort SampleType
-        {
-            get
-            {
-                return this._sampleType;
-            }
-
-            set
-            {
-                this._sampleType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value that describes data representation
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "dataRepresentation")]
-        public ushort DataRepresentation
-        {
-            get
-            {
-                return this._dataRepresentation;
-            }
-
-            set
-            {
-                this._dataRepresentation = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._sampleType);
-                    dos.WriteUnsignedShort((ushort)this._dataRepresentation);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._sampleType = dis.ReadUnsignedShort();
-                    this._dataRepresentation = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<GridAxisRecord>");
-            try
-            {
-                sb.AppendLine("<sampleType type=\"ushort\">" + this._sampleType.ToString(CultureInfo.InvariantCulture) + "</sampleType>");
-                sb.AppendLine("<dataRepresentation type=\"ushort\">" + this._dataRepresentation.ToString(CultureInfo.InvariantCulture) + "</dataRepresentation>");
-                sb.AppendLine("</GridAxisRecord>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as GridAxisRecord;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GridAxisRecord obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._sampleType != obj._sampleType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataRepresentation != obj._dataRepresentation)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._sampleType.GetHashCode();
-            result = GenerateHash(result) ^ this._dataRepresentation.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.44: Grid data record, a common abstract superclass for several subtypes 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class GridAxisRecord
+    {
+        /// <summary>
+        /// type of environmental sample
+        /// </summary>
+        private ushort _sampleType;
+
+        /// <summary>
+        /// value that describes data representation
+        /// </summary>
+        private ushort _dataRepresentation;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GridAxisRecord"/> class.
+        /// </summary>
+        public GridAxisRecord()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GridAxisRecord left, GridAxisRecord right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GridAxisRecord left, GridAxisRecord right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._sampleType
+            marshalSize += 2;  // this._dataRepresentation
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the type of environmental sample
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "sampleType")]
+        public ushort SampleType
+        {
+            get
+            {
+                return this._sampleType;
+            }
+
+            set
+            {
+                this._sampleType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that describes data representation
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "dataRepresentation")]
+        public ushort DataRepresentation
+        {
+            get
+            {
+                return this._dataRepresentation;
+            }
+
+            set
+            {
+                this._dataRepresentation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._sampleType);
+                    dos.WriteUnsignedShort((ushort)this._dataRepresentation);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._sampleType = dis.ReadUnsignedShort();
+                    this._dataRepresentation = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<GridAxisRecord>");
+            try
+            {
+                sb.AppendLine("<sampleType type=\"ushort\">" + this._sampleType.ToString(CultureInfo.InvariantCulture) + "</sampleType>");
+                sb.AppendLine("<dataRepresentation type=\"ushort\">" + this._dataRepresentation.ToString(CultureInfo.InvariantCulture) + "</dataRepresentation>");
+                sb.AppendLine("</GridAxisRecord>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as GridAxisRecord;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GridAxisRecord obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._sampleType != obj._sampleType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataRepresentation != obj._dataRepresentation)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._sampleType.GetHashCode();
+            result = GenerateHash(result) ^ this._dataRepresentation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation0.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs
rename to Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation0.cs
index 8ad02c4..12da337 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation0.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation0.cs
@@ -1,346 +1,346 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.44: Grid data record, representation 0
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(OneByteChunk))]
-    public partial class GridAxisRecordRepresentation0 : GridAxisRecord, IEquatable<GridAxisRecordRepresentation0>
-    {
-        /// <summary>
-        /// number of bytes of environmental state data
-        /// </summary>
-        private ushort _numberOfBytes;
-
-        /// <summary>
-        /// variable length list of data parameters ^^^this is wrong--need padding as well
-        /// </summary>
-        private byte[] _dataValues; 
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GridAxisRecordRepresentation0"/> class.
-        /// </summary>
-        public GridAxisRecordRepresentation0()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GridAxisRecordRepresentation0 left, GridAxisRecordRepresentation0 right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GridAxisRecordRepresentation0 left, GridAxisRecordRepresentation0 right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._numberOfBytes
-            marshalSize += this._dataValues.Length;
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the number of bytes of environmental state data
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfBytes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfBytes")]
-        public ushort NumberOfBytes
-        {
-            get
-            {
-                return this._numberOfBytes;
-            }
-
-            set
-            {
-                this._numberOfBytes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable length list of data parameters ^^^this is wrong--need padding as well
-        /// </summary>
-        [XmlElement(ElementName = "dataValuesList", DataType = "hexBinary")]
-        public byte[] DataValues
-        {
-            get
-            {
-                return this._dataValues;
-            }
-
-            set
-            {
-                this._dataValues = value;
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._dataValues.Length);
-
-                    dos.WriteByte(this._dataValues);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfBytes = dis.ReadUnsignedShort();
-
-                    this._dataValues = dis.ReadByteArray(this._numberOfBytes);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<GridAxisRecordRepresentation0>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<dataValues type=\"ushort\">" + this._dataValues.Length.ToString(CultureInfo.InvariantCulture) + "</dataValues>");
-                sb.AppendLine("<dataValues type=\"byte[]\">");
-                foreach (byte b in this._dataValues)
-                {
-                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
-                }
-
-                sb.AppendLine("</dataValues>");
-
-                sb.AppendLine("</GridAxisRecordRepresentation0>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as GridAxisRecordRepresentation0;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GridAxisRecordRepresentation0 obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._numberOfBytes != obj._numberOfBytes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._dataValues.Equals(obj._dataValues))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._numberOfBytes.GetHashCode();
-
-            if (this._dataValues.Length > 0)
-            {
-                for (int idx = 0; idx < this._dataValues.Length; idx++)
-                {
-                    result = GenerateHash(result) ^ this._dataValues[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.44: Grid data record, representation 0
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(OneByteChunk))]
+    public partial class GridAxisRecordRepresentation0 : GridAxisRecord, IEquatable<GridAxisRecordRepresentation0>
+    {
+        /// <summary>
+        /// number of bytes of environmental state data
+        /// </summary>
+        private ushort _numberOfBytes;
+
+        /// <summary>
+        /// variable length list of data parameters ^^^this is wrong--need padding as well
+        /// </summary>
+        private byte[] _dataValues; 
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GridAxisRecordRepresentation0"/> class.
+        /// </summary>
+        public GridAxisRecordRepresentation0()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GridAxisRecordRepresentation0 left, GridAxisRecordRepresentation0 right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GridAxisRecordRepresentation0 left, GridAxisRecordRepresentation0 right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._numberOfBytes
+            marshalSize += this._dataValues.Length;
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the number of bytes of environmental state data
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfBytes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfBytes")]
+        public ushort NumberOfBytes
+        {
+            get
+            {
+                return this._numberOfBytes;
+            }
+
+            set
+            {
+                this._numberOfBytes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of data parameters ^^^this is wrong--need padding as well
+        /// </summary>
+        [XmlElement(ElementName = "dataValuesList", DataType = "hexBinary")]
+        public byte[] DataValues
+        {
+            get
+            {
+                return this._dataValues;
+            }
+
+            set
+            {
+                this._dataValues = value;
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._dataValues.Length);
+
+                    dos.WriteByte(this._dataValues);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfBytes = dis.ReadUnsignedShort();
+
+                    this._dataValues = dis.ReadByteArray(this._numberOfBytes);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<GridAxisRecordRepresentation0>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<dataValues type=\"ushort\">" + this._dataValues.Length.ToString(CultureInfo.InvariantCulture) + "</dataValues>");
+                sb.AppendLine("<dataValues type=\"byte[]\">");
+                foreach (byte b in this._dataValues)
+                {
+                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
+                }
+
+                sb.AppendLine("</dataValues>");
+
+                sb.AppendLine("</GridAxisRecordRepresentation0>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as GridAxisRecordRepresentation0;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GridAxisRecordRepresentation0 obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._numberOfBytes != obj._numberOfBytes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._dataValues.Equals(obj._dataValues))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._numberOfBytes.GetHashCode();
+
+            if (this._dataValues.Length > 0)
+            {
+                for (int idx = 0; idx < this._dataValues.Length; idx++)
+                {
+                    result = GenerateHash(result) ^ this._dataValues[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation1.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs
rename to Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation1.cs
index ed86d8b..d81ef01 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation1.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation1.cs
@@ -1,430 +1,430 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.44: Grid data record, representation 1
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(TwoByteChunk))]
-    public partial class GridAxisRecordRepresentation1 : GridAxisRecord, IEquatable<GridAxisRecordRepresentation1>
-    {
-        /// <summary>
-        /// constant scale factor
-        /// </summary>
-        private float _fieldScale;
-
-        /// <summary>
-        /// constant offset used to scale grid data
-        /// </summary>
-        private float _fieldOffset;
-
-        /// <summary>
-        /// Number of data values
-        /// </summary>
-        private ushort _numberOfValues;
-
-        /// <summary>
-        /// variable length list of data parameters ^^^this is wrong--need padding as well
-        /// </summary>
-        private List<TwoByteChunk> _dataValues = new List<TwoByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GridAxisRecordRepresentation1"/> class.
-        /// </summary>
-        public GridAxisRecordRepresentation1()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GridAxisRecordRepresentation1 left, GridAxisRecordRepresentation1 right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GridAxisRecordRepresentation1 left, GridAxisRecordRepresentation1 right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._fieldScale
-            marshalSize += 4;  // this._fieldOffset
-            marshalSize += 2;  // this._numberOfValues
-            for (int idx = 0; idx < this._dataValues.Count; idx++)
-            {
-                TwoByteChunk listElement = (TwoByteChunk)this._dataValues[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the constant scale factor
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "fieldScale")]
-        public float FieldScale
-        {
-            get
-            {
-                return this._fieldScale;
-            }
-
-            set
-            {
-                this._fieldScale = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the constant offset used to scale grid data
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "fieldOffset")]
-        public float FieldOffset
-        {
-            get
-            {
-                return this._fieldOffset;
-            }
-
-            set
-            {
-                this._fieldOffset = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of data values
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfValues method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfValues")]
-        public ushort NumberOfValues
-        {
-            get
-            {
-                return this._numberOfValues;
-            }
-
-            set
-            {
-                this._numberOfValues = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of data parameters ^^^this is wrong--need padding as well
-        /// </summary>
-        [XmlElement(ElementName = "dataValuesList", Type = typeof(List<TwoByteChunk>))]
-        public List<TwoByteChunk> DataValues
-        {
-            get
-            {
-                return this._dataValues;
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._fieldScale);
-                    dos.WriteFloat((float)this._fieldOffset);
-                    dos.WriteUnsignedShort((ushort)this._dataValues.Count);
-
-                    for (int idx = 0; idx < this._dataValues.Count; idx++)
-                    {
-                        TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._dataValues[idx];
-                        aTwoByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._fieldScale = dis.ReadFloat();
-                    this._fieldOffset = dis.ReadFloat();
-                    this._numberOfValues = dis.ReadUnsignedShort();
-
-                    for (int idx = 0; idx < this.NumberOfValues; idx++)
-                    {
-                        TwoByteChunk anX = new TwoByteChunk();
-                        anX.Unmarshal(dis);
-                        this._dataValues.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<GridAxisRecordRepresentation1>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<fieldScale type=\"float\">" + this._fieldScale.ToString(CultureInfo.InvariantCulture) + "</fieldScale>");
-                sb.AppendLine("<fieldOffset type=\"float\">" + this._fieldOffset.ToString(CultureInfo.InvariantCulture) + "</fieldOffset>");
-                sb.AppendLine("<dataValues type=\"ushort\">" + this._dataValues.Count.ToString(CultureInfo.InvariantCulture) + "</dataValues>");
-                for (int idx = 0; idx < this._dataValues.Count; idx++)
-                {
-                    sb.AppendLine("<dataValues" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TwoByteChunk\">");
-                    TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._dataValues[idx];
-                    aTwoByteChunk.Reflection(sb);
-                    sb.AppendLine("</dataValues" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</GridAxisRecordRepresentation1>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as GridAxisRecordRepresentation1;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GridAxisRecordRepresentation1 obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._fieldScale != obj._fieldScale)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fieldOffset != obj._fieldOffset)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfValues != obj._numberOfValues)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataValues.Count != obj._dataValues.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._dataValues.Count; idx++)
-                {
-                    if (!this._dataValues[idx].Equals(obj._dataValues[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._fieldScale.GetHashCode();
-            result = GenerateHash(result) ^ this._fieldOffset.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfValues.GetHashCode();
-
-            if (this._dataValues.Count > 0)
-            {
-                for (int idx = 0; idx < this._dataValues.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._dataValues[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.44: Grid data record, representation 1
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(TwoByteChunk))]
+    public partial class GridAxisRecordRepresentation1 : GridAxisRecord, IEquatable<GridAxisRecordRepresentation1>
+    {
+        /// <summary>
+        /// constant scale factor
+        /// </summary>
+        private float _fieldScale;
+
+        /// <summary>
+        /// constant offset used to scale grid data
+        /// </summary>
+        private float _fieldOffset;
+
+        /// <summary>
+        /// Number of data values
+        /// </summary>
+        private ushort _numberOfValues;
+
+        /// <summary>
+        /// variable length list of data parameters ^^^this is wrong--need padding as well
+        /// </summary>
+        private List<TwoByteChunk> _dataValues = new List<TwoByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GridAxisRecordRepresentation1"/> class.
+        /// </summary>
+        public GridAxisRecordRepresentation1()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GridAxisRecordRepresentation1 left, GridAxisRecordRepresentation1 right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GridAxisRecordRepresentation1 left, GridAxisRecordRepresentation1 right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._fieldScale
+            marshalSize += 4;  // this._fieldOffset
+            marshalSize += 2;  // this._numberOfValues
+            for (int idx = 0; idx < this._dataValues.Count; idx++)
+            {
+                TwoByteChunk listElement = (TwoByteChunk)this._dataValues[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the constant scale factor
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "fieldScale")]
+        public float FieldScale
+        {
+            get
+            {
+                return this._fieldScale;
+            }
+
+            set
+            {
+                this._fieldScale = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the constant offset used to scale grid data
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "fieldOffset")]
+        public float FieldOffset
+        {
+            get
+            {
+                return this._fieldOffset;
+            }
+
+            set
+            {
+                this._fieldOffset = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of data values
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfValues method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfValues")]
+        public ushort NumberOfValues
+        {
+            get
+            {
+                return this._numberOfValues;
+            }
+
+            set
+            {
+                this._numberOfValues = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of data parameters ^^^this is wrong--need padding as well
+        /// </summary>
+        [XmlElement(ElementName = "dataValuesList", Type = typeof(List<TwoByteChunk>))]
+        public List<TwoByteChunk> DataValues
+        {
+            get
+            {
+                return this._dataValues;
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._fieldScale);
+                    dos.WriteFloat((float)this._fieldOffset);
+                    dos.WriteUnsignedShort((ushort)this._dataValues.Count);
+
+                    for (int idx = 0; idx < this._dataValues.Count; idx++)
+                    {
+                        TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._dataValues[idx];
+                        aTwoByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._fieldScale = dis.ReadFloat();
+                    this._fieldOffset = dis.ReadFloat();
+                    this._numberOfValues = dis.ReadUnsignedShort();
+
+                    for (int idx = 0; idx < this.NumberOfValues; idx++)
+                    {
+                        TwoByteChunk anX = new TwoByteChunk();
+                        anX.Unmarshal(dis);
+                        this._dataValues.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<GridAxisRecordRepresentation1>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<fieldScale type=\"float\">" + this._fieldScale.ToString(CultureInfo.InvariantCulture) + "</fieldScale>");
+                sb.AppendLine("<fieldOffset type=\"float\">" + this._fieldOffset.ToString(CultureInfo.InvariantCulture) + "</fieldOffset>");
+                sb.AppendLine("<dataValues type=\"ushort\">" + this._dataValues.Count.ToString(CultureInfo.InvariantCulture) + "</dataValues>");
+                for (int idx = 0; idx < this._dataValues.Count; idx++)
+                {
+                    sb.AppendLine("<dataValues" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TwoByteChunk\">");
+                    TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._dataValues[idx];
+                    aTwoByteChunk.Reflection(sb);
+                    sb.AppendLine("</dataValues" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</GridAxisRecordRepresentation1>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as GridAxisRecordRepresentation1;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GridAxisRecordRepresentation1 obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._fieldScale != obj._fieldScale)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fieldOffset != obj._fieldOffset)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfValues != obj._numberOfValues)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataValues.Count != obj._dataValues.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._dataValues.Count; idx++)
+                {
+                    if (!this._dataValues[idx].Equals(obj._dataValues[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._fieldScale.GetHashCode();
+            result = GenerateHash(result) ^ this._fieldOffset.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfValues.GetHashCode();
+
+            if (this._dataValues.Count > 0)
+            {
+                for (int idx = 0; idx < this._dataValues.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._dataValues[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation2.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs
rename to Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation2.cs
index 63b513e..4555bb2 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GridAxisRecordRepresentation2.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/GridAxisRecordRepresentation2.cs
@@ -1,366 +1,366 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.44: Grid data record, representation 1
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FourByteChunk))]
-    public partial class GridAxisRecordRepresentation2 : GridAxisRecord, IEquatable<GridAxisRecordRepresentation2>
-    {
-        /// <summary>
-        /// number of values
-        /// </summary>
-        private ushort _numberOfValues;
-
-        /// <summary>
-        /// variable length list of data parameters ^^^this is wrong--need padding as well
-        /// </summary>
-        private List<FourByteChunk> _dataValues = new List<FourByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GridAxisRecordRepresentation2"/> class.
-        /// </summary>
-        public GridAxisRecordRepresentation2()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GridAxisRecordRepresentation2 left, GridAxisRecordRepresentation2 right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GridAxisRecordRepresentation2 left, GridAxisRecordRepresentation2 right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._numberOfValues
-            for (int idx = 0; idx < this._dataValues.Count; idx++)
-            {
-                FourByteChunk listElement = (FourByteChunk)this._dataValues[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the number of values
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfValues method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfValues")]
-        public ushort NumberOfValues
-        {
-            get
-            {
-                return this._numberOfValues;
-            }
-
-            set
-            {
-                this._numberOfValues = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of data parameters ^^^this is wrong--need padding as well
-        /// </summary>
-        [XmlElement(ElementName = "dataValuesList", Type = typeof(List<FourByteChunk>))]
-        public List<FourByteChunk> DataValues
-        {
-            get
-            {
-                return this._dataValues;
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._dataValues.Count);
-
-                    for (int idx = 0; idx < this._dataValues.Count; idx++)
-                    {
-                        FourByteChunk aFourByteChunk = (FourByteChunk)this._dataValues[idx];
-                        aFourByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfValues = dis.ReadUnsignedShort();
-
-                    for (int idx = 0; idx < this.NumberOfValues; idx++)
-                    {
-                        FourByteChunk anX = new FourByteChunk();
-                        anX.Unmarshal(dis);
-                        this._dataValues.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<GridAxisRecordRepresentation2>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<dataValues type=\"ushort\">" + this._dataValues.Count.ToString(CultureInfo.InvariantCulture) + "</dataValues>");
-                for (int idx = 0; idx < this._dataValues.Count; idx++)
-                {
-                    sb.AppendLine("<dataValues" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
-                    FourByteChunk aFourByteChunk = (FourByteChunk)this._dataValues[idx];
-                    aFourByteChunk.Reflection(sb);
-                    sb.AppendLine("</dataValues" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</GridAxisRecordRepresentation2>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as GridAxisRecordRepresentation2;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GridAxisRecordRepresentation2 obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._numberOfValues != obj._numberOfValues)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataValues.Count != obj._dataValues.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._dataValues.Count; idx++)
-                {
-                    if (!this._dataValues[idx].Equals(obj._dataValues[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._numberOfValues.GetHashCode();
-
-            if (this._dataValues.Count > 0)
-            {
-                for (int idx = 0; idx < this._dataValues.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._dataValues[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.44: Grid data record, representation 1
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FourByteChunk))]
+    public partial class GridAxisRecordRepresentation2 : GridAxisRecord, IEquatable<GridAxisRecordRepresentation2>
+    {
+        /// <summary>
+        /// number of values
+        /// </summary>
+        private ushort _numberOfValues;
+
+        /// <summary>
+        /// variable length list of data parameters ^^^this is wrong--need padding as well
+        /// </summary>
+        private List<FourByteChunk> _dataValues = new List<FourByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GridAxisRecordRepresentation2"/> class.
+        /// </summary>
+        public GridAxisRecordRepresentation2()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GridAxisRecordRepresentation2 left, GridAxisRecordRepresentation2 right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GridAxisRecordRepresentation2 left, GridAxisRecordRepresentation2 right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._numberOfValues
+            for (int idx = 0; idx < this._dataValues.Count; idx++)
+            {
+                FourByteChunk listElement = (FourByteChunk)this._dataValues[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the number of values
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfValues method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfValues")]
+        public ushort NumberOfValues
+        {
+            get
+            {
+                return this._numberOfValues;
+            }
+
+            set
+            {
+                this._numberOfValues = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of data parameters ^^^this is wrong--need padding as well
+        /// </summary>
+        [XmlElement(ElementName = "dataValuesList", Type = typeof(List<FourByteChunk>))]
+        public List<FourByteChunk> DataValues
+        {
+            get
+            {
+                return this._dataValues;
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._dataValues.Count);
+
+                    for (int idx = 0; idx < this._dataValues.Count; idx++)
+                    {
+                        FourByteChunk aFourByteChunk = (FourByteChunk)this._dataValues[idx];
+                        aFourByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfValues = dis.ReadUnsignedShort();
+
+                    for (int idx = 0; idx < this.NumberOfValues; idx++)
+                    {
+                        FourByteChunk anX = new FourByteChunk();
+                        anX.Unmarshal(dis);
+                        this._dataValues.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<GridAxisRecordRepresentation2>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<dataValues type=\"ushort\">" + this._dataValues.Count.ToString(CultureInfo.InvariantCulture) + "</dataValues>");
+                for (int idx = 0; idx < this._dataValues.Count; idx++)
+                {
+                    sb.AppendLine("<dataValues" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
+                    FourByteChunk aFourByteChunk = (FourByteChunk)this._dataValues[idx];
+                    aFourByteChunk.Reflection(sb);
+                    sb.AppendLine("</dataValues" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</GridAxisRecordRepresentation2>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as GridAxisRecordRepresentation2;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GridAxisRecordRepresentation2 obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._numberOfValues != obj._numberOfValues)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataValues.Count != obj._dataValues.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._dataValues.Count; idx++)
+                {
+                    if (!this._dataValues[idx].Equals(obj._dataValues[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._numberOfValues.GetHashCode();
+
+            if (this._dataValues.Count > 0)
+            {
+                for (int idx = 0; idx < this._dataValues.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._dataValues[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GriddedDataPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/GriddedDataPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/GriddedDataPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/GriddedDataPdu.cs
index 5302600..17d9064 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/GriddedDataPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/GriddedDataPdu.cs
@@ -1,803 +1,803 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.11.2: Information about globat, spatially varying enviornmental effects. This requires manual cleanup; the grid axis        records are variable sized. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Orientation))]
-    [XmlInclude(typeof(GridAxisRecord))]
-    public partial class GriddedDataPdu : SyntheticEnvironmentFamilyPdu, IEquatable<GriddedDataPdu>
-    {
-        /// <summary>
-        /// environmental simulation application ID
-        /// </summary>
-        private EntityID _environmentalSimulationApplicationID = new EntityID();
-
-        /// <summary>
-        /// unique identifier for each piece of enviornmental data
-        /// </summary>
-        private ushort _fieldNumber;
-
-        /// <summary>
-        /// sequence number for the total set of PDUS used to transmit the data
-        /// </summary>
-        private ushort _pduNumber;
-
-        /// <summary>
-        /// Total number of PDUS used to transmit the data
-        /// </summary>
-        private ushort _pduTotal;
-
-        /// <summary>
-        /// coordinate system of the grid
-        /// </summary>
-        private ushort _coordinateSystem;
-
-        /// <summary>
-        /// number of grid axes for the environmental data
-        /// </summary>
-        private byte _numberOfGridAxes;
-
-        /// <summary>
-        /// are domain grid axes identidal to those of the priveious domain update?
-        /// </summary>
-        private byte _constantGrid;
-
-        /// <summary>
-        /// type of environment
-        /// </summary>
-        private EntityType _environmentType = new EntityType();
-
-        /// <summary>
-        /// orientation of the data grid
-        /// </summary>
-        private Orientation _orientation = new Orientation();
-
-        /// <summary>
-        /// valid time of the enviormental data sample, 64 bit unsigned int
-        /// </summary>
-        private long _sampleTime;
-
-        /// <summary>
-        /// total number of all data values for all pdus for an environmental sample
-        /// </summary>
-        private uint _totalValues;
-
-        /// <summary>
-        /// total number of data values at each grid point.
-        /// </summary>
-        private byte _vectorDimension;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// Grid data ^^^This is wrong
-        /// </summary>
-        private List<GridAxisRecord> _gridDataList = new List<GridAxisRecord>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GriddedDataPdu"/> class.
-        /// </summary>
-        public GriddedDataPdu()
-        {
-            PduType = (byte)42;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GriddedDataPdu left, GriddedDataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GriddedDataPdu left, GriddedDataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._environmentalSimulationApplicationID.GetMarshalledSize();  // this._environmentalSimulationApplicationID
-            marshalSize += 2;  // this._fieldNumber
-            marshalSize += 2;  // this._pduNumber
-            marshalSize += 2;  // this._pduTotal
-            marshalSize += 2;  // this._coordinateSystem
-            marshalSize += 1;  // this._numberOfGridAxes
-            marshalSize += 1;  // this._constantGrid
-            marshalSize += this._environmentType.GetMarshalledSize();  // this._environmentType
-            marshalSize += this._orientation.GetMarshalledSize();  // this._orientation
-            marshalSize += 8;  // this._sampleTime
-            marshalSize += 4;  // this._totalValues
-            marshalSize += 1;  // this._vectorDimension
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            for (int idx = 0; idx < this._gridDataList.Count; idx++)
-            {
-                GridAxisRecord listElement = (GridAxisRecord)this._gridDataList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the environmental simulation application ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "environmentalSimulationApplicationID")]
-        public EntityID EnvironmentalSimulationApplicationID
-        {
-            get
-            {
-                return this._environmentalSimulationApplicationID;
-            }
-
-            set
-            {
-                this._environmentalSimulationApplicationID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique identifier for each piece of enviornmental data
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "fieldNumber")]
-        public ushort FieldNumber
-        {
-            get
-            {
-                return this._fieldNumber;
-            }
-
-            set
-            {
-                this._fieldNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the sequence number for the total set of PDUS used to transmit the data
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pduNumber")]
-        public ushort PduNumber
-        {
-            get
-            {
-                return this._pduNumber;
-            }
-
-            set
-            {
-                this._pduNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Total number of PDUS used to transmit the data
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pduTotal")]
-        public ushort PduTotal
-        {
-            get
-            {
-                return this._pduTotal;
-            }
-
-            set
-            {
-                this._pduTotal = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the coordinate system of the grid
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "coordinateSystem")]
-        public ushort CoordinateSystem
-        {
-            get
-            {
-                return this._coordinateSystem;
-            }
-
-            set
-            {
-                this._coordinateSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of grid axes for the environmental data
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfGridAxes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfGridAxes")]
-        public byte NumberOfGridAxes
-        {
-            get
-            {
-                return this._numberOfGridAxes;
-            }
-
-            set
-            {
-                this._numberOfGridAxes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the are domain grid axes identidal to those of the priveious domain update?
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "constantGrid")]
-        public byte ConstantGrid
-        {
-            get
-            {
-                return this._constantGrid;
-            }
-
-            set
-            {
-                this._constantGrid = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of environment
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "environmentType")]
-        public EntityType EnvironmentType
-        {
-            get
-            {
-                return this._environmentType;
-            }
-
-            set
-            {
-                this._environmentType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the orientation of the data grid
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "orientation")]
-        public Orientation Orientation
-        {
-            get
-            {
-                return this._orientation;
-            }
-
-            set
-            {
-                this._orientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the valid time of the enviormental data sample, 64 bit unsigned int
-        /// </summary>
-        [XmlElement(Type = typeof(long), ElementName = "sampleTime")]
-        public long SampleTime
-        {
-            get
-            {
-                return this._sampleTime;
-            }
-
-            set
-            {
-                this._sampleTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the total number of all data values for all pdus for an environmental sample
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "totalValues")]
-        public uint TotalValues
-        {
-            get
-            {
-                return this._totalValues;
-            }
-
-            set
-            {
-                this._totalValues = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the total number of data values at each grid point.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "vectorDimension")]
-        public byte VectorDimension
-        {
-            get
-            {
-                return this._vectorDimension;
-            }
-
-            set
-            {
-                this._vectorDimension = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Grid data ^^^This is wrong
-        /// </summary>
-        [XmlElement(ElementName = "gridDataListList", Type = typeof(List<GridAxisRecord>))]
-        public List<GridAxisRecord> GridDataList
-        {
-            get
-            {
-                return this._gridDataList;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._environmentalSimulationApplicationID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._fieldNumber);
-                    dos.WriteUnsignedShort((ushort)this._pduNumber);
-                    dos.WriteUnsignedShort((ushort)this._pduTotal);
-                    dos.WriteUnsignedShort((ushort)this._coordinateSystem);
-                    dos.WriteUnsignedByte((byte)this._gridDataList.Count);
-                    dos.WriteUnsignedByte((byte)this._constantGrid);
-                    this._environmentType.Marshal(dos);
-                    this._orientation.Marshal(dos);
-                    dos.WriteLong((long)this._sampleTime);
-                    dos.WriteUnsignedInt((uint)this._totalValues);
-                    dos.WriteUnsignedByte((byte)this._vectorDimension);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteUnsignedByte((byte)this._padding2);
-
-                    for (int idx = 0; idx < this._gridDataList.Count; idx++)
-                    {
-                        GridAxisRecord aGridAxisRecord = (GridAxisRecord)this._gridDataList[idx];
-                        aGridAxisRecord.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._environmentalSimulationApplicationID.Unmarshal(dis);
-                    this._fieldNumber = dis.ReadUnsignedShort();
-                    this._pduNumber = dis.ReadUnsignedShort();
-                    this._pduTotal = dis.ReadUnsignedShort();
-                    this._coordinateSystem = dis.ReadUnsignedShort();
-                    this._numberOfGridAxes = dis.ReadUnsignedByte();
-                    this._constantGrid = dis.ReadUnsignedByte();
-                    this._environmentType.Unmarshal(dis);
-                    this._orientation.Unmarshal(dis);
-                    this._sampleTime = dis.ReadLong();
-                    this._totalValues = dis.ReadUnsignedInt();
-                    this._vectorDimension = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._padding2 = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.NumberOfGridAxes; idx++)
-                    {
-                        GridAxisRecord anX = new GridAxisRecord();
-                        anX.Unmarshal(dis);
-                        this._gridDataList.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<GriddedDataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<environmentalSimulationApplicationID>");
-                this._environmentalSimulationApplicationID.Reflection(sb);
-                sb.AppendLine("</environmentalSimulationApplicationID>");
-                sb.AppendLine("<fieldNumber type=\"ushort\">" + this._fieldNumber.ToString(CultureInfo.InvariantCulture) + "</fieldNumber>");
-                sb.AppendLine("<pduNumber type=\"ushort\">" + this._pduNumber.ToString(CultureInfo.InvariantCulture) + "</pduNumber>");
-                sb.AppendLine("<pduTotal type=\"ushort\">" + this._pduTotal.ToString(CultureInfo.InvariantCulture) + "</pduTotal>");
-                sb.AppendLine("<coordinateSystem type=\"ushort\">" + this._coordinateSystem.ToString(CultureInfo.InvariantCulture) + "</coordinateSystem>");
-                sb.AppendLine("<gridDataList type=\"byte\">" + this._gridDataList.Count.ToString(CultureInfo.InvariantCulture) + "</gridDataList>");
-                sb.AppendLine("<constantGrid type=\"byte\">" + this._constantGrid.ToString(CultureInfo.InvariantCulture) + "</constantGrid>");
-                sb.AppendLine("<environmentType>");
-                this._environmentType.Reflection(sb);
-                sb.AppendLine("</environmentType>");
-                sb.AppendLine("<orientation>");
-                this._orientation.Reflection(sb);
-                sb.AppendLine("</orientation>");
-                sb.AppendLine("<sampleTime type=\"long\">" + this._sampleTime.ToString(CultureInfo.InvariantCulture) + "</sampleTime>");
-                sb.AppendLine("<totalValues type=\"uint\">" + this._totalValues.ToString(CultureInfo.InvariantCulture) + "</totalValues>");
-                sb.AppendLine("<vectorDimension type=\"byte\">" + this._vectorDimension.ToString(CultureInfo.InvariantCulture) + "</vectorDimension>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                for (int idx = 0; idx < this._gridDataList.Count; idx++)
-                {
-                    sb.AppendLine("<gridDataList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"GridAxisRecord\">");
-                    GridAxisRecord aGridAxisRecord = (GridAxisRecord)this._gridDataList[idx];
-                    aGridAxisRecord.Reflection(sb);
-                    sb.AppendLine("</gridDataList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</GriddedDataPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as GriddedDataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GriddedDataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._environmentalSimulationApplicationID.Equals(obj._environmentalSimulationApplicationID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fieldNumber != obj._fieldNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduNumber != obj._pduNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduTotal != obj._pduTotal)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._coordinateSystem != obj._coordinateSystem)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfGridAxes != obj._numberOfGridAxes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._constantGrid != obj._constantGrid)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._environmentType.Equals(obj._environmentType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._orientation.Equals(obj._orientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sampleTime != obj._sampleTime)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._totalValues != obj._totalValues)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._vectorDimension != obj._vectorDimension)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._gridDataList.Count != obj._gridDataList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._gridDataList.Count; idx++)
-                {
-                    if (!this._gridDataList[idx].Equals(obj._gridDataList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._environmentalSimulationApplicationID.GetHashCode();
-            result = GenerateHash(result) ^ this._fieldNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._pduNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._pduTotal.GetHashCode();
-            result = GenerateHash(result) ^ this._coordinateSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfGridAxes.GetHashCode();
-            result = GenerateHash(result) ^ this._constantGrid.GetHashCode();
-            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
-            result = GenerateHash(result) ^ this._orientation.GetHashCode();
-            result = GenerateHash(result) ^ this._sampleTime.GetHashCode();
-            result = GenerateHash(result) ^ this._totalValues.GetHashCode();
-            result = GenerateHash(result) ^ this._vectorDimension.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            if (this._gridDataList.Count > 0)
-            {
-                for (int idx = 0; idx < this._gridDataList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._gridDataList[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.11.2: Information about globat, spatially varying enviornmental effects. This requires manual cleanup; the grid axis        records are variable sized. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Orientation))]
+    [XmlInclude(typeof(GridAxisRecord))]
+    public partial class GriddedDataPdu : SyntheticEnvironmentFamilyPdu, IEquatable<GriddedDataPdu>
+    {
+        /// <summary>
+        /// environmental simulation application ID
+        /// </summary>
+        private EntityID _environmentalSimulationApplicationID = new EntityID();
+
+        /// <summary>
+        /// unique identifier for each piece of enviornmental data
+        /// </summary>
+        private ushort _fieldNumber;
+
+        /// <summary>
+        /// sequence number for the total set of PDUS used to transmit the data
+        /// </summary>
+        private ushort _pduNumber;
+
+        /// <summary>
+        /// Total number of PDUS used to transmit the data
+        /// </summary>
+        private ushort _pduTotal;
+
+        /// <summary>
+        /// coordinate system of the grid
+        /// </summary>
+        private ushort _coordinateSystem;
+
+        /// <summary>
+        /// number of grid axes for the environmental data
+        /// </summary>
+        private byte _numberOfGridAxes;
+
+        /// <summary>
+        /// are domain grid axes identidal to those of the priveious domain update?
+        /// </summary>
+        private byte _constantGrid;
+
+        /// <summary>
+        /// type of environment
+        /// </summary>
+        private EntityType _environmentType = new EntityType();
+
+        /// <summary>
+        /// orientation of the data grid
+        /// </summary>
+        private Orientation _orientation = new Orientation();
+
+        /// <summary>
+        /// valid time of the enviormental data sample, 64 bit unsigned int
+        /// </summary>
+        private long _sampleTime;
+
+        /// <summary>
+        /// total number of all data values for all pdus for an environmental sample
+        /// </summary>
+        private uint _totalValues;
+
+        /// <summary>
+        /// total number of data values at each grid point.
+        /// </summary>
+        private byte _vectorDimension;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// Grid data ^^^This is wrong
+        /// </summary>
+        private List<GridAxisRecord> _gridDataList = new List<GridAxisRecord>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GriddedDataPdu"/> class.
+        /// </summary>
+        public GriddedDataPdu()
+        {
+            PduType = (byte)42;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GriddedDataPdu left, GriddedDataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GriddedDataPdu left, GriddedDataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._environmentalSimulationApplicationID.GetMarshalledSize();  // this._environmentalSimulationApplicationID
+            marshalSize += 2;  // this._fieldNumber
+            marshalSize += 2;  // this._pduNumber
+            marshalSize += 2;  // this._pduTotal
+            marshalSize += 2;  // this._coordinateSystem
+            marshalSize += 1;  // this._numberOfGridAxes
+            marshalSize += 1;  // this._constantGrid
+            marshalSize += this._environmentType.GetMarshalledSize();  // this._environmentType
+            marshalSize += this._orientation.GetMarshalledSize();  // this._orientation
+            marshalSize += 8;  // this._sampleTime
+            marshalSize += 4;  // this._totalValues
+            marshalSize += 1;  // this._vectorDimension
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            for (int idx = 0; idx < this._gridDataList.Count; idx++)
+            {
+                GridAxisRecord listElement = (GridAxisRecord)this._gridDataList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the environmental simulation application ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "environmentalSimulationApplicationID")]
+        public EntityID EnvironmentalSimulationApplicationID
+        {
+            get
+            {
+                return this._environmentalSimulationApplicationID;
+            }
+
+            set
+            {
+                this._environmentalSimulationApplicationID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique identifier for each piece of enviornmental data
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "fieldNumber")]
+        public ushort FieldNumber
+        {
+            get
+            {
+                return this._fieldNumber;
+            }
+
+            set
+            {
+                this._fieldNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the sequence number for the total set of PDUS used to transmit the data
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pduNumber")]
+        public ushort PduNumber
+        {
+            get
+            {
+                return this._pduNumber;
+            }
+
+            set
+            {
+                this._pduNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Total number of PDUS used to transmit the data
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pduTotal")]
+        public ushort PduTotal
+        {
+            get
+            {
+                return this._pduTotal;
+            }
+
+            set
+            {
+                this._pduTotal = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the coordinate system of the grid
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "coordinateSystem")]
+        public ushort CoordinateSystem
+        {
+            get
+            {
+                return this._coordinateSystem;
+            }
+
+            set
+            {
+                this._coordinateSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of grid axes for the environmental data
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfGridAxes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfGridAxes")]
+        public byte NumberOfGridAxes
+        {
+            get
+            {
+                return this._numberOfGridAxes;
+            }
+
+            set
+            {
+                this._numberOfGridAxes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the are domain grid axes identidal to those of the priveious domain update?
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "constantGrid")]
+        public byte ConstantGrid
+        {
+            get
+            {
+                return this._constantGrid;
+            }
+
+            set
+            {
+                this._constantGrid = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of environment
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "environmentType")]
+        public EntityType EnvironmentType
+        {
+            get
+            {
+                return this._environmentType;
+            }
+
+            set
+            {
+                this._environmentType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the orientation of the data grid
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "orientation")]
+        public Orientation Orientation
+        {
+            get
+            {
+                return this._orientation;
+            }
+
+            set
+            {
+                this._orientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the valid time of the enviormental data sample, 64 bit unsigned int
+        /// </summary>
+        [XmlElement(Type = typeof(long), ElementName = "sampleTime")]
+        public long SampleTime
+        {
+            get
+            {
+                return this._sampleTime;
+            }
+
+            set
+            {
+                this._sampleTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the total number of all data values for all pdus for an environmental sample
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "totalValues")]
+        public uint TotalValues
+        {
+            get
+            {
+                return this._totalValues;
+            }
+
+            set
+            {
+                this._totalValues = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the total number of data values at each grid point.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "vectorDimension")]
+        public byte VectorDimension
+        {
+            get
+            {
+                return this._vectorDimension;
+            }
+
+            set
+            {
+                this._vectorDimension = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Grid data ^^^This is wrong
+        /// </summary>
+        [XmlElement(ElementName = "gridDataListList", Type = typeof(List<GridAxisRecord>))]
+        public List<GridAxisRecord> GridDataList
+        {
+            get
+            {
+                return this._gridDataList;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._environmentalSimulationApplicationID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._fieldNumber);
+                    dos.WriteUnsignedShort((ushort)this._pduNumber);
+                    dos.WriteUnsignedShort((ushort)this._pduTotal);
+                    dos.WriteUnsignedShort((ushort)this._coordinateSystem);
+                    dos.WriteUnsignedByte((byte)this._gridDataList.Count);
+                    dos.WriteUnsignedByte((byte)this._constantGrid);
+                    this._environmentType.Marshal(dos);
+                    this._orientation.Marshal(dos);
+                    dos.WriteLong((long)this._sampleTime);
+                    dos.WriteUnsignedInt((uint)this._totalValues);
+                    dos.WriteUnsignedByte((byte)this._vectorDimension);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteUnsignedByte((byte)this._padding2);
+
+                    for (int idx = 0; idx < this._gridDataList.Count; idx++)
+                    {
+                        GridAxisRecord aGridAxisRecord = (GridAxisRecord)this._gridDataList[idx];
+                        aGridAxisRecord.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._environmentalSimulationApplicationID.Unmarshal(dis);
+                    this._fieldNumber = dis.ReadUnsignedShort();
+                    this._pduNumber = dis.ReadUnsignedShort();
+                    this._pduTotal = dis.ReadUnsignedShort();
+                    this._coordinateSystem = dis.ReadUnsignedShort();
+                    this._numberOfGridAxes = dis.ReadUnsignedByte();
+                    this._constantGrid = dis.ReadUnsignedByte();
+                    this._environmentType.Unmarshal(dis);
+                    this._orientation.Unmarshal(dis);
+                    this._sampleTime = dis.ReadLong();
+                    this._totalValues = dis.ReadUnsignedInt();
+                    this._vectorDimension = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._padding2 = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.NumberOfGridAxes; idx++)
+                    {
+                        GridAxisRecord anX = new GridAxisRecord();
+                        anX.Unmarshal(dis);
+                        this._gridDataList.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<GriddedDataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<environmentalSimulationApplicationID>");
+                this._environmentalSimulationApplicationID.Reflection(sb);
+                sb.AppendLine("</environmentalSimulationApplicationID>");
+                sb.AppendLine("<fieldNumber type=\"ushort\">" + this._fieldNumber.ToString(CultureInfo.InvariantCulture) + "</fieldNumber>");
+                sb.AppendLine("<pduNumber type=\"ushort\">" + this._pduNumber.ToString(CultureInfo.InvariantCulture) + "</pduNumber>");
+                sb.AppendLine("<pduTotal type=\"ushort\">" + this._pduTotal.ToString(CultureInfo.InvariantCulture) + "</pduTotal>");
+                sb.AppendLine("<coordinateSystem type=\"ushort\">" + this._coordinateSystem.ToString(CultureInfo.InvariantCulture) + "</coordinateSystem>");
+                sb.AppendLine("<gridDataList type=\"byte\">" + this._gridDataList.Count.ToString(CultureInfo.InvariantCulture) + "</gridDataList>");
+                sb.AppendLine("<constantGrid type=\"byte\">" + this._constantGrid.ToString(CultureInfo.InvariantCulture) + "</constantGrid>");
+                sb.AppendLine("<environmentType>");
+                this._environmentType.Reflection(sb);
+                sb.AppendLine("</environmentType>");
+                sb.AppendLine("<orientation>");
+                this._orientation.Reflection(sb);
+                sb.AppendLine("</orientation>");
+                sb.AppendLine("<sampleTime type=\"long\">" + this._sampleTime.ToString(CultureInfo.InvariantCulture) + "</sampleTime>");
+                sb.AppendLine("<totalValues type=\"uint\">" + this._totalValues.ToString(CultureInfo.InvariantCulture) + "</totalValues>");
+                sb.AppendLine("<vectorDimension type=\"byte\">" + this._vectorDimension.ToString(CultureInfo.InvariantCulture) + "</vectorDimension>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                for (int idx = 0; idx < this._gridDataList.Count; idx++)
+                {
+                    sb.AppendLine("<gridDataList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"GridAxisRecord\">");
+                    GridAxisRecord aGridAxisRecord = (GridAxisRecord)this._gridDataList[idx];
+                    aGridAxisRecord.Reflection(sb);
+                    sb.AppendLine("</gridDataList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</GriddedDataPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as GriddedDataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GriddedDataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._environmentalSimulationApplicationID.Equals(obj._environmentalSimulationApplicationID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fieldNumber != obj._fieldNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduNumber != obj._pduNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduTotal != obj._pduTotal)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._coordinateSystem != obj._coordinateSystem)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfGridAxes != obj._numberOfGridAxes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._constantGrid != obj._constantGrid)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._environmentType.Equals(obj._environmentType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._orientation.Equals(obj._orientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sampleTime != obj._sampleTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._totalValues != obj._totalValues)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._vectorDimension != obj._vectorDimension)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._gridDataList.Count != obj._gridDataList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._gridDataList.Count; idx++)
+                {
+                    if (!this._gridDataList[idx].Equals(obj._gridDataList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._environmentalSimulationApplicationID.GetHashCode();
+            result = GenerateHash(result) ^ this._fieldNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._pduNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._pduTotal.GetHashCode();
+            result = GenerateHash(result) ^ this._coordinateSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfGridAxes.GetHashCode();
+            result = GenerateHash(result) ^ this._constantGrid.GetHashCode();
+            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
+            result = GenerateHash(result) ^ this._orientation.GetHashCode();
+            result = GenerateHash(result) ^ this._sampleTime.GetHashCode();
+            result = GenerateHash(result) ^ this._totalValues.GetHashCode();
+            result = GenerateHash(result) ^ this._vectorDimension.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            if (this._gridDataList.Count > 0)
+            {
+                for (int idx = 0; idx < this._gridDataList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._gridDataList[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs b/Libs/CsharpDis6/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
index ddab62d..772de8a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IffAtcNavAidsLayer1Pdu.cs
@@ -1,479 +1,479 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.3.7.4.1: Navigational and IFF PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(SystemID))]
-    [XmlInclude(typeof(IffFundamentalData))]
-    public partial class IffAtcNavAidsLayer1Pdu : DistributedEmissionsFamilyPdu, IEquatable<IffAtcNavAidsLayer1Pdu>
-    {
-        /// <summary>
-        /// ID of the entity that is the source of the emissions
-        /// </summary>
-        private EntityID _emittingEntityId = new EntityID();
-
-        /// <summary>
-        /// Number generated by the issuing simulation to associate realted events.
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// Location wrt entity. There is some ambugiuity in the standard here, but this is the order it is listed in the table.
-        /// </summary>
-        private Vector3Float _location = new Vector3Float();
-
-        /// <summary>
-        /// System ID information
-        /// </summary>
-        private SystemID _systemID = new SystemID();
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad2;
-
-        /// <summary>
-        /// fundamental parameters
-        /// </summary>
-        private IffFundamentalData _fundamentalParameters = new IffFundamentalData();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IffAtcNavAidsLayer1Pdu"/> class.
-        /// </summary>
-        public IffAtcNavAidsLayer1Pdu()
-        {
-            PduType = (byte)28;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IffAtcNavAidsLayer1Pdu left, IffAtcNavAidsLayer1Pdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IffAtcNavAidsLayer1Pdu left, IffAtcNavAidsLayer1Pdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._emittingEntityId.GetMarshalledSize();  // this._emittingEntityId
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            marshalSize += this._systemID.GetMarshalledSize();  // this._systemID
-            marshalSize += 2;  // this._pad2
-            marshalSize += this._fundamentalParameters.GetMarshalledSize();  // this._fundamentalParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that is the source of the emissions
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityId")]
-        public EntityID EmittingEntityId
-        {
-            get
-            {
-                return this._emittingEntityId;
-            }
-
-            set
-            {
-                this._emittingEntityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number generated by the issuing simulation to associate realted events.
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location wrt entity. There is some ambugiuity in the standard here, but this is the order it is listed in the table.
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
-        public Vector3Float Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the System ID information
-        /// </summary>
-        [XmlElement(Type = typeof(SystemID), ElementName = "systemID")]
-        public SystemID SystemID
-        {
-            get
-            {
-                return this._systemID;
-            }
-
-            set
-            {
-                this._systemID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
-        public ushort Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the fundamental parameters
-        /// </summary>
-        [XmlElement(Type = typeof(IffFundamentalData), ElementName = "fundamentalParameters")]
-        public IffFundamentalData FundamentalParameters
-        {
-            get
-            {
-                return this._fundamentalParameters;
-            }
-
-            set
-            {
-                this._fundamentalParameters = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._emittingEntityId.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    this._location.Marshal(dos);
-                    this._systemID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._pad2);
-                    this._fundamentalParameters.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._emittingEntityId.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._location.Unmarshal(dis);
-                    this._systemID.Unmarshal(dis);
-                    this._pad2 = dis.ReadUnsignedShort();
-                    this._fundamentalParameters.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IffAtcNavAidsLayer1Pdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<emittingEntityId>");
-                this._emittingEntityId.Reflection(sb);
-                sb.AppendLine("</emittingEntityId>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                sb.AppendLine("<systemID>");
-                this._systemID.Reflection(sb);
-                sb.AppendLine("</systemID>");
-                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<fundamentalParameters>");
-                this._fundamentalParameters.Reflection(sb);
-                sb.AppendLine("</fundamentalParameters>");
-                sb.AppendLine("</IffAtcNavAidsLayer1Pdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IffAtcNavAidsLayer1Pdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IffAtcNavAidsLayer1Pdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._emittingEntityId.Equals(obj._emittingEntityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._systemID.Equals(obj._systemID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._fundamentalParameters.Equals(obj._fundamentalParameters))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._emittingEntityId.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-            result = GenerateHash(result) ^ this._systemID.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._fundamentalParameters.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.3.7.4.1: Navigational and IFF PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(SystemID))]
+    [XmlInclude(typeof(IffFundamentalData))]
+    public partial class IffAtcNavAidsLayer1Pdu : DistributedEmissionsFamilyPdu, IEquatable<IffAtcNavAidsLayer1Pdu>
+    {
+        /// <summary>
+        /// ID of the entity that is the source of the emissions
+        /// </summary>
+        private EntityID _emittingEntityId = new EntityID();
+
+        /// <summary>
+        /// Number generated by the issuing simulation to associate realted events.
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// Location wrt entity. There is some ambugiuity in the standard here, but this is the order it is listed in the table.
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// System ID information
+        /// </summary>
+        private SystemID _systemID = new SystemID();
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad2;
+
+        /// <summary>
+        /// fundamental parameters
+        /// </summary>
+        private IffFundamentalData _fundamentalParameters = new IffFundamentalData();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IffAtcNavAidsLayer1Pdu"/> class.
+        /// </summary>
+        public IffAtcNavAidsLayer1Pdu()
+        {
+            PduType = (byte)28;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IffAtcNavAidsLayer1Pdu left, IffAtcNavAidsLayer1Pdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IffAtcNavAidsLayer1Pdu left, IffAtcNavAidsLayer1Pdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._emittingEntityId.GetMarshalledSize();  // this._emittingEntityId
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            marshalSize += this._systemID.GetMarshalledSize();  // this._systemID
+            marshalSize += 2;  // this._pad2
+            marshalSize += this._fundamentalParameters.GetMarshalledSize();  // this._fundamentalParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that is the source of the emissions
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityId")]
+        public EntityID EmittingEntityId
+        {
+            get
+            {
+                return this._emittingEntityId;
+            }
+
+            set
+            {
+                this._emittingEntityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number generated by the issuing simulation to associate realted events.
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location wrt entity. There is some ambugiuity in the standard here, but this is the order it is listed in the table.
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the System ID information
+        /// </summary>
+        [XmlElement(Type = typeof(SystemID), ElementName = "systemID")]
+        public SystemID SystemID
+        {
+            get
+            {
+                return this._systemID;
+            }
+
+            set
+            {
+                this._systemID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad2")]
+        public ushort Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the fundamental parameters
+        /// </summary>
+        [XmlElement(Type = typeof(IffFundamentalData), ElementName = "fundamentalParameters")]
+        public IffFundamentalData FundamentalParameters
+        {
+            get
+            {
+                return this._fundamentalParameters;
+            }
+
+            set
+            {
+                this._fundamentalParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._emittingEntityId.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    this._location.Marshal(dos);
+                    this._systemID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._pad2);
+                    this._fundamentalParameters.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._emittingEntityId.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._location.Unmarshal(dis);
+                    this._systemID.Unmarshal(dis);
+                    this._pad2 = dis.ReadUnsignedShort();
+                    this._fundamentalParameters.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IffAtcNavAidsLayer1Pdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<emittingEntityId>");
+                this._emittingEntityId.Reflection(sb);
+                sb.AppendLine("</emittingEntityId>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                sb.AppendLine("<systemID>");
+                this._systemID.Reflection(sb);
+                sb.AppendLine("</systemID>");
+                sb.AppendLine("<pad2 type=\"ushort\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<fundamentalParameters>");
+                this._fundamentalParameters.Reflection(sb);
+                sb.AppendLine("</fundamentalParameters>");
+                sb.AppendLine("</IffAtcNavAidsLayer1Pdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IffAtcNavAidsLayer1Pdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IffAtcNavAidsLayer1Pdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._emittingEntityId.Equals(obj._emittingEntityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._systemID.Equals(obj._systemID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._fundamentalParameters.Equals(obj._fundamentalParameters))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._emittingEntityId.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+            result = GenerateHash(result) ^ this._systemID.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._fundamentalParameters.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs b/Libs/CsharpDis6/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
index e24e644..466c04b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IffAtcNavAidsLayer2Pdu.cs
@@ -1,444 +1,444 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the following fields. This requires manual cleanup.        the beamData attribute semantics are used in multiple ways. UNFINSISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(LayerHeader))]
-    [XmlInclude(typeof(BeamData))]
-    [XmlInclude(typeof(FundamentalParameterDataIff))]
-    public partial class IffAtcNavAidsLayer2Pdu : IffAtcNavAidsLayer1Pdu, IEquatable<IffAtcNavAidsLayer2Pdu>
-    {
-        /// <summary>
-        /// layer header
-        /// </summary>
-        private LayerHeader _layerHeader = new LayerHeader();
-
-        /// <summary>
-        /// beam data
-        /// </summary>
-        private BeamData _beamData = new BeamData();
-
-        /// <summary>
-        /// Secondary operational data, 5.2.57
-        /// </summary>
-        private BeamData _secondaryOperationalData = new BeamData();
-
-        /// <summary>
-        /// variable length list of fundamental parameters. ^^^This is wrong
-        /// </summary>
-        private List<FundamentalParameterDataIff> _fundamentalIffParameters = new List<FundamentalParameterDataIff>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IffAtcNavAidsLayer2Pdu"/> class.
-        /// </summary>
-        public IffAtcNavAidsLayer2Pdu()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IffAtcNavAidsLayer2Pdu left, IffAtcNavAidsLayer2Pdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IffAtcNavAidsLayer2Pdu left, IffAtcNavAidsLayer2Pdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._layerHeader.GetMarshalledSize();  // this._layerHeader
-            marshalSize += this._beamData.GetMarshalledSize();  // this._beamData
-            marshalSize += this._secondaryOperationalData.GetMarshalledSize();  // this._secondaryOperationalData
-            for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
-            {
-                FundamentalParameterDataIff listElement = (FundamentalParameterDataIff)this._fundamentalIffParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the layer header
-        /// </summary>
-        [XmlElement(Type = typeof(LayerHeader), ElementName = "layerHeader")]
-        public LayerHeader LayerHeader
-        {
-            get
-            {
-                return this._layerHeader;
-            }
-
-            set
-            {
-                this._layerHeader = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the beam data
-        /// </summary>
-        [XmlElement(Type = typeof(BeamData), ElementName = "beamData")]
-        public BeamData BeamData
-        {
-            get
-            {
-                return this._beamData;
-            }
-
-            set
-            {
-                this._beamData = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Secondary operational data, 5.2.57
-        /// </summary>
-        [XmlElement(Type = typeof(BeamData), ElementName = "secondaryOperationalData")]
-        public BeamData SecondaryOperationalData
-        {
-            get
-            {
-                return this._secondaryOperationalData;
-            }
-
-            set
-            {
-                this._secondaryOperationalData = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fundamental parameters. ^^^This is wrong
-        /// </summary>
-        [XmlElement(ElementName = "fundamentalIffParametersList", Type = typeof(List<FundamentalParameterDataIff>))]
-        public List<FundamentalParameterDataIff> FundamentalIffParameters
-        {
-            get
-            {
-                return this._fundamentalIffParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._layerHeader.Marshal(dos);
-                    this._beamData.Marshal(dos);
-                    this._secondaryOperationalData.Marshal(dos);
-
-                    for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
-                    {
-                        FundamentalParameterDataIff aFundamentalParameterDataIff = (FundamentalParameterDataIff)this._fundamentalIffParameters[idx];
-                        aFundamentalParameterDataIff.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._layerHeader.Unmarshal(dis);
-                    this._beamData.Unmarshal(dis);
-                    this._secondaryOperationalData.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this.Pad2; idx++)
-                    {
-                        FundamentalParameterDataIff anX = new FundamentalParameterDataIff();
-                        anX.Unmarshal(dis);
-                        this._fundamentalIffParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IffAtcNavAidsLayer2Pdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<layerHeader>");
-                this._layerHeader.Reflection(sb);
-                sb.AppendLine("</layerHeader>");
-                sb.AppendLine("<beamData>");
-                this._beamData.Reflection(sb);
-                sb.AppendLine("</beamData>");
-                sb.AppendLine("<secondaryOperationalData>");
-                this._secondaryOperationalData.Reflection(sb);
-                sb.AppendLine("</secondaryOperationalData>");
-                for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
-                {
-                    sb.AppendLine("<fundamentalIffParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FundamentalParameterDataIff\">");
-                    FundamentalParameterDataIff aFundamentalParameterDataIff = (FundamentalParameterDataIff)this._fundamentalIffParameters[idx];
-                    aFundamentalParameterDataIff.Reflection(sb);
-                    sb.AppendLine("</fundamentalIffParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</IffAtcNavAidsLayer2Pdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IffAtcNavAidsLayer2Pdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IffAtcNavAidsLayer2Pdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._layerHeader.Equals(obj._layerHeader))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._beamData.Equals(obj._beamData))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._secondaryOperationalData.Equals(obj._secondaryOperationalData))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fundamentalIffParameters.Count != obj._fundamentalIffParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
-                {
-                    if (!this._fundamentalIffParameters[idx].Equals(obj._fundamentalIffParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._layerHeader.GetHashCode();
-            result = GenerateHash(result) ^ this._beamData.GetHashCode();
-            result = GenerateHash(result) ^ this._secondaryOperationalData.GetHashCode();
-
-            if (this._fundamentalIffParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fundamentalIffParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the following fields. This requires manual cleanup.        the beamData attribute semantics are used in multiple ways. UNFINSISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(LayerHeader))]
+    [XmlInclude(typeof(BeamData))]
+    [XmlInclude(typeof(FundamentalParameterDataIff))]
+    public partial class IffAtcNavAidsLayer2Pdu : IffAtcNavAidsLayer1Pdu, IEquatable<IffAtcNavAidsLayer2Pdu>
+    {
+        /// <summary>
+        /// layer header
+        /// </summary>
+        private LayerHeader _layerHeader = new LayerHeader();
+
+        /// <summary>
+        /// beam data
+        /// </summary>
+        private BeamData _beamData = new BeamData();
+
+        /// <summary>
+        /// Secondary operational data, 5.2.57
+        /// </summary>
+        private BeamData _secondaryOperationalData = new BeamData();
+
+        /// <summary>
+        /// variable length list of fundamental parameters. ^^^This is wrong
+        /// </summary>
+        private List<FundamentalParameterDataIff> _fundamentalIffParameters = new List<FundamentalParameterDataIff>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IffAtcNavAidsLayer2Pdu"/> class.
+        /// </summary>
+        public IffAtcNavAidsLayer2Pdu()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IffAtcNavAidsLayer2Pdu left, IffAtcNavAidsLayer2Pdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IffAtcNavAidsLayer2Pdu left, IffAtcNavAidsLayer2Pdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._layerHeader.GetMarshalledSize();  // this._layerHeader
+            marshalSize += this._beamData.GetMarshalledSize();  // this._beamData
+            marshalSize += this._secondaryOperationalData.GetMarshalledSize();  // this._secondaryOperationalData
+            for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
+            {
+                FundamentalParameterDataIff listElement = (FundamentalParameterDataIff)this._fundamentalIffParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the layer header
+        /// </summary>
+        [XmlElement(Type = typeof(LayerHeader), ElementName = "layerHeader")]
+        public LayerHeader LayerHeader
+        {
+            get
+            {
+                return this._layerHeader;
+            }
+
+            set
+            {
+                this._layerHeader = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the beam data
+        /// </summary>
+        [XmlElement(Type = typeof(BeamData), ElementName = "beamData")]
+        public BeamData BeamData
+        {
+            get
+            {
+                return this._beamData;
+            }
+
+            set
+            {
+                this._beamData = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Secondary operational data, 5.2.57
+        /// </summary>
+        [XmlElement(Type = typeof(BeamData), ElementName = "secondaryOperationalData")]
+        public BeamData SecondaryOperationalData
+        {
+            get
+            {
+                return this._secondaryOperationalData;
+            }
+
+            set
+            {
+                this._secondaryOperationalData = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fundamental parameters. ^^^This is wrong
+        /// </summary>
+        [XmlElement(ElementName = "fundamentalIffParametersList", Type = typeof(List<FundamentalParameterDataIff>))]
+        public List<FundamentalParameterDataIff> FundamentalIffParameters
+        {
+            get
+            {
+                return this._fundamentalIffParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._layerHeader.Marshal(dos);
+                    this._beamData.Marshal(dos);
+                    this._secondaryOperationalData.Marshal(dos);
+
+                    for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
+                    {
+                        FundamentalParameterDataIff aFundamentalParameterDataIff = (FundamentalParameterDataIff)this._fundamentalIffParameters[idx];
+                        aFundamentalParameterDataIff.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._layerHeader.Unmarshal(dis);
+                    this._beamData.Unmarshal(dis);
+                    this._secondaryOperationalData.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this.Pad2; idx++)
+                    {
+                        FundamentalParameterDataIff anX = new FundamentalParameterDataIff();
+                        anX.Unmarshal(dis);
+                        this._fundamentalIffParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IffAtcNavAidsLayer2Pdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<layerHeader>");
+                this._layerHeader.Reflection(sb);
+                sb.AppendLine("</layerHeader>");
+                sb.AppendLine("<beamData>");
+                this._beamData.Reflection(sb);
+                sb.AppendLine("</beamData>");
+                sb.AppendLine("<secondaryOperationalData>");
+                this._secondaryOperationalData.Reflection(sb);
+                sb.AppendLine("</secondaryOperationalData>");
+                for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
+                {
+                    sb.AppendLine("<fundamentalIffParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FundamentalParameterDataIff\">");
+                    FundamentalParameterDataIff aFundamentalParameterDataIff = (FundamentalParameterDataIff)this._fundamentalIffParameters[idx];
+                    aFundamentalParameterDataIff.Reflection(sb);
+                    sb.AppendLine("</fundamentalIffParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</IffAtcNavAidsLayer2Pdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IffAtcNavAidsLayer2Pdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IffAtcNavAidsLayer2Pdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._layerHeader.Equals(obj._layerHeader))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._beamData.Equals(obj._beamData))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._secondaryOperationalData.Equals(obj._secondaryOperationalData))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fundamentalIffParameters.Count != obj._fundamentalIffParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
+                {
+                    if (!this._fundamentalIffParameters[idx].Equals(obj._fundamentalIffParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._layerHeader.GetHashCode();
+            result = GenerateHash(result) ^ this._beamData.GetHashCode();
+            result = GenerateHash(result) ^ this._secondaryOperationalData.GetHashCode();
+
+            if (this._fundamentalIffParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._fundamentalIffParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fundamentalIffParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffFundamentalData.cs b/Libs/CsharpDis6/Dis1998/Generated/IffFundamentalData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffFundamentalData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IffFundamentalData.cs
index 259a94e..8df4f16 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IffFundamentalData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IffFundamentalData.cs
@@ -1,588 +1,588 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.42. Basic operational data ofr IFF ATC NAVAIDS
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class IffFundamentalData
-    {
-        /// <summary>
-        /// system status
-        /// </summary>
-        private byte _systemStatus;
-
-        /// <summary>
-        /// Alternate parameter 4
-        /// </summary>
-        private byte _alternateParameter4;
-
-        /// <summary>
-        /// eight boolean fields
-        /// </summary>
-        private byte _informationLayers;
-
-        /// <summary>
-        /// enumeration
-        /// </summary>
-        private byte _modifier;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter1;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter2;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter3;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter4;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter5;
-
-        /// <summary>
-        /// parameter, enumeration
-        /// </summary>
-        private ushort _parameter6;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IffFundamentalData"/> class.
-        /// </summary>
-        public IffFundamentalData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IffFundamentalData left, IffFundamentalData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IffFundamentalData left, IffFundamentalData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._systemStatus
-            marshalSize += 1;  // this._alternateParameter4
-            marshalSize += 1;  // this._informationLayers
-            marshalSize += 1;  // this._modifier
-            marshalSize += 2;  // this._parameter1
-            marshalSize += 2;  // this._parameter2
-            marshalSize += 2;  // this._parameter3
-            marshalSize += 2;  // this._parameter4
-            marshalSize += 2;  // this._parameter5
-            marshalSize += 2;  // this._parameter6
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the system status
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "systemStatus")]
-        public byte SystemStatus
-        {
-            get
-            {
-                return this._systemStatus;
-            }
-
-            set
-            {
-                this._systemStatus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Alternate parameter 4
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "alternateParameter4")]
-        public byte AlternateParameter4
-        {
-            get
-            {
-                return this._alternateParameter4;
-            }
-
-            set
-            {
-                this._alternateParameter4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the eight boolean fields
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "informationLayers")]
-        public byte InformationLayers
-        {
-            get
-            {
-                return this._informationLayers;
-            }
-
-            set
-            {
-                this._informationLayers = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "modifier")]
-        public byte Modifier
-        {
-            get
-            {
-                return this._modifier;
-            }
-
-            set
-            {
-                this._modifier = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter1")]
-        public ushort Parameter1
-        {
-            get
-            {
-                return this._parameter1;
-            }
-
-            set
-            {
-                this._parameter1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter2")]
-        public ushort Parameter2
-        {
-            get
-            {
-                return this._parameter2;
-            }
-
-            set
-            {
-                this._parameter2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter3")]
-        public ushort Parameter3
-        {
-            get
-            {
-                return this._parameter3;
-            }
-
-            set
-            {
-                this._parameter3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter4")]
-        public ushort Parameter4
-        {
-            get
-            {
-                return this._parameter4;
-            }
-
-            set
-            {
-                this._parameter4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter5")]
-        public ushort Parameter5
-        {
-            get
-            {
-                return this._parameter5;
-            }
-
-            set
-            {
-                this._parameter5 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the parameter, enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "parameter6")]
-        public ushort Parameter6
-        {
-            get
-            {
-                return this._parameter6;
-            }
-
-            set
-            {
-                this._parameter6 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._systemStatus);
-                    dos.WriteUnsignedByte((byte)this._alternateParameter4);
-                    dos.WriteUnsignedByte((byte)this._informationLayers);
-                    dos.WriteUnsignedByte((byte)this._modifier);
-                    dos.WriteUnsignedShort((ushort)this._parameter1);
-                    dos.WriteUnsignedShort((ushort)this._parameter2);
-                    dos.WriteUnsignedShort((ushort)this._parameter3);
-                    dos.WriteUnsignedShort((ushort)this._parameter4);
-                    dos.WriteUnsignedShort((ushort)this._parameter5);
-                    dos.WriteUnsignedShort((ushort)this._parameter6);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._systemStatus = dis.ReadUnsignedByte();
-                    this._alternateParameter4 = dis.ReadUnsignedByte();
-                    this._informationLayers = dis.ReadUnsignedByte();
-                    this._modifier = dis.ReadUnsignedByte();
-                    this._parameter1 = dis.ReadUnsignedShort();
-                    this._parameter2 = dis.ReadUnsignedShort();
-                    this._parameter3 = dis.ReadUnsignedShort();
-                    this._parameter4 = dis.ReadUnsignedShort();
-                    this._parameter5 = dis.ReadUnsignedShort();
-                    this._parameter6 = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IffFundamentalData>");
-            try
-            {
-                sb.AppendLine("<systemStatus type=\"byte\">" + this._systemStatus.ToString(CultureInfo.InvariantCulture) + "</systemStatus>");
-                sb.AppendLine("<alternateParameter4 type=\"byte\">" + this._alternateParameter4.ToString(CultureInfo.InvariantCulture) + "</alternateParameter4>");
-                sb.AppendLine("<informationLayers type=\"byte\">" + this._informationLayers.ToString(CultureInfo.InvariantCulture) + "</informationLayers>");
-                sb.AppendLine("<modifier type=\"byte\">" + this._modifier.ToString(CultureInfo.InvariantCulture) + "</modifier>");
-                sb.AppendLine("<parameter1 type=\"ushort\">" + this._parameter1.ToString(CultureInfo.InvariantCulture) + "</parameter1>");
-                sb.AppendLine("<parameter2 type=\"ushort\">" + this._parameter2.ToString(CultureInfo.InvariantCulture) + "</parameter2>");
-                sb.AppendLine("<parameter3 type=\"ushort\">" + this._parameter3.ToString(CultureInfo.InvariantCulture) + "</parameter3>");
-                sb.AppendLine("<parameter4 type=\"ushort\">" + this._parameter4.ToString(CultureInfo.InvariantCulture) + "</parameter4>");
-                sb.AppendLine("<parameter5 type=\"ushort\">" + this._parameter5.ToString(CultureInfo.InvariantCulture) + "</parameter5>");
-                sb.AppendLine("<parameter6 type=\"ushort\">" + this._parameter6.ToString(CultureInfo.InvariantCulture) + "</parameter6>");
-                sb.AppendLine("</IffFundamentalData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IffFundamentalData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IffFundamentalData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._systemStatus != obj._systemStatus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._alternateParameter4 != obj._alternateParameter4)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._informationLayers != obj._informationLayers)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modifier != obj._modifier)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter1 != obj._parameter1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter2 != obj._parameter2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter3 != obj._parameter3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter4 != obj._parameter4)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter5 != obj._parameter5)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._parameter6 != obj._parameter6)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._systemStatus.GetHashCode();
-            result = GenerateHash(result) ^ this._alternateParameter4.GetHashCode();
-            result = GenerateHash(result) ^ this._informationLayers.GetHashCode();
-            result = GenerateHash(result) ^ this._modifier.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter1.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter2.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter3.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter4.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter5.GetHashCode();
-            result = GenerateHash(result) ^ this._parameter6.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.42. Basic operational data ofr IFF ATC NAVAIDS
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class IffFundamentalData
+    {
+        /// <summary>
+        /// system status
+        /// </summary>
+        private byte _systemStatus;
+
+        /// <summary>
+        /// Alternate parameter 4
+        /// </summary>
+        private byte _alternateParameter4;
+
+        /// <summary>
+        /// eight boolean fields
+        /// </summary>
+        private byte _informationLayers;
+
+        /// <summary>
+        /// enumeration
+        /// </summary>
+        private byte _modifier;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter1;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter2;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter3;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter4;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter5;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter6;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IffFundamentalData"/> class.
+        /// </summary>
+        public IffFundamentalData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IffFundamentalData left, IffFundamentalData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IffFundamentalData left, IffFundamentalData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._systemStatus
+            marshalSize += 1;  // this._alternateParameter4
+            marshalSize += 1;  // this._informationLayers
+            marshalSize += 1;  // this._modifier
+            marshalSize += 2;  // this._parameter1
+            marshalSize += 2;  // this._parameter2
+            marshalSize += 2;  // this._parameter3
+            marshalSize += 2;  // this._parameter4
+            marshalSize += 2;  // this._parameter5
+            marshalSize += 2;  // this._parameter6
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the system status
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "systemStatus")]
+        public byte SystemStatus
+        {
+            get
+            {
+                return this._systemStatus;
+            }
+
+            set
+            {
+                this._systemStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Alternate parameter 4
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "alternateParameter4")]
+        public byte AlternateParameter4
+        {
+            get
+            {
+                return this._alternateParameter4;
+            }
+
+            set
+            {
+                this._alternateParameter4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the eight boolean fields
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "informationLayers")]
+        public byte InformationLayers
+        {
+            get
+            {
+                return this._informationLayers;
+            }
+
+            set
+            {
+                this._informationLayers = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "modifier")]
+        public byte Modifier
+        {
+            get
+            {
+                return this._modifier;
+            }
+
+            set
+            {
+                this._modifier = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter1")]
+        public ushort Parameter1
+        {
+            get
+            {
+                return this._parameter1;
+            }
+
+            set
+            {
+                this._parameter1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter2")]
+        public ushort Parameter2
+        {
+            get
+            {
+                return this._parameter2;
+            }
+
+            set
+            {
+                this._parameter2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter3")]
+        public ushort Parameter3
+        {
+            get
+            {
+                return this._parameter3;
+            }
+
+            set
+            {
+                this._parameter3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter4")]
+        public ushort Parameter4
+        {
+            get
+            {
+                return this._parameter4;
+            }
+
+            set
+            {
+                this._parameter4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter5")]
+        public ushort Parameter5
+        {
+            get
+            {
+                return this._parameter5;
+            }
+
+            set
+            {
+                this._parameter5 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter6")]
+        public ushort Parameter6
+        {
+            get
+            {
+                return this._parameter6;
+            }
+
+            set
+            {
+                this._parameter6 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._systemStatus);
+                    dos.WriteUnsignedByte((byte)this._alternateParameter4);
+                    dos.WriteUnsignedByte((byte)this._informationLayers);
+                    dos.WriteUnsignedByte((byte)this._modifier);
+                    dos.WriteUnsignedShort((ushort)this._parameter1);
+                    dos.WriteUnsignedShort((ushort)this._parameter2);
+                    dos.WriteUnsignedShort((ushort)this._parameter3);
+                    dos.WriteUnsignedShort((ushort)this._parameter4);
+                    dos.WriteUnsignedShort((ushort)this._parameter5);
+                    dos.WriteUnsignedShort((ushort)this._parameter6);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._systemStatus = dis.ReadUnsignedByte();
+                    this._alternateParameter4 = dis.ReadUnsignedByte();
+                    this._informationLayers = dis.ReadUnsignedByte();
+                    this._modifier = dis.ReadUnsignedByte();
+                    this._parameter1 = dis.ReadUnsignedShort();
+                    this._parameter2 = dis.ReadUnsignedShort();
+                    this._parameter3 = dis.ReadUnsignedShort();
+                    this._parameter4 = dis.ReadUnsignedShort();
+                    this._parameter5 = dis.ReadUnsignedShort();
+                    this._parameter6 = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IffFundamentalData>");
+            try
+            {
+                sb.AppendLine("<systemStatus type=\"byte\">" + this._systemStatus.ToString(CultureInfo.InvariantCulture) + "</systemStatus>");
+                sb.AppendLine("<alternateParameter4 type=\"byte\">" + this._alternateParameter4.ToString(CultureInfo.InvariantCulture) + "</alternateParameter4>");
+                sb.AppendLine("<informationLayers type=\"byte\">" + this._informationLayers.ToString(CultureInfo.InvariantCulture) + "</informationLayers>");
+                sb.AppendLine("<modifier type=\"byte\">" + this._modifier.ToString(CultureInfo.InvariantCulture) + "</modifier>");
+                sb.AppendLine("<parameter1 type=\"ushort\">" + this._parameter1.ToString(CultureInfo.InvariantCulture) + "</parameter1>");
+                sb.AppendLine("<parameter2 type=\"ushort\">" + this._parameter2.ToString(CultureInfo.InvariantCulture) + "</parameter2>");
+                sb.AppendLine("<parameter3 type=\"ushort\">" + this._parameter3.ToString(CultureInfo.InvariantCulture) + "</parameter3>");
+                sb.AppendLine("<parameter4 type=\"ushort\">" + this._parameter4.ToString(CultureInfo.InvariantCulture) + "</parameter4>");
+                sb.AppendLine("<parameter5 type=\"ushort\">" + this._parameter5.ToString(CultureInfo.InvariantCulture) + "</parameter5>");
+                sb.AppendLine("<parameter6 type=\"ushort\">" + this._parameter6.ToString(CultureInfo.InvariantCulture) + "</parameter6>");
+                sb.AppendLine("</IffFundamentalData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IffFundamentalData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IffFundamentalData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._systemStatus != obj._systemStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._alternateParameter4 != obj._alternateParameter4)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._informationLayers != obj._informationLayers)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modifier != obj._modifier)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter1 != obj._parameter1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter2 != obj._parameter2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter3 != obj._parameter3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter4 != obj._parameter4)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter5 != obj._parameter5)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter6 != obj._parameter6)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._systemStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._alternateParameter4.GetHashCode();
+            result = GenerateHash(result) ^ this._informationLayers.GetHashCode();
+            result = GenerateHash(result) ^ this._modifier.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter1.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter2.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter3.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter4.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter5.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter6.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs b/Libs/CsharpDis6/Dis1998/Generated/IntercomCommunicationsParameters.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IntercomCommunicationsParameters.cs
index ba94210..cba822e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomCommunicationsParameters.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IntercomCommunicationsParameters.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.46.  Intercom communcations parameters
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class IntercomCommunicationsParameters
-    {
-        /// <summary>
-        /// Type of intercom parameters record
-        /// </summary>
-        private ushort _recordType;
-
-        /// <summary>
-        /// length of record
-        /// </summary>
-        private ushort _recordLength;
-
-        /// <summary>
-        /// Jerks. Looks like the committee is forcing a lookup of the record type parameter to find out how long the field is. This is a placeholder.
-        /// </summary>
-        private uint _recordSpecificField;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IntercomCommunicationsParameters"/> class.
-        /// </summary>
-        public IntercomCommunicationsParameters()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._recordType
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 4;  // this._recordSpecificField
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of intercom parameters record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordType")]
-        public ushort RecordType
-        {
-            get
-            {
-                return this._recordType;
-            }
-
-            set
-            {
-                this._recordType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length of record
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Jerks. Looks like the committee is forcing a lookup of the record type parameter to find out how long the field is. This is a placeholder.
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordSpecificField")]
-        public uint RecordSpecificField
-        {
-            get
-            {
-                return this._recordSpecificField;
-            }
-
-            set
-            {
-                this._recordSpecificField = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._recordType);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedInt((uint)this._recordSpecificField);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordType = dis.ReadUnsignedShort();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._recordSpecificField = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IntercomCommunicationsParameters>");
-            try
-            {
-                sb.AppendLine("<recordType type=\"ushort\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<recordSpecificField type=\"uint\">" + this._recordSpecificField.ToString(CultureInfo.InvariantCulture) + "</recordSpecificField>");
-                sb.AppendLine("</IntercomCommunicationsParameters>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IntercomCommunicationsParameters;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IntercomCommunicationsParameters obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordType != obj._recordType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSpecificField != obj._recordSpecificField)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordType.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._recordSpecificField.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.46.  Intercom communcations parameters
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class IntercomCommunicationsParameters
+    {
+        /// <summary>
+        /// Type of intercom parameters record
+        /// </summary>
+        private ushort _recordType;
+
+        /// <summary>
+        /// length of record
+        /// </summary>
+        private ushort _recordLength;
+
+        /// <summary>
+        /// Jerks. Looks like the committee is forcing a lookup of the record type parameter to find out how long the field is. This is a placeholder.
+        /// </summary>
+        private uint _recordSpecificField;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomCommunicationsParameters"/> class.
+        /// </summary>
+        public IntercomCommunicationsParameters()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 4;  // this._recordSpecificField
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of intercom parameters record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordType")]
+        public ushort RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length of record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Jerks. Looks like the committee is forcing a lookup of the record type parameter to find out how long the field is. This is a placeholder.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordSpecificField")]
+        public uint RecordSpecificField
+        {
+            get
+            {
+                return this._recordSpecificField;
+            }
+
+            set
+            {
+                this._recordSpecificField = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedInt((uint)this._recordSpecificField);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedShort();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._recordSpecificField = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IntercomCommunicationsParameters>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"ushort\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<recordSpecificField type=\"uint\">" + this._recordSpecificField.ToString(CultureInfo.InvariantCulture) + "</recordSpecificField>");
+                sb.AppendLine("</IntercomCommunicationsParameters>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IntercomCommunicationsParameters;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IntercomCommunicationsParameters obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSpecificField != obj._recordSpecificField)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._recordSpecificField.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomControlPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/IntercomControlPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomControlPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IntercomControlPdu.cs
index 4f6889b..591e67c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomControlPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IntercomControlPdu.cs
@@ -1,703 +1,703 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.8.5. Detailed inofrmation about the state of an intercom device and the actions it is requestion         of another intercom device, or the response to a requested action. Required manual intervention to fix the intercom parameters,        which can be of varialbe length. UNFINSISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(IntercomCommunicationsParameters))]
-    public partial class IntercomControlPdu : RadioCommunicationsFamilyPdu, IEquatable<IntercomControlPdu>
-    {
-        /// <summary>
-        /// control type
-        /// </summary>
-        private byte _controlType;
-
-        /// <summary>
-        /// control type
-        /// </summary>
-        private byte _communicationsChannelType;
-
-        /// <summary>
-        /// Source entity ID
-        /// </summary>
-        private EntityID _sourceEntityID = new EntityID();
-
-        /// <summary>
-        /// The specific intercom device being simulated within an entity.
-        /// </summary>
-        private byte _sourceCommunicationsDeviceID;
-
-        /// <summary>
-        /// Line number to which the intercom control refers
-        /// </summary>
-        private byte _sourceLineID;
-
-        /// <summary>
-        /// priority of this message relative to transmissons from other intercom devices
-        /// </summary>
-        private byte _transmitPriority;
-
-        /// <summary>
-        /// current transmit state of the line
-        /// </summary>
-        private byte _transmitLineState;
-
-        /// <summary>
-        /// detailed type requested.
-        /// </summary>
-        private byte _command;
-
-        /// <summary>
-        /// eid of the entity that has created this intercom channel.
-        /// </summary>
-        private EntityID _masterEntityID = new EntityID();
-
-        /// <summary>
-        /// specific intercom device that has created this intercom channel
-        /// </summary>
-        private ushort _masterCommunicationsDeviceID;
-
-        /// <summary>
-        /// number of intercom parameters
-        /// </summary>
-        private uint _intercomParametersLength;
-
-        /// <summary>
-        /// ^^^This is wrong--the length of the data field is variable. Using a long for now.
-        /// </summary>
-        private List<IntercomCommunicationsParameters> _intercomParameters = new List<IntercomCommunicationsParameters>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IntercomControlPdu"/> class.
-        /// </summary>
-        public IntercomControlPdu()
-        {
-            PduType = (byte)32;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IntercomControlPdu left, IntercomControlPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IntercomControlPdu left, IntercomControlPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._controlType
-            marshalSize += 1;  // this._communicationsChannelType
-            marshalSize += this._sourceEntityID.GetMarshalledSize();  // this._sourceEntityID
-            marshalSize += 1;  // this._sourceCommunicationsDeviceID
-            marshalSize += 1;  // this._sourceLineID
-            marshalSize += 1;  // this._transmitPriority
-            marshalSize += 1;  // this._transmitLineState
-            marshalSize += 1;  // this._command
-            marshalSize += this._masterEntityID.GetMarshalledSize();  // this._masterEntityID
-            marshalSize += 2;  // this._masterCommunicationsDeviceID
-            marshalSize += 4;  // this._intercomParametersLength
-            for (int idx = 0; idx < this._intercomParameters.Count; idx++)
-            {
-                IntercomCommunicationsParameters listElement = (IntercomCommunicationsParameters)this._intercomParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the control type
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "controlType")]
-        public byte ControlType
-        {
-            get
-            {
-                return this._controlType;
-            }
-
-            set
-            {
-                this._controlType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the control type
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "communicationsChannelType")]
-        public byte CommunicationsChannelType
-        {
-            get
-            {
-                return this._communicationsChannelType;
-            }
-
-            set
-            {
-                this._communicationsChannelType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Source entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "sourceEntityID")]
-        public EntityID SourceEntityID
-        {
-            get
-            {
-                return this._sourceEntityID;
-            }
-
-            set
-            {
-                this._sourceEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The specific intercom device being simulated within an entity.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "sourceCommunicationsDeviceID")]
-        public byte SourceCommunicationsDeviceID
-        {
-            get
-            {
-                return this._sourceCommunicationsDeviceID;
-            }
-
-            set
-            {
-                this._sourceCommunicationsDeviceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Line number to which the intercom control refers
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "sourceLineID")]
-        public byte SourceLineID
-        {
-            get
-            {
-                return this._sourceLineID;
-            }
-
-            set
-            {
-                this._sourceLineID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the priority of this message relative to transmissons from other intercom devices
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "transmitPriority")]
-        public byte TransmitPriority
-        {
-            get
-            {
-                return this._transmitPriority;
-            }
-
-            set
-            {
-                this._transmitPriority = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the current transmit state of the line
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "transmitLineState")]
-        public byte TransmitLineState
-        {
-            get
-            {
-                return this._transmitLineState;
-            }
-
-            set
-            {
-                this._transmitLineState = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the detailed type requested.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "command")]
-        public byte Command
-        {
-            get
-            {
-                return this._command;
-            }
-
-            set
-            {
-                this._command = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the eid of the entity that has created this intercom channel.
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "masterEntityID")]
-        public EntityID MasterEntityID
-        {
-            get
-            {
-                return this._masterEntityID;
-            }
-
-            set
-            {
-                this._masterEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific intercom device that has created this intercom channel
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "masterCommunicationsDeviceID")]
-        public ushort MasterCommunicationsDeviceID
-        {
-            get
-            {
-                return this._masterCommunicationsDeviceID;
-            }
-
-            set
-            {
-                this._masterCommunicationsDeviceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of intercom parameters
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getintercomParametersLength method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "intercomParametersLength")]
-        public uint IntercomParametersLength
-        {
-            get
-            {
-                return this._intercomParametersLength;
-            }
-
-            set
-            {
-                this._intercomParametersLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the ^^^This is wrong--the length of the data field is variable. Using a long for now.
-        /// </summary>
-        [XmlElement(ElementName = "intercomParametersList", Type = typeof(List<IntercomCommunicationsParameters>))]
-        public List<IntercomCommunicationsParameters> IntercomParameters
-        {
-            get
-            {
-                return this._intercomParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._controlType);
-                    dos.WriteUnsignedByte((byte)this._communicationsChannelType);
-                    this._sourceEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._sourceCommunicationsDeviceID);
-                    dos.WriteUnsignedByte((byte)this._sourceLineID);
-                    dos.WriteUnsignedByte((byte)this._transmitPriority);
-                    dos.WriteUnsignedByte((byte)this._transmitLineState);
-                    dos.WriteUnsignedByte((byte)this._command);
-                    this._masterEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._masterCommunicationsDeviceID);
-                    dos.WriteUnsignedInt((uint)this._intercomParameters.Count);
-
-                    for (int idx = 0; idx < this._intercomParameters.Count; idx++)
-                    {
-                        IntercomCommunicationsParameters aIntercomCommunicationsParameters = (IntercomCommunicationsParameters)this._intercomParameters[idx];
-                        aIntercomCommunicationsParameters.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._controlType = dis.ReadUnsignedByte();
-                    this._communicationsChannelType = dis.ReadUnsignedByte();
-                    this._sourceEntityID.Unmarshal(dis);
-                    this._sourceCommunicationsDeviceID = dis.ReadUnsignedByte();
-                    this._sourceLineID = dis.ReadUnsignedByte();
-                    this._transmitPriority = dis.ReadUnsignedByte();
-                    this._transmitLineState = dis.ReadUnsignedByte();
-                    this._command = dis.ReadUnsignedByte();
-                    this._masterEntityID.Unmarshal(dis);
-                    this._masterCommunicationsDeviceID = dis.ReadUnsignedShort();
-                    this._intercomParametersLength = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.IntercomParametersLength; idx++)
-                    {
-                        IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
-                        anX.Unmarshal(dis);
-                        this._intercomParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IntercomControlPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<controlType type=\"byte\">" + this._controlType.ToString(CultureInfo.InvariantCulture) + "</controlType>");
-                sb.AppendLine("<communicationsChannelType type=\"byte\">" + this._communicationsChannelType.ToString(CultureInfo.InvariantCulture) + "</communicationsChannelType>");
-                sb.AppendLine("<sourceEntityID>");
-                this._sourceEntityID.Reflection(sb);
-                sb.AppendLine("</sourceEntityID>");
-                sb.AppendLine("<sourceCommunicationsDeviceID type=\"byte\">" + this._sourceCommunicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</sourceCommunicationsDeviceID>");
-                sb.AppendLine("<sourceLineID type=\"byte\">" + this._sourceLineID.ToString(CultureInfo.InvariantCulture) + "</sourceLineID>");
-                sb.AppendLine("<transmitPriority type=\"byte\">" + this._transmitPriority.ToString(CultureInfo.InvariantCulture) + "</transmitPriority>");
-                sb.AppendLine("<transmitLineState type=\"byte\">" + this._transmitLineState.ToString(CultureInfo.InvariantCulture) + "</transmitLineState>");
-                sb.AppendLine("<command type=\"byte\">" + this._command.ToString(CultureInfo.InvariantCulture) + "</command>");
-                sb.AppendLine("<masterEntityID>");
-                this._masterEntityID.Reflection(sb);
-                sb.AppendLine("</masterEntityID>");
-                sb.AppendLine("<masterCommunicationsDeviceID type=\"ushort\">" + this._masterCommunicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</masterCommunicationsDeviceID>");
-                sb.AppendLine("<intercomParameters type=\"uint\">" + this._intercomParameters.Count.ToString(CultureInfo.InvariantCulture) + "</intercomParameters>");
-                for (int idx = 0; idx < this._intercomParameters.Count; idx++)
-                {
-                    sb.AppendLine("<intercomParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"IntercomCommunicationsParameters\">");
-                    IntercomCommunicationsParameters aIntercomCommunicationsParameters = (IntercomCommunicationsParameters)this._intercomParameters[idx];
-                    aIntercomCommunicationsParameters.Reflection(sb);
-                    sb.AppendLine("</intercomParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</IntercomControlPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IntercomControlPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IntercomControlPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._controlType != obj._controlType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._communicationsChannelType != obj._communicationsChannelType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._sourceEntityID.Equals(obj._sourceEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sourceCommunicationsDeviceID != obj._sourceCommunicationsDeviceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sourceLineID != obj._sourceLineID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitPriority != obj._transmitPriority)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitLineState != obj._transmitLineState)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._command != obj._command)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._masterEntityID.Equals(obj._masterEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._masterCommunicationsDeviceID != obj._masterCommunicationsDeviceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._intercomParametersLength != obj._intercomParametersLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._intercomParameters.Count != obj._intercomParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._intercomParameters.Count; idx++)
-                {
-                    if (!this._intercomParameters[idx].Equals(obj._intercomParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._controlType.GetHashCode();
-            result = GenerateHash(result) ^ this._communicationsChannelType.GetHashCode();
-            result = GenerateHash(result) ^ this._sourceEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._sourceCommunicationsDeviceID.GetHashCode();
-            result = GenerateHash(result) ^ this._sourceLineID.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitPriority.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitLineState.GetHashCode();
-            result = GenerateHash(result) ^ this._command.GetHashCode();
-            result = GenerateHash(result) ^ this._masterEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._masterCommunicationsDeviceID.GetHashCode();
-            result = GenerateHash(result) ^ this._intercomParametersLength.GetHashCode();
-
-            if (this._intercomParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._intercomParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._intercomParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.8.5. Detailed inofrmation about the state of an intercom device and the actions it is requestion         of another intercom device, or the response to a requested action. Required manual intervention to fix the intercom parameters,        which can be of varialbe length. UNFINSISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(IntercomCommunicationsParameters))]
+    public partial class IntercomControlPdu : RadioCommunicationsFamilyPdu, IEquatable<IntercomControlPdu>
+    {
+        /// <summary>
+        /// control type
+        /// </summary>
+        private byte _controlType;
+
+        /// <summary>
+        /// control type
+        /// </summary>
+        private byte _communicationsChannelType;
+
+        /// <summary>
+        /// Source entity ID
+        /// </summary>
+        private EntityID _sourceEntityID = new EntityID();
+
+        /// <summary>
+        /// The specific intercom device being simulated within an entity.
+        /// </summary>
+        private byte _sourceCommunicationsDeviceID;
+
+        /// <summary>
+        /// Line number to which the intercom control refers
+        /// </summary>
+        private byte _sourceLineID;
+
+        /// <summary>
+        /// priority of this message relative to transmissons from other intercom devices
+        /// </summary>
+        private byte _transmitPriority;
+
+        /// <summary>
+        /// current transmit state of the line
+        /// </summary>
+        private byte _transmitLineState;
+
+        /// <summary>
+        /// detailed type requested.
+        /// </summary>
+        private byte _command;
+
+        /// <summary>
+        /// eid of the entity that has created this intercom channel.
+        /// </summary>
+        private EntityID _masterEntityID = new EntityID();
+
+        /// <summary>
+        /// specific intercom device that has created this intercom channel
+        /// </summary>
+        private ushort _masterCommunicationsDeviceID;
+
+        /// <summary>
+        /// number of intercom parameters
+        /// </summary>
+        private uint _intercomParametersLength;
+
+        /// <summary>
+        /// ^^^This is wrong--the length of the data field is variable. Using a long for now.
+        /// </summary>
+        private List<IntercomCommunicationsParameters> _intercomParameters = new List<IntercomCommunicationsParameters>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomControlPdu"/> class.
+        /// </summary>
+        public IntercomControlPdu()
+        {
+            PduType = (byte)32;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IntercomControlPdu left, IntercomControlPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IntercomControlPdu left, IntercomControlPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._controlType
+            marshalSize += 1;  // this._communicationsChannelType
+            marshalSize += this._sourceEntityID.GetMarshalledSize();  // this._sourceEntityID
+            marshalSize += 1;  // this._sourceCommunicationsDeviceID
+            marshalSize += 1;  // this._sourceLineID
+            marshalSize += 1;  // this._transmitPriority
+            marshalSize += 1;  // this._transmitLineState
+            marshalSize += 1;  // this._command
+            marshalSize += this._masterEntityID.GetMarshalledSize();  // this._masterEntityID
+            marshalSize += 2;  // this._masterCommunicationsDeviceID
+            marshalSize += 4;  // this._intercomParametersLength
+            for (int idx = 0; idx < this._intercomParameters.Count; idx++)
+            {
+                IntercomCommunicationsParameters listElement = (IntercomCommunicationsParameters)this._intercomParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the control type
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "controlType")]
+        public byte ControlType
+        {
+            get
+            {
+                return this._controlType;
+            }
+
+            set
+            {
+                this._controlType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the control type
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "communicationsChannelType")]
+        public byte CommunicationsChannelType
+        {
+            get
+            {
+                return this._communicationsChannelType;
+            }
+
+            set
+            {
+                this._communicationsChannelType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Source entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "sourceEntityID")]
+        public EntityID SourceEntityID
+        {
+            get
+            {
+                return this._sourceEntityID;
+            }
+
+            set
+            {
+                this._sourceEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The specific intercom device being simulated within an entity.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "sourceCommunicationsDeviceID")]
+        public byte SourceCommunicationsDeviceID
+        {
+            get
+            {
+                return this._sourceCommunicationsDeviceID;
+            }
+
+            set
+            {
+                this._sourceCommunicationsDeviceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Line number to which the intercom control refers
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "sourceLineID")]
+        public byte SourceLineID
+        {
+            get
+            {
+                return this._sourceLineID;
+            }
+
+            set
+            {
+                this._sourceLineID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the priority of this message relative to transmissons from other intercom devices
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "transmitPriority")]
+        public byte TransmitPriority
+        {
+            get
+            {
+                return this._transmitPriority;
+            }
+
+            set
+            {
+                this._transmitPriority = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the current transmit state of the line
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "transmitLineState")]
+        public byte TransmitLineState
+        {
+            get
+            {
+                return this._transmitLineState;
+            }
+
+            set
+            {
+                this._transmitLineState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the detailed type requested.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "command")]
+        public byte Command
+        {
+            get
+            {
+                return this._command;
+            }
+
+            set
+            {
+                this._command = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the eid of the entity that has created this intercom channel.
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "masterEntityID")]
+        public EntityID MasterEntityID
+        {
+            get
+            {
+                return this._masterEntityID;
+            }
+
+            set
+            {
+                this._masterEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific intercom device that has created this intercom channel
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "masterCommunicationsDeviceID")]
+        public ushort MasterCommunicationsDeviceID
+        {
+            get
+            {
+                return this._masterCommunicationsDeviceID;
+            }
+
+            set
+            {
+                this._masterCommunicationsDeviceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of intercom parameters
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getintercomParametersLength method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "intercomParametersLength")]
+        public uint IntercomParametersLength
+        {
+            get
+            {
+                return this._intercomParametersLength;
+            }
+
+            set
+            {
+                this._intercomParametersLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the ^^^This is wrong--the length of the data field is variable. Using a long for now.
+        /// </summary>
+        [XmlElement(ElementName = "intercomParametersList", Type = typeof(List<IntercomCommunicationsParameters>))]
+        public List<IntercomCommunicationsParameters> IntercomParameters
+        {
+            get
+            {
+                return this._intercomParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._controlType);
+                    dos.WriteUnsignedByte((byte)this._communicationsChannelType);
+                    this._sourceEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._sourceCommunicationsDeviceID);
+                    dos.WriteUnsignedByte((byte)this._sourceLineID);
+                    dos.WriteUnsignedByte((byte)this._transmitPriority);
+                    dos.WriteUnsignedByte((byte)this._transmitLineState);
+                    dos.WriteUnsignedByte((byte)this._command);
+                    this._masterEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._masterCommunicationsDeviceID);
+                    dos.WriteUnsignedInt((uint)this._intercomParameters.Count);
+
+                    for (int idx = 0; idx < this._intercomParameters.Count; idx++)
+                    {
+                        IntercomCommunicationsParameters aIntercomCommunicationsParameters = (IntercomCommunicationsParameters)this._intercomParameters[idx];
+                        aIntercomCommunicationsParameters.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._controlType = dis.ReadUnsignedByte();
+                    this._communicationsChannelType = dis.ReadUnsignedByte();
+                    this._sourceEntityID.Unmarshal(dis);
+                    this._sourceCommunicationsDeviceID = dis.ReadUnsignedByte();
+                    this._sourceLineID = dis.ReadUnsignedByte();
+                    this._transmitPriority = dis.ReadUnsignedByte();
+                    this._transmitLineState = dis.ReadUnsignedByte();
+                    this._command = dis.ReadUnsignedByte();
+                    this._masterEntityID.Unmarshal(dis);
+                    this._masterCommunicationsDeviceID = dis.ReadUnsignedShort();
+                    this._intercomParametersLength = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.IntercomParametersLength; idx++)
+                    {
+                        IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
+                        anX.Unmarshal(dis);
+                        this._intercomParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IntercomControlPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<controlType type=\"byte\">" + this._controlType.ToString(CultureInfo.InvariantCulture) + "</controlType>");
+                sb.AppendLine("<communicationsChannelType type=\"byte\">" + this._communicationsChannelType.ToString(CultureInfo.InvariantCulture) + "</communicationsChannelType>");
+                sb.AppendLine("<sourceEntityID>");
+                this._sourceEntityID.Reflection(sb);
+                sb.AppendLine("</sourceEntityID>");
+                sb.AppendLine("<sourceCommunicationsDeviceID type=\"byte\">" + this._sourceCommunicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</sourceCommunicationsDeviceID>");
+                sb.AppendLine("<sourceLineID type=\"byte\">" + this._sourceLineID.ToString(CultureInfo.InvariantCulture) + "</sourceLineID>");
+                sb.AppendLine("<transmitPriority type=\"byte\">" + this._transmitPriority.ToString(CultureInfo.InvariantCulture) + "</transmitPriority>");
+                sb.AppendLine("<transmitLineState type=\"byte\">" + this._transmitLineState.ToString(CultureInfo.InvariantCulture) + "</transmitLineState>");
+                sb.AppendLine("<command type=\"byte\">" + this._command.ToString(CultureInfo.InvariantCulture) + "</command>");
+                sb.AppendLine("<masterEntityID>");
+                this._masterEntityID.Reflection(sb);
+                sb.AppendLine("</masterEntityID>");
+                sb.AppendLine("<masterCommunicationsDeviceID type=\"ushort\">" + this._masterCommunicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</masterCommunicationsDeviceID>");
+                sb.AppendLine("<intercomParameters type=\"uint\">" + this._intercomParameters.Count.ToString(CultureInfo.InvariantCulture) + "</intercomParameters>");
+                for (int idx = 0; idx < this._intercomParameters.Count; idx++)
+                {
+                    sb.AppendLine("<intercomParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"IntercomCommunicationsParameters\">");
+                    IntercomCommunicationsParameters aIntercomCommunicationsParameters = (IntercomCommunicationsParameters)this._intercomParameters[idx];
+                    aIntercomCommunicationsParameters.Reflection(sb);
+                    sb.AppendLine("</intercomParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</IntercomControlPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IntercomControlPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IntercomControlPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._controlType != obj._controlType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._communicationsChannelType != obj._communicationsChannelType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._sourceEntityID.Equals(obj._sourceEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sourceCommunicationsDeviceID != obj._sourceCommunicationsDeviceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sourceLineID != obj._sourceLineID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitPriority != obj._transmitPriority)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitLineState != obj._transmitLineState)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._command != obj._command)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._masterEntityID.Equals(obj._masterEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._masterCommunicationsDeviceID != obj._masterCommunicationsDeviceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._intercomParametersLength != obj._intercomParametersLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._intercomParameters.Count != obj._intercomParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._intercomParameters.Count; idx++)
+                {
+                    if (!this._intercomParameters[idx].Equals(obj._intercomParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._controlType.GetHashCode();
+            result = GenerateHash(result) ^ this._communicationsChannelType.GetHashCode();
+            result = GenerateHash(result) ^ this._sourceEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._sourceCommunicationsDeviceID.GetHashCode();
+            result = GenerateHash(result) ^ this._sourceLineID.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitPriority.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitLineState.GetHashCode();
+            result = GenerateHash(result) ^ this._command.GetHashCode();
+            result = GenerateHash(result) ^ this._masterEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._masterCommunicationsDeviceID.GetHashCode();
+            result = GenerateHash(result) ^ this._intercomParametersLength.GetHashCode();
+
+            if (this._intercomParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._intercomParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._intercomParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/IntercomSignalPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IntercomSignalPdu.cs
index 6c0e1c7..0a070f5 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IntercomSignalPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IntercomSignalPdu.cs
@@ -1,553 +1,553 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.8.4. Actual transmission of intercome voice data. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(OneByteChunk))]
-    public partial class IntercomSignalPdu : RadioCommunicationsFamilyPdu, IEquatable<IntercomSignalPdu>
-    {
-        /// <summary>
-        /// entity ID
-        /// </summary>
-        private EntityID _entityID = new EntityID();
-
-        /// <summary>
-        /// ID of communications device
-        /// </summary>
-        private ushort _communicationsDeviceID;
-
-        /// <summary>
-        /// encoding scheme
-        /// </summary>
-        private ushort _encodingScheme;
-
-        /// <summary>
-        /// tactical data link type
-        /// </summary>
-        private ushort _tdlType;
-
-        /// <summary>
-        /// sample rate
-        /// </summary>
-        private uint _sampleRate;
-
-        /// <summary>
-        /// data length
-        /// </summary>
-        private ushort _dataLength;
-
-        /// <summary>
-        /// samples
-        /// </summary>
-        private ushort _samples;
-
-        /// <summary>
-        /// data bytes
-        /// </summary>
-        private byte[] _data; 
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IntercomSignalPdu"/> class.
-        /// </summary>
-        public IntercomSignalPdu()
-        {
-            PduType = (byte)31;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IntercomSignalPdu left, IntercomSignalPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IntercomSignalPdu left, IntercomSignalPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
-            marshalSize += 2;  // this._communicationsDeviceID
-            marshalSize += 2;  // this._encodingScheme
-            marshalSize += 2;  // this._tdlType
-            marshalSize += 4;  // this._sampleRate
-            marshalSize += 2;  // this._dataLength
-            marshalSize += 2;  // this._samples
-            marshalSize += this._data.Length;
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
-        public EntityID EntityID
-        {
-            get
-            {
-                return this._entityID;
-            }
-
-            set
-            {
-                this._entityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of communications device
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "communicationsDeviceID")]
-        public ushort CommunicationsDeviceID
-        {
-            get
-            {
-                return this._communicationsDeviceID;
-            }
-
-            set
-            {
-                this._communicationsDeviceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the encoding scheme
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
-        public ushort EncodingScheme
-        {
-            get
-            {
-                return this._encodingScheme;
-            }
-
-            set
-            {
-                this._encodingScheme = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tactical data link type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
-        public ushort TdlType
-        {
-            get
-            {
-                return this._tdlType;
-            }
-
-            set
-            {
-                this._tdlType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the sample rate
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
-        public uint SampleRate
-        {
-            get
-            {
-                return this._sampleRate;
-            }
-
-            set
-            {
-                this._sampleRate = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the data length
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getdataLength method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "dataLength")]
-        public ushort DataLength
-        {
-            get
-            {
-                return this._dataLength;
-            }
-
-            set
-            {
-                this._dataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the samples
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "samples")]
-        public ushort Samples
-        {
-            get
-            {
-                return this._samples;
-            }
-
-            set
-            {
-                this._samples = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the data bytes
-        /// </summary>
-        [XmlElement(ElementName = "dataList", DataType = "hexBinary")]
-        public byte[] Data
-        {
-            get
-            {
-                return this._data;
-            }
-
-            set
-            {
-                this._data = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._communicationsDeviceID);
-                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
-                    dos.WriteUnsignedShort((ushort)this._tdlType);
-                    dos.WriteUnsignedInt((uint)this._sampleRate);
-                    dos.WriteUnsignedShort((ushort)this._data.Length);
-                    dos.WriteUnsignedShort((ushort)this._samples);
-
-                    dos.WriteByte(this._data);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityID.Unmarshal(dis);
-                    this._communicationsDeviceID = dis.ReadUnsignedShort();
-                    this._encodingScheme = dis.ReadUnsignedShort();
-                    this._tdlType = dis.ReadUnsignedShort();
-                    this._sampleRate = dis.ReadUnsignedInt();
-                    this._dataLength = dis.ReadUnsignedShort();
-                    this._samples = dis.ReadUnsignedShort();
-
-                    this._data = dis.ReadByteArray(this._dataLength);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IntercomSignalPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityID>");
-                this._entityID.Reflection(sb);
-                sb.AppendLine("</entityID>");
-                sb.AppendLine("<communicationsDeviceID type=\"ushort\">" + this._communicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</communicationsDeviceID>");
-                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
-                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
-                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
-                sb.AppendLine("<data type=\"ushort\">" + this._data.Length.ToString(CultureInfo.InvariantCulture) + "</data>");
-                sb.AppendLine("<samples type=\"ushort\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
-                sb.AppendLine("<data type=\"byte[]\">");
-                foreach (byte b in this._data)
-                {
-                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
-                }
-
-                sb.AppendLine("</data>");
-
-                sb.AppendLine("</IntercomSignalPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IntercomSignalPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IntercomSignalPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityID.Equals(obj._entityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._communicationsDeviceID != obj._communicationsDeviceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._encodingScheme != obj._encodingScheme)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._tdlType != obj._tdlType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sampleRate != obj._sampleRate)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataLength != obj._dataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._samples != obj._samples)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._data.Equals(obj._data))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityID.GetHashCode();
-            result = GenerateHash(result) ^ this._communicationsDeviceID.GetHashCode();
-            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
-            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
-            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
-            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._samples.GetHashCode();
-
-            if (this._data.Length > 0)
-            {
-                for (int idx = 0; idx < this._data.Length; idx++)
-                {
-                    result = GenerateHash(result) ^ this._data[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.8.4. Actual transmission of intercome voice data. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(OneByteChunk))]
+    public partial class IntercomSignalPdu : RadioCommunicationsFamilyPdu, IEquatable<IntercomSignalPdu>
+    {
+        /// <summary>
+        /// entity ID
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// ID of communications device
+        /// </summary>
+        private ushort _communicationsDeviceID;
+
+        /// <summary>
+        /// encoding scheme
+        /// </summary>
+        private ushort _encodingScheme;
+
+        /// <summary>
+        /// tactical data link type
+        /// </summary>
+        private ushort _tdlType;
+
+        /// <summary>
+        /// sample rate
+        /// </summary>
+        private uint _sampleRate;
+
+        /// <summary>
+        /// data length
+        /// </summary>
+        private ushort _dataLength;
+
+        /// <summary>
+        /// samples
+        /// </summary>
+        private ushort _samples;
+
+        /// <summary>
+        /// data bytes
+        /// </summary>
+        private byte[] _data; 
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomSignalPdu"/> class.
+        /// </summary>
+        public IntercomSignalPdu()
+        {
+            PduType = (byte)31;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IntercomSignalPdu left, IntercomSignalPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IntercomSignalPdu left, IntercomSignalPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 2;  // this._communicationsDeviceID
+            marshalSize += 2;  // this._encodingScheme
+            marshalSize += 2;  // this._tdlType
+            marshalSize += 4;  // this._sampleRate
+            marshalSize += 2;  // this._dataLength
+            marshalSize += 2;  // this._samples
+            marshalSize += this._data.Length;
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of communications device
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "communicationsDeviceID")]
+        public ushort CommunicationsDeviceID
+        {
+            get
+            {
+                return this._communicationsDeviceID;
+            }
+
+            set
+            {
+                this._communicationsDeviceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding scheme
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
+        public ushort EncodingScheme
+        {
+            get
+            {
+                return this._encodingScheme;
+            }
+
+            set
+            {
+                this._encodingScheme = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tactical data link type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
+        public ushort TdlType
+        {
+            get
+            {
+                return this._tdlType;
+            }
+
+            set
+            {
+                this._tdlType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the sample rate
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
+        public uint SampleRate
+        {
+            get
+            {
+                return this._sampleRate;
+            }
+
+            set
+            {
+                this._sampleRate = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the data length
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getdataLength method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "dataLength")]
+        public ushort DataLength
+        {
+            get
+            {
+                return this._dataLength;
+            }
+
+            set
+            {
+                this._dataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the samples
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "samples")]
+        public ushort Samples
+        {
+            get
+            {
+                return this._samples;
+            }
+
+            set
+            {
+                this._samples = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the data bytes
+        /// </summary>
+        [XmlElement(ElementName = "dataList", DataType = "hexBinary")]
+        public byte[] Data
+        {
+            get
+            {
+                return this._data;
+            }
+
+            set
+            {
+                this._data = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._communicationsDeviceID);
+                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
+                    dos.WriteUnsignedShort((ushort)this._tdlType);
+                    dos.WriteUnsignedInt((uint)this._sampleRate);
+                    dos.WriteUnsignedShort((ushort)this._data.Length);
+                    dos.WriteUnsignedShort((ushort)this._samples);
+
+                    dos.WriteByte(this._data);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._communicationsDeviceID = dis.ReadUnsignedShort();
+                    this._encodingScheme = dis.ReadUnsignedShort();
+                    this._tdlType = dis.ReadUnsignedShort();
+                    this._sampleRate = dis.ReadUnsignedInt();
+                    this._dataLength = dis.ReadUnsignedShort();
+                    this._samples = dis.ReadUnsignedShort();
+
+                    this._data = dis.ReadByteArray(this._dataLength);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IntercomSignalPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<communicationsDeviceID type=\"ushort\">" + this._communicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</communicationsDeviceID>");
+                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
+                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
+                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
+                sb.AppendLine("<data type=\"ushort\">" + this._data.Length.ToString(CultureInfo.InvariantCulture) + "</data>");
+                sb.AppendLine("<samples type=\"ushort\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
+                sb.AppendLine("<data type=\"byte[]\">");
+                foreach (byte b in this._data)
+                {
+                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
+                }
+
+                sb.AppendLine("</data>");
+
+                sb.AppendLine("</IntercomSignalPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IntercomSignalPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IntercomSignalPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._communicationsDeviceID != obj._communicationsDeviceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._encodingScheme != obj._encodingScheme)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._tdlType != obj._tdlType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sampleRate != obj._sampleRate)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataLength != obj._dataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._samples != obj._samples)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._data.Equals(obj._data))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._communicationsDeviceID.GetHashCode();
+            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
+            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
+            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
+            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._samples.GetHashCode();
+
+            if (this._data.Length > 0)
+            {
+                for (int idx = 0; idx < this._data.Length; idx++)
+                {
+                    result = GenerateHash(result) ^ this._data[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/IsGroupOfPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IsGroupOfPdu.cs
index a377d4b..002142c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsGroupOfPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IsGroupOfPdu.cs
@@ -1,541 +1,541 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.9.2 Information about a particular group of entities grouped together for the purposes of netowrk bandwidth         reduction or aggregation. Needs manual cleanup. The GED size requires a database lookup. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class IsGroupOfPdu : EntityManagementFamilyPdu, IEquatable<IsGroupOfPdu>
-    {
-        /// <summary>
-        /// ID of aggregated entities
-        /// </summary>
-        private EntityID _groupEntityID = new EntityID();
-
-        /// <summary>
-        /// type of entities constituting the group
-        /// </summary>
-        private byte _groupedEntityCategory;
-
-        /// <summary>
-        /// Number of individual entities constituting the group
-        /// </summary>
-        private byte _numberOfGroupedEntities;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _pad2;
-
-        /// <summary>
-        /// latitude
-        /// </summary>
-        private double _latitude;
-
-        /// <summary>
-        /// longitude
-        /// </summary>
-        private double _longitude;
-
-        /// <summary>
-        /// GED records about each individual entity in the group. ^^^this is wrong--need a database lookup to find the actual size of the list elements
-        /// </summary>
-        private List<VariableDatum> _groupedEntityDescriptions = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IsGroupOfPdu"/> class.
-        /// </summary>
-        public IsGroupOfPdu()
-        {
-            PduType = (byte)34;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IsGroupOfPdu left, IsGroupOfPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IsGroupOfPdu left, IsGroupOfPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._groupEntityID.GetMarshalledSize();  // this._groupEntityID
-            marshalSize += 1;  // this._groupedEntityCategory
-            marshalSize += 1;  // this._numberOfGroupedEntities
-            marshalSize += 4;  // this._pad2
-            marshalSize += 8;  // this._latitude
-            marshalSize += 8;  // this._longitude
-            for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._groupedEntityDescriptions[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of aggregated entities
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "groupEntityID")]
-        public EntityID GroupEntityID
-        {
-            get
-            {
-                return this._groupEntityID;
-            }
-
-            set
-            {
-                this._groupEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of entities constituting the group
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "groupedEntityCategory")]
-        public byte GroupedEntityCategory
-        {
-            get
-            {
-                return this._groupedEntityCategory;
-            }
-
-            set
-            {
-                this._groupedEntityCategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of individual entities constituting the group
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfGroupedEntities method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfGroupedEntities")]
-        public byte NumberOfGroupedEntities
-        {
-            get
-            {
-                return this._numberOfGroupedEntities;
-            }
-
-            set
-            {
-                this._numberOfGroupedEntities = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "pad2")]
-        public uint Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the latitude
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "latitude")]
-        public double Latitude
-        {
-            get
-            {
-                return this._latitude;
-            }
-
-            set
-            {
-                this._latitude = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the longitude
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "longitude")]
-        public double Longitude
-        {
-            get
-            {
-                return this._longitude;
-            }
-
-            set
-            {
-                this._longitude = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the GED records about each individual entity in the group. ^^^this is wrong--need a database lookup to find the actual size of the list elements
-        /// </summary>
-        [XmlElement(ElementName = "groupedEntityDescriptionsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> GroupedEntityDescriptions
-        {
-            get
-            {
-                return this._groupedEntityDescriptions;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._groupEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._groupedEntityCategory);
-                    dos.WriteUnsignedByte((byte)this._groupedEntityDescriptions.Count);
-                    dos.WriteUnsignedInt((uint)this._pad2);
-                    dos.WriteDouble((double)this._latitude);
-                    dos.WriteDouble((double)this._longitude);
-
-                    for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._groupedEntityDescriptions[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._groupEntityID.Unmarshal(dis);
-                    this._groupedEntityCategory = dis.ReadUnsignedByte();
-                    this._numberOfGroupedEntities = dis.ReadUnsignedByte();
-                    this._pad2 = dis.ReadUnsignedInt();
-                    this._latitude = dis.ReadDouble();
-                    this._longitude = dis.ReadDouble();
-
-                    for (int idx = 0; idx < this.NumberOfGroupedEntities; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._groupedEntityDescriptions.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IsGroupOfPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<groupEntityID>");
-                this._groupEntityID.Reflection(sb);
-                sb.AppendLine("</groupEntityID>");
-                sb.AppendLine("<groupedEntityCategory type=\"byte\">" + this._groupedEntityCategory.ToString(CultureInfo.InvariantCulture) + "</groupedEntityCategory>");
-                sb.AppendLine("<groupedEntityDescriptions type=\"byte\">" + this._groupedEntityDescriptions.Count.ToString(CultureInfo.InvariantCulture) + "</groupedEntityDescriptions>");
-                sb.AppendLine("<pad2 type=\"uint\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<latitude type=\"double\">" + this._latitude.ToString(CultureInfo.InvariantCulture) + "</latitude>");
-                sb.AppendLine("<longitude type=\"double\">" + this._longitude.ToString(CultureInfo.InvariantCulture) + "</longitude>");
-                for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
-                {
-                    sb.AppendLine("<groupedEntityDescriptions" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._groupedEntityDescriptions[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</groupedEntityDescriptions" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</IsGroupOfPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IsGroupOfPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IsGroupOfPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._groupEntityID.Equals(obj._groupEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._groupedEntityCategory != obj._groupedEntityCategory)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfGroupedEntities != obj._numberOfGroupedEntities)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._latitude != obj._latitude)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._longitude != obj._longitude)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._groupedEntityDescriptions.Count != obj._groupedEntityDescriptions.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
-                {
-                    if (!this._groupedEntityDescriptions[idx].Equals(obj._groupedEntityDescriptions[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._groupEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._groupedEntityCategory.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfGroupedEntities.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._latitude.GetHashCode();
-            result = GenerateHash(result) ^ this._longitude.GetHashCode();
-
-            if (this._groupedEntityDescriptions.Count > 0)
-            {
-                for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._groupedEntityDescriptions[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.9.2 Information about a particular group of entities grouped together for the purposes of netowrk bandwidth         reduction or aggregation. Needs manual cleanup. The GED size requires a database lookup. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class IsGroupOfPdu : EntityManagementFamilyPdu, IEquatable<IsGroupOfPdu>
+    {
+        /// <summary>
+        /// ID of aggregated entities
+        /// </summary>
+        private EntityID _groupEntityID = new EntityID();
+
+        /// <summary>
+        /// type of entities constituting the group
+        /// </summary>
+        private byte _groupedEntityCategory;
+
+        /// <summary>
+        /// Number of individual entities constituting the group
+        /// </summary>
+        private byte _numberOfGroupedEntities;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _pad2;
+
+        /// <summary>
+        /// latitude
+        /// </summary>
+        private double _latitude;
+
+        /// <summary>
+        /// longitude
+        /// </summary>
+        private double _longitude;
+
+        /// <summary>
+        /// GED records about each individual entity in the group. ^^^this is wrong--need a database lookup to find the actual size of the list elements
+        /// </summary>
+        private List<VariableDatum> _groupedEntityDescriptions = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsGroupOfPdu"/> class.
+        /// </summary>
+        public IsGroupOfPdu()
+        {
+            PduType = (byte)34;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IsGroupOfPdu left, IsGroupOfPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IsGroupOfPdu left, IsGroupOfPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._groupEntityID.GetMarshalledSize();  // this._groupEntityID
+            marshalSize += 1;  // this._groupedEntityCategory
+            marshalSize += 1;  // this._numberOfGroupedEntities
+            marshalSize += 4;  // this._pad2
+            marshalSize += 8;  // this._latitude
+            marshalSize += 8;  // this._longitude
+            for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._groupedEntityDescriptions[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of aggregated entities
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "groupEntityID")]
+        public EntityID GroupEntityID
+        {
+            get
+            {
+                return this._groupEntityID;
+            }
+
+            set
+            {
+                this._groupEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of entities constituting the group
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "groupedEntityCategory")]
+        public byte GroupedEntityCategory
+        {
+            get
+            {
+                return this._groupedEntityCategory;
+            }
+
+            set
+            {
+                this._groupedEntityCategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of individual entities constituting the group
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfGroupedEntities method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfGroupedEntities")]
+        public byte NumberOfGroupedEntities
+        {
+            get
+            {
+                return this._numberOfGroupedEntities;
+            }
+
+            set
+            {
+                this._numberOfGroupedEntities = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "pad2")]
+        public uint Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the latitude
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "latitude")]
+        public double Latitude
+        {
+            get
+            {
+                return this._latitude;
+            }
+
+            set
+            {
+                this._latitude = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the longitude
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "longitude")]
+        public double Longitude
+        {
+            get
+            {
+                return this._longitude;
+            }
+
+            set
+            {
+                this._longitude = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the GED records about each individual entity in the group. ^^^this is wrong--need a database lookup to find the actual size of the list elements
+        /// </summary>
+        [XmlElement(ElementName = "groupedEntityDescriptionsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> GroupedEntityDescriptions
+        {
+            get
+            {
+                return this._groupedEntityDescriptions;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._groupEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._groupedEntityCategory);
+                    dos.WriteUnsignedByte((byte)this._groupedEntityDescriptions.Count);
+                    dos.WriteUnsignedInt((uint)this._pad2);
+                    dos.WriteDouble((double)this._latitude);
+                    dos.WriteDouble((double)this._longitude);
+
+                    for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._groupedEntityDescriptions[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._groupEntityID.Unmarshal(dis);
+                    this._groupedEntityCategory = dis.ReadUnsignedByte();
+                    this._numberOfGroupedEntities = dis.ReadUnsignedByte();
+                    this._pad2 = dis.ReadUnsignedInt();
+                    this._latitude = dis.ReadDouble();
+                    this._longitude = dis.ReadDouble();
+
+                    for (int idx = 0; idx < this.NumberOfGroupedEntities; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._groupedEntityDescriptions.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IsGroupOfPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<groupEntityID>");
+                this._groupEntityID.Reflection(sb);
+                sb.AppendLine("</groupEntityID>");
+                sb.AppendLine("<groupedEntityCategory type=\"byte\">" + this._groupedEntityCategory.ToString(CultureInfo.InvariantCulture) + "</groupedEntityCategory>");
+                sb.AppendLine("<groupedEntityDescriptions type=\"byte\">" + this._groupedEntityDescriptions.Count.ToString(CultureInfo.InvariantCulture) + "</groupedEntityDescriptions>");
+                sb.AppendLine("<pad2 type=\"uint\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<latitude type=\"double\">" + this._latitude.ToString(CultureInfo.InvariantCulture) + "</latitude>");
+                sb.AppendLine("<longitude type=\"double\">" + this._longitude.ToString(CultureInfo.InvariantCulture) + "</longitude>");
+                for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
+                {
+                    sb.AppendLine("<groupedEntityDescriptions" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._groupedEntityDescriptions[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</groupedEntityDescriptions" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</IsGroupOfPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IsGroupOfPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IsGroupOfPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._groupEntityID.Equals(obj._groupEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._groupedEntityCategory != obj._groupedEntityCategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfGroupedEntities != obj._numberOfGroupedEntities)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._latitude != obj._latitude)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._longitude != obj._longitude)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._groupedEntityDescriptions.Count != obj._groupedEntityDescriptions.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
+                {
+                    if (!this._groupedEntityDescriptions[idx].Equals(obj._groupedEntityDescriptions[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._groupEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._groupedEntityCategory.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfGroupedEntities.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._latitude.GetHashCode();
+            result = GenerateHash(result) ^ this._longitude.GetHashCode();
+
+            if (this._groupedEntityDescriptions.Count > 0)
+            {
+                for (int idx = 0; idx < this._groupedEntityDescriptions.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._groupedEntityDescriptions[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsPartOfPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/IsPartOfPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsPartOfPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/IsPartOfPdu.cs
index 519dd50..c6029f4 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/IsPartOfPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/IsPartOfPdu.cs
@@ -1,481 +1,481 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.9.4 The joining of two or more simulation entities is communicated by this PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(Relationship))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(NamedLocation))]
-    [XmlInclude(typeof(EntityType))]
-    public partial class IsPartOfPdu : EntityManagementFamilyPdu, IEquatable<IsPartOfPdu>
-    {
-        /// <summary>
-        /// ID of entity originating PDU
-        /// </summary>
-        private EntityID _orginatingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of entity receiving PDU
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// relationship of joined parts
-        /// </summary>
-        private Relationship _relationship = new Relationship();
-
-        /// <summary>
-        /// location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
-        /// </summary>
-        private Vector3Float _partLocation = new Vector3Float();
-
-        /// <summary>
-        /// named location
-        /// </summary>
-        private NamedLocation _namedLocationID = new NamedLocation();
-
-        /// <summary>
-        /// entity type
-        /// </summary>
-        private EntityType _partEntityType = new EntityType();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IsPartOfPdu"/> class.
-        /// </summary>
-        public IsPartOfPdu()
-        {
-            PduType = (byte)36;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(IsPartOfPdu left, IsPartOfPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(IsPartOfPdu left, IsPartOfPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._relationship.GetMarshalledSize();  // this._relationship
-            marshalSize += this._partLocation.GetMarshalledSize();  // this._partLocation
-            marshalSize += this._namedLocationID.GetMarshalledSize();  // this._namedLocationID
-            marshalSize += this._partEntityType.GetMarshalledSize();  // this._partEntityType
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity originating PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
-        public EntityID OrginatingEntityID
-        {
-            get
-            {
-                return this._orginatingEntityID;
-            }
-
-            set
-            {
-                this._orginatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity receiving PDU
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the relationship of joined parts
-        /// </summary>
-        [XmlElement(Type = typeof(Relationship), ElementName = "relationship")]
-        public Relationship Relationship
-        {
-            get
-            {
-                return this._relationship;
-            }
-
-            set
-            {
-                this._relationship = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "partLocation")]
-        public Vector3Float PartLocation
-        {
-            get
-            {
-                return this._partLocation;
-            }
-
-            set
-            {
-                this._partLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the named location
-        /// </summary>
-        [XmlElement(Type = typeof(NamedLocation), ElementName = "namedLocationID")]
-        public NamedLocation NamedLocationID
-        {
-            get
-            {
-                return this._namedLocationID;
-            }
-
-            set
-            {
-                this._namedLocationID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the entity type
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "partEntityType")]
-        public EntityType PartEntityType
-        {
-            get
-            {
-                return this._partEntityType;
-            }
-
-            set
-            {
-                this._partEntityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Marshal(dos);
-                    this._receivingEntityID.Marshal(dos);
-                    this._relationship.Marshal(dos);
-                    this._partLocation.Marshal(dos);
-                    this._namedLocationID.Marshal(dos);
-                    this._partEntityType.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Unmarshal(dis);
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._relationship.Unmarshal(dis);
-                    this._partLocation.Unmarshal(dis);
-                    this._namedLocationID.Unmarshal(dis);
-                    this._partEntityType.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<IsPartOfPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<orginatingEntityID>");
-                this._orginatingEntityID.Reflection(sb);
-                sb.AppendLine("</orginatingEntityID>");
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<relationship>");
-                this._relationship.Reflection(sb);
-                sb.AppendLine("</relationship>");
-                sb.AppendLine("<partLocation>");
-                this._partLocation.Reflection(sb);
-                sb.AppendLine("</partLocation>");
-                sb.AppendLine("<namedLocationID>");
-                this._namedLocationID.Reflection(sb);
-                sb.AppendLine("</namedLocationID>");
-                sb.AppendLine("<partEntityType>");
-                this._partEntityType.Reflection(sb);
-                sb.AppendLine("</partEntityType>");
-                sb.AppendLine("</IsPartOfPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as IsPartOfPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(IsPartOfPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._relationship.Equals(obj._relationship))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._partLocation.Equals(obj._partLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._namedLocationID.Equals(obj._namedLocationID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._partEntityType.Equals(obj._partEntityType))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._relationship.GetHashCode();
-            result = GenerateHash(result) ^ this._partLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._namedLocationID.GetHashCode();
-            result = GenerateHash(result) ^ this._partEntityType.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.9.4 The joining of two or more simulation entities is communicated by this PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Relationship))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(NamedLocation))]
+    [XmlInclude(typeof(EntityType))]
+    public partial class IsPartOfPdu : EntityManagementFamilyPdu, IEquatable<IsPartOfPdu>
+    {
+        /// <summary>
+        /// ID of entity originating PDU
+        /// </summary>
+        private EntityID _orginatingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of entity receiving PDU
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// relationship of joined parts
+        /// </summary>
+        private Relationship _relationship = new Relationship();
+
+        /// <summary>
+        /// location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
+        /// </summary>
+        private Vector3Float _partLocation = new Vector3Float();
+
+        /// <summary>
+        /// named location
+        /// </summary>
+        private NamedLocation _namedLocationID = new NamedLocation();
+
+        /// <summary>
+        /// entity type
+        /// </summary>
+        private EntityType _partEntityType = new EntityType();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsPartOfPdu"/> class.
+        /// </summary>
+        public IsPartOfPdu()
+        {
+            PduType = (byte)36;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IsPartOfPdu left, IsPartOfPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IsPartOfPdu left, IsPartOfPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._relationship.GetMarshalledSize();  // this._relationship
+            marshalSize += this._partLocation.GetMarshalledSize();  // this._partLocation
+            marshalSize += this._namedLocationID.GetMarshalledSize();  // this._namedLocationID
+            marshalSize += this._partEntityType.GetMarshalledSize();  // this._partEntityType
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity originating PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
+        public EntityID OrginatingEntityID
+        {
+            get
+            {
+                return this._orginatingEntityID;
+            }
+
+            set
+            {
+                this._orginatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity receiving PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the relationship of joined parts
+        /// </summary>
+        [XmlElement(Type = typeof(Relationship), ElementName = "relationship")]
+        public Relationship Relationship
+        {
+            get
+            {
+                return this._relationship;
+            }
+
+            set
+            {
+                this._relationship = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "partLocation")]
+        public Vector3Float PartLocation
+        {
+            get
+            {
+                return this._partLocation;
+            }
+
+            set
+            {
+                this._partLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the named location
+        /// </summary>
+        [XmlElement(Type = typeof(NamedLocation), ElementName = "namedLocationID")]
+        public NamedLocation NamedLocationID
+        {
+            get
+            {
+                return this._namedLocationID;
+            }
+
+            set
+            {
+                this._namedLocationID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the entity type
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "partEntityType")]
+        public EntityType PartEntityType
+        {
+            get
+            {
+                return this._partEntityType;
+            }
+
+            set
+            {
+                this._partEntityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Marshal(dos);
+                    this._receivingEntityID.Marshal(dos);
+                    this._relationship.Marshal(dos);
+                    this._partLocation.Marshal(dos);
+                    this._namedLocationID.Marshal(dos);
+                    this._partEntityType.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Unmarshal(dis);
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._relationship.Unmarshal(dis);
+                    this._partLocation.Unmarshal(dis);
+                    this._namedLocationID.Unmarshal(dis);
+                    this._partEntityType.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IsPartOfPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<orginatingEntityID>");
+                this._orginatingEntityID.Reflection(sb);
+                sb.AppendLine("</orginatingEntityID>");
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<relationship>");
+                this._relationship.Reflection(sb);
+                sb.AppendLine("</relationship>");
+                sb.AppendLine("<partLocation>");
+                this._partLocation.Reflection(sb);
+                sb.AppendLine("</partLocation>");
+                sb.AppendLine("<namedLocationID>");
+                this._namedLocationID.Reflection(sb);
+                sb.AppendLine("</namedLocationID>");
+                sb.AppendLine("<partEntityType>");
+                this._partEntityType.Reflection(sb);
+                sb.AppendLine("</partEntityType>");
+                sb.AppendLine("</IsPartOfPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IsPartOfPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IsPartOfPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._relationship.Equals(obj._relationship))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._partLocation.Equals(obj._partLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._namedLocationID.Equals(obj._namedLocationID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._partEntityType.Equals(obj._partEntityType))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._relationship.GetHashCode();
+            result = GenerateHash(result) ^ this._partLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._namedLocationID.GetHashCode();
+            result = GenerateHash(result) ^ this._partEntityType.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LayerHeader.cs b/Libs/CsharpDis6/Dis1998/Generated/LayerHeader.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/LayerHeader.cs
rename to Libs/CsharpDis6/Dis1998/Generated/LayerHeader.cs
index d950558..4604c97 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LayerHeader.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/LayerHeader.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.47.  Layer header.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class LayerHeader
-    {
-        /// <summary>
-        /// Layer number
-        /// </summary>
-        private byte _layerNumber;
-
-        /// <summary>
-        /// Layer speccific information enumeration
-        /// </summary>
-        private byte _layerSpecificInformaiton;
-
-        /// <summary>
-        /// information length
-        /// </summary>
-        private ushort _length;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LayerHeader"/> class.
-        /// </summary>
-        public LayerHeader()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LayerHeader left, LayerHeader right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LayerHeader left, LayerHeader right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._layerNumber
-            marshalSize += 1;  // this._layerSpecificInformaiton
-            marshalSize += 2;  // this._length
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Layer number
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "layerNumber")]
-        public byte LayerNumber
-        {
-            get
-            {
-                return this._layerNumber;
-            }
-
-            set
-            {
-                this._layerNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Layer speccific information enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "layerSpecificInformaiton")]
-        public byte LayerSpecificInformaiton
-        {
-            get
-            {
-                return this._layerSpecificInformaiton;
-            }
-
-            set
-            {
-                this._layerSpecificInformaiton = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the information length
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "length")]
-        public ushort Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._layerNumber);
-                    dos.WriteUnsignedByte((byte)this._layerSpecificInformaiton);
-                    dos.WriteUnsignedShort((ushort)this._length);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._layerNumber = dis.ReadUnsignedByte();
-                    this._layerSpecificInformaiton = dis.ReadUnsignedByte();
-                    this._length = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LayerHeader>");
-            try
-            {
-                sb.AppendLine("<layerNumber type=\"byte\">" + this._layerNumber.ToString(CultureInfo.InvariantCulture) + "</layerNumber>");
-                sb.AppendLine("<layerSpecificInformaiton type=\"byte\">" + this._layerSpecificInformaiton.ToString(CultureInfo.InvariantCulture) + "</layerSpecificInformaiton>");
-                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("</LayerHeader>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LayerHeader;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LayerHeader obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._layerNumber != obj._layerNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._layerSpecificInformaiton != obj._layerSpecificInformaiton)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._layerNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._layerSpecificInformaiton.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.47.  Layer header.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class LayerHeader
+    {
+        /// <summary>
+        /// Layer number
+        /// </summary>
+        private byte _layerNumber;
+
+        /// <summary>
+        /// Layer speccific information enumeration
+        /// </summary>
+        private byte _layerSpecificInformaiton;
+
+        /// <summary>
+        /// information length
+        /// </summary>
+        private ushort _length;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LayerHeader"/> class.
+        /// </summary>
+        public LayerHeader()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LayerHeader left, LayerHeader right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LayerHeader left, LayerHeader right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._layerNumber
+            marshalSize += 1;  // this._layerSpecificInformaiton
+            marshalSize += 2;  // this._length
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Layer number
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "layerNumber")]
+        public byte LayerNumber
+        {
+            get
+            {
+                return this._layerNumber;
+            }
+
+            set
+            {
+                this._layerNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Layer speccific information enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "layerSpecificInformaiton")]
+        public byte LayerSpecificInformaiton
+        {
+            get
+            {
+                return this._layerSpecificInformaiton;
+            }
+
+            set
+            {
+                this._layerSpecificInformaiton = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the information length
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "length")]
+        public ushort Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._layerNumber);
+                    dos.WriteUnsignedByte((byte)this._layerSpecificInformaiton);
+                    dos.WriteUnsignedShort((ushort)this._length);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._layerNumber = dis.ReadUnsignedByte();
+                    this._layerSpecificInformaiton = dis.ReadUnsignedByte();
+                    this._length = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LayerHeader>");
+            try
+            {
+                sb.AppendLine("<layerNumber type=\"byte\">" + this._layerNumber.ToString(CultureInfo.InvariantCulture) + "</layerNumber>");
+                sb.AppendLine("<layerSpecificInformaiton type=\"byte\">" + this._layerSpecificInformaiton.ToString(CultureInfo.InvariantCulture) + "</layerSpecificInformaiton>");
+                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("</LayerHeader>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LayerHeader;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LayerHeader obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._layerNumber != obj._layerNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._layerSpecificInformaiton != obj._layerSpecificInformaiton)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._layerNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._layerSpecificInformaiton.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/LinearObjectStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/LinearObjectStatePdu.cs
index eb0dd74..70b2610 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearObjectStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/LinearObjectStatePdu.cs
@@ -1,615 +1,615 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.11.4: Information abut the addition or modification of a synthecic enviroment object that      is anchored to the terrain with a single point and has size or orientation. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SimulationAddress))]
-    [XmlInclude(typeof(ObjectType))]
-    [XmlInclude(typeof(LinearSegmentParameter))]
-    public partial class LinearObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<LinearObjectStatePdu>
-    {
-        /// <summary>
-        /// Object in synthetic environment
-        /// </summary>
-        private EntityID _objectID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _referencedObjectID = new EntityID();
-
-        /// <summary>
-        /// unique update number of each state transition of an object
-        /// </summary>
-        private ushort _updateNumber;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// number of linear segment parameters
-        /// </summary>
-        private byte _numberOfSegments;
-
-        /// <summary>
-        /// requesterID
-        /// </summary>
-        private SimulationAddress _requesterID = new SimulationAddress();
-
-        /// <summary>
-        /// receiver ID
-        /// </summary>
-        private SimulationAddress _receivingID = new SimulationAddress();
-
-        /// <summary>
-        /// Object type
-        /// </summary>
-        private ObjectType _objectType = new ObjectType();
-
-        /// <summary>
-        /// Linear segment parameters
-        /// </summary>
-        private List<LinearSegmentParameter> _linearSegmentParameters = new List<LinearSegmentParameter>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinearObjectStatePdu"/> class.
-        /// </summary>
-        public LinearObjectStatePdu()
-        {
-            PduType = (byte)44;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LinearObjectStatePdu left, LinearObjectStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LinearObjectStatePdu left, LinearObjectStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
-            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
-            marshalSize += 2;  // this._updateNumber
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._numberOfSegments
-            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
-            for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-            {
-                LinearSegmentParameter listElement = (LinearSegmentParameter)this._linearSegmentParameters[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object in synthetic environment
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
-        public EntityID ObjectID
-        {
-            get
-            {
-                return this._objectID;
-            }
-
-            set
-            {
-                this._objectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
-        public EntityID ReferencedObjectID
-        {
-            get
-            {
-                return this._referencedObjectID;
-            }
-
-            set
-            {
-                this._referencedObjectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique update number of each state transition of an object
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
-        public ushort UpdateNumber
-        {
-            get
-            {
-                return this._updateNumber;
-            }
-
-            set
-            {
-                this._updateNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of linear segment parameters
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSegments method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSegments")]
-        public byte NumberOfSegments
-        {
-            get
-            {
-                return this._numberOfSegments;
-            }
-
-            set
-            {
-                this._numberOfSegments = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the requesterID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
-        public SimulationAddress RequesterID
-        {
-            get
-            {
-                return this._requesterID;
-            }
-
-            set
-            {
-                this._requesterID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receiver ID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
-        public SimulationAddress ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object type
-        /// </summary>
-        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
-        public ObjectType ObjectType
-        {
-            get
-            {
-                return this._objectType;
-            }
-
-            set
-            {
-                this._objectType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Linear segment parameters
-        /// </summary>
-        [XmlElement(ElementName = "linearSegmentParametersList", Type = typeof(List<LinearSegmentParameter>))]
-        public List<LinearSegmentParameter> LinearSegmentParameters
-        {
-            get
-            {
-                return this._linearSegmentParameters;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._objectID.Marshal(dos);
-                    this._referencedObjectID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._updateNumber);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._linearSegmentParameters.Count);
-                    this._requesterID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    this._objectType.Marshal(dos);
-
-                    for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                    {
-                        LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
-                        aLinearSegmentParameter.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._objectID.Unmarshal(dis);
-                    this._referencedObjectID.Unmarshal(dis);
-                    this._updateNumber = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._numberOfSegments = dis.ReadUnsignedByte();
-                    this._requesterID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._objectType.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this.NumberOfSegments; idx++)
-                    {
-                        LinearSegmentParameter anX = new LinearSegmentParameter();
-                        anX.Unmarshal(dis);
-                        this._linearSegmentParameters.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LinearObjectStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<objectID>");
-                this._objectID.Reflection(sb);
-                sb.AppendLine("</objectID>");
-                sb.AppendLine("<referencedObjectID>");
-                this._referencedObjectID.Reflection(sb);
-                sb.AppendLine("</referencedObjectID>");
-                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<linearSegmentParameters type=\"byte\">" + this._linearSegmentParameters.Count.ToString(CultureInfo.InvariantCulture) + "</linearSegmentParameters>");
-                sb.AppendLine("<requesterID>");
-                this._requesterID.Reflection(sb);
-                sb.AppendLine("</requesterID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<objectType>");
-                this._objectType.Reflection(sb);
-                sb.AppendLine("</objectType>");
-                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                {
-                    sb.AppendLine("<linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"LinearSegmentParameter\">");
-                    LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
-                    aLinearSegmentParameter.Reflection(sb);
-                    sb.AppendLine("</linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</LinearObjectStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LinearObjectStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LinearObjectStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._objectID.Equals(obj._objectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._updateNumber != obj._updateNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSegments != obj._numberOfSegments)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requesterID.Equals(obj._requesterID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectType.Equals(obj._objectType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._linearSegmentParameters.Count != obj._linearSegmentParameters.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                {
-                    if (!this._linearSegmentParameters[idx].Equals(obj._linearSegmentParameters[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._objectID.GetHashCode();
-            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
-            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSegments.GetHashCode();
-            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._objectType.GetHashCode();
-
-            if (this._linearSegmentParameters.Count > 0)
-            {
-                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._linearSegmentParameters[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.11.4: Information abut the addition or modification of a synthecic enviroment object that      is anchored to the terrain with a single point and has size or orientation. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SimulationAddress))]
+    [XmlInclude(typeof(ObjectType))]
+    [XmlInclude(typeof(LinearSegmentParameter))]
+    public partial class LinearObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<LinearObjectStatePdu>
+    {
+        /// <summary>
+        /// Object in synthetic environment
+        /// </summary>
+        private EntityID _objectID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _referencedObjectID = new EntityID();
+
+        /// <summary>
+        /// unique update number of each state transition of an object
+        /// </summary>
+        private ushort _updateNumber;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// number of linear segment parameters
+        /// </summary>
+        private byte _numberOfSegments;
+
+        /// <summary>
+        /// requesterID
+        /// </summary>
+        private SimulationAddress _requesterID = new SimulationAddress();
+
+        /// <summary>
+        /// receiver ID
+        /// </summary>
+        private SimulationAddress _receivingID = new SimulationAddress();
+
+        /// <summary>
+        /// Object type
+        /// </summary>
+        private ObjectType _objectType = new ObjectType();
+
+        /// <summary>
+        /// Linear segment parameters
+        /// </summary>
+        private List<LinearSegmentParameter> _linearSegmentParameters = new List<LinearSegmentParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinearObjectStatePdu"/> class.
+        /// </summary>
+        public LinearObjectStatePdu()
+        {
+            PduType = (byte)44;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LinearObjectStatePdu left, LinearObjectStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LinearObjectStatePdu left, LinearObjectStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
+            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
+            marshalSize += 2;  // this._updateNumber
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._numberOfSegments
+            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
+            for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+            {
+                LinearSegmentParameter listElement = (LinearSegmentParameter)this._linearSegmentParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object in synthetic environment
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
+        public EntityID ObjectID
+        {
+            get
+            {
+                return this._objectID;
+            }
+
+            set
+            {
+                this._objectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
+        public EntityID ReferencedObjectID
+        {
+            get
+            {
+                return this._referencedObjectID;
+            }
+
+            set
+            {
+                this._referencedObjectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique update number of each state transition of an object
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
+        public ushort UpdateNumber
+        {
+            get
+            {
+                return this._updateNumber;
+            }
+
+            set
+            {
+                this._updateNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of linear segment parameters
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSegments method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSegments")]
+        public byte NumberOfSegments
+        {
+            get
+            {
+                return this._numberOfSegments;
+            }
+
+            set
+            {
+                this._numberOfSegments = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the requesterID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
+        public SimulationAddress RequesterID
+        {
+            get
+            {
+                return this._requesterID;
+            }
+
+            set
+            {
+                this._requesterID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receiver ID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
+        public SimulationAddress ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object type
+        /// </summary>
+        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
+        public ObjectType ObjectType
+        {
+            get
+            {
+                return this._objectType;
+            }
+
+            set
+            {
+                this._objectType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Linear segment parameters
+        /// </summary>
+        [XmlElement(ElementName = "linearSegmentParametersList", Type = typeof(List<LinearSegmentParameter>))]
+        public List<LinearSegmentParameter> LinearSegmentParameters
+        {
+            get
+            {
+                return this._linearSegmentParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._objectID.Marshal(dos);
+                    this._referencedObjectID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._updateNumber);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._linearSegmentParameters.Count);
+                    this._requesterID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    this._objectType.Marshal(dos);
+
+                    for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                    {
+                        LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
+                        aLinearSegmentParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._objectID.Unmarshal(dis);
+                    this._referencedObjectID.Unmarshal(dis);
+                    this._updateNumber = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._numberOfSegments = dis.ReadUnsignedByte();
+                    this._requesterID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._objectType.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this.NumberOfSegments; idx++)
+                    {
+                        LinearSegmentParameter anX = new LinearSegmentParameter();
+                        anX.Unmarshal(dis);
+                        this._linearSegmentParameters.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LinearObjectStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<objectID>");
+                this._objectID.Reflection(sb);
+                sb.AppendLine("</objectID>");
+                sb.AppendLine("<referencedObjectID>");
+                this._referencedObjectID.Reflection(sb);
+                sb.AppendLine("</referencedObjectID>");
+                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<linearSegmentParameters type=\"byte\">" + this._linearSegmentParameters.Count.ToString(CultureInfo.InvariantCulture) + "</linearSegmentParameters>");
+                sb.AppendLine("<requesterID>");
+                this._requesterID.Reflection(sb);
+                sb.AppendLine("</requesterID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<objectType>");
+                this._objectType.Reflection(sb);
+                sb.AppendLine("</objectType>");
+                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                {
+                    sb.AppendLine("<linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"LinearSegmentParameter\">");
+                    LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
+                    aLinearSegmentParameter.Reflection(sb);
+                    sb.AppendLine("</linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</LinearObjectStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LinearObjectStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LinearObjectStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._objectID.Equals(obj._objectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._updateNumber != obj._updateNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSegments != obj._numberOfSegments)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requesterID.Equals(obj._requesterID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectType.Equals(obj._objectType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._linearSegmentParameters.Count != obj._linearSegmentParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                {
+                    if (!this._linearSegmentParameters[idx].Equals(obj._linearSegmentParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._objectID.GetHashCode();
+            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
+            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSegments.GetHashCode();
+            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._objectType.GetHashCode();
+
+            if (this._linearSegmentParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._linearSegmentParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs b/Libs/CsharpDis6/Dis1998/Generated/LinearSegmentParameter.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs
rename to Libs/CsharpDis6/Dis1998/Generated/LinearSegmentParameter.cs
index 37f4d56..2283c7e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LinearSegmentParameter.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/LinearSegmentParameter.cs
@@ -1,565 +1,565 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.48: Linear segment parameters
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(SixByteChunk))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Orientation))]
-    public partial class LinearSegmentParameter
-    {
-        /// <summary>
-        /// number of segments
-        /// </summary>
-        private byte _segmentNumber;
-
-        /// <summary>
-        /// segment appearance
-        /// </summary>
-        private SixByteChunk _segmentAppearance = new SixByteChunk();
-
-        /// <summary>
-        /// location
-        /// </summary>
-        private Vector3Double _location = new Vector3Double();
-
-        /// <summary>
-        /// orientation
-        /// </summary>
-        private Orientation _orientation = new Orientation();
-
-        /// <summary>
-        /// segmentLength
-        /// </summary>
-        private ushort _segmentLength;
-
-        /// <summary>
-        /// segmentWidth
-        /// </summary>
-        private ushort _segmentWidth;
-
-        /// <summary>
-        /// segmentHeight
-        /// </summary>
-        private ushort _segmentHeight;
-
-        /// <summary>
-        /// segment Depth
-        /// </summary>
-        private ushort _segmentDepth;
-
-        /// <summary>
-        /// segment Depth
-        /// </summary>
-        private uint _pad1;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinearSegmentParameter"/> class.
-        /// </summary>
-        public LinearSegmentParameter()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LinearSegmentParameter left, LinearSegmentParameter right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LinearSegmentParameter left, LinearSegmentParameter right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._segmentNumber
-            marshalSize += this._segmentAppearance.GetMarshalledSize();  // this._segmentAppearance
-            marshalSize += this._location.GetMarshalledSize();  // this._location
-            marshalSize += this._orientation.GetMarshalledSize();  // this._orientation
-            marshalSize += 2;  // this._segmentLength
-            marshalSize += 2;  // this._segmentWidth
-            marshalSize += 2;  // this._segmentHeight
-            marshalSize += 2;  // this._segmentDepth
-            marshalSize += 4;  // this._pad1
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the number of segments
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "segmentNumber")]
-        public byte SegmentNumber
-        {
-            get
-            {
-                return this._segmentNumber;
-            }
-
-            set
-            {
-                this._segmentNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the segment appearance
-        /// </summary>
-        [XmlElement(Type = typeof(SixByteChunk), ElementName = "segmentAppearance")]
-        public SixByteChunk SegmentAppearance
-        {
-            get
-            {
-                return this._segmentAppearance;
-            }
-
-            set
-            {
-                this._segmentAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "location")]
-        public Vector3Double Location
-        {
-            get
-            {
-                return this._location;
-            }
-
-            set
-            {
-                this._location = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the orientation
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "orientation")]
-        public Orientation Orientation
-        {
-            get
-            {
-                return this._orientation;
-            }
-
-            set
-            {
-                this._orientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the segmentLength
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentLength")]
-        public ushort SegmentLength
-        {
-            get
-            {
-                return this._segmentLength;
-            }
-
-            set
-            {
-                this._segmentLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the segmentWidth
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentWidth")]
-        public ushort SegmentWidth
-        {
-            get
-            {
-                return this._segmentWidth;
-            }
-
-            set
-            {
-                this._segmentWidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the segmentHeight
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentHeight")]
-        public ushort SegmentHeight
-        {
-            get
-            {
-                return this._segmentHeight;
-            }
-
-            set
-            {
-                this._segmentHeight = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the segment Depth
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "segmentDepth")]
-        public ushort SegmentDepth
-        {
-            get
-            {
-                return this._segmentDepth;
-            }
-
-            set
-            {
-                this._segmentDepth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the segment Depth
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "pad1")]
-        public uint Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._segmentNumber);
-                    this._segmentAppearance.Marshal(dos);
-                    this._location.Marshal(dos);
-                    this._orientation.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._segmentLength);
-                    dos.WriteUnsignedShort((ushort)this._segmentWidth);
-                    dos.WriteUnsignedShort((ushort)this._segmentHeight);
-                    dos.WriteUnsignedShort((ushort)this._segmentDepth);
-                    dos.WriteUnsignedInt((uint)this._pad1);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._segmentNumber = dis.ReadUnsignedByte();
-                    this._segmentAppearance.Unmarshal(dis);
-                    this._location.Unmarshal(dis);
-                    this._orientation.Unmarshal(dis);
-                    this._segmentLength = dis.ReadUnsignedShort();
-                    this._segmentWidth = dis.ReadUnsignedShort();
-                    this._segmentHeight = dis.ReadUnsignedShort();
-                    this._segmentDepth = dis.ReadUnsignedShort();
-                    this._pad1 = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LinearSegmentParameter>");
-            try
-            {
-                sb.AppendLine("<segmentNumber type=\"byte\">" + this._segmentNumber.ToString(CultureInfo.InvariantCulture) + "</segmentNumber>");
-                sb.AppendLine("<segmentAppearance>");
-                this._segmentAppearance.Reflection(sb);
-                sb.AppendLine("</segmentAppearance>");
-                sb.AppendLine("<location>");
-                this._location.Reflection(sb);
-                sb.AppendLine("</location>");
-                sb.AppendLine("<orientation>");
-                this._orientation.Reflection(sb);
-                sb.AppendLine("</orientation>");
-                sb.AppendLine("<segmentLength type=\"ushort\">" + this._segmentLength.ToString(CultureInfo.InvariantCulture) + "</segmentLength>");
-                sb.AppendLine("<segmentWidth type=\"ushort\">" + this._segmentWidth.ToString(CultureInfo.InvariantCulture) + "</segmentWidth>");
-                sb.AppendLine("<segmentHeight type=\"ushort\">" + this._segmentHeight.ToString(CultureInfo.InvariantCulture) + "</segmentHeight>");
-                sb.AppendLine("<segmentDepth type=\"ushort\">" + this._segmentDepth.ToString(CultureInfo.InvariantCulture) + "</segmentDepth>");
-                sb.AppendLine("<pad1 type=\"uint\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("</LinearSegmentParameter>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LinearSegmentParameter;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LinearSegmentParameter obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._segmentNumber != obj._segmentNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._segmentAppearance.Equals(obj._segmentAppearance))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._location.Equals(obj._location))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._orientation.Equals(obj._orientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentLength != obj._segmentLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentWidth != obj._segmentWidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentHeight != obj._segmentHeight)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._segmentDepth != obj._segmentDepth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._segmentNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._location.GetHashCode();
-            result = GenerateHash(result) ^ this._orientation.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentLength.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentWidth.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentHeight.GetHashCode();
-            result = GenerateHash(result) ^ this._segmentDepth.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.48: Linear segment parameters
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SixByteChunk))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Orientation))]
+    public partial class LinearSegmentParameter
+    {
+        /// <summary>
+        /// number of segments
+        /// </summary>
+        private byte _segmentNumber;
+
+        /// <summary>
+        /// segment appearance
+        /// </summary>
+        private SixByteChunk _segmentAppearance = new SixByteChunk();
+
+        /// <summary>
+        /// location
+        /// </summary>
+        private Vector3Double _location = new Vector3Double();
+
+        /// <summary>
+        /// orientation
+        /// </summary>
+        private Orientation _orientation = new Orientation();
+
+        /// <summary>
+        /// segmentLength
+        /// </summary>
+        private ushort _segmentLength;
+
+        /// <summary>
+        /// segmentWidth
+        /// </summary>
+        private ushort _segmentWidth;
+
+        /// <summary>
+        /// segmentHeight
+        /// </summary>
+        private ushort _segmentHeight;
+
+        /// <summary>
+        /// segment Depth
+        /// </summary>
+        private ushort _segmentDepth;
+
+        /// <summary>
+        /// segment Depth
+        /// </summary>
+        private uint _pad1;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinearSegmentParameter"/> class.
+        /// </summary>
+        public LinearSegmentParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LinearSegmentParameter left, LinearSegmentParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LinearSegmentParameter left, LinearSegmentParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._segmentNumber
+            marshalSize += this._segmentAppearance.GetMarshalledSize();  // this._segmentAppearance
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            marshalSize += this._orientation.GetMarshalledSize();  // this._orientation
+            marshalSize += 2;  // this._segmentLength
+            marshalSize += 2;  // this._segmentWidth
+            marshalSize += 2;  // this._segmentHeight
+            marshalSize += 2;  // this._segmentDepth
+            marshalSize += 4;  // this._pad1
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the number of segments
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "segmentNumber")]
+        public byte SegmentNumber
+        {
+            get
+            {
+                return this._segmentNumber;
+            }
+
+            set
+            {
+                this._segmentNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the segment appearance
+        /// </summary>
+        [XmlElement(Type = typeof(SixByteChunk), ElementName = "segmentAppearance")]
+        public SixByteChunk SegmentAppearance
+        {
+            get
+            {
+                return this._segmentAppearance;
+            }
+
+            set
+            {
+                this._segmentAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "location")]
+        public Vector3Double Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the orientation
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "orientation")]
+        public Orientation Orientation
+        {
+            get
+            {
+                return this._orientation;
+            }
+
+            set
+            {
+                this._orientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the segmentLength
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentLength")]
+        public ushort SegmentLength
+        {
+            get
+            {
+                return this._segmentLength;
+            }
+
+            set
+            {
+                this._segmentLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the segmentWidth
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentWidth")]
+        public ushort SegmentWidth
+        {
+            get
+            {
+                return this._segmentWidth;
+            }
+
+            set
+            {
+                this._segmentWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the segmentHeight
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentHeight")]
+        public ushort SegmentHeight
+        {
+            get
+            {
+                return this._segmentHeight;
+            }
+
+            set
+            {
+                this._segmentHeight = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the segment Depth
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentDepth")]
+        public ushort SegmentDepth
+        {
+            get
+            {
+                return this._segmentDepth;
+            }
+
+            set
+            {
+                this._segmentDepth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the segment Depth
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "pad1")]
+        public uint Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._segmentNumber);
+                    this._segmentAppearance.Marshal(dos);
+                    this._location.Marshal(dos);
+                    this._orientation.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._segmentLength);
+                    dos.WriteUnsignedShort((ushort)this._segmentWidth);
+                    dos.WriteUnsignedShort((ushort)this._segmentHeight);
+                    dos.WriteUnsignedShort((ushort)this._segmentDepth);
+                    dos.WriteUnsignedInt((uint)this._pad1);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._segmentNumber = dis.ReadUnsignedByte();
+                    this._segmentAppearance.Unmarshal(dis);
+                    this._location.Unmarshal(dis);
+                    this._orientation.Unmarshal(dis);
+                    this._segmentLength = dis.ReadUnsignedShort();
+                    this._segmentWidth = dis.ReadUnsignedShort();
+                    this._segmentHeight = dis.ReadUnsignedShort();
+                    this._segmentDepth = dis.ReadUnsignedShort();
+                    this._pad1 = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LinearSegmentParameter>");
+            try
+            {
+                sb.AppendLine("<segmentNumber type=\"byte\">" + this._segmentNumber.ToString(CultureInfo.InvariantCulture) + "</segmentNumber>");
+                sb.AppendLine("<segmentAppearance>");
+                this._segmentAppearance.Reflection(sb);
+                sb.AppendLine("</segmentAppearance>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                sb.AppendLine("<orientation>");
+                this._orientation.Reflection(sb);
+                sb.AppendLine("</orientation>");
+                sb.AppendLine("<segmentLength type=\"ushort\">" + this._segmentLength.ToString(CultureInfo.InvariantCulture) + "</segmentLength>");
+                sb.AppendLine("<segmentWidth type=\"ushort\">" + this._segmentWidth.ToString(CultureInfo.InvariantCulture) + "</segmentWidth>");
+                sb.AppendLine("<segmentHeight type=\"ushort\">" + this._segmentHeight.ToString(CultureInfo.InvariantCulture) + "</segmentHeight>");
+                sb.AppendLine("<segmentDepth type=\"ushort\">" + this._segmentDepth.ToString(CultureInfo.InvariantCulture) + "</segmentDepth>");
+                sb.AppendLine("<pad1 type=\"uint\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("</LinearSegmentParameter>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LinearSegmentParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LinearSegmentParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._segmentNumber != obj._segmentNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._segmentAppearance.Equals(obj._segmentAppearance))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._orientation.Equals(obj._orientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentLength != obj._segmentLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentWidth != obj._segmentWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentHeight != obj._segmentHeight)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentDepth != obj._segmentDepth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._segmentNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+            result = GenerateHash(result) ^ this._orientation.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentLength.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentHeight.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentDepth.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/LogisticsFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/LogisticsFamilyPdu.cs
index 1f35507..d04406a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/LogisticsFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/LogisticsFamilyPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.5. Abstract superclass for logistics PDUs. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class LogisticsFamilyPdu : Pdu, IEquatable<LogisticsFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LogisticsFamilyPdu"/> class.
-        /// </summary>
-        public LogisticsFamilyPdu()
-        {
-            ProtocolFamily = (byte)3;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<LogisticsFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</LogisticsFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as LogisticsFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LogisticsFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.5. Abstract superclass for logistics PDUs. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class LogisticsFamilyPdu : Pdu, IEquatable<LogisticsFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogisticsFamilyPdu"/> class.
+        /// </summary>
+        public LogisticsFamilyPdu()
+        {
+            ProtocolFamily = (byte)3;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LogisticsFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</LogisticsFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LogisticsFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LogisticsFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Marking.cs b/Libs/CsharpDis6/Dis1998/Generated/Marking.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Marking.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Marking.cs
index de5da4d..79271e6 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Marking.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Marking.cs
@@ -1,359 +1,359 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.15. Specifies the character set used inthe first byte, followed by 11 characters of text data.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Marking
-    {
-        /// <summary>
-        /// The character set
-        /// </summary>
-        private byte _characterSet;
-
-        /// <summary>
-        /// The characters
-        /// </summary>
-        private byte[] _characters = new byte[11];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Marking"/> class.
-        /// </summary>
-        public Marking()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Marking left, Marking right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Marking left, Marking right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._characterSet
-            marshalSize += 11 * 1;  // _characters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The character set
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
-        public byte CharacterSet
-        {
-            get
-            {
-                return this._characterSet;
-            }
-
-            set
-            {
-                this._characterSet = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The characters
-        /// </summary>
-        [XmlArray(ElementName = "characters")]
-        public byte[] Characters
-        {
-            get
-            {
-                return this._characters;
-            }
-
-            set
-            {
-                this._characters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._characterSet);
-
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        dos.WriteByte(this._characters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._characterSet = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this._characters.Length; idx++)
-                    {
-                        this._characters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Marking>");
-            try
-            {
-                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
-                for (int idx = 0; idx < this._characters.Length; idx++)
-                {
-                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</Marking>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Marking;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Marking obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._characterSet != obj._characterSet)
-            {
-                ivarsEqual = false;
-            }
-
-            if (obj._characters.Length != 11) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 11; idx++)
-                {
-                    if (this._characters[idx] != obj._characters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
-
-            for (int idx = 0; idx < 11; idx++)
-            {
-                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.15. Specifies the character set used inthe first byte, followed by 11 characters of text data.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Marking
+    {
+        /// <summary>
+        /// The character set
+        /// </summary>
+        private byte _characterSet;
+
+        /// <summary>
+        /// The characters
+        /// </summary>
+        private byte[] _characters = new byte[11];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Marking"/> class.
+        /// </summary>
+        public Marking()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Marking left, Marking right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Marking left, Marking right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._characterSet
+            marshalSize += 11 * 1;  // _characters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The character set
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
+        public byte CharacterSet
+        {
+            get
+            {
+                return this._characterSet;
+            }
+
+            set
+            {
+                this._characterSet = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The characters
+        /// </summary>
+        [XmlArray(ElementName = "characters")]
+        public byte[] Characters
+        {
+            get
+            {
+                return this._characters;
+            }
+
+            set
+            {
+                this._characters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._characterSet);
+
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        dos.WriteByte(this._characters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._characterSet = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        this._characters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Marking>");
+            try
+            {
+                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
+                for (int idx = 0; idx < this._characters.Length; idx++)
+                {
+                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</Marking>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Marking;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Marking obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._characterSet != obj._characterSet)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._characters.Length != 11) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 11; idx++)
+                {
+                    if (this._characters[idx] != obj._characters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
+
+            for (int idx = 0; idx < 11; idx++)
+            {
+                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/MinefieldDataPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/MinefieldDataPdu.cs
index d9c2670..22a523a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldDataPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/MinefieldDataPdu.cs
@@ -1,815 +1,815 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.10.3 Information about individual mines within a minefield. This is very, very wrong. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(TwoByteChunk))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class MinefieldDataPdu : MinefieldFamilyPdu, IEquatable<MinefieldDataPdu>
-    {
-        /// <summary>
-        /// Minefield ID
-        /// </summary>
-        private EntityID _minefieldID = new EntityID();
-
-        /// <summary>
-        /// ID of entity making request
-        /// </summary>
-        private EntityID _requestingEntityID = new EntityID();
-
-        /// <summary>
-        /// Minefield sequence number
-        /// </summary>
-        private ushort _minefieldSequenceNumbeer;
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private byte _requestID;
-
-        /// <summary>
-        /// pdu sequence number
-        /// </summary>
-        private byte _pduSequenceNumber;
-
-        /// <summary>
-        /// number of pdus in response
-        /// </summary>
-        private byte _numberOfPdus;
-
-        /// <summary>
-        /// how many mines are in this PDU
-        /// </summary>
-        private byte _numberOfMinesInThisPdu;
-
-        /// <summary>
-        /// how many sensor type are in this PDU
-        /// </summary>
-        private byte _numberOfSensorTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// 32 boolean fields
-        /// </summary>
-        private uint _dataFilter;
-
-        /// <summary>
-        /// Mine type
-        /// </summary>
-        private EntityType _mineType = new EntityType();
-
-        /// <summary>
-        /// Sensor types, each 16 bits long
-        /// </summary>
-        private List<TwoByteChunk> _sensorTypes = new List<TwoByteChunk>();
-
-        /// <summary>
-        /// Padding to get things 32-bit aligned. ^^^this is wrong--dyanmically sized padding needed
-        /// </summary>
-        private byte _pad3;
-
-        /// <summary>
-        /// Mine locations
-        /// </summary>
-        private List<Vector3Float> _mineLocation = new List<Vector3Float>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldDataPdu"/> class.
-        /// </summary>
-        public MinefieldDataPdu()
-        {
-            PduType = (byte)39;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldDataPdu left, MinefieldDataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldDataPdu left, MinefieldDataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
-            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
-            marshalSize += 2;  // this._minefieldSequenceNumbeer
-            marshalSize += 1;  // this._requestID
-            marshalSize += 1;  // this._pduSequenceNumber
-            marshalSize += 1;  // this._numberOfPdus
-            marshalSize += 1;  // this._numberOfMinesInThisPdu
-            marshalSize += 1;  // this._numberOfSensorTypes
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._dataFilter
-            marshalSize += this._mineType.GetMarshalledSize();  // this._mineType
-            for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-            {
-                TwoByteChunk listElement = (TwoByteChunk)this._sensorTypes[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            marshalSize += 1;  // this._pad3
-            for (int idx = 0; idx < this._mineLocation.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._mineLocation[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
-        public EntityID MinefieldID
-        {
-            get
-            {
-                return this._minefieldID;
-            }
-
-            set
-            {
-                this._minefieldID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity making request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
-        public EntityID RequestingEntityID
-        {
-            get
-            {
-                return this._requestingEntityID;
-            }
-
-            set
-            {
-                this._requestingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield sequence number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "minefieldSequenceNumbeer")]
-        public ushort MinefieldSequenceNumbeer
-        {
-            get
-            {
-                return this._minefieldSequenceNumbeer;
-            }
-
-            set
-            {
-                this._minefieldSequenceNumbeer = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
-        public byte RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the pdu sequence number
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduSequenceNumber")]
-        public byte PduSequenceNumber
-        {
-            get
-            {
-                return this._pduSequenceNumber;
-            }
-
-            set
-            {
-                this._pduSequenceNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of pdus in response
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfPdus")]
-        public byte NumberOfPdus
-        {
-            get
-            {
-                return this._numberOfPdus;
-            }
-
-            set
-            {
-                this._numberOfPdus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many mines are in this PDU
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfMinesInThisPdu method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfMinesInThisPdu")]
-        public byte NumberOfMinesInThisPdu
-        {
-            get
-            {
-                return this._numberOfMinesInThisPdu;
-            }
-
-            set
-            {
-                this._numberOfMinesInThisPdu = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many sensor type are in this PDU
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSensorTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSensorTypes")]
-        public byte NumberOfSensorTypes
-        {
-            get
-            {
-                return this._numberOfSensorTypes;
-            }
-
-            set
-            {
-                this._numberOfSensorTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the 32 boolean fields
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "dataFilter")]
-        public uint DataFilter
-        {
-            get
-            {
-                return this._dataFilter;
-            }
-
-            set
-            {
-                this._dataFilter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Mine type
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "mineType")]
-        public EntityType MineType
-        {
-            get
-            {
-                return this._mineType;
-            }
-
-            set
-            {
-                this._mineType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Sensor types, each 16 bits long
-        /// </summary>
-        [XmlElement(ElementName = "sensorTypesList", Type = typeof(List<TwoByteChunk>))]
-        public List<TwoByteChunk> SensorTypes
-        {
-            get
-            {
-                return this._sensorTypes;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding to get things 32-bit aligned. ^^^this is wrong--dyanmically sized padding needed
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad3")]
-        public byte Pad3
-        {
-            get
-            {
-                return this._pad3;
-            }
-
-            set
-            {
-                this._pad3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Mine locations
-        /// </summary>
-        [XmlElement(ElementName = "mineLocationList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> MineLocation
-        {
-            get
-            {
-                return this._mineLocation;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._minefieldID.Marshal(dos);
-                    this._requestingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._minefieldSequenceNumbeer);
-                    dos.WriteUnsignedByte((byte)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._pduSequenceNumber);
-                    dos.WriteUnsignedByte((byte)this._numberOfPdus);
-                    dos.WriteUnsignedByte((byte)this._mineLocation.Count);
-                    dos.WriteUnsignedByte((byte)this._sensorTypes.Count);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._dataFilter);
-                    this._mineType.Marshal(dos);
-
-                    for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                    {
-                        TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
-                        aTwoByteChunk.Marshal(dos);
-                    }
-
-                    dos.WriteUnsignedByte((byte)this._pad3);
-
-                    for (int idx = 0; idx < this._mineLocation.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._mineLocation[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._minefieldID.Unmarshal(dis);
-                    this._requestingEntityID.Unmarshal(dis);
-                    this._minefieldSequenceNumbeer = dis.ReadUnsignedShort();
-                    this._requestID = dis.ReadUnsignedByte();
-                    this._pduSequenceNumber = dis.ReadUnsignedByte();
-                    this._numberOfPdus = dis.ReadUnsignedByte();
-                    this._numberOfMinesInThisPdu = dis.ReadUnsignedByte();
-                    this._numberOfSensorTypes = dis.ReadUnsignedByte();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._dataFilter = dis.ReadUnsignedInt();
-                    this._mineType.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this.NumberOfSensorTypes; idx++)
-                    {
-                        TwoByteChunk anX = new TwoByteChunk();
-                        anX.Unmarshal(dis);
-                        this._sensorTypes.Add(anX);
-                    }
-
-                    this._pad3 = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.NumberOfMinesInThisPdu; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._mineLocation.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldDataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<minefieldID>");
-                this._minefieldID.Reflection(sb);
-                sb.AppendLine("</minefieldID>");
-                sb.AppendLine("<requestingEntityID>");
-                this._requestingEntityID.Reflection(sb);
-                sb.AppendLine("</requestingEntityID>");
-                sb.AppendLine("<minefieldSequenceNumbeer type=\"ushort\">" + this._minefieldSequenceNumbeer.ToString(CultureInfo.InvariantCulture) + "</minefieldSequenceNumbeer>");
-                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<pduSequenceNumber type=\"byte\">" + this._pduSequenceNumber.ToString(CultureInfo.InvariantCulture) + "</pduSequenceNumber>");
-                sb.AppendLine("<numberOfPdus type=\"byte\">" + this._numberOfPdus.ToString(CultureInfo.InvariantCulture) + "</numberOfPdus>");
-                sb.AppendLine("<mineLocation type=\"byte\">" + this._mineLocation.Count.ToString(CultureInfo.InvariantCulture) + "</mineLocation>");
-                sb.AppendLine("<sensorTypes type=\"byte\">" + this._sensorTypes.Count.ToString(CultureInfo.InvariantCulture) + "</sensorTypes>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<dataFilter type=\"uint\">" + this._dataFilter.ToString(CultureInfo.InvariantCulture) + "</dataFilter>");
-                sb.AppendLine("<mineType>");
-                this._mineType.Reflection(sb);
-                sb.AppendLine("</mineType>");
-                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                {
-                    sb.AppendLine("<sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TwoByteChunk\">");
-                    TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
-                    aTwoByteChunk.Reflection(sb);
-                    sb.AppendLine("</sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("<pad3 type=\"byte\">" + this._pad3.ToString(CultureInfo.InvariantCulture) + "</pad3>");
-                for (int idx = 0; idx < this._mineLocation.Count; idx++)
-                {
-                    sb.AppendLine("<mineLocation" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._mineLocation[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</mineLocation" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</MinefieldDataPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldDataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldDataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._minefieldID.Equals(obj._minefieldID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._minefieldSequenceNumbeer != obj._minefieldSequenceNumbeer)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduSequenceNumber != obj._pduSequenceNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPdus != obj._numberOfPdus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfMinesInThisPdu != obj._numberOfMinesInThisPdu)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSensorTypes != obj._numberOfSensorTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataFilter != obj._dataFilter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._mineType.Equals(obj._mineType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sensorTypes.Count != obj._sensorTypes.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                {
-                    if (!this._sensorTypes[idx].Equals(obj._sensorTypes[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._pad3 != obj._pad3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._mineLocation.Count != obj._mineLocation.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._mineLocation.Count; idx++)
-                {
-                    if (!this._mineLocation[idx].Equals(obj._mineLocation[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldSequenceNumbeer.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._pduSequenceNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPdus.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfMinesInThisPdu.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSensorTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._dataFilter.GetHashCode();
-            result = GenerateHash(result) ^ this._mineType.GetHashCode();
-
-            if (this._sensorTypes.Count > 0)
-            {
-                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._sensorTypes[idx].GetHashCode();
-                }
-            }
-
-            result = GenerateHash(result) ^ this._pad3.GetHashCode();
-
-            if (this._mineLocation.Count > 0)
-            {
-                for (int idx = 0; idx < this._mineLocation.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._mineLocation[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.10.3 Information about individual mines within a minefield. This is very, very wrong. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(TwoByteChunk))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class MinefieldDataPdu : MinefieldFamilyPdu, IEquatable<MinefieldDataPdu>
+    {
+        /// <summary>
+        /// Minefield ID
+        /// </summary>
+        private EntityID _minefieldID = new EntityID();
+
+        /// <summary>
+        /// ID of entity making request
+        /// </summary>
+        private EntityID _requestingEntityID = new EntityID();
+
+        /// <summary>
+        /// Minefield sequence number
+        /// </summary>
+        private ushort _minefieldSequenceNumbeer;
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private byte _requestID;
+
+        /// <summary>
+        /// pdu sequence number
+        /// </summary>
+        private byte _pduSequenceNumber;
+
+        /// <summary>
+        /// number of pdus in response
+        /// </summary>
+        private byte _numberOfPdus;
+
+        /// <summary>
+        /// how many mines are in this PDU
+        /// </summary>
+        private byte _numberOfMinesInThisPdu;
+
+        /// <summary>
+        /// how many sensor type are in this PDU
+        /// </summary>
+        private byte _numberOfSensorTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// 32 boolean fields
+        /// </summary>
+        private uint _dataFilter;
+
+        /// <summary>
+        /// Mine type
+        /// </summary>
+        private EntityType _mineType = new EntityType();
+
+        /// <summary>
+        /// Sensor types, each 16 bits long
+        /// </summary>
+        private List<TwoByteChunk> _sensorTypes = new List<TwoByteChunk>();
+
+        /// <summary>
+        /// Padding to get things 32-bit aligned. ^^^this is wrong--dyanmically sized padding needed
+        /// </summary>
+        private byte _pad3;
+
+        /// <summary>
+        /// Mine locations
+        /// </summary>
+        private List<Vector3Float> _mineLocation = new List<Vector3Float>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldDataPdu"/> class.
+        /// </summary>
+        public MinefieldDataPdu()
+        {
+            PduType = (byte)39;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldDataPdu left, MinefieldDataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldDataPdu left, MinefieldDataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
+            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
+            marshalSize += 2;  // this._minefieldSequenceNumbeer
+            marshalSize += 1;  // this._requestID
+            marshalSize += 1;  // this._pduSequenceNumber
+            marshalSize += 1;  // this._numberOfPdus
+            marshalSize += 1;  // this._numberOfMinesInThisPdu
+            marshalSize += 1;  // this._numberOfSensorTypes
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._dataFilter
+            marshalSize += this._mineType.GetMarshalledSize();  // this._mineType
+            for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+            {
+                TwoByteChunk listElement = (TwoByteChunk)this._sensorTypes[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            marshalSize += 1;  // this._pad3
+            for (int idx = 0; idx < this._mineLocation.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._mineLocation[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
+        public EntityID MinefieldID
+        {
+            get
+            {
+                return this._minefieldID;
+            }
+
+            set
+            {
+                this._minefieldID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity making request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
+        public EntityID RequestingEntityID
+        {
+            get
+            {
+                return this._requestingEntityID;
+            }
+
+            set
+            {
+                this._requestingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield sequence number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "minefieldSequenceNumbeer")]
+        public ushort MinefieldSequenceNumbeer
+        {
+            get
+            {
+                return this._minefieldSequenceNumbeer;
+            }
+
+            set
+            {
+                this._minefieldSequenceNumbeer = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
+        public byte RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pdu sequence number
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduSequenceNumber")]
+        public byte PduSequenceNumber
+        {
+            get
+            {
+                return this._pduSequenceNumber;
+            }
+
+            set
+            {
+                this._pduSequenceNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of pdus in response
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfPdus")]
+        public byte NumberOfPdus
+        {
+            get
+            {
+                return this._numberOfPdus;
+            }
+
+            set
+            {
+                this._numberOfPdus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many mines are in this PDU
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfMinesInThisPdu method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfMinesInThisPdu")]
+        public byte NumberOfMinesInThisPdu
+        {
+            get
+            {
+                return this._numberOfMinesInThisPdu;
+            }
+
+            set
+            {
+                this._numberOfMinesInThisPdu = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many sensor type are in this PDU
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSensorTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSensorTypes")]
+        public byte NumberOfSensorTypes
+        {
+            get
+            {
+                return this._numberOfSensorTypes;
+            }
+
+            set
+            {
+                this._numberOfSensorTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 32 boolean fields
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "dataFilter")]
+        public uint DataFilter
+        {
+            get
+            {
+                return this._dataFilter;
+            }
+
+            set
+            {
+                this._dataFilter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Mine type
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "mineType")]
+        public EntityType MineType
+        {
+            get
+            {
+                return this._mineType;
+            }
+
+            set
+            {
+                this._mineType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Sensor types, each 16 bits long
+        /// </summary>
+        [XmlElement(ElementName = "sensorTypesList", Type = typeof(List<TwoByteChunk>))]
+        public List<TwoByteChunk> SensorTypes
+        {
+            get
+            {
+                return this._sensorTypes;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding to get things 32-bit aligned. ^^^this is wrong--dyanmically sized padding needed
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad3")]
+        public byte Pad3
+        {
+            get
+            {
+                return this._pad3;
+            }
+
+            set
+            {
+                this._pad3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Mine locations
+        /// </summary>
+        [XmlElement(ElementName = "mineLocationList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> MineLocation
+        {
+            get
+            {
+                return this._mineLocation;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._minefieldID.Marshal(dos);
+                    this._requestingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._minefieldSequenceNumbeer);
+                    dos.WriteUnsignedByte((byte)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._pduSequenceNumber);
+                    dos.WriteUnsignedByte((byte)this._numberOfPdus);
+                    dos.WriteUnsignedByte((byte)this._mineLocation.Count);
+                    dos.WriteUnsignedByte((byte)this._sensorTypes.Count);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._dataFilter);
+                    this._mineType.Marshal(dos);
+
+                    for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                    {
+                        TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
+                        aTwoByteChunk.Marshal(dos);
+                    }
+
+                    dos.WriteUnsignedByte((byte)this._pad3);
+
+                    for (int idx = 0; idx < this._mineLocation.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._mineLocation[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._minefieldID.Unmarshal(dis);
+                    this._requestingEntityID.Unmarshal(dis);
+                    this._minefieldSequenceNumbeer = dis.ReadUnsignedShort();
+                    this._requestID = dis.ReadUnsignedByte();
+                    this._pduSequenceNumber = dis.ReadUnsignedByte();
+                    this._numberOfPdus = dis.ReadUnsignedByte();
+                    this._numberOfMinesInThisPdu = dis.ReadUnsignedByte();
+                    this._numberOfSensorTypes = dis.ReadUnsignedByte();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._dataFilter = dis.ReadUnsignedInt();
+                    this._mineType.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this.NumberOfSensorTypes; idx++)
+                    {
+                        TwoByteChunk anX = new TwoByteChunk();
+                        anX.Unmarshal(dis);
+                        this._sensorTypes.Add(anX);
+                    }
+
+                    this._pad3 = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.NumberOfMinesInThisPdu; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._mineLocation.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldDataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<minefieldID>");
+                this._minefieldID.Reflection(sb);
+                sb.AppendLine("</minefieldID>");
+                sb.AppendLine("<requestingEntityID>");
+                this._requestingEntityID.Reflection(sb);
+                sb.AppendLine("</requestingEntityID>");
+                sb.AppendLine("<minefieldSequenceNumbeer type=\"ushort\">" + this._minefieldSequenceNumbeer.ToString(CultureInfo.InvariantCulture) + "</minefieldSequenceNumbeer>");
+                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<pduSequenceNumber type=\"byte\">" + this._pduSequenceNumber.ToString(CultureInfo.InvariantCulture) + "</pduSequenceNumber>");
+                sb.AppendLine("<numberOfPdus type=\"byte\">" + this._numberOfPdus.ToString(CultureInfo.InvariantCulture) + "</numberOfPdus>");
+                sb.AppendLine("<mineLocation type=\"byte\">" + this._mineLocation.Count.ToString(CultureInfo.InvariantCulture) + "</mineLocation>");
+                sb.AppendLine("<sensorTypes type=\"byte\">" + this._sensorTypes.Count.ToString(CultureInfo.InvariantCulture) + "</sensorTypes>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<dataFilter type=\"uint\">" + this._dataFilter.ToString(CultureInfo.InvariantCulture) + "</dataFilter>");
+                sb.AppendLine("<mineType>");
+                this._mineType.Reflection(sb);
+                sb.AppendLine("</mineType>");
+                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                {
+                    sb.AppendLine("<sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TwoByteChunk\">");
+                    TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
+                    aTwoByteChunk.Reflection(sb);
+                    sb.AppendLine("</sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("<pad3 type=\"byte\">" + this._pad3.ToString(CultureInfo.InvariantCulture) + "</pad3>");
+                for (int idx = 0; idx < this._mineLocation.Count; idx++)
+                {
+                    sb.AppendLine("<mineLocation" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._mineLocation[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</mineLocation" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</MinefieldDataPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldDataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldDataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._minefieldID.Equals(obj._minefieldID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._minefieldSequenceNumbeer != obj._minefieldSequenceNumbeer)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduSequenceNumber != obj._pduSequenceNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPdus != obj._numberOfPdus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfMinesInThisPdu != obj._numberOfMinesInThisPdu)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSensorTypes != obj._numberOfSensorTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataFilter != obj._dataFilter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._mineType.Equals(obj._mineType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sensorTypes.Count != obj._sensorTypes.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                {
+                    if (!this._sensorTypes[idx].Equals(obj._sensorTypes[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._pad3 != obj._pad3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._mineLocation.Count != obj._mineLocation.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._mineLocation.Count; idx++)
+                {
+                    if (!this._mineLocation[idx].Equals(obj._mineLocation[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldSequenceNumbeer.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._pduSequenceNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPdus.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfMinesInThisPdu.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSensorTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._dataFilter.GetHashCode();
+            result = GenerateHash(result) ^ this._mineType.GetHashCode();
+
+            if (this._sensorTypes.Count > 0)
+            {
+                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._sensorTypes[idx].GetHashCode();
+                }
+            }
+
+            result = GenerateHash(result) ^ this._pad3.GetHashCode();
+
+            if (this._mineLocation.Count > 0)
+            {
+                for (int idx = 0; idx < this._mineLocation.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._mineLocation[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/MinefieldFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/MinefieldFamilyPdu.cs
index 8712990..334671e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/MinefieldFamilyPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.10.1 Abstract superclass for PDUs relating to minefields
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class MinefieldFamilyPdu : Pdu, IEquatable<MinefieldFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldFamilyPdu"/> class.
-        /// </summary>
-        public MinefieldFamilyPdu()
-        {
-            ProtocolFamily = (byte)8;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</MinefieldFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.10.1 Abstract superclass for PDUs relating to minefields
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class MinefieldFamilyPdu : Pdu, IEquatable<MinefieldFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldFamilyPdu"/> class.
+        /// </summary>
+        public MinefieldFamilyPdu()
+        {
+            ProtocolFamily = (byte)8;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</MinefieldFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/MinefieldQueryPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/MinefieldQueryPdu.cs
index 8c092f6..c7d042f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldQueryPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/MinefieldQueryPdu.cs
@@ -1,684 +1,684 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.10.2 Query a minefield for information about individual mines. Requires manual clean up to get the padding right. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Point))]
-    [XmlInclude(typeof(TwoByteChunk))]
-    public partial class MinefieldQueryPdu : MinefieldFamilyPdu, IEquatable<MinefieldQueryPdu>
-    {
-        /// <summary>
-        /// Minefield ID
-        /// </summary>
-        private EntityID _minefieldID = new EntityID();
-
-        /// <summary>
-        /// EID of entity making the request
-        /// </summary>
-        private EntityID _requestingEntityID = new EntityID();
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private byte _requestID;
-
-        /// <summary>
-        /// Number of perimeter points for the minefield
-        /// </summary>
-        private byte _numberOfPerimeterPoints;
-
-        /// <summary>
-        /// Padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Number of sensor types
-        /// </summary>
-        private byte _numberOfSensorTypes;
-
-        /// <summary>
-        /// data filter, 32 boolean fields
-        /// </summary>
-        private uint _dataFilter;
-
-        /// <summary>
-        /// Entity type of mine being requested
-        /// </summary>
-        private EntityType _requestedMineType = new EntityType();
-
-        /// <summary>
-        /// perimeter points of request
-        /// </summary>
-        private List<Point> _requestedPerimeterPoints = new List<Point>();
-
-        /// <summary>
-        /// Sensor types, each 16 bits long
-        /// </summary>
-        private List<TwoByteChunk> _sensorTypes = new List<TwoByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldQueryPdu"/> class.
-        /// </summary>
-        public MinefieldQueryPdu()
-        {
-            PduType = (byte)38;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldQueryPdu left, MinefieldQueryPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldQueryPdu left, MinefieldQueryPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
-            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
-            marshalSize += 1;  // this._requestID
-            marshalSize += 1;  // this._numberOfPerimeterPoints
-            marshalSize += 1;  // this._pad2
-            marshalSize += 1;  // this._numberOfSensorTypes
-            marshalSize += 4;  // this._dataFilter
-            marshalSize += this._requestedMineType.GetMarshalledSize();  // this._requestedMineType
-            for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
-            {
-                Point listElement = (Point)this._requestedPerimeterPoints[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-            {
-                TwoByteChunk listElement = (TwoByteChunk)this._sensorTypes[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
-        public EntityID MinefieldID
-        {
-            get
-            {
-                return this._minefieldID;
-            }
-
-            set
-            {
-                this._minefieldID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the EID of entity making the request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
-        public EntityID RequestingEntityID
-        {
-            get
-            {
-                return this._requestingEntityID;
-            }
-
-            set
-            {
-                this._requestingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
-        public byte RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of perimeter points for the minefield
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPerimeterPoints method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfPerimeterPoints")]
-        public byte NumberOfPerimeterPoints
-        {
-            get
-            {
-                return this._numberOfPerimeterPoints;
-            }
-
-            set
-            {
-                this._numberOfPerimeterPoints = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of sensor types
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSensorTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSensorTypes")]
-        public byte NumberOfSensorTypes
-        {
-            get
-            {
-                return this._numberOfSensorTypes;
-            }
-
-            set
-            {
-                this._numberOfSensorTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the data filter, 32 boolean fields
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "dataFilter")]
-        public uint DataFilter
-        {
-            get
-            {
-                return this._dataFilter;
-            }
-
-            set
-            {
-                this._dataFilter = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity type of mine being requested
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "requestedMineType")]
-        public EntityType RequestedMineType
-        {
-            get
-            {
-                return this._requestedMineType;
-            }
-
-            set
-            {
-                this._requestedMineType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the perimeter points of request
-        /// </summary>
-        [XmlElement(ElementName = "requestedPerimeterPointsList", Type = typeof(List<Point>))]
-        public List<Point> RequestedPerimeterPoints
-        {
-            get
-            {
-                return this._requestedPerimeterPoints;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Sensor types, each 16 bits long
-        /// </summary>
-        [XmlElement(ElementName = "sensorTypesList", Type = typeof(List<TwoByteChunk>))]
-        public List<TwoByteChunk> SensorTypes
-        {
-            get
-            {
-                return this._sensorTypes;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._minefieldID.Marshal(dos);
-                    this._requestingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._requestedPerimeterPoints.Count);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedByte((byte)this._sensorTypes.Count);
-                    dos.WriteUnsignedInt((uint)this._dataFilter);
-                    this._requestedMineType.Marshal(dos);
-
-                    for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
-                    {
-                        Point aPoint = (Point)this._requestedPerimeterPoints[idx];
-                        aPoint.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                    {
-                        TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
-                        aTwoByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._minefieldID.Unmarshal(dis);
-                    this._requestingEntityID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedByte();
-                    this._numberOfPerimeterPoints = dis.ReadUnsignedByte();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._numberOfSensorTypes = dis.ReadUnsignedByte();
-                    this._dataFilter = dis.ReadUnsignedInt();
-                    this._requestedMineType.Unmarshal(dis);
-
-                    for (int idx = 0; idx < this.NumberOfPerimeterPoints; idx++)
-                    {
-                        Point anX = new Point();
-                        anX.Unmarshal(dis);
-                        this._requestedPerimeterPoints.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfSensorTypes; idx++)
-                    {
-                        TwoByteChunk anX = new TwoByteChunk();
-                        anX.Unmarshal(dis);
-                        this._sensorTypes.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldQueryPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<minefieldID>");
-                this._minefieldID.Reflection(sb);
-                sb.AppendLine("</minefieldID>");
-                sb.AppendLine("<requestingEntityID>");
-                this._requestingEntityID.Reflection(sb);
-                sb.AppendLine("</requestingEntityID>");
-                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requestedPerimeterPoints type=\"byte\">" + this._requestedPerimeterPoints.Count.ToString(CultureInfo.InvariantCulture) + "</requestedPerimeterPoints>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<sensorTypes type=\"byte\">" + this._sensorTypes.Count.ToString(CultureInfo.InvariantCulture) + "</sensorTypes>");
-                sb.AppendLine("<dataFilter type=\"uint\">" + this._dataFilter.ToString(CultureInfo.InvariantCulture) + "</dataFilter>");
-                sb.AppendLine("<requestedMineType>");
-                this._requestedMineType.Reflection(sb);
-                sb.AppendLine("</requestedMineType>");
-                for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
-                {
-                    sb.AppendLine("<requestedPerimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Point\">");
-                    Point aPoint = (Point)this._requestedPerimeterPoints[idx];
-                    aPoint.Reflection(sb);
-                    sb.AppendLine("</requestedPerimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                {
-                    sb.AppendLine("<sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TwoByteChunk\">");
-                    TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
-                    aTwoByteChunk.Reflection(sb);
-                    sb.AppendLine("</sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</MinefieldQueryPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldQueryPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldQueryPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._minefieldID.Equals(obj._minefieldID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPerimeterPoints != obj._numberOfPerimeterPoints)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSensorTypes != obj._numberOfSensorTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataFilter != obj._dataFilter)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requestedMineType.Equals(obj._requestedMineType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestedPerimeterPoints.Count != obj._requestedPerimeterPoints.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
-                {
-                    if (!this._requestedPerimeterPoints[idx].Equals(obj._requestedPerimeterPoints[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._sensorTypes.Count != obj._sensorTypes.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                {
-                    if (!this._sensorTypes[idx].Equals(obj._sensorTypes[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPerimeterPoints.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSensorTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._dataFilter.GetHashCode();
-            result = GenerateHash(result) ^ this._requestedMineType.GetHashCode();
-
-            if (this._requestedPerimeterPoints.Count > 0)
-            {
-                for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._requestedPerimeterPoints[idx].GetHashCode();
-                }
-            }
-
-            if (this._sensorTypes.Count > 0)
-            {
-                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._sensorTypes[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.10.2 Query a minefield for information about individual mines. Requires manual clean up to get the padding right. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Point))]
+    [XmlInclude(typeof(TwoByteChunk))]
+    public partial class MinefieldQueryPdu : MinefieldFamilyPdu, IEquatable<MinefieldQueryPdu>
+    {
+        /// <summary>
+        /// Minefield ID
+        /// </summary>
+        private EntityID _minefieldID = new EntityID();
+
+        /// <summary>
+        /// EID of entity making the request
+        /// </summary>
+        private EntityID _requestingEntityID = new EntityID();
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private byte _requestID;
+
+        /// <summary>
+        /// Number of perimeter points for the minefield
+        /// </summary>
+        private byte _numberOfPerimeterPoints;
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Number of sensor types
+        /// </summary>
+        private byte _numberOfSensorTypes;
+
+        /// <summary>
+        /// data filter, 32 boolean fields
+        /// </summary>
+        private uint _dataFilter;
+
+        /// <summary>
+        /// Entity type of mine being requested
+        /// </summary>
+        private EntityType _requestedMineType = new EntityType();
+
+        /// <summary>
+        /// perimeter points of request
+        /// </summary>
+        private List<Point> _requestedPerimeterPoints = new List<Point>();
+
+        /// <summary>
+        /// Sensor types, each 16 bits long
+        /// </summary>
+        private List<TwoByteChunk> _sensorTypes = new List<TwoByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldQueryPdu"/> class.
+        /// </summary>
+        public MinefieldQueryPdu()
+        {
+            PduType = (byte)38;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldQueryPdu left, MinefieldQueryPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldQueryPdu left, MinefieldQueryPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
+            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
+            marshalSize += 1;  // this._requestID
+            marshalSize += 1;  // this._numberOfPerimeterPoints
+            marshalSize += 1;  // this._pad2
+            marshalSize += 1;  // this._numberOfSensorTypes
+            marshalSize += 4;  // this._dataFilter
+            marshalSize += this._requestedMineType.GetMarshalledSize();  // this._requestedMineType
+            for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
+            {
+                Point listElement = (Point)this._requestedPerimeterPoints[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+            {
+                TwoByteChunk listElement = (TwoByteChunk)this._sensorTypes[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
+        public EntityID MinefieldID
+        {
+            get
+            {
+                return this._minefieldID;
+            }
+
+            set
+            {
+                this._minefieldID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the EID of entity making the request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
+        public EntityID RequestingEntityID
+        {
+            get
+            {
+                return this._requestingEntityID;
+            }
+
+            set
+            {
+                this._requestingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
+        public byte RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of perimeter points for the minefield
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPerimeterPoints method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfPerimeterPoints")]
+        public byte NumberOfPerimeterPoints
+        {
+            get
+            {
+                return this._numberOfPerimeterPoints;
+            }
+
+            set
+            {
+                this._numberOfPerimeterPoints = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of sensor types
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSensorTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSensorTypes")]
+        public byte NumberOfSensorTypes
+        {
+            get
+            {
+                return this._numberOfSensorTypes;
+            }
+
+            set
+            {
+                this._numberOfSensorTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the data filter, 32 boolean fields
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "dataFilter")]
+        public uint DataFilter
+        {
+            get
+            {
+                return this._dataFilter;
+            }
+
+            set
+            {
+                this._dataFilter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity type of mine being requested
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "requestedMineType")]
+        public EntityType RequestedMineType
+        {
+            get
+            {
+                return this._requestedMineType;
+            }
+
+            set
+            {
+                this._requestedMineType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the perimeter points of request
+        /// </summary>
+        [XmlElement(ElementName = "requestedPerimeterPointsList", Type = typeof(List<Point>))]
+        public List<Point> RequestedPerimeterPoints
+        {
+            get
+            {
+                return this._requestedPerimeterPoints;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Sensor types, each 16 bits long
+        /// </summary>
+        [XmlElement(ElementName = "sensorTypesList", Type = typeof(List<TwoByteChunk>))]
+        public List<TwoByteChunk> SensorTypes
+        {
+            get
+            {
+                return this._sensorTypes;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._minefieldID.Marshal(dos);
+                    this._requestingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._requestedPerimeterPoints.Count);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedByte((byte)this._sensorTypes.Count);
+                    dos.WriteUnsignedInt((uint)this._dataFilter);
+                    this._requestedMineType.Marshal(dos);
+
+                    for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
+                    {
+                        Point aPoint = (Point)this._requestedPerimeterPoints[idx];
+                        aPoint.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                    {
+                        TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
+                        aTwoByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._minefieldID.Unmarshal(dis);
+                    this._requestingEntityID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedByte();
+                    this._numberOfPerimeterPoints = dis.ReadUnsignedByte();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._numberOfSensorTypes = dis.ReadUnsignedByte();
+                    this._dataFilter = dis.ReadUnsignedInt();
+                    this._requestedMineType.Unmarshal(dis);
+
+                    for (int idx = 0; idx < this.NumberOfPerimeterPoints; idx++)
+                    {
+                        Point anX = new Point();
+                        anX.Unmarshal(dis);
+                        this._requestedPerimeterPoints.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfSensorTypes; idx++)
+                    {
+                        TwoByteChunk anX = new TwoByteChunk();
+                        anX.Unmarshal(dis);
+                        this._sensorTypes.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldQueryPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<minefieldID>");
+                this._minefieldID.Reflection(sb);
+                sb.AppendLine("</minefieldID>");
+                sb.AppendLine("<requestingEntityID>");
+                this._requestingEntityID.Reflection(sb);
+                sb.AppendLine("</requestingEntityID>");
+                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requestedPerimeterPoints type=\"byte\">" + this._requestedPerimeterPoints.Count.ToString(CultureInfo.InvariantCulture) + "</requestedPerimeterPoints>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<sensorTypes type=\"byte\">" + this._sensorTypes.Count.ToString(CultureInfo.InvariantCulture) + "</sensorTypes>");
+                sb.AppendLine("<dataFilter type=\"uint\">" + this._dataFilter.ToString(CultureInfo.InvariantCulture) + "</dataFilter>");
+                sb.AppendLine("<requestedMineType>");
+                this._requestedMineType.Reflection(sb);
+                sb.AppendLine("</requestedMineType>");
+                for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
+                {
+                    sb.AppendLine("<requestedPerimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Point\">");
+                    Point aPoint = (Point)this._requestedPerimeterPoints[idx];
+                    aPoint.Reflection(sb);
+                    sb.AppendLine("</requestedPerimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                {
+                    sb.AppendLine("<sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"TwoByteChunk\">");
+                    TwoByteChunk aTwoByteChunk = (TwoByteChunk)this._sensorTypes[idx];
+                    aTwoByteChunk.Reflection(sb);
+                    sb.AppendLine("</sensorTypes" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</MinefieldQueryPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldQueryPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldQueryPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._minefieldID.Equals(obj._minefieldID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPerimeterPoints != obj._numberOfPerimeterPoints)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSensorTypes != obj._numberOfSensorTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataFilter != obj._dataFilter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requestedMineType.Equals(obj._requestedMineType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestedPerimeterPoints.Count != obj._requestedPerimeterPoints.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
+                {
+                    if (!this._requestedPerimeterPoints[idx].Equals(obj._requestedPerimeterPoints[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._sensorTypes.Count != obj._sensorTypes.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                {
+                    if (!this._sensorTypes[idx].Equals(obj._sensorTypes[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPerimeterPoints.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSensorTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._dataFilter.GetHashCode();
+            result = GenerateHash(result) ^ this._requestedMineType.GetHashCode();
+
+            if (this._requestedPerimeterPoints.Count > 0)
+            {
+                for (int idx = 0; idx < this._requestedPerimeterPoints.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._requestedPerimeterPoints[idx].GetHashCode();
+                }
+            }
+
+            if (this._sensorTypes.Count > 0)
+            {
+                for (int idx = 0; idx < this._sensorTypes.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._sensorTypes[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/MinefieldResponseNackPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/MinefieldResponseNackPdu.cs
index 30fcb9b..b43b964 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldResponseNackPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/MinefieldResponseNackPdu.cs
@@ -1,479 +1,479 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.10.4 proivde the means to request a retransmit of a minefield data pdu. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EightByteChunk))]
-    public partial class MinefieldResponseNackPdu : MinefieldFamilyPdu, IEquatable<MinefieldResponseNackPdu>
-    {
-        /// <summary>
-        /// Minefield ID
-        /// </summary>
-        private EntityID _minefieldID = new EntityID();
-
-        /// <summary>
-        /// entity ID making the request
-        /// </summary>
-        private EntityID _requestingEntityID = new EntityID();
-
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private byte _requestID;
-
-        /// <summary>
-        /// how many pdus were missing
-        /// </summary>
-        private byte _numberOfMissingPdus;
-
-        /// <summary>
-        /// PDU sequence numbers that were missing
-        /// </summary>
-        private List<EightByteChunk> _missingPduSequenceNumbers = new List<EightByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldResponseNackPdu"/> class.
-        /// </summary>
-        public MinefieldResponseNackPdu()
-        {
-            PduType = (byte)40;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
-            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
-            marshalSize += 1;  // this._requestID
-            marshalSize += 1;  // this._numberOfMissingPdus
-            for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-            {
-                EightByteChunk listElement = (EightByteChunk)this._missingPduSequenceNumbers[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
-        public EntityID MinefieldID
-        {
-            get
-            {
-                return this._minefieldID;
-            }
-
-            set
-            {
-                this._minefieldID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the entity ID making the request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
-        public EntityID RequestingEntityID
-        {
-            get
-            {
-                return this._requestingEntityID;
-            }
-
-            set
-            {
-                this._requestingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
-        public byte RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many pdus were missing
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfMissingPdus method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfMissingPdus")]
-        public byte NumberOfMissingPdus
-        {
-            get
-            {
-                return this._numberOfMissingPdus;
-            }
-
-            set
-            {
-                this._numberOfMissingPdus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the PDU sequence numbers that were missing
-        /// </summary>
-        [XmlElement(ElementName = "missingPduSequenceNumbersList", Type = typeof(List<EightByteChunk>))]
-        public List<EightByteChunk> MissingPduSequenceNumbers
-        {
-            get
-            {
-                return this._missingPduSequenceNumbers;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._minefieldID.Marshal(dos);
-                    this._requestingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._missingPduSequenceNumbers.Count);
-
-                    for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                    {
-                        EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
-                        aEightByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._minefieldID.Unmarshal(dis);
-                    this._requestingEntityID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedByte();
-                    this._numberOfMissingPdus = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.NumberOfMissingPdus; idx++)
-                    {
-                        EightByteChunk anX = new EightByteChunk();
-                        anX.Unmarshal(dis);
-                        this._missingPduSequenceNumbers.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldResponseNackPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<minefieldID>");
-                this._minefieldID.Reflection(sb);
-                sb.AppendLine("</minefieldID>");
-                sb.AppendLine("<requestingEntityID>");
-                this._requestingEntityID.Reflection(sb);
-                sb.AppendLine("</requestingEntityID>");
-                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<missingPduSequenceNumbers type=\"byte\">" + this._missingPduSequenceNumbers.Count.ToString(CultureInfo.InvariantCulture) + "</missingPduSequenceNumbers>");
-                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                {
-                    sb.AppendLine("<missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
-                    EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
-                    aEightByteChunk.Reflection(sb);
-                    sb.AppendLine("</missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</MinefieldResponseNackPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldResponseNackPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldResponseNackPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._minefieldID.Equals(obj._minefieldID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfMissingPdus != obj._numberOfMissingPdus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._missingPduSequenceNumbers.Count != obj._missingPduSequenceNumbers.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                {
-                    if (!this._missingPduSequenceNumbers[idx].Equals(obj._missingPduSequenceNumbers[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfMissingPdus.GetHashCode();
-
-            if (this._missingPduSequenceNumbers.Count > 0)
-            {
-                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._missingPduSequenceNumbers[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.10.4 proivde the means to request a retransmit of a minefield data pdu. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EightByteChunk))]
+    public partial class MinefieldResponseNackPdu : MinefieldFamilyPdu, IEquatable<MinefieldResponseNackPdu>
+    {
+        /// <summary>
+        /// Minefield ID
+        /// </summary>
+        private EntityID _minefieldID = new EntityID();
+
+        /// <summary>
+        /// entity ID making the request
+        /// </summary>
+        private EntityID _requestingEntityID = new EntityID();
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private byte _requestID;
+
+        /// <summary>
+        /// how many pdus were missing
+        /// </summary>
+        private byte _numberOfMissingPdus;
+
+        /// <summary>
+        /// PDU sequence numbers that were missing
+        /// </summary>
+        private List<EightByteChunk> _missingPduSequenceNumbers = new List<EightByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldResponseNackPdu"/> class.
+        /// </summary>
+        public MinefieldResponseNackPdu()
+        {
+            PduType = (byte)40;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
+            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
+            marshalSize += 1;  // this._requestID
+            marshalSize += 1;  // this._numberOfMissingPdus
+            for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+            {
+                EightByteChunk listElement = (EightByteChunk)this._missingPduSequenceNumbers[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
+        public EntityID MinefieldID
+        {
+            get
+            {
+                return this._minefieldID;
+            }
+
+            set
+            {
+                this._minefieldID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the entity ID making the request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
+        public EntityID RequestingEntityID
+        {
+            get
+            {
+                return this._requestingEntityID;
+            }
+
+            set
+            {
+                this._requestingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
+        public byte RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many pdus were missing
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfMissingPdus method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfMissingPdus")]
+        public byte NumberOfMissingPdus
+        {
+            get
+            {
+                return this._numberOfMissingPdus;
+            }
+
+            set
+            {
+                this._numberOfMissingPdus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the PDU sequence numbers that were missing
+        /// </summary>
+        [XmlElement(ElementName = "missingPduSequenceNumbersList", Type = typeof(List<EightByteChunk>))]
+        public List<EightByteChunk> MissingPduSequenceNumbers
+        {
+            get
+            {
+                return this._missingPduSequenceNumbers;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._minefieldID.Marshal(dos);
+                    this._requestingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._missingPduSequenceNumbers.Count);
+
+                    for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                    {
+                        EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
+                        aEightByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._minefieldID.Unmarshal(dis);
+                    this._requestingEntityID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedByte();
+                    this._numberOfMissingPdus = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.NumberOfMissingPdus; idx++)
+                    {
+                        EightByteChunk anX = new EightByteChunk();
+                        anX.Unmarshal(dis);
+                        this._missingPduSequenceNumbers.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldResponseNackPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<minefieldID>");
+                this._minefieldID.Reflection(sb);
+                sb.AppendLine("</minefieldID>");
+                sb.AppendLine("<requestingEntityID>");
+                this._requestingEntityID.Reflection(sb);
+                sb.AppendLine("</requestingEntityID>");
+                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<missingPduSequenceNumbers type=\"byte\">" + this._missingPduSequenceNumbers.Count.ToString(CultureInfo.InvariantCulture) + "</missingPduSequenceNumbers>");
+                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                {
+                    sb.AppendLine("<missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
+                    EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
+                    aEightByteChunk.Reflection(sb);
+                    sb.AppendLine("</missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</MinefieldResponseNackPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldResponseNackPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldResponseNackPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._minefieldID.Equals(obj._minefieldID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfMissingPdus != obj._numberOfMissingPdus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._missingPduSequenceNumbers.Count != obj._missingPduSequenceNumbers.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                {
+                    if (!this._missingPduSequenceNumbers[idx].Equals(obj._missingPduSequenceNumbers[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfMissingPdus.GetHashCode();
+
+            if (this._missingPduSequenceNumbers.Count > 0)
+            {
+                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._missingPduSequenceNumbers[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/MinefieldStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/MinefieldStatePdu.cs
index b7abaa7..6e90590 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/MinefieldStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/MinefieldStatePdu.cs
@@ -1,752 +1,752 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.10.1 Abstract superclass for PDUs relating to minefields. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EntityType))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Orientation))]
-    [XmlInclude(typeof(Point))]
-    [XmlInclude(typeof(EntityType))]
-    public partial class MinefieldStatePdu : MinefieldFamilyPdu, IEquatable<MinefieldStatePdu>
-    {
-        /// <summary>
-        /// Minefield ID
-        /// </summary>
-        private EntityID _minefieldID = new EntityID();
-
-        /// <summary>
-        /// Minefield sequence
-        /// </summary>
-        private ushort _minefieldSequence;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// Number of permieter points
-        /// </summary>
-        private byte _numberOfPerimeterPoints;
-
-        /// <summary>
-        /// type of minefield
-        /// </summary>
-        private EntityType _minefieldType = new EntityType();
-
-        /// <summary>
-        /// how many mine types
-        /// </summary>
-        private ushort _numberOfMineTypes;
-
-        /// <summary>
-        /// location of minefield in world coords
-        /// </summary>
-        private Vector3Double _minefieldLocation = new Vector3Double();
-
-        /// <summary>
-        /// orientation of minefield
-        /// </summary>
-        private Orientation _minefieldOrientation = new Orientation();
-
-        /// <summary>
-        /// appearance bitflags
-        /// </summary>
-        private ushort _appearance;
-
-        /// <summary>
-        /// protocolMode
-        /// </summary>
-        private ushort _protocolMode;
-
-        /// <summary>
-        /// perimeter points for the minefield
-        /// </summary>
-        private List<Point> _perimeterPoints = new List<Point>();
-
-        /// <summary>
-        /// Type of mines
-        /// </summary>
-        private List<EntityType> _mineType = new List<EntityType>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinefieldStatePdu"/> class.
-        /// </summary>
-        public MinefieldStatePdu()
-        {
-            PduType = (byte)37;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldStatePdu left, MinefieldStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldStatePdu left, MinefieldStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
-            marshalSize += 2;  // this._minefieldSequence
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._numberOfPerimeterPoints
-            marshalSize += this._minefieldType.GetMarshalledSize();  // this._minefieldType
-            marshalSize += 2;  // this._numberOfMineTypes
-            marshalSize += this._minefieldLocation.GetMarshalledSize();  // this._minefieldLocation
-            marshalSize += this._minefieldOrientation.GetMarshalledSize();  // this._minefieldOrientation
-            marshalSize += 2;  // this._appearance
-            marshalSize += 2;  // this._protocolMode
-            for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-            {
-                Point listElement = (Point)this._perimeterPoints[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._mineType.Count; idx++)
-            {
-                EntityType listElement = (EntityType)this._mineType[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
-        public EntityID MinefieldID
-        {
-            get
-            {
-                return this._minefieldID;
-            }
-
-            set
-            {
-                this._minefieldID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Minefield sequence
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "minefieldSequence")]
-        public ushort MinefieldSequence
-        {
-            get
-            {
-                return this._minefieldSequence;
-            }
-
-            set
-            {
-                this._minefieldSequence = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of permieter points
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPerimeterPoints method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfPerimeterPoints")]
-        public byte NumberOfPerimeterPoints
-        {
-            get
-            {
-                return this._numberOfPerimeterPoints;
-            }
-
-            set
-            {
-                this._numberOfPerimeterPoints = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of minefield
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "minefieldType")]
-        public EntityType MinefieldType
-        {
-            get
-            {
-                return this._minefieldType;
-            }
-
-            set
-            {
-                this._minefieldType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many mine types
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfMineTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfMineTypes")]
-        public ushort NumberOfMineTypes
-        {
-            get
-            {
-                return this._numberOfMineTypes;
-            }
-
-            set
-            {
-                this._numberOfMineTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the location of minefield in world coords
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "minefieldLocation")]
-        public Vector3Double MinefieldLocation
-        {
-            get
-            {
-                return this._minefieldLocation;
-            }
-
-            set
-            {
-                this._minefieldLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the orientation of minefield
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "minefieldOrientation")]
-        public Orientation MinefieldOrientation
-        {
-            get
-            {
-                return this._minefieldOrientation;
-            }
-
-            set
-            {
-                this._minefieldOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the appearance bitflags
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "appearance")]
-        public ushort Appearance
-        {
-            get
-            {
-                return this._appearance;
-            }
-
-            set
-            {
-                this._appearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the protocolMode
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "protocolMode")]
-        public ushort ProtocolMode
-        {
-            get
-            {
-                return this._protocolMode;
-            }
-
-            set
-            {
-                this._protocolMode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the perimeter points for the minefield
-        /// </summary>
-        [XmlElement(ElementName = "perimeterPointsList", Type = typeof(List<Point>))]
-        public List<Point> PerimeterPoints
-        {
-            get
-            {
-                return this._perimeterPoints;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Type of mines
-        /// </summary>
-        [XmlElement(ElementName = "mineTypeList", Type = typeof(List<EntityType>))]
-        public List<EntityType> MineType
-        {
-            get
-            {
-                return this._mineType;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._minefieldID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._minefieldSequence);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._perimeterPoints.Count);
-                    this._minefieldType.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._mineType.Count);
-                    this._minefieldLocation.Marshal(dos);
-                    this._minefieldOrientation.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._appearance);
-                    dos.WriteUnsignedShort((ushort)this._protocolMode);
-
-                    for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                    {
-                        Point aPoint = (Point)this._perimeterPoints[idx];
-                        aPoint.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._mineType.Count; idx++)
-                    {
-                        EntityType aEntityType = (EntityType)this._mineType[idx];
-                        aEntityType.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._minefieldID.Unmarshal(dis);
-                    this._minefieldSequence = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._numberOfPerimeterPoints = dis.ReadUnsignedByte();
-                    this._minefieldType.Unmarshal(dis);
-                    this._numberOfMineTypes = dis.ReadUnsignedShort();
-                    this._minefieldLocation.Unmarshal(dis);
-                    this._minefieldOrientation.Unmarshal(dis);
-                    this._appearance = dis.ReadUnsignedShort();
-                    this._protocolMode = dis.ReadUnsignedShort();
-
-                    for (int idx = 0; idx < this.NumberOfPerimeterPoints; idx++)
-                    {
-                        Point anX = new Point();
-                        anX.Unmarshal(dis);
-                        this._perimeterPoints.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfMineTypes; idx++)
-                    {
-                        EntityType anX = new EntityType();
-                        anX.Unmarshal(dis);
-                        this._mineType.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<MinefieldStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<minefieldID>");
-                this._minefieldID.Reflection(sb);
-                sb.AppendLine("</minefieldID>");
-                sb.AppendLine("<minefieldSequence type=\"ushort\">" + this._minefieldSequence.ToString(CultureInfo.InvariantCulture) + "</minefieldSequence>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<perimeterPoints type=\"byte\">" + this._perimeterPoints.Count.ToString(CultureInfo.InvariantCulture) + "</perimeterPoints>");
-                sb.AppendLine("<minefieldType>");
-                this._minefieldType.Reflection(sb);
-                sb.AppendLine("</minefieldType>");
-                sb.AppendLine("<mineType type=\"ushort\">" + this._mineType.Count.ToString(CultureInfo.InvariantCulture) + "</mineType>");
-                sb.AppendLine("<minefieldLocation>");
-                this._minefieldLocation.Reflection(sb);
-                sb.AppendLine("</minefieldLocation>");
-                sb.AppendLine("<minefieldOrientation>");
-                this._minefieldOrientation.Reflection(sb);
-                sb.AppendLine("</minefieldOrientation>");
-                sb.AppendLine("<appearance type=\"ushort\">" + this._appearance.ToString(CultureInfo.InvariantCulture) + "</appearance>");
-                sb.AppendLine("<protocolMode type=\"ushort\">" + this._protocolMode.ToString(CultureInfo.InvariantCulture) + "</protocolMode>");
-                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                {
-                    sb.AppendLine("<perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Point\">");
-                    Point aPoint = (Point)this._perimeterPoints[idx];
-                    aPoint.Reflection(sb);
-                    sb.AppendLine("</perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._mineType.Count; idx++)
-                {
-                    sb.AppendLine("<mineType" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
-                    EntityType aEntityType = (EntityType)this._mineType[idx];
-                    aEntityType.Reflection(sb);
-                    sb.AppendLine("</mineType" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</MinefieldStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as MinefieldStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._minefieldID.Equals(obj._minefieldID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._minefieldSequence != obj._minefieldSequence)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPerimeterPoints != obj._numberOfPerimeterPoints)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._minefieldType.Equals(obj._minefieldType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfMineTypes != obj._numberOfMineTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._minefieldLocation.Equals(obj._minefieldLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._minefieldOrientation.Equals(obj._minefieldOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._appearance != obj._appearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._protocolMode != obj._protocolMode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._perimeterPoints.Count != obj._perimeterPoints.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                {
-                    if (!this._perimeterPoints[idx].Equals(obj._perimeterPoints[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._mineType.Count != obj._mineType.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._mineType.Count; idx++)
-                {
-                    if (!this._mineType[idx].Equals(obj._mineType[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldSequence.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPerimeterPoints.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldType.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfMineTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._minefieldOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._appearance.GetHashCode();
-            result = GenerateHash(result) ^ this._protocolMode.GetHashCode();
-
-            if (this._perimeterPoints.Count > 0)
-            {
-                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._perimeterPoints[idx].GetHashCode();
-                }
-            }
-
-            if (this._mineType.Count > 0)
-            {
-                for (int idx = 0; idx < this._mineType.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._mineType[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.10.1 Abstract superclass for PDUs relating to minefields. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Orientation))]
+    [XmlInclude(typeof(Point))]
+    [XmlInclude(typeof(EntityType))]
+    public partial class MinefieldStatePdu : MinefieldFamilyPdu, IEquatable<MinefieldStatePdu>
+    {
+        /// <summary>
+        /// Minefield ID
+        /// </summary>
+        private EntityID _minefieldID = new EntityID();
+
+        /// <summary>
+        /// Minefield sequence
+        /// </summary>
+        private ushort _minefieldSequence;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// Number of permieter points
+        /// </summary>
+        private byte _numberOfPerimeterPoints;
+
+        /// <summary>
+        /// type of minefield
+        /// </summary>
+        private EntityType _minefieldType = new EntityType();
+
+        /// <summary>
+        /// how many mine types
+        /// </summary>
+        private ushort _numberOfMineTypes;
+
+        /// <summary>
+        /// location of minefield in world coords
+        /// </summary>
+        private Vector3Double _minefieldLocation = new Vector3Double();
+
+        /// <summary>
+        /// orientation of minefield
+        /// </summary>
+        private Orientation _minefieldOrientation = new Orientation();
+
+        /// <summary>
+        /// appearance bitflags
+        /// </summary>
+        private ushort _appearance;
+
+        /// <summary>
+        /// protocolMode
+        /// </summary>
+        private ushort _protocolMode;
+
+        /// <summary>
+        /// perimeter points for the minefield
+        /// </summary>
+        private List<Point> _perimeterPoints = new List<Point>();
+
+        /// <summary>
+        /// Type of mines
+        /// </summary>
+        private List<EntityType> _mineType = new List<EntityType>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldStatePdu"/> class.
+        /// </summary>
+        public MinefieldStatePdu()
+        {
+            PduType = (byte)37;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldStatePdu left, MinefieldStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldStatePdu left, MinefieldStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
+            marshalSize += 2;  // this._minefieldSequence
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._numberOfPerimeterPoints
+            marshalSize += this._minefieldType.GetMarshalledSize();  // this._minefieldType
+            marshalSize += 2;  // this._numberOfMineTypes
+            marshalSize += this._minefieldLocation.GetMarshalledSize();  // this._minefieldLocation
+            marshalSize += this._minefieldOrientation.GetMarshalledSize();  // this._minefieldOrientation
+            marshalSize += 2;  // this._appearance
+            marshalSize += 2;  // this._protocolMode
+            for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+            {
+                Point listElement = (Point)this._perimeterPoints[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._mineType.Count; idx++)
+            {
+                EntityType listElement = (EntityType)this._mineType[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
+        public EntityID MinefieldID
+        {
+            get
+            {
+                return this._minefieldID;
+            }
+
+            set
+            {
+                this._minefieldID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield sequence
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "minefieldSequence")]
+        public ushort MinefieldSequence
+        {
+            get
+            {
+                return this._minefieldSequence;
+            }
+
+            set
+            {
+                this._minefieldSequence = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of permieter points
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPerimeterPoints method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfPerimeterPoints")]
+        public byte NumberOfPerimeterPoints
+        {
+            get
+            {
+                return this._numberOfPerimeterPoints;
+            }
+
+            set
+            {
+                this._numberOfPerimeterPoints = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of minefield
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "minefieldType")]
+        public EntityType MinefieldType
+        {
+            get
+            {
+                return this._minefieldType;
+            }
+
+            set
+            {
+                this._minefieldType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many mine types
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfMineTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfMineTypes")]
+        public ushort NumberOfMineTypes
+        {
+            get
+            {
+                return this._numberOfMineTypes;
+            }
+
+            set
+            {
+                this._numberOfMineTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of minefield in world coords
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "minefieldLocation")]
+        public Vector3Double MinefieldLocation
+        {
+            get
+            {
+                return this._minefieldLocation;
+            }
+
+            set
+            {
+                this._minefieldLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the orientation of minefield
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "minefieldOrientation")]
+        public Orientation MinefieldOrientation
+        {
+            get
+            {
+                return this._minefieldOrientation;
+            }
+
+            set
+            {
+                this._minefieldOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the appearance bitflags
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "appearance")]
+        public ushort Appearance
+        {
+            get
+            {
+                return this._appearance;
+            }
+
+            set
+            {
+                this._appearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the protocolMode
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "protocolMode")]
+        public ushort ProtocolMode
+        {
+            get
+            {
+                return this._protocolMode;
+            }
+
+            set
+            {
+                this._protocolMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the perimeter points for the minefield
+        /// </summary>
+        [XmlElement(ElementName = "perimeterPointsList", Type = typeof(List<Point>))]
+        public List<Point> PerimeterPoints
+        {
+            get
+            {
+                return this._perimeterPoints;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Type of mines
+        /// </summary>
+        [XmlElement(ElementName = "mineTypeList", Type = typeof(List<EntityType>))]
+        public List<EntityType> MineType
+        {
+            get
+            {
+                return this._mineType;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._minefieldID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._minefieldSequence);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._perimeterPoints.Count);
+                    this._minefieldType.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._mineType.Count);
+                    this._minefieldLocation.Marshal(dos);
+                    this._minefieldOrientation.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._appearance);
+                    dos.WriteUnsignedShort((ushort)this._protocolMode);
+
+                    for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                    {
+                        Point aPoint = (Point)this._perimeterPoints[idx];
+                        aPoint.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._mineType.Count; idx++)
+                    {
+                        EntityType aEntityType = (EntityType)this._mineType[idx];
+                        aEntityType.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._minefieldID.Unmarshal(dis);
+                    this._minefieldSequence = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._numberOfPerimeterPoints = dis.ReadUnsignedByte();
+                    this._minefieldType.Unmarshal(dis);
+                    this._numberOfMineTypes = dis.ReadUnsignedShort();
+                    this._minefieldLocation.Unmarshal(dis);
+                    this._minefieldOrientation.Unmarshal(dis);
+                    this._appearance = dis.ReadUnsignedShort();
+                    this._protocolMode = dis.ReadUnsignedShort();
+
+                    for (int idx = 0; idx < this.NumberOfPerimeterPoints; idx++)
+                    {
+                        Point anX = new Point();
+                        anX.Unmarshal(dis);
+                        this._perimeterPoints.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfMineTypes; idx++)
+                    {
+                        EntityType anX = new EntityType();
+                        anX.Unmarshal(dis);
+                        this._mineType.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<minefieldID>");
+                this._minefieldID.Reflection(sb);
+                sb.AppendLine("</minefieldID>");
+                sb.AppendLine("<minefieldSequence type=\"ushort\">" + this._minefieldSequence.ToString(CultureInfo.InvariantCulture) + "</minefieldSequence>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<perimeterPoints type=\"byte\">" + this._perimeterPoints.Count.ToString(CultureInfo.InvariantCulture) + "</perimeterPoints>");
+                sb.AppendLine("<minefieldType>");
+                this._minefieldType.Reflection(sb);
+                sb.AppendLine("</minefieldType>");
+                sb.AppendLine("<mineType type=\"ushort\">" + this._mineType.Count.ToString(CultureInfo.InvariantCulture) + "</mineType>");
+                sb.AppendLine("<minefieldLocation>");
+                this._minefieldLocation.Reflection(sb);
+                sb.AppendLine("</minefieldLocation>");
+                sb.AppendLine("<minefieldOrientation>");
+                this._minefieldOrientation.Reflection(sb);
+                sb.AppendLine("</minefieldOrientation>");
+                sb.AppendLine("<appearance type=\"ushort\">" + this._appearance.ToString(CultureInfo.InvariantCulture) + "</appearance>");
+                sb.AppendLine("<protocolMode type=\"ushort\">" + this._protocolMode.ToString(CultureInfo.InvariantCulture) + "</protocolMode>");
+                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                {
+                    sb.AppendLine("<perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Point\">");
+                    Point aPoint = (Point)this._perimeterPoints[idx];
+                    aPoint.Reflection(sb);
+                    sb.AppendLine("</perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._mineType.Count; idx++)
+                {
+                    sb.AppendLine("<mineType" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
+                    EntityType aEntityType = (EntityType)this._mineType[idx];
+                    aEntityType.Reflection(sb);
+                    sb.AppendLine("</mineType" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</MinefieldStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._minefieldID.Equals(obj._minefieldID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._minefieldSequence != obj._minefieldSequence)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPerimeterPoints != obj._numberOfPerimeterPoints)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._minefieldType.Equals(obj._minefieldType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfMineTypes != obj._numberOfMineTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._minefieldLocation.Equals(obj._minefieldLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._minefieldOrientation.Equals(obj._minefieldOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._appearance != obj._appearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._protocolMode != obj._protocolMode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._perimeterPoints.Count != obj._perimeterPoints.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                {
+                    if (!this._perimeterPoints[idx].Equals(obj._perimeterPoints[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._mineType.Count != obj._mineType.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._mineType.Count; idx++)
+                {
+                    if (!this._mineType[idx].Equals(obj._mineType[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldSequence.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPerimeterPoints.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldType.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfMineTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._appearance.GetHashCode();
+            result = GenerateHash(result) ^ this._protocolMode.GetHashCode();
+
+            if (this._perimeterPoints.Count > 0)
+            {
+                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._perimeterPoints[idx].GetHashCode();
+                }
+            }
+
+            if (this._mineType.Count > 0)
+            {
+                for (int idx = 0; idx < this._mineType.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._mineType[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ModulationType.cs b/Libs/CsharpDis6/Dis1998/Generated/ModulationType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ModulationType.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ModulationType.cs
index 6ec7b7b..c2e3ccb 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ModulationType.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ModulationType.cs
@@ -1,396 +1,396 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Radio modulation
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ModulationType
-    {
-        /// <summary>
-        /// spread spectrum, 16 bit boolean array
-        /// </summary>
-        private ushort _spreadSpectrum;
-
-        /// <summary>
-        /// major
-        /// </summary>
-        private ushort _major;
-
-        /// <summary>
-        /// detail
-        /// </summary>
-        private ushort _detail;
-
-        /// <summary>
-        /// system
-        /// </summary>
-        private ushort _system;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModulationType"/> class.
-        /// </summary>
-        public ModulationType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ModulationType left, ModulationType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ModulationType left, ModulationType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._spreadSpectrum
-            marshalSize += 2;  // this._major
-            marshalSize += 2;  // this._detail
-            marshalSize += 2;  // this._system
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the spread spectrum, 16 bit boolean array
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "spreadSpectrum")]
-        public ushort SpreadSpectrum
-        {
-            get
-            {
-                return this._spreadSpectrum;
-            }
-
-            set
-            {
-                this._spreadSpectrum = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the major
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "major")]
-        public ushort Major
-        {
-            get
-            {
-                return this._major;
-            }
-
-            set
-            {
-                this._major = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the detail
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "detail")]
-        public ushort Detail
-        {
-            get
-            {
-                return this._detail;
-            }
-
-            set
-            {
-                this._detail = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the system
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "system")]
-        public ushort System_
-        {
-            get
-            {
-                return this._system;
-            }
-
-            set
-            {
-                this._system = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._spreadSpectrum);
-                    dos.WriteUnsignedShort((ushort)this._major);
-                    dos.WriteUnsignedShort((ushort)this._detail);
-                    dos.WriteUnsignedShort((ushort)this._system);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._spreadSpectrum = dis.ReadUnsignedShort();
-                    this._major = dis.ReadUnsignedShort();
-                    this._detail = dis.ReadUnsignedShort();
-                    this._system = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ModulationType>");
-            try
-            {
-                sb.AppendLine("<spreadSpectrum type=\"ushort\">" + this._spreadSpectrum.ToString(CultureInfo.InvariantCulture) + "</spreadSpectrum>");
-                sb.AppendLine("<major type=\"ushort\">" + this._major.ToString(CultureInfo.InvariantCulture) + "</major>");
-                sb.AppendLine("<detail type=\"ushort\">" + this._detail.ToString(CultureInfo.InvariantCulture) + "</detail>");
-                sb.AppendLine("<system type=\"ushort\">" + this._system.ToString(CultureInfo.InvariantCulture) + "</system>");
-                sb.AppendLine("</ModulationType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ModulationType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ModulationType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._spreadSpectrum != obj._spreadSpectrum)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._major != obj._major)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._detail != obj._detail)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._system != obj._system)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._spreadSpectrum.GetHashCode();
-            result = GenerateHash(result) ^ this._major.GetHashCode();
-            result = GenerateHash(result) ^ this._detail.GetHashCode();
-            result = GenerateHash(result) ^ this._system.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Radio modulation
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ModulationType
+    {
+        /// <summary>
+        /// spread spectrum, 16 bit boolean array
+        /// </summary>
+        private ushort _spreadSpectrum;
+
+        /// <summary>
+        /// major
+        /// </summary>
+        private ushort _major;
+
+        /// <summary>
+        /// detail
+        /// </summary>
+        private ushort _detail;
+
+        /// <summary>
+        /// system
+        /// </summary>
+        private ushort _system;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModulationType"/> class.
+        /// </summary>
+        public ModulationType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ModulationType left, ModulationType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ModulationType left, ModulationType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._spreadSpectrum
+            marshalSize += 2;  // this._major
+            marshalSize += 2;  // this._detail
+            marshalSize += 2;  // this._system
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the spread spectrum, 16 bit boolean array
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "spreadSpectrum")]
+        public ushort SpreadSpectrum
+        {
+            get
+            {
+                return this._spreadSpectrum;
+            }
+
+            set
+            {
+                this._spreadSpectrum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the major
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "major")]
+        public ushort Major
+        {
+            get
+            {
+                return this._major;
+            }
+
+            set
+            {
+                this._major = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the detail
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "detail")]
+        public ushort Detail
+        {
+            get
+            {
+                return this._detail;
+            }
+
+            set
+            {
+                this._detail = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the system
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "system")]
+        public ushort System_
+        {
+            get
+            {
+                return this._system;
+            }
+
+            set
+            {
+                this._system = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._spreadSpectrum);
+                    dos.WriteUnsignedShort((ushort)this._major);
+                    dos.WriteUnsignedShort((ushort)this._detail);
+                    dos.WriteUnsignedShort((ushort)this._system);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._spreadSpectrum = dis.ReadUnsignedShort();
+                    this._major = dis.ReadUnsignedShort();
+                    this._detail = dis.ReadUnsignedShort();
+                    this._system = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ModulationType>");
+            try
+            {
+                sb.AppendLine("<spreadSpectrum type=\"ushort\">" + this._spreadSpectrum.ToString(CultureInfo.InvariantCulture) + "</spreadSpectrum>");
+                sb.AppendLine("<major type=\"ushort\">" + this._major.ToString(CultureInfo.InvariantCulture) + "</major>");
+                sb.AppendLine("<detail type=\"ushort\">" + this._detail.ToString(CultureInfo.InvariantCulture) + "</detail>");
+                sb.AppendLine("<system type=\"ushort\">" + this._system.ToString(CultureInfo.InvariantCulture) + "</system>");
+                sb.AppendLine("</ModulationType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ModulationType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ModulationType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._spreadSpectrum != obj._spreadSpectrum)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._major != obj._major)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._detail != obj._detail)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._system != obj._system)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._spreadSpectrum.GetHashCode();
+            result = GenerateHash(result) ^ this._major.GetHashCode();
+            result = GenerateHash(result) ^ this._detail.GetHashCode();
+            result = GenerateHash(result) ^ this._system.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/NamedLocation.cs b/Libs/CsharpDis6/Dis1998/Generated/NamedLocation.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/NamedLocation.cs
rename to Libs/CsharpDis6/Dis1998/Generated/NamedLocation.cs
index b4ad302..e0931e1 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/NamedLocation.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/NamedLocation.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// discrete ostional relationsihip 
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class NamedLocation
-    {
-        /// <summary>
-        /// station name enumeration
-        /// </summary>
-        private ushort _stationName;
-
-        /// <summary>
-        /// station number
-        /// </summary>
-        private ushort _stationNumber;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NamedLocation"/> class.
-        /// </summary>
-        public NamedLocation()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(NamedLocation left, NamedLocation right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(NamedLocation left, NamedLocation right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._stationName
-            marshalSize += 2;  // this._stationNumber
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the station name enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "stationName")]
-        public ushort StationName
-        {
-            get
-            {
-                return this._stationName;
-            }
-
-            set
-            {
-                this._stationName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the station number
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "stationNumber")]
-        public ushort StationNumber
-        {
-            get
-            {
-                return this._stationNumber;
-            }
-
-            set
-            {
-                this._stationNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._stationName);
-                    dos.WriteUnsignedShort((ushort)this._stationNumber);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._stationName = dis.ReadUnsignedShort();
-                    this._stationNumber = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<NamedLocation>");
-            try
-            {
-                sb.AppendLine("<stationName type=\"ushort\">" + this._stationName.ToString(CultureInfo.InvariantCulture) + "</stationName>");
-                sb.AppendLine("<stationNumber type=\"ushort\">" + this._stationNumber.ToString(CultureInfo.InvariantCulture) + "</stationNumber>");
-                sb.AppendLine("</NamedLocation>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as NamedLocation;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(NamedLocation obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._stationName != obj._stationName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stationNumber != obj._stationNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._stationName.GetHashCode();
-            result = GenerateHash(result) ^ this._stationNumber.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// discrete ostional relationsihip 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class NamedLocation
+    {
+        /// <summary>
+        /// station name enumeration
+        /// </summary>
+        private ushort _stationName;
+
+        /// <summary>
+        /// station number
+        /// </summary>
+        private ushort _stationNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NamedLocation"/> class.
+        /// </summary>
+        public NamedLocation()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(NamedLocation left, NamedLocation right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(NamedLocation left, NamedLocation right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._stationName
+            marshalSize += 2;  // this._stationNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the station name enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "stationName")]
+        public ushort StationName
+        {
+            get
+            {
+                return this._stationName;
+            }
+
+            set
+            {
+                this._stationName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the station number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "stationNumber")]
+        public ushort StationNumber
+        {
+            get
+            {
+                return this._stationNumber;
+            }
+
+            set
+            {
+                this._stationNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._stationName);
+                    dos.WriteUnsignedShort((ushort)this._stationNumber);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._stationName = dis.ReadUnsignedShort();
+                    this._stationNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<NamedLocation>");
+            try
+            {
+                sb.AppendLine("<stationName type=\"ushort\">" + this._stationName.ToString(CultureInfo.InvariantCulture) + "</stationName>");
+                sb.AppendLine("<stationNumber type=\"ushort\">" + this._stationNumber.ToString(CultureInfo.InvariantCulture) + "</stationNumber>");
+                sb.AppendLine("</NamedLocation>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as NamedLocation;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(NamedLocation obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._stationName != obj._stationName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stationNumber != obj._stationNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._stationName.GetHashCode();
+            result = GenerateHash(result) ^ this._stationNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ObjectType.cs b/Libs/CsharpDis6/Dis1998/Generated/ObjectType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ObjectType.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ObjectType.cs
index 9914357..bec410c 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ObjectType.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ObjectType.cs
@@ -1,428 +1,428 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Identifies type of object. This is a shorter version of EntityType that omits the specific and extra fields.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ObjectType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// subcategory of entity
-        /// </summary>
-        private byte _subcategory;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectType"/> class.
-        /// </summary>
-        public ObjectType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ObjectType left, ObjectType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ObjectType left, ObjectType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._subcategory
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the subcategory of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
-        public byte Subcategory
-        {
-            get
-            {
-                return this._subcategory;
-            }
-
-            set
-            {
-                this._subcategory = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._subcategory);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._subcategory = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ObjectType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
-                sb.AppendLine("</ObjectType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ObjectType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ObjectType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._subcategory != obj._subcategory)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Identifies type of object. This is a shorter version of EntityType that omits the specific and extra fields.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ObjectType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectType"/> class.
+        /// </summary>
+        public ObjectType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ObjectType left, ObjectType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ObjectType left, ObjectType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ObjectType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("</ObjectType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ObjectType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ObjectType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/OneByteChunk.cs b/Libs/CsharpDis6/Dis1998/Generated/OneByteChunk.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/OneByteChunk.cs
rename to Libs/CsharpDis6/Dis1998/Generated/OneByteChunk.cs
index 23f626d..4b85e0f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/OneByteChunk.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/OneByteChunk.cs
@@ -1,324 +1,324 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 8 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class OneByteChunk
-    {
-        /// <summary>
-        /// one byte of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[1];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OneByteChunk"/> class.
-        /// </summary>
-        public OneByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(OneByteChunk left, OneByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(OneByteChunk left, OneByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the one byte of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<OneByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</OneByteChunk>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as OneByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(OneByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 1) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 1; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            for (int idx = 0; idx < 1; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 8 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class OneByteChunk
+    {
+        /// <summary>
+        /// one byte of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[1];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OneByteChunk"/> class.
+        /// </summary>
+        public OneByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(OneByteChunk left, OneByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(OneByteChunk left, OneByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the one byte of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<OneByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</OneByteChunk>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as OneByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(OneByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 1) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 1; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            for (int idx = 0; idx < 1; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Orientation.cs b/Libs/CsharpDis6/Dis1998/Generated/Orientation.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Orientation.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Orientation.cs
index bf9b8fe..3c968ac 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Orientation.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Orientation.cs
@@ -1,355 +1,355 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.17. Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Orientation
-    {
-        private float _psi;
-
-        private float _theta;
-
-        private float _phi;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Orientation"/> class.
-        /// </summary>
-        public Orientation()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Orientation left, Orientation right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Orientation left, Orientation right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._psi
-            marshalSize += 4;  // this._theta
-            marshalSize += 4;  // this._phi
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the psi
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "psi")]
-        public float Psi
-        {
-            get
-            {
-                return this._psi;
-            }
-
-            set
-            {
-                this._psi = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the theta
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "theta")]
-        public float Theta
-        {
-            get
-            {
-                return this._theta;
-            }
-
-            set
-            {
-                this._theta = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the phi
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "phi")]
-        public float Phi
-        {
-            get
-            {
-                return this._phi;
-            }
-
-            set
-            {
-                this._phi = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._psi);
-                    dos.WriteFloat((float)this._theta);
-                    dos.WriteFloat((float)this._phi);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._psi = dis.ReadFloat();
-                    this._theta = dis.ReadFloat();
-                    this._phi = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Orientation>");
-            try
-            {
-                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
-                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
-                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
-                sb.AppendLine("</Orientation>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Orientation;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Orientation obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._psi != obj._psi)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._theta != obj._theta)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._phi != obj._phi)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._psi.GetHashCode();
-            result = GenerateHash(result) ^ this._theta.GetHashCode();
-            result = GenerateHash(result) ^ this._phi.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.17. Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Orientation
+    {
+        private float _psi;
+
+        private float _theta;
+
+        private float _phi;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Orientation"/> class.
+        /// </summary>
+        public Orientation()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Orientation left, Orientation right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Orientation left, Orientation right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._psi
+            marshalSize += 4;  // this._theta
+            marshalSize += 4;  // this._phi
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the psi
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "psi")]
+        public float Psi
+        {
+            get
+            {
+                return this._psi;
+            }
+
+            set
+            {
+                this._psi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the theta
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "theta")]
+        public float Theta
+        {
+            get
+            {
+                return this._theta;
+            }
+
+            set
+            {
+                this._theta = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the phi
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "phi")]
+        public float Phi
+        {
+            get
+            {
+                return this._phi;
+            }
+
+            set
+            {
+                this._phi = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._psi);
+                    dos.WriteFloat((float)this._theta);
+                    dos.WriteFloat((float)this._phi);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._psi = dis.ReadFloat();
+                    this._theta = dis.ReadFloat();
+                    this._phi = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Orientation>");
+            try
+            {
+                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
+                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
+                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
+                sb.AppendLine("</Orientation>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Orientation;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Orientation obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._psi != obj._psi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._theta != obj._theta)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phi != obj._phi)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._psi.GetHashCode();
+            result = GenerateHash(result) ^ this._theta.GetHashCode();
+            result = GenerateHash(result) ^ this._phi.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Pdu.cs b/Libs/CsharpDis6/Dis1998/Generated/Pdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Pdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Pdu.cs
index c20952c..8e5a567 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Pdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Pdu.cs
@@ -1,492 +1,492 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// The superclass for all PDUs. This incorporates the PduHeader record, section 5.2.29.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Pdu : PduBase, IPdu
-    {
-        /// <summary>
-        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998.
-        /// </summary>
-        private byte _protocolVersion = 6;
-
-        /// <summary>
-        /// Exercise ID
-        /// </summary>
-        private byte _exerciseID;
-
-        /// <summary>
-        /// Type of pdu, unique for each PDU class
-        /// </summary>
-        private byte _pduType;
-
-        /// <summary>
-        /// value that refers to the protocol family, eg SimulationManagement, et
-        /// </summary>
-        private byte _protocolFamily;
-
-        /// <summary>
-        /// Timestamp value
-        /// </summary>
-        private uint _timestamp;
-
-        /// <summary>
-        /// Length, in bytes, of the PDU
-        /// </summary>
-        private ushort _length;
-
-        /// <summary>
-        /// zero-filled array of padding
-        /// </summary>
-        private short _padding;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Pdu"/> class.
-        /// </summary>
-        public Pdu()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Pdu left, Pdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Pdu left, Pdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._protocolVersion
-            marshalSize += 1;  // this._exerciseID
-            marshalSize += 1;  // this._pduType
-            marshalSize += 1;  // this._protocolFamily
-            marshalSize += 4;  // this._timestamp
-            marshalSize += 2;  // this._length
-            marshalSize += 2;  // this._padding
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
-        public byte ProtocolVersion
-        {
-            get
-            {
-                return this._protocolVersion;
-            }
-
-            set
-            {
-                this._protocolVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Exercise ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
-        public byte ExerciseID
-        {
-            get
-            {
-                return this._exerciseID;
-            }
-
-            set
-            {
-                this._exerciseID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of pdu, unique for each PDU class
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
-        public byte PduType
-        {
-            get
-            {
-                return this._pduType;
-            }
-
-            set
-            {
-                this._pduType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, et
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
-        public byte ProtocolFamily
-        {
-            get
-            {
-                return this._protocolFamily;
-            }
-
-            set
-            {
-                this._protocolFamily = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Timestamp value
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
-        public uint Timestamp
-        {
-            get
-            {
-                return this._timestamp;
-            }
-
-            set
-            {
-                this._timestamp = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Length, in bytes, of the PDU
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "length")]
-        public ushort Length
-        {
-            get
-            {
-                return this._length;
-            }
-
-            set
-            {
-                this._length = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the zero-filled array of padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding")]
-        public short Padding
-        {
-            get
-            {
-                return this._padding;
-            }
-
-            set
-            {
-                this._padding = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._protocolVersion);
-                    dos.WriteUnsignedByte((byte)this._exerciseID);
-                    dos.WriteUnsignedByte((byte)this._pduType);
-                    dos.WriteUnsignedByte((byte)this._protocolFamily);
-                    dos.WriteUnsignedInt((uint)this._timestamp);
-                    dos.WriteUnsignedShort((ushort)this._length);
-                    dos.WriteShort((short)this._padding);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._protocolVersion = dis.ReadUnsignedByte();
-                    this._exerciseID = dis.ReadUnsignedByte();
-                    this._pduType = dis.ReadUnsignedByte();
-                    this._protocolFamily = dis.ReadUnsignedByte();
-                    this._timestamp = dis.ReadUnsignedInt();
-                    this._length = dis.ReadUnsignedShort();
-                    this._padding = dis.ReadShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Pdu>");
-            try
-            {
-                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
-                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
-                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
-                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
-                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
-                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
-                sb.AppendLine("<padding type=\"short\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
-                sb.AppendLine("</Pdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Pdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Pdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._protocolVersion != obj._protocolVersion)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._exerciseID != obj._exerciseID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pduType != obj._pduType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._protocolFamily != obj._protocolFamily)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._timestamp != obj._timestamp)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._length != obj._length)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding != obj._padding)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
-            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
-            result = GenerateHash(result) ^ this._pduType.GetHashCode();
-            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
-            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
-            result = GenerateHash(result) ^ this._length.GetHashCode();
-            result = GenerateHash(result) ^ this._padding.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// The superclass for all PDUs. This incorporates the PduHeader record, section 5.2.29.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Pdu : PduBase, IPdu
+    {
+        /// <summary>
+        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998.
+        /// </summary>
+        private byte _protocolVersion = 6;
+
+        /// <summary>
+        /// Exercise ID
+        /// </summary>
+        private byte _exerciseID;
+
+        /// <summary>
+        /// Type of pdu, unique for each PDU class
+        /// </summary>
+        private byte _pduType;
+
+        /// <summary>
+        /// value that refers to the protocol family, eg SimulationManagement, et
+        /// </summary>
+        private byte _protocolFamily;
+
+        /// <summary>
+        /// Timestamp value
+        /// </summary>
+        private uint _timestamp;
+
+        /// <summary>
+        /// Length, in bytes, of the PDU
+        /// </summary>
+        private ushort _length;
+
+        /// <summary>
+        /// zero-filled array of padding
+        /// </summary>
+        private short _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pdu"/> class.
+        /// </summary>
+        public Pdu()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Pdu left, Pdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Pdu left, Pdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._protocolVersion
+            marshalSize += 1;  // this._exerciseID
+            marshalSize += 1;  // this._pduType
+            marshalSize += 1;  // this._protocolFamily
+            marshalSize += 4;  // this._timestamp
+            marshalSize += 2;  // this._length
+            marshalSize += 2;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
+        public byte ProtocolVersion
+        {
+            get
+            {
+                return this._protocolVersion;
+            }
+
+            set
+            {
+                this._protocolVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Exercise ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
+        public byte ExerciseID
+        {
+            get
+            {
+                return this._exerciseID;
+            }
+
+            set
+            {
+                this._exerciseID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of pdu, unique for each PDU class
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
+        public byte PduType
+        {
+            get
+            {
+                return this._pduType;
+            }
+
+            set
+            {
+                this._pduType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, et
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
+        public byte ProtocolFamily
+        {
+            get
+            {
+                return this._protocolFamily;
+            }
+
+            set
+            {
+                this._protocolFamily = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Timestamp value
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
+        public uint Timestamp
+        {
+            get
+            {
+                return this._timestamp;
+            }
+
+            set
+            {
+                this._timestamp = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length, in bytes, of the PDU
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "length")]
+        public ushort Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the zero-filled array of padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding")]
+        public short Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._protocolVersion);
+                    dos.WriteUnsignedByte((byte)this._exerciseID);
+                    dos.WriteUnsignedByte((byte)this._pduType);
+                    dos.WriteUnsignedByte((byte)this._protocolFamily);
+                    dos.WriteUnsignedInt((uint)this._timestamp);
+                    dos.WriteUnsignedShort((ushort)this._length);
+                    dos.WriteShort((short)this._padding);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._protocolVersion = dis.ReadUnsignedByte();
+                    this._exerciseID = dis.ReadUnsignedByte();
+                    this._pduType = dis.ReadUnsignedByte();
+                    this._protocolFamily = dis.ReadUnsignedByte();
+                    this._timestamp = dis.ReadUnsignedInt();
+                    this._length = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Pdu>");
+            try
+            {
+                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
+                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
+                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
+                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
+                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
+                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("<padding type=\"short\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</Pdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Pdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Pdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._protocolVersion != obj._protocolVersion)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._exerciseID != obj._exerciseID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduType != obj._pduType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._protocolFamily != obj._protocolFamily)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timestamp != obj._timestamp)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
+            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
+            result = GenerateHash(result) ^ this._pduType.GetHashCode();
+            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
+            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PduContainer.cs b/Libs/CsharpDis6/Dis1998/Generated/PduContainer.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/PduContainer.cs
rename to Libs/CsharpDis6/Dis1998/Generated/PduContainer.cs
index 65e4911..86122d0 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PduContainer.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/PduContainer.cs
@@ -1,374 +1,374 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Used for XML compatability. A container that holds PDUs
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(Pdu))]
-    public partial class PduContainer
-    {
-        /// <summary>
-        /// Number of PDUs in the container list
-        /// </summary>
-        private int _numberOfPdus;
-
-        /// <summary>
-        /// record sets
-        /// </summary>
-        private List<Pdu> _pdus = new List<Pdu>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PduContainer"/> class.
-        /// </summary>
-        public PduContainer()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PduContainer left, PduContainer right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PduContainer left, PduContainer right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._numberOfPdus
-            for (int idx = 0; idx < this._pdus.Count; idx++)
-            {
-                Pdu listElement = (Pdu)this._pdus[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of PDUs in the container list
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPdus method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(int), ElementName = "numberOfPdus")]
-        public int NumberOfPdus
-        {
-            get
-            {
-                return this._numberOfPdus;
-            }
-
-            set
-            {
-                this._numberOfPdus = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the record sets
-        /// </summary>
-        [XmlElement(ElementName = "pdusList", Type = typeof(List<Pdu>))]
-        public List<Pdu> Pdus
-        {
-            get
-            {
-                return this._pdus;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteInt((int)this._pdus.Count);
-
-                    for (int idx = 0; idx < this._pdus.Count; idx++)
-                    {
-                        Pdu aPdu = (Pdu)this._pdus[idx];
-                        aPdu.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._numberOfPdus = dis.ReadInt();
-
-                    for (int idx = 0; idx < this.NumberOfPdus; idx++)
-                    {
-                        Pdu anX = new Pdu();
-                        anX.Unmarshal(dis);
-                        this._pdus.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PduContainer>");
-            try
-            {
-                sb.AppendLine("<pdus type=\"int\">" + this._pdus.Count.ToString(CultureInfo.InvariantCulture) + "</pdus>");
-                for (int idx = 0; idx < this._pdus.Count; idx++)
-                {
-                    sb.AppendLine("<pdus" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Pdu\">");
-                    Pdu aPdu = (Pdu)this._pdus[idx];
-                    aPdu.Reflection(sb);
-                    sb.AppendLine("</pdus" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</PduContainer>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PduContainer;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PduContainer obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._numberOfPdus != obj._numberOfPdus)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pdus.Count != obj._pdus.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._pdus.Count; idx++)
-                {
-                    if (!this._pdus[idx].Equals(obj._pdus[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._numberOfPdus.GetHashCode();
-
-            if (this._pdus.Count > 0)
-            {
-                for (int idx = 0; idx < this._pdus.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._pdus[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Used for XML compatability. A container that holds PDUs
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Pdu))]
+    public partial class PduContainer
+    {
+        /// <summary>
+        /// Number of PDUs in the container list
+        /// </summary>
+        private int _numberOfPdus;
+
+        /// <summary>
+        /// record sets
+        /// </summary>
+        private List<Pdu> _pdus = new List<Pdu>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PduContainer"/> class.
+        /// </summary>
+        public PduContainer()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PduContainer left, PduContainer right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PduContainer left, PduContainer right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._numberOfPdus
+            for (int idx = 0; idx < this._pdus.Count; idx++)
+            {
+                Pdu listElement = (Pdu)this._pdus[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of PDUs in the container list
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPdus method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(int), ElementName = "numberOfPdus")]
+        public int NumberOfPdus
+        {
+            get
+            {
+                return this._numberOfPdus;
+            }
+
+            set
+            {
+                this._numberOfPdus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the record sets
+        /// </summary>
+        [XmlElement(ElementName = "pdusList", Type = typeof(List<Pdu>))]
+        public List<Pdu> Pdus
+        {
+            get
+            {
+                return this._pdus;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteInt((int)this._pdus.Count);
+
+                    for (int idx = 0; idx < this._pdus.Count; idx++)
+                    {
+                        Pdu aPdu = (Pdu)this._pdus[idx];
+                        aPdu.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfPdus = dis.ReadInt();
+
+                    for (int idx = 0; idx < this.NumberOfPdus; idx++)
+                    {
+                        Pdu anX = new Pdu();
+                        anX.Unmarshal(dis);
+                        this._pdus.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PduContainer>");
+            try
+            {
+                sb.AppendLine("<pdus type=\"int\">" + this._pdus.Count.ToString(CultureInfo.InvariantCulture) + "</pdus>");
+                for (int idx = 0; idx < this._pdus.Count; idx++)
+                {
+                    sb.AppendLine("<pdus" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Pdu\">");
+                    Pdu aPdu = (Pdu)this._pdus[idx];
+                    aPdu.Reflection(sb);
+                    sb.AppendLine("</pdus" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</PduContainer>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PduContainer;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PduContainer obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._numberOfPdus != obj._numberOfPdus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pdus.Count != obj._pdus.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._pdus.Count; idx++)
+                {
+                    if (!this._pdus[idx].Equals(obj._pdus[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfPdus.GetHashCode();
+
+            if (this._pdus.Count > 0)
+            {
+                for (int idx = 0; idx < this._pdus.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._pdus[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Point.cs b/Libs/CsharpDis6/Dis1998/Generated/Point.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Point.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Point.cs
index e58d939..f75ce65 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Point.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Point.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// x,y point
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Point
-    {
-        /// <summary>
-        /// x
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// y
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Point"/> class.
-        /// </summary>
-        public Point()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Point left, Point right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Point left, Point right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the x
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Point>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("</Point>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Point;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Point obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// x,y point
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Point
+    {
+        /// <summary>
+        /// x
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// y
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Point"/> class.
+        /// </summary>
+        public Point()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Point left, Point right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Point left, Point right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the x
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Point>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("</Point>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Point;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Point obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/PointObjectStatePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/PointObjectStatePdu.cs
index 91923aa..90176dd 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PointObjectStatePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/PointObjectStatePdu.cs
@@ -1,675 +1,675 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.11.3: Inormation abut the addition or modification of a synthecic enviroment object that is anchored      to the terrain with a single point. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(ObjectType))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Orientation))]
-    [XmlInclude(typeof(SimulationAddress))]
-    public partial class PointObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<PointObjectStatePdu>
-    {
-        /// <summary>
-        /// Object in synthetic environment
-        /// </summary>
-        private EntityID _objectID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _referencedObjectID = new EntityID();
-
-        /// <summary>
-        /// unique update number of each state transition of an object
-        /// </summary>
-        private ushort _updateNumber;
-
-        /// <summary>
-        /// force ID
-        /// </summary>
-        private byte _forceID;
-
-        /// <summary>
-        /// modifications
-        /// </summary>
-        private byte _modifications;
-
-        /// <summary>
-        /// Object type
-        /// </summary>
-        private ObjectType _objectType = new ObjectType();
-
-        /// <summary>
-        /// Object location
-        /// </summary>
-        private Vector3Double _objectLocation = new Vector3Double();
-
-        /// <summary>
-        /// Object orientation
-        /// </summary>
-        private Orientation _objectOrientation = new Orientation();
-
-        /// <summary>
-        /// Object apperance
-        /// </summary>
-        private double _objectAppearance;
-
-        /// <summary>
-        /// requesterID
-        /// </summary>
-        private SimulationAddress _requesterID = new SimulationAddress();
-
-        /// <summary>
-        /// receiver ID
-        /// </summary>
-        private SimulationAddress _receivingID = new SimulationAddress();
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _pad2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PointObjectStatePdu"/> class.
-        /// </summary>
-        public PointObjectStatePdu()
-        {
-            PduType = (byte)43;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PointObjectStatePdu left, PointObjectStatePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PointObjectStatePdu left, PointObjectStatePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
-            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
-            marshalSize += 2;  // this._updateNumber
-            marshalSize += 1;  // this._forceID
-            marshalSize += 1;  // this._modifications
-            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
-            marshalSize += this._objectLocation.GetMarshalledSize();  // this._objectLocation
-            marshalSize += this._objectOrientation.GetMarshalledSize();  // this._objectOrientation
-            marshalSize += 8;  // this._objectAppearance
-            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
-            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
-            marshalSize += 4;  // this._pad2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object in synthetic environment
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
-        public EntityID ObjectID
-        {
-            get
-            {
-                return this._objectID;
-            }
-
-            set
-            {
-                this._objectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
-        public EntityID ReferencedObjectID
-        {
-            get
-            {
-                return this._referencedObjectID;
-            }
-
-            set
-            {
-                this._referencedObjectID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique update number of each state transition of an object
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
-        public ushort UpdateNumber
-        {
-            get
-            {
-                return this._updateNumber;
-            }
-
-            set
-            {
-                this._updateNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the force ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
-        public byte ForceID
-        {
-            get
-            {
-                return this._forceID;
-            }
-
-            set
-            {
-                this._forceID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the modifications
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
-        public byte Modifications
-        {
-            get
-            {
-                return this._modifications;
-            }
-
-            set
-            {
-                this._modifications = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object type
-        /// </summary>
-        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
-        public ObjectType ObjectType
-        {
-            get
-            {
-                return this._objectType;
-            }
-
-            set
-            {
-                this._objectType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object location
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "objectLocation")]
-        public Vector3Double ObjectLocation
-        {
-            get
-            {
-                return this._objectLocation;
-            }
-
-            set
-            {
-                this._objectLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object orientation
-        /// </summary>
-        [XmlElement(Type = typeof(Orientation), ElementName = "objectOrientation")]
-        public Orientation ObjectOrientation
-        {
-            get
-            {
-                return this._objectOrientation;
-            }
-
-            set
-            {
-                this._objectOrientation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object apperance
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "objectAppearance")]
-        public double ObjectAppearance
-        {
-            get
-            {
-                return this._objectAppearance;
-            }
-
-            set
-            {
-                this._objectAppearance = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the requesterID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
-        public SimulationAddress RequesterID
-        {
-            get
-            {
-                return this._requesterID;
-            }
-
-            set
-            {
-                this._requesterID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receiver ID
-        /// </summary>
-        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
-        public SimulationAddress ReceivingID
-        {
-            get
-            {
-                return this._receivingID;
-            }
-
-            set
-            {
-                this._receivingID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "pad2")]
-        public uint Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._objectID.Marshal(dos);
-                    this._referencedObjectID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._updateNumber);
-                    dos.WriteUnsignedByte((byte)this._forceID);
-                    dos.WriteUnsignedByte((byte)this._modifications);
-                    this._objectType.Marshal(dos);
-                    this._objectLocation.Marshal(dos);
-                    this._objectOrientation.Marshal(dos);
-                    dos.WriteDouble((double)this._objectAppearance);
-                    this._requesterID.Marshal(dos);
-                    this._receivingID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._pad2);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._objectID.Unmarshal(dis);
-                    this._referencedObjectID.Unmarshal(dis);
-                    this._updateNumber = dis.ReadUnsignedShort();
-                    this._forceID = dis.ReadUnsignedByte();
-                    this._modifications = dis.ReadUnsignedByte();
-                    this._objectType.Unmarshal(dis);
-                    this._objectLocation.Unmarshal(dis);
-                    this._objectOrientation.Unmarshal(dis);
-                    this._objectAppearance = dis.ReadDouble();
-                    this._requesterID.Unmarshal(dis);
-                    this._receivingID.Unmarshal(dis);
-                    this._pad2 = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PointObjectStatePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<objectID>");
-                this._objectID.Reflection(sb);
-                sb.AppendLine("</objectID>");
-                sb.AppendLine("<referencedObjectID>");
-                this._referencedObjectID.Reflection(sb);
-                sb.AppendLine("</referencedObjectID>");
-                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
-                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
-                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
-                sb.AppendLine("<objectType>");
-                this._objectType.Reflection(sb);
-                sb.AppendLine("</objectType>");
-                sb.AppendLine("<objectLocation>");
-                this._objectLocation.Reflection(sb);
-                sb.AppendLine("</objectLocation>");
-                sb.AppendLine("<objectOrientation>");
-                this._objectOrientation.Reflection(sb);
-                sb.AppendLine("</objectOrientation>");
-                sb.AppendLine("<objectAppearance type=\"double\">" + this._objectAppearance.ToString(CultureInfo.InvariantCulture) + "</objectAppearance>");
-                sb.AppendLine("<requesterID>");
-                this._requesterID.Reflection(sb);
-                sb.AppendLine("</requesterID>");
-                sb.AppendLine("<receivingID>");
-                this._receivingID.Reflection(sb);
-                sb.AppendLine("</receivingID>");
-                sb.AppendLine("<pad2 type=\"uint\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("</PointObjectStatePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PointObjectStatePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PointObjectStatePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._objectID.Equals(obj._objectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._updateNumber != obj._updateNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._forceID != obj._forceID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modifications != obj._modifications)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectType.Equals(obj._objectType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectLocation.Equals(obj._objectLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._objectOrientation.Equals(obj._objectOrientation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._objectAppearance != obj._objectAppearance)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._requesterID.Equals(obj._requesterID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingID.Equals(obj._receivingID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._objectID.GetHashCode();
-            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
-            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._forceID.GetHashCode();
-            result = GenerateHash(result) ^ this._modifications.GetHashCode();
-            result = GenerateHash(result) ^ this._objectType.GetHashCode();
-            result = GenerateHash(result) ^ this._objectLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._objectOrientation.GetHashCode();
-            result = GenerateHash(result) ^ this._objectAppearance.GetHashCode();
-            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.11.3: Inormation abut the addition or modification of a synthecic enviroment object that is anchored      to the terrain with a single point. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(ObjectType))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Orientation))]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class PointObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<PointObjectStatePdu>
+    {
+        /// <summary>
+        /// Object in synthetic environment
+        /// </summary>
+        private EntityID _objectID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _referencedObjectID = new EntityID();
+
+        /// <summary>
+        /// unique update number of each state transition of an object
+        /// </summary>
+        private ushort _updateNumber;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// modifications
+        /// </summary>
+        private byte _modifications;
+
+        /// <summary>
+        /// Object type
+        /// </summary>
+        private ObjectType _objectType = new ObjectType();
+
+        /// <summary>
+        /// Object location
+        /// </summary>
+        private Vector3Double _objectLocation = new Vector3Double();
+
+        /// <summary>
+        /// Object orientation
+        /// </summary>
+        private Orientation _objectOrientation = new Orientation();
+
+        /// <summary>
+        /// Object apperance
+        /// </summary>
+        private double _objectAppearance;
+
+        /// <summary>
+        /// requesterID
+        /// </summary>
+        private SimulationAddress _requesterID = new SimulationAddress();
+
+        /// <summary>
+        /// receiver ID
+        /// </summary>
+        private SimulationAddress _receivingID = new SimulationAddress();
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _pad2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PointObjectStatePdu"/> class.
+        /// </summary>
+        public PointObjectStatePdu()
+        {
+            PduType = (byte)43;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PointObjectStatePdu left, PointObjectStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PointObjectStatePdu left, PointObjectStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
+            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
+            marshalSize += 2;  // this._updateNumber
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._modifications
+            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
+            marshalSize += this._objectLocation.GetMarshalledSize();  // this._objectLocation
+            marshalSize += this._objectOrientation.GetMarshalledSize();  // this._objectOrientation
+            marshalSize += 8;  // this._objectAppearance
+            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += 4;  // this._pad2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object in synthetic environment
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
+        public EntityID ObjectID
+        {
+            get
+            {
+                return this._objectID;
+            }
+
+            set
+            {
+                this._objectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
+        public EntityID ReferencedObjectID
+        {
+            get
+            {
+                return this._referencedObjectID;
+            }
+
+            set
+            {
+                this._referencedObjectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique update number of each state transition of an object
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
+        public ushort UpdateNumber
+        {
+            get
+            {
+                return this._updateNumber;
+            }
+
+            set
+            {
+                this._updateNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modifications
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
+        public byte Modifications
+        {
+            get
+            {
+                return this._modifications;
+            }
+
+            set
+            {
+                this._modifications = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object type
+        /// </summary>
+        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
+        public ObjectType ObjectType
+        {
+            get
+            {
+                return this._objectType;
+            }
+
+            set
+            {
+                this._objectType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object location
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "objectLocation")]
+        public Vector3Double ObjectLocation
+        {
+            get
+            {
+                return this._objectLocation;
+            }
+
+            set
+            {
+                this._objectLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object orientation
+        /// </summary>
+        [XmlElement(Type = typeof(Orientation), ElementName = "objectOrientation")]
+        public Orientation ObjectOrientation
+        {
+            get
+            {
+                return this._objectOrientation;
+            }
+
+            set
+            {
+                this._objectOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object apperance
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "objectAppearance")]
+        public double ObjectAppearance
+        {
+            get
+            {
+                return this._objectAppearance;
+            }
+
+            set
+            {
+                this._objectAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the requesterID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
+        public SimulationAddress RequesterID
+        {
+            get
+            {
+                return this._requesterID;
+            }
+
+            set
+            {
+                this._requesterID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receiver ID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
+        public SimulationAddress ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "pad2")]
+        public uint Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._objectID.Marshal(dos);
+                    this._referencedObjectID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._updateNumber);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._modifications);
+                    this._objectType.Marshal(dos);
+                    this._objectLocation.Marshal(dos);
+                    this._objectOrientation.Marshal(dos);
+                    dos.WriteDouble((double)this._objectAppearance);
+                    this._requesterID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._pad2);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._objectID.Unmarshal(dis);
+                    this._referencedObjectID.Unmarshal(dis);
+                    this._updateNumber = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._modifications = dis.ReadUnsignedByte();
+                    this._objectType.Unmarshal(dis);
+                    this._objectLocation.Unmarshal(dis);
+                    this._objectOrientation.Unmarshal(dis);
+                    this._objectAppearance = dis.ReadDouble();
+                    this._requesterID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._pad2 = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PointObjectStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<objectID>");
+                this._objectID.Reflection(sb);
+                sb.AppendLine("</objectID>");
+                sb.AppendLine("<referencedObjectID>");
+                this._referencedObjectID.Reflection(sb);
+                sb.AppendLine("</referencedObjectID>");
+                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
+                sb.AppendLine("<objectType>");
+                this._objectType.Reflection(sb);
+                sb.AppendLine("</objectType>");
+                sb.AppendLine("<objectLocation>");
+                this._objectLocation.Reflection(sb);
+                sb.AppendLine("</objectLocation>");
+                sb.AppendLine("<objectOrientation>");
+                this._objectOrientation.Reflection(sb);
+                sb.AppendLine("</objectOrientation>");
+                sb.AppendLine("<objectAppearance type=\"double\">" + this._objectAppearance.ToString(CultureInfo.InvariantCulture) + "</objectAppearance>");
+                sb.AppendLine("<requesterID>");
+                this._requesterID.Reflection(sb);
+                sb.AppendLine("</requesterID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<pad2 type=\"uint\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("</PointObjectStatePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PointObjectStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PointObjectStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._objectID.Equals(obj._objectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._updateNumber != obj._updateNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modifications != obj._modifications)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectType.Equals(obj._objectType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectLocation.Equals(obj._objectLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectOrientation.Equals(obj._objectOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._objectAppearance != obj._objectAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requesterID.Equals(obj._requesterID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._objectID.GetHashCode();
+            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
+            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._modifications.GetHashCode();
+            result = GenerateHash(result) ^ this._objectType.GetHashCode();
+            result = GenerateHash(result) ^ this._objectLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._objectOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._objectAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PropulsionSystemData.cs b/Libs/CsharpDis6/Dis1998/Generated/PropulsionSystemData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/PropulsionSystemData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/PropulsionSystemData.cs
index 9583113..0e24a94 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/PropulsionSystemData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/PropulsionSystemData.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Data about a propulsion system
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class PropulsionSystemData
-    {
-        /// <summary>
-        /// powerSetting
-        /// </summary>
-        private float _powerSetting;
-
-        /// <summary>
-        /// engine RPMs
-        /// </summary>
-        private float _engineRpm;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropulsionSystemData"/> class.
-        /// </summary>
-        public PropulsionSystemData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PropulsionSystemData left, PropulsionSystemData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PropulsionSystemData left, PropulsionSystemData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._powerSetting
-            marshalSize += 4;  // this._engineRpm
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the powerSetting
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "powerSetting")]
-        public float PowerSetting
-        {
-            get
-            {
-                return this._powerSetting;
-            }
-
-            set
-            {
-                this._powerSetting = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the engine RPMs
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "engineRpm")]
-        public float EngineRpm
-        {
-            get
-            {
-                return this._engineRpm;
-            }
-
-            set
-            {
-                this._engineRpm = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._powerSetting);
-                    dos.WriteFloat((float)this._engineRpm);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._powerSetting = dis.ReadFloat();
-                    this._engineRpm = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<PropulsionSystemData>");
-            try
-            {
-                sb.AppendLine("<powerSetting type=\"float\">" + this._powerSetting.ToString(CultureInfo.InvariantCulture) + "</powerSetting>");
-                sb.AppendLine("<engineRpm type=\"float\">" + this._engineRpm.ToString(CultureInfo.InvariantCulture) + "</engineRpm>");
-                sb.AppendLine("</PropulsionSystemData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as PropulsionSystemData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PropulsionSystemData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._powerSetting != obj._powerSetting)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._engineRpm != obj._engineRpm)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._powerSetting.GetHashCode();
-            result = GenerateHash(result) ^ this._engineRpm.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Data about a propulsion system
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class PropulsionSystemData
+    {
+        /// <summary>
+        /// powerSetting
+        /// </summary>
+        private float _powerSetting;
+
+        /// <summary>
+        /// engine RPMs
+        /// </summary>
+        private float _engineRpm;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PropulsionSystemData"/> class.
+        /// </summary>
+        public PropulsionSystemData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PropulsionSystemData left, PropulsionSystemData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PropulsionSystemData left, PropulsionSystemData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._powerSetting
+            marshalSize += 4;  // this._engineRpm
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the powerSetting
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "powerSetting")]
+        public float PowerSetting
+        {
+            get
+            {
+                return this._powerSetting;
+            }
+
+            set
+            {
+                this._powerSetting = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the engine RPMs
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "engineRpm")]
+        public float EngineRpm
+        {
+            get
+            {
+                return this._engineRpm;
+            }
+
+            set
+            {
+                this._engineRpm = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._powerSetting);
+                    dos.WriteFloat((float)this._engineRpm);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._powerSetting = dis.ReadFloat();
+                    this._engineRpm = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PropulsionSystemData>");
+            try
+            {
+                sb.AppendLine("<powerSetting type=\"float\">" + this._powerSetting.ToString(CultureInfo.InvariantCulture) + "</powerSetting>");
+                sb.AppendLine("<engineRpm type=\"float\">" + this._engineRpm.ToString(CultureInfo.InvariantCulture) + "</engineRpm>");
+                sb.AppendLine("</PropulsionSystemData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PropulsionSystemData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PropulsionSystemData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._powerSetting != obj._powerSetting)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._engineRpm != obj._engineRpm)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._powerSetting.GetHashCode();
+            result = GenerateHash(result) ^ this._engineRpm.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
index 76f60de..2f685e3 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RadioCommunicationsFamilyPdu.cs
@@ -1,339 +1,339 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.8. Abstract superclass for radio communications PDUs.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RadioCommunicationsFamilyPdu : Pdu, IEquatable<RadioCommunicationsFamilyPdu>
-    {
-        /// <summary>
-        /// ID of the entitythat is the source of the communication
-        /// </summary>
-        private EntityID _entityId = new EntityID();
-
-        /// <summary>
-        /// particular radio within an entity
-        /// </summary>
-        private ushort _radioId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioCommunicationsFamilyPdu"/> class.
-        /// </summary>
-        public RadioCommunicationsFamilyPdu()
-        {
-            ProtocolFamily = (byte)4;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
-            marshalSize += 2;  // this._radioId
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entitythat is the source of the communication
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
-        public EntityID EntityId
-        {
-            get
-            {
-                return this._entityId;
-            }
-
-            set
-            {
-                this._entityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the particular radio within an entity
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "radioId")]
-        public ushort RadioId
-        {
-            get
-            {
-                return this._radioId;
-            }
-
-            set
-            {
-                this._radioId = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._entityId.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._radioId);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityId.Unmarshal(dis);
-                    this._radioId = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RadioCommunicationsFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<entityId>");
-                this._entityId.Reflection(sb);
-                sb.AppendLine("</entityId>");
-                sb.AppendLine("<radioId type=\"ushort\">" + this._radioId.ToString(CultureInfo.InvariantCulture) + "</radioId>");
-                sb.AppendLine("</RadioCommunicationsFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RadioCommunicationsFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioCommunicationsFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._entityId.Equals(obj._entityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._radioId != obj._radioId)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._entityId.GetHashCode();
-            result = GenerateHash(result) ^ this._radioId.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.8. Abstract superclass for radio communications PDUs.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RadioCommunicationsFamilyPdu : Pdu, IEquatable<RadioCommunicationsFamilyPdu>
+    {
+        /// <summary>
+        /// ID of the entitythat is the source of the communication
+        /// </summary>
+        private EntityID _entityId = new EntityID();
+
+        /// <summary>
+        /// particular radio within an entity
+        /// </summary>
+        private ushort _radioId;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioCommunicationsFamilyPdu"/> class.
+        /// </summary>
+        public RadioCommunicationsFamilyPdu()
+        {
+            ProtocolFamily = (byte)4;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
+            marshalSize += 2;  // this._radioId
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entitythat is the source of the communication
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
+        public EntityID EntityId
+        {
+            get
+            {
+                return this._entityId;
+            }
+
+            set
+            {
+                this._entityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the particular radio within an entity
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "radioId")]
+        public ushort RadioId
+        {
+            get
+            {
+                return this._radioId;
+            }
+
+            set
+            {
+                this._radioId = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityId.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._radioId);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityId.Unmarshal(dis);
+                    this._radioId = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RadioCommunicationsFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityId>");
+                this._entityId.Reflection(sb);
+                sb.AppendLine("</entityId>");
+                sb.AppendLine("<radioId type=\"ushort\">" + this._radioId.ToString(CultureInfo.InvariantCulture) + "</radioId>");
+                sb.AppendLine("</RadioCommunicationsFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RadioCommunicationsFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioCommunicationsFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityId.Equals(obj._entityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._radioId != obj._radioId)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityId.GetHashCode();
+            result = GenerateHash(result) ^ this._radioId.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioEntityType.cs b/Libs/CsharpDis6/Dis1998/Generated/RadioEntityType.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioEntityType.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RadioEntityType.cs
index 2bcea85..d3e6423 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RadioEntityType.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RadioEntityType.cs
@@ -1,457 +1,457 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.25. Identifies the type of radio
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RadioEntityType
-    {
-        /// <summary>
-        /// Kind of entity
-        /// </summary>
-        private byte _entityKind;
-
-        /// <summary>
-        /// Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        private byte _domain;
-
-        /// <summary>
-        /// country to which the design of the entity is attributed
-        /// </summary>
-        private ushort _country;
-
-        /// <summary>
-        /// category of entity
-        /// </summary>
-        private byte _category;
-
-        /// <summary>
-        /// specific info based on subcategory field
-        /// </summary>
-        private byte _nomenclatureVersion;
-
-        private ushort _nomenclature;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadioEntityType"/> class.
-        /// </summary>
-        public RadioEntityType()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioEntityType left, RadioEntityType right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioEntityType left, RadioEntityType right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._entityKind
-            marshalSize += 1;  // this._domain
-            marshalSize += 2;  // this._country
-            marshalSize += 1;  // this._category
-            marshalSize += 1;  // this._nomenclatureVersion
-            marshalSize += 2;  // this._nomenclature
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Kind of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
-        public byte EntityKind
-        {
-            get
-            {
-                return this._entityKind;
-            }
-
-            set
-            {
-                this._entityKind = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "domain")]
-        public byte Domain
-        {
-            get
-            {
-                return this._domain;
-            }
-
-            set
-            {
-                this._domain = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the country to which the design of the entity is attributed
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "country")]
-        public ushort Country
-        {
-            get
-            {
-                return this._country;
-            }
-
-            set
-            {
-                this._country = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the category of entity
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "category")]
-        public byte Category
-        {
-            get
-            {
-                return this._category;
-            }
-
-            set
-            {
-                this._category = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the specific info based on subcategory field
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "nomenclatureVersion")]
-        public byte NomenclatureVersion
-        {
-            get
-            {
-                return this._nomenclatureVersion;
-            }
-
-            set
-            {
-                this._nomenclatureVersion = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the nomenclature
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "nomenclature")]
-        public ushort Nomenclature
-        {
-            get
-            {
-                return this._nomenclature;
-            }
-
-            set
-            {
-                this._nomenclature = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._entityKind);
-                    dos.WriteUnsignedByte((byte)this._domain);
-                    dos.WriteUnsignedShort((ushort)this._country);
-                    dos.WriteUnsignedByte((byte)this._category);
-                    dos.WriteUnsignedByte((byte)this._nomenclatureVersion);
-                    dos.WriteUnsignedShort((ushort)this._nomenclature);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._entityKind = dis.ReadUnsignedByte();
-                    this._domain = dis.ReadUnsignedByte();
-                    this._country = dis.ReadUnsignedShort();
-                    this._category = dis.ReadUnsignedByte();
-                    this._nomenclatureVersion = dis.ReadUnsignedByte();
-                    this._nomenclature = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RadioEntityType>");
-            try
-            {
-                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
-                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
-                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
-                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
-                sb.AppendLine("<nomenclatureVersion type=\"byte\">" + this._nomenclatureVersion.ToString(CultureInfo.InvariantCulture) + "</nomenclatureVersion>");
-                sb.AppendLine("<nomenclature type=\"ushort\">" + this._nomenclature.ToString(CultureInfo.InvariantCulture) + "</nomenclature>");
-                sb.AppendLine("</RadioEntityType>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RadioEntityType;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioEntityType obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._entityKind != obj._entityKind)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._domain != obj._domain)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._country != obj._country)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._category != obj._category)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._nomenclatureVersion != obj._nomenclatureVersion)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._nomenclature != obj._nomenclature)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
-            result = GenerateHash(result) ^ this._domain.GetHashCode();
-            result = GenerateHash(result) ^ this._country.GetHashCode();
-            result = GenerateHash(result) ^ this._category.GetHashCode();
-            result = GenerateHash(result) ^ this._nomenclatureVersion.GetHashCode();
-            result = GenerateHash(result) ^ this._nomenclature.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.25. Identifies the type of radio
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RadioEntityType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _nomenclatureVersion;
+
+        private ushort _nomenclature;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioEntityType"/> class.
+        /// </summary>
+        public RadioEntityType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioEntityType left, RadioEntityType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioEntityType left, RadioEntityType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._nomenclatureVersion
+            marshalSize += 2;  // this._nomenclature
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "nomenclatureVersion")]
+        public byte NomenclatureVersion
+        {
+            get
+            {
+                return this._nomenclatureVersion;
+            }
+
+            set
+            {
+                this._nomenclatureVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the nomenclature
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "nomenclature")]
+        public ushort Nomenclature
+        {
+            get
+            {
+                return this._nomenclature;
+            }
+
+            set
+            {
+                this._nomenclature = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._nomenclatureVersion);
+                    dos.WriteUnsignedShort((ushort)this._nomenclature);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._nomenclatureVersion = dis.ReadUnsignedByte();
+                    this._nomenclature = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RadioEntityType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<nomenclatureVersion type=\"byte\">" + this._nomenclatureVersion.ToString(CultureInfo.InvariantCulture) + "</nomenclatureVersion>");
+                sb.AppendLine("<nomenclature type=\"ushort\">" + this._nomenclature.ToString(CultureInfo.InvariantCulture) + "</nomenclature>");
+                sb.AppendLine("</RadioEntityType>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RadioEntityType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioEntityType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._nomenclatureVersion != obj._nomenclatureVersion)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._nomenclature != obj._nomenclature)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._nomenclatureVersion.GetHashCode();
+            result = GenerateHash(result) ^ this._nomenclature.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ReceiverPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ReceiverPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ReceiverPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ReceiverPdu.cs
index 154e9b5..6befa37 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ReceiverPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ReceiverPdu.cs
@@ -1,435 +1,435 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.8.3. Communication of a receiver state. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class ReceiverPdu : RadioCommunicationsFamilyPdu, IEquatable<ReceiverPdu>
-    {
-        /// <summary>
-        /// encoding scheme used, and enumeration
-        /// </summary>
-        private ushort _receiverState;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// received power
-        /// </summary>
-        private float _receivedPoser;
-
-        /// <summary>
-        /// ID of transmitter
-        /// </summary>
-        private EntityID _transmitterEntityId = new EntityID();
-
-        /// <summary>
-        /// ID of transmitting radio
-        /// </summary>
-        private ushort _transmitterRadioId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReceiverPdu"/> class.
-        /// </summary>
-        public ReceiverPdu()
-        {
-            PduType = (byte)27;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ReceiverPdu left, ReceiverPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ReceiverPdu left, ReceiverPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._receiverState
-            marshalSize += 2;  // this._padding1
-            marshalSize += 4;  // this._receivedPoser
-            marshalSize += this._transmitterEntityId.GetMarshalledSize();  // this._transmitterEntityId
-            marshalSize += 2;  // this._transmitterRadioId
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the encoding scheme used, and enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "receiverState")]
-        public ushort ReceiverState
-        {
-            get
-            {
-                return this._receiverState;
-            }
-
-            set
-            {
-                this._receiverState = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the received power
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "receivedPoser")]
-        public float ReceivedPoser
-        {
-            get
-            {
-                return this._receivedPoser;
-            }
-
-            set
-            {
-                this._receivedPoser = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of transmitter
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "transmitterEntityId")]
-        public EntityID TransmitterEntityId
-        {
-            get
-            {
-                return this._transmitterEntityId;
-            }
-
-            set
-            {
-                this._transmitterEntityId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of transmitting radio
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "transmitterRadioId")]
-        public ushort TransmitterRadioId
-        {
-            get
-            {
-                return this._transmitterRadioId;
-            }
-
-            set
-            {
-                this._transmitterRadioId = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._receiverState);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    dos.WriteFloat((float)this._receivedPoser);
-                    this._transmitterEntityId.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._transmitterRadioId);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receiverState = dis.ReadUnsignedShort();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._receivedPoser = dis.ReadFloat();
-                    this._transmitterEntityId.Unmarshal(dis);
-                    this._transmitterRadioId = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ReceiverPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receiverState type=\"ushort\">" + this._receiverState.ToString(CultureInfo.InvariantCulture) + "</receiverState>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<receivedPoser type=\"float\">" + this._receivedPoser.ToString(CultureInfo.InvariantCulture) + "</receivedPoser>");
-                sb.AppendLine("<transmitterEntityId>");
-                this._transmitterEntityId.Reflection(sb);
-                sb.AppendLine("</transmitterEntityId>");
-                sb.AppendLine("<transmitterRadioId type=\"ushort\">" + this._transmitterRadioId.ToString(CultureInfo.InvariantCulture) + "</transmitterRadioId>");
-                sb.AppendLine("</ReceiverPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ReceiverPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ReceiverPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._receiverState != obj._receiverState)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._receivedPoser != obj._receivedPoser)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._transmitterEntityId.Equals(obj._transmitterEntityId))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitterRadioId != obj._transmitterRadioId)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receiverState.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._receivedPoser.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitterEntityId.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitterRadioId.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.8.3. Communication of a receiver state. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class ReceiverPdu : RadioCommunicationsFamilyPdu, IEquatable<ReceiverPdu>
+    {
+        /// <summary>
+        /// encoding scheme used, and enumeration
+        /// </summary>
+        private ushort _receiverState;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// received power
+        /// </summary>
+        private float _receivedPoser;
+
+        /// <summary>
+        /// ID of transmitter
+        /// </summary>
+        private EntityID _transmitterEntityId = new EntityID();
+
+        /// <summary>
+        /// ID of transmitting radio
+        /// </summary>
+        private ushort _transmitterRadioId;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReceiverPdu"/> class.
+        /// </summary>
+        public ReceiverPdu()
+        {
+            PduType = (byte)27;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ReceiverPdu left, ReceiverPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ReceiverPdu left, ReceiverPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._receiverState
+            marshalSize += 2;  // this._padding1
+            marshalSize += 4;  // this._receivedPoser
+            marshalSize += this._transmitterEntityId.GetMarshalledSize();  // this._transmitterEntityId
+            marshalSize += 2;  // this._transmitterRadioId
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding scheme used, and enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "receiverState")]
+        public ushort ReceiverState
+        {
+            get
+            {
+                return this._receiverState;
+            }
+
+            set
+            {
+                this._receiverState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the received power
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "receivedPoser")]
+        public float ReceivedPoser
+        {
+            get
+            {
+                return this._receivedPoser;
+            }
+
+            set
+            {
+                this._receivedPoser = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of transmitter
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "transmitterEntityId")]
+        public EntityID TransmitterEntityId
+        {
+            get
+            {
+                return this._transmitterEntityId;
+            }
+
+            set
+            {
+                this._transmitterEntityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of transmitting radio
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "transmitterRadioId")]
+        public ushort TransmitterRadioId
+        {
+            get
+            {
+                return this._transmitterRadioId;
+            }
+
+            set
+            {
+                this._transmitterRadioId = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._receiverState);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteFloat((float)this._receivedPoser);
+                    this._transmitterEntityId.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._transmitterRadioId);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receiverState = dis.ReadUnsignedShort();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._receivedPoser = dis.ReadFloat();
+                    this._transmitterEntityId.Unmarshal(dis);
+                    this._transmitterRadioId = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ReceiverPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receiverState type=\"ushort\">" + this._receiverState.ToString(CultureInfo.InvariantCulture) + "</receiverState>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<receivedPoser type=\"float\">" + this._receivedPoser.ToString(CultureInfo.InvariantCulture) + "</receivedPoser>");
+                sb.AppendLine("<transmitterEntityId>");
+                this._transmitterEntityId.Reflection(sb);
+                sb.AppendLine("</transmitterEntityId>");
+                sb.AppendLine("<transmitterRadioId type=\"ushort\">" + this._transmitterRadioId.ToString(CultureInfo.InvariantCulture) + "</transmitterRadioId>");
+                sb.AppendLine("</ReceiverPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ReceiverPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ReceiverPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._receiverState != obj._receiverState)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._receivedPoser != obj._receivedPoser)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._transmitterEntityId.Equals(obj._transmitterEntityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitterRadioId != obj._transmitterRadioId)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receiverState.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._receivedPoser.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitterEntityId.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitterRadioId.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/RecordQueryReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RecordQueryReliablePdu.cs
index bfa92bf..2bff5af 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordQueryReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RecordQueryReliablePdu.cs
@@ -1,570 +1,570 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.13: A request for one or more records of data from an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FourByteChunk))]
-    public partial class RecordQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RecordQueryReliablePdu>
-    {
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding. The spec is unclear and contradictory here.
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// event type
-        /// </summary>
-        private ushort _eventType;
-
-        /// <summary>
-        /// time
-        /// </summary>
-        private uint _time;
-
-        /// <summary>
-        /// numberOfRecords
-        /// </summary>
-        private uint _numberOfRecords;
-
-        /// <summary>
-        /// record IDs
-        /// </summary>
-        private List<FourByteChunk> _recordIDs = new List<FourByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RecordQueryReliablePdu"/> class.
-        /// </summary>
-        public RecordQueryReliablePdu()
-        {
-            PduType = (byte)63;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 2;  // this._eventType
-            marshalSize += 4;  // this._time
-            marshalSize += 4;  // this._numberOfRecords
-            for (int idx = 0; idx < this._recordIDs.Count; idx++)
-            {
-                FourByteChunk listElement = (FourByteChunk)this._recordIDs[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding. The spec is unclear and contradictory here.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the event type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
-        public ushort EventType
-        {
-            get
-            {
-                return this._eventType;
-            }
-
-            set
-            {
-                this._eventType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "time")]
-        public uint Time
-        {
-            get
-            {
-                return this._time;
-            }
-
-            set
-            {
-                this._time = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the numberOfRecords
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecords")]
-        public uint NumberOfRecords
-        {
-            get
-            {
-                return this._numberOfRecords;
-            }
-
-            set
-            {
-                this._numberOfRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the record IDs
-        /// </summary>
-        [XmlElement(ElementName = "recordIDsList", Type = typeof(List<FourByteChunk>))]
-        public List<FourByteChunk> RecordIDs
-        {
-            get
-            {
-                return this._recordIDs;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedShort((ushort)this._eventType);
-                    dos.WriteUnsignedInt((uint)this._time);
-                    dos.WriteUnsignedInt((uint)this._recordIDs.Count);
-
-                    for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                    {
-                        FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
-                        aFourByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._eventType = dis.ReadUnsignedShort();
-                    this._time = dis.ReadUnsignedInt();
-                    this._numberOfRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfRecords; idx++)
-                    {
-                        FourByteChunk anX = new FourByteChunk();
-                        anX.Unmarshal(dis);
-                        this._recordIDs.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RecordQueryReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
-                sb.AppendLine("<time type=\"uint\">" + this._time.ToString(CultureInfo.InvariantCulture) + "</time>");
-                sb.AppendLine("<recordIDs type=\"uint\">" + this._recordIDs.Count.ToString(CultureInfo.InvariantCulture) + "</recordIDs>");
-                for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                {
-                    sb.AppendLine("<recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
-                    FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
-                    aFourByteChunk.Reflection(sb);
-                    sb.AppendLine("</recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</RecordQueryReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RecordQueryReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RecordQueryReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._eventType != obj._eventType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._time != obj._time)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfRecords != obj._numberOfRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordIDs.Count != obj._recordIDs.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                {
-                    if (!this._recordIDs[idx].Equals(obj._recordIDs[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._eventType.GetHashCode();
-            result = GenerateHash(result) ^ this._time.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfRecords.GetHashCode();
-
-            if (this._recordIDs.Count > 0)
-            {
-                for (int idx = 0; idx < this._recordIDs.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._recordIDs[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.13: A request for one or more records of data from an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FourByteChunk))]
+    public partial class RecordQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RecordQueryReliablePdu>
+    {
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding. The spec is unclear and contradictory here.
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// event type
+        /// </summary>
+        private ushort _eventType;
+
+        /// <summary>
+        /// time
+        /// </summary>
+        private uint _time;
+
+        /// <summary>
+        /// numberOfRecords
+        /// </summary>
+        private uint _numberOfRecords;
+
+        /// <summary>
+        /// record IDs
+        /// </summary>
+        private List<FourByteChunk> _recordIDs = new List<FourByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RecordQueryReliablePdu"/> class.
+        /// </summary>
+        public RecordQueryReliablePdu()
+        {
+            PduType = (byte)63;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 2;  // this._eventType
+            marshalSize += 4;  // this._time
+            marshalSize += 4;  // this._numberOfRecords
+            for (int idx = 0; idx < this._recordIDs.Count; idx++)
+            {
+                FourByteChunk listElement = (FourByteChunk)this._recordIDs[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding. The spec is unclear and contradictory here.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the event type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
+        public ushort EventType
+        {
+            get
+            {
+                return this._eventType;
+            }
+
+            set
+            {
+                this._eventType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "time")]
+        public uint Time
+        {
+            get
+            {
+                return this._time;
+            }
+
+            set
+            {
+                this._time = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the numberOfRecords
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecords")]
+        public uint NumberOfRecords
+        {
+            get
+            {
+                return this._numberOfRecords;
+            }
+
+            set
+            {
+                this._numberOfRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the record IDs
+        /// </summary>
+        [XmlElement(ElementName = "recordIDsList", Type = typeof(List<FourByteChunk>))]
+        public List<FourByteChunk> RecordIDs
+        {
+            get
+            {
+                return this._recordIDs;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedShort((ushort)this._eventType);
+                    dos.WriteUnsignedInt((uint)this._time);
+                    dos.WriteUnsignedInt((uint)this._recordIDs.Count);
+
+                    for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                    {
+                        FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
+                        aFourByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._eventType = dis.ReadUnsignedShort();
+                    this._time = dis.ReadUnsignedInt();
+                    this._numberOfRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfRecords; idx++)
+                    {
+                        FourByteChunk anX = new FourByteChunk();
+                        anX.Unmarshal(dis);
+                        this._recordIDs.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RecordQueryReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
+                sb.AppendLine("<time type=\"uint\">" + this._time.ToString(CultureInfo.InvariantCulture) + "</time>");
+                sb.AppendLine("<recordIDs type=\"uint\">" + this._recordIDs.Count.ToString(CultureInfo.InvariantCulture) + "</recordIDs>");
+                for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                {
+                    sb.AppendLine("<recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
+                    FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
+                    aFourByteChunk.Reflection(sb);
+                    sb.AppendLine("</recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</RecordQueryReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RecordQueryReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RecordQueryReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._eventType != obj._eventType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._time != obj._time)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfRecords != obj._numberOfRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordIDs.Count != obj._recordIDs.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                {
+                    if (!this._recordIDs[idx].Equals(obj._recordIDs[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._eventType.GetHashCode();
+            result = GenerateHash(result) ^ this._time.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfRecords.GetHashCode();
+
+            if (this._recordIDs.Count > 0)
+            {
+                for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._recordIDs[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordSet.cs b/Libs/CsharpDis6/Dis1998/Generated/RecordSet.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordSet.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RecordSet.cs
index b442d58..aef40f2 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RecordSet.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RecordSet.cs
@@ -1,460 +1,460 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Record sets, used in transfer control request PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RecordSet
-    {
-        /// <summary>
-        /// record ID
-        /// </summary>
-        private uint _recordID;
-
-        /// <summary>
-        /// record set serial number
-        /// </summary>
-        private uint _recordSetSerialNumber;
-
-        /// <summary>
-        /// record length
-        /// </summary>
-        private ushort _recordLength;
-
-        /// <summary>
-        /// record count
-        /// </summary>
-        private ushort _recordCount;
-
-        /// <summary>
-        /// ^^^This is wrong--variable sized data records
-        /// </summary>
-        private ushort _recordValues;
-
-        /// <summary>
-        /// ^^^This is wrong--variable sized padding
-        /// </summary>
-        private byte _pad4;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RecordSet"/> class.
-        /// </summary>
-        public RecordSet()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RecordSet left, RecordSet right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RecordSet left, RecordSet right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._recordID
-            marshalSize += 4;  // this._recordSetSerialNumber
-            marshalSize += 2;  // this._recordLength
-            marshalSize += 2;  // this._recordCount
-            marshalSize += 2;  // this._recordValues
-            marshalSize += 1;  // this._pad4
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the record ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordID")]
-        public uint RecordID
-        {
-            get
-            {
-                return this._recordID;
-            }
-
-            set
-            {
-                this._recordID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the record set serial number
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "recordSetSerialNumber")]
-        public uint RecordSetSerialNumber
-        {
-            get
-            {
-                return this._recordSetSerialNumber;
-            }
-
-            set
-            {
-                this._recordSetSerialNumber = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the record length
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
-        public ushort RecordLength
-        {
-            get
-            {
-                return this._recordLength;
-            }
-
-            set
-            {
-                this._recordLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the record count
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordCount")]
-        public ushort RecordCount
-        {
-            get
-            {
-                return this._recordCount;
-            }
-
-            set
-            {
-                this._recordCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ^^^This is wrong--variable sized data records
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "recordValues")]
-        public ushort RecordValues
-        {
-            get
-            {
-                return this._recordValues;
-            }
-
-            set
-            {
-                this._recordValues = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ^^^This is wrong--variable sized padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad4")]
-        public byte Pad4
-        {
-            get
-            {
-                return this._pad4;
-            }
-
-            set
-            {
-                this._pad4 = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._recordID);
-                    dos.WriteUnsignedInt((uint)this._recordSetSerialNumber);
-                    dos.WriteUnsignedShort((ushort)this._recordLength);
-                    dos.WriteUnsignedShort((ushort)this._recordCount);
-                    dos.WriteUnsignedShort((ushort)this._recordValues);
-                    dos.WriteUnsignedByte((byte)this._pad4);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._recordID = dis.ReadUnsignedInt();
-                    this._recordSetSerialNumber = dis.ReadUnsignedInt();
-                    this._recordLength = dis.ReadUnsignedShort();
-                    this._recordCount = dis.ReadUnsignedShort();
-                    this._recordValues = dis.ReadUnsignedShort();
-                    this._pad4 = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RecordSet>");
-            try
-            {
-                sb.AppendLine("<recordID type=\"uint\">" + this._recordID.ToString(CultureInfo.InvariantCulture) + "</recordID>");
-                sb.AppendLine("<recordSetSerialNumber type=\"uint\">" + this._recordSetSerialNumber.ToString(CultureInfo.InvariantCulture) + "</recordSetSerialNumber>");
-                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
-                sb.AppendLine("<recordCount type=\"ushort\">" + this._recordCount.ToString(CultureInfo.InvariantCulture) + "</recordCount>");
-                sb.AppendLine("<recordValues type=\"ushort\">" + this._recordValues.ToString(CultureInfo.InvariantCulture) + "</recordValues>");
-                sb.AppendLine("<pad4 type=\"byte\">" + this._pad4.ToString(CultureInfo.InvariantCulture) + "</pad4>");
-                sb.AppendLine("</RecordSet>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RecordSet;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RecordSet obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._recordID != obj._recordID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSetSerialNumber != obj._recordSetSerialNumber)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordLength != obj._recordLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordCount != obj._recordCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordValues != obj._recordValues)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad4 != obj._pad4)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._recordID.GetHashCode();
-            result = GenerateHash(result) ^ this._recordSetSerialNumber.GetHashCode();
-            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
-            result = GenerateHash(result) ^ this._recordCount.GetHashCode();
-            result = GenerateHash(result) ^ this._recordValues.GetHashCode();
-            result = GenerateHash(result) ^ this._pad4.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Record sets, used in transfer control request PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RecordSet
+    {
+        /// <summary>
+        /// record ID
+        /// </summary>
+        private uint _recordID;
+
+        /// <summary>
+        /// record set serial number
+        /// </summary>
+        private uint _recordSetSerialNumber;
+
+        /// <summary>
+        /// record length
+        /// </summary>
+        private ushort _recordLength;
+
+        /// <summary>
+        /// record count
+        /// </summary>
+        private ushort _recordCount;
+
+        /// <summary>
+        /// ^^^This is wrong--variable sized data records
+        /// </summary>
+        private ushort _recordValues;
+
+        /// <summary>
+        /// ^^^This is wrong--variable sized padding
+        /// </summary>
+        private byte _pad4;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RecordSet"/> class.
+        /// </summary>
+        public RecordSet()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RecordSet left, RecordSet right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RecordSet left, RecordSet right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordID
+            marshalSize += 4;  // this._recordSetSerialNumber
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 2;  // this._recordCount
+            marshalSize += 2;  // this._recordValues
+            marshalSize += 1;  // this._pad4
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the record ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordID")]
+        public uint RecordID
+        {
+            get
+            {
+                return this._recordID;
+            }
+
+            set
+            {
+                this._recordID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the record set serial number
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordSetSerialNumber")]
+        public uint RecordSetSerialNumber
+        {
+            get
+            {
+                return this._recordSetSerialNumber;
+            }
+
+            set
+            {
+                this._recordSetSerialNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the record length
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the record count
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordCount")]
+        public ushort RecordCount
+        {
+            get
+            {
+                return this._recordCount;
+            }
+
+            set
+            {
+                this._recordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ^^^This is wrong--variable sized data records
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordValues")]
+        public ushort RecordValues
+        {
+            get
+            {
+                return this._recordValues;
+            }
+
+            set
+            {
+                this._recordValues = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ^^^This is wrong--variable sized padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad4")]
+        public byte Pad4
+        {
+            get
+            {
+                return this._pad4;
+            }
+
+            set
+            {
+                this._pad4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordID);
+                    dos.WriteUnsignedInt((uint)this._recordSetSerialNumber);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedShort((ushort)this._recordCount);
+                    dos.WriteUnsignedShort((ushort)this._recordValues);
+                    dos.WriteUnsignedByte((byte)this._pad4);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordID = dis.ReadUnsignedInt();
+                    this._recordSetSerialNumber = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._recordCount = dis.ReadUnsignedShort();
+                    this._recordValues = dis.ReadUnsignedShort();
+                    this._pad4 = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RecordSet>");
+            try
+            {
+                sb.AppendLine("<recordID type=\"uint\">" + this._recordID.ToString(CultureInfo.InvariantCulture) + "</recordID>");
+                sb.AppendLine("<recordSetSerialNumber type=\"uint\">" + this._recordSetSerialNumber.ToString(CultureInfo.InvariantCulture) + "</recordSetSerialNumber>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<recordCount type=\"ushort\">" + this._recordCount.ToString(CultureInfo.InvariantCulture) + "</recordCount>");
+                sb.AppendLine("<recordValues type=\"ushort\">" + this._recordValues.ToString(CultureInfo.InvariantCulture) + "</recordValues>");
+                sb.AppendLine("<pad4 type=\"byte\">" + this._pad4.ToString(CultureInfo.InvariantCulture) + "</pad4>");
+                sb.AppendLine("</RecordSet>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RecordSet;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RecordSet obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordID != obj._recordID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSetSerialNumber != obj._recordSetSerialNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordCount != obj._recordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordValues != obj._recordValues)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad4 != obj._pad4)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordID.GetHashCode();
+            result = GenerateHash(result) ^ this._recordSetSerialNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._recordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._recordValues.GetHashCode();
+            result = GenerateHash(result) ^ this._pad4.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Relationship.cs b/Libs/CsharpDis6/Dis1998/Generated/Relationship.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Relationship.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Relationship.cs
index f63d885..66992e5 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Relationship.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Relationship.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.56. Purpose for joinging two entities
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Relationship
-    {
-        /// <summary>
-        /// Nature of join
-        /// </summary>
-        private ushort _nature;
-
-        /// <summary>
-        /// position of join
-        /// </summary>
-        private ushort _position;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Relationship"/> class.
-        /// </summary>
-        public Relationship()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Relationship left, Relationship right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Relationship left, Relationship right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._nature
-            marshalSize += 2;  // this._position
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Nature of join
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "nature")]
-        public ushort Nature
-        {
-            get
-            {
-                return this._nature;
-            }
-
-            set
-            {
-                this._nature = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the position of join
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "position")]
-        public ushort Position
-        {
-            get
-            {
-                return this._position;
-            }
-
-            set
-            {
-                this._position = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._nature);
-                    dos.WriteUnsignedShort((ushort)this._position);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._nature = dis.ReadUnsignedShort();
-                    this._position = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Relationship>");
-            try
-            {
-                sb.AppendLine("<nature type=\"ushort\">" + this._nature.ToString(CultureInfo.InvariantCulture) + "</nature>");
-                sb.AppendLine("<position type=\"ushort\">" + this._position.ToString(CultureInfo.InvariantCulture) + "</position>");
-                sb.AppendLine("</Relationship>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Relationship;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Relationship obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._nature != obj._nature)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._position != obj._position)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._nature.GetHashCode();
-            result = GenerateHash(result) ^ this._position.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.56. Purpose for joinging two entities
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Relationship
+    {
+        /// <summary>
+        /// Nature of join
+        /// </summary>
+        private ushort _nature;
+
+        /// <summary>
+        /// position of join
+        /// </summary>
+        private ushort _position;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Relationship"/> class.
+        /// </summary>
+        public Relationship()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Relationship left, Relationship right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Relationship left, Relationship right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._nature
+            marshalSize += 2;  // this._position
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Nature of join
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "nature")]
+        public ushort Nature
+        {
+            get
+            {
+                return this._nature;
+            }
+
+            set
+            {
+                this._nature = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position of join
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "position")]
+        public ushort Position
+        {
+            get
+            {
+                return this._position;
+            }
+
+            set
+            {
+                this._position = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._nature);
+                    dos.WriteUnsignedShort((ushort)this._position);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._nature = dis.ReadUnsignedShort();
+                    this._position = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Relationship>");
+            try
+            {
+                sb.AppendLine("<nature type=\"ushort\">" + this._nature.ToString(CultureInfo.InvariantCulture) + "</nature>");
+                sb.AppendLine("<position type=\"ushort\">" + this._position.ToString(CultureInfo.InvariantCulture) + "</position>");
+                sb.AppendLine("</Relationship>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Relationship;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Relationship obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._nature != obj._nature)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._position != obj._position)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._nature.GetHashCode();
+            result = GenerateHash(result) ^ this._position.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/RemoveEntityPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RemoveEntityPdu.cs
index 368d760..93e358a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RemoveEntityPdu.cs
@@ -1,304 +1,304 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.2. Remove an entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RemoveEntityPdu : SimulationManagementFamilyPdu, IEquatable<RemoveEntityPdu>
-    {
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RemoveEntityPdu"/> class.
-        /// </summary>
-        public RemoveEntityPdu()
-        {
-            PduType = (byte)12;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RemoveEntityPdu left, RemoveEntityPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RemoveEntityPdu left, RemoveEntityPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RemoveEntityPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</RemoveEntityPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RemoveEntityPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RemoveEntityPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.2. Remove an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RemoveEntityPdu : SimulationManagementFamilyPdu, IEquatable<RemoveEntityPdu>
+    {
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveEntityPdu"/> class.
+        /// </summary>
+        public RemoveEntityPdu()
+        {
+            PduType = (byte)12;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RemoveEntityPdu left, RemoveEntityPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RemoveEntityPdu left, RemoveEntityPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RemoveEntityPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</RemoveEntityPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RemoveEntityPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RemoveEntityPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/RemoveEntityReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RemoveEntityReliablePdu.cs
index 86f0c41..a8c9ad8 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RemoveEntityReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RemoveEntityReliablePdu.cs
@@ -1,400 +1,400 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.2: Removal of an entity , reliable. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class RemoveEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RemoveEntityReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RemoveEntityReliablePdu"/> class.
-        /// </summary>
-        public RemoveEntityReliablePdu()
-        {
-            PduType = (byte)52;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RemoveEntityReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</RemoveEntityReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RemoveEntityReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RemoveEntityReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.2: Removal of an entity , reliable. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RemoveEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RemoveEntityReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveEntityReliablePdu"/> class.
+        /// </summary>
+        public RemoveEntityReliablePdu()
+        {
+            PduType = (byte)52;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RemoveEntityReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</RemoveEntityReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RemoveEntityReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RemoveEntityReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairCompletePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/RepairCompletePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairCompletePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RepairCompletePdu.cs
index 1ab6c94..22599c9 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairCompletePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RepairCompletePdu.cs
@@ -1,405 +1,405 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.5.5. Repair is complete. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RepairCompletePdu : LogisticsFamilyPdu, IEquatable<RepairCompletePdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _repairingEntityID = new EntityID();
-
-        /// <summary>
-        /// Enumeration for type of repair
-        /// </summary>
-        private ushort _repair;
-
-        /// <summary>
-        /// padding, number prevents conflict with superclass ivar name
-        /// </summary>
-        private short _padding2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RepairCompletePdu"/> class.
-        /// </summary>
-        public RepairCompletePdu()
-        {
-            PduType = (byte)9;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RepairCompletePdu left, RepairCompletePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RepairCompletePdu left, RepairCompletePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
-            marshalSize += 2;  // this._repair
-            marshalSize += 2;  // this._padding2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
-        public EntityID RepairingEntityID
-        {
-            get
-            {
-                return this._repairingEntityID;
-            }
-
-            set
-            {
-                this._repairingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Enumeration for type of repair
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "repair")]
-        public ushort Repair
-        {
-            get
-            {
-                return this._repair;
-            }
-
-            set
-            {
-                this._repair = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding, number prevents conflict with superclass ivar name
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding2")]
-        public short Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._repairingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._repair);
-                    dos.WriteShort((short)this._padding2);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._repairingEntityID.Unmarshal(dis);
-                    this._repair = dis.ReadUnsignedShort();
-                    this._padding2 = dis.ReadShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RepairCompletePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<repairingEntityID>");
-                this._repairingEntityID.Reflection(sb);
-                sb.AppendLine("</repairingEntityID>");
-                sb.AppendLine("<repair type=\"ushort\">" + this._repair.ToString(CultureInfo.InvariantCulture) + "</repair>");
-                sb.AppendLine("<padding2 type=\"short\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("</RepairCompletePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RepairCompletePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RepairCompletePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._repair != obj._repair)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repair.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.5.5. Repair is complete. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RepairCompletePdu : LogisticsFamilyPdu, IEquatable<RepairCompletePdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _repairingEntityID = new EntityID();
+
+        /// <summary>
+        /// Enumeration for type of repair
+        /// </summary>
+        private ushort _repair;
+
+        /// <summary>
+        /// padding, number prevents conflict with superclass ivar name
+        /// </summary>
+        private short _padding2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RepairCompletePdu"/> class.
+        /// </summary>
+        public RepairCompletePdu()
+        {
+            PduType = (byte)9;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RepairCompletePdu left, RepairCompletePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RepairCompletePdu left, RepairCompletePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
+            marshalSize += 2;  // this._repair
+            marshalSize += 2;  // this._padding2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
+        public EntityID RepairingEntityID
+        {
+            get
+            {
+                return this._repairingEntityID;
+            }
+
+            set
+            {
+                this._repairingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Enumeration for type of repair
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "repair")]
+        public ushort Repair
+        {
+            get
+            {
+                return this._repair;
+            }
+
+            set
+            {
+                this._repair = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding, number prevents conflict with superclass ivar name
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding2")]
+        public short Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._repairingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._repair);
+                    dos.WriteShort((short)this._padding2);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._repairingEntityID.Unmarshal(dis);
+                    this._repair = dis.ReadUnsignedShort();
+                    this._padding2 = dis.ReadShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RepairCompletePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<repairingEntityID>");
+                this._repairingEntityID.Reflection(sb);
+                sb.AppendLine("</repairingEntityID>");
+                sb.AppendLine("<repair type=\"ushort\">" + this._repair.ToString(CultureInfo.InvariantCulture) + "</repair>");
+                sb.AppendLine("<padding2 type=\"short\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("</RepairCompletePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RepairCompletePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RepairCompletePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._repair != obj._repair)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repair.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairResponsePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/RepairResponsePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairResponsePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/RepairResponsePdu.cs
index 0cc787b..e29d382 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/RepairResponsePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/RepairResponsePdu.cs
@@ -1,437 +1,437 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.5.6. Sent after repair complete PDU. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class RepairResponsePdu : LogisticsFamilyPdu, IEquatable<RepairResponsePdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _repairingEntityID = new EntityID();
-
-        /// <summary>
-        /// Result of repair operation
-        /// </summary>
-        private byte _repairResult;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RepairResponsePdu"/> class.
-        /// </summary>
-        public RepairResponsePdu()
-        {
-            PduType = (byte)10;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RepairResponsePdu left, RepairResponsePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RepairResponsePdu left, RepairResponsePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
-            marshalSize += 1;  // this._repairResult
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
-        public EntityID RepairingEntityID
-        {
-            get
-            {
-                return this._repairingEntityID;
-            }
-
-            set
-            {
-                this._repairingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Result of repair operation
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "repairResult")]
-        public byte RepairResult
-        {
-            get
-            {
-                return this._repairResult;
-            }
-
-            set
-            {
-                this._repairResult = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._repairingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._repairResult);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._repairingEntityID.Unmarshal(dis);
-                    this._repairResult = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<RepairResponsePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<repairingEntityID>");
-                this._repairingEntityID.Reflection(sb);
-                sb.AppendLine("</repairingEntityID>");
-                sb.AppendLine("<repairResult type=\"byte\">" + this._repairResult.ToString(CultureInfo.InvariantCulture) + "</repairResult>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("</RepairResponsePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as RepairResponsePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RepairResponsePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._repairResult != obj._repairResult)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._repairResult.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.5.6. Sent after repair complete PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RepairResponsePdu : LogisticsFamilyPdu, IEquatable<RepairResponsePdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _repairingEntityID = new EntityID();
+
+        /// <summary>
+        /// Result of repair operation
+        /// </summary>
+        private byte _repairResult;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RepairResponsePdu"/> class.
+        /// </summary>
+        public RepairResponsePdu()
+        {
+            PduType = (byte)10;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RepairResponsePdu left, RepairResponsePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RepairResponsePdu left, RepairResponsePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
+            marshalSize += 1;  // this._repairResult
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
+        public EntityID RepairingEntityID
+        {
+            get
+            {
+                return this._repairingEntityID;
+            }
+
+            set
+            {
+                this._repairingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Result of repair operation
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "repairResult")]
+        public byte RepairResult
+        {
+            get
+            {
+                return this._repairResult;
+            }
+
+            set
+            {
+                this._repairResult = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._repairingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._repairResult);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._repairingEntityID.Unmarshal(dis);
+                    this._repairResult = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RepairResponsePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<repairingEntityID>");
+                this._repairingEntityID.Reflection(sb);
+                sb.AppendLine("</repairingEntityID>");
+                sb.AppendLine("<repairResult type=\"byte\">" + this._repairResult.ToString(CultureInfo.InvariantCulture) + "</repairResult>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("</RepairResponsePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RepairResponsePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RepairResponsePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._repairResult != obj._repairResult)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairResult.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ResupplyCancelPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ResupplyCancelPdu.cs
index 5af92c2..183f9fe 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyCancelPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ResupplyCancelPdu.cs
@@ -1,341 +1,341 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.5.4. Cancel of resupply by either the receiving or supplying entity. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class ResupplyCancelPdu : LogisticsFamilyPdu, IEquatable<ResupplyCancelPdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyCancelPdu"/> class.
-        /// </summary>
-        public ResupplyCancelPdu()
-        {
-            PduType = (byte)8;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyCancelPdu left, ResupplyCancelPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyCancelPdu left, ResupplyCancelPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyCancelPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("</ResupplyCancelPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyCancelPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyCancelPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.5.4. Cancel of resupply by either the receiving or supplying entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class ResupplyCancelPdu : LogisticsFamilyPdu, IEquatable<ResupplyCancelPdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyCancelPdu"/> class.
+        /// </summary>
+        public ResupplyCancelPdu()
+        {
+            PduType = (byte)8;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyCancelPdu left, ResupplyCancelPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyCancelPdu left, ResupplyCancelPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyCancelPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("</ResupplyCancelPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyCancelPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyCancelPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ResupplyOfferPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ResupplyOfferPdu.cs
index aa0b041..58583b2 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyOfferPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ResupplyOfferPdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.5.2. Information about a request for supplies. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ResupplyOfferPdu : LogisticsFamilyPdu, IEquatable<ResupplyOfferPdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// how many supplies are being offered
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyOfferPdu"/> class.
-        /// </summary>
-        public ResupplyOfferPdu()
-        {
-            PduType = (byte)6;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyOfferPdu left, ResupplyOfferPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyOfferPdu left, ResupplyOfferPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many supplies are being offered
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the supplies
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyOfferPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ResupplyOfferPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyOfferPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyOfferPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.5.2. Information about a request for supplies. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ResupplyOfferPdu : LogisticsFamilyPdu, IEquatable<ResupplyOfferPdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// how many supplies are being offered
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyOfferPdu"/> class.
+        /// </summary>
+        public ResupplyOfferPdu()
+        {
+            PduType = (byte)6;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyOfferPdu left, ResupplyOfferPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyOfferPdu left, ResupplyOfferPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many supplies are being offered
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the supplies
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyOfferPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ResupplyOfferPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyOfferPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyOfferPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ResupplyReceivedPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ResupplyReceivedPdu.cs
index 4db7170..00dff52 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ResupplyReceivedPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ResupplyReceivedPdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.5.3. Receipt of supplies is communiated. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ResupplyReceivedPdu : LogisticsFamilyPdu, IEquatable<ResupplyReceivedPdu>
-    {
-        /// <summary>
-        /// Entity that is receiving service
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is supplying
-        /// </summary>
-        private EntityID _supplyingEntityID = new EntityID();
-
-        /// <summary>
-        /// how many supplies are being offered
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _padding2;
-
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResupplyReceivedPdu"/> class.
-        /// </summary>
-        public ResupplyReceivedPdu()
-        {
-            PduType = (byte)7;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._padding1
-            marshalSize += 1;  // this._padding2
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is receiving service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is supplying
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
-        public EntityID SupplyingEntityID
-        {
-            get
-            {
-                return this._supplyingEntityID;
-            }
-
-            set
-            {
-                this._supplyingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many supplies are being offered
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
-        public byte Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the supplies
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Marshal(dos);
-                    this._supplyingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteByte((byte)this._padding2);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._receivingEntityID.Unmarshal(dis);
-                    this._supplyingEntityID.Unmarshal(dis);
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._padding2 = dis.ReadByte();
-
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ResupplyReceivedPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("<supplyingEntityID>");
-                this._supplyingEntityID.Reflection(sb);
-                sb.AppendLine("</supplyingEntityID>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ResupplyReceivedPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ResupplyReceivedPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ResupplyReceivedPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.5.3. Receipt of supplies is communiated. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ResupplyReceivedPdu : LogisticsFamilyPdu, IEquatable<ResupplyReceivedPdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// how many supplies are being offered
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyReceivedPdu"/> class.
+        /// </summary>
+        public ResupplyReceivedPdu()
+        {
+            PduType = (byte)7;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many supplies are being offered
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the supplies
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyReceivedPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ResupplyReceivedPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyReceivedPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyReceivedPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SeesPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SeesPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SeesPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SeesPdu.cs
index 945af30..ec9fda9 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SeesPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SeesPdu.cs
@@ -1,615 +1,615 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.7.5. SEES PDU, supplemental emissions entity state information. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(PropulsionSystemData))]
-    [XmlInclude(typeof(VectoringNozzleSystemData))]
-    public partial class SeesPdu : DistributedEmissionsFamilyPdu, IEquatable<SeesPdu>
-    {
-        /// <summary>
-        /// Originating entity ID
-        /// </summary>
-        private EntityID _orginatingEntityID = new EntityID();
-
-        /// <summary>
-        /// IR Signature representation index
-        /// </summary>
-        private ushort _infraredSignatureRepresentationIndex;
-
-        /// <summary>
-        /// acoustic Signature representation index
-        /// </summary>
-        private ushort _acousticSignatureRepresentationIndex;
-
-        /// <summary>
-        /// radar cross section representation index
-        /// </summary>
-        private ushort _radarCrossSectionSignatureRepresentationIndex;
-
-        /// <summary>
-        /// how many propulsion systems
-        /// </summary>
-        private ushort _numberOfPropulsionSystems;
-
-        /// <summary>
-        /// how many vectoring nozzle systems
-        /// </summary>
-        private ushort _numberOfVectoringNozzleSystems;
-
-        /// <summary>
-        /// variable length list of propulsion system data
-        /// </summary>
-        private List<PropulsionSystemData> _propulsionSystemData = new List<PropulsionSystemData>();
-
-        /// <summary>
-        /// variable length list of vectoring system data
-        /// </summary>
-        private List<VectoringNozzleSystemData> _vectoringSystemData = new List<VectoringNozzleSystemData>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SeesPdu"/> class.
-        /// </summary>
-        public SeesPdu()
-        {
-            PduType = (byte)30;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SeesPdu left, SeesPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SeesPdu left, SeesPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
-            marshalSize += 2;  // this._infraredSignatureRepresentationIndex
-            marshalSize += 2;  // this._acousticSignatureRepresentationIndex
-            marshalSize += 2;  // this._radarCrossSectionSignatureRepresentationIndex
-            marshalSize += 2;  // this._numberOfPropulsionSystems
-            marshalSize += 2;  // this._numberOfVectoringNozzleSystems
-            for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-            {
-                PropulsionSystemData listElement = (PropulsionSystemData)this._propulsionSystemData[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-            {
-                VectoringNozzleSystemData listElement = (VectoringNozzleSystemData)this._vectoringSystemData[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Originating entity ID
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
-        public EntityID OrginatingEntityID
-        {
-            get
-            {
-                return this._orginatingEntityID;
-            }
-
-            set
-            {
-                this._orginatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the IR Signature representation index
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "infraredSignatureRepresentationIndex")]
-        public ushort InfraredSignatureRepresentationIndex
-        {
-            get
-            {
-                return this._infraredSignatureRepresentationIndex;
-            }
-
-            set
-            {
-                this._infraredSignatureRepresentationIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the acoustic Signature representation index
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "acousticSignatureRepresentationIndex")]
-        public ushort AcousticSignatureRepresentationIndex
-        {
-            get
-            {
-                return this._acousticSignatureRepresentationIndex;
-            }
-
-            set
-            {
-                this._acousticSignatureRepresentationIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the radar cross section representation index
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "radarCrossSectionSignatureRepresentationIndex")]
-        public ushort RadarCrossSectionSignatureRepresentationIndex
-        {
-            get
-            {
-                return this._radarCrossSectionSignatureRepresentationIndex;
-            }
-
-            set
-            {
-                this._radarCrossSectionSignatureRepresentationIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many propulsion systems
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfPropulsionSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPropulsionSystems")]
-        public ushort NumberOfPropulsionSystems
-        {
-            get
-            {
-                return this._numberOfPropulsionSystems;
-            }
-
-            set
-            {
-                this._numberOfPropulsionSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many vectoring nozzle systems
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVectoringNozzleSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "numberOfVectoringNozzleSystems")]
-        public ushort NumberOfVectoringNozzleSystems
-        {
-            get
-            {
-                return this._numberOfVectoringNozzleSystems;
-            }
-
-            set
-            {
-                this._numberOfVectoringNozzleSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of propulsion system data
-        /// </summary>
-        [XmlElement(ElementName = "propulsionSystemDataList", Type = typeof(List<PropulsionSystemData>))]
-        public List<PropulsionSystemData> PropulsionSystemData
-        {
-            get
-            {
-                return this._propulsionSystemData;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of vectoring system data
-        /// </summary>
-        [XmlElement(ElementName = "vectoringSystemDataList", Type = typeof(List<VectoringNozzleSystemData>))]
-        public List<VectoringNozzleSystemData> VectoringSystemData
-        {
-            get
-            {
-                return this._vectoringSystemData;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._infraredSignatureRepresentationIndex);
-                    dos.WriteUnsignedShort((ushort)this._acousticSignatureRepresentationIndex);
-                    dos.WriteUnsignedShort((ushort)this._radarCrossSectionSignatureRepresentationIndex);
-                    dos.WriteUnsignedShort((ushort)this._propulsionSystemData.Count);
-                    dos.WriteUnsignedShort((ushort)this._vectoringSystemData.Count);
-
-                    for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                    {
-                        PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
-                        aPropulsionSystemData.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                    {
-                        VectoringNozzleSystemData aVectoringNozzleSystemData = (VectoringNozzleSystemData)this._vectoringSystemData[idx];
-                        aVectoringNozzleSystemData.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Unmarshal(dis);
-                    this._infraredSignatureRepresentationIndex = dis.ReadUnsignedShort();
-                    this._acousticSignatureRepresentationIndex = dis.ReadUnsignedShort();
-                    this._radarCrossSectionSignatureRepresentationIndex = dis.ReadUnsignedShort();
-                    this._numberOfPropulsionSystems = dis.ReadUnsignedShort();
-                    this._numberOfVectoringNozzleSystems = dis.ReadUnsignedShort();
-
-                    for (int idx = 0; idx < this.NumberOfPropulsionSystems; idx++)
-                    {
-                        PropulsionSystemData anX = new PropulsionSystemData();
-                        anX.Unmarshal(dis);
-                        this._propulsionSystemData.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVectoringNozzleSystems; idx++)
-                    {
-                        VectoringNozzleSystemData anX = new VectoringNozzleSystemData();
-                        anX.Unmarshal(dis);
-                        this._vectoringSystemData.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SeesPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<orginatingEntityID>");
-                this._orginatingEntityID.Reflection(sb);
-                sb.AppendLine("</orginatingEntityID>");
-                sb.AppendLine("<infraredSignatureRepresentationIndex type=\"ushort\">" + this._infraredSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</infraredSignatureRepresentationIndex>");
-                sb.AppendLine("<acousticSignatureRepresentationIndex type=\"ushort\">" + this._acousticSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</acousticSignatureRepresentationIndex>");
-                sb.AppendLine("<radarCrossSectionSignatureRepresentationIndex type=\"ushort\">" + this._radarCrossSectionSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</radarCrossSectionSignatureRepresentationIndex>");
-                sb.AppendLine("<propulsionSystemData type=\"ushort\">" + this._propulsionSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</propulsionSystemData>");
-                sb.AppendLine("<vectoringSystemData type=\"ushort\">" + this._vectoringSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</vectoringSystemData>");
-                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                {
-                    sb.AppendLine("<propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"PropulsionSystemData\">");
-                    PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
-                    aPropulsionSystemData.Reflection(sb);
-                    sb.AppendLine("</propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                {
-                    sb.AppendLine("<vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VectoringNozzleSystemData\">");
-                    VectoringNozzleSystemData aVectoringNozzleSystemData = (VectoringNozzleSystemData)this._vectoringSystemData[idx];
-                    aVectoringNozzleSystemData.Reflection(sb);
-                    sb.AppendLine("</vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SeesPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SeesPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SeesPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._infraredSignatureRepresentationIndex != obj._infraredSignatureRepresentationIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._acousticSignatureRepresentationIndex != obj._acousticSignatureRepresentationIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._radarCrossSectionSignatureRepresentationIndex != obj._radarCrossSectionSignatureRepresentationIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfPropulsionSystems != obj._numberOfPropulsionSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVectoringNozzleSystems != obj._numberOfVectoringNozzleSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._propulsionSystemData.Count != obj._propulsionSystemData.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                {
-                    if (!this._propulsionSystemData[idx].Equals(obj._propulsionSystemData[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._vectoringSystemData.Count != obj._vectoringSystemData.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                {
-                    if (!this._vectoringSystemData[idx].Equals(obj._vectoringSystemData[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._infraredSignatureRepresentationIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._acousticSignatureRepresentationIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._radarCrossSectionSignatureRepresentationIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfPropulsionSystems.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVectoringNozzleSystems.GetHashCode();
-
-            if (this._propulsionSystemData.Count > 0)
-            {
-                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._propulsionSystemData[idx].GetHashCode();
-                }
-            }
-
-            if (this._vectoringSystemData.Count > 0)
-            {
-                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._vectoringSystemData[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.7.5. SEES PDU, supplemental emissions entity state information. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(PropulsionSystemData))]
+    [XmlInclude(typeof(VectoringNozzleSystemData))]
+    public partial class SeesPdu : DistributedEmissionsFamilyPdu, IEquatable<SeesPdu>
+    {
+        /// <summary>
+        /// Originating entity ID
+        /// </summary>
+        private EntityID _orginatingEntityID = new EntityID();
+
+        /// <summary>
+        /// IR Signature representation index
+        /// </summary>
+        private ushort _infraredSignatureRepresentationIndex;
+
+        /// <summary>
+        /// acoustic Signature representation index
+        /// </summary>
+        private ushort _acousticSignatureRepresentationIndex;
+
+        /// <summary>
+        /// radar cross section representation index
+        /// </summary>
+        private ushort _radarCrossSectionSignatureRepresentationIndex;
+
+        /// <summary>
+        /// how many propulsion systems
+        /// </summary>
+        private ushort _numberOfPropulsionSystems;
+
+        /// <summary>
+        /// how many vectoring nozzle systems
+        /// </summary>
+        private ushort _numberOfVectoringNozzleSystems;
+
+        /// <summary>
+        /// variable length list of propulsion system data
+        /// </summary>
+        private List<PropulsionSystemData> _propulsionSystemData = new List<PropulsionSystemData>();
+
+        /// <summary>
+        /// variable length list of vectoring system data
+        /// </summary>
+        private List<VectoringNozzleSystemData> _vectoringSystemData = new List<VectoringNozzleSystemData>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeesPdu"/> class.
+        /// </summary>
+        public SeesPdu()
+        {
+            PduType = (byte)30;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SeesPdu left, SeesPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SeesPdu left, SeesPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
+            marshalSize += 2;  // this._infraredSignatureRepresentationIndex
+            marshalSize += 2;  // this._acousticSignatureRepresentationIndex
+            marshalSize += 2;  // this._radarCrossSectionSignatureRepresentationIndex
+            marshalSize += 2;  // this._numberOfPropulsionSystems
+            marshalSize += 2;  // this._numberOfVectoringNozzleSystems
+            for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+            {
+                PropulsionSystemData listElement = (PropulsionSystemData)this._propulsionSystemData[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+            {
+                VectoringNozzleSystemData listElement = (VectoringNozzleSystemData)this._vectoringSystemData[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Originating entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
+        public EntityID OrginatingEntityID
+        {
+            get
+            {
+                return this._orginatingEntityID;
+            }
+
+            set
+            {
+                this._orginatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the IR Signature representation index
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "infraredSignatureRepresentationIndex")]
+        public ushort InfraredSignatureRepresentationIndex
+        {
+            get
+            {
+                return this._infraredSignatureRepresentationIndex;
+            }
+
+            set
+            {
+                this._infraredSignatureRepresentationIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the acoustic Signature representation index
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acousticSignatureRepresentationIndex")]
+        public ushort AcousticSignatureRepresentationIndex
+        {
+            get
+            {
+                return this._acousticSignatureRepresentationIndex;
+            }
+
+            set
+            {
+                this._acousticSignatureRepresentationIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the radar cross section representation index
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "radarCrossSectionSignatureRepresentationIndex")]
+        public ushort RadarCrossSectionSignatureRepresentationIndex
+        {
+            get
+            {
+                return this._radarCrossSectionSignatureRepresentationIndex;
+            }
+
+            set
+            {
+                this._radarCrossSectionSignatureRepresentationIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many propulsion systems
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPropulsionSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPropulsionSystems")]
+        public ushort NumberOfPropulsionSystems
+        {
+            get
+            {
+                return this._numberOfPropulsionSystems;
+            }
+
+            set
+            {
+                this._numberOfPropulsionSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many vectoring nozzle systems
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVectoringNozzleSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfVectoringNozzleSystems")]
+        public ushort NumberOfVectoringNozzleSystems
+        {
+            get
+            {
+                return this._numberOfVectoringNozzleSystems;
+            }
+
+            set
+            {
+                this._numberOfVectoringNozzleSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of propulsion system data
+        /// </summary>
+        [XmlElement(ElementName = "propulsionSystemDataList", Type = typeof(List<PropulsionSystemData>))]
+        public List<PropulsionSystemData> PropulsionSystemData
+        {
+            get
+            {
+                return this._propulsionSystemData;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of vectoring system data
+        /// </summary>
+        [XmlElement(ElementName = "vectoringSystemDataList", Type = typeof(List<VectoringNozzleSystemData>))]
+        public List<VectoringNozzleSystemData> VectoringSystemData
+        {
+            get
+            {
+                return this._vectoringSystemData;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._infraredSignatureRepresentationIndex);
+                    dos.WriteUnsignedShort((ushort)this._acousticSignatureRepresentationIndex);
+                    dos.WriteUnsignedShort((ushort)this._radarCrossSectionSignatureRepresentationIndex);
+                    dos.WriteUnsignedShort((ushort)this._propulsionSystemData.Count);
+                    dos.WriteUnsignedShort((ushort)this._vectoringSystemData.Count);
+
+                    for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                    {
+                        PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
+                        aPropulsionSystemData.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                    {
+                        VectoringNozzleSystemData aVectoringNozzleSystemData = (VectoringNozzleSystemData)this._vectoringSystemData[idx];
+                        aVectoringNozzleSystemData.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Unmarshal(dis);
+                    this._infraredSignatureRepresentationIndex = dis.ReadUnsignedShort();
+                    this._acousticSignatureRepresentationIndex = dis.ReadUnsignedShort();
+                    this._radarCrossSectionSignatureRepresentationIndex = dis.ReadUnsignedShort();
+                    this._numberOfPropulsionSystems = dis.ReadUnsignedShort();
+                    this._numberOfVectoringNozzleSystems = dis.ReadUnsignedShort();
+
+                    for (int idx = 0; idx < this.NumberOfPropulsionSystems; idx++)
+                    {
+                        PropulsionSystemData anX = new PropulsionSystemData();
+                        anX.Unmarshal(dis);
+                        this._propulsionSystemData.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVectoringNozzleSystems; idx++)
+                    {
+                        VectoringNozzleSystemData anX = new VectoringNozzleSystemData();
+                        anX.Unmarshal(dis);
+                        this._vectoringSystemData.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SeesPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<orginatingEntityID>");
+                this._orginatingEntityID.Reflection(sb);
+                sb.AppendLine("</orginatingEntityID>");
+                sb.AppendLine("<infraredSignatureRepresentationIndex type=\"ushort\">" + this._infraredSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</infraredSignatureRepresentationIndex>");
+                sb.AppendLine("<acousticSignatureRepresentationIndex type=\"ushort\">" + this._acousticSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</acousticSignatureRepresentationIndex>");
+                sb.AppendLine("<radarCrossSectionSignatureRepresentationIndex type=\"ushort\">" + this._radarCrossSectionSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</radarCrossSectionSignatureRepresentationIndex>");
+                sb.AppendLine("<propulsionSystemData type=\"ushort\">" + this._propulsionSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</propulsionSystemData>");
+                sb.AppendLine("<vectoringSystemData type=\"ushort\">" + this._vectoringSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</vectoringSystemData>");
+                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                {
+                    sb.AppendLine("<propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"PropulsionSystemData\">");
+                    PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
+                    aPropulsionSystemData.Reflection(sb);
+                    sb.AppendLine("</propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                {
+                    sb.AppendLine("<vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VectoringNozzleSystemData\">");
+                    VectoringNozzleSystemData aVectoringNozzleSystemData = (VectoringNozzleSystemData)this._vectoringSystemData[idx];
+                    aVectoringNozzleSystemData.Reflection(sb);
+                    sb.AppendLine("</vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SeesPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SeesPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SeesPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._infraredSignatureRepresentationIndex != obj._infraredSignatureRepresentationIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._acousticSignatureRepresentationIndex != obj._acousticSignatureRepresentationIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._radarCrossSectionSignatureRepresentationIndex != obj._radarCrossSectionSignatureRepresentationIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPropulsionSystems != obj._numberOfPropulsionSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVectoringNozzleSystems != obj._numberOfVectoringNozzleSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._propulsionSystemData.Count != obj._propulsionSystemData.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                {
+                    if (!this._propulsionSystemData[idx].Equals(obj._propulsionSystemData[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._vectoringSystemData.Count != obj._vectoringSystemData.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                {
+                    if (!this._vectoringSystemData[idx].Equals(obj._vectoringSystemData[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._infraredSignatureRepresentationIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._acousticSignatureRepresentationIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._radarCrossSectionSignatureRepresentationIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPropulsionSystems.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVectoringNozzleSystems.GetHashCode();
+
+            if (this._propulsionSystemData.Count > 0)
+            {
+                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._propulsionSystemData[idx].GetHashCode();
+                }
+            }
+
+            if (this._vectoringSystemData.Count > 0)
+            {
+                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._vectoringSystemData[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/ServiceRequestPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ServiceRequestPdu.cs
index fa7e980..eda2e30 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ServiceRequestPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ServiceRequestPdu.cs
@@ -1,508 +1,508 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.5.1. Information about a request for supplies. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(SupplyQuantity))]
-    public partial class ServiceRequestPdu : LogisticsFamilyPdu, IEquatable<ServiceRequestPdu>
-    {
-        /// <summary>
-        /// Entity that is requesting service
-        /// </summary>
-        private EntityID _requestingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is providing the service
-        /// </summary>
-        private EntityID _servicingEntityID = new EntityID();
-
-        /// <summary>
-        /// type of service requested
-        /// </summary>
-        private byte _serviceTypeRequested;
-
-        /// <summary>
-        /// How many requested
-        /// </summary>
-        private byte _numberOfSupplyTypes;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _serviceRequestPadding;
-
-        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceRequestPdu"/> class.
-        /// </summary>
-        public ServiceRequestPdu()
-        {
-            PduType = (byte)5;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ServiceRequestPdu left, ServiceRequestPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ServiceRequestPdu left, ServiceRequestPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
-            marshalSize += this._servicingEntityID.GetMarshalledSize();  // this._servicingEntityID
-            marshalSize += 1;  // this._serviceTypeRequested
-            marshalSize += 1;  // this._numberOfSupplyTypes
-            marshalSize += 2;  // this._serviceRequestPadding
-            for (int idx = 0; idx < this._supplies.Count; idx++)
-            {
-                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is requesting service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
-        public EntityID RequestingEntityID
-        {
-            get
-            {
-                return this._requestingEntityID;
-            }
-
-            set
-            {
-                this._requestingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is providing the service
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "servicingEntityID")]
-        public EntityID ServicingEntityID
-        {
-            get
-            {
-                return this._servicingEntityID;
-            }
-
-            set
-            {
-                this._servicingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of service requested
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "serviceTypeRequested")]
-        public byte ServiceTypeRequested
-        {
-            get
-            {
-                return this._serviceTypeRequested;
-            }
-
-            set
-            {
-                this._serviceTypeRequested = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the How many requested
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
-        public byte NumberOfSupplyTypes
-        {
-            get
-            {
-                return this._numberOfSupplyTypes;
-            }
-
-            set
-            {
-                this._numberOfSupplyTypes = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "serviceRequestPadding")]
-        public short ServiceRequestPadding
-        {
-            get
-            {
-                return this._serviceRequestPadding;
-            }
-
-            set
-            {
-                this._serviceRequestPadding = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the supplies
-        /// </summary>
-        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
-        public List<SupplyQuantity> Supplies
-        {
-            get
-            {
-                return this._supplies;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._requestingEntityID.Marshal(dos);
-                    this._servicingEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._serviceTypeRequested);
-                    dos.WriteUnsignedByte((byte)this._supplies.Count);
-                    dos.WriteShort((short)this._serviceRequestPadding);
-
-                    for (int idx = 0; idx < this._supplies.Count; idx++)
-                    {
-                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                        aSupplyQuantity.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestingEntityID.Unmarshal(dis);
-                    this._servicingEntityID.Unmarshal(dis);
-                    this._serviceTypeRequested = dis.ReadUnsignedByte();
-                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
-                    this._serviceRequestPadding = dis.ReadShort();
-
-                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
-                    {
-                        SupplyQuantity anX = new SupplyQuantity();
-                        anX.Unmarshal(dis);
-                        this._supplies.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ServiceRequestPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestingEntityID>");
-                this._requestingEntityID.Reflection(sb);
-                sb.AppendLine("</requestingEntityID>");
-                sb.AppendLine("<servicingEntityID>");
-                this._servicingEntityID.Reflection(sb);
-                sb.AppendLine("</servicingEntityID>");
-                sb.AppendLine("<serviceTypeRequested type=\"byte\">" + this._serviceTypeRequested.ToString(CultureInfo.InvariantCulture) + "</serviceTypeRequested>");
-                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
-                sb.AppendLine("<serviceRequestPadding type=\"short\">" + this._serviceRequestPadding.ToString(CultureInfo.InvariantCulture) + "</serviceRequestPadding>");
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
-                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
-                    aSupplyQuantity.Reflection(sb);
-                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</ServiceRequestPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ServiceRequestPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ServiceRequestPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._servicingEntityID.Equals(obj._servicingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._serviceTypeRequested != obj._serviceTypeRequested)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._serviceRequestPadding != obj._serviceRequestPadding)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._supplies.Count != obj._supplies.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._servicingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._serviceTypeRequested.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
-            result = GenerateHash(result) ^ this._serviceRequestPadding.GetHashCode();
-
-            if (this._supplies.Count > 0)
-            {
-                for (int idx = 0; idx < this._supplies.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.5.1. Information about a request for supplies. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ServiceRequestPdu : LogisticsFamilyPdu, IEquatable<ServiceRequestPdu>
+    {
+        /// <summary>
+        /// Entity that is requesting service
+        /// </summary>
+        private EntityID _requestingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is providing the service
+        /// </summary>
+        private EntityID _servicingEntityID = new EntityID();
+
+        /// <summary>
+        /// type of service requested
+        /// </summary>
+        private byte _serviceTypeRequested;
+
+        /// <summary>
+        /// How many requested
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _serviceRequestPadding;
+
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServiceRequestPdu"/> class.
+        /// </summary>
+        public ServiceRequestPdu()
+        {
+            PduType = (byte)5;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ServiceRequestPdu left, ServiceRequestPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ServiceRequestPdu left, ServiceRequestPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
+            marshalSize += this._servicingEntityID.GetMarshalledSize();  // this._servicingEntityID
+            marshalSize += 1;  // this._serviceTypeRequested
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._serviceRequestPadding
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is requesting service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
+        public EntityID RequestingEntityID
+        {
+            get
+            {
+                return this._requestingEntityID;
+            }
+
+            set
+            {
+                this._requestingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is providing the service
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "servicingEntityID")]
+        public EntityID ServicingEntityID
+        {
+            get
+            {
+                return this._servicingEntityID;
+            }
+
+            set
+            {
+                this._servicingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of service requested
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "serviceTypeRequested")]
+        public byte ServiceTypeRequested
+        {
+            get
+            {
+                return this._serviceTypeRequested;
+            }
+
+            set
+            {
+                this._serviceTypeRequested = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the How many requested
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "serviceRequestPadding")]
+        public short ServiceRequestPadding
+        {
+            get
+            {
+                return this._serviceRequestPadding;
+            }
+
+            set
+            {
+                this._serviceRequestPadding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the supplies
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._requestingEntityID.Marshal(dos);
+                    this._servicingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._serviceTypeRequested);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._serviceRequestPadding);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestingEntityID.Unmarshal(dis);
+                    this._servicingEntityID.Unmarshal(dis);
+                    this._serviceTypeRequested = dis.ReadUnsignedByte();
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._serviceRequestPadding = dis.ReadShort();
+
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ServiceRequestPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestingEntityID>");
+                this._requestingEntityID.Reflection(sb);
+                sb.AppendLine("</requestingEntityID>");
+                sb.AppendLine("<servicingEntityID>");
+                this._servicingEntityID.Reflection(sb);
+                sb.AppendLine("</servicingEntityID>");
+                sb.AppendLine("<serviceTypeRequested type=\"byte\">" + this._serviceTypeRequested.ToString(CultureInfo.InvariantCulture) + "</serviceTypeRequested>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<serviceRequestPadding type=\"short\">" + this._serviceRequestPadding.ToString(CultureInfo.InvariantCulture) + "</serviceRequestPadding>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ServiceRequestPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ServiceRequestPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ServiceRequestPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._servicingEntityID.Equals(obj._servicingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._serviceTypeRequested != obj._serviceTypeRequested)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._serviceRequestPadding != obj._serviceRequestPadding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._servicingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._serviceTypeRequested.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._serviceRequestPadding.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SetDataPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SetDataPdu.cs
index 6385986..1b0e305 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SetDataPdu.cs
@@ -1,548 +1,548 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6.9. Change state information with the data contained in this. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class SetDataPdu : SimulationManagementFamilyPdu, IEquatable<SetDataPdu>
-    {
-        /// <summary>
-        /// ID of request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private uint _padding1;
-
-        /// <summary>
-        /// Number of fixed datum records
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// Number of variable datum records
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// variable length list of fixed datums
-        /// </summary>
-        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
-
-        /// <summary>
-        /// variable length list of variable length datums
-        /// </summary>
-        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetDataPdu"/> class.
-        /// </summary>
-        public SetDataPdu()
-        {
-            PduType = (byte)19;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SetDataPdu left, SetDataPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SetDataPdu left, SetDataPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._padding1
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
-        public uint Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of fixed datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of variable datum records
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of fixed datums
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatums
-        {
-            get
-            {
-                return this._fixedDatums;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of variable length datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
-
-                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._padding1 = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatums.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SetDataPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SetDataPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SetDataPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SetDataPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatums.Count != obj._fixedDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6.9. Change state information with the data contained in this. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class SetDataPdu : SimulationManagementFamilyPdu, IEquatable<SetDataPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetDataPdu"/> class.
+        /// </summary>
+        public SetDataPdu()
+        {
+            PduType = (byte)19;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SetDataPdu left, SetDataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SetDataPdu left, SetDataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of fixed datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of variable datum records
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SetDataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SetDataPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SetDataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SetDataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SetDataReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SetDataReliablePdu.cs
index 543351c..2d3ef5b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetDataReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SetDataReliablePdu.cs
@@ -1,612 +1,612 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.9: initializing or chaning internal state information, reliable. Needs manual intervention to fix     padding on variable datums. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(FixedDatum))]
-    [XmlInclude(typeof(VariableDatum))]
-    public partial class SetDataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<SetDataReliablePdu>
-    {
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Fixed datum record count
-        /// </summary>
-        private uint _numberOfFixedDatumRecords;
-
-        /// <summary>
-        /// variable datum record count
-        /// </summary>
-        private uint _numberOfVariableDatumRecords;
-
-        /// <summary>
-        /// Fixed datum records
-        /// </summary>
-        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
-
-        /// <summary>
-        /// Variable datum records
-        /// </summary>
-        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetDataReliablePdu"/> class.
-        /// </summary>
-        public SetDataReliablePdu()
-        {
-            PduType = (byte)59;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SetDataReliablePdu left, SetDataReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SetDataReliablePdu left, SetDataReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            marshalSize += 4;  // this._numberOfFixedDatumRecords
-            marshalSize += 4;  // this._numberOfVariableDatumRecords
-            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-            {
-                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-            {
-                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Fixed datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
-        public uint NumberOfFixedDatumRecords
-        {
-            get
-            {
-                return this._numberOfFixedDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfFixedDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the variable datum record count
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
-        public uint NumberOfVariableDatumRecords
-        {
-            get
-            {
-                return this._numberOfVariableDatumRecords;
-            }
-
-            set
-            {
-                this._numberOfVariableDatumRecords = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Fixed datum records
-        /// </summary>
-        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
-        public List<FixedDatum> FixedDatumRecords
-        {
-            get
-            {
-                return this._fixedDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Variable datum records
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
-        public List<VariableDatum> VariableDatumRecords
-        {
-            get
-            {
-                return this._variableDatumRecords;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
-                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
-
-                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                    {
-                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                        aFixedDatum.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                    {
-                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                        aVariableDatum.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
-                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
-                    {
-                        FixedDatum anX = new FixedDatum();
-                        anX.Unmarshal(dis);
-                        this._fixedDatumRecords.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
-                    {
-                        VariableDatum anX = new VariableDatum();
-                        anX.Unmarshal(dis);
-                        this._variableDatumRecords.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SetDataReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
-                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
-                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
-                    aFixedDatum.Reflection(sb);
-                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
-                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
-                    aVariableDatum.Reflection(sb);
-                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SetDataReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SetDataReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SetDataReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
-
-            if (this._fixedDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            if (this._variableDatumRecords.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.9: initializing or chaning internal state information, reliable. Needs manual intervention to fix     padding on variable datums. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class SetDataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<SetDataReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetDataReliablePdu"/> class.
+        /// </summary>
+        public SetDataReliablePdu()
+        {
+            PduType = (byte)59;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SetDataReliablePdu left, SetDataReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SetDataReliablePdu left, SetDataReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable datum record count
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SetDataReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SetDataReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SetDataReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SetDataReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SetRecordReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SetRecordReliablePdu.cs
index befb2db..635c874 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SetRecordReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SetRecordReliablePdu.cs
@@ -1,506 +1,506 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.14: Initializing or changing internal parameter info. Needs manual intervention     to fix padding in recrod set PDUs. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(RecordSet))]
-    public partial class SetRecordReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<SetRecordReliablePdu>
-    {
-        /// <summary>
-        /// request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding. The spec is unclear and contradictory here.
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Number of record sets in list
-        /// </summary>
-        private uint _numberOfRecordSets;
-
-        /// <summary>
-        /// record sets
-        /// </summary>
-        private List<RecordSet> _recordSets = new List<RecordSet>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SetRecordReliablePdu"/> class.
-        /// </summary>
-        public SetRecordReliablePdu()
-        {
-            PduType = (byte)64;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SetRecordReliablePdu left, SetRecordReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SetRecordReliablePdu left, SetRecordReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 4;  // this._requestID
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._numberOfRecordSets
-            for (int idx = 0; idx < this._recordSets.Count; idx++)
-            {
-                RecordSet listElement = (RecordSet)this._recordSets[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding. The spec is unclear and contradictory here.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Number of record sets in list
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfRecordSets method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecordSets")]
-        public uint NumberOfRecordSets
-        {
-            get
-            {
-                return this._numberOfRecordSets;
-            }
-
-            set
-            {
-                this._numberOfRecordSets = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the record sets
-        /// </summary>
-        [XmlElement(ElementName = "recordSetsList", Type = typeof(List<RecordSet>))]
-        public List<RecordSet> RecordSets
-        {
-            get
-            {
-                return this._recordSets;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._recordSets.Count);
-
-                    for (int idx = 0; idx < this._recordSets.Count; idx++)
-                    {
-                        RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
-                        aRecordSet.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._numberOfRecordSets = dis.ReadUnsignedInt();
-
-                    for (int idx = 0; idx < this.NumberOfRecordSets; idx++)
-                    {
-                        RecordSet anX = new RecordSet();
-                        anX.Unmarshal(dis);
-                        this._recordSets.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SetRecordReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<recordSets type=\"uint\">" + this._recordSets.Count.ToString(CultureInfo.InvariantCulture) + "</recordSets>");
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    sb.AppendLine("<recordSets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"RecordSet\">");
-                    RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
-                    aRecordSet.Reflection(sb);
-                    sb.AppendLine("</recordSets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</SetRecordReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SetRecordReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SetRecordReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfRecordSets != obj._numberOfRecordSets)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSets.Count != obj._recordSets.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    if (!this._recordSets[idx].Equals(obj._recordSets[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfRecordSets.GetHashCode();
-
-            if (this._recordSets.Count > 0)
-            {
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._recordSets[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.14: Initializing or changing internal parameter info. Needs manual intervention     to fix padding in recrod set PDUs. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(RecordSet))]
+    public partial class SetRecordReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<SetRecordReliablePdu>
+    {
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding. The spec is unclear and contradictory here.
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Number of record sets in list
+        /// </summary>
+        private uint _numberOfRecordSets;
+
+        /// <summary>
+        /// record sets
+        /// </summary>
+        private List<RecordSet> _recordSets = new List<RecordSet>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetRecordReliablePdu"/> class.
+        /// </summary>
+        public SetRecordReliablePdu()
+        {
+            PduType = (byte)64;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SetRecordReliablePdu left, SetRecordReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SetRecordReliablePdu left, SetRecordReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._numberOfRecordSets
+            for (int idx = 0; idx < this._recordSets.Count; idx++)
+            {
+                RecordSet listElement = (RecordSet)this._recordSets[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding. The spec is unclear and contradictory here.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of record sets in list
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfRecordSets method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecordSets")]
+        public uint NumberOfRecordSets
+        {
+            get
+            {
+                return this._numberOfRecordSets;
+            }
+
+            set
+            {
+                this._numberOfRecordSets = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the record sets
+        /// </summary>
+        [XmlElement(ElementName = "recordSetsList", Type = typeof(List<RecordSet>))]
+        public List<RecordSet> RecordSets
+        {
+            get
+            {
+                return this._recordSets;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._recordSets.Count);
+
+                    for (int idx = 0; idx < this._recordSets.Count; idx++)
+                    {
+                        RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
+                        aRecordSet.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._numberOfRecordSets = dis.ReadUnsignedInt();
+
+                    for (int idx = 0; idx < this.NumberOfRecordSets; idx++)
+                    {
+                        RecordSet anX = new RecordSet();
+                        anX.Unmarshal(dis);
+                        this._recordSets.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SetRecordReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<recordSets type=\"uint\">" + this._recordSets.Count.ToString(CultureInfo.InvariantCulture) + "</recordSets>");
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    sb.AppendLine("<recordSets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"RecordSet\">");
+                    RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
+                    aRecordSet.Reflection(sb);
+                    sb.AppendLine("</recordSets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SetRecordReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SetRecordReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SetRecordReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfRecordSets != obj._numberOfRecordSets)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSets.Count != obj._recordSets.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    if (!this._recordSets[idx].Equals(obj._recordSets[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfRecordSets.GetHashCode();
+
+            if (this._recordSets.Count > 0)
+            {
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._recordSets[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ShaftRPMs.cs b/Libs/CsharpDis6/Dis1998/Generated/ShaftRPMs.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/ShaftRPMs.cs
rename to Libs/CsharpDis6/Dis1998/Generated/ShaftRPMs.cs
index 9b00a25..3fad088 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/ShaftRPMs.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/ShaftRPMs.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Shaft RPMs, used in underwater acoustic clacluations.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class ShaftRPMs
-    {
-        /// <summary>
-        /// Current shaft RPMs
-        /// </summary>
-        private short _currentShaftRPMs;
-
-        /// <summary>
-        /// ordered shaft rpms
-        /// </summary>
-        private short _orderedShaftRPMs;
-
-        /// <summary>
-        /// rate of change of shaft RPMs
-        /// </summary>
-        private float _shaftRPMRateOfChange;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ShaftRPMs"/> class.
-        /// </summary>
-        public ShaftRPMs()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ShaftRPMs left, ShaftRPMs right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ShaftRPMs left, ShaftRPMs right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._currentShaftRPMs
-            marshalSize += 2;  // this._orderedShaftRPMs
-            marshalSize += 4;  // this._shaftRPMRateOfChange
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Current shaft RPMs
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "currentShaftRPMs")]
-        public short CurrentShaftRPMs
-        {
-            get
-            {
-                return this._currentShaftRPMs;
-            }
-
-            set
-            {
-                this._currentShaftRPMs = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ordered shaft rpms
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "orderedShaftRPMs")]
-        public short OrderedShaftRPMs
-        {
-            get
-            {
-                return this._orderedShaftRPMs;
-            }
-
-            set
-            {
-                this._orderedShaftRPMs = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the rate of change of shaft RPMs
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "shaftRPMRateOfChange")]
-        public float ShaftRPMRateOfChange
-        {
-            get
-            {
-                return this._shaftRPMRateOfChange;
-            }
-
-            set
-            {
-                this._shaftRPMRateOfChange = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteShort((short)this._currentShaftRPMs);
-                    dos.WriteShort((short)this._orderedShaftRPMs);
-                    dos.WriteFloat((float)this._shaftRPMRateOfChange);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._currentShaftRPMs = dis.ReadShort();
-                    this._orderedShaftRPMs = dis.ReadShort();
-                    this._shaftRPMRateOfChange = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<ShaftRPMs>");
-            try
-            {
-                sb.AppendLine("<currentShaftRPMs type=\"short\">" + this._currentShaftRPMs.ToString(CultureInfo.InvariantCulture) + "</currentShaftRPMs>");
-                sb.AppendLine("<orderedShaftRPMs type=\"short\">" + this._orderedShaftRPMs.ToString(CultureInfo.InvariantCulture) + "</orderedShaftRPMs>");
-                sb.AppendLine("<shaftRPMRateOfChange type=\"float\">" + this._shaftRPMRateOfChange.ToString(CultureInfo.InvariantCulture) + "</shaftRPMRateOfChange>");
-                sb.AppendLine("</ShaftRPMs>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as ShaftRPMs;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ShaftRPMs obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._currentShaftRPMs != obj._currentShaftRPMs)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._orderedShaftRPMs != obj._orderedShaftRPMs)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._shaftRPMRateOfChange != obj._shaftRPMRateOfChange)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._currentShaftRPMs.GetHashCode();
-            result = GenerateHash(result) ^ this._orderedShaftRPMs.GetHashCode();
-            result = GenerateHash(result) ^ this._shaftRPMRateOfChange.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Shaft RPMs, used in underwater acoustic clacluations.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ShaftRPMs
+    {
+        /// <summary>
+        /// Current shaft RPMs
+        /// </summary>
+        private short _currentShaftRPMs;
+
+        /// <summary>
+        /// ordered shaft rpms
+        /// </summary>
+        private short _orderedShaftRPMs;
+
+        /// <summary>
+        /// rate of change of shaft RPMs
+        /// </summary>
+        private float _shaftRPMRateOfChange;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaftRPMs"/> class.
+        /// </summary>
+        public ShaftRPMs()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ShaftRPMs left, ShaftRPMs right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ShaftRPMs left, ShaftRPMs right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._currentShaftRPMs
+            marshalSize += 2;  // this._orderedShaftRPMs
+            marshalSize += 4;  // this._shaftRPMRateOfChange
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Current shaft RPMs
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "currentShaftRPMs")]
+        public short CurrentShaftRPMs
+        {
+            get
+            {
+                return this._currentShaftRPMs;
+            }
+
+            set
+            {
+                this._currentShaftRPMs = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ordered shaft rpms
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "orderedShaftRPMs")]
+        public short OrderedShaftRPMs
+        {
+            get
+            {
+                return this._orderedShaftRPMs;
+            }
+
+            set
+            {
+                this._orderedShaftRPMs = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rate of change of shaft RPMs
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "shaftRPMRateOfChange")]
+        public float ShaftRPMRateOfChange
+        {
+            get
+            {
+                return this._shaftRPMRateOfChange;
+            }
+
+            set
+            {
+                this._shaftRPMRateOfChange = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteShort((short)this._currentShaftRPMs);
+                    dos.WriteShort((short)this._orderedShaftRPMs);
+                    dos.WriteFloat((float)this._shaftRPMRateOfChange);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._currentShaftRPMs = dis.ReadShort();
+                    this._orderedShaftRPMs = dis.ReadShort();
+                    this._shaftRPMRateOfChange = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ShaftRPMs>");
+            try
+            {
+                sb.AppendLine("<currentShaftRPMs type=\"short\">" + this._currentShaftRPMs.ToString(CultureInfo.InvariantCulture) + "</currentShaftRPMs>");
+                sb.AppendLine("<orderedShaftRPMs type=\"short\">" + this._orderedShaftRPMs.ToString(CultureInfo.InvariantCulture) + "</orderedShaftRPMs>");
+                sb.AppendLine("<shaftRPMRateOfChange type=\"float\">" + this._shaftRPMRateOfChange.ToString(CultureInfo.InvariantCulture) + "</shaftRPMRateOfChange>");
+                sb.AppendLine("</ShaftRPMs>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ShaftRPMs;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ShaftRPMs obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._currentShaftRPMs != obj._currentShaftRPMs)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._orderedShaftRPMs != obj._orderedShaftRPMs)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._shaftRPMRateOfChange != obj._shaftRPMRateOfChange)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._currentShaftRPMs.GetHashCode();
+            result = GenerateHash(result) ^ this._orderedShaftRPMs.GetHashCode();
+            result = GenerateHash(result) ^ this._shaftRPMRateOfChange.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SignalPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SignalPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SignalPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SignalPdu.cs
index 1e786e4..cee79e5 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SignalPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SignalPdu.cs
@@ -1,484 +1,484 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.8.2. Detailed information about a radio transmitter. This PDU requires        manually written code to complete. The encodingScheme field can be used in multiple        ways, which requires hand-written code to finish. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(OneByteChunk))]
-    public partial class SignalPdu : RadioCommunicationsFamilyPdu, IEquatable<SignalPdu>
-    {
-        /// <summary>
-        /// encoding scheme used, and enumeration
-        /// </summary>
-        private ushort _encodingScheme;
-
-        /// <summary>
-        /// tdl type
-        /// </summary>
-        private ushort _tdlType;
-
-        /// <summary>
-        /// sample rate
-        /// </summary>
-        private uint _sampleRate;
-
-        /// <summary>
-        /// length od data
-        /// </summary>
-        private short _dataLength;
-
-        /// <summary>
-        /// number of samples
-        /// </summary>
-        private short _samples;
-
-        /// <summary>
-        /// list of eight bit values
-        /// </summary>
-        private byte[] _data; 
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignalPdu"/> class.
-        /// </summary>
-        public SignalPdu()
-        {
-            PduType = (byte)26;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SignalPdu left, SignalPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SignalPdu left, SignalPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += 2;  // this._encodingScheme
-            marshalSize += 2;  // this._tdlType
-            marshalSize += 4;  // this._sampleRate
-            marshalSize += 2;  // this._dataLength
-            marshalSize += 2;  // this._samples
-            marshalSize += this._data.Length;
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the encoding scheme used, and enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
-        public ushort EncodingScheme
-        {
-            get
-            {
-                return this._encodingScheme;
-            }
-
-            set
-            {
-                this._encodingScheme = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the tdl type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
-        public ushort TdlType
-        {
-            get
-            {
-                return this._tdlType;
-            }
-
-            set
-            {
-                this._tdlType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the sample rate
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
-        public uint SampleRate
-        {
-            get
-            {
-                return this._sampleRate;
-            }
-
-            set
-            {
-                this._sampleRate = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length od data
-        /// </summary>
-        /// <remarks>
-        /// This value must be set to the number of bits that will be used from the Data field.  Normally this value would be in increments of 8.  If this is the case then multiply the number of bytes used in the Data field by 8 and store that number here.ny computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(short), ElementName = "dataLength")]
-        public short DataLength
-        {
-            get
-            {
-                return this._dataLength;
-            }
-
-            set
-            {
-                this._dataLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of samples
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "samples")]
-        public short Samples
-        {
-            get
-            {
-                return this._samples;
-            }
-
-            set
-            {
-                this._samples = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the list of eight bit values
-        /// </summary>
-        [XmlElement(ElementName = "dataList", DataType = "hexBinary")]
-        public byte[] Data
-        {
-            get
-            {
-                return this._data;
-            }
-
-            set
-            {
-                this._data = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
-                    dos.WriteUnsignedShort((ushort)this._tdlType);
-                    dos.WriteUnsignedInt((uint)this._sampleRate);
-                    dos.WriteShort((short)((this._dataLength == 0 && this._data.Length > 0) ? this._data.Length * 8 : this._dataLength)); //09062009 Post processed.  If value is zero then default to every byte will use all 8 bits
-                    dos.WriteShort((short)this._samples);
-
-                    dos.WriteByte(this._data);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._encodingScheme = dis.ReadUnsignedShort();
-                    this._tdlType = dis.ReadUnsignedShort();
-                    this._sampleRate = dis.ReadUnsignedInt();
-                    this._dataLength = dis.ReadShort();
-                    this._samples = dis.ReadShort();
-
-                    this._data = dis.ReadByteArray((this._dataLength / 8) + (this._dataLength % 8 > 0 ? 1 : 0));  //09062009 Post processed. Needed to convert from bits to bytes
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SignalPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
-                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
-                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
-                sb.AppendLine("<data type=\"short\">" + this._data.Length.ToString(CultureInfo.InvariantCulture) + "</data>");
-                sb.AppendLine("<samples type=\"short\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
-                sb.AppendLine("<data type=\"byte[]\">");
-                foreach (byte b in this._data)
-                {
-                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
-                }
-
-                sb.AppendLine("</data>");
-
-                sb.AppendLine("</SignalPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SignalPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SignalPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (this._encodingScheme != obj._encodingScheme)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._tdlType != obj._tdlType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._sampleRate != obj._sampleRate)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._dataLength != obj._dataLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._samples != obj._samples)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._data.Equals(obj._data))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
-            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
-            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
-            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
-            result = GenerateHash(result) ^ this._samples.GetHashCode();
-
-            if (this._data.Length > 0)
-            {
-                for (int idx = 0; idx < this._data.Length; idx++)
-                {
-                    result = GenerateHash(result) ^ this._data[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.8.2. Detailed information about a radio transmitter. This PDU requires        manually written code to complete. The encodingScheme field can be used in multiple        ways, which requires hand-written code to finish. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(OneByteChunk))]
+    public partial class SignalPdu : RadioCommunicationsFamilyPdu, IEquatable<SignalPdu>
+    {
+        /// <summary>
+        /// encoding scheme used, and enumeration
+        /// </summary>
+        private ushort _encodingScheme;
+
+        /// <summary>
+        /// tdl type
+        /// </summary>
+        private ushort _tdlType;
+
+        /// <summary>
+        /// sample rate
+        /// </summary>
+        private uint _sampleRate;
+
+        /// <summary>
+        /// length od data
+        /// </summary>
+        private short _dataLength;
+
+        /// <summary>
+        /// number of samples
+        /// </summary>
+        private short _samples;
+
+        /// <summary>
+        /// list of eight bit values
+        /// </summary>
+        private byte[] _data; 
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SignalPdu"/> class.
+        /// </summary>
+        public SignalPdu()
+        {
+            PduType = (byte)26;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SignalPdu left, SignalPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SignalPdu left, SignalPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._encodingScheme
+            marshalSize += 2;  // this._tdlType
+            marshalSize += 4;  // this._sampleRate
+            marshalSize += 2;  // this._dataLength
+            marshalSize += 2;  // this._samples
+            marshalSize += this._data.Length;
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding scheme used, and enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
+        public ushort EncodingScheme
+        {
+            get
+            {
+                return this._encodingScheme;
+            }
+
+            set
+            {
+                this._encodingScheme = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tdl type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
+        public ushort TdlType
+        {
+            get
+            {
+                return this._tdlType;
+            }
+
+            set
+            {
+                this._tdlType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the sample rate
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
+        public uint SampleRate
+        {
+            get
+            {
+                return this._sampleRate;
+            }
+
+            set
+            {
+                this._sampleRate = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length od data
+        /// </summary>
+        /// <remarks>
+        /// This value must be set to the number of bits that will be used from the Data field.  Normally this value would be in increments of 8.  If this is the case then multiply the number of bytes used in the Data field by 8 and store that number here.ny computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(short), ElementName = "dataLength")]
+        public short DataLength
+        {
+            get
+            {
+                return this._dataLength;
+            }
+
+            set
+            {
+                this._dataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of samples
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "samples")]
+        public short Samples
+        {
+            get
+            {
+                return this._samples;
+            }
+
+            set
+            {
+                this._samples = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of eight bit values
+        /// </summary>
+        [XmlElement(ElementName = "dataList", DataType = "hexBinary")]
+        public byte[] Data
+        {
+            get
+            {
+                return this._data;
+            }
+
+            set
+            {
+                this._data = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
+                    dos.WriteUnsignedShort((ushort)this._tdlType);
+                    dos.WriteUnsignedInt((uint)this._sampleRate);
+                    dos.WriteShort((short)((this._dataLength == 0 && this._data.Length > 0) ? this._data.Length * 8 : this._dataLength)); //09062009 Post processed.  If value is zero then default to every byte will use all 8 bits
+                    dos.WriteShort((short)this._samples);
+
+                    dos.WriteByte(this._data);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._encodingScheme = dis.ReadUnsignedShort();
+                    this._tdlType = dis.ReadUnsignedShort();
+                    this._sampleRate = dis.ReadUnsignedInt();
+                    this._dataLength = dis.ReadShort();
+                    this._samples = dis.ReadShort();
+
+                    this._data = dis.ReadByteArray((this._dataLength / 8) + (this._dataLength % 8 > 0 ? 1 : 0));  //09062009 Post processed. Needed to convert from bits to bytes
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SignalPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
+                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
+                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
+                sb.AppendLine("<data type=\"short\">" + this._data.Length.ToString(CultureInfo.InvariantCulture) + "</data>");
+                sb.AppendLine("<samples type=\"short\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
+                sb.AppendLine("<data type=\"byte[]\">");
+                foreach (byte b in this._data)
+                {
+                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
+                }
+
+                sb.AppendLine("</data>");
+
+                sb.AppendLine("</SignalPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SignalPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SignalPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._encodingScheme != obj._encodingScheme)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._tdlType != obj._tdlType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sampleRate != obj._sampleRate)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataLength != obj._dataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._samples != obj._samples)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._data.Equals(obj._data))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
+            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
+            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
+            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._samples.GetHashCode();
+
+            if (this._data.Length > 0)
+            {
+                for (int idx = 0; idx < this._data.Length; idx++)
+                {
+                    result = GenerateHash(result) ^ this._data[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationAddress.cs b/Libs/CsharpDis6/Dis1998/Generated/SimulationAddress.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationAddress.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SimulationAddress.cs
index 8ff6f7d..6c4ad18 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationAddress.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SimulationAddress.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.14.1. A Simulation Address record shall consist of the Site Identification number and the Application Identification number.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SimulationAddress
-    {
-        /// <summary>
-        /// The site ID
-        /// </summary>
-        private ushort _site;
-
-        /// <summary>
-        /// The application ID
-        /// </summary>
-        private ushort _application;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationAddress"/> class.
-        /// </summary>
-        public SimulationAddress()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationAddress left, SimulationAddress right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationAddress left, SimulationAddress right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._site
-            marshalSize += 2;  // this._application
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the The site ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "site")]
-        public ushort Site
-        {
-            get
-            {
-                return this._site;
-            }
-
-            set
-            {
-                this._site = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The application ID
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "application")]
-        public ushort Application
-        {
-            get
-            {
-                return this._application;
-            }
-
-            set
-            {
-                this._application = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._site);
-                    dos.WriteUnsignedShort((ushort)this._application);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._site = dis.ReadUnsignedShort();
-                    this._application = dis.ReadUnsignedShort();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationAddress>");
-            try
-            {
-                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
-                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
-                sb.AppendLine("</SimulationAddress>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationAddress;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationAddress obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._site != obj._site)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._application != obj._application)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._site.GetHashCode();
-            result = GenerateHash(result) ^ this._application.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.14.1. A Simulation Address record shall consist of the Site Identification number and the Application Identification number.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SimulationAddress
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationAddress"/> class.
+        /// </summary>
+        public SimulationAddress()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationAddress left, SimulationAddress right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationAddress left, SimulationAddress right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationAddress>");
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("</SimulationAddress>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationAddress;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationAddress obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SimulationManagementFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SimulationManagementFamilyPdu.cs
index b8982a4..8d99264 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SimulationManagementFamilyPdu.cs
@@ -1,341 +1,341 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.6. Abstract superclass for PDUs relating to the simulation itself. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SimulationManagementFamilyPdu : Pdu, IEquatable<SimulationManagementFamilyPdu>
-    {
-        /// <summary>
-        /// Entity that is sending message
-        /// </summary>
-        private EntityID _originatingEntityID = new EntityID();
-
-        /// <summary>
-        /// Entity that is intended to receive message
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationManagementFamilyPdu"/> class.
-        /// </summary>
-        public SimulationManagementFamilyPdu()
-        {
-            ProtocolFamily = (byte)5;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is sending message
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
-        public EntityID OriginatingEntityID
-        {
-            get
-            {
-                return this._originatingEntityID;
-            }
-
-            set
-            {
-                this._originatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Entity that is intended to receive message
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Marshal(dos);
-                    this._receivingEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Unmarshal(dis);
-                    this._receivingEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationManagementFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingEntityID>");
-                this._originatingEntityID.Reflection(sb);
-                sb.AppendLine("</originatingEntityID>");
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("</SimulationManagementFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationManagementFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationManagementFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.6. Abstract superclass for PDUs relating to the simulation itself. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SimulationManagementFamilyPdu : Pdu, IEquatable<SimulationManagementFamilyPdu>
+    {
+        /// <summary>
+        /// Entity that is sending message
+        /// </summary>
+        private EntityID _originatingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is intended to receive message
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationManagementFamilyPdu"/> class.
+        /// </summary>
+        public SimulationManagementFamilyPdu()
+        {
+            ProtocolFamily = (byte)5;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is sending message
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
+        public EntityID OriginatingEntityID
+        {
+            get
+            {
+                return this._originatingEntityID;
+            }
+
+            set
+            {
+                this._originatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is intended to receive message
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Marshal(dos);
+                    this._receivingEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Unmarshal(dis);
+                    this._receivingEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationManagementFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingEntityID>");
+                this._originatingEntityID.Reflection(sb);
+                sb.AppendLine("</originatingEntityID>");
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("</SimulationManagementFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationManagementFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationManagementFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
index d706f38..f26861e 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SimulationManagementWithReliabilityFamilyPdu.cs
@@ -1,341 +1,341 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12: Abstract superclass for reliable simulation management PDUs
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class SimulationManagementWithReliabilityFamilyPdu : Pdu, IEquatable<SimulationManagementWithReliabilityFamilyPdu>
-    {
-        /// <summary>
-        /// Object originatig the request
-        /// </summary>
-        private EntityID _originatingEntityID = new EntityID();
-
-        /// <summary>
-        /// Object with which this point object is associated
-        /// </summary>
-        private EntityID _receivingEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimulationManagementWithReliabilityFamilyPdu"/> class.
-        /// </summary>
-        public SimulationManagementWithReliabilityFamilyPdu()
-        {
-            ProtocolFamily = (byte)10;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
-            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Object originatig the request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
-        public EntityID OriginatingEntityID
-        {
-            get
-            {
-                return this._originatingEntityID;
-            }
-
-            set
-            {
-                this._originatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Object with which this point object is associated
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
-        public EntityID ReceivingEntityID
-        {
-            get
-            {
-                return this._receivingEntityID;
-            }
-
-            set
-            {
-                this._receivingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Marshal(dos);
-                    this._receivingEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._originatingEntityID.Unmarshal(dis);
-                    this._receivingEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SimulationManagementWithReliabilityFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<originatingEntityID>");
-                this._originatingEntityID.Reflection(sb);
-                sb.AppendLine("</originatingEntityID>");
-                sb.AppendLine("<receivingEntityID>");
-                this._receivingEntityID.Reflection(sb);
-                sb.AppendLine("</receivingEntityID>");
-                sb.AppendLine("</SimulationManagementWithReliabilityFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SimulationManagementWithReliabilityFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SimulationManagementWithReliabilityFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12: Abstract superclass for reliable simulation management PDUs
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SimulationManagementWithReliabilityFamilyPdu : Pdu, IEquatable<SimulationManagementWithReliabilityFamilyPdu>
+    {
+        /// <summary>
+        /// Object originatig the request
+        /// </summary>
+        private EntityID _originatingEntityID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationManagementWithReliabilityFamilyPdu"/> class.
+        /// </summary>
+        public SimulationManagementWithReliabilityFamilyPdu()
+        {
+            ProtocolFamily = (byte)10;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object originatig the request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
+        public EntityID OriginatingEntityID
+        {
+            get
+            {
+                return this._originatingEntityID;
+            }
+
+            set
+            {
+                this._originatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Marshal(dos);
+                    this._receivingEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Unmarshal(dis);
+                    this._receivingEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationManagementWithReliabilityFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingEntityID>");
+                this._originatingEntityID.Reflection(sb);
+                sb.AppendLine("</originatingEntityID>");
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("</SimulationManagementWithReliabilityFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationManagementWithReliabilityFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationManagementWithReliabilityFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SixByteChunk.cs b/Libs/CsharpDis6/Dis1998/Generated/SixByteChunk.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SixByteChunk.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SixByteChunk.cs
index 21d5f6c..0b2ba22 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SixByteChunk.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SixByteChunk.cs
@@ -1,324 +1,324 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 48 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SixByteChunk
-    {
-        /// <summary>
-        /// six bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[6];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SixByteChunk"/> class.
-        /// </summary>
-        public SixByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SixByteChunk left, SixByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SixByteChunk left, SixByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 6 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the six bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SixByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</SixByteChunk>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SixByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SixByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 6) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 6; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            for (int idx = 0; idx < 6; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 48 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SixByteChunk
+    {
+        /// <summary>
+        /// six bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[6];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SixByteChunk"/> class.
+        /// </summary>
+        public SixByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SixByteChunk left, SixByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SixByteChunk left, SixByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 6 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the six bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SixByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</SixByteChunk>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SixByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SixByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 6) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 6; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            for (int idx = 0; idx < 6; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs b/Libs/CsharpDis6/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
index 2852284..85db9cf 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SphericalHarmonicAntennaPattern.cs
@@ -1,297 +1,297 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is of value 2.         Specified the direction and radiation pattern from a radio transmitter's antenna.        NOTE: this class must be hand-coded to clean up some implementation details.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SphericalHarmonicAntennaPattern
-    {
-        private byte _order;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SphericalHarmonicAntennaPattern"/> class.
-        /// </summary>
-        public SphericalHarmonicAntennaPattern()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 1;  // this._order
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the order
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "order")]
-        public byte Order
-        {
-            get
-            {
-                return this._order;
-            }
-
-            set
-            {
-                this._order = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteByte((byte)this._order);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._order = dis.ReadByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SphericalHarmonicAntennaPattern>");
-            try
-            {
-                sb.AppendLine("<order type=\"byte\">" + this._order.ToString(CultureInfo.InvariantCulture) + "</order>");
-                sb.AppendLine("</SphericalHarmonicAntennaPattern>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SphericalHarmonicAntennaPattern;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SphericalHarmonicAntennaPattern obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._order != obj._order)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._order.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.4.3. Used when the antenna pattern type in the transmitter pdu is of value 2.         Specified the direction and radiation pattern from a radio transmitter's antenna.        NOTE: this class must be hand-coded to clean up some implementation details.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SphericalHarmonicAntennaPattern
+    {
+        private byte _order;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SphericalHarmonicAntennaPattern"/> class.
+        /// </summary>
+        public SphericalHarmonicAntennaPattern()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SphericalHarmonicAntennaPattern left, SphericalHarmonicAntennaPattern right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._order
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the order
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "order")]
+        public byte Order
+        {
+            get
+            {
+                return this._order;
+            }
+
+            set
+            {
+                this._order = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteByte((byte)this._order);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._order = dis.ReadByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SphericalHarmonicAntennaPattern>");
+            try
+            {
+                sb.AppendLine("<order type=\"byte\">" + this._order.ToString(CultureInfo.InvariantCulture) + "</order>");
+                sb.AppendLine("</SphericalHarmonicAntennaPattern>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SphericalHarmonicAntennaPattern;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SphericalHarmonicAntennaPattern obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._order != obj._order)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._order.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/StartResumePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/StartResumePdu.cs
index 2917790..f4a6d46 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/StartResumePdu.cs
@@ -1,373 +1,373 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.6.3. Start or resume an exercise. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StartResumePdu : SimulationManagementFamilyPdu, IEquatable<StartResumePdu>
-    {
-        /// <summary>
-        /// UTC time at which the simulation shall start or resume
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// Simulation clock time at which the simulation shall start or resume
-        /// </summary>
-        private ClockTime _simulationTime = new ClockTime();
-
-        /// <summary>
-        /// Identifier for the request
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartResumePdu"/> class.
-        /// </summary>
-        public StartResumePdu()
-        {
-            PduType = (byte)13;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StartResumePdu left, StartResumePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StartResumePdu left, StartResumePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the UTC time at which the simulation shall start or resume
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Simulation clock time at which the simulation shall start or resume
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
-        public ClockTime SimulationTime
-        {
-            get
-            {
-                return this._simulationTime;
-            }
-
-            set
-            {
-                this._simulationTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Identifier for the request
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    this._simulationTime.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._simulationTime.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StartResumePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<simulationTime>");
-                this._simulationTime.Reflection(sb);
-                sb.AppendLine("</simulationTime>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StartResumePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StartResumePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StartResumePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._simulationTime.Equals(obj._simulationTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.6.3. Start or resume an exercise. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StartResumePdu : SimulationManagementFamilyPdu, IEquatable<StartResumePdu>
+    {
+        /// <summary>
+        /// UTC time at which the simulation shall start or resume
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// Simulation clock time at which the simulation shall start or resume
+        /// </summary>
+        private ClockTime _simulationTime = new ClockTime();
+
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartResumePdu"/> class.
+        /// </summary>
+        public StartResumePdu()
+        {
+            PduType = (byte)13;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StartResumePdu left, StartResumePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StartResumePdu left, StartResumePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the UTC time at which the simulation shall start or resume
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Simulation clock time at which the simulation shall start or resume
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
+        public ClockTime SimulationTime
+        {
+            get
+            {
+                return this._simulationTime;
+            }
+
+            set
+            {
+                this._simulationTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    this._simulationTime.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._simulationTime.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StartResumePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<simulationTime>");
+                this._simulationTime.Reflection(sb);
+                sb.AppendLine("</simulationTime>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StartResumePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StartResumePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StartResumePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._simulationTime.Equals(obj._simulationTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/StartResumeReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/StartResumeReliablePdu.cs
index 9e0831d..7baa785 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StartResumeReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/StartResumeReliablePdu.cs
@@ -1,469 +1,469 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.3: Start resume simulation, relaible. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StartResumeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StartResumeReliablePdu>
-    {
-        /// <summary>
-        /// time in real world for this operation to happen
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// time in simulation for the simulation to resume
-        /// </summary>
-        private ClockTime _simulationTime = new ClockTime();
-
-        /// <summary>
-        /// level of reliability service used for this transaction
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _pad1;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad2;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StartResumeReliablePdu"/> class.
-        /// </summary>
-        public StartResumeReliablePdu()
-        {
-            PduType = (byte)53;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StartResumeReliablePdu left, StartResumeReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StartResumeReliablePdu left, StartResumeReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 2;  // this._pad1
-            marshalSize += 1;  // this._pad2
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the time in real world for this operation to happen
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the time in simulation for the simulation to resume
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
-        public ClockTime SimulationTime
-        {
-            get
-            {
-                return this._simulationTime;
-            }
-
-            set
-            {
-                this._simulationTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the level of reliability service used for this transaction
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
-        public ushort Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
-        public byte Pad2
-        {
-            get
-            {
-                return this._pad2;
-            }
-
-            set
-            {
-                this._pad2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    this._simulationTime.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedShort((ushort)this._pad1);
-                    dos.WriteUnsignedByte((byte)this._pad2);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._simulationTime.Unmarshal(dis);
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedShort();
-                    this._pad2 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StartResumeReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<simulationTime>");
-                this._simulationTime.Reflection(sb);
-                sb.AppendLine("</simulationTime>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StartResumeReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StartResumeReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StartResumeReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._simulationTime.Equals(obj._simulationTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad2 != obj._pad2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._pad2.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.3: Start resume simulation, relaible. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StartResumeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StartResumeReliablePdu>
+    {
+        /// <summary>
+        /// time in real world for this operation to happen
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// time in simulation for the simulation to resume
+        /// </summary>
+        private ClockTime _simulationTime = new ClockTime();
+
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartResumeReliablePdu"/> class.
+        /// </summary>
+        public StartResumeReliablePdu()
+        {
+            PduType = (byte)53;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StartResumeReliablePdu left, StartResumeReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StartResumeReliablePdu left, StartResumeReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the time in real world for this operation to happen
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time in simulation for the simulation to resume
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
+        public ClockTime SimulationTime
+        {
+            get
+            {
+                return this._simulationTime;
+            }
+
+            set
+            {
+                this._simulationTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    this._simulationTime.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._simulationTime.Unmarshal(dis);
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StartResumeReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<simulationTime>");
+                this._simulationTime.Reflection(sb);
+                sb.AppendLine("</simulationTime>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StartResumeReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StartResumeReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StartResumeReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._simulationTime.Equals(obj._simulationTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/StopFreezePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/StopFreezePdu.cs
index 5dfff51..5010063 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/StopFreezePdu.cs
@@ -1,435 +1,435 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.3.4. Stop or freeze an exercise. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StopFreezePdu : SimulationManagementFamilyPdu, IEquatable<StopFreezePdu>
-    {
-        /// <summary>
-        /// UTC time at which the simulation shall stop or freeze
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// Reason the simulation was stopped or frozen
-        /// </summary>
-        private byte _reason;
-
-        /// <summary>
-        /// Internal behavior of the simulation and its appearance while frozento the other participants
-        /// </summary>
-        private byte _frozenBehavior;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private short _padding1;
-
-        /// <summary>
-        /// Request ID that is unique
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StopFreezePdu"/> class.
-        /// </summary>
-        public StopFreezePdu()
-        {
-            PduType = (byte)14;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StopFreezePdu left, StopFreezePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StopFreezePdu left, StopFreezePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += 1;  // this._reason
-            marshalSize += 1;  // this._frozenBehavior
-            marshalSize += 2;  // this._padding1
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the UTC time at which the simulation shall stop or freeze
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Reason the simulation was stopped or frozen
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "reason")]
-        public byte Reason
-        {
-            get
-            {
-                return this._reason;
-            }
-
-            set
-            {
-                this._reason = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Internal behavior of the simulation and its appearance while frozento the other participants
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
-        public byte FrozenBehavior
-        {
-            get
-            {
-                return this._frozenBehavior;
-            }
-
-            set
-            {
-                this._frozenBehavior = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(short), ElementName = "padding1")]
-        public short Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID that is unique
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._reason);
-                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
-                    dos.WriteShort((short)this._padding1);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._reason = dis.ReadUnsignedByte();
-                    this._frozenBehavior = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadShort();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StopFreezePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
-                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
-                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StopFreezePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StopFreezePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StopFreezePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._reason != obj._reason)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frozenBehavior != obj._frozenBehavior)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._reason.GetHashCode();
-            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.3.4. Stop or freeze an exercise. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StopFreezePdu : SimulationManagementFamilyPdu, IEquatable<StopFreezePdu>
+    {
+        /// <summary>
+        /// UTC time at which the simulation shall stop or freeze
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// Reason the simulation was stopped or frozen
+        /// </summary>
+        private byte _reason;
+
+        /// <summary>
+        /// Internal behavior of the simulation and its appearance while frozento the other participants
+        /// </summary>
+        private byte _frozenBehavior;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StopFreezePdu"/> class.
+        /// </summary>
+        public StopFreezePdu()
+        {
+            PduType = (byte)14;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StopFreezePdu left, StopFreezePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StopFreezePdu left, StopFreezePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += 1;  // this._reason
+            marshalSize += 1;  // this._frozenBehavior
+            marshalSize += 2;  // this._padding1
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the UTC time at which the simulation shall stop or freeze
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Reason the simulation was stopped or frozen
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "reason")]
+        public byte Reason
+        {
+            get
+            {
+                return this._reason;
+            }
+
+            set
+            {
+                this._reason = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Internal behavior of the simulation and its appearance while frozento the other participants
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
+        public byte FrozenBehavior
+        {
+            get
+            {
+                return this._frozenBehavior;
+            }
+
+            set
+            {
+                this._frozenBehavior = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._reason);
+                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._reason = dis.ReadUnsignedByte();
+                    this._frozenBehavior = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StopFreezePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
+                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StopFreezePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StopFreezePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StopFreezePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._reason != obj._reason)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frozenBehavior != obj._frozenBehavior)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._reason.GetHashCode();
+            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs b/Libs/CsharpDis6/Dis1998/Generated/StopFreezeReliablePdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/StopFreezeReliablePdu.cs
index 912d0e9..2d06f25 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/StopFreezeReliablePdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/StopFreezeReliablePdu.cs
@@ -1,467 +1,467 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(ClockTime))]
-    public partial class StopFreezeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StopFreezeReliablePdu>
-    {
-        /// <summary>
-        /// time in real world for this operation to happen
-        /// </summary>
-        private ClockTime _realWorldTime = new ClockTime();
-
-        /// <summary>
-        /// Reason for stopping/freezing simulation
-        /// </summary>
-        private byte _reason;
-
-        /// <summary>
-        /// internal behvior of the simulation while frozen
-        /// </summary>
-        private byte _frozenBehavior;
-
-        /// <summary>
-        /// reliablity level
-        /// </summary>
-        private byte _requiredReliablityService;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad1;
-
-        /// <summary>
-        /// Request ID
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StopFreezeReliablePdu"/> class.
-        /// </summary>
-        public StopFreezeReliablePdu()
-        {
-            PduType = (byte)54;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
-            marshalSize += 1;  // this._reason
-            marshalSize += 1;  // this._frozenBehavior
-            marshalSize += 1;  // this._requiredReliablityService
-            marshalSize += 1;  // this._pad1
-            marshalSize += 4;  // this._requestID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the time in real world for this operation to happen
-        /// </summary>
-        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
-        public ClockTime RealWorldTime
-        {
-            get
-            {
-                return this._realWorldTime;
-            }
-
-            set
-            {
-                this._realWorldTime = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Reason for stopping/freezing simulation
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "reason")]
-        public byte Reason
-        {
-            get
-            {
-                return this._reason;
-            }
-
-            set
-            {
-                this._reason = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the internal behvior of the simulation while frozen
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
-        public byte FrozenBehavior
-        {
-            get
-            {
-                return this._frozenBehavior;
-            }
-
-            set
-            {
-                this._frozenBehavior = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the reliablity level
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliablityService")]
-        public byte RequiredReliablityService
-        {
-            get
-            {
-                return this._requiredReliablityService;
-            }
-
-            set
-            {
-                this._requiredReliablityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad1")]
-        public byte Pad1
-        {
-            get
-            {
-                return this._pad1;
-            }
-
-            set
-            {
-                this._pad1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Request ID
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._realWorldTime.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._reason);
-                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
-                    dos.WriteUnsignedByte((byte)this._requiredReliablityService);
-                    dos.WriteUnsignedByte((byte)this._pad1);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._realWorldTime.Unmarshal(dis);
-                    this._reason = dis.ReadUnsignedByte();
-                    this._frozenBehavior = dis.ReadUnsignedByte();
-                    this._requiredReliablityService = dis.ReadUnsignedByte();
-                    this._pad1 = dis.ReadUnsignedByte();
-                    this._requestID = dis.ReadUnsignedInt();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<StopFreezeReliablePdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<realWorldTime>");
-                this._realWorldTime.Reflection(sb);
-                sb.AppendLine("</realWorldTime>");
-                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
-                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
-                sb.AppendLine("<requiredReliablityService type=\"byte\">" + this._requiredReliablityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliablityService>");
-                sb.AppendLine("<pad1 type=\"byte\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("</StopFreezeReliablePdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as StopFreezeReliablePdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(StopFreezeReliablePdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._realWorldTime.Equals(obj._realWorldTime))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._reason != obj._reason)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frozenBehavior != obj._frozenBehavior)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliablityService != obj._requiredReliablityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad1 != obj._pad1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
-            result = GenerateHash(result) ^ this._reason.GetHashCode();
-            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliablityService.GetHashCode();
-            result = GenerateHash(result) ^ this._pad1.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StopFreezeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StopFreezeReliablePdu>
+    {
+        /// <summary>
+        /// time in real world for this operation to happen
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// Reason for stopping/freezing simulation
+        /// </summary>
+        private byte _reason;
+
+        /// <summary>
+        /// internal behvior of the simulation while frozen
+        /// </summary>
+        private byte _frozenBehavior;
+
+        /// <summary>
+        /// reliablity level
+        /// </summary>
+        private byte _requiredReliablityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad1;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StopFreezeReliablePdu"/> class.
+        /// </summary>
+        public StopFreezeReliablePdu()
+        {
+            PduType = (byte)54;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += 1;  // this._reason
+            marshalSize += 1;  // this._frozenBehavior
+            marshalSize += 1;  // this._requiredReliablityService
+            marshalSize += 1;  // this._pad1
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the time in real world for this operation to happen
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Reason for stopping/freezing simulation
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "reason")]
+        public byte Reason
+        {
+            get
+            {
+                return this._reason;
+            }
+
+            set
+            {
+                this._reason = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the internal behvior of the simulation while frozen
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
+        public byte FrozenBehavior
+        {
+            get
+            {
+                return this._frozenBehavior;
+            }
+
+            set
+            {
+                this._frozenBehavior = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the reliablity level
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliablityService")]
+        public byte RequiredReliablityService
+        {
+            get
+            {
+                return this._requiredReliablityService;
+            }
+
+            set
+            {
+                this._requiredReliablityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad1")]
+        public byte Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._reason);
+                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
+                    dos.WriteUnsignedByte((byte)this._requiredReliablityService);
+                    dos.WriteUnsignedByte((byte)this._pad1);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._reason = dis.ReadUnsignedByte();
+                    this._frozenBehavior = dis.ReadUnsignedByte();
+                    this._requiredReliablityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StopFreezeReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
+                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
+                sb.AppendLine("<requiredReliablityService type=\"byte\">" + this._requiredReliablityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliablityService>");
+                sb.AppendLine("<pad1 type=\"byte\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StopFreezeReliablePdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StopFreezeReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StopFreezeReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._reason != obj._reason)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frozenBehavior != obj._frozenBehavior)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliablityService != obj._requiredReliablityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._reason.GetHashCode();
+            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliablityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SupplyQuantity.cs b/Libs/CsharpDis6/Dis1998/Generated/SupplyQuantity.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SupplyQuantity.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SupplyQuantity.cs
index fde70c2..9be956b 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SupplyQuantity.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SupplyQuantity.cs
@@ -1,335 +1,335 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.30. A supply, and the amount of that supply. Similar to an entity kind but with the addition of a quantity.
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityType))]
-    public partial class SupplyQuantity
-    {
-        /// <summary>
-        /// Type of supply
-        /// </summary>
-        private EntityType _supplyType = new EntityType();
-
-        /// <summary>
-        /// quantity to be supplied
-        /// </summary>
-        private byte _quantity;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SupplyQuantity"/> class.
-        /// </summary>
-        public SupplyQuantity()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SupplyQuantity left, SupplyQuantity right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SupplyQuantity left, SupplyQuantity right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._supplyType.GetMarshalledSize();  // this._supplyType
-            marshalSize += 1;  // this._quantity
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of supply
-        /// </summary>
-        [XmlElement(Type = typeof(EntityType), ElementName = "supplyType")]
-        public EntityType SupplyType
-        {
-            get
-            {
-                return this._supplyType;
-            }
-
-            set
-            {
-                this._supplyType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the quantity to be supplied
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "quantity")]
-        public byte Quantity
-        {
-            get
-            {
-                return this._quantity;
-            }
-
-            set
-            {
-                this._quantity = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._supplyType.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._quantity);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._supplyType.Unmarshal(dis);
-                    this._quantity = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SupplyQuantity>");
-            try
-            {
-                sb.AppendLine("<supplyType>");
-                this._supplyType.Reflection(sb);
-                sb.AppendLine("</supplyType>");
-                sb.AppendLine("<quantity type=\"byte\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
-                sb.AppendLine("</SupplyQuantity>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SupplyQuantity;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SupplyQuantity obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._supplyType.Equals(obj._supplyType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._quantity != obj._quantity)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._supplyType.GetHashCode();
-            result = GenerateHash(result) ^ this._quantity.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.30. A supply, and the amount of that supply. Similar to an entity kind but with the addition of a quantity.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class SupplyQuantity
+    {
+        /// <summary>
+        /// Type of supply
+        /// </summary>
+        private EntityType _supplyType = new EntityType();
+
+        /// <summary>
+        /// quantity to be supplied
+        /// </summary>
+        private byte _quantity;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SupplyQuantity"/> class.
+        /// </summary>
+        public SupplyQuantity()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SupplyQuantity left, SupplyQuantity right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SupplyQuantity left, SupplyQuantity right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._supplyType.GetMarshalledSize();  // this._supplyType
+            marshalSize += 1;  // this._quantity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of supply
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "supplyType")]
+        public EntityType SupplyType
+        {
+            get
+            {
+                return this._supplyType;
+            }
+
+            set
+            {
+                this._supplyType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the quantity to be supplied
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "quantity")]
+        public byte Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._supplyType.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._quantity);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._supplyType.Unmarshal(dis);
+                    this._quantity = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SupplyQuantity>");
+            try
+            {
+                sb.AppendLine("<supplyType>");
+                this._supplyType.Reflection(sb);
+                sb.AppendLine("</supplyType>");
+                sb.AppendLine("<quantity type=\"byte\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("</SupplyQuantity>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SupplyQuantity;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SupplyQuantity obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._supplyType.Equals(obj._supplyType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._supplyType.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
index 8de4b9a..3d4a959 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SyntheticEnvironmentFamilyPdu.cs
@@ -1,271 +1,271 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.11: Abstract superclass for synthetic environment PDUs
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SyntheticEnvironmentFamilyPdu : Pdu, IEquatable<SyntheticEnvironmentFamilyPdu>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SyntheticEnvironmentFamilyPdu"/> class.
-        /// </summary>
-        public SyntheticEnvironmentFamilyPdu()
-        {
-            ProtocolFamily = (byte)9;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SyntheticEnvironmentFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("</SyntheticEnvironmentFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SyntheticEnvironmentFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SyntheticEnvironmentFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.11: Abstract superclass for synthetic environment PDUs
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SyntheticEnvironmentFamilyPdu : Pdu, IEquatable<SyntheticEnvironmentFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SyntheticEnvironmentFamilyPdu"/> class.
+        /// </summary>
+        public SyntheticEnvironmentFamilyPdu()
+        {
+            ProtocolFamily = (byte)9;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SyntheticEnvironmentFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</SyntheticEnvironmentFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SyntheticEnvironmentFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SyntheticEnvironmentFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SystemID.cs b/Libs/CsharpDis6/Dis1998/Generated/SystemID.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/SystemID.cs
rename to Libs/CsharpDis6/Dis1998/Generated/SystemID.cs
index ed431f4..aeda573 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/SystemID.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/SystemID.cs
@@ -1,396 +1,396 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 5.2.58. Used in IFF ATC PDU
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class SystemID
-    {
-        /// <summary>
-        /// System Type
-        /// </summary>
-        private ushort _systemType;
-
-        /// <summary>
-        /// System name, an enumeration
-        /// </summary>
-        private ushort _systemName;
-
-        /// <summary>
-        /// System mode
-        /// </summary>
-        private byte _systemMode;
-
-        /// <summary>
-        /// Change Options
-        /// </summary>
-        private byte _changeOptions;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SystemID"/> class.
-        /// </summary>
-        public SystemID()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SystemID left, SystemID right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SystemID left, SystemID right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2;  // this._systemType
-            marshalSize += 2;  // this._systemName
-            marshalSize += 1;  // this._systemMode
-            marshalSize += 1;  // this._changeOptions
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the System Type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "systemType")]
-        public ushort SystemType
-        {
-            get
-            {
-                return this._systemType;
-            }
-
-            set
-            {
-                this._systemType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the System name, an enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "systemName")]
-        public ushort SystemName
-        {
-            get
-            {
-                return this._systemName;
-            }
-
-            set
-            {
-                this._systemName = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the System mode
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "systemMode")]
-        public byte SystemMode
-        {
-            get
-            {
-                return this._systemMode;
-            }
-
-            set
-            {
-                this._systemMode = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Change Options
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "changeOptions")]
-        public byte ChangeOptions
-        {
-            get
-            {
-                return this._changeOptions;
-            }
-
-            set
-            {
-                this._changeOptions = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedShort((ushort)this._systemType);
-                    dos.WriteUnsignedShort((ushort)this._systemName);
-                    dos.WriteUnsignedByte((byte)this._systemMode);
-                    dos.WriteUnsignedByte((byte)this._changeOptions);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._systemType = dis.ReadUnsignedShort();
-                    this._systemName = dis.ReadUnsignedShort();
-                    this._systemMode = dis.ReadUnsignedByte();
-                    this._changeOptions = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<SystemID>");
-            try
-            {
-                sb.AppendLine("<systemType type=\"ushort\">" + this._systemType.ToString(CultureInfo.InvariantCulture) + "</systemType>");
-                sb.AppendLine("<systemName type=\"ushort\">" + this._systemName.ToString(CultureInfo.InvariantCulture) + "</systemName>");
-                sb.AppendLine("<systemMode type=\"byte\">" + this._systemMode.ToString(CultureInfo.InvariantCulture) + "</systemMode>");
-                sb.AppendLine("<changeOptions type=\"byte\">" + this._changeOptions.ToString(CultureInfo.InvariantCulture) + "</changeOptions>");
-                sb.AppendLine("</SystemID>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as SystemID;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SystemID obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._systemType != obj._systemType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systemName != obj._systemName)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._systemMode != obj._systemMode)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._changeOptions != obj._changeOptions)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._systemType.GetHashCode();
-            result = GenerateHash(result) ^ this._systemName.GetHashCode();
-            result = GenerateHash(result) ^ this._systemMode.GetHashCode();
-            result = GenerateHash(result) ^ this._changeOptions.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 5.2.58. Used in IFF ATC PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SystemID
+    {
+        /// <summary>
+        /// System Type
+        /// </summary>
+        private ushort _systemType;
+
+        /// <summary>
+        /// System name, an enumeration
+        /// </summary>
+        private ushort _systemName;
+
+        /// <summary>
+        /// System mode
+        /// </summary>
+        private byte _systemMode;
+
+        /// <summary>
+        /// Change Options
+        /// </summary>
+        private byte _changeOptions;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SystemID"/> class.
+        /// </summary>
+        public SystemID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SystemID left, SystemID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SystemID left, SystemID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._systemType
+            marshalSize += 2;  // this._systemName
+            marshalSize += 1;  // this._systemMode
+            marshalSize += 1;  // this._changeOptions
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the System Type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "systemType")]
+        public ushort SystemType
+        {
+            get
+            {
+                return this._systemType;
+            }
+
+            set
+            {
+                this._systemType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the System name, an enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "systemName")]
+        public ushort SystemName
+        {
+            get
+            {
+                return this._systemName;
+            }
+
+            set
+            {
+                this._systemName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the System mode
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "systemMode")]
+        public byte SystemMode
+        {
+            get
+            {
+                return this._systemMode;
+            }
+
+            set
+            {
+                this._systemMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Change Options
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "changeOptions")]
+        public byte ChangeOptions
+        {
+            get
+            {
+                return this._changeOptions;
+            }
+
+            set
+            {
+                this._changeOptions = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._systemType);
+                    dos.WriteUnsignedShort((ushort)this._systemName);
+                    dos.WriteUnsignedByte((byte)this._systemMode);
+                    dos.WriteUnsignedByte((byte)this._changeOptions);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._systemType = dis.ReadUnsignedShort();
+                    this._systemName = dis.ReadUnsignedShort();
+                    this._systemMode = dis.ReadUnsignedByte();
+                    this._changeOptions = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SystemID>");
+            try
+            {
+                sb.AppendLine("<systemType type=\"ushort\">" + this._systemType.ToString(CultureInfo.InvariantCulture) + "</systemType>");
+                sb.AppendLine("<systemName type=\"ushort\">" + this._systemName.ToString(CultureInfo.InvariantCulture) + "</systemName>");
+                sb.AppendLine("<systemMode type=\"byte\">" + this._systemMode.ToString(CultureInfo.InvariantCulture) + "</systemMode>");
+                sb.AppendLine("<changeOptions type=\"byte\">" + this._changeOptions.ToString(CultureInfo.InvariantCulture) + "</changeOptions>");
+                sb.AppendLine("</SystemID>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SystemID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SystemID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._systemType != obj._systemType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systemName != obj._systemName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systemMode != obj._systemMode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._changeOptions != obj._changeOptions)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._systemType.GetHashCode();
+            result = GenerateHash(result) ^ this._systemName.GetHashCode();
+            result = GenerateHash(result) ^ this._systemMode.GetHashCode();
+            result = GenerateHash(result) ^ this._changeOptions.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TrackJamTarget.cs b/Libs/CsharpDis6/Dis1998/Generated/TrackJamTarget.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/TrackJamTarget.cs
rename to Libs/CsharpDis6/Dis1998/Generated/TrackJamTarget.cs
index dd34c40..4eef9ab 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TrackJamTarget.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/TrackJamTarget.cs
@@ -1,367 +1,367 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// One track/jam target
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class TrackJamTarget
-    {
-        /// <summary>
-        /// track/jam target
-        /// </summary>
-        private EntityID _trackJam = new EntityID();
-
-        /// <summary>
-        /// Emitter ID
-        /// </summary>
-        private byte _emitterID;
-
-        /// <summary>
-        /// beam ID
-        /// </summary>
-        private byte _beamID;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TrackJamTarget"/> class.
-        /// </summary>
-        public TrackJamTarget()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TrackJamTarget left, TrackJamTarget right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TrackJamTarget left, TrackJamTarget right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += this._trackJam.GetMarshalledSize();  // this._trackJam
-            marshalSize += 1;  // this._emitterID
-            marshalSize += 1;  // this._beamID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the track/jam target
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "trackJam")]
-        public EntityID TrackJam
-        {
-            get
-            {
-                return this._trackJam;
-            }
-
-            set
-            {
-                this._trackJam = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Emitter ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "emitterID")]
-        public byte EmitterID
-        {
-            get
-            {
-                return this._emitterID;
-            }
-
-            set
-            {
-                this._emitterID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the beam ID
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "beamID")]
-        public byte BeamID
-        {
-            get
-            {
-                return this._beamID;
-            }
-
-            set
-            {
-                this._beamID = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    this._trackJam.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._emitterID);
-                    dos.WriteUnsignedByte((byte)this._beamID);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._trackJam.Unmarshal(dis);
-                    this._emitterID = dis.ReadUnsignedByte();
-                    this._beamID = dis.ReadUnsignedByte();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TrackJamTarget>");
-            try
-            {
-                sb.AppendLine("<trackJam>");
-                this._trackJam.Reflection(sb);
-                sb.AppendLine("</trackJam>");
-                sb.AppendLine("<emitterID type=\"byte\">" + this._emitterID.ToString(CultureInfo.InvariantCulture) + "</emitterID>");
-                sb.AppendLine("<beamID type=\"byte\">" + this._beamID.ToString(CultureInfo.InvariantCulture) + "</beamID>");
-                sb.AppendLine("</TrackJamTarget>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TrackJamTarget;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TrackJamTarget obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (!this._trackJam.Equals(obj._trackJam))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._emitterID != obj._emitterID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._beamID != obj._beamID)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._trackJam.GetHashCode();
-            result = GenerateHash(result) ^ this._emitterID.GetHashCode();
-            result = GenerateHash(result) ^ this._beamID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// One track/jam target
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class TrackJamTarget
+    {
+        /// <summary>
+        /// track/jam target
+        /// </summary>
+        private EntityID _trackJam = new EntityID();
+
+        /// <summary>
+        /// Emitter ID
+        /// </summary>
+        private byte _emitterID;
+
+        /// <summary>
+        /// beam ID
+        /// </summary>
+        private byte _beamID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TrackJamTarget"/> class.
+        /// </summary>
+        public TrackJamTarget()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TrackJamTarget left, TrackJamTarget right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TrackJamTarget left, TrackJamTarget right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._trackJam.GetMarshalledSize();  // this._trackJam
+            marshalSize += 1;  // this._emitterID
+            marshalSize += 1;  // this._beamID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the track/jam target
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "trackJam")]
+        public EntityID TrackJam
+        {
+            get
+            {
+                return this._trackJam;
+            }
+
+            set
+            {
+                this._trackJam = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Emitter ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "emitterID")]
+        public byte EmitterID
+        {
+            get
+            {
+                return this._emitterID;
+            }
+
+            set
+            {
+                this._emitterID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the beam ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamID")]
+        public byte BeamID
+        {
+            get
+            {
+                return this._beamID;
+            }
+
+            set
+            {
+                this._beamID = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._trackJam.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._emitterID);
+                    dos.WriteUnsignedByte((byte)this._beamID);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._trackJam.Unmarshal(dis);
+                    this._emitterID = dis.ReadUnsignedByte();
+                    this._beamID = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TrackJamTarget>");
+            try
+            {
+                sb.AppendLine("<trackJam>");
+                this._trackJam.Reflection(sb);
+                sb.AppendLine("</trackJam>");
+                sb.AppendLine("<emitterID type=\"byte\">" + this._emitterID.ToString(CultureInfo.InvariantCulture) + "</emitterID>");
+                sb.AppendLine("<beamID type=\"byte\">" + this._beamID.ToString(CultureInfo.InvariantCulture) + "</beamID>");
+                sb.AppendLine("</TrackJamTarget>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TrackJamTarget;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TrackJamTarget obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._trackJam.Equals(obj._trackJam))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterID != obj._emitterID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamID != obj._beamID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._trackJam.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterID.GetHashCode();
+            result = GenerateHash(result) ^ this._beamID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/TransferControlRequestPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/TransferControlRequestPdu.cs
index acdd52f..ecefdc3 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransferControlRequestPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/TransferControlRequestPdu.cs
@@ -1,577 +1,577 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.9.3 Information initiating the dyanic allocation and control of simulation entities         between two simulation applications. Requires manual cleanup. The padding between record sets is variable. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(RecordSet))]
-    public partial class TransferControlRequestPdu : EntityManagementFamilyPdu, IEquatable<TransferControlRequestPdu>
-    {
-        /// <summary>
-        /// ID of entity originating request
-        /// </summary>
-        private EntityID _orginatingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of entity receiving request
-        /// </summary>
-        private EntityID _recevingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID ofrequest
-        /// </summary>
-        private uint _requestID;
-
-        /// <summary>
-        /// required level of reliabliity service.
-        /// </summary>
-        private byte _requiredReliabilityService;
-
-        /// <summary>
-        /// type of transfer desired
-        /// </summary>
-        private byte _tranferType;
-
-        /// <summary>
-        /// The entity for which control is being requested to transfer
-        /// </summary>
-        private EntityID _transferEntityID = new EntityID();
-
-        /// <summary>
-        /// number of record sets to transfer
-        /// </summary>
-        private byte _numberOfRecordSets;
-
-        /// <summary>
-        /// ^^^This is wrong--the RecordSet class needs more work
-        /// </summary>
-        private List<RecordSet> _recordSets = new List<RecordSet>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransferControlRequestPdu"/> class.
-        /// </summary>
-        public TransferControlRequestPdu()
-        {
-            PduType = (byte)35;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TransferControlRequestPdu left, TransferControlRequestPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TransferControlRequestPdu left, TransferControlRequestPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
-            marshalSize += this._recevingEntityID.GetMarshalledSize();  // this._recevingEntityID
-            marshalSize += 4;  // this._requestID
-            marshalSize += 1;  // this._requiredReliabilityService
-            marshalSize += 1;  // this._tranferType
-            marshalSize += this._transferEntityID.GetMarshalledSize();  // this._transferEntityID
-            marshalSize += 1;  // this._numberOfRecordSets
-            for (int idx = 0; idx < this._recordSets.Count; idx++)
-            {
-                RecordSet listElement = (RecordSet)this._recordSets[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity originating request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
-        public EntityID OrginatingEntityID
-        {
-            get
-            {
-                return this._orginatingEntityID;
-            }
-
-            set
-            {
-                this._orginatingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of entity receiving request
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "recevingEntityID")]
-        public EntityID RecevingEntityID
-        {
-            get
-            {
-                return this._recevingEntityID;
-            }
-
-            set
-            {
-                this._recevingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID ofrequest
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
-        public uint RequestID
-        {
-            get
-            {
-                return this._requestID;
-            }
-
-            set
-            {
-                this._requestID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the required level of reliabliity service.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
-        public byte RequiredReliabilityService
-        {
-            get
-            {
-                return this._requiredReliabilityService;
-            }
-
-            set
-            {
-                this._requiredReliabilityService = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of transfer desired
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "tranferType")]
-        public byte TranferType
-        {
-            get
-            {
-                return this._tranferType;
-            }
-
-            set
-            {
-                this._tranferType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the The entity for which control is being requested to transfer
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "transferEntityID")]
-        public EntityID TransferEntityID
-        {
-            get
-            {
-                return this._transferEntityID;
-            }
-
-            set
-            {
-                this._transferEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of record sets to transfer
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfRecordSets method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfRecordSets")]
-        public byte NumberOfRecordSets
-        {
-            get
-            {
-                return this._numberOfRecordSets;
-            }
-
-            set
-            {
-                this._numberOfRecordSets = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the ^^^This is wrong--the RecordSet class needs more work
-        /// </summary>
-        [XmlElement(ElementName = "recordSetsList", Type = typeof(List<RecordSet>))]
-        public List<RecordSet> RecordSets
-        {
-            get
-            {
-                return this._recordSets;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Marshal(dos);
-                    this._recevingEntityID.Marshal(dos);
-                    dos.WriteUnsignedInt((uint)this._requestID);
-                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
-                    dos.WriteUnsignedByte((byte)this._tranferType);
-                    this._transferEntityID.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._recordSets.Count);
-
-                    for (int idx = 0; idx < this._recordSets.Count; idx++)
-                    {
-                        RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
-                        aRecordSet.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._orginatingEntityID.Unmarshal(dis);
-                    this._recevingEntityID.Unmarshal(dis);
-                    this._requestID = dis.ReadUnsignedInt();
-                    this._requiredReliabilityService = dis.ReadUnsignedByte();
-                    this._tranferType = dis.ReadUnsignedByte();
-                    this._transferEntityID.Unmarshal(dis);
-                    this._numberOfRecordSets = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.NumberOfRecordSets; idx++)
-                    {
-                        RecordSet anX = new RecordSet();
-                        anX.Unmarshal(dis);
-                        this._recordSets.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TransferControlRequestPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<orginatingEntityID>");
-                this._orginatingEntityID.Reflection(sb);
-                sb.AppendLine("</orginatingEntityID>");
-                sb.AppendLine("<recevingEntityID>");
-                this._recevingEntityID.Reflection(sb);
-                sb.AppendLine("</recevingEntityID>");
-                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
-                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
-                sb.AppendLine("<tranferType type=\"byte\">" + this._tranferType.ToString(CultureInfo.InvariantCulture) + "</tranferType>");
-                sb.AppendLine("<transferEntityID>");
-                this._transferEntityID.Reflection(sb);
-                sb.AppendLine("</transferEntityID>");
-                sb.AppendLine("<recordSets type=\"byte\">" + this._recordSets.Count.ToString(CultureInfo.InvariantCulture) + "</recordSets>");
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    sb.AppendLine("<recordSets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"RecordSet\">");
-                    RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
-                    aRecordSet.Reflection(sb);
-                    sb.AppendLine("</recordSets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</TransferControlRequestPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TransferControlRequestPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TransferControlRequestPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._recevingEntityID.Equals(obj._recevingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requestID != obj._requestID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._requiredReliabilityService != obj._requiredReliabilityService)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._tranferType != obj._tranferType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._transferEntityID.Equals(obj._transferEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfRecordSets != obj._numberOfRecordSets)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._recordSets.Count != obj._recordSets.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    if (!this._recordSets[idx].Equals(obj._recordSets[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._recevingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._requestID.GetHashCode();
-            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
-            result = GenerateHash(result) ^ this._tranferType.GetHashCode();
-            result = GenerateHash(result) ^ this._transferEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfRecordSets.GetHashCode();
-
-            if (this._recordSets.Count > 0)
-            {
-                for (int idx = 0; idx < this._recordSets.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._recordSets[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.9.3 Information initiating the dyanic allocation and control of simulation entities         between two simulation applications. Requires manual cleanup. The padding between record sets is variable. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(RecordSet))]
+    public partial class TransferControlRequestPdu : EntityManagementFamilyPdu, IEquatable<TransferControlRequestPdu>
+    {
+        /// <summary>
+        /// ID of entity originating request
+        /// </summary>
+        private EntityID _orginatingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of entity receiving request
+        /// </summary>
+        private EntityID _recevingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID ofrequest
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// required level of reliabliity service.
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// type of transfer desired
+        /// </summary>
+        private byte _tranferType;
+
+        /// <summary>
+        /// The entity for which control is being requested to transfer
+        /// </summary>
+        private EntityID _transferEntityID = new EntityID();
+
+        /// <summary>
+        /// number of record sets to transfer
+        /// </summary>
+        private byte _numberOfRecordSets;
+
+        /// <summary>
+        /// ^^^This is wrong--the RecordSet class needs more work
+        /// </summary>
+        private List<RecordSet> _recordSets = new List<RecordSet>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TransferControlRequestPdu"/> class.
+        /// </summary>
+        public TransferControlRequestPdu()
+        {
+            PduType = (byte)35;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TransferControlRequestPdu left, TransferControlRequestPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TransferControlRequestPdu left, TransferControlRequestPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
+            marshalSize += this._recevingEntityID.GetMarshalledSize();  // this._recevingEntityID
+            marshalSize += 4;  // this._requestID
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 1;  // this._tranferType
+            marshalSize += this._transferEntityID.GetMarshalledSize();  // this._transferEntityID
+            marshalSize += 1;  // this._numberOfRecordSets
+            for (int idx = 0; idx < this._recordSets.Count; idx++)
+            {
+                RecordSet listElement = (RecordSet)this._recordSets[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity originating request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
+        public EntityID OrginatingEntityID
+        {
+            get
+            {
+                return this._orginatingEntityID;
+            }
+
+            set
+            {
+                this._orginatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity receiving request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "recevingEntityID")]
+        public EntityID RecevingEntityID
+        {
+            get
+            {
+                return this._recevingEntityID;
+            }
+
+            set
+            {
+                this._recevingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID ofrequest
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the required level of reliabliity service.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of transfer desired
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "tranferType")]
+        public byte TranferType
+        {
+            get
+            {
+                return this._tranferType;
+            }
+
+            set
+            {
+                this._tranferType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The entity for which control is being requested to transfer
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "transferEntityID")]
+        public EntityID TransferEntityID
+        {
+            get
+            {
+                return this._transferEntityID;
+            }
+
+            set
+            {
+                this._transferEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of record sets to transfer
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfRecordSets method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfRecordSets")]
+        public byte NumberOfRecordSets
+        {
+            get
+            {
+                return this._numberOfRecordSets;
+            }
+
+            set
+            {
+                this._numberOfRecordSets = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the ^^^This is wrong--the RecordSet class needs more work
+        /// </summary>
+        [XmlElement(ElementName = "recordSetsList", Type = typeof(List<RecordSet>))]
+        public List<RecordSet> RecordSets
+        {
+            get
+            {
+                return this._recordSets;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Marshal(dos);
+                    this._recevingEntityID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedByte((byte)this._tranferType);
+                    this._transferEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._recordSets.Count);
+
+                    for (int idx = 0; idx < this._recordSets.Count; idx++)
+                    {
+                        RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
+                        aRecordSet.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Unmarshal(dis);
+                    this._recevingEntityID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._tranferType = dis.ReadUnsignedByte();
+                    this._transferEntityID.Unmarshal(dis);
+                    this._numberOfRecordSets = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.NumberOfRecordSets; idx++)
+                    {
+                        RecordSet anX = new RecordSet();
+                        anX.Unmarshal(dis);
+                        this._recordSets.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TransferControlRequestPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<orginatingEntityID>");
+                this._orginatingEntityID.Reflection(sb);
+                sb.AppendLine("</orginatingEntityID>");
+                sb.AppendLine("<recevingEntityID>");
+                this._recevingEntityID.Reflection(sb);
+                sb.AppendLine("</recevingEntityID>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<tranferType type=\"byte\">" + this._tranferType.ToString(CultureInfo.InvariantCulture) + "</tranferType>");
+                sb.AppendLine("<transferEntityID>");
+                this._transferEntityID.Reflection(sb);
+                sb.AppendLine("</transferEntityID>");
+                sb.AppendLine("<recordSets type=\"byte\">" + this._recordSets.Count.ToString(CultureInfo.InvariantCulture) + "</recordSets>");
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    sb.AppendLine("<recordSets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"RecordSet\">");
+                    RecordSet aRecordSet = (RecordSet)this._recordSets[idx];
+                    aRecordSet.Reflection(sb);
+                    sb.AppendLine("</recordSets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</TransferControlRequestPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TransferControlRequestPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TransferControlRequestPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._recevingEntityID.Equals(obj._recevingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._tranferType != obj._tranferType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._transferEntityID.Equals(obj._transferEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfRecordSets != obj._numberOfRecordSets)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSets.Count != obj._recordSets.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    if (!this._recordSets[idx].Equals(obj._recordSets[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._recevingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._tranferType.GetHashCode();
+            result = GenerateHash(result) ^ this._transferEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfRecordSets.GetHashCode();
+
+            if (this._recordSets.Count > 0)
+            {
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._recordSets[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransmitterPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/TransmitterPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransmitterPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/TransmitterPdu.cs
index 1e35e4e..2b8a9a4 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TransmitterPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/TransmitterPdu.cs
@@ -1,976 +1,976 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU requires manually         written code to complete, since the modulation parameters are of variable length. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(RadioEntityType))]
-    [XmlInclude(typeof(Vector3Double))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(ModulationType))]
-    [XmlInclude(typeof(Vector3Float))]
-    [XmlInclude(typeof(Vector3Float))]
-    public partial class TransmitterPdu : RadioCommunicationsFamilyPdu, IEquatable<TransmitterPdu>
-    {
-        /// <summary>
-        /// linear accelleration of entity
-        /// </summary>
-        private RadioEntityType _radioEntityType = new RadioEntityType();
-
-        /// <summary>
-        /// transmit state
-        /// </summary>
-        private byte _transmitState;
-
-        /// <summary>
-        /// input source
-        /// </summary>
-        private byte _inputSource;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private ushort _padding1;
-
-        /// <summary>
-        /// Location of antenna
-        /// </summary>
-        private Vector3Double _antennaLocation = new Vector3Double();
-
-        /// <summary>
-        /// relative location of antenna
-        /// </summary>
-        private Vector3Float _relativeAntennaLocation = new Vector3Float();
-
-        /// <summary>
-        /// antenna pattern type
-        /// </summary>
-        private ushort _antennaPatternType;
-
-        /// <summary>
-        /// atenna pattern length
-        /// </summary>
-        private ushort _antennaPatternCount;
-
-        /// <summary>
-        /// frequency
-        /// </summary>
-        private ulong _frequency;
-
-        /// <summary>
-        /// transmit frequency Bandwidth
-        /// </summary>
-        private float _transmitFrequencyBandwidth;
-
-        /// <summary>
-        /// transmission power
-        /// </summary>
-        private float _power;
-
-        /// <summary>
-        /// modulation
-        /// </summary>
-        private ModulationType _modulationType = new ModulationType();
-
-        /// <summary>
-        /// crypto system enumeration
-        /// </summary>
-        private ushort _cryptoSystem;
-
-        /// <summary>
-        /// crypto system key identifer
-        /// </summary>
-        private ushort _cryptoKeyId;
-
-        /// <summary>
-        /// how many modulation parameters we have
-        /// </summary>
-        private byte _modulationParameterCount;
-
-        /// <summary>
-        /// padding2
-        /// </summary>
-        private ushort _padding2;
-
-        /// <summary>
-        /// padding3
-        /// </summary>
-        private byte _padding3;
-
-        /// <summary>
-        /// variable length list of modulation parameters
-        /// </summary>
-        private List<Vector3Float> _modulationParametersList = new List<Vector3Float>();
-
-        /// <summary>
-        /// variable length list of antenna pattern records
-        /// </summary>
-        private List<Vector3Float> _antennaPatternList = new List<Vector3Float>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransmitterPdu"/> class.
-        /// </summary>
-        public TransmitterPdu()
-        {
-            PduType = (byte)25;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TransmitterPdu left, TransmitterPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TransmitterPdu left, TransmitterPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._radioEntityType.GetMarshalledSize();  // this._radioEntityType
-            marshalSize += 1;  // this._transmitState
-            marshalSize += 1;  // this._inputSource
-            marshalSize += 2;  // this._padding1
-            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
-            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
-            marshalSize += 2;  // this._antennaPatternType
-            marshalSize += 2;  // this._antennaPatternCount
-            marshalSize += 8;  // this._frequency
-            marshalSize += 4;  // this._transmitFrequencyBandwidth
-            marshalSize += 4;  // this._power
-            marshalSize += this._modulationType.GetMarshalledSize();  // this._modulationType
-            marshalSize += 2;  // this._cryptoSystem
-            marshalSize += 2;  // this._cryptoKeyId
-            marshalSize += 1;  // this._modulationParameterCount
-            marshalSize += 2;  // this._padding2
-            marshalSize += 1;  // this._padding3
-            for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._modulationParametersList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-            {
-                Vector3Float listElement = (Vector3Float)this._antennaPatternList[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the linear accelleration of entity
-        /// </summary>
-        [XmlElement(Type = typeof(RadioEntityType), ElementName = "radioEntityType")]
-        public RadioEntityType RadioEntityType
-        {
-            get
-            {
-                return this._radioEntityType;
-            }
-
-            set
-            {
-                this._radioEntityType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the transmit state
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "transmitState")]
-        public byte TransmitState
-        {
-            get
-            {
-                return this._transmitState;
-            }
-
-            set
-            {
-                this._transmitState = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the input source
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "inputSource")]
-        public byte InputSource
-        {
-            get
-            {
-                return this._inputSource;
-            }
-
-            set
-            {
-                this._inputSource = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
-        public ushort Padding1
-        {
-            get
-            {
-                return this._padding1;
-            }
-
-            set
-            {
-                this._padding1 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Location of antenna
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
-        public Vector3Double AntennaLocation
-        {
-            get
-            {
-                return this._antennaLocation;
-            }
-
-            set
-            {
-                this._antennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the relative location of antenna
-        /// </summary>
-        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
-        public Vector3Float RelativeAntennaLocation
-        {
-            get
-            {
-                return this._relativeAntennaLocation;
-            }
-
-            set
-            {
-                this._relativeAntennaLocation = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the antenna pattern type
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternType")]
-        public ushort AntennaPatternType
-        {
-            get
-            {
-                return this._antennaPatternType;
-            }
-
-            set
-            {
-                this._antennaPatternType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the atenna pattern length
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getantennaPatternCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternCount")]
-        public ushort AntennaPatternCount
-        {
-            get
-            {
-                return this._antennaPatternCount;
-            }
-
-            set
-            {
-                this._antennaPatternCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the frequency
-        /// </summary>
-        [XmlElement(Type = typeof(ulong), ElementName = "frequency")]
-        public ulong Frequency
-        {
-            get
-            {
-                return this._frequency;
-            }
-
-            set
-            {
-                this._frequency = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the transmit frequency Bandwidth
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "transmitFrequencyBandwidth")]
-        public float TransmitFrequencyBandwidth
-        {
-            get
-            {
-                return this._transmitFrequencyBandwidth;
-            }
-
-            set
-            {
-                this._transmitFrequencyBandwidth = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the transmission power
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "power")]
-        public float Power
-        {
-            get
-            {
-                return this._power;
-            }
-
-            set
-            {
-                this._power = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the modulation
-        /// </summary>
-        [XmlElement(Type = typeof(ModulationType), ElementName = "modulationType")]
-        public ModulationType ModulationType
-        {
-            get
-            {
-                return this._modulationType;
-            }
-
-            set
-            {
-                this._modulationType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the crypto system enumeration
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "cryptoSystem")]
-        public ushort CryptoSystem
-        {
-            get
-            {
-                return this._cryptoSystem;
-            }
-
-            set
-            {
-                this._cryptoSystem = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the crypto system key identifer
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "cryptoKeyId")]
-        public ushort CryptoKeyId
-        {
-            get
-            {
-                return this._cryptoKeyId;
-            }
-
-            set
-            {
-                this._cryptoKeyId = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the how many modulation parameters we have
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getmodulationParameterCount method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "modulationParameterCount")]
-        public byte ModulationParameterCount
-        {
-            get
-            {
-                return this._modulationParameterCount;
-            }
-
-            set
-            {
-                this._modulationParameterCount = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding2
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
-        public ushort Padding2
-        {
-            get
-            {
-                return this._padding2;
-            }
-
-            set
-            {
-                this._padding2 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding3
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "padding3")]
-        public byte Padding3
-        {
-            get
-            {
-                return this._padding3;
-            }
-
-            set
-            {
-                this._padding3 = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of modulation parameters
-        /// </summary>
-        [XmlElement(ElementName = "modulationParametersListList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> ModulationParametersList
-        {
-            get
-            {
-                return this._modulationParametersList;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of antenna pattern records
-        /// </summary>
-        [XmlElement(ElementName = "antennaPatternListList", Type = typeof(List<Vector3Float>))]
-        public List<Vector3Float> AntennaPatternList
-        {
-            get
-            {
-                return this._antennaPatternList;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._radioEntityType.Marshal(dos);
-                    dos.WriteUnsignedByte((byte)this._transmitState);
-                    dos.WriteUnsignedByte((byte)this._inputSource);
-                    dos.WriteUnsignedShort((ushort)this._padding1);
-                    this._antennaLocation.Marshal(dos);
-                    this._relativeAntennaLocation.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._antennaPatternType);
-                    dos.WriteUnsignedShort((ushort)this._antennaPatternList.Count);
-                    dos.WriteUnsignedLong((ulong)this._frequency);
-                    dos.WriteFloat((float)this._transmitFrequencyBandwidth);
-                    dos.WriteFloat((float)this._power);
-                    this._modulationType.Marshal(dos);
-                    dos.WriteUnsignedShort((ushort)this._cryptoSystem);
-                    dos.WriteUnsignedShort((ushort)this._cryptoKeyId);
-                    dos.WriteUnsignedByte((byte)this._modulationParametersList.Count);
-                    dos.WriteUnsignedShort((ushort)this._padding2);
-                    dos.WriteUnsignedByte((byte)this._padding3);
-
-                    for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                    {
-                        Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
-                        aVector3Float.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._radioEntityType.Unmarshal(dis);
-                    this._transmitState = dis.ReadUnsignedByte();
-                    this._inputSource = dis.ReadUnsignedByte();
-                    this._padding1 = dis.ReadUnsignedShort();
-                    this._antennaLocation.Unmarshal(dis);
-                    this._relativeAntennaLocation.Unmarshal(dis);
-                    this._antennaPatternType = dis.ReadUnsignedShort();
-                    this._antennaPatternCount = dis.ReadUnsignedShort();
-                    this._frequency = dis.ReadUnsignedLong();
-                    this._transmitFrequencyBandwidth = dis.ReadFloat();
-                    this._power = dis.ReadFloat();
-                    this._modulationType.Unmarshal(dis);
-                    this._cryptoSystem = dis.ReadUnsignedShort();
-                    this._cryptoKeyId = dis.ReadUnsignedShort();
-                    this._modulationParameterCount = dis.ReadUnsignedByte();
-                    this._padding2 = dis.ReadUnsignedShort();
-                    this._padding3 = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.ModulationParameterCount; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._modulationParametersList.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.AntennaPatternCount; idx++)
-                    {
-                        Vector3Float anX = new Vector3Float();
-                        anX.Unmarshal(dis);
-                        this._antennaPatternList.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TransmitterPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<radioEntityType>");
-                this._radioEntityType.Reflection(sb);
-                sb.AppendLine("</radioEntityType>");
-                sb.AppendLine("<transmitState type=\"byte\">" + this._transmitState.ToString(CultureInfo.InvariantCulture) + "</transmitState>");
-                sb.AppendLine("<inputSource type=\"byte\">" + this._inputSource.ToString(CultureInfo.InvariantCulture) + "</inputSource>");
-                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
-                sb.AppendLine("<antennaLocation>");
-                this._antennaLocation.Reflection(sb);
-                sb.AppendLine("</antennaLocation>");
-                sb.AppendLine("<relativeAntennaLocation>");
-                this._relativeAntennaLocation.Reflection(sb);
-                sb.AppendLine("</relativeAntennaLocation>");
-                sb.AppendLine("<antennaPatternType type=\"ushort\">" + this._antennaPatternType.ToString(CultureInfo.InvariantCulture) + "</antennaPatternType>");
-                sb.AppendLine("<antennaPatternList type=\"ushort\">" + this._antennaPatternList.Count.ToString(CultureInfo.InvariantCulture) + "</antennaPatternList>");
-                sb.AppendLine("<frequency type=\"ulong\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
-                sb.AppendLine("<transmitFrequencyBandwidth type=\"float\">" + this._transmitFrequencyBandwidth.ToString(CultureInfo.InvariantCulture) + "</transmitFrequencyBandwidth>");
-                sb.AppendLine("<power type=\"float\">" + this._power.ToString(CultureInfo.InvariantCulture) + "</power>");
-                sb.AppendLine("<modulationType>");
-                this._modulationType.Reflection(sb);
-                sb.AppendLine("</modulationType>");
-                sb.AppendLine("<cryptoSystem type=\"ushort\">" + this._cryptoSystem.ToString(CultureInfo.InvariantCulture) + "</cryptoSystem>");
-                sb.AppendLine("<cryptoKeyId type=\"ushort\">" + this._cryptoKeyId.ToString(CultureInfo.InvariantCulture) + "</cryptoKeyId>");
-                sb.AppendLine("<modulationParametersList type=\"byte\">" + this._modulationParametersList.Count.ToString(CultureInfo.InvariantCulture) + "</modulationParametersList>");
-                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
-                sb.AppendLine("<padding3 type=\"byte\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
-                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                {
-                    sb.AppendLine("<modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                {
-                    sb.AppendLine("<antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
-                    Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
-                    aVector3Float.Reflection(sb);
-                    sb.AppendLine("</antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</TransmitterPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TransmitterPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TransmitterPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._radioEntityType.Equals(obj._radioEntityType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitState != obj._transmitState)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._inputSource != obj._inputSource)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding1 != obj._padding1)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._antennaLocation.Equals(obj._antennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._antennaPatternType != obj._antennaPatternType)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._antennaPatternCount != obj._antennaPatternCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._frequency != obj._frequency)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._transmitFrequencyBandwidth != obj._transmitFrequencyBandwidth)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._power != obj._power)
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._modulationType.Equals(obj._modulationType))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._cryptoSystem != obj._cryptoSystem)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._cryptoKeyId != obj._cryptoKeyId)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modulationParameterCount != obj._modulationParameterCount)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding2 != obj._padding2)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._padding3 != obj._padding3)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._modulationParametersList.Count != obj._modulationParametersList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                {
-                    if (!this._modulationParametersList[idx].Equals(obj._modulationParametersList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._antennaPatternList.Count != obj._antennaPatternList.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                {
-                    if (!this._antennaPatternList[idx].Equals(obj._antennaPatternList[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._radioEntityType.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitState.GetHashCode();
-            result = GenerateHash(result) ^ this._inputSource.GetHashCode();
-            result = GenerateHash(result) ^ this._padding1.GetHashCode();
-            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
-            result = GenerateHash(result) ^ this._antennaPatternType.GetHashCode();
-            result = GenerateHash(result) ^ this._antennaPatternCount.GetHashCode();
-            result = GenerateHash(result) ^ this._frequency.GetHashCode();
-            result = GenerateHash(result) ^ this._transmitFrequencyBandwidth.GetHashCode();
-            result = GenerateHash(result) ^ this._power.GetHashCode();
-            result = GenerateHash(result) ^ this._modulationType.GetHashCode();
-            result = GenerateHash(result) ^ this._cryptoSystem.GetHashCode();
-            result = GenerateHash(result) ^ this._cryptoKeyId.GetHashCode();
-            result = GenerateHash(result) ^ this._modulationParameterCount.GetHashCode();
-            result = GenerateHash(result) ^ this._padding2.GetHashCode();
-            result = GenerateHash(result) ^ this._padding3.GetHashCode();
-
-            if (this._modulationParametersList.Count > 0)
-            {
-                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._modulationParametersList[idx].GetHashCode();
-                }
-            }
-
-            if (this._antennaPatternList.Count > 0)
-            {
-                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._antennaPatternList[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.8.1. Detailed information about a radio transmitter. This PDU requires manually         written code to complete, since the modulation parameters are of variable length. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(RadioEntityType))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(ModulationType))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class TransmitterPdu : RadioCommunicationsFamilyPdu, IEquatable<TransmitterPdu>
+    {
+        /// <summary>
+        /// linear accelleration of entity
+        /// </summary>
+        private RadioEntityType _radioEntityType = new RadioEntityType();
+
+        /// <summary>
+        /// transmit state
+        /// </summary>
+        private byte _transmitState;
+
+        /// <summary>
+        /// input source
+        /// </summary>
+        private byte _inputSource;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// Location of antenna
+        /// </summary>
+        private Vector3Double _antennaLocation = new Vector3Double();
+
+        /// <summary>
+        /// relative location of antenna
+        /// </summary>
+        private Vector3Float _relativeAntennaLocation = new Vector3Float();
+
+        /// <summary>
+        /// antenna pattern type
+        /// </summary>
+        private ushort _antennaPatternType;
+
+        /// <summary>
+        /// atenna pattern length
+        /// </summary>
+        private ushort _antennaPatternCount;
+
+        /// <summary>
+        /// frequency
+        /// </summary>
+        private ulong _frequency;
+
+        /// <summary>
+        /// transmit frequency Bandwidth
+        /// </summary>
+        private float _transmitFrequencyBandwidth;
+
+        /// <summary>
+        /// transmission power
+        /// </summary>
+        private float _power;
+
+        /// <summary>
+        /// modulation
+        /// </summary>
+        private ModulationType _modulationType = new ModulationType();
+
+        /// <summary>
+        /// crypto system enumeration
+        /// </summary>
+        private ushort _cryptoSystem;
+
+        /// <summary>
+        /// crypto system key identifer
+        /// </summary>
+        private ushort _cryptoKeyId;
+
+        /// <summary>
+        /// how many modulation parameters we have
+        /// </summary>
+        private byte _modulationParameterCount;
+
+        /// <summary>
+        /// padding2
+        /// </summary>
+        private ushort _padding2;
+
+        /// <summary>
+        /// padding3
+        /// </summary>
+        private byte _padding3;
+
+        /// <summary>
+        /// variable length list of modulation parameters
+        /// </summary>
+        private List<Vector3Float> _modulationParametersList = new List<Vector3Float>();
+
+        /// <summary>
+        /// variable length list of antenna pattern records
+        /// </summary>
+        private List<Vector3Float> _antennaPatternList = new List<Vector3Float>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TransmitterPdu"/> class.
+        /// </summary>
+        public TransmitterPdu()
+        {
+            PduType = (byte)25;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TransmitterPdu left, TransmitterPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TransmitterPdu left, TransmitterPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._radioEntityType.GetMarshalledSize();  // this._radioEntityType
+            marshalSize += 1;  // this._transmitState
+            marshalSize += 1;  // this._inputSource
+            marshalSize += 2;  // this._padding1
+            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
+            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
+            marshalSize += 2;  // this._antennaPatternType
+            marshalSize += 2;  // this._antennaPatternCount
+            marshalSize += 8;  // this._frequency
+            marshalSize += 4;  // this._transmitFrequencyBandwidth
+            marshalSize += 4;  // this._power
+            marshalSize += this._modulationType.GetMarshalledSize();  // this._modulationType
+            marshalSize += 2;  // this._cryptoSystem
+            marshalSize += 2;  // this._cryptoKeyId
+            marshalSize += 1;  // this._modulationParameterCount
+            marshalSize += 2;  // this._padding2
+            marshalSize += 1;  // this._padding3
+            for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._modulationParametersList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._antennaPatternList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the linear accelleration of entity
+        /// </summary>
+        [XmlElement(Type = typeof(RadioEntityType), ElementName = "radioEntityType")]
+        public RadioEntityType RadioEntityType
+        {
+            get
+            {
+                return this._radioEntityType;
+            }
+
+            set
+            {
+                this._radioEntityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the transmit state
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "transmitState")]
+        public byte TransmitState
+        {
+            get
+            {
+                return this._transmitState;
+            }
+
+            set
+            {
+                this._transmitState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the input source
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "inputSource")]
+        public byte InputSource
+        {
+            get
+            {
+                return this._inputSource;
+            }
+
+            set
+            {
+                this._inputSource = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of antenna
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
+        public Vector3Double AntennaLocation
+        {
+            get
+            {
+                return this._antennaLocation;
+            }
+
+            set
+            {
+                this._antennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the relative location of antenna
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
+        public Vector3Float RelativeAntennaLocation
+        {
+            get
+            {
+                return this._relativeAntennaLocation;
+            }
+
+            set
+            {
+                this._relativeAntennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the antenna pattern type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternType")]
+        public ushort AntennaPatternType
+        {
+            get
+            {
+                return this._antennaPatternType;
+            }
+
+            set
+            {
+                this._antennaPatternType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the atenna pattern length
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getantennaPatternCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(ushort), ElementName = "antennaPatternCount")]
+        public ushort AntennaPatternCount
+        {
+            get
+            {
+                return this._antennaPatternCount;
+            }
+
+            set
+            {
+                this._antennaPatternCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the frequency
+        /// </summary>
+        [XmlElement(Type = typeof(ulong), ElementName = "frequency")]
+        public ulong Frequency
+        {
+            get
+            {
+                return this._frequency;
+            }
+
+            set
+            {
+                this._frequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the transmit frequency Bandwidth
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "transmitFrequencyBandwidth")]
+        public float TransmitFrequencyBandwidth
+        {
+            get
+            {
+                return this._transmitFrequencyBandwidth;
+            }
+
+            set
+            {
+                this._transmitFrequencyBandwidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the transmission power
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "power")]
+        public float Power
+        {
+            get
+            {
+                return this._power;
+            }
+
+            set
+            {
+                this._power = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modulation
+        /// </summary>
+        [XmlElement(Type = typeof(ModulationType), ElementName = "modulationType")]
+        public ModulationType ModulationType
+        {
+            get
+            {
+                return this._modulationType;
+            }
+
+            set
+            {
+                this._modulationType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the crypto system enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "cryptoSystem")]
+        public ushort CryptoSystem
+        {
+            get
+            {
+                return this._cryptoSystem;
+            }
+
+            set
+            {
+                this._cryptoSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the crypto system key identifer
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "cryptoKeyId")]
+        public ushort CryptoKeyId
+        {
+            get
+            {
+                return this._cryptoKeyId;
+            }
+
+            set
+            {
+                this._cryptoKeyId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many modulation parameters we have
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getmodulationParameterCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "modulationParameterCount")]
+        public byte ModulationParameterCount
+        {
+            get
+            {
+                return this._modulationParameterCount;
+            }
+
+            set
+            {
+                this._modulationParameterCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding2
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
+        public ushort Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding3
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding3")]
+        public byte Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of modulation parameters
+        /// </summary>
+        [XmlElement(ElementName = "modulationParametersListList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> ModulationParametersList
+        {
+            get
+            {
+                return this._modulationParametersList;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of antenna pattern records
+        /// </summary>
+        [XmlElement(ElementName = "antennaPatternListList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> AntennaPatternList
+        {
+            get
+            {
+                return this._antennaPatternList;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._radioEntityType.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._transmitState);
+                    dos.WriteUnsignedByte((byte)this._inputSource);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    this._antennaLocation.Marshal(dos);
+                    this._relativeAntennaLocation.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._antennaPatternType);
+                    dos.WriteUnsignedShort((ushort)this._antennaPatternList.Count);
+                    dos.WriteUnsignedLong((ulong)this._frequency);
+                    dos.WriteFloat((float)this._transmitFrequencyBandwidth);
+                    dos.WriteFloat((float)this._power);
+                    this._modulationType.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._cryptoSystem);
+                    dos.WriteUnsignedShort((ushort)this._cryptoKeyId);
+                    dos.WriteUnsignedByte((byte)this._modulationParametersList.Count);
+                    dos.WriteUnsignedShort((ushort)this._padding2);
+                    dos.WriteUnsignedByte((byte)this._padding3);
+
+                    for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._radioEntityType.Unmarshal(dis);
+                    this._transmitState = dis.ReadUnsignedByte();
+                    this._inputSource = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._antennaLocation.Unmarshal(dis);
+                    this._relativeAntennaLocation.Unmarshal(dis);
+                    this._antennaPatternType = dis.ReadUnsignedShort();
+                    this._antennaPatternCount = dis.ReadUnsignedShort();
+                    this._frequency = dis.ReadUnsignedLong();
+                    this._transmitFrequencyBandwidth = dis.ReadFloat();
+                    this._power = dis.ReadFloat();
+                    this._modulationType.Unmarshal(dis);
+                    this._cryptoSystem = dis.ReadUnsignedShort();
+                    this._cryptoKeyId = dis.ReadUnsignedShort();
+                    this._modulationParameterCount = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedShort();
+                    this._padding3 = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.ModulationParameterCount; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._modulationParametersList.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.AntennaPatternCount; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._antennaPatternList.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TransmitterPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<radioEntityType>");
+                this._radioEntityType.Reflection(sb);
+                sb.AppendLine("</radioEntityType>");
+                sb.AppendLine("<transmitState type=\"byte\">" + this._transmitState.ToString(CultureInfo.InvariantCulture) + "</transmitState>");
+                sb.AppendLine("<inputSource type=\"byte\">" + this._inputSource.ToString(CultureInfo.InvariantCulture) + "</inputSource>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<antennaLocation>");
+                this._antennaLocation.Reflection(sb);
+                sb.AppendLine("</antennaLocation>");
+                sb.AppendLine("<relativeAntennaLocation>");
+                this._relativeAntennaLocation.Reflection(sb);
+                sb.AppendLine("</relativeAntennaLocation>");
+                sb.AppendLine("<antennaPatternType type=\"ushort\">" + this._antennaPatternType.ToString(CultureInfo.InvariantCulture) + "</antennaPatternType>");
+                sb.AppendLine("<antennaPatternList type=\"ushort\">" + this._antennaPatternList.Count.ToString(CultureInfo.InvariantCulture) + "</antennaPatternList>");
+                sb.AppendLine("<frequency type=\"ulong\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
+                sb.AppendLine("<transmitFrequencyBandwidth type=\"float\">" + this._transmitFrequencyBandwidth.ToString(CultureInfo.InvariantCulture) + "</transmitFrequencyBandwidth>");
+                sb.AppendLine("<power type=\"float\">" + this._power.ToString(CultureInfo.InvariantCulture) + "</power>");
+                sb.AppendLine("<modulationType>");
+                this._modulationType.Reflection(sb);
+                sb.AppendLine("</modulationType>");
+                sb.AppendLine("<cryptoSystem type=\"ushort\">" + this._cryptoSystem.ToString(CultureInfo.InvariantCulture) + "</cryptoSystem>");
+                sb.AppendLine("<cryptoKeyId type=\"ushort\">" + this._cryptoKeyId.ToString(CultureInfo.InvariantCulture) + "</cryptoKeyId>");
+                sb.AppendLine("<modulationParametersList type=\"byte\">" + this._modulationParametersList.Count.ToString(CultureInfo.InvariantCulture) + "</modulationParametersList>");
+                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<padding3 type=\"byte\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                {
+                    sb.AppendLine("<modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._modulationParametersList[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</modulationParametersList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                {
+                    sb.AppendLine("<antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._antennaPatternList[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</antennaPatternList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</TransmitterPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TransmitterPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TransmitterPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._radioEntityType.Equals(obj._radioEntityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitState != obj._transmitState)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._inputSource != obj._inputSource)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._antennaLocation.Equals(obj._antennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._antennaPatternType != obj._antennaPatternType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._antennaPatternCount != obj._antennaPatternCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frequency != obj._frequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitFrequencyBandwidth != obj._transmitFrequencyBandwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._power != obj._power)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._modulationType.Equals(obj._modulationType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._cryptoSystem != obj._cryptoSystem)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._cryptoKeyId != obj._cryptoKeyId)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modulationParameterCount != obj._modulationParameterCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modulationParametersList.Count != obj._modulationParametersList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                {
+                    if (!this._modulationParametersList[idx].Equals(obj._modulationParametersList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._antennaPatternList.Count != obj._antennaPatternList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                {
+                    if (!this._antennaPatternList[idx].Equals(obj._antennaPatternList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._radioEntityType.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitState.GetHashCode();
+            result = GenerateHash(result) ^ this._inputSource.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._antennaPatternType.GetHashCode();
+            result = GenerateHash(result) ^ this._antennaPatternCount.GetHashCode();
+            result = GenerateHash(result) ^ this._frequency.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitFrequencyBandwidth.GetHashCode();
+            result = GenerateHash(result) ^ this._power.GetHashCode();
+            result = GenerateHash(result) ^ this._modulationType.GetHashCode();
+            result = GenerateHash(result) ^ this._cryptoSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._cryptoKeyId.GetHashCode();
+            result = GenerateHash(result) ^ this._modulationParameterCount.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+
+            if (this._modulationParametersList.Count > 0)
+            {
+                for (int idx = 0; idx < this._modulationParametersList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._modulationParametersList[idx].GetHashCode();
+                }
+            }
+
+            if (this._antennaPatternList.Count > 0)
+            {
+                for (int idx = 0; idx < this._antennaPatternList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._antennaPatternList[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TwoByteChunk.cs b/Libs/CsharpDis6/Dis1998/Generated/TwoByteChunk.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/TwoByteChunk.cs
rename to Libs/CsharpDis6/Dis1998/Generated/TwoByteChunk.cs
index 4aa47db..b722426 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/TwoByteChunk.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/TwoByteChunk.cs
@@ -1,324 +1,324 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// 16 bit piece of data
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class TwoByteChunk
-    {
-        /// <summary>
-        /// two bytes of arbitrary data
-        /// </summary>
-        private byte[] _otherParameters = new byte[2];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TwoByteChunk"/> class.
-        /// </summary>
-        public TwoByteChunk()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TwoByteChunk left, TwoByteChunk right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TwoByteChunk left, TwoByteChunk right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 2 * 1;  // _otherParameters
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the two bytes of arbitrary data
-        /// </summary>
-        [XmlArray(ElementName = "otherParameters")]
-        public byte[] OtherParameters
-        {
-            get
-            {
-                return this._otherParameters;
-            }
-
-            set
-            {
-                this._otherParameters = value;
-            }
-}
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        dos.WriteByte(this._otherParameters[idx]);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                    {
-                        this._otherParameters[idx] = dis.ReadByte();
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<TwoByteChunk>");
-            try
-            {
-                for (int idx = 0; idx < this._otherParameters.Length; idx++)
-                {
-                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-            }
-
-                sb.AppendLine("</TwoByteChunk>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as TwoByteChunk;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TwoByteChunk obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (obj._otherParameters.Length != 2) 
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < 2; idx++)
-                {
-                    if (this._otherParameters[idx] != obj._otherParameters[idx])
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            for (int idx = 0; idx < 2; idx++)
-            {
-                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// 16 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class TwoByteChunk
+    {
+        /// <summary>
+        /// two bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[2];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TwoByteChunk"/> class.
+        /// </summary>
+        public TwoByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TwoByteChunk left, TwoByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TwoByteChunk left, TwoByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the two bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TwoByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</TwoByteChunk>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TwoByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TwoByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 2) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 2; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            for (int idx = 0; idx < 2; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/UaPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/UaPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/UaPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/UaPdu.cs
index 5726589..2e23a48 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/UaPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/UaPdu.cs
@@ -1,785 +1,785 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.7.3. Information about underwater acoustic emmissions. This requires manual cleanup. The beam data records should ALL be a the finish, rather than attached to each emitter system. UNFINISHED
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    [XmlInclude(typeof(EventID))]
-    [XmlInclude(typeof(ShaftRPMs))]
-    [XmlInclude(typeof(ApaData))]
-    [XmlInclude(typeof(AcousticEmitterSystemData))]
-    public partial class UaPdu : DistributedEmissionsFamilyPdu, IEquatable<UaPdu>
-    {
-        /// <summary>
-        /// ID of the entity that is the source of the emission
-        /// </summary>
-        private EntityID _emittingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of event
-        /// </summary>
-        private EventID _eventID = new EventID();
-
-        /// <summary>
-        /// This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
-        /// </summary>
-        private byte _stateChangeIndicator;
-
-        /// <summary>
-        /// padding
-        /// </summary>
-        private byte _pad;
-
-        /// <summary>
-        /// This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
-        /// </summary>
-        private ushort _passiveParameterIndex;
-
-        /// <summary>
-        /// This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
-        /// </summary>
-        private byte _propulsionPlantConfiguration;
-
-        /// <summary>
-        ///  This field shall represent the number of shafts on a platform
-        /// </summary>
-        private byte _numberOfShafts;
-
-        /// <summary>
-        /// This field shall indicate the number of APAs described in the current UA PDU
-        /// </summary>
-        private byte _numberOfAPAs;
-
-        /// <summary>
-        /// This field shall specify the number of UA emitter systems being described in the current UA PDU
-        /// </summary>
-        private byte _numberOfUAEmitterSystems;
-
-        /// <summary>
-        /// shaft RPM values
-        /// </summary>
-        private List<ShaftRPMs> _shaftRPMs = new List<ShaftRPMs>();
-
-        /// <summary>
-        /// apaData
-        /// </summary>
-        private List<ApaData> _apaData = new List<ApaData>();
-
-        private List<AcousticEmitterSystemData> _emitterSystems = new List<AcousticEmitterSystemData>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UaPdu"/> class.
-        /// </summary>
-        public UaPdu()
-        {
-            PduType = (byte)29;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(UaPdu left, UaPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(UaPdu left, UaPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
-            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
-            marshalSize += 1;  // this._stateChangeIndicator
-            marshalSize += 1;  // this._pad
-            marshalSize += 2;  // this._passiveParameterIndex
-            marshalSize += 1;  // this._propulsionPlantConfiguration
-            marshalSize += 1;  // this._numberOfShafts
-            marshalSize += 1;  // this._numberOfAPAs
-            marshalSize += 1;  // this._numberOfUAEmitterSystems
-            for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-            {
-                ShaftRPMs listElement = (ShaftRPMs)this._shaftRPMs[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._apaData.Count; idx++)
-            {
-                ApaData listElement = (ApaData)this._apaData[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-            {
-                AcousticEmitterSystemData listElement = (AcousticEmitterSystemData)this._emitterSystems[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that is the source of the emission
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
-        public EntityID EmittingEntityID
-        {
-            get
-            {
-                return this._emittingEntityID;
-            }
-
-            set
-            {
-                this._emittingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of event
-        /// </summary>
-        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
-        public EventID EventID
-        {
-            get
-            {
-                return this._eventID;
-            }
-
-            set
-            {
-                this._eventID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "stateChangeIndicator")]
-        public byte StateChangeIndicator
-        {
-            get
-            {
-                return this._stateChangeIndicator;
-            }
-
-            set
-            {
-                this._stateChangeIndicator = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the padding
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "pad")]
-        public byte Pad
-        {
-            get
-            {
-                return this._pad;
-            }
-
-            set
-            {
-                this._pad = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
-        /// </summary>
-        [XmlElement(Type = typeof(ushort), ElementName = "passiveParameterIndex")]
-        public ushort PassiveParameterIndex
-        {
-            get
-            {
-                return this._passiveParameterIndex;
-            }
-
-            set
-            {
-                this._passiveParameterIndex = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
-        /// </summary>
-        [XmlElement(Type = typeof(byte), ElementName = "propulsionPlantConfiguration")]
-        public byte PropulsionPlantConfiguration
-        {
-            get
-            {
-                return this._propulsionPlantConfiguration;
-            }
-
-            set
-            {
-                this._propulsionPlantConfiguration = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the  This field shall represent the number of shafts on a platform
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfShafts method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfShafts")]
-        public byte NumberOfShafts
-        {
-            get
-            {
-                return this._numberOfShafts;
-            }
-
-            set
-            {
-                this._numberOfShafts = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall indicate the number of APAs described in the current UA PDU
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfAPAs method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfAPAs")]
-        public byte NumberOfAPAs
-        {
-            get
-            {
-                return this._numberOfAPAs;
-            }
-
-            set
-            {
-                this._numberOfAPAs = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the This field shall specify the number of UA emitter systems being described in the current UA PDU
-        /// </summary>
-        /// <remarks>
-        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
-        /// The getnumberOfUAEmitterSystems method will also be based on the actual list length rather than this value. 
-        /// The method is simply here for completeness and should not be used for any computations.
-        /// </remarks>
-        [XmlElement(Type = typeof(byte), ElementName = "numberOfUAEmitterSystems")]
-        public byte NumberOfUAEmitterSystems
-        {
-            get
-            {
-                return this._numberOfUAEmitterSystems;
-            }
-
-            set
-            {
-                this._numberOfUAEmitterSystems = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the shaft RPM values
-        /// </summary>
-        [XmlElement(ElementName = "shaftRPMsList", Type = typeof(List<ShaftRPMs>))]
-        public List<ShaftRPMs> ShaftRPMs
-        {
-            get
-            {
-                return this._shaftRPMs;
-            }
-        }
-
-        /// <summary>
-        /// Gets the apaData
-        /// </summary>
-        [XmlElement(ElementName = "apaDataList", Type = typeof(List<ApaData>))]
-        public List<ApaData> ApaData
-        {
-            get
-            {
-                return this._apaData;
-            }
-        }
-
-        /// <summary>
-        /// Gets the emitterSystems
-        /// </summary>
-        [XmlElement(ElementName = "emitterSystemsList", Type = typeof(List<AcousticEmitterSystemData>))]
-        public List<AcousticEmitterSystemData> EmitterSystems
-        {
-            get
-            {
-                return this._emitterSystems;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public override void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Marshal(dos);
-                    this._eventID.Marshal(dos);
-                    dos.WriteByte((byte)this._stateChangeIndicator);
-                    dos.WriteByte((byte)this._pad);
-                    dos.WriteUnsignedShort((ushort)this._passiveParameterIndex);
-                    dos.WriteUnsignedByte((byte)this._propulsionPlantConfiguration);
-                    dos.WriteUnsignedByte((byte)this._shaftRPMs.Count);
-                    dos.WriteUnsignedByte((byte)this._apaData.Count);
-                    dos.WriteUnsignedByte((byte)this._emitterSystems.Count);
-
-                    for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                    {
-                        ShaftRPMs aShaftRPMs = (ShaftRPMs)this._shaftRPMs[idx];
-                        aShaftRPMs.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._apaData.Count; idx++)
-                    {
-                        ApaData aApaData = (ApaData)this._apaData[idx];
-                        aApaData.Marshal(dos);
-                    }
-
-                    for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                    {
-                        AcousticEmitterSystemData aAcousticEmitterSystemData = (AcousticEmitterSystemData)this._emitterSystems[idx];
-                        aAcousticEmitterSystemData.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._emittingEntityID.Unmarshal(dis);
-                    this._eventID.Unmarshal(dis);
-                    this._stateChangeIndicator = dis.ReadByte();
-                    this._pad = dis.ReadByte();
-                    this._passiveParameterIndex = dis.ReadUnsignedShort();
-                    this._propulsionPlantConfiguration = dis.ReadUnsignedByte();
-                    this._numberOfShafts = dis.ReadUnsignedByte();
-                    this._numberOfAPAs = dis.ReadUnsignedByte();
-                    this._numberOfUAEmitterSystems = dis.ReadUnsignedByte();
-
-                    for (int idx = 0; idx < this.NumberOfShafts; idx++)
-                    {
-                        ShaftRPMs anX = new ShaftRPMs();
-                        anX.Unmarshal(dis);
-                        this._shaftRPMs.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfAPAs; idx++)
-                    {
-                        ApaData anX = new ApaData();
-                        anX.Unmarshal(dis);
-                        this._apaData.Add(anX);
-                    }
-
-                    for (int idx = 0; idx < this.NumberOfUAEmitterSystems; idx++)
-                    {
-                        AcousticEmitterSystemData anX = new AcousticEmitterSystemData();
-                        anX.Unmarshal(dis);
-                        this._emitterSystems.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<UaPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<emittingEntityID>");
-                this._emittingEntityID.Reflection(sb);
-                sb.AppendLine("</emittingEntityID>");
-                sb.AppendLine("<eventID>");
-                this._eventID.Reflection(sb);
-                sb.AppendLine("</eventID>");
-                sb.AppendLine("<stateChangeIndicator type=\"byte\">" + this._stateChangeIndicator.ToString(CultureInfo.InvariantCulture) + "</stateChangeIndicator>");
-                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
-                sb.AppendLine("<passiveParameterIndex type=\"ushort\">" + this._passiveParameterIndex.ToString(CultureInfo.InvariantCulture) + "</passiveParameterIndex>");
-                sb.AppendLine("<propulsionPlantConfiguration type=\"byte\">" + this._propulsionPlantConfiguration.ToString(CultureInfo.InvariantCulture) + "</propulsionPlantConfiguration>");
-                sb.AppendLine("<shaftRPMs type=\"byte\">" + this._shaftRPMs.Count.ToString(CultureInfo.InvariantCulture) + "</shaftRPMs>");
-                sb.AppendLine("<apaData type=\"byte\">" + this._apaData.Count.ToString(CultureInfo.InvariantCulture) + "</apaData>");
-                sb.AppendLine("<emitterSystems type=\"byte\">" + this._emitterSystems.Count.ToString(CultureInfo.InvariantCulture) + "</emitterSystems>");
-                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                {
-                    sb.AppendLine("<shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ShaftRPMs\">");
-                    ShaftRPMs aShaftRPMs = (ShaftRPMs)this._shaftRPMs[idx];
-                    aShaftRPMs.Reflection(sb);
-                    sb.AppendLine("</shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._apaData.Count; idx++)
-                {
-                    sb.AppendLine("<apaData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ApaData\">");
-                    ApaData aApaData = (ApaData)this._apaData[idx];
-                    aApaData.Reflection(sb);
-                    sb.AppendLine("</apaData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                {
-                    sb.AppendLine("<emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"AcousticEmitterSystemData\">");
-                    AcousticEmitterSystemData aAcousticEmitterSystemData = (AcousticEmitterSystemData)this._emitterSystems[idx];
-                    aAcousticEmitterSystemData.Reflection(sb);
-                    sb.AppendLine("</emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</UaPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as UaPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(UaPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._eventID.Equals(obj._eventID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._stateChangeIndicator != obj._stateChangeIndicator)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._pad != obj._pad)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._passiveParameterIndex != obj._passiveParameterIndex)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._propulsionPlantConfiguration != obj._propulsionPlantConfiguration)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfShafts != obj._numberOfShafts)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfAPAs != obj._numberOfAPAs)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._numberOfUAEmitterSystems != obj._numberOfUAEmitterSystems)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._shaftRPMs.Count != obj._shaftRPMs.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                {
-                    if (!this._shaftRPMs[idx].Equals(obj._shaftRPMs[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._apaData.Count != obj._apaData.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._apaData.Count; idx++)
-                {
-                    if (!this._apaData[idx].Equals(obj._apaData[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            if (this._emitterSystems.Count != obj._emitterSystems.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                {
-                    if (!this._emitterSystems[idx].Equals(obj._emitterSystems[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._eventID.GetHashCode();
-            result = GenerateHash(result) ^ this._stateChangeIndicator.GetHashCode();
-            result = GenerateHash(result) ^ this._pad.GetHashCode();
-            result = GenerateHash(result) ^ this._passiveParameterIndex.GetHashCode();
-            result = GenerateHash(result) ^ this._propulsionPlantConfiguration.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfShafts.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfAPAs.GetHashCode();
-            result = GenerateHash(result) ^ this._numberOfUAEmitterSystems.GetHashCode();
-
-            if (this._shaftRPMs.Count > 0)
-            {
-                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._shaftRPMs[idx].GetHashCode();
-                }
-            }
-
-            if (this._apaData.Count > 0)
-            {
-                for (int idx = 0; idx < this._apaData.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._apaData[idx].GetHashCode();
-                }
-            }
-
-            if (this._emitterSystems.Count > 0)
-            {
-                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._emitterSystems[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.7.3. Information about underwater acoustic emmissions. This requires manual cleanup. The beam data records should ALL be a the finish, rather than attached to each emitter system. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventID))]
+    [XmlInclude(typeof(ShaftRPMs))]
+    [XmlInclude(typeof(ApaData))]
+    [XmlInclude(typeof(AcousticEmitterSystemData))]
+    public partial class UaPdu : DistributedEmissionsFamilyPdu, IEquatable<UaPdu>
+    {
+        /// <summary>
+        /// ID of the entity that is the source of the emission
+        /// </summary>
+        private EntityID _emittingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventID _eventID = new EventID();
+
+        /// <summary>
+        /// This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
+        /// </summary>
+        private byte _stateChangeIndicator;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad;
+
+        /// <summary>
+        /// This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
+        /// </summary>
+        private ushort _passiveParameterIndex;
+
+        /// <summary>
+        /// This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
+        /// </summary>
+        private byte _propulsionPlantConfiguration;
+
+        /// <summary>
+        ///  This field shall represent the number of shafts on a platform
+        /// </summary>
+        private byte _numberOfShafts;
+
+        /// <summary>
+        /// This field shall indicate the number of APAs described in the current UA PDU
+        /// </summary>
+        private byte _numberOfAPAs;
+
+        /// <summary>
+        /// This field shall specify the number of UA emitter systems being described in the current UA PDU
+        /// </summary>
+        private byte _numberOfUAEmitterSystems;
+
+        /// <summary>
+        /// shaft RPM values
+        /// </summary>
+        private List<ShaftRPMs> _shaftRPMs = new List<ShaftRPMs>();
+
+        /// <summary>
+        /// apaData
+        /// </summary>
+        private List<ApaData> _apaData = new List<ApaData>();
+
+        private List<AcousticEmitterSystemData> _emitterSystems = new List<AcousticEmitterSystemData>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UaPdu"/> class.
+        /// </summary>
+        public UaPdu()
+        {
+            PduType = (byte)29;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(UaPdu left, UaPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(UaPdu left, UaPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._stateChangeIndicator
+            marshalSize += 1;  // this._pad
+            marshalSize += 2;  // this._passiveParameterIndex
+            marshalSize += 1;  // this._propulsionPlantConfiguration
+            marshalSize += 1;  // this._numberOfShafts
+            marshalSize += 1;  // this._numberOfAPAs
+            marshalSize += 1;  // this._numberOfUAEmitterSystems
+            for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+            {
+                ShaftRPMs listElement = (ShaftRPMs)this._shaftRPMs[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._apaData.Count; idx++)
+            {
+                ApaData listElement = (ApaData)this._apaData[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+            {
+                AcousticEmitterSystemData listElement = (AcousticEmitterSystemData)this._emitterSystems[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that is the source of the emission
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
+        public EntityID EmittingEntityID
+        {
+            get
+            {
+                return this._emittingEntityID;
+            }
+
+            set
+            {
+                this._emittingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventID), ElementName = "eventID")]
+        public EventID EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "stateChangeIndicator")]
+        public byte StateChangeIndicator
+        {
+            get
+            {
+                return this._stateChangeIndicator;
+            }
+
+            set
+            {
+                this._stateChangeIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad")]
+        public byte Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "passiveParameterIndex")]
+        public ushort PassiveParameterIndex
+        {
+            get
+            {
+                return this._passiveParameterIndex;
+            }
+
+            set
+            {
+                this._passiveParameterIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "propulsionPlantConfiguration")]
+        public byte PropulsionPlantConfiguration
+        {
+            get
+            {
+                return this._propulsionPlantConfiguration;
+            }
+
+            set
+            {
+                this._propulsionPlantConfiguration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  This field shall represent the number of shafts on a platform
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfShafts method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfShafts")]
+        public byte NumberOfShafts
+        {
+            get
+            {
+                return this._numberOfShafts;
+            }
+
+            set
+            {
+                this._numberOfShafts = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall indicate the number of APAs described in the current UA PDU
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfAPAs method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfAPAs")]
+        public byte NumberOfAPAs
+        {
+            get
+            {
+                return this._numberOfAPAs;
+            }
+
+            set
+            {
+                this._numberOfAPAs = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the number of UA emitter systems being described in the current UA PDU
+        /// </summary>
+        /// <remarks>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfUAEmitterSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </remarks>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfUAEmitterSystems")]
+        public byte NumberOfUAEmitterSystems
+        {
+            get
+            {
+                return this._numberOfUAEmitterSystems;
+            }
+
+            set
+            {
+                this._numberOfUAEmitterSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the shaft RPM values
+        /// </summary>
+        [XmlElement(ElementName = "shaftRPMsList", Type = typeof(List<ShaftRPMs>))]
+        public List<ShaftRPMs> ShaftRPMs
+        {
+            get
+            {
+                return this._shaftRPMs;
+            }
+        }
+
+        /// <summary>
+        /// Gets the apaData
+        /// </summary>
+        [XmlElement(ElementName = "apaDataList", Type = typeof(List<ApaData>))]
+        public List<ApaData> ApaData
+        {
+            get
+            {
+                return this._apaData;
+            }
+        }
+
+        /// <summary>
+        /// Gets the emitterSystems
+        /// </summary>
+        [XmlElement(ElementName = "emitterSystemsList", Type = typeof(List<AcousticEmitterSystemData>))]
+        public List<AcousticEmitterSystemData> EmitterSystems
+        {
+            get
+            {
+                return this._emitterSystems;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteByte((byte)this._stateChangeIndicator);
+                    dos.WriteByte((byte)this._pad);
+                    dos.WriteUnsignedShort((ushort)this._passiveParameterIndex);
+                    dos.WriteUnsignedByte((byte)this._propulsionPlantConfiguration);
+                    dos.WriteUnsignedByte((byte)this._shaftRPMs.Count);
+                    dos.WriteUnsignedByte((byte)this._apaData.Count);
+                    dos.WriteUnsignedByte((byte)this._emitterSystems.Count);
+
+                    for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                    {
+                        ShaftRPMs aShaftRPMs = (ShaftRPMs)this._shaftRPMs[idx];
+                        aShaftRPMs.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._apaData.Count; idx++)
+                    {
+                        ApaData aApaData = (ApaData)this._apaData[idx];
+                        aApaData.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                    {
+                        AcousticEmitterSystemData aAcousticEmitterSystemData = (AcousticEmitterSystemData)this._emitterSystems[idx];
+                        aAcousticEmitterSystemData.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._stateChangeIndicator = dis.ReadByte();
+                    this._pad = dis.ReadByte();
+                    this._passiveParameterIndex = dis.ReadUnsignedShort();
+                    this._propulsionPlantConfiguration = dis.ReadUnsignedByte();
+                    this._numberOfShafts = dis.ReadUnsignedByte();
+                    this._numberOfAPAs = dis.ReadUnsignedByte();
+                    this._numberOfUAEmitterSystems = dis.ReadUnsignedByte();
+
+                    for (int idx = 0; idx < this.NumberOfShafts; idx++)
+                    {
+                        ShaftRPMs anX = new ShaftRPMs();
+                        anX.Unmarshal(dis);
+                        this._shaftRPMs.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfAPAs; idx++)
+                    {
+                        ApaData anX = new ApaData();
+                        anX.Unmarshal(dis);
+                        this._apaData.Add(anX);
+                    }
+
+                    for (int idx = 0; idx < this.NumberOfUAEmitterSystems; idx++)
+                    {
+                        AcousticEmitterSystemData anX = new AcousticEmitterSystemData();
+                        anX.Unmarshal(dis);
+                        this._emitterSystems.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<UaPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<emittingEntityID>");
+                this._emittingEntityID.Reflection(sb);
+                sb.AppendLine("</emittingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<stateChangeIndicator type=\"byte\">" + this._stateChangeIndicator.ToString(CultureInfo.InvariantCulture) + "</stateChangeIndicator>");
+                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                sb.AppendLine("<passiveParameterIndex type=\"ushort\">" + this._passiveParameterIndex.ToString(CultureInfo.InvariantCulture) + "</passiveParameterIndex>");
+                sb.AppendLine("<propulsionPlantConfiguration type=\"byte\">" + this._propulsionPlantConfiguration.ToString(CultureInfo.InvariantCulture) + "</propulsionPlantConfiguration>");
+                sb.AppendLine("<shaftRPMs type=\"byte\">" + this._shaftRPMs.Count.ToString(CultureInfo.InvariantCulture) + "</shaftRPMs>");
+                sb.AppendLine("<apaData type=\"byte\">" + this._apaData.Count.ToString(CultureInfo.InvariantCulture) + "</apaData>");
+                sb.AppendLine("<emitterSystems type=\"byte\">" + this._emitterSystems.Count.ToString(CultureInfo.InvariantCulture) + "</emitterSystems>");
+                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                {
+                    sb.AppendLine("<shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ShaftRPMs\">");
+                    ShaftRPMs aShaftRPMs = (ShaftRPMs)this._shaftRPMs[idx];
+                    aShaftRPMs.Reflection(sb);
+                    sb.AppendLine("</shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._apaData.Count; idx++)
+                {
+                    sb.AppendLine("<apaData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"ApaData\">");
+                    ApaData aApaData = (ApaData)this._apaData[idx];
+                    aApaData.Reflection(sb);
+                    sb.AppendLine("</apaData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                {
+                    sb.AppendLine("<emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"AcousticEmitterSystemData\">");
+                    AcousticEmitterSystemData aAcousticEmitterSystemData = (AcousticEmitterSystemData)this._emitterSystems[idx];
+                    aAcousticEmitterSystemData.Reflection(sb);
+                    sb.AppendLine("</emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</UaPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as UaPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(UaPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateChangeIndicator != obj._stateChangeIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._passiveParameterIndex != obj._passiveParameterIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._propulsionPlantConfiguration != obj._propulsionPlantConfiguration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfShafts != obj._numberOfShafts)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfAPAs != obj._numberOfAPAs)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfUAEmitterSystems != obj._numberOfUAEmitterSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._shaftRPMs.Count != obj._shaftRPMs.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                {
+                    if (!this._shaftRPMs[idx].Equals(obj._shaftRPMs[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._apaData.Count != obj._apaData.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._apaData.Count; idx++)
+                {
+                    if (!this._apaData[idx].Equals(obj._apaData[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._emitterSystems.Count != obj._emitterSystems.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                {
+                    if (!this._emitterSystems[idx].Equals(obj._emitterSystems[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._stateChangeIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+            result = GenerateHash(result) ^ this._passiveParameterIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._propulsionPlantConfiguration.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfShafts.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfAPAs.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfUAEmitterSystems.GetHashCode();
+
+            if (this._shaftRPMs.Count > 0)
+            {
+                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._shaftRPMs[idx].GetHashCode();
+                }
+            }
+
+            if (this._apaData.Count > 0)
+            {
+                for (int idx = 0; idx < this._apaData.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._apaData[idx].GetHashCode();
+                }
+            }
+
+            if (this._emitterSystems.Count > 0)
+            {
+                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._emitterSystems[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/VariableDatum.cs b/Libs/CsharpDis6/Dis1998/Generated/VariableDatum.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/VariableDatum.cs
rename to Libs/CsharpDis6/Dis1998/Generated/VariableDatum.cs
index 6f5fb5c..f2dea02 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/VariableDatum.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/VariableDatum.cs
@@ -1,406 +1,406 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.32. Variable Datum Record
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EightByteChunk))]
-    public partial class VariableDatum
-    {
-        /// <summary>
-        /// ID of the variable datum
-        /// </summary>
-        private uint _variableDatumID;
-
-        /// <summary>
-        /// length of the variable datums
-        /// </summary>
-        private uint _variableDatumLength;
-
-        /// <summary>
-        /// variable length list of 64-bit datums
-        /// </summary>
-        private List<EightByteChunk> _variableDatums = new List<EightByteChunk>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VariableDatum"/> class.
-        /// </summary>
-        public VariableDatum()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(VariableDatum left, VariableDatum right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(VariableDatum left, VariableDatum right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._variableDatumID
-            marshalSize += 4;  // this._variableDatumLength
-            for (int idx = 0; idx < this._variableDatums.Count; idx++)
-            {
-                EightByteChunk listElement = (EightByteChunk)this._variableDatums[idx];
-                marshalSize += listElement.GetMarshalledSize();
-            }
-
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the variable datum
-        /// </summary>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumID")]
-        public uint VariableDatumID
-        {
-            get
-            {
-                return this._variableDatumID;
-            }
-
-            set
-            {
-                this._variableDatumID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the length of the variable datums
-        /// </summary>
-        /// <remarks>
-        /// This value must be set for any PDU using it to work!
-/// This value should be the number of bits used.
-        /// </remarks>
-        [XmlElement(Type = typeof(uint), ElementName = "variableDatumLength")]
-        public uint VariableDatumLength
-        {
-            get
-            {
-                return this._variableDatumLength;
-            }
-
-            set
-            {
-                this._variableDatumLength = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the variable length list of 64-bit datums
-        /// </summary>
-        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<EightByteChunk>))]
-        public List<EightByteChunk> VariableDatums
-        {
-            get
-            {
-                return this._variableDatums;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteUnsignedInt((uint)this._variableDatumID);
-                    dos.WriteUnsignedInt((uint)this._variableDatumLength); //Post processedtums.Count);
-
-                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                    {
-                        EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
-                        aEightByteChunk.Marshal(dos);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._variableDatumID = dis.ReadUnsignedInt();
-                    this._variableDatumLength = dis.ReadUnsignedInt();
-        int variableCount = (int)(this._variableDatumLength / 64) + (this._variableDatumLength % 64 > 0 ? 1 : 0);  //Post processed
-
-                    for (int idx = 0; idx < variableCount; idx++)
-                    {
-                        EightByteChunk anX = new EightByteChunk();
-                        anX.Unmarshal(dis);
-                        this._variableDatums.Add(anX);
-                    }
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<VariableDatum>");
-            try
-            {
-                sb.AppendLine("<variableDatumID type=\"uint\">" + this._variableDatumID.ToString(CultureInfo.InvariantCulture) + "</variableDatumID>");
-                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
-                    EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
-                    aEightByteChunk.Reflection(sb);
-                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
-                }
-
-                sb.AppendLine("</VariableDatum>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as VariableDatum;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(VariableDatum obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._variableDatumID != obj._variableDatumID)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatumLength != obj._variableDatumLength)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._variableDatums.Count != obj._variableDatums.Count)
-            {
-                ivarsEqual = false;
-            }
-
-            if (ivarsEqual)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
-                    {
-                        ivarsEqual = false;
-                    }
-                }
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._variableDatumID.GetHashCode();
-            result = GenerateHash(result) ^ this._variableDatumLength.GetHashCode();
-
-            if (this._variableDatums.Count > 0)
-            {
-                for (int idx = 0; idx < this._variableDatums.Count; idx++)
-                {
-                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
-                }
-            }
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.32. Variable Datum Record
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EightByteChunk))]
+    public partial class VariableDatum
+    {
+        /// <summary>
+        /// ID of the variable datum
+        /// </summary>
+        private uint _variableDatumID;
+
+        /// <summary>
+        /// length of the variable datums
+        /// </summary>
+        private uint _variableDatumLength;
+
+        /// <summary>
+        /// variable length list of 64-bit datums
+        /// </summary>
+        private List<EightByteChunk> _variableDatums = new List<EightByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VariableDatum"/> class.
+        /// </summary>
+        public VariableDatum()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(VariableDatum left, VariableDatum right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(VariableDatum left, VariableDatum right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._variableDatumID
+            marshalSize += 4;  // this._variableDatumLength
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                EightByteChunk listElement = (EightByteChunk)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the variable datum
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumID")]
+        public uint VariableDatumID
+        {
+            get
+            {
+                return this._variableDatumID;
+            }
+
+            set
+            {
+                this._variableDatumID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length of the variable datums
+        /// </summary>
+        /// <remarks>
+        /// This value must be set for any PDU using it to work!
+/// This value should be the number of bits used.
+        /// </remarks>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumLength")]
+        public uint VariableDatumLength
+        {
+            get
+            {
+                return this._variableDatumLength;
+            }
+
+            set
+            {
+                this._variableDatumLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the variable length list of 64-bit datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<EightByteChunk>))]
+        public List<EightByteChunk> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._variableDatumID);
+                    dos.WriteUnsignedInt((uint)this._variableDatumLength); //Post processedtums.Count);
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
+                        aEightByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._variableDatumID = dis.ReadUnsignedInt();
+                    this._variableDatumLength = dis.ReadUnsignedInt();
+        int variableCount = (int)(this._variableDatumLength / 64) + (this._variableDatumLength % 64 > 0 ? 1 : 0);  //Post processed
+
+                    for (int idx = 0; idx < variableCount; idx++)
+                    {
+                        EightByteChunk anX = new EightByteChunk();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    }
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<VariableDatum>");
+            try
+            {
+                sb.AppendLine("<variableDatumID type=\"uint\">" + this._variableDatumID.ToString(CultureInfo.InvariantCulture) + "</variableDatumID>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
+                    EightByteChunk aEightByteChunk = (EightByteChunk)this._variableDatums[idx];
+                    aEightByteChunk.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</VariableDatum>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as VariableDatum;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(VariableDatum obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._variableDatumID != obj._variableDatumID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumLength != obj._variableDatumLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._variableDatumID.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumLength.GetHashCode();
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Double.cs b/Libs/CsharpDis6/Dis1998/Generated/Vector3Double.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Double.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Vector3Double.cs
index 703bced..7185ee2 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Double.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Vector3Double.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.34. Three double precision floating point values, x, y, and z
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Vector3Double
-    {
-        /// <summary>
-        /// X value
-        /// </summary>
-        private double _x;
-
-        /// <summary>
-        /// Y value
-        /// </summary>
-        private double _y;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private double _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Vector3Double"/> class.
-        /// </summary>
-        public Vector3Double()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Vector3Double left, Vector3Double right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Vector3Double left, Vector3Double right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 8;  // this._x
-            marshalSize += 8;  // this._y
-            marshalSize += 8;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "x")]
-        public double X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Y value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "y")]
-        public double Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(double), ElementName = "z")]
-        public double Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteDouble((double)this._x);
-                    dos.WriteDouble((double)this._y);
-                    dos.WriteDouble((double)this._z);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadDouble();
-                    this._y = dis.ReadDouble();
-                    this._z = dis.ReadDouble();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Vector3Double>");
-            try
-            {
-                sb.AppendLine("<x type=\"double\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"double\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"double\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</Vector3Double>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Vector3Double;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Vector3Double obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.34. Three double precision floating point values, x, y, and z
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Vector3Double
+    {
+        /// <summary>
+        /// X value
+        /// </summary>
+        private double _x;
+
+        /// <summary>
+        /// Y value
+        /// </summary>
+        private double _y;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private double _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Vector3Double"/> class.
+        /// </summary>
+        public Vector3Double()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Vector3Double left, Vector3Double right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Vector3Double left, Vector3Double right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 8;  // this._x
+            marshalSize += 8;  // this._y
+            marshalSize += 8;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "x")]
+        public double X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Y value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "y")]
+        public double Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "z")]
+        public double Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteDouble((double)this._x);
+                    dos.WriteDouble((double)this._y);
+                    dos.WriteDouble((double)this._z);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadDouble();
+                    this._y = dis.ReadDouble();
+                    this._z = dis.ReadDouble();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Vector3Double>");
+            try
+            {
+                sb.AppendLine("<x type=\"double\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"double\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"double\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</Vector3Double>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Vector3Double;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Vector3Double obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Float.cs b/Libs/CsharpDis6/Dis1998/Generated/Vector3Float.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Float.cs
rename to Libs/CsharpDis6/Dis1998/Generated/Vector3Float.cs
index 9c6a76e..0cac45f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/Vector3Float.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/Vector3Float.cs
@@ -1,364 +1,364 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.33. Three floating point values, x, y, and z
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class Vector3Float
-    {
-        /// <summary>
-        /// X value
-        /// </summary>
-        private float _x;
-
-        /// <summary>
-        /// y Value
-        /// </summary>
-        private float _y;
-
-        /// <summary>
-        /// Z value
-        /// </summary>
-        private float _z;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Vector3Float"/> class.
-        /// </summary>
-        public Vector3Float()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Vector3Float left, Vector3Float right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Vector3Float left, Vector3Float right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._x
-            marshalSize += 4;  // this._y
-            marshalSize += 4;  // this._z
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the X value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "x")]
-        public float X
-        {
-            get
-            {
-                return this._x;
-            }
-
-            set
-            {
-                this._x = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y Value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "y")]
-        public float Y
-        {
-            get
-            {
-                return this._y;
-            }
-
-            set
-            {
-                this._y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Z value
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "z")]
-        public float Z
-        {
-            get
-            {
-                return this._z;
-            }
-
-            set
-            {
-                this._z = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._x);
-                    dos.WriteFloat((float)this._y);
-                    dos.WriteFloat((float)this._z);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._x = dis.ReadFloat();
-                    this._y = dis.ReadFloat();
-                    this._z = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<Vector3Float>");
-            try
-            {
-                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
-                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
-                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
-                sb.AppendLine("</Vector3Float>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as Vector3Float;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Vector3Float obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._x != obj._x)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._y != obj._y)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._z != obj._z)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._x.GetHashCode();
-            result = GenerateHash(result) ^ this._y.GetHashCode();
-            result = GenerateHash(result) ^ this._z.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.33. Three floating point values, x, y, and z
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Vector3Float
+    {
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Vector3Float"/> class.
+        /// </summary>
+        public Vector3Float()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Vector3Float left, Vector3Float right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Vector3Float left, Vector3Float right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            marshalSize += 4;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "z")]
+        public float Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                    dos.WriteFloat((float)this._z);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                    this._z = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Vector3Float>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</Vector3Float>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Vector3Float;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Vector3Float obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs b/Libs/CsharpDis6/Dis1998/Generated/VectoringNozzleSystemData.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs
rename to Libs/CsharpDis6/Dis1998/Generated/VectoringNozzleSystemData.cs
index 998432b..a2f5e1f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/VectoringNozzleSystemData.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/VectoringNozzleSystemData.cs
@@ -1,332 +1,332 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Data about a vectoring nozzle system
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    public partial class VectoringNozzleSystemData
-    {
-        /// <summary>
-        /// horizontal deflection angle
-        /// </summary>
-        private float _horizontalDeflectionAngle;
-
-        /// <summary>
-        /// vertical deflection angle
-        /// </summary>
-        private float _verticalDeflectionAngle;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VectoringNozzleSystemData"/> class.
-        /// </summary>
-        public VectoringNozzleSystemData()
-        {
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(VectoringNozzleSystemData left, VectoringNozzleSystemData right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(VectoringNozzleSystemData left, VectoringNozzleSystemData right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public virtual int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize += 4;  // this._horizontalDeflectionAngle
-            marshalSize += 4;  // this._verticalDeflectionAngle
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the horizontal deflection angle
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "horizontalDeflectionAngle")]
-        public float HorizontalDeflectionAngle
-        {
-            get
-            {
-                return this._horizontalDeflectionAngle;
-            }
-
-            set
-            {
-                this._horizontalDeflectionAngle = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the vertical deflection angle
-        /// </summary>
-        [XmlElement(Type = typeof(float), ElementName = "verticalDeflectionAngle")]
-        public float VerticalDeflectionAngle
-        {
-            get
-            {
-                return this._verticalDeflectionAngle;
-            }
-
-            set
-            {
-                this._verticalDeflectionAngle = value;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when exception when processing PDU is caught.
-        /// </summary>
-        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
-
-        /// <summary>
-        /// Called when exception occurs (raises the <see cref="Exception"/> event).
-        /// </summary>
-        /// <param name="e">The exception.</param>
-        protected void RaiseExceptionOccured(Exception e)
-        {
-            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
-            {
-                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
-            }
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Marshal(DataOutputStream dos)
-        {
-            if (dos != null)
-            {
-                try
-                {
-                    dos.WriteFloat((float)this._horizontalDeflectionAngle);
-                    dos.WriteFloat((float)this._verticalDeflectionAngle);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Unmarshal(DataInputStream dis)
-        {
-            if (dis != null)
-            {
-                try
-                {
-                    this._horizontalDeflectionAngle = dis.ReadFloat();
-                    this._verticalDeflectionAngle = dis.ReadFloat();
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public virtual void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<VectoringNozzleSystemData>");
-            try
-            {
-                sb.AppendLine("<horizontalDeflectionAngle type=\"float\">" + this._horizontalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</horizontalDeflectionAngle>");
-                sb.AppendLine("<verticalDeflectionAngle type=\"float\">" + this._verticalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</verticalDeflectionAngle>");
-                sb.AppendLine("</VectoringNozzleSystemData>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as VectoringNozzleSystemData;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(VectoringNozzleSystemData obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            if (this._horizontalDeflectionAngle != obj._horizontalDeflectionAngle)
-            {
-                ivarsEqual = false;
-            }
-
-            if (this._verticalDeflectionAngle != obj._verticalDeflectionAngle)
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ this._horizontalDeflectionAngle.GetHashCode();
-            result = GenerateHash(result) ^ this._verticalDeflectionAngle.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Data about a vectoring nozzle system
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class VectoringNozzleSystemData
+    {
+        /// <summary>
+        /// horizontal deflection angle
+        /// </summary>
+        private float _horizontalDeflectionAngle;
+
+        /// <summary>
+        /// vertical deflection angle
+        /// </summary>
+        private float _verticalDeflectionAngle;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VectoringNozzleSystemData"/> class.
+        /// </summary>
+        public VectoringNozzleSystemData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(VectoringNozzleSystemData left, VectoringNozzleSystemData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(VectoringNozzleSystemData left, VectoringNozzleSystemData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._horizontalDeflectionAngle
+            marshalSize += 4;  // this._verticalDeflectionAngle
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal deflection angle
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "horizontalDeflectionAngle")]
+        public float HorizontalDeflectionAngle
+        {
+            get
+            {
+                return this._horizontalDeflectionAngle;
+            }
+
+            set
+            {
+                this._horizontalDeflectionAngle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the vertical deflection angle
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "verticalDeflectionAngle")]
+        public float VerticalDeflectionAngle
+        {
+            get
+            {
+                return this._verticalDeflectionAngle;
+            }
+
+            set
+            {
+                this._verticalDeflectionAngle = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event EventHandler<PduExceptionEventArgs> ExceptionOccured;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void RaiseExceptionOccured(Exception e)
+        {
+            if (Pdu.FireExceptionEvents && this.ExceptionOccured != null)
+            {
+                this.ExceptionOccured(this, new PduExceptionEventArgs(e));
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._horizontalDeflectionAngle);
+                    dos.WriteFloat((float)this._verticalDeflectionAngle);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._horizontalDeflectionAngle = dis.ReadFloat();
+                    this._verticalDeflectionAngle = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<VectoringNozzleSystemData>");
+            try
+            {
+                sb.AppendLine("<horizontalDeflectionAngle type=\"float\">" + this._horizontalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</horizontalDeflectionAngle>");
+                sb.AppendLine("<verticalDeflectionAngle type=\"float\">" + this._verticalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</verticalDeflectionAngle>");
+                sb.AppendLine("</VectoringNozzleSystemData>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as VectoringNozzleSystemData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(VectoringNozzleSystemData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._horizontalDeflectionAngle != obj._horizontalDeflectionAngle)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._verticalDeflectionAngle != obj._verticalDeflectionAngle)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._horizontalDeflectionAngle.GetHashCode();
+            result = GenerateHash(result) ^ this._verticalDeflectionAngle.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs b/Libs/CsharpDis6/Dis1998/Generated/WarfareFamilyPdu.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs
rename to Libs/CsharpDis6/Dis1998/Generated/WarfareFamilyPdu.cs
index b493f2b..e04d3a0 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Generated/WarfareFamilyPdu.cs
+++ b/Libs/CsharpDis6/Dis1998/Generated/WarfareFamilyPdu.cs
@@ -1,341 +1,341 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author: DMcG
-// Modified for use with C#:
-//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.3.4. abstract superclass for fire and detonation pdus that have shared information. COMPLETE
-    /// </summary>
-    [Serializable]
-    [XmlRoot]
-    [XmlInclude(typeof(EntityID))]
-    public partial class WarfareFamilyPdu : Pdu, IEquatable<WarfareFamilyPdu>
-    {
-        /// <summary>
-        /// ID of the entity that shot
-        /// </summary>
-        private EntityID _firingEntityID = new EntityID();
-
-        /// <summary>
-        /// ID of the entity that is being shot at
-        /// </summary>
-        private EntityID _targetEntityID = new EntityID();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WarfareFamilyPdu"/> class.
-        /// </summary>
-        public WarfareFamilyPdu()
-        {
-            ProtocolFamily = (byte)2;
-        }
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(WarfareFamilyPdu left, WarfareFamilyPdu right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(WarfareFamilyPdu left, WarfareFamilyPdu right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        public override int GetMarshalledSize()
-        {
-            int marshalSize = 0; 
-
-            marshalSize = base.GetMarshalledSize();
-            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
-            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
-            return marshalSize;
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that shot
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "firingEntityID")]
-        public EntityID FiringEntityID
-        {
-            get
-            {
-                return this._firingEntityID;
-            }
-
-            set
-            {
-                this._firingEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity that is being shot at
-        /// </summary>
-        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
-        public EntityID TargetEntityID
-        {
-            get
-            {
-                return this._targetEntityID;
-            }
-
-            set
-            {
-                this._targetEntityID = value;
-            }
-        }
-
-        /// <summary>
-        /// Automatically sets the length of the marshalled data, then calls the marshal method.
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
-        {
-            // Set the length prior to marshalling data
-            this.Length = (ushort)this.GetMarshalledSize();
-            this.Marshal(dos);
-        }
-
-        /// <summary>
-        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
-        /// </summary>
-        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Marshal(DataOutputStream dos)
-        {
-            base.Marshal(dos);
-            if (dos != null)
-            {
-                try
-                {
-                    this._firingEntityID.Marshal(dos);
-                    this._targetEntityID.Marshal(dos);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Unmarshal(DataInputStream dis)
-        {
-            base.Unmarshal(dis);
-
-            if (dis != null)
-            {
-                try
-                {
-                    this._firingEntityID.Unmarshal(dis);
-                    this._targetEntityID.Unmarshal(dis);
-                }
-                catch (Exception e)
-                {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
-        /// This will be modified in the future to provide a better display.  Usage: 
-        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
-        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
-        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
-        /// </summary>
-        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
-        public override void Reflection(StringBuilder sb)
-        {
-            sb.AppendLine("<WarfareFamilyPdu>");
-            base.Reflection(sb);
-            try
-            {
-                sb.AppendLine("<firingEntityID>");
-                this._firingEntityID.Reflection(sb);
-                sb.AppendLine("</firingEntityID>");
-                sb.AppendLine("<targetEntityID>");
-                this._targetEntityID.Reflection(sb);
-                sb.AppendLine("</targetEntityID>");
-                sb.AppendLine("</WarfareFamilyPdu>");
-            }
-            catch (Exception e)
-            {
-                    if (PduBase.TraceExceptions)
-                    {
-                        Trace.WriteLine(e);
-                        Trace.Flush();
-                    }
-
-                    this.RaiseExceptionOccured(e);
-
-                    if (PduBase.ThrowExceptions)
-                    {
-                        throw e;
-                    }
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return this == obj as WarfareFamilyPdu;
-        }
-
-        /// <summary>
-        /// Compares for reference AND value equality.
-        /// </summary>
-        /// <param name="obj">The object to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(WarfareFamilyPdu obj)
-        {
-            bool ivarsEqual = true;
-
-            if (obj.GetType() != this.GetType())
-            {
-                return false;
-            }
-
-            ivarsEqual = base.Equals(obj);
-
-            if (!this._firingEntityID.Equals(obj._firingEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            if (!this._targetEntityID.Equals(obj._targetEntityID))
-            {
-                ivarsEqual = false;
-            }
-
-            return ivarsEqual;
-        }
-
-        /// <summary>
-        /// HashCode Helper
-        /// </summary>
-        /// <param name="hash">The hash value.</param>
-        /// <returns>The new hash value.</returns>
-        private static int GenerateHash(int hash)
-        {
-            hash = hash << (5 + hash);
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets the hash code.
-        /// </summary>
-        /// <returns>The hash code.</returns>
-        public override int GetHashCode()
-        {
-            int result = 0;
-
-            result = GenerateHash(result) ^ base.GetHashCode();
-
-            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
-            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
-
-            return result;
-        }
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.3.4. abstract superclass for fire and detonation pdus that have shared information. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class WarfareFamilyPdu : Pdu, IEquatable<WarfareFamilyPdu>
+    {
+        /// <summary>
+        /// ID of the entity that shot
+        /// </summary>
+        private EntityID _firingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of the entity that is being shot at
+        /// </summary>
+        private EntityID _targetEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WarfareFamilyPdu"/> class.
+        /// </summary>
+        public WarfareFamilyPdu()
+        {
+            ProtocolFamily = (byte)2;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(WarfareFamilyPdu left, WarfareFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(WarfareFamilyPdu left, WarfareFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
+            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that shot
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "firingEntityID")]
+        public EntityID FiringEntityID
+        {
+            get
+            {
+                return this._firingEntityID;
+            }
+
+            set
+            {
+                this._firingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that is being shot at
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
+        public EntityID TargetEntityID
+        {
+            get
+            {
+                return this._targetEntityID;
+            }
+
+            set
+            {
+                this._targetEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._firingEntityID.Marshal(dos);
+                    this._targetEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._firingEntityID.Unmarshal(dis);
+                    this._targetEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<WarfareFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<firingEntityID>");
+                this._firingEntityID.Reflection(sb);
+                sb.AppendLine("</firingEntityID>");
+                sb.AppendLine("<targetEntityID>");
+                this._targetEntityID.Reflection(sb);
+                sb.AppendLine("</targetEntityID>");
+                sb.AppendLine("</WarfareFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+                    if (PduBase.TraceExceptions)
+                    {
+                        Trace.WriteLine(e);
+                        Trace.Flush();
+                    }
+
+                    this.RaiseExceptionOccured(e);
+
+                    if (PduBase.ThrowExceptions)
+                    {
+                        throw e;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as WarfareFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(WarfareFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._firingEntityID.Equals(obj._firingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetEntityID.Equals(obj._targetEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/PduFactory.cs b/Libs/CsharpDis6/Dis1998/PduFactory.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Dis1998/PduFactory.cs
rename to Libs/CsharpDis6/Dis1998/PduFactory.cs
index 4ae7b28..3aae42f 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/PduFactory.cs
+++ b/Libs/CsharpDis6/Dis1998/PduFactory.cs
@@ -1,239 +1,239 @@
-using System;
-using OpenDis.Core;
-using OpenDis.Enumerations;
-
-namespace OpenDis.Dis1998
-{
-    public static class PduFactory
-    {
-        /// <summary>
-        /// Creates the PDU.
-        /// </summary>
-        /// <param name="type">The type of PDU to be created.</param>
-        /// <returns>Returns the corresponding PDU instance or null if type equals 0.</returns>
-        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
-        public static IPdu CreatePdu(byte type)
-        {
-            return CreatePdu((PduType)type);
-        }
-
-        /// <summary>
-        /// Creates the PDU.
-        /// </summary>
-        /// <param name="type">The type of PDU to be created.</param>
-        /// <returns>Returns the corresponding PDU instance or null if PduType.Other is specified.</returns>
-        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
-        public static IPdu CreatePdu(PduType type)
-        {
-            IPdu pdu = null;
-
-            switch (type)
-            {
-                case PduType.Other:
-                    pdu = new Pdu();
-                    break;
-                case PduType.EntityState:
-                    pdu = new EntityStatePdu();
-                    break;
-                case PduType.Fire:
-                    pdu = new FirePdu();
-                    break;
-                case PduType.Detonation:
-                    pdu = new DetonationPdu();
-                    break;
-                case PduType.Collision:
-                    pdu = new CollisionPdu();
-                    break;
-                case PduType.ServiceRequest:
-                    pdu = new ServiceRequestPdu();
-                    break;
-                case PduType.ResupplyOffer:
-                    pdu = new ResupplyOfferPdu();
-                    break;
-                case PduType.ResupplyReceived:
-                    pdu = new ResupplyReceivedPdu();
-                    break;
-                case PduType.ResupplyCancel:
-                    pdu = new ResupplyCancelPdu();
-                    break;
-                case PduType.RepairComplete:
-                    pdu = new RepairCompletePdu();
-                    break;
-                case PduType.RepairResponse:
-                    pdu = new RepairResponsePdu();
-                    break;
-                case PduType.CreateEntity:
-                    pdu = new CreateEntityPdu();
-                    break;
-                case PduType.RemoveEntity:
-                    pdu = new RemoveEntityPdu();
-                    break;
-                case PduType.StartResume:
-                    pdu = new StartResumePdu();
-                    break;
-                case PduType.StopFreeze:
-                    pdu = new StopFreezePdu();
-                    break;
-                case PduType.Acknowledge:
-                    pdu = new AcknowledgePdu();
-                    break;
-                case PduType.ActionRequest:
-                    pdu = new ActionRequestPdu();
-                    break;
-                case PduType.ActionResponse:
-                    pdu = new ActionResponsePdu();
-                    break;
-                case PduType.DataQuery:
-                    pdu = new DataQueryPdu();
-                    break;
-                case PduType.SetData:
-                    pdu = new SetDataPdu();
-                    break;
-                case PduType.Data:
-                    pdu = new DataPdu();
-                    break;
-                case PduType.EventReport:
-                    pdu = new EventReportPdu();
-                    break;
-                case PduType.Comment:
-                    pdu = new CommentPdu();
-                    break;
-                case PduType.ElectromagneticEmission:
-                    pdu = new ElectronicEmissionsPdu();
-                    break;
-                case PduType.Designator:
-                    pdu = new DesignatorPdu();
-                    break;
-                case PduType.Transmitter:
-                    pdu = new TransmitterPdu();
-                    break;
-                case PduType.Signal:
-                    pdu = new SignalPdu();
-                    break;
-                case PduType.Receiver:
-                    pdu = new ReceiverPdu();
-                    break;
-                case PduType.IFF_ATC_NAVAIDS:
-                    pdu = new IffAtcNavAidsLayer1Pdu();
-                    break;
-                case PduType.UnderwaterAcoustic:
-                    pdu = new UaPdu();
-                    break;
-                case PduType.SupplementalEmissionEntityState:
-                    pdu = new SeesPdu();
-                    break;
-                case PduType.IntercomSignal:
-                    pdu = new IntercomSignalPdu();
-                    break;
-                case PduType.IntercomControl:
-                    pdu = new IntercomControlPdu();
-                    break;
-                case PduType.AggregateState:
-                    pdu = new AggregateStatePdu();
-                    break;
-                case PduType.IsGroupOf:
-                    pdu = new IsGroupOfPdu();
-                    break;
-                case PduType.TransferControl:
-                    pdu = new TransferControlRequestPdu();
-                    break;
-                case PduType.IsPartOf:
-                    pdu = new IsPartOfPdu();
-                    break;
-                case PduType.MinefieldState:
-                    pdu = new MinefieldStatePdu();
-                    break;
-                case PduType.MinefieldQuery:
-                    pdu = new MinefieldQueryPdu();
-                    break;
-                case PduType.MinefieldData:
-                    pdu = new MinefieldDataPdu();
-                    break;
-                case PduType.MinefieldResponseNAK:
-                    pdu = new MinefieldResponseNackPdu();
-                    break;
-                case PduType.EnvironmentalProcess:
-                    pdu = new EnvironmentalProcessPdu();
-                    break;
-                case PduType.GriddedData:
-                    pdu = new GriddedDataPdu();
-                    break;
-                case PduType.PointObjectState:
-                    pdu = new PointObjectStatePdu();
-                    break;
-                case PduType.LinearObjectState:
-                    pdu = new LinearObjectStatePdu();
-                    break;
-                case PduType.ArealObjectState:
-                    pdu = new ArealObjectStatePdu();
-                    break;
-                case PduType.TSPI:
-                    throw new NotImplementedException();
-                case PduType.Appearance:
-                    throw new NotImplementedException();
-                case PduType.ArticulatedParts:
-                    throw new NotImplementedException();
-                case PduType.LEFire:
-                    throw new NotImplementedException();
-                case PduType.LEDetonation:
-                    throw new NotImplementedException();
-                case PduType.CreateEntityR:
-                    pdu = new CreateEntityReliablePdu();
-                    break;
-                case PduType.RemoveEntityR:
-                    pdu = new RemoveEntityReliablePdu();
-                    break;
-                case PduType.StartResumeR:
-                    pdu = new StartResumeReliablePdu();
-                    break;
-                case PduType.StopFreezeR:
-                    pdu = new StopFreezeReliablePdu();
-                    break;
-                case PduType.AcknowledgeR:
-                    pdu = new AcknowledgeReliablePdu();
-                    break;
-                case PduType.ActionRequestR:
-                    pdu = new ActionRequestReliablePdu();
-                    break;
-                case PduType.ActionResponseR:
-                    pdu = new ActionResponseReliablePdu();
-                    break;
-                case PduType.DataQueryR:
-                    pdu = new DataQueryReliablePdu();
-                    break;
-                case PduType.SetDataR:
-                    pdu = new SetDataReliablePdu();
-                    break;
-                case PduType.DataR:
-                    pdu = new DataReliablePdu();
-                    break;
-                case PduType.EventReportR:
-                    pdu = new EventReportReliablePdu();
-                    break;
-                case PduType.CommentR:
-                    pdu = new CommentReliablePdu();
-                    break;
-                case PduType.RecordR:
-                    pdu = new RecordQueryReliablePdu();
-                    break;
-                case PduType.SetRecordR:
-                    pdu = new SetRecordReliablePdu();
-                    break;
-                case PduType.RecordQueryR:
-                    pdu = new RecordQueryReliablePdu();
-                    break;
-                case PduType.CollisionElastic:
-                    pdu = new CollisionElasticPdu();
-                    break;
-                case PduType.EntityStateUpdate:
-                    pdu = new EntityStateUpdatePdu();
-                    break;
-                default:
-                    pdu = null;
-                    break;
-            }
-
-            return pdu;
-        }
-    }
-}
+using System;
+using OpenDis.Core;
+using OpenDis.Enumerations;
+
+namespace OpenDis.Dis1998
+{
+    public static class PduFactory
+    {
+        /// <summary>
+        /// Creates the PDU.
+        /// </summary>
+        /// <param name="type">The type of PDU to be created.</param>
+        /// <returns>Returns the corresponding PDU instance or null if type equals 0.</returns>
+        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
+        public static IPdu CreatePdu(byte type)
+        {
+            return CreatePdu((PduType)type);
+        }
+
+        /// <summary>
+        /// Creates the PDU.
+        /// </summary>
+        /// <param name="type">The type of PDU to be created.</param>
+        /// <returns>Returns the corresponding PDU instance or null if PduType.Other is specified.</returns>
+        /// <exception cref="NotImplementedException">if the PDU type specified in parameter is not supported.</exception>
+        public static IPdu CreatePdu(PduType type)
+        {
+            IPdu pdu = null;
+
+            switch (type)
+            {
+                case PduType.Other:
+                    pdu = new Pdu();
+                    break;
+                case PduType.EntityState:
+                    pdu = new EntityStatePdu();
+                    break;
+                case PduType.Fire:
+                    pdu = new FirePdu();
+                    break;
+                case PduType.Detonation:
+                    pdu = new DetonationPdu();
+                    break;
+                case PduType.Collision:
+                    pdu = new CollisionPdu();
+                    break;
+                case PduType.ServiceRequest:
+                    pdu = new ServiceRequestPdu();
+                    break;
+                case PduType.ResupplyOffer:
+                    pdu = new ResupplyOfferPdu();
+                    break;
+                case PduType.ResupplyReceived:
+                    pdu = new ResupplyReceivedPdu();
+                    break;
+                case PduType.ResupplyCancel:
+                    pdu = new ResupplyCancelPdu();
+                    break;
+                case PduType.RepairComplete:
+                    pdu = new RepairCompletePdu();
+                    break;
+                case PduType.RepairResponse:
+                    pdu = new RepairResponsePdu();
+                    break;
+                case PduType.CreateEntity:
+                    pdu = new CreateEntityPdu();
+                    break;
+                case PduType.RemoveEntity:
+                    pdu = new RemoveEntityPdu();
+                    break;
+                case PduType.StartResume:
+                    pdu = new StartResumePdu();
+                    break;
+                case PduType.StopFreeze:
+                    pdu = new StopFreezePdu();
+                    break;
+                case PduType.Acknowledge:
+                    pdu = new AcknowledgePdu();
+                    break;
+                case PduType.ActionRequest:
+                    pdu = new ActionRequestPdu();
+                    break;
+                case PduType.ActionResponse:
+                    pdu = new ActionResponsePdu();
+                    break;
+                case PduType.DataQuery:
+                    pdu = new DataQueryPdu();
+                    break;
+                case PduType.SetData:
+                    pdu = new SetDataPdu();
+                    break;
+                case PduType.Data:
+                    pdu = new DataPdu();
+                    break;
+                case PduType.EventReport:
+                    pdu = new EventReportPdu();
+                    break;
+                case PduType.Comment:
+                    pdu = new CommentPdu();
+                    break;
+                case PduType.ElectromagneticEmission:
+                    pdu = new ElectronicEmissionsPdu();
+                    break;
+                case PduType.Designator:
+                    pdu = new DesignatorPdu();
+                    break;
+                case PduType.Transmitter:
+                    pdu = new TransmitterPdu();
+                    break;
+                case PduType.Signal:
+                    pdu = new SignalPdu();
+                    break;
+                case PduType.Receiver:
+                    pdu = new ReceiverPdu();
+                    break;
+                case PduType.IFF_ATC_NAVAIDS:
+                    pdu = new IffAtcNavAidsLayer1Pdu();
+                    break;
+                case PduType.UnderwaterAcoustic:
+                    pdu = new UaPdu();
+                    break;
+                case PduType.SupplementalEmissionEntityState:
+                    pdu = new SeesPdu();
+                    break;
+                case PduType.IntercomSignal:
+                    pdu = new IntercomSignalPdu();
+                    break;
+                case PduType.IntercomControl:
+                    pdu = new IntercomControlPdu();
+                    break;
+                case PduType.AggregateState:
+                    pdu = new AggregateStatePdu();
+                    break;
+                case PduType.IsGroupOf:
+                    pdu = new IsGroupOfPdu();
+                    break;
+                case PduType.TransferControl:
+                    pdu = new TransferControlRequestPdu();
+                    break;
+                case PduType.IsPartOf:
+                    pdu = new IsPartOfPdu();
+                    break;
+                case PduType.MinefieldState:
+                    pdu = new MinefieldStatePdu();
+                    break;
+                case PduType.MinefieldQuery:
+                    pdu = new MinefieldQueryPdu();
+                    break;
+                case PduType.MinefieldData:
+                    pdu = new MinefieldDataPdu();
+                    break;
+                case PduType.MinefieldResponseNAK:
+                    pdu = new MinefieldResponseNackPdu();
+                    break;
+                case PduType.EnvironmentalProcess:
+                    pdu = new EnvironmentalProcessPdu();
+                    break;
+                case PduType.GriddedData:
+                    pdu = new GriddedDataPdu();
+                    break;
+                case PduType.PointObjectState:
+                    pdu = new PointObjectStatePdu();
+                    break;
+                case PduType.LinearObjectState:
+                    pdu = new LinearObjectStatePdu();
+                    break;
+                case PduType.ArealObjectState:
+                    pdu = new ArealObjectStatePdu();
+                    break;
+                case PduType.TSPI:
+                    throw new NotImplementedException();
+                case PduType.Appearance:
+                    throw new NotImplementedException();
+                case PduType.ArticulatedParts:
+                    throw new NotImplementedException();
+                case PduType.LEFire:
+                    throw new NotImplementedException();
+                case PduType.LEDetonation:
+                    throw new NotImplementedException();
+                case PduType.CreateEntityR:
+                    pdu = new CreateEntityReliablePdu();
+                    break;
+                case PduType.RemoveEntityR:
+                    pdu = new RemoveEntityReliablePdu();
+                    break;
+                case PduType.StartResumeR:
+                    pdu = new StartResumeReliablePdu();
+                    break;
+                case PduType.StopFreezeR:
+                    pdu = new StopFreezeReliablePdu();
+                    break;
+                case PduType.AcknowledgeR:
+                    pdu = new AcknowledgeReliablePdu();
+                    break;
+                case PduType.ActionRequestR:
+                    pdu = new ActionRequestReliablePdu();
+                    break;
+                case PduType.ActionResponseR:
+                    pdu = new ActionResponseReliablePdu();
+                    break;
+                case PduType.DataQueryR:
+                    pdu = new DataQueryReliablePdu();
+                    break;
+                case PduType.SetDataR:
+                    pdu = new SetDataReliablePdu();
+                    break;
+                case PduType.DataR:
+                    pdu = new DataReliablePdu();
+                    break;
+                case PduType.EventReportR:
+                    pdu = new EventReportReliablePdu();
+                    break;
+                case PduType.CommentR:
+                    pdu = new CommentReliablePdu();
+                    break;
+                case PduType.RecordR:
+                    pdu = new RecordQueryReliablePdu();
+                    break;
+                case PduType.SetRecordR:
+                    pdu = new SetRecordReliablePdu();
+                    break;
+                case PduType.RecordQueryR:
+                    pdu = new RecordQueryReliablePdu();
+                    break;
+                case PduType.CollisionElastic:
+                    pdu = new CollisionElasticPdu();
+                    break;
+                case PduType.EntityStateUpdate:
+                    pdu = new EntityStateUpdatePdu();
+                    break;
+                default:
+                    pdu = null;
+                    break;
+            }
+
+            return pdu;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Vector3Double.cs b/Libs/CsharpDis6/Dis1998/Vector3Double.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Vector3Double.cs
rename to Libs/CsharpDis6/Dis1998/Vector3Double.cs
index 92e556f..88bfe8a 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Vector3Double.cs
+++ b/Libs/CsharpDis6/Dis1998/Vector3Double.cs
@@ -1,19 +1,19 @@
-using System;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Three floating point values, x, y, and z.
-    /// </summary>
-    public partial class Vector3Double
-    {
-        /// <summary>
-        /// Calculates the length of the vector.
-        /// </summary>
-        /// <returns>The length of the vector.</returns>
-        public double CalculateLength()
-        {
-            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
-        }
-    }
-}
+using System;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Three floating point values, x, y, and z.
+    /// </summary>
+    public partial class Vector3Double
+    {
+        /// <summary>
+        /// Calculates the length of the vector.
+        /// </summary>
+        /// <returns>The length of the vector.</returns>
+        public double CalculateLength()
+        {
+            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Dis1998/Vector3Float.cs b/Libs/CsharpDis6/Dis1998/Vector3Float.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Dis1998/Vector3Float.cs
rename to Libs/CsharpDis6/Dis1998/Vector3Float.cs
index a936c47..4684f94 100644
--- a/Libs/CsharpDis6/OpenDis/Dis1998/Vector3Float.cs
+++ b/Libs/CsharpDis6/Dis1998/Vector3Float.cs
@@ -1,19 +1,19 @@
-using System;
-
-namespace OpenDis.Dis1998
-{
-    /// <summary>
-    /// Section 5.2.33. Three floating point values, x, y, and z
-    /// </summary>
-    public partial class Vector3Float
-    {
-        /// <summary>
-        /// Calculates the length of the vector.
-        /// </summary>
-        /// <returns>The length of the vector.</returns>
-        public double CalculateLength()
-        {
-            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
-        }
-    }
-}
+using System;
+
+namespace OpenDis.Dis1998
+{
+    /// <summary>
+    /// Section 5.2.33. Three floating point values, x, y, and z
+    /// </summary>
+    public partial class Vector3Float
+    {
+        /// <summary>
+        /// Calculates the length of the vector.
+        /// </summary>
+        /// <returns>The length of the vector.</returns>
+        public double CalculateLength()
+        {
+            return Math.Sqrt(Math.Pow(this.X, 2) + Math.Pow(this.Y, 2) + Math.Pow(this.Z, 2));
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/AggregateTypes.xml b/Libs/CsharpDis6/Enumerations/Cet2006/AggregateTypes.xml
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/AggregateTypes.xml
rename to Libs/CsharpDis6/Enumerations/Cet2006/AggregateTypes.xml
index 87b19f9..7554c06 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/AggregateTypes.xml
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/AggregateTypes.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<cet length="64" id="216" cname="eman.aggregate.type.types" name="Aggregate Types" source="11.1.3.3">
-  <entity kind="1" domain="1" country="225">
-    <category id="0" description="Other"/>
-    <category id="1" description="Individual Vehicle"/>
-    <category id="2" description="Element"/>
-    <category id="3" description="Platoon"/>
-    <category id="4" description="Battery"/>
-    <category id="5" description="Company"/>
-    <category id="6" description="Battalion"/>
-    <category id="7" description="Regiment"/>
-    <category id="8" description="Brigade"/>
-    <category id="9" description="Division"/>
-    <category id="10" description="Corps"/>
-  </entity>
+<?xml version="1.0" encoding="utf-8" ?>
+<cet length="64" id="216" cname="eman.aggregate.type.types" name="Aggregate Types" source="11.1.3.3">
+  <entity kind="1" domain="1" country="225">
+    <category id="0" description="Other"/>
+    <category id="1" description="Individual Vehicle"/>
+    <category id="2" description="Element"/>
+    <category id="3" description="Platoon"/>
+    <category id="4" description="Battery"/>
+    <category id="5" description="Company"/>
+    <category id="6" description="Battalion"/>
+    <category id="7" description="Regiment"/>
+    <category id="8" description="Brigade"/>
+    <category id="9" description="Division"/>
+    <category id="10" description="Corps"/>
+  </entity>
 </cet>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Category.cs b/Libs/CsharpDis6/Enumerations/Cet2006/Category.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Category.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/Category.cs
index 401ef62..32452bf 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Category.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/Category.cs
@@ -1,84 +1,84 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Category : GenericEntry
-    {
-		#region Fields (3) 
-
-        private List<Subcategory> subcategoryField;
-
-        private byte id;
-        private string idField;
-
-		#endregion Fields 
-
-		#region Properties (3) 
-
-        [XmlIgnore]
-        public byte Id
-        {
-            get
-            {
-                return this.id;
-            }
-
-            set
-            {
-                if (this.id != value)
-                {
-                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
-        public string RawId
-        {
-            get
-            {
-                return this.idField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.idField != value)
-                {
-                    this.idField = value;
-                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawId");
-                }
-            }
-        }
-
-        [XmlElement("subcategory", Form = XmlSchemaForm.Unqualified)]
-        public List<Subcategory> Subcategories
-        {
-            get
-            {
-                return this.subcategoryField;
-            }
-
-            set
-            {
-                if (this.subcategoryField != value)
-                {
-                    this.subcategoryField = value;
-                    this.RaisePropertyChanged("Subcategories");
-                }
-            }
-        }
-
-		#endregion Properties 
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Category : GenericEntry
+    {
+		#region Fields (3) 
+
+        private List<Subcategory> subcategoryField;
+
+        private byte id;
+        private string idField;
+
+		#endregion Fields 
+
+		#region Properties (3) 
+
+        [XmlIgnore]
+        public byte Id
+        {
+            get
+            {
+                return this.id;
+            }
+
+            set
+            {
+                if (this.id != value)
+                {
+                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
+        public string RawId
+        {
+            get
+            {
+                return this.idField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.idField != value)
+                {
+                    this.idField = value;
+                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawId");
+                }
+            }
+        }
+
+        [XmlElement("subcategory", Form = XmlSchemaForm.Unqualified)]
+        public List<Subcategory> Subcategories
+        {
+            get
+            {
+                return this.subcategoryField;
+            }
+
+            set
+            {
+                if (this.subcategoryField != value)
+                {
+                    this.subcategoryField = value;
+                    this.RaisePropertyChanged("Subcategories");
+                }
+            }
+        }
+
+		#endregion Properties 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Cet.cs b/Libs/CsharpDis6/Enumerations/Cet2006/Cet.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Cet.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/Cet.cs
index d32b7d4..d5c38cf 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Cet.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/Cet.cs
@@ -1,42 +1,42 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    [XmlRoot("cet", Namespace = "", IsNullable = false)]
-    public class Cet : GenericTable
-    {
-		#region Fields (1) 
-
-        private List<Entity> entityField;
-
-		#endregion Fields 
-
-		#region Properties (1) 
-
-        [XmlElement("entity", Form = XmlSchemaForm.Unqualified)]
-        public List<Entity> Entities
-        {
-            get
-            {
-                return this.entityField;
-            }
-
-            set
-            {
-                if (this.entityField != value)
-                {
-                    this.entityField = value;
-                    this.RaisePropertyChanged("Entities");
-                }
-            }
-        }
-
-		#endregion Properties 
-    }
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [XmlRoot("cet", Namespace = "", IsNullable = false)]
+    public class Cet : GenericTable
+    {
+		#region Fields (1) 
+
+        private List<Entity> entityField;
+
+		#endregion Fields 
+
+		#region Properties (1) 
+
+        [XmlElement("entity", Form = XmlSchemaForm.Unqualified)]
+        public List<Entity> Entities
+        {
+            get
+            {
+                return this.entityField;
+            }
+
+            set
+            {
+                if (this.entityField != value)
+                {
+                    this.entityField = value;
+                    this.RaisePropertyChanged("Entities");
+                }
+            }
+        }
+
+		#endregion Properties 
+    }
 }
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetFactory.cs b/Libs/CsharpDis6/Enumerations/Cet2006/CetFactory.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetFactory.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/CetFactory.cs
index 11c22ae..4ad0804 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetFactory.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/CetFactory.cs
@@ -1,124 +1,124 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    /// <summary>
-    /// Comprehensive entity types factory.
-    /// </summary>
-    public class CetFactory
-    {
-		#region Static methods (3) 
-
-        /// <summary>
-        /// Creates the aggregate types.
-        /// </summary>
-        /// <returns>Aggregate types</returns>
-        public static Cet CreateAggregateTypes()
-        {
-            return CreateCet("OpenDis.Enumerations.Cet2006.AggregateTypes.xml");
-        }
-
-        public static List<ICetItem> Transform(Cet c)
-        {
-            List<ICetItem> items = new List<ICetItem>();
-
-            IEnumerable<ICetItem> extras = 
-                from e in c.Entities 
-                from j in e.Categories 
-                from k in j.Subcategories 
-                from l in k.Specifices 
-                from m in l.Extras
-                select new CetItem() 
-                {   
-                    Category = j.Id, 
-                    Country = e.Country, 
-                    Description = m.Description,
-                    Domain = e.Domain,
-                    Extra = m.Id != 0 ? (byte?)m.Id : null,
-                    Kind = e.Kind,
-                    Specific = l.Id != 0 ? (byte?)l.Id : null,
-                    Subcategory = k.Id != 0 ? (byte?)k.Id : null
-                };
-
-            IEnumerable<ICetItem> specifices =
-                from e in c.Entities
-                from j in e.Categories
-                from k in j.Subcategories
-                from l in k.Specifices
-                select new CetItem()
-                {
-                    Category = j.Id,
-                    Country = e.Country,
-                    Description = l.Description,
-                    Domain = e.Domain,
-                    Kind = e.Kind,
-                    Specific = l.Id != 0 ? (byte?)l.Id : null,
-                    Maximum = l.Id2 != 0 ? (byte?)l.Id2 : null,
-                    Subcategory = k.Id != 0 ? (byte?)k.Id : null
-                };
-
-            IEnumerable<ICetItem> subcategories =
-                from e in c.Entities
-                from j in e.Categories
-                from k in j.Subcategories
-                select new CetItem()
-                {
-                    Category = j.Id,
-                    Country = e.Country,
-                    Description = k.Description,
-                    Domain = e.Domain,
-                    Kind = e.Kind,
-                    Subcategory = k.Id != 0 ? (byte?)k.Id : null,
-                    Maximum = k.Id2 != 0 ? (byte?)k.Id2 : null
-                };
-
-            IEnumerable<ICetItem> categories =
-                from e in c.Entities
-                from j in e.Categories
-                select new CetItem()
-                {
-                    Category = j.Id,
-                    Country = e.Country,
-                    Description = j.Description,
-                    Domain = e.Domain,
-                    Kind = e.Kind
-                };
-
-            items = items.Concat<ICetItem>(extras).Concat<ICetItem>(specifices).Concat<ICetItem>(subcategories).Concat<ICetItem>(categories).ToList<ICetItem>();
-            items.Sort();
-
-            return items;
-        }
-
-        /// <summary>
-        /// Creates the comprehensive entity-type instance.
-        /// </summary>
-        /// <param name="resource">The resource from which the CET is extracted.</param>
-        /// <returns>Comprehensive entity-type instance</returns>
-        private static Cet CreateCet(string resource)
-        {
-            XmlSerializer serializer = new XmlSerializer(typeof(Cet));
-
-            Stream s = Assembly.GetExecutingAssembly().GetManifestResourceStream(resource);
-            Cet et = (Cet)serializer.Deserialize(s);
-
-            return et;
-        }
-
-        /// <summary>
-        /// Creates the entity types.
-        /// </summary>
-        /// <returns>Entity types.</returns>
-        public static Cet CreateEntityTypes()
-        {
-            return CreateCet("OpenDis.Enumerations.Cet2006.EntityTypes.xml");
-        }
-
-		#endregion Static methods 
-    }
-}
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    /// <summary>
+    /// Comprehensive entity types factory.
+    /// </summary>
+    public class CetFactory
+    {
+		#region Static methods (3) 
+
+        /// <summary>
+        /// Creates the aggregate types.
+        /// </summary>
+        /// <returns>Aggregate types</returns>
+        public static Cet CreateAggregateTypes()
+        {
+            return CreateCet("OpenDis.Enumerations.Cet2006.AggregateTypes.xml");
+        }
+
+        public static List<ICetItem> Transform(Cet c)
+        {
+            List<ICetItem> items = new List<ICetItem>();
+
+            IEnumerable<ICetItem> extras = 
+                from e in c.Entities 
+                from j in e.Categories 
+                from k in j.Subcategories 
+                from l in k.Specifices 
+                from m in l.Extras
+                select new CetItem() 
+                {   
+                    Category = j.Id, 
+                    Country = e.Country, 
+                    Description = m.Description,
+                    Domain = e.Domain,
+                    Extra = m.Id != 0 ? (byte?)m.Id : null,
+                    Kind = e.Kind,
+                    Specific = l.Id != 0 ? (byte?)l.Id : null,
+                    Subcategory = k.Id != 0 ? (byte?)k.Id : null
+                };
+
+            IEnumerable<ICetItem> specifices =
+                from e in c.Entities
+                from j in e.Categories
+                from k in j.Subcategories
+                from l in k.Specifices
+                select new CetItem()
+                {
+                    Category = j.Id,
+                    Country = e.Country,
+                    Description = l.Description,
+                    Domain = e.Domain,
+                    Kind = e.Kind,
+                    Specific = l.Id != 0 ? (byte?)l.Id : null,
+                    Maximum = l.Id2 != 0 ? (byte?)l.Id2 : null,
+                    Subcategory = k.Id != 0 ? (byte?)k.Id : null
+                };
+
+            IEnumerable<ICetItem> subcategories =
+                from e in c.Entities
+                from j in e.Categories
+                from k in j.Subcategories
+                select new CetItem()
+                {
+                    Category = j.Id,
+                    Country = e.Country,
+                    Description = k.Description,
+                    Domain = e.Domain,
+                    Kind = e.Kind,
+                    Subcategory = k.Id != 0 ? (byte?)k.Id : null,
+                    Maximum = k.Id2 != 0 ? (byte?)k.Id2 : null
+                };
+
+            IEnumerable<ICetItem> categories =
+                from e in c.Entities
+                from j in e.Categories
+                select new CetItem()
+                {
+                    Category = j.Id,
+                    Country = e.Country,
+                    Description = j.Description,
+                    Domain = e.Domain,
+                    Kind = e.Kind
+                };
+
+            items = items.Concat<ICetItem>(extras).Concat<ICetItem>(specifices).Concat<ICetItem>(subcategories).Concat<ICetItem>(categories).ToList<ICetItem>();
+            items.Sort();
+
+            return items;
+        }
+
+        /// <summary>
+        /// Creates the comprehensive entity-type instance.
+        /// </summary>
+        /// <param name="resource">The resource from which the CET is extracted.</param>
+        /// <returns>Comprehensive entity-type instance</returns>
+        private static Cet CreateCet(string resource)
+        {
+            XmlSerializer serializer = new XmlSerializer(typeof(Cet));
+
+            Stream s = Assembly.GetExecutingAssembly().GetManifestResourceStream(resource);
+            Cet et = (Cet)serializer.Deserialize(s);
+
+            return et;
+        }
+
+        /// <summary>
+        /// Creates the entity types.
+        /// </summary>
+        /// <returns>Entity types.</returns>
+        public static Cet CreateEntityTypes()
+        {
+            return CreateCet("OpenDis.Enumerations.Cet2006.EntityTypes.xml");
+        }
+
+		#endregion Static methods 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetItem.cs b/Libs/CsharpDis6/Enumerations/Cet2006/CetItem.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetItem.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/CetItem.cs
index 34c0fae..2d65d89 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/CetItem.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/CetItem.cs
@@ -1,149 +1,149 @@
-using System;
-using OpenDis.Core;
-using OpenDis.Enumerations.EntityState.Type;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    public class CetItem : ICetItem
-    {
-		#region Properties (10) 
-
-        public Country Country { get; set; }
-
-        public byte Domain { get; set; }
-
-        public EntityKind Kind { get; set; }
-
-        public byte Category { get; set; }
-
-        public byte? Subcategory { get; set; }
-
-        public byte? Specific { get; set; }
-
-        public byte? Extra { get; set; }
-
-        public uint? Maximum { get; set; }
-
-        public string Description { get; set; }
-
-		#endregion Properties 
-
-		#region Methods (2) 
-
-        public int CompareTo(ICetItem other)
-        {
-            // By definition, any object compares greater than a null reference 
-            if (other == null)
-            {
-                return 1;
-            }
-
-            int countryCompare = this.Country.ToString().CompareTo(other.Country.ToString());
-            if (countryCompare != 0)
-            {
-                return countryCompare;
-            }
-
-            int domainCompare = this.Domain.CompareTo(other.Domain);
-            if (domainCompare != 0)
-            {
-                return domainCompare;
-            }
-
-            int kindCompare = this.Kind.ToString().CompareTo(other.Kind.ToString());
-            if (kindCompare != 0)
-            {
-                return kindCompare;
-            }
-
-            int categoryCompare = this.Category.CompareTo(other.Category);
-            if (categoryCompare != 0)
-            {
-                return categoryCompare;
-            }
-
-            if (this.Subcategory != null)
-            {
-                int subcategoryCompare = ((byte)this.Subcategory).CompareTo(other.Subcategory);
-                if (subcategoryCompare != 0)
-                {
-                    return subcategoryCompare;
-                }
-            }
-            else
-            {
-                if (other.Subcategory != null)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            if (this.Specific != null)
-            {
-                int specificCompare = ((byte)this.Specific).CompareTo(other.Specific);
-                if (specificCompare != 0)
-                {
-                    return specificCompare;
-                }
-            }
-            else
-            {
-                if (other.Specific != null)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            if (this.Extra != null)
-            {
-                int extraCompare = ((byte)this.Extra).CompareTo(other.Extra);
-                if (extraCompare != 0)
-                {
-                    return extraCompare;
-                }
-            }
-            else
-            {
-                if (other.Extra != null)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            if (!string.IsNullOrEmpty(this.Description))
-            {
-                return this.Description.CompareTo(other.Description);
-            }
-            else
-            {
-                return 0;
-            }
-        }
-
-        public int CompareTo(object obj)
-        {
-            if (obj is CetItem)
-            {
-                return this.CompareTo((CetItem)obj);
-            }
-            else
-            {
-                throw new ArgumentException("Object is not of type CetItem.");
-            }
-        }
-
-		#endregion Methods 
-    }
-}
+using System;
+using OpenDis.Core;
+using OpenDis.Enumerations.EntityState.Type;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    public class CetItem : ICetItem
+    {
+		#region Properties (10) 
+
+        public Country Country { get; set; }
+
+        public byte Domain { get; set; }
+
+        public EntityKind Kind { get; set; }
+
+        public byte Category { get; set; }
+
+        public byte? Subcategory { get; set; }
+
+        public byte? Specific { get; set; }
+
+        public byte? Extra { get; set; }
+
+        public uint? Maximum { get; set; }
+
+        public string Description { get; set; }
+
+		#endregion Properties 
+
+		#region Methods (2) 
+
+        public int CompareTo(ICetItem other)
+        {
+            // By definition, any object compares greater than a null reference 
+            if (other == null)
+            {
+                return 1;
+            }
+
+            int countryCompare = this.Country.ToString().CompareTo(other.Country.ToString());
+            if (countryCompare != 0)
+            {
+                return countryCompare;
+            }
+
+            int domainCompare = this.Domain.CompareTo(other.Domain);
+            if (domainCompare != 0)
+            {
+                return domainCompare;
+            }
+
+            int kindCompare = this.Kind.ToString().CompareTo(other.Kind.ToString());
+            if (kindCompare != 0)
+            {
+                return kindCompare;
+            }
+
+            int categoryCompare = this.Category.CompareTo(other.Category);
+            if (categoryCompare != 0)
+            {
+                return categoryCompare;
+            }
+
+            if (this.Subcategory != null)
+            {
+                int subcategoryCompare = ((byte)this.Subcategory).CompareTo(other.Subcategory);
+                if (subcategoryCompare != 0)
+                {
+                    return subcategoryCompare;
+                }
+            }
+            else
+            {
+                if (other.Subcategory != null)
+                {
+                    return -1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+
+            if (this.Specific != null)
+            {
+                int specificCompare = ((byte)this.Specific).CompareTo(other.Specific);
+                if (specificCompare != 0)
+                {
+                    return specificCompare;
+                }
+            }
+            else
+            {
+                if (other.Specific != null)
+                {
+                    return -1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+
+            if (this.Extra != null)
+            {
+                int extraCompare = ((byte)this.Extra).CompareTo(other.Extra);
+                if (extraCompare != 0)
+                {
+                    return extraCompare;
+                }
+            }
+            else
+            {
+                if (other.Extra != null)
+                {
+                    return -1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(this.Description))
+            {
+                return this.Description.CompareTo(other.Description);
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        public int CompareTo(object obj)
+        {
+            if (obj is CetItem)
+            {
+                return this.CompareTo((CetItem)obj);
+            }
+            else
+            {
+                throw new ArgumentException("Object is not of type CetItem.");
+            }
+        }
+
+		#endregion Methods 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Entity.cs b/Libs/CsharpDis6/Enumerations/Cet2006/Entity.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Entity.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/Entity.cs
index 83837fc..056849c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Entity.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/Entity.cs
@@ -1,282 +1,282 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using OpenDis.Core;
-using OpenDis.Enumerations.EntityState.Type;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Entity : CetBase, INotifyPropertyChanged
-    {
-		#region Fields (12) 
-
-        private List<Category> categoryField;
-
-        private Country country;
-        private string countryField;
-        private string descriptionField;
-        private byte domain;
-        private string domainField;
-        private string footnoteField;
-        private EntityKind kind;
-        private string kindField;
-        private bool unusedField;
-        private bool unusedFieldSpecified;
-        private string xrefField;
-
-		#endregion Fields 
-
-		#region Delegates and Events (1) 
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-		#endregion Delegates and Events 
-
-		#region Properties (12) 
-
-        [XmlElement("category", Form = XmlSchemaForm.Unqualified)]
-        public List<Category> Categories
-        {
-            get
-            {
-                return this.categoryField;
-            }
-
-            set
-            {
-                if (this.categoryField != value)
-                {
-                    this.categoryField = value;
-                    this.RaisePropertyChanged("Category");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public Country Country
-        {
-            get
-            {
-                return this.country;
-            }
-
-            set
-            {
-                if (this.country != value)
-                {
-                    this.RawCountry = ((int)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Country");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "description")]
-        public string Description
-        {
-            get
-            {
-                return this.descriptionField;
-            }
-
-            set
-            {
-                if (this.descriptionField != value)
-                {
-                    this.descriptionField = value;
-                    this.RaisePropertyChanged("Description");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public byte Domain
-        {
-            get
-            {
-                return this.domain;
-            }
-
-            set
-            {
-                if (this.domain != value)
-                {
-                    this.RawDomain = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Domain");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "footnote")]
-        public string Footnote
-        {
-            get
-            {
-                return this.footnoteField;
-            }
-
-            set
-            {
-                if (this.footnoteField != value)
-                {
-                    this.footnoteField = value;
-                    this.RaisePropertyChanged("Footnote");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public EntityKind Kind
-        {
-            get
-            {
-                return this.kind;
-            }
-
-            set
-            {
-                if (this.kind != value)
-                {
-                    this.RawKind = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Kind");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "country", DataType = "nonNegativeInteger")]
-        public string RawCountry
-        {
-            get
-            {
-                return this.countryField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.countryField != value)
-                {
-                    this.countryField = value;
-                    int intValue = int.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
-                    this.country = (Country)Enum.ToObject(typeof(Country), intValue);
-                    this.RaisePropertyChanged("RawCountry");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "domain", DataType = "nonNegativeInteger")]
-        public string RawDomain
-        {
-            get
-            {
-                return this.domainField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.domainField != value)
-                {
-                    this.domainField = value;
-                    this.domain = byte.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawDomain");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "kind", DataType = "nonNegativeInteger")]
-        public string RawKind
-        {
-            get
-            {
-                return this.kindField;
-            }
-
-            set
-            {
-                if (this.kindField != value)
-                {
-                    this.kindField = value;
-                    byte byteValue = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.kind = (EntityKind)Enum.ToObject(typeof(EntityKind), byteValue);
-                    this.RaisePropertyChanged("RawKind");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "unused")]
-        public bool Unused
-        {
-            get
-            {
-                return this.unusedField;
-            }
-
-            set
-            {
-                if (this.unusedField != value)
-                {
-                    this.unusedField = value;
-                    this.RaisePropertyChanged("Unused");
-                }
-            }
-        }
-
-        [XmlIgnore()]
-        public bool UnusedSpecified
-        {
-            get
-            {
-                return this.unusedFieldSpecified;
-            }
-
-            set
-            {
-                if (this.unusedFieldSpecified != value)
-                {
-                    this.unusedFieldSpecified = value;
-                    this.RaisePropertyChanged("UnusedSpecified");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "xref")]
-        public string XRef
-        {
-            get
-            {
-                return this.xrefField;
-            }
-
-            set
-            {
-                if (this.xrefField != value)
-                {
-                    this.xrefField = value;
-                    this.RaisePropertyChanged("XRef");
-                }
-            }
-        }
-
-		#endregion Properties 
-
-		#region Methods (1) 
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-		#endregion Methods 
-    }
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using OpenDis.Core;
+using OpenDis.Enumerations.EntityState.Type;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Entity : CetBase, INotifyPropertyChanged
+    {
+		#region Fields (12) 
+
+        private List<Category> categoryField;
+
+        private Country country;
+        private string countryField;
+        private string descriptionField;
+        private byte domain;
+        private string domainField;
+        private string footnoteField;
+        private EntityKind kind;
+        private string kindField;
+        private bool unusedField;
+        private bool unusedFieldSpecified;
+        private string xrefField;
+
+		#endregion Fields 
+
+		#region Delegates and Events (1) 
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+		#endregion Delegates and Events 
+
+		#region Properties (12) 
+
+        [XmlElement("category", Form = XmlSchemaForm.Unqualified)]
+        public List<Category> Categories
+        {
+            get
+            {
+                return this.categoryField;
+            }
+
+            set
+            {
+                if (this.categoryField != value)
+                {
+                    this.categoryField = value;
+                    this.RaisePropertyChanged("Category");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public Country Country
+        {
+            get
+            {
+                return this.country;
+            }
+
+            set
+            {
+                if (this.country != value)
+                {
+                    this.RawCountry = ((int)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Country");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "description")]
+        public string Description
+        {
+            get
+            {
+                return this.descriptionField;
+            }
+
+            set
+            {
+                if (this.descriptionField != value)
+                {
+                    this.descriptionField = value;
+                    this.RaisePropertyChanged("Description");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public byte Domain
+        {
+            get
+            {
+                return this.domain;
+            }
+
+            set
+            {
+                if (this.domain != value)
+                {
+                    this.RawDomain = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Domain");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "footnote")]
+        public string Footnote
+        {
+            get
+            {
+                return this.footnoteField;
+            }
+
+            set
+            {
+                if (this.footnoteField != value)
+                {
+                    this.footnoteField = value;
+                    this.RaisePropertyChanged("Footnote");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public EntityKind Kind
+        {
+            get
+            {
+                return this.kind;
+            }
+
+            set
+            {
+                if (this.kind != value)
+                {
+                    this.RawKind = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Kind");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "country", DataType = "nonNegativeInteger")]
+        public string RawCountry
+        {
+            get
+            {
+                return this.countryField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.countryField != value)
+                {
+                    this.countryField = value;
+                    int intValue = int.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
+                    this.country = (Country)Enum.ToObject(typeof(Country), intValue);
+                    this.RaisePropertyChanged("RawCountry");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "domain", DataType = "nonNegativeInteger")]
+        public string RawDomain
+        {
+            get
+            {
+                return this.domainField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.domainField != value)
+                {
+                    this.domainField = value;
+                    this.domain = byte.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawDomain");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "kind", DataType = "nonNegativeInteger")]
+        public string RawKind
+        {
+            get
+            {
+                return this.kindField;
+            }
+
+            set
+            {
+                if (this.kindField != value)
+                {
+                    this.kindField = value;
+                    byte byteValue = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.kind = (EntityKind)Enum.ToObject(typeof(EntityKind), byteValue);
+                    this.RaisePropertyChanged("RawKind");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "unused")]
+        public bool Unused
+        {
+            get
+            {
+                return this.unusedField;
+            }
+
+            set
+            {
+                if (this.unusedField != value)
+                {
+                    this.unusedField = value;
+                    this.RaisePropertyChanged("Unused");
+                }
+            }
+        }
+
+        [XmlIgnore()]
+        public bool UnusedSpecified
+        {
+            get
+            {
+                return this.unusedFieldSpecified;
+            }
+
+            set
+            {
+                if (this.unusedFieldSpecified != value)
+                {
+                    this.unusedFieldSpecified = value;
+                    this.RaisePropertyChanged("UnusedSpecified");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "xref")]
+        public string XRef
+        {
+            get
+            {
+                return this.xrefField;
+            }
+
+            set
+            {
+                if (this.xrefField != value)
+                {
+                    this.xrefField = value;
+                    this.RaisePropertyChanged("XRef");
+                }
+            }
+        }
+
+		#endregion Properties 
+
+		#region Methods (1) 
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+		#endregion Methods 
+    }
 }
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/EntityTypes.xml b/Libs/CsharpDis6/Enumerations/Cet2006/EntityTypes.xml
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/EntityTypes.xml
rename to Libs/CsharpDis6/Enumerations/Cet2006/EntityTypes.xml
index fd71b2a..53ea2df 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/EntityTypes.xml
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/EntityTypes.xml
@@ -1,15256 +1,15256 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<cet length="64" id="28" cname="es.type.cet" name="Comprehensive Entity-Type tables" source="4.2.3">
-  <entity kind="1" domain="1" country="225">
-    <category id="0" description="Other">
-      <subcategory id="0" description="Miscellaneous guns">
-        <specific id="1" description="M901 40-mm machine gun"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="Liquid propellant guns"/>
-        <specific id="4" description="Phalanx (Close-In Weapons Systems (CIWS) Mk15)"/>
-      </subcategory>
-      <subcategory id="2" description="Grenade launchers">
-        <specific id="1" description="Mk 19 40-mm"/>
-        <specific id="2" description="Brunswick Multisalvo Smoke Grenade Launcher"/>
-        <specific id="3" description="Tracor Aerospace Advanced Smoke Launcher System"/>
-      </subcategory>
-      <subcategory id="3" description="Other missile systems">
-        <specific id="1" description="McDonnell-Douglas Harpoon Coastal Defense System"/>
-      </subcategory>
-      <subcategory id="4" description="Bridges">
-        <specific id="1" description="Trailer Launched Bridge (TLB)"/>
-        <specific id="2" description="Mobile assault bridge"/>
-        <specific id="3" description="M60 bridge"/>
-      </subcategory>
-      <subcategory id="5" description="Command Post"/>
-    </category>
-    <category id="1" description="Tank">
-      <subcategory id="1" description="M1 Abrams">
-        <specific id="1" description="M1 Abrams"/>
-        <specific id="2" description="M1A1 Abrams"/>
-        <specific id="3" description="M1A2"/>
-        <specific id="4" description="M1A1 w/ mine rollers"/>
-        <specific id="5" description="M1A1 w/ mine plows"/>
-        <specific id="6" description="M1A1 w/ DU armor"/>
-        <specific id="7" description="M1A2 w/ Combat Vehicle Command and Control (CVCC)"/>
-        <specific id="8" description="M1A2 SEP"/>
-        <specific id="9" description="M1A1D"/>
-      </subcategory>
-      <subcategory id="2" description="M60 Main Battle Tank (MBT)">
-        <specific id="1" description="M60A3"/>
-        <specific id="2" description="M60A1"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="M60A1 with ERA"/>
-      </subcategory>
-      <subcategory id="3" description="M551 Sheridan light tank/reconnaissance vehicle">
-        <specific id="1" description="M551A1"/>
-      </subcategory>
-      <subcategory id="4" description="M48 medium tank">
-        <specific id="1" description="M48C"/>
-        <specific id="2" description="M48A1"/>
-        <specific id="3" description="M48A2"/>
-        <specific id="4" description="M48A2C"/>
-        <specific id="5" description="M48A3"/>
-        <specific id="6" description="M48A4"/>
-        <specific id="7" description="M48A5"/>
-        <specific id="8" description="M48H"/>
-        <specific id="9" description="M48 AVLB"/>
-        <specific id="10" description="M48 ARV"/>
-        <specific id="11" description="M48 mine clearing vehicle"/>
-        <specific id="12" description="M48A2GA2"/>
-        <specific id="13" description="M48A5E"/>
-      </subcategory>
-      <subcategory id="5" description="M47 medium tank">
-        <specific id="1" description="M47"/>
-        <specific id="2" description="M47M"/>
-        <specific id="3" description="GLS M47 ARV"/>
-      </subcategory>
-      <subcategory id="6" description="M41 light tank">
-        <specific id="1" description="M41C"/>
-        <specific id="2" description="M41E W/8V-71T Engine"/>
-        <specific id="3" description="QM41"/>
-        <specific id="4" description="M41B"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="M41 German Tank Improvement (GTI)"/>
-      </subcategory>
-      <subcategory id="7" description="Cadillac Gage Commando Stingray light tank"/>
-      <subcategory id="8" description="FMC Close Combat Vehicle Light VFM 5 tank"/>
-      <subcategory id="9" description="AAI Rapid Deployment Force Light Tank (RDF/LT) Combined Arms Team/Lightweight Combat Vehicle (CAT/LCV)">
-        <specific id="1" description="Prototype"/>
-      </subcategory>
-      <subcategory id="10" description="Teledyne Continental Armored Gun System"/>
-      <subcategory id="11" description="FCS Mounted Combat System"/>
-    </category>
-    <category id="2" description="Armored fighting vehicle">
-      <subcategory id="1" description="FMC M2/M3 Bradley">
-        <specific id="1" description="M2A2 Bradley Infantry Fighting Vehicle (IFV)"/>
-        <specific id="2" description="M3A2 Bradley Cavalry Fighting Vehicle (CFV)"/>
-        <specific id="3" description="FMC Bradley IFV"/>
-        <specific id="4" description="M2 Bradley IFV"/>
-        <specific id="5" description="M2A1 Bradley IFV"/>
-        <specific id="6" description="M3 Bradley CFV"/>
-        <specific id="7" description="M3A1 Bradley CFV"/>
-        <specific id="8" description="M7 BFIST"/>
-        <specific id="9" description="M2A3 Bradley IFV"/>
-        <specific id="10" description="M3A3 Bradley CFV"/>
-        <specific id="11" description="M2A2ODS Bradley IFV"/>
-      </subcategory>
-      <subcategory id="3" description="FMC M113 Armored Personnel Carrier (APC)">
-        <specific id="1" description="M113A2"/>
-        <specific id="2" description="M113A3"/>
-        <specific id="3" description="M113A3 w/ M105 trailer"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="M113A1 Improved TOW Vehicle (ITV)"/>
-        <specific id="7" description="M113A1 TOW"/>
-        <specific id="8" description="M113A2 ITV"/>
-        <specific id="9" description="M113A2 TOW"/>
-        <specific id="10" description="M730 Chaparral Surface-to-Air Missile (SAM) launcher"/>
-        <specific id="11" description="M113"/>
-        <specific id="12" description="M113A1"/>
-        <specific id="13" description="M113A1R"/>
-        <specific id="14" description="M113A2DR"/>
-        <specific id="15" description="M113A2H"/>
-        <specific id="16" description="M113A2IT"/>
-        <specific id="17" description="M113A2MK"/>
-        <specific id="18" description="M113A2R"/>
-        <specific id="19" description="M132/M132A1 Flamethrower"/>
-        <specific id="20" description="M667"/>
-        <specific id="21" description="(deleted)"/>
-        <specific id="22" description="(deleted)"/>
-        <specific id="23" description="M741"/>
-        <specific id="24" description="M741A1"/>
-        <specific id="25" description="M741A2"/>
-        <specific id="26" description="RTL"/>
-        <specific id="27" description="XM474"/>
-        <specific id="28" description="XM474E2"/>
-        <specific id="29" description="XM667E1"/>
-        <specific id="30" description="XM727"/>
-        <specific id="31" description="(deleted)"/>
-        <specific id="32" description="XM741"/>
-        <specific id="33" description="XM806E1"/>
-        <specific id="34" description="XM806E2"/>
-      </subcategory>
-      <subcategory id="5" description="Light Armored Vehicle (LAV) TOW">
-        <specific id="1" description="FIST"/>
-        <specific id="2" description="MGS"/>
-        <specific id="3" description="ATGM"/>
-        <specific id="4" description="Ambulance"/>
-        <specific id="5" description="Medical Team"/>
-        <specific id="6" description="PROPHET"/>
-        <specific id="7" description="REMBASS/GSR"/>
-        <specific id="8" description="NBC"/>
-        <specific id="9" description="155SP HOW"/>
-        <specific id="10" description="Plow"/>
-        <specific id="11" description="Roller"/>
-        <specific id="12" description="Wrecker"/>
-        <specific id="13" description="Logistics"/>
-        <specific id="14" description="Reconnaissance Vehicle"/>
-        <specific id="15" description="Command and Control TOC Vehicle"/>
-        <specific id="16" description="Mortar Carrier"/>
-        <specific id="17" description="Striker/Fire Support Team Vehicle"/>
-        <specific id="18" description="Stryker Personnel Carrier w/MK 19 mod 3 40-mm grenade launcher"/>
-        <specific id="19" description="Stryker Personnel Carrier w/M2 .50 cal heavy machine gun"/>
-        <specific id="20" description="Stryker Personnel Carrier w/MK 240 7.62 mm machine gun"/>
-        <specific id="21" description="Stryker Personnel Carrier w/automatic cannon"/>
-        <specific id="22" description="Stryker Mobile Gun System w/M68A1E4 105-mm cannon; MK 240 7.62 mm co-axial machine gun; and M2 .50 cal heavy machine gun"/>
-        <specific id="23" description="Stryker Reconnaissance Vehicle w/MK 240 7.62-mm machine gun"/>
-        <specific id="24" description="Stryker Mortar Carrier w/120-mm mortar"/>
-        <specific id="25" description="Stryker Mortar Carrier w/81-mm mortar"/>
-        <specific id="26" description="Stryker Mortar Carrier w/60-mm mortar"/>
-        <specific id="27" description="Stryker Command Vehicle w/MK 240 7.62-mm machine gun"/>
-        <specific id="28" description="Stryker Fire Support w/ MK 240 7.62-mm machine gun"/>
-        <specific id="29" description="Stryker Engineer w/MK 240 7.62-mm machine gun"/>
-        <specific id="30" description="Stryker Ambulance"/>
-        <specific id="31" description="Stryker Anti-tank Guided Missile"/>
-        <specific id="32" description="Stryker NBC Reconnaissance w/240 7.62-mm machine gun"/>
-      </subcategory>
-      <subcategory id="6" description="FMC Armored IFV">
-        <specific id="1" description="YPR 765 PRI"/>
-        <specific id="2" description="YPR 765 PRCO-B command vehicle"/>
-        <specific id="3" description="YPR 765 PRCO-C1 to C5"/>
-        <specific id="4" description="YPR 765 PRRDR radar vehicle"/>
-        <specific id="5" description="YPR 765 PRRDR-C radar/command vehicle"/>
-        <specific id="6" description="YPR 765 PRGWT ambulance"/>
-        <specific id="7" description="YPR 765 PRI/I"/>
-        <specific id="8" description="YPR 765 PRMR mortar tractor"/>
-        <specific id="9" description="YPR 765 PRVR-A cargo vehicle"/>
-        <specific id="10" description="YPR 765 PRVR-B cargo vehicle"/>
-        <specific id="11" description="YPR 765 PRAT"/>
-      </subcategory>
-      <subcategory id="7" description="FMC Lynx (or M113) Command and Reconnaissance Vehicle"/>
-      <subcategory id="8" description="M981 FIST-V"/>
-      <subcategory id="9" description="M106 mortar carrier">
-        <specific id="1" description="M106 107-mm"/>
-        <specific id="2" description="M106A1 107-mm"/>
-        <specific id="3" description="M106A2 107-mm"/>
-        <specific id="4" description="M1064 120-mm"/>
-      </subcategory>
-      <subcategory id="10" description="Electronics &amp; Space Corp M901 ITV">
-        <specific id="1" description="M901"/>
-        <specific id="2" description="M901A1"/>
-      </subcategory>
-      <subcategory id="11" description="M125 81-mm mortar carrier">
-        <specific id="1" description="M125A1"/>
-        <specific id="2" description="M125A2"/>
-      </subcategory>
-      <subcategory id="12" description="Cadillac Gage V-600 Armored Car"/>
-      <subcategory id="13" description="Cadillac Gage LAV Assault Gun LAV-105"/>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="LAV-105"/>
-      <subcategory id="16" description="Chrysler MAC-1 armored car"/>
-      <subcategory id="17" description="Cadillac Gage Commando Scout"/>
-      <subcategory id="18" description="Cadillac Gage Commando V-300">
-        <specific id="1" description="V-300 w/ TOW"/>
-        <specific id="2" description="V-300 w/ 81-mm mortar"/>
-        <specific id="3" description="V-300 ambulance"/>
-      </subcategory>
-      <subcategory id="19" description="Cadillac Gage Commando V-150">
-        <specific id="1" description="Commando w/ MG turret"/>
-        <specific id="2" description="Commando w/ 1-m MG turret"/>
-        <specific id="3" description="Commando w/ 1-m 20-mm turret"/>
-        <specific id="4" description="Commando w/ 20-mm turret"/>
-        <specific id="5" description="Commando w/ 25-mm turret"/>
-        <specific id="6" description="Commando w/ 40-mm/12.7-mm turret"/>
-        <specific id="7" description="Commando V-150 S"/>
-        <specific id="8" description="Commando air defense vehicle"/>
-        <specific id="9" description="Commando with 76-mm turret-mounted gun"/>
-        <specific id="10" description="Commando with 90-mm turret-mounted gun"/>
-        <specific id="11" description="Commando with 81-mm mortar"/>
-        <specific id="12" description="Commando with TOW"/>
-        <specific id="13" description="Commando command vehicle"/>
-        <specific id="14" description="Base security vehicle"/>
-        <specific id="15" description="Malaysian upgraded V-150 Commando"/>
-      </subcategory>
-      <subcategory id="20" description="AV Technology Corporation Dragoon">
-        <specific id="1" description="APC"/>
-        <specific id="2" description="ASV-XC extended cab"/>
-        <specific id="3" description="Dragoon Armored Command Vehicle (ACV)"/>
-        <specific id="4" description="Dragoon Armored Mortar Carrier (AMC)"/>
-        <specific id="5" description="Dragoon TOW Carrier"/>
-      </subcategory>
-      <subcategory id="21" description="Half-track APCs"/>
-      <subcategory id="22" description="Cadillac Gage Commando Ranger APC"/>
-      <subcategory id="23" description="Vehicle Sys Development Corp Lancer Armored Patrol Vehicle (APV)"/>
-      <subcategory id="24" description="AAI Propulsion System Demonstrator Amphibious Assault Vehicle (AAV)"/>
-      <subcategory id="25" description="Advanced AAV"/>
-      <subcategory id="26" description="FMC AAV7A1 (LVTP7A1)">
-        <specific id="1" description="AAVC7A1 command vehicle"/>
-        <specific id="2" description="AAVR7A1 recovery vehicle"/>
-        <specific id="3" description="AAV7A1 with mine plow"/>
-        <specific id="4" description="AAV7A1 with VEMASID"/>
-        <specific id="5" description="AAV7A1 with mine-clearance-system kit"/>
-        <specific id="6" description="AAVP7A1"/>
-      </subcategory>
-      <subcategory id="27" description="LVTP5A1 Armored AAV">
-        <specific id="1" description="LVTC5 (Command, Model 5)"/>
-        <specific id="2" description="LVTE1 (Engineer, Model 1)"/>
-        <specific id="3" description="LVTH6 (Howitzer, Model 6)"/>
-        <specific id="4" description="LVTR1 (Recovery, Model 1)"/>
-      </subcategory>
-      <subcategory id="28" description="Composite Armored Vehicle (CAV)"/>
-      <subcategory id="29" description="(deleted)"/>
-      <subcategory id="30" description="M93 Armored Reconnaissance Vehicle"/>
-      <subcategory id="31" description="M1117 Armored Security Vehicle"/>
-      <subcategory id="32" description="FCS Infantry Combat Vehicle"/>
-      <subcategory id="33" description="FCS Armed Robotic Vehicle - RSTA"/>
-      <subcategory id="34" description="FCS Armed Robotic Vehicle - Assault"/>
-      <subcategory id="35" description="FCS Armed Robotic Vehicle - Light"/>
-      <subcategory id="36" description="FCS Recon and Surveillance Vehicle"/>
-      <subcategory id="37" description="FCS Command &amp; Control Vehicle"/>
-      <subcategory id="38" description="FCS Medical Vehicle - Evacuation"/>
-    </category>
-    <category id="3" description="Armored utility vehicle">
-      <subcategory id="1" description="M88 medium recovery vehicle">
-        <specific id="1" description="M88A1"/>
-        <specific id="2" description="M88A2"/>
-        <specific id="3" description="M88A1E1"/>
-      </subcategory>
-      <subcategory id="2" description="M578 light armored recovery vehicle"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="AVLB">
-        <specific id="1" description="M1 AVLB bridge layer"/>
-        <specific id="2" description="M60 AVLB"/>
-        <specific id="3" description="M48 AVLB"/>
-        <specific id="4" description="M60 AVLB w/o bridge"/>
-        <specific id="5" description="M104 Wolverine"/>
-      </subcategory>
-      <subcategory id="5" description="M728 combat engineer vehicle"/>
-      <subcategory id="6" description="M9 armored combat earthmover"/>
-      <subcategory id="7" description="Cadillac Gage Commando V-150 Recovery Vehicle"/>
-      <subcategory id="8" description="AV Technology Corporation Dragoon">
-        <specific id="1" description="Armored Logistics Support Vehicle (ALSV)"/>
-      </subcategory>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="M113/M113A1/M113A2 bulldozer"/>
-      <subcategory id="11" description="M577/M577A1/M577A2 command post">
-        <specific id="1" description="M577 Command Post (MLRS Bn CP)"/>
-        <specific id="2" description="M577 Command Post (MLRS Btry CP)"/>
-      </subcategory>
-      <subcategory id="12" description="Stretched M577A2E2 command post"/>
-      <subcategory id="13" description="XM1068 command post vehicle"/>
-      <subcategory id="14" description="FMC (M113) APC ambulance"/>
-      <subcategory id="15" description="M113A2 recovery vehicle"/>
-      <subcategory id="16" description="Abrams Recovery Vehicle"/>
-      <subcategory id="17" description="(deleted)"/>
-      <subcategory id="18" description="Fitter's vehicle"/>
-      <subcategory id="19" description="Armored Maintenance Vehicle (AMV)"/>
-      <subcategory id="20" description="M1059 smoke-generating system"/>
-      <subcategory id="21" description="Armored Bulldozer, D7 MCAP"/>
-      <subcategory id="22" description="Armored Bulldozer, D9R"/>
-      <subcategory id="23" description="Armored Obstacle Breacher, Grizzly"/>
-      <subcategory id="24" description="Deployable Universal Combat Earthmover (DEUCE)"/>
-      <subcategory id="25" description="FCS Recovery and Maintenance Vehicle"/>
-    </category>
-    <category id="4" description="Self-propelled artillery">
-      <subcategory id="1" description="M270 Multiple Launch Rocket System (MLRS)">
-        <specific id="1" description="ATACMS"/>
-      </subcategory>
-      <subcategory id="2" description="M110 203-mm (8-inch) SP Howitzer">
-        <specific id="1" description="M110"/>
-        <specific id="2" description="M110A2"/>
-      </subcategory>
-      <subcategory id="3" description="M109 155-mm SP Howitzer">
-        <specific id="1" description="M109"/>
-        <specific id="2" description="M109A1"/>
-        <specific id="3" description="M109A2"/>
-        <specific id="4" description="M109A3"/>
-        <specific id="5" description="M109A4"/>
-        <specific id="6" description="M109A5"/>
-        <specific id="7" description="M109A6"/>
-        <specific id="8" description="M109L"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="M107-175 mm gun"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="155-mm SP Howitzer XM2001 Crusader"/>
-      <subcategory id="10" description="Liquid-propellant Artillery System"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="(deleted)"/>
-      <subcategory id="16" description="(deleted)"/>
-      <subcategory id="17" description="Fiber Optic Guided Missile (FOG-M)"/>
-      <subcategory id="18" description="(deleted)"/>
-      <subcategory id="19" description="(deleted)"/>
-      <subcategory id="20" description="(deleted)"/>
-      <subcategory id="21" description="Electronic &amp; Space Corp Ground-Launched Hellfire: Heavy (GLH:H)"/>
-      <subcategory id="22" description="Line-of-Sight Anti-Tank (LOSAT)"/>
-      <subcategory id="23" description="RGM-84 Harpoon Launcher"/>
-      <subcategory id="24" description="HIMARS"/>
-      <subcategory id="25" description="FCS NLOS - Cannon"/>
-      <subcategory id="26" description="FCS NLOS - Mortar"/>
-    </category>
-    <category id="5" description="Towed artillery">
-      <subcategory id="1" description="M114 155-mm Howitzer"/>
-      <subcategory id="2" description="M198 155-mm towed Howitzer"/>
-      <subcategory id="3" description="M101 105-mm Howitzer">
-        <specific id="1" description="M101"/>
-        <specific id="2" description="M101A1"/>
-      </subcategory>
-      <subcategory id="4" description="M119 105-mm light Howitzer"/>
-      <subcategory id="5" description="M115 8-inch Howitzer"/>
-      <subcategory id="6" description="XM777 155-mm Lightweight Towed Howitzer"/>
-      <subcategory id="7" description="M59 155-mm gun"/>
-      <subcategory id="8" description="M102 105-mm Howitzer"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="M993 70-mm Rapid Deployment Multiple Launch Rocket System (MLRS)"/>
-      <subcategory id="16" description="(deleted)"/>
-      <subcategory id="17" description="FCS NLOS-LS-Launcher"/>
-    </category>
-    <category id="6" description="Small wheeled utility vehicle">
-      <subcategory id="1" description="LTV HMMWV M998-series multipurpose wheeled vehicles">
-        <specific id="1" description="M998 cargo/troop carrier without winch"/>
-        <specific id="2" description="M1038 cargo/troop carrier with winch"/>
-        <specific id="3" description="M966 TOW missile carrier, basic armor, without winch"/>
-        <specific id="4" description="M1036 TOW missile carrier, basic armor, with winch"/>
-        <specific id="5" description="M1045 TOW missile carrier, supplemental armor, without winch"/>
-        <specific id="6" description="M1046 TOW missile carrier, supplemental armor, with winch"/>
-        <specific id="7" description="M1025 armament carrier, basic armor, without winch"/>
-        <specific id="8" description="M1026 armament carrier, basic armor, with winch"/>
-        <specific id="9" description="M1043 armament carrier, supplemental armor, without winch"/>
-        <specific id="10" description="M1044 armament carrier, supplemental armor, with winch"/>
-        <specific id="11" description="M996 mini-ambulance, 2-litter, basic armor"/>
-        <specific id="12" description="M997 maxi-ambulance, 4-litter, basic armor"/>
-        <specific id="13" description="M1035 soft-top ambulance, 2-litter"/>
-        <specific id="14" description="M1037 S-250 shelter carrier, without winch"/>
-        <specific id="15" description="M1042 S-250 shelter carrier, with winch"/>
-        <specific id="16" description="M1069 tractor for M119 105-mm light gun"/>
-        <specific id="17" description="M1025 Armament carrier, basic armor w/o winch, w/MK 19 40-mm grenade launcher"/>
-        <specific id="18" description="M1025 Armament carrier, basic armor w/o winch, w/M2 .50 cal heavy machine gun"/>
-        <specific id="19" description="M1025 armament carrier, basic armor w/o winch, w/M-60 7.62 mm medium machine gun"/>
-        <specific id="20" description="M707 Striker"/>
-        <specific id="21" description="M1114 armament carrier, armored"/>
-        <specific id="22" description="HMMWV w/M56 Coyote Smoke Generator"/>
-        <specific id="23" description="HMMWV w/M31 Biological Integrated Detection System (BIDS)"/>
-        <specific id="24" description="HMMWV w/M157 Smoke Generator"/>
-      </subcategory>
-      <subcategory id="2" description="Warrior NMC-40 Long-range Fast Attack Vehicle (FAV)"/>
-      <subcategory id="3" description="Chenowith FAV/Light Strike Vehicle (LSV)"/>
-      <subcategory id="4" description="M58/M59 Mine-clearing charge (MICLIC) (towed)">
-        <specific id="1" description="M58A3 w/rocket"/>
-        <specific id="2" description="M58A4"/>
-        <specific id="3" description="M59"/>
-        <specific id="4" description="M58A3 w/o rocket"/>
-      </subcategory>
-      <subcategory id="5" description="Teledyne 4x4 725-kg light forces vehicle"/>
-      <subcategory id="6" description="TPC 4x4 909-kg Rapid Multi-purpose Vehicle (RAMP-V)"/>
-      <subcategory id="7" description="M151 4x4 362-kg light vehicle and variants"/>
-      <subcategory id="8" description="Jeep 4x4 light vehicle"/>
-      <subcategory id="9" description="Jeep XJ 4x4 light truck/wagon series"/>
-      <subcategory id="10" description="M38-series 4x4 363-kg light vehicle (CJ-3A)"/>
-      <subcategory id="11" description="Cargo truck and variants: 4x4, 680-kg">
-        <specific id="1" description="M37"/>
-        <specific id="2" description="M42"/>
-        <specific id="3" description="M43"/>
-        <specific id="4" description="M201"/>
-      </subcategory>
-      <subcategory id="12" description="Stewart &amp; Stevenson Services Inc. SS-200 6x6 multi-purpose light vehicle"/>
-      <subcategory id="13" description="Commercial Utility Cargo Vehicle (CUCV)"/>
-      <subcategory id="14" description="M1008, truck, cargo, tactical 1-1/4 ton, 4x4"/>
-      <subcategory id="15" description="M1009, truck, utility, tactical 3/4 ton, 4x4"/>
-      <subcategory id="16" description="M1010, truck, ambulance, tactical 1-1/4 ton, 4x4"/>
-      <subcategory id="17" description="M1031, truck, chassis, tactical 1-1/4 ton, 4x4"/>
-      <subcategory id="18" description="M1028, truck, cargo, shelter carrier, tactical 1-1/4"/>
-      <subcategory id="19" description="M715 4x4 1-1/4 ton truck, AM715-series 4x4 1-1/4 ton cargo trucks"/>
-      <subcategory id="20" description="Jeep AM 720 4x4 1135-kg light truck"/>
-      <subcategory id="21" description="M880 4x4 1133 kg"/>
-      <subcategory id="22" description="M890 4x2 1133 kg"/>
-      <subcategory id="23" description="Tractor, aircraft towing">
-        <specific id="1" description="A/S32A-31"/>
-      </subcategory>
-      <subcategory id="24" description="Ordnance Trailer"/>
-      <subcategory id="25" description="Motorcycle">
-        <specific id="1" description="M1030B1 Motorcycle"/>
-      </subcategory>
-      <subcategory id="26" description="All Terrain Vehicle">
-        <specific id="1" description="ATV 4X4"/>
-        <specific id="2" description="ATV 6X6">
-          <extra id="1" description="Military Gator (basic)"/>
-          <extra id="2" description="Military Gator First Response Expeditionary"/>
-        </specific>
-      </subcategory>
-      <subcategory id="27" description="FCS MULE">
-        <specific id="1" description="FCS MULE Retransmission"/>
-        <specific id="2" description="FCS MULE Countermine"/>
-        <specific id="3" description="FCS MULE Transport"/>
-      </subcategory>
-      <subcategory id="28" description="FCS Small Unattended Ground Vehicle"/>
-    </category>
-    <category id="7" description="Large wheeled utility vehicle">
-      <subcategory id="1" description="M35/M44A2 6x6 2-1/2 ton cargo truck series">
-        <specific id="1" description="M34: cargo truck with an unladen weight of 5332 kg, chassis designated M44"/>
-        <specific id="2" description="M47: dump truck with an unladen weight of 6100 kg, chassis designated M57"/>
-        <specific id="3" description="Truck, maintenance: earth-boring machine and pole setter V18A/MTQ, chassis M44"/>
-        <specific id="4" description="Truck, maintenance: telephone construction and maintenance V17A/MTQ, chassis M44."/>
-        <specific id="5" description="M35 truck: basic M45 chassis"/>
-        <specific id="6" description="M35A2"/>
-        <specific id="7" description="M35A2C"/>
-        <specific id="8" description="M36"/>
-        <specific id="9" description="M36A2"/>
-        <specific id="10" description="M48: tractor truck"/>
-        <specific id="11" description="M49: fuel tanker"/>
-        <specific id="12" description="M49A2C"/>
-      </subcategory>
-      <subcategory id="2" description="M816, truck, wrecker, 5-ton, 6x6"/>
-      <subcategory id="3" description="M819, tractor, wrecker, 5-ton, 6x6"/>
-      <subcategory id="4" description="M817 engineer dump truck"/>
-      <subcategory id="5" description="M939 6X6 5-ton cargo truck">
-        <specific id="1" description="M923 - Truck, 5-ton, 6x6, Cargo dropside"/>
-        <specific id="2" description="M923A1 - Version with single rear wheels"/>
-        <specific id="3" description="M923A2 - Version with CTIS"/>
-        <specific id="4" description="M932A2 [Guntruck] - Modified version for convoy defence"/>
-        <specific id="5" description="M923A3 - Version with brake modifications"/>
-        <specific id="6" description="M924 - Truck, 5-ton, 6x6, LWB, Cargo w/o winch"/>
-        <specific id="7" description="M925 - Truck, 5-ton, 6x6, Cargo dropside w/winch"/>
-        <specific id="8" description="M925A1 - Version with single rear wheels"/>
-        <specific id="9" description="M925A2 - Version with CTIS"/>
-        <specific id="10" description="M926 - Truck, 5-ton, 6x6, cargo, lwb, w/winch, w/e"/>
-        <specific id="11" description="M927 - Truck, 5-ton, 6x6, Cargo, XLWB w/o winch"/>
-        <specific id="12" description="M927 [Winch Equipped] - Truck, 5-ton, 6x6, Cargo, XLWB w/winch"/>
-        <specific id="13" description="M928 - Truck, 5-ton, 6x6, Cargo, XLWB w/winch"/>
-        <specific id="14" description="M929 - Truck, 5-ton, 6x6, Dump w/o winch"/>
-        <specific id="15" description="M929A2 - Version with CTIS plate on front hubs"/>
-        <specific id="16" description="M930 - Truck, 5-ton, 6x6, Dump w/winch"/>
-        <specific id="17" description="M931 - Truck, 5-ton, 6x6, Tractor w/o winch"/>
-        <specific id="18" description="M931A1 - Version with single rear wheels"/>
-        <specific id="19" description="M932 - Truck, 5-ton, 6x6, Tractor w/winch"/>
-        <specific id="20" description="M933 - Truck, 5-ton, 6x6, Tractor-wrecker w/winch"/>
-        <specific id="21" description="M934 - Truck, 5-ton, 6x6, Van, expandable w/winch"/>
-        <specific id="22" description="M935 - Truck, 5-ton, 6x6, Van, expandable w/o winch"/>
-        <specific id="23" description="M936 - Truck, 5-ton, 6x6, Wrecker, medium w/winch"/>
-        <specific id="24" description="M939 - Truck, 5-ton, 6x6, chassis, w/e"/>
-        <specific id="25" description="M939 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
-        <specific id="26" description="M940 - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
-        <specific id="27" description="M941 - Truck, 5-ton, 6x6, chassis, w/e"/>
-        <specific id="28" description="M941 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
-        <specific id="29" description="M942 Truck, 5-ton, 6x6, chassis, w/e"/>
-        <specific id="30" description="M942 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
-        <specific id="31" description="M944 - Truck, 5-ton, 6x6, chassis"/>
-        <specific id="32" description="OE-MRC PATRIOT Antenna Mast Group (AMG) on M942 chassis"/>
-      </subcategory>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="M543, truck, wrecker: medium, 5-ton, 6x6"/>
-      <subcategory id="8" description="M915 series of 5-ton trucks">
-        <specific id="1" description="Cargo"/>
-        <specific id="2" description="w/ FS pods"/>
-        <specific id="3" description="w/ shelter"/>
-        <specific id="4" description="M915, tractor, truck, 14-ton, 6x4"/>
-        <specific id="5" description="M915A1, tractor, truck, 14-ton, 6x4"/>
-        <specific id="6" description="M915 (Eng Loader)"/>
-      </subcategory>
-      <subcategory id="9" description="LTV Hummer cab-over 4x4 2268-kg cargo truck"/>
-      <subcategory id="10" description="Freightliner All-Terrain Tow Vehicle (ATTV)">
-        <specific id="1" description="Kamaz-4310 with generator set"/>
-      </subcategory>
-      <subcategory id="11" description="Stewart &amp; Stevenson SS-300 8x8 2268-kg All-Terrain Vehicle"/>
-      <subcategory id="12" description="Stewart &amp; Stevenson Family of Medium Tactical Vehicles (FMTV)">
-        <specific id="1" description="M1078 Truck, Cargo; LMTV w/ Equip"/>
-        <specific id="2" description="M1078 Truck, Cargo; LMTV w/ Equip, w/ Winch"/>
-        <specific id="3" description="M1079 Truck, Van; LMTV w/ Equip"/>
-        <specific id="4" description="M1079 Truck, Van; LMTV w/ Equip, w/ Winch"/>
-        <specific id="5" description="M1080 Truck, Chassis; LMTV w/ Equip"/>
-        <specific id="6" description="M1081 Truck, Cargo; LMTV, LAPES/AD, w/ Equip"/>
-        <specific id="7" description="M1082 Trailer; LMTV"/>
-        <specific id="8" description="M1083 Truck, Cargo; MTV w/ Equip"/>
-        <specific id="9" description="M1083 Truck, Cargo; MTV w/ Equip, w/ winch"/>
-        <specific id="10" description="M1084 Truck, Cargo; w/ MHE w/ Equip"/>
-        <specific id="11" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip"/>
-        <specific id="12" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip, w/ Winch"/>
-        <specific id="13" description="M1086 Truck, Cargo; MTV, LWB, w/MHE, w/ Equip"/>
-        <specific id="14" description="M1087 Truck, Van; MTV, Expansible"/>
-        <specific id="15" description="M1088 Truck, Tractor; MTV, w/ Equip"/>
-        <specific id="16" description="M1088 Truck, Tractor; MTV, w/ Equip, w/ Winch"/>
-        <specific id="17" description="M1089 Truck, Wrecker; MTV, w/ Equip, w/ Winch"/>
-        <specific id="18" description="M1090 Truck, Dump; MTV w/ Equip"/>
-        <specific id="19" description="M1090 Truck, Dump; MTV w/ Equip, w/ Winch"/>
-        <specific id="20" description="M1091 Truck, Tanker; MTV w/ Equip, w/ Winch"/>
-        <specific id="21" description="M1092 Truck, Chassis; MTV w/ Equip"/>
-        <specific id="22" description="M1093 Truck, Cargo; MTV, LAPES/AD, w/ Equip"/>
-        <specific id="23" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip, w/ Winch"/>
-        <specific id="24" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip"/>
-        <specific id="25" description="M1095 Trailer, MTV"/>
-        <specific id="26" description="M1096 Truck, Chassis; MTV, LWB, w/ Equip"/>
-        <specific id="27" description="M1083 Truck, Cargo; MTV, w/ Equip, w/ Volcano"/>
-        <specific id="28" description="M1078 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun"/>
-        <specific id="29" description="M1083 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun"/>
-      </subcategory>
-      <subcategory id="13" description="TTC FMTV">
-        <specific id="1" description="LMTV"/>
-        <specific id="2" description="MTV"/>
-      </subcategory>
-      <subcategory id="14" description="M54 6x6 5-ton cargo truck series">
-        <specific id="1" description="M41, cargo"/>
-        <specific id="2" description="M41, dump6"/>
-        <specific id="3" description="M52, tractor"/>
-        <specific id="4" description="M54, cargo "/>
-        <specific id="5" description="M55, cargo"/>
-        <specific id="6" description="M62k, wrecker, medium"/>
-        <specific id="7" description="M64, cargo, van"/>
-        <specific id="8" description="M246, tractor, wrecker"/>
-        <specific id="9" description="M291, van, expansible"/>
-        <specific id="10" description="M328, stake, bridging"/>
-        <specific id="11" description="M543, wrecker, medium"/>
-        <specific id="12" description="M748, bolster"/>
-        <specific id="13" description="M139 chassis"/>
-      </subcategory>
-      <subcategory id="15" description="M809 6x6 5-ton cargo truck series">
-        <specific id="1" description="M809"/>
-        <specific id="2" description="M810"/>
-        <specific id="3" description="M811/M812"/>
-      </subcategory>
-      <subcategory id="16" description="M813 cargo truck, 5-ton, 6x6"/>
-      <subcategory id="17" description="Standard Trailing Arm Drive (TAD) vehicle series">
-        <specific id="1" description="Modular wheeled carrier"/>
-        <specific id="2" description="Forward Area Multi-purpose Vehicle (FAMV)"/>
-        <specific id="3" description="Medium Combat Truck (MCT)"/>
-      </subcategory>
-      <subcategory id="18" description="Oshkosh MK48-series articulated 8x8 vehicle">
-        <specific id="1" description="MK48/14: logistics platform truck"/>
-        <specific id="2" description="MK48/15: recovery vehicle"/>
-        <specific id="3" description="MK48/16: truck tractor"/>
-        <specific id="4" description="MK48/17: cargo truck with Material Handling Crane (MHC)"/>
-        <specific id="5" description="MK48/18: load handling system vehicle."/>
-      </subcategory>
-      <subcategory id="19" description="Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg">
-        <specific id="1" description="M977 cargo"/>
-        <specific id="2" description="M978 fuel-servicing"/>
-        <specific id="3" description="M983 tractor"/>
-        <specific id="4" description="M984A1 wrecker"/>
-        <specific id="5" description="M985 cargo"/>
-        <specific id="6" description="M977 w/ Mine Plow"/>
-        <specific id="7" description="M977 w/ Mine Roller"/>
-        <specific id="8" description="M985 w/ Mine Roller"/>
-        <specific id="9" description="M985 w/ Mine Plow"/>
-        <specific id="10" description="Truck, Heavy, M1074 PLS"/>
-      </subcategory>
-      <subcategory id="20" description="Mack RM6866SX 6x6 10000-kg truck"/>
-      <subcategory id="21" description="M1070 8x8 Heavy Equipment Transporter (HET)"/>
-      <subcategory id="22" description="M911 8x6 truck tractor"/>
-      <subcategory id="23" description="M746 8x8 22-1/2 ton tractor truck (HET)"/>
-      <subcategory id="24" description="Mack RD8226SX 52000-kg 6x6 tank transporter"/>
-      <subcategory id="25" description="Navistar International Corporation F5070 6x4 tank transporter"/>
-      <subcategory id="26" description="LARC-5 4x4 4545-kg amphibious cargo carrier"/>
-      <subcategory id="27" description="Variable Reach Rough Terrain Forklift Truck (VRRTFLT)"/>
-      <subcategory id="28" description="Rough Terrain Container Straddle Truck (RTCST)"/>
-      <subcategory id="29" description="Truck, tractor, yard type, 4x2">
-        <specific id="1" description="M878"/>
-        <specific id="2" description="M878A1"/>
-      </subcategory>
-      <subcategory id="30" description="Case MC2500 30-ton rough terrain crane"/>
-      <subcategory id="31" description="Crane, truck-mounted, hydraulic, 25-ton (CCE) (Grove TMS 300-5)"/>
-      <subcategory id="32" description="Rough terrain crane 4x4 5-ton Hanson H-446A"/>
-      <subcategory id="33" description="Wreckers, 2-1/2 ton 6x6">
-        <specific id="1" description="M60"/>
-        <specific id="2" description="M108"/>
-      </subcategory>
-      <subcategory id="34" description="M62, truck, wrecker, medium, 5-ton, 6x6"/>
-      <subcategory id="35" description="M246, truck, tractor, wrecker, 5-ton, 6x6"/>
-      <subcategory id="36" description="M916 Series trucks"/>
-      <subcategory id="37" description="Small Emplacement Excavator (SEE)"/>
-      <subcategory id="38" description="Truck, cargo; heavy PLS transporter 16.5T 8x8, M1075"/>
-    </category>
-    <category id="8" description="Small tracked utility vehicle"/>
-    <category id="9" description="Large tracked utility vehicle">
-      <subcategory id="1" description="M548 tracked cargo carrier">
-        <specific id="1" description="M1015"/>
-        <specific id="2" description="Stretched M548A1E1"/>
-        <specific id="3" description="M667"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="Recovery vehicles"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="Radar vehicles"/>
-        <specific id="8" description="M45"/>
-        <specific id="9" description="M548A1"/>
-        <specific id="10" description="M548GA1"/>
-        <specific id="11" description="M548/S"/>
-        <specific id="12" description="LAR 160"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="M992 Field Artillery Ammunition Support Vehicle (FAASV)">
-        <specific id="1" description="M993 MLRS carrier"/>
-        <specific id="2" description="XM987 cargo carrier"/>
-        <specific id="3" description="Armored, Forward-Area, Rearm Vehicle (AFARV)"/>
-        <specific id="4" description="Armored Maintenance Vehicle"/>
-        <specific id="5" description="XM1070 Electronic Fighting Vehicle System (EFVS)"/>
-        <specific id="6" description="Command-post vehicle"/>
-      </subcategory>
-      <subcategory id="4" description="M973 Small Unit Support Vehicle (SUSV)"/>
-      <subcategory id="5" description="LMC 1500 Over-snow vehicle"/>
-      <subcategory id="6" description="Caterpillar 988 50 000-lb (22 680-kg) rough terrain container handler"/>
-    </category>
-    <category id="10" description="Mortar">
-      <subcategory id="1" description="M29 81-mm"/>
-      <subcategory id="2" description="M224 60-mm light company mortar"/>
-      <subcategory id="3" description="M1 81-mm"/>
-      <subcategory id="4" description="M2 60-mm"/>
-      <subcategory id="5" description="M19 60-mm"/>
-      <subcategory id="6" description="M29A1 81-mm"/>
-      <subcategory id="7" description="M30 107-mm rifled"/>
-      <subcategory id="8" description="M252 81-mm"/>
-      <subcategory id="9" description="120mm Mortar, M120"/>
-    </category>
-    <category id="11" description="Mine plow"/>
-    <category id="12" description="Mine rake"/>
-    <category id="13" description="Mine roller"/>
-    <category id="14" description="Cargo trailer">
-      <subcategory id="1" description="0 - 0.5 ton"/>
-      <subcategory id="2" description="0.51 - 2 ton">
-        <specific id="1" description="Trailer cargo; high mobility, 3/4 ton, M1102"/>
-      </subcategory>
-      <subcategory id="3" description="2.01 - 5 ton">
-        <specific id="1" description="Trailer, cargo; 2 1/2 ton, M1082"/>
-        <specific id="2" description="Trailer, cargo; 5 ton, M1095"/>
-      </subcategory>
-      <subcategory id="4" description="5.02 - 10 ton"/>
-      <subcategory id="5" description="greater than 10 tons"/>
-    </category>
-    <category id="15" description="Fuel trailer">
-      <subcategory id="1" description="1-1000 gallons"/>
-      <subcategory id="2" description="1001 - 5000 gallons">
-        <specific id="1" description="Semi-trailer, fuel service, 5000 gallons, M969"/>
-      </subcategory>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="16" description="Generator trailer">
-      <subcategory id="1" description="0 - 100 kW"/>
-      <subcategory id="2" description="greater than 100 KW"/>
-    </category>
-    <category id="17" description="Water trailer">
-      <subcategory id="1" description="1-1000 gallons">
-        <specific id="1" description="Trailer, tank; 1 1/2 ton, water, 400 gallons, M149A2"/>
-      </subcategory>
-      <subcategory id="2" description="1001- 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="18" description="Engineer equipment">
-      <subcategory id="1" description="Mine clearing line charge"/>
-      <subcategory id="2" description="Dozer blade kit"/>
-      <subcategory id="3" description="Lane marking system"/>
-      <subcategory id="4" description="High Mobility Engineer Excavator"/>
-      <subcategory id="5" description="Road Grader"/>
-    </category>
-    <category id="19" description="Heavy equipment transport trailer">
-      <subcategory id="1" description="Heavy Equipment Trailer, M1000"/>
-    </category>
-    <category id="20" description="Maintenance equipment trailer">
-      <subcategory id="1" description="Welding trailer"/>
-      <subcategory id="2" description="Compressor"/>
-      <subcategory id="3" description="Tools/parts trailer">
-        <specific id="1" description="Semi-trailer, van, M129A2C"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Limber"/>
-    <category id="22" description="Chemical decontamination trailer"/>
-    <category id="23" description="Warning System">
-      <subcategory id="1" description="JTAGS"/>
-      <subcategory id="2" description="SHIELD/ALERT"/>
-      <subcategory id="3" description="FCS Intelligent Munitions System"/>
-      <subcategory id="4" description="FCS Unattended Ground Sensor - Urban"/>
-      <subcategory id="5" description="FCS Unattended Ground Sensor - Tactical"/>
-    </category>
-    <category id="27" description="Civilian Vehicle">
-      <subcategory id="1" description="Sedan"/>
-      <subcategory id="2" description="Sport Utility Vehicle"/>
-      <subcategory id="3" description="Truck Cargo">
-        <specific id="1" description="Truck Small">
-          <extra id="1" description="Pickup Mini"/>
-          <extra id="2" description="Pickup Medium"/>
-          <extra id="3" description="Pickup Large"/>
-        </specific>
-        <specific id="2" description="Truck Cargo Medium"/>
-        <specific id="3" description="Truck Cargo Large"/>
-      </subcategory>
-      <subcategory id="4" description="Tractor Trailer Combination"/>
-      <subcategory id="5" description="All Terrain Vehicle">
-        <specific id="1" description="ATV 4X4">
-          <extra id="1" description="Polaris Sportsman MV"/>
-        </specific>
-        <specific id="2" description="ATV 6X6">
-          <extra id="1" description="M-Gator"/>
-        </specific>
-      </subcategory>
-      <subcategory id="6" description="Motorcycle">
-        <specific id="1" description="Motorcycle Street"/>
-        <specific id="2" description="Motorcycle Trail">
-          <extra id="1" description="Kawasaki KLR 250"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category id="28" description="Air Defense / Missile Defense Unit Equipment">
-      <subcategory id="1" description="MIM-23 Raytheon HAWK Low-to-Medium Altitude SAM System">
-        <specific id="1" description="Batallion">
-          <extra id="1" description="HAWK BN/ADCP"/>
-        </specific>
-        <specific id="2" description="Battery">
-          <extra id="1" description="HAWK Battery Command Post (BCP)"/>
-          <extra id="2" description="HAWK CWAR (Continuous Wave Acquisition Radar) AN/MPQ-34/48/55/62"/>
-          <extra id="3" description="HAWK HPI (High-Power Illuminator) AN/MPQ-33/39/46/57/61 -"/>
-          <extra id="4" description="HAWK Launcher"/>
-          <extra id="5" description="HAWK PAR (Pulse Acquisition Radar) AN/MQP-50"/>
-          <extra id="6" description="HAWK ROR (Range-Only-Radar) AN/MPQ-37/51"/>
-          <extra id="7" description="HAWK PCP (Platoon Command Post)"/>
-        </specific>
-      </subcategory>
-      <subcategory id="2" description="MIM-104 Raytheon Patriot High-to-Medium Altitude Air Defense (HIMAD) System">
-        <specific id="1" description="Patriot Command Center">
-          <extra id="1" description="Patriot ICC (Information Coordination Central)"/>
-          <extra id="2" description="Patriot BTOC"/>
-        </specific>
-        <specific id="2" description="Patriot Battery">
-          <extra id="1" description="Patriot ECS (Engagement Control Station) AN/MSQ-104"/>
-          <extra id="2" description="Patriot LS (Launcher Station)"/>
-          <extra id="3" description="Patriot Radar AN/MPQ-53"/>
-          <extra id="4" description="Patriot Radar AN/MPQ-63"/>
-        </specific>
-      </subcategory>
-      <subcategory id="3" description="MIM-14B Nike-Hercules SAM System"/>
-      <subcategory id="4" description="Theater High Altitude Area Defense (THAAD) System">
-        <specific id="1" description="THAAD Battery TOC"/>
-        <specific id="2" description="THAAD ground-based radar (GBR)"/>
-        <specific id="3" description="THAAD Launcher"/>
-      </subcategory>
-      <subcategory id="5" description="Self -Propelled VSHORAD Gun / Missile System">
-        <specific id="1" description="M163 Vulcan SP Anti-Aircraft Gun"/>
-        <specific id="2" description="M42 Twin-40mm SP Anti-Aricraft Gun"/>
-        <specific id="3" description="General Electric Vulcan-Commando 20 mm SP Air Defense (AD) System"/>
-        <specific id="4" description="Boeing Avenger Pedestal-Mounted Stinger SP Air Defense (AD) System"/>
-        <specific id="5" description="Raytheon / Loral Aeronutronic Saber Air Defense (AD) System"/>
-        <specific id="6" description="LTV Crossbow pedestal-mounted weapon system"/>
-        <specific id="7" description="Loral Aeronutronic 48 Chaparral">
-          <extra id="1" description="M48"/>
-          <extra id="2" description="M48A1"/>
-          <extra id="3" description="M48A2"/>
-          <extra id="4" description="M48A3"/>
-        </specific>
-        <specific id="8" description="Block VII Low-Altitude SAM System"/>
-        <specific id="9" description="Loral Aeronutronic SAM System"/>
-        <specific id="10" description="M6 Linebacker"/>
-      </subcategory>
-      <subcategory id="6" description="Towed VSHORAD Gun / Missile System">
-        <specific id="1" description="M1 40mm Automatic Anti-Aircraft Gun"/>
-        <specific id="2" description="M167 20mm Vulcan Anti-Aircraft Gun"/>
-        <specific id="3" description="M55 Quad 12.7mm Anti-Aircraft MG"/>
-        <specific id="4" description="AN/MPQ-64 Phased Array SHORAD Radar"/>
-      </subcategory>
-      <subcategory id="7" description="HMWWV with AMRAAM">
-        <specific id="1" description="USMC Complementary Low Altitude Weapon System (CLAWS)"/>
-        <specific id="2" description="US Army HUMRAAM"/>
-      </subcategory>
-    </category>
-    <category id="29" description="Command, Control, Communications, and Intelligence (C3I) System">
-      <subcategory id="1" description="Control and Reporting Center / Modular Control Equipment (CRC / MCE)"/>
-      <subcategory id="2" description="Control and Reporting Element (CRE)"/>
-      <subcategory id="3" description="Control and Reporting Post (CRP)"/>
-      <subcategory id="4" description="USMC Tactical Air Operation Center (TAOC)"/>
-      <subcategory id="5" description="AN/TSQ-73 Missile Minder"/>
-      <subcategory id="6" description="JSTARS Ground Station Module (GSM) AN/TSQ-178"/>
-      <subcategory id="7" description="JSTARS Common Ground Station (CGS)"/>
-      <subcategory id="8" description="UAV Ground Control Station">
-        <specific id="1" description="Predator Ground Control Station"/>
-        <specific id="2" description="Hunter Ground Control Station"/>
-        <specific id="3" description="Shadow Ground Control Station"/>
-      </subcategory>
-    </category>
-    <category id="30" description="Operations Facility"/>
-    <category id="31" description="Intelligence Facility"/>
-    <category id="32" description="Surveillance Facility">
-      <subcategory id="1" description="JLENS Processing Stations (General)">
-        <specific id="1" description="JLENS PTIR Processing Station"/>
-        <specific id="2" description="JLENS SuR Processing Station"/>
-      </subcategory>
-    </category>
-    <category id="33" description="Communications Facility"/>
-    <category id="34" description="Command Facility"/>
-    <category id="35" description="C4I Facility"/>
-    <category id="36" description="Control Facility"/>
-    <category id="37" description="Fire Control Facility"/>
-    <category id="38" description="Missile Defense Facility"/>
-    <category id="39" description="Field Command Post"/>
-    <category id="40" description="Observation Post"/>
-  </entity>
-  <entity kind="1" domain="2" country="225">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Grumman F-14 Tomcat">
-        <specific id="1" description="F-14A"/>
-        <specific id="2" description="F-14D"/>
-        <specific id="3" description="F-14B"/>
-      </subcategory>
-      <subcategory id="3" description="General Dynamics F-16 Fighting Falcon">
-        <specific id="1" description="F-16A"/>
-        <specific id="2" description="F-16B"/>
-        <specific id="3" description="F-16C"/>
-        <specific id="4" description="F-16D"/>
-        <specific id="5" description="F-16E"/>
-        <specific id="6" description="F-16N"/>
-        <specific id="7" description="F-16 (ADF)"/>
-        <specific id="8" description="F-16 RECCE"/>
-        <specific id="9" description="F/A-16"/>
-        <specific id="10" description="F-16CJ (dedicated SEAD)"/>
-        <specific id="11" description="F-16CG"/>
-      </subcategory>
-      <subcategory id="4" description="McDonnell-Douglas F-4 Phantom II">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="F-4B"/>
-        <specific id="3" description="F-4C"/>
-        <specific id="4" description="F-4D"/>
-        <specific id="5" description="F-4E"/>
-        <specific id="6" description="F-4F"/>
-        <specific id="7" description="F-4J"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="F-4N"/>
-        <specific id="11" description="F-4S"/>
-      </subcategory>
-      <subcategory id="5" description="McDonnell-Douglas F-15 Eagle">
-        <specific id="1" description="F-15A"/>
-        <specific id="2" description="F-15B"/>
-        <specific id="3" description="F-15C"/>
-        <specific id="4" description="F-15D"/>
-        <specific id="5" description="F-15E"/>
-        <specific id="6" description="F-15F"/>
-        <specific id="7" description="F-15H"/>
-      </subcategory>
-      <subcategory id="6" description="Lockheed F-22 Raptor">
-        <specific id="1" description="F-22A"/>
-        <specific id="2" description="F-22B"/>
-      </subcategory>
-      <subcategory id="7" description="Lockheed F-104 Starfighter"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="McDonnell-Douglas F/A-18 Hornet">
-        <specific id="1" description="F/A-18A"/>
-        <specific id="2" description="F/A-18B"/>
-        <specific id="3" description="F/A-18C"/>
-        <specific id="4" description="F/A-18D"/>
-        <specific id="5" description="AF-18A"/>
-        <specific id="6" description="ATF-18A"/>
-        <specific id="7" description="CF-188A/B"/>
-        <specific id="8" description="C.15"/>
-        <specific id="9" description="CE.15"/>
-        <specific id="10" description="F/A-18E"/>
-        <specific id="11" description="F/A-18F"/>
-      </subcategory>
-      <subcategory id="10" description="Northrop F-5 Freedom Fighter/Tiger II">
-        <specific id="1" description="F-5A"/>
-        <specific id="2" description="F-5B"/>
-        <specific id="3" description="F-5E Tiger II"/>
-        <specific id="4" description="F-5F"/>
-        <specific id="5" description="RF-5A"/>
-        <specific id="6" description="RF-5E Tigereye"/>
-        <specific id="7" description="RF-5F"/>
-      </subcategory>
-      <subcategory id="11" description="Vought Crusader F-8">
-        <specific id="1" description="Crusader (Vought F-8E (FN))"/>
-      </subcategory>
-      <subcategory id="12" description="F-35 Joint Strike Fighter (JSF)">
-        <specific id="1" description="F-35A CTOL"/>
-        <specific id="2" description="F-35C Naval"/>
-        <specific id="3" description="F-35B STOVL"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Attack/Strike">
-      <subcategory id="1" description="McDonnell-Douglas A-4 Skyhawk"/>
-      <subcategory id="2" description="A-6 Intruder">
-        <specific id="1" description="A-6A"/>
-        <specific id="2" description="A-6B"/>
-        <specific id="3" description="A-6C"/>
-        <specific id="4" description="A-6E"/>
-      </subcategory>
-      <subcategory id="3" description="Vought A-7 Corsair II">
-        <specific id="1" description="A-7D"/>
-      </subcategory>
-      <subcategory id="4" description="Fairchild Republic A-10 Thunderbolt II">
-        <specific id="1" description="A-10A"/>
-        <specific id="2" description="OA-10A"/>
-      </subcategory>
-      <subcategory id="5" description="Cessna 318E Dragonfly">
-        <specific id="1" description="A-37"/>
-      </subcategory>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="McDonnell-Douglas AV-8B Harrier II">
-        <specific id="1" description="AV-8B"/>
-        <specific id="2" description="TAV-8B"/>
-        <specific id="3" description="Harrier GR. Mk 5"/>
-        <specific id="4" description="Harrier GR. Mk 5A"/>
-        <specific id="5" description="Harrier GR. Mk 7"/>
-        <specific id="6" description="Harrier T. Mk 10"/>
-        <specific id="7" description="VA.2 Matador II"/>
-      </subcategory>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="McDonnell-Douglas F-4 Phantom II">
-        <specific id="1" description="F-4G Wild Weasel"/>
-      </subcategory>
-      <subcategory id="11" description="Lockheed F-117A"/>
-      <subcategory id="12" description="General Dynamics F-111">
-        <specific id="1" description="F-111E"/>
-        <specific id="2" description="F-111F"/>
-        <specific id="3" description="F-111C"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Bomber">
-      <subcategory id="1" description="Rockwell International B-1">
-        <specific id="1" description="B-1B"/>
-      </subcategory>
-      <subcategory id="2" description="Northrop B-2"/>
-      <subcategory id="3" description="Boeing B-52 Stratofortress">
-        <specific id="1" description="B-52G"/>
-        <specific id="2" description="B-52H"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="Lockheed C-130 (Model 382) Hercules">
-        <specific id="1" description="C-130"/>
-        <specific id="2" description="AC-130">
-          <extra id="1" description="AC-130A"/>
-          <extra id="2" description="AC-130E"/>
-          <extra id="3" description="AC-130H"/>
-          <extra id="4" description="AC-130U"/>
-        </specific>
-        <specific id="3" description="DC-130"/>
-        <specific id="4" description="EC-130E Commando Solo"/>
-        <specific id="5" description="HC-130"/>
-        <specific id="6" description="JC-130"/>
-        <specific id="7" description="LC-130"/>
-        <specific id="8" description="MC-130">
-          <extra id="1" description="MC-130E"/>
-          <extra id="2" description="MC-130P"/>
-          <extra id="3" description="MC-130H"/>
-        </specific>
-        <specific id="9" description="NC-130"/>
-        <specific id="10" description="RC-130"/>
-        <specific id="11" description="WC-130"/>
-        <specific id="12" description="TC-130"/>
-        <specific id="13" description="KC-130"/>
-        <specific id="14" description="CC-130"/>
-        <specific id="15" description="Hercules C. Mk 1"/>
-        <specific id="16" description="Hercules C. Mk 2"/>
-        <specific id="17" description="Hercules C. Mk 3P"/>
-        <specific id="18" description="(deleted)"/>
-        <specific id="19" description="T.10"/>
-        <specific id="20" description="TK.10"/>
-        <specific id="21" description="TL.10"/>
-        <specific id="22" description="Tp 84"/>
-        <specific id="23" description="C-130H"/>
-        <specific id="24" description="C-130H-30"/>
-        <specific id="25" description="KC-130H"/>
-        <specific id="26" description="C-130H-MP"/>
-        <specific id="27" description="VC-130H"/>
-        <specific id="28" description="C-130J"/>
-        <specific id="29" description="C-130J-30"/>
-        <specific id="30" description="EC-130J Commando Solo"/>
-      </subcategory>
-      <subcategory id="2" description="Lockheed C-5 Galaxy">
-        <specific id="1" description="C-5A"/>
-        <specific id="2" description="C-5B"/>
-      </subcategory>
-      <subcategory id="3" description="Lockheed C-141 Starlifter">
-        <specific id="1" description="C-141A"/>
-        <specific id="2" description="C-141B"/>
-      </subcategory>
-      <subcategory id="4" description="C-135"/>
-      <subcategory id="5" description="Boeing KC-135 Stratotanker">
-        <specific id="1" description="KC-135A"/>
-        <specific id="2" description="KC-135E"/>
-        <specific id="3" description="KC-135Q"/>
-        <specific id="4" description="KC-135R"/>
-      </subcategory>
-      <subcategory id="6" description="McDonnell-Douglas KC-10 Extender">
-        <specific id="1" description="KC-10A"/>
-      </subcategory>
-      <subcategory id="7" description="Boeing 707 tanker/transport">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="T.17"/>
-      </subcategory>
-      <subcategory id="8" description="Boeing 707">
-        <specific id="1" description="VC-137"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="9" description="McDonnell-Douglas C-17A"/>
-      <subcategory id="10" description="Boeing 747">
-        <specific id="1" description="C-25A"/>
-        <specific id="2" description="VC-25A &quot;Air Force One&quot;"/>
-        <specific id="3" description="Boeing/Rockwell YAL-1 Airborne Laser (ABL)"/>
-      </subcategory>
-      <subcategory id="11" description="Gulfstream Aerospace Gulfstream III">
-        <specific id="1" description="C-20"/>
-      </subcategory>
-      <subcategory id="12" description="Learjet 35A/36A">
-        <specific id="1" description="C-21A"/>
-      </subcategory>
-      <subcategory id="13" description="Lockheed Model 1329-25 Jetstar II">
-        <specific id="1" description="C-140"/>
-      </subcategory>
-      <subcategory id="14" description="Douglas DC-3">
-        <specific id="1" description="C-47"/>
-        <specific id="2" description="R4D"/>
-        <specific id="3" description="Dakota"/>
-      </subcategory>
-      <subcategory id="15" description="McDonnell-Douglas DC-9">
-        <specific id="1" description="C-9A"/>
-        <specific id="2" description="VC-9C"/>
-        <specific id="3" description="C-9B"/>
-      </subcategory>
-      <subcategory id="16" description="Beechcraft Super King Air 200/B200">
-        <specific id="1" description="C-12"/>
-      </subcategory>
-      <subcategory id="17" description="Bell/Boeing V-22 Osprey">
-        <specific id="1" description="CV-22A"/>
-        <specific id="2" description="CV-22B"/>
-        <specific id="11" description="MV-22A"/>
-        <specific id="12" description="MV-22B"/>
-        <specific id="21" description="HV-22A"/>
-        <specific id="22" description="HV-22B"/>
-      </subcategory>
-      <subcategory id="18" description="Rockwell T-39 Saberliner"/>
-      <subcategory id="19" description="Grumman C-2A Greyhound (COD)"/>
-      <subcategory id="20" description="(deleted)"/>
-      <subcategory id="21" description="Lockheed Model L100">
-        <specific id="1" description="L100-30 (hospital)"/>
-      </subcategory>
-      <subcategory id="22" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Antisubmarine/patrol/observation">
-      <subcategory id="1" description="Lockheed Model 185/285 Orion">
-        <specific id="1" description="P-3"/>
-        <specific id="2" description="P-3C"/>
-        <specific id="3" description="UP-3"/>
-        <specific id="4" description="UP-3C"/>
-        <specific id="5" description="EP-3"/>
-        <specific id="6" description="P-3J"/>
-        <specific id="7" description="P-3W"/>
-        <specific id="8" description="P-3 AEW&amp;C"/>
-        <specific id="9" description="CF-140 Aurora"/>
-        <specific id="10" description="CP-140 Arcturus"/>
-        <specific id="11" description="EP-3E"/>
-        <specific id="12" description="AP-3C (Australia)"/>
-        <specific id="13" description="P3-K (Canada)"/>
-        <specific id="14" description="P-3F (Iran)"/>
-      </subcategory>
-      <subcategory id="2" description="Lockheed S-3 Viking">
-        <specific id="1" description="S-3B"/>
-        <specific id="2" description="ES-3"/>
-        <specific id="3" description="KS-3"/>
-      </subcategory>
-      <subcategory id="3" description="Rockwell International OV-10 Bronco">
-        <specific id="1" description="OV-10"/>
-        <specific id="2" description="OV-10D Plus"/>
-      </subcategory>
-      <subcategory id="4" description="Schweizer SA 2-37A">
-        <specific id="1" description="RG-8A"/>
-      </subcategory>
-      <subcategory id="5" description="Boeing P-8 Multi-Mission Maritime Aircraft (MMA)">
-        <specific id="1" description="P-8A"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Electronic Warfare (EW)">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="Grumman (General Dynamics) EF-111 Raven">
-        <specific id="1" description="EF-111A"/>
-      </subcategory>
-      <subcategory id="8" description="EC-130 Compass Call Electronic Combat (C2W)"/>
-      <subcategory id="9" description="Grumman EA-6 Prowler">
-        <specific id="1" description="EA-6A"/>
-        <specific id="2" description="EA-6B"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Reconnaissance">
-      <subcategory id="1" description="Lockheed SR-71 Blackbird">
-        <specific id="1" description="SR-71B"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Lockheed U-2">
-        <specific id="1" description="U-2R"/>
-        <specific id="2" description="ER-2"/>
-        <specific id="3" description="U-2S"/>
-      </subcategory>
-      <subcategory id="4" description="McDonnell-Douglas F-4 Phantom II">
-        <specific id="1" description="RF-4B"/>
-        <specific id="2" description="YRF-4C"/>
-        <specific id="3" description="RF-4C"/>
-        <specific id="4" description="RF-4E"/>
-        <specific id="5" description="RF-4EJ"/>
-      </subcategory>
-      <subcategory id="5" description="Sadler A-22 LASA"/>
-      <subcategory id="6" description="Boeing Canada DHC-7 Airborne Reconnaissance--Low (ARL)"/>
-      <subcategory id="7" description="Boeing RC-135">
-        <specific id="1" description="RC-135S Cobra Ball"/>
-        <specific id="2" description="RC-135U Combat Sent"/>
-        <specific id="3" description="RC-135 V/W Rivet Joint"/>
-        <specific id="4" description="RC-135X Cobra Eye"/>
-      </subcategory>
-      <subcategory id="8" description="Beechcraft Super King AIR 200/B200">
-        <specific id="1" description="RC-12H Guardrail Common Sensor"/>
-        <specific id="2" description="RC-12D"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Surveillance / C2 (Airborne Early Warning)">
-      <subcategory id="1" description="Grumman E-2 Hawkeye">
-        <specific id="1" description="E-2C"/>
-        <specific id="2" description="TE-2C"/>
-      </subcategory>
-      <subcategory id="2" description="EA-3">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="EA-3B"/>
-      </subcategory>
-      <subcategory id="3" description="Boeing E-6A Mercury (TACAMO II)"/>
-      <subcategory id="4" description="Boeing E-3 Sentry">
-        <specific id="1" description="E-3A Airborne Warning and Control System (AWACS)"/>
-        <specific id="2" description="E-3B AWACS"/>
-        <specific id="3" description="E-3C AWACS"/>
-        <specific id="4" description="E-3D Sentry AEW. Mk 1"/>
-        <specific id="5" description="E-3F System de Detection Aeroporte"/>
-        <specific id="6" description="KE-3A AWACS (Saudi Arabia)"/>
-      </subcategory>
-      <subcategory id="5" description="Boeing E-4 Advanced Airborne Command Post (AABNCP)">
-        <specific id="1" description="E-4A"/>
-        <specific id="2" description="E-4B"/>
-      </subcategory>
-      <subcategory id="6" description="E-8 (Joint STARS/JSTARS)">
-        <specific id="1" description="E-8A"/>
-        <specific id="2" description="E-8C"/>
-      </subcategory>
-      <subcategory id="7" description="Aerostat"/>
-      <subcategory id="8" description="EC-130E Airborne Command, Control and Communications (ABCCC)"/>
-      <subcategory id="9" description="EC-135 Airborne Command Post"/>
-      <subcategory id="10" description="JLENS Aerostats">
-        <specific id="1" description="JLENS PTIR Aerostat Platform"/>
-        <specific id="2" description="JLENS SuR Aerostat Plaftorm"/>
-      </subcategory>
-    </category>
-    <category id="20" description="Attack helicopter">
-      <subcategory id="1" description="McDonnell-Douglas AH-64 Apache">
-        <specific id="1" description="AH-64A"/>
-        <specific id="2" description="AH-64B"/>
-        <specific id="3" description="AH-64C"/>
-        <specific id="4" description="AH-64D with Longbow Radar"/>
-        <specific id="5" description="Petan (Cobra)"/>
-        <specific id="6" description="AH-64D without Longbow Radar"/>
-      </subcategory>
-      <subcategory id="2" description="Bell Model 209 Hueycobra, Seacobra, Supercobra">
-        <specific id="1" description="AH-1E"/>
-        <specific id="2" description="AH-1F"/>
-        <specific id="3" description="AH-1G"/>
-        <specific id="4" description="AH-1J"/>
-        <specific id="5" description="AH-1P"/>
-        <specific id="6" description="AH-1Q"/>
-        <specific id="7" description="AH-1R"/>
-        <specific id="8" description="AH-1S"/>
-        <specific id="9" description="AH-1T"/>
-        <specific id="10" description="AH-1W"/>
-        <specific id="11" description="AH-1W Venom"/>
-        <specific id="12" description="TH-1S"/>
-        <specific id="13" description="TH-1W"/>
-      </subcategory>
-      <subcategory id="3" description="Bell AH-1(4B)W Viper"/>
-      <subcategory id="4" description="Boeing/Sikorsky RAH-66 Comanche">
-        <specific id="1" description="RAH-66 with LONGBOW radar"/>
-      </subcategory>
-      <subcategory id="5" description="McDonnell-Douglas 500/530 Defender">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="AH-6"/>
-        <specific id="3" description="500MG"/>
-        <specific id="4" description="530MG"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="500 D/E"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Utility helicopter">
-      <subcategory id="1" description="Bell model 204 Iroquois">
-        <specific id="1" description="UH-1A"/>
-        <specific id="2" description="UH-1B"/>
-        <specific id="3" description="UH-1C"/>
-        <specific id="4" description="UH-1E"/>
-        <specific id="5" description="UH-1F"/>
-        <specific id="6" description="UH-1L"/>
-        <specific id="7" description="HH-1K"/>
-        <specific id="8" description="TH-1F"/>
-        <specific id="9" description="TH-1L"/>
-        <specific id="10" description="UH-1HP"/>
-      </subcategory>
-      <subcategory id="2" description="Sikorsky S-70A">
-        <specific id="1" description="UH-60A Blackhawk"/>
-        <specific id="2" description="UH-60L Blackhawk"/>
-        <specific id="3" description="EH-60C"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="VH-60N"/>
-        <specific id="6" description="UH-60P"/>
-        <specific id="7" description="S-70A-1"/>
-        <specific id="8" description="S-70A-1L"/>
-        <specific id="9" description="S-70A-5"/>
-        <specific id="10" description="S-70A-6"/>
-        <specific id="11" description="S-70A-9"/>
-        <specific id="12" description="S-70A-A9"/>
-        <specific id="13" description="S-70A-A11"/>
-        <specific id="14" description="S-70A-A12"/>
-        <specific id="15" description="S-70A-A14"/>
-        <specific id="16" description="S-70A-A16"/>
-        <specific id="17" description="S-70A-A17"/>
-        <specific id="18" description="S-70A-A18"/>
-        <specific id="19" description="S-70A-A19"/>
-        <specific id="20" description="S-70A-A20"/>
-        <specific id="21" description="S-70A-A21"/>
-        <specific id="22" description="S-70A-A22"/>
-        <specific id="23" description="S-70A-A24"/>
-      </subcategory>
-      <subcategory id="3" description="Boeing model 107">
-        <specific id="1" description="UH-46 Sea Knight"/>
-        <specific id="2" description="CH-46 Sea Knight">
-          <extra id="1" description="CH-46D"/>
-          <extra id="2" description="CH-46E"/>
-        </specific>
-      </subcategory>
-      <subcategory id="4" description="S-70C">
-        <specific id="1" description="H-60"/>
-      </subcategory>
-      <subcategory id="5" description="Sikorsky H-76 Eagle"/>
-      <subcategory id="6" description="Sikorsky-S-76b"/>
-    </category>
-    <category id="22" description="Antisubmarine Warfare/patrol helicopter">
-      <subcategory id="1" description="Kaman Seasprite and Super Seasprite">
-        <specific id="1" description="SH-2"/>
-      </subcategory>
-      <subcategory id="2" description="Agusta Sikorsky AS-61/ASH-3H Sea King">
-        <specific id="1" description="SH-3D"/>
-        <specific id="2" description="SH-3H"/>
-        <specific id="3" description="SH-3D/TS"/>
-        <specific id="4" description="ASH-3D"/>
-        <specific id="5" description="AS-61"/>
-        <specific id="6" description="SH-3B"/>
-      </subcategory>
-      <subcategory id="3" description="Sikorsky S-70B">
-        <specific id="1" description="SH-60B Seahawk"/>
-        <specific id="2" description="SH-60F Oceanhawk"/>
-        <specific id="3" description="HH-60H"/>
-        <specific id="4" description="HH-60J Jayhawk"/>
-        <specific id="5" description="HS.23"/>
-        <specific id="6" description="XSH-60J"/>
-        <specific id="7" description="UH-60J"/>
-        <specific id="8" description="S-70B-2"/>
-        <specific id="9" description="MH-60R Seahawk"/>
-      </subcategory>
-    </category>
-    <category id="23" description="Cargo helicopter">
-      <subcategory id="1" description="Boeing Models 114/414">
-        <specific id="1" description="CH-47 Chinook"/>
-        <specific id="2" description="CH-47B"/>
-        <specific id="3" description="CH-47C"/>
-        <specific id="4" description="CH-47D"/>
-        <specific id="5" description="CH-147"/>
-        <specific id="6" description="Chinook HC.Mk 1"/>
-        <specific id="7" description="Chinook HC.Mk 2"/>
-        <specific id="8" description="HT.17"/>
-      </subcategory>
-      <subcategory id="2" description="Sikorsky S-80/H-53">
-        <specific id="1" description="CH-53E Super Stallion"/>
-        <specific id="2" description="MH-53E Sea Dragon"/>
-        <specific id="3" description="S-80E"/>
-        <specific id="4" description="S-80M"/>
-      </subcategory>
-      <subcategory id="3" description="Sikorsky S-65A">
-        <specific id="1" description="CH-53A Sea Stallion"/>
-        <specific id="2" description="HH-53B"/>
-        <specific id="3" description="HH-53C"/>
-        <specific id="4" description="CH-53A"/>
-        <specific id="5" description="CH-53D"/>
-      </subcategory>
-    </category>
-    <category id="24" description="Observation helicopter">
-      <subcategory id="1" description="Bell Kiowa">
-        <specific id="1" description="OH-58"/>
-        <specific id="2" description="CH-136"/>
-        <specific id="3" description="OH-58C"/>
-      </subcategory>
-      <subcategory id="2" description="Bell Model 406 AHIP">
-        <specific id="1" description="OH-58D Kiowa/Kiowa Warrior"/>
-      </subcategory>
-      <subcategory id="3" description="Bell Model 406 CS Combat Scout">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="MH-58D Combat Scout"/>
-      </subcategory>
-    </category>
-    <category id="25" description="Special Operations helicopter">
-      <subcategory id="1" description="Sikorsky S-70A">
-        <specific id="1" description="MH-60A"/>
-        <specific id="2" description="MH-60G Pave Hawk"/>
-        <specific id="3" description="MH-60K"/>
-        <specific id="4" description="MH-60L"/>
-        <specific id="5" description="HH-60G"/>
-        <specific id="6" description="MH 60S Knight Hawk"/>
-      </subcategory>
-      <subcategory id="2" description="Boeing models 114/414">
-        <specific id="1" description="MH-47E"/>
-      </subcategory>
-      <subcategory id="3" description="Sikorsky S-65/MH-53 Pave Low">
-        <specific id="1" description="HH-53B"/>
-        <specific id="2" description="HH-53C"/>
-        <specific id="3" description="CH-53C"/>
-        <specific id="4" description="MH-53J Pave Low III"/>
-        <specific id="5" description="MH-53M Pave Low IV"/>
-        <specific id="6" description="RH-53D"/>
-      </subcategory>
-      <subcategory id="4" description="McDonnell-Douglas 500/530 Defender">
-        <specific id="1" description="MH-6"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="MH-6J"/>
-      </subcategory>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Cessna 172">
-        <specific id="1" description="T-41"/>
-      </subcategory>
-      <subcategory id="2" description="Cessna 318">
-        <specific id="1" description="T-37"/>
-      </subcategory>
-      <subcategory id="3" description="Northrop Talon">
-        <specific id="1" description="T-38"/>
-      </subcategory>
-      <subcategory id="4" description="McDonnell-Douglas/BAe T45TS">
-        <specific id="1" description="T-45 Goshawk"/>
-      </subcategory>
-      <subcategory id="5" description="Beechcraft T-34C">
-        <specific id="1" description="T-34C"/>
-      </subcategory>
-      <subcategory id="6" description="Beechcraft Sierrra 200/Sundowner 180">
-        <specific id="1" description="CT-134A Musketeer II"/>
-      </subcategory>
-      <subcategory id="7" description="Lockheed T-33">
-        <specific id="1" description="Silver Star"/>
-      </subcategory>
-      <subcategory id="8" description="Beechcraft Model 400A Beechjet">
-        <specific id="1" description="T-1A Jayhawk"/>
-      </subcategory>
-      <subcategory id="9" description="Boeing TC-135">
-        <specific id="1" description="TC-135W Rivet Joint Trainer"/>
-        <specific id="2" description="TC-135S Cobra Ball Trainer"/>
-      </subcategory>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="Cessna 208 Caravan"/>
-      <subcategory id="12" description="Cessna Citation"/>
-      <subcategory id="13" description="Raytheon / Pilatus PC-9 Mk II (Beech Mk II)">
-        <specific id="1" description="T-6A Texan II"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Unmanned">
-      <subcategory id="1" description="RQ-5A Hunter"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Maneuver UAV"/>
-      <subcategory id="4" description="Predator Medium Altitude Endurance UAV">
-        <specific id="1" description="RQ-1K Predator"/>
-        <specific id="2" description="RQ-1L Predator"/>
-        <specific id="3" description="MQ-1L Armed Predator"/>
-        <specific id="4" description="MQ-9A Predator B"/>
-      </subcategory>
-      <subcategory id="5" description="Lockheed Martin / Boeing Darkstar UAV"/>
-      <subcategory id="6" description="Global Hawk UAV">
-        <specific id="1" description="RQ-4A"/>
-      </subcategory>
-      <subcategory id="7" description="Alliant Techsystems Outrider UAV (formerly known as the Tactical UAV or TUAV)"/>
-      <subcategory id="8" description="RQ-7 Shadow UAV">
-        <specific id="1" description="RQ-7A"/>
-        <specific id="2" description="RQ-7B"/>
-      </subcategory>
-      <subcategory id="9" description="Pioneer UAV"/>
-      <subcategory id="10" description="BQM-74 Chukar"/>
-      <subcategory id="11" description="MQM-107 Streaker"/>
-      <subcategory id="12" description="MTR-15 Ballistic Aerial Target System (BATS)"/>
-      <subcategory id="13" description="FQM-117 Radio Controlled Minature Aerial Target (RCMAT)"/>
-      <subcategory id="14" description="QUH-1 Iroquois Target"/>
-      <subcategory id="15" description="QF-4 Phantom Target"/>
-      <subcategory id="16" description="QF-106 Delta Dart Target"/>
-      <subcategory id="17" description="MQM-8 Vandel"/>
-      <subcategory id="18" description="AQM-37 Challenger"/>
-      <subcategory id="19" description="TDU-34 Rigid Tow Target"/>
-      <subcategory id="20" description="Javelin (BAI Aerosystems lightweight airborne video system)"/>
-      <subcategory id="21" description="X-47A Pegasus UCAV"/>
-      <subcategory id="22" description="FQM-151 Pointer"/>
-      <subcategory id="23" description="BQM-34 Firebee"/>
-      <subcategory id="24" description="X-45 UCAV">
-        <specific id="1" description="X-45A"/>
-        <specific id="2" description="X-45C"/>
-      </subcategory>
-      <subcategory id="25" description="Boeing ScanEagle">
-        <specific id="1" description="ScanEagle A-15"/>
-        <specific id="2" description="ScanEagle Dual-Bay"/>
-      </subcategory>
-      <subcategory id="26" description="Boeing A-160 Hummingbird"/>
-      <subcategory id="27" description="Interim Small UAV, Raven"/>
-      <subcategory id="28" description="FCS UAV Class I"/>
-      <subcategory id="29" description="FCS UAV Class II"/>
-      <subcategory id="30" description="FCS UAV Class III"/>
-      <subcategory id="31" description="FCS UAV Class IV">
-        <specific id="1" description="FCS UAV Class IV-a"/>
-        <specific id="2" description="FCS UAV Class IV-b"/>
-      </subcategory>
-    </category>
-    <category id="57" description="Non-Combatant Commercial Aircraft">
-      <subcategory id="1" description="Passenger Airline">
-        <specific id="1" description="Boeing 747-400"/>
-        <specific id="2" description="Boeing 757-200"/>
-        <specific id="3" description="MD-82"/>
-        <specific id="4" description="MD-82T"/>
-        <specific id="5" description="MD-90-30-T"/>
-        <specific id="6" description="Boeing 727"/>
-        <specific id="7" description="Boeing 737"/>
-        <specific id="8" description="Boeing 767"/>
-        <specific id="9" description="DC-10"/>
-        <specific id="10" description="Lockheed L-1011 Tristar"/>
-        <specific id="11" description="Boeing 707"/>
-        <specific id="12" description="Boeing 717"/>
-        <specific id="13" description="Beech 1900"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="225">
-    <category id="1" description="Carrier">
-      <subcategory id="1" description="Nimitz Class">
-        <specific id="1" description="CVN 68 Nimitz"/>
-        <specific id="2" description="CVN 69 Dwight D. Eisenhower"/>
-        <specific id="3" description="CVN 70 Carl Vinson"/>
-        <specific id="4" description="CVN 71 Theodore Roosevelt"/>
-        <specific id="5" description="CVN 72 Abraham Lincoln"/>
-        <specific id="6" description="CVN 73 George Washington"/>
-        <specific id="7" description="CVN 74 John C. Stennis"/>
-        <specific id="8" description="CVN 75 Harry S. Truman"/>
-        <specific id="9" description="CVN 76 Ronald Reagen"/>
-      </subcategory>
-      <subcategory id="2" description="Enterprise Class">
-        <specific id="1" description="CVN 65 Enterprise"/>
-      </subcategory>
-      <subcategory id="3" description="Kitty Hawk/John F. Kennedy Class">
-        <specific id="1" description="CV 63 Kitty Hawk"/>
-        <specific id="2" description="CV 64 Constellation"/>
-        <specific id="3" description="CV 66 America"/>
-        <specific id="4" description="CV 67 John F. Kennedy"/>
-      </subcategory>
-      <subcategory id="4" description="Forrestal Class">
-        <specific id="1" description="AVT 59 Forrestal"/>
-        <specific id="2" description="CV 60 Saratoga"/>
-        <specific id="3" description="CV 61 Ranger"/>
-        <specific id="4" description="CV 62 Independence"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Command Ship/Cruiser">
-      <subcategory id="1" description="Blue Ridge Class">
-        <specific id="1" description="LCC 19 Blue Ridge"/>
-        <specific id="2" description="LLC 20 Mount Whitney"/>
-      </subcategory>
-      <subcategory id="2" description="Raleigh and Austin Classes">
-        <specific id="1" description="AGF 11 Coronado"/>
-        <specific id="2" description="AGF 3 La Salle"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Guided Missile Cruiser">
-      <subcategory id="1" description="Ticonderoga Class">
-        <specific id="1" description="CG 47 Ticonderoga"/>
-        <specific id="2" description="CG 48 Yorktown"/>
-        <specific id="3" description="CG 49 Vincennes"/>
-        <specific id="4" description="CG 50 Valley Forge"/>
-        <specific id="5" description="CG 51 Thomas S. Gates"/>
-        <specific id="6" description="CG 52 Bunker Hill"/>
-        <specific id="7" description="CG 53 Mobile Bay"/>
-        <specific id="8" description="CG 54 Antietam"/>
-        <specific id="9" description="CG 55 Leyte Gulf"/>
-        <specific id="10" description="CG 56 San Jacinto"/>
-        <specific id="11" description="CG 57 Lake Champlain"/>
-        <specific id="12" description="CG 58 Philippine Sea"/>
-        <specific id="13" description="CG 59 Princeton"/>
-        <specific id="14" description="CG 60 Normandy"/>
-        <specific id="15" description="CG 61 Monterey"/>
-        <specific id="16" description="CG 62 Chancellorsville"/>
-        <specific id="17" description="CG 63 Cowpens"/>
-        <specific id="18" description="CG 64 Gettysburg"/>
-        <specific id="19" description="CG 65 Chosin"/>
-        <specific id="20" description="CG 66 Hue City"/>
-        <specific id="21" description="CG 67 Shiloh"/>
-        <specific id="22" description="CG 68 Anzio"/>
-        <specific id="23" description="CG 69 Vicksburg"/>
-        <specific id="24" description="CG 70 Lake Erie"/>
-        <specific id="25" description="CG 71 Cape St. George"/>
-        <specific id="26" description="CG 72 Vella Gulf"/>
-        <specific id="27" description="CG 73 Port Royal"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="California Class">
-        <specific id="1" description="CGN 36 California"/>
-        <specific id="2" description="CGN 37 South Carolina"/>
-      </subcategory>
-      <subcategory id="4" description="Truxtun Class">
-        <specific id="1" description="CGN 35 Truxtun"/>
-      </subcategory>
-      <subcategory id="5" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="6" description="Bainbridge Class">
-        <specific id="1" description="CGN 25 Bainbridge"/>
-      </subcategory>
-      <subcategory id="7" description="Leahy Class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="CG 19 Dale"/>
-        <specific id="5" description="CG 20 R. K. Turner"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Guided Missile Destroyer">
-      <subcategory id="1" description="Arleigh Burke Class">
-        <specific id="1" description="DDG 51 Arleigh Burke"/>
-        <specific id="2" description="DDG 52 Barry"/>
-        <specific id="3" description="DDG 53 John Paul Jones"/>
-        <specific id="4" description="DDG 54 Curtis Wilbur"/>
-        <specific id="5" description="DDG 55 Stout"/>
-        <specific id="6" description="DDG 56 John S. McCain"/>
-        <specific id="7" description="DDG 57 Mitscher"/>
-        <specific id="8" description="DDG 58 Laboon"/>
-        <specific id="9" description="DDG 59 Russell"/>
-        <specific id="10" description="DDG 60 Paul Hamilton"/>
-        <specific id="11" description="DDG 61 Ramage"/>
-        <specific id="12" description="DDG 62 Fitzgerald"/>
-        <specific id="13" description="DDG 63 Stethem"/>
-        <specific id="14" description="DDG 64 Carney"/>
-        <specific id="15" description="DDG 65 Benfold"/>
-        <specific id="16" description="DDG 66 Gonzalez"/>
-        <specific id="17" description="DDG 67 Cole"/>
-        <specific id="18" description="DDG 68 The Sullivans"/>
-        <specific id="19" description="DDG 69 Milius"/>
-        <specific id="20" description="DDG 70 Hopper"/>
-        <specific id="21" description="DDG 71 Ross"/>
-        <specific id="22" description="DDG 72 Mahan"/>
-        <specific id="23" description="DDG 73 DeCatur"/>
-        <specific id="24" description="DDG 74 McFaul"/>
-        <specific id="25" description="DDG 75 Donald Cook"/>
-        <specific id="26" description="DDG 76 Higgins"/>
-        <specific id="27" description="DDG 77 O'Kane"/>
-        <specific id="28" description="DDG 78 Porter"/>
-        <specific id="29" description="DDG 79 Oscar Austin"/>
-        <specific id="30" description="DDG 80 Roosevelt"/>
-        <specific id="31" description="DDG 81 Winston Churchill"/>
-        <specific id="32" description="DDG 82 Lassen"/>
-        <specific id="33" description="DDG 83 Howard"/>
-        <specific id="34" description="DDG 84 Buckeley"/>
-        <specific id="35" description="DDG 85 McCampbell"/>
-        <specific id="36" description="DDG 86 Shoup"/>
-        <specific id="37" description="DDG 87 Mason"/>
-        <specific id="38" description="DDG 88 Preble"/>
-        <specific id="39" description="DDG 89 Mustin"/>
-        <specific id="40" description="DDG 90 Chafee"/>
-        <specific id="41" description="DDG 91 Pinckney"/>
-        <specific id="42" description="DDG 92 Momsen"/>
-        <specific id="43" description="DDG 93 Chung-Hoon"/>
-        <specific id="44" description="DDG 94 Nitze"/>
-        <specific id="45" description="DDG 95 James E. Williams"/>
-        <specific id="46" description="DDG 96 Bainbridge"/>
-        <specific id="47" description="DDG 97 Halsey"/>
-        <specific id="48" description="DDG 98 Forest Sherman"/>
-        <specific id="49" description="DDG 99 Farragut"/>
-        <specific id="50" description="DDG 100 Kidd"/>
-        <specific id="51" description="DDG 101 Gridley"/>
-        <specific id="52" description="DDG 102 Sampson"/>
-        <specific id="53" description="DDG 103 Truxtun"/>
-        <specific id="54" description="DDG 104 Sterett"/>
-        <specific id="55" description="DDG 105 Dewey"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="Coontz Class">
-        <specific id="1" description="DDG 39 MacDonough"/>
-        <specific id="2" description="DDG 43 Dahlgren"/>
-      </subcategory>
-      <subcategory id="4" description="Charles F. Adams Class">
-        <specific id="1" description="DDG 2 Charles F. Adams"/>
-      </subcategory>
-      <subcategory id="5" description="Modified Charles F. Adams Class">
-        <specific id="1" description="DDG 38 Perth (Australia)"/>
-        <specific id="2" description="DDG 39 Hobart (Australia)"/>
-        <specific id="3" description="DDG 41 Brisbane (Australia)"/>
-      </subcategory>
-      <subcategory id="6" description="Fletcher and Allen M Summer Class">
-        <specific id="1" description="DDG 906 Huei Yang (ex. English DDG 696) (Taiwan)"/>
-        <specific id="2" description="DDG 908 Kuei Yang (ex. Twining DD 540) (Taiwan)"/>
-        <specific id="3" description="DDG 909 Chin Yang (ex. Mullany DD 528) (Taiwan)"/>
-        <specific id="4" description="DDG 914 Loa Yang (ex. Taussig DD 746) (Taiwan)"/>
-        <specific id="5" description="DDG 917 Nan Yang (ex.Thomason DD760) (Taiwan)"/>
-        <specific id="6" description="DDG 918 An Yang (ex. Kimberly DD 521) (Taiwan)"/>
-        <specific id="7" description="DDG 919 Kun Yang (ex. Yarnall DD 541) (Taiwan)"/>
-      </subcategory>
-      <subcategory id="7" description="Gearing (Wu Chin I and II Conversions) (FRAM I and II) Class">
-        <specific id="1" description="DDG 907 Fu Yang (ex. Ernest G. Small DD 838) (FRAM II) (Taiwan)"/>
-        <specific id="2" description="DDG 915 Han Yang (ex. Herbert J. Thomas DD 833) (Taiwan)"/>
-        <specific id="3" description="DDG 924 Kai Yang (ex. Richard B. Anderson DD 786) (Taiwan)"/>
-        <specific id="4" description="DDG 926 Shuei Yang (ex. Hawkins DD 873) (Taiwan)"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Destroyer">
-      <subcategory id="1" description="Spruance Class">
-        <specific id="1" description="DD 963 Spruance"/>
-        <specific id="2" description="DD 964 Paul F. Foster"/>
-        <specific id="3" description="DD 965 Kinkaid"/>
-        <specific id="4" description="DD 966 Hewitt"/>
-        <specific id="5" description="DD 967 Elliott"/>
-        <specific id="6" description="DD 968 A. W. Radford"/>
-        <specific id="7" description="DD 969 Peterson"/>
-        <specific id="8" description="DD 970 Caron"/>
-        <specific id="9" description="DD 971 David R. Ray"/>
-        <specific id="10" description="DD 972 Olendorf"/>
-        <specific id="11" description="DD 973 John Young"/>
-        <specific id="12" description="DD 974 Comte De Grasse"/>
-        <specific id="13" description="DD 975 O'Brien"/>
-        <specific id="14" description="DD 976 Merrill"/>
-        <specific id="15" description="DD 977 Briscoe"/>
-        <specific id="16" description="DD 978 Stump"/>
-        <specific id="17" description="DD 979 Conolly"/>
-        <specific id="18" description="DD 980 Moosebrugger"/>
-        <specific id="19" description="DD 981 John Hancock"/>
-        <specific id="20" description="DD 982 Nicholson"/>
-        <specific id="21" description="DD 983 John Rodgers"/>
-        <specific id="22" description="DD 984 Leftwich"/>
-        <specific id="23" description="DD 985 Cushing"/>
-        <specific id="24" description="DD 986 Harry W. Hill"/>
-        <specific id="25" description="DD 987 O'Bannon"/>
-        <specific id="26" description="DD 988 Thorn"/>
-        <specific id="27" description="DD 989 Deyo"/>
-        <specific id="28" description="DD 990 Ingersoll"/>
-        <specific id="29" description="DD 991 Fife"/>
-        <specific id="30" description="DD 992 Fletcher"/>
-        <specific id="31" description="DD 997 Hayler"/>
-      </subcategory>
-      <subcategory id="2" description="Modified Gearing FRAM I Class (Turkey)"/>
-      <subcategory id="3" description="Gearing (Wu Chin III Conversion) (FRAM I) Class">
-        <specific id="1" description="DD 912 Chien Yang (ex. James E. Kyes DD 787) (Taiwan)"/>
-        <specific id="2" description="DD 921 Liao Yang (ex. Hanson DD 832) (Taiwan)"/>
-        <specific id="3" description="DD 929 Shao Yang (ex. Hollister DD 788) (Taiwan)"/>
-        <specific id="4" description="DD 925 Te Yang (ex. Sarsfield DD 837) (Taiwan)"/>
-        <specific id="5" description="DD 928 Chen Yang (ex. Johnston DD 821) (Taiwan)"/>
-        <specific id="6" description="DD 923 Shen Yang (ex. Power DD 839) (Taiwan)"/>
-        <specific id="7" description="DD 927 Yun Yang (ex. Hamner DD 718 ) (Taiwan)"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided Missile Frigate">
-      <subcategory id="1" description="Oliver Perry Class">
-        <specific id="1" description="FFG 7 O.H. Perry"/>
-        <specific id="2" description="FFG 8 McInerney"/>
-        <specific id="3" description="FFG 9 Wadsworth"/>
-        <specific id="4" description="FFG 10 Duncan"/>
-        <specific id="5" description="FFG 11 Clark"/>
-        <specific id="6" description="FFG 12 George Philip"/>
-        <specific id="7" description="FFG 13 Sam E. Morison"/>
-        <specific id="8" description="FFG 14 Sides"/>
-        <specific id="9" description="FFG 15 Estocin"/>
-        <specific id="10" description="FFG 16 Clifton Sprauge"/>
-        <specific id="11" description="FFG 19 John A. Moore"/>
-        <specific id="12" description="FFG 20 Antrim"/>
-        <specific id="13" description="FFG 21 Flatley"/>
-        <specific id="14" description="FFG 22 Fahrion"/>
-        <specific id="15" description="FFG 23 Lewis B. Puller"/>
-        <specific id="16" description="FFG 24 Jack Williams"/>
-        <specific id="17" description="FFG 25 Copeland"/>
-        <specific id="18" description="FFG 26 Gallery"/>
-        <specific id="19" description="FFG 27 M. S. Tisdale"/>
-        <specific id="20" description="FFG 28 Boone"/>
-        <specific id="21" description="FFG 29 S. W. Groves"/>
-        <specific id="22" description="FFG 30 Reid"/>
-        <specific id="23" description="FFG 31 Stark"/>
-        <specific id="24" description="FFG 32 John L. Hall"/>
-        <specific id="25" description="FFG 33 Jarrett"/>
-        <specific id="26" description="FFG 34 Aubrey Fitch"/>
-        <specific id="27" description="FFG 36 Underwood"/>
-        <specific id="28" description="FFG 37 Crommelin"/>
-        <specific id="29" description="FFG 38 Curts"/>
-        <specific id="30" description="FFG 39 Doyle"/>
-        <specific id="31" description="FFG 40 Halyburton"/>
-        <specific id="32" description="FFG 41 McClusky"/>
-        <specific id="33" description="FFG 42 Klakring"/>
-        <specific id="34" description="FFG 43 Thatch"/>
-        <specific id="35" description="FFG 45 De Wert"/>
-        <specific id="36" description="FFG 46 Rentz"/>
-        <specific id="37" description="FFG 47 Nicholas"/>
-        <specific id="38" description="FFG 48 Vandegrift"/>
-        <specific id="39" description="FFG 49 R. G. Bradley"/>
-        <specific id="40" description="FFG 50 Jesse L. Taylor"/>
-        <specific id="41" description="FFG 51 Gary"/>
-        <specific id="42" description="FFG 52 Carr"/>
-        <specific id="43" description="FFG 53 Hawes"/>
-        <specific id="44" description="FFG 54 Ford"/>
-        <specific id="45" description="FFG 55 Elrod"/>
-        <specific id="46" description="FFG 56 Simpson"/>
-        <specific id="47" description="FFG 57 Reuben James"/>
-        <specific id="48" description="FFG 58 Sam B. Roberts"/>
-        <specific id="49" description="FFG 59 Kauffman"/>
-        <specific id="50" description="FFG 60 Rodney M. Davis"/>
-        <specific id="51" description="FFG 61 Ingraham"/>
-        <specific id="52" description="F 81 Santa Maria (Spain)"/>
-        <specific id="53" description="F 82 Victoria (Spain)"/>
-        <specific id="54" description="F 83 Numancia (Spain)"/>
-        <specific id="55" description="F 84 Reina Sofia (Spain)"/>
-        <specific id="56" description="F 85 Navarra (Spain)"/>
-        <specific id="57" description="F 86 Canarias (Spain)"/>
-        <specific id="58" description="FFG 01 Adelaide (Australia)"/>
-        <specific id="59" description="FFG 02 Canberra (Australia)"/>
-        <specific id="60" description="FFG 03 Sydney (Australia)"/>
-        <specific id="61" description="FFG 04 Darwin (Australia)"/>
-        <specific id="62" description="FFG 05 Melbourne (Australia)"/>
-        <specific id="63" description="FFG 06 Newcastle (Australia)"/>
-      </subcategory>
-      <subcategory id="2" description="Knox Class">
-        <specific id="1" description="FFG 932 Chin Yang (ex. Robert E. Perry FF 1073) (Taiwan)"/>
-        <specific id="2" description="FFG 933 Fong Yang (ex. Brewton FF 1086) (Taiwan)"/>
-        <specific id="3" description="FFG 934 Feng Yang (ex. Kirk FF 1087) (Taiwan)"/>
-        <specific id="4" description="FFG 935 Lan Yang (ex. Joseph Hewes FF 1078) (Taiwan)"/>
-        <specific id="5" description="FFG 936 Hae Yang (ex. Cook FF 1083) (Taiwan)"/>
-        <specific id="6" description="FFG 937 Hwai Yang (ex. Barbey FF 1088) (Taiwan)"/>
-        <specific id="7" description="FFG 938 (ex. Downes FF 1070) (Taiwan)"/>
-        <specific id="8" description="FFG 939 (ex. Aylwin FF 1081) (Taiwan)"/>
-      </subcategory>
-      <subcategory id="3" description="Modified Oliver Perry Class"/>
-    </category>
-    <category id="7" description="Light/patrol craft">
-      <subcategory id="1" description="PC Class">
-        <specific id="1" description="PC 1 Cyclone"/>
-        <specific id="2" description="PC 2 Tempest"/>
-        <specific id="3" description="PC 3 Hurricane"/>
-        <specific id="4" description="PC 4 Monsoon"/>
-        <specific id="5" description="PC 5 Typhoon"/>
-        <specific id="6" description="PC 6 Sirocco"/>
-        <specific id="7" description="PC 7 Squall"/>
-        <specific id="8" description="PC 8 Zephyr"/>
-        <specific id="9" description="PC 9 Chinook"/>
-        <specific id="10" description="PC 10 Firebolt"/>
-        <specific id="11" description="PC 11 Whirlwind"/>
-        <specific id="12" description="PC 12 Thunderbolt"/>
-        <specific id="13" description="PC 13 Shamal"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine countermeasure ship/craft">
-      <subcategory id="1" description="Osprey class">
-        <specific id="1" description="MHC 51 Osprey"/>
-        <specific id="2" description="MHC 52 Heron"/>
-        <specific id="3" description="MHC 53 Pelican"/>
-        <specific id="4" description="MHC 54 Robin"/>
-        <specific id="5" description="MHC 55 Oriole"/>
-        <specific id="6" description="MHC 56 Kingfisher"/>
-        <specific id="7" description="MHC 57 Cormorant"/>
-        <specific id="8" description="MHC 58 Blackhawk"/>
-        <specific id="9" description="MHC 59 Falcon"/>
-        <specific id="10" description="MHC 60 Cardinal"/>
-        <specific id="11" description="MHC 61 Raven"/>
-        <specific id="12" description="MHC 62 Shrike"/>
-      </subcategory>
-      <subcategory id="2" description="Avenger Class">
-        <specific id="1" description="MCM 1 Avenger"/>
-        <specific id="2" description="MCM 2 Defender"/>
-        <specific id="3" description="MCM 3 Sentry"/>
-        <specific id="4" description="MCM 4 Champion"/>
-        <specific id="5" description="MCM 5 Guardian"/>
-        <specific id="6" description="MCM 6 Devastator"/>
-        <specific id="7" description="MCM 7 Patriot"/>
-        <specific id="8" description="MCM 8 Scout"/>
-        <specific id="9" description="MCM 9 Pioneer"/>
-        <specific id="10" description="MCM 10 Warrior"/>
-        <specific id="11" description="MCM 11 Gladiator"/>
-        <specific id="12" description="MCM 12 Ardent"/>
-        <specific id="13" description="MCM 13 Dextrous"/>
-        <specific id="14" description="MCM 14 Chief"/>
-      </subcategory>
-      <subcategory id="3" description="Acme Class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="MSO 511 Affray"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="(deleted)"/>
-        <specific id="11" description="(deleted)"/>
-        <specific id="12" description="(deleted)"/>
-        <specific id="13" description="(deleted)"/>
-        <specific id="14" description="(deleted)"/>
-        <specific id="15" description="(deleted)"/>
-        <specific id="16" description="(deleted)"/>
-        <specific id="17" description="(deleted)"/>
-        <specific id="18" description="(deleted)"/>
-        <specific id="19" description="(deleted)"/>
-      </subcategory>
-    </category>
-    <category id="9" description="Dock Landing Ship">
-      <subcategory id="1" description="Whidbey Island Class">
-        <specific id="1" description="LSD 41 Whidbey Island"/>
-        <specific id="2" description="LSD 42 Germantown"/>
-        <specific id="3" description="LSD 43 Fort McHenry"/>
-        <specific id="4" description="LSD 44 Gunston Hall"/>
-        <specific id="5" description="LSD 45 Comstock"/>
-        <specific id="6" description="LSD 46 Tortuga"/>
-        <specific id="7" description="LSD 47 Rushmore"/>
-        <specific id="8" description="LSD 48 Ashland"/>
-        <specific id="9" description="LSD 49 Harpers Ferry"/>
-        <specific id="10" description="LSD 50 Carter Hall"/>
-        <specific id="11" description="LSD 51 Oak Hill"/>
-        <specific id="12" description="LSD 52 Pearl Harbor"/>
-      </subcategory>
-      <subcategory id="2" description="Anchorage Class">
-        <specific id="1" description="LSD 36 Anchorage"/>
-        <specific id="2" description="LSD 37 Portland"/>
-        <specific id="3" description="LSD 38 Pensacola"/>
-        <specific id="4" description="LSD 39 Mount Vernon"/>
-        <specific id="5" description="LSD 40 Fort Fisher"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Tank Landing Ship">
-      <subcategory id="1" description="Newport Class">
-        <specific id="1" description="LST 1179 Newport"/>
-        <specific id="2" description="LST 1180 Manitowac"/>
-        <specific id="3" description="LST 1181 Sumter"/>
-        <specific id="4" description="LST 1182 Fresno"/>
-        <specific id="5" description="LST 1183 Peoria"/>
-        <specific id="6" description="LST 1184 Frederick"/>
-        <specific id="7" description="LST 1185 Schenectady"/>
-        <specific id="8" description="LST 1186 Cayuga"/>
-        <specific id="9" description="LST 1187 Tuscaloosa"/>
-        <specific id="10" description="LST 1188 Saginaw"/>
-        <specific id="11" description="LST 1189 San Bernardino"/>
-        <specific id="12" description="LST 1190 Boulder"/>
-        <specific id="13" description="LST 1191 Racine"/>
-        <specific id="14" description="LST 1192 Spartanburg County"/>
-        <specific id="15" description="LST 1193 Fairfax County"/>
-        <specific id="16" description="LST 1194 La Moure County"/>
-        <specific id="17" description="(deleted)"/>
-        <specific id="18" description="LST 1196 Harlan County"/>
-        <specific id="19" description="LST 1197 Barnstable County"/>
-        <specific id="20" description="LST 1198 Bristol County"/>
-      </subcategory>
-      <subcategory id="2" description="Newport Class LPA/LST (modified)">
-        <specific id="1" description="L51 Kanimbla (ex. Saginaw)"/>
-        <specific id="2" description="L52 Manoora (ex. Fairfax County)"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="Landing Craft Air Cusion (LCAC)"/>
-      <subcategory id="2" description="LCU 1600 Class: Utility Landing Craft"/>
-      <subcategory id="3" description="LCU 6 Type: Mechanized Landing Craft"/>
-      <subcategory id="4" description="Landing Craft Personnel (LCPL)"/>
-      <subcategory id="5" description="Amphibious Assault Vehicle (AAV)"/>
-      <subcategory id="6" description="LCU 1610 Class (Transport) (YFU) (Saudia Arabia)">
-        <specific id="1" description="212 Al Qiaq (Saudia Arabia)"/>
-      </subcategory>
-    </category>
-    <category id="14" description="Hydrofoil">
-      <subcategory id="1" description="Pegasus class">
-        <specific id="1" description="PHM 1 Pegasus"/>
-        <specific id="2" description="PHM 2 Hercules"/>
-        <specific id="3" description="PHM 3 Taurus"/>
-        <specific id="4" description="PHM 4 Aquila"/>
-        <specific id="5" description="PHM 5 Aries"/>
-        <specific id="6" description="PHM 6 Gemini"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Cimarron class (Fleet Oilers)">
-        <specific id="1" description="AO 177 Cimarron"/>
-        <specific id="2" description="AO 178 Monongahela"/>
-        <specific id="3" description="AO 179 Merrimack"/>
-        <specific id="4" description="AO 180 Willamette"/>
-        <specific id="5" description="AO 186 Platte"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="Wichita class (Replenishment Oilers)">
-        <specific id="1" description="AOR 1 Wichita"/>
-        <specific id="2" description="AOR 2 Milwaukee"/>
-        <specific id="3" description="AOR 3 Kansas City"/>
-        <specific id="4" description="AOR 4 Savannah"/>
-        <specific id="5" description="AOR 5 Wabash"/>
-        <specific id="6" description="AOR 6 Kalamazoo"/>
-        <specific id="7" description="AOR 7 Roanoke"/>
-      </subcategory>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="Vulcan class (Repair Ship)">
-        <specific id="1" description="AR 8 Jason"/>
-      </subcategory>
-      <subcategory id="13" description="Fulton class (Submarine Tenders)">
-        <specific id="1" description="AS 18 Orion"/>
-      </subcategory>
-      <subcategory id="14" description="Proteus class (Submarine Tenders)">
-        <specific id="1" description="AS 19 Proteus"/>
-      </subcategory>
-      <subcategory id="15" description="Hunley class (Submarine Tenders)">
-        <specific id="1" description="AS 31 Hunley"/>
-        <specific id="2" description="AS 32 Holland"/>
-      </subcategory>
-      <subcategory id="16" description="Simon Lake class (Submarine Tenders)">
-        <specific id="1" description="AS 33 Simon Lake"/>
-        <specific id="2" description="AS 34 Canopus"/>
-      </subcategory>
-      <subcategory id="17" description="Spear class (Submarine Tenders)">
-        <specific id="1" description="AS 36 L. Y. Spear"/>
-        <specific id="2" description="AS 37 Dixon"/>
-      </subcategory>
-      <subcategory id="18" description="Emory S. Land class (Submarine Tenders)">
-        <specific id="1" description="AS 39 Emory S. Land"/>
-        <specific id="2" description="AS 40 Frank Cable"/>
-        <specific id="3" description="AS 41 McKee"/>
-      </subcategory>
-      <subcategory id="19" description="Bolster class (Salvage Ships)">
-        <specific id="1" description="ARS 8 Preserver"/>
-        <specific id="2" description="ARS 38 Bolster"/>
-        <specific id="3" description="ARS 39 Conserver"/>
-        <specific id="4" description="ARS 40 Hoist"/>
-        <specific id="5" description="ARS 41 Opportune"/>
-        <specific id="6" description="ARS 42 Reclaimer"/>
-        <specific id="7" description="ARS 43 Recovery"/>
-      </subcategory>
-      <subcategory id="20" description="Safeguard class (Salvage Ships)">
-        <specific id="1" description="ARS 50 Safeguard"/>
-        <specific id="2" description="ARS 51 Grasp"/>
-        <specific id="3" description="ARS 52 Salvor"/>
-        <specific id="4" description="ARS 53 Grapple"/>
-      </subcategory>
-      <subcategory id="21" description="Edenton class (Salvage Ships)">
-        <specific id="1" description="ATS 1 Edenton"/>
-        <specific id="2" description="ATS 2 Beaufort"/>
-        <specific id="3" description="ATS 3 Brunswick"/>
-      </subcategory>
-      <subcategory id="22" description="Chanticleer class (Submarine Rescue)">
-        <specific id="1" description="ASR 13 Kittiwake"/>
-        <specific id="2" description="ASR 15 Sunbird"/>
-      </subcategory>
-      <subcategory id="23" description="Pigeon class (Submarine Rescue)">
-        <specific id="1" description="ASR 21 Pigeon"/>
-        <specific id="2" description="ASR 22 Ortolan"/>
-      </subcategory>
-      <subcategory id="24" description="Abnaki class (Fleet Ocean Tugs)">
-        <specific id="1" description="ATF 159 Paiute"/>
-        <specific id="2" description="ATF 160 Papago"/>
-      </subcategory>
-    </category>
-    <category id="17" description="Auxiliary, Merchant Marine">
-      <subcategory id="1" description="Fleet Ballistic Missile Support Ships (Naval Fleet)">
-        <specific id="1" description="TAK 282 Marshfield"/>
-        <specific id="2" description="TAK 286 Vega"/>
-      </subcategory>
-      <subcategory id="2" description="Ammunition Ship (Naval Fleet)">
-        <specific id="1" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="Fleet Stores Ship (Naval Fleet)">
-        <specific id="1" description="TAF 58 Rigel"/>
-      </subcategory>
-      <subcategory id="4" description="Combat Stores Ships (Naval Fleet)">
-        <specific id="1" description="TAFS 8 Sirius"/>
-        <specific id="2" description="TAFS 9 Spica"/>
-        <specific id="3" description="TAFS 10 Saturn"/>
-      </subcategory>
-      <subcategory id="5" description="Neosho class (Naval Fleet Oilers)">
-        <specific id="1" description="TAO 143 Neosho"/>
-        <specific id="2" description="TAO 146 Kawishiwi"/>
-        <specific id="3" description="TAO 148 Ponchatoula"/>
-      </subcategory>
-      <subcategory id="6" description="Henry J. Kaiser class (Naval Fleet Oilers)">
-        <specific id="1" description="TAO 187 Henry J. Kaiser"/>
-        <specific id="2" description="TAO 188 Joshua Humphreys"/>
-        <specific id="3" description="TAO 189 John Lenthall"/>
-        <specific id="4" description="TAO 190 Andrew J. Higgins"/>
-        <specific id="5" description="TAO 191 Benjamin Isherwood"/>
-        <specific id="6" description="TAO 192 Henry Eckford"/>
-        <specific id="7" description="TAO 193 Walter S. Diehl"/>
-        <specific id="8" description="TAO 194 John Ericsson"/>
-        <specific id="9" description="TAO 195 Leroy Grumman"/>
-        <specific id="10" description="TAO 196 Kanawha"/>
-        <specific id="11" description="TAO 197 Pecos"/>
-        <specific id="12" description="TAO 198 Big Horn"/>
-        <specific id="13" description="TAO 199 Tippecanoe"/>
-        <specific id="14" description="TAO 200 Guadaloupe"/>
-        <specific id="15" description="TAO 201 Patuxent"/>
-        <specific id="16" description="TAO 202 Yukon"/>
-        <specific id="17" description="TAO 203 Laramie"/>
-        <specific id="18" description="TAO 204 Rappahannock"/>
-      </subcategory>
-      <subcategory id="7" description="Powhatan class (Fleet Ocean Tugs)">
-        <specific id="1" description="TATF 166 Powhatan"/>
-        <specific id="2" description="TATF 167 Narragansett"/>
-        <specific id="3" description="TATF 168 Catawba"/>
-        <specific id="4" description="TATF 169 Navajo"/>
-        <specific id="5" description="TATF 170 Mohawk"/>
-        <specific id="6" description="TATF 171 Sioux"/>
-        <specific id="7" description="TATF 172 Apache"/>
-      </subcategory>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="Maritime Prepositioning Ships (MPS)">
-        <specific id="1" description="TAK 3000 Cpl Louis Hauge Jr."/>
-        <specific id="2" description="TAK 3001 Pfc William Baugh"/>
-        <specific id="3" description="TAK 3002 Pfc James Anderson Jr."/>
-        <specific id="4" description="TAK 3003 1st Lt Alexander Bonnyman Jr."/>
-        <specific id="5" description="TAK 3004 Pvt Harry Fisher"/>
-        <specific id="6" description="TAK 3005 Sgt Matej Kocak"/>
-        <specific id="7" description="TAK 3006 Pfc Eugene A. Obregon"/>
-        <specific id="8" description="TAK 3007 Maj Stephen W. Pless"/>
-        <specific id="9" description="TAK 3008 2nd Lt John P. Bobo"/>
-        <specific id="10" description="TAK 3009 Pfc Dewayne T. Williams"/>
-        <specific id="11" description="TAK 3010 1st Lt Baldomero Lopez"/>
-        <specific id="12" description="TAK 3011 1st Lt Jack Lummus"/>
-        <specific id="13" description="TAK 3012 Staff Sgt William R. Button"/>
-      </subcategory>
-      <subcategory id="10" description="Lash (Preposition)">
-        <specific id="1" description="TAK 1015 Green Island"/>
-        <specific id="2" description="TAK 2043 American Kestrel"/>
-        <specific id="3" description="TAK 2046 Austral Rainbow"/>
-        <specific id="4" description="TAK 2064 Green Harbour"/>
-      </subcategory>
-      <subcategory id="11" description="Freighters (Preposition)">
-        <specific id="1" description="TAK 5076 Noble Star"/>
-        <specific id="2" description="TAK 2040 Advantage"/>
-        <specific id="3" description="TAK 2062 American Cormorant"/>
-      </subcategory>
-      <subcategory id="12" description="Tankers (PRE-POSITION)">
-        <specific id="1" description="TAOT 170 Sealift China Sea"/>
-        <specific id="2" description="TAOT 181 Potomac"/>
-      </subcategory>
-      <subcategory id="13" description="Tankers (Ocean Transportation)">
-        <specific id="1" description="TAOT 168 Sealift Pacific"/>
-        <specific id="2" description="TAOT 169 Sealift Arabian Sea"/>
-        <specific id="3" description="TAOT 171 Sealift Indian Ocean"/>
-        <specific id="4" description="TAOT 172 Sealift Atlantic"/>
-        <specific id="5" description="TAOT 173 Sealift Mediterranean"/>
-        <specific id="6" description="TAOT 174 Sealift Caribbean"/>
-        <specific id="7" description="TAOT 175 Sealift Arctic"/>
-        <specific id="8" description="TAOT 176 Sealift Antarctic"/>
-        <specific id="9" description="TAOT 1121 Gus W. Darnell"/>
-        <specific id="10" description="TAOT 1122 Paul Buck"/>
-        <specific id="11" description="TAOT 1123 Samuel L. Cobb"/>
-        <specific id="12" description="TAOT 1124 Richard G. Matthieson"/>
-        <specific id="13" description="TAOT 1125 Lawrence H. Gianella"/>
-      </subcategory>
-      <subcategory id="14" description="Fast Sealift Ships (Strategic Sealift)">
-        <specific id="1" description="TAKR 287 Algol"/>
-        <specific id="2" description="TAKR 288 Bellatrix"/>
-        <specific id="3" description="TAKR 289 Denebola"/>
-        <specific id="4" description="TAKR 290 Pollux"/>
-        <specific id="5" description="TAKR 291 Altair"/>
-        <specific id="6" description="TAKR 292 Regulus"/>
-        <specific id="7" description="TAKR 293 Capella"/>
-        <specific id="8" description="TAKR 294 Antares"/>
-      </subcategory>
-      <subcategory id="15" description="Aviation Support Ships (Strategic Sealift)">
-        <specific id="1" description="TAVB 3 Wright"/>
-        <specific id="2" description="TAVB 4 Curtiss"/>
-      </subcategory>
-      <subcategory id="16" description="Hospital Ships (Strategic Sealift)">
-        <specific id="1" description="TAH 19 Mercy"/>
-        <specific id="2" description="TAH 20 Comfort"/>
-      </subcategory>
-      <subcategory id="17" description="Frigate Research Ship (Special Mission Support)">
-        <specific id="1" description="T-AGFF1 Glover"/>
-      </subcategory>
-      <subcategory id="18" description="Missile Range Instrumentation Ships (Special Mission Support)">
-        <specific id="1" description="TAGM 20 Redstone"/>
-        <specific id="2" description="TAGM 22 Range Sentinel"/>
-        <specific id="3" description="TAGM 23 Observation Island"/>
-      </subcategory>
-      <subcategory id="19" description="Oceanographic Research Ships (Special Mission Support)">
-        <specific id="1" description="TAGOR 10 Thomas Washington (loan)"/>
-        <specific id="2" description="TAGOR 12 De Steigeur"/>
-        <specific id="3" description="TAGOR 13 Bartlett"/>
-        <specific id="4" description="TAGOR 14 Melville (loan)"/>
-        <specific id="5" description="TAGOR 15 Knorr (loan)"/>
-        <specific id="6" description="TAGOR 21 Gyre (loan)"/>
-        <specific id="7" description="TAGOR 22 Moana Wave (loan)"/>
-        <specific id="8" description="TAGOR 23 Thomas G. Thompson (loan)"/>
-        <specific id="9" description="TAGOR 195 Hayes"/>
-      </subcategory>
-      <subcategory id="20" description="Surveying Ships (Special Mission Support)">
-        <specific id="1" description="TAGS 26 Silas Bent"/>
-        <specific id="2" description="TAGS 27 Kane"/>
-        <specific id="3" description="TAGS 29 Chauvenet"/>
-        <specific id="4" description="TAGS 32 Harkness"/>
-        <specific id="5" description="TAGS 33 Wilkes"/>
-        <specific id="6" description="TAGS 34 Wyman"/>
-        <specific id="7" description="TAGS 39 Maury"/>
-        <specific id="8" description="TAGS 40 Tanner"/>
-        <specific id="9" description="TAGS 45 Waters"/>
-        <specific id="10" description="TAGS 51 John McDonnell"/>
-        <specific id="11" description="TAGS 52 Littlehales"/>
-        <specific id="12" description="TAGS 60 Pathfinder"/>
-        <specific id="13" description="TAGS 61 Sumner"/>
-      </subcategory>
-      <subcategory id="21" description="Navigation Test Support Ship (Special Mission Support)">
-        <specific id="1" description="TAG 194 Vanguard"/>
-      </subcategory>
-      <subcategory id="22" description="Cable Repair Ships (Special Mission Support)">
-        <specific id="1" description="TARC 6 Albert J. Myer"/>
-        <specific id="2" description="TARC 7 Zeus"/>
-      </subcategory>
-      <subcategory id="23" description="Deep Submergence Support Ship (Special Mission Support)">
-        <specific id="1" description="TAGDS 2 Point Loma"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate">
-      <subcategory id="1" description="Knox Class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="FF 1056 Connole"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="(deleted)"/>
-        <specific id="11" description="(deleted)"/>
-        <specific id="12" description="FF 1063 Reasoner"/>
-        <specific id="13" description="FF 1064 Lockwood"/>
-        <specific id="14" description="FF 1065 Stein"/>
-        <specific id="15" description="FF 1066 Marvin Shields"/>
-        <specific id="16" description="FF 1067 F. Hammond"/>
-        <specific id="17" description="FF 1068 Vreeland"/>
-        <specific id="18" description="(deleted)"/>
-        <specific id="19" description="FF 1070 Downes"/>
-        <specific id="20" description="(deleted)"/>
-        <specific id="21" description="(deleted)"/>
-        <specific id="22" description="FF 1073 R. E. Peary"/>
-        <specific id="23" description="FF 1074 Harold E. Holt"/>
-        <specific id="24" description="FF 1075 Trippe"/>
-        <specific id="25" description="FF 1076 Fanning"/>
-        <specific id="26" description="FF 1077 Ouellet"/>
-        <specific id="27" description="FF 1078 Joseph Hewes"/>
-        <specific id="28" description="FF 1079 Bowen"/>
-        <specific id="29" description="FF 1080 Paul"/>
-        <specific id="30" description="FF 1081 Aylwin"/>
-        <specific id="31" description="FF 1082 E. Montgomery"/>
-        <specific id="32" description="FF 1083 Cook"/>
-        <specific id="33" description="FF 1084 McCandless"/>
-        <specific id="34" description="FF 1085 D. B. Beary"/>
-        <specific id="35" description="(deleted)"/>
-        <specific id="36" description="FF 1087 Kirk"/>
-        <specific id="37" description="(deleted)"/>
-        <specific id="38" description="FF 1089 J. L. Brown"/>
-        <specific id="39" description="FF 1090 Ainsworth"/>
-        <specific id="40" description="(deleted)"/>
-        <specific id="41" description="FF 1092 T. C. Hart"/>
-        <specific id="42" description="FF 1093 Capodanno"/>
-        <specific id="43" description="FF 1094 Pharris"/>
-        <specific id="44" description="FF 1095 Truett"/>
-        <specific id="45" description="(deleted)"/>
-        <specific id="46" description="FF 1097 Moinester"/>
-      </subcategory>
-    </category>
-    <category id="51" description="Battleship"/>
-    <category id="52" description="Heavy Cruiser"/>
-    <category id="53" description="Destroyer Tender">
-      <subcategory id="1" description="Sam Gompers/Yellowstone Class">
-        <specific id="1" description="AD 37 Samuel Gompers"/>
-        <specific id="2" description="AD 38 Puget Sound"/>
-        <specific id="3" description="AD 41 Yellowstone"/>
-        <specific id="4" description="AD 42 Acadia"/>
-        <specific id="5" description="AD 43 Cape Cod"/>
-        <specific id="6" description="AD 44 Shenandoah"/>
-      </subcategory>
-      <subcategory id="2" description="Dixie Class">
-        <specific id="1" description="AD 15 Prairie"/>
-        <specific id="2" description="AD 18 Sierra"/>
-        <specific id="3" description="AD 19 Yosemite"/>
-      </subcategory>
-    </category>
-    <category id="54" description="Amphibious Assault Ship">
-      <subcategory id="1" description="Tarawa Class">
-        <specific id="1" description="LHA 1 Tarawa"/>
-        <specific id="2" description="LHA 2 Saipan"/>
-        <specific id="3" description="LHA 3 Belleau Wood"/>
-        <specific id="4" description="LHA 4 Nassau"/>
-        <specific id="5" description="LHA 5 Peleliu"/>
-      </subcategory>
-      <subcategory id="2" description="Iwo Jima Class">
-        <specific id="1" description="LPH 2 Iwo Jima"/>
-        <specific id="2" description="LPH 3 Okinawa"/>
-        <specific id="3" description="LPH 7 Guadalcanal"/>
-        <specific id="4" description="LPH 9 Guam"/>
-        <specific id="5" description="LPH 10 Tripoli"/>
-        <specific id="6" description="LPH 11 New Orleans"/>
-        <specific id="7" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="Wasp Class">
-        <specific id="1" description="LHD 1 Wasp"/>
-        <specific id="2" description="LHD 2 Essex"/>
-        <specific id="3" description="LHD 3 Kearsage"/>
-        <specific id="4" description="LHD 4 Boxer"/>
-        <specific id="5" description="LHD 5 Bataan"/>
-        <specific id="6" description="LHD 6 Bonhomme Richard"/>
-        <specific id="7" description="LHD 7 Iwo Jima"/>
-      </subcategory>
-      <subcategory id="4" description="MCS Class">
-        <specific id="1" description="MCS 12 Inchon"/>
-      </subcategory>
-    </category>
-    <category id="55" description="Amphibious Cargo Ship">
-      <subcategory id="1" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-      </subcategory>
-    </category>
-    <category id="56" description="Amphibious Transport Dock">
-      <subcategory id="1" description="Austin Class">
-        <specific id="1" description="LPD 4 Austin"/>
-        <specific id="2" description="LPD 5 Ogden"/>
-        <specific id="3" description="LPD 6 Duluth"/>
-        <specific id="4" description="LPD 7 Cleveland"/>
-        <specific id="5" description="LPD 8 Dubuque"/>
-        <specific id="6" description="LPD 9 Denver"/>
-        <specific id="7" description="LPD 10 Juneau"/>
-        <specific id="8" description="LPD 12 Shreveport"/>
-        <specific id="9" description="LPD 13 Nashville"/>
-        <specific id="10" description="LPD 14 Trenton"/>
-        <specific id="11" description="LPD 15 Ponce"/>
-        <specific id="12" description="(deleted)"/>
-        <specific id="13" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="2" description="San Antonio Class">
-        <specific id="1" description="LPD 17 San Antonio"/>
-        <specific id="2" description="LPD 18 New Orleans"/>
-        <specific id="3" description="LPD 19 Mesa Verde"/>
-      </subcategory>
-    </category>
-    <category id="57" description="Ammunition Ship">
-      <subcategory id="1" description="Kilauea Class">
-        <specific id="1" description="T-AE 26 Kilauea"/>
-        <specific id="2" description="AE 27 Butte"/>
-        <specific id="3" description="AE 28 Santa Barbara"/>
-        <specific id="4" description="AE 29 Mount Hood"/>
-        <specific id="5" description="AE 32 Flint"/>
-        <specific id="6" description="AE 33 Shasta"/>
-        <specific id="7" description="AE 34 Mount Baker"/>
-        <specific id="8" description="AE 35 Kiska"/>
-      </subcategory>
-      <subcategory id="2" description="Suribachi Class">
-        <specific id="1" description="AE 21 Suribachi"/>
-        <specific id="2" description="AE 22 Mauna Kea"/>
-        <specific id="3" description="AE 23 Nitro"/>
-        <specific id="4" description="AE 24 Pyro"/>
-        <specific id="5" description="AE 25 Haleakala"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-    <category id="58" description="Combat Stores Ship">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Mars Class">
-        <specific id="1" description="AFS 1 Mars"/>
-        <specific id="2" description="AFS 2 Sylvania"/>
-        <specific id="3" description="AFS 3 Niagara Falls"/>
-        <specific id="4" description="AFS 4 White Plains"/>
-        <specific id="5" description="AFS 5 Concord"/>
-        <specific id="6" description="AFS 6 San Diego"/>
-        <specific id="7" description="AFS 7 San Jose"/>
-      </subcategory>
-    </category>
-    <category id="59" description="Surveillance Towed Array Sonar System (SURTASS)">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="SWATH-S (Small) class">
-        <specific id="1" description="TAGOS 19 Victorious"/>
-        <specific id="2" description="TAGOS 20 Able"/>
-        <specific id="3" description="TAGOS 21 Effective"/>
-        <specific id="4" description="TAGOS 22 Loyal"/>
-      </subcategory>
-      <subcategory id="3" description="SWATH-L (Large) class">
-        <specific id="1" description="TAGOS 23 Impeccable"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="Stalwart Class (Ocean Surveillance)">
-        <specific id="1" description="TAGOS 1 Stalwart"/>
-        <specific id="2" description="TAGOS 2 Contender"/>
-        <specific id="3" description="TAGOS 3 Vindicator"/>
-        <specific id="4" description="TAGOS 4 Triumph"/>
-        <specific id="5" description="TAGOS 5 Assurance"/>
-        <specific id="6" description="TAGOS 6 Persistent"/>
-        <specific id="7" description="TAGOS 7 Indomitable"/>
-        <specific id="8" description="TAGOS 8 Prevail"/>
-        <specific id="9" description="TAGOS 9 Assertive"/>
-        <specific id="10" description="TAGOS 10 Invincible"/>
-        <specific id="11" description="TAGOS 11 Audacious"/>
-        <specific id="12" description="TAGOS 12 Bold"/>
-        <specific id="13" description="TAGOS 13 Adventurous"/>
-        <specific id="14" description="TAGOS 14 Worthy"/>
-        <specific id="15" description="TAGOS 15 Titan"/>
-        <specific id="16" description="TAGOS 16 Capable"/>
-        <specific id="17" description="TAGOS 17 Intrepid"/>
-        <specific id="18" description="TAGOS 18 Relentless"/>
-      </subcategory>
-    </category>
-    <category id="60" description="Fast Combat Support Ship">
-      <subcategory id="1" description="Sacramento Class">
-        <specific id="1" description="AOE 1 Sacramento"/>
-        <specific id="2" description="AOE 2 Camden"/>
-        <specific id="3" description="AOE 3 Seattle"/>
-        <specific id="4" description="AOE 4 Detroit"/>
-      </subcategory>
-      <subcategory id="2" description="Supply Class">
-        <specific id="1" description="AOE 6 Supply"/>
-        <specific id="2" description="AOE 7 Rainier"/>
-        <specific id="3" description="AOE 8 Arctic"/>
-        <specific id="4" description="AOE 10 Bridge"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="American Kentucky"/>
-        <specific id="2" description="Ocean City"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker">
-        <specific id="1" description="Texaco Georgia"/>
-      </subcategory>
-      <subcategory id="3" description="Large Fishing Trawler"/>
-      <subcategory id="4" description="Medium Fishing Boat"/>
-      <subcategory id="5" description="Small Fishing Boat"/>
-      <subcategory id="6" description="Two Masted Fishing Boat"/>
-      <subcategory id="7" description="Single Masted Fishing Boat"/>
-      <subcategory id="8" description="Cigarette Boat"/>
-    </category>
-    <category id="62" description="Coast Guard Cutters">
-      <subcategory id="1" description="378-foot High Endurance (WHEC)">
-        <specific id="1" description="Boutwell (WHEC 719)"/>
-        <specific id="2" description="Chase (WHEC 718)"/>
-        <specific id="3" description="Dallas (WHEC 716)"/>
-        <specific id="4" description="Gallatin (WHEC 721)"/>
-        <specific id="5" description="Hamilton (WHEC 715)"/>
-        <specific id="6" description="Jarvis (WHEC 725)"/>
-        <specific id="7" description="Mellon (WHEC 717)"/>
-        <specific id="8" description="Midgett (WHEC 726)"/>
-        <specific id="9" description="Morgenthau (WHEC 722)"/>
-        <specific id="10" description="Munro (WHEC 724)"/>
-        <specific id="11" description="Rush (WHEC 723)"/>
-        <specific id="12" description="Sherman (WHEC 720)"/>
-      </subcategory>
-      <subcategory id="2" description="282-foot Medium Endurance (WMEC)">
-        <specific id="1" description="Alex Haley"/>
-      </subcategory>
-      <subcategory id="3" description="Famous Class (WMEC)">
-        <specific id="1" description="Bear (WMEC 901)"/>
-        <specific id="2" description="Campbell (WMEC 909)"/>
-        <specific id="3" description="Escanaba (WMEC 907)"/>
-        <specific id="4" description="Forward (WMEC 911)"/>
-        <specific id="5" description="Harriet Lane (WMEC 903)"/>
-        <specific id="6" description="Legare (WMEC 912)"/>
-        <specific id="7" description="Mohawk (WMEC 913)"/>
-        <specific id="8" description="Northland (WMEC 904)"/>
-        <specific id="9" description="Seneca (WMEC 906)"/>
-        <specific id="10" description="Spencer (WMEC 905)"/>
-        <specific id="11" description="Tahoma (WMEC 908)"/>
-        <specific id="12" description="Tampa (WMEC 902)"/>
-        <specific id="13" description="Thetis (WMEC 910)"/>
-      </subcategory>
-      <subcategory id="4" description="Reliance Class (WMEC)">
-        <specific id="1" description="Active (WMEC 618)"/>
-        <specific id="2" description="Alert (WMEC 630)"/>
-        <specific id="3" description="Confidence (WMEC 619)"/>
-        <specific id="4" description="Dauntless (WMEC 624)"/>
-        <specific id="5" description="Decisive (WMEC 629)"/>
-        <specific id="6" description="Dependable (WMEC 626)"/>
-        <specific id="7" description="Diligence (WMEC 616)"/>
-        <specific id="8" description="Reliance (WMEC 615)"/>
-        <specific id="9" description="Resolute (WMEC 620)"/>
-        <specific id="10" description="Steadfast (WMEC 623)"/>
-        <specific id="11" description="Valiant (WMEC 621)"/>
-        <specific id="12" description="Venturous (WMEC 625)"/>
-        <specific id="13" description="Vigilant (WMEC 617)"/>
-        <specific id="14" description="Vigorous (WMEC 627)"/>
-      </subcategory>
-      <subcategory id="5" description="Island Class (WPB)">
-        <specific id="1" description="Adak (WPB 1333)"/>
-        <specific id="2" description="Anacapa (WPB 1335)"/>
-        <specific id="3" description="Aquidneck (WPB 1309)"/>
-        <specific id="4" description="Assateague (WPB 1337)"/>
-        <specific id="5" description="Attu (WPB 1317)"/>
-        <specific id="6" description="Bainbridge Island (WPB 1343)"/>
-        <specific id="7" description="Baranof (WPB 1318)"/>
-        <specific id="8" description="Block Island (WPB 1344)"/>
-        <specific id="9" description="Chandeleur (WPB 1319)"/>
-        <specific id="10" description="Chincoteague (WPB 1320)"/>
-        <specific id="11" description="Cushing (WPB 1321)"/>
-        <specific id="12" description="Cuttyhunk(WPB 1322)"/>
-        <specific id="13" description="Drummond (WPB 1323)"/>
-        <specific id="14" description="Edisto (WPB 1313)"/>
-        <specific id="15" description="Faralon (WPB 1301)"/>
-        <specific id="16" description="Galveston Island (WPB 1343)"/>
-        <specific id="17" description="Grand Isle (WPB 1338)"/>
-        <specific id="18" description="Jefferson Island (WPB 1340)"/>
-        <specific id="19" description="Key Biscayne (WPB 1339)"/>
-        <specific id="20" description="Key Largo (WPB 1324)"/>
-        <specific id="21" description="Kiska (WPB 1336)"/>
-        <specific id="22" description="Knight Island (WPB 1348)"/>
-        <specific id="23" description="Kodiak Island (WPB 1341)"/>
-        <specific id="24" description="Liberty (WPB 1334)"/>
-        <specific id="25" description="Long Island (WPB 1342)"/>
-        <specific id="26" description="Manitou (WPB 1302)"/>
-        <specific id="27" description="Matagorda (WPB 1303)"/>
-        <specific id="28" description="Matinicus (WPB 1315)"/>
-        <specific id="29" description="Maui (WPB 1304)"/>
-        <specific id="30" description="Metompkin (WPB 1325)"/>
-        <specific id="31" description="Monhegan (WPB 1305)"/>
-        <specific id="32" description="Monomoy (WPB 1326)"/>
-        <specific id="33" description="Mustang (WPB 1310)"/>
-        <specific id="34" description="Nantucket (WPB 1316)"/>
-        <specific id="35" description="Naushon (WPB 1311)"/>
-        <specific id="36" description="Nunivak (WPB 1306)"/>
-        <specific id="37" description="Ocracoke (WPB 1307)"/>
-        <specific id="38" description="Orcas (WPB 1327)"/>
-        <specific id="39" description="Padre (WPB 1328)"/>
-        <specific id="40" description="Pea Island (WPB 1347)"/>
-        <specific id="41" description="Roanoke Island (WPB 1346)"/>
-        <specific id="42" description="Sanibel (WPB 1312)"/>
-        <specific id="43" description="Sapelo (WPB 1314)"/>
-        <specific id="44" description="Sitkinak (WPB 1329)"/>
-        <specific id="45" description="Staten Island (WPB 1345)"/>
-        <specific id="46" description="Tybee (WPB 1330)"/>
-        <specific id="47" description="Vashon (WPB 1308)"/>
-        <specific id="48" description="Washington (WPB 1331)"/>
-        <specific id="49" description="Wrangell (WPB 1332)"/>
-      </subcategory>
-      <subcategory id="6" description="Marine Protector Class (WPB)">
-        <specific id="1" description="Adelie (WPB 87333)"/>
-        <specific id="2" description="Albacore (WPB 87309)"/>
-        <specific id="3" description="Amberjack (WPB 87315)"/>
-        <specific id="4" description="Barracuda (WPB 87301)"/>
-        <specific id="5" description="Beluga (WPB 87325)"/>
-        <specific id="6" description="Blackfin (WPB 87317)"/>
-        <specific id="7" description="Blacktip (WPB 87326)"/>
-        <specific id="8" description="Bluefin (WPB 87318)"/>
-        <specific id="9" description="Bonito (WPB 87341)"/>
-        <specific id="10" description="Brant (WPB 87348)"/>
-        <specific id="11" description="Chinook (WPB 87308)"/>
-        <specific id="12" description="Cobia (WPB 87311)"/>
-        <specific id="13" description="Cochito (WPB 87329)"/>
-        <specific id="14" description="Coho (WPB 87321)"/>
-        <specific id="15" description="Cormorant (WPB 87313)"/>
-        <specific id="16" description="Dorado (WPB 87306)"/>
-        <specific id="17" description="Finback (WPB 87314)"/>
-        <specific id="18" description="Flyingfish (WPB 87346)"/>
-        <specific id="19" description="Gannet (WPB 87334)"/>
-        <specific id="20" description="Haddock (WPB 87347)"/>
-        <specific id="21" description="Halibut (WPB 8734008)"/>
-        <specific id="22" description="Hammerhead (WPB 87302)"/>
-        <specific id="23" description="Hawksbill (WPB 87312)"/>
-        <specific id="24" description="Heron (WPB 87344)"/>
-        <specific id="25" description="Ibis (WPB 87338)"/>
-        <specific id="26" description="Kingfisher (WPB 87322)"/>
-        <specific id="27" description="Kittiwake (WPB 87316)"/>
-        <specific id="28" description="Mako (WPB 87303)"/>
-        <specific id="29" description="Manowar (WPB 87330)"/>
-        <specific id="30" description="Manta (WPB 87320)"/>
-        <specific id="31" description="Marlin (WPB 87304)"/>
-        <specific id="32" description="Moray (WPB 87331)"/>
-        <specific id="33" description="Narwhal (WPB 87335)"/>
-        <specific id="34" description="Osprey (WPB 87307)"/>
-        <specific id="35" description="Pelican (WPB 87327)"/>
-        <specific id="36" description="Petrel (WPB 87350)"/>
-        <specific id="37" description="Pompano (WPB 87339)"/>
-        <specific id="38" description="Razorbill (WPB 87332)"/>
-        <specific id="39" description="Ridley (WPB 87328)"/>
-        <specific id="40" description="Seahawk (WPB 87323)"/>
-        <specific id="41" description="Shearwater (WPB 87349)"/>
-        <specific id="42" description="Shrike (WPB 87342)"/>
-        <specific id="43" description="Sockeye (WPB 87337)"/>
-        <specific id="44" description="Steelhead (WPB 87324)"/>
-        <specific id="45" description="Stingray (WPB 87305)"/>
-        <specific id="46" description="Sturgeon (WPB 87336)"/>
-        <specific id="47" description="Tarpon (WPB 87310)"/>
-        <specific id="48" description="Tern (WPB 87343)"/>
-        <specific id="49" description="Wahoo (WPB 87345)"/>
-        <specific id="50" description="Yellowfin (WPB 87319)"/>
-      </subcategory>
-      <subcategory id="7" description="Point Class (WPB)">
-        <specific id="1" description="Point Brower (WPB 87372)"/>
-      </subcategory>
-    </category>
-    <category id="63" description="Coast Guard Boats">
-      <subcategory id="1" description="52-foot Motor Life Boats (MLB)"/>
-      <subcategory id="2" description="47-foot Motor Life Boats (MLB)"/>
-      <subcategory id="3" description="44-foot Motor Life Boats (MLB)"/>
-      <subcategory id="4" description="41-foot Utility Boats (UTB)"/>
-      <subcategory id="5" description="38-foot Deployable Pursuit Boat (DPB)"/>
-      <subcategory id="6" description="21-64-foot Aids to Navigation Boats"/>
-      <subcategory id="7" description="25-foot Transportable Port Security Boats (TPSB)"/>
-      <subcategory id="8" description="Rigid Hull Inflatable Boats (RHI)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="225">
-    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
-      <subcategory id="1" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="Ohio class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="SSBN 730 Henry M. Jackson"/>
-        <specific id="6" description="SSBN 731 Alabama"/>
-        <specific id="7" description="SSBN 732 Alaska"/>
-        <specific id="8" description="SSBN 733 Nevada"/>
-        <specific id="9" description="SSBN 734 Tennessee"/>
-        <specific id="10" description="SSBN 735 Pennsylvania"/>
-        <specific id="11" description="SSBN 736 West Virginia"/>
-        <specific id="12" description="SSBN 737 Kentucky"/>
-        <specific id="13" description="SSBN 738 Maryland"/>
-        <specific id="14" description="SSBN 739 Nebraska"/>
-        <specific id="15" description="SSBN 740 Rhode Island"/>
-        <specific id="16" description="SSBN 741 Maine"/>
-        <specific id="17" description="SSBN 742 Wyoming"/>
-      </subcategory>
-    </category>
-    <category id="2" description="SSGN (Nuclear Guided Missile)">
-      <subcategory id="1" description="Ohio 726"/>
-      <subcategory id="2" description="Michigan 727"/>
-      <subcategory id="3" description="Florida 728"/>
-      <subcategory id="4" description="Georgia 729"/>
-    </category>
-    <category id="3" description="SSN (Nuclear Attack-Torpedo)">
-      <subcategory id="1" description="Seawolf class">
-        <specific id="1" description="SSN 21 Seawolf"/>
-        <specific id="2" description="SSN 22 Connecticut"/>
-        <specific id="3" description="SSN 23 Jimmy Carter"/>
-      </subcategory>
-      <subcategory id="2" description="Sturgeon class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="(deleted)"/>
-        <specific id="11" description="(deleted)"/>
-        <specific id="12" description="(deleted)"/>
-        <specific id="13" description="(deleted)"/>
-        <specific id="14" description="(deleted)"/>
-        <specific id="15" description="(deleted)"/>
-        <specific id="16" description="(deleted)"/>
-        <specific id="17" description="(deleted)"/>
-        <specific id="18" description="(deleted)"/>
-        <specific id="19" description="(deleted)"/>
-        <specific id="20" description="(deleted)"/>
-        <specific id="21" description="(deleted)"/>
-        <specific id="22" description="(deleted)"/>
-        <specific id="23" description="(deleted)"/>
-        <specific id="24" description="(deleted)"/>
-        <specific id="25" description="(deleted)"/>
-        <specific id="26" description="(deleted)"/>
-        <specific id="27" description="(deleted)"/>
-        <specific id="28" description="(deleted)"/>
-        <specific id="29" description="(deleted)"/>
-        <specific id="30" description="SSN 683 Parche"/>
-        <specific id="31" description="SSN 684 Cavalla"/>
-        <specific id="32" description="(deleted)"/>
-        <specific id="33" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="4" description="Los Angeles class">
-        <specific id="1" description="SSN 688 Los Angeles"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="SSN 690 Philadelphia"/>
-        <specific id="4" description="SSN 691 Memphis"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="(deleted)"/>
-        <specific id="11" description="SSN 698 Bremerton"/>
-        <specific id="12" description="SSN 699 Jacksonville"/>
-        <specific id="13" description="SSN 700 Dallas"/>
-        <specific id="14" description="SSN 701 La Jolla"/>
-        <specific id="15" description="(deleted)"/>
-        <specific id="16" description="(deleted)"/>
-        <specific id="17" description="(deleted)"/>
-        <specific id="18" description="SSN 705 City of Corpus Christi"/>
-        <specific id="19" description="SSN 706 Albuquerque"/>
-        <specific id="20" description="SSN 707 Portsmouth"/>
-        <specific id="21" description="SSN 708 Minneapolis-Saint Paul"/>
-        <specific id="22" description="SSN 709 Hyman G. Rickover"/>
-        <specific id="23" description="SSN 710 Augusta"/>
-        <specific id="24" description="SSN 711 San Francisco"/>
-        <specific id="25" description="SSN 712 Atlanta"/>
-        <specific id="26" description="SSN 713 Houston"/>
-        <specific id="27" description="SSN 714 Norfolk"/>
-        <specific id="28" description="SSN 715 Buffalo"/>
-        <specific id="29" description="SSN 716 Salt Lake City"/>
-        <specific id="30" description="SSN 717 Olympia"/>
-        <specific id="31" description="SSN 718 Honolulu"/>
-        <specific id="32" description="SSN 719 Providence"/>
-        <specific id="33" description="SSN 720 Pittsburgh"/>
-        <specific id="34" description="SSN 721 Chicago"/>
-        <specific id="35" description="SSN 722 Key West"/>
-        <specific id="36" description="SSN 723 Oklahoma City"/>
-        <specific id="37" description="SSN 724 Louisville"/>
-        <specific id="38" description="SSN 725 Helena"/>
-        <specific id="39" description="SSN 750 Newport News"/>
-        <specific id="40" description="SSN 751 San Juan"/>
-        <specific id="41" description="SSN 752 Pasadena"/>
-        <specific id="42" description="SSN 753 Albany"/>
-        <specific id="43" description="SSN 754 Topeka"/>
-        <specific id="44" description="SSN 755 Miami"/>
-        <specific id="45" description="SSN 756 Scranton"/>
-        <specific id="46" description="SSN 757 Alexandria"/>
-        <specific id="47" description="SSN 758 Asheville"/>
-        <specific id="48" description="SSN 759 Jefferson City"/>
-        <specific id="49" description="SSN 760 Annapolis"/>
-        <specific id="50" description="SSN 761 Springfield"/>
-        <specific id="51" description="SSN 762 Columbus"/>
-        <specific id="52" description="SSN 763 Santa Fe"/>
-        <specific id="53" description="SSN 764 Boise"/>
-        <specific id="54" description="SSN 765 Montpelier"/>
-        <specific id="55" description="SSN 766 Charlotte"/>
-        <specific id="56" description="SSN 767 Hampton"/>
-        <specific id="57" description="SSN 768 Hartford"/>
-        <specific id="58" description="SSN 769 Toledo"/>
-        <specific id="59" description="SSN 770 Tucson"/>
-        <specific id="60" description="SSN 771 Columbia"/>
-        <specific id="61" description="SSN 772 Greeneville"/>
-        <specific id="62" description="SSN 773 Cheyenne"/>
-      </subcategory>
-      <subcategory id="5" description="Virginia Class">
-        <specific id="1" description="SSN 774 Virginia"/>
-        <specific id="2" description="SSN 775 Texas"/>
-        <specific id="3" description="SSN 776 Hawaii"/>
-        <specific id="4" description="SSN 777 No. Carolina"/>
-      </subcategory>
-    </category>
-    <category id="7" description="SSA(Conventional Auxiliary)">
-      <subcategory id="1" description="Dolphin Class">
-        <specific id="1" description="AGSS 555 Dolphin"/>
-      </subcategory>
-      <subcategory id="2" description="Advanced SEAL Delivery System Class">
-        <specific id="1" description="ASDS-1"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="225">
-    <category id="0" description="Other">
-      <subcategory id="1" description="Space Shuttle Vehicle"/>
-      <subcategory id="2" description="National Launch System (NLS)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="SOTV"/>
-      <subcategory id="5" description="SMV"/>
-    </category>
-    <category id="1" description="Manned">
-      <subcategory id="1" description="Space Shuttle Orbiter">
-        <specific id="1" description="Atlantis"/>
-        <specific id="2" description="Discovery"/>
-        <specific id="3" description="Columbia"/>
-        <specific id="4" description="Endeavor"/>
-        <specific id="5" description="Enterprise"/>
-      </subcategory>
-      <subcategory id="2" description="Space Station">
-        <specific id="1" description="Freedom"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Unmanned">
-      <subcategory id="1" description="Communication satellite">
-        <specific id="1" description="Leasat"/>
-        <specific id="2" description="DSCS"/>
-        <specific id="3" description="Fleetsatcom"/>
-        <specific id="4" description="Milstar"/>
-        <specific id="5" description="SDS"/>
-        <specific id="6" description="Tactical Data Relay Satellite System (TDRSS)"/>
-        <specific id="7" description="Lightsat"/>
-        <specific id="8" description="STEP/Eagle"/>
-        <specific id="9" description="LES/Tacsat"/>
-      </subcategory>
-      <subcategory id="2" description="Navigation satellite">
-        <specific id="1" description="Transit"/>
-        <specific id="2" description="Global Positioning System (GPS)"/>
-        <specific id="3" description="Navstar 41-60 (launch 1996 or 1997)"/>
-      </subcategory>
-      <subcategory id="3" description="Early Warning satellite">
-        <specific id="1" description="DSP"/>
-        <specific id="2" description="MICRO-SAT"/>
-        <specific id="3" description="SIBRS"/>
-      </subcategory>
-      <subcategory id="4" description="Electronic Intelligence (ELINT) satellite">
-        <specific id="1" description="Rhyolite"/>
-        <specific id="2" description="Magnum"/>
-        <specific id="3" description="Challet/Vortex"/>
-        <specific id="4" description="Jumpseat"/>
-      </subcategory>
-      <subcategory id="5" description="Meteorology satellite">
-        <specific id="1" description="Defense Meteorological Satellite Program (DMSP)"/>
-      </subcategory>
-      <subcategory id="6" description="Ocean Surveillance satellite">
-        <specific id="1" description="White Cloud"/>
-      </subcategory>
-      <subcategory id="7" description="Imaging Radar Surveillance satellite">
-        <specific id="1" description="Lacrosse"/>
-      </subcategory>
-      <subcategory id="8" description="Optical Imaging Surveillance satellite">
-        <specific id="1" description="KH11"/>
-        <specific id="2" description="Advanced KH11"/>
-      </subcategory>
-      <subcategory id="9" description="SDI satellite">
-        <specific id="1" description="Delta 181"/>
-        <specific id="2" description="E2I (Endo-Exoatmospheric Interceptor)"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Booster">
-      <subcategory id="1" description="Atlas"/>
-      <subcategory id="2" description="Conestoga"/>
-      <subcategory id="3" description="Delta"/>
-      <subcategory id="4" description="Pegasus"/>
-      <subcategory id="5" description="Scout"/>
-      <subcategory id="6" description="Taurus"/>
-      <subcategory id="7" description="Titan"/>
-      <subcategory id="8" description="Tomahawk"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="222">
-    <category id="0" description="Other">
-      <subcategory id="0" description="Bridges">
-        <specific id="1" description="PMM-2 Amphibious Bridging and Ferry System"/>
-        <specific id="2" description="Amphibious Bridging System (Wheeled) (ABS(W))"/>
-        <specific id="3" description="MTU-72 armored bridgelayer"/>
-        <specific id="4" description="MTU-20 armored bridgelayer w/bridge"/>
-        <specific id="5" description="MTU armored bridgelayer"/>
-        <specific id="6" description="TMM truck-mounted treadway"/>
-        <specific id="7" description="KMM truck-mounted treadway"/>
-        <specific id="8" description="DPP-40 floating bridge equipment"/>
-        <specific id="9" description="GSP heavy amphibious ferry"/>
-        <specific id="10" description="PVD-20 airportable"/>
-        <specific id="11" description="PMP heavy folding pontoon"/>
-        <specific id="12" description="PPS heavy girder floating"/>
-        <specific id="13" description="PVM foot suspension"/>
-        <specific id="14" description="LVM light suspension"/>
-        <specific id="15" description="TVM heavy suspension"/>
-        <specific id="16" description="Underwater bridge set"/>
-        <specific id="17" description="MARM sectional arch"/>
-        <specific id="18" description="RMM-4 portable steel fixed"/>
-        <specific id="19" description="SARM sectional deck truss"/>
-        <specific id="20" description="REM-500 railway and road-section"/>
-        <specific id="21" description="NZhM-56 heavy floating railway and road"/>
-        <specific id="22" description="Heavy barge"/>
-        <specific id="23" description="BMK-T bridging boat"/>
-        <specific id="24" description="BMK-130 bridging boat"/>
-        <specific id="25" description="BMK-150 bridging boat"/>
-        <specific id="26" description="BMK-70 bridging boat"/>
-        <specific id="27" description="BMK-90 bridging boat"/>
-        <specific id="28" description="MTU-20 armored bridgelayer w/o bridge"/>
-        <specific id="29" description="MTU-20 bridge"/>
-      </subcategory>
-      <subcategory id="2" description="Missile Transporter/Launcher">
-        <specific id="1" description="SS-25 TEL"/>
-      </subcategory>
-    </category>
-    <category id="1" description="Tank">
-      <subcategory id="1" description="T-80 MBT">
-        <specific id="1" description="T-80"/>
-        <specific id="2" description="T-80B"/>
-        <specific id="3" description="T-80BK"/>
-        <specific id="4" description="T-80BV"/>
-        <specific id="5" description="T-80BVK"/>
-        <specific id="6" description="T-80U"/>
-        <specific id="7" description="T-80Uv"/>
-        <specific id="8" description="T-80 w/mine plow roller"/>
-        <specific id="9" description="T-80Uv w/mine plow roller"/>
-        <specific id="10" description="T-80U w/Reactive Armor"/>
-      </subcategory>
-      <subcategory id="2" description="T-72 MBT">
-        <specific id="1" description="T-72"/>
-        <specific id="2" description="T-72M"/>
-        <specific id="3" description="T-72K"/>
-        <specific id="4" description="T-72A"/>
-        <specific id="5" description="T-72AK"/>
-        <specific id="6" description="T-72B"/>
-        <specific id="7" description="T-72BK"/>
-        <specific id="8" description="T-72B1"/>
-        <specific id="9" description="T-72B1K"/>
-        <specific id="10" description="T-72 Bv"/>
-        <specific id="11" description="T-72 Bv w/mine plow roller"/>
-        <specific id="12" description="T-72 w/mine plow roller"/>
-        <specific id="13" description="T-72S"/>
-      </subcategory>
-      <subcategory id="3" description="T-64 MBT">
-        <specific id="1" description="T-64A"/>
-        <specific id="2" description="T-64AK"/>
-        <specific id="3" description="T-64B"/>
-        <specific id="4" description="T-64BV"/>
-        <specific id="5" description="T-64B1"/>
-        <specific id="6" description="T-64B1K"/>
-        <specific id="7" description="T-64BV1K"/>
-        <specific id="8" description="T-64R"/>
-        <specific id="9" description="T-64 Bv w/mine plow roller"/>
-      </subcategory>
-      <subcategory id="4" description="T-62 MBT">
-        <specific id="1" description="T-62"/>
-        <specific id="2" description="T-62K"/>
-        <specific id="3" description="T-62M"/>
-        <specific id="4" description="T-62MK"/>
-        <specific id="5" description="T-62MV"/>
-        <specific id="6" description="T-62M1"/>
-        <specific id="7" description="T-62 Bv w/mine plow roller"/>
-      </subcategory>
-      <subcategory id="5" description="T-54 MBT">
-        <specific id="1" description="T-54"/>
-        <specific id="2" description="T-54K"/>
-        <specific id="3" description="T-54B"/>
-        <specific id="4" description="T-54BK"/>
-        <specific id="5" description="T-54M"/>
-        <specific id="6" description="T-54MK"/>
-      </subcategory>
-      <subcategory id="6" description="T-55 MBT">
-        <specific id="1" description="T-55"/>
-        <specific id="2" description="T-55K"/>
-        <specific id="3" description="T-55A"/>
-        <specific id="4" description="T-55AD"/>
-        <specific id="5" description="T-55AK"/>
-        <specific id="6" description="T-55AM"/>
-        <specific id="7" description="T-55AMD"/>
-        <specific id="8" description="T-55AMK"/>
-        <specific id="9" description="T-55AMV"/>
-        <specific id="10" description="T-55M"/>
-        <specific id="11" description="T-55MK"/>
-        <specific id="12" description="T-55MVK"/>
-      </subcategory>
-      <subcategory id="8" description="PT-76 Amphibious light tank">
-        <specific id="1" description="PT-76A"/>
-        <specific id="2" description="PT-76B"/>
-      </subcategory>
-      <subcategory id="9" description="T-90 MBT"/>
-      <subcategory id="10" description="T-34/85"/>
-      <subcategory id="11" description="T-80UK Command Tank"/>
-    </category>
-    <category id="2" description="Armored fighting vehicle">
-      <subcategory id="1" description="BMP-1">
-        <specific id="1" description="BMP-1, basic model 1970"/>
-        <specific id="2" description="BMP-1K command"/>
-        <specific id="3" description="BMP-1K3 command"/>
-        <specific id="4" description="BMP-1P w/ AT-4 ATGW"/>
-        <specific id="5" description="BMP-1PK command"/>
-        <specific id="6" description="BRM-1K recon (aka M-1976)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="BMP-1KShM unarmed command"/>
-      </subcategory>
-      <subcategory id="2" description="BMP-2">
-        <specific id="1" description="BMP-2"/>
-        <specific id="2" description="BMP-2D"/>
-        <specific id="3" description="BMP-2K"/>
-        <specific id="4" description="BMP-2 w/ KMT-8/KMT-10"/>
-        <specific id="5" description="BVP-2 (Czech)"/>
-      </subcategory>
-      <subcategory id="3" description="BMP-3">
-        <specific id="1" description="BMP-3 [(SIFV) M1990/1]"/>
-        <specific id="2" description="BRM-3K Reconnaissance Vehicle"/>
-        <specific id="3" description="BMP-3K Command variant"/>
-      </subcategory>
-      <subcategory id="4" description="BRDM-2 Reconnaissance vehicle">
-        <specific id="1" description="BRDM-2 w/ AT-2 ATGM"/>
-        <specific id="2" description="BRDM-2 w/ AT-3 ATGM"/>
-        <specific id="3" description="BRDM-2 w/ AT-5 ATGM"/>
-        <specific id="4" description="BRDM-2-RKhb NBC"/>
-        <specific id="5" description="BRDM-2U command"/>
-        <specific id="6" description="BRDM-2 w/14.5mm"/>
-      </subcategory>
-      <subcategory id="5" description="BTR-40 Reconnaissance vehicle">
-        <specific id="1" description="BTR-40"/>
-        <specific id="2" description="BTR-40B"/>
-        <specific id="3" description="BTR-40A anti-air"/>
-        <specific id="4" description="BTR-40Kh chemical reconnaissance"/>
-        <specific id="5" description="BTR-40zhd railroad"/>
-      </subcategory>
-      <subcategory id="6" description="BTR-152">
-        <specific id="1" description="BTR-152"/>
-        <specific id="2" description="BTR-152V"/>
-        <specific id="3" description="BTR-152V1"/>
-        <specific id="4" description="BTR-152V2"/>
-        <specific id="5" description="BTR-152V3"/>
-        <specific id="6" description="BTR-152K"/>
-        <specific id="7" description="BTR-152U"/>
-        <specific id="8" description="BTR-152A"/>
-      </subcategory>
-      <subcategory id="7" description="MT-LB tracked vehicle">
-        <specific id="1" description="MT-LB 1V12"/>
-        <specific id="2" description="MT-LB 1V13 (battery Fire Direction Center (FDC))"/>
-        <specific id="3" description="MT-LB 1V14 (battery Command Post)"/>
-        <specific id="4" description="MT-LB 1V15 (battalion command)"/>
-        <specific id="5" description="MT-LB 1V16 (battalion FDC)"/>
-        <specific id="6" description="MT-LB 1V12M (artillery C2)"/>
-        <specific id="7" description="MT-LB 1V13M (artillery C2)"/>
-        <specific id="8" description="MT-LB 1V14M (artillery C2)"/>
-        <specific id="9" description="MT-LB 1V15M (artillery C2)"/>
-        <specific id="10" description="MT-LB 1V16M (artillery C2)"/>
-        <specific id="11" description="MT-LB 1V21 staff command"/>
-        <specific id="12" description="MT-LB 1V22 air defense management"/>
-        <specific id="13" description="MT-LB 1V23 C2"/>
-        <specific id="14" description="MT-LB 1V24 artillery C3"/>
-        <specific id="15" description="MT-LB 1V25 AD management"/>
-        <specific id="16" description="(deleted)"/>
-        <specific id="17" description="(deleted)"/>
-        <specific id="18" description="MT-LB SNAR-10 radar"/>
-        <specific id="19" description="MT-LBV snow/swamp"/>
-        <specific id="20" description="(deleted)"/>
-        <specific id="21" description="MT-LB ambulance"/>
-        <specific id="22" description="MT-LBR repair"/>
-        <specific id="23" description="MT-LB w/ AT-6 (Anti-Tank Guided Weapon) ATGW"/>
-        <specific id="24" description="RKhM (Chemical Recon)"/>
-      </subcategory>
-      <subcategory id="8" description="BTR-60">
-        <specific id="1" description="BTR-60"/>
-        <specific id="2" description="BTR-60P"/>
-        <specific id="3" description="BTR-60PA"/>
-        <specific id="4" description="BTR-60PB"/>
-        <specific id="5" description="BTR-60PU"/>
-        <specific id="6" description="BTR-60PBK command"/>
-        <specific id="7" description="BTR-60PU command"/>
-        <specific id="8" description="BTR-60PU-12 air defense command"/>
-        <specific id="9" description="BTR-601V19 FDC"/>
-        <specific id="10" description="BTR-601V18 artillery observation"/>
-        <specific id="11" description="BTR-60 R-145BM communications"/>
-        <specific id="12" description="BTR-60 R-975 forward air controller"/>
-        <specific id="13" description="BTR-60-E-351BR generator"/>
-        <specific id="14" description="BTR-60-P-238T switchboard"/>
-        <specific id="15" description="BTR-60-P-240T switchboard"/>
-        <specific id="16" description="BTR-60-P-241T field telephone"/>
-      </subcategory>
-      <subcategory id="9" description="BTR-50 Amphibious Tracked APC">
-        <specific id="1" description="BTR-50P"/>
-        <specific id="2" description="BTR-50PA"/>
-        <specific id="3" description="BTR-50PK"/>
-        <specific id="4" description="BTR-50PU"/>
-        <specific id="5" description="BTR-50PU R82"/>
-        <specific id="6" description="BTR-50PU-11"/>
-        <specific id="7" description="BTR-50PUM"/>
-        <specific id="8" description="BTR-50PUR"/>
-        <specific id="9" description="BTR-50PK(B)"/>
-        <specific id="10" description="MTP technical support"/>
-        <specific id="11" description="MTK mineclearing"/>
-        <specific id="12" description="MTR-1 repair"/>
-      </subcategory>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="BMD airborne fire support vehicle">
-        <specific id="1" description="BMD-1"/>
-        <specific id="2" description="BMD-1P w/ AT-3 ATGW"/>
-        <specific id="3" description="BMD-2"/>
-        <specific id="4" description="BMD w/ 82-mm mortar"/>
-        <specific id="5" description="BMD KShM command"/>
-        <specific id="6" description="BTR-D"/>
-        <specific id="7" description="BMD-3"/>
-        <specific id="8" description="BTR-RD ATGM section vehicle"/>
-        <specific id="9" description="BTR-ZD MANPADS section vehicle"/>
-        <specific id="10" description="BTR-D with 23-mm ZU-23"/>
-        <specific id="11" description="ACRV, 1V119"/>
-      </subcategory>
-      <subcategory id="12" description="BTR-70">
-        <specific id="1" description="BTR-70"/>
-        <specific id="2" description="BTR-70 M1986/1"/>
-        <specific id="3" description="BTR-70Kh chemical reconnaissance"/>
-        <specific id="4" description="BTR-70 w/ AGS-17"/>
-        <specific id="5" description="SPR-2 (poss jammer)"/>
-        <specific id="6" description="BTR-70MS communications"/>
-        <specific id="7" description="BTR-70KShM command/staff"/>
-        <specific id="8" description="BTR-70 BREM repair"/>
-      </subcategory>
-      <subcategory id="13" description="BTR-80">
-        <specific id="1" description="BTR-80"/>
-        <specific id="2" description="BTR-80 M1981/1 command"/>
-        <specific id="3" description="BTR-80 RKhM-4 chemical &amp; reconnaissance"/>
-        <specific id="4" description="BTR-80 UNSh"/>
-        <specific id="5" description="BMM-1 Ambulance"/>
-        <specific id="6" description="BMM-2 Bn Aid Station"/>
-        <specific id="7" description="BMM-3 Mobile Dressing Station"/>
-        <specific id="8" description="BTR-80A"/>
-      </subcategory>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="BRDM-1 Reconnaissance vehicle">
-        <specific id="1" description="BRDM-1"/>
-        <specific id="2" description="BRDM-1-RKhb"/>
-        <specific id="3" description="BRDM-U"/>
-      </subcategory>
-      <subcategory id="16" description="BTR-90"/>
-      <subcategory id="17" description="GMZ TML">
-        <specific id="1" description="GMZ-3"/>
-      </subcategory>
-      <subcategory id="18" description="MT-LBu Tracked Vehicle">
-        <specific id="1" description="Rangir (9S737) C3 Battery Command Post"/>
-        <specific id="2" description="R-330 B Jammer"/>
-        <specific id="3" description="MP22R (1V22R) Division AD"/>
-        <specific id="4" description="MP23R (1V23R) GCI C3"/>
-        <specific id="5" description="MP24R (1V24R) Artillery Control"/>
-        <specific id="6" description="MP25R (1V25R) Division AD"/>
-        <specific id="7" description="9S80 MT-LBu with DOG EAR radar"/>
-      </subcategory>
-      <subcategory id="19" description="PRP-3 with Small Fred radar"/>
-      <subcategory id="20" description="PRP-4"/>
-    </category>
-    <category id="3" description="Armored utility vehicle">
-      <subcategory id="1" description="BTS-2 medium armored tractor"/>
-      <subcategory id="2" description="MTP maintenance vehicle"/>
-      <subcategory id="3" description="IMR combat engineer vehicle">
-        <specific id="1" description="IMR-2 combat engineer vehicle"/>
-      </subcategory>
-      <subcategory id="4" description="IRM engineer reconnaissance vehicle"/>
-      <subcategory id="5" description="BAT-2 combat engineer vehicle"/>
-      <subcategory id="6" description="MT-LB engineer vehicle"/>
-      <subcategory id="7" description="BTU tank-mounted bulldozer"/>
-      <subcategory id="8" description="BTU-55 tank-mounted bulldozer"/>
-      <subcategory id="9" description="BREM-1 recovery and repair vehicle"/>
-      <subcategory id="10" description="M1977 armored recovery vehicle"/>
-      <subcategory id="11" description="T-54-T armored recovery vehicle"/>
-      <subcategory id="12" description="T-55-T armored recovery vehicle"/>
-      <subcategory id="13" description="T-55-TK armored recovery vehicle"/>
-      <subcategory id="14" description="BTR-50PK(B) amphibious recovery vehicle"/>
-      <subcategory id="15" description="BREM-4 light recovery vehicle"/>
-      <subcategory id="16" description="MTP-LB technical support vehicle"/>
-    </category>
-    <category id="4" description="Self-propelled artillery">
-      <subcategory id="1" description="M-1973 152-mm gun (2S3) (SO-152)"/>
-      <subcategory id="2" description="M-1974 122-mm Howitzer (2S1) (SO-122)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="Frog-3 rocket launcher"/>
-      <subcategory id="7" description="Frog-4 rocket launcher"/>
-      <subcategory id="8" description="Frog-5 rocket launcher"/>
-      <subcategory id="9" description="Frog-7 rocket launcher"/>
-      <subcategory id="10" description="SS-1 Scud missile launcher">
-        <specific id="1" description="Scud A"/>
-        <specific id="2" description="Scud B">
-          <extra id="1" description="TEL Decoy"/>
-        </specific>
-        <specific id="3" description="Scud C"/>
-      </subcategory>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="BM-14-17 140-mm rocket launcher"/>
-      <subcategory id="13" description="BM-21 122-mm rocket launcher"/>
-      <subcategory id="14" description="M-1975 120-mm rocket launcher"/>
-      <subcategory id="15" description="BM-24 240-mm rocket launcher"/>
-      <subcategory id="16" description="BM-25 250-mm rocket launcher"/>
-      <subcategory id="17" description="(deleted)"/>
-      <subcategory id="18" description="(deleted)"/>
-      <subcategory id="19" description="(deleted)"/>
-      <subcategory id="20" description="(deleted)"/>
-      <subcategory id="21" description="(deleted)"/>
-      <subcategory id="22" description="(deleted)"/>
-      <subcategory id="23" description="2S4 M-1975 240-mm mortar"/>
-      <subcategory id="24" description="2S7 M-1975 203-mm gun"/>
-      <subcategory id="25" description="M-1976 152-mm gun (2S5)(MSTA-B)"/>
-      <subcategory id="26" description="152-mm 2S19 (aka MSTA-S)"/>
-      <subcategory id="27" description="120-mm Howitzer/mortar (2S9) (SO-120)"/>
-      <subcategory id="28" description="120-mm Howitzer/mortar (2S23)"/>
-      <subcategory id="29" description="300-mm BM-30 14/12-round multiple rocket systems (9A52 Smerch)"/>
-      <subcategory id="30" description="220-mm BM-22 16-round multiple rocket system (M1977 Uragan)"/>
-      <subcategory id="31" description="200-mm 4-round BMD-20 multiple rocket system"/>
-      <subcategory id="32" description="(deleted)"/>
-      <subcategory id="33" description="(deleted)"/>
-      <subcategory id="34" description="(deleted)"/>
-      <subcategory id="35" description="(deleted)"/>
-      <subcategory id="36" description="(deleted)"/>
-      <subcategory id="37" description="(deleted)"/>
-      <subcategory id="38" description="(deleted)"/>
-      <subcategory id="39" description="(deleted)"/>
-      <subcategory id="40" description="(deleted)"/>
-      <subcategory id="41" description="(deleted)"/>
-      <subcategory id="42" description="(deleted)"/>
-      <subcategory id="43" description="(deleted)"/>
-      <subcategory id="44" description="(deleted)"/>
-      <subcategory id="45" description="(deleted)"/>
-      <subcategory id="46" description="(deleted)"/>
-      <subcategory id="47" description="(deleted)"/>
-      <subcategory id="48" description="(deleted)"/>
-      <subcategory id="49" description="(deleted)"/>
-      <subcategory id="50" description="(deleted)"/>
-      <subcategory id="51" description="SS-21"/>
-      <subcategory id="52" description="2S31 120-mm Combination Gun"/>
-      <subcategory id="53" description="9A51 Prima, 122-mm MRL, 50 tube"/>
-    </category>
-    <category id="5" description="Towed artillery">
-      <subcategory id="1" description="S-23 180-mm field gun"/>
-      <subcategory id="2" description="2A36 (M1976) 152-mm field gun"/>
-      <subcategory id="3" description="D-20 152-mm gun-Howitzer"/>
-      <subcategory id="4" description="D-30 122-mm gun-Howitzer"/>
-      <subcategory id="5" description="M-46 130-mm field gun"/>
-      <subcategory id="6" description="D-30 field Howitzer"/>
-      <subcategory id="7" description="T-12/MT-12 100-mm antitank gun"/>
-      <subcategory id="8" description="SD-44 gun">
-        <specific id="1" description="SD-44 85-mm auxiliary-propelled field gun"/>
-      </subcategory>
-      <subcategory id="9" description="M-1966 76.2-mm mountain gun"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="M-240 (aka M1953 or M53) 240-mm mortar"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="2A65 (M1987) 152-mm gun/Howitzer"/>
-      <subcategory id="15" description="(deleted)"/>
-      <subcategory id="16" description="M1943 (D-1) 152-mm Howitzer"/>
-      <subcategory id="17" description="M1937 (ML-20) 152-mm gun/Howitzer"/>
-      <subcategory id="18" description="(deleted)"/>
-      <subcategory id="19" description="D-74 122-mm field gun"/>
-      <subcategory id="20" description="(deleted)"/>
-      <subcategory id="21" description="M1938 (M-30) 122-mm Howitzer"/>
-      <subcategory id="22" description="2B16 120-mm combination gun"/>
-      <subcategory id="23" description="M1944 (BS-3) 100-mm field gun"/>
-      <subcategory id="24" description="D-48 85-mm antitank gun"/>
-      <subcategory id="25" description="M-1945 (D-44) 85-mm antitank gun"/>
-      <subcategory id="26" description="(deleted)"/>
-      <subcategory id="27" description="M1942 (ZIS-3) 76-mm divisional gun"/>
-      <subcategory id="28" description="SM-4-1 130-mm coastal gun"/>
-      <subcategory id="29" description="SPG-9 73-mm recoilless gun"/>
-      <subcategory id="30" description="B-10 82-mm recoilless gun"/>
-      <subcategory id="31" description="B-11 107-mm recoilless gun"/>
-      <subcategory id="32" description="(deleted)"/>
-      <subcategory id="33" description="(deleted)"/>
-      <subcategory id="34" description="(deleted)"/>
-      <subcategory id="35" description="(deleted)"/>
-      <subcategory id="36" description="(deleted)"/>
-      <subcategory id="37" description="(deleted)"/>
-      <subcategory id="38" description="125-mm AT Gun 2A45M"/>
-      <subcategory id="39" description="140-mm 16-round RPU-14 multiple rocket system"/>
-    </category>
-    <category id="6" description="Small wheeled utility vehicle">
-      <subcategory id="1" description="GAZ-69 4x4 light vehicle">
-        <specific id="1" description="Command vehicle"/>
-      </subcategory>
-      <subcategory id="2" description="UAZ-469B 4x4 600-kg light vehicle">
-        <specific id="1" description="Mine detecting system, DIM, on UAZ-469"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="LuAZ-967M amphibious battlefield support vehicle"/>
-      <subcategory id="5" description="LuAZ-969 4x4 light vehicle"/>
-      <subcategory id="6" description="GAZ-69A 4x4 light vehicle"/>
-      <subcategory id="7" description="UAZ-452D 4x4 800-kg light vehicle">
-        <specific id="1" description="Ambulance"/>
-      </subcategory>
-      <subcategory id="8" description="Motorcycles">
-        <specific id="1" description="IMZ-8"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Large wheeled utility vehicle">
-      <subcategory id="1" description="PZM-2 regimental trench-digging machine"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="ZIL-131 6x6 3500-kg truck">
-        <specific id="1" description="Missile fuel truck"/>
-        <specific id="2" description="Calibration vehicle"/>
-        <specific id="3" description="Fuel tanker"/>
-        <specific id="4" description="Compressor Truck"/>
-        <specific id="5" description="Firing Truck"/>
-        <specific id="6" description="Special Fuel Truck"/>
-        <specific id="7" description="Autonomous Test Truck"/>
-        <specific id="8" description="Oxidizer Truck"/>
-        <specific id="9" description="Transporter Truck"/>
-      </subcategory>
-      <subcategory id="5" description="ZIL-151 6x6 2500-kg truck"/>
-      <subcategory id="6" description="ZIL-157 6x6 2500-kg truck"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="GAZ-66 4x4 2000-kg truck">
-        <specific id="1" description="GAZ-66 Signals van"/>
-        <specific id="2" description="GAZ-66 Command van"/>
-        <specific id="3" description="DKV Decon truck"/>
-        <specific id="4" description="ACRV, 1V110"/>
-        <specific id="5" description="TDA-M Smoke"/>
-      </subcategory>
-      <subcategory id="9" description="Ural-375 6x6 4000-kg truck">
-        <specific id="1" description="Field artillery support"/>
-        <specific id="2" description="URAL-375D van"/>
-        <specific id="3" description="URAL-375D hospital van"/>
-        <specific id="4" description="1V111 URAL-375-D FDC"/>
-        <specific id="5" description="URAL-375D maintenance van"/>
-        <specific id="6" description="URAL-375 tranker truck"/>
-        <specific id="7" description="MAF-S water purification truck"/>
-        <specific id="8" description="URAL-375D meteorological van"/>
-        <specific id="9" description="URAL-375 propellant tanker"/>
-        <specific id="10" description="URAL-375 oxidizer tanker"/>
-      </subcategory>
-      <subcategory id="10" description="KamAZ-4310"/>
-      <subcategory id="11" description="Ural-4320 6x6 4500-kg trucks"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="KrAZ-255B 6x6 7500-kg truck">
-        <specific id="1" description="Fuel service"/>
-        <specific id="2" description="Aviation fuel support"/>
-        <specific id="3" description="KrAZ-255 Computer Van"/>
-        <specific id="4" description="KrAZ-255 Crane Truck"/>
-        <specific id="5" description="KrAZ-255 Dump truck"/>
-      </subcategory>
-      <subcategory id="14" description="Ural-375D 6x6 recovery vehicle">
-        <specific id="1" description="Crane/wrecker"/>
-      </subcategory>
-      <subcategory id="15" description="Ural-4320 6x6 recovery vehicle"/>
-      <subcategory id="16" description="KET-L 6x6 recovery truck"/>
-      <subcategory id="17" description="GAZ-53 4x2 3000-kg truck"/>
-      <subcategory id="18" description="Ural-377 6x4 7500-kg truck"/>
-      <subcategory id="19" description="ZIL-133 6x4 8000 kg-truck"/>
-      <subcategory id="20" description="YaAZ-214 6x6 7000-kg truck"/>
-      <subcategory id="21" description="KrAZ-214 6x6 7000-kg truck"/>
-      <subcategory id="22" description="KrAZ-206V 6x6 tractor truck"/>
-      <subcategory id="23" description="KamAZ-5320 6x4 8000-kg truck"/>
-      <subcategory id="24" description="KrAZ-260 6x6 9000-kg truck"/>
-      <subcategory id="25" description="KrAZ-240 6x6 9000-kg truck"/>
-      <subcategory id="26" description="Ural-5323 8x8 9000-kg truck"/>
-      <subcategory id="27" description="KrAZ-257 6x4 12000-kg truck"/>
-      <subcategory id="28" description="ZIL-135 series 8x8 truck"/>
-      <subcategory id="29" description="MAZ-543 8x8 truck"/>
-      <subcategory id="30" description="BAZ-5937 6x6 special purpose vehicle"/>
-      <subcategory id="31" description="BAZ-5939 6x6 special purpose vehicle"/>
-      <subcategory id="32" description="MAZ-535 and MAZ-537 8x8 series"/>
-      <subcategory id="33" description="TMK-2 trench-digging machine"/>
-      <subcategory id="34" description="PZM regimental trench-digging machine"/>
-      <subcategory id="35" description="OPS mobile water-desalination plant"/>
-      <subcategory id="36" description="POU mobile water-desalination plant"/>
-      <subcategory id="37" description="LBU-200 mobile well-drilling equipment"/>
-    </category>
-    <category id="8" description="Small tracked utility vehicle">
-      <subcategory id="1" description="AT-L light artillery tractor"/>
-      <subcategory id="2" description="AT-LM light artillery tractor"/>
-      <subcategory id="3" description="ATS-59G medium artillery tractor"/>
-      <subcategory id="4" description="ATS-59 medium artillery tractor"/>
-      <subcategory id="5" description="MT-S medium transporter"/>
-      <subcategory id="6" description="GT-SM amphibious over-snow vehicle"/>
-      <subcategory id="7" description="GT-T amphibious over-snow vehicle"/>
-      <subcategory id="8" description="MT-L amphibious over-snow vehicle"/>
-    </category>
-    <category id="9" description="Large tracked utility vehicle">
-      <subcategory id="1" description="PTS amphibious transport"/>
-      <subcategory id="2" description="PTS-M amphibious vehicle"/>
-      <subcategory id="3" description="PTS-2 amphibious vehicle"/>
-      <subcategory id="4" description="MTK-2 armored mineclearing vehicle"/>
-      <subcategory id="5" description="AT-T heavy artillery tractor"/>
-      <subcategory id="6" description="MT-T heavy transporter"/>
-      <subcategory id="7" description="GM-569 tractor"/>
-      <subcategory id="8" description="BTM high-speed ditching machine"/>
-      <subcategory id="9" description="BTM-3 high-speed ditching machine"/>
-      <subcategory id="10" description="BTM-TMG high-speed ditching machine"/>
-      <subcategory id="11" description="BTM-TMG2S high-speed ditching machine"/>
-      <subcategory id="12" description="MDK-2 trench-digging machine"/>
-      <subcategory id="13" description="MDK-2M trench-digging machine"/>
-      <subcategory id="14" description="MDK-3 trench-digging machine"/>
-      <subcategory id="15" description="BAT-1 high-speed tractor-mounted bulldozer"/>
-      <subcategory id="16" description="BAT-M high-speed tractor-mounted bulldozer"/>
-      <subcategory id="17" description="OLT high-speed tractor-mounted bulldozer"/>
-      <subcategory id="18" description="OST high-speed tractor-mounted bulldozer"/>
-      <subcategory id="19" description="OTT high-speed tractor-mounted bulldozer"/>
-      <subcategory id="20" description="(deleted)"/>
-      <subcategory id="21" description="PMR Minelayer"/>
-      <subcategory id="22" description="AT-S Medium Tractor"/>
-      <subcategory id="23" description="K-61 Amphibious"/>
-    </category>
-    <category id="10" description="Mortar">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="M-36 82-mm"/>
-      <subcategory id="8" description="M-37 82-mm"/>
-      <subcategory id="9" description="M-37 82-mm &quot;new&quot;"/>
-      <subcategory id="10" description="M-41 82-mm"/>
-      <subcategory id="11" description="AM 2B9 &quot;Vasilek&quot; 82-mm automatic"/>
-      <subcategory id="12" description="M-38 107-mm"/>
-      <subcategory id="13" description="2S12 120-mm"/>
-      <subcategory id="15" description="120mm Mortar M1943"/>
-    </category>
-    <category id="11" description="Mine plow">
-      <subcategory id="1" description="KMT-5M"/>
-    </category>
-    <category id="12" description="Mine rake"/>
-    <category id="13" description="Mine roller"/>
-    <category id="14" description="Cargo trailer">
-      <subcategory id="1" description="0 - 0.5 ton">
-        <specific id="1" description="Trailer, cargo, 1 axle, 0.5 ton, GAZ-704"/>
-      </subcategory>
-      <subcategory id="2" description="0.51 - 2 ton"/>
-      <subcategory id="3" description="2.01 - 5 ton">
-        <specific id="1" description="Trailer, cargo, 2 axle, 4 ton, SMZ-710Z"/>
-        <specific id="2" description="Amphibious trailer PKP"/>
-      </subcategory>
-      <subcategory id="4" description="5.02 - 10 ton"/>
-      <subcategory id="5" description="greater than 10 tons"/>
-    </category>
-    <category id="15" description="Fuel trailer">
-      <subcategory id="1" description="1-1000 gallons">
-        <specific id="1" description="MNUM-50M"/>
-      </subcategory>
-      <subcategory id="2" description="1001 - 5000 gallons">
-        <specific id="1" description="PTs-4.2-754V, 4200 liter trailer"/>
-      </subcategory>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="16" description="Generator trailer">
-      <subcategory id="1" description="0 - 100 KW"/>
-      <subcategory id="2" description="greater than 100 KW"/>
-    </category>
-    <category id="17" description="Water trailer">
-      <subcategory id="1" description="1-1000 gallons">
-        <specific id="1" description="Trailer, water, 1200 liter, ACMAT-ALM"/>
-        <specific id="2" description="Trailer, water, 950 liter, VMG-40-51"/>
-      </subcategory>
-      <subcategory id="2" description="1001- 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="18" description="Engineer equipment">
-      <subcategory id="1" description="Mine clearing line charge"/>
-      <subcategory id="2" description="Dozer blade kit"/>
-      <subcategory id="3" description="Lane marking system"/>
-    </category>
-    <category id="19" description="Heavy equipment transport trailer">
-      <subcategory id="1" description="Reload vehicle"/>
-      <subcategory id="2" description="Lowboy, Heavy Equipment, Transporter, ChMZAP-5247C"/>
-    </category>
-    <category id="20" description="Maintenance equipment trailer">
-      <subcategory id="1" description="Welding trailer"/>
-      <subcategory id="2" description="Compressor"/>
-      <subcategory id="3" description="Tools/parts trailer">
-        <specific id="1" description="Trailer, van, missile, OdAZ-740"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Limber"/>
-    <category id="22" description="Chemical decontamination trailer"/>
-    <category id="23" description="(deleted)"/>
-    <category id="24" description="(deleted)"/>
-    <category id="25" description="Train-Car">
-      <subcategory id="1" description="Boxcar"/>
-      <subcategory id="2" description="Tanker"/>
-      <subcategory id="3" description="Passenger"/>
-    </category>
-    <category id="26" description="Train-Caboose"/>
-    <category id="27" description="Civilian Vehicle">
-      <subcategory id="1" description="Sedan"/>
-    </category>
-    <category id="28" description="Air Defense / Missile Defense Unit Equipment">
-      <subcategory id="1" description="SA-2 Guideline SAM System">
-        <specific id="1" description="SA-2 Battery C3 Van"/>
-        <specific id="2" description="SA-2 Missile Launcher"/>
-        <specific id="3" description="Fan Song Engagement Radar">
-          <extra id="1" description="Fan Song B"/>
-          <extra id="2" description="Fan Song C/E"/>
-          <extra id="3" description="Fan Song F"/>
-        </specific>
-      </subcategory>
-      <subcategory id="2" description="SA-3 Goa SAM System">
-        <specific id="1" description="SA-3 Battery C3 Van"/>
-        <specific id="2" description="SA-3 Missile Launcher">
-          <extra id="1" description="Twin-Rail Launcher"/>
-          <extra id="2" description="Quad-Rail Launcher"/>
-        </specific>
-        <specific id="3" description="Low Blow Engagement Radar"/>
-      </subcategory>
-      <subcategory id="3" description="SA-5 Gammon SAM System">
-        <specific id="1" description="SA-5 Battalion C3 Van"/>
-        <specific id="2" description="SA-5 Missile Launcher"/>
-        <specific id="3" description="Square Pair Engagement Radar"/>
-      </subcategory>
-      <subcategory id="4" description="SA-10 Grumble SAM System">
-        <specific id="1" description="SA-10 Battery C3 Vehicle"/>
-        <specific id="2" description="SA-10 Missile Launcher">
-          <extra id="1" description="SA-10A Towed TEL (5P85T)"/>
-          <extra id="2" description="SA-10B SP TEL (5P85S)"/>
-        </specific>
-        <specific id="3" description="Flap Lid Engagement Radar (36N6E)">
-          <extra id="1" description="Flap Lid A Radar (tower mounted)"/>
-          <extra id="2" description="Flap Lid B (SP vehicle)"/>
-          <extra id="3" description="Tomb Stone Radar (SA-10C)"/>
-        </specific>
-        <specific id="4" description="Clam Shell Acquisition Radar"/>
-        <specific id="5" description="SA-10 Missile Transport/Reload Vehicle"/>
-      </subcategory>
-      <subcategory id="5" description="SA-4 Ganef SAM System">
-        <specific id="1" description="SA-4 Battery C3 Vehicle"/>
-        <specific id="2" description="SA-4 TEL (2P24)"/>
-        <specific id="3" description="Pat Hand Engagement Radar (1S32M)"/>
-        <specific id="4" description="SA-4 Missile Transporter/Loader Vehicle (2T6)"/>
-      </subcategory>
-      <subcategory id="6" description="SA-6 Gainful SAM System">
-        <specific id="1" description="SA-6 Battery C3 Vehicle"/>
-        <specific id="2" description="SA-6 TEL">
-          <extra id="1" description="SA-6A TEL (2P25)"/>
-          <extra id="2" description="SA-6B TEL (9A310M1 w/Fire Dome Radar)"/>
-        </specific>
-        <specific id="3" description="Straight Flush Engagement Radar"/>
-        <specific id="4" description="SA-6 Missile Transporter/Loader Vehicle"/>
-      </subcategory>
-      <subcategory id="7" description="SA-8 Gecko SAM System">
-        <specific id="1" description="SA-8 Battery C3 Vehicle"/>
-        <specific id="2" description="SA-8 TLAR">
-          <extra id="1" description="SA-8A TLAR"/>
-          <extra id="2" description="SA-8B TLAR"/>
-        </specific>
-        <specific id="3" description="SA-8 Transloader Vehicle"/>
-      </subcategory>
-      <subcategory id="8" description="SA-11 Gadfly SAM System">
-        <specific id="1" description="SA-11 Battery C3 Vehicle (9S470M1)"/>
-        <specific id="2" description="SA-11 TELAR (9A310M1)"/>
-        <specific id="3" description="SA-11 Loader/Launcher (9A39M1)"/>
-        <specific id="4" description="TUBE ARM Radar"/>
-      </subcategory>
-      <subcategory id="9" description="SA-12 Gladiator/Giant SAM System (S-300V)">
-        <specific id="1" description="Battalion">
-          <extra id="1" description="Battalion Command Post Vehicle (9S457-1)"/>
-          <extra id="2" description="Bill Board Acquisition Radar (9S15MT)"/>
-          <extra id="3" description="High Screen Sector Search Radar (9S19MT)"/>
-        </specific>
-        <specific id="2" description="Battery">
-          <extra id="1" description="Grill Pan Engagement Radar (9S32)"/>
-          <extra id="2" description="SA-12A Gladiator TELAR (9A83-1)"/>
-          <extra id="3" description="SA-12B Giant TELAR (9A82)"/>
-          <extra id="4" description="Gladiator Missile Loader/Launcher (9A85)"/>
-          <extra id="5" description="Giant Missile Loader/Launcher (9A84)"/>
-          <extra id="6" description="SA-12B (rail w/SS-24)"/>
-        </specific>
-      </subcategory>
-      <subcategory id="10" description="SA-15 Gauntlet SAM System">
-        <specific id="1" description="SA-15 Battery C3 Vehicle"/>
-        <specific id="2" description="SA-15 TELAR"/>
-        <specific id="3" description="8-Round Missile Reload Vehicle (9T224)"/>
-        <specific id="4" description="28-Round Missile Reload Transporter (9T225)"/>
-      </subcategory>
-      <subcategory id="11" description="SA-17 Grizzly SAM System">
-        <specific id="1" description="SA-17 Command Post Vehicle"/>
-        <specific id="2" description="Chair Back Engagement Radar">
-          <extra id="1" description="Tracked (SP) Chair Back Vehicle"/>
-          <extra id="2" description="Wheeled (towed) Chair Back Trailer"/>
-        </specific>
-        <specific id="3" description="SA-17 TELAR"/>
-        <specific id="4" description="SA-17 Launcher/Loader Vehicle (TEL)">
-          <extra id="1" description="Tracked (SP) LL"/>
-          <extra id="2" description="Wheeled (towed) LL"/>
-        </specific>
-      </subcategory>
-      <subcategory id="12" description="Self-Propelled VSHORAD Gun/Missile System">
-        <specific id="1" description="ZSU-23/4 Quad 23mm AAA"/>
-        <specific id="2" description="SA-9 Gaskin SAM System">
-          <extra id="1" description="SA-9A TEL (w/Flat Box-A)"/>
-          <extra id="2" description="SA-9B TEL (w/o Flat Box-A)"/>
-        </specific>
-        <specific id="3" description="SA-13 Gopher SAM System">
-          <extra id="1" description="SA-13 TELAR w/Flat Box B"/>
-          <extra id="2" description="SA-13 TELAR w/o Flat Box"/>
-        </specific>
-        <specific id="4" description="2S6 &quot;Tunguska&quot; Quad 30mm/SA-19 AD System"/>
-        <specific id="5" description="ZSU-57/2 twin-57mm AA Gun System"/>
-        <specific id="6" description="BTR-40A w/ZPTU-2 twin-14.5mm AA mount"/>
-        <specific id="7" description="BTR-152A w/ZPTU-2 twin-14.5mm AA mount"/>
-        <specific id="8" description="BTR-152D w/ZPU-2 twin-14.5mm AA mount"/>
-        <specific id="9" description="BTR-152 w/ZU-23 twin-23mm AA mount"/>
-        <specific id="10" description="BTR-152 w/M53 quad-12.7mm MG mount"/>
-      </subcategory>
-      <subcategory id="13" description="Towed VSHORAD Gun/Missile System">
-        <specific id="1" description="KS-30 130mm AA Gun"/>
-        <specific id="2" description="KS-19 100mm AA Gun"/>
-        <specific id="3" description="KS-12 85mm AA Gun"/>
-        <specific id="4" description="S-60 57mm AA Gun"/>
-        <specific id="5" description="M1939 37mm AA Gun"/>
-        <specific id="6" description="ZU-23 twin 23mm AA Gun"/>
-        <specific id="7" description="14.5mm ZPU AA MG">
-          <extra id="1" description="ZPU-1"/>
-          <extra id="2" description="ZPU-2"/>
-          <extra id="3" description="ZPU-4"/>
-        </specific>
-      </subcategory>
-      <subcategory id="14" description="SSC-3 Styx A/B/C/ variant launcher"/>
-      <subcategory id="15" description="SS-N-3B/C Shaddock/Sepal launcher"/>
-      <subcategory id="16" description="SS-N-22 Sunburn launcher"/>
-      <subcategory id="17" description="SSC-X-5 (SS-NX-26) launcher"/>
-      <subcategory id="18" description="SSC-6 (SS-N-25) launcher"/>
-      <subcategory id="19" description="P-270 Moskit (Kh-41) launcher"/>
-      <subcategory id="20" description="M51 launcher"/>
-      <subcategory id="21" description="SA-20 Gargoyle SAM System">
-        <specific id="1" description="SA-20 Group of Battalions CP Vehicle (54K6)"/>
-        <specific id="2" description="SA-20 Missile Launcher (5P85)"/>
-        <specific id="3" description="SA-20 Tomb Stone Engagement Radar/Battalion CP (30N6E1)"/>
-        <specific id="4" description="SA-20 Missile Transport/Reload Vehicle (22T6)"/>
-        <specific id="5" description="SA-20 Big Bird Acquisition Radar (64N6)"/>
-      </subcategory>
-    </category>
-    <category id="29" description="Command, Control, Communications and Intelligence (C3I) System"/>
-    <category id="30" description="Operations Facility"/>
-    <category id="31" description="Intelligence Facility"/>
-    <category id="32" description="Surveillance Facility"/>
-    <category id="33" description="Communications Facility"/>
-    <category id="34" description="Command Facility"/>
-    <category id="35" description="C4I Facility"/>
-    <category id="36" description="Control Facility"/>
-    <category id="37" description="Fire Control Facility"/>
-    <category id="38" description="Missile Defense Facility"/>
-    <category id="39" description="Field Command Post"/>
-    <category id="40" description="Observation Post"/>
-    <category id="41" description="General Wheeled Vehicles">
-      <subcategory id="1" description="Small truck"/>
-      <subcategory id="2" description="Medium truck"/>
-      <subcategory id="3" description="Large truck"/>
-      <subcategory id="4" description="TEL crane truck"/>
-      <subcategory id="5" description="Missile fuel truck"/>
-      <subcategory id="6" description="Tractor trailer truck"/>
-      <subcategory id="7" description="Missile command truck"/>
-      <subcategory id="8" description="Missile warhead truck"/>
-      <subcategory id="9" description="Artillery command and reconnaissance vehicle"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="222">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="MiG-31 Foxhound">
-        <specific id="1" description="MiG-31 Foxhound-A"/>
-        <specific id="2" description="MiG-31M Foxhound-B"/>
-      </subcategory>
-      <subcategory id="2" description="MiG-29 Fulcrum">
-        <specific id="1" description="MiG-29 Fulcrum A"/>
-        <specific id="2" description="MiG-29UB Fulcrum B"/>
-        <specific id="3" description="MiG-29 Fulcrum C"/>
-        <specific id="4" description="MiG-29K Fulcrum D"/>
-        <specific id="5" description="MiG-29M advanced version"/>
-        <specific id="6" description="MiG-29 thrust vectoring"/>
-        <specific id="7" description="MiG-29KU ship-based trainer"/>
-      </subcategory>
-      <subcategory id="3" description="Su-27 Flanker">
-        <specific id="1" description="Su-27 Flanker A prototypes"/>
-        <specific id="2" description="Su-27 Flanker B production"/>
-        <specific id="3" description="Su-27UB Flanker C"/>
-        <specific id="4" description="Su-27K Flanker D"/>
-        <specific id="5" description="Su-27IB"/>
-      </subcategory>
-      <subcategory id="4" description="MiG-25 Foxbat">
-        <specific id="1" description="MiG-25P Foxbat A"/>
-        <specific id="2" description="MiG-25RB Foxbat B"/>
-        <specific id="3" description="MiG-25RBV Foxbat B"/>
-        <specific id="4" description="MiG-25BBT Foxbat B"/>
-        <specific id="5" description="MiG-25R Foxbat B"/>
-        <specific id="6" description="MiG-25PU Foxbat C"/>
-        <specific id="7" description="MiG-25RU Foxbat C"/>
-        <specific id="8" description="MiG-25U Foxbat C"/>
-        <specific id="9" description="MiG-25RBK Foxbat D"/>
-        <specific id="10" description="MiG-25RBS Foxbat D"/>
-        <specific id="11" description="MiG-25RBSh Foxbat D"/>
-        <specific id="12" description="MiG-25RBF Foxbat D"/>
-        <specific id="13" description="MiG-25PD Foxbat E"/>
-        <specific id="14" description="MiG-25PDS Foxbat E"/>
-        <specific id="15" description="MiG-25BM Foxbat F"/>
-      </subcategory>
-      <subcategory id="5" description="MiG-23/24 Flogger">
-        <specific id="1" description="MiG-23M Flogger B"/>
-        <specific id="2" description="MiG-23MF Flogger B"/>
-        <specific id="3" description="MiG-23UB Flogger C"/>
-        <specific id="4" description="MiG-23UM Flogger C"/>
-        <specific id="5" description="MiG-23MF Flogger E"/>
-        <specific id="6" description="MiG-23MS Flogger E"/>
-        <specific id="7" description="MiG-23BN Flogger F"/>
-        <specific id="8" description="MiG-23BM Flogger F"/>
-        <specific id="9" description="MiG-23B Flogger F"/>
-        <specific id="10" description="MiG-23ML Flogger G"/>
-        <specific id="11" description="MiG-23P Flogger G"/>
-        <specific id="12" description="MiG-23BK Flogger H"/>
-        <specific id="13" description="MiG-23BN Flogger H"/>
-        <specific id="14" description="MiG-23MLD Flogger K"/>
-        <specific id="15" description="MiG-24 (export MiG-23)"/>
-      </subcategory>
-      <subcategory id="6" description="MiG-21 Fishbed/Mongol">
-        <specific id="1" description="MiG-21F Fishbed C"/>
-        <specific id="2" description="MiG-21PF Fishbed D"/>
-        <specific id="3" description="MiG-21PFM Fishbed F"/>
-        <specific id="4" description="MiG-21R Fishbed H"/>
-        <specific id="5" description="MiG-21S Fishbed H"/>
-        <specific id="6" description="MiG-21RF Fishbed H"/>
-        <specific id="7" description="MiG-21SM Fishbed J"/>
-        <specific id="8" description="MiG-21M (Type 96/Hindustan Aeronautics-India)"/>
-        <specific id="9" description="MiG-21PFMA Fishbed J"/>
-        <specific id="10" description="MiG-21MF Fishbed J"/>
-        <specific id="11" description="MiG-21SMT Fishbed K"/>
-        <specific id="12" description="MiG-21SMB Fishbed K"/>
-        <specific id="13" description="MiG-21bis-A Fishbed L"/>
-        <specific id="14" description="MiG-21bis-B Fishbed N"/>
-        <specific id="15" description="MiG-21U Mongol A"/>
-        <specific id="16" description="MiG-21US Mongol B"/>
-        <specific id="17" description="MiG-21UM Mongol B"/>
-      </subcategory>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="MiG-19 Farmer"/>
-      <subcategory id="15" description="MiG-17 Fresco"/>
-      <subcategory id="16" description="MiG15 Fagot"/>
-    </category>
-    <category id="2" description="Attack/Strike">
-      <subcategory id="1" description="MiG-27 Flogger">
-        <specific id="1" description="MiG-27 Flogger D"/>
-        <specific id="2" description="MiG-27K Flogger D"/>
-        <specific id="3" description="MiG-27D Flogger J"/>
-        <specific id="4" description="MiG-27M (Bahadur-India)"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="Su-17 Fitter">
-        <specific id="1" description="Su-17 (S-32, Fitter C)"/>
-        <specific id="2" description="Su-17M (S-32M, Fitter C)"/>
-        <specific id="3" description="Su-17R Fitter C"/>
-        <specific id="4" description="Su-17M-2/M-2D (S-32M2, Fitter D)"/>
-        <specific id="5" description="Su-17UM-2D (U-32, Fitter E)"/>
-        <specific id="6" description="Su-17UM-3 Fitter G"/>
-        <specific id="7" description="Su-17M-3 (S-52, Fitter H)"/>
-        <specific id="8" description="Su-17-1/M-2 Fitter H"/>
-        <specific id="9" description="Su-17M-4 (S-54, Fitter K)"/>
-      </subcategory>
-      <subcategory id="5" description="Su-20 Fitter C (Export Su-17)">
-        <specific id="1" description="Su-20 (S32Mk, Fitter-C)"/>
-        <specific id="2" description="Su-20R"/>
-      </subcategory>
-      <subcategory id="6" description="Su-22 Fitter">
-        <specific id="1" description="Su-22U Fitter E"/>
-        <specific id="2" description="Su-22 Fitter F"/>
-        <specific id="3" description="Su-22UM-3K Fitter G"/>
-        <specific id="4" description="Su-22 Fitter G"/>
-        <specific id="5" description="Su-22M-3 Fitter J"/>
-        <specific id="6" description="Su-22M-4 Fitter K"/>
-      </subcategory>
-      <subcategory id="7" description="Su-24 Fencer">
-        <specific id="1" description="Su-24 Fencer B"/>
-        <specific id="2" description="Su-24 Fencer C"/>
-        <specific id="3" description="Su-24MK Fencer D"/>
-        <specific id="4" description="Su-24MR Fencer E"/>
-        <specific id="5" description="Su-24MP Fencer F"/>
-        <specific id="6" description="Su-24K Fencer K"/>
-      </subcategory>
-      <subcategory id="8" description="Su-25 Frogfoot">
-        <specific id="1" description="Su-25 Frogfoot A"/>
-        <specific id="2" description="Su-25UB Frogfoot B"/>
-        <specific id="3" description="Su-25K (export &quot;A&quot;)"/>
-        <specific id="4" description="Su-25UBK (export &quot;UB&quot;)"/>
-        <specific id="5" description="Su-25UT Frogfoot B"/>
-        <specific id="6" description="Su-25UTG (tailhook)"/>
-        <specific id="7" description="Su-25T (Su-34) (antitank)"/>
-        <specific id="8" description="Su-25BM (target towing)"/>
-      </subcategory>
-      <subcategory id="9" description="Su-37 multirole fighter"/>
-      <subcategory id="10" description="Yak-38 Forger">
-        <specific id="1" description="Yak-38 Forger A"/>
-        <specific id="2" description="Yak-38 Forger B"/>
-      </subcategory>
-      <subcategory id="11" description="Su-35"/>
-      <subcategory id="12" description="Su-7 Fitter A"/>
-    </category>
-    <category id="3" description="Bomber">
-      <subcategory id="1" description="Tu-160 Blackjack"/>
-      <subcategory id="2" description="Tu-16 Badger">
-        <specific id="1" description="Tu-16A Badger A"/>
-        <specific id="2" description="Tu-16N Badger A, tanker"/>
-        <specific id="3" description="Tu-16T Badger A, torpedo"/>
-        <specific id="4" description="Tu-16KS-1 Badger B"/>
-        <specific id="5" description="Tu-16 Korvet, Search and Rescue (SAR)"/>
-        <specific id="6" description="Tu-16 K-10 Badger C"/>
-        <specific id="7" description="Tu-16R Badger D"/>
-        <specific id="8" description="Tu-16 Badger E, photo reconnaissance"/>
-        <specific id="9" description="Tu-16R Badger F, ELINT"/>
-        <specific id="10" description="Tu-16 Badger-G, ASM carrier"/>
-        <specific id="11" description="Tu-16K Badger G Mod"/>
-        <specific id="12" description="Tu-16PP Badger H, chaff dispenser"/>
-        <specific id="13" description="Tu-16PP Badger J, ECM"/>
-        <specific id="14" description="Tu-16R Badger K, reconnaissance"/>
-        <specific id="15" description="Tu-16 Badger L, EW"/>
-      </subcategory>
-      <subcategory id="3" description="Tu-26 (Tu-22M) Backfire">
-        <specific id="1" description="Tu-22M-1 Backfire A"/>
-        <specific id="2" description="Tu-22M-2 Backfire B"/>
-        <specific id="3" description="Tu-22M-3 Backfire C"/>
-      </subcategory>
-      <subcategory id="4" description="Tu-22 Blinder">
-        <specific id="1" description="Tu-22 Blinder-A"/>
-        <specific id="2" description="Tu-22 Blinder-B"/>
-        <specific id="3" description="Tu-22 Blinder-C, reconnaissance"/>
-        <specific id="4" description="Tu-22U Blinder-D"/>
-        <specific id="5" description="Tu-22 Blinder-E, EW/reconnaissance"/>
-      </subcategory>
-      <subcategory id="5" description="Tu-95 or Tu-142 Bear">
-        <specific id="1" description="Tu-95 Bear D, sea reconnaissance"/>
-        <specific id="2" description="Tu-95 Bear E (&quot;A&quot; conversion)"/>
-        <specific id="3" description="Tu-95 Bear G (&quot;B/C&quot; ELINT conversion)"/>
-        <specific id="4" description="Tu-95MS Bear H"/>
-        <specific id="5" description="Tu-142 Bear F, ASW"/>
-        <specific id="6" description="Tu-142 Bear F Mod 1"/>
-        <specific id="7" description="Tu-142M Bear F Mod 2"/>
-        <specific id="8" description="Tu-142 Bear F Mod 3"/>
-        <specific id="9" description="Tu-142 Bear F Mod 4"/>
-        <specific id="10" description="Tu-142 Bear J, VLF Communications"/>
-        <specific id="11" description="Tu-142K Bear H"/>
-      </subcategory>
-      <subcategory id="6" description="Il-28 Beagle"/>
-    </category>
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="An-124 Condor">
-        <specific id="1" description="An-124"/>
-      </subcategory>
-      <subcategory id="2" description="An-22 Cock">
-        <specific id="1" description="An-22"/>
-      </subcategory>
-      <subcategory id="3" description="Il-76 Candid">
-        <specific id="1" description="Il-76 Candid A"/>
-        <specific id="2" description="Il-76T Candid A, civil reserve"/>
-        <specific id="3" description="Il-76M Candid B"/>
-        <specific id="4" description="Il-76TD Candid A, civil reserve"/>
-        <specific id="5" description="Il-76MD Candid B"/>
-      </subcategory>
-      <subcategory id="4" description="Il-20/22 Coot">
-        <specific id="1" description="Il-20 Coot A, ELINT/recon (Il-18 variant)"/>
-        <specific id="2" description="Il-22 Coot B"/>
-      </subcategory>
-      <subcategory id="5" description="An-12 Cub">
-        <specific id="1" description="An-12BP"/>
-        <specific id="2" description="An-12A Cub A, ELINT"/>
-        <specific id="3" description="An-12B Cub B, SNA ELINT"/>
-        <specific id="4" description="An-12C Cub C, SNA ECM"/>
-        <specific id="5" description="An-12D Cub D, SNA ECM"/>
-      </subcategory>
-      <subcategory id="6" description="An-24 Coke">
-        <specific id="1" description="An-24"/>
-      </subcategory>
-      <subcategory id="7" description="An-26 Curl">
-        <specific id="1" description="An-26 Curl A, manual"/>
-        <specific id="2" description="An-26B Curl A, pallets"/>
-        <specific id="3" description="An-26 Curl B, SIGINT"/>
-      </subcategory>
-      <subcategory id="8" description="An-32 Cline">
-        <specific id="1" description="An-32"/>
-        <specific id="2" description="An-32 Sutlej (India)"/>
-      </subcategory>
-      <subcategory id="9" description="An-70T">
-        <specific id="1" description="An-70T"/>
-      </subcategory>
-      <subcategory id="10" description="An-72 Coaler">
-        <specific id="1" description="An-72"/>
-      </subcategory>
-      <subcategory id="11" description="An-225 Cossack">
-        <specific id="1" description="An-225"/>
-      </subcategory>
-      <subcategory id="12" description="Il-78 Midas">
-        <specific id="1" description="Il-78 (tanker)"/>
-      </subcategory>
-      <subcategory id="13" description="An-2/3 Colt">
-        <specific id="1" description="An-2 Colt"/>
-        <specific id="2" description="An-3 Colt"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Antisubmarine/patrol/observation">
-      <subcategory id="1" description="II-38 May">
-        <specific id="1" description="Il-38"/>
-      </subcategory>
-      <subcategory id="2" description="Be-12 Mail">
-        <specific id="1" description="Be-12"/>
-      </subcategory>
-      <subcategory id="3" description="Be-42 Mermaid">
-        <specific id="1" description="Be-42"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="A-40 Albatross">
-        <specific id="1" description="A-40"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Surveillance/C2">
-      <subcategory id="1" description="A-50 Mainstay">
-        <specific id="1" description="A-50 AEW&amp;C"/>
-      </subcategory>
-      <subcategory id="2" description="An-74 Madcap">
-        <specific id="1" description="An-74"/>
-      </subcategory>
-      <subcategory id="3" description="TU-126 Moss">
-        <specific id="1" description="Tu-126"/>
-      </subcategory>
-    </category>
-    <category id="20" description="Attack helicopter">
-      <subcategory id="1" description="Mi-28 Havoc">
-        <specific id="1" description="Mi-28"/>
-      </subcategory>
-      <subcategory id="2" description="Mi-24/25/35 Hind">
-        <specific id="1" description="Mi-24 Hind A"/>
-        <specific id="2" description="Mi-24 Hind B"/>
-        <specific id="3" description="Mi-24 Hind C"/>
-        <specific id="4" description="Mi-24D Hind D (1st gunship)"/>
-        <specific id="5" description="Mi-24W Hind E"/>
-        <specific id="6" description="Mi-24P Hind F"/>
-        <specific id="7" description="Mi-24RSH Hind G1 (NBC armored)"/>
-        <specific id="8" description="Mi-24RSH Hind G2 (reconnaissance/spotter)"/>
-        <specific id="9" description="Mi-25 (export Mi-24D)"/>
-        <specific id="10" description="Mi-35 (export Mi-24W)"/>
-        <specific id="11" description="Mi-35P (export Mi-24P)"/>
-      </subcategory>
-      <subcategory id="3" description="Ka-50 Hokum">
-        <specific id="1" description="Ka-50 Hokum A close air support"/>
-        <specific id="2" description="Ka-50 Hokum B tandem trainer"/>
-      </subcategory>
-      <subcategory id="4" description="Ka-25 Hormone">
-        <specific id="1" description="Ka-25BSh Hormone A, ASW"/>
-        <specific id="2" description="Ka-25 Hormone B (targeting &amp; missile guidance)"/>
-        <specific id="3" description="Ka-25PS Hormone C (targeting &amp; missile guidance)"/>
-        <specific id="4" description="Ka-25PL Hormone A"/>
-        <specific id="5" description="Ka-25TS Hormone B"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Utility helicopter">
-      <subcategory id="1" description="Mi-8/9/17/171 Hip">
-        <specific id="1" description="Mi-8 Hip C (assault)"/>
-        <specific id="2" description="Mi-8 Hip D (airborne communications)"/>
-        <specific id="3" description="Mi-8 Hip E &quot;C&quot; development, 12.7"/>
-        <specific id="4" description="Mi-8TBK (Mi-17) (&quot;E&quot; uprated)"/>
-        <specific id="5" description="Mi-8 Hip F (&quot;E&quot; export)"/>
-        <specific id="6" description="Mi-8 Hip J (ECM)"/>
-        <specific id="7" description="Mi-8PP Hip K (ECM)"/>
-        <specific id="8" description="Mi-9 Hip G (special duty &amp; airborne communications)"/>
-        <specific id="9" description="Mi-17 Hip H (MI-8 update)"/>
-        <specific id="10" description="Mi-17P (Hip K derivative)"/>
-        <specific id="11" description="Mi-171 Hip H (hospital)"/>
-        <specific id="12" description="Mi-17 (EW)"/>
-      </subcategory>
-      <subcategory id="2" description="Mi-14 Haze">
-        <specific id="1" description="Mi-14PL Haze A (ASW)"/>
-        <specific id="2" description="Mi-14PW (Polish Mi-14PL)"/>
-        <specific id="3" description="Mi-14BT Haze B (MCM)"/>
-        <specific id="4" description="Mi-14PS Haze C (SAR)"/>
-      </subcategory>
-      <subcategory id="3" description="Mi-26 Halo">
-        <specific id="1" description="Mi-26 heavy transport"/>
-        <specific id="2" description="Mi-26TZ tanker"/>
-        <specific id="3" description="Mi-26 communications &amp; support"/>
-      </subcategory>
-      <subcategory id="4" description="Mi-6 Hook">
-        <specific id="1" description="Mi-6 Hook A (export)"/>
-        <specific id="2" description="Mi-6 Hook B (command support)"/>
-        <specific id="3" description="Mi-6 Hook C (&quot;B&quot; development, command support)"/>
-      </subcategory>
-      <subcategory id="5" description="Mi-2 Hoplite">
-        <specific id="1" description="Mi-2 (only mfg in Poland)"/>
-      </subcategory>
-      <subcategory id="6" description="Mi-4 Hound">
-        <specific id="1" description="Mi-4"/>
-      </subcategory>
-      <subcategory id="7" description="Mi-10 Harke">
-        <specific id="1" description="Mi-10"/>
-        <specific id="2" description="Mi-10K"/>
-      </subcategory>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="Ka-27/28/29 Helix">
-        <specific id="1" description="Ka-27PL Helix A (ASW)"/>
-        <specific id="2" description="Ka-27PS Helix D (SAR)"/>
-        <specific id="3" description="Ka-28 Helix A (export Ka-27PL)"/>
-        <specific id="4" description="Ka-29TB Helix B (EW &amp; assault)"/>
-      </subcategory>
-      <subcategory id="10" description="Mi-34 Hermit">
-        <specific id="1" description="Mi-34 (1 engine)"/>
-        <specific id="2" description="Mi-34V (2 engine)"/>
-      </subcategory>
-      <subcategory id="11" description="Mi-38">
-        <specific id="1" description="Mi-38 (2 turbine, replaces Mi-8/17)"/>
-      </subcategory>
-      <subcategory id="12" description="Ka-26/126 Hoodlum">
-        <specific id="1" description="Ka-26 Hoodlum A (reciprocating)"/>
-        <specific id="2" description="Ka-126 Hoodlum B (turbine)"/>
-      </subcategory>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Tu-134 Crusty">
-        <specific id="1" description="Tu-134UBL (bomber pilot)"/>
-        <specific id="2" description="Tu-134Bsh (bomber navigator)"/>
-      </subcategory>
-      <subcategory id="2" description="Yak-18 Max"/>
-    </category>
-    <category id="57" description="Non-Combatant Commercial Aircraft">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Passenger Airliner">
-        <specific id="1" description="Tupolev TU-154 Careless">
-          <extra id="1" description="Tupolev TU-154M Careless"/>
-        </specific>
-        <specific id="2" description="Illyushin IL-62 Classic"/>
-        <specific id="3" description="Yakovlev Yak-42 Clobber"/>
-        <specific id="4" description="Illyushin IL-86 Camber"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="222">
-    <category id="1" description="Carrier">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Kuznetsov class (CV)">
-        <specific id="1" description="Admiral Kuznetsov (ex-Tbilisi, ex-Leonid Brezhnev)"/>
-        <specific id="2" description="Varyag (ex-Riga)"/>
-      </subcategory>
-      <subcategory id="4" description="Modified Kiev class (CV)">
-        <specific id="1" description="Admiral Gorshkov (ex-Baku)"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Guided-missile Cruiser">
-      <subcategory id="1" description="Slava class (CG)">
-        <specific id="1" description="Slava"/>
-        <specific id="2" description="Marshal Ustinov"/>
-        <specific id="3" description="Chervona Ukraina"/>
-        <specific id="4" description="Vilna Ukraina"/>
-      </subcategory>
-      <subcategory id="2" description="Kirov class">
-        <specific id="1" description="Admiral Ushakov"/>
-        <specific id="2" description="Admiral Lazarev"/>
-        <specific id="3" description="Admiral Nakimov"/>
-        <specific id="4" description="Peter Velikiy"/>
-      </subcategory>
-      <subcategory id="3" description="Kara class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="Ochakov"/>
-        <specific id="3" description="Kerch"/>
-        <specific id="4" description="Azov"/>
-        <specific id="5" description="Petropavlovsk"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="Vladivostok (ex-Tallinn)"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="Kresta I class">
-        <specific id="1" description="Admiral Zozulya"/>
-      </subcategory>
-      <subcategory id="6" description="Kynda class">
-        <specific id="1" description="Grozny"/>
-        <specific id="2" description="Admiral Fokin"/>
-        <specific id="3" description="Admiral Golovko"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Guided-missile Destroyer">
-      <subcategory id="1" description="Udaloy class">
-        <specific id="1" description="Udaloy"/>
-        <specific id="2" description="Vitse Admiral Kulakov"/>
-        <specific id="3" description="Marshal Vasilevsky"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="Admiral Spiridonov"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="Marshal Shaposhnikov"/>
-        <specific id="8" description="Simferopol (ex-Marshal Buokenny)"/>
-        <specific id="9" description="Admiral Levchenko"/>
-        <specific id="10" description="Admiral Vinogradov"/>
-        <specific id="11" description="Admiral Kharlamov"/>
-        <specific id="12" description="Admiral Panteleyev"/>
-      </subcategory>
-      <subcategory id="2" description="Sovremennyy class">
-        <specific id="1" description="Sovremennyy"/>
-        <specific id="2" description="Otchayannyy"/>
-        <specific id="3" description="Otlichnny"/>
-        <specific id="4" description="Osmotritelny"/>
-        <specific id="5" description="Bezuprechny"/>
-        <specific id="6" description="Boyevoy"/>
-        <specific id="7" description="Stoyky"/>
-        <specific id="8" description="Okrylenny"/>
-        <specific id="9" description="Burny"/>
-        <specific id="10" description="Gremyashchy"/>
-        <specific id="11" description="Bystry"/>
-        <specific id="12" description="Rastoropny"/>
-        <specific id="13" description="Bezboyaznenny"/>
-        <specific id="14" description="Bezuderzhny"/>
-        <specific id="15" description="Bespokoiny"/>
-        <specific id="16" description="Nastoichivyy"/>
-        <specific id="17" description="Besstrashnyy"/>
-        <specific id="18" description="Vazhnyy"/>
-        <specific id="19" description="Udumchivyy"/>
-        <specific id="20" description="136 Hangzhou (China) (ex-Vazhny)"/>
-        <specific id="21" description="137 Fuzhou (China) (ex-Alexandr Nevsky)"/>
-      </subcategory>
-      <subcategory id="3" description="Modified Kashin class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="Sderzhandoyy"/>
-      </subcategory>
-      <subcategory id="4" description="Kashin class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="Krasnyy Kavkaz"/>
-        <specific id="3" description="Krasnyy Krym"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="Skoryy"/>
-        <specific id="9" description="Smetlivvy"/>
-      </subcategory>
-      <subcategory id="5" description="Udaloy II">
-        <specific id="1" description="Admiral Chabenenko"/>
-      </subcategory>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="SAM Kotlin class">
-        <specific id="1" description="Bravyy"/>
-        <specific id="2" description="Nakhodchivyy"/>
-        <specific id="3" description="Nastochivyy"/>
-        <specific id="4" description="Hesokrushimyy"/>
-        <specific id="5" description="Skromnyy"/>
-        <specific id="6" description="Skrytnyy"/>
-        <specific id="7" description="Soznatel'nyy"/>
-        <specific id="8" description="Vozbuzhdennyy"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided-missile Frigate (includes Corvette)">
-      <subcategory id="1" description="Krivak I class">
-        <specific id="1" description="Bditelny"/>
-        <specific id="2" description="Bezukoriznenny"/>
-        <specific id="3" description="Bezzavetny"/>
-        <specific id="4" description="Bodry"/>
-        <specific id="5" description="Deyatelny"/>
-        <specific id="6" description="Doblestny"/>
-        <specific id="7" description="Dostoyny"/>
-        <specific id="8" description="Druzhny"/>
-        <specific id="9" description="Ladny"/>
-        <specific id="10" description="Legky"/>
-        <specific id="11" description="(deleted)"/>
-        <specific id="12" description="Letuchy"/>
-        <specific id="13" description="(deleted)"/>
-        <specific id="14" description="Razumny"/>
-        <specific id="15" description="Razyashchiy"/>
-        <specific id="16" description="Retivy"/>
-        <specific id="17" description="Silnyy"/>
-        <specific id="18" description="Storozhevoy"/>
-        <specific id="19" description="Svirepyy"/>
-        <specific id="20" description="Zadorny"/>
-        <specific id="21" description="Zharky"/>
-        <specific id="22" description="Pylky"/>
-        <specific id="23" description="Poryvisty"/>
-      </subcategory>
-      <subcategory id="2" description="Krivak II class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="Neukrotimy"/>
-        <specific id="6" description="Pitlivy"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="(deleted)"/>
-        <specific id="11" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="Neustrashimy class (FFG)">
-        <specific id="1" description="Neustrashimy"/>
-        <specific id="2" description="Nepristupnyy"/>
-      </subcategory>
-      <subcategory id="5" description="Tarantul I class (Corvette)"/>
-      <subcategory id="6" description="Tarantul II class (Corvette)"/>
-      <subcategory id="7" description="Nanuchka I class (Corvette)">
-        <specific id="1" description="Grad"/>
-        <specific id="2" description="Raduga"/>
-        <specific id="3" description="Suval"/>
-        <specific id="4" description="Storm"/>
-        <specific id="5" description="Taifun"/>
-        <specific id="6" description="Zyklon"/>
-        <specific id="7" description="Metl"/>
-        <specific id="8" description="Zarnitsa"/>
-        <specific id="9" description="Grom"/>
-        <specific id="10" description="Molnija"/>
-        <specific id="11" description="Musson"/>
-        <specific id="12" description="Vichr"/>
-        <specific id="13" description="Bora"/>
-        <specific id="14" description="Briz"/>
-      </subcategory>
-      <subcategory id="8" description="Nanuchka III class (Corvette)">
-        <specific id="1" description="Mirazh-617"/>
-        <specific id="2" description="Zyb-560"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="Priliv Burun-562"/>
-        <specific id="5" description="Burun-566"/>
-        <specific id="6" description="Liven-551"/>
-        <specific id="7" description="Passat-570"/>
-        <specific id="8" description="Moroz-409"/>
-        <specific id="9" description="Smerch-423"/>
-        <specific id="10" description="Inej-432"/>
-        <specific id="11" description="Rasssvet-520"/>
-        <specific id="12" description="Razliv-450"/>
-        <specific id="13" description="Veter"/>
-      </subcategory>
-      <subcategory id="9" description="Nanuchka IV class (Corvette)"/>
-      <subcategory id="10" description="Tarantul III class (Corvette)"/>
-      <subcategory id="11" description="Gepard Class">
-        <specific id="1" description="Gepard"/>
-      </subcategory>
-      <subcategory id="12" description="Nanuchka II class (Corvette)"/>
-    </category>
-    <category id="7" description="Light/Patrol craft">
-      <subcategory id="1" description="2/3 T 58 PGF/PGR class (patrol)"/>
-      <subcategory id="2" description="Dergach class (light missile force)">
-        <specific id="1" description="Sivuch"/>
-      </subcategory>
-      <subcategory id="3" description="OSA I class"/>
-      <subcategory id="4" description="OSA II class"/>
-      <subcategory id="5" description="Poti class (fast attack craft--patrol)"/>
-      <subcategory id="6" description="Svetlyak class (fast attack craft--patrol)"/>
-      <subcategory id="7" description="Pauk I class (fast attack craft--patrol)"/>
-      <subcategory id="8" description="Zhuk class"/>
-      <subcategory id="9" description="Yaz class"/>
-      <subcategory id="10" description="Stenka class"/>
-      <subcategory id="11" description="Piyavka class (river patrol craft)"/>
-      <subcategory id="12" description="SO 1 class"/>
-      <subcategory id="13" description="Shmel class (river patrol craft)"/>
-      <subcategory id="14" description="TR 40 class (river patrol craft)"/>
-      <subcategory id="15" description="Command ship (river patrol craft)">
-        <specific id="1" description="SSV-10"/>
-      </subcategory>
-      <subcategory id="16" description="Potok class (torpedo experimental ships)">
-        <specific id="1" description="OS-100"/>
-        <specific id="2" description="OS-138"/>
-        <specific id="3" description="OS-145"/>
-        <specific id="4" description="OS-225"/>
-      </subcategory>
-      <subcategory id="17" description="Shelon class (torpedo operating/patrol &amp; target craft)">
-        <specific id="1" description="YPT Weapon Recovery"/>
-        <specific id="2" description="Shelon II (Environmental Research)"/>
-      </subcategory>
-      <subcategory id="18" description="Poluchat I/II/III classes (torpedo operating/patrol &amp; target craft)"/>
-      <subcategory id="19" description="Pozharny I class"/>
-      <subcategory id="20" description="Iva class (fire/patrol craft)">
-        <specific id="1" description="PZHK 415"/>
-        <specific id="2" description="1514"/>
-        <specific id="3" description="1544"/>
-        <specific id="4" description="1547"/>
-        <specific id="5" description="1859"/>
-      </subcategory>
-      <subcategory id="21" description="Vikhr class"/>
-      <subcategory id="22" description="Vosh class (river patrol craft)"/>
-      <subcategory id="23" description="Shershen class"/>
-      <subcategory id="24" description="Komar class"/>
-      <subcategory id="25" description="Matka class"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship / Craft">
-      <subcategory id="1" description="Alesha Class">
-        <specific id="1" description="Pripyat"/>
-        <specific id="2" description="Vychegda"/>
-        <specific id="3" description="Pechora"/>
-      </subcategory>
-      <subcategory id="2" description="Natya I class">
-        <specific id="1" description="Dizelist"/>
-        <specific id="2" description="Miner"/>
-        <specific id="3" description="Starshkiy"/>
-        <specific id="4" description="Snaypr"/>
-        <specific id="5" description="Elektrik"/>
-        <specific id="6" description="Motorist"/>
-        <specific id="7" description="Signalshik"/>
-        <specific id="8" description="Turbinist"/>
-        <specific id="9" description="Polemetchiz"/>
-        <specific id="10" description="Rulevoy"/>
-        <specific id="11" description="Zapal"/>
-        <specific id="12" description="Zenitchik"/>
-        <specific id="13" description="Radist"/>
-        <specific id="14" description="Dobrotay"/>
-        <specific id="15" description="Zaryad"/>
-      </subcategory>
-      <subcategory id="3" description="Natya II class"/>
-      <subcategory id="4" description="Yurka class">
-        <specific id="1" description="Gafel"/>
-        <specific id="2" description="Evgeniy Nikonov"/>
-        <specific id="3" description="Mazlov"/>
-        <specific id="4" description="Navodchik"/>
-        <specific id="5" description="Semen Rosal"/>
-      </subcategory>
-      <subcategory id="5" description="T-43 class"/>
-      <subcategory id="6" description="Sonya class"/>
-      <subcategory id="7" description="Baltika class"/>
-      <subcategory id="8" description="Vanya I class"/>
-      <subcategory id="9" description="Vanya II class"/>
-      <subcategory id="10" description="Sasha class"/>
-      <subcategory id="11" description="Yevgenya class"/>
-      <subcategory id="12" description="Pelikan class ACV (minesweeper, inshore)"/>
-      <subcategory id="13" description="Lida class (minehunter, inshore)"/>
-      <subcategory id="14" description="Ilyusha class (minesweeper, inshore)"/>
-      <subcategory id="15" description="(deleted)"/>
-      <subcategory id="16" description="Olya class (minesweeper, inshore)"/>
-      <subcategory id="17" description="Tanya class (minesweeper, inshore)"/>
-      <subcategory id="18" description="K 8 class (minesweeping boat)"/>
-      <subcategory id="19" description="Gorya class (minehunter, ocean)">
-        <specific id="1" description="Zheleznyakov"/>
-      </subcategory>
-    </category>
-    <category id="9" description="Dock landing ship">
-      <subcategory id="1" description="Ivan Rogov class">
-        <specific id="1" description="Ivan Rogov"/>
-        <specific id="2" description="Aleksandr Nikolay"/>
-        <specific id="3" description="Mitrofan Moskalenko"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Tank landing ship">
-      <subcategory id="1" description="Ropucha class">
-        <specific id="1" description="Aleksandr Shabalin"/>
-        <specific id="2" description="Constantin Olshanskiy"/>
-        <specific id="3" description="Tsesar Kunikov"/>
-        <specific id="4" description="Bobruisk"/>
-      </subcategory>
-      <subcategory id="2" description="Alligator class">
-        <specific id="1" description="Aleksandr Tortsev"/>
-        <specific id="2" description="Donetskiy Shakhter"/>
-        <specific id="3" description="Krasnaya Presnya"/>
-        <specific id="4" description="Krymskiy Kom."/>
-        <specific id="5" description="Nikolay Fil'chenkov"/>
-        <specific id="6" description="Nikolay Vilkov"/>
-        <specific id="7" description="50 Let Sheftsva Vlksm"/>
-        <specific id="8" description="Petr Il'ichyev"/>
-        <specific id="9" description="Sergei Lazo"/>
-        <specific id="10" description="Tomskiy Kom."/>
-        <specific id="11" description="Ilya Azarov"/>
-      </subcategory>
-      <subcategory id="3" description="Polnocny class"/>
-    </category>
-    <category id="11" description="Landing craft">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="Vydra class"/>
-      <subcategory id="5" description="Ondatra class"/>
-    </category>
-    <category id="13" description="Cruiser/Helicopter Carrier">
-      <subcategory id="1" description="(deleted)"/>
-    </category>
-    <category id="14" description="Hydrofoil">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Matka class (fast attack craft, missile hydrofoil)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="Mukha class (fast attack craft, patrol hydrofoil)"/>
-      <subcategory id="6" description="Turya class (fast attack craft, torpedo hydrofoil)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="Babochka class (fast attack craft, patrol hydrofoil)"/>
-      <subcategory id="10" description="Muravey class (fast attack craft, patrol hydrofoil)"/>
-    </category>
-    <category id="15" description="Air cushion/Surface effect">
-      <subcategory id="1" description="Pomornik class (air-cushion vehicles)"/>
-      <subcategory id="2" description="Aist class (air-cushion vehicles)"/>
-      <subcategory id="3" description="Tsaplya class (air-cushion vehicles)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="Utka class (wing-in-ground-effect craft) (air cushion)"/>
-      <subcategory id="8" description="Orlan class (wing-in-ground-effect craft) (air cushion)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Ugra class (submarine depot ships)">
-        <specific id="1" description="Ivan Kolyshkin"/>
-        <specific id="2" description="Ivan Vakhrameev"/>
-        <specific id="3" description="Volga"/>
-        <specific id="4" description="Ivan Kucherenko"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="Lentra"/>
-      </subcategory>
-      <subcategory id="2" description="Don class (submarine depot ships)">
-        <specific id="1" description="Dmitry Galkin"/>
-        <specific id="2" description="Kamchatsky Kkomsomolets"/>
-        <specific id="3" description="Magomet Gadzhiev (ex-Mikhail Tukhachevsky)"/>
-        <specific id="4" description="Viktor Kotelnikov"/>
-        <specific id="5" description="Fedor Vidyayev"/>
-        <specific id="6" description="Magadansky Komsomolets"/>
-      </subcategory>
-      <subcategory id="3" description="Aleksandr Brykin class (missile support ship)">
-        <specific id="1" description="Aleksandr Brykin"/>
-      </subcategory>
-      <subcategory id="4" description="Amga class (missile support ships)">
-        <specific id="1" description="Amga"/>
-        <specific id="2" description="Vetluga"/>
-        <specific id="3" description="Daugava"/>
-      </subcategory>
-      <subcategory id="5" description="Malina class (nuclear submarine support ships)">
-        <specific id="1" description="PM 63"/>
-        <specific id="2" description="PM 74"/>
-        <specific id="3" description="PM 12"/>
-      </subcategory>
-      <subcategory id="6" description="Pinega class (nuclear submarine support ships)">
-        <specific id="1" description="Pinega"/>
-        <specific id="2" description="Amur"/>
-      </subcategory>
-      <subcategory id="7" description="Lama class (missile support ships)">
-        <specific id="1" description="General Ryabakov"/>
-        <specific id="2" description="Voronesh"/>
-        <specific id="3" description="PM 44"/>
-        <specific id="4" description="PM 93"/>
-        <specific id="5" description="PM 131"/>
-        <specific id="6" description="PM 150"/>
-        <specific id="7" description="PM 154"/>
-      </subcategory>
-      <subcategory id="8" description="Modified Andizhan class (missile support ships)">
-        <specific id="1" description="Venta"/>
-        <specific id="2" description="Vilyuy"/>
-      </subcategory>
-      <subcategory id="9" description="Amur I Class (Repair Ship)">
-        <specific id="1" description="PM 9"/>
-        <specific id="2" description="PM 10"/>
-        <specific id="3" description="PM 15"/>
-        <specific id="4" description="PM 37"/>
-        <specific id="5" description="PM 49"/>
-        <specific id="6" description="PM 52"/>
-        <specific id="7" description="PM 56"/>
-        <specific id="8" description="PM 75"/>
-        <specific id="9" description="PM 94"/>
-        <specific id="10" description="PM 138"/>
-        <specific id="11" description="PM 161"/>
-        <specific id="12" description="PM 163"/>
-        <specific id="13" description="5"/>
-        <specific id="14" description="30"/>
-        <specific id="15" description="34"/>
-        <specific id="16" description="40"/>
-        <specific id="17" description="64"/>
-        <specific id="18" description="73"/>
-        <specific id="19" description="81"/>
-        <specific id="20" description="82"/>
-        <specific id="21" description="129"/>
-        <specific id="22" description="139"/>
-        <specific id="23" description="140"/>
-        <specific id="24" description="156"/>
-      </subcategory>
-      <subcategory id="10" description="Amur II Class (repair ship)">
-        <specific id="1" description="59"/>
-        <specific id="2" description="69"/>
-        <specific id="3" description="86"/>
-        <specific id="4" description="92"/>
-        <specific id="5" description="97"/>
-      </subcategory>
-      <subcategory id="11" description="Oskol class (repair ships)">
-        <specific id="1" description="PM 2"/>
-        <specific id="2" description="PM 24"/>
-        <specific id="3" description="PM 26"/>
-        <specific id="4" description="PM 42"/>
-        <specific id="5" description="PM 147"/>
-        <specific id="6" description="PM 148"/>
-        <specific id="7" description="20"/>
-        <specific id="8" description="21"/>
-        <specific id="9" description="51"/>
-        <specific id="10" description="68"/>
-        <specific id="11" description="146"/>
-      </subcategory>
-      <subcategory id="12" description="Tomba class (support ships)">
-        <specific id="1" description="244"/>
-        <specific id="2" description="254"/>
-        <specific id="3" description="348"/>
-        <specific id="4" description="357"/>
-      </subcategory>
-      <subcategory id="13" description="Vytegrales class (support &amp; depot)">
-        <specific id="1" description="Apsheron (ex-Vagales)"/>
-        <specific id="2" description="Baskunchak (ex-Kirishi)"/>
-        <specific id="3" description="Dauriya (ex-Vyborgles)"/>
-        <specific id="4" description="Dikson (ex-Vostok 3)"/>
-        <specific id="5" description="Donbas (ex-Vostok 4)"/>
-        <specific id="6" description="Sevan (ex-Siverles)"/>
-        <specific id="7" description="Taman (ex-Suzdal)"/>
-        <specific id="8" description="Yamal (ex-Tosnoles)"/>
-      </subcategory>
-      <subcategory id="14" description="Vishnya class (AGIs)">
-        <specific id="1" description="SSV 169"/>
-        <specific id="2" description="SSV 175"/>
-        <specific id="3" description="SSV 201"/>
-        <specific id="4" description="SSV 208"/>
-        <specific id="5" description="SSV 231"/>
-        <specific id="6" description="SSV 520"/>
-        <specific id="7" description="SSV 535"/>
-      </subcategory>
-      <subcategory id="15" description="Balzam class (AGIs)">
-        <specific id="1" description="SSV 80"/>
-        <specific id="2" description="SSV 493"/>
-        <specific id="3" description="SSV 516"/>
-        <specific id="4" description="SSV 571"/>
-      </subcategory>
-      <subcategory id="16" description="Primorye class (AGIs)">
-        <specific id="1" description="SSV 464 Zabaykalye"/>
-        <specific id="2" description="SSV 465 Primorye"/>
-        <specific id="3" description="SSV 501 Zaporozhye"/>
-        <specific id="4" description="SSV 502 Zakarpatye"/>
-        <specific id="5" description="SSV 590 Krym"/>
-        <specific id="6" description="SSV 591 Kavkaz"/>
-      </subcategory>
-      <subcategory id="17" description="Nikolay Zubov class (AGIs)">
-        <specific id="1" description="SSV 468 Gavril Sarychev (mod)"/>
-        <specific id="2" description="SSV 469 Semen Chelyuskin"/>
-        <specific id="3" description="SSV 503 Khariton Laptev (mod)"/>
-      </subcategory>
-      <subcategory id="18" description="Modified Pamir class (AGIs)">
-        <specific id="1" description="SSV 477 Peleng (ex-Arban)"/>
-      </subcategory>
-      <subcategory id="19" description="Moma class (AGIs)">
-        <specific id="1" description="Ekvator"/>
-        <specific id="2" description="Yupiter (mod)"/>
-        <specific id="3" description="Kildin (mod)"/>
-        <specific id="4" description="SSV 472 (ex-Ilmen) (mod)"/>
-        <specific id="5" description="SSV 474 (ex-Vega) (mod)"/>
-        <specific id="6" description="SSV 506 (ex-Nakhodka)"/>
-        <specific id="7" description="SSV 509 (ex-Pelorus) (mod)"/>
-        <specific id="8" description="SSV 512 (ex-Arkhipelag) (mod)"/>
-        <specific id="9" description="SSV 514 (ex-Seliger) (mod)"/>
-      </subcategory>
-      <subcategory id="20" description="Alpinist class (AGIs)">
-        <specific id="1" description="GS 7 (mod)"/>
-        <specific id="2" description="GS 8"/>
-        <specific id="3" description="GS 19 (mod)"/>
-        <specific id="4" description="GS 39 (mod)"/>
-      </subcategory>
-      <subcategory id="21" description="Mayak class">
-        <specific id="1" description="Khersones"/>
-        <specific id="2" description="Kurs"/>
-        <specific id="3" description="Kursograf"/>
-        <specific id="4" description="Ladoga"/>
-        <specific id="5" description="GS 239"/>
-        <specific id="6" description="GS 242"/>
-        <specific id="7" description="Girorulevoy"/>
-        <specific id="8" description="Aneroid"/>
-      </subcategory>
-      <subcategory id="22" description="Okean class (AGIs)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="Ekholot"/>
-        <specific id="5" description="Krenometr"/>
-        <specific id="6" description="Linza (mod)"/>
-        <specific id="7" description="Lotlin (mod)"/>
-        <specific id="8" description="Reduktor (mod)"/>
-        <specific id="9" description="Repiter"/>
-        <specific id="10" description="Teodolit"/>
-        <specific id="11" description="Traverz"/>
-        <specific id="12" description="Zond (mod) no missiles"/>
-      </subcategory>
-      <subcategory id="23" description="Lentra class (AGIs)">
-        <specific id="1" description="GS 41"/>
-        <specific id="2" description="GS 43 (mod)"/>
-        <specific id="3" description="GS 55"/>
-        <specific id="4" description="GS 59"/>
-      </subcategory>
-      <subcategory id="24" description="Akademik Krylov class (naval research)">
-        <specific id="1" description="Admiral Vladimirsky"/>
-        <specific id="2" description="Ivan Kruzenshtern"/>
-        <specific id="3" description="Leonid Demin"/>
-        <specific id="4" description="Akademik Krylov"/>
-        <specific id="5" description="Leonid Sobolev"/>
-        <specific id="6" description="Mikhail Krupsky"/>
-      </subcategory>
-      <subcategory id="25" description="Abkhaziya class (naval research)">
-        <specific id="1" description="Abkhaziya"/>
-        <specific id="2" description="Adzhariya"/>
-        <specific id="3" description="Bashkiriya"/>
-        <specific id="4" description="Moldavia"/>
-      </subcategory>
-      <subcategory id="26" description="Polyus class (Kovel type) (naval research)">
-        <specific id="1" description="Baykal (mod)"/>
-        <specific id="2" description="Balkhash (mod)"/>
-        <specific id="3" description="Polyus"/>
-      </subcategory>
-      <subcategory id="27" description="Modified Dobrynya Nikitich class (naval research)">
-        <specific id="1" description="Vladimir Kavraysky"/>
-      </subcategory>
-      <subcategory id="28" description="Nikolay Zubov class (naval research)">
-        <specific id="1" description="Aleksey Chirikov"/>
-        <specific id="2" description="Fedor Litke"/>
-        <specific id="3" description="Andrey Vilkitsky"/>
-        <specific id="4" description="Nikolay Zubov"/>
-        <specific id="5" description="Boris Davidov"/>
-        <specific id="6" description="Semen Dezhnev"/>
-        <specific id="7" description="Faddey Bellinsgausen"/>
-        <specific id="8" description="Vasily Golovnin"/>
-      </subcategory>
-      <subcategory id="29" description="Yug class (naval research)">
-        <specific id="1" description="V Adm Vorontsov (ex-Briz)"/>
-        <specific id="2" description="Donuzlav"/>
-        <specific id="3" description="Gals"/>
-        <specific id="4" description="Gidrolog"/>
-        <specific id="5" description="Gorizont"/>
-        <specific id="6" description="Mangyshlak"/>
-        <specific id="7" description="Marshal Gelovani"/>
-        <specific id="8" description="Nikolay Matusevich"/>
-        <specific id="9" description="Pegas"/>
-        <specific id="10" description="Persey"/>
-        <specific id="11" description="Pluton"/>
-        <specific id="12" description="Senezh"/>
-        <specific id="13" description="Strelets"/>
-        <specific id="14" description="Tayga"/>
-        <specific id="15" description="Vizir"/>
-        <specific id="16" description="Zodiak"/>
-        <specific id="17" description="Stvor"/>
-        <specific id="18" description="704 (ex-SSV 328)"/>
-      </subcategory>
-      <subcategory id="30" description="Mod Sorum class (naval research)">
-        <specific id="1" description="OS 572"/>
-      </subcategory>
-      <subcategory id="31" description="Moma class (+9 AGIs) (naval survey)">
-        <specific id="1" description="Altair"/>
-        <specific id="2" description="Anadyr"/>
-        <specific id="3" description="Andromeda"/>
-        <specific id="4" description="Antares"/>
-        <specific id="5" description="Antarktyda"/>
-        <specific id="6" description="Arktika"/>
-        <specific id="7" description="Askold"/>
-        <specific id="8" description="Berezan"/>
-        <specific id="9" description="Cheleken"/>
-        <specific id="10" description="Elton"/>
-        <specific id="11" description="Kolguev (mod)"/>
-        <specific id="12" description="Krilon"/>
-        <specific id="13" description="Liman"/>
-        <specific id="14" description="Mars"/>
-        <specific id="15" description="Morzhovets"/>
-        <specific id="16" description="Okean"/>
-        <specific id="17" description="Rybachi (mod)"/>
-        <specific id="18" description="Sever"/>
-        <specific id="19" description="Taymyr"/>
-        <specific id="20" description="Zapolyarye"/>
-      </subcategory>
-      <subcategory id="32" description="Samara class (naval survey)">
-        <specific id="1" description="Azimut"/>
-        <specific id="2" description="Glubomer"/>
-        <specific id="3" description="Tropik"/>
-        <specific id="4" description="Deviator"/>
-        <specific id="5" description="Gradus"/>
-        <specific id="6" description="Vostok"/>
-        <specific id="7" description="Gigrometr"/>
-        <specific id="8" description="Kompas"/>
-        <specific id="9" description="Vaygach (mod)"/>
-        <specific id="10" description="Moskovsky Universitet"/>
-        <specific id="11" description="Pamyat Merkuryia"/>
-        <specific id="12" description="Zenit (ex-Gorizont) (mod)"/>
-        <specific id="13" description="Rumb"/>
-      </subcategory>
-      <subcategory id="33" description="Finik class (naval survey)">
-        <specific id="1" description="GS 44"/>
-        <specific id="2" description="47"/>
-        <specific id="3" description="84"/>
-        <specific id="4" description="86"/>
-        <specific id="5" description="87"/>
-        <specific id="6" description="260"/>
-        <specific id="7" description="265"/>
-        <specific id="8" description="270"/>
-        <specific id="9" description="272"/>
-        <specific id="10" description="278"/>
-        <specific id="11" description="296"/>
-        <specific id="12" description="297"/>
-        <specific id="13" description="301"/>
-        <specific id="14" description="388"/>
-        <specific id="15" description="392"/>
-        <specific id="16" description="397"/>
-        <specific id="17" description="398"/>
-        <specific id="18" description="399"/>
-        <specific id="19" description="400"/>
-        <specific id="20" description="401"/>
-        <specific id="21" description="402"/>
-        <specific id="22" description="403"/>
-        <specific id="23" description="404"/>
-        <specific id="24" description="405"/>
-      </subcategory>
-      <subcategory id="34" description="Biya class (naval survey)">
-        <specific id="1" description="GS 182"/>
-        <specific id="2" description="193"/>
-        <specific id="3" description="194"/>
-        <specific id="4" description="198"/>
-        <specific id="5" description="200"/>
-        <specific id="6" description="202"/>
-        <specific id="7" description="204"/>
-        <specific id="8" description="206"/>
-        <specific id="9" description="210"/>
-        <specific id="10" description="212"/>
-        <specific id="11" description="214"/>
-        <specific id="12" description="271"/>
-        <specific id="13" description="273"/>
-        <specific id="14" description="275"/>
-      </subcategory>
-      <subcategory id="35" description="Kamenka class (naval survey)">
-        <specific id="1" description="GS 66"/>
-        <specific id="2" description="74"/>
-        <specific id="3" description="78"/>
-        <specific id="4" description="82"/>
-        <specific id="5" description="107"/>
-        <specific id="6" description="108 (ex-Vernier)"/>
-        <specific id="7" description="113 (ex-Belbeck)"/>
-        <specific id="8" description="118"/>
-        <specific id="9" description="199 (ex-Sima)"/>
-        <specific id="10" description="207"/>
-        <specific id="11" description="211"/>
-        <specific id="12" description="Astronom (mod)"/>
-      </subcategory>
-      <subcategory id="36" description="Vinograd class (naval survey)">
-        <specific id="1" description="GS 525"/>
-        <specific id="2" description="GS 526"/>
-      </subcategory>
-      <subcategory id="37" description="Melitopol class (naval survey)">
-        <specific id="1" description="Mayak"/>
-        <specific id="2" description="Nivelir"/>
-        <specific id="3" description="Prizma"/>
-        <specific id="4" description="Indigurka (mod)"/>
-        <specific id="5" description="Shevchenoko (mod)"/>
-      </subcategory>
-      <subcategory id="38" description="Nyryat 1 class (naval survey)"/>
-      <subcategory id="39" description="Nyryat 2 class (naval survey)"/>
-      <subcategory id="40" description="Sibir class (naval missile range)">
-        <specific id="1" description="Sakhalin"/>
-        <specific id="2" description="Spassk (ex-Suchan)"/>
-      </subcategory>
-      <subcategory id="41" description="Marshal Nedelin class (naval missile range)">
-        <specific id="1" description="Marshal Nedelin"/>
-        <specific id="2" description="Marshal Krylov"/>
-        <specific id="3" description="Akademik Nicolai Pilyugin"/>
-      </subcategory>
-      <subcategory id="42" description="Kamchatka class (AG) (naval missile range)">
-        <specific id="1" description="SSV 391 Kamchatka"/>
-      </subcategory>
-      <subcategory id="43" description="Kapusta class (naval missile range)">
-        <specific id="1" description="SSV 33 Ural"/>
-      </subcategory>
-      <subcategory id="44" description="Ugra II class (AXT) (training)">
-        <specific id="1" description="Borodino"/>
-        <specific id="2" description="Gangut"/>
-      </subcategory>
-      <subcategory id="45" description="Smolny class (AXT) (training)">
-        <specific id="1" description="Khasan"/>
-        <specific id="2" description="Perekop"/>
-        <specific id="3" description="Smolny"/>
-      </subcategory>
-      <subcategory id="46" description="Wodnik II class (AXT) (training)">
-        <specific id="1" description="Luga"/>
-        <specific id="2" description="Oka"/>
-      </subcategory>
-      <subcategory id="47" description="Sail training ships">
-        <specific id="1" description="Mir"/>
-        <specific id="2" description="Druzjba"/>
-        <specific id="3" description="Khersones"/>
-        <specific id="4" description="Pallada"/>
-      </subcategory>
-      <subcategory id="48" description="Klasma class (cable ships)">
-        <specific id="1" description="Donets"/>
-        <specific id="2" description="Ingul"/>
-        <specific id="3" description="Inguri"/>
-        <specific id="4" description="Katun"/>
-        <specific id="5" description="Tavda"/>
-        <specific id="6" description="Tsna"/>
-        <specific id="7" description="Yana type I"/>
-        <specific id="8" description="Zeya"/>
-      </subcategory>
-      <subcategory id="49" description="Emba I class (cable ships)">
-        <specific id="1" description="Emba"/>
-        <specific id="2" description="Nepryadva"/>
-        <specific id="3" description="Setun"/>
-      </subcategory>
-      <subcategory id="50" description="Emba II class (cable ships)">
-        <specific id="1" description="Biriusa"/>
-        <specific id="2" description="Kemj"/>
-      </subcategory>
-      <subcategory id="51" description="Berezina class (replenishment ships)">
-        <specific id="1" description="Berezina"/>
-      </subcategory>
-      <subcategory id="52" description="Boris Chilikin class (replenishment ships)">
-        <specific id="1" description="Boris Butoma"/>
-        <specific id="2" description="Genrich Gasanov"/>
-        <specific id="3" description="Boris Chilikin"/>
-        <specific id="4" description="Ivan Bubnov"/>
-        <specific id="5" description="Dnestr"/>
-        <specific id="6" description="Vladimir Kolechitsky"/>
-      </subcategory>
-      <subcategory id="53" description="Dubna class (replenishment tankers)">
-        <specific id="1" description="Dubna"/>
-        <specific id="2" description="Pechenga"/>
-        <specific id="3" description="Irkut"/>
-        <specific id="4" description="Sventa"/>
-      </subcategory>
-      <subcategory id="54" description="Mod Kazbek class (replenishment tankers)">
-        <specific id="1" description="Alatyr"/>
-        <specific id="2" description="Desna"/>
-        <specific id="3" description="Volkhov"/>
-      </subcategory>
-      <subcategory id="55" description="Mod Altay class (replenishment tankers)">
-        <specific id="1" description="Elnya"/>
-        <specific id="2" description="Ilim"/>
-        <specific id="3" description="Izhora"/>
-        <specific id="4" description="Kola"/>
-        <specific id="5" description="Prut"/>
-        <specific id="6" description="Yegorlik"/>
-      </subcategory>
-      <subcategory id="56" description="Uda class (replenishment tankers)">
-        <specific id="1" description="Dunay (mod)"/>
-        <specific id="2" description="Koida"/>
-        <specific id="3" description="Lena (mod)"/>
-        <specific id="4" description="Terek (mod)"/>
-        <specific id="5" description="Vishera"/>
-      </subcategory>
-      <subcategory id="57" description="Olekma class (replenishment tankers)">
-        <specific id="1" description="Olekma (mod)"/>
-        <specific id="2" description="Iman"/>
-        <specific id="3" description="Zolotoy rog"/>
-      </subcategory>
-      <subcategory id="58" description="Kaliningradneft class (support tankers)">
-        <specific id="1" description="Argun"/>
-        <specific id="2" description="Vyazma"/>
-      </subcategory>
-      <subcategory id="59" description="Sofya class (support tanker)">
-        <specific id="1" description="Akhtyuba (ex-Hanoi)"/>
-      </subcategory>
-      <subcategory id="60" description="Nercha class (support tankers)">
-        <specific id="1" description="Nara"/>
-        <specific id="2" description="Nercha"/>
-      </subcategory>
-      <subcategory id="61" description="Konda class (support tankers)">
-        <specific id="1" description="Konda"/>
-        <specific id="2" description="Rossosh"/>
-        <specific id="3" description="Soyana"/>
-        <specific id="4" description="Yakhroma"/>
-      </subcategory>
-      <subcategory id="62" description="Khobi class (support tankers)">
-        <specific id="1" description="Cheremshan"/>
-        <specific id="2" description="Orsha"/>
-        <specific id="3" description="Shelon"/>
-        <specific id="4" description="Tartu"/>
-        <specific id="5" description="Khobi"/>
-        <specific id="6" description="Seima"/>
-        <specific id="7" description="Sosva"/>
-        <specific id="8" description="Titan 150"/>
-        <specific id="9" description="Lovat"/>
-        <specific id="10" description="Shacha"/>
-        <specific id="11" description="Sysola"/>
-        <specific id="12" description="Tunguska"/>
-        <specific id="13" description="Metan"/>
-      </subcategory>
-      <subcategory id="63" description="Irtysh class (support tanker)">
-        <specific id="1" description="Narva"/>
-      </subcategory>
-      <subcategory id="64" description="Baskunchak class (support tankers)">
-        <specific id="1" description="Ivan Golubets"/>
-        <specific id="2" description="Sovietsky Pogranichnik"/>
-      </subcategory>
-      <subcategory id="65" description="Luza class (special tankers)">
-        <specific id="1" description="Alambai"/>
-        <specific id="2" description="Barguzin"/>
-        <specific id="3" description="Kama"/>
-        <specific id="4" description="Aragvi"/>
-        <specific id="5" description="Don"/>
-        <specific id="6" description="Selenga"/>
-      </subcategory>
-      <subcategory id="66" description="Vala class (special tankers)">
-        <specific id="1" description="Vala"/>
-        <specific id="2" description="TNT 11"/>
-        <specific id="3" description="TNT 27"/>
-        <specific id="4" description="12"/>
-        <specific id="5" description="19"/>
-        <specific id="6" description="25"/>
-        <specific id="7" description="29"/>
-      </subcategory>
-      <subcategory id="67" description="OB class (AH)">
-        <specific id="1" description="OB"/>
-        <specific id="2" description="Yenisei"/>
-        <specific id="3" description="Svir"/>
-        <specific id="4" description="Irtysh"/>
-      </subcategory>
-      <subcategory id="68" description="Mikhail Rudnitsky class (ARs)">
-        <specific id="1" description="Mikhail Rudnitsky"/>
-        <specific id="2" description="Georgy Kozmin"/>
-        <specific id="3" description="Georgy Titov"/>
-        <specific id="4" description="Sayany"/>
-      </subcategory>
-      <subcategory id="69" description="Pamir class (salvage, rescue &amp; mooring)">
-        <specific id="1" description="Agatan"/>
-        <specific id="2" description="Aldan"/>
-      </subcategory>
-      <subcategory id="70" description="Ingul class (salvage, rescue &amp; mooring)">
-        <specific id="1" description="Pamir"/>
-        <specific id="2" description="Mashuk"/>
-        <specific id="3" description="Alatau"/>
-        <specific id="4" description="Karakh"/>
-      </subcategory>
-      <subcategory id="71" description="Sliva class (salvage, rescue &amp; mooring)">
-        <specific id="1" description="SB 406"/>
-        <specific id="2" description="SB 408"/>
-        <specific id="3" description="SB 921"/>
-        <specific id="4" description="SB 922 Shakhter"/>
-      </subcategory>
-      <subcategory id="72" description="Kashtan class (buoy tenders)">
-        <specific id="1" description="KIL 926"/>
-        <specific id="2" description="KIL 143"/>
-        <specific id="3" description="KIL 164"/>
-        <specific id="4" description="KIL 498"/>
-        <specific id="5" description="KIL 927"/>
-        <specific id="6" description="KIL 158"/>
-        <specific id="7" description="KIL 140"/>
-        <specific id="8" description="KIL 168"/>
-      </subcategory>
-      <subcategory id="73" description="Sura class (buoy tenders)">
-        <specific id="1" description="KIL 1"/>
-        <specific id="2" description="2"/>
-        <specific id="3" description="21"/>
-        <specific id="4" description="22"/>
-        <specific id="5" description="25"/>
-        <specific id="6" description="27"/>
-        <specific id="7" description="29"/>
-        <specific id="8" description="31"/>
-        <specific id="9" description="32"/>
-        <specific id="10" description="33"/>
-      </subcategory>
-      <subcategory id="74" description="Orel class (salvage tugs)">
-        <specific id="1" description="SB 38"/>
-        <specific id="2" description="SB 43"/>
-      </subcategory>
-      <subcategory id="75" description="Katun I class (salvage &amp; rescue tugs)">
-        <specific id="1" description="PZHS 96"/>
-        <specific id="2" description="98"/>
-        <specific id="3" description="123"/>
-        <specific id="4" description="124"/>
-        <specific id="5" description="209"/>
-        <specific id="6" description="273"/>
-        <specific id="7" description="279"/>
-        <specific id="8" description="282"/>
-        <specific id="9" description="551"/>
-      </subcategory>
-      <subcategory id="76" description="Katun II (salvage &amp; rescue tugs)">
-        <specific id="1" description="PZHS 64"/>
-        <specific id="2" description="92"/>
-      </subcategory>
-      <subcategory id="77" description="Neptun class (salvage, rescue &amp; mooring)">
-        <specific id="1" description="KIL 3"/>
-        <specific id="2" description="6"/>
-        <specific id="3" description="7"/>
-        <specific id="4" description="9"/>
-        <specific id="5" description="11"/>
-        <specific id="6" description="13"/>
-        <specific id="7" description="15"/>
-        <specific id="8" description="17"/>
-        <specific id="9" description="18"/>
-      </subcategory>
-      <subcategory id="78" description="Elbrus class (submarine rescue ships)">
-        <specific id="1" description="Elbrus"/>
-        <specific id="2" description="Alagez"/>
-      </subcategory>
-      <subcategory id="79" description="Nepa class (submarine rescue ships)">
-        <specific id="1" description="Karpaty"/>
-      </subcategory>
-      <subcategory id="80" description="Prut class (submarine rescue ships)">
-        <specific id="1" description="Altay"/>
-        <specific id="2" description="Beshtau"/>
-        <specific id="3" description="Vladimir Trefolev"/>
-        <specific id="4" description="Zhiguli"/>
-        <specific id="5" description="SS 21"/>
-        <specific id="6" description="Epron (ex-SS 26)"/>
-        <specific id="7" description="SS 83"/>
-      </subcategory>
-      <subcategory id="81" description="Valday class (ex-T 58)">
-        <specific id="1" description="Kazbek"/>
-        <specific id="2" description="Khibiny"/>
-        <specific id="3" description="Valday"/>
-        <specific id="4" description="Zangezur"/>
-        <specific id="5" description="Pulkovo (ex-SS 38)"/>
-        <specific id="6" description="SS 30"/>
-        <specific id="7" description="35"/>
-        <specific id="8" description="40"/>
-        <specific id="9" description="47"/>
-        <specific id="10" description="50"/>
-      </subcategory>
-      <subcategory id="82" description="Anadyr class (transports)">
-        <specific id="1" description="Anadyr"/>
-      </subcategory>
-      <subcategory id="83" description="Angara class (transports)">
-        <specific id="1" description="Angara (ex-Hela)"/>
-      </subcategory>
-      <subcategory id="84" description="Amguema class (transports)">
-        <specific id="1" description="Yauza"/>
-      </subcategory>
-      <subcategory id="85" description="Chulym class (transports)">
-        <specific id="1" description="Severodonetsk"/>
-      </subcategory>
-      <subcategory id="86" description="Andizan class (transports)">
-        <specific id="1" description="Onda"/>
-        <specific id="2" description="Posyet"/>
-      </subcategory>
-      <subcategory id="87" description="Kalinin class (transports)">
-        <specific id="1" description="Kuban (ex-Nadeshda-Krupskaya)"/>
-      </subcategory>
-      <subcategory id="88" description="Antonov class (transports)">
-        <specific id="1" description="Neon Antonov"/>
-        <specific id="2" description="Irbit"/>
-        <specific id="3" description="Nicolay Starshinov"/>
-        <specific id="4" description="Ivan Lednev"/>
-        <specific id="5" description="Nikolay Sipyagin"/>
-        <specific id="6" description="Ivan Sudtsov"/>
-        <specific id="7" description="Ivan Odtejev"/>
-        <specific id="8" description="Victor Denison"/>
-        <specific id="9" description="Sergey Sudetsky"/>
-        <specific id="10" description="Dvina"/>
-        <specific id="11" description="Mikhail Konovalov"/>
-      </subcategory>
-      <subcategory id="89" description="Partizan class (transports)">
-        <specific id="1" description="Pechora"/>
-        <specific id="2" description="Turgay"/>
-        <specific id="3" description="Ufa"/>
-        <specific id="4" description="V Adm Fomin (ex-Pinega) (mod)"/>
-      </subcategory>
-      <subcategory id="90" description="Keyla class (transports)">
-        <specific id="1" description="Mezen"/>
-        <specific id="2" description="Onega"/>
-        <specific id="3" description="Ponoi"/>
-        <specific id="4" description="Ritsa (AGI)"/>
-        <specific id="5" description="Teriberka"/>
-        <specific id="6" description="Tuloma"/>
-        <specific id="7" description="Tvertsa"/>
-        <specific id="8" description="Unza"/>
-        <specific id="9" description="Ussury"/>
-        <specific id="10" description="Yeruslan"/>
-      </subcategory>
-      <subcategory id="91" description="Muna class (transports)">
-        <specific id="1" description="VTR 28"/>
-        <specific id="2" description="48"/>
-        <specific id="3" description="81"/>
-        <specific id="4" description="82"/>
-        <specific id="5" description="83"/>
-        <specific id="6" description="84"/>
-        <specific id="7" description="85"/>
-        <specific id="8" description="86"/>
-        <specific id="9" description="91"/>
-        <specific id="10" description="92"/>
-        <specific id="11" description="93"/>
-        <specific id="12" description="94"/>
-        <specific id="13" description="148"/>
-      </subcategory>
-      <subcategory id="92" description="Mayak class (transports)">
-        <specific id="1" description="Buzuluk"/>
-        <specific id="2" description="Ishim"/>
-        <specific id="3" description="Lama"/>
-        <specific id="4" description="Mius"/>
-        <specific id="5" description="Neman"/>
-        <specific id="6" description="Rioni"/>
-        <specific id="7" description="Ulma"/>
-        <specific id="8" description="Vytegra"/>
-      </subcategory>
-      <subcategory id="93" description="Lentra class (transports)">
-        <specific id="1" description="Alma"/>
-        <specific id="2" description="Kacha"/>
-        <specific id="3" description="Ufa"/>
-        <specific id="4" description="Ugra"/>
-        <specific id="5" description="VTR 1"/>
-        <specific id="6" description="28"/>
-        <specific id="7" description="32"/>
-        <specific id="8" description="143"/>
-        <specific id="9" description="144"/>
-        <specific id="10" description="145"/>
-      </subcategory>
-      <subcategory id="94" description="MP 4 class (transports)">
-        <specific id="1" description="VTR 294"/>
-        <specific id="2" description="VTR 295"/>
-      </subcategory>
-      <subcategory id="95" description="MP 6 class (transports)">
-        <specific id="1" description="Bira"/>
-        <specific id="2" description="Vologda"/>
-      </subcategory>
-      <subcategory id="96" description="Telnovsk class (transports)">
-        <specific id="1" description="Burovestnik"/>
-        <specific id="2" description="Lag"/>
-        <specific id="3" description="VTR 73"/>
-        <specific id="4" description="VTR 74 (ex-Jan Kreuks)"/>
-      </subcategory>
-      <subcategory id="97" description="Khabarov class (transports)">
-        <specific id="1" description="VTR 8"/>
-        <specific id="2" description="13"/>
-        <specific id="3" description="15"/>
-        <specific id="4" description="25"/>
-      </subcategory>
-      <subcategory id="98" description="Komandor class">
-        <specific id="1" description="Komandor"/>
-        <specific id="2" description="Shkiper Gyek"/>
-        <specific id="3" description="Herluf Bidstrup"/>
-      </subcategory>
-      <subcategory id="99" description="Onega class">
-        <specific id="1" description="GKS 52"/>
-        <specific id="2" description="SFP 95"/>
-        <specific id="3" description="SFP 224"/>
-        <specific id="4" description="SFP 240"/>
-        <specific id="5" description="SFP 283"/>
-        <specific id="6" description="GKS 286"/>
-        <specific id="7" description="SFP 295"/>
-        <specific id="8" description="SFP 322"/>
-        <specific id="9" description="SFP 340"/>
-        <specific id="10" description="SFP 173"/>
-        <specific id="11" description="SFP 511"/>
-        <specific id="12" description="SFP 542"/>
-        <specific id="13" description="SFP 562"/>
-        <specific id="14" description="SFP 177"/>
-      </subcategory>
-      <subcategory id="100" description="T 43 class">
-        <specific id="1" description="GKS 11"/>
-        <specific id="2" description="12"/>
-        <specific id="3" description="14-24"/>
-        <specific id="4" description="26"/>
-        <specific id="5" description="45"/>
-      </subcategory>
-      <subcategory id="101" description="(deleted)"/>
-      <subcategory id="102" description="(deleted)"/>
-      <subcategory id="103" description="(deleted)"/>
-      <subcategory id="104" description="PO 2 class"/>
-      <subcategory id="105" description="Nyryat 2 class"/>
-      <subcategory id="106" description="Nyryat 1 class"/>
-      <subcategory id="107" description="Petrushka class"/>
-      <subcategory id="108" description="Miernyk class"/>
-      <subcategory id="109" description="Daldyn class">
-        <specific id="1" description="Daldyn"/>
-      </subcategory>
-      <subcategory id="110" description="Yelva class">
-        <specific id="1" description="VM 143"/>
-        <specific id="2" description="146"/>
-        <specific id="3" description="154"/>
-        <specific id="4" description="266"/>
-        <specific id="5" description="268"/>
-        <specific id="6" description="413"/>
-        <specific id="7" description="414"/>
-        <specific id="8" description="416"/>
-        <specific id="9" description="420"/>
-        <specific id="10" description="425"/>
-        <specific id="11" description="907"/>
-        <specific id="12" description="909"/>
-      </subcategory>
-      <subcategory id="111" description="Bolva (barracks ships)">
-        <specific id="1" description="Bolva 1"/>
-        <specific id="2" description="Bolva 2"/>
-        <specific id="3" description="Bolva 3"/>
-      </subcategory>
-      <subcategory id="112" description="Target Barge"/>
-    </category>
-    <category id="17" description="Auxiliary, Merchant Marine">
-      <subcategory id="1" description="Tamyr class (ice breakers)">
-        <specific id="1" description="Tamyr"/>
-        <specific id="2" description="Vaygach"/>
-      </subcategory>
-      <subcategory id="2" description="Arktika class (ice breakers)">
-        <specific id="1" description="Arktika"/>
-        <specific id="2" description="Sibir"/>
-        <specific id="3" description="Rossiya"/>
-        <specific id="4" description="Sovetskiy Soyuz"/>
-        <specific id="5" description="Oktyabryskaya Revolutsiya"/>
-        <specific id="6" description="Ural (1996)"/>
-      </subcategory>
-      <subcategory id="3" description="Yermak class (ice breakers)">
-        <specific id="1" description="Yermak"/>
-        <specific id="2" description="Admiral Makarov"/>
-        <specific id="3" description="Krasin"/>
-      </subcategory>
-      <subcategory id="4" description="Moskva class (ice breakers)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="Leningrad"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="Murmansk"/>
-        <specific id="5" description="Vladivostok"/>
-      </subcategory>
-      <subcategory id="5" description="Kapitan Sorokin class (ice breakers)">
-        <specific id="1" description="Kapitan Sorokin (mod)"/>
-        <specific id="2" description="Kapitan Nikolayev"/>
-        <specific id="3" description="Kapitan Dranitsyn"/>
-        <specific id="4" description="Kapitan Khlebnikov"/>
-      </subcategory>
-      <subcategory id="6" description="Mudyug class (ice breakers)">
-        <specific id="1" description="Mudyug"/>
-        <specific id="2" description="Magadan"/>
-        <specific id="3" description="Dikson"/>
-      </subcategory>
-      <subcategory id="7" description="Kapitan Belousov class (ice breakers)">
-        <specific id="1" description="Kapitan Belousov"/>
-        <specific id="2" description="Kapitan Melekhov"/>
-        <specific id="3" description="Kapitan Voronin"/>
-      </subcategory>
-      <subcategory id="8" description="Dobrynya Nikitich class (ice breakers)">
-        <specific id="1" description="Afanasy Nikitin (ex-Ledokol 2)"/>
-        <specific id="2" description="Purga (1961)"/>
-        <specific id="3" description="Buran (1966)"/>
-        <specific id="4" description="Sadko (1968)"/>
-        <specific id="5" description="Dobrynya Nikitich (1960)"/>
-        <specific id="6" description="Semen Chelyuskin (ex-Ledokol 8)(1965)"/>
-        <specific id="7" description="Fedor Litke (1970)"/>
-        <specific id="8" description="Georgy Sedov (1967)"/>
-        <specific id="9" description="Semen Dezhnev (1971)"/>
-        <specific id="10" description="Ilya Muromets (1966)"/>
-        <specific id="11" description="Vasily Poyarkov (ex-Ledokol 4) (1963)"/>
-        <specific id="12" description="Ivan Moskvitin (1971)"/>
-        <specific id="13" description="Vladimir Rusanov (ex-Ledokol 7) (1964)"/>
-        <specific id="14" description="Ivan Kruzenshtern (ex-Ledokol 6) (1964)"/>
-        <specific id="15" description="Khariton Laptev (ex-Ledokol 3) (1962)"/>
-        <specific id="16" description="Vyuga (1961) (ex-Ledokol 5) (1963)"/>
-        <specific id="17" description="P Pakhtusov (1966)"/>
-        <specific id="18" description="Peresvet (1969)"/>
-        <specific id="19" description="Yerofei Khabarov"/>
-        <specific id="20" description="Yury Lisyansky (ex-Ledokol 9) (1965)"/>
-        <specific id="21" description="Plug (1961)"/>
-      </subcategory>
-      <subcategory id="9" description="Kapitan Chechkin class (ice breakers)">
-        <specific id="1" description="Kapitan Chechkin"/>
-        <specific id="2" description="Kapitan Plakhin"/>
-        <specific id="3" description="Kapitan Chadayev"/>
-        <specific id="4" description="Kapitan Krutov"/>
-        <specific id="5" description="Kapitan Bukayev"/>
-        <specific id="6" description="Kapitan Zarubin"/>
-      </subcategory>
-      <subcategory id="10" description="Kapitan Yevdokimov class (ice breakers)">
-        <specific id="1" description="Kapitan Uevdokimov"/>
-        <specific id="2" description="Kapitan Babichev"/>
-        <specific id="3" description="Kapitan Chudinov"/>
-        <specific id="4" description="Kapitan Borodkin"/>
-        <specific id="5" description="Avramiy Zavenyagin (ex-Kapitan Krylov)"/>
-        <specific id="6" description="Kapitan Metsayk"/>
-        <specific id="7" description="Kapitan Demidov"/>
-        <specific id="8" description="Kapitan Moshkin"/>
-      </subcategory>
-      <subcategory id="11" description="Kapitan Izmaylov class (ice breakers)">
-        <specific id="1" description="Kapitan M. Izmaylov"/>
-        <specific id="2" description="Kapitan Kosolapov"/>
-        <specific id="3" description="Kapitan A. Radzabov"/>
-      </subcategory>
-      <subcategory id="12" description="Stroptivy class (ice breakers)">
-        <specific id="1" description="Stroptivy"/>
-        <specific id="2" description="Stakhanovets"/>
-        <specific id="3" description="Sibirsky"/>
-        <specific id="4" description="Spravedlivy"/>
-        <specific id="5" description="Suvorovets"/>
-        <specific id="6" description="Fobos"/>
-        <specific id="7" description="Deymos"/>
-      </subcategory>
-      <subcategory id="13" description="Ivan Susanin class (armed ice breakers)">
-        <specific id="1" description="Zaisberg"/>
-        <specific id="2" description="Neva"/>
-        <specific id="3" description="Dunay"/>
-        <specific id="4" description="Ruslan"/>
-        <specific id="5" description="Imeni XXVI Syezda KPSS"/>
-        <specific id="6" description="Volga"/>
-        <specific id="7" description="Ivan Susanin"/>
-        <specific id="8" description="Imeni XXV Syezda KPSS"/>
-      </subcategory>
-    </category>
-    <category id="18" description="Utility">
-      <subcategory id="1" description="Manych class (water tankers)">
-        <specific id="1" description="Manych"/>
-        <specific id="2" description="Tagil"/>
-      </subcategory>
-      <subcategory id="2" description="Voda class (water carriers)">
-        <specific id="1" description="Abakan"/>
-        <specific id="2" description="Sura"/>
-        <specific id="3" description="MVT 6"/>
-        <specific id="4" description="9"/>
-        <specific id="5" description="10"/>
-        <specific id="6" description="16"/>
-        <specific id="7" description="17"/>
-        <specific id="8" description="18"/>
-        <specific id="9" description="20"/>
-        <specific id="10" description="21"/>
-        <specific id="11" description="24"/>
-        <specific id="12" description="134"/>
-        <specific id="13" description="135"/>
-        <specific id="14" description="138"/>
-      </subcategory>
-      <subcategory id="3" description="Pelym class (degaussing ships (YDG))">
-        <specific id="1" description="SR 70"/>
-        <specific id="2" description="SR 111"/>
-        <specific id="3" description="SR 179"/>
-        <specific id="4" description="SR 180"/>
-        <specific id="5" description="SR 191"/>
-        <specific id="6" description="SR 203"/>
-        <specific id="7" description="SR 215"/>
-        <specific id="8" description="SR 218"/>
-        <specific id="9" description="SR 221"/>
-        <specific id="10" description="SR 222"/>
-        <specific id="11" description="SR 233"/>
-        <specific id="12" description="SR 241"/>
-        <specific id="13" description="SR 276"/>
-        <specific id="14" description="SR 280"/>
-        <specific id="15" description="SR 281"/>
-        <specific id="16" description="SR 407"/>
-        <specific id="17" description="SR 409"/>
-        <specific id="18" description="SR 455"/>
-      </subcategory>
-      <subcategory id="4" description="Bereza Class (degaussing ships (YDG))">
-        <specific id="1" description="SR 28"/>
-        <specific id="2" description="SR 59"/>
-        <specific id="3" description="SR 74"/>
-        <specific id="4" description="SR 120"/>
-        <specific id="5" description="SR 137"/>
-        <specific id="6" description="SR 188"/>
-        <specific id="7" description="SR 216"/>
-        <specific id="8" description="SR 370"/>
-        <specific id="9" description="SR 478"/>
-        <specific id="10" description="SR 479"/>
-        <specific id="11" description="SR 541"/>
-        <specific id="12" description="SR 548"/>
-        <specific id="13" description="SR 568"/>
-        <specific id="14" description="SR 569"/>
-        <specific id="15" description="SR 570"/>
-        <specific id="16" description="SR 936"/>
-        <specific id="17" description="SR 939"/>
-      </subcategory>
-      <subcategory id="5" description="Khabarov class (degaussing ships (YDG))">
-        <specific id="1" description="Khabarov"/>
-        <specific id="2" description="SR 164"/>
-      </subcategory>
-      <subcategory id="6" description="Sekstan class"/>
-      <subcategory id="7" description="Korall class"/>
-      <subcategory id="8" description="Baklazhan class (tugs)">
-        <specific id="1" description="SB 131 Nikolai Chiker"/>
-        <specific id="2" description="SB 135"/>
-      </subcategory>
-      <subcategory id="9" description="Neftegaz class (tugs)">
-        <specific id="1" description="Aleksey Kortunov"/>
-        <specific id="2" description="Ilga"/>
-        <specific id="3" description="Umka"/>
-        <specific id="4" description="Kalar"/>
-      </subcategory>
-      <subcategory id="10" description="Goryn class (tugs)">
-        <specific id="1" description="MB 15"/>
-        <specific id="2" description="MB 119"/>
-        <specific id="3" description="MB 18"/>
-        <specific id="4" description="SB 365 (ex-MB 29)"/>
-        <specific id="5" description="MB 32"/>
-        <specific id="6" description="SB 521 (ex-MB 61)"/>
-        <specific id="7" description="MB 35"/>
-        <specific id="8" description="SB 522 (ex-MB 62)"/>
-        <specific id="9" description="MB 36"/>
-        <specific id="10" description="SB 523 (ex-MB 64)"/>
-        <specific id="11" description="MB 38"/>
-        <specific id="12" description="SB 524 (ex-MB 108)"/>
-        <specific id="13" description="MB 105"/>
-      </subcategory>
-      <subcategory id="11" description="Sorum class (tugs)">
-        <specific id="1" description="Amur"/>
-        <specific id="2" description="Primorye"/>
-        <specific id="3" description="Brest"/>
-        <specific id="4" description="Bug"/>
-        <specific id="5" description="Burya"/>
-        <specific id="6" description="Chukotka"/>
-        <specific id="7" description="Kamchatka"/>
-        <specific id="8" description="Karelia"/>
-        <specific id="9" description="Ladoga"/>
-        <specific id="10" description="Neman"/>
-        <specific id="11" description="Sakhalin"/>
-        <specific id="12" description="Ural"/>
-        <specific id="13" description="Victor Kingsiepp"/>
-        <specific id="14" description="Yan Berzin"/>
-        <specific id="15" description="Yenisey"/>
-        <specific id="16" description="Zabaykalye"/>
-        <specific id="17" description="Zapolarye"/>
-        <specific id="18" description="MB 4"/>
-        <specific id="19" description="MB 6"/>
-        <specific id="20" description="MB 13"/>
-        <specific id="21" description="MB 19"/>
-        <specific id="22" description="MB 25"/>
-        <specific id="23" description="MB 26"/>
-        <specific id="24" description="MB 28"/>
-        <specific id="25" description="MB 30"/>
-        <specific id="26" description="MB 31"/>
-        <specific id="27" description="MB 37"/>
-        <specific id="28" description="MB 56"/>
-        <specific id="29" description="MB 58"/>
-        <specific id="30" description="MB 61"/>
-        <specific id="31" description="MB 76"/>
-        <specific id="32" description="MB 99"/>
-        <specific id="33" description="MB 110"/>
-        <specific id="34" description="MB 147"/>
-        <specific id="35" description="MB 148"/>
-        <specific id="36" description="MB 196"/>
-        <specific id="37" description="MB 236"/>
-        <specific id="38" description="MB 304"/>
-        <specific id="39" description="MB 307"/>
-      </subcategory>
-      <subcategory id="12" description="Okhtensky class (tugs)">
-        <specific id="1" description="Loksa"/>
-        <specific id="2" description="Orion"/>
-        <specific id="3" description="Saturn"/>
-        <specific id="4" description="Neptun"/>
-        <specific id="5" description="Pochetny"/>
-        <specific id="6" description="Tyulen"/>
-      </subcategory>
-      <subcategory id="13" description="Roslavl class (tugs)">
-        <specific id="1" description="MB 50"/>
-        <specific id="2" description="MB 94"/>
-        <specific id="3" description="MB 95"/>
-        <specific id="4" description="MB 102"/>
-        <specific id="5" description="MB 125"/>
-        <specific id="6" description="MB 145"/>
-        <specific id="7" description="MB 146"/>
-        <specific id="8" description="MB 147"/>
-        <specific id="9" description="SB 41"/>
-        <specific id="10" description="SB 46"/>
-      </subcategory>
-      <subcategory id="14" description="Zenit class (tugs)"/>
-      <subcategory id="15" description="Scholle class (harbor tugs)"/>
-      <subcategory id="16" description="Tugur class (harbor tugs)"/>
-      <subcategory id="17" description="Sidehole (1, 2) classes (harbor tugs)"/>
-    </category>
-    <category id="50" description="Frigate">
-      <subcategory id="1" description="Grisha I class"/>
-      <subcategory id="2" description="Grisha II class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="U-200 Vinnitsa (Ukraine) (Ex-Dneper)"/>
-        <specific id="11" description="(deleted)"/>
-        <specific id="12" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="Grisha III class"/>
-      <subcategory id="4" description="Grisha V class"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="Petya I class"/>
-      <subcategory id="7" description="Petya II class"/>
-      <subcategory id="8" description="Riga class"/>
-      <subcategory id="9" description="Krivak III (Zaliv (Kerch))">
-        <specific id="1" description="Menzhinsky"/>
-        <specific id="2" description="Derzhinsky"/>
-        <specific id="3" description="Orel"/>
-        <specific id="4" description="Imeni lXX Letiya Vchk-Kgb"/>
-        <specific id="5" description="Imeni lXX Letiya Pogranvoysk"/>
-        <specific id="6" description="Kedrov"/>
-        <specific id="7" description="Vorovsky"/>
-        <specific id="8" description="Hetman Dorosenko"/>
-        <specific id="9" description="Hetman Petr Sagadachny"/>
-      </subcategory>
-      <subcategory id="10" description="Parchim II Class"/>
-      <subcategory id="11" description="Petya III Class"/>
-      <subcategory id="12" description="Koni Class"/>
-    </category>
-    <category id="52" description="Heavy Cruiser"/>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Akvamarinovyy"/>
-        <specific id="2" description="Ivan Susanin"/>
-        <specific id="3" description="Kapitan Chukhchin"/>
-      </subcategory>
-      <subcategory id="2" description="Small Fishing Boat"/>
-      <subcategory id="3" description="Medium Fishing Boat"/>
-      <subcategory id="4" description="Large Fishing Boat"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="222">
-    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
-      <subcategory id="1" description="Typhoon class"/>
-      <subcategory id="2" description="Delta IV class"/>
-      <subcategory id="3" description="Delta III class"/>
-      <subcategory id="4" description="Delta II class"/>
-      <subcategory id="5" description="Delta I class"/>
-      <subcategory id="6" description="Yankee I class"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)Golf I class"/>
-      <subcategory id="11" description="(deleted)"/>
-    </category>
-    <category id="2" description="SSGN (Nuclear Guided Missile)">
-      <subcategory id="1" description="Oscar II class"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="Yankee conversion class"/>
-      <subcategory id="7" description="Severodvinsk class"/>
-    </category>
-    <category id="3" description="SSN (Nuclear Attack-Torpedo)">
-      <subcategory id="1" description="Victor III Class"/>
-      <subcategory id="2" description="Victor II class"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="Yankee Notch class"/>
-      <subcategory id="5" description="Sierra II class">
-        <specific id="1" description="Orel"/>
-        <specific id="2" description="Kasatka"/>
-      </subcategory>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="Alfa class"/>
-      <subcategory id="8" description="Akula class">
-        <specific id="1" description="Bars"/>
-        <specific id="2" description="Leopard"/>
-        <specific id="3" description="Pantera"/>
-        <specific id="4" description="Puma"/>
-        <specific id="5" description="Volk"/>
-        <specific id="6" description="Tigr"/>
-      </subcategory>
-      <subcategory id="9" description="Akula II Class"/>
-    </category>
-    <category id="4" description="SSG (Conventional Guided Missile)">
-      <subcategory id="1" description="(deleted)"/>
-    </category>
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Kilo class"/>
-      <subcategory id="2" description="Tango class"/>
-      <subcategory id="3" description="Foxtrot class"/>
-      <subcategory id="4" description="Romeo class">
-        <specific id="1" description="(North Korean Romeo SS (Snorkle))"/>
-        <specific id="2" description="(North Korean Romeo SS (Split Plant))"/>
-        <specific id="3" description="Romeo"/>
-      </subcategory>
-      <subcategory id="5" description="Whiskey Class"/>
-    </category>
-    <category id="6" description="SSAN (Nuclear Auxiliary)">
-      <subcategory id="1" description="Yankee class (ex-SSBN)"/>
-      <subcategory id="2" description="Uniform class"/>
-      <subcategory id="3" description="Paltus class"/>
-    </category>
-    <category id="7" description="SSA (Conventional Auxiliary)">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Lima class"/>
-      <subcategory id="4" description="Beluga class"/>
-      <subcategory id="5" description="X-Ray class"/>
-      <subcategory id="6" description="India class"/>
-      <subcategory id="7" description="Bravo class (target sub)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="222">
-    <category id="0" description="Other">
-      <subcategory id="0" description="Astronomical Module">
-        <specific id="1" description="Kavant 1"/>
-        <specific id="2" description="Kavant 2"/>
-        <specific id="3" description="Priroda"/>
-        <specific id="4" description="Spektrum"/>
-        <specific id="5" description="Kristall"/>
-      </subcategory>
-    </category>
-    <category id="1" description="Manned">
-      <subcategory id="1" description="Space Shuttle">
-        <specific id="1" description="Buran"/>
-      </subcategory>
-      <subcategory id="2" description="Space Station">
-        <specific id="1" description="Mir"/>
-        <specific id="2" description="Kvant"/>
-        <specific id="3" description="Resurs-F2"/>
-      </subcategory>
-      <subcategory id="3" description="Space vehicles">
-        <specific id="1" description="Phobos 2"/>
-        <specific id="2" description="Soyuz-TM"/>
-        <specific id="3" description="Phobos"/>
-        <specific id="4" description="Progress"/>
-        <specific id="5" description="Progress-M"/>
-        <specific id="6" description="Prognaz"/>
-        <specific id="7" description="Vostok"/>
-        <specific id="8" description="Molniya"/>
-        <specific id="9" description="Cosmos"/>
-        <specific id="10" description="Proton K"/>
-        <specific id="11" description="Proton KM"/>
-        <specific id="12" description="Tsyklon"/>
-        <specific id="13" description="Zenit"/>
-        <specific id="14" description="Lomonosov (MHB)"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Unmanned">
-      <subcategory id="1" description="Communication satellite">
-        <specific id="1" description="Molniya"/>
-      </subcategory>
-      <subcategory id="2" description="Navigation satellite">
-        <specific id="1" description="GEO-IK Geodedic Cosmos"/>
-        <specific id="2" description="Elektron"/>
-      </subcategory>
-      <subcategory id="3" description="Early Warning satellite">
-        <specific id="1" description="Cosmos"/>
-      </subcategory>
-      <subcategory id="4" description="Electronic Intelligence satellite">
-        <specific id="1" description="Elints"/>
-      </subcategory>
-      <subcategory id="6" description="Ocean surveillance satellite">
-        <specific id="1" description="Okean"/>
-        <specific id="2" description="Eorsats"/>
-      </subcategory>
-      <subcategory id="8" description="Optical imaging surveillance satellite">
-        <specific id="1" description="Venera"/>
-        <specific id="2" description="Generation"/>
-      </subcategory>
-      <subcategory id="10" description="Minor military satellite">
-        <specific id="1" description="C2093"/>
-        <specific id="2" description="C2002"/>
-        <specific id="3" description="C2059"/>
-        <specific id="4" description="C2075"/>
-        <specific id="5" description="C2137"/>
-        <specific id="6" description="C2164"/>
-        <specific id="7" description="C1985"/>
-        <specific id="8" description="C2053"/>
-        <specific id="9" description="C2106"/>
-      </subcategory>
-      <subcategory id="11" description="Illuminating satellite">
-        <specific id="1" description="Reflector"/>
-        <specific id="2" description="Energia"/>
-      </subcategory>
-      <subcategory id="12" description="Microwave activity">
-        <specific id="1" description="Relikt"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="224">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="Chieftain MBT"/>
-      <subcategory id="2" description="Challenger MBT">
-        <specific id="1" description="Mark I"/>
-        <specific id="2" description="Mark II"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Armored fighting vehicle">
-      <subcategory id="1" description="FV 432 (APC)">
-        <specific id="1" description="Ambulance"/>
-        <specific id="2" description="81mm mortar carrier"/>
-      </subcategory>
-      <subcategory id="2" description="FV 103 Spartan (APC)"/>
-      <subcategory id="3" description="FV 601 Saladin"/>
-      <subcategory id="4" description="FV 107 Scimitar"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="FV 603 Saracen"/>
-      <subcategory id="7" description="AT 105 Saxon"/>
-      <subcategory id="8" description="FV 510 Warrior"/>
-      <subcategory id="9" description="FV 711 Ferret"/>
-      <subcategory id="10" description="FV 721 Fox"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="FV 102 Striker"/>
-      <subcategory id="13" description="FV 101 Scorpion"/>
-      <subcategory id="14" description="FV 106 Samson"/>
-    </category>
-    <category id="3" description="Armored utility vehicle">
-      <subcategory id="1" description="FV 4204 Chieftain ARV"/>
-      <subcategory id="2" description="Challenger ARV"/>
-      <subcategory id="3" description="FV 4003 Centurion (MK 5) AVRE"/>
-      <subcategory id="4" description="Chieftain AVRE"/>
-      <subcategory id="5" description="Combat Engineer tractor"/>
-      <subcategory id="6" description="FV 4205 Chieftain AVLB"/>
-      <subcategory id="7" description="Mobile bridge">
-        <specific id="1" description="M2"/>
-        <specific id="2" description="M3"/>
-      </subcategory>
-      <subcategory id="8" description="FV 105 Sultan"/>
-      <subcategory id="9" description="FV 104 Samaritan"/>
-      <subcategory id="10" description="FV 512 Warrior Repair Vehicle"/>
-      <subcategory id="11" description="FV 513 Warrior Recovery Vehicle"/>
-    </category>
-    <category id="4" description="Self-propelled artillery">
-      <subcategory id="1" description="FV 433 Abbot 105-mm Howitzer"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="Stormer HVM Carrier"/>
-      <subcategory id="7" description="AS90 155-mm"/>
-    </category>
-    <category id="5" description="Towed artillery">
-      <subcategory id="1" description="FH-70 155-mm gun"/>
-      <subcategory id="2" description="L-118 105-mm"/>
-      <subcategory id="3" description="M-56 105-mm"/>
-      <subcategory id="4" description="5.5-in/140-mm"/>
-    </category>
-    <category id="6" description="Small wheeled utility vehicle">
-      <subcategory id="1" description="LWB Land Rover"/>
-      <subcategory id="2" description="Land Rover 6x6 truck"/>
-      <subcategory id="3" description="Tractor, aircraft towing"/>
-    </category>
-    <category id="7" description="Large wheeled utility vehicle">
-      <subcategory id="1" description="4 Tonne"/>
-      <subcategory id="2" description="8 Tonne"/>
-      <subcategory id="3" description="8 Tonne fuel"/>
-      <subcategory id="4" description="14 Tonne"/>
-      <subcategory id="5" description="14 Tonne with bridge trailer"/>
-    </category>
-    <category id="8" description="Small tracked utility vehicle"/>
-    <category id="9" description="Large tracked utility vehicle"/>
-    <category id="10" description="Mortar"/>
-    <category id="11" description="Mine plow">
-      <subcategory id="1" description="Mortar, 51mm, L10A1"/>
-    </category>
-    <category id="12" description="Mine rake"/>
-    <category id="13" description="Mine roller"/>
-    <category id="14" description="Cargo trailer">
-      <subcategory id="1" description="0 - 0.5 ton"/>
-      <subcategory id="2" description="0.51 - 2 ton"/>
-      <subcategory id="3" description="2.01 - 5 ton"/>
-      <subcategory id="4" description="5.02 - 10 ton"/>
-      <subcategory id="5" description="greater than 10 tons"/>
-    </category>
-    <category id="15" description="Fuel trailer">
-      <subcategory id="1" description="1-1000 gallons"/>
-      <subcategory id="2" description="1001 - 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="16" description="Generator trailer">
-      <subcategory id="1" description="0 - 100 KW"/>
-      <subcategory id="2" description="greater than 100 KW"/>
-    </category>
-    <category id="17" description="Water trailer">
-      <subcategory id="1" description="1-1000 gallons"/>
-      <subcategory id="2" description="1001- 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="18" description="Engineer equipment">
-      <subcategory id="1" description="Mine clearing line charge"/>
-      <subcategory id="2" description="Dozer blade kit"/>
-      <subcategory id="3" description="Lane marking system"/>
-    </category>
-    <category id="19" description="Heavy equipment transport trailer"/>
-    <category id="20" description="Maintenance equipment trailer">
-      <subcategory id="1" description="Welding trailer"/>
-      <subcategory id="2" description="Compressor"/>
-      <subcategory id="3" description="Tools/parts trailer"/>
-    </category>
-    <category id="21" description="Limber"/>
-    <category id="22" description="Chemical decontamination trailer"/>
-    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
-      <subcategory id="1" description="Rapier SAM System">
-        <specific id="1" description="Rapier Battery Command Post (BCP)"/>
-        <specific id="2" description="Rapier Launcher">
-          <extra id="1" description="Standard 4-Round Launcher"/>
-          <extra id="2" description="6-Round Launcher (Darkfire variant)"/>
-          <extra id="3" description="8-Round Launcher (Rapier 2000/JERNAS)"/>
-          <extra id="4" description="Tracked Rapier"/>
-        </specific>
-        <specific id="3" description="Blindfire Engagement Radar (DN-181)"/>
-        <specific id="4" description="Dagger Surveillance Radar (Rapier 2000/JERNAS)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="224">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="Tornado ADV">
-        <specific id="1" description="Tornado F. Mk2"/>
-        <specific id="2" description="Tornado F. Mk 2A"/>
-        <specific id="3" description="Tornado F. Mk 3"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Eurofighter 2000"/>
-    </category>
-    <category id="2" description="Attack/Strike">
-      <subcategory id="1" description="Sea Harrier">
-        <specific id="1" description="Sea Harrier FRS. Mk 1"/>
-        <specific id="2" description="Sea Harrier T. Mk 4"/>
-        <specific id="3" description="Sea Harrier FRS. Mk 51"/>
-      </subcategory>
-      <subcategory id="2" description="Harrier">
-        <specific id="1" description="Harrier GR. Mk 3"/>
-        <specific id="2" description="Harrier T. Mk 4"/>
-        <specific id="3" description="Harrier GR. 5"/>
-        <specific id="4" description="Harrier GR. 7"/>
-        <specific id="5" description="VA.1 Matador (AV-8S &amp; TAV-8S)"/>
-        <specific id="6" description="Harrier GR. Mk9"/>
-      </subcategory>
-      <subcategory id="3" description="BAe HS Buccaneer"/>
-      <subcategory id="4" description="Tornado">
-        <specific id="1" description="Tornado GR Mk 1"/>
-        <specific id="2" description="Tornado GR Mk 1A"/>
-        <specific id="3" description="Tornado GR Mk 4"/>
-      </subcategory>
-      <subcategory id="5" description="Jaguar">
-        <specific id="1" description="Jaguar GR1 Mk 1"/>
-        <specific id="2" description="Jaguar GR1 Mk 1A"/>
-        <specific id="3" description="Jaguar GR Mk3"/>
-        <specific id="4" description="Jaguar GR Mk3A"/>
-      </subcategory>
-      <subcategory id="6" description="BAe Hawk">
-        <specific id="1" description="Hawk T Mk 1"/>
-        <specific id="2" description="Hawk T Mk 1A"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="K-2 Victor"/>
-      <subcategory id="2" description="Hercules C130">
-        <specific id="1" description="Hercules C. Mk 1"/>
-        <specific id="2" description="Hercules C. Mk 1P"/>
-        <specific id="3" description="Hercules C. MK 1K"/>
-        <specific id="4" description="Hercules C. Mk 3P"/>
-      </subcategory>
-      <subcategory id="3" description="BAe 146">
-        <specific id="1" description="BAe 146 CC. Mk 2"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="Sea Devon"/>
-      <subcategory id="6" description="Sea Heron"/>
-      <subcategory id="7" description="V-22 Osprey"/>
-      <subcategory id="8" description="BAe (BAC/Vickers) VC-10">
-        <specific id="1" description="VC-10 C. Mk1(K)"/>
-        <specific id="2" description="VC-10 K. Mk 2"/>
-        <specific id="3" description="VC-10 K. Mk 3"/>
-        <specific id="4" description="VC-10 K. Mk 4"/>
-      </subcategory>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="Pilatus Britten-Norman Defender">
-        <specific id="1" description="Islander CC. Mk 2"/>
-        <specific id="2" description="Islander AL. Mk 1"/>
-        <specific id="3" description="Maritime Defender"/>
-        <specific id="4" description="Turbine Defender"/>
-      </subcategory>
-      <subcategory id="12" description="Shorts 330 Sherpa">
-        <specific id="1" description="C-23A"/>
-        <specific id="2" description="C-23B"/>
-        <specific id="3" description="Shorts 330-UTT"/>
-        <specific id="4" description="Skyvan SC7"/>
-      </subcategory>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="BAe HS 748MF">
-        <specific id="1" description="Andover C. Mk 1"/>
-      </subcategory>
-      <subcategory id="15" description="Vickers VC2 Viscount"/>
-      <subcategory id="16" description="L-1011 TriStar">
-        <specific id="1" description="TriStar KC Mk 1"/>
-        <specific id="2" description="TriStar K Mk 1"/>
-        <specific id="3" description="TriStar C Mk 2"/>
-      </subcategory>
-    </category>
-    <category id="5" description="ASW/patrol/observation">
-      <subcategory id="1" description="Nimrod">
-        <specific id="1" description="Nimrod R Mk 1"/>
-        <specific id="2" description="Nimrod MR Mk 2"/>
-        <specific id="3" description="Nimrod MR Mk 2P"/>
-        <specific id="4" description="Nimrod MR Mk 3"/>
-      </subcategory>
-      <subcategory id="2" description="BAe P. 132"/>
-    </category>
-    <category id="7" description="Reconnaissance">
-      <subcategory id="1" description="English Electric Canberra">
-        <specific id="1" description="Canberra PR Mk 7"/>
-        <specific id="2" description="Canberra PR Mk 9"/>
-      </subcategory>
-      <subcategory id="2" description="HS Buccaneer">
-        <specific id="1" description="Buccaneer S. Mk 2A"/>
-      </subcategory>
-      <subcategory id="3" description="Tornado">
-        <specific id="1" description="Tornado GR Mk 1 w/recon pod"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Surveillance/C2">
-      <subcategory id="1" description="E-3D Sentry AEW Mk 1"/>
-      <subcategory id="2" description="Andover">
-        <specific id="1" description="Andover C. Mk1"/>
-      </subcategory>
-      <subcategory id="3" description="Canberra">
-        <specific id="1" description="B Mk 2"/>
-        <specific id="2" description="T Mk 4"/>
-        <specific id="3" description="E Mk 15"/>
-        <specific id="4" description="E Mk 17"/>
-        <specific id="5" description="TT Mk 18"/>
-        <specific id="6" description="TT Mk 22"/>
-      </subcategory>
-      <subcategory id="4" description="Hawker Hunter">
-        <specific id="1" description="GA 11"/>
-        <specific id="2" description="T. Mk 7"/>
-        <specific id="3" description="T. Mk 8"/>
-        <specific id="4" description="PR Mk 11"/>
-      </subcategory>
-    </category>
-    <category id="20" description="Attack Helicopter">
-      <subcategory id="1" description="Boeing">
-        <specific id="1" description="WAH64"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Utility helicopter">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Westland Lynx">
-        <specific id="1" description="Mk 5"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="(deleted)"/>
-        <specific id="10" description="(deleted)"/>
-        <specific id="11" description="Mk 28"/>
-        <specific id="12" description="(deleted)"/>
-        <specific id="13" description="Mk 90"/>
-        <specific id="14" description="Mk 86"/>
-        <specific id="15" description="Mk 95"/>
-        <specific id="16" description="Mk 99"/>
-        <specific id="17" description="AH. Mk1"/>
-        <specific id="18" description="AH. Mk 7"/>
-        <specific id="19" description="AH. Mk 9"/>
-      </subcategory>
-      <subcategory id="8" description="Westland Wessex">
-        <specific id="1" description="HC.MK 2"/>
-        <specific id="2" description="HC.MK 5"/>
-      </subcategory>
-      <subcategory id="9" description="Scout"/>
-      <subcategory id="10" description="Wasp"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="(deleted)"/>
-      <subcategory id="16" description="(deleted)"/>
-      <subcategory id="17" description="(deleted)"/>
-      <subcategory id="18" description="SA 330"/>
-      <subcategory id="19" description="Westland Super Lynx">
-        <specific id="1" description="Mk 95"/>
-        <specific id="2" description="Mk 99"/>
-      </subcategory>
-    </category>
-    <category id="22" description="Antisubmarine Warfare / Patrol Helicopter">
-      <subcategory id="1" description="Westland Sea King">
-        <specific id="1" description="HAS. Mk 1"/>
-        <specific id="2" description="HAS. Mk 2"/>
-        <specific id="3" description="HAS. Mk 5"/>
-        <specific id="4" description="HAS. Mk 6"/>
-        <specific id="5" description="AEW. Mk 2A"/>
-        <specific id="6" description="HAR. Mk 3"/>
-        <specific id="7" description="HAR. Mk 5"/>
-        <specific id="8" description="Mk 41"/>
-        <specific id="9" description="Mk 42"/>
-        <specific id="10" description="Mk 42A"/>
-        <specific id="11" description="Mk 42B"/>
-        <specific id="12" description="Mk 43"/>
-        <specific id="13" description="Mk 43A"/>
-        <specific id="14" description="Mk 43B"/>
-        <specific id="15" description="Mk 45"/>
-        <specific id="16" description="Mk 47"/>
-        <specific id="17" description="Mk 48"/>
-        <specific id="18" description="Mk 50"/>
-      </subcategory>
-      <subcategory id="2" description="Westland Lynx (Naval)">
-        <specific id="1" description="HAS Mk 2"/>
-        <specific id="2" description="HAS Mk 3"/>
-        <specific id="3" description="HAS Mk 2 (FN)"/>
-        <specific id="4" description="HAS Mk 3 (FN)"/>
-        <specific id="5" description="Mk 21 (Brazil)"/>
-        <specific id="6" description="Mk 23 (Argentina)"/>
-        <specific id="7" description="Mk 25 (Netherlands)"/>
-        <specific id="8" description="Mk 27 (Netherlands)"/>
-        <specific id="9" description="MK 81 (Netherlands)"/>
-        <specific id="10" description="MK 80 (Denmark)"/>
-        <specific id="11" description="MK 8"/>
-      </subcategory>
-      <subcategory id="3" description="EH101 Merlin"/>
-    </category>
-    <category id="23" description="Cargo Helicopter">
-      <subcategory id="1" description="Westland Commando">
-        <specific id="1" description="Commando Mk 1"/>
-        <specific id="2" description="Commando Mk 2"/>
-        <specific id="3" description="Commando Mk 2B"/>
-        <specific id="4" description="Commando Mk 2E"/>
-        <specific id="5" description="Commando Mk 2A"/>
-        <specific id="6" description="Commando Mk 2C"/>
-        <specific id="7" description="Commando Mk 3"/>
-        <specific id="8" description="Indian Sea King Mk 42C"/>
-        <specific id="9" description="Sea King HC. Mk"/>
-      </subcategory>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Shorts S312 Tucano">
-        <specific id="1" description="T. Mk 1"/>
-      </subcategory>
-      <subcategory id="2" description="Bulldog">
-        <specific id="1" description="T. MK 1"/>
-      </subcategory>
-      <subcategory id="3" description="Chipmunk"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="BAe Hawk">
-        <specific id="1" description="Hawk T. Mk 1"/>
-        <specific id="2" description="Hawk T. Mk 1A"/>
-        <specific id="3" description="Goshawk T-45A"/>
-      </subcategory>
-      <subcategory id="6" description="BAe Jetstream Super 31">
-        <specific id="1" description="Jetstream T Mk 2"/>
-        <specific id="2" description="Jetstream T Mk 3"/>
-      </subcategory>
-      <subcategory id="7" description="Chieftain"/>
-      <subcategory id="8" description="BAe 125-800">
-        <specific id="1" description="C-29A"/>
-        <specific id="2" description="U-125A"/>
-      </subcategory>
-      <subcategory id="9" description="Slingsby T67 Firefly">
-        <specific id="1" description="T67M Mk II"/>
-        <specific id="2" description="T67M260"/>
-      </subcategory>
-      <subcategory id="10" description="Provost">
-        <specific id="1" description="T Mk 5"/>
-      </subcategory>
-    </category>
-    <category id="57" description="Non-Combatant Commercial Aircraft">
-      <subcategory id="1" description="Passenger Airline">
-        <specific id="1" description="British Aerospace 146-100"/>
-        <specific id="2" description="BAC-111"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="224">
-    <category id="4" description="Guided-missile Destroyer">
-      <subcategory id="1" description="Type 42">
-        <specific id="1" description="D 86 Birmingham"/>
-        <specific id="2" description="D 87 Newcastle"/>
-        <specific id="3" description="D 88 Glasgow"/>
-        <specific id="4" description="D 108 Cardiff"/>
-        <specific id="5" description="D 89 Exeter"/>
-        <specific id="6" description="D 90 Southampton"/>
-        <specific id="7" description="D 91 Nottingham"/>
-        <specific id="8" description="D 92 Liverpool"/>
-        <specific id="9" description="D 95 Manchester"/>
-        <specific id="10" description="D 96 Gloucester"/>
-        <specific id="11" description="D 97 Edinburgh"/>
-        <specific id="12" description="D 98 York"/>
-      </subcategory>
-      <subcategory id="2" description="Type 45">
-        <specific id="1" description="D 32 Daring"/>
-        <specific id="2" description="D 33 Dauntless"/>
-        <specific id="3" description="D 34 Diamond"/>
-        <specific id="4" description="D 35 Dragon"/>
-        <specific id="5" description="D 36 Defender"/>
-        <specific id="6" description="D 37 Duncan"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided-missile Frigate">
-      <subcategory id="1" description="Duke class (Type 23)">
-        <specific id="1" description="F 230 Norfolk"/>
-        <specific id="2" description="F 231 Argyll"/>
-        <specific id="3" description="F 229 Lancaster (ex-F 232)"/>
-        <specific id="4" description="F 233 Marlborough"/>
-        <specific id="5" description="F 234 Iron Duke"/>
-        <specific id="6" description="F 235 Monmouth"/>
-        <specific id="7" description="F 236 Montrose"/>
-        <specific id="8" description="F 237 Westminster"/>
-        <specific id="9" description="F 238 Northumberland"/>
-        <specific id="10" description="F 239 Richmond"/>
-        <specific id="11" description="F 240 Somerset"/>
-        <specific id="12" description="F 241 Grafton"/>
-        <specific id="13" description="F 242 Sutherland"/>
-      </subcategory>
-      <subcategory id="2" description="Broadsword class (Type 22)">
-        <specific id="1" description="F 88 Broadsword"/>
-        <specific id="2" description="F 89 Battleaxe"/>
-        <specific id="3" description="F 90 Brilliant"/>
-        <specific id="4" description="F 91 Brazen"/>
-        <specific id="5" description="F 92 Boxer"/>
-        <specific id="6" description="F 93 Beaver"/>
-        <specific id="7" description="F 94 Brave"/>
-        <specific id="8" description="F 95 London (ex-Bloodhound)"/>
-        <specific id="9" description="F 96 Sheffield"/>
-        <specific id="10" description="F 98 Coventry"/>
-        <specific id="11" description="F 85 Cumberland"/>
-        <specific id="12" description="F 86 Campbeltown"/>
-        <specific id="13" description="F 87 Chatham"/>
-        <specific id="14" description="F 99 Cornwall"/>
-      </subcategory>
-      <subcategory id="3" description="Amazon class (Type 21)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="F 181 Tariq (Pak.)"/>
-        <specific id="8" description="F 182 Babur (Pak.)"/>
-        <specific id="9" description="F 183 Khaibir (Pak.)"/>
-        <specific id="10" description="F 184 Badr (Pak.)"/>
-        <specific id="11" description="F 185 Shahjahan (Pak.)"/>
-        <specific id="12" description="F 186 Tippu Sultan (Pak.)"/>
-      </subcategory>
-      <subcategory id="4" description="Leander Class">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="Condell (Chile)"/>
-        <specific id="6" description="Lynch (Chile)"/>
-        <specific id="7" description="Ministro Zenteno (Chile)"/>
-        <specific id="8" description="General Baquedano (Chile)"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/patrol craft">
-      <subcategory id="1" description="Antarctic patrol ship">
-        <specific id="1" description="A 176 Polar Circle"/>
-      </subcategory>
-      <subcategory id="2" description="Castle class (offshore patrol vessels MK 2)">
-        <specific id="1" description="P 258 Leeds Castle"/>
-        <specific id="2" description="Dumbarton Castle"/>
-      </subcategory>
-      <subcategory id="3" description="Island class (offshore patrol vessels)">
-        <specific id="1" description="P 277 Anglesey"/>
-        <specific id="2" description="P 278 Alderney"/>
-        <specific id="3" description="P 295 Jersey"/>
-        <specific id="4" description="P 297 Guernsey"/>
-        <specific id="5" description="P 298 Shetland"/>
-        <specific id="6" description="P 299 Orkney"/>
-        <specific id="7" description="P 300 Lindisfarne"/>
-      </subcategory>
-      <subcategory id="4" description="Peacock class (large patrol craft)">
-        <specific id="1" description="P 239 Peacock"/>
-        <specific id="2" description="P 240 Plover"/>
-        <specific id="3" description="P 241 Starling"/>
-      </subcategory>
-      <subcategory id="5" description="Bird and Seal class (large patrol craft)">
-        <specific id="1" description="P 259 Redpole (ex-Sea Otter)"/>
-        <specific id="2" description="P 260 Kingfisher"/>
-        <specific id="3" description="P 261 Cygnet"/>
-      </subcategory>
-      <subcategory id="6" description="Archer class (training and patrol craft)">
-        <specific id="1" description="P 264 Archer"/>
-        <specific id="2" description="P 270 Biter"/>
-        <specific id="3" description="P 272 Smiter"/>
-        <specific id="4" description="P 273 Pursuer"/>
-        <specific id="5" description="P 279 Blazer"/>
-        <specific id="6" description="P 280 Dasher"/>
-        <specific id="7" description="P 291 Puncher"/>
-        <specific id="8" description="P 292 Charger"/>
-        <specific id="9" description="P 293 Ranger"/>
-        <specific id="10" description="P 294 Trumpeter"/>
-        <specific id="11" description="A 153 Example (RNXS)"/>
-        <specific id="12" description="A 154 Explorer (RNXS)"/>
-        <specific id="13" description="A 163 Express (RNXS)"/>
-        <specific id="14" description="A 167 Exploit (RNXS)"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Hunt class (minesweepers/minehunters, coastal)">
-        <specific id="1" description="M 29 Brecon"/>
-        <specific id="2" description="M 30 Ledbury"/>
-        <specific id="3" description="M 31 Cattistock"/>
-        <specific id="4" description="M 32 Cottesmore"/>
-        <specific id="5" description="M 33 Brocklesby"/>
-        <specific id="6" description="M 34 Middleton"/>
-        <specific id="7" description="M 35 Dulverton"/>
-        <specific id="8" description="M 36 Bicester"/>
-        <specific id="9" description="M 37 Chiddingfold"/>
-        <specific id="10" description="M 38 Atherstone"/>
-        <specific id="11" description="M 39 Hurworth"/>
-        <specific id="12" description="M 40 Berkeley"/>
-        <specific id="13" description="M 41 Quorn"/>
-      </subcategory>
-      <subcategory id="2" description="River class (minesweepers, coastal)">
-        <specific id="1" description="M 2003 Waveney"/>
-        <specific id="2" description="M 2004 Carron"/>
-        <specific id="3" description="M 2005 Dovey"/>
-        <specific id="4" description="M 2006 Helford"/>
-        <specific id="5" description="M 2007 Humber"/>
-        <specific id="6" description="M 2008 Blackwater"/>
-        <specific id="7" description="M 2009 Itchen"/>
-        <specific id="8" description="M 2010 Helmsdale"/>
-        <specific id="9" description="M 2011 Orwell"/>
-        <specific id="10" description="M2012 Ribble"/>
-        <specific id="11" description="M 2013 Spey"/>
-        <specific id="12" description="M 2014 Arun"/>
-      </subcategory>
-      <subcategory id="3" description="Ton class (coastal minehunters)">
-        <specific id="1" description="M 1114 Brinton"/>
-        <specific id="2" description="M 1151 Iveston"/>
-        <specific id="3" description="M 1154 Kellington"/>
-        <specific id="4" description="M 1166 Nurton"/>
-        <specific id="5" description="M 1181 Sheraton"/>
-      </subcategory>
-      <subcategory id="4" description="Sandown class (minehunters)">
-        <specific id="1" description="M 101 Sandown"/>
-        <specific id="2" description="M 102 Inverness"/>
-        <specific id="3" description="M 103 Cromer"/>
-        <specific id="4" description="M 104 Walney"/>
-        <specific id="5" description="M 105 Bridport"/>
-        <specific id="6" description="M 106 Penzance"/>
-        <specific id="7" description="M 107 Pembroke"/>
-        <specific id="8" description="M 108 Grimsby"/>
-        <specific id="9" description="M 109 Bangor"/>
-      </subcategory>
-    </category>
-    <category id="9" description="Dock Landing Ship">
-      <subcategory id="1" description="Bay Class">
-        <specific id="1" description="Largs Bay"/>
-        <specific id="2" description="Lyme Bay"/>
-        <specific id="3" description="Mounts Bay"/>
-        <specific id="4" description="Cardigan Bay"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Tank landing ship">
-      <subcategory id="1" description="Sir Bedivere Class (LSL)"/>
-      <subcategory id="2" description="Sir Galahad Class (LSL)"/>
-    </category>
-    <category id="12" description="Light carrier">
-      <subcategory id="1" description="Light aircraft carrier (CVSG)">
-        <specific id="1" description="R 05 Invincible"/>
-        <specific id="2" description="R 06 Illustrious"/>
-        <specific id="3" description="R 07 Ark Royal"/>
-        <specific id="4" description="R 22 VIRAAT (India)"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Leander class (training ships)">
-        <specific id="1" description="F 52 Juno"/>
-      </subcategory>
-      <subcategory id="2" description="Dartmouth training ship">
-        <specific id="1" description="M1116 Wilton"/>
-      </subcategory>
-      <subcategory id="3" description="Improved Hecla class (survey)">
-        <specific id="1" description="A 138 Herald"/>
-      </subcategory>
-      <subcategory id="4" description="Hecla class (survey)">
-        <specific id="1" description="A 133 Hecla"/>
-      </subcategory>
-      <subcategory id="5" description="A 317 Bulldog class (survey)">
-        <specific id="1" description="A 317 Bulldog"/>
-        <specific id="2" description="A 319 Beagle"/>
-      </subcategory>
-      <subcategory id="6" description="Roebuck class (survey)">
-        <specific id="1" description="A 130 Roebuck"/>
-      </subcategory>
-      <subcategory id="7" description="Ol class (large fleet tankers (AO))">
-        <specific id="1" description="A 122 Olwen"/>
-        <specific id="2" description="A 123 Olna"/>
-        <specific id="3" description="A 124 Olmeda"/>
-      </subcategory>
-      <subcategory id="8" description="Appleleaf class (support tankers (AOT))">
-        <specific id="1" description="A 81 Brambleleaf (ex-Hudson Cavalier)"/>
-        <specific id="2" description="A 109 Bayleaf"/>
-        <specific id="3" description="A 110 Orangeleaf (ex-Balder London, ex-Hudson Progress)"/>
-        <specific id="4" description="O 195 Westralia (ex. A79 Hudson Cavalier)"/>
-      </subcategory>
-      <subcategory id="9" description="Rover class (small fleet tankers (AOL))">
-        <specific id="1" description="A 269 Grey Rover"/>
-        <specific id="2" description="A 270 Blue rover"/>
-        <specific id="3" description="A 271 Gold rover"/>
-        <specific id="4" description="A 273 Black rover"/>
-      </subcategory>
-      <subcategory id="10" description="Fort Victoria class (fleet replenishment)">
-        <specific id="1" description="A 387 Fort Victoria"/>
-        <specific id="2" description="A 388 Fort George"/>
-      </subcategory>
-      <subcategory id="11" description="Fort Grange class (AFS(H))">
-        <specific id="1" description="A 385 Fort Grange"/>
-        <specific id="2" description="A 386 Fort Austin"/>
-      </subcategory>
-      <subcategory id="12" description="Regent class (AFS(H))">
-        <specific id="1" description="A 480 Resource"/>
-        <specific id="2" description="A 486 Regent"/>
-      </subcategory>
-      <subcategory id="13" description="Stena type (forward repair ship)">
-        <specific id="1" description="A 132 Diligence (ex-Stena Inspector)"/>
-      </subcategory>
-      <subcategory id="14" description="Sal Class (salvage &amp; mooring)">
-        <specific id="1" description="A 185 Salmoor"/>
-        <specific id="2" description="A 186 Salmaster"/>
-        <specific id="3" description="A 187 Salmaid"/>
-      </subcategory>
-      <subcategory id="15" description="Wild Duck class (salvage &amp; mooring)">
-        <specific id="1" description="A 164 Goosander"/>
-        <specific id="2" description="A 165 Pochard"/>
-      </subcategory>
-      <subcategory id="16" description="Moorhen class (salvage &amp; mooring)">
-        <specific id="1" description="Y 32 Moorhen"/>
-        <specific id="2" description="Y 33 Moorfowl"/>
-        <specific id="3" description="A 72 Cameron"/>
-      </subcategory>
-      <subcategory id="17" description="Oilpress class (coastal tankers)">
-        <specific id="1" description="Y 21 Oilpress"/>
-        <specific id="2" description="Y 22 Oilstone"/>
-        <specific id="3" description="Y 23 Oilwell"/>
-        <specific id="4" description="Y 25 Oilbird"/>
-        <specific id="5" description="Y 26 Oilman"/>
-      </subcategory>
-      <subcategory id="18" description="Tornado class (torpedo recovery)">
-        <specific id="1" description="A 140 Tornado"/>
-        <specific id="2" description="A 141 Torch a 141"/>
-        <specific id="3" description="A 142 Tormentor"/>
-        <specific id="4" description="A 143 Toreador"/>
-      </subcategory>
-      <subcategory id="19" description="Water class (water carriers)">
-        <specific id="1" description="Y 17 Waterfall"/>
-        <specific id="2" description="Y 18 Watershed"/>
-        <specific id="3" description="Y 19 Waterspout"/>
-        <specific id="4" description="Y 30 Watercourse"/>
-        <specific id="5" description="Y 31 Waterfowl"/>
-        <specific id="6" description="A 146 Waterman"/>
-      </subcategory>
-      <subcategory id="20" description="Seal class (lrrsc) (aviation support)">
-        <specific id="1" description="5000 Seal"/>
-        <specific id="2" description="5001 Seagull"/>
-      </subcategory>
-      <subcategory id="21" description="Spitfire class (rttl mk 3) (aviation support)">
-        <specific id="1" description="4000 Spitfire"/>
-        <specific id="2" description="4003 Halifax"/>
-        <specific id="3" description="4004 Hampden"/>
-        <specific id="4" description="4005 Hurricane"/>
-        <specific id="5" description="4006 Lancaster"/>
-        <specific id="6" description="4007 Wellington"/>
-      </subcategory>
-      <subcategory id="22" description="Insect class (fleet tenders)">
-        <specific id="1" description="A 216 Bee"/>
-        <specific id="2" description="A 229 Cricket"/>
-        <specific id="3" description="A 230 Cockchafer"/>
-        <specific id="4" description="A 239 Gnat"/>
-        <specific id="5" description="A 253 Ladybird"/>
-        <specific id="6" description="A 263 Cicada"/>
-        <specific id="7" description="A 272 Scarab"/>
-      </subcategory>
-      <subcategory id="23" description="Loyal class (RNXs) (fleet tenders)">
-        <specific id="1" description="A 157 Loyal Helper"/>
-        <specific id="2" description="A 158 Supporter (ex-Loyal Supporter)"/>
-        <specific id="3" description="A 159 Loyal Watcher"/>
-        <specific id="4" description="A 160 Loyal Volunteer"/>
-        <specific id="5" description="A 161 Loyal Mediator"/>
-        <specific id="6" description="A 220 Loyal Moderator"/>
-        <specific id="7" description="A 1770 Loyal Chancellor"/>
-        <specific id="8" description="A 1771 Loyal Proctor"/>
-      </subcategory>
-      <subcategory id="24" description="Clovelly class (fleet tenders)">
-        <specific id="1" description="A 207 Llandovery"/>
-        <specific id="2" description="A 208 Lamlash"/>
-        <specific id="3" description="A 211 Lechlade"/>
-        <specific id="4" description="A 251 Lydford (ex-Loyal Governor, ex-Alert)"/>
-        <specific id="5" description="A 254 Meavy (ex-Loyal Factor, ex-Vigilant)"/>
-        <specific id="6" description="A 274 Ettrick"/>
-        <specific id="7" description="A 277 Elsing"/>
-        <specific id="8" description="A 341 Fotherby"/>
-        <specific id="9" description="A 348 Felsted"/>
-        <specific id="10" description="A 353 Elkstone"/>
-        <specific id="11" description="A 354 Froxfield"/>
-        <specific id="12" description="A 355 Epworth"/>
-        <specific id="13" description="A 365 Fulbeck"/>
-        <specific id="14" description="A 381 Cricklade"/>
-        <specific id="15" description="A 391 Criccieth"/>
-        <specific id="16" description="A 392 Glencoe"/>
-        <specific id="17" description="A 393 Dunster"/>
-        <specific id="18" description="A 394 Fintry"/>
-        <specific id="19" description="A 402 Grasmere"/>
-        <specific id="20" description="A 488 Cromarty"/>
-        <specific id="21" description="A 490 Dornoch"/>
-        <specific id="22" description="A 1766 Headcorn"/>
-        <specific id="23" description="A 1767 Hever"/>
-        <specific id="24" description="A 1768 Harlech"/>
-        <specific id="25" description="A 1769 Hambledon"/>
-        <specific id="26" description="A 1772 Holmwood"/>
-        <specific id="27" description="A 1773 Horning"/>
-      </subcategory>
-      <subcategory id="25" description="Manly class (fleet tenders)">
-        <specific id="1" description="A 83 Melton"/>
-        <specific id="2" description="A 84 Menai"/>
-        <specific id="3" description="A 87 Meon"/>
-        <specific id="4" description="A 91 Milford"/>
-        <specific id="5" description="A 107 Messina"/>
-      </subcategory>
-      <subcategory id="26" description="Magnet class (degaussing vessels)">
-        <specific id="1" description="A 114 Magnet"/>
-        <specific id="2" description="A 115 Lodestone"/>
-      </subcategory>
-      <subcategory id="27" description="Aberdovey class (auxiliary training vessels)">
-        <specific id="1" description="A 100 Beddgelert"/>
-        <specific id="2" description="A 103 Sultan Venturer (ex-Bibury)"/>
-        <specific id="3" description="A 383 Appleby"/>
-        <specific id="4" description="Y 10 Aberdovey"/>
-        <specific id="5" description="Y 11 Abinger"/>
-        <specific id="6" description="Y 13 Alnmouth"/>
-      </subcategory>
-      <subcategory id="28" description="Wave Class (Large Fleet Tankers )(AO)">
-        <specific id="1" description="A390 Wave Knight"/>
-      </subcategory>
-      <subcategory id="29" description="Oakleaf Class (Support Tanker)(AOT)">
-        <specific id="1" description="A111 Oakleaf"/>
-      </subcategory>
-    </category>
-    <category id="17" description="Auxiliary, Merchant Marine">
-      <subcategory id="1" description="Avon class (Royal Corps of Transport)">
-        <specific id="1" description="RPL 05 Eden"/>
-        <specific id="2" description="RPL 06 Forth"/>
-        <specific id="3" description="RPL 12 Medway"/>
-      </subcategory>
-      <subcategory id="2" description="Adept class (TUTT) (tugs)">
-        <specific id="1" description="A 221 Forceful"/>
-        <specific id="2" description="A 222 Nimble"/>
-        <specific id="3" description="A 223 Powerful"/>
-        <specific id="4" description="A 224 Adept"/>
-        <specific id="5" description="A 225 Bustler"/>
-        <specific id="6" description="A 226 Capable"/>
-        <specific id="7" description="A 227 Careful"/>
-        <specific id="8" description="A 228 Faithful"/>
-        <specific id="9" description="A 231 Dexterous"/>
-      </subcategory>
-      <subcategory id="3" description="Dog class (tugs and range-trials vessels)">
-        <specific id="1" description="A 106 Alsatian"/>
-        <specific id="2" description="A 126 Cairn"/>
-        <specific id="3" description="A 129 Dalmatian"/>
-        <specific id="4" description="A 155 Deerhound"/>
-        <specific id="5" description="A 162 Elkhound"/>
-        <specific id="6" description="A 168 Labrador"/>
-        <specific id="7" description="A 178 Husky"/>
-        <specific id="8" description="A 180 Mastiff"/>
-        <specific id="9" description="A 182 Saluki"/>
-        <specific id="10" description="A 188 Pointer"/>
-        <specific id="11" description="A 189 Setter"/>
-        <specific id="12" description="A 197 Sealyham"/>
-        <specific id="13" description="A 201 Spaniel"/>
-        <specific id="14" description="A 250 Sheepdog"/>
-        <specific id="15" description="A 326 Foxhound (ex-Boxer)"/>
-        <specific id="16" description="A 327 Basset (ex-Beagle)"/>
-        <specific id="17" description="A 328 Collie"/>
-        <specific id="18" description="A 330 Corgi"/>
-      </subcategory>
-      <subcategory id="4" description="Modified Girl Class">
-        <specific id="1" description="A 156 Daphne"/>
-        <specific id="2" description="A 177 Edith"/>
-      </subcategory>
-      <subcategory id="5" description="Triton class">
-        <specific id="1" description="A 166 Kathleen"/>
-        <specific id="2" description="A 170 Kitty"/>
-        <specific id="3" description="A 172 Lesley"/>
-        <specific id="4" description="A 174 Lilah"/>
-        <specific id="5" description="A 175 Mary"/>
-        <specific id="6" description="A 181 Irene"/>
-        <specific id="7" description="A 183 Isabel"/>
-        <specific id="8" description="A 190 Joan"/>
-        <specific id="9" description="A 193 Joyce"/>
-        <specific id="10" description="A 199 Myrtle"/>
-        <specific id="11" description="A 202 Nancy"/>
-        <specific id="12" description="A 205 Norah"/>
-      </subcategory>
-      <subcategory id="6" description="Felicity class">
-        <specific id="1" description="A 112 Felicity"/>
-        <specific id="2" description="A 147 Frances"/>
-        <specific id="3" description="A 148 Fiona"/>
-        <specific id="4" description="A 149 Florence"/>
-        <specific id="5" description="A 150 Genevieve"/>
-        <specific id="6" description="A 152 Georgina"/>
-        <specific id="7" description="A 196 Gwendoline"/>
-        <specific id="8" description="A 198 Helen"/>
-      </subcategory>
-    </category>
-    <category id="54" description="Amphibious Assault Ship">
-      <subcategory id="1" description="LPH01 Ocean"/>
-      <subcategory id="2" description="Helicopter Carrier (LPH)">
-        <specific id="1" description="L12 Ocean"/>
-      </subcategory>
-    </category>
-    <category id="56" description="Amphibious transport dock">
-      <subcategory id="1" description="Assault ships (LPD)">
-        <specific id="1" description="L 10 Fearless"/>
-        <specific id="2" description="L 11 Intrepid"/>
-        <specific id="3" description="L 14 Albion"/>
-        <specific id="4" description="L 15 Bulwalk"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Adi Eu"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="224">
-    <category id="1" description="SSBN (Nuclear Ballistic Missiles)">
-      <subcategory id="1" description="Vanguard Class">
-        <specific id="1" description="05 Vanguard"/>
-        <specific id="2" description="06 Victorious"/>
-        <specific id="3" description="07 Vigilant"/>
-        <specific id="4" description="08"/>
-      </subcategory>
-      <subcategory id="2" description="Resolution Class">
-        <specific id="1" description="S 22 Resolution"/>
-        <specific id="2" description="S 23 Repulse"/>
-        <specific id="3" description="S 26 Renown"/>
-        <specific id="4" description="S 27 Revenge"/>
-      </subcategory>
-    </category>
-    <category id="3" description="SSN (Nuclear Attack-Torpedo)">
-      <subcategory id="1" description="Trafalgar Class">
-        <specific id="1" description="S 87 Turbulent"/>
-        <specific id="2" description="S 88 Tireless"/>
-        <specific id="3" description="S 90 Torbay"/>
-        <specific id="4" description="S 91 Trenchant"/>
-        <specific id="5" description="S 92 Talent"/>
-        <specific id="6" description="S 93 Triumph"/>
-        <specific id="7" description="S 107 Trafalgar"/>
-      </subcategory>
-      <subcategory id="2" description="Swiftsure Class">
-        <specific id="1" description="S 104 Sceptre"/>
-        <specific id="2" description="S 105 Spartan"/>
-        <specific id="3" description="S 106 Splendid"/>
-        <specific id="4" description="S 108 Sovereign"/>
-        <specific id="5" description="S 109 Superb"/>
-      </subcategory>
-      <subcategory id="3" description="Valiant Class">
-        <specific id="1" description="S 102 Valiant"/>
-      </subcategory>
-    </category>
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Upholder class (Type 2400)">
-        <specific id="1" description="S 40 Upholder"/>
-        <specific id="2" description="S 41 Unseen"/>
-        <specific id="3" description="S 42 Ursula"/>
-        <specific id="4" description="S 43 Unicorn"/>
-      </subcategory>
-      <subcategory id="2" description="Oberon Class">
-        <specific id="1" description="S 16 Oracle"/>
-        <specific id="2" description="S 19 Opossum"/>
-        <specific id="3" description="S 20 Opportune"/>
-        <specific id="60" description="Onslow (Australia)"/>
-        <specific id="62" description="Otama (Australia)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="224">
-    <category id="0" description="Other"/>
-    <category id="1" description="Manned"/>
-    <category id="2" description="Unmanned">
-      <subcategory id="1" description="Communication satellite">
-        <specific id="1" description="Skynet 4"/>
-        <specific id="2" description="Skynet 4A"/>
-        <specific id="3" description="Skynet 4B"/>
-        <specific id="4" description="Skynet 4C"/>
-        <specific id="5" description="NATO 4"/>
-        <specific id="6" description="ECS"/>
-        <specific id="7" description="Eurostar"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="71">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="AMX-30">
-        <specific id="1" description="AMX-30B2"/>
-      </subcategory>
-      <subcategory id="2" description="AMX-13 Light Tank"/>
-      <subcategory id="3" description="AMX-40 MBT"/>
-      <subcategory id="4" description="Le Clerc"/>
-    </category>
-    <category id="2" description="Armored fighting vehicle">
-      <subcategory id="1" description="VBC-90 armored car"/>
-      <subcategory id="2" description="ERC-90 armored car"/>
-      <subcategory id="3" description="AML-90 armored car"/>
-      <subcategory id="4" description="AML-60 armored car"/>
-      <subcategory id="5" description="VAB APC"/>
-      <subcategory id="6" description="AMX-10RC armored car"/>
-      <subcategory id="7" description="AMX-13 IFV"/>
-      <subcategory id="8" description="AMX-10 IFV">
-        <specific id="1" description="with two-rail MILAN anti-tank missile launcher"/>
-        <specific id="2" description="with HOT: ATGM launcher vehicle"/>
-      </subcategory>
-      <subcategory id="9" description="EBR armored car"/>
-      <subcategory id="10" description="AMX-13 VCI APC"/>
-      <subcategory id="11" description="AMX-13 DCA"/>
-      <subcategory id="12" description="Berliet VXB armored car"/>
-      <subcategory id="13" description="Panhard EBR"/>
-    </category>
-    <category id="3" description="Armored utility vehicle">
-      <subcategory id="1" description="AMX-10 ECH Recovery Vehicle"/>
-    </category>
-    <category id="4" description="Self-propelled artillery">
-      <subcategory id="1" description="A UF1 155-mm Howitzer"/>
-      <subcategory id="2" description="AMX 105-mm Howitzer"/>
-      <subcategory id="3" description="AU-50 105-mm Howitzer"/>
-      <subcategory id="4" description="F-3 155-mm gun"/>
-      <subcategory id="5" description="MM 38 Exocet launcher"/>
-      <subcategory id="6" description="MM 40 Exocet launcher"/>
-      <subcategory id="7" description="Otomat Mk 1 launcher"/>
-      <subcategory id="8" description="Otomat Mk 2/3 launcher"/>
-    </category>
-    <category id="5" description="Towed artillery">
-      <subcategory id="1" description="TR 155-mm Howitzer"/>
-    </category>
-    <category id="6" description="Small wheeled utility vehicle"/>
-    <category id="7" description="Large wheeled utility vehicle"/>
-    <category id="8" description="Small tracked utility vehicle"/>
-    <category id="9" description="Large tracked utility vehicle"/>
-    <category id="10" description="Mortar">
-      <subcategory id="1" description="120mm Mortar RT-61"/>
-    </category>
-    <category id="11" description="Mine plow"/>
-    <category id="12" description="Mine rake"/>
-    <category id="13" description="Mine roller"/>
-    <category id="14" description="Cargo trailer">
-      <subcategory id="1" description="0 - 0.5 ton"/>
-      <subcategory id="2" description="0.51 - 2 ton"/>
-      <subcategory id="3" description="2.01 - 5 ton"/>
-      <subcategory id="4" description="5.02 - 10 ton"/>
-      <subcategory id="5" description="greater than 10 tons"/>
-    </category>
-    <category id="15" description="Fuel trailer">
-      <subcategory id="1" description="1-1000 gallons"/>
-      <subcategory id="2" description="1001 - 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="16" description="Generator trailer">
-      <subcategory id="1" description="0 - 100 KW"/>
-      <subcategory id="2" description="greater than 100 KW"/>
-    </category>
-    <category id="17" description="Water trailer">
-      <subcategory id="1" description="1-1000 gallons"/>
-      <subcategory id="2" description="1001- 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="18" description="Engineer equipment">
-      <subcategory id="1" description="Mine clearing line charge"/>
-      <subcategory id="2" description="Dozer blade kit"/>
-      <subcategory id="3" description="Lane marking system"/>
-    </category>
-    <category id="19" description="Heavy equipment transport trailer"/>
-    <category id="20" description="Maintenance equipment trailer">
-      <subcategory id="1" description="Welding trailer"/>
-      <subcategory id="2" description="Compressor"/>
-      <subcategory id="3" description="Tools/parts trailer"/>
-    </category>
-    <category id="21" description="Limber"/>
-    <category id="22" description="Chemical decontamination trailer"/>
-    <category id="28" description="Air Defense / Missile Defense Unit Equipment">
-      <subcategory id="1" description="Crotale SAM System">
-        <specific id="1" description="Crotale P4R Missile Firing System"/>
-        <specific id="2" description="Crotale P4R Radar System"/>
-      </subcategory>
-      <subcategory id="2" description="Crotale NG SAM System"/>
-      <subcategory id="3" description="Shahine SAM System">
-        <specific id="1" description="Shahine Acquisition Radar/AMX-30 chassis"/>
-        <specific id="2" description="Shahine Launcher/AMX-30 chassis"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="71">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="Mirage F-1">
-        <specific id="1" description="F1-AD"/>
-        <specific id="2" description="F1-AZ"/>
-        <specific id="3" description="F1-B"/>
-        <specific id="4" description="F1-BD"/>
-        <specific id="5" description="F1-BE"/>
-        <specific id="6" description="F1-BJ"/>
-        <specific id="7" description="F1-BK"/>
-        <specific id="8" description="F1-BQ"/>
-        <specific id="9" description="F1-B &amp; E"/>
-        <specific id="10" description="F1-C"/>
-        <specific id="11" description="F1-CE"/>
-        <specific id="12" description="F1-CG"/>
-        <specific id="13" description="F1-CH"/>
-        <specific id="14" description="F1-CJ"/>
-        <specific id="15" description="F1-CK"/>
-        <specific id="16" description="F1-CR-200"/>
-        <specific id="17" description="F1-CZ"/>
-        <specific id="18" description="F1-C-200s"/>
-        <specific id="19" description="F1-DDA"/>
-        <specific id="20" description="F1-ED"/>
-        <specific id="21" description="F1-EDA"/>
-        <specific id="22" description="F1-EE"/>
-        <specific id="23" description="F1-EH"/>
-        <specific id="24" description="F1-EJ"/>
-        <specific id="25" description="F1-EQ"/>
-        <specific id="26" description="F1-JA"/>
-        <specific id="27" description="F1-JE"/>
-      </subcategory>
-      <subcategory id="3" description="Mirage III">
-        <specific id="1" description="Mirage III-D"/>
-        <specific id="2" description="Mirage III-E"/>
-      </subcategory>
-      <subcategory id="4" description="Mirage 2000">
-        <specific id="1" description="Mirage 2000AD"/>
-        <specific id="2" description="Mirage 2000BGM"/>
-        <specific id="3" description="Mirage 2000C"/>
-        <specific id="4" description="Mirage 2000D"/>
-        <specific id="5" description="Mirage 2000DAD"/>
-        <specific id="6" description="Mirage 2000DP"/>
-        <specific id="7" description="Mirage 2000E"/>
-        <specific id="8" description="Mirage 2000EAD"/>
-        <specific id="9" description="Mirage 2000EGM"/>
-        <specific id="10" description="Mirage 2000H (KF-101)"/>
-        <specific id="11" description="Mirage 2000N"/>
-        <specific id="12" description="Mirage 2000P"/>
-        <specific id="13" description="Mirage 2000RAD"/>
-        <specific id="14" description="Mirage 2000TH (KT-201)"/>
-        <specific id="15" description="Mirage 2000-5"/>
-        <specific id="16" description="Vajra (Divine Thunder)"/>
-      </subcategory>
-      <subcategory id="5" description="Dassault Rafale (Squall)">
-        <specific id="1" description="Rafale B"/>
-        <specific id="2" description="Rafale C"/>
-        <specific id="3" description="Rafale S-1 Standard"/>
-        <specific id="4" description="Rafale M"/>
-      </subcategory>
-      <subcategory id="6" description="Mirage 50"/>
-      <subcategory id="7" description="(deleted)"/>
-    </category>
-    <category id="2" description="Attack/Strike">
-      <subcategory id="1" description="Dassault/BAe Jaguar"/>
-      <subcategory id="2" description="Etendard IV-P"/>
-      <subcategory id="3" description="Dassault Super Etendard">
-        <specific id="1" description="Super Etendard"/>
-      </subcategory>
-      <subcategory id="4" description="Dassault/Dornier Alpha Jet">
-        <specific id="1" description="Alpha Jet 2"/>
-        <specific id="2" description="Alpha Jet E"/>
-        <specific id="3" description="Alpha Jet A"/>
-        <specific id="4" description="Alpha Jet 3"/>
-      </subcategory>
-      <subcategory id="5" description="Mirage 5"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="Mirage IV"/>
-    </category>
-    <category id="3" description="Bomber">
-      <subcategory id="1" description="(deleted)"/>
-    </category>
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="Transall C-160"/>
-      <subcategory id="2" description="Dassault Mystere-Falcon 50"/>
-      <subcategory id="3" description="T.16 air ambulance."/>
-      <subcategory id="4" description="Reims F 406 Caravan II">
-        <specific id="1" description="Reims F 406 Vigilante"/>
-      </subcategory>
-      <subcategory id="5" description="SECA/Fokker F27 Friendship Arat"/>
-      <subcategory id="6" description="Dassault Mystere-Falcon 20">
-        <specific id="1" description="HU-25 Guardian"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Antisubmarine/patrol/observation">
-      <subcategory id="1" description="Dassault Alantique 2"/>
-      <subcategory id="2" description="Dassault (Breguet) Alize"/>
-      <subcategory id="3" description="Dassault (Breguet) (1050) Atlantic"/>
-      <subcategory id="4" description="Dassault Mystere-Falcon 900">
-        <specific id="1" description="T.18"/>
-      </subcategory>
-      <subcategory id="5" description="Dassault Gardian 2"/>
-    </category>
-    <category id="6" description="Electronic Warfare (EW)">
-      <subcategory id="1" description="Transall C-160"/>
-      <subcategory id="2" description="Dassault (Breguet 1050) Alize"/>
-      <subcategory id="3" description="Dassault Mystere-Falcon 20 (ECM)"/>
-    </category>
-    <category id="7" description="Reconnaissance">
-      <subcategory id="1" description="Dassault Mystere-Falcon 900"/>
-      <subcategory id="2" description="Mirage III">
-        <specific id="1" description="Mirage III-R"/>
-        <specific id="2" description="Mirage III-R2Z"/>
-        <specific id="3" description="Mirage III-RD"/>
-      </subcategory>
-      <subcategory id="3" description="Dassault Mystere-Falcon 20SNR"/>
-    </category>
-    <category id="20" description="Attack Helicopter">
-      <subcategory id="1" description="Eurocopter AS 532 Cougar">
-        <specific id="1" description="AS 532AC"/>
-        <specific id="2" description="AS 532AL"/>
-      </subcategory>
-      <subcategory id="2" description="Eurocopter SA342 Gazelle">
-        <specific id="1" description="SA 342ATAM"/>
-        <specific id="2" description="SA 342M Viviane"/>
-      </subcategory>
-      <subcategory id="3" description="Eurocopter BO 105/PAH-1/VBH/BSH-1">
-        <specific id="1" description="BO 105 PAH-1A1"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Utility Helicopter">
-      <subcategory id="1" description="Aerospatiale SA 313B Alouette II"/>
-      <subcategory id="2" description="Aerospatiale SA 315B">
-        <specific id="1" description="Cheetah"/>
-      </subcategory>
-      <subcategory id="3" description="Aerospatiale SA 316B Alouette III"/>
-      <subcategory id="4" description="Aerospatiale SA 321 Super Frelon">
-        <specific id="1" description="SA 321H"/>
-      </subcategory>
-      <subcategory id="5" description="Aerospatiale SA 330 Puma">
-        <specific id="1" description="330 Puma"/>
-        <specific id="2" description="332M Super Puma"/>
-        <specific id="3" description="Super Puma/Puma"/>
-      </subcategory>
-      <subcategory id="6" description="Aerospatiale SA 341 Gazelle">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="SA 341B"/>
-        <specific id="3" description="Gazelle HT. Mk 3"/>
-        <specific id="4" description="Gazelle HCC. Mk4"/>
-        <specific id="5" description="SA 341 F"/>
-        <specific id="6" description="SA 341 H"/>
-      </subcategory>
-      <subcategory id="7" description="Eurocopter AS 332L Super Puma MK II and AS 532 Cougar MkII">
-        <specific id="1" description="532U2 Cougar MK II"/>
-        <specific id="2" description="532A2 Cougar Mk II"/>
-      </subcategory>
-      <subcategory id="8" description="Eurocopter SA 342 Gazelle">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="SA 342M"/>
-      </subcategory>
-      <subcategory id="9" description="Eurocopter AS 532 Cougar">
-        <specific id="1" description="AS 532UC"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="AS 532MC"/>
-        <specific id="4" description="AS 532UL"/>
-      </subcategory>
-      <subcategory id="10" description="Eurocopter AS 565 Panther">
-        <specific id="1" description="AS 365N2 Dauphin 2"/>
-        <specific id="2" description="AS 565MA"/>
-      </subcategory>
-      <subcategory id="11" description="Eurocopter 365N2 Dauphin 2">
-        <specific id="1" description="AS 366G1 (HH-65A Dolphin)"/>
-      </subcategory>
-      <subcategory id="12" description="Eurocopter BO 105"/>
-      <subcategory id="13" description="Eurocopter AS 350 Ecureuil/Astar and AS 550 Fennec">
-        <specific id="1" description="CH-50"/>
-        <specific id="2" description="TH-50 Esquilo"/>
-        <specific id="3" description="HA-1 Esquilo"/>
-        <specific id="4" description="UH-12 Esquilo"/>
-        <specific id="5" description="AS 350BA Ecureuil"/>
-        <specific id="6" description="AS 350B2 Ecureuil"/>
-        <specific id="7" description="AS 350 B3 Ecureuil"/>
-        <specific id="8" description="AS 350D Astar"/>
-        <specific id="9" description="AS 350 Firefighter"/>
-        <specific id="10" description="AS 550 Fennec"/>
-        <specific id="11" description="550A2"/>
-        <specific id="12" description="AS 550C2"/>
-        <specific id="13" description="AS 550M2"/>
-        <specific id="14" description="AS 550S2"/>
-      </subcategory>
-      <subcategory id="14" description="Eurocopter AS 355 Ecureuil 2 Twinstar and AS 555 Fennec">
-        <specific id="1" description="CH-55"/>
-        <specific id="2" description="VH-55 Esquilo"/>
-        <specific id="3" description="UH-12B Esquilo"/>
-        <specific id="4" description="AS 555UN Fennec"/>
-        <specific id="5" description="AS 555AN Fennec"/>
-        <specific id="6" description="AS 555CN Fennec"/>
-        <specific id="7" description="AS 555MN Fennec"/>
-        <specific id="8" description="AS 555SN Fennec naval ASW"/>
-      </subcategory>
-      <subcategory id="15" description="Eurocopter AS 365N2 Dauphin 2">
-        <specific id="1" description="AS 366G1 (HH-65A Dolphin)"/>
-        <specific id="2" description="AS 565 Panther"/>
-        <specific id="3" description="HM-1"/>
-        <specific id="4" description="AS 565AA"/>
-        <specific id="5" description="AS 565CA"/>
-        <specific id="6" description="AS 565 Panther 807, AS 565MA Panther"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="AS 565SA Panter"/>
-      </subcategory>
-    </category>
-    <category id="22" description="Antisubmarine Warfare / Patrol Helicopter">
-      <subcategory id="1" description="Aerospatiale SA 319B ASTAZOU"/>
-      <subcategory id="2" description="Aerospatiale SA 321 Super Frelon">
-        <specific id="1" description="AS 32"/>
-      </subcategory>
-      <subcategory id="3" description="Eurocopter AS 532 Cougar">
-        <specific id="1" description="AS 532SC"/>
-      </subcategory>
-      <subcategory id="4" description="Eurocopter AS 565 Panther">
-        <specific id="1" description="AS 565SA"/>
-        <specific id="2" description="AS 565F (MA)"/>
-      </subcategory>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Mudry CAP 10 B"/>
-      <subcategory id="2" description="Socata TB 30 Epsilon"/>
-      <subcategory id="3" description="Socata TB 31 Omega"/>
-      <subcategory id="4" description="SEPECAT Jaguar International">
-        <specific id="1" description="Jaguar GR. Mk 1A"/>
-      </subcategory>
-      <subcategory id="5" description="Dassault Mystere-Falcon 20SNA"/>
-    </category>
-    <category id="57" description="Non-Combatant Commercial Aircraft">
-      <subcategory id="1" description="Passenger Airline">
-        <specific id="1" description="A320 Air Bus"/>
-        <specific id="2" description="Airbus A300"/>
-        <specific id="3" description="Airbus A310"/>
-        <specific id="4" description="Airbus A318"/>
-        <specific id="5" description="Airbus A319"/>
-        <specific id="6" description="Airbus A321"/>
-        <specific id="7" description="Airbus A330"/>
-        <specific id="8" description="Airbus A340"/>
-        <specific id="9" description="Airbus A380"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="71">
-    <category id="1" description="Carrier (Porte-Avions)">
-      <subcategory id="1" description="Nuclear-Propelled Aircraft Carriers (CVN)">
-        <specific id="1" description="R 91 Charles De Gaulle"/>
-      </subcategory>
-      <subcategory id="2" description="Clemenceau class (CV)">
-        <specific id="1" description="R 98 Clemenceau"/>
-        <specific id="2" description="R 99 Foch"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Guided Missile Destroyer (Fregates or Escorteurs D'escadres)">
-      <subcategory id="1" description="Georges Leygues Class (Type f 70 (ASW))">
-        <specific id="1" description="D 640 Georges Leygues"/>
-        <specific id="2" description="D 641 Dupleix"/>
-        <specific id="3" description="D 642 Montcalm"/>
-        <specific id="4" description="D 643 Jean de vienne"/>
-        <specific id="5" description="D 644 Primauguet"/>
-        <specific id="6" description="D 645 La motte-picquet"/>
-        <specific id="7" description="D 646 Latouche-treville"/>
-      </subcategory>
-      <subcategory id="2" description="Cassard class (Type F 70 (A/A))">
-        <specific id="1" description="D 614 Cassard"/>
-        <specific id="2" description="D 615 Jean Bart"/>
-      </subcategory>
-      <subcategory id="3" description="Suffren class">
-        <specific id="1" description="D 602 Suffren"/>
-        <specific id="2" description="D 603 Duquesne"/>
-      </subcategory>
-      <subcategory id="4" description="Tourville class (Type F 67)">
-        <specific id="1" description="D 610 Tourville"/>
-        <specific id="2" description="D 611 Duguay-Trouin"/>
-        <specific id="3" description="D 612 De grasse"/>
-      </subcategory>
-      <subcategory id="5" description="Type F 65 (ASW)">
-        <specific id="1" description="D 609 Aconit (ex-F 703)"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided-missile Frigate">
-      <subcategory id="1" description="La Fayette class (light frigates)">
-        <specific id="1" description="F 710 Lafayette"/>
-        <specific id="2" description="F 711 Surcouf"/>
-        <specific id="3" description="F 712 Courbet"/>
-      </subcategory>
-      <subcategory id="2" description="Floreal class (patrol frigates)">
-        <specific id="1" description="F 730 Floreal"/>
-        <specific id="2" description="F 731 Prairial"/>
-        <specific id="3" description="F 732 Nivose"/>
-        <specific id="4" description="F 733 Ventose"/>
-        <specific id="5" description="F 734 Vendemiaire"/>
-        <specific id="6" description="F 735 Germinal"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/patrol craft">
-      <subcategory id="1" description="P 400 class (fast attack craft--patrol)">
-        <specific id="1" description="P 682 L'audacieuse"/>
-        <specific id="2" description="P 683 La boudeuse"/>
-        <specific id="3" description="P 684 La capricieuse"/>
-        <specific id="4" description="P 685 La fougueuse"/>
-        <specific id="5" description="P 686 La glorieuse"/>
-        <specific id="6" description="P 687 La gracieuse"/>
-        <specific id="7" description="P 688 La moqueuse"/>
-        <specific id="8" description="P 689 La railleuse"/>
-        <specific id="9" description="P 690 La rieuse"/>
-        <specific id="10" description="P 691 La tapageuse"/>
-        <specific id="11" description="B1 AI Bushra (OMAN)"/>
-      </subcategory>
-      <subcategory id="2" description="Thomson-CSF Type (large patrol craft)">
-        <specific id="1" description="P 696 Iris"/>
-      </subcategory>
-      <subcategory id="3" description="Combattante IIG Class"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship / Craft">
-      <subcategory id="1" description="Narvik class (minehunter/sweeper)">
-        <specific id="1" description="M 660 Narvik"/>
-        <specific id="2" description="Bir Hakeim"/>
-        <specific id="3" description="Garigliano"/>
-        <specific id="4" description="Autun"/>
-        <specific id="5" description="Colmar"/>
-        <specific id="6" description="Berlaimont"/>
-      </subcategory>
-      <subcategory id="2" description="Eridan (Tripartite) class (minehunters)">
-        <specific id="1" description="M 641 Eridan"/>
-        <specific id="2" description="M 642 Cassiopee"/>
-        <specific id="3" description="M 643 Andromede"/>
-        <specific id="4" description="M 644 Pegase"/>
-        <specific id="5" description="M 645 Orion"/>
-        <specific id="6" description="M 646 Croix du sud"/>
-        <specific id="7" description="M 647 Aigle"/>
-        <specific id="8" description="M 648 Lyre"/>
-        <specific id="9" description="M 649 Persee"/>
-      </subcategory>
-      <subcategory id="3" description="Circe class (minehunters)">
-        <specific id="1" description="M 712 Cybele"/>
-        <specific id="2" description="M 713 Calliope"/>
-        <specific id="3" description="M 714 Clio"/>
-        <specific id="4" description="M 715 Circe"/>
-        <specific id="5" description="M 716 Ceres"/>
-      </subcategory>
-      <subcategory id="4" description="ex-US Aggressive class (minesweepers)">
-        <specific id="1" description="M 610 Ouistreham (ex-MSO 513)"/>
-        <specific id="2" description="M 612 Alencon (ex-MSO 453)"/>
-        <specific id="3" description="M 623 Baccarat (ex-MSO 505)"/>
-      </subcategory>
-      <subcategory id="5" description="MCM diving support ships">
-        <specific id="1" description="A 613 Acheron"/>
-        <specific id="2" description="M 611 Vulcain"/>
-        <specific id="3" description="M 614 Styx"/>
-        <specific id="4" description="M 622 Pluton"/>
-      </subcategory>
-    </category>
-    <category id="9" description="Dock Landing Ship">
-      <subcategory id="1" description="Foudre class (Type TCD 90)">
-        <specific id="1" description="L 9011 Foudre"/>
-      </subcategory>
-      <subcategory id="2" description="Ouragan class (TCDs)">
-        <specific id="1" description="L 9021 Ouragan"/>
-        <specific id="2" description="L 9022 Orage"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="Bougainville class (BTs)">
-        <specific id="1" description="L 9077 Bougainville"/>
-      </subcategory>
-      <subcategory id="2" description="Batral type (light transports and landing ships)">
-        <specific id="1" description="L 9030 Champlain"/>
-        <specific id="2" description="L 9031 Francis Garnier"/>
-        <specific id="3" description="L 9032 Dumont D'urville"/>
-        <specific id="4" description="L 9033 Jacques Cartier"/>
-        <specific id="5" description="L 9034 La grandiere"/>
-      </subcategory>
-      <subcategory id="3" description="Edic 700 class (LCT)">
-        <specific id="1" description="L 9051"/>
-        <specific id="2" description="L 9052"/>
-      </subcategory>
-      <subcategory id="4" description="Edic class (LCT)">
-        <specific id="1" description="L 9070"/>
-        <specific id="2" description="L 9072"/>
-        <specific id="3" description="L 9074"/>
-      </subcategory>
-      <subcategory id="5" description="CDIC class (LCT)">
-        <specific id="1" description="L 9061"/>
-        <specific id="2" description="L 9062"/>
-      </subcategory>
-      <subcategory id="6" description="Transport landing ship">
-        <specific id="1" description="L 9090 Gapeau"/>
-      </subcategory>
-    </category>
-    <category id="13" description="Cruiser/Helicopter Carrier">
-      <subcategory id="1" description="Jeanne D'Arc Class (Helo CV)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="BH2 class (Batiments Hydrographiques De 2E class) (oceanographic &amp; survey)">
-        <specific id="1" description="A 791 Laperouse"/>
-        <specific id="2" description="A 792 Borda"/>
-        <specific id="3" description="A 793 Laplace"/>
-        <specific id="4" description="A 795 Arago"/>
-      </subcategory>
-      <subcategory id="2" description="Durance class (underway replenishment tankers)">
-        <specific id="1" description="A 607 Meuse"/>
-        <specific id="2" description="A 608 Var"/>
-        <specific id="3" description="A 629 Durance"/>
-        <specific id="4" description="A 630 Marne"/>
-        <specific id="5" description="A 631 Somme"/>
-      </subcategory>
-      <subcategory id="3" description="Maintenance and repair ship">
-        <specific id="1" description="A 620 Jules Verne (ex-Acheron)"/>
-      </subcategory>
-      <subcategory id="4" description="Rhin class (depot and support ships)">
-        <specific id="1" description="A 615 Loire"/>
-        <specific id="2" description="A 617 Garonne"/>
-        <specific id="3" description="A 618 Rance"/>
-        <specific id="4" description="A 621 Rhin"/>
-        <specific id="5" description="A 622 Rhone"/>
-      </subcategory>
-      <subcategory id="5" description="Chamois class (supply tenders)">
-        <specific id="1" description="A 633 Taape"/>
-        <specific id="2" description="A 767 Chamois"/>
-        <specific id="3" description="A 768 Elan"/>
-        <specific id="4" description="A 774 Chevreuil"/>
-        <specific id="5" description="A 775 Gazelle"/>
-        <specific id="6" description="A 776 Isard"/>
-        <specific id="7" description="A 779 Tapatai (ex-Silver Fish)"/>
-      </subcategory>
-      <subcategory id="6" description="RR 4000 type (supply tenders)">
-        <specific id="1" description="A 634 Rari"/>
-        <specific id="2" description="A 635 Revi"/>
-      </subcategory>
-      <subcategory id="7" description="Leopard class (training ships)">
-        <specific id="1" description="A 748 Leopard"/>
-        <specific id="2" description="A 749 Panthere"/>
-        <specific id="3" description="A 750 Jaguar"/>
-        <specific id="4" description="A 751 Lynx"/>
-        <specific id="5" description="A 752 Guepard"/>
-        <specific id="6" description="A 753 Chacal"/>
-        <specific id="7" description="A 754 Tigre"/>
-        <specific id="8" description="A 755 Lion"/>
-      </subcategory>
-    </category>
-    <category id="17" description="Auxiliary, Merchant Marine">
-      <subcategory id="1" description="Government Maritime Forces">
-        <specific id="1" description="Patra Class (fast patrol craft)">
-          <extra id="1" description="P 670 Trident"/>
-          <extra id="2" description="P 671 Glaive"/>
-          <extra id="3" description="P 672 Epee"/>
-          <extra id="4" description="P 673 Pertuisane"/>
-        </specific>
-      </subcategory>
-      <subcategory id="2" description="Harbour tugs (Remorqueurs De Port)">
-        <specific id="1" description="105-ton type">
-          <extra id="1" description="Y 601 Acajou"/>
-          <extra id="2" description="Y 620 Chataigner"/>
-          <extra id="3" description="Y 623 Charme"/>
-          <extra id="4" description="Y 624 Chene"/>
-          <extra id="5" description="Y 629 Cormier"/>
-          <extra id="6" description="Y 644 Frene"/>
-          <extra id="7" description="Y 654 Hetre"/>
-          <extra id="8" description="Y 655 Hevea"/>
-          <extra id="9" description="Y 663 Latanier"/>
-          <extra id="10" description="Y 666 Manguier"/>
-          <extra id="11" description="Y 668 Meleze"/>
-          <extra id="12" description="Y 669 Merisier"/>
-          <extra id="13" description="Y 686 Paletuvier"/>
-          <extra id="14" description="Y 688 Peuplier"/>
-          <extra id="15" description="Y 689 Pin"/>
-          <extra id="16" description="Y 695 Platane"/>
-          <extra id="17" description="Y 708 Saule"/>
-          <extra id="18" description="Y 709 Sycomore"/>
-          <extra id="19" description="Y 717 Ebene"/>
-          <extra id="20" description="Y 718 Erable"/>
-          <extra id="21" description="Y 719 Olivier"/>
-          <extra id="22" description="Y 720 Santal"/>
-          <extra id="23" description="Y 738 Maronnier"/>
-          <extra id="24" description="Y 739 Noyer"/>
-          <extra id="25" description="Y 740 Papayer"/>
-        </specific>
-        <specific id="2" description="93-ton type">
-          <extra id="1" description="Y 630 Bonite"/>
-          <extra id="2" description="Y 634 Rouget"/>
-        </specific>
-        <specific id="3" description="65-ton type">
-          <extra id="1" description="Y 611 Bengali"/>
-          <extra id="2" description="Y 617 Mouette"/>
-          <extra id="3" description="Y 621 Mesange"/>
-          <extra id="4" description="Y 625 Cigogne"/>
-          <extra id="5" description="Y 628 Colibri"/>
-          <extra id="6" description="Y 632 Cygne"/>
-          <extra id="7" description="Y 636 Martinet"/>
-          <extra id="8" description="Y 637 Fauvette"/>
-          <extra id="9" description="Y 648 Goeland"/>
-          <extra id="10" description="Y 670 Merle"/>
-          <extra id="11" description="Y 673 Moineau"/>
-          <extra id="12" description="Y 675 Martin Pecheur"/>
-          <extra id="13" description="Y 687 Passereau"/>
-          <extra id="14" description="Y 691 Pinson"/>
-          <extra id="15" description="Y 694 Pivert"/>
-          <extra id="16" description="Y 721 Alouette"/>
-          <extra id="17" description="Y 722 Vanneau"/>
-          <extra id="18" description="Y 723 Engoulevent"/>
-          <extra id="19" description="Y 724 Sarcelle"/>
-          <extra id="20" description="Y 725 Marabout"/>
-          <extra id="21" description="Y 726 Toucan"/>
-          <extra id="22" description="Y 727 Macreuse"/>
-          <extra id="23" description="Y 728 Grand Duc"/>
-          <extra id="24" description="Y 729 Eider"/>
-          <extra id="25" description="Y 730 Ara"/>
-          <extra id="26" description="Y 747 Loriot"/>
-          <extra id="27" description="Y 748 Gelinotte"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate">
-      <subcategory id="1" description="D'estienne D'orves (Type A 69) class">
-        <specific id="1" description="F 781 D'estienne D'orves"/>
-        <specific id="2" description="F 782 Amyot d'inville"/>
-        <specific id="3" description="F 783 Drogou"/>
-        <specific id="4" description="F 784 Detroyat"/>
-        <specific id="5" description="F 785 Jean Moulin"/>
-        <specific id="6" description="F 786 Quartier Maitre Anquetil"/>
-        <specific id="7" description="F 787 Commandant de Pimodan"/>
-        <specific id="8" description="F 788 Second Maitre Le Bihan"/>
-        <specific id="9" description="F 789 Lieutenant De Vaisseau Le Henaff"/>
-        <specific id="10" description="F 790 Lieutenant De Vaisseau Lavallee"/>
-        <specific id="11" description="F 791 Commandant L'herminier"/>
-        <specific id="12" description="F 792 Premier Maitre L'her"/>
-        <specific id="13" description="F 793 Commandant Blaison"/>
-        <specific id="14" description="F 794 Enseigne De Vaisseau Jacoubet"/>
-        <specific id="15" description="F 795 Commandant Ducuing"/>
-        <specific id="16" description="F 796 Commandant Birot"/>
-        <specific id="17" description="F 797 Commandant Bouan"/>
-      </subcategory>
-      <subcategory id="2" description="Commandant Riviere class (Avisos Escorteurs)">
-        <specific id="1" description="F 726 Commandant Bory"/>
-        <specific id="2" description="F 729 Balny"/>
-        <specific id="3" description="F 749 Enseigne de Vaisseau Henry"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Descrates"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker class">
-        <specific id="1" description="Athos"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="71">
-    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
-      <subcategory id="1" description="Le Triomphant class (SNLE-NG)">
-        <specific id="1" description="S 616 Le triomphant"/>
-        <specific id="2" description="S 617 Le temeraire"/>
-        <specific id="3" description="S 618"/>
-      </subcategory>
-    </category>
-    <category id="2" description="SSGN (Nuclear Guided Missile)">
-      <subcategory id="1" description="L'inflexible class (SNLE)">
-        <specific id="1" description="S 610 Le foudroyant"/>
-        <specific id="2" description="S 612 Le terrible"/>
-        <specific id="3" description="S 613 L'indomptable"/>
-        <specific id="4" description="S 614 Le tonnant"/>
-        <specific id="5" description="S 615 L'inflexible"/>
-      </subcategory>
-    </category>
-    <category id="3" description="SSN (Nuclear Attack Ballistic Missile) (Sous-Marins Nucleaires D'attaque (SNA))">
-      <subcategory id="1" description="Rubis Class (SNA 72)">
-        <specific id="1" description="S 601 Rubis"/>
-        <specific id="2" description="S 602 Saphir"/>
-        <specific id="3" description="S 603 Casabianca"/>
-        <specific id="4" description="S 604 Emeraude"/>
-        <specific id="5" description="S 605 Amethyste"/>
-        <specific id="6" description="S 606 Perle"/>
-        <specific id="7" description="S 607 Turquoise"/>
-      </subcategory>
-    </category>
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol) (Sous-Marins D'attaque)">
-      <subcategory id="1" description="Agosta Class">
-        <specific id="1" description="S 620 Agosta"/>
-        <specific id="2" description="S 621 Beveziers"/>
-        <specific id="3" description="S 622 La praya"/>
-        <specific id="4" description="S 623 Ouessant"/>
-      </subcategory>
-      <subcategory id="2" description="Daphne Class">
-        <specific id="1" description="S 643 Doris"/>
-        <specific id="2" description="S 648 Jun"/>
-        <specific id="3" description="S 650 Psyche"/>
-        <specific id="4" description="S 651 Sirene"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="71">
-    <category id="0" description="Other"/>
-    <category id="1" description="Manned">
-      <subcategory id="6" description="Space Plane">
-        <specific id="1" description="Hermes"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Unmanned">
-      <subcategory id="1" description="Communication satellite">
-        <specific id="1" description="Telecom"/>
-        <specific id="2" description="Hispasat"/>
-        <specific id="3" description="Eutelsat"/>
-        <specific id="4" description="Turksat"/>
-        <specific id="6" description="Argos"/>
-        <specific id="7" description="S80/T"/>
-        <specific id="8" description="Arsene"/>
-        <specific id="9" description="Syracuse"/>
-      </subcategory>
-      <subcategory id="2" description="Navigation satellite"/>
-      <subcategory id="4" description="Electronic Intelligence satellite">
-        <specific id="1" description="Cerise"/>
-      </subcategory>
-      <subcategory id="7" description="Imaging Radar surveillance satellite">
-        <specific id="1" description="Helios"/>
-        <specific id="2" description="Osiris SAR"/>
-      </subcategory>
-      <subcategory id="8" description="Optical imaging surveillance satellite">
-        <specific id="1" description="Syracuse 3"/>
-      </subcategory>
-      <subcategory id="13" description="Science satellite">
-        <specific id="1" description="Hipparcos"/>
-        <specific id="2" description="Titan"/>
-        <specific id="3" description="Topex/Poseidon"/>
-        <specific id="4" description="Starlette"/>
-        <specific id="5" description="SRAT 2"/>
-      </subcategory>
-      <subcategory id="14" description="Survey satellite">
-        <specific id="1" description="Stella"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Booster">
-      <subcategory id="1" description="Ariane"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="78">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="Leopard 1 MBT">
-        <specific id="1" description="A1"/>
-        <specific id="2" description="A2"/>
-        <specific id="3" description="A3"/>
-        <specific id="4" description="A4"/>
-        <specific id="5" description="A5"/>
-      </subcategory>
-      <subcategory id="2" description="Leopard 2 MBT"/>
-      <subcategory id="3" description="Leopard 2 (improved) MBT">
-        <specific id="1" description="(S) Stridsfordon 122"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Armored Fighting Vehicle">
-      <subcategory id="1" description="Marder 1 A3"/>
-      <subcategory id="2" description="Marder 2"/>
-      <subcategory id="3" description="BMP 1"/>
-      <subcategory id="4" description="Jaguar 1 tank destroyer, missile"/>
-      <subcategory id="5" description="Jaguar 2"/>
-      <subcategory id="6" description="Luchs armored reconnaissance vehicle"/>
-      <subcategory id="7" description="Zobel armored reconnaissance vehicle"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="Wiesel">
-        <specific id="1" description="Wiesel with 20mm"/>
-        <specific id="2" description="Wiesel with TOW"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Armored Utility Vehicle">
-      <subcategory id="1" description="Biber armored bridge layer"/>
-      <subcategory id="2" description="Dachs armored engineer tank"/>
-      <subcategory id="3" description="Keiler armored minesweeper"/>
-      <subcategory id="4" description="Skorpion armored minelayer"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="M113 armored motor-ambulance"/>
-      <subcategory id="7" description="M113 armored artillery observer"/>
-      <subcategory id="8" description="Transportpanzer 1 &quot;Fuchs&quot;"/>
-      <subcategory id="9" description="Buffel ARV"/>
-    </category>
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="Panzerhaubitze 2000"/>
-    </category>
-    <category id="5" description="Towed Artillery">
-      <subcategory id="1" description="(deleted)"/>
-    </category>
-    <category id="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)">
-      <subcategory id="1" description="Mercedez Benz (240 GD)"/>
-    </category>
-    <category id="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)">
-      <subcategory id="1" description="IVECO Magirus 110-16 AWM (4x4) 5000kg truck (aka 168M11FAL)"/>
-      <subcategory id="2" description="MAN 5 ton"/>
-      <subcategory id="3" description="MAN 7 ton"/>
-      <subcategory id="4" description="MAN 10 ton"/>
-    </category>
-    <category id="10" description="Mortar">
-      <subcategory id="1" description="M113 armored mortar"/>
-    </category>
-    <category id="11" description="Mine plow"/>
-    <category id="12" description="Mine rake"/>
-    <category id="13" description="Mine roller"/>
-    <category id="14" description="Cargo trailer">
-      <subcategory id="1" description="0 - 0.5 ton"/>
-      <subcategory id="2" description="0.51 - 2 ton"/>
-      <subcategory id="3" description="2.01 - 5 ton"/>
-      <subcategory id="4" description="5.02 - 10 ton"/>
-      <subcategory id="5" description="greater than 10 tons"/>
-    </category>
-    <category id="15" description="Fuel trailer">
-      <subcategory id="1" description="1-1000 gallons"/>
-      <subcategory id="2" description="1001 - 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="16" description="Generator trailer">
-      <subcategory id="1" description="0 - 100 KW"/>
-      <subcategory id="2" description="greater than 100 KW"/>
-    </category>
-    <category id="17" description="Water trailer">
-      <subcategory id="1" description="1-1000 gallons"/>
-      <subcategory id="2" description="1001- 5000 gallons"/>
-      <subcategory id="3" description="greater than 5000 gallons"/>
-    </category>
-    <category id="18" description="Engineer equipment">
-      <subcategory id="1" description="Mine clearing line charge"/>
-      <subcategory id="2" description="Dozer blade kit"/>
-      <subcategory id="3" description="Lane marking system"/>
-    </category>
-    <category id="19" description="Heavy equipment transport trailer"/>
-    <category id="20" description="Maintenance equipment trailer">
-      <subcategory id="1" description="Welding trailer"/>
-      <subcategory id="2" description="Compressor"/>
-      <subcategory id="3" description="Tools/parts trailer"/>
-    </category>
-    <category id="21" description="Limber"/>
-    <category id="22" description="Chemical decontamination trailer"/>
-    <category id="27" description="Civilian Vehicle">
-      <subcategory id="1" description="Truck"/>
-      <subcategory id="2" description="Bus"/>
-      <subcategory id="3" description="Car"/>
-    </category>
-    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
-      <subcategory id="1" description="Self-Propelled VSHORAD Gun/Missile System">
-        <specific id="1" description="Roland AD System missile"/>
-        <specific id="2" description="Gepard armored AD gun"/>
-      </subcategory>
-      <subcategory id="2" description="Towed VSHORAD Gun / Missile System">
-        <specific id="1" description="Rheinmetal 20mm twin Rh202"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="78">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="EFM (Enhanced Fighter Maneuverability) X-31A"/>
-    </category>
-    <category id="2" description="Attack/Strike">
-      <subcategory id="1" description="Dassault/Dornier Alpha Jet">
-        <specific id="1" description="Alpha Jet E trainer/attack"/>
-        <specific id="2" description="Alpha Jet MS1"/>
-        <specific id="3" description="Alpha Jet A"/>
-        <specific id="4" description="Alpha Jet MS2"/>
-        <specific id="5" description="Alpha Jet 2"/>
-      </subcategory>
-      <subcategory id="2" description="Panavia Tornado IDS">
-        <specific id="1" description="Tornado IDS GR. Mk 1"/>
-        <specific id="2" description="Tornado IDS GR. 1A"/>
-        <specific id="3" description="Tornado IDS GR. 4"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Electronic Warfare (EW)">
-      <subcategory id="1" description="Panavia Tornado ECR"/>
-    </category>
-    <category id="8" description="Surveillance/C2">
-      <subcategory id="1" description="Transall C-160">
-        <specific id="1" description="C-160S. Maritime"/>
-        <specific id="2" description="C-160SE. Electronic"/>
-        <specific id="3" description="C-160AAA AEW"/>
-      </subcategory>
-      <subcategory id="2" description="Egrett II">
-        <specific id="1" description="Strato 1"/>
-      </subcategory>
-    </category>
-    <category id="20" description="Attack Helicopter">
-      <subcategory id="1" description="Eurocopter BO 105/PAH-1/VBH/BSH-1">
-        <specific id="1" description="PAH-1"/>
-        <specific id="2" description="PAH-1A1"/>
-        <specific id="3" description="BSH"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="Hkp 9"/>
-      </subcategory>
-      <subcategory id="2" description="Eurocopter Tigre">
-        <specific id="1" description="PAH-2"/>
-        <specific id="2" description="HAC"/>
-        <specific id="3" description="HAP"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Utility Helicopter">
-      <subcategory id="1" description="NH 90">
-        <specific id="1" description="TTH 90 medium helicopter"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="Eurocopter BO 105">
-        <specific id="1" description="BO 105CB"/>
-        <specific id="2" description="BO 105CBS"/>
-      </subcategory>
-      <subcategory id="7" description="Eurocopter/Kawasaki BK 117">
-        <specific id="1" description="BK 117 M"/>
-        <specific id="2" description="NBK-117"/>
-      </subcategory>
-    </category>
-    <category id="22" description="Antisubmarine Warfare / Patrol Helicopter">
-      <subcategory id="1" description="NH 90"/>
-      <subcategory id="2" description="NFH 90"/>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Dassault/Dornier Alpha Jet">
-        <specific id="1" description="Alpha Jet E"/>
-        <specific id="2" description="Alpha Jet 3"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="78">
-    <category id="4" description="Guided Missile Destroyer">
-      <subcategory id="1" description="Ex-US Modified Charles F. Adams class (type 103B) (DDGs)">
-        <specific id="1" description="D 185 Lutjens (ex-US DDG 28)"/>
-        <specific id="2" description="D 186 Molders (ex-US DDG 29)"/>
-        <specific id="3" description="D 187 Rommel (ex-US DDG 30)"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Destroyer">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Hamburg class (Type 101A)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="D 182 Schleswig-Hostein"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided Missile Frigate">
-      <subcategory id="1" description="Brandenburg class (Type 123)">
-        <specific id="1" description="F 215 Brandenburg"/>
-        <specific id="2" description="F 216 Schleswig-Holstein"/>
-        <specific id="3" description="F 217 Bayern"/>
-        <specific id="4" description="F 218 Mecklenburg-Vorpommern"/>
-      </subcategory>
-      <subcategory id="2" description="Bremen class (Type 122)">
-        <specific id="1" description="F 207 Bremen"/>
-        <specific id="2" description="F 208 Niedersachsen"/>
-        <specific id="3" description="F 209 Rheinland-Pfalz"/>
-        <specific id="4" description="F 210 Emden"/>
-        <specific id="5" description="F 211 Koln"/>
-        <specific id="6" description="F 212 Karlsruhe"/>
-        <specific id="7" description="F 213 Augsburg"/>
-        <specific id="8" description="F 214 Lubeck"/>
-      </subcategory>
-      <subcategory id="3" description="Sachsen Class (Type 124) (FFG)">
-        <specific id="1" description="F219 Sachsen"/>
-        <specific id="2" description="F220 Hamburg"/>
-        <specific id="3" description="F221 Hessen"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/patrol craft">
-      <subcategory id="1" description="Gepard class (type 143 A) (fast attack craft, missile)">
-        <specific id="1" description="P 6121 Gepard"/>
-        <specific id="2" description="P 6122 Puma"/>
-        <specific id="3" description="P 6123 Hermelin"/>
-        <specific id="4" description="P 6124 Nerz"/>
-        <specific id="5" description="P 6125 Zobel"/>
-        <specific id="6" description="P 6126 Frettechen"/>
-        <specific id="7" description="P 6127 Dachs"/>
-        <specific id="8" description="P 6128 Ozelot"/>
-        <specific id="9" description="P 6129 Wiesel"/>
-        <specific id="10" description="P 6130 Hyane"/>
-      </subcategory>
-      <subcategory id="2" description="Albatros class (type 143/143B) (fast attack craft, missile)">
-        <specific id="1" description="P 6111 Albatros"/>
-        <specific id="2" description="P 6122 Falke"/>
-        <specific id="3" description="P 6113 Geier"/>
-        <specific id="4" description="P 6114 Bussard"/>
-        <specific id="5" description="P 6115 Sperber"/>
-        <specific id="6" description="P 6116 Greif"/>
-        <specific id="7" description="P 6117 Kondor"/>
-        <specific id="8" description="P 6118 Seeadler"/>
-        <specific id="9" description="P 6119 Habicht"/>
-        <specific id="10" description="P 6120 Kormoran"/>
-      </subcategory>
-      <subcategory id="3" description="Tiger class (type 148) (fast attack craft, missile)">
-        <specific id="1" description="P 6141 Tiger"/>
-        <specific id="2" description="P 6142 Iltis"/>
-        <specific id="3" description="P 6143 Luchs"/>
-        <specific id="4" description="P 6144 Marder"/>
-        <specific id="5" description="P 6145 Leopard"/>
-        <specific id="6" description="P 6146 Fuchs"/>
-        <specific id="7" description="P 6147 Jaguar"/>
-        <specific id="8" description="P 6148 Lowe"/>
-        <specific id="9" description="P 6149 Wolf"/>
-        <specific id="10" description="P 6150 Panther"/>
-        <specific id="11" description="P 6151 Haher"/>
-        <specific id="12" description="P 6152 Storch"/>
-        <specific id="13" description="P 6153 Pelikan"/>
-        <specific id="14" description="P 6154 Elster"/>
-        <specific id="15" description="P 6155 Alk"/>
-        <specific id="16" description="P 6156 Dommel"/>
-        <specific id="17" description="P 6157 Weihe"/>
-        <specific id="18" description="P 6158 Pinguin"/>
-        <specific id="19" description="P 6159 Reiher"/>
-        <specific id="20" description="P 6160 Kranich"/>
-      </subcategory>
-      <subcategory id="4" description="Bredstedt class (large patrol craft, Coast Guard vessels)">
-        <specific id="1" description="BG 21 Bredstedt"/>
-      </subcategory>
-      <subcategory id="5" description="Sassnitz class (Coast Guard vessels)">
-        <specific id="1" description="Sassnitz (ex-P 6165, ex-591)"/>
-        <specific id="2" description="Sellin (ex-592)"/>
-        <specific id="3" description="Binz (ex-593)"/>
-      </subcategory>
-      <subcategory id="6" description="Neustadt class (large patrol craft, Coast Guard vessels)">
-        <specific id="1" description="BG 11 Neustadt"/>
-        <specific id="2" description="BG 12 Bad Bramstedt"/>
-        <specific id="3" description="BG 14 Duderstadt"/>
-        <specific id="4" description="BG 15 Eschwege"/>
-        <specific id="5" description="BG 16 Alsfeld"/>
-        <specific id="6" description="BG 17 Bayreuth"/>
-        <specific id="7" description="BG 18 Rosenheim"/>
-      </subcategory>
-      <subcategory id="7" description="Bremse class (harbor patrol craft, Coast Guard vessels)">
-        <specific id="1" description="GS 23"/>
-        <specific id="2" description="GS 30"/>
-        <specific id="3" description="GS 31"/>
-        <specific id="4" description="GS 32"/>
-        <specific id="5" description="GS 40"/>
-        <specific id="6" description="GS 41"/>
-        <specific id="7" description="GS 42"/>
-        <specific id="8" description="GS 51"/>
-        <specific id="9" description="GS 52"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship / Craft">
-      <subcategory id="1" description="Schutze class (type 340-341, minesweepers, coastal)">
-        <specific id="1" description="M 1059 Spica"/>
-        <specific id="2" description="M 1062 Schutze"/>
-        <specific id="3" description="M 1063 Waage"/>
-      </subcategory>
-      <subcategory id="2" description="Lindau class (coastal minesweepers and minehunters: type 331, minehunters; and type 351, Troika)">
-        <specific id="1" description="M 1070 Gottingen"/>
-        <specific id="2" description="M 1071 Koblenz"/>
-        <specific id="3" description="M 1072 Lindau"/>
-        <specific id="4" description="M 1073 Schleswig"/>
-        <specific id="5" description="M 1074 Tubingen"/>
-        <specific id="6" description="M 1075 Wetzlar"/>
-        <specific id="7" description="M 1076 Paderborn"/>
-        <specific id="8" description="M 1077 Weilheim"/>
-        <specific id="9" description="M 1078 Cuxhaven"/>
-        <specific id="10" description="M 1079 Duren"/>
-        <specific id="11" description="M 1080 Marburg"/>
-        <specific id="12" description="M 1081 Konstanz"/>
-        <specific id="13" description="M 1082 Wolfsburg"/>
-        <specific id="14" description="M 1083 Ulm"/>
-        <specific id="15" description="M 1085 Minden"/>
-      </subcategory>
-      <subcategory id="3" description="Kondor II class (minesweeper, coastal)">
-        <specific id="1" description="M2670 Sommerda (ex-311)"/>
-      </subcategory>
-      <subcategory id="4" description="Frauenlob class (type 394 minesweepers, inshore)">
-        <specific id="1" description="M 2658 Frauenlob"/>
-        <specific id="2" description="M 2659 Nautilus"/>
-        <specific id="3" description="M 2660 Gefion"/>
-        <specific id="4" description="M 2661 Medusa"/>
-        <specific id="5" description="M 2662 Undine"/>
-        <specific id="6" description="M 2663 Minerva"/>
-        <specific id="7" description="M 2664 Diana"/>
-        <specific id="8" description="M 2665 Loreley"/>
-        <specific id="9" description="M 2666 Atlantis"/>
-        <specific id="10" description="M 2667"/>
-      </subcategory>
-      <subcategory id="5" description="Ariadne Class (Type 393 minesweepers, inshore)">
-        <specific id="1" description="M 2651 Freya"/>
-        <specific id="2" description="M 2653 Hertha"/>
-        <specific id="3" description="M 2654 Nymphe"/>
-        <specific id="4" description="M 2655 Hertha"/>
-      </subcategory>
-      <subcategory id="6" description="Frankenthal class (type 332 minehunters, coastal)">
-        <specific id="1" description="M 1060 Weiden"/>
-        <specific id="2" description="M 1061 Rottweil"/>
-        <specific id="3" description="M 1062 Sulzbach-Rosenberg"/>
-        <specific id="4" description="M 1063 Bad Bevensen"/>
-        <specific id="5" description="M 1064 Gromitz"/>
-        <specific id="6" description="M 1065 Dillingen"/>
-        <specific id="7" description="M 1066 Frankenthal"/>
-        <specific id="8" description="M 1067 Bad Rappenau"/>
-        <specific id="9" description="M 1068 Datteln"/>
-        <specific id="10" description="M 1069 Homburg"/>
-      </subcategory>
-      <subcategory id="7" description="Hameln class (type 343 minesweepers, coastal)">
-        <specific id="1" description="M 1090 Pegnitz"/>
-        <specific id="2" description="M 1091 Kulmbach"/>
-        <specific id="3" description="M 1092 Hameln"/>
-        <specific id="4" description="M 1093 Auerbach"/>
-        <specific id="5" description="M 1094 Ensdorf"/>
-        <specific id="6" description="M 1095 Uberherrn"/>
-        <specific id="7" description="M 1096 Passau"/>
-        <specific id="8" description="M 1097 Laboe"/>
-        <specific id="9" description="M 1098 Siegburg"/>
-        <specific id="10" description="M 1099 Herten"/>
-      </subcategory>
-      <subcategory id="8" description="Trials ship (type 740, ex-minesweeper)">
-        <specific id="1" description="A 1400 Holnis (ex-A 836)"/>
-      </subcategory>
-      <subcategory id="9" description="Schutze class (type 732, diver-support ship)">
-        <specific id="1" description="M 1053 Stier (ex-Y 849)"/>
-      </subcategory>
-      <subcategory id="10" description="Sachsenwald class (type 762, mine transport)">
-        <specific id="1" description="A 1438 Steigerwald"/>
-      </subcategory>
-      <subcategory id="11" description="Kondor I class (minesweeper/patrol craft; Coast Guard vessels)">
-        <specific id="1" description="BG 31 Templin (ex-GS 06, ex-G 442)"/>
-        <specific id="2" description="BG 32 Kuhlungsborn (ex-GS 07, ex-G 445)"/>
-        <specific id="3" description="BG 33 Ahrenshoop (ex-GS 08, ex-G 415)"/>
-        <specific id="4" description="GS 01 Uckermunde (ex-G 411)"/>
-        <specific id="5" description="GS 02 Demmin (ex-G 422)"/>
-        <specific id="6" description="GS 03 Malchin (ex-G 441)"/>
-        <specific id="7" description="GS 04 Altentreptow (ex-G 414)"/>
-        <specific id="8" description="GS 05 Pasewalk (ex-G 423)"/>
-        <specific id="9" description="GS 09 Boltenhagen (ex-G 443)"/>
-      </subcategory>
-      <subcategory id="12" description="Seehund (Minesweepers - Drones)(MSD)"/>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="Type 521 (LCMs)">
-        <specific id="1" description="LCM 12 Sprotte"/>
-        <specific id="2" description="LCM 13 Sardine"/>
-        <specific id="3" description="LCM 14 Sardelle"/>
-        <specific id="4" description="LCM 15 Hering"/>
-        <specific id="5" description="LCM 16 Orfe"/>
-        <specific id="6" description="LCM 17 Marane"/>
-        <specific id="7" description="LCM 18 Saibling"/>
-        <specific id="8" description="LCM 19 Stint"/>
-        <specific id="9" description="LCM 20 Aesche"/>
-        <specific id="10" description="L 780 Hummer"/>
-        <specific id="11" description="L 781 Krill"/>
-        <specific id="12" description="L 782 Krabbe"/>
-        <specific id="13" description="L 783 Auster"/>
-        <specific id="14" description="L 784 Muschel"/>
-        <specific id="15" description="L 785 Koralle"/>
-        <specific id="16" description="L 786 Garnele"/>
-        <specific id="17" description="L 787 Languste"/>
-      </subcategory>
-      <subcategory id="2" description="Type 520 (LCUs)">
-        <specific id="1" description="L 760 Flunder"/>
-        <specific id="2" description="L 761 Karpfen"/>
-        <specific id="3" description="L 762 Lachs"/>
-        <specific id="4" description="L 763 Plotze"/>
-        <specific id="5" description="L 766 Stor"/>
-        <specific id="6" description="L 767 Tummler"/>
-        <specific id="7" description="L 768 Wels"/>
-        <specific id="8" description="L 769 Zander"/>
-        <specific id="9" description="L 788 Butt"/>
-        <specific id="10" description="L 795 Inger"/>
-      </subcategory>
-      <subcategory id="3" description="Mannheim 59 class (river landing craft, LCMs)"/>
-      <subcategory id="4" description="Bodan class (river landing craft, LCMs)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Elbe class (type 404, tenders)">
-        <specific id="1" description="A 511 Elbe"/>
-        <specific id="2" description="A 512 Mosel"/>
-        <specific id="3" description="A 513 Rhein"/>
-        <specific id="4" description="A 514 Werra"/>
-        <specific id="5" description="A 515 Main"/>
-        <specific id="6" description="A 516 Donau"/>
-      </subcategory>
-      <subcategory id="2" description="Rhein class (type 401, tenders)">
-        <specific id="1" description="A 58 Rhein"/>
-        <specific id="2" description="A 61 Elbe"/>
-        <specific id="3" description="A 63 Main"/>
-        <specific id="4" description="A 69 Donau"/>
-      </subcategory>
-      <subcategory id="3" description="Replenishment tankers (type 704)">
-        <specific id="1" description="A 1442 Spessart (ex-Okapi)"/>
-        <specific id="2" description="A 1443 Rhon (ex-Okene)"/>
-      </subcategory>
-      <subcategory id="4" description="Walchensee class (type 703, replenishment tankers)">
-        <specific id="1" description="A 1424 Walchensee"/>
-        <specific id="2" description="A 1425 Ammersee"/>
-        <specific id="3" description="A 1426 Tegernsee"/>
-        <specific id="4" description="A 1427 Westensee"/>
-      </subcategory>
-      <subcategory id="5" description="Type 763 (support tanker)">
-        <specific id="1" description="A 1407 Wittensee (ex-Sioux)"/>
-      </subcategory>
-      <subcategory id="6" description="Luneburg class (type 701, support ships)">
-        <specific id="1" description="A 1411 Luneburg"/>
-        <specific id="2" description="A 1413 Freiburg"/>
-        <specific id="3" description="A 1414 Glucksburg"/>
-        <specific id="4" description="A 1415 Saarburg"/>
-        <specific id="5" description="A 1416 Nienburg"/>
-        <specific id="6" description="A 1417 Offenburg"/>
-        <specific id="7" description="A 1418 Meersburg"/>
-      </subcategory>
-      <subcategory id="7" description="Westerwald class (type 760, ammunition, transports)">
-        <specific id="1" description="A 1435 Westerwald"/>
-        <specific id="2" description="A 1436 Odenwald"/>
-      </subcategory>
-      <subcategory id="8" description="Towing launches (type 946)">
-        <specific id="1" description="AK 1 Y 1671"/>
-        <specific id="2" description="AK 3 Y 1672"/>
-        <specific id="3" description="MA 2 Y 1676"/>
-        <specific id="4" description="MA 3 Y 1677"/>
-        <specific id="5" description="Borby Y 1687"/>
-      </subcategory>
-      <subcategory id="9" description="Oste Class (type 423, AGI)">
-        <specific id="1" description="A 50 Alster"/>
-        <specific id="2" description="A 52 Oste"/>
-        <specific id="3" description="A 53 Oker"/>
-      </subcategory>
-      <subcategory id="10" description="Trials ship (type 742)">
-        <specific id="1" description="A 1410 Walther Von Ledebur (ex-Y 841)"/>
-      </subcategory>
-      <subcategory id="11" description="Research ship (type 750)">
-        <specific id="1" description="A 1450 Planet"/>
-      </subcategory>
-      <subcategory id="12" description="Trials ship (type 741)">
-        <specific id="1" description="A 1408 SP 1 (ex-A 837)"/>
-        <specific id="2" description="A 1409 Wilhelm Pullwer (ex-Y 838)"/>
-      </subcategory>
-      <subcategory id="13" description="Diving tender (type 732)">
-        <specific id="1" description="M 1050 TB1"/>
-      </subcategory>
-      <subcategory id="14" description="Helgoland class (type 720, salvage tugs)">
-        <specific id="1" description="A 1457 Helgoland"/>
-        <specific id="2" description="A 1458 Fehmarn"/>
-      </subcategory>
-      <subcategory id="15" description="Wangerooge class (type 722, type 754; tugs)">
-        <specific id="1" description="A 1439 Baltrum"/>
-        <specific id="2" description="A 1440 Juist"/>
-        <specific id="3" description="A 1441 Langeoog"/>
-        <specific id="4" description="A 1451 Wangerooge"/>
-        <specific id="5" description="A 1452 Spiekeroog"/>
-        <specific id="6" description="A 1455 Rderney"/>
-      </subcategory>
-      <subcategory id="16" description="Berlin Class (Type 702)(AOR)">
-        <specific id="1" description="A1411 Berlin"/>
-      </subcategory>
-    </category>
-    <category id="17" description="Auxiliary, Merchant Marine">
-      <subcategory id="1" description="Harbor tugs (type 724)">
-        <specific id="1" description="Y 820 Sylt"/>
-        <specific id="2" description="Y 821 Fohr"/>
-        <specific id="3" description="Y 822 Amrum"/>
-        <specific id="4" description="Y 823 Neuwerk"/>
-        <specific id="5" description="Y 1680 Neuende"/>
-        <specific id="6" description="Y 1681 Heppens"/>
-        <specific id="7" description="Y 1682 Ellerbek"/>
-      </subcategory>
-      <subcategory id="2" description="Harbor tugs (type 725)">
-        <specific id="1" description="Y 812 Lutjehorn"/>
-        <specific id="2" description="Y 814 Knechtsand"/>
-        <specific id="3" description="Y 815 Scharhorn"/>
-        <specific id="4" description="Y 816 Vogelsand"/>
-        <specific id="5" description="Y 817 Rdstrand"/>
-        <specific id="6" description="Y 819 Langeness"/>
-      </subcategory>
-      <subcategory id="3" description="Harbor tugs (type 414)">
-        <specific id="1" description="Koos (ex-Delphin)"/>
-        <specific id="2" description="Wustrow (ex-Zander)"/>
-        <specific id="3" description="Drankse (ex-Kormoran)"/>
-        <specific id="4" description="Y 1651 (ex-A 08)"/>
-        <specific id="5" description="Y 1656 (ex-A 45)"/>
-        <specific id="6" description="Y 1658 (ex-A 68)"/>
-      </subcategory>
-      <subcategory id="4" description="Icebreaking tug (type 724; Coast Guard vessels)">
-        <specific id="1" description="BG 5 Rettin"/>
-      </subcategory>
-    </category>
-    <category id="18" description="Utility">
-      <subcategory id="1" description="Gustav Konigs class (harbor tankers)">
-        <specific id="1" description="Y 1652 Kolpinsee (ex-C 11)"/>
-        <specific id="2" description="Y 1657 Fleesensee (ex-C 40)"/>
-      </subcategory>
-      <subcategory id="2" description="Ohre class (accommodation ships)">
-        <specific id="1" description="Y 890 Vogtland (ex-H 71)"/>
-        <specific id="2" description="Y 891 Altmark (ex-H 11)"/>
-        <specific id="3" description="Y 892 Havelland (ex-H 51)"/>
-        <specific id="4" description="Y 893 Uckermark (ex-H 91)"/>
-        <specific id="5" description="Y 894 Borde (ex-H 72)"/>
-        <specific id="6" description="Y 895 Wische (ex-H 31)"/>
-      </subcategory>
-      <subcategory id="3" description="Type 705 (water boats)">
-        <specific id="1" description="FW 1 A 1403 (ex-Y 864)"/>
-        <specific id="2" description="FW 5 A 1405 (ex-Y 868)"/>
-      </subcategory>
-      <subcategory id="4" description="Knurrhahn Class (type 730, accommodation ship)">
-        <specific id="1" description="Y 811 Knurrhahn"/>
-      </subcategory>
-      <subcategory id="5" description="Battery-charging craft (type 718)">
-        <specific id="1" description="LP 1"/>
-        <specific id="2" description="LP 2"/>
-        <specific id="3" description="Y 1690 LP 3"/>
-      </subcategory>
-      <subcategory id="6" description="Schwedeneck class (type 748, multipurpose)">
-        <specific id="1" description="Y 860 Schwedeneck"/>
-        <specific id="2" description="Y 861 Kronsort"/>
-        <specific id="3" description="Y 862 Helmsand"/>
-      </subcategory>
-      <subcategory id="7" description="Stollergrund class (type 745, multipurpose)">
-        <specific id="1" description="Y 863 Stollergrund"/>
-        <specific id="2" description="Y 864 Mittelgrund"/>
-        <specific id="3" description="Y 865 Kalkgrund"/>
-        <specific id="4" description="Y 866 Breitgrund"/>
-        <specific id="5" description="Y 867 Bant"/>
-      </subcategory>
-      <subcategory id="8" description="Trials ship (type 740)">
-        <specific id="1" description="Y 871 Heinz Roggenkamp"/>
-      </subcategory>
-      <subcategory id="9" description="Floating docks (types 712-715) and cranes (type 711)">
-        <specific id="1" description="A Y 842 Schwimmdocks"/>
-        <specific id="2" description="Y 875 Hiev"/>
-        <specific id="3" description="B Y 879 Schwimmdocks"/>
-        <specific id="4" description="Y 876 Griep"/>
-        <specific id="5" description="c, 2 and 3"/>
-      </subcategory>
-      <subcategory id="10" description="Tank cleaning vessels (type 710)">
-        <specific id="1" description="Y 1641 Forde"/>
-        <specific id="2" description="Y 1642 Jade"/>
-      </subcategory>
-      <subcategory id="11" description="Trial boat (type 740)">
-        <specific id="1" description="Y 1689 Bums"/>
-      </subcategory>
-      <subcategory id="12" description="General service launches (types 740, 743, 744, 744a)">
-        <specific id="1" description="Y 1670 MT-BOOT"/>
-        <specific id="2" description="Y 1673 AK 5"/>
-        <specific id="3" description="Y 1674 AK 6"/>
-        <specific id="4" description="Y 1675 AM 8"/>
-        <specific id="5" description="Y 1679 AM 7"/>
-        <specific id="6" description="Y 1683 AK 6"/>
-        <specific id="7" description="Y 1684 Peter Bachmann"/>
-        <specific id="8" description="Y 1686 AK 2 Y"/>
-      </subcategory>
-      <subcategory id="13" description="Range-safety craft (5 type 369, 1 type 909)">
-        <specific id="1" description="Y 827 KW 15"/>
-        <specific id="2" description="Y 830 KW 16"/>
-        <specific id="3" description="Y 845 KW 17"/>
-        <specific id="4" description="Y 832 KW 18"/>
-        <specific id="5" description="Y 846 KW 20"/>
-        <specific id="6" description="Y 857 H 11"/>
-      </subcategory>
-      <subcategory id="14" description="Twin-hull oil-recovery ships (type 738)">
-        <specific id="1" description="Y 1643 Bottsand"/>
-        <specific id="2" description="Y 1644 Eversand"/>
-      </subcategory>
-      <subcategory id="15" description="Torpedo recovery vessels (type 430A)">
-        <specific id="1" description="Y 851 TF 1"/>
-        <specific id="2" description="Y 852 TF 2"/>
-        <specific id="3" description="Y 853 TF 3"/>
-        <specific id="4" description="Y 855 TF 5"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate">
-      <subcategory id="1" description="Thetis class (type 420)">
-        <specific id="1" description="P 6053 Hermes"/>
-        <specific id="2" description="P 6055 Triton"/>
-        <specific id="3" description="P 6056 Theseus"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="78">
-    <category id="5" description="SS (Conventional attack-torpedo patrol)">
-      <subcategory id="1" description="Type 206">
-        <specific id="1" description="S 192 U 13"/>
-        <specific id="2" description="S 193 U 14"/>
-        <specific id="3" description="S 198 U 19"/>
-        <specific id="4" description="S 199 U 20"/>
-        <specific id="5" description="S 170 U 21"/>
-        <specific id="6" description="S 176 U 27"/>
-      </subcategory>
-      <subcategory id="2" description="Type 206A">
-        <specific id="1" description="S 194 U 15"/>
-        <specific id="2" description="S 195 U 16"/>
-        <specific id="3" description="S 196 U 17"/>
-        <specific id="4" description="S 197 U 18"/>
-        <specific id="5" description="S 171 U 22"/>
-        <specific id="6" description="S 172 U 23"/>
-        <specific id="7" description="S 173 U 24"/>
-        <specific id="8" description="S 174 U 25"/>
-        <specific id="9" description="S 175 U 26"/>
-        <specific id="10" description="S 177 U 28"/>
-        <specific id="11" description="S 178 U 29"/>
-        <specific id="12" description="S 179 U 30"/>
-      </subcategory>
-      <subcategory id="3" description="Type 205">
-        <specific id="1" description="S 188 U 9"/>
-        <specific id="2" description="S 189 U 10"/>
-        <specific id="3" description="S 190 U 11"/>
-        <specific id="4" description="S 191 U 12"/>
-      </subcategory>
-      <subcategory id="4" description="Type 209">
-        <specific id="1" description="1500">
-          <extra id="1" description="S44 Shishumar (India)"/>
-        </specific>
-        <specific id="2" description="1200"/>
-      </subcategory>
-      <subcategory id="5" description="Modernized Kobben class (type 207)">
-        <specific id="1" description="Sklinna (Norway)"/>
-        <specific id="2" description="Skolpen (Norway)"/>
-        <specific id="3" description="Stord (Norway)"/>
-        <specific id="4" description="Svenner (Norway)"/>
-        <specific id="5" description="Kobben (Norway)"/>
-        <specific id="6" description="Kunna (Norway)"/>
-      </subcategory>
-      <subcategory id="6" description="Type 212A">
-        <specific id="1" description="U-31"/>
-        <specific id="2" description="U-32"/>
-        <specific id="3" description="U-33"/>
-        <specific id="4" description="U-34"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="78">
-    <category id="1" description="Manned">
-      <subcategory id="1" description="Space vehicles">
-        <specific id="1" description="Hermes"/>
-        <specific id="2" description="Saenger Spaceplane"/>
-      </subcategory>
-      <subcategory id="2" description="Space Station">
-        <specific id="1" description="Columbus"/>
-      </subcategory>
-      <subcategory id="3" description="Space Lab">
-        <specific id="1" description="D1"/>
-        <specific id="2" description="D2"/>
-        <specific id="3" description="D3"/>
-        <specific id="4" description="IML 1"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Unmanned">
-      <subcategory id="1" description="Communication satellite">
-        <specific id="1" description="DFS-Kopernikus"/>
-        <specific id="2" description="Artemis"/>
-        <specific id="3" description="DRS"/>
-      </subcategory>
-      <subcategory id="5" description="Meteorology satellite">
-        <specific id="1" description="Atmos"/>
-        <specific id="2" description="Azur"/>
-        <specific id="3" description="X-SAR"/>
-        <specific id="4" description="ERS"/>
-        <specific id="5" description="POEM"/>
-      </subcategory>
-      <subcategory id="7" description="Imaging Radar Surveillance Satellite">
-        <specific id="1" description="Rosat"/>
-      </subcategory>
-      <subcategory id="13" description="Science satellite">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="Ulysses"/>
-        <specific id="3" description="Galileo"/>
-        <specific id="4" description="Soho &amp; Cluster"/>
-        <specific id="5" description="Eureca"/>
-        <specific id="6" description="Astro-SPAS"/>
-        <specific id="7" description="HST"/>
-        <specific id="8" description="Mars-94/96"/>
-        <specific id="9" description="ISO"/>
-        <specific id="10" description="Huygens/Cassini"/>
-        <specific id="11" description="Giotto"/>
-        <specific id="12" description="Hipparcos"/>
-        <specific id="13" description="Compton"/>
-        <specific id="14" description="(deleted)"/>
-        <specific id="15" description="Bremsat"/>
-      </subcategory>
-      <subcategory id="15" description="Microgravity Satellite">
-        <specific id="1" description="Spacelab"/>
-        <specific id="2" description="Eureca"/>
-        <specific id="3" description="SPAS"/>
-        <specific id="4" description="Maxus"/>
-        <specific id="5" description="Texus"/>
-        <specific id="6" description="Mikroba"/>
-        <specific id="7" description="Mir-92"/>
-        <specific id="8" description="MAUS"/>
-        <specific id="9" description="Express"/>
-      </subcategory>
-      <subcategory id="16" description="Miscellaneous">
-        <specific id="1" description="Shuttle Pallet (SPAS)"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Booster">
-      <subcategory id="1" description="Ariane"/>
-      <subcategory id="2" description="Maxus"/>
-      <subcategory id="3" description="Saenger"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="45">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="Type 59">
-        <specific id="1" description="Type 59-I"/>
-        <specific id="2" description="Type 59-II"/>
-      </subcategory>
-      <subcategory id="2" description="Type 69">
-        <specific id="1" description="Type 69-I"/>
-        <specific id="2" description="Type 69-II"/>
-      </subcategory>
-      <subcategory id="3" description="Type 79"/>
-      <subcategory id="4" description="Type 80">
-        <specific id="1" description="Type 80"/>
-        <specific id="2" description="Type 80-II"/>
-      </subcategory>
-      <subcategory id="5" description="Type 85-II">
-        <specific id="1" description="Type 85-II"/>
-        <specific id="2" description="Type 85-IIA"/>
-        <specific id="3" description="Type 85-11M (w/125mm gun)"/>
-        <specific id="4" description="Type 85-III"/>
-      </subcategory>
-      <subcategory id="6" description="Type 63 (light amphibious)">
-        <specific id="1" description="Type 63A"/>
-      </subcategory>
-      <subcategory id="7" description="Type 62 (light)"/>
-    </category>
-    <category id="2" description="Armored Fighting Vehicle">
-      <subcategory id="1" description="NORINCO YW 531 Armored Personnel Carrier (APC)"/>
-      <subcategory id="2" description="NORINCO Type 85 (YW 531H) Armored Personnel Carrier (APC)"/>
-      <subcategory id="3" description="NORINCO YW 534 Armored Personnel Carrier (APC)"/>
-      <subcategory id="4" description="NORINCO Type 77 (M1974) Armored Personnel Carrier (APC)"/>
-      <subcategory id="5" description="NORINCO Type WZ 501 Infantry Fighting Vehicle (IFV)"/>
-      <subcategory id="6" description="NORINCO WZ 551 Armored Personnel Carrier (APC)"/>
-      <subcategory id="7" description="NORINCO Type WZ 523 Armored Personnel Carrier (APC)"/>
-    </category>
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="Type 54-1 122mm SP Howitzer"/>
-      <subcategory id="2" description="Type 83 152mm SP Gun-Howitzer"/>
-      <subcategory id="3" description="Type 81 122mm Multiple Rocket Launcher (MRL)"/>
-      <subcategory id="4" description="Type 63 130mm Multiple Rocket Launcher (MRL)"/>
-      <subcategory id="5" description="Type 87 253mm Mine Clearing System (MRL)"/>
-      <subcategory id="6" description="Type 74 284mm Minelaying Rocket System"/>
-      <subcategory id="7" description="Type 75 105mm Recoilless Rifle"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="SY-1 (Styx) ASCM launcher"/>
-      <subcategory id="14" description="YJ-1/C-802/CSS-N-8 Saccade ASCM launcher"/>
-      <subcategory id="15" description="CSS-8 (M-7) surface-to-surface missile launcher"/>
-      <subcategory id="16" description="DF-15 (M9) launcher"/>
-      <subcategory id="17" description="CSSC-5 (YJ-16/C-101) Saples launcher"/>
-      <subcategory id="18" description="CSSC-6 (HY-3) Sawhorse launcher"/>
-      <subcategory id="19" description="CSSC-7 (HY-4) Sadsack launcher"/>
-    </category>
-    <category id="5" description="Towed Artillery">
-      <subcategory id="1" description="Type 54 122mm Howitzer"/>
-      <subcategory id="2" description="Type 59 130mm Gun">
-        <specific id="1" description="Type 59"/>
-        <specific id="2" description="Type 59-1"/>
-      </subcategory>
-      <subcategory id="3" description="Type 54 152mm Howitzer"/>
-      <subcategory id="4" description="Type 66 152mm Gun-Howitzer"/>
-      <subcategory id="5" description="Type WA 021 (WAC 21) 155mm Gun-Howitzer"/>
-      <subcategory id="6" description="Type 63 107mm Multiple Rocket Launcher (MRL)"/>
-      <subcategory id="7" description="Type 65 82mm Recoilless Rifle"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="Type 55 57mm Anti-Tank Gun (ATG)"/>
-      <subcategory id="12" description="Type 54 76mm ATG"/>
-      <subcategory id="13" description="Type 56 85mm ATG"/>
-      <subcategory id="14" description="Type 73 100mm ATG"/>
-      <subcategory id="15" description="Type 86 100mm ATG"/>
-      <subcategory id="16" description="HY-series ASCM launcher">
-        <specific id="1" description="HY-1/CSSC-2 Silkworm launcher"/>
-        <specific id="2" description="HY-2/CSSC-3 Seersucker launcher"/>
-      </subcategory>
-      <subcategory id="17" description="C-801/YJ-1/CSS-N-4 Sardine launcher"/>
-    </category>
-    <category id="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)">
-      <subcategory id="1" description="BJ212 4x4"/>
-    </category>
-    <category id="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)">
-      <subcategory id="1" description="Jiefang CA-10"/>
-      <subcategory id="2" description="Jiefang CA-30 6x6 2500kg cargo/utility truck">
-        <specific id="1" description="CA-30"/>
-        <specific id="2" description="CA-30A"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Mortar">
-      <subcategory id="1" description="100 mm type 71 mortar"/>
-      <subcategory id="2" description="120 mm type 55 mortar"/>
-      <subcategory id="3" description="160 mm type 56 mortar"/>
-    </category>
-    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
-      <subcategory id="1" description="HQ-2/CSA-1 SAM System">
-        <specific id="1" description="Battalion C3 Vehicle"/>
-        <specific id="2" description="HQ-2 Launcher">
-          <extra id="1" description="HQ-2 Launcher (standard)"/>
-          <extra id="2" description="HQ-2B SP Launcher (tracked)"/>
-        </specific>
-        <specific id="3" description="Gin Sling Engagement Radar">
-          <extra id="1" description="Gin Sling A"/>
-          <extra id="2" description="Gin Sling B"/>
-        </specific>
-      </subcategory>
-      <subcategory id="2" description="HQ-61/CSA-2 SAM System">
-        <specific id="1" description="Battery Command Post Vehicle"/>
-        <specific id="2" description="HQ-61 Twin-Rail Launcher Vehicle"/>
-        <specific id="3" description="HQ-61 Engagement Radar"/>
-      </subcategory>
-      <subcategory id="3" description="LY-60 SAM System">
-        <specific id="1" description="LY-60 Battery C3 Vehicle"/>
-        <specific id="2" description="LY-60 5-Round SP Launcher"/>
-        <specific id="3" description="LY-60 Engagement Radar Vehicle"/>
-        <specific id="4" description="LY-60 Surveillance Radar Vehicle"/>
-      </subcategory>
-      <subcategory id="4" description="Self-Propelled VSHORAD Gun/Missile System">
-        <specific id="1" description="PL-9 SAM System (quad-rail)"/>
-        <specific id="2" description="HN-5C SAM System"/>
-      </subcategory>
-      <subcategory id="5" description="Towed VSHORAD Gun/Missile System">
-        <specific id="1" description="Type 59 57mm AA Gun (similar to CIS S-60)"/>
-        <specific id="2" description="NORINCO 37mm AA Guns">
-          <extra id="1" description="Type 55"/>
-          <extra id="2" description="Type 65 (twin)"/>
-          <extra id="3" description="Type 74 (twin)"/>
-          <extra id="4" description="Type P793 (twin)"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="45">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="Shenyang F-6 (Farmer)"/>
-      <subcategory id="2" description="Xien J-7 (Fishbed)">
-        <specific id="1" description="J-7 II"/>
-        <specific id="2" description="J-7 E"/>
-        <specific id="3" description="J-7 / F-7 III"/>
-        <specific id="4" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="3" description="Shenyang J-8 (Finback)">
-        <specific id="1" description="J-8 I Finback A"/>
-        <specific id="2" description="J-8 II Finback B"/>
-      </subcategory>
-      <subcategory id="4" description="Chengdu Aircraft Industrial Corp. J-9"/>
-    </category>
-    <category id="2" description="Attack/Strike">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Nanchang Q-5 (Fantan)">
-        <specific id="1" description="Q-5"/>
-        <specific id="2" description="Q-5I"/>
-        <specific id="3" description="Q-5IA"/>
-        <specific id="4" description="Q-5 II"/>
-        <specific id="5" description="A-5C Fantan"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="Xian Aircraft Company JH-7"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-    </category>
-    <category id="3" description="Bomber">
-      <subcategory id="1" description="Harbin H-5 (B-5) Beagle"/>
-      <subcategory id="2" description="Xian H-6 (B-6) Badger">
-        <specific id="1" description="B-6 Badger A"/>
-        <specific id="2" description="B-6D Badger (ASM platform)"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="Shaanxi Aircraft Company Y-8">
-        <specific id="1" description="Y-8A (helicopter carrier)"/>
-        <specific id="2" description="Y-8E (drone carrier)"/>
-      </subcategory>
-      <subcategory id="2" description="Xian Aircraft Company Y-7">
-        <specific id="1" description="Y-7 (cargo)"/>
-        <specific id="2" description="Y-7H-500 (cargo)"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="ASW/Patrol/Observation">
-        <specific id="1" description="Harbin Aircraft Manufacturing Corp. SH-5"/>
-        <specific id="2" description="Shannxi Aircraft Company Y-8X"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Utility helicopter">
-      <subcategory id="1" description="Changhe Aircraft Factory Z-8"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Chengdu Aircraft Industrial Corp. JJ-5"/>
-      <subcategory id="2" description="Changdu Aircraft Industrial Corp. JJ-7/FT-7"/>
-      <subcategory id="3" description="Guizhou Aviation Industry Corp JJ-7"/>
-      <subcategory id="4" description="Nanchang Aircraft Manufacturing Company CJ-6">
-        <specific id="1" description="CJ-6A"/>
-        <specific id="2" description="CJ-6B"/>
-      </subcategory>
-      <subcategory id="5" description="Nanchang AMC / PAK K-8"/>
-    </category>
-    <category id="57" description="Non-Combatant Commercial Aircraft">
-      <subcategory id="1" description="Passenger Airline">
-        <specific id="1" description="Harbin Aircraft Manufacturing Corp. Y-12(I)"/>
-        <specific id="2" description="Harbin Aircraft Manufacturing Corp. Y-12 (II)"/>
-        <specific id="3" description="Harbin Aircraft Manufacturing Corp. Y-12 (IV)"/>
-        <specific id="4" description="Shaanxi Aircraft Company Y-8B"/>
-        <specific id="5" description="Shaanxi Aircraft Company Y-8C"/>
-        <specific id="6" description="Xian Aircraft Company Y7-100"/>
-        <specific id="7" description="Xian Aircraft Company Y7-100C"/>
-        <specific id="8" description="Xian Aircraft Compnay Y7-200"/>
-        <specific id="9" description="Xian Aircraft Company Y7-200B"/>
-        <specific id="10" description="(deleted)"/>
-        <specific id="11" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="2" description="Agriculture">
-        <specific id="1" description="Nanching Aircraft Manufacturing Company N-5A"/>
-        <specific id="2" description="Harbin Aircraft Manufacturing Corp. Y-11B (I)"/>
-        <specific id="3" description="WSK-PZL Mielec M-18 Dromader"/>
-      </subcategory>
-      <subcategory id="3" description="Helicopter">
-        <specific id="1" description="Harbin Aircraft Co. Z-9/Z-9A (Eurocopter AS 365N2)"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="Special Purpose">
-        <specific id="1" description="Shaanxi Aircraft Company Y-8F (livestock carrier)"/>
-        <specific id="2" description="Shaanxi Aircraft Company Y-8H (aerial survey)"/>
-        <specific id="3" description="Xian Aircraft Company Y-7 (cargo)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="45">
-    <category id="4" description="Guided Missile Destroyer (DDG)">
-      <subcategory id="1" description="Luhu (Type 052)">
-        <specific id="1" description="112 Luhu"/>
-      </subcategory>
-      <subcategory id="2" description="Luda (Type 051)">
-        <specific id="1" description="Jinan"/>
-        <specific id="2" description="Xian"/>
-        <specific id="3" description="Yinchuan"/>
-        <specific id="4" description="Xinging"/>
-        <specific id="5" description="Kaifeng"/>
-        <specific id="6" description="Dalien"/>
-        <specific id="7" description="Nanjing"/>
-        <specific id="8" description="Hefei"/>
-        <specific id="9" description="Chongqing"/>
-        <specific id="10" description="Zunyi"/>
-        <specific id="11" description="Changsha"/>
-        <specific id="12" description="Nanning"/>
-        <specific id="13" description="Nanchang"/>
-        <specific id="14" description="Guilin"/>
-        <specific id="15" description="Zangjiang"/>
-        <specific id="16" description="Zhuhei"/>
-      </subcategory>
-      <subcategory id="3" description="Luhia Class DDG">
-        <specific id="1" description="Shenzhen"/>
-        <specific id="2" description="H2 (2003)"/>
-        <specific id="3" description="H3 (2005)"/>
-        <specific id="4" description="H4 (2007)"/>
-        <specific id="5" description="H5 (2007)"/>
-        <specific id="6" description="H6 (2009)"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Jianghu (Type 053)">
-        <specific id="1" description="Chang De"/>
-        <specific id="2" description="Shaoxing"/>
-        <specific id="3" description="Nantong"/>
-        <specific id="4" description="Wuxi"/>
-        <specific id="5" description="Huayin"/>
-        <specific id="6" description="Zhenjiang"/>
-        <specific id="7" description="Xiamen"/>
-        <specific id="8" description="Jiujiang"/>
-        <specific id="9" description="Nanping"/>
-        <specific id="10" description="Jian"/>
-        <specific id="11" description="Changzhi"/>
-        <specific id="12" description="Ningpo"/>
-        <specific id="13" description="Jinhua"/>
-        <specific id="14" description="Dandong"/>
-        <specific id="15" description="Tinashan"/>
-        <specific id="16" description="Maoming"/>
-        <specific id="17" description="Yibin"/>
-        <specific id="18" description="Shaoguan"/>
-        <specific id="19" description="Anshun"/>
-        <specific id="20" description="Zhaotong"/>
-        <specific id="21" description="Jishao"/>
-        <specific id="22" description="Zigong"/>
-        <specific id="23" description="Kangding"/>
-        <specific id="24" description="Dongguan"/>
-        <specific id="25" description="Shantou"/>
-      </subcategory>
-      <subcategory id="2" description="Jianghu II (Type 053)">
-        <specific id="1" description="Siping"/>
-      </subcategory>
-      <subcategory id="3" description="Jianghu III">
-        <specific id="1" description="Huangshi"/>
-        <specific id="2" description="WuHu"/>
-      </subcategory>
-      <subcategory id="4" description="Jianghu IV">
-        <specific id="1" description="Zhoushan"/>
-      </subcategory>
-      <subcategory id="5" description="Jiangwei">
-        <specific id="1" description="Anging"/>
-        <specific id="2" description="Huainan"/>
-        <specific id="3" description="Huaibei"/>
-        <specific id="4" description="Tongling"/>
-      </subcategory>
-      <subcategory id="6" description="Jiavgnan (Type 065)">
-        <specific id="1" description="Nanchong"/>
-        <specific id="2" description="Dongchuan"/>
-      </subcategory>
-      <subcategory id="7" description="Chengdu (Type 01)">
-        <specific id="1" description="Chengdu"/>
-        <specific id="2" description="Pingxiang"/>
-      </subcategory>
-      <subcategory id="8" description="Jiangdong (Type 053K)">
-        <specific id="1" description="Yingtan"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Huang class Type 037/2 (fast attack missile)">
-        <specific id="1" description="770"/>
-      </subcategory>
-      <subcategory id="2" description="Houxin class (fast attack missile)">
-        <specific id="1" description="751-758"/>
-      </subcategory>
-      <subcategory id="3" description="Hola class (fast attach missile)">
-        <specific id="1" description="5100"/>
-      </subcategory>
-      <subcategory id="4" description="Hegu/Hoku class Type 024 (fast attack missile)"/>
-      <subcategory id="5" description="Haijui class (fast attack patrol)">
-        <specific id="1" description="688"/>
-        <specific id="2" description="693"/>
-        <specific id="3" description="694"/>
-        <specific id="4" description="697"/>
-      </subcategory>
-      <subcategory id="6" description="Hainan class Type 037 (fast attack patrol)">
-        <specific id="1" description="267-285"/>
-        <specific id="2" description="290"/>
-        <specific id="3" description="302"/>
-        <specific id="4" description="305"/>
-        <specific id="5" description="609"/>
-        <specific id="6" description="610"/>
-        <specific id="7" description="622"/>
-        <specific id="8" description="628"/>
-        <specific id="9" description="636-698"/>
-        <specific id="10" description="689-692"/>
-        <specific id="11" description="695"/>
-        <specific id="12" description="696"/>
-        <specific id="13" description="698"/>
-        <specific id="14" description="699"/>
-        <specific id="15" description="701"/>
-        <specific id="16" description="702"/>
-        <specific id="17" description="707"/>
-        <specific id="18" description="723-730"/>
-      </subcategory>
-      <subcategory id="7" description="Shanghai class Type 062 (fast attack gun)">
-        <specific id="1" description="E227"/>
-        <specific id="2" description="301"/>
-        <specific id="3" description="321"/>
-        <specific id="4" description="N1121"/>
-        <specific id="5" description="1127"/>
-        <specific id="6" description="3140"/>
-        <specific id="7" description="3141"/>
-        <specific id="8" description="N3215"/>
-        <specific id="9" description="N3313"/>
-        <specific id="10" description="N4301"/>
-        <specific id="11" description="4324"/>
-        <specific id="12" description="9342 et al"/>
-      </subcategory>
-      <subcategory id="8" description="Huludao class Type 206 (fast attack patrol)">
-        <specific id="1" description="65"/>
-        <specific id="2" description="77"/>
-        <specific id="3" description="101"/>
-        <specific id="4" description="109"/>
-      </subcategory>
-      <subcategory id="9" description="Huxin class (river patrol)">
-        <specific id="1" description="62 et al"/>
-      </subcategory>
-      <subcategory id="10" description="Huangfen Class (Pakistan)"/>
-      <subcategory id="11" description="Haiqing (Type 037/1) Class (Fast Attack Craft-Patrol)(PC)">
-        <specific id="1" description="710"/>
-      </subcategory>
-      <subcategory id="12" description="Huchuan (Type 025/026) Class (Fast Attack Craft-Torpedo)">
-        <specific id="1" description="205"/>
-      </subcategory>
-      <subcategory id="13" description="Houku Class Type 024 Fast Attack Missile"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Beleijan class (minelayer)">
-        <specific id="1" description="814"/>
-      </subcategory>
-      <subcategory id="2" description="Wosao class (minesweeper-coastal)">
-        <specific id="1" description="4422 et al"/>
-      </subcategory>
-      <subcategory id="3" description="Fushun class (minesweeper-coastal)">
-        <specific id="1" description="E303 et al"/>
-      </subcategory>
-      <subcategory id="4" description="Lienyou class (minesweeper-coastal)"/>
-      <subcategory id="5" description="Futi class Type 312 (minesweeper-drone)"/>
-      <subcategory id="6" description="T-43 MSO Type 010">
-        <specific id="1" description="830"/>
-        <specific id="2" description="831"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Tank Landing Ship">
-      <subcategory id="1" description="Yuting class">
-        <specific id="1" description="991"/>
-      </subcategory>
-      <subcategory id="2" description="Yukan class Type 072">
-        <specific id="1" description="927"/>
-        <specific id="2" description="928"/>
-        <specific id="3" description="929"/>
-        <specific id="4" description="930"/>
-      </subcategory>
-      <subcategory id="3" description="US 1-511 (Shan) Class (LST)">
-        <specific id="1" description="US1"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="Yudao class (landing ship medium)"/>
-      <subcategory id="2" description="Yuliang class Type 079 (landing ship medium)"/>
-      <subcategory id="3" description="Yuling class (landing ship medium)"/>
-      <subcategory id="4" description="Chinese Type class (landing ship medium)">
-        <specific id="1" description="972"/>
-        <specific id="2" description="990 et al"/>
-      </subcategory>
-      <subcategory id="5" description="Yunnan class Type 067 (landing craft utility)">
-        <specific id="1" description="3313"/>
-        <specific id="2" description="3321"/>
-        <specific id="3" description="3344"/>
-        <specific id="4" description="5526"/>
-        <specific id="5" description="7566"/>
-        <specific id="6" description="7568 et al"/>
-      </subcategory>
-      <subcategory id="6" description="Yuch'in class Type 068/069 (landing craft utility)">
-        <specific id="1" description="Y765 et al"/>
-      </subcategory>
-    </category>
-    <category id="14" description="Hydrofoil">
-      <subcategory id="1" description="Huchuan class Type 025/026 (fast attack-torpedo)">
-        <specific id="1" description="205"/>
-        <specific id="2" description="207-209"/>
-        <specific id="3" description="248"/>
-        <specific id="4" description="1247"/>
-        <specific id="5" description="2201"/>
-        <specific id="6" description="2203"/>
-        <specific id="7" description="3206"/>
-        <specific id="8" description="3214"/>
-        <specific id="9" description="6218"/>
-        <specific id="10" description="7230 et al"/>
-      </subcategory>
-    </category>
-    <category id="15" description="Air Cushion/Surface Effect">
-      <subcategory id="1" description="Jingsah II class">
-        <specific id="1" description="452"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Daxin class (training ship)">
-        <specific id="1" description="81 Zhenghe"/>
-      </subcategory>
-      <subcategory id="2" description="Dajiang class (submarine support)">
-        <specific id="1" description="J121 Changxingdao"/>
-        <specific id="2" description="J122 Chongmingdao"/>
-        <specific id="3" description="J506 Yongxingdao"/>
-      </subcategory>
-      <subcategory id="3" description="Da Dong class (salvage)">
-        <specific id="1" description="J304"/>
-      </subcategory>
-      <subcategory id="4" description="Dadao class (salvage)">
-        <specific id="1" description="Dadao"/>
-      </subcategory>
-      <subcategory id="5" description="Dalang class (submarine support)">
-        <specific id="1" description="J503 Dalang"/>
-        <specific id="2" description="J504"/>
-      </subcategory>
-      <subcategory id="6" description="Dongxiu class (submarine support)">
-        <specific id="1" description="U911 Dongxiu"/>
-      </subcategory>
-      <subcategory id="7" description="Dazhi class (submarine support)">
-        <specific id="1" description="920 Dazhi"/>
-      </subcategory>
-      <subcategory id="8" description="Hudung class (submarine rescue)">
-        <specific id="1" description="403 Haijui"/>
-        <specific id="2" description="512 Haijui"/>
-      </subcategory>
-      <subcategory id="9" description="DSRV (salvage submarine)"/>
-      <subcategory id="10" description="Ten Ting class (salvage)">
-        <specific id="1" description="456 Hai Lao"/>
-        <specific id="2" description="520 Hai Lao"/>
-        <specific id="3" description="523 Hai Lao"/>
-        <specific id="4" description="666 Hai Lao"/>
-      </subcategory>
-      <subcategory id="11" description="Kansha class (salvage)">
-        <specific id="1" description="Kansha"/>
-        <specific id="2" description="304 Haito"/>
-        <specific id="3" description="403"/>
-      </subcategory>
-      <subcategory id="12" description="Jin Jian Xun 05 class (salvage)"/>
-      <subcategory id="13" description="Qionshe class (attack transport)">
-        <specific id="1" description="Y830"/>
-        <specific id="2" description="Y831"/>
-        <specific id="3" description="Y833 et al"/>
-      </subcategory>
-      <subcategory id="14" description="Qionshe class (hospital)">
-        <specific id="1" description="Y833"/>
-      </subcategory>
-      <subcategory id="15" description="Fuqing class (replenishment oiler)">
-        <specific id="1" description="X575 Taicang"/>
-        <specific id="2" description="X615 Dongyun"/>
-      </subcategory>
-      <subcategory id="16" description="Shengli class (transport oiler)">
-        <specific id="1" description="X620"/>
-        <specific id="2" description="X621"/>
-      </subcategory>
-      <subcategory id="17" description="Fulin class (transport oiler)">
-        <specific id="1" description="X583"/>
-        <specific id="2" description="X606"/>
-        <specific id="3" description="X607"/>
-        <specific id="4" description="X609"/>
-        <specific id="5" description="X628"/>
-        <specific id="6" description="X629"/>
-        <specific id="7" description="X633"/>
-      </subcategory>
-      <subcategory id="18" description="Fuzhou class (transport oiler)">
-        <specific id="1" description="X573"/>
-        <specific id="2" description="X580"/>
-        <specific id="3" description="X606"/>
-        <specific id="4" description="X629 et al"/>
-      </subcategory>
-      <subcategory id="19" description="Jinyou class (transport oiler)">
-        <specific id="1" description="X622"/>
-        <specific id="2" description="X625"/>
-        <specific id="3" description="X675"/>
-      </subcategory>
-      <subcategory id="20" description="Leizhou class (transport oiler-light)">
-        <specific id="1" description="N1101 Liezhou et al"/>
-      </subcategory>
-      <subcategory id="21" description="Fuzhou class (water transport)">
-        <specific id="1" description="416 Hai Shui"/>
-        <specific id="2" description="419 Hai Shui"/>
-        <specific id="3" description="556 Hai Shui"/>
-        <specific id="4" description="557 Hai Shui"/>
-        <specific id="5" description="608 Hai Shui et al"/>
-      </subcategory>
-      <subcategory id="22" description="Leizhou class (water transport)">
-        <specific id="1" description="412 Hai Shui"/>
-        <specific id="2" description="555 Hai Shui"/>
-        <specific id="3" description="558 Hai Shui"/>
-      </subcategory>
-      <subcategory id="23" description="Yen Pai class (degaussing)">
-        <specific id="1" description="746 Hai Dzu"/>
-        <specific id="2" description="863 Dong Qin"/>
-      </subcategory>
-      <subcategory id="24" description="Yenka class (degaussing)">
-        <specific id="1" description="745 Hai Dzu"/>
-        <specific id="2" description="Hai Dzu"/>
-      </subcategory>
-      <subcategory id="25" description="Yen Fang class (degaussing)">
-        <specific id="1" description="950 Hai Dzu"/>
-        <specific id="2" description="951 Hai Dzu"/>
-      </subcategory>
-      <subcategory id="26" description="Haibing class (icebreaker)">
-        <specific id="1" description="101"/>
-        <specific id="2" description="102"/>
-      </subcategory>
-      <subcategory id="27" description="Mod Yanha class (icebreaker)">
-        <specific id="1" description="723"/>
-      </subcategory>
-      <subcategory id="28" description="Yanha class (icebreaker)">
-        <specific id="1" description="519"/>
-      </subcategory>
-      <subcategory id="29" description="Galait class (cargo)">
-        <specific id="1" description="318 Haiyun"/>
-        <specific id="2" description="600 Haiyun"/>
-      </subcategory>
-      <subcategory id="30" description="Dayun class (cargo)">
-        <specific id="1" description="951"/>
-        <specific id="2" description="952"/>
-      </subcategory>
-      <subcategory id="31" description="Yukan class (cargo)">
-        <specific id="1" description="801"/>
-      </subcategory>
-      <subcategory id="32" description="Danlin class (cargo)">
-        <specific id="1" description="L191 Hai Leng"/>
-        <specific id="2" description="L201 Hai Leng"/>
-        <specific id="3" description="L790 Hai Yun"/>
-        <specific id="4" description="L795 Hai Yun"/>
-      </subcategory>
-      <subcategory id="33" description="Hongqi class (cargo)">
-        <specific id="1" description="Y433"/>
-        <specific id="2" description="Y528"/>
-        <specific id="3" description="Y755"/>
-        <specific id="4" description="Y771"/>
-      </subcategory>
-      <subcategory id="34" description="Damen class (cargo)">
-        <specific id="1" description="Y529"/>
-      </subcategory>
-      <subcategory id="35" description="Wulai class (cable)">
-        <specific id="1" description="230"/>
-      </subcategory>
-      <subcategory id="36" description="Yan Jiu class (ocean tug)">
-        <specific id="1" description="14 Jan Jiu"/>
-      </subcategory>
-      <subcategory id="37" description="Gromovoy class (ocean tug)">
-        <specific id="1" description="210 Haito"/>
-        <specific id="2" description="221 Haito"/>
-        <specific id="3" description="230 Haito"/>
-        <specific id="4" description="231 Haito"/>
-        <specific id="5" description="235 Haito"/>
-        <specific id="6" description="319 Haito"/>
-        <specific id="7" description="T147 Haito"/>
-        <specific id="8" description="T716 Haito"/>
-        <specific id="9" description="T802 Haito"/>
-        <specific id="10" description="T814 Haito et al"/>
-      </subcategory>
-      <subcategory id="38" description="Yung Gang (ocean tug)"/>
-      <subcategory id="39" description="Hujiu class (tug)">
-        <specific id="1" description="T155"/>
-        <specific id="2" description="T711"/>
-        <specific id="3" description="T842"/>
-        <specific id="4" description="T867"/>
-      </subcategory>
-      <subcategory id="40" description="Tuzhong class (ocean tug-towing)">
-        <specific id="1" description="T154"/>
-        <specific id="2" description="T710"/>
-        <specific id="3" description="T830"/>
-        <specific id="4" description="T890"/>
-      </subcategory>
-      <subcategory id="41" description="Harbor tug"/>
-    </category>
-    <category id="17" description="Auxiliary, Merchant Marine">
-      <subcategory id="1" description="Ji Di Hao class (research)">
-        <specific id="1" description="Ji Di Hao"/>
-      </subcategory>
-      <subcategory id="2" description="Dajiang class (research)">
-        <specific id="1" description="R327"/>
-        <specific id="2" description="3 Yuan Wang"/>
-      </subcategory>
-      <subcategory id="3" description="Yuan Wang class (space event)">
-        <specific id="1" description="1 Yuan Wang"/>
-        <specific id="2" description="2 Yuan Wang"/>
-      </subcategory>
-      <subcategory id="4" description="Shijian class (oceanographic research)">
-        <specific id="1" description="Shijian"/>
-        <specific id="2" description="Kexueyihao"/>
-      </subcategory>
-      <subcategory id="5" description="Hai Ying class (oceanographic research)">
-        <specific id="1" description="Ke Xue Yihao"/>
-        <specific id="2" description="Ke Xue Yijao"/>
-      </subcategory>
-      <subcategory id="6" description="Kan class (oceanographic research)">
-        <specific id="1" description="102 Kan"/>
-      </subcategory>
-      <subcategory id="7" description="Shuguang 04 class (oceanographic research)">
-        <specific id="1" description="04 Shuguang"/>
-        <specific id="2" description="05 Shuguang"/>
-        <specific id="3" description="06 Shuguang"/>
-        <specific id="4" description="07 Shuguang"/>
-        <specific id="5" description="08 Shuguang"/>
-      </subcategory>
-      <subcategory id="8" description="Hai Yang class (oceanographic research)">
-        <specific id="1" description="01 Hai Yang"/>
-        <specific id="2" description="02 Hai Yang"/>
-      </subcategory>
-      <subcategory id="9" description="Hai class (oceanographic research)">
-        <specific id="1" description="521 Hai"/>
-      </subcategory>
-      <subcategory id="10" description="Dong Fang Hong class (oceanographic research)">
-        <specific id="1" description="Dong Fang Hong"/>
-      </subcategory>
-      <subcategory id="11" description="Dadie (intelligence collection)">
-        <specific id="1" description="841"/>
-      </subcategory>
-      <subcategory id="12" description="Xing Fengshan class (intelligence collection)">
-        <specific id="1" description="V856 Xing Fengshan"/>
-        <specific id="2" description="01 Xiangyang Hong"/>
-        <specific id="3" description="04, 06 Yiangyang Hong"/>
-        <specific id="4" description="02, 03, 08 Xiangyang Hong"/>
-        <specific id="5" description="05 Xiangyang Hong"/>
-        <specific id="6" description="09 Xiangyang Hong"/>
-        <specific id="7" description="10 Xiangyang Hong"/>
-        <specific id="8" description="11-16 Xiangyang Hong"/>
-      </subcategory>
-      <subcategory id="13" description="Hen Hsi class (missile range instrumentation)">
-        <specific id="1" description="701 Hsun"/>
-      </subcategory>
-      <subcategory id="14" description="Nan Hai class (geophysical research)">
-        <specific id="1" description="502 Han Hai"/>
-        <specific id="2" description="511 Bin Hai"/>
-      </subcategory>
-      <subcategory id="15" description="Yenlai class (survey)">
-        <specific id="1" description="K200"/>
-        <specific id="2" description="226"/>
-        <specific id="3" description="426"/>
-        <specific id="4" description="427"/>
-        <specific id="5" description="943"/>
-      </subcategory>
-      <subcategory id="16" description="Yenlun class (survey)">
-        <specific id="1" description="583 Haitse"/>
-      </subcategory>
-      <subcategory id="17" description="King Hai class (survey)">
-        <specific id="1" description="701 Hai Sheng"/>
-        <specific id="2" description="702 Hai Sheng"/>
-      </subcategory>
-      <subcategory id="18" description="Kaiboban class (survey)">
-        <specific id="1" description="623 Hai Sheng"/>
-      </subcategory>
-      <subcategory id="19" description="Ganzhu class (survey)">
-        <specific id="1" description="K420"/>
-      </subcategory>
-      <subcategory id="20" description="Yanxi class (survey)">
-        <specific id="1" description="V201"/>
-      </subcategory>
-      <subcategory id="21" description="Yannan class (survey)">
-        <specific id="1" description="K982"/>
-        <specific id="2" description="983"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Bai Yu Lan"/>
-        <specific id="2" description="Donghai"/>
-        <specific id="3" description="Keisho"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker class">
-        <specific id="1" description="Bin Hai 517"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="45">
-    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
-      <subcategory id="1" description="Xia Class (Type 092)">
-        <specific id="1" description="Xia"/>
-      </subcategory>
-    </category>
-    <category id="3" description="SSN (Nuclear Attack - Torpedo)">
-      <subcategory id="1" description="Han Class">
-        <specific id="1" description="Han 401"/>
-        <specific id="2" description="Han 402"/>
-        <specific id="3" description="Han 403"/>
-        <specific id="4" description="Han 404"/>
-        <specific id="5" description="Han 405"/>
-      </subcategory>
-    </category>
-    <category id="5" description="SS (Conventional Attack - Torpedo, Patrol)">
-      <subcategory id="1" description="Ming Class (Type 035)">
-        <specific id="1" description="Ming 232"/>
-        <specific id="2" description="Ming 233"/>
-        <specific id="3" description="Ming 342"/>
-        <specific id="4" description="Ming 352"/>
-        <specific id="5" description="Ming 353"/>
-        <specific id="6" description="Ming 354"/>
-        <specific id="7" description="Ming 356"/>
-        <specific id="8" description="Ming 357"/>
-        <specific id="9" description="Ming 358"/>
-      </subcategory>
-      <subcategory id="2" description="Song Class (Type 039) (SSG)">
-        <specific id="1" description="Song 320"/>
-        <specific id="2" description="Song 321"/>
-        <specific id="3" description="Song 322"/>
-        <specific id="4" description="Song 323"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="205">
-    <category id="0" description="Other"/>
-    <category id="1" description="Tank"/>
-    <category id="2" description="Armored Fighting Vehicle">
-      <subcategory id="1" description="Stridsfordon 90"/>
-      <subcategory id="2" description="Pansarbandvagn 302"/>
-    </category>
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="RBS-15K launcher"/>
-    </category>
-    <category id="5" description="Towed Artillery">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-    </category>
-    <category id="27" description="Civilian Vehicle">
-      <subcategory id="1" description="Truck"/>
-      <subcategory id="2" description="Bus"/>
-      <subcategory id="3" description="Car"/>
-    </category>
-    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
-      <subcategory id="1" description="Towed VSHORAD Gun/Missile System">
-        <specific id="1" description="40mm Bofors">
-          <extra id="1" description="L/70 AA Gun"/>
-          <extra id="2" description="L/60 AA Gun"/>
-        </specific>
-        <specific id="2" description="57mm Bofors"/>
-        <specific id="3" description="RBS-70 Launcher"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="205">
-    <category id="0" description="Other"/>
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="SAAB J 35 Draken"/>
-      <subcategory id="2" description="SAAB JA 37 Viggen"/>
-      <subcategory id="3" description="SAAB JAS 39 Gripen"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="205">
-    <category id="0" description="Other"/>
-    <category id="1" description="Carrier">
-      <subcategory id="1" description="Stockholm"/>
-    </category>
-    <category id="7" description="Light/Patrol Craft"/>
-  </entity>
-  <entity kind="1" domain="4" country="205">
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Nachen (Denmark)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="13">
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="GAF Normad">
-        <specific id="1" description="N22B"/>
-        <specific id="2" description="N24A"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="13">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="ANZAC Class (Meko 200)">
-        <specific id="1" description="FFH 150 Anzac"/>
-        <specific id="2" description="FFH 151 Arunta"/>
-        <specific id="3" description="FFH 152 Warumungu"/>
-        <specific id="4" description="FFH 153 Stuart"/>
-        <specific id="5" description="FFH 154 Parramatta"/>
-        <specific id="6" description="FFH 155 Ballarat"/>
-        <specific id="7" description="FFH 156 Toowoomba"/>
-        <specific id="8" description="FFH 157 Perth"/>
-        <specific id="9" description="Te Kaha (New Zealand)"/>
-        <specific id="10" description="Te Mana (new Zealand)"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Fremantle Class (Large Patrol Craft)">
-        <specific id="1" description="P 203 Fremantle"/>
-        <specific id="2" description="P 204 Warrnambool"/>
-        <specific id="3" description="P 205 Townsville"/>
-        <specific id="4" description="P 206 Wollongong"/>
-        <specific id="5" description="P 207 Launceston"/>
-        <specific id="6" description="P 208 Whyalla"/>
-        <specific id="7" description="P 209 Ipswich"/>
-        <specific id="8" description="P 210 Cessnock"/>
-        <specific id="9" description="P 211 Bendigo"/>
-        <specific id="10" description="P 212 Gawler"/>
-        <specific id="11" description="P 213 Geraldton"/>
-        <specific id="12" description="P 214 Dubbo"/>
-        <specific id="13" description="P 215 Geelong"/>
-        <specific id="14" description="P 216 Gladstone"/>
-        <specific id="15" description="P 217 Bunbury"/>
-      </subcategory>
-      <subcategory id="2" description="Fremantle Class (Modified)">
-        <specific id="1" description="Kula (Fiji)"/>
-        <specific id="2" description="Kikau (Fiji)"/>
-        <specific id="3" description="Kiro (Fiji)"/>
-        <specific id="4" description="Tukoro (Vanuatu)"/>
-        <specific id="5" description="Teanaoai (Kiribati)"/>
-        <specific id="6" description="Lomor (Marshall Islands)"/>
-        <specific id="7" description="Palikir (Micronesia)"/>
-        <specific id="8" description="Micronesia (Micronesia)"/>
-        <specific id="9" description="Independence (Micronesia)"/>
-        <specific id="10" description="Neiafu (Tonga)"/>
-        <specific id="11" description="Pangui (Tonga)"/>
-        <specific id="12" description="Savea (Tonga)"/>
-        <specific id="13" description="Te Mataili (Tuvalu)"/>
-        <specific id="14" description="President HI Remeliik (Palau)"/>
-        <specific id="15" description="Nalanva (Western Samoa)"/>
-        <specific id="16" description="Te Kukupa (Cook Islands)"/>
-        <specific id="17" description="Tarangau (PNG)"/>
-        <specific id="18" description="Dregen (PNG)"/>
-        <specific id="19" description="Seeadler (PNG)"/>
-        <specific id="20" description="Baslislk (PNG)"/>
-        <specific id="21" description="Lata (Solomon Islands)"/>
-        <specific id="22" description="Auki (Solomon Islands)"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Huon Class (Minehunters-Coastal)">
-        <specific id="1" description="M 82 Huon"/>
-        <specific id="2" description="M 83 Hawkesbury"/>
-        <specific id="3" description="M 84 Norman"/>
-        <specific id="4" description="M 85 Gascoyne"/>
-        <specific id="5" description="M 86 Diamantina"/>
-        <specific id="6" description="M 87 Yarra"/>
-      </subcategory>
-      <subcategory id="2" description="Bay Class (Minehunters - Inshore)">
-        <specific id="1" description="M 80 Rushcutter"/>
-        <specific id="2" description="M 81 Shoalwater"/>
-      </subcategory>
-      <subcategory id="3" description="COOP Class (Minesweepers - Auxiliary)">
-        <specific id="1" description="1102 Brolga"/>
-        <specific id="2" description="1185 Koraaga"/>
-        <specific id="3" description="Y 298 Bandicoot"/>
-        <specific id="4" description="Y 299 Wallaroo"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Landing Craft">
-      <subcategory id="1" description="Modified Sir Bedivere Class">
-        <specific id="1" description="LSH 50 Tobruk Tank landing ship"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="LCH Type">
-        <specific id="1" description="L 126 Balikpapan"/>
-        <specific id="2" description="L 127 Brunei"/>
-        <specific id="3" description="L 128 Labuan"/>
-        <specific id="4" description="L 129 Tarakan"/>
-        <specific id="5" description="L 130 Wewak"/>
-        <specific id="6" description="L 133 Betano"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Incat class: Fast Sealift Catamaran">
-        <specific id="1" description="AKR45 Jervis Bay"/>
-      </subcategory>
-      <subcategory id="2" description="Austal class: Fast Sealift Catamaran">
-        <specific id="1" description="Westpac Express"/>
-      </subcategory>
-      <subcategory id="3" description="Durance class (Underway Replenishment Tanker) AOR"/>
-      <subcategory id="4" description="Leaf class (Underway Replenishment Tanker) AOR/AOT"/>
-    </category>
-    <category id="50" description="Frigate">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="River Class (FF)"/>
-    </category>
-    <category id="54" description="Amphibious Assault Ship">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="(deleted)">
-        <specific id="1" description="(deleted)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="13">
-    <category id="4" description="SSG (Conventional Guided Missile)">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Collins Class">
-        <specific id="1" description="S 71 Collins"/>
-        <specific id="2" description="S 72 Farncomb"/>
-        <specific id="3" description="S 73 Waller"/>
-        <specific id="4" description="S 74 Dechaineux"/>
-        <specific id="5" description="S 75 Sheean"/>
-        <specific id="6" description="S 76 Rankin"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="120">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="Type 88"/>
-      <subcategory id="2" description="K1 105mm MBT"/>
-      <subcategory id="3" description="K1A1 120mm MBT"/>
-    </category>
-    <category id="2" description="Armored Fighting Vehicle">
-      <subcategory id="1" description="KM900 Armored Personnel Carrier"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="120">
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="Aircraft Technologies Industries (Airtech) CN-235">
-        <specific id="1" description="CN-235 M"/>
-      </subcategory>
-    </category>
-    <category id="21" description="Utility Helicopter">
-      <subcategory id="1" description="Kawasaki BK 117"/>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="KTX-1 Yeo-Myoung (Dawn)"/>
-    </category>
-    <category id="57" description="Non-Combatant Commercial Aircraft">
-      <subcategory id="1" description="Passenger Airline">
-        <specific id="1" description="Fokker 1000"/>
-        <specific id="2" description="CHK-91 Chang-Gong 91 (Blue Sky 91)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="120">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Ulsan Class">
-        <specific id="1" description="FF 951 Ulsan"/>
-        <specific id="2" description="FF 952 Seoul"/>
-        <specific id="3" description="FF 953 Chung Nam"/>
-        <specific id="4" description="FF 955 Masan"/>
-        <specific id="5" description="FF 956 Kyong Buk"/>
-        <specific id="6" description="FF 957 Chon Nam"/>
-        <specific id="7" description="FF 958 Che Ju"/>
-        <specific id="8" description="FF 959 Busan"/>
-        <specific id="9" description="FF 961 Chung Ju"/>
-      </subcategory>
-      <subcategory id="2" description="Po Hang Class (Corvette)">
-        <specific id="1" description="756 Po Hang"/>
-        <specific id="2" description="757 Kun San"/>
-        <specific id="3" description="758 Kyong Ju"/>
-        <specific id="4" description="759 Mok Po"/>
-        <specific id="5" description="761 Kim Chon"/>
-        <specific id="6" description="762 Chung Ju"/>
-        <specific id="7" description="763 Jin Ju"/>
-        <specific id="8" description="765 Yo Su"/>
-        <specific id="9" description="766 An Dong"/>
-        <specific id="10" description="767 Sun Chon"/>
-        <specific id="11" description="768 Yee Ree"/>
-        <specific id="12" description="769 Won Ju"/>
-        <specific id="13" description="771 Je Chon"/>
-        <specific id="14" description="772 Chon An"/>
-        <specific id="15" description="773 Song Nam"/>
-        <specific id="16" description="775 Bu Chon"/>
-        <specific id="17" description="776 Dae Chon"/>
-        <specific id="18" description="777 Jin Hae"/>
-        <specific id="19" description="778 Sok Cho"/>
-        <specific id="20" description="779 Yong Ju"/>
-        <specific id="21" description="781 Nam Won"/>
-        <specific id="22" description="782 Kwan Myong"/>
-        <specific id="23" description="783"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Pae Ku (PSMM 5) Class (fast attack craft-missile)">
-        <specific id="1" description="PGM 582 Pae Ku 52"/>
-        <specific id="2" description="PGM 583 Pae Ku 53"/>
-        <specific id="3" description="PGM 585 Pae Ku 55"/>
-        <specific id="4" description="PGM 586 Pae Ku 56"/>
-        <specific id="5" description="PGM 587 Pae Ku 57"/>
-        <specific id="6" description="PGM 588 Pae Ku 58"/>
-        <specific id="7" description="PGM 589 Pae Ku 59"/>
-        <specific id="8" description="PGM 591 Pae Ku 51"/>
-      </subcategory>
-      <subcategory id="2" description="Sea Dolphin Class (fast attack craft-patrol)">
-        <specific id="1" description="PKM 212-358 series"/>
-      </subcategory>
-      <subcategory id="3" description="Wildcat Class (fast attack craft-missile)">
-        <specific id="1" description="PKM 271-72"/>
-      </subcategory>
-      <subcategory id="4" description="Sea Hawk Class (fast attack craft-patrol)">
-        <specific id="1" description="PK 161-189 series"/>
-      </subcategory>
-      <subcategory id="5" description="Sea Fox Class (fast attack craft-patrol)">
-        <specific id="1" description="PK 161-189 series"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Swallow Class (minehunter)">
-        <specific id="1" description="561 Kang Keong"/>
-        <specific id="2" description="562 Kang Jin"/>
-        <specific id="3" description="563 Ko Ryeong"/>
-        <specific id="4" description="565 Kim Po"/>
-        <specific id="5" description="566 Ko Chang"/>
-        <specific id="6" description="567 Kum Cha"/>
-      </subcategory>
-      <subcategory id="2" description="US MSC 268 Class (minesweeper-coastal)">
-        <specific id="1" description="MSC 551 Kum San"/>
-        <specific id="2" description="MSC 552 Ko Hung"/>
-        <specific id="3" description="MSC 553 Kum Kok"/>
-      </subcategory>
-      <subcategory id="3" description="US MSC 389 Class (minesweeper-coastal)">
-        <specific id="1" description="MSC 555 Nam Yang"/>
-        <specific id="2" description="MSC 556 Ha Dong"/>
-        <specific id="3" description="MSC 557 Sam Kok"/>
-        <specific id="4" description="MSC 558 Yong Dong"/>
-        <specific id="5" description="MSC 559 Ok Cheon"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Tank Landing Ship">
-      <subcategory id="1" description="Alligator Class (LST)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Chun Jee Class (HDA 8000) (AOE)">
-        <specific id="1" description="AO 57 Chun Jee"/>
-        <specific id="2" description="AO 53"/>
-      </subcategory>
-      <subcategory id="2" description="Furseal Class (LCU)">
-        <specific id="1" description="72, 73-75-78 Mulkae"/>
-      </subcategory>
-      <subcategory id="3" description="Surveying Ship">
-        <specific id="1" description="801-803, 805, 806 Pusan"/>
-        <specific id="2" description="821 Ch'ungnam"/>
-        <specific id="3" description="831 Kangwon"/>
-      </subcategory>
-      <subcategory id="4" description="Trials Support Ship">
-        <specific id="1" description="Sunjin"/>
-      </subcategory>
-      <subcategory id="5" description="Salvage Ship">
-        <specific id="1" description="ARS 26 GUMI"/>
-        <specific id="2" description="ARS 25 CHANG WON"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Dong Hae Class (Corvette)">
-        <specific id="1" description="751 Dong Hae"/>
-        <specific id="2" description="752 Su Won"/>
-        <specific id="3" description="753 Kang Reung"/>
-        <specific id="4" description="755 An Yang"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Chung Gu"/>
-        <specific id="2" description="Ga Yang"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="120">
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Chang Bogo (Type 209) Class)">
-        <specific id="1" description="061 Chang Bogo"/>
-        <specific id="2" description="062 Yi Chon"/>
-        <specific id="3" description="063 Choi Muson"/>
-      </subcategory>
-    </category>
-    <category id="7" description="SSA (Conventional Auxiliary)">
-      <subcategory id="1" description="KSS-1 Tolgorae Class (midget submarine)">
-        <specific id="1" description="051-053"/>
-      </subcategory>
-      <subcategory id="2" description="Cosmos Class (midget submarine)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="119">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="M1985 Light tank"/>
-      <subcategory id="2" description="Type-63 Light amphibious tank"/>
-    </category>
-    <category id="4" description="Self-propelled artillery">
-      <subcategory id="1" description="170 mm Self Propelled Gun">
-        <specific id="1" description="M-1978 SP &quot;Koksan&quot;"/>
-        <specific id="2" description="M-1989"/>
-      </subcategory>
-      <subcategory id="2" description="240 mm Rocket Launcher">
-        <specific id="1" description="M-1985"/>
-        <specific id="2" description="M-1991"/>
-      </subcategory>
-      <subcategory id="3" description="BM-11 122 mm Multiple Rocket Launcher"/>
-      <subcategory id="4" description="M-1992 Self Propelled Combination Gun"/>
-      <subcategory id="5" description="Taepo Dong I Launcher"/>
-      <subcategory id="6" description="Taepo Dong II Launcher (2-stage version)"/>
-      <subcategory id="7" description="Taepo Dong II Launcher (3-stage version)"/>
-      <subcategory id="8" description="No Dong Launcher"/>
-      <subcategory id="9" description="SCUB-B Launcher"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="119">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Soho Class"/>
-      <subcategory id="2" description="Najin Class"/>
-    </category>
-    <category id="7" description="Light/patrol Craft">
-      <subcategory id="1" description="So 1 Class (large patrol craft)"/>
-      <subcategory id="2" description="Soju Class (fast attack craft-missile)"/>
-      <subcategory id="3" description="Sohung Class (fast attack craft-missile)"/>
-      <subcategory id="4" description="Sariwon Class (large patrol craft)">
-        <specific id="1" description="725-27"/>
-      </subcategory>
-      <subcategory id="5" description="Soman Class (large patrol craft)"/>
-      <subcategory id="6" description="Taechong I (large patrol craft)"/>
-      <subcategory id="7" description="Taechong II (Mayang) (large patrol craft)"/>
-      <subcategory id="8" description="Chodo Class (fast attack craft-gun)"/>
-      <subcategory id="9" description="Chaho Class (fast attack craft-gun)"/>
-      <subcategory id="10" description="Chong-Jin Class (fast attack craft-gun)"/>
-      <subcategory id="11" description="Chong-Ju Class (fast attack craft-gun)"/>
-      <subcategory id="12" description="Sinpo (Sinnam) Class (fast attack craft-gun)"/>
-      <subcategory id="13" description="Ku Song Class (fast attack craft-torpedo)"/>
-      <subcategory id="14" description="Sin Hung Class (fast attack craft-torpedo)"/>
-      <subcategory id="15" description="Mod Sin Hung Class (fast attack craft-torpedo)"/>
-      <subcategory id="16" description="TB 11PA Class (inshore patrol craft)"/>
-      <subcategory id="17" description="TB 40A Class (inshore patrol craft)"/>
-      <subcategory id="18" description="Modified Fishing Vessels (coastal patrol craft)"/>
-      <subcategory id="19" description="High Speed Infiltration Craft (HSIC)"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Yukto I Class (coastal minesweeper)"/>
-      <subcategory id="2" description="Yukto II Class (coastal minesweeper)"/>
-      <subcategory id="3" description="Pipa-Got Class (inshore minesweeper)"/>
-    </category>
-    <category id="10" description="Tank Landing Ship">
-      <subcategory id="1" description="Hungnam Class (LSM)"/>
-      <subcategory id="2" description="Hantae Class (LSM)"/>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="Hanchon Class (LCM)"/>
-      <subcategory id="2" description="Nampo Class (LCP)"/>
-    </category>
-    <category id="15" description="Air Cushion/Surface Effect">
-      <subcategory id="1" description="Songjong Class (Type I-III) (LCP-hovercraft)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Depot Ship for Midget Submarine">
-        <specific id="1" description="Soo Gun-Ho"/>
-        <specific id="2" description="Dong Geon Ae Gook-Ho"/>
-        <specific id="3" description="Dong Hae-Ho"/>
-        <specific id="4" description="Chong Seong-Ho Number One"/>
-        <specific id="5" description="Chong Seong-Ho Number Two"/>
-        <specific id="6" description="Chong Seong-Ho Humber Three"/>
-        <specific id="7" description="Hae Gum Gong-Ho"/>
-        <specific id="8" description="Song Rim-Ho"/>
-      </subcategory>
-      <subcategory id="2" description="Surveying Ship">
-        <specific id="1" description="101 Donghae"/>
-        <specific id="2" description="102 Donghae"/>
-        <specific id="3" description="201 Sohai"/>
-        <specific id="4" description="202 Sohai"/>
-      </subcategory>
-      <subcategory id="3" description="Coastal Patrol Craft">
-        <specific id="1" description="177"/>
-        <specific id="2" description="801"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-combatant ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Chong Jin"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="119">
-    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
-      <subcategory id="1" description="Sang-O class (midget submarine)"/>
-    </category>
-    <category id="7" description="SSA (Conventional Auxiliary)">
-      <subcategory id="1" description="North Korean Design (midget submarine)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="178">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Damsah (Combattante III M) Class (fast attack craft-missile)">
-        <specific id="1" description="Q01 Damsah"/>
-        <specific id="2" description="Q02 AL Ghariyah"/>
-        <specific id="3" description="Q03 Rbigah"/>
-      </subcategory>
-      <subcategory id="2" description="Barzan Class (large patrol craft)">
-        <specific id="1" description="Q11 Barzan"/>
-        <specific id="2" description="Q12 Hwar"/>
-        <specific id="3" description="Q13 That Assuari"/>
-        <specific id="4" description="Q14 AL Wusail"/>
-        <specific id="5" description="Q15 Fateh-AL-Khair"/>
-        <specific id="6" description="Q16 Tariq"/>
-      </subcategory>
-      <subcategory id="3" description="Damen Polycat 1450 Class (coastal patrolcraft)">
-        <specific id="1" description="Q31-36"/>
-      </subcategory>
-      <subcategory id="4" description="Fairey Marine Spear Class (coastal patrol craft)">
-        <specific id="1" description="Q71-95"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="189">
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Pilatus Flugzeugwerke SA PC-9">
-        <specific id="1" description="PC-9"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="189">
-    <category id="6" description="Guided Missile Frigate">
-      <subcategory id="1" description="Madina (Type F 2000S) Class">
-        <specific id="1" description="702 Madina"/>
-        <specific id="2" description="704 Hofouf"/>
-        <specific id="3" description="706 Abha"/>
-        <specific id="4" description="708 Taif"/>
-      </subcategory>
-      <subcategory id="2" description="Badr Class (Corvette)">
-        <specific id="1" description="612 Badr"/>
-        <specific id="2" description="614 Al Yarmook"/>
-        <specific id="3" description="616 Hitteen"/>
-        <specific id="4" description="618 Tabuk"/>
-      </subcategory>
-      <subcategory id="3" description="Arriyad Class (Type F-3000S)">
-        <specific id="1" description="812 Al Ryadh"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Jaguar Class (fast attack craft-torpedo)">
-        <specific id="1" description="90 Dammam"/>
-        <specific id="2" description="50 Khabar"/>
-        <specific id="3" description="10 Maccah"/>
-      </subcategory>
-      <subcategory id="2" description="Halter Type (coastal patrol craft)"/>
-      <subcategory id="3" description="Simmoneau 51 Type (inshore patrol craft)"/>
-      <subcategory id="4" description="Al Siddiq (fast attack craft-missile)">
-        <specific id="1" description="511 Al Siddiq"/>
-        <specific id="2" description="513 Al Farouq"/>
-        <specific id="3" description="515 Abdul Aziz"/>
-        <specific id="4" description="517 Faisal"/>
-        <specific id="5" description="519 Kahlid"/>
-        <specific id="6" description="521 Amyr"/>
-        <specific id="7" description="523 Taiq"/>
-        <specific id="8" description="525 Oqbah"/>
-        <specific id="9" description="527 Abu Abaidah"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure/Ship Craft">
-      <subcategory id="1" description="Sandown Class (minehunters-coastal)">
-        <specific id="1" description="420 Al Jawf"/>
-        <specific id="2" description="422 Shaqra"/>
-        <specific id="3" description="424 Al Kharj"/>
-      </subcategory>
-      <subcategory id="2" description="MSC 322 Class (minesweeper/hunter-coastal)">
-        <specific id="1" description="MSC 412 Addriyah"/>
-        <specific id="2" description="MSC 414 Al Quysumah"/>
-        <specific id="3" description="MSC 416 Al Wadeeah"/>
-        <specific id="4" description="MSC 418 Safwa"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Mod Durance Class (replenishment ship)">
-        <specific id="1" description="902 Boraida"/>
-        <specific id="2" description="904 Yunbou"/>
-      </subcategory>
-      <subcategory id="2" description="LCM 6 Class">
-        <specific id="1" description="220 Dheba"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Admai"/>
-        <specific id="2" description="Abu Mariam"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker class">
-        <specific id="1" description="Nur Al Jubail"/>
-        <specific id="2" description="Al Saudia"/>
-        <specific id="3" description="Al Widadia"/>
-        <specific id="4" description="Al-Zait Al-Araby 5"/>
-        <specific id="5" description="Adel"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="121">
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Short Brothers :LC T.MK 52 Toucan">
-        <specific id="1" description="T.MK 52"/>
-      </subcategory>
-      <subcategory id="2" description="Empresa Brasileria de Aeronautica SA EMB-312 Toucan">
-        <specific id="1" description="EMB-S312"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="121">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="OPV 310 Class (large patrol craft)">
-        <specific id="1" description="P301 Inttisar"/>
-        <specific id="2" description="P302 Aman"/>
-        <specific id="3" description="P303 Maimom"/>
-        <specific id="4" description="P304 Mobark"/>
-      </subcategory>
-      <subcategory id="2" description="TNC 45 Type (fast attack craft-missile)">
-        <specific id="1" description="P3404 Al Sanbouk"/>
-      </subcategory>
-      <subcategory id="3" description="Simmoneau Standard 12 Class (inshore patrol craft)"/>
-      <subcategory id="4" description="FPB 57 Type (fast attack craft-missile)">
-        <specific id="1" description="P5702 Istiqlal"/>
-      </subcategory>
-      <subcategory id="5" description="Cougar Type (inshore patrol craft)"/>
-      <subcategory id="6" description="Al-Shaali Type (inshore patrol craft)"/>
-      <subcategory id="7" description="UM Almaradim Class (PCFG)">
-        <specific id="1" description="P3711 Um Almaradim"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="AL Tahaddy Class (LCM/AKL)">
-        <specific id="1" description="L401 AL Soumood"/>
-      </subcategory>
-      <subcategory id="2" description="Support Ship (AG)">
-        <specific id="1" description="S5509 Qaruh"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Na Hai Fa Xian"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker class">
-        <specific id="1" description="Gas Al Mutlaa"/>
-        <specific id="2" description="Al Shuhadaa"/>
-        <specific id="3" description="Al Shegaya">
-          <extra id="4" description="Al Awdah"/>
-        </specific>
-        <specific id="5" description="Al Bida"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="164">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Patrol Ship">
-        <specific id="1" description="A1 AL Mabrukak"/>
-      </subcategory>
-      <subcategory id="2" description="AL Waafi (Brooke Marine) Class (fast attack craft-gun)">
-        <specific id="1" description="B4 AL Waafi"/>
-        <specific id="2" description="B5 AL Fulk"/>
-        <specific id="3" description="B6 AL Mujahid"/>
-        <specific id="4" description="B7 AL Jabbar"/>
-      </subcategory>
-      <subcategory id="3" description="Seeb (Vosper 25) Class (inshore patrol craft)">
-        <specific id="1" description="B20 Seeb"/>
-        <specific id="2" description="B21 Shinas"/>
-        <specific id="3" description="B22 Sadh"/>
-        <specific id="4" description="B23 Khassab"/>
-      </subcategory>
-      <subcategory id="4" description="Dhofar (Province) Class (fast attack craft-missile)">
-        <specific id="1" description="B10 Dhofar"/>
-        <specific id="2" description="B11 AL Sharqiyah"/>
-        <specific id="3" description="B12 AL Bat'nah"/>
-        <specific id="4" description="B14 Mussandam"/>
-      </subcategory>
-      <subcategory id="5" description="Tyler-Vortex Type (inshore patrol craft)">
-        <specific id="1" description="Q2"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="LCM">
-        <specific id="1" description="C8 Saba AL Bahr"/>
-        <specific id="2" description="C9 AL Doghas"/>
-        <specific id="3" description="C10 AL Temsah"/>
-      </subcategory>
-      <subcategory id="2" description="LCU">
-        <specific id="1" description="C7 AL Neemran"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate (including Corvettes)">
-      <subcategory id="1" description="Qahir Class (FSG)">
-        <specific id="1" description="Q-31 Qahir Al Amwaj"/>
-      </subcategory>
-    </category>
-    <category id="55" description="Amphibious Cargo Ship">
-      <subcategory id="1" description="Landing Ship-Logistic">
-        <specific id="1" description="L2 Nasar AL Bahr"/>
-      </subcategory>
-    </category>
-    <category id="58" description="Combat Stores Ship">
-      <subcategory id="1" description="Supply Ship">
-        <specific id="1" description="A2 AL Sultana"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="123">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Tracker Mk2 (coastal patrol craft)"/>
-      <subcategory id="2" description="Aztec Class (coastal patrol craft)"/>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Perla"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="102">
-    <category id="2" description="Armored Fighting Vehicle">
-      <subcategory id="1" description="EE-3 JARARACA"/>
-      <subcategory id="2" description="EE-9 CASCAVELEE - 11URUTRU"/>
-      <subcategory id="3" description="EE-11 URUTRU"/>
-    </category>
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="127 mm ASTROS II"/>
-      <subcategory id="2" description="262 mm ABABEEL"/>
-      <subcategory id="3" description="160 mm mortar"/>
-      <subcategory id="4" description="FAW 70 launcher"/>
-      <subcategory id="5" description="FAW 150 launcher"/>
-      <subcategory id="6" description="FAW 200 launcher"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="102">
-    <category id="1" description="Fighter/Air Defense"/>
-    <category id="8" description="Surveillance/C2 (Airborne Early Warning)">
-      <subcategory id="1" description="Iraqui Air Force Adnan 1">
-        <specific id="1" description="Adnan I"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="102">
-    <category id="6" description="Guided Missile Frigate">
-      <subcategory id="6" description="Assad Class">
-        <specific id="1" description="F210 Mussa Ben Nussair"/>
-        <specific id="2" description="F212 Tariq lbn Ziad"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Bogomol Class (large patrol craft)"/>
-      <subcategory id="2" description="PB 90 Class (coastal patrol craft)"/>
-      <subcategory id="3" description="Sawari Class (inshore patrol boat)"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Nestin Class (minesweeper-inshore)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Transport Ship">
-        <specific id="1" description="426 Al Zahraa"/>
-        <specific id="2" description="428 Khawla"/>
-        <specific id="3" description="429 Balqees"/>
-      </subcategory>
-      <subcategory id="2" description="Spasilac Class (salvage ship)">
-        <specific id="1" description="A81 Aka"/>
-      </subcategory>
-      <subcategory id="3" description="Diving Tender"/>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Yugoslav Type">
-        <specific id="1" description="507 lbn Marjid"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-combatant Ship">
-      <subcategory id="1" description="Container Class"/>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Al Thirthar"/>
-        <specific id="2" description="1 Athar"/>
-        <specific id="3" description="1 Hurizan"/>
-        <specific id="4" description="7 Nissan"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="101">
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="320 mm OGHAB Multiple Rocket Launcher"/>
-      <subcategory id="2" description="330 mm SHAHIN Multiple Rocket Launcher"/>
-      <subcategory id="3" description="330 mm NAZEAT"/>
-      <subcategory id="4" description="Shahab TEL"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="101">
-    <category id="5" description="Destroyer (DD)">
-      <subcategory id="5" description="Damavand"/>
-      <subcategory id="2" description="Babr"/>
-    </category>
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Avland (vosper Mk 5) Class">
-        <specific id="1" description="71 Alvand"/>
-        <specific id="2" description="72 Alborz"/>
-        <specific id="3" description="73 Sabalan"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Kaman (Combattante II) Class">
-        <specific id="1" description="P221 Kaman"/>
-        <specific id="2" description="P222 Zoubin"/>
-        <specific id="3" description="P223 Khadang"/>
-        <specific id="4" description="P226 Falakhon"/>
-        <specific id="5" description="P227 Shamshir"/>
-        <specific id="6" description="P228 Gorz"/>
-        <specific id="7" description="P229 Gardouneh"/>
-        <specific id="8" description="P230 Khanjar"/>
-        <specific id="9" description="P231 Neyzeh"/>
-        <specific id="10" description="P232 Tabarzin"/>
-      </subcategory>
-      <subcategory id="2" description="Parvin (PGM-71) Class (large patrol craft)">
-        <specific id="1" description="211 Parvin"/>
-        <specific id="2" description="212 Bahram"/>
-        <specific id="3" description="213 Nahid"/>
-      </subcategory>
-      <subcategory id="3" description="MK II Class (Coastal patrol craft)"/>
-      <subcategory id="4" description="MIG-S-1800 Class (coastal patrol craft)"/>
-      <subcategory id="5" description="MK III Class (coastal patrol craft)"/>
-      <subcategory id="6" description="MIG-G-1900 Class (coastal patrol craft)"/>
-      <subcategory id="7" description="PBI Type (coastal patrol craft)"/>
-      <subcategory id="8" description="Enforcer Type (inshore patrol craft)"/>
-      <subcategory id="9" description="Stewart Type (inshore patrol craft)">
-        <specific id="1" description="Mahnavi-Hamraz"/>
-        <specific id="2" description="Mahnavi-Vahedi"/>
-        <specific id="3" description="Mahnavi-Taheri"/>
-      </subcategory>
-      <subcategory id="10" description="Boghammar Craft"/>
-      <subcategory id="11" description="Boston Whaler Craft (Type I)"/>
-      <subcategory id="12" description="HUDONG Class">
-        <specific id="1" description="P3131"/>
-        <specific id="2" description="P3132"/>
-        <specific id="3" description="P3133"/>
-        <specific id="4" description="P3134"/>
-        <specific id="5" description="P3135"/>
-        <specific id="6" description="P3136"/>
-        <specific id="7" description="P3137"/>
-        <specific id="8" description="P3138"/>
-        <specific id="9" description="P3139"/>
-        <specific id="10" description="P3140"/>
-      </subcategory>
-      <subcategory id="13" description="TAEDONG"/>
-      <subcategory id="14" description="TIR"/>
-      <subcategory id="15" description="PEYKAAP WPT"/>
-      <subcategory id="16" description="BANDAR-A Corvette (FFL)"/>
-      <subcategory id="17" description="KASHDOM WPBG"/>
-      <subcategory id="18" description="MIG-S-2600 Class"/>
-      <subcategory id="19" description="CHINA CAT Class"/>
-      <subcategory id="20" description="ASHOORA I PBR"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Cape Class (minesweeper-inshore)">
-        <specific id="1" description="311 Harischi"/>
-        <specific id="2" description="312 Raizi"/>
-      </subcategory>
-      <subcategory id="2" description="MSC 268/292 Class"/>
-    </category>
-    <category id="10" description="Tank Landing Ship">
-      <subcategory id="1" description="Iran Air Class (LST)">
-        <specific id="1" description="Iran Asir"/>
-        <specific id="2" description="Iran Ghaydr"/>
-      </subcategory>
-      <subcategory id="2" description="Iran Hormuz 24 Class (LST)">
-        <specific id="1" description="24-26"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="Rotork Craft (LCU)"/>
-      <subcategory id="2" description="MIG-S-3700 Class (LCT)"/>
-      <subcategory id="3" description="Iran Hormuz 21 Class (LCT)">
-        <specific id="1" description="21-23"/>
-      </subcategory>
-    </category>
-    <category id="15" description="Air Cushion/Surface Effect">
-      <subcategory id="1" description="Winchester (SR. N6) Class (hovercraft)">
-        <specific id="1" description="01-08"/>
-      </subcategory>
-      <subcategory id="2" description="Wellington (BH.7) Class (hovercraft)">
-        <specific id="1" description="101-106"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Replenishment Ship">
-        <specific id="1" description="431 Kharg"/>
-      </subcategory>
-      <subcategory id="2" description="Hendijan Class (AG) (tenders)">
-        <specific id="1" description="Hendijan"/>
-        <specific id="2" description="Konarak"/>
-        <specific id="3" description="Sirik"/>
-        <specific id="4" description="Geno"/>
-        <specific id="5" description="Kalat"/>
-        <specific id="6" description="Genaveh"/>
-        <specific id="7" description="Savatar"/>
-        <specific id="8" description="Mogam"/>
-        <specific id="9" description="Rostani"/>
-        <specific id="10" description="Mayband"/>
-        <specific id="11" description="Maqam"/>
-        <specific id="12" description="Koramshahr"/>
-        <specific id="13" description="Bamregan"/>
-      </subcategory>
-      <subcategory id="3" description="Kangan Class (water tanker)">
-        <specific id="1" description="411 Kangan"/>
-        <specific id="2" description="412 Teheri"/>
-        <specific id="3" description="xxx Shahid Marjani"/>
-        <specific id="4" description="xxx Amir"/>
-      </subcategory>
-      <subcategory id="4" description="Delvar Class (support ship)">
-        <specific id="1" description="Chark (AK) (cargo)"/>
-        <specific id="2" description="Chiroo (AK) (cargo)"/>
-        <specific id="3" description="Souru (AK) (cargo)"/>
-        <specific id="4" description="Dilim (AW) (water)"/>
-        <specific id="5" description="Dayer (AW) (water)"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Bayandor Class"/>
-    </category>
-    <category id="55" description="Amphibious Cargo Ship">
-      <subcategory id="1" description="Hengam Class (LSL)">
-        <specific id="1" description="511 Hengam"/>
-        <specific id="2" description="512 Larak"/>
-        <specific id="3" description="513 Tonb"/>
-        <specific id="4" description="514 Lavan"/>
-      </subcategory>
-    </category>
-    <category id="57" description="Ammunition Ship">
-      <subcategory id="1" description="Delvar Class (support ship)">
-        <specific id="1" description="Delvar (AE)"/>
-        <specific id="2" description="Sirjan (AE)"/>
-      </subcategory>
-    </category>
-    <category id="58" description="Combat Stores Ship">
-      <subcategory id="1" description="Fleet Supply Ship">
-        <specific id="1" description="421 Bandar Abbas"/>
-        <specific id="2" description="422 Boushehr"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="ADIR"/>
-        <specific id="2" description="IRAN ABOZAR"/>
-        <specific id="3" description="IRAN AKHAVAN"/>
-        <specific id="4" description="IRAN FALLAHI"/>
-        <specific id="5" description="IRAN TALEGHANI"/>
-        <specific id="6" description="IRAN SHARIATI"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="101">
-    <category id="5" description="SS (Conventional, Attack-Torpedo, Patrol)">
-      <subcategory id="5" description="901 Tareq"/>
-      <subcategory id="2" description="902 Noor"/>
-    </category>
-    <category id="7" description="SSA (Conventional Auxiliary)">
-      <subcategory id="1" description="Midget Submarine">
-        <specific id="1" description="Semi Submersible TAEDONG-B"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="105">
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="Gabriel Mk 1 launcher"/>
-      <subcategory id="2" description="Gabriel Mk 2 launcher"/>
-      <subcategory id="3" description="Gabriel Mk 3 launcher"/>
-      <subcategory id="4" description="Gabriel Mk LR launcher"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="105">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Israel Aircraft Industries C-7 Kifr">
-        <specific id="1" description="C-7"/>
-      </subcategory>
-      <subcategory id="3" description="I A I Lavi"/>
-    </category>
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Israel Aircraft Industries 707">
-        <specific id="1" description="707-320C"/>
-        <specific id="2" description="ARAVA IAI-202"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Surveillance/C2 (Airborne Early Warning)">
-      <subcategory id="1" description="707"/>
-      <subcategory id="2" description="720"/>
-      <subcategory id="3" description="ARAVA IAI-201"/>
-    </category>
-    <category id="21" description="Utility Helicopter">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="Bell Helicopter Textron Canada Ltd. Twin Two Twelve"/>
-    </category>
-    <category id="23" description="Cargo Helicopter">
-      <subcategory id="1" description="Israel Aircraft Industries Yasur 2000">
-        <specific id="1" description="Yasur 2000"/>
-      </subcategory>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Israel Aircraft Industries C-7 Kifr">
-        <specific id="1" description="TC-7"/>
-      </subcategory>
-    </category>
-    <category id="57" description="Non-Combatant Commercial Aircraft">
-      <subcategory id="1" description="Passenger Airline">
-        <specific id="1" description="Israel Aircraft Industries 1125 Astra SP"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="105">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Eilat (Saar 5) Class (Corvette)">
-        <specific id="1" description="501 Eilat"/>
-        <specific id="2" description="503 Hanit"/>
-        <specific id="3" description="502 Lahav"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Aliya (Saar 4.5) (fast attack craft-missile)">
-        <specific id="1" description="Aliya"/>
-        <specific id="2" description="Geoula"/>
-      </subcategory>
-      <subcategory id="2" description="Hetz (Saar 4.5) (fast attack craft-missile)">
-        <specific id="1" description="Romat"/>
-        <specific id="2" description="Keshet"/>
-        <specific id="3" description="Hetz"/>
-      </subcategory>
-      <subcategory id="3" description="Mivtach (Saar 2) Class (fast attack craft-missile)">
-        <specific id="1" description="311 Mivtach"/>
-        <specific id="2" description="312 Miznag"/>
-        <specific id="3" description="313 Mifgav"/>
-        <specific id="4" description="321 Eilath"/>
-        <specific id="5" description="322 Haifa"/>
-        <specific id="6" description="323 Akko"/>
-      </subcategory>
-      <subcategory id="4" description="Reshef (Saar 4) (fast attack craft-missile)">
-        <specific id="1" description="Reshef"/>
-        <specific id="2" description="Kidon"/>
-        <specific id="3" description="Tarshish"/>
-        <specific id="4" description="Yaffo"/>
-        <specific id="5" description="Nitzhon"/>
-        <specific id="6" description="Atsmount"/>
-        <specific id="7" description="Moledet"/>
-        <specific id="8" description="Komemiut"/>
-      </subcategory>
-      <subcategory id="5" description="Super Dvora Class (fast attack craft-gun)">
-        <specific id="1" description="810-821"/>
-      </subcategory>
-      <subcategory id="6" description="Dabur Class (coastal patrol craft)"/>
-      <subcategory id="7" description="Iquique (Saar3)">
-        <specific id="1" description="Iquique"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="Ashdod Class (LCT)">
-        <specific id="1" description="61 Ashdod"/>
-        <specific id="2" description="63 Ashkelon"/>
-        <specific id="3" description="65 Achziv"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="105">
-    <category id="4" description="SSG (Conventional Guided Missile)">
-      <subcategory id="1" description="Gal (Vickers Type 540) Class">
-        <specific id="1" description="Gal"/>
-        <specific id="2" description="Tanin"/>
-        <specific id="3" description="Rahav"/>
-      </subcategory>
-    </category>
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Dolphin Type 800">
-        <specific id="1" description="Dolphin"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="114">
-    <category id="2" description="Attack/Strike">
-      <subcategory id="2" description="Construcciones Aeronauticas CC-04 Aviojet">
-        <specific id="1" description="CC-04"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="114">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Faysal">
-        <specific id="1" description="Faysal"/>
-        <specific id="2" description="Han"/>
-        <specific id="3" description="Hasayu"/>
-        <specific id="4" description="Muhammed"/>
-      </subcategory>
-      <subcategory id="2" description="AL Hussein (Hawk) Class (fast attack craft-gun)">
-        <specific id="1" description="101 AL Hussein"/>
-        <specific id="2" description="102 AL Hussan"/>
-        <specific id="3" description="103 Abdullah"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="AL Hashim (Rotork) Class (LCU)">
-        <specific id="1" description="AL Hashim"/>
-        <specific id="2" description="AL Faisal"/>
-        <specific id="3" description="AL Hamza"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="106">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="Light Tank/Recon">
-        <specific id="1" description="Centauro B-1"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Armored Fighting Vehicle">
-      <subcategory id="1" description="Armored Personnel Carrier (APC)">
-        <specific id="1" description="VCC 1/2"/>
-        <specific id="2" description="Fiat 6614"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Self Propelled Artillery (guns and howitzers)">
-      <subcategory id="1" description="M-109G"/>
-      <subcategory id="2" description="M-109L"/>
-      <subcategory id="3" description="M-110A2"/>
-    </category>
-    <category id="5" description="Towed Artillery (anti-tank guns, guns and howitzers)">
-      <subcategory id="1" description="Model 56 PACK"/>
-      <subcategory id="2" description="FH-70"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-    <category id="10" description="Mortar">
-      <subcategory id="1" description="120 mm"/>
-      <subcategory id="2" description="81 mm"/>
-    </category>
-    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
-      <subcategory id="1" description="SPADA SAM System">
-        <specific id="1" description="Detection Center (DC)">
-          <extra id="1" description="Operational Control Center (OCC)"/>
-          <extra id="2" description="Search and Interrogation Radar (SIR)"/>
-        </specific>
-        <specific id="2" description="SPADA Firing Section">
-          <extra id="1" description="Aspide 6-Round Missile Launcher"/>
-          <extra id="2" description="Tracking and Illumination Radar (TIR)"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="106">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="AMX">
-        <specific id="1" description="AMX-T"/>
-      </subcategory>
-      <subcategory id="2" description="MB 339"/>
-      <subcategory id="3" description="MB-326"/>
-    </category>
-    <category id="2" description="Attack/Strike"/>
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="G-222"/>
-    </category>
-    <category id="20" description="Attack Helicopter">
-      <subcategory id="1" description="Agusta Bell 412SP"/>
-    </category>
-    <category id="21" description="Utility Helicopter">
-      <subcategory id="1" description="Agusta A139"/>
-      <subcategory id="2" description="Agusta-Bell 206B"/>
-      <subcategory id="3" description="Agusta-Bell 212"/>
-      <subcategory id="4" description="HA-3F"/>
-      <subcategory id="5" description="A-109"/>
-      <subcategory id="6" description="A-129"/>
-      <subcategory id="7" description="AB-205A"/>
-      <subcategory id="8" description="Agusta-Bell 214"/>
-    </category>
-    <category id="22" description="Anti-submarine Warfare/Patrol Helicopter">
-      <subcategory id="1" description="Agusta Bell 212 ASW"/>
-      <subcategory id="2" description="AS-61"/>
-      <subcategory id="3" description="ASH-3H"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="106">
-    <category id="1" description="Carrier">
-      <subcategory id="1" description="Luigi Einaudi Class (CV)">
-        <specific id="1" description="C552 Luigi Einaudi"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Command Ship/Cruiser">
-      <subcategory id="1" description="C 550 Vittorio Veneto"/>
-    </category>
-    <category id="4" description="Guided Missile Destroyer (DDG)">
-      <subcategory id="1" description="Audace class">
-        <specific id="1" description="D 550 Ardito"/>
-        <specific id="2" description="D 551 Audace"/>
-      </subcategory>
-      <subcategory id="2" description="Animoso class">
-        <specific id="1" description="D 560 Luigi Durand De La Penne"/>
-        <specific id="2" description="D 561 Francisco Mimbelli"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Cassiopea Class (Offshore Patrol Vessels) (OPV)">
-        <specific id="1" description="P401 Cassiopea"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Gaeta Class">
-        <specific id="1" description="M5550 Lerici"/>
-        <specific id="2" description="M5551 Sapri"/>
-        <specific id="3" description="M5552 Milazzo"/>
-        <specific id="4" description="M5553 Viesta"/>
-        <specific id="5" description="M5554 Gaeta"/>
-        <specific id="6" description="M5555 Termoli"/>
-        <specific id="7" description="M5556 Alghero"/>
-        <specific id="8" description="M5557 Numana"/>
-        <specific id="9" description="M5558 Crotone"/>
-        <specific id="10" description="M5559 Viareggio"/>
-        <specific id="11" description="M5560 Chioggia"/>
-        <specific id="12" description="M5561 Rimini"/>
-      </subcategory>
-      <subcategory id="2" description="Adjutant Class">
-        <specific id="1" description="M5504 Castagno"/>
-        <specific id="2" description="M5505 Cedro"/>
-        <specific id="3" description="M5509 Gelso"/>
-        <specific id="4" description="M5516 Platano"/>
-        <specific id="5" description="M5519 Mandorlo"/>
-      </subcategory>
-    </category>
-    <category id="12" description="Light Carrier">
-      <subcategory id="1" description="C551 Giuseppe Garibaldi"/>
-    </category>
-    <category id="14" description="Hydrofoil">
-      <subcategory id="1" description="Sparviero Class (Hydrofoil-Missile)">
-        <specific id="1" description="P421 Nibbio"/>
-        <specific id="2" description="P422 Falcone"/>
-        <specific id="3" description="P423 Astore"/>
-        <specific id="4" description="P424 Grifone"/>
-        <specific id="5" description="P425 Cheppio"/>
-        <specific id="6" description="P426 Condor"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Etna Class (Replenishment Tanker)">
-        <specific id="1" description="Lieut Comdr Erminio Bagnasco"/>
-      </subcategory>
-      <subcategory id="2" description="Stromboli Class">
-        <specific id="1" description="A5327 Stromboli"/>
-        <specific id="2" description="A5329 Vesuvio"/>
-      </subcategory>
-      <subcategory id="3" description="Experimental Ship">
-        <specific id="1" description="A5325 Raffaele Rossetti"/>
-        <specific id="2" description="A5320 Vincenzo Martellotta"/>
-        <specific id="3" description="P492 Barbara"/>
-        <specific id="4" description="A5305 Murena"/>
-      </subcategory>
-      <subcategory id="4" description="Barngat Class (Support Ship)">
-        <specific id="1" description="A5301 Pietro Cavezzali"/>
-      </subcategory>
-      <subcategory id="5" description="MTC 1011 Class (Ramped Transport)">
-        <specific id="1" description="A5347 Gorgona"/>
-        <specific id="2" description="A5348 Tremiti"/>
-        <specific id="3" description="A5349 Capera"/>
-        <specific id="4" description="A5351 Pantelleria"/>
-        <specific id="5" description="A5352 Lipari"/>
-        <specific id="6" description="A5353 Capri"/>
-      </subcategory>
-      <subcategory id="6" description="Pedretti Class (Commando Support Craft)">
-        <specific id="1" description="Y499 Alcide Pedretti"/>
-        <specific id="2" description="Y498 Mario Marino"/>
-      </subcategory>
-      <subcategory id="7" description="Men 215 Class (LCVP)">
-        <specific id="1" description="MEN 215"/>
-        <specific id="2" description="MEN 216"/>
-      </subcategory>
-      <subcategory id="8" description="SAR CRAFT (Air/Sea rescue)">
-        <specific id="1" description="Paolucci"/>
-      </subcategory>
-      <subcategory id="9" description="Men 212 Class (TRV)">
-        <specific id="1" description="MEN 212"/>
-      </subcategory>
-      <subcategory id="10" description="Ex-Us LCM">
-        <specific id="1" description="MTM 542"/>
-        <specific id="2" description="MTM 543"/>
-        <specific id="3" description="MTM 544"/>
-        <specific id="4" description="MTM 545"/>
-        <specific id="5" description="MTM 546"/>
-        <specific id="6" description="MTM 547"/>
-        <specific id="7" description="MTM 548"/>
-        <specific id="8" description="MTM 549"/>
-        <specific id="9" description="MTM 550"/>
-        <specific id="10" description="MTM 551"/>
-        <specific id="11" description="MTM 552"/>
-        <specific id="12" description="MTM 553"/>
-        <specific id="13" description="MTM 554"/>
-        <specific id="14" description="MTM 555"/>
-        <specific id="15" description="MTM 556"/>
-      </subcategory>
-      <subcategory id="11" description="MTM 217 Class (LCMs)">
-        <specific id="1" description="MTM 217"/>
-        <specific id="2" description="MTM 218"/>
-        <specific id="3" description="MTM 219"/>
-        <specific id="4" description="MTM 220"/>
-        <specific id="5" description="MTM 221"/>
-        <specific id="6" description="MTM 222"/>
-        <specific id="7" description="MTM 223"/>
-        <specific id="8" description="MTM 224"/>
-        <specific id="9" description="MTM 225"/>
-        <specific id="10" description="MTM 226"/>
-        <specific id="11" description="MTM 227"/>
-      </subcategory>
-      <subcategory id="12" description="US LCVP Type">
-        <specific id="1" description="MTP 9726"/>
-        <specific id="2" description="MTP 9731"/>
-        <specific id="3" description="MTP 9748"/>
-        <specific id="4" description="MTP 9749"/>
-        <specific id="5" description="MTP 9750"/>
-        <specific id="6" description="MTP 9751"/>
-      </subcategory>
-      <subcategory id="13" description="MTP 96 Class (LCVP)">
-        <specific id="1" description="MTP 96"/>
-        <specific id="2" description="MTP 97"/>
-        <specific id="3" description="MTP 98"/>
-        <specific id="4" description="MTP 99"/>
-        <specific id="5" description="MTP 100"/>
-        <specific id="6" description="MTP 101"/>
-        <specific id="7" description="MTP 102"/>
-        <specific id="8" description="MTP 103"/>
-        <specific id="9" description="MTP 104"/>
-        <specific id="10" description="MTP 105"/>
-        <specific id="11" description="MTP 106"/>
-        <specific id="12" description="MTP 107"/>
-      </subcategory>
-      <subcategory id="14" description="Harbor Tanker">
-        <specific id="1" description="GRS Type"/>
-      </subcategory>
-      <subcategory id="15" description="Training Ship">
-        <specific id="1" description="A5312 Amerigo Vespucci"/>
-        <specific id="2" description="A5311 Palinuro"/>
-        <specific id="3" description="A5378 Aragosta"/>
-        <specific id="4" description="A5379 Astice"/>
-        <specific id="5" description="A5380 Mitilo"/>
-        <specific id="6" description="A5381 Polipo"/>
-        <specific id="7" description="A5382 Porpora"/>
-        <specific id="8" description="A5308 Alloro"/>
-        <specific id="9" description="A5302 Caroly"/>
-        <specific id="10" description="A5313 Stella Polare"/>
-        <specific id="11" description="A5316 Corsaro II"/>
-        <specific id="12" description="Cristofore Colombo II"/>
-      </subcategory>
-      <subcategory id="16" description="Salvage Ship">
-        <specific id="1" description="A5310 Proteo"/>
-        <specific id="2" description="A5309 Anteo"/>
-      </subcategory>
-      <subcategory id="17" description="Lighthouse Tender">
-        <specific id="1" description="A5364 Ponza"/>
-        <specific id="2" description="A5366 Levanzo"/>
-        <specific id="3" description="A5367 Tavolara"/>
-        <specific id="4" description="A5368 Palmaria"/>
-        <specific id="5" description="A5383 Procida"/>
-      </subcategory>
-      <subcategory id="18" description="Repair Craft (LCT 3 Type)">
-        <specific id="1" description="A5331 MOC 1201"/>
-        <specific id="2" description="A5332 MOC 1202"/>
-        <specific id="3" description="A5333 MOC 1203"/>
-        <specific id="4" description="A5334 MOC 1204"/>
-        <specific id="5" description="A5335 MOC 1205"/>
-      </subcategory>
-      <subcategory id="19" description="Ferry">
-        <specific id="1" description="Tarantola"/>
-      </subcategory>
-      <subcategory id="20" description="Water Carrier">
-        <specific id="1" description="A5354 Piave"/>
-        <specific id="2" description="A5356 Basento"/>
-        <specific id="3" description="A5357 Bradano"/>
-        <specific id="4" description="A5358 Brenta"/>
-        <specific id="5" description="A5359 Bormida"/>
-      </subcategory>
-      <subcategory id="21" description="Water Carrier Tug">
-        <specific id="1" description="A5370 MCC 1101"/>
-        <specific id="2" description="A5371 MCC 1102"/>
-        <specific id="3" description="A5372 MCC 1103"/>
-        <specific id="4" description="A5373 MCC 1104"/>
-      </subcategory>
-      <subcategory id="22" description="Tug">
-        <specific id="1" description="A5319 Ciclope"/>
-        <specific id="2" description="A5324 Titano"/>
-        <specific id="3" description="A5325 Polifemo"/>
-        <specific id="4" description="A5328 Gigante"/>
-        <specific id="5" description="A5330 Saturno"/>
-        <specific id="6" description="A5365 Tenace"/>
-        <specific id="7" description="A5317 Atlante"/>
-        <specific id="8" description="A5318 Prometeo"/>
-      </subcategory>
-      <subcategory id="23" description="Coastal Tug">
-        <specific id="1" description="Y421 Porto Empedocle"/>
-        <specific id="2" description="Y422 Porto Pisano"/>
-        <specific id="3" description="Y423 Porto Conte"/>
-        <specific id="4" description="Y425 Porto Ferraio"/>
-        <specific id="5" description="Y426 Porto Venere"/>
-        <specific id="6" description="Y413 Porto Fossone"/>
-        <specific id="7" description="Y416 Porto Torres"/>
-        <specific id="8" description="Y417 Porto Corsini"/>
-        <specific id="9" description="Y436 Porto D'ischia"/>
-        <specific id="10" description="Y443 Riva Trigoso"/>
-        <specific id="11" description="Y428 Porto Salvo"/>
-      </subcategory>
-      <subcategory id="24" description="Harbour Tug">
-        <specific id="1" description="Y403 RP 101"/>
-        <specific id="2" description="Y404 RP 102"/>
-        <specific id="3" description="Y406 RP 103"/>
-        <specific id="4" description="Y407 RP 104"/>
-        <specific id="5" description="Y408 RP 105"/>
-        <specific id="6" description="Y410 RP 106"/>
-        <specific id="7" description="Y452 RP 108"/>
-        <specific id="8" description="Y456 RP 109"/>
-        <specific id="9" description="Y458 RP 110"/>
-        <specific id="10" description="Y460 RP 111"/>
-        <specific id="11" description="Y462 RP 112"/>
-        <specific id="12" description="Y463 RP 113"/>
-        <specific id="13" description="Y464 RP 114"/>
-        <specific id="14" description="Y465 RP 115"/>
-        <specific id="15" description="Y466 RP 116"/>
-        <specific id="16" description="Y468 RP 118"/>
-        <specific id="17" description="Y470 RP 119"/>
-        <specific id="18" description="Y471 RP 120"/>
-        <specific id="19" description="RP 121"/>
-        <specific id="20" description="Y473 RP 122"/>
-        <specific id="21" description="Y467 RP 123"/>
-        <specific id="22" description="Y477 RP 124"/>
-        <specific id="23" description="Y478 RP 125"/>
-        <specific id="24" description="Y479 RP 126"/>
-        <specific id="25" description="Y480 RP 127"/>
-        <specific id="26" description="Y481 RP 128"/>
-        <specific id="27" description="Y482 RP 129"/>
-        <specific id="28" description="Y483 RP 130"/>
-        <specific id="29" description="Y484 RP 131"/>
-        <specific id="30" description="Y485 RP 132"/>
-        <specific id="31" description="Y486 RP 133"/>
-        <specific id="32" description="Y487 RP 134"/>
-      </subcategory>
-      <subcategory id="25" description="(deleted)"/>
-      <subcategory id="26" description="Floating Dock">
-        <specific id="1" description="GO 1"/>
-        <specific id="2" description="GO 5"/>
-        <specific id="3" description="GO 8"/>
-        <specific id="4" description="GO 10"/>
-        <specific id="5" description="GO 11"/>
-        <specific id="6" description="GO 17"/>
-        <specific id="7" description="GO 18A"/>
-        <specific id="8" description="GO 18B"/>
-        <specific id="9" description="GO 20"/>
-        <specific id="10" description="GO 22"/>
-        <specific id="11" description="GO 23"/>
-        <specific id="12" description="GO 51"/>
-        <specific id="13" description="GO 52"/>
-        <specific id="14" description="GO 53"/>
-      </subcategory>
-      <subcategory id="27" description="Guardia Costiera-Capitaneria Di porto (Coast Guard)">
-        <specific id="1" description="CP 406"/>
-        <specific id="2" description="CP 251"/>
-      </subcategory>
-      <subcategory id="28" description="Servizio Navale Carabinieri">
-        <specific id="1" description="S500"/>
-        <specific id="2" description="S400"/>
-      </subcategory>
-      <subcategory id="29" description="Servizio Navale Guardia Di Finanza">
-        <specific id="1" description="Gian Maria Paolini"/>
-      </subcategory>
-      <subcategory id="30" description="Antonio Zara Class">
-        <specific id="1" description="Antonio Zara P 01"/>
-        <specific id="2" description="Vezzari P 02"/>
-      </subcategory>
-      <subcategory id="31" description="Corrubia &amp; Bigliani Classes">
-        <specific id="1" description="Bigliani G 80"/>
-        <specific id="2" description="Cavaglia G 81"/>
-        <specific id="3" description="Corrubia G 90"/>
-        <specific id="4" description="Guidice G 91"/>
-      </subcategory>
-      <subcategory id="32" description="Alpino Class (MCS)">
-        <specific id="1" description="A5384 Alpino"/>
-      </subcategory>
-    </category>
-    <category id="17" description="Auxiliary, Merchant Marine">
-      <subcategory id="1" description="A5303 Ammiraglio Magnaghi"/>
-      <subcategory id="2" description="A5306 Mirto"/>
-      <subcategory id="3" description="A5307 Pioppo"/>
-    </category>
-    <category id="18" description="Utility">
-      <subcategory id="1" description="Cassiopea Class">
-        <specific id="1" description="P401 Cassiopea"/>
-        <specific id="2" description="P402 Libra"/>
-        <specific id="3" description="P403 Spica"/>
-        <specific id="4" description="P404 Vega"/>
-      </subcategory>
-      <subcategory id="2" description="Agave Class">
-        <specific id="1" description="P495 Bambu"/>
-        <specific id="2" description="P496 Mango"/>
-        <specific id="3" description="P497 Mogano"/>
-        <specific id="4" description="P500 Palma"/>
-      </subcategory>
-      <subcategory id="3" description="Aggressive Class">
-        <specific id="1" description="Storione"/>
-        <specific id="2" description="Squalo"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Alpino class">
-        <specific id="1" description="F 580 Alpino"/>
-        <specific id="2" description="F 581 Carabiniere"/>
-      </subcategory>
-      <subcategory id="2" description="Maestrale class">
-        <specific id="1" description="F 570 Maestrale"/>
-        <specific id="2" description="F 571 Gricale"/>
-        <specific id="3" description="F 572 Libeccio"/>
-        <specific id="4" description="F 573 Scirocco"/>
-        <specific id="5" description="F 574 Aliseo"/>
-        <specific id="6" description="F 575 Euro"/>
-        <specific id="7" description="F 576 Espero"/>
-        <specific id="8" description="F 577 Zeffiro"/>
-      </subcategory>
-      <subcategory id="3" description="Lupo class">
-        <specific id="1" description="F 564 Lupo"/>
-        <specific id="2" description="F 565 Sagittario"/>
-        <specific id="3" description="F 566 Perseo"/>
-        <specific id="4" description="F 567 Orsa"/>
-      </subcategory>
-      <subcategory id="4" description="Artigliere (Lupo) class">
-        <specific id="1" description="F 582 Artigliere"/>
-        <specific id="2" description="F 583 Aviere"/>
-        <specific id="3" description="F 584 Bersagliere"/>
-        <specific id="4" description="F 585 Granatiere"/>
-      </subcategory>
-      <subcategory id="5" description="Minerva class">
-        <specific id="1" description="F 551 Minerva"/>
-        <specific id="2" description="F 552 Urania"/>
-        <specific id="3" description="F 553 Danaide"/>
-        <specific id="4" description="F 554 Sfinge"/>
-        <specific id="5" description="F 555 Driade"/>
-        <specific id="6" description="F 556 Chimera"/>
-        <specific id="7" description="F 557 Fenice"/>
-        <specific id="8" description="F 558 Sibella"/>
-      </subcategory>
-      <subcategory id="6" description="De Cristofaro class">
-        <specific id="1" description="F 550 Salvatore Todaro"/>
-      </subcategory>
-    </category>
-    <category id="56" description="Amphibious Transport Dock">
-      <subcategory id="1" description="San Giorgio Class (LPDs)">
-        <specific id="1" description="L9892 San Giorgio"/>
-        <specific id="2" description="L9893 San Marco"/>
-        <specific id="3" description="L9894 San Giusto"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Bulkignazio"/>
-        <specific id="2" description="Bulk Genova"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker class">
-        <specific id="1" description="Eco Europa"/>
-        <specific id="2" description="Pantelleria"/>
-        <specific id="3" description="Agip Siracusa"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="106">
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="5" description="Improved Sauro Class">
-        <specific id="1" description="S 522 Salvatore Pelosi"/>
-        <specific id="2" description="S 523 Giuliano Prini"/>
-        <specific id="3" description="S 524 Primo Longobrado"/>
-        <specific id="4" description="S 525 Gazzana Priaroggia"/>
-      </subcategory>
-      <subcategory id="2" description="Sauro Class (1081 Type)">
-        <specific id="1" description="S 518 Nazario Sauro"/>
-        <specific id="2" description="S 519 Fecia Di Cossato"/>
-        <specific id="3" description="S 520 Leonardo Da Vinci"/>
-        <specific id="4" description="S 521 Guglielmo Marconi"/>
-      </subcategory>
-      <subcategory id="3" description="Toti Class (1075 class)">
-        <specific id="1" description="S 506 Enrico Toti"/>
-        <specific id="2" description="S 513 Enrico Dandolo"/>
-      </subcategory>
-      <subcategory id="4" description="Type 212A SSK">
-        <specific id="1" description="Salvatore Todaro"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="16">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="AL Manama (FPB 62) Class (fast attack craft-missile)">
-        <specific id="1" description="50 AL Manama"/>
-        <specific id="2" description="51 AL Muharraq"/>
-      </subcategory>
-      <subcategory id="2" description="Almad EL Fateh (FPB 45) Class (fast attack craft-missile)">
-        <specific id="1" description="20 Admad El Fateh"/>
-        <specific id="2" description="21 Al Jabiri"/>
-        <specific id="3" description="22 Abdul Rahman AL Fadel"/>
-        <specific id="4" description="23 Al Taweelah"/>
-      </subcategory>
-      <subcategory id="3" description="AL Riffa (FPB 38) Class (fast attack craft-gun)">
-        <specific id="1" description="10 AL Riffa"/>
-        <specific id="2" description="11 Hawar"/>
-      </subcategory>
-      <subcategory id="4" description="AL Jarim (FPB 20) Class (fast attack craft-gun)">
-        <specific id="1" description="30 AL Jarim"/>
-        <specific id="2" description="31 AL Jasrah"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Support Ship">
-        <specific id="1" description="41 Ajeera"/>
-        <specific id="2" description="42 Mashtan"/>
-        <specific id="3" description="43 Rubodh"/>
-        <specific id="4" description="44 Suwad"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="223">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Muray Jip (Lurssen 62) Class (Corvette)">
-        <specific id="1" description="P6501 Muray Jip"/>
-        <specific id="2" description="P6502 Das"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Kawkab Class (coastal patrol craft)">
-        <specific id="1" description="P561 Kawkab"/>
-        <specific id="2" description="P562 Thoaban"/>
-        <specific id="3" description="P563 Bani Yas"/>
-      </subcategory>
-      <subcategory id="2" description="Murbarraz Class (fast attack craft-missile)">
-        <specific id="1" description="P4401 Murbarraz"/>
-        <specific id="2" description="P4402 Makasib"/>
-      </subcategory>
-      <subcategory id="3" description="Ban Yas (Lurssen TNC 45) Class (fast attack craft-missile)">
-        <specific id="1" description="P4501 Ban Yas"/>
-        <specific id="2" description="P4502 Marban"/>
-        <specific id="3" description="P4503 Rodqm"/>
-        <specific id="4" description="P4504 Shaheen"/>
-        <specific id="5" description="P4505 Sagar"/>
-        <specific id="6" description="P4506 Tarif"/>
-      </subcategory>
-      <subcategory id="4" description="Ardhana Class (large patrol craft)">
-        <specific id="1" description="P1101 Ardana"/>
-        <specific id="2" description="P1102 Zurara"/>
-        <specific id="3" description="P1103 Murban"/>
-        <specific id="4" description="P1104 Al Ghullan"/>
-        <specific id="5" description="P1105 Radoom"/>
-        <specific id="6" description="P1105 Ghanadhah"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Tank Landing Ship">
-      <subcategory id="1" description="LSL/LST">
-        <specific id="1" description="L5401 Al Feyi"/>
-        <specific id="2" description="L5402 Jananah"/>
-        <specific id="3" description="L5403 Dayyinah"/>
-      </subcategory>
-    </category>
-    <category id="11" description="Landing Craft">
-      <subcategory id="1" description="LCM">
-        <specific id="1" description="Ghagha II"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Cheverton Type (Tender)">
-        <specific id="1" description="A271"/>
-        <specific id="2" description="A272"/>
-      </subcategory>
-      <subcategory id="2" description="Diving Tender">
-        <specific id="1" description="D1051"/>
-      </subcategory>
-      <subcategory id="3" description="Support Craft">
-        <specific id="1" description="Baracuda"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Julphara"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Al Dhabiyyah"/>
-        <specific id="2" description="Al Dhibyaniyyah"/>
-        <specific id="3" description="Al Markhaniya"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="237">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="7" description="Broadsword Class (coastal patrol craft)">
-        <specific id="1" description="141 26 September"/>
-        <specific id="2" description="142 Ramadan"/>
-        <specific id="3" description="143 Sana's"/>
-      </subcategory>
-      <subcategory id="2" description="Baklan Class (PCF)">
-        <specific id="1" description="1201 Baklan"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Toplivo Class">
-        <specific id="1" description="135 (tanker-water)"/>
-        <specific id="2" description="140 (tanker-oil)"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Kedah Cement I"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker">
-        <specific id="1" description="Abc Al-Rodha"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="10">
-    <category id="4" description="Guided Missile Destroyer">
-      <subcategory id="1" description="Almirante Brown (Meko 360)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Costa Sur"/>
-      <subcategory id="2" description="Puerto Deseado"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="10">
-    <category id="5" description="SS (Conventional Attack - Torpedo, Patrol">
-      <subcategory id="1" description="Santa Cruz (TR 1700) Class (SS)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="21">
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Wielingen Class (FF)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="39">
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="CC144 Challenger"/>
-    </category>
-    <category id="5" description="ASW/Patrol/Observation">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="CP144 Challenger"/>
-    </category>
-    <category id="6" description="Electronic Warfare (EW)">
-      <subcategory id="1" description="CE144 Challenger"/>
-    </category>
-    <category id="22" description="Antisubmarine Warfare/Patrol Helicopter">
-      <subcategory id="1" description="CH-124 (HELO)"/>
-    </category>
-    <category id="57" description="Non-combatant Commercial Aircraft">
-      <subcategory id="1" description="Passenger Airline">
-        <specific id="1" description="DASH-8"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="39">
-    <category id="4" description="Guided Missile Destroyer (DDG)">
-      <subcategory id="1" description="Iroquis Class (DDG)"/>
-    </category>
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Halifax Class (FFG)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Provider Class (AOR)"/>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Annapolis Class (FF)"/>
-      <subcategory id="2" description="Restigouche Class (FF)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="57">
-    <category id="57" description="Light/ Patrol Craft">
-      <subcategory id="1" description="Willemoes Class"/>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Lindo Maersk"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="62">
-    <category id="5" description="Destroyer">
-      <subcategory id="1" description="Z Class (DD)">
-        <specific id="1" description="921 El Fateh"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided Missile Frigates">
-      <subcategory id="1" description="Descubierta Class (FFG)">
-        <specific id="1" description="F946 Abu Qir"/>
-      </subcategory>
-      <subcategory id="2" description="Jianghu I Class (FFG)">
-        <specific id="1" description="951 Najim Al Zaffer"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Ramadan Class"/>
-    </category>
-    <category id="61" description="Non-combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Abydos"/>
-        <specific id="2" description="Esna"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Al Sharifa II"/>
-        <specific id="2" description="Abu Khalid"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="62">
-    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
-      <subcategory id="1" description="Improved Romeo Class (Type 033) (SSK)">
-        <specific id="1" description="849"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="99">
-    <category id="2" description="Attack/Strike">
-      <subcategory id="1" description="HAL Jaguar"/>
-      <subcategory id="2" description="HAL Kiran Mk II"/>
-    </category>
-    <category id="21" description="Utility Helicopter">
-      <subcategory id="1" description="HAL SA 316 Alouette III"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="99">
-    <category id="4" description="Guided Missile Destroyer (DDG)">
-      <subcategory id="1" description="Delhi Class"/>
-      <subcategory id="2" description="Rajput Class"/>
-    </category>
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Godavari Class"/>
-      <subcategory id="2" description="Talwar (Type 1135.6/Project 17) Class (FFG)">
-        <specific id="1" description="Talwar"/>
-      </subcategory>
-      <subcategory id="3" description="Brahmaputra Class (FFG)">
-        <specific id="1" description="F31 Brahmaputra"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft(PC)">
-      <subcategory id="1" description="Sukanya Class"/>
-      <subcategory id="2" description="Samar Class"/>
-      <subcategory id="3" description="Abhay (Pauk II) Class (FS)">
-        <specific id="1" description="P33 Abhay"/>
-      </subcategory>
-      <subcategory id="4" description="Durg (Nanuchka II) Class (FSG)">
-        <specific id="1" description="K72 Sindhudurg"/>
-      </subcategory>
-      <subcategory id="5" description="SDB Mk 3/T 60 Class (Large Patrol Craft) (PC)">
-        <specific id="1" description="Y61 Trinkat"/>
-      </subcategory>
-      <subcategory id="6" description="Super Dvora MkII Class (PFC)">
-        <specific id="1" description="T80"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Mahe (Yevgenya) Class (Type 1258)">
-        <specific id="1" description="M83 Mahe"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Deepak Class (Replenishment Tanker) ( AOR)">
-        <specific id="1" description="A57 Shakti"/>
-      </subcategory>
-      <subcategory id="2" description="Jyoti Class (Replenishment Tanker ) (AOR)">
-        <specific id="1" description="A58 Jyoti"/>
-      </subcategory>
-      <subcategory id="3" description="Aditya Class (Replenishment and Repair Ship) (AOR/AR)">
-        <specific id="1" description="A59 Aditya"/>
-      </subcategory>
-      <subcategory id="4" description="Support Tanker (AOTL)">
-        <specific id="1" description="Poshak"/>
-      </subcategory>
-      <subcategory id="5" description="Transport Ship (AP)">
-        <specific id="1" description="Nicobar"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Khukri Class"/>
-      <subcategory id="2" description="Kora Class (Project 25A) ( FSG)">
-        <specific id="1" description="P61 Kora"/>
-      </subcategory>
-    </category>
-    <category id="54" description="Amphibious Assault Ship">
-      <subcategory id="1" description="Magar Class (LST)">
-        <specific id="1" description="L20 Magar"/>
-      </subcategory>
-      <subcategory id="2" description="Mk 3 Landing Craft (LCU/LSM)">
-        <specific id="1" description="L34 Vasco Da Gama"/>
-      </subcategory>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container class">
-        <specific id="1" description="Pearl Grace"/>
-        <specific id="2" description="Aditya Gaurav"/>
-        <specific id="3" description="Aditya Gautam"/>
-        <specific id="4" description="Aditya Gopal"/>
-        <specific id="5" description="Aditya Prakash"/>
-        <specific id="6" description="Fomento Sharad"/>
-        <specific id="7" description="ICL Parthibhan"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker class">
-        <specific id="1" description="Ankleshwar"/>
-        <specific id="2" description="Annapurna"/>
-        <specific id="3" description="Jag Leela"/>
-        <specific id="4" description="Abul Kalam Azad"/>
-        <specific id="5" description="Aditya Vikram"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="110">
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="SSM-1A/1B (type 88/90) launcher"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="110">
-    <category id="4" description="Guided Missile Destroyer (DDG)">
-      <subcategory id="1" description="Kongo Class (DDG)"/>
-      <subcategory id="2" description="Tachikaze Class (DDG)"/>
-      <subcategory id="3" description="Hatakaze Class (DDG)"/>
-    </category>
-    <category id="5" description="Destroyer (DD)">
-      <subcategory id="1" description="Shirane Class (DD)"/>
-      <subcategory id="2" description="Haruna Class (DD)"/>
-      <subcategory id="3" description="Asagiri Class (DD)"/>
-      <subcategory id="4" description="Hatsuyuki Class (DD)"/>
-      <subcategory id="5" description="Minegumo Class (DD)"/>
-      <subcategory id="6" description="Takasuki Class (DD)"/>
-      <subcategory id="7" description="Yamagumo Class (DD)"/>
-      <subcategory id="8" description="Murasame Class"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Hatsushima Class (Minesweeper)"/>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Abukuma Class (FF)"/>
-      <subcategory id="2" description="Yubari Class (FF)"/>
-      <subcategory id="3" description="Chikugo Class (FF)"/>
-    </category>
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Supertanker">
-        <specific id="1" description="Kota Mutiara"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="110">
-    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
-      <subcategory id="5" description="Harushio Class (SS)"/>
-      <subcategory id="2" description="Yuushio Class (SS)"/>
-      <subcategory id="3" description="Uzushio Class (SS)"/>
-      <subcategory id="4" description="Oyashio Class"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="126">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="6" description="Dat Assawari"/>
-    </category>
-    <category id="7" description="Light/Patrol Craft (PC)">
-      <subcategory id="1" description="Combattante 2 G Class">
-        <specific id="1" description="Laheeb"/>
-        <specific id="2" description="Shafak"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate(including Corvette)">
-      <subcategory id="1" description="Assad Class">
-        <specific id="1" description="Assad AL BIHAR"/>
-        <specific id="2" description="Assad ELTOUGOUR"/>
-        <specific id="3" description="Assad AL KHALI"/>
-        <specific id="4" description="Assad AL HUDUD"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="153">
-    <category id="23" description="Warning System">
-      <subcategory id="1" description="CRC">
-        <specific id="1" description="CRC (NL)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="153">
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="Fokker F27"/>
-    </category>
-    <category id="21" description="Utility Helicopter">
-      <subcategory id="1" description="SH 14 (Mk27 Lynx)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="153">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Tromp Class"/>
-      <subcategory id="2" description="Kortenaer Class"/>
-      <subcategory id="3" description="Jacob Van Heemskerck Class"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="A20 Moawin (ex. Poolster) Pakistan"/>
-      <subcategory id="2" description="Amsterdam"/>
-      <subcategory id="3" description="Tanker (AOT)">
-        <specific id="1" description="A40 Attock"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="153">
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Walrus Class"/>
-      <subcategory id="2" description="Hai Lung Class">
-        <specific id="1" description="793 Hai Lung (Taiwan)"/>
-        <specific id="2" description="794 Hai Hu (Taiwan)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="163">
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="Penguin Mk 2 launcher"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="163">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Snogg Class"/>
-      <subcategory id="2" description="Hauk Class">
-        <specific id="1" description="Hauk"/>
-        <specific id="2" description="Orn"/>
-        <specific id="3" description="Terne"/>
-        <specific id="4" description="Tjeld"/>
-        <specific id="5" description="Skarv"/>
-        <specific id="6" description="Teist"/>
-        <specific id="7" description="Jo"/>
-        <specific id="8" description="Lom"/>
-        <specific id="9" description="Stegg"/>
-        <specific id="10" description="Falk"/>
-        <specific id="11" description="Ravn"/>
-        <specific id="12" description="Gribb"/>
-        <specific id="13" description="Geir"/>
-        <specific id="14" description="Erle"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Vidar Class"/>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Oslo Class"/>
-    </category>
-    <category id="61" description="Non-combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Amber Fin"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Berge Sisar"/>
-        <specific id="2" description="Bow Century"/>
-        <specific id="3" description="Hebris"/>
-        <specific id="4" description="Norgas Energy"/>
-        <specific id="5" description="Sitalene"/>
-        <specific id="6" description="Solviken"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="163">
-    <category id="5" description="SS(Conventional Attack-Torpedo Patrol)">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="S300 Ula"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="198">
-    <category id="4" description="Cargo/Tanker">
-      <subcategory id="1" description="CASA C-212"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="198">
-    <category id="1" description="Carrier">
-      <subcategory id="1" description="Principe De Asturias Class (CVS)">
-        <specific id="1" description="R11 Principe De Asturias"/>
-      </subcategory>
-    </category>
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Baleares Class"/>
-      <subcategory id="2" description="Alvaro De Bazan Class (FFG)">
-        <specific id="1" description="F101 Alvaro De Bazan"/>
-      </subcategory>
-      <subcategory id="3" description="Santa Maria Class (FFG)">
-        <specific id="1" description="F81 Santa Maria"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Barcelo Class"/>
-      <subcategory id="2" description="Serviola Class">
-        <specific id="1" description="P71 Serviola"/>
-      </subcategory>
-      <subcategory id="3" description="Conejera Class (Coastal Patrol)">
-        <specific id="1" description="P31 Conejera"/>
-      </subcategory>
-      <subcategory id="4" description="Anaga Class">
-        <specific id="1" description="P21 Anaga"/>
-      </subcategory>
-      <subcategory id="5" description="Toralla Class (Coastal Patrol Craft) ( PC)">
-        <specific id="1" description="P81 Tortalla"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship">
-      <subcategory id="1" description="Segura Class (Minehunters) (MHC)">
-        <specific id="1" description="M31 Segura"/>
-      </subcategory>
-      <subcategory id="2" description="Adjutant, Redwing and MSC 268 Class">
-        <specific id="1" description="M22 Ebro"/>
-      </subcategory>
-    </category>
-    <category id="16" description="Auxiliry">
-      <subcategory id="1" description="Patino Class (Fleet Logistic Tanker) (AOR)">
-        <specific id="1" description="A14 Patino"/>
-      </subcategory>
-      <subcategory id="2" description="Transport Ship (AP)">
-        <specific id="1" description="A04 Martin Posadillo"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Descubierto Class"/>
-    </category>
-    <category id="56" description="Amphibious Transport Dock">
-      <subcategory id="1" description="Galicia Class (LPD)">
-        <specific id="1" description="L51 Galicia"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="206">
-    <category id="5" description="Towed Artillery">
-      <subcategory id="1" description="NORICUM GH N-45 155mm gun-howitzer"/>
-    </category>
-    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
-      <subcategory id="1" description="Towed VSHORAD Gun/Missile System">
-        <specific id="1" description="Oerlikon-Contraves 35mm">
-          <extra id="1" description="GDF-Series Twin-35mm"/>
-          <extra id="2" description="Skyshield 35 Revolver Gun Mount (RGM)"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="206">
-    <category id="4" description="Cargo / Tanker">
-      <subcategory id="1" description="Pilatus PC-6">
-        <specific id="1" description="Pilatus PC-6 Turbo Porter"/>
-      </subcategory>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Pilatus PC-7">
-        <specific id="1" description="Pilatus PC-7 Turbo Trainer"/>
-        <specific id="2" description="PC-7 Mk II"/>
-      </subcategory>
-      <subcategory id="2" description="Pilatus PC-9">
-        <specific id="1" description="Pilatus PC-9 Turbo Trainer"/>
-        <specific id="2" description="PC-9 Mk II"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="210">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Naresuan Class"/>
-      <subcategory id="2" description="Chao Phraya Class"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="218">
-    <category id="5" description="Destroyer (DD)">
-      <subcategory id="1" description="Mod Gearing Fram"/>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Dogan Class"/>
-    </category>
-    <category id="50" description="Frigate (including Corvette)">
-      <subcategory id="1" description="Yavuz"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="218">
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Modified Guppy III Class"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="240">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="1" description="Split/Kotor"/>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Koncar Class"/>
-      <subcategory id="2" description="Mirna Class Type 140 PCF">
-        <specific id="1" description="Ucka 174"/>
-        <specific id="2" description="Grmec 175"/>
-        <specific id="3" description="Gora 177"/>
-        <specific id="4" description="Kosmaj 178"/>
-        <specific id="5" description="Zelengora 179"/>
-      </subcategory>
-      <subcategory id="3" description="Damen Class"/>
-    </category>
-    <category id="8" description="Mine Countermeasure Ship/Craft">
-      <subcategory id="1" description="Silba Class (LCT)"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Spasilac Class (ASR)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="240">
-    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
-      <subcategory id="1" description="Heroj Class"/>
-      <subcategory id="2" description="Sava Class"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="197">
-    <category id="1" description="Tank">
-      <subcategory id="1" description="Olifant">
-        <specific id="1" description="Mk 1"/>
-        <specific id="2" description="Mk 2"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Armored Fighting Vehicle">
-      <subcategory id="1" description="Rooikat">
-        <specific id="1" description="76 mm"/>
-      </subcategory>
-      <subcategory id="2" description="Ratel">
-        <specific id="1" description="20 mm"/>
-        <specific id="2" description="60 mm"/>
-        <specific id="3" description="90 mm"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Armored Utility Vehicle">
-      <subcategory id="1" description="BLV"/>
-    </category>
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="G6 155-mm Howitzer"/>
-    </category>
-    <category id="5" description="Towed Artillery">
-      <subcategory id="1" description="G5"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="197">
-    <category id="1" description="Fighter / Air Defense">
-      <subcategory id="1" description="Cheetah">
-        <specific id="1" description="C"/>
-        <specific id="2" description="D"/>
-      </subcategory>
-    </category>
-    <category id="20" description="Attack Helicopter">
-      <subcategory id="1" description="Rooivalk"/>
-    </category>
-    <category id="50" description="Unmanned">
-      <subcategory id="1" description="RPV">
-        <specific id="1" description="Seeker"/>
-        <specific id="2" description="Vulture"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="56">
-    <category id="1" description="Fighter / Air Defense">
-      <subcategory id="1" description="Aero L-159"/>
-    </category>
-    <category id="2" description="Attack / Strike">
-      <subcategory id="1" description="Aero L-39Z Albatros">
-        <specific id="1" description="Aero L-39ZO"/>
-        <specific id="2" description="Aero L-39ZA"/>
-      </subcategory>
-      <subcategory id="2" description="Aero L-59"/>
-    </category>
-    <category id="4" description="Cargo / Tanker">
-      <subcategory id="1" description="Let L-410 Turbolet"/>
-    </category>
-    <category id="40" description="Trainer">
-      <subcategory id="1" description="Zlin Z-142"/>
-      <subcategory id="2" description="Aero L-29 Delphin"/>
-      <subcategory id="3" description="Aero L-39C Albatros"/>
-      <subcategory id="4" description="Aero L-59"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="208">
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="Hsiung Feng I launcher"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="208">
-    <category id="1" description="Fighter/Air Defense">
-      <subcategory id="1" description="Ching-kuo (IDF)"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="208">
-    <category id="6" description="Guided Missile Frigate (FFG)">
-      <subcategory id="6" description="Cheng Kung Class (Kwang Hua Project)">
-        <specific id="1" description="FFG 1101 Cheng Kung"/>
-        <specific id="2" description="FFG 1103 Cheng Ho"/>
-        <specific id="3" description="FFG 1105 Chi Kuang"/>
-        <specific id="4" description="FFG 1106 Yueh Fei"/>
-        <specific id="5" description="FFG 1107 Tzu-I"/>
-        <specific id="6" description="FFG 1108 Pan Chao"/>
-        <specific id="7" description="FFG 1109 Chang Chien"/>
-      </subcategory>
-      <subcategory id="2" description="Kang Ding (La Fayette) Class">
-        <specific id="1" description="FFG 1202 Kang Ding"/>
-        <specific id="2" description="FFG 1203 Si Ning"/>
-        <specific id="3" description="FFG 1205 Kun Ming"/>
-        <specific id="4" description="FFG 1206 Di Hua"/>
-        <specific id="5" description="FFG 1207 Wu Chang"/>
-        <specific id="6" description="FFG 1208 Chen Te"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Hai Ou Class">
-        <specific id="1" description="FABG 5"/>
-        <specific id="2" description="FABG 6"/>
-        <specific id="3" description="FABG 7"/>
-        <specific id="4" description="FABG 8"/>
-        <specific id="5" description="FABG 9"/>
-        <specific id="6" description="FABG 10"/>
-        <specific id="7" description="FABG 11"/>
-        <specific id="8" description="FABG 12"/>
-        <specific id="9" description="FABG 14"/>
-        <specific id="10" description="FABG 15"/>
-        <specific id="11" description="FABG 16"/>
-        <specific id="12" description="FABG 17"/>
-        <specific id="13" description="FABG 18"/>
-        <specific id="14" description="FABG 19"/>
-        <specific id="15" description="FABG 20"/>
-        <specific id="16" description="FABG 21"/>
-        <specific id="17" description="FABG 23"/>
-        <specific id="18" description="FABG 24"/>
-        <specific id="19" description="FABG 25"/>
-        <specific id="20" description="FABG 26"/>
-        <specific id="21" description="FABG 27"/>
-        <specific id="22" description="FABG 28"/>
-        <specific id="23" description="FABG 29"/>
-        <specific id="24" description="FABG 30"/>
-        <specific id="25" description="FABG 32"/>
-        <specific id="26" description="FABG 33"/>
-        <specific id="27" description="FABG 34"/>
-        <specific id="28" description="FABG 35"/>
-        <specific id="29" description="FABG 36"/>
-        <specific id="30" description="FABG 37"/>
-        <specific id="31" description="FABG 38"/>
-        <specific id="32" description="FABG 39"/>
-        <specific id="33" description="FABG 41"/>
-        <specific id="34" description="FABG 42"/>
-        <specific id="35" description="FABG 43"/>
-        <specific id="36" description="FABG 44"/>
-        <specific id="37" description="FABG 45"/>
-        <specific id="38" description="FABG 46"/>
-        <specific id="39" description="FABG 47"/>
-        <specific id="40" description="FABG 48"/>
-        <specific id="41" description="FABG 49"/>
-        <specific id="42" description="FABG 50"/>
-        <specific id="43" description="FABG 51"/>
-        <specific id="44" description="FABG 52"/>
-        <specific id="45" description="FABG 53"/>
-        <specific id="46" description="FABG 54"/>
-        <specific id="47" description="FABG 55"/>
-        <specific id="48" description="FABG 56"/>
-        <specific id="49" description="FABG 57"/>
-        <specific id="50" description="FABG 58"/>
-      </subcategory>
-      <subcategory id="2" description="Jin Chiang Class">
-        <specific id="1" description="603 Jin Chiang"/>
-      </subcategory>
-      <subcategory id="3" description="PCL Type">
-        <specific id="1" description="1 PCL"/>
-        <specific id="2" description="2 PCL"/>
-        <specific id="3" description="3 PCL"/>
-        <specific id="4" description="5 PCL"/>
-        <specific id="5" description="6 PCL"/>
-        <specific id="6" description="7 PCL"/>
-        <specific id="7" description="8 PCL"/>
-        <specific id="8" description="9 PCL"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Mine Coutermeasures Ship/Craft">
-      <subcategory id="1" description="Yun Feng Class">
-        <specific id="1" description="1301 Yung Feng"/>
-        <specific id="2" description="1302 Yung Chia"/>
-        <specific id="3" description="1303 Yung Nieng"/>
-        <specific id="4" description="1305 Yung Shoen"/>
-      </subcategory>
-    </category>
-    <category id="56" description="Amphibious Transport Dock">
-      <subcategory id="1" description="Tai Wu Class">
-        <specific id="1" description="518 Tai Wu"/>
-        <specific id="2" description="522 Ling Yuen"/>
-        <specific id="3" description="523 Wan An"/>
-      </subcategory>
-      <subcategory id="2" description="Wu Kang Class">
-        <specific id="1" description="524 Yuen Feng"/>
-        <specific id="2" description="525 Wu Kang"/>
-        <specific id="3" description="526 Hsin Kang"/>
-      </subcategory>
-    </category>
-    <category id="60" description="Fast Combat Support Ship">
-      <subcategory id="1" description="Wu Yi Class">
-        <specific id="1" description="530 Wu Yi"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="208">
-    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
-      <subcategory id="1" description="Hai Shih (ex. Guppy II)">
-        <specific id="1" description="791 Hai Shih"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="2">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Florida"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="15">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Chicago Express"/>
-        <specific id="2" description="Sea Leader"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Berge Hus"/>
-        <specific id="2" description="Mosocean"/>
-        <specific id="3" description="Orient Tiger"/>
-        <specific id="4" description="Ramlah"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="22">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Boka Star"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="24">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Corner Brook"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="55">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Yukon"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Beltrade"/>
-        <specific id="2" description="Fulmar"/>
-        <specific id="3" description="Messiniakos"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="82">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Daedalus"/>
-        <specific id="2" description="Fedra"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Althea"/>
-        <specific id="2" description="Olympic Loyalty"/>
-        <specific id="3" description="Peaceventure L"/>
-      </subcategory>
-      <subcategory id="3" description="Supertanker">
-        <specific id="1" description="H. Alhambra"/>
-        <specific id="2" description="H. Metropolis"/>
-        <specific id="3" description="H. Fairfax"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="125">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Jolly Orca"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Almak"/>
-        <specific id="2" description="Alphard Star"/>
-        <specific id="3" description="Amber Lady"/>
-        <specific id="4" description="Front Chief"/>
-        <specific id="5" description="Ish"/>
-        <specific id="6" description="Khannur"/>
-        <specific id="7" description="Kuban"/>
-        <specific id="8" description="New Vitality"/>
-        <specific id="9" description="Ocean Guardian"/>
-        <specific id="10" description="Polaris Star"/>
-        <specific id="11" description="Shahamah"/>
-        <specific id="12" description="Tarquin Navigator"/>
-        <specific id="13" description="Igloo Star"/>
-        <specific id="14" description="SC Breeze"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="168">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Pollux"/>
-        <specific id="2" description="Sima Roja"/>
-        <specific id="3" description="Stellar Might"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Navix Astral"/>
-        <specific id="2" description="Oriental Daisy"/>
-        <specific id="3" description="Pacific Lagoon"/>
-        <specific id="4" description="World Princess"/>
-        <specific id="5" description="Nereo"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="173">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Endeavour"/>
-        <specific id="2" description="General Villa"/>
-        <specific id="3" description="Handy Gunner"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="193">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Container Class">
-        <specific id="1" description="Neptune Pearl"/>
-      </subcategory>
-      <subcategory id="2" description="Tanker Class">
-        <specific id="1" description="Argo Pallas"/>
-        <specific id="2" description="Evelyn Maersk"/>
-        <specific id="3" description="Jront Highness"/>
-        <specific id="4" description="Pacific Harmony"/>
-        <specific id="5" description="Fidelity"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="249">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Koncar (Type R-02) Class (Fast Attack Craft-Missile) (PCFG)">
-        <specific id="1" description="RTOP 21 Sibenik"/>
-      </subcategory>
-    </category>
-    <category id="50" description="Frigate (including Corvettes)">
-      <subcategory id="1" description="Kralj (Type R-03) Class (FSG)">
-        <specific id="1" description="RTOP 11 Kralj Petar Kresimir IV"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="165">
-    <category id="7" description="Light/Patrol Craft">
-      <subcategory id="1" description="Town Class (Large Patrol Craft) (PC)"/>
-      <subcategory id="2" description="Larkana Class (Large Patrol Class) (PC)"/>
-      <subcategory id="3" description="Barkat Class"/>
-    </category>
-    <category id="16" description="Auxiliary">
-      <subcategory id="1" description="Fuqing Class (AOR)">
-        <specific id="1" description="A47 Nasr"/>
-      </subcategory>
-      <subcategory id="2" description="Coastal Tankers (AOTL)">
-        <specific id="1" description="A49 Gwadar"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="29">
-    <category id="4" description="Self-propelled Artillery">
-      <subcategory id="1" description="Launcher ASTROS AV-LMU"/>
-    </category>
-    <category id="7" description="Large Wheeled Utility Vehicle">
-      <subcategory id="1" description="Tectran Enginharia">
-        <specific id="1" description="ASTROS Resupply AV-RMD"/>
-      </subcategory>
-    </category>
-    <category id="37" description="Fire Control Facility">
-      <subcategory id="1" description="ASTROS Fire Control Vehicle AV-VCC"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="176">
-    <category id="61" description="PRT Non-Combatant Ship">
-      <subcategory id="1" description="PRT Ship Container Class"/>
-      <subcategory id="2" description="PRT Ship Tanker Class"/>
-      <subcategory id="3" description="PRT Ship Commercial Large (&gt; 30m)"/>
-      <subcategory id="4" description="PRT Boat Commercial Medium (10m to 29m)"/>
-      <subcategory id="5" description="PRT Boat Commercial Small (&lt;10m)"/>
-      <subcategory id="6" description="PRT Sailboat Commercial Two-Mast"/>
-      <subcategory id="7" description="PRT Sailboat Commercial One-Mast"/>
-      <subcategory id="9" description="PRT Boat Private Very Small (&lt; 3m)">
-        <specific id="1" description="PRT Boat Private Very Small Outboard"/>
-        <specific id="2" description="PRT Boat Private Very Small Inboard"/>
-      </subcategory>
-      <subcategory id="10" description="PRT Boat Private Small (3m to 5m)">
-        <specific id="1" description="PRT Boat Private Very Small Outboard"/>
-        <specific id="2" description="PRT Boat Private Very Small Inboard"/>
-      </subcategory>
-      <subcategory id="11" description="PRT Boat Private Medium (6m to 10m)">
-        <specific id="1" description="PRT Boat Private Medium Motor Yacht"/>
-      </subcategory>
-      <subcategory id="12" description="PRT Boat Private Large (11m to 15m)">
-        <specific id="1" description="PRT Boat Private Large Yacht"/>
-      </subcategory>
-      <subcategory id="13" description="PRT Boat Private Very Large (&gt; 15m)">
-        <specific id="1" description="PRT Boat Private Very Large Yacht"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="0">
-    <category id="61" description="Non-Combatant Ship">
-      <subcategory id="1" description="Generic Ship Container Class"/>
-      <subcategory id="2" description="Generic Ship Tanker Class"/>
-      <subcategory id="3" description="Generic Ship Commercial Large (&gt; 30m)"/>
-      <subcategory id="4" description="Generic Boat Commercial Medium (10m to 29m)"/>
-      <subcategory id="5" description="Generic Boat Commercial Small (&lt;10m)"/>
-      <subcategory id="6" description="Generic Sailboat Commercial Two-Mast"/>
-      <subcategory id="7" description="Generic Sailboat Commercial One-Mast"/>
-      <subcategory id="9" description="Generic Boat Private Very Small (&lt; 3m)">
-        <specific id="1" description="Generic Boat Private Very Small Outboard"/>
-        <specific id="2" description="Generic Boat Private Very Small Inboard"/>
-      </subcategory>
-      <subcategory id="10" description="Generic Boat Private Small (3m to 5m)">
-        <specific id="1" description="Generic Boat Private Very Small Outboard"/>
-        <specific id="2" description="Generic Boat Private Very Small Inboard"/>
-      </subcategory>
-      <subcategory id="11" description="Generic Boat Private Medium (6m to 10m)">
-        <specific id="1" description="Generic Boat Private Medium Motor Yacht"/>
-      </subcategory>
-      <subcategory id="12" description="Generic Boat Private Large (11m to 15m)">
-        <specific id="1" description="Generic Boat Private Large Yacht"/>
-      </subcategory>
-      <subcategory id="13" description="Generic Boat Private Very Large (&gt; 15m)">
-        <specific id="1" description="Generic Boat Private Very Large Yacht"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="0" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Deadeye 5-in. projectile"/>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="Mine-clearing torpedo, Bangalore">
-        <specific id="1" description="M1A1"/>
-        <specific id="2" description="M1A2"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AIM-9 Sidewinder">
-        <specific id="1" description="AIM-9B"/>
-        <specific id="2" description="AIM-9D"/>
-        <specific id="3" description="AIM-9L/M/S">
-          <extra id="1" description="AIM-9L"/>
-          <extra id="2" description="AIM-9M"/>
-          <extra id="3" description="AIM-9M-7"/>
-          <extra id="4" description="AIM-9S"/>
-        </specific>
-        <specific id="4" description="AIM-9P"/>
-        <specific id="5" description="AIM-9R"/>
-        <specific id="6" description="AIM-9X"/>
-        <specific id="7" description="AIM-9J"/>
-      </subcategory>
-      <subcategory id="2" description="AIM-120 Advanced Medium-Range Air-to-Air Missile (AMRAAM)">
-        <specific id="1" description="AIM-120A"/>
-        <specific id="2" description="AIM-120B"/>
-        <specific id="3" description="AIM-120C"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="Falcon">
-        <specific id="1" description="AIM-4D"/>
-        <specific id="2" description="AIM-4F"/>
-        <specific id="3" description="AIM-4G"/>
-        <specific id="4" description="AIM-26"/>
-        <specific id="5" description="AIM-26B"/>
-      </subcategory>
-      <subcategory id="5" description="MIM-72 Chaparral"/>
-      <subcategory id="6" description="MIM-23 Hawk C/E/F/G/H">
-        <specific id="1" description="MIM-23B I-Hawk"/>
-        <specific id="2" description="Hawk PIP"/>
-      </subcategory>
-      <subcategory id="7" description="MLMS"/>
-      <subcategory id="8" description="AIM-54 Phoenix">
-        <specific id="1" description="AIM-54A"/>
-        <specific id="2" description="AIM-54C"/>
-      </subcategory>
-      <subcategory id="9" description="Rapier UK"/>
-      <subcategory id="10" description="FIM-43 Redeye"/>
-      <subcategory id="11" description="Roland"/>
-      <subcategory id="12" description="Sea Sparrow">
-        <specific id="1" description="RIM-7H"/>
-        <specific id="2" description="Evolved Sea Sparrow Missile (ESSM)">
-          <extra id="1" description="RIM-162A"/>
-          <extra id="2" description="RIM-162B"/>
-          <extra id="3" description="RIM-162C"/>
-          <extra id="4" description="RIM-162D"/>
-        </specific>
-      </subcategory>
-      <subcategory id="13" description="Sparrow">
-        <specific id="1" description="AIM-7F"/>
-        <specific id="2" description="AIM-7M"/>
-        <specific id="3" description="AIM-7P"/>
-        <specific id="4" description="AIM-7R (multimode seeker)"/>
-        <specific id="5" description="AIM-7MH"/>
-      </subcategory>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="Stinger">
-        <specific id="1" description="FIM-92 Stinger A/B/C"/>
-        <specific id="2" description="Stinger Post"/>
-        <specific id="3" description="Stinger RMP"/>
-        <specific id="4" description="Stinger ATAS"/>
-      </subcategory>
-      <subcategory id="16" description="MIM-104 Patriot">
-        <specific id="1" description="PAC-2">
-          <extra id="1" description="Standard"/>
-          <extra id="2" description="GEM"/>
-        </specific>
-        <specific id="2" description="PAC-3 (ERINT)"/>
-      </subcategory>
-      <subcategory id="17" description="(deleted)"/>
-      <subcategory id="18" description="(deleted)"/>
-      <subcategory id="19" description="ADATS"/>
-      <subcategory id="20" description="MIM-14B Nike-Hercules"/>
-      <subcategory id="21" description="Theater High-Altitude Area Defense (THAAD)"/>
-      <subcategory id="22" description="(deleted)"/>
-      <subcategory id="23" description="(deleted)"/>
-      <subcategory id="24" description="(deleted)"/>
-      <subcategory id="25" description="(deleted)"/>
-      <subcategory id="26" description="(deleted)"/>
-      <subcategory id="27" description="Standard Missile">
-        <specific id="1" description="Standard MR (RIM-66)">
-          <extra id="1" description="SM-1 Block 5 MR"/>
-          <extra id="2" description="SM-1 Block 6B"/>
-          <extra id="3" description="SM-2 Block 2 MR"/>
-          <extra id="4" description="SM-2 Block 3 MR"/>
-          <extra id="5" description="SM-2 Block 3A MR"/>
-          <extra id="6" description="SM-2 Block 3B"/>
-          <extra id="7" description="(deleted)"/>
-          <extra id="8" description="SM-2 Block 6 MR"/>
-          <extra id="9" description="(deleted)"/>
-        </specific>
-        <specific id="2" description="Standard ER (RIM-67)">
-          <extra id="1" description="SM-2 Block 4"/>
-          <extra id="2" description="SM-2 Block 4A"/>
-        </specific>
-        <specific id="3" description="Standard BMD (RIM-61)">
-          <extra id="1" description="SM-3 Boost Phase Vehicle"/>
-          <extra id="2" description="SM-3 Second Stage Vehicle"/>
-          <extra id="3" description="SM-3 Third Stage Vehicle"/>
-          <extra id="4" description="SM-3 Separated Kill Vehicle (KV)"/>
-          <extra id="5" description="SM-3 Jettisoned first stage"/>
-          <extra id="6" description="SM-3 Jettisoned second stage"/>
-          <extra id="7" description="SM-3 Jettisoned third stage"/>
-          <extra id="8" description="SM-3 Block 1 Kill Weapon (KW)"/>
-        </specific>
-      </subcategory>
-      <subcategory id="28" description="Mk 49 RAM"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="3-in, .50 caliber"/>
-      <subcategory id="2" description="12.7-mm/.50 caliber">
-        <specific id="1" description="M2 AP"/>
-        <specific id="2" description="M8 API"/>
-        <specific id="3" description="M20 API-T"/>
-        <specific id="4" description="M2 ball"/>
-        <specific id="5" description="M33 ball"/>
-        <specific id="6" description="M1 incediary"/>
-        <specific id="7" description="M23 incendiary"/>
-      </subcategory>
-      <subcategory id="3" description="20-mm">
-        <specific id="1" description="M56A4 HEI/M242 HEI-T 7:1 ratio"/>
-        <specific id="2" description="PGU-28/B SAPHEI"/>
-        <specific id="3" description="M246 HEIT-SD"/>
-        <specific id="4" description="M940 MPT-SD"/>
-        <specific id="5" description="MK149 APDS"/>
-        <specific id="6" description="MK244 Mod 0 (tungsten)"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="Anti-helicopter mine (AHM)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="BGM-71 TOW">
-        <specific id="1" description="BGM-71A/B"/>
-        <specific id="2" description="BGM-71C ITOW"/>
-        <specific id="3" description="BGM-71D TOW 2"/>
-        <specific id="4" description="BGM-71E TOW 2-A"/>
-        <specific id="5" description="BGM-71F TOW 2-B"/>
-      </subcategory>
-      <subcategory id="2" description="Dragon ATGW">
-        <specific id="1" description="M222 Dragon"/>
-        <specific id="2" description="Dragon II"/>
-        <specific id="3" description="Dragon III"/>
-      </subcategory>
-      <subcategory id="3" description="AGM-114 Hellfire">
-        <specific id="1" description="AGM-114A"/>
-        <specific id="2" description="AGM-114B"/>
-        <specific id="3" description="AGM-114C"/>
-        <specific id="4" description="AGM-114F"/>
-        <specific id="5" description="AGM-114K">
-          <extra id="1" description="AGM-114K SAL"/>
-          <extra id="2" description="AGM-114K RF"/>
-        </specific>
-        <specific id="6" description="AGM-114L, Laser Guided Hellfire"/>
-      </subcategory>
-      <subcategory id="4" description="AGM-65 Maverick">
-        <specific id="1" description="AGM-65A"/>
-        <specific id="2" description="AGM-65B"/>
-        <specific id="3" description="AGM-65D"/>
-        <specific id="4" description="AGM-65E"/>
-        <specific id="5" description="AGM-65F"/>
-        <specific id="6" description="AGM-65G"/>
-      </subcategory>
-      <subcategory id="5" description="M712 Copperhead Cannon Launched Guided Projectile"/>
-      <subcategory id="6" description="AAWS-M"/>
-      <subcategory id="7" description="High Velocity Missile (HVM)"/>
-      <subcategory id="8" description="Javelin"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="Rocket, Loitering Attack Munition"/>
-      <subcategory id="11" description="Rocket, Precision Attack Munition"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="12.7-mm (.50 Cal)">
-        <specific id="1" description="M2 AP"/>
-        <specific id="2" description="M8 API"/>
-        <specific id="3" description="M17"/>
-        <specific id="4" description="M20 API-T"/>
-        <specific id="5" description="A534 (4 ball &amp; 1 tracer mix)"/>
-      </subcategory>
-      <subcategory id="2" description="20 mm">
-        <specific id="1" description="M39"/>
-        <specific id="2" description="M53 API"/>
-        <specific id="3" description="M601 API-T"/>
-        <specific id="4" description="M775 API-T"/>
-        <specific id="5" description="M940 MP-T-SD"/>
-        <specific id="6" description="MK149 Mod 4 APDS"/>
-        <specific id="7" description="Oerlikon S"/>
-        <specific id="8" description="PGU-28/B SAP-HE"/>
-        <specific id="9" description="U.S. Navy Mark 100"/>
-      </subcategory>
-      <subcategory id="3" description="25 mm">
-        <specific id="1" description="Oerlikon KBA"/>
-        <specific id="2" description="M791 APDS-T"/>
-        <specific id="3" description="M919 APFSDS-T"/>
-        <specific id="4" description="PGU-20/U API"/>
-        <specific id="5" description="PGU-32/U SAPHEI"/>
-        <specific id="6" description="Mk 96"/>
-      </subcategory>
-      <subcategory id="4" description="30 mm">
-        <specific id="1" description="173 Mauser model F APDS-T"/>
-        <specific id="2" description="PGU-14/B API, PGU-13/B HEI 4:1 ratio"/>
-        <specific id="3" description="GPU 5A"/>
-        <specific id="4" description="PGU-15/B TP"/>
-      </subcategory>
-      <subcategory id="5" description="66 mm 72 LAW"/>
-      <subcategory id="6" description="76 mm">
-        <specific id="1" description="M319, HVAP-T"/>
-        <specific id="2" description="M331A1, HVAP-DS-T"/>
-        <specific id="3" description="M331A2, HVAP-DS-T"/>
-        <specific id="4" description="M339, AP-T"/>
-        <specific id="5" description="M464, APFSDS-T"/>
-        <specific id="6" description="M496, HEAT-T"/>
-      </subcategory>
-      <subcategory id="7" description="81 mm"/>
-      <subcategory id="8" description="84 mm">
-        <specific id="1" description="M136, HEAT"/>
-      </subcategory>
-      <subcategory id="9" description="90 mm">
-        <specific id="1" description="M77 AP-T"/>
-        <specific id="2" description="M82 APC-T"/>
-        <specific id="3" description="M318 AP-T"/>
-        <specific id="4" description="M318A1 AP-T"/>
-        <specific id="5" description="M332A1 HVAP-T"/>
-        <specific id="6" description="M348 HEAT"/>
-        <specific id="7" description="M348A1 HEAT"/>
-        <specific id="8" description="M431 HEAT-T"/>
-        <specific id="9" description="RCL M67"/>
-      </subcategory>
-      <subcategory id="10" description="105 mm">
-        <specific id="1" description="FP105, APFSDS"/>
-        <specific id="2" description="M392 APDS-T"/>
-        <specific id="3" description="M392A2 APDS-T"/>
-        <specific id="4" description="M456 HEAT-T"/>
-        <specific id="5" description="M456A2 HEAT-T"/>
-        <specific id="6" description="M662 HEAT-T"/>
-        <specific id="7" description="M728 APDS-T"/>
-        <specific id="8" description="M735 APFSDS-T"/>
-        <specific id="9" description="M774 APFSDS-T"/>
-        <specific id="10" description="M833 APFSDS-T"/>
-        <specific id="11" description="M900 APFSDS-T"/>
-        <specific id="12" description="Olin 105, APFSDS"/>
-        <specific id="13" description="XM815 HEAT-MP"/>
-      </subcategory>
-      <subcategory id="11" description="106 mm RCL40 (M40)"/>
-      <subcategory id="12" description="107 mm"/>
-      <subcategory id="13" description="120 mm">
-        <specific id="1" description="M829 APFSDS-T"/>
-        <specific id="2" description="M829A1 APFSDS-T"/>
-        <specific id="3" description="M830 HEAT-MP-T"/>
-        <specific id="4" description="Olin 120 APFSDS"/>
-        <specific id="5" description="Olin 120+ APFSDS"/>
-        <specific id="6" description="M830A1 HEAT-MP-T"/>
-        <specific id="7" description="XM943 STAFF"/>
-      </subcategory>
-      <subcategory id="14" description="152 mm">
-        <specific id="1" description="M409 Series HEAT-T-MP"/>
-      </subcategory>
-      <subcategory id="15" description="155 mm">
-        <specific id="1" description="M898 SADARM"/>
-      </subcategory>
-      <subcategory id="16" description="227-mm rocket">
-        <specific id="1" description="AT2"/>
-        <specific id="2" description="M77"/>
-        <specific id="3" description="TGW"/>
-        <specific id="4" description="SADARM"/>
-      </subcategory>
-      <subcategory id="17" description="(deleted)"/>
-      <subcategory id="18" description="(deleted)"/>
-      <subcategory id="19" description="(deleted)"/>
-      <subcategory id="20" description="Hydra 70 Rocket System">
-        <specific id="1" description="Hydra Rocket w/M156 WP smoke warhead"/>
-        <specific id="2" description="Hydra Rocket w/M67 Mod WP smoke warhead"/>
-        <specific id="3" description="Hydra Rocket w/M67 Mod 1 RP smoke warhead"/>
-        <specific id="4" description="Hydra Rocket w/M151 HE frag warhead"/>
-        <specific id="5" description="Hydra Rocket w/M257 visible flare warhead"/>
-        <specific id="6" description="Hydra Rocket w/M278 infrared flare warhead"/>
-        <specific id="7" description="Hydra Rocket w/WDU-4A/A flechette warhead"/>
-        <specific id="8" description="Hydra Rocket w/WTU-1/B practice warhead"/>
-      </subcategory>
-      <subcategory id="50" description="Rockeye II Mk 20 cluster weapon"/>
-      <subcategory id="51" description="SUU-65/B TAC Munition Dispenser (TMD) Wide Area Antiarmor Munition (WAAM)"/>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="Area Denial Artillery Munition (ADAM)"/>
-      <subcategory id="2" description="Extended Range Anti-armor Munition (ERAM)"/>
-      <subcategory id="3" description="GATOR Anti-armor System"/>
-      <subcategory id="4" description="XM93 Wide Area Mine (WAM)"/>
-      <subcategory id="5" description="M21 Heavy Antitank mine"/>
-      <subcategory id="6" description="Off-route Antitank mine">
-        <specific id="1" description="M24"/>
-        <specific id="2" description="M66"/>
-      </subcategory>
-      <subcategory id="7" description="M19 Antitank mine"/>
-      <subcategory id="8" description="M15 Antitank mine"/>
-      <subcategory id="9" description="M86 Pursuit Deterrent Munition (PDM)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Decoys">
-        <specific id="1" description="Anti-Radiation Missile Decoy (ARM-D)"/>
-        <specific id="2" description="Mk-57 (MOSS)"/>
-      </subcategory>
-      <subcategory id="2" description="RIM-72 Sea Chaparral"/>
-      <subcategory id="3" description="RIM-116A RAM"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AGM-88 High-speed Antiradiation Missile (HARM)">
-        <specific id="1" description="AGM-88A"/>
-        <specific id="2" description="AGM-88B"/>
-        <specific id="3" description="AGM-88C"/>
-      </subcategory>
-      <subcategory id="2" description="AGM-45 Shrike">
-        <specific id="1" description="AGM-45A"/>
-        <specific id="2" description="AGM-45B"/>
-      </subcategory>
-      <subcategory id="3" description="AGM-78 Standard ARM"/>
-      <subcategory id="4" description="AGM-122 Sidearm">
-        <specific id="1" description="AGM-122A"/>
-      </subcategory>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="Stinger">
-        <specific id="1" description="Air Defense Suppression Missile (ADSM)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="5" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Asat"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Harpoon">
-        <specific id="1" description="AGM-84A"/>
-        <specific id="2" description="UGM-84A"/>
-        <specific id="3" description="RGM-84A"/>
-        <specific id="4" description="AGM-84B"/>
-        <specific id="5" description="UGM-84B"/>
-        <specific id="6" description="AGM-84C"/>
-        <specific id="7" description="UGM-84C"/>
-        <specific id="8" description="AGM-84D"/>
-        <specific id="9" description="UGM-84D"/>
-        <specific id="10" description="AGM-84E"/>
-        <specific id="11" description="UGM-84E"/>
-        <specific id="12" description="RGM-84E"/>
-        <specific id="13" description="AGHM-84F"/>
-        <specific id="14" description="UGM-84F"/>
-        <specific id="15" description="RGM-84F"/>
-        <specific id="16" description="AGM-84G"/>
-        <specific id="17" description="UGM-84G"/>
-        <specific id="18" description="RGM-84G"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="NT 37F torpedo">
-        <specific id="1" description="Mod 2"/>
-        <specific id="2" description="Mod 3"/>
-        <specific id="3" description="NT 37E"/>
-      </subcategory>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="AGM-142 Popeye"/>
-      <subcategory id="9" description="AGM-119 Penguin"/>
-      <subcategory id="10" description="AGM-123 Skipper">
-        <specific id="1" description="AGM-123A"/>
-      </subcategory>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="BGM-109B Tomahawk Antiship Missile (TASM)"/>
-      <subcategory id="13" description="ADCAP">
-        <specific id="1" description="Mod 5"/>
-        <specific id="2" description="Mod 6"/>
-      </subcategory>
-      <subcategory id="14" description="Mk 48">
-        <specific id="1" description="Mod 4"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="5-in .38 caliber"/>
-      <subcategory id="2" description="5-in .54 caliber">
-        <specific id="1" description="AAC"/>
-        <specific id="2" description="HC"/>
-        <specific id="3" description="HE-IR"/>
-        <specific id="4" description="HE-PD"/>
-        <specific id="5" description="HE"/>
-        <specific id="6" description="HE-CVT"/>
-        <specific id="7" description="IR"/>
-        <specific id="8" description="VT (Variable Time)"/>
-        <specific id="9" description="VT-IR (Variable Time, Infrared)"/>
-        <specific id="10" description="VT-RF"/>
-      </subcategory>
-      <subcategory id="3" description="76 mm">
-        <specific id="1" description="AAC"/>
-        <specific id="2" description="HE"/>
-        <specific id="3" description="HE-PD"/>
-        <specific id="4" description="VT fragmentation"/>
-        <specific id="5" description="VT IR"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="DST Mk 36 mine"/>
-      <subcategory id="2" description="DST Mk 40 mine"/>
-      <subcategory id="3" description="DST Mk 41 mine"/>
-      <subcategory id="4" description="DST 115A mine"/>
-      <subcategory id="5" description="Mk 52 bottom mine">
-        <specific id="1" description="Mod 1"/>
-        <specific id="2" description="Mod 2"/>
-        <specific id="3" description="Mod 3"/>
-      </subcategory>
-      <subcategory id="6" description="Mk 55 bottom mine">
-        <specific id="1" description="Mod 2"/>
-        <specific id="2" description="Mod 3"/>
-        <specific id="3" description="Mod 5"/>
-        <specific id="4" description="Mod 6"/>
-        <specific id="5" description="Mod 7"/>
-      </subcategory>
-      <subcategory id="7" description="Mk 57 moored mine">
-        <specific id="1" description="Mod 0"/>
-      </subcategory>
-      <subcategory id="8" description="Quickstrike mines">
-        <specific id="1" description="Mk 62"/>
-        <specific id="2" description="Mk 63"/>
-        <specific id="3" description="Mk 64"/>
-        <specific id="4" description="Mk 65"/>
-      </subcategory>
-      <subcategory id="9" description="CAPTOR - Encapsulated Torpedo moored mine"/>
-      <subcategory id="10" description="Advanced sea mine"/>
-      <subcategory id="11" description="Mk 56 Mod 0 moored mine"/>
-      <subcategory id="12" description="Mk 67 Submarine Launched Mobile Mine"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Mk 46 torpedo">
-        <specific id="1" description="Mk 46 Mod 0"/>
-        <specific id="2" description="Mk 46 Mod 5 (NEARTIP)"/>
-        <specific id="3" description="Mk 46 Mod 7"/>
-        <specific id="4" description="Mk 46 Mod 6"/>
-      </subcategory>
-      <subcategory id="2" description="Mk 48 torpedo">
-        <specific id="1" description="Mod 4"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="MK37 torpedo">
-        <specific id="1" description="Mod 0"/>
-        <specific id="2" description="Mod 1"/>
-        <specific id="3" description="Mod 2"/>
-        <specific id="4" description="Mod 3"/>
-      </subcategory>
-      <subcategory id="5" description="RUR-5A ASROC"/>
-      <subcategory id="6" description="CASW/SOW"/>
-      <subcategory id="7" description="SUBROC">
-        <specific id="1" description="UUM-44A"/>
-      </subcategory>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="Mk 44 torpedo"/>
-      <subcategory id="10" description="Mk 48 ADCAP torpedo">
-        <specific id="1" description="Mod 5 ADCAP"/>
-        <specific id="2" description="Mod 6 ADCAP/MODS"/>
-      </subcategory>
-      <subcategory id="11" description="Mk 50 Advanced lightweight torpedo">
-        <specific id="1" description="100S"/>
-        <specific id="2" description="200S"/>
-      </subcategory>
-      <subcategory id="12" description="NT 37F">
-        <specific id="1" description="Mod 2"/>
-        <specific id="2" description="Mod 3"/>
-        <specific id="3" description="NT 37E"/>
-      </subcategory>
-      <subcategory id="13" description="HOTTORP torpedo"/>
-      <subcategory id="14" description="Sea Lance ASW"/>
-      <subcategory id="18" description="Mk 32 torpedo">
-        <specific id="1" description="Mod 2"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="225">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="5.56 mm">
-        <specific id="1" description="M193"/>
-        <specific id="2" description="M193 Tracer"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="5.56 x 45"/>
-        <specific id="5" description="M855"/>
-        <specific id="6" description="M856"/>
-        <specific id="7" description="A064"/>
-      </subcategory>
-      <subcategory id="2" description="7.62 mm">
-        <specific id="1" description=".30 Carbine"/>
-        <specific id="2" description=".308 Winchester"/>
-        <specific id="3" description=".30-06 Springfield"/>
-        <specific id="4" description="A131 M80/M62 4:1 ratio (for M60, M240, etc.)"/>
-        <specific id="5" description="A130 M80 NATO ball (for M14, etc.)"/>
-        <specific id="6" description="A122 M59 ball (for AR-10, M14, etc.)"/>
-        <specific id="7" description="A141"/>
-        <specific id="8" description="4 ball +1tracer linked"/>
-        <specific id="9" description="AA11 M118 Long Range (for M86, M14, etc.)"/>
-      </subcategory>
-      <subcategory id="3" description="9.0 mm">
-        <specific id="1" description=".380 Auto"/>
-        <specific id="2" description="Browning Short"/>
-        <specific id="3" description="Parabellum"/>
-        <specific id="4" description="Winchester Magnum"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="12.7 mm">
-        <specific id="1" description="A605 .50 ball M33 (for .50 Spotting rifle, etc.)"/>
-        <specific id="2" description="A556 .50 4 ball M2/M1 4:1 ratio (for M2 MG, etc.)"/>
-        <specific id="3" description="A534 .50 API M8/M20 4:1 ratio (for M2, , etc.)"/>
-      </subcategory>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="90 mm">
-        <specific id="1" description="M580 APERS-T"/>
-      </subcategory>
-      <subcategory id="8" description="105 mm">
-        <specific id="1" description="M336 canister"/>
-        <specific id="2" description="M377 canister"/>
-        <specific id="3" description="M494 APERS-T"/>
-        <specific id="4" description="M546 APERS-T"/>
-      </subcategory>
-      <subcategory id="9" description="152 mm">
-        <specific id="1" description="M625A1 cannister (flechettes)"/>
-      </subcategory>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description=".357">
-        <specific id="1" description="Magnum"/>
-      </subcategory>
-      <subcategory id="12" description=".38 Cal">
-        <specific id="1" description="Auto"/>
-        <specific id="2" description="Super Auto"/>
-        <specific id="3" description="Special"/>
-      </subcategory>
-      <subcategory id="13" description=".45">
-        <specific id="1" description="Auto Colt"/>
-      </subcategory>
-      <subcategory id="14" description="12 ga shotgun shells"/>
-      <subcategory id="50" description="BLU-97 Submunition">
-        <specific id="1" description="BLU-97A"/>
-        <specific id="2" description="BLU-97B"/>
-      </subcategory>
-      <subcategory id="51" description="ISCB-1 Area Denial Cluster Weapon"/>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="Bounding mines">
-        <specific id="1" description="M16"/>
-        <specific id="2" description="M16A1"/>
-        <specific id="3" description="M16A2"/>
-        <specific id="4" description="M2A4"/>
-      </subcategory>
-      <subcategory id="2" description="Claymore mine"/>
-      <subcategory id="3" description="M15 heavy AT mine"/>
-      <subcategory id="4" description="M19 nonmetallic AT mine"/>
-      <subcategory id="5" description="M21 heavy AT mine"/>
-      <subcategory id="6" description="M741 scatterable AT mine"/>
-      <subcategory id="7" description="M718 scatterable AT mine"/>
-      <subcategory id="8" description="M75 scatterable AT mine"/>
-      <subcategory id="9" description="Nonmetallic &quot;Toe Popper&quot; mine">
-        <specific id="1" description="M14"/>
-      </subcategory>
-      <subcategory id="10" description="M731 scatterable mine"/>
-      <subcategory id="11" description="M692 scatterable mine"/>
-      <subcategory id="12" description="M74 scatterable mine"/>
-      <subcategory id="13" description="M1 one-gallon chemical mine"/>
-      <subcategory id="14" description="M18A1 mine"/>
-      <subcategory id="15" description="M23 chemical-agent mine"/>
-      <subcategory id="16" description="M26 mine"/>
-      <subcategory id="17" description="M131 Modular Pack Mine System (MOPMS)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AGM-86 Air Launched Cruise Missile (ALCM)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="AGM-86C"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="MGM-52C Lance"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="AGM-62 Walleye"/>
-      <subcategory id="8" description="SRAM-A">
-        <specific id="1" description="AGM-69A"/>
-        <specific id="2" description="AGM-69B"/>
-      </subcategory>
-      <subcategory id="9" description="SLAM">
-        <specific id="1" description="AGM/RGM 84E"/>
-      </subcategory>
-      <subcategory id="10" description="Advanced Cruise Missile">
-        <specific id="1" description="AGM-129A"/>
-      </subcategory>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="AGM 130">
-        <specific id="1" description="AGM-130A"/>
-        <specific id="2" description="AGM-130C"/>
-      </subcategory>
-      <subcategory id="13" description="Boeing 120-mm Fiber Optic Mortar Projectile (FOMP)"/>
-      <subcategory id="14" description="Mk-82">
-        <specific id="1" description="GBU-12 Mk 82 500-lb">
-          <extra id="1" description="(deleted)"/>
-          <extra id="2" description=".10 sec delay"/>
-          <extra id="3" description=".25 sec delay"/>
-        </specific>
-        <specific id="2" description="GBU-38/B JDAM"/>
-      </subcategory>
-      <subcategory id="15" description="Mk-84 bomb">
-        <specific id="1" description="GBU-15 Glide Bomb"/>
-        <specific id="2" description="GBU-24A/B Glide Bomb"/>
-        <specific id="3" description="PAVEWAY II laser-guided"/>
-        <specific id="4" description="GBU-10 Mk 84 2000-lb">
-          <extra id="1" description="Impact fuse"/>
-          <extra id="2" description=".10 sec delay"/>
-          <extra id="3" description=".25 sec delay"/>
-        </specific>
-        <specific id="5" description="Mk-84 GAMS"/>
-        <specific id="6" description="GBU-31A JDAM"/>
-      </subcategory>
-      <subcategory id="16" description="Paveway III">
-        <specific id="1" description="GBU-24A/B Mk 109/B 2000-lb pen Bm"/>
-        <specific id="2" description="GBU-24B Mk 84 2000-lb HE bomb"/>
-        <specific id="3" description="GBU-28B (BLU-113/B)"/>
-      </subcategory>
-      <subcategory id="17" description="Army TACMS">
-        <specific id="1" description="M39"/>
-        <specific id="2" description="Block IA"/>
-        <specific id="3" description="Block II"/>
-        <specific id="4" description="Block IIA"/>
-        <specific id="5" description="Block IA Unitary"/>
-      </subcategory>
-      <subcategory id="18" description="Mk-83 1000-lb LGB">
-        <specific id="1" description="GBU - 16Mk 83"/>
-        <specific id="2" description="Mk 13/18"/>
-        <specific id="3" description="GBU-32 JDAM"/>
-      </subcategory>
-      <subcategory id="19" description="Tomahawk">
-        <specific id="1" description="BGM - 109C (TLAM-C)"/>
-        <specific id="2" description="BGM - 109D (TLAM-D)"/>
-        <specific id="3" description="Tactical Tomahawk Penetrator Variant Mk14"/>
-        <specific id="4" description="Tactical Tomahawk Penatrator Variant Mk45 Mod1"/>
-        <specific id="5" description="TACTOM BGM 109E"/>
-      </subcategory>
-      <subcategory id="20" description="BLU-109/B Bomb">
-        <specific id="1" description="GBU-10G"/>
-        <specific id="2" description="GBU-10H"/>
-        <specific id="3" description="GBU-10J"/>
-        <specific id="4" description="GBU-24A"/>
-        <specific id="5" description="GBU-27A"/>
-        <specific id="6" description="GBU-15(V)-31"/>
-        <specific id="7" description="GBU-15(V)-32"/>
-        <specific id="8" description="GBU-31B JDAM"/>
-      </subcategory>
-      <subcategory id="21" description="AGM-154 Joint Standoff Munition">
-        <specific id="1" description="AGM-154A (w/BLU-97 CEM)"/>
-        <specific id="2" description="AGM-154B (w/BLU-108 SFW)"/>
-        <specific id="3" description="AGM-154C (unitary w/BLU-111)"/>
-      </subcategory>
-      <subcategory id="22" description="Wind-Corrected Munitions Dispenser (WCMD)">
-        <specific id="1" description="WCMD with Gator mines (BLU-91/92)"/>
-        <specific id="2" description="WCMD with Combined Effects Munition (BLU-97/B)"/>
-        <specific id="3" description="CBU-105 (WCMD w/BLU-108 SFW)"/>
-      </subcategory>
-      <subcategory id="23" description="Low Cost Autonomous Attack System (LOCAAS)"/>
-      <subcategory id="24" description="Small Diameter Bomb">
-        <specific id="1" description="GBU-39/B"/>
-        <specific id="2" description="GBU-40/B"/>
-      </subcategory>
-      <subcategory id="25" description="Massive Ordnance Air Blast (MOAB)">
-        <specific id="1" description="GBU-43/B"/>
-      </subcategory>
-      <subcategory id="26" description="AGM-158 Joint Air-to-Surface Standoff Missile (JASSM)">
-        <specific id="1" description="AGM-158A JASSM"/>
-        <specific id="2" description="AGM-158B JASSM-ER"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="20 mm">
-        <specific id="1" description="M39"/>
-        <specific id="2" description="M56 HEI"/>
-        <specific id="3" description="M56A3 HE/I"/>
-        <specific id="4" description="M210 HEI"/>
-        <specific id="5" description="M242 HE-I-T"/>
-        <specific id="6" description="M246 HEIT-SD"/>
-        <specific id="7" description="M246 HEI-T"/>
-        <specific id="8" description="M940 MPT-SD"/>
-        <specific id="9" description="Mk 149 (Mod2, 4) CIWS"/>
-      </subcategory>
-      <subcategory id="2" description="25 mm">
-        <specific id="1" description="M792 HEI-T"/>
-        <specific id="2" description="PGU-22/25 HE-I"/>
-        <specific id="3" description="M791 APDS-T"/>
-        <specific id="4" description="M919 APFSDS-T"/>
-      </subcategory>
-      <subcategory id="3" description="30 mm">
-        <specific id="1" description="M789 HEDP"/>
-        <specific id="2" description="M799 HE-I"/>
-      </subcategory>
-      <subcategory id="4" description="40 mm">
-        <specific id="1" description="Grenade cartridges"/>
-        <specific id="2" description="M433 HEDP"/>
-        <specific id="3" description="M397 Airburst"/>
-        <specific id="4" description="M397A1 Airburst"/>
-        <specific id="5" description="M381 HE"/>
-        <specific id="6" description="M386 HE"/>
-        <specific id="7" description="M406 HE"/>
-        <specific id="8" description="(deleted)"/>
-        <specific id="9" description="M441 HE"/>
-        <specific id="10" description="M576 Buckshot"/>
-        <specific id="11" description="M583 White star parachute"/>
-        <specific id="12" description="M583A1 White star parachute"/>
-        <specific id="13" description="M585 Star cluster"/>
-        <specific id="14" description="M651 Tactical CS"/>
-        <specific id="15" description="M661 Green star parachute"/>
-        <specific id="16" description="M662 Red star parachute"/>
-        <specific id="17" description="M676 Yellow smoke canopy"/>
-        <specific id="18" description="M680 White smoke canopy"/>
-        <specific id="19" description="M682 Red smoke canopy"/>
-        <specific id="20" description="M713 Red ground smoke marker"/>
-        <specific id="21" description="M715 Green ground smoke marker"/>
-        <specific id="22" description="M716 Yellow ground smoke marker"/>
-        <specific id="23" description="Grenade, HE, 40mm, M383"/>
-      </subcategory>
-      <subcategory id="5" description="60 mm">
-        <specific id="1" description="M49A4 HE bomb"/>
-        <specific id="2" description="M49A5 HE bomb"/>
-        <specific id="3" description="M83A3 illuminating bomb"/>
-        <specific id="4" description="M302A2 smoke bomb"/>
-        <specific id="5" description="M720 HE bomb"/>
-        <specific id="6" description="Projectile, 60-mm, HE-Frag, M888"/>
-      </subcategory>
-      <subcategory id="6" description="66 mm rocket"/>
-      <subcategory id="7" description="76 mm">
-        <specific id="1" description="M352 HE"/>
-        <specific id="2" description="M361 smoke"/>
-        <specific id="3" description="M361A1 smoke"/>
-        <specific id="4" description="M363 HE"/>
-      </subcategory>
-      <subcategory id="8" description="81 mm">
-        <specific id="1" description="M43A1 HE bomb"/>
-        <specific id="2" description="M43A1B1 HE bomb"/>
-        <specific id="3" description="M57 smoke WP bomb"/>
-        <specific id="4" description="M57A1 smoke WP bomb"/>
-        <specific id="5" description="M301A1 illuminating bomb"/>
-        <specific id="6" description="M301A2 illuminating bomb"/>
-        <specific id="7" description="M301A3 illuminating bomb"/>
-        <specific id="8" description="M362 HE bomb"/>
-        <specific id="9" description="M362A1 HE bomb"/>
-        <specific id="10" description="M370 smoke bomb"/>
-        <specific id="11" description="M374 HE bomb"/>
-        <specific id="12" description="M374A2 HE bomb"/>
-        <specific id="13" description="M374A3 HE bomb"/>
-        <specific id="14" description="M375 smoke bomb"/>
-        <specific id="15" description="M375A1 smoke bomb"/>
-        <specific id="16" description="M375A2 smoke bomb"/>
-        <specific id="17" description="M445 training bomb"/>
-        <specific id="18" description="Projectile, Mortar, 81mm, High Explosive M889A1"/>
-      </subcategory>
-      <subcategory id="9" description="90 mm">
-        <specific id="1" description="M71 HE"/>
-        <specific id="2" description="M71 A1 HE-T"/>
-        <specific id="3" description="M313 smoke"/>
-        <specific id="4" description="M313C smoke"/>
-      </subcategory>
-      <subcategory id="10" description="105 mm">
-        <specific id="1" description="M1 HE"/>
-        <specific id="2" description="M60 Agent H/HD"/>
-        <specific id="3" description="M60 smoke"/>
-        <specific id="4" description="M84 smoke"/>
-        <specific id="5" description="M314 illumination"/>
-        <specific id="6" description="M314A3, illuminating cartridge"/>
-        <specific id="7" description="M327 HEP/HEP-T"/>
-        <specific id="8" description="M360 Agent GB"/>
-        <specific id="9" description="M393 HEP-T"/>
-        <specific id="10" description="M413 HE"/>
-        <specific id="11" description="M416 smoke WP"/>
-        <specific id="12" description="M444 HE"/>
-        <specific id="13" description="M548 HERA"/>
-        <specific id="14" description="M629 tactical CS"/>
-        <specific id="15" description="M657 HE-T"/>
-        <specific id="16" description="M760 HE"/>
-        <specific id="17" description="M913 RAP"/>
-        <specific id="18" description="XM872 KE"/>
-      </subcategory>
-      <subcategory id="11" description="120 mm">
-        <specific id="1" description="M933HE"/>
-        <specific id="2" description="M934HE"/>
-        <specific id="3" description="M57 HE"/>
-        <specific id="4" description="M68 WP"/>
-        <specific id="5" description="M929 WP"/>
-        <specific id="6" description="M91 Illumination"/>
-        <specific id="7" description="M930 Illumination"/>
-      </subcategory>
-      <subcategory id="12" description="127 mm (5.0 in)">
-        <specific id="1" description="Zuni rocket"/>
-      </subcategory>
-      <subcategory id="13" description="152 mm"/>
-      <subcategory id="14" description="155 mm">
-        <specific id="1" description="BGD155C ICM"/>
-        <specific id="2" description="M107 HE">
-          <extra id="1" description="Variable time"/>
-          <extra id="2" description="Point detonating"/>
-        </specific>
-        <specific id="3" description="M483A1 HE DP (ICM)"/>
-        <specific id="4" description="M485 illumination"/>
-        <specific id="5" description="M485A1 illumination"/>
-        <specific id="6" description="M485A2 illumination"/>
-        <specific id="7" description="M549 HE RA"/>
-        <specific id="8" description="M549A1 HE RA"/>
-        <specific id="9" description="M864 BB ICM"/>
-        <specific id="10" description="M449 APICM"/>
-        <specific id="11" description="M731 FASCAM ADAM"/>
-        <specific id="12" description="M741"/>
-        <specific id="13" description="M116A1 HC Smoke"/>
-        <specific id="14" description="M825 WP"/>
-        <specific id="15" description="Projectile, 155-mm, Extended Range, XM982"/>
-        <specific id="16" description="M121 VX"/>
-        <specific id="17" description="M121 GB"/>
-        <specific id="18" description="M692 ADAM"/>
-        <specific id="19" description="M718 RAAM-L"/>
-        <specific id="20" description="M795 HE">
-          <extra id="1" description="Variable time"/>
-          <extra id="2" description="Point detonating"/>
-        </specific>
-        <specific id="21" description="M687 BINARY"/>
-      </subcategory>
-      <subcategory id="15" description="203 mm">
-        <specific id="1" description="M106 HE"/>
-        <specific id="2" description="M404 HE/ICM"/>
-        <specific id="3" description="M422 nuclear"/>
-        <specific id="4" description="M426 Agent GB"/>
-        <specific id="5" description="M509 HE/ICM"/>
-        <specific id="6" description="M509 A1, HE/ICM"/>
-        <specific id="7" description="M650 HERA"/>
-        <specific id="8" description="M753 nuclear"/>
-      </subcategory>
-      <subcategory id="16" description="227 mm rocket"/>
-      <subcategory id="17" description="(deleted)"/>
-      <subcategory id="18" description="107 mm">
-        <specific id="1" description="M328 smoke bomb"/>
-        <specific id="2" description="M328 A1 smoke bomb"/>
-        <specific id="3" description="M329 A1 HE bomb"/>
-        <specific id="4" description="M329 A2 HE bomb"/>
-        <specific id="5" description="M335 illuminating bomb"/>
-        <specific id="6" description="M335 A2 illuminating bomb"/>
-        <specific id="7" description="M630 tactical CS bomb"/>
-      </subcategory>
-      <subcategory id="19" description="7.62 mm">
-        <specific id="1" description="A131 (4 Ball &amp; 1 Tracer Mix)"/>
-        <specific id="2" description="M62 (4 Ball &amp; 1 Tracer)"/>
-        <specific id="3" description="M80"/>
-        <specific id="4" description="A131"/>
-      </subcategory>
-      <subcategory id="20" description="12.7 mm">
-        <specific id="1" description="M2 ball"/>
-        <specific id="2" description="M17 tracer"/>
-        <specific id="3" description="M33 ball"/>
-        <specific id="4" description="A621 .50 4 Ball M33/1 Tr M17"/>
-        <specific id="5" description=".50 Inc M1"/>
-        <specific id="6" description=".50 Tr M1"/>
-        <specific id="7" description=".50 AP M2"/>
-        <specific id="8" description=".50 API M8"/>
-        <specific id="9" description=".50 API-T M20"/>
-        <specific id="10" description=".50 Inc M23"/>
-        <specific id="11" description="A530 .50 4 AP M2/1 Tr M17"/>
-        <specific id="12" description="A534 .50 4 API M8/1 API-T M20"/>
-        <specific id="13" description="A539 .50 3 API M8/1 Tr M17"/>
-        <specific id="14" description="A540 .50 4 API M8/1 Tr M1"/>
-        <specific id="15" description="A547 .50 1 API M8/1 Inc M1"/>
-        <specific id="16" description="A549 .50 2 AP M2/2 Inc M1/1 Tr M1"/>
-        <specific id="17" description="A556 .50 4 Ball M2/1 Tr M1"/>
-        <specific id="18" description="A557 .50 4 Ball M2/1 Tr M17"/>
-      </subcategory>
-      <subcategory id="21" description="70 mm (2.75 in) rocket">
-        <specific id="1" description="M 151 HE"/>
-        <specific id="2" description="M 255 flechette"/>
-        <specific id="3" description="M 261 submunitions"/>
-        <specific id="4" description="M 262"/>
-        <specific id="5" description="M229 HE"/>
-        <specific id="6" description="Rocket, 2.75in, Smoke, WP, M264"/>
-      </subcategory>
-      <subcategory id="22" description="175 mm" footnote="The M107 175-mm gun is no longer in service with the U.S. Army but is still used by some other nations.">
-        <specific id="1" description="M437A1 HE"/>
-        <specific id="2" description="M437A2 HE"/>
-      </subcategory>
-      <subcategory id="23" description="165 mm">
-        <specific id="1" description="HEP"/>
-      </subcategory>
-      <subcategory id="24" description="(deleted)"/>
-      <subcategory id="25" description="(deleted)"/>
-      <subcategory id="26" description="(deleted)"/>
-      <subcategory id="27" description="(deleted)"/>
-      <subcategory id="28" description="(deleted)"/>
-      <subcategory id="29" description="(deleted)"/>
-      <subcategory id="30" description="(deleted)"/>
-      <subcategory id="31" description="(deleted)"/>
-      <subcategory id="32" description="(deleted)"/>
-      <subcategory id="33" description="(deleted)"/>
-      <subcategory id="34" description="(deleted)"/>
-      <subcategory id="35" description="(deleted)"/>
-      <subcategory id="36" description="(deleted)"/>
-      <subcategory id="37" description="(deleted)"/>
-      <subcategory id="38" description="(deleted)"/>
-      <subcategory id="39" description="(deleted)"/>
-      <subcategory id="40" description="M76 vehicle smoke grenade"/>
-      <subcategory id="41" description="M243 smoke grenade"/>
-      <subcategory id="42" description="M250 smoke grenade"/>
-      <subcategory id="43" description="M257 grenade">
-        <specific id="1" description="L8A1/A3 red phosphorous smoke grenade"/>
-        <specific id="2" description="L8A1/A3 WP smoke grenade"/>
-      </subcategory>
-      <subcategory id="44" description="M545 universal fragmentation grenade"/>
-      <subcategory id="45" description="M560-series antipersonnel fragmentation grenades"/>
-      <subcategory id="46" description="Ring Airfoil Grenade (RAG)"/>
-      <subcategory id="47" description="(deleted)"/>
-      <subcategory id="48" description="(deleted)"/>
-      <subcategory id="49" description="(deleted)"/>
-      <subcategory id="50" description="B28 nuclear bomb">
-        <specific id="1" description="B28 EX"/>
-        <specific id="2" description="B28 FI"/>
-        <specific id="3" description="B28 IN"/>
-        <specific id="4" description="B28 RE"/>
-        <specific id="5" description="B28 RI"/>
-      </subcategory>
-      <subcategory id="51" description="B43 nuclear bomb"/>
-      <subcategory id="52" description="B53 nuclear bomb"/>
-      <subcategory id="53" description="B57 nuclear bomb"/>
-      <subcategory id="54" description="B61 nuclear bomb">
-        <specific id="1" description="mod O"/>
-        <specific id="2" description="mod 1"/>
-        <specific id="3" description="mod 2"/>
-        <specific id="4" description="mod 3"/>
-        <specific id="5" description="mod 4"/>
-        <specific id="6" description="mod 5"/>
-      </subcategory>
-      <subcategory id="55" description="B83 nuclear bomb"/>
-      <subcategory id="56" description="BLU-73/B FAE Bomb"/>
-      <subcategory id="57" description="BLU-109/B Bomb">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="(deleted)"/>
-        <specific id="4" description="(deleted)"/>
-        <specific id="5" description="(deleted)"/>
-        <specific id="6" description="(deleted)"/>
-        <specific id="7" description="(deleted)"/>
-        <specific id="8" description="BLU-109/B Low Drag">
-          <extra id="1" description="Impact fuse"/>
-          <extra id="2" description=".10 sec delay"/>
-          <extra id="3" description=".25 sec delay"/>
-        </specific>
-      </subcategory>
-      <subcategory id="58" description="CBU 15"/>
-      <subcategory id="59" description="CBU 52"/>
-      <subcategory id="60" description="CBU-55">
-        <specific id="1" description="CBU-55/B"/>
-        <specific id="2" description="CBU-72"/>
-      </subcategory>
-      <subcategory id="61" description="CBU 58"/>
-      <subcategory id="62" description="CBU 71"/>
-      <subcategory id="63" description="CBU 75"/>
-      <subcategory id="64" description="CBU 87">
-        <specific id="1" description="CBU-87/B (CEM)"/>
-      </subcategory>
-      <subcategory id="65" description="(deleted)"/>
-      <subcategory id="66" description="CBU 89"/>
-      <subcategory id="67" description="CBU-97/B"/>
-      <subcategory id="68" description="Direct Airfield Attack Combined Munition Weapon (DAACM)"/>
-      <subcategory id="69" description="Durandal"/>
-      <subcategory id="70" description="M117 GP bomb">
-        <specific id="1" description="M117R"/>
-      </subcategory>
-      <subcategory id="71" description="Mk-7 Dispenser">
-        <specific id="1" description="CBU-78/B Gator mines (USN)"/>
-        <specific id="2" description="CBU-59/B APAM"/>
-      </subcategory>
-      <subcategory id="72" description="Mk-81">
-        <specific id="1" description="Mk-81 Low Drag General Purpose"/>
-        <specific id="2" description="Mk-81 Snakeye"/>
-      </subcategory>
-      <subcategory id="73" description="Mk-82">
-        <specific id="1" description="Mk-82 air inflatable retard">
-          <extra id="1" description="Impact fuse"/>
-          <extra id="4" description="Proximity fuse"/>
-        </specific>
-        <specific id="2" description="Mk-82 Low Drag General Purpose">
-          <extra id="1" description="Impact fuse"/>
-          <extra id="2" description=".10 sec. delay"/>
-          <extra id="3" description=".25 sec. delay"/>
-        </specific>
-        <specific id="3" description="MK-82 Snakeye">
-          <extra id="1" description="Impact fuse"/>
-          <extra id="4" description="Proximity fuse"/>
-        </specific>
-        <specific id="4" description="BLU-111/B"/>
-      </subcategory>
-      <subcategory id="74" description="Mk-83">
-        <specific id="1" description="BLU-110/B"/>
-      </subcategory>
-      <subcategory id="75" description="Mk-84">
-        <specific id="1" description="Mk-84 air inflatable retard">
-          <extra id="1" description="Impact fuse"/>
-          <extra id="4" description="Proximity fuse"/>
-        </specific>
-        <specific id="2" description="MK-84 Low Drag General Purpose">
-          <extra id="1" description="Impact fuse"/>
-          <extra id="2" description=".10 sec. delay"/>
-          <extra id="3" description=".25 sec delay"/>
-        </specific>
-      </subcategory>
-      <subcategory id="76" description="Sensor Fused Weapon (SFW)"/>
-      <subcategory id="77" description="165mm HEP"/>
-      <subcategory id="78" description="Napalm"/>
-      <subcategory id="79" description="Mine Clearing Lane Charge"/>
-      <subcategory id="80" description="MLRS Rocket">
-        <specific id="1" description="M26"/>
-        <specific id="2" description="M28A1"/>
-        <specific id="3" description="MLRS-ER"/>
-      </subcategory>
-      <subcategory id="81" description="5.56 MM">
-        <specific id="1" description="M855 Ball"/>
-        <specific id="2" description="M856 Tracer"/>
-        <specific id="3" description="A064 (4 ball &amp; 1 tracer mix)"/>
-      </subcategory>
-      <subcategory id="82" description="M87 mine canister"/>
-      <subcategory id="83" description="BLU-82/B"/>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="SLAM"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="225">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AGM-86B ALCM"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="Tomahawk">
-        <specific id="1" description="BGM-109A (TLAM-N)"/>
-      </subcategory>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="LGM-30G Minuteman III"/>
-      <subcategory id="8" description="MGM-118 Peacekeeper"/>
-      <subcategory id="9" description="UGM-73 Poseidon"/>
-      <subcategory id="10" description="UGM-93A Trident (II)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="12" country="225">
-    <category id="1" description="Point Effect DE Weapon">
-      <subcategory id="1" description="Laser Weapon">
-        <specific id="1" description="Chemical Oxygen Iodine Laser (COIL)"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Area Effect DE Weapon">
-      <subcategory id="1" description="High Power Microwave (HPM) Weapon"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AA-1 Alkali"/>
-      <subcategory id="2" description="AA-2 Atoll">
-        <specific id="1" description="AA-2C"/>
-        <specific id="2" description="AA-2D"/>
-      </subcategory>
-      <subcategory id="3" description="AA-3 Anab">
-        <specific id="1" description="AA-3, IR"/>
-        <specific id="2" description="AA-3, radar"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="AA-5 Ash">
-        <specific id="1" description="AA-5, IR"/>
-        <specific id="2" description="AA-5, radar"/>
-      </subcategory>
-      <subcategory id="6" description="AA-6 Acrid">
-        <specific id="1" description="AA-6, IR"/>
-        <specific id="2" description="AA-6, radar"/>
-      </subcategory>
-      <subcategory id="7" description="AA-7 Apex">
-        <specific id="1" description="AA-7, IR"/>
-        <specific id="2" description="AA-7, radar"/>
-      </subcategory>
-      <subcategory id="8" description="AA-8 Aphid">
-        <specific id="1" description="AA-8A Aphid"/>
-        <specific id="2" description="AA-8B Aphid"/>
-        <specific id="3" description="AA-8C Aphid"/>
-      </subcategory>
-      <subcategory id="9" description="AA-9 Amos">
-        <specific id="1" description="AA-9, inertial"/>
-        <specific id="2" description="AA-9, command update"/>
-        <specific id="3" description="AA-9, radar"/>
-      </subcategory>
-      <subcategory id="10" description="AA-10 Alamo">
-        <specific id="1" description="AA-10A, short burn radar"/>
-        <specific id="2" description="AA-10B, short burn, IR"/>
-        <specific id="3" description="AA-10C, long burn radar"/>
-        <specific id="4" description="AA-10D, long burn, IR"/>
-      </subcategory>
-      <subcategory id="11" description="AA-11 Archer"/>
-      <subcategory id="12" description="AA-X-12"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="SA-2 Guideline">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="SA-2b Guideline Mod 1"/>
-        <specific id="3" description="SA-2d Guideline Mod3"/>
-        <specific id="4" description="SA-2f Guideline Mod5"/>
-      </subcategory>
-      <subcategory id="15" description="(deleted)"/>
-      <subcategory id="16" description="SA-4 Ganef">
-        <specific id="1" description="SA-4A"/>
-        <specific id="2" description="SA-4B"/>
-      </subcategory>
-      <subcategory id="17" description="SA-5 Gammon">
-        <specific id="1" description="SA-5A"/>
-        <specific id="2" description="SA-5B"/>
-        <specific id="3" description="SA-5C"/>
-      </subcategory>
-      <subcategory id="18" description="SA-6 Gainful">
-        <specific id="1" description="SA-6A"/>
-        <specific id="2" description="SA-6B"/>
-      </subcategory>
-      <subcategory id="19" description="SA-7 Grail">
-        <specific id="1" description="SA-7A"/>
-        <specific id="2" description="SA-7B"/>
-        <specific id="3" description="SA-7B (Spetsnaz mod)"/>
-        <specific id="4" description="SA-7C"/>
-      </subcategory>
-      <subcategory id="20" description="SA-8 Gecko">
-        <specific id="1" description="SA-8A mod 0"/>
-        <specific id="2" description="SA-8B mod 1"/>
-      </subcategory>
-      <subcategory id="21" description="SA-9 Gaskin"/>
-      <subcategory id="22" description="SA-10 Grumble">
-        <specific id="1" description="SA-10a Grumble Mod 0"/>
-        <specific id="2" description="SA-10b Grumble Mod 1"/>
-        <specific id="3" description="SA-10c Grumble Mod 2"/>
-      </subcategory>
-      <subcategory id="23" description="SA-11 Gadfly"/>
-      <subcategory id="24" description="SA-12 Gladiator/Giant">
-        <specific id="1" description="SA-12A Gladiator SAM"/>
-        <specific id="2" description="(deleted)"/>
-        <specific id="3" description="SA-X-12B Giant SAM"/>
-        <specific id="4" description="SA-X-12B Giant SAM (rail w/ SS-24)"/>
-      </subcategory>
-      <subcategory id="25" description="SA-13 Gopher">
-        <specific id="1" description="Strela 10M2"/>
-        <specific id="2" description="Strela 10M3"/>
-      </subcategory>
-      <subcategory id="26" description="SA-14 Gremlin"/>
-      <subcategory id="27" description="SA-15 Gauntlet"/>
-      <subcategory id="28" description="SA-16 Gimlet"/>
-      <subcategory id="29" description="SA-17 Grizzly"/>
-      <subcategory id="30" description="SA-18"/>
-      <subcategory id="31" description="SA-19 Grison">
-        <specific id="1" description="SA-N-11"/>
-      </subcategory>
-      <subcategory id="32" description="SA-N-1 Goa (M-1 Volga-M)"/>
-      <subcategory id="33" description="SA-N-3 Goblet">
-        <specific id="1" description="SA-N-3 Mod 0"/>
-        <specific id="2" description="SA-N-3B Mod 1"/>
-      </subcategory>
-      <subcategory id="34" description="SA-N-4 (OSA-M)"/>
-      <subcategory id="35" description="SA-N-5 Grail (Strela 2)"/>
-      <subcategory id="36" description="SA-N-6"/>
-      <subcategory id="37" description="SA-N-7 Gadfly (Smerch/Shtil)"/>
-      <subcategory id="38" description="SA-N-8 Gremlin (Strela 3)"/>
-      <subcategory id="39" description="SA-N-9 Tor-M/Klinok"/>
-      <subcategory id="40" description="SA-N-11 (9M311)"/>
-      <subcategory id="41" description="SA-3 Goa"/>
-      <subcategory id="42" description="SA-20 Gargoyle"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="12.7 mm"/>
-      <subcategory id="2" description="14.5 mm">
-        <specific id="1" description="API"/>
-        <specific id="2" description="API-T"/>
-        <specific id="3" description="I-T"/>
-      </subcategory>
-      <subcategory id="3" description="23 mm">
-        <specific id="1" description="NS HE-I-T OZT"/>
-        <specific id="2" description="NS AP-I BZ"/>
-        <specific id="3" description="VYa HE-I-T OZT"/>
-        <specific id="4" description="VYa AP-I BZ"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="25 mm">
-        <specific id="1" description="M1940 HE-I-T UOZR-132"/>
-        <specific id="2" description="M1940 AP-T UZR-132"/>
-        <specific id="3" description="2-M3"/>
-        <specific id="4" description="2-M8"/>
-      </subcategory>
-      <subcategory id="6" description="30 mm">
-        <specific id="1" description="BR-83 AP-T"/>
-        <specific id="2" description="OF-83D HE"/>
-      </subcategory>
-      <subcategory id="7" description="57 mm"/>
-      <subcategory id="8" description="76 mm"/>
-      <subcategory id="9" description="85 mm"/>
-      <subcategory id="10" description="100 mm"/>
-      <subcategory id="11" description="130 mm">
-        <specific id="1" description="SM-4-1"/>
-      </subcategory>
-      <subcategory id="12" description="37 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="AT-1 Snapper"/>
-      <subcategory id="4" description="AT-2 Swatter">
-        <specific id="1" description="Swatter A/B (radio command)"/>
-        <specific id="2" description="Swatter C (SACLOS)"/>
-      </subcategory>
-      <subcategory id="5" description="AT-3 Sagger">
-        <specific id="1" description="Sagger (MCLOS)"/>
-      </subcategory>
-      <subcategory id="6" description="AT-4 Spigot">
-        <specific id="1" description="Spigot A"/>
-        <specific id="2" description="Spigot B"/>
-      </subcategory>
-      <subcategory id="7" description="AT-5 Spandrel"/>
-      <subcategory id="8" description="AT-6 Spiral"/>
-      <subcategory id="9" description="AT-7 Saxhorn">
-        <specific id="1" description="AT-13 Metis-M"/>
-      </subcategory>
-      <subcategory id="10" description="AT-8 Songster"/>
-      <subcategory id="11" description="AT-9"/>
-      <subcategory id="12" description="AT -10 Stabber"/>
-      <subcategory id="13" description="AT-11 Sniper"/>
-      <subcategory id="14" description="AT-12"/>
-      <subcategory id="15" description="AT-14">
-        <specific id="1" description="AT-14 KORNET-LR"/>
-        <specific id="2" description="AT-14 FAE"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="23 mm"/>
-      <subcategory id="2" description="30 mm">
-        <specific id="1" description="30mm AP-T"/>
-        <specific id="2" description="30mm APDS-T"/>
-        <specific id="3" description="30mm APFSDS-T"/>
-      </subcategory>
-      <subcategory id="3" description="64 mm">
-        <specific id="1" description="(w/ RPG-18 light anti-armor weapon)"/>
-      </subcategory>
-      <subcategory id="4" description="73 mm">
-        <specific id="1" description="HEAT FS"/>
-        <specific id="2" description="HEAT-FS, PG-7VL"/>
-      </subcategory>
-      <subcategory id="5" description="76 mm"/>
-      <subcategory id="6" description="80 mm"/>
-      <subcategory id="7" description="82 mm">
-        <specific id="1" description="BK-881 HEAT"/>
-        <specific id="2" description="BK-881M HEAT"/>
-      </subcategory>
-      <subcategory id="8" description="85 mm">
-        <specific id="1" description="HEAT"/>
-      </subcategory>
-      <subcategory id="9" description="107 mm"/>
-      <subcategory id="10" description="115 mm">
-        <specific id="1" description="HEAT-FS"/>
-        <specific id="2" description="HVAPFSDS"/>
-      </subcategory>
-      <subcategory id="11" description="125 mm">
-        <specific id="1" description="APFSDS-T BM-9"/>
-        <specific id="2" description="APFSDS-T BM-12"/>
-        <specific id="3" description="HEAT-FS BM-14m"/>
-        <specific id="4" description="HVAPFSDS"/>
-        <specific id="5" description="APFSDS-T, BM-42M"/>
-        <specific id="6" description="HEAT-T, BK-29M"/>
-        <specific id="7" description="HEAT-T, BK-27"/>
-      </subcategory>
-      <subcategory id="12" description="BRAB-200DS HE AP"/>
-      <subcategory id="13" description="BRAB-220 HE AP"/>
-      <subcategory id="14" description="BRAB-500 HE AP"/>
-      <subcategory id="15" description="BRAB-1000 HE AP"/>
-      <subcategory id="16" description="PTAB-2.5 bomblet HE anti-armor"/>
-      <subcategory id="17" description="122mm">
-        <specific id="1" description="HEAT"/>
-      </subcategory>
-      <subcategory id="18" description="120mm">
-        <specific id="1" description="HEAT-FS"/>
-      </subcategory>
-      <subcategory id="19" description="100mm">
-        <specific id="1" description="APFSDS-T"/>
-        <specific id="2" description="HEAT"/>
-        <specific id="3" description="HEAT-FS"/>
-      </subcategory>
-      <subcategory id="20" description="RPG-7VAT Grenade Launcher"/>
-      <subcategory id="21" description="130 mm">
-        <specific id="1" description="APC-T BR-482B"/>
-      </subcategory>
-      <subcategory id="22" description="152mm">
-        <specific id="1" description="Projectile, 152-mm, HEAT-FS"/>
-        <specific id="2" description="APC-T, 3BR-540, 152mm"/>
-      </subcategory>
-      <subcategory id="23" description="105mm">
-        <specific id="1" description="PG-29V 105mm HEAT (Tandem)"/>
-      </subcategory>
-      <subcategory id="24" description="57mm Air to ground rockets">
-        <specific id="1" description="57mm HEAT rocket, S-5"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="SH-01 Galosh (UR-96)">
-        <specific id="1" description="(deleted)"/>
-        <specific id="2" description="SH-08"/>
-        <specific id="3" description="SH-11 Gorgon"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="30 mm">
-        <specific id="1" description="UOF-84 HE-I"/>
-        <specific id="2" description="UOR-84 HE-T"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AS-4 Kitchen"/>
-      <subcategory id="2" description="AS-9 Kyle"/>
-      <subcategory id="3" description="AS-12 Kegler"/>
-      <subcategory id="4" description="AS-11 Kilter">
-        <specific id="1" description="AS-11A, Mod 1 Kilter"/>
-        <specific id="2" description="AS-11B, Mod 2 Kilter"/>
-      </subcategory>
-      <subcategory id="5" description="KH-31P/X-31 or possibly AS-17"/>
-      <subcategory id="6" description="SS-21 Scarab">
-        <specific id="1" description="Tochka-R"/>
-      </subcategory>
-      <subcategory id="7" description="Kh-29MP Kedge anti-radar">
-        <specific id="1" description="Kh-29T Kedge (AS-14A) TV-guided"/>
-        <specific id="2" description="Kh-29L Kedge (AS-14B) laser-guided"/>
-        <specific id="3" description="Kh-29D Kedge infrared guided"/>
-        <specific id="4" description="Kh-29LE Kedge laser guided export"/>
-        <specific id="5" description="Kh-29ML Kedge"/>
-        <specific id="6" description="Kh-29TE Kedge TV guided"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="5" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Antisatellite System"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AS-2 Kipper"/>
-      <subcategory id="2" description="AS-4 Kitchen"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="AS-6 Kingfish"/>
-      <subcategory id="5" description="AS-13 Kingbolt"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="AS-15 Kent">
-        <specific id="1" description="Kh-55 Kent (AS-15A)"/>
-        <specific id="2" description="Kh-55SM Kent Mod 1 (AS-15B)"/>
-        <specific id="3" description="Kent Mod 2"/>
-      </subcategory>
-      <subcategory id="8" description="SS-N-2 Styx">
-        <specific id="1" description="SS-N-2a"/>
-        <specific id="2" description="SS-N-2b"/>
-        <specific id="3" description="SS-N-2c"/>
-        <specific id="4" description="SS-N-2d"/>
-      </subcategory>
-      <subcategory id="9" description="SS-N-7 Starbright"/>
-      <subcategory id="10" description="SS-N-9 Siren"/>
-      <subcategory id="11" description="SS-N-12 Sandbox"/>
-      <subcategory id="12" description="SS-N-19 Shipwreck">
-        <specific id="1" description="Boost phase vehicle"/>
-        <specific id="2" description="Jettisoned vehicle"/>
-        <specific id="3" description="Separated warhead"/>
-      </subcategory>
-      <subcategory id="13" description="SS-N-22 Sunburn"/>
-      <subcategory id="14" description="SS-N-3 Shaddock">
-        <specific id="1" description="SS-N-3a"/>
-        <specific id="2" description="SS-N-3b"/>
-        <specific id="3" description="SS-N-3c"/>
-      </subcategory>
-      <subcategory id="15" description="SSC-2b Samlet Cruise"/>
-      <subcategory id="16" description="SSC-1b Sepal"/>
-      <subcategory id="17" description="SSC-3 Styx"/>
-      <subcategory id="18" description="533-mm torpedo"/>
-      <subcategory id="19" description="406-mm torpedo"/>
-      <subcategory id="20" description="(deleted)"/>
-      <subcategory id="21" description="(deleted)"/>
-      <subcategory id="22" description="SS-N-21 Sampson"/>
-      <subcategory id="23" description="SS-N-25 (Kh 35)"/>
-      <subcategory id="24" description="AS-5 Kelt"/>
-      <subcategory id="25" description="AS-10 Karen"/>
-      <subcategory id="26" description="Kh-31 Krypton (AS-17) Non-ARM">
-        <specific id="1" description="Kh-31A Krypton (AS-17A)"/>
-        <specific id="2" description="Kh-31AD Krypton (AS-17B)"/>
-      </subcategory>
-      <subcategory id="27" description="53 CM Torpedo Thermal (turbine)"/>
-      <subcategory id="28" description="65 CM Torpedo Thermal"/>
-      <subcategory id="29" description="SSC-X-5 (SS-NX-26)">
-        <specific id="1" description="Yakhont"/>
-      </subcategory>
-      <subcategory id="30" description="SSC-6 (SS-N-25)"/>
-      <subcategory id="31" description="P-270 Moskit (Kh-41)"/>
-      <subcategory id="32" description="M51"/>
-      <subcategory id="33" description="53-56/51 Torpedo"/>
-      <subcategory id="34" description="Kh-59M Kazoo (AS-18)"/>
-      <subcategory id="35" description="Kh-35 Kayak (AS-20)"/>
-      <subcategory id="36" description="SS-NX-30 Conventional LACM"/>
-      <subcategory id="37" description="PJ-10"/>
-      <subcategory id="38" description="M-5 Torpedo"/>
-      <subcategory id="39" description="USET-80 Torpedo"/>
-      <subcategory id="40" description="SAET-50 Torpedo"/>
-      <subcategory id="41" description="SET 53A Torpedo"/>
-      <subcategory id="42" description="3M-14E (Klub) SS-N-17"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="12.7 mm"/>
-      <subcategory id="2" description="14.5 mm"/>
-      <subcategory id="3" description="23 mm"/>
-      <subcategory id="4" description="25 mm"/>
-      <subcategory id="5" description="30 mm">
-        <specific id="1" description="BR-83 AP-T"/>
-        <specific id="2" description="OF-83D HE"/>
-      </subcategory>
-      <subcategory id="6" description="57 mm"/>
-      <subcategory id="7" description="76 mm"/>
-      <subcategory id="8" description="85 mm"/>
-      <subcategory id="9" description="100 mm"/>
-      <subcategory id="10" description="130 mm">
-        <specific id="1" description="SM-4-1"/>
-      </subcategory>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="M-26 mine"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="SS-N-14 Silex"/>
-      <subcategory id="3" description="SS-N-15 Starfish"/>
-      <subcategory id="4" description="SS-N-16 Stallion"/>
-      <subcategory id="5" description="533-mm torpedo">
-        <specific id="1" description="Type 3"/>
-        <specific id="2" description="Type 3 nuclear"/>
-        <specific id="3" description="new passive wake-homing turbine"/>
-        <specific id="4" description="new electric"/>
-      </subcategory>
-      <subcategory id="6" description="406-mm Type 40 torpedo"/>
-      <subcategory id="7" description="650-mm submarine-launched torpedo"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="Type 45 (light, air-launched)"/>
-      <subcategory id="14" description="Type E53 (light, air-launched)"/>
-      <subcategory id="15" description="Test 71 Torpedo"/>
-      <subcategory id="16" description="APR-2 Torpedo"/>
-      <subcategory id="17" description="APR-3 Torpedo"/>
-      <subcategory id="18" description="E40-79 Torpedo"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="FRAS-1/SUW-N-1 (VETER)"/>
-      <subcategory id="2" description="RBU 1000"/>
-      <subcategory id="3" description="RBU 1200"/>
-      <subcategory id="4" description="RBU 2500"/>
-      <subcategory id="5" description="RBU 6000"/>
-      <subcategory id="6" description="RBU 12000"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="222">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="5.45 mm">
-        <specific id="1" description="5.45-mm Soviet pistol (aka 5.45 x 18 mm)"/>
-        <specific id="2" description="5.45-mm Soviet rifle (aka 5.45 x 39.5 mm and 5.45-mm M74)"/>
-      </subcategory>
-      <subcategory id="2" description="7.62 mm">
-        <specific id="1" description="7.62 x 25-mm Soviet pistol (aka 7.62-mm Tokarev)"/>
-        <specific id="2" description="7.62 x 38R Nagant Revolver (aka 7.62-mm Soviet revolver and 7.62-mm Nagant gas-seal)"/>
-        <specific id="3" description="7.62-mm Soviet M1943 (aka 7.62 x 39 mm, 7.62-mm Kalashnikov, and 7.62-mm obr 43g)"/>
-        <specific id="4" description="7.62-mm Mosin-Nagant (aka 7.62 x 54R, 7.62-mm Soviet Rimmed, and 7.62-mm obr 1891)"/>
-      </subcategory>
-      <subcategory id="3" description="9 mm">
-        <specific id="1" description="9-mm Makarov (aka 9 x 18 mm Soviet, 9-mm Stechkin, and 9-mm Type 59)"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="82 mm">
-        <specific id="1" description="HE fragmentation (O-881A)"/>
-      </subcategory>
-      <subcategory id="8" description="107-mm M-38 mortar"/>
-      <subcategory id="9" description="AO-1 SCH bomblet HE submunition"/>
-      <subcategory id="10" description="AO-2.5 bomblet"/>
-      <subcategory id="11" description="AO-2.5 HE submunition"/>
-      <subcategory id="12" description="AO-2.5-2 HE submunition"/>
-      <subcategory id="13" description="AO-8M2 HE"/>
-      <subcategory id="14" description="AO-10 HE"/>
-      <subcategory id="15" description="AO-10-6.5 HE"/>
-      <subcategory id="16" description="AO-20 HE"/>
-      <subcategory id="17" description="AO-20M3 HE"/>
-      <subcategory id="18" description="AO-25M1 HE"/>
-      <subcategory id="19" description="AO-25M2 HE"/>
-      <subcategory id="20" description="AO-100 HE"/>
-      <subcategory id="21" description="FAB-50 HE"/>
-      <subcategory id="22" description="FAB-70 HE"/>
-      <subcategory id="23" description="FAB-100 M43 HE"/>
-      <subcategory id="24" description="FAB-100 M62 HE"/>
-      <subcategory id="25" description="FAB-250 HE"/>
-      <subcategory id="26" description="FAB-250 M43 HE"/>
-      <subcategory id="27" description="FAB-250 M46 HE"/>
-      <subcategory id="28" description="FAB-250 M54 HE"/>
-      <subcategory id="29" description="FAB-250 M62 HE"/>
-      <subcategory id="30" description="FAB-500 HE"/>
-      <subcategory id="31" description="FAB-500 M46 HE"/>
-      <subcategory id="32" description="FAB-500 M54 HE"/>
-      <subcategory id="33" description="FAB-500 M62 HE"/>
-      <subcategory id="34" description="FAB-1000 M62 HE"/>
-      <subcategory id="35" description="FAB-1500 M46 HE"/>
-      <subcategory id="36" description="FAB-1500 M54 HE"/>
-      <subcategory id="37" description="FAB-3000 M46 HE"/>
-      <subcategory id="38" description="KhAB 100-kg (80) mustard gas/lewisite HL"/>
-      <subcategory id="39" description="KhAB 100-kg (100) mustard gas/lewisite HL"/>
-      <subcategory id="40" description="KhAB 250-kg Sarin (GB)"/>
-      <subcategory id="41" description="M-1 bomblet (35-40 g of liquid explosive)"/>
-      <subcategory id="42" description="Mustard gas/lewisite HL (from 500- and 1500-kg spray tanks)"/>
-      <subcategory id="43" description="OFAB-100M HE"/>
-      <subcategory id="44" description="OFAB-100MH HE"/>
-      <subcategory id="45" description="OFAB-100NV HE"/>
-      <subcategory id="46" description="OFAB-250M HE"/>
-      <subcategory id="47" description="OKT-11 bomblet (incendiary or chemical)"/>
-      <subcategory id="48" description="ROSAB bomblet HE"/>
-      <subcategory id="49" description="Soman (GD) (from 250-kg spray tank)"/>
-      <subcategory id="50" description="ZAB-1E incendiary (1.5 kg)"/>
-      <subcategory id="51" description="ZAB 500 T Shch incendiary (500 kg)"/>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="Wooden TMD-B AT mine"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="TM-46 AT-blast mine"/>
-      <subcategory id="6" description="TMN-46 AT-blast mine"/>
-      <subcategory id="7" description="TM-57 AT mine"/>
-      <subcategory id="8" description="TM-62M AT mine (metal casing)"/>
-      <subcategory id="9" description="TMK-2 AT shaped-charge mine"/>
-      <subcategory id="10" description="Area-type POMZ-2 AP-fragmentation mine"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="MON series AP mine (directional) (MON-50/MON-90/MON-100/MON-200)"/>
-      <subcategory id="13" description="PMN AP-blast mine"/>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="AMD-500"/>
-      <subcategory id="16" description="AMD-1000"/>
-      <subcategory id="17" description="AMG-1"/>
-      <subcategory id="18" description="BDT mine-clearance charge"/>
-      <subcategory id="19" description="ITB-2 mine-clearance charge"/>
-      <subcategory id="20" description="KMD-500"/>
-      <subcategory id="21" description="KMD-1000"/>
-      <subcategory id="22" description="M-08"/>
-      <subcategory id="23" description="M-12"/>
-      <subcategory id="24" description="M-16"/>
-      <subcategory id="25" description="M-AG"/>
-      <subcategory id="26" description="M-KB"/>
-      <subcategory id="27" description="M-KB-3"/>
-      <subcategory id="28" description="Mirab"/>
-      <subcategory id="29" description="MYaM"/>
-      <subcategory id="30" description="MYaRM"/>
-      <subcategory id="31" description="MZ-26"/>
-      <subcategory id="32" description="OZM bounding AP mine"/>
-      <subcategory id="33" description="OZM-3 bounding AP mine"/>
-      <subcategory id="34" description="OZM-4 bounding AP mine"/>
-      <subcategory id="35" description="OZM-72 bounding AP mine"/>
-      <subcategory id="36" description="OZM-160 bounding AP mine"/>
-      <subcategory id="37" description="PFM-1 or PMZ AP mine/bomblet"/>
-      <subcategory id="38" description="PGMDM scatterable Anti-tank mine"/>
-      <subcategory id="39" description="PLT"/>
-      <subcategory id="40" description="PLT-3"/>
-      <subcategory id="41" description="PMD-6 wooden AP mine"/>
-      <subcategory id="42" description="PMD-6M wooden AP mine"/>
-      <subcategory id="43" description="PMD-7 wooden AP mine"/>
-      <subcategory id="44" description="PMD-7ts wooden AP mine"/>
-      <subcategory id="45" description="PMD-57 wooden AP mine"/>
-      <subcategory id="46" description="PMN AP mine"/>
-      <subcategory id="47" description="PMN-2 AP mine"/>
-      <subcategory id="48" description="PMN-6"/>
-      <subcategory id="49" description="POMZ-2 AP stake mine"/>
-      <subcategory id="50" description="POMZ-2M AP stake mine"/>
-      <subcategory id="51" description="SPZ-2 mine-clearance charge"/>
-      <subcategory id="52" description="SPZ-4 mine-clearance charge"/>
-      <subcategory id="53" description="TM-62 AT mine P2 (plastic casing)"/>
-      <subcategory id="54" description="TM-62B waterproof cardboard casing"/>
-      <subcategory id="55" description="TM-62D rectangular wooden case"/>
-      <subcategory id="56" description="TM-62 P3 plastic casing"/>
-      <subcategory id="57" description="TMD-B Anti-tank mine"/>
-      <subcategory id="58" description="TMD-44 Anti-tank mine"/>
-      <subcategory id="59" description="UEP"/>
-      <subcategory id="60" description="UZ-1 Bangalore torpedo"/>
-      <subcategory id="61" description="UZ-2 Bangalore torpedo"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AS-3 Kangaroo"/>
-      <subcategory id="2" description="AS-4 Kitchen"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="AS-7 Kerry"/>
-      <subcategory id="5" description="AS-10 Karen">
-        <specific id="1" description="AS-10 (radio)"/>
-        <specific id="2" description="AS-10 (laser)"/>
-      </subcategory>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="AS-16 Kickback">
-        <specific id="1" description="Kh-15 Kickback (AS-16A) nuclear"/>
-        <specific id="2" description="Kh-15 Kickback (AS-16B) conventional"/>
-      </subcategory>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="(deleted)"/>
-      <subcategory id="15" description="KAB-500N laser-guided HE"/>
-      <subcategory id="16" description="KAB-500T TV-guided HE"/>
-      <subcategory id="17" description="SS-21 Scarab">
-        <specific id="1" description="SS-21 W/HE Warhead (9M79F)"/>
-        <specific id="2" description="SS-21 W/sub-munition warhead (9M79K)"/>
-        <specific id="3" description="SS-21 W/nuclear warhead (9M79B)"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="12.7 mm Soviet machine gun (aka 12.7 x 107mm)">
-        <specific id="1" description="API type Bz"/>
-        <specific id="2" description="API - T type BZT"/>
-      </subcategory>
-      <subcategory id="2" description="14.5 mm Soviet machine gun (aka 14.5 x 114mm)">
-        <specific id="1" description="API type BS41"/>
-        <specific id="2" description="API-T type BZT"/>
-        <specific id="3" description="Incendiary type ZP"/>
-      </subcategory>
-      <subcategory id="3" description="23 mm"/>
-      <subcategory id="4" description="25 mm">
-        <specific id="1" description="25 mm Soviet 2-M3"/>
-        <specific id="2" description="25 mm Soviet 2-M8"/>
-      </subcategory>
-      <subcategory id="5" description="30 mm grenade">
-        <specific id="1" description="HE FRAG"/>
-      </subcategory>
-      <subcategory id="6" description="37 mm"/>
-      <subcategory id="7" description="40-mm rocket"/>
-      <subcategory id="8" description="45 mm"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="82 mm (mortar)">
-        <specific id="1" description="82-mm model 0-832 DU HE fragmentation bomb"/>
-      </subcategory>
-      <subcategory id="11" description="100 mm">
-        <specific id="1" description="HE-FRAG OF-412"/>
-        <specific id="2" description="HE-FRAG OF-17"/>
-      </subcategory>
-      <subcategory id="12" description="107 mm"/>
-      <subcategory id="13" description="120 mm (mortar)">
-        <specific id="1" description="HE bomb F-843"/>
-        <specific id="2" description="HE bomb OF-843"/>
-        <specific id="3" description="HE bomb OF-843A"/>
-        <specific id="4" description="WP"/>
-        <specific id="5" description="HE FRAG"/>
-        <specific id="6" description="Illumination"/>
-        <specific id="7" description="Incendiary"/>
-        <specific id="8" description="HE-Frag, OF-843B"/>
-        <specific id="9" description="HE-Frag, RAP"/>
-      </subcategory>
-      <subcategory id="14" description="122 mm">
-        <specific id="1" description="122mm, High Explosive, 30F-56"/>
-        <specific id="2" description="122mm, High Explosive - FRAG, 53-VOF-471G"/>
-        <specific id="3" description="122mm, DPICM"/>
-        <specific id="4" description="122mm, HE -Rocket Assist Projectile, 3OF-463"/>
-        <specific id="5" description="122mm, DPICM-ER"/>
-        <specific id="6" description="122mm, Incendiary"/>
-        <specific id="7" description="122mm, Smoke, S-463"/>
-        <specific id="8" description="122mm, Smoke WP, 3D-4"/>
-        <specific id="9" description="122mm, Laser Guided, KITOLOV-2M"/>
-      </subcategory>
-      <subcategory id="15" description="122-mm rocket">
-        <specific id="1" description="M-21-OF (9M22M)"/>
-        <specific id="2" description="M-21-OF (9M22U)"/>
-        <specific id="3" description="Smoke"/>
-        <specific id="4" description="HE FRAG"/>
-        <specific id="5" description="ICM"/>
-        <specific id="6" description="Illumination"/>
-        <specific id="7" description="Incendiary"/>
-        <specific id="8" description="Chemical"/>
-        <specific id="9" description="Jammer"/>
-      </subcategory>
-      <subcategory id="16" description="125 mm">
-        <specific id="1" description="HE-FRAG OF-19"/>
-        <specific id="2" description="FRAG-HE-T, OF-26"/>
-      </subcategory>
-      <subcategory id="17" description="130 mm">
-        <specific id="1" description="FRAG-HE OF-482M"/>
-      </subcategory>
-      <subcategory id="18" description="139.7-mm rocket">
-        <specific id="1" description="M-14-OF"/>
-      </subcategory>
-      <subcategory id="19" description="152 mm">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="Projectile, 152-mm, Flechette"/>
-        <specific id="3" description="Projectile, 152-mm, ICM"/>
-        <specific id="4" description="Projectile, 152-mm, Incendiary"/>
-        <specific id="5" description="Projectile, 152-mm, Concrete Piercing"/>
-        <specific id="6" description="Projectile, 152-mm, Illuminating"/>
-        <specific id="7" description="Projectile, 152-mm, Chemical: VX"/>
-        <specific id="8" description="Projectile, 152-mm, Chemical: GD"/>
-        <specific id="9" description="Projectile, 152-mm, Chemical: AC"/>
-        <specific id="10" description="Projectile, 152-mm, DPICM"/>
-        <specific id="11" description="Projectile, 152-mm, DPICM, Base Bleed"/>
-        <specific id="12" description="Projectile, 152-mm, HE, Base Bleed"/>
-        <specific id="13" description="Projectile, 152-mm, HE-Frag, RAP"/>
-        <specific id="14" description="Projectile, 152-mm, HE-Frag, 3OF-45"/>
-      </subcategory>
-      <subcategory id="20" description="160 mm (mortar)">
-        <specific id="1" description="HE BOMB F-853U"/>
-        <specific id="2" description="HE BOMB F-853A"/>
-        <specific id="3" description="HE Bomb F-852"/>
-      </subcategory>
-      <subcategory id="21" description="180 mm"/>
-      <subcategory id="22" description="203-mm Howitzer">
-        <specific id="1" description="203-mm, High Explosive-Frag"/>
-        <specific id="2" description="203-mm, DPICM"/>
-        <specific id="3" description="203-mm, HE-Concrete Piercing"/>
-        <specific id="4" description="203-mm, HE, OF-43"/>
-        <specific id="5" description="203-mm, HE-RAP"/>
-        <specific id="6" description="203-mm, HE-Frag, Base Bleed"/>
-        <specific id="7" description="203-mm, DPICM, Base Bleed"/>
-      </subcategory>
-      <subcategory id="23" description="220-mm rocket"/>
-      <subcategory id="24" description="240 mm (mortar)">
-        <specific id="1" description="F-864 HE bomb"/>
-      </subcategory>
-      <subcategory id="25" description="240-mm rocket"/>
-      <subcategory id="26" description="250-mm rocket"/>
-      <subcategory id="27" description="400-mm rocket"/>
-      <subcategory id="28" description="550-mm rocket"/>
-      <subcategory id="29" description="600-mm rocket"/>
-      <subcategory id="30" description="850-mm missile"/>
-      <subcategory id="31" description="1100-mm missile"/>
-      <subcategory id="32" description="250 SHN HE (parachute-retarded)"/>
-      <subcategory id="33" description="500 SH HE (parachute-retarded)"/>
-      <subcategory id="34" description="BETAB-150DS HE concrete-piercing"/>
-      <subcategory id="35" description="OF-841A HE fragmentation bomb"/>
-      <subcategory id="36" description="81mm smoke grenade"/>
-      <subcategory id="37" description="Frog-7"/>
-      <subcategory id="38" description="57 mm rocket">
-        <specific id="1" description="S5"/>
-      </subcategory>
-      <subcategory id="39" description="73mm">
-        <specific id="1" description="HE FRAG"/>
-      </subcategory>
-      <subcategory id="40" description="80mm rocket">
-        <specific id="1" description="S8"/>
-      </subcategory>
-      <subcategory id="41" description="8/mm grenade">
-        <specific id="1" description="RP"/>
-      </subcategory>
-      <subcategory id="42" description="115mm">
-        <specific id="1" description="HE FRAG"/>
-      </subcategory>
-      <subcategory id="43" description="120mm (gun/mortar)">
-        <specific id="1" description="Incendiary"/>
-        <specific id="2" description="HE FRAG"/>
-        <specific id="3" description="Illumination"/>
-        <specific id="4" description="WP"/>
-        <specific id="5" description="HE-Frag-RAP"/>
-        <specific id="6" description="HE-Frag-Laser Guided"/>
-      </subcategory>
-      <subcategory id="44" description="MCLC"/>
-      <subcategory id="45" description="300-mm rocket">
-        <specific id="1" description="9M5K1 rocket"/>
-      </subcategory>
-      <subcategory id="46" description="200-mm rocket"/>
-      <subcategory id="47" description="30mm autocannon ammunition">
-        <specific id="1" description="30mm HE-Frag"/>
-      </subcategory>
-      <subcategory id="48" description="40mm">
-        <specific id="1" description="40mm VOG-25"/>
-        <specific id="2" description="40mm VOG-25P"/>
-      </subcategory>
-      <subcategory id="49" description="Flame weapons">
-        <specific id="1" description="Rocket, incendiary, 93mm (RPO)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="222">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="SS-N-5 Sark"/>
-      <subcategory id="2" description="SS-N-6 Serb">
-        <specific id="1" description="SS-N-6"/>
-        <specific id="2" description="SS-N-6 Mod 1"/>
-        <specific id="3" description="SS-N-6 Mod 2"/>
-      </subcategory>
-      <subcategory id="3" description="SS-N-8 Sawfly"/>
-      <subcategory id="4" description="SS-N-17 Snipe"/>
-      <subcategory id="5" description="SS-N-18 Stingray"/>
-      <subcategory id="6" description="SS-N-20 Sturgeon"/>
-      <subcategory id="7" description="SS-N-23 Skiff"/>
-      <subcategory id="8" description="SS-N-21 Sampson"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="AS-15 Kent">
-        <specific id="1" description="AS-15A (Tu-95 Bear-H) w/nuclear warhead"/>
-        <specific id="2" description="AS-15B (Tu-160 Blackjack) w/nuclear warhead"/>
-      </subcategory>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="SS-11 Sego"/>
-      <subcategory id="15" description="SS-13 Savage"/>
-      <subcategory id="16" description="SS-16 Sinner"/>
-      <subcategory id="17" description="SS-17 Spanker"/>
-      <subcategory id="18" description="SS-18 Satan"/>
-      <subcategory id="19" description="SS-19 Stiletto"/>
-      <subcategory id="20" description="SS-20 Saber"/>
-      <subcategory id="21" description="SS-24 Scapel"/>
-      <subcategory id="22" description="SS-25 Sickle">
-        <specific id="1" description="RS-12m (Topol)"/>
-        <specific id="2" description="RS-12 M1 (Topol-M)"/>
-        <specific id="3" description="RS-12 M2 (Topol-M, silo based)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="222">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="SCUD-B"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Rapier Mk 1"/>
-      <subcategory id="3" description="Rapier Mk 2">
-        <specific id="1" description="Rapier Mk 2A (impact fuze)"/>
-        <specific id="2" description="Rapier Mk 2B (proximity fuze)"/>
-      </subcategory>
-      <subcategory id="4" description="Seacat/Tigercat"/>
-      <subcategory id="5" description="Blowpipe"/>
-      <subcategory id="6" description="Javelin"/>
-      <subcategory id="7" description="Star Streak"/>
-      <subcategory id="8" description="Sea Dart">
-        <specific id="1" description="GWS 30"/>
-      </subcategory>
-      <subcategory id="9" description="Sea Wolf">
-        <specific id="1" description="GWS 25"/>
-        <specific id="2" description="GWS 26 Mod 1"/>
-      </subcategory>
-      <subcategory id="10" description="Sky Flash"/>
-      <subcategory id="11" description="ASRAAM"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Milan missile"/>
-      <subcategory id="2" description="Swingfire missile"/>
-      <subcategory id="3" description="Merlin"/>
-      <subcategory id="4" description="FI TOW"/>
-      <subcategory id="5" description="Trigat"/>
-      <subcategory id="6" description="LAW 80"/>
-      <subcategory id="7" description="SWAARM"/>
-      <subcategory id="8" description="Wolverine"/>
-      <subcategory id="9" description="Brimstone"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="30mm RARDEN APDS"/>
-      <subcategory id="2" description="120mm APFSDS-T (L23A1)"/>
-      <subcategory id="3" description="120mm HESH- T(L31)"/>
-      <subcategory id="4" description="27mm Mauser HE"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Decoys">
-        <specific id="1" description="Towed radar decoy"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="ALARM"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Vosper Thorny Croft Excalibur Coast Defense Missile System"/>
-      <subcategory id="2" description="Sea Eagle"/>
-      <subcategory id="3" description="Sea Eagle SL"/>
-      <subcategory id="4" description="Sea Skua"/>
-      <subcategory id="5" description="Martel"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Tigerfish torpedo"/>
-      <subcategory id="2" description="Spear Fish torpedo"/>
-      <subcategory id="3" description="Sting Ray torpedo"/>
-      <subcategory id="4" description="Mk 24 torpedo"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="224">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="7.62 mm"/>
-      <subcategory id="2" description="9.0 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Storm-Shadow"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="51 mm"/>
-      <subcategory id="2" description="89 mm"/>
-      <subcategory id="3" description="105 mm"/>
-      <subcategory id="4" description="155 mm"/>
-      <subcategory id="5" description="175 mm"/>
-      <subcategory id="6" description="30 mm RARDEN HE"/>
-      <subcategory id="7" description="120 mm smoke WP (L34)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="224">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="A-3TK Polaris"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Aster 15"/>
-      <subcategory id="2" description="Aster 30"/>
-      <subcategory id="3" description="Crotale">
-        <specific id="1" description="Crotale R440 missile"/>
-        <specific id="2" description="VT-1 (Crotale NG) missile"/>
-      </subcategory>
-      <subcategory id="4" description="Roland"/>
-      <subcategory id="5" description="Mistral"/>
-      <subcategory id="6" description="Masurca"/>
-      <subcategory id="7" description="Mica Missile">
-        <specific id="1" description="Radar"/>
-        <specific id="2" description="IR"/>
-      </subcategory>
-      <subcategory id="8" description="R530"/>
-      <subcategory id="9" description="R-550 Magic">
-        <specific id="1" description="R-550 Magic 1"/>
-        <specific id="2" description="R-550 Magic 2"/>
-      </subcategory>
-      <subcategory id="10" description="Super 530">
-        <specific id="1" description="Super 530F"/>
-        <specific id="2" description="Super 530D"/>
-      </subcategory>
-      <subcategory id="11" description="Shahine R460 missile"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="20 mm"/>
-      <subcategory id="2" description="25 mm"/>
-      <subcategory id="3" description="30 mm"/>
-      <subcategory id="9" description="90"/>
-      <subcategory id="30" description=".50 Cal."/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="SS-11/AS-11"/>
-      <subcategory id="2" description="Eryx missile"/>
-      <subcategory id="3" description="HOT missile"/>
-      <subcategory id="4" description="Milan missile"/>
-      <subcategory id="5" description="ACL-STRIM"/>
-      <subcategory id="6" description="Entac"/>
-      <subcategory id="7" description="AS-15">
-        <specific id="1" description="AS-15 TT"/>
-      </subcategory>
-      <subcategory id="8" description="BAT 120 anti-armor bomb"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="8 in."/>
-      <subcategory id="3" description="20 mm"/>
-      <subcategory id="4" description="25 mm"/>
-      <subcategory id="5" description="30 mm"/>
-      <subcategory id="6" description="60 mm"/>
-      <subcategory id="7" description="68 mm"/>
-      <subcategory id="8" description="74 mm"/>
-      <subcategory id="9" description="90 mm"/>
-      <subcategory id="10" description="105 mm"/>
-      <subcategory id="11" description="106 mm"/>
-      <subcategory id="12" description="120 mm"/>
-      <subcategory id="13" description="155 mm"/>
-      <subcategory id="14" description="175 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Decoys"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Armat"/>
-      <subcategory id="2" description="AS 37 Martel"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Exocet">
-        <specific id="1" description="MM-38"/>
-        <specific id="2" description="AM-39"/>
-        <specific id="3" description="SM-39 Exocet"/>
-        <specific id="4" description="MM-40"/>
-      </subcategory>
-      <subcategory id="2" description="AS-11"/>
-      <subcategory id="3" description="SS-12M"/>
-      <subcategory id="4" description="AS-15"/>
-      <subcategory id="5" description="AS-30"/>
-      <subcategory id="6" description="AS-37 Martel"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="Otomat">
-        <specific id="1" description="Mk1"/>
-        <specific id="2" description="Mk2"/>
-      </subcategory>
-      <subcategory id="9" description="E-14 torpedo"/>
-      <subcategory id="10" description="E-15 torpedo"/>
-      <subcategory id="11" description="F-17 torpedo">
-        <specific id="1" description="F-17 mod 2"/>
-      </subcategory>
-      <subcategory id="12" description="L-5 torpedo">
-        <specific id="1" description="L-5 mod 3"/>
-        <specific id="2" description="L-5 mod 5"/>
-      </subcategory>
-      <subcategory id="13" description="Z-16 torpedo"/>
-      <subcategory id="14" description="AS-12"/>
-      <subcategory id="15" description="MU-90 Torpedo"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="20 mm"/>
-      <subcategory id="2" description="25 mm"/>
-      <subcategory id="3" description="30 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Malafon"/>
-      <subcategory id="2" description="E-14 torpedo"/>
-      <subcategory id="3" description="E-15 torpedo"/>
-      <subcategory id="4" description="F-17 torpedo"/>
-      <subcategory id="5" description="L3 torpedo"/>
-      <subcategory id="6" description="L4 torpedo"/>
-      <subcategory id="7" description="L5 torpedo"/>
-      <subcategory id="8" description="Murene torpedo"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="71">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description=".22 cal. Long Rifle"/>
-      <subcategory id="2" description=".30-06"/>
-      <subcategory id="3" description=".380 cal."/>
-      <subcategory id="4" description=".38"/>
-      <subcategory id="5" description=".45 cal."/>
-      <subcategory id="6" description=".50 cal."/>
-      <subcategory id="7" description="5.56 mm"/>
-      <subcategory id="8" description="6.35 mm"/>
-      <subcategory id="9" description="7.5 mm"/>
-      <subcategory id="10" description="7.62 mm"/>
-      <subcategory id="11" description="7.65 mm"/>
-      <subcategory id="12" description="8 mm"/>
-      <subcategory id="13" description="9 mm"/>
-      <subcategory id="14" description="20 mm"/>
-      <subcategory id="15" description="25 mm"/>
-      <subcategory id="16" description="30 mm"/>
-      <subcategory id="17" description="60 mm"/>
-      <subcategory id="18" description="68 mm"/>
-      <subcategory id="19" description="81 mm"/>
-      <subcategory id="20" description="90 mm"/>
-      <subcategory id="21" description="120 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Hades missile"/>
-      <subcategory id="2" description="Pluton missile"/>
-      <subcategory id="3" description="AS 30L (laser guided)"/>
-      <subcategory id="4" description="ASMP"/>
-      <subcategory id="5" description="Excalibur MP 22 bomb"/>
-      <subcategory id="6" description="Matra laser-guided bomb (LGB)"/>
-      <subcategory id="7" description="French Apache GLCM"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description=".50 Cal."/>
-      <subcategory id="2" description="20 mm"/>
-      <subcategory id="3" description="25 mm"/>
-      <subcategory id="4" description="30 mm"/>
-      <subcategory id="5" description="58 mm"/>
-      <subcategory id="6" description="74 mm"/>
-      <subcategory id="7" description="90 mm"/>
-      <subcategory id="8" description="105 mm"/>
-      <subcategory id="9" description="106 mm"/>
-      <subcategory id="10" description="155 mm"/>
-      <subcategory id="11" description="175 mm"/>
-      <subcategory id="12" description="8 in."/>
-      <subcategory id="13" description="120mm Mortar Ammunition">
-        <specific id="1" description="120mm FRAG-HE, PR14"/>
-        <specific id="2" description="120mm HE-RA, PRPA"/>
-      </subcategory>
-      <subcategory id="50" description="BAP 100-mm airfield attack bomb"/>
-      <subcategory id="51" description="BLG 66 Belouga bomb"/>
-      <subcategory id="52" description="BM 400 bomb"/>
-      <subcategory id="53" description="CASCAD Mk 1"/>
-      <subcategory id="54" description="CASCAD Mk 2"/>
-      <subcategory id="55" description="CH-TABO Pod"/>
-      <subcategory id="56" description="Durandal penetration bomb"/>
-      <subcategory id="57" description="LU 250 EG-FT bomb"/>
-      <subcategory id="58" description="SAMP BL 61 125-kg fragmentation bomb"/>
-      <subcategory id="59" description="SAMP BL 70 400-kg fragmentation bomb"/>
-      <subcategory id="60" description="SAMP BL 99 450-kg bomb"/>
-      <subcategory id="61" description="SAMP BL EU4 1000-kg bomb"/>
-      <subcategory id="62" description="T 15 SAMP fragmentation bomb"/>
-      <subcategory id="63" description="BL 8 SAMP fragmentation bomb"/>
-      <subcategory id="64" description="BL 9 SAMP fragmentation bomb"/>
-      <subcategory id="65" description="BL 18 SAMP fragmentation bomb"/>
-      <subcategory id="66" description="SAMP GP bomb family"/>
-      <subcategory id="67" description="SAMP 81 AF 125-kg bomb"/>
-      <subcategory id="68" description="TBA retarded 125-kg close-support bomb"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="71">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="SSBS Type S-30D/TN-61"/>
-      <subcategory id="2" description="SSBS Type S-4(SX)"/>
-      <subcategory id="3" description="SLBM M-20"/>
-      <subcategory id="4" description="SLBM M-4"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="78">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Roland">
-        <specific id="1" description="Roland 1"/>
-        <specific id="2" description="Roland 2"/>
-        <specific id="3" description="Roland 3"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="20 mm"/>
-      <subcategory id="2" description="35 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="78">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Milan missile"/>
-      <subcategory id="2" description="HOT missile"/>
-      <subcategory id="3" description="TOW missile"/>
-      <subcategory id="4" description="Pars 3 missile"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="110-mm rocket"/>
-      <subcategory id="2" description="105-mm APDS-T"/>
-      <subcategory id="3" description="105-mm APFSDS-T"/>
-      <subcategory id="4" description="105-mm HEAT-T"/>
-      <subcategory id="5" description="120-mm HEAT-MP-T DM12"/>
-      <subcategory id="6" description="120-mm APFSDS-T DM13"/>
-      <subcategory id="7" description="120-mm APFSDS-T DM23"/>
-      <subcategory id="8" description="120-mm APFSDS-T DM33"/>
-      <subcategory id="9" description="110mm">
-        <specific id="1" description="110mm Tandem HEAT, 3-T for PzFst-3"/>
-        <specific id="2" description="110mm HEAT, PZF-3"/>
-        <specific id="3" description="110mm SAL-H"/>
-      </subcategory>
-      <subcategory id="10" description="Armbrust 67mm HEAT rocket"/>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="Anti-tank mine">
-        <specific id="1" description="MIFF"/>
-        <specific id="2" description="KB44"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="78">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Kormoran"/>
-      <subcategory id="2" description="AEG Seeal 533 mm Torpedo"/>
-      <subcategory id="3" description="SST-3 Torpedo"/>
-      <subcategory id="4" description="SST-4 Torpedo"/>
-      <subcategory id="5" description="DM2A1 Seal Torpedo"/>
-      <subcategory id="6" description="DM2A3 Seehecht Torpedo"/>
-      <subcategory id="7" description="SUT Torpedo"/>
-      <subcategory id="8" description="G7e Torpedo"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="78">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="AEG Seeschlange 533 mm Torpedo"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="78">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="5.56 mm"/>
-      <subcategory id="2" description="7.62 mm"/>
-      <subcategory id="3" description="9 mm"/>
-    </category>
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="Mine"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="78">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Parachute signal rocket, white"/>
-      <subcategory id="2" description="Taurus"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="20 mm"/>
-      <subcategory id="2" description="35 mm"/>
-      <subcategory id="3" description="73 mm"/>
-      <subcategory id="4" description="105 mm"/>
-      <subcategory id="5" description="120 mm">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="APFSDS-P"/>
-        <specific id="3" description="TRCSDS-T"/>
-        <specific id="4" description="SABOT"/>
-        <specific id="5" description="Heat (MZ)"/>
-      </subcategory>
-      <subcategory id="6" description="110 mm">
-        <specific id="1" description="110mm HE-Frag, MZ-110"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="102">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="Al Abbas"/>
-      <subcategory id="2" description="Al Hussein"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="102">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="FAW 70"/>
-      <subcategory id="2" description="FAW 150"/>
-      <subcategory id="3" description="FAW 200"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="105">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Shafrir 2"/>
-      <subcategory id="2" description="Python III"/>
-      <subcategory id="3" description="Python IV"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="105">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="TOW (Ramata) M-113"/>
-      <subcategory id="2" description="Picket 81 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="105">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Surface to Air">
-        <specific id="1" description="Barak"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="105">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Gabriel">
-        <specific id="1" description="Gabriel I"/>
-        <specific id="2" description="Gabriel II"/>
-        <specific id="3" description="Gabriel III (Mod)"/>
-        <specific id="4" description="Gabriel Mk 4 LR"/>
-      </subcategory>
-      <subcategory id="2" description="LUZ"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="105">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="Jericho 2"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="HQ-2 (CSA-1)">
-        <specific id="1" description="HQ-2"/>
-        <specific id="2" description="HQ-2J"/>
-        <specific id="3" description="HQ-2B"/>
-      </subcategory>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="HQ-61 SAM"/>
-      <subcategory id="4" description="HN-5 (SA-7 type)">
-        <specific id="1" description="HN-5"/>
-        <specific id="2" description="HN-5A"/>
-      </subcategory>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="PL-2 ATOLL type">
-        <specific id="1" description="PL-2"/>
-        <specific id="2" description="PL-2A"/>
-      </subcategory>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="PL-5B ATOLL Type"/>
-      <subcategory id="11" description="PL-7"/>
-      <subcategory id="12" description="PL-9"/>
-      <subcategory id="13" description="PL-8 (python-III type)"/>
-      <subcategory id="14" description="PL-4 (Aspide type)"/>
-      <subcategory id="15" description="LY-60">
-        <specific id="1" description="LY-60N"/>
-      </subcategory>
-      <subcategory id="16" description="FM-80 / HQ-7 (Crotale type)"/>
-      <subcategory id="17" description="QW-1 Vanguard"/>
-      <subcategory id="18" description="PL-11"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="12.7 mm Type 54">
-        <specific id="1" description="API"/>
-        <specific id="2" description="API-T"/>
-      </subcategory>
-      <subcategory id="2" description="14.5 mm Type 56">
-        <specific id="1" description="API"/>
-        <specific id="2" description="API-T"/>
-        <specific id="3" description="Incendiary"/>
-      </subcategory>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="57 mm"/>
-      <subcategory id="5" description="85 mm"/>
-      <subcategory id="6" description="100 mm"/>
-      <subcategory id="7" description="37 mm Type 55">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="HE-T"/>
-        <specific id="3" description="APHE"/>
-        <specific id="4" description="AP-T"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="HJ-7S (Sagger type)"/>
-      <subcategory id="2" description="HJ-8 (TOW/Milan type)"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="57 mm type 55"/>
-      <subcategory id="2" description="76 mm type 54"/>
-      <subcategory id="3" description="100 mm">
-        <specific id="1" description="HE Type 73"/>
-        <specific id="2" description="HEAT Type 73"/>
-        <specific id="3" description="APDS Type 73"/>
-        <specific id="4" description="APFSDS Type 73"/>
-        <specific id="5" description="APFSDS Type 86"/>
-        <specific id="6" description="APFSDS-T Type AP100-2"/>
-        <specific id="7" description="APFSDS-T (for Type 59 MBT)"/>
-        <specific id="8" description="HE (for Type 69 MBT)"/>
-        <specific id="9" description="HEAT (for Type 69 MBT)"/>
-        <specific id="10" description="APHE (for Type 69 MBT)"/>
-        <specific id="11" description="APFSDS (for Type 69 MBT)"/>
-        <specific id="12" description="HVAPDS (for Type 69 MBT)"/>
-      </subcategory>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="105 mm">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="HESH"/>
-        <specific id="3" description="HEAT"/>
-        <specific id="4" description="HEAT-T"/>
-        <specific id="5" description="APDS"/>
-        <specific id="6" description="APFSDS"/>
-        <specific id="7" description="APFSDS-T"/>
-        <specific id="8" description="Type 75"/>
-      </subcategory>
-      <subcategory id="6" description="82 mm Type 65 (recoilless rifle)"/>
-      <subcategory id="7" description="85 mm Type 56 ATG">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="HEAT-FS"/>
-        <specific id="3" description="HESH"/>
-      </subcategory>
-      <subcategory id="8" description="90 mm Type 51"/>
-      <subcategory id="9" description="35mm Grenade Launcher Ammunition">
-        <specific id="1" description="Grenade, 35mm, HEAT"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="YJ-1/C-801/CSS-N-4 Sardine (Exocet type)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="CSS-N-2 (HY-2 Styx derivative Silkworm)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="SY-1/FL-1">
-        <specific id="1" description="CSSC-1B mod 1/2 Coastal Defense missile"/>
-        <specific id="2" description="CSS-N-1 Scrubbrush mod 1/2"/>
-      </subcategory>
-      <subcategory id="8" description="HY-1">
-        <specific id="1" description="HY-1/CSSC-2A Silkworm"/>
-        <specific id="2" description="HY-1A/CSSC-2B Silkworm"/>
-        <specific id="3" description="CSS-N-2 Safflower"/>
-      </subcategory>
-      <subcategory id="9" description="HY-2/CSSC-3">
-        <specific id="1" description="HY-2A/CSSC-3A"/>
-        <specific id="2" description="HY-2G/CSSC-3B"/>
-        <specific id="3" description="HY-2B/CSSC-3C"/>
-        <specific id="4" description="C-601/CAS-1 Kraken"/>
-      </subcategory>
-      <subcategory id="10" description="HY-4">
-        <specific id="1" description="HY-4/CSSC-7 Sadsack"/>
-        <specific id="2" description="C-611 (air launched variant)"/>
-      </subcategory>
-      <subcategory id="11" description="YJ-2/C-802/CSS-N-8 Saccade"/>
-      <subcategory id="12" description="CH/SS-N-6/C802(YJ-8A)"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="100 mm Gun"/>
-      <subcategory id="2" description="130 mm Gun"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="CY-1 ASW Msl Torpedo"/>
-      <subcategory id="2" description="Yu-1 Torpedo"/>
-      <subcategory id="3" description="Yu-3 Torpedo"/>
-      <subcategory id="4" description="Yu-4 Torpedo"/>
-      <subcategory id="5" description="Yu-6 Torpedo"/>
-      <subcategory id="6" description="TEST-96 Torpedo"/>
-      <subcategory id="7" description="YU-7 Torpedo"/>
-      <subcategory id="8" description="LE-2 Torpedo"/>
-      <subcategory id="9" description="L-5 Torpedo"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="(deleted)"/>
-      <subcategory id="8" description="(deleted)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="(deleted)"/>
-      <subcategory id="11" description="(deleted)"/>
-      <subcategory id="12" description="(deleted)"/>
-      <subcategory id="13" description="(deleted)"/>
-      <subcategory id="14" description="CSSC-5 (YJ-16/C-101) Saples"/>
-      <subcategory id="15" description="CSSC-6 (HY-3) Sawhorse"/>
-      <subcategory id="16" description="CSSC-7 (HY-4) Sadsack"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="(deleted)"/>
-      <subcategory id="3" description="(deleted)"/>
-      <subcategory id="4" description="(deleted)"/>
-      <subcategory id="5" description="(deleted)"/>
-      <subcategory id="6" description="(deleted)"/>
-      <subcategory id="7" description="7.62 mm"/>
-      <subcategory id="8" description="12.7 mm"/>
-      <subcategory id="9" description="73 mm"/>
-      <subcategory id="10" description="100 mm">
-        <specific id="1" description="Mortar bomb (Type 71)"/>
-      </subcategory>
-      <subcategory id="11" description="107 mm Rocket">
-        <specific id="1" description="HE-Frag"/>
-        <specific id="2" description="Type 63 HEI"/>
-        <specific id="3" description="Type 63-I HEI"/>
-        <specific id="4" description="Type 63-II HE"/>
-        <specific id="5" description="Type 63-III HE"/>
-        <specific id="6" description="Jamming rocket"/>
-      </subcategory>
-      <subcategory id="12" description="120 mm">
-        <specific id="1" description="Mortar bomb (Type 55)"/>
-      </subcategory>
-      <subcategory id="13" description="122 mm">
-        <specific id="1" description="HE Type 54"/>
-        <specific id="2" description="Smoke Type 54"/>
-        <specific id="3" description="Illuminating Type 54"/>
-      </subcategory>
-      <subcategory id="14" description="122 mm Rocket">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="HE-Frag"/>
-        <specific id="3" description="HEI"/>
-        <specific id="4" description="HE Cargo"/>
-        <specific id="5" description="HEI-Frag"/>
-        <specific id="6" description="Minelaying"/>
-        <specific id="7" description="Minelaying Type 84"/>
-      </subcategory>
-      <subcategory id="15" description="130 mm">
-        <specific id="1" description="HE Type 59"/>
-        <specific id="2" description="Illunination Type 59"/>
-        <specific id="3" description="MP-130 RAP"/>
-        <specific id="4" description="ERFB-HE"/>
-      </subcategory>
-      <subcategory id="16" description="130 mm rocket">
-        <specific id="1" description="HE Type 63"/>
-        <specific id="2" description="HE-Frag Type 82"/>
-        <specific id="3" description="HEI Type 82"/>
-        <specific id="4" description="Extended-range HE-Frag"/>
-      </subcategory>
-      <subcategory id="17" description="152 mm">
-        <specific id="1" description="HE Type 66"/>
-        <specific id="2" description="Smoke Type 66"/>
-        <specific id="3" description="Type MP-152 RAP"/>
-        <specific id="4" description="NORINCO Incendiary"/>
-        <specific id="5" description="NORINCO Smoke"/>
-        <specific id="6" description="NORINCO Illuminating"/>
-        <specific id="7" description="HE Type 83"/>
-        <specific id="8" description="NORINCO ERFB-BB"/>
-      </subcategory>
-      <subcategory id="18" description="155 mm">
-        <specific id="1" description="ERFB"/>
-        <specific id="2" description="ERFB-BB"/>
-        <specific id="3" description="ERFB-WP"/>
-        <specific id="4" description="ERFB Illuminating"/>
-      </subcategory>
-      <subcategory id="19" description="160 mm">
-        <specific id="1" description="Mortar bomb type 56"/>
-      </subcategory>
-      <subcategory id="20" description="253 mm">
-        <specific id="1" description="Minesweeping rocket Type 81"/>
-        <specific id="2" description="Minesweeping rocket Type 81-II"/>
-      </subcategory>
-      <subcategory id="21" description="284 mm">
-        <specific id="1" description="Minelaying rocket Type 74"/>
-        <specific id="2" description="Minelaying rocket Type 85"/>
-      </subcategory>
-      <subcategory id="22" description="M-7/CSS-8 (HQ-2 SSM variant)">
-        <specific id="1" description="Booster phase vehicle"/>
-        <specific id="2" description="Jettisoned booster"/>
-        <specific id="3" description="Separated warhead"/>
-      </subcategory>
-      <subcategory id="23" description="35mm Grenade Launcher Ammunition">
-        <specific id="1" description="Grenade, 35mm, HE"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="45">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="CSS-2 (DF-3)"/>
-      <subcategory id="3" description="CSS-3 (DF-4)"/>
-      <subcategory id="4" description="CSS-4 (DF-5)">
-        <specific id="1" description="DF-5"/>
-        <specific id="2" description="DF-5A"/>
-      </subcategory>
-      <subcategory id="5" description="DF-21">
-        <specific id="1" description="Booster phase vehicle"/>
-        <specific id="2" description="(presently not populated)"/>
-        <specific id="3" description="Separated warhead"/>
-        <specific id="4" description="Jettisoned first stage"/>
-        <specific id="5" description="Second stage vehicle"/>
-        <specific id="6" description="Jettisoned second stage"/>
-      </subcategory>
-      <subcategory id="6" description="DF-31"/>
-      <subcategory id="7" description="DF-41"/>
-      <subcategory id="8" description="JL-1 (CSS-N-1)"/>
-      <subcategory id="9" description="(deleted)"/>
-      <subcategory id="10" description="CSS-NX-3"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="45">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="DF-15 (M-9)">
-        <specific id="1" description="Booster phase vehicle"/>
-        <specific id="2" description="(presently not populated)"/>
-        <specific id="3" description="Separated warhead"/>
-        <specific id="4" description="Jettisoned first stage"/>
-        <specific id="5" description="Second stage vehicle"/>
-        <specific id="6" description="Jettisoned second stage"/>
-      </subcategory>
-      <subcategory id="2" description="M-11 / DF-11 / CSS-7">
-        <specific id="1" description="Booster phase vehicle"/>
-        <specific id="2" description="Jettisoned booster"/>
-        <specific id="3" description="Separated warhead"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="119">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="Scud-C (SS-1D)"/>
-      <subcategory id="3" description="(deleted)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="119">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="240 mm rocket"/>
-      <subcategory id="2" description="170mm Koksan round">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="ICM"/>
-        <specific id="3" description="Chem-Bio"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="119">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Taepo Dong I">
-        <specific id="1" description="Booster phase vehicle"/>
-        <specific id="2" description="(presently not populated)"/>
-        <specific id="3" description="Separated warhead"/>
-        <specific id="4" description="Jettisoned first stage"/>
-        <specific id="5" description="Second stage vehicle"/>
-        <specific id="6" description="Jettisoned second stage"/>
-      </subcategory>
-      <subcategory id="2" description="No Dong">
-        <specific id="1" description="Booster phase vehicle"/>
-        <specific id="2" description="Jettisoned booster"/>
-        <specific id="3" description="Separated warhead"/>
-      </subcategory>
-      <subcategory id="3" description="Scud-D">
-        <specific id="1" description="Booster phase vehicle"/>
-        <specific id="2" description="Jettisoned booster"/>
-        <specific id="3" description="Separated warhead"/>
-      </subcategory>
-      <subcategory id="4" description="Taepo Dong II (2-stage version)">
-        <specific id="1" description="Stage 2 and warhead only"/>
-        <specific id="2" description="Separated warhead only"/>
-        <specific id="3" description="Jettisoned booster (first stage)"/>
-        <specific id="4" description="Jettisoned second stage"/>
-      </subcategory>
-      <subcategory id="5" description="Taepo Dong II (3-stage version)">
-        <specific id="1" description="Stage 2, 3 and warhead"/>
-        <specific id="2" description="Stage 3 and warhead"/>
-        <specific id="3" description="Separated warhead"/>
-        <specific id="4" description="Jettisoned booster (first stage)"/>
-        <specific id="5" description="Jettisoned second stage"/>
-        <specific id="6" description="Jettisoned third stage"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="205">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="RBS-70">
-        <specific id="1" description="RBS-70 Mk 1"/>
-        <specific id="2" description="RBS-70 Mk 2"/>
-      </subcategory>
-      <subcategory id="2" description="RBS-15">
-        <specific id="1" description="RBS-15K"/>
-        <specific id="2" description="RBS-15M"/>
-        <specific id="3" description="RBS-15F"/>
-        <specific id="4" description="RBS-15F MK1"/>
-        <specific id="5" description="RBS-15K MK1"/>
-        <specific id="6" description="RBS-15M MK2"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="40 mm">
-        <specific id="1" description="PFHE mk 2"/>
-        <specific id="2" description="3P"/>
-      </subcategory>
-      <subcategory id="2" description="57 mm"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="205">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="40 mm">
-        <specific id="1" description="APFSDS-T"/>
-      </subcategory>
-      <subcategory id="2" description="84mm Carl Gustav rounds">
-        <specific id="1" description="FFV 441B HE"/>
-        <specific id="2" description="FFV 469B Smoke"/>
-        <specific id="3" description="FFV 545 IL"/>
-        <specific id="4" description="FFV 502 HEDP"/>
-        <specific id="5" description="FFV 551 HEAT"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="205">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="40 mm">
-        <specific id="1" description="HE"/>
-        <specific id="2" description="MP-T"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="106">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="(deleted)"/>
-      <subcategory id="2" description="ASPIDE"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="106">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Decoy">
-        <specific id="1" description="BREDA SCLAR 105 mm"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="106">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="OTO Melara Teseo MK 2"/>
-      <subcategory id="2" description="MILAS"/>
-      <subcategory id="3" description="324 mm B-515 Torpedo"/>
-      <subcategory id="4" description="MARTE 2"/>
-      <subcategory id="5" description="Sistel Sea Killer"/>
-    </category>
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="40 mm/70 BREDA"/>
-      <subcategory id="2" description="3 in/62 MMK OTO Melara"/>
-      <subcategory id="3" description="5 in/54 OTO Melara"/>
-      <subcategory id="4" description="25 mm twin"/>
-      <subcategory id="5" description="30 mm twin"/>
-      <subcategory id="6" description="Whitehead K113"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="106">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="324 mm B-515"/>
-      <subcategory id="2" description="Whitehead A290"/>
-      <subcategory id="3" description="Whitehead A184"/>
-      <subcategory id="4" description="Whitehead A-244/s Torpedo"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="110">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Type 89 Torpedo"/>
-      <subcategory id="2" description="SSM-1A/1B (type 88/90)"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="240">
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="TMRP-6 Anti-tank mine"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="0">
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="AN/FO (94% ammonium nitrate, 6% fuel oil)">
-        <specific id="1" description="1 000 lbs. Explosive"/>
-        <specific id="2" description="2 000 lbs. Explosive"/>
-        <specific id="3" description="5 000 lbs. Explosive"/>
-        <specific id="4" description="10 000 lbs. Explosive"/>
-        <specific id="5" description="15 000 lbs. Explosive"/>
-        <specific id="6" description="20 000 lbs. Explosive"/>
-        <specific id="7" description="25 000 lbs. Explosive"/>
-        <specific id="8" description="30 000 lbs. Explosive"/>
-        <specific id="9" description="35 000 lbs. Explosive"/>
-        <specific id="10" description="40 000 lbs. Explosive"/>
-        <specific id="11" description="45 000 lbs. Explosive"/>
-        <specific id="12" description="50 000 lbs. Explosive"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="101">
-    <category id="3" description="Fixed">
-      <subcategory id="1" description="SADAF-02 mine"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="101">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Shahab 4"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="101">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="Shahab 3">
-        <specific id="1" description="Boost phase vehicle"/>
-        <specific id="2" description="Jettisoned booster"/>
-        <specific id="3" description="Separated warhead"/>
-      </subcategory>
-      <subcategory id="2" description="Iran 170"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="206">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="35 mm">
-        <specific id="1" description="HEI-T"/>
-        <specific id="2" description="SAPHEI-T"/>
-        <specific id="3" description="FAPDS"/>
-        <specific id="4" description="AHEAD"/>
-        <specific id="5" description="HEI"/>
-        <specific id="6" description="HEI-BF"/>
-        <specific id="7" description="TP-T"/>
-        <specific id="8" description="APDS-T"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="99">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Agni"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="99">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="Prithvi"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="99">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Trishul"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="165">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="Hatf-1"/>
-      <subcategory id="2" description="Hatf-2"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="165">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="Hatf-3"/>
-      <subcategory id="2" description="Ghauri"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="208">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Sky Bow II / Tien Kung II"/>
-      <subcategory id="2" description="Tien Chien II / Sky Sword II"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="208">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Hsiung-Feng II"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="39">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="70 mm(2.75in)">
-        <specific id="1" description="CRV7 WTU-5001/B: Practice"/>
-        <specific id="2" description="CRV7 WTU-5001 A/B: Hardened Rod Practice"/>
-        <specific id="3" description="CRV7 WAU-5001/B KEP: Kinetic Energy Penetrator"/>
-        <specific id="4" description="CRV7 WDU-500X/B GPF: General Purpose Flechette"/>
-        <specific id="5" description="CRV7 WDU-5002/B FAT: Flechette Anti-Tank"/>
-        <specific id="6" description="CRV7 RA-70 HEISAP: High Explosive Incendiary Semi-Armor Piercing"/>
-        <specific id="7" description="CRV7 WDU-5001/B PHEI: Penetrator High Explosive Incendiary"/>
-        <specific id="8" description="CRV7 M151 HEPD: High/Explosive Point Detonating"/>
-        <specific id="9" description="CRV7 M156: SMOKE (White Phosphorus)"/>
-        <specific id="10" description="CRV7 M257 (M442 Fuze): Illumination"/>
-        <specific id="11" description="CRV7 M261 HE MPSM: High Explosive Multipurpose Submunition"/>
-        <specific id="12" description="CRV7 M267 PRACTICE MPSM: Practice Multipurpose Submunition"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="163">
-    <category id="1" description="Guided">
-      <subcategory id="1" description="Penguin MK 2"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="29">
-    <category id="2" description="Ballistic">
-      <subcategory id="1" description="Rocket ASTROS">
-        <specific id="1" description="127 mm SS-30">
-          <extra id="1" description="HE Frag"/>
-        </specific>
-        <specific id="2" description="180 mm SS-40">
-          <extra id="1" description="HE Frag"/>
-          <extra id="2" description="HE Incendiary"/>
-          <extra id="3" description="DPICM"/>
-          <extra id="4" description="Mine Anti-tank"/>
-          <extra id="5" description="Mine Anti-personnel"/>
-          <extra id="6" description="Runway Denial"/>
-        </specific>
-        <specific id="3" description="3 mm SS-60">
-          <extra id="1" description="HE Frag"/>
-          <extra id="2" description="HE Incendiary"/>
-          <extra id="3" description="DPICM"/>
-          <extra id="4" description="Mine Anti-tank"/>
-          <extra id="5" description="Mine Anti-personnel"/>
-          <extra id="6" description="Runway Denial"/>
-        </specific>
-        <specific id="4" description="3 mm SS-80">
-          <extra id="1" description="HE Frag"/>
-          <extra id="2" description="HE Incendiary"/>
-          <extra id="3" description="DPICM"/>
-          <extra id="4" description="Mine Anti-tank"/>
-          <extra id="5" description="Mine Anti-personnel"/>
-          <extra id="6" description="Runway Denial"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="0" country="0">
-    <category id="0" description="Other"/>
-  </entity>
-  <entity kind="3" domain="1" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Dismounted Infantry (with)">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
-        <specific id="1" id2="100" description="Number of individuals"/>
-        <specific id="101" description="Fire Team"/>
-        <specific id="102" description="Squad"/>
-        <specific id="103" description="Platoon"/>
-        <specific id="104" description="Company"/>
-        <specific id="105" description="Battalion"/>
-        <specific id="106" description="Regiment"/>
-        <specific id="107" description="Division"/>
-        <specific id="108" description="Corps"/>
-        <specific id="109" description="Army"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Dismounted Infantry (non-visible)">
-      <subcategory id="0" description="Other-Observation Post"/>
-    </category>
-    <category id="3" description="Civilian, unarmed">
-      <subcategory id="1" description="Civilian, non government">
-        <specific id="1" description="Contractor"/>
-        <specific id="2" description="Media"/>
-      </subcategory>
-      <subcategory id="2" description="Local Officials">
-        <specific id="1" description="Mayor"/>
-        <specific id="2" description="Policeman."/>
-        <specific id="3" description="Police Chief"/>
-        <specific id="4" description="VIP"/>
-        <specific id="5" description="Religious Leader."/>
-      </subcategory>
-    </category>
-    <category id="4" description="Civilian, w/weapons">
-      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat"/>
-    </category>
-    <category id="5" description="Animal">
-      <subcategory id="1" description="Domesticated Animal">
-        <specific id="1" description="Dog"/>
-        <specific id="2" description="Cat"/>
-        <specific id="3" description="Cow"/>
-        <specific id="4" description="Horse"/>
-        <specific id="5" description="Camel"/>
-      </subcategory>
-      <subcategory id="2" description="Wild Animal">
-        <specific id="1" description="Canine"/>
-        <specific id="2" description="Feline"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="2" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Parachutist (with)">
-      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
-        <specific id="1" id2="100" description="Number of individuals"/>
-        <specific id="101" description="Fire Team"/>
-        <specific id="102" description="Squad"/>
-        <specific id="103" description="Platoon"/>
-        <specific id="104" description="Company"/>
-        <specific id="105" description="Battalion"/>
-        <specific id="106" description="Regiment"/>
-        <specific id="107" description="Division"/>
-        <specific id="108" description="Corps"/>
-        <specific id="109" description="Army"/>
-      </subcategory>
-    </category>
-    <category id="2" description="A bird"/>
-    <category id="3" description="Flock of birds">
-      <subcategory id="0" description="Unspecified size">
-        <specific id="1" description="Number of individuals"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="3" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Swimmer (with)">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
-        <specific id="1" id2="100" description="Number of individuals"/>
-        <specific id="101" description="Fire Team"/>
-        <specific id="102" description="Squad"/>
-        <specific id="103" description="Platoon"/>
-        <specific id="104" description="Company"/>
-        <specific id="105" description="Battalion"/>
-        <specific id="106" description="Regiment"/>
-        <specific id="107" description="Division"/>
-        <specific id="108" description="Corps"/>
-        <specific id="109" description="Army"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Occupied life raft">
-      <subcategory id="0" description="Unused">
-        <specific id="1" id2="100" description="Number of individuals"/>
-        <specific id="101" description="Fire Team"/>
-        <specific id="102" description="Squad"/>
-        <specific id="103" description="Platoon"/>
-        <specific id="104" description="Company"/>
-        <specific id="105" description="Battalion"/>
-        <specific id="106" description="Regiment"/>
-        <specific id="107" description="Division"/>
-        <specific id="108" description="Corps"/>
-        <specific id="109" description="Army"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="4" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Diver (with)">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
-        <specific id="1" id2="100" description="Number of individuals"/>
-      </subcategory>
-    </category>
-    <category id="2" description="School of Fish">
-      <subcategory id="0" description="Unspecified size">
-        <specific id="1" id2="100" description="Number of individuals"/>
-      </subcategory>
-    </category>
-    <category id="3" description="School of Shrimp">
-      <subcategory id="0" description="Unspecified size">
-        <specific id="1" id2="100" description="Number of individuals"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Whale"/>
-  </entity>
-  <entity kind="3" domain="5" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Astronaut (with)">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
-        <specific id="1" description="Number of individuals"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="4" domain="1" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Radar collected noise"/>
-  </entity>
-  <entity kind="4" domain="2" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Smoke"/>
-    <category id="2" description="Fog"/>
-    <category id="3" description="Cloud"/>
-    <category id="4" description="Cloud With Rain Falling"/>
-    <category id="5" description="Cloud With Snow Falling"/>
-    <category id="6" description="Haze"/>
-    <category id="7" description="Dust/Sandstorm"/>
-    <category id="8" description="Cloud with sleet falling"/>
-  </entity>
-  <entity kind="4" domain="3" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Sea State"/>
-    <category id="2" description="Oil Slick"/>
-    <category id="3" description="Ice"/>
-    <category id="4" description="Debris"/>
-    <category id="5" description="Surf Noise"/>
-    <category id="6" description="Island"/>
-  </entity>
-  <entity kind="4" domain="4" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Sound Velocity Profile"/>
-    <category id="2" description="Ice Berg"/>
-    <category id="3" description="Current Profile"/>
-    <category id="4" description="Biologics">
-      <subcategory id="0" description="Bioluminescence"/>
-    </category>
-    <category id="5" description="Transmissivity profile"/>
-    <category id="6" description="Ice Merchant"/>
-    <category id="7" description="Kelp Bed"/>
-    <category id="8" description="Knuckle"/>
-    <category id="9" description="Debris/Clutter"/>
-  </entity>
-  <entity kind="4" domain="5" country="0">
-    <category id="0" description="Unused"/>
-  </entity>
-  <entity kind="5" domain="1" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Bridge">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Concrete, two-lane"/>
-      <subcategory id="2" description="Concrete, four-lane"/>
-      <subcategory id="3" description="Truss, two-lane"/>
-      <subcategory id="4" description="Truss, four-lane"/>
-      <subcategory id="5" description="Suspension, two-lane"/>
-      <subcategory id="6" description="Suspension, four-lane"/>
-    </category>
-    <category id="2" description="Building">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="One-story">
-        <specific id="1" description="Trapezoidal Aircraft Shelter (Trihangar)"/>
-        <specific id="2" description="Curvilinear Aircraft Shelter"/>
-        <specific id="3" description="Bermed Storage Bunker"/>
-        <specific id="4" description="Hardened Curvilinear Munitions Bunker"/>
-      </subcategory>
-      <subcategory id="2" description="Two-story"/>
-      <subcategory id="3" description="Three-story"/>
-      <subcategory id="4" description="Four-story"/>
-      <subcategory id="5" description="Five story"/>
-      <subcategory id="6" description="Six story"/>
-      <subcategory id="7" description="Seven story"/>
-      <subcategory id="8" description="Eight story"/>
-      <subcategory id="9" description="Nine story"/>
-      <subcategory id="10" description="Ten story"/>
-    </category>
-    <category id="3" description="Tracks">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Tank"/>
-    </category>
-    <category id="4" description="Crater"/>
-    <category id="5" description="Obstacle">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Ditch"/>
-      <subcategory id="2" description="Tank ditch, 100x4 M"/>
-      <subcategory id="3" description="Tank ditch, 200x4 M"/>
-      <subcategory id="4" description="Tank ditch, 300x4 M"/>
-      <subcategory id="5" description="Abatis, 8-tree"/>
-      <subcategory id="6" description="Concertina fence, 3-roll"/>
-      <subcategory id="7" description="Log crib, rectangular"/>
-      <subcategory id="8" description="Ammo prestock"/>
-      <subcategory id="9" description="Fuel prestock"/>
-      <subcategory id="10" description="Minefield, hasty, 0-300 M"/>
-      <subcategory id="11" description="Minefield, prepared, 0-500 M"/>
-      <subcategory id="12" description="Minefield, scatterable oval"/>
-      <subcategory id="13" description="Barbed wire"/>
-      <subcategory id="14" description="Dragon's teeth"/>
-      <subcategory id="15" description="Jersey Barrier"/>
-    </category>
-    <category id="6" description="Flags/markers">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Breached lane"/>
-      <subcategory id="2" description="Minefield"/>
-    </category>
-    <category id="7" description="Prepared positions">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Armored, hull defilade"/>
-      <subcategory id="2" description="Fighting, hull defilade"/>
-      <subcategory id="3" description="Mortar carrier, hull defilade"/>
-      <subcategory id="4" description="Tank, hull defilade"/>
-      <subcategory id="5" description="Infantry fighting"/>
-      <subcategory id="6" description="Machine gun"/>
-      <subcategory id="7" description="Covered machine gun bunker"/>
-      <subcategory id="8" description="Overhead covered infantry"/>
-      <subcategory id="9" description="Forward Area Re-arming Point (FARD)"/>
-    </category>
-    <category id="8" description="Underground facility">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Single level"/>
-      <subcategory id="2" description="Two levels"/>
-      <subcategory id="3" description="Three levels"/>
-    </category>
-    <category id="9" description="SSM Site">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Fixed"/>
-      <subcategory id="2" description="Towed"/>
-      <subcategory id="3" description="Self-propelled"/>
-    </category>
-    <category id="10" description="Runway">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="5m x 150m"/>
-    </category>
-    <category id="11" description="SAM Site">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Fixed"/>
-      <subcategory id="2" description="Towed"/>
-      <subcategory id="3" description="Self-propelled"/>
-    </category>
-    <category id="12" description="Nuclear Power Plant">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Pressurized Water Reactor">
-        <specific id="1" description="One Reactor Unit"/>
-        <specific id="2" description="Two Reactor Units"/>
-      </subcategory>
-      <subcategory id="2" description="Gas-Cooled Graphite Reactor">
-        <specific id="1" description="One Reactor Unit"/>
-        <specific id="2" description="Two Reactor Units"/>
-      </subcategory>
-      <subcategory id="3" description="High Temperature Gas-cooled Reactor (HTGR)">
-        <specific id="0" description="Other"/>
-        <specific id="1" description="One Reactor Unit"/>
-        <specific id="2" description="Two Reactor Units"/>
-      </subcategory>
-      <subcategory id="4" description="Boiling Water Reactor">
-        <specific id="0" description="Other"/>
-        <specific id="1" description="One Reactor Unit"/>
-        <specific id="2" description="Two Reactor Units"/>
-      </subcategory>
-    </category>
-    <category id="13" description="Railyard"/>
-    <category id="14" description="Camp Lejeune MOUT Collective Training Facility (CTF)">
-      <subcategory id="1" description="Public Building">
-        <specific id="1" description="City Hall"/>
-        <specific id="2" description="Church"/>
-        <specific id="3" description="School"/>
-        <specific id="4" description="School Gymnasium"/>
-      </subcategory>
-      <subcategory id="2" description="Commercial Building">
-        <specific id="1" description="Bank"/>
-        <specific id="2" description="Hotel"/>
-        <specific id="3" description="Strip Mall"/>
-        <specific id="4" description="Service Station"/>
-        <specific id="5" description="Warehouse"/>
-        <specific id="6" description="2-story Office Building"/>
-        <specific id="7" description="3-story Office Building"/>
-      </subcategory>
-      <subcategory id="3" description="Residential Building">
-        <specific id="1" description="1-story House"/>
-        <specific id="2" description="1-story House with Fireplace"/>
-        <specific id="3" description="2-story House"/>
-        <specific id="4" description="Town House"/>
-        <specific id="5" description="2-story Apartment Building"/>
-        <specific id="6" description="3-story Apartment Building"/>
-      </subcategory>
-    </category>
-    <category id="15" description="POL Storage Tank"/>
-    <category id="16" description="Cargo Container"/>
-    <category id="17" description="Tower">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Antenna"/>
-      <subcategory id="2" description="Water"/>
-      <subcategory id="3" description="Observation"/>
-    </category>
-    <category id="18" description="AAA site">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Fixed"/>
-      <subcategory id="2" description="Towed"/>
-      <subcategory id="3" description="Self-propelled"/>
-    </category>
-    <category id="19" description="Bridge Span">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Single Lane Each Way">
-        <specific id="1" description="Single Lane Concrete Girder Bridge Span"/>
-        <specific id="2" description="Single Lane Concrete Pier Bridge Span"/>
-        <specific id="3" description="Single Lane Masonary Arch Bridge Span"/>
-        <specific id="4" description="Single Lane Steel Floating Bridge Span"/>
-        <specific id="5" description="Single Lane Steel Girder Bridge Span"/>
-        <specific id="6" description="Single Lane Steel Pier Bridge Span"/>
-        <specific id="7" description="Single Lane Steel Suspension Bridge Span"/>
-        <specific id="8" description="Single Lane Steel Trestle Bridge Span"/>
-        <specific id="9" description="Rope Suspension Bridge Span"/>
-        <specific id="10" description="Single Lane Wood Girder Bridge Span"/>
-        <specific id="11" description="Single Lane Wood Pier Bridge Span"/>
-        <specific id="12" description="Single Lane Wood Trestle Bridge Span"/>
-      </subcategory>
-      <subcategory id="2" description="Double Lane Each Way">
-        <specific id="1" description="Double Lane Concrete Girder Bridge Span"/>
-        <specific id="2" description="Double Lane Concrete Pier Bridge Span"/>
-        <specific id="3" description="Double Lane Masonary Arch Bridge Span"/>
-        <specific id="4" description="Double Lane Steel Floating Bridge Span"/>
-        <specific id="5" description="Double Lane Steel Girder Bridge Span"/>
-        <specific id="6" description="Double Lane Steel Pier Bridge Span"/>
-        <specific id="7" description="Double Lane Steel Suspension Bridge Span"/>
-        <specific id="8" description="Double Lane Steel Trestle Bridge Span"/>
-        <specific id="9" description="Double Lane Wood Girder Bridge Span"/>
-        <specific id="10" description="Double Lane Wood Pier Bridge Span"/>
-        <specific id="11" description="Double Lane Wood Pier Trestle Span"/>
-      </subcategory>
-    </category>
-    <category id="20" description="Road element">
-      <subcategory id="1" description="Road Section Straight">
-        <specific id="1" description="One Lane"/>
-        <specific id="2" description="Two Lane"/>
-        <specific id="3" description="Three Lane"/>
-        <specific id="4" description="Four Lane"/>
-      </subcategory>
-      <subcategory id="2" description="Road Section Curved">
-        <specific id="1" description="Road Section Curved, One Lane"/>
-        <specific id="2" description="Road Section Curved, Two Lane"/>
-        <specific id="3" description="Road Section Curved, Three Lane"/>
-        <specific id="4" description="Road Section Curved, Four Lane"/>
-      </subcategory>
-      <subcategory id="3" description="Intersection">
-        <specific id="11" description="Intersection, One Lane to One Lane"/>
-        <specific id="12" description="Intersection, One Lane to Two Lane"/>
-        <specific id="13" description="Intersection, One Lane to Three Lane"/>
-        <specific id="14" description="Intersection, One Lane to Four Lane"/>
-        <specific id="22" description="Intersection, Two Lane to Two Lane"/>
-        <specific id="23" description="Intersection, Two Lane to Three Lane"/>
-        <specific id="24" description="Intersection, Two Lane to Four Lane"/>
-        <specific id="33" description="Intersection, Three Lane to Three Lane"/>
-        <specific id="34" description="Intersection, Three Lane to Four Lane"/>
-        <specific id="44" description="Intersection, Four Lane to Four Lane"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="5" domain="3" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Oil derrick"/>
-    <category id="2" description="Buoy">
-      <subcategory id="1" description="Lighted buoy">
-        <specific id="1" description="Fixed Light"/>
-        <specific id="2" description="Flashing Light"/>
-        <specific id="3" description="Red lighted (flashing)"/>
-        <specific id="4" description="Green lighted (flashing)"/>
-        <specific id="5" description="Yellow lighted (flashing)"/>
-      </subcategory>
-      <subcategory id="2" description="Can">
-        <specific id="1" description="Black buoy"/>
-        <specific id="2" description="Green buoy"/>
-      </subcategory>
-      <subcategory id="3" description="Sound buoy"/>
-      <subcategory id="4" description="Nun"/>
-      <subcategory id="5" description="Spherical"/>
-    </category>
-    <category id="3" description="Pier"/>
-    <category id="4" description="Marker">
-      <subcategory id="1" description="Center channel marker"/>
-      <subcategory id="2" description="Range marker"/>
-      <subcategory id="3" description="Day marker"/>
-    </category>
-    <category id="5" description="Datum" footnote="Datum is a term which refers to the last known position in time and space of an entity."/>
-    <category id="6" description="Special Point">
-      <subcategory id="1" description="Mine"/>
-      <subcategory id="2" description="DLRP"/>
-      <subcategory id="3" description="Navigation Hazard"/>
-      <subcategory id="4" description="Downed A/C"/>
-      <subcategory id="5" description="Man in Water"/>
-      <subcategory id="6" description="Distressed Vessel"/>
-      <subcategory id="7" description="Reference Point"/>
-      <subcategory id="8" description="Waypoint"/>
-      <subcategory id="9" description="Position of Intended Movement (PIM)"/>
-      <subcategory id="10" description="Combat Air Patrol (CAP)"/>
-      <subcategory id="11" description="Strike Initial Point (SIP)"/>
-      <subcategory id="12" description="Flight Rendezvous Point"/>
-      <subcategory id="13" description="Orbit Point"/>
-      <subcategory id="14" description="Radar Site"/>
-    </category>
-  </entity>
-  <entity kind="5" domain="4" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Oil derrick"/>
-    <category id="2" description="Buoy"/>
-    <category id="3" description="Sunken ship"/>
-  </entity>
-  <entity kind="6" domain="0" country="0">
-    <category id="0" description="Other"/>
-    <category id="1" description="Fuels">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Gasoline"/>
-      <subcategory id="2" description="Diesel Fuel"/>
-      <subcategory id="3" description="JP4"/>
-      <subcategory id="4" description="Fuel Oil"/>
-      <subcategory id="5" description="JP-8 Fuel"/>
-      <subcategory id="6" description="Fog oil"/>
-      <subcategory id="7" description="Multi-Spectral Fog Oil"/>
-    </category>
-    <category id="2" description="Oils"/>
-    <category id="3" description="Lubricants"/>
-    <category id="4" description="Food">
-      <subcategory id="1" description="Water, Drinking, Sterile, Clear Colorless (bulk)"/>
-      <subcategory id="2" description="Water, Drinking, Distilled or Sparkling"/>
-      <subcategory id="3" description="Meal Ready To Eat Individuals Menus NO.1"/>
-      <subcategory id="4" description="Humanitarian Daily Ration"/>
-      <subcategory id="5" description="Vegetarian MRE"/>
-      <subcategory id="6" description="Bread, Shelf-Stable White"/>
-      <subcategory id="7" description="Meal, Cold Weather"/>
-      <subcategory id="8" description="Long Range Patrol Ration"/>
-    </category>
-    <category id="5" description="Spare Parts"/>
-    <category id="6" description="Personnel">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Dismounted Infantry"/>
-    </category>
-    <category id="7" description="Equipment">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Mine Plow"/>
-      <subcategory id="2" description="Mine Rollers"/>
-    </category>
-    <category id="8" description="Pallets with ammunition"/>
-    <category id="9" description="Pallets with water"/>
-    <category id="10" description="Pallets of fuel (JP8)"/>
-    <category id="11" description="Decontamination supplies">
-      <subcategory id="1" description="Decon Agent STB"/>
-      <subcategory id="2" description="Ferric Chloride AN 100 1 LB"/>
-    </category>
-  </entity>
-  <entity kind="7" domain="1" country="225">
-    <category id="1" description="Voice Transmission/Reception">
-      <subcategory id="0" description="Other">
-        <specific id="3" description="Typical DAFIF Derived Traffic Control Voice Radio"/>
-      </subcategory>
-    </category>
-    <category id="4" description="Instrumented Landing System (ILS) Glideslope">
-      <subcategory id="0" description="Other">
-        <specific id="3" description="Typical DAFIF Derived ILS Glideslope Transmitter"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Instrumented Landing System (ILS) Localizer Transmitter">
-      <subcategory id="0" description="Other">
-        <specific id="3" description="Typical DAFIF Derived ILS Localizer Transmitter"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment)">
-      <subcategory id="0" description="Other">
-        <specific id="3" description="Typical DAFIF Derived TACAN"/>
-      </subcategory>
-    </category>
-    <category id="12" description="Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment)">
-      <subcategory id="0" description="Other"/>
-      <subcategory id="1" description="Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196)">
-        <specific id="1" description="AN/ARN-118"/>
-        <specific id="2" description="AN/ARN-139"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="8" domain="2" country="225">
-    <category id="0" description="Other"/>
-    <category id="1" description="Chaff">
-      <subcategory id="1" description="Bundle">
-        <specific id="0" description="Other">
-          <extra id="1" description="TACCSF notional friendly chaff"/>
-        </specific>
-        <specific id="1" description="Very small"/>
-        <specific id="2" description="Small"/>
-        <specific id="3" description="Medium"/>
-        <specific id="4" description="Large"/>
-        <specific id="5" description="Very Large"/>
-        <specific id="6" description="RR-170 Chaff"/>
-        <specific id="7" description="RR-180 Chaff"/>
-        <specific id="8" description="RR-188 Chaff"/>
-        <specific id="9" description="RR-129 Chaff"/>
-        <specific id="10" description="RR-144 Chaff"/>
-        <specific id="11" description="M-1 Chaff"/>
-      </subcategory>
-      <subcategory id="2" description="Corridor">
-        <specific id="0" description="Other"/>
-        <specific id="1" description="Very small"/>
-        <specific id="2" description="Small"/>
-        <specific id="3" description="Medium"/>
-        <specific id="4" description="Large"/>
-        <specific id="5" description="Very Large"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Flare">
-      <subcategory id="0" description="Other">
-        <specific id="1" description="TACCSF notional friendly flare"/>
-      </subcategory>
-      <subcategory id="1" description="M-206 Flare"/>
-      <subcategory id="2" description="MJU-7 Flare"/>
-      <subcategory id="3" description="MJU-10 Flare"/>
-      <subcategory id="4" description="MJU-8 / Mk46 Flare"/>
-      <subcategory id="5" description="Mk47 Flare"/>
-    </category>
-    <category id="3" description="Combined chaff/flare"/>
-    <category id="4" description="Active emitter">
-      <subcategory id="1" description="Towed Decoy">
-        <specific id="1" description="AN/ALE-50 Advanced Airborne Expendable Decoy (AAED)"/>
-        <specific id="2" description="AN/ALE-55 Fiber Optic Towed Decoy (FOTD)"/>
-        <specific id="3" description="High Power Fiber Optic Towed Decoy (HPFOTD)"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Passive decoy"/>
-    <category id="6" description="Winged Decoy">
-      <subcategory id="1" description="Tactical Air-Launched Decoy">
-        <specific id="1" description="A/B37U-1(V)1 chaff-dispensing"/>
-        <specific id="2" description="A/B37U-1(V)2 passive RF augmentation"/>
-        <specific id="3" description="ADM-141A passive and active RF augmentation"/>
-        <specific id="4" description="ADM-141B chaff-dispensing"/>
-        <specific id="5" description="ADM-141C Improved TALD"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="8" domain="3" country="225">
-    <category id="0" description="Other"/>
-    <category id="2" description="Flare"/>
-    <category id="4" description="Active emitter">
-      <subcategory id="0" description="Other">
-        <specific id="1" description="Nixie SLQ 25"/>
-      </subcategory>
-    </category>
-    <category id="5" description="Passive decoy"/>
-  </entity>
-  <entity kind="8" domain="4" country="225">
-    <category id="4" description="Active Emitter">
-      <subcategory id="1" description="CM NAE"/>
-      <subcategory id="2" description="CM ADC Mk 3 T"/>
-      <subcategory id="3" description="CM ADC Mk 3 S"/>
-      <subcategory id="4" description="CM ADC Mk 3 N"/>
-      <subcategory id="5" description="CM ADC Mk 4">
-        <specific id="1" description="CM ADC MK-4 BBNR"/>
-        <specific id="2" description="CM ADC MK-4 BBN"/>
-        <specific id="3" description="CM ADC MK-4 SFJR"/>
-        <specific id="4" description="CM ADC MK-4 SFJ"/>
-      </subcategory>
-      <subcategory id="6" description="CM ADC MK-3">
-        <specific id="1" description="CM ADC MK-3 R3"/>
-        <specific id="2" description="CM ADC MK-3 BN"/>
-        <specific id="3" description="CM ADC MK-3 NPN"/>
-        <specific id="4" description="CM ADC MK-3 IR 3"/>
-      </subcategory>
-      <subcategory id="7" description="CM ADC MK-1"/>
-    </category>
-  </entity>
-  <entity kind="8" domain="2" country="222">
-    <category id="0" description="Other"/>
-    <category id="1" description="Chaff">
-      <subcategory id="1" description="Bundle">
-        <specific id="0" description="Other">
-          <extra id="1" description="TACCSF notional hostile chaff"/>
-        </specific>
-        <specific id="1" description="Very small"/>
-        <specific id="2" description="Small"/>
-        <specific id="3" description="Medium"/>
-        <specific id="4" description="Large"/>
-        <specific id="5" description="Very Large"/>
-        <specific id="6" description="26mm chaff cartridge"/>
-        <specific id="7" description="50mm chaff cartridge"/>
-      </subcategory>
-    </category>
-    <category id="2" description="Flare">
-      <subcategory id="0" description="Other">
-        <specific id="1" description="TACCSF notional hostile flare"/>
-      </subcategory>
-      <subcategory id="1" description="26mm Flare"/>
-      <subcategory id="2" description="50mm Flare"/>
-    </category>
-  </entity>
-  <entity kind="8" domain="4" country="222">
-    <category id="4" description="Active Emitter">
-      <subcategory id="1" description="UC-2S"/>
-      <subcategory id="2" description="UC-5M"/>
-      <subcategory id="3" description="UC-2 Countermeasure"/>
-    </category>
-  </entity>
-  <entity kind="8" domain="3" country="13">
-    <category id="0" description="Other">
-      <subcategory id="0" description="Other">
-        <specific id="1" description="Nulka"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="225">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-      <subcategory id="2" description="Early Warning / Surveillance Radar">
-        <specific id="1" description="AN/TPS-43"/>
-        <specific id="2" description="AN/TPS-59"/>
-        <specific id="3" description="AN/TPS-63"/>
-        <specific id="4" description="AN/TPS-75"/>
-        <specific id="5" description="AN/FPS-117"/>
-        <specific id="6" description="AN/FPS-89"/>
-        <specific id="7" description="AN/TPS-70"/>
-        <specific id="8" description="AN/TPS-24"/>
-        <specific id="9" description="AN/TPS-65"/>
-        <specific id="10" description="ASR-4">
-          <extra id="1" description="ASR-4D"/>
-          <extra id="2" description="ASR-4 LRSR"/>
-        </specific>
-        <specific id="11" description="ASR-5"/>
-        <specific id="12" description="ASR-7"/>
-        <specific id="13" description="ASR-8"/>
-        <specific id="14" description="ASR-9"/>
-        <specific id="15" description="ASR-10">
-          <extra id="1" description="ASR-10 SS"/>
-        </specific>
-        <specific id="16" description="ASR-11">
-          <extra id="1" description="ASR-11/DASR"/>
-        </specific>
-        <specific id="17" description="ASR-12"/>
-        <specific id="18" description="ASR-23">
-          <extra id="1" description="ASR-23 SS"/>
-        </specific>
-      </subcategory>
-      <subcategory id="5" description="Target Acquisition Radar">
-        <specific id="1" description="AN/MPQ-64 FAAD GBS"/>
-      </subcategory>
-      <subcategory id="8" description="Firing Point/Launch Point Determination Sensor">
-        <specific id="1" description="AN/TPQ-36"/>
-        <specific id="2" description="AN/TPQ-37 Firefinder"/>
-        <specific id="3" description="Trailer mounted AN/TPQ-38 (V8)"/>
-        <specific id="4" description="Trailer mounted AN/TPQ-47"/>
-        <specific id="5" description="AN/TPQ-47"/>
-      </subcategory>
-      <subcategory id="24" description="Battlefield Surveillance">
-        <specific id="1" description="AN/PPS-5"/>
-        <specific id="2" description="AN/PPS-15A (V1)"/>
-      </subcategory>
-    </category>
-    <category id="3" description="RF Passive">
-      <subcategory id="8" description="Firing Point/Launch Point Determination Sensor">
-        <specific id="1" description="Expert Missile Tracker (adjunct to AN/TPS-75)"/>
-      </subcategory>
-    </category>
-    <category id="7" description="Chemical, point detector">
-      <subcategory id="1" description="ACADA">
-        <specific id="1" description="w/Telemetry Link"/>
-      </subcategory>
-      <subcategory id="2" description="M44A1">
-        <specific id="1" description="w/Telemetry Link"/>
-      </subcategory>
-    </category>
-    <category id="8" description="Chemical, standoff">
-      <subcategory id="1" description="M21"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="2" country="225">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF active">
-      <subcategory id="2" description="Early Warning/Surveillance">
-        <specific id="1" description="JLENS PTIR Sensor"/>
-        <specific id="2" description="JLENS SuR Sensor"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="3" country="225">
-    <category id="0" description="Other"/>
-    <category id="10" description="Acoustic, active">
-      <subcategory id="77" description="Sonobuoy">
-        <specific id="1" description="ICEPICK (GEOBUOY)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="225">
-    <category id="0" description="Other"/>
-    <category id="9" description="Thermal (temperature sensing)">
-      <subcategory id="78" description="Bathythermal Sensor">
-        <specific id="1" description="AN/SSQ-36B BTS (Bathythermograph Transmitting Set)"/>
-      </subcategory>
-    </category>
-    <category id="10" description="Acoustic, active">
-      <subcategory id="5" description="Acquisition / detection"/>
-      <subcategory id="77" description="Sonobuoy">
-        <specific id="1" description="AN/SSQ-62 DICASS (Directional Command Active Sonobuoy System)">
-          <extra id="1" description="AN/SSQ-62D DICASS"/>
-          <extra id="2" description="AN/SSQ-62D1 DICASS"/>
-          <extra id="3" description="AN/SSQ-62D2 DICASS"/>
-          <extra id="4" description="AN/SSQ-62E DICASS"/>
-          <extra id="5" description="AN/SSQ-62E1 DICASS"/>
-          <extra id="6" description="AN/SSQ-62E2 DICASS"/>
-        </specific>
-        <specific id="2" description="AN/SSQ-110 EER (Extended Echo Ranging), a.k.a. SUS (Signal, Underwater Sound)">
-          <extra id="1" description="AN/SSQ-110A EER"/>
-          <extra id="2" description="AN/SSQ-110B EER"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category id="11" description="Acoustic, Passive">
-      <subcategory id="77" description="Sonobuoy">
-        <specific id="1" description="AN/SSQ-53 DIFAR (Directional Frequency Analysis Recording)">
-          <extra id="1" description="AN/SSQ-53D DIFAR"/>
-          <extra id="2" description="AN/SSQ-53E DIFAR"/>
-          <extra id="3" description="AN/SSQ-53F DIFAR"/>
-        </specific>
-        <specific id="2" description="AN/SSQ-57 ANM (Ambient Noise Measurement)">
-          <extra id="1" description="AN/SSQ-57C1 ANM"/>
-        </specific>
-        <specific id="3" description="AN/SSQ-77 VLAD (Vertical Line Array DIFAR)">
-          <extra id="1" description="AN/SSQ-77B VLAD"/>
-          <extra id="2" description="AN/SSQ-77C VLAD"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="222">
-    <category id="0" description="Other"/>
-    <category id="1" description="Multi-spectral">
-      <subcategory id="1" description="Land Radar Hostile Fixed"/>
-      <subcategory id="2" description="Land Radar Hostile Dynamic"/>
-    </category>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-      <subcategory id="2" description="Early Warning/Surveillance Radar">
-        <specific id="1" description="Back Trap"/>
-        <specific id="2" description="Bar Lock (P-35/P-37/P-50)"/>
-        <specific id="3" description="Flat Face (P-15, CASTA-2E1)"/>
-        <specific id="4" description="Long Track"/>
-        <specific id="5" description="Spoon Rest (P-12)"/>
-        <specific id="6" description="Squat Eye (P-15M)"/>
-        <specific id="7" description="Tall King (P-14)"/>
-        <specific id="8" description="Tin Shield"/>
-        <specific id="9" description="Knife Rest (P-10)"/>
-        <specific id="10" description="Tin Trap"/>
-        <specific id="11" description="Box Spring"/>
-      </subcategory>
-      <subcategory id="3" description="Height Finding Radar">
-        <specific id="1" description="Odd Group"/>
-        <specific id="2" description="Odd Pair"/>
-        <specific id="3" description="Side Net (PRV-11)"/>
-        <specific id="4" description="Thin Skin"/>
-      </subcategory>
-      <subcategory id="4" description="Fire Control Radar">
-        <specific id="1" description="Fire Can"/>
-        <specific id="2" description="Flap Wheel"/>
-        <specific id="3" description="Whiff"/>
-        <specific id="4" description="(deleted)"/>
-      </subcategory>
-      <subcategory id="5" description="Target Acquisition Radar">
-        <specific id="1" description="Dog Ear"/>
-        <specific id="2" description="Snow Drift (9S18M1)"/>
-        <specific id="3" description="MT-LB mounted ARK-1"/>
-        <specific id="4" description="MT-LB mounted ZOOPARK"/>
-        <specific id="5" description="Truck/trailer mounted SNAR-10"/>
-        <specific id="6" description="MT-LB mounted BIG FRED"/>
-      </subcategory>
-      <subcategory id="14" description="Meteorological Radar">
-        <specific id="1" description="End Tray"/>
-      </subcategory>
-      <subcategory id="18" description="Surface Search Radar">
-        <specific id="1" description="Sheet Bend"/>
-      </subcategory>
-      <subcategory id="24" description="Battlefield Surveillance">
-        <specific id="1" description="PSNR-5K (TALL MIKE)"/>
-        <specific id="2" description="FARA-1 (SBR-3)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="3" country="222">
-    <category id="0" description="Other"/>
-    <category id="10" description="Acoustic active">
-      <subcategory id="77" description="Sonobuoy"/>
-      <subcategory id="79" description="Towed Counter Measure">
-        <specific id="1" description="Towed CM BAT-1"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="222">
-    <category id="10" description="Acoustic, active">
-      <subcategory id="28" description="Decoy/Mimic"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="224">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-      <subcategory id="2" description="Early Warning/Surveillance Radar">
-        <specific id="1" description="Plessey AR-5"/>
-      </subcategory>
-      <subcategory id="3" description="Height Finding">
-        <specific id="1" description="Decca HF 200"/>
-      </subcategory>
-      <subcategory id="6" description="Target Tracking Radar"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="224">
-    <category id="10" description="Acoustic, Passive">
-      <subcategory id="77" description="Sonobuoy">
-        <specific id="1" description="AN/SSQ-955 HIDAR (High Instantaneous Dynamic Range)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="71">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-      <subcategory id="2" description="Early Warning/Surveillance Radar">
-        <specific id="1" description="Thompson LP-23 (TRS-2050)"/>
-        <specific id="2" description="Tiger-S (TRS-2100)"/>
-        <specific id="3" description="Tiger-G (TRS-2105)"/>
-        <specific id="4" description="THD 1940 (Picador)"/>
-        <specific id="5" description="Volex III/IV"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="78">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multifunction Radar">
-        <specific id="1" description="(deleted)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="206">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="4" description="Fire Control Radar">
-        <specific id="1" description="Skyguard"/>
-        <specific id="2" description="Super Fledermaus"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="56">
-    <category id="0" description="Other"/>
-    <category id="3" description="RF Passive (intercept and DF)">
-      <subcategory id="16" description="Identification/Classification Radar">
-        <specific id="1" description="Ramona (Soft Ball)"/>
-        <specific id="2" description="Tamara (Trash Drum)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="45">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-      <subcategory id="2" description="Early Warning / Surveillance Radar">
-        <specific id="1" description="Cross Legs"/>
-        <specific id="2" description="HN-503"/>
-        <specific id="3" description="JY-8">
-          <extra id="1" description="JY-8A"/>
-        </specific>
-        <specific id="4" description="JY-9"/>
-        <specific id="5" description="JY-14"/>
-        <specific id="6" description="Nanjing B/C">
-          <extra id="1" description="Nanjing B"/>
-          <extra id="2" description="Nanjing C"/>
-        </specific>
-        <specific id="7" description="Pin Jib"/>
-        <specific id="8" description="Slot Rest"/>
-      </subcategory>
-      <subcategory id="4" description="Fire Control Radar">
-        <specific id="1" description="Team Work"/>
-      </subcategory>
-      <subcategory id="5" description="Target Acquisition Radar">
-        <specific id="1" description="Rice Pad"/>
-      </subcategory>
-      <subcategory id="18" description="Surface-Search Radar">
-        <specific id="1" description="Cross Slot"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="119">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-      <subcategory id="4" description="Fire Control Radar">
-        <specific id="1" description="Drum Tilt B"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="106">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-      </subcategory>
-      <subcategory id="2" description="Early Warning/Surveillance Radar">
-        <specific id="1" description="Pluto"/>
-        <specific id="2" description="RAT-31S"/>
-        <specific id="3" description="ATCR-33 (Selenia)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="205">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="5" description="Target Acquisition Radar">
-        <specific id="1" description="Giraffe">
-          <extra id="1" description="Giraffe-40"/>
-          <extra id="2" description="Giraffe-50 AT"/>
-          <extra id="3" description="Giraffe-75"/>
-        </specific>
-        <specific id="2" description="HARD (PS-91)"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="13">
-    <category id="0" description="Other"/>
-    <category id="11" description="Acoustic, passive">
-      <subcategory id="77" description="Sonobuoy">
-        <specific id="1" description="AN/SSQ-801B Barra"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="0">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="0">
-    <category id="10" description="Acoustic, active">
-      <subcategory id="64" description="Jamming noise"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="153">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="101">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="102">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="240">
-    <category id="0" description="Other"/>
-    <category id="2" description="RF Active">
-      <subcategory id="1" description="Multi-function">
-        <specific id="1" description="Fixed"/>
-        <specific id="2" description="Mobile"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="110">
-    <category id="0" description="RF Active">
-      <subcategory id="2" description="Multi-function">
-        <specific id="2" description="FR-2855W"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="39">
-    <category id="9" description="Thermal (temperature sensing)">
-      <subcategory id="78" description="Bathythermal Sensor">
-        <specific id="1" description="AN/SSQ-536B BTS (Bathythermograph Transmitting Set)"/>
-      </subcategory>
-    </category>
-  </entity>
+<?xml version="1.0" encoding="utf-8" ?>
+<cet length="64" id="28" cname="es.type.cet" name="Comprehensive Entity-Type tables" source="4.2.3">
+  <entity kind="1" domain="1" country="225">
+    <category id="0" description="Other">
+      <subcategory id="0" description="Miscellaneous guns">
+        <specific id="1" description="M901 40-mm machine gun"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="Liquid propellant guns"/>
+        <specific id="4" description="Phalanx (Close-In Weapons Systems (CIWS) Mk15)"/>
+      </subcategory>
+      <subcategory id="2" description="Grenade launchers">
+        <specific id="1" description="Mk 19 40-mm"/>
+        <specific id="2" description="Brunswick Multisalvo Smoke Grenade Launcher"/>
+        <specific id="3" description="Tracor Aerospace Advanced Smoke Launcher System"/>
+      </subcategory>
+      <subcategory id="3" description="Other missile systems">
+        <specific id="1" description="McDonnell-Douglas Harpoon Coastal Defense System"/>
+      </subcategory>
+      <subcategory id="4" description="Bridges">
+        <specific id="1" description="Trailer Launched Bridge (TLB)"/>
+        <specific id="2" description="Mobile assault bridge"/>
+        <specific id="3" description="M60 bridge"/>
+      </subcategory>
+      <subcategory id="5" description="Command Post"/>
+    </category>
+    <category id="1" description="Tank">
+      <subcategory id="1" description="M1 Abrams">
+        <specific id="1" description="M1 Abrams"/>
+        <specific id="2" description="M1A1 Abrams"/>
+        <specific id="3" description="M1A2"/>
+        <specific id="4" description="M1A1 w/ mine rollers"/>
+        <specific id="5" description="M1A1 w/ mine plows"/>
+        <specific id="6" description="M1A1 w/ DU armor"/>
+        <specific id="7" description="M1A2 w/ Combat Vehicle Command and Control (CVCC)"/>
+        <specific id="8" description="M1A2 SEP"/>
+        <specific id="9" description="M1A1D"/>
+      </subcategory>
+      <subcategory id="2" description="M60 Main Battle Tank (MBT)">
+        <specific id="1" description="M60A3"/>
+        <specific id="2" description="M60A1"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="M60A1 with ERA"/>
+      </subcategory>
+      <subcategory id="3" description="M551 Sheridan light tank/reconnaissance vehicle">
+        <specific id="1" description="M551A1"/>
+      </subcategory>
+      <subcategory id="4" description="M48 medium tank">
+        <specific id="1" description="M48C"/>
+        <specific id="2" description="M48A1"/>
+        <specific id="3" description="M48A2"/>
+        <specific id="4" description="M48A2C"/>
+        <specific id="5" description="M48A3"/>
+        <specific id="6" description="M48A4"/>
+        <specific id="7" description="M48A5"/>
+        <specific id="8" description="M48H"/>
+        <specific id="9" description="M48 AVLB"/>
+        <specific id="10" description="M48 ARV"/>
+        <specific id="11" description="M48 mine clearing vehicle"/>
+        <specific id="12" description="M48A2GA2"/>
+        <specific id="13" description="M48A5E"/>
+      </subcategory>
+      <subcategory id="5" description="M47 medium tank">
+        <specific id="1" description="M47"/>
+        <specific id="2" description="M47M"/>
+        <specific id="3" description="GLS M47 ARV"/>
+      </subcategory>
+      <subcategory id="6" description="M41 light tank">
+        <specific id="1" description="M41C"/>
+        <specific id="2" description="M41E W/8V-71T Engine"/>
+        <specific id="3" description="QM41"/>
+        <specific id="4" description="M41B"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="M41 German Tank Improvement (GTI)"/>
+      </subcategory>
+      <subcategory id="7" description="Cadillac Gage Commando Stingray light tank"/>
+      <subcategory id="8" description="FMC Close Combat Vehicle Light VFM 5 tank"/>
+      <subcategory id="9" description="AAI Rapid Deployment Force Light Tank (RDF/LT) Combined Arms Team/Lightweight Combat Vehicle (CAT/LCV)">
+        <specific id="1" description="Prototype"/>
+      </subcategory>
+      <subcategory id="10" description="Teledyne Continental Armored Gun System"/>
+      <subcategory id="11" description="FCS Mounted Combat System"/>
+    </category>
+    <category id="2" description="Armored fighting vehicle">
+      <subcategory id="1" description="FMC M2/M3 Bradley">
+        <specific id="1" description="M2A2 Bradley Infantry Fighting Vehicle (IFV)"/>
+        <specific id="2" description="M3A2 Bradley Cavalry Fighting Vehicle (CFV)"/>
+        <specific id="3" description="FMC Bradley IFV"/>
+        <specific id="4" description="M2 Bradley IFV"/>
+        <specific id="5" description="M2A1 Bradley IFV"/>
+        <specific id="6" description="M3 Bradley CFV"/>
+        <specific id="7" description="M3A1 Bradley CFV"/>
+        <specific id="8" description="M7 BFIST"/>
+        <specific id="9" description="M2A3 Bradley IFV"/>
+        <specific id="10" description="M3A3 Bradley CFV"/>
+        <specific id="11" description="M2A2ODS Bradley IFV"/>
+      </subcategory>
+      <subcategory id="3" description="FMC M113 Armored Personnel Carrier (APC)">
+        <specific id="1" description="M113A2"/>
+        <specific id="2" description="M113A3"/>
+        <specific id="3" description="M113A3 w/ M105 trailer"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="M113A1 Improved TOW Vehicle (ITV)"/>
+        <specific id="7" description="M113A1 TOW"/>
+        <specific id="8" description="M113A2 ITV"/>
+        <specific id="9" description="M113A2 TOW"/>
+        <specific id="10" description="M730 Chaparral Surface-to-Air Missile (SAM) launcher"/>
+        <specific id="11" description="M113"/>
+        <specific id="12" description="M113A1"/>
+        <specific id="13" description="M113A1R"/>
+        <specific id="14" description="M113A2DR"/>
+        <specific id="15" description="M113A2H"/>
+        <specific id="16" description="M113A2IT"/>
+        <specific id="17" description="M113A2MK"/>
+        <specific id="18" description="M113A2R"/>
+        <specific id="19" description="M132/M132A1 Flamethrower"/>
+        <specific id="20" description="M667"/>
+        <specific id="21" description="(deleted)"/>
+        <specific id="22" description="(deleted)"/>
+        <specific id="23" description="M741"/>
+        <specific id="24" description="M741A1"/>
+        <specific id="25" description="M741A2"/>
+        <specific id="26" description="RTL"/>
+        <specific id="27" description="XM474"/>
+        <specific id="28" description="XM474E2"/>
+        <specific id="29" description="XM667E1"/>
+        <specific id="30" description="XM727"/>
+        <specific id="31" description="(deleted)"/>
+        <specific id="32" description="XM741"/>
+        <specific id="33" description="XM806E1"/>
+        <specific id="34" description="XM806E2"/>
+      </subcategory>
+      <subcategory id="5" description="Light Armored Vehicle (LAV) TOW">
+        <specific id="1" description="FIST"/>
+        <specific id="2" description="MGS"/>
+        <specific id="3" description="ATGM"/>
+        <specific id="4" description="Ambulance"/>
+        <specific id="5" description="Medical Team"/>
+        <specific id="6" description="PROPHET"/>
+        <specific id="7" description="REMBASS/GSR"/>
+        <specific id="8" description="NBC"/>
+        <specific id="9" description="155SP HOW"/>
+        <specific id="10" description="Plow"/>
+        <specific id="11" description="Roller"/>
+        <specific id="12" description="Wrecker"/>
+        <specific id="13" description="Logistics"/>
+        <specific id="14" description="Reconnaissance Vehicle"/>
+        <specific id="15" description="Command and Control TOC Vehicle"/>
+        <specific id="16" description="Mortar Carrier"/>
+        <specific id="17" description="Striker/Fire Support Team Vehicle"/>
+        <specific id="18" description="Stryker Personnel Carrier w/MK 19 mod 3 40-mm grenade launcher"/>
+        <specific id="19" description="Stryker Personnel Carrier w/M2 .50 cal heavy machine gun"/>
+        <specific id="20" description="Stryker Personnel Carrier w/MK 240 7.62 mm machine gun"/>
+        <specific id="21" description="Stryker Personnel Carrier w/automatic cannon"/>
+        <specific id="22" description="Stryker Mobile Gun System w/M68A1E4 105-mm cannon; MK 240 7.62 mm co-axial machine gun; and M2 .50 cal heavy machine gun"/>
+        <specific id="23" description="Stryker Reconnaissance Vehicle w/MK 240 7.62-mm machine gun"/>
+        <specific id="24" description="Stryker Mortar Carrier w/120-mm mortar"/>
+        <specific id="25" description="Stryker Mortar Carrier w/81-mm mortar"/>
+        <specific id="26" description="Stryker Mortar Carrier w/60-mm mortar"/>
+        <specific id="27" description="Stryker Command Vehicle w/MK 240 7.62-mm machine gun"/>
+        <specific id="28" description="Stryker Fire Support w/ MK 240 7.62-mm machine gun"/>
+        <specific id="29" description="Stryker Engineer w/MK 240 7.62-mm machine gun"/>
+        <specific id="30" description="Stryker Ambulance"/>
+        <specific id="31" description="Stryker Anti-tank Guided Missile"/>
+        <specific id="32" description="Stryker NBC Reconnaissance w/240 7.62-mm machine gun"/>
+      </subcategory>
+      <subcategory id="6" description="FMC Armored IFV">
+        <specific id="1" description="YPR 765 PRI"/>
+        <specific id="2" description="YPR 765 PRCO-B command vehicle"/>
+        <specific id="3" description="YPR 765 PRCO-C1 to C5"/>
+        <specific id="4" description="YPR 765 PRRDR radar vehicle"/>
+        <specific id="5" description="YPR 765 PRRDR-C radar/command vehicle"/>
+        <specific id="6" description="YPR 765 PRGWT ambulance"/>
+        <specific id="7" description="YPR 765 PRI/I"/>
+        <specific id="8" description="YPR 765 PRMR mortar tractor"/>
+        <specific id="9" description="YPR 765 PRVR-A cargo vehicle"/>
+        <specific id="10" description="YPR 765 PRVR-B cargo vehicle"/>
+        <specific id="11" description="YPR 765 PRAT"/>
+      </subcategory>
+      <subcategory id="7" description="FMC Lynx (or M113) Command and Reconnaissance Vehicle"/>
+      <subcategory id="8" description="M981 FIST-V"/>
+      <subcategory id="9" description="M106 mortar carrier">
+        <specific id="1" description="M106 107-mm"/>
+        <specific id="2" description="M106A1 107-mm"/>
+        <specific id="3" description="M106A2 107-mm"/>
+        <specific id="4" description="M1064 120-mm"/>
+      </subcategory>
+      <subcategory id="10" description="Electronics &amp; Space Corp M901 ITV">
+        <specific id="1" description="M901"/>
+        <specific id="2" description="M901A1"/>
+      </subcategory>
+      <subcategory id="11" description="M125 81-mm mortar carrier">
+        <specific id="1" description="M125A1"/>
+        <specific id="2" description="M125A2"/>
+      </subcategory>
+      <subcategory id="12" description="Cadillac Gage V-600 Armored Car"/>
+      <subcategory id="13" description="Cadillac Gage LAV Assault Gun LAV-105"/>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="LAV-105"/>
+      <subcategory id="16" description="Chrysler MAC-1 armored car"/>
+      <subcategory id="17" description="Cadillac Gage Commando Scout"/>
+      <subcategory id="18" description="Cadillac Gage Commando V-300">
+        <specific id="1" description="V-300 w/ TOW"/>
+        <specific id="2" description="V-300 w/ 81-mm mortar"/>
+        <specific id="3" description="V-300 ambulance"/>
+      </subcategory>
+      <subcategory id="19" description="Cadillac Gage Commando V-150">
+        <specific id="1" description="Commando w/ MG turret"/>
+        <specific id="2" description="Commando w/ 1-m MG turret"/>
+        <specific id="3" description="Commando w/ 1-m 20-mm turret"/>
+        <specific id="4" description="Commando w/ 20-mm turret"/>
+        <specific id="5" description="Commando w/ 25-mm turret"/>
+        <specific id="6" description="Commando w/ 40-mm/12.7-mm turret"/>
+        <specific id="7" description="Commando V-150 S"/>
+        <specific id="8" description="Commando air defense vehicle"/>
+        <specific id="9" description="Commando with 76-mm turret-mounted gun"/>
+        <specific id="10" description="Commando with 90-mm turret-mounted gun"/>
+        <specific id="11" description="Commando with 81-mm mortar"/>
+        <specific id="12" description="Commando with TOW"/>
+        <specific id="13" description="Commando command vehicle"/>
+        <specific id="14" description="Base security vehicle"/>
+        <specific id="15" description="Malaysian upgraded V-150 Commando"/>
+      </subcategory>
+      <subcategory id="20" description="AV Technology Corporation Dragoon">
+        <specific id="1" description="APC"/>
+        <specific id="2" description="ASV-XC extended cab"/>
+        <specific id="3" description="Dragoon Armored Command Vehicle (ACV)"/>
+        <specific id="4" description="Dragoon Armored Mortar Carrier (AMC)"/>
+        <specific id="5" description="Dragoon TOW Carrier"/>
+      </subcategory>
+      <subcategory id="21" description="Half-track APCs"/>
+      <subcategory id="22" description="Cadillac Gage Commando Ranger APC"/>
+      <subcategory id="23" description="Vehicle Sys Development Corp Lancer Armored Patrol Vehicle (APV)"/>
+      <subcategory id="24" description="AAI Propulsion System Demonstrator Amphibious Assault Vehicle (AAV)"/>
+      <subcategory id="25" description="Advanced AAV"/>
+      <subcategory id="26" description="FMC AAV7A1 (LVTP7A1)">
+        <specific id="1" description="AAVC7A1 command vehicle"/>
+        <specific id="2" description="AAVR7A1 recovery vehicle"/>
+        <specific id="3" description="AAV7A1 with mine plow"/>
+        <specific id="4" description="AAV7A1 with VEMASID"/>
+        <specific id="5" description="AAV7A1 with mine-clearance-system kit"/>
+        <specific id="6" description="AAVP7A1"/>
+      </subcategory>
+      <subcategory id="27" description="LVTP5A1 Armored AAV">
+        <specific id="1" description="LVTC5 (Command, Model 5)"/>
+        <specific id="2" description="LVTE1 (Engineer, Model 1)"/>
+        <specific id="3" description="LVTH6 (Howitzer, Model 6)"/>
+        <specific id="4" description="LVTR1 (Recovery, Model 1)"/>
+      </subcategory>
+      <subcategory id="28" description="Composite Armored Vehicle (CAV)"/>
+      <subcategory id="29" description="(deleted)"/>
+      <subcategory id="30" description="M93 Armored Reconnaissance Vehicle"/>
+      <subcategory id="31" description="M1117 Armored Security Vehicle"/>
+      <subcategory id="32" description="FCS Infantry Combat Vehicle"/>
+      <subcategory id="33" description="FCS Armed Robotic Vehicle - RSTA"/>
+      <subcategory id="34" description="FCS Armed Robotic Vehicle - Assault"/>
+      <subcategory id="35" description="FCS Armed Robotic Vehicle - Light"/>
+      <subcategory id="36" description="FCS Recon and Surveillance Vehicle"/>
+      <subcategory id="37" description="FCS Command &amp; Control Vehicle"/>
+      <subcategory id="38" description="FCS Medical Vehicle - Evacuation"/>
+    </category>
+    <category id="3" description="Armored utility vehicle">
+      <subcategory id="1" description="M88 medium recovery vehicle">
+        <specific id="1" description="M88A1"/>
+        <specific id="2" description="M88A2"/>
+        <specific id="3" description="M88A1E1"/>
+      </subcategory>
+      <subcategory id="2" description="M578 light armored recovery vehicle"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="AVLB">
+        <specific id="1" description="M1 AVLB bridge layer"/>
+        <specific id="2" description="M60 AVLB"/>
+        <specific id="3" description="M48 AVLB"/>
+        <specific id="4" description="M60 AVLB w/o bridge"/>
+        <specific id="5" description="M104 Wolverine"/>
+      </subcategory>
+      <subcategory id="5" description="M728 combat engineer vehicle"/>
+      <subcategory id="6" description="M9 armored combat earthmover"/>
+      <subcategory id="7" description="Cadillac Gage Commando V-150 Recovery Vehicle"/>
+      <subcategory id="8" description="AV Technology Corporation Dragoon">
+        <specific id="1" description="Armored Logistics Support Vehicle (ALSV)"/>
+      </subcategory>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="M113/M113A1/M113A2 bulldozer"/>
+      <subcategory id="11" description="M577/M577A1/M577A2 command post">
+        <specific id="1" description="M577 Command Post (MLRS Bn CP)"/>
+        <specific id="2" description="M577 Command Post (MLRS Btry CP)"/>
+      </subcategory>
+      <subcategory id="12" description="Stretched M577A2E2 command post"/>
+      <subcategory id="13" description="XM1068 command post vehicle"/>
+      <subcategory id="14" description="FMC (M113) APC ambulance"/>
+      <subcategory id="15" description="M113A2 recovery vehicle"/>
+      <subcategory id="16" description="Abrams Recovery Vehicle"/>
+      <subcategory id="17" description="(deleted)"/>
+      <subcategory id="18" description="Fitter's vehicle"/>
+      <subcategory id="19" description="Armored Maintenance Vehicle (AMV)"/>
+      <subcategory id="20" description="M1059 smoke-generating system"/>
+      <subcategory id="21" description="Armored Bulldozer, D7 MCAP"/>
+      <subcategory id="22" description="Armored Bulldozer, D9R"/>
+      <subcategory id="23" description="Armored Obstacle Breacher, Grizzly"/>
+      <subcategory id="24" description="Deployable Universal Combat Earthmover (DEUCE)"/>
+      <subcategory id="25" description="FCS Recovery and Maintenance Vehicle"/>
+    </category>
+    <category id="4" description="Self-propelled artillery">
+      <subcategory id="1" description="M270 Multiple Launch Rocket System (MLRS)">
+        <specific id="1" description="ATACMS"/>
+      </subcategory>
+      <subcategory id="2" description="M110 203-mm (8-inch) SP Howitzer">
+        <specific id="1" description="M110"/>
+        <specific id="2" description="M110A2"/>
+      </subcategory>
+      <subcategory id="3" description="M109 155-mm SP Howitzer">
+        <specific id="1" description="M109"/>
+        <specific id="2" description="M109A1"/>
+        <specific id="3" description="M109A2"/>
+        <specific id="4" description="M109A3"/>
+        <specific id="5" description="M109A4"/>
+        <specific id="6" description="M109A5"/>
+        <specific id="7" description="M109A6"/>
+        <specific id="8" description="M109L"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="M107-175 mm gun"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="155-mm SP Howitzer XM2001 Crusader"/>
+      <subcategory id="10" description="Liquid-propellant Artillery System"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="(deleted)"/>
+      <subcategory id="16" description="(deleted)"/>
+      <subcategory id="17" description="Fiber Optic Guided Missile (FOG-M)"/>
+      <subcategory id="18" description="(deleted)"/>
+      <subcategory id="19" description="(deleted)"/>
+      <subcategory id="20" description="(deleted)"/>
+      <subcategory id="21" description="Electronic &amp; Space Corp Ground-Launched Hellfire: Heavy (GLH:H)"/>
+      <subcategory id="22" description="Line-of-Sight Anti-Tank (LOSAT)"/>
+      <subcategory id="23" description="RGM-84 Harpoon Launcher"/>
+      <subcategory id="24" description="HIMARS"/>
+      <subcategory id="25" description="FCS NLOS - Cannon"/>
+      <subcategory id="26" description="FCS NLOS - Mortar"/>
+    </category>
+    <category id="5" description="Towed artillery">
+      <subcategory id="1" description="M114 155-mm Howitzer"/>
+      <subcategory id="2" description="M198 155-mm towed Howitzer"/>
+      <subcategory id="3" description="M101 105-mm Howitzer">
+        <specific id="1" description="M101"/>
+        <specific id="2" description="M101A1"/>
+      </subcategory>
+      <subcategory id="4" description="M119 105-mm light Howitzer"/>
+      <subcategory id="5" description="M115 8-inch Howitzer"/>
+      <subcategory id="6" description="XM777 155-mm Lightweight Towed Howitzer"/>
+      <subcategory id="7" description="M59 155-mm gun"/>
+      <subcategory id="8" description="M102 105-mm Howitzer"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="M993 70-mm Rapid Deployment Multiple Launch Rocket System (MLRS)"/>
+      <subcategory id="16" description="(deleted)"/>
+      <subcategory id="17" description="FCS NLOS-LS-Launcher"/>
+    </category>
+    <category id="6" description="Small wheeled utility vehicle">
+      <subcategory id="1" description="LTV HMMWV M998-series multipurpose wheeled vehicles">
+        <specific id="1" description="M998 cargo/troop carrier without winch"/>
+        <specific id="2" description="M1038 cargo/troop carrier with winch"/>
+        <specific id="3" description="M966 TOW missile carrier, basic armor, without winch"/>
+        <specific id="4" description="M1036 TOW missile carrier, basic armor, with winch"/>
+        <specific id="5" description="M1045 TOW missile carrier, supplemental armor, without winch"/>
+        <specific id="6" description="M1046 TOW missile carrier, supplemental armor, with winch"/>
+        <specific id="7" description="M1025 armament carrier, basic armor, without winch"/>
+        <specific id="8" description="M1026 armament carrier, basic armor, with winch"/>
+        <specific id="9" description="M1043 armament carrier, supplemental armor, without winch"/>
+        <specific id="10" description="M1044 armament carrier, supplemental armor, with winch"/>
+        <specific id="11" description="M996 mini-ambulance, 2-litter, basic armor"/>
+        <specific id="12" description="M997 maxi-ambulance, 4-litter, basic armor"/>
+        <specific id="13" description="M1035 soft-top ambulance, 2-litter"/>
+        <specific id="14" description="M1037 S-250 shelter carrier, without winch"/>
+        <specific id="15" description="M1042 S-250 shelter carrier, with winch"/>
+        <specific id="16" description="M1069 tractor for M119 105-mm light gun"/>
+        <specific id="17" description="M1025 Armament carrier, basic armor w/o winch, w/MK 19 40-mm grenade launcher"/>
+        <specific id="18" description="M1025 Armament carrier, basic armor w/o winch, w/M2 .50 cal heavy machine gun"/>
+        <specific id="19" description="M1025 armament carrier, basic armor w/o winch, w/M-60 7.62 mm medium machine gun"/>
+        <specific id="20" description="M707 Striker"/>
+        <specific id="21" description="M1114 armament carrier, armored"/>
+        <specific id="22" description="HMMWV w/M56 Coyote Smoke Generator"/>
+        <specific id="23" description="HMMWV w/M31 Biological Integrated Detection System (BIDS)"/>
+        <specific id="24" description="HMMWV w/M157 Smoke Generator"/>
+      </subcategory>
+      <subcategory id="2" description="Warrior NMC-40 Long-range Fast Attack Vehicle (FAV)"/>
+      <subcategory id="3" description="Chenowith FAV/Light Strike Vehicle (LSV)"/>
+      <subcategory id="4" description="M58/M59 Mine-clearing charge (MICLIC) (towed)">
+        <specific id="1" description="M58A3 w/rocket"/>
+        <specific id="2" description="M58A4"/>
+        <specific id="3" description="M59"/>
+        <specific id="4" description="M58A3 w/o rocket"/>
+      </subcategory>
+      <subcategory id="5" description="Teledyne 4x4 725-kg light forces vehicle"/>
+      <subcategory id="6" description="TPC 4x4 909-kg Rapid Multi-purpose Vehicle (RAMP-V)"/>
+      <subcategory id="7" description="M151 4x4 362-kg light vehicle and variants"/>
+      <subcategory id="8" description="Jeep 4x4 light vehicle"/>
+      <subcategory id="9" description="Jeep XJ 4x4 light truck/wagon series"/>
+      <subcategory id="10" description="M38-series 4x4 363-kg light vehicle (CJ-3A)"/>
+      <subcategory id="11" description="Cargo truck and variants: 4x4, 680-kg">
+        <specific id="1" description="M37"/>
+        <specific id="2" description="M42"/>
+        <specific id="3" description="M43"/>
+        <specific id="4" description="M201"/>
+      </subcategory>
+      <subcategory id="12" description="Stewart &amp; Stevenson Services Inc. SS-200 6x6 multi-purpose light vehicle"/>
+      <subcategory id="13" description="Commercial Utility Cargo Vehicle (CUCV)"/>
+      <subcategory id="14" description="M1008, truck, cargo, tactical 1-1/4 ton, 4x4"/>
+      <subcategory id="15" description="M1009, truck, utility, tactical 3/4 ton, 4x4"/>
+      <subcategory id="16" description="M1010, truck, ambulance, tactical 1-1/4 ton, 4x4"/>
+      <subcategory id="17" description="M1031, truck, chassis, tactical 1-1/4 ton, 4x4"/>
+      <subcategory id="18" description="M1028, truck, cargo, shelter carrier, tactical 1-1/4"/>
+      <subcategory id="19" description="M715 4x4 1-1/4 ton truck, AM715-series 4x4 1-1/4 ton cargo trucks"/>
+      <subcategory id="20" description="Jeep AM 720 4x4 1135-kg light truck"/>
+      <subcategory id="21" description="M880 4x4 1133 kg"/>
+      <subcategory id="22" description="M890 4x2 1133 kg"/>
+      <subcategory id="23" description="Tractor, aircraft towing">
+        <specific id="1" description="A/S32A-31"/>
+      </subcategory>
+      <subcategory id="24" description="Ordnance Trailer"/>
+      <subcategory id="25" description="Motorcycle">
+        <specific id="1" description="M1030B1 Motorcycle"/>
+      </subcategory>
+      <subcategory id="26" description="All Terrain Vehicle">
+        <specific id="1" description="ATV 4X4"/>
+        <specific id="2" description="ATV 6X6">
+          <extra id="1" description="Military Gator (basic)"/>
+          <extra id="2" description="Military Gator First Response Expeditionary"/>
+        </specific>
+      </subcategory>
+      <subcategory id="27" description="FCS MULE">
+        <specific id="1" description="FCS MULE Retransmission"/>
+        <specific id="2" description="FCS MULE Countermine"/>
+        <specific id="3" description="FCS MULE Transport"/>
+      </subcategory>
+      <subcategory id="28" description="FCS Small Unattended Ground Vehicle"/>
+    </category>
+    <category id="7" description="Large wheeled utility vehicle">
+      <subcategory id="1" description="M35/M44A2 6x6 2-1/2 ton cargo truck series">
+        <specific id="1" description="M34: cargo truck with an unladen weight of 5332 kg, chassis designated M44"/>
+        <specific id="2" description="M47: dump truck with an unladen weight of 6100 kg, chassis designated M57"/>
+        <specific id="3" description="Truck, maintenance: earth-boring machine and pole setter V18A/MTQ, chassis M44"/>
+        <specific id="4" description="Truck, maintenance: telephone construction and maintenance V17A/MTQ, chassis M44."/>
+        <specific id="5" description="M35 truck: basic M45 chassis"/>
+        <specific id="6" description="M35A2"/>
+        <specific id="7" description="M35A2C"/>
+        <specific id="8" description="M36"/>
+        <specific id="9" description="M36A2"/>
+        <specific id="10" description="M48: tractor truck"/>
+        <specific id="11" description="M49: fuel tanker"/>
+        <specific id="12" description="M49A2C"/>
+      </subcategory>
+      <subcategory id="2" description="M816, truck, wrecker, 5-ton, 6x6"/>
+      <subcategory id="3" description="M819, tractor, wrecker, 5-ton, 6x6"/>
+      <subcategory id="4" description="M817 engineer dump truck"/>
+      <subcategory id="5" description="M939 6X6 5-ton cargo truck">
+        <specific id="1" description="M923 - Truck, 5-ton, 6x6, Cargo dropside"/>
+        <specific id="2" description="M923A1 - Version with single rear wheels"/>
+        <specific id="3" description="M923A2 - Version with CTIS"/>
+        <specific id="4" description="M932A2 [Guntruck] - Modified version for convoy defence"/>
+        <specific id="5" description="M923A3 - Version with brake modifications"/>
+        <specific id="6" description="M924 - Truck, 5-ton, 6x6, LWB, Cargo w/o winch"/>
+        <specific id="7" description="M925 - Truck, 5-ton, 6x6, Cargo dropside w/winch"/>
+        <specific id="8" description="M925A1 - Version with single rear wheels"/>
+        <specific id="9" description="M925A2 - Version with CTIS"/>
+        <specific id="10" description="M926 - Truck, 5-ton, 6x6, cargo, lwb, w/winch, w/e"/>
+        <specific id="11" description="M927 - Truck, 5-ton, 6x6, Cargo, XLWB w/o winch"/>
+        <specific id="12" description="M927 [Winch Equipped] - Truck, 5-ton, 6x6, Cargo, XLWB w/winch"/>
+        <specific id="13" description="M928 - Truck, 5-ton, 6x6, Cargo, XLWB w/winch"/>
+        <specific id="14" description="M929 - Truck, 5-ton, 6x6, Dump w/o winch"/>
+        <specific id="15" description="M929A2 - Version with CTIS plate on front hubs"/>
+        <specific id="16" description="M930 - Truck, 5-ton, 6x6, Dump w/winch"/>
+        <specific id="17" description="M931 - Truck, 5-ton, 6x6, Tractor w/o winch"/>
+        <specific id="18" description="M931A1 - Version with single rear wheels"/>
+        <specific id="19" description="M932 - Truck, 5-ton, 6x6, Tractor w/winch"/>
+        <specific id="20" description="M933 - Truck, 5-ton, 6x6, Tractor-wrecker w/winch"/>
+        <specific id="21" description="M934 - Truck, 5-ton, 6x6, Van, expandable w/winch"/>
+        <specific id="22" description="M935 - Truck, 5-ton, 6x6, Van, expandable w/o winch"/>
+        <specific id="23" description="M936 - Truck, 5-ton, 6x6, Wrecker, medium w/winch"/>
+        <specific id="24" description="M939 - Truck, 5-ton, 6x6, chassis, w/e"/>
+        <specific id="25" description="M939 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
+        <specific id="26" description="M940 - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
+        <specific id="27" description="M941 - Truck, 5-ton, 6x6, chassis, w/e"/>
+        <specific id="28" description="M941 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
+        <specific id="29" description="M942 Truck, 5-ton, 6x6, chassis, w/e"/>
+        <specific id="30" description="M942 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e"/>
+        <specific id="31" description="M944 - Truck, 5-ton, 6x6, chassis"/>
+        <specific id="32" description="OE-MRC PATRIOT Antenna Mast Group (AMG) on M942 chassis"/>
+      </subcategory>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="M543, truck, wrecker: medium, 5-ton, 6x6"/>
+      <subcategory id="8" description="M915 series of 5-ton trucks">
+        <specific id="1" description="Cargo"/>
+        <specific id="2" description="w/ FS pods"/>
+        <specific id="3" description="w/ shelter"/>
+        <specific id="4" description="M915, tractor, truck, 14-ton, 6x4"/>
+        <specific id="5" description="M915A1, tractor, truck, 14-ton, 6x4"/>
+        <specific id="6" description="M915 (Eng Loader)"/>
+      </subcategory>
+      <subcategory id="9" description="LTV Hummer cab-over 4x4 2268-kg cargo truck"/>
+      <subcategory id="10" description="Freightliner All-Terrain Tow Vehicle (ATTV)">
+        <specific id="1" description="Kamaz-4310 with generator set"/>
+      </subcategory>
+      <subcategory id="11" description="Stewart &amp; Stevenson SS-300 8x8 2268-kg All-Terrain Vehicle"/>
+      <subcategory id="12" description="Stewart &amp; Stevenson Family of Medium Tactical Vehicles (FMTV)">
+        <specific id="1" description="M1078 Truck, Cargo; LMTV w/ Equip"/>
+        <specific id="2" description="M1078 Truck, Cargo; LMTV w/ Equip, w/ Winch"/>
+        <specific id="3" description="M1079 Truck, Van; LMTV w/ Equip"/>
+        <specific id="4" description="M1079 Truck, Van; LMTV w/ Equip, w/ Winch"/>
+        <specific id="5" description="M1080 Truck, Chassis; LMTV w/ Equip"/>
+        <specific id="6" description="M1081 Truck, Cargo; LMTV, LAPES/AD, w/ Equip"/>
+        <specific id="7" description="M1082 Trailer; LMTV"/>
+        <specific id="8" description="M1083 Truck, Cargo; MTV w/ Equip"/>
+        <specific id="9" description="M1083 Truck, Cargo; MTV w/ Equip, w/ winch"/>
+        <specific id="10" description="M1084 Truck, Cargo; w/ MHE w/ Equip"/>
+        <specific id="11" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip"/>
+        <specific id="12" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip, w/ Winch"/>
+        <specific id="13" description="M1086 Truck, Cargo; MTV, LWB, w/MHE, w/ Equip"/>
+        <specific id="14" description="M1087 Truck, Van; MTV, Expansible"/>
+        <specific id="15" description="M1088 Truck, Tractor; MTV, w/ Equip"/>
+        <specific id="16" description="M1088 Truck, Tractor; MTV, w/ Equip, w/ Winch"/>
+        <specific id="17" description="M1089 Truck, Wrecker; MTV, w/ Equip, w/ Winch"/>
+        <specific id="18" description="M1090 Truck, Dump; MTV w/ Equip"/>
+        <specific id="19" description="M1090 Truck, Dump; MTV w/ Equip, w/ Winch"/>
+        <specific id="20" description="M1091 Truck, Tanker; MTV w/ Equip, w/ Winch"/>
+        <specific id="21" description="M1092 Truck, Chassis; MTV w/ Equip"/>
+        <specific id="22" description="M1093 Truck, Cargo; MTV, LAPES/AD, w/ Equip"/>
+        <specific id="23" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip, w/ Winch"/>
+        <specific id="24" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip"/>
+        <specific id="25" description="M1095 Trailer, MTV"/>
+        <specific id="26" description="M1096 Truck, Chassis; MTV, LWB, w/ Equip"/>
+        <specific id="27" description="M1083 Truck, Cargo; MTV, w/ Equip, w/ Volcano"/>
+        <specific id="28" description="M1078 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun"/>
+        <specific id="29" description="M1083 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun"/>
+      </subcategory>
+      <subcategory id="13" description="TTC FMTV">
+        <specific id="1" description="LMTV"/>
+        <specific id="2" description="MTV"/>
+      </subcategory>
+      <subcategory id="14" description="M54 6x6 5-ton cargo truck series">
+        <specific id="1" description="M41, cargo"/>
+        <specific id="2" description="M41, dump6"/>
+        <specific id="3" description="M52, tractor"/>
+        <specific id="4" description="M54, cargo "/>
+        <specific id="5" description="M55, cargo"/>
+        <specific id="6" description="M62k, wrecker, medium"/>
+        <specific id="7" description="M64, cargo, van"/>
+        <specific id="8" description="M246, tractor, wrecker"/>
+        <specific id="9" description="M291, van, expansible"/>
+        <specific id="10" description="M328, stake, bridging"/>
+        <specific id="11" description="M543, wrecker, medium"/>
+        <specific id="12" description="M748, bolster"/>
+        <specific id="13" description="M139 chassis"/>
+      </subcategory>
+      <subcategory id="15" description="M809 6x6 5-ton cargo truck series">
+        <specific id="1" description="M809"/>
+        <specific id="2" description="M810"/>
+        <specific id="3" description="M811/M812"/>
+      </subcategory>
+      <subcategory id="16" description="M813 cargo truck, 5-ton, 6x6"/>
+      <subcategory id="17" description="Standard Trailing Arm Drive (TAD) vehicle series">
+        <specific id="1" description="Modular wheeled carrier"/>
+        <specific id="2" description="Forward Area Multi-purpose Vehicle (FAMV)"/>
+        <specific id="3" description="Medium Combat Truck (MCT)"/>
+      </subcategory>
+      <subcategory id="18" description="Oshkosh MK48-series articulated 8x8 vehicle">
+        <specific id="1" description="MK48/14: logistics platform truck"/>
+        <specific id="2" description="MK48/15: recovery vehicle"/>
+        <specific id="3" description="MK48/16: truck tractor"/>
+        <specific id="4" description="MK48/17: cargo truck with Material Handling Crane (MHC)"/>
+        <specific id="5" description="MK48/18: load handling system vehicle."/>
+      </subcategory>
+      <subcategory id="19" description="Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg">
+        <specific id="1" description="M977 cargo"/>
+        <specific id="2" description="M978 fuel-servicing"/>
+        <specific id="3" description="M983 tractor"/>
+        <specific id="4" description="M984A1 wrecker"/>
+        <specific id="5" description="M985 cargo"/>
+        <specific id="6" description="M977 w/ Mine Plow"/>
+        <specific id="7" description="M977 w/ Mine Roller"/>
+        <specific id="8" description="M985 w/ Mine Roller"/>
+        <specific id="9" description="M985 w/ Mine Plow"/>
+        <specific id="10" description="Truck, Heavy, M1074 PLS"/>
+      </subcategory>
+      <subcategory id="20" description="Mack RM6866SX 6x6 10000-kg truck"/>
+      <subcategory id="21" description="M1070 8x8 Heavy Equipment Transporter (HET)"/>
+      <subcategory id="22" description="M911 8x6 truck tractor"/>
+      <subcategory id="23" description="M746 8x8 22-1/2 ton tractor truck (HET)"/>
+      <subcategory id="24" description="Mack RD8226SX 52000-kg 6x6 tank transporter"/>
+      <subcategory id="25" description="Navistar International Corporation F5070 6x4 tank transporter"/>
+      <subcategory id="26" description="LARC-5 4x4 4545-kg amphibious cargo carrier"/>
+      <subcategory id="27" description="Variable Reach Rough Terrain Forklift Truck (VRRTFLT)"/>
+      <subcategory id="28" description="Rough Terrain Container Straddle Truck (RTCST)"/>
+      <subcategory id="29" description="Truck, tractor, yard type, 4x2">
+        <specific id="1" description="M878"/>
+        <specific id="2" description="M878A1"/>
+      </subcategory>
+      <subcategory id="30" description="Case MC2500 30-ton rough terrain crane"/>
+      <subcategory id="31" description="Crane, truck-mounted, hydraulic, 25-ton (CCE) (Grove TMS 300-5)"/>
+      <subcategory id="32" description="Rough terrain crane 4x4 5-ton Hanson H-446A"/>
+      <subcategory id="33" description="Wreckers, 2-1/2 ton 6x6">
+        <specific id="1" description="M60"/>
+        <specific id="2" description="M108"/>
+      </subcategory>
+      <subcategory id="34" description="M62, truck, wrecker, medium, 5-ton, 6x6"/>
+      <subcategory id="35" description="M246, truck, tractor, wrecker, 5-ton, 6x6"/>
+      <subcategory id="36" description="M916 Series trucks"/>
+      <subcategory id="37" description="Small Emplacement Excavator (SEE)"/>
+      <subcategory id="38" description="Truck, cargo; heavy PLS transporter 16.5T 8x8, M1075"/>
+    </category>
+    <category id="8" description="Small tracked utility vehicle"/>
+    <category id="9" description="Large tracked utility vehicle">
+      <subcategory id="1" description="M548 tracked cargo carrier">
+        <specific id="1" description="M1015"/>
+        <specific id="2" description="Stretched M548A1E1"/>
+        <specific id="3" description="M667"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="Recovery vehicles"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="Radar vehicles"/>
+        <specific id="8" description="M45"/>
+        <specific id="9" description="M548A1"/>
+        <specific id="10" description="M548GA1"/>
+        <specific id="11" description="M548/S"/>
+        <specific id="12" description="LAR 160"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="M992 Field Artillery Ammunition Support Vehicle (FAASV)">
+        <specific id="1" description="M993 MLRS carrier"/>
+        <specific id="2" description="XM987 cargo carrier"/>
+        <specific id="3" description="Armored, Forward-Area, Rearm Vehicle (AFARV)"/>
+        <specific id="4" description="Armored Maintenance Vehicle"/>
+        <specific id="5" description="XM1070 Electronic Fighting Vehicle System (EFVS)"/>
+        <specific id="6" description="Command-post vehicle"/>
+      </subcategory>
+      <subcategory id="4" description="M973 Small Unit Support Vehicle (SUSV)"/>
+      <subcategory id="5" description="LMC 1500 Over-snow vehicle"/>
+      <subcategory id="6" description="Caterpillar 988 50 000-lb (22 680-kg) rough terrain container handler"/>
+    </category>
+    <category id="10" description="Mortar">
+      <subcategory id="1" description="M29 81-mm"/>
+      <subcategory id="2" description="M224 60-mm light company mortar"/>
+      <subcategory id="3" description="M1 81-mm"/>
+      <subcategory id="4" description="M2 60-mm"/>
+      <subcategory id="5" description="M19 60-mm"/>
+      <subcategory id="6" description="M29A1 81-mm"/>
+      <subcategory id="7" description="M30 107-mm rifled"/>
+      <subcategory id="8" description="M252 81-mm"/>
+      <subcategory id="9" description="120mm Mortar, M120"/>
+    </category>
+    <category id="11" description="Mine plow"/>
+    <category id="12" description="Mine rake"/>
+    <category id="13" description="Mine roller"/>
+    <category id="14" description="Cargo trailer">
+      <subcategory id="1" description="0 - 0.5 ton"/>
+      <subcategory id="2" description="0.51 - 2 ton">
+        <specific id="1" description="Trailer cargo; high mobility, 3/4 ton, M1102"/>
+      </subcategory>
+      <subcategory id="3" description="2.01 - 5 ton">
+        <specific id="1" description="Trailer, cargo; 2 1/2 ton, M1082"/>
+        <specific id="2" description="Trailer, cargo; 5 ton, M1095"/>
+      </subcategory>
+      <subcategory id="4" description="5.02 - 10 ton"/>
+      <subcategory id="5" description="greater than 10 tons"/>
+    </category>
+    <category id="15" description="Fuel trailer">
+      <subcategory id="1" description="1-1000 gallons"/>
+      <subcategory id="2" description="1001 - 5000 gallons">
+        <specific id="1" description="Semi-trailer, fuel service, 5000 gallons, M969"/>
+      </subcategory>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="16" description="Generator trailer">
+      <subcategory id="1" description="0 - 100 kW"/>
+      <subcategory id="2" description="greater than 100 KW"/>
+    </category>
+    <category id="17" description="Water trailer">
+      <subcategory id="1" description="1-1000 gallons">
+        <specific id="1" description="Trailer, tank; 1 1/2 ton, water, 400 gallons, M149A2"/>
+      </subcategory>
+      <subcategory id="2" description="1001- 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="18" description="Engineer equipment">
+      <subcategory id="1" description="Mine clearing line charge"/>
+      <subcategory id="2" description="Dozer blade kit"/>
+      <subcategory id="3" description="Lane marking system"/>
+      <subcategory id="4" description="High Mobility Engineer Excavator"/>
+      <subcategory id="5" description="Road Grader"/>
+    </category>
+    <category id="19" description="Heavy equipment transport trailer">
+      <subcategory id="1" description="Heavy Equipment Trailer, M1000"/>
+    </category>
+    <category id="20" description="Maintenance equipment trailer">
+      <subcategory id="1" description="Welding trailer"/>
+      <subcategory id="2" description="Compressor"/>
+      <subcategory id="3" description="Tools/parts trailer">
+        <specific id="1" description="Semi-trailer, van, M129A2C"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Limber"/>
+    <category id="22" description="Chemical decontamination trailer"/>
+    <category id="23" description="Warning System">
+      <subcategory id="1" description="JTAGS"/>
+      <subcategory id="2" description="SHIELD/ALERT"/>
+      <subcategory id="3" description="FCS Intelligent Munitions System"/>
+      <subcategory id="4" description="FCS Unattended Ground Sensor - Urban"/>
+      <subcategory id="5" description="FCS Unattended Ground Sensor - Tactical"/>
+    </category>
+    <category id="27" description="Civilian Vehicle">
+      <subcategory id="1" description="Sedan"/>
+      <subcategory id="2" description="Sport Utility Vehicle"/>
+      <subcategory id="3" description="Truck Cargo">
+        <specific id="1" description="Truck Small">
+          <extra id="1" description="Pickup Mini"/>
+          <extra id="2" description="Pickup Medium"/>
+          <extra id="3" description="Pickup Large"/>
+        </specific>
+        <specific id="2" description="Truck Cargo Medium"/>
+        <specific id="3" description="Truck Cargo Large"/>
+      </subcategory>
+      <subcategory id="4" description="Tractor Trailer Combination"/>
+      <subcategory id="5" description="All Terrain Vehicle">
+        <specific id="1" description="ATV 4X4">
+          <extra id="1" description="Polaris Sportsman MV"/>
+        </specific>
+        <specific id="2" description="ATV 6X6">
+          <extra id="1" description="M-Gator"/>
+        </specific>
+      </subcategory>
+      <subcategory id="6" description="Motorcycle">
+        <specific id="1" description="Motorcycle Street"/>
+        <specific id="2" description="Motorcycle Trail">
+          <extra id="1" description="Kawasaki KLR 250"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category id="28" description="Air Defense / Missile Defense Unit Equipment">
+      <subcategory id="1" description="MIM-23 Raytheon HAWK Low-to-Medium Altitude SAM System">
+        <specific id="1" description="Batallion">
+          <extra id="1" description="HAWK BN/ADCP"/>
+        </specific>
+        <specific id="2" description="Battery">
+          <extra id="1" description="HAWK Battery Command Post (BCP)"/>
+          <extra id="2" description="HAWK CWAR (Continuous Wave Acquisition Radar) AN/MPQ-34/48/55/62"/>
+          <extra id="3" description="HAWK HPI (High-Power Illuminator) AN/MPQ-33/39/46/57/61 -"/>
+          <extra id="4" description="HAWK Launcher"/>
+          <extra id="5" description="HAWK PAR (Pulse Acquisition Radar) AN/MQP-50"/>
+          <extra id="6" description="HAWK ROR (Range-Only-Radar) AN/MPQ-37/51"/>
+          <extra id="7" description="HAWK PCP (Platoon Command Post)"/>
+        </specific>
+      </subcategory>
+      <subcategory id="2" description="MIM-104 Raytheon Patriot High-to-Medium Altitude Air Defense (HIMAD) System">
+        <specific id="1" description="Patriot Command Center">
+          <extra id="1" description="Patriot ICC (Information Coordination Central)"/>
+          <extra id="2" description="Patriot BTOC"/>
+        </specific>
+        <specific id="2" description="Patriot Battery">
+          <extra id="1" description="Patriot ECS (Engagement Control Station) AN/MSQ-104"/>
+          <extra id="2" description="Patriot LS (Launcher Station)"/>
+          <extra id="3" description="Patriot Radar AN/MPQ-53"/>
+          <extra id="4" description="Patriot Radar AN/MPQ-63"/>
+        </specific>
+      </subcategory>
+      <subcategory id="3" description="MIM-14B Nike-Hercules SAM System"/>
+      <subcategory id="4" description="Theater High Altitude Area Defense (THAAD) System">
+        <specific id="1" description="THAAD Battery TOC"/>
+        <specific id="2" description="THAAD ground-based radar (GBR)"/>
+        <specific id="3" description="THAAD Launcher"/>
+      </subcategory>
+      <subcategory id="5" description="Self -Propelled VSHORAD Gun / Missile System">
+        <specific id="1" description="M163 Vulcan SP Anti-Aircraft Gun"/>
+        <specific id="2" description="M42 Twin-40mm SP Anti-Aricraft Gun"/>
+        <specific id="3" description="General Electric Vulcan-Commando 20 mm SP Air Defense (AD) System"/>
+        <specific id="4" description="Boeing Avenger Pedestal-Mounted Stinger SP Air Defense (AD) System"/>
+        <specific id="5" description="Raytheon / Loral Aeronutronic Saber Air Defense (AD) System"/>
+        <specific id="6" description="LTV Crossbow pedestal-mounted weapon system"/>
+        <specific id="7" description="Loral Aeronutronic 48 Chaparral">
+          <extra id="1" description="M48"/>
+          <extra id="2" description="M48A1"/>
+          <extra id="3" description="M48A2"/>
+          <extra id="4" description="M48A3"/>
+        </specific>
+        <specific id="8" description="Block VII Low-Altitude SAM System"/>
+        <specific id="9" description="Loral Aeronutronic SAM System"/>
+        <specific id="10" description="M6 Linebacker"/>
+      </subcategory>
+      <subcategory id="6" description="Towed VSHORAD Gun / Missile System">
+        <specific id="1" description="M1 40mm Automatic Anti-Aircraft Gun"/>
+        <specific id="2" description="M167 20mm Vulcan Anti-Aircraft Gun"/>
+        <specific id="3" description="M55 Quad 12.7mm Anti-Aircraft MG"/>
+        <specific id="4" description="AN/MPQ-64 Phased Array SHORAD Radar"/>
+      </subcategory>
+      <subcategory id="7" description="HMWWV with AMRAAM">
+        <specific id="1" description="USMC Complementary Low Altitude Weapon System (CLAWS)"/>
+        <specific id="2" description="US Army HUMRAAM"/>
+      </subcategory>
+    </category>
+    <category id="29" description="Command, Control, Communications, and Intelligence (C3I) System">
+      <subcategory id="1" description="Control and Reporting Center / Modular Control Equipment (CRC / MCE)"/>
+      <subcategory id="2" description="Control and Reporting Element (CRE)"/>
+      <subcategory id="3" description="Control and Reporting Post (CRP)"/>
+      <subcategory id="4" description="USMC Tactical Air Operation Center (TAOC)"/>
+      <subcategory id="5" description="AN/TSQ-73 Missile Minder"/>
+      <subcategory id="6" description="JSTARS Ground Station Module (GSM) AN/TSQ-178"/>
+      <subcategory id="7" description="JSTARS Common Ground Station (CGS)"/>
+      <subcategory id="8" description="UAV Ground Control Station">
+        <specific id="1" description="Predator Ground Control Station"/>
+        <specific id="2" description="Hunter Ground Control Station"/>
+        <specific id="3" description="Shadow Ground Control Station"/>
+      </subcategory>
+    </category>
+    <category id="30" description="Operations Facility"/>
+    <category id="31" description="Intelligence Facility"/>
+    <category id="32" description="Surveillance Facility">
+      <subcategory id="1" description="JLENS Processing Stations (General)">
+        <specific id="1" description="JLENS PTIR Processing Station"/>
+        <specific id="2" description="JLENS SuR Processing Station"/>
+      </subcategory>
+    </category>
+    <category id="33" description="Communications Facility"/>
+    <category id="34" description="Command Facility"/>
+    <category id="35" description="C4I Facility"/>
+    <category id="36" description="Control Facility"/>
+    <category id="37" description="Fire Control Facility"/>
+    <category id="38" description="Missile Defense Facility"/>
+    <category id="39" description="Field Command Post"/>
+    <category id="40" description="Observation Post"/>
+  </entity>
+  <entity kind="1" domain="2" country="225">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Grumman F-14 Tomcat">
+        <specific id="1" description="F-14A"/>
+        <specific id="2" description="F-14D"/>
+        <specific id="3" description="F-14B"/>
+      </subcategory>
+      <subcategory id="3" description="General Dynamics F-16 Fighting Falcon">
+        <specific id="1" description="F-16A"/>
+        <specific id="2" description="F-16B"/>
+        <specific id="3" description="F-16C"/>
+        <specific id="4" description="F-16D"/>
+        <specific id="5" description="F-16E"/>
+        <specific id="6" description="F-16N"/>
+        <specific id="7" description="F-16 (ADF)"/>
+        <specific id="8" description="F-16 RECCE"/>
+        <specific id="9" description="F/A-16"/>
+        <specific id="10" description="F-16CJ (dedicated SEAD)"/>
+        <specific id="11" description="F-16CG"/>
+      </subcategory>
+      <subcategory id="4" description="McDonnell-Douglas F-4 Phantom II">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="F-4B"/>
+        <specific id="3" description="F-4C"/>
+        <specific id="4" description="F-4D"/>
+        <specific id="5" description="F-4E"/>
+        <specific id="6" description="F-4F"/>
+        <specific id="7" description="F-4J"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="F-4N"/>
+        <specific id="11" description="F-4S"/>
+      </subcategory>
+      <subcategory id="5" description="McDonnell-Douglas F-15 Eagle">
+        <specific id="1" description="F-15A"/>
+        <specific id="2" description="F-15B"/>
+        <specific id="3" description="F-15C"/>
+        <specific id="4" description="F-15D"/>
+        <specific id="5" description="F-15E"/>
+        <specific id="6" description="F-15F"/>
+        <specific id="7" description="F-15H"/>
+      </subcategory>
+      <subcategory id="6" description="Lockheed F-22 Raptor">
+        <specific id="1" description="F-22A"/>
+        <specific id="2" description="F-22B"/>
+      </subcategory>
+      <subcategory id="7" description="Lockheed F-104 Starfighter"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="McDonnell-Douglas F/A-18 Hornet">
+        <specific id="1" description="F/A-18A"/>
+        <specific id="2" description="F/A-18B"/>
+        <specific id="3" description="F/A-18C"/>
+        <specific id="4" description="F/A-18D"/>
+        <specific id="5" description="AF-18A"/>
+        <specific id="6" description="ATF-18A"/>
+        <specific id="7" description="CF-188A/B"/>
+        <specific id="8" description="C.15"/>
+        <specific id="9" description="CE.15"/>
+        <specific id="10" description="F/A-18E"/>
+        <specific id="11" description="F/A-18F"/>
+      </subcategory>
+      <subcategory id="10" description="Northrop F-5 Freedom Fighter/Tiger II">
+        <specific id="1" description="F-5A"/>
+        <specific id="2" description="F-5B"/>
+        <specific id="3" description="F-5E Tiger II"/>
+        <specific id="4" description="F-5F"/>
+        <specific id="5" description="RF-5A"/>
+        <specific id="6" description="RF-5E Tigereye"/>
+        <specific id="7" description="RF-5F"/>
+      </subcategory>
+      <subcategory id="11" description="Vought Crusader F-8">
+        <specific id="1" description="Crusader (Vought F-8E (FN))"/>
+      </subcategory>
+      <subcategory id="12" description="F-35 Joint Strike Fighter (JSF)">
+        <specific id="1" description="F-35A CTOL"/>
+        <specific id="2" description="F-35C Naval"/>
+        <specific id="3" description="F-35B STOVL"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Attack/Strike">
+      <subcategory id="1" description="McDonnell-Douglas A-4 Skyhawk"/>
+      <subcategory id="2" description="A-6 Intruder">
+        <specific id="1" description="A-6A"/>
+        <specific id="2" description="A-6B"/>
+        <specific id="3" description="A-6C"/>
+        <specific id="4" description="A-6E"/>
+      </subcategory>
+      <subcategory id="3" description="Vought A-7 Corsair II">
+        <specific id="1" description="A-7D"/>
+      </subcategory>
+      <subcategory id="4" description="Fairchild Republic A-10 Thunderbolt II">
+        <specific id="1" description="A-10A"/>
+        <specific id="2" description="OA-10A"/>
+      </subcategory>
+      <subcategory id="5" description="Cessna 318E Dragonfly">
+        <specific id="1" description="A-37"/>
+      </subcategory>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="McDonnell-Douglas AV-8B Harrier II">
+        <specific id="1" description="AV-8B"/>
+        <specific id="2" description="TAV-8B"/>
+        <specific id="3" description="Harrier GR. Mk 5"/>
+        <specific id="4" description="Harrier GR. Mk 5A"/>
+        <specific id="5" description="Harrier GR. Mk 7"/>
+        <specific id="6" description="Harrier T. Mk 10"/>
+        <specific id="7" description="VA.2 Matador II"/>
+      </subcategory>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="McDonnell-Douglas F-4 Phantom II">
+        <specific id="1" description="F-4G Wild Weasel"/>
+      </subcategory>
+      <subcategory id="11" description="Lockheed F-117A"/>
+      <subcategory id="12" description="General Dynamics F-111">
+        <specific id="1" description="F-111E"/>
+        <specific id="2" description="F-111F"/>
+        <specific id="3" description="F-111C"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Bomber">
+      <subcategory id="1" description="Rockwell International B-1">
+        <specific id="1" description="B-1B"/>
+      </subcategory>
+      <subcategory id="2" description="Northrop B-2"/>
+      <subcategory id="3" description="Boeing B-52 Stratofortress">
+        <specific id="1" description="B-52G"/>
+        <specific id="2" description="B-52H"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="Lockheed C-130 (Model 382) Hercules">
+        <specific id="1" description="C-130"/>
+        <specific id="2" description="AC-130">
+          <extra id="1" description="AC-130A"/>
+          <extra id="2" description="AC-130E"/>
+          <extra id="3" description="AC-130H"/>
+          <extra id="4" description="AC-130U"/>
+        </specific>
+        <specific id="3" description="DC-130"/>
+        <specific id="4" description="EC-130E Commando Solo"/>
+        <specific id="5" description="HC-130"/>
+        <specific id="6" description="JC-130"/>
+        <specific id="7" description="LC-130"/>
+        <specific id="8" description="MC-130">
+          <extra id="1" description="MC-130E"/>
+          <extra id="2" description="MC-130P"/>
+          <extra id="3" description="MC-130H"/>
+        </specific>
+        <specific id="9" description="NC-130"/>
+        <specific id="10" description="RC-130"/>
+        <specific id="11" description="WC-130"/>
+        <specific id="12" description="TC-130"/>
+        <specific id="13" description="KC-130"/>
+        <specific id="14" description="CC-130"/>
+        <specific id="15" description="Hercules C. Mk 1"/>
+        <specific id="16" description="Hercules C. Mk 2"/>
+        <specific id="17" description="Hercules C. Mk 3P"/>
+        <specific id="18" description="(deleted)"/>
+        <specific id="19" description="T.10"/>
+        <specific id="20" description="TK.10"/>
+        <specific id="21" description="TL.10"/>
+        <specific id="22" description="Tp 84"/>
+        <specific id="23" description="C-130H"/>
+        <specific id="24" description="C-130H-30"/>
+        <specific id="25" description="KC-130H"/>
+        <specific id="26" description="C-130H-MP"/>
+        <specific id="27" description="VC-130H"/>
+        <specific id="28" description="C-130J"/>
+        <specific id="29" description="C-130J-30"/>
+        <specific id="30" description="EC-130J Commando Solo"/>
+      </subcategory>
+      <subcategory id="2" description="Lockheed C-5 Galaxy">
+        <specific id="1" description="C-5A"/>
+        <specific id="2" description="C-5B"/>
+      </subcategory>
+      <subcategory id="3" description="Lockheed C-141 Starlifter">
+        <specific id="1" description="C-141A"/>
+        <specific id="2" description="C-141B"/>
+      </subcategory>
+      <subcategory id="4" description="C-135"/>
+      <subcategory id="5" description="Boeing KC-135 Stratotanker">
+        <specific id="1" description="KC-135A"/>
+        <specific id="2" description="KC-135E"/>
+        <specific id="3" description="KC-135Q"/>
+        <specific id="4" description="KC-135R"/>
+      </subcategory>
+      <subcategory id="6" description="McDonnell-Douglas KC-10 Extender">
+        <specific id="1" description="KC-10A"/>
+      </subcategory>
+      <subcategory id="7" description="Boeing 707 tanker/transport">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="T.17"/>
+      </subcategory>
+      <subcategory id="8" description="Boeing 707">
+        <specific id="1" description="VC-137"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="9" description="McDonnell-Douglas C-17A"/>
+      <subcategory id="10" description="Boeing 747">
+        <specific id="1" description="C-25A"/>
+        <specific id="2" description="VC-25A &quot;Air Force One&quot;"/>
+        <specific id="3" description="Boeing/Rockwell YAL-1 Airborne Laser (ABL)"/>
+      </subcategory>
+      <subcategory id="11" description="Gulfstream Aerospace Gulfstream III">
+        <specific id="1" description="C-20"/>
+      </subcategory>
+      <subcategory id="12" description="Learjet 35A/36A">
+        <specific id="1" description="C-21A"/>
+      </subcategory>
+      <subcategory id="13" description="Lockheed Model 1329-25 Jetstar II">
+        <specific id="1" description="C-140"/>
+      </subcategory>
+      <subcategory id="14" description="Douglas DC-3">
+        <specific id="1" description="C-47"/>
+        <specific id="2" description="R4D"/>
+        <specific id="3" description="Dakota"/>
+      </subcategory>
+      <subcategory id="15" description="McDonnell-Douglas DC-9">
+        <specific id="1" description="C-9A"/>
+        <specific id="2" description="VC-9C"/>
+        <specific id="3" description="C-9B"/>
+      </subcategory>
+      <subcategory id="16" description="Beechcraft Super King Air 200/B200">
+        <specific id="1" description="C-12"/>
+      </subcategory>
+      <subcategory id="17" description="Bell/Boeing V-22 Osprey">
+        <specific id="1" description="CV-22A"/>
+        <specific id="2" description="CV-22B"/>
+        <specific id="11" description="MV-22A"/>
+        <specific id="12" description="MV-22B"/>
+        <specific id="21" description="HV-22A"/>
+        <specific id="22" description="HV-22B"/>
+      </subcategory>
+      <subcategory id="18" description="Rockwell T-39 Saberliner"/>
+      <subcategory id="19" description="Grumman C-2A Greyhound (COD)"/>
+      <subcategory id="20" description="(deleted)"/>
+      <subcategory id="21" description="Lockheed Model L100">
+        <specific id="1" description="L100-30 (hospital)"/>
+      </subcategory>
+      <subcategory id="22" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Antisubmarine/patrol/observation">
+      <subcategory id="1" description="Lockheed Model 185/285 Orion">
+        <specific id="1" description="P-3"/>
+        <specific id="2" description="P-3C"/>
+        <specific id="3" description="UP-3"/>
+        <specific id="4" description="UP-3C"/>
+        <specific id="5" description="EP-3"/>
+        <specific id="6" description="P-3J"/>
+        <specific id="7" description="P-3W"/>
+        <specific id="8" description="P-3 AEW&amp;C"/>
+        <specific id="9" description="CF-140 Aurora"/>
+        <specific id="10" description="CP-140 Arcturus"/>
+        <specific id="11" description="EP-3E"/>
+        <specific id="12" description="AP-3C (Australia)"/>
+        <specific id="13" description="P3-K (Canada)"/>
+        <specific id="14" description="P-3F (Iran)"/>
+      </subcategory>
+      <subcategory id="2" description="Lockheed S-3 Viking">
+        <specific id="1" description="S-3B"/>
+        <specific id="2" description="ES-3"/>
+        <specific id="3" description="KS-3"/>
+      </subcategory>
+      <subcategory id="3" description="Rockwell International OV-10 Bronco">
+        <specific id="1" description="OV-10"/>
+        <specific id="2" description="OV-10D Plus"/>
+      </subcategory>
+      <subcategory id="4" description="Schweizer SA 2-37A">
+        <specific id="1" description="RG-8A"/>
+      </subcategory>
+      <subcategory id="5" description="Boeing P-8 Multi-Mission Maritime Aircraft (MMA)">
+        <specific id="1" description="P-8A"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Electronic Warfare (EW)">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="Grumman (General Dynamics) EF-111 Raven">
+        <specific id="1" description="EF-111A"/>
+      </subcategory>
+      <subcategory id="8" description="EC-130 Compass Call Electronic Combat (C2W)"/>
+      <subcategory id="9" description="Grumman EA-6 Prowler">
+        <specific id="1" description="EA-6A"/>
+        <specific id="2" description="EA-6B"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Reconnaissance">
+      <subcategory id="1" description="Lockheed SR-71 Blackbird">
+        <specific id="1" description="SR-71B"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Lockheed U-2">
+        <specific id="1" description="U-2R"/>
+        <specific id="2" description="ER-2"/>
+        <specific id="3" description="U-2S"/>
+      </subcategory>
+      <subcategory id="4" description="McDonnell-Douglas F-4 Phantom II">
+        <specific id="1" description="RF-4B"/>
+        <specific id="2" description="YRF-4C"/>
+        <specific id="3" description="RF-4C"/>
+        <specific id="4" description="RF-4E"/>
+        <specific id="5" description="RF-4EJ"/>
+      </subcategory>
+      <subcategory id="5" description="Sadler A-22 LASA"/>
+      <subcategory id="6" description="Boeing Canada DHC-7 Airborne Reconnaissance--Low (ARL)"/>
+      <subcategory id="7" description="Boeing RC-135">
+        <specific id="1" description="RC-135S Cobra Ball"/>
+        <specific id="2" description="RC-135U Combat Sent"/>
+        <specific id="3" description="RC-135 V/W Rivet Joint"/>
+        <specific id="4" description="RC-135X Cobra Eye"/>
+      </subcategory>
+      <subcategory id="8" description="Beechcraft Super King AIR 200/B200">
+        <specific id="1" description="RC-12H Guardrail Common Sensor"/>
+        <specific id="2" description="RC-12D"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Surveillance / C2 (Airborne Early Warning)">
+      <subcategory id="1" description="Grumman E-2 Hawkeye">
+        <specific id="1" description="E-2C"/>
+        <specific id="2" description="TE-2C"/>
+      </subcategory>
+      <subcategory id="2" description="EA-3">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="EA-3B"/>
+      </subcategory>
+      <subcategory id="3" description="Boeing E-6A Mercury (TACAMO II)"/>
+      <subcategory id="4" description="Boeing E-3 Sentry">
+        <specific id="1" description="E-3A Airborne Warning and Control System (AWACS)"/>
+        <specific id="2" description="E-3B AWACS"/>
+        <specific id="3" description="E-3C AWACS"/>
+        <specific id="4" description="E-3D Sentry AEW. Mk 1"/>
+        <specific id="5" description="E-3F System de Detection Aeroporte"/>
+        <specific id="6" description="KE-3A AWACS (Saudi Arabia)"/>
+      </subcategory>
+      <subcategory id="5" description="Boeing E-4 Advanced Airborne Command Post (AABNCP)">
+        <specific id="1" description="E-4A"/>
+        <specific id="2" description="E-4B"/>
+      </subcategory>
+      <subcategory id="6" description="E-8 (Joint STARS/JSTARS)">
+        <specific id="1" description="E-8A"/>
+        <specific id="2" description="E-8C"/>
+      </subcategory>
+      <subcategory id="7" description="Aerostat"/>
+      <subcategory id="8" description="EC-130E Airborne Command, Control and Communications (ABCCC)"/>
+      <subcategory id="9" description="EC-135 Airborne Command Post"/>
+      <subcategory id="10" description="JLENS Aerostats">
+        <specific id="1" description="JLENS PTIR Aerostat Platform"/>
+        <specific id="2" description="JLENS SuR Aerostat Plaftorm"/>
+      </subcategory>
+    </category>
+    <category id="20" description="Attack helicopter">
+      <subcategory id="1" description="McDonnell-Douglas AH-64 Apache">
+        <specific id="1" description="AH-64A"/>
+        <specific id="2" description="AH-64B"/>
+        <specific id="3" description="AH-64C"/>
+        <specific id="4" description="AH-64D with Longbow Radar"/>
+        <specific id="5" description="Petan (Cobra)"/>
+        <specific id="6" description="AH-64D without Longbow Radar"/>
+      </subcategory>
+      <subcategory id="2" description="Bell Model 209 Hueycobra, Seacobra, Supercobra">
+        <specific id="1" description="AH-1E"/>
+        <specific id="2" description="AH-1F"/>
+        <specific id="3" description="AH-1G"/>
+        <specific id="4" description="AH-1J"/>
+        <specific id="5" description="AH-1P"/>
+        <specific id="6" description="AH-1Q"/>
+        <specific id="7" description="AH-1R"/>
+        <specific id="8" description="AH-1S"/>
+        <specific id="9" description="AH-1T"/>
+        <specific id="10" description="AH-1W"/>
+        <specific id="11" description="AH-1W Venom"/>
+        <specific id="12" description="TH-1S"/>
+        <specific id="13" description="TH-1W"/>
+      </subcategory>
+      <subcategory id="3" description="Bell AH-1(4B)W Viper"/>
+      <subcategory id="4" description="Boeing/Sikorsky RAH-66 Comanche">
+        <specific id="1" description="RAH-66 with LONGBOW radar"/>
+      </subcategory>
+      <subcategory id="5" description="McDonnell-Douglas 500/530 Defender">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="AH-6"/>
+        <specific id="3" description="500MG"/>
+        <specific id="4" description="530MG"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="500 D/E"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Utility helicopter">
+      <subcategory id="1" description="Bell model 204 Iroquois">
+        <specific id="1" description="UH-1A"/>
+        <specific id="2" description="UH-1B"/>
+        <specific id="3" description="UH-1C"/>
+        <specific id="4" description="UH-1E"/>
+        <specific id="5" description="UH-1F"/>
+        <specific id="6" description="UH-1L"/>
+        <specific id="7" description="HH-1K"/>
+        <specific id="8" description="TH-1F"/>
+        <specific id="9" description="TH-1L"/>
+        <specific id="10" description="UH-1HP"/>
+      </subcategory>
+      <subcategory id="2" description="Sikorsky S-70A">
+        <specific id="1" description="UH-60A Blackhawk"/>
+        <specific id="2" description="UH-60L Blackhawk"/>
+        <specific id="3" description="EH-60C"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="VH-60N"/>
+        <specific id="6" description="UH-60P"/>
+        <specific id="7" description="S-70A-1"/>
+        <specific id="8" description="S-70A-1L"/>
+        <specific id="9" description="S-70A-5"/>
+        <specific id="10" description="S-70A-6"/>
+        <specific id="11" description="S-70A-9"/>
+        <specific id="12" description="S-70A-A9"/>
+        <specific id="13" description="S-70A-A11"/>
+        <specific id="14" description="S-70A-A12"/>
+        <specific id="15" description="S-70A-A14"/>
+        <specific id="16" description="S-70A-A16"/>
+        <specific id="17" description="S-70A-A17"/>
+        <specific id="18" description="S-70A-A18"/>
+        <specific id="19" description="S-70A-A19"/>
+        <specific id="20" description="S-70A-A20"/>
+        <specific id="21" description="S-70A-A21"/>
+        <specific id="22" description="S-70A-A22"/>
+        <specific id="23" description="S-70A-A24"/>
+      </subcategory>
+      <subcategory id="3" description="Boeing model 107">
+        <specific id="1" description="UH-46 Sea Knight"/>
+        <specific id="2" description="CH-46 Sea Knight">
+          <extra id="1" description="CH-46D"/>
+          <extra id="2" description="CH-46E"/>
+        </specific>
+      </subcategory>
+      <subcategory id="4" description="S-70C">
+        <specific id="1" description="H-60"/>
+      </subcategory>
+      <subcategory id="5" description="Sikorsky H-76 Eagle"/>
+      <subcategory id="6" description="Sikorsky-S-76b"/>
+    </category>
+    <category id="22" description="Antisubmarine Warfare/patrol helicopter">
+      <subcategory id="1" description="Kaman Seasprite and Super Seasprite">
+        <specific id="1" description="SH-2"/>
+      </subcategory>
+      <subcategory id="2" description="Agusta Sikorsky AS-61/ASH-3H Sea King">
+        <specific id="1" description="SH-3D"/>
+        <specific id="2" description="SH-3H"/>
+        <specific id="3" description="SH-3D/TS"/>
+        <specific id="4" description="ASH-3D"/>
+        <specific id="5" description="AS-61"/>
+        <specific id="6" description="SH-3B"/>
+      </subcategory>
+      <subcategory id="3" description="Sikorsky S-70B">
+        <specific id="1" description="SH-60B Seahawk"/>
+        <specific id="2" description="SH-60F Oceanhawk"/>
+        <specific id="3" description="HH-60H"/>
+        <specific id="4" description="HH-60J Jayhawk"/>
+        <specific id="5" description="HS.23"/>
+        <specific id="6" description="XSH-60J"/>
+        <specific id="7" description="UH-60J"/>
+        <specific id="8" description="S-70B-2"/>
+        <specific id="9" description="MH-60R Seahawk"/>
+      </subcategory>
+    </category>
+    <category id="23" description="Cargo helicopter">
+      <subcategory id="1" description="Boeing Models 114/414">
+        <specific id="1" description="CH-47 Chinook"/>
+        <specific id="2" description="CH-47B"/>
+        <specific id="3" description="CH-47C"/>
+        <specific id="4" description="CH-47D"/>
+        <specific id="5" description="CH-147"/>
+        <specific id="6" description="Chinook HC.Mk 1"/>
+        <specific id="7" description="Chinook HC.Mk 2"/>
+        <specific id="8" description="HT.17"/>
+      </subcategory>
+      <subcategory id="2" description="Sikorsky S-80/H-53">
+        <specific id="1" description="CH-53E Super Stallion"/>
+        <specific id="2" description="MH-53E Sea Dragon"/>
+        <specific id="3" description="S-80E"/>
+        <specific id="4" description="S-80M"/>
+      </subcategory>
+      <subcategory id="3" description="Sikorsky S-65A">
+        <specific id="1" description="CH-53A Sea Stallion"/>
+        <specific id="2" description="HH-53B"/>
+        <specific id="3" description="HH-53C"/>
+        <specific id="4" description="CH-53A"/>
+        <specific id="5" description="CH-53D"/>
+      </subcategory>
+    </category>
+    <category id="24" description="Observation helicopter">
+      <subcategory id="1" description="Bell Kiowa">
+        <specific id="1" description="OH-58"/>
+        <specific id="2" description="CH-136"/>
+        <specific id="3" description="OH-58C"/>
+      </subcategory>
+      <subcategory id="2" description="Bell Model 406 AHIP">
+        <specific id="1" description="OH-58D Kiowa/Kiowa Warrior"/>
+      </subcategory>
+      <subcategory id="3" description="Bell Model 406 CS Combat Scout">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="MH-58D Combat Scout"/>
+      </subcategory>
+    </category>
+    <category id="25" description="Special Operations helicopter">
+      <subcategory id="1" description="Sikorsky S-70A">
+        <specific id="1" description="MH-60A"/>
+        <specific id="2" description="MH-60G Pave Hawk"/>
+        <specific id="3" description="MH-60K"/>
+        <specific id="4" description="MH-60L"/>
+        <specific id="5" description="HH-60G"/>
+        <specific id="6" description="MH 60S Knight Hawk"/>
+      </subcategory>
+      <subcategory id="2" description="Boeing models 114/414">
+        <specific id="1" description="MH-47E"/>
+      </subcategory>
+      <subcategory id="3" description="Sikorsky S-65/MH-53 Pave Low">
+        <specific id="1" description="HH-53B"/>
+        <specific id="2" description="HH-53C"/>
+        <specific id="3" description="CH-53C"/>
+        <specific id="4" description="MH-53J Pave Low III"/>
+        <specific id="5" description="MH-53M Pave Low IV"/>
+        <specific id="6" description="RH-53D"/>
+      </subcategory>
+      <subcategory id="4" description="McDonnell-Douglas 500/530 Defender">
+        <specific id="1" description="MH-6"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="MH-6J"/>
+      </subcategory>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Cessna 172">
+        <specific id="1" description="T-41"/>
+      </subcategory>
+      <subcategory id="2" description="Cessna 318">
+        <specific id="1" description="T-37"/>
+      </subcategory>
+      <subcategory id="3" description="Northrop Talon">
+        <specific id="1" description="T-38"/>
+      </subcategory>
+      <subcategory id="4" description="McDonnell-Douglas/BAe T45TS">
+        <specific id="1" description="T-45 Goshawk"/>
+      </subcategory>
+      <subcategory id="5" description="Beechcraft T-34C">
+        <specific id="1" description="T-34C"/>
+      </subcategory>
+      <subcategory id="6" description="Beechcraft Sierrra 200/Sundowner 180">
+        <specific id="1" description="CT-134A Musketeer II"/>
+      </subcategory>
+      <subcategory id="7" description="Lockheed T-33">
+        <specific id="1" description="Silver Star"/>
+      </subcategory>
+      <subcategory id="8" description="Beechcraft Model 400A Beechjet">
+        <specific id="1" description="T-1A Jayhawk"/>
+      </subcategory>
+      <subcategory id="9" description="Boeing TC-135">
+        <specific id="1" description="TC-135W Rivet Joint Trainer"/>
+        <specific id="2" description="TC-135S Cobra Ball Trainer"/>
+      </subcategory>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="Cessna 208 Caravan"/>
+      <subcategory id="12" description="Cessna Citation"/>
+      <subcategory id="13" description="Raytheon / Pilatus PC-9 Mk II (Beech Mk II)">
+        <specific id="1" description="T-6A Texan II"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Unmanned">
+      <subcategory id="1" description="RQ-5A Hunter"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Maneuver UAV"/>
+      <subcategory id="4" description="Predator Medium Altitude Endurance UAV">
+        <specific id="1" description="RQ-1K Predator"/>
+        <specific id="2" description="RQ-1L Predator"/>
+        <specific id="3" description="MQ-1L Armed Predator"/>
+        <specific id="4" description="MQ-9A Predator B"/>
+      </subcategory>
+      <subcategory id="5" description="Lockheed Martin / Boeing Darkstar UAV"/>
+      <subcategory id="6" description="Global Hawk UAV">
+        <specific id="1" description="RQ-4A"/>
+      </subcategory>
+      <subcategory id="7" description="Alliant Techsystems Outrider UAV (formerly known as the Tactical UAV or TUAV)"/>
+      <subcategory id="8" description="RQ-7 Shadow UAV">
+        <specific id="1" description="RQ-7A"/>
+        <specific id="2" description="RQ-7B"/>
+      </subcategory>
+      <subcategory id="9" description="Pioneer UAV"/>
+      <subcategory id="10" description="BQM-74 Chukar"/>
+      <subcategory id="11" description="MQM-107 Streaker"/>
+      <subcategory id="12" description="MTR-15 Ballistic Aerial Target System (BATS)"/>
+      <subcategory id="13" description="FQM-117 Radio Controlled Minature Aerial Target (RCMAT)"/>
+      <subcategory id="14" description="QUH-1 Iroquois Target"/>
+      <subcategory id="15" description="QF-4 Phantom Target"/>
+      <subcategory id="16" description="QF-106 Delta Dart Target"/>
+      <subcategory id="17" description="MQM-8 Vandel"/>
+      <subcategory id="18" description="AQM-37 Challenger"/>
+      <subcategory id="19" description="TDU-34 Rigid Tow Target"/>
+      <subcategory id="20" description="Javelin (BAI Aerosystems lightweight airborne video system)"/>
+      <subcategory id="21" description="X-47A Pegasus UCAV"/>
+      <subcategory id="22" description="FQM-151 Pointer"/>
+      <subcategory id="23" description="BQM-34 Firebee"/>
+      <subcategory id="24" description="X-45 UCAV">
+        <specific id="1" description="X-45A"/>
+        <specific id="2" description="X-45C"/>
+      </subcategory>
+      <subcategory id="25" description="Boeing ScanEagle">
+        <specific id="1" description="ScanEagle A-15"/>
+        <specific id="2" description="ScanEagle Dual-Bay"/>
+      </subcategory>
+      <subcategory id="26" description="Boeing A-160 Hummingbird"/>
+      <subcategory id="27" description="Interim Small UAV, Raven"/>
+      <subcategory id="28" description="FCS UAV Class I"/>
+      <subcategory id="29" description="FCS UAV Class II"/>
+      <subcategory id="30" description="FCS UAV Class III"/>
+      <subcategory id="31" description="FCS UAV Class IV">
+        <specific id="1" description="FCS UAV Class IV-a"/>
+        <specific id="2" description="FCS UAV Class IV-b"/>
+      </subcategory>
+    </category>
+    <category id="57" description="Non-Combatant Commercial Aircraft">
+      <subcategory id="1" description="Passenger Airline">
+        <specific id="1" description="Boeing 747-400"/>
+        <specific id="2" description="Boeing 757-200"/>
+        <specific id="3" description="MD-82"/>
+        <specific id="4" description="MD-82T"/>
+        <specific id="5" description="MD-90-30-T"/>
+        <specific id="6" description="Boeing 727"/>
+        <specific id="7" description="Boeing 737"/>
+        <specific id="8" description="Boeing 767"/>
+        <specific id="9" description="DC-10"/>
+        <specific id="10" description="Lockheed L-1011 Tristar"/>
+        <specific id="11" description="Boeing 707"/>
+        <specific id="12" description="Boeing 717"/>
+        <specific id="13" description="Beech 1900"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="225">
+    <category id="1" description="Carrier">
+      <subcategory id="1" description="Nimitz Class">
+        <specific id="1" description="CVN 68 Nimitz"/>
+        <specific id="2" description="CVN 69 Dwight D. Eisenhower"/>
+        <specific id="3" description="CVN 70 Carl Vinson"/>
+        <specific id="4" description="CVN 71 Theodore Roosevelt"/>
+        <specific id="5" description="CVN 72 Abraham Lincoln"/>
+        <specific id="6" description="CVN 73 George Washington"/>
+        <specific id="7" description="CVN 74 John C. Stennis"/>
+        <specific id="8" description="CVN 75 Harry S. Truman"/>
+        <specific id="9" description="CVN 76 Ronald Reagen"/>
+      </subcategory>
+      <subcategory id="2" description="Enterprise Class">
+        <specific id="1" description="CVN 65 Enterprise"/>
+      </subcategory>
+      <subcategory id="3" description="Kitty Hawk/John F. Kennedy Class">
+        <specific id="1" description="CV 63 Kitty Hawk"/>
+        <specific id="2" description="CV 64 Constellation"/>
+        <specific id="3" description="CV 66 America"/>
+        <specific id="4" description="CV 67 John F. Kennedy"/>
+      </subcategory>
+      <subcategory id="4" description="Forrestal Class">
+        <specific id="1" description="AVT 59 Forrestal"/>
+        <specific id="2" description="CV 60 Saratoga"/>
+        <specific id="3" description="CV 61 Ranger"/>
+        <specific id="4" description="CV 62 Independence"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Command Ship/Cruiser">
+      <subcategory id="1" description="Blue Ridge Class">
+        <specific id="1" description="LCC 19 Blue Ridge"/>
+        <specific id="2" description="LLC 20 Mount Whitney"/>
+      </subcategory>
+      <subcategory id="2" description="Raleigh and Austin Classes">
+        <specific id="1" description="AGF 11 Coronado"/>
+        <specific id="2" description="AGF 3 La Salle"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Guided Missile Cruiser">
+      <subcategory id="1" description="Ticonderoga Class">
+        <specific id="1" description="CG 47 Ticonderoga"/>
+        <specific id="2" description="CG 48 Yorktown"/>
+        <specific id="3" description="CG 49 Vincennes"/>
+        <specific id="4" description="CG 50 Valley Forge"/>
+        <specific id="5" description="CG 51 Thomas S. Gates"/>
+        <specific id="6" description="CG 52 Bunker Hill"/>
+        <specific id="7" description="CG 53 Mobile Bay"/>
+        <specific id="8" description="CG 54 Antietam"/>
+        <specific id="9" description="CG 55 Leyte Gulf"/>
+        <specific id="10" description="CG 56 San Jacinto"/>
+        <specific id="11" description="CG 57 Lake Champlain"/>
+        <specific id="12" description="CG 58 Philippine Sea"/>
+        <specific id="13" description="CG 59 Princeton"/>
+        <specific id="14" description="CG 60 Normandy"/>
+        <specific id="15" description="CG 61 Monterey"/>
+        <specific id="16" description="CG 62 Chancellorsville"/>
+        <specific id="17" description="CG 63 Cowpens"/>
+        <specific id="18" description="CG 64 Gettysburg"/>
+        <specific id="19" description="CG 65 Chosin"/>
+        <specific id="20" description="CG 66 Hue City"/>
+        <specific id="21" description="CG 67 Shiloh"/>
+        <specific id="22" description="CG 68 Anzio"/>
+        <specific id="23" description="CG 69 Vicksburg"/>
+        <specific id="24" description="CG 70 Lake Erie"/>
+        <specific id="25" description="CG 71 Cape St. George"/>
+        <specific id="26" description="CG 72 Vella Gulf"/>
+        <specific id="27" description="CG 73 Port Royal"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="California Class">
+        <specific id="1" description="CGN 36 California"/>
+        <specific id="2" description="CGN 37 South Carolina"/>
+      </subcategory>
+      <subcategory id="4" description="Truxtun Class">
+        <specific id="1" description="CGN 35 Truxtun"/>
+      </subcategory>
+      <subcategory id="5" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="6" description="Bainbridge Class">
+        <specific id="1" description="CGN 25 Bainbridge"/>
+      </subcategory>
+      <subcategory id="7" description="Leahy Class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="CG 19 Dale"/>
+        <specific id="5" description="CG 20 R. K. Turner"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Guided Missile Destroyer">
+      <subcategory id="1" description="Arleigh Burke Class">
+        <specific id="1" description="DDG 51 Arleigh Burke"/>
+        <specific id="2" description="DDG 52 Barry"/>
+        <specific id="3" description="DDG 53 John Paul Jones"/>
+        <specific id="4" description="DDG 54 Curtis Wilbur"/>
+        <specific id="5" description="DDG 55 Stout"/>
+        <specific id="6" description="DDG 56 John S. McCain"/>
+        <specific id="7" description="DDG 57 Mitscher"/>
+        <specific id="8" description="DDG 58 Laboon"/>
+        <specific id="9" description="DDG 59 Russell"/>
+        <specific id="10" description="DDG 60 Paul Hamilton"/>
+        <specific id="11" description="DDG 61 Ramage"/>
+        <specific id="12" description="DDG 62 Fitzgerald"/>
+        <specific id="13" description="DDG 63 Stethem"/>
+        <specific id="14" description="DDG 64 Carney"/>
+        <specific id="15" description="DDG 65 Benfold"/>
+        <specific id="16" description="DDG 66 Gonzalez"/>
+        <specific id="17" description="DDG 67 Cole"/>
+        <specific id="18" description="DDG 68 The Sullivans"/>
+        <specific id="19" description="DDG 69 Milius"/>
+        <specific id="20" description="DDG 70 Hopper"/>
+        <specific id="21" description="DDG 71 Ross"/>
+        <specific id="22" description="DDG 72 Mahan"/>
+        <specific id="23" description="DDG 73 DeCatur"/>
+        <specific id="24" description="DDG 74 McFaul"/>
+        <specific id="25" description="DDG 75 Donald Cook"/>
+        <specific id="26" description="DDG 76 Higgins"/>
+        <specific id="27" description="DDG 77 O'Kane"/>
+        <specific id="28" description="DDG 78 Porter"/>
+        <specific id="29" description="DDG 79 Oscar Austin"/>
+        <specific id="30" description="DDG 80 Roosevelt"/>
+        <specific id="31" description="DDG 81 Winston Churchill"/>
+        <specific id="32" description="DDG 82 Lassen"/>
+        <specific id="33" description="DDG 83 Howard"/>
+        <specific id="34" description="DDG 84 Buckeley"/>
+        <specific id="35" description="DDG 85 McCampbell"/>
+        <specific id="36" description="DDG 86 Shoup"/>
+        <specific id="37" description="DDG 87 Mason"/>
+        <specific id="38" description="DDG 88 Preble"/>
+        <specific id="39" description="DDG 89 Mustin"/>
+        <specific id="40" description="DDG 90 Chafee"/>
+        <specific id="41" description="DDG 91 Pinckney"/>
+        <specific id="42" description="DDG 92 Momsen"/>
+        <specific id="43" description="DDG 93 Chung-Hoon"/>
+        <specific id="44" description="DDG 94 Nitze"/>
+        <specific id="45" description="DDG 95 James E. Williams"/>
+        <specific id="46" description="DDG 96 Bainbridge"/>
+        <specific id="47" description="DDG 97 Halsey"/>
+        <specific id="48" description="DDG 98 Forest Sherman"/>
+        <specific id="49" description="DDG 99 Farragut"/>
+        <specific id="50" description="DDG 100 Kidd"/>
+        <specific id="51" description="DDG 101 Gridley"/>
+        <specific id="52" description="DDG 102 Sampson"/>
+        <specific id="53" description="DDG 103 Truxtun"/>
+        <specific id="54" description="DDG 104 Sterett"/>
+        <specific id="55" description="DDG 105 Dewey"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="Coontz Class">
+        <specific id="1" description="DDG 39 MacDonough"/>
+        <specific id="2" description="DDG 43 Dahlgren"/>
+      </subcategory>
+      <subcategory id="4" description="Charles F. Adams Class">
+        <specific id="1" description="DDG 2 Charles F. Adams"/>
+      </subcategory>
+      <subcategory id="5" description="Modified Charles F. Adams Class">
+        <specific id="1" description="DDG 38 Perth (Australia)"/>
+        <specific id="2" description="DDG 39 Hobart (Australia)"/>
+        <specific id="3" description="DDG 41 Brisbane (Australia)"/>
+      </subcategory>
+      <subcategory id="6" description="Fletcher and Allen M Summer Class">
+        <specific id="1" description="DDG 906 Huei Yang (ex. English DDG 696) (Taiwan)"/>
+        <specific id="2" description="DDG 908 Kuei Yang (ex. Twining DD 540) (Taiwan)"/>
+        <specific id="3" description="DDG 909 Chin Yang (ex. Mullany DD 528) (Taiwan)"/>
+        <specific id="4" description="DDG 914 Loa Yang (ex. Taussig DD 746) (Taiwan)"/>
+        <specific id="5" description="DDG 917 Nan Yang (ex.Thomason DD760) (Taiwan)"/>
+        <specific id="6" description="DDG 918 An Yang (ex. Kimberly DD 521) (Taiwan)"/>
+        <specific id="7" description="DDG 919 Kun Yang (ex. Yarnall DD 541) (Taiwan)"/>
+      </subcategory>
+      <subcategory id="7" description="Gearing (Wu Chin I and II Conversions) (FRAM I and II) Class">
+        <specific id="1" description="DDG 907 Fu Yang (ex. Ernest G. Small DD 838) (FRAM II) (Taiwan)"/>
+        <specific id="2" description="DDG 915 Han Yang (ex. Herbert J. Thomas DD 833) (Taiwan)"/>
+        <specific id="3" description="DDG 924 Kai Yang (ex. Richard B. Anderson DD 786) (Taiwan)"/>
+        <specific id="4" description="DDG 926 Shuei Yang (ex. Hawkins DD 873) (Taiwan)"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Destroyer">
+      <subcategory id="1" description="Spruance Class">
+        <specific id="1" description="DD 963 Spruance"/>
+        <specific id="2" description="DD 964 Paul F. Foster"/>
+        <specific id="3" description="DD 965 Kinkaid"/>
+        <specific id="4" description="DD 966 Hewitt"/>
+        <specific id="5" description="DD 967 Elliott"/>
+        <specific id="6" description="DD 968 A. W. Radford"/>
+        <specific id="7" description="DD 969 Peterson"/>
+        <specific id="8" description="DD 970 Caron"/>
+        <specific id="9" description="DD 971 David R. Ray"/>
+        <specific id="10" description="DD 972 Olendorf"/>
+        <specific id="11" description="DD 973 John Young"/>
+        <specific id="12" description="DD 974 Comte De Grasse"/>
+        <specific id="13" description="DD 975 O'Brien"/>
+        <specific id="14" description="DD 976 Merrill"/>
+        <specific id="15" description="DD 977 Briscoe"/>
+        <specific id="16" description="DD 978 Stump"/>
+        <specific id="17" description="DD 979 Conolly"/>
+        <specific id="18" description="DD 980 Moosebrugger"/>
+        <specific id="19" description="DD 981 John Hancock"/>
+        <specific id="20" description="DD 982 Nicholson"/>
+        <specific id="21" description="DD 983 John Rodgers"/>
+        <specific id="22" description="DD 984 Leftwich"/>
+        <specific id="23" description="DD 985 Cushing"/>
+        <specific id="24" description="DD 986 Harry W. Hill"/>
+        <specific id="25" description="DD 987 O'Bannon"/>
+        <specific id="26" description="DD 988 Thorn"/>
+        <specific id="27" description="DD 989 Deyo"/>
+        <specific id="28" description="DD 990 Ingersoll"/>
+        <specific id="29" description="DD 991 Fife"/>
+        <specific id="30" description="DD 992 Fletcher"/>
+        <specific id="31" description="DD 997 Hayler"/>
+      </subcategory>
+      <subcategory id="2" description="Modified Gearing FRAM I Class (Turkey)"/>
+      <subcategory id="3" description="Gearing (Wu Chin III Conversion) (FRAM I) Class">
+        <specific id="1" description="DD 912 Chien Yang (ex. James E. Kyes DD 787) (Taiwan)"/>
+        <specific id="2" description="DD 921 Liao Yang (ex. Hanson DD 832) (Taiwan)"/>
+        <specific id="3" description="DD 929 Shao Yang (ex. Hollister DD 788) (Taiwan)"/>
+        <specific id="4" description="DD 925 Te Yang (ex. Sarsfield DD 837) (Taiwan)"/>
+        <specific id="5" description="DD 928 Chen Yang (ex. Johnston DD 821) (Taiwan)"/>
+        <specific id="6" description="DD 923 Shen Yang (ex. Power DD 839) (Taiwan)"/>
+        <specific id="7" description="DD 927 Yun Yang (ex. Hamner DD 718 ) (Taiwan)"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided Missile Frigate">
+      <subcategory id="1" description="Oliver Perry Class">
+        <specific id="1" description="FFG 7 O.H. Perry"/>
+        <specific id="2" description="FFG 8 McInerney"/>
+        <specific id="3" description="FFG 9 Wadsworth"/>
+        <specific id="4" description="FFG 10 Duncan"/>
+        <specific id="5" description="FFG 11 Clark"/>
+        <specific id="6" description="FFG 12 George Philip"/>
+        <specific id="7" description="FFG 13 Sam E. Morison"/>
+        <specific id="8" description="FFG 14 Sides"/>
+        <specific id="9" description="FFG 15 Estocin"/>
+        <specific id="10" description="FFG 16 Clifton Sprauge"/>
+        <specific id="11" description="FFG 19 John A. Moore"/>
+        <specific id="12" description="FFG 20 Antrim"/>
+        <specific id="13" description="FFG 21 Flatley"/>
+        <specific id="14" description="FFG 22 Fahrion"/>
+        <specific id="15" description="FFG 23 Lewis B. Puller"/>
+        <specific id="16" description="FFG 24 Jack Williams"/>
+        <specific id="17" description="FFG 25 Copeland"/>
+        <specific id="18" description="FFG 26 Gallery"/>
+        <specific id="19" description="FFG 27 M. S. Tisdale"/>
+        <specific id="20" description="FFG 28 Boone"/>
+        <specific id="21" description="FFG 29 S. W. Groves"/>
+        <specific id="22" description="FFG 30 Reid"/>
+        <specific id="23" description="FFG 31 Stark"/>
+        <specific id="24" description="FFG 32 John L. Hall"/>
+        <specific id="25" description="FFG 33 Jarrett"/>
+        <specific id="26" description="FFG 34 Aubrey Fitch"/>
+        <specific id="27" description="FFG 36 Underwood"/>
+        <specific id="28" description="FFG 37 Crommelin"/>
+        <specific id="29" description="FFG 38 Curts"/>
+        <specific id="30" description="FFG 39 Doyle"/>
+        <specific id="31" description="FFG 40 Halyburton"/>
+        <specific id="32" description="FFG 41 McClusky"/>
+        <specific id="33" description="FFG 42 Klakring"/>
+        <specific id="34" description="FFG 43 Thatch"/>
+        <specific id="35" description="FFG 45 De Wert"/>
+        <specific id="36" description="FFG 46 Rentz"/>
+        <specific id="37" description="FFG 47 Nicholas"/>
+        <specific id="38" description="FFG 48 Vandegrift"/>
+        <specific id="39" description="FFG 49 R. G. Bradley"/>
+        <specific id="40" description="FFG 50 Jesse L. Taylor"/>
+        <specific id="41" description="FFG 51 Gary"/>
+        <specific id="42" description="FFG 52 Carr"/>
+        <specific id="43" description="FFG 53 Hawes"/>
+        <specific id="44" description="FFG 54 Ford"/>
+        <specific id="45" description="FFG 55 Elrod"/>
+        <specific id="46" description="FFG 56 Simpson"/>
+        <specific id="47" description="FFG 57 Reuben James"/>
+        <specific id="48" description="FFG 58 Sam B. Roberts"/>
+        <specific id="49" description="FFG 59 Kauffman"/>
+        <specific id="50" description="FFG 60 Rodney M. Davis"/>
+        <specific id="51" description="FFG 61 Ingraham"/>
+        <specific id="52" description="F 81 Santa Maria (Spain)"/>
+        <specific id="53" description="F 82 Victoria (Spain)"/>
+        <specific id="54" description="F 83 Numancia (Spain)"/>
+        <specific id="55" description="F 84 Reina Sofia (Spain)"/>
+        <specific id="56" description="F 85 Navarra (Spain)"/>
+        <specific id="57" description="F 86 Canarias (Spain)"/>
+        <specific id="58" description="FFG 01 Adelaide (Australia)"/>
+        <specific id="59" description="FFG 02 Canberra (Australia)"/>
+        <specific id="60" description="FFG 03 Sydney (Australia)"/>
+        <specific id="61" description="FFG 04 Darwin (Australia)"/>
+        <specific id="62" description="FFG 05 Melbourne (Australia)"/>
+        <specific id="63" description="FFG 06 Newcastle (Australia)"/>
+      </subcategory>
+      <subcategory id="2" description="Knox Class">
+        <specific id="1" description="FFG 932 Chin Yang (ex. Robert E. Perry FF 1073) (Taiwan)"/>
+        <specific id="2" description="FFG 933 Fong Yang (ex. Brewton FF 1086) (Taiwan)"/>
+        <specific id="3" description="FFG 934 Feng Yang (ex. Kirk FF 1087) (Taiwan)"/>
+        <specific id="4" description="FFG 935 Lan Yang (ex. Joseph Hewes FF 1078) (Taiwan)"/>
+        <specific id="5" description="FFG 936 Hae Yang (ex. Cook FF 1083) (Taiwan)"/>
+        <specific id="6" description="FFG 937 Hwai Yang (ex. Barbey FF 1088) (Taiwan)"/>
+        <specific id="7" description="FFG 938 (ex. Downes FF 1070) (Taiwan)"/>
+        <specific id="8" description="FFG 939 (ex. Aylwin FF 1081) (Taiwan)"/>
+      </subcategory>
+      <subcategory id="3" description="Modified Oliver Perry Class"/>
+    </category>
+    <category id="7" description="Light/patrol craft">
+      <subcategory id="1" description="PC Class">
+        <specific id="1" description="PC 1 Cyclone"/>
+        <specific id="2" description="PC 2 Tempest"/>
+        <specific id="3" description="PC 3 Hurricane"/>
+        <specific id="4" description="PC 4 Monsoon"/>
+        <specific id="5" description="PC 5 Typhoon"/>
+        <specific id="6" description="PC 6 Sirocco"/>
+        <specific id="7" description="PC 7 Squall"/>
+        <specific id="8" description="PC 8 Zephyr"/>
+        <specific id="9" description="PC 9 Chinook"/>
+        <specific id="10" description="PC 10 Firebolt"/>
+        <specific id="11" description="PC 11 Whirlwind"/>
+        <specific id="12" description="PC 12 Thunderbolt"/>
+        <specific id="13" description="PC 13 Shamal"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine countermeasure ship/craft">
+      <subcategory id="1" description="Osprey class">
+        <specific id="1" description="MHC 51 Osprey"/>
+        <specific id="2" description="MHC 52 Heron"/>
+        <specific id="3" description="MHC 53 Pelican"/>
+        <specific id="4" description="MHC 54 Robin"/>
+        <specific id="5" description="MHC 55 Oriole"/>
+        <specific id="6" description="MHC 56 Kingfisher"/>
+        <specific id="7" description="MHC 57 Cormorant"/>
+        <specific id="8" description="MHC 58 Blackhawk"/>
+        <specific id="9" description="MHC 59 Falcon"/>
+        <specific id="10" description="MHC 60 Cardinal"/>
+        <specific id="11" description="MHC 61 Raven"/>
+        <specific id="12" description="MHC 62 Shrike"/>
+      </subcategory>
+      <subcategory id="2" description="Avenger Class">
+        <specific id="1" description="MCM 1 Avenger"/>
+        <specific id="2" description="MCM 2 Defender"/>
+        <specific id="3" description="MCM 3 Sentry"/>
+        <specific id="4" description="MCM 4 Champion"/>
+        <specific id="5" description="MCM 5 Guardian"/>
+        <specific id="6" description="MCM 6 Devastator"/>
+        <specific id="7" description="MCM 7 Patriot"/>
+        <specific id="8" description="MCM 8 Scout"/>
+        <specific id="9" description="MCM 9 Pioneer"/>
+        <specific id="10" description="MCM 10 Warrior"/>
+        <specific id="11" description="MCM 11 Gladiator"/>
+        <specific id="12" description="MCM 12 Ardent"/>
+        <specific id="13" description="MCM 13 Dextrous"/>
+        <specific id="14" description="MCM 14 Chief"/>
+      </subcategory>
+      <subcategory id="3" description="Acme Class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="MSO 511 Affray"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="(deleted)"/>
+        <specific id="11" description="(deleted)"/>
+        <specific id="12" description="(deleted)"/>
+        <specific id="13" description="(deleted)"/>
+        <specific id="14" description="(deleted)"/>
+        <specific id="15" description="(deleted)"/>
+        <specific id="16" description="(deleted)"/>
+        <specific id="17" description="(deleted)"/>
+        <specific id="18" description="(deleted)"/>
+        <specific id="19" description="(deleted)"/>
+      </subcategory>
+    </category>
+    <category id="9" description="Dock Landing Ship">
+      <subcategory id="1" description="Whidbey Island Class">
+        <specific id="1" description="LSD 41 Whidbey Island"/>
+        <specific id="2" description="LSD 42 Germantown"/>
+        <specific id="3" description="LSD 43 Fort McHenry"/>
+        <specific id="4" description="LSD 44 Gunston Hall"/>
+        <specific id="5" description="LSD 45 Comstock"/>
+        <specific id="6" description="LSD 46 Tortuga"/>
+        <specific id="7" description="LSD 47 Rushmore"/>
+        <specific id="8" description="LSD 48 Ashland"/>
+        <specific id="9" description="LSD 49 Harpers Ferry"/>
+        <specific id="10" description="LSD 50 Carter Hall"/>
+        <specific id="11" description="LSD 51 Oak Hill"/>
+        <specific id="12" description="LSD 52 Pearl Harbor"/>
+      </subcategory>
+      <subcategory id="2" description="Anchorage Class">
+        <specific id="1" description="LSD 36 Anchorage"/>
+        <specific id="2" description="LSD 37 Portland"/>
+        <specific id="3" description="LSD 38 Pensacola"/>
+        <specific id="4" description="LSD 39 Mount Vernon"/>
+        <specific id="5" description="LSD 40 Fort Fisher"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Tank Landing Ship">
+      <subcategory id="1" description="Newport Class">
+        <specific id="1" description="LST 1179 Newport"/>
+        <specific id="2" description="LST 1180 Manitowac"/>
+        <specific id="3" description="LST 1181 Sumter"/>
+        <specific id="4" description="LST 1182 Fresno"/>
+        <specific id="5" description="LST 1183 Peoria"/>
+        <specific id="6" description="LST 1184 Frederick"/>
+        <specific id="7" description="LST 1185 Schenectady"/>
+        <specific id="8" description="LST 1186 Cayuga"/>
+        <specific id="9" description="LST 1187 Tuscaloosa"/>
+        <specific id="10" description="LST 1188 Saginaw"/>
+        <specific id="11" description="LST 1189 San Bernardino"/>
+        <specific id="12" description="LST 1190 Boulder"/>
+        <specific id="13" description="LST 1191 Racine"/>
+        <specific id="14" description="LST 1192 Spartanburg County"/>
+        <specific id="15" description="LST 1193 Fairfax County"/>
+        <specific id="16" description="LST 1194 La Moure County"/>
+        <specific id="17" description="(deleted)"/>
+        <specific id="18" description="LST 1196 Harlan County"/>
+        <specific id="19" description="LST 1197 Barnstable County"/>
+        <specific id="20" description="LST 1198 Bristol County"/>
+      </subcategory>
+      <subcategory id="2" description="Newport Class LPA/LST (modified)">
+        <specific id="1" description="L51 Kanimbla (ex. Saginaw)"/>
+        <specific id="2" description="L52 Manoora (ex. Fairfax County)"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="Landing Craft Air Cusion (LCAC)"/>
+      <subcategory id="2" description="LCU 1600 Class: Utility Landing Craft"/>
+      <subcategory id="3" description="LCU 6 Type: Mechanized Landing Craft"/>
+      <subcategory id="4" description="Landing Craft Personnel (LCPL)"/>
+      <subcategory id="5" description="Amphibious Assault Vehicle (AAV)"/>
+      <subcategory id="6" description="LCU 1610 Class (Transport) (YFU) (Saudia Arabia)">
+        <specific id="1" description="212 Al Qiaq (Saudia Arabia)"/>
+      </subcategory>
+    </category>
+    <category id="14" description="Hydrofoil">
+      <subcategory id="1" description="Pegasus class">
+        <specific id="1" description="PHM 1 Pegasus"/>
+        <specific id="2" description="PHM 2 Hercules"/>
+        <specific id="3" description="PHM 3 Taurus"/>
+        <specific id="4" description="PHM 4 Aquila"/>
+        <specific id="5" description="PHM 5 Aries"/>
+        <specific id="6" description="PHM 6 Gemini"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Cimarron class (Fleet Oilers)">
+        <specific id="1" description="AO 177 Cimarron"/>
+        <specific id="2" description="AO 178 Monongahela"/>
+        <specific id="3" description="AO 179 Merrimack"/>
+        <specific id="4" description="AO 180 Willamette"/>
+        <specific id="5" description="AO 186 Platte"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="Wichita class (Replenishment Oilers)">
+        <specific id="1" description="AOR 1 Wichita"/>
+        <specific id="2" description="AOR 2 Milwaukee"/>
+        <specific id="3" description="AOR 3 Kansas City"/>
+        <specific id="4" description="AOR 4 Savannah"/>
+        <specific id="5" description="AOR 5 Wabash"/>
+        <specific id="6" description="AOR 6 Kalamazoo"/>
+        <specific id="7" description="AOR 7 Roanoke"/>
+      </subcategory>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="Vulcan class (Repair Ship)">
+        <specific id="1" description="AR 8 Jason"/>
+      </subcategory>
+      <subcategory id="13" description="Fulton class (Submarine Tenders)">
+        <specific id="1" description="AS 18 Orion"/>
+      </subcategory>
+      <subcategory id="14" description="Proteus class (Submarine Tenders)">
+        <specific id="1" description="AS 19 Proteus"/>
+      </subcategory>
+      <subcategory id="15" description="Hunley class (Submarine Tenders)">
+        <specific id="1" description="AS 31 Hunley"/>
+        <specific id="2" description="AS 32 Holland"/>
+      </subcategory>
+      <subcategory id="16" description="Simon Lake class (Submarine Tenders)">
+        <specific id="1" description="AS 33 Simon Lake"/>
+        <specific id="2" description="AS 34 Canopus"/>
+      </subcategory>
+      <subcategory id="17" description="Spear class (Submarine Tenders)">
+        <specific id="1" description="AS 36 L. Y. Spear"/>
+        <specific id="2" description="AS 37 Dixon"/>
+      </subcategory>
+      <subcategory id="18" description="Emory S. Land class (Submarine Tenders)">
+        <specific id="1" description="AS 39 Emory S. Land"/>
+        <specific id="2" description="AS 40 Frank Cable"/>
+        <specific id="3" description="AS 41 McKee"/>
+      </subcategory>
+      <subcategory id="19" description="Bolster class (Salvage Ships)">
+        <specific id="1" description="ARS 8 Preserver"/>
+        <specific id="2" description="ARS 38 Bolster"/>
+        <specific id="3" description="ARS 39 Conserver"/>
+        <specific id="4" description="ARS 40 Hoist"/>
+        <specific id="5" description="ARS 41 Opportune"/>
+        <specific id="6" description="ARS 42 Reclaimer"/>
+        <specific id="7" description="ARS 43 Recovery"/>
+      </subcategory>
+      <subcategory id="20" description="Safeguard class (Salvage Ships)">
+        <specific id="1" description="ARS 50 Safeguard"/>
+        <specific id="2" description="ARS 51 Grasp"/>
+        <specific id="3" description="ARS 52 Salvor"/>
+        <specific id="4" description="ARS 53 Grapple"/>
+      </subcategory>
+      <subcategory id="21" description="Edenton class (Salvage Ships)">
+        <specific id="1" description="ATS 1 Edenton"/>
+        <specific id="2" description="ATS 2 Beaufort"/>
+        <specific id="3" description="ATS 3 Brunswick"/>
+      </subcategory>
+      <subcategory id="22" description="Chanticleer class (Submarine Rescue)">
+        <specific id="1" description="ASR 13 Kittiwake"/>
+        <specific id="2" description="ASR 15 Sunbird"/>
+      </subcategory>
+      <subcategory id="23" description="Pigeon class (Submarine Rescue)">
+        <specific id="1" description="ASR 21 Pigeon"/>
+        <specific id="2" description="ASR 22 Ortolan"/>
+      </subcategory>
+      <subcategory id="24" description="Abnaki class (Fleet Ocean Tugs)">
+        <specific id="1" description="ATF 159 Paiute"/>
+        <specific id="2" description="ATF 160 Papago"/>
+      </subcategory>
+    </category>
+    <category id="17" description="Auxiliary, Merchant Marine">
+      <subcategory id="1" description="Fleet Ballistic Missile Support Ships (Naval Fleet)">
+        <specific id="1" description="TAK 282 Marshfield"/>
+        <specific id="2" description="TAK 286 Vega"/>
+      </subcategory>
+      <subcategory id="2" description="Ammunition Ship (Naval Fleet)">
+        <specific id="1" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="Fleet Stores Ship (Naval Fleet)">
+        <specific id="1" description="TAF 58 Rigel"/>
+      </subcategory>
+      <subcategory id="4" description="Combat Stores Ships (Naval Fleet)">
+        <specific id="1" description="TAFS 8 Sirius"/>
+        <specific id="2" description="TAFS 9 Spica"/>
+        <specific id="3" description="TAFS 10 Saturn"/>
+      </subcategory>
+      <subcategory id="5" description="Neosho class (Naval Fleet Oilers)">
+        <specific id="1" description="TAO 143 Neosho"/>
+        <specific id="2" description="TAO 146 Kawishiwi"/>
+        <specific id="3" description="TAO 148 Ponchatoula"/>
+      </subcategory>
+      <subcategory id="6" description="Henry J. Kaiser class (Naval Fleet Oilers)">
+        <specific id="1" description="TAO 187 Henry J. Kaiser"/>
+        <specific id="2" description="TAO 188 Joshua Humphreys"/>
+        <specific id="3" description="TAO 189 John Lenthall"/>
+        <specific id="4" description="TAO 190 Andrew J. Higgins"/>
+        <specific id="5" description="TAO 191 Benjamin Isherwood"/>
+        <specific id="6" description="TAO 192 Henry Eckford"/>
+        <specific id="7" description="TAO 193 Walter S. Diehl"/>
+        <specific id="8" description="TAO 194 John Ericsson"/>
+        <specific id="9" description="TAO 195 Leroy Grumman"/>
+        <specific id="10" description="TAO 196 Kanawha"/>
+        <specific id="11" description="TAO 197 Pecos"/>
+        <specific id="12" description="TAO 198 Big Horn"/>
+        <specific id="13" description="TAO 199 Tippecanoe"/>
+        <specific id="14" description="TAO 200 Guadaloupe"/>
+        <specific id="15" description="TAO 201 Patuxent"/>
+        <specific id="16" description="TAO 202 Yukon"/>
+        <specific id="17" description="TAO 203 Laramie"/>
+        <specific id="18" description="TAO 204 Rappahannock"/>
+      </subcategory>
+      <subcategory id="7" description="Powhatan class (Fleet Ocean Tugs)">
+        <specific id="1" description="TATF 166 Powhatan"/>
+        <specific id="2" description="TATF 167 Narragansett"/>
+        <specific id="3" description="TATF 168 Catawba"/>
+        <specific id="4" description="TATF 169 Navajo"/>
+        <specific id="5" description="TATF 170 Mohawk"/>
+        <specific id="6" description="TATF 171 Sioux"/>
+        <specific id="7" description="TATF 172 Apache"/>
+      </subcategory>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="Maritime Prepositioning Ships (MPS)">
+        <specific id="1" description="TAK 3000 Cpl Louis Hauge Jr."/>
+        <specific id="2" description="TAK 3001 Pfc William Baugh"/>
+        <specific id="3" description="TAK 3002 Pfc James Anderson Jr."/>
+        <specific id="4" description="TAK 3003 1st Lt Alexander Bonnyman Jr."/>
+        <specific id="5" description="TAK 3004 Pvt Harry Fisher"/>
+        <specific id="6" description="TAK 3005 Sgt Matej Kocak"/>
+        <specific id="7" description="TAK 3006 Pfc Eugene A. Obregon"/>
+        <specific id="8" description="TAK 3007 Maj Stephen W. Pless"/>
+        <specific id="9" description="TAK 3008 2nd Lt John P. Bobo"/>
+        <specific id="10" description="TAK 3009 Pfc Dewayne T. Williams"/>
+        <specific id="11" description="TAK 3010 1st Lt Baldomero Lopez"/>
+        <specific id="12" description="TAK 3011 1st Lt Jack Lummus"/>
+        <specific id="13" description="TAK 3012 Staff Sgt William R. Button"/>
+      </subcategory>
+      <subcategory id="10" description="Lash (Preposition)">
+        <specific id="1" description="TAK 1015 Green Island"/>
+        <specific id="2" description="TAK 2043 American Kestrel"/>
+        <specific id="3" description="TAK 2046 Austral Rainbow"/>
+        <specific id="4" description="TAK 2064 Green Harbour"/>
+      </subcategory>
+      <subcategory id="11" description="Freighters (Preposition)">
+        <specific id="1" description="TAK 5076 Noble Star"/>
+        <specific id="2" description="TAK 2040 Advantage"/>
+        <specific id="3" description="TAK 2062 American Cormorant"/>
+      </subcategory>
+      <subcategory id="12" description="Tankers (PRE-POSITION)">
+        <specific id="1" description="TAOT 170 Sealift China Sea"/>
+        <specific id="2" description="TAOT 181 Potomac"/>
+      </subcategory>
+      <subcategory id="13" description="Tankers (Ocean Transportation)">
+        <specific id="1" description="TAOT 168 Sealift Pacific"/>
+        <specific id="2" description="TAOT 169 Sealift Arabian Sea"/>
+        <specific id="3" description="TAOT 171 Sealift Indian Ocean"/>
+        <specific id="4" description="TAOT 172 Sealift Atlantic"/>
+        <specific id="5" description="TAOT 173 Sealift Mediterranean"/>
+        <specific id="6" description="TAOT 174 Sealift Caribbean"/>
+        <specific id="7" description="TAOT 175 Sealift Arctic"/>
+        <specific id="8" description="TAOT 176 Sealift Antarctic"/>
+        <specific id="9" description="TAOT 1121 Gus W. Darnell"/>
+        <specific id="10" description="TAOT 1122 Paul Buck"/>
+        <specific id="11" description="TAOT 1123 Samuel L. Cobb"/>
+        <specific id="12" description="TAOT 1124 Richard G. Matthieson"/>
+        <specific id="13" description="TAOT 1125 Lawrence H. Gianella"/>
+      </subcategory>
+      <subcategory id="14" description="Fast Sealift Ships (Strategic Sealift)">
+        <specific id="1" description="TAKR 287 Algol"/>
+        <specific id="2" description="TAKR 288 Bellatrix"/>
+        <specific id="3" description="TAKR 289 Denebola"/>
+        <specific id="4" description="TAKR 290 Pollux"/>
+        <specific id="5" description="TAKR 291 Altair"/>
+        <specific id="6" description="TAKR 292 Regulus"/>
+        <specific id="7" description="TAKR 293 Capella"/>
+        <specific id="8" description="TAKR 294 Antares"/>
+      </subcategory>
+      <subcategory id="15" description="Aviation Support Ships (Strategic Sealift)">
+        <specific id="1" description="TAVB 3 Wright"/>
+        <specific id="2" description="TAVB 4 Curtiss"/>
+      </subcategory>
+      <subcategory id="16" description="Hospital Ships (Strategic Sealift)">
+        <specific id="1" description="TAH 19 Mercy"/>
+        <specific id="2" description="TAH 20 Comfort"/>
+      </subcategory>
+      <subcategory id="17" description="Frigate Research Ship (Special Mission Support)">
+        <specific id="1" description="T-AGFF1 Glover"/>
+      </subcategory>
+      <subcategory id="18" description="Missile Range Instrumentation Ships (Special Mission Support)">
+        <specific id="1" description="TAGM 20 Redstone"/>
+        <specific id="2" description="TAGM 22 Range Sentinel"/>
+        <specific id="3" description="TAGM 23 Observation Island"/>
+      </subcategory>
+      <subcategory id="19" description="Oceanographic Research Ships (Special Mission Support)">
+        <specific id="1" description="TAGOR 10 Thomas Washington (loan)"/>
+        <specific id="2" description="TAGOR 12 De Steigeur"/>
+        <specific id="3" description="TAGOR 13 Bartlett"/>
+        <specific id="4" description="TAGOR 14 Melville (loan)"/>
+        <specific id="5" description="TAGOR 15 Knorr (loan)"/>
+        <specific id="6" description="TAGOR 21 Gyre (loan)"/>
+        <specific id="7" description="TAGOR 22 Moana Wave (loan)"/>
+        <specific id="8" description="TAGOR 23 Thomas G. Thompson (loan)"/>
+        <specific id="9" description="TAGOR 195 Hayes"/>
+      </subcategory>
+      <subcategory id="20" description="Surveying Ships (Special Mission Support)">
+        <specific id="1" description="TAGS 26 Silas Bent"/>
+        <specific id="2" description="TAGS 27 Kane"/>
+        <specific id="3" description="TAGS 29 Chauvenet"/>
+        <specific id="4" description="TAGS 32 Harkness"/>
+        <specific id="5" description="TAGS 33 Wilkes"/>
+        <specific id="6" description="TAGS 34 Wyman"/>
+        <specific id="7" description="TAGS 39 Maury"/>
+        <specific id="8" description="TAGS 40 Tanner"/>
+        <specific id="9" description="TAGS 45 Waters"/>
+        <specific id="10" description="TAGS 51 John McDonnell"/>
+        <specific id="11" description="TAGS 52 Littlehales"/>
+        <specific id="12" description="TAGS 60 Pathfinder"/>
+        <specific id="13" description="TAGS 61 Sumner"/>
+      </subcategory>
+      <subcategory id="21" description="Navigation Test Support Ship (Special Mission Support)">
+        <specific id="1" description="TAG 194 Vanguard"/>
+      </subcategory>
+      <subcategory id="22" description="Cable Repair Ships (Special Mission Support)">
+        <specific id="1" description="TARC 6 Albert J. Myer"/>
+        <specific id="2" description="TARC 7 Zeus"/>
+      </subcategory>
+      <subcategory id="23" description="Deep Submergence Support Ship (Special Mission Support)">
+        <specific id="1" description="TAGDS 2 Point Loma"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate">
+      <subcategory id="1" description="Knox Class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="FF 1056 Connole"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="(deleted)"/>
+        <specific id="11" description="(deleted)"/>
+        <specific id="12" description="FF 1063 Reasoner"/>
+        <specific id="13" description="FF 1064 Lockwood"/>
+        <specific id="14" description="FF 1065 Stein"/>
+        <specific id="15" description="FF 1066 Marvin Shields"/>
+        <specific id="16" description="FF 1067 F. Hammond"/>
+        <specific id="17" description="FF 1068 Vreeland"/>
+        <specific id="18" description="(deleted)"/>
+        <specific id="19" description="FF 1070 Downes"/>
+        <specific id="20" description="(deleted)"/>
+        <specific id="21" description="(deleted)"/>
+        <specific id="22" description="FF 1073 R. E. Peary"/>
+        <specific id="23" description="FF 1074 Harold E. Holt"/>
+        <specific id="24" description="FF 1075 Trippe"/>
+        <specific id="25" description="FF 1076 Fanning"/>
+        <specific id="26" description="FF 1077 Ouellet"/>
+        <specific id="27" description="FF 1078 Joseph Hewes"/>
+        <specific id="28" description="FF 1079 Bowen"/>
+        <specific id="29" description="FF 1080 Paul"/>
+        <specific id="30" description="FF 1081 Aylwin"/>
+        <specific id="31" description="FF 1082 E. Montgomery"/>
+        <specific id="32" description="FF 1083 Cook"/>
+        <specific id="33" description="FF 1084 McCandless"/>
+        <specific id="34" description="FF 1085 D. B. Beary"/>
+        <specific id="35" description="(deleted)"/>
+        <specific id="36" description="FF 1087 Kirk"/>
+        <specific id="37" description="(deleted)"/>
+        <specific id="38" description="FF 1089 J. L. Brown"/>
+        <specific id="39" description="FF 1090 Ainsworth"/>
+        <specific id="40" description="(deleted)"/>
+        <specific id="41" description="FF 1092 T. C. Hart"/>
+        <specific id="42" description="FF 1093 Capodanno"/>
+        <specific id="43" description="FF 1094 Pharris"/>
+        <specific id="44" description="FF 1095 Truett"/>
+        <specific id="45" description="(deleted)"/>
+        <specific id="46" description="FF 1097 Moinester"/>
+      </subcategory>
+    </category>
+    <category id="51" description="Battleship"/>
+    <category id="52" description="Heavy Cruiser"/>
+    <category id="53" description="Destroyer Tender">
+      <subcategory id="1" description="Sam Gompers/Yellowstone Class">
+        <specific id="1" description="AD 37 Samuel Gompers"/>
+        <specific id="2" description="AD 38 Puget Sound"/>
+        <specific id="3" description="AD 41 Yellowstone"/>
+        <specific id="4" description="AD 42 Acadia"/>
+        <specific id="5" description="AD 43 Cape Cod"/>
+        <specific id="6" description="AD 44 Shenandoah"/>
+      </subcategory>
+      <subcategory id="2" description="Dixie Class">
+        <specific id="1" description="AD 15 Prairie"/>
+        <specific id="2" description="AD 18 Sierra"/>
+        <specific id="3" description="AD 19 Yosemite"/>
+      </subcategory>
+    </category>
+    <category id="54" description="Amphibious Assault Ship">
+      <subcategory id="1" description="Tarawa Class">
+        <specific id="1" description="LHA 1 Tarawa"/>
+        <specific id="2" description="LHA 2 Saipan"/>
+        <specific id="3" description="LHA 3 Belleau Wood"/>
+        <specific id="4" description="LHA 4 Nassau"/>
+        <specific id="5" description="LHA 5 Peleliu"/>
+      </subcategory>
+      <subcategory id="2" description="Iwo Jima Class">
+        <specific id="1" description="LPH 2 Iwo Jima"/>
+        <specific id="2" description="LPH 3 Okinawa"/>
+        <specific id="3" description="LPH 7 Guadalcanal"/>
+        <specific id="4" description="LPH 9 Guam"/>
+        <specific id="5" description="LPH 10 Tripoli"/>
+        <specific id="6" description="LPH 11 New Orleans"/>
+        <specific id="7" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="Wasp Class">
+        <specific id="1" description="LHD 1 Wasp"/>
+        <specific id="2" description="LHD 2 Essex"/>
+        <specific id="3" description="LHD 3 Kearsage"/>
+        <specific id="4" description="LHD 4 Boxer"/>
+        <specific id="5" description="LHD 5 Bataan"/>
+        <specific id="6" description="LHD 6 Bonhomme Richard"/>
+        <specific id="7" description="LHD 7 Iwo Jima"/>
+      </subcategory>
+      <subcategory id="4" description="MCS Class">
+        <specific id="1" description="MCS 12 Inchon"/>
+      </subcategory>
+    </category>
+    <category id="55" description="Amphibious Cargo Ship">
+      <subcategory id="1" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+      </subcategory>
+    </category>
+    <category id="56" description="Amphibious Transport Dock">
+      <subcategory id="1" description="Austin Class">
+        <specific id="1" description="LPD 4 Austin"/>
+        <specific id="2" description="LPD 5 Ogden"/>
+        <specific id="3" description="LPD 6 Duluth"/>
+        <specific id="4" description="LPD 7 Cleveland"/>
+        <specific id="5" description="LPD 8 Dubuque"/>
+        <specific id="6" description="LPD 9 Denver"/>
+        <specific id="7" description="LPD 10 Juneau"/>
+        <specific id="8" description="LPD 12 Shreveport"/>
+        <specific id="9" description="LPD 13 Nashville"/>
+        <specific id="10" description="LPD 14 Trenton"/>
+        <specific id="11" description="LPD 15 Ponce"/>
+        <specific id="12" description="(deleted)"/>
+        <specific id="13" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="2" description="San Antonio Class">
+        <specific id="1" description="LPD 17 San Antonio"/>
+        <specific id="2" description="LPD 18 New Orleans"/>
+        <specific id="3" description="LPD 19 Mesa Verde"/>
+      </subcategory>
+    </category>
+    <category id="57" description="Ammunition Ship">
+      <subcategory id="1" description="Kilauea Class">
+        <specific id="1" description="T-AE 26 Kilauea"/>
+        <specific id="2" description="AE 27 Butte"/>
+        <specific id="3" description="AE 28 Santa Barbara"/>
+        <specific id="4" description="AE 29 Mount Hood"/>
+        <specific id="5" description="AE 32 Flint"/>
+        <specific id="6" description="AE 33 Shasta"/>
+        <specific id="7" description="AE 34 Mount Baker"/>
+        <specific id="8" description="AE 35 Kiska"/>
+      </subcategory>
+      <subcategory id="2" description="Suribachi Class">
+        <specific id="1" description="AE 21 Suribachi"/>
+        <specific id="2" description="AE 22 Mauna Kea"/>
+        <specific id="3" description="AE 23 Nitro"/>
+        <specific id="4" description="AE 24 Pyro"/>
+        <specific id="5" description="AE 25 Haleakala"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+    <category id="58" description="Combat Stores Ship">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Mars Class">
+        <specific id="1" description="AFS 1 Mars"/>
+        <specific id="2" description="AFS 2 Sylvania"/>
+        <specific id="3" description="AFS 3 Niagara Falls"/>
+        <specific id="4" description="AFS 4 White Plains"/>
+        <specific id="5" description="AFS 5 Concord"/>
+        <specific id="6" description="AFS 6 San Diego"/>
+        <specific id="7" description="AFS 7 San Jose"/>
+      </subcategory>
+    </category>
+    <category id="59" description="Surveillance Towed Array Sonar System (SURTASS)">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="SWATH-S (Small) class">
+        <specific id="1" description="TAGOS 19 Victorious"/>
+        <specific id="2" description="TAGOS 20 Able"/>
+        <specific id="3" description="TAGOS 21 Effective"/>
+        <specific id="4" description="TAGOS 22 Loyal"/>
+      </subcategory>
+      <subcategory id="3" description="SWATH-L (Large) class">
+        <specific id="1" description="TAGOS 23 Impeccable"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="Stalwart Class (Ocean Surveillance)">
+        <specific id="1" description="TAGOS 1 Stalwart"/>
+        <specific id="2" description="TAGOS 2 Contender"/>
+        <specific id="3" description="TAGOS 3 Vindicator"/>
+        <specific id="4" description="TAGOS 4 Triumph"/>
+        <specific id="5" description="TAGOS 5 Assurance"/>
+        <specific id="6" description="TAGOS 6 Persistent"/>
+        <specific id="7" description="TAGOS 7 Indomitable"/>
+        <specific id="8" description="TAGOS 8 Prevail"/>
+        <specific id="9" description="TAGOS 9 Assertive"/>
+        <specific id="10" description="TAGOS 10 Invincible"/>
+        <specific id="11" description="TAGOS 11 Audacious"/>
+        <specific id="12" description="TAGOS 12 Bold"/>
+        <specific id="13" description="TAGOS 13 Adventurous"/>
+        <specific id="14" description="TAGOS 14 Worthy"/>
+        <specific id="15" description="TAGOS 15 Titan"/>
+        <specific id="16" description="TAGOS 16 Capable"/>
+        <specific id="17" description="TAGOS 17 Intrepid"/>
+        <specific id="18" description="TAGOS 18 Relentless"/>
+      </subcategory>
+    </category>
+    <category id="60" description="Fast Combat Support Ship">
+      <subcategory id="1" description="Sacramento Class">
+        <specific id="1" description="AOE 1 Sacramento"/>
+        <specific id="2" description="AOE 2 Camden"/>
+        <specific id="3" description="AOE 3 Seattle"/>
+        <specific id="4" description="AOE 4 Detroit"/>
+      </subcategory>
+      <subcategory id="2" description="Supply Class">
+        <specific id="1" description="AOE 6 Supply"/>
+        <specific id="2" description="AOE 7 Rainier"/>
+        <specific id="3" description="AOE 8 Arctic"/>
+        <specific id="4" description="AOE 10 Bridge"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="American Kentucky"/>
+        <specific id="2" description="Ocean City"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker">
+        <specific id="1" description="Texaco Georgia"/>
+      </subcategory>
+      <subcategory id="3" description="Large Fishing Trawler"/>
+      <subcategory id="4" description="Medium Fishing Boat"/>
+      <subcategory id="5" description="Small Fishing Boat"/>
+      <subcategory id="6" description="Two Masted Fishing Boat"/>
+      <subcategory id="7" description="Single Masted Fishing Boat"/>
+      <subcategory id="8" description="Cigarette Boat"/>
+    </category>
+    <category id="62" description="Coast Guard Cutters">
+      <subcategory id="1" description="378-foot High Endurance (WHEC)">
+        <specific id="1" description="Boutwell (WHEC 719)"/>
+        <specific id="2" description="Chase (WHEC 718)"/>
+        <specific id="3" description="Dallas (WHEC 716)"/>
+        <specific id="4" description="Gallatin (WHEC 721)"/>
+        <specific id="5" description="Hamilton (WHEC 715)"/>
+        <specific id="6" description="Jarvis (WHEC 725)"/>
+        <specific id="7" description="Mellon (WHEC 717)"/>
+        <specific id="8" description="Midgett (WHEC 726)"/>
+        <specific id="9" description="Morgenthau (WHEC 722)"/>
+        <specific id="10" description="Munro (WHEC 724)"/>
+        <specific id="11" description="Rush (WHEC 723)"/>
+        <specific id="12" description="Sherman (WHEC 720)"/>
+      </subcategory>
+      <subcategory id="2" description="282-foot Medium Endurance (WMEC)">
+        <specific id="1" description="Alex Haley"/>
+      </subcategory>
+      <subcategory id="3" description="Famous Class (WMEC)">
+        <specific id="1" description="Bear (WMEC 901)"/>
+        <specific id="2" description="Campbell (WMEC 909)"/>
+        <specific id="3" description="Escanaba (WMEC 907)"/>
+        <specific id="4" description="Forward (WMEC 911)"/>
+        <specific id="5" description="Harriet Lane (WMEC 903)"/>
+        <specific id="6" description="Legare (WMEC 912)"/>
+        <specific id="7" description="Mohawk (WMEC 913)"/>
+        <specific id="8" description="Northland (WMEC 904)"/>
+        <specific id="9" description="Seneca (WMEC 906)"/>
+        <specific id="10" description="Spencer (WMEC 905)"/>
+        <specific id="11" description="Tahoma (WMEC 908)"/>
+        <specific id="12" description="Tampa (WMEC 902)"/>
+        <specific id="13" description="Thetis (WMEC 910)"/>
+      </subcategory>
+      <subcategory id="4" description="Reliance Class (WMEC)">
+        <specific id="1" description="Active (WMEC 618)"/>
+        <specific id="2" description="Alert (WMEC 630)"/>
+        <specific id="3" description="Confidence (WMEC 619)"/>
+        <specific id="4" description="Dauntless (WMEC 624)"/>
+        <specific id="5" description="Decisive (WMEC 629)"/>
+        <specific id="6" description="Dependable (WMEC 626)"/>
+        <specific id="7" description="Diligence (WMEC 616)"/>
+        <specific id="8" description="Reliance (WMEC 615)"/>
+        <specific id="9" description="Resolute (WMEC 620)"/>
+        <specific id="10" description="Steadfast (WMEC 623)"/>
+        <specific id="11" description="Valiant (WMEC 621)"/>
+        <specific id="12" description="Venturous (WMEC 625)"/>
+        <specific id="13" description="Vigilant (WMEC 617)"/>
+        <specific id="14" description="Vigorous (WMEC 627)"/>
+      </subcategory>
+      <subcategory id="5" description="Island Class (WPB)">
+        <specific id="1" description="Adak (WPB 1333)"/>
+        <specific id="2" description="Anacapa (WPB 1335)"/>
+        <specific id="3" description="Aquidneck (WPB 1309)"/>
+        <specific id="4" description="Assateague (WPB 1337)"/>
+        <specific id="5" description="Attu (WPB 1317)"/>
+        <specific id="6" description="Bainbridge Island (WPB 1343)"/>
+        <specific id="7" description="Baranof (WPB 1318)"/>
+        <specific id="8" description="Block Island (WPB 1344)"/>
+        <specific id="9" description="Chandeleur (WPB 1319)"/>
+        <specific id="10" description="Chincoteague (WPB 1320)"/>
+        <specific id="11" description="Cushing (WPB 1321)"/>
+        <specific id="12" description="Cuttyhunk(WPB 1322)"/>
+        <specific id="13" description="Drummond (WPB 1323)"/>
+        <specific id="14" description="Edisto (WPB 1313)"/>
+        <specific id="15" description="Faralon (WPB 1301)"/>
+        <specific id="16" description="Galveston Island (WPB 1343)"/>
+        <specific id="17" description="Grand Isle (WPB 1338)"/>
+        <specific id="18" description="Jefferson Island (WPB 1340)"/>
+        <specific id="19" description="Key Biscayne (WPB 1339)"/>
+        <specific id="20" description="Key Largo (WPB 1324)"/>
+        <specific id="21" description="Kiska (WPB 1336)"/>
+        <specific id="22" description="Knight Island (WPB 1348)"/>
+        <specific id="23" description="Kodiak Island (WPB 1341)"/>
+        <specific id="24" description="Liberty (WPB 1334)"/>
+        <specific id="25" description="Long Island (WPB 1342)"/>
+        <specific id="26" description="Manitou (WPB 1302)"/>
+        <specific id="27" description="Matagorda (WPB 1303)"/>
+        <specific id="28" description="Matinicus (WPB 1315)"/>
+        <specific id="29" description="Maui (WPB 1304)"/>
+        <specific id="30" description="Metompkin (WPB 1325)"/>
+        <specific id="31" description="Monhegan (WPB 1305)"/>
+        <specific id="32" description="Monomoy (WPB 1326)"/>
+        <specific id="33" description="Mustang (WPB 1310)"/>
+        <specific id="34" description="Nantucket (WPB 1316)"/>
+        <specific id="35" description="Naushon (WPB 1311)"/>
+        <specific id="36" description="Nunivak (WPB 1306)"/>
+        <specific id="37" description="Ocracoke (WPB 1307)"/>
+        <specific id="38" description="Orcas (WPB 1327)"/>
+        <specific id="39" description="Padre (WPB 1328)"/>
+        <specific id="40" description="Pea Island (WPB 1347)"/>
+        <specific id="41" description="Roanoke Island (WPB 1346)"/>
+        <specific id="42" description="Sanibel (WPB 1312)"/>
+        <specific id="43" description="Sapelo (WPB 1314)"/>
+        <specific id="44" description="Sitkinak (WPB 1329)"/>
+        <specific id="45" description="Staten Island (WPB 1345)"/>
+        <specific id="46" description="Tybee (WPB 1330)"/>
+        <specific id="47" description="Vashon (WPB 1308)"/>
+        <specific id="48" description="Washington (WPB 1331)"/>
+        <specific id="49" description="Wrangell (WPB 1332)"/>
+      </subcategory>
+      <subcategory id="6" description="Marine Protector Class (WPB)">
+        <specific id="1" description="Adelie (WPB 87333)"/>
+        <specific id="2" description="Albacore (WPB 87309)"/>
+        <specific id="3" description="Amberjack (WPB 87315)"/>
+        <specific id="4" description="Barracuda (WPB 87301)"/>
+        <specific id="5" description="Beluga (WPB 87325)"/>
+        <specific id="6" description="Blackfin (WPB 87317)"/>
+        <specific id="7" description="Blacktip (WPB 87326)"/>
+        <specific id="8" description="Bluefin (WPB 87318)"/>
+        <specific id="9" description="Bonito (WPB 87341)"/>
+        <specific id="10" description="Brant (WPB 87348)"/>
+        <specific id="11" description="Chinook (WPB 87308)"/>
+        <specific id="12" description="Cobia (WPB 87311)"/>
+        <specific id="13" description="Cochito (WPB 87329)"/>
+        <specific id="14" description="Coho (WPB 87321)"/>
+        <specific id="15" description="Cormorant (WPB 87313)"/>
+        <specific id="16" description="Dorado (WPB 87306)"/>
+        <specific id="17" description="Finback (WPB 87314)"/>
+        <specific id="18" description="Flyingfish (WPB 87346)"/>
+        <specific id="19" description="Gannet (WPB 87334)"/>
+        <specific id="20" description="Haddock (WPB 87347)"/>
+        <specific id="21" description="Halibut (WPB 8734008)"/>
+        <specific id="22" description="Hammerhead (WPB 87302)"/>
+        <specific id="23" description="Hawksbill (WPB 87312)"/>
+        <specific id="24" description="Heron (WPB 87344)"/>
+        <specific id="25" description="Ibis (WPB 87338)"/>
+        <specific id="26" description="Kingfisher (WPB 87322)"/>
+        <specific id="27" description="Kittiwake (WPB 87316)"/>
+        <specific id="28" description="Mako (WPB 87303)"/>
+        <specific id="29" description="Manowar (WPB 87330)"/>
+        <specific id="30" description="Manta (WPB 87320)"/>
+        <specific id="31" description="Marlin (WPB 87304)"/>
+        <specific id="32" description="Moray (WPB 87331)"/>
+        <specific id="33" description="Narwhal (WPB 87335)"/>
+        <specific id="34" description="Osprey (WPB 87307)"/>
+        <specific id="35" description="Pelican (WPB 87327)"/>
+        <specific id="36" description="Petrel (WPB 87350)"/>
+        <specific id="37" description="Pompano (WPB 87339)"/>
+        <specific id="38" description="Razorbill (WPB 87332)"/>
+        <specific id="39" description="Ridley (WPB 87328)"/>
+        <specific id="40" description="Seahawk (WPB 87323)"/>
+        <specific id="41" description="Shearwater (WPB 87349)"/>
+        <specific id="42" description="Shrike (WPB 87342)"/>
+        <specific id="43" description="Sockeye (WPB 87337)"/>
+        <specific id="44" description="Steelhead (WPB 87324)"/>
+        <specific id="45" description="Stingray (WPB 87305)"/>
+        <specific id="46" description="Sturgeon (WPB 87336)"/>
+        <specific id="47" description="Tarpon (WPB 87310)"/>
+        <specific id="48" description="Tern (WPB 87343)"/>
+        <specific id="49" description="Wahoo (WPB 87345)"/>
+        <specific id="50" description="Yellowfin (WPB 87319)"/>
+      </subcategory>
+      <subcategory id="7" description="Point Class (WPB)">
+        <specific id="1" description="Point Brower (WPB 87372)"/>
+      </subcategory>
+    </category>
+    <category id="63" description="Coast Guard Boats">
+      <subcategory id="1" description="52-foot Motor Life Boats (MLB)"/>
+      <subcategory id="2" description="47-foot Motor Life Boats (MLB)"/>
+      <subcategory id="3" description="44-foot Motor Life Boats (MLB)"/>
+      <subcategory id="4" description="41-foot Utility Boats (UTB)"/>
+      <subcategory id="5" description="38-foot Deployable Pursuit Boat (DPB)"/>
+      <subcategory id="6" description="21-64-foot Aids to Navigation Boats"/>
+      <subcategory id="7" description="25-foot Transportable Port Security Boats (TPSB)"/>
+      <subcategory id="8" description="Rigid Hull Inflatable Boats (RHI)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="225">
+    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
+      <subcategory id="1" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="Ohio class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="SSBN 730 Henry M. Jackson"/>
+        <specific id="6" description="SSBN 731 Alabama"/>
+        <specific id="7" description="SSBN 732 Alaska"/>
+        <specific id="8" description="SSBN 733 Nevada"/>
+        <specific id="9" description="SSBN 734 Tennessee"/>
+        <specific id="10" description="SSBN 735 Pennsylvania"/>
+        <specific id="11" description="SSBN 736 West Virginia"/>
+        <specific id="12" description="SSBN 737 Kentucky"/>
+        <specific id="13" description="SSBN 738 Maryland"/>
+        <specific id="14" description="SSBN 739 Nebraska"/>
+        <specific id="15" description="SSBN 740 Rhode Island"/>
+        <specific id="16" description="SSBN 741 Maine"/>
+        <specific id="17" description="SSBN 742 Wyoming"/>
+      </subcategory>
+    </category>
+    <category id="2" description="SSGN (Nuclear Guided Missile)">
+      <subcategory id="1" description="Ohio 726"/>
+      <subcategory id="2" description="Michigan 727"/>
+      <subcategory id="3" description="Florida 728"/>
+      <subcategory id="4" description="Georgia 729"/>
+    </category>
+    <category id="3" description="SSN (Nuclear Attack-Torpedo)">
+      <subcategory id="1" description="Seawolf class">
+        <specific id="1" description="SSN 21 Seawolf"/>
+        <specific id="2" description="SSN 22 Connecticut"/>
+        <specific id="3" description="SSN 23 Jimmy Carter"/>
+      </subcategory>
+      <subcategory id="2" description="Sturgeon class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="(deleted)"/>
+        <specific id="11" description="(deleted)"/>
+        <specific id="12" description="(deleted)"/>
+        <specific id="13" description="(deleted)"/>
+        <specific id="14" description="(deleted)"/>
+        <specific id="15" description="(deleted)"/>
+        <specific id="16" description="(deleted)"/>
+        <specific id="17" description="(deleted)"/>
+        <specific id="18" description="(deleted)"/>
+        <specific id="19" description="(deleted)"/>
+        <specific id="20" description="(deleted)"/>
+        <specific id="21" description="(deleted)"/>
+        <specific id="22" description="(deleted)"/>
+        <specific id="23" description="(deleted)"/>
+        <specific id="24" description="(deleted)"/>
+        <specific id="25" description="(deleted)"/>
+        <specific id="26" description="(deleted)"/>
+        <specific id="27" description="(deleted)"/>
+        <specific id="28" description="(deleted)"/>
+        <specific id="29" description="(deleted)"/>
+        <specific id="30" description="SSN 683 Parche"/>
+        <specific id="31" description="SSN 684 Cavalla"/>
+        <specific id="32" description="(deleted)"/>
+        <specific id="33" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="4" description="Los Angeles class">
+        <specific id="1" description="SSN 688 Los Angeles"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="SSN 690 Philadelphia"/>
+        <specific id="4" description="SSN 691 Memphis"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="(deleted)"/>
+        <specific id="11" description="SSN 698 Bremerton"/>
+        <specific id="12" description="SSN 699 Jacksonville"/>
+        <specific id="13" description="SSN 700 Dallas"/>
+        <specific id="14" description="SSN 701 La Jolla"/>
+        <specific id="15" description="(deleted)"/>
+        <specific id="16" description="(deleted)"/>
+        <specific id="17" description="(deleted)"/>
+        <specific id="18" description="SSN 705 City of Corpus Christi"/>
+        <specific id="19" description="SSN 706 Albuquerque"/>
+        <specific id="20" description="SSN 707 Portsmouth"/>
+        <specific id="21" description="SSN 708 Minneapolis-Saint Paul"/>
+        <specific id="22" description="SSN 709 Hyman G. Rickover"/>
+        <specific id="23" description="SSN 710 Augusta"/>
+        <specific id="24" description="SSN 711 San Francisco"/>
+        <specific id="25" description="SSN 712 Atlanta"/>
+        <specific id="26" description="SSN 713 Houston"/>
+        <specific id="27" description="SSN 714 Norfolk"/>
+        <specific id="28" description="SSN 715 Buffalo"/>
+        <specific id="29" description="SSN 716 Salt Lake City"/>
+        <specific id="30" description="SSN 717 Olympia"/>
+        <specific id="31" description="SSN 718 Honolulu"/>
+        <specific id="32" description="SSN 719 Providence"/>
+        <specific id="33" description="SSN 720 Pittsburgh"/>
+        <specific id="34" description="SSN 721 Chicago"/>
+        <specific id="35" description="SSN 722 Key West"/>
+        <specific id="36" description="SSN 723 Oklahoma City"/>
+        <specific id="37" description="SSN 724 Louisville"/>
+        <specific id="38" description="SSN 725 Helena"/>
+        <specific id="39" description="SSN 750 Newport News"/>
+        <specific id="40" description="SSN 751 San Juan"/>
+        <specific id="41" description="SSN 752 Pasadena"/>
+        <specific id="42" description="SSN 753 Albany"/>
+        <specific id="43" description="SSN 754 Topeka"/>
+        <specific id="44" description="SSN 755 Miami"/>
+        <specific id="45" description="SSN 756 Scranton"/>
+        <specific id="46" description="SSN 757 Alexandria"/>
+        <specific id="47" description="SSN 758 Asheville"/>
+        <specific id="48" description="SSN 759 Jefferson City"/>
+        <specific id="49" description="SSN 760 Annapolis"/>
+        <specific id="50" description="SSN 761 Springfield"/>
+        <specific id="51" description="SSN 762 Columbus"/>
+        <specific id="52" description="SSN 763 Santa Fe"/>
+        <specific id="53" description="SSN 764 Boise"/>
+        <specific id="54" description="SSN 765 Montpelier"/>
+        <specific id="55" description="SSN 766 Charlotte"/>
+        <specific id="56" description="SSN 767 Hampton"/>
+        <specific id="57" description="SSN 768 Hartford"/>
+        <specific id="58" description="SSN 769 Toledo"/>
+        <specific id="59" description="SSN 770 Tucson"/>
+        <specific id="60" description="SSN 771 Columbia"/>
+        <specific id="61" description="SSN 772 Greeneville"/>
+        <specific id="62" description="SSN 773 Cheyenne"/>
+      </subcategory>
+      <subcategory id="5" description="Virginia Class">
+        <specific id="1" description="SSN 774 Virginia"/>
+        <specific id="2" description="SSN 775 Texas"/>
+        <specific id="3" description="SSN 776 Hawaii"/>
+        <specific id="4" description="SSN 777 No. Carolina"/>
+      </subcategory>
+    </category>
+    <category id="7" description="SSA(Conventional Auxiliary)">
+      <subcategory id="1" description="Dolphin Class">
+        <specific id="1" description="AGSS 555 Dolphin"/>
+      </subcategory>
+      <subcategory id="2" description="Advanced SEAL Delivery System Class">
+        <specific id="1" description="ASDS-1"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="225">
+    <category id="0" description="Other">
+      <subcategory id="1" description="Space Shuttle Vehicle"/>
+      <subcategory id="2" description="National Launch System (NLS)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="SOTV"/>
+      <subcategory id="5" description="SMV"/>
+    </category>
+    <category id="1" description="Manned">
+      <subcategory id="1" description="Space Shuttle Orbiter">
+        <specific id="1" description="Atlantis"/>
+        <specific id="2" description="Discovery"/>
+        <specific id="3" description="Columbia"/>
+        <specific id="4" description="Endeavor"/>
+        <specific id="5" description="Enterprise"/>
+      </subcategory>
+      <subcategory id="2" description="Space Station">
+        <specific id="1" description="Freedom"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Unmanned">
+      <subcategory id="1" description="Communication satellite">
+        <specific id="1" description="Leasat"/>
+        <specific id="2" description="DSCS"/>
+        <specific id="3" description="Fleetsatcom"/>
+        <specific id="4" description="Milstar"/>
+        <specific id="5" description="SDS"/>
+        <specific id="6" description="Tactical Data Relay Satellite System (TDRSS)"/>
+        <specific id="7" description="Lightsat"/>
+        <specific id="8" description="STEP/Eagle"/>
+        <specific id="9" description="LES/Tacsat"/>
+      </subcategory>
+      <subcategory id="2" description="Navigation satellite">
+        <specific id="1" description="Transit"/>
+        <specific id="2" description="Global Positioning System (GPS)"/>
+        <specific id="3" description="Navstar 41-60 (launch 1996 or 1997)"/>
+      </subcategory>
+      <subcategory id="3" description="Early Warning satellite">
+        <specific id="1" description="DSP"/>
+        <specific id="2" description="MICRO-SAT"/>
+        <specific id="3" description="SIBRS"/>
+      </subcategory>
+      <subcategory id="4" description="Electronic Intelligence (ELINT) satellite">
+        <specific id="1" description="Rhyolite"/>
+        <specific id="2" description="Magnum"/>
+        <specific id="3" description="Challet/Vortex"/>
+        <specific id="4" description="Jumpseat"/>
+      </subcategory>
+      <subcategory id="5" description="Meteorology satellite">
+        <specific id="1" description="Defense Meteorological Satellite Program (DMSP)"/>
+      </subcategory>
+      <subcategory id="6" description="Ocean Surveillance satellite">
+        <specific id="1" description="White Cloud"/>
+      </subcategory>
+      <subcategory id="7" description="Imaging Radar Surveillance satellite">
+        <specific id="1" description="Lacrosse"/>
+      </subcategory>
+      <subcategory id="8" description="Optical Imaging Surveillance satellite">
+        <specific id="1" description="KH11"/>
+        <specific id="2" description="Advanced KH11"/>
+      </subcategory>
+      <subcategory id="9" description="SDI satellite">
+        <specific id="1" description="Delta 181"/>
+        <specific id="2" description="E2I (Endo-Exoatmospheric Interceptor)"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Booster">
+      <subcategory id="1" description="Atlas"/>
+      <subcategory id="2" description="Conestoga"/>
+      <subcategory id="3" description="Delta"/>
+      <subcategory id="4" description="Pegasus"/>
+      <subcategory id="5" description="Scout"/>
+      <subcategory id="6" description="Taurus"/>
+      <subcategory id="7" description="Titan"/>
+      <subcategory id="8" description="Tomahawk"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="222">
+    <category id="0" description="Other">
+      <subcategory id="0" description="Bridges">
+        <specific id="1" description="PMM-2 Amphibious Bridging and Ferry System"/>
+        <specific id="2" description="Amphibious Bridging System (Wheeled) (ABS(W))"/>
+        <specific id="3" description="MTU-72 armored bridgelayer"/>
+        <specific id="4" description="MTU-20 armored bridgelayer w/bridge"/>
+        <specific id="5" description="MTU armored bridgelayer"/>
+        <specific id="6" description="TMM truck-mounted treadway"/>
+        <specific id="7" description="KMM truck-mounted treadway"/>
+        <specific id="8" description="DPP-40 floating bridge equipment"/>
+        <specific id="9" description="GSP heavy amphibious ferry"/>
+        <specific id="10" description="PVD-20 airportable"/>
+        <specific id="11" description="PMP heavy folding pontoon"/>
+        <specific id="12" description="PPS heavy girder floating"/>
+        <specific id="13" description="PVM foot suspension"/>
+        <specific id="14" description="LVM light suspension"/>
+        <specific id="15" description="TVM heavy suspension"/>
+        <specific id="16" description="Underwater bridge set"/>
+        <specific id="17" description="MARM sectional arch"/>
+        <specific id="18" description="RMM-4 portable steel fixed"/>
+        <specific id="19" description="SARM sectional deck truss"/>
+        <specific id="20" description="REM-500 railway and road-section"/>
+        <specific id="21" description="NZhM-56 heavy floating railway and road"/>
+        <specific id="22" description="Heavy barge"/>
+        <specific id="23" description="BMK-T bridging boat"/>
+        <specific id="24" description="BMK-130 bridging boat"/>
+        <specific id="25" description="BMK-150 bridging boat"/>
+        <specific id="26" description="BMK-70 bridging boat"/>
+        <specific id="27" description="BMK-90 bridging boat"/>
+        <specific id="28" description="MTU-20 armored bridgelayer w/o bridge"/>
+        <specific id="29" description="MTU-20 bridge"/>
+      </subcategory>
+      <subcategory id="2" description="Missile Transporter/Launcher">
+        <specific id="1" description="SS-25 TEL"/>
+      </subcategory>
+    </category>
+    <category id="1" description="Tank">
+      <subcategory id="1" description="T-80 MBT">
+        <specific id="1" description="T-80"/>
+        <specific id="2" description="T-80B"/>
+        <specific id="3" description="T-80BK"/>
+        <specific id="4" description="T-80BV"/>
+        <specific id="5" description="T-80BVK"/>
+        <specific id="6" description="T-80U"/>
+        <specific id="7" description="T-80Uv"/>
+        <specific id="8" description="T-80 w/mine plow roller"/>
+        <specific id="9" description="T-80Uv w/mine plow roller"/>
+        <specific id="10" description="T-80U w/Reactive Armor"/>
+      </subcategory>
+      <subcategory id="2" description="T-72 MBT">
+        <specific id="1" description="T-72"/>
+        <specific id="2" description="T-72M"/>
+        <specific id="3" description="T-72K"/>
+        <specific id="4" description="T-72A"/>
+        <specific id="5" description="T-72AK"/>
+        <specific id="6" description="T-72B"/>
+        <specific id="7" description="T-72BK"/>
+        <specific id="8" description="T-72B1"/>
+        <specific id="9" description="T-72B1K"/>
+        <specific id="10" description="T-72 Bv"/>
+        <specific id="11" description="T-72 Bv w/mine plow roller"/>
+        <specific id="12" description="T-72 w/mine plow roller"/>
+        <specific id="13" description="T-72S"/>
+      </subcategory>
+      <subcategory id="3" description="T-64 MBT">
+        <specific id="1" description="T-64A"/>
+        <specific id="2" description="T-64AK"/>
+        <specific id="3" description="T-64B"/>
+        <specific id="4" description="T-64BV"/>
+        <specific id="5" description="T-64B1"/>
+        <specific id="6" description="T-64B1K"/>
+        <specific id="7" description="T-64BV1K"/>
+        <specific id="8" description="T-64R"/>
+        <specific id="9" description="T-64 Bv w/mine plow roller"/>
+      </subcategory>
+      <subcategory id="4" description="T-62 MBT">
+        <specific id="1" description="T-62"/>
+        <specific id="2" description="T-62K"/>
+        <specific id="3" description="T-62M"/>
+        <specific id="4" description="T-62MK"/>
+        <specific id="5" description="T-62MV"/>
+        <specific id="6" description="T-62M1"/>
+        <specific id="7" description="T-62 Bv w/mine plow roller"/>
+      </subcategory>
+      <subcategory id="5" description="T-54 MBT">
+        <specific id="1" description="T-54"/>
+        <specific id="2" description="T-54K"/>
+        <specific id="3" description="T-54B"/>
+        <specific id="4" description="T-54BK"/>
+        <specific id="5" description="T-54M"/>
+        <specific id="6" description="T-54MK"/>
+      </subcategory>
+      <subcategory id="6" description="T-55 MBT">
+        <specific id="1" description="T-55"/>
+        <specific id="2" description="T-55K"/>
+        <specific id="3" description="T-55A"/>
+        <specific id="4" description="T-55AD"/>
+        <specific id="5" description="T-55AK"/>
+        <specific id="6" description="T-55AM"/>
+        <specific id="7" description="T-55AMD"/>
+        <specific id="8" description="T-55AMK"/>
+        <specific id="9" description="T-55AMV"/>
+        <specific id="10" description="T-55M"/>
+        <specific id="11" description="T-55MK"/>
+        <specific id="12" description="T-55MVK"/>
+      </subcategory>
+      <subcategory id="8" description="PT-76 Amphibious light tank">
+        <specific id="1" description="PT-76A"/>
+        <specific id="2" description="PT-76B"/>
+      </subcategory>
+      <subcategory id="9" description="T-90 MBT"/>
+      <subcategory id="10" description="T-34/85"/>
+      <subcategory id="11" description="T-80UK Command Tank"/>
+    </category>
+    <category id="2" description="Armored fighting vehicle">
+      <subcategory id="1" description="BMP-1">
+        <specific id="1" description="BMP-1, basic model 1970"/>
+        <specific id="2" description="BMP-1K command"/>
+        <specific id="3" description="BMP-1K3 command"/>
+        <specific id="4" description="BMP-1P w/ AT-4 ATGW"/>
+        <specific id="5" description="BMP-1PK command"/>
+        <specific id="6" description="BRM-1K recon (aka M-1976)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="BMP-1KShM unarmed command"/>
+      </subcategory>
+      <subcategory id="2" description="BMP-2">
+        <specific id="1" description="BMP-2"/>
+        <specific id="2" description="BMP-2D"/>
+        <specific id="3" description="BMP-2K"/>
+        <specific id="4" description="BMP-2 w/ KMT-8/KMT-10"/>
+        <specific id="5" description="BVP-2 (Czech)"/>
+      </subcategory>
+      <subcategory id="3" description="BMP-3">
+        <specific id="1" description="BMP-3 [(SIFV) M1990/1]"/>
+        <specific id="2" description="BRM-3K Reconnaissance Vehicle"/>
+        <specific id="3" description="BMP-3K Command variant"/>
+      </subcategory>
+      <subcategory id="4" description="BRDM-2 Reconnaissance vehicle">
+        <specific id="1" description="BRDM-2 w/ AT-2 ATGM"/>
+        <specific id="2" description="BRDM-2 w/ AT-3 ATGM"/>
+        <specific id="3" description="BRDM-2 w/ AT-5 ATGM"/>
+        <specific id="4" description="BRDM-2-RKhb NBC"/>
+        <specific id="5" description="BRDM-2U command"/>
+        <specific id="6" description="BRDM-2 w/14.5mm"/>
+      </subcategory>
+      <subcategory id="5" description="BTR-40 Reconnaissance vehicle">
+        <specific id="1" description="BTR-40"/>
+        <specific id="2" description="BTR-40B"/>
+        <specific id="3" description="BTR-40A anti-air"/>
+        <specific id="4" description="BTR-40Kh chemical reconnaissance"/>
+        <specific id="5" description="BTR-40zhd railroad"/>
+      </subcategory>
+      <subcategory id="6" description="BTR-152">
+        <specific id="1" description="BTR-152"/>
+        <specific id="2" description="BTR-152V"/>
+        <specific id="3" description="BTR-152V1"/>
+        <specific id="4" description="BTR-152V2"/>
+        <specific id="5" description="BTR-152V3"/>
+        <specific id="6" description="BTR-152K"/>
+        <specific id="7" description="BTR-152U"/>
+        <specific id="8" description="BTR-152A"/>
+      </subcategory>
+      <subcategory id="7" description="MT-LB tracked vehicle">
+        <specific id="1" description="MT-LB 1V12"/>
+        <specific id="2" description="MT-LB 1V13 (battery Fire Direction Center (FDC))"/>
+        <specific id="3" description="MT-LB 1V14 (battery Command Post)"/>
+        <specific id="4" description="MT-LB 1V15 (battalion command)"/>
+        <specific id="5" description="MT-LB 1V16 (battalion FDC)"/>
+        <specific id="6" description="MT-LB 1V12M (artillery C2)"/>
+        <specific id="7" description="MT-LB 1V13M (artillery C2)"/>
+        <specific id="8" description="MT-LB 1V14M (artillery C2)"/>
+        <specific id="9" description="MT-LB 1V15M (artillery C2)"/>
+        <specific id="10" description="MT-LB 1V16M (artillery C2)"/>
+        <specific id="11" description="MT-LB 1V21 staff command"/>
+        <specific id="12" description="MT-LB 1V22 air defense management"/>
+        <specific id="13" description="MT-LB 1V23 C2"/>
+        <specific id="14" description="MT-LB 1V24 artillery C3"/>
+        <specific id="15" description="MT-LB 1V25 AD management"/>
+        <specific id="16" description="(deleted)"/>
+        <specific id="17" description="(deleted)"/>
+        <specific id="18" description="MT-LB SNAR-10 radar"/>
+        <specific id="19" description="MT-LBV snow/swamp"/>
+        <specific id="20" description="(deleted)"/>
+        <specific id="21" description="MT-LB ambulance"/>
+        <specific id="22" description="MT-LBR repair"/>
+        <specific id="23" description="MT-LB w/ AT-6 (Anti-Tank Guided Weapon) ATGW"/>
+        <specific id="24" description="RKhM (Chemical Recon)"/>
+      </subcategory>
+      <subcategory id="8" description="BTR-60">
+        <specific id="1" description="BTR-60"/>
+        <specific id="2" description="BTR-60P"/>
+        <specific id="3" description="BTR-60PA"/>
+        <specific id="4" description="BTR-60PB"/>
+        <specific id="5" description="BTR-60PU"/>
+        <specific id="6" description="BTR-60PBK command"/>
+        <specific id="7" description="BTR-60PU command"/>
+        <specific id="8" description="BTR-60PU-12 air defense command"/>
+        <specific id="9" description="BTR-601V19 FDC"/>
+        <specific id="10" description="BTR-601V18 artillery observation"/>
+        <specific id="11" description="BTR-60 R-145BM communications"/>
+        <specific id="12" description="BTR-60 R-975 forward air controller"/>
+        <specific id="13" description="BTR-60-E-351BR generator"/>
+        <specific id="14" description="BTR-60-P-238T switchboard"/>
+        <specific id="15" description="BTR-60-P-240T switchboard"/>
+        <specific id="16" description="BTR-60-P-241T field telephone"/>
+      </subcategory>
+      <subcategory id="9" description="BTR-50 Amphibious Tracked APC">
+        <specific id="1" description="BTR-50P"/>
+        <specific id="2" description="BTR-50PA"/>
+        <specific id="3" description="BTR-50PK"/>
+        <specific id="4" description="BTR-50PU"/>
+        <specific id="5" description="BTR-50PU R82"/>
+        <specific id="6" description="BTR-50PU-11"/>
+        <specific id="7" description="BTR-50PUM"/>
+        <specific id="8" description="BTR-50PUR"/>
+        <specific id="9" description="BTR-50PK(B)"/>
+        <specific id="10" description="MTP technical support"/>
+        <specific id="11" description="MTK mineclearing"/>
+        <specific id="12" description="MTR-1 repair"/>
+      </subcategory>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="BMD airborne fire support vehicle">
+        <specific id="1" description="BMD-1"/>
+        <specific id="2" description="BMD-1P w/ AT-3 ATGW"/>
+        <specific id="3" description="BMD-2"/>
+        <specific id="4" description="BMD w/ 82-mm mortar"/>
+        <specific id="5" description="BMD KShM command"/>
+        <specific id="6" description="BTR-D"/>
+        <specific id="7" description="BMD-3"/>
+        <specific id="8" description="BTR-RD ATGM section vehicle"/>
+        <specific id="9" description="BTR-ZD MANPADS section vehicle"/>
+        <specific id="10" description="BTR-D with 23-mm ZU-23"/>
+        <specific id="11" description="ACRV, 1V119"/>
+      </subcategory>
+      <subcategory id="12" description="BTR-70">
+        <specific id="1" description="BTR-70"/>
+        <specific id="2" description="BTR-70 M1986/1"/>
+        <specific id="3" description="BTR-70Kh chemical reconnaissance"/>
+        <specific id="4" description="BTR-70 w/ AGS-17"/>
+        <specific id="5" description="SPR-2 (poss jammer)"/>
+        <specific id="6" description="BTR-70MS communications"/>
+        <specific id="7" description="BTR-70KShM command/staff"/>
+        <specific id="8" description="BTR-70 BREM repair"/>
+      </subcategory>
+      <subcategory id="13" description="BTR-80">
+        <specific id="1" description="BTR-80"/>
+        <specific id="2" description="BTR-80 M1981/1 command"/>
+        <specific id="3" description="BTR-80 RKhM-4 chemical &amp; reconnaissance"/>
+        <specific id="4" description="BTR-80 UNSh"/>
+        <specific id="5" description="BMM-1 Ambulance"/>
+        <specific id="6" description="BMM-2 Bn Aid Station"/>
+        <specific id="7" description="BMM-3 Mobile Dressing Station"/>
+        <specific id="8" description="BTR-80A"/>
+      </subcategory>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="BRDM-1 Reconnaissance vehicle">
+        <specific id="1" description="BRDM-1"/>
+        <specific id="2" description="BRDM-1-RKhb"/>
+        <specific id="3" description="BRDM-U"/>
+      </subcategory>
+      <subcategory id="16" description="BTR-90"/>
+      <subcategory id="17" description="GMZ TML">
+        <specific id="1" description="GMZ-3"/>
+      </subcategory>
+      <subcategory id="18" description="MT-LBu Tracked Vehicle">
+        <specific id="1" description="Rangir (9S737) C3 Battery Command Post"/>
+        <specific id="2" description="R-330 B Jammer"/>
+        <specific id="3" description="MP22R (1V22R) Division AD"/>
+        <specific id="4" description="MP23R (1V23R) GCI C3"/>
+        <specific id="5" description="MP24R (1V24R) Artillery Control"/>
+        <specific id="6" description="MP25R (1V25R) Division AD"/>
+        <specific id="7" description="9S80 MT-LBu with DOG EAR radar"/>
+      </subcategory>
+      <subcategory id="19" description="PRP-3 with Small Fred radar"/>
+      <subcategory id="20" description="PRP-4"/>
+    </category>
+    <category id="3" description="Armored utility vehicle">
+      <subcategory id="1" description="BTS-2 medium armored tractor"/>
+      <subcategory id="2" description="MTP maintenance vehicle"/>
+      <subcategory id="3" description="IMR combat engineer vehicle">
+        <specific id="1" description="IMR-2 combat engineer vehicle"/>
+      </subcategory>
+      <subcategory id="4" description="IRM engineer reconnaissance vehicle"/>
+      <subcategory id="5" description="BAT-2 combat engineer vehicle"/>
+      <subcategory id="6" description="MT-LB engineer vehicle"/>
+      <subcategory id="7" description="BTU tank-mounted bulldozer"/>
+      <subcategory id="8" description="BTU-55 tank-mounted bulldozer"/>
+      <subcategory id="9" description="BREM-1 recovery and repair vehicle"/>
+      <subcategory id="10" description="M1977 armored recovery vehicle"/>
+      <subcategory id="11" description="T-54-T armored recovery vehicle"/>
+      <subcategory id="12" description="T-55-T armored recovery vehicle"/>
+      <subcategory id="13" description="T-55-TK armored recovery vehicle"/>
+      <subcategory id="14" description="BTR-50PK(B) amphibious recovery vehicle"/>
+      <subcategory id="15" description="BREM-4 light recovery vehicle"/>
+      <subcategory id="16" description="MTP-LB technical support vehicle"/>
+    </category>
+    <category id="4" description="Self-propelled artillery">
+      <subcategory id="1" description="M-1973 152-mm gun (2S3) (SO-152)"/>
+      <subcategory id="2" description="M-1974 122-mm Howitzer (2S1) (SO-122)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="Frog-3 rocket launcher"/>
+      <subcategory id="7" description="Frog-4 rocket launcher"/>
+      <subcategory id="8" description="Frog-5 rocket launcher"/>
+      <subcategory id="9" description="Frog-7 rocket launcher"/>
+      <subcategory id="10" description="SS-1 Scud missile launcher">
+        <specific id="1" description="Scud A"/>
+        <specific id="2" description="Scud B">
+          <extra id="1" description="TEL Decoy"/>
+        </specific>
+        <specific id="3" description="Scud C"/>
+      </subcategory>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="BM-14-17 140-mm rocket launcher"/>
+      <subcategory id="13" description="BM-21 122-mm rocket launcher"/>
+      <subcategory id="14" description="M-1975 120-mm rocket launcher"/>
+      <subcategory id="15" description="BM-24 240-mm rocket launcher"/>
+      <subcategory id="16" description="BM-25 250-mm rocket launcher"/>
+      <subcategory id="17" description="(deleted)"/>
+      <subcategory id="18" description="(deleted)"/>
+      <subcategory id="19" description="(deleted)"/>
+      <subcategory id="20" description="(deleted)"/>
+      <subcategory id="21" description="(deleted)"/>
+      <subcategory id="22" description="(deleted)"/>
+      <subcategory id="23" description="2S4 M-1975 240-mm mortar"/>
+      <subcategory id="24" description="2S7 M-1975 203-mm gun"/>
+      <subcategory id="25" description="M-1976 152-mm gun (2S5)(MSTA-B)"/>
+      <subcategory id="26" description="152-mm 2S19 (aka MSTA-S)"/>
+      <subcategory id="27" description="120-mm Howitzer/mortar (2S9) (SO-120)"/>
+      <subcategory id="28" description="120-mm Howitzer/mortar (2S23)"/>
+      <subcategory id="29" description="300-mm BM-30 14/12-round multiple rocket systems (9A52 Smerch)"/>
+      <subcategory id="30" description="220-mm BM-22 16-round multiple rocket system (M1977 Uragan)"/>
+      <subcategory id="31" description="200-mm 4-round BMD-20 multiple rocket system"/>
+      <subcategory id="32" description="(deleted)"/>
+      <subcategory id="33" description="(deleted)"/>
+      <subcategory id="34" description="(deleted)"/>
+      <subcategory id="35" description="(deleted)"/>
+      <subcategory id="36" description="(deleted)"/>
+      <subcategory id="37" description="(deleted)"/>
+      <subcategory id="38" description="(deleted)"/>
+      <subcategory id="39" description="(deleted)"/>
+      <subcategory id="40" description="(deleted)"/>
+      <subcategory id="41" description="(deleted)"/>
+      <subcategory id="42" description="(deleted)"/>
+      <subcategory id="43" description="(deleted)"/>
+      <subcategory id="44" description="(deleted)"/>
+      <subcategory id="45" description="(deleted)"/>
+      <subcategory id="46" description="(deleted)"/>
+      <subcategory id="47" description="(deleted)"/>
+      <subcategory id="48" description="(deleted)"/>
+      <subcategory id="49" description="(deleted)"/>
+      <subcategory id="50" description="(deleted)"/>
+      <subcategory id="51" description="SS-21"/>
+      <subcategory id="52" description="2S31 120-mm Combination Gun"/>
+      <subcategory id="53" description="9A51 Prima, 122-mm MRL, 50 tube"/>
+    </category>
+    <category id="5" description="Towed artillery">
+      <subcategory id="1" description="S-23 180-mm field gun"/>
+      <subcategory id="2" description="2A36 (M1976) 152-mm field gun"/>
+      <subcategory id="3" description="D-20 152-mm gun-Howitzer"/>
+      <subcategory id="4" description="D-30 122-mm gun-Howitzer"/>
+      <subcategory id="5" description="M-46 130-mm field gun"/>
+      <subcategory id="6" description="D-30 field Howitzer"/>
+      <subcategory id="7" description="T-12/MT-12 100-mm antitank gun"/>
+      <subcategory id="8" description="SD-44 gun">
+        <specific id="1" description="SD-44 85-mm auxiliary-propelled field gun"/>
+      </subcategory>
+      <subcategory id="9" description="M-1966 76.2-mm mountain gun"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="M-240 (aka M1953 or M53) 240-mm mortar"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="2A65 (M1987) 152-mm gun/Howitzer"/>
+      <subcategory id="15" description="(deleted)"/>
+      <subcategory id="16" description="M1943 (D-1) 152-mm Howitzer"/>
+      <subcategory id="17" description="M1937 (ML-20) 152-mm gun/Howitzer"/>
+      <subcategory id="18" description="(deleted)"/>
+      <subcategory id="19" description="D-74 122-mm field gun"/>
+      <subcategory id="20" description="(deleted)"/>
+      <subcategory id="21" description="M1938 (M-30) 122-mm Howitzer"/>
+      <subcategory id="22" description="2B16 120-mm combination gun"/>
+      <subcategory id="23" description="M1944 (BS-3) 100-mm field gun"/>
+      <subcategory id="24" description="D-48 85-mm antitank gun"/>
+      <subcategory id="25" description="M-1945 (D-44) 85-mm antitank gun"/>
+      <subcategory id="26" description="(deleted)"/>
+      <subcategory id="27" description="M1942 (ZIS-3) 76-mm divisional gun"/>
+      <subcategory id="28" description="SM-4-1 130-mm coastal gun"/>
+      <subcategory id="29" description="SPG-9 73-mm recoilless gun"/>
+      <subcategory id="30" description="B-10 82-mm recoilless gun"/>
+      <subcategory id="31" description="B-11 107-mm recoilless gun"/>
+      <subcategory id="32" description="(deleted)"/>
+      <subcategory id="33" description="(deleted)"/>
+      <subcategory id="34" description="(deleted)"/>
+      <subcategory id="35" description="(deleted)"/>
+      <subcategory id="36" description="(deleted)"/>
+      <subcategory id="37" description="(deleted)"/>
+      <subcategory id="38" description="125-mm AT Gun 2A45M"/>
+      <subcategory id="39" description="140-mm 16-round RPU-14 multiple rocket system"/>
+    </category>
+    <category id="6" description="Small wheeled utility vehicle">
+      <subcategory id="1" description="GAZ-69 4x4 light vehicle">
+        <specific id="1" description="Command vehicle"/>
+      </subcategory>
+      <subcategory id="2" description="UAZ-469B 4x4 600-kg light vehicle">
+        <specific id="1" description="Mine detecting system, DIM, on UAZ-469"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="LuAZ-967M amphibious battlefield support vehicle"/>
+      <subcategory id="5" description="LuAZ-969 4x4 light vehicle"/>
+      <subcategory id="6" description="GAZ-69A 4x4 light vehicle"/>
+      <subcategory id="7" description="UAZ-452D 4x4 800-kg light vehicle">
+        <specific id="1" description="Ambulance"/>
+      </subcategory>
+      <subcategory id="8" description="Motorcycles">
+        <specific id="1" description="IMZ-8"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Large wheeled utility vehicle">
+      <subcategory id="1" description="PZM-2 regimental trench-digging machine"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="ZIL-131 6x6 3500-kg truck">
+        <specific id="1" description="Missile fuel truck"/>
+        <specific id="2" description="Calibration vehicle"/>
+        <specific id="3" description="Fuel tanker"/>
+        <specific id="4" description="Compressor Truck"/>
+        <specific id="5" description="Firing Truck"/>
+        <specific id="6" description="Special Fuel Truck"/>
+        <specific id="7" description="Autonomous Test Truck"/>
+        <specific id="8" description="Oxidizer Truck"/>
+        <specific id="9" description="Transporter Truck"/>
+      </subcategory>
+      <subcategory id="5" description="ZIL-151 6x6 2500-kg truck"/>
+      <subcategory id="6" description="ZIL-157 6x6 2500-kg truck"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="GAZ-66 4x4 2000-kg truck">
+        <specific id="1" description="GAZ-66 Signals van"/>
+        <specific id="2" description="GAZ-66 Command van"/>
+        <specific id="3" description="DKV Decon truck"/>
+        <specific id="4" description="ACRV, 1V110"/>
+        <specific id="5" description="TDA-M Smoke"/>
+      </subcategory>
+      <subcategory id="9" description="Ural-375 6x6 4000-kg truck">
+        <specific id="1" description="Field artillery support"/>
+        <specific id="2" description="URAL-375D van"/>
+        <specific id="3" description="URAL-375D hospital van"/>
+        <specific id="4" description="1V111 URAL-375-D FDC"/>
+        <specific id="5" description="URAL-375D maintenance van"/>
+        <specific id="6" description="URAL-375 tranker truck"/>
+        <specific id="7" description="MAF-S water purification truck"/>
+        <specific id="8" description="URAL-375D meteorological van"/>
+        <specific id="9" description="URAL-375 propellant tanker"/>
+        <specific id="10" description="URAL-375 oxidizer tanker"/>
+      </subcategory>
+      <subcategory id="10" description="KamAZ-4310"/>
+      <subcategory id="11" description="Ural-4320 6x6 4500-kg trucks"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="KrAZ-255B 6x6 7500-kg truck">
+        <specific id="1" description="Fuel service"/>
+        <specific id="2" description="Aviation fuel support"/>
+        <specific id="3" description="KrAZ-255 Computer Van"/>
+        <specific id="4" description="KrAZ-255 Crane Truck"/>
+        <specific id="5" description="KrAZ-255 Dump truck"/>
+      </subcategory>
+      <subcategory id="14" description="Ural-375D 6x6 recovery vehicle">
+        <specific id="1" description="Crane/wrecker"/>
+      </subcategory>
+      <subcategory id="15" description="Ural-4320 6x6 recovery vehicle"/>
+      <subcategory id="16" description="KET-L 6x6 recovery truck"/>
+      <subcategory id="17" description="GAZ-53 4x2 3000-kg truck"/>
+      <subcategory id="18" description="Ural-377 6x4 7500-kg truck"/>
+      <subcategory id="19" description="ZIL-133 6x4 8000 kg-truck"/>
+      <subcategory id="20" description="YaAZ-214 6x6 7000-kg truck"/>
+      <subcategory id="21" description="KrAZ-214 6x6 7000-kg truck"/>
+      <subcategory id="22" description="KrAZ-206V 6x6 tractor truck"/>
+      <subcategory id="23" description="KamAZ-5320 6x4 8000-kg truck"/>
+      <subcategory id="24" description="KrAZ-260 6x6 9000-kg truck"/>
+      <subcategory id="25" description="KrAZ-240 6x6 9000-kg truck"/>
+      <subcategory id="26" description="Ural-5323 8x8 9000-kg truck"/>
+      <subcategory id="27" description="KrAZ-257 6x4 12000-kg truck"/>
+      <subcategory id="28" description="ZIL-135 series 8x8 truck"/>
+      <subcategory id="29" description="MAZ-543 8x8 truck"/>
+      <subcategory id="30" description="BAZ-5937 6x6 special purpose vehicle"/>
+      <subcategory id="31" description="BAZ-5939 6x6 special purpose vehicle"/>
+      <subcategory id="32" description="MAZ-535 and MAZ-537 8x8 series"/>
+      <subcategory id="33" description="TMK-2 trench-digging machine"/>
+      <subcategory id="34" description="PZM regimental trench-digging machine"/>
+      <subcategory id="35" description="OPS mobile water-desalination plant"/>
+      <subcategory id="36" description="POU mobile water-desalination plant"/>
+      <subcategory id="37" description="LBU-200 mobile well-drilling equipment"/>
+    </category>
+    <category id="8" description="Small tracked utility vehicle">
+      <subcategory id="1" description="AT-L light artillery tractor"/>
+      <subcategory id="2" description="AT-LM light artillery tractor"/>
+      <subcategory id="3" description="ATS-59G medium artillery tractor"/>
+      <subcategory id="4" description="ATS-59 medium artillery tractor"/>
+      <subcategory id="5" description="MT-S medium transporter"/>
+      <subcategory id="6" description="GT-SM amphibious over-snow vehicle"/>
+      <subcategory id="7" description="GT-T amphibious over-snow vehicle"/>
+      <subcategory id="8" description="MT-L amphibious over-snow vehicle"/>
+    </category>
+    <category id="9" description="Large tracked utility vehicle">
+      <subcategory id="1" description="PTS amphibious transport"/>
+      <subcategory id="2" description="PTS-M amphibious vehicle"/>
+      <subcategory id="3" description="PTS-2 amphibious vehicle"/>
+      <subcategory id="4" description="MTK-2 armored mineclearing vehicle"/>
+      <subcategory id="5" description="AT-T heavy artillery tractor"/>
+      <subcategory id="6" description="MT-T heavy transporter"/>
+      <subcategory id="7" description="GM-569 tractor"/>
+      <subcategory id="8" description="BTM high-speed ditching machine"/>
+      <subcategory id="9" description="BTM-3 high-speed ditching machine"/>
+      <subcategory id="10" description="BTM-TMG high-speed ditching machine"/>
+      <subcategory id="11" description="BTM-TMG2S high-speed ditching machine"/>
+      <subcategory id="12" description="MDK-2 trench-digging machine"/>
+      <subcategory id="13" description="MDK-2M trench-digging machine"/>
+      <subcategory id="14" description="MDK-3 trench-digging machine"/>
+      <subcategory id="15" description="BAT-1 high-speed tractor-mounted bulldozer"/>
+      <subcategory id="16" description="BAT-M high-speed tractor-mounted bulldozer"/>
+      <subcategory id="17" description="OLT high-speed tractor-mounted bulldozer"/>
+      <subcategory id="18" description="OST high-speed tractor-mounted bulldozer"/>
+      <subcategory id="19" description="OTT high-speed tractor-mounted bulldozer"/>
+      <subcategory id="20" description="(deleted)"/>
+      <subcategory id="21" description="PMR Minelayer"/>
+      <subcategory id="22" description="AT-S Medium Tractor"/>
+      <subcategory id="23" description="K-61 Amphibious"/>
+    </category>
+    <category id="10" description="Mortar">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="M-36 82-mm"/>
+      <subcategory id="8" description="M-37 82-mm"/>
+      <subcategory id="9" description="M-37 82-mm &quot;new&quot;"/>
+      <subcategory id="10" description="M-41 82-mm"/>
+      <subcategory id="11" description="AM 2B9 &quot;Vasilek&quot; 82-mm automatic"/>
+      <subcategory id="12" description="M-38 107-mm"/>
+      <subcategory id="13" description="2S12 120-mm"/>
+      <subcategory id="15" description="120mm Mortar M1943"/>
+    </category>
+    <category id="11" description="Mine plow">
+      <subcategory id="1" description="KMT-5M"/>
+    </category>
+    <category id="12" description="Mine rake"/>
+    <category id="13" description="Mine roller"/>
+    <category id="14" description="Cargo trailer">
+      <subcategory id="1" description="0 - 0.5 ton">
+        <specific id="1" description="Trailer, cargo, 1 axle, 0.5 ton, GAZ-704"/>
+      </subcategory>
+      <subcategory id="2" description="0.51 - 2 ton"/>
+      <subcategory id="3" description="2.01 - 5 ton">
+        <specific id="1" description="Trailer, cargo, 2 axle, 4 ton, SMZ-710Z"/>
+        <specific id="2" description="Amphibious trailer PKP"/>
+      </subcategory>
+      <subcategory id="4" description="5.02 - 10 ton"/>
+      <subcategory id="5" description="greater than 10 tons"/>
+    </category>
+    <category id="15" description="Fuel trailer">
+      <subcategory id="1" description="1-1000 gallons">
+        <specific id="1" description="MNUM-50M"/>
+      </subcategory>
+      <subcategory id="2" description="1001 - 5000 gallons">
+        <specific id="1" description="PTs-4.2-754V, 4200 liter trailer"/>
+      </subcategory>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="16" description="Generator trailer">
+      <subcategory id="1" description="0 - 100 KW"/>
+      <subcategory id="2" description="greater than 100 KW"/>
+    </category>
+    <category id="17" description="Water trailer">
+      <subcategory id="1" description="1-1000 gallons">
+        <specific id="1" description="Trailer, water, 1200 liter, ACMAT-ALM"/>
+        <specific id="2" description="Trailer, water, 950 liter, VMG-40-51"/>
+      </subcategory>
+      <subcategory id="2" description="1001- 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="18" description="Engineer equipment">
+      <subcategory id="1" description="Mine clearing line charge"/>
+      <subcategory id="2" description="Dozer blade kit"/>
+      <subcategory id="3" description="Lane marking system"/>
+    </category>
+    <category id="19" description="Heavy equipment transport trailer">
+      <subcategory id="1" description="Reload vehicle"/>
+      <subcategory id="2" description="Lowboy, Heavy Equipment, Transporter, ChMZAP-5247C"/>
+    </category>
+    <category id="20" description="Maintenance equipment trailer">
+      <subcategory id="1" description="Welding trailer"/>
+      <subcategory id="2" description="Compressor"/>
+      <subcategory id="3" description="Tools/parts trailer">
+        <specific id="1" description="Trailer, van, missile, OdAZ-740"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Limber"/>
+    <category id="22" description="Chemical decontamination trailer"/>
+    <category id="23" description="(deleted)"/>
+    <category id="24" description="(deleted)"/>
+    <category id="25" description="Train-Car">
+      <subcategory id="1" description="Boxcar"/>
+      <subcategory id="2" description="Tanker"/>
+      <subcategory id="3" description="Passenger"/>
+    </category>
+    <category id="26" description="Train-Caboose"/>
+    <category id="27" description="Civilian Vehicle">
+      <subcategory id="1" description="Sedan"/>
+    </category>
+    <category id="28" description="Air Defense / Missile Defense Unit Equipment">
+      <subcategory id="1" description="SA-2 Guideline SAM System">
+        <specific id="1" description="SA-2 Battery C3 Van"/>
+        <specific id="2" description="SA-2 Missile Launcher"/>
+        <specific id="3" description="Fan Song Engagement Radar">
+          <extra id="1" description="Fan Song B"/>
+          <extra id="2" description="Fan Song C/E"/>
+          <extra id="3" description="Fan Song F"/>
+        </specific>
+      </subcategory>
+      <subcategory id="2" description="SA-3 Goa SAM System">
+        <specific id="1" description="SA-3 Battery C3 Van"/>
+        <specific id="2" description="SA-3 Missile Launcher">
+          <extra id="1" description="Twin-Rail Launcher"/>
+          <extra id="2" description="Quad-Rail Launcher"/>
+        </specific>
+        <specific id="3" description="Low Blow Engagement Radar"/>
+      </subcategory>
+      <subcategory id="3" description="SA-5 Gammon SAM System">
+        <specific id="1" description="SA-5 Battalion C3 Van"/>
+        <specific id="2" description="SA-5 Missile Launcher"/>
+        <specific id="3" description="Square Pair Engagement Radar"/>
+      </subcategory>
+      <subcategory id="4" description="SA-10 Grumble SAM System">
+        <specific id="1" description="SA-10 Battery C3 Vehicle"/>
+        <specific id="2" description="SA-10 Missile Launcher">
+          <extra id="1" description="SA-10A Towed TEL (5P85T)"/>
+          <extra id="2" description="SA-10B SP TEL (5P85S)"/>
+        </specific>
+        <specific id="3" description="Flap Lid Engagement Radar (36N6E)">
+          <extra id="1" description="Flap Lid A Radar (tower mounted)"/>
+          <extra id="2" description="Flap Lid B (SP vehicle)"/>
+          <extra id="3" description="Tomb Stone Radar (SA-10C)"/>
+        </specific>
+        <specific id="4" description="Clam Shell Acquisition Radar"/>
+        <specific id="5" description="SA-10 Missile Transport/Reload Vehicle"/>
+      </subcategory>
+      <subcategory id="5" description="SA-4 Ganef SAM System">
+        <specific id="1" description="SA-4 Battery C3 Vehicle"/>
+        <specific id="2" description="SA-4 TEL (2P24)"/>
+        <specific id="3" description="Pat Hand Engagement Radar (1S32M)"/>
+        <specific id="4" description="SA-4 Missile Transporter/Loader Vehicle (2T6)"/>
+      </subcategory>
+      <subcategory id="6" description="SA-6 Gainful SAM System">
+        <specific id="1" description="SA-6 Battery C3 Vehicle"/>
+        <specific id="2" description="SA-6 TEL">
+          <extra id="1" description="SA-6A TEL (2P25)"/>
+          <extra id="2" description="SA-6B TEL (9A310M1 w/Fire Dome Radar)"/>
+        </specific>
+        <specific id="3" description="Straight Flush Engagement Radar"/>
+        <specific id="4" description="SA-6 Missile Transporter/Loader Vehicle"/>
+      </subcategory>
+      <subcategory id="7" description="SA-8 Gecko SAM System">
+        <specific id="1" description="SA-8 Battery C3 Vehicle"/>
+        <specific id="2" description="SA-8 TLAR">
+          <extra id="1" description="SA-8A TLAR"/>
+          <extra id="2" description="SA-8B TLAR"/>
+        </specific>
+        <specific id="3" description="SA-8 Transloader Vehicle"/>
+      </subcategory>
+      <subcategory id="8" description="SA-11 Gadfly SAM System">
+        <specific id="1" description="SA-11 Battery C3 Vehicle (9S470M1)"/>
+        <specific id="2" description="SA-11 TELAR (9A310M1)"/>
+        <specific id="3" description="SA-11 Loader/Launcher (9A39M1)"/>
+        <specific id="4" description="TUBE ARM Radar"/>
+      </subcategory>
+      <subcategory id="9" description="SA-12 Gladiator/Giant SAM System (S-300V)">
+        <specific id="1" description="Battalion">
+          <extra id="1" description="Battalion Command Post Vehicle (9S457-1)"/>
+          <extra id="2" description="Bill Board Acquisition Radar (9S15MT)"/>
+          <extra id="3" description="High Screen Sector Search Radar (9S19MT)"/>
+        </specific>
+        <specific id="2" description="Battery">
+          <extra id="1" description="Grill Pan Engagement Radar (9S32)"/>
+          <extra id="2" description="SA-12A Gladiator TELAR (9A83-1)"/>
+          <extra id="3" description="SA-12B Giant TELAR (9A82)"/>
+          <extra id="4" description="Gladiator Missile Loader/Launcher (9A85)"/>
+          <extra id="5" description="Giant Missile Loader/Launcher (9A84)"/>
+          <extra id="6" description="SA-12B (rail w/SS-24)"/>
+        </specific>
+      </subcategory>
+      <subcategory id="10" description="SA-15 Gauntlet SAM System">
+        <specific id="1" description="SA-15 Battery C3 Vehicle"/>
+        <specific id="2" description="SA-15 TELAR"/>
+        <specific id="3" description="8-Round Missile Reload Vehicle (9T224)"/>
+        <specific id="4" description="28-Round Missile Reload Transporter (9T225)"/>
+      </subcategory>
+      <subcategory id="11" description="SA-17 Grizzly SAM System">
+        <specific id="1" description="SA-17 Command Post Vehicle"/>
+        <specific id="2" description="Chair Back Engagement Radar">
+          <extra id="1" description="Tracked (SP) Chair Back Vehicle"/>
+          <extra id="2" description="Wheeled (towed) Chair Back Trailer"/>
+        </specific>
+        <specific id="3" description="SA-17 TELAR"/>
+        <specific id="4" description="SA-17 Launcher/Loader Vehicle (TEL)">
+          <extra id="1" description="Tracked (SP) LL"/>
+          <extra id="2" description="Wheeled (towed) LL"/>
+        </specific>
+      </subcategory>
+      <subcategory id="12" description="Self-Propelled VSHORAD Gun/Missile System">
+        <specific id="1" description="ZSU-23/4 Quad 23mm AAA"/>
+        <specific id="2" description="SA-9 Gaskin SAM System">
+          <extra id="1" description="SA-9A TEL (w/Flat Box-A)"/>
+          <extra id="2" description="SA-9B TEL (w/o Flat Box-A)"/>
+        </specific>
+        <specific id="3" description="SA-13 Gopher SAM System">
+          <extra id="1" description="SA-13 TELAR w/Flat Box B"/>
+          <extra id="2" description="SA-13 TELAR w/o Flat Box"/>
+        </specific>
+        <specific id="4" description="2S6 &quot;Tunguska&quot; Quad 30mm/SA-19 AD System"/>
+        <specific id="5" description="ZSU-57/2 twin-57mm AA Gun System"/>
+        <specific id="6" description="BTR-40A w/ZPTU-2 twin-14.5mm AA mount"/>
+        <specific id="7" description="BTR-152A w/ZPTU-2 twin-14.5mm AA mount"/>
+        <specific id="8" description="BTR-152D w/ZPU-2 twin-14.5mm AA mount"/>
+        <specific id="9" description="BTR-152 w/ZU-23 twin-23mm AA mount"/>
+        <specific id="10" description="BTR-152 w/M53 quad-12.7mm MG mount"/>
+      </subcategory>
+      <subcategory id="13" description="Towed VSHORAD Gun/Missile System">
+        <specific id="1" description="KS-30 130mm AA Gun"/>
+        <specific id="2" description="KS-19 100mm AA Gun"/>
+        <specific id="3" description="KS-12 85mm AA Gun"/>
+        <specific id="4" description="S-60 57mm AA Gun"/>
+        <specific id="5" description="M1939 37mm AA Gun"/>
+        <specific id="6" description="ZU-23 twin 23mm AA Gun"/>
+        <specific id="7" description="14.5mm ZPU AA MG">
+          <extra id="1" description="ZPU-1"/>
+          <extra id="2" description="ZPU-2"/>
+          <extra id="3" description="ZPU-4"/>
+        </specific>
+      </subcategory>
+      <subcategory id="14" description="SSC-3 Styx A/B/C/ variant launcher"/>
+      <subcategory id="15" description="SS-N-3B/C Shaddock/Sepal launcher"/>
+      <subcategory id="16" description="SS-N-22 Sunburn launcher"/>
+      <subcategory id="17" description="SSC-X-5 (SS-NX-26) launcher"/>
+      <subcategory id="18" description="SSC-6 (SS-N-25) launcher"/>
+      <subcategory id="19" description="P-270 Moskit (Kh-41) launcher"/>
+      <subcategory id="20" description="M51 launcher"/>
+      <subcategory id="21" description="SA-20 Gargoyle SAM System">
+        <specific id="1" description="SA-20 Group of Battalions CP Vehicle (54K6)"/>
+        <specific id="2" description="SA-20 Missile Launcher (5P85)"/>
+        <specific id="3" description="SA-20 Tomb Stone Engagement Radar/Battalion CP (30N6E1)"/>
+        <specific id="4" description="SA-20 Missile Transport/Reload Vehicle (22T6)"/>
+        <specific id="5" description="SA-20 Big Bird Acquisition Radar (64N6)"/>
+      </subcategory>
+    </category>
+    <category id="29" description="Command, Control, Communications and Intelligence (C3I) System"/>
+    <category id="30" description="Operations Facility"/>
+    <category id="31" description="Intelligence Facility"/>
+    <category id="32" description="Surveillance Facility"/>
+    <category id="33" description="Communications Facility"/>
+    <category id="34" description="Command Facility"/>
+    <category id="35" description="C4I Facility"/>
+    <category id="36" description="Control Facility"/>
+    <category id="37" description="Fire Control Facility"/>
+    <category id="38" description="Missile Defense Facility"/>
+    <category id="39" description="Field Command Post"/>
+    <category id="40" description="Observation Post"/>
+    <category id="41" description="General Wheeled Vehicles">
+      <subcategory id="1" description="Small truck"/>
+      <subcategory id="2" description="Medium truck"/>
+      <subcategory id="3" description="Large truck"/>
+      <subcategory id="4" description="TEL crane truck"/>
+      <subcategory id="5" description="Missile fuel truck"/>
+      <subcategory id="6" description="Tractor trailer truck"/>
+      <subcategory id="7" description="Missile command truck"/>
+      <subcategory id="8" description="Missile warhead truck"/>
+      <subcategory id="9" description="Artillery command and reconnaissance vehicle"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="222">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="MiG-31 Foxhound">
+        <specific id="1" description="MiG-31 Foxhound-A"/>
+        <specific id="2" description="MiG-31M Foxhound-B"/>
+      </subcategory>
+      <subcategory id="2" description="MiG-29 Fulcrum">
+        <specific id="1" description="MiG-29 Fulcrum A"/>
+        <specific id="2" description="MiG-29UB Fulcrum B"/>
+        <specific id="3" description="MiG-29 Fulcrum C"/>
+        <specific id="4" description="MiG-29K Fulcrum D"/>
+        <specific id="5" description="MiG-29M advanced version"/>
+        <specific id="6" description="MiG-29 thrust vectoring"/>
+        <specific id="7" description="MiG-29KU ship-based trainer"/>
+      </subcategory>
+      <subcategory id="3" description="Su-27 Flanker">
+        <specific id="1" description="Su-27 Flanker A prototypes"/>
+        <specific id="2" description="Su-27 Flanker B production"/>
+        <specific id="3" description="Su-27UB Flanker C"/>
+        <specific id="4" description="Su-27K Flanker D"/>
+        <specific id="5" description="Su-27IB"/>
+      </subcategory>
+      <subcategory id="4" description="MiG-25 Foxbat">
+        <specific id="1" description="MiG-25P Foxbat A"/>
+        <specific id="2" description="MiG-25RB Foxbat B"/>
+        <specific id="3" description="MiG-25RBV Foxbat B"/>
+        <specific id="4" description="MiG-25BBT Foxbat B"/>
+        <specific id="5" description="MiG-25R Foxbat B"/>
+        <specific id="6" description="MiG-25PU Foxbat C"/>
+        <specific id="7" description="MiG-25RU Foxbat C"/>
+        <specific id="8" description="MiG-25U Foxbat C"/>
+        <specific id="9" description="MiG-25RBK Foxbat D"/>
+        <specific id="10" description="MiG-25RBS Foxbat D"/>
+        <specific id="11" description="MiG-25RBSh Foxbat D"/>
+        <specific id="12" description="MiG-25RBF Foxbat D"/>
+        <specific id="13" description="MiG-25PD Foxbat E"/>
+        <specific id="14" description="MiG-25PDS Foxbat E"/>
+        <specific id="15" description="MiG-25BM Foxbat F"/>
+      </subcategory>
+      <subcategory id="5" description="MiG-23/24 Flogger">
+        <specific id="1" description="MiG-23M Flogger B"/>
+        <specific id="2" description="MiG-23MF Flogger B"/>
+        <specific id="3" description="MiG-23UB Flogger C"/>
+        <specific id="4" description="MiG-23UM Flogger C"/>
+        <specific id="5" description="MiG-23MF Flogger E"/>
+        <specific id="6" description="MiG-23MS Flogger E"/>
+        <specific id="7" description="MiG-23BN Flogger F"/>
+        <specific id="8" description="MiG-23BM Flogger F"/>
+        <specific id="9" description="MiG-23B Flogger F"/>
+        <specific id="10" description="MiG-23ML Flogger G"/>
+        <specific id="11" description="MiG-23P Flogger G"/>
+        <specific id="12" description="MiG-23BK Flogger H"/>
+        <specific id="13" description="MiG-23BN Flogger H"/>
+        <specific id="14" description="MiG-23MLD Flogger K"/>
+        <specific id="15" description="MiG-24 (export MiG-23)"/>
+      </subcategory>
+      <subcategory id="6" description="MiG-21 Fishbed/Mongol">
+        <specific id="1" description="MiG-21F Fishbed C"/>
+        <specific id="2" description="MiG-21PF Fishbed D"/>
+        <specific id="3" description="MiG-21PFM Fishbed F"/>
+        <specific id="4" description="MiG-21R Fishbed H"/>
+        <specific id="5" description="MiG-21S Fishbed H"/>
+        <specific id="6" description="MiG-21RF Fishbed H"/>
+        <specific id="7" description="MiG-21SM Fishbed J"/>
+        <specific id="8" description="MiG-21M (Type 96/Hindustan Aeronautics-India)"/>
+        <specific id="9" description="MiG-21PFMA Fishbed J"/>
+        <specific id="10" description="MiG-21MF Fishbed J"/>
+        <specific id="11" description="MiG-21SMT Fishbed K"/>
+        <specific id="12" description="MiG-21SMB Fishbed K"/>
+        <specific id="13" description="MiG-21bis-A Fishbed L"/>
+        <specific id="14" description="MiG-21bis-B Fishbed N"/>
+        <specific id="15" description="MiG-21U Mongol A"/>
+        <specific id="16" description="MiG-21US Mongol B"/>
+        <specific id="17" description="MiG-21UM Mongol B"/>
+      </subcategory>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="MiG-19 Farmer"/>
+      <subcategory id="15" description="MiG-17 Fresco"/>
+      <subcategory id="16" description="MiG15 Fagot"/>
+    </category>
+    <category id="2" description="Attack/Strike">
+      <subcategory id="1" description="MiG-27 Flogger">
+        <specific id="1" description="MiG-27 Flogger D"/>
+        <specific id="2" description="MiG-27K Flogger D"/>
+        <specific id="3" description="MiG-27D Flogger J"/>
+        <specific id="4" description="MiG-27M (Bahadur-India)"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="Su-17 Fitter">
+        <specific id="1" description="Su-17 (S-32, Fitter C)"/>
+        <specific id="2" description="Su-17M (S-32M, Fitter C)"/>
+        <specific id="3" description="Su-17R Fitter C"/>
+        <specific id="4" description="Su-17M-2/M-2D (S-32M2, Fitter D)"/>
+        <specific id="5" description="Su-17UM-2D (U-32, Fitter E)"/>
+        <specific id="6" description="Su-17UM-3 Fitter G"/>
+        <specific id="7" description="Su-17M-3 (S-52, Fitter H)"/>
+        <specific id="8" description="Su-17-1/M-2 Fitter H"/>
+        <specific id="9" description="Su-17M-4 (S-54, Fitter K)"/>
+      </subcategory>
+      <subcategory id="5" description="Su-20 Fitter C (Export Su-17)">
+        <specific id="1" description="Su-20 (S32Mk, Fitter-C)"/>
+        <specific id="2" description="Su-20R"/>
+      </subcategory>
+      <subcategory id="6" description="Su-22 Fitter">
+        <specific id="1" description="Su-22U Fitter E"/>
+        <specific id="2" description="Su-22 Fitter F"/>
+        <specific id="3" description="Su-22UM-3K Fitter G"/>
+        <specific id="4" description="Su-22 Fitter G"/>
+        <specific id="5" description="Su-22M-3 Fitter J"/>
+        <specific id="6" description="Su-22M-4 Fitter K"/>
+      </subcategory>
+      <subcategory id="7" description="Su-24 Fencer">
+        <specific id="1" description="Su-24 Fencer B"/>
+        <specific id="2" description="Su-24 Fencer C"/>
+        <specific id="3" description="Su-24MK Fencer D"/>
+        <specific id="4" description="Su-24MR Fencer E"/>
+        <specific id="5" description="Su-24MP Fencer F"/>
+        <specific id="6" description="Su-24K Fencer K"/>
+      </subcategory>
+      <subcategory id="8" description="Su-25 Frogfoot">
+        <specific id="1" description="Su-25 Frogfoot A"/>
+        <specific id="2" description="Su-25UB Frogfoot B"/>
+        <specific id="3" description="Su-25K (export &quot;A&quot;)"/>
+        <specific id="4" description="Su-25UBK (export &quot;UB&quot;)"/>
+        <specific id="5" description="Su-25UT Frogfoot B"/>
+        <specific id="6" description="Su-25UTG (tailhook)"/>
+        <specific id="7" description="Su-25T (Su-34) (antitank)"/>
+        <specific id="8" description="Su-25BM (target towing)"/>
+      </subcategory>
+      <subcategory id="9" description="Su-37 multirole fighter"/>
+      <subcategory id="10" description="Yak-38 Forger">
+        <specific id="1" description="Yak-38 Forger A"/>
+        <specific id="2" description="Yak-38 Forger B"/>
+      </subcategory>
+      <subcategory id="11" description="Su-35"/>
+      <subcategory id="12" description="Su-7 Fitter A"/>
+    </category>
+    <category id="3" description="Bomber">
+      <subcategory id="1" description="Tu-160 Blackjack"/>
+      <subcategory id="2" description="Tu-16 Badger">
+        <specific id="1" description="Tu-16A Badger A"/>
+        <specific id="2" description="Tu-16N Badger A, tanker"/>
+        <specific id="3" description="Tu-16T Badger A, torpedo"/>
+        <specific id="4" description="Tu-16KS-1 Badger B"/>
+        <specific id="5" description="Tu-16 Korvet, Search and Rescue (SAR)"/>
+        <specific id="6" description="Tu-16 K-10 Badger C"/>
+        <specific id="7" description="Tu-16R Badger D"/>
+        <specific id="8" description="Tu-16 Badger E, photo reconnaissance"/>
+        <specific id="9" description="Tu-16R Badger F, ELINT"/>
+        <specific id="10" description="Tu-16 Badger-G, ASM carrier"/>
+        <specific id="11" description="Tu-16K Badger G Mod"/>
+        <specific id="12" description="Tu-16PP Badger H, chaff dispenser"/>
+        <specific id="13" description="Tu-16PP Badger J, ECM"/>
+        <specific id="14" description="Tu-16R Badger K, reconnaissance"/>
+        <specific id="15" description="Tu-16 Badger L, EW"/>
+      </subcategory>
+      <subcategory id="3" description="Tu-26 (Tu-22M) Backfire">
+        <specific id="1" description="Tu-22M-1 Backfire A"/>
+        <specific id="2" description="Tu-22M-2 Backfire B"/>
+        <specific id="3" description="Tu-22M-3 Backfire C"/>
+      </subcategory>
+      <subcategory id="4" description="Tu-22 Blinder">
+        <specific id="1" description="Tu-22 Blinder-A"/>
+        <specific id="2" description="Tu-22 Blinder-B"/>
+        <specific id="3" description="Tu-22 Blinder-C, reconnaissance"/>
+        <specific id="4" description="Tu-22U Blinder-D"/>
+        <specific id="5" description="Tu-22 Blinder-E, EW/reconnaissance"/>
+      </subcategory>
+      <subcategory id="5" description="Tu-95 or Tu-142 Bear">
+        <specific id="1" description="Tu-95 Bear D, sea reconnaissance"/>
+        <specific id="2" description="Tu-95 Bear E (&quot;A&quot; conversion)"/>
+        <specific id="3" description="Tu-95 Bear G (&quot;B/C&quot; ELINT conversion)"/>
+        <specific id="4" description="Tu-95MS Bear H"/>
+        <specific id="5" description="Tu-142 Bear F, ASW"/>
+        <specific id="6" description="Tu-142 Bear F Mod 1"/>
+        <specific id="7" description="Tu-142M Bear F Mod 2"/>
+        <specific id="8" description="Tu-142 Bear F Mod 3"/>
+        <specific id="9" description="Tu-142 Bear F Mod 4"/>
+        <specific id="10" description="Tu-142 Bear J, VLF Communications"/>
+        <specific id="11" description="Tu-142K Bear H"/>
+      </subcategory>
+      <subcategory id="6" description="Il-28 Beagle"/>
+    </category>
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="An-124 Condor">
+        <specific id="1" description="An-124"/>
+      </subcategory>
+      <subcategory id="2" description="An-22 Cock">
+        <specific id="1" description="An-22"/>
+      </subcategory>
+      <subcategory id="3" description="Il-76 Candid">
+        <specific id="1" description="Il-76 Candid A"/>
+        <specific id="2" description="Il-76T Candid A, civil reserve"/>
+        <specific id="3" description="Il-76M Candid B"/>
+        <specific id="4" description="Il-76TD Candid A, civil reserve"/>
+        <specific id="5" description="Il-76MD Candid B"/>
+      </subcategory>
+      <subcategory id="4" description="Il-20/22 Coot">
+        <specific id="1" description="Il-20 Coot A, ELINT/recon (Il-18 variant)"/>
+        <specific id="2" description="Il-22 Coot B"/>
+      </subcategory>
+      <subcategory id="5" description="An-12 Cub">
+        <specific id="1" description="An-12BP"/>
+        <specific id="2" description="An-12A Cub A, ELINT"/>
+        <specific id="3" description="An-12B Cub B, SNA ELINT"/>
+        <specific id="4" description="An-12C Cub C, SNA ECM"/>
+        <specific id="5" description="An-12D Cub D, SNA ECM"/>
+      </subcategory>
+      <subcategory id="6" description="An-24 Coke">
+        <specific id="1" description="An-24"/>
+      </subcategory>
+      <subcategory id="7" description="An-26 Curl">
+        <specific id="1" description="An-26 Curl A, manual"/>
+        <specific id="2" description="An-26B Curl A, pallets"/>
+        <specific id="3" description="An-26 Curl B, SIGINT"/>
+      </subcategory>
+      <subcategory id="8" description="An-32 Cline">
+        <specific id="1" description="An-32"/>
+        <specific id="2" description="An-32 Sutlej (India)"/>
+      </subcategory>
+      <subcategory id="9" description="An-70T">
+        <specific id="1" description="An-70T"/>
+      </subcategory>
+      <subcategory id="10" description="An-72 Coaler">
+        <specific id="1" description="An-72"/>
+      </subcategory>
+      <subcategory id="11" description="An-225 Cossack">
+        <specific id="1" description="An-225"/>
+      </subcategory>
+      <subcategory id="12" description="Il-78 Midas">
+        <specific id="1" description="Il-78 (tanker)"/>
+      </subcategory>
+      <subcategory id="13" description="An-2/3 Colt">
+        <specific id="1" description="An-2 Colt"/>
+        <specific id="2" description="An-3 Colt"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Antisubmarine/patrol/observation">
+      <subcategory id="1" description="II-38 May">
+        <specific id="1" description="Il-38"/>
+      </subcategory>
+      <subcategory id="2" description="Be-12 Mail">
+        <specific id="1" description="Be-12"/>
+      </subcategory>
+      <subcategory id="3" description="Be-42 Mermaid">
+        <specific id="1" description="Be-42"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="A-40 Albatross">
+        <specific id="1" description="A-40"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Surveillance/C2">
+      <subcategory id="1" description="A-50 Mainstay">
+        <specific id="1" description="A-50 AEW&amp;C"/>
+      </subcategory>
+      <subcategory id="2" description="An-74 Madcap">
+        <specific id="1" description="An-74"/>
+      </subcategory>
+      <subcategory id="3" description="TU-126 Moss">
+        <specific id="1" description="Tu-126"/>
+      </subcategory>
+    </category>
+    <category id="20" description="Attack helicopter">
+      <subcategory id="1" description="Mi-28 Havoc">
+        <specific id="1" description="Mi-28"/>
+      </subcategory>
+      <subcategory id="2" description="Mi-24/25/35 Hind">
+        <specific id="1" description="Mi-24 Hind A"/>
+        <specific id="2" description="Mi-24 Hind B"/>
+        <specific id="3" description="Mi-24 Hind C"/>
+        <specific id="4" description="Mi-24D Hind D (1st gunship)"/>
+        <specific id="5" description="Mi-24W Hind E"/>
+        <specific id="6" description="Mi-24P Hind F"/>
+        <specific id="7" description="Mi-24RSH Hind G1 (NBC armored)"/>
+        <specific id="8" description="Mi-24RSH Hind G2 (reconnaissance/spotter)"/>
+        <specific id="9" description="Mi-25 (export Mi-24D)"/>
+        <specific id="10" description="Mi-35 (export Mi-24W)"/>
+        <specific id="11" description="Mi-35P (export Mi-24P)"/>
+      </subcategory>
+      <subcategory id="3" description="Ka-50 Hokum">
+        <specific id="1" description="Ka-50 Hokum A close air support"/>
+        <specific id="2" description="Ka-50 Hokum B tandem trainer"/>
+      </subcategory>
+      <subcategory id="4" description="Ka-25 Hormone">
+        <specific id="1" description="Ka-25BSh Hormone A, ASW"/>
+        <specific id="2" description="Ka-25 Hormone B (targeting &amp; missile guidance)"/>
+        <specific id="3" description="Ka-25PS Hormone C (targeting &amp; missile guidance)"/>
+        <specific id="4" description="Ka-25PL Hormone A"/>
+        <specific id="5" description="Ka-25TS Hormone B"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Utility helicopter">
+      <subcategory id="1" description="Mi-8/9/17/171 Hip">
+        <specific id="1" description="Mi-8 Hip C (assault)"/>
+        <specific id="2" description="Mi-8 Hip D (airborne communications)"/>
+        <specific id="3" description="Mi-8 Hip E &quot;C&quot; development, 12.7"/>
+        <specific id="4" description="Mi-8TBK (Mi-17) (&quot;E&quot; uprated)"/>
+        <specific id="5" description="Mi-8 Hip F (&quot;E&quot; export)"/>
+        <specific id="6" description="Mi-8 Hip J (ECM)"/>
+        <specific id="7" description="Mi-8PP Hip K (ECM)"/>
+        <specific id="8" description="Mi-9 Hip G (special duty &amp; airborne communications)"/>
+        <specific id="9" description="Mi-17 Hip H (MI-8 update)"/>
+        <specific id="10" description="Mi-17P (Hip K derivative)"/>
+        <specific id="11" description="Mi-171 Hip H (hospital)"/>
+        <specific id="12" description="Mi-17 (EW)"/>
+      </subcategory>
+      <subcategory id="2" description="Mi-14 Haze">
+        <specific id="1" description="Mi-14PL Haze A (ASW)"/>
+        <specific id="2" description="Mi-14PW (Polish Mi-14PL)"/>
+        <specific id="3" description="Mi-14BT Haze B (MCM)"/>
+        <specific id="4" description="Mi-14PS Haze C (SAR)"/>
+      </subcategory>
+      <subcategory id="3" description="Mi-26 Halo">
+        <specific id="1" description="Mi-26 heavy transport"/>
+        <specific id="2" description="Mi-26TZ tanker"/>
+        <specific id="3" description="Mi-26 communications &amp; support"/>
+      </subcategory>
+      <subcategory id="4" description="Mi-6 Hook">
+        <specific id="1" description="Mi-6 Hook A (export)"/>
+        <specific id="2" description="Mi-6 Hook B (command support)"/>
+        <specific id="3" description="Mi-6 Hook C (&quot;B&quot; development, command support)"/>
+      </subcategory>
+      <subcategory id="5" description="Mi-2 Hoplite">
+        <specific id="1" description="Mi-2 (only mfg in Poland)"/>
+      </subcategory>
+      <subcategory id="6" description="Mi-4 Hound">
+        <specific id="1" description="Mi-4"/>
+      </subcategory>
+      <subcategory id="7" description="Mi-10 Harke">
+        <specific id="1" description="Mi-10"/>
+        <specific id="2" description="Mi-10K"/>
+      </subcategory>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="Ka-27/28/29 Helix">
+        <specific id="1" description="Ka-27PL Helix A (ASW)"/>
+        <specific id="2" description="Ka-27PS Helix D (SAR)"/>
+        <specific id="3" description="Ka-28 Helix A (export Ka-27PL)"/>
+        <specific id="4" description="Ka-29TB Helix B (EW &amp; assault)"/>
+      </subcategory>
+      <subcategory id="10" description="Mi-34 Hermit">
+        <specific id="1" description="Mi-34 (1 engine)"/>
+        <specific id="2" description="Mi-34V (2 engine)"/>
+      </subcategory>
+      <subcategory id="11" description="Mi-38">
+        <specific id="1" description="Mi-38 (2 turbine, replaces Mi-8/17)"/>
+      </subcategory>
+      <subcategory id="12" description="Ka-26/126 Hoodlum">
+        <specific id="1" description="Ka-26 Hoodlum A (reciprocating)"/>
+        <specific id="2" description="Ka-126 Hoodlum B (turbine)"/>
+      </subcategory>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Tu-134 Crusty">
+        <specific id="1" description="Tu-134UBL (bomber pilot)"/>
+        <specific id="2" description="Tu-134Bsh (bomber navigator)"/>
+      </subcategory>
+      <subcategory id="2" description="Yak-18 Max"/>
+    </category>
+    <category id="57" description="Non-Combatant Commercial Aircraft">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Passenger Airliner">
+        <specific id="1" description="Tupolev TU-154 Careless">
+          <extra id="1" description="Tupolev TU-154M Careless"/>
+        </specific>
+        <specific id="2" description="Illyushin IL-62 Classic"/>
+        <specific id="3" description="Yakovlev Yak-42 Clobber"/>
+        <specific id="4" description="Illyushin IL-86 Camber"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="222">
+    <category id="1" description="Carrier">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Kuznetsov class (CV)">
+        <specific id="1" description="Admiral Kuznetsov (ex-Tbilisi, ex-Leonid Brezhnev)"/>
+        <specific id="2" description="Varyag (ex-Riga)"/>
+      </subcategory>
+      <subcategory id="4" description="Modified Kiev class (CV)">
+        <specific id="1" description="Admiral Gorshkov (ex-Baku)"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Guided-missile Cruiser">
+      <subcategory id="1" description="Slava class (CG)">
+        <specific id="1" description="Slava"/>
+        <specific id="2" description="Marshal Ustinov"/>
+        <specific id="3" description="Chervona Ukraina"/>
+        <specific id="4" description="Vilna Ukraina"/>
+      </subcategory>
+      <subcategory id="2" description="Kirov class">
+        <specific id="1" description="Admiral Ushakov"/>
+        <specific id="2" description="Admiral Lazarev"/>
+        <specific id="3" description="Admiral Nakimov"/>
+        <specific id="4" description="Peter Velikiy"/>
+      </subcategory>
+      <subcategory id="3" description="Kara class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="Ochakov"/>
+        <specific id="3" description="Kerch"/>
+        <specific id="4" description="Azov"/>
+        <specific id="5" description="Petropavlovsk"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="Vladivostok (ex-Tallinn)"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="Kresta I class">
+        <specific id="1" description="Admiral Zozulya"/>
+      </subcategory>
+      <subcategory id="6" description="Kynda class">
+        <specific id="1" description="Grozny"/>
+        <specific id="2" description="Admiral Fokin"/>
+        <specific id="3" description="Admiral Golovko"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Guided-missile Destroyer">
+      <subcategory id="1" description="Udaloy class">
+        <specific id="1" description="Udaloy"/>
+        <specific id="2" description="Vitse Admiral Kulakov"/>
+        <specific id="3" description="Marshal Vasilevsky"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="Admiral Spiridonov"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="Marshal Shaposhnikov"/>
+        <specific id="8" description="Simferopol (ex-Marshal Buokenny)"/>
+        <specific id="9" description="Admiral Levchenko"/>
+        <specific id="10" description="Admiral Vinogradov"/>
+        <specific id="11" description="Admiral Kharlamov"/>
+        <specific id="12" description="Admiral Panteleyev"/>
+      </subcategory>
+      <subcategory id="2" description="Sovremennyy class">
+        <specific id="1" description="Sovremennyy"/>
+        <specific id="2" description="Otchayannyy"/>
+        <specific id="3" description="Otlichnny"/>
+        <specific id="4" description="Osmotritelny"/>
+        <specific id="5" description="Bezuprechny"/>
+        <specific id="6" description="Boyevoy"/>
+        <specific id="7" description="Stoyky"/>
+        <specific id="8" description="Okrylenny"/>
+        <specific id="9" description="Burny"/>
+        <specific id="10" description="Gremyashchy"/>
+        <specific id="11" description="Bystry"/>
+        <specific id="12" description="Rastoropny"/>
+        <specific id="13" description="Bezboyaznenny"/>
+        <specific id="14" description="Bezuderzhny"/>
+        <specific id="15" description="Bespokoiny"/>
+        <specific id="16" description="Nastoichivyy"/>
+        <specific id="17" description="Besstrashnyy"/>
+        <specific id="18" description="Vazhnyy"/>
+        <specific id="19" description="Udumchivyy"/>
+        <specific id="20" description="136 Hangzhou (China) (ex-Vazhny)"/>
+        <specific id="21" description="137 Fuzhou (China) (ex-Alexandr Nevsky)"/>
+      </subcategory>
+      <subcategory id="3" description="Modified Kashin class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="Sderzhandoyy"/>
+      </subcategory>
+      <subcategory id="4" description="Kashin class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="Krasnyy Kavkaz"/>
+        <specific id="3" description="Krasnyy Krym"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="Skoryy"/>
+        <specific id="9" description="Smetlivvy"/>
+      </subcategory>
+      <subcategory id="5" description="Udaloy II">
+        <specific id="1" description="Admiral Chabenenko"/>
+      </subcategory>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="SAM Kotlin class">
+        <specific id="1" description="Bravyy"/>
+        <specific id="2" description="Nakhodchivyy"/>
+        <specific id="3" description="Nastochivyy"/>
+        <specific id="4" description="Hesokrushimyy"/>
+        <specific id="5" description="Skromnyy"/>
+        <specific id="6" description="Skrytnyy"/>
+        <specific id="7" description="Soznatel'nyy"/>
+        <specific id="8" description="Vozbuzhdennyy"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided-missile Frigate (includes Corvette)">
+      <subcategory id="1" description="Krivak I class">
+        <specific id="1" description="Bditelny"/>
+        <specific id="2" description="Bezukoriznenny"/>
+        <specific id="3" description="Bezzavetny"/>
+        <specific id="4" description="Bodry"/>
+        <specific id="5" description="Deyatelny"/>
+        <specific id="6" description="Doblestny"/>
+        <specific id="7" description="Dostoyny"/>
+        <specific id="8" description="Druzhny"/>
+        <specific id="9" description="Ladny"/>
+        <specific id="10" description="Legky"/>
+        <specific id="11" description="(deleted)"/>
+        <specific id="12" description="Letuchy"/>
+        <specific id="13" description="(deleted)"/>
+        <specific id="14" description="Razumny"/>
+        <specific id="15" description="Razyashchiy"/>
+        <specific id="16" description="Retivy"/>
+        <specific id="17" description="Silnyy"/>
+        <specific id="18" description="Storozhevoy"/>
+        <specific id="19" description="Svirepyy"/>
+        <specific id="20" description="Zadorny"/>
+        <specific id="21" description="Zharky"/>
+        <specific id="22" description="Pylky"/>
+        <specific id="23" description="Poryvisty"/>
+      </subcategory>
+      <subcategory id="2" description="Krivak II class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="Neukrotimy"/>
+        <specific id="6" description="Pitlivy"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="(deleted)"/>
+        <specific id="11" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="Neustrashimy class (FFG)">
+        <specific id="1" description="Neustrashimy"/>
+        <specific id="2" description="Nepristupnyy"/>
+      </subcategory>
+      <subcategory id="5" description="Tarantul I class (Corvette)"/>
+      <subcategory id="6" description="Tarantul II class (Corvette)"/>
+      <subcategory id="7" description="Nanuchka I class (Corvette)">
+        <specific id="1" description="Grad"/>
+        <specific id="2" description="Raduga"/>
+        <specific id="3" description="Suval"/>
+        <specific id="4" description="Storm"/>
+        <specific id="5" description="Taifun"/>
+        <specific id="6" description="Zyklon"/>
+        <specific id="7" description="Metl"/>
+        <specific id="8" description="Zarnitsa"/>
+        <specific id="9" description="Grom"/>
+        <specific id="10" description="Molnija"/>
+        <specific id="11" description="Musson"/>
+        <specific id="12" description="Vichr"/>
+        <specific id="13" description="Bora"/>
+        <specific id="14" description="Briz"/>
+      </subcategory>
+      <subcategory id="8" description="Nanuchka III class (Corvette)">
+        <specific id="1" description="Mirazh-617"/>
+        <specific id="2" description="Zyb-560"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="Priliv Burun-562"/>
+        <specific id="5" description="Burun-566"/>
+        <specific id="6" description="Liven-551"/>
+        <specific id="7" description="Passat-570"/>
+        <specific id="8" description="Moroz-409"/>
+        <specific id="9" description="Smerch-423"/>
+        <specific id="10" description="Inej-432"/>
+        <specific id="11" description="Rasssvet-520"/>
+        <specific id="12" description="Razliv-450"/>
+        <specific id="13" description="Veter"/>
+      </subcategory>
+      <subcategory id="9" description="Nanuchka IV class (Corvette)"/>
+      <subcategory id="10" description="Tarantul III class (Corvette)"/>
+      <subcategory id="11" description="Gepard Class">
+        <specific id="1" description="Gepard"/>
+      </subcategory>
+      <subcategory id="12" description="Nanuchka II class (Corvette)"/>
+    </category>
+    <category id="7" description="Light/Patrol craft">
+      <subcategory id="1" description="2/3 T 58 PGF/PGR class (patrol)"/>
+      <subcategory id="2" description="Dergach class (light missile force)">
+        <specific id="1" description="Sivuch"/>
+      </subcategory>
+      <subcategory id="3" description="OSA I class"/>
+      <subcategory id="4" description="OSA II class"/>
+      <subcategory id="5" description="Poti class (fast attack craft--patrol)"/>
+      <subcategory id="6" description="Svetlyak class (fast attack craft--patrol)"/>
+      <subcategory id="7" description="Pauk I class (fast attack craft--patrol)"/>
+      <subcategory id="8" description="Zhuk class"/>
+      <subcategory id="9" description="Yaz class"/>
+      <subcategory id="10" description="Stenka class"/>
+      <subcategory id="11" description="Piyavka class (river patrol craft)"/>
+      <subcategory id="12" description="SO 1 class"/>
+      <subcategory id="13" description="Shmel class (river patrol craft)"/>
+      <subcategory id="14" description="TR 40 class (river patrol craft)"/>
+      <subcategory id="15" description="Command ship (river patrol craft)">
+        <specific id="1" description="SSV-10"/>
+      </subcategory>
+      <subcategory id="16" description="Potok class (torpedo experimental ships)">
+        <specific id="1" description="OS-100"/>
+        <specific id="2" description="OS-138"/>
+        <specific id="3" description="OS-145"/>
+        <specific id="4" description="OS-225"/>
+      </subcategory>
+      <subcategory id="17" description="Shelon class (torpedo operating/patrol &amp; target craft)">
+        <specific id="1" description="YPT Weapon Recovery"/>
+        <specific id="2" description="Shelon II (Environmental Research)"/>
+      </subcategory>
+      <subcategory id="18" description="Poluchat I/II/III classes (torpedo operating/patrol &amp; target craft)"/>
+      <subcategory id="19" description="Pozharny I class"/>
+      <subcategory id="20" description="Iva class (fire/patrol craft)">
+        <specific id="1" description="PZHK 415"/>
+        <specific id="2" description="1514"/>
+        <specific id="3" description="1544"/>
+        <specific id="4" description="1547"/>
+        <specific id="5" description="1859"/>
+      </subcategory>
+      <subcategory id="21" description="Vikhr class"/>
+      <subcategory id="22" description="Vosh class (river patrol craft)"/>
+      <subcategory id="23" description="Shershen class"/>
+      <subcategory id="24" description="Komar class"/>
+      <subcategory id="25" description="Matka class"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship / Craft">
+      <subcategory id="1" description="Alesha Class">
+        <specific id="1" description="Pripyat"/>
+        <specific id="2" description="Vychegda"/>
+        <specific id="3" description="Pechora"/>
+      </subcategory>
+      <subcategory id="2" description="Natya I class">
+        <specific id="1" description="Dizelist"/>
+        <specific id="2" description="Miner"/>
+        <specific id="3" description="Starshkiy"/>
+        <specific id="4" description="Snaypr"/>
+        <specific id="5" description="Elektrik"/>
+        <specific id="6" description="Motorist"/>
+        <specific id="7" description="Signalshik"/>
+        <specific id="8" description="Turbinist"/>
+        <specific id="9" description="Polemetchiz"/>
+        <specific id="10" description="Rulevoy"/>
+        <specific id="11" description="Zapal"/>
+        <specific id="12" description="Zenitchik"/>
+        <specific id="13" description="Radist"/>
+        <specific id="14" description="Dobrotay"/>
+        <specific id="15" description="Zaryad"/>
+      </subcategory>
+      <subcategory id="3" description="Natya II class"/>
+      <subcategory id="4" description="Yurka class">
+        <specific id="1" description="Gafel"/>
+        <specific id="2" description="Evgeniy Nikonov"/>
+        <specific id="3" description="Mazlov"/>
+        <specific id="4" description="Navodchik"/>
+        <specific id="5" description="Semen Rosal"/>
+      </subcategory>
+      <subcategory id="5" description="T-43 class"/>
+      <subcategory id="6" description="Sonya class"/>
+      <subcategory id="7" description="Baltika class"/>
+      <subcategory id="8" description="Vanya I class"/>
+      <subcategory id="9" description="Vanya II class"/>
+      <subcategory id="10" description="Sasha class"/>
+      <subcategory id="11" description="Yevgenya class"/>
+      <subcategory id="12" description="Pelikan class ACV (minesweeper, inshore)"/>
+      <subcategory id="13" description="Lida class (minehunter, inshore)"/>
+      <subcategory id="14" description="Ilyusha class (minesweeper, inshore)"/>
+      <subcategory id="15" description="(deleted)"/>
+      <subcategory id="16" description="Olya class (minesweeper, inshore)"/>
+      <subcategory id="17" description="Tanya class (minesweeper, inshore)"/>
+      <subcategory id="18" description="K 8 class (minesweeping boat)"/>
+      <subcategory id="19" description="Gorya class (minehunter, ocean)">
+        <specific id="1" description="Zheleznyakov"/>
+      </subcategory>
+    </category>
+    <category id="9" description="Dock landing ship">
+      <subcategory id="1" description="Ivan Rogov class">
+        <specific id="1" description="Ivan Rogov"/>
+        <specific id="2" description="Aleksandr Nikolay"/>
+        <specific id="3" description="Mitrofan Moskalenko"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Tank landing ship">
+      <subcategory id="1" description="Ropucha class">
+        <specific id="1" description="Aleksandr Shabalin"/>
+        <specific id="2" description="Constantin Olshanskiy"/>
+        <specific id="3" description="Tsesar Kunikov"/>
+        <specific id="4" description="Bobruisk"/>
+      </subcategory>
+      <subcategory id="2" description="Alligator class">
+        <specific id="1" description="Aleksandr Tortsev"/>
+        <specific id="2" description="Donetskiy Shakhter"/>
+        <specific id="3" description="Krasnaya Presnya"/>
+        <specific id="4" description="Krymskiy Kom."/>
+        <specific id="5" description="Nikolay Fil'chenkov"/>
+        <specific id="6" description="Nikolay Vilkov"/>
+        <specific id="7" description="50 Let Sheftsva Vlksm"/>
+        <specific id="8" description="Petr Il'ichyev"/>
+        <specific id="9" description="Sergei Lazo"/>
+        <specific id="10" description="Tomskiy Kom."/>
+        <specific id="11" description="Ilya Azarov"/>
+      </subcategory>
+      <subcategory id="3" description="Polnocny class"/>
+    </category>
+    <category id="11" description="Landing craft">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="Vydra class"/>
+      <subcategory id="5" description="Ondatra class"/>
+    </category>
+    <category id="13" description="Cruiser/Helicopter Carrier">
+      <subcategory id="1" description="(deleted)"/>
+    </category>
+    <category id="14" description="Hydrofoil">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Matka class (fast attack craft, missile hydrofoil)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="Mukha class (fast attack craft, patrol hydrofoil)"/>
+      <subcategory id="6" description="Turya class (fast attack craft, torpedo hydrofoil)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="Babochka class (fast attack craft, patrol hydrofoil)"/>
+      <subcategory id="10" description="Muravey class (fast attack craft, patrol hydrofoil)"/>
+    </category>
+    <category id="15" description="Air cushion/Surface effect">
+      <subcategory id="1" description="Pomornik class (air-cushion vehicles)"/>
+      <subcategory id="2" description="Aist class (air-cushion vehicles)"/>
+      <subcategory id="3" description="Tsaplya class (air-cushion vehicles)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="Utka class (wing-in-ground-effect craft) (air cushion)"/>
+      <subcategory id="8" description="Orlan class (wing-in-ground-effect craft) (air cushion)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Ugra class (submarine depot ships)">
+        <specific id="1" description="Ivan Kolyshkin"/>
+        <specific id="2" description="Ivan Vakhrameev"/>
+        <specific id="3" description="Volga"/>
+        <specific id="4" description="Ivan Kucherenko"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="Lentra"/>
+      </subcategory>
+      <subcategory id="2" description="Don class (submarine depot ships)">
+        <specific id="1" description="Dmitry Galkin"/>
+        <specific id="2" description="Kamchatsky Kkomsomolets"/>
+        <specific id="3" description="Magomet Gadzhiev (ex-Mikhail Tukhachevsky)"/>
+        <specific id="4" description="Viktor Kotelnikov"/>
+        <specific id="5" description="Fedor Vidyayev"/>
+        <specific id="6" description="Magadansky Komsomolets"/>
+      </subcategory>
+      <subcategory id="3" description="Aleksandr Brykin class (missile support ship)">
+        <specific id="1" description="Aleksandr Brykin"/>
+      </subcategory>
+      <subcategory id="4" description="Amga class (missile support ships)">
+        <specific id="1" description="Amga"/>
+        <specific id="2" description="Vetluga"/>
+        <specific id="3" description="Daugava"/>
+      </subcategory>
+      <subcategory id="5" description="Malina class (nuclear submarine support ships)">
+        <specific id="1" description="PM 63"/>
+        <specific id="2" description="PM 74"/>
+        <specific id="3" description="PM 12"/>
+      </subcategory>
+      <subcategory id="6" description="Pinega class (nuclear submarine support ships)">
+        <specific id="1" description="Pinega"/>
+        <specific id="2" description="Amur"/>
+      </subcategory>
+      <subcategory id="7" description="Lama class (missile support ships)">
+        <specific id="1" description="General Ryabakov"/>
+        <specific id="2" description="Voronesh"/>
+        <specific id="3" description="PM 44"/>
+        <specific id="4" description="PM 93"/>
+        <specific id="5" description="PM 131"/>
+        <specific id="6" description="PM 150"/>
+        <specific id="7" description="PM 154"/>
+      </subcategory>
+      <subcategory id="8" description="Modified Andizhan class (missile support ships)">
+        <specific id="1" description="Venta"/>
+        <specific id="2" description="Vilyuy"/>
+      </subcategory>
+      <subcategory id="9" description="Amur I Class (Repair Ship)">
+        <specific id="1" description="PM 9"/>
+        <specific id="2" description="PM 10"/>
+        <specific id="3" description="PM 15"/>
+        <specific id="4" description="PM 37"/>
+        <specific id="5" description="PM 49"/>
+        <specific id="6" description="PM 52"/>
+        <specific id="7" description="PM 56"/>
+        <specific id="8" description="PM 75"/>
+        <specific id="9" description="PM 94"/>
+        <specific id="10" description="PM 138"/>
+        <specific id="11" description="PM 161"/>
+        <specific id="12" description="PM 163"/>
+        <specific id="13" description="5"/>
+        <specific id="14" description="30"/>
+        <specific id="15" description="34"/>
+        <specific id="16" description="40"/>
+        <specific id="17" description="64"/>
+        <specific id="18" description="73"/>
+        <specific id="19" description="81"/>
+        <specific id="20" description="82"/>
+        <specific id="21" description="129"/>
+        <specific id="22" description="139"/>
+        <specific id="23" description="140"/>
+        <specific id="24" description="156"/>
+      </subcategory>
+      <subcategory id="10" description="Amur II Class (repair ship)">
+        <specific id="1" description="59"/>
+        <specific id="2" description="69"/>
+        <specific id="3" description="86"/>
+        <specific id="4" description="92"/>
+        <specific id="5" description="97"/>
+      </subcategory>
+      <subcategory id="11" description="Oskol class (repair ships)">
+        <specific id="1" description="PM 2"/>
+        <specific id="2" description="PM 24"/>
+        <specific id="3" description="PM 26"/>
+        <specific id="4" description="PM 42"/>
+        <specific id="5" description="PM 147"/>
+        <specific id="6" description="PM 148"/>
+        <specific id="7" description="20"/>
+        <specific id="8" description="21"/>
+        <specific id="9" description="51"/>
+        <specific id="10" description="68"/>
+        <specific id="11" description="146"/>
+      </subcategory>
+      <subcategory id="12" description="Tomba class (support ships)">
+        <specific id="1" description="244"/>
+        <specific id="2" description="254"/>
+        <specific id="3" description="348"/>
+        <specific id="4" description="357"/>
+      </subcategory>
+      <subcategory id="13" description="Vytegrales class (support &amp; depot)">
+        <specific id="1" description="Apsheron (ex-Vagales)"/>
+        <specific id="2" description="Baskunchak (ex-Kirishi)"/>
+        <specific id="3" description="Dauriya (ex-Vyborgles)"/>
+        <specific id="4" description="Dikson (ex-Vostok 3)"/>
+        <specific id="5" description="Donbas (ex-Vostok 4)"/>
+        <specific id="6" description="Sevan (ex-Siverles)"/>
+        <specific id="7" description="Taman (ex-Suzdal)"/>
+        <specific id="8" description="Yamal (ex-Tosnoles)"/>
+      </subcategory>
+      <subcategory id="14" description="Vishnya class (AGIs)">
+        <specific id="1" description="SSV 169"/>
+        <specific id="2" description="SSV 175"/>
+        <specific id="3" description="SSV 201"/>
+        <specific id="4" description="SSV 208"/>
+        <specific id="5" description="SSV 231"/>
+        <specific id="6" description="SSV 520"/>
+        <specific id="7" description="SSV 535"/>
+      </subcategory>
+      <subcategory id="15" description="Balzam class (AGIs)">
+        <specific id="1" description="SSV 80"/>
+        <specific id="2" description="SSV 493"/>
+        <specific id="3" description="SSV 516"/>
+        <specific id="4" description="SSV 571"/>
+      </subcategory>
+      <subcategory id="16" description="Primorye class (AGIs)">
+        <specific id="1" description="SSV 464 Zabaykalye"/>
+        <specific id="2" description="SSV 465 Primorye"/>
+        <specific id="3" description="SSV 501 Zaporozhye"/>
+        <specific id="4" description="SSV 502 Zakarpatye"/>
+        <specific id="5" description="SSV 590 Krym"/>
+        <specific id="6" description="SSV 591 Kavkaz"/>
+      </subcategory>
+      <subcategory id="17" description="Nikolay Zubov class (AGIs)">
+        <specific id="1" description="SSV 468 Gavril Sarychev (mod)"/>
+        <specific id="2" description="SSV 469 Semen Chelyuskin"/>
+        <specific id="3" description="SSV 503 Khariton Laptev (mod)"/>
+      </subcategory>
+      <subcategory id="18" description="Modified Pamir class (AGIs)">
+        <specific id="1" description="SSV 477 Peleng (ex-Arban)"/>
+      </subcategory>
+      <subcategory id="19" description="Moma class (AGIs)">
+        <specific id="1" description="Ekvator"/>
+        <specific id="2" description="Yupiter (mod)"/>
+        <specific id="3" description="Kildin (mod)"/>
+        <specific id="4" description="SSV 472 (ex-Ilmen) (mod)"/>
+        <specific id="5" description="SSV 474 (ex-Vega) (mod)"/>
+        <specific id="6" description="SSV 506 (ex-Nakhodka)"/>
+        <specific id="7" description="SSV 509 (ex-Pelorus) (mod)"/>
+        <specific id="8" description="SSV 512 (ex-Arkhipelag) (mod)"/>
+        <specific id="9" description="SSV 514 (ex-Seliger) (mod)"/>
+      </subcategory>
+      <subcategory id="20" description="Alpinist class (AGIs)">
+        <specific id="1" description="GS 7 (mod)"/>
+        <specific id="2" description="GS 8"/>
+        <specific id="3" description="GS 19 (mod)"/>
+        <specific id="4" description="GS 39 (mod)"/>
+      </subcategory>
+      <subcategory id="21" description="Mayak class">
+        <specific id="1" description="Khersones"/>
+        <specific id="2" description="Kurs"/>
+        <specific id="3" description="Kursograf"/>
+        <specific id="4" description="Ladoga"/>
+        <specific id="5" description="GS 239"/>
+        <specific id="6" description="GS 242"/>
+        <specific id="7" description="Girorulevoy"/>
+        <specific id="8" description="Aneroid"/>
+      </subcategory>
+      <subcategory id="22" description="Okean class (AGIs)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="Ekholot"/>
+        <specific id="5" description="Krenometr"/>
+        <specific id="6" description="Linza (mod)"/>
+        <specific id="7" description="Lotlin (mod)"/>
+        <specific id="8" description="Reduktor (mod)"/>
+        <specific id="9" description="Repiter"/>
+        <specific id="10" description="Teodolit"/>
+        <specific id="11" description="Traverz"/>
+        <specific id="12" description="Zond (mod) no missiles"/>
+      </subcategory>
+      <subcategory id="23" description="Lentra class (AGIs)">
+        <specific id="1" description="GS 41"/>
+        <specific id="2" description="GS 43 (mod)"/>
+        <specific id="3" description="GS 55"/>
+        <specific id="4" description="GS 59"/>
+      </subcategory>
+      <subcategory id="24" description="Akademik Krylov class (naval research)">
+        <specific id="1" description="Admiral Vladimirsky"/>
+        <specific id="2" description="Ivan Kruzenshtern"/>
+        <specific id="3" description="Leonid Demin"/>
+        <specific id="4" description="Akademik Krylov"/>
+        <specific id="5" description="Leonid Sobolev"/>
+        <specific id="6" description="Mikhail Krupsky"/>
+      </subcategory>
+      <subcategory id="25" description="Abkhaziya class (naval research)">
+        <specific id="1" description="Abkhaziya"/>
+        <specific id="2" description="Adzhariya"/>
+        <specific id="3" description="Bashkiriya"/>
+        <specific id="4" description="Moldavia"/>
+      </subcategory>
+      <subcategory id="26" description="Polyus class (Kovel type) (naval research)">
+        <specific id="1" description="Baykal (mod)"/>
+        <specific id="2" description="Balkhash (mod)"/>
+        <specific id="3" description="Polyus"/>
+      </subcategory>
+      <subcategory id="27" description="Modified Dobrynya Nikitich class (naval research)">
+        <specific id="1" description="Vladimir Kavraysky"/>
+      </subcategory>
+      <subcategory id="28" description="Nikolay Zubov class (naval research)">
+        <specific id="1" description="Aleksey Chirikov"/>
+        <specific id="2" description="Fedor Litke"/>
+        <specific id="3" description="Andrey Vilkitsky"/>
+        <specific id="4" description="Nikolay Zubov"/>
+        <specific id="5" description="Boris Davidov"/>
+        <specific id="6" description="Semen Dezhnev"/>
+        <specific id="7" description="Faddey Bellinsgausen"/>
+        <specific id="8" description="Vasily Golovnin"/>
+      </subcategory>
+      <subcategory id="29" description="Yug class (naval research)">
+        <specific id="1" description="V Adm Vorontsov (ex-Briz)"/>
+        <specific id="2" description="Donuzlav"/>
+        <specific id="3" description="Gals"/>
+        <specific id="4" description="Gidrolog"/>
+        <specific id="5" description="Gorizont"/>
+        <specific id="6" description="Mangyshlak"/>
+        <specific id="7" description="Marshal Gelovani"/>
+        <specific id="8" description="Nikolay Matusevich"/>
+        <specific id="9" description="Pegas"/>
+        <specific id="10" description="Persey"/>
+        <specific id="11" description="Pluton"/>
+        <specific id="12" description="Senezh"/>
+        <specific id="13" description="Strelets"/>
+        <specific id="14" description="Tayga"/>
+        <specific id="15" description="Vizir"/>
+        <specific id="16" description="Zodiak"/>
+        <specific id="17" description="Stvor"/>
+        <specific id="18" description="704 (ex-SSV 328)"/>
+      </subcategory>
+      <subcategory id="30" description="Mod Sorum class (naval research)">
+        <specific id="1" description="OS 572"/>
+      </subcategory>
+      <subcategory id="31" description="Moma class (+9 AGIs) (naval survey)">
+        <specific id="1" description="Altair"/>
+        <specific id="2" description="Anadyr"/>
+        <specific id="3" description="Andromeda"/>
+        <specific id="4" description="Antares"/>
+        <specific id="5" description="Antarktyda"/>
+        <specific id="6" description="Arktika"/>
+        <specific id="7" description="Askold"/>
+        <specific id="8" description="Berezan"/>
+        <specific id="9" description="Cheleken"/>
+        <specific id="10" description="Elton"/>
+        <specific id="11" description="Kolguev (mod)"/>
+        <specific id="12" description="Krilon"/>
+        <specific id="13" description="Liman"/>
+        <specific id="14" description="Mars"/>
+        <specific id="15" description="Morzhovets"/>
+        <specific id="16" description="Okean"/>
+        <specific id="17" description="Rybachi (mod)"/>
+        <specific id="18" description="Sever"/>
+        <specific id="19" description="Taymyr"/>
+        <specific id="20" description="Zapolyarye"/>
+      </subcategory>
+      <subcategory id="32" description="Samara class (naval survey)">
+        <specific id="1" description="Azimut"/>
+        <specific id="2" description="Glubomer"/>
+        <specific id="3" description="Tropik"/>
+        <specific id="4" description="Deviator"/>
+        <specific id="5" description="Gradus"/>
+        <specific id="6" description="Vostok"/>
+        <specific id="7" description="Gigrometr"/>
+        <specific id="8" description="Kompas"/>
+        <specific id="9" description="Vaygach (mod)"/>
+        <specific id="10" description="Moskovsky Universitet"/>
+        <specific id="11" description="Pamyat Merkuryia"/>
+        <specific id="12" description="Zenit (ex-Gorizont) (mod)"/>
+        <specific id="13" description="Rumb"/>
+      </subcategory>
+      <subcategory id="33" description="Finik class (naval survey)">
+        <specific id="1" description="GS 44"/>
+        <specific id="2" description="47"/>
+        <specific id="3" description="84"/>
+        <specific id="4" description="86"/>
+        <specific id="5" description="87"/>
+        <specific id="6" description="260"/>
+        <specific id="7" description="265"/>
+        <specific id="8" description="270"/>
+        <specific id="9" description="272"/>
+        <specific id="10" description="278"/>
+        <specific id="11" description="296"/>
+        <specific id="12" description="297"/>
+        <specific id="13" description="301"/>
+        <specific id="14" description="388"/>
+        <specific id="15" description="392"/>
+        <specific id="16" description="397"/>
+        <specific id="17" description="398"/>
+        <specific id="18" description="399"/>
+        <specific id="19" description="400"/>
+        <specific id="20" description="401"/>
+        <specific id="21" description="402"/>
+        <specific id="22" description="403"/>
+        <specific id="23" description="404"/>
+        <specific id="24" description="405"/>
+      </subcategory>
+      <subcategory id="34" description="Biya class (naval survey)">
+        <specific id="1" description="GS 182"/>
+        <specific id="2" description="193"/>
+        <specific id="3" description="194"/>
+        <specific id="4" description="198"/>
+        <specific id="5" description="200"/>
+        <specific id="6" description="202"/>
+        <specific id="7" description="204"/>
+        <specific id="8" description="206"/>
+        <specific id="9" description="210"/>
+        <specific id="10" description="212"/>
+        <specific id="11" description="214"/>
+        <specific id="12" description="271"/>
+        <specific id="13" description="273"/>
+        <specific id="14" description="275"/>
+      </subcategory>
+      <subcategory id="35" description="Kamenka class (naval survey)">
+        <specific id="1" description="GS 66"/>
+        <specific id="2" description="74"/>
+        <specific id="3" description="78"/>
+        <specific id="4" description="82"/>
+        <specific id="5" description="107"/>
+        <specific id="6" description="108 (ex-Vernier)"/>
+        <specific id="7" description="113 (ex-Belbeck)"/>
+        <specific id="8" description="118"/>
+        <specific id="9" description="199 (ex-Sima)"/>
+        <specific id="10" description="207"/>
+        <specific id="11" description="211"/>
+        <specific id="12" description="Astronom (mod)"/>
+      </subcategory>
+      <subcategory id="36" description="Vinograd class (naval survey)">
+        <specific id="1" description="GS 525"/>
+        <specific id="2" description="GS 526"/>
+      </subcategory>
+      <subcategory id="37" description="Melitopol class (naval survey)">
+        <specific id="1" description="Mayak"/>
+        <specific id="2" description="Nivelir"/>
+        <specific id="3" description="Prizma"/>
+        <specific id="4" description="Indigurka (mod)"/>
+        <specific id="5" description="Shevchenoko (mod)"/>
+      </subcategory>
+      <subcategory id="38" description="Nyryat 1 class (naval survey)"/>
+      <subcategory id="39" description="Nyryat 2 class (naval survey)"/>
+      <subcategory id="40" description="Sibir class (naval missile range)">
+        <specific id="1" description="Sakhalin"/>
+        <specific id="2" description="Spassk (ex-Suchan)"/>
+      </subcategory>
+      <subcategory id="41" description="Marshal Nedelin class (naval missile range)">
+        <specific id="1" description="Marshal Nedelin"/>
+        <specific id="2" description="Marshal Krylov"/>
+        <specific id="3" description="Akademik Nicolai Pilyugin"/>
+      </subcategory>
+      <subcategory id="42" description="Kamchatka class (AG) (naval missile range)">
+        <specific id="1" description="SSV 391 Kamchatka"/>
+      </subcategory>
+      <subcategory id="43" description="Kapusta class (naval missile range)">
+        <specific id="1" description="SSV 33 Ural"/>
+      </subcategory>
+      <subcategory id="44" description="Ugra II class (AXT) (training)">
+        <specific id="1" description="Borodino"/>
+        <specific id="2" description="Gangut"/>
+      </subcategory>
+      <subcategory id="45" description="Smolny class (AXT) (training)">
+        <specific id="1" description="Khasan"/>
+        <specific id="2" description="Perekop"/>
+        <specific id="3" description="Smolny"/>
+      </subcategory>
+      <subcategory id="46" description="Wodnik II class (AXT) (training)">
+        <specific id="1" description="Luga"/>
+        <specific id="2" description="Oka"/>
+      </subcategory>
+      <subcategory id="47" description="Sail training ships">
+        <specific id="1" description="Mir"/>
+        <specific id="2" description="Druzjba"/>
+        <specific id="3" description="Khersones"/>
+        <specific id="4" description="Pallada"/>
+      </subcategory>
+      <subcategory id="48" description="Klasma class (cable ships)">
+        <specific id="1" description="Donets"/>
+        <specific id="2" description="Ingul"/>
+        <specific id="3" description="Inguri"/>
+        <specific id="4" description="Katun"/>
+        <specific id="5" description="Tavda"/>
+        <specific id="6" description="Tsna"/>
+        <specific id="7" description="Yana type I"/>
+        <specific id="8" description="Zeya"/>
+      </subcategory>
+      <subcategory id="49" description="Emba I class (cable ships)">
+        <specific id="1" description="Emba"/>
+        <specific id="2" description="Nepryadva"/>
+        <specific id="3" description="Setun"/>
+      </subcategory>
+      <subcategory id="50" description="Emba II class (cable ships)">
+        <specific id="1" description="Biriusa"/>
+        <specific id="2" description="Kemj"/>
+      </subcategory>
+      <subcategory id="51" description="Berezina class (replenishment ships)">
+        <specific id="1" description="Berezina"/>
+      </subcategory>
+      <subcategory id="52" description="Boris Chilikin class (replenishment ships)">
+        <specific id="1" description="Boris Butoma"/>
+        <specific id="2" description="Genrich Gasanov"/>
+        <specific id="3" description="Boris Chilikin"/>
+        <specific id="4" description="Ivan Bubnov"/>
+        <specific id="5" description="Dnestr"/>
+        <specific id="6" description="Vladimir Kolechitsky"/>
+      </subcategory>
+      <subcategory id="53" description="Dubna class (replenishment tankers)">
+        <specific id="1" description="Dubna"/>
+        <specific id="2" description="Pechenga"/>
+        <specific id="3" description="Irkut"/>
+        <specific id="4" description="Sventa"/>
+      </subcategory>
+      <subcategory id="54" description="Mod Kazbek class (replenishment tankers)">
+        <specific id="1" description="Alatyr"/>
+        <specific id="2" description="Desna"/>
+        <specific id="3" description="Volkhov"/>
+      </subcategory>
+      <subcategory id="55" description="Mod Altay class (replenishment tankers)">
+        <specific id="1" description="Elnya"/>
+        <specific id="2" description="Ilim"/>
+        <specific id="3" description="Izhora"/>
+        <specific id="4" description="Kola"/>
+        <specific id="5" description="Prut"/>
+        <specific id="6" description="Yegorlik"/>
+      </subcategory>
+      <subcategory id="56" description="Uda class (replenishment tankers)">
+        <specific id="1" description="Dunay (mod)"/>
+        <specific id="2" description="Koida"/>
+        <specific id="3" description="Lena (mod)"/>
+        <specific id="4" description="Terek (mod)"/>
+        <specific id="5" description="Vishera"/>
+      </subcategory>
+      <subcategory id="57" description="Olekma class (replenishment tankers)">
+        <specific id="1" description="Olekma (mod)"/>
+        <specific id="2" description="Iman"/>
+        <specific id="3" description="Zolotoy rog"/>
+      </subcategory>
+      <subcategory id="58" description="Kaliningradneft class (support tankers)">
+        <specific id="1" description="Argun"/>
+        <specific id="2" description="Vyazma"/>
+      </subcategory>
+      <subcategory id="59" description="Sofya class (support tanker)">
+        <specific id="1" description="Akhtyuba (ex-Hanoi)"/>
+      </subcategory>
+      <subcategory id="60" description="Nercha class (support tankers)">
+        <specific id="1" description="Nara"/>
+        <specific id="2" description="Nercha"/>
+      </subcategory>
+      <subcategory id="61" description="Konda class (support tankers)">
+        <specific id="1" description="Konda"/>
+        <specific id="2" description="Rossosh"/>
+        <specific id="3" description="Soyana"/>
+        <specific id="4" description="Yakhroma"/>
+      </subcategory>
+      <subcategory id="62" description="Khobi class (support tankers)">
+        <specific id="1" description="Cheremshan"/>
+        <specific id="2" description="Orsha"/>
+        <specific id="3" description="Shelon"/>
+        <specific id="4" description="Tartu"/>
+        <specific id="5" description="Khobi"/>
+        <specific id="6" description="Seima"/>
+        <specific id="7" description="Sosva"/>
+        <specific id="8" description="Titan 150"/>
+        <specific id="9" description="Lovat"/>
+        <specific id="10" description="Shacha"/>
+        <specific id="11" description="Sysola"/>
+        <specific id="12" description="Tunguska"/>
+        <specific id="13" description="Metan"/>
+      </subcategory>
+      <subcategory id="63" description="Irtysh class (support tanker)">
+        <specific id="1" description="Narva"/>
+      </subcategory>
+      <subcategory id="64" description="Baskunchak class (support tankers)">
+        <specific id="1" description="Ivan Golubets"/>
+        <specific id="2" description="Sovietsky Pogranichnik"/>
+      </subcategory>
+      <subcategory id="65" description="Luza class (special tankers)">
+        <specific id="1" description="Alambai"/>
+        <specific id="2" description="Barguzin"/>
+        <specific id="3" description="Kama"/>
+        <specific id="4" description="Aragvi"/>
+        <specific id="5" description="Don"/>
+        <specific id="6" description="Selenga"/>
+      </subcategory>
+      <subcategory id="66" description="Vala class (special tankers)">
+        <specific id="1" description="Vala"/>
+        <specific id="2" description="TNT 11"/>
+        <specific id="3" description="TNT 27"/>
+        <specific id="4" description="12"/>
+        <specific id="5" description="19"/>
+        <specific id="6" description="25"/>
+        <specific id="7" description="29"/>
+      </subcategory>
+      <subcategory id="67" description="OB class (AH)">
+        <specific id="1" description="OB"/>
+        <specific id="2" description="Yenisei"/>
+        <specific id="3" description="Svir"/>
+        <specific id="4" description="Irtysh"/>
+      </subcategory>
+      <subcategory id="68" description="Mikhail Rudnitsky class (ARs)">
+        <specific id="1" description="Mikhail Rudnitsky"/>
+        <specific id="2" description="Georgy Kozmin"/>
+        <specific id="3" description="Georgy Titov"/>
+        <specific id="4" description="Sayany"/>
+      </subcategory>
+      <subcategory id="69" description="Pamir class (salvage, rescue &amp; mooring)">
+        <specific id="1" description="Agatan"/>
+        <specific id="2" description="Aldan"/>
+      </subcategory>
+      <subcategory id="70" description="Ingul class (salvage, rescue &amp; mooring)">
+        <specific id="1" description="Pamir"/>
+        <specific id="2" description="Mashuk"/>
+        <specific id="3" description="Alatau"/>
+        <specific id="4" description="Karakh"/>
+      </subcategory>
+      <subcategory id="71" description="Sliva class (salvage, rescue &amp; mooring)">
+        <specific id="1" description="SB 406"/>
+        <specific id="2" description="SB 408"/>
+        <specific id="3" description="SB 921"/>
+        <specific id="4" description="SB 922 Shakhter"/>
+      </subcategory>
+      <subcategory id="72" description="Kashtan class (buoy tenders)">
+        <specific id="1" description="KIL 926"/>
+        <specific id="2" description="KIL 143"/>
+        <specific id="3" description="KIL 164"/>
+        <specific id="4" description="KIL 498"/>
+        <specific id="5" description="KIL 927"/>
+        <specific id="6" description="KIL 158"/>
+        <specific id="7" description="KIL 140"/>
+        <specific id="8" description="KIL 168"/>
+      </subcategory>
+      <subcategory id="73" description="Sura class (buoy tenders)">
+        <specific id="1" description="KIL 1"/>
+        <specific id="2" description="2"/>
+        <specific id="3" description="21"/>
+        <specific id="4" description="22"/>
+        <specific id="5" description="25"/>
+        <specific id="6" description="27"/>
+        <specific id="7" description="29"/>
+        <specific id="8" description="31"/>
+        <specific id="9" description="32"/>
+        <specific id="10" description="33"/>
+      </subcategory>
+      <subcategory id="74" description="Orel class (salvage tugs)">
+        <specific id="1" description="SB 38"/>
+        <specific id="2" description="SB 43"/>
+      </subcategory>
+      <subcategory id="75" description="Katun I class (salvage &amp; rescue tugs)">
+        <specific id="1" description="PZHS 96"/>
+        <specific id="2" description="98"/>
+        <specific id="3" description="123"/>
+        <specific id="4" description="124"/>
+        <specific id="5" description="209"/>
+        <specific id="6" description="273"/>
+        <specific id="7" description="279"/>
+        <specific id="8" description="282"/>
+        <specific id="9" description="551"/>
+      </subcategory>
+      <subcategory id="76" description="Katun II (salvage &amp; rescue tugs)">
+        <specific id="1" description="PZHS 64"/>
+        <specific id="2" description="92"/>
+      </subcategory>
+      <subcategory id="77" description="Neptun class (salvage, rescue &amp; mooring)">
+        <specific id="1" description="KIL 3"/>
+        <specific id="2" description="6"/>
+        <specific id="3" description="7"/>
+        <specific id="4" description="9"/>
+        <specific id="5" description="11"/>
+        <specific id="6" description="13"/>
+        <specific id="7" description="15"/>
+        <specific id="8" description="17"/>
+        <specific id="9" description="18"/>
+      </subcategory>
+      <subcategory id="78" description="Elbrus class (submarine rescue ships)">
+        <specific id="1" description="Elbrus"/>
+        <specific id="2" description="Alagez"/>
+      </subcategory>
+      <subcategory id="79" description="Nepa class (submarine rescue ships)">
+        <specific id="1" description="Karpaty"/>
+      </subcategory>
+      <subcategory id="80" description="Prut class (submarine rescue ships)">
+        <specific id="1" description="Altay"/>
+        <specific id="2" description="Beshtau"/>
+        <specific id="3" description="Vladimir Trefolev"/>
+        <specific id="4" description="Zhiguli"/>
+        <specific id="5" description="SS 21"/>
+        <specific id="6" description="Epron (ex-SS 26)"/>
+        <specific id="7" description="SS 83"/>
+      </subcategory>
+      <subcategory id="81" description="Valday class (ex-T 58)">
+        <specific id="1" description="Kazbek"/>
+        <specific id="2" description="Khibiny"/>
+        <specific id="3" description="Valday"/>
+        <specific id="4" description="Zangezur"/>
+        <specific id="5" description="Pulkovo (ex-SS 38)"/>
+        <specific id="6" description="SS 30"/>
+        <specific id="7" description="35"/>
+        <specific id="8" description="40"/>
+        <specific id="9" description="47"/>
+        <specific id="10" description="50"/>
+      </subcategory>
+      <subcategory id="82" description="Anadyr class (transports)">
+        <specific id="1" description="Anadyr"/>
+      </subcategory>
+      <subcategory id="83" description="Angara class (transports)">
+        <specific id="1" description="Angara (ex-Hela)"/>
+      </subcategory>
+      <subcategory id="84" description="Amguema class (transports)">
+        <specific id="1" description="Yauza"/>
+      </subcategory>
+      <subcategory id="85" description="Chulym class (transports)">
+        <specific id="1" description="Severodonetsk"/>
+      </subcategory>
+      <subcategory id="86" description="Andizan class (transports)">
+        <specific id="1" description="Onda"/>
+        <specific id="2" description="Posyet"/>
+      </subcategory>
+      <subcategory id="87" description="Kalinin class (transports)">
+        <specific id="1" description="Kuban (ex-Nadeshda-Krupskaya)"/>
+      </subcategory>
+      <subcategory id="88" description="Antonov class (transports)">
+        <specific id="1" description="Neon Antonov"/>
+        <specific id="2" description="Irbit"/>
+        <specific id="3" description="Nicolay Starshinov"/>
+        <specific id="4" description="Ivan Lednev"/>
+        <specific id="5" description="Nikolay Sipyagin"/>
+        <specific id="6" description="Ivan Sudtsov"/>
+        <specific id="7" description="Ivan Odtejev"/>
+        <specific id="8" description="Victor Denison"/>
+        <specific id="9" description="Sergey Sudetsky"/>
+        <specific id="10" description="Dvina"/>
+        <specific id="11" description="Mikhail Konovalov"/>
+      </subcategory>
+      <subcategory id="89" description="Partizan class (transports)">
+        <specific id="1" description="Pechora"/>
+        <specific id="2" description="Turgay"/>
+        <specific id="3" description="Ufa"/>
+        <specific id="4" description="V Adm Fomin (ex-Pinega) (mod)"/>
+      </subcategory>
+      <subcategory id="90" description="Keyla class (transports)">
+        <specific id="1" description="Mezen"/>
+        <specific id="2" description="Onega"/>
+        <specific id="3" description="Ponoi"/>
+        <specific id="4" description="Ritsa (AGI)"/>
+        <specific id="5" description="Teriberka"/>
+        <specific id="6" description="Tuloma"/>
+        <specific id="7" description="Tvertsa"/>
+        <specific id="8" description="Unza"/>
+        <specific id="9" description="Ussury"/>
+        <specific id="10" description="Yeruslan"/>
+      </subcategory>
+      <subcategory id="91" description="Muna class (transports)">
+        <specific id="1" description="VTR 28"/>
+        <specific id="2" description="48"/>
+        <specific id="3" description="81"/>
+        <specific id="4" description="82"/>
+        <specific id="5" description="83"/>
+        <specific id="6" description="84"/>
+        <specific id="7" description="85"/>
+        <specific id="8" description="86"/>
+        <specific id="9" description="91"/>
+        <specific id="10" description="92"/>
+        <specific id="11" description="93"/>
+        <specific id="12" description="94"/>
+        <specific id="13" description="148"/>
+      </subcategory>
+      <subcategory id="92" description="Mayak class (transports)">
+        <specific id="1" description="Buzuluk"/>
+        <specific id="2" description="Ishim"/>
+        <specific id="3" description="Lama"/>
+        <specific id="4" description="Mius"/>
+        <specific id="5" description="Neman"/>
+        <specific id="6" description="Rioni"/>
+        <specific id="7" description="Ulma"/>
+        <specific id="8" description="Vytegra"/>
+      </subcategory>
+      <subcategory id="93" description="Lentra class (transports)">
+        <specific id="1" description="Alma"/>
+        <specific id="2" description="Kacha"/>
+        <specific id="3" description="Ufa"/>
+        <specific id="4" description="Ugra"/>
+        <specific id="5" description="VTR 1"/>
+        <specific id="6" description="28"/>
+        <specific id="7" description="32"/>
+        <specific id="8" description="143"/>
+        <specific id="9" description="144"/>
+        <specific id="10" description="145"/>
+      </subcategory>
+      <subcategory id="94" description="MP 4 class (transports)">
+        <specific id="1" description="VTR 294"/>
+        <specific id="2" description="VTR 295"/>
+      </subcategory>
+      <subcategory id="95" description="MP 6 class (transports)">
+        <specific id="1" description="Bira"/>
+        <specific id="2" description="Vologda"/>
+      </subcategory>
+      <subcategory id="96" description="Telnovsk class (transports)">
+        <specific id="1" description="Burovestnik"/>
+        <specific id="2" description="Lag"/>
+        <specific id="3" description="VTR 73"/>
+        <specific id="4" description="VTR 74 (ex-Jan Kreuks)"/>
+      </subcategory>
+      <subcategory id="97" description="Khabarov class (transports)">
+        <specific id="1" description="VTR 8"/>
+        <specific id="2" description="13"/>
+        <specific id="3" description="15"/>
+        <specific id="4" description="25"/>
+      </subcategory>
+      <subcategory id="98" description="Komandor class">
+        <specific id="1" description="Komandor"/>
+        <specific id="2" description="Shkiper Gyek"/>
+        <specific id="3" description="Herluf Bidstrup"/>
+      </subcategory>
+      <subcategory id="99" description="Onega class">
+        <specific id="1" description="GKS 52"/>
+        <specific id="2" description="SFP 95"/>
+        <specific id="3" description="SFP 224"/>
+        <specific id="4" description="SFP 240"/>
+        <specific id="5" description="SFP 283"/>
+        <specific id="6" description="GKS 286"/>
+        <specific id="7" description="SFP 295"/>
+        <specific id="8" description="SFP 322"/>
+        <specific id="9" description="SFP 340"/>
+        <specific id="10" description="SFP 173"/>
+        <specific id="11" description="SFP 511"/>
+        <specific id="12" description="SFP 542"/>
+        <specific id="13" description="SFP 562"/>
+        <specific id="14" description="SFP 177"/>
+      </subcategory>
+      <subcategory id="100" description="T 43 class">
+        <specific id="1" description="GKS 11"/>
+        <specific id="2" description="12"/>
+        <specific id="3" description="14-24"/>
+        <specific id="4" description="26"/>
+        <specific id="5" description="45"/>
+      </subcategory>
+      <subcategory id="101" description="(deleted)"/>
+      <subcategory id="102" description="(deleted)"/>
+      <subcategory id="103" description="(deleted)"/>
+      <subcategory id="104" description="PO 2 class"/>
+      <subcategory id="105" description="Nyryat 2 class"/>
+      <subcategory id="106" description="Nyryat 1 class"/>
+      <subcategory id="107" description="Petrushka class"/>
+      <subcategory id="108" description="Miernyk class"/>
+      <subcategory id="109" description="Daldyn class">
+        <specific id="1" description="Daldyn"/>
+      </subcategory>
+      <subcategory id="110" description="Yelva class">
+        <specific id="1" description="VM 143"/>
+        <specific id="2" description="146"/>
+        <specific id="3" description="154"/>
+        <specific id="4" description="266"/>
+        <specific id="5" description="268"/>
+        <specific id="6" description="413"/>
+        <specific id="7" description="414"/>
+        <specific id="8" description="416"/>
+        <specific id="9" description="420"/>
+        <specific id="10" description="425"/>
+        <specific id="11" description="907"/>
+        <specific id="12" description="909"/>
+      </subcategory>
+      <subcategory id="111" description="Bolva (barracks ships)">
+        <specific id="1" description="Bolva 1"/>
+        <specific id="2" description="Bolva 2"/>
+        <specific id="3" description="Bolva 3"/>
+      </subcategory>
+      <subcategory id="112" description="Target Barge"/>
+    </category>
+    <category id="17" description="Auxiliary, Merchant Marine">
+      <subcategory id="1" description="Tamyr class (ice breakers)">
+        <specific id="1" description="Tamyr"/>
+        <specific id="2" description="Vaygach"/>
+      </subcategory>
+      <subcategory id="2" description="Arktika class (ice breakers)">
+        <specific id="1" description="Arktika"/>
+        <specific id="2" description="Sibir"/>
+        <specific id="3" description="Rossiya"/>
+        <specific id="4" description="Sovetskiy Soyuz"/>
+        <specific id="5" description="Oktyabryskaya Revolutsiya"/>
+        <specific id="6" description="Ural (1996)"/>
+      </subcategory>
+      <subcategory id="3" description="Yermak class (ice breakers)">
+        <specific id="1" description="Yermak"/>
+        <specific id="2" description="Admiral Makarov"/>
+        <specific id="3" description="Krasin"/>
+      </subcategory>
+      <subcategory id="4" description="Moskva class (ice breakers)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="Leningrad"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="Murmansk"/>
+        <specific id="5" description="Vladivostok"/>
+      </subcategory>
+      <subcategory id="5" description="Kapitan Sorokin class (ice breakers)">
+        <specific id="1" description="Kapitan Sorokin (mod)"/>
+        <specific id="2" description="Kapitan Nikolayev"/>
+        <specific id="3" description="Kapitan Dranitsyn"/>
+        <specific id="4" description="Kapitan Khlebnikov"/>
+      </subcategory>
+      <subcategory id="6" description="Mudyug class (ice breakers)">
+        <specific id="1" description="Mudyug"/>
+        <specific id="2" description="Magadan"/>
+        <specific id="3" description="Dikson"/>
+      </subcategory>
+      <subcategory id="7" description="Kapitan Belousov class (ice breakers)">
+        <specific id="1" description="Kapitan Belousov"/>
+        <specific id="2" description="Kapitan Melekhov"/>
+        <specific id="3" description="Kapitan Voronin"/>
+      </subcategory>
+      <subcategory id="8" description="Dobrynya Nikitich class (ice breakers)">
+        <specific id="1" description="Afanasy Nikitin (ex-Ledokol 2)"/>
+        <specific id="2" description="Purga (1961)"/>
+        <specific id="3" description="Buran (1966)"/>
+        <specific id="4" description="Sadko (1968)"/>
+        <specific id="5" description="Dobrynya Nikitich (1960)"/>
+        <specific id="6" description="Semen Chelyuskin (ex-Ledokol 8)(1965)"/>
+        <specific id="7" description="Fedor Litke (1970)"/>
+        <specific id="8" description="Georgy Sedov (1967)"/>
+        <specific id="9" description="Semen Dezhnev (1971)"/>
+        <specific id="10" description="Ilya Muromets (1966)"/>
+        <specific id="11" description="Vasily Poyarkov (ex-Ledokol 4) (1963)"/>
+        <specific id="12" description="Ivan Moskvitin (1971)"/>
+        <specific id="13" description="Vladimir Rusanov (ex-Ledokol 7) (1964)"/>
+        <specific id="14" description="Ivan Kruzenshtern (ex-Ledokol 6) (1964)"/>
+        <specific id="15" description="Khariton Laptev (ex-Ledokol 3) (1962)"/>
+        <specific id="16" description="Vyuga (1961) (ex-Ledokol 5) (1963)"/>
+        <specific id="17" description="P Pakhtusov (1966)"/>
+        <specific id="18" description="Peresvet (1969)"/>
+        <specific id="19" description="Yerofei Khabarov"/>
+        <specific id="20" description="Yury Lisyansky (ex-Ledokol 9) (1965)"/>
+        <specific id="21" description="Plug (1961)"/>
+      </subcategory>
+      <subcategory id="9" description="Kapitan Chechkin class (ice breakers)">
+        <specific id="1" description="Kapitan Chechkin"/>
+        <specific id="2" description="Kapitan Plakhin"/>
+        <specific id="3" description="Kapitan Chadayev"/>
+        <specific id="4" description="Kapitan Krutov"/>
+        <specific id="5" description="Kapitan Bukayev"/>
+        <specific id="6" description="Kapitan Zarubin"/>
+      </subcategory>
+      <subcategory id="10" description="Kapitan Yevdokimov class (ice breakers)">
+        <specific id="1" description="Kapitan Uevdokimov"/>
+        <specific id="2" description="Kapitan Babichev"/>
+        <specific id="3" description="Kapitan Chudinov"/>
+        <specific id="4" description="Kapitan Borodkin"/>
+        <specific id="5" description="Avramiy Zavenyagin (ex-Kapitan Krylov)"/>
+        <specific id="6" description="Kapitan Metsayk"/>
+        <specific id="7" description="Kapitan Demidov"/>
+        <specific id="8" description="Kapitan Moshkin"/>
+      </subcategory>
+      <subcategory id="11" description="Kapitan Izmaylov class (ice breakers)">
+        <specific id="1" description="Kapitan M. Izmaylov"/>
+        <specific id="2" description="Kapitan Kosolapov"/>
+        <specific id="3" description="Kapitan A. Radzabov"/>
+      </subcategory>
+      <subcategory id="12" description="Stroptivy class (ice breakers)">
+        <specific id="1" description="Stroptivy"/>
+        <specific id="2" description="Stakhanovets"/>
+        <specific id="3" description="Sibirsky"/>
+        <specific id="4" description="Spravedlivy"/>
+        <specific id="5" description="Suvorovets"/>
+        <specific id="6" description="Fobos"/>
+        <specific id="7" description="Deymos"/>
+      </subcategory>
+      <subcategory id="13" description="Ivan Susanin class (armed ice breakers)">
+        <specific id="1" description="Zaisberg"/>
+        <specific id="2" description="Neva"/>
+        <specific id="3" description="Dunay"/>
+        <specific id="4" description="Ruslan"/>
+        <specific id="5" description="Imeni XXVI Syezda KPSS"/>
+        <specific id="6" description="Volga"/>
+        <specific id="7" description="Ivan Susanin"/>
+        <specific id="8" description="Imeni XXV Syezda KPSS"/>
+      </subcategory>
+    </category>
+    <category id="18" description="Utility">
+      <subcategory id="1" description="Manych class (water tankers)">
+        <specific id="1" description="Manych"/>
+        <specific id="2" description="Tagil"/>
+      </subcategory>
+      <subcategory id="2" description="Voda class (water carriers)">
+        <specific id="1" description="Abakan"/>
+        <specific id="2" description="Sura"/>
+        <specific id="3" description="MVT 6"/>
+        <specific id="4" description="9"/>
+        <specific id="5" description="10"/>
+        <specific id="6" description="16"/>
+        <specific id="7" description="17"/>
+        <specific id="8" description="18"/>
+        <specific id="9" description="20"/>
+        <specific id="10" description="21"/>
+        <specific id="11" description="24"/>
+        <specific id="12" description="134"/>
+        <specific id="13" description="135"/>
+        <specific id="14" description="138"/>
+      </subcategory>
+      <subcategory id="3" description="Pelym class (degaussing ships (YDG))">
+        <specific id="1" description="SR 70"/>
+        <specific id="2" description="SR 111"/>
+        <specific id="3" description="SR 179"/>
+        <specific id="4" description="SR 180"/>
+        <specific id="5" description="SR 191"/>
+        <specific id="6" description="SR 203"/>
+        <specific id="7" description="SR 215"/>
+        <specific id="8" description="SR 218"/>
+        <specific id="9" description="SR 221"/>
+        <specific id="10" description="SR 222"/>
+        <specific id="11" description="SR 233"/>
+        <specific id="12" description="SR 241"/>
+        <specific id="13" description="SR 276"/>
+        <specific id="14" description="SR 280"/>
+        <specific id="15" description="SR 281"/>
+        <specific id="16" description="SR 407"/>
+        <specific id="17" description="SR 409"/>
+        <specific id="18" description="SR 455"/>
+      </subcategory>
+      <subcategory id="4" description="Bereza Class (degaussing ships (YDG))">
+        <specific id="1" description="SR 28"/>
+        <specific id="2" description="SR 59"/>
+        <specific id="3" description="SR 74"/>
+        <specific id="4" description="SR 120"/>
+        <specific id="5" description="SR 137"/>
+        <specific id="6" description="SR 188"/>
+        <specific id="7" description="SR 216"/>
+        <specific id="8" description="SR 370"/>
+        <specific id="9" description="SR 478"/>
+        <specific id="10" description="SR 479"/>
+        <specific id="11" description="SR 541"/>
+        <specific id="12" description="SR 548"/>
+        <specific id="13" description="SR 568"/>
+        <specific id="14" description="SR 569"/>
+        <specific id="15" description="SR 570"/>
+        <specific id="16" description="SR 936"/>
+        <specific id="17" description="SR 939"/>
+      </subcategory>
+      <subcategory id="5" description="Khabarov class (degaussing ships (YDG))">
+        <specific id="1" description="Khabarov"/>
+        <specific id="2" description="SR 164"/>
+      </subcategory>
+      <subcategory id="6" description="Sekstan class"/>
+      <subcategory id="7" description="Korall class"/>
+      <subcategory id="8" description="Baklazhan class (tugs)">
+        <specific id="1" description="SB 131 Nikolai Chiker"/>
+        <specific id="2" description="SB 135"/>
+      </subcategory>
+      <subcategory id="9" description="Neftegaz class (tugs)">
+        <specific id="1" description="Aleksey Kortunov"/>
+        <specific id="2" description="Ilga"/>
+        <specific id="3" description="Umka"/>
+        <specific id="4" description="Kalar"/>
+      </subcategory>
+      <subcategory id="10" description="Goryn class (tugs)">
+        <specific id="1" description="MB 15"/>
+        <specific id="2" description="MB 119"/>
+        <specific id="3" description="MB 18"/>
+        <specific id="4" description="SB 365 (ex-MB 29)"/>
+        <specific id="5" description="MB 32"/>
+        <specific id="6" description="SB 521 (ex-MB 61)"/>
+        <specific id="7" description="MB 35"/>
+        <specific id="8" description="SB 522 (ex-MB 62)"/>
+        <specific id="9" description="MB 36"/>
+        <specific id="10" description="SB 523 (ex-MB 64)"/>
+        <specific id="11" description="MB 38"/>
+        <specific id="12" description="SB 524 (ex-MB 108)"/>
+        <specific id="13" description="MB 105"/>
+      </subcategory>
+      <subcategory id="11" description="Sorum class (tugs)">
+        <specific id="1" description="Amur"/>
+        <specific id="2" description="Primorye"/>
+        <specific id="3" description="Brest"/>
+        <specific id="4" description="Bug"/>
+        <specific id="5" description="Burya"/>
+        <specific id="6" description="Chukotka"/>
+        <specific id="7" description="Kamchatka"/>
+        <specific id="8" description="Karelia"/>
+        <specific id="9" description="Ladoga"/>
+        <specific id="10" description="Neman"/>
+        <specific id="11" description="Sakhalin"/>
+        <specific id="12" description="Ural"/>
+        <specific id="13" description="Victor Kingsiepp"/>
+        <specific id="14" description="Yan Berzin"/>
+        <specific id="15" description="Yenisey"/>
+        <specific id="16" description="Zabaykalye"/>
+        <specific id="17" description="Zapolarye"/>
+        <specific id="18" description="MB 4"/>
+        <specific id="19" description="MB 6"/>
+        <specific id="20" description="MB 13"/>
+        <specific id="21" description="MB 19"/>
+        <specific id="22" description="MB 25"/>
+        <specific id="23" description="MB 26"/>
+        <specific id="24" description="MB 28"/>
+        <specific id="25" description="MB 30"/>
+        <specific id="26" description="MB 31"/>
+        <specific id="27" description="MB 37"/>
+        <specific id="28" description="MB 56"/>
+        <specific id="29" description="MB 58"/>
+        <specific id="30" description="MB 61"/>
+        <specific id="31" description="MB 76"/>
+        <specific id="32" description="MB 99"/>
+        <specific id="33" description="MB 110"/>
+        <specific id="34" description="MB 147"/>
+        <specific id="35" description="MB 148"/>
+        <specific id="36" description="MB 196"/>
+        <specific id="37" description="MB 236"/>
+        <specific id="38" description="MB 304"/>
+        <specific id="39" description="MB 307"/>
+      </subcategory>
+      <subcategory id="12" description="Okhtensky class (tugs)">
+        <specific id="1" description="Loksa"/>
+        <specific id="2" description="Orion"/>
+        <specific id="3" description="Saturn"/>
+        <specific id="4" description="Neptun"/>
+        <specific id="5" description="Pochetny"/>
+        <specific id="6" description="Tyulen"/>
+      </subcategory>
+      <subcategory id="13" description="Roslavl class (tugs)">
+        <specific id="1" description="MB 50"/>
+        <specific id="2" description="MB 94"/>
+        <specific id="3" description="MB 95"/>
+        <specific id="4" description="MB 102"/>
+        <specific id="5" description="MB 125"/>
+        <specific id="6" description="MB 145"/>
+        <specific id="7" description="MB 146"/>
+        <specific id="8" description="MB 147"/>
+        <specific id="9" description="SB 41"/>
+        <specific id="10" description="SB 46"/>
+      </subcategory>
+      <subcategory id="14" description="Zenit class (tugs)"/>
+      <subcategory id="15" description="Scholle class (harbor tugs)"/>
+      <subcategory id="16" description="Tugur class (harbor tugs)"/>
+      <subcategory id="17" description="Sidehole (1, 2) classes (harbor tugs)"/>
+    </category>
+    <category id="50" description="Frigate">
+      <subcategory id="1" description="Grisha I class"/>
+      <subcategory id="2" description="Grisha II class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="U-200 Vinnitsa (Ukraine) (Ex-Dneper)"/>
+        <specific id="11" description="(deleted)"/>
+        <specific id="12" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="Grisha III class"/>
+      <subcategory id="4" description="Grisha V class"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="Petya I class"/>
+      <subcategory id="7" description="Petya II class"/>
+      <subcategory id="8" description="Riga class"/>
+      <subcategory id="9" description="Krivak III (Zaliv (Kerch))">
+        <specific id="1" description="Menzhinsky"/>
+        <specific id="2" description="Derzhinsky"/>
+        <specific id="3" description="Orel"/>
+        <specific id="4" description="Imeni lXX Letiya Vchk-Kgb"/>
+        <specific id="5" description="Imeni lXX Letiya Pogranvoysk"/>
+        <specific id="6" description="Kedrov"/>
+        <specific id="7" description="Vorovsky"/>
+        <specific id="8" description="Hetman Dorosenko"/>
+        <specific id="9" description="Hetman Petr Sagadachny"/>
+      </subcategory>
+      <subcategory id="10" description="Parchim II Class"/>
+      <subcategory id="11" description="Petya III Class"/>
+      <subcategory id="12" description="Koni Class"/>
+    </category>
+    <category id="52" description="Heavy Cruiser"/>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Akvamarinovyy"/>
+        <specific id="2" description="Ivan Susanin"/>
+        <specific id="3" description="Kapitan Chukhchin"/>
+      </subcategory>
+      <subcategory id="2" description="Small Fishing Boat"/>
+      <subcategory id="3" description="Medium Fishing Boat"/>
+      <subcategory id="4" description="Large Fishing Boat"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="222">
+    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
+      <subcategory id="1" description="Typhoon class"/>
+      <subcategory id="2" description="Delta IV class"/>
+      <subcategory id="3" description="Delta III class"/>
+      <subcategory id="4" description="Delta II class"/>
+      <subcategory id="5" description="Delta I class"/>
+      <subcategory id="6" description="Yankee I class"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)Golf I class"/>
+      <subcategory id="11" description="(deleted)"/>
+    </category>
+    <category id="2" description="SSGN (Nuclear Guided Missile)">
+      <subcategory id="1" description="Oscar II class"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="Yankee conversion class"/>
+      <subcategory id="7" description="Severodvinsk class"/>
+    </category>
+    <category id="3" description="SSN (Nuclear Attack-Torpedo)">
+      <subcategory id="1" description="Victor III Class"/>
+      <subcategory id="2" description="Victor II class"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="Yankee Notch class"/>
+      <subcategory id="5" description="Sierra II class">
+        <specific id="1" description="Orel"/>
+        <specific id="2" description="Kasatka"/>
+      </subcategory>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="Alfa class"/>
+      <subcategory id="8" description="Akula class">
+        <specific id="1" description="Bars"/>
+        <specific id="2" description="Leopard"/>
+        <specific id="3" description="Pantera"/>
+        <specific id="4" description="Puma"/>
+        <specific id="5" description="Volk"/>
+        <specific id="6" description="Tigr"/>
+      </subcategory>
+      <subcategory id="9" description="Akula II Class"/>
+    </category>
+    <category id="4" description="SSG (Conventional Guided Missile)">
+      <subcategory id="1" description="(deleted)"/>
+    </category>
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Kilo class"/>
+      <subcategory id="2" description="Tango class"/>
+      <subcategory id="3" description="Foxtrot class"/>
+      <subcategory id="4" description="Romeo class">
+        <specific id="1" description="(North Korean Romeo SS (Snorkle))"/>
+        <specific id="2" description="(North Korean Romeo SS (Split Plant))"/>
+        <specific id="3" description="Romeo"/>
+      </subcategory>
+      <subcategory id="5" description="Whiskey Class"/>
+    </category>
+    <category id="6" description="SSAN (Nuclear Auxiliary)">
+      <subcategory id="1" description="Yankee class (ex-SSBN)"/>
+      <subcategory id="2" description="Uniform class"/>
+      <subcategory id="3" description="Paltus class"/>
+    </category>
+    <category id="7" description="SSA (Conventional Auxiliary)">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Lima class"/>
+      <subcategory id="4" description="Beluga class"/>
+      <subcategory id="5" description="X-Ray class"/>
+      <subcategory id="6" description="India class"/>
+      <subcategory id="7" description="Bravo class (target sub)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="222">
+    <category id="0" description="Other">
+      <subcategory id="0" description="Astronomical Module">
+        <specific id="1" description="Kavant 1"/>
+        <specific id="2" description="Kavant 2"/>
+        <specific id="3" description="Priroda"/>
+        <specific id="4" description="Spektrum"/>
+        <specific id="5" description="Kristall"/>
+      </subcategory>
+    </category>
+    <category id="1" description="Manned">
+      <subcategory id="1" description="Space Shuttle">
+        <specific id="1" description="Buran"/>
+      </subcategory>
+      <subcategory id="2" description="Space Station">
+        <specific id="1" description="Mir"/>
+        <specific id="2" description="Kvant"/>
+        <specific id="3" description="Resurs-F2"/>
+      </subcategory>
+      <subcategory id="3" description="Space vehicles">
+        <specific id="1" description="Phobos 2"/>
+        <specific id="2" description="Soyuz-TM"/>
+        <specific id="3" description="Phobos"/>
+        <specific id="4" description="Progress"/>
+        <specific id="5" description="Progress-M"/>
+        <specific id="6" description="Prognaz"/>
+        <specific id="7" description="Vostok"/>
+        <specific id="8" description="Molniya"/>
+        <specific id="9" description="Cosmos"/>
+        <specific id="10" description="Proton K"/>
+        <specific id="11" description="Proton KM"/>
+        <specific id="12" description="Tsyklon"/>
+        <specific id="13" description="Zenit"/>
+        <specific id="14" description="Lomonosov (MHB)"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Unmanned">
+      <subcategory id="1" description="Communication satellite">
+        <specific id="1" description="Molniya"/>
+      </subcategory>
+      <subcategory id="2" description="Navigation satellite">
+        <specific id="1" description="GEO-IK Geodedic Cosmos"/>
+        <specific id="2" description="Elektron"/>
+      </subcategory>
+      <subcategory id="3" description="Early Warning satellite">
+        <specific id="1" description="Cosmos"/>
+      </subcategory>
+      <subcategory id="4" description="Electronic Intelligence satellite">
+        <specific id="1" description="Elints"/>
+      </subcategory>
+      <subcategory id="6" description="Ocean surveillance satellite">
+        <specific id="1" description="Okean"/>
+        <specific id="2" description="Eorsats"/>
+      </subcategory>
+      <subcategory id="8" description="Optical imaging surveillance satellite">
+        <specific id="1" description="Venera"/>
+        <specific id="2" description="Generation"/>
+      </subcategory>
+      <subcategory id="10" description="Minor military satellite">
+        <specific id="1" description="C2093"/>
+        <specific id="2" description="C2002"/>
+        <specific id="3" description="C2059"/>
+        <specific id="4" description="C2075"/>
+        <specific id="5" description="C2137"/>
+        <specific id="6" description="C2164"/>
+        <specific id="7" description="C1985"/>
+        <specific id="8" description="C2053"/>
+        <specific id="9" description="C2106"/>
+      </subcategory>
+      <subcategory id="11" description="Illuminating satellite">
+        <specific id="1" description="Reflector"/>
+        <specific id="2" description="Energia"/>
+      </subcategory>
+      <subcategory id="12" description="Microwave activity">
+        <specific id="1" description="Relikt"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="224">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="Chieftain MBT"/>
+      <subcategory id="2" description="Challenger MBT">
+        <specific id="1" description="Mark I"/>
+        <specific id="2" description="Mark II"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Armored fighting vehicle">
+      <subcategory id="1" description="FV 432 (APC)">
+        <specific id="1" description="Ambulance"/>
+        <specific id="2" description="81mm mortar carrier"/>
+      </subcategory>
+      <subcategory id="2" description="FV 103 Spartan (APC)"/>
+      <subcategory id="3" description="FV 601 Saladin"/>
+      <subcategory id="4" description="FV 107 Scimitar"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="FV 603 Saracen"/>
+      <subcategory id="7" description="AT 105 Saxon"/>
+      <subcategory id="8" description="FV 510 Warrior"/>
+      <subcategory id="9" description="FV 711 Ferret"/>
+      <subcategory id="10" description="FV 721 Fox"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="FV 102 Striker"/>
+      <subcategory id="13" description="FV 101 Scorpion"/>
+      <subcategory id="14" description="FV 106 Samson"/>
+    </category>
+    <category id="3" description="Armored utility vehicle">
+      <subcategory id="1" description="FV 4204 Chieftain ARV"/>
+      <subcategory id="2" description="Challenger ARV"/>
+      <subcategory id="3" description="FV 4003 Centurion (MK 5) AVRE"/>
+      <subcategory id="4" description="Chieftain AVRE"/>
+      <subcategory id="5" description="Combat Engineer tractor"/>
+      <subcategory id="6" description="FV 4205 Chieftain AVLB"/>
+      <subcategory id="7" description="Mobile bridge">
+        <specific id="1" description="M2"/>
+        <specific id="2" description="M3"/>
+      </subcategory>
+      <subcategory id="8" description="FV 105 Sultan"/>
+      <subcategory id="9" description="FV 104 Samaritan"/>
+      <subcategory id="10" description="FV 512 Warrior Repair Vehicle"/>
+      <subcategory id="11" description="FV 513 Warrior Recovery Vehicle"/>
+    </category>
+    <category id="4" description="Self-propelled artillery">
+      <subcategory id="1" description="FV 433 Abbot 105-mm Howitzer"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="Stormer HVM Carrier"/>
+      <subcategory id="7" description="AS90 155-mm"/>
+    </category>
+    <category id="5" description="Towed artillery">
+      <subcategory id="1" description="FH-70 155-mm gun"/>
+      <subcategory id="2" description="L-118 105-mm"/>
+      <subcategory id="3" description="M-56 105-mm"/>
+      <subcategory id="4" description="5.5-in/140-mm"/>
+    </category>
+    <category id="6" description="Small wheeled utility vehicle">
+      <subcategory id="1" description="LWB Land Rover"/>
+      <subcategory id="2" description="Land Rover 6x6 truck"/>
+      <subcategory id="3" description="Tractor, aircraft towing"/>
+    </category>
+    <category id="7" description="Large wheeled utility vehicle">
+      <subcategory id="1" description="4 Tonne"/>
+      <subcategory id="2" description="8 Tonne"/>
+      <subcategory id="3" description="8 Tonne fuel"/>
+      <subcategory id="4" description="14 Tonne"/>
+      <subcategory id="5" description="14 Tonne with bridge trailer"/>
+    </category>
+    <category id="8" description="Small tracked utility vehicle"/>
+    <category id="9" description="Large tracked utility vehicle"/>
+    <category id="10" description="Mortar"/>
+    <category id="11" description="Mine plow">
+      <subcategory id="1" description="Mortar, 51mm, L10A1"/>
+    </category>
+    <category id="12" description="Mine rake"/>
+    <category id="13" description="Mine roller"/>
+    <category id="14" description="Cargo trailer">
+      <subcategory id="1" description="0 - 0.5 ton"/>
+      <subcategory id="2" description="0.51 - 2 ton"/>
+      <subcategory id="3" description="2.01 - 5 ton"/>
+      <subcategory id="4" description="5.02 - 10 ton"/>
+      <subcategory id="5" description="greater than 10 tons"/>
+    </category>
+    <category id="15" description="Fuel trailer">
+      <subcategory id="1" description="1-1000 gallons"/>
+      <subcategory id="2" description="1001 - 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="16" description="Generator trailer">
+      <subcategory id="1" description="0 - 100 KW"/>
+      <subcategory id="2" description="greater than 100 KW"/>
+    </category>
+    <category id="17" description="Water trailer">
+      <subcategory id="1" description="1-1000 gallons"/>
+      <subcategory id="2" description="1001- 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="18" description="Engineer equipment">
+      <subcategory id="1" description="Mine clearing line charge"/>
+      <subcategory id="2" description="Dozer blade kit"/>
+      <subcategory id="3" description="Lane marking system"/>
+    </category>
+    <category id="19" description="Heavy equipment transport trailer"/>
+    <category id="20" description="Maintenance equipment trailer">
+      <subcategory id="1" description="Welding trailer"/>
+      <subcategory id="2" description="Compressor"/>
+      <subcategory id="3" description="Tools/parts trailer"/>
+    </category>
+    <category id="21" description="Limber"/>
+    <category id="22" description="Chemical decontamination trailer"/>
+    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
+      <subcategory id="1" description="Rapier SAM System">
+        <specific id="1" description="Rapier Battery Command Post (BCP)"/>
+        <specific id="2" description="Rapier Launcher">
+          <extra id="1" description="Standard 4-Round Launcher"/>
+          <extra id="2" description="6-Round Launcher (Darkfire variant)"/>
+          <extra id="3" description="8-Round Launcher (Rapier 2000/JERNAS)"/>
+          <extra id="4" description="Tracked Rapier"/>
+        </specific>
+        <specific id="3" description="Blindfire Engagement Radar (DN-181)"/>
+        <specific id="4" description="Dagger Surveillance Radar (Rapier 2000/JERNAS)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="224">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="Tornado ADV">
+        <specific id="1" description="Tornado F. Mk2"/>
+        <specific id="2" description="Tornado F. Mk 2A"/>
+        <specific id="3" description="Tornado F. Mk 3"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Eurofighter 2000"/>
+    </category>
+    <category id="2" description="Attack/Strike">
+      <subcategory id="1" description="Sea Harrier">
+        <specific id="1" description="Sea Harrier FRS. Mk 1"/>
+        <specific id="2" description="Sea Harrier T. Mk 4"/>
+        <specific id="3" description="Sea Harrier FRS. Mk 51"/>
+      </subcategory>
+      <subcategory id="2" description="Harrier">
+        <specific id="1" description="Harrier GR. Mk 3"/>
+        <specific id="2" description="Harrier T. Mk 4"/>
+        <specific id="3" description="Harrier GR. 5"/>
+        <specific id="4" description="Harrier GR. 7"/>
+        <specific id="5" description="VA.1 Matador (AV-8S &amp; TAV-8S)"/>
+        <specific id="6" description="Harrier GR. Mk9"/>
+      </subcategory>
+      <subcategory id="3" description="BAe HS Buccaneer"/>
+      <subcategory id="4" description="Tornado">
+        <specific id="1" description="Tornado GR Mk 1"/>
+        <specific id="2" description="Tornado GR Mk 1A"/>
+        <specific id="3" description="Tornado GR Mk 4"/>
+      </subcategory>
+      <subcategory id="5" description="Jaguar">
+        <specific id="1" description="Jaguar GR1 Mk 1"/>
+        <specific id="2" description="Jaguar GR1 Mk 1A"/>
+        <specific id="3" description="Jaguar GR Mk3"/>
+        <specific id="4" description="Jaguar GR Mk3A"/>
+      </subcategory>
+      <subcategory id="6" description="BAe Hawk">
+        <specific id="1" description="Hawk T Mk 1"/>
+        <specific id="2" description="Hawk T Mk 1A"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="K-2 Victor"/>
+      <subcategory id="2" description="Hercules C130">
+        <specific id="1" description="Hercules C. Mk 1"/>
+        <specific id="2" description="Hercules C. Mk 1P"/>
+        <specific id="3" description="Hercules C. MK 1K"/>
+        <specific id="4" description="Hercules C. Mk 3P"/>
+      </subcategory>
+      <subcategory id="3" description="BAe 146">
+        <specific id="1" description="BAe 146 CC. Mk 2"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="Sea Devon"/>
+      <subcategory id="6" description="Sea Heron"/>
+      <subcategory id="7" description="V-22 Osprey"/>
+      <subcategory id="8" description="BAe (BAC/Vickers) VC-10">
+        <specific id="1" description="VC-10 C. Mk1(K)"/>
+        <specific id="2" description="VC-10 K. Mk 2"/>
+        <specific id="3" description="VC-10 K. Mk 3"/>
+        <specific id="4" description="VC-10 K. Mk 4"/>
+      </subcategory>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="Pilatus Britten-Norman Defender">
+        <specific id="1" description="Islander CC. Mk 2"/>
+        <specific id="2" description="Islander AL. Mk 1"/>
+        <specific id="3" description="Maritime Defender"/>
+        <specific id="4" description="Turbine Defender"/>
+      </subcategory>
+      <subcategory id="12" description="Shorts 330 Sherpa">
+        <specific id="1" description="C-23A"/>
+        <specific id="2" description="C-23B"/>
+        <specific id="3" description="Shorts 330-UTT"/>
+        <specific id="4" description="Skyvan SC7"/>
+      </subcategory>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="BAe HS 748MF">
+        <specific id="1" description="Andover C. Mk 1"/>
+      </subcategory>
+      <subcategory id="15" description="Vickers VC2 Viscount"/>
+      <subcategory id="16" description="L-1011 TriStar">
+        <specific id="1" description="TriStar KC Mk 1"/>
+        <specific id="2" description="TriStar K Mk 1"/>
+        <specific id="3" description="TriStar C Mk 2"/>
+      </subcategory>
+    </category>
+    <category id="5" description="ASW/patrol/observation">
+      <subcategory id="1" description="Nimrod">
+        <specific id="1" description="Nimrod R Mk 1"/>
+        <specific id="2" description="Nimrod MR Mk 2"/>
+        <specific id="3" description="Nimrod MR Mk 2P"/>
+        <specific id="4" description="Nimrod MR Mk 3"/>
+      </subcategory>
+      <subcategory id="2" description="BAe P. 132"/>
+    </category>
+    <category id="7" description="Reconnaissance">
+      <subcategory id="1" description="English Electric Canberra">
+        <specific id="1" description="Canberra PR Mk 7"/>
+        <specific id="2" description="Canberra PR Mk 9"/>
+      </subcategory>
+      <subcategory id="2" description="HS Buccaneer">
+        <specific id="1" description="Buccaneer S. Mk 2A"/>
+      </subcategory>
+      <subcategory id="3" description="Tornado">
+        <specific id="1" description="Tornado GR Mk 1 w/recon pod"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Surveillance/C2">
+      <subcategory id="1" description="E-3D Sentry AEW Mk 1"/>
+      <subcategory id="2" description="Andover">
+        <specific id="1" description="Andover C. Mk1"/>
+      </subcategory>
+      <subcategory id="3" description="Canberra">
+        <specific id="1" description="B Mk 2"/>
+        <specific id="2" description="T Mk 4"/>
+        <specific id="3" description="E Mk 15"/>
+        <specific id="4" description="E Mk 17"/>
+        <specific id="5" description="TT Mk 18"/>
+        <specific id="6" description="TT Mk 22"/>
+      </subcategory>
+      <subcategory id="4" description="Hawker Hunter">
+        <specific id="1" description="GA 11"/>
+        <specific id="2" description="T. Mk 7"/>
+        <specific id="3" description="T. Mk 8"/>
+        <specific id="4" description="PR Mk 11"/>
+      </subcategory>
+    </category>
+    <category id="20" description="Attack Helicopter">
+      <subcategory id="1" description="Boeing">
+        <specific id="1" description="WAH64"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Utility helicopter">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Westland Lynx">
+        <specific id="1" description="Mk 5"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="(deleted)"/>
+        <specific id="10" description="(deleted)"/>
+        <specific id="11" description="Mk 28"/>
+        <specific id="12" description="(deleted)"/>
+        <specific id="13" description="Mk 90"/>
+        <specific id="14" description="Mk 86"/>
+        <specific id="15" description="Mk 95"/>
+        <specific id="16" description="Mk 99"/>
+        <specific id="17" description="AH. Mk1"/>
+        <specific id="18" description="AH. Mk 7"/>
+        <specific id="19" description="AH. Mk 9"/>
+      </subcategory>
+      <subcategory id="8" description="Westland Wessex">
+        <specific id="1" description="HC.MK 2"/>
+        <specific id="2" description="HC.MK 5"/>
+      </subcategory>
+      <subcategory id="9" description="Scout"/>
+      <subcategory id="10" description="Wasp"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="(deleted)"/>
+      <subcategory id="16" description="(deleted)"/>
+      <subcategory id="17" description="(deleted)"/>
+      <subcategory id="18" description="SA 330"/>
+      <subcategory id="19" description="Westland Super Lynx">
+        <specific id="1" description="Mk 95"/>
+        <specific id="2" description="Mk 99"/>
+      </subcategory>
+    </category>
+    <category id="22" description="Antisubmarine Warfare / Patrol Helicopter">
+      <subcategory id="1" description="Westland Sea King">
+        <specific id="1" description="HAS. Mk 1"/>
+        <specific id="2" description="HAS. Mk 2"/>
+        <specific id="3" description="HAS. Mk 5"/>
+        <specific id="4" description="HAS. Mk 6"/>
+        <specific id="5" description="AEW. Mk 2A"/>
+        <specific id="6" description="HAR. Mk 3"/>
+        <specific id="7" description="HAR. Mk 5"/>
+        <specific id="8" description="Mk 41"/>
+        <specific id="9" description="Mk 42"/>
+        <specific id="10" description="Mk 42A"/>
+        <specific id="11" description="Mk 42B"/>
+        <specific id="12" description="Mk 43"/>
+        <specific id="13" description="Mk 43A"/>
+        <specific id="14" description="Mk 43B"/>
+        <specific id="15" description="Mk 45"/>
+        <specific id="16" description="Mk 47"/>
+        <specific id="17" description="Mk 48"/>
+        <specific id="18" description="Mk 50"/>
+      </subcategory>
+      <subcategory id="2" description="Westland Lynx (Naval)">
+        <specific id="1" description="HAS Mk 2"/>
+        <specific id="2" description="HAS Mk 3"/>
+        <specific id="3" description="HAS Mk 2 (FN)"/>
+        <specific id="4" description="HAS Mk 3 (FN)"/>
+        <specific id="5" description="Mk 21 (Brazil)"/>
+        <specific id="6" description="Mk 23 (Argentina)"/>
+        <specific id="7" description="Mk 25 (Netherlands)"/>
+        <specific id="8" description="Mk 27 (Netherlands)"/>
+        <specific id="9" description="MK 81 (Netherlands)"/>
+        <specific id="10" description="MK 80 (Denmark)"/>
+        <specific id="11" description="MK 8"/>
+      </subcategory>
+      <subcategory id="3" description="EH101 Merlin"/>
+    </category>
+    <category id="23" description="Cargo Helicopter">
+      <subcategory id="1" description="Westland Commando">
+        <specific id="1" description="Commando Mk 1"/>
+        <specific id="2" description="Commando Mk 2"/>
+        <specific id="3" description="Commando Mk 2B"/>
+        <specific id="4" description="Commando Mk 2E"/>
+        <specific id="5" description="Commando Mk 2A"/>
+        <specific id="6" description="Commando Mk 2C"/>
+        <specific id="7" description="Commando Mk 3"/>
+        <specific id="8" description="Indian Sea King Mk 42C"/>
+        <specific id="9" description="Sea King HC. Mk"/>
+      </subcategory>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Shorts S312 Tucano">
+        <specific id="1" description="T. Mk 1"/>
+      </subcategory>
+      <subcategory id="2" description="Bulldog">
+        <specific id="1" description="T. MK 1"/>
+      </subcategory>
+      <subcategory id="3" description="Chipmunk"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="BAe Hawk">
+        <specific id="1" description="Hawk T. Mk 1"/>
+        <specific id="2" description="Hawk T. Mk 1A"/>
+        <specific id="3" description="Goshawk T-45A"/>
+      </subcategory>
+      <subcategory id="6" description="BAe Jetstream Super 31">
+        <specific id="1" description="Jetstream T Mk 2"/>
+        <specific id="2" description="Jetstream T Mk 3"/>
+      </subcategory>
+      <subcategory id="7" description="Chieftain"/>
+      <subcategory id="8" description="BAe 125-800">
+        <specific id="1" description="C-29A"/>
+        <specific id="2" description="U-125A"/>
+      </subcategory>
+      <subcategory id="9" description="Slingsby T67 Firefly">
+        <specific id="1" description="T67M Mk II"/>
+        <specific id="2" description="T67M260"/>
+      </subcategory>
+      <subcategory id="10" description="Provost">
+        <specific id="1" description="T Mk 5"/>
+      </subcategory>
+    </category>
+    <category id="57" description="Non-Combatant Commercial Aircraft">
+      <subcategory id="1" description="Passenger Airline">
+        <specific id="1" description="British Aerospace 146-100"/>
+        <specific id="2" description="BAC-111"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="224">
+    <category id="4" description="Guided-missile Destroyer">
+      <subcategory id="1" description="Type 42">
+        <specific id="1" description="D 86 Birmingham"/>
+        <specific id="2" description="D 87 Newcastle"/>
+        <specific id="3" description="D 88 Glasgow"/>
+        <specific id="4" description="D 108 Cardiff"/>
+        <specific id="5" description="D 89 Exeter"/>
+        <specific id="6" description="D 90 Southampton"/>
+        <specific id="7" description="D 91 Nottingham"/>
+        <specific id="8" description="D 92 Liverpool"/>
+        <specific id="9" description="D 95 Manchester"/>
+        <specific id="10" description="D 96 Gloucester"/>
+        <specific id="11" description="D 97 Edinburgh"/>
+        <specific id="12" description="D 98 York"/>
+      </subcategory>
+      <subcategory id="2" description="Type 45">
+        <specific id="1" description="D 32 Daring"/>
+        <specific id="2" description="D 33 Dauntless"/>
+        <specific id="3" description="D 34 Diamond"/>
+        <specific id="4" description="D 35 Dragon"/>
+        <specific id="5" description="D 36 Defender"/>
+        <specific id="6" description="D 37 Duncan"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided-missile Frigate">
+      <subcategory id="1" description="Duke class (Type 23)">
+        <specific id="1" description="F 230 Norfolk"/>
+        <specific id="2" description="F 231 Argyll"/>
+        <specific id="3" description="F 229 Lancaster (ex-F 232)"/>
+        <specific id="4" description="F 233 Marlborough"/>
+        <specific id="5" description="F 234 Iron Duke"/>
+        <specific id="6" description="F 235 Monmouth"/>
+        <specific id="7" description="F 236 Montrose"/>
+        <specific id="8" description="F 237 Westminster"/>
+        <specific id="9" description="F 238 Northumberland"/>
+        <specific id="10" description="F 239 Richmond"/>
+        <specific id="11" description="F 240 Somerset"/>
+        <specific id="12" description="F 241 Grafton"/>
+        <specific id="13" description="F 242 Sutherland"/>
+      </subcategory>
+      <subcategory id="2" description="Broadsword class (Type 22)">
+        <specific id="1" description="F 88 Broadsword"/>
+        <specific id="2" description="F 89 Battleaxe"/>
+        <specific id="3" description="F 90 Brilliant"/>
+        <specific id="4" description="F 91 Brazen"/>
+        <specific id="5" description="F 92 Boxer"/>
+        <specific id="6" description="F 93 Beaver"/>
+        <specific id="7" description="F 94 Brave"/>
+        <specific id="8" description="F 95 London (ex-Bloodhound)"/>
+        <specific id="9" description="F 96 Sheffield"/>
+        <specific id="10" description="F 98 Coventry"/>
+        <specific id="11" description="F 85 Cumberland"/>
+        <specific id="12" description="F 86 Campbeltown"/>
+        <specific id="13" description="F 87 Chatham"/>
+        <specific id="14" description="F 99 Cornwall"/>
+      </subcategory>
+      <subcategory id="3" description="Amazon class (Type 21)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="F 181 Tariq (Pak.)"/>
+        <specific id="8" description="F 182 Babur (Pak.)"/>
+        <specific id="9" description="F 183 Khaibir (Pak.)"/>
+        <specific id="10" description="F 184 Badr (Pak.)"/>
+        <specific id="11" description="F 185 Shahjahan (Pak.)"/>
+        <specific id="12" description="F 186 Tippu Sultan (Pak.)"/>
+      </subcategory>
+      <subcategory id="4" description="Leander Class">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="Condell (Chile)"/>
+        <specific id="6" description="Lynch (Chile)"/>
+        <specific id="7" description="Ministro Zenteno (Chile)"/>
+        <specific id="8" description="General Baquedano (Chile)"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/patrol craft">
+      <subcategory id="1" description="Antarctic patrol ship">
+        <specific id="1" description="A 176 Polar Circle"/>
+      </subcategory>
+      <subcategory id="2" description="Castle class (offshore patrol vessels MK 2)">
+        <specific id="1" description="P 258 Leeds Castle"/>
+        <specific id="2" description="Dumbarton Castle"/>
+      </subcategory>
+      <subcategory id="3" description="Island class (offshore patrol vessels)">
+        <specific id="1" description="P 277 Anglesey"/>
+        <specific id="2" description="P 278 Alderney"/>
+        <specific id="3" description="P 295 Jersey"/>
+        <specific id="4" description="P 297 Guernsey"/>
+        <specific id="5" description="P 298 Shetland"/>
+        <specific id="6" description="P 299 Orkney"/>
+        <specific id="7" description="P 300 Lindisfarne"/>
+      </subcategory>
+      <subcategory id="4" description="Peacock class (large patrol craft)">
+        <specific id="1" description="P 239 Peacock"/>
+        <specific id="2" description="P 240 Plover"/>
+        <specific id="3" description="P 241 Starling"/>
+      </subcategory>
+      <subcategory id="5" description="Bird and Seal class (large patrol craft)">
+        <specific id="1" description="P 259 Redpole (ex-Sea Otter)"/>
+        <specific id="2" description="P 260 Kingfisher"/>
+        <specific id="3" description="P 261 Cygnet"/>
+      </subcategory>
+      <subcategory id="6" description="Archer class (training and patrol craft)">
+        <specific id="1" description="P 264 Archer"/>
+        <specific id="2" description="P 270 Biter"/>
+        <specific id="3" description="P 272 Smiter"/>
+        <specific id="4" description="P 273 Pursuer"/>
+        <specific id="5" description="P 279 Blazer"/>
+        <specific id="6" description="P 280 Dasher"/>
+        <specific id="7" description="P 291 Puncher"/>
+        <specific id="8" description="P 292 Charger"/>
+        <specific id="9" description="P 293 Ranger"/>
+        <specific id="10" description="P 294 Trumpeter"/>
+        <specific id="11" description="A 153 Example (RNXS)"/>
+        <specific id="12" description="A 154 Explorer (RNXS)"/>
+        <specific id="13" description="A 163 Express (RNXS)"/>
+        <specific id="14" description="A 167 Exploit (RNXS)"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Hunt class (minesweepers/minehunters, coastal)">
+        <specific id="1" description="M 29 Brecon"/>
+        <specific id="2" description="M 30 Ledbury"/>
+        <specific id="3" description="M 31 Cattistock"/>
+        <specific id="4" description="M 32 Cottesmore"/>
+        <specific id="5" description="M 33 Brocklesby"/>
+        <specific id="6" description="M 34 Middleton"/>
+        <specific id="7" description="M 35 Dulverton"/>
+        <specific id="8" description="M 36 Bicester"/>
+        <specific id="9" description="M 37 Chiddingfold"/>
+        <specific id="10" description="M 38 Atherstone"/>
+        <specific id="11" description="M 39 Hurworth"/>
+        <specific id="12" description="M 40 Berkeley"/>
+        <specific id="13" description="M 41 Quorn"/>
+      </subcategory>
+      <subcategory id="2" description="River class (minesweepers, coastal)">
+        <specific id="1" description="M 2003 Waveney"/>
+        <specific id="2" description="M 2004 Carron"/>
+        <specific id="3" description="M 2005 Dovey"/>
+        <specific id="4" description="M 2006 Helford"/>
+        <specific id="5" description="M 2007 Humber"/>
+        <specific id="6" description="M 2008 Blackwater"/>
+        <specific id="7" description="M 2009 Itchen"/>
+        <specific id="8" description="M 2010 Helmsdale"/>
+        <specific id="9" description="M 2011 Orwell"/>
+        <specific id="10" description="M2012 Ribble"/>
+        <specific id="11" description="M 2013 Spey"/>
+        <specific id="12" description="M 2014 Arun"/>
+      </subcategory>
+      <subcategory id="3" description="Ton class (coastal minehunters)">
+        <specific id="1" description="M 1114 Brinton"/>
+        <specific id="2" description="M 1151 Iveston"/>
+        <specific id="3" description="M 1154 Kellington"/>
+        <specific id="4" description="M 1166 Nurton"/>
+        <specific id="5" description="M 1181 Sheraton"/>
+      </subcategory>
+      <subcategory id="4" description="Sandown class (minehunters)">
+        <specific id="1" description="M 101 Sandown"/>
+        <specific id="2" description="M 102 Inverness"/>
+        <specific id="3" description="M 103 Cromer"/>
+        <specific id="4" description="M 104 Walney"/>
+        <specific id="5" description="M 105 Bridport"/>
+        <specific id="6" description="M 106 Penzance"/>
+        <specific id="7" description="M 107 Pembroke"/>
+        <specific id="8" description="M 108 Grimsby"/>
+        <specific id="9" description="M 109 Bangor"/>
+      </subcategory>
+    </category>
+    <category id="9" description="Dock Landing Ship">
+      <subcategory id="1" description="Bay Class">
+        <specific id="1" description="Largs Bay"/>
+        <specific id="2" description="Lyme Bay"/>
+        <specific id="3" description="Mounts Bay"/>
+        <specific id="4" description="Cardigan Bay"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Tank landing ship">
+      <subcategory id="1" description="Sir Bedivere Class (LSL)"/>
+      <subcategory id="2" description="Sir Galahad Class (LSL)"/>
+    </category>
+    <category id="12" description="Light carrier">
+      <subcategory id="1" description="Light aircraft carrier (CVSG)">
+        <specific id="1" description="R 05 Invincible"/>
+        <specific id="2" description="R 06 Illustrious"/>
+        <specific id="3" description="R 07 Ark Royal"/>
+        <specific id="4" description="R 22 VIRAAT (India)"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Leander class (training ships)">
+        <specific id="1" description="F 52 Juno"/>
+      </subcategory>
+      <subcategory id="2" description="Dartmouth training ship">
+        <specific id="1" description="M1116 Wilton"/>
+      </subcategory>
+      <subcategory id="3" description="Improved Hecla class (survey)">
+        <specific id="1" description="A 138 Herald"/>
+      </subcategory>
+      <subcategory id="4" description="Hecla class (survey)">
+        <specific id="1" description="A 133 Hecla"/>
+      </subcategory>
+      <subcategory id="5" description="A 317 Bulldog class (survey)">
+        <specific id="1" description="A 317 Bulldog"/>
+        <specific id="2" description="A 319 Beagle"/>
+      </subcategory>
+      <subcategory id="6" description="Roebuck class (survey)">
+        <specific id="1" description="A 130 Roebuck"/>
+      </subcategory>
+      <subcategory id="7" description="Ol class (large fleet tankers (AO))">
+        <specific id="1" description="A 122 Olwen"/>
+        <specific id="2" description="A 123 Olna"/>
+        <specific id="3" description="A 124 Olmeda"/>
+      </subcategory>
+      <subcategory id="8" description="Appleleaf class (support tankers (AOT))">
+        <specific id="1" description="A 81 Brambleleaf (ex-Hudson Cavalier)"/>
+        <specific id="2" description="A 109 Bayleaf"/>
+        <specific id="3" description="A 110 Orangeleaf (ex-Balder London, ex-Hudson Progress)"/>
+        <specific id="4" description="O 195 Westralia (ex. A79 Hudson Cavalier)"/>
+      </subcategory>
+      <subcategory id="9" description="Rover class (small fleet tankers (AOL))">
+        <specific id="1" description="A 269 Grey Rover"/>
+        <specific id="2" description="A 270 Blue rover"/>
+        <specific id="3" description="A 271 Gold rover"/>
+        <specific id="4" description="A 273 Black rover"/>
+      </subcategory>
+      <subcategory id="10" description="Fort Victoria class (fleet replenishment)">
+        <specific id="1" description="A 387 Fort Victoria"/>
+        <specific id="2" description="A 388 Fort George"/>
+      </subcategory>
+      <subcategory id="11" description="Fort Grange class (AFS(H))">
+        <specific id="1" description="A 385 Fort Grange"/>
+        <specific id="2" description="A 386 Fort Austin"/>
+      </subcategory>
+      <subcategory id="12" description="Regent class (AFS(H))">
+        <specific id="1" description="A 480 Resource"/>
+        <specific id="2" description="A 486 Regent"/>
+      </subcategory>
+      <subcategory id="13" description="Stena type (forward repair ship)">
+        <specific id="1" description="A 132 Diligence (ex-Stena Inspector)"/>
+      </subcategory>
+      <subcategory id="14" description="Sal Class (salvage &amp; mooring)">
+        <specific id="1" description="A 185 Salmoor"/>
+        <specific id="2" description="A 186 Salmaster"/>
+        <specific id="3" description="A 187 Salmaid"/>
+      </subcategory>
+      <subcategory id="15" description="Wild Duck class (salvage &amp; mooring)">
+        <specific id="1" description="A 164 Goosander"/>
+        <specific id="2" description="A 165 Pochard"/>
+      </subcategory>
+      <subcategory id="16" description="Moorhen class (salvage &amp; mooring)">
+        <specific id="1" description="Y 32 Moorhen"/>
+        <specific id="2" description="Y 33 Moorfowl"/>
+        <specific id="3" description="A 72 Cameron"/>
+      </subcategory>
+      <subcategory id="17" description="Oilpress class (coastal tankers)">
+        <specific id="1" description="Y 21 Oilpress"/>
+        <specific id="2" description="Y 22 Oilstone"/>
+        <specific id="3" description="Y 23 Oilwell"/>
+        <specific id="4" description="Y 25 Oilbird"/>
+        <specific id="5" description="Y 26 Oilman"/>
+      </subcategory>
+      <subcategory id="18" description="Tornado class (torpedo recovery)">
+        <specific id="1" description="A 140 Tornado"/>
+        <specific id="2" description="A 141 Torch a 141"/>
+        <specific id="3" description="A 142 Tormentor"/>
+        <specific id="4" description="A 143 Toreador"/>
+      </subcategory>
+      <subcategory id="19" description="Water class (water carriers)">
+        <specific id="1" description="Y 17 Waterfall"/>
+        <specific id="2" description="Y 18 Watershed"/>
+        <specific id="3" description="Y 19 Waterspout"/>
+        <specific id="4" description="Y 30 Watercourse"/>
+        <specific id="5" description="Y 31 Waterfowl"/>
+        <specific id="6" description="A 146 Waterman"/>
+      </subcategory>
+      <subcategory id="20" description="Seal class (lrrsc) (aviation support)">
+        <specific id="1" description="5000 Seal"/>
+        <specific id="2" description="5001 Seagull"/>
+      </subcategory>
+      <subcategory id="21" description="Spitfire class (rttl mk 3) (aviation support)">
+        <specific id="1" description="4000 Spitfire"/>
+        <specific id="2" description="4003 Halifax"/>
+        <specific id="3" description="4004 Hampden"/>
+        <specific id="4" description="4005 Hurricane"/>
+        <specific id="5" description="4006 Lancaster"/>
+        <specific id="6" description="4007 Wellington"/>
+      </subcategory>
+      <subcategory id="22" description="Insect class (fleet tenders)">
+        <specific id="1" description="A 216 Bee"/>
+        <specific id="2" description="A 229 Cricket"/>
+        <specific id="3" description="A 230 Cockchafer"/>
+        <specific id="4" description="A 239 Gnat"/>
+        <specific id="5" description="A 253 Ladybird"/>
+        <specific id="6" description="A 263 Cicada"/>
+        <specific id="7" description="A 272 Scarab"/>
+      </subcategory>
+      <subcategory id="23" description="Loyal class (RNXs) (fleet tenders)">
+        <specific id="1" description="A 157 Loyal Helper"/>
+        <specific id="2" description="A 158 Supporter (ex-Loyal Supporter)"/>
+        <specific id="3" description="A 159 Loyal Watcher"/>
+        <specific id="4" description="A 160 Loyal Volunteer"/>
+        <specific id="5" description="A 161 Loyal Mediator"/>
+        <specific id="6" description="A 220 Loyal Moderator"/>
+        <specific id="7" description="A 1770 Loyal Chancellor"/>
+        <specific id="8" description="A 1771 Loyal Proctor"/>
+      </subcategory>
+      <subcategory id="24" description="Clovelly class (fleet tenders)">
+        <specific id="1" description="A 207 Llandovery"/>
+        <specific id="2" description="A 208 Lamlash"/>
+        <specific id="3" description="A 211 Lechlade"/>
+        <specific id="4" description="A 251 Lydford (ex-Loyal Governor, ex-Alert)"/>
+        <specific id="5" description="A 254 Meavy (ex-Loyal Factor, ex-Vigilant)"/>
+        <specific id="6" description="A 274 Ettrick"/>
+        <specific id="7" description="A 277 Elsing"/>
+        <specific id="8" description="A 341 Fotherby"/>
+        <specific id="9" description="A 348 Felsted"/>
+        <specific id="10" description="A 353 Elkstone"/>
+        <specific id="11" description="A 354 Froxfield"/>
+        <specific id="12" description="A 355 Epworth"/>
+        <specific id="13" description="A 365 Fulbeck"/>
+        <specific id="14" description="A 381 Cricklade"/>
+        <specific id="15" description="A 391 Criccieth"/>
+        <specific id="16" description="A 392 Glencoe"/>
+        <specific id="17" description="A 393 Dunster"/>
+        <specific id="18" description="A 394 Fintry"/>
+        <specific id="19" description="A 402 Grasmere"/>
+        <specific id="20" description="A 488 Cromarty"/>
+        <specific id="21" description="A 490 Dornoch"/>
+        <specific id="22" description="A 1766 Headcorn"/>
+        <specific id="23" description="A 1767 Hever"/>
+        <specific id="24" description="A 1768 Harlech"/>
+        <specific id="25" description="A 1769 Hambledon"/>
+        <specific id="26" description="A 1772 Holmwood"/>
+        <specific id="27" description="A 1773 Horning"/>
+      </subcategory>
+      <subcategory id="25" description="Manly class (fleet tenders)">
+        <specific id="1" description="A 83 Melton"/>
+        <specific id="2" description="A 84 Menai"/>
+        <specific id="3" description="A 87 Meon"/>
+        <specific id="4" description="A 91 Milford"/>
+        <specific id="5" description="A 107 Messina"/>
+      </subcategory>
+      <subcategory id="26" description="Magnet class (degaussing vessels)">
+        <specific id="1" description="A 114 Magnet"/>
+        <specific id="2" description="A 115 Lodestone"/>
+      </subcategory>
+      <subcategory id="27" description="Aberdovey class (auxiliary training vessels)">
+        <specific id="1" description="A 100 Beddgelert"/>
+        <specific id="2" description="A 103 Sultan Venturer (ex-Bibury)"/>
+        <specific id="3" description="A 383 Appleby"/>
+        <specific id="4" description="Y 10 Aberdovey"/>
+        <specific id="5" description="Y 11 Abinger"/>
+        <specific id="6" description="Y 13 Alnmouth"/>
+      </subcategory>
+      <subcategory id="28" description="Wave Class (Large Fleet Tankers )(AO)">
+        <specific id="1" description="A390 Wave Knight"/>
+      </subcategory>
+      <subcategory id="29" description="Oakleaf Class (Support Tanker)(AOT)">
+        <specific id="1" description="A111 Oakleaf"/>
+      </subcategory>
+    </category>
+    <category id="17" description="Auxiliary, Merchant Marine">
+      <subcategory id="1" description="Avon class (Royal Corps of Transport)">
+        <specific id="1" description="RPL 05 Eden"/>
+        <specific id="2" description="RPL 06 Forth"/>
+        <specific id="3" description="RPL 12 Medway"/>
+      </subcategory>
+      <subcategory id="2" description="Adept class (TUTT) (tugs)">
+        <specific id="1" description="A 221 Forceful"/>
+        <specific id="2" description="A 222 Nimble"/>
+        <specific id="3" description="A 223 Powerful"/>
+        <specific id="4" description="A 224 Adept"/>
+        <specific id="5" description="A 225 Bustler"/>
+        <specific id="6" description="A 226 Capable"/>
+        <specific id="7" description="A 227 Careful"/>
+        <specific id="8" description="A 228 Faithful"/>
+        <specific id="9" description="A 231 Dexterous"/>
+      </subcategory>
+      <subcategory id="3" description="Dog class (tugs and range-trials vessels)">
+        <specific id="1" description="A 106 Alsatian"/>
+        <specific id="2" description="A 126 Cairn"/>
+        <specific id="3" description="A 129 Dalmatian"/>
+        <specific id="4" description="A 155 Deerhound"/>
+        <specific id="5" description="A 162 Elkhound"/>
+        <specific id="6" description="A 168 Labrador"/>
+        <specific id="7" description="A 178 Husky"/>
+        <specific id="8" description="A 180 Mastiff"/>
+        <specific id="9" description="A 182 Saluki"/>
+        <specific id="10" description="A 188 Pointer"/>
+        <specific id="11" description="A 189 Setter"/>
+        <specific id="12" description="A 197 Sealyham"/>
+        <specific id="13" description="A 201 Spaniel"/>
+        <specific id="14" description="A 250 Sheepdog"/>
+        <specific id="15" description="A 326 Foxhound (ex-Boxer)"/>
+        <specific id="16" description="A 327 Basset (ex-Beagle)"/>
+        <specific id="17" description="A 328 Collie"/>
+        <specific id="18" description="A 330 Corgi"/>
+      </subcategory>
+      <subcategory id="4" description="Modified Girl Class">
+        <specific id="1" description="A 156 Daphne"/>
+        <specific id="2" description="A 177 Edith"/>
+      </subcategory>
+      <subcategory id="5" description="Triton class">
+        <specific id="1" description="A 166 Kathleen"/>
+        <specific id="2" description="A 170 Kitty"/>
+        <specific id="3" description="A 172 Lesley"/>
+        <specific id="4" description="A 174 Lilah"/>
+        <specific id="5" description="A 175 Mary"/>
+        <specific id="6" description="A 181 Irene"/>
+        <specific id="7" description="A 183 Isabel"/>
+        <specific id="8" description="A 190 Joan"/>
+        <specific id="9" description="A 193 Joyce"/>
+        <specific id="10" description="A 199 Myrtle"/>
+        <specific id="11" description="A 202 Nancy"/>
+        <specific id="12" description="A 205 Norah"/>
+      </subcategory>
+      <subcategory id="6" description="Felicity class">
+        <specific id="1" description="A 112 Felicity"/>
+        <specific id="2" description="A 147 Frances"/>
+        <specific id="3" description="A 148 Fiona"/>
+        <specific id="4" description="A 149 Florence"/>
+        <specific id="5" description="A 150 Genevieve"/>
+        <specific id="6" description="A 152 Georgina"/>
+        <specific id="7" description="A 196 Gwendoline"/>
+        <specific id="8" description="A 198 Helen"/>
+      </subcategory>
+    </category>
+    <category id="54" description="Amphibious Assault Ship">
+      <subcategory id="1" description="LPH01 Ocean"/>
+      <subcategory id="2" description="Helicopter Carrier (LPH)">
+        <specific id="1" description="L12 Ocean"/>
+      </subcategory>
+    </category>
+    <category id="56" description="Amphibious transport dock">
+      <subcategory id="1" description="Assault ships (LPD)">
+        <specific id="1" description="L 10 Fearless"/>
+        <specific id="2" description="L 11 Intrepid"/>
+        <specific id="3" description="L 14 Albion"/>
+        <specific id="4" description="L 15 Bulwalk"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Adi Eu"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="224">
+    <category id="1" description="SSBN (Nuclear Ballistic Missiles)">
+      <subcategory id="1" description="Vanguard Class">
+        <specific id="1" description="05 Vanguard"/>
+        <specific id="2" description="06 Victorious"/>
+        <specific id="3" description="07 Vigilant"/>
+        <specific id="4" description="08"/>
+      </subcategory>
+      <subcategory id="2" description="Resolution Class">
+        <specific id="1" description="S 22 Resolution"/>
+        <specific id="2" description="S 23 Repulse"/>
+        <specific id="3" description="S 26 Renown"/>
+        <specific id="4" description="S 27 Revenge"/>
+      </subcategory>
+    </category>
+    <category id="3" description="SSN (Nuclear Attack-Torpedo)">
+      <subcategory id="1" description="Trafalgar Class">
+        <specific id="1" description="S 87 Turbulent"/>
+        <specific id="2" description="S 88 Tireless"/>
+        <specific id="3" description="S 90 Torbay"/>
+        <specific id="4" description="S 91 Trenchant"/>
+        <specific id="5" description="S 92 Talent"/>
+        <specific id="6" description="S 93 Triumph"/>
+        <specific id="7" description="S 107 Trafalgar"/>
+      </subcategory>
+      <subcategory id="2" description="Swiftsure Class">
+        <specific id="1" description="S 104 Sceptre"/>
+        <specific id="2" description="S 105 Spartan"/>
+        <specific id="3" description="S 106 Splendid"/>
+        <specific id="4" description="S 108 Sovereign"/>
+        <specific id="5" description="S 109 Superb"/>
+      </subcategory>
+      <subcategory id="3" description="Valiant Class">
+        <specific id="1" description="S 102 Valiant"/>
+      </subcategory>
+    </category>
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Upholder class (Type 2400)">
+        <specific id="1" description="S 40 Upholder"/>
+        <specific id="2" description="S 41 Unseen"/>
+        <specific id="3" description="S 42 Ursula"/>
+        <specific id="4" description="S 43 Unicorn"/>
+      </subcategory>
+      <subcategory id="2" description="Oberon Class">
+        <specific id="1" description="S 16 Oracle"/>
+        <specific id="2" description="S 19 Opossum"/>
+        <specific id="3" description="S 20 Opportune"/>
+        <specific id="60" description="Onslow (Australia)"/>
+        <specific id="62" description="Otama (Australia)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="224">
+    <category id="0" description="Other"/>
+    <category id="1" description="Manned"/>
+    <category id="2" description="Unmanned">
+      <subcategory id="1" description="Communication satellite">
+        <specific id="1" description="Skynet 4"/>
+        <specific id="2" description="Skynet 4A"/>
+        <specific id="3" description="Skynet 4B"/>
+        <specific id="4" description="Skynet 4C"/>
+        <specific id="5" description="NATO 4"/>
+        <specific id="6" description="ECS"/>
+        <specific id="7" description="Eurostar"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="71">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="AMX-30">
+        <specific id="1" description="AMX-30B2"/>
+      </subcategory>
+      <subcategory id="2" description="AMX-13 Light Tank"/>
+      <subcategory id="3" description="AMX-40 MBT"/>
+      <subcategory id="4" description="Le Clerc"/>
+    </category>
+    <category id="2" description="Armored fighting vehicle">
+      <subcategory id="1" description="VBC-90 armored car"/>
+      <subcategory id="2" description="ERC-90 armored car"/>
+      <subcategory id="3" description="AML-90 armored car"/>
+      <subcategory id="4" description="AML-60 armored car"/>
+      <subcategory id="5" description="VAB APC"/>
+      <subcategory id="6" description="AMX-10RC armored car"/>
+      <subcategory id="7" description="AMX-13 IFV"/>
+      <subcategory id="8" description="AMX-10 IFV">
+        <specific id="1" description="with two-rail MILAN anti-tank missile launcher"/>
+        <specific id="2" description="with HOT: ATGM launcher vehicle"/>
+      </subcategory>
+      <subcategory id="9" description="EBR armored car"/>
+      <subcategory id="10" description="AMX-13 VCI APC"/>
+      <subcategory id="11" description="AMX-13 DCA"/>
+      <subcategory id="12" description="Berliet VXB armored car"/>
+      <subcategory id="13" description="Panhard EBR"/>
+    </category>
+    <category id="3" description="Armored utility vehicle">
+      <subcategory id="1" description="AMX-10 ECH Recovery Vehicle"/>
+    </category>
+    <category id="4" description="Self-propelled artillery">
+      <subcategory id="1" description="A UF1 155-mm Howitzer"/>
+      <subcategory id="2" description="AMX 105-mm Howitzer"/>
+      <subcategory id="3" description="AU-50 105-mm Howitzer"/>
+      <subcategory id="4" description="F-3 155-mm gun"/>
+      <subcategory id="5" description="MM 38 Exocet launcher"/>
+      <subcategory id="6" description="MM 40 Exocet launcher"/>
+      <subcategory id="7" description="Otomat Mk 1 launcher"/>
+      <subcategory id="8" description="Otomat Mk 2/3 launcher"/>
+    </category>
+    <category id="5" description="Towed artillery">
+      <subcategory id="1" description="TR 155-mm Howitzer"/>
+    </category>
+    <category id="6" description="Small wheeled utility vehicle"/>
+    <category id="7" description="Large wheeled utility vehicle"/>
+    <category id="8" description="Small tracked utility vehicle"/>
+    <category id="9" description="Large tracked utility vehicle"/>
+    <category id="10" description="Mortar">
+      <subcategory id="1" description="120mm Mortar RT-61"/>
+    </category>
+    <category id="11" description="Mine plow"/>
+    <category id="12" description="Mine rake"/>
+    <category id="13" description="Mine roller"/>
+    <category id="14" description="Cargo trailer">
+      <subcategory id="1" description="0 - 0.5 ton"/>
+      <subcategory id="2" description="0.51 - 2 ton"/>
+      <subcategory id="3" description="2.01 - 5 ton"/>
+      <subcategory id="4" description="5.02 - 10 ton"/>
+      <subcategory id="5" description="greater than 10 tons"/>
+    </category>
+    <category id="15" description="Fuel trailer">
+      <subcategory id="1" description="1-1000 gallons"/>
+      <subcategory id="2" description="1001 - 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="16" description="Generator trailer">
+      <subcategory id="1" description="0 - 100 KW"/>
+      <subcategory id="2" description="greater than 100 KW"/>
+    </category>
+    <category id="17" description="Water trailer">
+      <subcategory id="1" description="1-1000 gallons"/>
+      <subcategory id="2" description="1001- 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="18" description="Engineer equipment">
+      <subcategory id="1" description="Mine clearing line charge"/>
+      <subcategory id="2" description="Dozer blade kit"/>
+      <subcategory id="3" description="Lane marking system"/>
+    </category>
+    <category id="19" description="Heavy equipment transport trailer"/>
+    <category id="20" description="Maintenance equipment trailer">
+      <subcategory id="1" description="Welding trailer"/>
+      <subcategory id="2" description="Compressor"/>
+      <subcategory id="3" description="Tools/parts trailer"/>
+    </category>
+    <category id="21" description="Limber"/>
+    <category id="22" description="Chemical decontamination trailer"/>
+    <category id="28" description="Air Defense / Missile Defense Unit Equipment">
+      <subcategory id="1" description="Crotale SAM System">
+        <specific id="1" description="Crotale P4R Missile Firing System"/>
+        <specific id="2" description="Crotale P4R Radar System"/>
+      </subcategory>
+      <subcategory id="2" description="Crotale NG SAM System"/>
+      <subcategory id="3" description="Shahine SAM System">
+        <specific id="1" description="Shahine Acquisition Radar/AMX-30 chassis"/>
+        <specific id="2" description="Shahine Launcher/AMX-30 chassis"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="71">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="Mirage F-1">
+        <specific id="1" description="F1-AD"/>
+        <specific id="2" description="F1-AZ"/>
+        <specific id="3" description="F1-B"/>
+        <specific id="4" description="F1-BD"/>
+        <specific id="5" description="F1-BE"/>
+        <specific id="6" description="F1-BJ"/>
+        <specific id="7" description="F1-BK"/>
+        <specific id="8" description="F1-BQ"/>
+        <specific id="9" description="F1-B &amp; E"/>
+        <specific id="10" description="F1-C"/>
+        <specific id="11" description="F1-CE"/>
+        <specific id="12" description="F1-CG"/>
+        <specific id="13" description="F1-CH"/>
+        <specific id="14" description="F1-CJ"/>
+        <specific id="15" description="F1-CK"/>
+        <specific id="16" description="F1-CR-200"/>
+        <specific id="17" description="F1-CZ"/>
+        <specific id="18" description="F1-C-200s"/>
+        <specific id="19" description="F1-DDA"/>
+        <specific id="20" description="F1-ED"/>
+        <specific id="21" description="F1-EDA"/>
+        <specific id="22" description="F1-EE"/>
+        <specific id="23" description="F1-EH"/>
+        <specific id="24" description="F1-EJ"/>
+        <specific id="25" description="F1-EQ"/>
+        <specific id="26" description="F1-JA"/>
+        <specific id="27" description="F1-JE"/>
+      </subcategory>
+      <subcategory id="3" description="Mirage III">
+        <specific id="1" description="Mirage III-D"/>
+        <specific id="2" description="Mirage III-E"/>
+      </subcategory>
+      <subcategory id="4" description="Mirage 2000">
+        <specific id="1" description="Mirage 2000AD"/>
+        <specific id="2" description="Mirage 2000BGM"/>
+        <specific id="3" description="Mirage 2000C"/>
+        <specific id="4" description="Mirage 2000D"/>
+        <specific id="5" description="Mirage 2000DAD"/>
+        <specific id="6" description="Mirage 2000DP"/>
+        <specific id="7" description="Mirage 2000E"/>
+        <specific id="8" description="Mirage 2000EAD"/>
+        <specific id="9" description="Mirage 2000EGM"/>
+        <specific id="10" description="Mirage 2000H (KF-101)"/>
+        <specific id="11" description="Mirage 2000N"/>
+        <specific id="12" description="Mirage 2000P"/>
+        <specific id="13" description="Mirage 2000RAD"/>
+        <specific id="14" description="Mirage 2000TH (KT-201)"/>
+        <specific id="15" description="Mirage 2000-5"/>
+        <specific id="16" description="Vajra (Divine Thunder)"/>
+      </subcategory>
+      <subcategory id="5" description="Dassault Rafale (Squall)">
+        <specific id="1" description="Rafale B"/>
+        <specific id="2" description="Rafale C"/>
+        <specific id="3" description="Rafale S-1 Standard"/>
+        <specific id="4" description="Rafale M"/>
+      </subcategory>
+      <subcategory id="6" description="Mirage 50"/>
+      <subcategory id="7" description="(deleted)"/>
+    </category>
+    <category id="2" description="Attack/Strike">
+      <subcategory id="1" description="Dassault/BAe Jaguar"/>
+      <subcategory id="2" description="Etendard IV-P"/>
+      <subcategory id="3" description="Dassault Super Etendard">
+        <specific id="1" description="Super Etendard"/>
+      </subcategory>
+      <subcategory id="4" description="Dassault/Dornier Alpha Jet">
+        <specific id="1" description="Alpha Jet 2"/>
+        <specific id="2" description="Alpha Jet E"/>
+        <specific id="3" description="Alpha Jet A"/>
+        <specific id="4" description="Alpha Jet 3"/>
+      </subcategory>
+      <subcategory id="5" description="Mirage 5"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="Mirage IV"/>
+    </category>
+    <category id="3" description="Bomber">
+      <subcategory id="1" description="(deleted)"/>
+    </category>
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="Transall C-160"/>
+      <subcategory id="2" description="Dassault Mystere-Falcon 50"/>
+      <subcategory id="3" description="T.16 air ambulance."/>
+      <subcategory id="4" description="Reims F 406 Caravan II">
+        <specific id="1" description="Reims F 406 Vigilante"/>
+      </subcategory>
+      <subcategory id="5" description="SECA/Fokker F27 Friendship Arat"/>
+      <subcategory id="6" description="Dassault Mystere-Falcon 20">
+        <specific id="1" description="HU-25 Guardian"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Antisubmarine/patrol/observation">
+      <subcategory id="1" description="Dassault Alantique 2"/>
+      <subcategory id="2" description="Dassault (Breguet) Alize"/>
+      <subcategory id="3" description="Dassault (Breguet) (1050) Atlantic"/>
+      <subcategory id="4" description="Dassault Mystere-Falcon 900">
+        <specific id="1" description="T.18"/>
+      </subcategory>
+      <subcategory id="5" description="Dassault Gardian 2"/>
+    </category>
+    <category id="6" description="Electronic Warfare (EW)">
+      <subcategory id="1" description="Transall C-160"/>
+      <subcategory id="2" description="Dassault (Breguet 1050) Alize"/>
+      <subcategory id="3" description="Dassault Mystere-Falcon 20 (ECM)"/>
+    </category>
+    <category id="7" description="Reconnaissance">
+      <subcategory id="1" description="Dassault Mystere-Falcon 900"/>
+      <subcategory id="2" description="Mirage III">
+        <specific id="1" description="Mirage III-R"/>
+        <specific id="2" description="Mirage III-R2Z"/>
+        <specific id="3" description="Mirage III-RD"/>
+      </subcategory>
+      <subcategory id="3" description="Dassault Mystere-Falcon 20SNR"/>
+    </category>
+    <category id="20" description="Attack Helicopter">
+      <subcategory id="1" description="Eurocopter AS 532 Cougar">
+        <specific id="1" description="AS 532AC"/>
+        <specific id="2" description="AS 532AL"/>
+      </subcategory>
+      <subcategory id="2" description="Eurocopter SA342 Gazelle">
+        <specific id="1" description="SA 342ATAM"/>
+        <specific id="2" description="SA 342M Viviane"/>
+      </subcategory>
+      <subcategory id="3" description="Eurocopter BO 105/PAH-1/VBH/BSH-1">
+        <specific id="1" description="BO 105 PAH-1A1"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Utility Helicopter">
+      <subcategory id="1" description="Aerospatiale SA 313B Alouette II"/>
+      <subcategory id="2" description="Aerospatiale SA 315B">
+        <specific id="1" description="Cheetah"/>
+      </subcategory>
+      <subcategory id="3" description="Aerospatiale SA 316B Alouette III"/>
+      <subcategory id="4" description="Aerospatiale SA 321 Super Frelon">
+        <specific id="1" description="SA 321H"/>
+      </subcategory>
+      <subcategory id="5" description="Aerospatiale SA 330 Puma">
+        <specific id="1" description="330 Puma"/>
+        <specific id="2" description="332M Super Puma"/>
+        <specific id="3" description="Super Puma/Puma"/>
+      </subcategory>
+      <subcategory id="6" description="Aerospatiale SA 341 Gazelle">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="SA 341B"/>
+        <specific id="3" description="Gazelle HT. Mk 3"/>
+        <specific id="4" description="Gazelle HCC. Mk4"/>
+        <specific id="5" description="SA 341 F"/>
+        <specific id="6" description="SA 341 H"/>
+      </subcategory>
+      <subcategory id="7" description="Eurocopter AS 332L Super Puma MK II and AS 532 Cougar MkII">
+        <specific id="1" description="532U2 Cougar MK II"/>
+        <specific id="2" description="532A2 Cougar Mk II"/>
+      </subcategory>
+      <subcategory id="8" description="Eurocopter SA 342 Gazelle">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="SA 342M"/>
+      </subcategory>
+      <subcategory id="9" description="Eurocopter AS 532 Cougar">
+        <specific id="1" description="AS 532UC"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="AS 532MC"/>
+        <specific id="4" description="AS 532UL"/>
+      </subcategory>
+      <subcategory id="10" description="Eurocopter AS 565 Panther">
+        <specific id="1" description="AS 365N2 Dauphin 2"/>
+        <specific id="2" description="AS 565MA"/>
+      </subcategory>
+      <subcategory id="11" description="Eurocopter 365N2 Dauphin 2">
+        <specific id="1" description="AS 366G1 (HH-65A Dolphin)"/>
+      </subcategory>
+      <subcategory id="12" description="Eurocopter BO 105"/>
+      <subcategory id="13" description="Eurocopter AS 350 Ecureuil/Astar and AS 550 Fennec">
+        <specific id="1" description="CH-50"/>
+        <specific id="2" description="TH-50 Esquilo"/>
+        <specific id="3" description="HA-1 Esquilo"/>
+        <specific id="4" description="UH-12 Esquilo"/>
+        <specific id="5" description="AS 350BA Ecureuil"/>
+        <specific id="6" description="AS 350B2 Ecureuil"/>
+        <specific id="7" description="AS 350 B3 Ecureuil"/>
+        <specific id="8" description="AS 350D Astar"/>
+        <specific id="9" description="AS 350 Firefighter"/>
+        <specific id="10" description="AS 550 Fennec"/>
+        <specific id="11" description="550A2"/>
+        <specific id="12" description="AS 550C2"/>
+        <specific id="13" description="AS 550M2"/>
+        <specific id="14" description="AS 550S2"/>
+      </subcategory>
+      <subcategory id="14" description="Eurocopter AS 355 Ecureuil 2 Twinstar and AS 555 Fennec">
+        <specific id="1" description="CH-55"/>
+        <specific id="2" description="VH-55 Esquilo"/>
+        <specific id="3" description="UH-12B Esquilo"/>
+        <specific id="4" description="AS 555UN Fennec"/>
+        <specific id="5" description="AS 555AN Fennec"/>
+        <specific id="6" description="AS 555CN Fennec"/>
+        <specific id="7" description="AS 555MN Fennec"/>
+        <specific id="8" description="AS 555SN Fennec naval ASW"/>
+      </subcategory>
+      <subcategory id="15" description="Eurocopter AS 365N2 Dauphin 2">
+        <specific id="1" description="AS 366G1 (HH-65A Dolphin)"/>
+        <specific id="2" description="AS 565 Panther"/>
+        <specific id="3" description="HM-1"/>
+        <specific id="4" description="AS 565AA"/>
+        <specific id="5" description="AS 565CA"/>
+        <specific id="6" description="AS 565 Panther 807, AS 565MA Panther"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="AS 565SA Panter"/>
+      </subcategory>
+    </category>
+    <category id="22" description="Antisubmarine Warfare / Patrol Helicopter">
+      <subcategory id="1" description="Aerospatiale SA 319B ASTAZOU"/>
+      <subcategory id="2" description="Aerospatiale SA 321 Super Frelon">
+        <specific id="1" description="AS 32"/>
+      </subcategory>
+      <subcategory id="3" description="Eurocopter AS 532 Cougar">
+        <specific id="1" description="AS 532SC"/>
+      </subcategory>
+      <subcategory id="4" description="Eurocopter AS 565 Panther">
+        <specific id="1" description="AS 565SA"/>
+        <specific id="2" description="AS 565F (MA)"/>
+      </subcategory>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Mudry CAP 10 B"/>
+      <subcategory id="2" description="Socata TB 30 Epsilon"/>
+      <subcategory id="3" description="Socata TB 31 Omega"/>
+      <subcategory id="4" description="SEPECAT Jaguar International">
+        <specific id="1" description="Jaguar GR. Mk 1A"/>
+      </subcategory>
+      <subcategory id="5" description="Dassault Mystere-Falcon 20SNA"/>
+    </category>
+    <category id="57" description="Non-Combatant Commercial Aircraft">
+      <subcategory id="1" description="Passenger Airline">
+        <specific id="1" description="A320 Air Bus"/>
+        <specific id="2" description="Airbus A300"/>
+        <specific id="3" description="Airbus A310"/>
+        <specific id="4" description="Airbus A318"/>
+        <specific id="5" description="Airbus A319"/>
+        <specific id="6" description="Airbus A321"/>
+        <specific id="7" description="Airbus A330"/>
+        <specific id="8" description="Airbus A340"/>
+        <specific id="9" description="Airbus A380"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="71">
+    <category id="1" description="Carrier (Porte-Avions)">
+      <subcategory id="1" description="Nuclear-Propelled Aircraft Carriers (CVN)">
+        <specific id="1" description="R 91 Charles De Gaulle"/>
+      </subcategory>
+      <subcategory id="2" description="Clemenceau class (CV)">
+        <specific id="1" description="R 98 Clemenceau"/>
+        <specific id="2" description="R 99 Foch"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Guided Missile Destroyer (Fregates or Escorteurs D'escadres)">
+      <subcategory id="1" description="Georges Leygues Class (Type f 70 (ASW))">
+        <specific id="1" description="D 640 Georges Leygues"/>
+        <specific id="2" description="D 641 Dupleix"/>
+        <specific id="3" description="D 642 Montcalm"/>
+        <specific id="4" description="D 643 Jean de vienne"/>
+        <specific id="5" description="D 644 Primauguet"/>
+        <specific id="6" description="D 645 La motte-picquet"/>
+        <specific id="7" description="D 646 Latouche-treville"/>
+      </subcategory>
+      <subcategory id="2" description="Cassard class (Type F 70 (A/A))">
+        <specific id="1" description="D 614 Cassard"/>
+        <specific id="2" description="D 615 Jean Bart"/>
+      </subcategory>
+      <subcategory id="3" description="Suffren class">
+        <specific id="1" description="D 602 Suffren"/>
+        <specific id="2" description="D 603 Duquesne"/>
+      </subcategory>
+      <subcategory id="4" description="Tourville class (Type F 67)">
+        <specific id="1" description="D 610 Tourville"/>
+        <specific id="2" description="D 611 Duguay-Trouin"/>
+        <specific id="3" description="D 612 De grasse"/>
+      </subcategory>
+      <subcategory id="5" description="Type F 65 (ASW)">
+        <specific id="1" description="D 609 Aconit (ex-F 703)"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided-missile Frigate">
+      <subcategory id="1" description="La Fayette class (light frigates)">
+        <specific id="1" description="F 710 Lafayette"/>
+        <specific id="2" description="F 711 Surcouf"/>
+        <specific id="3" description="F 712 Courbet"/>
+      </subcategory>
+      <subcategory id="2" description="Floreal class (patrol frigates)">
+        <specific id="1" description="F 730 Floreal"/>
+        <specific id="2" description="F 731 Prairial"/>
+        <specific id="3" description="F 732 Nivose"/>
+        <specific id="4" description="F 733 Ventose"/>
+        <specific id="5" description="F 734 Vendemiaire"/>
+        <specific id="6" description="F 735 Germinal"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/patrol craft">
+      <subcategory id="1" description="P 400 class (fast attack craft--patrol)">
+        <specific id="1" description="P 682 L'audacieuse"/>
+        <specific id="2" description="P 683 La boudeuse"/>
+        <specific id="3" description="P 684 La capricieuse"/>
+        <specific id="4" description="P 685 La fougueuse"/>
+        <specific id="5" description="P 686 La glorieuse"/>
+        <specific id="6" description="P 687 La gracieuse"/>
+        <specific id="7" description="P 688 La moqueuse"/>
+        <specific id="8" description="P 689 La railleuse"/>
+        <specific id="9" description="P 690 La rieuse"/>
+        <specific id="10" description="P 691 La tapageuse"/>
+        <specific id="11" description="B1 AI Bushra (OMAN)"/>
+      </subcategory>
+      <subcategory id="2" description="Thomson-CSF Type (large patrol craft)">
+        <specific id="1" description="P 696 Iris"/>
+      </subcategory>
+      <subcategory id="3" description="Combattante IIG Class"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship / Craft">
+      <subcategory id="1" description="Narvik class (minehunter/sweeper)">
+        <specific id="1" description="M 660 Narvik"/>
+        <specific id="2" description="Bir Hakeim"/>
+        <specific id="3" description="Garigliano"/>
+        <specific id="4" description="Autun"/>
+        <specific id="5" description="Colmar"/>
+        <specific id="6" description="Berlaimont"/>
+      </subcategory>
+      <subcategory id="2" description="Eridan (Tripartite) class (minehunters)">
+        <specific id="1" description="M 641 Eridan"/>
+        <specific id="2" description="M 642 Cassiopee"/>
+        <specific id="3" description="M 643 Andromede"/>
+        <specific id="4" description="M 644 Pegase"/>
+        <specific id="5" description="M 645 Orion"/>
+        <specific id="6" description="M 646 Croix du sud"/>
+        <specific id="7" description="M 647 Aigle"/>
+        <specific id="8" description="M 648 Lyre"/>
+        <specific id="9" description="M 649 Persee"/>
+      </subcategory>
+      <subcategory id="3" description="Circe class (minehunters)">
+        <specific id="1" description="M 712 Cybele"/>
+        <specific id="2" description="M 713 Calliope"/>
+        <specific id="3" description="M 714 Clio"/>
+        <specific id="4" description="M 715 Circe"/>
+        <specific id="5" description="M 716 Ceres"/>
+      </subcategory>
+      <subcategory id="4" description="ex-US Aggressive class (minesweepers)">
+        <specific id="1" description="M 610 Ouistreham (ex-MSO 513)"/>
+        <specific id="2" description="M 612 Alencon (ex-MSO 453)"/>
+        <specific id="3" description="M 623 Baccarat (ex-MSO 505)"/>
+      </subcategory>
+      <subcategory id="5" description="MCM diving support ships">
+        <specific id="1" description="A 613 Acheron"/>
+        <specific id="2" description="M 611 Vulcain"/>
+        <specific id="3" description="M 614 Styx"/>
+        <specific id="4" description="M 622 Pluton"/>
+      </subcategory>
+    </category>
+    <category id="9" description="Dock Landing Ship">
+      <subcategory id="1" description="Foudre class (Type TCD 90)">
+        <specific id="1" description="L 9011 Foudre"/>
+      </subcategory>
+      <subcategory id="2" description="Ouragan class (TCDs)">
+        <specific id="1" description="L 9021 Ouragan"/>
+        <specific id="2" description="L 9022 Orage"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="Bougainville class (BTs)">
+        <specific id="1" description="L 9077 Bougainville"/>
+      </subcategory>
+      <subcategory id="2" description="Batral type (light transports and landing ships)">
+        <specific id="1" description="L 9030 Champlain"/>
+        <specific id="2" description="L 9031 Francis Garnier"/>
+        <specific id="3" description="L 9032 Dumont D'urville"/>
+        <specific id="4" description="L 9033 Jacques Cartier"/>
+        <specific id="5" description="L 9034 La grandiere"/>
+      </subcategory>
+      <subcategory id="3" description="Edic 700 class (LCT)">
+        <specific id="1" description="L 9051"/>
+        <specific id="2" description="L 9052"/>
+      </subcategory>
+      <subcategory id="4" description="Edic class (LCT)">
+        <specific id="1" description="L 9070"/>
+        <specific id="2" description="L 9072"/>
+        <specific id="3" description="L 9074"/>
+      </subcategory>
+      <subcategory id="5" description="CDIC class (LCT)">
+        <specific id="1" description="L 9061"/>
+        <specific id="2" description="L 9062"/>
+      </subcategory>
+      <subcategory id="6" description="Transport landing ship">
+        <specific id="1" description="L 9090 Gapeau"/>
+      </subcategory>
+    </category>
+    <category id="13" description="Cruiser/Helicopter Carrier">
+      <subcategory id="1" description="Jeanne D'Arc Class (Helo CV)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="BH2 class (Batiments Hydrographiques De 2E class) (oceanographic &amp; survey)">
+        <specific id="1" description="A 791 Laperouse"/>
+        <specific id="2" description="A 792 Borda"/>
+        <specific id="3" description="A 793 Laplace"/>
+        <specific id="4" description="A 795 Arago"/>
+      </subcategory>
+      <subcategory id="2" description="Durance class (underway replenishment tankers)">
+        <specific id="1" description="A 607 Meuse"/>
+        <specific id="2" description="A 608 Var"/>
+        <specific id="3" description="A 629 Durance"/>
+        <specific id="4" description="A 630 Marne"/>
+        <specific id="5" description="A 631 Somme"/>
+      </subcategory>
+      <subcategory id="3" description="Maintenance and repair ship">
+        <specific id="1" description="A 620 Jules Verne (ex-Acheron)"/>
+      </subcategory>
+      <subcategory id="4" description="Rhin class (depot and support ships)">
+        <specific id="1" description="A 615 Loire"/>
+        <specific id="2" description="A 617 Garonne"/>
+        <specific id="3" description="A 618 Rance"/>
+        <specific id="4" description="A 621 Rhin"/>
+        <specific id="5" description="A 622 Rhone"/>
+      </subcategory>
+      <subcategory id="5" description="Chamois class (supply tenders)">
+        <specific id="1" description="A 633 Taape"/>
+        <specific id="2" description="A 767 Chamois"/>
+        <specific id="3" description="A 768 Elan"/>
+        <specific id="4" description="A 774 Chevreuil"/>
+        <specific id="5" description="A 775 Gazelle"/>
+        <specific id="6" description="A 776 Isard"/>
+        <specific id="7" description="A 779 Tapatai (ex-Silver Fish)"/>
+      </subcategory>
+      <subcategory id="6" description="RR 4000 type (supply tenders)">
+        <specific id="1" description="A 634 Rari"/>
+        <specific id="2" description="A 635 Revi"/>
+      </subcategory>
+      <subcategory id="7" description="Leopard class (training ships)">
+        <specific id="1" description="A 748 Leopard"/>
+        <specific id="2" description="A 749 Panthere"/>
+        <specific id="3" description="A 750 Jaguar"/>
+        <specific id="4" description="A 751 Lynx"/>
+        <specific id="5" description="A 752 Guepard"/>
+        <specific id="6" description="A 753 Chacal"/>
+        <specific id="7" description="A 754 Tigre"/>
+        <specific id="8" description="A 755 Lion"/>
+      </subcategory>
+    </category>
+    <category id="17" description="Auxiliary, Merchant Marine">
+      <subcategory id="1" description="Government Maritime Forces">
+        <specific id="1" description="Patra Class (fast patrol craft)">
+          <extra id="1" description="P 670 Trident"/>
+          <extra id="2" description="P 671 Glaive"/>
+          <extra id="3" description="P 672 Epee"/>
+          <extra id="4" description="P 673 Pertuisane"/>
+        </specific>
+      </subcategory>
+      <subcategory id="2" description="Harbour tugs (Remorqueurs De Port)">
+        <specific id="1" description="105-ton type">
+          <extra id="1" description="Y 601 Acajou"/>
+          <extra id="2" description="Y 620 Chataigner"/>
+          <extra id="3" description="Y 623 Charme"/>
+          <extra id="4" description="Y 624 Chene"/>
+          <extra id="5" description="Y 629 Cormier"/>
+          <extra id="6" description="Y 644 Frene"/>
+          <extra id="7" description="Y 654 Hetre"/>
+          <extra id="8" description="Y 655 Hevea"/>
+          <extra id="9" description="Y 663 Latanier"/>
+          <extra id="10" description="Y 666 Manguier"/>
+          <extra id="11" description="Y 668 Meleze"/>
+          <extra id="12" description="Y 669 Merisier"/>
+          <extra id="13" description="Y 686 Paletuvier"/>
+          <extra id="14" description="Y 688 Peuplier"/>
+          <extra id="15" description="Y 689 Pin"/>
+          <extra id="16" description="Y 695 Platane"/>
+          <extra id="17" description="Y 708 Saule"/>
+          <extra id="18" description="Y 709 Sycomore"/>
+          <extra id="19" description="Y 717 Ebene"/>
+          <extra id="20" description="Y 718 Erable"/>
+          <extra id="21" description="Y 719 Olivier"/>
+          <extra id="22" description="Y 720 Santal"/>
+          <extra id="23" description="Y 738 Maronnier"/>
+          <extra id="24" description="Y 739 Noyer"/>
+          <extra id="25" description="Y 740 Papayer"/>
+        </specific>
+        <specific id="2" description="93-ton type">
+          <extra id="1" description="Y 630 Bonite"/>
+          <extra id="2" description="Y 634 Rouget"/>
+        </specific>
+        <specific id="3" description="65-ton type">
+          <extra id="1" description="Y 611 Bengali"/>
+          <extra id="2" description="Y 617 Mouette"/>
+          <extra id="3" description="Y 621 Mesange"/>
+          <extra id="4" description="Y 625 Cigogne"/>
+          <extra id="5" description="Y 628 Colibri"/>
+          <extra id="6" description="Y 632 Cygne"/>
+          <extra id="7" description="Y 636 Martinet"/>
+          <extra id="8" description="Y 637 Fauvette"/>
+          <extra id="9" description="Y 648 Goeland"/>
+          <extra id="10" description="Y 670 Merle"/>
+          <extra id="11" description="Y 673 Moineau"/>
+          <extra id="12" description="Y 675 Martin Pecheur"/>
+          <extra id="13" description="Y 687 Passereau"/>
+          <extra id="14" description="Y 691 Pinson"/>
+          <extra id="15" description="Y 694 Pivert"/>
+          <extra id="16" description="Y 721 Alouette"/>
+          <extra id="17" description="Y 722 Vanneau"/>
+          <extra id="18" description="Y 723 Engoulevent"/>
+          <extra id="19" description="Y 724 Sarcelle"/>
+          <extra id="20" description="Y 725 Marabout"/>
+          <extra id="21" description="Y 726 Toucan"/>
+          <extra id="22" description="Y 727 Macreuse"/>
+          <extra id="23" description="Y 728 Grand Duc"/>
+          <extra id="24" description="Y 729 Eider"/>
+          <extra id="25" description="Y 730 Ara"/>
+          <extra id="26" description="Y 747 Loriot"/>
+          <extra id="27" description="Y 748 Gelinotte"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate">
+      <subcategory id="1" description="D'estienne D'orves (Type A 69) class">
+        <specific id="1" description="F 781 D'estienne D'orves"/>
+        <specific id="2" description="F 782 Amyot d'inville"/>
+        <specific id="3" description="F 783 Drogou"/>
+        <specific id="4" description="F 784 Detroyat"/>
+        <specific id="5" description="F 785 Jean Moulin"/>
+        <specific id="6" description="F 786 Quartier Maitre Anquetil"/>
+        <specific id="7" description="F 787 Commandant de Pimodan"/>
+        <specific id="8" description="F 788 Second Maitre Le Bihan"/>
+        <specific id="9" description="F 789 Lieutenant De Vaisseau Le Henaff"/>
+        <specific id="10" description="F 790 Lieutenant De Vaisseau Lavallee"/>
+        <specific id="11" description="F 791 Commandant L'herminier"/>
+        <specific id="12" description="F 792 Premier Maitre L'her"/>
+        <specific id="13" description="F 793 Commandant Blaison"/>
+        <specific id="14" description="F 794 Enseigne De Vaisseau Jacoubet"/>
+        <specific id="15" description="F 795 Commandant Ducuing"/>
+        <specific id="16" description="F 796 Commandant Birot"/>
+        <specific id="17" description="F 797 Commandant Bouan"/>
+      </subcategory>
+      <subcategory id="2" description="Commandant Riviere class (Avisos Escorteurs)">
+        <specific id="1" description="F 726 Commandant Bory"/>
+        <specific id="2" description="F 729 Balny"/>
+        <specific id="3" description="F 749 Enseigne de Vaisseau Henry"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Descrates"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker class">
+        <specific id="1" description="Athos"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="71">
+    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
+      <subcategory id="1" description="Le Triomphant class (SNLE-NG)">
+        <specific id="1" description="S 616 Le triomphant"/>
+        <specific id="2" description="S 617 Le temeraire"/>
+        <specific id="3" description="S 618"/>
+      </subcategory>
+    </category>
+    <category id="2" description="SSGN (Nuclear Guided Missile)">
+      <subcategory id="1" description="L'inflexible class (SNLE)">
+        <specific id="1" description="S 610 Le foudroyant"/>
+        <specific id="2" description="S 612 Le terrible"/>
+        <specific id="3" description="S 613 L'indomptable"/>
+        <specific id="4" description="S 614 Le tonnant"/>
+        <specific id="5" description="S 615 L'inflexible"/>
+      </subcategory>
+    </category>
+    <category id="3" description="SSN (Nuclear Attack Ballistic Missile) (Sous-Marins Nucleaires D'attaque (SNA))">
+      <subcategory id="1" description="Rubis Class (SNA 72)">
+        <specific id="1" description="S 601 Rubis"/>
+        <specific id="2" description="S 602 Saphir"/>
+        <specific id="3" description="S 603 Casabianca"/>
+        <specific id="4" description="S 604 Emeraude"/>
+        <specific id="5" description="S 605 Amethyste"/>
+        <specific id="6" description="S 606 Perle"/>
+        <specific id="7" description="S 607 Turquoise"/>
+      </subcategory>
+    </category>
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol) (Sous-Marins D'attaque)">
+      <subcategory id="1" description="Agosta Class">
+        <specific id="1" description="S 620 Agosta"/>
+        <specific id="2" description="S 621 Beveziers"/>
+        <specific id="3" description="S 622 La praya"/>
+        <specific id="4" description="S 623 Ouessant"/>
+      </subcategory>
+      <subcategory id="2" description="Daphne Class">
+        <specific id="1" description="S 643 Doris"/>
+        <specific id="2" description="S 648 Jun"/>
+        <specific id="3" description="S 650 Psyche"/>
+        <specific id="4" description="S 651 Sirene"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="71">
+    <category id="0" description="Other"/>
+    <category id="1" description="Manned">
+      <subcategory id="6" description="Space Plane">
+        <specific id="1" description="Hermes"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Unmanned">
+      <subcategory id="1" description="Communication satellite">
+        <specific id="1" description="Telecom"/>
+        <specific id="2" description="Hispasat"/>
+        <specific id="3" description="Eutelsat"/>
+        <specific id="4" description="Turksat"/>
+        <specific id="6" description="Argos"/>
+        <specific id="7" description="S80/T"/>
+        <specific id="8" description="Arsene"/>
+        <specific id="9" description="Syracuse"/>
+      </subcategory>
+      <subcategory id="2" description="Navigation satellite"/>
+      <subcategory id="4" description="Electronic Intelligence satellite">
+        <specific id="1" description="Cerise"/>
+      </subcategory>
+      <subcategory id="7" description="Imaging Radar surveillance satellite">
+        <specific id="1" description="Helios"/>
+        <specific id="2" description="Osiris SAR"/>
+      </subcategory>
+      <subcategory id="8" description="Optical imaging surveillance satellite">
+        <specific id="1" description="Syracuse 3"/>
+      </subcategory>
+      <subcategory id="13" description="Science satellite">
+        <specific id="1" description="Hipparcos"/>
+        <specific id="2" description="Titan"/>
+        <specific id="3" description="Topex/Poseidon"/>
+        <specific id="4" description="Starlette"/>
+        <specific id="5" description="SRAT 2"/>
+      </subcategory>
+      <subcategory id="14" description="Survey satellite">
+        <specific id="1" description="Stella"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Booster">
+      <subcategory id="1" description="Ariane"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="78">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="Leopard 1 MBT">
+        <specific id="1" description="A1"/>
+        <specific id="2" description="A2"/>
+        <specific id="3" description="A3"/>
+        <specific id="4" description="A4"/>
+        <specific id="5" description="A5"/>
+      </subcategory>
+      <subcategory id="2" description="Leopard 2 MBT"/>
+      <subcategory id="3" description="Leopard 2 (improved) MBT">
+        <specific id="1" description="(S) Stridsfordon 122"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Armored Fighting Vehicle">
+      <subcategory id="1" description="Marder 1 A3"/>
+      <subcategory id="2" description="Marder 2"/>
+      <subcategory id="3" description="BMP 1"/>
+      <subcategory id="4" description="Jaguar 1 tank destroyer, missile"/>
+      <subcategory id="5" description="Jaguar 2"/>
+      <subcategory id="6" description="Luchs armored reconnaissance vehicle"/>
+      <subcategory id="7" description="Zobel armored reconnaissance vehicle"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="Wiesel">
+        <specific id="1" description="Wiesel with 20mm"/>
+        <specific id="2" description="Wiesel with TOW"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Armored Utility Vehicle">
+      <subcategory id="1" description="Biber armored bridge layer"/>
+      <subcategory id="2" description="Dachs armored engineer tank"/>
+      <subcategory id="3" description="Keiler armored minesweeper"/>
+      <subcategory id="4" description="Skorpion armored minelayer"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="M113 armored motor-ambulance"/>
+      <subcategory id="7" description="M113 armored artillery observer"/>
+      <subcategory id="8" description="Transportpanzer 1 &quot;Fuchs&quot;"/>
+      <subcategory id="9" description="Buffel ARV"/>
+    </category>
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="Panzerhaubitze 2000"/>
+    </category>
+    <category id="5" description="Towed Artillery">
+      <subcategory id="1" description="(deleted)"/>
+    </category>
+    <category id="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)">
+      <subcategory id="1" description="Mercedez Benz (240 GD)"/>
+    </category>
+    <category id="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)">
+      <subcategory id="1" description="IVECO Magirus 110-16 AWM (4x4) 5000kg truck (aka 168M11FAL)"/>
+      <subcategory id="2" description="MAN 5 ton"/>
+      <subcategory id="3" description="MAN 7 ton"/>
+      <subcategory id="4" description="MAN 10 ton"/>
+    </category>
+    <category id="10" description="Mortar">
+      <subcategory id="1" description="M113 armored mortar"/>
+    </category>
+    <category id="11" description="Mine plow"/>
+    <category id="12" description="Mine rake"/>
+    <category id="13" description="Mine roller"/>
+    <category id="14" description="Cargo trailer">
+      <subcategory id="1" description="0 - 0.5 ton"/>
+      <subcategory id="2" description="0.51 - 2 ton"/>
+      <subcategory id="3" description="2.01 - 5 ton"/>
+      <subcategory id="4" description="5.02 - 10 ton"/>
+      <subcategory id="5" description="greater than 10 tons"/>
+    </category>
+    <category id="15" description="Fuel trailer">
+      <subcategory id="1" description="1-1000 gallons"/>
+      <subcategory id="2" description="1001 - 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="16" description="Generator trailer">
+      <subcategory id="1" description="0 - 100 KW"/>
+      <subcategory id="2" description="greater than 100 KW"/>
+    </category>
+    <category id="17" description="Water trailer">
+      <subcategory id="1" description="1-1000 gallons"/>
+      <subcategory id="2" description="1001- 5000 gallons"/>
+      <subcategory id="3" description="greater than 5000 gallons"/>
+    </category>
+    <category id="18" description="Engineer equipment">
+      <subcategory id="1" description="Mine clearing line charge"/>
+      <subcategory id="2" description="Dozer blade kit"/>
+      <subcategory id="3" description="Lane marking system"/>
+    </category>
+    <category id="19" description="Heavy equipment transport trailer"/>
+    <category id="20" description="Maintenance equipment trailer">
+      <subcategory id="1" description="Welding trailer"/>
+      <subcategory id="2" description="Compressor"/>
+      <subcategory id="3" description="Tools/parts trailer"/>
+    </category>
+    <category id="21" description="Limber"/>
+    <category id="22" description="Chemical decontamination trailer"/>
+    <category id="27" description="Civilian Vehicle">
+      <subcategory id="1" description="Truck"/>
+      <subcategory id="2" description="Bus"/>
+      <subcategory id="3" description="Car"/>
+    </category>
+    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
+      <subcategory id="1" description="Self-Propelled VSHORAD Gun/Missile System">
+        <specific id="1" description="Roland AD System missile"/>
+        <specific id="2" description="Gepard armored AD gun"/>
+      </subcategory>
+      <subcategory id="2" description="Towed VSHORAD Gun / Missile System">
+        <specific id="1" description="Rheinmetal 20mm twin Rh202"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="78">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="EFM (Enhanced Fighter Maneuverability) X-31A"/>
+    </category>
+    <category id="2" description="Attack/Strike">
+      <subcategory id="1" description="Dassault/Dornier Alpha Jet">
+        <specific id="1" description="Alpha Jet E trainer/attack"/>
+        <specific id="2" description="Alpha Jet MS1"/>
+        <specific id="3" description="Alpha Jet A"/>
+        <specific id="4" description="Alpha Jet MS2"/>
+        <specific id="5" description="Alpha Jet 2"/>
+      </subcategory>
+      <subcategory id="2" description="Panavia Tornado IDS">
+        <specific id="1" description="Tornado IDS GR. Mk 1"/>
+        <specific id="2" description="Tornado IDS GR. 1A"/>
+        <specific id="3" description="Tornado IDS GR. 4"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Electronic Warfare (EW)">
+      <subcategory id="1" description="Panavia Tornado ECR"/>
+    </category>
+    <category id="8" description="Surveillance/C2">
+      <subcategory id="1" description="Transall C-160">
+        <specific id="1" description="C-160S. Maritime"/>
+        <specific id="2" description="C-160SE. Electronic"/>
+        <specific id="3" description="C-160AAA AEW"/>
+      </subcategory>
+      <subcategory id="2" description="Egrett II">
+        <specific id="1" description="Strato 1"/>
+      </subcategory>
+    </category>
+    <category id="20" description="Attack Helicopter">
+      <subcategory id="1" description="Eurocopter BO 105/PAH-1/VBH/BSH-1">
+        <specific id="1" description="PAH-1"/>
+        <specific id="2" description="PAH-1A1"/>
+        <specific id="3" description="BSH"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="Hkp 9"/>
+      </subcategory>
+      <subcategory id="2" description="Eurocopter Tigre">
+        <specific id="1" description="PAH-2"/>
+        <specific id="2" description="HAC"/>
+        <specific id="3" description="HAP"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Utility Helicopter">
+      <subcategory id="1" description="NH 90">
+        <specific id="1" description="TTH 90 medium helicopter"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="Eurocopter BO 105">
+        <specific id="1" description="BO 105CB"/>
+        <specific id="2" description="BO 105CBS"/>
+      </subcategory>
+      <subcategory id="7" description="Eurocopter/Kawasaki BK 117">
+        <specific id="1" description="BK 117 M"/>
+        <specific id="2" description="NBK-117"/>
+      </subcategory>
+    </category>
+    <category id="22" description="Antisubmarine Warfare / Patrol Helicopter">
+      <subcategory id="1" description="NH 90"/>
+      <subcategory id="2" description="NFH 90"/>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Dassault/Dornier Alpha Jet">
+        <specific id="1" description="Alpha Jet E"/>
+        <specific id="2" description="Alpha Jet 3"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="78">
+    <category id="4" description="Guided Missile Destroyer">
+      <subcategory id="1" description="Ex-US Modified Charles F. Adams class (type 103B) (DDGs)">
+        <specific id="1" description="D 185 Lutjens (ex-US DDG 28)"/>
+        <specific id="2" description="D 186 Molders (ex-US DDG 29)"/>
+        <specific id="3" description="D 187 Rommel (ex-US DDG 30)"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Destroyer">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Hamburg class (Type 101A)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="D 182 Schleswig-Hostein"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided Missile Frigate">
+      <subcategory id="1" description="Brandenburg class (Type 123)">
+        <specific id="1" description="F 215 Brandenburg"/>
+        <specific id="2" description="F 216 Schleswig-Holstein"/>
+        <specific id="3" description="F 217 Bayern"/>
+        <specific id="4" description="F 218 Mecklenburg-Vorpommern"/>
+      </subcategory>
+      <subcategory id="2" description="Bremen class (Type 122)">
+        <specific id="1" description="F 207 Bremen"/>
+        <specific id="2" description="F 208 Niedersachsen"/>
+        <specific id="3" description="F 209 Rheinland-Pfalz"/>
+        <specific id="4" description="F 210 Emden"/>
+        <specific id="5" description="F 211 Koln"/>
+        <specific id="6" description="F 212 Karlsruhe"/>
+        <specific id="7" description="F 213 Augsburg"/>
+        <specific id="8" description="F 214 Lubeck"/>
+      </subcategory>
+      <subcategory id="3" description="Sachsen Class (Type 124) (FFG)">
+        <specific id="1" description="F219 Sachsen"/>
+        <specific id="2" description="F220 Hamburg"/>
+        <specific id="3" description="F221 Hessen"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/patrol craft">
+      <subcategory id="1" description="Gepard class (type 143 A) (fast attack craft, missile)">
+        <specific id="1" description="P 6121 Gepard"/>
+        <specific id="2" description="P 6122 Puma"/>
+        <specific id="3" description="P 6123 Hermelin"/>
+        <specific id="4" description="P 6124 Nerz"/>
+        <specific id="5" description="P 6125 Zobel"/>
+        <specific id="6" description="P 6126 Frettechen"/>
+        <specific id="7" description="P 6127 Dachs"/>
+        <specific id="8" description="P 6128 Ozelot"/>
+        <specific id="9" description="P 6129 Wiesel"/>
+        <specific id="10" description="P 6130 Hyane"/>
+      </subcategory>
+      <subcategory id="2" description="Albatros class (type 143/143B) (fast attack craft, missile)">
+        <specific id="1" description="P 6111 Albatros"/>
+        <specific id="2" description="P 6122 Falke"/>
+        <specific id="3" description="P 6113 Geier"/>
+        <specific id="4" description="P 6114 Bussard"/>
+        <specific id="5" description="P 6115 Sperber"/>
+        <specific id="6" description="P 6116 Greif"/>
+        <specific id="7" description="P 6117 Kondor"/>
+        <specific id="8" description="P 6118 Seeadler"/>
+        <specific id="9" description="P 6119 Habicht"/>
+        <specific id="10" description="P 6120 Kormoran"/>
+      </subcategory>
+      <subcategory id="3" description="Tiger class (type 148) (fast attack craft, missile)">
+        <specific id="1" description="P 6141 Tiger"/>
+        <specific id="2" description="P 6142 Iltis"/>
+        <specific id="3" description="P 6143 Luchs"/>
+        <specific id="4" description="P 6144 Marder"/>
+        <specific id="5" description="P 6145 Leopard"/>
+        <specific id="6" description="P 6146 Fuchs"/>
+        <specific id="7" description="P 6147 Jaguar"/>
+        <specific id="8" description="P 6148 Lowe"/>
+        <specific id="9" description="P 6149 Wolf"/>
+        <specific id="10" description="P 6150 Panther"/>
+        <specific id="11" description="P 6151 Haher"/>
+        <specific id="12" description="P 6152 Storch"/>
+        <specific id="13" description="P 6153 Pelikan"/>
+        <specific id="14" description="P 6154 Elster"/>
+        <specific id="15" description="P 6155 Alk"/>
+        <specific id="16" description="P 6156 Dommel"/>
+        <specific id="17" description="P 6157 Weihe"/>
+        <specific id="18" description="P 6158 Pinguin"/>
+        <specific id="19" description="P 6159 Reiher"/>
+        <specific id="20" description="P 6160 Kranich"/>
+      </subcategory>
+      <subcategory id="4" description="Bredstedt class (large patrol craft, Coast Guard vessels)">
+        <specific id="1" description="BG 21 Bredstedt"/>
+      </subcategory>
+      <subcategory id="5" description="Sassnitz class (Coast Guard vessels)">
+        <specific id="1" description="Sassnitz (ex-P 6165, ex-591)"/>
+        <specific id="2" description="Sellin (ex-592)"/>
+        <specific id="3" description="Binz (ex-593)"/>
+      </subcategory>
+      <subcategory id="6" description="Neustadt class (large patrol craft, Coast Guard vessels)">
+        <specific id="1" description="BG 11 Neustadt"/>
+        <specific id="2" description="BG 12 Bad Bramstedt"/>
+        <specific id="3" description="BG 14 Duderstadt"/>
+        <specific id="4" description="BG 15 Eschwege"/>
+        <specific id="5" description="BG 16 Alsfeld"/>
+        <specific id="6" description="BG 17 Bayreuth"/>
+        <specific id="7" description="BG 18 Rosenheim"/>
+      </subcategory>
+      <subcategory id="7" description="Bremse class (harbor patrol craft, Coast Guard vessels)">
+        <specific id="1" description="GS 23"/>
+        <specific id="2" description="GS 30"/>
+        <specific id="3" description="GS 31"/>
+        <specific id="4" description="GS 32"/>
+        <specific id="5" description="GS 40"/>
+        <specific id="6" description="GS 41"/>
+        <specific id="7" description="GS 42"/>
+        <specific id="8" description="GS 51"/>
+        <specific id="9" description="GS 52"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship / Craft">
+      <subcategory id="1" description="Schutze class (type 340-341, minesweepers, coastal)">
+        <specific id="1" description="M 1059 Spica"/>
+        <specific id="2" description="M 1062 Schutze"/>
+        <specific id="3" description="M 1063 Waage"/>
+      </subcategory>
+      <subcategory id="2" description="Lindau class (coastal minesweepers and minehunters: type 331, minehunters; and type 351, Troika)">
+        <specific id="1" description="M 1070 Gottingen"/>
+        <specific id="2" description="M 1071 Koblenz"/>
+        <specific id="3" description="M 1072 Lindau"/>
+        <specific id="4" description="M 1073 Schleswig"/>
+        <specific id="5" description="M 1074 Tubingen"/>
+        <specific id="6" description="M 1075 Wetzlar"/>
+        <specific id="7" description="M 1076 Paderborn"/>
+        <specific id="8" description="M 1077 Weilheim"/>
+        <specific id="9" description="M 1078 Cuxhaven"/>
+        <specific id="10" description="M 1079 Duren"/>
+        <specific id="11" description="M 1080 Marburg"/>
+        <specific id="12" description="M 1081 Konstanz"/>
+        <specific id="13" description="M 1082 Wolfsburg"/>
+        <specific id="14" description="M 1083 Ulm"/>
+        <specific id="15" description="M 1085 Minden"/>
+      </subcategory>
+      <subcategory id="3" description="Kondor II class (minesweeper, coastal)">
+        <specific id="1" description="M2670 Sommerda (ex-311)"/>
+      </subcategory>
+      <subcategory id="4" description="Frauenlob class (type 394 minesweepers, inshore)">
+        <specific id="1" description="M 2658 Frauenlob"/>
+        <specific id="2" description="M 2659 Nautilus"/>
+        <specific id="3" description="M 2660 Gefion"/>
+        <specific id="4" description="M 2661 Medusa"/>
+        <specific id="5" description="M 2662 Undine"/>
+        <specific id="6" description="M 2663 Minerva"/>
+        <specific id="7" description="M 2664 Diana"/>
+        <specific id="8" description="M 2665 Loreley"/>
+        <specific id="9" description="M 2666 Atlantis"/>
+        <specific id="10" description="M 2667"/>
+      </subcategory>
+      <subcategory id="5" description="Ariadne Class (Type 393 minesweepers, inshore)">
+        <specific id="1" description="M 2651 Freya"/>
+        <specific id="2" description="M 2653 Hertha"/>
+        <specific id="3" description="M 2654 Nymphe"/>
+        <specific id="4" description="M 2655 Hertha"/>
+      </subcategory>
+      <subcategory id="6" description="Frankenthal class (type 332 minehunters, coastal)">
+        <specific id="1" description="M 1060 Weiden"/>
+        <specific id="2" description="M 1061 Rottweil"/>
+        <specific id="3" description="M 1062 Sulzbach-Rosenberg"/>
+        <specific id="4" description="M 1063 Bad Bevensen"/>
+        <specific id="5" description="M 1064 Gromitz"/>
+        <specific id="6" description="M 1065 Dillingen"/>
+        <specific id="7" description="M 1066 Frankenthal"/>
+        <specific id="8" description="M 1067 Bad Rappenau"/>
+        <specific id="9" description="M 1068 Datteln"/>
+        <specific id="10" description="M 1069 Homburg"/>
+      </subcategory>
+      <subcategory id="7" description="Hameln class (type 343 minesweepers, coastal)">
+        <specific id="1" description="M 1090 Pegnitz"/>
+        <specific id="2" description="M 1091 Kulmbach"/>
+        <specific id="3" description="M 1092 Hameln"/>
+        <specific id="4" description="M 1093 Auerbach"/>
+        <specific id="5" description="M 1094 Ensdorf"/>
+        <specific id="6" description="M 1095 Uberherrn"/>
+        <specific id="7" description="M 1096 Passau"/>
+        <specific id="8" description="M 1097 Laboe"/>
+        <specific id="9" description="M 1098 Siegburg"/>
+        <specific id="10" description="M 1099 Herten"/>
+      </subcategory>
+      <subcategory id="8" description="Trials ship (type 740, ex-minesweeper)">
+        <specific id="1" description="A 1400 Holnis (ex-A 836)"/>
+      </subcategory>
+      <subcategory id="9" description="Schutze class (type 732, diver-support ship)">
+        <specific id="1" description="M 1053 Stier (ex-Y 849)"/>
+      </subcategory>
+      <subcategory id="10" description="Sachsenwald class (type 762, mine transport)">
+        <specific id="1" description="A 1438 Steigerwald"/>
+      </subcategory>
+      <subcategory id="11" description="Kondor I class (minesweeper/patrol craft; Coast Guard vessels)">
+        <specific id="1" description="BG 31 Templin (ex-GS 06, ex-G 442)"/>
+        <specific id="2" description="BG 32 Kuhlungsborn (ex-GS 07, ex-G 445)"/>
+        <specific id="3" description="BG 33 Ahrenshoop (ex-GS 08, ex-G 415)"/>
+        <specific id="4" description="GS 01 Uckermunde (ex-G 411)"/>
+        <specific id="5" description="GS 02 Demmin (ex-G 422)"/>
+        <specific id="6" description="GS 03 Malchin (ex-G 441)"/>
+        <specific id="7" description="GS 04 Altentreptow (ex-G 414)"/>
+        <specific id="8" description="GS 05 Pasewalk (ex-G 423)"/>
+        <specific id="9" description="GS 09 Boltenhagen (ex-G 443)"/>
+      </subcategory>
+      <subcategory id="12" description="Seehund (Minesweepers - Drones)(MSD)"/>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="Type 521 (LCMs)">
+        <specific id="1" description="LCM 12 Sprotte"/>
+        <specific id="2" description="LCM 13 Sardine"/>
+        <specific id="3" description="LCM 14 Sardelle"/>
+        <specific id="4" description="LCM 15 Hering"/>
+        <specific id="5" description="LCM 16 Orfe"/>
+        <specific id="6" description="LCM 17 Marane"/>
+        <specific id="7" description="LCM 18 Saibling"/>
+        <specific id="8" description="LCM 19 Stint"/>
+        <specific id="9" description="LCM 20 Aesche"/>
+        <specific id="10" description="L 780 Hummer"/>
+        <specific id="11" description="L 781 Krill"/>
+        <specific id="12" description="L 782 Krabbe"/>
+        <specific id="13" description="L 783 Auster"/>
+        <specific id="14" description="L 784 Muschel"/>
+        <specific id="15" description="L 785 Koralle"/>
+        <specific id="16" description="L 786 Garnele"/>
+        <specific id="17" description="L 787 Languste"/>
+      </subcategory>
+      <subcategory id="2" description="Type 520 (LCUs)">
+        <specific id="1" description="L 760 Flunder"/>
+        <specific id="2" description="L 761 Karpfen"/>
+        <specific id="3" description="L 762 Lachs"/>
+        <specific id="4" description="L 763 Plotze"/>
+        <specific id="5" description="L 766 Stor"/>
+        <specific id="6" description="L 767 Tummler"/>
+        <specific id="7" description="L 768 Wels"/>
+        <specific id="8" description="L 769 Zander"/>
+        <specific id="9" description="L 788 Butt"/>
+        <specific id="10" description="L 795 Inger"/>
+      </subcategory>
+      <subcategory id="3" description="Mannheim 59 class (river landing craft, LCMs)"/>
+      <subcategory id="4" description="Bodan class (river landing craft, LCMs)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Elbe class (type 404, tenders)">
+        <specific id="1" description="A 511 Elbe"/>
+        <specific id="2" description="A 512 Mosel"/>
+        <specific id="3" description="A 513 Rhein"/>
+        <specific id="4" description="A 514 Werra"/>
+        <specific id="5" description="A 515 Main"/>
+        <specific id="6" description="A 516 Donau"/>
+      </subcategory>
+      <subcategory id="2" description="Rhein class (type 401, tenders)">
+        <specific id="1" description="A 58 Rhein"/>
+        <specific id="2" description="A 61 Elbe"/>
+        <specific id="3" description="A 63 Main"/>
+        <specific id="4" description="A 69 Donau"/>
+      </subcategory>
+      <subcategory id="3" description="Replenishment tankers (type 704)">
+        <specific id="1" description="A 1442 Spessart (ex-Okapi)"/>
+        <specific id="2" description="A 1443 Rhon (ex-Okene)"/>
+      </subcategory>
+      <subcategory id="4" description="Walchensee class (type 703, replenishment tankers)">
+        <specific id="1" description="A 1424 Walchensee"/>
+        <specific id="2" description="A 1425 Ammersee"/>
+        <specific id="3" description="A 1426 Tegernsee"/>
+        <specific id="4" description="A 1427 Westensee"/>
+      </subcategory>
+      <subcategory id="5" description="Type 763 (support tanker)">
+        <specific id="1" description="A 1407 Wittensee (ex-Sioux)"/>
+      </subcategory>
+      <subcategory id="6" description="Luneburg class (type 701, support ships)">
+        <specific id="1" description="A 1411 Luneburg"/>
+        <specific id="2" description="A 1413 Freiburg"/>
+        <specific id="3" description="A 1414 Glucksburg"/>
+        <specific id="4" description="A 1415 Saarburg"/>
+        <specific id="5" description="A 1416 Nienburg"/>
+        <specific id="6" description="A 1417 Offenburg"/>
+        <specific id="7" description="A 1418 Meersburg"/>
+      </subcategory>
+      <subcategory id="7" description="Westerwald class (type 760, ammunition, transports)">
+        <specific id="1" description="A 1435 Westerwald"/>
+        <specific id="2" description="A 1436 Odenwald"/>
+      </subcategory>
+      <subcategory id="8" description="Towing launches (type 946)">
+        <specific id="1" description="AK 1 Y 1671"/>
+        <specific id="2" description="AK 3 Y 1672"/>
+        <specific id="3" description="MA 2 Y 1676"/>
+        <specific id="4" description="MA 3 Y 1677"/>
+        <specific id="5" description="Borby Y 1687"/>
+      </subcategory>
+      <subcategory id="9" description="Oste Class (type 423, AGI)">
+        <specific id="1" description="A 50 Alster"/>
+        <specific id="2" description="A 52 Oste"/>
+        <specific id="3" description="A 53 Oker"/>
+      </subcategory>
+      <subcategory id="10" description="Trials ship (type 742)">
+        <specific id="1" description="A 1410 Walther Von Ledebur (ex-Y 841)"/>
+      </subcategory>
+      <subcategory id="11" description="Research ship (type 750)">
+        <specific id="1" description="A 1450 Planet"/>
+      </subcategory>
+      <subcategory id="12" description="Trials ship (type 741)">
+        <specific id="1" description="A 1408 SP 1 (ex-A 837)"/>
+        <specific id="2" description="A 1409 Wilhelm Pullwer (ex-Y 838)"/>
+      </subcategory>
+      <subcategory id="13" description="Diving tender (type 732)">
+        <specific id="1" description="M 1050 TB1"/>
+      </subcategory>
+      <subcategory id="14" description="Helgoland class (type 720, salvage tugs)">
+        <specific id="1" description="A 1457 Helgoland"/>
+        <specific id="2" description="A 1458 Fehmarn"/>
+      </subcategory>
+      <subcategory id="15" description="Wangerooge class (type 722, type 754; tugs)">
+        <specific id="1" description="A 1439 Baltrum"/>
+        <specific id="2" description="A 1440 Juist"/>
+        <specific id="3" description="A 1441 Langeoog"/>
+        <specific id="4" description="A 1451 Wangerooge"/>
+        <specific id="5" description="A 1452 Spiekeroog"/>
+        <specific id="6" description="A 1455 Rderney"/>
+      </subcategory>
+      <subcategory id="16" description="Berlin Class (Type 702)(AOR)">
+        <specific id="1" description="A1411 Berlin"/>
+      </subcategory>
+    </category>
+    <category id="17" description="Auxiliary, Merchant Marine">
+      <subcategory id="1" description="Harbor tugs (type 724)">
+        <specific id="1" description="Y 820 Sylt"/>
+        <specific id="2" description="Y 821 Fohr"/>
+        <specific id="3" description="Y 822 Amrum"/>
+        <specific id="4" description="Y 823 Neuwerk"/>
+        <specific id="5" description="Y 1680 Neuende"/>
+        <specific id="6" description="Y 1681 Heppens"/>
+        <specific id="7" description="Y 1682 Ellerbek"/>
+      </subcategory>
+      <subcategory id="2" description="Harbor tugs (type 725)">
+        <specific id="1" description="Y 812 Lutjehorn"/>
+        <specific id="2" description="Y 814 Knechtsand"/>
+        <specific id="3" description="Y 815 Scharhorn"/>
+        <specific id="4" description="Y 816 Vogelsand"/>
+        <specific id="5" description="Y 817 Rdstrand"/>
+        <specific id="6" description="Y 819 Langeness"/>
+      </subcategory>
+      <subcategory id="3" description="Harbor tugs (type 414)">
+        <specific id="1" description="Koos (ex-Delphin)"/>
+        <specific id="2" description="Wustrow (ex-Zander)"/>
+        <specific id="3" description="Drankse (ex-Kormoran)"/>
+        <specific id="4" description="Y 1651 (ex-A 08)"/>
+        <specific id="5" description="Y 1656 (ex-A 45)"/>
+        <specific id="6" description="Y 1658 (ex-A 68)"/>
+      </subcategory>
+      <subcategory id="4" description="Icebreaking tug (type 724; Coast Guard vessels)">
+        <specific id="1" description="BG 5 Rettin"/>
+      </subcategory>
+    </category>
+    <category id="18" description="Utility">
+      <subcategory id="1" description="Gustav Konigs class (harbor tankers)">
+        <specific id="1" description="Y 1652 Kolpinsee (ex-C 11)"/>
+        <specific id="2" description="Y 1657 Fleesensee (ex-C 40)"/>
+      </subcategory>
+      <subcategory id="2" description="Ohre class (accommodation ships)">
+        <specific id="1" description="Y 890 Vogtland (ex-H 71)"/>
+        <specific id="2" description="Y 891 Altmark (ex-H 11)"/>
+        <specific id="3" description="Y 892 Havelland (ex-H 51)"/>
+        <specific id="4" description="Y 893 Uckermark (ex-H 91)"/>
+        <specific id="5" description="Y 894 Borde (ex-H 72)"/>
+        <specific id="6" description="Y 895 Wische (ex-H 31)"/>
+      </subcategory>
+      <subcategory id="3" description="Type 705 (water boats)">
+        <specific id="1" description="FW 1 A 1403 (ex-Y 864)"/>
+        <specific id="2" description="FW 5 A 1405 (ex-Y 868)"/>
+      </subcategory>
+      <subcategory id="4" description="Knurrhahn Class (type 730, accommodation ship)">
+        <specific id="1" description="Y 811 Knurrhahn"/>
+      </subcategory>
+      <subcategory id="5" description="Battery-charging craft (type 718)">
+        <specific id="1" description="LP 1"/>
+        <specific id="2" description="LP 2"/>
+        <specific id="3" description="Y 1690 LP 3"/>
+      </subcategory>
+      <subcategory id="6" description="Schwedeneck class (type 748, multipurpose)">
+        <specific id="1" description="Y 860 Schwedeneck"/>
+        <specific id="2" description="Y 861 Kronsort"/>
+        <specific id="3" description="Y 862 Helmsand"/>
+      </subcategory>
+      <subcategory id="7" description="Stollergrund class (type 745, multipurpose)">
+        <specific id="1" description="Y 863 Stollergrund"/>
+        <specific id="2" description="Y 864 Mittelgrund"/>
+        <specific id="3" description="Y 865 Kalkgrund"/>
+        <specific id="4" description="Y 866 Breitgrund"/>
+        <specific id="5" description="Y 867 Bant"/>
+      </subcategory>
+      <subcategory id="8" description="Trials ship (type 740)">
+        <specific id="1" description="Y 871 Heinz Roggenkamp"/>
+      </subcategory>
+      <subcategory id="9" description="Floating docks (types 712-715) and cranes (type 711)">
+        <specific id="1" description="A Y 842 Schwimmdocks"/>
+        <specific id="2" description="Y 875 Hiev"/>
+        <specific id="3" description="B Y 879 Schwimmdocks"/>
+        <specific id="4" description="Y 876 Griep"/>
+        <specific id="5" description="c, 2 and 3"/>
+      </subcategory>
+      <subcategory id="10" description="Tank cleaning vessels (type 710)">
+        <specific id="1" description="Y 1641 Forde"/>
+        <specific id="2" description="Y 1642 Jade"/>
+      </subcategory>
+      <subcategory id="11" description="Trial boat (type 740)">
+        <specific id="1" description="Y 1689 Bums"/>
+      </subcategory>
+      <subcategory id="12" description="General service launches (types 740, 743, 744, 744a)">
+        <specific id="1" description="Y 1670 MT-BOOT"/>
+        <specific id="2" description="Y 1673 AK 5"/>
+        <specific id="3" description="Y 1674 AK 6"/>
+        <specific id="4" description="Y 1675 AM 8"/>
+        <specific id="5" description="Y 1679 AM 7"/>
+        <specific id="6" description="Y 1683 AK 6"/>
+        <specific id="7" description="Y 1684 Peter Bachmann"/>
+        <specific id="8" description="Y 1686 AK 2 Y"/>
+      </subcategory>
+      <subcategory id="13" description="Range-safety craft (5 type 369, 1 type 909)">
+        <specific id="1" description="Y 827 KW 15"/>
+        <specific id="2" description="Y 830 KW 16"/>
+        <specific id="3" description="Y 845 KW 17"/>
+        <specific id="4" description="Y 832 KW 18"/>
+        <specific id="5" description="Y 846 KW 20"/>
+        <specific id="6" description="Y 857 H 11"/>
+      </subcategory>
+      <subcategory id="14" description="Twin-hull oil-recovery ships (type 738)">
+        <specific id="1" description="Y 1643 Bottsand"/>
+        <specific id="2" description="Y 1644 Eversand"/>
+      </subcategory>
+      <subcategory id="15" description="Torpedo recovery vessels (type 430A)">
+        <specific id="1" description="Y 851 TF 1"/>
+        <specific id="2" description="Y 852 TF 2"/>
+        <specific id="3" description="Y 853 TF 3"/>
+        <specific id="4" description="Y 855 TF 5"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate">
+      <subcategory id="1" description="Thetis class (type 420)">
+        <specific id="1" description="P 6053 Hermes"/>
+        <specific id="2" description="P 6055 Triton"/>
+        <specific id="3" description="P 6056 Theseus"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="78">
+    <category id="5" description="SS (Conventional attack-torpedo patrol)">
+      <subcategory id="1" description="Type 206">
+        <specific id="1" description="S 192 U 13"/>
+        <specific id="2" description="S 193 U 14"/>
+        <specific id="3" description="S 198 U 19"/>
+        <specific id="4" description="S 199 U 20"/>
+        <specific id="5" description="S 170 U 21"/>
+        <specific id="6" description="S 176 U 27"/>
+      </subcategory>
+      <subcategory id="2" description="Type 206A">
+        <specific id="1" description="S 194 U 15"/>
+        <specific id="2" description="S 195 U 16"/>
+        <specific id="3" description="S 196 U 17"/>
+        <specific id="4" description="S 197 U 18"/>
+        <specific id="5" description="S 171 U 22"/>
+        <specific id="6" description="S 172 U 23"/>
+        <specific id="7" description="S 173 U 24"/>
+        <specific id="8" description="S 174 U 25"/>
+        <specific id="9" description="S 175 U 26"/>
+        <specific id="10" description="S 177 U 28"/>
+        <specific id="11" description="S 178 U 29"/>
+        <specific id="12" description="S 179 U 30"/>
+      </subcategory>
+      <subcategory id="3" description="Type 205">
+        <specific id="1" description="S 188 U 9"/>
+        <specific id="2" description="S 189 U 10"/>
+        <specific id="3" description="S 190 U 11"/>
+        <specific id="4" description="S 191 U 12"/>
+      </subcategory>
+      <subcategory id="4" description="Type 209">
+        <specific id="1" description="1500">
+          <extra id="1" description="S44 Shishumar (India)"/>
+        </specific>
+        <specific id="2" description="1200"/>
+      </subcategory>
+      <subcategory id="5" description="Modernized Kobben class (type 207)">
+        <specific id="1" description="Sklinna (Norway)"/>
+        <specific id="2" description="Skolpen (Norway)"/>
+        <specific id="3" description="Stord (Norway)"/>
+        <specific id="4" description="Svenner (Norway)"/>
+        <specific id="5" description="Kobben (Norway)"/>
+        <specific id="6" description="Kunna (Norway)"/>
+      </subcategory>
+      <subcategory id="6" description="Type 212A">
+        <specific id="1" description="U-31"/>
+        <specific id="2" description="U-32"/>
+        <specific id="3" description="U-33"/>
+        <specific id="4" description="U-34"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="78">
+    <category id="1" description="Manned">
+      <subcategory id="1" description="Space vehicles">
+        <specific id="1" description="Hermes"/>
+        <specific id="2" description="Saenger Spaceplane"/>
+      </subcategory>
+      <subcategory id="2" description="Space Station">
+        <specific id="1" description="Columbus"/>
+      </subcategory>
+      <subcategory id="3" description="Space Lab">
+        <specific id="1" description="D1"/>
+        <specific id="2" description="D2"/>
+        <specific id="3" description="D3"/>
+        <specific id="4" description="IML 1"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Unmanned">
+      <subcategory id="1" description="Communication satellite">
+        <specific id="1" description="DFS-Kopernikus"/>
+        <specific id="2" description="Artemis"/>
+        <specific id="3" description="DRS"/>
+      </subcategory>
+      <subcategory id="5" description="Meteorology satellite">
+        <specific id="1" description="Atmos"/>
+        <specific id="2" description="Azur"/>
+        <specific id="3" description="X-SAR"/>
+        <specific id="4" description="ERS"/>
+        <specific id="5" description="POEM"/>
+      </subcategory>
+      <subcategory id="7" description="Imaging Radar Surveillance Satellite">
+        <specific id="1" description="Rosat"/>
+      </subcategory>
+      <subcategory id="13" description="Science satellite">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="Ulysses"/>
+        <specific id="3" description="Galileo"/>
+        <specific id="4" description="Soho &amp; Cluster"/>
+        <specific id="5" description="Eureca"/>
+        <specific id="6" description="Astro-SPAS"/>
+        <specific id="7" description="HST"/>
+        <specific id="8" description="Mars-94/96"/>
+        <specific id="9" description="ISO"/>
+        <specific id="10" description="Huygens/Cassini"/>
+        <specific id="11" description="Giotto"/>
+        <specific id="12" description="Hipparcos"/>
+        <specific id="13" description="Compton"/>
+        <specific id="14" description="(deleted)"/>
+        <specific id="15" description="Bremsat"/>
+      </subcategory>
+      <subcategory id="15" description="Microgravity Satellite">
+        <specific id="1" description="Spacelab"/>
+        <specific id="2" description="Eureca"/>
+        <specific id="3" description="SPAS"/>
+        <specific id="4" description="Maxus"/>
+        <specific id="5" description="Texus"/>
+        <specific id="6" description="Mikroba"/>
+        <specific id="7" description="Mir-92"/>
+        <specific id="8" description="MAUS"/>
+        <specific id="9" description="Express"/>
+      </subcategory>
+      <subcategory id="16" description="Miscellaneous">
+        <specific id="1" description="Shuttle Pallet (SPAS)"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Booster">
+      <subcategory id="1" description="Ariane"/>
+      <subcategory id="2" description="Maxus"/>
+      <subcategory id="3" description="Saenger"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="45">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="Type 59">
+        <specific id="1" description="Type 59-I"/>
+        <specific id="2" description="Type 59-II"/>
+      </subcategory>
+      <subcategory id="2" description="Type 69">
+        <specific id="1" description="Type 69-I"/>
+        <specific id="2" description="Type 69-II"/>
+      </subcategory>
+      <subcategory id="3" description="Type 79"/>
+      <subcategory id="4" description="Type 80">
+        <specific id="1" description="Type 80"/>
+        <specific id="2" description="Type 80-II"/>
+      </subcategory>
+      <subcategory id="5" description="Type 85-II">
+        <specific id="1" description="Type 85-II"/>
+        <specific id="2" description="Type 85-IIA"/>
+        <specific id="3" description="Type 85-11M (w/125mm gun)"/>
+        <specific id="4" description="Type 85-III"/>
+      </subcategory>
+      <subcategory id="6" description="Type 63 (light amphibious)">
+        <specific id="1" description="Type 63A"/>
+      </subcategory>
+      <subcategory id="7" description="Type 62 (light)"/>
+    </category>
+    <category id="2" description="Armored Fighting Vehicle">
+      <subcategory id="1" description="NORINCO YW 531 Armored Personnel Carrier (APC)"/>
+      <subcategory id="2" description="NORINCO Type 85 (YW 531H) Armored Personnel Carrier (APC)"/>
+      <subcategory id="3" description="NORINCO YW 534 Armored Personnel Carrier (APC)"/>
+      <subcategory id="4" description="NORINCO Type 77 (M1974) Armored Personnel Carrier (APC)"/>
+      <subcategory id="5" description="NORINCO Type WZ 501 Infantry Fighting Vehicle (IFV)"/>
+      <subcategory id="6" description="NORINCO WZ 551 Armored Personnel Carrier (APC)"/>
+      <subcategory id="7" description="NORINCO Type WZ 523 Armored Personnel Carrier (APC)"/>
+    </category>
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="Type 54-1 122mm SP Howitzer"/>
+      <subcategory id="2" description="Type 83 152mm SP Gun-Howitzer"/>
+      <subcategory id="3" description="Type 81 122mm Multiple Rocket Launcher (MRL)"/>
+      <subcategory id="4" description="Type 63 130mm Multiple Rocket Launcher (MRL)"/>
+      <subcategory id="5" description="Type 87 253mm Mine Clearing System (MRL)"/>
+      <subcategory id="6" description="Type 74 284mm Minelaying Rocket System"/>
+      <subcategory id="7" description="Type 75 105mm Recoilless Rifle"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="SY-1 (Styx) ASCM launcher"/>
+      <subcategory id="14" description="YJ-1/C-802/CSS-N-8 Saccade ASCM launcher"/>
+      <subcategory id="15" description="CSS-8 (M-7) surface-to-surface missile launcher"/>
+      <subcategory id="16" description="DF-15 (M9) launcher"/>
+      <subcategory id="17" description="CSSC-5 (YJ-16/C-101) Saples launcher"/>
+      <subcategory id="18" description="CSSC-6 (HY-3) Sawhorse launcher"/>
+      <subcategory id="19" description="CSSC-7 (HY-4) Sadsack launcher"/>
+    </category>
+    <category id="5" description="Towed Artillery">
+      <subcategory id="1" description="Type 54 122mm Howitzer"/>
+      <subcategory id="2" description="Type 59 130mm Gun">
+        <specific id="1" description="Type 59"/>
+        <specific id="2" description="Type 59-1"/>
+      </subcategory>
+      <subcategory id="3" description="Type 54 152mm Howitzer"/>
+      <subcategory id="4" description="Type 66 152mm Gun-Howitzer"/>
+      <subcategory id="5" description="Type WA 021 (WAC 21) 155mm Gun-Howitzer"/>
+      <subcategory id="6" description="Type 63 107mm Multiple Rocket Launcher (MRL)"/>
+      <subcategory id="7" description="Type 65 82mm Recoilless Rifle"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="Type 55 57mm Anti-Tank Gun (ATG)"/>
+      <subcategory id="12" description="Type 54 76mm ATG"/>
+      <subcategory id="13" description="Type 56 85mm ATG"/>
+      <subcategory id="14" description="Type 73 100mm ATG"/>
+      <subcategory id="15" description="Type 86 100mm ATG"/>
+      <subcategory id="16" description="HY-series ASCM launcher">
+        <specific id="1" description="HY-1/CSSC-2 Silkworm launcher"/>
+        <specific id="2" description="HY-2/CSSC-3 Seersucker launcher"/>
+      </subcategory>
+      <subcategory id="17" description="C-801/YJ-1/CSS-N-4 Sardine launcher"/>
+    </category>
+    <category id="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)">
+      <subcategory id="1" description="BJ212 4x4"/>
+    </category>
+    <category id="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)">
+      <subcategory id="1" description="Jiefang CA-10"/>
+      <subcategory id="2" description="Jiefang CA-30 6x6 2500kg cargo/utility truck">
+        <specific id="1" description="CA-30"/>
+        <specific id="2" description="CA-30A"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Mortar">
+      <subcategory id="1" description="100 mm type 71 mortar"/>
+      <subcategory id="2" description="120 mm type 55 mortar"/>
+      <subcategory id="3" description="160 mm type 56 mortar"/>
+    </category>
+    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
+      <subcategory id="1" description="HQ-2/CSA-1 SAM System">
+        <specific id="1" description="Battalion C3 Vehicle"/>
+        <specific id="2" description="HQ-2 Launcher">
+          <extra id="1" description="HQ-2 Launcher (standard)"/>
+          <extra id="2" description="HQ-2B SP Launcher (tracked)"/>
+        </specific>
+        <specific id="3" description="Gin Sling Engagement Radar">
+          <extra id="1" description="Gin Sling A"/>
+          <extra id="2" description="Gin Sling B"/>
+        </specific>
+      </subcategory>
+      <subcategory id="2" description="HQ-61/CSA-2 SAM System">
+        <specific id="1" description="Battery Command Post Vehicle"/>
+        <specific id="2" description="HQ-61 Twin-Rail Launcher Vehicle"/>
+        <specific id="3" description="HQ-61 Engagement Radar"/>
+      </subcategory>
+      <subcategory id="3" description="LY-60 SAM System">
+        <specific id="1" description="LY-60 Battery C3 Vehicle"/>
+        <specific id="2" description="LY-60 5-Round SP Launcher"/>
+        <specific id="3" description="LY-60 Engagement Radar Vehicle"/>
+        <specific id="4" description="LY-60 Surveillance Radar Vehicle"/>
+      </subcategory>
+      <subcategory id="4" description="Self-Propelled VSHORAD Gun/Missile System">
+        <specific id="1" description="PL-9 SAM System (quad-rail)"/>
+        <specific id="2" description="HN-5C SAM System"/>
+      </subcategory>
+      <subcategory id="5" description="Towed VSHORAD Gun/Missile System">
+        <specific id="1" description="Type 59 57mm AA Gun (similar to CIS S-60)"/>
+        <specific id="2" description="NORINCO 37mm AA Guns">
+          <extra id="1" description="Type 55"/>
+          <extra id="2" description="Type 65 (twin)"/>
+          <extra id="3" description="Type 74 (twin)"/>
+          <extra id="4" description="Type P793 (twin)"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="45">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="Shenyang F-6 (Farmer)"/>
+      <subcategory id="2" description="Xien J-7 (Fishbed)">
+        <specific id="1" description="J-7 II"/>
+        <specific id="2" description="J-7 E"/>
+        <specific id="3" description="J-7 / F-7 III"/>
+        <specific id="4" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="3" description="Shenyang J-8 (Finback)">
+        <specific id="1" description="J-8 I Finback A"/>
+        <specific id="2" description="J-8 II Finback B"/>
+      </subcategory>
+      <subcategory id="4" description="Chengdu Aircraft Industrial Corp. J-9"/>
+    </category>
+    <category id="2" description="Attack/Strike">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Nanchang Q-5 (Fantan)">
+        <specific id="1" description="Q-5"/>
+        <specific id="2" description="Q-5I"/>
+        <specific id="3" description="Q-5IA"/>
+        <specific id="4" description="Q-5 II"/>
+        <specific id="5" description="A-5C Fantan"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="Xian Aircraft Company JH-7"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+    </category>
+    <category id="3" description="Bomber">
+      <subcategory id="1" description="Harbin H-5 (B-5) Beagle"/>
+      <subcategory id="2" description="Xian H-6 (B-6) Badger">
+        <specific id="1" description="B-6 Badger A"/>
+        <specific id="2" description="B-6D Badger (ASM platform)"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="Shaanxi Aircraft Company Y-8">
+        <specific id="1" description="Y-8A (helicopter carrier)"/>
+        <specific id="2" description="Y-8E (drone carrier)"/>
+      </subcategory>
+      <subcategory id="2" description="Xian Aircraft Company Y-7">
+        <specific id="1" description="Y-7 (cargo)"/>
+        <specific id="2" description="Y-7H-500 (cargo)"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="ASW/Patrol/Observation">
+        <specific id="1" description="Harbin Aircraft Manufacturing Corp. SH-5"/>
+        <specific id="2" description="Shannxi Aircraft Company Y-8X"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Utility helicopter">
+      <subcategory id="1" description="Changhe Aircraft Factory Z-8"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Chengdu Aircraft Industrial Corp. JJ-5"/>
+      <subcategory id="2" description="Changdu Aircraft Industrial Corp. JJ-7/FT-7"/>
+      <subcategory id="3" description="Guizhou Aviation Industry Corp JJ-7"/>
+      <subcategory id="4" description="Nanchang Aircraft Manufacturing Company CJ-6">
+        <specific id="1" description="CJ-6A"/>
+        <specific id="2" description="CJ-6B"/>
+      </subcategory>
+      <subcategory id="5" description="Nanchang AMC / PAK K-8"/>
+    </category>
+    <category id="57" description="Non-Combatant Commercial Aircraft">
+      <subcategory id="1" description="Passenger Airline">
+        <specific id="1" description="Harbin Aircraft Manufacturing Corp. Y-12(I)"/>
+        <specific id="2" description="Harbin Aircraft Manufacturing Corp. Y-12 (II)"/>
+        <specific id="3" description="Harbin Aircraft Manufacturing Corp. Y-12 (IV)"/>
+        <specific id="4" description="Shaanxi Aircraft Company Y-8B"/>
+        <specific id="5" description="Shaanxi Aircraft Company Y-8C"/>
+        <specific id="6" description="Xian Aircraft Company Y7-100"/>
+        <specific id="7" description="Xian Aircraft Company Y7-100C"/>
+        <specific id="8" description="Xian Aircraft Compnay Y7-200"/>
+        <specific id="9" description="Xian Aircraft Company Y7-200B"/>
+        <specific id="10" description="(deleted)"/>
+        <specific id="11" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="2" description="Agriculture">
+        <specific id="1" description="Nanching Aircraft Manufacturing Company N-5A"/>
+        <specific id="2" description="Harbin Aircraft Manufacturing Corp. Y-11B (I)"/>
+        <specific id="3" description="WSK-PZL Mielec M-18 Dromader"/>
+      </subcategory>
+      <subcategory id="3" description="Helicopter">
+        <specific id="1" description="Harbin Aircraft Co. Z-9/Z-9A (Eurocopter AS 365N2)"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="Special Purpose">
+        <specific id="1" description="Shaanxi Aircraft Company Y-8F (livestock carrier)"/>
+        <specific id="2" description="Shaanxi Aircraft Company Y-8H (aerial survey)"/>
+        <specific id="3" description="Xian Aircraft Company Y-7 (cargo)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="45">
+    <category id="4" description="Guided Missile Destroyer (DDG)">
+      <subcategory id="1" description="Luhu (Type 052)">
+        <specific id="1" description="112 Luhu"/>
+      </subcategory>
+      <subcategory id="2" description="Luda (Type 051)">
+        <specific id="1" description="Jinan"/>
+        <specific id="2" description="Xian"/>
+        <specific id="3" description="Yinchuan"/>
+        <specific id="4" description="Xinging"/>
+        <specific id="5" description="Kaifeng"/>
+        <specific id="6" description="Dalien"/>
+        <specific id="7" description="Nanjing"/>
+        <specific id="8" description="Hefei"/>
+        <specific id="9" description="Chongqing"/>
+        <specific id="10" description="Zunyi"/>
+        <specific id="11" description="Changsha"/>
+        <specific id="12" description="Nanning"/>
+        <specific id="13" description="Nanchang"/>
+        <specific id="14" description="Guilin"/>
+        <specific id="15" description="Zangjiang"/>
+        <specific id="16" description="Zhuhei"/>
+      </subcategory>
+      <subcategory id="3" description="Luhia Class DDG">
+        <specific id="1" description="Shenzhen"/>
+        <specific id="2" description="H2 (2003)"/>
+        <specific id="3" description="H3 (2005)"/>
+        <specific id="4" description="H4 (2007)"/>
+        <specific id="5" description="H5 (2007)"/>
+        <specific id="6" description="H6 (2009)"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Jianghu (Type 053)">
+        <specific id="1" description="Chang De"/>
+        <specific id="2" description="Shaoxing"/>
+        <specific id="3" description="Nantong"/>
+        <specific id="4" description="Wuxi"/>
+        <specific id="5" description="Huayin"/>
+        <specific id="6" description="Zhenjiang"/>
+        <specific id="7" description="Xiamen"/>
+        <specific id="8" description="Jiujiang"/>
+        <specific id="9" description="Nanping"/>
+        <specific id="10" description="Jian"/>
+        <specific id="11" description="Changzhi"/>
+        <specific id="12" description="Ningpo"/>
+        <specific id="13" description="Jinhua"/>
+        <specific id="14" description="Dandong"/>
+        <specific id="15" description="Tinashan"/>
+        <specific id="16" description="Maoming"/>
+        <specific id="17" description="Yibin"/>
+        <specific id="18" description="Shaoguan"/>
+        <specific id="19" description="Anshun"/>
+        <specific id="20" description="Zhaotong"/>
+        <specific id="21" description="Jishao"/>
+        <specific id="22" description="Zigong"/>
+        <specific id="23" description="Kangding"/>
+        <specific id="24" description="Dongguan"/>
+        <specific id="25" description="Shantou"/>
+      </subcategory>
+      <subcategory id="2" description="Jianghu II (Type 053)">
+        <specific id="1" description="Siping"/>
+      </subcategory>
+      <subcategory id="3" description="Jianghu III">
+        <specific id="1" description="Huangshi"/>
+        <specific id="2" description="WuHu"/>
+      </subcategory>
+      <subcategory id="4" description="Jianghu IV">
+        <specific id="1" description="Zhoushan"/>
+      </subcategory>
+      <subcategory id="5" description="Jiangwei">
+        <specific id="1" description="Anging"/>
+        <specific id="2" description="Huainan"/>
+        <specific id="3" description="Huaibei"/>
+        <specific id="4" description="Tongling"/>
+      </subcategory>
+      <subcategory id="6" description="Jiavgnan (Type 065)">
+        <specific id="1" description="Nanchong"/>
+        <specific id="2" description="Dongchuan"/>
+      </subcategory>
+      <subcategory id="7" description="Chengdu (Type 01)">
+        <specific id="1" description="Chengdu"/>
+        <specific id="2" description="Pingxiang"/>
+      </subcategory>
+      <subcategory id="8" description="Jiangdong (Type 053K)">
+        <specific id="1" description="Yingtan"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Huang class Type 037/2 (fast attack missile)">
+        <specific id="1" description="770"/>
+      </subcategory>
+      <subcategory id="2" description="Houxin class (fast attack missile)">
+        <specific id="1" description="751-758"/>
+      </subcategory>
+      <subcategory id="3" description="Hola class (fast attach missile)">
+        <specific id="1" description="5100"/>
+      </subcategory>
+      <subcategory id="4" description="Hegu/Hoku class Type 024 (fast attack missile)"/>
+      <subcategory id="5" description="Haijui class (fast attack patrol)">
+        <specific id="1" description="688"/>
+        <specific id="2" description="693"/>
+        <specific id="3" description="694"/>
+        <specific id="4" description="697"/>
+      </subcategory>
+      <subcategory id="6" description="Hainan class Type 037 (fast attack patrol)">
+        <specific id="1" description="267-285"/>
+        <specific id="2" description="290"/>
+        <specific id="3" description="302"/>
+        <specific id="4" description="305"/>
+        <specific id="5" description="609"/>
+        <specific id="6" description="610"/>
+        <specific id="7" description="622"/>
+        <specific id="8" description="628"/>
+        <specific id="9" description="636-698"/>
+        <specific id="10" description="689-692"/>
+        <specific id="11" description="695"/>
+        <specific id="12" description="696"/>
+        <specific id="13" description="698"/>
+        <specific id="14" description="699"/>
+        <specific id="15" description="701"/>
+        <specific id="16" description="702"/>
+        <specific id="17" description="707"/>
+        <specific id="18" description="723-730"/>
+      </subcategory>
+      <subcategory id="7" description="Shanghai class Type 062 (fast attack gun)">
+        <specific id="1" description="E227"/>
+        <specific id="2" description="301"/>
+        <specific id="3" description="321"/>
+        <specific id="4" description="N1121"/>
+        <specific id="5" description="1127"/>
+        <specific id="6" description="3140"/>
+        <specific id="7" description="3141"/>
+        <specific id="8" description="N3215"/>
+        <specific id="9" description="N3313"/>
+        <specific id="10" description="N4301"/>
+        <specific id="11" description="4324"/>
+        <specific id="12" description="9342 et al"/>
+      </subcategory>
+      <subcategory id="8" description="Huludao class Type 206 (fast attack patrol)">
+        <specific id="1" description="65"/>
+        <specific id="2" description="77"/>
+        <specific id="3" description="101"/>
+        <specific id="4" description="109"/>
+      </subcategory>
+      <subcategory id="9" description="Huxin class (river patrol)">
+        <specific id="1" description="62 et al"/>
+      </subcategory>
+      <subcategory id="10" description="Huangfen Class (Pakistan)"/>
+      <subcategory id="11" description="Haiqing (Type 037/1) Class (Fast Attack Craft-Patrol)(PC)">
+        <specific id="1" description="710"/>
+      </subcategory>
+      <subcategory id="12" description="Huchuan (Type 025/026) Class (Fast Attack Craft-Torpedo)">
+        <specific id="1" description="205"/>
+      </subcategory>
+      <subcategory id="13" description="Houku Class Type 024 Fast Attack Missile"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Beleijan class (minelayer)">
+        <specific id="1" description="814"/>
+      </subcategory>
+      <subcategory id="2" description="Wosao class (minesweeper-coastal)">
+        <specific id="1" description="4422 et al"/>
+      </subcategory>
+      <subcategory id="3" description="Fushun class (minesweeper-coastal)">
+        <specific id="1" description="E303 et al"/>
+      </subcategory>
+      <subcategory id="4" description="Lienyou class (minesweeper-coastal)"/>
+      <subcategory id="5" description="Futi class Type 312 (minesweeper-drone)"/>
+      <subcategory id="6" description="T-43 MSO Type 010">
+        <specific id="1" description="830"/>
+        <specific id="2" description="831"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Tank Landing Ship">
+      <subcategory id="1" description="Yuting class">
+        <specific id="1" description="991"/>
+      </subcategory>
+      <subcategory id="2" description="Yukan class Type 072">
+        <specific id="1" description="927"/>
+        <specific id="2" description="928"/>
+        <specific id="3" description="929"/>
+        <specific id="4" description="930"/>
+      </subcategory>
+      <subcategory id="3" description="US 1-511 (Shan) Class (LST)">
+        <specific id="1" description="US1"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="Yudao class (landing ship medium)"/>
+      <subcategory id="2" description="Yuliang class Type 079 (landing ship medium)"/>
+      <subcategory id="3" description="Yuling class (landing ship medium)"/>
+      <subcategory id="4" description="Chinese Type class (landing ship medium)">
+        <specific id="1" description="972"/>
+        <specific id="2" description="990 et al"/>
+      </subcategory>
+      <subcategory id="5" description="Yunnan class Type 067 (landing craft utility)">
+        <specific id="1" description="3313"/>
+        <specific id="2" description="3321"/>
+        <specific id="3" description="3344"/>
+        <specific id="4" description="5526"/>
+        <specific id="5" description="7566"/>
+        <specific id="6" description="7568 et al"/>
+      </subcategory>
+      <subcategory id="6" description="Yuch'in class Type 068/069 (landing craft utility)">
+        <specific id="1" description="Y765 et al"/>
+      </subcategory>
+    </category>
+    <category id="14" description="Hydrofoil">
+      <subcategory id="1" description="Huchuan class Type 025/026 (fast attack-torpedo)">
+        <specific id="1" description="205"/>
+        <specific id="2" description="207-209"/>
+        <specific id="3" description="248"/>
+        <specific id="4" description="1247"/>
+        <specific id="5" description="2201"/>
+        <specific id="6" description="2203"/>
+        <specific id="7" description="3206"/>
+        <specific id="8" description="3214"/>
+        <specific id="9" description="6218"/>
+        <specific id="10" description="7230 et al"/>
+      </subcategory>
+    </category>
+    <category id="15" description="Air Cushion/Surface Effect">
+      <subcategory id="1" description="Jingsah II class">
+        <specific id="1" description="452"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Daxin class (training ship)">
+        <specific id="1" description="81 Zhenghe"/>
+      </subcategory>
+      <subcategory id="2" description="Dajiang class (submarine support)">
+        <specific id="1" description="J121 Changxingdao"/>
+        <specific id="2" description="J122 Chongmingdao"/>
+        <specific id="3" description="J506 Yongxingdao"/>
+      </subcategory>
+      <subcategory id="3" description="Da Dong class (salvage)">
+        <specific id="1" description="J304"/>
+      </subcategory>
+      <subcategory id="4" description="Dadao class (salvage)">
+        <specific id="1" description="Dadao"/>
+      </subcategory>
+      <subcategory id="5" description="Dalang class (submarine support)">
+        <specific id="1" description="J503 Dalang"/>
+        <specific id="2" description="J504"/>
+      </subcategory>
+      <subcategory id="6" description="Dongxiu class (submarine support)">
+        <specific id="1" description="U911 Dongxiu"/>
+      </subcategory>
+      <subcategory id="7" description="Dazhi class (submarine support)">
+        <specific id="1" description="920 Dazhi"/>
+      </subcategory>
+      <subcategory id="8" description="Hudung class (submarine rescue)">
+        <specific id="1" description="403 Haijui"/>
+        <specific id="2" description="512 Haijui"/>
+      </subcategory>
+      <subcategory id="9" description="DSRV (salvage submarine)"/>
+      <subcategory id="10" description="Ten Ting class (salvage)">
+        <specific id="1" description="456 Hai Lao"/>
+        <specific id="2" description="520 Hai Lao"/>
+        <specific id="3" description="523 Hai Lao"/>
+        <specific id="4" description="666 Hai Lao"/>
+      </subcategory>
+      <subcategory id="11" description="Kansha class (salvage)">
+        <specific id="1" description="Kansha"/>
+        <specific id="2" description="304 Haito"/>
+        <specific id="3" description="403"/>
+      </subcategory>
+      <subcategory id="12" description="Jin Jian Xun 05 class (salvage)"/>
+      <subcategory id="13" description="Qionshe class (attack transport)">
+        <specific id="1" description="Y830"/>
+        <specific id="2" description="Y831"/>
+        <specific id="3" description="Y833 et al"/>
+      </subcategory>
+      <subcategory id="14" description="Qionshe class (hospital)">
+        <specific id="1" description="Y833"/>
+      </subcategory>
+      <subcategory id="15" description="Fuqing class (replenishment oiler)">
+        <specific id="1" description="X575 Taicang"/>
+        <specific id="2" description="X615 Dongyun"/>
+      </subcategory>
+      <subcategory id="16" description="Shengli class (transport oiler)">
+        <specific id="1" description="X620"/>
+        <specific id="2" description="X621"/>
+      </subcategory>
+      <subcategory id="17" description="Fulin class (transport oiler)">
+        <specific id="1" description="X583"/>
+        <specific id="2" description="X606"/>
+        <specific id="3" description="X607"/>
+        <specific id="4" description="X609"/>
+        <specific id="5" description="X628"/>
+        <specific id="6" description="X629"/>
+        <specific id="7" description="X633"/>
+      </subcategory>
+      <subcategory id="18" description="Fuzhou class (transport oiler)">
+        <specific id="1" description="X573"/>
+        <specific id="2" description="X580"/>
+        <specific id="3" description="X606"/>
+        <specific id="4" description="X629 et al"/>
+      </subcategory>
+      <subcategory id="19" description="Jinyou class (transport oiler)">
+        <specific id="1" description="X622"/>
+        <specific id="2" description="X625"/>
+        <specific id="3" description="X675"/>
+      </subcategory>
+      <subcategory id="20" description="Leizhou class (transport oiler-light)">
+        <specific id="1" description="N1101 Liezhou et al"/>
+      </subcategory>
+      <subcategory id="21" description="Fuzhou class (water transport)">
+        <specific id="1" description="416 Hai Shui"/>
+        <specific id="2" description="419 Hai Shui"/>
+        <specific id="3" description="556 Hai Shui"/>
+        <specific id="4" description="557 Hai Shui"/>
+        <specific id="5" description="608 Hai Shui et al"/>
+      </subcategory>
+      <subcategory id="22" description="Leizhou class (water transport)">
+        <specific id="1" description="412 Hai Shui"/>
+        <specific id="2" description="555 Hai Shui"/>
+        <specific id="3" description="558 Hai Shui"/>
+      </subcategory>
+      <subcategory id="23" description="Yen Pai class (degaussing)">
+        <specific id="1" description="746 Hai Dzu"/>
+        <specific id="2" description="863 Dong Qin"/>
+      </subcategory>
+      <subcategory id="24" description="Yenka class (degaussing)">
+        <specific id="1" description="745 Hai Dzu"/>
+        <specific id="2" description="Hai Dzu"/>
+      </subcategory>
+      <subcategory id="25" description="Yen Fang class (degaussing)">
+        <specific id="1" description="950 Hai Dzu"/>
+        <specific id="2" description="951 Hai Dzu"/>
+      </subcategory>
+      <subcategory id="26" description="Haibing class (icebreaker)">
+        <specific id="1" description="101"/>
+        <specific id="2" description="102"/>
+      </subcategory>
+      <subcategory id="27" description="Mod Yanha class (icebreaker)">
+        <specific id="1" description="723"/>
+      </subcategory>
+      <subcategory id="28" description="Yanha class (icebreaker)">
+        <specific id="1" description="519"/>
+      </subcategory>
+      <subcategory id="29" description="Galait class (cargo)">
+        <specific id="1" description="318 Haiyun"/>
+        <specific id="2" description="600 Haiyun"/>
+      </subcategory>
+      <subcategory id="30" description="Dayun class (cargo)">
+        <specific id="1" description="951"/>
+        <specific id="2" description="952"/>
+      </subcategory>
+      <subcategory id="31" description="Yukan class (cargo)">
+        <specific id="1" description="801"/>
+      </subcategory>
+      <subcategory id="32" description="Danlin class (cargo)">
+        <specific id="1" description="L191 Hai Leng"/>
+        <specific id="2" description="L201 Hai Leng"/>
+        <specific id="3" description="L790 Hai Yun"/>
+        <specific id="4" description="L795 Hai Yun"/>
+      </subcategory>
+      <subcategory id="33" description="Hongqi class (cargo)">
+        <specific id="1" description="Y433"/>
+        <specific id="2" description="Y528"/>
+        <specific id="3" description="Y755"/>
+        <specific id="4" description="Y771"/>
+      </subcategory>
+      <subcategory id="34" description="Damen class (cargo)">
+        <specific id="1" description="Y529"/>
+      </subcategory>
+      <subcategory id="35" description="Wulai class (cable)">
+        <specific id="1" description="230"/>
+      </subcategory>
+      <subcategory id="36" description="Yan Jiu class (ocean tug)">
+        <specific id="1" description="14 Jan Jiu"/>
+      </subcategory>
+      <subcategory id="37" description="Gromovoy class (ocean tug)">
+        <specific id="1" description="210 Haito"/>
+        <specific id="2" description="221 Haito"/>
+        <specific id="3" description="230 Haito"/>
+        <specific id="4" description="231 Haito"/>
+        <specific id="5" description="235 Haito"/>
+        <specific id="6" description="319 Haito"/>
+        <specific id="7" description="T147 Haito"/>
+        <specific id="8" description="T716 Haito"/>
+        <specific id="9" description="T802 Haito"/>
+        <specific id="10" description="T814 Haito et al"/>
+      </subcategory>
+      <subcategory id="38" description="Yung Gang (ocean tug)"/>
+      <subcategory id="39" description="Hujiu class (tug)">
+        <specific id="1" description="T155"/>
+        <specific id="2" description="T711"/>
+        <specific id="3" description="T842"/>
+        <specific id="4" description="T867"/>
+      </subcategory>
+      <subcategory id="40" description="Tuzhong class (ocean tug-towing)">
+        <specific id="1" description="T154"/>
+        <specific id="2" description="T710"/>
+        <specific id="3" description="T830"/>
+        <specific id="4" description="T890"/>
+      </subcategory>
+      <subcategory id="41" description="Harbor tug"/>
+    </category>
+    <category id="17" description="Auxiliary, Merchant Marine">
+      <subcategory id="1" description="Ji Di Hao class (research)">
+        <specific id="1" description="Ji Di Hao"/>
+      </subcategory>
+      <subcategory id="2" description="Dajiang class (research)">
+        <specific id="1" description="R327"/>
+        <specific id="2" description="3 Yuan Wang"/>
+      </subcategory>
+      <subcategory id="3" description="Yuan Wang class (space event)">
+        <specific id="1" description="1 Yuan Wang"/>
+        <specific id="2" description="2 Yuan Wang"/>
+      </subcategory>
+      <subcategory id="4" description="Shijian class (oceanographic research)">
+        <specific id="1" description="Shijian"/>
+        <specific id="2" description="Kexueyihao"/>
+      </subcategory>
+      <subcategory id="5" description="Hai Ying class (oceanographic research)">
+        <specific id="1" description="Ke Xue Yihao"/>
+        <specific id="2" description="Ke Xue Yijao"/>
+      </subcategory>
+      <subcategory id="6" description="Kan class (oceanographic research)">
+        <specific id="1" description="102 Kan"/>
+      </subcategory>
+      <subcategory id="7" description="Shuguang 04 class (oceanographic research)">
+        <specific id="1" description="04 Shuguang"/>
+        <specific id="2" description="05 Shuguang"/>
+        <specific id="3" description="06 Shuguang"/>
+        <specific id="4" description="07 Shuguang"/>
+        <specific id="5" description="08 Shuguang"/>
+      </subcategory>
+      <subcategory id="8" description="Hai Yang class (oceanographic research)">
+        <specific id="1" description="01 Hai Yang"/>
+        <specific id="2" description="02 Hai Yang"/>
+      </subcategory>
+      <subcategory id="9" description="Hai class (oceanographic research)">
+        <specific id="1" description="521 Hai"/>
+      </subcategory>
+      <subcategory id="10" description="Dong Fang Hong class (oceanographic research)">
+        <specific id="1" description="Dong Fang Hong"/>
+      </subcategory>
+      <subcategory id="11" description="Dadie (intelligence collection)">
+        <specific id="1" description="841"/>
+      </subcategory>
+      <subcategory id="12" description="Xing Fengshan class (intelligence collection)">
+        <specific id="1" description="V856 Xing Fengshan"/>
+        <specific id="2" description="01 Xiangyang Hong"/>
+        <specific id="3" description="04, 06 Yiangyang Hong"/>
+        <specific id="4" description="02, 03, 08 Xiangyang Hong"/>
+        <specific id="5" description="05 Xiangyang Hong"/>
+        <specific id="6" description="09 Xiangyang Hong"/>
+        <specific id="7" description="10 Xiangyang Hong"/>
+        <specific id="8" description="11-16 Xiangyang Hong"/>
+      </subcategory>
+      <subcategory id="13" description="Hen Hsi class (missile range instrumentation)">
+        <specific id="1" description="701 Hsun"/>
+      </subcategory>
+      <subcategory id="14" description="Nan Hai class (geophysical research)">
+        <specific id="1" description="502 Han Hai"/>
+        <specific id="2" description="511 Bin Hai"/>
+      </subcategory>
+      <subcategory id="15" description="Yenlai class (survey)">
+        <specific id="1" description="K200"/>
+        <specific id="2" description="226"/>
+        <specific id="3" description="426"/>
+        <specific id="4" description="427"/>
+        <specific id="5" description="943"/>
+      </subcategory>
+      <subcategory id="16" description="Yenlun class (survey)">
+        <specific id="1" description="583 Haitse"/>
+      </subcategory>
+      <subcategory id="17" description="King Hai class (survey)">
+        <specific id="1" description="701 Hai Sheng"/>
+        <specific id="2" description="702 Hai Sheng"/>
+      </subcategory>
+      <subcategory id="18" description="Kaiboban class (survey)">
+        <specific id="1" description="623 Hai Sheng"/>
+      </subcategory>
+      <subcategory id="19" description="Ganzhu class (survey)">
+        <specific id="1" description="K420"/>
+      </subcategory>
+      <subcategory id="20" description="Yanxi class (survey)">
+        <specific id="1" description="V201"/>
+      </subcategory>
+      <subcategory id="21" description="Yannan class (survey)">
+        <specific id="1" description="K982"/>
+        <specific id="2" description="983"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Bai Yu Lan"/>
+        <specific id="2" description="Donghai"/>
+        <specific id="3" description="Keisho"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker class">
+        <specific id="1" description="Bin Hai 517"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="45">
+    <category id="1" description="SSBN (Nuclear Ballistic Missile)">
+      <subcategory id="1" description="Xia Class (Type 092)">
+        <specific id="1" description="Xia"/>
+      </subcategory>
+    </category>
+    <category id="3" description="SSN (Nuclear Attack - Torpedo)">
+      <subcategory id="1" description="Han Class">
+        <specific id="1" description="Han 401"/>
+        <specific id="2" description="Han 402"/>
+        <specific id="3" description="Han 403"/>
+        <specific id="4" description="Han 404"/>
+        <specific id="5" description="Han 405"/>
+      </subcategory>
+    </category>
+    <category id="5" description="SS (Conventional Attack - Torpedo, Patrol)">
+      <subcategory id="1" description="Ming Class (Type 035)">
+        <specific id="1" description="Ming 232"/>
+        <specific id="2" description="Ming 233"/>
+        <specific id="3" description="Ming 342"/>
+        <specific id="4" description="Ming 352"/>
+        <specific id="5" description="Ming 353"/>
+        <specific id="6" description="Ming 354"/>
+        <specific id="7" description="Ming 356"/>
+        <specific id="8" description="Ming 357"/>
+        <specific id="9" description="Ming 358"/>
+      </subcategory>
+      <subcategory id="2" description="Song Class (Type 039) (SSG)">
+        <specific id="1" description="Song 320"/>
+        <specific id="2" description="Song 321"/>
+        <specific id="3" description="Song 322"/>
+        <specific id="4" description="Song 323"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="205">
+    <category id="0" description="Other"/>
+    <category id="1" description="Tank"/>
+    <category id="2" description="Armored Fighting Vehicle">
+      <subcategory id="1" description="Stridsfordon 90"/>
+      <subcategory id="2" description="Pansarbandvagn 302"/>
+    </category>
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="RBS-15K launcher"/>
+    </category>
+    <category id="5" description="Towed Artillery">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+    </category>
+    <category id="27" description="Civilian Vehicle">
+      <subcategory id="1" description="Truck"/>
+      <subcategory id="2" description="Bus"/>
+      <subcategory id="3" description="Car"/>
+    </category>
+    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
+      <subcategory id="1" description="Towed VSHORAD Gun/Missile System">
+        <specific id="1" description="40mm Bofors">
+          <extra id="1" description="L/70 AA Gun"/>
+          <extra id="2" description="L/60 AA Gun"/>
+        </specific>
+        <specific id="2" description="57mm Bofors"/>
+        <specific id="3" description="RBS-70 Launcher"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="205">
+    <category id="0" description="Other"/>
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="SAAB J 35 Draken"/>
+      <subcategory id="2" description="SAAB JA 37 Viggen"/>
+      <subcategory id="3" description="SAAB JAS 39 Gripen"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="205">
+    <category id="0" description="Other"/>
+    <category id="1" description="Carrier">
+      <subcategory id="1" description="Stockholm"/>
+    </category>
+    <category id="7" description="Light/Patrol Craft"/>
+  </entity>
+  <entity kind="1" domain="4" country="205">
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Nachen (Denmark)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="13">
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="GAF Normad">
+        <specific id="1" description="N22B"/>
+        <specific id="2" description="N24A"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="13">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="ANZAC Class (Meko 200)">
+        <specific id="1" description="FFH 150 Anzac"/>
+        <specific id="2" description="FFH 151 Arunta"/>
+        <specific id="3" description="FFH 152 Warumungu"/>
+        <specific id="4" description="FFH 153 Stuart"/>
+        <specific id="5" description="FFH 154 Parramatta"/>
+        <specific id="6" description="FFH 155 Ballarat"/>
+        <specific id="7" description="FFH 156 Toowoomba"/>
+        <specific id="8" description="FFH 157 Perth"/>
+        <specific id="9" description="Te Kaha (New Zealand)"/>
+        <specific id="10" description="Te Mana (new Zealand)"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Fremantle Class (Large Patrol Craft)">
+        <specific id="1" description="P 203 Fremantle"/>
+        <specific id="2" description="P 204 Warrnambool"/>
+        <specific id="3" description="P 205 Townsville"/>
+        <specific id="4" description="P 206 Wollongong"/>
+        <specific id="5" description="P 207 Launceston"/>
+        <specific id="6" description="P 208 Whyalla"/>
+        <specific id="7" description="P 209 Ipswich"/>
+        <specific id="8" description="P 210 Cessnock"/>
+        <specific id="9" description="P 211 Bendigo"/>
+        <specific id="10" description="P 212 Gawler"/>
+        <specific id="11" description="P 213 Geraldton"/>
+        <specific id="12" description="P 214 Dubbo"/>
+        <specific id="13" description="P 215 Geelong"/>
+        <specific id="14" description="P 216 Gladstone"/>
+        <specific id="15" description="P 217 Bunbury"/>
+      </subcategory>
+      <subcategory id="2" description="Fremantle Class (Modified)">
+        <specific id="1" description="Kula (Fiji)"/>
+        <specific id="2" description="Kikau (Fiji)"/>
+        <specific id="3" description="Kiro (Fiji)"/>
+        <specific id="4" description="Tukoro (Vanuatu)"/>
+        <specific id="5" description="Teanaoai (Kiribati)"/>
+        <specific id="6" description="Lomor (Marshall Islands)"/>
+        <specific id="7" description="Palikir (Micronesia)"/>
+        <specific id="8" description="Micronesia (Micronesia)"/>
+        <specific id="9" description="Independence (Micronesia)"/>
+        <specific id="10" description="Neiafu (Tonga)"/>
+        <specific id="11" description="Pangui (Tonga)"/>
+        <specific id="12" description="Savea (Tonga)"/>
+        <specific id="13" description="Te Mataili (Tuvalu)"/>
+        <specific id="14" description="President HI Remeliik (Palau)"/>
+        <specific id="15" description="Nalanva (Western Samoa)"/>
+        <specific id="16" description="Te Kukupa (Cook Islands)"/>
+        <specific id="17" description="Tarangau (PNG)"/>
+        <specific id="18" description="Dregen (PNG)"/>
+        <specific id="19" description="Seeadler (PNG)"/>
+        <specific id="20" description="Baslislk (PNG)"/>
+        <specific id="21" description="Lata (Solomon Islands)"/>
+        <specific id="22" description="Auki (Solomon Islands)"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Huon Class (Minehunters-Coastal)">
+        <specific id="1" description="M 82 Huon"/>
+        <specific id="2" description="M 83 Hawkesbury"/>
+        <specific id="3" description="M 84 Norman"/>
+        <specific id="4" description="M 85 Gascoyne"/>
+        <specific id="5" description="M 86 Diamantina"/>
+        <specific id="6" description="M 87 Yarra"/>
+      </subcategory>
+      <subcategory id="2" description="Bay Class (Minehunters - Inshore)">
+        <specific id="1" description="M 80 Rushcutter"/>
+        <specific id="2" description="M 81 Shoalwater"/>
+      </subcategory>
+      <subcategory id="3" description="COOP Class (Minesweepers - Auxiliary)">
+        <specific id="1" description="1102 Brolga"/>
+        <specific id="2" description="1185 Koraaga"/>
+        <specific id="3" description="Y 298 Bandicoot"/>
+        <specific id="4" description="Y 299 Wallaroo"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Landing Craft">
+      <subcategory id="1" description="Modified Sir Bedivere Class">
+        <specific id="1" description="LSH 50 Tobruk Tank landing ship"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="LCH Type">
+        <specific id="1" description="L 126 Balikpapan"/>
+        <specific id="2" description="L 127 Brunei"/>
+        <specific id="3" description="L 128 Labuan"/>
+        <specific id="4" description="L 129 Tarakan"/>
+        <specific id="5" description="L 130 Wewak"/>
+        <specific id="6" description="L 133 Betano"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Incat class: Fast Sealift Catamaran">
+        <specific id="1" description="AKR45 Jervis Bay"/>
+      </subcategory>
+      <subcategory id="2" description="Austal class: Fast Sealift Catamaran">
+        <specific id="1" description="Westpac Express"/>
+      </subcategory>
+      <subcategory id="3" description="Durance class (Underway Replenishment Tanker) AOR"/>
+      <subcategory id="4" description="Leaf class (Underway Replenishment Tanker) AOR/AOT"/>
+    </category>
+    <category id="50" description="Frigate">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="River Class (FF)"/>
+    </category>
+    <category id="54" description="Amphibious Assault Ship">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="(deleted)">
+        <specific id="1" description="(deleted)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="13">
+    <category id="4" description="SSG (Conventional Guided Missile)">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Collins Class">
+        <specific id="1" description="S 71 Collins"/>
+        <specific id="2" description="S 72 Farncomb"/>
+        <specific id="3" description="S 73 Waller"/>
+        <specific id="4" description="S 74 Dechaineux"/>
+        <specific id="5" description="S 75 Sheean"/>
+        <specific id="6" description="S 76 Rankin"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="120">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="Type 88"/>
+      <subcategory id="2" description="K1 105mm MBT"/>
+      <subcategory id="3" description="K1A1 120mm MBT"/>
+    </category>
+    <category id="2" description="Armored Fighting Vehicle">
+      <subcategory id="1" description="KM900 Armored Personnel Carrier"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="120">
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="Aircraft Technologies Industries (Airtech) CN-235">
+        <specific id="1" description="CN-235 M"/>
+      </subcategory>
+    </category>
+    <category id="21" description="Utility Helicopter">
+      <subcategory id="1" description="Kawasaki BK 117"/>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="KTX-1 Yeo-Myoung (Dawn)"/>
+    </category>
+    <category id="57" description="Non-Combatant Commercial Aircraft">
+      <subcategory id="1" description="Passenger Airline">
+        <specific id="1" description="Fokker 1000"/>
+        <specific id="2" description="CHK-91 Chang-Gong 91 (Blue Sky 91)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="120">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Ulsan Class">
+        <specific id="1" description="FF 951 Ulsan"/>
+        <specific id="2" description="FF 952 Seoul"/>
+        <specific id="3" description="FF 953 Chung Nam"/>
+        <specific id="4" description="FF 955 Masan"/>
+        <specific id="5" description="FF 956 Kyong Buk"/>
+        <specific id="6" description="FF 957 Chon Nam"/>
+        <specific id="7" description="FF 958 Che Ju"/>
+        <specific id="8" description="FF 959 Busan"/>
+        <specific id="9" description="FF 961 Chung Ju"/>
+      </subcategory>
+      <subcategory id="2" description="Po Hang Class (Corvette)">
+        <specific id="1" description="756 Po Hang"/>
+        <specific id="2" description="757 Kun San"/>
+        <specific id="3" description="758 Kyong Ju"/>
+        <specific id="4" description="759 Mok Po"/>
+        <specific id="5" description="761 Kim Chon"/>
+        <specific id="6" description="762 Chung Ju"/>
+        <specific id="7" description="763 Jin Ju"/>
+        <specific id="8" description="765 Yo Su"/>
+        <specific id="9" description="766 An Dong"/>
+        <specific id="10" description="767 Sun Chon"/>
+        <specific id="11" description="768 Yee Ree"/>
+        <specific id="12" description="769 Won Ju"/>
+        <specific id="13" description="771 Je Chon"/>
+        <specific id="14" description="772 Chon An"/>
+        <specific id="15" description="773 Song Nam"/>
+        <specific id="16" description="775 Bu Chon"/>
+        <specific id="17" description="776 Dae Chon"/>
+        <specific id="18" description="777 Jin Hae"/>
+        <specific id="19" description="778 Sok Cho"/>
+        <specific id="20" description="779 Yong Ju"/>
+        <specific id="21" description="781 Nam Won"/>
+        <specific id="22" description="782 Kwan Myong"/>
+        <specific id="23" description="783"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Pae Ku (PSMM 5) Class (fast attack craft-missile)">
+        <specific id="1" description="PGM 582 Pae Ku 52"/>
+        <specific id="2" description="PGM 583 Pae Ku 53"/>
+        <specific id="3" description="PGM 585 Pae Ku 55"/>
+        <specific id="4" description="PGM 586 Pae Ku 56"/>
+        <specific id="5" description="PGM 587 Pae Ku 57"/>
+        <specific id="6" description="PGM 588 Pae Ku 58"/>
+        <specific id="7" description="PGM 589 Pae Ku 59"/>
+        <specific id="8" description="PGM 591 Pae Ku 51"/>
+      </subcategory>
+      <subcategory id="2" description="Sea Dolphin Class (fast attack craft-patrol)">
+        <specific id="1" description="PKM 212-358 series"/>
+      </subcategory>
+      <subcategory id="3" description="Wildcat Class (fast attack craft-missile)">
+        <specific id="1" description="PKM 271-72"/>
+      </subcategory>
+      <subcategory id="4" description="Sea Hawk Class (fast attack craft-patrol)">
+        <specific id="1" description="PK 161-189 series"/>
+      </subcategory>
+      <subcategory id="5" description="Sea Fox Class (fast attack craft-patrol)">
+        <specific id="1" description="PK 161-189 series"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Swallow Class (minehunter)">
+        <specific id="1" description="561 Kang Keong"/>
+        <specific id="2" description="562 Kang Jin"/>
+        <specific id="3" description="563 Ko Ryeong"/>
+        <specific id="4" description="565 Kim Po"/>
+        <specific id="5" description="566 Ko Chang"/>
+        <specific id="6" description="567 Kum Cha"/>
+      </subcategory>
+      <subcategory id="2" description="US MSC 268 Class (minesweeper-coastal)">
+        <specific id="1" description="MSC 551 Kum San"/>
+        <specific id="2" description="MSC 552 Ko Hung"/>
+        <specific id="3" description="MSC 553 Kum Kok"/>
+      </subcategory>
+      <subcategory id="3" description="US MSC 389 Class (minesweeper-coastal)">
+        <specific id="1" description="MSC 555 Nam Yang"/>
+        <specific id="2" description="MSC 556 Ha Dong"/>
+        <specific id="3" description="MSC 557 Sam Kok"/>
+        <specific id="4" description="MSC 558 Yong Dong"/>
+        <specific id="5" description="MSC 559 Ok Cheon"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Tank Landing Ship">
+      <subcategory id="1" description="Alligator Class (LST)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Chun Jee Class (HDA 8000) (AOE)">
+        <specific id="1" description="AO 57 Chun Jee"/>
+        <specific id="2" description="AO 53"/>
+      </subcategory>
+      <subcategory id="2" description="Furseal Class (LCU)">
+        <specific id="1" description="72, 73-75-78 Mulkae"/>
+      </subcategory>
+      <subcategory id="3" description="Surveying Ship">
+        <specific id="1" description="801-803, 805, 806 Pusan"/>
+        <specific id="2" description="821 Ch'ungnam"/>
+        <specific id="3" description="831 Kangwon"/>
+      </subcategory>
+      <subcategory id="4" description="Trials Support Ship">
+        <specific id="1" description="Sunjin"/>
+      </subcategory>
+      <subcategory id="5" description="Salvage Ship">
+        <specific id="1" description="ARS 26 GUMI"/>
+        <specific id="2" description="ARS 25 CHANG WON"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Dong Hae Class (Corvette)">
+        <specific id="1" description="751 Dong Hae"/>
+        <specific id="2" description="752 Su Won"/>
+        <specific id="3" description="753 Kang Reung"/>
+        <specific id="4" description="755 An Yang"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Chung Gu"/>
+        <specific id="2" description="Ga Yang"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="120">
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Chang Bogo (Type 209) Class)">
+        <specific id="1" description="061 Chang Bogo"/>
+        <specific id="2" description="062 Yi Chon"/>
+        <specific id="3" description="063 Choi Muson"/>
+      </subcategory>
+    </category>
+    <category id="7" description="SSA (Conventional Auxiliary)">
+      <subcategory id="1" description="KSS-1 Tolgorae Class (midget submarine)">
+        <specific id="1" description="051-053"/>
+      </subcategory>
+      <subcategory id="2" description="Cosmos Class (midget submarine)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="119">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="M1985 Light tank"/>
+      <subcategory id="2" description="Type-63 Light amphibious tank"/>
+    </category>
+    <category id="4" description="Self-propelled artillery">
+      <subcategory id="1" description="170 mm Self Propelled Gun">
+        <specific id="1" description="M-1978 SP &quot;Koksan&quot;"/>
+        <specific id="2" description="M-1989"/>
+      </subcategory>
+      <subcategory id="2" description="240 mm Rocket Launcher">
+        <specific id="1" description="M-1985"/>
+        <specific id="2" description="M-1991"/>
+      </subcategory>
+      <subcategory id="3" description="BM-11 122 mm Multiple Rocket Launcher"/>
+      <subcategory id="4" description="M-1992 Self Propelled Combination Gun"/>
+      <subcategory id="5" description="Taepo Dong I Launcher"/>
+      <subcategory id="6" description="Taepo Dong II Launcher (2-stage version)"/>
+      <subcategory id="7" description="Taepo Dong II Launcher (3-stage version)"/>
+      <subcategory id="8" description="No Dong Launcher"/>
+      <subcategory id="9" description="SCUB-B Launcher"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="119">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Soho Class"/>
+      <subcategory id="2" description="Najin Class"/>
+    </category>
+    <category id="7" description="Light/patrol Craft">
+      <subcategory id="1" description="So 1 Class (large patrol craft)"/>
+      <subcategory id="2" description="Soju Class (fast attack craft-missile)"/>
+      <subcategory id="3" description="Sohung Class (fast attack craft-missile)"/>
+      <subcategory id="4" description="Sariwon Class (large patrol craft)">
+        <specific id="1" description="725-27"/>
+      </subcategory>
+      <subcategory id="5" description="Soman Class (large patrol craft)"/>
+      <subcategory id="6" description="Taechong I (large patrol craft)"/>
+      <subcategory id="7" description="Taechong II (Mayang) (large patrol craft)"/>
+      <subcategory id="8" description="Chodo Class (fast attack craft-gun)"/>
+      <subcategory id="9" description="Chaho Class (fast attack craft-gun)"/>
+      <subcategory id="10" description="Chong-Jin Class (fast attack craft-gun)"/>
+      <subcategory id="11" description="Chong-Ju Class (fast attack craft-gun)"/>
+      <subcategory id="12" description="Sinpo (Sinnam) Class (fast attack craft-gun)"/>
+      <subcategory id="13" description="Ku Song Class (fast attack craft-torpedo)"/>
+      <subcategory id="14" description="Sin Hung Class (fast attack craft-torpedo)"/>
+      <subcategory id="15" description="Mod Sin Hung Class (fast attack craft-torpedo)"/>
+      <subcategory id="16" description="TB 11PA Class (inshore patrol craft)"/>
+      <subcategory id="17" description="TB 40A Class (inshore patrol craft)"/>
+      <subcategory id="18" description="Modified Fishing Vessels (coastal patrol craft)"/>
+      <subcategory id="19" description="High Speed Infiltration Craft (HSIC)"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Yukto I Class (coastal minesweeper)"/>
+      <subcategory id="2" description="Yukto II Class (coastal minesweeper)"/>
+      <subcategory id="3" description="Pipa-Got Class (inshore minesweeper)"/>
+    </category>
+    <category id="10" description="Tank Landing Ship">
+      <subcategory id="1" description="Hungnam Class (LSM)"/>
+      <subcategory id="2" description="Hantae Class (LSM)"/>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="Hanchon Class (LCM)"/>
+      <subcategory id="2" description="Nampo Class (LCP)"/>
+    </category>
+    <category id="15" description="Air Cushion/Surface Effect">
+      <subcategory id="1" description="Songjong Class (Type I-III) (LCP-hovercraft)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Depot Ship for Midget Submarine">
+        <specific id="1" description="Soo Gun-Ho"/>
+        <specific id="2" description="Dong Geon Ae Gook-Ho"/>
+        <specific id="3" description="Dong Hae-Ho"/>
+        <specific id="4" description="Chong Seong-Ho Number One"/>
+        <specific id="5" description="Chong Seong-Ho Number Two"/>
+        <specific id="6" description="Chong Seong-Ho Humber Three"/>
+        <specific id="7" description="Hae Gum Gong-Ho"/>
+        <specific id="8" description="Song Rim-Ho"/>
+      </subcategory>
+      <subcategory id="2" description="Surveying Ship">
+        <specific id="1" description="101 Donghae"/>
+        <specific id="2" description="102 Donghae"/>
+        <specific id="3" description="201 Sohai"/>
+        <specific id="4" description="202 Sohai"/>
+      </subcategory>
+      <subcategory id="3" description="Coastal Patrol Craft">
+        <specific id="1" description="177"/>
+        <specific id="2" description="801"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-combatant ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Chong Jin"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="119">
+    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
+      <subcategory id="1" description="Sang-O class (midget submarine)"/>
+    </category>
+    <category id="7" description="SSA (Conventional Auxiliary)">
+      <subcategory id="1" description="North Korean Design (midget submarine)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="178">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Damsah (Combattante III M) Class (fast attack craft-missile)">
+        <specific id="1" description="Q01 Damsah"/>
+        <specific id="2" description="Q02 AL Ghariyah"/>
+        <specific id="3" description="Q03 Rbigah"/>
+      </subcategory>
+      <subcategory id="2" description="Barzan Class (large patrol craft)">
+        <specific id="1" description="Q11 Barzan"/>
+        <specific id="2" description="Q12 Hwar"/>
+        <specific id="3" description="Q13 That Assuari"/>
+        <specific id="4" description="Q14 AL Wusail"/>
+        <specific id="5" description="Q15 Fateh-AL-Khair"/>
+        <specific id="6" description="Q16 Tariq"/>
+      </subcategory>
+      <subcategory id="3" description="Damen Polycat 1450 Class (coastal patrolcraft)">
+        <specific id="1" description="Q31-36"/>
+      </subcategory>
+      <subcategory id="4" description="Fairey Marine Spear Class (coastal patrol craft)">
+        <specific id="1" description="Q71-95"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="189">
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Pilatus Flugzeugwerke SA PC-9">
+        <specific id="1" description="PC-9"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="189">
+    <category id="6" description="Guided Missile Frigate">
+      <subcategory id="1" description="Madina (Type F 2000S) Class">
+        <specific id="1" description="702 Madina"/>
+        <specific id="2" description="704 Hofouf"/>
+        <specific id="3" description="706 Abha"/>
+        <specific id="4" description="708 Taif"/>
+      </subcategory>
+      <subcategory id="2" description="Badr Class (Corvette)">
+        <specific id="1" description="612 Badr"/>
+        <specific id="2" description="614 Al Yarmook"/>
+        <specific id="3" description="616 Hitteen"/>
+        <specific id="4" description="618 Tabuk"/>
+      </subcategory>
+      <subcategory id="3" description="Arriyad Class (Type F-3000S)">
+        <specific id="1" description="812 Al Ryadh"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Jaguar Class (fast attack craft-torpedo)">
+        <specific id="1" description="90 Dammam"/>
+        <specific id="2" description="50 Khabar"/>
+        <specific id="3" description="10 Maccah"/>
+      </subcategory>
+      <subcategory id="2" description="Halter Type (coastal patrol craft)"/>
+      <subcategory id="3" description="Simmoneau 51 Type (inshore patrol craft)"/>
+      <subcategory id="4" description="Al Siddiq (fast attack craft-missile)">
+        <specific id="1" description="511 Al Siddiq"/>
+        <specific id="2" description="513 Al Farouq"/>
+        <specific id="3" description="515 Abdul Aziz"/>
+        <specific id="4" description="517 Faisal"/>
+        <specific id="5" description="519 Kahlid"/>
+        <specific id="6" description="521 Amyr"/>
+        <specific id="7" description="523 Taiq"/>
+        <specific id="8" description="525 Oqbah"/>
+        <specific id="9" description="527 Abu Abaidah"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure/Ship Craft">
+      <subcategory id="1" description="Sandown Class (minehunters-coastal)">
+        <specific id="1" description="420 Al Jawf"/>
+        <specific id="2" description="422 Shaqra"/>
+        <specific id="3" description="424 Al Kharj"/>
+      </subcategory>
+      <subcategory id="2" description="MSC 322 Class (minesweeper/hunter-coastal)">
+        <specific id="1" description="MSC 412 Addriyah"/>
+        <specific id="2" description="MSC 414 Al Quysumah"/>
+        <specific id="3" description="MSC 416 Al Wadeeah"/>
+        <specific id="4" description="MSC 418 Safwa"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Mod Durance Class (replenishment ship)">
+        <specific id="1" description="902 Boraida"/>
+        <specific id="2" description="904 Yunbou"/>
+      </subcategory>
+      <subcategory id="2" description="LCM 6 Class">
+        <specific id="1" description="220 Dheba"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Admai"/>
+        <specific id="2" description="Abu Mariam"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker class">
+        <specific id="1" description="Nur Al Jubail"/>
+        <specific id="2" description="Al Saudia"/>
+        <specific id="3" description="Al Widadia"/>
+        <specific id="4" description="Al-Zait Al-Araby 5"/>
+        <specific id="5" description="Adel"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="121">
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Short Brothers :LC T.MK 52 Toucan">
+        <specific id="1" description="T.MK 52"/>
+      </subcategory>
+      <subcategory id="2" description="Empresa Brasileria de Aeronautica SA EMB-312 Toucan">
+        <specific id="1" description="EMB-S312"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="121">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="OPV 310 Class (large patrol craft)">
+        <specific id="1" description="P301 Inttisar"/>
+        <specific id="2" description="P302 Aman"/>
+        <specific id="3" description="P303 Maimom"/>
+        <specific id="4" description="P304 Mobark"/>
+      </subcategory>
+      <subcategory id="2" description="TNC 45 Type (fast attack craft-missile)">
+        <specific id="1" description="P3404 Al Sanbouk"/>
+      </subcategory>
+      <subcategory id="3" description="Simmoneau Standard 12 Class (inshore patrol craft)"/>
+      <subcategory id="4" description="FPB 57 Type (fast attack craft-missile)">
+        <specific id="1" description="P5702 Istiqlal"/>
+      </subcategory>
+      <subcategory id="5" description="Cougar Type (inshore patrol craft)"/>
+      <subcategory id="6" description="Al-Shaali Type (inshore patrol craft)"/>
+      <subcategory id="7" description="UM Almaradim Class (PCFG)">
+        <specific id="1" description="P3711 Um Almaradim"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="AL Tahaddy Class (LCM/AKL)">
+        <specific id="1" description="L401 AL Soumood"/>
+      </subcategory>
+      <subcategory id="2" description="Support Ship (AG)">
+        <specific id="1" description="S5509 Qaruh"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Na Hai Fa Xian"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker class">
+        <specific id="1" description="Gas Al Mutlaa"/>
+        <specific id="2" description="Al Shuhadaa"/>
+        <specific id="3" description="Al Shegaya">
+          <extra id="4" description="Al Awdah"/>
+        </specific>
+        <specific id="5" description="Al Bida"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="164">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Patrol Ship">
+        <specific id="1" description="A1 AL Mabrukak"/>
+      </subcategory>
+      <subcategory id="2" description="AL Waafi (Brooke Marine) Class (fast attack craft-gun)">
+        <specific id="1" description="B4 AL Waafi"/>
+        <specific id="2" description="B5 AL Fulk"/>
+        <specific id="3" description="B6 AL Mujahid"/>
+        <specific id="4" description="B7 AL Jabbar"/>
+      </subcategory>
+      <subcategory id="3" description="Seeb (Vosper 25) Class (inshore patrol craft)">
+        <specific id="1" description="B20 Seeb"/>
+        <specific id="2" description="B21 Shinas"/>
+        <specific id="3" description="B22 Sadh"/>
+        <specific id="4" description="B23 Khassab"/>
+      </subcategory>
+      <subcategory id="4" description="Dhofar (Province) Class (fast attack craft-missile)">
+        <specific id="1" description="B10 Dhofar"/>
+        <specific id="2" description="B11 AL Sharqiyah"/>
+        <specific id="3" description="B12 AL Bat'nah"/>
+        <specific id="4" description="B14 Mussandam"/>
+      </subcategory>
+      <subcategory id="5" description="Tyler-Vortex Type (inshore patrol craft)">
+        <specific id="1" description="Q2"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="LCM">
+        <specific id="1" description="C8 Saba AL Bahr"/>
+        <specific id="2" description="C9 AL Doghas"/>
+        <specific id="3" description="C10 AL Temsah"/>
+      </subcategory>
+      <subcategory id="2" description="LCU">
+        <specific id="1" description="C7 AL Neemran"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate (including Corvettes)">
+      <subcategory id="1" description="Qahir Class (FSG)">
+        <specific id="1" description="Q-31 Qahir Al Amwaj"/>
+      </subcategory>
+    </category>
+    <category id="55" description="Amphibious Cargo Ship">
+      <subcategory id="1" description="Landing Ship-Logistic">
+        <specific id="1" description="L2 Nasar AL Bahr"/>
+      </subcategory>
+    </category>
+    <category id="58" description="Combat Stores Ship">
+      <subcategory id="1" description="Supply Ship">
+        <specific id="1" description="A2 AL Sultana"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="123">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Tracker Mk2 (coastal patrol craft)"/>
+      <subcategory id="2" description="Aztec Class (coastal patrol craft)"/>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Perla"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="102">
+    <category id="2" description="Armored Fighting Vehicle">
+      <subcategory id="1" description="EE-3 JARARACA"/>
+      <subcategory id="2" description="EE-9 CASCAVELEE - 11URUTRU"/>
+      <subcategory id="3" description="EE-11 URUTRU"/>
+    </category>
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="127 mm ASTROS II"/>
+      <subcategory id="2" description="262 mm ABABEEL"/>
+      <subcategory id="3" description="160 mm mortar"/>
+      <subcategory id="4" description="FAW 70 launcher"/>
+      <subcategory id="5" description="FAW 150 launcher"/>
+      <subcategory id="6" description="FAW 200 launcher"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="102">
+    <category id="1" description="Fighter/Air Defense"/>
+    <category id="8" description="Surveillance/C2 (Airborne Early Warning)">
+      <subcategory id="1" description="Iraqui Air Force Adnan 1">
+        <specific id="1" description="Adnan I"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="102">
+    <category id="6" description="Guided Missile Frigate">
+      <subcategory id="6" description="Assad Class">
+        <specific id="1" description="F210 Mussa Ben Nussair"/>
+        <specific id="2" description="F212 Tariq lbn Ziad"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Bogomol Class (large patrol craft)"/>
+      <subcategory id="2" description="PB 90 Class (coastal patrol craft)"/>
+      <subcategory id="3" description="Sawari Class (inshore patrol boat)"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Nestin Class (minesweeper-inshore)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Transport Ship">
+        <specific id="1" description="426 Al Zahraa"/>
+        <specific id="2" description="428 Khawla"/>
+        <specific id="3" description="429 Balqees"/>
+      </subcategory>
+      <subcategory id="2" description="Spasilac Class (salvage ship)">
+        <specific id="1" description="A81 Aka"/>
+      </subcategory>
+      <subcategory id="3" description="Diving Tender"/>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Yugoslav Type">
+        <specific id="1" description="507 lbn Marjid"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-combatant Ship">
+      <subcategory id="1" description="Container Class"/>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Al Thirthar"/>
+        <specific id="2" description="1 Athar"/>
+        <specific id="3" description="1 Hurizan"/>
+        <specific id="4" description="7 Nissan"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="101">
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="320 mm OGHAB Multiple Rocket Launcher"/>
+      <subcategory id="2" description="330 mm SHAHIN Multiple Rocket Launcher"/>
+      <subcategory id="3" description="330 mm NAZEAT"/>
+      <subcategory id="4" description="Shahab TEL"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="101">
+    <category id="5" description="Destroyer (DD)">
+      <subcategory id="5" description="Damavand"/>
+      <subcategory id="2" description="Babr"/>
+    </category>
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Avland (vosper Mk 5) Class">
+        <specific id="1" description="71 Alvand"/>
+        <specific id="2" description="72 Alborz"/>
+        <specific id="3" description="73 Sabalan"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Kaman (Combattante II) Class">
+        <specific id="1" description="P221 Kaman"/>
+        <specific id="2" description="P222 Zoubin"/>
+        <specific id="3" description="P223 Khadang"/>
+        <specific id="4" description="P226 Falakhon"/>
+        <specific id="5" description="P227 Shamshir"/>
+        <specific id="6" description="P228 Gorz"/>
+        <specific id="7" description="P229 Gardouneh"/>
+        <specific id="8" description="P230 Khanjar"/>
+        <specific id="9" description="P231 Neyzeh"/>
+        <specific id="10" description="P232 Tabarzin"/>
+      </subcategory>
+      <subcategory id="2" description="Parvin (PGM-71) Class (large patrol craft)">
+        <specific id="1" description="211 Parvin"/>
+        <specific id="2" description="212 Bahram"/>
+        <specific id="3" description="213 Nahid"/>
+      </subcategory>
+      <subcategory id="3" description="MK II Class (Coastal patrol craft)"/>
+      <subcategory id="4" description="MIG-S-1800 Class (coastal patrol craft)"/>
+      <subcategory id="5" description="MK III Class (coastal patrol craft)"/>
+      <subcategory id="6" description="MIG-G-1900 Class (coastal patrol craft)"/>
+      <subcategory id="7" description="PBI Type (coastal patrol craft)"/>
+      <subcategory id="8" description="Enforcer Type (inshore patrol craft)"/>
+      <subcategory id="9" description="Stewart Type (inshore patrol craft)">
+        <specific id="1" description="Mahnavi-Hamraz"/>
+        <specific id="2" description="Mahnavi-Vahedi"/>
+        <specific id="3" description="Mahnavi-Taheri"/>
+      </subcategory>
+      <subcategory id="10" description="Boghammar Craft"/>
+      <subcategory id="11" description="Boston Whaler Craft (Type I)"/>
+      <subcategory id="12" description="HUDONG Class">
+        <specific id="1" description="P3131"/>
+        <specific id="2" description="P3132"/>
+        <specific id="3" description="P3133"/>
+        <specific id="4" description="P3134"/>
+        <specific id="5" description="P3135"/>
+        <specific id="6" description="P3136"/>
+        <specific id="7" description="P3137"/>
+        <specific id="8" description="P3138"/>
+        <specific id="9" description="P3139"/>
+        <specific id="10" description="P3140"/>
+      </subcategory>
+      <subcategory id="13" description="TAEDONG"/>
+      <subcategory id="14" description="TIR"/>
+      <subcategory id="15" description="PEYKAAP WPT"/>
+      <subcategory id="16" description="BANDAR-A Corvette (FFL)"/>
+      <subcategory id="17" description="KASHDOM WPBG"/>
+      <subcategory id="18" description="MIG-S-2600 Class"/>
+      <subcategory id="19" description="CHINA CAT Class"/>
+      <subcategory id="20" description="ASHOORA I PBR"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Cape Class (minesweeper-inshore)">
+        <specific id="1" description="311 Harischi"/>
+        <specific id="2" description="312 Raizi"/>
+      </subcategory>
+      <subcategory id="2" description="MSC 268/292 Class"/>
+    </category>
+    <category id="10" description="Tank Landing Ship">
+      <subcategory id="1" description="Iran Air Class (LST)">
+        <specific id="1" description="Iran Asir"/>
+        <specific id="2" description="Iran Ghaydr"/>
+      </subcategory>
+      <subcategory id="2" description="Iran Hormuz 24 Class (LST)">
+        <specific id="1" description="24-26"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="Rotork Craft (LCU)"/>
+      <subcategory id="2" description="MIG-S-3700 Class (LCT)"/>
+      <subcategory id="3" description="Iran Hormuz 21 Class (LCT)">
+        <specific id="1" description="21-23"/>
+      </subcategory>
+    </category>
+    <category id="15" description="Air Cushion/Surface Effect">
+      <subcategory id="1" description="Winchester (SR. N6) Class (hovercraft)">
+        <specific id="1" description="01-08"/>
+      </subcategory>
+      <subcategory id="2" description="Wellington (BH.7) Class (hovercraft)">
+        <specific id="1" description="101-106"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Replenishment Ship">
+        <specific id="1" description="431 Kharg"/>
+      </subcategory>
+      <subcategory id="2" description="Hendijan Class (AG) (tenders)">
+        <specific id="1" description="Hendijan"/>
+        <specific id="2" description="Konarak"/>
+        <specific id="3" description="Sirik"/>
+        <specific id="4" description="Geno"/>
+        <specific id="5" description="Kalat"/>
+        <specific id="6" description="Genaveh"/>
+        <specific id="7" description="Savatar"/>
+        <specific id="8" description="Mogam"/>
+        <specific id="9" description="Rostani"/>
+        <specific id="10" description="Mayband"/>
+        <specific id="11" description="Maqam"/>
+        <specific id="12" description="Koramshahr"/>
+        <specific id="13" description="Bamregan"/>
+      </subcategory>
+      <subcategory id="3" description="Kangan Class (water tanker)">
+        <specific id="1" description="411 Kangan"/>
+        <specific id="2" description="412 Teheri"/>
+        <specific id="3" description="xxx Shahid Marjani"/>
+        <specific id="4" description="xxx Amir"/>
+      </subcategory>
+      <subcategory id="4" description="Delvar Class (support ship)">
+        <specific id="1" description="Chark (AK) (cargo)"/>
+        <specific id="2" description="Chiroo (AK) (cargo)"/>
+        <specific id="3" description="Souru (AK) (cargo)"/>
+        <specific id="4" description="Dilim (AW) (water)"/>
+        <specific id="5" description="Dayer (AW) (water)"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Bayandor Class"/>
+    </category>
+    <category id="55" description="Amphibious Cargo Ship">
+      <subcategory id="1" description="Hengam Class (LSL)">
+        <specific id="1" description="511 Hengam"/>
+        <specific id="2" description="512 Larak"/>
+        <specific id="3" description="513 Tonb"/>
+        <specific id="4" description="514 Lavan"/>
+      </subcategory>
+    </category>
+    <category id="57" description="Ammunition Ship">
+      <subcategory id="1" description="Delvar Class (support ship)">
+        <specific id="1" description="Delvar (AE)"/>
+        <specific id="2" description="Sirjan (AE)"/>
+      </subcategory>
+    </category>
+    <category id="58" description="Combat Stores Ship">
+      <subcategory id="1" description="Fleet Supply Ship">
+        <specific id="1" description="421 Bandar Abbas"/>
+        <specific id="2" description="422 Boushehr"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="ADIR"/>
+        <specific id="2" description="IRAN ABOZAR"/>
+        <specific id="3" description="IRAN AKHAVAN"/>
+        <specific id="4" description="IRAN FALLAHI"/>
+        <specific id="5" description="IRAN TALEGHANI"/>
+        <specific id="6" description="IRAN SHARIATI"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="101">
+    <category id="5" description="SS (Conventional, Attack-Torpedo, Patrol)">
+      <subcategory id="5" description="901 Tareq"/>
+      <subcategory id="2" description="902 Noor"/>
+    </category>
+    <category id="7" description="SSA (Conventional Auxiliary)">
+      <subcategory id="1" description="Midget Submarine">
+        <specific id="1" description="Semi Submersible TAEDONG-B"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="105">
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="Gabriel Mk 1 launcher"/>
+      <subcategory id="2" description="Gabriel Mk 2 launcher"/>
+      <subcategory id="3" description="Gabriel Mk 3 launcher"/>
+      <subcategory id="4" description="Gabriel Mk LR launcher"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="105">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Israel Aircraft Industries C-7 Kifr">
+        <specific id="1" description="C-7"/>
+      </subcategory>
+      <subcategory id="3" description="I A I Lavi"/>
+    </category>
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Israel Aircraft Industries 707">
+        <specific id="1" description="707-320C"/>
+        <specific id="2" description="ARAVA IAI-202"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Surveillance/C2 (Airborne Early Warning)">
+      <subcategory id="1" description="707"/>
+      <subcategory id="2" description="720"/>
+      <subcategory id="3" description="ARAVA IAI-201"/>
+    </category>
+    <category id="21" description="Utility Helicopter">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="Bell Helicopter Textron Canada Ltd. Twin Two Twelve"/>
+    </category>
+    <category id="23" description="Cargo Helicopter">
+      <subcategory id="1" description="Israel Aircraft Industries Yasur 2000">
+        <specific id="1" description="Yasur 2000"/>
+      </subcategory>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Israel Aircraft Industries C-7 Kifr">
+        <specific id="1" description="TC-7"/>
+      </subcategory>
+    </category>
+    <category id="57" description="Non-Combatant Commercial Aircraft">
+      <subcategory id="1" description="Passenger Airline">
+        <specific id="1" description="Israel Aircraft Industries 1125 Astra SP"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="105">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Eilat (Saar 5) Class (Corvette)">
+        <specific id="1" description="501 Eilat"/>
+        <specific id="2" description="503 Hanit"/>
+        <specific id="3" description="502 Lahav"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Aliya (Saar 4.5) (fast attack craft-missile)">
+        <specific id="1" description="Aliya"/>
+        <specific id="2" description="Geoula"/>
+      </subcategory>
+      <subcategory id="2" description="Hetz (Saar 4.5) (fast attack craft-missile)">
+        <specific id="1" description="Romat"/>
+        <specific id="2" description="Keshet"/>
+        <specific id="3" description="Hetz"/>
+      </subcategory>
+      <subcategory id="3" description="Mivtach (Saar 2) Class (fast attack craft-missile)">
+        <specific id="1" description="311 Mivtach"/>
+        <specific id="2" description="312 Miznag"/>
+        <specific id="3" description="313 Mifgav"/>
+        <specific id="4" description="321 Eilath"/>
+        <specific id="5" description="322 Haifa"/>
+        <specific id="6" description="323 Akko"/>
+      </subcategory>
+      <subcategory id="4" description="Reshef (Saar 4) (fast attack craft-missile)">
+        <specific id="1" description="Reshef"/>
+        <specific id="2" description="Kidon"/>
+        <specific id="3" description="Tarshish"/>
+        <specific id="4" description="Yaffo"/>
+        <specific id="5" description="Nitzhon"/>
+        <specific id="6" description="Atsmount"/>
+        <specific id="7" description="Moledet"/>
+        <specific id="8" description="Komemiut"/>
+      </subcategory>
+      <subcategory id="5" description="Super Dvora Class (fast attack craft-gun)">
+        <specific id="1" description="810-821"/>
+      </subcategory>
+      <subcategory id="6" description="Dabur Class (coastal patrol craft)"/>
+      <subcategory id="7" description="Iquique (Saar3)">
+        <specific id="1" description="Iquique"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="Ashdod Class (LCT)">
+        <specific id="1" description="61 Ashdod"/>
+        <specific id="2" description="63 Ashkelon"/>
+        <specific id="3" description="65 Achziv"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="105">
+    <category id="4" description="SSG (Conventional Guided Missile)">
+      <subcategory id="1" description="Gal (Vickers Type 540) Class">
+        <specific id="1" description="Gal"/>
+        <specific id="2" description="Tanin"/>
+        <specific id="3" description="Rahav"/>
+      </subcategory>
+    </category>
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Dolphin Type 800">
+        <specific id="1" description="Dolphin"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="114">
+    <category id="2" description="Attack/Strike">
+      <subcategory id="2" description="Construcciones Aeronauticas CC-04 Aviojet">
+        <specific id="1" description="CC-04"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="114">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Faysal">
+        <specific id="1" description="Faysal"/>
+        <specific id="2" description="Han"/>
+        <specific id="3" description="Hasayu"/>
+        <specific id="4" description="Muhammed"/>
+      </subcategory>
+      <subcategory id="2" description="AL Hussein (Hawk) Class (fast attack craft-gun)">
+        <specific id="1" description="101 AL Hussein"/>
+        <specific id="2" description="102 AL Hussan"/>
+        <specific id="3" description="103 Abdullah"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="AL Hashim (Rotork) Class (LCU)">
+        <specific id="1" description="AL Hashim"/>
+        <specific id="2" description="AL Faisal"/>
+        <specific id="3" description="AL Hamza"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="106">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="Light Tank/Recon">
+        <specific id="1" description="Centauro B-1"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Armored Fighting Vehicle">
+      <subcategory id="1" description="Armored Personnel Carrier (APC)">
+        <specific id="1" description="VCC 1/2"/>
+        <specific id="2" description="Fiat 6614"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Self Propelled Artillery (guns and howitzers)">
+      <subcategory id="1" description="M-109G"/>
+      <subcategory id="2" description="M-109L"/>
+      <subcategory id="3" description="M-110A2"/>
+    </category>
+    <category id="5" description="Towed Artillery (anti-tank guns, guns and howitzers)">
+      <subcategory id="1" description="Model 56 PACK"/>
+      <subcategory id="2" description="FH-70"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+    <category id="10" description="Mortar">
+      <subcategory id="1" description="120 mm"/>
+      <subcategory id="2" description="81 mm"/>
+    </category>
+    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
+      <subcategory id="1" description="SPADA SAM System">
+        <specific id="1" description="Detection Center (DC)">
+          <extra id="1" description="Operational Control Center (OCC)"/>
+          <extra id="2" description="Search and Interrogation Radar (SIR)"/>
+        </specific>
+        <specific id="2" description="SPADA Firing Section">
+          <extra id="1" description="Aspide 6-Round Missile Launcher"/>
+          <extra id="2" description="Tracking and Illumination Radar (TIR)"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="106">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="AMX">
+        <specific id="1" description="AMX-T"/>
+      </subcategory>
+      <subcategory id="2" description="MB 339"/>
+      <subcategory id="3" description="MB-326"/>
+    </category>
+    <category id="2" description="Attack/Strike"/>
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="G-222"/>
+    </category>
+    <category id="20" description="Attack Helicopter">
+      <subcategory id="1" description="Agusta Bell 412SP"/>
+    </category>
+    <category id="21" description="Utility Helicopter">
+      <subcategory id="1" description="Agusta A139"/>
+      <subcategory id="2" description="Agusta-Bell 206B"/>
+      <subcategory id="3" description="Agusta-Bell 212"/>
+      <subcategory id="4" description="HA-3F"/>
+      <subcategory id="5" description="A-109"/>
+      <subcategory id="6" description="A-129"/>
+      <subcategory id="7" description="AB-205A"/>
+      <subcategory id="8" description="Agusta-Bell 214"/>
+    </category>
+    <category id="22" description="Anti-submarine Warfare/Patrol Helicopter">
+      <subcategory id="1" description="Agusta Bell 212 ASW"/>
+      <subcategory id="2" description="AS-61"/>
+      <subcategory id="3" description="ASH-3H"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="106">
+    <category id="1" description="Carrier">
+      <subcategory id="1" description="Luigi Einaudi Class (CV)">
+        <specific id="1" description="C552 Luigi Einaudi"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Command Ship/Cruiser">
+      <subcategory id="1" description="C 550 Vittorio Veneto"/>
+    </category>
+    <category id="4" description="Guided Missile Destroyer (DDG)">
+      <subcategory id="1" description="Audace class">
+        <specific id="1" description="D 550 Ardito"/>
+        <specific id="2" description="D 551 Audace"/>
+      </subcategory>
+      <subcategory id="2" description="Animoso class">
+        <specific id="1" description="D 560 Luigi Durand De La Penne"/>
+        <specific id="2" description="D 561 Francisco Mimbelli"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Cassiopea Class (Offshore Patrol Vessels) (OPV)">
+        <specific id="1" description="P401 Cassiopea"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Gaeta Class">
+        <specific id="1" description="M5550 Lerici"/>
+        <specific id="2" description="M5551 Sapri"/>
+        <specific id="3" description="M5552 Milazzo"/>
+        <specific id="4" description="M5553 Viesta"/>
+        <specific id="5" description="M5554 Gaeta"/>
+        <specific id="6" description="M5555 Termoli"/>
+        <specific id="7" description="M5556 Alghero"/>
+        <specific id="8" description="M5557 Numana"/>
+        <specific id="9" description="M5558 Crotone"/>
+        <specific id="10" description="M5559 Viareggio"/>
+        <specific id="11" description="M5560 Chioggia"/>
+        <specific id="12" description="M5561 Rimini"/>
+      </subcategory>
+      <subcategory id="2" description="Adjutant Class">
+        <specific id="1" description="M5504 Castagno"/>
+        <specific id="2" description="M5505 Cedro"/>
+        <specific id="3" description="M5509 Gelso"/>
+        <specific id="4" description="M5516 Platano"/>
+        <specific id="5" description="M5519 Mandorlo"/>
+      </subcategory>
+    </category>
+    <category id="12" description="Light Carrier">
+      <subcategory id="1" description="C551 Giuseppe Garibaldi"/>
+    </category>
+    <category id="14" description="Hydrofoil">
+      <subcategory id="1" description="Sparviero Class (Hydrofoil-Missile)">
+        <specific id="1" description="P421 Nibbio"/>
+        <specific id="2" description="P422 Falcone"/>
+        <specific id="3" description="P423 Astore"/>
+        <specific id="4" description="P424 Grifone"/>
+        <specific id="5" description="P425 Cheppio"/>
+        <specific id="6" description="P426 Condor"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Etna Class (Replenishment Tanker)">
+        <specific id="1" description="Lieut Comdr Erminio Bagnasco"/>
+      </subcategory>
+      <subcategory id="2" description="Stromboli Class">
+        <specific id="1" description="A5327 Stromboli"/>
+        <specific id="2" description="A5329 Vesuvio"/>
+      </subcategory>
+      <subcategory id="3" description="Experimental Ship">
+        <specific id="1" description="A5325 Raffaele Rossetti"/>
+        <specific id="2" description="A5320 Vincenzo Martellotta"/>
+        <specific id="3" description="P492 Barbara"/>
+        <specific id="4" description="A5305 Murena"/>
+      </subcategory>
+      <subcategory id="4" description="Barngat Class (Support Ship)">
+        <specific id="1" description="A5301 Pietro Cavezzali"/>
+      </subcategory>
+      <subcategory id="5" description="MTC 1011 Class (Ramped Transport)">
+        <specific id="1" description="A5347 Gorgona"/>
+        <specific id="2" description="A5348 Tremiti"/>
+        <specific id="3" description="A5349 Capera"/>
+        <specific id="4" description="A5351 Pantelleria"/>
+        <specific id="5" description="A5352 Lipari"/>
+        <specific id="6" description="A5353 Capri"/>
+      </subcategory>
+      <subcategory id="6" description="Pedretti Class (Commando Support Craft)">
+        <specific id="1" description="Y499 Alcide Pedretti"/>
+        <specific id="2" description="Y498 Mario Marino"/>
+      </subcategory>
+      <subcategory id="7" description="Men 215 Class (LCVP)">
+        <specific id="1" description="MEN 215"/>
+        <specific id="2" description="MEN 216"/>
+      </subcategory>
+      <subcategory id="8" description="SAR CRAFT (Air/Sea rescue)">
+        <specific id="1" description="Paolucci"/>
+      </subcategory>
+      <subcategory id="9" description="Men 212 Class (TRV)">
+        <specific id="1" description="MEN 212"/>
+      </subcategory>
+      <subcategory id="10" description="Ex-Us LCM">
+        <specific id="1" description="MTM 542"/>
+        <specific id="2" description="MTM 543"/>
+        <specific id="3" description="MTM 544"/>
+        <specific id="4" description="MTM 545"/>
+        <specific id="5" description="MTM 546"/>
+        <specific id="6" description="MTM 547"/>
+        <specific id="7" description="MTM 548"/>
+        <specific id="8" description="MTM 549"/>
+        <specific id="9" description="MTM 550"/>
+        <specific id="10" description="MTM 551"/>
+        <specific id="11" description="MTM 552"/>
+        <specific id="12" description="MTM 553"/>
+        <specific id="13" description="MTM 554"/>
+        <specific id="14" description="MTM 555"/>
+        <specific id="15" description="MTM 556"/>
+      </subcategory>
+      <subcategory id="11" description="MTM 217 Class (LCMs)">
+        <specific id="1" description="MTM 217"/>
+        <specific id="2" description="MTM 218"/>
+        <specific id="3" description="MTM 219"/>
+        <specific id="4" description="MTM 220"/>
+        <specific id="5" description="MTM 221"/>
+        <specific id="6" description="MTM 222"/>
+        <specific id="7" description="MTM 223"/>
+        <specific id="8" description="MTM 224"/>
+        <specific id="9" description="MTM 225"/>
+        <specific id="10" description="MTM 226"/>
+        <specific id="11" description="MTM 227"/>
+      </subcategory>
+      <subcategory id="12" description="US LCVP Type">
+        <specific id="1" description="MTP 9726"/>
+        <specific id="2" description="MTP 9731"/>
+        <specific id="3" description="MTP 9748"/>
+        <specific id="4" description="MTP 9749"/>
+        <specific id="5" description="MTP 9750"/>
+        <specific id="6" description="MTP 9751"/>
+      </subcategory>
+      <subcategory id="13" description="MTP 96 Class (LCVP)">
+        <specific id="1" description="MTP 96"/>
+        <specific id="2" description="MTP 97"/>
+        <specific id="3" description="MTP 98"/>
+        <specific id="4" description="MTP 99"/>
+        <specific id="5" description="MTP 100"/>
+        <specific id="6" description="MTP 101"/>
+        <specific id="7" description="MTP 102"/>
+        <specific id="8" description="MTP 103"/>
+        <specific id="9" description="MTP 104"/>
+        <specific id="10" description="MTP 105"/>
+        <specific id="11" description="MTP 106"/>
+        <specific id="12" description="MTP 107"/>
+      </subcategory>
+      <subcategory id="14" description="Harbor Tanker">
+        <specific id="1" description="GRS Type"/>
+      </subcategory>
+      <subcategory id="15" description="Training Ship">
+        <specific id="1" description="A5312 Amerigo Vespucci"/>
+        <specific id="2" description="A5311 Palinuro"/>
+        <specific id="3" description="A5378 Aragosta"/>
+        <specific id="4" description="A5379 Astice"/>
+        <specific id="5" description="A5380 Mitilo"/>
+        <specific id="6" description="A5381 Polipo"/>
+        <specific id="7" description="A5382 Porpora"/>
+        <specific id="8" description="A5308 Alloro"/>
+        <specific id="9" description="A5302 Caroly"/>
+        <specific id="10" description="A5313 Stella Polare"/>
+        <specific id="11" description="A5316 Corsaro II"/>
+        <specific id="12" description="Cristofore Colombo II"/>
+      </subcategory>
+      <subcategory id="16" description="Salvage Ship">
+        <specific id="1" description="A5310 Proteo"/>
+        <specific id="2" description="A5309 Anteo"/>
+      </subcategory>
+      <subcategory id="17" description="Lighthouse Tender">
+        <specific id="1" description="A5364 Ponza"/>
+        <specific id="2" description="A5366 Levanzo"/>
+        <specific id="3" description="A5367 Tavolara"/>
+        <specific id="4" description="A5368 Palmaria"/>
+        <specific id="5" description="A5383 Procida"/>
+      </subcategory>
+      <subcategory id="18" description="Repair Craft (LCT 3 Type)">
+        <specific id="1" description="A5331 MOC 1201"/>
+        <specific id="2" description="A5332 MOC 1202"/>
+        <specific id="3" description="A5333 MOC 1203"/>
+        <specific id="4" description="A5334 MOC 1204"/>
+        <specific id="5" description="A5335 MOC 1205"/>
+      </subcategory>
+      <subcategory id="19" description="Ferry">
+        <specific id="1" description="Tarantola"/>
+      </subcategory>
+      <subcategory id="20" description="Water Carrier">
+        <specific id="1" description="A5354 Piave"/>
+        <specific id="2" description="A5356 Basento"/>
+        <specific id="3" description="A5357 Bradano"/>
+        <specific id="4" description="A5358 Brenta"/>
+        <specific id="5" description="A5359 Bormida"/>
+      </subcategory>
+      <subcategory id="21" description="Water Carrier Tug">
+        <specific id="1" description="A5370 MCC 1101"/>
+        <specific id="2" description="A5371 MCC 1102"/>
+        <specific id="3" description="A5372 MCC 1103"/>
+        <specific id="4" description="A5373 MCC 1104"/>
+      </subcategory>
+      <subcategory id="22" description="Tug">
+        <specific id="1" description="A5319 Ciclope"/>
+        <specific id="2" description="A5324 Titano"/>
+        <specific id="3" description="A5325 Polifemo"/>
+        <specific id="4" description="A5328 Gigante"/>
+        <specific id="5" description="A5330 Saturno"/>
+        <specific id="6" description="A5365 Tenace"/>
+        <specific id="7" description="A5317 Atlante"/>
+        <specific id="8" description="A5318 Prometeo"/>
+      </subcategory>
+      <subcategory id="23" description="Coastal Tug">
+        <specific id="1" description="Y421 Porto Empedocle"/>
+        <specific id="2" description="Y422 Porto Pisano"/>
+        <specific id="3" description="Y423 Porto Conte"/>
+        <specific id="4" description="Y425 Porto Ferraio"/>
+        <specific id="5" description="Y426 Porto Venere"/>
+        <specific id="6" description="Y413 Porto Fossone"/>
+        <specific id="7" description="Y416 Porto Torres"/>
+        <specific id="8" description="Y417 Porto Corsini"/>
+        <specific id="9" description="Y436 Porto D'ischia"/>
+        <specific id="10" description="Y443 Riva Trigoso"/>
+        <specific id="11" description="Y428 Porto Salvo"/>
+      </subcategory>
+      <subcategory id="24" description="Harbour Tug">
+        <specific id="1" description="Y403 RP 101"/>
+        <specific id="2" description="Y404 RP 102"/>
+        <specific id="3" description="Y406 RP 103"/>
+        <specific id="4" description="Y407 RP 104"/>
+        <specific id="5" description="Y408 RP 105"/>
+        <specific id="6" description="Y410 RP 106"/>
+        <specific id="7" description="Y452 RP 108"/>
+        <specific id="8" description="Y456 RP 109"/>
+        <specific id="9" description="Y458 RP 110"/>
+        <specific id="10" description="Y460 RP 111"/>
+        <specific id="11" description="Y462 RP 112"/>
+        <specific id="12" description="Y463 RP 113"/>
+        <specific id="13" description="Y464 RP 114"/>
+        <specific id="14" description="Y465 RP 115"/>
+        <specific id="15" description="Y466 RP 116"/>
+        <specific id="16" description="Y468 RP 118"/>
+        <specific id="17" description="Y470 RP 119"/>
+        <specific id="18" description="Y471 RP 120"/>
+        <specific id="19" description="RP 121"/>
+        <specific id="20" description="Y473 RP 122"/>
+        <specific id="21" description="Y467 RP 123"/>
+        <specific id="22" description="Y477 RP 124"/>
+        <specific id="23" description="Y478 RP 125"/>
+        <specific id="24" description="Y479 RP 126"/>
+        <specific id="25" description="Y480 RP 127"/>
+        <specific id="26" description="Y481 RP 128"/>
+        <specific id="27" description="Y482 RP 129"/>
+        <specific id="28" description="Y483 RP 130"/>
+        <specific id="29" description="Y484 RP 131"/>
+        <specific id="30" description="Y485 RP 132"/>
+        <specific id="31" description="Y486 RP 133"/>
+        <specific id="32" description="Y487 RP 134"/>
+      </subcategory>
+      <subcategory id="25" description="(deleted)"/>
+      <subcategory id="26" description="Floating Dock">
+        <specific id="1" description="GO 1"/>
+        <specific id="2" description="GO 5"/>
+        <specific id="3" description="GO 8"/>
+        <specific id="4" description="GO 10"/>
+        <specific id="5" description="GO 11"/>
+        <specific id="6" description="GO 17"/>
+        <specific id="7" description="GO 18A"/>
+        <specific id="8" description="GO 18B"/>
+        <specific id="9" description="GO 20"/>
+        <specific id="10" description="GO 22"/>
+        <specific id="11" description="GO 23"/>
+        <specific id="12" description="GO 51"/>
+        <specific id="13" description="GO 52"/>
+        <specific id="14" description="GO 53"/>
+      </subcategory>
+      <subcategory id="27" description="Guardia Costiera-Capitaneria Di porto (Coast Guard)">
+        <specific id="1" description="CP 406"/>
+        <specific id="2" description="CP 251"/>
+      </subcategory>
+      <subcategory id="28" description="Servizio Navale Carabinieri">
+        <specific id="1" description="S500"/>
+        <specific id="2" description="S400"/>
+      </subcategory>
+      <subcategory id="29" description="Servizio Navale Guardia Di Finanza">
+        <specific id="1" description="Gian Maria Paolini"/>
+      </subcategory>
+      <subcategory id="30" description="Antonio Zara Class">
+        <specific id="1" description="Antonio Zara P 01"/>
+        <specific id="2" description="Vezzari P 02"/>
+      </subcategory>
+      <subcategory id="31" description="Corrubia &amp; Bigliani Classes">
+        <specific id="1" description="Bigliani G 80"/>
+        <specific id="2" description="Cavaglia G 81"/>
+        <specific id="3" description="Corrubia G 90"/>
+        <specific id="4" description="Guidice G 91"/>
+      </subcategory>
+      <subcategory id="32" description="Alpino Class (MCS)">
+        <specific id="1" description="A5384 Alpino"/>
+      </subcategory>
+    </category>
+    <category id="17" description="Auxiliary, Merchant Marine">
+      <subcategory id="1" description="A5303 Ammiraglio Magnaghi"/>
+      <subcategory id="2" description="A5306 Mirto"/>
+      <subcategory id="3" description="A5307 Pioppo"/>
+    </category>
+    <category id="18" description="Utility">
+      <subcategory id="1" description="Cassiopea Class">
+        <specific id="1" description="P401 Cassiopea"/>
+        <specific id="2" description="P402 Libra"/>
+        <specific id="3" description="P403 Spica"/>
+        <specific id="4" description="P404 Vega"/>
+      </subcategory>
+      <subcategory id="2" description="Agave Class">
+        <specific id="1" description="P495 Bambu"/>
+        <specific id="2" description="P496 Mango"/>
+        <specific id="3" description="P497 Mogano"/>
+        <specific id="4" description="P500 Palma"/>
+      </subcategory>
+      <subcategory id="3" description="Aggressive Class">
+        <specific id="1" description="Storione"/>
+        <specific id="2" description="Squalo"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Alpino class">
+        <specific id="1" description="F 580 Alpino"/>
+        <specific id="2" description="F 581 Carabiniere"/>
+      </subcategory>
+      <subcategory id="2" description="Maestrale class">
+        <specific id="1" description="F 570 Maestrale"/>
+        <specific id="2" description="F 571 Gricale"/>
+        <specific id="3" description="F 572 Libeccio"/>
+        <specific id="4" description="F 573 Scirocco"/>
+        <specific id="5" description="F 574 Aliseo"/>
+        <specific id="6" description="F 575 Euro"/>
+        <specific id="7" description="F 576 Espero"/>
+        <specific id="8" description="F 577 Zeffiro"/>
+      </subcategory>
+      <subcategory id="3" description="Lupo class">
+        <specific id="1" description="F 564 Lupo"/>
+        <specific id="2" description="F 565 Sagittario"/>
+        <specific id="3" description="F 566 Perseo"/>
+        <specific id="4" description="F 567 Orsa"/>
+      </subcategory>
+      <subcategory id="4" description="Artigliere (Lupo) class">
+        <specific id="1" description="F 582 Artigliere"/>
+        <specific id="2" description="F 583 Aviere"/>
+        <specific id="3" description="F 584 Bersagliere"/>
+        <specific id="4" description="F 585 Granatiere"/>
+      </subcategory>
+      <subcategory id="5" description="Minerva class">
+        <specific id="1" description="F 551 Minerva"/>
+        <specific id="2" description="F 552 Urania"/>
+        <specific id="3" description="F 553 Danaide"/>
+        <specific id="4" description="F 554 Sfinge"/>
+        <specific id="5" description="F 555 Driade"/>
+        <specific id="6" description="F 556 Chimera"/>
+        <specific id="7" description="F 557 Fenice"/>
+        <specific id="8" description="F 558 Sibella"/>
+      </subcategory>
+      <subcategory id="6" description="De Cristofaro class">
+        <specific id="1" description="F 550 Salvatore Todaro"/>
+      </subcategory>
+    </category>
+    <category id="56" description="Amphibious Transport Dock">
+      <subcategory id="1" description="San Giorgio Class (LPDs)">
+        <specific id="1" description="L9892 San Giorgio"/>
+        <specific id="2" description="L9893 San Marco"/>
+        <specific id="3" description="L9894 San Giusto"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Bulkignazio"/>
+        <specific id="2" description="Bulk Genova"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker class">
+        <specific id="1" description="Eco Europa"/>
+        <specific id="2" description="Pantelleria"/>
+        <specific id="3" description="Agip Siracusa"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="106">
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="5" description="Improved Sauro Class">
+        <specific id="1" description="S 522 Salvatore Pelosi"/>
+        <specific id="2" description="S 523 Giuliano Prini"/>
+        <specific id="3" description="S 524 Primo Longobrado"/>
+        <specific id="4" description="S 525 Gazzana Priaroggia"/>
+      </subcategory>
+      <subcategory id="2" description="Sauro Class (1081 Type)">
+        <specific id="1" description="S 518 Nazario Sauro"/>
+        <specific id="2" description="S 519 Fecia Di Cossato"/>
+        <specific id="3" description="S 520 Leonardo Da Vinci"/>
+        <specific id="4" description="S 521 Guglielmo Marconi"/>
+      </subcategory>
+      <subcategory id="3" description="Toti Class (1075 class)">
+        <specific id="1" description="S 506 Enrico Toti"/>
+        <specific id="2" description="S 513 Enrico Dandolo"/>
+      </subcategory>
+      <subcategory id="4" description="Type 212A SSK">
+        <specific id="1" description="Salvatore Todaro"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="16">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="AL Manama (FPB 62) Class (fast attack craft-missile)">
+        <specific id="1" description="50 AL Manama"/>
+        <specific id="2" description="51 AL Muharraq"/>
+      </subcategory>
+      <subcategory id="2" description="Almad EL Fateh (FPB 45) Class (fast attack craft-missile)">
+        <specific id="1" description="20 Admad El Fateh"/>
+        <specific id="2" description="21 Al Jabiri"/>
+        <specific id="3" description="22 Abdul Rahman AL Fadel"/>
+        <specific id="4" description="23 Al Taweelah"/>
+      </subcategory>
+      <subcategory id="3" description="AL Riffa (FPB 38) Class (fast attack craft-gun)">
+        <specific id="1" description="10 AL Riffa"/>
+        <specific id="2" description="11 Hawar"/>
+      </subcategory>
+      <subcategory id="4" description="AL Jarim (FPB 20) Class (fast attack craft-gun)">
+        <specific id="1" description="30 AL Jarim"/>
+        <specific id="2" description="31 AL Jasrah"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Support Ship">
+        <specific id="1" description="41 Ajeera"/>
+        <specific id="2" description="42 Mashtan"/>
+        <specific id="3" description="43 Rubodh"/>
+        <specific id="4" description="44 Suwad"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="223">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Muray Jip (Lurssen 62) Class (Corvette)">
+        <specific id="1" description="P6501 Muray Jip"/>
+        <specific id="2" description="P6502 Das"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Kawkab Class (coastal patrol craft)">
+        <specific id="1" description="P561 Kawkab"/>
+        <specific id="2" description="P562 Thoaban"/>
+        <specific id="3" description="P563 Bani Yas"/>
+      </subcategory>
+      <subcategory id="2" description="Murbarraz Class (fast attack craft-missile)">
+        <specific id="1" description="P4401 Murbarraz"/>
+        <specific id="2" description="P4402 Makasib"/>
+      </subcategory>
+      <subcategory id="3" description="Ban Yas (Lurssen TNC 45) Class (fast attack craft-missile)">
+        <specific id="1" description="P4501 Ban Yas"/>
+        <specific id="2" description="P4502 Marban"/>
+        <specific id="3" description="P4503 Rodqm"/>
+        <specific id="4" description="P4504 Shaheen"/>
+        <specific id="5" description="P4505 Sagar"/>
+        <specific id="6" description="P4506 Tarif"/>
+      </subcategory>
+      <subcategory id="4" description="Ardhana Class (large patrol craft)">
+        <specific id="1" description="P1101 Ardana"/>
+        <specific id="2" description="P1102 Zurara"/>
+        <specific id="3" description="P1103 Murban"/>
+        <specific id="4" description="P1104 Al Ghullan"/>
+        <specific id="5" description="P1105 Radoom"/>
+        <specific id="6" description="P1105 Ghanadhah"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Tank Landing Ship">
+      <subcategory id="1" description="LSL/LST">
+        <specific id="1" description="L5401 Al Feyi"/>
+        <specific id="2" description="L5402 Jananah"/>
+        <specific id="3" description="L5403 Dayyinah"/>
+      </subcategory>
+    </category>
+    <category id="11" description="Landing Craft">
+      <subcategory id="1" description="LCM">
+        <specific id="1" description="Ghagha II"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Cheverton Type (Tender)">
+        <specific id="1" description="A271"/>
+        <specific id="2" description="A272"/>
+      </subcategory>
+      <subcategory id="2" description="Diving Tender">
+        <specific id="1" description="D1051"/>
+      </subcategory>
+      <subcategory id="3" description="Support Craft">
+        <specific id="1" description="Baracuda"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Julphara"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Al Dhabiyyah"/>
+        <specific id="2" description="Al Dhibyaniyyah"/>
+        <specific id="3" description="Al Markhaniya"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="237">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="7" description="Broadsword Class (coastal patrol craft)">
+        <specific id="1" description="141 26 September"/>
+        <specific id="2" description="142 Ramadan"/>
+        <specific id="3" description="143 Sana's"/>
+      </subcategory>
+      <subcategory id="2" description="Baklan Class (PCF)">
+        <specific id="1" description="1201 Baklan"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Toplivo Class">
+        <specific id="1" description="135 (tanker-water)"/>
+        <specific id="2" description="140 (tanker-oil)"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Kedah Cement I"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker">
+        <specific id="1" description="Abc Al-Rodha"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="10">
+    <category id="4" description="Guided Missile Destroyer">
+      <subcategory id="1" description="Almirante Brown (Meko 360)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Costa Sur"/>
+      <subcategory id="2" description="Puerto Deseado"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="10">
+    <category id="5" description="SS (Conventional Attack - Torpedo, Patrol">
+      <subcategory id="1" description="Santa Cruz (TR 1700) Class (SS)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="21">
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Wielingen Class (FF)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="39">
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="CC144 Challenger"/>
+    </category>
+    <category id="5" description="ASW/Patrol/Observation">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="CP144 Challenger"/>
+    </category>
+    <category id="6" description="Electronic Warfare (EW)">
+      <subcategory id="1" description="CE144 Challenger"/>
+    </category>
+    <category id="22" description="Antisubmarine Warfare/Patrol Helicopter">
+      <subcategory id="1" description="CH-124 (HELO)"/>
+    </category>
+    <category id="57" description="Non-combatant Commercial Aircraft">
+      <subcategory id="1" description="Passenger Airline">
+        <specific id="1" description="DASH-8"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="39">
+    <category id="4" description="Guided Missile Destroyer (DDG)">
+      <subcategory id="1" description="Iroquis Class (DDG)"/>
+    </category>
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Halifax Class (FFG)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Provider Class (AOR)"/>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Annapolis Class (FF)"/>
+      <subcategory id="2" description="Restigouche Class (FF)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="57">
+    <category id="57" description="Light/ Patrol Craft">
+      <subcategory id="1" description="Willemoes Class"/>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Lindo Maersk"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="62">
+    <category id="5" description="Destroyer">
+      <subcategory id="1" description="Z Class (DD)">
+        <specific id="1" description="921 El Fateh"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided Missile Frigates">
+      <subcategory id="1" description="Descubierta Class (FFG)">
+        <specific id="1" description="F946 Abu Qir"/>
+      </subcategory>
+      <subcategory id="2" description="Jianghu I Class (FFG)">
+        <specific id="1" description="951 Najim Al Zaffer"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Ramadan Class"/>
+    </category>
+    <category id="61" description="Non-combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Abydos"/>
+        <specific id="2" description="Esna"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Al Sharifa II"/>
+        <specific id="2" description="Abu Khalid"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="62">
+    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
+      <subcategory id="1" description="Improved Romeo Class (Type 033) (SSK)">
+        <specific id="1" description="849"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="99">
+    <category id="2" description="Attack/Strike">
+      <subcategory id="1" description="HAL Jaguar"/>
+      <subcategory id="2" description="HAL Kiran Mk II"/>
+    </category>
+    <category id="21" description="Utility Helicopter">
+      <subcategory id="1" description="HAL SA 316 Alouette III"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="99">
+    <category id="4" description="Guided Missile Destroyer (DDG)">
+      <subcategory id="1" description="Delhi Class"/>
+      <subcategory id="2" description="Rajput Class"/>
+    </category>
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Godavari Class"/>
+      <subcategory id="2" description="Talwar (Type 1135.6/Project 17) Class (FFG)">
+        <specific id="1" description="Talwar"/>
+      </subcategory>
+      <subcategory id="3" description="Brahmaputra Class (FFG)">
+        <specific id="1" description="F31 Brahmaputra"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft(PC)">
+      <subcategory id="1" description="Sukanya Class"/>
+      <subcategory id="2" description="Samar Class"/>
+      <subcategory id="3" description="Abhay (Pauk II) Class (FS)">
+        <specific id="1" description="P33 Abhay"/>
+      </subcategory>
+      <subcategory id="4" description="Durg (Nanuchka II) Class (FSG)">
+        <specific id="1" description="K72 Sindhudurg"/>
+      </subcategory>
+      <subcategory id="5" description="SDB Mk 3/T 60 Class (Large Patrol Craft) (PC)">
+        <specific id="1" description="Y61 Trinkat"/>
+      </subcategory>
+      <subcategory id="6" description="Super Dvora MkII Class (PFC)">
+        <specific id="1" description="T80"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Mahe (Yevgenya) Class (Type 1258)">
+        <specific id="1" description="M83 Mahe"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Deepak Class (Replenishment Tanker) ( AOR)">
+        <specific id="1" description="A57 Shakti"/>
+      </subcategory>
+      <subcategory id="2" description="Jyoti Class (Replenishment Tanker ) (AOR)">
+        <specific id="1" description="A58 Jyoti"/>
+      </subcategory>
+      <subcategory id="3" description="Aditya Class (Replenishment and Repair Ship) (AOR/AR)">
+        <specific id="1" description="A59 Aditya"/>
+      </subcategory>
+      <subcategory id="4" description="Support Tanker (AOTL)">
+        <specific id="1" description="Poshak"/>
+      </subcategory>
+      <subcategory id="5" description="Transport Ship (AP)">
+        <specific id="1" description="Nicobar"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Khukri Class"/>
+      <subcategory id="2" description="Kora Class (Project 25A) ( FSG)">
+        <specific id="1" description="P61 Kora"/>
+      </subcategory>
+    </category>
+    <category id="54" description="Amphibious Assault Ship">
+      <subcategory id="1" description="Magar Class (LST)">
+        <specific id="1" description="L20 Magar"/>
+      </subcategory>
+      <subcategory id="2" description="Mk 3 Landing Craft (LCU/LSM)">
+        <specific id="1" description="L34 Vasco Da Gama"/>
+      </subcategory>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container class">
+        <specific id="1" description="Pearl Grace"/>
+        <specific id="2" description="Aditya Gaurav"/>
+        <specific id="3" description="Aditya Gautam"/>
+        <specific id="4" description="Aditya Gopal"/>
+        <specific id="5" description="Aditya Prakash"/>
+        <specific id="6" description="Fomento Sharad"/>
+        <specific id="7" description="ICL Parthibhan"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker class">
+        <specific id="1" description="Ankleshwar"/>
+        <specific id="2" description="Annapurna"/>
+        <specific id="3" description="Jag Leela"/>
+        <specific id="4" description="Abul Kalam Azad"/>
+        <specific id="5" description="Aditya Vikram"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="110">
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="SSM-1A/1B (type 88/90) launcher"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="110">
+    <category id="4" description="Guided Missile Destroyer (DDG)">
+      <subcategory id="1" description="Kongo Class (DDG)"/>
+      <subcategory id="2" description="Tachikaze Class (DDG)"/>
+      <subcategory id="3" description="Hatakaze Class (DDG)"/>
+    </category>
+    <category id="5" description="Destroyer (DD)">
+      <subcategory id="1" description="Shirane Class (DD)"/>
+      <subcategory id="2" description="Haruna Class (DD)"/>
+      <subcategory id="3" description="Asagiri Class (DD)"/>
+      <subcategory id="4" description="Hatsuyuki Class (DD)"/>
+      <subcategory id="5" description="Minegumo Class (DD)"/>
+      <subcategory id="6" description="Takasuki Class (DD)"/>
+      <subcategory id="7" description="Yamagumo Class (DD)"/>
+      <subcategory id="8" description="Murasame Class"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Hatsushima Class (Minesweeper)"/>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Abukuma Class (FF)"/>
+      <subcategory id="2" description="Yubari Class (FF)"/>
+      <subcategory id="3" description="Chikugo Class (FF)"/>
+    </category>
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Supertanker">
+        <specific id="1" description="Kota Mutiara"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="110">
+    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
+      <subcategory id="5" description="Harushio Class (SS)"/>
+      <subcategory id="2" description="Yuushio Class (SS)"/>
+      <subcategory id="3" description="Uzushio Class (SS)"/>
+      <subcategory id="4" description="Oyashio Class"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="126">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="6" description="Dat Assawari"/>
+    </category>
+    <category id="7" description="Light/Patrol Craft (PC)">
+      <subcategory id="1" description="Combattante 2 G Class">
+        <specific id="1" description="Laheeb"/>
+        <specific id="2" description="Shafak"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate(including Corvette)">
+      <subcategory id="1" description="Assad Class">
+        <specific id="1" description="Assad AL BIHAR"/>
+        <specific id="2" description="Assad ELTOUGOUR"/>
+        <specific id="3" description="Assad AL KHALI"/>
+        <specific id="4" description="Assad AL HUDUD"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="153">
+    <category id="23" description="Warning System">
+      <subcategory id="1" description="CRC">
+        <specific id="1" description="CRC (NL)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="153">
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="Fokker F27"/>
+    </category>
+    <category id="21" description="Utility Helicopter">
+      <subcategory id="1" description="SH 14 (Mk27 Lynx)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="153">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Tromp Class"/>
+      <subcategory id="2" description="Kortenaer Class"/>
+      <subcategory id="3" description="Jacob Van Heemskerck Class"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="A20 Moawin (ex. Poolster) Pakistan"/>
+      <subcategory id="2" description="Amsterdam"/>
+      <subcategory id="3" description="Tanker (AOT)">
+        <specific id="1" description="A40 Attock"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="153">
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Walrus Class"/>
+      <subcategory id="2" description="Hai Lung Class">
+        <specific id="1" description="793 Hai Lung (Taiwan)"/>
+        <specific id="2" description="794 Hai Hu (Taiwan)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="163">
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="Penguin Mk 2 launcher"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="163">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Snogg Class"/>
+      <subcategory id="2" description="Hauk Class">
+        <specific id="1" description="Hauk"/>
+        <specific id="2" description="Orn"/>
+        <specific id="3" description="Terne"/>
+        <specific id="4" description="Tjeld"/>
+        <specific id="5" description="Skarv"/>
+        <specific id="6" description="Teist"/>
+        <specific id="7" description="Jo"/>
+        <specific id="8" description="Lom"/>
+        <specific id="9" description="Stegg"/>
+        <specific id="10" description="Falk"/>
+        <specific id="11" description="Ravn"/>
+        <specific id="12" description="Gribb"/>
+        <specific id="13" description="Geir"/>
+        <specific id="14" description="Erle"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Vidar Class"/>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Oslo Class"/>
+    </category>
+    <category id="61" description="Non-combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Amber Fin"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Berge Sisar"/>
+        <specific id="2" description="Bow Century"/>
+        <specific id="3" description="Hebris"/>
+        <specific id="4" description="Norgas Energy"/>
+        <specific id="5" description="Sitalene"/>
+        <specific id="6" description="Solviken"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="163">
+    <category id="5" description="SS(Conventional Attack-Torpedo Patrol)">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="S300 Ula"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="198">
+    <category id="4" description="Cargo/Tanker">
+      <subcategory id="1" description="CASA C-212"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="198">
+    <category id="1" description="Carrier">
+      <subcategory id="1" description="Principe De Asturias Class (CVS)">
+        <specific id="1" description="R11 Principe De Asturias"/>
+      </subcategory>
+    </category>
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Baleares Class"/>
+      <subcategory id="2" description="Alvaro De Bazan Class (FFG)">
+        <specific id="1" description="F101 Alvaro De Bazan"/>
+      </subcategory>
+      <subcategory id="3" description="Santa Maria Class (FFG)">
+        <specific id="1" description="F81 Santa Maria"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Barcelo Class"/>
+      <subcategory id="2" description="Serviola Class">
+        <specific id="1" description="P71 Serviola"/>
+      </subcategory>
+      <subcategory id="3" description="Conejera Class (Coastal Patrol)">
+        <specific id="1" description="P31 Conejera"/>
+      </subcategory>
+      <subcategory id="4" description="Anaga Class">
+        <specific id="1" description="P21 Anaga"/>
+      </subcategory>
+      <subcategory id="5" description="Toralla Class (Coastal Patrol Craft) ( PC)">
+        <specific id="1" description="P81 Tortalla"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship">
+      <subcategory id="1" description="Segura Class (Minehunters) (MHC)">
+        <specific id="1" description="M31 Segura"/>
+      </subcategory>
+      <subcategory id="2" description="Adjutant, Redwing and MSC 268 Class">
+        <specific id="1" description="M22 Ebro"/>
+      </subcategory>
+    </category>
+    <category id="16" description="Auxiliry">
+      <subcategory id="1" description="Patino Class (Fleet Logistic Tanker) (AOR)">
+        <specific id="1" description="A14 Patino"/>
+      </subcategory>
+      <subcategory id="2" description="Transport Ship (AP)">
+        <specific id="1" description="A04 Martin Posadillo"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Descubierto Class"/>
+    </category>
+    <category id="56" description="Amphibious Transport Dock">
+      <subcategory id="1" description="Galicia Class (LPD)">
+        <specific id="1" description="L51 Galicia"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="206">
+    <category id="5" description="Towed Artillery">
+      <subcategory id="1" description="NORICUM GH N-45 155mm gun-howitzer"/>
+    </category>
+    <category id="28" description="Air Defense/Missile Defense Unit Equipment">
+      <subcategory id="1" description="Towed VSHORAD Gun/Missile System">
+        <specific id="1" description="Oerlikon-Contraves 35mm">
+          <extra id="1" description="GDF-Series Twin-35mm"/>
+          <extra id="2" description="Skyshield 35 Revolver Gun Mount (RGM)"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="206">
+    <category id="4" description="Cargo / Tanker">
+      <subcategory id="1" description="Pilatus PC-6">
+        <specific id="1" description="Pilatus PC-6 Turbo Porter"/>
+      </subcategory>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Pilatus PC-7">
+        <specific id="1" description="Pilatus PC-7 Turbo Trainer"/>
+        <specific id="2" description="PC-7 Mk II"/>
+      </subcategory>
+      <subcategory id="2" description="Pilatus PC-9">
+        <specific id="1" description="Pilatus PC-9 Turbo Trainer"/>
+        <specific id="2" description="PC-9 Mk II"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="210">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Naresuan Class"/>
+      <subcategory id="2" description="Chao Phraya Class"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="218">
+    <category id="5" description="Destroyer (DD)">
+      <subcategory id="1" description="Mod Gearing Fram"/>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Dogan Class"/>
+    </category>
+    <category id="50" description="Frigate (including Corvette)">
+      <subcategory id="1" description="Yavuz"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="218">
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Modified Guppy III Class"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="240">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="1" description="Split/Kotor"/>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Koncar Class"/>
+      <subcategory id="2" description="Mirna Class Type 140 PCF">
+        <specific id="1" description="Ucka 174"/>
+        <specific id="2" description="Grmec 175"/>
+        <specific id="3" description="Gora 177"/>
+        <specific id="4" description="Kosmaj 178"/>
+        <specific id="5" description="Zelengora 179"/>
+      </subcategory>
+      <subcategory id="3" description="Damen Class"/>
+    </category>
+    <category id="8" description="Mine Countermeasure Ship/Craft">
+      <subcategory id="1" description="Silba Class (LCT)"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Spasilac Class (ASR)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="240">
+    <category id="5" description="SS (Conventional Attack-Torpedo, Patrol)">
+      <subcategory id="1" description="Heroj Class"/>
+      <subcategory id="2" description="Sava Class"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="197">
+    <category id="1" description="Tank">
+      <subcategory id="1" description="Olifant">
+        <specific id="1" description="Mk 1"/>
+        <specific id="2" description="Mk 2"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Armored Fighting Vehicle">
+      <subcategory id="1" description="Rooikat">
+        <specific id="1" description="76 mm"/>
+      </subcategory>
+      <subcategory id="2" description="Ratel">
+        <specific id="1" description="20 mm"/>
+        <specific id="2" description="60 mm"/>
+        <specific id="3" description="90 mm"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Armored Utility Vehicle">
+      <subcategory id="1" description="BLV"/>
+    </category>
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="G6 155-mm Howitzer"/>
+    </category>
+    <category id="5" description="Towed Artillery">
+      <subcategory id="1" description="G5"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="197">
+    <category id="1" description="Fighter / Air Defense">
+      <subcategory id="1" description="Cheetah">
+        <specific id="1" description="C"/>
+        <specific id="2" description="D"/>
+      </subcategory>
+    </category>
+    <category id="20" description="Attack Helicopter">
+      <subcategory id="1" description="Rooivalk"/>
+    </category>
+    <category id="50" description="Unmanned">
+      <subcategory id="1" description="RPV">
+        <specific id="1" description="Seeker"/>
+        <specific id="2" description="Vulture"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="56">
+    <category id="1" description="Fighter / Air Defense">
+      <subcategory id="1" description="Aero L-159"/>
+    </category>
+    <category id="2" description="Attack / Strike">
+      <subcategory id="1" description="Aero L-39Z Albatros">
+        <specific id="1" description="Aero L-39ZO"/>
+        <specific id="2" description="Aero L-39ZA"/>
+      </subcategory>
+      <subcategory id="2" description="Aero L-59"/>
+    </category>
+    <category id="4" description="Cargo / Tanker">
+      <subcategory id="1" description="Let L-410 Turbolet"/>
+    </category>
+    <category id="40" description="Trainer">
+      <subcategory id="1" description="Zlin Z-142"/>
+      <subcategory id="2" description="Aero L-29 Delphin"/>
+      <subcategory id="3" description="Aero L-39C Albatros"/>
+      <subcategory id="4" description="Aero L-59"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="208">
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="Hsiung Feng I launcher"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="208">
+    <category id="1" description="Fighter/Air Defense">
+      <subcategory id="1" description="Ching-kuo (IDF)"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="208">
+    <category id="6" description="Guided Missile Frigate (FFG)">
+      <subcategory id="6" description="Cheng Kung Class (Kwang Hua Project)">
+        <specific id="1" description="FFG 1101 Cheng Kung"/>
+        <specific id="2" description="FFG 1103 Cheng Ho"/>
+        <specific id="3" description="FFG 1105 Chi Kuang"/>
+        <specific id="4" description="FFG 1106 Yueh Fei"/>
+        <specific id="5" description="FFG 1107 Tzu-I"/>
+        <specific id="6" description="FFG 1108 Pan Chao"/>
+        <specific id="7" description="FFG 1109 Chang Chien"/>
+      </subcategory>
+      <subcategory id="2" description="Kang Ding (La Fayette) Class">
+        <specific id="1" description="FFG 1202 Kang Ding"/>
+        <specific id="2" description="FFG 1203 Si Ning"/>
+        <specific id="3" description="FFG 1205 Kun Ming"/>
+        <specific id="4" description="FFG 1206 Di Hua"/>
+        <specific id="5" description="FFG 1207 Wu Chang"/>
+        <specific id="6" description="FFG 1208 Chen Te"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Hai Ou Class">
+        <specific id="1" description="FABG 5"/>
+        <specific id="2" description="FABG 6"/>
+        <specific id="3" description="FABG 7"/>
+        <specific id="4" description="FABG 8"/>
+        <specific id="5" description="FABG 9"/>
+        <specific id="6" description="FABG 10"/>
+        <specific id="7" description="FABG 11"/>
+        <specific id="8" description="FABG 12"/>
+        <specific id="9" description="FABG 14"/>
+        <specific id="10" description="FABG 15"/>
+        <specific id="11" description="FABG 16"/>
+        <specific id="12" description="FABG 17"/>
+        <specific id="13" description="FABG 18"/>
+        <specific id="14" description="FABG 19"/>
+        <specific id="15" description="FABG 20"/>
+        <specific id="16" description="FABG 21"/>
+        <specific id="17" description="FABG 23"/>
+        <specific id="18" description="FABG 24"/>
+        <specific id="19" description="FABG 25"/>
+        <specific id="20" description="FABG 26"/>
+        <specific id="21" description="FABG 27"/>
+        <specific id="22" description="FABG 28"/>
+        <specific id="23" description="FABG 29"/>
+        <specific id="24" description="FABG 30"/>
+        <specific id="25" description="FABG 32"/>
+        <specific id="26" description="FABG 33"/>
+        <specific id="27" description="FABG 34"/>
+        <specific id="28" description="FABG 35"/>
+        <specific id="29" description="FABG 36"/>
+        <specific id="30" description="FABG 37"/>
+        <specific id="31" description="FABG 38"/>
+        <specific id="32" description="FABG 39"/>
+        <specific id="33" description="FABG 41"/>
+        <specific id="34" description="FABG 42"/>
+        <specific id="35" description="FABG 43"/>
+        <specific id="36" description="FABG 44"/>
+        <specific id="37" description="FABG 45"/>
+        <specific id="38" description="FABG 46"/>
+        <specific id="39" description="FABG 47"/>
+        <specific id="40" description="FABG 48"/>
+        <specific id="41" description="FABG 49"/>
+        <specific id="42" description="FABG 50"/>
+        <specific id="43" description="FABG 51"/>
+        <specific id="44" description="FABG 52"/>
+        <specific id="45" description="FABG 53"/>
+        <specific id="46" description="FABG 54"/>
+        <specific id="47" description="FABG 55"/>
+        <specific id="48" description="FABG 56"/>
+        <specific id="49" description="FABG 57"/>
+        <specific id="50" description="FABG 58"/>
+      </subcategory>
+      <subcategory id="2" description="Jin Chiang Class">
+        <specific id="1" description="603 Jin Chiang"/>
+      </subcategory>
+      <subcategory id="3" description="PCL Type">
+        <specific id="1" description="1 PCL"/>
+        <specific id="2" description="2 PCL"/>
+        <specific id="3" description="3 PCL"/>
+        <specific id="4" description="5 PCL"/>
+        <specific id="5" description="6 PCL"/>
+        <specific id="6" description="7 PCL"/>
+        <specific id="7" description="8 PCL"/>
+        <specific id="8" description="9 PCL"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Mine Coutermeasures Ship/Craft">
+      <subcategory id="1" description="Yun Feng Class">
+        <specific id="1" description="1301 Yung Feng"/>
+        <specific id="2" description="1302 Yung Chia"/>
+        <specific id="3" description="1303 Yung Nieng"/>
+        <specific id="4" description="1305 Yung Shoen"/>
+      </subcategory>
+    </category>
+    <category id="56" description="Amphibious Transport Dock">
+      <subcategory id="1" description="Tai Wu Class">
+        <specific id="1" description="518 Tai Wu"/>
+        <specific id="2" description="522 Ling Yuen"/>
+        <specific id="3" description="523 Wan An"/>
+      </subcategory>
+      <subcategory id="2" description="Wu Kang Class">
+        <specific id="1" description="524 Yuen Feng"/>
+        <specific id="2" description="525 Wu Kang"/>
+        <specific id="3" description="526 Hsin Kang"/>
+      </subcategory>
+    </category>
+    <category id="60" description="Fast Combat Support Ship">
+      <subcategory id="1" description="Wu Yi Class">
+        <specific id="1" description="530 Wu Yi"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="208">
+    <category id="5" description="SS (Conventional Attack-Torpedo Patrol)">
+      <subcategory id="1" description="Hai Shih (ex. Guppy II)">
+        <specific id="1" description="791 Hai Shih"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="2">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Florida"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="15">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Chicago Express"/>
+        <specific id="2" description="Sea Leader"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Berge Hus"/>
+        <specific id="2" description="Mosocean"/>
+        <specific id="3" description="Orient Tiger"/>
+        <specific id="4" description="Ramlah"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="22">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Boka Star"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="24">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Corner Brook"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="55">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Yukon"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Beltrade"/>
+        <specific id="2" description="Fulmar"/>
+        <specific id="3" description="Messiniakos"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="82">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Daedalus"/>
+        <specific id="2" description="Fedra"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Althea"/>
+        <specific id="2" description="Olympic Loyalty"/>
+        <specific id="3" description="Peaceventure L"/>
+      </subcategory>
+      <subcategory id="3" description="Supertanker">
+        <specific id="1" description="H. Alhambra"/>
+        <specific id="2" description="H. Metropolis"/>
+        <specific id="3" description="H. Fairfax"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="125">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Jolly Orca"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Almak"/>
+        <specific id="2" description="Alphard Star"/>
+        <specific id="3" description="Amber Lady"/>
+        <specific id="4" description="Front Chief"/>
+        <specific id="5" description="Ish"/>
+        <specific id="6" description="Khannur"/>
+        <specific id="7" description="Kuban"/>
+        <specific id="8" description="New Vitality"/>
+        <specific id="9" description="Ocean Guardian"/>
+        <specific id="10" description="Polaris Star"/>
+        <specific id="11" description="Shahamah"/>
+        <specific id="12" description="Tarquin Navigator"/>
+        <specific id="13" description="Igloo Star"/>
+        <specific id="14" description="SC Breeze"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="168">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Pollux"/>
+        <specific id="2" description="Sima Roja"/>
+        <specific id="3" description="Stellar Might"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Navix Astral"/>
+        <specific id="2" description="Oriental Daisy"/>
+        <specific id="3" description="Pacific Lagoon"/>
+        <specific id="4" description="World Princess"/>
+        <specific id="5" description="Nereo"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="173">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Endeavour"/>
+        <specific id="2" description="General Villa"/>
+        <specific id="3" description="Handy Gunner"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="193">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Container Class">
+        <specific id="1" description="Neptune Pearl"/>
+      </subcategory>
+      <subcategory id="2" description="Tanker Class">
+        <specific id="1" description="Argo Pallas"/>
+        <specific id="2" description="Evelyn Maersk"/>
+        <specific id="3" description="Jront Highness"/>
+        <specific id="4" description="Pacific Harmony"/>
+        <specific id="5" description="Fidelity"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="249">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Koncar (Type R-02) Class (Fast Attack Craft-Missile) (PCFG)">
+        <specific id="1" description="RTOP 21 Sibenik"/>
+      </subcategory>
+    </category>
+    <category id="50" description="Frigate (including Corvettes)">
+      <subcategory id="1" description="Kralj (Type R-03) Class (FSG)">
+        <specific id="1" description="RTOP 11 Kralj Petar Kresimir IV"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="165">
+    <category id="7" description="Light/Patrol Craft">
+      <subcategory id="1" description="Town Class (Large Patrol Craft) (PC)"/>
+      <subcategory id="2" description="Larkana Class (Large Patrol Class) (PC)"/>
+      <subcategory id="3" description="Barkat Class"/>
+    </category>
+    <category id="16" description="Auxiliary">
+      <subcategory id="1" description="Fuqing Class (AOR)">
+        <specific id="1" description="A47 Nasr"/>
+      </subcategory>
+      <subcategory id="2" description="Coastal Tankers (AOTL)">
+        <specific id="1" description="A49 Gwadar"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="29">
+    <category id="4" description="Self-propelled Artillery">
+      <subcategory id="1" description="Launcher ASTROS AV-LMU"/>
+    </category>
+    <category id="7" description="Large Wheeled Utility Vehicle">
+      <subcategory id="1" description="Tectran Enginharia">
+        <specific id="1" description="ASTROS Resupply AV-RMD"/>
+      </subcategory>
+    </category>
+    <category id="37" description="Fire Control Facility">
+      <subcategory id="1" description="ASTROS Fire Control Vehicle AV-VCC"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="176">
+    <category id="61" description="PRT Non-Combatant Ship">
+      <subcategory id="1" description="PRT Ship Container Class"/>
+      <subcategory id="2" description="PRT Ship Tanker Class"/>
+      <subcategory id="3" description="PRT Ship Commercial Large (&gt; 30m)"/>
+      <subcategory id="4" description="PRT Boat Commercial Medium (10m to 29m)"/>
+      <subcategory id="5" description="PRT Boat Commercial Small (&lt;10m)"/>
+      <subcategory id="6" description="PRT Sailboat Commercial Two-Mast"/>
+      <subcategory id="7" description="PRT Sailboat Commercial One-Mast"/>
+      <subcategory id="9" description="PRT Boat Private Very Small (&lt; 3m)">
+        <specific id="1" description="PRT Boat Private Very Small Outboard"/>
+        <specific id="2" description="PRT Boat Private Very Small Inboard"/>
+      </subcategory>
+      <subcategory id="10" description="PRT Boat Private Small (3m to 5m)">
+        <specific id="1" description="PRT Boat Private Very Small Outboard"/>
+        <specific id="2" description="PRT Boat Private Very Small Inboard"/>
+      </subcategory>
+      <subcategory id="11" description="PRT Boat Private Medium (6m to 10m)">
+        <specific id="1" description="PRT Boat Private Medium Motor Yacht"/>
+      </subcategory>
+      <subcategory id="12" description="PRT Boat Private Large (11m to 15m)">
+        <specific id="1" description="PRT Boat Private Large Yacht"/>
+      </subcategory>
+      <subcategory id="13" description="PRT Boat Private Very Large (&gt; 15m)">
+        <specific id="1" description="PRT Boat Private Very Large Yacht"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="0">
+    <category id="61" description="Non-Combatant Ship">
+      <subcategory id="1" description="Generic Ship Container Class"/>
+      <subcategory id="2" description="Generic Ship Tanker Class"/>
+      <subcategory id="3" description="Generic Ship Commercial Large (&gt; 30m)"/>
+      <subcategory id="4" description="Generic Boat Commercial Medium (10m to 29m)"/>
+      <subcategory id="5" description="Generic Boat Commercial Small (&lt;10m)"/>
+      <subcategory id="6" description="Generic Sailboat Commercial Two-Mast"/>
+      <subcategory id="7" description="Generic Sailboat Commercial One-Mast"/>
+      <subcategory id="9" description="Generic Boat Private Very Small (&lt; 3m)">
+        <specific id="1" description="Generic Boat Private Very Small Outboard"/>
+        <specific id="2" description="Generic Boat Private Very Small Inboard"/>
+      </subcategory>
+      <subcategory id="10" description="Generic Boat Private Small (3m to 5m)">
+        <specific id="1" description="Generic Boat Private Very Small Outboard"/>
+        <specific id="2" description="Generic Boat Private Very Small Inboard"/>
+      </subcategory>
+      <subcategory id="11" description="Generic Boat Private Medium (6m to 10m)">
+        <specific id="1" description="Generic Boat Private Medium Motor Yacht"/>
+      </subcategory>
+      <subcategory id="12" description="Generic Boat Private Large (11m to 15m)">
+        <specific id="1" description="Generic Boat Private Large Yacht"/>
+      </subcategory>
+      <subcategory id="13" description="Generic Boat Private Very Large (&gt; 15m)">
+        <specific id="1" description="Generic Boat Private Very Large Yacht"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="0" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Deadeye 5-in. projectile"/>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="Mine-clearing torpedo, Bangalore">
+        <specific id="1" description="M1A1"/>
+        <specific id="2" description="M1A2"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AIM-9 Sidewinder">
+        <specific id="1" description="AIM-9B"/>
+        <specific id="2" description="AIM-9D"/>
+        <specific id="3" description="AIM-9L/M/S">
+          <extra id="1" description="AIM-9L"/>
+          <extra id="2" description="AIM-9M"/>
+          <extra id="3" description="AIM-9M-7"/>
+          <extra id="4" description="AIM-9S"/>
+        </specific>
+        <specific id="4" description="AIM-9P"/>
+        <specific id="5" description="AIM-9R"/>
+        <specific id="6" description="AIM-9X"/>
+        <specific id="7" description="AIM-9J"/>
+      </subcategory>
+      <subcategory id="2" description="AIM-120 Advanced Medium-Range Air-to-Air Missile (AMRAAM)">
+        <specific id="1" description="AIM-120A"/>
+        <specific id="2" description="AIM-120B"/>
+        <specific id="3" description="AIM-120C"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="Falcon">
+        <specific id="1" description="AIM-4D"/>
+        <specific id="2" description="AIM-4F"/>
+        <specific id="3" description="AIM-4G"/>
+        <specific id="4" description="AIM-26"/>
+        <specific id="5" description="AIM-26B"/>
+      </subcategory>
+      <subcategory id="5" description="MIM-72 Chaparral"/>
+      <subcategory id="6" description="MIM-23 Hawk C/E/F/G/H">
+        <specific id="1" description="MIM-23B I-Hawk"/>
+        <specific id="2" description="Hawk PIP"/>
+      </subcategory>
+      <subcategory id="7" description="MLMS"/>
+      <subcategory id="8" description="AIM-54 Phoenix">
+        <specific id="1" description="AIM-54A"/>
+        <specific id="2" description="AIM-54C"/>
+      </subcategory>
+      <subcategory id="9" description="Rapier UK"/>
+      <subcategory id="10" description="FIM-43 Redeye"/>
+      <subcategory id="11" description="Roland"/>
+      <subcategory id="12" description="Sea Sparrow">
+        <specific id="1" description="RIM-7H"/>
+        <specific id="2" description="Evolved Sea Sparrow Missile (ESSM)">
+          <extra id="1" description="RIM-162A"/>
+          <extra id="2" description="RIM-162B"/>
+          <extra id="3" description="RIM-162C"/>
+          <extra id="4" description="RIM-162D"/>
+        </specific>
+      </subcategory>
+      <subcategory id="13" description="Sparrow">
+        <specific id="1" description="AIM-7F"/>
+        <specific id="2" description="AIM-7M"/>
+        <specific id="3" description="AIM-7P"/>
+        <specific id="4" description="AIM-7R (multimode seeker)"/>
+        <specific id="5" description="AIM-7MH"/>
+      </subcategory>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="Stinger">
+        <specific id="1" description="FIM-92 Stinger A/B/C"/>
+        <specific id="2" description="Stinger Post"/>
+        <specific id="3" description="Stinger RMP"/>
+        <specific id="4" description="Stinger ATAS"/>
+      </subcategory>
+      <subcategory id="16" description="MIM-104 Patriot">
+        <specific id="1" description="PAC-2">
+          <extra id="1" description="Standard"/>
+          <extra id="2" description="GEM"/>
+        </specific>
+        <specific id="2" description="PAC-3 (ERINT)"/>
+      </subcategory>
+      <subcategory id="17" description="(deleted)"/>
+      <subcategory id="18" description="(deleted)"/>
+      <subcategory id="19" description="ADATS"/>
+      <subcategory id="20" description="MIM-14B Nike-Hercules"/>
+      <subcategory id="21" description="Theater High-Altitude Area Defense (THAAD)"/>
+      <subcategory id="22" description="(deleted)"/>
+      <subcategory id="23" description="(deleted)"/>
+      <subcategory id="24" description="(deleted)"/>
+      <subcategory id="25" description="(deleted)"/>
+      <subcategory id="26" description="(deleted)"/>
+      <subcategory id="27" description="Standard Missile">
+        <specific id="1" description="Standard MR (RIM-66)">
+          <extra id="1" description="SM-1 Block 5 MR"/>
+          <extra id="2" description="SM-1 Block 6B"/>
+          <extra id="3" description="SM-2 Block 2 MR"/>
+          <extra id="4" description="SM-2 Block 3 MR"/>
+          <extra id="5" description="SM-2 Block 3A MR"/>
+          <extra id="6" description="SM-2 Block 3B"/>
+          <extra id="7" description="(deleted)"/>
+          <extra id="8" description="SM-2 Block 6 MR"/>
+          <extra id="9" description="(deleted)"/>
+        </specific>
+        <specific id="2" description="Standard ER (RIM-67)">
+          <extra id="1" description="SM-2 Block 4"/>
+          <extra id="2" description="SM-2 Block 4A"/>
+        </specific>
+        <specific id="3" description="Standard BMD (RIM-61)">
+          <extra id="1" description="SM-3 Boost Phase Vehicle"/>
+          <extra id="2" description="SM-3 Second Stage Vehicle"/>
+          <extra id="3" description="SM-3 Third Stage Vehicle"/>
+          <extra id="4" description="SM-3 Separated Kill Vehicle (KV)"/>
+          <extra id="5" description="SM-3 Jettisoned first stage"/>
+          <extra id="6" description="SM-3 Jettisoned second stage"/>
+          <extra id="7" description="SM-3 Jettisoned third stage"/>
+          <extra id="8" description="SM-3 Block 1 Kill Weapon (KW)"/>
+        </specific>
+      </subcategory>
+      <subcategory id="28" description="Mk 49 RAM"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="3-in, .50 caliber"/>
+      <subcategory id="2" description="12.7-mm/.50 caliber">
+        <specific id="1" description="M2 AP"/>
+        <specific id="2" description="M8 API"/>
+        <specific id="3" description="M20 API-T"/>
+        <specific id="4" description="M2 ball"/>
+        <specific id="5" description="M33 ball"/>
+        <specific id="6" description="M1 incediary"/>
+        <specific id="7" description="M23 incendiary"/>
+      </subcategory>
+      <subcategory id="3" description="20-mm">
+        <specific id="1" description="M56A4 HEI/M242 HEI-T 7:1 ratio"/>
+        <specific id="2" description="PGU-28/B SAPHEI"/>
+        <specific id="3" description="M246 HEIT-SD"/>
+        <specific id="4" description="M940 MPT-SD"/>
+        <specific id="5" description="MK149 APDS"/>
+        <specific id="6" description="MK244 Mod 0 (tungsten)"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="Anti-helicopter mine (AHM)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="BGM-71 TOW">
+        <specific id="1" description="BGM-71A/B"/>
+        <specific id="2" description="BGM-71C ITOW"/>
+        <specific id="3" description="BGM-71D TOW 2"/>
+        <specific id="4" description="BGM-71E TOW 2-A"/>
+        <specific id="5" description="BGM-71F TOW 2-B"/>
+      </subcategory>
+      <subcategory id="2" description="Dragon ATGW">
+        <specific id="1" description="M222 Dragon"/>
+        <specific id="2" description="Dragon II"/>
+        <specific id="3" description="Dragon III"/>
+      </subcategory>
+      <subcategory id="3" description="AGM-114 Hellfire">
+        <specific id="1" description="AGM-114A"/>
+        <specific id="2" description="AGM-114B"/>
+        <specific id="3" description="AGM-114C"/>
+        <specific id="4" description="AGM-114F"/>
+        <specific id="5" description="AGM-114K">
+          <extra id="1" description="AGM-114K SAL"/>
+          <extra id="2" description="AGM-114K RF"/>
+        </specific>
+        <specific id="6" description="AGM-114L, Laser Guided Hellfire"/>
+      </subcategory>
+      <subcategory id="4" description="AGM-65 Maverick">
+        <specific id="1" description="AGM-65A"/>
+        <specific id="2" description="AGM-65B"/>
+        <specific id="3" description="AGM-65D"/>
+        <specific id="4" description="AGM-65E"/>
+        <specific id="5" description="AGM-65F"/>
+        <specific id="6" description="AGM-65G"/>
+      </subcategory>
+      <subcategory id="5" description="M712 Copperhead Cannon Launched Guided Projectile"/>
+      <subcategory id="6" description="AAWS-M"/>
+      <subcategory id="7" description="High Velocity Missile (HVM)"/>
+      <subcategory id="8" description="Javelin"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="Rocket, Loitering Attack Munition"/>
+      <subcategory id="11" description="Rocket, Precision Attack Munition"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="12.7-mm (.50 Cal)">
+        <specific id="1" description="M2 AP"/>
+        <specific id="2" description="M8 API"/>
+        <specific id="3" description="M17"/>
+        <specific id="4" description="M20 API-T"/>
+        <specific id="5" description="A534 (4 ball &amp; 1 tracer mix)"/>
+      </subcategory>
+      <subcategory id="2" description="20 mm">
+        <specific id="1" description="M39"/>
+        <specific id="2" description="M53 API"/>
+        <specific id="3" description="M601 API-T"/>
+        <specific id="4" description="M775 API-T"/>
+        <specific id="5" description="M940 MP-T-SD"/>
+        <specific id="6" description="MK149 Mod 4 APDS"/>
+        <specific id="7" description="Oerlikon S"/>
+        <specific id="8" description="PGU-28/B SAP-HE"/>
+        <specific id="9" description="U.S. Navy Mark 100"/>
+      </subcategory>
+      <subcategory id="3" description="25 mm">
+        <specific id="1" description="Oerlikon KBA"/>
+        <specific id="2" description="M791 APDS-T"/>
+        <specific id="3" description="M919 APFSDS-T"/>
+        <specific id="4" description="PGU-20/U API"/>
+        <specific id="5" description="PGU-32/U SAPHEI"/>
+        <specific id="6" description="Mk 96"/>
+      </subcategory>
+      <subcategory id="4" description="30 mm">
+        <specific id="1" description="173 Mauser model F APDS-T"/>
+        <specific id="2" description="PGU-14/B API, PGU-13/B HEI 4:1 ratio"/>
+        <specific id="3" description="GPU 5A"/>
+        <specific id="4" description="PGU-15/B TP"/>
+      </subcategory>
+      <subcategory id="5" description="66 mm 72 LAW"/>
+      <subcategory id="6" description="76 mm">
+        <specific id="1" description="M319, HVAP-T"/>
+        <specific id="2" description="M331A1, HVAP-DS-T"/>
+        <specific id="3" description="M331A2, HVAP-DS-T"/>
+        <specific id="4" description="M339, AP-T"/>
+        <specific id="5" description="M464, APFSDS-T"/>
+        <specific id="6" description="M496, HEAT-T"/>
+      </subcategory>
+      <subcategory id="7" description="81 mm"/>
+      <subcategory id="8" description="84 mm">
+        <specific id="1" description="M136, HEAT"/>
+      </subcategory>
+      <subcategory id="9" description="90 mm">
+        <specific id="1" description="M77 AP-T"/>
+        <specific id="2" description="M82 APC-T"/>
+        <specific id="3" description="M318 AP-T"/>
+        <specific id="4" description="M318A1 AP-T"/>
+        <specific id="5" description="M332A1 HVAP-T"/>
+        <specific id="6" description="M348 HEAT"/>
+        <specific id="7" description="M348A1 HEAT"/>
+        <specific id="8" description="M431 HEAT-T"/>
+        <specific id="9" description="RCL M67"/>
+      </subcategory>
+      <subcategory id="10" description="105 mm">
+        <specific id="1" description="FP105, APFSDS"/>
+        <specific id="2" description="M392 APDS-T"/>
+        <specific id="3" description="M392A2 APDS-T"/>
+        <specific id="4" description="M456 HEAT-T"/>
+        <specific id="5" description="M456A2 HEAT-T"/>
+        <specific id="6" description="M662 HEAT-T"/>
+        <specific id="7" description="M728 APDS-T"/>
+        <specific id="8" description="M735 APFSDS-T"/>
+        <specific id="9" description="M774 APFSDS-T"/>
+        <specific id="10" description="M833 APFSDS-T"/>
+        <specific id="11" description="M900 APFSDS-T"/>
+        <specific id="12" description="Olin 105, APFSDS"/>
+        <specific id="13" description="XM815 HEAT-MP"/>
+      </subcategory>
+      <subcategory id="11" description="106 mm RCL40 (M40)"/>
+      <subcategory id="12" description="107 mm"/>
+      <subcategory id="13" description="120 mm">
+        <specific id="1" description="M829 APFSDS-T"/>
+        <specific id="2" description="M829A1 APFSDS-T"/>
+        <specific id="3" description="M830 HEAT-MP-T"/>
+        <specific id="4" description="Olin 120 APFSDS"/>
+        <specific id="5" description="Olin 120+ APFSDS"/>
+        <specific id="6" description="M830A1 HEAT-MP-T"/>
+        <specific id="7" description="XM943 STAFF"/>
+      </subcategory>
+      <subcategory id="14" description="152 mm">
+        <specific id="1" description="M409 Series HEAT-T-MP"/>
+      </subcategory>
+      <subcategory id="15" description="155 mm">
+        <specific id="1" description="M898 SADARM"/>
+      </subcategory>
+      <subcategory id="16" description="227-mm rocket">
+        <specific id="1" description="AT2"/>
+        <specific id="2" description="M77"/>
+        <specific id="3" description="TGW"/>
+        <specific id="4" description="SADARM"/>
+      </subcategory>
+      <subcategory id="17" description="(deleted)"/>
+      <subcategory id="18" description="(deleted)"/>
+      <subcategory id="19" description="(deleted)"/>
+      <subcategory id="20" description="Hydra 70 Rocket System">
+        <specific id="1" description="Hydra Rocket w/M156 WP smoke warhead"/>
+        <specific id="2" description="Hydra Rocket w/M67 Mod WP smoke warhead"/>
+        <specific id="3" description="Hydra Rocket w/M67 Mod 1 RP smoke warhead"/>
+        <specific id="4" description="Hydra Rocket w/M151 HE frag warhead"/>
+        <specific id="5" description="Hydra Rocket w/M257 visible flare warhead"/>
+        <specific id="6" description="Hydra Rocket w/M278 infrared flare warhead"/>
+        <specific id="7" description="Hydra Rocket w/WDU-4A/A flechette warhead"/>
+        <specific id="8" description="Hydra Rocket w/WTU-1/B practice warhead"/>
+      </subcategory>
+      <subcategory id="50" description="Rockeye II Mk 20 cluster weapon"/>
+      <subcategory id="51" description="SUU-65/B TAC Munition Dispenser (TMD) Wide Area Antiarmor Munition (WAAM)"/>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="Area Denial Artillery Munition (ADAM)"/>
+      <subcategory id="2" description="Extended Range Anti-armor Munition (ERAM)"/>
+      <subcategory id="3" description="GATOR Anti-armor System"/>
+      <subcategory id="4" description="XM93 Wide Area Mine (WAM)"/>
+      <subcategory id="5" description="M21 Heavy Antitank mine"/>
+      <subcategory id="6" description="Off-route Antitank mine">
+        <specific id="1" description="M24"/>
+        <specific id="2" description="M66"/>
+      </subcategory>
+      <subcategory id="7" description="M19 Antitank mine"/>
+      <subcategory id="8" description="M15 Antitank mine"/>
+      <subcategory id="9" description="M86 Pursuit Deterrent Munition (PDM)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Decoys">
+        <specific id="1" description="Anti-Radiation Missile Decoy (ARM-D)"/>
+        <specific id="2" description="Mk-57 (MOSS)"/>
+      </subcategory>
+      <subcategory id="2" description="RIM-72 Sea Chaparral"/>
+      <subcategory id="3" description="RIM-116A RAM"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AGM-88 High-speed Antiradiation Missile (HARM)">
+        <specific id="1" description="AGM-88A"/>
+        <specific id="2" description="AGM-88B"/>
+        <specific id="3" description="AGM-88C"/>
+      </subcategory>
+      <subcategory id="2" description="AGM-45 Shrike">
+        <specific id="1" description="AGM-45A"/>
+        <specific id="2" description="AGM-45B"/>
+      </subcategory>
+      <subcategory id="3" description="AGM-78 Standard ARM"/>
+      <subcategory id="4" description="AGM-122 Sidearm">
+        <specific id="1" description="AGM-122A"/>
+      </subcategory>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="Stinger">
+        <specific id="1" description="Air Defense Suppression Missile (ADSM)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="5" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Asat"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Harpoon">
+        <specific id="1" description="AGM-84A"/>
+        <specific id="2" description="UGM-84A"/>
+        <specific id="3" description="RGM-84A"/>
+        <specific id="4" description="AGM-84B"/>
+        <specific id="5" description="UGM-84B"/>
+        <specific id="6" description="AGM-84C"/>
+        <specific id="7" description="UGM-84C"/>
+        <specific id="8" description="AGM-84D"/>
+        <specific id="9" description="UGM-84D"/>
+        <specific id="10" description="AGM-84E"/>
+        <specific id="11" description="UGM-84E"/>
+        <specific id="12" description="RGM-84E"/>
+        <specific id="13" description="AGHM-84F"/>
+        <specific id="14" description="UGM-84F"/>
+        <specific id="15" description="RGM-84F"/>
+        <specific id="16" description="AGM-84G"/>
+        <specific id="17" description="UGM-84G"/>
+        <specific id="18" description="RGM-84G"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="NT 37F torpedo">
+        <specific id="1" description="Mod 2"/>
+        <specific id="2" description="Mod 3"/>
+        <specific id="3" description="NT 37E"/>
+      </subcategory>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="AGM-142 Popeye"/>
+      <subcategory id="9" description="AGM-119 Penguin"/>
+      <subcategory id="10" description="AGM-123 Skipper">
+        <specific id="1" description="AGM-123A"/>
+      </subcategory>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="BGM-109B Tomahawk Antiship Missile (TASM)"/>
+      <subcategory id="13" description="ADCAP">
+        <specific id="1" description="Mod 5"/>
+        <specific id="2" description="Mod 6"/>
+      </subcategory>
+      <subcategory id="14" description="Mk 48">
+        <specific id="1" description="Mod 4"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="5-in .38 caliber"/>
+      <subcategory id="2" description="5-in .54 caliber">
+        <specific id="1" description="AAC"/>
+        <specific id="2" description="HC"/>
+        <specific id="3" description="HE-IR"/>
+        <specific id="4" description="HE-PD"/>
+        <specific id="5" description="HE"/>
+        <specific id="6" description="HE-CVT"/>
+        <specific id="7" description="IR"/>
+        <specific id="8" description="VT (Variable Time)"/>
+        <specific id="9" description="VT-IR (Variable Time, Infrared)"/>
+        <specific id="10" description="VT-RF"/>
+      </subcategory>
+      <subcategory id="3" description="76 mm">
+        <specific id="1" description="AAC"/>
+        <specific id="2" description="HE"/>
+        <specific id="3" description="HE-PD"/>
+        <specific id="4" description="VT fragmentation"/>
+        <specific id="5" description="VT IR"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="DST Mk 36 mine"/>
+      <subcategory id="2" description="DST Mk 40 mine"/>
+      <subcategory id="3" description="DST Mk 41 mine"/>
+      <subcategory id="4" description="DST 115A mine"/>
+      <subcategory id="5" description="Mk 52 bottom mine">
+        <specific id="1" description="Mod 1"/>
+        <specific id="2" description="Mod 2"/>
+        <specific id="3" description="Mod 3"/>
+      </subcategory>
+      <subcategory id="6" description="Mk 55 bottom mine">
+        <specific id="1" description="Mod 2"/>
+        <specific id="2" description="Mod 3"/>
+        <specific id="3" description="Mod 5"/>
+        <specific id="4" description="Mod 6"/>
+        <specific id="5" description="Mod 7"/>
+      </subcategory>
+      <subcategory id="7" description="Mk 57 moored mine">
+        <specific id="1" description="Mod 0"/>
+      </subcategory>
+      <subcategory id="8" description="Quickstrike mines">
+        <specific id="1" description="Mk 62"/>
+        <specific id="2" description="Mk 63"/>
+        <specific id="3" description="Mk 64"/>
+        <specific id="4" description="Mk 65"/>
+      </subcategory>
+      <subcategory id="9" description="CAPTOR - Encapsulated Torpedo moored mine"/>
+      <subcategory id="10" description="Advanced sea mine"/>
+      <subcategory id="11" description="Mk 56 Mod 0 moored mine"/>
+      <subcategory id="12" description="Mk 67 Submarine Launched Mobile Mine"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Mk 46 torpedo">
+        <specific id="1" description="Mk 46 Mod 0"/>
+        <specific id="2" description="Mk 46 Mod 5 (NEARTIP)"/>
+        <specific id="3" description="Mk 46 Mod 7"/>
+        <specific id="4" description="Mk 46 Mod 6"/>
+      </subcategory>
+      <subcategory id="2" description="Mk 48 torpedo">
+        <specific id="1" description="Mod 4"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="MK37 torpedo">
+        <specific id="1" description="Mod 0"/>
+        <specific id="2" description="Mod 1"/>
+        <specific id="3" description="Mod 2"/>
+        <specific id="4" description="Mod 3"/>
+      </subcategory>
+      <subcategory id="5" description="RUR-5A ASROC"/>
+      <subcategory id="6" description="CASW/SOW"/>
+      <subcategory id="7" description="SUBROC">
+        <specific id="1" description="UUM-44A"/>
+      </subcategory>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="Mk 44 torpedo"/>
+      <subcategory id="10" description="Mk 48 ADCAP torpedo">
+        <specific id="1" description="Mod 5 ADCAP"/>
+        <specific id="2" description="Mod 6 ADCAP/MODS"/>
+      </subcategory>
+      <subcategory id="11" description="Mk 50 Advanced lightweight torpedo">
+        <specific id="1" description="100S"/>
+        <specific id="2" description="200S"/>
+      </subcategory>
+      <subcategory id="12" description="NT 37F">
+        <specific id="1" description="Mod 2"/>
+        <specific id="2" description="Mod 3"/>
+        <specific id="3" description="NT 37E"/>
+      </subcategory>
+      <subcategory id="13" description="HOTTORP torpedo"/>
+      <subcategory id="14" description="Sea Lance ASW"/>
+      <subcategory id="18" description="Mk 32 torpedo">
+        <specific id="1" description="Mod 2"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="225">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="5.56 mm">
+        <specific id="1" description="M193"/>
+        <specific id="2" description="M193 Tracer"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="5.56 x 45"/>
+        <specific id="5" description="M855"/>
+        <specific id="6" description="M856"/>
+        <specific id="7" description="A064"/>
+      </subcategory>
+      <subcategory id="2" description="7.62 mm">
+        <specific id="1" description=".30 Carbine"/>
+        <specific id="2" description=".308 Winchester"/>
+        <specific id="3" description=".30-06 Springfield"/>
+        <specific id="4" description="A131 M80/M62 4:1 ratio (for M60, M240, etc.)"/>
+        <specific id="5" description="A130 M80 NATO ball (for M14, etc.)"/>
+        <specific id="6" description="A122 M59 ball (for AR-10, M14, etc.)"/>
+        <specific id="7" description="A141"/>
+        <specific id="8" description="4 ball +1tracer linked"/>
+        <specific id="9" description="AA11 M118 Long Range (for M86, M14, etc.)"/>
+      </subcategory>
+      <subcategory id="3" description="9.0 mm">
+        <specific id="1" description=".380 Auto"/>
+        <specific id="2" description="Browning Short"/>
+        <specific id="3" description="Parabellum"/>
+        <specific id="4" description="Winchester Magnum"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="12.7 mm">
+        <specific id="1" description="A605 .50 ball M33 (for .50 Spotting rifle, etc.)"/>
+        <specific id="2" description="A556 .50 4 ball M2/M1 4:1 ratio (for M2 MG, etc.)"/>
+        <specific id="3" description="A534 .50 API M8/M20 4:1 ratio (for M2, , etc.)"/>
+      </subcategory>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="90 mm">
+        <specific id="1" description="M580 APERS-T"/>
+      </subcategory>
+      <subcategory id="8" description="105 mm">
+        <specific id="1" description="M336 canister"/>
+        <specific id="2" description="M377 canister"/>
+        <specific id="3" description="M494 APERS-T"/>
+        <specific id="4" description="M546 APERS-T"/>
+      </subcategory>
+      <subcategory id="9" description="152 mm">
+        <specific id="1" description="M625A1 cannister (flechettes)"/>
+      </subcategory>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description=".357">
+        <specific id="1" description="Magnum"/>
+      </subcategory>
+      <subcategory id="12" description=".38 Cal">
+        <specific id="1" description="Auto"/>
+        <specific id="2" description="Super Auto"/>
+        <specific id="3" description="Special"/>
+      </subcategory>
+      <subcategory id="13" description=".45">
+        <specific id="1" description="Auto Colt"/>
+      </subcategory>
+      <subcategory id="14" description="12 ga shotgun shells"/>
+      <subcategory id="50" description="BLU-97 Submunition">
+        <specific id="1" description="BLU-97A"/>
+        <specific id="2" description="BLU-97B"/>
+      </subcategory>
+      <subcategory id="51" description="ISCB-1 Area Denial Cluster Weapon"/>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="Bounding mines">
+        <specific id="1" description="M16"/>
+        <specific id="2" description="M16A1"/>
+        <specific id="3" description="M16A2"/>
+        <specific id="4" description="M2A4"/>
+      </subcategory>
+      <subcategory id="2" description="Claymore mine"/>
+      <subcategory id="3" description="M15 heavy AT mine"/>
+      <subcategory id="4" description="M19 nonmetallic AT mine"/>
+      <subcategory id="5" description="M21 heavy AT mine"/>
+      <subcategory id="6" description="M741 scatterable AT mine"/>
+      <subcategory id="7" description="M718 scatterable AT mine"/>
+      <subcategory id="8" description="M75 scatterable AT mine"/>
+      <subcategory id="9" description="Nonmetallic &quot;Toe Popper&quot; mine">
+        <specific id="1" description="M14"/>
+      </subcategory>
+      <subcategory id="10" description="M731 scatterable mine"/>
+      <subcategory id="11" description="M692 scatterable mine"/>
+      <subcategory id="12" description="M74 scatterable mine"/>
+      <subcategory id="13" description="M1 one-gallon chemical mine"/>
+      <subcategory id="14" description="M18A1 mine"/>
+      <subcategory id="15" description="M23 chemical-agent mine"/>
+      <subcategory id="16" description="M26 mine"/>
+      <subcategory id="17" description="M131 Modular Pack Mine System (MOPMS)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AGM-86 Air Launched Cruise Missile (ALCM)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="AGM-86C"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="MGM-52C Lance"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="AGM-62 Walleye"/>
+      <subcategory id="8" description="SRAM-A">
+        <specific id="1" description="AGM-69A"/>
+        <specific id="2" description="AGM-69B"/>
+      </subcategory>
+      <subcategory id="9" description="SLAM">
+        <specific id="1" description="AGM/RGM 84E"/>
+      </subcategory>
+      <subcategory id="10" description="Advanced Cruise Missile">
+        <specific id="1" description="AGM-129A"/>
+      </subcategory>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="AGM 130">
+        <specific id="1" description="AGM-130A"/>
+        <specific id="2" description="AGM-130C"/>
+      </subcategory>
+      <subcategory id="13" description="Boeing 120-mm Fiber Optic Mortar Projectile (FOMP)"/>
+      <subcategory id="14" description="Mk-82">
+        <specific id="1" description="GBU-12 Mk 82 500-lb">
+          <extra id="1" description="(deleted)"/>
+          <extra id="2" description=".10 sec delay"/>
+          <extra id="3" description=".25 sec delay"/>
+        </specific>
+        <specific id="2" description="GBU-38/B JDAM"/>
+      </subcategory>
+      <subcategory id="15" description="Mk-84 bomb">
+        <specific id="1" description="GBU-15 Glide Bomb"/>
+        <specific id="2" description="GBU-24A/B Glide Bomb"/>
+        <specific id="3" description="PAVEWAY II laser-guided"/>
+        <specific id="4" description="GBU-10 Mk 84 2000-lb">
+          <extra id="1" description="Impact fuse"/>
+          <extra id="2" description=".10 sec delay"/>
+          <extra id="3" description=".25 sec delay"/>
+        </specific>
+        <specific id="5" description="Mk-84 GAMS"/>
+        <specific id="6" description="GBU-31A JDAM"/>
+      </subcategory>
+      <subcategory id="16" description="Paveway III">
+        <specific id="1" description="GBU-24A/B Mk 109/B 2000-lb pen Bm"/>
+        <specific id="2" description="GBU-24B Mk 84 2000-lb HE bomb"/>
+        <specific id="3" description="GBU-28B (BLU-113/B)"/>
+      </subcategory>
+      <subcategory id="17" description="Army TACMS">
+        <specific id="1" description="M39"/>
+        <specific id="2" description="Block IA"/>
+        <specific id="3" description="Block II"/>
+        <specific id="4" description="Block IIA"/>
+        <specific id="5" description="Block IA Unitary"/>
+      </subcategory>
+      <subcategory id="18" description="Mk-83 1000-lb LGB">
+        <specific id="1" description="GBU - 16Mk 83"/>
+        <specific id="2" description="Mk 13/18"/>
+        <specific id="3" description="GBU-32 JDAM"/>
+      </subcategory>
+      <subcategory id="19" description="Tomahawk">
+        <specific id="1" description="BGM - 109C (TLAM-C)"/>
+        <specific id="2" description="BGM - 109D (TLAM-D)"/>
+        <specific id="3" description="Tactical Tomahawk Penetrator Variant Mk14"/>
+        <specific id="4" description="Tactical Tomahawk Penatrator Variant Mk45 Mod1"/>
+        <specific id="5" description="TACTOM BGM 109E"/>
+      </subcategory>
+      <subcategory id="20" description="BLU-109/B Bomb">
+        <specific id="1" description="GBU-10G"/>
+        <specific id="2" description="GBU-10H"/>
+        <specific id="3" description="GBU-10J"/>
+        <specific id="4" description="GBU-24A"/>
+        <specific id="5" description="GBU-27A"/>
+        <specific id="6" description="GBU-15(V)-31"/>
+        <specific id="7" description="GBU-15(V)-32"/>
+        <specific id="8" description="GBU-31B JDAM"/>
+      </subcategory>
+      <subcategory id="21" description="AGM-154 Joint Standoff Munition">
+        <specific id="1" description="AGM-154A (w/BLU-97 CEM)"/>
+        <specific id="2" description="AGM-154B (w/BLU-108 SFW)"/>
+        <specific id="3" description="AGM-154C (unitary w/BLU-111)"/>
+      </subcategory>
+      <subcategory id="22" description="Wind-Corrected Munitions Dispenser (WCMD)">
+        <specific id="1" description="WCMD with Gator mines (BLU-91/92)"/>
+        <specific id="2" description="WCMD with Combined Effects Munition (BLU-97/B)"/>
+        <specific id="3" description="CBU-105 (WCMD w/BLU-108 SFW)"/>
+      </subcategory>
+      <subcategory id="23" description="Low Cost Autonomous Attack System (LOCAAS)"/>
+      <subcategory id="24" description="Small Diameter Bomb">
+        <specific id="1" description="GBU-39/B"/>
+        <specific id="2" description="GBU-40/B"/>
+      </subcategory>
+      <subcategory id="25" description="Massive Ordnance Air Blast (MOAB)">
+        <specific id="1" description="GBU-43/B"/>
+      </subcategory>
+      <subcategory id="26" description="AGM-158 Joint Air-to-Surface Standoff Missile (JASSM)">
+        <specific id="1" description="AGM-158A JASSM"/>
+        <specific id="2" description="AGM-158B JASSM-ER"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="20 mm">
+        <specific id="1" description="M39"/>
+        <specific id="2" description="M56 HEI"/>
+        <specific id="3" description="M56A3 HE/I"/>
+        <specific id="4" description="M210 HEI"/>
+        <specific id="5" description="M242 HE-I-T"/>
+        <specific id="6" description="M246 HEIT-SD"/>
+        <specific id="7" description="M246 HEI-T"/>
+        <specific id="8" description="M940 MPT-SD"/>
+        <specific id="9" description="Mk 149 (Mod2, 4) CIWS"/>
+      </subcategory>
+      <subcategory id="2" description="25 mm">
+        <specific id="1" description="M792 HEI-T"/>
+        <specific id="2" description="PGU-22/25 HE-I"/>
+        <specific id="3" description="M791 APDS-T"/>
+        <specific id="4" description="M919 APFSDS-T"/>
+      </subcategory>
+      <subcategory id="3" description="30 mm">
+        <specific id="1" description="M789 HEDP"/>
+        <specific id="2" description="M799 HE-I"/>
+      </subcategory>
+      <subcategory id="4" description="40 mm">
+        <specific id="1" description="Grenade cartridges"/>
+        <specific id="2" description="M433 HEDP"/>
+        <specific id="3" description="M397 Airburst"/>
+        <specific id="4" description="M397A1 Airburst"/>
+        <specific id="5" description="M381 HE"/>
+        <specific id="6" description="M386 HE"/>
+        <specific id="7" description="M406 HE"/>
+        <specific id="8" description="(deleted)"/>
+        <specific id="9" description="M441 HE"/>
+        <specific id="10" description="M576 Buckshot"/>
+        <specific id="11" description="M583 White star parachute"/>
+        <specific id="12" description="M583A1 White star parachute"/>
+        <specific id="13" description="M585 Star cluster"/>
+        <specific id="14" description="M651 Tactical CS"/>
+        <specific id="15" description="M661 Green star parachute"/>
+        <specific id="16" description="M662 Red star parachute"/>
+        <specific id="17" description="M676 Yellow smoke canopy"/>
+        <specific id="18" description="M680 White smoke canopy"/>
+        <specific id="19" description="M682 Red smoke canopy"/>
+        <specific id="20" description="M713 Red ground smoke marker"/>
+        <specific id="21" description="M715 Green ground smoke marker"/>
+        <specific id="22" description="M716 Yellow ground smoke marker"/>
+        <specific id="23" description="Grenade, HE, 40mm, M383"/>
+      </subcategory>
+      <subcategory id="5" description="60 mm">
+        <specific id="1" description="M49A4 HE bomb"/>
+        <specific id="2" description="M49A5 HE bomb"/>
+        <specific id="3" description="M83A3 illuminating bomb"/>
+        <specific id="4" description="M302A2 smoke bomb"/>
+        <specific id="5" description="M720 HE bomb"/>
+        <specific id="6" description="Projectile, 60-mm, HE-Frag, M888"/>
+      </subcategory>
+      <subcategory id="6" description="66 mm rocket"/>
+      <subcategory id="7" description="76 mm">
+        <specific id="1" description="M352 HE"/>
+        <specific id="2" description="M361 smoke"/>
+        <specific id="3" description="M361A1 smoke"/>
+        <specific id="4" description="M363 HE"/>
+      </subcategory>
+      <subcategory id="8" description="81 mm">
+        <specific id="1" description="M43A1 HE bomb"/>
+        <specific id="2" description="M43A1B1 HE bomb"/>
+        <specific id="3" description="M57 smoke WP bomb"/>
+        <specific id="4" description="M57A1 smoke WP bomb"/>
+        <specific id="5" description="M301A1 illuminating bomb"/>
+        <specific id="6" description="M301A2 illuminating bomb"/>
+        <specific id="7" description="M301A3 illuminating bomb"/>
+        <specific id="8" description="M362 HE bomb"/>
+        <specific id="9" description="M362A1 HE bomb"/>
+        <specific id="10" description="M370 smoke bomb"/>
+        <specific id="11" description="M374 HE bomb"/>
+        <specific id="12" description="M374A2 HE bomb"/>
+        <specific id="13" description="M374A3 HE bomb"/>
+        <specific id="14" description="M375 smoke bomb"/>
+        <specific id="15" description="M375A1 smoke bomb"/>
+        <specific id="16" description="M375A2 smoke bomb"/>
+        <specific id="17" description="M445 training bomb"/>
+        <specific id="18" description="Projectile, Mortar, 81mm, High Explosive M889A1"/>
+      </subcategory>
+      <subcategory id="9" description="90 mm">
+        <specific id="1" description="M71 HE"/>
+        <specific id="2" description="M71 A1 HE-T"/>
+        <specific id="3" description="M313 smoke"/>
+        <specific id="4" description="M313C smoke"/>
+      </subcategory>
+      <subcategory id="10" description="105 mm">
+        <specific id="1" description="M1 HE"/>
+        <specific id="2" description="M60 Agent H/HD"/>
+        <specific id="3" description="M60 smoke"/>
+        <specific id="4" description="M84 smoke"/>
+        <specific id="5" description="M314 illumination"/>
+        <specific id="6" description="M314A3, illuminating cartridge"/>
+        <specific id="7" description="M327 HEP/HEP-T"/>
+        <specific id="8" description="M360 Agent GB"/>
+        <specific id="9" description="M393 HEP-T"/>
+        <specific id="10" description="M413 HE"/>
+        <specific id="11" description="M416 smoke WP"/>
+        <specific id="12" description="M444 HE"/>
+        <specific id="13" description="M548 HERA"/>
+        <specific id="14" description="M629 tactical CS"/>
+        <specific id="15" description="M657 HE-T"/>
+        <specific id="16" description="M760 HE"/>
+        <specific id="17" description="M913 RAP"/>
+        <specific id="18" description="XM872 KE"/>
+      </subcategory>
+      <subcategory id="11" description="120 mm">
+        <specific id="1" description="M933HE"/>
+        <specific id="2" description="M934HE"/>
+        <specific id="3" description="M57 HE"/>
+        <specific id="4" description="M68 WP"/>
+        <specific id="5" description="M929 WP"/>
+        <specific id="6" description="M91 Illumination"/>
+        <specific id="7" description="M930 Illumination"/>
+      </subcategory>
+      <subcategory id="12" description="127 mm (5.0 in)">
+        <specific id="1" description="Zuni rocket"/>
+      </subcategory>
+      <subcategory id="13" description="152 mm"/>
+      <subcategory id="14" description="155 mm">
+        <specific id="1" description="BGD155C ICM"/>
+        <specific id="2" description="M107 HE">
+          <extra id="1" description="Variable time"/>
+          <extra id="2" description="Point detonating"/>
+        </specific>
+        <specific id="3" description="M483A1 HE DP (ICM)"/>
+        <specific id="4" description="M485 illumination"/>
+        <specific id="5" description="M485A1 illumination"/>
+        <specific id="6" description="M485A2 illumination"/>
+        <specific id="7" description="M549 HE RA"/>
+        <specific id="8" description="M549A1 HE RA"/>
+        <specific id="9" description="M864 BB ICM"/>
+        <specific id="10" description="M449 APICM"/>
+        <specific id="11" description="M731 FASCAM ADAM"/>
+        <specific id="12" description="M741"/>
+        <specific id="13" description="M116A1 HC Smoke"/>
+        <specific id="14" description="M825 WP"/>
+        <specific id="15" description="Projectile, 155-mm, Extended Range, XM982"/>
+        <specific id="16" description="M121 VX"/>
+        <specific id="17" description="M121 GB"/>
+        <specific id="18" description="M692 ADAM"/>
+        <specific id="19" description="M718 RAAM-L"/>
+        <specific id="20" description="M795 HE">
+          <extra id="1" description="Variable time"/>
+          <extra id="2" description="Point detonating"/>
+        </specific>
+        <specific id="21" description="M687 BINARY"/>
+      </subcategory>
+      <subcategory id="15" description="203 mm">
+        <specific id="1" description="M106 HE"/>
+        <specific id="2" description="M404 HE/ICM"/>
+        <specific id="3" description="M422 nuclear"/>
+        <specific id="4" description="M426 Agent GB"/>
+        <specific id="5" description="M509 HE/ICM"/>
+        <specific id="6" description="M509 A1, HE/ICM"/>
+        <specific id="7" description="M650 HERA"/>
+        <specific id="8" description="M753 nuclear"/>
+      </subcategory>
+      <subcategory id="16" description="227 mm rocket"/>
+      <subcategory id="17" description="(deleted)"/>
+      <subcategory id="18" description="107 mm">
+        <specific id="1" description="M328 smoke bomb"/>
+        <specific id="2" description="M328 A1 smoke bomb"/>
+        <specific id="3" description="M329 A1 HE bomb"/>
+        <specific id="4" description="M329 A2 HE bomb"/>
+        <specific id="5" description="M335 illuminating bomb"/>
+        <specific id="6" description="M335 A2 illuminating bomb"/>
+        <specific id="7" description="M630 tactical CS bomb"/>
+      </subcategory>
+      <subcategory id="19" description="7.62 mm">
+        <specific id="1" description="A131 (4 Ball &amp; 1 Tracer Mix)"/>
+        <specific id="2" description="M62 (4 Ball &amp; 1 Tracer)"/>
+        <specific id="3" description="M80"/>
+        <specific id="4" description="A131"/>
+      </subcategory>
+      <subcategory id="20" description="12.7 mm">
+        <specific id="1" description="M2 ball"/>
+        <specific id="2" description="M17 tracer"/>
+        <specific id="3" description="M33 ball"/>
+        <specific id="4" description="A621 .50 4 Ball M33/1 Tr M17"/>
+        <specific id="5" description=".50 Inc M1"/>
+        <specific id="6" description=".50 Tr M1"/>
+        <specific id="7" description=".50 AP M2"/>
+        <specific id="8" description=".50 API M8"/>
+        <specific id="9" description=".50 API-T M20"/>
+        <specific id="10" description=".50 Inc M23"/>
+        <specific id="11" description="A530 .50 4 AP M2/1 Tr M17"/>
+        <specific id="12" description="A534 .50 4 API M8/1 API-T M20"/>
+        <specific id="13" description="A539 .50 3 API M8/1 Tr M17"/>
+        <specific id="14" description="A540 .50 4 API M8/1 Tr M1"/>
+        <specific id="15" description="A547 .50 1 API M8/1 Inc M1"/>
+        <specific id="16" description="A549 .50 2 AP M2/2 Inc M1/1 Tr M1"/>
+        <specific id="17" description="A556 .50 4 Ball M2/1 Tr M1"/>
+        <specific id="18" description="A557 .50 4 Ball M2/1 Tr M17"/>
+      </subcategory>
+      <subcategory id="21" description="70 mm (2.75 in) rocket">
+        <specific id="1" description="M 151 HE"/>
+        <specific id="2" description="M 255 flechette"/>
+        <specific id="3" description="M 261 submunitions"/>
+        <specific id="4" description="M 262"/>
+        <specific id="5" description="M229 HE"/>
+        <specific id="6" description="Rocket, 2.75in, Smoke, WP, M264"/>
+      </subcategory>
+      <subcategory id="22" description="175 mm" footnote="The M107 175-mm gun is no longer in service with the U.S. Army but is still used by some other nations.">
+        <specific id="1" description="M437A1 HE"/>
+        <specific id="2" description="M437A2 HE"/>
+      </subcategory>
+      <subcategory id="23" description="165 mm">
+        <specific id="1" description="HEP"/>
+      </subcategory>
+      <subcategory id="24" description="(deleted)"/>
+      <subcategory id="25" description="(deleted)"/>
+      <subcategory id="26" description="(deleted)"/>
+      <subcategory id="27" description="(deleted)"/>
+      <subcategory id="28" description="(deleted)"/>
+      <subcategory id="29" description="(deleted)"/>
+      <subcategory id="30" description="(deleted)"/>
+      <subcategory id="31" description="(deleted)"/>
+      <subcategory id="32" description="(deleted)"/>
+      <subcategory id="33" description="(deleted)"/>
+      <subcategory id="34" description="(deleted)"/>
+      <subcategory id="35" description="(deleted)"/>
+      <subcategory id="36" description="(deleted)"/>
+      <subcategory id="37" description="(deleted)"/>
+      <subcategory id="38" description="(deleted)"/>
+      <subcategory id="39" description="(deleted)"/>
+      <subcategory id="40" description="M76 vehicle smoke grenade"/>
+      <subcategory id="41" description="M243 smoke grenade"/>
+      <subcategory id="42" description="M250 smoke grenade"/>
+      <subcategory id="43" description="M257 grenade">
+        <specific id="1" description="L8A1/A3 red phosphorous smoke grenade"/>
+        <specific id="2" description="L8A1/A3 WP smoke grenade"/>
+      </subcategory>
+      <subcategory id="44" description="M545 universal fragmentation grenade"/>
+      <subcategory id="45" description="M560-series antipersonnel fragmentation grenades"/>
+      <subcategory id="46" description="Ring Airfoil Grenade (RAG)"/>
+      <subcategory id="47" description="(deleted)"/>
+      <subcategory id="48" description="(deleted)"/>
+      <subcategory id="49" description="(deleted)"/>
+      <subcategory id="50" description="B28 nuclear bomb">
+        <specific id="1" description="B28 EX"/>
+        <specific id="2" description="B28 FI"/>
+        <specific id="3" description="B28 IN"/>
+        <specific id="4" description="B28 RE"/>
+        <specific id="5" description="B28 RI"/>
+      </subcategory>
+      <subcategory id="51" description="B43 nuclear bomb"/>
+      <subcategory id="52" description="B53 nuclear bomb"/>
+      <subcategory id="53" description="B57 nuclear bomb"/>
+      <subcategory id="54" description="B61 nuclear bomb">
+        <specific id="1" description="mod O"/>
+        <specific id="2" description="mod 1"/>
+        <specific id="3" description="mod 2"/>
+        <specific id="4" description="mod 3"/>
+        <specific id="5" description="mod 4"/>
+        <specific id="6" description="mod 5"/>
+      </subcategory>
+      <subcategory id="55" description="B83 nuclear bomb"/>
+      <subcategory id="56" description="BLU-73/B FAE Bomb"/>
+      <subcategory id="57" description="BLU-109/B Bomb">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="(deleted)"/>
+        <specific id="4" description="(deleted)"/>
+        <specific id="5" description="(deleted)"/>
+        <specific id="6" description="(deleted)"/>
+        <specific id="7" description="(deleted)"/>
+        <specific id="8" description="BLU-109/B Low Drag">
+          <extra id="1" description="Impact fuse"/>
+          <extra id="2" description=".10 sec delay"/>
+          <extra id="3" description=".25 sec delay"/>
+        </specific>
+      </subcategory>
+      <subcategory id="58" description="CBU 15"/>
+      <subcategory id="59" description="CBU 52"/>
+      <subcategory id="60" description="CBU-55">
+        <specific id="1" description="CBU-55/B"/>
+        <specific id="2" description="CBU-72"/>
+      </subcategory>
+      <subcategory id="61" description="CBU 58"/>
+      <subcategory id="62" description="CBU 71"/>
+      <subcategory id="63" description="CBU 75"/>
+      <subcategory id="64" description="CBU 87">
+        <specific id="1" description="CBU-87/B (CEM)"/>
+      </subcategory>
+      <subcategory id="65" description="(deleted)"/>
+      <subcategory id="66" description="CBU 89"/>
+      <subcategory id="67" description="CBU-97/B"/>
+      <subcategory id="68" description="Direct Airfield Attack Combined Munition Weapon (DAACM)"/>
+      <subcategory id="69" description="Durandal"/>
+      <subcategory id="70" description="M117 GP bomb">
+        <specific id="1" description="M117R"/>
+      </subcategory>
+      <subcategory id="71" description="Mk-7 Dispenser">
+        <specific id="1" description="CBU-78/B Gator mines (USN)"/>
+        <specific id="2" description="CBU-59/B APAM"/>
+      </subcategory>
+      <subcategory id="72" description="Mk-81">
+        <specific id="1" description="Mk-81 Low Drag General Purpose"/>
+        <specific id="2" description="Mk-81 Snakeye"/>
+      </subcategory>
+      <subcategory id="73" description="Mk-82">
+        <specific id="1" description="Mk-82 air inflatable retard">
+          <extra id="1" description="Impact fuse"/>
+          <extra id="4" description="Proximity fuse"/>
+        </specific>
+        <specific id="2" description="Mk-82 Low Drag General Purpose">
+          <extra id="1" description="Impact fuse"/>
+          <extra id="2" description=".10 sec. delay"/>
+          <extra id="3" description=".25 sec. delay"/>
+        </specific>
+        <specific id="3" description="MK-82 Snakeye">
+          <extra id="1" description="Impact fuse"/>
+          <extra id="4" description="Proximity fuse"/>
+        </specific>
+        <specific id="4" description="BLU-111/B"/>
+      </subcategory>
+      <subcategory id="74" description="Mk-83">
+        <specific id="1" description="BLU-110/B"/>
+      </subcategory>
+      <subcategory id="75" description="Mk-84">
+        <specific id="1" description="Mk-84 air inflatable retard">
+          <extra id="1" description="Impact fuse"/>
+          <extra id="4" description="Proximity fuse"/>
+        </specific>
+        <specific id="2" description="MK-84 Low Drag General Purpose">
+          <extra id="1" description="Impact fuse"/>
+          <extra id="2" description=".10 sec. delay"/>
+          <extra id="3" description=".25 sec delay"/>
+        </specific>
+      </subcategory>
+      <subcategory id="76" description="Sensor Fused Weapon (SFW)"/>
+      <subcategory id="77" description="165mm HEP"/>
+      <subcategory id="78" description="Napalm"/>
+      <subcategory id="79" description="Mine Clearing Lane Charge"/>
+      <subcategory id="80" description="MLRS Rocket">
+        <specific id="1" description="M26"/>
+        <specific id="2" description="M28A1"/>
+        <specific id="3" description="MLRS-ER"/>
+      </subcategory>
+      <subcategory id="81" description="5.56 MM">
+        <specific id="1" description="M855 Ball"/>
+        <specific id="2" description="M856 Tracer"/>
+        <specific id="3" description="A064 (4 ball &amp; 1 tracer mix)"/>
+      </subcategory>
+      <subcategory id="82" description="M87 mine canister"/>
+      <subcategory id="83" description="BLU-82/B"/>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="SLAM"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="225">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AGM-86B ALCM"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="Tomahawk">
+        <specific id="1" description="BGM-109A (TLAM-N)"/>
+      </subcategory>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="LGM-30G Minuteman III"/>
+      <subcategory id="8" description="MGM-118 Peacekeeper"/>
+      <subcategory id="9" description="UGM-73 Poseidon"/>
+      <subcategory id="10" description="UGM-93A Trident (II)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="12" country="225">
+    <category id="1" description="Point Effect DE Weapon">
+      <subcategory id="1" description="Laser Weapon">
+        <specific id="1" description="Chemical Oxygen Iodine Laser (COIL)"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Area Effect DE Weapon">
+      <subcategory id="1" description="High Power Microwave (HPM) Weapon"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AA-1 Alkali"/>
+      <subcategory id="2" description="AA-2 Atoll">
+        <specific id="1" description="AA-2C"/>
+        <specific id="2" description="AA-2D"/>
+      </subcategory>
+      <subcategory id="3" description="AA-3 Anab">
+        <specific id="1" description="AA-3, IR"/>
+        <specific id="2" description="AA-3, radar"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="AA-5 Ash">
+        <specific id="1" description="AA-5, IR"/>
+        <specific id="2" description="AA-5, radar"/>
+      </subcategory>
+      <subcategory id="6" description="AA-6 Acrid">
+        <specific id="1" description="AA-6, IR"/>
+        <specific id="2" description="AA-6, radar"/>
+      </subcategory>
+      <subcategory id="7" description="AA-7 Apex">
+        <specific id="1" description="AA-7, IR"/>
+        <specific id="2" description="AA-7, radar"/>
+      </subcategory>
+      <subcategory id="8" description="AA-8 Aphid">
+        <specific id="1" description="AA-8A Aphid"/>
+        <specific id="2" description="AA-8B Aphid"/>
+        <specific id="3" description="AA-8C Aphid"/>
+      </subcategory>
+      <subcategory id="9" description="AA-9 Amos">
+        <specific id="1" description="AA-9, inertial"/>
+        <specific id="2" description="AA-9, command update"/>
+        <specific id="3" description="AA-9, radar"/>
+      </subcategory>
+      <subcategory id="10" description="AA-10 Alamo">
+        <specific id="1" description="AA-10A, short burn radar"/>
+        <specific id="2" description="AA-10B, short burn, IR"/>
+        <specific id="3" description="AA-10C, long burn radar"/>
+        <specific id="4" description="AA-10D, long burn, IR"/>
+      </subcategory>
+      <subcategory id="11" description="AA-11 Archer"/>
+      <subcategory id="12" description="AA-X-12"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="SA-2 Guideline">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="SA-2b Guideline Mod 1"/>
+        <specific id="3" description="SA-2d Guideline Mod3"/>
+        <specific id="4" description="SA-2f Guideline Mod5"/>
+      </subcategory>
+      <subcategory id="15" description="(deleted)"/>
+      <subcategory id="16" description="SA-4 Ganef">
+        <specific id="1" description="SA-4A"/>
+        <specific id="2" description="SA-4B"/>
+      </subcategory>
+      <subcategory id="17" description="SA-5 Gammon">
+        <specific id="1" description="SA-5A"/>
+        <specific id="2" description="SA-5B"/>
+        <specific id="3" description="SA-5C"/>
+      </subcategory>
+      <subcategory id="18" description="SA-6 Gainful">
+        <specific id="1" description="SA-6A"/>
+        <specific id="2" description="SA-6B"/>
+      </subcategory>
+      <subcategory id="19" description="SA-7 Grail">
+        <specific id="1" description="SA-7A"/>
+        <specific id="2" description="SA-7B"/>
+        <specific id="3" description="SA-7B (Spetsnaz mod)"/>
+        <specific id="4" description="SA-7C"/>
+      </subcategory>
+      <subcategory id="20" description="SA-8 Gecko">
+        <specific id="1" description="SA-8A mod 0"/>
+        <specific id="2" description="SA-8B mod 1"/>
+      </subcategory>
+      <subcategory id="21" description="SA-9 Gaskin"/>
+      <subcategory id="22" description="SA-10 Grumble">
+        <specific id="1" description="SA-10a Grumble Mod 0"/>
+        <specific id="2" description="SA-10b Grumble Mod 1"/>
+        <specific id="3" description="SA-10c Grumble Mod 2"/>
+      </subcategory>
+      <subcategory id="23" description="SA-11 Gadfly"/>
+      <subcategory id="24" description="SA-12 Gladiator/Giant">
+        <specific id="1" description="SA-12A Gladiator SAM"/>
+        <specific id="2" description="(deleted)"/>
+        <specific id="3" description="SA-X-12B Giant SAM"/>
+        <specific id="4" description="SA-X-12B Giant SAM (rail w/ SS-24)"/>
+      </subcategory>
+      <subcategory id="25" description="SA-13 Gopher">
+        <specific id="1" description="Strela 10M2"/>
+        <specific id="2" description="Strela 10M3"/>
+      </subcategory>
+      <subcategory id="26" description="SA-14 Gremlin"/>
+      <subcategory id="27" description="SA-15 Gauntlet"/>
+      <subcategory id="28" description="SA-16 Gimlet"/>
+      <subcategory id="29" description="SA-17 Grizzly"/>
+      <subcategory id="30" description="SA-18"/>
+      <subcategory id="31" description="SA-19 Grison">
+        <specific id="1" description="SA-N-11"/>
+      </subcategory>
+      <subcategory id="32" description="SA-N-1 Goa (M-1 Volga-M)"/>
+      <subcategory id="33" description="SA-N-3 Goblet">
+        <specific id="1" description="SA-N-3 Mod 0"/>
+        <specific id="2" description="SA-N-3B Mod 1"/>
+      </subcategory>
+      <subcategory id="34" description="SA-N-4 (OSA-M)"/>
+      <subcategory id="35" description="SA-N-5 Grail (Strela 2)"/>
+      <subcategory id="36" description="SA-N-6"/>
+      <subcategory id="37" description="SA-N-7 Gadfly (Smerch/Shtil)"/>
+      <subcategory id="38" description="SA-N-8 Gremlin (Strela 3)"/>
+      <subcategory id="39" description="SA-N-9 Tor-M/Klinok"/>
+      <subcategory id="40" description="SA-N-11 (9M311)"/>
+      <subcategory id="41" description="SA-3 Goa"/>
+      <subcategory id="42" description="SA-20 Gargoyle"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="12.7 mm"/>
+      <subcategory id="2" description="14.5 mm">
+        <specific id="1" description="API"/>
+        <specific id="2" description="API-T"/>
+        <specific id="3" description="I-T"/>
+      </subcategory>
+      <subcategory id="3" description="23 mm">
+        <specific id="1" description="NS HE-I-T OZT"/>
+        <specific id="2" description="NS AP-I BZ"/>
+        <specific id="3" description="VYa HE-I-T OZT"/>
+        <specific id="4" description="VYa AP-I BZ"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="25 mm">
+        <specific id="1" description="M1940 HE-I-T UOZR-132"/>
+        <specific id="2" description="M1940 AP-T UZR-132"/>
+        <specific id="3" description="2-M3"/>
+        <specific id="4" description="2-M8"/>
+      </subcategory>
+      <subcategory id="6" description="30 mm">
+        <specific id="1" description="BR-83 AP-T"/>
+        <specific id="2" description="OF-83D HE"/>
+      </subcategory>
+      <subcategory id="7" description="57 mm"/>
+      <subcategory id="8" description="76 mm"/>
+      <subcategory id="9" description="85 mm"/>
+      <subcategory id="10" description="100 mm"/>
+      <subcategory id="11" description="130 mm">
+        <specific id="1" description="SM-4-1"/>
+      </subcategory>
+      <subcategory id="12" description="37 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="AT-1 Snapper"/>
+      <subcategory id="4" description="AT-2 Swatter">
+        <specific id="1" description="Swatter A/B (radio command)"/>
+        <specific id="2" description="Swatter C (SACLOS)"/>
+      </subcategory>
+      <subcategory id="5" description="AT-3 Sagger">
+        <specific id="1" description="Sagger (MCLOS)"/>
+      </subcategory>
+      <subcategory id="6" description="AT-4 Spigot">
+        <specific id="1" description="Spigot A"/>
+        <specific id="2" description="Spigot B"/>
+      </subcategory>
+      <subcategory id="7" description="AT-5 Spandrel"/>
+      <subcategory id="8" description="AT-6 Spiral"/>
+      <subcategory id="9" description="AT-7 Saxhorn">
+        <specific id="1" description="AT-13 Metis-M"/>
+      </subcategory>
+      <subcategory id="10" description="AT-8 Songster"/>
+      <subcategory id="11" description="AT-9"/>
+      <subcategory id="12" description="AT -10 Stabber"/>
+      <subcategory id="13" description="AT-11 Sniper"/>
+      <subcategory id="14" description="AT-12"/>
+      <subcategory id="15" description="AT-14">
+        <specific id="1" description="AT-14 KORNET-LR"/>
+        <specific id="2" description="AT-14 FAE"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="23 mm"/>
+      <subcategory id="2" description="30 mm">
+        <specific id="1" description="30mm AP-T"/>
+        <specific id="2" description="30mm APDS-T"/>
+        <specific id="3" description="30mm APFSDS-T"/>
+      </subcategory>
+      <subcategory id="3" description="64 mm">
+        <specific id="1" description="(w/ RPG-18 light anti-armor weapon)"/>
+      </subcategory>
+      <subcategory id="4" description="73 mm">
+        <specific id="1" description="HEAT FS"/>
+        <specific id="2" description="HEAT-FS, PG-7VL"/>
+      </subcategory>
+      <subcategory id="5" description="76 mm"/>
+      <subcategory id="6" description="80 mm"/>
+      <subcategory id="7" description="82 mm">
+        <specific id="1" description="BK-881 HEAT"/>
+        <specific id="2" description="BK-881M HEAT"/>
+      </subcategory>
+      <subcategory id="8" description="85 mm">
+        <specific id="1" description="HEAT"/>
+      </subcategory>
+      <subcategory id="9" description="107 mm"/>
+      <subcategory id="10" description="115 mm">
+        <specific id="1" description="HEAT-FS"/>
+        <specific id="2" description="HVAPFSDS"/>
+      </subcategory>
+      <subcategory id="11" description="125 mm">
+        <specific id="1" description="APFSDS-T BM-9"/>
+        <specific id="2" description="APFSDS-T BM-12"/>
+        <specific id="3" description="HEAT-FS BM-14m"/>
+        <specific id="4" description="HVAPFSDS"/>
+        <specific id="5" description="APFSDS-T, BM-42M"/>
+        <specific id="6" description="HEAT-T, BK-29M"/>
+        <specific id="7" description="HEAT-T, BK-27"/>
+      </subcategory>
+      <subcategory id="12" description="BRAB-200DS HE AP"/>
+      <subcategory id="13" description="BRAB-220 HE AP"/>
+      <subcategory id="14" description="BRAB-500 HE AP"/>
+      <subcategory id="15" description="BRAB-1000 HE AP"/>
+      <subcategory id="16" description="PTAB-2.5 bomblet HE anti-armor"/>
+      <subcategory id="17" description="122mm">
+        <specific id="1" description="HEAT"/>
+      </subcategory>
+      <subcategory id="18" description="120mm">
+        <specific id="1" description="HEAT-FS"/>
+      </subcategory>
+      <subcategory id="19" description="100mm">
+        <specific id="1" description="APFSDS-T"/>
+        <specific id="2" description="HEAT"/>
+        <specific id="3" description="HEAT-FS"/>
+      </subcategory>
+      <subcategory id="20" description="RPG-7VAT Grenade Launcher"/>
+      <subcategory id="21" description="130 mm">
+        <specific id="1" description="APC-T BR-482B"/>
+      </subcategory>
+      <subcategory id="22" description="152mm">
+        <specific id="1" description="Projectile, 152-mm, HEAT-FS"/>
+        <specific id="2" description="APC-T, 3BR-540, 152mm"/>
+      </subcategory>
+      <subcategory id="23" description="105mm">
+        <specific id="1" description="PG-29V 105mm HEAT (Tandem)"/>
+      </subcategory>
+      <subcategory id="24" description="57mm Air to ground rockets">
+        <specific id="1" description="57mm HEAT rocket, S-5"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="SH-01 Galosh (UR-96)">
+        <specific id="1" description="(deleted)"/>
+        <specific id="2" description="SH-08"/>
+        <specific id="3" description="SH-11 Gorgon"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="30 mm">
+        <specific id="1" description="UOF-84 HE-I"/>
+        <specific id="2" description="UOR-84 HE-T"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AS-4 Kitchen"/>
+      <subcategory id="2" description="AS-9 Kyle"/>
+      <subcategory id="3" description="AS-12 Kegler"/>
+      <subcategory id="4" description="AS-11 Kilter">
+        <specific id="1" description="AS-11A, Mod 1 Kilter"/>
+        <specific id="2" description="AS-11B, Mod 2 Kilter"/>
+      </subcategory>
+      <subcategory id="5" description="KH-31P/X-31 or possibly AS-17"/>
+      <subcategory id="6" description="SS-21 Scarab">
+        <specific id="1" description="Tochka-R"/>
+      </subcategory>
+      <subcategory id="7" description="Kh-29MP Kedge anti-radar">
+        <specific id="1" description="Kh-29T Kedge (AS-14A) TV-guided"/>
+        <specific id="2" description="Kh-29L Kedge (AS-14B) laser-guided"/>
+        <specific id="3" description="Kh-29D Kedge infrared guided"/>
+        <specific id="4" description="Kh-29LE Kedge laser guided export"/>
+        <specific id="5" description="Kh-29ML Kedge"/>
+        <specific id="6" description="Kh-29TE Kedge TV guided"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="5" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Antisatellite System"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AS-2 Kipper"/>
+      <subcategory id="2" description="AS-4 Kitchen"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="AS-6 Kingfish"/>
+      <subcategory id="5" description="AS-13 Kingbolt"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="AS-15 Kent">
+        <specific id="1" description="Kh-55 Kent (AS-15A)"/>
+        <specific id="2" description="Kh-55SM Kent Mod 1 (AS-15B)"/>
+        <specific id="3" description="Kent Mod 2"/>
+      </subcategory>
+      <subcategory id="8" description="SS-N-2 Styx">
+        <specific id="1" description="SS-N-2a"/>
+        <specific id="2" description="SS-N-2b"/>
+        <specific id="3" description="SS-N-2c"/>
+        <specific id="4" description="SS-N-2d"/>
+      </subcategory>
+      <subcategory id="9" description="SS-N-7 Starbright"/>
+      <subcategory id="10" description="SS-N-9 Siren"/>
+      <subcategory id="11" description="SS-N-12 Sandbox"/>
+      <subcategory id="12" description="SS-N-19 Shipwreck">
+        <specific id="1" description="Boost phase vehicle"/>
+        <specific id="2" description="Jettisoned vehicle"/>
+        <specific id="3" description="Separated warhead"/>
+      </subcategory>
+      <subcategory id="13" description="SS-N-22 Sunburn"/>
+      <subcategory id="14" description="SS-N-3 Shaddock">
+        <specific id="1" description="SS-N-3a"/>
+        <specific id="2" description="SS-N-3b"/>
+        <specific id="3" description="SS-N-3c"/>
+      </subcategory>
+      <subcategory id="15" description="SSC-2b Samlet Cruise"/>
+      <subcategory id="16" description="SSC-1b Sepal"/>
+      <subcategory id="17" description="SSC-3 Styx"/>
+      <subcategory id="18" description="533-mm torpedo"/>
+      <subcategory id="19" description="406-mm torpedo"/>
+      <subcategory id="20" description="(deleted)"/>
+      <subcategory id="21" description="(deleted)"/>
+      <subcategory id="22" description="SS-N-21 Sampson"/>
+      <subcategory id="23" description="SS-N-25 (Kh 35)"/>
+      <subcategory id="24" description="AS-5 Kelt"/>
+      <subcategory id="25" description="AS-10 Karen"/>
+      <subcategory id="26" description="Kh-31 Krypton (AS-17) Non-ARM">
+        <specific id="1" description="Kh-31A Krypton (AS-17A)"/>
+        <specific id="2" description="Kh-31AD Krypton (AS-17B)"/>
+      </subcategory>
+      <subcategory id="27" description="53 CM Torpedo Thermal (turbine)"/>
+      <subcategory id="28" description="65 CM Torpedo Thermal"/>
+      <subcategory id="29" description="SSC-X-5 (SS-NX-26)">
+        <specific id="1" description="Yakhont"/>
+      </subcategory>
+      <subcategory id="30" description="SSC-6 (SS-N-25)"/>
+      <subcategory id="31" description="P-270 Moskit (Kh-41)"/>
+      <subcategory id="32" description="M51"/>
+      <subcategory id="33" description="53-56/51 Torpedo"/>
+      <subcategory id="34" description="Kh-59M Kazoo (AS-18)"/>
+      <subcategory id="35" description="Kh-35 Kayak (AS-20)"/>
+      <subcategory id="36" description="SS-NX-30 Conventional LACM"/>
+      <subcategory id="37" description="PJ-10"/>
+      <subcategory id="38" description="M-5 Torpedo"/>
+      <subcategory id="39" description="USET-80 Torpedo"/>
+      <subcategory id="40" description="SAET-50 Torpedo"/>
+      <subcategory id="41" description="SET 53A Torpedo"/>
+      <subcategory id="42" description="3M-14E (Klub) SS-N-17"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="12.7 mm"/>
+      <subcategory id="2" description="14.5 mm"/>
+      <subcategory id="3" description="23 mm"/>
+      <subcategory id="4" description="25 mm"/>
+      <subcategory id="5" description="30 mm">
+        <specific id="1" description="BR-83 AP-T"/>
+        <specific id="2" description="OF-83D HE"/>
+      </subcategory>
+      <subcategory id="6" description="57 mm"/>
+      <subcategory id="7" description="76 mm"/>
+      <subcategory id="8" description="85 mm"/>
+      <subcategory id="9" description="100 mm"/>
+      <subcategory id="10" description="130 mm">
+        <specific id="1" description="SM-4-1"/>
+      </subcategory>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="M-26 mine"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="SS-N-14 Silex"/>
+      <subcategory id="3" description="SS-N-15 Starfish"/>
+      <subcategory id="4" description="SS-N-16 Stallion"/>
+      <subcategory id="5" description="533-mm torpedo">
+        <specific id="1" description="Type 3"/>
+        <specific id="2" description="Type 3 nuclear"/>
+        <specific id="3" description="new passive wake-homing turbine"/>
+        <specific id="4" description="new electric"/>
+      </subcategory>
+      <subcategory id="6" description="406-mm Type 40 torpedo"/>
+      <subcategory id="7" description="650-mm submarine-launched torpedo"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="Type 45 (light, air-launched)"/>
+      <subcategory id="14" description="Type E53 (light, air-launched)"/>
+      <subcategory id="15" description="Test 71 Torpedo"/>
+      <subcategory id="16" description="APR-2 Torpedo"/>
+      <subcategory id="17" description="APR-3 Torpedo"/>
+      <subcategory id="18" description="E40-79 Torpedo"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="FRAS-1/SUW-N-1 (VETER)"/>
+      <subcategory id="2" description="RBU 1000"/>
+      <subcategory id="3" description="RBU 1200"/>
+      <subcategory id="4" description="RBU 2500"/>
+      <subcategory id="5" description="RBU 6000"/>
+      <subcategory id="6" description="RBU 12000"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="222">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="5.45 mm">
+        <specific id="1" description="5.45-mm Soviet pistol (aka 5.45 x 18 mm)"/>
+        <specific id="2" description="5.45-mm Soviet rifle (aka 5.45 x 39.5 mm and 5.45-mm M74)"/>
+      </subcategory>
+      <subcategory id="2" description="7.62 mm">
+        <specific id="1" description="7.62 x 25-mm Soviet pistol (aka 7.62-mm Tokarev)"/>
+        <specific id="2" description="7.62 x 38R Nagant Revolver (aka 7.62-mm Soviet revolver and 7.62-mm Nagant gas-seal)"/>
+        <specific id="3" description="7.62-mm Soviet M1943 (aka 7.62 x 39 mm, 7.62-mm Kalashnikov, and 7.62-mm obr 43g)"/>
+        <specific id="4" description="7.62-mm Mosin-Nagant (aka 7.62 x 54R, 7.62-mm Soviet Rimmed, and 7.62-mm obr 1891)"/>
+      </subcategory>
+      <subcategory id="3" description="9 mm">
+        <specific id="1" description="9-mm Makarov (aka 9 x 18 mm Soviet, 9-mm Stechkin, and 9-mm Type 59)"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="82 mm">
+        <specific id="1" description="HE fragmentation (O-881A)"/>
+      </subcategory>
+      <subcategory id="8" description="107-mm M-38 mortar"/>
+      <subcategory id="9" description="AO-1 SCH bomblet HE submunition"/>
+      <subcategory id="10" description="AO-2.5 bomblet"/>
+      <subcategory id="11" description="AO-2.5 HE submunition"/>
+      <subcategory id="12" description="AO-2.5-2 HE submunition"/>
+      <subcategory id="13" description="AO-8M2 HE"/>
+      <subcategory id="14" description="AO-10 HE"/>
+      <subcategory id="15" description="AO-10-6.5 HE"/>
+      <subcategory id="16" description="AO-20 HE"/>
+      <subcategory id="17" description="AO-20M3 HE"/>
+      <subcategory id="18" description="AO-25M1 HE"/>
+      <subcategory id="19" description="AO-25M2 HE"/>
+      <subcategory id="20" description="AO-100 HE"/>
+      <subcategory id="21" description="FAB-50 HE"/>
+      <subcategory id="22" description="FAB-70 HE"/>
+      <subcategory id="23" description="FAB-100 M43 HE"/>
+      <subcategory id="24" description="FAB-100 M62 HE"/>
+      <subcategory id="25" description="FAB-250 HE"/>
+      <subcategory id="26" description="FAB-250 M43 HE"/>
+      <subcategory id="27" description="FAB-250 M46 HE"/>
+      <subcategory id="28" description="FAB-250 M54 HE"/>
+      <subcategory id="29" description="FAB-250 M62 HE"/>
+      <subcategory id="30" description="FAB-500 HE"/>
+      <subcategory id="31" description="FAB-500 M46 HE"/>
+      <subcategory id="32" description="FAB-500 M54 HE"/>
+      <subcategory id="33" description="FAB-500 M62 HE"/>
+      <subcategory id="34" description="FAB-1000 M62 HE"/>
+      <subcategory id="35" description="FAB-1500 M46 HE"/>
+      <subcategory id="36" description="FAB-1500 M54 HE"/>
+      <subcategory id="37" description="FAB-3000 M46 HE"/>
+      <subcategory id="38" description="KhAB 100-kg (80) mustard gas/lewisite HL"/>
+      <subcategory id="39" description="KhAB 100-kg (100) mustard gas/lewisite HL"/>
+      <subcategory id="40" description="KhAB 250-kg Sarin (GB)"/>
+      <subcategory id="41" description="M-1 bomblet (35-40 g of liquid explosive)"/>
+      <subcategory id="42" description="Mustard gas/lewisite HL (from 500- and 1500-kg spray tanks)"/>
+      <subcategory id="43" description="OFAB-100M HE"/>
+      <subcategory id="44" description="OFAB-100MH HE"/>
+      <subcategory id="45" description="OFAB-100NV HE"/>
+      <subcategory id="46" description="OFAB-250M HE"/>
+      <subcategory id="47" description="OKT-11 bomblet (incendiary or chemical)"/>
+      <subcategory id="48" description="ROSAB bomblet HE"/>
+      <subcategory id="49" description="Soman (GD) (from 250-kg spray tank)"/>
+      <subcategory id="50" description="ZAB-1E incendiary (1.5 kg)"/>
+      <subcategory id="51" description="ZAB 500 T Shch incendiary (500 kg)"/>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="Wooden TMD-B AT mine"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="TM-46 AT-blast mine"/>
+      <subcategory id="6" description="TMN-46 AT-blast mine"/>
+      <subcategory id="7" description="TM-57 AT mine"/>
+      <subcategory id="8" description="TM-62M AT mine (metal casing)"/>
+      <subcategory id="9" description="TMK-2 AT shaped-charge mine"/>
+      <subcategory id="10" description="Area-type POMZ-2 AP-fragmentation mine"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="MON series AP mine (directional) (MON-50/MON-90/MON-100/MON-200)"/>
+      <subcategory id="13" description="PMN AP-blast mine"/>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="AMD-500"/>
+      <subcategory id="16" description="AMD-1000"/>
+      <subcategory id="17" description="AMG-1"/>
+      <subcategory id="18" description="BDT mine-clearance charge"/>
+      <subcategory id="19" description="ITB-2 mine-clearance charge"/>
+      <subcategory id="20" description="KMD-500"/>
+      <subcategory id="21" description="KMD-1000"/>
+      <subcategory id="22" description="M-08"/>
+      <subcategory id="23" description="M-12"/>
+      <subcategory id="24" description="M-16"/>
+      <subcategory id="25" description="M-AG"/>
+      <subcategory id="26" description="M-KB"/>
+      <subcategory id="27" description="M-KB-3"/>
+      <subcategory id="28" description="Mirab"/>
+      <subcategory id="29" description="MYaM"/>
+      <subcategory id="30" description="MYaRM"/>
+      <subcategory id="31" description="MZ-26"/>
+      <subcategory id="32" description="OZM bounding AP mine"/>
+      <subcategory id="33" description="OZM-3 bounding AP mine"/>
+      <subcategory id="34" description="OZM-4 bounding AP mine"/>
+      <subcategory id="35" description="OZM-72 bounding AP mine"/>
+      <subcategory id="36" description="OZM-160 bounding AP mine"/>
+      <subcategory id="37" description="PFM-1 or PMZ AP mine/bomblet"/>
+      <subcategory id="38" description="PGMDM scatterable Anti-tank mine"/>
+      <subcategory id="39" description="PLT"/>
+      <subcategory id="40" description="PLT-3"/>
+      <subcategory id="41" description="PMD-6 wooden AP mine"/>
+      <subcategory id="42" description="PMD-6M wooden AP mine"/>
+      <subcategory id="43" description="PMD-7 wooden AP mine"/>
+      <subcategory id="44" description="PMD-7ts wooden AP mine"/>
+      <subcategory id="45" description="PMD-57 wooden AP mine"/>
+      <subcategory id="46" description="PMN AP mine"/>
+      <subcategory id="47" description="PMN-2 AP mine"/>
+      <subcategory id="48" description="PMN-6"/>
+      <subcategory id="49" description="POMZ-2 AP stake mine"/>
+      <subcategory id="50" description="POMZ-2M AP stake mine"/>
+      <subcategory id="51" description="SPZ-2 mine-clearance charge"/>
+      <subcategory id="52" description="SPZ-4 mine-clearance charge"/>
+      <subcategory id="53" description="TM-62 AT mine P2 (plastic casing)"/>
+      <subcategory id="54" description="TM-62B waterproof cardboard casing"/>
+      <subcategory id="55" description="TM-62D rectangular wooden case"/>
+      <subcategory id="56" description="TM-62 P3 plastic casing"/>
+      <subcategory id="57" description="TMD-B Anti-tank mine"/>
+      <subcategory id="58" description="TMD-44 Anti-tank mine"/>
+      <subcategory id="59" description="UEP"/>
+      <subcategory id="60" description="UZ-1 Bangalore torpedo"/>
+      <subcategory id="61" description="UZ-2 Bangalore torpedo"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AS-3 Kangaroo"/>
+      <subcategory id="2" description="AS-4 Kitchen"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="AS-7 Kerry"/>
+      <subcategory id="5" description="AS-10 Karen">
+        <specific id="1" description="AS-10 (radio)"/>
+        <specific id="2" description="AS-10 (laser)"/>
+      </subcategory>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="AS-16 Kickback">
+        <specific id="1" description="Kh-15 Kickback (AS-16A) nuclear"/>
+        <specific id="2" description="Kh-15 Kickback (AS-16B) conventional"/>
+      </subcategory>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="(deleted)"/>
+      <subcategory id="15" description="KAB-500N laser-guided HE"/>
+      <subcategory id="16" description="KAB-500T TV-guided HE"/>
+      <subcategory id="17" description="SS-21 Scarab">
+        <specific id="1" description="SS-21 W/HE Warhead (9M79F)"/>
+        <specific id="2" description="SS-21 W/sub-munition warhead (9M79K)"/>
+        <specific id="3" description="SS-21 W/nuclear warhead (9M79B)"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="12.7 mm Soviet machine gun (aka 12.7 x 107mm)">
+        <specific id="1" description="API type Bz"/>
+        <specific id="2" description="API - T type BZT"/>
+      </subcategory>
+      <subcategory id="2" description="14.5 mm Soviet machine gun (aka 14.5 x 114mm)">
+        <specific id="1" description="API type BS41"/>
+        <specific id="2" description="API-T type BZT"/>
+        <specific id="3" description="Incendiary type ZP"/>
+      </subcategory>
+      <subcategory id="3" description="23 mm"/>
+      <subcategory id="4" description="25 mm">
+        <specific id="1" description="25 mm Soviet 2-M3"/>
+        <specific id="2" description="25 mm Soviet 2-M8"/>
+      </subcategory>
+      <subcategory id="5" description="30 mm grenade">
+        <specific id="1" description="HE FRAG"/>
+      </subcategory>
+      <subcategory id="6" description="37 mm"/>
+      <subcategory id="7" description="40-mm rocket"/>
+      <subcategory id="8" description="45 mm"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="82 mm (mortar)">
+        <specific id="1" description="82-mm model 0-832 DU HE fragmentation bomb"/>
+      </subcategory>
+      <subcategory id="11" description="100 mm">
+        <specific id="1" description="HE-FRAG OF-412"/>
+        <specific id="2" description="HE-FRAG OF-17"/>
+      </subcategory>
+      <subcategory id="12" description="107 mm"/>
+      <subcategory id="13" description="120 mm (mortar)">
+        <specific id="1" description="HE bomb F-843"/>
+        <specific id="2" description="HE bomb OF-843"/>
+        <specific id="3" description="HE bomb OF-843A"/>
+        <specific id="4" description="WP"/>
+        <specific id="5" description="HE FRAG"/>
+        <specific id="6" description="Illumination"/>
+        <specific id="7" description="Incendiary"/>
+        <specific id="8" description="HE-Frag, OF-843B"/>
+        <specific id="9" description="HE-Frag, RAP"/>
+      </subcategory>
+      <subcategory id="14" description="122 mm">
+        <specific id="1" description="122mm, High Explosive, 30F-56"/>
+        <specific id="2" description="122mm, High Explosive - FRAG, 53-VOF-471G"/>
+        <specific id="3" description="122mm, DPICM"/>
+        <specific id="4" description="122mm, HE -Rocket Assist Projectile, 3OF-463"/>
+        <specific id="5" description="122mm, DPICM-ER"/>
+        <specific id="6" description="122mm, Incendiary"/>
+        <specific id="7" description="122mm, Smoke, S-463"/>
+        <specific id="8" description="122mm, Smoke WP, 3D-4"/>
+        <specific id="9" description="122mm, Laser Guided, KITOLOV-2M"/>
+      </subcategory>
+      <subcategory id="15" description="122-mm rocket">
+        <specific id="1" description="M-21-OF (9M22M)"/>
+        <specific id="2" description="M-21-OF (9M22U)"/>
+        <specific id="3" description="Smoke"/>
+        <specific id="4" description="HE FRAG"/>
+        <specific id="5" description="ICM"/>
+        <specific id="6" description="Illumination"/>
+        <specific id="7" description="Incendiary"/>
+        <specific id="8" description="Chemical"/>
+        <specific id="9" description="Jammer"/>
+      </subcategory>
+      <subcategory id="16" description="125 mm">
+        <specific id="1" description="HE-FRAG OF-19"/>
+        <specific id="2" description="FRAG-HE-T, OF-26"/>
+      </subcategory>
+      <subcategory id="17" description="130 mm">
+        <specific id="1" description="FRAG-HE OF-482M"/>
+      </subcategory>
+      <subcategory id="18" description="139.7-mm rocket">
+        <specific id="1" description="M-14-OF"/>
+      </subcategory>
+      <subcategory id="19" description="152 mm">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="Projectile, 152-mm, Flechette"/>
+        <specific id="3" description="Projectile, 152-mm, ICM"/>
+        <specific id="4" description="Projectile, 152-mm, Incendiary"/>
+        <specific id="5" description="Projectile, 152-mm, Concrete Piercing"/>
+        <specific id="6" description="Projectile, 152-mm, Illuminating"/>
+        <specific id="7" description="Projectile, 152-mm, Chemical: VX"/>
+        <specific id="8" description="Projectile, 152-mm, Chemical: GD"/>
+        <specific id="9" description="Projectile, 152-mm, Chemical: AC"/>
+        <specific id="10" description="Projectile, 152-mm, DPICM"/>
+        <specific id="11" description="Projectile, 152-mm, DPICM, Base Bleed"/>
+        <specific id="12" description="Projectile, 152-mm, HE, Base Bleed"/>
+        <specific id="13" description="Projectile, 152-mm, HE-Frag, RAP"/>
+        <specific id="14" description="Projectile, 152-mm, HE-Frag, 3OF-45"/>
+      </subcategory>
+      <subcategory id="20" description="160 mm (mortar)">
+        <specific id="1" description="HE BOMB F-853U"/>
+        <specific id="2" description="HE BOMB F-853A"/>
+        <specific id="3" description="HE Bomb F-852"/>
+      </subcategory>
+      <subcategory id="21" description="180 mm"/>
+      <subcategory id="22" description="203-mm Howitzer">
+        <specific id="1" description="203-mm, High Explosive-Frag"/>
+        <specific id="2" description="203-mm, DPICM"/>
+        <specific id="3" description="203-mm, HE-Concrete Piercing"/>
+        <specific id="4" description="203-mm, HE, OF-43"/>
+        <specific id="5" description="203-mm, HE-RAP"/>
+        <specific id="6" description="203-mm, HE-Frag, Base Bleed"/>
+        <specific id="7" description="203-mm, DPICM, Base Bleed"/>
+      </subcategory>
+      <subcategory id="23" description="220-mm rocket"/>
+      <subcategory id="24" description="240 mm (mortar)">
+        <specific id="1" description="F-864 HE bomb"/>
+      </subcategory>
+      <subcategory id="25" description="240-mm rocket"/>
+      <subcategory id="26" description="250-mm rocket"/>
+      <subcategory id="27" description="400-mm rocket"/>
+      <subcategory id="28" description="550-mm rocket"/>
+      <subcategory id="29" description="600-mm rocket"/>
+      <subcategory id="30" description="850-mm missile"/>
+      <subcategory id="31" description="1100-mm missile"/>
+      <subcategory id="32" description="250 SHN HE (parachute-retarded)"/>
+      <subcategory id="33" description="500 SH HE (parachute-retarded)"/>
+      <subcategory id="34" description="BETAB-150DS HE concrete-piercing"/>
+      <subcategory id="35" description="OF-841A HE fragmentation bomb"/>
+      <subcategory id="36" description="81mm smoke grenade"/>
+      <subcategory id="37" description="Frog-7"/>
+      <subcategory id="38" description="57 mm rocket">
+        <specific id="1" description="S5"/>
+      </subcategory>
+      <subcategory id="39" description="73mm">
+        <specific id="1" description="HE FRAG"/>
+      </subcategory>
+      <subcategory id="40" description="80mm rocket">
+        <specific id="1" description="S8"/>
+      </subcategory>
+      <subcategory id="41" description="8/mm grenade">
+        <specific id="1" description="RP"/>
+      </subcategory>
+      <subcategory id="42" description="115mm">
+        <specific id="1" description="HE FRAG"/>
+      </subcategory>
+      <subcategory id="43" description="120mm (gun/mortar)">
+        <specific id="1" description="Incendiary"/>
+        <specific id="2" description="HE FRAG"/>
+        <specific id="3" description="Illumination"/>
+        <specific id="4" description="WP"/>
+        <specific id="5" description="HE-Frag-RAP"/>
+        <specific id="6" description="HE-Frag-Laser Guided"/>
+      </subcategory>
+      <subcategory id="44" description="MCLC"/>
+      <subcategory id="45" description="300-mm rocket">
+        <specific id="1" description="9M5K1 rocket"/>
+      </subcategory>
+      <subcategory id="46" description="200-mm rocket"/>
+      <subcategory id="47" description="30mm autocannon ammunition">
+        <specific id="1" description="30mm HE-Frag"/>
+      </subcategory>
+      <subcategory id="48" description="40mm">
+        <specific id="1" description="40mm VOG-25"/>
+        <specific id="2" description="40mm VOG-25P"/>
+      </subcategory>
+      <subcategory id="49" description="Flame weapons">
+        <specific id="1" description="Rocket, incendiary, 93mm (RPO)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="222">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="SS-N-5 Sark"/>
+      <subcategory id="2" description="SS-N-6 Serb">
+        <specific id="1" description="SS-N-6"/>
+        <specific id="2" description="SS-N-6 Mod 1"/>
+        <specific id="3" description="SS-N-6 Mod 2"/>
+      </subcategory>
+      <subcategory id="3" description="SS-N-8 Sawfly"/>
+      <subcategory id="4" description="SS-N-17 Snipe"/>
+      <subcategory id="5" description="SS-N-18 Stingray"/>
+      <subcategory id="6" description="SS-N-20 Sturgeon"/>
+      <subcategory id="7" description="SS-N-23 Skiff"/>
+      <subcategory id="8" description="SS-N-21 Sampson"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="AS-15 Kent">
+        <specific id="1" description="AS-15A (Tu-95 Bear-H) w/nuclear warhead"/>
+        <specific id="2" description="AS-15B (Tu-160 Blackjack) w/nuclear warhead"/>
+      </subcategory>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="SS-11 Sego"/>
+      <subcategory id="15" description="SS-13 Savage"/>
+      <subcategory id="16" description="SS-16 Sinner"/>
+      <subcategory id="17" description="SS-17 Spanker"/>
+      <subcategory id="18" description="SS-18 Satan"/>
+      <subcategory id="19" description="SS-19 Stiletto"/>
+      <subcategory id="20" description="SS-20 Saber"/>
+      <subcategory id="21" description="SS-24 Scapel"/>
+      <subcategory id="22" description="SS-25 Sickle">
+        <specific id="1" description="RS-12m (Topol)"/>
+        <specific id="2" description="RS-12 M1 (Topol-M)"/>
+        <specific id="3" description="RS-12 M2 (Topol-M, silo based)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="222">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="SCUD-B"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Rapier Mk 1"/>
+      <subcategory id="3" description="Rapier Mk 2">
+        <specific id="1" description="Rapier Mk 2A (impact fuze)"/>
+        <specific id="2" description="Rapier Mk 2B (proximity fuze)"/>
+      </subcategory>
+      <subcategory id="4" description="Seacat/Tigercat"/>
+      <subcategory id="5" description="Blowpipe"/>
+      <subcategory id="6" description="Javelin"/>
+      <subcategory id="7" description="Star Streak"/>
+      <subcategory id="8" description="Sea Dart">
+        <specific id="1" description="GWS 30"/>
+      </subcategory>
+      <subcategory id="9" description="Sea Wolf">
+        <specific id="1" description="GWS 25"/>
+        <specific id="2" description="GWS 26 Mod 1"/>
+      </subcategory>
+      <subcategory id="10" description="Sky Flash"/>
+      <subcategory id="11" description="ASRAAM"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Milan missile"/>
+      <subcategory id="2" description="Swingfire missile"/>
+      <subcategory id="3" description="Merlin"/>
+      <subcategory id="4" description="FI TOW"/>
+      <subcategory id="5" description="Trigat"/>
+      <subcategory id="6" description="LAW 80"/>
+      <subcategory id="7" description="SWAARM"/>
+      <subcategory id="8" description="Wolverine"/>
+      <subcategory id="9" description="Brimstone"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="30mm RARDEN APDS"/>
+      <subcategory id="2" description="120mm APFSDS-T (L23A1)"/>
+      <subcategory id="3" description="120mm HESH- T(L31)"/>
+      <subcategory id="4" description="27mm Mauser HE"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Decoys">
+        <specific id="1" description="Towed radar decoy"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="ALARM"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Vosper Thorny Croft Excalibur Coast Defense Missile System"/>
+      <subcategory id="2" description="Sea Eagle"/>
+      <subcategory id="3" description="Sea Eagle SL"/>
+      <subcategory id="4" description="Sea Skua"/>
+      <subcategory id="5" description="Martel"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Tigerfish torpedo"/>
+      <subcategory id="2" description="Spear Fish torpedo"/>
+      <subcategory id="3" description="Sting Ray torpedo"/>
+      <subcategory id="4" description="Mk 24 torpedo"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="224">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="7.62 mm"/>
+      <subcategory id="2" description="9.0 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Storm-Shadow"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="51 mm"/>
+      <subcategory id="2" description="89 mm"/>
+      <subcategory id="3" description="105 mm"/>
+      <subcategory id="4" description="155 mm"/>
+      <subcategory id="5" description="175 mm"/>
+      <subcategory id="6" description="30 mm RARDEN HE"/>
+      <subcategory id="7" description="120 mm smoke WP (L34)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="224">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="A-3TK Polaris"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Aster 15"/>
+      <subcategory id="2" description="Aster 30"/>
+      <subcategory id="3" description="Crotale">
+        <specific id="1" description="Crotale R440 missile"/>
+        <specific id="2" description="VT-1 (Crotale NG) missile"/>
+      </subcategory>
+      <subcategory id="4" description="Roland"/>
+      <subcategory id="5" description="Mistral"/>
+      <subcategory id="6" description="Masurca"/>
+      <subcategory id="7" description="Mica Missile">
+        <specific id="1" description="Radar"/>
+        <specific id="2" description="IR"/>
+      </subcategory>
+      <subcategory id="8" description="R530"/>
+      <subcategory id="9" description="R-550 Magic">
+        <specific id="1" description="R-550 Magic 1"/>
+        <specific id="2" description="R-550 Magic 2"/>
+      </subcategory>
+      <subcategory id="10" description="Super 530">
+        <specific id="1" description="Super 530F"/>
+        <specific id="2" description="Super 530D"/>
+      </subcategory>
+      <subcategory id="11" description="Shahine R460 missile"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="20 mm"/>
+      <subcategory id="2" description="25 mm"/>
+      <subcategory id="3" description="30 mm"/>
+      <subcategory id="9" description="90"/>
+      <subcategory id="30" description=".50 Cal."/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="SS-11/AS-11"/>
+      <subcategory id="2" description="Eryx missile"/>
+      <subcategory id="3" description="HOT missile"/>
+      <subcategory id="4" description="Milan missile"/>
+      <subcategory id="5" description="ACL-STRIM"/>
+      <subcategory id="6" description="Entac"/>
+      <subcategory id="7" description="AS-15">
+        <specific id="1" description="AS-15 TT"/>
+      </subcategory>
+      <subcategory id="8" description="BAT 120 anti-armor bomb"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="8 in."/>
+      <subcategory id="3" description="20 mm"/>
+      <subcategory id="4" description="25 mm"/>
+      <subcategory id="5" description="30 mm"/>
+      <subcategory id="6" description="60 mm"/>
+      <subcategory id="7" description="68 mm"/>
+      <subcategory id="8" description="74 mm"/>
+      <subcategory id="9" description="90 mm"/>
+      <subcategory id="10" description="105 mm"/>
+      <subcategory id="11" description="106 mm"/>
+      <subcategory id="12" description="120 mm"/>
+      <subcategory id="13" description="155 mm"/>
+      <subcategory id="14" description="175 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Decoys"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Armat"/>
+      <subcategory id="2" description="AS 37 Martel"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Exocet">
+        <specific id="1" description="MM-38"/>
+        <specific id="2" description="AM-39"/>
+        <specific id="3" description="SM-39 Exocet"/>
+        <specific id="4" description="MM-40"/>
+      </subcategory>
+      <subcategory id="2" description="AS-11"/>
+      <subcategory id="3" description="SS-12M"/>
+      <subcategory id="4" description="AS-15"/>
+      <subcategory id="5" description="AS-30"/>
+      <subcategory id="6" description="AS-37 Martel"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="Otomat">
+        <specific id="1" description="Mk1"/>
+        <specific id="2" description="Mk2"/>
+      </subcategory>
+      <subcategory id="9" description="E-14 torpedo"/>
+      <subcategory id="10" description="E-15 torpedo"/>
+      <subcategory id="11" description="F-17 torpedo">
+        <specific id="1" description="F-17 mod 2"/>
+      </subcategory>
+      <subcategory id="12" description="L-5 torpedo">
+        <specific id="1" description="L-5 mod 3"/>
+        <specific id="2" description="L-5 mod 5"/>
+      </subcategory>
+      <subcategory id="13" description="Z-16 torpedo"/>
+      <subcategory id="14" description="AS-12"/>
+      <subcategory id="15" description="MU-90 Torpedo"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="20 mm"/>
+      <subcategory id="2" description="25 mm"/>
+      <subcategory id="3" description="30 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Malafon"/>
+      <subcategory id="2" description="E-14 torpedo"/>
+      <subcategory id="3" description="E-15 torpedo"/>
+      <subcategory id="4" description="F-17 torpedo"/>
+      <subcategory id="5" description="L3 torpedo"/>
+      <subcategory id="6" description="L4 torpedo"/>
+      <subcategory id="7" description="L5 torpedo"/>
+      <subcategory id="8" description="Murene torpedo"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="71">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description=".22 cal. Long Rifle"/>
+      <subcategory id="2" description=".30-06"/>
+      <subcategory id="3" description=".380 cal."/>
+      <subcategory id="4" description=".38"/>
+      <subcategory id="5" description=".45 cal."/>
+      <subcategory id="6" description=".50 cal."/>
+      <subcategory id="7" description="5.56 mm"/>
+      <subcategory id="8" description="6.35 mm"/>
+      <subcategory id="9" description="7.5 mm"/>
+      <subcategory id="10" description="7.62 mm"/>
+      <subcategory id="11" description="7.65 mm"/>
+      <subcategory id="12" description="8 mm"/>
+      <subcategory id="13" description="9 mm"/>
+      <subcategory id="14" description="20 mm"/>
+      <subcategory id="15" description="25 mm"/>
+      <subcategory id="16" description="30 mm"/>
+      <subcategory id="17" description="60 mm"/>
+      <subcategory id="18" description="68 mm"/>
+      <subcategory id="19" description="81 mm"/>
+      <subcategory id="20" description="90 mm"/>
+      <subcategory id="21" description="120 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Hades missile"/>
+      <subcategory id="2" description="Pluton missile"/>
+      <subcategory id="3" description="AS 30L (laser guided)"/>
+      <subcategory id="4" description="ASMP"/>
+      <subcategory id="5" description="Excalibur MP 22 bomb"/>
+      <subcategory id="6" description="Matra laser-guided bomb (LGB)"/>
+      <subcategory id="7" description="French Apache GLCM"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description=".50 Cal."/>
+      <subcategory id="2" description="20 mm"/>
+      <subcategory id="3" description="25 mm"/>
+      <subcategory id="4" description="30 mm"/>
+      <subcategory id="5" description="58 mm"/>
+      <subcategory id="6" description="74 mm"/>
+      <subcategory id="7" description="90 mm"/>
+      <subcategory id="8" description="105 mm"/>
+      <subcategory id="9" description="106 mm"/>
+      <subcategory id="10" description="155 mm"/>
+      <subcategory id="11" description="175 mm"/>
+      <subcategory id="12" description="8 in."/>
+      <subcategory id="13" description="120mm Mortar Ammunition">
+        <specific id="1" description="120mm FRAG-HE, PR14"/>
+        <specific id="2" description="120mm HE-RA, PRPA"/>
+      </subcategory>
+      <subcategory id="50" description="BAP 100-mm airfield attack bomb"/>
+      <subcategory id="51" description="BLG 66 Belouga bomb"/>
+      <subcategory id="52" description="BM 400 bomb"/>
+      <subcategory id="53" description="CASCAD Mk 1"/>
+      <subcategory id="54" description="CASCAD Mk 2"/>
+      <subcategory id="55" description="CH-TABO Pod"/>
+      <subcategory id="56" description="Durandal penetration bomb"/>
+      <subcategory id="57" description="LU 250 EG-FT bomb"/>
+      <subcategory id="58" description="SAMP BL 61 125-kg fragmentation bomb"/>
+      <subcategory id="59" description="SAMP BL 70 400-kg fragmentation bomb"/>
+      <subcategory id="60" description="SAMP BL 99 450-kg bomb"/>
+      <subcategory id="61" description="SAMP BL EU4 1000-kg bomb"/>
+      <subcategory id="62" description="T 15 SAMP fragmentation bomb"/>
+      <subcategory id="63" description="BL 8 SAMP fragmentation bomb"/>
+      <subcategory id="64" description="BL 9 SAMP fragmentation bomb"/>
+      <subcategory id="65" description="BL 18 SAMP fragmentation bomb"/>
+      <subcategory id="66" description="SAMP GP bomb family"/>
+      <subcategory id="67" description="SAMP 81 AF 125-kg bomb"/>
+      <subcategory id="68" description="TBA retarded 125-kg close-support bomb"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="71">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="SSBS Type S-30D/TN-61"/>
+      <subcategory id="2" description="SSBS Type S-4(SX)"/>
+      <subcategory id="3" description="SLBM M-20"/>
+      <subcategory id="4" description="SLBM M-4"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="78">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Roland">
+        <specific id="1" description="Roland 1"/>
+        <specific id="2" description="Roland 2"/>
+        <specific id="3" description="Roland 3"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="20 mm"/>
+      <subcategory id="2" description="35 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="78">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Milan missile"/>
+      <subcategory id="2" description="HOT missile"/>
+      <subcategory id="3" description="TOW missile"/>
+      <subcategory id="4" description="Pars 3 missile"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="110-mm rocket"/>
+      <subcategory id="2" description="105-mm APDS-T"/>
+      <subcategory id="3" description="105-mm APFSDS-T"/>
+      <subcategory id="4" description="105-mm HEAT-T"/>
+      <subcategory id="5" description="120-mm HEAT-MP-T DM12"/>
+      <subcategory id="6" description="120-mm APFSDS-T DM13"/>
+      <subcategory id="7" description="120-mm APFSDS-T DM23"/>
+      <subcategory id="8" description="120-mm APFSDS-T DM33"/>
+      <subcategory id="9" description="110mm">
+        <specific id="1" description="110mm Tandem HEAT, 3-T for PzFst-3"/>
+        <specific id="2" description="110mm HEAT, PZF-3"/>
+        <specific id="3" description="110mm SAL-H"/>
+      </subcategory>
+      <subcategory id="10" description="Armbrust 67mm HEAT rocket"/>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="Anti-tank mine">
+        <specific id="1" description="MIFF"/>
+        <specific id="2" description="KB44"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="78">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Kormoran"/>
+      <subcategory id="2" description="AEG Seeal 533 mm Torpedo"/>
+      <subcategory id="3" description="SST-3 Torpedo"/>
+      <subcategory id="4" description="SST-4 Torpedo"/>
+      <subcategory id="5" description="DM2A1 Seal Torpedo"/>
+      <subcategory id="6" description="DM2A3 Seehecht Torpedo"/>
+      <subcategory id="7" description="SUT Torpedo"/>
+      <subcategory id="8" description="G7e Torpedo"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="78">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="AEG Seeschlange 533 mm Torpedo"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="78">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="5.56 mm"/>
+      <subcategory id="2" description="7.62 mm"/>
+      <subcategory id="3" description="9 mm"/>
+    </category>
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="Mine"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="78">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Parachute signal rocket, white"/>
+      <subcategory id="2" description="Taurus"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="20 mm"/>
+      <subcategory id="2" description="35 mm"/>
+      <subcategory id="3" description="73 mm"/>
+      <subcategory id="4" description="105 mm"/>
+      <subcategory id="5" description="120 mm">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="APFSDS-P"/>
+        <specific id="3" description="TRCSDS-T"/>
+        <specific id="4" description="SABOT"/>
+        <specific id="5" description="Heat (MZ)"/>
+      </subcategory>
+      <subcategory id="6" description="110 mm">
+        <specific id="1" description="110mm HE-Frag, MZ-110"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="102">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="Al Abbas"/>
+      <subcategory id="2" description="Al Hussein"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="102">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="FAW 70"/>
+      <subcategory id="2" description="FAW 150"/>
+      <subcategory id="3" description="FAW 200"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="105">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Shafrir 2"/>
+      <subcategory id="2" description="Python III"/>
+      <subcategory id="3" description="Python IV"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="105">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="TOW (Ramata) M-113"/>
+      <subcategory id="2" description="Picket 81 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="105">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Surface to Air">
+        <specific id="1" description="Barak"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="105">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Gabriel">
+        <specific id="1" description="Gabriel I"/>
+        <specific id="2" description="Gabriel II"/>
+        <specific id="3" description="Gabriel III (Mod)"/>
+        <specific id="4" description="Gabriel Mk 4 LR"/>
+      </subcategory>
+      <subcategory id="2" description="LUZ"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="105">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="Jericho 2"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="HQ-2 (CSA-1)">
+        <specific id="1" description="HQ-2"/>
+        <specific id="2" description="HQ-2J"/>
+        <specific id="3" description="HQ-2B"/>
+      </subcategory>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="HQ-61 SAM"/>
+      <subcategory id="4" description="HN-5 (SA-7 type)">
+        <specific id="1" description="HN-5"/>
+        <specific id="2" description="HN-5A"/>
+      </subcategory>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="PL-2 ATOLL type">
+        <specific id="1" description="PL-2"/>
+        <specific id="2" description="PL-2A"/>
+      </subcategory>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="PL-5B ATOLL Type"/>
+      <subcategory id="11" description="PL-7"/>
+      <subcategory id="12" description="PL-9"/>
+      <subcategory id="13" description="PL-8 (python-III type)"/>
+      <subcategory id="14" description="PL-4 (Aspide type)"/>
+      <subcategory id="15" description="LY-60">
+        <specific id="1" description="LY-60N"/>
+      </subcategory>
+      <subcategory id="16" description="FM-80 / HQ-7 (Crotale type)"/>
+      <subcategory id="17" description="QW-1 Vanguard"/>
+      <subcategory id="18" description="PL-11"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="12.7 mm Type 54">
+        <specific id="1" description="API"/>
+        <specific id="2" description="API-T"/>
+      </subcategory>
+      <subcategory id="2" description="14.5 mm Type 56">
+        <specific id="1" description="API"/>
+        <specific id="2" description="API-T"/>
+        <specific id="3" description="Incendiary"/>
+      </subcategory>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="57 mm"/>
+      <subcategory id="5" description="85 mm"/>
+      <subcategory id="6" description="100 mm"/>
+      <subcategory id="7" description="37 mm Type 55">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="HE-T"/>
+        <specific id="3" description="APHE"/>
+        <specific id="4" description="AP-T"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="HJ-7S (Sagger type)"/>
+      <subcategory id="2" description="HJ-8 (TOW/Milan type)"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="57 mm type 55"/>
+      <subcategory id="2" description="76 mm type 54"/>
+      <subcategory id="3" description="100 mm">
+        <specific id="1" description="HE Type 73"/>
+        <specific id="2" description="HEAT Type 73"/>
+        <specific id="3" description="APDS Type 73"/>
+        <specific id="4" description="APFSDS Type 73"/>
+        <specific id="5" description="APFSDS Type 86"/>
+        <specific id="6" description="APFSDS-T Type AP100-2"/>
+        <specific id="7" description="APFSDS-T (for Type 59 MBT)"/>
+        <specific id="8" description="HE (for Type 69 MBT)"/>
+        <specific id="9" description="HEAT (for Type 69 MBT)"/>
+        <specific id="10" description="APHE (for Type 69 MBT)"/>
+        <specific id="11" description="APFSDS (for Type 69 MBT)"/>
+        <specific id="12" description="HVAPDS (for Type 69 MBT)"/>
+      </subcategory>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="105 mm">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="HESH"/>
+        <specific id="3" description="HEAT"/>
+        <specific id="4" description="HEAT-T"/>
+        <specific id="5" description="APDS"/>
+        <specific id="6" description="APFSDS"/>
+        <specific id="7" description="APFSDS-T"/>
+        <specific id="8" description="Type 75"/>
+      </subcategory>
+      <subcategory id="6" description="82 mm Type 65 (recoilless rifle)"/>
+      <subcategory id="7" description="85 mm Type 56 ATG">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="HEAT-FS"/>
+        <specific id="3" description="HESH"/>
+      </subcategory>
+      <subcategory id="8" description="90 mm Type 51"/>
+      <subcategory id="9" description="35mm Grenade Launcher Ammunition">
+        <specific id="1" description="Grenade, 35mm, HEAT"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="YJ-1/C-801/CSS-N-4 Sardine (Exocet type)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="CSS-N-2 (HY-2 Styx derivative Silkworm)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="SY-1/FL-1">
+        <specific id="1" description="CSSC-1B mod 1/2 Coastal Defense missile"/>
+        <specific id="2" description="CSS-N-1 Scrubbrush mod 1/2"/>
+      </subcategory>
+      <subcategory id="8" description="HY-1">
+        <specific id="1" description="HY-1/CSSC-2A Silkworm"/>
+        <specific id="2" description="HY-1A/CSSC-2B Silkworm"/>
+        <specific id="3" description="CSS-N-2 Safflower"/>
+      </subcategory>
+      <subcategory id="9" description="HY-2/CSSC-3">
+        <specific id="1" description="HY-2A/CSSC-3A"/>
+        <specific id="2" description="HY-2G/CSSC-3B"/>
+        <specific id="3" description="HY-2B/CSSC-3C"/>
+        <specific id="4" description="C-601/CAS-1 Kraken"/>
+      </subcategory>
+      <subcategory id="10" description="HY-4">
+        <specific id="1" description="HY-4/CSSC-7 Sadsack"/>
+        <specific id="2" description="C-611 (air launched variant)"/>
+      </subcategory>
+      <subcategory id="11" description="YJ-2/C-802/CSS-N-8 Saccade"/>
+      <subcategory id="12" description="CH/SS-N-6/C802(YJ-8A)"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="100 mm Gun"/>
+      <subcategory id="2" description="130 mm Gun"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="CY-1 ASW Msl Torpedo"/>
+      <subcategory id="2" description="Yu-1 Torpedo"/>
+      <subcategory id="3" description="Yu-3 Torpedo"/>
+      <subcategory id="4" description="Yu-4 Torpedo"/>
+      <subcategory id="5" description="Yu-6 Torpedo"/>
+      <subcategory id="6" description="TEST-96 Torpedo"/>
+      <subcategory id="7" description="YU-7 Torpedo"/>
+      <subcategory id="8" description="LE-2 Torpedo"/>
+      <subcategory id="9" description="L-5 Torpedo"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="(deleted)"/>
+      <subcategory id="8" description="(deleted)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="(deleted)"/>
+      <subcategory id="11" description="(deleted)"/>
+      <subcategory id="12" description="(deleted)"/>
+      <subcategory id="13" description="(deleted)"/>
+      <subcategory id="14" description="CSSC-5 (YJ-16/C-101) Saples"/>
+      <subcategory id="15" description="CSSC-6 (HY-3) Sawhorse"/>
+      <subcategory id="16" description="CSSC-7 (HY-4) Sadsack"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="(deleted)"/>
+      <subcategory id="3" description="(deleted)"/>
+      <subcategory id="4" description="(deleted)"/>
+      <subcategory id="5" description="(deleted)"/>
+      <subcategory id="6" description="(deleted)"/>
+      <subcategory id="7" description="7.62 mm"/>
+      <subcategory id="8" description="12.7 mm"/>
+      <subcategory id="9" description="73 mm"/>
+      <subcategory id="10" description="100 mm">
+        <specific id="1" description="Mortar bomb (Type 71)"/>
+      </subcategory>
+      <subcategory id="11" description="107 mm Rocket">
+        <specific id="1" description="HE-Frag"/>
+        <specific id="2" description="Type 63 HEI"/>
+        <specific id="3" description="Type 63-I HEI"/>
+        <specific id="4" description="Type 63-II HE"/>
+        <specific id="5" description="Type 63-III HE"/>
+        <specific id="6" description="Jamming rocket"/>
+      </subcategory>
+      <subcategory id="12" description="120 mm">
+        <specific id="1" description="Mortar bomb (Type 55)"/>
+      </subcategory>
+      <subcategory id="13" description="122 mm">
+        <specific id="1" description="HE Type 54"/>
+        <specific id="2" description="Smoke Type 54"/>
+        <specific id="3" description="Illuminating Type 54"/>
+      </subcategory>
+      <subcategory id="14" description="122 mm Rocket">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="HE-Frag"/>
+        <specific id="3" description="HEI"/>
+        <specific id="4" description="HE Cargo"/>
+        <specific id="5" description="HEI-Frag"/>
+        <specific id="6" description="Minelaying"/>
+        <specific id="7" description="Minelaying Type 84"/>
+      </subcategory>
+      <subcategory id="15" description="130 mm">
+        <specific id="1" description="HE Type 59"/>
+        <specific id="2" description="Illunination Type 59"/>
+        <specific id="3" description="MP-130 RAP"/>
+        <specific id="4" description="ERFB-HE"/>
+      </subcategory>
+      <subcategory id="16" description="130 mm rocket">
+        <specific id="1" description="HE Type 63"/>
+        <specific id="2" description="HE-Frag Type 82"/>
+        <specific id="3" description="HEI Type 82"/>
+        <specific id="4" description="Extended-range HE-Frag"/>
+      </subcategory>
+      <subcategory id="17" description="152 mm">
+        <specific id="1" description="HE Type 66"/>
+        <specific id="2" description="Smoke Type 66"/>
+        <specific id="3" description="Type MP-152 RAP"/>
+        <specific id="4" description="NORINCO Incendiary"/>
+        <specific id="5" description="NORINCO Smoke"/>
+        <specific id="6" description="NORINCO Illuminating"/>
+        <specific id="7" description="HE Type 83"/>
+        <specific id="8" description="NORINCO ERFB-BB"/>
+      </subcategory>
+      <subcategory id="18" description="155 mm">
+        <specific id="1" description="ERFB"/>
+        <specific id="2" description="ERFB-BB"/>
+        <specific id="3" description="ERFB-WP"/>
+        <specific id="4" description="ERFB Illuminating"/>
+      </subcategory>
+      <subcategory id="19" description="160 mm">
+        <specific id="1" description="Mortar bomb type 56"/>
+      </subcategory>
+      <subcategory id="20" description="253 mm">
+        <specific id="1" description="Minesweeping rocket Type 81"/>
+        <specific id="2" description="Minesweeping rocket Type 81-II"/>
+      </subcategory>
+      <subcategory id="21" description="284 mm">
+        <specific id="1" description="Minelaying rocket Type 74"/>
+        <specific id="2" description="Minelaying rocket Type 85"/>
+      </subcategory>
+      <subcategory id="22" description="M-7/CSS-8 (HQ-2 SSM variant)">
+        <specific id="1" description="Booster phase vehicle"/>
+        <specific id="2" description="Jettisoned booster"/>
+        <specific id="3" description="Separated warhead"/>
+      </subcategory>
+      <subcategory id="23" description="35mm Grenade Launcher Ammunition">
+        <specific id="1" description="Grenade, 35mm, HE"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="45">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="CSS-2 (DF-3)"/>
+      <subcategory id="3" description="CSS-3 (DF-4)"/>
+      <subcategory id="4" description="CSS-4 (DF-5)">
+        <specific id="1" description="DF-5"/>
+        <specific id="2" description="DF-5A"/>
+      </subcategory>
+      <subcategory id="5" description="DF-21">
+        <specific id="1" description="Booster phase vehicle"/>
+        <specific id="2" description="(presently not populated)"/>
+        <specific id="3" description="Separated warhead"/>
+        <specific id="4" description="Jettisoned first stage"/>
+        <specific id="5" description="Second stage vehicle"/>
+        <specific id="6" description="Jettisoned second stage"/>
+      </subcategory>
+      <subcategory id="6" description="DF-31"/>
+      <subcategory id="7" description="DF-41"/>
+      <subcategory id="8" description="JL-1 (CSS-N-1)"/>
+      <subcategory id="9" description="(deleted)"/>
+      <subcategory id="10" description="CSS-NX-3"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="45">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="DF-15 (M-9)">
+        <specific id="1" description="Booster phase vehicle"/>
+        <specific id="2" description="(presently not populated)"/>
+        <specific id="3" description="Separated warhead"/>
+        <specific id="4" description="Jettisoned first stage"/>
+        <specific id="5" description="Second stage vehicle"/>
+        <specific id="6" description="Jettisoned second stage"/>
+      </subcategory>
+      <subcategory id="2" description="M-11 / DF-11 / CSS-7">
+        <specific id="1" description="Booster phase vehicle"/>
+        <specific id="2" description="Jettisoned booster"/>
+        <specific id="3" description="Separated warhead"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="119">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="Scud-C (SS-1D)"/>
+      <subcategory id="3" description="(deleted)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="119">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="240 mm rocket"/>
+      <subcategory id="2" description="170mm Koksan round">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="ICM"/>
+        <specific id="3" description="Chem-Bio"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="119">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Taepo Dong I">
+        <specific id="1" description="Booster phase vehicle"/>
+        <specific id="2" description="(presently not populated)"/>
+        <specific id="3" description="Separated warhead"/>
+        <specific id="4" description="Jettisoned first stage"/>
+        <specific id="5" description="Second stage vehicle"/>
+        <specific id="6" description="Jettisoned second stage"/>
+      </subcategory>
+      <subcategory id="2" description="No Dong">
+        <specific id="1" description="Booster phase vehicle"/>
+        <specific id="2" description="Jettisoned booster"/>
+        <specific id="3" description="Separated warhead"/>
+      </subcategory>
+      <subcategory id="3" description="Scud-D">
+        <specific id="1" description="Booster phase vehicle"/>
+        <specific id="2" description="Jettisoned booster"/>
+        <specific id="3" description="Separated warhead"/>
+      </subcategory>
+      <subcategory id="4" description="Taepo Dong II (2-stage version)">
+        <specific id="1" description="Stage 2 and warhead only"/>
+        <specific id="2" description="Separated warhead only"/>
+        <specific id="3" description="Jettisoned booster (first stage)"/>
+        <specific id="4" description="Jettisoned second stage"/>
+      </subcategory>
+      <subcategory id="5" description="Taepo Dong II (3-stage version)">
+        <specific id="1" description="Stage 2, 3 and warhead"/>
+        <specific id="2" description="Stage 3 and warhead"/>
+        <specific id="3" description="Separated warhead"/>
+        <specific id="4" description="Jettisoned booster (first stage)"/>
+        <specific id="5" description="Jettisoned second stage"/>
+        <specific id="6" description="Jettisoned third stage"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="205">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="RBS-70">
+        <specific id="1" description="RBS-70 Mk 1"/>
+        <specific id="2" description="RBS-70 Mk 2"/>
+      </subcategory>
+      <subcategory id="2" description="RBS-15">
+        <specific id="1" description="RBS-15K"/>
+        <specific id="2" description="RBS-15M"/>
+        <specific id="3" description="RBS-15F"/>
+        <specific id="4" description="RBS-15F MK1"/>
+        <specific id="5" description="RBS-15K MK1"/>
+        <specific id="6" description="RBS-15M MK2"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="40 mm">
+        <specific id="1" description="PFHE mk 2"/>
+        <specific id="2" description="3P"/>
+      </subcategory>
+      <subcategory id="2" description="57 mm"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="205">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="40 mm">
+        <specific id="1" description="APFSDS-T"/>
+      </subcategory>
+      <subcategory id="2" description="84mm Carl Gustav rounds">
+        <specific id="1" description="FFV 441B HE"/>
+        <specific id="2" description="FFV 469B Smoke"/>
+        <specific id="3" description="FFV 545 IL"/>
+        <specific id="4" description="FFV 502 HEDP"/>
+        <specific id="5" description="FFV 551 HEAT"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="205">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="40 mm">
+        <specific id="1" description="HE"/>
+        <specific id="2" description="MP-T"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="106">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="(deleted)"/>
+      <subcategory id="2" description="ASPIDE"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="106">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Decoy">
+        <specific id="1" description="BREDA SCLAR 105 mm"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="106">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="OTO Melara Teseo MK 2"/>
+      <subcategory id="2" description="MILAS"/>
+      <subcategory id="3" description="324 mm B-515 Torpedo"/>
+      <subcategory id="4" description="MARTE 2"/>
+      <subcategory id="5" description="Sistel Sea Killer"/>
+    </category>
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="40 mm/70 BREDA"/>
+      <subcategory id="2" description="3 in/62 MMK OTO Melara"/>
+      <subcategory id="3" description="5 in/54 OTO Melara"/>
+      <subcategory id="4" description="25 mm twin"/>
+      <subcategory id="5" description="30 mm twin"/>
+      <subcategory id="6" description="Whitehead K113"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="106">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="324 mm B-515"/>
+      <subcategory id="2" description="Whitehead A290"/>
+      <subcategory id="3" description="Whitehead A184"/>
+      <subcategory id="4" description="Whitehead A-244/s Torpedo"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="110">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Type 89 Torpedo"/>
+      <subcategory id="2" description="SSM-1A/1B (type 88/90)"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="240">
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="TMRP-6 Anti-tank mine"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="0">
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="AN/FO (94% ammonium nitrate, 6% fuel oil)">
+        <specific id="1" description="1 000 lbs. Explosive"/>
+        <specific id="2" description="2 000 lbs. Explosive"/>
+        <specific id="3" description="5 000 lbs. Explosive"/>
+        <specific id="4" description="10 000 lbs. Explosive"/>
+        <specific id="5" description="15 000 lbs. Explosive"/>
+        <specific id="6" description="20 000 lbs. Explosive"/>
+        <specific id="7" description="25 000 lbs. Explosive"/>
+        <specific id="8" description="30 000 lbs. Explosive"/>
+        <specific id="9" description="35 000 lbs. Explosive"/>
+        <specific id="10" description="40 000 lbs. Explosive"/>
+        <specific id="11" description="45 000 lbs. Explosive"/>
+        <specific id="12" description="50 000 lbs. Explosive"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="101">
+    <category id="3" description="Fixed">
+      <subcategory id="1" description="SADAF-02 mine"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="101">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Shahab 4"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="101">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="Shahab 3">
+        <specific id="1" description="Boost phase vehicle"/>
+        <specific id="2" description="Jettisoned booster"/>
+        <specific id="3" description="Separated warhead"/>
+      </subcategory>
+      <subcategory id="2" description="Iran 170"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="206">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="35 mm">
+        <specific id="1" description="HEI-T"/>
+        <specific id="2" description="SAPHEI-T"/>
+        <specific id="3" description="FAPDS"/>
+        <specific id="4" description="AHEAD"/>
+        <specific id="5" description="HEI"/>
+        <specific id="6" description="HEI-BF"/>
+        <specific id="7" description="TP-T"/>
+        <specific id="8" description="APDS-T"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="99">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Agni"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="99">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="Prithvi"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="99">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Trishul"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="165">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="Hatf-1"/>
+      <subcategory id="2" description="Hatf-2"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="165">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="Hatf-3"/>
+      <subcategory id="2" description="Ghauri"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="208">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Sky Bow II / Tien Kung II"/>
+      <subcategory id="2" description="Tien Chien II / Sky Sword II"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="208">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Hsiung-Feng II"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="39">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="70 mm(2.75in)">
+        <specific id="1" description="CRV7 WTU-5001/B: Practice"/>
+        <specific id="2" description="CRV7 WTU-5001 A/B: Hardened Rod Practice"/>
+        <specific id="3" description="CRV7 WAU-5001/B KEP: Kinetic Energy Penetrator"/>
+        <specific id="4" description="CRV7 WDU-500X/B GPF: General Purpose Flechette"/>
+        <specific id="5" description="CRV7 WDU-5002/B FAT: Flechette Anti-Tank"/>
+        <specific id="6" description="CRV7 RA-70 HEISAP: High Explosive Incendiary Semi-Armor Piercing"/>
+        <specific id="7" description="CRV7 WDU-5001/B PHEI: Penetrator High Explosive Incendiary"/>
+        <specific id="8" description="CRV7 M151 HEPD: High/Explosive Point Detonating"/>
+        <specific id="9" description="CRV7 M156: SMOKE (White Phosphorus)"/>
+        <specific id="10" description="CRV7 M257 (M442 Fuze): Illumination"/>
+        <specific id="11" description="CRV7 M261 HE MPSM: High Explosive Multipurpose Submunition"/>
+        <specific id="12" description="CRV7 M267 PRACTICE MPSM: Practice Multipurpose Submunition"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="163">
+    <category id="1" description="Guided">
+      <subcategory id="1" description="Penguin MK 2"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="29">
+    <category id="2" description="Ballistic">
+      <subcategory id="1" description="Rocket ASTROS">
+        <specific id="1" description="127 mm SS-30">
+          <extra id="1" description="HE Frag"/>
+        </specific>
+        <specific id="2" description="180 mm SS-40">
+          <extra id="1" description="HE Frag"/>
+          <extra id="2" description="HE Incendiary"/>
+          <extra id="3" description="DPICM"/>
+          <extra id="4" description="Mine Anti-tank"/>
+          <extra id="5" description="Mine Anti-personnel"/>
+          <extra id="6" description="Runway Denial"/>
+        </specific>
+        <specific id="3" description="3 mm SS-60">
+          <extra id="1" description="HE Frag"/>
+          <extra id="2" description="HE Incendiary"/>
+          <extra id="3" description="DPICM"/>
+          <extra id="4" description="Mine Anti-tank"/>
+          <extra id="5" description="Mine Anti-personnel"/>
+          <extra id="6" description="Runway Denial"/>
+        </specific>
+        <specific id="4" description="3 mm SS-80">
+          <extra id="1" description="HE Frag"/>
+          <extra id="2" description="HE Incendiary"/>
+          <extra id="3" description="DPICM"/>
+          <extra id="4" description="Mine Anti-tank"/>
+          <extra id="5" description="Mine Anti-personnel"/>
+          <extra id="6" description="Runway Denial"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="0" country="0">
+    <category id="0" description="Other"/>
+  </entity>
+  <entity kind="3" domain="1" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Dismounted Infantry (with)">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
+        <specific id="1" id2="100" description="Number of individuals"/>
+        <specific id="101" description="Fire Team"/>
+        <specific id="102" description="Squad"/>
+        <specific id="103" description="Platoon"/>
+        <specific id="104" description="Company"/>
+        <specific id="105" description="Battalion"/>
+        <specific id="106" description="Regiment"/>
+        <specific id="107" description="Division"/>
+        <specific id="108" description="Corps"/>
+        <specific id="109" description="Army"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Dismounted Infantry (non-visible)">
+      <subcategory id="0" description="Other-Observation Post"/>
+    </category>
+    <category id="3" description="Civilian, unarmed">
+      <subcategory id="1" description="Civilian, non government">
+        <specific id="1" description="Contractor"/>
+        <specific id="2" description="Media"/>
+      </subcategory>
+      <subcategory id="2" description="Local Officials">
+        <specific id="1" description="Mayor"/>
+        <specific id="2" description="Policeman."/>
+        <specific id="3" description="Police Chief"/>
+        <specific id="4" description="VIP"/>
+        <specific id="5" description="Religious Leader."/>
+      </subcategory>
+    </category>
+    <category id="4" description="Civilian, w/weapons">
+      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat"/>
+    </category>
+    <category id="5" description="Animal">
+      <subcategory id="1" description="Domesticated Animal">
+        <specific id="1" description="Dog"/>
+        <specific id="2" description="Cat"/>
+        <specific id="3" description="Cow"/>
+        <specific id="4" description="Horse"/>
+        <specific id="5" description="Camel"/>
+      </subcategory>
+      <subcategory id="2" description="Wild Animal">
+        <specific id="1" description="Canine"/>
+        <specific id="2" description="Feline"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="2" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Parachutist (with)">
+      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
+        <specific id="1" id2="100" description="Number of individuals"/>
+        <specific id="101" description="Fire Team"/>
+        <specific id="102" description="Squad"/>
+        <specific id="103" description="Platoon"/>
+        <specific id="104" description="Company"/>
+        <specific id="105" description="Battalion"/>
+        <specific id="106" description="Regiment"/>
+        <specific id="107" description="Division"/>
+        <specific id="108" description="Corps"/>
+        <specific id="109" description="Army"/>
+      </subcategory>
+    </category>
+    <category id="2" description="A bird"/>
+    <category id="3" description="Flock of birds">
+      <subcategory id="0" description="Unspecified size">
+        <specific id="1" description="Number of individuals"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="3" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Swimmer (with)">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
+        <specific id="1" id2="100" description="Number of individuals"/>
+        <specific id="101" description="Fire Team"/>
+        <specific id="102" description="Squad"/>
+        <specific id="103" description="Platoon"/>
+        <specific id="104" description="Company"/>
+        <specific id="105" description="Battalion"/>
+        <specific id="106" description="Regiment"/>
+        <specific id="107" description="Division"/>
+        <specific id="108" description="Corps"/>
+        <specific id="109" description="Army"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Occupied life raft">
+      <subcategory id="0" description="Unused">
+        <specific id="1" id2="100" description="Number of individuals"/>
+        <specific id="101" description="Fire Team"/>
+        <specific id="102" description="Squad"/>
+        <specific id="103" description="Platoon"/>
+        <specific id="104" description="Company"/>
+        <specific id="105" description="Battalion"/>
+        <specific id="106" description="Regiment"/>
+        <specific id="107" description="Division"/>
+        <specific id="108" description="Corps"/>
+        <specific id="109" description="Army"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="4" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Diver (with)">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
+        <specific id="1" id2="100" description="Number of individuals"/>
+      </subcategory>
+    </category>
+    <category id="2" description="School of Fish">
+      <subcategory id="0" description="Unspecified size">
+        <specific id="1" id2="100" description="Number of individuals"/>
+      </subcategory>
+    </category>
+    <category id="3" description="School of Shrimp">
+      <subcategory id="0" description="Unspecified size">
+        <specific id="1" id2="100" description="Number of individuals"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Whale"/>
+  </entity>
+  <entity kind="3" domain="5" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Astronaut (with)">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" id2="255" description="Weapon" xref="es.type.kind.3.subcat">
+        <specific id="1" description="Number of individuals"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="4" domain="1" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Radar collected noise"/>
+  </entity>
+  <entity kind="4" domain="2" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Smoke"/>
+    <category id="2" description="Fog"/>
+    <category id="3" description="Cloud"/>
+    <category id="4" description="Cloud With Rain Falling"/>
+    <category id="5" description="Cloud With Snow Falling"/>
+    <category id="6" description="Haze"/>
+    <category id="7" description="Dust/Sandstorm"/>
+    <category id="8" description="Cloud with sleet falling"/>
+  </entity>
+  <entity kind="4" domain="3" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Sea State"/>
+    <category id="2" description="Oil Slick"/>
+    <category id="3" description="Ice"/>
+    <category id="4" description="Debris"/>
+    <category id="5" description="Surf Noise"/>
+    <category id="6" description="Island"/>
+  </entity>
+  <entity kind="4" domain="4" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Sound Velocity Profile"/>
+    <category id="2" description="Ice Berg"/>
+    <category id="3" description="Current Profile"/>
+    <category id="4" description="Biologics">
+      <subcategory id="0" description="Bioluminescence"/>
+    </category>
+    <category id="5" description="Transmissivity profile"/>
+    <category id="6" description="Ice Merchant"/>
+    <category id="7" description="Kelp Bed"/>
+    <category id="8" description="Knuckle"/>
+    <category id="9" description="Debris/Clutter"/>
+  </entity>
+  <entity kind="4" domain="5" country="0">
+    <category id="0" description="Unused"/>
+  </entity>
+  <entity kind="5" domain="1" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Bridge">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Concrete, two-lane"/>
+      <subcategory id="2" description="Concrete, four-lane"/>
+      <subcategory id="3" description="Truss, two-lane"/>
+      <subcategory id="4" description="Truss, four-lane"/>
+      <subcategory id="5" description="Suspension, two-lane"/>
+      <subcategory id="6" description="Suspension, four-lane"/>
+    </category>
+    <category id="2" description="Building">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="One-story">
+        <specific id="1" description="Trapezoidal Aircraft Shelter (Trihangar)"/>
+        <specific id="2" description="Curvilinear Aircraft Shelter"/>
+        <specific id="3" description="Bermed Storage Bunker"/>
+        <specific id="4" description="Hardened Curvilinear Munitions Bunker"/>
+      </subcategory>
+      <subcategory id="2" description="Two-story"/>
+      <subcategory id="3" description="Three-story"/>
+      <subcategory id="4" description="Four-story"/>
+      <subcategory id="5" description="Five story"/>
+      <subcategory id="6" description="Six story"/>
+      <subcategory id="7" description="Seven story"/>
+      <subcategory id="8" description="Eight story"/>
+      <subcategory id="9" description="Nine story"/>
+      <subcategory id="10" description="Ten story"/>
+    </category>
+    <category id="3" description="Tracks">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Tank"/>
+    </category>
+    <category id="4" description="Crater"/>
+    <category id="5" description="Obstacle">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Ditch"/>
+      <subcategory id="2" description="Tank ditch, 100x4 M"/>
+      <subcategory id="3" description="Tank ditch, 200x4 M"/>
+      <subcategory id="4" description="Tank ditch, 300x4 M"/>
+      <subcategory id="5" description="Abatis, 8-tree"/>
+      <subcategory id="6" description="Concertina fence, 3-roll"/>
+      <subcategory id="7" description="Log crib, rectangular"/>
+      <subcategory id="8" description="Ammo prestock"/>
+      <subcategory id="9" description="Fuel prestock"/>
+      <subcategory id="10" description="Minefield, hasty, 0-300 M"/>
+      <subcategory id="11" description="Minefield, prepared, 0-500 M"/>
+      <subcategory id="12" description="Minefield, scatterable oval"/>
+      <subcategory id="13" description="Barbed wire"/>
+      <subcategory id="14" description="Dragon's teeth"/>
+      <subcategory id="15" description="Jersey Barrier"/>
+    </category>
+    <category id="6" description="Flags/markers">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Breached lane"/>
+      <subcategory id="2" description="Minefield"/>
+    </category>
+    <category id="7" description="Prepared positions">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Armored, hull defilade"/>
+      <subcategory id="2" description="Fighting, hull defilade"/>
+      <subcategory id="3" description="Mortar carrier, hull defilade"/>
+      <subcategory id="4" description="Tank, hull defilade"/>
+      <subcategory id="5" description="Infantry fighting"/>
+      <subcategory id="6" description="Machine gun"/>
+      <subcategory id="7" description="Covered machine gun bunker"/>
+      <subcategory id="8" description="Overhead covered infantry"/>
+      <subcategory id="9" description="Forward Area Re-arming Point (FARD)"/>
+    </category>
+    <category id="8" description="Underground facility">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Single level"/>
+      <subcategory id="2" description="Two levels"/>
+      <subcategory id="3" description="Three levels"/>
+    </category>
+    <category id="9" description="SSM Site">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Fixed"/>
+      <subcategory id="2" description="Towed"/>
+      <subcategory id="3" description="Self-propelled"/>
+    </category>
+    <category id="10" description="Runway">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="5m x 150m"/>
+    </category>
+    <category id="11" description="SAM Site">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Fixed"/>
+      <subcategory id="2" description="Towed"/>
+      <subcategory id="3" description="Self-propelled"/>
+    </category>
+    <category id="12" description="Nuclear Power Plant">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Pressurized Water Reactor">
+        <specific id="1" description="One Reactor Unit"/>
+        <specific id="2" description="Two Reactor Units"/>
+      </subcategory>
+      <subcategory id="2" description="Gas-Cooled Graphite Reactor">
+        <specific id="1" description="One Reactor Unit"/>
+        <specific id="2" description="Two Reactor Units"/>
+      </subcategory>
+      <subcategory id="3" description="High Temperature Gas-cooled Reactor (HTGR)">
+        <specific id="0" description="Other"/>
+        <specific id="1" description="One Reactor Unit"/>
+        <specific id="2" description="Two Reactor Units"/>
+      </subcategory>
+      <subcategory id="4" description="Boiling Water Reactor">
+        <specific id="0" description="Other"/>
+        <specific id="1" description="One Reactor Unit"/>
+        <specific id="2" description="Two Reactor Units"/>
+      </subcategory>
+    </category>
+    <category id="13" description="Railyard"/>
+    <category id="14" description="Camp Lejeune MOUT Collective Training Facility (CTF)">
+      <subcategory id="1" description="Public Building">
+        <specific id="1" description="City Hall"/>
+        <specific id="2" description="Church"/>
+        <specific id="3" description="School"/>
+        <specific id="4" description="School Gymnasium"/>
+      </subcategory>
+      <subcategory id="2" description="Commercial Building">
+        <specific id="1" description="Bank"/>
+        <specific id="2" description="Hotel"/>
+        <specific id="3" description="Strip Mall"/>
+        <specific id="4" description="Service Station"/>
+        <specific id="5" description="Warehouse"/>
+        <specific id="6" description="2-story Office Building"/>
+        <specific id="7" description="3-story Office Building"/>
+      </subcategory>
+      <subcategory id="3" description="Residential Building">
+        <specific id="1" description="1-story House"/>
+        <specific id="2" description="1-story House with Fireplace"/>
+        <specific id="3" description="2-story House"/>
+        <specific id="4" description="Town House"/>
+        <specific id="5" description="2-story Apartment Building"/>
+        <specific id="6" description="3-story Apartment Building"/>
+      </subcategory>
+    </category>
+    <category id="15" description="POL Storage Tank"/>
+    <category id="16" description="Cargo Container"/>
+    <category id="17" description="Tower">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Antenna"/>
+      <subcategory id="2" description="Water"/>
+      <subcategory id="3" description="Observation"/>
+    </category>
+    <category id="18" description="AAA site">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Fixed"/>
+      <subcategory id="2" description="Towed"/>
+      <subcategory id="3" description="Self-propelled"/>
+    </category>
+    <category id="19" description="Bridge Span">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Single Lane Each Way">
+        <specific id="1" description="Single Lane Concrete Girder Bridge Span"/>
+        <specific id="2" description="Single Lane Concrete Pier Bridge Span"/>
+        <specific id="3" description="Single Lane Masonary Arch Bridge Span"/>
+        <specific id="4" description="Single Lane Steel Floating Bridge Span"/>
+        <specific id="5" description="Single Lane Steel Girder Bridge Span"/>
+        <specific id="6" description="Single Lane Steel Pier Bridge Span"/>
+        <specific id="7" description="Single Lane Steel Suspension Bridge Span"/>
+        <specific id="8" description="Single Lane Steel Trestle Bridge Span"/>
+        <specific id="9" description="Rope Suspension Bridge Span"/>
+        <specific id="10" description="Single Lane Wood Girder Bridge Span"/>
+        <specific id="11" description="Single Lane Wood Pier Bridge Span"/>
+        <specific id="12" description="Single Lane Wood Trestle Bridge Span"/>
+      </subcategory>
+      <subcategory id="2" description="Double Lane Each Way">
+        <specific id="1" description="Double Lane Concrete Girder Bridge Span"/>
+        <specific id="2" description="Double Lane Concrete Pier Bridge Span"/>
+        <specific id="3" description="Double Lane Masonary Arch Bridge Span"/>
+        <specific id="4" description="Double Lane Steel Floating Bridge Span"/>
+        <specific id="5" description="Double Lane Steel Girder Bridge Span"/>
+        <specific id="6" description="Double Lane Steel Pier Bridge Span"/>
+        <specific id="7" description="Double Lane Steel Suspension Bridge Span"/>
+        <specific id="8" description="Double Lane Steel Trestle Bridge Span"/>
+        <specific id="9" description="Double Lane Wood Girder Bridge Span"/>
+        <specific id="10" description="Double Lane Wood Pier Bridge Span"/>
+        <specific id="11" description="Double Lane Wood Pier Trestle Span"/>
+      </subcategory>
+    </category>
+    <category id="20" description="Road element">
+      <subcategory id="1" description="Road Section Straight">
+        <specific id="1" description="One Lane"/>
+        <specific id="2" description="Two Lane"/>
+        <specific id="3" description="Three Lane"/>
+        <specific id="4" description="Four Lane"/>
+      </subcategory>
+      <subcategory id="2" description="Road Section Curved">
+        <specific id="1" description="Road Section Curved, One Lane"/>
+        <specific id="2" description="Road Section Curved, Two Lane"/>
+        <specific id="3" description="Road Section Curved, Three Lane"/>
+        <specific id="4" description="Road Section Curved, Four Lane"/>
+      </subcategory>
+      <subcategory id="3" description="Intersection">
+        <specific id="11" description="Intersection, One Lane to One Lane"/>
+        <specific id="12" description="Intersection, One Lane to Two Lane"/>
+        <specific id="13" description="Intersection, One Lane to Three Lane"/>
+        <specific id="14" description="Intersection, One Lane to Four Lane"/>
+        <specific id="22" description="Intersection, Two Lane to Two Lane"/>
+        <specific id="23" description="Intersection, Two Lane to Three Lane"/>
+        <specific id="24" description="Intersection, Two Lane to Four Lane"/>
+        <specific id="33" description="Intersection, Three Lane to Three Lane"/>
+        <specific id="34" description="Intersection, Three Lane to Four Lane"/>
+        <specific id="44" description="Intersection, Four Lane to Four Lane"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="5" domain="3" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Oil derrick"/>
+    <category id="2" description="Buoy">
+      <subcategory id="1" description="Lighted buoy">
+        <specific id="1" description="Fixed Light"/>
+        <specific id="2" description="Flashing Light"/>
+        <specific id="3" description="Red lighted (flashing)"/>
+        <specific id="4" description="Green lighted (flashing)"/>
+        <specific id="5" description="Yellow lighted (flashing)"/>
+      </subcategory>
+      <subcategory id="2" description="Can">
+        <specific id="1" description="Black buoy"/>
+        <specific id="2" description="Green buoy"/>
+      </subcategory>
+      <subcategory id="3" description="Sound buoy"/>
+      <subcategory id="4" description="Nun"/>
+      <subcategory id="5" description="Spherical"/>
+    </category>
+    <category id="3" description="Pier"/>
+    <category id="4" description="Marker">
+      <subcategory id="1" description="Center channel marker"/>
+      <subcategory id="2" description="Range marker"/>
+      <subcategory id="3" description="Day marker"/>
+    </category>
+    <category id="5" description="Datum" footnote="Datum is a term which refers to the last known position in time and space of an entity."/>
+    <category id="6" description="Special Point">
+      <subcategory id="1" description="Mine"/>
+      <subcategory id="2" description="DLRP"/>
+      <subcategory id="3" description="Navigation Hazard"/>
+      <subcategory id="4" description="Downed A/C"/>
+      <subcategory id="5" description="Man in Water"/>
+      <subcategory id="6" description="Distressed Vessel"/>
+      <subcategory id="7" description="Reference Point"/>
+      <subcategory id="8" description="Waypoint"/>
+      <subcategory id="9" description="Position of Intended Movement (PIM)"/>
+      <subcategory id="10" description="Combat Air Patrol (CAP)"/>
+      <subcategory id="11" description="Strike Initial Point (SIP)"/>
+      <subcategory id="12" description="Flight Rendezvous Point"/>
+      <subcategory id="13" description="Orbit Point"/>
+      <subcategory id="14" description="Radar Site"/>
+    </category>
+  </entity>
+  <entity kind="5" domain="4" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Oil derrick"/>
+    <category id="2" description="Buoy"/>
+    <category id="3" description="Sunken ship"/>
+  </entity>
+  <entity kind="6" domain="0" country="0">
+    <category id="0" description="Other"/>
+    <category id="1" description="Fuels">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Gasoline"/>
+      <subcategory id="2" description="Diesel Fuel"/>
+      <subcategory id="3" description="JP4"/>
+      <subcategory id="4" description="Fuel Oil"/>
+      <subcategory id="5" description="JP-8 Fuel"/>
+      <subcategory id="6" description="Fog oil"/>
+      <subcategory id="7" description="Multi-Spectral Fog Oil"/>
+    </category>
+    <category id="2" description="Oils"/>
+    <category id="3" description="Lubricants"/>
+    <category id="4" description="Food">
+      <subcategory id="1" description="Water, Drinking, Sterile, Clear Colorless (bulk)"/>
+      <subcategory id="2" description="Water, Drinking, Distilled or Sparkling"/>
+      <subcategory id="3" description="Meal Ready To Eat Individuals Menus NO.1"/>
+      <subcategory id="4" description="Humanitarian Daily Ration"/>
+      <subcategory id="5" description="Vegetarian MRE"/>
+      <subcategory id="6" description="Bread, Shelf-Stable White"/>
+      <subcategory id="7" description="Meal, Cold Weather"/>
+      <subcategory id="8" description="Long Range Patrol Ration"/>
+    </category>
+    <category id="5" description="Spare Parts"/>
+    <category id="6" description="Personnel">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Dismounted Infantry"/>
+    </category>
+    <category id="7" description="Equipment">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Mine Plow"/>
+      <subcategory id="2" description="Mine Rollers"/>
+    </category>
+    <category id="8" description="Pallets with ammunition"/>
+    <category id="9" description="Pallets with water"/>
+    <category id="10" description="Pallets of fuel (JP8)"/>
+    <category id="11" description="Decontamination supplies">
+      <subcategory id="1" description="Decon Agent STB"/>
+      <subcategory id="2" description="Ferric Chloride AN 100 1 LB"/>
+    </category>
+  </entity>
+  <entity kind="7" domain="1" country="225">
+    <category id="1" description="Voice Transmission/Reception">
+      <subcategory id="0" description="Other">
+        <specific id="3" description="Typical DAFIF Derived Traffic Control Voice Radio"/>
+      </subcategory>
+    </category>
+    <category id="4" description="Instrumented Landing System (ILS) Glideslope">
+      <subcategory id="0" description="Other">
+        <specific id="3" description="Typical DAFIF Derived ILS Glideslope Transmitter"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Instrumented Landing System (ILS) Localizer Transmitter">
+      <subcategory id="0" description="Other">
+        <specific id="3" description="Typical DAFIF Derived ILS Localizer Transmitter"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment)">
+      <subcategory id="0" description="Other">
+        <specific id="3" description="Typical DAFIF Derived TACAN"/>
+      </subcategory>
+    </category>
+    <category id="12" description="Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment)">
+      <subcategory id="0" description="Other"/>
+      <subcategory id="1" description="Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196)">
+        <specific id="1" description="AN/ARN-118"/>
+        <specific id="2" description="AN/ARN-139"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="8" domain="2" country="225">
+    <category id="0" description="Other"/>
+    <category id="1" description="Chaff">
+      <subcategory id="1" description="Bundle">
+        <specific id="0" description="Other">
+          <extra id="1" description="TACCSF notional friendly chaff"/>
+        </specific>
+        <specific id="1" description="Very small"/>
+        <specific id="2" description="Small"/>
+        <specific id="3" description="Medium"/>
+        <specific id="4" description="Large"/>
+        <specific id="5" description="Very Large"/>
+        <specific id="6" description="RR-170 Chaff"/>
+        <specific id="7" description="RR-180 Chaff"/>
+        <specific id="8" description="RR-188 Chaff"/>
+        <specific id="9" description="RR-129 Chaff"/>
+        <specific id="10" description="RR-144 Chaff"/>
+        <specific id="11" description="M-1 Chaff"/>
+      </subcategory>
+      <subcategory id="2" description="Corridor">
+        <specific id="0" description="Other"/>
+        <specific id="1" description="Very small"/>
+        <specific id="2" description="Small"/>
+        <specific id="3" description="Medium"/>
+        <specific id="4" description="Large"/>
+        <specific id="5" description="Very Large"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Flare">
+      <subcategory id="0" description="Other">
+        <specific id="1" description="TACCSF notional friendly flare"/>
+      </subcategory>
+      <subcategory id="1" description="M-206 Flare"/>
+      <subcategory id="2" description="MJU-7 Flare"/>
+      <subcategory id="3" description="MJU-10 Flare"/>
+      <subcategory id="4" description="MJU-8 / Mk46 Flare"/>
+      <subcategory id="5" description="Mk47 Flare"/>
+    </category>
+    <category id="3" description="Combined chaff/flare"/>
+    <category id="4" description="Active emitter">
+      <subcategory id="1" description="Towed Decoy">
+        <specific id="1" description="AN/ALE-50 Advanced Airborne Expendable Decoy (AAED)"/>
+        <specific id="2" description="AN/ALE-55 Fiber Optic Towed Decoy (FOTD)"/>
+        <specific id="3" description="High Power Fiber Optic Towed Decoy (HPFOTD)"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Passive decoy"/>
+    <category id="6" description="Winged Decoy">
+      <subcategory id="1" description="Tactical Air-Launched Decoy">
+        <specific id="1" description="A/B37U-1(V)1 chaff-dispensing"/>
+        <specific id="2" description="A/B37U-1(V)2 passive RF augmentation"/>
+        <specific id="3" description="ADM-141A passive and active RF augmentation"/>
+        <specific id="4" description="ADM-141B chaff-dispensing"/>
+        <specific id="5" description="ADM-141C Improved TALD"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="8" domain="3" country="225">
+    <category id="0" description="Other"/>
+    <category id="2" description="Flare"/>
+    <category id="4" description="Active emitter">
+      <subcategory id="0" description="Other">
+        <specific id="1" description="Nixie SLQ 25"/>
+      </subcategory>
+    </category>
+    <category id="5" description="Passive decoy"/>
+  </entity>
+  <entity kind="8" domain="4" country="225">
+    <category id="4" description="Active Emitter">
+      <subcategory id="1" description="CM NAE"/>
+      <subcategory id="2" description="CM ADC Mk 3 T"/>
+      <subcategory id="3" description="CM ADC Mk 3 S"/>
+      <subcategory id="4" description="CM ADC Mk 3 N"/>
+      <subcategory id="5" description="CM ADC Mk 4">
+        <specific id="1" description="CM ADC MK-4 BBNR"/>
+        <specific id="2" description="CM ADC MK-4 BBN"/>
+        <specific id="3" description="CM ADC MK-4 SFJR"/>
+        <specific id="4" description="CM ADC MK-4 SFJ"/>
+      </subcategory>
+      <subcategory id="6" description="CM ADC MK-3">
+        <specific id="1" description="CM ADC MK-3 R3"/>
+        <specific id="2" description="CM ADC MK-3 BN"/>
+        <specific id="3" description="CM ADC MK-3 NPN"/>
+        <specific id="4" description="CM ADC MK-3 IR 3"/>
+      </subcategory>
+      <subcategory id="7" description="CM ADC MK-1"/>
+    </category>
+  </entity>
+  <entity kind="8" domain="2" country="222">
+    <category id="0" description="Other"/>
+    <category id="1" description="Chaff">
+      <subcategory id="1" description="Bundle">
+        <specific id="0" description="Other">
+          <extra id="1" description="TACCSF notional hostile chaff"/>
+        </specific>
+        <specific id="1" description="Very small"/>
+        <specific id="2" description="Small"/>
+        <specific id="3" description="Medium"/>
+        <specific id="4" description="Large"/>
+        <specific id="5" description="Very Large"/>
+        <specific id="6" description="26mm chaff cartridge"/>
+        <specific id="7" description="50mm chaff cartridge"/>
+      </subcategory>
+    </category>
+    <category id="2" description="Flare">
+      <subcategory id="0" description="Other">
+        <specific id="1" description="TACCSF notional hostile flare"/>
+      </subcategory>
+      <subcategory id="1" description="26mm Flare"/>
+      <subcategory id="2" description="50mm Flare"/>
+    </category>
+  </entity>
+  <entity kind="8" domain="4" country="222">
+    <category id="4" description="Active Emitter">
+      <subcategory id="1" description="UC-2S"/>
+      <subcategory id="2" description="UC-5M"/>
+      <subcategory id="3" description="UC-2 Countermeasure"/>
+    </category>
+  </entity>
+  <entity kind="8" domain="3" country="13">
+    <category id="0" description="Other">
+      <subcategory id="0" description="Other">
+        <specific id="1" description="Nulka"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="225">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+      <subcategory id="2" description="Early Warning / Surveillance Radar">
+        <specific id="1" description="AN/TPS-43"/>
+        <specific id="2" description="AN/TPS-59"/>
+        <specific id="3" description="AN/TPS-63"/>
+        <specific id="4" description="AN/TPS-75"/>
+        <specific id="5" description="AN/FPS-117"/>
+        <specific id="6" description="AN/FPS-89"/>
+        <specific id="7" description="AN/TPS-70"/>
+        <specific id="8" description="AN/TPS-24"/>
+        <specific id="9" description="AN/TPS-65"/>
+        <specific id="10" description="ASR-4">
+          <extra id="1" description="ASR-4D"/>
+          <extra id="2" description="ASR-4 LRSR"/>
+        </specific>
+        <specific id="11" description="ASR-5"/>
+        <specific id="12" description="ASR-7"/>
+        <specific id="13" description="ASR-8"/>
+        <specific id="14" description="ASR-9"/>
+        <specific id="15" description="ASR-10">
+          <extra id="1" description="ASR-10 SS"/>
+        </specific>
+        <specific id="16" description="ASR-11">
+          <extra id="1" description="ASR-11/DASR"/>
+        </specific>
+        <specific id="17" description="ASR-12"/>
+        <specific id="18" description="ASR-23">
+          <extra id="1" description="ASR-23 SS"/>
+        </specific>
+      </subcategory>
+      <subcategory id="5" description="Target Acquisition Radar">
+        <specific id="1" description="AN/MPQ-64 FAAD GBS"/>
+      </subcategory>
+      <subcategory id="8" description="Firing Point/Launch Point Determination Sensor">
+        <specific id="1" description="AN/TPQ-36"/>
+        <specific id="2" description="AN/TPQ-37 Firefinder"/>
+        <specific id="3" description="Trailer mounted AN/TPQ-38 (V8)"/>
+        <specific id="4" description="Trailer mounted AN/TPQ-47"/>
+        <specific id="5" description="AN/TPQ-47"/>
+      </subcategory>
+      <subcategory id="24" description="Battlefield Surveillance">
+        <specific id="1" description="AN/PPS-5"/>
+        <specific id="2" description="AN/PPS-15A (V1)"/>
+      </subcategory>
+    </category>
+    <category id="3" description="RF Passive">
+      <subcategory id="8" description="Firing Point/Launch Point Determination Sensor">
+        <specific id="1" description="Expert Missile Tracker (adjunct to AN/TPS-75)"/>
+      </subcategory>
+    </category>
+    <category id="7" description="Chemical, point detector">
+      <subcategory id="1" description="ACADA">
+        <specific id="1" description="w/Telemetry Link"/>
+      </subcategory>
+      <subcategory id="2" description="M44A1">
+        <specific id="1" description="w/Telemetry Link"/>
+      </subcategory>
+    </category>
+    <category id="8" description="Chemical, standoff">
+      <subcategory id="1" description="M21"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="2" country="225">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF active">
+      <subcategory id="2" description="Early Warning/Surveillance">
+        <specific id="1" description="JLENS PTIR Sensor"/>
+        <specific id="2" description="JLENS SuR Sensor"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="3" country="225">
+    <category id="0" description="Other"/>
+    <category id="10" description="Acoustic, active">
+      <subcategory id="77" description="Sonobuoy">
+        <specific id="1" description="ICEPICK (GEOBUOY)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="225">
+    <category id="0" description="Other"/>
+    <category id="9" description="Thermal (temperature sensing)">
+      <subcategory id="78" description="Bathythermal Sensor">
+        <specific id="1" description="AN/SSQ-36B BTS (Bathythermograph Transmitting Set)"/>
+      </subcategory>
+    </category>
+    <category id="10" description="Acoustic, active">
+      <subcategory id="5" description="Acquisition / detection"/>
+      <subcategory id="77" description="Sonobuoy">
+        <specific id="1" description="AN/SSQ-62 DICASS (Directional Command Active Sonobuoy System)">
+          <extra id="1" description="AN/SSQ-62D DICASS"/>
+          <extra id="2" description="AN/SSQ-62D1 DICASS"/>
+          <extra id="3" description="AN/SSQ-62D2 DICASS"/>
+          <extra id="4" description="AN/SSQ-62E DICASS"/>
+          <extra id="5" description="AN/SSQ-62E1 DICASS"/>
+          <extra id="6" description="AN/SSQ-62E2 DICASS"/>
+        </specific>
+        <specific id="2" description="AN/SSQ-110 EER (Extended Echo Ranging), a.k.a. SUS (Signal, Underwater Sound)">
+          <extra id="1" description="AN/SSQ-110A EER"/>
+          <extra id="2" description="AN/SSQ-110B EER"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category id="11" description="Acoustic, Passive">
+      <subcategory id="77" description="Sonobuoy">
+        <specific id="1" description="AN/SSQ-53 DIFAR (Directional Frequency Analysis Recording)">
+          <extra id="1" description="AN/SSQ-53D DIFAR"/>
+          <extra id="2" description="AN/SSQ-53E DIFAR"/>
+          <extra id="3" description="AN/SSQ-53F DIFAR"/>
+        </specific>
+        <specific id="2" description="AN/SSQ-57 ANM (Ambient Noise Measurement)">
+          <extra id="1" description="AN/SSQ-57C1 ANM"/>
+        </specific>
+        <specific id="3" description="AN/SSQ-77 VLAD (Vertical Line Array DIFAR)">
+          <extra id="1" description="AN/SSQ-77B VLAD"/>
+          <extra id="2" description="AN/SSQ-77C VLAD"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="222">
+    <category id="0" description="Other"/>
+    <category id="1" description="Multi-spectral">
+      <subcategory id="1" description="Land Radar Hostile Fixed"/>
+      <subcategory id="2" description="Land Radar Hostile Dynamic"/>
+    </category>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+      <subcategory id="2" description="Early Warning/Surveillance Radar">
+        <specific id="1" description="Back Trap"/>
+        <specific id="2" description="Bar Lock (P-35/P-37/P-50)"/>
+        <specific id="3" description="Flat Face (P-15, CASTA-2E1)"/>
+        <specific id="4" description="Long Track"/>
+        <specific id="5" description="Spoon Rest (P-12)"/>
+        <specific id="6" description="Squat Eye (P-15M)"/>
+        <specific id="7" description="Tall King (P-14)"/>
+        <specific id="8" description="Tin Shield"/>
+        <specific id="9" description="Knife Rest (P-10)"/>
+        <specific id="10" description="Tin Trap"/>
+        <specific id="11" description="Box Spring"/>
+      </subcategory>
+      <subcategory id="3" description="Height Finding Radar">
+        <specific id="1" description="Odd Group"/>
+        <specific id="2" description="Odd Pair"/>
+        <specific id="3" description="Side Net (PRV-11)"/>
+        <specific id="4" description="Thin Skin"/>
+      </subcategory>
+      <subcategory id="4" description="Fire Control Radar">
+        <specific id="1" description="Fire Can"/>
+        <specific id="2" description="Flap Wheel"/>
+        <specific id="3" description="Whiff"/>
+        <specific id="4" description="(deleted)"/>
+      </subcategory>
+      <subcategory id="5" description="Target Acquisition Radar">
+        <specific id="1" description="Dog Ear"/>
+        <specific id="2" description="Snow Drift (9S18M1)"/>
+        <specific id="3" description="MT-LB mounted ARK-1"/>
+        <specific id="4" description="MT-LB mounted ZOOPARK"/>
+        <specific id="5" description="Truck/trailer mounted SNAR-10"/>
+        <specific id="6" description="MT-LB mounted BIG FRED"/>
+      </subcategory>
+      <subcategory id="14" description="Meteorological Radar">
+        <specific id="1" description="End Tray"/>
+      </subcategory>
+      <subcategory id="18" description="Surface Search Radar">
+        <specific id="1" description="Sheet Bend"/>
+      </subcategory>
+      <subcategory id="24" description="Battlefield Surveillance">
+        <specific id="1" description="PSNR-5K (TALL MIKE)"/>
+        <specific id="2" description="FARA-1 (SBR-3)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="3" country="222">
+    <category id="0" description="Other"/>
+    <category id="10" description="Acoustic active">
+      <subcategory id="77" description="Sonobuoy"/>
+      <subcategory id="79" description="Towed Counter Measure">
+        <specific id="1" description="Towed CM BAT-1"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="222">
+    <category id="10" description="Acoustic, active">
+      <subcategory id="28" description="Decoy/Mimic"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="224">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+      <subcategory id="2" description="Early Warning/Surveillance Radar">
+        <specific id="1" description="Plessey AR-5"/>
+      </subcategory>
+      <subcategory id="3" description="Height Finding">
+        <specific id="1" description="Decca HF 200"/>
+      </subcategory>
+      <subcategory id="6" description="Target Tracking Radar"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="224">
+    <category id="10" description="Acoustic, Passive">
+      <subcategory id="77" description="Sonobuoy">
+        <specific id="1" description="AN/SSQ-955 HIDAR (High Instantaneous Dynamic Range)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="71">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+      <subcategory id="2" description="Early Warning/Surveillance Radar">
+        <specific id="1" description="Thompson LP-23 (TRS-2050)"/>
+        <specific id="2" description="Tiger-S (TRS-2100)"/>
+        <specific id="3" description="Tiger-G (TRS-2105)"/>
+        <specific id="4" description="THD 1940 (Picador)"/>
+        <specific id="5" description="Volex III/IV"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="78">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multifunction Radar">
+        <specific id="1" description="(deleted)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="206">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="4" description="Fire Control Radar">
+        <specific id="1" description="Skyguard"/>
+        <specific id="2" description="Super Fledermaus"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="56">
+    <category id="0" description="Other"/>
+    <category id="3" description="RF Passive (intercept and DF)">
+      <subcategory id="16" description="Identification/Classification Radar">
+        <specific id="1" description="Ramona (Soft Ball)"/>
+        <specific id="2" description="Tamara (Trash Drum)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="45">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+      <subcategory id="2" description="Early Warning / Surveillance Radar">
+        <specific id="1" description="Cross Legs"/>
+        <specific id="2" description="HN-503"/>
+        <specific id="3" description="JY-8">
+          <extra id="1" description="JY-8A"/>
+        </specific>
+        <specific id="4" description="JY-9"/>
+        <specific id="5" description="JY-14"/>
+        <specific id="6" description="Nanjing B/C">
+          <extra id="1" description="Nanjing B"/>
+          <extra id="2" description="Nanjing C"/>
+        </specific>
+        <specific id="7" description="Pin Jib"/>
+        <specific id="8" description="Slot Rest"/>
+      </subcategory>
+      <subcategory id="4" description="Fire Control Radar">
+        <specific id="1" description="Team Work"/>
+      </subcategory>
+      <subcategory id="5" description="Target Acquisition Radar">
+        <specific id="1" description="Rice Pad"/>
+      </subcategory>
+      <subcategory id="18" description="Surface-Search Radar">
+        <specific id="1" description="Cross Slot"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="119">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+      <subcategory id="4" description="Fire Control Radar">
+        <specific id="1" description="Drum Tilt B"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="106">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+      </subcategory>
+      <subcategory id="2" description="Early Warning/Surveillance Radar">
+        <specific id="1" description="Pluto"/>
+        <specific id="2" description="RAT-31S"/>
+        <specific id="3" description="ATCR-33 (Selenia)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="205">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="5" description="Target Acquisition Radar">
+        <specific id="1" description="Giraffe">
+          <extra id="1" description="Giraffe-40"/>
+          <extra id="2" description="Giraffe-50 AT"/>
+          <extra id="3" description="Giraffe-75"/>
+        </specific>
+        <specific id="2" description="HARD (PS-91)"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="13">
+    <category id="0" description="Other"/>
+    <category id="11" description="Acoustic, passive">
+      <subcategory id="77" description="Sonobuoy">
+        <specific id="1" description="AN/SSQ-801B Barra"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="0">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="0">
+    <category id="10" description="Acoustic, active">
+      <subcategory id="64" description="Jamming noise"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="153">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="101">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="102">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="240">
+    <category id="0" description="Other"/>
+    <category id="2" description="RF Active">
+      <subcategory id="1" description="Multi-function">
+        <specific id="1" description="Fixed"/>
+        <specific id="2" description="Mobile"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="110">
+    <category id="0" description="RF Active">
+      <subcategory id="2" description="Multi-function">
+        <specific id="2" description="FR-2855W"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="39">
+    <category id="9" description="Thermal (temperature sensing)">
+      <subcategory id="78" description="Bathythermal Sensor">
+        <specific id="1" description="AN/SSQ-536B BTS (Bathythermograph Transmitting Set)"/>
+      </subcategory>
+    </category>
+  </entity>
 </cet>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Extra.cs b/Libs/CsharpDis6/Enumerations/Cet2006/Extra.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Extra.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/Extra.cs
index d1a9818..ff2d932 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Extra.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/Extra.cs
@@ -1,62 +1,62 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Extra : GenericEntry
-    {
-		#region Fields (2) 
-
-        private byte id;
-        private string idField;
-
-		#endregion Fields 
-
-		#region Properties (2) 
-
-        [XmlIgnore]
-        public byte Id
-        {
-            get
-            {
-                return this.id;
-            }
-
-            set
-            {
-                if (this.id != value)
-                {
-                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
-        public string RawId
-        {
-            get
-            {
-                return this.idField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.idField != value)
-                {
-                    this.idField = value;
-                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawId");
-                }
-            }
-        }
-
-		#endregion Properties 
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Extra : GenericEntry
+    {
+		#region Fields (2) 
+
+        private byte id;
+        private string idField;
+
+		#endregion Fields 
+
+		#region Properties (2) 
+
+        [XmlIgnore]
+        public byte Id
+        {
+            get
+            {
+                return this.id;
+            }
+
+            set
+            {
+                if (this.id != value)
+                {
+                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
+        public string RawId
+        {
+            get
+            {
+                return this.idField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.idField != value)
+                {
+                    this.idField = value;
+                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawId");
+                }
+            }
+        }
+
+		#endregion Properties 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericEntry.cs b/Libs/CsharpDis6/Enumerations/Cet2006/GenericEntry.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericEntry.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/GenericEntry.cs
index 189c73c..91abc7e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericEntry.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/GenericEntry.cs
@@ -1,177 +1,177 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [XmlInclude(typeof(Extra))]
-    [XmlInclude(typeof(Specific))]
-    [XmlInclude(typeof(Subcategory))]
-    [XmlInclude(typeof(Category))]
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class GenericEntry : CetBase, INotifyPropertyChanged
-    {
-		#region Fields (7) 
-
-        private bool deletedField;
-        private bool deletedFieldSpecified;
-        private string descriptionField;
-        private string footnoteField;
-        private bool unusedField;
-        private bool unusedFieldSpecified;
-        private string xrefField;
-
-		#endregion Fields 
-
-		#region Delegates and Events (1) 
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-		#endregion Delegates and Events 
-
-		#region Properties (7) 
-
-        [XmlAttribute(AttributeName = "deleted")]
-        public bool Deleted
-        {
-            get
-            {
-                return this.deletedField;
-            }
-
-            set
-            {
-                if (this.deletedField != value)
-                {
-                    this.deletedField = value;
-                    this.RaisePropertyChanged("Deleted");
-                }
-            }
-        }
-
-        [XmlIgnore()]
-        public bool DeletedSpecified
-        {
-            get
-            {
-                return this.deletedFieldSpecified;
-            }
-
-            set
-            {
-                if (this.deletedFieldSpecified != value)
-                {
-                    this.deletedFieldSpecified = value;
-                    this.RaisePropertyChanged("DeletedSpecified");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "description")]
-        public string Description
-        {
-            get
-            {
-                return this.descriptionField;
-            }
-
-            set
-            {
-                if (this.descriptionField != value)
-                {
-                    this.descriptionField = value;
-                    this.RaisePropertyChanged("Description");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "footnote")]
-        public string Footnote
-        {
-            get
-            {
-                return this.footnoteField;
-            }
-
-            set
-            {
-                if (this.footnoteField != value)
-                {
-                    this.footnoteField = value;
-                    this.RaisePropertyChanged("Footnote");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "unused")]
-        public bool Unused
-        {
-            get
-            {
-                return this.unusedField;
-            }
-
-            set
-            {
-                if (this.unusedField != value)
-                {
-                    this.unusedField = value;
-                    this.RaisePropertyChanged("Unused");
-                }
-            }
-        }
-
-        [XmlIgnore()]
-        public bool UnusedSpecified
-        {
-            get
-            {
-                return this.unusedFieldSpecified;
-            }
-
-            set
-            {
-                if (this.unusedFieldSpecified)
-                {
-                    this.unusedFieldSpecified = value;
-                    this.RaisePropertyChanged("UnusedSpecified");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "xref")]
-        public string XRef
-        {
-            get
-            {
-                return this.xrefField;
-            }
-
-            set
-            {
-                if (this.xrefField != value)
-                {
-                    this.xrefField = value;
-                    this.RaisePropertyChanged("XRef");
-                }
-            }
-        }
-
-		#endregion Properties 
-
-		#region Methods (1) 
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-		#endregion Methods 
-    }
-}
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [XmlInclude(typeof(Extra))]
+    [XmlInclude(typeof(Specific))]
+    [XmlInclude(typeof(Subcategory))]
+    [XmlInclude(typeof(Category))]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class GenericEntry : CetBase, INotifyPropertyChanged
+    {
+		#region Fields (7) 
+
+        private bool deletedField;
+        private bool deletedFieldSpecified;
+        private string descriptionField;
+        private string footnoteField;
+        private bool unusedField;
+        private bool unusedFieldSpecified;
+        private string xrefField;
+
+		#endregion Fields 
+
+		#region Delegates and Events (1) 
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+		#endregion Delegates and Events 
+
+		#region Properties (7) 
+
+        [XmlAttribute(AttributeName = "deleted")]
+        public bool Deleted
+        {
+            get
+            {
+                return this.deletedField;
+            }
+
+            set
+            {
+                if (this.deletedField != value)
+                {
+                    this.deletedField = value;
+                    this.RaisePropertyChanged("Deleted");
+                }
+            }
+        }
+
+        [XmlIgnore()]
+        public bool DeletedSpecified
+        {
+            get
+            {
+                return this.deletedFieldSpecified;
+            }
+
+            set
+            {
+                if (this.deletedFieldSpecified != value)
+                {
+                    this.deletedFieldSpecified = value;
+                    this.RaisePropertyChanged("DeletedSpecified");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "description")]
+        public string Description
+        {
+            get
+            {
+                return this.descriptionField;
+            }
+
+            set
+            {
+                if (this.descriptionField != value)
+                {
+                    this.descriptionField = value;
+                    this.RaisePropertyChanged("Description");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "footnote")]
+        public string Footnote
+        {
+            get
+            {
+                return this.footnoteField;
+            }
+
+            set
+            {
+                if (this.footnoteField != value)
+                {
+                    this.footnoteField = value;
+                    this.RaisePropertyChanged("Footnote");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "unused")]
+        public bool Unused
+        {
+            get
+            {
+                return this.unusedField;
+            }
+
+            set
+            {
+                if (this.unusedField != value)
+                {
+                    this.unusedField = value;
+                    this.RaisePropertyChanged("Unused");
+                }
+            }
+        }
+
+        [XmlIgnore()]
+        public bool UnusedSpecified
+        {
+            get
+            {
+                return this.unusedFieldSpecified;
+            }
+
+            set
+            {
+                if (this.unusedFieldSpecified)
+                {
+                    this.unusedFieldSpecified = value;
+                    this.RaisePropertyChanged("UnusedSpecified");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "xref")]
+        public string XRef
+        {
+            get
+            {
+                return this.xrefField;
+            }
+
+            set
+            {
+                if (this.xrefField != value)
+                {
+                    this.xrefField = value;
+                    this.RaisePropertyChanged("XRef");
+                }
+            }
+        }
+
+		#endregion Properties 
+
+		#region Methods (1) 
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+		#endregion Methods 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericTable.cs b/Libs/CsharpDis6/Enumerations/Cet2006/GenericTable.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericTable.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/GenericTable.cs
index 2a4a0dd..c17a357 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/GenericTable.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/GenericTable.cs
@@ -1,177 +1,177 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [XmlInclude(typeof(Cet))]
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class GenericTable : CetBase, INotifyPropertyChanged
-    {
-		#region Fields (7) 
-
-        private string cnameField;
-        private ulong id;
-        private string idField;
-        private ulong length;
-        private string lengthField;
-        private string nameField;
-        private string sourceField;
-
-		#endregion Fields 
-
-		#region Delegates and Events (1) 
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-		#endregion Delegates and Events 
-
-		#region Properties (7) 
-
-        [XmlAttribute(AttributeName = "cname")]
-        public string CName
-        {
-            get
-            {
-                return this.cnameField;
-            }
-
-            set
-            {
-                if (this.cnameField != value)
-                {
-                    this.cnameField = value;
-                    this.RaisePropertyChanged("CName");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public ulong Id
-        {
-            get
-            {
-                return this.id;
-            }
-
-            set
-            {
-                if (this.id != value)
-                {
-                    this.RawId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public ulong Length
-        {
-            get
-            {
-                return this.length;
-            }
-
-            set
-            {
-                if (this.length != value)
-                {
-                    this.RawLength = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Length");
-                }
-            }
-        }
-
-        [XmlAttributeAttribute(AttributeName = "name")]
-        public string Name
-        {
-            get
-            {
-                return this.nameField;
-            }
-
-            set
-            {
-                if (this.nameField != value)
-                {
-                    this.nameField = value;
-                    this.RaisePropertyChanged("Name");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "id", DataType = "positiveInteger")]
-        public string RawId
-        {
-            get
-            {
-                return this.idField;
-            }
-
-            set
-            {
-                if (this.idField != value)
-                {
-                    this.idField = value;
-                    this.id = ulong.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawId");
-                }
-            }
-        }
-
-        [XmlAttributeAttribute(AttributeName = "length", DataType = "positiveInteger")]
-        public string RawLength
-        {
-            get
-            {
-                return this.lengthField;
-            }
-
-            set
-            {
-                if (this.lengthField != value)
-                {
-                    this.lengthField = value;
-                    this.length = ulong.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawLength");
-                }
-            }
-        }
-
-        [XmlAttributeAttribute(AttributeName = "source")]
-        public string Source
-        {
-            get
-            {
-                return this.sourceField;
-            }
-
-            set
-            {
-                if (this.sourceField != value)
-                {
-                    this.sourceField = value;
-                    this.RaisePropertyChanged("Source");
-                }
-            }
-        }
-
-		#endregion Properties 
-
-		#region Methods (1) 
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-		#endregion Methods 
-    }
-}
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [XmlInclude(typeof(Cet))]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class GenericTable : CetBase, INotifyPropertyChanged
+    {
+		#region Fields (7) 
+
+        private string cnameField;
+        private ulong id;
+        private string idField;
+        private ulong length;
+        private string lengthField;
+        private string nameField;
+        private string sourceField;
+
+		#endregion Fields 
+
+		#region Delegates and Events (1) 
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+		#endregion Delegates and Events 
+
+		#region Properties (7) 
+
+        [XmlAttribute(AttributeName = "cname")]
+        public string CName
+        {
+            get
+            {
+                return this.cnameField;
+            }
+
+            set
+            {
+                if (this.cnameField != value)
+                {
+                    this.cnameField = value;
+                    this.RaisePropertyChanged("CName");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public ulong Id
+        {
+            get
+            {
+                return this.id;
+            }
+
+            set
+            {
+                if (this.id != value)
+                {
+                    this.RawId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public ulong Length
+        {
+            get
+            {
+                return this.length;
+            }
+
+            set
+            {
+                if (this.length != value)
+                {
+                    this.RawLength = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Length");
+                }
+            }
+        }
+
+        [XmlAttributeAttribute(AttributeName = "name")]
+        public string Name
+        {
+            get
+            {
+                return this.nameField;
+            }
+
+            set
+            {
+                if (this.nameField != value)
+                {
+                    this.nameField = value;
+                    this.RaisePropertyChanged("Name");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "id", DataType = "positiveInteger")]
+        public string RawId
+        {
+            get
+            {
+                return this.idField;
+            }
+
+            set
+            {
+                if (this.idField != value)
+                {
+                    this.idField = value;
+                    this.id = ulong.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawId");
+                }
+            }
+        }
+
+        [XmlAttributeAttribute(AttributeName = "length", DataType = "positiveInteger")]
+        public string RawLength
+        {
+            get
+            {
+                return this.lengthField;
+            }
+
+            set
+            {
+                if (this.lengthField != value)
+                {
+                    this.lengthField = value;
+                    this.length = ulong.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawLength");
+                }
+            }
+        }
+
+        [XmlAttributeAttribute(AttributeName = "source")]
+        public string Source
+        {
+            get
+            {
+                return this.sourceField;
+            }
+
+            set
+            {
+                if (this.sourceField != value)
+                {
+                    this.sourceField = value;
+                    this.RaisePropertyChanged("Source");
+                }
+            }
+        }
+
+		#endregion Properties 
+
+		#region Methods (1) 
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+		#endregion Methods 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Specific.cs b/Libs/CsharpDis6/Enumerations/Cet2006/Specific.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Specific.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/Specific.cs
index f845e6c..dc1a654 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Specific.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/Specific.cs
@@ -1,122 +1,122 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Specific : GenericEntry
-    {
-		#region Fields (5) 
-
-        private List<Extra> extraField;
-
-        private byte id;
-        private byte id2;
-        private string id2Field;
-        private string idField;
-
-		#endregion Fields 
-
-		#region Properties (5) 
-
-        [XmlElementAttribute("extra", Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public List<Extra> Extras
-        {
-            get
-            {
-                return this.extraField;
-            }
-
-            set
-            {
-                if (this.extraField != value)
-                {
-                    this.extraField = value;
-                    this.RaisePropertyChanged("Extra");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public byte Id
-        {
-            get
-            {
-                return this.id;
-            }
-
-            set
-            {
-                if (this.id != value)
-                {
-                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public byte Id2
-        {
-            get
-            {
-                return this.id2;
-            }
-
-            set
-            {
-                if (this.id2 != value)
-                {
-                    this.RawId2 = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id2");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
-        public string RawId
-        {
-            get
-            {
-                return this.idField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.idField != value)
-                {
-                    this.idField = value;
-                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawId");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "id2", DataType = "nonNegativeInteger")]
-        public string RawId2
-        {
-            get
-            {
-                return this.id2Field;
-            }
-
-            set
-            {
-                if (this.id2Field != value)
-                {
-                    this.id2Field = value;
-                    this.id2 = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id2");
-                }
-            }
-        }
-
-		#endregion Properties 
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Specific : GenericEntry
+    {
+		#region Fields (5) 
+
+        private List<Extra> extraField;
+
+        private byte id;
+        private byte id2;
+        private string id2Field;
+        private string idField;
+
+		#endregion Fields 
+
+		#region Properties (5) 
+
+        [XmlElementAttribute("extra", Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+        public List<Extra> Extras
+        {
+            get
+            {
+                return this.extraField;
+            }
+
+            set
+            {
+                if (this.extraField != value)
+                {
+                    this.extraField = value;
+                    this.RaisePropertyChanged("Extra");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public byte Id
+        {
+            get
+            {
+                return this.id;
+            }
+
+            set
+            {
+                if (this.id != value)
+                {
+                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public byte Id2
+        {
+            get
+            {
+                return this.id2;
+            }
+
+            set
+            {
+                if (this.id2 != value)
+                {
+                    this.RawId2 = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id2");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
+        public string RawId
+        {
+            get
+            {
+                return this.idField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.idField != value)
+                {
+                    this.idField = value;
+                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawId");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "id2", DataType = "nonNegativeInteger")]
+        public string RawId2
+        {
+            get
+            {
+                return this.id2Field;
+            }
+
+            set
+            {
+                if (this.id2Field != value)
+                {
+                    this.id2Field = value;
+                    this.id2 = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id2");
+                }
+            }
+        }
+
+		#endregion Properties 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Subcategory.cs b/Libs/CsharpDis6/Enumerations/Cet2006/Subcategory.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Subcategory.cs
rename to Libs/CsharpDis6/Enumerations/Cet2006/Subcategory.cs
index ba322ca..f108844 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/Subcategory.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2006/Subcategory.cs
@@ -1,122 +1,122 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2006
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Subcategory : GenericEntry
-    {
-		#region Fields (5) 
-
-        private List<Specific> specificField;
-
-        private byte id;
-        private byte id2;
-        private string id2Field;
-        private string idField;
-
-		#endregion Fields 
-
-		#region Properties (5) 
-
-        [XmlIgnore]
-        public byte Id
-        {
-            get
-            {
-                return this.id;
-            }
-
-            set
-            {
-                if (this.id != value)
-                {
-                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public byte Id2
-        {
-            get
-            {
-                return this.id2;
-            }
-
-            set
-            {
-                if (this.id2 != value)
-                {
-                    this.RawId2 = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id2");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
-        public string RawId
-        {
-            get
-            {
-                return this.idField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.idField != value)
-                {
-                    this.idField = value;
-                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawId");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "id2", DataType = "nonNegativeInteger")]
-        public string RawId2
-        {
-            get
-            {
-                return this.id2Field;
-            }
-
-            set
-            {
-                if (this.id2Field != value)
-                {
-                    this.id2Field = value;
-                    this.id2 = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Id2");
-                }
-            }
-        }
-
-        [XmlElement("specific", Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public List<Specific> Specifices
-        {
-            get
-            {
-                return this.specificField;
-            }
-
-            set
-            {
-                if (this.specificField != value)
-                {
-                    this.specificField = value;
-                    this.RaisePropertyChanged("Specifices");
-                }
-            }
-        }
-
-		#endregion Properties 
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2006
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Subcategory : GenericEntry
+    {
+		#region Fields (5) 
+
+        private List<Specific> specificField;
+
+        private byte id;
+        private byte id2;
+        private string id2Field;
+        private string idField;
+
+		#endregion Fields 
+
+		#region Properties (5) 
+
+        [XmlIgnore]
+        public byte Id
+        {
+            get
+            {
+                return this.id;
+            }
+
+            set
+            {
+                if (this.id != value)
+                {
+                    this.RawId = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public byte Id2
+        {
+            get
+            {
+                return this.id2;
+            }
+
+            set
+            {
+                if (this.id2 != value)
+                {
+                    this.RawId2 = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id2");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "id", DataType = "nonNegativeInteger")]
+        public string RawId
+        {
+            get
+            {
+                return this.idField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.idField != value)
+                {
+                    this.idField = value;
+                    this.id = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawId");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "id2", DataType = "nonNegativeInteger")]
+        public string RawId2
+        {
+            get
+            {
+                return this.id2Field;
+            }
+
+            set
+            {
+                if (this.id2Field != value)
+                {
+                    this.id2Field = value;
+                    this.id2 = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Id2");
+                }
+            }
+        }
+
+        [XmlElement("specific", Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+        public List<Specific> Specifices
+        {
+            get
+            {
+                return this.specificField;
+            }
+
+            set
+            {
+                if (this.specificField != value)
+                {
+                    this.specificField = value;
+                    this.RaisePropertyChanged("Specifices");
+                }
+            }
+        }
+
+		#endregion Properties 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/cet.xsd b/Libs/CsharpDis6/Enumerations/Cet2006/cet.xsd
similarity index 100%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2006/cet.xsd
rename to Libs/CsharpDis6/Enumerations/Cet2006/cet.xsd
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/AggregateTypes.xml b/Libs/CsharpDis6/Enumerations/Cet2010/AggregateTypes.xml
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/AggregateTypes.xml
rename to Libs/CsharpDis6/Enumerations/Cet2010/AggregateTypes.xml
index 5bb7bb1..e0a6698 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/AggregateTypes.xml
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/AggregateTypes.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<cet uid="207" name="Aggregate State-Aggregate Types">
-  <entity kind="1" domain="1" country="225" uuid="1b221588-526a-11df-9faa-080069138b88" uid="22599">
-    <category value="0" description="Other" uuid="1b232428-526a-11df-9309-080069138b88" uid="22600"/>
-    <category value="1" description="Individual Vehicle" uuid="1b24328c-526a-11df-ad44-080069138b88" uid="22601"/>
-    <category value="2" description="Element" uuid="1b254550-526a-11df-9bc4-080069138b88" uid="22602"/>
-    <category value="3" description="Platoon" uuid="1b2653d2-526a-11df-8b47-080069138b88" uid="22603"/>
-    <category value="4" description="Battery" uuid="1b2763b2-526a-11df-b1be-080069138b88" uid="22604"/>
-    <category value="5" description="Company" uuid="1b286cda-526a-11df-8180-080069138b88" uid="22605"/>
-    <category value="6" description="Battalion" uuid="1b297c56-526a-11df-96b8-080069138b88" uid="22606"/>
-    <category value="7" description="Regiment" uuid="1b2a8f06-526a-11df-b0ea-080069138b88" uid="22607"/>
-    <category value="8" description="Brigade" uuid="1b2ba350-526a-11df-9193-080069138b88" uid="22608"/>
-    <category value="9" description="Division" uuid="1b2caca0-526a-11df-a9a3-080069138b88" uid="22609"/>
-    <category value="10" description="Corps" uuid="1b2dbba4-526a-11df-8d9b-080069138b88" uid="22610"/>
-  </entity>
-</cet>
+<?xml version="1.0" encoding="utf-8"?>
+<cet uid="207" name="Aggregate State-Aggregate Types">
+  <entity kind="1" domain="1" country="225" uuid="1b221588-526a-11df-9faa-080069138b88" uid="22599">
+    <category value="0" description="Other" uuid="1b232428-526a-11df-9309-080069138b88" uid="22600"/>
+    <category value="1" description="Individual Vehicle" uuid="1b24328c-526a-11df-ad44-080069138b88" uid="22601"/>
+    <category value="2" description="Element" uuid="1b254550-526a-11df-9bc4-080069138b88" uid="22602"/>
+    <category value="3" description="Platoon" uuid="1b2653d2-526a-11df-8b47-080069138b88" uid="22603"/>
+    <category value="4" description="Battery" uuid="1b2763b2-526a-11df-b1be-080069138b88" uid="22604"/>
+    <category value="5" description="Company" uuid="1b286cda-526a-11df-8180-080069138b88" uid="22605"/>
+    <category value="6" description="Battalion" uuid="1b297c56-526a-11df-96b8-080069138b88" uid="22606"/>
+    <category value="7" description="Regiment" uuid="1b2a8f06-526a-11df-b0ea-080069138b88" uid="22607"/>
+    <category value="8" description="Brigade" uuid="1b2ba350-526a-11df-9193-080069138b88" uid="22608"/>
+    <category value="9" description="Division" uuid="1b2caca0-526a-11df-a9a3-080069138b88" uid="22609"/>
+    <category value="10" description="Corps" uuid="1b2dbba4-526a-11df-8d9b-080069138b88" uid="22610"/>
+  </entity>
+</cet>
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Category.cs b/Libs/CsharpDis6/Enumerations/Cet2010/Category.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Category.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/Category.cs
index 4b8595a..899fc2d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Category.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/Category.cs
@@ -1,95 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Category : GenericEntrySingle, ICategoryOrCategoryRange
-    {
-		#region�Fields�(3)�
-
-        private List<GenericEntryDescription> subcategories;
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(3)�
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        [XmlElement("subcategory", typeof(Subcategory), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("subcategory_range", typeof(SubcategoryRange), Form = XmlSchemaForm.Unqualified)]
-        public List<GenericEntryDescription> Subcategories
-        {
-            get
-            {
-                return this.subcategories;
-            }
-
-            set
-            {
-                if (this.subcategories == value)
-                {
-                    return;
-                }
-
-                this.subcategories = value;
-                this.RaisePropertyChanged("Subcategories");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Category : GenericEntrySingle, ICategoryOrCategoryRange
+    {
+		#region�Fields�(3)�
+
+        private List<GenericEntryDescription> subcategories;
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(3)�
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        [XmlElement("subcategory", typeof(Subcategory), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("subcategory_range", typeof(SubcategoryRange), Form = XmlSchemaForm.Unqualified)]
+        public List<GenericEntryDescription> Subcategories
+        {
+            get
+            {
+                return this.subcategories;
+            }
+
+            set
+            {
+                if (this.subcategories == value)
+                {
+                    return;
+                }
+
+                this.subcategories = value;
+                this.RaisePropertyChanged("Subcategories");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CategoryRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/CategoryRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CategoryRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/CategoryRange.cs
index 4a1bde0..ac4a03d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CategoryRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/CategoryRange.cs
@@ -1,95 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class CategoryRange : GenericEntryRange, ICategoryOrCategoryRange
-    {
-		#region�Fields�(3)�
-
-        private List<GenericEntryDescription> items1Field;
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(3)�
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        [XmlElement("subcategory", typeof(Subcategory), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("subcategory_range", typeof(SubcategoryRange), Form = XmlSchemaForm.Unqualified)]
-        public List<GenericEntryDescription> Subcategories
-        {
-            get
-            {
-                return this.items1Field;
-            }
-
-            set
-            {
-                if (this.items1Field == value)
-                {
-                    return;
-                }
-
-                this.items1Field = value;
-                this.RaisePropertyChanged("Subcategories");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class CategoryRange : GenericEntryRange, ICategoryOrCategoryRange
+    {
+		#region�Fields�(3)�
+
+        private List<GenericEntryDescription> items1Field;
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(3)�
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        [XmlElement("subcategory", typeof(Subcategory), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("subcategory_range", typeof(SubcategoryRange), Form = XmlSchemaForm.Unqualified)]
+        public List<GenericEntryDescription> Subcategories
+        {
+            get
+            {
+                return this.items1Field;
+            }
+
+            set
+            {
+                if (this.items1Field == value)
+                {
+                    return;
+                }
+
+                this.items1Field = value;
+                this.RaisePropertyChanged("Subcategories");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cet.cs b/Libs/CsharpDis6/Enumerations/Cet2010/Cet.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cet.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/Cet.cs
index 2046aee..9855ac1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cet.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/Cet.cs
@@ -1,44 +1,44 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    [XmlRoot("cet", IsNullable = false)]
-    public class Cet : GenericTable
-    {
-		#region Fields (1) 
-
-        private List<Entity> entityField;
-
-		#endregion Fields 
-
-		#region Properties (1) 
-
-        [XmlElement("entity", Form = XmlSchemaForm.Unqualified)]
-        public List<Entity> Entities
-        {
-            get
-            {
-                return this.entityField;
-            }
-
-            set
-            {
-                if (this.entityField == value)
-                {
-                    return;
-                }
-
-                this.entityField = value;
-                this.RaisePropertyChanged("Entities");
-            }
-        }
-
-		#endregion Properties 
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    [XmlRoot("cet", IsNullable = false)]
+    public class Cet : GenericTable
+    {
+		#region Fields (1) 
+
+        private List<Entity> entityField;
+
+		#endregion Fields 
+
+		#region Properties (1) 
+
+        [XmlElement("entity", Form = XmlSchemaForm.Unqualified)]
+        public List<Entity> Entities
+        {
+            get
+            {
+                return this.entityField;
+            }
+
+            set
+            {
+                if (this.entityField == value)
+                {
+                    return;
+                }
+
+                this.entityField = value;
+                this.RaisePropertyChanged("Entities");
+            }
+        }
+
+		#endregion Properties 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetFactory.cs b/Libs/CsharpDis6/Enumerations/Cet2010/CetFactory.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetFactory.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/CetFactory.cs
index 50d3c48..11e107b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetFactory.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/CetFactory.cs
@@ -1,125 +1,125 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Comprehensive entity types factory.
-    /// </summary>
-    public class CetFactory
-    {
-		#region Static methods (3) 
-
-        /// <summary>
-        /// Creates the aggregate types.
-        /// </summary>
-        /// <returns>Aggregate types</returns>
-        public static Cet CreateAggregateTypes()
-        {
-            return CreateCet("OpenDis.Enumerations.Cet2010.AggregateTypes.xml");
-        }
-
-        /// <summary>
-        /// Creates the comprehensive entity-type instance.
-        /// </summary>
-        /// <param name="resource">The resource from which the CET is extracted.</param>
-        /// <returns>Comprehensive entity-type instance</returns>
-        private static Cet CreateCet(string resource)
-        {
-            XmlSerializer serializer = new XmlSerializer(typeof(Cet));
-
-            Stream s = Assembly.GetExecutingAssembly().GetManifestResourceStream(resource);
-            Cet et = (Cet)serializer.Deserialize(s);
-
-            return et;
-        }
-
-        public static List<ICetItem> Transform(Cet c)
-        {
-            List<ICetItem> items = new List<ICetItem>();
-
-            IEnumerable<ICetItem> extras =
-                from e in c.Entities
-                from j in e.Categories
-                from k in ((ICategoryOrCategoryRange)j).Subcategories
-                from l in ((ISubcategoryOrSubcategoryRange)k).Specifices
-                from m in ((ISpecificOrSpecificRange)l).Extras
-                select new CetItem()
-                {
-                    Category = (byte)((GenericEntrySingle)j).Value,
-                    Country = e.Country,
-                    Description = m.Description,
-                    Domain = e.Domain,
-                    Extra = (m is GenericEntryRange) ? (((GenericEntryRange)m).Min != 0 ? (byte?)((GenericEntryRange)m).Min : null) : (byte)((GenericEntrySingle)m).Value,
-                    Maximum = (m is GenericEntryRange) ? (((GenericEntryRange)m).Max != 0 ? (byte?)((GenericEntryRange)m).Max : null) : null,
-                    Kind = e.Kind,
-                    Specific = (l is GenericEntryRange) ? (((GenericEntryRange)l).Min != 0 ? (byte?)((GenericEntryRange)l).Min : null) : (byte)((GenericEntrySingle)l).Value,
-                    Subcategory = (k is GenericEntryRange) ? (((GenericEntryRange)k).Min != 0 ? (byte?)((GenericEntryRange)k).Min : null) : (byte)((GenericEntrySingle)k).Value
-                };
-
-            IEnumerable<ICetItem> specifices =
-                from e in c.Entities
-                from j in e.Categories
-                from k in ((ICategoryOrCategoryRange)j).Subcategories
-                from l in ((ISubcategoryOrSubcategoryRange)k).Specifices
-                select new CetItem()
-                {
-                    Category = (byte)((GenericEntrySingle)j).Value,
-                    Country = e.Country,
-                    Description = l.Description,
-                    Domain = e.Domain,
-                    Kind = e.Kind,
-                    Specific = (l is GenericEntryRange) ? (((GenericEntryRange)l).Min != 0 ? (byte?)((GenericEntryRange)l).Min : null) : (byte)((GenericEntrySingle)l).Value,
-                    Maximum = (l is GenericEntryRange) ? (((GenericEntryRange)l).Max != 0 ? (byte?)((GenericEntryRange)l).Max : null) : null,
-                    Subcategory = (k is GenericEntryRange) ? (((GenericEntryRange)k).Min != 0 ? (byte?)((GenericEntryRange)k).Min : null) : (byte)((GenericEntrySingle)k).Value
-                };
-
-            IEnumerable<ICetItem> subcategories =
-                from e in c.Entities
-                from j in e.Categories
-                from k in ((ICategoryOrCategoryRange)j).Subcategories
-                select new CetItem()
-                {
-                    Category = (byte)((GenericEntrySingle)j).Value,
-                    Country = e.Country,
-                    Description = k.Description,
-                    Domain = e.Domain,
-                    Kind = e.Kind,
-                    Subcategory = (k is GenericEntryRange) ? (((GenericEntryRange)k).Min != 0 ? (byte?)((GenericEntryRange)k).Min : null) : (byte)((GenericEntrySingle)k).Value,
-                    Maximum = (k is GenericEntryRange) ? (((GenericEntryRange)k).Max != 0 ? (byte?)((GenericEntryRange)k).Max : null) : null,
-                };
-
-            IEnumerable<ICetItem> categories =
-                from e in c.Entities
-                from j in e.Categories
-                select new CetItem()
-                {
-                    Category = (byte)((GenericEntrySingle)j).Value,
-                    Country = e.Country,
-                    Description = j.Description,
-                    Domain = e.Domain,
-                    Kind = e.Kind
-                };
-
-            items = items.Concat<ICetItem>(extras).Concat<ICetItem>(specifices).Concat<ICetItem>(subcategories).Concat<ICetItem>(categories).ToList<ICetItem>();
-            items.Sort();
-
-            return items;
-        }
-
-        /// <summary>
-        /// Creates the entity types.
-        /// </summary>
-        /// <returns>Entity types.</returns>
-        public static Cet CreateEntityTypes()
-        {
-            return CreateCet("OpenDis.Enumerations.Cet2010.EntityTypes.xml");
-        }
-
-		#endregion Static methods 
-    }
-}
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Comprehensive entity types factory.
+    /// </summary>
+    public class CetFactory
+    {
+		#region Static methods (3) 
+
+        /// <summary>
+        /// Creates the aggregate types.
+        /// </summary>
+        /// <returns>Aggregate types</returns>
+        public static Cet CreateAggregateTypes()
+        {
+            return CreateCet("OpenDis.Enumerations.Cet2010.AggregateTypes.xml");
+        }
+
+        /// <summary>
+        /// Creates the comprehensive entity-type instance.
+        /// </summary>
+        /// <param name="resource">The resource from which the CET is extracted.</param>
+        /// <returns>Comprehensive entity-type instance</returns>
+        private static Cet CreateCet(string resource)
+        {
+            XmlSerializer serializer = new XmlSerializer(typeof(Cet));
+
+            Stream s = Assembly.GetExecutingAssembly().GetManifestResourceStream(resource);
+            Cet et = (Cet)serializer.Deserialize(s);
+
+            return et;
+        }
+
+        public static List<ICetItem> Transform(Cet c)
+        {
+            List<ICetItem> items = new List<ICetItem>();
+
+            IEnumerable<ICetItem> extras =
+                from e in c.Entities
+                from j in e.Categories
+                from k in ((ICategoryOrCategoryRange)j).Subcategories
+                from l in ((ISubcategoryOrSubcategoryRange)k).Specifices
+                from m in ((ISpecificOrSpecificRange)l).Extras
+                select new CetItem()
+                {
+                    Category = (byte)((GenericEntrySingle)j).Value,
+                    Country = e.Country,
+                    Description = m.Description,
+                    Domain = e.Domain,
+                    Extra = (m is GenericEntryRange) ? (((GenericEntryRange)m).Min != 0 ? (byte?)((GenericEntryRange)m).Min : null) : (byte)((GenericEntrySingle)m).Value,
+                    Maximum = (m is GenericEntryRange) ? (((GenericEntryRange)m).Max != 0 ? (byte?)((GenericEntryRange)m).Max : null) : null,
+                    Kind = e.Kind,
+                    Specific = (l is GenericEntryRange) ? (((GenericEntryRange)l).Min != 0 ? (byte?)((GenericEntryRange)l).Min : null) : (byte)((GenericEntrySingle)l).Value,
+                    Subcategory = (k is GenericEntryRange) ? (((GenericEntryRange)k).Min != 0 ? (byte?)((GenericEntryRange)k).Min : null) : (byte)((GenericEntrySingle)k).Value
+                };
+
+            IEnumerable<ICetItem> specifices =
+                from e in c.Entities
+                from j in e.Categories
+                from k in ((ICategoryOrCategoryRange)j).Subcategories
+                from l in ((ISubcategoryOrSubcategoryRange)k).Specifices
+                select new CetItem()
+                {
+                    Category = (byte)((GenericEntrySingle)j).Value,
+                    Country = e.Country,
+                    Description = l.Description,
+                    Domain = e.Domain,
+                    Kind = e.Kind,
+                    Specific = (l is GenericEntryRange) ? (((GenericEntryRange)l).Min != 0 ? (byte?)((GenericEntryRange)l).Min : null) : (byte)((GenericEntrySingle)l).Value,
+                    Maximum = (l is GenericEntryRange) ? (((GenericEntryRange)l).Max != 0 ? (byte?)((GenericEntryRange)l).Max : null) : null,
+                    Subcategory = (k is GenericEntryRange) ? (((GenericEntryRange)k).Min != 0 ? (byte?)((GenericEntryRange)k).Min : null) : (byte)((GenericEntrySingle)k).Value
+                };
+
+            IEnumerable<ICetItem> subcategories =
+                from e in c.Entities
+                from j in e.Categories
+                from k in ((ICategoryOrCategoryRange)j).Subcategories
+                select new CetItem()
+                {
+                    Category = (byte)((GenericEntrySingle)j).Value,
+                    Country = e.Country,
+                    Description = k.Description,
+                    Domain = e.Domain,
+                    Kind = e.Kind,
+                    Subcategory = (k is GenericEntryRange) ? (((GenericEntryRange)k).Min != 0 ? (byte?)((GenericEntryRange)k).Min : null) : (byte)((GenericEntrySingle)k).Value,
+                    Maximum = (k is GenericEntryRange) ? (((GenericEntryRange)k).Max != 0 ? (byte?)((GenericEntryRange)k).Max : null) : null,
+                };
+
+            IEnumerable<ICetItem> categories =
+                from e in c.Entities
+                from j in e.Categories
+                select new CetItem()
+                {
+                    Category = (byte)((GenericEntrySingle)j).Value,
+                    Country = e.Country,
+                    Description = j.Description,
+                    Domain = e.Domain,
+                    Kind = e.Kind
+                };
+
+            items = items.Concat<ICetItem>(extras).Concat<ICetItem>(specifices).Concat<ICetItem>(subcategories).Concat<ICetItem>(categories).ToList<ICetItem>();
+            items.Sort();
+
+            return items;
+        }
+
+        /// <summary>
+        /// Creates the entity types.
+        /// </summary>
+        /// <returns>Entity types.</returns>
+        public static Cet CreateEntityTypes()
+        {
+            return CreateCet("OpenDis.Enumerations.Cet2010.EntityTypes.xml");
+        }
+
+		#endregion Static methods 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetItem.cs b/Libs/CsharpDis6/Enumerations/Cet2010/CetItem.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetItem.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/CetItem.cs
index 44fbce5..dfdbe7c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CetItem.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/CetItem.cs
@@ -1,149 +1,149 @@
-using System;
-using OpenDis.Core;
-using OpenDis.Enumerations.EntityState.Type;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    public class CetItem : ICetItem
-    {
-		#region Properties (10) 
-
-        public Country Country { get; set; }
-
-        public byte Domain { get; set; }
-
-        public EntityKind Kind { get; set; }
-
-        public byte Category { get; set; }
-
-        public byte? Subcategory { get; set; }
-
-        public byte? Specific { get; set; }
-
-        public byte? Extra { get; set; }
-
-        public uint? Maximum { get; set; }
-
-        public string Description { get; set; }
-
-		#endregion Properties 
-
-		#region Methods (2) 
-
-        public int CompareTo(ICetItem other)
-        {
-            // By definition, any object compares greater than a null reference 
-            if (other == null)
-            {
-                return 1;
-            }
-
-            int countryCompare = this.Country.ToString().CompareTo(other.Country.ToString());
-            if (countryCompare != 0)
-            {
-                return countryCompare;
-            }
-
-            int domainCompare = this.Domain.CompareTo(other.Domain);
-            if (domainCompare != 0)
-            {
-                return domainCompare;
-            }
-
-            int kindCompare = this.Kind.ToString().CompareTo(other.Kind.ToString());
-            if (kindCompare != 0)
-            {
-                return kindCompare;
-            }
-
-            int categoryCompare = this.Category.CompareTo(other.Category);
-            if (categoryCompare != 0)
-            {
-                return categoryCompare;
-            }
-
-            if (this.Subcategory != null)
-            {
-                int subcategoryCompare = ((byte)this.Subcategory).CompareTo(other.Subcategory);
-                if (subcategoryCompare != 0)
-                {
-                    return subcategoryCompare;
-                }
-            }
-            else
-            {
-                if (other.Subcategory != null)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            if (this.Specific != null)
-            {
-                int specificCompare = ((byte)this.Specific).CompareTo(other.Specific);
-                if (specificCompare != 0)
-                {
-                    return specificCompare;
-                }
-            }
-            else
-            {
-                if (other.Specific != null)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            if (this.Extra != null)
-            {
-                int extraCompare = ((byte)this.Extra).CompareTo(other.Extra);
-                if (extraCompare != 0)
-                {
-                    return extraCompare;
-                }
-            }
-            else
-            {
-                if (other.Extra != null)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-
-            if (!string.IsNullOrEmpty(this.Description))
-            {
-                return this.Description.CompareTo(other.Description);
-            }
-            else
-            {
-                return 0;
-            }
-        }
-
-        public int CompareTo(object obj)
-        {
-            if (obj is CetItem)
-            {
-                return this.CompareTo((CetItem)obj);
-            }
-            else
-            {
-                throw new ArgumentException("Object is not of type CetItem.");
-            }
-        }
-
-		#endregion Methods 
-    }
-}
+using System;
+using OpenDis.Core;
+using OpenDis.Enumerations.EntityState.Type;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    public class CetItem : ICetItem
+    {
+		#region Properties (10) 
+
+        public Country Country { get; set; }
+
+        public byte Domain { get; set; }
+
+        public EntityKind Kind { get; set; }
+
+        public byte Category { get; set; }
+
+        public byte? Subcategory { get; set; }
+
+        public byte? Specific { get; set; }
+
+        public byte? Extra { get; set; }
+
+        public uint? Maximum { get; set; }
+
+        public string Description { get; set; }
+
+		#endregion Properties 
+
+		#region Methods (2) 
+
+        public int CompareTo(ICetItem other)
+        {
+            // By definition, any object compares greater than a null reference 
+            if (other == null)
+            {
+                return 1;
+            }
+
+            int countryCompare = this.Country.ToString().CompareTo(other.Country.ToString());
+            if (countryCompare != 0)
+            {
+                return countryCompare;
+            }
+
+            int domainCompare = this.Domain.CompareTo(other.Domain);
+            if (domainCompare != 0)
+            {
+                return domainCompare;
+            }
+
+            int kindCompare = this.Kind.ToString().CompareTo(other.Kind.ToString());
+            if (kindCompare != 0)
+            {
+                return kindCompare;
+            }
+
+            int categoryCompare = this.Category.CompareTo(other.Category);
+            if (categoryCompare != 0)
+            {
+                return categoryCompare;
+            }
+
+            if (this.Subcategory != null)
+            {
+                int subcategoryCompare = ((byte)this.Subcategory).CompareTo(other.Subcategory);
+                if (subcategoryCompare != 0)
+                {
+                    return subcategoryCompare;
+                }
+            }
+            else
+            {
+                if (other.Subcategory != null)
+                {
+                    return -1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+
+            if (this.Specific != null)
+            {
+                int specificCompare = ((byte)this.Specific).CompareTo(other.Specific);
+                if (specificCompare != 0)
+                {
+                    return specificCompare;
+                }
+            }
+            else
+            {
+                if (other.Specific != null)
+                {
+                    return -1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+
+            if (this.Extra != null)
+            {
+                int extraCompare = ((byte)this.Extra).CompareTo(other.Extra);
+                if (extraCompare != 0)
+                {
+                    return extraCompare;
+                }
+            }
+            else
+            {
+                if (other.Extra != null)
+                {
+                    return -1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(this.Description))
+            {
+                return this.Description.CompareTo(other.Description);
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        public int CompareTo(object obj)
+        {
+            if (obj is CetItem)
+            {
+                return this.CompareTo((CetItem)obj);
+            }
+            else
+            {
+                throw new ArgumentException("Object is not of type CetItem.");
+            }
+        }
+
+		#endregion Methods 
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cr.cs b/Libs/CsharpDis6/Enumerations/Cet2010/Cr.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cr.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/Cr.cs
index 6803a6d..2b38380 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Cr.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/Cr.cs
@@ -1,93 +1,93 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Change request
-    /// </summary>
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Cr : CetBase, INotifyPropertyChanged
-    {
-		#region�Fields�(2)�
-
-        private ulong value;
-        private string valueField;
-
-		#endregion�Fields�
-
-		#region�Delegates�and�Events�(1)�
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-		#endregion�Delegates�and�Events�
-
-		#region�Properties�(2)�
-
-        /// <summary>
-        /// Gets or sets the change request number - RAW value.
-        /// </summary>
-        /// <value>The RAW change request number.</value>
-        [XmlAttribute(AttributeName = "value", DataType = "positiveInteger")]
-        public string RawValue
-        {
-            get
-            {
-                return this.valueField;
-            }
-
-            set
-            {
-                if (this.valueField == value)
-                {
-                    return;
-                }
-
-                this.valueField = value;
-                this.value = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawValue");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the change request number.
-        /// </summary>
-        /// <value>The change request number.</value>
-        [XmlIgnore]
-        public ulong Value
-        {
-            get
-            {
-                return this.value;
-            }
-
-            set
-            {
-                if (this.value != value)
-                {
-                    this.RawValue = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Value");
-                }
-            }
-        }
-
-		#endregion�Properties�
-
-		#region�Methods�(1)�
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-		#endregion�Methods�
-    }
-}
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Change request
+    /// </summary>
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Cr : CetBase, INotifyPropertyChanged
+    {
+		#region�Fields�(2)�
+
+        private ulong value;
+        private string valueField;
+
+		#endregion�Fields�
+
+		#region�Delegates�and�Events�(1)�
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+		#endregion�Delegates�and�Events�
+
+		#region�Properties�(2)�
+
+        /// <summary>
+        /// Gets or sets the change request number - RAW value.
+        /// </summary>
+        /// <value>The RAW change request number.</value>
+        [XmlAttribute(AttributeName = "value", DataType = "positiveInteger")]
+        public string RawValue
+        {
+            get
+            {
+                return this.valueField;
+            }
+
+            set
+            {
+                if (this.valueField == value)
+                {
+                    return;
+                }
+
+                this.valueField = value;
+                this.value = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawValue");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the change request number.
+        /// </summary>
+        /// <value>The change request number.</value>
+        [XmlIgnore]
+        public ulong Value
+        {
+            get
+            {
+                return this.value;
+            }
+
+            set
+            {
+                if (this.value != value)
+                {
+                    this.RawValue = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Value");
+                }
+            }
+        }
+
+		#endregion�Properties�
+
+		#region�Methods�(1)�
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+		#endregion�Methods�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CrRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/CrRange.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CrRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/CrRange.cs
index 0a62ff5..9ce8380 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/CrRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/CrRange.cs
@@ -1,93 +1,93 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Change request range
-    /// </summary>
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class CrRange : CetBase, INotifyPropertyChanged
-    {
-		#region�Fields�(2)�
-
-        private int max;
-        private int min;
-
-		#endregion�Fields�
-
-		#region�Delegates�and�Events�(1)�
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-		#endregion�Delegates�and�Events�
-
-		#region�Properties�(2)�
-
-        /// <summary>
-        /// Gets or sets the maximum change request number (inclusive).
-        /// </summary>
-        /// <value>The maximum change request number (inclusive)..</value>
-        [XmlAttribute(AttributeName = "value_max")]
-        public int Max
-        {
-            get
-            {
-                return this.max;
-            }
-
-            set
-            {
-                if (this.max == value)
-                {
-                    return;
-                }
-
-                this.max = value;
-                this.RaisePropertyChanged("Max");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the minimum change request number (inclusive).
-        /// </summary>
-        /// <value>The minimum change request number (inclusive)..</value>
-        [XmlAttribute(AttributeName = "value_min")]
-        public int Min
-        {
-            get
-            {
-                return this.min;
-            }
-
-            set
-            {
-                if (this.min == value)
-                {
-                    return;
-                }
-
-                this.min = value;
-                this.RaisePropertyChanged("Min");
-            }
-        }
-
-		#endregion�Properties�
-
-		#region�Methods�(1)�
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-		#endregion�Methods�
-    }
-}
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Change request range
+    /// </summary>
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class CrRange : CetBase, INotifyPropertyChanged
+    {
+		#region�Fields�(2)�
+
+        private int max;
+        private int min;
+
+		#endregion�Fields�
+
+		#region�Delegates�and�Events�(1)�
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+		#endregion�Delegates�and�Events�
+
+		#region�Properties�(2)�
+
+        /// <summary>
+        /// Gets or sets the maximum change request number (inclusive).
+        /// </summary>
+        /// <value>The maximum change request number (inclusive)..</value>
+        [XmlAttribute(AttributeName = "value_max")]
+        public int Max
+        {
+            get
+            {
+                return this.max;
+            }
+
+            set
+            {
+                if (this.max == value)
+                {
+                    return;
+                }
+
+                this.max = value;
+                this.RaisePropertyChanged("Max");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum change request number (inclusive).
+        /// </summary>
+        /// <value>The minimum change request number (inclusive)..</value>
+        [XmlAttribute(AttributeName = "value_min")]
+        public int Min
+        {
+            get
+            {
+                return this.min;
+            }
+
+            set
+            {
+                if (this.min == value)
+                {
+                    return;
+                }
+
+                this.min = value;
+                this.RaisePropertyChanged("Min");
+            }
+        }
+
+		#endregion�Properties�
+
+		#region�Methods�(1)�
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+		#endregion�Methods�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Entity.cs b/Libs/CsharpDis6/Enumerations/Cet2010/Entity.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Entity.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/Entity.cs
index 5676e97..5a76eb1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Entity.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/Entity.cs
@@ -1,219 +1,219 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using OpenDis.Enumerations.EntityState.Type;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Entity : GenericEntry
-    {
-		#region�Fields�(9)�
-
-        private List<GenericEntryDescription> categories;
-
-        private Country country;
-        private string countryField;
-        private byte domain;
-        private string domainField;
-        private EntityKind kind;
-        private string kindField;
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(9)�
-
-        [XmlElement("category", typeof(Category), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("category_range", typeof(CategoryRange), Form = XmlSchemaForm.Unqualified)]
-        public List<GenericEntryDescription> Categories
-        {
-            get
-            {
-                return this.categories;
-            }
-
-            set
-            {
-                if (this.categories == value)
-                {
-                    return;
-                }
-
-                this.categories = value;
-                this.RaisePropertyChanged("Categories");
-            }
-        }
-
-        [XmlIgnore]
-        public Country Country
-        {
-            get
-            {
-                return this.country;
-            }
-
-            set
-            {
-                if (this.country != value)
-                {
-                    this.RawCountry = ((int)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Country");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public byte Domain
-        {
-            get
-            {
-                return this.domain;
-            }
-
-            set
-            {
-                if (this.domain != value)
-                {
-                    this.RawDomain = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Domain");
-                }
-            }
-        }
-
-        [XmlIgnore]
-        public EntityKind Kind
-        {
-            get
-            {
-                return this.kind;
-            }
-
-            set
-            {
-                if (this.kind != value)
-                {
-                    this.RawKind = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("Kind");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "country", DataType = "nonNegativeInteger")]
-        public string RawCountry
-        {
-            get
-            {
-                return this.countryField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.countryField != value)
-                {
-                    this.countryField = value;
-                    int intValue = int.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
-                    this.country = (Country)Enum.ToObject(typeof(Country), intValue);
-                    this.RaisePropertyChanged("RawCountry");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "domain", DataType = "nonNegativeInteger")]
-        public string RawDomain
-        {
-            get
-            {
-                return this.domainField;
-            }
-
-            set
-            {
-                this.VerifyNumericString(value, false);
-
-                if (this.domainField != value)
-                {
-                    this.domainField = value;
-                    this.domain = byte.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("RawDomain");
-                }
-            }
-        }
-
-        [XmlAttribute(AttributeName = "kind", DataType = "nonNegativeInteger")]
-        public string RawKind
-        {
-            get
-            {
-                return this.kindField;
-            }
-
-            set
-            {
-                if (this.kindField != value)
-                {
-                    this.kindField = value;
-                    byte byteValue = byte.Parse(value, CultureInfo.InvariantCulture);
-                    this.kind = (EntityKind)Enum.ToObject(typeof(EntityKind), byteValue);
-                    this.RaisePropertyChanged("RawKind");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using OpenDis.Enumerations.EntityState.Type;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Entity : GenericEntry
+    {
+		#region�Fields�(9)�
+
+        private List<GenericEntryDescription> categories;
+
+        private Country country;
+        private string countryField;
+        private byte domain;
+        private string domainField;
+        private EntityKind kind;
+        private string kindField;
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(9)�
+
+        [XmlElement("category", typeof(Category), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("category_range", typeof(CategoryRange), Form = XmlSchemaForm.Unqualified)]
+        public List<GenericEntryDescription> Categories
+        {
+            get
+            {
+                return this.categories;
+            }
+
+            set
+            {
+                if (this.categories == value)
+                {
+                    return;
+                }
+
+                this.categories = value;
+                this.RaisePropertyChanged("Categories");
+            }
+        }
+
+        [XmlIgnore]
+        public Country Country
+        {
+            get
+            {
+                return this.country;
+            }
+
+            set
+            {
+                if (this.country != value)
+                {
+                    this.RawCountry = ((int)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Country");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public byte Domain
+        {
+            get
+            {
+                return this.domain;
+            }
+
+            set
+            {
+                if (this.domain != value)
+                {
+                    this.RawDomain = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Domain");
+                }
+            }
+        }
+
+        [XmlIgnore]
+        public EntityKind Kind
+        {
+            get
+            {
+                return this.kind;
+            }
+
+            set
+            {
+                if (this.kind != value)
+                {
+                    this.RawKind = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("Kind");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "country", DataType = "nonNegativeInteger")]
+        public string RawCountry
+        {
+            get
+            {
+                return this.countryField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.countryField != value)
+                {
+                    this.countryField = value;
+                    int intValue = int.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
+                    this.country = (Country)Enum.ToObject(typeof(Country), intValue);
+                    this.RaisePropertyChanged("RawCountry");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "domain", DataType = "nonNegativeInteger")]
+        public string RawDomain
+        {
+            get
+            {
+                return this.domainField;
+            }
+
+            set
+            {
+                this.VerifyNumericString(value, false);
+
+                if (this.domainField != value)
+                {
+                    this.domainField = value;
+                    this.domain = byte.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("RawDomain");
+                }
+            }
+        }
+
+        [XmlAttribute(AttributeName = "kind", DataType = "nonNegativeInteger")]
+        public string RawKind
+        {
+            get
+            {
+                return this.kindField;
+            }
+
+            set
+            {
+                if (this.kindField != value)
+                {
+                    this.kindField = value;
+                    byte byteValue = byte.Parse(value, CultureInfo.InvariantCulture);
+                    this.kind = (EntityKind)Enum.ToObject(typeof(EntityKind), byteValue);
+                    this.RaisePropertyChanged("RawKind");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/EntityTypes.xml b/Libs/CsharpDis6/Enumerations/Cet2010/EntityTypes.xml
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/EntityTypes.xml
rename to Libs/CsharpDis6/Enumerations/Cet2010/EntityTypes.xml
index dec8515..45026b7 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/EntityTypes.xml
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/EntityTypes.xml
@@ -1,16085 +1,16085 @@
-<?xml version="1.0" encoding="utf-8"?>
-<cet uid="30" name="Comprehensive Entity Types">
-  <entity kind="1" domain="1" country="225" uuid="c55fe33c-5269-11df-9704-080069138b88" uid="10000">
-    <category value="0" description="Other" uuid="c560f038-5269-11df-80e7-080069138b88" uid="10001">
-      <subcategory value="1" description="Miscellaneous guns" uuid="c561feec-5269-11df-810f-080069138b88" uid="10002">
-        <specific value="1" description="M901 40-mm machine gun" uuid="c5630efe-5269-11df-b52e-080069138b88" uid="10003"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="c564265e-5269-11df-8d66-080069138b88" uid="10004"/>
-        <specific value="3" description="Liquid propellant guns" uuid="c565377e-5269-11df-a84a-080069138b88" uid="10005"/>
-        <specific value="4" description="Phalanx (Close-In Weapons Systems (CIWS) Mk15)" uuid="c56648e4-5269-11df-b01f-080069138b88" uid="10006"/>
-      </subcategory>
-      <subcategory value="2" description="Grenade launchers" uuid="c567fdce-5269-11df-98c6-080069138b88" uid="10007">
-        <specific value="1" description="Mk 19 40-mm" uuid="c5690624-5269-11df-ab99-080069138b88" uid="10008"/>
-        <specific value="2" description="Brunswick Multisalvo Smoke Grenade Launcher" uuid="c56a1668-5269-11df-86cb-080069138b88" uid="10009"/>
-        <specific value="3" description="Tracor Aerospace Advanced Smoke Launcher System" uuid="c56b2b34-5269-11df-b38e-080069138b88" uid="10010"/>
-      </subcategory>
-      <subcategory value="3" description="Other missile systems" uuid="c56cdc54-5269-11df-a974-080069138b88" uid="10011">
-        <specific value="1" description="McDonnell-Douglas Harpoon Coastal Defense System" uuid="c56de888-5269-11df-85b9-080069138b88" uid="10012"/>
-      </subcategory>
-      <subcategory value="4" description="Bridges" uuid="c56f9d40-5269-11df-8b3c-080069138b88" uid="10013">
-        <specific value="1" description="Trailer Launched Bridge (TLB)" uuid="c570ac08-5269-11df-9960-080069138b88" uid="10014"/>
-        <specific value="2" description="Mobile assault bridge" uuid="c571bc9c-5269-11df-8e81-080069138b88" uid="10015"/>
-        <specific value="3" description="M60 bridge" uuid="c572c934-5269-11df-83a9-080069138b88" uid="10016"/>
-      </subcategory>
-      <subcategory value="5" description="Command Post" uuid="c57476bc-5269-11df-b63c-080069138b88" uid="10017"/>
-      <subcategory value="7" description="Decontamination equipment" status="new" uuid="6c36cef6-04c0-4eee-97e0-945142140d9e" uid="22821">
-        <cr value="1767"/>
-        <specific value="1" description="M17 Lightweight Decontamination" status="new" uuid="3cb4faad-1ad8-4bbf-b4fa-623987aa2e24" uid="22822">
-          <cr value="1767"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="1" description="Tank" uuid="c5762778-5269-11df-a96f-080069138b88" uid="10018">
-      <subcategory value="1" description="M1 Abrams" uuid="c5773514-5269-11df-8c70-080069138b88" uid="10019">
-        <specific value="1" description="M1 Abrams" uuid="c578453a-5269-11df-8adc-080069138b88" uid="10020"/>
-        <specific value="2" description="M1A1 Abrams" uuid="c5795308-5269-11df-9659-080069138b88" uid="10021"/>
-        <specific value="3" description="M1A2" uuid="c57a668a-5269-11df-83c7-080069138b88" uid="10022"/>
-        <specific value="4" description="M1A1 w/ mine rollers" uuid="c57b73f4-5269-11df-b2a8-080069138b88" uid="10023"/>
-        <specific value="5" description="M1A1 w/ mine plows" uuid="c57c7f1a-5269-11df-89e0-080069138b88" uid="10024"/>
-        <specific value="6" description="M1A1 w/ DU armor" uuid="c57d9396-5269-11df-9d94-080069138b88" uid="10025"/>
-        <specific value="7" description="M1A2 w/ Combat Vehicle Command and Control (CVCC)" uuid="c57ea3d0-5269-11df-b170-080069138b88" uid="10026"/>
-        <specific value="8" description="M1A2 SEP" uuid="c57faeb0-5269-11df-ac46-080069138b88" uid="10027"/>
-        <specific value="9" description="M1A1D" uuid="c580bdbe-5269-11df-bee1-080069138b88" uid="10028"/>
-      </subcategory>
-      <subcategory value="2" description="M60 Main Battle Tank (MBT)" uuid="c582794c-5269-11df-97ad-080069138b88" uid="10029">
-        <specific value="1" description="M60A3" uuid="c5838a08-5269-11df-81b8-080069138b88" uid="10030"/>
-        <specific value="2" description="M60A1" uuid="c584924a-5269-11df-9714-080069138b88" uid="10031"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="c585a518-5269-11df-9d61-080069138b88" uid="10032"/>
-        <specific value="4" description="M60A1 with ERA" uuid="c586b638-5269-11df-b433-080069138b88" uid="10033"/>
-      </subcategory>
-      <subcategory value="3" description="M551 Sheridan light tank/reconnaissance vehicle" uuid="c588682a-5269-11df-90ec-080069138b88" uid="10034">
-        <specific value="1" description="M551A1" uuid="c5897256-5269-11df-b369-080069138b88" uid="10035"/>
-      </subcategory>
-      <subcategory value="4" description="M48 medium tank" uuid="c58b2358-5269-11df-a9eb-080069138b88" uid="10036">
-        <specific value="1" description="M48C" uuid="c58c3324-5269-11df-8c90-080069138b88" uid="10037"/>
-        <specific value="2" description="M48A1" uuid="c58d43cc-5269-11df-a3e9-080069138b88" uid="10038"/>
-        <specific value="3" description="M48A2" uuid="c58e4c40-5269-11df-99cc-080069138b88" uid="10039"/>
-        <specific value="4" description="M48A2C" uuid="c58f5c5c-5269-11df-8501-080069138b88" uid="10040"/>
-        <specific value="5" description="M48A3" uuid="c590707e-5269-11df-9e2c-080069138b88" uid="10041"/>
-        <specific value="6" description="M48A4" uuid="c59178ca-5269-11df-b471-080069138b88" uid="10042"/>
-        <specific value="7" description="M48A5" uuid="c592871a-5269-11df-91dc-080069138b88" uid="10043"/>
-        <specific value="8" description="M48H" uuid="c5939736-5269-11df-b74c-080069138b88" uid="10044"/>
-        <specific value="9" description="M48 AVLB" uuid="c594a1bc-5269-11df-b83f-080069138b88" uid="10045"/>
-        <specific value="10" description="M48 ARV" uuid="c595aff8-5269-11df-b965-080069138b88" uid="10046"/>
-        <specific value="11" description="M48 mine clearing vehicle" uuid="c596c370-5269-11df-9cb2-080069138b88" uid="10047"/>
-        <specific value="12" description="M48A2GA2" uuid="c597ce0a-5269-11df-864b-080069138b88" uid="10048"/>
-        <specific value="13" description="M48A5E" uuid="c598dbd8-5269-11df-92ca-080069138b88" uid="10049"/>
-      </subcategory>
-      <subcategory value="5" description="M47 medium tank" uuid="c59a8c94-5269-11df-a0d0-080069138b88" uid="10050">
-        <specific value="1" description="M47" uuid="c59b9b48-5269-11df-821a-080069138b88" uid="10051"/>
-        <specific value="2" description="M47M" uuid="c59ca452-5269-11df-bc33-080069138b88" uid="10052"/>
-        <specific value="3" description="GLS M47 ARV" uuid="c59db7e8-5269-11df-9fb2-080069138b88" uid="10053"/>
-      </subcategory>
-      <subcategory value="6" description="M41 light tank" uuid="c59f64da-5269-11df-8210-080069138b88" uid="10054">
-        <specific value="1" description="M41C" uuid="c5a07dca-5269-11df-8b40-080069138b88" uid="10055"/>
-        <specific value="2" description="M41E W/8V-71T Engine" uuid="c5a18c74-5269-11df-9740-080069138b88" uid="10056"/>
-        <specific value="3" description="QM41" uuid="c5a29cc2-5269-11df-b8f6-080069138b88" uid="10057"/>
-        <specific value="4" description="M41B" uuid="c5a3aa36-5269-11df-967f-080069138b88" uid="10058"/>
-        <specific value="5" description="(deprecated)" deprecated="1" uuid="c5a4e068-5269-11df-abaf-080069138b88" uid="10059"/>
-        <specific value="6" description="M41 German Tank Improvement (GTI)" uuid="c5a5f534-5269-11df-b0fa-080069138b88" uid="10060"/>
-      </subcategory>
-      <subcategory value="7" description="Cadillac Gage Commando Stingray light tank" uuid="c5a7a6fe-5269-11df-ae6f-080069138b88" uid="10061"/>
-      <subcategory value="8" description="FMC Close Combat Vehicle Light VFM 5 tank" uuid="c5a8b9e0-5269-11df-920e-080069138b88" uid="10062"/>
-      <subcategory value="9" description="AAI Rapid Deployment Force Light Tank (RDF/LT) Combined Arms Team/Lightweight Combat Vehicle (CAT/LCV)" uuid="c5a9d0f0-5269-11df-b679-080069138b88" uid="10063">
-        <specific value="1" description="Prototype" uuid="c5aadf40-5269-11df-b2b3-080069138b88" uid="10064"/>
-      </subcategory>
-      <subcategory value="10" description="Teledyne Continental Armored Gun System" uuid="c5ac8fc0-5269-11df-a4dd-080069138b88" uid="10065"/>
-      <subcategory value="11" description="FCS Mounted Combat System" uuid="c5ada536-5269-11df-8d29-080069138b88" uid="10066"/>
-    </category>
-    <category value="2" description="Armored fighting vehicle" uuid="c5af53f4-5269-11df-82cb-080069138b88" uid="10067">
-      <subcategory value="1" description="FMC M2/M3 Bradley" uuid="c5b0660e-5269-11df-8234-080069138b88" uid="10068">
-        <specific value="1" description="M2A2 Bradley Infantry Fighting Vehicle (IFV)" uuid="c5b1709e-5269-11df-b31b-080069138b88" uid="10069"/>
-        <specific value="2" description="M3A2 Bradley Cavalry Fighting Vehicle (CFV)" uuid="c5b28182-5269-11df-9872-080069138b88" uid="10070"/>
-        <specific value="3" description="FMC Bradley IFV" uuid="c5b3a1d4-5269-11df-b841-080069138b88" uid="10071"/>
-        <specific value="4" description="M2 Bradley IFV" uuid="c5b4b07e-5269-11df-a751-080069138b88" uid="10072"/>
-        <specific value="5" description="M2A1 Bradley IFV" uuid="c5b5c086-5269-11df-831e-080069138b88" uid="10073"/>
-        <specific value="6" description="M3 Bradley CFV" uuid="c5b6d1b0-5269-11df-b99f-080069138b88" uid="10074"/>
-        <specific value="7" description="M3A1 Bradley CFV" uuid="c5b7da38-5269-11df-991e-080069138b88" uid="10075"/>
-        <specific value="8" description="M7 BFIST" uuid="c5b8ecf2-5269-11df-b6bc-080069138b88" uid="10076"/>
-        <specific value="9" description="M2A3 Bradley IFV" uuid="c5b9fb56-5269-11df-b029-080069138b88" uid="10077"/>
-        <specific value="10" description="M3A3 Bradley CFV" uuid="c5bb05c8-5269-11df-b345-080069138b88" uid="10078"/>
-        <specific value="11" description="M2A2ODS Bradley IFV" uuid="c5bc17a6-5269-11df-897d-080069138b88" uid="10079"/>
-      </subcategory>
-      <subcategory value="3" description="FMC M113 Armored Personnel Carrier (APC)" uuid="c5bdc632-5269-11df-b819-080069138b88" uid="10080">
-        <specific value="1" description="M113A2" uuid="c5bed720-5269-11df-bd30-080069138b88" uid="10081"/>
-        <specific value="2" description="M113A3" uuid="c5bfed22-5269-11df-b53e-080069138b88" uid="10082"/>
-        <specific value="3" description="M113A3 w/ M105 trailer" uuid="c5c0fbea-5269-11df-98b2-080069138b88" uid="10083"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="c5c20cd8-5269-11df-8273-080069138b88" uid="10084"/>
-        <specific value="5" description="(deprecated)" deprecated="1" uuid="c5c31c54-5269-11df-b409-080069138b88" uid="10085"/>
-        <specific value="6" description="M113A1 Improved TOW Vehicle (ITV)" uuid="c5c42c5c-5269-11df-82a5-080069138b88" uid="10086"/>
-        <specific value="7" description="M113A1 TOW" uuid="c5c53bce-5269-11df-a0ab-080069138b88" uid="10087"/>
-        <specific value="8" description="M113A2 ITV" uuid="c5c6494c-5269-11df-a973-080069138b88" uid="10088"/>
-        <specific value="9" description="M113A2 TOW" uuid="c5c758b4-5269-11df-b2ef-080069138b88" uid="10089"/>
-        <specific value="10" description="M730 Chaparral Surface-to-Air Missile (SAM) launcher" uuid="c5c868a8-5269-11df-a8ff-080069138b88" uid="10090"/>
-        <specific value="11" description="M113" uuid="c5c97356-5269-11df-87a4-080069138b88" uid="10091"/>
-        <specific value="12" description="M113A1" uuid="c5ca82d2-5269-11df-8cc9-080069138b88" uid="10092"/>
-        <specific value="13" description="M113A1R" uuid="c5cb9622-5269-11df-bdb9-080069138b88" uid="10093"/>
-        <specific value="14" description="M113A2DR" uuid="c5cc9f4a-5269-11df-aca4-080069138b88" uid="10094"/>
-        <specific value="15" description="M113A2H" uuid="c5cdaeda-5269-11df-9dd1-080069138b88" uid="10095"/>
-        <specific value="16" description="M113A2IT" uuid="c5cec1ee-5269-11df-b50c-080069138b88" uid="10096"/>
-        <specific value="17" description="M113A2MK" uuid="c5cfcbb6-5269-11df-8a56-080069138b88" uid="10097"/>
-        <specific value="18" description="M113A2R" uuid="c5d0d902-5269-11df-92e3-080069138b88" uid="10098"/>
-        <specific value="19" description="M132/M132A1 Flamethrower" uuid="c5d1eacc-5269-11df-b60d-080069138b88" uid="10099"/>
-        <specific value="20" description="M667" uuid="c5d2f962-5269-11df-851b-080069138b88" uid="10100"/>
-        <specific value="21" description="(deprecated)" deprecated="1" uuid="c5d407e4-5269-11df-ad68-080069138b88" uid="10101"/>
-        <specific value="22" description="(deprecated)" deprecated="1" uuid="c5d51788-5269-11df-8432-080069138b88" uid="10102"/>
-        <specific value="23" description="M741" uuid="c5d625ce-5269-11df-a13d-080069138b88" uid="10103"/>
-        <specific value="24" description="M741A1" uuid="c5d73450-5269-11df-b1a4-080069138b88" uid="10104"/>
-        <specific value="25" description="M741A2" uuid="c5d84142-5269-11df-8cde-080069138b88" uid="10105"/>
-        <specific value="26" description="RTL" uuid="c5d94b28-5269-11df-8d3e-080069138b88" uid="10106"/>
-        <specific value="27" description="XM474" uuid="c5da5d10-5269-11df-a881-080069138b88" uid="10107"/>
-        <specific value="28" description="XM474E2" uuid="c5db6be2-5269-11df-b6c5-080069138b88" uid="10108"/>
-        <specific value="29" description="XM667E1" uuid="c5dc7410-5269-11df-be9c-080069138b88" uid="10109"/>
-        <specific value="30" description="XM727" uuid="c5dd8788-5269-11df-b4b9-080069138b88" uid="10110"/>
-        <specific value="31" description="(deprecated)" deprecated="1" uuid="c5dea028-5269-11df-8fa1-080069138b88" uid="10111"/>
-        <specific value="32" description="XM741" uuid="c5dfaacc-5269-11df-a0e7-080069138b88" uid="10112"/>
-        <specific value="33" description="XM806E1" uuid="c5e0b912-5269-11df-bfce-080069138b88" uid="10113"/>
-        <specific value="34" description="XM806E2" uuid="c5e1cb0e-5269-11df-9735-080069138b88" uid="10114"/>
-        <specific value="35" description="M58A3 Wolf Smoke" status="new" uuid="b96b4e70-d9ed-4f37-b291-aedd67a7bf64" uid="22857">
-          <cr value="2224"/>
-        </specific>
-      </subcategory>
-      <subcategory value="5" description="Light Armored Vehicle (LAV) TOW" uuid="c5e378a0-5269-11df-8c96-080069138b88" uid="10115">
-        <specific value="1" description="FIST" uuid="c5e4848e-5269-11df-88a3-080069138b88" uid="10116"/>
-        <specific value="2" description="MGS" uuid="c5e590c2-5269-11df-9cbe-080069138b88" uid="10117"/>
-        <specific value="3" description="ATGM" uuid="c5e6a46c-5269-11df-8c15-080069138b88" uid="10118"/>
-        <specific value="4" description="Ambulance" uuid="c5e7ae5c-5269-11df-a1c2-080069138b88" uid="10119"/>
-        <specific value="5" description="Medical Team" uuid="c5e8bbe4-5269-11df-911b-080069138b88" uid="10120"/>
-        <specific value="6" description="PROPHET" uuid="c5e9cbd8-5269-11df-9cf9-080069138b88" uid="10121"/>
-        <specific value="7" description="REMBASS/GSR" uuid="c5ead848-5269-11df-a59b-080069138b88" uid="10122"/>
-        <specific value="8" description="NBC" uuid="c5ebef26-5269-11df-93d8-080069138b88" uid="10123"/>
-        <specific value="9" description="155SP HOW" uuid="c5ecf7c2-5269-11df-8201-080069138b88" uid="10124"/>
-        <specific value="10" description="Plow" uuid="c5ee061c-5269-11df-b383-080069138b88" uid="10125"/>
-        <specific value="11" description="Roller" uuid="c5ef167e-5269-11df-b828-080069138b88" uid="10126"/>
-        <specific value="12" description="Wrecker" uuid="c5f02960-5269-11df-bfdc-080069138b88" uid="10127"/>
-        <specific value="13" description="Logistics" uuid="c5f131de-5269-11df-9c3e-080069138b88" uid="10128"/>
-        <specific value="14" description="Reconnaissance Vehicle" uuid="c5f2410a-5269-11df-a24b-080069138b88" uid="10129"/>
-        <specific value="15" description="Command and Control TOC Vehicle" uuid="c5f354e6-5269-11df-86cd-080069138b88" uid="10130"/>
-        <specific value="16" description="Mortar Carrier" uuid="c5f46016-5269-11df-90a1-080069138b88" uid="10131"/>
-        <specific value="17" description="Striker/Fire Support Team Vehicle" uuid="c5f56f1a-5269-11df-8d52-080069138b88" uid="10132"/>
-        <specific value="18" description="Stryker Personnel Carrier w/MK 19 mod 3 40-mm grenade launcher" uuid="c5f6815c-5269-11df-9df4-080069138b88" uid="10133"/>
-        <specific value="19" description="Stryker Personnel Carrier w/M2 .50 cal heavy machine gun" uuid="c5f792b8-5269-11df-b568-080069138b88" uid="10134"/>
-        <specific value="20" description="Stryker Personnel Carrier w/MK 240 7.62 mm machine gun" uuid="c5f8a57c-5269-11df-a32c-080069138b88" uid="10135"/>
-        <specific value="21" description="Stryker Personnel Carrier w/automatic cannon" uuid="c5f9b796-5269-11df-9056-080069138b88" uid="10136"/>
-        <specific value="22" description="Stryker Mobile Gun System w/M68A1E4 105-mm cannon; MK 240 7.62 mm co-axial machine gun; and M2 .50 cal heavy machine gun" uuid="c5faca6e-5269-11df-bc37-080069138b88" uid="10137"/>
-        <specific value="23" description="Stryker Reconnaissance Vehicle w/MK 240 7.62-mm machine gun" uuid="c5fbe598-5269-11df-ad5b-080069138b88" uid="10138"/>
-        <specific value="24" description="Stryker Mortar Carrier w/120-mm mortar" uuid="c5fd0216-5269-11df-ba7f-080069138b88" uid="10139"/>
-        <specific value="25" description="Stryker Mortar Carrier w/81-mm mortar" uuid="c5fe0e0e-5269-11df-bf57-080069138b88" uid="10140"/>
-        <specific value="26" description="Stryker Mortar Carrier w/60-mm mortar" uuid="c5ff2154-5269-11df-b4eb-080069138b88" uid="10141"/>
-        <specific value="27" description="Stryker Command Vehicle w/MK 240 7.62-mm machine gun" uuid="c60054fc-5269-11df-8d80-080069138b88" uid="10142"/>
-        <specific value="28" description="Stryker Fire Support w/ MK 240 7.62-mm machine gun" uuid="c6016824-5269-11df-a34a-080069138b88" uid="10143"/>
-        <specific value="29" description="Stryker Engineer w/MK 240 7.62-mm machine gun" uuid="c6027dea-5269-11df-ad87-080069138b88" uid="10144"/>
-        <specific value="30" description="Stryker Ambulance" uuid="c60394c8-5269-11df-9513-080069138b88" uid="10145"/>
-        <specific value="31" description="Stryker Anti-tank Guided Missile" uuid="c604a502-5269-11df-bfbc-080069138b88" uid="10146"/>
-        <specific value="32" description="Stryker NBC Reconnaissance w/240 7.62-mm machine gun" uuid="c605b276-5269-11df-bfb9-080069138b88" uid="10147"/>
-        <specific value="33" description="LAV-Assault Gun (LAV-AG)" status="new" uuid="94b1162c-df7a-47f8-b747-ecb25cd4e0b3" uid="22858">
-          <cr value="2225"/>
-        </specific>
-      </subcategory>
-      <subcategory value="6" description="FMC Armored IFV" uuid="c60764e0-5269-11df-b145-080069138b88" uid="10148">
-        <specific value="1" description="YPR 765 PRI" uuid="c6087678-5269-11df-87b4-080069138b88" uid="10149"/>
-        <specific value="2" description="YPR 765 PRCO-B command vehicle" uuid="c6098676-5269-11df-ae84-080069138b88" uid="10150"/>
-        <specific value="3" description="YPR 765 PRCO-C1 to C5" uuid="c60a9444-5269-11df-a547-080069138b88" uid="10151"/>
-        <specific value="4" description="YPR 765 PRRDR radar vehicle" uuid="c60ba852-5269-11df-bf29-080069138b88" uid="10152"/>
-        <specific value="5" description="YPR 765 PRRDR-C radar/command vehicle" uuid="c60cb896-5269-11df-a15a-080069138b88" uid="10153"/>
-        <specific value="6" description="YPR 765 PRGWT ambulance" uuid="c60dc3ee-5269-11df-967c-080069138b88" uid="10154"/>
-        <specific value="7" description="YPR 765 PRI/I" uuid="c60ed7c0-5269-11df-92a1-080069138b88" uid="10155"/>
-        <specific value="8" description="YPR 765 PRMR mortar tractor" uuid="c60fe700-5269-11df-97b6-080069138b88" uid="10156"/>
-        <specific value="9" description="YPR 765 PRVR-A cargo vehicle" uuid="c610f046-5269-11df-b4bc-080069138b88" uid="10157"/>
-        <specific value="10" description="YPR 765 PRVR-B cargo vehicle" uuid="c61203d2-5269-11df-9687-080069138b88" uid="10158"/>
-        <specific value="11" description="YPR 765 PRAT" uuid="c61318a8-5269-11df-9161-080069138b88" uid="10159"/>
-      </subcategory>
-      <subcategory value="7" description="FMC Lynx (or M113) Command and Reconnaissance Vehicle" uuid="c614c734-5269-11df-95df-080069138b88" uid="10160"/>
-      <subcategory value="8" description="M981 FIST-V" uuid="c615d354-5269-11df-be0b-080069138b88" uid="10161"/>
-      <subcategory value="9" description="M106 mortar carrier" uuid="c616e6fe-5269-11df-ba95-080069138b88" uid="10162">
-        <specific value="1" description="M106 107-mm" uuid="c617f6de-5269-11df-b673-080069138b88" uid="10163"/>
-        <specific value="2" description="M106A1 107-mm" uuid="c6190010-5269-11df-bcd3-080069138b88" uid="10164"/>
-        <specific value="3" description="M106A2 107-mm" uuid="c61a1162-5269-11df-b060-080069138b88" uid="10165"/>
-        <specific value="4" description="M1064 120-mm" uuid="c61b2b9c-5269-11df-bbf9-080069138b88" uid="10166"/>
-        <specific value="5" description="M1064A2" status="new" uuid="4ffbc4d2-3e94-4cf3-b7bb-1702354b2d3b" uid="22859">
-          <cr value="2225"/>
-        </specific>
-        <specific value="6" description="M1064A3" status="new" uuid="db72c0ca-3bee-4b84-bb29-0a2a9eb63c2b" uid="22860">
-          <cr value="2225"/>
-        </specific>
-      </subcategory>
-      <subcategory value="10" description="Electronics &amp; Space Corp M901 ITV" uuid="c61ce0ae-5269-11df-b28f-080069138b88" uid="10167">
-        <specific value="1" description="M901" uuid="c61deb3e-5269-11df-b5fd-080069138b88" uid="10168"/>
-        <specific value="2" description="M901A1" uuid="c61ef984-5269-11df-b001-080069138b88" uid="10169"/>
-        <specific value="3" description="M901A3" status="new" uuid="ab52c7a5-9025-459e-8b7a-cb5fed1b3a38" uid="22861">
-          <cr value="2225"/>
-        </specific>
-      </subcategory>
-      <subcategory value="11" description="M125 81-mm mortar carrier" uuid="c620ac20-5269-11df-b61b-080069138b88" uid="10170">
-        <specific value="1" description="M125A1" uuid="c621bb92-5269-11df-a393-080069138b88" uid="10171"/>
-        <specific value="2" description="M125A2" uuid="c622c69a-5269-11df-b05b-080069138b88" uid="10172"/>
-      </subcategory>
-      <subcategory value="12" description="Cadillac Gage V-600 Armored Car" uuid="c62477c4-5269-11df-8fbe-080069138b88" uid="10173"/>
-      <subcategory value="13" description="Cadillac Gage LAV Assault Gun LAV-105" uuid="c62589ac-5269-11df-911e-080069138b88" uid="10174"/>
-      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="c6269bd0-5269-11df-b06f-080069138b88" uid="10175"/>
-      <subcategory value="15" description="LAV-105" uuid="c627a71e-5269-11df-b076-080069138b88" uid="10176"/>
-      <subcategory value="16" description="Chrysler MAC-1 armored car" uuid="c628b776-5269-11df-a740-080069138b88" uid="10177"/>
-      <subcategory value="17" description="Cadillac Gage Commando Scout" uuid="c629cd5a-5269-11df-8701-080069138b88" uid="10178"/>
-      <subcategory value="18" description="Cadillac Gage Commando V-300" uuid="c62ad894-5269-11df-b4ca-080069138b88" uid="10179">
-        <specific value="1" description="V-300 w/ TOW" uuid="c62be9a0-5269-11df-909c-080069138b88" uid="10180"/>
-        <specific value="2" description="V-300 w/ 81-mm mortar" uuid="c62cf93a-5269-11df-ae7e-080069138b88" uid="10181"/>
-        <specific value="3" description="V-300 ambulance" uuid="c62e080c-5269-11df-8935-080069138b88" uid="10182"/>
-      </subcategory>
-      <subcategory value="19" description="Cadillac Gage Commando V-150" uuid="c62fb7ba-5269-11df-8193-080069138b88" uid="10183">
-        <specific value="1" description="Commando w/ MG turret" uuid="c630c830-5269-11df-8fe1-080069138b88" uid="10184"/>
-        <specific value="2" description="Commando w/ 1-m MG turret" uuid="c631d928-5269-11df-a0ef-080069138b88" uid="10185"/>
-        <specific value="3" description="Commando w/ 1-m 20-mm turret" uuid="c632e804-5269-11df-92ae-080069138b88" uid="10186"/>
-        <specific value="4" description="Commando w/ 20-mm turret" uuid="c633f816-5269-11df-9753-080069138b88" uid="10187"/>
-        <specific value="5" description="Commando w/ 25-mm turret" uuid="c63506e8-5269-11df-97ca-080069138b88" uid="10188"/>
-        <specific value="6" description="Commando w/ 40-mm/12.7-mm turret" uuid="c636122c-5269-11df-bc46-080069138b88" uid="10189"/>
-        <specific value="7" description="Commando V-150 S" uuid="c637266c-5269-11df-a714-080069138b88" uid="10190"/>
-        <specific value="8" description="Commando air defense vehicle" uuid="c6383610-5269-11df-87d6-080069138b88" uid="10191"/>
-        <specific value="9" description="Commando with 76-mm turret-mounted gun" uuid="c639414a-5269-11df-9c0f-080069138b88" uid="10192"/>
-        <specific value="10" description="Commando with 90-mm turret-mounted gun" uuid="c63a6034-5269-11df-899c-080069138b88" uid="10193"/>
-        <specific value="11" description="Commando with 81-mm mortar" uuid="c63b71cc-5269-11df-b2bc-080069138b88" uid="10194"/>
-        <specific value="12" description="Commando with TOW" uuid="c63c827e-5269-11df-b95b-080069138b88" uid="10195"/>
-        <specific value="13" description="Commando command vehicle" uuid="c63d8c96-5269-11df-848c-080069138b88" uid="10196"/>
-        <specific value="14" description="Base security vehicle" uuid="c63ea13a-5269-11df-a1d1-080069138b88" uid="10197"/>
-        <specific value="15" description="Malaysian upgraded V-150 Commando" uuid="c63fb20a-5269-11df-b72a-080069138b88" uid="10198"/>
-      </subcategory>
-      <subcategory value="20" description="AV Technology Corporation Dragoon" uuid="c641660e-5269-11df-965c-080069138b88" uid="10199">
-        <specific value="1" description="APC" uuid="c642709e-5269-11df-b183-080069138b88" uid="10200"/>
-        <specific value="2" description="ASV-XC extended cab" uuid="c643807e-5269-11df-8db9-080069138b88" uid="10201"/>
-        <specific value="3" description="Dragoon Armored Command Vehicle (ACV)" uuid="c6449144-5269-11df-9bdf-080069138b88" uid="10202"/>
-        <specific value="4" description="Dragoon Armored Mortar Carrier (AMC)" uuid="c645a05c-5269-11df-9752-080069138b88" uid="10203"/>
-        <specific value="5" description="Dragoon TOW Carrier" uuid="c646af74-5269-11df-b6b5-080069138b88" uid="10204"/>
-      </subcategory>
-      <subcategory value="21" description="Half-track APCs" uuid="c6485edc-5269-11df-af6f-080069138b88" uid="10205"/>
-      <subcategory value="22" description="Cadillac Gage Commando Ranger APC" uuid="c64971be-5269-11df-8a7e-080069138b88" uid="10206"/>
-      <subcategory value="23" description="Vehicle Sys Development Corp Lancer Armored Patrol Vehicle (APV)" uuid="c64a82ca-5269-11df-8892-080069138b88" uid="10207"/>
-      <subcategory value="24" description="AAI Propulsion System Demonstrator Amphibious Assault Vehicle (AAV)" uuid="c64b962e-5269-11df-a867-080069138b88" uid="10208"/>
-      <subcategory value="25" description="Advanced AAV" uuid="c64cb6b2-5269-11df-8424-080069138b88" uid="10209"/>
-      <subcategory value="26" description="FMC AAV7A1 (LVTP7A1)" uuid="c64dc4e4-5269-11df-b151-080069138b88" uid="10210">
-        <specific value="1" description="AAVC7A1 command vehicle" uuid="c64ed4ec-5269-11df-98a9-080069138b88" uid="10211"/>
-        <specific value="2" description="AAVR7A1 recovery vehicle" uuid="c64fe652-5269-11df-b757-080069138b88" uid="10212"/>
-        <specific value="3" description="AAV7A1 with mine plow" uuid="c650f114-5269-11df-89c9-080069138b88" uid="10213"/>
-        <specific value="4" description="AAV7A1 with VEMASID" uuid="c652031a-5269-11df-befc-080069138b88" uid="10214"/>
-        <specific value="5" description="AAV7A1 with mine-clearance-system kit" uuid="c65318b8-5269-11df-be48-080069138b88" uid="10215"/>
-        <specific value="6" description="AAVP7A1" uuid="c6542320-5269-11df-a40d-080069138b88" uid="10216"/>
-      </subcategory>
-      <subcategory value="27" description="LVTP5A1 Armored AAV" uuid="c655d15c-5269-11df-978d-080069138b88" uid="10217">
-        <specific value="1" description="LVTC5 (Command, Model 5)" uuid="c656e1e6-5269-11df-a3ea-080069138b88" uid="10218"/>
-        <specific value="2" description="LVTE1 (Engineer, Model 1)" uuid="c657f5f4-5269-11df-b001-080069138b88" uid="10219"/>
-        <specific value="3" description="LVTH6 (Howitzer, Model 6)" uuid="c659099e-5269-11df-affd-080069138b88" uid="10220"/>
-        <specific value="4" description="LVTR1 (Recovery, Model 1)" uuid="c65a1b40-5269-11df-a638-080069138b88" uid="10221"/>
-      </subcategory>
-      <subcategory value="28" description="Composite Armored Vehicle (CAV)" uuid="c65bf460-5269-11df-90dc-080069138b88" uid="10222"/>
-      <subcategory value="29" description="(deprecated)" deprecated="1" uuid="c65d0b98-5269-11df-94f9-080069138b88" uid="10223"/>
-      <subcategory value="30" description="M93 Armored Reconnaissance Vehicle" uuid="c65e22bc-5269-11df-a659-080069138b88" uid="10224">
-        <specific value="1" description="M93A1 Fox" status="new" uuid="902e2505-ac5d-475a-b050-15c661f82401" uid="22862">
-          <cr value="2225"/>
-        </specific>
-      </subcategory>
-      <subcategory value="31" description="M1117 Armored Security Vehicle" uuid="c65f2fa4-5269-11df-a8f6-080069138b88" uid="10225"/>
-      <subcategory value="32" description="FCS Infantry Combat Vehicle" uuid="c6604010-5269-11df-b214-080069138b88" uid="10226"/>
-      <subcategory value="33" description="FCS Armed Robotic Vehicle - RSTA" uuid="c6615360-5269-11df-8be2-080069138b88" uid="10227"/>
-      <subcategory value="34" description="FCS Armed Robotic Vehicle - Assault" uuid="c66263c2-5269-11df-b00a-080069138b88" uid="10228"/>
-      <subcategory value="35" description="FCS Armed Robotic Vehicle - Light" uuid="c66374b0-5269-11df-aeeb-080069138b88" uid="10229"/>
-      <subcategory value="36" description="FCS Recon and Surveillance Vehicle" uuid="c6648724-5269-11df-aa9c-080069138b88" uid="10230"/>
-      <subcategory value="37" description="FCS Command &amp; Control Vehicle" uuid="c6659498-5269-11df-b762-080069138b88" uid="10231"/>
-      <subcategory value="38" description="FCS Medical Vehicle - Evacuation" uuid="c666a9aa-5269-11df-893e-080069138b88" uid="10232"/>
-    </category>
-    <category value="3" description="Armored utility vehicle" uuid="c6685bd8-5269-11df-aab8-080069138b88" uid="10233">
-      <subcategory value="1" description="M88 medium recovery vehicle" uuid="c669699c-5269-11df-b976-080069138b88" uid="10234">
-        <specific value="1" description="M88A1" uuid="c66a7774-5269-11df-ac6b-080069138b88" uid="10235"/>
-        <specific value="2" description="M88A2" uuid="c66b8538-5269-11df-9b15-080069138b88" uid="10236"/>
-        <specific value="3" description="M88A1E1" uuid="c66c92d4-5269-11df-894c-080069138b88" uid="10237"/>
-      </subcategory>
-      <subcategory value="2" description="M578 light armored recovery vehicle" uuid="c66e44f8-5269-11df-9c99-080069138b88" uid="10238"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="c66f5136-5269-11df-8024-080069138b88" uid="10239"/>
-      <subcategory value="4" description="AVLB" uuid="c6706256-5269-11df-9269-080069138b88" uid="10240">
-        <specific value="1" description="M1 AVLB bridge layer" uuid="c671743e-5269-11df-bb15-080069138b88" uid="10241"/>
-        <specific value="2" description="M60 AVLB" uuid="c6727e56-5269-11df-b7de-080069138b88" uid="10242"/>
-        <specific value="3" description="M48 AVLB" uuid="c6738d6e-5269-11df-a2bc-080069138b88" uid="10243"/>
-        <specific value="4" description="M60 AVLB w/o bridge" uuid="c6749d94-5269-11df-bbdf-080069138b88" uid="10244"/>
-        <specific value="5" description="M104 Wolverine" uuid="c675a644-5269-11df-a073-080069138b88" uid="10245"/>
-      </subcategory>
-      <subcategory value="5" description="M728 combat engineer vehicle" uuid="c6776114-5269-11df-b468-080069138b88" uid="10246"/>
-      <subcategory value="6" description="M9 armored combat earthmover" uuid="c6787446-5269-11df-8f30-080069138b88" uid="10247"/>
-      <subcategory value="7" description="Cadillac Gage Commando V-150 Recovery Vehicle" uuid="c67988b8-5269-11df-acb7-080069138b88" uid="10248"/>
-      <subcategory value="8" description="AV Technology Corporation Dragoon" uuid="c67a9c94-5269-11df-a4b2-080069138b88" uid="10249">
-        <specific value="1" description="Armored Logistics Support Vehicle (ALSV)" uuid="c67bb4da-5269-11df-bebd-080069138b88" uid="10250"/>
-      </subcategory>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="c67d6c08-5269-11df-bcfd-080069138b88" uid="10251"/>
-      <subcategory value="10" description="M113/M113A1/M113A2 bulldozer" uuid="c67e7e36-5269-11df-9e38-080069138b88" uid="10252"/>
-      <subcategory value="11" description="M577/M577A1/M577A2 command post" uuid="c67f8aba-5269-11df-8cb6-080069138b88" uid="10253">
-        <specific value="1" description="M577 Command Post (MLRS Bn CP)" uuid="c6809afe-5269-11df-909b-080069138b88" uid="10254"/>
-        <specific value="2" description="M577 Command Post (MLRS Btry CP)" uuid="c681affc-5269-11df-8b70-080069138b88" uid="10255"/>
-        <specific value="3" description="M577A2 FDC" status="new" uuid="fd57c53c-1ebf-41fc-b2b7-7d3a08bfddca" uid="22863">
-          <cr value="2227"/>
-        </specific>
-        <specific value="4" description="M577A3" status="new" uuid="b6e305f7-b6fb-4904-9e77-eb83eb1605f6" uid="22864">
-          <cr value="2227"/>
-        </specific>
-      </subcategory>
-      <subcategory value="12" description="Stretched M577A2E2 command post" uuid="c6836176-5269-11df-a758-080069138b88" uid="10256"/>
-      <subcategory value="13" description="M1068" uuid="c6846ea4-5269-11df-94ff-080069138b88" uid="10257" status="new">
-        <cr value="2227"/>
-        <specific value="1" description="M1068A3 SICPS" status="new" uuid="76f14bc0-e647-460e-930b-4e160ad9a9b7" uid="22865">
-          <cr value="2227"/>
-        </specific>
-      </subcategory>
-      <subcategory value="14" description="FMC (M113) APC ambulance" uuid="c6857efc-5269-11df-8c5f-080069138b88" uid="10258"/>
-      <subcategory value="15" description="M113A2 recovery vehicle" uuid="c68693be-5269-11df-a266-080069138b88" uid="10259"/>
-      <subcategory value="16" description="Abrams Recovery Vehicle" uuid="c687a1d2-5269-11df-aeeb-080069138b88" uid="10260"/>
-      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="c688b27a-5269-11df-9495-080069138b88" uid="10261"/>
-      <subcategory value="18" description="Fitter's vehicle" uuid="c689c44e-5269-11df-aea2-080069138b88" uid="10262"/>
-      <subcategory value="19" description="Armored Maintenance Vehicle (AMV)" uuid="c68ad3fc-5269-11df-9f28-080069138b88" uid="10263"/>
-      <subcategory value="20" description="M1059 smoke-generating system" uuid="c68be5bc-5269-11df-98a2-080069138b88" uid="10264"/>
-      <subcategory value="21" description="Armored Bulldozer, D7 MCAP" uuid="c68cf70e-5269-11df-b92d-080069138b88" uid="10265"/>
-      <subcategory value="22" description="Armored Bulldozer, D9R" uuid="c68e025c-5269-11df-8042-080069138b88" uid="10266"/>
-      <subcategory value="23" description="Armored Obstacle Breacher, Grizzly" uuid="c68f14d0-5269-11df-bacc-080069138b88" uid="10267"/>
-      <subcategory value="24" description="Deployable Universal Combat Earthmover (DEUCE)" uuid="c6902b68-5269-11df-8b87-080069138b88" uid="10268"/>
-      <subcategory value="25" description="FCS Recovery and Maintenance Vehicle" uuid="c6913792-5269-11df-9637-080069138b88" uid="10269"/>
-    </category>
-    <category value="4" description="Self-propelled artillery" uuid="c692e70e-5269-11df-8e8a-080069138b88" uid="10270">
-      <subcategory value="1" description="M270 Multiple Launch Rocket System (MLRS)" uuid="c693f928-5269-11df-b1df-080069138b88" uid="10271">
-        <specific value="1" description="ATACMS" uuid="c6950ebc-5269-11df-9fde-080069138b88" uid="10272"/>
-      </subcategory>
-      <subcategory value="2" description="M110 203-mm (8-inch) SP Howitzer" uuid="c696c824-5269-11df-b550-080069138b88" uid="10273">
-        <specific value="1" description="M110" uuid="c697d250-5269-11df-86b9-080069138b88" uid="10274"/>
-        <specific value="2" description="M110A2" uuid="c698e2da-5269-11df-8bd7-080069138b88" uid="10275"/>
-      </subcategory>
-      <subcategory value="3" description="M109 155-mm SP Howitzer" uuid="c69a942c-5269-11df-8cd4-080069138b88" uid="10276">
-        <specific value="1" description="M109" uuid="c69ba3d0-5269-11df-b750-080069138b88" uid="10277"/>
-        <specific value="2" description="M109A1" uuid="c69cabd6-5269-11df-815d-080069138b88" uid="10278"/>
-        <specific value="3" description="M109A2" uuid="c69dbc88-5269-11df-8b3f-080069138b88" uid="10279"/>
-        <specific value="4" description="M109A3" uuid="c69ed000-5269-11df-87ec-080069138b88" uid="10280"/>
-        <specific value="5" description="M109A4" uuid="c69fd7e8-5269-11df-ad21-080069138b88" uid="10281"/>
-        <specific value="6" description="M109A5" uuid="c6a0e69c-5269-11df-9184-080069138b88" uid="10282"/>
-        <specific value="7" description="M109A6" uuid="c6a1f65e-5269-11df-9e57-080069138b88" uid="10283"/>
-        <specific value="8" description="M109L" uuid="c6a30080-5269-11df-9860-080069138b88" uid="10284"/>
-      </subcategory>
-      <subcategory value="4" description="Ground Launched Cruise Missile (GLCM) launcher" deprecated="1" uuid="c6a4b326-5269-11df-9128-080069138b88" uid="10285"/>
-      <subcategory value="5" description="M163 Vulcan Anti aircraft gun" deprecated="1" uuid="c6a5c662-5269-11df-aa4c-080069138b88" uid="10286"/>
-      <subcategory value="6" description="M107-175 mm gun" uuid="c6a6da7a-5269-11df-a51c-080069138b88" uid="10287"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="c6a7e6a4-5269-11df-ad8d-080069138b88" uid="10288"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="c6a8f5da-5269-11df-9af6-080069138b88" uid="10289"/>
-      <subcategory value="9" description="155-mm SP Howitzer XM2001 Crusader" uuid="c6aa0b8c-5269-11df-bd10-080069138b88" uid="10290"/>
-      <subcategory value="10" description="Liquid-propellant Artillery System" uuid="c6ab1a04-5269-11df-afc4-080069138b88" uid="10291"/>
-      <subcategory value="11" description="M42 twin 40-mm SP anti-aircraft gun" deprecated="1" uuid="c6ac2cf0-5269-11df-80f2-080069138b88" uid="10292"/>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="c6ad4356-5269-11df-9aec-080069138b88" uid="10293"/>
-      <subcategory value="13" description="General Electric Vulcan-Commando 20-mm SP Air Defense (AD) system" deprecated="1" uuid="c6ae503e-5269-11df-87c5-080069138b88" uid="10294"/>
-      <subcategory value="14" description="Boeing Avenger pedestal-mounted Stinger SP AD System" deprecated="1" uuid="c6af65f0-5269-11df-b65a-080069138b88" uid="10295"/>
-      <subcategory value="15" description="Raytheon/Loral Aeronutronic Saber AD missile system" deprecated="1" uuid="c6b07d1e-5269-11df-bb59-080069138b88" uid="10296"/>
-      <subcategory value="16" description="LTV Crossbow pedestal-mounted weapon system" deprecated="1" uuid="c6b18d94-5269-11df-9ce4-080069138b88" uid="10297"/>
-      <subcategory value="17" description="Fiber Optic Guided Missile (FOG-M)" uuid="c6b29fcc-5269-11df-a858-080069138b88" uid="10298"/>
-      <subcategory value="18" description="Loral Aeronutronic M48 Chaparral" deprecated="1" uuid="c6b3b290-5269-11df-b578-080069138b88" uid="10299">
-        <specific value="1" description="M48" deprecated="1" uuid="c6b4cb62-5269-11df-9707-080069138b88" uid="10300"/>
-        <specific value="2" description="M48A1" deprecated="1" uuid="c6b5dc14-5269-11df-9e58-080069138b88" uid="10301"/>
-        <specific value="3" description="M48A2" deprecated="1" uuid="c6b6ed16-5269-11df-bbf7-080069138b88" uid="10302"/>
-        <specific value="4" description="M48A3" deprecated="1" uuid="c6b820e6-5269-11df-a5d9-080069138b88" uid="10303"/>
-      </subcategory>
-      <subcategory value="19" description="Block VII Low-Altitude SAM System" deprecated="1" uuid="c6b9dbb6-5269-11df-a7b3-080069138b88" uid="10304"/>
-      <subcategory value="20" description="Loral Aeronutronic SAM System" deprecated="1" uuid="c6baea6a-5269-11df-bdae-080069138b88" uid="10305"/>
-      <subcategory value="21" description="Electronic &amp; Space Corp Ground-Launched Hellfire: Heavy (GLH:H)" uuid="c6bc01f2-5269-11df-9e48-080069138b88" uid="10306"/>
-      <subcategory value="22" description="Line-of-Sight Anti-Tank (LOSAT)" uuid="c6bd14de-5269-11df-bfa8-080069138b88" uid="10307"/>
-      <subcategory value="23" description="RGM-84 Harpoon Launcher" uuid="c6be2112-5269-11df-8205-080069138b88" uid="10308"/>
-      <subcategory value="24" description="HIMARS" uuid="c6bf34d0-5269-11df-9d2e-080069138b88" uid="10309"/>
-      <subcategory value="25" description="FCS NLOS - Cannon" uuid="c6c04410-5269-11df-8139-080069138b88" uid="10310"/>
-      <subcategory value="26" description="FCS NLOS - Mortar" uuid="c6c14e00-5269-11df-bdd3-080069138b88" uid="10311"/>
-    </category>
-    <category value="5" description="Towed artillery" uuid="c6c300ec-5269-11df-98bb-080069138b88" uid="10312">
-      <subcategory value="1" description="M114 155-mm Howitzer" uuid="c6c40ff0-5269-11df-8d8b-080069138b88" uid="10313"/>
-      <subcategory value="2" description="M198 155-mm towed Howitzer" uuid="c6c52066-5269-11df-b867-080069138b88" uid="10314"/>
-      <subcategory value="3" description="M101 105-mm Howitzer" uuid="c6c62c36-5269-11df-9753-080069138b88" uid="10315">
-        <specific value="1" description="M101" uuid="c6c73db0-5269-11df-b9a5-080069138b88" uid="10316"/>
-        <specific value="2" description="M101A1" uuid="c6c850d8-5269-11df-9a2d-080069138b88" uid="10317"/>
-      </subcategory>
-      <subcategory value="4" description="M119 105-mm light Howitzer" uuid="c6ca005e-5269-11df-b41b-080069138b88" uid="10318"/>
-      <subcategory value="5" description="M115 8-inch Howitzer" uuid="c6cb0b52-5269-11df-a258-080069138b88" uid="10319"/>
-      <subcategory value="6" description="XM777 155-mm Lightweight Towed Howitzer" uuid="c6cc1e02-5269-11df-a0be-080069138b88" uid="10320"/>
-      <subcategory value="7" description="M59 155-mm gun" uuid="c6cd33be-5269-11df-9bfb-080069138b88" uid="10321"/>
-      <subcategory value="8" description="M102 105-mm Howitzer" uuid="c6ce3dfe-5269-11df-8536-080069138b88" uid="10322"/>
-      <subcategory value="9" description="M1 40-mm Automatic Anti aircraft gun" deprecated="1" uuid="c6cf4e56-5269-11df-ac04-080069138b88" uid="10323"/>
-      <subcategory value="10" description="M167 20-mm Vulcan Anti aircraft gun" deprecated="1" uuid="c6d0630e-5269-11df-a71f-080069138b88" uid="10324"/>
-      <subcategory value="11" description="M55 12.7-mm (Quad) Anti aircraft MG" deprecated="1" uuid="c6d17550-5269-11df-b6b5-080069138b88" uid="10325"/>
-      <subcategory value="12" description="MIM 23 Raytheon Hawk Low-to-Medium Altitude SAM System" deprecated="1" uuid="c6d2895e-5269-11df-b770-080069138b88" uid="10326">
-        <specific value="1" description="Battalion" deprecated="1" uuid="c6d3a3a2-5269-11df-8b3a-080069138b88" uid="10327">
-          <extra value="1" description="Hawk BN/ADCP" deprecated="1" uuid="c6d4b12a-5269-11df-af38-080069138b88" uid="10328"/>
-        </specific>
-        <specific value="2" description="Battery" deprecated="1" uuid="c6d665b0-5269-11df-9845-080069138b88" uid="10329">
-          <extra value="1" description="Hawk BCP" deprecated="1" uuid="c6d77540-5269-11df-be63-080069138b88" uid="10330"/>
-          <extra value="2" description="Hawk CWAR" deprecated="1" uuid="c6d884bc-5269-11df-9b83-080069138b88" uid="10331"/>
-          <extra value="3" description="Hawk HPI" deprecated="1" uuid="c6d9938e-5269-11df-b3ec-080069138b88" uid="10332"/>
-          <extra value="4" description="Hawk Lehr" deprecated="1" uuid="c6daa3fa-5269-11df-a3f1-080069138b88" uid="10333"/>
-        </specific>
-      </subcategory>
-      <subcategory value="13" description="MIM 104 Raytheon Patriot High-to-Medium Altitude Air Defense (HIMAD) System" deprecated="1" uuid="c6dcf614-5269-11df-96a6-080069138b88" uid="10334">
-        <specific value="1" description="Patriot Command Center" deprecated="1" uuid="c6de0c8e-5269-11df-80f4-080069138b88" uid="10335">
-          <extra value="1" description="Patriot ICC" deprecated="1" uuid="c6df1d86-5269-11df-bb9c-080069138b88" uid="10336"/>
-          <extra value="2" description="Patriot BTOC" deprecated="1" uuid="c6e02d7a-5269-11df-af4b-080069138b88" uid="10337"/>
-        </specific>
-        <specific value="2" description="Patriot Battery" deprecated="1" uuid="c6e1e084-5269-11df-9de6-080069138b88" uid="10338">
-          <extra value="1" description="Patriot ECS" deprecated="1" uuid="c6e2eaec-5269-11df-9953-080069138b88" uid="10339"/>
-          <extra value="2" description="Patriot LS" deprecated="1" uuid="c6e3fb76-5269-11df-bd33-080069138b88" uid="10340"/>
-        </specific>
-      </subcategory>
-      <subcategory value="14" description="MIM 14B Nike Hercules SAM System" deprecated="1" uuid="c6e65db2-5269-11df-9cef-080069138b88" uid="10341"/>
-      <subcategory value="15" description="M993 70-mm Rapid Deployment Multiple Launch Rocket System (MLRS)" uuid="c6e771ca-5269-11df-861c-080069138b88" uid="10342"/>
-      <subcategory value="16" description="Theatre-High Altitude Area Defense(THAAD) System" deprecated="1" uuid="c6e88a2e-5269-11df-bb96-080069138b88" uid="10343">
-        <specific value="1" description="THAAD Battery TOC" deprecated="1" uuid="c6e99cfc-5269-11df-99e2-080069138b88" uid="10344"/>
-        <specific value="2" description="THAAD Radar" deprecated="1" uuid="c6eaa926-5269-11df-b2b8-080069138b88" uid="10345"/>
-        <specific value="3" description="THAAD Launcher" deprecated="1" uuid="c6ebbdca-5269-11df-8d5f-080069138b88" uid="10346"/>
-      </subcategory>
-      <subcategory value="17" description="FCS NLOS-LS-Launcher" uuid="c6ed6e54-5269-11df-aaf8-080069138b88" uid="10347"/>
-    </category>
-    <category value="6" description="Small wheeled utility vehicle" uuid="c6ef1cfe-5269-11df-a8da-080069138b88" uid="10348">
-      <subcategory value="1" description="LTV HMMWV M998-series multipurpose wheeled vehicles" uuid="c6f031ca-5269-11df-a8dd-080069138b88" uid="10349">
-        <specific value="1" description="M998 cargo/troop carrier without winch" uuid="c6f13e9e-5269-11df-aa1c-080069138b88" uid="10350"/>
-        <specific value="2" description="M1038 cargo/troop carrier with winch" uuid="c6f258ba-5269-11df-8268-080069138b88" uid="10351"/>
-        <specific value="3" description="M966 TOW missile carrier, basic armor, without winch" uuid="c6f36f0c-5269-11df-9ef0-080069138b88" uid="10352"/>
-        <specific value="4" description="M1036 TOW missile carrier, basic armor, with winch" uuid="c6f47cb2-5269-11df-a515-080069138b88" uid="10353"/>
-        <specific value="5" description="M1045 TOW missile carrier, supplemental armor, without winch" uuid="c6f59246-5269-11df-abcd-080069138b88" uid="10354"/>
-        <specific value="6" description="M1046 TOW missile carrier, supplemental armor, with winch" uuid="c6f6a8de-5269-11df-8441-080069138b88" uid="10355"/>
-        <specific value="7" description="M1025 armament carrier, basic armor, without winch" uuid="c6f7b666-5269-11df-8e2f-080069138b88" uid="10356"/>
-        <specific value="8" description="M1026 armament carrier, basic armor, with winch" uuid="c6f8ca7e-5269-11df-8d1d-080069138b88" uid="10357">
-          <extra value="1" description="M1026 CROWS" status="new" uuid="0a2d8594-8fb4-4584-a70c-3bf9434e6b0d" uid="22866">
-            <cr value="2230"/>
-          </extra>
-        </specific>
-        <specific value="9" description="M1043 armament carrier, supplemental armor, without winch" uuid="c6f9df68-5269-11df-8ec3-080069138b88" uid="10358"/>
-        <specific value="10" description="M1044 armament carrier, supplemental armor, with winch" uuid="c6faf164-5269-11df-85f8-080069138b88" uid="10359"/>
-        <specific value="11" description="M996 mini-ambulance, 2-litter, basic armor" uuid="c6fc03ce-5269-11df-b043-080069138b88" uid="10360"/>
-        <specific value="12" description="M997 maxi-ambulance, 4-litter, basic armor" uuid="c6fd1638-5269-11df-96d0-080069138b88" uid="10361"/>
-        <specific value="13" description="M1035 soft-top ambulance, 2-litter" uuid="c6fe271c-5269-11df-9504-080069138b88" uid="10362"/>
-        <specific value="14" description="M1037 S-250 shelter carrier, without winch" uuid="c6ff3846-5269-11df-909a-080069138b88" uid="10363"/>
-        <specific value="15" description="M1042 S-250 shelter carrier, with winch" uuid="c7004a2e-5269-11df-be83-080069138b88" uid="10364"/>
-        <specific value="16" description="M1069 tractor for M119 105-mm light gun" uuid="c7015540-5269-11df-acb6-080069138b88" uid="10365"/>
-        <specific value="17" description="M1025 Armament carrier, basic armor w/o winch, w/MK 19 40-mm grenade launcher" uuid="c7026d0e-5269-11df-bfdc-080069138b88" uid="10366"/>
-        <specific value="18" description="M1025 Armament carrier, basic armor w/o winch, w/M2 .50 cal heavy machine gun" uuid="c70386ee-5269-11df-99bb-080069138b88" uid="10367"/>
-        <specific value="19" description="M1025 armament carrier, basic armor w/o winch, w/M-60 7.62 mm medium machine gun" uuid="c7049746-5269-11df-a902-080069138b88" uid="10368"/>
-        <specific value="20" description="M707 Striker" uuid="c705ab18-5269-11df-bfaa-080069138b88" uid="10369"/>
-        <specific value="21" description="M1114 armament carrier, armored" uuid="c706bc60-5269-11df-af0b-080069138b88" uid="10370">
-          <extra value="1" description="M1114 w/ M240" status="new" uuid="6292f633-f553-4f76-adae-832f7daaf3c3" uid="22867">
-            <cr value="2230"/>
-          </extra>
-          <extra value="2" description="M1114 w/ .50 Cal" status="new" uuid="41d32f04-e2d4-4871-86e7-b5bafd5d634a" uid="22868">
-            <cr value="2230"/>
-          </extra>
-        </specific>
-        <specific value="22" description="HMMWV w/M56 Coyote Smoke Generator" uuid="c707cb82-5269-11df-9586-080069138b88" uid="10371"/>
-        <specific value="23" description="HMMWV w/M31 Biological Integrated Detection System (BIDS)" uuid="c708dd92-5269-11df-81da-080069138b88" uid="10372"/>
-        <specific value="24" description="HMMWV w/M157 Smoke Generator" uuid="c709eeda-5269-11df-947f-080069138b88" uid="10373"/>
-        <specific value="31" description="M997A2 Ambulance" status="new" uuid="b05fec3b-e0d4-4bee-85da-b12ba3f0bf60" uid="22869">
-          <cr value="2230"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="Warrior NMC-40 Long-range Fast Attack Vehicle (FAV)" uuid="c70ba5a4-5269-11df-a24b-080069138b88" uid="10374"/>
-      <subcategory value="3" description="Chenowith FAV/Light Strike Vehicle (LSV)" uuid="c70cb264-5269-11df-85d7-080069138b88" uid="10375"/>
-      <subcategory value="4" description="M58/M59 Mine-clearing charge (MICLIC) (towed)" uuid="c70dc3f2-5269-11df-ba05-080069138b88" uid="10376">
-        <specific value="1" description="M58A3 w/rocket" uuid="c70ed4fe-5269-11df-9c81-080069138b88" uid="10377"/>
-        <specific value="2" description="M58A4" uuid="c70fe268-5269-11df-9104-080069138b88" uid="10378"/>
-        <specific value="3" description="M59" uuid="c710f8d8-5269-11df-91f0-080069138b88" uid="10379"/>
-        <specific value="4" description="M58A3 w/o rocket" uuid="c7120a84-5269-11df-9287-080069138b88" uid="10380"/>
-      </subcategory>
-      <subcategory value="5" description="Teledyne 4x4 725-kg light forces vehicle" uuid="c713e49e-5269-11df-89b1-080069138b88" uid="10381"/>
-      <subcategory value="6" description="TPC 4x4 909-kg Rapid Multi-purpose Vehicle (RAMP-V)" uuid="c714f852-5269-11df-9184-080069138b88" uid="10382"/>
-      <subcategory value="7" description="M151 4x4 362-kg light vehicle and variants" uuid="c71606ca-5269-11df-a119-080069138b88" uid="10383"/>
-      <subcategory value="8" description="Jeep 4x4 light vehicle" uuid="c7171cf4-5269-11df-bbaa-080069138b88" uid="10384"/>
-      <subcategory value="9" description="Jeep XJ 4x4 light truck/wagon series" uuid="c7182df6-5269-11df-b9e3-080069138b88" uid="10385"/>
-      <subcategory value="10" description="M38-series 4x4 363-kg light vehicle (CJ-3A)" uuid="c71939d0-5269-11df-98af-080069138b88" uid="10386"/>
-      <subcategory value="11" description="Cargo truck and variants: 4x4, 680-kg" uuid="c71a5108-5269-11df-af0c-080069138b88" uid="10387">
-        <specific value="1" description="M37" uuid="c71b625a-5269-11df-9fed-080069138b88" uid="10388"/>
-        <specific value="2" description="M42" uuid="c71c6aa6-5269-11df-aad4-080069138b88" uid="10389"/>
-        <specific value="3" description="M43" uuid="c71d784c-5269-11df-abda-080069138b88" uid="10390"/>
-        <specific value="4" description="M201" uuid="c71e899e-5269-11df-b6f4-080069138b88" uid="10391"/>
-      </subcategory>
-      <subcategory value="12" description="Stewart &amp; Stevenson Services Inc. SS-200 6x6 multi-purpose light vehicle" uuid="c72039a6-5269-11df-8d0b-080069138b88" uid="10392"/>
-      <subcategory value="13" description="Commercial Utility Cargo Vehicle (CUCV)" uuid="c7214a6c-5269-11df-beba-080069138b88" uid="10393"/>
-      <subcategory value="14" description="M1008, truck, cargo, tactical 1-1/4 ton, 4x4" uuid="c7225b78-5269-11df-95a4-080069138b88" uid="10394"/>
-      <subcategory value="15" description="M1009, truck, utility, tactical 3/4 ton, 4x4" uuid="c7237468-5269-11df-813f-080069138b88" uid="10395"/>
-      <subcategory value="16" description="M1010, truck, ambulance, tactical 1-1/4 ton, 4x4" uuid="c72482c2-5269-11df-b44b-080069138b88" uid="10396"/>
-      <subcategory value="17" description="M1031, truck, chassis, tactical 1-1/4 ton, 4x4" uuid="c72596c6-5269-11df-867d-080069138b88" uid="10397"/>
-      <subcategory value="18" description="M1028, truck, cargo, shelter carrier, tactical 1-1/4" uuid="c726ac82-5269-11df-b03d-080069138b88" uid="10398"/>
-      <subcategory value="19" description="M715 4x4 1-1/4 ton truck, AM715-series 4x4 1-1/4 ton cargo trucks" uuid="c727ba8c-5269-11df-98c9-080069138b88" uid="10399"/>
-      <subcategory value="20" description="Jeep AM 720 4x4 1135-kg light truck" uuid="c728cfa8-5269-11df-bb1a-080069138b88" uid="10400"/>
-      <subcategory value="21" description="M880 4x4 1133 kg" uuid="c729e1f4-5269-11df-b6bf-080069138b88" uid="10401"/>
-      <subcategory value="22" description="M890 4x2 1133 kg" uuid="c72aebda-5269-11df-8b4d-080069138b88" uid="10402"/>
-      <subcategory value="23" description="Tractor, aircraft towing" uuid="c72c0088-5269-11df-b977-080069138b88" uid="10403">
-        <specific value="1" description="A/S32A-31" uuid="c72d1086-5269-11df-b79d-080069138b88" uid="10404"/>
-      </subcategory>
-      <subcategory value="24" description="Ordnance Trailer" uuid="c72ebfda-5269-11df-8e75-080069138b88" uid="10405"/>
-      <subcategory value="25" description="Motorcycle" uuid="c72fd226-5269-11df-947e-080069138b88" uid="10406">
-        <specific value="1" description="M1030B1 Motorcycle" uuid="c730e706-5269-11df-bde3-080069138b88" uid="10407"/>
-        <specific value="2" description="Motorcycle Trail Kawasaki KLR 250" status="new" uuid="6c6eb6d1-8190-484d-971d-0949b5429e7e" uid="22870">
-          <cr value="2230"/>
-        </specific>
-      </subcategory>
-      <subcategory value="26" description="All Terrain Vehicle" uuid="c73296f0-5269-11df-b292-080069138b88" uid="10408">
-        <specific value="1" description="ATV 4X4" uuid="c733a928-5269-11df-8af5-080069138b88" uid="10409"/>
-        <specific value="2" description="ATV 6X6" uuid="c734b26e-5269-11df-a7e1-080069138b88" uid="10410">
-          <extra value="1" description="Military Gator (basic)" uuid="c735c5fa-5269-11df-b8ee-080069138b88" uid="10411"/>
-          <extra value="2" description="Military Gator First Response Expeditionary" uuid="c736d616-5269-11df-8f14-080069138b88" uid="10412"/>
-        </specific>
-        <specific value="3" description="ATV 6X4" status="new" uuid="3b0ea861-a796-479c-9a45-97777aebcdf6" uid="22871">
-          <cr value="2230"/>
-          <extra value="1" description="M-Gator A1" status="new" uuid="c8fdabd1-cdfe-445b-9860-df1c01c37dd6" uid="22872">
-            <cr value="2230"/>
-          </extra>
-        </specific>
-      </subcategory>
-      <subcategory value="27" description="FCS MULE" uuid="c739268c-5269-11df-a462-080069138b88" uid="10413">
-        <specific value="1" description="FCS MULE Retransmission" uuid="c73a37fc-5269-11df-a734-080069138b88" uid="10414"/>
-        <specific value="2" description="FCS MULE Countermine" uuid="c73b4340-5269-11df-a2ee-080069138b88" uid="10415"/>
-        <specific value="3" description="FCS MULE Transport" uuid="c73c546a-5269-11df-872c-080069138b88" uid="10416"/>
-      </subcategory>
-      <subcategory value="28" description="FCS Small Unattended Ground Vehicle" uuid="c73e07c4-5269-11df-8f61-080069138b88" uid="10417"/>
-    </category>
-    <category value="7" description="Large wheeled utility vehicle" uuid="c73fb704-5269-11df-9d62-080069138b88" uid="10418">
-      <subcategory value="1" description="M35/M44A2 6x6 2-1/2 ton cargo truck series" uuid="c740cb12-5269-11df-beaf-080069138b88" uid="10419">
-        <specific value="1" description="M34: cargo truck with an unladen weight of 5332 kg, chassis designated M44" uuid="c741d8e0-5269-11df-93e9-080069138b88" uid="10420"/>
-        <specific value="2" description="M47: dump truck with an unladen weight of 6100 kg, chassis designated M57" uuid="c742ee1a-5269-11df-87d4-080069138b88" uid="10421"/>
-        <specific value="3" description="Truck, maintenance: earth-boring machine and pole setter V18A/MTQ, chassis M44" uuid="c74403d6-5269-11df-8a61-080069138b88" uid="10422"/>
-        <specific value="4" description="Truck, maintenance: telephone construction and maintenance V17A/MTQ, chassis M44." uuid="c74515e6-5269-11df-ac5c-080069138b88" uid="10423"/>
-        <specific value="5" description="M35 truck: basic M45 chassis" uuid="c7462a94-5269-11df-8d28-080069138b88" uid="10424"/>
-        <specific value="6" description="M35A2" uuid="c7473b96-5269-11df-9d33-080069138b88" uid="10425"/>
-        <specific value="7" description="M35A2C" uuid="c7484752-5269-11df-a0bb-080069138b88" uid="10426"/>
-        <specific value="8" description="M36" uuid="c74956f6-5269-11df-b13e-080069138b88" uid="10427"/>
-        <specific value="9" description="M36A2" uuid="c74a6686-5269-11df-afaf-080069138b88" uid="10428"/>
-        <specific value="10" description="M48: tractor truck" uuid="c74b71e8-5269-11df-92c2-080069138b88" uid="10429"/>
-        <specific value="11" description="M49: fuel tanker" uuid="c74c8042-5269-11df-96f3-080069138b88" uid="10430"/>
-        <specific value="12" description="M49A2C" uuid="c74d9400-5269-11df-84b4-080069138b88" uid="10431"/>
-      </subcategory>
-      <subcategory value="2" description="M816, truck, wrecker, 5-ton, 6x6" uuid="c74f4c3c-5269-11df-bfa5-080069138b88" uid="10432"/>
-      <subcategory value="3" description="M819, tractor, wrecker, 5-ton, 6x6" uuid="c7505bb8-5269-11df-8efd-080069138b88" uid="10433"/>
-      <subcategory value="4" description="M817 engineer dump truck" uuid="c7516e36-5269-11df-9db4-080069138b88" uid="10434"/>
-      <subcategory value="5" description="M939 6X6 5-ton cargo truck" uuid="c75281fe-5269-11df-9a93-080069138b88" uid="10435">
-        <specific value="1" description="M923 - Truck, 5-ton, 6x6, Cargo dropside" uuid="c753913e-5269-11df-9632-080069138b88" uid="10436"/>
-        <specific value="2" description="M923A1 - Version with single rear wheels" uuid="c754a2e0-5269-11df-bb50-080069138b88" uid="10437"/>
-        <specific value="3" description="M923A2 - Version with CTIS" uuid="c755b2f2-5269-11df-8714-080069138b88" uid="10438"/>
-        <specific value="4" description="M932A2 [Guntruck] - Modified version for convoy defence" uuid="c756c340-5269-11df-8edd-080069138b88" uid="10439"/>
-        <specific value="5" description="M923A3 - Version with brake modifications" uuid="c757d546-5269-11df-b71e-080069138b88" uid="10440"/>
-        <specific value="6" description="M924 - Truck, 5-ton, 6x6, LWB, Cargo w/o winch" uuid="c758e792-5269-11df-b531-080069138b88" uid="10441"/>
-        <specific value="7" description="M925 - Truck, 5-ton, 6x6, Cargo dropside w/winch" uuid="c759f394-5269-11df-937f-080069138b88" uid="10442"/>
-        <specific value="8" description="M925A1 - Version with single rear wheels" uuid="c75b08ec-5269-11df-868e-080069138b88" uid="10443"/>
-        <specific value="9" description="M925A2 - Version with CTIS" uuid="c75c1ab6-5269-11df-a94d-080069138b88" uid="10444"/>
-        <specific value="10" description="M926 - Truck, 5-ton, 6x6, cargo, lwb, w/winch, w/e" uuid="c75d26c2-5269-11df-8905-080069138b88" uid="10445"/>
-        <specific value="11" description="M927 - Truck, 5-ton, 6x6, Cargo, XLWB w/o winch" uuid="c75e3ada-5269-11df-9782-080069138b88" uid="10446"/>
-        <specific value="12" description="M927 [Winch Equipped] - Truck, 5-ton, 6x6, Cargo, XLWB w/winch" uuid="c75f4d1c-5269-11df-8a70-080069138b88" uid="10447"/>
-        <specific value="13" description="M928 - Truck, 5-ton, 6x6, Cargo, XLWB w/winch" uuid="c7605b1c-5269-11df-9e0b-080069138b88" uid="10448"/>
-        <specific value="14" description="M929 - Truck, 5-ton, 6x6, Dump w/o winch" uuid="c7616e44-5269-11df-b405-080069138b88" uid="10449"/>
-        <specific value="15" description="M929A2 - Version with CTIS plate on front hubs" uuid="c762809a-5269-11df-bbb3-080069138b88" uid="10450"/>
-        <specific value="16" description="M930 - Truck, 5-ton, 6x6, Dump w/winch" uuid="c763912e-5269-11df-ad86-080069138b88" uid="10451"/>
-        <specific value="17" description="M931 - Truck, 5-ton, 6x6, Tractor w/o winch" uuid="c764a29e-5269-11df-99ca-080069138b88" uid="10452"/>
-        <specific value="18" description="M931A1 - Version with single rear wheels" uuid="c765c110-5269-11df-83a9-080069138b88" uid="10453"/>
-        <specific value="19" description="M932 - Truck, 5-ton, 6x6, Tractor w/winch" uuid="c766cca4-5269-11df-aebc-080069138b88" uid="10454"/>
-        <specific value="20" description="M933 - Truck, 5-ton, 6x6, Tractor-wrecker w/winch" uuid="c767e2f6-5269-11df-b19c-080069138b88" uid="10455"/>
-        <specific value="21" description="M934 - Truck, 5-ton, 6x6, Van, expandable w/winch" uuid="c768f5b0-5269-11df-9cfa-080069138b88" uid="10456"/>
-        <specific value="22" description="M935 - Truck, 5-ton, 6x6, Van, expandable w/o winch" uuid="c76a0374-5269-11df-bd5f-080069138b88" uid="10457"/>
-        <specific value="23" description="M936 - Truck, 5-ton, 6x6, Wrecker, medium w/winch" uuid="c76b1a02-5269-11df-9880-080069138b88" uid="10458"/>
-        <specific value="24" description="M939 - Truck, 5-ton, 6x6, chassis, w/e" uuid="c76c2c12-5269-11df-9584-080069138b88" uid="10459"/>
-        <specific value="25" description="M939 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c76d4250-5269-11df-baf4-080069138b88" uid="10460"/>
-        <specific value="26" description="M940 - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c76e5be0-5269-11df-a7fd-080069138b88" uid="10461"/>
-        <specific value="27" description="M941 - Truck, 5-ton, 6x6, chassis, w/e" uuid="c76f924e-5269-11df-9156-080069138b88" uid="10462"/>
-        <specific value="28" description="M941 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c770a238-5269-11df-bfad-080069138b88" uid="10463"/>
-        <specific value="29" description="M942 Truck, 5-ton, 6x6, chassis, w/e" uuid="c771b6a0-5269-11df-a4b7-080069138b88" uid="10464"/>
-        <specific value="30" description="M942 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c772cd42-5269-11df-9c26-080069138b88" uid="10465"/>
-        <specific value="31" description="M944 - Truck, 5-ton, 6x6, chassis" uuid="c773db06-5269-11df-851b-080069138b88" uid="10466"/>
-        <specific value="32" description="OE-MRC PATRIOT Antenna Mast Group (AMG) on M942 chassis" uuid="c774ecda-5269-11df-a7b6-080069138b88" uid="10467"/>
-      </subcategory>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="c776a340-5269-11df-b2e9-080069138b88" uid="10468"/>
-      <subcategory value="7" description="M543, truck, wrecker: medium, 5-ton, 6x6" uuid="c777b4ba-5269-11df-851d-080069138b88" uid="10469"/>
-      <subcategory value="8" description="M915 series of 5-ton trucks" uuid="c778c292-5269-11df-b412-080069138b88" uid="10470">
-        <specific value="1" description="Cargo" uuid="c779d66e-5269-11df-9233-080069138b88" uid="10471"/>
-        <specific value="2" description="w/ FS pods" uuid="c77ae4a0-5269-11df-b650-080069138b88" uid="10472"/>
-        <specific value="3" description="w/ shelter" uuid="c77bee72-5269-11df-8cbc-080069138b88" uid="10473"/>
-        <specific value="4" description="M915, tractor, truck, 14-ton, 6x4" uuid="c77d0262-5269-11df-9242-080069138b88" uid="10474"/>
-        <specific value="5" description="M915A1, tractor, truck, 14-ton, 6x4" uuid="c77e13dc-5269-11df-83ff-080069138b88" uid="10475"/>
-        <specific value="6" description="M915 (Eng Loader)" uuid="c77f1dd6-5269-11df-b4c9-080069138b88" uid="10476"/>
-      </subcategory>
-      <subcategory value="9" description="LTV Hummer cab-over 4x4 2268-kg cargo truck" uuid="c780d270-5269-11df-8d4f-080069138b88" uid="10477"/>
-      <subcategory value="10" description="Freightliner All-Terrain Tow Vehicle (ATTV)" uuid="c781e5ca-5269-11df-a503-080069138b88" uid="10478">
-        <specific value="1" description="Kamaz-4310 with generator set" uuid="c782f74e-5269-11df-8183-080069138b88" uid="10479"/>
-      </subcategory>
-      <subcategory value="11" description="Stewart &amp; Stevenson SS-300 8x8 2268-kg All-Terrain Vehicle" uuid="c784a8f0-5269-11df-9379-080069138b88" uid="10480"/>
-      <subcategory value="12" description="Stewart &amp; Stevenson Family of Medium Tactical Vehicles (FMTV)" uuid="c785bb5a-5269-11df-8a5a-080069138b88" uid="10481">
-        <specific value="1" description="M1078 Truck, Cargo; LMTV w/ Equip" uuid="c786ce64-5269-11df-b725-080069138b88" uid="10482"/>
-        <specific value="2" description="M1078 Truck, Cargo; LMTV w/ Equip, w/ Winch" uuid="c787e060-5269-11df-80cf-080069138b88" uid="10483"/>
-        <specific value="3" description="M1079 Truck, Van; LMTV w/ Equip" uuid="c788eb5e-5269-11df-bb27-080069138b88" uid="10484"/>
-        <specific value="4" description="M1079 Truck, Van; LMTV w/ Equip, w/ Winch" uuid="c78a0138-5269-11df-a4ce-080069138b88" uid="10485"/>
-        <specific value="5" description="M1080 Truck, Chassis; LMTV w/ Equip" uuid="c78b13e8-5269-11df-b785-080069138b88" uid="10486"/>
-        <specific value="6" description="M1081 Truck, Cargo; LMTV, LAPES/AD, w/ Equip" uuid="c78c2922-5269-11df-af18-080069138b88" uid="10487"/>
-        <specific value="7" description="M1082 Trailer; LMTV" uuid="c78d3f60-5269-11df-bab7-080069138b88" uid="10488"/>
-        <specific value="8" description="M1083 Truck, Cargo; MTV w/ Equip" uuid="c78e508a-5269-11df-a9a3-080069138b88" uid="10489"/>
-        <specific value="9" description="M1083 Truck, Cargo; MTV w/ Equip, w/ winch" uuid="c78f5d90-5269-11df-92c6-080069138b88" uid="10490"/>
-        <specific value="10" description="M1084 Truck, Cargo; w/ MHE w/ Equip" uuid="c7907112-5269-11df-af04-080069138b88" uid="10491"/>
-        <specific value="11" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip" uuid="c791832c-5269-11df-9037-080069138b88" uid="10492"/>
-        <specific value="12" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip, w/ Winch" uuid="c79293fc-5269-11df-ae4f-080069138b88" uid="10493"/>
-        <specific value="13" description="M1086 Truck, Cargo; MTV, LWB, w/MHE, w/ Equip" uuid="c793a72e-5269-11df-b1e6-080069138b88" uid="10494"/>
-        <specific value="14" description="M1087 Truck, Van; MTV, Expansible" uuid="c794bd62-5269-11df-93b5-080069138b88" uid="10495"/>
-        <specific value="15" description="M1088 Truck, Tractor; MTV, w/ Equip" uuid="c795c7fc-5269-11df-b771-080069138b88" uid="10496"/>
-        <specific value="16" description="M1088 Truck, Tractor; MTV, w/ Equip, w/ Winch" uuid="c796da70-5269-11df-a2a3-080069138b88" uid="10497"/>
-        <specific value="17" description="M1089 Truck, Wrecker; MTV, w/ Equip, w/ Winch" uuid="c797ed98-5269-11df-9d18-080069138b88" uid="10498"/>
-        <specific value="18" description="M1090 Truck, Dump; MTV w/ Equip" uuid="c798fd8c-5269-11df-a622-080069138b88" uid="10499"/>
-        <specific value="19" description="M1090 Truck, Dump; MTV w/ Equip, w/ Winch" uuid="c79a0d44-5269-11df-93db-080069138b88" uid="10500"/>
-        <specific value="20" description="M1091 Truck, Tanker; MTV w/ Equip, w/ Winch" uuid="c79b1ee6-5269-11df-9617-080069138b88" uid="10501"/>
-        <specific value="21" description="M1092 Truck, Chassis; MTV w/ Equip" uuid="c79c2ed0-5269-11df-95d5-080069138b88" uid="10502"/>
-        <specific value="22" description="M1093 Truck, Cargo; MTV, LAPES/AD, w/ Equip" uuid="c79d4004-5269-11df-9756-080069138b88" uid="10503"/>
-        <specific value="23" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip, w/ Winch" uuid="c79e5106-5269-11df-a731-080069138b88" uid="10504"/>
-        <specific value="24" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip" uuid="c79f5f56-5269-11df-8b11-080069138b88" uid="10505"/>
-        <specific value="25" description="M1095 Trailer, MTV" uuid="c7a075bc-5269-11df-b7d6-080069138b88" uid="10506"/>
-        <specific value="26" description="M1096 Truck, Chassis; MTV, LWB, w/ Equip" uuid="c7a18614-5269-11df-ba3f-080069138b88" uid="10507"/>
-        <specific value="27" description="M1083 Truck, Cargo; MTV, w/ Equip, w/ Volcano" uuid="c7a291d0-5269-11df-8991-080069138b88" uid="10508"/>
-        <specific value="28" description="M1078 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun" uuid="c7a3a890-5269-11df-a29d-080069138b88" uid="10509"/>
-        <specific value="29" description="M1083 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun" uuid="c7a4be06-5269-11df-861b-080069138b88" uid="10510"/>
-      </subcategory>
-      <subcategory value="13" description="TTC FMTV" uuid="c7a67098-5269-11df-b24b-080069138b88" uid="10511">
-        <specific value="1" description="LMTV" uuid="c7a77bd2-5269-11df-9db0-080069138b88" uid="10512"/>
-        <specific value="2" description="MTV" uuid="c7a88aa4-5269-11df-84dd-080069138b88" uid="10513"/>
-      </subcategory>
-      <subcategory value="14" description="M54 6x6 5-ton cargo truck series" uuid="c7aa3a0c-5269-11df-87dc-080069138b88" uid="10514">
-        <specific value="1" description="M41, cargo" uuid="c7ab5748-5269-11df-afa2-080069138b88" uid="10515"/>
-        <specific value="2" description="M41, dump6" uuid="c7ac60b6-5269-11df-a229-080069138b88" uid="10516"/>
-        <specific value="3" description="M52, tractor" uuid="c7ad6f60-5269-11df-a637-080069138b88" uid="10517"/>
-        <specific value="4" description="M54, cargo " uuid="c7ae81c0-5269-11df-9bdf-080069138b88" uid="10518"/>
-        <specific value="5" description="M55, cargo" uuid="c7af8ba6-5269-11df-a353-080069138b88" uid="10519"/>
-        <specific value="6" description="M62k, wrecker, medium" uuid="c7b09a50-5269-11df-9b0e-080069138b88" uid="10520"/>
-        <specific value="7" description="M64, cargo, van" uuid="c7b1adfa-5269-11df-8f71-080069138b88" uid="10521"/>
-        <specific value="8" description="M246, tractor, wrecker" uuid="c7b2b93e-5269-11df-ae53-080069138b88" uid="10522"/>
-        <specific value="9" description="M291, van, expansible" uuid="c7b3ca36-5269-11df-a141-080069138b88" uid="10523"/>
-        <specific value="10" description="M328, stake, bridging" uuid="c7b4d8cc-5269-11df-859e-080069138b88" uid="10524"/>
-        <specific value="11" description="M543, wrecker, medium" uuid="c7b5e79e-5269-11df-b986-080069138b88" uid="10525"/>
-        <specific value="12" description="M748, bolster" uuid="c7b6f6ac-5269-11df-80af-080069138b88" uid="10526"/>
-        <specific value="13" description="M139 chassis" uuid="c7b8063c-5269-11df-bd17-080069138b88" uid="10527"/>
-      </subcategory>
-      <subcategory value="15" description="M809 6x6 5-ton cargo truck series" uuid="c7b9b7e8-5269-11df-be8f-080069138b88" uid="10528">
-        <specific value="1" description="M809" uuid="c7bac232-5269-11df-b8e9-080069138b88" uid="10529"/>
-        <specific value="2" description="M810" uuid="c7bbd078-5269-11df-859f-080069138b88" uid="10530"/>
-        <specific value="3" description="M811/M812" uuid="c7bce292-5269-11df-aed6-080069138b88" uid="10531"/>
-      </subcategory>
-      <subcategory value="16" description="M813 cargo truck, 5-ton, 6x6" uuid="c7be910a-5269-11df-9cb5-080069138b88" uid="10532"/>
-      <subcategory value="17" description="Standard Trailing Arm Drive (TAD) vehicle series" uuid="c7bf9f3c-5269-11df-aebb-080069138b88" uid="10533">
-        <specific value="1" description="Modular wheeled carrier" uuid="c7c0b660-5269-11df-8a8e-080069138b88" uid="10534"/>
-        <specific value="2" description="Forward Area Multi-purpose Vehicle (FAMV)" uuid="c7c1c758-5269-11df-82f3-080069138b88" uid="10535"/>
-        <specific value="3" description="Medium Combat Truck (MCT)" uuid="c7c2d238-5269-11df-86c2-080069138b88" uid="10536"/>
-      </subcategory>
-      <subcategory value="18" description="Oshkosh MK48-series articulated 8x8 vehicle" uuid="c7c48650-5269-11df-bf6d-080069138b88" uid="10537">
-        <specific value="1" description="MK48/14: logistics platform truck" uuid="c7c596c6-5269-11df-9f52-080069138b88" uid="10538"/>
-        <specific value="2" description="MK48/15: recovery vehicle" uuid="c7c6a8ae-5269-11df-8c32-080069138b88" uid="10539"/>
-        <specific value="3" description="MK48/16: truck tractor" uuid="c7c7b852-5269-11df-baa4-080069138b88" uid="10540"/>
-        <specific value="4" description="MK48/17: cargo truck with Material Handling Crane (MHC)" uuid="c7c8ca3a-5269-11df-ba35-080069138b88" uid="10541"/>
-        <specific value="5" description="MK48/18: load handling system vehicle." uuid="c7c9e618-5269-11df-9432-080069138b88" uid="10542"/>
-      </subcategory>
-      <subcategory value="19" description="Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg" uuid="c7cbc37a-5269-11df-8bbf-080069138b88" uid="10543">
-        <specific value="1" description="M977 cargo" uuid="c7ccd9a4-5269-11df-a271-080069138b88" uid="10544"/>
-        <specific value="2" description="M978 fuel-servicing" uuid="c7cde4f2-5269-11df-8357-080069138b88" uid="10545"/>
-        <specific value="3" description="M983 tractor" uuid="c7cef9c8-5269-11df-961d-080069138b88" uid="10546"/>
-        <specific value="4" description="M984A1 wrecker" uuid="c7d00b1a-5269-11df-ae1a-080069138b88" uid="10547"/>
-        <specific value="5" description="M985 cargo" uuid="c7d115b4-5269-11df-8eb4-080069138b88" uid="10548"/>
-        <specific value="6" description="M977 w/ Mine Plow" uuid="c7d223fa-5269-11df-994b-080069138b88" uid="10549"/>
-        <specific value="7" description="M977 w/ Mine Roller" uuid="c7d337a4-5269-11df-9a03-080069138b88" uid="10550"/>
-        <specific value="8" description="M985 w/ Mine Roller" uuid="c7d441f8-5269-11df-996f-080069138b88" uid="10551"/>
-        <specific value="9" description="M985 w/ Mine Plow" uuid="c7d5526e-5269-11df-982d-080069138b88" uid="10552"/>
-        <specific value="10" description="Truck, Heavy, M1074 PLS" uuid="c7d663fc-5269-11df-9e04-080069138b88" uid="10553"/>
-      </subcategory>
-      <subcategory value="20" description="Mack RM6866SX 6x6 10000-kg truck" uuid="c7d81774-5269-11df-b61c-080069138b88" uid="10554"/>
-      <subcategory value="21" description="M1070 8x8 Heavy Equipment Transporter (HET)" uuid="c7d923da-5269-11df-a989-080069138b88" uid="10555"/>
-      <subcategory value="22" description="M911 8x6 truck tractor" uuid="c7da363a-5269-11df-a142-080069138b88" uid="10556"/>
-      <subcategory value="23" description="M746 8x8 22-1/2 ton tractor truck (HET)" uuid="c7db4796-5269-11df-a2d8-080069138b88" uid="10557"/>
-      <subcategory value="24" description="Mack RD8226SX 52000-kg 6x6 tank transporter" uuid="c7dc58a2-5269-11df-aed8-080069138b88" uid="10558"/>
-      <subcategory value="25" description="Navistar International Corporation F5070 6x4 tank transporter" uuid="c7dd6e0e-5269-11df-9924-080069138b88" uid="10559"/>
-      <subcategory value="26" description="LARC-5 4x4 4545-kg amphibious cargo carrier" uuid="c7de8230-5269-11df-a81b-080069138b88" uid="10560"/>
-      <subcategory value="27" description="Variable Reach Rough Terrain Forklift Truck (VRRTFLT)" uuid="c7df9030-5269-11df-9c4e-080069138b88" uid="10561"/>
-      <subcategory value="28" description="Rough Terrain Container Straddle Truck (RTCST)" uuid="c7e0a4ac-5269-11df-9cbb-080069138b88" uid="10562"/>
-      <subcategory value="29" description="Truck, tractor, yard type, 4x2" uuid="c7e1bbd0-5269-11df-bae7-080069138b88" uid="10563">
-        <specific value="1" description="M878" uuid="c7e2c5fc-5269-11df-8cf5-080069138b88" uid="10564"/>
-        <specific value="2" description="M878A1" uuid="c7e3d42e-5269-11df-9064-080069138b88" uid="10565"/>
-      </subcategory>
-      <subcategory value="30" description="Case MC2500 30-ton rough terrain crane" uuid="c7e5859e-5269-11df-95d8-080069138b88" uid="10566"/>
-      <subcategory value="31" description="Crane, truck-mounted, hydraulic, 25-ton (CCE) (Grove TMS 300-5)" uuid="c7e69c90-5269-11df-93a8-080069138b88" uid="10567"/>
-      <subcategory value="32" description="Rough terrain crane 4x4 5-ton Hanson H-446A" uuid="c7e7abbc-5269-11df-95db-080069138b88" uid="10568"/>
-      <subcategory value="33" description="Wreckers, 2-1/2 ton 6x6" uuid="c7e8c704-5269-11df-86df-080069138b88" uid="10569">
-        <specific value="1" description="M60" uuid="c7e9daa4-5269-11df-bda1-080069138b88" uid="10570"/>
-        <specific value="2" description="M108" uuid="c7eae7f0-5269-11df-a27b-080069138b88" uid="10571"/>
-      </subcategory>
-      <subcategory value="34" description="M62, truck, wrecker, medium, 5-ton, 6x6" uuid="c7ec964a-5269-11df-afc8-080069138b88" uid="10572"/>
-      <subcategory value="35" description="M246, truck, tractor, wrecker, 5-ton, 6x6" uuid="c7eda882-5269-11df-a6a7-080069138b88" uid="10573"/>
-      <subcategory value="36" description="M916 Series trucks" uuid="c7eebe7a-5269-11df-a045-080069138b88" uid="10574"/>
-      <subcategory value="37" description="Small Emplacement Excavator (SEE)" uuid="c7efcec8-5269-11df-94ee-080069138b88" uid="10575"/>
-      <subcategory value="38" description="Truck, cargo; heavy PLS transporter 16.5T 8x8, M1075" uuid="c7f0e114-5269-11df-8f78-080069138b88" uid="10576"/>
-    </category>
-    <category value="8" description="Small tracked utility vehicle" uuid="c7f29162-5269-11df-bdd2-080069138b88" uid="10577"/>
-    <category value="9" description="Large tracked utility vehicle" uuid="c7f3a4e4-5269-11df-a1b5-080069138b88" uid="10578">
-      <subcategory value="1" description="M548 tracked cargo carrier" uuid="c7f4af60-5269-11df-95a2-080069138b88" uid="10579">
-        <specific value="1" description="M1015" uuid="c7f5bfae-5269-11df-a048-080069138b88" uid="10580"/>
-        <specific value="2" description="Stretched M548A1E1" uuid="c7f6d15a-5269-11df-aa5f-080069138b88" uid="10581"/>
-        <specific value="3" description="M667" uuid="c7f7db68-5269-11df-8598-080069138b88" uid="10582"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="c7f8eb98-5269-11df-9964-080069138b88" uid="10583"/>
-        <specific value="5" description="Recovery vehicles" uuid="c7f9fd12-5269-11df-9e27-080069138b88" uid="10584"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="c7fb06f8-5269-11df-a98b-080069138b88" uid="10585"/>
-        <specific value="7" description="Radar vehicles" uuid="c7fc184a-5269-11df-ae92-080069138b88" uid="10586"/>
-        <specific value="8" description="M45" uuid="c7fd2c3a-5269-11df-9770-080069138b88" uid="10587"/>
-        <specific value="9" description="M548A1" uuid="c7fe3576-5269-11df-ae00-080069138b88" uid="10588"/>
-        <specific value="10" description="M548GA1" uuid="c7ff459c-5269-11df-a8d2-080069138b88" uid="10589"/>
-        <specific value="11" description="M548/S" uuid="c800577a-5269-11df-8ad8-080069138b88" uid="10590"/>
-        <specific value="12" description="LAR 160" uuid="c80163ae-5269-11df-8de6-080069138b88" uid="10591"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="c80314a6-5269-11df-bab2-080069138b88" uid="10592"/>
-      <subcategory value="3" description="M992 Field Artillery Ammunition Support Vehicle (FAASV)" uuid="c80425f8-5269-11df-8825-080069138b88" uid="10593">
-        <specific value="1" description="M993 MLRS carrier" uuid="c8053b0a-5269-11df-8e85-080069138b88" uid="10594"/>
-        <specific value="2" description="XM987 cargo carrier" uuid="c8064900-5269-11df-a4d4-080069138b88" uid="10595"/>
-        <specific value="3" description="Armored, Forward-Area, Rearm Vehicle (AFARV)" uuid="c80763da-5269-11df-a524-080069138b88" uid="10596"/>
-        <specific value="4" description="Armored Maintenance Vehicle" uuid="c8087590-5269-11df-9756-080069138b88" uid="10597"/>
-        <specific value="5" description="XM1070 Electronic Fighting Vehicle System (EFVS)" uuid="c809826e-5269-11df-9824-080069138b88" uid="10598"/>
-        <specific value="6" description="Command-post vehicle" uuid="c80a9802-5269-11df-9188-080069138b88" uid="10599"/>
-      </subcategory>
-      <subcategory value="4" description="M973 Small Unit Support Vehicle (SUSV)" uuid="c80c4832-5269-11df-967f-080069138b88" uid="10600"/>
-      <subcategory value="5" description="LMC 1500 Over-snow vehicle" uuid="c80d597a-5269-11df-ad8d-080069138b88" uid="10601"/>
-      <subcategory value="6" description="Caterpillar 988 50 000-lb (22 680-kg) rough terrain container handler" uuid="c80e6900-5269-11df-a3b2-080069138b88" uid="10602"/>
-    </category>
-    <category value="10" description="Mortar" uuid="c8101f52-5269-11df-9639-080069138b88" uid="10603">
-      <subcategory value="1" description="M29 81-mm" uuid="c8112e88-5269-11df-ab4d-080069138b88" uid="10604"/>
-      <subcategory value="2" description="M224 60-mm light company mortar" uuid="c8123ea4-5269-11df-bbe3-080069138b88" uid="10605"/>
-      <subcategory value="3" description="M1 81-mm" uuid="c8134e16-5269-11df-b730-080069138b88" uid="10606"/>
-      <subcategory value="4" description="M2 60-mm" uuid="c8145d10-5269-11df-98fa-080069138b88" uid="10607"/>
-      <subcategory value="5" description="M19 60-mm" uuid="c815710a-5269-11df-8aad-080069138b88" uid="10608"/>
-      <subcategory value="6" description="M29A1 81-mm" uuid="c81687e8-5269-11df-969e-080069138b88" uid="10609"/>
-      <subcategory value="7" description="M30 107-mm rifled" uuid="c8179c64-5269-11df-890f-080069138b88" uid="10610"/>
-      <subcategory value="8" description="M252 81-mm" uuid="c818ad7a-5269-11df-a795-080069138b88" uid="10611"/>
-      <subcategory value="9" description="120mm Mortar, M120" uuid="c819bad0-5269-11df-92c1-080069138b88" uid="10612"/>
-    </category>
-    <category value="11" description="Mine plow" uuid="c81b6d9e-5269-11df-91cc-080069138b88" uid="10613"/>
-    <category value="12" description="Mine rake" uuid="c81c7c66-5269-11df-b02f-080069138b88" uid="10614"/>
-    <category value="13" description="Mine roller" uuid="c81d8d7c-5269-11df-99e3-080069138b88" uid="10615"/>
-    <category value="14" description="Cargo trailer" uuid="c81e9816-5269-11df-8742-080069138b88" uid="10616">
-      <subcategory value="1" description="0 - 0.5 ton" uuid="c81fa670-5269-11df-b8a0-080069138b88" uid="10617">
-        <specific value="1" description="Trailer, M1100 with M120" status="new" uuid="1eb4f692-bd34-4c8d-a3ba-f76c3fbe8e1f" uid="22873">
-          <cr value="2233"/>
-        </specific>
-        <specific value="2" description="Trailer, M1100, Empty" status="new" uuid="9f2fab76-e69f-4e09-82ca-a78bc670333f" uid="22874">
-          <cr value="2233"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="0.51 - 2 ton" uuid="c820bb46-5269-11df-89c6-080069138b88" uid="10618">
-        <specific value="1" description="Trailer cargo; high mobility, 3/4 ton, M1102" uuid="c821c6b2-5269-11df-b435-080069138b88" uid="10619"/>
-        <specific value="3" description="Trailer, Cargo, 1 1/2 ton, M105A2" status="new" uuid="08c1d871-1c01-49bc-9d1b-abc6bc55878b" uid="22875">
-          <cr value="2233"/>
-        </specific>
-      </subcategory>
-      <subcategory value="3" description="2.01 - 5 ton" uuid="c8237962-5269-11df-aaf2-080069138b88" uid="10620">
-        <specific value="1" description="Trailer, cargo; 2 1/2 ton, M1082" uuid="c8248870-5269-11df-a34b-080069138b88" uid="10621"/>
-        <specific value="2" description="Trailer, cargo; 5 ton, M1095" uuid="c825a6e2-5269-11df-8944-080069138b88" uid="10622"/>
-      </subcategory>
-      <subcategory value="4" description="5.02 - 10 ton" uuid="c8277d50-5269-11df-9e49-080069138b88" uid="10623"/>
-      <subcategory value="5" description="greater than 10 tons" uuid="c82894a6-5269-11df-bd6b-080069138b88" uid="10624">
-        <specific value="1" description="M871, 22 1/2 ton" status="new" uuid="05ad5fe5-8eb1-47ec-8c72-38cf6c4950ae" uid="22876">
-          <cr value="2233"/>
-        </specific>
-        <specific value="2" description="M872, 34 ton" status="new" uuid="69ebbfc9-33c2-4e53-9748-0eee45a8f247" uid="22877">
-          <cr value="2233"/>
-        </specific>
-        <specific value="3" description="M127A2C, 12 ton" status="new" uuid="f79248f4-75d4-4215-8e90-a35d803b9bfb" uid="22878">
-          <cr value="2233"/>
-        </specific>
-        <specific value="4" description="M1076, PLS, 16 1/2 ton" status="new" uuid="63127117-d536-43e3-81bd-2d3bba10b301" uid="22879">
-          <cr value="2233"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="15" description="Fuel trailer" uuid="c82a4634-5269-11df-9ffd-080069138b88" uid="10625">
-      <subcategory value="1" description="1-1000 gallons" uuid="c82b4fe8-5269-11df-8889-080069138b88" uid="10626"/>
-      <subcategory value="2" description="1001 - 5000 gallons" uuid="c82c6428-5269-11df-adae-080069138b88" uid="10627">
-        <specific value="1" description="Semi-trailer, fuel service, 5000 gallons, M969" uuid="c82d76c4-5269-11df-8440-080069138b88" uid="10628"/>
-      </subcategory>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="c82f297e-5269-11df-bbbb-080069138b88" uid="10629"/>
-    </category>
-    <category value="16" description="Generator trailer" uuid="c830dc7e-5269-11df-94ea-080069138b88" uid="10630">
-      <subcategory value="1" description="0 - 100 kW" uuid="c831e5a6-5269-11df-a6a8-080069138b88" uid="10631">
-        <specific value="1" description="TES Main Generator" status="new" uuid="26f3020d-df66-4a43-a9d6-f02d92c25292" uid="22880">
-          <cr value="2233"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="greater than 100 KW" uuid="c832f63a-5269-11df-b4ed-080069138b88" uid="10632"/>
-    </category>
-    <category value="17" description="Water trailer" uuid="c834a91c-5269-11df-9ff3-080069138b88" uid="10633">
-      <subcategory value="1" description="1-1000 gallons" uuid="c835b762-5269-11df-baa5-080069138b88" uid="10634">
-        <specific value="1" description="Trailer, tank; 1 1/2 ton, water, 400 gallons, M149A2" uuid="c836c59e-5269-11df-9d34-080069138b88" uid="10635"/>
-      </subcategory>
-      <subcategory value="2" description="1001- 5000 gallons" uuid="c83875e2-5269-11df-b734-080069138b88" uid="10636"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="c83987fc-5269-11df-b43a-080069138b88" uid="10637"/>
-    </category>
-    <category value="18" description="Engineer equipment" uuid="c83b3bce-5269-11df-8df5-080069138b88" uid="10638">
-      <subcategory value="1" description="Mine clearing line charge" uuid="c83c4974-5269-11df-9c56-080069138b88" uid="10639"/>
-      <subcategory value="2" description="Dozer blade kit" uuid="c83d57e2-5269-11df-894f-080069138b88" uid="10640"/>
-      <subcategory value="3" description="Lane marking system" uuid="c83e6c04-5269-11df-b997-080069138b88" uid="10641"/>
-      <subcategory value="4" description="High Mobility Engineer Excavator" uuid="c83f7c5c-5269-11df-a80a-080069138b88" uid="10642"/>
-      <subcategory value="5" description="Road Grader" uuid="c8408836-5269-11df-bf71-080069138b88" uid="10643"/>
-    </category>
-    <category value="19" description="Heavy equipment transport trailer" uuid="c8423c08-5269-11df-83c9-080069138b88" uid="10644">
-      <subcategory value="1" description="Heavy Equipment Trailer, M1000" uuid="c8434ca6-5269-11df-88bd-080069138b88" uid="10645"/>
-      <subcategory value="2" description="Semi-trailer, M870A1, 40-ton" status="new" uuid="70987829-d649-4953-963c-88100a7d27e9" uid="22918">
-        <cr value="2246"/>
-      </subcategory>
-      <subcategory value="3" description="Semi-trailer, M172A1, 25-ton" status="new" uuid="2d23f1bb-2ac3-4043-b95a-65fbd4dc0179" uid="22919">
-        <cr value="2246"/>
-      </subcategory>
-    </category>
-    <category value="20" description="Maintenance equipment trailer" uuid="c84509ec-5269-11df-a4fd-080069138b88" uid="10646">
-      <subcategory value="1" description="Welding trailer" uuid="c8461990-5269-11df-94db-080069138b88" uid="10647"/>
-      <subcategory value="2" description="Compressor" uuid="c847286c-5269-11df-aee1-080069138b88" uid="10648"/>
-      <subcategory value="3" description="Tools/parts trailer" uuid="c84839aa-5269-11df-b47f-080069138b88" uid="10649">
-        <specific value="1" description="Semi-trailer, Van, 12-ton, M129A2C" uuid="c8494ba6-5269-11df-b79e-080069138b88" uid="10650" status="new">
-          <cr value="2246"/>
-        </specific>
-        <specific value="2" description="Semi-trailer, Van, 6-ton, M146" status="new" uuid="4e62e414-7dcc-420e-ac31-3f854e11f520" uid="22920">
-          <cr value="2246"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="21" description="Limber" uuid="c84b9d02-5269-11df-9210-080069138b88" uid="10651"/>
-    <category value="22" description="Chemical decontamination trailer" uuid="c84cae40-5269-11df-98d8-080069138b88" uid="10652"/>
-    <category value="23" description="Warning System" uuid="c84dbccc-5269-11df-87e3-080069138b88" uid="10653">
-      <subcategory value="1" description="JTAGS" uuid="c84ecbe4-5269-11df-8384-080069138b88" uid="10654"/>
-      <subcategory value="2" description="SHIELD/ALERT" uuid="c84fdab6-5269-11df-b300-080069138b88" uid="10655"/>
-      <subcategory value="3" description="FCS Intelligent Munitions System" uuid="c850e6b8-5269-11df-bbd0-080069138b88" uid="10656"/>
-      <subcategory value="4" description="Urban Unattended Ground Sensor (U-UGS)" uuid="c851fb3e-5269-11df-94c4-080069138b88" uid="10657" footnote="This is the gateway node" status="new">
-        <cr value="2234"/>
-        <specific value="1" description="U-UGS Imaging Node" status="new" uuid="add32c22-23bd-4093-9d2c-4b5ced2a7af0" uid="22881">
-          <cr value="2234"/>
-        </specific>
-        <specific value="2" description="U-UGS Motion Sensor" status="new" uuid="4649c30d-8d5f-4f05-8cb5-d8eb240b5f60" uid="22882">
-          <cr value="2234"/>
-        </specific>
-      </subcategory>
-      <subcategory value="5" description="Tactical Unattended Ground Sensor (T-UGS)" uuid="c8530d08-5269-11df-8768-080069138b88" uid="10658" footnote="This is the gateway node" status="new">
-        <cr value="2234"/>
-        <specific value="1" description="T-UGS Electro-Optic/Infrared Node" status="new" uuid="cd1efb5e-33c5-4321-9ae1-8d554f2d7fee" uid="22883">
-          <cr value="2234"/>
-        </specific>
-        <specific value="2" description="T-UGS ISR Node" status="new" uuid="bbbade62-4a69-482f-891b-f529f6592f1d" uid="22884">
-          <cr value="2234"/>
-        </specific>
-        <specific value="3" description="T-UGS Radiological Nuclear Node" status="new" uuid="9ab7750b-9a06-4970-80bc-c72b6066b5dd" uid="22885">
-          <cr value="2234"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="27" description="Civilian Vehicle" uuid="c854bc84-5269-11df-8012-080069138b88" uid="10659">
-      <subcategory value="1" description="Sedan" uuid="c855c994-5269-11df-b173-080069138b88" uid="10660"/>
-      <subcategory value="2" description="Sport Utility Vehicle" uuid="c856d9a6-5269-11df-9726-080069138b88" uid="10661"/>
-      <subcategory value="3" description="Truck Cargo" uuid="c857ea08-5269-11df-9d42-080069138b88" uid="10662">
-        <specific value="1" description="Truck Small" uuid="c858f6a0-5269-11df-be59-080069138b88" uid="10663">
-          <extra value="1" description="Pickup Mini" uuid="c85a05e0-5269-11df-9734-080069138b88" uid="10664"/>
-          <extra value="2" description="Pickup Medium" uuid="c85b14d0-5269-11df-bb8b-080069138b88" uid="10665"/>
-          <extra value="3" description="Pickup Large" uuid="c85c1df8-5269-11df-9b9b-080069138b88" uid="10666"/>
-        </specific>
-        <specific value="2" description="Truck Cargo Medium" uuid="c85dcfcc-5269-11df-99b5-080069138b88" uid="10667"/>
-        <specific value="3" description="Truck Cargo Large" uuid="c85edfde-5269-11df-b736-080069138b88" uid="10668"/>
-      </subcategory>
-      <subcategory value="4" description="Tractor Trailer Combination" uuid="c860914e-5269-11df-b4fd-080069138b88" uid="10669"/>
-      <subcategory value="5" description="All Terrain Vehicle" uuid="c861a408-5269-11df-bf52-080069138b88" uid="10670">
-        <specific value="1" description="ATV 4X4" uuid="c862aeb6-5269-11df-9c39-080069138b88" uid="10671">
-          <extra value="1" description="Polaris Sportsman MV" uuid="c863c760-5269-11df-83b8-080069138b88" uid="10672"/>
-        </specific>
-        <specific value="2" description="ATV 6X6" uuid="c8657c2c-5269-11df-9e21-080069138b88" uid="10673">
-          <extra value="1" description="M-Gator" uuid="c86688c4-5269-11df-bf3b-080069138b88" uid="10674"/>
-        </specific>
-      </subcategory>
-      <subcategory value="6" description="Motorcycle" uuid="c868d8ae-5269-11df-a050-080069138b88" uid="10675">
-        <specific value="1" description="Motorcycle Street" uuid="c869e7f8-5269-11df-9c13-080069138b88" uid="10676"/>
-        <specific value="2" description="Motorcycle Trail" uuid="c86af440-5269-11df-9d0f-080069138b88" uid="10677">
-          <extra value="1" description="Kawasaki KLR 250" uuid="c86c0362-5269-11df-a806-080069138b88" uid="10678"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="28" description="Air Defense / Missile Defense Unit Equipment" uuid="c86ef982-5269-11df-a8be-080069138b88" uid="10679">
-      <subcategory value="1" description="MIM-23 Raytheon HAWK Low-to-Medium Altitude SAM System" uuid="c8700f52-5269-11df-bce3-080069138b88" uid="10680">
-        <specific value="1" description="Batallion" uuid="c8711bfe-5269-11df-b654-080069138b88" uid="10681">
-          <extra value="1" description="HAWK BN/ADCP" uuid="c8722b02-5269-11df-8394-080069138b88" uid="10682"/>
-        </specific>
-        <specific value="2" description="Battery" uuid="c873dbaa-5269-11df-bc56-080069138b88" uid="10683">
-          <extra value="1" description="HAWK Battery Command Post (BCP)" uuid="c874ee1e-5269-11df-87c0-080069138b88" uid="10684"/>
-          <extra value="2" description="HAWK CWAR (Continuous Wave Acquisition Radar) AN/MPQ-34/48/55/62" uuid="c875fc78-5269-11df-8bf4-080069138b88" uid="10685"/>
-          <extra value="3" description="HAWK HPI (High-Power Illuminator) AN/MPQ-33/39/46/57/61 -" uuid="c8771040-5269-11df-88e7-080069138b88" uid="10686"/>
-          <extra value="4" description="HAWK Launcher" uuid="c8782386-5269-11df-8ef6-080069138b88" uid="10687"/>
-          <extra value="5" description="HAWK PAR (Pulse Acquisition Radar) AN/MQP-50" uuid="c879323a-5269-11df-85e4-080069138b88" uid="10688"/>
-          <extra value="6" description="HAWK ROR (Range-Only-Radar) AN/MPQ-37/51" uuid="c87a44cc-5269-11df-a909-080069138b88" uid="10689"/>
-          <extra value="7" description="HAWK PCP (Platoon Command Post)" uuid="c87b5858-5269-11df-bc70-080069138b88" uid="10690"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="MIM-104 Raytheon Patriot High-to-Medium Altitude Air Defense (HIMAD) System" uuid="c87da824-5269-11df-b8dc-080069138b88" uid="10691">
-        <specific value="1" description="Patriot Command Center" uuid="c87ebf84-5269-11df-9fee-080069138b88" uid="10692">
-          <extra value="1" description="Patriot ICC (Information Coordination Central)" uuid="c87fca1e-5269-11df-bcc5-080069138b88" uid="10693"/>
-          <extra value="2" description="Patriot BTOC" uuid="c880dc10-5269-11df-9a7c-080069138b88" uid="10694"/>
-        </specific>
-        <specific value="2" description="Patriot Battery" uuid="c882b95e-5269-11df-b657-080069138b88" uid="10695">
-          <extra value="1" description="Patriot ECS (Engagement Control Station) AN/MSQ-104" uuid="c883cdee-5269-11df-834d-080069138b88" uid="10696"/>
-          <extra value="2" description="Patriot LS (Launcher Station)" uuid="c884e526-5269-11df-b07e-080069138b88" uid="10697"/>
-          <extra value="3" description="Patriot Radar AN/MPQ-53" uuid="c885f13c-5269-11df-b171-080069138b88" uid="10698"/>
-          <extra value="4" description="Patriot Radar AN/MPQ-63" uuid="c887027a-5269-11df-b467-080069138b88" uid="10699"/>
-        </specific>
-      </subcategory>
-      <subcategory value="3" description="MIM-14B Nike-Hercules SAM System" uuid="c88955c0-5269-11df-b4df-080069138b88" uid="10700"/>
-      <subcategory value="4" description="Theater High Altitude Area Defense (THAAD) System" uuid="c88a68b6-5269-11df-a644-080069138b88" uid="10701">
-        <specific value="1" description="THAAD Battery TOC" uuid="c88b7fb2-5269-11df-9718-080069138b88" uid="10702"/>
-        <specific value="2" description="THAAD ground-based radar (GBR)" uuid="c88c908c-5269-11df-bc2b-080069138b88" uid="10703"/>
-        <specific value="3" description="THAAD Launcher" uuid="c88d9b26-5269-11df-a484-080069138b88" uid="10704"/>
-      </subcategory>
-      <subcategory value="5" description="Self -Propelled VSHORAD Gun / Missile System" uuid="c88f4eee-5269-11df-bf95-080069138b88" uid="10705">
-        <specific value="1" description="M163 Vulcan SP Anti-Aircraft Gun" uuid="c8906072-5269-11df-b605-080069138b88" uid="10706"/>
-        <specific value="2" description="M42 Twin-40mm SP Anti-Aricraft Gun" uuid="c8917368-5269-11df-95aa-080069138b88" uid="10707"/>
-        <specific value="3" description="General Electric Vulcan-Commando 20 mm SP Air Defense (AD) System" uuid="c8928320-5269-11df-8973-080069138b88" uid="10708"/>
-        <specific value="4" description="Boeing Avenger Pedestal-Mounted Stinger SP Air Defense (AD) System" uuid="c89397b0-5269-11df-8ae1-080069138b88" uid="10709"/>
-        <specific value="5" description="Raytheon / Loral Aeronutronic Saber Air Defense (AD) System" uuid="c894ada8-5269-11df-9943-080069138b88" uid="10710"/>
-        <specific value="6" description="LTV Crossbow pedestal-mounted weapon system" uuid="c895be5a-5269-11df-9457-080069138b88" uid="10711"/>
-        <specific value="7" description="Loral Aeronutronic 48 Chaparral" uuid="c896d09c-5269-11df-9791-080069138b88" uid="10712">
-          <extra value="1" description="M48" uuid="c897df5a-5269-11df-b4f6-080069138b88" uid="10713"/>
-          <extra value="2" description="M48A1" uuid="c898e864-5269-11df-99de-080069138b88" uid="10714"/>
-          <extra value="3" description="M48A2" uuid="c899faa6-5269-11df-91c6-080069138b88" uid="10715"/>
-          <extra value="4" description="M48A3" uuid="c89b07b6-5269-11df-aa6f-080069138b88" uid="10716"/>
-        </specific>
-        <specific value="8" description="Block VII Low-Altitude SAM System" uuid="c89cb552-5269-11df-b4bd-080069138b88" uid="10717"/>
-        <specific value="9" description="Loral Aeronutronic SAM System" uuid="c89dc550-5269-11df-bf8a-080069138b88" uid="10718"/>
-        <specific value="10" description="M6 Linebacker" uuid="c89ed6f2-5269-11df-94bf-080069138b88" uid="10719"/>
-      </subcategory>
-      <subcategory value="6" description="Towed VSHORAD Gun / Missile System" uuid="c8a09280-5269-11df-bcbc-080069138b88" uid="10720">
-        <specific value="1" description="M1 40mm Automatic Anti-Aircraft Gun" uuid="c8a1a4fe-5269-11df-8320-080069138b88" uid="10721"/>
-        <specific value="2" description="M167 20mm Vulcan Anti-Aircraft Gun" uuid="c8a2b632-5269-11df-a723-080069138b88" uid="10722"/>
-        <specific value="3" description="M55 Quad 12.7mm Anti-Aircraft MG" uuid="c8a3c81a-5269-11df-8184-080069138b88" uid="10723"/>
-        <specific value="4" description="AN/MPQ-64 Phased Array SHORAD Radar" uuid="c8a4da02-5269-11df-8a5e-080069138b88" uid="10724"/>
-      </subcategory>
-      <subcategory value="7" description="HMWWV with AMRAAM" uuid="c8a68eba-5269-11df-bc51-080069138b88" uid="10725">
-        <specific value="1" description="USMC Complementary Low Altitude Weapon System (CLAWS)" uuid="c8a79a1c-5269-11df-b681-080069138b88" uid="10726"/>
-        <specific value="2" description="US Army HUMRAAM" uuid="c8a8acf4-5269-11df-afe7-080069138b88" uid="10727"/>
-      </subcategory>
-    </category>
-    <category value="29" description="Command, Control, Communications, and Intelligence (C3I) System" uuid="c8ab0170-5269-11df-bafc-080069138b88" uid="10728">
-      <subcategory value="1" description="Control and Reporting Center / Modular Control Equipment (CRC / MCE)" uuid="c8ac14e8-5269-11df-9f61-080069138b88" uid="10729"/>
-      <subcategory value="2" description="Control and Reporting Element (CRE)" uuid="c8ad2d42-5269-11df-b9ca-080069138b88" uid="10730"/>
-      <subcategory value="3" description="Control and Reporting Post (CRP)" uuid="c8ae4cd6-5269-11df-9bbd-080069138b88" uid="10731"/>
-      <subcategory value="4" description="USMC Tactical Air Operation Center (TAOC)" uuid="c8af5bbc-5269-11df-acc4-080069138b88" uid="10732"/>
-      <subcategory value="5" description="AN/TSQ-73 Missile Minder" uuid="c8b07114-5269-11df-a53f-080069138b88" uid="10733"/>
-      <subcategory value="6" description="JSTARS Ground Station Module (GSM) AN/TSQ-178" uuid="c8b182ca-5269-11df-859f-080069138b88" uid="10734"/>
-      <subcategory value="7" description="JSTARS Common Ground Station (CGS)" uuid="c8b295b6-5269-11df-be2c-080069138b88" uid="10735"/>
-      <subcategory value="8" description="UAV Ground Control Station" uuid="c8b3a88e-5269-11df-b4a4-080069138b88" uid="10736">
-        <specific value="1" description="Predator Ground Control Station" uuid="c8b4ba1c-5269-11df-b553-080069138b88" uid="10737"/>
-        <specific value="2" description="Hunter Ground Control Station" uuid="c8b5c95c-5269-11df-b47a-080069138b88" uid="10738"/>
-        <specific value="3" description="Shadow Ground Control Station" uuid="c8b6db6c-5269-11df-afd0-080069138b88" uid="10739"/>
-      </subcategory>
-    </category>
-    <category value="30" description="Operations Facility" uuid="c8b930a6-5269-11df-a166-080069138b88" uid="10740"/>
-    <category value="31" description="Intelligence Facility" uuid="c8ba4202-5269-11df-83db-080069138b88" uid="10741"/>
-    <category value="32" description="Surveillance Facility" uuid="c8bb5264-5269-11df-9f90-080069138b88" uid="10742">
-      <subcategory value="1" description="JLENS Processing Stations (General)" uuid="c8bc63de-5269-11df-865c-080069138b88" uid="10743">
-        <specific value="1" description="JLENS PTIR Processing Station" uuid="c8bd747c-5269-11df-80cd-080069138b88" uid="10744"/>
-        <specific value="2" description="JLENS SuR Processing Station" uuid="c8be860a-5269-11df-815a-080069138b88" uid="10745"/>
-      </subcategory>
-    </category>
-    <category value="33" description="Communications Facility" uuid="c8c0e530-5269-11df-9438-080069138b88" uid="10746"/>
-    <category value="34" description="Command Facility" uuid="c8c1f59c-5269-11df-9ef1-080069138b88" uid="10747"/>
-    <category value="35" description="C4I Facility" uuid="c8c3069e-5269-11df-a070-080069138b88" uid="10748"/>
-    <category value="36" description="Control Facility" uuid="c8c419c6-5269-11df-8f07-080069138b88" uid="10749"/>
-    <category value="37" description="Fire Control Facility" uuid="c8c5242e-5269-11df-80b3-080069138b88" uid="10750"/>
-    <category value="38" description="Missile Defense Facility" uuid="c8c63760-5269-11df-bdfc-080069138b88" uid="10751"/>
-    <category value="39" description="Field Command Post" uuid="c8c74a24-5269-11df-865b-080069138b88" uid="10752"/>
-    <category value="40" description="Observation Post" uuid="c8c856c6-5269-11df-96de-080069138b88" uid="10753"/>
-  </entity>
-  <entity kind="1" domain="2" country="225" uuid="c8ca08fe-5269-11df-86e8-080069138b88" uid="10754">
-    <category value="1" description="Fighter/Air Defense" uuid="c8cb1820-5269-11df-a9c8-080069138b88" uid="10755">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="c8cc2a76-5269-11df-a608-080069138b88" uid="10756"/>
-      <subcategory value="2" description="Grumman F-14 Tomcat" uuid="c8cd37fe-5269-11df-8d42-080069138b88" uid="10757">
-        <specific value="1" description="F-14A" uuid="c8ce4752-5269-11df-9f51-080069138b88" uid="10758"/>
-        <specific value="2" description="F-14D" uuid="c8cf5b4c-5269-11df-ac9c-080069138b88" uid="10759"/>
-        <specific value="3" description="F-14B" uuid="c8d0650a-5269-11df-9fe0-080069138b88" uid="10760"/>
-      </subcategory>
-      <subcategory value="3" description="General Dynamics F-16 Fighting Falcon" uuid="c8d2176a-5269-11df-a35d-080069138b88" uid="10761">
-        <specific value="1" description="F-16A" uuid="c8d3283a-5269-11df-b2b9-080069138b88" uid="10762"/>
-        <specific value="2" description="F-16B" uuid="c8d43b94-5269-11df-b3b6-080069138b88" uid="10763"/>
-        <specific value="3" description="F-16C" uuid="c8d545a2-5269-11df-8df4-080069138b88" uid="10764"/>
-        <specific value="4" description="F-16D" uuid="c8d655be-5269-11df-b44b-080069138b88" uid="10765"/>
-        <specific value="5" description="F-16E" uuid="c8d763dc-5269-11df-ae49-080069138b88" uid="10766"/>
-        <specific value="6" description="F-16N" uuid="c8d87222-5269-11df-bb0b-080069138b88" uid="10767"/>
-        <specific value="7" description="F-16 (ADF)" uuid="c8d982d4-5269-11df-a473-080069138b88" uid="10768"/>
-        <specific value="8" description="F-16 RECCE" uuid="c8da932c-5269-11df-9b9f-080069138b88" uid="10769"/>
-        <specific value="9" description="F/A-16" uuid="c8db9fc4-5269-11df-8425-080069138b88" uid="10770"/>
-        <specific value="10" description="F-16CJ (dedicated SEAD)" uuid="c8dcaff4-5269-11df-be4b-080069138b88" uid="10771"/>
-        <specific value="11" description="F-16CG" uuid="c8ddc9ca-5269-11df-980a-080069138b88" uid="10772"/>
-      </subcategory>
-      <subcategory value="4" description="McDonnell-Douglas F-4 Phantom II" uuid="c8dfa524-5269-11df-8ac9-080069138b88" uid="10773">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="c8e0b824-5269-11df-b800-080069138b88" uid="10774"/>
-        <specific value="2" description="F-4B" uuid="c8e1c39a-5269-11df-ad4b-080069138b88" uid="10775"/>
-        <specific value="3" description="F-4C" uuid="c8e2d712-5269-11df-af68-080069138b88" uid="10776"/>
-        <specific value="4" description="F-4D" uuid="c8e3e79c-5269-11df-9328-080069138b88" uid="10777"/>
-        <specific value="5" description="F-4E" uuid="c8e4f1e6-5269-11df-ae18-080069138b88" uid="10778"/>
-        <specific value="6" description="F-4F" uuid="c8e60090-5269-11df-a19a-080069138b88" uid="10779"/>
-        <specific value="7" description="F-4J" uuid="c8e70fbc-5269-11df-8845-080069138b88" uid="10780"/>
-        <specific value="8" description="(deprecated)" deprecated="1" uuid="c8e82028-5269-11df-82d1-080069138b88" uid="10781"/>
-        <specific value="9" description="(deprecated)" deprecated="1" uuid="c8e932ce-5269-11df-8cdc-080069138b88" uid="10782"/>
-        <specific value="10" description="F-4N" uuid="c8ea44ca-5269-11df-9b64-080069138b88" uid="10783"/>
-        <specific value="11" description="F-4S" uuid="c8eb55ae-5269-11df-bf25-080069138b88" uid="10784"/>
-      </subcategory>
-      <subcategory value="5" description="McDonnell-Douglas F-15 Eagle" uuid="c8ed05f2-5269-11df-aac9-080069138b88" uid="10785">
-        <specific value="1" description="F-15A" uuid="c8ee17c6-5269-11df-8fb8-080069138b88" uid="10786"/>
-        <specific value="2" description="F-15B" uuid="c8ef27c4-5269-11df-a423-080069138b88" uid="10787"/>
-        <specific value="3" description="F-15C" uuid="c8f035d8-5269-11df-87ca-080069138b88" uid="10788"/>
-        <specific value="4" description="F-15D" uuid="c8f14572-5269-11df-903c-080069138b88" uid="10789"/>
-        <specific value="5" description="F-15E" uuid="c8f253d6-5269-11df-893f-080069138b88" uid="10790"/>
-        <specific value="6" description="F-15F" uuid="c8f35db2-5269-11df-b50b-080069138b88" uid="10791"/>
-        <specific value="7" description="F-15H" uuid="c8f46e78-5269-11df-a07c-080069138b88" uid="10792"/>
-      </subcategory>
-      <subcategory value="6" description="Lockheed F-22 Raptor" uuid="c8f62236-5269-11df-8a38-080069138b88" uid="10793">
-        <specific value="1" description="F-22A" uuid="c8f730c2-5269-11df-b063-080069138b88" uid="10794"/>
-        <specific value="2" description="F-22B" uuid="c8f83c88-5269-11df-964f-080069138b88" uid="10795"/>
-      </subcategory>
-      <subcategory value="7" description="Lockheed F-104 Starfighter" uuid="c8f9f028-5269-11df-8e1f-080069138b88" uid="10796"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="c8fb01fc-5269-11df-ade2-080069138b88" uid="10797"/>
-      <subcategory value="9" description="McDonnell-Douglas F/A-18 Hornet" uuid="c8fc15a6-5269-11df-a6fc-080069138b88" uid="10798">
-        <specific value="1" description="F/A-18A" uuid="c8fd2fcc-5269-11df-b545-080069138b88" uid="10799"/>
-        <specific value="2" description="F/A-18B" uuid="c8fe4060-5269-11df-acda-080069138b88" uid="10800"/>
-        <specific value="3" description="F/A-18C" uuid="c8ff516c-5269-11df-8360-080069138b88" uid="10801"/>
-        <specific value="4" description="F/A-18D" uuid="c9005f58-5269-11df-b055-080069138b88" uid="10802"/>
-        <specific value="5" description="AF-18A" uuid="c9017122-5269-11df-aa72-080069138b88" uid="10803"/>
-        <specific value="6" description="ATF-18A" uuid="c90281de-5269-11df-baec-080069138b88" uid="10804"/>
-        <specific value="7" description="CF-188A/B" uuid="c9038f3e-5269-11df-aca4-080069138b88" uid="10805"/>
-        <specific value="8" description="C.15" uuid="c9049f28-5269-11df-adbd-080069138b88" uid="10806"/>
-        <specific value="9" description="CE.15" uuid="c905b142-5269-11df-91f7-080069138b88" uid="10807"/>
-        <specific value="10" description="F/A-18E" uuid="c906bcf4-5269-11df-b850-080069138b88" uid="10808"/>
-        <specific value="11" description="F/A-18F" uuid="c907d09e-5269-11df-9276-080069138b88" uid="10809"/>
-      </subcategory>
-      <subcategory value="10" description="Northrop F-5 Freedom Fighter/Tiger II" uuid="c9097ff2-5269-11df-a6ae-080069138b88" uid="10810">
-        <specific value="1" description="F-5A" uuid="c90a9194-5269-11df-bbbe-080069138b88" uid="10811"/>
-        <specific value="2" description="F-5B" uuid="c90b9f58-5269-11df-98ce-080069138b88" uid="10812"/>
-        <specific value="3" description="F-5E Tiger II" uuid="c90caede-5269-11df-9073-080069138b88" uid="10813"/>
-        <specific value="4" description="F-5F" uuid="c90dbec8-5269-11df-9986-080069138b88" uid="10814"/>
-        <specific value="5" description="RF-5A" uuid="c90ecc96-5269-11df-aa8a-080069138b88" uid="10815"/>
-        <specific value="6" description="RF-5E Tigereye" uuid="c90fdfe6-5269-11df-8e25-080069138b88" uid="10816"/>
-        <specific value="7" description="RF-5F" uuid="c910f2fa-5269-11df-8390-080069138b88" uid="10817"/>
-      </subcategory>
-      <subcategory value="11" description="Vought Crusader F-8" uuid="c912a302-5269-11df-98d9-080069138b88" uid="10818">
-        <specific value="1" description="Crusader (Vought F-8E (FN))" uuid="c913b2ce-5269-11df-a878-080069138b88" uid="10819"/>
-      </subcategory>
-      <subcategory value="12" description="F-35 Joint Strike Fighter (JSF)" uuid="c9156498-5269-11df-a54b-080069138b88" uid="10820">
-        <specific value="1" description="F-35A CTOL" uuid="c916755e-5269-11df-9a83-080069138b88" uid="10821"/>
-        <specific value="2" description="F-35C Naval" uuid="c9178976-5269-11df-a875-080069138b88" uid="10822"/>
-        <specific value="3" description="F-35B STOVL" uuid="c918938e-5269-11df-83fe-080069138b88" uid="10823"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Attack/Strike" uuid="c91af138-5269-11df-850d-080069138b88" uid="10824">
-      <subcategory value="1" description="McDonnell-Douglas A-4 Skyhawk" uuid="c91c0280-5269-11df-9743-080069138b88" uid="10825"/>
-      <subcategory value="2" description="A-6 Intruder" uuid="c91d1472-5269-11df-9cee-080069138b88" uid="10826">
-        <specific value="1" description="A-6A" uuid="c91e247a-5269-11df-b05a-080069138b88" uid="10827"/>
-        <specific value="2" description="A-6B" uuid="c91f3202-5269-11df-ac39-080069138b88" uid="10828"/>
-        <specific value="3" description="A-6C" uuid="c920419c-5269-11df-a03b-080069138b88" uid="10829"/>
-        <specific value="4" description="A-6E" uuid="c9214ee8-5269-11df-947b-080069138b88" uid="10830"/>
-      </subcategory>
-      <subcategory value="3" description="Vought A-7 Corsair II" uuid="c9230274-5269-11df-9d1a-080069138b88" uid="10831">
-        <specific value="1" description="A-7D" uuid="c9240df4-5269-11df-b46e-080069138b88" uid="10832"/>
-      </subcategory>
-      <subcategory value="4" description="Fairchild Republic A-10 Thunderbolt II" uuid="c925c0fe-5269-11df-a83f-080069138b88" uid="10833">
-        <specific value="1" description="A-10A" uuid="c926d3a4-5269-11df-9766-080069138b88" uid="10834"/>
-        <specific value="2" description="OA-10A" uuid="c927e2f8-5269-11df-942d-080069138b88" uid="10835"/>
-      </subcategory>
-      <subcategory value="5" description="Cessna 318E Dragonfly" uuid="c92998c8-5269-11df-8670-080069138b88" uid="10836">
-        <specific value="1" description="A-37" uuid="c92aa416-5269-11df-bd7d-080069138b88" uid="10837"/>
-      </subcategory>
-      <subcategory value="6" description="Grumman EA-6 Prowler" deprecated="1" uuid="c92c531a-5269-11df-8d20-080069138b88" uid="10838">
-        <specific value="1" description="EA-6A" deprecated="1" uuid="c92d687c-5269-11df-8ded-080069138b88" uid="10839"/>
-        <specific value="2" description="EA-6B" deprecated="1" uuid="c92e7a64-5269-11df-9929-080069138b88" uid="10840"/>
-      </subcategory>
-      <subcategory value="7" description="Grumman A-6 Intruder Tanker" deprecated="1" uuid="c9302bac-5269-11df-9daf-080069138b88" uid="10841">
-        <specific value="1" description="KA-6D" deprecated="1" uuid="c9313b6e-5269-11df-b640-080069138b88" uid="10842"/>
-        <specific value="2" description="KA-6H" deprecated="1" uuid="c9324b4e-5269-11df-b9f3-080069138b88" uid="10843"/>
-      </subcategory>
-      <subcategory value="8" description="McDonnell-Douglas AV-8B Harrier II" uuid="c933fd54-5269-11df-b790-080069138b88" uid="10844">
-        <specific value="1" description="AV-8B" uuid="c93510fe-5269-11df-9721-080069138b88" uid="10845"/>
-        <specific value="2" description="TAV-8B" uuid="c9361b52-5269-11df-9817-080069138b88" uid="10846"/>
-        <specific value="3" description="Harrier GR. Mk 5" uuid="c9372c0e-5269-11df-91ae-080069138b88" uid="10847"/>
-        <specific value="4" description="Harrier GR. Mk 5A" uuid="c9383e32-5269-11df-b401-080069138b88" uid="10848"/>
-        <specific value="5" description="Harrier GR. Mk 7" uuid="c9394cf0-5269-11df-90fd-080069138b88" uid="10849"/>
-        <specific value="6" description="Harrier T. Mk 10" uuid="c93a866a-5269-11df-85e6-080069138b88" uid="10850"/>
-        <specific value="7" description="VA.2 Matador II" uuid="c93b9cc6-5269-11df-a832-080069138b88" uid="10851"/>
-      </subcategory>
-      <subcategory value="9" description="Rockwell (Lockheed) AC-130U Spectre" deprecated="1" uuid="c93d5002-5269-11df-a6fa-080069138b88" uid="10852"/>
-      <subcategory value="10" description="McDonnell-Douglas F-4 Phantom II" uuid="c93e6348-5269-11df-a6e3-080069138b88" uid="10853">
-        <specific value="1" description="F-4G Wild Weasel" uuid="c93f75ee-5269-11df-ba59-080069138b88" uid="10854"/>
-      </subcategory>
-      <subcategory value="11" description="Lockheed F-117A" uuid="c94127ea-5269-11df-ab50-080069138b88" uid="10855"/>
-      <subcategory value="12" description="General Dynamics F-111" uuid="c9423acc-5269-11df-9335-080069138b88" uid="10856">
-        <specific value="1" description="F-111E" uuid="c943457a-5269-11df-94ed-080069138b88" uid="10857"/>
-        <specific value="2" description="F-111F" uuid="c94455e6-5269-11df-acc1-080069138b88" uid="10858"/>
-        <specific value="3" description="F-111C" uuid="c9456774-5269-11df-ac54-080069138b88" uid="10859"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Bomber" uuid="c947cf78-5269-11df-8efa-080069138b88" uid="10860">
-      <subcategory value="1" description="Rockwell International B-1" uuid="c948dea4-5269-11df-8659-080069138b88" uid="10861">
-        <specific value="1" description="B-1B" uuid="c949e9ca-5269-11df-9f3e-080069138b88" uid="10862"/>
-      </subcategory>
-      <subcategory value="2" description="Northrop B-2" uuid="c94b9d06-5269-11df-84e8-080069138b88" uid="10863"/>
-      <subcategory value="3" description="Boeing B-52 Stratofortress" uuid="c94cad90-5269-11df-8ca2-080069138b88" uid="10864">
-        <specific value="1" description="B-52G" uuid="c94dbdde-5269-11df-89f6-080069138b88" uid="10865"/>
-        <specific value="2" description="B-52H" uuid="c94ecb66-5269-11df-8487-080069138b88" uid="10866"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Cargo/Tanker" uuid="c9511d4e-5269-11df-a480-080069138b88" uid="10867">
-      <subcategory value="1" description="Lockheed C-130 (Model 382) Hercules" uuid="c9522b1c-5269-11df-9bbc-080069138b88" uid="10868">
-        <specific value="1" description="C-130" uuid="c9533b92-5269-11df-bbc4-080069138b88" uid="10869"/>
-        <specific value="2" description="AC-130" uuid="c9544a14-5269-11df-aeb3-080069138b88" uid="10870">
-          <extra value="1" description="AC-130A" uuid="c95557b0-5269-11df-a66e-080069138b88" uid="10871"/>
-          <extra value="2" description="AC-130E" uuid="c95665a6-5269-11df-8020-080069138b88" uid="10872"/>
-          <extra value="3" description="AC-130H" uuid="c957746e-5269-11df-82bf-080069138b88" uid="10873"/>
-          <extra value="4" description="AC-130U" uuid="c95888e0-5269-11df-a79b-080069138b88" uid="10874"/>
-        </specific>
-        <specific value="3" description="DC-130" uuid="c95a3c12-5269-11df-99e0-080069138b88" uid="10875"/>
-        <specific value="4" description="EC-130E Commando Solo" uuid="c95b4a08-5269-11df-91d2-080069138b88" uid="10876"/>
-        <specific value="5" description="HC-130" uuid="c95c5b8c-5269-11df-aa6e-080069138b88" uid="10877"/>
-        <specific value="6" description="JC-130" uuid="c95d6964-5269-11df-b8ac-080069138b88" uid="10878"/>
-        <specific value="7" description="LC-130" uuid="c95e7958-5269-11df-a109-080069138b88" uid="10879"/>
-        <specific value="8" description="MC-130" uuid="c95f88f2-5269-11df-988e-080069138b88" uid="10880">
-          <extra value="1" description="MC-130E" uuid="c9609620-5269-11df-a582-080069138b88" uid="10881"/>
-          <extra value="2" description="MC-130P" uuid="c961a4d4-5269-11df-9f8b-080069138b88" uid="10882"/>
-          <extra value="3" description="MC-130H" uuid="c962b342-5269-11df-866d-080069138b88" uid="10883"/>
-        </specific>
-        <specific value="9" description="NC-130" uuid="c9646188-5269-11df-890b-080069138b88" uid="10884"/>
-        <specific value="10" description="RC-130" uuid="c9656fa6-5269-11df-b846-080069138b88" uid="10885"/>
-        <specific value="11" description="WC-130" uuid="c96680c6-5269-11df-9eb5-080069138b88" uid="10886"/>
-        <specific value="12" description="TC-130" uuid="c96790ba-5269-11df-beab-080069138b88" uid="10887"/>
-        <specific value="13" description="KC-130" uuid="c96898d4-5269-11df-9c02-080069138b88" uid="10888"/>
-        <specific value="14" description="CC-130" uuid="c969a904-5269-11df-977e-080069138b88" uid="10889"/>
-        <specific value="15" description="Hercules C. Mk 1" uuid="c96abd12-5269-11df-9959-080069138b88" uid="10890"/>
-        <specific value="16" description="Hercules C. Mk 2" uuid="c96bc5fe-5269-11df-b358-080069138b88" uid="10891"/>
-        <specific value="17" description="Hercules C. Mk 3P" uuid="c96cd700-5269-11df-8861-080069138b88" uid="10892"/>
-        <specific value="18" description="(deprecated)" deprecated="1" uuid="c96dea32-5269-11df-a7a4-080069138b88" uid="10893"/>
-        <specific value="19" description="T.10" uuid="c96ef616-5269-11df-adc0-080069138b88" uid="10894"/>
-        <specific value="20" description="TK.10" uuid="c97003ee-5269-11df-a267-080069138b88" uid="10895"/>
-        <specific value="21" description="TL.10" uuid="c97117c0-5269-11df-a18b-080069138b88" uid="10896"/>
-        <specific value="22" description="Tp 84" uuid="c972208e-5269-11df-a27a-080069138b88" uid="10897"/>
-        <specific value="23" description="C-130H" uuid="c9732f88-5269-11df-935a-080069138b88" uid="10898"/>
-        <specific value="24" description="C-130H-30" uuid="c97441de-5269-11df-9c9f-080069138b88" uid="10899"/>
-        <specific value="25" description="KC-130H" uuid="c9754d86-5269-11df-bdfc-080069138b88" uid="10900"/>
-        <specific value="26" description="C-130H-MP" uuid="c97667f2-5269-11df-9ca9-080069138b88" uid="10901"/>
-        <specific value="27" description="VC-130H" uuid="c9778aba-5269-11df-9413-080069138b88" uid="10902"/>
-        <specific value="28" description="C-130J" uuid="c978943c-5269-11df-8625-080069138b88" uid="10903"/>
-        <specific value="29" description="C-130J-30" uuid="c979a408-5269-11df-92b9-080069138b88" uid="10904"/>
-        <specific value="30" description="EC-130J Commando Solo" uuid="c97ab4d8-5269-11df-908c-080069138b88" uid="10905"/>
-        <specific value="31" description="KC-130T" status="new" uuid="46c096f6-2570-4595-a835-b991b7f54832" uid="22852">
-          <cr value="2194"/>
-        </specific>
-        <specific value="32" description="EC-130 Senior Scout" status="new" uuid="9d9f7289-cd15-460b-8174-e35ffcea2600" uid="22853">
-          <cr value="2194"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="Lockheed C-5 Galaxy" uuid="c97c699a-5269-11df-a5a3-080069138b88" uid="10906">
-        <specific value="1" description="C-5A" uuid="c97d72f4-5269-11df-b289-080069138b88" uid="10907"/>
-        <specific value="2" description="C-5B" uuid="c97e827a-5269-11df-a352-080069138b88" uid="10908"/>
-      </subcategory>
-      <subcategory value="3" description="Lockheed C-141 Starlifter" uuid="c9803b2e-5269-11df-a3cf-080069138b88" uid="10909">
-        <specific value="1" description="C-141A" uuid="c9814c62-5269-11df-bc0e-080069138b88" uid="10910"/>
-        <specific value="2" description="C-141B" uuid="c9825490-5269-11df-ab66-080069138b88" uid="10911"/>
-      </subcategory>
-      <subcategory value="4" description="C-135" uuid="c98405d8-5269-11df-a03c-080069138b88" uid="10912"/>
-      <subcategory value="5" description="Boeing KC-135 Stratotanker" uuid="c9851856-5269-11df-9523-080069138b88" uid="10913">
-        <specific value="1" description="KC-135A" uuid="c9862b9c-5269-11df-98e2-080069138b88" uid="10914"/>
-        <specific value="2" description="KC-135E" uuid="c987347e-5269-11df-91d4-080069138b88" uid="10915"/>
-        <specific value="3" description="KC-135Q" uuid="c98844d6-5269-11df-ac3f-080069138b88" uid="10916"/>
-        <specific value="4" description="KC-135R" uuid="c9895394-5269-11df-8093-080069138b88" uid="10917"/>
-      </subcategory>
-      <subcategory value="6" description="McDonnell-Douglas KC-10 Extender" uuid="c98b059a-5269-11df-960c-080069138b88" uid="10918">
-        <specific value="1" description="KC-10A" uuid="c98c1002-5269-11df-831c-080069138b88" uid="10919"/>
-      </subcategory>
-      <subcategory value="7" description="Boeing 707 tanker/transport" uuid="c98dc38e-5269-11df-9ff7-080069138b88" uid="10920">
-        <specific value="1" description="KE-3A" deprecated="1" uuid="c98ed378-5269-11df-a1a0-080069138b88" uid="10921"/>
-        <specific value="2" description="T.17" uuid="c98fe3da-5269-11df-92e5-080069138b88" uid="10922"/>
-      </subcategory>
-      <subcategory value="8" description="Boeing 707" uuid="c991920c-5269-11df-b1f4-080069138b88" uid="10923">
-        <specific value="1" description="VC-137" uuid="c9929eae-5269-11df-acb2-080069138b88" uid="10924"/>
-        <specific value="2" description="E-6A" deprecated="1" uuid="c993af24-5269-11df-bc3e-080069138b88" uid="10925"/>
-        <specific value="3" description="E-8" deprecated="1" uuid="c994c116-5269-11df-a444-080069138b88" uid="10926"/>
-      </subcategory>
-      <subcategory value="9" description="McDonnell-Douglas C-17A" uuid="c9969f90-5269-11df-b1e7-080069138b88" uid="10927"/>
-      <subcategory value="10" description="Boeing 747" uuid="c997af3e-5269-11df-bc75-080069138b88" uid="10928">
-        <specific value="1" description="C-25A" uuid="c998c14e-5269-11df-8f9a-080069138b88" uid="10929"/>
-        <specific value="2" description="VC-25A &quot;Air Force One&quot;" uuid="c999d5d4-5269-11df-9fae-080069138b88" uid="10930"/>
-        <specific value="3" description="Boeing/Rockwell YAL-1 Airborne Laser (ABL)" uuid="c99ae992-5269-11df-a6b4-080069138b88" uid="10931"/>
-      </subcategory>
-      <subcategory value="11" description="Gulfstream Aerospace Gulfstream III" uuid="c99c9b3e-5269-11df-b1db-080069138b88" uid="10932">
-        <specific value="1" description="C-20" uuid="c99daa10-5269-11df-84d8-080069138b88" uid="10933"/>
-      </subcategory>
-      <subcategory value="12" description="Learjet 35A/36A" uuid="c99f5d1a-5269-11df-b08c-080069138b88" uid="10934">
-        <specific value="1" description="C-21A" uuid="c9a06d18-5269-11df-b279-080069138b88" uid="10935"/>
-      </subcategory>
-      <subcategory value="13" description="Lockheed Model 1329-25 Jetstar II" uuid="c9a22072-5269-11df-a772-080069138b88" uid="10936">
-        <specific value="1" description="C-140" uuid="c9a32f44-5269-11df-a2a9-080069138b88" uid="10937"/>
-      </subcategory>
-      <subcategory value="14" description="Douglas DC-3" uuid="c9a4e3ca-5269-11df-abd5-080069138b88" uid="10938">
-        <specific value="1" description="C-47" uuid="c9a5eda6-5269-11df-bbbf-080069138b88" uid="10939"/>
-        <specific value="2" description="R4D" uuid="c9a6fb2e-5269-11df-84b1-080069138b88" uid="10940"/>
-        <specific value="3" description="Dakota" uuid="c9a80dc0-5269-11df-a2cb-080069138b88" uid="10941"/>
-      </subcategory>
-      <subcategory value="15" description="McDonnell-Douglas DC-9" uuid="c9a9bfb2-5269-11df-9306-080069138b88" uid="10942">
-        <specific value="1" description="C-9A" uuid="c9aac998-5269-11df-8723-080069138b88" uid="10943"/>
-        <specific value="2" description="VC-9C" uuid="c9abd784-5269-11df-b5d4-080069138b88" uid="10944"/>
-        <specific value="3" description="C-9B" uuid="c9acea34-5269-11df-991c-080069138b88" uid="10945"/>
-      </subcategory>
-      <subcategory value="16" description="Beechcraft Super King Air 200/B200" uuid="c9ae99ba-5269-11df-b283-080069138b88" uid="10946">
-        <specific value="1" description="C-12" uuid="c9afa710-5269-11df-ba0e-080069138b88" uid="10947"/>
-      </subcategory>
-      <subcategory value="17" description="Bell/Boeing V-22 Osprey" uuid="c9b15894-5269-11df-b872-080069138b88" uid="10948">
-        <specific value="1" description="CV-22A" uuid="c9b26856-5269-11df-b693-080069138b88" uid="10949"/>
-        <specific value="2" description="CV-22B" uuid="c9b376b0-5269-11df-b84c-080069138b88" uid="10950"/>
-        <specific value="11" description="MV-22A" uuid="c9b48fdc-5269-11df-896e-080069138b88" uid="10951"/>
-        <specific value="12" description="MV-22B" uuid="c9b59f62-5269-11df-bf5a-080069138b88" uid="10952"/>
-        <specific value="21" description="HV-22A" uuid="c9b6af7e-5269-11df-ae83-080069138b88" uid="10953"/>
-        <specific value="22" description="HV-22B" uuid="c9b7bd06-5269-11df-b0b1-080069138b88" uid="10954"/>
-      </subcategory>
-      <subcategory value="18" description="Rockwell T-39 Saberliner" uuid="c9b96b06-5269-11df-bf99-080069138b88" uid="10955"/>
-      <subcategory value="19" description="Grumman C-2A Greyhound (COD)" uuid="c9ba7c4e-5269-11df-b8fa-080069138b88" uid="10956"/>
-      <subcategory value="20" description="(deprecated)" deprecated="1" uuid="c9bb9106-5269-11df-a9ce-080069138b88" uid="10957"/>
-      <subcategory value="21" description="Lockheed Model L100" uuid="c9bc9bb4-5269-11df-8773-080069138b88" uid="10958">
-        <specific value="1" description="L100-30 (hospital)" uuid="c9bdab44-5269-11df-87bc-080069138b88" uid="10959"/>
-      </subcategory>
-      <subcategory value="22" description="Grumman KA-6 Intruder Tanker" deprecated="1" uuid="c9bf5d72-5269-11df-ab91-080069138b88" uid="10960">
-        <specific value="1" description="KA-6D" deprecated="1" uuid="c9c06dc0-5269-11df-a48f-080069138b88" uid="10961"/>
-        <specific value="2" description="KA-6H" deprecated="1" uuid="c9c179e0-5269-11df-b96e-080069138b88" uid="10962"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Antisubmarine/patrol/observation" uuid="c9c3d0a0-5269-11df-ab2c-080069138b88" uid="10963">
-      <subcategory value="1" description="Lockheed Model 185/285 Orion" uuid="c9c4db58-5269-11df-a6b6-080069138b88" uid="10964">
-        <specific value="1" description="P-3" uuid="c9c5ef20-5269-11df-bdba-080069138b88" uid="10965"/>
-        <specific value="2" description="P-3C" uuid="c9c6fdd4-5269-11df-bc1a-080069138b88" uid="10966"/>
-        <specific value="3" description="UP-3" uuid="c9c80742-5269-11df-9489-080069138b88" uid="10967"/>
-        <specific value="4" description="UP-3C" uuid="c9c91952-5269-11df-a3a9-080069138b88" uid="10968"/>
-        <specific value="5" description="EP-3" uuid="c9ca2752-5269-11df-8faa-080069138b88" uid="10969"/>
-        <specific value="6" description="P-3J" uuid="c9cb30f2-5269-11df-a8ea-080069138b88" uid="10970"/>
-        <specific value="7" description="P-3W" uuid="c9cc40c8-5269-11df-b4ff-080069138b88" uid="10971"/>
-        <specific value="8" description="P-3 AEW&amp;C" uuid="c9cd4dce-5269-11df-acb0-080069138b88" uid="10972"/>
-        <specific value="9" description="CF-140 Aurora" uuid="c9ce5b6a-5269-11df-835d-080069138b88" uid="10973"/>
-        <specific value="10" description="CP-140 Arcturus" uuid="c9cf6a96-5269-11df-8cfc-080069138b88" uid="10974"/>
-        <specific value="11" description="EP-3E" uuid="c9d079c2-5269-11df-aac1-080069138b88" uid="10975"/>
-        <specific value="12" description="AP-3C (Australia)" uuid="c9d187a4-5269-11df-b8fc-080069138b88" uid="10976"/>
-        <specific value="13" description="P3-K (Canada)" uuid="c9d297de-5269-11df-af42-080069138b88" uid="10977"/>
-        <specific value="14" description="P-3F (Iran)" uuid="c9d3b22c-5269-11df-a044-080069138b88" uid="10978"/>
-      </subcategory>
-      <subcategory value="2" description="Lockheed S-3 Viking" uuid="c9d56540-5269-11df-aab7-080069138b88" uid="10979">
-        <specific value="1" description="S-3B" uuid="c9d66d5a-5269-11df-b8c7-080069138b88" uid="10980"/>
-        <specific value="2" description="ES-3" uuid="c9d77da8-5269-11df-b0a8-080069138b88" uid="10981"/>
-        <specific value="3" description="KS-3" uuid="c9d88d38-5269-11df-9fc5-080069138b88" uid="10982"/>
-      </subcategory>
-      <subcategory value="3" description="Rockwell International OV-10 Bronco" uuid="c9da3e8a-5269-11df-9ed8-080069138b88" uid="10983">
-        <specific value="1" description="OV-10" uuid="c9db497e-5269-11df-a825-080069138b88" uid="10984"/>
-        <specific value="2" description="OV-10D Plus" uuid="c9dc585a-5269-11df-a818-080069138b88" uid="10985"/>
-      </subcategory>
-      <subcategory value="4" description="Schweizer SA 2-37A" uuid="c9de0a10-5269-11df-9e1a-080069138b88" uid="10986">
-        <specific value="1" description="RG-8A" uuid="c9df17e8-5269-11df-a19d-080069138b88" uid="10987"/>
-      </subcategory>
-      <subcategory value="5" description="Boeing P-8 Multi-Mission Maritime Aircraft (MMA)" uuid="c9e0ca0c-5269-11df-b44c-080069138b88" uid="10988">
-        <specific value="1" description="P-8A" uuid="c9e1d4ba-5269-11df-893e-080069138b88" uid="10989"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Electronic Warfare (EW)" uuid="c9e42b3e-5269-11df-8c8b-080069138b88" uid="10990">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="c9e534f2-5269-11df-9f10-080069138b88" uid="10991"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="c9e645fe-5269-11df-9f1e-080069138b88" uid="10992"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="c9e758e0-5269-11df-98ab-080069138b88" uid="10993"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="c9e86a14-5269-11df-a166-080069138b88" uid="10994"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="c9e97954-5269-11df-9e33-080069138b88" uid="10995"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="c9ea8b46-5269-11df-aafb-080069138b88" uid="10996"/>
-      <subcategory value="7" description="Grumman (General Dynamics) EF-111 Raven" uuid="c9eb9af4-5269-11df-b466-080069138b88" uid="10997">
-        <specific value="1" description="EF-111A" uuid="c9ecac50-5269-11df-b22a-080069138b88" uid="10998"/>
-      </subcategory>
-      <subcategory value="8" description="EC-130 Compass Call Electronic Combat (C2W)" uuid="c9ee5a6e-5269-11df-91fb-080069138b88" uid="10999"/>
-      <subcategory value="9" description="Grumman EA-6 Prowler" uuid="c9ef6f76-5269-11df-bd60-080069138b88" uid="11000">
-        <specific value="1" description="EA-6A" uuid="c9f079fc-5269-11df-8190-080069138b88" uid="11001"/>
-        <specific value="2" description="EA-6B" uuid="c9f19008-5269-11df-8e07-080069138b88" uid="11002"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Reconnaissance" uuid="c9f40af4-5269-11df-8db4-080069138b88" uid="11003">
-      <subcategory value="1" description="Lockheed SR-71 Blackbird" uuid="c9f51ae8-5269-11df-bcf2-080069138b88" uid="11004">
-        <specific value="1" description="SR-71B" uuid="c9f62dca-5269-11df-b0f4-080069138b88" uid="11005"/>
-      </subcategory>
-      <subcategory value="2" description="Lockheed TR-1" deprecated="1" uuid="c9f7e21e-5269-11df-a7a4-080069138b88" uid="11006">
-        <specific value="1" description="TR-1A" deprecated="1" uuid="c9f8f1ae-5269-11df-b88d-080069138b88" uid="11007"/>
-        <specific value="2" description="TR-1B" deprecated="1" uuid="c9f9fbe4-5269-11df-895f-080069138b88" uid="11008"/>
-      </subcategory>
-      <subcategory value="3" description="Lockheed U-2" uuid="c9fbb088-5269-11df-a6ea-080069138b88" uid="11009">
-        <specific value="1" description="U-2R" uuid="c9fcbfc8-5269-11df-a5c3-080069138b88" uid="11010"/>
-        <specific value="2" description="ER-2" uuid="c9fdcf6c-5269-11df-8974-080069138b88" uid="11011"/>
-        <specific value="3" description="U-2S" uuid="c9fed75e-5269-11df-82ef-080069138b88" uid="11012"/>
-      </subcategory>
-      <subcategory value="4" description="McDonnell-Douglas F-4 Phantom II" uuid="ca0089f0-5269-11df-83cc-080069138b88" uid="11013">
-        <specific value="1" description="RF-4B" uuid="ca019aac-5269-11df-b272-080069138b88" uid="11014"/>
-        <specific value="2" description="YRF-4C" uuid="ca02acb2-5269-11df-b66a-080069138b88" uid="11015"/>
-        <specific value="3" description="RF-4C" uuid="ca03b5c6-5269-11df-aba5-080069138b88" uid="11016"/>
-        <specific value="4" description="RF-4E" uuid="ca04c894-5269-11df-80aa-080069138b88" uid="11017"/>
-        <specific value="5" description="RF-4EJ" uuid="ca05d7b6-5269-11df-9008-080069138b88" uid="11018"/>
-      </subcategory>
-      <subcategory value="5" description="Sadler A-22 LASA" uuid="ca0787c8-5269-11df-bad6-080069138b88" uid="11019"/>
-      <subcategory value="6" description="Boeing Canada DHC-7 Airborne Reconnaissance--Low (ARL)" uuid="ca089582-5269-11df-8f6c-080069138b88" uid="11020"/>
-      <subcategory value="7" description="Boeing RC-135" uuid="ca09a918-5269-11df-8227-080069138b88" uid="11021">
-        <specific value="1" description="RC-135S Cobra Ball" uuid="ca0ab89e-5269-11df-85cd-080069138b88" uid="11022"/>
-        <specific value="2" description="RC-135U Combat Sent" uuid="ca0bc626-5269-11df-80d1-080069138b88" uid="11023"/>
-        <specific value="3" description="RC-135 V/W Rivet Joint" uuid="ca0cd584-5269-11df-b870-080069138b88" uid="11024"/>
-        <specific value="4" description="RC-135X Cobra Eye" uuid="ca0de64a-5269-11df-aeb6-080069138b88" uid="11025"/>
-      </subcategory>
-      <subcategory value="8" description="Beechcraft Super King AIR 200/B200" uuid="ca0f9a1c-5269-11df-8c64-080069138b88" uid="11026">
-        <specific value="1" description="RC-12H Guardrail Common Sensor" uuid="ca10af38-5269-11df-a455-080069138b88" uid="11027"/>
-        <specific value="2" description="RC-12D" uuid="ca11c238-5269-11df-abea-080069138b88" uid="11028"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Surveillance / C2 (Airborne Early Warning)" uuid="ca141538-5269-11df-9136-080069138b88" uid="11029">
-      <subcategory value="1" description="Grumman E-2 Hawkeye" uuid="ca1525b8-5269-11df-884c-080069138b88" uid="11030">
-        <specific value="1" description="E-2C" uuid="ca1635b6-5269-11df-8251-080069138b88" uid="11031"/>
-        <specific value="2" description="TE-2C" uuid="ca174492-5269-11df-8a2b-080069138b88" uid="11032"/>
-      </subcategory>
-      <subcategory value="2" description="EA-3" uuid="ca18f6f2-5269-11df-8618-080069138b88" uid="11033">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="ca1a00c4-5269-11df-adf8-080069138b88" uid="11034"/>
-        <specific value="2" description="EA-3B" uuid="ca1b12ca-5269-11df-a87a-080069138b88" uid="11035"/>
-      </subcategory>
-      <subcategory value="3" description="Boeing E-6A Mercury (TACAMO II)" uuid="ca1cc46c-5269-11df-8b2e-080069138b88" uid="11036"/>
-      <subcategory value="4" description="Boeing E-3 Sentry" uuid="ca1dd4e2-5269-11df-9e07-080069138b88" uid="11037">
-        <specific value="1" description="E-3A Airborne Warning and Control System (AWACS)" uuid="ca1ee080-5269-11df-ac1c-080069138b88" uid="11038"/>
-        <specific value="2" description="E-3B AWACS" uuid="ca1ff614-5269-11df-89f3-080069138b88" uid="11039"/>
-        <specific value="3" description="E-3C AWACS" uuid="ca210518-5269-11df-aabc-080069138b88" uid="11040"/>
-        <specific value="4" description="E-3D Sentry AEW. Mk 1" uuid="ca220fa8-5269-11df-a0ce-080069138b88" uid="11041"/>
-        <specific value="5" description="E-3F System de Detection Aeroporte" uuid="ca232442-5269-11df-bc3b-080069138b88" uid="11042"/>
-        <specific value="6" description="KE-3A AWACS (Saudi Arabia)" uuid="ca243508-5269-11df-b58e-080069138b88" uid="11043"/>
-      </subcategory>
-      <subcategory value="5" description="Boeing E-4 Advanced Airborne Command Post (AABNCP)" uuid="ca25e54c-5269-11df-8b6c-080069138b88" uid="11044">
-        <specific value="1" description="E-4A" uuid="ca26f5fe-5269-11df-88d0-080069138b88" uid="11045"/>
-        <specific value="2" description="E-4B" uuid="ca28071e-5269-11df-a87e-080069138b88" uid="11046"/>
-      </subcategory>
-      <subcategory value="6" description="E-8 (Joint STARS/JSTARS)" uuid="ca29b6b8-5269-11df-b7d3-080069138b88" uid="11047">
-        <specific value="1" description="E-8A" uuid="ca2ac882-5269-11df-b5ce-080069138b88" uid="11048"/>
-        <specific value="2" description="E-8C" uuid="ca2bd236-5269-11df-96c1-080069138b88" uid="11049"/>
-      </subcategory>
-      <subcategory value="7" description="Aerostat" uuid="ca2d8068-5269-11df-bd47-080069138b88" uid="11050"/>
-      <subcategory value="8" description="EC-130E Airborne Command, Control and Communications (ABCCC)" uuid="ca2e9494-5269-11df-a8a9-080069138b88" uid="11051"/>
-      <subcategory value="9" description="EC-135 Airborne Command Post" uuid="ca2fb0ea-5269-11df-a9e3-080069138b88" uid="11052"/>
-      <subcategory value="10" description="JLENS Aerostats" uuid="ca30be9a-5269-11df-ad56-080069138b88" uid="11053">
-        <specific value="1" description="JLENS PTIR Aerostat Platform" uuid="ca31d280-5269-11df-a7fb-080069138b88" uid="11054"/>
-        <specific value="2" description="JLENS SuR Aerostat Plaftorm" uuid="ca32e396-5269-11df-97d8-080069138b88" uid="11055"/>
-      </subcategory>
-    </category>
-    <category value="20" description="Attack helicopter" uuid="ca35359c-5269-11df-b933-080069138b88" uid="11056">
-      <subcategory value="1" description="McDonnell-Douglas AH-64 Apache" uuid="ca364450-5269-11df-ae66-080069138b88" uid="11057">
-        <specific value="1" description="AH-64A" uuid="ca374f9e-5269-11df-ac90-080069138b88" uid="11058"/>
-        <specific value="2" description="AH-64B" uuid="ca3863a2-5269-11df-9f54-080069138b88" uid="11059"/>
-        <specific value="3" description="AH-64C" uuid="ca3971de-5269-11df-8823-080069138b88" uid="11060"/>
-        <specific value="4" description="AH-64D with Longbow Radar" uuid="ca3a7c78-5269-11df-b4f5-080069138b88" uid="11061"/>
-        <specific value="5" description="Petan (Cobra)" uuid="ca3b8d48-5269-11df-84d2-080069138b88" uid="11062"/>
-        <specific value="6" description="AH-64D without Longbow Radar" uuid="ca3ca03e-5269-11df-8712-080069138b88" uid="11063"/>
-      </subcategory>
-      <subcategory value="2" description="Bell Model 209 Hueycobra, Seacobra, Supercobra" uuid="ca3e4fb0-5269-11df-bfe4-080069138b88" uid="11064">
-        <specific value="1" description="AH-1E" uuid="ca3f5bda-5269-11df-b8fe-080069138b88" uid="11065"/>
-        <specific value="2" description="AH-1F" uuid="ca4070a6-5269-11df-9b0d-080069138b88" uid="11066"/>
-        <specific value="3" description="AH-1G" uuid="ca4180b8-5269-11df-bac6-080069138b88" uid="11067"/>
-        <specific value="4" description="AH-1J" uuid="ca4289c2-5269-11df-95b2-080069138b88" uid="11068"/>
-        <specific value="5" description="AH-1P" uuid="ca439c04-5269-11df-a1db-080069138b88" uid="11069"/>
-        <specific value="6" description="AH-1Q" uuid="ca44ab1c-5269-11df-9f58-080069138b88" uid="11070"/>
-        <specific value="7" description="AH-1R" uuid="ca45b3fe-5269-11df-88d5-080069138b88" uid="11071"/>
-        <specific value="8" description="AH-1S" uuid="ca46c1d6-5269-11df-9262-080069138b88" uid="11072"/>
-        <specific value="9" description="AH-1T" uuid="ca47d44a-5269-11df-8255-080069138b88" uid="11073"/>
-        <specific value="10" description="AH-1W" uuid="ca48ddb8-5269-11df-a100-080069138b88" uid="11074"/>
-        <specific value="11" description="AH-1W Venom" uuid="ca49ead2-5269-11df-8550-080069138b88" uid="11075"/>
-        <specific value="12" description="TH-1S" uuid="ca4afc60-5269-11df-96ae-080069138b88" uid="11076"/>
-        <specific value="13" description="TH-1W" uuid="ca4c08e4-5269-11df-9ea9-080069138b88" uid="11077"/>
-      </subcategory>
-      <subcategory value="3" description="Bell AH-1(4B)W Viper" uuid="ca4dc09e-5269-11df-894e-080069138b88" uid="11078"/>
-      <subcategory value="4" description="Boeing/Sikorsky RAH-66 Comanche" uuid="ca4ef644-5269-11df-b5f0-080069138b88" uid="11079">
-        <specific value="1" description="RAH-66 with LONGBOW radar" uuid="ca500ec6-5269-11df-85bf-080069138b88" uid="11080"/>
-      </subcategory>
-      <subcategory value="5" description="McDonnell-Douglas 500/530 Defender" uuid="ca51c14e-5269-11df-94c8-080069138b88" uid="11081">
-        <specific value="1" description="MH-6" deprecated="1" uuid="ca52d32c-5269-11df-ab2d-080069138b88" uid="11082"/>
-        <specific value="2" description="AH-6" uuid="ca53e190-5269-11df-b6c7-080069138b88" uid="11083"/>
-        <specific value="3" description="500MG" uuid="ca54f030-5269-11df-9f56-080069138b88" uid="11084"/>
-        <specific value="4" description="530MG" uuid="ca55ffd4-5269-11df-8e20-080069138b88" uid="11085"/>
-        <specific value="5" description="MH-6J" deprecated="1" uuid="ca570ece-5269-11df-8ee1-080069138b88" uid="11086"/>
-        <specific value="6" description="500 D/E" uuid="ca581e90-5269-11df-a9f0-080069138b88" uid="11087"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Utility helicopter" uuid="ca5a6d30-5269-11df-87b7-080069138b88" uid="11088">
-      <subcategory value="1" description="Bell model 204 Iroquois" uuid="ca5b8058-5269-11df-8c7b-080069138b88" uid="11089">
-        <specific value="1" description="UH-1A" uuid="ca5c90ce-5269-11df-81af-080069138b88" uid="11090"/>
-        <specific value="2" description="UH-1B" uuid="ca5da00e-5269-11df-a496-080069138b88" uid="11091"/>
-        <specific value="3" description="UH-1C" uuid="ca5eacc4-5269-11df-86d1-080069138b88" uid="11092"/>
-        <specific value="4" description="UH-1E" uuid="ca5fbccc-5269-11df-a756-080069138b88" uid="11093"/>
-        <specific value="5" description="UH-1F" uuid="ca60d864-5269-11df-88dd-080069138b88" uid="11094"/>
-        <specific value="6" description="UH-1L" uuid="ca61e4ca-5269-11df-b63f-080069138b88" uid="11095"/>
-        <specific value="7" description="HH-1K" uuid="ca62f342-5269-11df-ae12-080069138b88" uid="11096"/>
-        <specific value="8" description="TH-1F" uuid="ca640390-5269-11df-8efc-080069138b88" uid="11097"/>
-        <specific value="9" description="TH-1L" uuid="ca650df8-5269-11df-a2c1-080069138b88" uid="11098"/>
-        <specific value="10" description="UH-1HP" uuid="ca66203a-5269-11df-860b-080069138b88" uid="11099"/>
-      </subcategory>
-      <subcategory value="2" description="Sikorsky S-70A" uuid="ca67ce80-5269-11df-80c5-080069138b88" uid="11100">
-        <specific value="1" description="UH-60A Blackhawk" uuid="ca68dd66-5269-11df-be94-080069138b88" uid="11101"/>
-        <specific value="2" description="UH-60L Blackhawk" uuid="ca69eb8e-5269-11df-b5a5-080069138b88" uid="11102"/>
-        <specific value="3" description="EH-60C" uuid="ca6afb50-5269-11df-9be4-080069138b88" uid="11103"/>
-        <specific value="4" description="MH-60K" deprecated="1" uuid="ca6c0a72-5269-11df-bda3-080069138b88" uid="11104"/>
-        <specific value="5" description="VH-60N" uuid="ca6d236c-5269-11df-a059-080069138b88" uid="11105"/>
-        <specific value="6" description="UH-60P" uuid="ca6e3324-5269-11df-8c82-080069138b88" uid="11106"/>
-        <specific value="7" description="S-70A-1" uuid="ca6f443a-5269-11df-b185-080069138b88" uid="11107"/>
-        <specific value="8" description="S-70A-1L" uuid="ca704b78-5269-11df-bdfa-080069138b88" uid="11108"/>
-        <specific value="9" description="S-70A-5" uuid="ca715c84-5269-11df-8b57-080069138b88" uid="11109"/>
-        <specific value="10" description="S-70A-6" uuid="ca72701a-5269-11df-9565-080069138b88" uid="11110"/>
-        <specific value="11" description="S-70A-9" uuid="ca7379ce-5269-11df-8498-080069138b88" uid="11111"/>
-        <specific value="12" description="S-70A-A9" uuid="ca7488e6-5269-11df-b26f-080069138b88" uid="11112"/>
-        <specific value="13" description="S-70A-A11" uuid="ca7598f8-5269-11df-8b4c-080069138b88" uid="11113"/>
-        <specific value="14" description="S-70A-A12" uuid="ca76a522-5269-11df-8da4-080069138b88" uid="11114"/>
-        <specific value="15" description="S-70A-A14" uuid="ca77ba52-5269-11df-83fc-080069138b88" uid="11115"/>
-        <specific value="16" description="S-70A-A16" uuid="ca78dc02-5269-11df-9300-080069138b88" uid="11116"/>
-        <specific value="17" description="S-70A-A17" uuid="ca79e886-5269-11df-8cd4-080069138b88" uid="11117"/>
-        <specific value="18" description="S-70A-A18" uuid="ca7afbc2-5269-11df-942d-080069138b88" uid="11118"/>
-        <specific value="19" description="S-70A-A19" uuid="ca7c0bac-5269-11df-95ab-080069138b88" uid="11119"/>
-        <specific value="20" description="S-70A-A20" uuid="ca7d13d0-5269-11df-9d22-080069138b88" uid="11120"/>
-        <specific value="21" description="S-70A-A21" uuid="ca7e2432-5269-11df-b3d2-080069138b88" uid="11121"/>
-        <specific value="22" description="S-70A-A22" uuid="ca7f3818-5269-11df-b9ea-080069138b88" uid="11122"/>
-        <specific value="23" description="S-70A-A24" uuid="ca80403c-5269-11df-8cb3-080069138b88" uid="11123"/>
-      </subcategory>
-      <subcategory value="3" description="Boeing model 107" uuid="ca81eefa-5269-11df-b885-080069138b88" uid="11124">
-        <specific value="1" description="UH-46 Sea Knight" uuid="ca83002e-5269-11df-bf10-080069138b88" uid="11125"/>
-        <specific value="2" description="CH-46 Sea Knight" uuid="ca8413ce-5269-11df-938b-080069138b88" uid="11126">
-          <extra value="1" description="CH-46D" uuid="ca851c88-5269-11df-8059-080069138b88" uid="11127"/>
-          <extra value="2" description="CH-46E" uuid="ca862b1e-5269-11df-b0d6-080069138b88" uid="11128"/>
-        </specific>
-      </subcategory>
-      <subcategory value="4" description="S-70C" uuid="ca887a68-5269-11df-9b8e-080069138b88" uid="11129">
-        <specific value="1" description="H-60" uuid="ca898a0c-5269-11df-a62a-080069138b88" uid="11130"/>
-      </subcategory>
-      <subcategory value="5" description="Sikorsky H-76 Eagle" uuid="ca8b45ea-5269-11df-bf36-080069138b88" uid="11131"/>
-      <subcategory value="6" description="Sikorsky-S-76b" uuid="ca8c56a6-5269-11df-b7fc-080069138b88" uid="11132"/>
-    </category>
-    <category value="22" description="Antisubmarine Warfare/patrol helicopter" uuid="ca8e09d8-5269-11df-84eb-080069138b88" uid="11133">
-      <subcategory value="1" description="Kaman Seasprite and Super Seasprite" uuid="ca8f1bd4-5269-11df-8884-080069138b88" uid="11134">
-        <specific value="1" description="SH-2" uuid="ca9027d6-5269-11df-adce-080069138b88" uid="11135"/>
-      </subcategory>
-      <subcategory value="2" description="Agusta Sikorsky AS-61/ASH-3H Sea King" uuid="ca91d91e-5269-11df-bb0a-080069138b88" uid="11136">
-        <specific value="1" description="SH-3D" uuid="ca92e958-5269-11df-bdbc-080069138b88" uid="11137"/>
-        <specific value="2" description="SH-3H" uuid="ca93fc76-5269-11df-a1df-080069138b88" uid="11138"/>
-        <specific value="3" description="SH-3D/TS" uuid="ca9504f4-5269-11df-9127-080069138b88" uid="11139"/>
-        <specific value="4" description="ASH-3D" uuid="ca9613e4-5269-11df-af37-080069138b88" uid="11140"/>
-        <specific value="5" description="AS-61" uuid="ca972360-5269-11df-9028-080069138b88" uid="11141"/>
-        <specific value="6" description="SH-3B" uuid="ca983048-5269-11df-8fbb-080069138b88" uid="11142"/>
-      </subcategory>
-      <subcategory value="3" description="Sikorsky S-70B" uuid="ca99dd1c-5269-11df-9784-080069138b88" uid="11143">
-        <specific value="1" description="SH-60B Seahawk" uuid="ca9aed60-5269-11df-86e1-080069138b88" uid="11144"/>
-        <specific value="2" description="SH-60F Oceanhawk" uuid="ca9c0010-5269-11df-bd42-080069138b88" uid="11145"/>
-        <specific value="3" description="HH-60H" uuid="ca9d0adc-5269-11df-8f48-080069138b88" uid="11146"/>
-        <specific value="4" description="HH-60J Jayhawk" uuid="ca9e19f4-5269-11df-9e4b-080069138b88" uid="11147"/>
-        <specific value="5" description="HS.23" uuid="ca9f2b3c-5269-11df-ac51-080069138b88" uid="11148"/>
-        <specific value="6" description="XSH-60J" uuid="caa0387e-5269-11df-adad-080069138b88" uid="11149"/>
-        <specific value="7" description="UH-60J" uuid="caa1475a-5269-11df-b7cc-080069138b88" uid="11150"/>
-        <specific value="8" description="S-70B-2" uuid="caa25596-5269-11df-a573-080069138b88" uid="11151"/>
-        <specific value="9" description="MH-60R Seahawk" uuid="caa35fea-5269-11df-80da-080069138b88" uid="11152"/>
-      </subcategory>
-    </category>
-    <category value="23" description="Cargo helicopter" uuid="caa5b63c-5269-11df-a4c3-080069138b88" uid="11153">
-      <subcategory value="1" description="Boeing Models 114/414" uuid="caa6c0e0-5269-11df-9669-080069138b88" uid="11154">
-        <specific value="1" description="CH-47 Chinook" uuid="caa7d3cc-5269-11df-9a5a-080069138b88" uid="11155"/>
-        <specific value="2" description="CH-47B" uuid="caa8e2c6-5269-11df-b3a2-080069138b88" uid="11156"/>
-        <specific value="3" description="CH-47C" uuid="caaa17d6-5269-11df-8b16-080069138b88" uid="11157"/>
-        <specific value="4" description="CH-47D" uuid="caab2f36-5269-11df-8033-080069138b88" uid="11158"/>
-        <specific value="5" description="CH-147" uuid="caac3fa2-5269-11df-a3c0-080069138b88" uid="11159"/>
-        <specific value="6" description="Chinook HC.Mk 1" uuid="caad4df2-5269-11df-a280-080069138b88" uid="11160"/>
-        <specific value="7" description="Chinook HC.Mk 2" uuid="caae59e0-5269-11df-b8e6-080069138b88" uid="11161"/>
-        <specific value="8" description="HT.17" uuid="caaf6d8a-5269-11df-8dd7-080069138b88" uid="11162"/>
-      </subcategory>
-      <subcategory value="2" description="Sikorsky S-80/H-53" uuid="cab119fa-5269-11df-b070-080069138b88" uid="11163">
-        <specific value="1" description="CH-53E Super Stallion" uuid="cab229b2-5269-11df-af87-080069138b88" uid="11164"/>
-        <specific value="2" description="MH-53E Sea Dragon" uuid="cab338fc-5269-11df-973a-080069138b88" uid="11165"/>
-        <specific value="3" description="S-80E" uuid="cab4495e-5269-11df-8aa5-080069138b88" uid="11166"/>
-        <specific value="4" description="S-80M" uuid="cab557ae-5269-11df-8edc-080069138b88" uid="11167"/>
-      </subcategory>
-      <subcategory value="3" description="Sikorsky S-65A" uuid="cab70996-5269-11df-9351-080069138b88" uid="11168">
-        <specific value="1" description="CH-53A Sea Stallion" uuid="cab81368-5269-11df-90d5-080069138b88" uid="11169"/>
-        <specific value="2" description="HH-53B" uuid="cab92384-5269-11df-a72f-080069138b88" uid="11170"/>
-        <specific value="3" description="HH-53C" uuid="caba354e-5269-11df-93a4-080069138b88" uid="11171"/>
-        <specific value="4" description="CH-53A" uuid="cabb3dea-5269-11df-95e2-080069138b88" uid="11172"/>
-        <specific value="5" description="CH-53D" uuid="cabc4eb0-5269-11df-bfec-080069138b88" uid="11173"/>
-      </subcategory>
-    </category>
-    <category value="24" description="Observation helicopter" uuid="cabe9fd0-5269-11df-99ee-080069138b88" uid="11174">
-      <subcategory value="1" description="Bell Kiowa" uuid="cabfaefc-5269-11df-bd16-080069138b88" uid="11175">
-        <specific value="1" description="OH-58" uuid="cac0c198-5269-11df-846e-080069138b88" uid="11176"/>
-        <specific value="2" description="CH-136" uuid="cac1d150-5269-11df-83d1-080069138b88" uid="11177"/>
-        <specific value="3" description="OH-58C" uuid="cac2db36-5269-11df-b36b-080069138b88" uid="11178"/>
-      </subcategory>
-      <subcategory value="2" description="Bell Model 406 AHIP" uuid="cac48cc4-5269-11df-840b-080069138b88" uid="11179">
-        <specific value="1" description="OH-58D Kiowa/Kiowa Warrior" uuid="cac59dc6-5269-11df-9bf5-080069138b88" uid="11180"/>
-      </subcategory>
-      <subcategory value="3" description="Bell Model 406 CS Combat Scout" uuid="cac75288-5269-11df-b1b0-080069138b88" uid="11181">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="cac86d30-5269-11df-abf3-080069138b88" uid="11182"/>
-        <specific value="2" description="MH-58D Combat Scout" uuid="cac97806-5269-11df-8b10-080069138b88" uid="11183"/>
-      </subcategory>
-    </category>
-    <category value="25" description="Special Operations helicopter" uuid="cacbd088-5269-11df-b50f-080069138b88" uid="11184">
-      <subcategory value="1" description="Sikorsky S-70A" uuid="caccdc80-5269-11df-a655-080069138b88" uid="11185">
-        <specific value="1" description="MH-60A" uuid="cacded5a-5269-11df-935a-080069138b88" uid="11186"/>
-        <specific value="2" description="MH-60G Pave Hawk" uuid="caceffd8-5269-11df-98ea-080069138b88" uid="11187"/>
-        <specific value="3" description="MH-60K" uuid="cad00ae0-5269-11df-9df7-080069138b88" uid="11188"/>
-        <specific value="4" description="MH-60L" uuid="cad11a52-5269-11df-b9b6-080069138b88" uid="11189"/>
-        <specific value="5" description="HH-60G" uuid="cad22ae6-5269-11df-b374-080069138b88" uid="11190"/>
-        <specific value="6" description="MH 60S Knight Hawk" uuid="cad332e2-5269-11df-a6bf-080069138b88" uid="11191"/>
-      </subcategory>
-      <subcategory value="2" description="Boeing models 114/414" uuid="cad4e7ea-5269-11df-90d0-080069138b88" uid="11192">
-        <specific value="1" description="MH-47E" uuid="cad5f7d4-5269-11df-9f2a-080069138b88" uid="11193"/>
-      </subcategory>
-      <subcategory value="3" description="Sikorsky S-65/MH-53 Pave Low" uuid="cad7a728-5269-11df-9ed1-080069138b88" uid="11194">
-        <specific value="1" description="HH-53B" uuid="cad8ba5a-5269-11df-b812-080069138b88" uid="11195"/>
-        <specific value="2" description="HH-53C" uuid="cad9c6f2-5269-11df-8530-080069138b88" uid="11196"/>
-        <specific value="3" description="CH-53C" uuid="cadad6fa-5269-11df-8c17-080069138b88" uid="11197"/>
-        <specific value="4" description="MH-53J Pave Low III" uuid="cadbe784-5269-11df-9585-080069138b88" uid="11198"/>
-        <specific value="5" description="MH-53M Pave Low IV" uuid="cadcf340-5269-11df-911b-080069138b88" uid="11199"/>
-        <specific value="6" description="RH-53D" uuid="cade03d4-5269-11df-a901-080069138b88" uid="11200"/>
-      </subcategory>
-      <subcategory value="4" description="McDonnell-Douglas 500/530 Defender" uuid="cadfb6de-5269-11df-97af-080069138b88" uid="11201">
-        <specific value="1" description="MH-6" uuid="cae0c79a-5269-11df-9203-080069138b88" uid="11202"/>
-        <specific value="2" description="500MD" deprecated="1" uuid="cae1d02c-5269-11df-975f-080069138b88" uid="11203"/>
-        <specific value="3" description="MH-6J" uuid="cae2e296-5269-11df-862f-080069138b88" uid="11204"/>
-      </subcategory>
-    </category>
-    <category value="40" description="Trainer" uuid="cae5342e-5269-11df-b228-080069138b88" uid="11205">
-      <subcategory value="1" description="Cessna 172" uuid="cae64422-5269-11df-a1f5-080069138b88" uid="11206">
-        <specific value="1" description="T-41" uuid="cae75f10-5269-11df-bfc6-080069138b88" uid="11207"/>
-      </subcategory>
-      <subcategory value="2" description="Cessna 318" uuid="cae90d74-5269-11df-87fe-080069138b88" uid="11208">
-        <specific value="1" description="T-37" uuid="caea1de0-5269-11df-a5ab-080069138b88" uid="11209"/>
-      </subcategory>
-      <subcategory value="3" description="Northrop Talon" uuid="caebcfd2-5269-11df-894d-080069138b88" uid="11210">
-        <specific value="1" description="T-38" uuid="caecd954-5269-11df-aa60-080069138b88" uid="11211"/>
-      </subcategory>
-      <subcategory value="4" description="McDonnell-Douglas/BAe T45TS" uuid="caee8b32-5269-11df-8bd4-080069138b88" uid="11212">
-        <specific value="1" description="T-45 Goshawk" uuid="caef9b6c-5269-11df-922f-080069138b88" uid="11213"/>
-      </subcategory>
-      <subcategory value="5" description="Beechcraft T-34C" uuid="caf14c32-5269-11df-9d80-080069138b88" uid="11214">
-        <specific value="1" description="T-34C" uuid="caf25e24-5269-11df-83ff-080069138b88" uid="11215"/>
-      </subcategory>
-      <subcategory value="6" description="Beechcraft Sierrra 200/Sundowner 180" uuid="caf40d28-5269-11df-a6f1-080069138b88" uid="11216">
-        <specific value="1" description="CT-134A Musketeer II" uuid="caf519f2-5269-11df-a7b1-080069138b88" uid="11217"/>
-      </subcategory>
-      <subcategory value="7" description="Lockheed T-33" uuid="caf6cca2-5269-11df-8651-080069138b88" uid="11218">
-        <specific value="1" description="Silver Star" uuid="caf7dac0-5269-11df-a4f8-080069138b88" uid="11219"/>
-      </subcategory>
-      <subcategory value="8" description="Beechcraft Model 400A Beechjet" uuid="caf98b7c-5269-11df-ae69-080069138b88" uid="11220">
-        <specific value="1" description="T-1A Jayhawk" uuid="cafa9f1c-5269-11df-906f-080069138b88" uid="11221"/>
-      </subcategory>
-      <subcategory value="9" description="Boeing TC-135" uuid="cafc50a0-5269-11df-a926-080069138b88" uid="11222">
-        <specific value="1" description="TC-135W Rivet Joint Trainer" uuid="cafd59a0-5269-11df-b3ad-080069138b88" uid="11223"/>
-        <specific value="2" description="TC-135S Cobra Ball Trainer" uuid="cafe6e80-5269-11df-95c1-080069138b88" uid="11224"/>
-      </subcategory>
-      <subcategory value="10" description="Beachcraft Super King AIR 200/B200" deprecated="1" uuid="cb002072-5269-11df-9efd-080069138b88" uid="11225">
-        <specific value="1" description="RC-12H Guardrail Common Sensor" deprecated="1" uuid="cb0134e4-5269-11df-9f11-080069138b88" uid="11226"/>
-        <specific value="2" description="RC-12D" deprecated="1" uuid="cb02400a-5269-11df-b18b-080069138b88" uid="11227"/>
-      </subcategory>
-      <subcategory value="11" description="Cessna 208 Caravan" uuid="cb03f0ee-5269-11df-aed8-080069138b88" uid="11228"/>
-      <subcategory value="12" description="Cessna Citation" uuid="cb0505a6-5269-11df-b513-080069138b88" uid="11229"/>
-      <subcategory value="13" description="Raytheon / Pilatus PC-9 Mk II (Beech Mk II)" uuid="cb063f2a-5269-11df-96ef-080069138b88" uid="11230">
-        <specific value="1" description="T-6A Texan II" uuid="cb074d2a-5269-11df-aa62-080069138b88" uid="11231"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Unmanned" uuid="cb09a4e4-5269-11df-83ca-080069138b88" uid="11232">
-      <subcategory value="1" description="RQ-5A Hunter" uuid="cb0aad44-5269-11df-a4a6-080069138b88" uid="11233"/>
-      <subcategory value="2" description="TRW/IAI Hunter - shipboard variant" deprecated="1" uuid="cb0bbfea-5269-11df-884b-080069138b88" uid="11234"/>
-      <subcategory value="3" description="Maneuver UAV" uuid="cb0cd6aa-5269-11df-824c-080069138b88" uid="11235"/>
-      <subcategory value="4" description="Predator Medium Altitude Endurance UAV" uuid="cb0de09a-5269-11df-aa7e-080069138b88" uid="11236">
-        <specific value="1" description="RQ-1K Predator" uuid="cb0ef25a-5269-11df-842b-080069138b88" uid="11237"/>
-        <specific value="2" description="RQ-1L Predator" uuid="cb100410-5269-11df-b4ec-080069138b88" uid="11238"/>
-        <specific value="3" description="MQ-1L Armed Predator" uuid="cb111fe4-5269-11df-b9cd-080069138b88" uid="11239"/>
-        <specific value="4" description="MQ-9A Predator B" uuid="cb123154-5269-11df-9e7c-080069138b88" uid="11240"/>
-      </subcategory>
-      <subcategory value="5" description="Lockheed Martin / Boeing Darkstar UAV" uuid="cb13e148-5269-11df-8ce5-080069138b88" uid="11241"/>
-      <subcategory value="6" description="Global Hawk UAV" uuid="cb14f678-5269-11df-82f3-080069138b88" uid="11242">
-        <specific value="1" description="RQ-4A" uuid="cb1600f4-5269-11df-b902-080069138b88" uid="11243"/>
-      </subcategory>
-      <subcategory value="7" description="Alliant Techsystems Outrider UAV (formerly known as the Tactical UAV or TUAV)" uuid="cb17b11a-5269-11df-90be-080069138b88" uid="11244"/>
-      <subcategory value="8" description="RQ-7 Shadow UAV" uuid="cb18c712-5269-11df-bf2c-080069138b88" uid="11245">
-        <specific value="1" description="RQ-7A" uuid="cb19d620-5269-11df-9ad7-080069138b88" uid="11246"/>
-        <specific value="2" description="RQ-7B" uuid="cb1ae0ce-5269-11df-8a4d-080069138b88" uid="11247"/>
-      </subcategory>
-      <subcategory value="9" description="Pioneer UAV" uuid="cb1c90cc-5269-11df-b132-080069138b88" uid="11248"/>
-      <subcategory value="10" description="BQM-74 Chukar" uuid="cb1da2aa-5269-11df-9539-080069138b88" uid="11249"/>
-      <subcategory value="11" description="MQM-107 Streaker" uuid="cb1eb28a-5269-11df-9a6c-080069138b88" uid="11250"/>
-      <subcategory value="12" description="MTR-15 Ballistic Aerial Target System (BATS)" uuid="cb1fbea0-5269-11df-96c8-080069138b88" uid="11251"/>
-      <subcategory value="13" description="FQM-117 Radio Controlled Minature Aerial Target (RCMAT)" uuid="cb20d3ee-5269-11df-a7f7-080069138b88" uid="11252"/>
-      <subcategory value="14" description="QUH-1 Iroquois Target" uuid="cb21e5cc-5269-11df-add8-080069138b88" uid="11253"/>
-      <subcategory value="15" description="QF-4 Phantom Target" uuid="cb22f52a-5269-11df-af70-080069138b88" uid="11254"/>
-      <subcategory value="16" description="QF-106 Delta Dart Target" uuid="cb240f6e-5269-11df-af61-080069138b88" uid="11255"/>
-      <subcategory value="17" description="MQM-8 Vandel" uuid="cb252250-5269-11df-b669-080069138b88" uid="11256"/>
-      <subcategory value="18" description="AQM-37 Challenger" uuid="cb262f88-5269-11df-8861-080069138b88" uid="11257"/>
-      <subcategory value="19" description="TDU-34 Rigid Tow Target" uuid="cb273fcc-5269-11df-8a21-080069138b88" uid="11258"/>
-      <subcategory value="20" description="Javelin (BAI Aerosystems lightweight airborne video system)" uuid="cb2852e0-5269-11df-b29f-080069138b88" uid="11259"/>
-      <subcategory value="21" description="X-47A Pegasus UCAV" uuid="cb2961d0-5269-11df-8a51-080069138b88" uid="11260"/>
-      <subcategory value="22" description="FQM-151 Pointer" uuid="cb2a717e-5269-11df-8a44-080069138b88" uid="11261"/>
-      <subcategory value="23" description="BQM-34 Firebee" uuid="cb2b846a-5269-11df-89a4-080069138b88" uid="11262"/>
-      <subcategory value="24" description="X-45 UCAV" uuid="cb2c9346-5269-11df-9c99-080069138b88" uid="11263">
-        <specific value="1" description="X-45A" uuid="cb2da2f4-5269-11df-b052-080069138b88" uid="11264"/>
-        <specific value="2" description="X-45C" uuid="cb2eb18a-5269-11df-887d-080069138b88" uid="11265"/>
-      </subcategory>
-      <subcategory value="25" description="Boeing ScanEagle" uuid="cb3064d0-5269-11df-aa6d-080069138b88" uid="11266">
-        <specific value="1" description="ScanEagle A-15" uuid="cb316f56-5269-11df-9f6b-080069138b88" uid="11267"/>
-        <specific value="2" description="ScanEagle Dual-Bay" uuid="cb327ebe-5269-11df-8b17-080069138b88" uid="11268"/>
-      </subcategory>
-      <subcategory value="26" description="Boeing A-160 Hummingbird" uuid="cb342ff2-5269-11df-bc50-080069138b88" uid="11269"/>
-      <subcategory value="27" description="Interim Small UAV, Raven" uuid="cb3544d2-5269-11df-9a40-080069138b88" uid="11270"/>
-      <subcategory value="28" description="FCS UAV Class I" uuid="cb365002-5269-11df-99b1-080069138b88" uid="11271"/>
-      <subcategory value="29" description="FCS UAV Class II" uuid="cb375f92-5269-11df-8318-080069138b88" uid="11272"/>
-      <subcategory value="30" description="FCS UAV Class III" uuid="cb38722e-5269-11df-ae18-080069138b88" uid="11273"/>
-      <subcategory value="31" description="FCS UAV Class IV" uuid="cb39804c-5269-11df-b973-080069138b88" uid="11274">
-        <specific value="1" description="FCS UAV Class IV-a" uuid="cb3a925c-5269-11df-af46-080069138b88" uid="11275"/>
-        <specific value="2" description="FCS UAV Class IV-b" uuid="cb3ba598-5269-11df-8217-080069138b88" uid="11276"/>
-      </subcategory>
-    </category>
-    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="cb3df7d0-5269-11df-8c60-080069138b88" uid="11277">
-      <subcategory value="1" description="Passenger Airline" uuid="cb3f07f6-5269-11df-8f27-080069138b88" uid="11278">
-        <specific value="1" description="Boeing 747-400" uuid="cb401678-5269-11df-931c-080069138b88" uid="11279"/>
-        <specific value="2" description="Boeing 757-200" uuid="cb4124d2-5269-11df-8cda-080069138b88" uid="11280"/>
-        <specific value="3" description="MD-82" uuid="cb423548-5269-11df-bda6-080069138b88" uid="11281"/>
-        <specific value="4" description="MD-82T" uuid="cb434bea-5269-11df-ba17-080069138b88" uid="11282"/>
-        <specific value="5" description="MD-90-30-T" uuid="cb445b98-5269-11df-932b-080069138b88" uid="11283"/>
-        <specific value="6" description="Boeing 727" uuid="cb456a38-5269-11df-9faf-080069138b88" uid="11284"/>
-        <specific value="7" description="Boeing 737" uuid="cb467392-5269-11df-bb00-080069138b88" uid="11285"/>
-        <specific value="8" description="Boeing 767" uuid="cb4786e2-5269-11df-b5b9-080069138b88" uid="11286"/>
-        <specific value="9" description="DC-10" uuid="cb4896a4-5269-11df-9a15-080069138b88" uid="11287"/>
-        <specific value="10" description="Lockheed L-1011 Tristar" uuid="cb49a080-5269-11df-83f6-080069138b88" uid="11288"/>
-        <specific value="11" description="Boeing 707" uuid="cb4ab5e2-5269-11df-adbe-080069138b88" uid="11289"/>
-        <specific value="12" description="Boeing 717" uuid="cb4bc52c-5269-11df-831a-080069138b88" uid="11290"/>
-        <specific value="13" description="Beech 1900" uuid="cb4cd016-5269-11df-9a13-080069138b88" uid="11291"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="225" uuid="cb4fc514-5269-11df-8b11-080069138b88" uid="11292">
-    <category value="1" description="Carrier" uuid="cb50d3be-5269-11df-95c9-080069138b88" uid="11293">
-      <subcategory value="1" description="Nimitz Class" uuid="cb51e092-5269-11df-a846-080069138b88" uid="11294">
-        <specific value="1" description="CVN 68 Nimitz" uuid="cb52efa0-5269-11df-81c8-080069138b88" uid="11295"/>
-        <specific value="2" description="CVN 69 Dwight D. Eisenhower" uuid="cb53feea-5269-11df-94bd-080069138b88" uid="11296"/>
-        <specific value="3" description="CVN 70 Carl Vinson" uuid="cb550d1c-5269-11df-874c-080069138b88" uid="11297"/>
-        <specific value="4" description="CVN 71 Theodore Roosevelt" uuid="cb56213e-5269-11df-be08-080069138b88" uid="11298"/>
-        <specific value="5" description="CVN 72 Abraham Lincoln" uuid="cb573178-5269-11df-aad2-080069138b88" uid="11299"/>
-        <specific value="6" description="CVN 73 George Washington" uuid="cb587db2-5269-11df-b3e9-080069138b88" uid="11300"/>
-        <specific value="7" description="CVN 74 John C. Stennis" uuid="cb599d8c-5269-11df-904e-080069138b88" uid="11301"/>
-        <specific value="8" description="CVN 75 Harry S. Truman" uuid="cb5aaf74-5269-11df-a086-080069138b88" uid="11302"/>
-        <specific value="9" description="CVN 76 Ronald Reagen" uuid="cb5bc2c4-5269-11df-99d9-080069138b88" uid="11303"/>
-      </subcategory>
-      <subcategory value="2" description="Enterprise Class" uuid="cb5d77e0-5269-11df-ab93-080069138b88" uid="11304">
-        <specific value="1" description="CVN 65 Enterprise" uuid="cb5e822a-5269-11df-a2a7-080069138b88" uid="11305"/>
-      </subcategory>
-      <subcategory value="3" description="Kitty Hawk/John F. Kennedy Class" uuid="cb603156-5269-11df-bc5f-080069138b88" uid="11306">
-        <specific value="1" description="CV 63 Kitty Hawk" uuid="cb6146b8-5269-11df-a868-080069138b88" uid="11307"/>
-        <specific value="2" description="CV 64 Constellation" uuid="cb669532-5269-11df-9622-080069138b88" uid="11308"/>
-        <specific value="3" description="CV 66 America" uuid="cb6f8e94-5269-11df-9781-080069138b88" uid="11309"/>
-        <specific value="4" description="CV 67 John F. Kennedy" uuid="cb753362-5269-11df-90b5-080069138b88" uid="11310"/>
-      </subcategory>
-      <subcategory value="4" description="Forrestal Class" uuid="cb7b5404-5269-11df-b469-080069138b88" uid="11311">
-        <specific value="1" description="AVT 59 Forrestal" uuid="cb7c68f8-5269-11df-9e85-080069138b88" uid="11312"/>
-        <specific value="2" description="CV 60 Saratoga" uuid="cb7d7c2a-5269-11df-beb5-080069138b88" uid="11313"/>
-        <specific value="3" description="CV 61 Ranger" uuid="cb7eb0ea-5269-11df-a9bf-080069138b88" uid="11314"/>
-        <specific value="4" description="CV 62 Independence" uuid="cb7fc340-5269-11df-913f-080069138b88" uid="11315"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Command Ship/Cruiser" uuid="cb822bda-5269-11df-a47d-080069138b88" uid="11316">
-      <subcategory value="1" description="Blue Ridge Class" uuid="cb833c82-5269-11df-a3b6-080069138b88" uid="11317">
-        <specific value="1" description="LCC 19 Blue Ridge" uuid="cb844e7e-5269-11df-9952-080069138b88" uid="11318"/>
-        <specific value="2" description="LLC 20 Mount Whitney" uuid="cb856002-5269-11df-81a9-080069138b88" uid="11319"/>
-      </subcategory>
-      <subcategory value="2" description="Raleigh and Austin Classes" uuid="cb871582-5269-11df-9bd5-080069138b88" uid="11320">
-        <specific value="1" description="AGF 11 Coronado" uuid="cb882184-5269-11df-acef-080069138b88" uid="11321"/>
-        <specific value="2" description="AGF 3 La Salle" uuid="cb893542-5269-11df-84ee-080069138b88" uid="11322"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Guided Missile Cruiser" uuid="cb8b8c66-5269-11df-9fe6-080069138b88" uid="11323">
-      <subcategory value="1" description="Ticonderoga Class" uuid="cb8c9d18-5269-11df-8bf4-080069138b88" uid="11324">
-        <specific value="1" description="CG 47 Ticonderoga" uuid="cb8daec4-5269-11df-93f0-080069138b88" uid="11325"/>
-        <specific value="2" description="CG 48 Yorktown" uuid="cb8ec156-5269-11df-b47b-080069138b88" uid="11326"/>
-        <specific value="3" description="CG 49 Vincennes" uuid="cb8fcb46-5269-11df-a4e1-080069138b88" uid="11327"/>
-        <specific value="4" description="CG 50 Valley Forge" uuid="cb90dd9c-5269-11df-9727-080069138b88" uid="11328"/>
-        <specific value="5" description="CG 51 Thomas S. Gates" uuid="cb91f3bc-5269-11df-b4b6-080069138b88" uid="11329"/>
-        <specific value="6" description="CG 52 Bunker Hill" uuid="cb92ff0a-5269-11df-a635-080069138b88" uid="11330"/>
-        <specific value="7" description="CG 53 Mobile Bay" uuid="cb94107a-5269-11df-bb5d-080069138b88" uid="11331"/>
-        <specific value="8" description="CG 54 Antietam" uuid="cb95235c-5269-11df-9e09-080069138b88" uid="11332"/>
-        <specific value="9" description="CG 55 Leyte Gulf" uuid="cb9632ec-5269-11df-9b6b-080069138b88" uid="11333"/>
-        <specific value="10" description="CG 56 San Jacinto" uuid="cb9744d4-5269-11df-b714-080069138b88" uid="11334"/>
-        <specific value="11" description="CG 57 Lake Champlain" uuid="cb985694-5269-11df-88e1-080069138b88" uid="11335"/>
-        <specific value="12" description="CG 58 Philippine Sea" uuid="cb99630e-5269-11df-a3be-080069138b88" uid="11336"/>
-        <specific value="13" description="CG 59 Princeton" uuid="cb9a796a-5269-11df-a366-080069138b88" uid="11337"/>
-        <specific value="14" description="CG 60 Normandy" uuid="cb9b8b34-5269-11df-ac54-080069138b88" uid="11338"/>
-        <specific value="15" description="CG 61 Monterey" uuid="cb9c95ec-5269-11df-b897-080069138b88" uid="11339"/>
-        <specific value="16" description="CG 62 Chancellorsville" uuid="cb9dabbc-5269-11df-a045-080069138b88" uid="11340"/>
-        <specific value="17" description="CG 63 Cowpens" uuid="cb9ebdb8-5269-11df-9a07-080069138b88" uid="11341"/>
-        <specific value="18" description="CG 64 Gettysburg" uuid="cb9fd310-5269-11df-95b8-080069138b88" uid="11342"/>
-        <specific value="19" description="CG 65 Chosin" uuid="cba0e430-5269-11df-9993-080069138b88" uid="11343"/>
-        <specific value="20" description="CG 66 Hue City" uuid="cba1f988-5269-11df-988b-080069138b88" uid="11344"/>
-        <specific value="21" description="CG 67 Shiloh" uuid="cba30508-5269-11df-a4fa-080069138b88" uid="11345"/>
-        <specific value="22" description="CG 68 Anzio" uuid="cba4168c-5269-11df-8585-080069138b88" uid="11346"/>
-        <specific value="23" description="CG 69 Vicksburg" uuid="cba52810-5269-11df-8d5c-080069138b88" uid="11347"/>
-        <specific value="24" description="CG 70 Lake Erie" uuid="cba6382c-5269-11df-9920-080069138b88" uid="11348"/>
-        <specific value="25" description="CG 71 Cape St. George" uuid="cba74a32-5269-11df-b61d-080069138b88" uid="11349"/>
-        <specific value="26" description="CG 72 Vella Gulf" uuid="cba85daa-5269-11df-aac6-080069138b88" uid="11350"/>
-        <specific value="27" description="CG 73 Port Royal" uuid="cba96dee-5269-11df-9ad6-080069138b88" uid="11351"/>
-      </subcategory>
-      <subcategory value="2" description="Virginia Class" deprecated="1" uuid="cbab28be-5269-11df-bb52-080069138b88" uid="11352">
-        <specific value="1" description="CGN 38 Virginia" deprecated="1" uuid="cbac3b96-5269-11df-b8b1-080069138b88" uid="11353"/>
-        <specific value="2" description="CGN 39 Texas" deprecated="1" uuid="cbad4df6-5269-11df-a0ac-080069138b88" uid="11354"/>
-        <specific value="3" description="CGN 40 Mississippi" deprecated="1" uuid="cbae5a20-5269-11df-af8d-080069138b88" uid="11355"/>
-        <specific value="4" description="CGN 41 Arkansas" deprecated="1" uuid="cbaf75d6-5269-11df-bf7c-080069138b88" uid="11356"/>
-      </subcategory>
-      <subcategory value="3" description="California Class" uuid="cbb12a0c-5269-11df-b94c-080069138b88" uid="11357">
-        <specific value="1" description="CGN 36 California" uuid="cbb23e6a-5269-11df-bf5b-080069138b88" uid="11358"/>
-        <specific value="2" description="CGN 37 South Carolina" uuid="cbb349d6-5269-11df-b95c-080069138b88" uid="11359"/>
-      </subcategory>
-      <subcategory value="4" description="Truxtun Class" uuid="cbb4fb64-5269-11df-b7aa-080069138b88" uid="11360">
-        <specific value="1" description="CGN 35 Truxtun" uuid="cbb6108a-5269-11df-8528-080069138b88" uid="11361"/>
-      </subcategory>
-      <subcategory value="5" description="Belknap Class" deprecated="1" uuid="cbb7c29a-5269-11df-812a-080069138b88" uid="11362">
-        <specific value="1" description="CG 26 Belknap" deprecated="1" uuid="cbb8d4dc-5269-11df-9f83-080069138b88" uid="11363"/>
-      </subcategory>
-      <subcategory value="6" description="Bainbridge Class" uuid="cbba8a8e-5269-11df-95cf-080069138b88" uid="11364">
-        <specific value="1" description="CGN 25 Bainbridge" uuid="cbbbacca-5269-11df-9bec-080069138b88" uid="11365"/>
-      </subcategory>
-      <subcategory value="7" description="Leahy Class" uuid="cbbd63ee-5269-11df-a0b8-080069138b88" uid="11366">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="cbbe7dc4-5269-11df-85e4-080069138b88" uid="11367"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="cbbf90ba-5269-11df-9e2b-080069138b88" uid="11368"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="cbc09d70-5269-11df-a796-080069138b88" uid="11369"/>
-        <specific value="4" description="CG 19 Dale" uuid="cbc1b1ba-5269-11df-b2e8-080069138b88" uid="11370"/>
-        <specific value="5" description="CG 20 R. K. Turner" uuid="cbc2c636-5269-11df-9653-080069138b88" uid="11371"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Guided Missile Destroyer" uuid="cbc51832-5269-11df-aa64-080069138b88" uid="11372">
-      <subcategory value="1" description="Arleigh Burke Class" uuid="cbc62dda-5269-11df-8d35-080069138b88" uid="11373">
-        <specific value="1" description="DDG 51 Arleigh Burke" uuid="cbc73d24-5269-11df-a7a3-080069138b88" uid="11374"/>
-        <specific value="2" description="DDG 52 Barry" uuid="cbc84f84-5269-11df-bf7b-080069138b88" uid="11375"/>
-        <specific value="3" description="DDG 53 John Paul Jones" uuid="cbc962ac-5269-11df-8cd7-080069138b88" uid="11376"/>
-        <specific value="4" description="DDG 54 Curtis Wilbur" uuid="cbca6d6e-5269-11df-84dc-080069138b88" uid="11377"/>
-        <specific value="5" description="DDG 55 Stout" uuid="cbcb8302-5269-11df-9541-080069138b88" uid="11378"/>
-        <specific value="6" description="DDG 56 John S. McCain" uuid="cbcc93d2-5269-11df-9ae8-080069138b88" uid="11379"/>
-        <specific value="7" description="DDG 57 Mitscher" uuid="cbcd9fa2-5269-11df-b64b-080069138b88" uid="11380"/>
-        <specific value="8" description="DDG 58 Laboon" uuid="cbceafb4-5269-11df-a3a1-080069138b88" uid="11381"/>
-        <specific value="9" description="DDG 59 Russell" uuid="cbcfc368-5269-11df-9ca7-080069138b88" uid="11382"/>
-        <specific value="10" description="DDG 60 Paul Hamilton" uuid="cbd0cf6a-5269-11df-a69a-080069138b88" uid="11383"/>
-        <specific value="11" description="DDG 61 Ramage" uuid="cbd1e13e-5269-11df-b137-080069138b88" uid="11384"/>
-        <specific value="12" description="DDG 62 Fitzgerald" uuid="cbd2f484-5269-11df-8a14-080069138b88" uid="11385"/>
-        <specific value="13" description="DDG 63 Stethem" uuid="cbd40040-5269-11df-b8b7-080069138b88" uid="11386"/>
-        <specific value="14" description="DDG 64 Carney" uuid="cbd5116a-5269-11df-a166-080069138b88" uid="11387"/>
-        <specific value="15" description="DDG 65 Benfold" uuid="cbd623e8-5269-11df-93b4-080069138b88" uid="11388"/>
-        <specific value="16" description="DDG 66 Gonzalez" uuid="cbd72ee6-5269-11df-a122-080069138b88" uid="11389"/>
-        <specific value="17" description="DDG 67 Cole" uuid="cbd840ec-5269-11df-9c94-080069138b88" uid="11390"/>
-        <specific value="18" description="DDG 68 The Sullivans" uuid="cbd95554-5269-11df-8215-080069138b88" uid="11391"/>
-        <specific value="19" description="DDG 69 Milius" uuid="cbda6052-5269-11df-a5f5-080069138b88" uid="11392"/>
-        <specific value="20" description="DDG 70 Hopper" uuid="cbdb7014-5269-11df-8a25-080069138b88" uid="11393"/>
-        <specific value="21" description="DDG 71 Ross" uuid="cbdc8bde-5269-11df-b914-080069138b88" uid="11394"/>
-        <specific value="22" description="DDG 72 Mahan" uuid="cbdd9c18-5269-11df-ba4d-080069138b88" uid="11395"/>
-        <specific value="23" description="DDG 73 DeCatur" uuid="cbdeae32-5269-11df-9b25-080069138b88" uid="11396"/>
-        <specific value="24" description="DDG 74 McFaul" uuid="cbdfbf02-5269-11df-8b49-080069138b88" uid="11397"/>
-        <specific value="25" description="DDG 75 Donald Cook" uuid="cbe0cba4-5269-11df-9e3e-080069138b88" uid="11398"/>
-        <specific value="26" description="DDG 76 Higgins" uuid="cbe1e0c0-5269-11df-a9eb-080069138b88" uid="11399"/>
-        <specific value="27" description="DDG 77 O'Kane" uuid="cbe2ebb4-5269-11df-a2f2-080069138b88" uid="11400"/>
-        <specific value="28" description="DDG 78 Porter" uuid="cbe3fa90-5269-11df-b8fe-080069138b88" uid="11401"/>
-        <specific value="29" description="DDG 79 Oscar Austin" uuid="cbe51060-5269-11df-bd64-080069138b88" uid="11402"/>
-        <specific value="30" description="DDG 80 Roosevelt" uuid="cbe621d0-5269-11df-b7ef-080069138b88" uid="11403"/>
-        <specific value="31" description="DDG 81 Winston Churchill" uuid="cbe72f3a-5269-11df-913e-080069138b88" uid="11404"/>
-        <specific value="32" description="DDG 82 Lassen" uuid="cbe83fec-5269-11df-bec2-080069138b88" uid="11405"/>
-        <specific value="33" description="DDG 83 Howard" uuid="cbe95508-5269-11df-ba9c-080069138b88" uid="11406"/>
-        <specific value="34" description="DDG 84 Buckeley" uuid="cbea6056-5269-11df-809c-080069138b88" uid="11407"/>
-        <specific value="35" description="DDG 85 McCampbell" uuid="cbeb711c-5269-11df-a134-080069138b88" uid="11408"/>
-        <specific value="36" description="DDG 86 Shoup" uuid="cbec82dc-5269-11df-8217-080069138b88" uid="11409"/>
-        <specific value="37" description="DDG 87 Mason" uuid="cbed92e4-5269-11df-9a4c-080069138b88" uid="11410"/>
-        <specific value="38" description="DDG 88 Preble" uuid="cbeea396-5269-11df-9b68-080069138b88" uid="11411"/>
-        <specific value="39" description="DDG 89 Mustin" uuid="cbefb3d0-5269-11df-83b1-080069138b88" uid="11412"/>
-        <specific value="40" description="DDG 90 Chafee" uuid="cbf0c05e-5269-11df-b124-080069138b88" uid="11413"/>
-        <specific value="41" description="DDG 91 Pinckney" uuid="cbf1d50c-5269-11df-a223-080069138b88" uid="11414"/>
-        <specific value="42" description="DDG 92 Momsen" uuid="cbf2e550-5269-11df-9aca-080069138b88" uid="11415"/>
-        <specific value="43" description="DDG 93 Chung-Hoon" uuid="cbf3f026-5269-11df-8a47-080069138b88" uid="11416"/>
-        <specific value="44" description="DDG 94 Nitze" uuid="cbf504de-5269-11df-93bb-080069138b88" uid="11417"/>
-        <specific value="45" description="DDG 95 James E. Williams" uuid="cbf61662-5269-11df-8657-080069138b88" uid="11418"/>
-        <specific value="46" description="DDG 96 Bainbridge" uuid="cbf722be-5269-11df-8358-080069138b88" uid="11419"/>
-        <specific value="47" description="DDG 97 Halsey" uuid="cbf83226-5269-11df-8b44-080069138b88" uid="11420"/>
-        <specific value="48" description="DDG 98 Forest Sherman" uuid="cbf946ac-5269-11df-b244-080069138b88" uid="11421"/>
-        <specific value="49" description="DDG 99 Farragut" uuid="cbfa5290-5269-11df-96ce-080069138b88" uid="11422"/>
-        <specific value="50" description="DDG 100 Kidd" uuid="cbfb6c84-5269-11df-b684-080069138b88" uid="11423"/>
-        <specific value="51" description="DDG 101 Gridley" uuid="cbfc8146-5269-11df-8ece-080069138b88" uid="11424"/>
-        <specific value="52" description="DDG 102 Sampson" uuid="cbfd8d02-5269-11df-bbbc-080069138b88" uid="11425"/>
-        <specific value="53" description="DDG 103 Truxtun" uuid="cbfe9f9e-5269-11df-a0b7-080069138b88" uid="11426"/>
-        <specific value="54" description="DDG 104 Sterett" uuid="cbffb14a-5269-11df-88e9-080069138b88" uid="11427"/>
-        <specific value="55" description="DDG 105 Dewey" uuid="cc00bbc6-5269-11df-915c-080069138b88" uid="11428"/>
-      </subcategory>
-      <subcategory value="2" description="Kidd Class" deprecated="1" uuid="cc026ff2-5269-11df-84d8-080069138b88" uid="11429">
-        <specific value="1" description="DDG 993 Kidd" deprecated="1" uuid="cc0381ee-5269-11df-af11-080069138b88" uid="11430"/>
-        <specific value="2" description="DDG 994 Callaghan" deprecated="1" uuid="cc0497dc-5269-11df-88d1-080069138b88" uid="11431"/>
-        <specific value="3" description="DDG 995 Scott" deprecated="1" uuid="cc05a4ec-5269-11df-9ea0-080069138b88" uid="11432"/>
-        <specific value="4" description="DDG 996 Chandler" deprecated="1" uuid="cc07067a-5269-11df-afa2-080069138b88" uid="11433"/>
-      </subcategory>
-      <subcategory value="3" description="Coontz Class" uuid="cc08c64a-5269-11df-a1b2-080069138b88" uid="11434">
-        <specific value="1" description="DDG 39 MacDonough" uuid="cc09d92c-5269-11df-8e9b-080069138b88" uid="11435"/>
-        <specific value="2" description="DDG 43 Dahlgren" uuid="cc0aef88-5269-11df-8bca-080069138b88" uid="11436"/>
-      </subcategory>
-      <subcategory value="4" description="Charles F. Adams Class" uuid="cc0ca4fe-5269-11df-94dd-080069138b88" uid="11437">
-        <specific value="1" description="DDG 2 Charles F. Adams" uuid="cc0db182-5269-11df-ae84-080069138b88" uid="11438"/>
-      </subcategory>
-      <subcategory value="5" description="Modified Charles F. Adams Class" uuid="cc0f771a-5269-11df-80d4-080069138b88" uid="11439">
-        <specific value="1" description="DDG 38 Perth (Australia)" uuid="cc108bc8-5269-11df-b0b2-080069138b88" uid="11440"/>
-        <specific value="2" description="DDG 39 Hobart (Australia)" uuid="cc153ea2-5269-11df-97d1-080069138b88" uid="11441"/>
-        <specific value="3" description="DDG 41 Brisbane (Australia)" uuid="cc1654a4-5269-11df-a6ac-080069138b88" uid="11442"/>
-      </subcategory>
-      <subcategory value="6" description="Fletcher and Allen M Summer Class" uuid="cc180d94-5269-11df-abd4-080069138b88" uid="11443">
-        <specific value="1" description="DDG 906 Huei Yang (ex. English DDG 696) (Taiwan)" uuid="cc191b62-5269-11df-941a-080069138b88" uid="11444"/>
-        <specific value="2" description="DDG 908 Kuei Yang (ex. Twining DD 540) (Taiwan)" uuid="cc1a3ce0-5269-11df-bd64-080069138b88" uid="11445"/>
-        <specific value="3" description="DDG 909 Chin Yang (ex. Mullany DD 528) (Taiwan)" uuid="cc1b6ca0-5269-11df-8fb3-080069138b88" uid="11446"/>
-        <specific value="4" description="DDG 914 Loa Yang (ex. Taussig DD 746) (Taiwan)" uuid="cc1c7dfc-5269-11df-8e92-080069138b88" uid="11447"/>
-        <specific value="5" description="DDG 917 Nan Yang (ex.Thomason DD760) (Taiwan)" uuid="cc1d946c-5269-11df-b5d7-080069138b88" uid="11448"/>
-        <specific value="6" description="DDG 918 An Yang (ex. Kimberly DD 521) (Taiwan)" uuid="cc1ea7c6-5269-11df-b239-080069138b88" uid="11449"/>
-        <specific value="7" description="DDG 919 Kun Yang (ex. Yarnall DD 541) (Taiwan)" uuid="cc1fbaee-5269-11df-8021-080069138b88" uid="11450"/>
-      </subcategory>
-      <subcategory value="7" description="Gearing (Wu Chin I and II Conversions) (FRAM I and II) Class" uuid="cc217280-5269-11df-8e6b-080069138b88" uid="11451">
-        <specific value="1" description="DDG 907 Fu Yang (ex. Ernest G. Small DD 838) (FRAM II) (Taiwan)" uuid="cc228c4c-5269-11df-9e5f-080069138b88" uid="11452"/>
-        <specific value="2" description="DDG 915 Han Yang (ex. Herbert J. Thomas DD 833) (Taiwan)" uuid="cc23a280-5269-11df-aeeb-080069138b88" uid="11453"/>
-        <specific value="3" description="DDG 924 Kai Yang (ex. Richard B. Anderson DD 786) (Taiwan)" uuid="cc24b21a-5269-11df-b4d8-080069138b88" uid="11454"/>
-        <specific value="4" description="DDG 926 Shuei Yang (ex. Hawkins DD 873) (Taiwan)" uuid="cc25c7c2-5269-11df-ae5b-080069138b88" uid="11455"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Destroyer" uuid="cc281e0a-5269-11df-a351-080069138b88" uid="11456">
-      <subcategory value="1" description="Spruance Class" uuid="cc292dd6-5269-11df-a932-080069138b88" uid="11457">
-        <specific value="1" description="DD 963 Spruance" uuid="cc2a427a-5269-11df-b027-080069138b88" uid="11458"/>
-        <specific value="2" description="DD 964 Paul F. Foster" uuid="cc2b5386-5269-11df-95c0-080069138b88" uid="11459"/>
-        <specific value="3" description="DD 965 Kinkaid" uuid="cc2c60b4-5269-11df-97e9-080069138b88" uid="11460"/>
-        <specific value="4" description="DD 966 Hewitt" uuid="cc2d7256-5269-11df-9b55-080069138b88" uid="11461"/>
-        <specific value="5" description="DD 967 Elliott" uuid="cc2e8434-5269-11df-a7ba-080069138b88" uid="11462"/>
-        <specific value="6" description="DD 968 A. W. Radford" uuid="cc341a7a-5269-11df-9df4-080069138b88" uid="11463"/>
-        <specific value="7" description="DD 969 Peterson" uuid="cc352f14-5269-11df-b347-080069138b88" uid="11464"/>
-        <specific value="8" description="DD 970 Caron" uuid="cc3640f2-5269-11df-877b-080069138b88" uid="11465"/>
-        <specific value="9" description="DD 971 David R. Ray" uuid="cc375672-5269-11df-aa9d-080069138b88" uid="11466"/>
-        <specific value="10" description="DD 972 Olendorf" uuid="cc386fda-5269-11df-83a4-080069138b88" uid="11467"/>
-        <specific value="11" description="DD 973 John Young" uuid="cc39986a-5269-11df-bcff-080069138b88" uid="11468"/>
-        <specific value="12" description="DD 974 Comte De Grasse" uuid="cc3aaf34-5269-11df-91ea-080069138b88" uid="11469"/>
-        <specific value="13" description="DD 975 O'Brien" uuid="cc3bc040-5269-11df-80d2-080069138b88" uid="11470"/>
-        <specific value="14" description="DD 976 Merrill" uuid="cc3ccbde-5269-11df-954d-080069138b88" uid="11471"/>
-        <specific value="15" description="DD 977 Briscoe" uuid="cc3ddd26-5269-11df-8ea4-080069138b88" uid="11472"/>
-        <specific value="16" description="DD 978 Stump" uuid="cc3eeb9e-5269-11df-8b5b-080069138b88" uid="11473"/>
-        <specific value="17" description="DD 979 Conolly" uuid="cc3ffa20-5269-11df-9484-080069138b88" uid="11474"/>
-        <specific value="18" description="DD 980 Moosebrugger" uuid="cc4109ba-5269-11df-9baa-080069138b88" uid="11475"/>
-        <specific value="19" description="DD 981 John Hancock" uuid="cc4221f6-5269-11df-853e-080069138b88" uid="11476"/>
-        <specific value="20" description="DD 982 Nicholson" uuid="cc43303c-5269-11df-a6e8-080069138b88" uid="11477"/>
-        <specific value="21" description="DD 983 John Rodgers" uuid="cc44429c-5269-11df-ba50-080069138b88" uid="11478"/>
-        <specific value="22" description="DD 984 Leftwich" uuid="cc455358-5269-11df-a8bc-080069138b88" uid="11479"/>
-        <specific value="23" description="DD 985 Cushing" uuid="cc465c30-5269-11df-9840-080069138b88" uid="11480"/>
-        <specific value="24" description="DD 986 Harry W. Hill" uuid="cc476f76-5269-11df-a1e4-080069138b88" uid="11481"/>
-        <specific value="25" description="DD 987 O'Bannon" uuid="cc487f6a-5269-11df-8406-080069138b88" uid="11482"/>
-        <specific value="26" description="DD 988 Thorn" uuid="cc498aae-5269-11df-992f-080069138b88" uid="11483"/>
-        <specific value="27" description="DD 989 Deyo" uuid="cc4a9c64-5269-11df-b2d3-080069138b88" uid="11484"/>
-        <specific value="28" description="DD 990 Ingersoll" uuid="cc4bac26-5269-11df-ae72-080069138b88" uid="11485"/>
-        <specific value="29" description="DD 991 Fife" uuid="cc4cb5e4-5269-11df-b0af-080069138b88" uid="11486"/>
-        <specific value="30" description="DD 992 Fletcher" uuid="cc4dc8d0-5269-11df-a509-080069138b88" uid="11487"/>
-        <specific value="31" description="DD 997 Hayler" uuid="cc4ed7a2-5269-11df-9177-080069138b88" uid="11488"/>
-      </subcategory>
-      <subcategory value="2" description="Modified Gearing FRAM I Class (Turkey)" uuid="cc508890-5269-11df-b0c1-080069138b88" uid="11489"/>
-      <subcategory value="3" description="Gearing (Wu Chin III Conversion) (FRAM I) Class" uuid="cc519924-5269-11df-8778-080069138b88" uid="11490">
-        <specific value="1" description="DD 912 Chien Yang (ex. James E. Kyes DD 787) (Taiwan)" uuid="cc52ad82-5269-11df-8249-080069138b88" uid="11491"/>
-        <specific value="2" description="DD 921 Liao Yang (ex. Hanson DD 832) (Taiwan)" uuid="cc53c0dc-5269-11df-adae-080069138b88" uid="11492"/>
-        <specific value="3" description="DD 929 Shao Yang (ex. Hollister DD 788) (Taiwan)" uuid="cc54d1b6-5269-11df-9dca-080069138b88" uid="11493"/>
-        <specific value="4" description="DD 925 Te Yang (ex. Sarsfield DD 837) (Taiwan)" uuid="cc5b16b6-5269-11df-8fad-080069138b88" uid="11494"/>
-        <specific value="5" description="DD 928 Chen Yang (ex. Johnston DD 821) (Taiwan)" uuid="cc601404-5269-11df-bfe9-080069138b88" uid="11495"/>
-        <specific value="6" description="DD 923 Shen Yang (ex. Power DD 839) (Taiwan)" uuid="cc676682-5269-11df-9457-080069138b88" uid="11496"/>
-        <specific value="7" description="DD 927 Yun Yang (ex. Hamner DD 718 ) (Taiwan)" uuid="cc6b37bc-5269-11df-b0ff-080069138b88" uid="11497"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided Missile Frigate" uuid="cc6dd918-5269-11df-94c0-080069138b88" uid="11498">
-      <subcategory value="1" description="Oliver Perry Class" uuid="cc6eea4c-5269-11df-bf0e-080069138b88" uid="11499">
-        <specific value="1" description="FFG 7 O.H. Perry" uuid="cc6ffe00-5269-11df-8f7b-080069138b88" uid="11500"/>
-        <specific value="2" description="FFG 8 McInerney" uuid="cc710eda-5269-11df-bb6a-080069138b88" uid="11501"/>
-        <specific value="3" description="FFG 9 Wadsworth" uuid="cc7226b2-5269-11df-9ca1-080069138b88" uid="11502"/>
-        <specific value="4" description="FFG 10 Duncan" uuid="cc73459c-5269-11df-ba09-080069138b88" uid="11503"/>
-        <specific value="5" description="FFG 11 Clark" uuid="cc745752-5269-11df-9888-080069138b88" uid="11504"/>
-        <specific value="6" description="FFG 12 George Philip" uuid="cc7563ae-5269-11df-a31e-080069138b88" uid="11505"/>
-        <specific value="7" description="FFG 13 Sam E. Morison" uuid="cc768a0e-5269-11df-8c5a-080069138b88" uid="11506"/>
-        <specific value="8" description="FFG 14 Sides" uuid="cc779d5e-5269-11df-bfa4-080069138b88" uid="11507"/>
-        <specific value="9" description="FFG 15 Estocin" uuid="cc78aa00-5269-11df-9604-080069138b88" uid="11508"/>
-        <specific value="10" description="FFG 16 Clifton Sprauge" uuid="cc79bcd8-5269-11df-b0d1-080069138b88" uid="11509"/>
-        <specific value="11" description="FFG 19 John A. Moore" uuid="cc7ac952-5269-11df-a4e5-080069138b88" uid="11510"/>
-        <specific value="12" description="FFG 20 Antrim" uuid="cc7be486-5269-11df-b2d0-080069138b88" uid="11511"/>
-        <specific value="13" description="FFG 21 Flatley" uuid="cc7cf6d2-5269-11df-a2a7-080069138b88" uid="11512"/>
-        <specific value="14" description="FFG 22 Fahrion" uuid="cc7e0a40-5269-11df-ba35-080069138b88" uid="11513"/>
-        <specific value="15" description="FFG 23 Lewis B. Puller" uuid="cc7f15e8-5269-11df-aee5-080069138b88" uid="11514"/>
-        <specific value="16" description="FFG 24 Jack Williams" uuid="cc802b36-5269-11df-8175-080069138b88" uid="11515"/>
-        <specific value="17" description="FFG 25 Copeland" uuid="cc813c42-5269-11df-bcab-080069138b88" uid="11516"/>
-        <specific value="18" description="FFG 26 Gallery" uuid="cc8248ee-5269-11df-8ac1-080069138b88" uid="11517"/>
-        <specific value="19" description="FFG 27 M. S. Tisdale" uuid="cc835e64-5269-11df-b281-080069138b88" uid="11518"/>
-        <specific value="20" description="FFG 28 Boone" uuid="cc84710a-5269-11df-aa35-080069138b88" uid="11519"/>
-        <specific value="21" description="FFG 29 S. W. Groves" uuid="cc857cf8-5269-11df-80dd-080069138b88" uid="11520"/>
-        <specific value="22" description="FFG 30 Reid" uuid="cc86902a-5269-11df-a5bc-080069138b88" uid="11521"/>
-        <specific value="23" description="FFG 31 Stark" uuid="cc87a08c-5269-11df-9351-080069138b88" uid="11522"/>
-        <specific value="24" description="FFG 32 John L. Hall" uuid="cc88b012-5269-11df-87b2-080069138b88" uid="11523"/>
-        <specific value="25" description="FFG 33 Jarrett" uuid="cc89c290-5269-11df-b1e1-080069138b88" uid="11524"/>
-        <specific value="26" description="FFG 34 Aubrey Fitch" uuid="cc8ad5ae-5269-11df-8307-080069138b88" uid="11525"/>
-        <specific value="27" description="FFG 36 Underwood" uuid="cc8be084-5269-11df-a6cf-080069138b88" uid="11526"/>
-        <specific value="28" description="FFG 37 Crommelin" uuid="cc8cf5a0-5269-11df-a7be-080069138b88" uid="11527"/>
-        <specific value="29" description="FFG 38 Curts" uuid="cc8e060c-5269-11df-8d62-080069138b88" uid="11528"/>
-        <specific value="30" description="FFG 39 Doyle" uuid="cc8f11aa-5269-11df-bd68-080069138b88" uid="11529"/>
-        <specific value="31" description="FFG 40 Halyburton" uuid="cc9026d0-5269-11df-99eb-080069138b88" uid="11530"/>
-        <specific value="32" description="FFG 41 McClusky" uuid="cc91396c-5269-11df-bb8d-080069138b88" uid="11531"/>
-        <specific value="33" description="FFG 42 Klakring" uuid="cc9248d4-5269-11df-b84a-080069138b88" uid="11532"/>
-        <specific value="34" description="FFG 43 Thatch" uuid="cc935b48-5269-11df-a438-080069138b88" uid="11533"/>
-        <specific value="35" description="FFG 45 De Wert" uuid="cc947474-5269-11df-ad4f-080069138b88" uid="11534"/>
-        <specific value="36" description="FFG 46 Rentz" uuid="cc95853a-5269-11df-ae9c-080069138b88" uid="11535"/>
-        <specific value="37" description="FFG 47 Nicholas" uuid="cc969600-5269-11df-988f-080069138b88" uid="11536"/>
-        <specific value="38" description="FFG 48 Vandegrift" uuid="cc97a842-5269-11df-95e9-080069138b88" uid="11537"/>
-        <specific value="39" description="FFG 49 R. G. Bradley" uuid="cc98b390-5269-11df-a33e-080069138b88" uid="11538"/>
-        <specific value="40" description="FFG 50 Jesse L. Taylor" uuid="cc99c8c0-5269-11df-aeaf-080069138b88" uid="11539"/>
-        <specific value="41" description="FFG 51 Gary" uuid="cc9ada44-5269-11df-9365-080069138b88" uid="11540"/>
-        <specific value="42" description="FFG 52 Carr" uuid="cc9be6c8-5269-11df-8a35-080069138b88" uid="11541"/>
-        <specific value="43" description="FFG 53 Hawes" uuid="cc9cf9aa-5269-11df-bbb6-080069138b88" uid="11542"/>
-        <specific value="44" description="FFG 54 Ford" uuid="cc9e0aac-5269-11df-945e-080069138b88" uid="11543"/>
-        <specific value="45" description="FFG 55 Elrod" uuid="cca033cc-5269-11df-abef-080069138b88" uid="11544"/>
-        <specific value="46" description="FFG 56 Simpson" uuid="cca149a6-5269-11df-bc4b-080069138b88" uid="11545"/>
-        <specific value="47" description="FFG 57 Reuben James" uuid="cca2614c-5269-11df-91a9-080069138b88" uid="11546"/>
-        <specific value="48" description="FFG 58 Sam B. Roberts" uuid="cca3758c-5269-11df-814d-080069138b88" uid="11547"/>
-        <specific value="49" description="FFG 59 Kauffman" uuid="cca48ecc-5269-11df-9a4a-080069138b88" uid="11548"/>
-        <specific value="50" description="FFG 60 Rodney M. Davis" uuid="cca59b0a-5269-11df-b124-080069138b88" uid="11549"/>
-        <specific value="51" description="FFG 61 Ingraham" uuid="cca6acd4-5269-11df-9d6b-080069138b88" uid="11550"/>
-        <specific value="52" description="F 81 Santa Maria (Spain)" uuid="cca7d640-5269-11df-8fee-080069138b88" uid="11551"/>
-        <specific value="53" description="F 82 Victoria (Spain)" uuid="cca8e94a-5269-11df-b7d3-080069138b88" uid="11552"/>
-        <specific value="54" description="F 83 Numancia (Spain)" uuid="cca9fbd2-5269-11df-a95e-080069138b88" uid="11553"/>
-        <specific value="55" description="F 84 Reina Sofia (Spain)" uuid="ccab0d74-5269-11df-aaaf-080069138b88" uid="11554"/>
-        <specific value="56" description="F 85 Navarra (Spain)" uuid="ccac1f70-5269-11df-912e-080069138b88" uid="11555"/>
-        <specific value="57" description="F 86 Canarias (Spain)" uuid="ccad31da-5269-11df-b075-080069138b88" uid="11556"/>
-        <specific value="58" description="FFG 01 Adelaide (Australia)" uuid="ccae43cc-5269-11df-a5ac-080069138b88" uid="11557"/>
-        <specific value="59" description="FFG 02 Canberra (Australia)" uuid="ccaf4f7e-5269-11df-b3e7-080069138b88" uid="11558"/>
-        <specific value="60" description="FFG 03 Sydney (Australia)" uuid="ccb065b2-5269-11df-b8a9-080069138b88" uid="11559"/>
-        <specific value="61" description="FFG 04 Darwin (Australia)" uuid="ccb45ffa-5269-11df-a290-080069138b88" uid="11560"/>
-        <specific value="62" description="FFG 05 Melbourne (Australia)" uuid="ccb5cdea-5269-11df-88bd-080069138b88" uid="11561"/>
-        <specific value="63" description="FFG 06 Newcastle (Australia)" uuid="ccb6e798-5269-11df-a4be-080069138b88" uid="11562"/>
-      </subcategory>
-      <subcategory value="2" description="Knox Class" uuid="ccb89fca-5269-11df-a648-080069138b88" uid="11563">
-        <specific value="1" description="FFG 932 Chin Yang (ex. Robert E. Perry FF 1073) (Taiwan)" uuid="ccb9b84c-5269-11df-b0b4-080069138b88" uid="11564"/>
-        <specific value="2" description="FFG 933 Fong Yang (ex. Brewton FF 1086) (Taiwan)" uuid="ccbac8f4-5269-11df-bcb2-080069138b88" uid="11565"/>
-        <specific value="3" description="FFG 934 Feng Yang (ex. Kirk FF 1087) (Taiwan)" uuid="ccbbdf6e-5269-11df-bf13-080069138b88" uid="11566"/>
-        <specific value="4" description="FFG 935 Lan Yang (ex. Joseph Hewes FF 1078) (Taiwan)" uuid="ccbcf8e0-5269-11df-a84f-080069138b88" uid="11567"/>
-        <specific value="5" description="FFG 936 Hae Yang (ex. Cook FF 1083) (Taiwan)" uuid="ccbe1fd6-5269-11df-84ef-080069138b88" uid="11568"/>
-        <specific value="6" description="FFG 937 Hwai Yang (ex. Barbey FF 1088) (Taiwan)" uuid="ccbf3ce0-5269-11df-93bb-080069138b88" uid="11569"/>
-        <specific value="7" description="FFG 938 (ex. Downes FF 1070) (Taiwan)" uuid="ccc052ce-5269-11df-a789-080069138b88" uid="11570"/>
-        <specific value="8" description="FFG 939 (ex. Aylwin FF 1081) (Taiwan)" uuid="ccc16bb4-5269-11df-8d50-080069138b88" uid="11571"/>
-      </subcategory>
-      <subcategory value="3" description="Modified Oliver Perry Class" uuid="ccc32102-5269-11df-88b2-080069138b88" uid="11572"/>
-    </category>
-    <category value="7" description="Light/patrol craft" uuid="ccc4d592-5269-11df-a941-080069138b88" uid="11573">
-      <subcategory value="1" description="PC Class" uuid="ccc5e464-5269-11df-b04b-080069138b88" uid="11574">
-        <specific value="1" description="PC 1 Cyclone" uuid="ccc6f610-5269-11df-87e8-080069138b88" uid="11575"/>
-        <specific value="2" description="PC 2 Tempest" uuid="ccc80a00-5269-11df-b770-080069138b88" uid="11576"/>
-        <specific value="3" description="PC 3 Hurricane" uuid="ccc91a44-5269-11df-886c-080069138b88" uid="11577"/>
-        <specific value="4" description="PC 4 Monsoon" uuid="ccca2b32-5269-11df-968a-080069138b88" uid="11578"/>
-        <specific value="5" description="PC 5 Typhoon" uuid="cccb3dec-5269-11df-82ee-080069138b88" uid="11579"/>
-        <specific value="6" description="PC 6 Sirocco" uuid="cccc4dcc-5269-11df-b710-080069138b88" uid="11580"/>
-        <specific value="7" description="PC 7 Squall" uuid="cccd5faa-5269-11df-9859-080069138b88" uid="11581"/>
-        <specific value="8" description="PC 8 Zephyr" uuid="ccd2c094-5269-11df-8d6d-080069138b88" uid="11582"/>
-        <specific value="9" description="PC 9 Chinook" uuid="ccd3da7e-5269-11df-a6ae-080069138b88" uid="11583"/>
-        <specific value="10" description="PC 10 Firebolt" uuid="ccd4ef86-5269-11df-98fc-080069138b88" uid="11584"/>
-        <specific value="11" description="PC 11 Whirlwind" uuid="ccd6038a-5269-11df-b4f0-080069138b88" uid="11585"/>
-        <specific value="12" description="PC 12 Thunderbolt" uuid="ccd71702-5269-11df-aa07-080069138b88" uid="11586"/>
-        <specific value="13" description="PC 13 Shamal" uuid="ccd8435c-5269-11df-8e52-080069138b88" uid="11587"/>
-        <specific value="14" description="PC 14 Tornado" status="new" uuid="71bf9521-122c-4a64-8854-9238d5f46f52" uid="22796">
-          <cr value="1642"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine countermeasure ship/craft" uuid="ccdaa868-5269-11df-b47b-080069138b88" uid="11588">
-      <subcategory value="1" description="Osprey class" uuid="ccdbc400-5269-11df-9a9c-080069138b88" uid="11589">
-        <specific value="1" description="MHC 51 Osprey" uuid="ccdcd638-5269-11df-94d3-080069138b88" uid="11590"/>
-        <specific value="2" description="MHC 52 Heron" uuid="ccdde3ac-5269-11df-ab56-080069138b88" uid="11591"/>
-        <specific value="3" description="MHC 53 Pelican" uuid="ccdef9ae-5269-11df-93eb-080069138b88" uid="11592"/>
-        <specific value="4" description="MHC 54 Robin" uuid="cce00b1e-5269-11df-98b5-080069138b88" uid="11593"/>
-        <specific value="5" description="MHC 55 Oriole" uuid="cce119dc-5269-11df-842f-080069138b88" uid="11594"/>
-        <specific value="6" description="MHC 56 Kingfisher" uuid="cce22fa2-5269-11df-9999-080069138b88" uid="11595"/>
-        <specific value="7" description="MHC 57 Cormorant" uuid="cce341ee-5269-11df-b0c7-080069138b88" uid="11596"/>
-        <specific value="8" description="MHC 58 Blackhawk" uuid="cce44d46-5269-11df-bb52-080069138b88" uid="11597"/>
-        <specific value="9" description="MHC 59 Falcon" uuid="cce56028-5269-11df-a4e6-080069138b88" uid="11598"/>
-        <specific value="10" description="MHC 60 Cardinal" uuid="cce67800-5269-11df-9554-080069138b88" uid="11599"/>
-        <specific value="11" description="MHC 61 Raven" uuid="cced7236-5269-11df-aa07-080069138b88" uid="11600"/>
-        <specific value="12" description="MHC 62 Shrike" uuid="ccee8392-5269-11df-89ba-080069138b88" uid="11601"/>
-      </subcategory>
-      <subcategory value="2" description="Avenger Class" uuid="ccf03ae8-5269-11df-a120-080069138b88" uid="11602">
-        <specific value="1" description="MCM 1 Avenger" uuid="ccf15a9a-5269-11df-bb27-080069138b88" uid="11603"/>
-        <specific value="2" description="MCM 2 Defender" uuid="ccf26e12-5269-11df-96b5-080069138b88" uid="11604"/>
-        <specific value="3" description="MCM 3 Sentry" uuid="ccf37bc2-5269-11df-975a-080069138b88" uid="11605"/>
-        <specific value="4" description="MCM 4 Champion" uuid="ccf49192-5269-11df-a275-080069138b88" uid="11606"/>
-        <specific value="5" description="MCM 5 Guardian" uuid="ccf5a58c-5269-11df-bab9-080069138b88" uid="11607"/>
-        <specific value="6" description="MCM 6 Devastator" uuid="ccf6ca70-5269-11df-bb03-080069138b88" uid="11608"/>
-        <specific value="7" description="MCM 7 Patriot" uuid="ccf7dd34-5269-11df-b3c6-080069138b88" uid="11609"/>
-        <specific value="8" description="MCM 8 Scout" uuid="ccf8f642-5269-11df-b60d-080069138b88" uid="11610"/>
-        <specific value="9" description="MCM 9 Pioneer" uuid="ccfa02f8-5269-11df-bafd-080069138b88" uid="11611"/>
-        <specific value="10" description="MCM 10 Warrior" uuid="ccfb159e-5269-11df-96b3-080069138b88" uid="11612"/>
-        <specific value="11" description="MCM 11 Gladiator" uuid="ccfc32d0-5269-11df-9b1c-080069138b88" uid="11613"/>
-        <specific value="12" description="MCM 12 Ardent" uuid="ccfd3fb8-5269-11df-bc97-080069138b88" uid="11614"/>
-        <specific value="13" description="MCM 13 Dextrous" uuid="ccfe52cc-5269-11df-b062-080069138b88" uid="11615"/>
-        <specific value="14" description="MCM 14 Chief" uuid="ccff67de-5269-11df-a38b-080069138b88" uid="11616"/>
-      </subcategory>
-      <subcategory value="3" description="Acme Class" uuid="cd011bec-5269-11df-bca8-080069138b88" uid="11617">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="cd022d02-5269-11df-ac90-080069138b88" uid="11618"/>
-        <specific value="2" description="MSO 511 Affray" uuid="cd033ff8-5269-11df-9478-080069138b88" uid="11619"/>
-      </subcategory>
-      <subcategory value="4" description="Agile/Aggressive Class" deprecated="1" uuid="cd04f294-5269-11df-b95d-080069138b88" uid="11620">
-        <specific value="1" description="MSO 427 Constant" deprecated="1" uuid="cd0609ea-5269-11df-a2ed-080069138b88" uid="11621"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="cd071646-5269-11df-b658-080069138b88" uid="11622"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="cd0c9daa-5269-11df-b3f9-080069138b88" uid="11623"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="cd1148e6-5269-11df-821e-080069138b88" uid="11624"/>
-        <specific value="5" description="MSO 439 Excel" deprecated="1" uuid="cd19950a-5269-11df-9fb9-080069138b88" uid="11625"/>
-        <specific value="6" description="MSO 440 Exploit" deprecated="1" uuid="cd1aac88-5269-11df-8a5a-080069138b88" uid="11626"/>
-        <specific value="7" description="(deprecated)" deprecated="1" uuid="cd1bbbb4-5269-11df-bd41-080069138b88" uid="11627"/>
-        <specific value="8" description="(deprecated)" deprecated="1" uuid="cd1cd2b0-5269-11df-8267-080069138b88" uid="11628"/>
-        <specific value="9" description="(deprecated)" deprecated="1" uuid="cd1de5f6-5269-11df-8d3c-080069138b88" uid="11629"/>
-        <specific value="10" description="MSO 446 Fortify" deprecated="1" uuid="cd1ef46e-5269-11df-b8cb-080069138b88" uid="11630"/>
-        <specific value="11" description="(deprecated)" deprecated="1" uuid="cd200c1e-5269-11df-b3ac-080069138b88" uid="11631"/>
-        <specific value="12" description="MSO 449 Impervious" deprecated="1" uuid="cd211fb4-5269-11df-b38f-080069138b88" uid="11632"/>
-        <specific value="13" description="(deprecated)" deprecated="1" uuid="cd222d28-5269-11df-80f7-080069138b88" uid="11633"/>
-        <specific value="14" description="(deprecated)" deprecated="1" uuid="cd233ea2-5269-11df-9eb6-080069138b88" uid="11634"/>
-        <specific value="15" description="(deprecated)" deprecated="1" uuid="cd24551c-5269-11df-a880-080069138b88" uid="11635"/>
-        <specific value="16" description="MSO 488 Conquest" deprecated="1" uuid="cd2562c2-5269-11df-8337-080069138b88" uid="11636"/>
-        <specific value="17" description="MSO 489 Gallant" deprecated="1" uuid="cd26754a-5269-11df-a99d-080069138b88" uid="11637"/>
-        <specific value="18" description="(deprecated)" deprecated="1" uuid="cd278a48-5269-11df-82fa-080069138b88" uid="11638"/>
-        <specific value="19" description="MSO 492 Pledge" deprecated="1" uuid="cd289758-5269-11df-ab06-080069138b88" uid="11639"/>
-      </subcategory>
-    </category>
-    <category value="9" description="Dock Landing Ship" uuid="cd2af3ae-5269-11df-916c-080069138b88" uid="11640">
-      <subcategory value="1" description="Whidbey Island Class" uuid="cd2bff1a-5269-11df-b895-080069138b88" uid="11641">
-        <specific value="1" description="LSD 41 Whidbey Island" uuid="cd2d0fcc-5269-11df-9227-080069138b88" uid="11642"/>
-        <specific value="2" description="LSD 42 Germantown" uuid="cd2e22ea-5269-11df-bd3e-080069138b88" uid="11643"/>
-        <specific value="3" description="LSD 43 Fort McHenry" uuid="cd2f3360-5269-11df-82fa-080069138b88" uid="11644"/>
-        <specific value="4" description="LSD 44 Gunston Hall" uuid="cd304dfe-5269-11df-93e4-080069138b88" uid="11645"/>
-        <specific value="5" description="LSD 45 Comstock" uuid="cd3161e4-5269-11df-a071-080069138b88" uid="11646"/>
-        <specific value="6" description="LSD 46 Tortuga" uuid="cd326c60-5269-11df-99a6-080069138b88" uid="11647"/>
-        <specific value="7" description="LSD 47 Rushmore" uuid="cd33844c-5269-11df-ad22-080069138b88" uid="11648"/>
-        <specific value="8" description="LSD 48 Ashland" uuid="cd349b52-5269-11df-bd80-080069138b88" uid="11649"/>
-        <specific value="9" description="LSD 49 Harpers Ferry" uuid="cd35a7cc-5269-11df-a7f6-080069138b88" uid="11650"/>
-        <specific value="10" description="LSD 50 Carter Hall" uuid="cd36b874-5269-11df-ae78-080069138b88" uid="11651"/>
-        <specific value="11" description="LSD 51 Oak Hill" uuid="cd37cbf6-5269-11df-8452-080069138b88" uid="11652"/>
-        <specific value="12" description="LSD 52 Pearl Harbor" uuid="cd38db90-5269-11df-90e9-080069138b88" uid="11653"/>
-      </subcategory>
-      <subcategory value="2" description="Anchorage Class" uuid="cd3a8d5a-5269-11df-97e2-080069138b88" uid="11654">
-        <specific value="1" description="LSD 36 Anchorage" uuid="cd3b9ea2-5269-11df-9d32-080069138b88" uid="11655"/>
-        <specific value="2" description="LSD 37 Portland" uuid="cd3cb0e4-5269-11df-9966-080069138b88" uid="11656"/>
-        <specific value="3" description="LSD 38 Pensacola" uuid="cd3dc27c-5269-11df-856a-080069138b88" uid="11657"/>
-        <specific value="4" description="LSD 39 Mount Vernon" uuid="cd3ed4fa-5269-11df-85e2-080069138b88" uid="11658"/>
-        <specific value="5" description="LSD 40 Fort Fisher" uuid="cd3fe584-5269-11df-8168-080069138b88" uid="11659"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Tank Landing Ship" uuid="cd423af0-5269-11df-ab42-080069138b88" uid="11660">
-      <subcategory value="1" description="Newport Class" uuid="cd434b48-5269-11df-94c0-080069138b88" uid="11661">
-        <specific value="1" description="LST 1179 Newport" uuid="cd445718-5269-11df-ac5e-080069138b88" uid="11662"/>
-        <specific value="2" description="LST 1180 Manitowac" uuid="cd4569b4-5269-11df-8d65-080069138b88" uid="11663"/>
-        <specific value="3" description="LST 1181 Sumter" uuid="cd467ade-5269-11df-b572-080069138b88" uid="11664"/>
-        <specific value="4" description="LST 1182 Fresno" uuid="cd478708-5269-11df-a045-080069138b88" uid="11665"/>
-        <specific value="5" description="LST 1183 Peoria" uuid="cd4898aa-5269-11df-9b71-080069138b88" uid="11666"/>
-        <specific value="6" description="LST 1184 Frederick" uuid="cd49a998-5269-11df-9184-080069138b88" uid="11667"/>
-        <specific value="7" description="LST 1185 Schenectady" uuid="cd4ab9be-5269-11df-ae4f-080069138b88" uid="11668"/>
-        <specific value="8" description="LST 1186 Cayuga" uuid="cd4bcbd8-5269-11df-98c3-080069138b88" uid="11669"/>
-        <specific value="9" description="LST 1187 Tuscaloosa" uuid="cd4cdd16-5269-11df-b3f6-080069138b88" uid="11670"/>
-        <specific value="10" description="LST 1188 Saginaw" uuid="cd4dea44-5269-11df-a5e7-080069138b88" uid="11671"/>
-        <specific value="11" description="LST 1189 San Bernardino" uuid="cd4f056e-5269-11df-9020-080069138b88" uid="11672"/>
-        <specific value="12" description="LST 1190 Boulder" uuid="cd501c74-5269-11df-b948-080069138b88" uid="11673"/>
-        <specific value="13" description="LST 1191 Racine" uuid="cd51289e-5269-11df-97ac-080069138b88" uid="11674"/>
-        <specific value="14" description="LST 1192 Spartanburg County" uuid="cd523982-5269-11df-b45e-080069138b88" uid="11675"/>
-        <specific value="15" description="LST 1193 Fairfax County" uuid="cd534d18-5269-11df-973b-080069138b88" uid="11676"/>
-        <specific value="16" description="LST 1194 La Moure County" uuid="cd545d0c-5269-11df-82df-080069138b88" uid="11677"/>
-        <specific value="17" description="(deprecated)" deprecated="1" uuid="cd556e7c-5269-11df-864d-080069138b88" uid="11678"/>
-        <specific value="18" description="LST 1196 Harlan County" uuid="cd56800a-5269-11df-88c7-080069138b88" uid="11679"/>
-        <specific value="19" description="LST 1197 Barnstable County" uuid="cd578c66-5269-11df-b500-080069138b88" uid="11680"/>
-        <specific value="20" description="LST 1198 Bristol County" uuid="cd58a240-5269-11df-8967-080069138b88" uid="11681"/>
-      </subcategory>
-      <subcategory value="2" description="Newport Class LPA/LST (modified)" uuid="cd5a55a4-5269-11df-b10b-080069138b88" uid="11682">
-        <specific value="1" description="L51 Kanimbla (ex. Saginaw)" uuid="cd5b8974-5269-11df-b49e-080069138b88" uid="11683"/>
-        <specific value="2" description="L52 Manoora (ex. Fairfax County)" uuid="cd5c9ce2-5269-11df-b03d-080069138b88" uid="11684"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="cd5ef460-5269-11df-846f-080069138b88" uid="11685">
-      <subcategory value="1" description="Landing Craft Air Cusion (LCAC)" uuid="cd60054e-5269-11df-9ffe-080069138b88" uid="11686"/>
-      <subcategory value="2" description="LCU 1600 Class: Utility Landing Craft" uuid="cd6115e2-5269-11df-b6e3-080069138b88" uid="11687"/>
-      <subcategory value="3" description="LCU 6 Type: Mechanized Landing Craft" uuid="cd622928-5269-11df-9c4e-080069138b88" uid="11688"/>
-      <subcategory value="4" description="Landing Craft Personnel (LCPL)" uuid="cd633dd6-5269-11df-b1d2-080069138b88" uid="11689"/>
-      <subcategory value="5" description="Amphibious Assault Vehicle (AAV)" uuid="cd644ea6-5269-11df-b4d1-080069138b88" uid="11690"/>
-      <subcategory value="6" description="LCU 1610 Class (Transport) (YFU) (Saudia Arabia)" uuid="cd656296-5269-11df-ad48-080069138b88" uid="11691">
-        <specific value="1" description="212 Al Qiaq (Saudia Arabia)" uuid="cd6674ce-5269-11df-867e-080069138b88" uid="11692"/>
-      </subcategory>
-    </category>
-    <category value="14" description="Hydrofoil" uuid="cd68ca30-5269-11df-8f3c-080069138b88" uid="11693">
-      <subcategory value="1" description="Pegasus class" uuid="cd69da1a-5269-11df-9fe6-080069138b88" uid="11694">
-        <specific value="1" description="PHM 1 Pegasus" uuid="cd6aed06-5269-11df-a1a0-080069138b88" uid="11695"/>
-        <specific value="2" description="PHM 2 Hercules" uuid="cd6bfdea-5269-11df-b597-080069138b88" uid="11696"/>
-        <specific value="3" description="PHM 3 Taurus" uuid="cd6d0ece-5269-11df-a832-080069138b88" uid="11697"/>
-        <specific value="4" description="PHM 4 Aquila" uuid="cd6e2408-5269-11df-881a-080069138b88" uid="11698"/>
-        <specific value="5" description="PHM 5 Aries" uuid="cd6f3a32-5269-11df-b2c7-080069138b88" uid="11699"/>
-        <specific value="6" description="PHM 6 Gemini" uuid="cd704b8e-5269-11df-b9cc-080069138b88" uid="11700"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="cd72a942-5269-11df-8289-080069138b88" uid="11701">
-      <subcategory value="1" description="Cimarron class (Fleet Oilers)" uuid="cd73c12e-5269-11df-b49d-080069138b88" uid="11702">
-        <specific value="1" description="AO 177 Cimarron" uuid="cd74cfd8-5269-11df-b838-080069138b88" uid="11703"/>
-        <specific value="2" description="AO 178 Monongahela" uuid="cd75e1e8-5269-11df-a8fe-080069138b88" uid="11704"/>
-        <specific value="3" description="AO 179 Merrimack" uuid="cd76f10a-5269-11df-a003-080069138b88" uid="11705"/>
-        <specific value="4" description="AO 180 Willamette" uuid="cd7800b8-5269-11df-b32a-080069138b88" uid="11706"/>
-        <specific value="5" description="AO 186 Platte" uuid="cd7911e2-5269-11df-99b6-080069138b88" uid="11707"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="cd7ac5be-5269-11df-818e-080069138b88" uid="11708"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="cd7bd9f4-5269-11df-b9a4-080069138b88" uid="11709"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="cd7ce722-5269-11df-a7c1-080069138b88" uid="11710"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="cd7dfa90-5269-11df-9d63-080069138b88" uid="11711"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="cd7f1128-5269-11df-b08e-080069138b88" uid="11712"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="cd807f7c-5269-11df-a7b2-080069138b88" uid="11713"/>
-      <subcategory value="8" description="Wichita class (Replenishment Oilers)" uuid="cd819d08-5269-11df-8432-080069138b88" uid="11714">
-        <specific value="1" description="AOR 1 Wichita" uuid="cd82b652-5269-11df-826d-080069138b88" uid="11715"/>
-        <specific value="2" description="AOR 2 Milwaukee" uuid="cd84465c-5269-11df-a229-080069138b88" uid="11716"/>
-        <specific value="3" description="AOR 3 Kansas City" uuid="cd855be6-5269-11df-af79-080069138b88" uid="11717"/>
-        <specific value="4" description="AOR 4 Savannah" uuid="cd86af64-5269-11df-b7f1-080069138b88" uid="11718"/>
-        <specific value="5" description="AOR 5 Wabash" uuid="cd87c958-5269-11df-b76d-080069138b88" uid="11719"/>
-        <specific value="6" description="AOR 6 Kalamazoo" uuid="cd88da5a-5269-11df-9628-080069138b88" uid="11720"/>
-        <specific value="7" description="AOR 7 Roanoke" uuid="cd89ebd4-5269-11df-97b7-080069138b88" uid="11721"/>
-      </subcategory>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="cd8ba668-5269-11df-b5ce-080069138b88" uid="11722"/>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="cd8cdd58-5269-11df-b845-080069138b88" uid="11723"/>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="cd8df4e0-5269-11df-9480-080069138b88" uid="11724"/>
-      <subcategory value="12" description="Vulcan class (Repair Ship)" uuid="cd8f0998-5269-11df-929e-080069138b88" uid="11725">
-        <specific value="1" description="AR 8 Jason" uuid="cd901fcc-5269-11df-ab4a-080069138b88" uid="11726"/>
-      </subcategory>
-      <subcategory value="13" description="Fulton class (Submarine Tenders)" uuid="cd91d218-5269-11df-820d-080069138b88" uid="11727">
-        <specific value="1" description="AS 18 Orion" uuid="cd92e112-5269-11df-b5fb-080069138b88" uid="11728"/>
-      </subcategory>
-      <subcategory value="14" description="Proteus class (Submarine Tenders)" uuid="cd949232-5269-11df-a40e-080069138b88" uid="11729">
-        <specific value="1" description="AS 19 Proteus" uuid="cd95a492-5269-11df-9ebc-080069138b88" uid="11730"/>
-      </subcategory>
-      <subcategory value="15" description="Hunley class (Submarine Tenders)" uuid="cd975882-5269-11df-9dfd-080069138b88" uid="11731">
-        <specific value="1" description="AS 31 Hunley" uuid="cd9868b2-5269-11df-a9aa-080069138b88" uid="11732"/>
-        <specific value="2" description="AS 32 Holland" uuid="cd99737e-5269-11df-9f99-080069138b88" uid="11733"/>
-      </subcategory>
-      <subcategory value="16" description="Simon Lake class (Submarine Tenders)" uuid="cd9b275a-5269-11df-976c-080069138b88" uid="11734">
-        <specific value="1" description="AS 33 Simon Lake" uuid="cd9c3a82-5269-11df-80e8-080069138b88" uid="11735"/>
-        <specific value="2" description="AS 34 Canopus" uuid="cd9d497c-5269-11df-ae3e-080069138b88" uid="11736"/>
-      </subcategory>
-      <subcategory value="17" description="Spear class (Submarine Tenders)" uuid="cd9efd12-5269-11df-af02-080069138b88" uid="11737">
-        <specific value="1" description="AS 36 L. Y. Spear" uuid="cda009b4-5269-11df-9e36-080069138b88" uid="11738"/>
-        <specific value="2" description="AS 37 Dixon" uuid="cda11b4c-5269-11df-92cf-080069138b88" uid="11739"/>
-      </subcategory>
-      <subcategory value="18" description="Emory S. Land class (Submarine Tenders)" uuid="cda2cf0a-5269-11df-8d02-080069138b88" uid="11740">
-        <specific value="1" description="AS 39 Emory S. Land" uuid="cda3e124-5269-11df-9d00-080069138b88" uid="11741"/>
-        <specific value="2" description="AS 40 Frank Cable" uuid="cda4ecd6-5269-11df-99d3-080069138b88" uid="11742"/>
-        <specific value="3" description="AS 41 McKee" uuid="cda60076-5269-11df-8b55-080069138b88" uid="11743"/>
-      </subcategory>
-      <subcategory value="19" description="Bolster class (Salvage Ships)" uuid="cda7b416-5269-11df-95fe-080069138b88" uid="11744">
-        <specific value="1" description="ARS 8 Preserver" uuid="cda8c978-5269-11df-a6d5-080069138b88" uid="11745"/>
-        <specific value="2" description="ARS 38 Bolster" uuid="cda9d52a-5269-11df-a259-080069138b88" uid="11746"/>
-        <specific value="3" description="ARS 39 Conserver" uuid="cdaaf0b8-5269-11df-81d6-080069138b88" uid="11747"/>
-        <specific value="4" description="ARS 40 Hoist" uuid="cdabfd78-5269-11df-a3f5-080069138b88" uid="11748"/>
-        <specific value="5" description="ARS 41 Opportune" uuid="cdad11cc-5269-11df-9662-080069138b88" uid="11749"/>
-        <specific value="6" description="ARS 42 Reclaimer" uuid="cdae2256-5269-11df-9b53-080069138b88" uid="11750"/>
-        <specific value="7" description="ARS 43 Recovery" uuid="cdaf3330-5269-11df-b6ca-080069138b88" uid="11751"/>
-      </subcategory>
-      <subcategory value="20" description="Safeguard class (Salvage Ships)" uuid="cdb0e5f4-5269-11df-b82f-080069138b88" uid="11752">
-        <specific value="1" description="ARS 50 Safeguard" uuid="cdb2660e-5269-11df-ba06-080069138b88" uid="11753"/>
-        <specific value="2" description="ARS 51 Grasp" uuid="cdb37508-5269-11df-9854-080069138b88" uid="11754"/>
-        <specific value="3" description="ARS 52 Salvor" uuid="cdb485f6-5269-11df-9ecb-080069138b88" uid="11755"/>
-        <specific value="4" description="ARS 53 Grapple" uuid="cdb59af4-5269-11df-a11a-080069138b88" uid="11756"/>
-      </subcategory>
-      <subcategory value="21" description="Edenton class (Salvage Ships)" uuid="cdb7674e-5269-11df-96ea-080069138b88" uid="11757">
-        <specific value="1" description="ATS 1 Edenton" uuid="cdb92fca-5269-11df-814d-080069138b88" uid="11758"/>
-        <specific value="2" description="ATS 2 Beaufort" uuid="cdba4c16-5269-11df-8178-080069138b88" uid="11759"/>
-        <specific value="3" description="ATS 3 Brunswick" uuid="cdbba584-5269-11df-854e-080069138b88" uid="11760"/>
-      </subcategory>
-      <subcategory value="22" description="Chanticleer class (Submarine Rescue)" uuid="cdbd9e52-5269-11df-9048-080069138b88" uid="11761">
-        <specific value="1" description="ASR 13 Kittiwake" uuid="cdbeacb6-5269-11df-b7b0-080069138b88" uid="11762"/>
-        <specific value="2" description="ASR 15 Sunbird" uuid="cdbfc60a-5269-11df-988e-080069138b88" uid="11763"/>
-      </subcategory>
-      <subcategory value="23" description="Pigeon class (Submarine Rescue)" uuid="cdc17856-5269-11df-bda0-080069138b88" uid="11764">
-        <specific value="1" description="ASR 21 Pigeon" uuid="cdc28930-5269-11df-ba80-080069138b88" uid="11765"/>
-        <specific value="2" description="ASR 22 Ortolan" uuid="cdc39816-5269-11df-a383-080069138b88" uid="11766"/>
-      </subcategory>
-      <subcategory value="24" description="Abnaki class (Fleet Ocean Tugs)" uuid="cdc549b8-5269-11df-bdb2-080069138b88" uid="11767">
-        <specific value="1" description="ATF 159 Paiute" uuid="cdc65bbe-5269-11df-b54e-080069138b88" uid="11768"/>
-        <specific value="2" description="ATF 160 Papago" uuid="cdc76f2c-5269-11df-89d3-080069138b88" uid="11769"/>
-      </subcategory>
-    </category>
-    <category value="17" description="Auxiliary, Merchant Marine" uuid="cdc9c7fe-5269-11df-be28-080069138b88" uid="11770">
-      <subcategory value="1" description="Fleet Ballistic Missile Support Ships (Naval Fleet)" uuid="cdcae058-5269-11df-9654-080069138b88" uid="11771">
-        <specific value="1" description="TAK 282 Marshfield" uuid="cdcbef3e-5269-11df-9d43-080069138b88" uid="11772"/>
-        <specific value="2" description="TAK 286 Vega" uuid="cdcd0478-5269-11df-99e1-080069138b88" uid="11773"/>
-      </subcategory>
-      <subcategory value="2" description="Ammunition Ship (Naval Fleet)" uuid="cdceb822-5269-11df-aa51-080069138b88" uid="11774">
-        <specific value="1" description="TAE 26 Kilauea" deprecated="1" uuid="cdcfc9b0-5269-11df-969f-080069138b88" uid="11775"/>
-      </subcategory>
-      <subcategory value="3" description="Fleet Stores Ship (Naval Fleet)" uuid="cdd17bd4-5269-11df-b1d6-080069138b88" uid="11776">
-        <specific value="1" description="TAF 58 Rigel" uuid="cdd28a42-5269-11df-86b6-080069138b88" uid="11777"/>
-      </subcategory>
-      <subcategory value="4" description="Combat Stores Ships (Naval Fleet)" uuid="cdd43982-5269-11df-9083-080069138b88" uid="11778">
-        <specific value="1" description="TAFS 8 Sirius" uuid="cdd54b38-5269-11df-9307-080069138b88" uid="11779"/>
-        <specific value="2" description="TAFS 9 Spica" uuid="cdd661f8-5269-11df-a452-080069138b88" uid="11780"/>
-        <specific value="3" description="TAFS 10 Saturn" uuid="cdd76bfc-5269-11df-9ddf-080069138b88" uid="11781"/>
-      </subcategory>
-      <subcategory value="5" description="Neosho class (Naval Fleet Oilers)" uuid="cdd91bdc-5269-11df-aa6c-080069138b88" uid="11782">
-        <specific value="1" description="TAO 143 Neosho" uuid="cdda3134-5269-11df-8747-080069138b88" uid="11783"/>
-        <specific value="2" description="TAO 146 Kawishiwi" uuid="cddb6892-5269-11df-bdbf-080069138b88" uid="11784"/>
-        <specific value="3" description="TAO 148 Ponchatoula" uuid="cddc7a66-5269-11df-984b-080069138b88" uid="11785"/>
-      </subcategory>
-      <subcategory value="6" description="Henry J. Kaiser class (Naval Fleet Oilers)" uuid="cdde3662-5269-11df-8c26-080069138b88" uid="11786">
-        <specific value="1" description="TAO 187 Henry J. Kaiser" uuid="cddf4250-5269-11df-a5c4-080069138b88" uid="11787"/>
-        <specific value="2" description="TAO 188 Joshua Humphreys" uuid="cde05834-5269-11df-8c70-080069138b88" uid="11788"/>
-        <specific value="3" description="TAO 189 John Lenthall" uuid="cde16a1c-5269-11df-b44c-080069138b88" uid="11789"/>
-        <specific value="4" description="TAO 190 Andrew J. Higgins" uuid="cde27574-5269-11df-a25d-080069138b88" uid="11790"/>
-        <specific value="5" description="TAO 191 Benjamin Isherwood" uuid="cde38a90-5269-11df-8756-080069138b88" uid="11791"/>
-        <specific value="6" description="TAO 192 Henry Eckford" uuid="cde49b7e-5269-11df-a1e1-080069138b88" uid="11792"/>
-        <specific value="7" description="TAO 193 Walter S. Diehl" uuid="cde5a7c6-5269-11df-9d6b-080069138b88" uid="11793"/>
-        <specific value="8" description="TAO 194 John Ericsson" uuid="cde6b9e0-5269-11df-ab07-080069138b88" uid="11794"/>
-        <specific value="9" description="TAO 195 Leroy Grumman" uuid="cde7c9de-5269-11df-9c82-080069138b88" uid="11795"/>
-        <specific value="10" description="TAO 196 Kanawha" uuid="cde8e2ba-5269-11df-bb2b-080069138b88" uid="11796"/>
-        <specific value="11" description="TAO 197 Pecos" uuid="cde9f6f0-5269-11df-b10b-080069138b88" uid="11797"/>
-        <specific value="12" description="TAO 198 Big Horn" uuid="cdeb0964-5269-11df-a9c1-080069138b88" uid="11798"/>
-        <specific value="13" description="TAO 199 Tippecanoe" uuid="cdec12c8-5269-11df-8c95-080069138b88" uid="11799"/>
-        <specific value="14" description="TAO 200 Guadaloupe" uuid="cded2776-5269-11df-90f4-080069138b88" uid="11800"/>
-        <specific value="15" description="TAO 201 Patuxent" uuid="cdee385a-5269-11df-9a8e-080069138b88" uid="11801"/>
-        <specific value="16" description="TAO 202 Yukon" uuid="cdef43d0-5269-11df-98ae-080069138b88" uid="11802"/>
-        <specific value="17" description="TAO 203 Laramie" uuid="cdf0569e-5269-11df-82dd-080069138b88" uid="11803"/>
-        <specific value="18" description="TAO 204 Rappahannock" uuid="cdf1680e-5269-11df-a383-080069138b88" uid="11804"/>
-      </subcategory>
-      <subcategory value="7" description="Powhatan class (Fleet Ocean Tugs)" uuid="cdf31a82-5269-11df-a27e-080069138b88" uid="11805">
-        <specific value="1" description="TATF 166 Powhatan" uuid="cdf429a4-5269-11df-9902-080069138b88" uid="11806"/>
-        <specific value="2" description="TATF 167 Narragansett" uuid="cdf538d0-5269-11df-94d9-080069138b88" uid="11807"/>
-        <specific value="3" description="TATF 168 Catawba" uuid="cdf649a0-5269-11df-8e58-080069138b88" uid="11808"/>
-        <specific value="4" description="TATF 169 Navajo" uuid="cdf7580e-5269-11df-bca2-080069138b88" uid="11809"/>
-        <specific value="5" description="TATF 170 Mohawk" uuid="cdf86776-5269-11df-8dd8-080069138b88" uid="11810"/>
-        <specific value="6" description="TATF 171 Sioux" uuid="cdf97792-5269-11df-bcd6-080069138b88" uid="11811"/>
-        <specific value="7" description="TATF 172 Apache" uuid="cdfa860a-5269-11df-8819-080069138b88" uid="11812"/>
-      </subcategory>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="cdfc354a-5269-11df-b473-080069138b88" uid="11813"/>
-      <subcategory value="9" description="Maritime Prepositioning Ships (MPS)" uuid="cdfd4908-5269-11df-b5f3-080069138b88" uid="11814">
-        <specific value="1" description="TAK 3000 Cpl Louis Hauge Jr." uuid="cdfe5e56-5269-11df-97db-080069138b88" uid="11815"/>
-        <specific value="2" description="TAK 3001 Pfc William Baugh" uuid="cdff69b8-5269-11df-b0e3-080069138b88" uid="11816"/>
-        <specific value="3" description="TAK 3002 Pfc James Anderson Jr." uuid="ce007ba0-5269-11df-a8a3-080069138b88" uid="11817"/>
-        <specific value="4" description="TAK 3003 1st Lt Alexander Bonnyman Jr." uuid="ce018ec8-5269-11df-be42-080069138b88" uid="11818"/>
-        <specific value="5" description="TAK 3004 Pvt Harry Fisher" uuid="ce029a0c-5269-11df-b923-080069138b88" uid="11819"/>
-        <specific value="6" description="TAK 3005 Sgt Matej Kocak" uuid="ce03abae-5269-11df-b629-080069138b88" uid="11820"/>
-        <specific value="7" description="TAK 3006 Pfc Eugene A. Obregon" uuid="ce04c0fc-5269-11df-9b66-080069138b88" uid="11821"/>
-        <specific value="8" description="TAK 3007 Maj Stephen W. Pless" uuid="ce05cd26-5269-11df-8274-080069138b88" uid="11822"/>
-        <specific value="9" description="TAK 3008 2nd Lt John P. Bobo" uuid="ce06df5e-5269-11df-890d-080069138b88" uid="11823"/>
-        <specific value="10" description="TAK 3009 Pfc Dewayne T. Williams" uuid="ce07fb96-5269-11df-b4c8-080069138b88" uid="11824"/>
-        <specific value="11" description="TAK 3010 1st Lt Baldomero Lopez" uuid="ce090c16-5269-11df-8530-080069138b88" uid="11825"/>
-        <specific value="12" description="TAK 3011 1st Lt Jack Lummus" uuid="ce0a1ebc-5269-11df-bf8c-080069138b88" uid="11826"/>
-        <specific value="13" description="TAK 3012 Staff Sgt William R. Button" uuid="ce0b3338-5269-11df-a5fe-080069138b88" uid="11827"/>
-      </subcategory>
-      <subcategory value="10" description="Lash (Preposition)" uuid="ce0cf4a2-5269-11df-811e-080069138b88" uid="11828">
-        <specific value="1" description="TAK 1015 Green Island" uuid="ce0e007c-5269-11df-8a31-080069138b88" uid="11829"/>
-        <specific value="2" description="TAK 2043 American Kestrel" uuid="ce0f1228-5269-11df-8b6c-080069138b88" uid="11830"/>
-        <specific value="3" description="TAK 2046 Austral Rainbow" uuid="ce102276-5269-11df-9bc3-080069138b88" uid="11831"/>
-        <specific value="4" description="TAK 2064 Green Harbour" uuid="ce11318e-5269-11df-b5ff-080069138b88" uid="11832"/>
-      </subcategory>
-      <subcategory value="11" description="Freighters (Preposition)" uuid="ce12e236-5269-11df-b72b-080069138b88" uid="11833">
-        <specific value="1" description="TAK 5076 Noble Star" uuid="ce13f4b4-5269-11df-bc37-080069138b88" uid="11834"/>
-        <specific value="2" description="TAK 2040 Advantage" uuid="ce1504ee-5269-11df-8c41-080069138b88" uid="11835"/>
-        <specific value="3" description="TAK 2062 American Cormorant" uuid="ce161050-5269-11df-b6fe-080069138b88" uid="11836"/>
-      </subcategory>
-      <subcategory value="12" description="Tankers (PRE-POSITION)" uuid="ce17c440-5269-11df-a5c7-080069138b88" uid="11837">
-        <specific value="1" description="TAOT 170 Sealift China Sea" uuid="ce18d632-5269-11df-bd3a-080069138b88" uid="11838"/>
-        <specific value="2" description="TAOT 181 Potomac" uuid="ce19e5fe-5269-11df-8413-080069138b88" uid="11839"/>
-      </subcategory>
-      <subcategory value="13" description="Tankers (Ocean Transportation)" uuid="ce1b993a-5269-11df-bcb4-080069138b88" uid="11840">
-        <specific value="1" description="TAOT 168 Sealift Pacific" uuid="ce1ca4b0-5269-11df-bbe7-080069138b88" uid="11841"/>
-        <specific value="2" description="TAOT 169 Sealift Arabian Sea" uuid="ce1db620-5269-11df-8a1b-080069138b88" uid="11842"/>
-        <specific value="3" description="TAOT 171 Sealift Indian Ocean" uuid="ce1ec844-5269-11df-a6ba-080069138b88" uid="11843"/>
-        <specific value="4" description="TAOT 172 Sealift Atlantic" uuid="ce1fd748-5269-11df-bc9f-080069138b88" uid="11844"/>
-        <specific value="5" description="TAOT 173 Sealift Mediterranean" uuid="ce20e70a-5269-11df-a84f-080069138b88" uid="11845"/>
-        <specific value="6" description="TAOT 174 Sealift Caribbean" uuid="ce21f9d8-5269-11df-8463-080069138b88" uid="11846"/>
-        <specific value="7" description="TAOT 175 Sealift Arctic" uuid="ce230724-5269-11df-84c3-080069138b88" uid="11847"/>
-        <specific value="8" description="TAOT 176 Sealift Antarctic" uuid="ce2418bc-5269-11df-b4cb-080069138b88" uid="11848"/>
-        <specific value="9" description="TAOT 1121 Gus W. Darnell" uuid="ce252a72-5269-11df-84af-080069138b88" uid="11849"/>
-        <specific value="10" description="TAOT 1122 Paul Buck" uuid="ce2641d2-5269-11df-ac91-080069138b88" uid="11850"/>
-        <specific value="11" description="TAOT 1123 Samuel L. Cobb" uuid="ce275310-5269-11df-adcb-080069138b88" uid="11851"/>
-        <specific value="12" description="TAOT 1124 Richard G. Matthieson" uuid="ce286610-5269-11df-ba30-080069138b88" uid="11852"/>
-        <specific value="13" description="TAOT 1125 Lawrence H. Gianella" uuid="ce2972bc-5269-11df-9d75-080069138b88" uid="11853"/>
-      </subcategory>
-      <subcategory value="14" description="Fast Sealift Ships (Strategic Sealift)" uuid="ce2b280a-5269-11df-a7fc-080069138b88" uid="11854">
-        <specific value="1" description="TAKR 287 Algol" uuid="ce2c3772-5269-11df-a67d-080069138b88" uid="11855"/>
-        <specific value="2" description="TAKR 288 Bellatrix" uuid="ce2d48c4-5269-11df-821a-080069138b88" uid="11856"/>
-        <specific value="3" description="TAKR 289 Denebola" uuid="ce2e576e-5269-11df-8188-080069138b88" uid="11857"/>
-        <specific value="4" description="TAKR 290 Pollux" uuid="ce2f66f4-5269-11df-9d70-080069138b88" uid="11858"/>
-        <specific value="5" description="TAKR 291 Altair" uuid="ce30762a-5269-11df-82d1-080069138b88" uid="11859"/>
-        <specific value="6" description="TAKR 292 Regulus" uuid="ce31834e-5269-11df-8e5d-080069138b88" uid="11860"/>
-        <specific value="7" description="TAKR 293 Capella" uuid="ce32945a-5269-11df-8102-080069138b88" uid="11861"/>
-        <specific value="8" description="TAKR 294 Antares" uuid="ce33a520-5269-11df-9085-080069138b88" uid="11862"/>
-      </subcategory>
-      <subcategory value="15" description="Aviation Support Ships (Strategic Sealift)" uuid="ce3554ec-5269-11df-baf3-080069138b88" uid="11863">
-        <specific value="1" description="TAVB 3 Wright" uuid="ce366486-5269-11df-865a-080069138b88" uid="11864"/>
-        <specific value="2" description="TAVB 4 Curtiss" uuid="ce38b894-5269-11df-b01b-080069138b88" uid="11865"/>
-      </subcategory>
-      <subcategory value="16" description="Hospital Ships (Strategic Sealift)" uuid="ce3a72d8-5269-11df-8833-080069138b88" uid="11866">
-        <specific value="1" description="TAH 19 Mercy" uuid="ce3b85e2-5269-11df-9e85-080069138b88" uid="11867"/>
-        <specific value="2" description="TAH 20 Comfort" uuid="ce3c8fc8-5269-11df-be42-080069138b88" uid="11868"/>
-      </subcategory>
-      <subcategory value="17" description="Frigate Research Ship (Special Mission Support)" uuid="ce3e4430-5269-11df-81a4-080069138b88" uid="11869">
-        <specific value="1" description="T-AGFF1 Glover" uuid="ce3f56f4-5269-11df-acf5-080069138b88" uid="11870"/>
-      </subcategory>
-      <subcategory value="18" description="Missile Range Instrumentation Ships (Special Mission Support)" uuid="ce410ad0-5269-11df-96ca-080069138b88" uid="11871">
-        <specific value="1" description="TAGM 20 Redstone" uuid="ce421baa-5269-11df-807c-080069138b88" uid="11872"/>
-        <specific value="2" description="TAGM 22 Range Sentinel" uuid="ce432ab8-5269-11df-86ab-080069138b88" uid="11873"/>
-        <specific value="3" description="TAGM 23 Observation Island" uuid="ce443d7c-5269-11df-85c4-080069138b88" uid="11874"/>
-      </subcategory>
-      <subcategory value="19" description="Oceanographic Research Ships (Special Mission Support)" uuid="ce45f9f0-5269-11df-90d1-080069138b88" uid="11875">
-        <specific value="1" description="TAGOR 10 Thomas Washington (loan)" uuid="ce470ba6-5269-11df-b238-080069138b88" uid="11876"/>
-        <specific value="2" description="TAGOR 12 De Steigeur" uuid="ce481d48-5269-11df-8384-080069138b88" uid="11877"/>
-        <specific value="3" description="TAGOR 13 Bartlett" uuid="ce492f9e-5269-11df-be3a-080069138b88" uid="11878"/>
-        <specific value="4" description="TAGOR 14 Melville (loan)" uuid="ce4a40be-5269-11df-8c45-080069138b88" uid="11879"/>
-        <specific value="5" description="TAGOR 15 Knorr (loan)" uuid="ce4b4f86-5269-11df-9978-080069138b88" uid="11880"/>
-        <specific value="6" description="TAGOR 21 Gyre (loan)" uuid="ce4c60c4-5269-11df-9ae3-080069138b88" uid="11881"/>
-        <specific value="7" description="TAGOR 22 Moana Wave (loan)" uuid="ce4d728e-5269-11df-a5ae-080069138b88" uid="11882"/>
-        <specific value="8" description="TAGOR 23 Thomas G. Thompson (loan)" uuid="ce4e7ea4-5269-11df-8443-080069138b88" uid="11883"/>
-        <specific value="9" description="TAGOR 195 Hayes" uuid="ce4f8f1a-5269-11df-8f9b-080069138b88" uid="11884"/>
-      </subcategory>
-      <subcategory value="20" description="Surveying Ships (Special Mission Support)" uuid="ce514346-5269-11df-bc27-080069138b88" uid="11885">
-        <specific value="1" description="TAGS 26 Silas Bent" uuid="ce52540c-5269-11df-9e6a-080069138b88" uid="11886"/>
-        <specific value="2" description="TAGS 27 Kane" uuid="ce536306-5269-11df-8eac-080069138b88" uid="11887"/>
-        <specific value="3" description="TAGS 29 Chauvenet" uuid="ce54716a-5269-11df-b35e-080069138b88" uid="11888"/>
-        <specific value="4" description="TAGS 32 Harkness" uuid="ce5581b8-5269-11df-97d7-080069138b88" uid="11889"/>
-        <specific value="5" description="TAGS 33 Wilkes" uuid="ce568ff4-5269-11df-880f-080069138b88" uid="11890"/>
-        <specific value="6" description="TAGS 34 Wyman" uuid="ce57a0d8-5269-11df-a960-080069138b88" uid="11891"/>
-        <specific value="7" description="TAGS 39 Maury" uuid="ce58afb4-5269-11df-a371-080069138b88" uid="11892"/>
-        <specific value="8" description="TAGS 40 Tanner" uuid="ce59bdc8-5269-11df-9e34-080069138b88" uid="11893"/>
-        <specific value="9" description="TAGS 45 Waters" uuid="ce5acde4-5269-11df-8725-080069138b88" uid="11894"/>
-        <specific value="10" description="TAGS 51 John McDonnell" uuid="ce5bdf18-5269-11df-906a-080069138b88" uid="11895"/>
-        <specific value="11" description="TAGS 52 Littlehales" uuid="ce5ce944-5269-11df-9209-080069138b88" uid="11896"/>
-        <specific value="12" description="TAGS 60 Pathfinder" uuid="ce5dfb2c-5269-11df-a21a-080069138b88" uid="11897"/>
-        <specific value="13" description="TAGS 61 Sumner" uuid="ce5f0fe4-5269-11df-ab99-080069138b88" uid="11898"/>
-      </subcategory>
-      <subcategory value="21" description="Navigation Test Support Ship (Special Mission Support)" uuid="ce60c122-5269-11df-9467-080069138b88" uid="11899">
-        <specific value="1" description="TAG 194 Vanguard" uuid="ce61cd4c-5269-11df-a38f-080069138b88" uid="11900"/>
-      </subcategory>
-      <subcategory value="22" description="Cable Repair Ships (Special Mission Support)" uuid="ce638b0a-5269-11df-8cc9-080069138b88" uid="11901">
-        <specific value="1" description="TARC 6 Albert J. Myer" uuid="ce649de2-5269-11df-b6d8-080069138b88" uid="11902"/>
-        <specific value="2" description="TARC 7 Zeus" uuid="ce65af3e-5269-11df-b122-080069138b88" uid="11903"/>
-      </subcategory>
-      <subcategory value="23" description="Deep Submergence Support Ship (Special Mission Support)" uuid="ce676130-5269-11df-a943-080069138b88" uid="11904">
-        <specific value="1" description="TAGDS 2 Point Loma" uuid="ce6871a6-5269-11df-9118-080069138b88" uid="11905"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate" uuid="ce6ac44c-5269-11df-9085-080069138b88" uid="11906">
-      <subcategory value="1" description="Knox Class" uuid="ce6bcde2-5269-11df-b3e3-080069138b88" uid="11907">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="ce6cdcb4-5269-11df-b3d4-080069138b88" uid="11908"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="ce6df2b6-5269-11df-8921-080069138b88" uid="11909"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="ce6f00de-5269-11df-98e0-080069138b88" uid="11910"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="ce7013a2-5269-11df-827b-080069138b88" uid="11911"/>
-        <specific value="5" description="FF 1056 Connole" uuid="ce71247c-5269-11df-ab17-080069138b88" uid="11912"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="ce72334e-5269-11df-a309-080069138b88" uid="11913"/>
-        <specific value="7" description="(deprecated)" deprecated="1" uuid="ce7343ec-5269-11df-b6a8-080069138b88" uid="11914"/>
-        <specific value="8" description="(deprecated)" deprecated="1" uuid="ce74566a-5269-11df-9338-080069138b88" uid="11915"/>
-        <specific value="9" description="(deprecated)" deprecated="1" uuid="ce756438-5269-11df-b8c2-080069138b88" uid="11916"/>
-        <specific value="10" description="(deprecated)" deprecated="1" uuid="ce7676de-5269-11df-8fe6-080069138b88" uid="11917"/>
-        <specific value="11" description="(deprecated)" deprecated="1" uuid="ce778880-5269-11df-adef-080069138b88" uid="11918"/>
-        <specific value="12" description="FF 1063 Reasoner" uuid="ce789568-5269-11df-96a7-080069138b88" uid="11919"/>
-        <specific value="13" description="FF 1064 Lockwood" uuid="ce79a584-5269-11df-8b03-080069138b88" uid="11920"/>
-        <specific value="14" description="FF 1065 Stein" uuid="ce7ab9ec-5269-11df-939a-080069138b88" uid="11921"/>
-        <specific value="15" description="FF 1066 Marvin Shields" uuid="ce7bc616-5269-11df-aaef-080069138b88" uid="11922"/>
-        <specific value="16" description="FF 1067 F. Hammond" uuid="ce7cd72c-5269-11df-be37-080069138b88" uid="11923"/>
-        <specific value="17" description="FF 1068 Vreeland" uuid="ce7de7e8-5269-11df-a146-080069138b88" uid="11924"/>
-        <specific value="18" description="(deprecated)" deprecated="1" uuid="ce7ef70a-5269-11df-943b-080069138b88" uid="11925"/>
-        <specific value="19" description="FF 1070 Downes" uuid="ce80071c-5269-11df-a090-080069138b88" uid="11926"/>
-        <specific value="20" description="(deprecated)" deprecated="1" uuid="ce8117ec-5269-11df-81ad-080069138b88" uid="11927"/>
-        <specific value="21" description="(deprecated)" deprecated="1" uuid="ce822c04-5269-11df-b88a-080069138b88" uid="11928"/>
-        <specific value="22" description="FF 1073 R. E. Peary" uuid="ce833f40-5269-11df-82b7-080069138b88" uid="11929"/>
-        <specific value="23" description="FF 1074 Harold E. Holt" uuid="ce845434-5269-11df-bcb3-080069138b88" uid="11930"/>
-        <specific value="24" description="FF 1075 Trippe" uuid="ce855e56-5269-11df-81a3-080069138b88" uid="11931"/>
-        <specific value="25" description="FF 1076 Fanning" uuid="ce866f12-5269-11df-a863-080069138b88" uid="11932"/>
-        <specific value="26" description="FF 1077 Ouellet" uuid="ce8780b4-5269-11df-9bb9-080069138b88" uid="11933"/>
-        <specific value="27" description="FF 1078 Joseph Hewes" uuid="ce888f22-5269-11df-bce8-080069138b88" uid="11934"/>
-        <specific value="28" description="FF 1079 Bowen" uuid="ce899f20-5269-11df-8b83-080069138b88" uid="11935"/>
-        <specific value="29" description="FF 1080 Paul" uuid="ce8aae9c-5269-11df-a6db-080069138b88" uid="11936"/>
-        <specific value="30" description="FF 1081 Aylwin" uuid="ce8bb97c-5269-11df-ab47-080069138b88" uid="11937"/>
-        <specific value="31" description="FF 1082 E. Montgomery" uuid="ce8ccd3a-5269-11df-ba41-080069138b88" uid="11938"/>
-        <specific value="32" description="FF 1083 Cook" uuid="ce8ddd7e-5269-11df-a364-080069138b88" uid="11939"/>
-        <specific value="33" description="FF 1084 McCandless" uuid="ce8ee804-5269-11df-9f2f-080069138b88" uid="11940"/>
-        <specific value="34" description="FF 1085 D. B. Beary" uuid="ce8ffb4a-5269-11df-aa07-080069138b88" uid="11941"/>
-        <specific value="35" description="(deprecated)" deprecated="1" uuid="ce910c42-5269-11df-822b-080069138b88" uid="11942"/>
-        <specific value="36" description="FF 1087 Kirk" uuid="ce9216dc-5269-11df-86e4-080069138b88" uid="11943"/>
-        <specific value="37" description="(deprecated)" deprecated="1" uuid="ce934ea8-5269-11df-bdee-080069138b88" uid="11944"/>
-        <specific value="38" description="FF 1089 J. L. Brown" uuid="ce9466b2-5269-11df-99c1-080069138b88" uid="11945"/>
-        <specific value="39" description="FF 1090 Ainsworth" uuid="ce957296-5269-11df-abba-080069138b88" uid="11946"/>
-        <specific value="40" description="(deprecated)" deprecated="1" uuid="ce9685dc-5269-11df-a5a5-080069138b88" uid="11947"/>
-        <specific value="41" description="FF 1092 T. C. Hart" uuid="ce979a1c-5269-11df-9cd8-080069138b88" uid="11948"/>
-        <specific value="42" description="FF 1093 Capodanno" uuid="ce98a484-5269-11df-a2bb-080069138b88" uid="11949"/>
-        <specific value="43" description="FF 1094 Pharris" uuid="ce99b54a-5269-11df-b8d6-080069138b88" uid="11950"/>
-        <specific value="44" description="FF 1095 Truett" uuid="ce9ac778-5269-11df-a8bc-080069138b88" uid="11951"/>
-        <specific value="45" description="(deprecated)" deprecated="1" uuid="ce9bd19a-5269-11df-bc9c-080069138b88" uid="11952"/>
-        <specific value="46" description="FF 1097 Moinester" uuid="ce9ce436-5269-11df-9596-080069138b88" uid="11953"/>
-      </subcategory>
-    </category>
-    <category value="51" description="Battleship" uuid="ce9f3808-5269-11df-82e1-080069138b88" uid="11954"/>
-    <category value="52" description="Heavy Cruiser" uuid="cea0504e-5269-11df-ac52-080069138b88" uid="11955"/>
-    <category value="53" description="Destroyer Tender" uuid="cea1643e-5269-11df-886d-080069138b88" uid="11956">
-      <subcategory value="1" description="Sam Gompers/Yellowstone Class" uuid="cea27540-5269-11df-8568-080069138b88" uid="11957">
-        <specific value="1" description="AD 37 Samuel Gompers" uuid="cea381ce-5269-11df-a949-080069138b88" uid="11958"/>
-        <specific value="2" description="AD 38 Puget Sound" uuid="cea4955a-5269-11df-8827-080069138b88" uid="11959"/>
-        <specific value="3" description="AD 41 Yellowstone" uuid="cea5a616-5269-11df-b0b1-080069138b88" uid="11960"/>
-        <specific value="4" description="AD 42 Acadia" uuid="cea6bbbe-5269-11df-8821-080069138b88" uid="11961"/>
-        <specific value="5" description="AD 43 Cape Cod" uuid="cea7cdd8-5269-11df-b515-080069138b88" uid="11962"/>
-        <specific value="6" description="AD 44 Shenandoah" uuid="cea8de08-5269-11df-ba62-080069138b88" uid="11963"/>
-      </subcategory>
-      <subcategory value="2" description="Dixie Class" uuid="ceaa91b2-5269-11df-8510-080069138b88" uid="11964">
-        <specific value="1" description="AD 15 Prairie" uuid="ceab9aa8-5269-11df-acdc-080069138b88" uid="11965"/>
-        <specific value="2" description="AD 18 Sierra" uuid="ceacaca4-5269-11df-a6d2-080069138b88" uid="11966"/>
-        <specific value="3" description="AD 19 Yosemite" uuid="ceadbf90-5269-11df-be2a-080069138b88" uid="11967"/>
-      </subcategory>
-    </category>
-    <category value="54" description="Amphibious Assault Ship" uuid="ceb00d0e-5269-11df-a0ea-080069138b88" uid="11968">
-      <subcategory value="1" description="Tarawa Class" uuid="ceb11f82-5269-11df-b59e-080069138b88" uid="11969">
-        <specific value="1" description="LHA 1 Tarawa" uuid="ceb2295e-5269-11df-8112-080069138b88" uid="11970"/>
-        <specific value="2" description="LHA 2 Saipan" uuid="ceb33a56-5269-11df-bdfe-080069138b88" uid="11971"/>
-        <specific value="3" description="LHA 3 Belleau Wood" uuid="ceb44d92-5269-11df-a5db-080069138b88" uid="11972"/>
-        <specific value="4" description="LHA 4 Nassau" uuid="ceb558ae-5269-11df-854f-080069138b88" uid="11973"/>
-        <specific value="5" description="LHA 5 Peleliu" uuid="ceb668ac-5269-11df-bc86-080069138b88" uid="11974"/>
-      </subcategory>
-      <subcategory value="2" description="Iwo Jima Class" uuid="ceb81b20-5269-11df-95cb-080069138b88" uid="11975">
-        <specific value="1" description="LPH 2 Iwo Jima" uuid="ceb927e0-5269-11df-a6fc-080069138b88" uid="11976"/>
-        <specific value="2" description="LPH 3 Okinawa" uuid="ceba32de-5269-11df-ad2a-080069138b88" uid="11977"/>
-        <specific value="3" description="LPH 7 Guadalcanal" uuid="cebb473c-5269-11df-a498-080069138b88" uid="11978"/>
-        <specific value="4" description="LPH 9 Guam" uuid="cebc57ee-5269-11df-9ff8-080069138b88" uid="11979"/>
-        <specific value="5" description="LPH 10 Tripoli" uuid="cebd618e-5269-11df-a5bb-080069138b88" uid="11980"/>
-        <specific value="6" description="LPH 11 New Orleans" uuid="cebe7452-5269-11df-8943-080069138b88" uid="11981"/>
-        <specific value="7" description="LPH 12 Inchon" deprecated="1" uuid="cebf8f86-5269-11df-9d68-080069138b88" uid="11982"/>
-      </subcategory>
-      <subcategory value="3" description="Wasp Class" uuid="cec14042-5269-11df-9f92-080069138b88" uid="11983">
-        <specific value="1" description="LHD 1 Wasp" uuid="cec24c44-5269-11df-8d80-080069138b88" uid="11984"/>
-        <specific value="2" description="LHD 2 Essex" uuid="cec35bde-5269-11df-b81d-080069138b88" uid="11985"/>
-        <specific value="3" description="LHD 3 Kearsage" uuid="cec46c7c-5269-11df-9dc2-080069138b88" uid="11986"/>
-        <specific value="4" description="LHD 4 Boxer" uuid="cec578d8-5269-11df-8ffe-080069138b88" uid="11987"/>
-        <specific value="5" description="LHD 5 Bataan" uuid="cec68750-5269-11df-956c-080069138b88" uid="11988"/>
-        <specific value="6" description="LHD 6 Bonhomme Richard" uuid="cec79adc-5269-11df-ba15-080069138b88" uid="11989"/>
-        <specific value="7" description="LHD 7 Iwo Jima" uuid="cec8a652-5269-11df-9fd9-080069138b88" uid="11990"/>
-      </subcategory>
-      <subcategory value="4" description="MCS Class" uuid="ceca566e-5269-11df-922a-080069138b88" uid="11991">
-        <specific value="1" description="MCS 12 Inchon" uuid="cecb63e2-5269-11df-ba12-080069138b88" uid="11992"/>
-      </subcategory>
-    </category>
-    <category value="55" description="Amphibious Cargo Ship" uuid="cecdb71e-5269-11df-95ff-080069138b88" uid="11993">
-      <subcategory value="1" description="Charleston Class" deprecated="1" uuid="cecec78a-5269-11df-8e7c-080069138b88" uid="11994">
-        <specific value="1" description="LKA 113 Charleston" deprecated="1" uuid="cecfddaa-5269-11df-9f47-080069138b88" uid="11995"/>
-        <specific value="2" description="LKA 114 Durham" deprecated="1" uuid="ced0edb2-5269-11df-8b99-080069138b88" uid="11996"/>
-        <specific value="3" description="LKA 115 Mobile" deprecated="1" uuid="ced1f95a-5269-11df-8843-080069138b88" uid="11997"/>
-        <specific value="4" description="LKA 116 St. Louis" deprecated="1" uuid="ced30e62-5269-11df-a57b-080069138b88" uid="11998"/>
-        <specific value="5" description="LKA 117 El Paso" deprecated="1" uuid="ced41fdc-5269-11df-be37-080069138b88" uid="11999"/>
-      </subcategory>
-    </category>
-    <category value="56" description="Amphibious Transport Dock" uuid="ced670c0-5269-11df-b3f4-080069138b88" uid="12000">
-      <subcategory value="1" description="Austin Class" uuid="ced784b0-5269-11df-87d2-080069138b88" uid="12001">
-        <specific value="1" description="LPD 4 Austin" uuid="ced88e96-5269-11df-a209-080069138b88" uid="12002"/>
-        <specific value="2" description="LPD 5 Ogden" uuid="ced99e6c-5269-11df-a580-080069138b88" uid="12003"/>
-        <specific value="3" description="LPD 6 Duluth" uuid="cedaad34-5269-11df-af06-080069138b88" uid="12004"/>
-        <specific value="4" description="LPD 7 Cleveland" uuid="cedbbaee-5269-11df-bd98-080069138b88" uid="12005"/>
-        <specific value="5" description="LPD 8 Dubuque" uuid="cedcca7e-5269-11df-b99e-080069138b88" uid="12006"/>
-        <specific value="6" description="LPD 9 Denver" uuid="cedddd10-5269-11df-a539-080069138b88" uid="12007"/>
-        <specific value="7" description="LPD 10 Juneau" uuid="cedef15a-5269-11df-9e73-080069138b88" uid="12008"/>
-        <specific value="8" description="LPD 12 Shreveport" uuid="cee0020c-5269-11df-a0ac-080069138b88" uid="12009"/>
-        <specific value="9" description="LPD 13 Nashville" uuid="cee11322-5269-11df-8c8a-080069138b88" uid="12010"/>
-        <specific value="10" description="LPD 14 Trenton" uuid="cee21eca-5269-11df-979b-080069138b88" uid="12011"/>
-        <specific value="11" description="LPD 15 Ponce" uuid="cee32d24-5269-11df-a3a8-080069138b88" uid="12012"/>
-        <specific value="12" description="LPD 17 San Antonio" deprecated="1" uuid="cee442e0-5269-11df-b0ab-080069138b88" uid="12013"/>
-        <specific value="13" description="LPD 18 New Orleans" deprecated="1" uuid="cee54e42-5269-11df-a615-080069138b88" uid="12014"/>
-      </subcategory>
-      <subcategory value="2" description="San Antonio Class" uuid="cee6ffa8-5269-11df-9538-080069138b88" uid="12015">
-        <specific value="1" description="LPD 17 San Antonio" uuid="cee80e3e-5269-11df-9849-080069138b88" uid="12016"/>
-        <specific value="2" description="LPD 18 New Orleans" uuid="cee9233c-5269-11df-9c29-080069138b88" uid="12017"/>
-        <specific value="3" description="LPD 19 Mesa Verde" uuid="ceea2caa-5269-11df-8378-080069138b88" uid="12018"/>
-      </subcategory>
-    </category>
-    <category value="57" description="Ammunition Ship" uuid="ceec83a6-5269-11df-9ee0-080069138b88" uid="12019">
-      <subcategory value="1" description="Kilauea Class" uuid="ceed8c7e-5269-11df-a137-080069138b88" uid="12020">
-        <specific value="1" description="T-AE 26 Kilauea" uuid="ceeed764-5269-11df-92af-080069138b88" uid="12021"/>
-        <specific value="2" description="AE 27 Butte" uuid="ceeff504-5269-11df-bf19-080069138b88" uid="12022"/>
-        <specific value="3" description="AE 28 Santa Barbara" uuid="cef1011a-5269-11df-bc92-080069138b88" uid="12023"/>
-        <specific value="4" description="AE 29 Mount Hood" uuid="cef21258-5269-11df-8584-080069138b88" uid="12024"/>
-        <specific value="5" description="AE 32 Flint" uuid="cef3226a-5269-11df-af8d-080069138b88" uid="12025"/>
-        <specific value="6" description="AE 33 Shasta" uuid="cef432c2-5269-11df-836c-080069138b88" uid="12026"/>
-        <specific value="7" description="AE 34 Mount Baker" uuid="cef54342-5269-11df-9f0c-080069138b88" uid="12027"/>
-        <specific value="8" description="AE 35 Kiska" uuid="cef65444-5269-11df-884f-080069138b88" uid="12028"/>
-      </subcategory>
-      <subcategory value="2" description="Suribachi Class" uuid="cef80640-5269-11df-b879-080069138b88" uid="12029">
-        <specific value="1" description="AE 21 Suribachi" uuid="cef91058-5269-11df-b527-080069138b88" uid="12030"/>
-        <specific value="2" description="AE 22 Mauna Kea" uuid="cefa20ba-5269-11df-bdf4-080069138b88" uid="12031"/>
-        <specific value="3" description="AE 23 Nitro" uuid="cefb341e-5269-11df-8c0f-080069138b88" uid="12032"/>
-        <specific value="4" description="AE 24 Pyro" uuid="cefc3e54-5269-11df-8d36-080069138b88" uid="12033"/>
-        <specific value="5" description="AE 25 Haleakala" uuid="cefd57e4-5269-11df-baef-080069138b88" uid="12034"/>
-      </subcategory>
-      <subcategory value="3" description="Nitro Class" deprecated="1" uuid="ceff0daa-5269-11df-8a9d-080069138b88" uid="12035">
-        <specific value="1" description="AE 23 Nitro" deprecated="1" uuid="cf001e2a-5269-11df-bfa0-080069138b88" uid="12036"/>
-        <specific value="2" description="AE 24 Pyro" deprecated="1" uuid="cf012aea-5269-11df-8e12-080069138b88" uid="12037"/>
-        <specific value="3" description="AE 25 Haleakala" deprecated="1" uuid="cf023f16-5269-11df-ac37-080069138b88" uid="12038"/>
-      </subcategory>
-    </category>
-    <category value="58" description="Combat Stores Ship" uuid="cf0490ae-5269-11df-8abb-080069138b88" uid="12039">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="cf05a476-5269-11df-9092-080069138b88" uid="12040"/>
-      <subcategory value="2" description="Mars Class" uuid="cf06b654-5269-11df-8da9-080069138b88" uid="12041">
-        <specific value="1" description="AFS 1 Mars" uuid="cf07c8fa-5269-11df-9d06-080069138b88" uid="12042"/>
-        <specific value="2" description="AFS 2 Sylvania" uuid="cf08d7ae-5269-11df-b741-080069138b88" uid="12043"/>
-        <specific value="3" description="AFS 3 Niagara Falls" uuid="cf09e81a-5269-11df-a5b8-080069138b88" uid="12044"/>
-        <specific value="4" description="AFS 4 White Plains" uuid="cf0af7f0-5269-11df-b2e1-080069138b88" uid="12045"/>
-        <specific value="5" description="AFS 5 Concord" uuid="cf0c0334-5269-11df-93fb-080069138b88" uid="12046"/>
-        <specific value="6" description="AFS 6 San Diego" uuid="cf0d1706-5269-11df-95e3-080069138b88" uid="12047"/>
-        <specific value="7" description="AFS 7 San Jose" uuid="cf0e281c-5269-11df-8abf-080069138b88" uid="12048"/>
-      </subcategory>
-    </category>
-    <category value="59" description="Surveillance Towed Array Sonar System (SURTASS)" uuid="cf1079dc-5269-11df-848b-080069138b88" uid="12049">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="cf118bba-5269-11df-9ea8-080069138b88" uid="12050"/>
-      <subcategory value="2" description="SWATH-S (Small) class" uuid="cf129884-5269-11df-b687-080069138b88" uid="12051">
-        <specific value="1" description="TAGOS 19 Victorious" uuid="cf13ad00-5269-11df-b26d-080069138b88" uid="12052"/>
-        <specific value="2" description="TAGOS 20 Able" uuid="cf14be8e-5269-11df-88cc-080069138b88" uid="12053"/>
-        <specific value="3" description="TAGOS 21 Effective" uuid="cf15c9fa-5269-11df-86dc-080069138b88" uid="12054"/>
-        <specific value="4" description="TAGOS 22 Loyal" uuid="cf16db06-5269-11df-8223-080069138b88" uid="12055"/>
-      </subcategory>
-      <subcategory value="3" description="SWATH-L (Large) class" uuid="cf188e38-5269-11df-a8e3-080069138b88" uid="12056">
-        <specific value="1" description="TAGOS 23 Impeccable" uuid="cf199c7e-5269-11df-ad4c-080069138b88" uid="12057"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="cf1b5a64-5269-11df-8d35-080069138b88" uid="12058"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="cf1c683c-5269-11df-adca-080069138b88" uid="12059"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="cf1d7b46-5269-11df-bf25-080069138b88" uid="12060"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="cf1e8f04-5269-11df-b60a-080069138b88" uid="12061"/>
-      <subcategory value="8" description="Stalwart Class (Ocean Surveillance)" uuid="cf1f9a3e-5269-11df-bd8b-080069138b88" uid="12062">
-        <specific value="1" description="TAGOS 1 Stalwart" uuid="cf20acee-5269-11df-b753-080069138b88" uid="12063"/>
-        <specific value="2" description="TAGOS 2 Contender" uuid="cf21c142-5269-11df-8084-080069138b88" uid="12064"/>
-        <specific value="3" description="TAGOS 3 Vindicator" uuid="cf22cc04-5269-11df-8be7-080069138b88" uid="12065"/>
-        <specific value="4" description="TAGOS 4 Triumph" uuid="cf23dd06-5269-11df-87c7-080069138b88" uid="12066"/>
-        <specific value="5" description="TAGOS 5 Assurance" uuid="cf24ef2a-5269-11df-b60f-080069138b88" uid="12067"/>
-        <specific value="6" description="TAGOS 6 Persistent" uuid="cf25fcee-5269-11df-86e4-080069138b88" uid="12068"/>
-        <specific value="7" description="TAGOS 7 Indomitable" uuid="cf270c6a-5269-11df-9abe-080069138b88" uid="12069"/>
-        <specific value="8" description="TAGOS 8 Prevail" uuid="cf281eb6-5269-11df-93ad-080069138b88" uid="12070"/>
-        <specific value="9" description="TAGOS 9 Assertive" uuid="cf292b08-5269-11df-a18f-080069138b88" uid="12071"/>
-        <specific value="10" description="TAGOS 10 Invincible" uuid="cf2a3ea8-5269-11df-84aa-080069138b88" uid="12072"/>
-        <specific value="11" description="TAGOS 11 Audacious" uuid="cf2b4e60-5269-11df-8dc9-080069138b88" uid="12073"/>
-        <specific value="12" description="TAGOS 12 Bold" uuid="cf2c58be-5269-11df-8e49-080069138b88" uid="12074"/>
-        <specific value="13" description="TAGOS 13 Adventurous" uuid="cf2d6bfa-5269-11df-9af6-080069138b88" uid="12075"/>
-        <specific value="14" description="TAGOS 14 Worthy" uuid="cf2e7cfc-5269-11df-97ea-080069138b88" uid="12076"/>
-        <specific value="15" description="TAGOS 15 Titan" uuid="cf2f8660-5269-11df-aa93-080069138b88" uid="12077"/>
-        <specific value="16" description="TAGOS 16 Capable" uuid="cf309712-5269-11df-ad4e-080069138b88" uid="12078"/>
-        <specific value="17" description="TAGOS 17 Intrepid" uuid="cf31abfc-5269-11df-a8bd-080069138b88" uid="12079"/>
-        <specific value="18" description="TAGOS 18 Relentless" uuid="cf32b812-5269-11df-aa66-080069138b88" uid="12080"/>
-      </subcategory>
-    </category>
-    <category value="60" description="Fast Combat Support Ship" uuid="cf350e6e-5269-11df-8e16-080069138b88" uid="12081">
-      <subcategory value="1" description="Sacramento Class" uuid="cf361d90-5269-11df-bb71-080069138b88" uid="12082">
-        <specific value="1" description="AOE 1 Sacramento" uuid="cf372dd4-5269-11df-b5bd-080069138b88" uid="12083"/>
-        <specific value="2" description="AOE 2 Camden" uuid="cf383f1c-5269-11df-a6a1-080069138b88" uid="12084"/>
-        <specific value="3" description="AOE 3 Seattle" uuid="cf394826-5269-11df-b3d4-080069138b88" uid="12085"/>
-        <specific value="4" description="AOE 4 Detroit" uuid="cf3a6346-5269-11df-86ba-080069138b88" uid="12086"/>
-      </subcategory>
-      <subcategory value="2" description="Supply Class" uuid="cf3c18f8-5269-11df-af06-080069138b88" uid="12087">
-        <specific value="1" description="AOE 6 Supply" uuid="cf3d37a6-5269-11df-952c-080069138b88" uid="12088"/>
-        <specific value="2" description="AOE 7 Rainier" uuid="cf3e5366-5269-11df-b201-080069138b88" uid="12089"/>
-        <specific value="3" description="AOE 8 Arctic" uuid="cf3f647c-5269-11df-a0ef-080069138b88" uid="12090"/>
-        <specific value="4" description="AOE 10 Bridge" uuid="cf40795c-5269-11df-81b1-080069138b88" uid="12091"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="cf42cafe-5269-11df-8e5a-080069138b88" uid="12092">
-      <subcategory value="1" description="Container Class" uuid="cf43de44-5269-11df-8f19-080069138b88" uid="12093">
-        <specific value="1" description="American Kentucky" uuid="cf44e834-5269-11df-8588-080069138b88" uid="12094"/>
-        <specific value="2" description="Ocean City" uuid="cf45f8a0-5269-11df-b2c2-080069138b88" uid="12095"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker" uuid="cf47acd6-5269-11df-89d9-080069138b88" uid="12096">
-        <specific value="1" description="Texaco Georgia" uuid="cf48bb9e-5269-11df-aede-080069138b88" uid="12097"/>
-      </subcategory>
-      <subcategory value="3" description="Large Fishing Trawler" uuid="cf4a9176-5269-11df-9b93-080069138b88" uid="12098"/>
-      <subcategory value="4" description="Medium Fishing Boat" uuid="cf4ba200-5269-11df-81fb-080069138b88" uid="12099"/>
-      <subcategory value="5" description="Small Fishing Boat" uuid="cf4cb9f6-5269-11df-8491-080069138b88" uid="12100"/>
-      <subcategory value="6" description="Two Masted Fishing Boat" uuid="cf4dcbca-5269-11df-9573-080069138b88" uid="12101"/>
-      <subcategory value="7" description="Single Masted Fishing Boat" uuid="cf4ed7ea-5269-11df-9e6d-080069138b88" uid="12102"/>
-      <subcategory value="8" description="Cigarette Boat" uuid="cf4fe8ba-5269-11df-b9fd-080069138b88" uid="12103"/>
-    </category>
-    <category value="62" description="Coast Guard Cutters" uuid="cf519e44-5269-11df-a0c1-080069138b88" uid="12104">
-      <subcategory value="1" description="378-foot High Endurance (WHEC)" uuid="cf52af64-5269-11df-8cc6-080069138b88" uid="12105">
-        <specific value="1" description="Boutwell (WHEC 719)" uuid="cf53bd82-5269-11df-a75d-080069138b88" uid="12106"/>
-        <specific value="2" description="Chase (WHEC 718)" uuid="cf54ce20-5269-11df-920d-080069138b88" uid="12107"/>
-        <specific value="3" description="Dallas (WHEC 716)" uuid="cf55e3c8-5269-11df-8c41-080069138b88" uid="12108"/>
-        <specific value="4" description="Gallatin (WHEC 721)" uuid="cf56ef16-5269-11df-adf4-080069138b88" uid="12109"/>
-        <specific value="5" description="Hamilton (WHEC 715)" uuid="cf580086-5269-11df-9d49-080069138b88" uid="12110"/>
-        <specific value="6" description="Jarvis (WHEC 725)" uuid="cf591ae8-5269-11df-a94b-080069138b88" uid="12111"/>
-        <specific value="7" description="Mellon (WHEC 717)" uuid="cf5a6074-5269-11df-8930-080069138b88" uid="12112"/>
-        <specific value="8" description="Midgett (WHEC 726)" uuid="cf5b8b70-5269-11df-90d2-080069138b88" uid="12113"/>
-        <specific value="9" description="Morgenthau (WHEC 722)" uuid="cf5d0cfc-5269-11df-8df9-080069138b88" uid="12114"/>
-        <specific value="10" description="Munro (WHEC 724)" uuid="cf5e2902-5269-11df-ac8f-080069138b88" uid="12115"/>
-        <specific value="11" description="Rush (WHEC 723)" uuid="cf5f7366-5269-11df-8b21-080069138b88" uid="12116"/>
-        <specific value="12" description="Sherman (WHEC 720)" uuid="cf60886e-5269-11df-ac96-080069138b88" uid="12117"/>
-      </subcategory>
-      <subcategory value="2" description="282-foot Medium Endurance (WMEC)" uuid="cf62406e-5269-11df-82b9-080069138b88" uid="12118">
-        <specific value="1" description="Alex Haley" uuid="cf63513e-5269-11df-926e-080069138b88" uid="12119"/>
-      </subcategory>
-      <subcategory value="3" description="Famous Class (WMEC)" uuid="cf65084e-5269-11df-b569-080069138b88" uid="12120">
-        <specific value="1" description="Bear (WMEC 901)" uuid="cf661f18-5269-11df-8a34-080069138b88" uid="12121"/>
-        <specific value="2" description="Campbell (WMEC 909)" uuid="cf6728e0-5269-11df-a3f3-080069138b88" uid="12122"/>
-        <specific value="3" description="Escanaba (WMEC 907)" uuid="cf683938-5269-11df-be87-080069138b88" uid="12123"/>
-        <specific value="4" description="Forward (WMEC 911)" uuid="cf698c02-5269-11df-8031-080069138b88" uid="12124"/>
-        <specific value="5" description="Harriet Lane (WMEC 903)" uuid="cf6aaa4c-5269-11df-a539-080069138b88" uid="12125"/>
-        <specific value="6" description="Legare (WMEC 912)" uuid="cf6bbcc0-5269-11df-a6b6-080069138b88" uid="12126"/>
-        <specific value="7" description="Mohawk (WMEC 913)" uuid="cf6d3956-5269-11df-a762-080069138b88" uid="12127"/>
-        <specific value="8" description="Northland (WMEC 904)" uuid="cf6e5b38-5269-11df-b449-080069138b88" uid="12128"/>
-        <specific value="9" description="Seneca (WMEC 906)" uuid="cf6fa722-5269-11df-9cfd-080069138b88" uid="12129"/>
-        <specific value="10" description="Spencer (WMEC 905)" uuid="cf70b7b6-5269-11df-a4e5-080069138b88" uid="12130"/>
-        <specific value="11" description="Tahoma (WMEC 908)" uuid="cf71cd7c-5269-11df-adb3-080069138b88" uid="12131"/>
-        <specific value="12" description="Tampa (WMEC 902)" uuid="cf72fdc8-5269-11df-8518-080069138b88" uid="12132"/>
-        <specific value="13" description="Thetis (WMEC 910)" uuid="cf741334-5269-11df-9d7d-080069138b88" uid="12133"/>
-      </subcategory>
-      <subcategory value="4" description="Reliance Class (WMEC)" uuid="cf75c9b8-5269-11df-a744-080069138b88" uid="12134">
-        <specific value="1" description="Active (WMEC 618)" uuid="cf76d97a-5269-11df-a1d1-080069138b88" uid="12135"/>
-        <specific value="2" description="Alert (WMEC 630)" uuid="cf780e9e-5269-11df-9ca9-080069138b88" uid="12136"/>
-        <specific value="3" description="Confidence (WMEC 619)" uuid="cf7925cc-5269-11df-94f4-080069138b88" uid="12137"/>
-        <specific value="4" description="Dauntless (WMEC 624)" uuid="cf7a6d42-5269-11df-bc55-080069138b88" uid="12138"/>
-        <specific value="5" description="Decisive (WMEC 629)" uuid="cf7b9032-5269-11df-b821-080069138b88" uid="12139"/>
-        <specific value="6" description="Dependable (WMEC 626)" uuid="cf7d0e6c-5269-11df-ae82-080069138b88" uid="12140"/>
-        <specific value="7" description="Diligence (WMEC 616)" uuid="cf7e2a36-5269-11df-a89f-080069138b88" uid="12141"/>
-        <specific value="8" description="Reliance (WMEC 615)" uuid="cf7f6aa4-5269-11df-b7fd-080069138b88" uid="12142"/>
-        <specific value="9" description="Resolute (WMEC 620)" uuid="cf8083a8-5269-11df-bcac-080069138b88" uid="12143"/>
-        <specific value="10" description="Steadfast (WMEC 623)" uuid="cf81b714-5269-11df-b56e-080069138b88" uid="12144"/>
-        <specific value="11" description="Valiant (WMEC 621)" uuid="cf82c92e-5269-11df-8639-080069138b88" uid="12145"/>
-        <specific value="12" description="Venturous (WMEC 625)" uuid="cf83e08e-5269-11df-98d3-080069138b88" uid="12146"/>
-        <specific value="13" description="Vigilant (WMEC 617)" uuid="cf84ebd2-5269-11df-afaf-080069138b88" uid="12147"/>
-        <specific value="14" description="Vigorous (WMEC 627)" uuid="cf85fe64-5269-11df-a329-080069138b88" uid="12148"/>
-      </subcategory>
-      <subcategory value="5" description="Island Class (WPB)" uuid="cf87b416-5269-11df-ae12-080069138b88" uid="12149">
-        <specific value="1" description="Adak (WPB 1333)" uuid="cf88c3c4-5269-11df-9f5f-080069138b88" uid="12150"/>
-        <specific value="2" description="Anacapa (WPB 1335)" uuid="cf89cd14-5269-11df-8a57-080069138b88" uid="12151"/>
-        <specific value="3" description="Aquidneck (WPB 1309)" uuid="cf8adf2e-5269-11df-8523-080069138b88" uid="12152"/>
-        <specific value="4" description="Assateague (WPB 1337)" uuid="cf8bf4cc-5269-11df-9120-080069138b88" uid="12153"/>
-        <specific value="5" description="Attu (WPB 1317)" uuid="cf8cff02-5269-11df-8832-080069138b88" uid="12154"/>
-        <specific value="6" description="Bainbridge Island (WPB 1343)" uuid="cf8e0fbe-5269-11df-98b4-080069138b88" uid="12155"/>
-        <specific value="7" description="Baranof (WPB 1318)" uuid="cf8f219c-5269-11df-aa61-080069138b88" uid="12156"/>
-        <specific value="8" description="Block Island (WPB 1344)" uuid="cf903014-5269-11df-8666-080069138b88" uid="12157"/>
-        <specific value="9" description="Chandeleur (WPB 1319)" uuid="cf917fa0-5269-11df-8de6-080069138b88" uid="12158"/>
-        <specific value="10" description="Chincoteague (WPB 1320)" uuid="cf92a182-5269-11df-8638-080069138b88" uid="12159"/>
-        <specific value="11" description="Cushing (WPB 1321)" uuid="cf94199a-5269-11df-b2b3-080069138b88" uid="12160"/>
-        <specific value="12" description="Cuttyhunk(WPB 1322)" uuid="cf955666-5269-11df-bc53-080069138b88" uid="12161"/>
-        <specific value="13" description="Drummond (WPB 1323)" uuid="cf969c6a-5269-11df-b453-080069138b88" uid="12162"/>
-        <specific value="14" description="Edisto (WPB 1313)" uuid="cf97b56e-5269-11df-9ed7-080069138b88" uid="12163"/>
-        <specific value="15" description="Faralon (WPB 1301)" uuid="cf98c79c-5269-11df-b74a-080069138b88" uid="12164"/>
-        <specific value="16" description="Galveston Island (WPB 1343)" uuid="cf99dc22-5269-11df-bb39-080069138b88" uid="12165"/>
-        <specific value="17" description="Grand Isle (WPB 1338)" uuid="cf9ae824-5269-11df-95a8-080069138b88" uid="12166"/>
-        <specific value="18" description="Jefferson Island (WPB 1340)" uuid="cf9bfea8-5269-11df-89cd-080069138b88" uid="12167"/>
-        <specific value="19" description="Key Biscayne (WPB 1339)" uuid="cf9d140a-5269-11df-bcc2-080069138b88" uid="12168"/>
-        <specific value="20" description="Key Largo (WPB 1324)" uuid="cf9e1eea-5269-11df-bbc7-080069138b88" uid="12169"/>
-        <specific value="21" description="Kiska (WPB 1336)" uuid="cf9f2f6a-5269-11df-a5e9-080069138b88" uid="12170"/>
-        <specific value="22" description="Knight Island (WPB 1348)" uuid="cfa08356-5269-11df-a612-080069138b88" uid="12171"/>
-        <specific value="23" description="Kodiak Island (WPB 1341)" uuid="cfa1a326-5269-11df-8627-080069138b88" uid="12172"/>
-        <specific value="24" description="Liberty (WPB 1334)" uuid="cfa2b662-5269-11df-930b-080069138b88" uid="12173"/>
-        <specific value="25" description="Long Island (WPB 1342)" uuid="cfa474c0-5269-11df-9ac5-080069138b88" uid="12174"/>
-        <specific value="26" description="Manitou (WPB 1302)" uuid="cfa8ce30-5269-11df-b93f-080069138b88" uid="12175"/>
-        <specific value="27" description="Matagorda (WPB 1303)" uuid="cfaa481e-5269-11df-a2bb-080069138b88" uid="12176"/>
-        <specific value="28" description="Matinicus (WPB 1315)" uuid="cfabb866-5269-11df-bad5-080069138b88" uid="12177"/>
-        <specific value="29" description="Maui (WPB 1304)" uuid="cfacfa50-5269-11df-9197-080069138b88" uid="12178"/>
-        <specific value="30" description="Metompkin (WPB 1325)" uuid="cfaf6bdc-5269-11df-b901-080069138b88" uid="12179"/>
-        <specific value="31" description="Monhegan (WPB 1305)" uuid="cfb0ba64-5269-11df-8bb2-080069138b88" uid="12180"/>
-        <specific value="32" description="Monomoy (WPB 1326)" uuid="cfb206a8-5269-11df-8104-080069138b88" uid="12181"/>
-        <specific value="33" description="Mustang (WPB 1310)" uuid="cfb32204-5269-11df-839f-080069138b88" uid="12182"/>
-        <specific value="34" description="Nantucket (WPB 1316)" uuid="cfb43432-5269-11df-badb-080069138b88" uid="12183"/>
-        <specific value="35" description="Naushon (WPB 1311)" uuid="cfb54d86-5269-11df-9ba8-080069138b88" uid="12184"/>
-        <specific value="36" description="Nunivak (WPB 1306)" uuid="cfb65dd4-5269-11df-b142-080069138b88" uid="12185"/>
-        <specific value="37" description="Ocracoke (WPB 1307)" uuid="cfb76ff8-5269-11df-af64-080069138b88" uid="12186"/>
-        <specific value="38" description="Orcas (WPB 1327)" uuid="cfb881a4-5269-11df-96be-080069138b88" uid="12187"/>
-        <specific value="39" description="Padre (WPB 1328)" uuid="cfb98ae0-5269-11df-9351-080069138b88" uid="12188"/>
-        <specific value="40" description="Pea Island (WPB 1347)" uuid="cfba9ea8-5269-11df-a131-080069138b88" uid="12189"/>
-        <specific value="41" description="Roanoke Island (WPB 1346)" uuid="cfbbb086-5269-11df-a86a-080069138b88" uid="12190"/>
-        <specific value="42" description="Sanibel (WPB 1312)" uuid="cfbcbcba-5269-11df-9358-080069138b88" uid="12191"/>
-        <specific value="43" description="Sapelo (WPB 1314)" uuid="cfbdcf88-5269-11df-95c3-080069138b88" uid="12192"/>
-        <specific value="44" description="Sitkinak (WPB 1329)" uuid="cfbee0ee-5269-11df-b717-080069138b88" uid="12193"/>
-        <specific value="45" description="Staten Island (WPB 1345)" uuid="cfbff1f0-5269-11df-af68-080069138b88" uid="12194"/>
-        <specific value="46" description="Tybee (WPB 1330)" uuid="cfc1057c-5269-11df-8a8a-080069138b88" uid="12195"/>
-        <specific value="47" description="Vashon (WPB 1308)" uuid="cfc21570-5269-11df-a419-080069138b88" uid="12196"/>
-        <specific value="48" description="Washington (WPB 1331)" uuid="cfc32172-5269-11df-97a2-080069138b88" uid="12197"/>
-        <specific value="49" description="Wrangell (WPB 1332)" uuid="cfc4326a-5269-11df-939a-080069138b88" uid="12198"/>
-      </subcategory>
-      <subcategory value="6" description="Marine Protector Class (WPB)" uuid="cfc5e7e0-5269-11df-ba94-080069138b88" uid="12199">
-        <specific value="1" description="Adelie (WPB 87333)" uuid="cfc6f784-5269-11df-aa70-080069138b88" uid="12200"/>
-        <specific value="2" description="Albacore (WPB 87309)" uuid="cfc803f4-5269-11df-80da-080069138b88" uid="12201"/>
-        <specific value="3" description="Amberjack (WPB 87315)" uuid="cfc918d4-5269-11df-ad05-080069138b88" uid="12202"/>
-        <specific value="4" description="Barracuda (WPB 87301)" uuid="cfca29d6-5269-11df-aa9f-080069138b88" uid="12203"/>
-        <specific value="5" description="Beluga (WPB 87325)" uuid="cfcb359c-5269-11df-a672-080069138b88" uid="12204"/>
-        <specific value="6" description="Blackfin (WPB 87317)" uuid="cfcc49d2-5269-11df-851a-080069138b88" uid="12205"/>
-        <specific value="7" description="Blacktip (WPB 87326)" uuid="cfcd596c-5269-11df-94c6-080069138b88" uid="12206"/>
-        <specific value="8" description="Bluefin (WPB 87318)" uuid="cfce660e-5269-11df-8a7d-080069138b88" uid="12207"/>
-        <specific value="9" description="Bonito (WPB 87341)" uuid="cfcf7512-5269-11df-be82-080069138b88" uid="12208"/>
-        <specific value="10" description="Brant (WPB 87348)" uuid="cfd08844-5269-11df-9282-080069138b88" uid="12209"/>
-        <specific value="11" description="Chinook (WPB 87308)" uuid="cfd192ac-5269-11df-b3e7-080069138b88" uid="12210"/>
-        <specific value="12" description="Cobia (WPB 87311)" uuid="cfd2a372-5269-11df-9b9d-080069138b88" uid="12211"/>
-        <specific value="13" description="Cochito (WPB 87329)" uuid="cfd3bbf4-5269-11df-b9c6-080069138b88" uid="12212"/>
-        <specific value="14" description="Coho (WPB 87321)" uuid="cfd4d052-5269-11df-b047-080069138b88" uid="12213"/>
-        <specific value="15" description="Cormorant (WPB 87313)" uuid="cfd5f158-5269-11df-88d6-080069138b88" uid="12214"/>
-        <specific value="16" description="Dorado (WPB 87306)" uuid="cfd70688-5269-11df-9c9d-080069138b88" uid="12215"/>
-        <specific value="17" description="Finback (WPB 87314)" uuid="cfd8105a-5269-11df-98ee-080069138b88" uid="12216"/>
-        <specific value="18" description="Flyingfish (WPB 87346)" uuid="cfd921e8-5269-11df-8465-080069138b88" uid="12217"/>
-        <specific value="19" description="Gannet (WPB 87334)" uuid="cfda32ae-5269-11df-88ab-080069138b88" uid="12218"/>
-        <specific value="20" description="Haddock (WPB 87347)" uuid="cfdb4180-5269-11df-8d7d-080069138b88" uid="12219"/>
-        <specific value="21" description="Halibut (WPB 8734008)" uuid="cfdc50e8-5269-11df-bfca-080069138b88" uid="12220"/>
-        <specific value="22" description="Hammerhead (WPB 87302)" uuid="cfdd62a8-5269-11df-86d1-080069138b88" uid="12221"/>
-        <specific value="23" description="Hawksbill (WPB 87312)" uuid="cfde7206-5269-11df-8ed6-080069138b88" uid="12222"/>
-        <specific value="24" description="Heron (WPB 87344)" uuid="cfdf82ae-5269-11df-9b5e-080069138b88" uid="12223"/>
-        <specific value="25" description="Ibis (WPB 87338)" uuid="cfe092ac-5269-11df-a973-080069138b88" uid="12224"/>
-        <specific value="26" description="Kingfisher (WPB 87322)" uuid="cfe19e04-5269-11df-97ad-080069138b88" uid="12225"/>
-        <specific value="27" description="Kittiwake (WPB 87316)" uuid="cfe2b2d0-5269-11df-bb45-080069138b88" uid="12226"/>
-        <specific value="28" description="Mako (WPB 87303)" uuid="cfe3c36e-5269-11df-8b49-080069138b88" uid="12227"/>
-        <specific value="29" description="Manowar (WPB 87330)" uuid="cfe4cde0-5269-11df-8844-080069138b88" uid="12228"/>
-        <specific value="30" description="Manta (WPB 87320)" uuid="cfe5e1e4-5269-11df-ba8a-080069138b88" uid="12229"/>
-        <specific value="31" description="Marlin (WPB 87304)" uuid="cfe6f278-5269-11df-b4bf-080069138b88" uid="12230"/>
-        <specific value="32" description="Moray (WPB 87331)" uuid="cfe7fe20-5269-11df-bda5-080069138b88" uid="12231"/>
-        <specific value="33" description="Narwhal (WPB 87335)" uuid="cfe90cfc-5269-11df-95bc-080069138b88" uid="12232"/>
-        <specific value="34" description="Osprey (WPB 87307)" uuid="cfea2272-5269-11df-9a54-080069138b88" uid="12233"/>
-        <specific value="35" description="Pelican (WPB 87327)" uuid="cfeb2d0c-5269-11df-a19b-080069138b88" uid="12234"/>
-        <specific value="36" description="Petrel (WPB 87350)" uuid="cfec435e-5269-11df-91f6-080069138b88" uid="12235"/>
-        <specific value="37" description="Pompano (WPB 87339)" uuid="cfed553c-5269-11df-9785-080069138b88" uid="12236"/>
-        <specific value="38" description="Razorbill (WPB 87332)" uuid="cfee65da-5269-11df-8dce-080069138b88" uid="12237"/>
-        <specific value="39" description="Ridley (WPB 87328)" uuid="cfef766e-5269-11df-b69e-080069138b88" uid="12238"/>
-        <specific value="40" description="Seahawk (WPB 87323)" uuid="cff087a2-5269-11df-be6a-080069138b88" uid="12239"/>
-        <specific value="41" description="Shearwater (WPB 87349)" uuid="cff1917e-5269-11df-980b-080069138b88" uid="12240"/>
-        <specific value="42" description="Shrike (WPB 87342)" uuid="cff2abc2-5269-11df-84c8-080069138b88" uid="12241"/>
-        <specific value="43" description="Sockeye (WPB 87337)" uuid="cff3c246-5269-11df-9493-080069138b88" uid="12242"/>
-        <specific value="44" description="Steelhead (WPB 87324)" uuid="cff4ce2a-5269-11df-9b1e-080069138b88" uid="12243"/>
-        <specific value="45" description="Stingray (WPB 87305)" uuid="cff5de64-5269-11df-baae-080069138b88" uid="12244"/>
-        <specific value="46" description="Sturgeon (WPB 87336)" uuid="cff6f114-5269-11df-898e-080069138b88" uid="12245"/>
-        <specific value="47" description="Tarpon (WPB 87310)" uuid="cff80004-5269-11df-b138-080069138b88" uid="12246"/>
-        <specific value="48" description="Tern (WPB 87343)" uuid="cff91034-5269-11df-94f3-080069138b88" uid="12247"/>
-        <specific value="49" description="Wahoo (WPB 87345)" uuid="cffa2032-5269-11df-8447-080069138b88" uid="12248"/>
-        <specific value="50" description="Yellowfin (WPB 87319)" uuid="cffb4f98-5269-11df-b77d-080069138b88" uid="12249"/>
-      </subcategory>
-      <subcategory value="7" description="Point Class (WPB)" uuid="cffd142c-5269-11df-ad46-080069138b88" uid="12250">
-        <specific value="1" description="Point Brower (WPB 87372)" uuid="cffe2150-5269-11df-ac2d-080069138b88" uid="12251"/>
-      </subcategory>
-    </category>
-    <category value="63" description="Coast Guard Boats" uuid="d000793c-5269-11df-be41-080069138b88" uid="12252">
-      <subcategory value="1" description="52-foot Motor Life Boats (MLB)" uuid="d0018372-5269-11df-b31b-080069138b88" uid="12253"/>
-      <subcategory value="2" description="47-foot Motor Life Boats (MLB)" uuid="d00298fc-5269-11df-81e8-080069138b88" uid="12254"/>
-      <subcategory value="3" description="44-foot Motor Life Boats (MLB)" uuid="d003aaee-5269-11df-a3cd-080069138b88" uid="12255"/>
-      <subcategory value="4" description="41-foot Utility Boats (UTB)" uuid="d004b7ea-5269-11df-89cd-080069138b88" uid="12256"/>
-      <subcategory value="5" description="38-foot Deployable Pursuit Boat (DPB)" uuid="d005cca2-5269-11df-ac2d-080069138b88" uid="12257"/>
-      <subcategory value="6" description="21-64-foot Aids to Navigation Boats" uuid="d006df8e-5269-11df-9402-080069138b88" uid="12258"/>
-      <subcategory value="7" description="25-foot Transportable Port Security Boats (TPSB)" uuid="d007ed8e-5269-11df-a7ac-080069138b88" uid="12259"/>
-      <subcategory value="8" description="Rigid Hull Inflatable Boats (RHI)" uuid="d00901b0-5269-11df-a4ea-080069138b88" uid="12260"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="225" uuid="d00b542e-5269-11df-a7c3-080069138b88" uid="12261">
-    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="d00c6346-5269-11df-8f03-080069138b88" uid="12262">
-      <subcategory value="1" description="James Madison class" deprecated="1" uuid="d00d7934-5269-11df-b59b-080069138b88" uid="12263">
-        <specific value="1" description="SSBN 629 Daniel Boone" deprecated="1" uuid="d00e8694-5269-11df-aee9-080069138b88" uid="12264"/>
-        <specific value="2" description="SSBN 630 John C. Calhoun" deprecated="1" uuid="d00f9750-5269-11df-8394-080069138b88" uid="12265"/>
-        <specific value="3" description="SSBN 632 Von Steuben" deprecated="1" uuid="d010acc6-5269-11df-8536-080069138b88" uid="12266"/>
-        <specific value="4" description="SSBN 633 Casimir Pulaski" deprecated="1" uuid="d011c980-5269-11df-8344-080069138b88" uid="12267"/>
-        <specific value="5" description="SSBN 634 Stonewall Jackson" deprecated="1" uuid="d012d816-5269-11df-80b2-080069138b88" uid="12268"/>
-      </subcategory>
-      <subcategory value="2" description="Benjamin Franklin class" deprecated="1" uuid="d0148dc8-5269-11df-91aa-080069138b88" uid="12269">
-        <specific value="1" description="SSBN 640 Benjamin Franklin" deprecated="1" uuid="d015a046-5269-11df-918a-080069138b88" uid="12270"/>
-        <specific value="2" description="SSBN 641 Simon Bolivar" deprecated="1" uuid="d016b3d2-5269-11df-922c-080069138b88" uid="12271"/>
-        <specific value="3" description="SSBN 642 Kamehameha" deprecated="1" uuid="d017c3ee-5269-11df-88f4-080069138b88" uid="12272"/>
-        <specific value="4" description="SSBN 643 George Bancroft" deprecated="1" uuid="d018d54a-5269-11df-97ac-080069138b88" uid="12273"/>
-        <specific value="5" description="SSBN 645 James K. Polk" deprecated="1" uuid="d019e69c-5269-11df-b8ef-080069138b88" uid="12274"/>
-        <specific value="6" description="SSBN 655 Henry L. Stimson" deprecated="1" uuid="d01af3e8-5269-11df-8abc-080069138b88" uid="12275"/>
-        <specific value="7" description="SSBN 657 Francis Scott Key" deprecated="1" uuid="d01c09c2-5269-11df-ad70-080069138b88" uid="12276"/>
-        <specific value="8" description="SSBN 658 Mariano G. Vallejo" deprecated="1" uuid="d01d1d8a-5269-11df-9efa-080069138b88" uid="12277"/>
-      </subcategory>
-      <subcategory value="3" description="Ohio class" uuid="d01ecefa-5269-11df-80f1-080069138b88" uid="12278">
-        <specific value="1" description="SSBN 726 Ohio" deprecated="1" uuid="d01fdc1e-5269-11df-98e8-080069138b88" uid="12279"/>
-        <specific value="2" description="SSBN 727 Michigan" deprecated="1" uuid="d020ed48-5269-11df-afb6-080069138b88" uid="12280"/>
-        <specific value="3" description="SSBN 728 Florida" deprecated="1" uuid="d021fe68-5269-11df-b1e5-080069138b88" uid="12281"/>
-        <specific value="4" description="SSBN 729 Georgia" deprecated="1" uuid="d0230d1c-5269-11df-927d-080069138b88" uid="12282"/>
-        <specific value="5" description="SSBN 730 Henry M. Jackson" uuid="d0241e6e-5269-11df-8aa5-080069138b88" uid="12283"/>
-        <specific value="6" description="SSBN 731 Alabama" uuid="d0252f2a-5269-11df-b3c8-080069138b88" uid="12284"/>
-        <specific value="7" description="SSBN 732 Alaska" uuid="d0263a82-5269-11df-810b-080069138b88" uid="12285"/>
-        <specific value="8" description="SSBN 733 Nevada" uuid="d02749e0-5269-11df-8056-080069138b88" uid="12286"/>
-        <specific value="9" description="SSBN 734 Tennessee" uuid="d0285e02-5269-11df-bde2-080069138b88" uid="12287"/>
-        <specific value="10" description="SSBN 735 Pennsylvania" uuid="d0296888-5269-11df-bdc5-080069138b88" uid="12288"/>
-        <specific value="11" description="SSBN 736 West Virginia" uuid="d02a77be-5269-11df-b483-080069138b88" uid="12289"/>
-        <specific value="12" description="SSBN 737 Kentucky" uuid="d02b89ec-5269-11df-9072-080069138b88" uid="12290"/>
-        <specific value="13" description="SSBN 738 Maryland" uuid="d02c98dc-5269-11df-9e47-080069138b88" uid="12291"/>
-        <specific value="14" description="SSBN 739 Nebraska" uuid="d02da9d4-5269-11df-99e6-080069138b88" uid="12292"/>
-        <specific value="15" description="SSBN 740 Rhode Island" uuid="d02eb9c8-5269-11df-a284-080069138b88" uid="12293"/>
-        <specific value="16" description="SSBN 741 Maine" uuid="d02fc6c4-5269-11df-8fac-080069138b88" uid="12294"/>
-        <specific value="17" description="SSBN 742 Wyoming" uuid="d030e39c-5269-11df-b8be-080069138b88" uid="12295"/>
-      </subcategory>
-    </category>
-    <category value="2" description="SSGN (Nuclear Guided Missile)" uuid="d03333e0-5269-11df-a808-080069138b88" uid="12296">
-      <subcategory value="1" description="Ohio 726" uuid="d03447e4-5269-11df-937d-080069138b88" uid="12297"/>
-      <subcategory value="2" description="Michigan 727" uuid="d0355670-5269-11df-9015-080069138b88" uid="12298"/>
-      <subcategory value="3" description="Florida 728" uuid="d0366650-5269-11df-bd63-080069138b88" uid="12299"/>
-      <subcategory value="4" description="Georgia 729" uuid="d037748c-5269-11df-a703-080069138b88" uid="12300"/>
-    </category>
-    <category value="3" description="SSN (Nuclear Attack-Torpedo)" uuid="d0392368-5269-11df-aa4a-080069138b88" uid="12301">
-      <subcategory value="1" description="Seawolf class" uuid="d03a3668-5269-11df-882c-080069138b88" uid="12302">
-        <specific value="1" description="SSN 21 Seawolf" uuid="d03b49a4-5269-11df-a099-080069138b88" uid="12303"/>
-        <specific value="2" description="SSN 22 Connecticut" uuid="d03c563c-5269-11df-93b2-080069138b88" uid="12304"/>
-        <specific value="3" description="SSN 23 Jimmy Carter" uuid="d03d6644-5269-11df-a0b4-080069138b88" uid="12305"/>
-      </subcategory>
-      <subcategory value="2" description="Sturgeon class" uuid="d03f15f2-5269-11df-b5a3-080069138b88" uid="12306">
-        <specific value="1" description="SSN 637 Sturgeon" deprecated="1" uuid="d0402a3c-5269-11df-8d5a-080069138b88" uid="12307"/>
-        <specific value="2" description="SSN 638 Whale" deprecated="1" uuid="d04135a8-5269-11df-a25f-080069138b88" uid="12308"/>
-        <specific value="3" description="SSN 639 Tautog" deprecated="1" uuid="d042460a-5269-11df-ba7a-080069138b88" uid="12309"/>
-        <specific value="4" description="SSN 646 Grayling" deprecated="1" uuid="d04359a0-5269-11df-ab70-080069138b88" uid="12310"/>
-        <specific value="5" description="SSN 647 Pogy" deprecated="1" uuid="d0446962-5269-11df-b3e7-080069138b88" uid="12311"/>
-        <specific value="6" description="SSN 648 Aspro" deprecated="1" uuid="d0457ac8-5269-11df-9ec5-080069138b88" uid="12312"/>
-        <specific value="7" description="SSN 649 Sunfish" deprecated="1" uuid="d0468c4c-5269-11df-82b3-080069138b88" uid="12313"/>
-        <specific value="8" description="SSN 650 Pargo" deprecated="1" uuid="d04798da-5269-11df-befb-080069138b88" uid="12314"/>
-        <specific value="9" description="SSN 652 Puffer" deprecated="1" uuid="d048ab80-5269-11df-9716-080069138b88" uid="12315"/>
-        <specific value="10" description="SSN 653 Ray" deprecated="1" uuid="d049c0ba-5269-11df-bdd0-080069138b88" uid="12316"/>
-        <specific value="11" description="SSN 660 Sand Lance" deprecated="1" uuid="d04acbf4-5269-11df-9028-080069138b88" uid="12317"/>
-        <specific value="12" description="SSN 662 Gurnard" deprecated="1" uuid="d04bdf3a-5269-11df-9660-080069138b88" uid="12318"/>
-        <specific value="13" description="SSN 663 Hammerhead" deprecated="1" uuid="d04cf30c-5269-11df-b285-080069138b88" uid="12319"/>
-        <specific value="14" description="SSN 666 Hawkbill" deprecated="1" uuid="d04e001c-5269-11df-b1ae-080069138b88" uid="12320"/>
-        <specific value="15" description="SSN 667 Bergall" deprecated="1" uuid="d04f1ccc-5269-11df-8261-080069138b88" uid="12321"/>
-        <specific value="16" description="SSN 668 Spadefish" deprecated="1" uuid="d0502e46-5269-11df-af9f-080069138b88" uid="12322"/>
-        <specific value="17" description="SSN 669 Seahorse" deprecated="1" uuid="d0513e9e-5269-11df-8eca-080069138b88" uid="12323"/>
-        <specific value="18" description="SSN 670 Finback" deprecated="1" uuid="d05251a8-5269-11df-8599-080069138b88" uid="12324"/>
-        <specific value="19" description="SSN 672 Pintado" deprecated="1" uuid="d053641c-5269-11df-a689-080069138b88" uid="12325"/>
-        <specific value="20" description="SSN 673 Flying Fish" deprecated="1" uuid="d0547276-5269-11df-83f1-080069138b88" uid="12326"/>
-        <specific value="21" description="SSN 674 Trepang" deprecated="1" uuid="d0558684-5269-11df-b7d3-080069138b88" uid="12327"/>
-        <specific value="22" description="SSN 675 Bluefish" deprecated="1" uuid="d056e6c8-5269-11df-b61e-080069138b88" uid="12328"/>
-        <specific value="23" description="SSN 676 Billfish" deprecated="1" uuid="d057f8f6-5269-11df-a457-080069138b88" uid="12329"/>
-        <specific value="24" description="SSN 677 Drum" deprecated="1" uuid="d0590c14-5269-11df-8b97-080069138b88" uid="12330"/>
-        <specific value="25" description="SSN 678 Archerfish" deprecated="1" uuid="d05a1f0a-5269-11df-857e-080069138b88" uid="12331"/>
-        <specific value="26" description="SSN 679 Silversides" deprecated="1" uuid="d05b2b70-5269-11df-93b9-080069138b88" uid="12332"/>
-        <specific value="27" description="SSN 680 William H. Bates" deprecated="1" uuid="d05c3efc-5269-11df-a7ba-080069138b88" uid="12333"/>
-        <specific value="28" description="SSN 681 Batfish" deprecated="1" uuid="d05d560c-5269-11df-8e00-080069138b88" uid="12334"/>
-        <specific value="29" description="SSN 682 Tunny" deprecated="1" uuid="d05e6236-5269-11df-9b95-080069138b88" uid="12335"/>
-        <specific value="30" description="SSN 683 Parche" uuid="d05f7432-5269-11df-86fb-080069138b88" uid="12336"/>
-        <specific value="31" description="SSN 684 Cavalla" uuid="d067ab34-5269-11df-8b45-080069138b88" uid="12337"/>
-        <specific value="32" description="SSN 686 L. Mendel Rivers" deprecated="1" uuid="d06e531c-5269-11df-a48e-080069138b88" uid="12338"/>
-        <specific value="33" description="SSN 687 Richard B. Russell" deprecated="1" uuid="d073261c-5269-11df-ac62-080069138b88" uid="12339"/>
-      </subcategory>
-      <subcategory value="3" description="Narwhal class" deprecated="1" uuid="d07b1926-5269-11df-a4ea-080069138b88" uid="12340">
-        <specific value="1" description="SSN 671 Narwhal" deprecated="1" uuid="d07ca020-5269-11df-9117-080069138b88" uid="12341"/>
-      </subcategory>
-      <subcategory value="4" description="Los Angeles class" uuid="d07e5c08-5269-11df-93d7-080069138b88" uid="12342">
-        <specific value="1" description="SSN 688 Los Angeles" uuid="d07f6e22-5269-11df-8a18-080069138b88" uid="12343"/>
-        <specific value="2" description="SSN 689 Baton Rouge" deprecated="1" uuid="d08080fa-5269-11df-b4f3-080069138b88" uid="12344"/>
-        <specific value="3" description="SSN 690 Philadelphia" uuid="d0819648-5269-11df-8857-080069138b88" uid="12345"/>
-        <specific value="4" description="SSN 691 Memphis" uuid="d082a696-5269-11df-954c-080069138b88" uid="12346"/>
-        <specific value="5" description="SSN 692 Omaha" deprecated="1" uuid="d083ba04-5269-11df-ba87-080069138b88" uid="12347"/>
-        <specific value="6" description="SSN 693 Cincinnati" deprecated="1" uuid="d084cbec-5269-11df-94e9-080069138b88" uid="12348"/>
-        <specific value="7" description="SSN 694 Groton" deprecated="1" uuid="d085db04-5269-11df-b5b2-080069138b88" uid="12349"/>
-        <specific value="8" description="SSN 695 Birmingham" deprecated="1" uuid="d086f2c8-5269-11df-b0ca-080069138b88" uid="12350"/>
-        <specific value="9" description="SSN 696 New York City" deprecated="1" uuid="d0880640-5269-11df-802b-080069138b88" uid="12351"/>
-        <specific value="10" description="SSN 697 Indianapolis" deprecated="1" uuid="d089136e-5269-11df-b2b0-080069138b88" uid="12352"/>
-        <specific value="11" description="SSN 698 Bremerton" uuid="d08a2cd6-5269-11df-b183-080069138b88" uid="12353"/>
-        <specific value="12" description="SSN 699 Jacksonville" uuid="d08b404e-5269-11df-b718-080069138b88" uid="12354"/>
-        <specific value="13" description="SSN 700 Dallas" uuid="d08c4d54-5269-11df-a561-080069138b88" uid="12355"/>
-        <specific value="14" description="SSN 701 La Jolla" uuid="d08d6004-5269-11df-b425-080069138b88" uid="12356"/>
-        <specific value="15" description="SSN 702 Phoenix" deprecated="1" uuid="d08e71ce-5269-11df-9264-080069138b88" uid="12357"/>
-        <specific value="16" description="SSN 703 Boston" deprecated="1" uuid="d08f83a2-5269-11df-9563-080069138b88" uid="12358"/>
-        <specific value="17" description="SSN 704 Baltimore" deprecated="1" uuid="d0909792-5269-11df-bf50-080069138b88" uid="12359"/>
-        <specific value="18" description="SSN 705 City of Corpus Christi" uuid="d091ab64-5269-11df-afad-080069138b88" uid="12360"/>
-        <specific value="19" description="SSN 706 Albuquerque" uuid="d092bb9e-5269-11df-8b4c-080069138b88" uid="12361"/>
-        <specific value="20" description="SSN 707 Portsmouth" uuid="d093d09c-5269-11df-b1db-080069138b88" uid="12362"/>
-        <specific value="21" description="SSN 708 Minneapolis-Saint Paul" uuid="d094ed9c-5269-11df-8740-080069138b88" uid="12363"/>
-        <specific value="22" description="SSN 709 Hyman G. Rickover" uuid="d095ffb6-5269-11df-9993-080069138b88" uid="12364"/>
-        <specific value="23" description="SSN 710 Augusta" uuid="d0972170-5269-11df-a624-080069138b88" uid="12365"/>
-        <specific value="24" description="SSN 711 San Francisco" uuid="d0983c18-5269-11df-8dd2-080069138b88" uid="12366"/>
-        <specific value="25" description="SSN 712 Atlanta" uuid="d099540e-5269-11df-a796-080069138b88" uid="12367"/>
-        <specific value="26" description="SSN 713 Houston" uuid="d09a6efc-5269-11df-b88e-080069138b88" uid="12368"/>
-        <specific value="27" description="SSN 714 Norfolk" uuid="d09b8440-5269-11df-8b5f-080069138b88" uid="12369"/>
-        <specific value="28" description="SSN 715 Buffalo" uuid="d09cf6f4-5269-11df-a997-080069138b88" uid="12370"/>
-        <specific value="29" description="SSN 716 Salt Lake City" uuid="d09e08e6-5269-11df-a21a-080069138b88" uid="12371"/>
-        <specific value="30" description="SSN 717 Olympia" uuid="d09ff08e-5269-11df-813f-080069138b88" uid="12372"/>
-        <specific value="31" description="SSN 718 Honolulu" uuid="d0a11fa4-5269-11df-b49e-080069138b88" uid="12373"/>
-        <specific value="32" description="SSN 719 Providence" uuid="d0a23722-5269-11df-b4c4-080069138b88" uid="12374"/>
-        <specific value="33" description="SSN 720 Pittsburgh" uuid="d0a3e928-5269-11df-a573-080069138b88" uid="12375"/>
-        <specific value="34" description="SSN 721 Chicago" uuid="d0a58df0-5269-11df-9bbe-080069138b88" uid="12376"/>
-        <specific value="35" description="SSN 722 Key West" uuid="d0a6c008-5269-11df-914a-080069138b88" uid="12377"/>
-        <specific value="36" description="SSN 723 Oklahoma City" uuid="d0a7e064-5269-11df-8051-080069138b88" uid="12378"/>
-        <specific value="37" description="SSN 724 Louisville" uuid="d0a90e4e-5269-11df-ac2b-080069138b88" uid="12379"/>
-        <specific value="38" description="SSN 725 Helena" uuid="d0aa24aa-5269-11df-a292-080069138b88" uid="12380"/>
-        <specific value="39" description="SSN 750 Newport News" uuid="d0abc418-5269-11df-a967-080069138b88" uid="12381"/>
-        <specific value="40" description="SSN 751 San Juan" uuid="d0acfb44-5269-11df-9041-080069138b88" uid="12382"/>
-        <specific value="41" description="SSN 752 Pasadena" uuid="d0ae10f6-5269-11df-9927-080069138b88" uid="12383"/>
-        <specific value="42" description="SSN 753 Albany" uuid="d0af2612-5269-11df-a56e-080069138b88" uid="12384"/>
-        <specific value="43" description="SSN 754 Topeka" uuid="d0b03976-5269-11df-aa04-080069138b88" uid="12385"/>
-        <specific value="44" description="SSN 755 Miami" uuid="d0b14fc8-5269-11df-a1a1-080069138b88" uid="12386"/>
-        <specific value="45" description="SSN 756 Scranton" uuid="d0b25f26-5269-11df-9891-080069138b88" uid="12387"/>
-        <specific value="46" description="SSN 757 Alexandria" uuid="d0b389dc-5269-11df-86fa-080069138b88" uid="12388"/>
-        <specific value="47" description="SSN 758 Asheville" uuid="d0b4a182-5269-11df-9487-080069138b88" uid="12389"/>
-        <specific value="48" description="SSN 759 Jefferson City" uuid="d0b6449c-5269-11df-9989-080069138b88" uid="12390"/>
-        <specific value="49" description="SSN 760 Annapolis" uuid="d0b81a9c-5269-11df-b74b-080069138b88" uid="12391"/>
-        <specific value="50" description="SSN 761 Springfield" uuid="d0b9a75e-5269-11df-b510-080069138b88" uid="12392"/>
-        <specific value="51" description="SSN 762 Columbus" uuid="d0bad7f0-5269-11df-afe8-080069138b88" uid="12393"/>
-        <specific value="52" description="SSN 763 Santa Fe" uuid="d0bbeb18-5269-11df-99bf-080069138b88" uid="12394"/>
-        <specific value="53" description="SSN 764 Boise" uuid="d0bd1b5a-5269-11df-bf5b-080069138b88" uid="12395"/>
-        <specific value="54" description="SSN 765 Montpelier" uuid="d0be3422-5269-11df-b7d3-080069138b88" uid="12396"/>
-        <specific value="55" description="SSN 766 Charlotte" uuid="d0bf5ad2-5269-11df-997a-080069138b88" uid="12397"/>
-        <specific value="56" description="SSN 767 Hampton" uuid="d0c0723c-5269-11df-a0d5-080069138b88" uid="12398"/>
-        <specific value="57" description="SSN 768 Hartford" uuid="d0c1a256-5269-11df-812c-080069138b88" uid="12399"/>
-        <specific value="58" description="SSN 769 Toledo" uuid="d0c2cc12-5269-11df-94ec-080069138b88" uid="12400"/>
-        <specific value="59" description="SSN 770 Tucson" uuid="d0c3edea-5269-11df-8334-080069138b88" uid="12401"/>
-        <specific value="60" description="SSN 771 Columbia" uuid="d0c51ce2-5269-11df-a18b-080069138b88" uid="12402"/>
-        <specific value="61" description="SSN 772 Greeneville" uuid="d0c6341a-5269-11df-90f3-080069138b88" uid="12403"/>
-        <specific value="62" description="SSN 773 Cheyenne" uuid="d0c75ed0-5269-11df-82e1-080069138b88" uid="12404"/>
-      </subcategory>
-      <subcategory value="5" description="Virginia Class" uuid="d0c9302a-5269-11df-afe1-080069138b88" uid="12405">
-        <specific value="1" description="SSN 774 Virginia" uuid="d0ca419a-5269-11df-b4eb-080069138b88" uid="12406"/>
-        <specific value="2" description="SSN 775 Texas" uuid="d0cb707e-5269-11df-99a0-080069138b88" uid="12407"/>
-        <specific value="3" description="SSN 776 Hawaii" uuid="d0cc889c-5269-11df-95b7-080069138b88" uid="12408"/>
-        <specific value="4" description="SSN 777 No. Carolina" uuid="d0cdae66-5269-11df-8732-080069138b88" uid="12409"/>
-      </subcategory>
-    </category>
-    <category value="7" description="SSA(Conventional Auxiliary)" uuid="d0d02b96-5269-11df-9fee-080069138b88" uid="12410">
-      <subcategory value="1" description="Dolphin Class" uuid="d0d14f4e-5269-11df-aa34-080069138b88" uid="12411">
-        <specific value="1" description="AGSS 555 Dolphin" uuid="d0d2683e-5269-11df-a802-080069138b88" uid="12412"/>
-      </subcategory>
-      <subcategory value="2" description="Advanced SEAL Delivery System Class" uuid="d0d44d5c-5269-11df-b7af-080069138b88" uid="12413">
-        <specific value="1" description="ASDS-1" uuid="d0d56e1c-5269-11df-9005-080069138b88" uid="12414"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="225" uuid="d0d89628-5269-11df-99fd-080069138b88" uid="12415">
-    <category value="0" description="Other" uuid="d0d9bfe4-5269-11df-a645-080069138b88" uid="12416">
-      <subcategory value="1" description="Space Shuttle Vehicle" uuid="d0dad208-5269-11df-a31f-080069138b88" uid="12417"/>
-      <subcategory value="2" description="National Launch System (NLS)" uuid="d0dbfa20-5269-11df-9741-080069138b88" uid="12418"/>
-      <subcategory value="3" description="National Aerospace Plane (NASP)" deprecated="1" uuid="d0dd14e6-5269-11df-8fd3-080069138b88" uid="12419"/>
-      <subcategory value="4" description="SOTV" uuid="d0de40d2-5269-11df-aaa2-080069138b88" uid="12420"/>
-      <subcategory value="5" description="SMV" uuid="d0df6caa-5269-11df-b93c-080069138b88" uid="12421"/>
-    </category>
-    <category value="1" description="Manned" uuid="d0e128b0-5269-11df-8f18-080069138b88" uid="12422">
-      <subcategory value="1" description="Space Shuttle Orbiter" uuid="d0e281e2-5269-11df-bf7a-080069138b88" uid="12423">
-        <specific value="1" description="Atlantis" uuid="d0e3b666-5269-11df-902d-080069138b88" uid="12424"/>
-        <specific value="2" description="Discovery" uuid="d0e4d0d2-5269-11df-96a7-080069138b88" uid="12425"/>
-        <specific value="3" description="Columbia" uuid="d0e602ea-5269-11df-a0bd-080069138b88" uid="12426"/>
-        <specific value="4" description="Endeavor" uuid="d0e71220-5269-11df-80b4-080069138b88" uid="12427"/>
-        <specific value="5" description="Enterprise" uuid="d0e84ce4-5269-11df-bdd1-080069138b88" uid="12428"/>
-      </subcategory>
-      <subcategory value="2" description="Space Station" uuid="d0ea212c-5269-11df-9cc7-080069138b88" uid="12429">
-        <specific value="1" description="Freedom" uuid="d0eb3328-5269-11df-b4ce-080069138b88" uid="12430"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Unmanned" uuid="d0edc7e6-5269-11df-a40a-080069138b88" uid="12431">
-      <subcategory value="1" description="Communication satellite" uuid="d0eee306-5269-11df-9863-080069138b88" uid="12432">
-        <specific value="1" description="Leasat" uuid="d0f013ca-5269-11df-86e2-080069138b88" uid="12433"/>
-        <specific value="2" description="DSCS" uuid="d0f129a4-5269-11df-a501-080069138b88" uid="12434"/>
-        <specific value="3" description="Fleetsatcom" uuid="d0f25c52-5269-11df-9690-080069138b88" uid="12435"/>
-        <specific value="4" description="Milstar" uuid="d0f37556-5269-11df-85d3-080069138b88" uid="12436"/>
-        <specific value="5" description="SDS" uuid="d0f4ab4c-5269-11df-847c-080069138b88" uid="12437"/>
-        <specific value="6" description="Tactical Data Relay Satellite System (TDRSS)" uuid="d0f5d724-5269-11df-835b-080069138b88" uid="12438"/>
-        <specific value="7" description="Lightsat" uuid="d0f6e98e-5269-11df-839c-080069138b88" uid="12439"/>
-        <specific value="8" description="STEP/Eagle" uuid="d0f81a52-5269-11df-b618-080069138b88" uid="12440"/>
-        <specific value="9" description="LES/Tacsat" uuid="d0f9366c-5269-11df-8f1e-080069138b88" uid="12441"/>
-      </subcategory>
-      <subcategory value="2" description="Navigation satellite" uuid="d0fb0942-5269-11df-9f90-080069138b88" uid="12442">
-        <specific value="1" description="Transit" uuid="d0fc3a4c-5269-11df-8e4a-080069138b88" uid="12443"/>
-        <specific value="2" description="Global Positioning System (GPS)" uuid="d0fd4e50-5269-11df-8429-080069138b88" uid="12444"/>
-        <specific value="3" description="Navstar 41-60 (launch 1996 or 1997)" uuid="d0fe81ee-5269-11df-96ff-080069138b88" uid="12445"/>
-      </subcategory>
-      <subcategory value="3" description="Early Warning satellite" uuid="d1005622-5269-11df-aa49-080069138b88" uid="12446">
-        <specific value="1" description="DSP" uuid="d1017192-5269-11df-9827-080069138b88" uid="12447"/>
-        <specific value="2" description="MICRO-SAT" uuid="d102a332-5269-11df-948f-080069138b88" uid="12448"/>
-        <specific value="3" description="SIBRS" uuid="d103b0f6-5269-11df-a059-080069138b88" uid="12449"/>
-      </subcategory>
-      <subcategory value="4" description="Electronic Intelligence (ELINT) satellite" uuid="d1058688-5269-11df-9310-080069138b88" uid="12450">
-        <specific value="1" description="Rhyolite" uuid="d106b846-5269-11df-be27-080069138b88" uid="12451"/>
-        <specific value="2" description="Magnum" uuid="d107cfce-5269-11df-8667-080069138b88" uid="12452"/>
-        <specific value="3" description="Challet/Vortex" uuid="d10905f6-5269-11df-a4c5-080069138b88" uid="12453"/>
-        <specific value="4" description="Jumpseat" uuid="d10a3084-5269-11df-9c4b-080069138b88" uid="12454"/>
-      </subcategory>
-      <subcategory value="5" description="Meteorology satellite" uuid="d10bfed2-5269-11df-be40-080069138b88" uid="12455">
-        <specific value="1" description="Defense Meteorological Satellite Program (DMSP)" uuid="d10eb104-5269-11df-bb83-080069138b88" uid="12456"/>
-      </subcategory>
-      <subcategory value="6" description="Ocean Surveillance satellite" uuid="d1109492-5269-11df-b2b8-080069138b88" uid="12457">
-        <specific value="1" description="White Cloud" uuid="d111b0d4-5269-11df-99cb-080069138b88" uid="12458"/>
-      </subcategory>
-      <subcategory value="7" description="Imaging Radar Surveillance satellite" uuid="d1139386-5269-11df-b9d8-080069138b88" uid="12459">
-        <specific value="1" description="Lacrosse" uuid="d114c396-5269-11df-9154-080069138b88" uid="12460"/>
-      </subcategory>
-      <subcategory value="8" description="Optical Imaging Surveillance satellite" uuid="d116a378-5269-11df-af48-080069138b88" uid="12461">
-        <specific value="1" description="KH11" uuid="d117b75e-5269-11df-b892-080069138b88" uid="12462"/>
-        <specific value="2" description="Advanced KH11" uuid="d1190406-5269-11df-8e52-080069138b88" uid="12463"/>
-      </subcategory>
-      <subcategory value="9" description="SDI satellite" uuid="d11adef2-5269-11df-9d74-080069138b88" uid="12464">
-        <specific value="1" description="Delta 181" uuid="d11bf4e0-5269-11df-907c-080069138b88" uid="12465"/>
-        <specific value="2" description="E2I (Endo-Exoatmospheric Interceptor)" uuid="d11d2a7c-5269-11df-99d2-080069138b88" uid="12466"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Booster" uuid="d11fad6a-5269-11df-8bf0-080069138b88" uid="12467">
-      <subcategory value="1" description="Atlas" uuid="d120e8f6-5269-11df-9b53-080069138b88" uid="12468"/>
-      <subcategory value="2" description="Conestoga" uuid="d12200c4-5269-11df-ac9d-080069138b88" uid="12469"/>
-      <subcategory value="3" description="Delta" uuid="d12334c6-5269-11df-b326-080069138b88" uid="12470"/>
-      <subcategory value="4" description="Pegasus" uuid="d12465a8-5269-11df-b548-080069138b88" uid="12471"/>
-      <subcategory value="5" description="Scout" uuid="d1259018-5269-11df-bb27-080069138b88" uid="12472"/>
-      <subcategory value="6" description="Taurus" uuid="d126c8c0-5269-11df-9f55-080069138b88" uid="12473"/>
-      <subcategory value="7" description="Titan" uuid="d127ddf0-5269-11df-a065-080069138b88" uid="12474"/>
-      <subcategory value="8" description="Tomahawk" uuid="d129136e-5269-11df-b08a-080069138b88" uid="12475"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="222" uuid="d12b8da6-5269-11df-a19d-080069138b88" uid="12476">
-    <category value="0" description="Other" uuid="d12cbf14-5269-11df-b636-080069138b88" uid="12477">
-      <subcategory value="1" description="Bridges" uuid="d12dd48a-5269-11df-a864-080069138b88" uid="12478">
-        <specific value="1" description="PMM-2 Amphibious Bridging and Ferry System" uuid="d12f04fe-5269-11df-9a2b-080069138b88" uid="12479"/>
-        <specific value="2" description="Amphibious Bridging System (Wheeled) (ABS(W))" uuid="d13024d8-5269-11df-8ab8-080069138b88" uid="12480"/>
-        <specific value="3" description="MTU-72 armored bridgelayer" uuid="d133cca0-5269-11df-9f80-080069138b88" uid="12481"/>
-        <specific value="4" description="MTU-20 armored bridgelayer w/bridge" uuid="d1350c8c-5269-11df-a865-080069138b88" uid="12482"/>
-        <specific value="5" description="MTU armored bridgelayer" uuid="d13629f0-5269-11df-ba27-080069138b88" uid="12483"/>
-        <specific value="6" description="TMM truck-mounted treadway" uuid="d1375ece-5269-11df-9722-080069138b88" uid="12484"/>
-        <specific value="7" description="KMM truck-mounted treadway" uuid="d13876d8-5269-11df-bbd8-080069138b88" uid="12485"/>
-        <specific value="8" description="DPP-40 floating bridge equipment" uuid="d13b245a-5269-11df-8bc6-080069138b88" uid="12486"/>
-        <specific value="9" description="GSP heavy amphibious ferry" uuid="d13c3d72-5269-11df-bbc2-080069138b88" uid="12487"/>
-        <specific value="10" description="PVD-20 airportable" uuid="d13d68d2-5269-11df-bacb-080069138b88" uid="12488"/>
-        <specific value="11" description="PMP heavy folding pontoon" uuid="d13e8474-5269-11df-9a01-080069138b88" uid="12489"/>
-        <specific value="12" description="PPS heavy girder floating" uuid="d13f9f6c-5269-11df-9e85-080069138b88" uid="12490"/>
-        <specific value="13" description="PVM foot suspension" uuid="d140b262-5269-11df-a650-080069138b88" uid="12491"/>
-        <specific value="14" description="LVM light suspension" uuid="d141c86e-5269-11df-8bb5-080069138b88" uid="12492"/>
-        <specific value="15" description="TVM heavy suspension" uuid="d142e50a-5269-11df-bcb5-080069138b88" uid="12493"/>
-        <specific value="16" description="Underwater bridge set" uuid="d143fdaa-5269-11df-a81a-080069138b88" uid="12494"/>
-        <specific value="17" description="MARM sectional arch" uuid="d14511c2-5269-11df-a544-080069138b88" uid="12495"/>
-        <specific value="18" description="RMM-4 portable steel fixed" uuid="d1462706-5269-11df-8468-080069138b88" uid="12496"/>
-        <specific value="19" description="SARM sectional deck truss" uuid="d1474294-5269-11df-a3a9-080069138b88" uid="12497"/>
-        <specific value="20" description="REM-500 railway and road-section" uuid="d148522e-5269-11df-86a9-080069138b88" uid="12498"/>
-        <specific value="21" description="NZhM-56 heavy floating railway and road" uuid="d1496f9c-5269-11df-a0bc-080069138b88" uid="12499"/>
-        <specific value="22" description="Heavy barge" uuid="d14a840e-5269-11df-9dfd-080069138b88" uid="12500"/>
-        <specific value="23" description="BMK-T bridging boat" uuid="d14b9e34-5269-11df-b83b-080069138b88" uid="12501"/>
-        <specific value="24" description="BMK-130 bridging boat" uuid="d14cb2ec-5269-11df-92a2-080069138b88" uid="12502"/>
-        <specific value="25" description="BMK-150 bridging boat" uuid="d14dcd08-5269-11df-9e2b-080069138b88" uid="12503"/>
-        <specific value="26" description="BMK-70 bridging boat" uuid="d14eeac6-5269-11df-b06a-080069138b88" uid="12504"/>
-        <specific value="27" description="BMK-90 bridging boat" uuid="d14ffd26-5269-11df-9776-080069138b88" uid="12505"/>
-        <specific value="28" description="MTU-20 armored bridgelayer w/o bridge" uuid="d1511300-5269-11df-a572-080069138b88" uid="12506"/>
-        <specific value="29" description="MTU-20 bridge" uuid="d1522b1e-5269-11df-9823-080069138b88" uid="12507"/>
-      </subcategory>
-      <subcategory value="2" description="Missile Transporter/Launcher" uuid="d153e4a4-5269-11df-8d3e-080069138b88" uid="12508">
-        <specific value="1" description="SS-25 TEL" uuid="d154f9b6-5269-11df-adcc-080069138b88" uid="12509"/>
-      </subcategory>
-    </category>
-    <category value="1" description="Tank" uuid="d1574f4a-5269-11df-9483-080069138b88" uid="12510">
-      <subcategory value="1" description="T-80 MBT" uuid="d15861aa-5269-11df-a6a2-080069138b88" uid="12511">
-        <specific value="1" description="T-80" uuid="d1597734-5269-11df-9969-080069138b88" uid="12512"/>
-        <specific value="2" description="T-80B" uuid="d15a894e-5269-11df-8a73-080069138b88" uid="12513"/>
-        <specific value="3" description="T-80BK" uuid="d15b93b6-5269-11df-9a13-080069138b88" uid="12514"/>
-        <specific value="4" description="T-80BV" uuid="d15ca68e-5269-11df-8803-080069138b88" uid="12515"/>
-        <specific value="5" description="T-80BVK" uuid="d15db970-5269-11df-b4a9-080069138b88" uid="12516"/>
-        <specific value="6" description="T-80U" uuid="d15ec73e-5269-11df-b22a-080069138b88" uid="12517"/>
-        <specific value="7" description="T-80Uv" uuid="d15fdbc4-5269-11df-8738-080069138b88" uid="12518"/>
-        <specific value="8" description="T-80 w/mine plow roller" uuid="d160ee56-5269-11df-8f6a-080069138b88" uid="12519"/>
-        <specific value="9" description="T-80Uv w/mine plow roller" uuid="d161fc60-5269-11df-8522-080069138b88" uid="12520"/>
-        <specific value="10" description="T-80U w/Reactive Armor" uuid="d1631186-5269-11df-ac7f-080069138b88" uid="12521"/>
-      </subcategory>
-      <subcategory value="2" description="T-72 MBT" uuid="d164c8c8-5269-11df-bae3-080069138b88" uid="12522">
-        <specific value="1" description="T-72" uuid="d165d8bc-5269-11df-b1a1-080069138b88" uid="12523"/>
-        <specific value="2" description="T-72M" uuid="d166e5d6-5269-11df-aa02-080069138b88" uid="12524"/>
-        <specific value="3" description="T-72K" uuid="d167f778-5269-11df-849f-080069138b88" uid="12525"/>
-        <specific value="4" description="T-72A" uuid="d1690870-5269-11df-8e7a-080069138b88" uid="12526"/>
-        <specific value="5" description="T-72AK" uuid="d16a181e-5269-11df-93f0-080069138b88" uid="12527"/>
-        <specific value="6" description="T-72B" uuid="d16b2ab0-5269-11df-9d50-080069138b88" uid="12528"/>
-        <specific value="7" description="T-72BK" uuid="d16c4526-5269-11df-9d4c-080069138b88" uid="12529"/>
-        <specific value="8" description="T-72B1" uuid="d16d5128-5269-11df-987f-080069138b88" uid="12530"/>
-        <specific value="9" description="T-72B1K" uuid="d16e6d60-5269-11df-95de-080069138b88" uid="12531"/>
-        <specific value="10" description="T-72 Bv" uuid="d16f80a6-5269-11df-9774-080069138b88" uid="12532"/>
-        <specific value="11" description="T-72 Bv w/mine plow roller" uuid="d17090f4-5269-11df-8c98-080069138b88" uid="12533"/>
-        <specific value="12" description="T-72 w/mine plow roller" uuid="d171a502-5269-11df-9ceb-080069138b88" uid="12534"/>
-        <specific value="13" description="T-72S" uuid="d172b686-5269-11df-94b0-080069138b88" uid="12535"/>
-        <specific value="14" description="BMP-T Fire Support Vehicle" status="new" uuid="286b2b1b-735a-4410-816a-5ad0cc8f35bd" uid="22827">
-          <cr value="2120"/>
-        </specific>
-      </subcategory>
-      <subcategory value="3" description="T-64 MBT" uuid="d1746ddc-5269-11df-b0c8-080069138b88" uid="12536">
-        <specific value="1" description="T-64A" uuid="d1757ac4-5269-11df-aa37-080069138b88" uid="12537"/>
-        <specific value="2" description="T-64AK" uuid="d1768c2a-5269-11df-a99e-080069138b88" uid="12538"/>
-        <specific value="3" description="T-64B" uuid="d1779f8e-5269-11df-a819-080069138b88" uid="12539"/>
-        <specific value="4" description="T-64BV" uuid="d178adde-5269-11df-be82-080069138b88" uid="12540"/>
-        <specific value="5" description="T-64B1" uuid="d179c386-5269-11df-bbd0-080069138b88" uid="12541"/>
-        <specific value="6" description="T-64B1K" uuid="d17ad4c4-5269-11df-8062-080069138b88" uid="12542"/>
-        <specific value="7" description="T-64BV1K" uuid="d17bdef0-5269-11df-9456-080069138b88" uid="12543"/>
-        <specific value="8" description="T-64R" uuid="d17cf1a0-5269-11df-a76a-080069138b88" uid="12544"/>
-        <specific value="9" description="T-64 Bv w/mine plow roller" uuid="d17e06d0-5269-11df-9933-080069138b88" uid="12545"/>
-      </subcategory>
-      <subcategory value="4" description="T-62 MBT" uuid="d17fb930-5269-11df-ae43-080069138b88" uid="12546">
-        <specific value="1" description="T-62" uuid="d180c3fc-5269-11df-bf55-080069138b88" uid="12547"/>
-        <specific value="2" description="T-62K" uuid="d181e192-5269-11df-a82f-080069138b88" uid="12548"/>
-        <specific value="3" description="T-62M" uuid="d182f5e6-5269-11df-805d-080069138b88" uid="12549"/>
-        <specific value="4" description="T-62MK" uuid="d18404fe-5269-11df-afa3-080069138b88" uid="12550"/>
-        <specific value="5" description="T-62MV" uuid="d185156a-5269-11df-8382-080069138b88" uid="12551"/>
-        <specific value="6" description="T-62M1" uuid="d1862b26-5269-11df-9b6e-080069138b88" uid="12552"/>
-        <specific value="7" description="T-62 Bv w/mine plow roller" uuid="d1873872-5269-11df-82e2-080069138b88" uid="12553"/>
-      </subcategory>
-      <subcategory value="5" description="T-54 MBT" uuid="d188ec8a-5269-11df-8238-080069138b88" uid="12554">
-        <specific value="1" description="T-54" uuid="d189fcd8-5269-11df-915a-080069138b88" uid="12555"/>
-        <specific value="2" description="T-54K" uuid="d18b1154-5269-11df-82f2-080069138b88" uid="12556"/>
-        <specific value="3" description="T-54B" uuid="d18c23a0-5269-11df-8c22-080069138b88" uid="12557"/>
-        <specific value="4" description="T-54BK" uuid="d18d3718-5269-11df-bda4-080069138b88" uid="12558"/>
-        <specific value="5" description="T-54M" uuid="d18e4ab8-5269-11df-bf55-080069138b88" uid="12559"/>
-        <specific value="6" description="T-54MK" uuid="d18f5746-5269-11df-839c-080069138b88" uid="12560"/>
-      </subcategory>
-      <subcategory value="6" description="T-55 MBT" uuid="d1910938-5269-11df-8a56-080069138b88" uid="12561">
-        <specific value="1" description="T-55" uuid="d1921c60-5269-11df-9693-080069138b88" uid="12562"/>
-        <specific value="2" description="T-55K" uuid="d1933046-5269-11df-991c-080069138b88" uid="12563"/>
-        <specific value="3" description="T-55A" uuid="d1943ef0-5269-11df-8660-080069138b88" uid="12564"/>
-        <specific value="4" description="T-55AD" uuid="d1954fac-5269-11df-b335-080069138b88" uid="12565"/>
-        <specific value="5" description="T-55AK" uuid="d1966676-5269-11df-ad53-080069138b88" uid="12566"/>
-        <specific value="6" description="T-55AM" uuid="d19770a2-5269-11df-94c6-080069138b88" uid="12567"/>
-        <specific value="7" description="T-55AMD" uuid="d1988230-5269-11df-b449-080069138b88" uid="12568"/>
-        <specific value="8" description="T-55AMK" uuid="d199965c-5269-11df-b5cc-080069138b88" uid="12569"/>
-        <specific value="9" description="T-55AMV" uuid="d19aa326-5269-11df-ba52-080069138b88" uid="12570"/>
-        <specific value="10" description="T-55M" uuid="d19bb400-5269-11df-ad7b-080069138b88" uid="12571"/>
-        <specific value="11" description="T-55MK" uuid="d19cc714-5269-11df-86bf-080069138b88" uid="12572"/>
-        <specific value="12" description="T-55MVK" uuid="d19dd3d4-5269-11df-91bc-080069138b88" uid="12573"/>
-        <specific value="13" description="BTR-T Heavy APC" status="new" uuid="720e7412-dcd8-41e9-b336-ed5429d12c61" uid="22826">
-          <cr value="2119"/>
-        </specific>
-      </subcategory>
-      <subcategory value="8" description="PT-76 Amphibious light tank" uuid="d19f9d68-5269-11df-a656-080069138b88" uid="12574">
-        <specific value="1" description="PT-76A" uuid="d1a0b3e2-5269-11df-9b3a-080069138b88" uid="12575"/>
-        <specific value="2" description="PT-76B" uuid="d1a1c4c6-5269-11df-ab80-080069138b88" uid="12576"/>
-      </subcategory>
-      <subcategory value="9" description="T-90 MBT" uuid="d1a37b0e-5269-11df-a3df-080069138b88" uid="12577"/>
-      <subcategory value="10" description="T-34/85" uuid="d1a4879c-5269-11df-9a32-080069138b88" uid="12578"/>
-      <subcategory value="11" description="T-80UK Command Tank" uuid="d1a59ac4-5269-11df-af28-080069138b88" uid="12579"/>
-    </category>
-    <category value="2" description="Armored fighting vehicle" uuid="d1a75094-5269-11df-9b27-080069138b88" uid="12580">
-      <subcategory value="1" description="BMP-1" uuid="d1a86268-5269-11df-8878-080069138b88" uid="12581">
-        <specific value="1" description="BMP-1, basic model 1970" uuid="d1a96dde-5269-11df-b8c6-080069138b88" uid="12582"/>
-        <specific value="2" description="BMP-1K command" uuid="d1aa8336-5269-11df-9767-080069138b88" uid="12583"/>
-        <specific value="3" description="BMP-1K3 command" uuid="d1aba37e-5269-11df-bfcb-080069138b88" uid="12584"/>
-        <specific value="4" description="BMP-1P w/ AT-4 ATGW" uuid="d1acb14c-5269-11df-9a0b-080069138b88" uid="12585"/>
-        <specific value="5" description="BMP-1PK command" uuid="d1adc4a6-5269-11df-9849-080069138b88" uid="12586"/>
-        <specific value="6" description="BRM-1K recon (aka M-1976)" uuid="d1aeda3a-5269-11df-b0e0-080069138b88" uid="12587"/>
-        <specific value="7" description="(deprecated)" deprecated="1" uuid="d1afe830-5269-11df-bd88-080069138b88" uid="12588"/>
-        <specific value="8" description="(deprecated)" deprecated="1" uuid="d1b0f978-5269-11df-ba38-080069138b88" uid="12589"/>
-        <specific value="9" description="BMP-1KShM unarmed command" uuid="d1b20e8a-5269-11df-85b8-080069138b88" uid="12590"/>
-      </subcategory>
-      <subcategory value="2" description="BMP-2" uuid="d1b3c7ca-5269-11df-a082-080069138b88" uid="12591">
-        <specific value="1" description="BMP-2" uuid="d1b4d336-5269-11df-89e8-080069138b88" uid="12592"/>
-        <specific value="2" description="BMP-2D" uuid="d1b5e334-5269-11df-9879-080069138b88" uid="12593"/>
-        <specific value="3" description="BMP-2K" uuid="d1b6f63e-5269-11df-90c1-080069138b88" uid="12594"/>
-        <specific value="4" description="BMP-2 w/ KMT-8/KMT-10" uuid="d1b8039e-5269-11df-ba08-080069138b88" uid="12595"/>
-        <specific value="5" description="BVP-2 (Czech)" uuid="d1b919d2-5269-11df-a5f7-080069138b88" uid="12596"/>
-        <specific value="6" description="BRM-2" status="new" uuid="2517f137-952c-4b6f-91b8-13a207bed262" uid="22854">
-          <cr value="2210"/>
-        </specific>
-      </subcategory>
-      <subcategory value="3" description="BMP-3" uuid="d1bacb4c-5269-11df-89ef-080069138b88" uid="12597">
-        <specific value="1" description="BMP-3 [(SIFV) M1990/1]" uuid="d1bbdd5c-5269-11df-b78d-080069138b88" uid="12598"/>
-        <specific value="2" description="BRM-3K Reconnaissance Vehicle" uuid="d1bcedd2-5269-11df-88be-080069138b88" uid="12599"/>
-        <specific value="3" description="BMP-3K Command variant" uuid="d1bdff92-5269-11df-97a3-080069138b88" uid="12600"/>
-      </subcategory>
-      <subcategory value="4" description="BRDM-2 Reconnaissance vehicle" uuid="d1bfb382-5269-11df-bee0-080069138b88" uid="12601">
-        <specific value="1" description="BRDM-2 w/ AT-2 ATGM" uuid="d1c0c998-5269-11df-931c-080069138b88" uid="12602"/>
-        <specific value="2" description="BRDM-2 w/ AT-3 ATGM" uuid="d1c1d928-5269-11df-9e66-080069138b88" uid="12603"/>
-        <specific value="3" description="BRDM-2 w/ AT-5 ATGM" uuid="d1c2ee26-5269-11df-8773-080069138b88" uid="12604"/>
-        <specific value="4" description="BRDM-2-RKhb NBC" uuid="d1c40018-5269-11df-a902-080069138b88" uid="12605"/>
-        <specific value="5" description="BRDM-2U command" uuid="d1c51016-5269-11df-b498-080069138b88" uid="12606"/>
-        <specific value="6" description="BRDM-2 w/14.5mm" uuid="d1c6224e-5269-11df-8d57-080069138b88" uid="12607"/>
-      </subcategory>
-      <subcategory value="5" description="BTR-40 Reconnaissance vehicle" uuid="d1c7e7aa-5269-11df-b144-080069138b88" uid="12608">
-        <specific value="1" description="BTR-40" uuid="d1c8fff0-5269-11df-b847-080069138b88" uid="12609"/>
-        <specific value="2" description="BTR-40B" uuid="d1ca88f2-5269-11df-b0e0-080069138b88" uid="12610"/>
-        <specific value="3" description="BTR-40A anti-air" uuid="d1cb9fda-5269-11df-8a3f-080069138b88" uid="12611"/>
-        <specific value="4" description="BTR-40Kh chemical reconnaissance" uuid="d1cd191e-5269-11df-abf1-080069138b88" uid="12612"/>
-        <specific value="5" description="BTR-40zhd railroad" uuid="d1ce2f98-5269-11df-aaf0-080069138b88" uid="12613"/>
-      </subcategory>
-      <subcategory value="6" description="BTR-152" uuid="d1cfe702-5269-11df-946d-080069138b88" uid="12614">
-        <specific value="1" description="BTR-152" uuid="d1d103d0-5269-11df-b6cd-080069138b88" uid="12615"/>
-        <specific value="2" description="BTR-152V" uuid="d1d2184c-5269-11df-b9e8-080069138b88" uid="12616"/>
-        <specific value="3" description="BTR-152V1" uuid="d1d324e4-5269-11df-bca3-080069138b88" uid="12617"/>
-        <specific value="4" description="BTR-152V2" uuid="d1d43942-5269-11df-b2cd-080069138b88" uid="12618"/>
-        <specific value="5" description="BTR-152V3" uuid="d1d54e9a-5269-11df-a4b3-080069138b88" uid="12619"/>
-        <specific value="6" description="BTR-152K" uuid="d1d66064-5269-11df-8369-080069138b88" uid="12620"/>
-        <specific value="7" description="BTR-152U" uuid="d1d77120-5269-11df-a628-080069138b88" uid="12621"/>
-        <specific value="8" description="BTR-152A" uuid="d1d87e6c-5269-11df-832a-080069138b88" uid="12622"/>
-      </subcategory>
-      <subcategory value="7" description="MT-LB tracked vehicle" uuid="d1da3dce-5269-11df-9331-080069138b88" uid="12623">
-        <specific value="1" description="MT-LB 1V12" uuid="d1db4cf0-5269-11df-87c3-080069138b88" uid="12624"/>
-        <specific value="2" description="MT-LB 1V13 (battery Fire Direction Center (FDC))" uuid="d1dc5ff0-5269-11df-8da3-080069138b88" uid="12625"/>
-        <specific value="3" description="MT-LB 1V14 (battery Command Post)" uuid="d1dd764c-5269-11df-a5d3-080069138b88" uid="12626"/>
-        <specific value="4" description="MT-LB 1V15 (battalion command)" uuid="d1de8910-5269-11df-a63f-080069138b88" uid="12627"/>
-        <specific value="5" description="MT-LB 1V16 (battalion FDC)" uuid="d1dfa124-5269-11df-9d5e-080069138b88" uid="12628"/>
-        <specific value="6" description="MT-LB 1V12M (artillery C2)" uuid="d1e0b276-5269-11df-80db-080069138b88" uid="12629"/>
-        <specific value="7" description="MT-LB 1V13M (artillery C2)" uuid="d1e1c17a-5269-11df-a9fa-080069138b88" uid="12630"/>
-        <specific value="8" description="MT-LB 1V14M (artillery C2)" uuid="d1e2d826-5269-11df-8158-080069138b88" uid="12631"/>
-        <specific value="9" description="MT-LB 1V15M (artillery C2)" uuid="d1e3eab8-5269-11df-86e7-080069138b88" uid="12632"/>
-        <specific value="10" description="MT-LB 1V16M (artillery C2)" uuid="d1e4f6f6-5269-11df-a95a-080069138b88" uid="12633"/>
-        <specific value="11" description="MT-LB 1V21 staff command" uuid="d1e60b04-5269-11df-b347-080069138b88" uid="12634"/>
-        <specific value="12" description="MT-LB 1V22 air defense management" uuid="d1e7232c-5269-11df-9c9e-080069138b88" uid="12635"/>
-        <specific value="13" description="MT-LB 1V23 C2" uuid="d1e830dc-5269-11df-bd70-080069138b88" uid="12636"/>
-        <specific value="14" description="MT-LB 1V24 artillery C3" uuid="d1e94ee0-5269-11df-a683-080069138b88" uid="12637"/>
-        <specific value="15" description="MT-LB 1V25 AD management" uuid="d1ea5f1a-5269-11df-8aa7-080069138b88" uid="12638"/>
-        <specific value="16" description="(deprecated)" deprecated="1" uuid="d1eb7904-5269-11df-beeb-080069138b88" uid="12639"/>
-        <specific value="17" description="(deprecated)" deprecated="1" uuid="d1ec8e0c-5269-11df-b2fe-080069138b88" uid="12640"/>
-        <specific value="18" description="MT-LB SNAR-10 radar" uuid="d1ed9d1a-5269-11df-9bc0-080069138b88" uid="12641"/>
-        <specific value="19" description="MT-LBV snow/swamp" uuid="d1eeaf02-5269-11df-99a5-080069138b88" uid="12642"/>
-        <specific value="20" description="MT-LB engineer" deprecated="1" uuid="d1efc27a-5269-11df-8d8e-080069138b88" uid="12643"/>
-        <specific value="21" description="MT-LB ambulance" uuid="d1f0d41c-5269-11df-b74a-080069138b88" uid="12644"/>
-        <specific value="22" description="MT-LBR repair" uuid="d1f1e852-5269-11df-8337-080069138b88" uid="12645"/>
-        <specific value="23" description="MT-LB w/ AT-6 (Anti-Tank Guided Weapon) ATGW" uuid="d1f2fa94-5269-11df-994c-080069138b88" uid="12646"/>
-        <specific value="24" description="RKhM (Chemical Recon)" uuid="d1f40cc2-5269-11df-9bee-080069138b88" uid="12647"/>
-      </subcategory>
-      <subcategory value="8" description="BTR-60" uuid="d1f5befa-5269-11df-bc28-080069138b88" uid="12648">
-        <specific value="1" description="BTR-60" uuid="d1f6cf70-5269-11df-8663-080069138b88" uid="12649"/>
-        <specific value="2" description="BTR-60P" uuid="d1f7e31a-5269-11df-b02a-080069138b88" uid="12650"/>
-        <specific value="3" description="BTR-60PA" uuid="d1f8ee68-5269-11df-ac57-080069138b88" uid="12651"/>
-        <specific value="4" description="BTR-60PB" uuid="d1f9ff10-5269-11df-bfa8-080069138b88" uid="12652"/>
-        <specific value="5" description="BTR-60PU" uuid="d1fb1134-5269-11df-8076-080069138b88" uid="12653"/>
-        <specific value="6" description="BTR-60PBK command" uuid="d1fc1aca-5269-11df-ba43-080069138b88" uid="12654"/>
-        <specific value="7" description="BTR-60PU command" uuid="d1fd3090-5269-11df-96b9-080069138b88" uid="12655"/>
-        <specific value="8" description="BTR-60PU-12 air defense command" uuid="d1fe41d8-5269-11df-ac19-080069138b88" uid="12656"/>
-        <specific value="9" description="BTR-601V19 FDC" uuid="d1ff4ff6-5269-11df-844d-080069138b88" uid="12657"/>
-        <specific value="10" description="BTR-601V18 artillery observation" uuid="d20060a8-5269-11df-9e2f-080069138b88" uid="12658"/>
-        <specific value="11" description="BTR-60 R-145BM communications" uuid="d20177ea-5269-11df-8efd-080069138b88" uid="12659"/>
-        <specific value="12" description="BTR-60 R-975 forward air controller" uuid="d202861c-5269-11df-8d0b-080069138b88" uid="12660"/>
-        <specific value="13" description="BTR-60-E-351BR generator" uuid="d20399c6-5269-11df-bb4a-080069138b88" uid="12661"/>
-        <specific value="14" description="BTR-60-P-238T switchboard" uuid="d204b1ee-5269-11df-a8a4-080069138b88" uid="12662"/>
-        <specific value="15" description="BTR-60-P-240T switchboard" uuid="d205be86-5269-11df-ada0-080069138b88" uid="12663"/>
-        <specific value="16" description="BTR-60-P-241T field telephone" uuid="d206d140-5269-11df-9835-080069138b88" uid="12664"/>
-      </subcategory>
-      <subcategory value="9" description="BTR-50 Amphibious Tracked APC" uuid="d20892d2-5269-11df-9d51-080069138b88" uid="12665">
-        <specific value="1" description="BTR-50P" uuid="d209a47e-5269-11df-be91-080069138b88" uid="12666"/>
-        <specific value="2" description="BTR-50PA" uuid="d20aaf36-5269-11df-8390-080069138b88" uid="12667"/>
-        <specific value="3" description="BTR-50PK" uuid="d20bc452-5269-11df-8912-080069138b88" uid="12668"/>
-        <specific value="4" description="BTR-50PU" uuid="d20cd590-5269-11df-a05c-080069138b88" uid="12669"/>
-        <specific value="5" description="BTR-50PU R82" uuid="d20de070-5269-11df-896c-080069138b88" uid="12670"/>
-        <specific value="6" description="BTR-50PU-11" uuid="d20ef0e6-5269-11df-9a2a-080069138b88" uid="12671"/>
-        <specific value="7" description="BTR-50PUM" uuid="d21005a8-5269-11df-878f-080069138b88" uid="12672"/>
-        <specific value="8" description="BTR-50PUR" uuid="d211147a-5269-11df-b633-080069138b88" uid="12673"/>
-        <specific value="9" description="BTR-50PK(B)" uuid="d21223d8-5269-11df-b668-080069138b88" uid="12674"/>
-        <specific value="10" description="MTP technical support" uuid="d2133796-5269-11df-8aea-080069138b88" uid="12675"/>
-        <specific value="11" description="MTK mineclearing" uuid="d2144898-5269-11df-a674-080069138b88" uid="12676"/>
-        <specific value="12" description="MTR-1 repair" uuid="d2155a08-5269-11df-ab9f-080069138b88" uid="12677"/>
-      </subcategory>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="d2170d62-5269-11df-a4e0-080069138b88" uid="12678"/>
-      <subcategory value="11" description="BMD airborne fire support vehicle" uuid="d218203a-5269-11df-a629-080069138b88" uid="12679">
-        <specific value="1" description="BMD-1" uuid="d21930c4-5269-11df-a7f1-080069138b88" uid="12680"/>
-        <specific value="2" description="BMD-1P w/ AT-3 ATGW" uuid="d21a41b2-5269-11df-bf93-080069138b88" uid="12681"/>
-        <specific value="3" description="BMD-2" uuid="d21b53c2-5269-11df-8405-080069138b88" uid="12682"/>
-        <specific value="4" description="BMD w/ 82-mm mortar" uuid="d21c5e5c-5269-11df-8667-080069138b88" uid="12683"/>
-        <specific value="5" description="BMD KShM command" uuid="d21d7256-5269-11df-bc68-080069138b88" uid="12684"/>
-        <specific value="6" description="BTR-D" uuid="d21e875e-5269-11df-813d-080069138b88" uid="12685"/>
-        <specific value="7" description="BMD-3" uuid="d21f9108-5269-11df-8c08-080069138b88" uid="12686"/>
-        <specific value="8" description="BTR-RD ATGM section vehicle" uuid="d220a386-5269-11df-8845-080069138b88" uid="12687"/>
-        <specific value="9" description="BTR-ZD MANPADS section vehicle" uuid="d221b852-5269-11df-bbf6-080069138b88" uid="12688"/>
-        <specific value="10" description="BTR-D with 23-mm ZU-23" uuid="d222c7ec-5269-11df-9c93-080069138b88" uid="12689"/>
-        <specific value="11" description="ACRV, 1V119" uuid="d223dae2-5269-11df-b964-080069138b88" uid="12690"/>
-        <specific value="12" description="BMD w/ UAV launcher (Sterkh)" status="new" uuid="398e37fb-64ad-497b-a7db-620e17674517" uid="22845">
-          <cr value="2177"/>
-        </specific>
-        <specific value="13" description="2S25 Tank Destroyer" status="new" uuid="8ab6ff2e-47d0-4008-95ad-17ea2538966e" uid="22855">
-          <cr value="2210"/>
-        </specific>
-        <specific value="14" description="BTR-D Kliver turret / Kornet ATGM" status="new" uuid="60f2fe8e-6481-4a60-92c8-34756a0473f0" uid="22856">
-          <cr value="2210"/>
-        </specific>
-      </subcategory>
-      <subcategory value="12" description="BTR-70" uuid="d225906c-5269-11df-ac67-080069138b88" uid="12691">
-        <specific value="1" description="BTR-70" uuid="d226ae84-5269-11df-a652-080069138b88" uid="12692"/>
-        <specific value="2" description="BTR-70 M1986/1" uuid="d227baea-5269-11df-b559-080069138b88" uid="12693"/>
-        <specific value="3" description="BTR-70Kh chemical reconnaissance" uuid="d228ccdc-5269-11df-a6fd-080069138b88" uid="12694"/>
-        <specific value="4" description="BTR-70 w/ AGS-17" uuid="d229de4c-5269-11df-a020-080069138b88" uid="12695"/>
-        <specific value="5" description="SPR-2 (poss jammer)" uuid="d22aee04-5269-11df-aed9-080069138b88" uid="12696"/>
-        <specific value="6" description="BTR-70MS communications" uuid="d22bffce-5269-11df-8023-080069138b88" uid="12697"/>
-        <specific value="7" description="BTR-70KShM command/staff" uuid="d22d1170-5269-11df-b917-080069138b88" uid="12698"/>
-        <specific value="8" description="BTR-70 BREM repair" uuid="d22e2024-5269-11df-80f8-080069138b88" uid="12699"/>
-      </subcategory>
-      <subcategory value="13" description="BTR-80" uuid="d22fd1e4-5269-11df-b5e6-080069138b88" uid="12700">
-        <specific value="1" description="BTR-80" uuid="d230e278-5269-11df-89f4-080069138b88" uid="12701"/>
-        <specific value="2" description="BTR-80 M1981/1 command" uuid="d231f762-5269-11df-bba4-080069138b88" uid="12702"/>
-        <specific value="3" description="BTR-80 RKhM-4 chemical &amp; reconnaissance" uuid="d233033c-5269-11df-9c8a-080069138b88" uid="12703"/>
-        <specific value="4" description="BTR-80 UNSh" uuid="d2341614-5269-11df-8535-080069138b88" uid="12704"/>
-        <specific value="5" description="BMM-1 Ambulance" uuid="d2352b1c-5269-11df-9a00-080069138b88" uid="12705"/>
-        <specific value="6" description="BMM-2 Bn Aid Station" uuid="d23636f6-5269-11df-b5c6-080069138b88" uid="12706"/>
-        <specific value="7" description="BMM-3 Mobile Dressing Station" uuid="d237487a-5269-11df-af70-080069138b88" uid="12707"/>
-        <specific value="8" description="BTR-80A" uuid="d2386bf6-5269-11df-9b28-080069138b88" uid="12708"/>
-      </subcategory>
-      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="d23a1ed8-5269-11df-8fc0-080069138b88" uid="12709"/>
-      <subcategory value="15" description="BRDM-1 Reconnaissance vehicle" uuid="d23b30a2-5269-11df-a4bd-080069138b88" uid="12710">
-        <specific value="1" description="BRDM-1" uuid="d23c4348-5269-11df-bc25-080069138b88" uid="12711"/>
-        <specific value="2" description="BRDM-1-RKhb" uuid="d23d52d8-5269-11df-9d5f-080069138b88" uid="12712"/>
-        <specific value="3" description="BRDM-U" uuid="d23e61fa-5269-11df-8516-080069138b88" uid="12713"/>
-      </subcategory>
-      <subcategory value="16" description="BTR-90" uuid="d240128e-5269-11df-b590-080069138b88" uid="12714"/>
-      <subcategory value="17" description="GMZ TML" uuid="d2412282-5269-11df-b808-080069138b88" uid="12715">
-        <specific value="1" description="GMZ-3" uuid="d2423550-5269-11df-9d62-080069138b88" uid="12716"/>
-      </subcategory>
-      <subcategory value="18" description="MT-LBu Tracked Vehicle" uuid="d243eac6-5269-11df-be7a-080069138b88" uid="12717">
-        <specific value="1" description="Rangir (9S737) C3 Battery Command Post" uuid="d244ff56-5269-11df-8f59-080069138b88" uid="12718"/>
-        <specific value="2" description="R-330 B Jammer" uuid="d24615b2-5269-11df-86d1-080069138b88" uid="12719"/>
-        <specific value="3" description="MP22R (1V22R) Division AD" uuid="d2472628-5269-11df-bb3c-080069138b88" uid="12720"/>
-        <specific value="4" description="MP23R (1V23R) GCI C3" uuid="d24836da-5269-11df-9019-080069138b88" uid="12721"/>
-        <specific value="5" description="MP24R (1V24R) Artillery Control" uuid="d2494962-5269-11df-b5c4-080069138b88" uid="12722"/>
-        <specific value="6" description="MP25R (1V25R) Division AD" uuid="d24a5bfe-5269-11df-bcbd-080069138b88" uid="12723"/>
-        <specific value="7" description="9S80 MT-LBu with DOG EAR radar" uuid="d24b6d96-5269-11df-bd05-080069138b88" uid="12724"/>
-      </subcategory>
-      <subcategory value="19" description="PRP-3 with Small Fred radar" uuid="d24d2122-5269-11df-a389-080069138b88" uid="12725"/>
-      <subcategory value="20" description="PRP-4" uuid="d24e330a-5269-11df-8830-080069138b88" uid="12726"/>
-    </category>
-    <category value="3" description="Armored utility vehicle" uuid="d24fea42-5269-11df-aa66-080069138b88" uid="12727">
-      <subcategory value="1" description="BTS-2 medium armored tractor" uuid="d250fb1c-5269-11df-805d-080069138b88" uid="12728"/>
-      <subcategory value="2" description="MTP maintenance vehicle" uuid="d25208c2-5269-11df-b272-080069138b88" uid="12729"/>
-      <subcategory value="3" description="IMR combat engineer vehicle" uuid="d25322e8-5269-11df-b3f3-080069138b88" uid="12730">
-        <specific value="1" description="IMR-2 combat engineer vehicle" uuid="d2543688-5269-11df-8931-080069138b88" uid="12731"/>
-      </subcategory>
-      <subcategory value="4" description="IRM engineer reconnaissance vehicle" uuid="d255ea5a-5269-11df-b33d-080069138b88" uid="12732"/>
-      <subcategory value="5" description="BAT-2 combat engineer vehicle" uuid="d256f7ce-5269-11df-b1c8-080069138b88" uid="12733"/>
-      <subcategory value="6" description="MT-LB engineer vehicle" uuid="d2580cae-5269-11df-9e1a-080069138b88" uid="12734"/>
-      <subcategory value="7" description="BTU tank-mounted bulldozer" uuid="d2592378-5269-11df-a5c8-080069138b88" uid="12735"/>
-      <subcategory value="8" description="BTU-55 tank-mounted bulldozer" uuid="d25a306a-5269-11df-8e95-080069138b88" uid="12736"/>
-      <subcategory value="9" description="BREM-1 recovery and repair vehicle" uuid="d25b4266-5269-11df-bdff-080069138b88" uid="12737"/>
-      <subcategory value="10" description="M1977 armored recovery vehicle" uuid="d25c570a-5269-11df-966a-080069138b88" uid="12738"/>
-      <subcategory value="11" description="T-54-T armored recovery vehicle" uuid="d25d67bc-5269-11df-bbd0-080069138b88" uid="12739"/>
-      <subcategory value="12" description="T-55-T armored recovery vehicle" uuid="d25e7ad0-5269-11df-8ce9-080069138b88" uid="12740"/>
-      <subcategory value="13" description="T-55-TK armored recovery vehicle" uuid="d25f8d80-5269-11df-88fb-080069138b88" uid="12741"/>
-      <subcategory value="14" description="BTR-50PK(B) amphibious recovery vehicle" uuid="d2609b9e-5269-11df-a520-080069138b88" uid="12742"/>
-      <subcategory value="15" description="BREM-4 light recovery vehicle" uuid="d261b33a-5269-11df-a30e-080069138b88" uid="12743"/>
-      <subcategory value="16" description="MTP-LB technical support vehicle" uuid="d262c5cc-5269-11df-b579-080069138b88" uid="12744"/>
-      <subcategory value="17" description="GM-5951 w/ IL-220U CM/CB Radar" status="new" uuid="570e8335-5afd-41a9-b37d-0cf06a90c4b7" uid="22849">
-        <cr value="2178"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Self-propelled artillery" uuid="d2648150-5269-11df-9401-080069138b88" uid="12745">
-      <subcategory value="1" description="M-1973 152-mm gun (2S3) (SO-152)" uuid="d265923e-5269-11df-97c7-080069138b88" uid="12746"/>
-      <subcategory value="2" description="M-1974 122-mm Howitzer (2S1) (SO-122)" uuid="d266a66a-5269-11df-9a17-080069138b88" uid="12747"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d267baf0-5269-11df-a4dc-080069138b88" uid="12748"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d268cb20-5269-11df-929f-080069138b88" uid="12749"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="d269dd58-5269-11df-8ad5-080069138b88" uid="12750"/>
-      <subcategory value="6" description="Frog-3 rocket launcher" uuid="d26afb5c-5269-11df-9f6a-080069138b88" uid="12751"/>
-      <subcategory value="7" description="Frog-4 rocket launcher" uuid="d26c1258-5269-11df-ab5e-080069138b88" uid="12752"/>
-      <subcategory value="8" description="Frog-5 rocket launcher" uuid="d26d2512-5269-11df-8fa6-080069138b88" uid="12753"/>
-      <subcategory value="9" description="Frog-7 rocket launcher" uuid="d26e35ec-5269-11df-9e33-080069138b88" uid="12754"/>
-      <subcategory value="10" description="SS-1 Scud missile launcher" uuid="d26f4360-5269-11df-a0bb-080069138b88" uid="12755">
-        <specific value="1" description="Scud A" uuid="d27059b2-5269-11df-883e-080069138b88" uid="12756"/>
-        <specific value="2" description="Scud B" uuid="d27164b0-5269-11df-9261-080069138b88" uid="12757">
-          <extra value="1" description="TEL Decoy" uuid="d2727346-5269-11df-8c8e-080069138b88" uid="12758"/>
-        </specific>
-        <specific value="3" description="Scud C" uuid="d2742790-5269-11df-b9e8-080069138b88" uid="12759"/>
-      </subcategory>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="d275d810-5269-11df-92fd-080069138b88" uid="12760"/>
-      <subcategory value="12" description="BM-14-17 140-mm rocket launcher" uuid="d276ecf0-5269-11df-a6b8-080069138b88" uid="12761"/>
-      <subcategory value="13" description="BM-21 122-mm rocket launcher" uuid="d277ff96-5269-11df-bd4c-080069138b88" uid="12762"/>
-      <subcategory value="14" description="M-1975 120-mm rocket launcher" uuid="d2791048-5269-11df-a8e4-080069138b88" uid="12763"/>
-      <subcategory value="15" description="BM-24 240-mm rocket launcher" uuid="d27a22da-5269-11df-9bdc-080069138b88" uid="12764"/>
-      <subcategory value="16" description="BM-25 250-mm rocket launcher" uuid="d27b363e-5269-11df-8cfd-080069138b88" uid="12765"/>
-      <subcategory value="17" description="GMZ TML" deprecated="1" uuid="d27c4506-5269-11df-91d9-080069138b88" uid="12766"/>
-      <subcategory value="18" description="ZSU-23/4 Quad 23-mm AAA" deprecated="1" uuid="d27d573e-5269-11df-8ef0-080069138b88" uid="12767"/>
-      <subcategory value="19" description="SA-6 SAM" deprecated="1" uuid="d27e6c78-5269-11df-b1df-080069138b88" uid="12768">
-        <specific value="1" description="SA-6A" deprecated="1" uuid="d27f78de-5269-11df-93f7-080069138b88" uid="12769"/>
-        <specific value="2" description="SA-6B" deprecated="1" uuid="d28089a4-5269-11df-917e-080069138b88" uid="12770"/>
-      </subcategory>
-      <subcategory value="20" description="SA-9 SAM" deprecated="1" uuid="d2824064-5269-11df-965d-080069138b88" uid="12771"/>
-      <subcategory value="21" description="SA-13 SAM" deprecated="1" uuid="d2835bc0-5269-11df-af60-080069138b88" uid="12772">
-        <specific value="1" description="Strela-10M2" deprecated="1" uuid="d2846c90-5269-11df-838c-080069138b88" uid="12773"/>
-        <specific value="2" description="Strela-10M3" deprecated="1" uuid="d2857d74-5269-11df-b83f-080069138b88" uid="12774"/>
-      </subcategory>
-      <subcategory value="22" description="2S6 Quad 30-mm/SA‑19 AD system" deprecated="1" uuid="d2873254-5269-11df-9f3a-080069138b88" uid="12775"/>
-      <subcategory value="23" description="2S4 M-1975 240-mm mortar" uuid="d2884a22-5269-11df-8a69-080069138b88" uid="12776"/>
-      <subcategory value="24" description="2S7 M-1975 203-mm gun" uuid="d2895728-5269-11df-ac4a-080069138b88" uid="12777"/>
-      <subcategory value="25" description="M-1976 152-mm gun (2S5)(MSTA-B)" uuid="d28a6a6e-5269-11df-988c-080069138b88" uid="12778"/>
-      <subcategory value="26" description="152-mm 2S19 (aka MSTA-S)" uuid="d28b7c4c-5269-11df-8084-080069138b88" uid="12779"/>
-      <subcategory value="27" description="120-mm Howitzer/mortar (2S9) (SO-120)" uuid="d28c8cea-5269-11df-9a1b-080069138b88" uid="12780"/>
-      <subcategory value="28" description="120-mm Howitzer/mortar (2S23)" uuid="d28da206-5269-11df-8031-080069138b88" uid="12781"/>
-      <subcategory value="29" description="300-mm BM-30 14/12-round multiple rocket systems (9A52 Smerch)" uuid="d28eb650-5269-11df-85a7-080069138b88" uid="12782"/>
-      <subcategory value="30" description="220-mm BM-22 16-round multiple rocket system (M1977 Uragan)" uuid="d28fca04-5269-11df-b532-080069138b88" uid="12783"/>
-      <subcategory value="31" description="200-mm 4-round BMD-20 multiple rocket system" uuid="d290dfa2-5269-11df-8a8b-080069138b88" uid="12784"/>
-      <subcategory value="32" description="140-mm 16‑round RPU‑14 multiple rocket system" deprecated="1" uuid="d291f4f0-5269-11df-9468-080069138b88" uid="12785"/>
-      <subcategory value="33" description="(deprecated)" deprecated="1" uuid="d2930502-5269-11df-98a0-080069138b88" uid="12786"/>
-      <subcategory value="34" description="ZSU‑57‑2 twin 57-mm anti‑aircraft gun system" deprecated="1" uuid="d29416d6-5269-11df-818e-080069138b88" uid="12787"/>
-      <subcategory value="35" description="BTR-40A w/ ZTPU‑2 mount" deprecated="1" uuid="d2952f58-5269-11df-af08-080069138b88" uid="12788"/>
-      <subcategory value="36" description="BTR-152A w/ ZTPU‑2 mount" deprecated="1" uuid="d2963dc6-5269-11df-b137-080069138b88" uid="12789"/>
-      <subcategory value="37" description="BTR‑152D w/ twin 14.5-mm ZPU‑2 mount" deprecated="1" uuid="d29751a2-5269-11df-a551-080069138b88" uid="12790"/>
-      <subcategory value="38" description="BTR‑152 w/ twin 23-mm ZU‑23" deprecated="1" uuid="d29868bc-5269-11df-972f-080069138b88" uid="12791"/>
-      <subcategory value="39" description="BTR‑152 with M53 MGs" deprecated="1" uuid="d299769e-5269-11df-891b-080069138b88" uid="12792"/>
-      <subcategory value="40" description="SA‑4  Ganef SAM" deprecated="1" uuid="d29a89d0-5269-11df-9c26-080069138b88" uid="12793"/>
-      <subcategory value="41" description="SA‑8 Gecko SAM" deprecated="1" uuid="d29b9e7e-5269-11df-b3d4-080069138b88" uid="12794">
-        <specific value="1" description="SA-8" deprecated="1" uuid="d29caab2-5269-11df-ab49-080069138b88" uid="12795"/>
-        <specific value="2" description="SA-8A" deprecated="1" uuid="d29dc05a-5269-11df-ae5f-080069138b88" uid="12796"/>
-        <specific value="3" description="SA-8B" deprecated="1" uuid="d29ed2b0-5269-11df-829d-080069138b88" uid="12797"/>
-      </subcategory>
-      <subcategory value="42" description="SA‑10B Mod 1 Grumble SAM" deprecated="1" uuid="d2a08a2e-5269-11df-8843-080069138b88" uid="12798"/>
-      <subcategory value="43" description="SA‑11 Gadfly SAM" deprecated="1" uuid="d2a1a12a-5269-11df-811d-080069138b88" uid="12799"/>
-      <subcategory value="44" description="SA‑12A Gladiator SAM" deprecated="1" uuid="d2a2b3d0-5269-11df-baa0-080069138b88" uid="12800"/>
-      <subcategory value="45" description="(deprecated)" deprecated="1" uuid="d2a3cb26-5269-11df-a34c-080069138b88" uid="12801"/>
-      <subcategory value="46" description="SA‑X‑12B Giant SAM" deprecated="1" uuid="d2a4d84a-5269-11df-8c07-080069138b88" uid="12802"/>
-      <subcategory value="47" description="SA‑X‑12B SAM (rail w/ SS-24)" deprecated="1" uuid="d2a5eb68-5269-11df-82b1-080069138b88" uid="12803"/>
-      <subcategory value="48" description="SA‑15 Gauntlet SAM" deprecated="1" uuid="d2a702f0-5269-11df-8972-080069138b88" uid="12804"/>
-      <subcategory value="49" description="SA‑X‑17 SAM (replaces SA-11)" deprecated="1" uuid="d2a8105a-5269-11df-b569-080069138b88" uid="12805"/>
-      <subcategory value="50" description="(deprecated)" deprecated="1" uuid="d2a9242c-5269-11df-ac76-080069138b88" uid="12806"/>
-      <subcategory value="51" description="SS-21" uuid="d2aa3948-5269-11df-97f6-080069138b88" uid="12807"/>
-      <subcategory value="52" description="2S31 120-mm Combination Gun" uuid="d2ab4324-5269-11df-b219-080069138b88" uid="12808"/>
-      <subcategory value="53" description="9A51 Prima, 122-mm MRL, 50 tube" uuid="d2ac59e4-5269-11df-a565-080069138b88" uid="12809"/>
-    </category>
-    <category value="5" description="Towed artillery" uuid="d2ae0df2-5269-11df-84c1-080069138b88" uid="12810">
-      <subcategory value="1" description="S-23 180-mm field gun" uuid="d2af1ecc-5269-11df-9e1b-080069138b88" uid="12811"/>
-      <subcategory value="2" description="2A36 (M1976) 152-mm field gun" uuid="d2b02a88-5269-11df-b517-080069138b88" uid="12812"/>
-      <subcategory value="3" description="D-20 152-mm gun-Howitzer" uuid="d2b1404e-5269-11df-bdd0-080069138b88" uid="12813"/>
-      <subcategory value="4" description="D-30 122-mm gun-Howitzer" uuid="d2b2522c-5269-11df-8154-080069138b88" uid="12814"/>
-      <subcategory value="5" description="M-46 130-mm field gun" uuid="d2b35f46-5269-11df-9409-080069138b88" uid="12815"/>
-      <subcategory value="6" description="D-30 field Howitzer" uuid="d2b47430-5269-11df-bc62-080069138b88" uid="12816"/>
-      <subcategory value="7" description="T-12/MT-12 100-mm antitank gun" uuid="d2b5858c-5269-11df-a097-080069138b88" uid="12817"/>
-      <subcategory value="8" description="SD-44 gun" uuid="d2b69238-5269-11df-a33e-080069138b88" uid="12818">
-        <specific value="1" description="SD-44 85-mm auxiliary-propelled field gun" uuid="d2b7a47a-5269-11df-88e5-080069138b88" uid="12819"/>
-      </subcategory>
-      <subcategory value="9" description="M-1966 76.2-mm mountain gun" uuid="d2b95964-5269-11df-a46a-080069138b88" uid="12820"/>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="d2ba69bc-5269-11df-b59d-080069138b88" uid="12821"/>
-      <subcategory value="11" description="M-240 (aka M1953 or M53) 240-mm mortar" uuid="d2bb773a-5269-11df-b414-080069138b88" uid="12822"/>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="d2bc8e72-5269-11df-9eb0-080069138b88" uid="12823"/>
-      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="d2bda00a-5269-11df-a83d-080069138b88" uid="12824"/>
-      <subcategory value="14" description="2A65 (M1987) 152-mm gun/Howitzer" uuid="d2bead4c-5269-11df-9445-080069138b88" uid="12825"/>
-      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="d2bfcb50-5269-11df-b9f2-080069138b88" uid="12826"/>
-      <subcategory value="16" description="M1943 (D-1) 152-mm Howitzer" uuid="d2c0df86-5269-11df-8b3a-080069138b88" uid="12827"/>
-      <subcategory value="17" description="M1937 (ML-20) 152-mm gun/Howitzer" uuid="d2c1eb74-5269-11df-a5f2-080069138b88" uid="12828"/>
-      <subcategory value="18" description="(deprecated)" deprecated="1" uuid="d2c2ff50-5269-11df-9c06-080069138b88" uid="12829"/>
-      <subcategory value="19" description="D-74 122-mm field gun" uuid="d2c415d4-5269-11df-b54f-080069138b88" uid="12830"/>
-      <subcategory value="20" description="(deprecated)" deprecated="1" uuid="d2c523d4-5269-11df-8e3b-080069138b88" uid="12831"/>
-      <subcategory value="21" description="M1938 (M-30) 122-mm Howitzer" uuid="d2c6363e-5269-11df-b265-080069138b88" uid="12832"/>
-      <subcategory value="22" description="2B16 120-mm combination gun" uuid="d2c74920-5269-11df-b7d8-080069138b88" uid="12833"/>
-      <subcategory value="23" description="M1944 (BS-3) 100-mm field gun" uuid="d2c85b44-5269-11df-9301-080069138b88" uid="12834"/>
-      <subcategory value="24" description="D-48 85-mm antitank gun" uuid="d2c96ed0-5269-11df-aedc-080069138b88" uid="12835"/>
-      <subcategory value="25" description="M-1945 (D-44) 85-mm antitank gun" uuid="d2ca8090-5269-11df-89c0-080069138b88" uid="12836"/>
-      <subcategory value="26" description="Vasilyek 82-mm automatic mortar" deprecated="1" uuid="d2cb8e0e-5269-11df-9712-080069138b88" uid="12837"/>
-      <subcategory value="27" description="M1942 (ZIS-3) 76-mm divisional gun" uuid="d2cca424-5269-11df-b331-080069138b88" uid="12838"/>
-      <subcategory value="28" description="SM-4-1 130-mm coastal gun" uuid="d2cdbb70-5269-11df-9673-080069138b88" uid="12839"/>
-      <subcategory value="29" description="SPG-9 73-mm recoilless gun" uuid="d2cec790-5269-11df-b21e-080069138b88" uid="12840"/>
-      <subcategory value="30" description="B-10 82-mm recoilless gun" uuid="d2cfd9aa-5269-11df-8d3e-080069138b88" uid="12841"/>
-      <subcategory value="31" description="B-11 107-mm recoilless gun" uuid="d2d0f236-5269-11df-8f34-080069138b88" uid="12842"/>
-      <subcategory value="32" description="KS‑30 130-mm AA gun" deprecated="1" uuid="d2d206bc-5269-11df-b9da-080069138b88" uid="12843"/>
-      <subcategory value="33" description="KS‑19 100-mm AA gun" deprecated="1" uuid="d2d31ac0-5269-11df-b138-080069138b88" uid="12844"/>
-      <subcategory value="34" description="S‑60 57-mm AAA gun" deprecated="1" uuid="d2d42d2a-5269-11df-841d-080069138b88" uid="12845"/>
-      <subcategory value="35" description="M1939 37-mm AAA gun" deprecated="1" uuid="d2d53ba2-5269-11df-bf41-080069138b88" uid="12846"/>
-      <subcategory value="36" description="ZU‑23 twin 23-mm AAA gun" deprecated="1" uuid="d2d65366-5269-11df-aca5-080069138b88" uid="12847"/>
-      <subcategory value="37" description="14.5-mm ZPU AA MG" deprecated="1" uuid="d2d768dc-5269-11df-8a7b-080069138b88" uid="12848">
-        <specific value="1" description="ZPU‑1" deprecated="1" uuid="d2d87560-5269-11df-9bdd-080069138b88" uid="12849"/>
-        <specific value="2" description="ZPU‑2" deprecated="1" uuid="d2d98ad6-5269-11df-a970-080069138b88" uid="12850"/>
-        <specific value="3" description="ZPU‑3" deprecated="1" uuid="d2da9c3c-5269-11df-a46d-080069138b88" uid="12851"/>
-      </subcategory>
-      <subcategory value="38" description="125-mm AT Gun 2A45M" uuid="d2dc4e74-5269-11df-83df-080069138b88" uid="12852"/>
-      <subcategory value="39" description="140-mm 16-round RPU-14 multiple rocket system" uuid="d2dd5da0-5269-11df-82b8-080069138b88" uid="12853"/>
-    </category>
-    <category value="6" description="Small wheeled utility vehicle" uuid="d2df18d4-5269-11df-b3bd-080069138b88" uid="12854">
-      <subcategory value="1" description="GAZ-69 4x4 light vehicle" uuid="d2e02cf6-5269-11df-8520-080069138b88" uid="12855">
-        <specific value="1" description="Command vehicle" uuid="d2e14352-5269-11df-a3e4-080069138b88" uid="12856"/>
-      </subcategory>
-      <subcategory value="2" description="UAZ-469B 4x4 600-kg light vehicle" uuid="d2e2f30a-5269-11df-8687-080069138b88" uid="12857">
-        <specific value="1" description="Mine detecting system, DIM, on UAZ-469" uuid="d2e4007e-5269-11df-b5e2-080069138b88" uid="12858"/>
-      </subcategory>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d2e5b81a-5269-11df-b74c-080069138b88" uid="12859"/>
-      <subcategory value="4" description="LuAZ-967M amphibious battlefield support vehicle" uuid="d2e6cb06-5269-11df-9d02-080069138b88" uid="12860"/>
-      <subcategory value="5" description="LuAZ-969 4x4 light vehicle" uuid="d2e7deec-5269-11df-9ce1-080069138b88" uid="12861"/>
-      <subcategory value="6" description="GAZ-69A 4x4 light vehicle" uuid="d2e8eae4-5269-11df-ae2b-080069138b88" uid="12862"/>
-      <subcategory value="7" description="UAZ-452D 4x4 800-kg light vehicle" uuid="d2ea005a-5269-11df-8db4-080069138b88" uid="12863">
-        <specific value="1" description="Ambulance" uuid="d2eb1314-5269-11df-a890-080069138b88" uid="12864"/>
-      </subcategory>
-      <subcategory value="8" description="Motorcycles" uuid="d2ecc542-5269-11df-b418-080069138b88" uid="12865">
-        <specific value="1" description="IMZ-8" uuid="d2edce06-5269-11df-8d2b-080069138b88" uid="12866"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Large wheeled utility vehicle" uuid="d2f028f4-5269-11df-942b-080069138b88" uid="12867">
-      <subcategory value="1" description="PZM-2 regimental trench-digging machine" uuid="d2f13910-5269-11df-8189-080069138b88" uid="12868"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d2f24cc4-5269-11df-bf4f-080069138b88" uid="12869"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d2f35f38-5269-11df-b22d-080069138b88" uid="12870"/>
-      <subcategory value="4" description="ZIL-131 6x6 3500-kg truck" uuid="d2f46e32-5269-11df-8797-080069138b88" uid="12871">
-        <specific value="1" description="Missile fuel truck" uuid="d2f57fe8-5269-11df-855a-080069138b88" uid="12872"/>
-        <specific value="2" description="Calibration vehicle" uuid="d2f69018-5269-11df-a4dc-080069138b88" uid="12873"/>
-        <specific value="3" description="Fuel tanker" uuid="d2f79b98-5269-11df-81aa-080069138b88" uid="12874"/>
-        <specific value="4" description="Compressor Truck" uuid="d2f8ae66-5269-11df-9a1e-080069138b88" uid="12875"/>
-        <specific value="5" description="Firing Truck" uuid="d2f9bf2c-5269-11df-85e0-080069138b88" uid="12876"/>
-        <specific value="6" description="Special Fuel Truck" uuid="d2facb06-5269-11df-8a99-080069138b88" uid="12877"/>
-        <specific value="7" description="Autonomous Test Truck" uuid="d2fbdf5a-5269-11df-9866-080069138b88" uid="12878"/>
-        <specific value="8" description="Oxidizer Truck" uuid="d2fcf0b6-5269-11df-9b94-080069138b88" uid="12879"/>
-        <specific value="9" description="Transporter Truck" uuid="d2fe0500-5269-11df-a3c1-080069138b88" uid="12880"/>
-      </subcategory>
-      <subcategory value="5" description="ZIL-151 6x6 2500-kg truck" uuid="d2ffb99a-5269-11df-97ee-080069138b88" uid="12881"/>
-      <subcategory value="6" description="ZIL-157 6x6 2500-kg truck" uuid="d300cc7c-5269-11df-bf2c-080069138b88" uid="12882"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d301de8c-5269-11df-8cdc-080069138b88" uid="12883"/>
-      <subcategory value="8" description="GAZ-66 4x4 2000-kg truck" uuid="d302ef98-5269-11df-bc4f-080069138b88" uid="12884">
-        <specific value="1" description="GAZ-66 Signals van" uuid="d304019e-5269-11df-9f48-080069138b88" uid="12885"/>
-        <specific value="2" description="GAZ-66 Command van" uuid="d30512b4-5269-11df-8e03-080069138b88" uid="12886"/>
-        <specific value="3" description="DKV Decon truck" uuid="d3061d62-5269-11df-b6bb-080069138b88" uid="12887"/>
-        <specific value="4" description="ACRV, 1V110" uuid="d3072f72-5269-11df-a69a-080069138b88" uid="12888"/>
-        <specific value="5" description="TDA-M Smoke" uuid="d3084402-5269-11df-a7ee-080069138b88" uid="12889"/>
-      </subcategory>
-      <subcategory value="9" description="Ural-375 6x6 4000-kg truck" uuid="d309f3d8-5269-11df-b4d9-080069138b88" uid="12890">
-        <specific value="1" description="Field artillery support" uuid="d30b0156-5269-11df-99d9-080069138b88" uid="12891"/>
-        <specific value="2" description="URAL-375D van" uuid="d30c1690-5269-11df-a47f-080069138b88" uid="12892"/>
-        <specific value="3" description="URAL-375D hospital van" uuid="d30d2742-5269-11df-b42f-080069138b88" uid="12893"/>
-        <specific value="4" description="1V111 URAL-375-D FDC" uuid="d30e324a-5269-11df-b25f-080069138b88" uid="12894"/>
-        <specific value="5" description="URAL-375D maintenance van" uuid="d30f46da-5269-11df-bbc4-080069138b88" uid="12895"/>
-        <specific value="6" description="URAL-375 tranker truck" uuid="d310587c-5269-11df-9577-080069138b88" uid="12896"/>
-        <specific value="7" description="MAF-S water purification truck" uuid="d31164ce-5269-11df-b8e2-080069138b88" uid="12897"/>
-        <specific value="8" description="URAL-375D meteorological van" uuid="d31275c6-5269-11df-ba99-080069138b88" uid="12898"/>
-        <specific value="9" description="URAL-375 propellant tanker" uuid="d3138b28-5269-11df-88d2-080069138b88" uid="12899"/>
-        <specific value="10" description="URAL-375 oxidizer tanker" uuid="d3149784-5269-11df-95e5-080069138b88" uid="12900"/>
-        <specific value="11" description="TMS-65 Decontamination truck" status="new" uuid="1ce6b8e7-0f12-49fe-bff7-d1e8f4731582" uid="22795">
-          <cr value="1636"/>
-        </specific>
-      </subcategory>
-      <subcategory value="10" description="KamAZ-4310" uuid="d3164b2e-5269-11df-92fe-080069138b88" uid="12901"/>
-      <subcategory value="11" description="Ural-4320 6x6 4500-kg trucks" uuid="d3175be0-5269-11df-97f2-080069138b88" uid="12902"/>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="d3186fb2-5269-11df-be3a-080069138b88" uid="12903"/>
-      <subcategory value="13" description="KrAZ-255B 6x6 7500-kg truck" uuid="d3197cf4-5269-11df-85a2-080069138b88" uid="12904">
-        <specific value="1" description="Fuel service" uuid="d31a9238-5269-11df-9058-080069138b88" uid="12905"/>
-        <specific value="2" description="Aviation fuel support" uuid="d31bb078-5269-11df-b85f-080069138b88" uid="12906"/>
-        <specific value="3" description="KrAZ-255 Computer Van" uuid="d31cbdce-5269-11df-90a4-080069138b88" uid="12907"/>
-        <specific value="4" description="KrAZ-255 Crane Truck" uuid="d31dd06a-5269-11df-97b1-080069138b88" uid="12908"/>
-        <specific value="5" description="KrAZ-255 Dump truck" uuid="d31ee5cc-5269-11df-8535-080069138b88" uid="12909"/>
-      </subcategory>
-      <subcategory value="14" description="Ural-375D 6x6 recovery vehicle" uuid="d320976e-5269-11df-8761-080069138b88" uid="12910">
-        <specific value="1" description="Crane/wrecker" uuid="d321a3a2-5269-11df-b6e8-080069138b88" uid="12911"/>
-      </subcategory>
-      <subcategory value="15" description="Ural-4320 6x6 recovery vehicle" uuid="d32358d2-5269-11df-a0ce-080069138b88" uid="12912"/>
-      <subcategory value="16" description="KET-L 6x6 recovery truck" uuid="d3246ae2-5269-11df-93c9-080069138b88" uid="12913"/>
-      <subcategory value="17" description="GAZ-53 4x2 3000-kg truck" uuid="d3257d92-5269-11df-a456-080069138b88" uid="12914"/>
-      <subcategory value="18" description="Ural-377 6x4 7500-kg truck" uuid="d3268c50-5269-11df-916b-080069138b88" uid="12915"/>
-      <subcategory value="19" description="ZIL-133 6x4 8000 kg-truck" uuid="d3279e60-5269-11df-b2a6-080069138b88" uid="12916"/>
-      <subcategory value="20" description="YaAZ-214 6x6 7000-kg truck" uuid="d328b1e2-5269-11df-a7c5-080069138b88" uid="12917"/>
-      <subcategory value="21" description="KrAZ-214 6x6 7000-kg truck" uuid="d329c104-5269-11df-8a9c-080069138b88" uid="12918"/>
-      <subcategory value="22" description="KrAZ-206V 6x6 tractor truck" uuid="d32ad378-5269-11df-a6de-080069138b88" uid="12919"/>
-      <subcategory value="23" description="KamAZ-5320 6x4 8000-kg truck" uuid="d32bea42-5269-11df-8e08-080069138b88" uid="12920"/>
-      <subcategory value="24" description="KrAZ-260 6x6 9000-kg truck" uuid="d32cf766-5269-11df-8120-080069138b88" uid="12921"/>
-      <subcategory value="25" description="KrAZ-240 6x6 9000-kg truck" uuid="d32e0912-5269-11df-8456-080069138b88" uid="12922"/>
-      <subcategory value="26" description="Ural-5323 8x8 9000-kg truck" uuid="d32f1e06-5269-11df-bf76-080069138b88" uid="12923"/>
-      <subcategory value="27" description="KrAZ-257 6x4 12000-kg truck" uuid="d3302ada-5269-11df-bd5d-080069138b88" uid="12924"/>
-      <subcategory value="28" description="ZIL-135 series 8x8 truck" uuid="d3313e8e-5269-11df-915b-080069138b88" uid="12925"/>
-      <subcategory value="29" description="MAZ-543 8x8 truck" uuid="d33251de-5269-11df-b859-080069138b88" uid="12926"/>
-      <subcategory value="30" description="BAZ-5937 6x6 special purpose vehicle" uuid="d3335dc2-5269-11df-aa1d-080069138b88" uid="12927"/>
-      <subcategory value="31" description="BAZ-5939 6x6 special purpose vehicle" uuid="d33474f0-5269-11df-b262-080069138b88" uid="12928"/>
-      <subcategory value="32" description="MAZ-535 and MAZ-537 8x8 series" uuid="d33588ae-5269-11df-b5f7-080069138b88" uid="12929"/>
-      <subcategory value="33" description="TMK-2 trench-digging machine" uuid="d3369794-5269-11df-b96a-080069138b88" uid="12930"/>
-      <subcategory value="34" description="PZM regimental trench-digging machine" uuid="d337ad64-5269-11df-9d7d-080069138b88" uid="12931"/>
-      <subcategory value="35" description="OPS mobile water-desalination plant" uuid="d338bff6-5269-11df-a667-080069138b88" uid="12932"/>
-      <subcategory value="36" description="POU mobile water-desalination plant" uuid="d339cfb8-5269-11df-82ed-080069138b88" uid="12933"/>
-      <subcategory value="37" description="LBU-200 mobile well-drilling equipment" uuid="d33aef88-5269-11df-855a-080069138b88" uid="12934"/>
-    </category>
-    <category value="8" description="Small tracked utility vehicle" uuid="d33ca4ae-5269-11df-b401-080069138b88" uid="12935">
-      <subcategory value="1" description="AT-L light artillery tractor" uuid="d33db5f6-5269-11df-aeb8-080069138b88" uid="12936">
-        <specific value="1" description="AT-L w/ Pork Trough GSR" status="new" uuid="7f6628b0-95c0-4125-842b-c7b01e198609" uid="22846">
-          <cr value="2178"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="AT-LM light artillery tractor" uuid="d33eca90-5269-11df-9928-080069138b88" uid="12937"/>
-      <subcategory value="3" description="ATS-59G medium artillery tractor" uuid="d33fdc64-5269-11df-9ae7-080069138b88" uid="12938"/>
-      <subcategory value="4" description="ATS-59 medium artillery tractor" uuid="d340effa-5269-11df-bc53-080069138b88" uid="12939"/>
-      <subcategory value="5" description="MT-S medium transporter" uuid="d342011a-5269-11df-81bc-080069138b88" uid="12940"/>
-      <subcategory value="6" description="GT-SM amphibious over-snow vehicle" uuid="d343137a-5269-11df-83a7-080069138b88" uid="12941"/>
-      <subcategory value="7" description="GT-T amphibious over-snow vehicle" uuid="d34427e2-5269-11df-b0af-080069138b88" uid="12942"/>
-      <subcategory value="8" description="MT-L amphibious over-snow vehicle" uuid="d3453ba0-5269-11df-995c-080069138b88" uid="12943"/>
-    </category>
-    <category value="9" description="Large tracked utility vehicle" uuid="d346efae-5269-11df-b923-080069138b88" uid="12944">
-      <subcategory value="1" description="PTS amphibious transport" uuid="d347fb9c-5269-11df-bb26-080069138b88" uid="12945"/>
-      <subcategory value="2" description="PTS-M amphibious vehicle" uuid="d3490f96-5269-11df-a1f6-080069138b88" uid="12946"/>
-      <subcategory value="3" description="PTS-2 amphibious vehicle" uuid="d34a269c-5269-11df-a9e2-080069138b88" uid="12947"/>
-      <subcategory value="4" description="MTK-2 armored mineclearing vehicle" uuid="d34b31a4-5269-11df-b247-080069138b88" uid="12948"/>
-      <subcategory value="5" description="AT-T heavy artillery tractor" uuid="d34c44cc-5269-11df-8e80-080069138b88" uid="12949"/>
-      <subcategory value="6" description="MT-T heavy transporter" uuid="d34d5b96-5269-11df-bb66-080069138b88" uid="12950"/>
-      <subcategory value="7" description="GM-569 tractor" uuid="d34e67ac-5269-11df-93c0-080069138b88" uid="12951"/>
-      <subcategory value="8" description="BTM high-speed ditching machine" uuid="d34f7822-5269-11df-b4a0-080069138b88" uid="12952"/>
-      <subcategory value="9" description="BTM-3 high-speed ditching machine" uuid="d3508b72-5269-11df-b24d-080069138b88" uid="12953"/>
-      <subcategory value="10" description="BTM-TMG high-speed ditching machine" uuid="d351a890-5269-11df-aaa3-080069138b88" uid="12954"/>
-      <subcategory value="11" description="BTM-TMG2S high-speed ditching machine" uuid="d352bbe0-5269-11df-b514-080069138b88" uid="12955"/>
-      <subcategory value="12" description="MDK-2 trench-digging machine" uuid="d353cf6c-5269-11df-bfc5-080069138b88" uid="12956"/>
-      <subcategory value="13" description="MDK-2M trench-digging machine" uuid="d354e03c-5269-11df-8d0d-080069138b88" uid="12957"/>
-      <subcategory value="14" description="MDK-3 trench-digging machine" uuid="d355f29c-5269-11df-94de-080069138b88" uid="12958"/>
-      <subcategory value="15" description="BAT-1 high-speed tractor-mounted bulldozer" uuid="d35706f0-5269-11df-9f34-080069138b88" uid="12959"/>
-      <subcategory value="16" description="BAT-M high-speed tractor-mounted bulldozer" uuid="d3581626-5269-11df-8a6d-080069138b88" uid="12960"/>
-      <subcategory value="17" description="OLT high-speed tractor-mounted bulldozer" uuid="d359334e-5269-11df-a4ef-080069138b88" uid="12961"/>
-      <subcategory value="18" description="OST high-speed tractor-mounted bulldozer" uuid="d35a4bb2-5269-11df-bc2e-080069138b88" uid="12962"/>
-      <subcategory value="19" description="OTT high-speed tractor-mounted bulldozer" uuid="d35b599e-5269-11df-a0f4-080069138b88" uid="12963"/>
-      <subcategory value="20" description="GMZ Mine Layer" deprecated="1" uuid="d35c6d48-5269-11df-897b-080069138b88" uid="12964"/>
-      <subcategory value="21" description="PMR Minelayer" uuid="d35d8192-5269-11df-8388-080069138b88" uid="12965"/>
-      <subcategory value="22" description="AT-S Medium Tractor" uuid="d35e8cd6-5269-11df-b637-080069138b88" uid="12966"/>
-      <subcategory value="23" description="K-61 Amphibious" uuid="d35f9f04-5269-11df-ae56-080069138b88" uid="12967"/>
-    </category>
-    <category value="10" description="Mortar" uuid="d3614f8e-5269-11df-88d9-080069138b88" uid="12968">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d36261c6-5269-11df-b137-080069138b88" uid="12969"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d36371d8-5269-11df-bf09-080069138b88" uid="12970"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d3651f24-5269-11df-8fef-080069138b88" uid="12971"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d3663896-5269-11df-bed9-080069138b88" uid="12972"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="d3674d08-5269-11df-b26c-080069138b88" uid="12973"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="d3685e3c-5269-11df-996c-080069138b88" uid="12974"/>
-      <subcategory value="7" description="M-36 82-mm" uuid="d369e298-5269-11df-b68d-080069138b88" uid="12975"/>
-      <subcategory value="8" description="M-37 82-mm" uuid="d36b1136-5269-11df-8645-080069138b88" uid="12976"/>
-      <subcategory value="9" description="M-37 82-mm &quot;new&quot;" uuid="d36c251c-5269-11df-98be-080069138b88" uid="12977"/>
-      <subcategory value="10" description="M-41 82-mm" uuid="d399d5c0-5269-11df-9f65-080069138b88" uid="12978"/>
-      <subcategory value="11" description="AM 2B9 &quot;Vasilek&quot; 82-mm automatic" uuid="d39aec76-5269-11df-b22f-080069138b88" uid="12979"/>
-      <subcategory value="12" description="M-38 107-mm" uuid="d39bfa9e-5269-11df-905a-080069138b88" uid="12980"/>
-      <subcategory value="13" description="2S12 120-mm" uuid="d39d2496-5269-11df-a82d-080069138b88" uid="12981"/>
-      <subcategory value="15" description="120mm Mortar M1943" uuid="d39e3700-5269-11df-84b0-080069138b88" uid="12982"/>
-    </category>
-    <category value="11" description="Mine plow" uuid="d39feb9a-5269-11df-9af7-080069138b88" uid="12983">
-      <subcategory value="1" description="KMT-5M" uuid="d3a0f576-5269-11df-b861-080069138b88" uid="12984"/>
-    </category>
-    <category value="12" description="Mine rake" uuid="d3a41fa8-5269-11df-add7-080069138b88" uid="12985"/>
-    <category value="13" description="Mine roller" uuid="d3a56df4-5269-11df-8a8c-080069138b88" uid="12986"/>
-    <category value="14" description="Cargo trailer" uuid="d3a679ce-5269-11df-9a4d-080069138b88" uid="12987">
-      <subcategory value="1" description="0 - 0.5 ton" uuid="d3a78c9c-5269-11df-911b-080069138b88" uid="12988">
-        <specific value="1" description="Trailer, cargo, 1 axle, 0.5 ton, GAZ-704" uuid="d3a8b810-5269-11df-a331-080069138b88" uid="12989"/>
-      </subcategory>
-      <subcategory value="2" description="0.51 - 2 ton" uuid="d3aa6c46-5269-11df-b508-080069138b88" uid="12990"/>
-      <subcategory value="3" description="2.01 - 5 ton" uuid="d3ab7708-5269-11df-aa4e-080069138b88" uid="12991">
-        <specific value="1" description="Trailer, cargo, 2 axle, 4 ton, SMZ-710Z" uuid="d3ad0884-5269-11df-9ebe-080069138b88" uid="12992"/>
-        <specific value="2" description="Amphibious trailer PKP" uuid="d3ae1b7a-5269-11df-b234-080069138b88" uid="12993"/>
-      </subcategory>
-      <subcategory value="4" description="5.02 - 10 ton" uuid="d3afcfb0-5269-11df-b79c-080069138b88" uid="12994"/>
-      <subcategory value="5" description="greater than 10 tons" uuid="d3b0ef94-5269-11df-8754-080069138b88" uid="12995"/>
-    </category>
-    <category value="15" description="Fuel trailer" uuid="d3b2d552-5269-11df-9b8e-080069138b88" uid="12996">
-      <subcategory value="1" description="1-1000 gallons" uuid="d3b3e744-5269-11df-99ee-080069138b88" uid="12997">
-        <specific value="1" description="MNUM-50M" uuid="d3b4f7c4-5269-11df-a4c3-080069138b88" uid="12998"/>
-      </subcategory>
-      <subcategory value="2" description="1001 - 5000 gallons" uuid="d3b6b2bc-5269-11df-b2c8-080069138b88" uid="12999">
-        <specific value="1" description="PTs-4.2-754V, 4200 liter trailer" uuid="d3b7befa-5269-11df-98c3-080069138b88" uid="13000"/>
-      </subcategory>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="d3b978bc-5269-11df-ab50-080069138b88" uid="13001"/>
-    </category>
-    <category value="16" description="Generator trailer" uuid="d3bb6e60-5269-11df-b2b3-080069138b88" uid="13002">
-      <subcategory value="1" description="0 - 100 KW" uuid="d3bc84e4-5269-11df-8959-080069138b88" uid="13003"/>
-      <subcategory value="2" description="greater than 100 KW" uuid="d3bd969a-5269-11df-9661-080069138b88" uid="13004"/>
-    </category>
-    <category value="17" description="Water trailer" uuid="d3bf4e90-5269-11df-ad14-080069138b88" uid="13005">
-      <subcategory value="1" description="1-1000 gallons" uuid="d3c05ede-5269-11df-912f-080069138b88" uid="13006">
-        <specific value="1" description="Trailer, water, 1200 liter, ACMAT-ALM" uuid="d3c16a04-5269-11df-9e34-080069138b88" uid="13007"/>
-        <specific value="2" description="Trailer, water, 950 liter, VMG-40-51" uuid="d3c28b0a-5269-11df-922c-080069138b88" uid="13008"/>
-      </subcategory>
-      <subcategory value="2" description="1001- 5000 gallons" uuid="d3c44a9e-5269-11df-866e-080069138b88" uid="13009"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="d3c55b46-5269-11df-aff0-080069138b88" uid="13010"/>
-    </category>
-    <category value="18" description="Engineer equipment" uuid="d3c7165c-5269-11df-a5b3-080069138b88" uid="13011">
-      <subcategory value="1" description="Mine clearing line charge" uuid="d3c845b8-5269-11df-adf8-080069138b88" uid="13012"/>
-      <subcategory value="2" description="Dozer blade kit" uuid="d3c97154-5269-11df-95f2-080069138b88" uid="13013"/>
-      <subcategory value="3" description="Lane marking system" uuid="d3ca84fe-5269-11df-968a-080069138b88" uid="13014"/>
-    </category>
-    <category value="19" description="Heavy equipment transport trailer" uuid="d3cc3286-5269-11df-8ebb-080069138b88" uid="13015">
-      <subcategory value="1" description="Reload vehicle" uuid="d3cd4a22-5269-11df-bc9f-080069138b88" uid="13016"/>
-      <subcategory value="2" description="Lowboy, Heavy Equipment, Transporter, ChMZAP-5247C" uuid="d3cfbe42-5269-11df-97fc-080069138b88" uid="13017"/>
-    </category>
-    <category value="20" description="Maintenance equipment trailer" uuid="d3d17552-5269-11df-8ea5-080069138b88" uid="13018">
-      <subcategory value="1" description="Welding trailer" uuid="d3d2810e-5269-11df-8e97-080069138b88" uid="13019"/>
-      <subcategory value="2" description="Compressor" uuid="d3d49e3a-5269-11df-9dc3-080069138b88" uid="13020"/>
-      <subcategory value="3" description="Tools/parts trailer" uuid="d3d5ac94-5269-11df-952f-080069138b88" uid="13021">
-        <specific value="1" description="Trailer, van, missile, OdAZ-740" uuid="d3d6c020-5269-11df-97bc-080069138b88" uid="13022"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Limber" uuid="d3da3944-5269-11df-af5b-080069138b88" uid="13023"/>
-    <category value="22" description="Chemical decontamination trailer" uuid="d3db4ad2-5269-11df-9265-080069138b88" uid="13024"/>
-    <category value="23" description="(deprecated)" deprecated="1" uuid="d3dc60ca-5269-11df-bf11-080069138b88" uid="13025"/>
-    <category value="24" description="(deprecated)" deprecated="1" uuid="d3dd6b8c-5269-11df-b559-080069138b88" uid="13026"/>
-    <category value="25" description="Train-Car" uuid="d3de7b6c-5269-11df-a5b0-080069138b88" uid="13027">
-      <subcategory value="1" description="Boxcar" uuid="d3df8b38-5269-11df-9946-080069138b88" uid="13028"/>
-      <subcategory value="2" description="Tanker" uuid="d3e0941a-5269-11df-9de1-080069138b88" uid="13029"/>
-      <subcategory value="3" description="Passenger" uuid="d3e1ad6e-5269-11df-ac3b-080069138b88" uid="13030"/>
-    </category>
-    <category value="26" description="Train-Caboose" uuid="d3e35df8-5269-11df-bf7d-080069138b88" uid="13031"/>
-    <category value="27" description="Civilian Vehicle" uuid="d3e46af4-5269-11df-a829-080069138b88" uid="13032">
-      <subcategory value="1" description="Sedan" uuid="d3e57462-5269-11df-8aa7-080069138b88" uid="13033"/>
-    </category>
-    <category value="28" description="Air Defense / Missile Defense Unit Equipment" uuid="d3e727ee-5269-11df-8261-080069138b88" uid="13034">
-      <subcategory value="1" description="SA-2 Guideline SAM System" uuid="d3e83800-5269-11df-8ad3-080069138b88" uid="13035">
-        <specific value="1" description="SA-2 Battery C3 Van" uuid="d3e94632-5269-11df-b6b3-080069138b88" uid="13036"/>
-        <specific value="2" description="SA-2 Missile Launcher" uuid="d3ea5054-5269-11df-bc1c-080069138b88" uid="13037"/>
-        <specific value="3" description="Fan Song Engagement Radar" uuid="d3eb630e-5269-11df-9b5b-080069138b88" uid="13038">
-          <extra value="1" description="Fan Song B" uuid="d3ec7136-5269-11df-8fac-080069138b88" uid="13039"/>
-          <extra value="2" description="Fan Song C/E" uuid="d3ed78ba-5269-11df-ba8b-080069138b88" uid="13040"/>
-          <extra value="3" description="Fan Song F" uuid="d3ee8a48-5269-11df-848c-080069138b88" uid="13041"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="SA-3 Goa SAM System" uuid="d3f0d514-5269-11df-b2c7-080069138b88" uid="13042">
-        <specific value="1" description="SA-3 Battery C3 Van" uuid="d3f1e4c2-5269-11df-ba87-080069138b88" uid="13043"/>
-        <specific value="2" description="SA-3 Missile Launcher" uuid="d3f2f31c-5269-11df-85f7-080069138b88" uid="13044">
-          <extra value="1" description="Twin-Rail Launcher" uuid="d3f405ae-5269-11df-9e50-080069138b88" uid="13045"/>
-          <extra value="2" description="Quad-Rail Launcher" uuid="d3f51106-5269-11df-82ce-080069138b88" uid="13046"/>
-        </specific>
-        <specific value="3" description="Low Blow Engagement Radar" uuid="d3f6bc40-5269-11df-a4f2-080069138b88" uid="13047"/>
-      </subcategory>
-      <subcategory value="3" description="SA-5 Gammon SAM System" uuid="d3f86c0c-5269-11df-a95b-080069138b88" uid="13048">
-        <specific value="1" description="SA-5 Battalion C3 Van" uuid="d3f97a84-5269-11df-b3bf-080069138b88" uid="13049"/>
-        <specific value="2" description="SA-5 Missile Launcher" uuid="d3fa8cda-5269-11df-8b69-080069138b88" uid="13050"/>
-        <specific value="3" description="Square Pair Engagement Radar" uuid="d3fb9576-5269-11df-96d3-080069138b88" uid="13051"/>
-      </subcategory>
-      <subcategory value="4" description="SA-10 Grumble SAM System" uuid="d3fd44fc-5269-11df-9b70-080069138b88" uid="13052">
-        <specific value="1" description="SA-10 Battery C3 Vehicle" uuid="d3fe52e8-5269-11df-934f-080069138b88" uid="13053"/>
-        <specific value="2" description="SA-10 Missile Launcher" uuid="d3ff60fc-5269-11df-b6d7-080069138b88" uid="13054">
-          <extra value="1" description="SA-10A Towed TEL (5P85T)" uuid="d40072b2-5269-11df-b59e-080069138b88" uid="13055"/>
-          <extra value="2" description="SA-10B SP TEL (5P85S)" uuid="d4018f62-5269-11df-a38e-080069138b88" uid="13056"/>
-        </specific>
-        <specific value="3" description="Flap Lid Engagement Radar (36N6E)" uuid="d40342e4-5269-11df-9567-080069138b88" uid="13057">
-          <extra value="1" description="Flap Lid A Radar (tower mounted)" uuid="d40454f4-5269-11df-acb8-080069138b88" uid="13058"/>
-          <extra value="2" description="Flap Lid B (SP vehicle)" uuid="d4055e1c-5269-11df-b318-080069138b88" uid="13059"/>
-          <extra value="3" description="Tomb Stone Radar (SA-10C)" uuid="d4066d0c-5269-11df-9a37-080069138b88" uid="13060"/>
-        </specific>
-        <specific value="4" description="Clam Shell Acquisition Radar" uuid="d4081d46-5269-11df-9c18-080069138b88" uid="13061"/>
-        <specific value="5" description="SA-10 Missile Transport/Reload Vehicle" uuid="d4092cfe-5269-11df-9e7c-080069138b88" uid="13062"/>
-      </subcategory>
-      <subcategory value="5" description="SA-4 Ganef SAM System" uuid="d40adb3a-5269-11df-b024-080069138b88" uid="13063">
-        <specific value="1" description="SA-4 Battery C3 Vehicle" uuid="d40be890-5269-11df-b0cf-080069138b88" uid="13064"/>
-        <specific value="2" description="SA-4 TEL (2P24)" uuid="d40cf7ee-5269-11df-83cb-080069138b88" uid="13065"/>
-        <specific value="3" description="Pat Hand Engagement Radar (1S32M)" uuid="d40e0710-5269-11df-839b-080069138b88" uid="13066"/>
-        <specific value="4" description="SA-4 Missile Transporter/Loader Vehicle (2T6)" uuid="d40f1056-5269-11df-ac53-080069138b88" uid="13067"/>
-      </subcategory>
-      <subcategory value="6" description="SA-6 Gainful SAM System" uuid="d410c4a0-5269-11df-b75d-080069138b88" uid="13068">
-        <specific value="1" description="SA-6 Battery C3 Vehicle" uuid="d411d3fe-5269-11df-bd5c-080069138b88" uid="13069"/>
-        <specific value="2" description="SA-6 TEL" uuid="d412e30c-5269-11df-a3ed-080069138b88" uid="13070">
-          <extra value="1" description="SA-6A TEL (2P25)" uuid="d413e9dc-5269-11df-a437-080069138b88" uid="13071"/>
-          <extra value="2" description="SA-6B TEL (9A310M1 w/Fire Dome Radar)" uuid="d414fb38-5269-11df-8c63-080069138b88" uid="13072"/>
-        </specific>
-        <specific value="3" description="Straight Flush Engagement Radar" uuid="d416ad8e-5269-11df-a155-080069138b88" uid="13073"/>
-        <specific value="4" description="SA-6 Missile Transporter/Loader Vehicle" uuid="d417bc88-5269-11df-88c4-080069138b88" uid="13074"/>
-      </subcategory>
-      <subcategory value="7" description="SA-8 Gecko SAM System" uuid="d4196b28-5269-11df-93df-080069138b88" uid="13075">
-        <specific value="1" description="SA-8 Battery C3 Vehicle" uuid="d41a7856-5269-11df-8937-080069138b88" uid="13076"/>
-        <specific value="2" description="SA-8 TLAR" uuid="d41b864c-5269-11df-8acc-080069138b88" uid="13077">
-          <extra value="1" description="SA-8A TLAR" uuid="d41c928a-5269-11df-a3b6-080069138b88" uid="13078"/>
-          <extra value="2" description="SA-8B TLAR" uuid="d41d9a86-5269-11df-a823-080069138b88" uid="13079"/>
-        </specific>
-        <specific value="3" description="SA-8 Transloader Vehicle" uuid="d41f540c-5269-11df-8cfe-080069138b88" uid="13080"/>
-      </subcategory>
-      <subcategory value="8" description="SA-11 Gadfly SAM System" uuid="d421020c-5269-11df-ab6f-080069138b88" uid="13081">
-        <specific value="1" description="SA-11 Battery C3 Vehicle (9S470M1)" uuid="d42213f4-5269-11df-8b68-080069138b88" uid="13082"/>
-        <specific value="2" description="SA-11 TELAR (9A310M1)" uuid="d423237a-5269-11df-ad16-080069138b88" uid="13083"/>
-        <specific value="3" description="SA-11 Loader/Launcher (9A39M1)" uuid="d4242f36-5269-11df-ae42-080069138b88" uid="13084"/>
-        <specific value="4" description="TUBE ARM Radar" uuid="d4253fa2-5269-11df-8937-080069138b88" uid="13085"/>
-      </subcategory>
-      <subcategory value="9" description="SA-12 Gladiator/Giant SAM System (S-300V)" uuid="d426f004-5269-11df-ae0a-080069138b88" uid="13086">
-        <specific value="1" description="Battalion" uuid="d427fe90-5269-11df-a0b5-080069138b88" uid="13087">
-          <extra value="1" description="Battalion Command Post Vehicle (9S457-1)" uuid="d42907e0-5269-11df-9ec7-080069138b88" uid="13088"/>
-          <extra value="2" description="Bill Board Acquisition Radar (9S15MT)" uuid="d42a189c-5269-11df-93c8-080069138b88" uid="13089"/>
-          <extra value="3" description="High Screen Sector Search Radar (9S19MT)" uuid="d42b27d2-5269-11df-ab3d-080069138b88" uid="13090"/>
-        </specific>
-        <specific value="2" description="Battery" uuid="d42cd8c0-5269-11df-be82-080069138b88" uid="13091">
-          <extra value="1" description="Grill Pan Engagement Radar (9S32)" uuid="d42de094-5269-11df-8c2d-080069138b88" uid="13092"/>
-          <extra value="2" description="SA-12A Gladiator TELAR (9A83-1)" uuid="d42ef16e-5269-11df-916b-080069138b88" uid="13093"/>
-          <extra value="3" description="SA-12B Giant TELAR (9A82)" uuid="d430005e-5269-11df-82c6-080069138b88" uid="13094"/>
-          <extra value="4" description="Gladiator Missile Loader/Launcher (9A85)" uuid="d4310dfa-5269-11df-968a-080069138b88" uid="13095"/>
-          <extra value="5" description="Giant Missile Loader/Launcher (9A84)" uuid="d4321d94-5269-11df-9389-080069138b88" uid="13096"/>
-          <extra value="6" description="SA-12B (rail w/SS-24)" uuid="d4332c7a-5269-11df-a689-080069138b88" uid="13097"/>
-        </specific>
-      </subcategory>
-      <subcategory value="10" description="SA-15 Gauntlet SAM System" uuid="d4357ac0-5269-11df-a17a-080069138b88" uid="13098">
-        <specific value="1" description="SA-15 Battery C3 Vehicle" uuid="d4368a14-5269-11df-8f0a-080069138b88" uid="13099"/>
-        <specific value="2" description="SA-15 TELAR" uuid="d4379486-5269-11df-8dc6-080069138b88" uid="13100"/>
-        <specific value="3" description="8-Round Missile Reload Vehicle (9T224)" uuid="d438a1aa-5269-11df-831f-080069138b88" uid="13101"/>
-        <specific value="4" description="28-Round Missile Reload Transporter (9T225)" uuid="d439b68a-5269-11df-99a8-080069138b88" uid="13102"/>
-      </subcategory>
-      <subcategory value="11" description="SA-17 Grizzly SAM System" uuid="d43ba7d8-5269-11df-8df3-080069138b88" uid="13103">
-        <specific value="1" description="SA-17 Command Post Vehicle" uuid="d43cb8b2-5269-11df-9150-080069138b88" uid="13104"/>
-        <specific value="2" description="Chair Back Engagement Radar" uuid="d43dd2c4-5269-11df-9c95-080069138b88" uid="13105">
-          <extra value="1" description="Tracked (SP) Chair Back Vehicle" uuid="d43ee358-5269-11df-9084-080069138b88" uid="13106"/>
-          <extra value="2" description="Wheeled (towed) Chair Back Trailer" uuid="d43fed0c-5269-11df-b9f4-080069138b88" uid="13107"/>
-        </specific>
-        <specific value="3" description="SA-17 TELAR" uuid="d4419ed6-5269-11df-8dde-080069138b88" uid="13108"/>
-        <specific value="4" description="SA-17 Launcher/Loader Vehicle (TEL)" uuid="d442ad62-5269-11df-8cfe-080069138b88" uid="13109">
-          <extra value="1" description="Tracked (SP) LL" uuid="d443be32-5269-11df-a081-080069138b88" uid="13110"/>
-          <extra value="2" description="Wheeled (towed) LL" uuid="d444c598-5269-11df-a717-080069138b88" uid="13111"/>
-        </specific>
-      </subcategory>
-      <subcategory value="12" description="Self-Propelled VSHORAD Gun/Missile System" uuid="d4471b54-5269-11df-8e5f-080069138b88" uid="13112">
-        <specific value="1" description="ZSU-23/4 Quad 23mm AAA" uuid="d4482666-5269-11df-978d-080069138b88" uid="13113"/>
-        <specific value="2" description="SA-9 Gaskin SAM System" uuid="d4493560-5269-11df-8f66-080069138b88" uid="13114">
-          <extra value="1" description="SA-9A TEL (w/Flat Box-A)" uuid="d44a4478-5269-11df-ba65-080069138b88" uid="13115"/>
-          <extra value="2" description="SA-9B TEL (w/o Flat Box-A)" uuid="d44b516a-5269-11df-8fbe-080069138b88" uid="13116"/>
-        </specific>
-        <specific value="3" description="SA-13 Gopher SAM System" uuid="d44cfe66-5269-11df-91c2-080069138b88" uid="13117">
-          <extra value="1" description="SA-13 TELAR w/Flat Box B" uuid="d44e0dec-5269-11df-ac5e-080069138b88" uid="13118"/>
-          <extra value="2" description="SA-13 TELAR w/o Flat Box" uuid="d44f1d04-5269-11df-a252-080069138b88" uid="13119"/>
-        </specific>
-        <specific value="4" description="2S6 &quot;Tunguska&quot; Quad 30mm/SA-19 AD System" uuid="d450cdd4-5269-11df-8181-080069138b88" uid="13120"/>
-        <specific value="5" description="ZSU-57/2 twin-57mm AA Gun System" uuid="d451d9fe-5269-11df-ac06-080069138b88" uid="13121"/>
-        <specific value="6" description="BTR-40A w/ZPTU-2 twin-14.5mm AA mount" uuid="d452ef4c-5269-11df-9694-080069138b88" uid="13122"/>
-        <specific value="7" description="BTR-152A w/ZPTU-2 twin-14.5mm AA mount" uuid="d4540242-5269-11df-85ee-080069138b88" uid="13123"/>
-        <specific value="8" description="BTR-152D w/ZPU-2 twin-14.5mm AA mount" uuid="d45510d8-5269-11df-8287-080069138b88" uid="13124"/>
-        <specific value="9" description="BTR-152 w/ZU-23 twin-23mm AA mount" uuid="d4562158-5269-11df-977b-080069138b88" uid="13125"/>
-        <specific value="10" description="BTR-152 w/M53 quad-12.7mm MG mount" uuid="d4573020-5269-11df-a784-080069138b88" uid="13126"/>
-      </subcategory>
-      <subcategory value="13" description="Towed VSHORAD Gun/Missile System" uuid="d458e212-5269-11df-936f-080069138b88" uid="13127">
-        <specific value="1" description="KS-30 130mm AA Gun" uuid="d459ebb2-5269-11df-b5bf-080069138b88" uid="13128"/>
-        <specific value="2" description="KS-19 100mm AA Gun" uuid="d45afdea-5269-11df-b007-080069138b88" uid="13129"/>
-        <specific value="3" description="KS-12 85mm AA Gun" uuid="d45c1446-5269-11df-8716-080069138b88" uid="13130"/>
-        <specific value="4" description="S-60 57mm AA Gun" uuid="d45d1fda-5269-11df-b2c5-080069138b88" uid="13131"/>
-        <specific value="5" description="M1939 37mm AA Gun" uuid="d45e301e-5269-11df-9b17-080069138b88" uid="13132"/>
-        <specific value="6" description="ZU-23 twin 23mm AA Gun" uuid="d45f42ec-5269-11df-b934-080069138b88" uid="13133"/>
-        <specific value="7" description="14.5mm ZPU AA MG" uuid="d4604bf6-5269-11df-be15-080069138b88" uid="13134">
-          <extra value="1" description="ZPU-1" uuid="d4615960-5269-11df-888c-080069138b88" uid="13135"/>
-          <extra value="2" description="ZPU-2" uuid="d4626a08-5269-11df-a324-080069138b88" uid="13136"/>
-          <extra value="3" description="ZPU-4" uuid="d46371a0-5269-11df-bf53-080069138b88" uid="13137"/>
-        </specific>
-      </subcategory>
-      <subcategory value="14" description="SSC-3 Styx A/B/C/ variant launcher" uuid="d465c1c6-5269-11df-8d53-080069138b88" uid="13138"/>
-      <subcategory value="15" description="SS-N-3B/C Shaddock/Sepal launcher" uuid="d466cf76-5269-11df-9cd4-080069138b88" uid="13139"/>
-      <subcategory value="16" description="SS-N-22 Sunburn launcher" uuid="d467e23a-5269-11df-abfa-080069138b88" uid="13140"/>
-      <subcategory value="17" description="SSC-X-5 (SS-NX-26) launcher" uuid="d468f292-5269-11df-b0dc-080069138b88" uid="13141"/>
-      <subcategory value="18" description="SSC-6 (SS-N-25) launcher" uuid="d469fb88-5269-11df-9a38-080069138b88" uid="13142"/>
-      <subcategory value="19" description="P-270 Moskit (Kh-41) launcher" uuid="d46b0d0c-5269-11df-8992-080069138b88" uid="13143"/>
-      <subcategory value="20" description="M51 launcher" uuid="d46c207a-5269-11df-ac26-080069138b88" uid="13144"/>
-      <subcategory value="21" description="SA-20 Gargoyle SAM System" uuid="d46d283a-5269-11df-a617-080069138b88" uid="13145">
-        <specific value="1" description="SA-20 Group of Battalions CP Vehicle (54K6)" uuid="d46e37a2-5269-11df-ab24-080069138b88" uid="13146"/>
-        <specific value="2" description="SA-20 Missile Launcher (5P85)" uuid="d46f4a16-5269-11df-a63f-080069138b88" uid="13147"/>
-        <specific value="3" description="SA-20 Tomb Stone Engagement Radar/Battalion CP (30N6E1)" uuid="d4705618-5269-11df-831a-080069138b88" uid="13148"/>
-        <specific value="4" description="SA-20 Missile Transport/Reload Vehicle (22T6)" uuid="d4716648-5269-11df-83fe-080069138b88" uid="13149"/>
-        <specific value="5" description="SA-20 Big Bird Acquisition Radar (64N6)" uuid="d4727c68-5269-11df-b87a-080069138b88" uid="13150"/>
-      </subcategory>
-    </category>
-    <category value="29" description="Command, Control, Communications and Intelligence (C3I) System" uuid="d474caae-5269-11df-b767-080069138b88" uid="13151"/>
-    <category value="30" description="Operations Facility" uuid="d475dec6-5269-11df-a609-080069138b88" uid="13152"/>
-    <category value="31" description="Intelligence Facility" uuid="d476e6a4-5269-11df-8621-080069138b88" uid="13153"/>
-    <category value="32" description="Surveillance Facility" uuid="d477f576-5269-11df-8b05-080069138b88" uid="13154"/>
-    <category value="33" description="Communications Facility" uuid="d47905ba-5269-11df-8f4e-080069138b88" uid="13155"/>
-    <category value="34" description="Command Facility" uuid="d47a105e-5269-11df-9e19-080069138b88" uid="13156"/>
-    <category value="35" description="C4I Facility" uuid="d47b262e-5269-11df-b5d4-080069138b88" uid="13157"/>
-    <category value="36" description="Control Facility" uuid="d47c3898-5269-11df-b2fa-080069138b88" uid="13158"/>
-    <category value="37" description="Fire Control Facility" uuid="d47d41e8-5269-11df-a217-080069138b88" uid="13159"/>
-    <category value="38" description="Missile Defense Facility" uuid="d47e50ba-5269-11df-99e8-080069138b88" uid="13160"/>
-    <category value="39" description="Field Command Post" uuid="d47f604a-5269-11df-807a-080069138b88" uid="13161"/>
-    <category value="40" description="Observation Post" uuid="d4806d28-5269-11df-9499-080069138b88" uid="13162"/>
-    <category value="41" description="General Wheeled Vehicles" uuid="d4817ccc-5269-11df-b0d4-080069138b88" uid="13163">
-      <subcategory value="1" description="Small truck" uuid="d4828af4-5269-11df-b3c9-080069138b88" uid="13164"/>
-      <subcategory value="2" description="Medium truck" uuid="d48392c8-5269-11df-9b28-080069138b88" uid="13165"/>
-      <subcategory value="3" description="Large truck" uuid="d484a2da-5269-11df-9053-080069138b88" uid="13166"/>
-      <subcategory value="4" description="TEL crane truck" uuid="d485b526-5269-11df-9895-080069138b88" uid="13167"/>
-      <subcategory value="5" description="Missile fuel truck" uuid="d486bd2c-5269-11df-aa8b-080069138b88" uid="13168"/>
-      <subcategory value="6" description="Tractor trailer truck" uuid="d487cd5c-5269-11df-b59f-080069138b88" uid="13169"/>
-      <subcategory value="7" description="Missile command truck" uuid="d488e0f2-5269-11df-8ed6-080069138b88" uid="13170"/>
-      <subcategory value="8" description="Missile warhead truck" uuid="d489eae2-5269-11df-a4ac-080069138b88" uid="13171"/>
-      <subcategory value="9" description="Artillery command and reconnaissance vehicle" uuid="d48af8ec-5269-11df-a43b-080069138b88" uid="13172"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="222" uuid="d48d4a20-5269-11df-a0eb-080069138b88" uid="13173">
-    <category value="1" description="Fighter/Air Defense" uuid="d48e56d6-5269-11df-8ee3-080069138b88" uid="13174">
-      <subcategory value="1" description="MiG-31 Foxhound" uuid="d48f6620-5269-11df-8b75-080069138b88" uid="13175">
-        <specific value="1" description="MiG-31 Foxhound-A" uuid="d49074f2-5269-11df-a7b5-080069138b88" uid="13176"/>
-        <specific value="2" description="MiG-31M Foxhound-B" uuid="d4918234-5269-11df-983b-080069138b88" uid="13177"/>
-      </subcategory>
-      <subcategory value="2" description="MiG-29 Fulcrum" uuid="d4932df0-5269-11df-ae6a-080069138b88" uid="13178">
-        <specific value="1" description="MiG-29 Fulcrum A" uuid="d4943cc2-5269-11df-9302-080069138b88" uid="13179"/>
-        <specific value="2" description="MiG-29UB Fulcrum B" uuid="d4954b9e-5269-11df-8a18-080069138b88" uid="13180"/>
-        <specific value="3" description="MiG-29 Fulcrum C" uuid="d496580e-5269-11df-a8c9-080069138b88" uid="13181"/>
-        <specific value="4" description="MiG-29K Fulcrum D" uuid="d49766b8-5269-11df-bb01-080069138b88" uid="13182"/>
-        <specific value="5" description="MiG-29M advanced version" uuid="d4987382-5269-11df-975e-080069138b88" uid="13183"/>
-        <specific value="6" description="MiG-29 thrust vectoring" uuid="d4998560-5269-11df-85a3-080069138b88" uid="13184"/>
-        <specific value="7" description="MiG-29KU ship-based trainer" uuid="d49aa800-5269-11df-9df7-080069138b88" uid="13185"/>
-      </subcategory>
-      <subcategory value="3" description="Su-27 Flanker" uuid="d49c579a-5269-11df-94ad-080069138b88" uid="13186">
-        <specific value="1" description="Su-27 Flanker A prototypes" uuid="d49d66b2-5269-11df-a50f-080069138b88" uid="13187"/>
-        <specific value="2" description="Su-27 Flanker B production" uuid="d49e7002-5269-11df-8d6d-080069138b88" uid="13188"/>
-        <specific value="3" description="Su-27UB Flanker C" uuid="d49f803c-5269-11df-971a-080069138b88" uid="13189"/>
-        <specific value="4" description="Su-27K Flanker D" uuid="d4a09314-5269-11df-921c-080069138b88" uid="13190"/>
-        <specific value="5" description="Su-27IB" uuid="d4a19aa2-5269-11df-99ea-080069138b88" uid="13191"/>
-      </subcategory>
-      <subcategory value="4" description="MiG-25 Foxbat" uuid="d4a34640-5269-11df-b219-080069138b88" uid="13192">
-        <specific value="1" description="MiG-25P Foxbat A" uuid="d4a45864-5269-11df-ad01-080069138b88" uid="13193"/>
-        <specific value="2" description="MiG-25RB Foxbat B" uuid="d4a566e6-5269-11df-8c17-080069138b88" uid="13194"/>
-        <specific value="3" description="MiG-25RBV Foxbat B" uuid="d4a66f14-5269-11df-9d4d-080069138b88" uid="13195"/>
-        <specific value="4" description="MiG-25BBT Foxbat B" uuid="d4a78110-5269-11df-8f7b-080069138b88" uid="13196"/>
-        <specific value="5" description="MiG-25R Foxbat B" uuid="d4a88f6a-5269-11df-945b-080069138b88" uid="13197"/>
-        <specific value="6" description="MiG-25PU Foxbat C" uuid="d4a99716-5269-11df-b724-080069138b88" uid="13198"/>
-        <specific value="7" description="MiG-25RU Foxbat C" uuid="d4aaa516-5269-11df-baaf-080069138b88" uid="13199"/>
-        <specific value="8" description="MiG-25U Foxbat C" uuid="d4abb7a8-5269-11df-91ab-080069138b88" uid="13200"/>
-        <specific value="9" description="MiG-25RBK Foxbat D" uuid="d4acc026-5269-11df-9f57-080069138b88" uid="13201"/>
-        <specific value="10" description="MiG-25RBS Foxbat D" uuid="d4adcde0-5269-11df-829c-080069138b88" uid="13202"/>
-        <specific value="11" description="MiG-25RBSh Foxbat D" uuid="d4aede10-5269-11df-b95e-080069138b88" uid="13203"/>
-        <specific value="12" description="MiG-25RBF Foxbat D" uuid="d4afeac6-5269-11df-93de-080069138b88" uid="13204"/>
-        <specific value="13" description="MiG-25PD Foxbat E" uuid="d4b0fa1a-5269-11df-9de3-080069138b88" uid="13205"/>
-        <specific value="14" description="MiG-25PDS Foxbat E" uuid="d4b207ca-5269-11df-b47d-080069138b88" uid="13206"/>
-        <specific value="15" description="MiG-25BM Foxbat F" uuid="d4b3119c-5269-11df-b6c2-080069138b88" uid="13207"/>
-      </subcategory>
-      <subcategory value="5" description="MiG-23/24 Flogger" uuid="d4b4c212-5269-11df-ad66-080069138b88" uid="13208">
-        <specific value="1" description="MiG-23M Flogger B" uuid="d4b5cfae-5269-11df-9373-080069138b88" uid="13209"/>
-        <specific value="2" description="MiG-23MF Flogger B" uuid="d4b6de1c-5269-11df-9828-080069138b88" uid="13210"/>
-        <specific value="3" description="MiG-23UB Flogger C" uuid="d4b7ec08-5269-11df-9c3d-080069138b88" uid="13211"/>
-        <specific value="4" description="MiG-23UM Flogger C" uuid="d4b9035e-5269-11df-97e3-080069138b88" uid="13212"/>
-        <specific value="5" description="MiG-23MF Flogger E" uuid="d4ba1262-5269-11df-9b54-080069138b88" uid="13213"/>
-        <specific value="6" description="MiG-23MS Flogger E" uuid="d4bb1f40-5269-11df-a423-080069138b88" uid="13214"/>
-        <specific value="7" description="MiG-23BN Flogger F" uuid="d4bc2e08-5269-11df-91fc-080069138b88" uid="13215"/>
-        <specific value="8" description="MiG-23BM Flogger F" uuid="d4bd3c94-5269-11df-be14-080069138b88" uid="13216"/>
-        <specific value="9" description="MiG-23B Flogger F" uuid="d4be4486-5269-11df-82eb-080069138b88" uid="13217"/>
-        <specific value="10" description="MiG-23ML Flogger G" uuid="d4bf56a0-5269-11df-a1f9-080069138b88" uid="13218"/>
-        <specific value="11" description="MiG-23P Flogger G" uuid="d4c06734-5269-11df-9789-080069138b88" uid="13219"/>
-        <specific value="12" description="MiG-23BK Flogger H" uuid="d4c17084-5269-11df-922d-080069138b88" uid="13220"/>
-        <specific value="13" description="MiG-23BN Flogger H" uuid="d4c28186-5269-11df-9259-080069138b88" uid="13221"/>
-        <specific value="14" description="MiG-23MLD Flogger K" uuid="d4c39026-5269-11df-a800-080069138b88" uid="13222"/>
-        <specific value="15" description="MiG-24 (export MiG-23)" uuid="d4c4996c-5269-11df-bae1-080069138b88" uid="13223"/>
-      </subcategory>
-      <subcategory value="6" description="MiG-21 Fishbed/Mongol" uuid="d4c64992-5269-11df-89ed-080069138b88" uid="13224">
-        <specific value="1" description="MiG-21F Fishbed C" uuid="d4c756a2-5269-11df-a15d-080069138b88" uid="13225"/>
-        <specific value="2" description="MiG-21PF Fishbed D" uuid="d4c86588-5269-11df-bc24-080069138b88" uid="13226"/>
-        <specific value="3" description="MiG-21PFM Fishbed F" uuid="d4c96f28-5269-11df-97b7-080069138b88" uid="13227"/>
-        <specific value="4" description="MiG-21R Fishbed H" uuid="d4ca7d28-5269-11df-8f56-080069138b88" uid="13228"/>
-        <specific value="5" description="MiG-21S Fishbed H" uuid="d4cb8ec0-5269-11df-94e9-080069138b88" uid="13229"/>
-        <specific value="6" description="MiG-21RF Fishbed H" uuid="d4cc98c4-5269-11df-a694-080069138b88" uid="13230"/>
-        <specific value="7" description="MiG-21SM Fishbed J" uuid="d4cda7aa-5269-11df-b592-080069138b88" uid="13231"/>
-        <specific value="8" description="MiG-21M (Type 96/Hindustan Aeronautics-India)" uuid="d4ceb672-5269-11df-b44e-080069138b88" uid="13232"/>
-        <specific value="9" description="MiG-21PFMA Fishbed J" uuid="d4cfc616-5269-11df-96a9-080069138b88" uid="13233"/>
-        <specific value="10" description="MiG-21MF Fishbed J" uuid="d4d0d3e4-5269-11df-ad0c-080069138b88" uid="13234"/>
-        <specific value="11" description="MiG-21SMT Fishbed K" uuid="d4d1e2e8-5269-11df-bb8b-080069138b88" uid="13235"/>
-        <specific value="12" description="MiG-21SMB Fishbed K" uuid="d4d2eef4-5269-11df-b371-080069138b88" uid="13236"/>
-        <specific value="13" description="MiG-21bis-A Fishbed L" uuid="d4d3fdd0-5269-11df-85e0-080069138b88" uid="13237"/>
-        <specific value="14" description="MiG-21bis-B Fishbed N" uuid="d4d50c16-5269-11df-927d-080069138b88" uid="13238"/>
-        <specific value="15" description="MiG-21U Mongol A" uuid="d4d61444-5269-11df-bd81-080069138b88" uid="13239"/>
-        <specific value="16" description="MiG-21US Mongol B" uuid="d4d72f14-5269-11df-9847-080069138b88" uid="13240"/>
-        <specific value="17" description="MiG-21UM Mongol B" uuid="d4d83d00-5269-11df-a1e3-080069138b88" uid="13241"/>
-      </subcategory>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d4d9ec90-5269-11df-96f2-080069138b88" uid="13242"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="d4daf644-5269-11df-b455-080069138b88" uid="13243"/>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="d4dc091c-5269-11df-a046-080069138b88" uid="13244"/>
-      <subcategory value="10" description="Su-15 Flagon" deprecated="1" uuid="d4dd18c0-5269-11df-a940-080069138b88" uid="13245">
-        <specific value="1" description="Su-15TM Flagon E" deprecated="1" uuid="d4de236e-5269-11df-8cad-080069138b88" uid="13246"/>
-        <specific value="2" description="Su-15bis Flagon F" deprecated="1" uuid="d4df32fe-5269-11df-81e6-080069138b88" uid="13247"/>
-        <specific value="3" description="Su-15 trainer" deprecated="1" uuid="d4e04734-5269-11df-adae-080069138b88" uid="13248"/>
-      </subcategory>
-      <subcategory value="11" description="Tu-128 Fiddler" deprecated="1" uuid="d4e1f5b6-5269-11df-9c20-080069138b88" uid="13249">
-        <specific value="1" description="Tu-128P Fiddler" deprecated="1" uuid="d4e3006e-5269-11df-822b-080069138b88" uid="13250"/>
-      </subcategory>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="d4e4b166-5269-11df-a8f3-080069138b88" uid="13251"/>
-      <subcategory value="13" description="Yak-28 Firebar" deprecated="1" uuid="d4e5c088-5269-11df-ae22-080069138b88" uid="13252">
-        <specific value="1" description="Yak-28P" deprecated="1" uuid="d4e6cfe6-5269-11df-85f8-080069138b88" uid="13253"/>
-        <specific value="2" description="Yak-28PA" deprecated="1" uuid="d4e7d7e2-5269-11df-aca2-080069138b88" uid="13254"/>
-        <specific value="3" description="Yak-28PB" deprecated="1" uuid="d4e8e95c-5269-11df-80f7-080069138b88" uid="13255"/>
-      </subcategory>
-      <subcategory value="14" description="MiG-19 Farmer" uuid="d4ea95fe-5269-11df-b849-080069138b88" uid="13256"/>
-      <subcategory value="15" description="MiG-17 Fresco" uuid="d4eba624-5269-11df-be09-080069138b88" uid="13257"/>
-      <subcategory value="16" description="MiG15 Fagot" uuid="d4ecae3e-5269-11df-9e16-080069138b88" uid="13258"/>
-    </category>
-    <category value="2" description="Attack/Strike" uuid="d4ee5aae-5269-11df-b90c-080069138b88" uid="13259">
-      <subcategory value="1" description="MiG-27 Flogger" uuid="d4ef6cc8-5269-11df-92a1-080069138b88" uid="13260">
-        <specific value="1" description="MiG-27 Flogger D" uuid="d4f07a64-5269-11df-b7de-080069138b88" uid="13261"/>
-        <specific value="2" description="MiG-27K Flogger D" uuid="d4f18242-5269-11df-8517-080069138b88" uid="13262"/>
-        <specific value="3" description="MiG-27D Flogger J" uuid="d4f29128-5269-11df-8783-080069138b88" uid="13263"/>
-        <specific value="4" description="MiG-27M (Bahadur-India)" uuid="d4f3a324-5269-11df-b6d2-080069138b88" uid="13264"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d4f558d6-5269-11df-bea9-080069138b88" uid="13265"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d4f66280-5269-11df-a162-080069138b88" uid="13266"/>
-      <subcategory value="4" description="Su-17 Fitter" uuid="d4f77684-5269-11df-8ef1-080069138b88" uid="13267">
-        <specific value="1" description="Su-17 (S-32, Fitter C)" uuid="d4f884d4-5269-11df-935b-080069138b88" uid="13268"/>
-        <specific value="2" description="Su-17M (S-32M, Fitter C)" uuid="d4f9937e-5269-11df-80b8-080069138b88" uid="13269"/>
-        <specific value="3" description="Su-17R Fitter C" uuid="d4fa9f9e-5269-11df-8dd9-080069138b88" uid="13270"/>
-        <specific value="4" description="Su-17M-2/M-2D (S-32M2, Fitter D)" uuid="d4fbae70-5269-11df-81c2-080069138b88" uid="13271"/>
-        <specific value="5" description="Su-17UM-2D (U-32, Fitter E)" uuid="d4fcbde2-5269-11df-a14a-080069138b88" uid="13272"/>
-        <specific value="6" description="Su-17UM-3 Fitter G" uuid="d4fdc606-5269-11df-a823-080069138b88" uid="13273"/>
-        <specific value="7" description="Su-17M-3 (S-52, Fitter H)" uuid="d4fed834-5269-11df-842f-080069138b88" uid="13274"/>
-        <specific value="8" description="Su-17-1/M-2 Fitter H" uuid="d4ffe742-5269-11df-8de3-080069138b88" uid="13275"/>
-        <specific value="9" description="Su-17M-4 (S-54, Fitter K)" uuid="d500f380-5269-11df-b330-080069138b88" uid="13276"/>
-      </subcategory>
-      <subcategory value="5" description="Su-20 Fitter C (Export Su-17)" uuid="d502a284-5269-11df-817c-080069138b88" uid="13277">
-        <specific value="1" description="Su-20 (S32Mk, Fitter-C)" uuid="d503b160-5269-11df-8586-080069138b88" uid="13278"/>
-        <specific value="2" description="Su-20R" uuid="d504c0c8-5269-11df-932d-080069138b88" uid="13279"/>
-      </subcategory>
-      <subcategory value="6" description="Su-22 Fitter" uuid="d5066f18-5269-11df-9309-080069138b88" uid="13280">
-        <specific value="1" description="Su-22U Fitter E" uuid="d5077606-5269-11df-8538-080069138b88" uid="13281"/>
-        <specific value="2" description="Su-22 Fitter F" uuid="d50887d0-5269-11df-aa9b-080069138b88" uid="13282"/>
-        <specific value="3" description="Su-22UM-3K Fitter G" uuid="d50995a8-5269-11df-a329-080069138b88" uid="13283"/>
-        <specific value="4" description="Su-22 Fitter G" uuid="d50a9d04-5269-11df-9f48-080069138b88" uid="13284"/>
-        <specific value="5" description="Su-22M-3 Fitter J" uuid="d50bae1a-5269-11df-a780-080069138b88" uid="13285"/>
-        <specific value="6" description="Su-22M-4 Fitter K" uuid="d50cbcc4-5269-11df-b04c-080069138b88" uid="13286"/>
-      </subcategory>
-      <subcategory value="7" description="Su-24 Fencer" uuid="d50e6ad8-5269-11df-8a8a-080069138b88" uid="13287">
-        <specific value="1" description="Su-24 Fencer B" uuid="d50f7662-5269-11df-bcb1-080069138b88" uid="13288"/>
-        <specific value="2" description="Su-24 Fencer C" uuid="d5108476-5269-11df-8bbc-080069138b88" uid="13289"/>
-        <specific value="3" description="Su-24MK Fencer D" uuid="d5119258-5269-11df-b845-080069138b88" uid="13290"/>
-        <specific value="4" description="Su-24MR Fencer E" uuid="d5129da6-5269-11df-994e-080069138b88" uid="13291"/>
-        <specific value="5" description="Su-24MP Fencer F" uuid="d513ab60-5269-11df-8645-080069138b88" uid="13292"/>
-        <specific value="6" description="Su-24K Fencer K" uuid="d514c23e-5269-11df-9775-080069138b88" uid="13293"/>
-      </subcategory>
-      <subcategory value="8" description="Su-25 Frogfoot" uuid="d51671ec-5269-11df-8ca8-080069138b88" uid="13294">
-        <specific value="1" description="Su-25 Frogfoot A" uuid="d5177a42-5269-11df-9b05-080069138b88" uid="13295"/>
-        <specific value="2" description="Su-25UB Frogfoot B" uuid="d51887b6-5269-11df-bbed-080069138b88" uid="13296"/>
-        <specific value="3" description="Su-25K (export &quot;A&quot;)" uuid="d51998a4-5269-11df-9832-080069138b88" uid="13297"/>
-        <specific value="4" description="Su-25UBK (export &quot;UB&quot;)" uuid="d51aa514-5269-11df-bd51-080069138b88" uid="13298"/>
-        <specific value="5" description="Su-25UT Frogfoot B" uuid="d51bb314-5269-11df-b2ac-080069138b88" uid="13299"/>
-        <specific value="6" description="Su-25UTG (tailhook)" uuid="d51cc2d6-5269-11df-90a5-080069138b88" uid="13300"/>
-        <specific value="7" description="Su-25T (Su-34) (antitank)" uuid="d51dcd70-5269-11df-a600-080069138b88" uid="13301"/>
-        <specific value="8" description="Su-25BM (target towing)" uuid="d51ede04-5269-11df-8a45-080069138b88" uid="13302"/>
-      </subcategory>
-      <subcategory value="9" description="Su-37 multirole fighter" uuid="d5208a60-5269-11df-9240-080069138b88" uid="13303"/>
-      <subcategory value="10" description="Yak-38 Forger" uuid="d5219888-5269-11df-b296-080069138b88" uid="13304">
-        <specific value="1" description="Yak-38 Forger A" uuid="d522a476-5269-11df-9c27-080069138b88" uid="13305"/>
-        <specific value="2" description="Yak-38 Forger B" uuid="d523b21c-5269-11df-af05-080069138b88" uid="13306"/>
-      </subcategory>
-      <subcategory value="11" description="Su-35" uuid="d5255d2e-5269-11df-b4d7-080069138b88" uid="13307"/>
-      <subcategory value="12" description="Su-7 Fitter A" uuid="d5266e44-5269-11df-8a95-080069138b88" uid="13308"/>
-    </category>
-    <category value="3" description="Bomber" uuid="d5281a14-5269-11df-907a-080069138b88" uid="13309">
-      <subcategory value="1" description="Tu-160 Blackjack" uuid="d5291fd6-5269-11df-9b9f-080069138b88" uid="13310"/>
-      <subcategory value="2" description="Tu-16 Badger" uuid="d52a3132-5269-11df-80bf-080069138b88" uid="13311">
-        <specific value="1" description="Tu-16A Badger A" uuid="d52b3e38-5269-11df-9595-080069138b88" uid="13312"/>
-        <specific value="2" description="Tu-16N Badger A, tanker" uuid="d52c4742-5269-11df-998f-080069138b88" uid="13313"/>
-        <specific value="3" description="Tu-16T Badger A, torpedo" uuid="d52d597a-5269-11df-a8f1-080069138b88" uid="13314"/>
-        <specific value="4" description="Tu-16KS-1 Badger B" uuid="d52e684c-5269-11df-b501-080069138b88" uid="13315"/>
-        <specific value="5" description="Tu-16 Korvet, Search and Rescue (SAR)" uuid="d52f7160-5269-11df-807f-080069138b88" uid="13316"/>
-        <specific value="6" description="Tu-16 K-10 Badger C" uuid="d5308424-5269-11df-9d3e-080069138b88" uid="13317"/>
-        <specific value="7" description="Tu-16R Badger D" uuid="d53191ac-5269-11df-8245-080069138b88" uid="13318"/>
-        <specific value="8" description="Tu-16 Badger E, photo reconnaissance" uuid="d532dca6-5269-11df-8aff-080069138b88" uid="13319"/>
-        <specific value="9" description="Tu-16R Badger F, ELINT" uuid="d533f852-5269-11df-a271-080069138b88" uid="13320"/>
-        <specific value="10" description="Tu-16 Badger-G, ASM carrier" uuid="d5350990-5269-11df-8cb5-080069138b88" uid="13321"/>
-        <specific value="11" description="Tu-16K Badger G Mod" uuid="d536198e-5269-11df-b00b-080069138b88" uid="13322"/>
-        <specific value="12" description="Tu-16PP Badger H, chaff dispenser" uuid="d53721bc-5269-11df-b677-080069138b88" uid="13323"/>
-        <specific value="13" description="Tu-16PP Badger J, ECM" uuid="d53834a8-5269-11df-a7a1-080069138b88" uid="13324"/>
-        <specific value="14" description="Tu-16R Badger K, reconnaissance" uuid="d5394438-5269-11df-ae22-080069138b88" uid="13325"/>
-        <specific value="15" description="Tu-16 Badger L, EW" uuid="d53a4f40-5269-11df-adff-080069138b88" uid="13326"/>
-      </subcategory>
-      <subcategory value="3" description="Tu-26 (Tu-22M) Backfire" uuid="d53bfe1c-5269-11df-8cab-080069138b88" uid="13327">
-        <specific value="1" description="Tu-22M-1 Backfire A" uuid="d53d0d70-5269-11df-9f4b-080069138b88" uid="13328"/>
-        <specific value="2" description="Tu-22M-2 Backfire B" uuid="d53e1d3c-5269-11df-97ea-080069138b88" uid="13329"/>
-        <specific value="3" description="Tu-22M-3 Backfire C" uuid="d53f2948-5269-11df-b7a7-080069138b88" uid="13330"/>
-      </subcategory>
-      <subcategory value="4" description="Tu-22 Blinder" uuid="d540d4f0-5269-11df-a6e5-080069138b88" uid="13331">
-        <specific value="1" description="Tu-22 Blinder-A" uuid="d541e5c0-5269-11df-8b43-080069138b88" uid="13332"/>
-        <specific value="2" description="Tu-22 Blinder-B" uuid="d542f406-5269-11df-9349-080069138b88" uid="13333"/>
-        <specific value="3" description="Tu-22 Blinder-C, reconnaissance" uuid="d543fb44-5269-11df-9389-080069138b88" uid="13334"/>
-        <specific value="4" description="Tu-22U Blinder-D" uuid="d5450d40-5269-11df-8395-080069138b88" uid="13335"/>
-        <specific value="5" description="Tu-22 Blinder-E, EW/reconnaissance" uuid="d5461bc2-5269-11df-a2cf-080069138b88" uid="13336"/>
-      </subcategory>
-      <subcategory value="5" description="Tu-95 or Tu-142 Bear" uuid="d547c8b4-5269-11df-a9ec-080069138b88" uid="13337">
-        <specific value="1" description="Tu-95 Bear D, sea reconnaissance" uuid="d548d4c0-5269-11df-8b54-080069138b88" uid="13338"/>
-        <specific value="2" description="Tu-95 Bear E (&quot;A&quot; conversion)" uuid="d549e374-5269-11df-a1b6-080069138b88" uid="13339"/>
-        <specific value="3" description="Tu-95 Bear G (&quot;B/C&quot; ELINT conversion)" uuid="d54af462-5269-11df-8ffe-080069138b88" uid="13340"/>
-        <specific value="4" description="Tu-95MS Bear H" uuid="d54c01c2-5269-11df-86ca-080069138b88" uid="13341"/>
-        <specific value="5" description="Tu-142 Bear F, ASW" uuid="d54d0f36-5269-11df-bc29-080069138b88" uid="13342"/>
-        <specific value="6" description="Tu-142 Bear F Mod 1" uuid="d54e1dc2-5269-11df-b68a-080069138b88" uid="13343"/>
-        <specific value="7" description="Tu-142M Bear F Mod 2" uuid="d54f28f2-5269-11df-a473-080069138b88" uid="13344"/>
-        <specific value="8" description="Tu-142 Bear F Mod 3" uuid="d550362a-5269-11df-b2f8-080069138b88" uid="13345"/>
-        <specific value="9" description="Tu-142 Bear F Mod 4" uuid="d5514c2c-5269-11df-a4ae-080069138b88" uid="13346"/>
-        <specific value="10" description="Tu-142 Bear J, VLF Communications" uuid="d55257ac-5269-11df-b806-080069138b88" uid="13347"/>
-        <specific value="11" description="Tu-142K Bear H" uuid="d5536b2e-5269-11df-9daa-080069138b88" uid="13348"/>
-      </subcategory>
-      <subcategory value="6" description="Il-28 Beagle" uuid="d5551668-5269-11df-933c-080069138b88" uid="13349"/>
-    </category>
-    <category value="4" description="Cargo/Tanker" uuid="d556c5bc-5269-11df-899a-080069138b88" uid="13350">
-      <subcategory value="1" description="An-124 Condor" uuid="d557d286-5269-11df-a4fd-080069138b88" uid="13351">
-        <specific value="1" description="An-124" uuid="d558da82-5269-11df-9dd4-080069138b88" uid="13352"/>
-      </subcategory>
-      <subcategory value="2" description="An-22 Cock" uuid="d55a8896-5269-11df-a21a-080069138b88" uid="13353">
-        <specific value="1" description="An-22" uuid="d55b9682-5269-11df-a862-080069138b88" uid="13354"/>
-      </subcategory>
-      <subcategory value="3" description="Il-76 Candid" uuid="d55d441e-5269-11df-9b69-080069138b88" uid="13355">
-        <specific value="1" description="Il-76 Candid A" uuid="d55e5426-5269-11df-9c57-080069138b88" uid="13356"/>
-        <specific value="2" description="Il-76T Candid A, civil reserve" uuid="d55f5baa-5269-11df-bd32-080069138b88" uid="13357"/>
-        <specific value="3" description="Il-76M Candid B" uuid="d5606acc-5269-11df-9039-080069138b88" uid="13358"/>
-        <specific value="4" description="Il-76TD Candid A, civil reserve" uuid="d5617bba-5269-11df-96eb-080069138b88" uid="13359"/>
-        <specific value="5" description="Il-76MD Candid B" uuid="d562849c-5269-11df-8c0b-080069138b88" uid="13360"/>
-      </subcategory>
-      <subcategory value="4" description="Il-20/22 Coot" uuid="d56430f8-5269-11df-9a9d-080069138b88" uid="13361">
-        <specific value="1" description="Il-20 Coot A, ELINT/recon (Il-18 variant)" uuid="d5654222-5269-11df-a666-080069138b88" uid="13362"/>
-        <specific value="2" description="Il-22 Coot B" uuid="d5665202-5269-11df-be7a-080069138b88" uid="13363"/>
-      </subcategory>
-      <subcategory value="5" description="An-12 Cub" uuid="d5680b24-5269-11df-b8dc-080069138b88" uid="13364">
-        <specific value="1" description="An-12BP" uuid="d5691564-5269-11df-a91c-080069138b88" uid="13365"/>
-        <specific value="2" description="An-12A Cub A, ELINT" uuid="d56a2314-5269-11df-96ba-080069138b88" uid="13366"/>
-        <specific value="3" description="An-12B Cub B, SNA ELINT" uuid="d56b2c0a-5269-11df-b180-080069138b88" uid="13367"/>
-        <specific value="4" description="An-12C Cub C, SNA ECM" uuid="d56c3a5a-5269-11df-a8dc-080069138b88" uid="13368"/>
-        <specific value="5" description="An-12D Cub D, SNA ECM" uuid="d56d4d0a-5269-11df-9ad3-080069138b88" uid="13369"/>
-      </subcategory>
-      <subcategory value="6" description="An-24 Coke" uuid="d56ef916-5269-11df-b423-080069138b88" uid="13370">
-        <specific value="1" description="An-24" uuid="d5700e78-5269-11df-810a-080069138b88" uid="13371"/>
-      </subcategory>
-      <subcategory value="7" description="An-26 Curl" uuid="d571bc50-5269-11df-8ee3-080069138b88" uid="13372">
-        <specific value="1" description="An-26 Curl A, manual" uuid="d572c848-5269-11df-bd49-080069138b88" uid="13373"/>
-        <specific value="2" description="An-26B Curl A, pallets" uuid="d573d62a-5269-11df-bd14-080069138b88" uid="13374"/>
-        <specific value="3" description="An-26 Curl B, SIGINT" uuid="d574e54c-5269-11df-8e7b-080069138b88" uid="13375"/>
-      </subcategory>
-      <subcategory value="8" description="An-32 Cline" uuid="d5769220-5269-11df-9cb0-080069138b88" uid="13376">
-        <specific value="1" description="An-32" uuid="d5779cf6-5269-11df-9f7d-080069138b88" uid="13377"/>
-        <specific value="2" description="An-32 Sutlej (India)" uuid="d578aace-5269-11df-b823-080069138b88" uid="13378"/>
-      </subcategory>
-      <subcategory value="9" description="An-70T" uuid="d57a5586-5269-11df-b01e-080069138b88" uid="13379">
-        <specific value="1" description="An-70T" uuid="d57b657a-5269-11df-85fe-080069138b88" uid="13380"/>
-      </subcategory>
-      <subcategory value="10" description="An-72 Coaler" uuid="d57d10c8-5269-11df-9f2a-080069138b88" uid="13381">
-        <specific value="1" description="An-72" uuid="d57e18b0-5269-11df-86af-080069138b88" uid="13382"/>
-      </subcategory>
-      <subcategory value="11" description="An-225 Cossack" uuid="d57fc58e-5269-11df-ba7b-080069138b88" uid="13383">
-        <specific value="1" description="An-225" uuid="d580d244-5269-11df-97b0-080069138b88" uid="13384"/>
-      </subcategory>
-      <subcategory value="12" description="Il-78 Midas" uuid="d58281c0-5269-11df-a527-080069138b88" uid="13385">
-        <specific value="1" description="Il-78 (tanker)" uuid="d5838ea8-5269-11df-9c77-080069138b88" uid="13386"/>
-      </subcategory>
-      <subcategory value="13" description="An-2/3 Colt" uuid="d5853974-5269-11df-808f-080069138b88" uid="13387">
-        <specific value="1" description="An-2 Colt" uuid="d58644fe-5269-11df-ac61-080069138b88" uid="13388"/>
-        <specific value="2" description="An-3 Colt" uuid="d5875236-5269-11df-97a4-080069138b88" uid="13389"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Antisubmarine/patrol/observation" uuid="d5899d20-5269-11df-b1da-080069138b88" uid="13390">
-      <subcategory value="1" description="II-38 May" uuid="d58aadfa-5269-11df-95b0-080069138b88" uid="13391">
-        <specific value="1" description="Il-38" uuid="d58bbc0e-5269-11df-9b5f-080069138b88" uid="13392"/>
-      </subcategory>
-      <subcategory value="2" description="Be-12 Mail" uuid="d58d6662-5269-11df-bbba-080069138b88" uid="13393">
-        <specific value="1" description="Be-12" uuid="d58e75b6-5269-11df-9fe5-080069138b88" uid="13394"/>
-      </subcategory>
-      <subcategory value="3" description="Be-42 Mermaid" uuid="d590287a-5269-11df-97d4-080069138b88" uid="13395">
-        <specific value="1" description="Be-42" uuid="d59130da-5269-11df-8b7f-080069138b88" uid="13396"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d592e060-5269-11df-a424-080069138b88" uid="13397"/>
-      <subcategory value="5" description="A-40 Albatross" uuid="d593ee42-5269-11df-9d55-080069138b88" uid="13398">
-        <specific value="1" description="A-40" uuid="d594fcec-5269-11df-be0d-080069138b88" uid="13399"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Surveillance/C2" uuid="d5974952-5269-11df-b92a-080069138b88" uid="13400">
-      <subcategory value="1" description="A-50 Mainstay" uuid="d5985662-5269-11df-ae3b-080069138b88" uid="13401">
-        <specific value="1" description="A-50 AEW&amp;C" uuid="d5995ddc-5269-11df-9bd9-080069138b88" uid="13402"/>
-      </subcategory>
-      <subcategory value="2" description="An-74 Madcap" uuid="d59b11ae-5269-11df-ae5c-080069138b88" uid="13403">
-        <specific value="1" description="An-74" uuid="d59c1e8c-5269-11df-9ab9-080069138b88" uid="13404"/>
-      </subcategory>
-      <subcategory value="3" description="TU-126 Moss" uuid="d59dc99e-5269-11df-bafa-080069138b88" uid="13405">
-        <specific value="1" description="Tu-126" uuid="d59ed6d6-5269-11df-8522-080069138b88" uid="13406"/>
-      </subcategory>
-    </category>
-    <category value="20" description="Attack helicopter" uuid="d5a122e2-5269-11df-82ec-080069138b88" uid="13407">
-      <subcategory value="1" description="Mi-28 Havoc" uuid="d5a231aa-5269-11df-b5c6-080069138b88" uid="13408">
-        <specific value="1" description="Mi-28" uuid="d5a33816-5269-11df-8216-080069138b88" uid="13409"/>
-      </subcategory>
-      <subcategory value="2" description="Mi-24/25/35 Hind" uuid="d5a4e6ac-5269-11df-bde7-080069138b88" uid="13410">
-        <specific value="1" description="Mi-24 Hind A" uuid="d5a5f3d0-5269-11df-95f1-080069138b88" uid="13411"/>
-        <specific value="2" description="Mi-24 Hind B" uuid="d5a70626-5269-11df-b63b-080069138b88" uid="13412"/>
-        <specific value="3" description="Mi-24 Hind C" uuid="d5a80cb0-5269-11df-80d9-080069138b88" uid="13413"/>
-        <specific value="4" description="Mi-24D Hind D (1st gunship)" uuid="d5a91a1a-5269-11df-b0d3-080069138b88" uid="13414"/>
-        <specific value="5" description="Mi-24W Hind E" uuid="d5aa2bf8-5269-11df-97a5-080069138b88" uid="13415"/>
-        <specific value="6" description="Mi-24P Hind F" uuid="d5ab348a-5269-11df-a1a0-080069138b88" uid="13416"/>
-        <specific value="7" description="Mi-24RSH Hind G1 (NBC armored)" uuid="d5ac4118-5269-11df-8a65-080069138b88" uid="13417"/>
-        <specific value="8" description="Mi-24RSH Hind G2 (reconnaissance/spotter)" uuid="d5ad5a58-5269-11df-b18e-080069138b88" uid="13418"/>
-        <specific value="9" description="Mi-25 (export Mi-24D)" uuid="d5ae6984-5269-11df-aaf2-080069138b88" uid="13419"/>
-        <specific value="10" description="Mi-35 (export Mi-24W)" uuid="d5af7874-5269-11df-bf21-080069138b88" uid="13420"/>
-        <specific value="11" description="Mi-35P (export Mi-24P)" uuid="d5b08516-5269-11df-a4be-080069138b88" uid="13421"/>
-      </subcategory>
-      <subcategory value="3" description="Ka-50 Hokum" uuid="d5b235b4-5269-11df-a4f5-080069138b88" uid="13422">
-        <specific value="1" description="Ka-50 Hokum A close air support" uuid="d5b33e32-5269-11df-9980-080069138b88" uid="13423"/>
-        <specific value="2" description="Ka-50 Hokum B tandem trainer" uuid="d5b44b4c-5269-11df-8e3c-080069138b88" uid="13424"/>
-      </subcategory>
-      <subcategory value="4" description="Ka-25 Hormone" uuid="d5b5fbea-5269-11df-88f5-080069138b88" uid="13425">
-        <specific value="1" description="Ka-25BSh Hormone A, ASW" uuid="d5b70896-5269-11df-83a9-080069138b88" uid="13426"/>
-        <specific value="2" description="Ka-25 Hormone B (targeting &amp; missile guidance)" uuid="d5b81178-5269-11df-b180-080069138b88" uid="13427"/>
-        <specific value="3" description="Ka-25PS Hormone C (targeting &amp; missile guidance)" uuid="d5b92112-5269-11df-9351-080069138b88" uid="13428"/>
-        <specific value="4" description="Ka-25PL Hormone A" uuid="d5ba352a-5269-11df-a3d5-080069138b88" uid="13429"/>
-        <specific value="5" description="Ka-25TS Hormone B" uuid="d5bb3d44-5269-11df-af12-080069138b88" uid="13430"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Utility helicopter" uuid="d5bd8c0c-5269-11df-b25e-080069138b88" uid="13431">
-      <subcategory value="1" description="Mi-8/9/17/171 Hip" uuid="d5be9728-5269-11df-962e-080069138b88" uid="13432">
-        <specific value="1" description="Mi-8 Hip C (assault)" uuid="d5bfa53c-5269-11df-b773-080069138b88" uid="13433"/>
-        <specific value="2" description="Mi-8 Hip D (airborne communications)" uuid="d5c0b314-5269-11df-a19f-080069138b88" uid="13434"/>
-        <specific value="3" description="Mi-8 Hip E &quot;C&quot; development, 12.7" uuid="d5c1bcdc-5269-11df-99aa-080069138b88" uid="13435"/>
-        <specific value="4" description="Mi-8TBK (Mi-17) (&quot;E&quot; uprated)" uuid="d5c2cf46-5269-11df-b3bb-080069138b88" uid="13436"/>
-        <specific value="5" description="Mi-8 Hip F (&quot;E&quot; export)" uuid="d5c3de5e-5269-11df-ae7f-080069138b88" uid="13437"/>
-        <specific value="6" description="Mi-8 Hip J (ECM)" uuid="d5c4e7b8-5269-11df-b8c4-080069138b88" uid="13438"/>
-        <specific value="7" description="Mi-8PP Hip K (ECM)" uuid="d5c5f7fc-5269-11df-a9b9-080069138b88" uid="13439"/>
-        <specific value="8" description="Mi-9 Hip G (special duty &amp; airborne communications)" uuid="d5c706ec-5269-11df-942f-080069138b88" uid="13440"/>
-        <specific value="9" description="Mi-17 Hip H (MI-8 update)" uuid="d5c8110e-5269-11df-bbdb-080069138b88" uid="13441"/>
-        <specific value="10" description="Mi-17P (Hip K derivative)" uuid="d5c92292-5269-11df-bbd1-080069138b88" uid="13442"/>
-        <specific value="11" description="Mi-171 Hip H (hospital)" uuid="d5ca30d8-5269-11df-bf8e-080069138b88" uid="13443"/>
-        <specific value="12" description="Mi-17 (EW)" uuid="d5cb3988-5269-11df-b2f8-080069138b88" uid="13444"/>
-      </subcategory>
-      <subcategory value="2" description="Mi-14 Haze" uuid="d5ccef08-5269-11df-b808-080069138b88" uid="13445">
-        <specific value="1" description="Mi-14PL Haze A (ASW)" uuid="d5cdfd1c-5269-11df-8afe-080069138b88" uid="13446"/>
-        <specific value="2" description="Mi-14PW (Polish Mi-14PL)" uuid="d5cf0b80-5269-11df-a803-080069138b88" uid="13447"/>
-        <specific value="3" description="Mi-14BT Haze B (MCM)" uuid="d5d01836-5269-11df-ba91-080069138b88" uid="13448"/>
-        <specific value="4" description="Mi-14PS Haze C (SAR)" uuid="d5d125be-5269-11df-969b-080069138b88" uid="13449"/>
-      </subcategory>
-      <subcategory value="3" description="Mi-26 Halo" uuid="d5d2d0da-5269-11df-bb69-080069138b88" uid="13450">
-        <specific value="1" description="Mi-26 heavy transport" uuid="d5d3e11e-5269-11df-9e4d-080069138b88" uid="13451"/>
-        <specific value="2" description="Mi-26TZ tanker" uuid="d5d4e960-5269-11df-b879-080069138b88" uid="13452"/>
-        <specific value="3" description="Mi-26 communications &amp; support" uuid="d5d5f7d8-5269-11df-bb0e-080069138b88" uid="13453"/>
-      </subcategory>
-      <subcategory value="4" description="Mi-6 Hook" uuid="d5d7a70e-5269-11df-a8eb-080069138b88" uid="13454">
-        <specific value="1" description="Mi-6 Hook A (export)" uuid="d5d8b2fc-5269-11df-bbcf-080069138b88" uid="13455"/>
-        <specific value="2" description="Mi-6 Hook B (command support)" uuid="d5d9bcc4-5269-11df-9b28-080069138b88" uid="13456"/>
-        <specific value="3" description="Mi-6 Hook C (&quot;B&quot; development, command support)" uuid="d5daccae-5269-11df-a4eb-080069138b88" uid="13457"/>
-      </subcategory>
-      <subcategory value="5" description="Mi-2 Hoplite" uuid="d5dc7e28-5269-11df-830d-080069138b88" uid="13458">
-        <specific value="1" description="Mi-2 (only mfg in Poland)" uuid="d5dd8b4c-5269-11df-a989-080069138b88" uid="13459"/>
-      </subcategory>
-      <subcategory value="6" description="Mi-4 Hound" uuid="d5df3762-5269-11df-b20a-080069138b88" uid="13460">
-        <specific value="1" description="Mi-4" uuid="d5e04062-5269-11df-942a-080069138b88" uid="13461"/>
-      </subcategory>
-      <subcategory value="7" description="Mi-10 Harke" uuid="d5e1ea8e-5269-11df-b917-080069138b88" uid="13462">
-        <specific value="1" description="Mi-10" uuid="d5e2f834-5269-11df-b92b-080069138b88" uid="13463"/>
-        <specific value="2" description="Mi-10K" uuid="d5e408b4-5269-11df-8fcf-080069138b88" uid="13464"/>
-      </subcategory>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="d5e5b290-5269-11df-9ee2-080069138b88" uid="13465"/>
-      <subcategory value="9" description="Ka-27/28/29 Helix" uuid="d5e6bc94-5269-11df-8009-080069138b88" uid="13466">
-        <specific value="1" description="Ka-27PL Helix A (ASW)" uuid="d5e7ce2c-5269-11df-a125-080069138b88" uid="13467"/>
-        <specific value="2" description="Ka-27PS Helix D (SAR)" uuid="d5e8dc90-5269-11df-9823-080069138b88" uid="13468"/>
-        <specific value="3" description="Ka-28 Helix A (export Ka-27PL)" uuid="d5e9e5ea-5269-11df-9b6e-080069138b88" uid="13469"/>
-        <specific value="4" description="Ka-29TB Helix B (EW &amp; assault)" uuid="d5eb01c8-5269-11df-9595-080069138b88" uid="13470"/>
-      </subcategory>
-      <subcategory value="10" description="Mi-34 Hermit" uuid="d5ecaf28-5269-11df-a66d-080069138b88" uid="13471">
-        <specific value="1" description="Mi-34 (1 engine)" uuid="d5edbbfc-5269-11df-96f1-080069138b88" uid="13472"/>
-        <specific value="2" description="Mi-34V (2 engine)" uuid="d5eec6be-5269-11df-9ff0-080069138b88" uid="13473"/>
-      </subcategory>
-      <subcategory value="11" description="Mi-38" uuid="d5f07162-5269-11df-8cfa-080069138b88" uid="13474">
-        <specific value="1" description="Mi-38 (2 turbine, replaces Mi-8/17)" uuid="d5f17e0e-5269-11df-bcc5-080069138b88" uid="13475"/>
-      </subcategory>
-      <subcategory value="12" description="Ka-26/126 Hoodlum" uuid="d5f32ccc-5269-11df-8e2a-080069138b88" uid="13476">
-        <specific value="1" description="Ka-26 Hoodlum A (reciprocating)" uuid="d5f439b4-5269-11df-9f4d-080069138b88" uid="13477"/>
-        <specific value="2" description="Ka-126 Hoodlum B (turbine)" uuid="d5f543d6-5269-11df-9443-080069138b88" uid="13478"/>
-      </subcategory>
-    </category>
-    <category value="40" description="Trainer" uuid="d5f79442-5269-11df-b19e-080069138b88" uid="13479">
-      <subcategory value="1" description="Tu-134 Crusty" uuid="d5f89af4-5269-11df-b72e-080069138b88" uid="13480">
-        <specific value="1" description="Tu-134UBL (bomber pilot)" uuid="d5f9abec-5269-11df-86bb-080069138b88" uid="13481"/>
-        <specific value="2" description="Tu-134Bsh (bomber navigator)" uuid="d5fabb40-5269-11df-a177-080069138b88" uid="13482"/>
-      </subcategory>
-      <subcategory value="2" description="Yak-18 Max" uuid="d5fc680a-5269-11df-adb9-080069138b88" uid="13483"/>
-    </category>
-    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="d5fe1362-5269-11df-8d87-080069138b88" uid="13484">
-      <subcategory value="1" description="Tupolev TU-154" deprecated="1" uuid="d5ff2086-5269-11df-82f0-080069138b88" uid="13485">
-        <specific value="1" description="TU-154M Careless" deprecated="1" uuid="d6002fbc-5269-11df-b31c-080069138b88" uid="13486"/>
-        <specific value="2" description="Illyuskin IL-62 Classic" deprecated="1" uuid="d6013e84-5269-11df-9887-080069138b88" uid="13487"/>
-        <specific value="3" description="Yakovlev YAK-42 Clobber" deprecated="1" uuid="d602477a-5269-11df-971f-080069138b88" uid="13488"/>
-      </subcategory>
-      <subcategory value="2" description="Passenger Airliner" uuid="d603f9c6-5269-11df-902f-080069138b88" uid="13489">
-        <specific value="1" description="Tupolev TU-154 Careless" uuid="d6050762-5269-11df-af87-080069138b88" uid="13490">
-          <extra value="1" description="Tupolev TU-154M Careless" uuid="d60612d8-5269-11df-badd-080069138b88" uid="13491"/>
-        </specific>
-        <specific value="2" description="Illyushin IL-62 Classic" uuid="d607c2ea-5269-11df-b3ec-080069138b88" uid="13492"/>
-        <specific value="3" description="Yakovlev Yak-42 Clobber" uuid="d608cc9e-5269-11df-a539-080069138b88" uid="13493"/>
-        <specific value="4" description="Illyushin IL-86 Camber" uuid="d609e214-5269-11df-9a9e-080069138b88" uid="13494"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="222" uuid="d60ccfba-5269-11df-a120-080069138b88" uid="13495">
-    <category value="1" description="Carrier" uuid="d60ddb8a-5269-11df-95a3-080069138b88" uid="13496">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d60ee6ce-5269-11df-8120-080069138b88" uid="13497"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d60ff64a-5269-11df-ad4d-080069138b88" uid="13498"/>
-      <subcategory value="3" description="Kuznetsov class (CV)" uuid="d6110404-5269-11df-a9bd-080069138b88" uid="13499">
-        <specific value="1" description="Admiral Kuznetsov (ex-Tbilisi, ex-Leonid Brezhnev)" uuid="d6121056-5269-11df-8f99-080069138b88" uid="13500"/>
-        <specific value="2" description="Varyag (ex-Riga)" uuid="d613200e-5269-11df-b617-080069138b88" uid="13501"/>
-      </subcategory>
-      <subcategory value="4" description="Modified Kiev class (CV)" uuid="d614cc74-5269-11df-a76e-080069138b88" uid="13502">
-        <specific value="1" description="Admiral Gorshkov (ex-Baku)" uuid="d615d934-5269-11df-91d8-080069138b88" uid="13503"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Guided-missile Cruiser" uuid="d6182752-5269-11df-8d3d-080069138b88" uid="13504">
-      <subcategory value="1" description="Slava class (CG)" uuid="d6193476-5269-11df-97ae-080069138b88" uid="13505">
-        <specific value="1" description="Slava" uuid="d61a3e66-5269-11df-999c-080069138b88" uid="13506"/>
-        <specific value="2" description="Marshal Ustinov" uuid="d61b4b9e-5269-11df-9743-080069138b88" uid="13507"/>
-        <specific value="3" description="Chervona Ukraina" uuid="d61c5840-5269-11df-8656-080069138b88" uid="13508"/>
-        <specific value="4" description="Vilna Ukraina" uuid="d61d6370-5269-11df-b340-080069138b88" uid="13509"/>
-      </subcategory>
-      <subcategory value="2" description="Kirov class" uuid="d61f0c8e-5269-11df-b3ff-080069138b88" uid="13510">
-        <specific value="1" description="Admiral Ushakov" uuid="d6201c78-5269-11df-908b-080069138b88" uid="13511"/>
-        <specific value="2" description="Admiral Lazarev" uuid="d621297e-5269-11df-9e2b-080069138b88" uid="13512"/>
-        <specific value="3" description="Admiral Nakimov" uuid="d62230da-5269-11df-ad2d-080069138b88" uid="13513"/>
-        <specific value="4" description="Peter Velikiy" uuid="d6234074-5269-11df-a717-080069138b88" uid="13514"/>
-      </subcategory>
-      <subcategory value="3" description="Kara class" uuid="d624ea78-5269-11df-8ba0-080069138b88" uid="13515">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="d625f724-5269-11df-9520-080069138b88" uid="13516"/>
-        <specific value="2" description="Ochakov" uuid="d627022c-5269-11df-a54d-080069138b88" uid="13517"/>
-        <specific value="3" description="Kerch" uuid="d62817ac-5269-11df-b681-080069138b88" uid="13518"/>
-        <specific value="4" description="Azov" uuid="d6292502-5269-11df-b009-080069138b88" uid="13519"/>
-        <specific value="5" description="Petropavlovsk" uuid="d62a2ff6-5269-11df-bce0-080069138b88" uid="13520"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="d62b3c66-5269-11df-9e4f-080069138b88" uid="13521"/>
-        <specific value="7" description="Vladivostok (ex-Tallinn)" uuid="d62c4b92-5269-11df-8355-080069138b88" uid="13522"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d62dfaa0-5269-11df-bb8c-080069138b88" uid="13523"/>
-      <subcategory value="5" description="Kresta I class" uuid="d62f04c2-5269-11df-b875-080069138b88" uid="13524">
-        <specific value="1" description="Admiral Zozulya" uuid="d630127c-5269-11df-ac5a-080069138b88" uid="13525"/>
-      </subcategory>
-      <subcategory value="6" description="Kynda class" uuid="d631bf28-5269-11df-9aa6-080069138b88" uid="13526">
-        <specific value="1" description="Grozny" uuid="d632d156-5269-11df-8572-080069138b88" uid="13527"/>
-        <specific value="2" description="Admiral Fokin" uuid="d633d786-5269-11df-9c0d-080069138b88" uid="13528"/>
-        <specific value="3" description="Admiral Golovko" uuid="d634e522-5269-11df-b761-080069138b88" uid="13529"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Guided-missile Destroyer" uuid="d637321e-5269-11df-8ac1-080069138b88" uid="13530">
-      <subcategory value="1" description="Udaloy class" uuid="d6383f9c-5269-11df-a393-080069138b88" uid="13531">
-        <specific value="1" description="Udaloy" uuid="d6394bb2-5269-11df-960e-080069138b88" uid="13532"/>
-        <specific value="2" description="Vitse Admiral Kulakov" uuid="d63a5c3c-5269-11df-88f0-080069138b88" uid="13533"/>
-        <specific value="3" description="Marshal Vasilevsky" uuid="d63b6474-5269-11df-824c-080069138b88" uid="13534"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="d63c7274-5269-11df-ad6d-080069138b88" uid="13535"/>
-        <specific value="5" description="Admiral Spiridonov" uuid="d63d80ce-5269-11df-85c3-080069138b88" uid="13536"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="d63e8cee-5269-11df-a2db-080069138b88" uid="13537"/>
-        <specific value="7" description="Marshal Shaposhnikov" uuid="d63f9d1e-5269-11df-9d7b-080069138b88" uid="13538"/>
-        <specific value="8" description="Simferopol (ex-Marshal Buokenny)" uuid="d640aa60-5269-11df-8bce-080069138b88" uid="13539"/>
-        <specific value="9" description="Admiral Levchenko" uuid="d641b40a-5269-11df-8e8e-080069138b88" uid="13540"/>
-        <specific value="10" description="Admiral Vinogradov" uuid="d642c4d0-5269-11df-aac0-080069138b88" uid="13541"/>
-        <specific value="11" description="Admiral Kharlamov" uuid="d643d258-5269-11df-aece-080069138b88" uid="13542"/>
-        <specific value="12" description="Admiral Panteleyev" uuid="d644d9b4-5269-11df-95a4-080069138b88" uid="13543"/>
-      </subcategory>
-      <subcategory value="2" description="Sovremennyy class" uuid="d646898a-5269-11df-87ed-080069138b88" uid="13544">
-        <specific value="1" description="Sovremennyy" uuid="d647a0c2-5269-11df-a345-080069138b88" uid="13545"/>
-        <specific value="2" description="Otchayannyy" uuid="d648ae86-5269-11df-b569-080069138b88" uid="13546"/>
-        <specific value="3" description="Otlichnny" uuid="d649b880-5269-11df-af3b-080069138b88" uid="13547"/>
-        <specific value="4" description="Osmotritelny" uuid="d64ac522-5269-11df-bf7e-080069138b88" uid="13548"/>
-        <specific value="5" description="Bezuprechny" uuid="d64bd214-5269-11df-97e5-080069138b88" uid="13549"/>
-        <specific value="6" description="Boyevoy" uuid="d64ce442-5269-11df-b546-080069138b88" uid="13550"/>
-        <specific value="7" description="Stoyky" uuid="d64df40e-5269-11df-a43a-080069138b88" uid="13551"/>
-        <specific value="8" description="Okrylenny" uuid="d64f0092-5269-11df-986b-080069138b88" uid="13552"/>
-        <specific value="9" description="Burny" uuid="d650083e-5269-11df-b0b4-080069138b88" uid="13553"/>
-        <specific value="10" description="Gremyashchy" uuid="d6511788-5269-11df-a3ec-080069138b88" uid="13554"/>
-        <specific value="11" description="Bystry" uuid="d65224c0-5269-11df-ada4-080069138b88" uid="13555"/>
-        <specific value="12" description="Rastoropny" uuid="d6532bea-5269-11df-953b-080069138b88" uid="13556"/>
-        <specific value="13" description="Bezboyaznenny" uuid="d6543c4c-5269-11df-a0f8-080069138b88" uid="13557"/>
-        <specific value="14" description="Bezuderzhny" uuid="d6554830-5269-11df-9251-080069138b88" uid="13558"/>
-        <specific value="15" description="Bespokoiny" uuid="d6565176-5269-11df-b2f7-080069138b88" uid="13559"/>
-        <specific value="16" description="Nastoichivyy" uuid="d6575f80-5269-11df-b78f-080069138b88" uid="13560"/>
-        <specific value="17" description="Besstrashnyy" uuid="d6586bdc-5269-11df-9c10-080069138b88" uid="13561"/>
-        <specific value="18" description="Vazhnyy" uuid="d65977a2-5269-11df-88e7-080069138b88" uid="13562"/>
-        <specific value="19" description="Udumchivyy" uuid="d65a841c-5269-11df-a734-080069138b88" uid="13563"/>
-        <specific value="20" description="136 Hangzhou (China) (ex-Vazhny)" uuid="d65b919a-5269-11df-9c88-080069138b88" uid="13564"/>
-        <specific value="21" description="137 Fuzhou (China) (ex-Alexandr Nevsky)" uuid="d65c9e32-5269-11df-89c7-080069138b88" uid="13565"/>
-      </subcategory>
-      <subcategory value="3" description="Modified Kashin class" uuid="d65e4bba-5269-11df-80c5-080069138b88" uid="13566">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="d65f5a64-5269-11df-aa4d-080069138b88" uid="13567"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="d6606ad0-5269-11df-9d2d-080069138b88" uid="13568"/>
-        <specific value="3" description="Sderzhandoyy" uuid="d661747a-5269-11df-95c6-080069138b88" uid="13569"/>
-      </subcategory>
-      <subcategory value="4" description="Kashin class" uuid="d6632004-5269-11df-82cb-080069138b88" uid="13570">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="d6643e80-5269-11df-915e-080069138b88" uid="13571"/>
-        <specific value="2" description="Krasnyy Kavkaz" uuid="d66559f0-5269-11df-bfa1-080069138b88" uid="13572"/>
-        <specific value="3" description="Krasnyy Krym" uuid="d666639a-5269-11df-9ad7-080069138b88" uid="13573"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="d667753c-5269-11df-9ccc-080069138b88" uid="13574"/>
-        <specific value="5" description="(deprecated)" deprecated="1" uuid="d66884f4-5269-11df-b2ec-080069138b88" uid="13575"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="d6698c64-5269-11df-8d9e-080069138b88" uid="13576"/>
-        <specific value="7" description="(deprecated)" deprecated="1" uuid="d66a9bf4-5269-11df-9e7c-080069138b88" uid="13577"/>
-        <specific value="8" description="Skoryy" uuid="d66badd2-5269-11df-9dc4-080069138b88" uid="13578"/>
-        <specific value="9" description="Smetlivvy" uuid="d66cb4f2-5269-11df-83ad-080069138b88" uid="13579"/>
-      </subcategory>
-      <subcategory value="5" description="Udaloy II" uuid="d66e5ea6-5269-11df-bc22-080069138b88" uid="13580">
-        <specific value="1" description="Admiral Chabenenko" uuid="d66f6ce2-5269-11df-a695-080069138b88" uid="13581"/>
-      </subcategory>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="d6711c86-5269-11df-b11e-080069138b88" uid="13582"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d6722a9a-5269-11df-ab81-080069138b88" uid="13583"/>
-      <subcategory value="8" description="SAM Kotlin class" uuid="d67332dc-5269-11df-96d5-080069138b88" uid="13584">
-        <specific value="1" description="Bravyy" uuid="d67440d2-5269-11df-997e-080069138b88" uid="13585"/>
-        <specific value="2" description="Nakhodchivyy" uuid="d6755300-5269-11df-9b2d-080069138b88" uid="13586"/>
-        <specific value="3" description="Nastochivyy" uuid="d6765cd2-5269-11df-b3f4-080069138b88" uid="13587"/>
-        <specific value="4" description="Hesokrushimyy" uuid="d6776aaa-5269-11df-bc17-080069138b88" uid="13588"/>
-        <specific value="5" description="Skromnyy" uuid="d6787a76-5269-11df-a961-080069138b88" uid="13589"/>
-        <specific value="6" description="Skrytnyy" uuid="d67981be-5269-11df-aa61-080069138b88" uid="13590"/>
-        <specific value="7" description="Soznatel'nyy" uuid="d67a8da2-5269-11df-b55a-080069138b88" uid="13591"/>
-        <specific value="8" description="Vozbuzhdennyy" uuid="d67b9b48-5269-11df-ad52-080069138b88" uid="13592"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided-missile Frigate (includes Corvette)" uuid="d67de86c-5269-11df-b8a2-080069138b88" uid="13593">
-      <subcategory value="1" description="Krivak I class" uuid="d67ef75c-5269-11df-8ab8-080069138b88" uid="13594">
-        <specific value="1" description="Bditelny" uuid="d6800174-5269-11df-821c-080069138b88" uid="13595"/>
-        <specific value="2" description="Bezukoriznenny" uuid="d6810dc6-5269-11df-9ff6-080069138b88" uid="13596"/>
-        <specific value="3" description="Bezzavetny" uuid="d6821b12-5269-11df-9abb-080069138b88" uid="13597"/>
-        <specific value="4" description="Bodry" uuid="d6832106-5269-11df-950f-080069138b88" uid="13598"/>
-        <specific value="5" description="Deyatelny" uuid="d6843744-5269-11df-84ef-080069138b88" uid="13599"/>
-        <specific value="6" description="Doblestny" uuid="d6854a8a-5269-11df-a82d-080069138b88" uid="13600"/>
-        <specific value="7" description="Dostoyny" uuid="d6865240-5269-11df-baf6-080069138b88" uid="13601"/>
-        <specific value="8" description="Druzhny" uuid="d6875ee2-5269-11df-a731-080069138b88" uid="13602"/>
-        <specific value="9" description="Ladny" uuid="d6886d0a-5269-11df-abfd-080069138b88" uid="13603"/>
-        <specific value="10" description="Legky" uuid="d689770e-5269-11df-8cf4-080069138b88" uid="13604"/>
-        <specific value="11" description="(deprecated)" deprecated="1" uuid="d68a8388-5269-11df-beaf-080069138b88" uid="13605"/>
-        <specific value="12" description="Letuchy" uuid="d68b939a-5269-11df-a62e-080069138b88" uid="13606"/>
-        <specific value="13" description="(deprecated)" deprecated="1" uuid="d68c9d94-5269-11df-a64a-080069138b88" uid="13607"/>
-        <specific value="14" description="Razumny" uuid="d68dad4c-5269-11df-a083-080069138b88" uid="13608"/>
-        <specific value="15" description="Razyashchiy" uuid="d68eb9a8-5269-11df-b2ef-080069138b88" uid="13609"/>
-        <specific value="16" description="Retivy" uuid="d68fc4ce-5269-11df-9f06-080069138b88" uid="13610"/>
-        <specific value="17" description="Silnyy" uuid="d690d184-5269-11df-b021-080069138b88" uid="13611"/>
-        <specific value="18" description="Storozhevoy" uuid="d691dd86-5269-11df-8d59-080069138b88" uid="13612"/>
-        <specific value="19" description="Svirepyy" uuid="d692e942-5269-11df-a514-080069138b88" uid="13613"/>
-        <specific value="20" description="Zadorny" uuid="d693f5e4-5269-11df-8bfe-080069138b88" uid="13614"/>
-        <specific value="21" description="Zharky" uuid="d69503b2-5269-11df-bb7e-080069138b88" uid="13615"/>
-        <specific value="22" description="Pylky" uuid="d6960a64-5269-11df-adae-080069138b88" uid="13616"/>
-        <specific value="23" description="Poryvisty" uuid="d697188c-5269-11df-9786-080069138b88" uid="13617"/>
-      </subcategory>
-      <subcategory value="2" description="Krivak II class" uuid="d698c7fe-5269-11df-b805-080069138b88" uid="13618">
-        <specific value="1" description="Bessmenny" deprecated="1" uuid="d699d518-5269-11df-bd10-080069138b88" uid="13619"/>
-        <specific value="2" description="Gordelivy" deprecated="1" uuid="d69adcce-5269-11df-ab2f-080069138b88" uid="13620"/>
-        <specific value="3" description="Gromky" deprecated="1" uuid="d69beca4-5269-11df-8ea0-080069138b88" uid="13621"/>
-        <specific value="4" description="Grozyashchy" deprecated="1" uuid="d69cf96e-5269-11df-b88d-080069138b88" uid="13622"/>
-        <specific value="5" description="Neukrotimy" uuid="d69e05d4-5269-11df-b008-080069138b88" uid="13623"/>
-        <specific value="6" description="Pitlivy" uuid="d69f137a-5269-11df-ae1e-080069138b88" uid="13624"/>
-        <specific value="7" description="Razitelny" deprecated="1" uuid="d6a023a0-5269-11df-a6bb-080069138b88" uid="13625"/>
-        <specific value="8" description="Revnosttny" deprecated="1" uuid="d6a12cb4-5269-11df-a86f-080069138b88" uid="13626"/>
-        <specific value="9" description="Rezky" deprecated="1" uuid="d6a239ba-5269-11df-b022-080069138b88" uid="13627"/>
-        <specific value="10" description="Rezvy" deprecated="1" uuid="d6a351a6-5269-11df-8f70-080069138b88" uid="13628"/>
-        <specific value="11" description="Ryanny" deprecated="1" uuid="d6a45ff6-5269-11df-9bd1-080069138b88" uid="13629"/>
-      </subcategory>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d6a60c70-5269-11df-8ecc-080069138b88" uid="13630"/>
-      <subcategory value="4" description="Neustrashimy class (FFG)" uuid="d6a71a02-5269-11df-8778-080069138b88" uid="13631">
-        <specific value="1" description="Neustrashimy" uuid="d6a82bf4-5269-11df-8659-080069138b88" uid="13632"/>
-        <specific value="2" description="Nepristupnyy" uuid="d6a93328-5269-11df-ac97-080069138b88" uid="13633"/>
-      </subcategory>
-      <subcategory value="5" description="Tarantul I class (Corvette)" uuid="d6aaddc2-5269-11df-bd9d-080069138b88" uid="13634"/>
-      <subcategory value="6" description="Tarantul II class (Corvette)" uuid="d6abf018-5269-11df-9704-080069138b88" uid="13635"/>
-      <subcategory value="7" description="Nanuchka I class (Corvette)" uuid="d6acfec2-5269-11df-b338-080069138b88" uid="13636">
-        <specific value="1" description="Grad" uuid="d6ae08d0-5269-11df-b1d9-080069138b88" uid="13637"/>
-        <specific value="2" description="Raduga" uuid="d6af1478-5269-11df-b180-080069138b88" uid="13638"/>
-        <specific value="3" description="Suval" uuid="d6b02516-5269-11df-9669-080069138b88" uid="13639"/>
-        <specific value="4" description="Storm" uuid="d6b12c9a-5269-11df-bd1d-080069138b88" uid="13640"/>
-        <specific value="5" description="Taifun" uuid="d6b237e8-5269-11df-a9ec-080069138b88" uid="13641"/>
-        <specific value="6" description="Zyklon" uuid="d6b34660-5269-11df-ae2b-080069138b88" uid="13642"/>
-        <specific value="7" description="Metl" uuid="d6b45244-5269-11df-a6a9-080069138b88" uid="13643"/>
-        <specific value="8" description="Zarnitsa" uuid="d6b55ee6-5269-11df-9629-080069138b88" uid="13644"/>
-        <specific value="9" description="Grom" uuid="d6b66a98-5269-11df-b8b5-080069138b88" uid="13645"/>
-        <specific value="10" description="Molnija" uuid="d6b772bc-5269-11df-9ce7-080069138b88" uid="13646"/>
-        <specific value="11" description="Musson" uuid="d6b88396-5269-11df-a740-080069138b88" uid="13647"/>
-        <specific value="12" description="Vichr" uuid="d6b98fd4-5269-11df-a682-080069138b88" uid="13648"/>
-        <specific value="13" description="Bora" uuid="d6ba9636-5269-11df-a9e5-080069138b88" uid="13649"/>
-        <specific value="14" description="Briz" uuid="d6bba698-5269-11df-b2f3-080069138b88" uid="13650"/>
-      </subcategory>
-      <subcategory value="8" description="Nanuchka III class (Corvette)" uuid="d6bd51b4-5269-11df-8d28-080069138b88" uid="13651">
-        <specific value="1" description="Mirazh-617" uuid="d6be5f14-5269-11df-a012-080069138b88" uid="13652"/>
-        <specific value="2" description="Zyb-560" uuid="d6bf6a44-5269-11df-92d4-080069138b88" uid="13653"/>
-        <specific value="3" description="Tucha" deprecated="1" uuid="d6c077ae-5269-11df-abb9-080069138b88" uid="13654"/>
-        <specific value="4" description="Priliv Burun-562" uuid="d6c18e0a-5269-11df-8f2d-080069138b88" uid="13655"/>
-        <specific value="5" description="Burun-566" uuid="d6c29548-5269-11df-8c8e-080069138b88" uid="13656"/>
-        <specific value="6" description="Liven-551" uuid="d6c3a514-5269-11df-b0e5-080069138b88" uid="13657"/>
-        <specific value="7" description="Passat-570" uuid="d6c4b5f8-5269-11df-a688-080069138b88" uid="13658"/>
-        <specific value="8" description="Moroz-409" uuid="d6c5bc3c-5269-11df-a9f2-080069138b88" uid="13659"/>
-        <specific value="9" description="Smerch-423" uuid="d6c6c9ba-5269-11df-b5f2-080069138b88" uid="13660"/>
-        <specific value="10" description="Inej-432" uuid="d6c7d8be-5269-11df-91bd-080069138b88" uid="13661"/>
-        <specific value="11" description="Rasssvet-520" uuid="d6c8e100-5269-11df-87bf-080069138b88" uid="13662"/>
-        <specific value="12" description="Razliv-450" uuid="d6c9ed84-5269-11df-94fa-080069138b88" uid="13663"/>
-        <specific value="13" description="Veter" uuid="d6caff08-5269-11df-9803-080069138b88" uid="13664"/>
-      </subcategory>
-      <subcategory value="9" description="Nanuchka IV class (Corvette)" uuid="d6ccac18-5269-11df-a983-080069138b88" uid="13665"/>
-      <subcategory value="10" description="Tarantul III class (Corvette)" uuid="d6cdb676-5269-11df-9b1e-080069138b88" uid="13666"/>
-      <subcategory value="11" description="Gepard Class" uuid="d6cec49e-5269-11df-9fd2-080069138b88" uid="13667">
-        <specific value="1" description="Gepard" uuid="d6cfd5d2-5269-11df-8847-080069138b88" uid="13668"/>
-      </subcategory>
-      <subcategory value="12" description="Nanuchka II class (Corvette)" uuid="d6d18062-5269-11df-8b05-080069138b88" uid="13669"/>
-    </category>
-    <category value="7" description="Light/Patrol craft" uuid="d6d3315a-5269-11df-b0e1-080069138b88" uid="13670">
-      <subcategory value="1" description="2/3 T 58 PGF/PGR class (patrol)" uuid="d6d43898-5269-11df-8b1f-080069138b88" uid="13671"/>
-      <subcategory value="2" description="Dergach class (light missile force)" uuid="d6d54774-5269-11df-a923-080069138b88" uid="13672">
-        <specific value="1" description="Sivuch" uuid="d6d659e8-5269-11df-b1a8-080069138b88" uid="13673"/>
-      </subcategory>
-      <subcategory value="3" description="OSA I class" uuid="d6d804dc-5269-11df-8e95-080069138b88" uid="13674"/>
-      <subcategory value="4" description="OSA II class" uuid="d6d90fe4-5269-11df-b54b-080069138b88" uid="13675"/>
-      <subcategory value="5" description="Poti class (fast attack craft--patrol)" uuid="d6da1e70-5269-11df-89aa-080069138b88" uid="13676"/>
-      <subcategory value="6" description="Svetlyak class (fast attack craft--patrol)" uuid="d6db2e50-5269-11df-9caf-080069138b88" uid="13677"/>
-      <subcategory value="7" description="Pauk I class (fast attack craft--patrol)" uuid="d6dc3962-5269-11df-92ff-080069138b88" uid="13678"/>
-      <subcategory value="8" description="Zhuk class" uuid="d6dd4a32-5269-11df-bd3c-080069138b88" uid="13679"/>
-      <subcategory value="9" description="Yaz class" uuid="d6de5a76-5269-11df-9a16-080069138b88" uid="13680"/>
-      <subcategory value="10" description="Stenka class" uuid="d6df61b4-5269-11df-883f-080069138b88" uid="13681"/>
-      <subcategory value="11" description="Piyavka class (river patrol craft)" uuid="d6e07860-5269-11df-8c96-080069138b88" uid="13682"/>
-      <subcategory value="12" description="SO 1 class" uuid="d6e18a3e-5269-11df-bc26-080069138b88" uid="13683"/>
-      <subcategory value="13" description="Shmel class (river patrol craft)" uuid="d6e295c8-5269-11df-8c34-080069138b88" uid="13684"/>
-      <subcategory value="14" description="TR 40 class (river patrol craft)" uuid="d6e3a5da-5269-11df-9bac-080069138b88" uid="13685"/>
-      <subcategory value="15" description="Command ship (river patrol craft)" uuid="d6e4b7cc-5269-11df-95be-080069138b88" uid="13686">
-        <specific value="1" description="SSV-10" uuid="d6e5c1ee-5269-11df-943f-080069138b88" uid="13687"/>
-      </subcategory>
-      <subcategory value="16" description="Potok class (torpedo experimental ships)" uuid="d6e7705c-5269-11df-8606-080069138b88" uid="13688">
-        <specific value="1" description="OS-100" uuid="d6e87e0c-5269-11df-b7ad-080069138b88" uid="13689"/>
-        <specific value="2" description="OS-138" uuid="d6e98b62-5269-11df-8878-080069138b88" uid="13690"/>
-        <specific value="3" description="OS-145" uuid="d6ea96f6-5269-11df-8a91-080069138b88" uid="13691"/>
-        <specific value="4" description="OS-225" uuid="d6eba366-5269-11df-9083-080069138b88" uid="13692"/>
-      </subcategory>
-      <subcategory value="17" description="Shelon class (torpedo operating/patrol &amp; target craft)" uuid="d6ed4f40-5269-11df-b650-080069138b88" uid="13693">
-        <specific value="1" description="YPT Weapon Recovery" uuid="d6ee62e0-5269-11df-b54b-080069138b88" uid="13694"/>
-        <specific value="2" description="Shelon II (Environmental Research)" uuid="d6ef6ba4-5269-11df-a376-080069138b88" uid="13695"/>
-      </subcategory>
-      <subcategory value="18" description="Poluchat I/II/III classes (torpedo operating/patrol &amp; target craft)" uuid="d6f119b8-5269-11df-9fa4-080069138b88" uid="13696"/>
-      <subcategory value="19" description="Pozharny I class" uuid="d6f22a38-5269-11df-99c1-080069138b88" uid="13697"/>
-      <subcategory value="20" description="Iva class (fire/patrol craft)" uuid="d6f33e00-5269-11df-afd5-080069138b88" uid="13698">
-        <specific value="1" description="PZHK 415" uuid="d6f446ec-5269-11df-a26d-080069138b88" uid="13699"/>
-        <specific value="2" description="1514" uuid="d6f55262-5269-11df-9fb9-080069138b88" uid="13700"/>
-        <specific value="3" description="1544" uuid="d6f65fb8-5269-11df-a943-080069138b88" uid="13701"/>
-        <specific value="4" description="1547" uuid="d6f76a52-5269-11df-bb56-080069138b88" uid="13702"/>
-        <specific value="5" description="1859" uuid="d6f87712-5269-11df-9ab6-080069138b88" uid="13703"/>
-      </subcategory>
-      <subcategory value="21" description="Vikhr class" uuid="d6fa213e-5269-11df-964c-080069138b88" uid="13704"/>
-      <subcategory value="22" description="Vosh class (river patrol craft)" uuid="d6fb3290-5269-11df-b430-080069138b88" uid="13705"/>
-      <subcategory value="23" description="Shershen class" uuid="d6fc455e-5269-11df-b546-080069138b88" uid="13706"/>
-      <subcategory value="24" description="Komar class" uuid="d6fd5930-5269-11df-a03a-080069138b88" uid="13707"/>
-      <subcategory value="25" description="Matka class" uuid="d6fe665e-5269-11df-939a-080069138b88" uid="13708"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship / Craft" uuid="d700205c-5269-11df-9bdd-080069138b88" uid="13709">
-      <subcategory value="1" description="Alesha Class" uuid="d7012916-5269-11df-a5de-080069138b88" uid="13710">
-        <specific value="1" description="Pripyat" uuid="d7023982-5269-11df-a0e4-080069138b88" uid="13711"/>
-        <specific value="2" description="Vychegda" uuid="d70346ec-5269-11df-84ce-080069138b88" uid="13712"/>
-        <specific value="3" description="Pechora" uuid="d70452b2-5269-11df-ad7f-080069138b88" uid="13713"/>
-      </subcategory>
-      <subcategory value="2" description="Natya I class" uuid="d705fd74-5269-11df-abf2-080069138b88" uid="13714">
-        <specific value="1" description="Dizelist" uuid="d70708ea-5269-11df-b9fa-080069138b88" uid="13715"/>
-        <specific value="2" description="Miner" uuid="d7081960-5269-11df-b718-080069138b88" uid="13716"/>
-        <specific value="3" description="Starshkiy" uuid="d7092058-5269-11df-8ccf-080069138b88" uid="13717"/>
-        <specific value="4" description="Snaypr" uuid="d70a2db8-5269-11df-901d-080069138b88" uid="13718"/>
-        <specific value="5" description="Elektrik" uuid="d70b3a3c-5269-11df-a2b4-080069138b88" uid="13719"/>
-        <specific value="6" description="Motorist" uuid="d70c45a8-5269-11df-a4cc-080069138b88" uid="13720"/>
-        <specific value="7" description="Signalshik" uuid="d70d5236-5269-11df-b6a7-080069138b88" uid="13721"/>
-        <specific value="8" description="Turbinist" uuid="d70e5e1a-5269-11df-a975-080069138b88" uid="13722"/>
-        <specific value="9" description="Polemetchiz" uuid="d70f692c-5269-11df-8e6c-080069138b88" uid="13723"/>
-        <specific value="10" description="Rulevoy" uuid="d7107646-5269-11df-b0d2-080069138b88" uid="13724"/>
-        <specific value="11" description="Zapal" uuid="d71182de-5269-11df-bb2c-080069138b88" uid="13725"/>
-        <specific value="12" description="Zenitchik" uuid="d7128a44-5269-11df-88c1-080069138b88" uid="13726"/>
-        <specific value="13" description="Radist" uuid="d713993e-5269-11df-9b05-080069138b88" uid="13727"/>
-        <specific value="14" description="Dobrotay" uuid="d714aa72-5269-11df-8ea3-080069138b88" uid="13728"/>
-        <specific value="15" description="Zaryad" uuid="d715b08e-5269-11df-91a9-080069138b88" uid="13729"/>
-      </subcategory>
-      <subcategory value="3" description="Natya II class" uuid="d7175b14-5269-11df-8554-080069138b88" uid="13730"/>
-      <subcategory value="4" description="Yurka class" uuid="d7186a54-5269-11df-b128-080069138b88" uid="13731">
-        <specific value="1" description="Gafel" uuid="d7197ba6-5269-11df-9ff2-080069138b88" uid="13732"/>
-        <specific value="2" description="Evgeniy Nikonov" uuid="d71a8262-5269-11df-8c28-080069138b88" uid="13733"/>
-        <specific value="3" description="Mazlov" uuid="d71b8fb8-5269-11df-9267-080069138b88" uid="13734"/>
-        <specific value="4" description="Navodchik" uuid="d71ca024-5269-11df-bb5c-080069138b88" uid="13735"/>
-        <specific value="5" description="Semen Rosal" uuid="d71db04a-5269-11df-84da-080069138b88" uid="13736"/>
-      </subcategory>
-      <subcategory value="5" description="T-43 class" uuid="d71f5ca6-5269-11df-ad5b-080069138b88" uid="13737"/>
-      <subcategory value="6" description="Sonya class" uuid="d7206b00-5269-11df-a3de-080069138b88" uid="13738"/>
-      <subcategory value="7" description="Baltika class" uuid="d7217cd4-5269-11df-98b4-080069138b88" uid="13739"/>
-      <subcategory value="8" description="Vanya I class" uuid="d7228430-5269-11df-82af-080069138b88" uid="13740"/>
-      <subcategory value="9" description="Vanya II class" uuid="d7239208-5269-11df-9109-080069138b88" uid="13741"/>
-      <subcategory value="10" description="Sasha class" uuid="d724a1ca-5269-11df-8a5a-080069138b88" uid="13742"/>
-      <subcategory value="11" description="Yevgenya class" uuid="d725ab42-5269-11df-bbd6-080069138b88" uid="13743"/>
-      <subcategory value="12" description="Pelikan class ACV (minesweeper, inshore)" uuid="d726b906-5269-11df-99d8-080069138b88" uid="13744"/>
-      <subcategory value="13" description="Lida class (minehunter, inshore)" uuid="d727cce2-5269-11df-b173-080069138b88" uid="13745"/>
-      <subcategory value="14" description="Ilyusha class (minesweeper, inshore)" uuid="d728d736-5269-11df-a641-080069138b88" uid="13746"/>
-      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="d729e658-5269-11df-a4b7-080069138b88" uid="13747"/>
-      <subcategory value="16" description="Olya class (minesweeper, inshore)" uuid="d72af692-5269-11df-94bf-080069138b88" uid="13748"/>
-      <subcategory value="17" description="Tanya class (minesweeper, inshore)" uuid="d72c0492-5269-11df-b5c6-080069138b88" uid="13749"/>
-      <subcategory value="18" description="K 8 class (minesweeping boat)" uuid="d72d1382-5269-11df-9174-080069138b88" uid="13750"/>
-      <subcategory value="19" description="Gorya class (minehunter, ocean)" uuid="d72e2268-5269-11df-8b37-080069138b88" uid="13751">
-        <specific value="1" description="Zheleznyakov" uuid="d72f2a46-5269-11df-80c2-080069138b88" uid="13752"/>
-      </subcategory>
-    </category>
-    <category value="9" description="Dock landing ship" uuid="d7317ddc-5269-11df-855b-080069138b88" uid="13753">
-      <subcategory value="1" description="Ivan Rogov class" uuid="d7328510-5269-11df-93c6-080069138b88" uid="13754">
-        <specific value="1" description="Ivan Rogov" uuid="d7339248-5269-11df-b4c1-080069138b88" uid="13755"/>
-        <specific value="2" description="Aleksandr Nikolay" uuid="d734a0b6-5269-11df-bd08-080069138b88" uid="13756"/>
-        <specific value="3" description="Mitrofan Moskalenko" uuid="d735ac40-5269-11df-8110-080069138b88" uid="13757"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Tank landing ship" uuid="d737f9e6-5269-11df-ab16-080069138b88" uid="13758">
-      <subcategory value="1" description="Ropucha class" uuid="d7390368-5269-11df-93ee-080069138b88" uid="13759">
-        <specific value="1" description="Aleksandr Shabalin" uuid="d73a0ff6-5269-11df-b7b8-080069138b88" uid="13760"/>
-        <specific value="2" description="Constantin Olshanskiy" uuid="d73b1e46-5269-11df-807e-080069138b88" uid="13761"/>
-        <specific value="3" description="Tsesar Kunikov" uuid="d73c2fe8-5269-11df-bc87-080069138b88" uid="13762"/>
-        <specific value="4" description="Bobruisk" uuid="d73d3d5c-5269-11df-83ae-080069138b88" uid="13763"/>
-      </subcategory>
-      <subcategory value="2" description="Alligator class" uuid="d73eedc8-5269-11df-8fcf-080069138b88" uid="13764">
-        <specific value="1" description="Aleksandr Tortsev" uuid="d73ffaa6-5269-11df-b8e1-080069138b88" uid="13765"/>
-        <specific value="2" description="Donetskiy Shakhter" uuid="d74102c0-5269-11df-9e4b-080069138b88" uid="13766"/>
-        <specific value="3" description="Krasnaya Presnya" uuid="d7421408-5269-11df-a205-080069138b88" uid="13767"/>
-        <specific value="4" description="Krymskiy Kom." uuid="d743244c-5269-11df-813f-080069138b88" uid="13768"/>
-        <specific value="5" description="Nikolay Fil'chenkov" uuid="d7442d88-5269-11df-b595-080069138b88" uid="13769"/>
-        <specific value="6" description="Nikolay Vilkov" uuid="d7453a16-5269-11df-8b74-080069138b88" uid="13770"/>
-        <specific value="7" description="50 Let Sheftsva Vlksm" uuid="d7464bea-5269-11df-b1f8-080069138b88" uid="13771"/>
-        <specific value="8" description="Petr Il'ichyev" uuid="d74754f4-5269-11df-9860-080069138b88" uid="13772"/>
-        <specific value="9" description="Sergei Lazo" uuid="d74861dc-5269-11df-918b-080069138b88" uid="13773"/>
-        <specific value="10" description="Tomskiy Kom." uuid="d7496ef6-5269-11df-9ba2-080069138b88" uid="13774"/>
-        <specific value="11" description="Ilya Azarov" uuid="d74a7b16-5269-11df-9491-080069138b88" uid="13775"/>
-      </subcategory>
-      <subcategory value="3" description="Polnocny class" uuid="d74c26a0-5269-11df-9343-080069138b88" uid="13776"/>
-    </category>
-    <category value="11" description="Landing craft" uuid="d74dd090-5269-11df-9071-080069138b88" uid="13777">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d74ee142-5269-11df-8f4f-080069138b88" uid="13778"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d74fef88-5269-11df-ad2b-080069138b88" uid="13779"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d750fb12-5269-11df-900a-080069138b88" uid="13780"/>
-      <subcategory value="4" description="Vydra class" uuid="d7520908-5269-11df-9925-080069138b88" uid="13781"/>
-      <subcategory value="5" description="Ondatra class" uuid="d7531b40-5269-11df-b33c-080069138b88" uid="13782"/>
-    </category>
-    <category value="13" description="Cruiser/Helicopter Carrier" uuid="d754c6ac-5269-11df-a2a1-080069138b88" uid="13783">
-      <subcategory value="1" description="Moskva class" deprecated="1" uuid="d755d04c-5269-11df-bfc8-080069138b88" uid="13784"/>
-    </category>
-    <category value="14" description="Hydrofoil" uuid="d75782e8-5269-11df-88e3-080069138b88" uid="13785">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d7588ff8-5269-11df-8105-080069138b88" uid="13786"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d7599fec-5269-11df-9bdd-080069138b88" uid="13787"/>
-      <subcategory value="3" description="Matka class (fast attack craft, missile hydrofoil)" uuid="d75ab2f6-5269-11df-b84f-080069138b88" uid="13788"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d75bc416-5269-11df-9e58-080069138b88" uid="13789"/>
-      <subcategory value="5" description="Mukha class (fast attack craft, patrol hydrofoil)" uuid="d75cd874-5269-11df-94d1-080069138b88" uid="13790"/>
-      <subcategory value="6" description="Turya class (fast attack craft, torpedo hydrofoil)" uuid="d75de444-5269-11df-bf7f-080069138b88" uid="13791"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d75ef3c0-5269-11df-94ed-080069138b88" uid="13792"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="d7600512-5269-11df-941c-080069138b88" uid="13793"/>
-      <subcategory value="9" description="Babochka class (fast attack craft, patrol hydrofoil)" uuid="d7611380-5269-11df-adfa-080069138b88" uid="13794"/>
-      <subcategory value="10" description="Muravey class (fast attack craft, patrol hydrofoil)" uuid="d7622478-5269-11df-bbe1-080069138b88" uid="13795"/>
-    </category>
-    <category value="15" description="Air cushion/Surface effect" uuid="d763d17e-5269-11df-9a51-080069138b88" uid="13796">
-      <subcategory value="1" description="Pomornik class (air-cushion vehicles)" uuid="d764e618-5269-11df-85aa-080069138b88" uid="13797"/>
-      <subcategory value="2" description="Aist class (air-cushion vehicles)" uuid="d765f06c-5269-11df-a816-080069138b88" uid="13798"/>
-      <subcategory value="3" description="Tsaplya class (air-cushion vehicles)" uuid="d766ffca-5269-11df-89d3-080069138b88" uid="13799"/>
-      <subcategory value="4" description="Lebed class (air-cushion vehicles)" deprecated="1" uuid="d7680df2-5269-11df-a9cf-080069138b88" uid="13800"/>
-      <subcategory value="5" description="Utenok class (air-cushion vehicles)" deprecated="1" uuid="d7691cc4-5269-11df-98fe-080069138b88" uid="13801"/>
-      <subcategory value="6" description="Gus class (air-cushion vehicles)" deprecated="1" uuid="d76a2dda-5269-11df-9366-080069138b88" uid="13802"/>
-      <subcategory value="7" description="Utka class (wing-in-ground-effect craft) (air cushion)" uuid="d76b3f5e-5269-11df-9459-080069138b88" uid="13803"/>
-      <subcategory value="8" description="Orlan class (wing-in-ground-effect craft) (air cushion)" uuid="d76c4d54-5269-11df-96eb-080069138b88" uid="13804"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="d76dfa46-5269-11df-a404-080069138b88" uid="13805">
-      <subcategory value="1" description="Ugra class (submarine depot ships)" uuid="d76f079c-5269-11df-91c1-080069138b88" uid="13806">
-        <specific value="1" description="Ivan Kolyshkin" uuid="d7701c22-5269-11df-b3d6-080069138b88" uid="13807"/>
-        <specific value="2" description="Ivan Vakhrameev" uuid="d77124be-5269-11df-ac91-080069138b88" uid="13808"/>
-        <specific value="3" description="Volga" uuid="d7723232-5269-11df-b297-080069138b88" uid="13809"/>
-        <specific value="4" description="Ivan Kucherenko" uuid="d77342f8-5269-11df-8e47-080069138b88" uid="13810"/>
-        <specific value="5" description="(deprecated)" deprecated="1" uuid="d7744a2c-5269-11df-815b-080069138b88" uid="13811"/>
-        <specific value="6" description="Lentra" uuid="d7755818-5269-11df-bd5c-080069138b88" uid="13812"/>
-      </subcategory>
-      <subcategory value="2" description="Don class (submarine depot ships)" uuid="d7770686-5269-11df-a1f1-080069138b88" uid="13813">
-        <specific value="1" description="Dmitry Galkin" uuid="d778177e-5269-11df-af9d-080069138b88" uid="13814"/>
-        <specific value="2" description="Kamchatsky Kkomsomolets" uuid="d7791ffc-5269-11df-ae6a-080069138b88" uid="13815"/>
-        <specific value="3" description="Magomet Gadzhiev (ex-Mikhail Tukhachevsky)" uuid="d77a370c-5269-11df-95b4-080069138b88" uid="13816"/>
-        <specific value="4" description="Viktor Kotelnikov" uuid="d77b498a-5269-11df-adbd-080069138b88" uid="13817"/>
-        <specific value="5" description="Fedor Vidyayev" uuid="d77c5212-5269-11df-adee-080069138b88" uid="13818"/>
-        <specific value="6" description="Magadansky Komsomolets" uuid="d77d5f04-5269-11df-8bbb-080069138b88" uid="13819"/>
-      </subcategory>
-      <subcategory value="3" description="Aleksandr Brykin class (missile support ship)" uuid="d77f1196-5269-11df-b070-080069138b88" uid="13820">
-        <specific value="1" description="Aleksandr Brykin" uuid="d78020ea-5269-11df-a889-080069138b88" uid="13821"/>
-      </subcategory>
-      <subcategory value="4" description="Amga class (missile support ships)" uuid="d781cd1e-5269-11df-9c8e-080069138b88" uid="13822">
-        <specific value="1" description="Amga" uuid="d782d9a2-5269-11df-8bf3-080069138b88" uid="13823"/>
-        <specific value="2" description="Vetluga" uuid="d783e680-5269-11df-a764-080069138b88" uid="13824"/>
-        <specific value="3" description="Daugava" uuid="d784f2d2-5269-11df-87bc-080069138b88" uid="13825"/>
-      </subcategory>
-      <subcategory value="5" description="Malina class (nuclear submarine support ships)" uuid="d786a1f4-5269-11df-8a3b-080069138b88" uid="13826">
-        <specific value="1" description="PM 63" uuid="d787aae0-5269-11df-9846-080069138b88" uid="13827"/>
-        <specific value="2" description="PM 74" uuid="d788b6d8-5269-11df-a0ea-080069138b88" uid="13828"/>
-        <specific value="3" description="PM 12" uuid="d789c492-5269-11df-8584-080069138b88" uid="13829"/>
-      </subcategory>
-      <subcategory value="6" description="Pinega class (nuclear submarine support ships)" uuid="d78b712a-5269-11df-a027-080069138b88" uid="13830">
-        <specific value="1" description="Pinega" uuid="d78c7dc2-5269-11df-b51e-080069138b88" uid="13831"/>
-        <specific value="2" description="Amur" uuid="d78d8b04-5269-11df-83f9-080069138b88" uid="13832"/>
-      </subcategory>
-      <subcategory value="7" description="Lama class (missile support ships)" uuid="d78f3792-5269-11df-99bd-080069138b88" uid="13833">
-        <specific value="1" description="General Ryabakov" uuid="d790461e-5269-11df-95a4-080069138b88" uid="13834"/>
-        <specific value="2" description="Voronesh" uuid="d7915252-5269-11df-81f0-080069138b88" uid="13835"/>
-        <specific value="3" description="PM 44" uuid="d7925f1c-5269-11df-9451-080069138b88" uid="13836"/>
-        <specific value="4" description="PM 93" uuid="d7936ab0-5269-11df-951e-080069138b88" uid="13837"/>
-        <specific value="5" description="PM 131" uuid="d794723e-5269-11df-b0f9-080069138b88" uid="13838"/>
-        <specific value="6" description="PM 150" uuid="d7958624-5269-11df-a25e-080069138b88" uid="13839"/>
-        <specific value="7" description="PM 154" uuid="d79696b8-5269-11df-8cc7-080069138b88" uid="13840"/>
-      </subcategory>
-      <subcategory value="8" description="Modified Andizhan class (missile support ships)" uuid="d7984a62-5269-11df-b134-080069138b88" uid="13841">
-        <specific value="1" description="Venta" uuid="d79958e4-5269-11df-b661-080069138b88" uid="13842"/>
-        <specific value="2" description="Vilyuy" uuid="d79a6626-5269-11df-8bf7-080069138b88" uid="13843"/>
-      </subcategory>
-      <subcategory value="9" description="Amur I Class (Repair Ship)" uuid="d79c1386-5269-11df-893b-080069138b88" uid="13844">
-        <specific value="1" description="PM 9" uuid="d79d1fa6-5269-11df-bfb9-080069138b88" uid="13845"/>
-        <specific value="2" description="PM 10" uuid="d79e2aea-5269-11df-8c0d-080069138b88" uid="13846"/>
-        <specific value="3" description="PM 15" uuid="d79f3886-5269-11df-a4d5-080069138b88" uid="13847"/>
-        <specific value="4" description="PM 37" uuid="d7a04604-5269-11df-b72d-080069138b88" uid="13848"/>
-        <specific value="5" description="PM 49" uuid="d7a15094-5269-11df-98ca-080069138b88" uid="13849"/>
-        <specific value="6" description="PM 52" uuid="d7a25d5e-5269-11df-896c-080069138b88" uid="13850"/>
-        <specific value="7" description="PM 56" uuid="d7a36a5a-5269-11df-9437-080069138b88" uid="13851"/>
-        <specific value="8" description="PM 75" uuid="d7a47026-5269-11df-ab75-080069138b88" uid="13852"/>
-        <specific value="9" description="PM 94" uuid="d7a57e12-5269-11df-8639-080069138b88" uid="13853"/>
-        <specific value="10" description="PM 138" uuid="d7a68f1e-5269-11df-bbe1-080069138b88" uid="13854"/>
-        <specific value="11" description="PM 161" uuid="d7a79594-5269-11df-80fa-080069138b88" uid="13855"/>
-        <specific value="12" description="PM 163" uuid="d7a8a272-5269-11df-8864-080069138b88" uid="13856"/>
-        <specific value="13" description="5" uuid="d7a9b0c2-5269-11df-9f0e-080069138b88" uid="13857"/>
-        <specific value="14" description="30" uuid="d7aab954-5269-11df-8684-080069138b88" uid="13858"/>
-        <specific value="15" description="34" uuid="d7abc484-5269-11df-9fea-080069138b88" uid="13859"/>
-        <specific value="16" description="40" uuid="d7acd63a-5269-11df-8629-080069138b88" uid="13860"/>
-        <specific value="17" description="64" uuid="d7adde72-5269-11df-b42d-080069138b88" uid="13861"/>
-        <specific value="18" description="73" uuid="d7aeec40-5269-11df-861f-080069138b88" uid="13862"/>
-        <specific value="19" description="81" uuid="d7aff928-5269-11df-b013-080069138b88" uid="13863"/>
-        <specific value="20" description="82" uuid="d7b10412-5269-11df-9b7a-080069138b88" uid="13864"/>
-        <specific value="21" description="129" uuid="d7b2108c-5269-11df-984b-080069138b88" uid="13865"/>
-        <specific value="22" description="139" uuid="d7b31bee-5269-11df-9a6f-080069138b88" uid="13866"/>
-        <specific value="23" description="140" uuid="d7b4239a-5269-11df-b077-080069138b88" uid="13867"/>
-        <specific value="24" description="156" uuid="d7b53488-5269-11df-86f1-080069138b88" uid="13868"/>
-      </subcategory>
-      <subcategory value="10" description="Amur II Class (repair ship)" uuid="d7b6e7e2-5269-11df-b00f-080069138b88" uid="13869">
-        <specific value="1" description="59" uuid="d7b7f600-5269-11df-94f3-080069138b88" uid="13870"/>
-        <specific value="2" description="69" uuid="d7b90194-5269-11df-8bc1-080069138b88" uid="13871"/>
-        <specific value="3" description="86" uuid="d7ba0daa-5269-11df-ae6e-080069138b88" uid="13872"/>
-        <specific value="4" description="92" uuid="d7bb195c-5269-11df-a633-080069138b88" uid="13873"/>
-        <specific value="5" description="97" uuid="d7bc243c-5269-11df-bb8e-080069138b88" uid="13874"/>
-      </subcategory>
-      <subcategory value="11" description="Oskol class (repair ships)" uuid="d7bdcfee-5269-11df-adf5-080069138b88" uid="13875">
-        <specific value="1" description="PM 2" uuid="d7beddda-5269-11df-984b-080069138b88" uid="13876"/>
-        <specific value="2" description="PM 24" uuid="d7bfec34-5269-11df-9485-080069138b88" uid="13877"/>
-        <specific value="3" description="PM 26" uuid="d7c0f35e-5269-11df-a764-080069138b88" uid="13878"/>
-        <specific value="4" description="PM 42" uuid="d7c2014a-5269-11df-a01c-080069138b88" uid="13879"/>
-        <specific value="5" description="PM 147" uuid="d7c30d06-5269-11df-a2e0-080069138b88" uid="13880"/>
-        <specific value="6" description="PM 148" uuid="d7c417d2-5269-11df-9415-080069138b88" uid="13881"/>
-        <specific value="7" description="20" uuid="d7c523b6-5269-11df-b487-080069138b88" uid="13882"/>
-        <specific value="8" description="21" uuid="d7c630ee-5269-11df-ade4-080069138b88" uid="13883"/>
-        <specific value="9" description="51" uuid="d7c73a02-5269-11df-9fcf-080069138b88" uid="13884"/>
-        <specific value="10" description="68" uuid="d7c84640-5269-11df-99d0-080069138b88" uid="13885"/>
-        <specific value="11" description="146" uuid="d7c951f2-5269-11df-a132-080069138b88" uid="13886"/>
-      </subcategory>
-      <subcategory value="12" description="Tomba class (support ships)" uuid="d7cb00b0-5269-11df-afed-080069138b88" uid="13887">
-        <specific value="1" description="244" uuid="d7cc07f8-5269-11df-b7c2-080069138b88" uid="13888"/>
-        <specific value="2" description="254" uuid="d7cd15a8-5269-11df-86da-080069138b88" uid="13889"/>
-        <specific value="3" description="348" uuid="d7ce20b0-5269-11df-858f-080069138b88" uid="13890"/>
-        <specific value="4" description="357" uuid="d7cf6f42-5269-11df-97ad-080069138b88" uid="13891"/>
-      </subcategory>
-      <subcategory value="13" description="Vytegrales class (support &amp; depot)" uuid="d7d11eb4-5269-11df-afb9-080069138b88" uid="13892">
-        <specific value="1" description="Apsheron (ex-Vagales)" uuid="d7d231f0-5269-11df-a525-080069138b88" uid="13893"/>
-        <specific value="2" description="Baskunchak (ex-Kirishi)" uuid="d7d342ca-5269-11df-bf11-080069138b88" uid="13894"/>
-        <specific value="3" description="Dauriya (ex-Vyborgles)" uuid="d7d44d0a-5269-11df-944f-080069138b88" uid="13895"/>
-        <specific value="4" description="Dikson (ex-Vostok 3)" uuid="d7d56442-5269-11df-879c-080069138b88" uid="13896"/>
-        <specific value="5" description="Donbas (ex-Vostok 4)" uuid="d7d674b8-5269-11df-a4c4-080069138b88" uid="13897"/>
-        <specific value="6" description="Sevan (ex-Siverles)" uuid="d7d78268-5269-11df-be2f-080069138b88" uid="13898"/>
-        <specific value="7" description="Taman (ex-Suzdal)" uuid="d7d89040-5269-11df-8ef3-080069138b88" uid="13899"/>
-        <specific value="8" description="Yamal (ex-Tosnoles)" uuid="d7d99cce-5269-11df-a89b-080069138b88" uid="13900"/>
-      </subcategory>
-      <subcategory value="14" description="Vishnya class (AGIs)" uuid="d7db4c5e-5269-11df-b120-080069138b88" uid="13901">
-        <specific value="1" description="SSV 169" uuid="d7dc54e6-5269-11df-bc2b-080069138b88" uid="13902"/>
-        <specific value="2" description="SSV 175" uuid="d7dd62be-5269-11df-aa40-080069138b88" uid="13903"/>
-        <specific value="3" description="SSV 201" uuid="d7de72e4-5269-11df-afd3-080069138b88" uid="13904"/>
-        <specific value="4" description="SSV 208" uuid="d7df7aa4-5269-11df-887d-080069138b88" uid="13905"/>
-        <specific value="5" description="SSV 231" uuid="d7e087a0-5269-11df-93bd-080069138b88" uid="13906"/>
-        <specific value="6" description="SSV 520" uuid="d7e19604-5269-11df-b42a-080069138b88" uid="13907"/>
-        <specific value="7" description="SSV 535" uuid="d7e29d10-5269-11df-a5ff-080069138b88" uid="13908"/>
-      </subcategory>
-      <subcategory value="15" description="Balzam class (AGIs)" uuid="d7e44e12-5269-11df-9cfc-080069138b88" uid="13909">
-        <specific value="1" description="SSV 80" uuid="d7e55cd0-5269-11df-9a45-080069138b88" uid="13910"/>
-        <specific value="2" description="SSV 493" uuid="d7e66896-5269-11df-b375-080069138b88" uid="13911"/>
-        <specific value="3" description="SSV 516" uuid="d7e77128-5269-11df-8960-080069138b88" uid="13912"/>
-        <specific value="4" description="SSV 571" uuid="d7e881bc-5269-11df-ab1a-080069138b88" uid="13913"/>
-      </subcategory>
-      <subcategory value="16" description="Primorye class (AGIs)" uuid="d7ea2ddc-5269-11df-82a2-080069138b88" uid="13914">
-        <specific value="1" description="SSV 464 Zabaykalye" uuid="d7eb3aba-5269-11df-bed2-080069138b88" uid="13915"/>
-        <specific value="2" description="SSV 465 Primorye" uuid="d7ec4752-5269-11df-bd3d-080069138b88" uid="13916"/>
-        <specific value="3" description="SSV 501 Zaporozhye" uuid="d7ed566a-5269-11df-abe2-080069138b88" uid="13917"/>
-        <specific value="4" description="SSV 502 Zakarpatye" uuid="d7ee644c-5269-11df-9b31-080069138b88" uid="13918"/>
-        <specific value="5" description="SSV 590 Krym" uuid="d7ef6f90-5269-11df-8be9-080069138b88" uid="13919"/>
-        <specific value="6" description="SSV 591 Kavkaz" uuid="d7f07ce6-5269-11df-862b-080069138b88" uid="13920"/>
-      </subcategory>
-      <subcategory value="17" description="Nikolay Zubov class (AGIs)" uuid="d7f22906-5269-11df-a0d1-080069138b88" uid="13921">
-        <specific value="1" description="SSV 468 Gavril Sarychev (mod)" uuid="d7f33954-5269-11df-8cb4-080069138b88" uid="13922"/>
-        <specific value="2" description="SSV 469 Semen Chelyuskin" uuid="d7f44a2e-5269-11df-bac3-080069138b88" uid="13923"/>
-        <specific value="3" description="SSV 503 Khariton Laptev (mod)" uuid="d7f55bc6-5269-11df-b52d-080069138b88" uid="13924"/>
-      </subcategory>
-      <subcategory value="18" description="Modified Pamir class (AGIs)" uuid="d7f70a3e-5269-11df-8573-080069138b88" uid="13925">
-        <specific value="1" description="SSV 477 Peleng (ex-Arban)" uuid="d7f81b68-5269-11df-bc82-080069138b88" uid="13926"/>
-      </subcategory>
-      <subcategory value="19" description="Moma class (AGIs)" uuid="d7f9c706-5269-11df-8303-080069138b88" uid="13927">
-        <specific value="1" description="Ekvator" uuid="d7fad0a6-5269-11df-8e68-080069138b88" uid="13928"/>
-        <specific value="2" description="Yupiter (mod)" uuid="d7fbe158-5269-11df-9b0d-080069138b88" uid="13929"/>
-        <specific value="3" description="Kildin (mod)" uuid="d7fcef62-5269-11df-a7b9-080069138b88" uid="13930"/>
-        <specific value="4" description="SSV 472 (ex-Ilmen) (mod)" uuid="d7fdf9f2-5269-11df-8b3d-080069138b88" uid="13931"/>
-        <specific value="5" description="SSV 474 (ex-Vega) (mod)" uuid="d7ff0c84-5269-11df-ae0a-080069138b88" uid="13932"/>
-        <specific value="6" description="SSV 506 (ex-Nakhodka)" uuid="d8001afc-5269-11df-8ab4-080069138b88" uid="13933"/>
-        <specific value="7" description="SSV 509 (ex-Pelorus) (mod)" uuid="d801233e-5269-11df-832b-080069138b88" uid="13934"/>
-        <specific value="8" description="SSV 512 (ex-Arkhipelag) (mod)" uuid="d802329c-5269-11df-98c3-080069138b88" uid="13935"/>
-        <specific value="9" description="SSV 514 (ex-Seliger) (mod)" uuid="d80345d8-5269-11df-b447-080069138b88" uid="13936"/>
-      </subcategory>
-      <subcategory value="20" description="Alpinist class (AGIs)" uuid="d804f23e-5269-11df-bad8-080069138b88" uid="13937">
-        <specific value="1" description="GS 7 (mod)" uuid="d805fb48-5269-11df-9dbb-080069138b88" uid="13938"/>
-        <specific value="2" description="GS 8" uuid="d8070c4a-5269-11df-be89-080069138b88" uid="13939"/>
-        <specific value="3" description="GS 19 (mod)" uuid="d80819c8-5269-11df-b434-080069138b88" uid="13940"/>
-        <specific value="4" description="GS 39 (mod)" uuid="d8092034-5269-11df-b039-080069138b88" uid="13941"/>
-      </subcategory>
-      <subcategory value="21" description="Mayak class" uuid="d80ad08c-5269-11df-8084-080069138b88" uid="13942">
-        <specific value="1" description="Khersones" uuid="d80bdf40-5269-11df-9287-080069138b88" uid="13943"/>
-        <specific value="2" description="Kurs" uuid="d80cec96-5269-11df-b447-080069138b88" uid="13944"/>
-        <specific value="3" description="Kursograf" uuid="d80df6fe-5269-11df-94eb-080069138b88" uid="13945"/>
-        <specific value="4" description="Ladoga" uuid="d80f0440-5269-11df-bdbe-080069138b88" uid="13946"/>
-        <specific value="5" description="GS 239" uuid="d8101128-5269-11df-b196-080069138b88" uid="13947"/>
-        <specific value="6" description="GS 242" uuid="d8111794-5269-11df-9827-080069138b88" uid="13948"/>
-        <specific value="7" description="Girorulevoy" uuid="d81225bc-5269-11df-aeda-080069138b88" uid="13949"/>
-        <specific value="8" description="Aneroid" uuid="d8134050-5269-11df-98e3-080069138b88" uid="13950"/>
-      </subcategory>
-      <subcategory value="22" description="Okean class (AGIs)" uuid="d814ed88-5269-11df-a71a-080069138b88" uid="13951">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="d815f4e4-5269-11df-aa8d-080069138b88" uid="13952"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="d8170640-5269-11df-8984-080069138b88" uid="13953"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="d818195e-5269-11df-a1e0-080069138b88" uid="13954"/>
-        <specific value="4" description="Ekholot" uuid="d8192204-5269-11df-a550-080069138b88" uid="13955"/>
-        <specific value="5" description="Krenometr" uuid="d81a2e1a-5269-11df-9bd8-080069138b88" uid="13956"/>
-        <specific value="6" description="Linza (mod)" uuid="d81b3d5a-5269-11df-99a4-080069138b88" uid="13957"/>
-        <specific value="7" description="Lotlin (mod)" uuid="d81c46fa-5269-11df-9dc3-080069138b88" uid="13958"/>
-        <specific value="8" description="Reduktor (mod)" uuid="d81d53ba-5269-11df-8048-080069138b88" uid="13959"/>
-        <specific value="9" description="Repiter" uuid="d81e65c0-5269-11df-a917-080069138b88" uid="13960"/>
-        <specific value="10" description="Teodolit" uuid="d81f6e02-5269-11df-b053-080069138b88" uid="13961"/>
-        <specific value="11" description="Traverz" uuid="d8207b30-5269-11df-9007-080069138b88" uid="13962"/>
-        <specific value="12" description="Zond (mod) no missiles" uuid="d821893a-5269-11df-9163-080069138b88" uid="13963"/>
-      </subcategory>
-      <subcategory value="23" description="Lentra class (AGIs)" uuid="d8233a00-5269-11df-b79d-080069138b88" uid="13964">
-        <specific value="1" description="GS 41" uuid="d82441e8-5269-11df-ab58-080069138b88" uid="13965"/>
-        <specific value="2" description="GS 43 (mod)" uuid="d8254e80-5269-11df-924d-080069138b88" uid="13966"/>
-        <specific value="3" description="GS 55" uuid="d8265ce4-5269-11df-a351-080069138b88" uid="13967"/>
-        <specific value="4" description="GS 59" uuid="d8276882-5269-11df-b9d7-080069138b88" uid="13968"/>
-      </subcategory>
-      <subcategory value="24" description="Akademik Krylov class (naval research)" uuid="d82913c6-5269-11df-8a77-080069138b88" uid="13969">
-        <specific value="1" description="Admiral Vladimirsky" uuid="d82a2248-5269-11df-9e4f-080069138b88" uid="13970"/>
-        <specific value="2" description="Ivan Kruzenshtern" uuid="d82b337c-5269-11df-b2ce-080069138b88" uid="13971"/>
-        <specific value="3" description="Leonid Demin" uuid="d82c3f7e-5269-11df-a68f-080069138b88" uid="13972"/>
-        <specific value="4" description="Akademik Krylov" uuid="d82d4d38-5269-11df-b3ae-080069138b88" uid="13973"/>
-        <specific value="5" description="Leonid Sobolev" uuid="d82e5994-5269-11df-abe5-080069138b88" uid="13974"/>
-        <specific value="6" description="Mikhail Krupsky" uuid="d82f64ec-5269-11df-a597-080069138b88" uid="13975"/>
-      </subcategory>
-      <subcategory value="25" description="Abkhaziya class (naval research)" uuid="d8311184-5269-11df-9b35-080069138b88" uid="13976">
-        <specific value="1" description="Abkhaziya" uuid="d83229f2-5269-11df-922a-080069138b88" uid="13977"/>
-        <specific value="2" description="Adzhariya" uuid="d833387e-5269-11df-a1c2-080069138b88" uid="13978"/>
-        <specific value="3" description="Bashkiriya" uuid="d8344520-5269-11df-8960-080069138b88" uid="13979"/>
-        <specific value="4" description="Moldavia" uuid="d8355262-5269-11df-8031-080069138b88" uid="13980"/>
-      </subcategory>
-      <subcategory value="26" description="Polyus class (Kovel type) (naval research)" uuid="d836fd6a-5269-11df-9a50-080069138b88" uid="13981">
-        <specific value="1" description="Baykal (mod)" uuid="d8381042-5269-11df-9d28-080069138b88" uid="13982"/>
-        <specific value="2" description="Balkhash (mod)" uuid="d8391898-5269-11df-a1dd-080069138b88" uid="13983"/>
-        <specific value="3" description="Polyus" uuid="d83a25e4-5269-11df-a668-080069138b88" uid="13984"/>
-      </subcategory>
-      <subcategory value="27" description="Modified Dobrynya Nikitich class (naval research)" uuid="d83bd678-5269-11df-ab3b-080069138b88" uid="13985">
-        <specific value="1" description="Vladimir Kavraysky" uuid="d83ce69e-5269-11df-8317-080069138b88" uid="13986"/>
-      </subcategory>
-      <subcategory value="28" description="Nikolay Zubov class (naval research)" uuid="d83e96b0-5269-11df-b253-080069138b88" uid="13987">
-        <specific value="1" description="Aleksey Chirikov" uuid="d83fa000-5269-11df-b994-080069138b88" uid="13988"/>
-        <specific value="2" description="Fedor Litke" uuid="d840ad06-5269-11df-b7af-080069138b88" uid="13989"/>
-        <specific value="3" description="Andrey Vilkitsky" uuid="d841bb74-5269-11df-b37c-080069138b88" uid="13990"/>
-        <specific value="4" description="Nikolay Zubov" uuid="d842c726-5269-11df-ab4a-080069138b88" uid="13991"/>
-        <specific value="5" description="Boris Davidov" uuid="d843d38c-5269-11df-a0e5-080069138b88" uid="13992"/>
-        <specific value="6" description="Semen Dezhnev" uuid="d844e100-5269-11df-b9ad-080069138b88" uid="13993"/>
-        <specific value="7" description="Faddey Bellinsgausen" uuid="d845eac8-5269-11df-8711-080069138b88" uid="13994"/>
-        <specific value="8" description="Vasily Golovnin" uuid="d846fc92-5269-11df-9f2b-080069138b88" uid="13995"/>
-      </subcategory>
-      <subcategory value="29" description="Yug class (naval research)" uuid="d848a81c-5269-11df-9d95-080069138b88" uid="13996">
-        <specific value="1" description="V Adm Vorontsov (ex-Briz)" uuid="d849b658-5269-11df-ac87-080069138b88" uid="13997"/>
-        <specific value="2" description="Donuzlav" uuid="d84ac2fa-5269-11df-9614-080069138b88" uid="13998"/>
-        <specific value="3" description="Gals" uuid="d84bd10e-5269-11df-8ee1-080069138b88" uid="13999"/>
-        <specific value="4" description="Gidrolog" uuid="d84cdc7a-5269-11df-bf42-080069138b88" uid="14000"/>
-        <specific value="5" description="Gorizont" uuid="d84de78c-5269-11df-a010-080069138b88" uid="14001"/>
-        <specific value="6" description="Mangyshlak" uuid="d84ef460-5269-11df-8aef-080069138b88" uid="14002"/>
-        <specific value="7" description="Marshal Gelovani" uuid="d85000da-5269-11df-8759-080069138b88" uid="14003"/>
-        <specific value="8" description="Nikolay Matusevich" uuid="d8511222-5269-11df-a416-080069138b88" uid="14004"/>
-        <specific value="9" description="Pegas" uuid="d85224c8-5269-11df-b0d3-080069138b88" uid="14005"/>
-        <specific value="10" description="Persey" uuid="d853328c-5269-11df-81b8-080069138b88" uid="14006"/>
-        <specific value="11" description="Pluton" uuid="d854390c-5269-11df-b528-080069138b88" uid="14007"/>
-        <specific value="12" description="Senezh" uuid="d85549c8-5269-11df-91f5-080069138b88" uid="14008"/>
-        <specific value="13" description="Strelets" uuid="d856571e-5269-11df-a9b2-080069138b88" uid="14009"/>
-        <specific value="14" description="Tayga" uuid="d8575e02-5269-11df-9cbc-080069138b88" uid="14010"/>
-        <specific value="15" description="Vizir" uuid="d8586b30-5269-11df-80fa-080069138b88" uid="14011"/>
-        <specific value="16" description="Zodiak" uuid="d8597bec-5269-11df-87f7-080069138b88" uid="14012"/>
-        <specific value="17" description="Stvor" uuid="d85a838e-5269-11df-9d65-080069138b88" uid="14013"/>
-        <specific value="18" description="704 (ex-SSV 328)" uuid="d85b9030-5269-11df-bd3c-080069138b88" uid="14014"/>
-      </subcategory>
-      <subcategory value="30" description="Mod Sorum class (naval research)" uuid="d85d3f02-5269-11df-935f-080069138b88" uid="14015">
-        <specific value="1" description="OS 572" uuid="d85e516c-5269-11df-bb8b-080069138b88" uid="14016"/>
-      </subcategory>
-      <subcategory value="31" description="Moma class (+9 AGIs) (naval survey)" uuid="d85ffda0-5269-11df-8a73-080069138b88" uid="14017">
-        <specific value="1" description="Altair" uuid="d8610538-5269-11df-8948-080069138b88" uid="14018"/>
-        <specific value="2" description="Anadyr" uuid="d86214dc-5269-11df-9c4d-080069138b88" uid="14019"/>
-        <specific value="3" description="Andromeda" uuid="d863313c-5269-11df-8509-080069138b88" uid="14020"/>
-        <specific value="4" description="Antares" uuid="d8643fbe-5269-11df-b18b-080069138b88" uid="14021"/>
-        <specific value="5" description="Antarktyda" uuid="d8654c88-5269-11df-8ce8-080069138b88" uid="14022"/>
-        <specific value="6" description="Arktika" uuid="d866586c-5269-11df-95d1-080069138b88" uid="14023"/>
-        <specific value="7" description="Askold" uuid="d8677ab2-5269-11df-84bb-080069138b88" uid="14024"/>
-        <specific value="8" description="Berezan" uuid="d8689cd0-5269-11df-a595-080069138b88" uid="14025"/>
-        <specific value="9" description="Cheleken" uuid="d869bcbe-5269-11df-8a86-080069138b88" uid="14026"/>
-        <specific value="10" description="Elton" uuid="d86b0362-5269-11df-8211-080069138b88" uid="14027"/>
-        <specific value="11" description="Kolguev (mod)" uuid="d86c1324-5269-11df-8c57-080069138b88" uid="14028"/>
-        <specific value="12" description="Krilon" uuid="d86d26d8-5269-11df-a010-080069138b88" uid="14029"/>
-        <specific value="13" description="Liman" uuid="d86e34c4-5269-11df-bc8a-080069138b88" uid="14030"/>
-        <specific value="14" description="Mars" uuid="d86f4620-5269-11df-a0be-080069138b88" uid="14031"/>
-        <specific value="15" description="Morzhovets" uuid="d870552e-5269-11df-9409-080069138b88" uid="14032"/>
-        <specific value="16" description="Okean" uuid="d87166c6-5269-11df-a0ef-080069138b88" uid="14033"/>
-        <specific value="17" description="Rybachi (mod)" uuid="d8726f58-5269-11df-953a-080069138b88" uid="14034"/>
-        <specific value="18" description="Sever" uuid="d8737e02-5269-11df-85c9-080069138b88" uid="14035"/>
-        <specific value="19" description="Taymyr" uuid="d8748c02-5269-11df-a6e4-080069138b88" uid="14036"/>
-        <specific value="20" description="Zapolyarye" uuid="d875984a-5269-11df-a112-080069138b88" uid="14037"/>
-      </subcategory>
-      <subcategory value="32" description="Samara class (naval survey)" uuid="d877442e-5269-11df-99dc-080069138b88" uid="14038">
-        <specific value="1" description="Azimut" uuid="d87851b6-5269-11df-b294-080069138b88" uid="14039"/>
-        <specific value="2" description="Glubomer" uuid="d87961d2-5269-11df-9503-080069138b88" uid="14040"/>
-        <specific value="3" description="Tropik" uuid="d87a6d34-5269-11df-8258-080069138b88" uid="14041"/>
-        <specific value="4" description="Deviator" uuid="d87b7af8-5269-11df-9745-080069138b88" uid="14042"/>
-        <specific value="5" description="Gradus" uuid="d87c86c8-5269-11df-8dec-080069138b88" uid="14043"/>
-        <specific value="6" description="Vostok" uuid="d87d8f14-5269-11df-880a-080069138b88" uid="14044"/>
-        <specific value="7" description="Gigrometr" uuid="d87ea0ac-5269-11df-ab21-080069138b88" uid="14045"/>
-        <specific value="8" description="Kompas" uuid="d87fad30-5269-11df-a2c3-080069138b88" uid="14046"/>
-        <specific value="9" description="Vaygach (mod)" uuid="d880b46e-5269-11df-ad40-080069138b88" uid="14047"/>
-        <specific value="10" description="Moskovsky Universitet" uuid="d881c610-5269-11df-aa67-080069138b88" uid="14048"/>
-        <specific value="11" description="Pamyat Merkuryia" uuid="d882d532-5269-11df-b535-080069138b88" uid="14049"/>
-        <specific value="12" description="Zenit (ex-Gorizont) (mod)" uuid="d883dc5c-5269-11df-80ee-080069138b88" uid="14050"/>
-        <specific value="13" description="Rumb" uuid="d884eb7e-5269-11df-8b0b-080069138b88" uid="14051"/>
-      </subcategory>
-      <subcategory value="33" description="Finik class (naval survey)" uuid="d8869bcc-5269-11df-be09-080069138b88" uid="14052">
-        <specific value="1" description="GS 44" uuid="d887a922-5269-11df-8955-080069138b88" uid="14053"/>
-        <specific value="2" description="47" uuid="d888b092-5269-11df-908a-080069138b88" uid="14054"/>
-        <specific value="3" description="84" uuid="d889bf32-5269-11df-bc07-080069138b88" uid="14055"/>
-        <specific value="4" description="86" uuid="d88ad00c-5269-11df-9adb-080069138b88" uid="14056"/>
-        <specific value="5" description="87" uuid="d88bd60a-5269-11df-8e44-080069138b88" uid="14057"/>
-        <specific value="6" description="260" uuid="d88ce342-5269-11df-85bb-080069138b88" uid="14058"/>
-        <specific value="7" description="265" uuid="d88dfaa2-5269-11df-a675-080069138b88" uid="14059"/>
-        <specific value="8" description="270" uuid="d88f042e-5269-11df-ab82-080069138b88" uid="14060"/>
-        <specific value="9" description="272" uuid="d89010a8-5269-11df-a423-080069138b88" uid="14061"/>
-        <specific value="10" description="278" uuid="d8912268-5269-11df-a783-080069138b88" uid="14062"/>
-        <specific value="11" description="296" uuid="d89229f6-5269-11df-8791-080069138b88" uid="14063"/>
-        <specific value="12" description="297" uuid="d8933864-5269-11df-9d14-080069138b88" uid="14064"/>
-        <specific value="13" description="301" uuid="d894466e-5269-11df-92f2-080069138b88" uid="14065"/>
-        <specific value="14" description="388" uuid="d89552a2-5269-11df-83a6-080069138b88" uid="14066"/>
-        <specific value="15" description="392" uuid="d8966214-5269-11df-b9c1-080069138b88" uid="14067"/>
-        <specific value="16" description="397" uuid="d8976d30-5269-11df-9ce8-080069138b88" uid="14068"/>
-        <specific value="17" description="398" uuid="d898769e-5269-11df-b53a-080069138b88" uid="14069"/>
-        <specific value="18" description="399" uuid="d89987aa-5269-11df-bc18-080069138b88" uid="14070"/>
-        <specific value="19" description="400" uuid="d89a94ba-5269-11df-bc23-080069138b88" uid="14071"/>
-        <specific value="20" description="401" uuid="d89b9a68-5269-11df-8cb2-080069138b88" uid="14072"/>
-        <specific value="21" description="402" uuid="d89cab60-5269-11df-a52b-080069138b88" uid="14073"/>
-        <specific value="22" description="403" uuid="d89db8fc-5269-11df-9458-080069138b88" uid="14074"/>
-        <specific value="23" description="404" uuid="d89ebf18-5269-11df-a7ad-080069138b88" uid="14075"/>
-        <specific value="24" description="405" uuid="d89fcc3c-5269-11df-8ec0-080069138b88" uid="14076"/>
-      </subcategory>
-      <subcategory value="34" description="Biya class (naval survey)" uuid="d8a17c1c-5269-11df-b820-080069138b88" uid="14077">
-        <specific value="1" description="GS 182" uuid="d8a28ac6-5269-11df-909e-080069138b88" uid="14078"/>
-        <specific value="2" description="193" uuid="d8a39164-5269-11df-8840-080069138b88" uid="14079"/>
-        <specific value="3" description="194" uuid="d8a49fc8-5269-11df-89ee-080069138b88" uid="14080"/>
-        <specific value="4" description="198" uuid="d8a5b0ac-5269-11df-b125-080069138b88" uid="14081"/>
-        <specific value="5" description="200" uuid="d8a6b6a0-5269-11df-bb31-080069138b88" uid="14082"/>
-        <specific value="6" description="202" uuid="d8a7c2f2-5269-11df-870c-080069138b88" uid="14083"/>
-        <specific value="7" description="204" uuid="d8a8d282-5269-11df-b7ba-080069138b88" uid="14084"/>
-        <specific value="8" description="206" uuid="d8a9dac4-5269-11df-96d2-080069138b88" uid="14085"/>
-        <specific value="9" description="210" uuid="d8aae68a-5269-11df-9cf3-080069138b88" uid="14086"/>
-        <specific value="10" description="212" uuid="d8abf75a-5269-11df-a521-080069138b88" uid="14087"/>
-        <specific value="11" description="214" uuid="d8ad07da-5269-11df-9aff-080069138b88" uid="14088"/>
-        <specific value="12" description="271" uuid="d8ae156c-5269-11df-aa5e-080069138b88" uid="14089"/>
-        <specific value="13" description="273" uuid="d8af22ea-5269-11df-a190-080069138b88" uid="14090"/>
-        <specific value="14" description="275" uuid="d8b02e88-5269-11df-8566-080069138b88" uid="14091"/>
-      </subcategory>
-      <subcategory value="35" description="Kamenka class (naval survey)" uuid="d8b1d9c2-5269-11df-b504-080069138b88" uid="14092">
-        <specific value="1" description="GS 66" uuid="d8b2e736-5269-11df-89d2-080069138b88" uid="14093"/>
-        <specific value="2" description="74" uuid="d8b3f608-5269-11df-97d2-080069138b88" uid="14094"/>
-        <specific value="3" description="78" uuid="d8b500b6-5269-11df-b3f6-080069138b88" uid="14095"/>
-        <specific value="4" description="82" uuid="d8b60da8-5269-11df-98fa-080069138b88" uid="14096"/>
-        <specific value="5" description="107" uuid="d8b718f6-5269-11df-991d-080069138b88" uid="14097"/>
-        <specific value="6" description="108 (ex-Vernier)" uuid="d8b82872-5269-11df-b5eb-080069138b88" uid="14098"/>
-        <specific value="7" description="113 (ex-Belbeck)" uuid="d8b9371c-5269-11df-91e0-080069138b88" uid="14099"/>
-        <specific value="8" description="118" uuid="d8ba4422-5269-11df-8b03-080069138b88" uid="14100"/>
-        <specific value="9" description="199 (ex-Sima)" uuid="d8bb4e4e-5269-11df-b4c8-080069138b88" uid="14101"/>
-        <specific value="10" description="207" uuid="d8bc5b7c-5269-11df-a68c-080069138b88" uid="14102"/>
-        <specific value="11" description="211" uuid="d8bd6850-5269-11df-bb2e-080069138b88" uid="14103"/>
-        <specific value="12" description="Astronom (mod)" uuid="d8be6f34-5269-11df-b6cb-080069138b88" uid="14104"/>
-      </subcategory>
-      <subcategory value="36" description="Vinograd class (naval survey)" uuid="d8c01d84-5269-11df-82d9-080069138b88" uid="14105">
-        <specific value="1" description="GS 525" uuid="d8c13016-5269-11df-869d-080069138b88" uid="14106"/>
-        <specific value="2" description="GS 526" uuid="d8c23cb8-5269-11df-9484-080069138b88" uid="14107"/>
-      </subcategory>
-      <subcategory value="37" description="Melitopol class (naval survey)" uuid="d8c3e6ee-5269-11df-a760-080069138b88" uid="14108">
-        <specific value="1" description="Mayak" uuid="d8c4f41c-5269-11df-9146-080069138b88" uid="14109"/>
-        <specific value="2" description="Nivelir" uuid="d8c611e4-5269-11df-926a-080069138b88" uid="14110"/>
-        <specific value="3" description="Prizma" uuid="d8c72552-5269-11df-8940-080069138b88" uid="14111"/>
-        <specific value="4" description="Indigurka (mod)" uuid="d8c82d76-5269-11df-bafb-080069138b88" uid="14112"/>
-        <specific value="5" description="Shevchenoko (mod)" uuid="d8c93d42-5269-11df-8caf-080069138b88" uid="14113"/>
-      </subcategory>
-      <subcategory value="38" description="Nyryat 1 class (naval survey)" uuid="d8caeeee-5269-11df-b3f0-080069138b88" uid="14114"/>
-      <subcategory value="39" description="Nyryat 2 class (naval survey)" uuid="d8cc0946-5269-11df-affe-080069138b88" uid="14115"/>
-      <subcategory value="40" description="Sibir class (naval missile range)" uuid="d8cd1318-5269-11df-9ed8-080069138b88" uid="14116">
-        <specific value="1" description="Sakhalin" uuid="d8ce2398-5269-11df-9a0b-080069138b88" uid="14117"/>
-        <specific value="2" description="Spassk (ex-Suchan)" uuid="d8cf35c6-5269-11df-9984-080069138b88" uid="14118"/>
-      </subcategory>
-      <subcategory value="41" description="Marshal Nedelin class (naval missile range)" uuid="d8d0e2cc-5269-11df-af2f-080069138b88" uid="14119">
-        <specific value="1" description="Marshal Nedelin" uuid="d8d1eb9a-5269-11df-a6db-080069138b88" uid="14120"/>
-        <specific value="2" description="Marshal Krylov" uuid="d8d2fbb6-5269-11df-9439-080069138b88" uid="14121"/>
-        <specific value="3" description="Akademik Nicolai Pilyugin" uuid="d8d40cea-5269-11df-a1ce-080069138b88" uid="14122"/>
-      </subcategory>
-      <subcategory value="42" description="Kamchatka class (AG) (naval missile range)" uuid="d8d5b9a0-5269-11df-814b-080069138b88" uid="14123">
-        <specific value="1" description="SSV 391 Kamchatka" uuid="d8d6c3ae-5269-11df-9bec-080069138b88" uid="14124"/>
-      </subcategory>
-      <subcategory value="43" description="Kapusta class (naval missile range)" uuid="d8d8769a-5269-11df-aa47-080069138b88" uid="14125">
-        <specific value="1" description="SSV 33 Ural" uuid="d8d98486-5269-11df-955e-080069138b88" uid="14126"/>
-      </subcategory>
-      <subcategory value="44" description="Ugra II class (AXT) (training)" uuid="d8db3038-5269-11df-8222-080069138b88" uid="14127">
-        <specific value="1" description="Borodino" uuid="d8dc41f8-5269-11df-8a5a-080069138b88" uid="14128"/>
-        <specific value="2" description="Gangut" uuid="d8dd495e-5269-11df-85f2-080069138b88" uid="14129"/>
-      </subcategory>
-      <subcategory value="45" description="Smolny class (AXT) (training)" uuid="d8def75e-5269-11df-9a41-080069138b88" uid="14130">
-        <specific value="1" description="Khasan" uuid="d8e004dc-5269-11df-96e4-080069138b88" uid="14131"/>
-        <specific value="2" description="Perekop" uuid="d8e1155c-5269-11df-a1d3-080069138b88" uid="14132"/>
-        <specific value="3" description="Smolny" uuid="d8e21d62-5269-11df-b5fa-080069138b88" uid="14133"/>
-      </subcategory>
-      <subcategory value="46" description="Wodnik II class (AXT) (training)" uuid="d8e3c900-5269-11df-a4a9-080069138b88" uid="14134">
-        <specific value="1" description="Luga" uuid="d8e4d9f8-5269-11df-bbd5-080069138b88" uid="14135"/>
-        <specific value="2" description="Oka" uuid="d8e5e79e-5269-11df-b398-080069138b88" uid="14136"/>
-      </subcategory>
-      <subcategory value="47" description="Sail training ships" uuid="d8e79350-5269-11df-a8b5-080069138b88" uid="14137">
-        <specific value="1" description="Mir" uuid="d8e89da4-5269-11df-8b0a-080069138b88" uid="14138"/>
-        <specific value="2" description="Druzjba" uuid="d8e9b2de-5269-11df-b766-080069138b88" uid="14139"/>
-        <specific value="3" description="Khersones" uuid="d8eac264-5269-11df-aadf-080069138b88" uid="14140"/>
-        <specific value="4" description="Pallada" uuid="d8ebcb82-5269-11df-8dac-080069138b88" uid="14141"/>
-      </subcategory>
-      <subcategory value="48" description="Klasma class (cable ships)" uuid="d8ed7a36-5269-11df-86cb-080069138b88" uid="14142">
-        <specific value="1" description="Donets" uuid="d8ee8822-5269-11df-840c-080069138b88" uid="14143"/>
-        <specific value="2" description="Ingul" uuid="d8ef94b0-5269-11df-b34c-080069138b88" uid="14144"/>
-        <specific value="3" description="Inguri" uuid="d8f09ff4-5269-11df-8c10-080069138b88" uid="14145"/>
-        <specific value="4" description="Katun" uuid="d8f1ab56-5269-11df-8ea1-080069138b88" uid="14146"/>
-        <specific value="5" description="Tavda" uuid="d8f2b82a-5269-11df-9261-080069138b88" uid="14147"/>
-        <specific value="6" description="Tsna" uuid="d8f3c3b4-5269-11df-99da-080069138b88" uid="14148"/>
-        <specific value="7" description="Yana type I" uuid="d8f4cf2a-5269-11df-b3ef-080069138b88" uid="14149"/>
-        <specific value="8" description="Zeya" uuid="d8f5dc58-5269-11df-b075-080069138b88" uid="14150"/>
-      </subcategory>
-      <subcategory value="49" description="Emba I class (cable ships)" uuid="d8f78d78-5269-11df-8d5e-080069138b88" uid="14151">
-        <specific value="1" description="Emba" uuid="d8f89588-5269-11df-ab1d-080069138b88" uid="14152"/>
-        <specific value="2" description="Nepryadva" uuid="d8f9a2b6-5269-11df-9c84-080069138b88" uid="14153"/>
-        <specific value="3" description="Setun" uuid="d8fab2e6-5269-11df-a605-080069138b88" uid="14154"/>
-      </subcategory>
-      <subcategory value="50" description="Emba II class (cable ships)" uuid="d8fc5e98-5269-11df-96c2-080069138b88" uid="14155">
-        <specific value="1" description="Biriusa" uuid="d8fd6914-5269-11df-a5ff-080069138b88" uid="14156"/>
-        <specific value="2" description="Kemj" uuid="d8fe74da-5269-11df-8330-080069138b88" uid="14157"/>
-      </subcategory>
-      <subcategory value="51" description="Berezina class (replenishment ships)" uuid="d9002500-5269-11df-ba3f-080069138b88" uid="14158">
-        <specific value="1" description="Berezina" uuid="d90134c2-5269-11df-a8d7-080069138b88" uid="14159"/>
-      </subcategory>
-      <subcategory value="52" description="Boris Chilikin class (replenishment ships)" uuid="d902e4de-5269-11df-9845-080069138b88" uid="14160">
-        <specific value="1" description="Boris Butoma" uuid="d903ed5c-5269-11df-844c-080069138b88" uid="14161"/>
-        <specific value="2" description="Genrich Gasanov" uuid="d904fa9e-5269-11df-b491-080069138b88" uid="14162"/>
-        <specific value="3" description="Boris Chilikin" uuid="d9060d8a-5269-11df-bb29-080069138b88" uid="14163"/>
-        <specific value="4" description="Ivan Bubnov" uuid="d90714dc-5269-11df-9db9-080069138b88" uid="14164"/>
-        <specific value="5" description="Dnestr" uuid="d908228c-5269-11df-aa3f-080069138b88" uid="14165"/>
-        <specific value="6" description="Vladimir Kolechitsky" uuid="d9093bfe-5269-11df-bdd4-080069138b88" uid="14166"/>
-      </subcategory>
-      <subcategory value="53" description="Dubna class (replenishment tankers)" uuid="d90ae986-5269-11df-9cb0-080069138b88" uid="14167">
-        <specific value="1" description="Dubna" uuid="d90bf2d6-5269-11df-bf72-080069138b88" uid="14168"/>
-        <specific value="2" description="Pechenga" uuid="d90d00c2-5269-11df-b1ac-080069138b88" uid="14169"/>
-        <specific value="3" description="Irkut" uuid="d90e0f80-5269-11df-8548-080069138b88" uid="14170"/>
-        <specific value="4" description="Sventa" uuid="d90f1b6e-5269-11df-ac69-080069138b88" uid="14171"/>
-      </subcategory>
-      <subcategory value="54" description="Mod Kazbek class (replenishment tankers)" uuid="d910c5a4-5269-11df-b59a-080069138b88" uid="14172">
-        <specific value="1" description="Alatyr" uuid="d911d57a-5269-11df-8908-080069138b88" uid="14173"/>
-        <specific value="2" description="Desna" uuid="d912e6a4-5269-11df-a6ae-080069138b88" uid="14174"/>
-        <specific value="3" description="Volkhov" uuid="d913ec5c-5269-11df-94f2-080069138b88" uid="14175"/>
-      </subcategory>
-      <subcategory value="55" description="Mod Altay class (replenishment tankers)" uuid="d9159930-5269-11df-9b1f-080069138b88" uid="14176">
-        <specific value="1" description="Elnya" uuid="d916acc6-5269-11df-a02b-080069138b88" uid="14177"/>
-        <specific value="2" description="Ilim" uuid="d917b954-5269-11df-be5c-080069138b88" uid="14178"/>
-        <specific value="3" description="Izhora" uuid="d918bfe8-5269-11df-a0d9-080069138b88" uid="14179"/>
-        <specific value="4" description="Kola" uuid="d919d054-5269-11df-8b23-080069138b88" uid="14180"/>
-        <specific value="5" description="Prut" uuid="d91adde6-5269-11df-be7a-080069138b88" uid="14181"/>
-        <specific value="6" description="Yegorlik" uuid="d91be38a-5269-11df-a5d4-080069138b88" uid="14182"/>
-      </subcategory>
-      <subcategory value="56" description="Uda class (replenishment tankers)" uuid="d91d9388-5269-11df-86e5-080069138b88" uid="14183">
-        <specific value="1" description="Dunay (mod)" uuid="d91ea250-5269-11df-acc4-080069138b88" uid="14184"/>
-        <specific value="2" description="Koida" uuid="d91faf88-5269-11df-91a4-080069138b88" uid="14185"/>
-        <specific value="3" description="Lena (mod)" uuid="d920b554-5269-11df-bae2-080069138b88" uid="14186"/>
-        <specific value="4" description="Terek (mod)" uuid="d921c70a-5269-11df-aad5-080069138b88" uid="14187"/>
-        <specific value="5" description="Vishera" uuid="d922d406-5269-11df-8a3a-080069138b88" uid="14188"/>
-      </subcategory>
-      <subcategory value="57" description="Olekma class (replenishment tankers)" uuid="d9248184-5269-11df-b171-080069138b88" uid="14189">
-        <specific value="1" description="Olekma (mod)" uuid="d9258b24-5269-11df-b7bb-080069138b88" uid="14190"/>
-        <specific value="2" description="Iman" uuid="d9269a00-5269-11df-9fe7-080069138b88" uid="14191"/>
-        <specific value="3" description="Zolotoy rog" uuid="d927b570-5269-11df-87ca-080069138b88" uid="14192"/>
-      </subcategory>
-      <subcategory value="58" description="Kaliningradneft class (support tankers)" uuid="d929628a-5269-11df-aed9-080069138b88" uid="14193">
-        <specific value="1" description="Argun" uuid="d92a6b62-5269-11df-98a5-080069138b88" uid="14194"/>
-        <specific value="2" description="Vyazma" uuid="d92b7a8e-5269-11df-ad62-080069138b88" uid="14195"/>
-      </subcategory>
-      <subcategory value="59" description="Sofya class (support tanker)" uuid="d92d2ac8-5269-11df-848d-080069138b88" uid="14196">
-        <specific value="1" description="Akhtyuba (ex-Hanoi)" uuid="d92e38d2-5269-11df-bd1a-080069138b88" uid="14197"/>
-      </subcategory>
-      <subcategory value="60" description="Nercha class (support tankers)" uuid="d92fe74a-5269-11df-bad5-080069138b88" uid="14198">
-        <specific value="1" description="Nara" uuid="d930f4b4-5269-11df-9d7f-080069138b88" uid="14199"/>
-        <specific value="2" description="Nercha" uuid="d9320188-5269-11df-a644-080069138b88" uid="14200"/>
-      </subcategory>
-      <subcategory value="61" description="Konda class (support tankers)" uuid="d933accc-5269-11df-88f3-080069138b88" uid="14201">
-        <specific value="1" description="Konda" uuid="d934bd7e-5269-11df-9135-080069138b88" uid="14202"/>
-        <specific value="2" description="Rossosh" uuid="d935c91c-5269-11df-ac87-080069138b88" uid="14203"/>
-        <specific value="3" description="Soyana" uuid="d936d690-5269-11df-815a-080069138b88" uid="14204"/>
-        <specific value="4" description="Yakhroma" uuid="d937e2e2-5269-11df-b699-080069138b88" uid="14205"/>
-      </subcategory>
-      <subcategory value="62" description="Khobi class (support tankers)" uuid="d9399290-5269-11df-a7ae-080069138b88" uid="14206">
-        <specific value="1" description="Cheremshan" uuid="d93a9b86-5269-11df-8bcd-080069138b88" uid="14207"/>
-        <specific value="2" description="Orsha" uuid="d93baae4-5269-11df-b1f9-080069138b88" uid="14208"/>
-        <specific value="3" description="Shelon" uuid="d93cb6b4-5269-11df-94c9-080069138b88" uid="14209"/>
-        <specific value="4" description="Tartu" uuid="d93dc270-5269-11df-99bc-080069138b88" uid="14210"/>
-        <specific value="5" description="Khobi" uuid="d93ecf9e-5269-11df-a549-080069138b88" uid="14211"/>
-        <specific value="6" description="Seima" uuid="d93fdc40-5269-11df-ad6c-080069138b88" uid="14212"/>
-        <specific value="7" description="Sosva" uuid="d940e7ca-5269-11df-97a2-080069138b88" uid="14213"/>
-        <specific value="8" description="Titan 150" uuid="d941f4a8-5269-11df-b7f6-080069138b88" uid="14214"/>
-        <specific value="9" description="Lovat" uuid="d9430212-5269-11df-b7c2-080069138b88" uid="14215"/>
-        <specific value="10" description="Shacha" uuid="d944082e-5269-11df-a93e-080069138b88" uid="14216"/>
-        <specific value="11" description="Sysola" uuid="d94517a0-5269-11df-96ad-080069138b88" uid="14217"/>
-        <specific value="12" description="Tunguska" uuid="d94630d6-5269-11df-a61f-080069138b88" uid="14218"/>
-        <specific value="13" description="Metan" uuid="d9473968-5269-11df-bb79-080069138b88" uid="14219"/>
-      </subcategory>
-      <subcategory value="63" description="Irtysh class (support tanker)" uuid="d948f0be-5269-11df-953a-080069138b88" uid="14220">
-        <specific value="1" description="Narva" uuid="d94a01b6-5269-11df-99bb-080069138b88" uid="14221"/>
-      </subcategory>
-      <subcategory value="64" description="Baskunchak class (support tankers)" uuid="d94bb286-5269-11df-ac4d-080069138b88" uid="14222">
-        <specific value="1" description="Ivan Golubets" uuid="d94cc13a-5269-11df-9635-080069138b88" uid="14223"/>
-        <specific value="2" description="Sovietsky Pogranichnik" uuid="d94dc99a-5269-11df-9280-080069138b88" uid="14224"/>
-      </subcategory>
-      <subcategory value="65" description="Luza class (special tankers)" uuid="d94f7b64-5269-11df-a057-080069138b88" uid="14225">
-        <specific value="1" description="Alambai" uuid="d95088f6-5269-11df-b446-080069138b88" uid="14226"/>
-        <specific value="2" description="Barguzin" uuid="d95194c6-5269-11df-8b10-080069138b88" uid="14227"/>
-        <specific value="3" description="Kama" uuid="d9529c86-5269-11df-a4af-080069138b88" uid="14228"/>
-        <specific value="4" description="Aragvi" uuid="d953adce-5269-11df-815b-080069138b88" uid="14229"/>
-        <specific value="5" description="Don" uuid="d954bbba-5269-11df-b5e1-080069138b88" uid="14230"/>
-        <specific value="6" description="Selenga" uuid="d955c302-5269-11df-bb9f-080069138b88" uid="14231"/>
-      </subcategory>
-      <subcategory value="66" description="Vala class (special tankers)" uuid="d957727e-5269-11df-827c-080069138b88" uid="14232">
-        <specific value="1" description="Vala" uuid="d9588114-5269-11df-be08-080069138b88" uid="14233"/>
-        <specific value="2" description="TNT 11" uuid="d9598ee2-5269-11df-bbb8-080069138b88" uid="14234"/>
-        <specific value="3" description="TNT 27" uuid="d95a9a4e-5269-11df-9b99-080069138b88" uid="14235"/>
-        <specific value="4" description="12" uuid="d95ba74a-5269-11df-b159-080069138b88" uid="14236"/>
-        <specific value="5" description="19" uuid="d95cb432-5269-11df-bba4-080069138b88" uid="14237"/>
-        <specific value="6" description="25" uuid="d95dba44-5269-11df-b067-080069138b88" uid="14238"/>
-        <specific value="7" description="29" uuid="d95ed3fc-5269-11df-86d6-080069138b88" uid="14239"/>
-      </subcategory>
-      <subcategory value="67" description="OB class (AH)" uuid="d96086c0-5269-11df-8359-080069138b88" uid="14240">
-        <specific value="1" description="OB" uuid="d96193c6-5269-11df-a585-080069138b88" uid="14241"/>
-        <specific value="2" description="Yenisei" uuid="d9629abe-5269-11df-9e12-080069138b88" uid="14242"/>
-        <specific value="3" description="Svir" uuid="d963ab3e-5269-11df-aeae-080069138b88" uid="14243"/>
-        <specific value="4" description="Irtysh" uuid="d964c4a6-5269-11df-a035-080069138b88" uid="14244"/>
-      </subcategory>
-      <subcategory value="68" description="Mikhail Rudnitsky class (ARs)" uuid="d96672ce-5269-11df-b7a3-080069138b88" uid="14245">
-        <specific value="1" description="Mikhail Rudnitsky" uuid="d9677c00-5269-11df-b1e0-080069138b88" uid="14246"/>
-        <specific value="2" description="Georgy Kozmin" uuid="d9688b40-5269-11df-b5ee-080069138b88" uid="14247"/>
-        <specific value="3" description="Georgy Titov" uuid="d9699ce2-5269-11df-980e-080069138b88" uid="14248"/>
-        <specific value="4" description="Sayany" uuid="d96aa498-5269-11df-abc7-080069138b88" uid="14249"/>
-      </subcategory>
-      <subcategory value="69" description="Pamir class (salvage, rescue &amp; mooring)" uuid="d96c4f50-5269-11df-b0bc-080069138b88" uid="14250">
-        <specific value="1" description="Agatan" uuid="d96d6070-5269-11df-960a-080069138b88" uid="14251"/>
-        <specific value="2" description="Aldan" uuid="d96e71a4-5269-11df-821d-080069138b88" uid="14252"/>
-      </subcategory>
-      <subcategory value="70" description="Ingul class (salvage, rescue &amp; mooring)" uuid="d9701cac-5269-11df-969f-080069138b88" uid="14253">
-        <specific value="1" description="Pamir" uuid="d97126ce-5269-11df-b0b4-080069138b88" uid="14254"/>
-        <specific value="2" description="Mashuk" uuid="d97237d0-5269-11df-a442-080069138b88" uid="14255"/>
-        <specific value="3" description="Alatau" uuid="d9734580-5269-11df-ba1c-080069138b88" uid="14256"/>
-        <specific value="4" description="Karakh" uuid="d9744caa-5269-11df-975c-080069138b88" uid="14257"/>
-      </subcategory>
-      <subcategory value="71" description="Sliva class (salvage, rescue &amp; mooring)" uuid="d975fc4e-5269-11df-8732-080069138b88" uid="14258">
-        <specific value="1" description="SB 406" uuid="d9770b84-5269-11df-ac6e-080069138b88" uid="14259"/>
-        <specific value="2" description="SB 408" uuid="d9781934-5269-11df-816d-080069138b88" uid="14260"/>
-        <specific value="3" description="SB 921" uuid="d9792342-5269-11df-9d91-080069138b88" uid="14261"/>
-        <specific value="4" description="SB 922 Shakhter" uuid="d97a3070-5269-11df-9f08-080069138b88" uid="14262"/>
-      </subcategory>
-      <subcategory value="72" description="Kashtan class (buoy tenders)" uuid="d97bdd1c-5269-11df-803f-080069138b88" uid="14263">
-        <specific value="1" description="KIL 926" uuid="d97cec7a-5269-11df-a3c6-080069138b88" uid="14264"/>
-        <specific value="2" description="KIL 143" uuid="d97df412-5269-11df-aaf8-080069138b88" uid="14265"/>
-        <specific value="3" description="KIL 164" uuid="d97f01a4-5269-11df-8749-080069138b88" uid="14266"/>
-        <specific value="4" description="KIL 498" uuid="d9800fea-5269-11df-87b9-080069138b88" uid="14267"/>
-        <specific value="5" description="KIL 927" uuid="d9811692-5269-11df-ab6d-080069138b88" uid="14268"/>
-        <specific value="6" description="KIL 158" uuid="d98224ba-5269-11df-9d5e-080069138b88" uid="14269"/>
-        <specific value="7" description="KIL 140" uuid="d98335d0-5269-11df-8cc1-080069138b88" uid="14270"/>
-        <specific value="8" description="KIL 168" uuid="d9844902-5269-11df-93e5-080069138b88" uid="14271"/>
-      </subcategory>
-      <subcategory value="73" description="Sura class (buoy tenders)" uuid="d985f374-5269-11df-8465-080069138b88" uid="14272">
-        <specific value="1" description="KIL 1" uuid="d9870214-5269-11df-ac1e-080069138b88" uid="14273"/>
-        <specific value="2" description="2" uuid="d988130c-5269-11df-bb1a-080069138b88" uid="14274"/>
-        <specific value="3" description="21" uuid="d989196e-5269-11df-ad64-080069138b88" uid="14275"/>
-        <specific value="4" description="22" uuid="d98a25f2-5269-11df-8ce0-080069138b88" uid="14276"/>
-        <specific value="5" description="25" uuid="d98b3596-5269-11df-81e3-080069138b88" uid="14277"/>
-        <specific value="6" description="27" uuid="d98c3db0-5269-11df-80e6-080069138b88" uid="14278"/>
-        <specific value="7" description="29" uuid="d98d4962-5269-11df-ad6a-080069138b88" uid="14279"/>
-        <specific value="8" description="31" uuid="d98e56c2-5269-11df-ad90-080069138b88" uid="14280"/>
-        <specific value="9" description="32" uuid="d98f61d4-5269-11df-9e4c-080069138b88" uid="14281"/>
-        <specific value="10" description="33" uuid="d9906d86-5269-11df-b605-080069138b88" uid="14282"/>
-      </subcategory>
-      <subcategory value="74" description="Orel class (salvage tugs)" uuid="d9921a28-5269-11df-8ca5-080069138b88" uid="14283">
-        <specific value="1" description="SB 38" uuid="d9932df0-5269-11df-9541-080069138b88" uid="14284"/>
-        <specific value="2" description="SB 43" uuid="d9943524-5269-11df-89e0-080069138b88" uid="14285"/>
-      </subcategory>
-      <subcategory value="75" description="Katun I class (salvage &amp; rescue tugs)" uuid="d995dffa-5269-11df-8032-080069138b88" uid="14286">
-        <specific value="1" description="PZHS 96" uuid="d996f098-5269-11df-ac75-080069138b88" uid="14287"/>
-        <specific value="2" description="98" uuid="d997fb8c-5269-11df-970e-080069138b88" uid="14288"/>
-        <specific value="3" description="123" uuid="d9990752-5269-11df-8141-080069138b88" uid="14289"/>
-        <specific value="4" description="124" uuid="d99a12fa-5269-11df-9aab-080069138b88" uid="14290"/>
-        <specific value="5" description="209" uuid="d99b2186-5269-11df-866c-080069138b88" uid="14291"/>
-        <specific value="6" description="273" uuid="d99c2978-5269-11df-bef1-080069138b88" uid="14292"/>
-        <specific value="7" description="279" uuid="d99d3534-5269-11df-972b-080069138b88" uid="14293"/>
-        <specific value="8" description="282" uuid="d99e46a4-5269-11df-a1fc-080069138b88" uid="14294"/>
-        <specific value="9" description="551" uuid="d99f4dec-5269-11df-b515-080069138b88" uid="14295"/>
-      </subcategory>
-      <subcategory value="76" description="Katun II (salvage &amp; rescue tugs)" uuid="d9a0fad4-5269-11df-bd90-080069138b88" uid="14296">
-        <specific value="1" description="PZHS 64" uuid="d9a211f8-5269-11df-b3ef-080069138b88" uid="14297"/>
-        <specific value="2" description="92" uuid="d9a32480-5269-11df-bbec-080069138b88" uid="14298"/>
-      </subcategory>
-      <subcategory value="77" description="Neptun class (salvage, rescue &amp; mooring)" uuid="d9a4d0a0-5269-11df-84b7-080069138b88" uid="14299">
-        <specific value="1" description="KIL 3" uuid="d9a5dba8-5269-11df-a5b3-080069138b88" uid="14300"/>
-        <specific value="2" description="6" uuid="d9a6e714-5269-11df-ad32-080069138b88" uid="14301"/>
-        <specific value="3" description="7" uuid="d9a7f816-5269-11df-aaf0-080069138b88" uid="14302"/>
-        <specific value="4" description="9" uuid="d9a90094-5269-11df-b436-080069138b88" uid="14303"/>
-        <specific value="5" description="11" uuid="d9aa0cdc-5269-11df-a84a-080069138b88" uid="14304"/>
-        <specific value="6" description="13" uuid="d9ab1b7c-5269-11df-9f59-080069138b88" uid="14305"/>
-        <specific value="7" description="15" uuid="d9ac25bc-5269-11df-82cb-080069138b88" uid="14306"/>
-        <specific value="8" description="17" uuid="d9ad3268-5269-11df-9d2e-080069138b88" uid="14307"/>
-        <specific value="9" description="18" uuid="d9ae3d84-5269-11df-800c-080069138b88" uid="14308"/>
-      </subcategory>
-      <subcategory value="78" description="Elbrus class (submarine rescue ships)" uuid="d9afee2c-5269-11df-843c-080069138b88" uid="14309">
-        <specific value="1" description="Elbrus" uuid="d9b0f826-5269-11df-aaf6-080069138b88" uid="14310"/>
-        <specific value="2" description="Alagez" uuid="d9b20496-5269-11df-bb6a-080069138b88" uid="14311"/>
-      </subcategory>
-      <subcategory value="79" description="Nepa class (submarine rescue ships)" uuid="d9b3b50c-5269-11df-84fc-080069138b88" uid="14312">
-        <specific value="1" description="Karpaty" uuid="d9b4c33e-5269-11df-992c-080069138b88" uid="14313"/>
-      </subcategory>
-      <subcategory value="80" description="Prut class (submarine rescue ships)" uuid="d9b66eb4-5269-11df-9faf-080069138b88" uid="14314">
-        <specific value="1" description="Altay" uuid="d9b77a0c-5269-11df-bab5-080069138b88" uid="14315"/>
-        <specific value="2" description="Beshtau" uuid="d9b886f4-5269-11df-a918-080069138b88" uid="14316"/>
-        <specific value="3" description="Vladimir Trefolev" uuid="d9b994e0-5269-11df-bf54-080069138b88" uid="14317"/>
-        <specific value="4" description="Zhiguli" uuid="d9ba9dd6-5269-11df-816e-080069138b88" uid="14318"/>
-        <specific value="5" description="SS 21" uuid="d9bba9b0-5269-11df-ab62-080069138b88" uid="14319"/>
-        <specific value="6" description="Epron (ex-SS 26)" uuid="d9bcbad0-5269-11df-9ac9-080069138b88" uid="14320"/>
-        <specific value="7" description="SS 83" uuid="d9bdc2a4-5269-11df-a7a5-080069138b88" uid="14321"/>
-      </subcategory>
-      <subcategory value="81" description="Valday class (ex-T 58)" uuid="d9bf6e2e-5269-11df-9876-080069138b88" uid="14322">
-        <specific value="1" description="Kazbek" uuid="d9c0871e-5269-11df-8e85-080069138b88" uid="14323"/>
-        <specific value="2" description="Khibiny" uuid="d9c1974e-5269-11df-8852-080069138b88" uid="14324"/>
-        <specific value="3" description="Valday" uuid="d9c29fb8-5269-11df-a66b-080069138b88" uid="14325"/>
-        <specific value="4" description="Zangezur" uuid="d9c3af8e-5269-11df-bd5c-080069138b88" uid="14326"/>
-        <specific value="5" description="Pulkovo (ex-SS 38)" uuid="d9c4bcee-5269-11df-9557-080069138b88" uid="14327"/>
-        <specific value="6" description="SS 30" uuid="d9c5c58a-5269-11df-a6d9-080069138b88" uid="14328"/>
-        <specific value="7" description="35" uuid="d9c6d3b2-5269-11df-ad23-080069138b88" uid="14329"/>
-        <specific value="8" description="40" uuid="d9c7df96-5269-11df-9594-080069138b88" uid="14330"/>
-        <specific value="9" description="47" uuid="d9c8ecd8-5269-11df-8e33-080069138b88" uid="14331"/>
-        <specific value="10" description="50" uuid="d9c9f95c-5269-11df-b2f4-080069138b88" uid="14332"/>
-      </subcategory>
-      <subcategory value="82" description="Anadyr class (transports)" uuid="d9cba3f6-5269-11df-8099-080069138b88" uid="14333">
-        <specific value="1" description="Anadyr" uuid="d9ccb764-5269-11df-b9fe-080069138b88" uid="14334"/>
-      </subcategory>
-      <subcategory value="83" description="Angara class (transports)" uuid="d9ce626c-5269-11df-8a8a-080069138b88" uid="14335">
-        <specific value="1" description="Angara (ex-Hela)" uuid="d9cf6edc-5269-11df-9439-080069138b88" uid="14336"/>
-      </subcategory>
-      <subcategory value="84" description="Amguema class (transports)" uuid="d9d11b06-5269-11df-8519-080069138b88" uid="14337">
-        <specific value="1" description="Yauza" uuid="d9d22c8a-5269-11df-a9e8-080069138b88" uid="14338"/>
-      </subcategory>
-      <subcategory value="85" description="Chulym class (transports)" uuid="d9d3d918-5269-11df-b06b-080069138b88" uid="14339">
-        <specific value="1" description="Severodonetsk" uuid="d9d4e952-5269-11df-aea1-080069138b88" uid="14340"/>
-      </subcategory>
-      <subcategory value="86" description="Andizan class (transports)" uuid="d9d69572-5269-11df-a21a-080069138b88" uid="14341">
-        <specific value="1" description="Onda" uuid="d9d7a2f0-5269-11df-9271-080069138b88" uid="14342"/>
-        <specific value="2" description="Posyet" uuid="d9d8b0d2-5269-11df-b51d-080069138b88" uid="14343"/>
-      </subcategory>
-      <subcategory value="87" description="Kalinin class (transports)" uuid="d9da5bbc-5269-11df-b462-080069138b88" uid="14344">
-        <specific value="1" description="Kuban (ex-Nadeshda-Krupskaya)" uuid="d9db6b06-5269-11df-9697-080069138b88" uid="14345"/>
-      </subcategory>
-      <subcategory value="88" description="Antonov class (transports)" uuid="d9dd1cb2-5269-11df-8bce-080069138b88" uid="14346">
-        <specific value="1" description="Neon Antonov" uuid="d9de2562-5269-11df-b2ae-080069138b88" uid="14347"/>
-        <specific value="2" description="Irbit" uuid="d9df3b46-5269-11df-a7e2-080069138b88" uid="14348"/>
-        <specific value="3" description="Nicolay Starshinov" uuid="d9e04ba8-5269-11df-9499-080069138b88" uid="14349"/>
-        <specific value="4" description="Ivan Lednev" uuid="d9e158f4-5269-11df-aaf2-080069138b88" uid="14350"/>
-        <specific value="5" description="Nikolay Sipyagin" uuid="d9e266b8-5269-11df-a2f6-080069138b88" uid="14351"/>
-        <specific value="6" description="Ivan Sudtsov" uuid="d9e3735a-5269-11df-ab1d-080069138b88" uid="14352"/>
-        <specific value="7" description="Ivan Odtejev" uuid="d9e47ce6-5269-11df-9a7c-080069138b88" uid="14353"/>
-        <specific value="8" description="Victor Denison" uuid="d9e58ee2-5269-11df-b834-080069138b88" uid="14354"/>
-        <specific value="9" description="Sergey Sudetsky" uuid="d9e69c60-5269-11df-9720-080069138b88" uid="14355"/>
-        <specific value="10" description="Dvina" uuid="d9e7a416-5269-11df-ac86-080069138b88" uid="14356"/>
-        <specific value="11" description="Mikhail Konovalov" uuid="d9e8b4a0-5269-11df-8417-080069138b88" uid="14357"/>
-      </subcategory>
-      <subcategory value="89" description="Partizan class (transports)" uuid="d9ea6160-5269-11df-b298-080069138b88" uid="14358">
-        <specific value="1" description="Pechora" uuid="d9eb6fa6-5269-11df-acaa-080069138b88" uid="14359"/>
-        <specific value="2" description="Turgay" uuid="d9ec79aa-5269-11df-b566-080069138b88" uid="14360"/>
-        <specific value="3" description="Ufa" uuid="d9ed8732-5269-11df-b02c-080069138b88" uid="14361"/>
-        <specific value="4" description="V Adm Fomin (ex-Pinega) (mod)" uuid="d9ee9460-5269-11df-8caa-080069138b88" uid="14362"/>
-      </subcategory>
-      <subcategory value="90" description="Keyla class (transports)" uuid="d9f04404-5269-11df-9fe6-080069138b88" uid="14363">
-        <specific value="1" description="Mezen" uuid="d9f15100-5269-11df-b6ed-080069138b88" uid="14364"/>
-        <specific value="2" description="Onega" uuid="d9f25ec4-5269-11df-b3a7-080069138b88" uid="14365"/>
-        <specific value="3" description="Ponoi" uuid="d9f36bf2-5269-11df-8291-080069138b88" uid="14366"/>
-        <specific value="4" description="Ritsa (AGI)" uuid="d9f47326-5269-11df-864a-080069138b88" uid="14367"/>
-        <specific value="5" description="Teriberka" uuid="d9f5818a-5269-11df-82e9-080069138b88" uid="14368"/>
-        <specific value="6" description="Tuloma" uuid="d9f6937c-5269-11df-809c-080069138b88" uid="14369"/>
-        <specific value="7" description="Tvertsa" uuid="d9f79eca-5269-11df-b030-080069138b88" uid="14370"/>
-        <specific value="8" description="Unza" uuid="d9f8aff4-5269-11df-9b96-080069138b88" uid="14371"/>
-        <specific value="9" description="Ussury" uuid="d9f9bf02-5269-11df-b2c8-080069138b88" uid="14372"/>
-        <specific value="10" description="Yeruslan" uuid="d9fac820-5269-11df-8932-080069138b88" uid="14373"/>
-      </subcategory>
-      <subcategory value="91" description="Muna class (transports)" uuid="d9fc7738-5269-11df-9f07-080069138b88" uid="14374">
-        <specific value="1" description="VTR 28" uuid="d9fd8556-5269-11df-8925-080069138b88" uid="14375"/>
-        <specific value="2" description="48" uuid="d9fe9af4-5269-11df-8b5e-080069138b88" uid="14376"/>
-        <specific value="3" description="81" uuid="d9ffa570-5269-11df-9424-080069138b88" uid="14377"/>
-        <specific value="4" description="82" uuid="da00b1c2-5269-11df-814d-080069138b88" uid="14378"/>
-        <specific value="5" description="83" uuid="da01c2f6-5269-11df-a499-080069138b88" uid="14379"/>
-        <specific value="6" description="84" uuid="da02ca8e-5269-11df-a69a-080069138b88" uid="14380"/>
-        <specific value="7" description="85" uuid="da03d76c-5269-11df-9539-080069138b88" uid="14381"/>
-        <specific value="8" description="86" uuid="da04e56c-5269-11df-9a68-080069138b88" uid="14382"/>
-        <specific value="9" description="91" uuid="da05f038-5269-11df-8f79-080069138b88" uid="14383"/>
-        <specific value="10" description="92" uuid="da06fd3e-5269-11df-821a-080069138b88" uid="14384"/>
-        <specific value="11" description="93" uuid="da0809a4-5269-11df-abc8-080069138b88" uid="14385"/>
-        <specific value="12" description="94" uuid="da09116e-5269-11df-add2-080069138b88" uid="14386"/>
-        <specific value="13" description="148" uuid="da0a22ca-5269-11df-a6a4-080069138b88" uid="14387"/>
-      </subcategory>
-      <subcategory value="92" description="Mayak class (transports)" uuid="da0bce7c-5269-11df-bbdc-080069138b88" uid="14388">
-        <specific value="1" description="Buzuluk" uuid="da0cdb5a-5269-11df-b872-080069138b88" uid="14389"/>
-        <specific value="2" description="Ishim" uuid="da0de766-5269-11df-bd4b-080069138b88" uid="14390"/>
-        <specific value="3" description="Lama" uuid="da0ef4bc-5269-11df-8dfb-080069138b88" uid="14391"/>
-        <specific value="4" description="Mius" uuid="da100406-5269-11df-9ea6-080069138b88" uid="14392"/>
-        <specific value="5" description="Neman" uuid="da110f4a-5269-11df-b6bb-080069138b88" uid="14393"/>
-        <specific value="6" description="Rioni" uuid="da121cbe-5269-11df-ab21-080069138b88" uid="14394"/>
-        <specific value="7" description="Ulma" uuid="da132960-5269-11df-b783-080069138b88" uid="14395"/>
-        <specific value="8" description="Vytegra" uuid="da142fd6-5269-11df-9976-080069138b88" uid="14396"/>
-      </subcategory>
-      <subcategory value="93" description="Lentra class (transports)" uuid="da15e13c-5269-11df-9117-080069138b88" uid="14397">
-        <specific value="1" description="Alma" uuid="da16ef32-5269-11df-8efe-080069138b88" uid="14398"/>
-        <specific value="2" description="Kacha" uuid="da17fc24-5269-11df-97a6-080069138b88" uid="14399"/>
-        <specific value="3" description="Ufa" uuid="da19031c-5269-11df-8b36-080069138b88" uid="14400"/>
-        <specific value="4" description="Ugra" uuid="da1a10c2-5269-11df-aa55-080069138b88" uid="14401"/>
-        <specific value="5" description="VTR 1" uuid="da1b21ec-5269-11df-847d-080069138b88" uid="14402"/>
-        <specific value="6" description="28" uuid="da1c28bc-5269-11df-9bac-080069138b88" uid="14403"/>
-        <specific value="7" description="32" uuid="da1d3f90-5269-11df-9302-080069138b88" uid="14404"/>
-        <specific value="8" description="143" uuid="da1e50a6-5269-11df-b44e-080069138b88" uid="14405"/>
-        <specific value="9" description="144" uuid="da1f594c-5269-11df-b8f4-080069138b88" uid="14406"/>
-        <specific value="10" description="145" uuid="da20654e-5269-11df-b934-080069138b88" uid="14407"/>
-      </subcategory>
-      <subcategory value="94" description="MP 4 class (transports)" uuid="da2216c8-5269-11df-aeb6-080069138b88" uid="14408">
-        <specific value="1" description="VTR 294" uuid="da2325ae-5269-11df-b8b4-080069138b88" uid="14409"/>
-        <specific value="2" description="VTR 295" uuid="da242c88-5269-11df-be0b-080069138b88" uid="14410"/>
-      </subcategory>
-      <subcategory value="95" description="MP 6 class (transports)" uuid="da25dc40-5269-11df-bfb7-080069138b88" uid="14411">
-        <specific value="1" description="Bira" uuid="da26ea90-5269-11df-999d-080069138b88" uid="14412"/>
-        <specific value="2" description="Vologda" uuid="da27f796-5269-11df-a4a0-080069138b88" uid="14413"/>
-      </subcategory>
-      <subcategory value="96" description="Telnovsk class (transports)" uuid="da29a604-5269-11df-a915-080069138b88" uid="14414">
-        <specific value="1" description="Burovestnik" uuid="da2aaf22-5269-11df-bc73-080069138b88" uid="14415"/>
-        <specific value="2" description="Lag" uuid="da2bbcdc-5269-11df-89c6-080069138b88" uid="14416"/>
-        <specific value="3" description="VTR 73" uuid="da2ccb2c-5269-11df-b4f8-080069138b88" uid="14417"/>
-        <specific value="4" description="VTR 74 (ex-Jan Kreuks)" uuid="da2dd27e-5269-11df-8e27-080069138b88" uid="14418"/>
-      </subcategory>
-      <subcategory value="97" description="Khabarov class (transports)" uuid="da2f85d8-5269-11df-8b0e-080069138b88" uid="14419">
-        <specific value="1" description="VTR 8" uuid="da3094dc-5269-11df-98cd-080069138b88" uid="14420"/>
-        <specific value="2" description="13" uuid="da31a200-5269-11df-a0af-080069138b88" uid="14421"/>
-        <specific value="3" description="15" uuid="da32a8da-5269-11df-b28c-080069138b88" uid="14422"/>
-        <specific value="4" description="25" uuid="da33b748-5269-11df-971c-080069138b88" uid="14423"/>
-      </subcategory>
-      <subcategory value="98" description="Komandor class" uuid="da356750-5269-11df-b1d4-080069138b88" uid="14424">
-        <specific value="1" description="Komandor" uuid="da3673ca-5269-11df-a675-080069138b88" uid="14425"/>
-        <specific value="2" description="Shkiper Gyek" uuid="da377c0c-5269-11df-9a82-080069138b88" uid="14426"/>
-        <specific value="3" description="Herluf Bidstrup" uuid="da388d86-5269-11df-a561-080069138b88" uid="14427"/>
-      </subcategory>
-      <subcategory value="99" description="Onega class" uuid="da3a3a5a-5269-11df-899e-080069138b88" uid="14428">
-        <specific value="1" description="GKS 52" uuid="da3b4dbe-5269-11df-ac9e-080069138b88" uid="14429"/>
-        <specific value="2" description="SFP 95" uuid="da3c5ac4-5269-11df-a307-080069138b88" uid="14430"/>
-        <specific value="3" description="SFP 224" uuid="da3d682e-5269-11df-aa6a-080069138b88" uid="14431"/>
-        <specific value="4" description="SFP 240" uuid="da3e76d8-5269-11df-93a5-080069138b88" uid="14432"/>
-        <specific value="5" description="SFP 283" uuid="da3f821c-5269-11df-aae6-080069138b88" uid="14433"/>
-        <specific value="6" description="GKS 286" uuid="da408f72-5269-11df-a934-080069138b88" uid="14434"/>
-        <specific value="7" description="SFP 295" uuid="da419cdc-5269-11df-b7cf-080069138b88" uid="14435"/>
-        <specific value="8" description="SFP 322" uuid="da42a32a-5269-11df-b0c4-080069138b88" uid="14436"/>
-        <specific value="9" description="SFP 340" uuid="da43b40e-5269-11df-9cff-080069138b88" uid="14437"/>
-        <specific value="10" description="SFP 173" uuid="da44c100-5269-11df-b7fd-080069138b88" uid="14438"/>
-        <specific value="11" description="SFP 511" uuid="da45c924-5269-11df-9c83-080069138b88" uid="14439"/>
-        <specific value="12" description="SFP 542" uuid="da46d968-5269-11df-b574-080069138b88" uid="14440"/>
-        <specific value="13" description="SFP 562" uuid="da47e6be-5269-11df-b0f6-080069138b88" uid="14441"/>
-        <specific value="14" description="SFP 177" uuid="da48eef6-5269-11df-a907-080069138b88" uid="14442"/>
-      </subcategory>
-      <subcategory value="100" description="T 43 class" uuid="da4a9e18-5269-11df-92e5-080069138b88" uid="14443">
-        <specific value="1" description="GKS 11" uuid="da4bab46-5269-11df-af47-080069138b88" uid="14444"/>
-        <specific value="2" description="12" uuid="da4cb950-5269-11df-a12a-080069138b88" uid="14445"/>
-        <specific value="3" description="14-24" uuid="da4dc23c-5269-11df-8222-080069138b88" uid="14446"/>
-        <specific value="4" description="26" uuid="da4ecea2-5269-11df-8fc8-080069138b88" uid="14447"/>
-        <specific value="5" description="45" uuid="da4fe012-5269-11df-afba-080069138b88" uid="14448"/>
-      </subcategory>
-      <subcategory value="101" description="(deprecated)" deprecated="1" uuid="da518bd8-5269-11df-93e4-080069138b88" uid="14449"/>
-      <subcategory value="102" description="(deprecated)" deprecated="1" uuid="da5296cc-5269-11df-9d07-080069138b88" uid="14450"/>
-      <subcategory value="103" description="(deprecated)" deprecated="1" uuid="da53a602-5269-11df-8324-080069138b88" uid="14451"/>
-      <subcategory value="104" description="PO 2 class" uuid="da54b920-5269-11df-9d66-080069138b88" uid="14452"/>
-      <subcategory value="105" description="Nyryat 2 class" uuid="da55c338-5269-11df-b4be-080069138b88" uid="14453"/>
-      <subcategory value="106" description="Nyryat 1 class" uuid="da56d0ca-5269-11df-a8f6-080069138b88" uid="14454"/>
-      <subcategory value="107" description="Petrushka class" uuid="da57e12c-5269-11df-b0f3-080069138b88" uid="14455"/>
-      <subcategory value="108" description="Miernyk class" uuid="da58eee6-5269-11df-9b30-080069138b88" uid="14456"/>
-      <subcategory value="109" description="Daldyn class" uuid="da5a0524-5269-11df-87d6-080069138b88" uid="14457">
-        <specific value="1" description="Daldyn" uuid="da5b1338-5269-11df-a09b-080069138b88" uid="14458"/>
-      </subcategory>
-      <subcategory value="110" description="Yelva class" uuid="da5cc3ae-5269-11df-99df-080069138b88" uid="14459">
-        <specific value="1" description="VM 143" uuid="da5dcd76-5269-11df-8438-080069138b88" uid="14460"/>
-        <specific value="2" description="146" uuid="da5edbc6-5269-11df-a9e7-080069138b88" uid="14461"/>
-        <specific value="3" description="154" uuid="da5fe7fa-5269-11df-a2e1-080069138b88" uid="14462"/>
-        <specific value="4" description="266" uuid="da60f5dc-5269-11df-97a4-080069138b88" uid="14463"/>
-        <specific value="5" description="268" uuid="da620328-5269-11df-ada9-080069138b88" uid="14464"/>
-        <specific value="6" description="413" uuid="da631088-5269-11df-a39b-080069138b88" uid="14465"/>
-        <specific value="7" description="414" uuid="da641b2c-5269-11df-8e88-080069138b88" uid="14466"/>
-        <specific value="8" description="416" uuid="da652828-5269-11df-8ef5-080069138b88" uid="14467"/>
-        <specific value="9" description="420" uuid="da66352e-5269-11df-8c03-080069138b88" uid="14468"/>
-        <specific value="10" description="425" uuid="da673bea-5269-11df-8ae2-080069138b88" uid="14469"/>
-        <specific value="11" description="907" uuid="da684a3a-5269-11df-8b08-080069138b88" uid="14470"/>
-        <specific value="12" description="909" uuid="da695baa-5269-11df-acc3-080069138b88" uid="14471"/>
-      </subcategory>
-      <subcategory value="111" description="Bolva (barracks ships)" uuid="da6b07c0-5269-11df-ac14-080069138b88" uid="14472">
-        <specific value="1" description="Bolva 1" uuid="da6c0fee-5269-11df-ac0e-080069138b88" uid="14473"/>
-        <specific value="2" description="Bolva 2" uuid="da6d20e6-5269-11df-b00d-080069138b88" uid="14474"/>
-        <specific value="3" description="Bolva 3" uuid="da6e31fc-5269-11df-b4db-080069138b88" uid="14475"/>
-      </subcategory>
-      <subcategory value="112" description="Target Barge" uuid="da6fdc82-5269-11df-bbed-080069138b88" uid="14476"/>
-    </category>
-    <category value="17" description="Auxiliary, Merchant Marine" uuid="da718c08-5269-11df-b2b5-080069138b88" uid="14477">
-      <subcategory value="1" description="Tamyr class (ice breakers)" uuid="da72959e-5269-11df-9ecc-080069138b88" uid="14478">
-        <specific value="1" description="Tamyr" uuid="da73a498-5269-11df-9240-080069138b88" uid="14479"/>
-        <specific value="2" description="Vaygach" uuid="da74b0cc-5269-11df-9572-080069138b88" uid="14480"/>
-      </subcategory>
-      <subcategory value="2" description="Arktika class (ice breakers)" uuid="da766070-5269-11df-b11d-080069138b88" uid="14481">
-        <specific value="1" description="Arktika" uuid="da776a42-5269-11df-8d51-080069138b88" uid="14482"/>
-        <specific value="2" description="Sibir" uuid="da787964-5269-11df-914b-080069138b88" uid="14483"/>
-        <specific value="3" description="Rossiya" uuid="da798e76-5269-11df-a415-080069138b88" uid="14484"/>
-        <specific value="4" description="Sovetskiy Soyuz" uuid="da7a9b7c-5269-11df-aa89-080069138b88" uid="14485"/>
-        <specific value="5" description="Oktyabryskaya Revolutsiya" uuid="da7bab16-5269-11df-8bd5-080069138b88" uid="14486"/>
-        <specific value="6" description="Ural (1996)" uuid="da7cbae2-5269-11df-b99b-080069138b88" uid="14487"/>
-      </subcategory>
-      <subcategory value="3" description="Yermak class (ice breakers)" uuid="da7e6a86-5269-11df-9532-080069138b88" uid="14488">
-        <specific value="1" description="Yermak" uuid="da7f73d6-5269-11df-9efb-080069138b88" uid="14489"/>
-        <specific value="2" description="Admiral Makarov" uuid="da8081e0-5269-11df-93db-080069138b88" uid="14490"/>
-        <specific value="3" description="Krasin" uuid="da819486-5269-11df-ba74-080069138b88" uid="14491"/>
-      </subcategory>
-      <subcategory value="4" description="Moskva class (ice breakers)" uuid="da833eee-5269-11df-9d71-080069138b88" uid="14492">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="da844942-5269-11df-973f-080069138b88" uid="14493"/>
-        <specific value="2" description="Leningrad" uuid="da855bca-5269-11df-a473-080069138b88" uid="14494"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="da86686c-5269-11df-a56d-080069138b88" uid="14495"/>
-        <specific value="4" description="Murmansk" uuid="da877306-5269-11df-8d14-080069138b88" uid="14496"/>
-        <specific value="5" description="Vladivostok" uuid="da888462-5269-11df-9a3e-080069138b88" uid="14497"/>
-      </subcategory>
-      <subcategory value="5" description="Kapitan Sorokin class (ice breakers)" uuid="da8a30d2-5269-11df-8fde-080069138b88" uid="14498">
-        <specific value="1" description="Kapitan Sorokin (mod)" uuid="da8b3fea-5269-11df-82e6-080069138b88" uid="14499"/>
-        <specific value="2" description="Kapitan Nikolayev" uuid="da8c4e4e-5269-11df-b5cd-080069138b88" uid="14500"/>
-        <specific value="3" description="Kapitan Dranitsyn" uuid="da8d5d3e-5269-11df-9544-080069138b88" uid="14501"/>
-        <specific value="4" description="Kapitan Khlebnikov" uuid="da8e6bde-5269-11df-8650-080069138b88" uid="14502"/>
-      </subcategory>
-      <subcategory value="6" description="Mudyug class (ice breakers)" uuid="da901de4-5269-11df-b347-080069138b88" uid="14503">
-        <specific value="1" description="Mudyug" uuid="da912bda-5269-11df-9280-080069138b88" uid="14504"/>
-        <specific value="2" description="Magadan" uuid="da9239a8-5269-11df-a791-080069138b88" uid="14505"/>
-        <specific value="3" description="Dikson" uuid="da934708-5269-11df-95a2-080069138b88" uid="14506"/>
-      </subcategory>
-      <subcategory value="7" description="Kapitan Belousov class (ice breakers)" uuid="da94f3fa-5269-11df-ab20-080069138b88" uid="14507">
-        <specific value="1" description="Kapitan Belousov" uuid="da960290-5269-11df-96a8-080069138b88" uid="14508"/>
-        <specific value="2" description="Kapitan Melekhov" uuid="da9717c0-5269-11df-aa9a-080069138b88" uid="14509"/>
-        <specific value="3" description="Kapitan Voronin" uuid="da982930-5269-11df-bfe1-080069138b88" uid="14510"/>
-      </subcategory>
-      <subcategory value="8" description="Dobrynya Nikitich class (ice breakers)" uuid="da99d712-5269-11df-aa0a-080069138b88" uid="14511">
-        <specific value="1" description="Afanasy Nikitin (ex-Ledokol 2)" uuid="da9ae512-5269-11df-bff9-080069138b88" uid="14512"/>
-        <specific value="2" description="Purga (1961)" uuid="da9bf4ac-5269-11df-afb3-080069138b88" uid="14513"/>
-        <specific value="3" description="Buran (1966)" uuid="da9d0234-5269-11df-bc43-080069138b88" uid="14514"/>
-        <specific value="4" description="Sadko (1968)" uuid="da9e0a58-5269-11df-8690-080069138b88" uid="14515"/>
-        <specific value="5" description="Dobrynya Nikitich (1960)" uuid="da9f1ca4-5269-11df-a80d-080069138b88" uid="14516"/>
-        <specific value="6" description="Semen Chelyuskin (ex-Ledokol 8)(1965)" uuid="daa02c70-5269-11df-912c-080069138b88" uid="14517"/>
-        <specific value="7" description="Fedor Litke (1970)" uuid="daa1364c-5269-11df-a987-080069138b88" uid="14518"/>
-        <specific value="8" description="Georgy Sedov (1967)" uuid="daa2485c-5269-11df-bbb5-080069138b88" uid="14519"/>
-        <specific value="9" description="Semen Dezhnev (1971)" uuid="daa356ac-5269-11df-ac9e-080069138b88" uid="14520"/>
-        <specific value="10" description="Ilya Muromets (1966)" uuid="daa45fe8-5269-11df-b73a-080069138b88" uid="14521"/>
-        <specific value="11" description="Vasily Poyarkov (ex-Ledokol 4) (1963)" uuid="daa56d8e-5269-11df-bf92-080069138b88" uid="14522"/>
-        <specific value="12" description="Ivan Moskvitin (1971)" uuid="daa6811a-5269-11df-acc3-080069138b88" uid="14523"/>
-        <specific value="13" description="Vladimir Rusanov (ex-Ledokol 7) (1964)" uuid="daa78a6a-5269-11df-be9d-080069138b88" uid="14524"/>
-        <specific value="14" description="Ivan Kruzenshtern (ex-Ledokol 6) (1964)" uuid="daa89a68-5269-11df-8046-080069138b88" uid="14525"/>
-        <specific value="15" description="Khariton Laptev (ex-Ledokol 3) (1962)" uuid="daa9ac1e-5269-11df-9f0a-080069138b88" uid="14526"/>
-        <specific value="16" description="Vyuga (1961) (ex-Ledokol 5) (1963)" uuid="daaab9f6-5269-11df-8dcf-080069138b88" uid="14527"/>
-        <specific value="17" description="P Pakhtusov (1966)" uuid="daabca4e-5269-11df-ac5b-080069138b88" uid="14528"/>
-        <specific value="18" description="Peresvet (1969)" uuid="daacd790-5269-11df-ac88-080069138b88" uid="14529"/>
-        <specific value="19" description="Yerofei Khabarov" uuid="daade130-5269-11df-9da4-080069138b88" uid="14530"/>
-        <specific value="20" description="Yury Lisyansky (ex-Ledokol 9) (1965)" uuid="daaef408-5269-11df-97a2-080069138b88" uid="14531"/>
-        <specific value="21" description="Plug (1961)" uuid="dab00334-5269-11df-bf2a-080069138b88" uid="14532"/>
-      </subcategory>
-      <subcategory value="9" description="Kapitan Chechkin class (ice breakers)" uuid="dab1aff4-5269-11df-8de3-080069138b88" uid="14533">
-        <specific value="1" description="Kapitan Chechkin" uuid="dab2bdc2-5269-11df-a974-080069138b88" uid="14534"/>
-        <specific value="2" description="Kapitan Plakhin" uuid="dab3cbae-5269-11df-b43e-080069138b88" uid="14535"/>
-        <specific value="3" description="Kapitan Chadayev" uuid="dab4daee-5269-11df-89e4-080069138b88" uid="14536"/>
-        <specific value="4" description="Kapitan Krutov" uuid="dab5ecc2-5269-11df-8558-080069138b88" uid="14537"/>
-        <specific value="5" description="Kapitan Bukayev" uuid="dab7008a-5269-11df-b7ca-080069138b88" uid="14538"/>
-        <specific value="6" description="Kapitan Zarubin" uuid="dab80f5c-5269-11df-bd2a-080069138b88" uid="14539"/>
-      </subcategory>
-      <subcategory value="10" description="Kapitan Yevdokimov class (ice breakers)" uuid="dab9bc4e-5269-11df-a4ce-080069138b88" uid="14540">
-        <specific value="1" description="Kapitan Uevdokimov" uuid="dabaca26-5269-11df-8e0e-080069138b88" uid="14541"/>
-        <specific value="2" description="Kapitan Babichev" uuid="dabbd9fc-5269-11df-b043-080069138b88" uid="14542"/>
-        <specific value="3" description="Kapitan Chudinov" uuid="dabce770-5269-11df-aa71-080069138b88" uid="14543"/>
-        <specific value="4" description="Kapitan Borodkin" uuid="dabdef4e-5269-11df-988f-080069138b88" uid="14544"/>
-        <specific value="5" description="Avramiy Zavenyagin (ex-Kapitan Krylov)" uuid="dabf015e-5269-11df-9a10-080069138b88" uid="14545"/>
-        <specific value="6" description="Kapitan Metsayk" uuid="dac010a8-5269-11df-9a7d-080069138b88" uid="14546"/>
-        <specific value="7" description="Kapitan Demidov" uuid="dac1196c-5269-11df-bdfa-080069138b88" uid="14547"/>
-        <specific value="8" description="Kapitan Moshkin" uuid="dac22a6e-5269-11df-9a28-080069138b88" uid="14548"/>
-      </subcategory>
-      <subcategory value="11" description="Kapitan Izmaylov class (ice breakers)" uuid="dac3d850-5269-11df-aac1-080069138b88" uid="14549">
-        <specific value="1" description="Kapitan M. Izmaylov" uuid="dac4e7a4-5269-11df-a032-080069138b88" uid="14550"/>
-        <specific value="2" description="Kapitan Kosolapov" uuid="dac5f3d8-5269-11df-b699-080069138b88" uid="14551"/>
-        <specific value="3" description="Kapitan A. Radzabov" uuid="dac70192-5269-11df-a22d-080069138b88" uid="14552"/>
-      </subcategory>
-      <subcategory value="12" description="Stroptivy class (ice breakers)" uuid="dac8af7e-5269-11df-82d0-080069138b88" uid="14553">
-        <specific value="1" description="Stroptivy" uuid="dac9c1fc-5269-11df-b346-080069138b88" uid="14554"/>
-        <specific value="2" description="Stakhanovets" uuid="dacacad4-5269-11df-97cf-080069138b88" uid="14555"/>
-        <specific value="3" description="Sibirsky" uuid="dacbd988-5269-11df-842c-080069138b88" uid="14556"/>
-        <specific value="4" description="Spravedlivy" uuid="dacce846-5269-11df-9320-080069138b88" uid="14557"/>
-        <specific value="5" description="Suvorovets" uuid="dacdf218-5269-11df-82e4-080069138b88" uid="14558"/>
-        <specific value="6" description="Fobos" uuid="daceff14-5269-11df-b714-080069138b88" uid="14559"/>
-        <specific value="7" description="Deymos" uuid="dad00fb2-5269-11df-ad55-080069138b88" uid="14560"/>
-      </subcategory>
-      <subcategory value="13" description="Ivan Susanin class (armed ice breakers)" uuid="dad1bcae-5269-11df-aaa4-080069138b88" uid="14561">
-        <specific value="1" description="Zaisberg" uuid="dad2c6da-5269-11df-bd26-080069138b88" uid="14562"/>
-        <specific value="2" description="Neva" uuid="dad3d3e0-5269-11df-b710-080069138b88" uid="14563"/>
-        <specific value="3" description="Dunay" uuid="dad4eba4-5269-11df-8691-080069138b88" uid="14564"/>
-        <specific value="4" description="Ruslan" uuid="dad5f850-5269-11df-9753-080069138b88" uid="14565"/>
-        <specific value="5" description="Imeni XXVI Syezda KPSS" uuid="dad705e2-5269-11df-82a5-080069138b88" uid="14566"/>
-        <specific value="6" description="Volga" uuid="dad8137e-5269-11df-8b87-080069138b88" uid="14567"/>
-        <specific value="7" description="Ivan Susanin" uuid="dad91f76-5269-11df-a862-080069138b88" uid="14568"/>
-        <specific value="8" description="Imeni XXV Syezda KPSS" uuid="dada2d76-5269-11df-8ea3-080069138b88" uid="14569"/>
-      </subcategory>
-    </category>
-    <category value="18" description="Utility" uuid="dadc793c-5269-11df-81ab-080069138b88" uid="14570">
-      <subcategory value="1" description="Manych class (water tankers)" uuid="dadd8ae8-5269-11df-8e6a-080069138b88" uid="14571">
-        <specific value="1" description="Manych" uuid="dade9a3c-5269-11df-bd26-080069138b88" uid="14572"/>
-        <specific value="2" description="Tagil" uuid="dadfa81e-5269-11df-93c1-080069138b88" uid="14573"/>
-      </subcategory>
-      <subcategory value="2" description="Voda class (water carriers)" uuid="dae154ac-5269-11df-98fc-080069138b88" uid="14574">
-        <specific value="1" description="Abakan" uuid="dae26180-5269-11df-9538-080069138b88" uid="14575"/>
-        <specific value="2" description="Sura" uuid="dae36f62-5269-11df-be8c-080069138b88" uid="14576"/>
-        <specific value="3" description="MVT 6" uuid="dae47cae-5269-11df-bf3f-080069138b88" uid="14577"/>
-        <specific value="4" description="9" uuid="dae58342-5269-11df-9dad-080069138b88" uid="14578"/>
-        <specific value="5" description="10" uuid="dae6919c-5269-11df-958e-080069138b88" uid="14579"/>
-        <specific value="6" description="16" uuid="dae7a28a-5269-11df-977a-080069138b88" uid="14580"/>
-        <specific value="7" description="17" uuid="dae8a874-5269-11df-aada-080069138b88" uid="14581"/>
-        <specific value="8" description="18" uuid="dae9b5fc-5269-11df-a9ef-080069138b88" uid="14582"/>
-        <specific value="9" description="20" uuid="daeac6e0-5269-11df-9797-080069138b88" uid="14583"/>
-        <specific value="10" description="21" uuid="daebcec8-5269-11df-a948-080069138b88" uid="14584"/>
-        <specific value="11" description="24" uuid="daecd9da-5269-11df-8b84-080069138b88" uid="14585"/>
-        <specific value="12" description="134" uuid="daede776-5269-11df-8da3-080069138b88" uid="14586"/>
-        <specific value="13" description="135" uuid="daeef328-5269-11df-a939-080069138b88" uid="14587"/>
-        <specific value="14" description="138" uuid="daefff84-5269-11df-bec8-080069138b88" uid="14588"/>
-      </subcategory>
-      <subcategory value="3" description="Pelym class (degaussing ships (YDG))" uuid="daf1abea-5269-11df-9edd-080069138b88" uid="14589">
-        <specific value="1" description="SR 70" uuid="daf2bf4e-5269-11df-9821-080069138b88" uid="14590"/>
-        <specific value="2" description="SR 111" uuid="daf3ce52-5269-11df-8d6b-080069138b88" uid="14591"/>
-        <specific value="3" description="SR 179" uuid="daf4db44-5269-11df-9fe3-080069138b88" uid="14592"/>
-        <specific value="4" description="SR 180" uuid="daf5e98a-5269-11df-9cc7-080069138b88" uid="14593"/>
-        <specific value="5" description="SR 191" uuid="daf6f5dc-5269-11df-92fc-080069138b88" uid="14594"/>
-        <specific value="6" description="SR 203" uuid="daf80300-5269-11df-a381-080069138b88" uid="14595"/>
-        <specific value="7" description="SR 215" uuid="daf90f0c-5269-11df-881e-080069138b88" uid="14596"/>
-        <specific value="8" description="SR 218" uuid="dafa1a6e-5269-11df-af8d-080069138b88" uid="14597"/>
-        <specific value="9" description="SR 221" uuid="dafb2c06-5269-11df-9d58-080069138b88" uid="14598"/>
-        <specific value="10" description="SR 222" uuid="dafc3862-5269-11df-bfdb-080069138b88" uid="14599"/>
-        <specific value="11" description="SR 233" uuid="dafd3fdc-5269-11df-9a25-080069138b88" uid="14600"/>
-        <specific value="12" description="SR 241" uuid="dafe50c0-5269-11df-a3ce-080069138b88" uid="14601"/>
-        <specific value="13" description="SR 276" uuid="daff5e98-5269-11df-81ee-080069138b88" uid="14602"/>
-        <specific value="14" description="SR 280" uuid="db006518-5269-11df-bffb-080069138b88" uid="14603"/>
-        <specific value="15" description="SR 281" uuid="db0172e6-5269-11df-948f-080069138b88" uid="14604"/>
-        <specific value="16" description="SR 407" uuid="db0283d4-5269-11df-9cba-080069138b88" uid="14605"/>
-        <specific value="17" description="SR 409" uuid="db038ae0-5269-11df-a1da-080069138b88" uid="14606"/>
-        <specific value="18" description="SR 455" uuid="db0497b4-5269-11df-b0a7-080069138b88" uid="14607"/>
-      </subcategory>
-      <subcategory value="4" description="Bereza Class (degaussing ships (YDG))" uuid="db06473a-5269-11df-a723-080069138b88" uid="14608">
-        <specific value="1" description="SR 28" uuid="db0759d6-5269-11df-918a-080069138b88" uid="14609"/>
-        <specific value="2" description="SR 59" uuid="db086010-5269-11df-ae6e-080069138b88" uid="14610"/>
-        <specific value="3" description="SR 74" uuid="db096e60-5269-11df-9bf5-080069138b88" uid="14611"/>
-        <specific value="4" description="SR 120" uuid="db0a7fa8-5269-11df-9fe8-080069138b88" uid="14612"/>
-        <specific value="5" description="SR 137" uuid="db0b86f0-5269-11df-991b-080069138b88" uid="14613"/>
-        <specific value="6" description="SR 188" uuid="db0c9298-5269-11df-ab48-080069138b88" uid="14614"/>
-        <specific value="7" description="SR 216" uuid="db0da2d2-5269-11df-9483-080069138b88" uid="14615"/>
-        <specific value="8" description="SR 370" uuid="db0eabb4-5269-11df-add8-080069138b88" uid="14616"/>
-        <specific value="9" description="SR 478" uuid="db0fb748-5269-11df-88e5-080069138b88" uid="14617"/>
-        <specific value="10" description="SR 479" uuid="db10caac-5269-11df-98a2-080069138b88" uid="14618"/>
-        <specific value="11" description="SR 541" uuid="db11dbe0-5269-11df-8f8f-080069138b88" uid="14619"/>
-        <specific value="12" description="SR 548" uuid="db12eb70-5269-11df-8e26-080069138b88" uid="14620"/>
-        <specific value="13" description="SR 568" uuid="db13f844-5269-11df-88b4-080069138b88" uid="14621"/>
-        <specific value="14" description="SR 569" uuid="db1504be-5269-11df-a28c-080069138b88" uid="14622"/>
-        <specific value="15" description="SR 570" uuid="db161372-5269-11df-91ab-080069138b88" uid="14623"/>
-        <specific value="16" description="SR 936" uuid="db17217c-5269-11df-bb78-080069138b88" uid="14624"/>
-        <specific value="17" description="SR 939" uuid="db182c52-5269-11df-8d4d-080069138b88" uid="14625"/>
-      </subcategory>
-      <subcategory value="5" description="Khabarov class (degaussing ships (YDG))" uuid="db19d96c-5269-11df-9c57-080069138b88" uid="14626">
-        <specific value="1" description="Khabarov" uuid="db1ae8f2-5269-11df-8170-080069138b88" uid="14627"/>
-        <specific value="2" description="SR 164" uuid="db1bf882-5269-11df-95ad-080069138b88" uid="14628"/>
-      </subcategory>
-      <subcategory value="6" description="Sekstan class" uuid="db1da236-5269-11df-a1b3-080069138b88" uid="14629"/>
-      <subcategory value="7" description="Korall class" uuid="db1eabfe-5269-11df-9621-080069138b88" uid="14630"/>
-      <subcategory value="8" description="Baklazhan class (tugs)" uuid="db1fbe22-5269-11df-b104-080069138b88" uid="14631">
-        <specific value="1" description="SB 131 Nikolai Chiker" uuid="db20cb6e-5269-11df-b3cf-080069138b88" uid="14632"/>
-        <specific value="2" description="SB 135" uuid="db21d39c-5269-11df-bda8-080069138b88" uid="14633"/>
-      </subcategory>
-      <subcategory value="9" description="Neftegaz class (tugs)" uuid="db2382dc-5269-11df-a836-080069138b88" uid="14634">
-        <specific value="1" description="Aleksey Kortunov" uuid="db249050-5269-11df-8b40-080069138b88" uid="14635"/>
-        <specific value="2" description="Ilga" uuid="db259d24-5269-11df-8cbf-080069138b88" uid="14636"/>
-        <specific value="3" description="Umka" uuid="db26a8c2-5269-11df-8cd4-080069138b88" uid="14637"/>
-        <specific value="4" description="Kalar" uuid="db27b64a-5269-11df-b850-080069138b88" uid="14638"/>
-      </subcategory>
-      <subcategory value="10" description="Goryn class (tugs)" uuid="db297390-5269-11df-a9e5-080069138b88" uid="14639">
-        <specific value="1" description="MB 15" uuid="db2a9022-5269-11df-8b87-080069138b88" uid="14640"/>
-        <specific value="2" description="MB 119" uuid="db2b9936-5269-11df-a6f8-080069138b88" uid="14641"/>
-        <specific value="3" description="MB 18" uuid="db2ca66e-5269-11df-af57-080069138b88" uid="14642"/>
-        <specific value="4" description="SB 365 (ex-MB 29)" uuid="db2db52c-5269-11df-bf79-080069138b88" uid="14643"/>
-        <specific value="5" description="MB 32" uuid="db2ebcd8-5269-11df-8ce6-080069138b88" uid="14644"/>
-        <specific value="6" description="SB 521 (ex-MB 61)" uuid="db2fcc0e-5269-11df-9a8b-080069138b88" uid="14645"/>
-        <specific value="7" description="MB 35" uuid="db30e670-5269-11df-b7db-080069138b88" uid="14646"/>
-        <specific value="8" description="SB 522 (ex-MB 62)" uuid="db31ed7c-5269-11df-a5c5-080069138b88" uid="14647"/>
-        <specific value="9" description="MB 36" uuid="db32fbf4-5269-11df-8561-080069138b88" uid="14648"/>
-        <specific value="10" description="SB 523 (ex-MB 64)" uuid="db340aa8-5269-11df-8cf3-080069138b88" uid="14649"/>
-        <specific value="11" description="MB 38" uuid="db351466-5269-11df-9d0e-080069138b88" uid="14650"/>
-        <specific value="12" description="SB 524 (ex-MB 108)" uuid="db3620fe-5269-11df-a790-080069138b88" uid="14651"/>
-        <specific value="13" description="MB 105" uuid="db3734a8-5269-11df-b96f-080069138b88" uid="14652"/>
-      </subcategory>
-      <subcategory value="11" description="Sorum class (tugs)" uuid="db38e212-5269-11df-9d6c-080069138b88" uid="14653">
-        <specific value="1" description="Amur" uuid="db39eb1c-5269-11df-ba3f-080069138b88" uid="14654"/>
-        <specific value="2" description="Primorye" uuid="db3af7be-5269-11df-bfbe-080069138b88" uid="14655"/>
-        <specific value="3" description="Brest" uuid="db3c09d8-5269-11df-a43c-080069138b88" uid="14656"/>
-        <specific value="4" description="Bug" uuid="db3d1184-5269-11df-8dbf-080069138b88" uid="14657"/>
-        <specific value="5" description="Burya" uuid="db3e1dae-5269-11df-86e9-080069138b88" uid="14658"/>
-        <specific value="6" description="Chukotka" uuid="db3f2cd0-5269-11df-a47e-080069138b88" uid="14659"/>
-        <specific value="7" description="Kamchatka" uuid="db4038a0-5269-11df-977b-080069138b88" uid="14660"/>
-        <specific value="8" description="Karelia" uuid="db414556-5269-11df-b8e6-080069138b88" uid="14661"/>
-        <specific value="9" description="Ladoga" uuid="db42516c-5269-11df-8585-080069138b88" uid="14662"/>
-        <specific value="10" description="Neman" uuid="db435a44-5269-11df-bd24-080069138b88" uid="14663"/>
-        <specific value="11" description="Sakhalin" uuid="db446b3c-5269-11df-96cd-080069138b88" uid="14664"/>
-        <specific value="12" description="Ural" uuid="db4577fc-5269-11df-82b1-080069138b88" uid="14665"/>
-        <specific value="13" description="Victor Kingsiepp" uuid="db468110-5269-11df-bdc9-080069138b88" uid="14666"/>
-        <specific value="14" description="Yan Berzin" uuid="db479398-5269-11df-82ca-080069138b88" uid="14667"/>
-        <specific value="15" description="Yenisey" uuid="db48a210-5269-11df-b1ce-080069138b88" uid="14668"/>
-        <specific value="16" description="Zabaykalye" uuid="db49a908-5269-11df-8c6c-080069138b88" uid="14669"/>
-        <specific value="17" description="Zapolarye" uuid="db4ab6a4-5269-11df-a110-080069138b88" uid="14670"/>
-        <specific value="18" description="MB 4" uuid="db4bc742-5269-11df-a79b-080069138b88" uid="14671"/>
-        <specific value="19" description="MB 6" uuid="db4ccd86-5269-11df-a867-080069138b88" uid="14672"/>
-        <specific value="20" description="MB 13" uuid="db4dda0a-5269-11df-88ca-080069138b88" uid="14673"/>
-        <specific value="21" description="MB 19" uuid="db4ee94a-5269-11df-9467-080069138b88" uid="14674"/>
-        <specific value="22" description="MB 25" uuid="db4ffa92-5269-11df-8068-080069138b88" uid="14675"/>
-        <specific value="23" description="MB 26" uuid="db510720-5269-11df-80cb-080069138b88" uid="14676"/>
-        <specific value="24" description="MB 28" uuid="db5218cc-5269-11df-b137-080069138b88" uid="14677"/>
-        <specific value="25" description="MB 30" uuid="db532028-5269-11df-8b95-080069138b88" uid="14678"/>
-        <specific value="26" description="MB 31" uuid="db542db0-5269-11df-bfac-080069138b88" uid="14679"/>
-        <specific value="27" description="MB 37" uuid="db553af2-5269-11df-b7ec-080069138b88" uid="14680"/>
-        <specific value="28" description="MB 56" uuid="db5646cc-5269-11df-b095-080069138b88" uid="14681"/>
-        <specific value="29" description="MB 58" uuid="db575512-5269-11df-ba35-080069138b88" uid="14682"/>
-        <specific value="30" description="MB 61" uuid="db5861b4-5269-11df-9be7-080069138b88" uid="14683"/>
-        <specific value="31" description="MB 76" uuid="db596a0a-5269-11df-83a3-080069138b88" uid="14684"/>
-        <specific value="32" description="MB 99" uuid="db5a7ad0-5269-11df-8e11-080069138b88" uid="14685"/>
-        <specific value="33" description="MB 110" uuid="db5b8790-5269-11df-a028-080069138b88" uid="14686"/>
-        <specific value="34" description="MB 147" uuid="db5c8eba-5269-11df-bc1e-080069138b88" uid="14687"/>
-        <specific value="35" description="MB 148" uuid="db5d9f62-5269-11df-9661-080069138b88" uid="14688"/>
-        <specific value="36" description="MB 196" uuid="db5eadee-5269-11df-9016-080069138b88" uid="14689"/>
-        <specific value="37" description="MB 236" uuid="db5fc076-5269-11df-9459-080069138b88" uid="14690"/>
-        <specific value="38" description="MB 304" uuid="db60d36c-5269-11df-90dc-080069138b88" uid="14691"/>
-        <specific value="39" description="MB 307" uuid="db621f56-5269-11df-8869-080069138b88" uid="14692"/>
-      </subcategory>
-      <subcategory value="12" description="Okhtensky class (tugs)" uuid="db63d468-5269-11df-9d54-080069138b88" uid="14693">
-        <specific value="1" description="Loksa" uuid="db64e15a-5269-11df-986e-080069138b88" uid="14694"/>
-        <specific value="2" description="Orion" uuid="db65ef28-5269-11df-afd9-080069138b88" uid="14695"/>
-        <specific value="3" description="Saturn" uuid="db66fb66-5269-11df-aa07-080069138b88" uid="14696"/>
-        <specific value="4" description="Neptun" uuid="db680538-5269-11df-8e37-080069138b88" uid="14697"/>
-        <specific value="5" description="Pochetny" uuid="db69178e-5269-11df-86f1-080069138b88" uid="14698"/>
-        <specific value="6" description="Tyulen" uuid="db6a24da-5269-11df-bfa5-080069138b88" uid="14699"/>
-      </subcategory>
-      <subcategory value="13" description="Roslavl class (tugs)" uuid="db6bcfba-5269-11df-bbdc-080069138b88" uid="14700">
-        <specific value="1" description="MB 50" uuid="db6cdcf2-5269-11df-a8e8-080069138b88" uid="14701"/>
-        <specific value="2" description="MB 94" uuid="db6df1c8-5269-11df-8db0-080069138b88" uid="14702"/>
-        <specific value="3" description="MB 95" uuid="db6f00b8-5269-11df-9720-080069138b88" uid="14703"/>
-        <specific value="4" description="MB 102" uuid="db700c74-5269-11df-bf1d-080069138b88" uid="14704"/>
-        <specific value="5" description="MB 125" uuid="db711a7e-5269-11df-8d2d-080069138b88" uid="14705"/>
-        <specific value="6" description="MB 145" uuid="db7227c0-5269-11df-b8ac-080069138b88" uid="14706"/>
-        <specific value="7" description="MB 146" uuid="db732f12-5269-11df-b935-080069138b88" uid="14707"/>
-        <specific value="8" description="MB 147" uuid="db743d62-5269-11df-82bd-080069138b88" uid="14708"/>
-        <specific value="9" description="SB 41" uuid="db754e96-5269-11df-aa9e-080069138b88" uid="14709"/>
-        <specific value="10" description="SB 46" uuid="db7655de-5269-11df-9a9e-080069138b88" uid="14710"/>
-      </subcategory>
-      <subcategory value="14" description="Zenit class (tugs)" uuid="db7801f4-5269-11df-9b48-080069138b88" uid="14711"/>
-      <subcategory value="15" description="Scholle class (harbor tugs)" uuid="db7913fa-5269-11df-97f6-080069138b88" uid="14712"/>
-      <subcategory value="16" description="Tugur class (harbor tugs)" uuid="db7a28d0-5269-11df-9845-080069138b88" uid="14713"/>
-      <subcategory value="17" description="Sidehole (1, 2) classes (harbor tugs)" uuid="db7b328e-5269-11df-b7ee-080069138b88" uid="14714"/>
-    </category>
-    <category value="50" description="Frigate" uuid="db7ce05c-5269-11df-a16d-080069138b88" uid="14715">
-      <subcategory value="1" description="Grisha I class" uuid="db7def38-5269-11df-9385-080069138b88" uid="14716"/>
-      <subcategory value="2" description="Grisha II class" uuid="db7f0170-5269-11df-ab33-080069138b88" uid="14717">
-        <specific value="1" description="Ametyst" deprecated="1" uuid="db800958-5269-11df-89dd-080069138b88" uid="14718"/>
-        <specific value="2" description="Brilliant" deprecated="1" uuid="db811802-5269-11df-ac60-080069138b88" uid="14719"/>
-        <specific value="3" description="Izumrud" deprecated="1" uuid="db8229c2-5269-11df-aec8-080069138b88" uid="14720"/>
-        <specific value="4" description="Predanny" deprecated="1" uuid="db833308-5269-11df-b263-080069138b88" uid="14721"/>
-        <specific value="5" description="Rubin" deprecated="1" uuid="db843fdc-5269-11df-a7e7-080069138b88" uid="14722"/>
-        <specific value="6" description="Sapfir" deprecated="1" uuid="db854eae-5269-11df-9baf-080069138b88" uid="14723"/>
-        <specific value="7" description="Zhemchug" deprecated="1" uuid="db865cd6-5269-11df-858e-080069138b88" uid="14724"/>
-        <specific value="8" description="Provorny" deprecated="1" uuid="db876bbc-5269-11df-a6a5-080069138b88" uid="14725"/>
-        <specific value="9" description="Izmail" deprecated="1" uuid="db8879d0-5269-11df-a4ea-080069138b88" uid="14726"/>
-        <specific value="10" description="U-200 Vinnitsa (Ukraine) (Ex-Dneper)" uuid="db8987d0-5269-11df-ac55-080069138b88" uid="14727"/>
-        <specific value="11" description="Resitelny" deprecated="1" uuid="db8a976a-5269-11df-94b9-080069138b88" uid="14728"/>
-        <specific value="12" description="Primerny" deprecated="1" uuid="db8ba4fc-5269-11df-80ec-080069138b88" uid="14729"/>
-      </subcategory>
-      <subcategory value="3" description="Grisha III class" uuid="db8d6008-5269-11df-a6a3-080069138b88" uid="14730"/>
-      <subcategory value="4" description="Grisha V class" uuid="db8e6962-5269-11df-b8bd-080069138b88" uid="14731"/>
-      <subcategory value="5" description="Mirka II class" deprecated="1" uuid="db8f7834-5269-11df-89e6-080069138b88" uid="14732"/>
-      <subcategory value="6" description="Petya I class" uuid="db9086ca-5269-11df-b591-080069138b88" uid="14733"/>
-      <subcategory value="7" description="Petya II class" uuid="db9192ae-5269-11df-bb53-080069138b88" uid="14734"/>
-      <subcategory value="8" description="Riga class" uuid="db92a2d4-5269-11df-a516-080069138b88" uid="14735"/>
-      <subcategory value="9" description="Krivak III (Zaliv (Kerch))" uuid="db93b200-5269-11df-bb22-080069138b88" uid="14736">
-        <specific value="1" description="Menzhinsky" uuid="db94bd8a-5269-11df-9c70-080069138b88" uid="14737"/>
-        <specific value="2" description="Derzhinsky" uuid="db95cb8a-5269-11df-ab06-080069138b88" uid="14738"/>
-        <specific value="3" description="Orel" uuid="db96da7a-5269-11df-9796-080069138b88" uid="14739"/>
-        <specific value="4" description="Imeni lXX Letiya Vchk-Kgb" uuid="db97e172-5269-11df-8ab9-080069138b88" uid="14740"/>
-        <specific value="5" description="Imeni lXX Letiya Pogranvoysk" uuid="db98f328-5269-11df-ac46-080069138b88" uid="14741"/>
-        <specific value="6" description="Kedrov" uuid="db9a0204-5269-11df-9d13-080069138b88" uid="14742"/>
-        <specific value="7" description="Vorovsky" uuid="db9b0ad2-5269-11df-a678-080069138b88" uid="14743"/>
-        <specific value="8" description="Hetman Dorosenko" uuid="db9c1ac6-5269-11df-8ed3-080069138b88" uid="14744"/>
-        <specific value="9" description="Hetman Petr Sagadachny" uuid="db9d29ca-5269-11df-b11a-080069138b88" uid="14745"/>
-      </subcategory>
-      <subcategory value="10" description="Parchim II Class" uuid="db9edb6c-5269-11df-8ada-080069138b88" uid="14746"/>
-      <subcategory value="11" description="Petya III Class" uuid="db9fe3fe-5269-11df-af5d-080069138b88" uid="14747"/>
-      <subcategory value="12" description="Koni Class" uuid="dba0f190-5269-11df-afcd-080069138b88" uid="14748"/>
-    </category>
-    <category value="52" description="Heavy Cruiser" uuid="dba2a198-5269-11df-a31b-080069138b88" uid="14749"/>
-    <category value="61" description="Non-Combatant Ship" uuid="dba3ae94-5269-11df-a8cd-080069138b88" uid="14750">
-      <subcategory value="1" description="Container Class" uuid="dba4b712-5269-11df-995e-080069138b88" uid="14751">
-        <specific value="1" description="Akvamarinovyy" uuid="dba5c5d0-5269-11df-843c-080069138b88" uid="14752"/>
-        <specific value="2" description="Ivan Susanin" uuid="dba6d8da-5269-11df-9500-080069138b88" uid="14753"/>
-        <specific value="3" description="Kapitan Chukhchin" uuid="dba7e1da-5269-11df-9d5c-080069138b88" uid="14754"/>
-      </subcategory>
-      <subcategory value="2" description="Small Fishing Boat" uuid="dba98d00-5269-11df-a605-080069138b88" uid="14755"/>
-      <subcategory value="3" description="Medium Fishing Boat" uuid="dbaa9fa6-5269-11df-a6c5-080069138b88" uid="14756"/>
-      <subcategory value="4" description="Large Fishing Boat" uuid="dbabb7d8-5269-11df-b55e-080069138b88" uid="14757"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="222" uuid="dbae06a0-5269-11df-99f4-080069138b88" uid="14758">
-    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="dbaf11f8-5269-11df-8b39-080069138b88" uid="14759">
-      <subcategory value="1" description="Typhoon class" uuid="dbb01bac-5269-11df-ba72-080069138b88" uid="14760"/>
-      <subcategory value="2" description="Delta IV class" uuid="dbb12a1a-5269-11df-89b2-080069138b88" uid="14761"/>
-      <subcategory value="3" description="Delta III class" uuid="dbb23c66-5269-11df-91c4-080069138b88" uid="14762"/>
-      <subcategory value="4" description="Delta II class" uuid="dbb3453e-5269-11df-b76d-080069138b88" uid="14763"/>
-      <subcategory value="5" description="Delta I class" uuid="dbb453f2-5269-11df-8fb6-080069138b88" uid="14764"/>
-      <subcategory value="6" description="Yankee I class" uuid="dbb566c0-5269-11df-af18-080069138b88" uid="14765"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="dbb67038-5269-11df-89aa-080069138b88" uid="14766"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="dbb77eb0-5269-11df-8187-080069138b88" uid="14767"/>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="dbb88eb8-5269-11df-8369-080069138b88" uid="14768"/>
-      <subcategory value="10" description="Golf I class" deprecated="1" uuid="dbb99d1c-5269-11df-a2b3-080069138b88" uid="14769"/>
-      <subcategory value="11" description="Golf II class" deprecated="1" uuid="dbbaac52-5269-11df-b0db-080069138b88" uid="14770"/>
-    </category>
-    <category value="2" description="SSGN (Nuclear Guided Missile)" uuid="dbbc599e-5269-11df-83f2-080069138b88" uid="14771">
-      <subcategory value="1" description="Oscar II class" uuid="dbbd6bd6-5269-11df-be15-080069138b88" uid="14772"/>
-      <subcategory value="2" description="Oscar I class" deprecated="1" uuid="dbbe7512-5269-11df-a6e9-080069138b88" uid="14773"/>
-      <subcategory value="3" description="Charlie II class" deprecated="1" uuid="dbbf834e-5269-11df-8114-080069138b88" uid="14774"/>
-      <subcategory value="4" description="Charlie I class" deprecated="1" uuid="dbc09478-5269-11df-8428-080069138b88" uid="14775"/>
-      <subcategory value="5" description="Echo II class" deprecated="1" uuid="dbc1afa2-5269-11df-8a39-080069138b88" uid="14776"/>
-      <subcategory value="6" description="Yankee conversion class" uuid="dbc2c09a-5269-11df-af06-080069138b88" uid="14777"/>
-      <subcategory value="7" description="Severodvinsk class" uuid="dbc3cf08-5269-11df-a480-080069138b88" uid="14778"/>
-    </category>
-    <category value="3" description="SSN (Nuclear Attack-Torpedo)" uuid="dbc580d2-5269-11df-8b0b-080069138b88" uid="14779">
-      <subcategory value="1" description="Victor III Class" uuid="dbc689f0-5269-11df-9b39-080069138b88" uid="14780"/>
-      <subcategory value="2" description="Victor II class" uuid="dbc7989a-5269-11df-8d01-080069138b88" uid="14781"/>
-      <subcategory value="3" description="Victor I class" deprecated="1" uuid="dbc8a60e-5269-11df-aeb1-080069138b88" uid="14782"/>
-      <subcategory value="4" description="Yankee Notch class" uuid="dbc9b440-5269-11df-89aa-080069138b88" uid="14783"/>
-      <subcategory value="5" description="Sierra II class" uuid="dbcacc54-5269-11df-b9c8-080069138b88" uid="14784">
-        <specific value="1" description="Orel" uuid="dbcbdb4e-5269-11df-9020-080069138b88" uid="14785"/>
-        <specific value="2" description="Kasatka" uuid="dbcce5ac-5269-11df-9626-080069138b88" uid="14786"/>
-      </subcategory>
-      <subcategory value="6" description="Sierra I class" deprecated="1" uuid="dbce91ae-5269-11df-b0fe-080069138b88" uid="14787"/>
-      <subcategory value="7" description="Alfa class" uuid="dbcfa0f8-5269-11df-9578-080069138b88" uid="14788"/>
-      <subcategory value="8" description="Akula class" uuid="dbd0b27c-5269-11df-afdc-080069138b88" uid="14789">
-        <specific value="1" description="Bars" uuid="dbd1b924-5269-11df-9e31-080069138b88" uid="14790"/>
-        <specific value="2" description="Leopard" uuid="dbd2c74c-5269-11df-9b57-080069138b88" uid="14791"/>
-        <specific value="3" description="Pantera" uuid="dbd3d8e4-5269-11df-9be2-080069138b88" uid="14792"/>
-        <specific value="4" description="Puma" uuid="dbd4e036-5269-11df-9de5-080069138b88" uid="14793"/>
-        <specific value="5" description="Volk" uuid="dbd5ecb0-5269-11df-8104-080069138b88" uid="14794"/>
-        <specific value="6" description="Tigr" uuid="dbd6fc68-5269-11df-b1c8-080069138b88" uid="14795"/>
-      </subcategory>
-      <subcategory value="9" description="Akula II Class" uuid="dbd8a770-5269-11df-931d-080069138b88" uid="14796"/>
-    </category>
-    <category value="4" description="SSG (Conventional Guided Missile)" uuid="dbda5584-5269-11df-9474-080069138b88" uid="14797">
-      <subcategory value="1" description="Juliett Class" deprecated="1" uuid="dbdb6280-5269-11df-81e1-080069138b88" uid="14798"/>
-    </category>
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="dbdd0fd6-5269-11df-98ff-080069138b88" uid="14799">
-      <subcategory value="1" description="Kilo class" uuid="dbde1e94-5269-11df-bf07-080069138b88" uid="14800"/>
-      <subcategory value="2" description="Tango class" uuid="dbdf2cf8-5269-11df-9184-080069138b88" uid="14801"/>
-      <subcategory value="3" description="Foxtrot class" uuid="dbe038f0-5269-11df-be36-080069138b88" uid="14802"/>
-      <subcategory value="4" description="Romeo class" uuid="dbe146aa-5269-11df-b4e7-080069138b88" uid="14803">
-        <specific value="1" description="(North Korean Romeo SS (Snorkle))" uuid="dbe252ca-5269-11df-a5b4-080069138b88" uid="14804"/>
-        <specific value="2" description="(North Korean Romeo SS (Split Plant))" uuid="dbe35de6-5269-11df-ad7b-080069138b88" uid="14805"/>
-        <specific value="3" description="Romeo" uuid="dbe47212-5269-11df-bcf9-080069138b88" uid="14806"/>
-      </subcategory>
-      <subcategory value="5" description="Whiskey Class" uuid="dbe61dec-5269-11df-9dc6-080069138b88" uid="14807"/>
-    </category>
-    <category value="6" description="SSAN (Nuclear Auxiliary)" uuid="dbe7cc6e-5269-11df-bf59-080069138b88" uid="14808">
-      <subcategory value="1" description="Yankee class (ex-SSBN)" uuid="dbe8e324-5269-11df-baee-080069138b88" uid="14809"/>
-      <subcategory value="2" description="Uniform class" uuid="dbe9edb4-5269-11df-8f96-080069138b88" uid="14810"/>
-      <subcategory value="3" description="Paltus class" uuid="dbeafd12-5269-11df-8786-080069138b88" uid="14811"/>
-    </category>
-    <category value="7" description="SSA (Conventional Auxiliary)" uuid="dbecad42-5269-11df-a982-080069138b88" uid="14812">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="dbedbbce-5269-11df-8f9d-080069138b88" uid="14813"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="dbeec62c-5269-11df-a226-080069138b88" uid="14814"/>
-      <subcategory value="3" description="Lima class" uuid="dbefd65c-5269-11df-9bcd-080069138b88" uid="14815"/>
-      <subcategory value="4" description="Beluga class" uuid="dbf0e36c-5269-11df-8337-080069138b88" uid="14816"/>
-      <subcategory value="5" description="X-Ray class" uuid="dbf1f14e-5269-11df-94a6-080069138b88" uid="14817"/>
-      <subcategory value="6" description="India class" uuid="dbf2ff12-5269-11df-9dce-080069138b88" uid="14818"/>
-      <subcategory value="7" description="Bravo class (target sub)" uuid="dbf40e8e-5269-11df-b0e4-080069138b88" uid="14819"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="222" uuid="dbf65a40-5269-11df-9aa5-080069138b88" uid="14820">
-    <category value="0" description="Other" uuid="dbf76692-5269-11df-bc60-080069138b88" uid="14821">
-      <subcategory value="1" description="Astronomical Module" uuid="dbf86f4c-5269-11df-aff6-080069138b88" uid="14822">
-        <specific value="1" description="Kavant 1" uuid="dbf97c5c-5269-11df-b703-080069138b88" uid="14823"/>
-        <specific value="2" description="Kavant 2" uuid="dbfa8868-5269-11df-807a-080069138b88" uid="14824"/>
-        <specific value="3" description="Priroda" uuid="dbfb94ec-5269-11df-8a79-080069138b88" uid="14825"/>
-        <specific value="4" description="Spektrum" uuid="dbfca350-5269-11df-98a7-080069138b88" uid="14826"/>
-        <specific value="5" description="Kristall" uuid="dbfdaf48-5269-11df-bfc5-080069138b88" uid="14827"/>
-      </subcategory>
-    </category>
-    <category value="1" description="Manned" uuid="dbfffb72-5269-11df-9ae8-080069138b88" uid="14828">
-      <subcategory value="1" description="Space Shuttle" uuid="dc01071a-5269-11df-8e1c-080069138b88" uid="14829">
-        <specific value="1" description="Buran" uuid="dc0211dc-5269-11df-9e72-080069138b88" uid="14830"/>
-      </subcategory>
-      <subcategory value="2" description="Space Station" uuid="dc03bdac-5269-11df-92de-080069138b88" uid="14831">
-        <specific value="1" description="Mir" uuid="dc04ce2c-5269-11df-aab0-080069138b88" uid="14832"/>
-        <specific value="2" description="Kvant" uuid="dc05dbdc-5269-11df-9c0d-080069138b88" uid="14833"/>
-        <specific value="3" description="Resurs-F2" uuid="dc06e306-5269-11df-9c90-080069138b88" uid="14834"/>
-      </subcategory>
-      <subcategory value="3" description="Space vehicles" uuid="dc089a2a-5269-11df-b625-080069138b88" uid="14835">
-        <specific value="1" description="Phobos 2" uuid="dc09a7d0-5269-11df-a25d-080069138b88" uid="14836"/>
-        <specific value="2" description="Soyuz-TM" uuid="dc0ab5c6-5269-11df-b190-080069138b88" uid="14837"/>
-        <specific value="3" description="Phobos" uuid="dc0bbcbe-5269-11df-b76f-080069138b88" uid="14838"/>
-        <specific value="4" description="Progress" uuid="dc0ccb7c-5269-11df-8b2b-080069138b88" uid="14839"/>
-        <specific value="5" description="Progress-M" uuid="dc0ddcd8-5269-11df-a41d-080069138b88" uid="14840"/>
-        <specific value="6" description="Prognaz" uuid="dc0ee47a-5269-11df-970b-080069138b88" uid="14841"/>
-        <specific value="7" description="Vostok" uuid="dc0ff20c-5269-11df-a3d5-080069138b88" uid="14842"/>
-        <specific value="8" description="Molniya" uuid="dc1100de-5269-11df-9545-080069138b88" uid="14843"/>
-        <specific value="9" description="Cosmos" uuid="dc120a60-5269-11df-addc-080069138b88" uid="14844"/>
-        <specific value="10" description="Proton K" uuid="dc1317f2-5269-11df-888e-080069138b88" uid="14845"/>
-        <specific value="11" description="Proton KM" uuid="dc1429d0-5269-11df-85a8-080069138b88" uid="14846"/>
-        <specific value="12" description="Tsyklon" uuid="dc1530dc-5269-11df-ba07-080069138b88" uid="14847"/>
-        <specific value="13" description="Zenit" uuid="dc163e5a-5269-11df-a662-080069138b88" uid="14848"/>
-        <specific value="14" description="Lomonosov (MHB)" uuid="dc174bb0-5269-11df-b357-080069138b88" uid="14849"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Unmanned" uuid="dc199866-5269-11df-91ca-080069138b88" uid="14850">
-      <subcategory value="1" description="Communication satellite" uuid="dc1aa4ea-5269-11df-8df4-080069138b88" uid="14851">
-        <specific value="1" description="Molniya" uuid="dc1bac3c-5269-11df-8aa7-080069138b88" uid="14852"/>
-      </subcategory>
-      <subcategory value="2" description="Navigation satellite" uuid="dc1d5a00-5269-11df-869c-080069138b88" uid="14853">
-        <specific value="1" description="GEO-IK Geodedic Cosmos" uuid="dc1e68d2-5269-11df-971b-080069138b88" uid="14854"/>
-        <specific value="2" description="Elektron" uuid="dc1f7af6-5269-11df-b369-080069138b88" uid="14855"/>
-      </subcategory>
-      <subcategory value="3" description="Early Warning satellite" uuid="dc2124f0-5269-11df-9ab4-080069138b88" uid="14856">
-        <specific value="1" description="Cosmos" uuid="dc2230ac-5269-11df-8078-080069138b88" uid="14857"/>
-      </subcategory>
-      <subcategory value="4" description="Electronic Intelligence satellite" uuid="dc23dd76-5269-11df-9abf-080069138b88" uid="14858">
-        <specific value="1" description="Elints" uuid="dc24ecb6-5269-11df-95e8-080069138b88" uid="14859"/>
-      </subcategory>
-      <subcategory value="6" description="Ocean surveillance satellite" uuid="dc26a59c-5269-11df-b003-080069138b88" uid="14860">
-        <specific value="1" description="Okean" uuid="dc27b40a-5269-11df-8f9c-080069138b88" uid="14861"/>
-        <specific value="2" description="Eorsats" uuid="dc28bc7e-5269-11df-90ce-080069138b88" uid="14862"/>
-      </subcategory>
-      <subcategory value="8" description="Optical imaging surveillance satellite" uuid="dc2a6a10-5269-11df-9ddc-080069138b88" uid="14863">
-        <specific value="1" description="Venera" uuid="dc2b7b26-5269-11df-b7be-080069138b88" uid="14864"/>
-        <specific value="2" description="Generation" uuid="dc2c8b2e-5269-11df-950a-080069138b88" uid="14865"/>
-      </subcategory>
-      <subcategory value="10" description="Minor military satellite" uuid="dc2e3abe-5269-11df-b91f-080069138b88" uid="14866">
-        <specific value="1" description="C2093" uuid="dc2f4314-5269-11df-85fd-080069138b88" uid="14867"/>
-        <specific value="2" description="C2002" uuid="dc304f8e-5269-11df-abee-080069138b88" uid="14868"/>
-        <specific value="3" description="C2059" uuid="dc315e42-5269-11df-91ab-080069138b88" uid="14869"/>
-        <specific value="4" description="C2075" uuid="dc326850-5269-11df-b3ed-080069138b88" uid="14870"/>
-        <specific value="5" description="C2137" uuid="dc3374b6-5269-11df-bd68-080069138b88" uid="14871"/>
-        <specific value="6" description="C2164" uuid="dc34850e-5269-11df-b4eb-080069138b88" uid="14872"/>
-        <specific value="7" description="C1985" uuid="dc358c42-5269-11df-b0d6-080069138b88" uid="14873"/>
-        <specific value="8" description="C2053" uuid="dc369998-5269-11df-a272-080069138b88" uid="14874"/>
-        <specific value="9" description="C2106" uuid="dc37a98c-5269-11df-9002-080069138b88" uid="14875"/>
-      </subcategory>
-      <subcategory value="11" description="Illuminating satellite" uuid="dc395980-5269-11df-b650-080069138b88" uid="14876">
-        <specific value="1" description="Reflector" uuid="dc3a626c-5269-11df-ad8a-080069138b88" uid="14877"/>
-        <specific value="2" description="Energia" uuid="dc3b6fcc-5269-11df-a502-080069138b88" uid="14878"/>
-      </subcategory>
-      <subcategory value="12" description="Microwave activity" uuid="dc3d1d04-5269-11df-a118-080069138b88" uid="14879">
-        <specific value="1" description="Relikt" uuid="dc3e2eec-5269-11df-9377-080069138b88" uid="14880"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="224" uuid="dc41186e-5269-11df-a96f-080069138b88" uid="14881">
-    <category value="1" description="Tank" uuid="dc422466-5269-11df-b9f3-080069138b88" uid="14882">
-      <subcategory value="1" description="Chieftain MBT" uuid="dc433ce8-5269-11df-9ff2-080069138b88" uid="14883"/>
-      <subcategory value="2" description="Challenger MBT" uuid="dc4452d6-5269-11df-b78a-080069138b88" uid="14884">
-        <specific value="1" description="Mark I" uuid="dc4560a4-5269-11df-a0bb-080069138b88" uid="14885"/>
-        <specific value="2" description="Mark II" uuid="dc466c92-5269-11df-8132-080069138b88" uid="14886"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Armored fighting vehicle" uuid="dc48ba1a-5269-11df-b953-080069138b88" uid="14887">
-      <subcategory value="1" description="FV 432 (APC)" uuid="dc49c7e8-5269-11df-af75-080069138b88" uid="14888">
-        <specific value="1" description="Ambulance" uuid="dc4ad5ac-5269-11df-867d-080069138b88" uid="14889"/>
-        <specific value="2" description="81mm mortar carrier" uuid="dc4be230-5269-11df-b10c-080069138b88" uid="14890"/>
-      </subcategory>
-      <subcategory value="2" description="FV 103 Spartan (APC)" uuid="dc4d918e-5269-11df-9caa-080069138b88" uid="14891"/>
-      <subcategory value="3" description="FV 601 Saladin" uuid="dc4e9b1a-5269-11df-a0f3-080069138b88" uid="14892"/>
-      <subcategory value="4" description="FV 107 Scimitar" uuid="dc4faa0a-5269-11df-98b5-080069138b88" uid="14893"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="dc50b8f0-5269-11df-a97d-080069138b88" uid="14894"/>
-      <subcategory value="6" description="FV 603 Saracen" uuid="dc51c7d6-5269-11df-b3d3-080069138b88" uid="14895"/>
-      <subcategory value="7" description="AT 105 Saxon" uuid="dc52d694-5269-11df-81d5-080069138b88" uid="14896"/>
-      <subcategory value="8" description="FV 510 Warrior" uuid="dc53e480-5269-11df-9dca-080069138b88" uid="14897"/>
-      <subcategory value="9" description="FV 711 Ferret" uuid="dc54f014-5269-11df-9f3d-080069138b88" uid="14898"/>
-      <subcategory value="10" description="FV 721 Fox" uuid="dc55fe14-5269-11df-917a-080069138b88" uid="14899"/>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="dc570bec-5269-11df-84cc-080069138b88" uid="14900"/>
-      <subcategory value="12" description="FV 102 Striker" uuid="dc581488-5269-11df-986e-080069138b88" uid="14901"/>
-      <subcategory value="13" description="FV 101 Scorpion" uuid="dc592652-5269-11df-ac8a-080069138b88" uid="14902"/>
-      <subcategory value="14" description="FV 106 Samson" uuid="dc5a3fce-5269-11df-b32f-080069138b88" uid="14903"/>
-    </category>
-    <category value="3" description="Armored utility vehicle" uuid="dc5bf300-5269-11df-ae3f-080069138b88" uid="14904">
-      <subcategory value="1" description="FV 4204 Chieftain ARV" uuid="dc5cfb10-5269-11df-a6a0-080069138b88" uid="14905"/>
-      <subcategory value="2" description="Challenger ARV" uuid="dc5e0a5a-5269-11df-98eb-080069138b88" uid="14906"/>
-      <subcategory value="3" description="FV 4003 Centurion (MK 5) AVRE" uuid="dc5f18dc-5269-11df-bfa1-080069138b88" uid="14907"/>
-      <subcategory value="4" description="Chieftain AVRE" uuid="dc60263c-5269-11df-bc36-080069138b88" uid="14908"/>
-      <subcategory value="5" description="Combat Engineer tractor" uuid="dc613504-5269-11df-8652-080069138b88" uid="14909"/>
-      <subcategory value="6" description="FV 4205 Chieftain AVLB" uuid="dc6244da-5269-11df-852f-080069138b88" uid="14910"/>
-      <subcategory value="7" description="Mobile bridge" uuid="dc635a8c-5269-11df-a7f2-080069138b88" uid="14911">
-        <specific value="1" description="M2" uuid="dc6468a0-5269-11df-8f8d-080069138b88" uid="14912"/>
-        <specific value="2" description="M3" uuid="dc65752e-5269-11df-810f-080069138b88" uid="14913"/>
-      </subcategory>
-      <subcategory value="8" description="FV 105 Sultan" uuid="dc6724be-5269-11df-82ce-080069138b88" uid="14914"/>
-      <subcategory value="9" description="FV 104 Samaritan" uuid="dc682e18-5269-11df-ad52-080069138b88" uid="14915"/>
-      <subcategory value="10" description="FV 512 Warrior Repair Vehicle" uuid="dc693cb8-5269-11df-b40d-080069138b88" uid="14916"/>
-      <subcategory value="11" description="FV 513 Warrior Recovery Vehicle" uuid="dc6a4e1e-5269-11df-a8f9-080069138b88" uid="14917"/>
-    </category>
-    <category value="4" description="Self-propelled artillery" uuid="dc6bff48-5269-11df-bec9-080069138b88" uid="14918">
-      <subcategory value="1" description="FV 433 Abbot 105-mm Howitzer" uuid="dc6d07f8-5269-11df-a3be-080069138b88" uid="14919"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="dc6e1652-5269-11df-9e65-080069138b88" uid="14920"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="dc6f2902-5269-11df-9b5c-080069138b88" uid="14921"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="dc7032de-5269-11df-8136-080069138b88" uid="14922"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="dc7146b0-5269-11df-b82c-080069138b88" uid="14923"/>
-      <subcategory value="6" description="Stormer HVM Carrier" uuid="dc7255e6-5269-11df-9809-080069138b88" uid="14924"/>
-      <subcategory value="7" description="AS90 155-mm" uuid="dc736224-5269-11df-adba-080069138b88" uid="14925"/>
-    </category>
-    <category value="5" description="Towed artillery" uuid="dc750e8a-5269-11df-af24-080069138b88" uid="14926">
-      <subcategory value="1" description="FH-70 155-mm gun" uuid="dc761c62-5269-11df-8105-080069138b88" uid="14927"/>
-      <subcategory value="2" description="L-118 105-mm" uuid="dc7729c2-5269-11df-a0b0-080069138b88" uid="14928"/>
-      <subcategory value="3" description="M-56 105-mm" uuid="dc78366e-5269-11df-ac4f-080069138b88" uid="14929"/>
-      <subcategory value="4" description="5.5-in/140-mm" uuid="dc794554-5269-11df-a223-080069138b88" uid="14930"/>
-    </category>
-    <category value="6" description="Small wheeled utility vehicle" uuid="dc7af26e-5269-11df-89ea-080069138b88" uid="14931">
-      <subcategory value="1" description="LWB Land Rover" uuid="dc7bff4c-5269-11df-a428-080069138b88" uid="14932"/>
-      <subcategory value="2" description="Land Rover 6x6 truck" uuid="dc7d0cfc-5269-11df-af7b-080069138b88" uid="14933"/>
-      <subcategory value="3" description="Tractor, aircraft towing" uuid="dc7e1bce-5269-11df-b85e-080069138b88" uid="14934"/>
-    </category>
-    <category value="7" description="Large wheeled utility vehicle" uuid="dc7fc780-5269-11df-b3c8-080069138b88" uid="14935">
-      <subcategory value="1" description="4 Tonne" uuid="dc80da12-5269-11df-b2bb-080069138b88" uid="14936"/>
-      <subcategory value="2" description="8 Tonne" uuid="dc81eb00-5269-11df-bb0e-080069138b88" uid="14937"/>
-      <subcategory value="3" description="8 Tonne fuel" uuid="dc82fa86-5269-11df-8907-080069138b88" uid="14938"/>
-      <subcategory value="4" description="14 Tonne" uuid="dc840bf6-5269-11df-aa71-080069138b88" uid="14939"/>
-      <subcategory value="5" description="14 Tonne with bridge trailer" uuid="dc851500-5269-11df-837c-080069138b88" uid="14940"/>
-    </category>
-    <category value="8" description="Small tracked utility vehicle" uuid="dc86c274-5269-11df-b049-080069138b88" uid="14941"/>
-    <category value="9" description="Large tracked utility vehicle" uuid="dc87d4d4-5269-11df-834a-080069138b88" uid="14942"/>
-    <category value="10" description="Mortar" uuid="dc88e234-5269-11df-a9d2-080069138b88" uid="14943"/>
-    <category value="11" description="Mine plow" uuid="dc89e9cc-5269-11df-bd97-080069138b88" uid="14944">
-      <subcategory value="1" description="Mortar, 51mm, L10A1" uuid="dc8afa9c-5269-11df-90b7-080069138b88" uid="14945"/>
-    </category>
-    <category value="12" description="Mine rake" uuid="dc8ca69e-5269-11df-82ea-080069138b88" uid="14946"/>
-    <category value="13" description="Mine roller" uuid="dc8db322-5269-11df-9a0b-080069138b88" uid="14947"/>
-    <category value="14" description="Cargo trailer" uuid="dc8ebf24-5269-11df-86ef-080069138b88" uid="14948">
-      <subcategory value="1" description="0 - 0.5 ton" uuid="dc8fcc7a-5269-11df-9486-080069138b88" uid="14949"/>
-      <subcategory value="2" description="0.51 - 2 ton" uuid="dc90dac0-5269-11df-ab75-080069138b88" uid="14950"/>
-      <subcategory value="3" description="2.01 - 5 ton" uuid="dc91e33e-5269-11df-97d0-080069138b88" uid="14951"/>
-      <subcategory value="4" description="5.02 - 10 ton" uuid="dc92f31e-5269-11df-8b47-080069138b88" uid="14952"/>
-      <subcategory value="5" description="greater than 10 tons" uuid="dc940560-5269-11df-a33a-080069138b88" uid="14953"/>
-    </category>
-    <category value="15" description="Fuel trailer" uuid="dc95b0fe-5269-11df-a224-080069138b88" uid="14954">
-      <subcategory value="1" description="1-1000 gallons" uuid="dc96bd5a-5269-11df-a8bf-080069138b88" uid="14955"/>
-      <subcategory value="2" description="1001 - 5000 gallons" uuid="dc97cc86-5269-11df-80b3-080069138b88" uid="14956"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="dc98db1c-5269-11df-b51b-080069138b88" uid="14957"/>
-    </category>
-    <category value="16" description="Generator trailer" uuid="dc9a898a-5269-11df-861a-080069138b88" uid="14958">
-      <subcategory value="1" description="0 - 100 KW" uuid="dc9b917c-5269-11df-b84a-080069138b88" uid="14959"/>
-      <subcategory value="2" description="greater than 100 KW" uuid="dc9c9fb8-5269-11df-ac06-080069138b88" uid="14960"/>
-    </category>
-    <category value="17" description="Water trailer" uuid="dc9e4e30-5269-11df-99fc-080069138b88" uid="14961">
-      <subcategory value="1" description="1-1000 gallons" uuid="dc9f5a8c-5269-11df-968f-080069138b88" uid="14962"/>
-      <subcategory value="2" description="1001- 5000 gallons" uuid="dca06f80-5269-11df-812f-080069138b88" uid="14963"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="dca17fb0-5269-11df-a09b-080069138b88" uid="14964"/>
-    </category>
-    <category value="18" description="Engineer equipment" uuid="dca32c70-5269-11df-b6b0-080069138b88" uid="14965">
-      <subcategory value="1" description="Mine clearing line charge" uuid="dca43e62-5269-11df-88d9-080069138b88" uid="14966"/>
-      <subcategory value="2" description="Dozer blade kit" uuid="dca54884-5269-11df-a029-080069138b88" uid="14967"/>
-      <subcategory value="3" description="Lane marking system" uuid="dca65706-5269-11df-9a11-080069138b88" uid="14968"/>
-    </category>
-    <category value="19" description="Heavy equipment transport trailer" uuid="dca806be-5269-11df-9204-080069138b88" uid="14969"/>
-    <category value="20" description="Maintenance equipment trailer" uuid="dca91586-5269-11df-b97b-080069138b88" uid="14970">
-      <subcategory value="1" description="Welding trailer" uuid="dcaa1fd0-5269-11df-8b6e-080069138b88" uid="14971"/>
-      <subcategory value="2" description="Compressor" uuid="dcab2e0c-5269-11df-9f6c-080069138b88" uid="14972"/>
-      <subcategory value="3" description="Tools/parts trailer" uuid="dcac3ba8-5269-11df-931a-080069138b88" uid="14973"/>
-    </category>
-    <category value="21" description="Limber" uuid="dcadec6e-5269-11df-aadf-080069138b88" uid="14974"/>
-    <category value="22" description="Chemical decontamination trailer" uuid="dcaef442-5269-11df-b60a-080069138b88" uid="14975"/>
-    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="dcb0030a-5269-11df-9787-080069138b88" uid="14976">
-      <subcategory value="1" description="Rapier SAM System" uuid="dcb11628-5269-11df-a5e9-080069138b88" uid="14977">
-        <specific value="1" description="Rapier Battery Command Post (BCP)" uuid="dcb21f14-5269-11df-945c-080069138b88" uid="14978"/>
-        <specific value="2" description="Rapier Launcher" uuid="dcb32e72-5269-11df-92ba-080069138b88" uid="14979">
-          <extra value="1" description="Standard 4-Round Launcher" uuid="dcb43bbe-5269-11df-899a-080069138b88" uid="14980"/>
-          <extra value="2" description="6-Round Launcher (Darkfire variant)" uuid="dcb54946-5269-11df-a85f-080069138b88" uid="14981"/>
-          <extra value="3" description="8-Round Launcher (Rapier 2000/JERNAS)" uuid="dcb6580e-5269-11df-bf58-080069138b88" uid="14982"/>
-          <extra value="4" description="Tracked Rapier" uuid="dcb76762-5269-11df-874f-080069138b88" uid="14983"/>
-        </specific>
-        <specific value="3" description="Blindfire Engagement Radar (DN-181)" uuid="dcb915f8-5269-11df-b7e7-080069138b88" uid="14984"/>
-        <specific value="4" description="Dagger Surveillance Radar (Rapier 2000/JERNAS)" uuid="dcba1fca-5269-11df-9e95-080069138b88" uid="14985"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="224" uuid="dcbd1068-5269-11df-8fbf-080069138b88" uid="14986">
-    <category value="1" description="Fighter/Air Defense" uuid="dcbe1ca6-5269-11df-9b6a-080069138b88" uid="14987">
-      <subcategory value="1" description="Tornado ADV" uuid="dcbf2d26-5269-11df-a693-080069138b88" uid="14988">
-        <specific value="1" description="Tornado F. Mk2" uuid="dcc03db0-5269-11df-82b9-080069138b88" uid="14989"/>
-        <specific value="2" description="Tornado F. Mk 2A" uuid="dcc14fde-5269-11df-be80-080069138b88" uid="14990"/>
-        <specific value="3" description="Tornado F. Mk 3" uuid="dcc2578a-5269-11df-8f8e-080069138b88" uid="14991"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="dcc40472-5269-11df-a138-080069138b88" uid="14992"/>
-      <subcategory value="3" description="Eurofighter 2000" uuid="dcc51696-5269-11df-b628-080069138b88" uid="14993"/>
-    </category>
-    <category value="2" description="Attack/Strike" uuid="dcc6c6ee-5269-11df-8f5a-080069138b88" uid="14994">
-      <subcategory value="1" description="Sea Harrier" uuid="dcc7d278-5269-11df-a6e0-080069138b88" uid="14995">
-        <specific value="1" description="Sea Harrier FRS. Mk 1" uuid="dcc8daec-5269-11df-aca0-080069138b88" uid="14996"/>
-        <specific value="2" description="Sea Harrier T. Mk 4" uuid="dcc9ede2-5269-11df-9e4c-080069138b88" uid="14997"/>
-        <specific value="3" description="Sea Harrier FRS. Mk 51" uuid="dccafc78-5269-11df-800e-080069138b88" uid="14998"/>
-      </subcategory>
-      <subcategory value="2" description="Harrier" uuid="dccca834-5269-11df-bbf6-080069138b88" uid="14999">
-        <specific value="1" description="Harrier GR. Mk 3" uuid="dccdb346-5269-11df-87d2-080069138b88" uid="15000"/>
-        <specific value="2" description="Harrier T. Mk 4" uuid="dccec268-5269-11df-b225-080069138b88" uid="15001"/>
-        <specific value="3" description="Harrier GR. 5" uuid="dccfd0a4-5269-11df-84dc-080069138b88" uid="15002"/>
-        <specific value="4" description="Harrier GR. 7" uuid="dcd0dcec-5269-11df-900e-080069138b88" uid="15003"/>
-        <specific value="5" description="VA.1 Matador (AV-8S &amp; TAV-8S)" uuid="dcd1eaf6-5269-11df-a708-080069138b88" uid="15004"/>
-        <specific value="6" description="Harrier GR. Mk9" uuid="dcd2fa72-5269-11df-bec6-080069138b88" uid="15005"/>
-      </subcategory>
-      <subcategory value="3" description="BAe HS Buccaneer" uuid="dcd4a872-5269-11df-a5fa-080069138b88" uid="15006"/>
-      <subcategory value="4" description="Tornado" uuid="dcd5b136-5269-11df-a44f-080069138b88" uid="15007">
-        <specific value="1" description="Tornado GR Mk 1" uuid="dcd6bec8-5269-11df-a892-080069138b88" uid="15008"/>
-        <specific value="2" description="Tornado GR Mk 1A" uuid="dcd7cd86-5269-11df-9f8d-080069138b88" uid="15009"/>
-        <specific value="3" description="Tornado GR Mk 4" uuid="dcd8d528-5269-11df-84a1-080069138b88" uid="15010"/>
-      </subcategory>
-      <subcategory value="5" description="Jaguar" uuid="dcda862a-5269-11df-b156-080069138b88" uid="15011">
-        <specific value="1" description="Jaguar GR1 Mk 1" uuid="dcdb92b8-5269-11df-ba4f-080069138b88" uid="15012"/>
-        <specific value="2" description="Jaguar GR1 Mk 1A" uuid="dcdca072-5269-11df-89db-080069138b88" uid="15013"/>
-        <specific value="3" description="Jaguar GR Mk3" uuid="dcddb052-5269-11df-ac4e-080069138b88" uid="15014"/>
-        <specific value="4" description="Jaguar GR Mk3A" uuid="dcdec190-5269-11df-86e8-080069138b88" uid="15015"/>
-      </subcategory>
-      <subcategory value="6" description="BAe Hawk" uuid="dce0721a-5269-11df-93f3-080069138b88" uid="15016">
-        <specific value="1" description="Hawk T Mk 1" uuid="dce17f5c-5269-11df-b7b3-080069138b88" uid="15017"/>
-        <specific value="2" description="Hawk T Mk 1A" uuid="dce2860e-5269-11df-b883-080069138b88" uid="15018"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Cargo/Tanker" uuid="dce4da30-5269-11df-b267-080069138b88" uid="15019">
-      <subcategory value="1" description="K-2 Victor" uuid="dce5e1be-5269-11df-8f9b-080069138b88" uid="15020"/>
-      <subcategory value="2" description="Hercules C130" uuid="dce6ef64-5269-11df-aced-080069138b88" uid="15021">
-        <specific value="1" description="Hercules C. Mk 1" uuid="dce7fe18-5269-11df-a83d-080069138b88" uid="15022"/>
-        <specific value="2" description="Hercules C. Mk 1P" uuid="dce90a9c-5269-11df-86b8-080069138b88" uid="15023"/>
-        <specific value="3" description="Hercules C. MK 1K" uuid="dcea18c4-5269-11df-8c47-080069138b88" uid="15024"/>
-        <specific value="4" description="Hercules C. Mk 3P" uuid="dceb253e-5269-11df-8dfb-080069138b88" uid="15025"/>
-      </subcategory>
-      <subcategory value="3" description="BAe 146" uuid="dcecd424-5269-11df-8e11-080069138b88" uid="15026">
-        <specific value="1" description="BAe 146 CC. Mk 2" uuid="dceddd4c-5269-11df-a150-080069138b88" uid="15027"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="dcef8a16-5269-11df-8c51-080069138b88" uid="15028"/>
-      <subcategory value="5" description="Sea Devon" uuid="dcf097bc-5269-11df-b294-080069138b88" uid="15029"/>
-      <subcategory value="6" description="Sea Heron" uuid="dcf1aae4-5269-11df-9ea3-080069138b88" uid="15030"/>
-      <subcategory value="7" description="V-22 Osprey" uuid="dcf2b34e-5269-11df-95ae-080069138b88" uid="15031"/>
-      <subcategory value="8" description="BAe (BAC/Vickers) VC-10" uuid="dcf3c0a4-5269-11df-8db2-080069138b88" uid="15032">
-        <specific value="1" description="VC-10 C. Mk1(K)" uuid="dcf4d0c0-5269-11df-8965-080069138b88" uid="15033"/>
-        <specific value="2" description="VC-10 K. Mk 2" uuid="dcf5dd3a-5269-11df-8dcb-080069138b88" uid="15034"/>
-        <specific value="3" description="VC-10 K. Mk 3" uuid="dcf6eb30-5269-11df-9c02-080069138b88" uid="15035"/>
-        <specific value="4" description="VC-10 K. Mk 4" uuid="dcf7f7b4-5269-11df-a693-080069138b88" uid="15036"/>
-      </subcategory>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="dcf9a834-5269-11df-b313-080069138b88" uid="15037"/>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="dcfab300-5269-11df-975c-080069138b88" uid="15038"/>
-      <subcategory value="11" description="Pilatus Britten-Norman Defender" uuid="dcfbc2e0-5269-11df-80ca-080069138b88" uid="15039">
-        <specific value="1" description="Islander CC. Mk 2" uuid="dcfcda18-5269-11df-a997-080069138b88" uid="15040"/>
-        <specific value="2" description="Islander AL. Mk 1" uuid="dcfde5ac-5269-11df-ae57-080069138b88" uid="15041"/>
-        <specific value="3" description="Maritime Defender" uuid="dcfef80c-5269-11df-ab1d-080069138b88" uid="15042"/>
-        <specific value="4" description="Turbine Defender" uuid="dd00059e-5269-11df-9a3a-080069138b88" uid="15043"/>
-      </subcategory>
-      <subcategory value="12" description="Shorts 330 Sherpa" uuid="dd01b100-5269-11df-9fab-080069138b88" uid="15044">
-        <specific value="1" description="C-23A" uuid="dd02bdca-5269-11df-93be-080069138b88" uid="15045"/>
-        <specific value="2" description="C-23B" uuid="dd03cabc-5269-11df-ab0f-080069138b88" uid="15046"/>
-        <specific value="3" description="Shorts 330-UTT" uuid="dd04d79a-5269-11df-9919-080069138b88" uid="15047"/>
-        <specific value="4" description="Skyvan SC7" uuid="dd05e3a6-5269-11df-bf22-080069138b88" uid="15048"/>
-      </subcategory>
-      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="dd078fee-5269-11df-a3eb-080069138b88" uid="15049"/>
-      <subcategory value="14" description="BAe HS 748MF" uuid="dd089ec0-5269-11df-9277-080069138b88" uid="15050">
-        <specific value="1" description="Andover C. Mk 1" uuid="dd09af18-5269-11df-92c4-080069138b88" uid="15051"/>
-      </subcategory>
-      <subcategory value="15" description="Vickers VC2 Viscount" uuid="dd0b5b1a-5269-11df-afc1-080069138b88" uid="15052"/>
-      <subcategory value="16" description="L-1011 TriStar" uuid="dd0c64e2-5269-11df-93c9-080069138b88" uid="15053">
-        <specific value="1" description="TriStar KC Mk 1" uuid="dd0d75ee-5269-11df-afd6-080069138b88" uid="15054"/>
-        <specific value="2" description="TriStar K Mk 1" uuid="dd0e845c-5269-11df-8abe-080069138b88" uid="15055"/>
-        <specific value="3" description="TriStar C Mk 2" uuid="dd0f90f4-5269-11df-90c6-080069138b88" uid="15056"/>
-      </subcategory>
-    </category>
-    <category value="5" description="ASW/patrol/observation" uuid="dd11df9e-5269-11df-a914-080069138b88" uid="15057">
-      <subcategory value="1" description="Nimrod" uuid="dd12e736-5269-11df-a4a4-080069138b88" uid="15058">
-        <specific value="1" description="Nimrod R Mk 1" uuid="dd13f7a2-5269-11df-b5e6-080069138b88" uid="15059"/>
-        <specific value="2" description="Nimrod MR Mk 2" uuid="dd15050c-5269-11df-9ea0-080069138b88" uid="15060"/>
-        <specific value="3" description="Nimrod MR Mk 2P" uuid="dd160e16-5269-11df-9b16-080069138b88" uid="15061"/>
-        <specific value="4" description="Nimrod MR Mk 3" uuid="dd171b6c-5269-11df-bc8d-080069138b88" uid="15062"/>
-      </subcategory>
-      <subcategory value="2" description="BAe P. 132" uuid="dd18ca8e-5269-11df-8c50-080069138b88" uid="15063"/>
-    </category>
-    <category value="7" description="Reconnaissance" uuid="dd1a75b4-5269-11df-8815-080069138b88" uid="15064">
-      <subcategory value="1" description="English Electric Canberra" uuid="dd1b9070-5269-11df-9bf5-080069138b88" uid="15065">
-        <specific value="1" description="Canberra PR Mk 7" uuid="dd1c9b28-5269-11df-b248-080069138b88" uid="15066"/>
-        <specific value="2" description="Canberra PR Mk 9" uuid="dd1da9d2-5269-11df-8c50-080069138b88" uid="15067"/>
-      </subcategory>
-      <subcategory value="2" description="HS Buccaneer" uuid="dd1f5ade-5269-11df-b8cb-080069138b88" uid="15068">
-        <specific value="1" description="Buccaneer S. Mk 2A" uuid="dd2067a8-5269-11df-80e5-080069138b88" uid="15069"/>
-      </subcategory>
-      <subcategory value="3" description="Tornado" uuid="dd221512-5269-11df-a75d-080069138b88" uid="15070">
-        <specific value="1" description="Tornado GR Mk 1 w/recon pod" uuid="dd232088-5269-11df-89ae-080069138b88" uid="15071"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Surveillance/C2" uuid="dd256f96-5269-11df-ac3e-080069138b88" uid="15072">
-      <subcategory value="1" description="E-3D Sentry AEW Mk 1" uuid="dd26781e-5269-11df-9440-080069138b88" uid="15073"/>
-      <subcategory value="2" description="Andover" uuid="dd278614-5269-11df-b70f-080069138b88" uid="15074">
-        <specific value="1" description="Andover C. Mk1" uuid="dd289892-5269-11df-ab34-080069138b88" uid="15075"/>
-      </subcategory>
-      <subcategory value="3" description="Canberra" uuid="dd2a4494-5269-11df-976b-080069138b88" uid="15076">
-        <specific value="1" description="B Mk 2" uuid="dd2b4b32-5269-11df-9633-080069138b88" uid="15077"/>
-        <specific value="2" description="T Mk 4" uuid="dd2c5ebe-5269-11df-bb3c-080069138b88" uid="15078"/>
-        <specific value="3" description="E Mk 15" uuid="dd2d6b4c-5269-11df-add1-080069138b88" uid="15079"/>
-        <specific value="4" description="E Mk 17" uuid="dd2e7456-5269-11df-b93f-080069138b88" uid="15080"/>
-        <specific value="5" description="TT Mk 18" uuid="dd2f80e4-5269-11df-86e1-080069138b88" uid="15081"/>
-        <specific value="6" description="TT Mk 22" uuid="dd30922c-5269-11df-a619-080069138b88" uid="15082"/>
-      </subcategory>
-      <subcategory value="4" description="Hawker Hunter" uuid="dd323dc0-5269-11df-b0d6-080069138b88" uid="15083">
-        <specific value="1" description="GA 11" uuid="dd33468e-5269-11df-a0f4-080069138b88" uid="15084"/>
-        <specific value="2" description="T. Mk 7" uuid="dd3452e0-5269-11df-ab4e-080069138b88" uid="15085"/>
-        <specific value="3" description="T. Mk 8" uuid="dd356400-5269-11df-b426-080069138b88" uid="15086"/>
-        <specific value="4" description="PR Mk 11" uuid="dd366b5c-5269-11df-a7e9-080069138b88" uid="15087"/>
-      </subcategory>
-    </category>
-    <category value="20" description="Attack Helicopter" uuid="dd38bbd2-5269-11df-8970-080069138b88" uid="15088">
-      <subcategory value="1" description="Boeing" uuid="dd39cca2-5269-11df-9d8a-080069138b88" uid="15089">
-        <specific value="1" description="WAH64" uuid="dd3ade4e-5269-11df-add7-080069138b88" uid="15090"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Utility helicopter" uuid="dd3d2d84-5269-11df-b406-080069138b88" uid="15091">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="dd3e3a62-5269-11df-af31-080069138b88" uid="15092"/>
-      <subcategory value="2" description="Westland Lynx" uuid="dd3f4ad8-5269-11df-8d46-080069138b88" uid="15093">
-        <specific value="1" description="Mk 5" uuid="dd40598c-5269-11df-9d6d-080069138b88" uid="15094"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="dd416548-5269-11df-8671-080069138b88" uid="15095"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="dd427352-5269-11df-a276-080069138b88" uid="15096"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="dd438260-5269-11df-bbe3-080069138b88" uid="15097"/>
-        <specific value="5" description="(deprecated)" deprecated="1" uuid="dd448fb6-5269-11df-9027-080069138b88" uid="15098"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="dd459ed8-5269-11df-a663-080069138b88" uid="15099"/>
-        <specific value="7" description="(deprecated)" deprecated="1" uuid="dd46ac88-5269-11df-b52c-080069138b88" uid="15100"/>
-        <specific value="8" description="(deprecated)" deprecated="1" uuid="dd47b722-5269-11df-9bd0-080069138b88" uid="15101"/>
-        <specific value="9" description="(deprecated)" deprecated="1" uuid="dd48c9dc-5269-11df-80ee-080069138b88" uid="15102"/>
-        <specific value="10" description="(deprecated)" deprecated="1" uuid="dd49d7f0-5269-11df-8769-080069138b88" uid="15103"/>
-        <specific value="11" description="Mk 28" uuid="dd4ae0f0-5269-11df-b133-080069138b88" uid="15104"/>
-        <specific value="12" description="(deprecated)" deprecated="1" uuid="dd4bf2e2-5269-11df-8157-080069138b88" uid="15105"/>
-        <specific value="13" description="Mk 90" uuid="dd4d015a-5269-11df-a2c5-080069138b88" uid="15106"/>
-        <specific value="14" description="Mk 86" uuid="dd4e0816-5269-11df-9e58-080069138b88" uid="15107"/>
-        <specific value="15" description="Mk 95" uuid="dd4f15c6-5269-11df-909d-080069138b88" uid="15108"/>
-        <specific value="16" description="Mk 99" uuid="dd502718-5269-11df-ad1b-080069138b88" uid="15109"/>
-        <specific value="17" description="AH. Mk1" uuid="dd512ece-5269-11df-a224-080069138b88" uid="15110"/>
-        <specific value="18" description="AH. Mk 7" uuid="dd523b0c-5269-11df-8d9f-080069138b88" uid="15111"/>
-        <specific value="19" description="AH. Mk 9" uuid="dd534998-5269-11df-984f-080069138b88" uid="15112"/>
-      </subcategory>
-      <subcategory value="8" description="Westland Wessex" uuid="dd54f680-5269-11df-9a61-080069138b88" uid="15113">
-        <specific value="1" description="HC.MK 2" uuid="dd560200-5269-11df-9fbd-080069138b88" uid="15114"/>
-        <specific value="2" description="HC.MK 5" uuid="dd570efc-5269-11df-81dd-080069138b88" uid="15115"/>
-      </subcategory>
-      <subcategory value="9" description="Scout" uuid="dd58c382-5269-11df-9b49-080069138b88" uid="15116"/>
-      <subcategory value="10" description="Wasp" uuid="dd59d632-5269-11df-bb3a-080069138b88" uid="15117"/>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="dd5adde8-5269-11df-97ac-080069138b88" uid="15118"/>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="dd5beef4-5269-11df-a784-080069138b88" uid="15119"/>
-      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="dd5d07c6-5269-11df-8f62-080069138b88" uid="15120"/>
-      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="dd5e1300-5269-11df-b831-080069138b88" uid="15121"/>
-      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="dd5f2128-5269-11df-8fb1-080069138b88" uid="15122"/>
-      <subcategory value="16" description="(deprecated)" deprecated="1" uuid="dd603252-5269-11df-87be-080069138b88" uid="15123"/>
-      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="dd6140e8-5269-11df-b111-080069138b88" uid="15124"/>
-      <subcategory value="18" description="SA 330" uuid="dd624f10-5269-11df-8c54-080069138b88" uid="15125"/>
-      <subcategory value="19" description="Westland Super Lynx" uuid="dd635c20-5269-11df-84ab-080069138b88" uid="15126">
-        <specific value="1" description="Mk 95" uuid="dd646886-5269-11df-a51b-080069138b88" uid="15127"/>
-        <specific value="2" description="Mk 99" uuid="dd657636-5269-11df-830c-080069138b88" uid="15128"/>
-      </subcategory>
-    </category>
-    <category value="22" description="Antisubmarine Warfare / Patrol Helicopter" uuid="dd67bebe-5269-11df-a9a9-080069138b88" uid="15129">
-      <subcategory value="1" description="Westland Sea King" uuid="dd68d2e0-5269-11df-8726-080069138b88" uid="15130">
-        <specific value="1" description="HAS. Mk 1" uuid="dd69e0d6-5269-11df-ba21-080069138b88" uid="15131"/>
-        <specific value="2" description="HAS. Mk 2" uuid="dd6aeff8-5269-11df-8ed9-080069138b88" uid="15132"/>
-        <specific value="3" description="HAS. Mk 5" uuid="dd6bfa7e-5269-11df-a515-080069138b88" uid="15133"/>
-        <specific value="4" description="HAS. Mk 6" uuid="dd6d0888-5269-11df-b51c-080069138b88" uid="15134"/>
-        <specific value="5" description="AEW. Mk 2A" uuid="dd6e15d4-5269-11df-8b0f-080069138b88" uid="15135"/>
-        <specific value="6" description="HAR. Mk 3" uuid="dd6f20c8-5269-11df-82ca-080069138b88" uid="15136"/>
-        <specific value="7" description="HAR. Mk 5" uuid="dd702d4c-5269-11df-a8b1-080069138b88" uid="15137"/>
-        <specific value="8" description="Mk 41" uuid="dd713b24-5269-11df-8993-080069138b88" uid="15138"/>
-        <specific value="9" description="Mk 42" uuid="dd724550-5269-11df-b29a-080069138b88" uid="15139"/>
-        <specific value="10" description="Mk 42A" uuid="dd735148-5269-11df-a1b8-080069138b88" uid="15140"/>
-        <specific value="11" description="Mk 42B" uuid="dd746038-5269-11df-8272-080069138b88" uid="15141"/>
-        <specific value="12" description="Mk 43" uuid="dd756956-5269-11df-9aa6-080069138b88" uid="15142"/>
-        <specific value="13" description="Mk 43A" uuid="dd767940-5269-11df-99ea-080069138b88" uid="15143"/>
-        <specific value="14" description="Mk 43B" uuid="dd778f06-5269-11df-93ea-080069138b88" uid="15144"/>
-        <specific value="15" description="Mk 45" uuid="dd7897ca-5269-11df-b329-080069138b88" uid="15145"/>
-        <specific value="16" description="Mk 47" uuid="dd79a91c-5269-11df-9cd3-080069138b88" uid="15146"/>
-        <specific value="17" description="Mk 48" uuid="dd7ab780-5269-11df-af7d-080069138b88" uid="15147"/>
-        <specific value="18" description="Mk 50" uuid="dd7bbe50-5269-11df-9cf6-080069138b88" uid="15148"/>
-      </subcategory>
-      <subcategory value="2" description="Westland Lynx (Naval)" uuid="dd7d6e76-5269-11df-bc13-080069138b88" uid="15149">
-        <specific value="1" description="HAS Mk 2" uuid="dd7e7d20-5269-11df-b217-080069138b88" uid="15150"/>
-        <specific value="2" description="HAS Mk 3" uuid="dd7f8940-5269-11df-9dcd-080069138b88" uid="15151"/>
-        <specific value="3" description="HAS Mk 2 (FN)" uuid="dd809204-5269-11df-8433-080069138b88" uid="15152"/>
-        <specific value="4" description="HAS Mk 3 (FN)" uuid="dd81a388-5269-11df-91bc-080069138b88" uid="15153"/>
-        <specific value="5" description="Mk 21 (Brazil)" uuid="dd82b110-5269-11df-92fe-080069138b88" uid="15154"/>
-        <specific value="6" description="Mk 23 (Argentina)" uuid="dd83b8bc-5269-11df-a4fd-080069138b88" uid="15155"/>
-        <specific value="7" description="Mk 25 (Netherlands)" uuid="dd84cb8a-5269-11df-a9af-080069138b88" uid="15156"/>
-        <specific value="8" description="Mk 27 (Netherlands)" uuid="dd85daf2-5269-11df-b38c-080069138b88" uid="15157"/>
-        <specific value="9" description="MK 81 (Netherlands)" uuid="dd86e398-5269-11df-a10c-080069138b88" uid="15158"/>
-        <specific value="10" description="MK 80 (Denmark)" uuid="dd87f030-5269-11df-90f8-080069138b88" uid="15159"/>
-        <specific value="11" description="MK 8" uuid="dd8902d6-5269-11df-a434-080069138b88" uid="15160"/>
-      </subcategory>
-      <subcategory value="3" description="EH101 Merlin" uuid="dd8abd38-5269-11df-a534-080069138b88" uid="15161"/>
-    </category>
-    <category value="23" description="Cargo Helicopter" uuid="dd8c6eee-5269-11df-891d-080069138b88" uid="15162">
-      <subcategory value="1" description="Westland Commando" uuid="dd8d7a6e-5269-11df-9338-080069138b88" uid="15163">
-        <specific value="1" description="Commando Mk 1" uuid="dd8e8940-5269-11df-b27c-080069138b88" uid="15164"/>
-        <specific value="2" description="Commando Mk 2" uuid="dd8f97c2-5269-11df-8d38-080069138b88" uid="15165"/>
-        <specific value="3" description="Commando Mk 2B" uuid="dd909f1e-5269-11df-847c-080069138b88" uid="15166"/>
-        <specific value="4" description="Commando Mk 2E" uuid="dd91b034-5269-11df-9c43-080069138b88" uid="15167"/>
-        <specific value="5" description="Commando Mk 2A" uuid="dd92be34-5269-11df-8699-080069138b88" uid="15168"/>
-        <specific value="6" description="Commando Mk 2C" uuid="dd93c702-5269-11df-be92-080069138b88" uid="15169"/>
-        <specific value="7" description="Commando Mk 3" uuid="dd94d728-5269-11df-bfef-080069138b88" uid="15170"/>
-        <specific value="8" description="Indian Sea King Mk 42C" uuid="dd95ee38-5269-11df-9205-080069138b88" uid="15171"/>
-        <specific value="9" description="Sea King HC. Mk" uuid="dd96f864-5269-11df-b1f2-080069138b88" uid="15172"/>
-      </subcategory>
-    </category>
-    <category value="40" description="Trainer" uuid="dd994a2e-5269-11df-a394-080069138b88" uid="15173">
-      <subcategory value="1" description="Shorts S312 Tucano" uuid="dd9a5266-5269-11df-acd6-080069138b88" uid="15174">
-        <specific value="1" description="T. Mk 1" uuid="dd9b63cc-5269-11df-8e5a-080069138b88" uid="15175"/>
-      </subcategory>
-      <subcategory value="2" description="Bulldog" uuid="dd9d0fce-5269-11df-b0c5-080069138b88" uid="15176">
-        <specific value="1" description="T. MK 1" uuid="dd9e1d2e-5269-11df-84f9-080069138b88" uid="15177"/>
-      </subcategory>
-      <subcategory value="3" description="Chipmunk" uuid="dd9fcbc4-5269-11df-ac7e-080069138b88" uid="15178"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="dda0d424-5269-11df-bb94-080069138b88" uid="15179"/>
-      <subcategory value="5" description="BAe Hawk" uuid="dda1e396-5269-11df-8ec1-080069138b88" uid="15180">
-        <specific value="1" description="Hawk T. Mk 1" uuid="dda2f434-5269-11df-af8c-080069138b88" uid="15181"/>
-        <specific value="2" description="Hawk T. Mk 1A" uuid="dda3fcf8-5269-11df-816c-080069138b88" uid="15182"/>
-        <specific value="3" description="Goshawk T-45A" uuid="dda50ba2-5269-11df-937d-080069138b88" uid="15183"/>
-      </subcategory>
-      <subcategory value="6" description="BAe Jetstream Super 31" uuid="dda6b98e-5269-11df-ad1c-080069138b88" uid="15184">
-        <specific value="1" description="Jetstream T Mk 2" uuid="dda7ca04-5269-11df-b270-080069138b88" uid="15185"/>
-        <specific value="2" description="Jetstream T Mk 3" uuid="dda8d296-5269-11df-89d1-080069138b88" uid="15186"/>
-      </subcategory>
-      <subcategory value="7" description="Chieftain" uuid="ddaa8028-5269-11df-83dc-080069138b88" uid="15187"/>
-      <subcategory value="8" description="BAe 125-800" uuid="ddab918e-5269-11df-ab14-080069138b88" uid="15188">
-        <specific value="1" description="C-29A" uuid="ddac9dcc-5269-11df-ba20-080069138b88" uid="15189"/>
-        <specific value="2" description="U-125A" uuid="ddada5fa-5269-11df-b15c-080069138b88" uid="15190"/>
-      </subcategory>
-      <subcategory value="9" description="Slingsby T67 Firefly" uuid="ddaf5468-5269-11df-b498-080069138b88" uid="15191">
-        <specific value="1" description="T67M Mk II" uuid="ddb061be-5269-11df-bd32-080069138b88" uid="15192"/>
-        <specific value="2" description="T67M260" uuid="ddb16f5a-5269-11df-9da8-080069138b88" uid="15193"/>
-      </subcategory>
-      <subcategory value="10" description="Provost" uuid="ddb31fd0-5269-11df-a4b8-080069138b88" uid="15194">
-        <specific value="1" description="T Mk 5" uuid="ddb42f6a-5269-11df-af23-080069138b88" uid="15195"/>
-      </subcategory>
-    </category>
-    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="ddb6813e-5269-11df-ac27-080069138b88" uid="15196">
-      <subcategory value="1" description="Passenger Airline" uuid="ddb78a16-5269-11df-a05d-080069138b88" uid="15197">
-        <specific value="1" description="British Aerospace 146-100" uuid="ddb89a00-5269-11df-9a4a-080069138b88" uid="15198"/>
-        <specific value="2" description="BAC-111" uuid="ddb9ae72-5269-11df-a1d3-080069138b88" uid="15199"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="224" uuid="ddbc92b8-5269-11df-b85d-080069138b88" uid="15200">
-    <category value="4" description="Guided-missile Destroyer" uuid="ddbda3d8-5269-11df-8bf4-080069138b88" uid="15201">
-      <subcategory value="1" description="Type 42" uuid="ddbeb28c-5269-11df-b5fc-080069138b88" uid="15202">
-        <specific value="1" description="D 86 Birmingham" uuid="ddbfc046-5269-11df-9c17-080069138b88" uid="15203"/>
-        <specific value="2" description="D 87 Newcastle" uuid="ddc0cafe-5269-11df-82ff-080069138b88" uid="15204"/>
-        <specific value="3" description="D 88 Glasgow" uuid="ddc1d87c-5269-11df-ae6b-080069138b88" uid="15205"/>
-        <specific value="4" description="D 108 Cardiff" uuid="ddc2e67c-5269-11df-a34d-080069138b88" uid="15206"/>
-        <specific value="5" description="D 89 Exeter" uuid="ddc3f224-5269-11df-a31b-080069138b88" uid="15207"/>
-        <specific value="6" description="D 90 Southampton" uuid="ddc4fe8a-5269-11df-bb5c-080069138b88" uid="15208"/>
-        <specific value="7" description="D 91 Nottingham" uuid="ddc60d70-5269-11df-bf02-080069138b88" uid="15209"/>
-        <specific value="8" description="D 92 Liverpool" uuid="ddc71698-5269-11df-8751-080069138b88" uid="15210"/>
-        <specific value="9" description="D 95 Manchester" uuid="ddc8233a-5269-11df-a0d5-080069138b88" uid="15211"/>
-        <specific value="10" description="D 96 Gloucester" uuid="ddc935b8-5269-11df-8a92-080069138b88" uid="15212"/>
-        <specific value="11" description="D 97 Edinburgh" uuid="ddca3e0e-5269-11df-ac29-080069138b88" uid="15213"/>
-        <specific value="12" description="D 98 York" uuid="ddcb4d62-5269-11df-aa64-080069138b88" uid="15214"/>
-      </subcategory>
-      <subcategory value="2" description="Type 45" uuid="ddccfc98-5269-11df-b7a3-080069138b88" uid="15215">
-        <specific value="1" description="D 32 Daring" uuid="ddce08e0-5269-11df-8a5b-080069138b88" uid="15216"/>
-        <specific value="2" description="D 33 Dauntless" uuid="ddcf117c-5269-11df-8392-080069138b88" uid="15217"/>
-        <specific value="3" description="D 34 Diamond" uuid="ddd01d60-5269-11df-bef5-080069138b88" uid="15218"/>
-        <specific value="4" description="D 35 Dragon" uuid="ddd12e4e-5269-11df-bcbe-080069138b88" uid="15219"/>
-        <specific value="5" description="D 36 Defender" uuid="ddd235a0-5269-11df-b434-080069138b88" uid="15220"/>
-        <specific value="6" description="D 37 Duncan" uuid="ddd34cd8-5269-11df-9edb-080069138b88" uid="15221"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided-missile Frigate" uuid="ddd597b8-5269-11df-b4c5-080069138b88" uid="15222">
-      <subcategory value="1" description="Duke class (Type 23)" uuid="ddd6a630-5269-11df-959e-080069138b88" uid="15223">
-        <specific value="1" description="F 230 Norfolk" uuid="ddd7b656-5269-11df-bf46-080069138b88" uid="15224"/>
-        <specific value="2" description="F 231 Argyll" uuid="ddd8c906-5269-11df-98b1-080069138b88" uid="15225"/>
-        <specific value="3" description="F 229 Lancaster (ex-F 232)" uuid="ddd9d06c-5269-11df-9662-080069138b88" uid="15226"/>
-        <specific value="4" description="F 233 Marlborough" uuid="dddadfb6-5269-11df-84ba-080069138b88" uid="15227"/>
-        <specific value="5" description="F 234 Iron Duke" uuid="dddbf1e4-5269-11df-8288-080069138b88" uid="15228"/>
-        <specific value="6" description="F 235 Monmouth" uuid="dddcfa30-5269-11df-a6b8-080069138b88" uid="15229"/>
-        <specific value="7" description="F 236 Montrose" uuid="ddde06dc-5269-11df-b7a2-080069138b88" uid="15230"/>
-        <specific value="8" description="F 237 Westminster" uuid="dddf1734-5269-11df-b5dd-080069138b88" uid="15231"/>
-        <specific value="9" description="F 238 Northumberland" uuid="dde02282-5269-11df-a4cc-080069138b88" uid="15232"/>
-        <specific value="10" description="F 239 Richmond" uuid="dde12f1a-5269-11df-b43d-080069138b88" uid="15233"/>
-        <specific value="11" description="F 240 Somerset" uuid="dde23e6e-5269-11df-849d-080069138b88" uid="15234"/>
-        <specific value="12" description="F 241 Grafton" uuid="dde3484a-5269-11df-b218-080069138b88" uid="15235"/>
-        <specific value="13" description="F 242 Sutherland" uuid="dde458fc-5269-11df-b599-080069138b88" uid="15236"/>
-      </subcategory>
-      <subcategory value="2" description="Broadsword class (Type 22)" uuid="dde6045e-5269-11df-8092-080069138b88" uid="15237">
-        <specific value="1" description="F 88 Broadsword" uuid="dde712ae-5269-11df-9214-080069138b88" uid="15238"/>
-        <specific value="2" description="F 89 Battleaxe" uuid="dde81fa0-5269-11df-a457-080069138b88" uid="15239"/>
-        <specific value="3" description="F 90 Brilliant" uuid="dde92d78-5269-11df-91cc-080069138b88" uid="15240"/>
-        <specific value="4" description="F 91 Brazen" uuid="ddea3998-5269-11df-a00f-080069138b88" uid="15241"/>
-        <specific value="5" description="F 92 Boxer" uuid="ddeb461c-5269-11df-9f3b-080069138b88" uid="15242"/>
-        <specific value="6" description="F 93 Beaver" uuid="ddec550c-5269-11df-b0e2-080069138b88" uid="15243"/>
-        <specific value="7" description="F 94 Brave" uuid="dded61f4-5269-11df-8ff0-080069138b88" uid="15244"/>
-        <specific value="8" description="F 95 London (ex-Bloodhound)" uuid="ddee6a54-5269-11df-bb9c-080069138b88" uid="15245"/>
-        <specific value="9" description="F 96 Sheffield" uuid="ddef7cdc-5269-11df-9762-080069138b88" uid="15246"/>
-        <specific value="10" description="F 98 Coventry" uuid="ddf08a6e-5269-11df-bdcb-080069138b88" uid="15247"/>
-        <specific value="11" description="F 85 Cumberland" uuid="ddf19936-5269-11df-ba51-080069138b88" uid="15248"/>
-        <specific value="12" description="F 86 Campbeltown" uuid="ddf2ac4a-5269-11df-8923-080069138b88" uid="15249"/>
-        <specific value="13" description="F 87 Chatham" uuid="ddf3baea-5269-11df-aae1-080069138b88" uid="15250"/>
-        <specific value="14" description="F 99 Cornwall" uuid="ddf4c340-5269-11df-80ab-080069138b88" uid="15251"/>
-      </subcategory>
-      <subcategory value="3" description="Amazon class (Type 21)" uuid="ddf6738e-5269-11df-adb4-080069138b88" uid="15252">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="ddf78436-5269-11df-a077-080069138b88" uid="15253"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="ddf89362-5269-11df-a6a5-080069138b88" uid="15254"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="ddf99bea-5269-11df-9211-080069138b88" uid="15255"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="ddfaada0-5269-11df-81a6-080069138b88" uid="15256"/>
-        <specific value="5" description="(deprecated)" deprecated="1" uuid="ddfbbc86-5269-11df-b049-080069138b88" uid="15257"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="ddfcc66c-5269-11df-acb6-080069138b88" uid="15258"/>
-        <specific value="7" description="F 181 Tariq (Pak.)" uuid="ddfdd7aa-5269-11df-ac9d-080069138b88" uid="15259"/>
-        <specific value="8" description="F 182 Babur (Pak.)" uuid="ddfee5dc-5269-11df-86f8-080069138b88" uid="15260"/>
-        <specific value="9" description="F 183 Khaibir (Pak.)" uuid="ddffee00-5269-11df-a7a9-080069138b88" uid="15261"/>
-        <specific value="10" description="F 184 Badr (Pak.)" uuid="de00ffca-5269-11df-9a59-080069138b88" uid="15262"/>
-        <specific value="11" description="F 185 Shahjahan (Pak.)" uuid="de020e6a-5269-11df-a618-080069138b88" uid="15263"/>
-        <specific value="12" description="F 186 Tippu Sultan (Pak.)" uuid="de0317ce-5269-11df-9ec1-080069138b88" uid="15264"/>
-      </subcategory>
-      <subcategory value="4" description="Leander Class" uuid="de04c6fa-5269-11df-a744-080069138b88" uid="15265">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="de05d4aa-5269-11df-a973-080069138b88" uid="15266"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="de06e50c-5269-11df-84ab-080069138b88" uid="15267"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="de07ef60-5269-11df-8734-080069138b88" uid="15268"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="de0901ac-5269-11df-8ef5-080069138b88" uid="15269"/>
-        <specific value="5" description="Condell (Chile)" uuid="de0a0f2a-5269-11df-8abb-080069138b88" uid="15270"/>
-        <specific value="6" description="Lynch (Chile)" uuid="de0b16fe-5269-11df-ae9c-080069138b88" uid="15271"/>
-        <specific value="7" description="Ministro Zenteno (Chile)" uuid="de0c2846-5269-11df-9d77-080069138b88" uid="15272"/>
-        <specific value="8" description="General Baquedano (Chile)" uuid="de0d3754-5269-11df-bd74-080069138b88" uid="15273"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/patrol craft" uuid="de0f80ea-5269-11df-8f61-080069138b88" uid="15274">
-      <subcategory value="1" description="Antarctic patrol ship" uuid="de1098fe-5269-11df-af0d-080069138b88" uid="15275">
-        <specific value="1" description="A 176 Polar Circle" uuid="de11a758-5269-11df-8f41-080069138b88" uid="15276"/>
-      </subcategory>
-      <subcategory value="2" description="Castle class (offshore patrol vessels MK 2)" uuid="de1353e6-5269-11df-9ba8-080069138b88" uid="15277">
-        <specific value="1" description="P 258 Leeds Castle" uuid="de1461fa-5269-11df-be9b-080069138b88" uid="15278"/>
-        <specific value="2" description="Dumbarton Castle" uuid="de157450-5269-11df-b316-080069138b88" uid="15279"/>
-      </subcategory>
-      <subcategory value="3" description="Island class (offshore patrol vessels)" uuid="de1721a6-5269-11df-bcc7-080069138b88" uid="15280">
-        <specific value="1" description="P 277 Anglesey" uuid="de182c72-5269-11df-9048-080069138b88" uid="15281"/>
-        <specific value="2" description="P 278 Alderney" uuid="de1939fa-5269-11df-9276-080069138b88" uid="15282"/>
-        <specific value="3" description="P 295 Jersey" uuid="de1a4bf6-5269-11df-9a51-080069138b88" uid="15283"/>
-        <specific value="4" description="P 297 Guernsey" uuid="de1b5410-5269-11df-9f2a-080069138b88" uid="15284"/>
-        <specific value="5" description="P 298 Shetland" uuid="de1c6152-5269-11df-a1b2-080069138b88" uid="15285"/>
-        <specific value="6" description="P 299 Orkney" uuid="de1d7218-5269-11df-9c06-080069138b88" uid="15286"/>
-        <specific value="7" description="P 300 Lindisfarne" uuid="de1e7e1a-5269-11df-9544-080069138b88" uid="15287"/>
-      </subcategory>
-      <subcategory value="4" description="Peacock class (large patrol craft)" uuid="de202a30-5269-11df-bbae-080069138b88" uid="15288">
-        <specific value="1" description="P 239 Peacock" uuid="de213880-5269-11df-86de-080069138b88" uid="15289"/>
-        <specific value="2" description="P 240 Plover" uuid="de2247a2-5269-11df-ab0b-080069138b88" uid="15290"/>
-        <specific value="3" description="P 241 Starling" uuid="de235d4a-5269-11df-8e28-080069138b88" uid="15291"/>
-      </subcategory>
-      <subcategory value="5" description="Bird and Seal class (large patrol craft)" uuid="de250eec-5269-11df-8cba-080069138b88" uid="15292">
-        <specific value="1" description="P 259 Redpole (ex-Sea Otter)" uuid="de261f08-5269-11df-9293-080069138b88" uid="15293"/>
-        <specific value="2" description="P 260 Kingfisher" uuid="de27315e-5269-11df-8f75-080069138b88" uid="15294"/>
-        <specific value="3" description="P 261 Cygnet" uuid="de283932-5269-11df-987a-080069138b88" uid="15295"/>
-      </subcategory>
-      <subcategory value="6" description="Archer class (training and patrol craft)" uuid="de29e796-5269-11df-a75d-080069138b88" uid="15296">
-        <specific value="1" description="P 264 Archer" uuid="de2af618-5269-11df-a9ed-080069138b88" uid="15297"/>
-        <specific value="2" description="P 270 Biter" uuid="de2c07c4-5269-11df-baac-080069138b88" uid="15298"/>
-        <specific value="3" description="P 272 Smiter" uuid="de2d107e-5269-11df-94e7-080069138b88" uid="15299"/>
-        <specific value="4" description="P 273 Pursuer" uuid="de2e1dde-5269-11df-a854-080069138b88" uid="15300"/>
-        <specific value="5" description="P 279 Blazer" uuid="de2f3674-5269-11df-883f-080069138b88" uid="15301"/>
-        <specific value="6" description="P 280 Dasher" uuid="de3043ac-5269-11df-992c-080069138b88" uid="15302"/>
-        <specific value="7" description="P 291 Puncher" uuid="de315152-5269-11df-b6ea-080069138b88" uid="15303"/>
-        <specific value="8" description="P 292 Charger" uuid="de325db8-5269-11df-83d5-080069138b88" uid="15304"/>
-        <specific value="9" description="P 293 Ranger" uuid="de3366b8-5269-11df-a465-080069138b88" uid="15305"/>
-        <specific value="10" description="P 294 Trumpeter" uuid="de3478c8-5269-11df-8fda-080069138b88" uid="15306"/>
-        <specific value="11" description="A 153 Example (RNXS)" uuid="de3586b4-5269-11df-a8d5-080069138b88" uid="15307"/>
-        <specific value="12" description="A 154 Explorer (RNXS)" uuid="de368faa-5269-11df-bed8-080069138b88" uid="15308"/>
-        <specific value="13" description="A 163 Express (RNXS)" uuid="de37a1ba-5269-11df-8b0f-080069138b88" uid="15309"/>
-        <specific value="14" description="A 167 Exploit (RNXS)" uuid="de38af9c-5269-11df-a495-080069138b88" uid="15310"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="de3afaae-5269-11df-a2f0-080069138b88" uid="15311">
-      <subcategory value="1" description="Hunt class (minesweepers/minehunters, coastal)" uuid="de3c08b8-5269-11df-964a-080069138b88" uid="15312">
-        <specific value="1" description="M 29 Brecon" uuid="de3d17a8-5269-11df-b292-080069138b88" uid="15313"/>
-        <specific value="2" description="M 30 Ledbury" uuid="de3e24a4-5269-11df-848f-080069138b88" uid="15314"/>
-        <specific value="3" description="M 31 Cattistock" uuid="de3f322c-5269-11df-804e-080069138b88" uid="15315"/>
-        <specific value="4" description="M 32 Cottesmore" uuid="de403e60-5269-11df-9256-080069138b88" uid="15316"/>
-        <specific value="5" description="M 33 Brocklesby" uuid="de414c1a-5269-11df-b83e-080069138b88" uid="15317"/>
-        <specific value="6" description="M 34 Middleton" uuid="de4259fc-5269-11df-9ef0-080069138b88" uid="15318"/>
-        <specific value="7" description="M 35 Dulverton" uuid="de4360b8-5269-11df-8fb0-080069138b88" uid="15319"/>
-        <specific value="8" description="M 36 Bicester" uuid="de446f6c-5269-11df-a432-080069138b88" uid="15320"/>
-        <specific value="9" description="M 37 Chiddingfold" uuid="de4581cc-5269-11df-97ff-080069138b88" uid="15321"/>
-        <specific value="10" description="M 38 Atherstone" uuid="de468b4e-5269-11df-b9ab-080069138b88" uid="15322"/>
-        <specific value="11" description="M 39 Hurworth" uuid="de479890-5269-11df-9a38-080069138b88" uid="15323"/>
-        <specific value="12" description="M 40 Berkeley" uuid="de48a7ee-5269-11df-89ce-080069138b88" uid="15324"/>
-        <specific value="13" description="M 41 Quorn" uuid="de49b170-5269-11df-bf0f-080069138b88" uid="15325"/>
-      </subcategory>
-      <subcategory value="2" description="River class (minesweepers, coastal)" uuid="de4b604c-5269-11df-a555-080069138b88" uid="15326">
-        <specific value="1" description="M 2003 Waveney" uuid="de4c6f1e-5269-11df-8f6e-080069138b88" uid="15327"/>
-        <specific value="2" description="M 2004 Carron" uuid="de4d8516-5269-11df-abeb-080069138b88" uid="15328"/>
-        <specific value="3" description="M 2005 Dovey" uuid="de4e9014-5269-11df-a8db-080069138b88" uid="15329"/>
-        <specific value="4" description="M 2006 Helford" uuid="de4f9cc0-5269-11df-b291-080069138b88" uid="15330"/>
-        <specific value="5" description="M 2007 Humber" uuid="de50ae62-5269-11df-9b56-080069138b88" uid="15331"/>
-        <specific value="6" description="M 2008 Blackwater" uuid="de51b690-5269-11df-bb7e-080069138b88" uid="15332"/>
-        <specific value="7" description="M 2009 Itchen" uuid="de52c3e6-5269-11df-a91c-080069138b88" uid="15333"/>
-        <specific value="8" description="M 2010 Helmsdale" uuid="de53d1f0-5269-11df-879c-080069138b88" uid="15334"/>
-        <specific value="9" description="M 2011 Orwell" uuid="de54dd7a-5269-11df-bdc3-080069138b88" uid="15335"/>
-        <specific value="10" description="M2012 Ribble" uuid="de55ebb6-5269-11df-ad4a-080069138b88" uid="15336"/>
-        <specific value="11" description="M 2013 Spey" uuid="de56f8bc-5269-11df-81b3-080069138b88" uid="15337"/>
-        <specific value="12" description="M 2014 Arun" uuid="de58002c-5269-11df-b053-080069138b88" uid="15338"/>
-      </subcategory>
-      <subcategory value="3" description="Ton class (coastal minehunters)" uuid="de59aff8-5269-11df-92c3-080069138b88" uid="15339">
-        <specific value="1" description="M 1114 Brinton" uuid="de5abf1a-5269-11df-89c2-080069138b88" uid="15340"/>
-        <specific value="2" description="M 1151 Iveston" uuid="de5bd5f8-5269-11df-be4e-080069138b88" uid="15341"/>
-        <specific value="3" description="M 1154 Kellington" uuid="de5ce894-5269-11df-85bd-080069138b88" uid="15342"/>
-        <specific value="4" description="M 1166 Nurton" uuid="de5df734-5269-11df-9bd5-080069138b88" uid="15343"/>
-        <specific value="5" description="M 1181 Sheraton" uuid="de5f0520-5269-11df-bd6d-080069138b88" uid="15344"/>
-      </subcategory>
-      <subcategory value="4" description="Sandown class (minehunters)" uuid="de60b406-5269-11df-aedd-080069138b88" uid="15345">
-        <specific value="1" description="M 101 Sandown" uuid="de61bcc0-5269-11df-9e8c-080069138b88" uid="15346"/>
-        <specific value="2" description="M 102 Inverness" uuid="de62c9e4-5269-11df-a925-080069138b88" uid="15347"/>
-        <specific value="3" description="M 103 Cromer" uuid="de63dab4-5269-11df-85da-080069138b88" uid="15348"/>
-        <specific value="4" description="M 104 Walney" uuid="de64e198-5269-11df-bb89-080069138b88" uid="15349"/>
-        <specific value="5" description="M 105 Bridport" uuid="de65efca-5269-11df-9a48-080069138b88" uid="15350"/>
-        <specific value="6" description="M 106 Penzance" uuid="de66fe1a-5269-11df-a353-080069138b88" uid="15351"/>
-        <specific value="7" description="M 107 Pembroke" uuid="de6804d6-5269-11df-ae38-080069138b88" uid="15352"/>
-        <specific value="8" description="M 108 Grimsby" uuid="de6913b2-5269-11df-879b-080069138b88" uid="15353"/>
-        <specific value="9" description="M 109 Bangor" uuid="de6a24f0-5269-11df-9191-080069138b88" uid="15354"/>
-      </subcategory>
-    </category>
-    <category value="9" description="Dock Landing Ship" uuid="de6c7534-5269-11df-8525-080069138b88" uid="15355">
-      <subcategory value="1" description="Bay Class" uuid="de6d86f4-5269-11df-bdd7-080069138b88" uid="15356">
-        <specific value="1" description="Largs Bay" uuid="de6e8f90-5269-11df-8f40-080069138b88" uid="15357"/>
-        <specific value="2" description="Lyme Bay" uuid="de6f9cc8-5269-11df-b74e-080069138b88" uid="15358"/>
-        <specific value="3" description="Mounts Bay" uuid="de70ab7c-5269-11df-bad8-080069138b88" uid="15359"/>
-        <specific value="4" description="Cardigan Bay" uuid="de71b2ce-5269-11df-b188-080069138b88" uid="15360"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Tank landing ship" uuid="de74065a-5269-11df-9d26-080069138b88" uid="15361">
-      <subcategory value="1" description="Sir Bedivere Class (LSL)" uuid="de750f64-5269-11df-b1d2-080069138b88" uid="15362"/>
-      <subcategory value="2" description="Sir Galahad Class (LSL)" uuid="de761d96-5269-11df-9696-080069138b88" uid="15363"/>
-    </category>
-    <category value="12" description="Light carrier" uuid="de77cd1c-5269-11df-bc9b-080069138b88" uid="15364">
-      <subcategory value="1" description="Light aircraft carrier (CVSG)" uuid="de78de00-5269-11df-82cc-080069138b88" uid="15365">
-        <specific value="1" description="R 05 Invincible" uuid="de79e78c-5269-11df-a020-080069138b88" uid="15366"/>
-        <specific value="2" description="R 06 Illustrious" uuid="de7af4f6-5269-11df-a5dc-080069138b88" uid="15367"/>
-        <specific value="3" description="R 07 Ark Royal" uuid="de7c049a-5269-11df-b891-080069138b88" uid="15368"/>
-        <specific value="4" description="R 22 VIRAAT (India)" uuid="de7d106a-5269-11df-a257-080069138b88" uid="15369"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="de7f5ee2-5269-11df-89a5-080069138b88" uid="15370">
-      <subcategory value="1" description="Leander class (training ships)" uuid="de806562-5269-11df-8720-080069138b88" uid="15371">
-        <specific value="1" description="F 52 Juno" uuid="de8175f6-5269-11df-995c-080069138b88" uid="15372"/>
-      </subcategory>
-      <subcategory value="2" description="Dartmouth training ship" uuid="de832572-5269-11df-ad2b-080069138b88" uid="15373">
-        <specific value="1" description="M1116 Wilton" uuid="de8432a0-5269-11df-8273-080069138b88" uid="15374"/>
-      </subcategory>
-      <subcategory value="3" description="Improved Hecla class (survey)" uuid="de85de8e-5269-11df-a167-080069138b88" uid="15375">
-        <specific value="1" description="A 138 Herald" uuid="de86ec70-5269-11df-a545-080069138b88" uid="15376"/>
-      </subcategory>
-      <subcategory value="4" description="Hecla class (survey)" uuid="de8897be-5269-11df-be3b-080069138b88" uid="15377">
-        <specific value="1" description="A 133 Hecla" uuid="de89a492-5269-11df-8939-080069138b88" uid="15378"/>
-      </subcategory>
-      <subcategory value="5" description="A 317 Bulldog class (survey)" uuid="de8b5a44-5269-11df-985d-080069138b88" uid="15379">
-        <specific value="1" description="A 317 Bulldog" uuid="de8c6eca-5269-11df-bfba-080069138b88" uid="15380"/>
-        <specific value="2" description="A 319 Beagle" uuid="de8d76bc-5269-11df-ba44-080069138b88" uid="15381"/>
-      </subcategory>
-      <subcategory value="6" description="Roebuck class (survey)" uuid="de8f23fe-5269-11df-9f23-080069138b88" uid="15382">
-        <specific value="1" description="A 130 Roebuck" uuid="de9035b4-5269-11df-92db-080069138b88" uid="15383"/>
-      </subcategory>
-      <subcategory value="7" description="Ol class (large fleet tankers (AO))" uuid="de91e288-5269-11df-ad2c-080069138b88" uid="15384">
-        <specific value="1" description="A 122 Olwen" uuid="de92f218-5269-11df-ba12-080069138b88" uid="15385"/>
-        <specific value="2" description="A 123 Olna" uuid="de93fa50-5269-11df-a835-080069138b88" uid="15386"/>
-        <specific value="3" description="A 124 Olmeda" uuid="de950b0c-5269-11df-a9bc-080069138b88" uid="15387"/>
-      </subcategory>
-      <subcategory value="8" description="Appleleaf class (support tankers (AOT))" uuid="de96b722-5269-11df-a418-080069138b88" uid="15388">
-        <specific value="1" description="A 81 Brambleleaf (ex-Hudson Cavalier)" uuid="de97c978-5269-11df-82b4-080069138b88" uid="15389"/>
-        <specific value="2" description="A 109 Bayleaf" uuid="de98d23c-5269-11df-85e3-080069138b88" uid="15390"/>
-        <specific value="3" description="A 110 Orangeleaf (ex-Balder London, ex-Hudson Progress)" uuid="de99e0e6-5269-11df-8145-080069138b88" uid="15391"/>
-        <specific value="4" description="O 195 Westralia (ex. A79 Hudson Cavalier)" uuid="de9af6fc-5269-11df-8da3-080069138b88" uid="15392"/>
-      </subcategory>
-      <subcategory value="9" description="Rover class (small fleet tankers (AOL))" uuid="de9ca4d4-5269-11df-a227-080069138b88" uid="15393">
-        <specific value="1" description="A 269 Grey Rover" uuid="de9dadd4-5269-11df-b617-080069138b88" uid="15394"/>
-        <specific value="2" description="A 270 Blue rover" uuid="de9ebd64-5269-11df-9da0-080069138b88" uid="15395"/>
-        <specific value="3" description="A 271 Gold rover" uuid="de9fcede-5269-11df-b1f4-080069138b88" uid="15396"/>
-        <specific value="4" description="A 273 Black rover" uuid="dea0d61c-5269-11df-92b2-080069138b88" uid="15397"/>
-      </subcategory>
-      <subcategory value="10" description="Fort Victoria class (fleet replenishment)" uuid="dea282c8-5269-11df-891e-080069138b88" uid="15398">
-        <specific value="1" description="A 387 Fort Victoria" uuid="dea394c4-5269-11df-8a74-080069138b88" uid="15399"/>
-        <specific value="2" description="A 388 Fort George" uuid="dea4a634-5269-11df-a71f-080069138b88" uid="15400"/>
-      </subcategory>
-      <subcategory value="11" description="Fort Grange class (AFS(H))" uuid="dea6516e-5269-11df-a81e-080069138b88" uid="15401">
-        <specific value="1" description="A 385 Fort Grange" uuid="dea75f0a-5269-11df-83eb-080069138b88" uid="15402"/>
-        <specific value="2" description="A 386 Fort Austin" uuid="dea86da0-5269-11df-87aa-080069138b88" uid="15403"/>
-      </subcategory>
-      <subcategory value="12" description="Regent class (AFS(H))" uuid="deaa22d0-5269-11df-ab51-080069138b88" uid="15404">
-        <specific value="1" description="A 480 Resource" uuid="deab313e-5269-11df-80da-080069138b88" uid="15405"/>
-        <specific value="2" description="A 486 Regent" uuid="deac3d0e-5269-11df-8b4a-080069138b88" uid="15406"/>
-      </subcategory>
-      <subcategory value="13" description="Stena type (forward repair ship)" uuid="deade9d8-5269-11df-833d-080069138b88" uid="15407">
-        <specific value="1" description="A 132 Diligence (ex-Stena Inspector)" uuid="deaefa26-5269-11df-b49a-080069138b88" uid="15408"/>
-      </subcategory>
-      <subcategory value="14" description="Sal Class (salvage &amp; mooring)" uuid="deb0ab0a-5269-11df-8f90-080069138b88" uid="15409">
-        <specific value="1" description="A 185 Salmoor" uuid="deb1b8c4-5269-11df-b05d-080069138b88" uid="15410"/>
-        <specific value="2" description="A 186 Salmaster" uuid="deb2c1e2-5269-11df-a179-080069138b88" uid="15411"/>
-        <specific value="3" description="A 187 Salmaid" uuid="deb3d064-5269-11df-a37b-080069138b88" uid="15412"/>
-      </subcategory>
-      <subcategory value="15" description="Wild Duck class (salvage &amp; mooring)" uuid="deb57fc2-5269-11df-9863-080069138b88" uid="15413">
-        <specific value="1" description="A 164 Goosander" uuid="deb68e6c-5269-11df-b4fa-080069138b88" uid="15414"/>
-        <specific value="2" description="A 165 Pochard" uuid="deb79712-5269-11df-90d4-080069138b88" uid="15415"/>
-      </subcategory>
-      <subcategory value="16" description="Moorhen class (salvage &amp; mooring)" uuid="deb94580-5269-11df-9dea-080069138b88" uid="15416">
-        <specific value="1" description="Y 32 Moorhen" uuid="deba5420-5269-11df-a4f7-080069138b88" uid="15417"/>
-        <specific value="2" description="Y 33 Moorfowl" uuid="debb622a-5269-11df-992d-080069138b88" uid="15418"/>
-        <specific value="3" description="A 72 Cameron" uuid="debc6fbc-5269-11df-be4b-080069138b88" uid="15419"/>
-      </subcategory>
-      <subcategory value="17" description="Oilpress class (coastal tankers)" uuid="debe21cc-5269-11df-b751-080069138b88" uid="15420">
-        <specific value="1" description="Y 21 Oilpress" uuid="debf3120-5269-11df-a62b-080069138b88" uid="15421"/>
-        <specific value="2" description="Y 22 Oilstone" uuid="dec03ebc-5269-11df-a997-080069138b88" uid="15422"/>
-        <specific value="3" description="Y 23 Oilwell" uuid="dec14a82-5269-11df-a9c7-080069138b88" uid="15423"/>
-        <specific value="4" description="Y 25 Oilbird" uuid="dec25706-5269-11df-9ed1-080069138b88" uid="15424"/>
-        <specific value="5" description="Y 26 Oilman" uuid="dec364de-5269-11df-846e-080069138b88" uid="15425"/>
-      </subcategory>
-      <subcategory value="18" description="Tornado class (torpedo recovery)" uuid="dec51536-5269-11df-8bc1-080069138b88" uid="15426">
-        <specific value="1" description="A 140 Tornado" uuid="dec61e22-5269-11df-b6af-080069138b88" uid="15427"/>
-        <specific value="2" description="A 141 Torch a 141" uuid="dec72bc8-5269-11df-b00a-080069138b88" uid="15428"/>
-        <specific value="3" description="A 142 Tormentor" uuid="dec83db0-5269-11df-9e4e-080069138b88" uid="15429"/>
-        <specific value="4" description="A 143 Toreador" uuid="dec94e9e-5269-11df-8396-080069138b88" uid="15430"/>
-      </subcategory>
-      <subcategory value="19" description="Water class (water carriers)" uuid="decafa5a-5269-11df-aef7-080069138b88" uid="15431">
-        <specific value="1" description="Y 17 Waterfall" uuid="decc0ca6-5269-11df-be57-080069138b88" uid="15432"/>
-        <specific value="2" description="Y 18 Watershed" uuid="decd1a1a-5269-11df-a3d3-080069138b88" uid="15433"/>
-        <specific value="3" description="Y 19 Waterspout" uuid="dece237e-5269-11df-8b3f-080069138b88" uid="15434"/>
-        <specific value="4" description="Y 30 Watercourse" uuid="decf332c-5269-11df-a273-080069138b88" uid="15435"/>
-        <specific value="5" description="Y 31 Waterfowl" uuid="ded041ae-5269-11df-a06b-080069138b88" uid="15436"/>
-        <specific value="6" description="A 146 Waterman" uuid="ded149b4-5269-11df-a7a2-080069138b88" uid="15437"/>
-      </subcategory>
-      <subcategory value="20" description="Seal class (lrrsc) (aviation support)" uuid="ded2f94e-5269-11df-a0e6-080069138b88" uid="15438">
-        <specific value="1" description="5000 Seal" uuid="ded407d0-5269-11df-a74a-080069138b88" uid="15439"/>
-        <specific value="2" description="5001 Seagull" uuid="ded5163e-5269-11df-9eb0-080069138b88" uid="15440"/>
-      </subcategory>
-      <subcategory value="21" description="Spitfire class (rttl mk 3) (aviation support)" uuid="ded6c628-5269-11df-aa6d-080069138b88" uid="15441">
-        <specific value="1" description="4000 Spitfire" uuid="ded7d0c2-5269-11df-8e9b-080069138b88" uid="15442"/>
-        <specific value="2" description="4003 Halifax" uuid="ded8ddaa-5269-11df-82ca-080069138b88" uid="15443"/>
-        <specific value="3" description="4004 Hampden" uuid="ded9ef38-5269-11df-8116-080069138b88" uid="15444"/>
-        <specific value="4" description="4005 Hurricane" uuid="dedaf770-5269-11df-9964-080069138b88" uid="15445"/>
-        <specific value="5" description="4006 Lancaster" uuid="dedc039a-5269-11df-8ef4-080069138b88" uid="15446"/>
-        <specific value="6" description="4007 Wellington" uuid="dedd12ee-5269-11df-9343-080069138b88" uid="15447"/>
-      </subcategory>
-      <subcategory value="22" description="Insect class (fleet tenders)" uuid="dedec1fc-5269-11df-b5c6-080069138b88" uid="15448">
-        <specific value="1" description="A 216 Bee" uuid="dedfca2a-5269-11df-9a34-080069138b88" uid="15449"/>
-        <specific value="2" description="A 229 Cricket" uuid="dee0d67c-5269-11df-b7a2-080069138b88" uid="15450"/>
-        <specific value="3" description="A 230 Cockchafer" uuid="dee1e6de-5269-11df-a3fd-080069138b88" uid="15451"/>
-        <specific value="4" description="A 239 Gnat" uuid="dee2f2ea-5269-11df-b930-080069138b88" uid="15452"/>
-        <specific value="5" description="A 253 Ladybird" uuid="dee3ff78-5269-11df-8ac0-080069138b88" uid="15453"/>
-        <specific value="6" description="A 263 Cicada" uuid="dee50cf6-5269-11df-85e4-080069138b88" uid="15454"/>
-        <specific value="7" description="A 272 Scarab" uuid="dee61894-5269-11df-afac-080069138b88" uid="15455"/>
-      </subcategory>
-      <subcategory value="23" description="Loyal class (RNXs) (fleet tenders)" uuid="dee7cc48-5269-11df-aaff-080069138b88" uid="15456">
-        <specific value="1" description="A 157 Loyal Helper" uuid="dee8dbec-5269-11df-903c-080069138b88" uid="15457"/>
-        <specific value="2" description="A 158 Supporter (ex-Loyal Supporter)" uuid="dee9ecee-5269-11df-9479-080069138b88" uid="15458"/>
-        <specific value="3" description="A 159 Loyal Watcher" uuid="deeafb2a-5269-11df-8e8a-080069138b88" uid="15459"/>
-        <specific value="4" description="A 160 Loyal Volunteer" uuid="deec08ee-5269-11df-89d7-080069138b88" uid="15460"/>
-        <specific value="5" description="A 161 Loyal Mediator" uuid="deed16a8-5269-11df-8c0d-080069138b88" uid="15461"/>
-        <specific value="6" description="A 220 Loyal Moderator" uuid="deee22aa-5269-11df-b3ef-080069138b88" uid="15462"/>
-        <specific value="7" description="A 1770 Loyal Chancellor" uuid="deef3172-5269-11df-a042-080069138b88" uid="15463"/>
-        <specific value="8" description="A 1771 Loyal Proctor" uuid="def03f18-5269-11df-b3e1-080069138b88" uid="15464"/>
-      </subcategory>
-      <subcategory value="24" description="Clovelly class (fleet tenders)" uuid="def1ef5c-5269-11df-8918-080069138b88" uid="15465">
-        <specific value="1" description="A 207 Llandovery" uuid="def2f9a6-5269-11df-a49c-080069138b88" uid="15466"/>
-        <specific value="2" description="A 208 Lamlash" uuid="def407c4-5269-11df-9ede-080069138b88" uid="15467"/>
-        <specific value="3" description="A 211 Lechlade" uuid="def51178-5269-11df-a492-080069138b88" uid="15468"/>
-        <specific value="4" description="A 251 Lydford (ex-Loyal Governor, ex-Alert)" uuid="def660b4-5269-11df-9717-080069138b88" uid="15469"/>
-        <specific value="5" description="A 254 Meavy (ex-Loyal Factor, ex-Vigilant)" uuid="def7807a-5269-11df-8c76-080069138b88" uid="15470"/>
-        <specific value="6" description="A 274 Ettrick" uuid="def8aa5e-5269-11df-846a-080069138b88" uid="15471"/>
-        <specific value="7" description="A 277 Elsing" uuid="def9c95c-5269-11df-95ee-080069138b88" uid="15472"/>
-        <specific value="8" description="A 341 Fotherby" uuid="defb849a-5269-11df-90aa-080069138b88" uid="15473"/>
-        <specific value="9" description="A 348 Felsted" uuid="defc9a74-5269-11df-bb85-080069138b88" uid="15474"/>
-        <specific value="10" description="A 353 Elkstone" uuid="defdabf8-5269-11df-bc2e-080069138b88" uid="15475"/>
-        <specific value="11" description="A 354 Froxfield" uuid="defebc46-5269-11df-9831-080069138b88" uid="15476"/>
-        <specific value="12" description="A 355 Epworth" uuid="deffcc12-5269-11df-8848-080069138b88" uid="15477"/>
-        <specific value="13" description="A 365 Fulbeck" uuid="df00dddc-5269-11df-b037-080069138b88" uid="15478"/>
-        <specific value="14" description="A 381 Cricklade" uuid="df01ed44-5269-11df-a29f-080069138b88" uid="15479"/>
-        <specific value="15" description="A 391 Criccieth" uuid="df02f7ca-5269-11df-9957-080069138b88" uid="15480"/>
-        <specific value="16" description="A 392 Glencoe" uuid="df0409a8-5269-11df-9795-080069138b88" uid="15481"/>
-        <specific value="17" description="A 393 Dunster" uuid="df052090-5269-11df-a06e-080069138b88" uid="15482"/>
-        <specific value="18" description="A 394 Fintry" uuid="df06297c-5269-11df-9e20-080069138b88" uid="15483"/>
-        <specific value="19" description="A 402 Grasmere" uuid="df07447e-5269-11df-9849-080069138b88" uid="15484"/>
-        <specific value="20" description="A 488 Cromarty" uuid="df0856f2-5269-11df-a157-080069138b88" uid="15485"/>
-        <specific value="21" description="A 490 Dornoch" uuid="df096380-5269-11df-9cd3-080069138b88" uid="15486"/>
-        <specific value="22" description="A 1766 Headcorn" uuid="df0a723e-5269-11df-86fa-080069138b88" uid="15487"/>
-        <specific value="23" description="A 1767 Hever" uuid="df0b83d6-5269-11df-af4f-080069138b88" uid="15488"/>
-        <specific value="24" description="A 1768 Harlech" uuid="df0c8fe2-5269-11df-85fa-080069138b88" uid="15489"/>
-        <specific value="25" description="A 1769 Hambledon" uuid="df0da29c-5269-11df-83c0-080069138b88" uid="15490"/>
-        <specific value="26" description="A 1772 Holmwood" uuid="df0eb178-5269-11df-a9bd-080069138b88" uid="15491"/>
-        <specific value="27" description="A 1773 Horning" uuid="df0fbc80-5269-11df-a0f5-080069138b88" uid="15492"/>
-      </subcategory>
-      <subcategory value="25" description="Manly class (fleet tenders)" uuid="df116ff8-5269-11df-b784-080069138b88" uid="15493">
-        <specific value="1" description="A 83 Melton" uuid="df127f24-5269-11df-b9d6-080069138b88" uid="15494"/>
-        <specific value="2" description="A 84 Menai" uuid="df138e5a-5269-11df-a1e7-080069138b88" uid="15495"/>
-        <specific value="3" description="A 87 Meon" uuid="df149c1e-5269-11df-abff-080069138b88" uid="15496"/>
-        <specific value="4" description="A 91 Milford" uuid="df15ac3a-5269-11df-bb18-080069138b88" uid="15497"/>
-        <specific value="5" description="A 107 Messina" uuid="df16bbd4-5269-11df-8d2c-080069138b88" uid="15498"/>
-      </subcategory>
-      <subcategory value="26" description="Magnet class (degaussing vessels)" uuid="df186b1e-5269-11df-ae6f-080069138b88" uid="15499">
-        <specific value="1" description="A 114 Magnet" uuid="df197a18-5269-11df-98f4-080069138b88" uid="15500"/>
-        <specific value="2" description="A 115 Lodestone" uuid="df1a8a66-5269-11df-b9c8-080069138b88" uid="15501"/>
-      </subcategory>
-      <subcategory value="27" description="Aberdovey class (auxiliary training vessels)" uuid="df1c3a3c-5269-11df-a882-080069138b88" uid="15502">
-        <specific value="1" description="A 100 Beddgelert" uuid="df1d4cec-5269-11df-9996-080069138b88" uid="15503"/>
-        <specific value="2" description="A 103 Sultan Venturer (ex-Bibury)" uuid="df1e5858-5269-11df-8db1-080069138b88" uid="15504"/>
-        <specific value="3" description="A 383 Appleby" uuid="df1f6810-5269-11df-8d7a-080069138b88" uid="15505"/>
-        <specific value="4" description="Y 10 Aberdovey" uuid="df2079f8-5269-11df-9288-080069138b88" uid="15506"/>
-        <specific value="5" description="Y 11 Abinger" uuid="df218316-5269-11df-b4ee-080069138b88" uid="15507"/>
-        <specific value="6" description="Y 13 Alnmouth" uuid="df22936e-5269-11df-b146-080069138b88" uid="15508"/>
-      </subcategory>
-      <subcategory value="28" description="Wave Class (Large Fleet Tankers )(AO)" uuid="df244768-5269-11df-bf66-080069138b88" uid="15509">
-        <specific value="1" description="A390 Wave Knight" uuid="df2561c0-5269-11df-b52b-080069138b88" uid="15510"/>
-      </subcategory>
-      <subcategory value="29" description="Oakleaf Class (Support Tanker)(AOT)" uuid="df2712d6-5269-11df-960b-080069138b88" uid="15511">
-        <specific value="1" description="A111 Oakleaf" uuid="df2823ce-5269-11df-89c7-080069138b88" uid="15512"/>
-      </subcategory>
-    </category>
-    <category value="17" description="Auxiliary, Merchant Marine" uuid="df2a77dc-5269-11df-b812-080069138b88" uid="15513">
-      <subcategory value="1" description="Avon class (Royal Corps of Transport)" uuid="df2b83c0-5269-11df-8595-080069138b88" uid="15514">
-        <specific value="1" description="RPL 05 Eden" uuid="df2c93be-5269-11df-8f12-080069138b88" uid="15515"/>
-        <specific value="2" description="RPL 06 Forth" uuid="df2da6f0-5269-11df-b189-080069138b88" uid="15516"/>
-        <specific value="3" description="RPL 12 Medway" uuid="df2eb112-5269-11df-9d8f-080069138b88" uid="15517"/>
-      </subcategory>
-      <subcategory value="2" description="Adept class (TUTT) (tugs)" uuid="df306160-5269-11df-a350-080069138b88" uid="15518">
-        <specific value="1" description="A 221 Forceful" uuid="df31735c-5269-11df-9ba8-080069138b88" uid="15519"/>
-        <specific value="2" description="A 222 Nimble" uuid="df328364-5269-11df-bea8-080069138b88" uid="15520"/>
-        <specific value="3" description="A 223 Powerful" uuid="df338d9a-5269-11df-825c-080069138b88" uid="15521"/>
-        <specific value="4" description="A 224 Adept" uuid="df34a158-5269-11df-82fa-080069138b88" uid="15522"/>
-        <specific value="5" description="A 225 Bustler" uuid="df35b02a-5269-11df-9650-080069138b88" uid="15523"/>
-        <specific value="6" description="A 226 Capable" uuid="df36bb46-5269-11df-8341-080069138b88" uid="15524"/>
-        <specific value="7" description="A 227 Careful" uuid="df37cdce-5269-11df-97be-080069138b88" uid="15525"/>
-        <specific value="8" description="A 228 Faithful" uuid="df38dd40-5269-11df-8ba4-080069138b88" uid="15526"/>
-        <specific value="9" description="A 231 Dexterous" uuid="df39e6b8-5269-11df-8042-080069138b88" uid="15527"/>
-      </subcategory>
-      <subcategory value="3" description="Dog class (tugs and range-trials vessels)" uuid="df3b9b7a-5269-11df-b451-080069138b88" uid="15528">
-        <specific value="1" description="A 106 Alsatian" uuid="df3cacfe-5269-11df-ae95-080069138b88" uid="15529"/>
-        <specific value="2" description="A 126 Cairn" uuid="df3dc8be-5269-11df-9fe9-080069138b88" uid="15530"/>
-        <specific value="3" description="A 129 Dalmatian" uuid="df3ed1b4-5269-11df-b4bb-080069138b88" uid="15531"/>
-        <specific value="4" description="A 155 Deerhound" uuid="df3fe2fc-5269-11df-9df8-080069138b88" uid="15532"/>
-        <specific value="5" description="A 162 Elkhound" uuid="df40f688-5269-11df-8126-080069138b88" uid="15533"/>
-        <specific value="6" description="A 168 Labrador" uuid="df41ff1a-5269-11df-908f-080069138b88" uid="15534"/>
-        <specific value="7" description="A 178 Husky" uuid="df430ee6-5269-11df-9f97-080069138b88" uid="15535"/>
-        <specific value="8" description="A 180 Mastiff" uuid="df4428f8-5269-11df-8ffc-080069138b88" uid="15536"/>
-        <specific value="9" description="A 182 Saluki" uuid="df45375c-5269-11df-be38-080069138b88" uid="15537"/>
-        <specific value="10" description="A 188 Pointer" uuid="df464732-5269-11df-b912-080069138b88" uid="15538"/>
-        <specific value="11" description="A 189 Setter" uuid="df475618-5269-11df-a90b-080069138b88" uid="15539"/>
-        <specific value="12" description="A 197 Sealyham" uuid="df4860a8-5269-11df-b92d-080069138b88" uid="15540"/>
-        <specific value="13" description="A 201 Spaniel" uuid="df497420-5269-11df-aae8-080069138b88" uid="15541"/>
-        <specific value="14" description="A 250 Sheepdog" uuid="df4a8360-5269-11df-923d-080069138b88" uid="15542"/>
-        <specific value="15" description="A 326 Foxhound (ex-Boxer)" uuid="df4b8e0e-5269-11df-948e-080069138b88" uid="15543"/>
-        <specific value="16" description="A 327 Basset (ex-Beagle)" uuid="df4ca262-5269-11df-bfa6-080069138b88" uid="15544"/>
-        <specific value="17" description="A 328 Collie" uuid="df4db2ba-5269-11df-a563-080069138b88" uid="15545"/>
-        <specific value="18" description="A 330 Corgi" uuid="df4ebc46-5269-11df-b1ca-080069138b88" uid="15546"/>
-      </subcategory>
-      <subcategory value="4" description="Modified Girl Class" uuid="df50700e-5269-11df-9a9b-080069138b88" uid="15547">
-        <specific value="1" description="A 156 Daphne" uuid="df518070-5269-11df-b167-080069138b88" uid="15548"/>
-        <specific value="2" description="A 177 Edith" uuid="df528fe2-5269-11df-8c12-080069138b88" uid="15549"/>
-      </subcategory>
-      <subcategory value="5" description="Triton class" uuid="df543e28-5269-11df-ac7e-080069138b88" uid="15550">
-        <specific value="1" description="A 166 Kathleen" uuid="df554bd8-5269-11df-8b99-080069138b88" uid="15551"/>
-        <specific value="2" description="A 170 Kitty" uuid="df565c08-5269-11df-a6b5-080069138b88" uid="15552"/>
-        <specific value="3" description="A 172 Lesley" uuid="df576b16-5269-11df-a64a-080069138b88" uid="15553"/>
-        <specific value="4" description="A 174 Lilah" uuid="df587330-5269-11df-b402-080069138b88" uid="15554"/>
-        <specific value="5" description="A 175 Mary" uuid="df5984f0-5269-11df-b29b-080069138b88" uid="15555"/>
-        <specific value="6" description="A 181 Irene" uuid="df5a9994-5269-11df-b8ae-080069138b88" uid="15556"/>
-        <specific value="7" description="A 183 Isabel" uuid="df5ba1ae-5269-11df-952a-080069138b88" uid="15557"/>
-        <specific value="8" description="A 190 Joan" uuid="df5cb134-5269-11df-9a9f-080069138b88" uid="15558"/>
-        <specific value="9" description="A 193 Joyce" uuid="df5dc196-5269-11df-9f3b-080069138b88" uid="15559"/>
-        <specific value="10" description="A 199 Myrtle" uuid="df5eceba-5269-11df-9e90-080069138b88" uid="15560"/>
-        <specific value="11" description="A 202 Nancy" uuid="df5fdbca-5269-11df-b5ae-080069138b88" uid="15561"/>
-        <specific value="12" description="A 205 Norah" uuid="df60ee5c-5269-11df-ae62-080069138b88" uid="15562"/>
-      </subcategory>
-      <subcategory value="6" description="Felicity class" uuid="df62a6a2-5269-11df-bd41-080069138b88" uid="15563">
-        <specific value="1" description="A 112 Felicity" uuid="df63b3e4-5269-11df-be9b-080069138b88" uid="15564"/>
-        <specific value="2" description="A 147 Frances" uuid="df64c4aa-5269-11df-b81d-080069138b88" uid="15565"/>
-        <specific value="3" description="A 148 Fiona" uuid="df65d674-5269-11df-8167-080069138b88" uid="15566"/>
-        <specific value="4" description="A 149 Florence" uuid="df66e26c-5269-11df-b247-080069138b88" uid="15567"/>
-        <specific value="5" description="A 150 Genevieve" uuid="df67f53a-5269-11df-8d95-080069138b88" uid="15568"/>
-        <specific value="6" description="A 152 Georgina" uuid="df690344-5269-11df-808d-080069138b88" uid="15569"/>
-        <specific value="7" description="A 196 Gwendoline" uuid="df6a0e9c-5269-11df-b917-080069138b88" uid="15570"/>
-        <specific value="8" description="A 198 Helen" uuid="df6b2200-5269-11df-86e3-080069138b88" uid="15571"/>
-      </subcategory>
-    </category>
-    <category value="54" description="Amphibious Assault Ship" uuid="df6d6fb0-5269-11df-a901-080069138b88" uid="15572">
-      <subcategory value="1" description="LPH01 Ocean" uuid="df6e7fc2-5269-11df-ae71-080069138b88" uid="15573"/>
-      <subcategory value="2" description="Helicopter Carrier (LPH)" uuid="df6f942a-5269-11df-949e-080069138b88" uid="15574">
-        <specific value="1" description="L12 Ocean" uuid="df70a50e-5269-11df-aa6f-080069138b88" uid="15575"/>
-      </subcategory>
-    </category>
-    <category value="56" description="Amphibious transport dock" uuid="df72f642-5269-11df-a9f3-080069138b88" uid="15576">
-      <subcategory value="1" description="Assault ships (LPD)" uuid="df740514-5269-11df-abdf-080069138b88" uid="15577">
-        <specific value="1" description="L 10 Fearless" uuid="df751058-5269-11df-920a-080069138b88" uid="15578"/>
-        <specific value="2" description="L 11 Intrepid" uuid="df7620d8-5269-11df-998c-080069138b88" uid="15579"/>
-        <specific value="3" description="L 14 Albion" uuid="df773464-5269-11df-83e8-080069138b88" uid="15580"/>
-        <specific value="4" description="L 15 Bulwalk" uuid="df783d50-5269-11df-84be-080069138b88" uid="15581"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="df7a921c-5269-11df-804f-080069138b88" uid="15582">
-      <subcategory value="1" description="Container class" uuid="df7b9cac-5269-11df-a8c9-080069138b88" uid="15583">
-        <specific value="1" description="Adi Eu" uuid="df7cab74-5269-11df-8ca3-080069138b88" uid="15584"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="224" uuid="df7fa130-5269-11df-b767-080069138b88" uid="15585">
-    <category value="1" description="SSBN (Nuclear Ballistic Missiles)" uuid="df80af44-5269-11df-9728-080069138b88" uid="15586">
-      <subcategory value="1" description="Vanguard Class" uuid="df81c38e-5269-11df-8023-080069138b88" uid="15587">
-        <specific value="1" description="05 Vanguard" uuid="df82d800-5269-11df-81e8-080069138b88" uid="15588"/>
-        <specific value="2" description="06 Victorious" uuid="df83e68c-5269-11df-b888-080069138b88" uid="15589"/>
-        <specific value="3" description="07 Vigilant" uuid="df84f0a4-5269-11df-8d60-080069138b88" uid="15590"/>
-        <specific value="4" description="08" uuid="df860372-5269-11df-966d-080069138b88" uid="15591"/>
-      </subcategory>
-      <subcategory value="2" description="Resolution Class" uuid="df87b280-5269-11df-9feb-080069138b88" uid="15592">
-        <specific value="1" description="S 22 Resolution" uuid="df88c1de-5269-11df-a6ac-080069138b88" uid="15593"/>
-        <specific value="2" description="S 23 Repulse" uuid="df89cf84-5269-11df-bb90-080069138b88" uid="15594"/>
-        <specific value="3" description="S 26 Renown" uuid="df8adfbe-5269-11df-b402-080069138b88" uid="15595"/>
-        <specific value="4" description="S 27 Revenge" uuid="df8bf1ce-5269-11df-af88-080069138b88" uid="15596"/>
-      </subcategory>
-    </category>
-    <category value="3" description="SSN (Nuclear Attack-Torpedo)" uuid="df8e4410-5269-11df-ad16-080069138b88" uid="15597">
-      <subcategory value="1" description="Trafalgar Class" uuid="df8f5490-5269-11df-ae7b-080069138b88" uid="15598">
-        <specific value="1" description="S 87 Turbulent" uuid="df906204-5269-11df-bf56-080069138b88" uid="15599"/>
-        <specific value="2" description="S 88 Tireless" uuid="df917162-5269-11df-9895-080069138b88" uid="15600"/>
-        <specific value="3" description="S 90 Torbay" uuid="df928016-5269-11df-befd-080069138b88" uid="15601"/>
-        <specific value="4" description="S 91 Trenchant" uuid="df938dd0-5269-11df-9eef-080069138b88" uid="15602"/>
-        <specific value="5" description="S 92 Talent" uuid="df949e6e-5269-11df-87ad-080069138b88" uid="15603"/>
-        <specific value="6" description="S 93 Triumph" uuid="df95ae9e-5269-11df-b70c-080069138b88" uid="15604"/>
-        <specific value="7" description="S 107 Trafalgar" uuid="df96bd2a-5269-11df-8ad8-080069138b88" uid="15605"/>
-      </subcategory>
-      <subcategory value="2" description="Swiftsure Class" uuid="df986ddc-5269-11df-bffc-080069138b88" uid="15606">
-        <specific value="1" description="S 104 Sceptre" uuid="df997ef2-5269-11df-be39-080069138b88" uid="15607"/>
-        <specific value="2" description="S 105 Spartan" uuid="df9a90e4-5269-11df-9163-080069138b88" uid="15608"/>
-        <specific value="3" description="S 106 Splendid" uuid="df9b9a16-5269-11df-804f-080069138b88" uid="15609"/>
-        <specific value="4" description="S 108 Sovereign" uuid="df9caa1e-5269-11df-bbf9-080069138b88" uid="15610"/>
-        <specific value="5" description="S 109 Superb" uuid="df9dbcb0-5269-11df-8534-080069138b88" uid="15611"/>
-      </subcategory>
-      <subcategory value="3" description="Valiant Class" uuid="df9f75fa-5269-11df-8469-080069138b88" uid="15612">
-        <specific value="1" description="S 102 Valiant" uuid="dfa088a0-5269-11df-90d7-080069138b88" uid="15613"/>
-      </subcategory>
-    </category>
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="dfa2e208-5269-11df-862c-080069138b88" uid="15614">
-      <subcategory value="1" description="Upholder class (Type 2400)" uuid="dfa3ee3c-5269-11df-b8a1-080069138b88" uid="15615">
-        <specific value="1" description="S 40 Upholder" uuid="dfa4ff3e-5269-11df-ad7e-080069138b88" uid="15616"/>
-        <specific value="2" description="S 41 Unseen" uuid="dfa6122a-5269-11df-92f3-080069138b88" uid="15617"/>
-        <specific value="3" description="S 42 Ursula" uuid="dfa71b7a-5269-11df-b750-080069138b88" uid="15618"/>
-        <specific value="4" description="S 43 Unicorn" uuid="dfa82c18-5269-11df-8497-080069138b88" uid="15619"/>
-      </subcategory>
-      <subcategory value="2" description="Oberon Class" uuid="dfa9dcde-5269-11df-886b-080069138b88" uid="15620">
-        <specific value="1" description="S 16 Oracle" uuid="dfaaee44-5269-11df-b71c-080069138b88" uid="15621"/>
-        <specific value="2" description="S 19 Opossum" uuid="dfabf7e4-5269-11df-9cfa-080069138b88" uid="15622"/>
-        <specific value="3" description="S 20 Opportune" uuid="dfad0904-5269-11df-9ec6-080069138b88" uid="15623"/>
-        <specific value="60" description="Onslow (Australia)" uuid="dfae1cfe-5269-11df-8c3a-080069138b88" uid="15624"/>
-        <specific value="62" description="Otama (Australia)" uuid="dfaf25a4-5269-11df-84fd-080069138b88" uid="15625"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="224" uuid="dfb21a16-5269-11df-b7df-080069138b88" uid="15626">
-    <category value="0" description="Other" uuid="dfb3274e-5269-11df-97b0-080069138b88" uid="15627"/>
-    <category value="1" description="Manned" uuid="dfb43436-5269-11df-acd2-080069138b88" uid="15628"/>
-    <category value="2" description="Unmanned" uuid="dfb54286-5269-11df-8d35-080069138b88" uid="15629">
-      <subcategory value="1" description="Communication satellite" uuid="dfb6527a-5269-11df-87ce-080069138b88" uid="15630">
-        <specific value="1" description="Skynet 4" uuid="dfb761d8-5269-11df-a7e3-080069138b88" uid="15631"/>
-        <specific value="2" description="Skynet 4A" uuid="dfb870fa-5269-11df-b538-080069138b88" uid="15632"/>
-        <specific value="3" description="Skynet 4B" uuid="dfb97f04-5269-11df-9b61-080069138b88" uid="15633"/>
-        <specific value="4" description="Skynet 4C" uuid="dfba89d0-5269-11df-bfb0-080069138b88" uid="15634"/>
-        <specific value="5" description="NATO 4" uuid="dfbb9c76-5269-11df-b1ca-080069138b88" uid="15635"/>
-        <specific value="6" description="ECS" uuid="dfbcab66-5269-11df-bdf3-080069138b88" uid="15636"/>
-        <specific value="7" description="Eurostar" uuid="dfbdb628-5269-11df-8d76-080069138b88" uid="15637"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="71" uuid="dfc0b4d6-5269-11df-8176-080069138b88" uid="15638">
-    <category value="1" description="Tank" uuid="dfc1c402-5269-11df-9767-080069138b88" uid="15639">
-      <subcategory value="1" description="AMX-30" uuid="dfc2d0e0-5269-11df-b73c-080069138b88" uid="15640">
-        <specific value="1" description="AMX-30B2" uuid="dfc3deea-5269-11df-82ca-080069138b88" uid="15641"/>
-      </subcategory>
-      <subcategory value="2" description="AMX-13 Light Tank" uuid="dfc5917c-5269-11df-96ba-080069138b88" uid="15642"/>
-      <subcategory value="3" description="AMX-40 MBT" uuid="dfc6a210-5269-11df-96b6-080069138b88" uid="15643"/>
-      <subcategory value="4" description="Le Clerc" uuid="dfc7aca0-5269-11df-a200-080069138b88" uid="15644"/>
-    </category>
-    <category value="2" description="Armored fighting vehicle" uuid="dfc95da2-5269-11df-95ae-080069138b88" uid="15645">
-      <subcategory value="1" description="VBC-90 armored car" uuid="dfca6dc8-5269-11df-9014-080069138b88" uid="15646"/>
-      <subcategory value="2" description="ERC-90 armored car" uuid="dfcb7f60-5269-11df-a051-080069138b88" uid="15647"/>
-      <subcategory value="3" description="AML-90 armored car" uuid="dfcc8e82-5269-11df-a2d0-080069138b88" uid="15648"/>
-      <subcategory value="4" description="AML-60 armored car" uuid="dfcd9fa2-5269-11df-b1e9-080069138b88" uid="15649"/>
-      <subcategory value="5" description="VAB APC" uuid="dfceb248-5269-11df-8ce3-080069138b88" uid="15650"/>
-      <subcategory value="6" description="AMX-10RC armored car" uuid="dfcfbf6c-5269-11df-892a-080069138b88" uid="15651"/>
-      <subcategory value="7" description="AMX-13 IFV" uuid="dfd0cf38-5269-11df-893f-080069138b88" uid="15652"/>
-      <subcategory value="8" description="AMX-10 IFV" uuid="dfd1e0a8-5269-11df-b549-080069138b88" uid="15653">
-        <specific value="1" description="with two-rail MILAN anti-tank missile launcher" uuid="dfd2ed2c-5269-11df-966e-080069138b88" uid="15654"/>
-        <specific value="2" description="with HOT: ATGM launcher vehicle" uuid="dfd40298-5269-11df-8853-080069138b88" uid="15655"/>
-        <specific value="3" description="AMX-10/PAC 90" status="new" uuid="e267c0b6-cc2c-4219-9018-26e4f77716fc" uid="22820">
-          <cr value="1699"/>
-        </specific>
-      </subcategory>
-      <subcategory value="9" description="EBR armored car" uuid="dfd5b200-5269-11df-b89f-080069138b88" uid="15656"/>
-      <subcategory value="10" description="AMX-13 VCI APC" uuid="dfd6c1f4-5269-11df-851b-080069138b88" uid="15657"/>
-      <subcategory value="11" description="AMX-13 DCA" uuid="dfd7d13e-5269-11df-82e7-080069138b88" uid="15658"/>
-      <subcategory value="12" description="Berliet VXB armored car" uuid="dfd8e0ec-5269-11df-b3d9-080069138b88" uid="15659"/>
-      <subcategory value="13" description="Panhard EBR" uuid="dfd9f108-5269-11df-8f38-080069138b88" uid="15660"/>
-    </category>
-    <category value="3" description="Armored utility vehicle" uuid="dfdba53e-5269-11df-b25d-080069138b88" uid="15661">
-      <subcategory value="1" description="AMX-10 ECH Recovery Vehicle" uuid="dfdcaf88-5269-11df-a8e2-080069138b88" uid="15662"/>
-    </category>
-    <category value="4" description="Self-propelled artillery" uuid="dfde6c38-5269-11df-bde8-080069138b88" uid="15663">
-      <subcategory value="1" description="A UF1 155-mm Howitzer" uuid="dfdf7d08-5269-11df-b1f8-080069138b88" uid="15664"/>
-      <subcategory value="2" description="AMX 105-mm Howitzer" uuid="dfe08c48-5269-11df-84f7-080069138b88" uid="15665"/>
-      <subcategory value="3" description="AU-50 105-mm Howitzer" uuid="dfe197f0-5269-11df-bdc4-080069138b88" uid="15666"/>
-      <subcategory value="4" description="F-3 155-mm gun" uuid="dfe2ad2a-5269-11df-91cd-080069138b88" uid="15667"/>
-      <subcategory value="5" description="MM 38 Exocet launcher" uuid="dfe3bc42-5269-11df-a483-080069138b88" uid="15668"/>
-      <subcategory value="6" description="MM 40 Exocet launcher" uuid="dfe4c7f4-5269-11df-8c2d-080069138b88" uid="15669"/>
-      <subcategory value="7" description="Otomat Mk 1 launcher" uuid="dfe5dd2e-5269-11df-90d2-080069138b88" uid="15670"/>
-      <subcategory value="8" description="Otomat Mk 2/3 launcher" uuid="dfe6eec6-5269-11df-9622-080069138b88" uid="15671"/>
-    </category>
-    <category value="5" description="Towed artillery" uuid="dfe89cd0-5269-11df-9c8b-080069138b88" uid="15672">
-      <subcategory value="1" description="TR 155-mm Howitzer" uuid="dfe9a9ea-5269-11df-beb4-080069138b88" uid="15673"/>
-    </category>
-    <category value="6" description="Small wheeled utility vehicle" uuid="dfeb5a7e-5269-11df-a94d-080069138b88" uid="15674"/>
-    <category value="7" description="Large wheeled utility vehicle" uuid="dfec6b30-5269-11df-a2dd-080069138b88" uid="15675"/>
-    <category value="8" description="Small tracked utility vehicle" uuid="dfed93c0-5269-11df-b6f6-080069138b88" uid="15676"/>
-    <category value="9" description="Large tracked utility vehicle" uuid="dfeea24c-5269-11df-81f0-080069138b88" uid="15677"/>
-    <category value="10" description="Mortar" uuid="dfefb57e-5269-11df-a7b2-080069138b88" uid="15678">
-      <subcategory value="1" description="120mm Mortar RT-61" uuid="dff0c8e2-5269-11df-b4ea-080069138b88" uid="15679"/>
-    </category>
-    <category value="11" description="Mine plow" uuid="dff27836-5269-11df-a834-080069138b88" uid="15680"/>
-    <category value="12" description="Mine rake" uuid="dff3819a-5269-11df-809c-080069138b88" uid="15681"/>
-    <category value="13" description="Mine roller" uuid="dff495bc-5269-11df-a421-080069138b88" uid="15682"/>
-    <category value="14" description="Cargo trailer" uuid="dff5a506-5269-11df-bf63-080069138b88" uid="15683">
-      <subcategory value="1" description="0 - 0.5 ton" uuid="dff6af14-5269-11df-8da1-080069138b88" uid="15684"/>
-      <subcategory value="2" description="0.51 - 2 ton" uuid="dff7be4a-5269-11df-a5cc-080069138b88" uid="15685"/>
-      <subcategory value="3" description="2.01 - 5 ton" uuid="dff8d2a8-5269-11df-aaa1-080069138b88" uid="15686"/>
-      <subcategory value="4" description="5.02 - 10 ton" uuid="dff9dcca-5269-11df-a875-080069138b88" uid="15687"/>
-      <subcategory value="5" description="greater than 10 tons" uuid="dffaed5e-5269-11df-b981-080069138b88" uid="15688"/>
-    </category>
-    <category value="15" description="Fuel trailer" uuid="dffca87e-5269-11df-8f86-080069138b88" uid="15689">
-      <subcategory value="1" description="1-1000 gallons" uuid="dffdbb56-5269-11df-8364-080069138b88" uid="15690"/>
-      <subcategory value="2" description="1001 - 5000 gallons" uuid="dffecd5c-5269-11df-a539-080069138b88" uid="15691"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="dfffdbac-5269-11df-a14f-080069138b88" uid="15692"/>
-    </category>
-    <category value="16" description="Generator trailer" uuid="e0018b28-5269-11df-ae17-080069138b88" uid="15693">
-      <subcategory value="1" description="0 - 100 KW" uuid="e0029ab8-5269-11df-9834-080069138b88" uid="15694"/>
-      <subcategory value="2" description="greater than 100 KW" uuid="e003af02-5269-11df-a1fe-080069138b88" uid="15695"/>
-    </category>
-    <category value="17" description="Water trailer" uuid="e0055ec4-5269-11df-a635-080069138b88" uid="15696">
-      <subcategory value="1" description="1-1000 gallons" uuid="e00666c0-5269-11df-8bfa-080069138b88" uid="15697"/>
-      <subcategory value="2" description="1001- 5000 gallons" uuid="e0077948-5269-11df-b678-080069138b88" uid="15698"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="e0088e46-5269-11df-83ce-080069138b88" uid="15699"/>
-    </category>
-    <category value="18" description="Engineer equipment" uuid="e00a3c78-5269-11df-9953-080069138b88" uid="15700">
-      <subcategory value="1" description="Mine clearing line charge" uuid="e00b474e-5269-11df-9575-080069138b88" uid="15701"/>
-      <subcategory value="2" description="Dozer blade kit" uuid="e00c5986-5269-11df-a838-080069138b88" uid="15702"/>
-      <subcategory value="3" description="Lane marking system" uuid="e00d6d30-5269-11df-9311-080069138b88" uid="15703"/>
-    </category>
-    <category value="19" description="Heavy equipment transport trailer" uuid="e00f1dce-5269-11df-8248-080069138b88" uid="15704"/>
-    <category value="20" description="Maintenance equipment trailer" uuid="e0102980-5269-11df-8b38-080069138b88" uid="15705">
-      <subcategory value="1" description="Welding trailer" uuid="e0113b9a-5269-11df-bfc7-080069138b88" uid="15706"/>
-      <subcategory value="2" description="Compressor" uuid="e0124f80-5269-11df-9732-080069138b88" uid="15707"/>
-      <subcategory value="3" description="Tools/parts trailer" uuid="e0135a4c-5269-11df-958a-080069138b88" uid="15708"/>
-    </category>
-    <category value="21" description="Limber" uuid="e015091e-5269-11df-a5d7-080069138b88" uid="15709"/>
-    <category value="22" description="Chemical decontamination trailer" uuid="e01619c6-5269-11df-a6dc-080069138b88" uid="15710"/>
-    <category value="28" description="Air Defense / Missile Defense Unit Equipment" uuid="e0172f00-5269-11df-a7e6-080069138b88" uid="15711">
-      <subcategory value="1" description="Crotale SAM System" uuid="e01839e0-5269-11df-af44-080069138b88" uid="15712">
-        <specific value="1" description="Crotale P4R Missile Firing System" uuid="e0194af6-5269-11df-ae9d-080069138b88" uid="15713"/>
-        <specific value="2" description="Crotale P4R Radar System" uuid="e01a5ebe-5269-11df-b3fa-080069138b88" uid="15714"/>
-      </subcategory>
-      <subcategory value="2" description="Crotale NG SAM System" uuid="e01c1c68-5269-11df-a310-080069138b88" uid="15715"/>
-      <subcategory value="3" description="Shahine SAM System" uuid="e01d27ca-5269-11df-90b5-080069138b88" uid="15716">
-        <specific value="1" description="Shahine Acquisition Radar/AMX-30 chassis" uuid="e01e37a0-5269-11df-a1e2-080069138b88" uid="15717"/>
-        <specific value="2" description="Shahine Launcher/AMX-30 chassis" uuid="e01f4b5e-5269-11df-af83-080069138b88" uid="15718"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="71" uuid="e0223abc-5269-11df-a2dc-080069138b88" uid="15719">
-    <category value="1" description="Fighter/Air Defense" uuid="e0234984-5269-11df-b5c0-080069138b88" uid="15720">
-      <subcategory value="1" description="Mirage F-1" uuid="e0245d56-5269-11df-8801-080069138b88" uid="15721">
-        <specific value="1" description="F1-AD" uuid="e0256ca0-5269-11df-b877-080069138b88" uid="15722"/>
-        <specific value="2" description="F1-AZ" uuid="e0267686-5269-11df-816f-080069138b88" uid="15723"/>
-        <specific value="3" description="F1-B" uuid="e027867a-5269-11df-a26a-080069138b88" uid="15724"/>
-        <specific value="4" description="F1-BD" uuid="e0289524-5269-11df-9750-080069138b88" uid="15725"/>
-        <specific value="5" description="F1-BE" uuid="e029a338-5269-11df-a18b-080069138b88" uid="15726"/>
-        <specific value="6" description="F1-BJ" uuid="e02ab4ee-5269-11df-a2c5-080069138b88" uid="15727"/>
-        <specific value="7" description="F1-BK" uuid="e02bc4a6-5269-11df-a44c-080069138b88" uid="15728"/>
-        <specific value="8" description="F1-BQ" uuid="e02cd094-5269-11df-9639-080069138b88" uid="15729"/>
-        <specific value="9" description="F1-B &amp; E" uuid="e02de088-5269-11df-b351-080069138b88" uid="15730"/>
-        <specific value="10" description="F1-C" uuid="e02eef1e-5269-11df-9c10-080069138b88" uid="15731"/>
-        <specific value="11" description="F1-CE" uuid="e02ff76a-5269-11df-93d2-080069138b88" uid="15732"/>
-        <specific value="12" description="F1-CG" uuid="e03109fc-5269-11df-8cc7-080069138b88" uid="15733"/>
-        <specific value="13" description="F1-CH" uuid="e032191e-5269-11df-9bb4-080069138b88" uid="15734"/>
-        <specific value="14" description="F1-CJ" uuid="e03322dc-5269-11df-bdac-080069138b88" uid="15735"/>
-        <specific value="15" description="F1-CK" uuid="e034342e-5269-11df-b5d1-080069138b88" uid="15736"/>
-        <specific value="16" description="F1-CR-200" uuid="e035442c-5269-11df-b238-080069138b88" uid="15737"/>
-        <specific value="17" description="F1-CZ" uuid="e0364d68-5269-11df-82c2-080069138b88" uid="15738"/>
-        <specific value="18" description="F1-C-200s" uuid="e0375a50-5269-11df-8b1d-080069138b88" uid="15739"/>
-        <specific value="19" description="F1-DDA" uuid="e0386d46-5269-11df-8175-080069138b88" uid="15740"/>
-        <specific value="20" description="F1-ED" uuid="e0397fce-5269-11df-a0bd-080069138b88" uid="15741"/>
-        <specific value="21" description="F1-EDA" uuid="e03a91c0-5269-11df-b854-080069138b88" uid="15742"/>
-        <specific value="22" description="F1-EE" uuid="e03ba416-5269-11df-ab4e-080069138b88" uid="15743"/>
-        <specific value="23" description="F1-EH" uuid="e03cad98-5269-11df-ad8f-080069138b88" uid="15744"/>
-        <specific value="24" description="F1-EJ" uuid="e03dbe54-5269-11df-9858-080069138b88" uid="15745"/>
-        <specific value="25" description="F1-EQ" uuid="e03ecd8a-5269-11df-aa9f-080069138b88" uid="15746"/>
-        <specific value="26" description="F1-JA" uuid="e03fd658-5269-11df-b1a0-080069138b88" uid="15747"/>
-        <specific value="27" description="F1-JE" uuid="e040e9e4-5269-11df-b226-080069138b88" uid="15748"/>
-      </subcategory>
-      <subcategory value="3" description="Mirage III" uuid="e04298f2-5269-11df-80ae-080069138b88" uid="15749">
-        <specific value="1" description="Mirage III-D" uuid="e043aa30-5269-11df-b7e8-080069138b88" uid="15750"/>
-        <specific value="2" description="Mirage III-E" uuid="e044b344-5269-11df-ad0c-080069138b88" uid="15751"/>
-      </subcategory>
-      <subcategory value="4" description="Mirage 2000" uuid="e0466644-5269-11df-be31-080069138b88" uid="15752">
-        <specific value="1" description="Mirage 2000AD" uuid="e047750c-5269-11df-b74d-080069138b88" uid="15753"/>
-        <specific value="2" description="Mirage 2000BGM" uuid="e0488474-5269-11df-a77a-080069138b88" uid="15754"/>
-        <specific value="3" description="Mirage 2000C" uuid="e0499238-5269-11df-83e9-080069138b88" uid="15755"/>
-        <specific value="4" description="Mirage 2000D" uuid="e04aa182-5269-11df-8972-080069138b88" uid="15756"/>
-        <specific value="5" description="Mirage 2000DAD" uuid="e04bb09a-5269-11df-8c98-080069138b88" uid="15757"/>
-        <specific value="6" description="Mirage 2000DP" uuid="e04cbc56-5269-11df-9583-080069138b88" uid="15758"/>
-        <specific value="7" description="Mirage 2000E" uuid="e04dca60-5269-11df-bd63-080069138b88" uid="15759"/>
-        <specific value="8" description="Mirage 2000EAD" uuid="e04edd6a-5269-11df-82a6-080069138b88" uid="15760"/>
-        <specific value="9" description="Mirage 2000EGM" uuid="e04fe7b4-5269-11df-8316-080069138b88" uid="15761"/>
-        <specific value="10" description="Mirage 2000H (KF-101)" uuid="e050f6ae-5269-11df-8855-080069138b88" uid="15762"/>
-        <specific value="11" description="Mirage 2000N" uuid="e0520922-5269-11df-a9ac-080069138b88" uid="15763"/>
-        <specific value="12" description="Mirage 2000P" uuid="e05315e2-5269-11df-9d4b-080069138b88" uid="15764"/>
-        <specific value="13" description="Mirage 2000RAD" uuid="e0542612-5269-11df-82d5-080069138b88" uid="15765"/>
-        <specific value="14" description="Mirage 2000TH (KT-201)" uuid="e05534f8-5269-11df-a50b-080069138b88" uid="15766"/>
-        <specific value="15" description="Mirage 2000-5" uuid="e0564096-5269-11df-a202-080069138b88" uid="15767"/>
-        <specific value="16" description="Vajra (Divine Thunder)" uuid="e0575436-5269-11df-a46b-080069138b88" uid="15768"/>
-      </subcategory>
-      <subcategory value="5" description="Dassault Rafale (Squall)" uuid="e0590f42-5269-11df-a2fa-080069138b88" uid="15769">
-        <specific value="1" description="Rafale B" uuid="e05a1f04-5269-11df-9d81-080069138b88" uid="15770"/>
-        <specific value="2" description="Rafale C" uuid="e05b2e80-5269-11df-a4f4-080069138b88" uid="15771"/>
-        <specific value="3" description="Rafale S-1 Standard" uuid="e05c3e1a-5269-11df-8d84-080069138b88" uid="15772"/>
-        <specific value="4" description="Rafale M" uuid="e05d4e72-5269-11df-9c07-080069138b88" uid="15773"/>
-      </subcategory>
-      <subcategory value="6" description="Mirage 50" uuid="e05eff38-5269-11df-9416-080069138b88" uid="15774"/>
-      <subcategory value="7" description="Mirage 4000" deprecated="1" uuid="e06009aa-5269-11df-827e-080069138b88" uid="15775"/>
-    </category>
-    <category value="2" description="Attack/Strike" uuid="e061bdae-5269-11df-a4f6-080069138b88" uid="15776">
-      <subcategory value="1" description="Dassault/BAe Jaguar" uuid="e062cd98-5269-11df-9d99-080069138b88" uid="15777"/>
-      <subcategory value="2" description="Etendard IV-P" uuid="e063dcf6-5269-11df-8a0c-080069138b88" uid="15778"/>
-      <subcategory value="3" description="Dassault Super Etendard" uuid="e064ea38-5269-11df-898e-080069138b88" uid="15779">
-        <specific value="1" description="Super Etendard" uuid="e065fb94-5269-11df-afe8-080069138b88" uid="15780"/>
-      </subcategory>
-      <subcategory value="4" description="Dassault/Dornier Alpha Jet" uuid="e067ad2c-5269-11df-ada1-080069138b88" uid="15781">
-        <specific value="1" description="Alpha Jet 2" uuid="e068bc44-5269-11df-b9e4-080069138b88" uid="15782"/>
-        <specific value="2" description="Alpha Jet E" uuid="e069c990-5269-11df-b352-080069138b88" uid="15783"/>
-        <specific value="3" description="Alpha Jet A" uuid="e06ad952-5269-11df-b363-080069138b88" uid="15784"/>
-        <specific value="4" description="Alpha Jet 3" uuid="e06be9f0-5269-11df-b3d0-080069138b88" uid="15785"/>
-      </subcategory>
-      <subcategory value="5" description="Mirage 5" uuid="e06d9bd8-5269-11df-92a9-080069138b88" uid="15786"/>
-      <subcategory value="6" description="Crusader (Vought F-8E(FN))" deprecated="1" uuid="e06ea668-5269-11df-8827-080069138b88" uid="15787"/>
-      <subcategory value="7" description="Mirage IV" uuid="e06fb904-5269-11df-a722-080069138b88" uid="15788"/>
-    </category>
-    <category value="3" description="Bomber" uuid="e0716ace-5269-11df-91c9-080069138b88" uid="15789">
-      <subcategory value="1" description="Mirage IV" deprecated="1" uuid="e07277fc-5269-11df-a5f2-080069138b88" uid="15790"/>
-    </category>
-    <category value="4" description="Cargo/Tanker" uuid="e0742b88-5269-11df-8653-080069138b88" uid="15791">
-      <subcategory value="1" description="Transall C-160" uuid="e0753596-5269-11df-a46c-080069138b88" uid="15792"/>
-      <subcategory value="2" description="Dassault Mystere-Falcon 50" uuid="e076459e-5269-11df-96c1-080069138b88" uid="15793"/>
-      <subcategory value="3" description="T.16 air ambulance." uuid="e0775e84-5269-11df-a055-080069138b88" uid="15794"/>
-      <subcategory value="4" description="Reims F 406 Caravan II" uuid="e078708a-5269-11df-b8d1-080069138b88" uid="15795">
-        <specific value="1" description="Reims F 406 Vigilante" uuid="e07980e2-5269-11df-9757-080069138b88" uid="15796"/>
-      </subcategory>
-      <subcategory value="5" description="SECA/Fokker F27 Friendship Arat" uuid="e07b32a2-5269-11df-9f31-080069138b88" uid="15797"/>
-      <subcategory value="6" description="Dassault Mystere-Falcon 20" uuid="e07c42e6-5269-11df-b926-080069138b88" uid="15798">
-        <specific value="1" description="HU-25 Guardian" uuid="e07d51cc-5269-11df-880c-080069138b88" uid="15799"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Antisubmarine/patrol/observation" uuid="e07fa648-5269-11df-a264-080069138b88" uid="15800">
-      <subcategory value="1" description="Dassault Alantique 2" uuid="e080b538-5269-11df-b9e1-080069138b88" uid="15801"/>
-      <subcategory value="2" description="Dassault (Breguet) Alize" uuid="e081c55e-5269-11df-b88e-080069138b88" uid="15802"/>
-      <subcategory value="3" description="Dassault (Breguet) (1050) Atlantic" uuid="e082d5e8-5269-11df-acf2-080069138b88" uid="15803"/>
-      <subcategory value="4" description="Dassault Mystere-Falcon 900" uuid="e083e5a0-5269-11df-ba3c-080069138b88" uid="15804">
-        <specific value="1" description="T.18" uuid="e084f5bc-5269-11df-9255-080069138b88" uid="15805"/>
-      </subcategory>
-      <subcategory value="5" description="Dassault Gardian 2" uuid="e086b01e-5269-11df-a966-080069138b88" uid="15806"/>
-    </category>
-    <category value="6" description="Electronic Warfare (EW)" uuid="e08862c4-5269-11df-85cb-080069138b88" uid="15807">
-      <subcategory value="1" description="Transall C-160" uuid="e0897678-5269-11df-b737-080069138b88" uid="15808"/>
-      <subcategory value="2" description="Dassault (Breguet 1050) Alize" uuid="e08a814e-5269-11df-badd-080069138b88" uid="15809"/>
-      <subcategory value="3" description="Dassault Mystere-Falcon 20 (ECM)" uuid="e08b9318-5269-11df-9932-080069138b88" uid="15810"/>
-    </category>
-    <category value="7" description="Reconnaissance" uuid="e08d473a-5269-11df-a06f-080069138b88" uid="15811">
-      <subcategory value="1" description="Dassault Mystere-Falcon 900" uuid="e08e5a08-5269-11df-b87b-080069138b88" uid="15812"/>
-      <subcategory value="2" description="Mirage III" uuid="e08f6600-5269-11df-9273-080069138b88" uid="15813">
-        <specific value="1" description="Mirage III-R" uuid="e090743c-5269-11df-9996-080069138b88" uid="15814"/>
-        <specific value="2" description="Mirage III-R2Z" uuid="e091850c-5269-11df-9854-080069138b88" uid="15815"/>
-        <specific value="3" description="Mirage III-RD" uuid="e0929276-5269-11df-811c-080069138b88" uid="15816"/>
-      </subcategory>
-      <subcategory value="3" description="Dassault Mystere-Falcon 20SNR" uuid="e09441c0-5269-11df-b59e-080069138b88" uid="15817"/>
-    </category>
-    <category value="20" description="Attack Helicopter" uuid="e095fac4-5269-11df-be89-080069138b88" uid="15818">
-      <subcategory value="1" description="Eurocopter AS 532 Cougar" uuid="e0970e78-5269-11df-ba02-080069138b88" uid="15819">
-        <specific value="1" description="AS 532AC" uuid="e0981f3e-5269-11df-ab0e-080069138b88" uid="15820"/>
-        <specific value="2" description="AS 532AL" uuid="e09929ce-5269-11df-b518-080069138b88" uid="15821"/>
-      </subcategory>
-      <subcategory value="2" description="Eurocopter SA342 Gazelle" uuid="e09adbc0-5269-11df-ac8c-080069138b88" uid="15822">
-        <specific value="1" description="SA 342ATAM" uuid="e09beb82-5269-11df-bfcc-080069138b88" uid="15823"/>
-        <specific value="2" description="SA 342M Viviane" uuid="e09cfbbc-5269-11df-9bf9-080069138b88" uid="15824"/>
-      </subcategory>
-      <subcategory value="3" description="Eurocopter BO 105/PAH-1/VBH/BSH-1" uuid="e09eae80-5269-11df-abb4-080069138b88" uid="15825">
-        <specific value="1" description="BO 105 PAH-1A1" uuid="e09fb9c4-5269-11df-b34f-080069138b88" uid="15826"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Utility Helicopter" uuid="e0a20e18-5269-11df-a7d8-080069138b88" uid="15827">
-      <subcategory value="1" description="Aerospatiale SA 313B Alouette II" uuid="e0a31bc8-5269-11df-8362-080069138b88" uid="15828"/>
-      <subcategory value="2" description="Aerospatiale SA 315B" uuid="e0a42e5a-5269-11df-bd1f-080069138b88" uid="15829">
-        <specific value="1" description="Cheetah" uuid="e0a53df4-5269-11df-8b93-080069138b88" uid="15830"/>
-      </subcategory>
-      <subcategory value="3" description="Aerospatiale SA 316B Alouette III" uuid="e0a6f04a-5269-11df-8217-080069138b88" uid="15831"/>
-      <subcategory value="4" description="Aerospatiale SA 321 Super Frelon" uuid="e0a7fd32-5269-11df-baf5-080069138b88" uid="15832">
-        <specific value="1" description="SA 321H" uuid="e0a90da8-5269-11df-8bc1-080069138b88" uid="15833"/>
-      </subcategory>
-      <subcategory value="5" description="Aerospatiale SA 330 Puma" uuid="e0aabffe-5269-11df-804c-080069138b88" uid="15834">
-        <specific value="1" description="330 Puma" uuid="e0abcdea-5269-11df-a6cc-080069138b88" uid="15835"/>
-        <specific value="2" description="332M Super Puma" uuid="e0acd8f2-5269-11df-9ed4-080069138b88" uid="15836"/>
-        <specific value="3" description="Super Puma/Puma" uuid="e0adec56-5269-11df-b015-080069138b88" uid="15837"/>
-      </subcategory>
-      <subcategory value="6" description="Aerospatiale SA 341 Gazelle" uuid="e0af9c22-5269-11df-82c1-080069138b88" uid="15838">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="e0b0aac2-5269-11df-b387-080069138b88" uid="15839"/>
-        <specific value="2" description="SA 341B" uuid="e0b1ba20-5269-11df-b21a-080069138b88" uid="15840"/>
-        <specific value="3" description="Gazelle HT. Mk 3" uuid="e0b2c910-5269-11df-82c8-080069138b88" uid="15841"/>
-        <specific value="4" description="Gazelle HCC. Mk4" uuid="e0b3d6fc-5269-11df-a44e-080069138b88" uid="15842"/>
-        <specific value="5" description="SA 341 F" uuid="e0b4eea2-5269-11df-9c53-080069138b88" uid="15843"/>
-        <specific value="6" description="SA 341 H" uuid="e0b5fe78-5269-11df-b616-080069138b88" uid="15844"/>
-      </subcategory>
-      <subcategory value="7" description="Eurocopter AS 332L Super Puma MK II and AS 532 Cougar MkII" uuid="e0b7af3e-5269-11df-a267-080069138b88" uid="15845">
-        <specific value="1" description="532U2 Cougar MK II" uuid="e0b8c536-5269-11df-bbb7-080069138b88" uid="15846"/>
-        <specific value="2" description="532A2 Cougar Mk II" uuid="e0b9ceb8-5269-11df-a670-080069138b88" uid="15847"/>
-      </subcategory>
-      <subcategory value="8" description="Eurocopter SA 342 Gazelle" uuid="e0bb7e70-5269-11df-950d-080069138b88" uid="15848">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="e0bc94e0-5269-11df-ac51-080069138b88" uid="15849"/>
-        <specific value="2" description="SA 342M" uuid="e0bda588-5269-11df-9db8-080069138b88" uid="15850"/>
-      </subcategory>
-      <subcategory value="9" description="Eurocopter AS 532 Cougar" uuid="e0bf53ce-5269-11df-a902-080069138b88" uid="15851">
-        <specific value="1" description="AS 532UC" uuid="e0c06322-5269-11df-b093-080069138b88" uid="15852"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="e0c172f8-5269-11df-a3c9-080069138b88" uid="15853"/>
-        <specific value="3" description="AS 532MC" uuid="e0c2827e-5269-11df-8619-080069138b88" uid="15854"/>
-        <specific value="4" description="AS 532UL" uuid="e0c38f3e-5269-11df-a103-080069138b88" uid="15855"/>
-      </subcategory>
-      <subcategory value="10" description="Eurocopter AS 565 Panther" uuid="e0c53d48-5269-11df-ac43-080069138b88" uid="15856">
-        <specific value="1" description="AS 365N2 Dauphin 2" uuid="e0c64f30-5269-11df-88d5-080069138b88" uid="15857"/>
-        <specific value="2" description="AS 565MA" uuid="e0c7615e-5269-11df-a385-080069138b88" uid="15858"/>
-      </subcategory>
-      <subcategory value="11" description="Eurocopter 365N2 Dauphin 2" uuid="e0c91116-5269-11df-aeff-080069138b88" uid="15859">
-        <specific value="1" description="AS 366G1 (HH-65A Dolphin)" uuid="e0ca1d54-5269-11df-a889-080069138b88" uid="15860"/>
-      </subcategory>
-      <subcategory value="12" description="Eurocopter BO 105" uuid="e0cbd05e-5269-11df-8d02-080069138b88" uid="15861"/>
-      <subcategory value="13" description="Eurocopter AS 350 Ecureuil/Astar and AS 550 Fennec" uuid="e0cce098-5269-11df-91e8-080069138b88" uid="15862">
-        <specific value="1" description="CH-50" uuid="e0cdf42e-5269-11df-a7a9-080069138b88" uid="15863"/>
-        <specific value="2" description="TH-50 Esquilo" uuid="e0cf01ac-5269-11df-8fee-080069138b88" uid="15864"/>
-        <specific value="3" description="HA-1 Esquilo" uuid="e0d0111e-5269-11df-a53a-080069138b88" uid="15865"/>
-        <specific value="4" description="UH-12 Esquilo" uuid="e0d11fc8-5269-11df-812f-080069138b88" uid="15866"/>
-        <specific value="5" description="AS 350BA Ecureuil" uuid="e0d22abc-5269-11df-8dce-080069138b88" uid="15867"/>
-        <specific value="6" description="AS 350B2 Ecureuil" uuid="e0d344d8-5269-11df-b2c3-080069138b88" uid="15868"/>
-        <specific value="7" description="AS 350 B3 Ecureuil" uuid="e0d45918-5269-11df-8371-080069138b88" uid="15869"/>
-        <specific value="8" description="AS 350D Astar" uuid="e0d562d6-5269-11df-8f95-080069138b88" uid="15870"/>
-        <specific value="9" description="AS 350 Firefighter" uuid="e0d674c8-5269-11df-96a3-080069138b88" uid="15871"/>
-        <specific value="10" description="AS 550 Fennec" uuid="e0d7880e-5269-11df-b69e-080069138b88" uid="15872"/>
-        <specific value="11" description="550A2" uuid="e0d89122-5269-11df-b516-080069138b88" uid="15873"/>
-        <specific value="12" description="AS 550C2" uuid="e0d99f0e-5269-11df-9541-080069138b88" uid="15874"/>
-        <specific value="13" description="AS 550M2" uuid="e0dab1be-5269-11df-a9bb-080069138b88" uid="15875"/>
-        <specific value="14" description="AS 550S2" uuid="e0dbbe56-5269-11df-9053-080069138b88" uid="15876"/>
-      </subcategory>
-      <subcategory value="14" description="Eurocopter AS 355 Ecureuil 2 Twinstar and AS 555 Fennec" uuid="e0dd6e04-5269-11df-8606-080069138b88" uid="15877">
-        <specific value="1" description="CH-55" uuid="e0de7eac-5269-11df-aa82-080069138b88" uid="15878"/>
-        <specific value="2" description="VH-55 Esquilo" uuid="e0df901c-5269-11df-90f6-080069138b88" uid="15879"/>
-        <specific value="3" description="UH-12B Esquilo" uuid="e0e09e58-5269-11df-885c-080069138b88" uid="15880"/>
-        <specific value="4" description="AS 555UN Fennec" uuid="e0e1add4-5269-11df-9d9e-080069138b88" uid="15881"/>
-        <specific value="5" description="AS 555AN Fennec" uuid="e0e2bc88-5269-11df-a01c-080069138b88" uid="15882"/>
-        <specific value="6" description="AS 555CN Fennec" uuid="e0e3c7ae-5269-11df-aa65-080069138b88" uid="15883"/>
-        <specific value="7" description="AS 555MN Fennec" uuid="e0e4dbb2-5269-11df-b48e-080069138b88" uid="15884"/>
-        <specific value="8" description="AS 555SN Fennec naval ASW" uuid="e0e5ec82-5269-11df-827e-080069138b88" uid="15885"/>
-      </subcategory>
-      <subcategory value="15" description="Eurocopter AS 365N2 Dauphin 2" uuid="e0e79b54-5269-11df-be2a-080069138b88" uid="15886">
-        <specific value="1" description="AS 366G1 (HH-65A Dolphin)" uuid="e0e8aaf8-5269-11df-b099-080069138b88" uid="15887"/>
-        <specific value="2" description="AS 565 Panther" uuid="e0e9bc04-5269-11df-ade0-080069138b88" uid="15888"/>
-        <specific value="3" description="HM-1" uuid="e0eacb4e-5269-11df-9d4a-080069138b88" uid="15889"/>
-        <specific value="4" description="AS 565AA" uuid="e0ebd9a8-5269-11df-a35e-080069138b88" uid="15890"/>
-        <specific value="5" description="AS 565CA" uuid="e0ece8de-5269-11df-bcfc-080069138b88" uid="15891"/>
-        <specific value="6" description="AS 565 Panther 807, AS 565MA Panther" uuid="e0edf904-5269-11df-a4f6-080069138b88" uid="15892"/>
-        <specific value="7" description="(deprecated)" deprecated="1" uuid="e0ef0416-5269-11df-8b34-080069138b88" uid="15893"/>
-        <specific value="8" description="AS 565SA Panter" uuid="e0f01900-5269-11df-abed-080069138b88" uid="15894"/>
-      </subcategory>
-    </category>
-    <category value="22" description="Antisubmarine Warfare / Patrol Helicopter" uuid="e0f27196-5269-11df-b9fc-080069138b88" uid="15895">
-      <subcategory value="1" description="Aerospatiale SA 319B ASTAZOU" uuid="e0f387ac-5269-11df-9c23-080069138b88" uid="15896"/>
-      <subcategory value="2" description="Aerospatiale SA 321 Super Frelon" uuid="e0f498ea-5269-11df-954c-080069138b88" uid="15897">
-        <specific value="1" description="AS 32" uuid="e0f5aa6e-5269-11df-b0a3-080069138b88" uid="15898"/>
-      </subcategory>
-      <subcategory value="3" description="Eurocopter AS 532 Cougar" uuid="e0f75d96-5269-11df-b339-080069138b88" uid="15899">
-        <specific value="1" description="AS 532SC" uuid="e0f868ee-5269-11df-a316-080069138b88" uid="15900"/>
-      </subcategory>
-      <subcategory value="4" description="Eurocopter AS 565 Panther" uuid="e0fa18b0-5269-11df-843c-080069138b88" uid="15901">
-        <specific value="1" description="AS 565SA" uuid="e0fb289a-5269-11df-a241-080069138b88" uid="15902"/>
-        <specific value="2" description="AS 565F (MA)" uuid="e0fc3cbc-5269-11df-9c77-080069138b88" uid="15903"/>
-      </subcategory>
-    </category>
-    <category value="40" description="Trainer" uuid="e0fe8a58-5269-11df-9fa9-080069138b88" uid="15904">
-      <subcategory value="1" description="Mudry CAP 10 B" uuid="e0ff9c9a-5269-11df-9144-080069138b88" uid="15905"/>
-      <subcategory value="2" description="Socata TB 30 Epsilon" uuid="e100a5b8-5269-11df-9625-080069138b88" uid="15906"/>
-      <subcategory value="3" description="Socata TB 31 Omega" uuid="e101b692-5269-11df-8216-080069138b88" uid="15907"/>
-      <subcategory value="4" description="SEPECAT Jaguar International" uuid="e102ccc6-5269-11df-8274-080069138b88" uid="15908">
-        <specific value="1" description="Jaguar GR. Mk 1A" uuid="e103d8a0-5269-11df-b47b-080069138b88" uid="15909"/>
-      </subcategory>
-      <subcategory value="5" description="Dassault Mystere-Falcon 20SNA" uuid="e105890c-5269-11df-bbcc-080069138b88" uid="15910"/>
-    </category>
-    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="e1073e1e-5269-11df-8def-080069138b88" uid="15911">
-      <subcategory value="1" description="Passenger Airline" uuid="e1084f16-5269-11df-a4dd-080069138b88" uid="15912">
-        <specific value="1" description="A320 Air Bus" uuid="e1095ed8-5269-11df-8bf0-080069138b88" uid="15913"/>
-        <specific value="2" description="Airbus A300" uuid="e10a686e-5269-11df-a4b5-080069138b88" uid="15914"/>
-        <specific value="3" description="Airbus A310" uuid="e10b7a06-5269-11df-9695-080069138b88" uid="15915"/>
-        <specific value="4" description="Airbus A318" uuid="e10c8dec-5269-11df-bb8e-080069138b88" uid="15916"/>
-        <specific value="5" description="Airbus A319" uuid="e10d96ec-5269-11df-92b6-080069138b88" uid="15917"/>
-        <specific value="6" description="Airbus A321" uuid="e10ea71c-5269-11df-a550-080069138b88" uid="15918"/>
-        <specific value="7" description="Airbus A330" uuid="e10fb7ce-5269-11df-9346-080069138b88" uid="15919"/>
-        <specific value="8" description="Airbus A340" uuid="e110ce98-5269-11df-b254-080069138b88" uid="15920"/>
-        <specific value="9" description="Airbus A380" uuid="e111dec8-5269-11df-84f3-080069138b88" uid="15921"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="71" uuid="e114d704-5269-11df-8940-080069138b88" uid="15922">
-    <category value="1" description="Carrier (Porte-Avions)" uuid="e115e608-5269-11df-9c7f-080069138b88" uid="15923">
-      <subcategory value="1" description="Nuclear-Propelled Aircraft Carriers (CVN)" uuid="e116f192-5269-11df-8605-080069138b88" uid="15924">
-        <specific value="1" description="R 91 Charles De Gaulle" uuid="e118049c-5269-11df-826b-080069138b88" uid="15925"/>
-      </subcategory>
-      <subcategory value="2" description="Clemenceau class (CV)" uuid="e119b832-5269-11df-8a64-080069138b88" uid="15926">
-        <specific value="1" description="R 98 Clemenceau" uuid="e11ac7ae-5269-11df-9b6b-080069138b88" uid="15927"/>
-        <specific value="2" description="R 99 Foch" uuid="e11bd2a2-5269-11df-81f1-080069138b88" uid="15928"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Guided Missile Destroyer (Fregates or Escorteurs D'escadres)" uuid="e11e2886-5269-11df-a28a-080069138b88" uid="15929">
-      <subcategory value="1" description="Georges Leygues Class (Type f 70 (ASW))" uuid="e11f4662-5269-11df-ae3c-080069138b88" uid="15930">
-        <specific value="1" description="D 640 Georges Leygues" uuid="e1205df4-5269-11df-a824-080069138b88" uid="15931"/>
-        <specific value="2" description="D 641 Dupleix" uuid="e1216f0a-5269-11df-b421-080069138b88" uid="15932"/>
-        <specific value="3" description="D 642 Montcalm" uuid="e12279d6-5269-11df-8288-080069138b88" uid="15933"/>
-        <specific value="4" description="D 643 Jean de vienne" uuid="e1238c72-5269-11df-883b-080069138b88" uid="15934"/>
-        <specific value="5" description="D 644 Primauguet" uuid="e1249ec8-5269-11df-ab00-080069138b88" uid="15935"/>
-        <specific value="6" description="D 645 La motte-picquet" uuid="e125a962-5269-11df-bcbb-080069138b88" uid="15936"/>
-        <specific value="7" description="D 646 Latouche-treville" uuid="e126bbf4-5269-11df-a5b5-080069138b88" uid="15937"/>
-      </subcategory>
-      <subcategory value="2" description="Cassard class (Type F 70 (A/A))" uuid="e1286ff8-5269-11df-b475-080069138b88" uid="15938">
-        <specific value="1" description="D 614 Cassard" uuid="e1297f60-5269-11df-9203-080069138b88" uid="15939"/>
-        <specific value="2" description="D 615 Jean Bart" uuid="e12a8914-5269-11df-96ea-080069138b88" uid="15940"/>
-      </subcategory>
-      <subcategory value="3" description="Suffren class" uuid="e12c3c78-5269-11df-acad-080069138b88" uid="15941">
-        <specific value="1" description="D 602 Suffren" uuid="e12d4a28-5269-11df-afa7-080069138b88" uid="15942"/>
-        <specific value="2" description="D 603 Duquesne" uuid="e12e5b48-5269-11df-a942-080069138b88" uid="15943"/>
-      </subcategory>
-      <subcategory value="4" description="Tourville class (Type F 67)" uuid="e13018a2-5269-11df-ba87-080069138b88" uid="15944">
-        <specific value="1" description="D 610 Tourville" uuid="e1312396-5269-11df-8cf9-080069138b88" uid="15945"/>
-        <specific value="2" description="D 611 Duguay-Trouin" uuid="e1323380-5269-11df-b167-080069138b88" uid="15946"/>
-        <specific value="3" description="D 612 De grasse" uuid="e13345ea-5269-11df-9e2e-080069138b88" uid="15947"/>
-      </subcategory>
-      <subcategory value="5" description="Type F 65 (ASW)" uuid="e134fa7a-5269-11df-a4dc-080069138b88" uid="15948">
-        <specific value="1" description="D 609 Aconit (ex-F 703)" uuid="e1360456-5269-11df-9c43-080069138b88" uid="15949"/>
-      </subcategory>
-      <subcategory value="6" description="Forbin (Horizon) Class" status="new" uuid="8d5bc0f5-95a0-47d2-9229-31e805f2360d" uid="22711">
-        <cr value="1620"/>
-        <specific value="1" description="D620 Forbin" status="new" uuid="42196b9f-b8ad-4147-a7dc-696941735b37" uid="22712">
-          <cr value="1620"/>
-        </specific>
-        <specific value="2" description="D620 Chevalier Paul" status="new" uuid="c63ba4b5-0970-4c81-a6c4-1e8d0d37b0d6" uid="22713">
-          <cr value="1620"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided-missile Frigate" uuid="e1385cd8-5269-11df-afa3-080069138b88" uid="15950">
-      <subcategory value="1" description="La Fayette class (light frigates)" uuid="e13966b4-5269-11df-985b-080069138b88" uid="15951">
-        <specific value="1" description="F 710 Lafayette" uuid="e13a786a-5269-11df-a88a-080069138b88" uid="15952"/>
-        <specific value="2" description="F 711 Surcouf" uuid="e13b8c32-5269-11df-ab51-080069138b88" uid="15953"/>
-        <specific value="3" description="F 712 Courbet" uuid="e13c962c-5269-11df-9a31-080069138b88" uid="15954"/>
-      </subcategory>
-      <subcategory value="2" description="Floreal class (patrol frigates)" uuid="e13e46fc-5269-11df-be7e-080069138b88" uid="15955">
-        <specific value="1" description="F 730 Floreal" uuid="e13f586c-5269-11df-9e3c-080069138b88" uid="15956"/>
-        <specific value="2" description="F 731 Prairial" uuid="e1406c20-5269-11df-95e7-080069138b88" uid="15957"/>
-        <specific value="3" description="F 732 Nivose" uuid="e1417570-5269-11df-8345-080069138b88" uid="15958"/>
-        <specific value="4" description="F 733 Ventose" uuid="e142858c-5269-11df-ba72-080069138b88" uid="15959"/>
-        <specific value="5" description="F 734 Vendemiaire" uuid="e14398aa-5269-11df-bf72-080069138b88" uid="15960"/>
-        <specific value="6" description="F 735 Germinal" uuid="e144a420-5269-11df-9b1b-080069138b88" uid="15961"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/patrol craft" uuid="e146fd74-5269-11df-872d-080069138b88" uid="15962">
-      <subcategory value="1" description="P 400 class (fast attack craft--patrol)" uuid="e14806ec-5269-11df-a8aa-080069138b88" uid="15963">
-        <specific value="1" description="P 682 L'audacieuse" uuid="e1491910-5269-11df-8845-080069138b88" uid="15964"/>
-        <specific value="2" description="P 683 La boudeuse" uuid="e14a2c92-5269-11df-8b1c-080069138b88" uid="15965"/>
-        <specific value="3" description="P 684 La capricieuse" uuid="e14b35e2-5269-11df-88e4-080069138b88" uid="15966"/>
-        <specific value="4" description="P 685 La fougueuse" uuid="e14c45b8-5269-11df-aad0-080069138b88" uid="15967"/>
-        <specific value="5" description="P 686 La glorieuse" uuid="e14d62cc-5269-11df-85f9-080069138b88" uid="15968"/>
-        <specific value="6" description="P 687 La gracieuse" uuid="e14e6e7e-5269-11df-b45c-080069138b88" uid="15969"/>
-        <specific value="7" description="P 688 La moqueuse" uuid="e14f7e7c-5269-11df-ba3e-080069138b88" uid="15970"/>
-        <specific value="8" description="P 689 La railleuse" uuid="e150910e-5269-11df-bfbe-080069138b88" uid="15971"/>
-        <specific value="9" description="P 690 La rieuse" uuid="e151a0c6-5269-11df-8b7e-080069138b88" uid="15972"/>
-        <specific value="10" description="P 691 La tapageuse" uuid="e152b222-5269-11df-aa12-080069138b88" uid="15973"/>
-        <specific value="11" description="B1 AI Bushra (OMAN)" uuid="e153c20c-5269-11df-8c61-080069138b88" uid="15974"/>
-      </subcategory>
-      <subcategory value="2" description="Thomson-CSF Type (large patrol craft)" uuid="e1557692-5269-11df-acd9-080069138b88" uid="15975">
-        <specific value="1" description="P 696 Iris" uuid="e156824e-5269-11df-aee4-080069138b88" uid="15976"/>
-      </subcategory>
-      <subcategory value="3" description="Combattante IIG Class" uuid="e1583382-5269-11df-92bc-080069138b88" uid="15977"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship / Craft" uuid="e159f244-5269-11df-858d-080069138b88" uid="15978">
-      <subcategory value="1" description="Narvik class (minehunter/sweeper)" uuid="e15b029c-5269-11df-925b-080069138b88" uid="15979">
-        <specific value="1" description="M 660 Narvik" uuid="e15c1592-5269-11df-8a26-080069138b88" uid="15980"/>
-        <specific value="2" description="Bir Hakeim" uuid="e15d246e-5269-11df-ae8b-080069138b88" uid="15981"/>
-        <specific value="3" description="Garigliano" uuid="e15e3462-5269-11df-96ea-080069138b88" uid="15982"/>
-        <specific value="4" description="Autun" uuid="e15f429e-5269-11df-9cdb-080069138b88" uid="15983"/>
-        <specific value="5" description="Colmar" uuid="e1604cb6-5269-11df-9a4d-080069138b88" uid="15984"/>
-        <specific value="6" description="Berlaimont" uuid="e1615ffc-5269-11df-9b88-080069138b88" uid="15985"/>
-      </subcategory>
-      <subcategory value="2" description="Eridan (Tripartite) class (minehunters)" uuid="e1631108-5269-11df-bed0-080069138b88" uid="15986">
-        <specific value="1" description="M 641 Eridan" uuid="e164205c-5269-11df-8938-080069138b88" uid="15987"/>
-        <specific value="2" description="M 642 Cassiopee" uuid="e1652f74-5269-11df-8571-080069138b88" uid="15988"/>
-        <specific value="3" description="M 643 Andromede" uuid="e1663efa-5269-11df-82a4-080069138b88" uid="15989"/>
-        <specific value="4" description="M 644 Pegase" uuid="e1674d7c-5269-11df-956d-080069138b88" uid="15990"/>
-        <specific value="5" description="M 645 Orion" uuid="e1685afa-5269-11df-bce9-080069138b88" uid="15991"/>
-        <specific value="6" description="M 646 Croix du sud" uuid="e16969fe-5269-11df-9a42-080069138b88" uid="15992"/>
-        <specific value="7" description="M 647 Aigle" uuid="e16a79f2-5269-11df-a1b3-080069138b88" uid="15993"/>
-        <specific value="8" description="M 648 Lyre" uuid="e16b81ee-5269-11df-86a0-080069138b88" uid="15994"/>
-        <specific value="9" description="M 649 Persee" uuid="e16c9f8e-5269-11df-ae10-080069138b88" uid="15995"/>
-      </subcategory>
-      <subcategory value="3" description="Circe class (minehunters)" uuid="e16e500e-5269-11df-a5b5-080069138b88" uid="15996">
-        <specific value="1" description="M 712 Cybele" uuid="e16f639a-5269-11df-9ee6-080069138b88" uid="15997"/>
-        <specific value="2" description="M 713 Calliope" uuid="e1706cc2-5269-11df-b2c7-080069138b88" uid="15998"/>
-        <specific value="3" description="M 714 Clio" uuid="e1717d56-5269-11df-ad4d-080069138b88" uid="15999"/>
-        <specific value="4" description="M 715 Circe" uuid="e1728f20-5269-11df-a13d-080069138b88" uid="16000"/>
-        <specific value="5" description="M 716 Ceres" uuid="e1739cd0-5269-11df-813d-080069138b88" uid="16001"/>
-      </subcategory>
-      <subcategory value="4" description="ex-US Aggressive class (minesweepers)" uuid="e1754c56-5269-11df-a895-080069138b88" uid="16002">
-        <specific value="1" description="M 610 Ouistreham (ex-MSO 513)" uuid="e1765e98-5269-11df-a54f-080069138b88" uid="16003"/>
-        <specific value="2" description="M 612 Alencon (ex-MSO 453)" uuid="e1777364-5269-11df-b93b-080069138b88" uid="16004"/>
-        <specific value="3" description="M 623 Baccarat (ex-MSO 505)" uuid="e1787f8e-5269-11df-84e5-080069138b88" uid="16005"/>
-      </subcategory>
-      <subcategory value="5" description="MCM diving support ships" uuid="e17a2e7e-5269-11df-95e0-080069138b88" uid="16006">
-        <specific value="1" description="A 613 Acheron" uuid="e17b423c-5269-11df-b6bf-080069138b88" uid="16007"/>
-        <specific value="2" description="M 611 Vulcain" uuid="e17c526c-5269-11df-a3a3-080069138b88" uid="16008"/>
-        <specific value="3" description="M 614 Styx" uuid="e17d5c2a-5269-11df-8eef-080069138b88" uid="16009"/>
-        <specific value="4" description="M 622 Pluton" uuid="e17e6eee-5269-11df-9f6f-080069138b88" uid="16010"/>
-      </subcategory>
-    </category>
-    <category value="9" description="Dock Landing Ship" uuid="e180bc3a-5269-11df-b4c5-080069138b88" uid="16011">
-      <subcategory value="1" description="Foudre class (Type TCD 90)" uuid="e181cf58-5269-11df-9586-080069138b88" uid="16012">
-        <specific value="1" description="L 9011 Foudre" uuid="e182e014-5269-11df-9b81-080069138b88" uid="16013"/>
-      </subcategory>
-      <subcategory value="2" description="Ouragan class (TCDs)" uuid="e1848cc0-5269-11df-ae80-080069138b88" uid="16014">
-        <specific value="1" description="L 9021 Ouragan" uuid="e1859fca-5269-11df-8f0d-080069138b88" uid="16015"/>
-        <specific value="2" description="L 9022 Orage" uuid="e186aa5a-5269-11df-ae09-080069138b88" uid="16016"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="e188fe36-5269-11df-8b62-080069138b88" uid="16017">
-      <subcategory value="1" description="Bougainville class (BTs)" uuid="e18a0a9c-5269-11df-966b-080069138b88" uid="16018">
-        <specific value="1" description="L 9077 Bougainville" uuid="e18b2562-5269-11df-ac1d-080069138b88" uid="16019"/>
-      </subcategory>
-      <subcategory value="2" description="Batral type (light transports and landing ships)" uuid="e18cda74-5269-11df-a1af-080069138b88" uid="16020">
-        <specific value="1" description="L 9030 Champlain" uuid="e18dec66-5269-11df-b655-080069138b88" uid="16021"/>
-        <specific value="2" description="L 9031 Francis Garnier" uuid="e18ef674-5269-11df-aaf1-080069138b88" uid="16022"/>
-        <specific value="3" description="L 9032 Dumont D'urville" uuid="e1900a32-5269-11df-804f-080069138b88" uid="16023"/>
-        <specific value="4" description="L 9033 Jacques Cartier" uuid="e1911c10-5269-11df-8e73-080069138b88" uid="16024"/>
-        <specific value="5" description="L 9034 La grandiere" uuid="e1922772-5269-11df-9351-080069138b88" uid="16025"/>
-      </subcategory>
-      <subcategory value="3" description="Edic 700 class (LCT)" uuid="e193da18-5269-11df-86b4-080069138b88" uid="16026">
-        <specific value="1" description="L 9051" uuid="e194ea20-5269-11df-aa43-080069138b88" uid="16027"/>
-        <specific value="2" description="L 9052" uuid="e195f9e2-5269-11df-8424-080069138b88" uid="16028"/>
-      </subcategory>
-      <subcategory value="4" description="Edic class (LCT)" uuid="e197ab98-5269-11df-bb9e-080069138b88" uid="16029">
-        <specific value="1" description="L 9070" uuid="e198b98e-5269-11df-82a4-080069138b88" uid="16030"/>
-        <specific value="2" description="L 9072" uuid="e199c82e-5269-11df-99c3-080069138b88" uid="16031"/>
-        <specific value="3" description="L 9074" uuid="e19ad714-5269-11df-9434-080069138b88" uid="16032"/>
-      </subcategory>
-      <subcategory value="5" description="CDIC class (LCT)" uuid="e19c897e-5269-11df-83e8-080069138b88" uid="16033">
-        <specific value="1" description="L 9061" uuid="e19d9206-5269-11df-af70-080069138b88" uid="16034"/>
-        <specific value="2" description="L 9062" uuid="e19ea31c-5269-11df-b1dd-080069138b88" uid="16035"/>
-      </subcategory>
-      <subcategory value="6" description="Transport landing ship" uuid="e1a05234-5269-11df-a9a4-080069138b88" uid="16036">
-        <specific value="1" description="L 9090 Gapeau" uuid="e1a16412-5269-11df-9ddd-080069138b88" uid="16037"/>
-      </subcategory>
-    </category>
-    <category value="13" description="Cruiser/Helicopter Carrier" uuid="e1a3b1a4-5269-11df-93e7-080069138b88" uid="16038">
-      <subcategory value="1" description="Jeanne D'Arc Class (Helo CV)" uuid="e1a4c5f8-5269-11df-95de-080069138b88" uid="16039"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="e1a67588-5269-11df-91be-080069138b88" uid="16040">
-      <subcategory value="1" description="BH2 class (Batiments Hydrographiques De 2E class) (oceanographic &amp; survey)" uuid="e1a781c6-5269-11df-a185-080069138b88" uid="16041">
-        <specific value="1" description="A 791 Laperouse" uuid="e1a894da-5269-11df-b5f3-080069138b88" uid="16042"/>
-        <specific value="2" description="A 792 Borda" uuid="e1a9b0cc-5269-11df-9dd8-080069138b88" uid="16043"/>
-        <specific value="3" description="A 793 Laplace" uuid="e1aabba2-5269-11df-937b-080069138b88" uid="16044"/>
-        <specific value="4" description="A 795 Arago" uuid="e1abcb6e-5269-11df-8424-080069138b88" uid="16045"/>
-      </subcategory>
-      <subcategory value="2" description="Durance class (underway replenishment tankers)" uuid="e1ad7eb4-5269-11df-be3d-080069138b88" uid="16046">
-        <specific value="1" description="A 607 Meuse" uuid="e1ae9024-5269-11df-b46d-080069138b88" uid="16047"/>
-        <specific value="2" description="A 608 Var" uuid="e1af9d98-5269-11df-9f9d-080069138b88" uid="16048"/>
-        <specific value="3" description="A 629 Durance" uuid="e1b0ae86-5269-11df-a49f-080069138b88" uid="16049"/>
-        <specific value="4" description="A 630 Marne" uuid="e1b1bd80-5269-11df-acab-080069138b88" uid="16050"/>
-        <specific value="5" description="A 631 Somme" uuid="e1b2c77a-5269-11df-9cae-080069138b88" uid="16051"/>
-      </subcategory>
-      <subcategory value="3" description="Maintenance and repair ship" uuid="e1b47bf6-5269-11df-8a83-080069138b88" uid="16052">
-        <specific value="1" description="A 620 Jules Verne (ex-Acheron)" uuid="e1b58d5c-5269-11df-88f3-080069138b88" uid="16053"/>
-      </subcategory>
-      <subcategory value="4" description="Rhin class (depot and support ships)" uuid="e1b74692-5269-11df-98ee-080069138b88" uid="16054">
-        <specific value="1" description="A 615 Loire" uuid="e1b85672-5269-11df-860e-080069138b88" uid="16055"/>
-        <specific value="2" description="A 617 Garonne" uuid="e1b961de-5269-11df-8406-080069138b88" uid="16056"/>
-        <specific value="3" description="A 618 Rance" uuid="e1ba7286-5269-11df-ac08-080069138b88" uid="16057"/>
-        <specific value="4" description="A 621 Rhin" uuid="e1bb90da-5269-11df-9849-080069138b88" uid="16058"/>
-        <specific value="5" description="A 622 Rhone" uuid="e1bc9b38-5269-11df-8f3a-080069138b88" uid="16059"/>
-      </subcategory>
-      <subcategory value="5" description="Chamois class (supply tenders)" uuid="e1be509a-5269-11df-8b4f-080069138b88" uid="16060">
-        <specific value="1" description="A 633 Taape" uuid="e1bf619c-5269-11df-b8e1-080069138b88" uid="16061"/>
-        <specific value="2" description="A 767 Chamois" uuid="e1c07352-5269-11df-b265-080069138b88" uid="16062"/>
-        <specific value="3" description="A 768 Elan" uuid="e1c17c34-5269-11df-9670-080069138b88" uid="16063"/>
-        <specific value="4" description="A 774 Chevreuil" uuid="e1c28df4-5269-11df-a91c-080069138b88" uid="16064"/>
-        <specific value="5" description="A 775 Gazelle" uuid="e1c3a22a-5269-11df-a0c0-080069138b88" uid="16065"/>
-        <specific value="6" description="A 776 Isard" uuid="e1c4ab0c-5269-11df-99b0-080069138b88" uid="16066"/>
-        <specific value="7" description="A 779 Tapatai (ex-Silver Fish)" uuid="e1c5bbbe-5269-11df-a0b9-080069138b88" uid="16067"/>
-      </subcategory>
-      <subcategory value="6" description="RR 4000 type (supply tenders)" uuid="e1c76e82-5269-11df-82b0-080069138b88" uid="16068">
-        <specific value="1" description="A 634 Rari" uuid="e1c88bbe-5269-11df-9a68-080069138b88" uid="16069"/>
-        <specific value="2" description="A 635 Revi" uuid="e1c99766-5269-11df-a35e-080069138b88" uid="16070"/>
-      </subcategory>
-      <subcategory value="7" description="Leopard class (training ships)" uuid="e1cb473c-5269-11df-842b-080069138b88" uid="16071">
-        <specific value="1" description="A 748 Leopard" uuid="e1cc5924-5269-11df-8abe-080069138b88" uid="16072"/>
-        <specific value="2" description="A 749 Panthere" uuid="e1cd6c7e-5269-11df-8ddf-080069138b88" uid="16073"/>
-        <specific value="3" description="A 750 Jaguar" uuid="e1ce75c4-5269-11df-99a3-080069138b88" uid="16074"/>
-        <specific value="4" description="A 751 Lynx" uuid="e1cf85e0-5269-11df-8035-080069138b88" uid="16075"/>
-        <specific value="5" description="A 752 Guepard" uuid="e1d09840-5269-11df-9f57-080069138b88" uid="16076"/>
-        <specific value="6" description="A 753 Chacal" uuid="e1d1a3de-5269-11df-9175-080069138b88" uid="16077"/>
-        <specific value="7" description="A 754 Tigre" uuid="e1d2b30a-5269-11df-8e62-080069138b88" uid="16078"/>
-        <specific value="8" description="A 755 Lion" uuid="e1d3c63c-5269-11df-b5f6-080069138b88" uid="16079"/>
-      </subcategory>
-    </category>
-    <category value="17" description="Auxiliary, Merchant Marine" uuid="e1d6150e-5269-11df-a026-080069138b88" uid="16080">
-      <subcategory value="1" description="Government Maritime Forces" uuid="e1d728e0-5269-11df-a407-080069138b88" uid="16081">
-        <specific value="1" description="Patra Class (fast patrol craft)" uuid="e1d83280-5269-11df-92c9-080069138b88" uid="16082">
-          <extra value="1" description="P 670 Trident" uuid="e1d94742-5269-11df-a420-080069138b88" uid="16083"/>
-          <extra value="2" description="P 671 Glaive" uuid="e1da58ee-5269-11df-b99d-080069138b88" uid="16084"/>
-          <extra value="3" description="P 672 Epee" uuid="e1db63e2-5269-11df-b08d-080069138b88" uid="16085"/>
-          <extra value="4" description="P 673 Pertuisane" uuid="e1dc71ba-5269-11df-baab-080069138b88" uid="16086"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="Harbour tugs (Remorqueurs De Port)" uuid="e1dec47e-5269-11df-80f3-080069138b88" uid="16087">
-        <specific value="1" description="105-ton type" uuid="e1dfd724-5269-11df-b926-080069138b88" uid="16088">
-          <extra value="1" description="Y 601 Acajou" uuid="e1e0e7ea-5269-11df-bc56-080069138b88" uid="16089"/>
-          <extra value="2" description="Y 620 Chataigner" uuid="e1e1fa40-5269-11df-9555-080069138b88" uid="16090"/>
-          <extra value="3" description="Y 623 Charme" uuid="e1e304bc-5269-11df-a1c8-080069138b88" uid="16091"/>
-          <extra value="4" description="Y 624 Chene" uuid="e1e412bc-5269-11df-b100-080069138b88" uid="16092"/>
-          <extra value="5" description="Y 629 Cormier" uuid="e1e52594-5269-11df-a6dc-080069138b88" uid="16093"/>
-          <extra value="6" description="Y 644 Frene" uuid="e1e62d54-5269-11df-9b3e-080069138b88" uid="16094"/>
-          <extra value="7" description="Y 654 Hetre" uuid="e1e74770-5269-11df-8909-080069138b88" uid="16095"/>
-          <extra value="8" description="Y 655 Hevea" uuid="e1e8593a-5269-11df-902e-080069138b88" uid="16096"/>
-          <extra value="9" description="Y 663 Latanier" uuid="e1e96410-5269-11df-9a74-080069138b88" uid="16097"/>
-          <extra value="10" description="Y 666 Manguier" uuid="e1ea72c4-5269-11df-83ea-080069138b88" uid="16098"/>
-          <extra value="11" description="Y 668 Meleze" uuid="e1eb8222-5269-11df-b6c7-080069138b88" uid="16099"/>
-          <extra value="12" description="Y 669 Merisier" uuid="e1ec902c-5269-11df-acfa-080069138b88" uid="16100"/>
-          <extra value="13" description="Y 686 Paletuvier" uuid="e1ed9f30-5269-11df-9cd3-080069138b88" uid="16101"/>
-          <extra value="14" description="Y 688 Peuplier" uuid="e1eeae98-5269-11df-a956-080069138b88" uid="16102"/>
-          <extra value="15" description="Y 689 Pin" uuid="e1efbcf2-5269-11df-b64a-080069138b88" uid="16103"/>
-          <extra value="16" description="Y 695 Platane" uuid="e1f0cb9c-5269-11df-a42f-080069138b88" uid="16104"/>
-          <extra value="17" description="Y 708 Saule" uuid="e1f1da46-5269-11df-b634-080069138b88" uid="16105"/>
-          <extra value="18" description="Y 709 Sycomore" uuid="e1f2e3b4-5269-11df-acf9-080069138b88" uid="16106"/>
-          <extra value="19" description="Y 717 Ebene" uuid="e1f3f61e-5269-11df-ba06-080069138b88" uid="16107"/>
-          <extra value="20" description="Y 718 Erable" uuid="e1f50522-5269-11df-8cbc-080069138b88" uid="16108"/>
-          <extra value="21" description="Y 719 Olivier" uuid="e1f60e18-5269-11df-a618-080069138b88" uid="16109"/>
-          <extra value="22" description="Y 720 Santal" uuid="e1f721c2-5269-11df-be22-080069138b88" uid="16110"/>
-          <extra value="23" description="Y 738 Maronnier" uuid="e1f830c6-5269-11df-80fe-080069138b88" uid="16111"/>
-          <extra value="24" description="Y 739 Noyer" uuid="e1f93bd8-5269-11df-ac5b-080069138b88" uid="16112"/>
-          <extra value="25" description="Y 740 Papayer" uuid="e1fa4a50-5269-11df-b44c-080069138b88" uid="16113"/>
-        </specific>
-        <specific value="2" description="93-ton type" uuid="e1fbfcb0-5269-11df-a949-080069138b88" uid="16114">
-          <extra value="1" description="Y 630 Bonite" uuid="e1fd0a9c-5269-11df-9029-080069138b88" uid="16115"/>
-          <extra value="2" description="Y 634 Rouget" uuid="e1fe14aa-5269-11df-b241-080069138b88" uid="16116"/>
-        </specific>
-        <specific value="3" description="65-ton type" uuid="e1ffc76e-5269-11df-be84-080069138b88" uid="16117">
-          <extra value="1" description="Y 611 Bengali" uuid="e200d6ae-5269-11df-b0ef-080069138b88" uid="16118"/>
-          <extra value="2" description="Y 617 Mouette" uuid="e201e67a-5269-11df-8432-080069138b88" uid="16119"/>
-          <extra value="3" description="Y 621 Mesange" uuid="e202f04c-5269-11df-b585-080069138b88" uid="16120"/>
-          <extra value="4" description="Y 625 Cigogne" uuid="e204037e-5269-11df-a1e8-080069138b88" uid="16121"/>
-          <extra value="5" description="Y 628 Colibri" uuid="e2051296-5269-11df-be5f-080069138b88" uid="16122"/>
-          <extra value="6" description="Y 632 Cygne" uuid="e206258c-5269-11df-bfd1-080069138b88" uid="16123"/>
-          <extra value="7" description="Y 636 Martinet" uuid="e2073814-5269-11df-b550-080069138b88" uid="16124"/>
-          <extra value="8" description="Y 637 Fauvette" uuid="e2084754-5269-11df-952d-080069138b88" uid="16125"/>
-          <extra value="9" description="Y 648 Goeland" uuid="e2095298-5269-11df-b464-080069138b88" uid="16126"/>
-          <extra value="10" description="Y 670 Merle" uuid="e20a6336-5269-11df-b9bc-080069138b88" uid="16127"/>
-          <extra value="11" description="Y 673 Moineau" uuid="e20b7168-5269-11df-a207-080069138b88" uid="16128"/>
-          <extra value="12" description="Y 675 Martin Pecheur" uuid="e20c7efa-5269-11df-9ca7-080069138b88" uid="16129"/>
-          <extra value="13" description="Y 687 Passereau" uuid="e20d8de0-5269-11df-8e8f-080069138b88" uid="16130"/>
-          <extra value="14" description="Y 691 Pinson" uuid="e20e9faa-5269-11df-8595-080069138b88" uid="16131"/>
-          <extra value="15" description="Y 694 Pivert" uuid="e20fa9e0-5269-11df-b61f-080069138b88" uid="16132"/>
-          <extra value="16" description="Y 721 Alouette" uuid="e210bb64-5269-11df-b1e8-080069138b88" uid="16133"/>
-          <extra value="17" description="Y 722 Vanneau" uuid="e211ced2-5269-11df-96ba-080069138b88" uid="16134"/>
-          <extra value="18" description="Y 723 Engoulevent" uuid="e212d930-5269-11df-8564-080069138b88" uid="16135"/>
-          <extra value="19" description="Y 724 Sarcelle" uuid="e213e8a2-5269-11df-bcbf-080069138b88" uid="16136"/>
-          <extra value="20" description="Y 725 Marabout" uuid="e214f9ae-5269-11df-9867-080069138b88" uid="16137"/>
-          <extra value="21" description="Y 726 Toucan" uuid="e21605b0-5269-11df-b6d0-080069138b88" uid="16138"/>
-          <extra value="22" description="Y 727 Macreuse" uuid="e217143c-5269-11df-9ee8-080069138b88" uid="16139"/>
-          <extra value="23" description="Y 728 Grand Duc" uuid="e2182606-5269-11df-adff-080069138b88" uid="16140"/>
-          <extra value="24" description="Y 729 Eider" uuid="e21930f0-5269-11df-995a-080069138b88" uid="16141"/>
-          <extra value="25" description="Y 730 Ara" uuid="e21a438c-5269-11df-af29-080069138b88" uid="16142"/>
-          <extra value="26" description="Y 747 Loriot" uuid="e21b51aa-5269-11df-9d5d-080069138b88" uid="16143"/>
-          <extra value="27" description="Y 748 Gelinotte" uuid="e21c5c44-5269-11df-9212-080069138b88" uid="16144"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate" uuid="e21f51a6-5269-11df-8f2c-080069138b88" uid="16145">
-      <subcategory value="1" description="D'estienne D'orves (Type A 69) class" uuid="e2206064-5269-11df-bd51-080069138b88" uid="16146">
-        <specific value="1" description="F 781 D'estienne D'orves" uuid="e2216fae-5269-11df-964c-080069138b88" uid="16147"/>
-        <specific value="2" description="F 782 Amyot d'inville" uuid="e2228010-5269-11df-8454-080069138b88" uid="16148"/>
-        <specific value="3" description="F 783 Drogou" uuid="e223943c-5269-11df-8ae5-080069138b88" uid="16149"/>
-        <specific value="4" description="F 784 Detroyat" uuid="e224a9bc-5269-11df-97eb-080069138b88" uid="16150"/>
-        <specific value="5" description="F 785 Jean Moulin" uuid="e225b96a-5269-11df-bcbf-080069138b88" uid="16151"/>
-        <specific value="6" description="F 786 Quartier Maitre Anquetil" uuid="e226cb48-5269-11df-9011-080069138b88" uid="16152"/>
-        <specific value="7" description="F 787 Commandant de Pimodan" uuid="e227d8c6-5269-11df-a6fd-080069138b88" uid="16153"/>
-        <specific value="8" description="F 788 Second Maitre Le Bihan" uuid="e228ed88-5269-11df-80d4-080069138b88" uid="16154"/>
-        <specific value="9" description="F 789 Lieutenant De Vaisseau Le Henaff" uuid="e229fdea-5269-11df-9e36-080069138b88" uid="16155"/>
-        <specific value="10" description="F 790 Lieutenant De Vaisseau Lavallee" uuid="e22b0b68-5269-11df-924f-080069138b88" uid="16156"/>
-        <specific value="11" description="F 791 Commandant L'herminier" uuid="e22c20f2-5269-11df-bb80-080069138b88" uid="16157"/>
-        <specific value="12" description="F 792 Premier Maitre L'her" uuid="e22d3226-5269-11df-93cd-080069138b88" uid="16158"/>
-        <specific value="13" description="F 793 Commandant Blaison" uuid="e22e3cca-5269-11df-8b2b-080069138b88" uid="16159"/>
-        <specific value="14" description="F 794 Enseigne De Vaisseau Jacoubet" uuid="e22f4e26-5269-11df-8fbd-080069138b88" uid="16160"/>
-        <specific value="15" description="F 795 Commandant Ducuing" uuid="e23064aa-5269-11df-a3b7-080069138b88" uid="16161"/>
-        <specific value="16" description="F 796 Commandant Birot" uuid="e2317052-5269-11df-9486-080069138b88" uid="16162"/>
-        <specific value="17" description="F 797 Commandant Bouan" uuid="e2327fec-5269-11df-92da-080069138b88" uid="16163"/>
-      </subcategory>
-      <subcategory value="2" description="Commandant Riviere class (Avisos Escorteurs)" uuid="e23433b4-5269-11df-8c3f-080069138b88" uid="16164">
-        <specific value="1" description="F 726 Commandant Bory" uuid="e2354948-5269-11df-9429-080069138b88" uid="16165"/>
-        <specific value="2" description="F 729 Balny" uuid="e23653a6-5269-11df-a4b6-080069138b88" uid="16166"/>
-        <specific value="3" description="F 749 Enseigne de Vaisseau Henry" uuid="e23762c8-5269-11df-ad69-080069138b88" uid="16167"/>
-      </subcategory>
-    </category>
-    <category value="54" description="Amphibious Assault Ship" status="new" uuid="1ef58b6e-d93a-49cf-b3d5-97d0612f27cc" uid="22707">
-      <cr value="1619"/>
-      <subcategory value="1" description="Mistral class" status="new" uuid="72d90f84-3e3f-4319-b9be-2bc2028e3bd4" uid="22708">
-        <cr value="1619"/>
-        <specific value="1" description="L9013 Mistral" status="new" uuid="5a0888ed-01f6-4555-8a7e-2a519dee820a" uid="22709">
-          <cr value="1619"/>
-        </specific>
-        <specific value="2" description="L9014 Tonnerre" status="new" uuid="a6f0ffef-ed75-414e-a6ea-ffe3e4483157" uid="22710">
-          <cr value="1619"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="e239c2a2-5269-11df-8c9a-080069138b88" uid="16168">
-      <subcategory value="1" description="Container class" uuid="e23ad20a-5269-11df-80aa-080069138b88" uid="16169">
-        <specific value="1" description="Descrates" uuid="e23be19a-5269-11df-aaff-080069138b88" uid="16170"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker class" uuid="e23d951c-5269-11df-856c-080069138b88" uid="16171">
-        <specific value="1" description="Athos" uuid="e23ea2fe-5269-11df-99e4-080069138b88" uid="16172"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="71" uuid="e24192ca-5269-11df-8179-080069138b88" uid="16173">
-    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="e242a8ae-5269-11df-8d0c-080069138b88" uid="16174">
-      <subcategory value="1" description="Le Triomphant class (SNLE-NG)" uuid="e243bbae-5269-11df-97f4-080069138b88" uid="16175">
-        <specific value="1" description="S 616 Le Triomphant" uuid="e244d0fc-5269-11df-9023-080069138b88" uid="16176" status="new">
-          <cr value="1654"/>
-        </specific>
-        <specific value="2" description="S 617 Le Temeraire" uuid="e245dc54-5269-11df-b737-080069138b88" uid="16177" status="new">
-          <cr value="1654"/>
-        </specific>
-        <specific value="3" description="S 618 Le Vigilant" uuid="e246ecf2-5269-11df-a1ee-080069138b88" uid="16178" status="new">
-          <cr value="1654"/>
-        </specific>
-        <specific value="4" description="S 619 Le Terrible" status="new" uuid="f5a9d0bf-7c60-42fa-ad30-e646415c393b" uid="22797">
-          <cr value="1654"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="2" description="SSGN (Nuclear Guided Missile)" uuid="e2493fa2-5269-11df-9dc1-080069138b88" uid="16179">
-      <subcategory value="1" description="L'inflexible class (SNLE)" uuid="e24a4f1e-5269-11df-8288-080069138b88" uid="16180">
-        <specific value="1" description="S 610 Le foudroyant" uuid="e24b63cc-5269-11df-b5eb-080069138b88" uid="16181"/>
-        <specific value="2" description="S 612 Le terrible" uuid="e24c741a-5269-11df-a027-080069138b88" uid="16182"/>
-        <specific value="3" description="S 613 L'indomptable" uuid="e24d80bc-5269-11df-a674-080069138b88" uid="16183"/>
-        <specific value="4" description="S 614 Le tonnant" uuid="e24e9362-5269-11df-8f40-080069138b88" uid="16184"/>
-        <specific value="5" description="S 615 L'inflexible" uuid="e24faf86-5269-11df-9595-080069138b88" uid="16185"/>
-      </subcategory>
-    </category>
-    <category value="3" description="SSN (Nuclear Attack Ballistic Missile) (Sous-Marins Nucleaires D'attaque (SNA))" uuid="e2520948-5269-11df-9fb3-080069138b88" uid="16186">
-      <subcategory value="1" description="Rubis Class (SNA 72)" uuid="e2531d60-5269-11df-8570-080069138b88" uid="16187">
-        <specific value="1" description="S 601 Rubis" uuid="e25426ec-5269-11df-845b-080069138b88" uid="16188"/>
-        <specific value="2" description="S 602 Saphir" uuid="e2553a1e-5269-11df-94eb-080069138b88" uid="16189"/>
-        <specific value="3" description="S 603 Casabianca" uuid="e2564af8-5269-11df-bfa8-080069138b88" uid="16190"/>
-        <specific value="4" description="S 604 Emeraude" uuid="e2575542-5269-11df-bb3a-080069138b88" uid="16191"/>
-        <specific value="5" description="S 605 Amethyste" uuid="e258648c-5269-11df-a44c-080069138b88" uid="16192"/>
-        <specific value="6" description="S 606 Perle" uuid="e259778c-5269-11df-bd24-080069138b88" uid="16193"/>
-        <specific value="7" description="S 607 Turquoise" uuid="e25a8208-5269-11df-b5df-080069138b88" uid="16194"/>
-      </subcategory>
-    </category>
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol) (Sous-Marins D'attaque)" uuid="e25cd936-5269-11df-8d11-080069138b88" uid="16195">
-      <subcategory value="1" description="Agosta Class" uuid="e25de7ae-5269-11df-b54d-080069138b88" uid="16196">
-        <specific value="1" description="S 620 Agosta" uuid="e25ef752-5269-11df-a9e5-080069138b88" uid="16197"/>
-        <specific value="2" description="S 621 Beveziers" uuid="e26008cc-5269-11df-8ea4-080069138b88" uid="16198"/>
-        <specific value="3" description="S 622 La praya" uuid="e2611d84-5269-11df-b8db-080069138b88" uid="16199"/>
-        <specific value="4" description="S 623 Ouessant" uuid="e2623002-5269-11df-a309-080069138b88" uid="16200"/>
-      </subcategory>
-      <subcategory value="2" description="Daphne Class" uuid="e263df9c-5269-11df-b45f-080069138b88" uid="16201">
-        <specific value="1" description="S 643 Doris" uuid="e264f314-5269-11df-82c1-080069138b88" uid="16202"/>
-        <specific value="2" description="S 648 Jun" uuid="e265fdae-5269-11df-9437-080069138b88" uid="16203"/>
-        <specific value="3" description="S 650 Psyche" uuid="e2670c4e-5269-11df-9918-080069138b88" uid="16204"/>
-        <specific value="4" description="S 651 Sirene" uuid="e2681c9c-5269-11df-9150-080069138b88" uid="16205"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="71" uuid="e26b0dbc-5269-11df-a887-080069138b88" uid="16206">
-    <category value="0" description="Other" uuid="e26c1fcc-5269-11df-8ce5-080069138b88" uid="16207"/>
-    <category value="1" description="Manned" uuid="e26d2f48-5269-11df-817c-080069138b88" uid="16208">
-      <subcategory value="6" description="Space Plane" uuid="e26e3cc6-5269-11df-beea-080069138b88" uid="16209">
-        <specific value="1" description="Hermes" uuid="e26f4a1c-5269-11df-b8a3-080069138b88" uid="16210"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Unmanned" uuid="e2719c72-5269-11df-a82f-080069138b88" uid="16211">
-      <subcategory value="1" description="Communication satellite" uuid="e272a5d6-5269-11df-9cd3-080069138b88" uid="16212">
-        <specific value="1" description="Telecom" uuid="e273ba0c-5269-11df-a84d-080069138b88" uid="16213"/>
-        <specific value="2" description="Hispasat" uuid="e274c910-5269-11df-b157-080069138b88" uid="16214"/>
-        <specific value="3" description="Eutelsat" uuid="e275d53a-5269-11df-84e4-080069138b88" uid="16215"/>
-        <specific value="4" description="Turksat" uuid="e276e4d4-5269-11df-acac-080069138b88" uid="16216"/>
-        <specific value="6" description="Argos" uuid="e277f5a4-5269-11df-b21f-080069138b88" uid="16217"/>
-        <specific value="7" description="S80/T" uuid="e278ffee-5269-11df-80b7-080069138b88" uid="16218"/>
-        <specific value="8" description="Arsene" uuid="e27a126c-5269-11df-a706-080069138b88" uid="16219"/>
-        <specific value="9" description="Syracuse" uuid="e27b215c-5269-11df-89f2-080069138b88" uid="16220"/>
-      </subcategory>
-      <subcategory value="2" description="Navigation satellite" uuid="e27cd254-5269-11df-9b68-080069138b88" uid="16221"/>
-      <subcategory value="4" description="Electronic Intelligence satellite" uuid="e27de18a-5269-11df-9af8-080069138b88" uid="16222">
-        <specific value="1" description="Cerise" uuid="e27ef318-5269-11df-b8d3-080069138b88" uid="16223"/>
-      </subcategory>
-      <subcategory value="7" description="Imaging Radar surveillance satellite" uuid="e280abcc-5269-11df-839d-080069138b88" uid="16224">
-        <specific value="1" description="Helios" uuid="e281c0e8-5269-11df-9c6c-080069138b88" uid="16225"/>
-        <specific value="2" description="Osiris SAR" uuid="e282cb5a-5269-11df-8c2e-080069138b88" uid="16226"/>
-      </subcategory>
-      <subcategory value="8" description="Optical imaging surveillance satellite" uuid="e2847e1e-5269-11df-8654-080069138b88" uid="16227">
-        <specific value="1" description="Syracuse 3" uuid="e2858dc2-5269-11df-8462-080069138b88" uid="16228"/>
-      </subcategory>
-      <subcategory value="13" description="Science satellite" uuid="e2873f1e-5269-11df-8a12-080069138b88" uid="16229">
-        <specific value="1" description="Hipparcos" uuid="e2885250-5269-11df-8afc-080069138b88" uid="16230"/>
-        <specific value="2" description="Titan" uuid="e28963e8-5269-11df-bb6b-080069138b88" uid="16231"/>
-        <specific value="3" description="Topex/Poseidon" uuid="e28a72f6-5269-11df-bf9b-080069138b88" uid="16232"/>
-        <specific value="4" description="Starlette" uuid="e28b861e-5269-11df-9982-080069138b88" uid="16233"/>
-        <specific value="5" description="SRAT 2" uuid="e28c94b4-5269-11df-8885-080069138b88" uid="16234"/>
-      </subcategory>
-      <subcategory value="14" description="Survey satellite" uuid="e28e4354-5269-11df-b2fb-080069138b88" uid="16235">
-        <specific value="1" description="Stella" uuid="e28f52d0-5269-11df-8b6c-080069138b88" uid="16236"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Booster" uuid="e291a440-5269-11df-a928-080069138b88" uid="16237">
-      <subcategory value="1" description="Ariane" uuid="e292b43e-5269-11df-9e4a-080069138b88" uid="16238"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="78" uuid="e2950c0c-5269-11df-9aea-080069138b88" uid="16239">
-    <category value="1" description="Tank" uuid="e2961444-5269-11df-9dc8-080069138b88" uid="16240">
-      <subcategory value="1" description="Leopard 1 MBT" uuid="e29721e0-5269-11df-95cf-080069138b88" uid="16241">
-        <specific value="1" description="A1" uuid="e2983620-5269-11df-a356-080069138b88" uid="16242"/>
-        <specific value="2" description="A2" uuid="e2993f48-5269-11df-8212-080069138b88" uid="16243"/>
-        <specific value="3" description="A3" uuid="e29a4f46-5269-11df-9cbd-080069138b88" uid="16244"/>
-        <specific value="4" description="A4" uuid="e29b6106-5269-11df-a427-080069138b88" uid="16245"/>
-        <specific value="5" description="A5" uuid="e29c6ed4-5269-11df-9565-080069138b88" uid="16246"/>
-        <specific value="6" description="Leopard 1 A5 Observer" status="new" uuid="e343f192-8fee-4d7d-bce0-4bfc051312d3" uid="22717">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="Leopard 2 MBT" uuid="e29e1d06-5269-11df-be72-080069138b88" uid="16247">
-        <specific value="1" description="Leopard 2 A1" status="new" uuid="f458a828-e4ad-4c44-b2b7-dd33fbc54fc8" uid="22718">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Leopard 2 A2" status="new" uuid="660757a1-79ec-4e7e-ad92-97ae4a8338e3" uid="22719">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Leopard 2 A3" status="new" uuid="3d41cc6b-a3e2-479b-afd4-a733d61319b7" uid="22720">
-          <cr value="1627"/>
-        </specific>
-        <specific value="4" description="Leopard 2 A4" status="new" uuid="17e6e863-19c1-4d4a-949f-94f8fd912af9" uid="22721">
-          <cr value="1627"/>
-        </specific>
-        <specific value="5" description="Leopard 2 A5" status="new" uuid="d0679ccc-8622-4ce9-b72a-f9d8ec563c4c" uid="22722">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="3" description="Leopard 2 (improved) MBT" uuid="e29f384e-5269-11df-a8a9-080069138b88" uid="16248">
-        <specific value="1" description="Stridsvagn 122 (replaced)" uuid="e2a049a0-5269-11df-a78b-080069138b88" uid="16249" status="new">
-          <cr value="1633"/>
-        </specific>
-        <specific value="2" description="Leopard 2 A6" status="new" uuid="4df7775a-2055-47ec-97e1-e9ddbb2ca813" uid="22723">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Leopard 2 A6M" status="new" uuid="26502dc1-289f-403d-af66-5e5662408fad" uid="22724">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="2" description="Armored Fighting Vehicle" uuid="e2a29c50-5269-11df-a7e4-080069138b88" uid="16250">
-      <subcategory value="1" description="Marder 1" uuid="e2a3ad0c-5269-11df-a522-080069138b88" uid="16251" status="new">
-        <cr value="1627"/>
-        <specific value="1" description="Marder 1 A1" status="new" uuid="6c32219a-0143-4a21-933d-3d947ab4f8f6" uid="22725">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Marder 1 A2" status="new" uuid="f831c1fe-5f52-4e91-9bbb-0ca30d5a469b" uid="22726">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Marder 1 A3" status="new" uuid="deb5d218-10b1-466e-bddb-f12bd1546e2e" uid="22727">
-          <cr value="1627"/>
-        </specific>
-        <specific value="4" description="Marder 1 A4" status="new" uuid="b3674416-d5c0-4b6e-9f84-4362206f3634" uid="22728">
-          <cr value="1627"/>
-        </specific>
-        <specific value="5" description="Marder 1 A5" status="new" uuid="6a870d2b-5488-4ac4-9918-d459d2b6e9e0" uid="22729">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="Marder 2" uuid="e2a4bc38-5269-11df-b189-080069138b88" uid="16252" deprecated="true">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="3" description="BMP 1" uuid="e2a5cb0a-5269-11df-88d3-080069138b88" uid="16253" deprecated="true">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="4" description="Jaguar 1 tank destroyer, missile" uuid="e2a6dc52-5269-11df-a91d-080069138b88" uid="16254"/>
-      <subcategory value="5" description="Jaguar 2" uuid="e2a7ec64-5269-11df-8f4e-080069138b88" uid="16255"/>
-      <subcategory value="6" description="Luchs armored reconnaissance vehicle" uuid="e2a8fde8-5269-11df-ba9e-080069138b88" uid="16256"/>
-      <subcategory value="7" description="Zobel armored reconnaissance vehicle" uuid="e2aa0f08-5269-11df-84d0-080069138b88" uid="16257" deprecated="true">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="8" description="Roland AD system, missile" deprecated="1" uuid="e2ab1e2a-5269-11df-ab61-080069138b88" uid="16258"/>
-      <subcategory value="9" description="Gepard armored AD, gun" deprecated="1" uuid="e2ac358a-5269-11df-af26-080069138b88" uid="16259"/>
-      <subcategory value="10" description="Wiesel" uuid="e2ad4812-5269-11df-b322-080069138b88" uid="16260">
-        <specific value="1" description="Wiesel with 20mm" uuid="e2ae519e-5269-11df-90f9-080069138b88" uid="16261"/>
-        <specific value="2" description="Wiesel with TOW" uuid="e2af65c0-5269-11df-83df-080069138b88" uid="16262"/>
-      </subcategory>
-      <subcategory value="11" description="Wiesel 2 armoured weapons carrier" status="new" uuid="0df0e9ff-e0ee-438b-b0ea-9d92429683e3" uid="22730">
-        <cr value="1627"/>
-        <specific value="1" description="Wiesel 2 ambulance" status="new" uuid="78de3021-642e-42bd-91bd-3434aa1ec20d" uid="22731">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Wiesel 2 lePzMrs 120 mm (mortar)" status="new" uuid="51f6ac7e-9766-4661-9491-f1ee598cd5a1" uid="22732">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Wiesel 2 command post" status="new" uuid="0e9a9b62-f58b-43d1-a85a-d744378ee1c0" uid="22733">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="12" description="Puma IFV" status="new" uuid="04a97c96-b9ca-4bc1-9f15-9bbe5fae9835" uid="22734">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="13" description="Fennek light armoured reconnaissance vehicle" status="new" uuid="bbae7a34-eaf0-474f-a5ad-3f0ae11071f1" uid="22735">
-        <cr value="1627"/>
-        <specific value="1" description="Fennek LVB (reconnaissance)" status="new" uuid="3b2edc9e-043d-473f-a31c-943568c15696" uid="22736">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Fennek JFST (joint fire support team)" status="new" uuid="8dc4e8e9-5db0-4fde-99b8-d89b5adf8351" uid="22737">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Fennek Fü-/ErkdFzg Pi (combat engineer)" status="new" uuid="e610c7ec-ce8d-40bb-abc7-66c992fd367b" uid="22738">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="3" description="Armored Utility Vehicle" uuid="e2b1b582-5269-11df-a851-080069138b88" uid="16263">
-      <subcategory value="1" description="Biber armored bridge layer" uuid="e2b2c544-5269-11df-92fe-080069138b88" uid="16264"/>
-      <subcategory value="2" description="Dachs armored engineer tank" uuid="e2b3d650-5269-11df-b131-080069138b88" uid="16265"/>
-      <subcategory value="3" description="Keiler armored minesweeper" uuid="e2b4ec98-5269-11df-83af-080069138b88" uid="16266"/>
-      <subcategory value="4" description="Skorpion armored minelayer" uuid="e2b5f8fe-5269-11df-a652-080069138b88" uid="16267"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="e2b70c4e-5269-11df-b972-080069138b88" uid="16268"/>
-      <subcategory value="6" description="M113 armored motor-ambulance" uuid="e2b81e86-5269-11df-87bd-080069138b88" uid="16269"/>
-      <subcategory value="7" description="M113 armored artillery observer" uuid="e2b92fa6-5269-11df-803d-080069138b88" uid="16270"/>
-      <subcategory value="8" description="Transportpanzer 1 &quot;Fuchs&quot;" uuid="e2ba4152-5269-11df-9ef2-080069138b88" uid="16271">
-        <specific value="1" description="Fuchs APC" status="new" uuid="5a757188-ab16-4fe4-968e-7971e0fb18a5" uid="22739">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Fuchs NBC reconaissance" status="new" uuid="3066c717-98d5-4016-8707-fb668689ad6f" uid="22740">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Hummel EloKa electronic warfare" status="new" uuid="1eb61ca6-42ef-429c-ac22-4169002fb1d1" uid="22741">
-          <cr value="1627"/>
-        </specific>
-        <specific value="4" description="Fuchs PARA RASIT battlefield radar" status="new" uuid="90aa516f-928c-411b-8abc-8a9c251c69d9" uid="22742">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="9" description="Buffel ARV" uuid="e2bb539e-5269-11df-8a95-080069138b88" uid="16272"/>
-      <subcategory value="10" description="GTK Boxer armoured fighting vehicle" status="new" uuid="34470edb-0513-42c7-bf4e-4eb5f03fc33a" uid="22743">
-        <cr value="1627"/>
-        <specific value="1" description="GTK Boxer APC" status="new" uuid="5b54de28-7260-4f30-b50c-af1860a7d9e0" uid="22744">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="GTK Boxer ambulance" status="new" uuid="9fe6e94c-0a33-4d25-8e01-9432a27b2d1e" uid="22745">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="GTK Boxer command post" status="new" uuid="4eefefb9-1736-40a4-9259-5c8b98460409" uid="22746">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="11" description="ATF Dingo armoured infantry mobility vehicle" status="new" uuid="6700e320-3379-4454-b99d-deafe29f7a48" uid="22747">
-        <cr value="1627"/>
-        <specific value="1" description="ATF Dingo 1" status="new" uuid="57b7304f-41e5-4be4-a788-26963900ba81" uid="22748">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="ATF Dingo 2" status="new" uuid="01768bf5-60fe-4900-8cad-790d3c9068b7" uid="22749">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="12" description="MOWAG Eagle armoured infantry mobility vehicle" status="new" uuid="f70aa469-0536-4877-bde5-aa1dc01fada9" uid="22750">
-        <cr value="1627"/>
-        <specific value="1" description="Eagle IV" status="new" uuid="14159c8e-da5f-4a67-aaa9-25cef7e324ec" uid="22751">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Eagle IV BAT (ambulance)" status="new" uuid="1e2d5c24-f090-4c13-82f6-4b1674b33f32" uid="22752">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="13" description="MOWAG Duro" status="new" uuid="263ad96d-caca-4238-932f-190ce99c7aaa" uid="22753">
-        <cr value="1627"/>
-        <specific value="1" description="YAK" status="new" uuid="f3da0165-cb2f-48c3-9c39-0a2324ff39ab" uid="22754">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="YAK BAT (ambulance)" status="new" uuid="2dfeb6ab-5a14-4376-988e-06d7a48a2738" uid="22755">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="YAK EOD" status="new" uuid="eac2e9af-5ffa-419c-b599-cfbd00974bc6" uid="22756">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="14" description="ESK Mungo armoured multirole transport vehicle" status="new" uuid="a41aa7e6-6ddf-4d38-9e8b-922b7b7e5617" uid="22757">
-        <cr value="1627"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Self-propelled Artillery" uuid="e2bd05c2-5269-11df-a707-080069138b88" uid="16273">
-      <subcategory value="1" description="Panzerhaubitze 2000" uuid="e2be1cb4-5269-11df-a116-080069138b88" uid="16274"/>
-      <subcategory value="2" description="M109 self-propelled 155 mm howitzer" status="new" uuid="96db5293-7f8f-4991-a1a4-b8c0080460ef" uid="22758">
-        <cr value="1627"/>
-        <specific value="1" description="M109G" status="new" uuid="c2c78da6-8faa-42ff-a5fd-66b619d47f1d" uid="22759">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="M109GEA1" status="new" uuid="c00ba6f2-5b55-4dd7-a097-43d98bf296b2" uid="22760">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="M109GEA2" status="new" uuid="8e7f0052-d3cb-4664-96b8-2f973c6f38d3" uid="22761">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-      <subcategory value="3" description="M270 Multiple Launch Rocket System (MLRS)" status="new" uuid="d4a168e9-4507-463b-af5a-b42d900ed0ff" uid="22762">
-        <cr value="1627"/>
-        <specific value="1" description="MARS (Mittleres Artillerieraketensystem)" status="new" uuid="76d03b7c-4223-4384-bded-3796872c0e4a" uid="22763">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="5" description="Towed Artillery" uuid="e2bfce56-5269-11df-bee8-080069138b88" uid="16275">
-      <subcategory value="1" description="Rheinmetal 20mm twin Rh202" deprecated="1" uuid="e2c0dee0-5269-11df-8956-080069138b88" uid="16276"/>
-    </category>
-    <category value="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)" uuid="e2c29384-5269-11df-8391-080069138b88" uid="16277">
-      <subcategory value="1" description="Wolf (Mercedes Benz G-Class 4x4)" uuid="e2c3a38c-5269-11df-8a35-080069138b88" uid="16278" status="new">
-        <cr value="1627"/>
-        <specific value="1" description="Wolf kurz offen" status="new" uuid="e8765425-6eff-43fa-bb23-bb6ff2c5315d" uid="22764">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Wolf kurz offen LL" status="new" uuid="e323fa17-3b33-4258-8113-d9ef9087740d" uid="22765">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Wolf lang offen" status="new" uuid="1ad77beb-be94-4f6b-95c9-b479f88d58e9" uid="22766">
-          <cr value="1627"/>
-        </specific>
-        <specific value="4" description="Wolf ambulance" status="new" uuid="595dea4c-d7f0-4d1a-9bdf-6966b819b87f" uid="22767">
-          <cr value="1627"/>
-        </specific>
-        <specific value="5" description="Wolf ambulance box body" status="new" uuid="3d681fe4-9e30-4857-95e8-98f0d90eab35" uid="22768">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)" uuid="e2c559d4-5269-11df-a138-080069138b88" uid="16279">
-      <subcategory value="1" description="IVECO Magirus 110-16 AWM (4x4) 5000kg truck (aka 168M11FAL)" uuid="e2c667c0-5269-11df-99ac-080069138b88" uid="16280"/>
-      <subcategory value="2" description="MAN 5 ton" uuid="e2c77836-5269-11df-b8ea-080069138b88" uid="16281"/>
-      <subcategory value="3" description="MAN 7 ton" uuid="e2c88a50-5269-11df-9fc3-080069138b88" uid="16282"/>
-      <subcategory value="4" description="MAN 10 ton" uuid="e2c99b70-5269-11df-90a3-080069138b88" uid="16283"/>
-    </category>
-    <category value="10" description="Mortar" uuid="e2cb49ca-5269-11df-9fb6-080069138b88" uid="16284">
-      <subcategory value="1" description="M113 armored mortar" uuid="e2cc57c0-5269-11df-bd48-080069138b88" uid="16285"/>
-    </category>
-    <category value="11" description="Mine plow" uuid="e2ce09b2-5269-11df-a985-080069138b88" uid="16286"/>
-    <category value="12" description="Mine rake" uuid="e2cf1c30-5269-11df-bdfe-080069138b88" uid="16287"/>
-    <category value="13" description="Mine roller" uuid="e2d024fe-5269-11df-9e95-080069138b88" uid="16288"/>
-    <category value="14" description="Cargo trailer" uuid="e2d134f2-5269-11df-a1c4-080069138b88" uid="16289">
-      <subcategory value="1" description="0 - 0.5 ton" uuid="e2d246da-5269-11df-a364-080069138b88" uid="16290"/>
-      <subcategory value="2" description="0.51 - 2 ton" uuid="e2d35520-5269-11df-aa6c-080069138b88" uid="16291"/>
-      <subcategory value="3" description="2.01 - 5 ton" uuid="e2d465dc-5269-11df-a0f0-080069138b88" uid="16292"/>
-      <subcategory value="4" description="5.02 - 10 ton" uuid="e2d57562-5269-11df-82c7-080069138b88" uid="16293"/>
-      <subcategory value="5" description="greater than 10 tons" uuid="e2d680b0-5269-11df-9278-080069138b88" uid="16294"/>
-    </category>
-    <category value="15" description="Fuel trailer" uuid="e2d8339c-5269-11df-9096-080069138b88" uid="16295">
-      <subcategory value="1" description="1-1000 gallons" uuid="e2d94444-5269-11df-b76d-080069138b88" uid="16296"/>
-      <subcategory value="2" description="1001 - 5000 gallons" uuid="e2da541a-5269-11df-95aa-080069138b88" uid="16297"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="e2db63a0-5269-11df-ac74-080069138b88" uid="16298"/>
-    </category>
-    <category value="16" description="Generator trailer" uuid="e2dd1dbc-5269-11df-b7d2-080069138b88" uid="16299">
-      <subcategory value="1" description="0 - 100 KW" uuid="e2de2f4a-5269-11df-93ee-080069138b88" uid="16300"/>
-      <subcategory value="2" description="greater than 100 KW" uuid="e2df3e62-5269-11df-b37f-080069138b88" uid="16301"/>
-    </category>
-    <category value="17" description="Water trailer" uuid="e2e0f2d4-5269-11df-a883-080069138b88" uid="16302">
-      <subcategory value="1" description="1-1000 gallons" uuid="e2e20304-5269-11df-be79-080069138b88" uid="16303"/>
-      <subcategory value="2" description="1001- 5000 gallons" uuid="e2e30f06-5269-11df-b13d-080069138b88" uid="16304"/>
-      <subcategory value="3" description="greater than 5000 gallons" uuid="e2e41f36-5269-11df-8258-080069138b88" uid="16305"/>
-    </category>
-    <category value="18" description="Engineer equipment" uuid="e2e5d29a-5269-11df-88c1-080069138b88" uid="16306">
-      <subcategory value="1" description="Mine clearing line charge" uuid="e2e6e2ca-5269-11df-a7f0-080069138b88" uid="16307"/>
-      <subcategory value="2" description="Dozer blade kit" uuid="e2e7f2aa-5269-11df-8103-080069138b88" uid="16308"/>
-      <subcategory value="3" description="Lane marking system" uuid="e2e910ea-5269-11df-8c32-080069138b88" uid="16309"/>
-    </category>
-    <category value="19" description="Heavy equipment transport trailer" uuid="e2eac55c-5269-11df-a995-080069138b88" uid="16310"/>
-    <category value="20" description="Maintenance equipment trailer" uuid="e2ebd6e0-5269-11df-8ee7-080069138b88" uid="16311">
-      <subcategory value="1" description="Welding trailer" uuid="e2ece2ce-5269-11df-b239-080069138b88" uid="16312"/>
-      <subcategory value="2" description="Compressor" uuid="e2edf4de-5269-11df-aefe-080069138b88" uid="16313"/>
-      <subcategory value="3" description="Tools/parts trailer" uuid="e2ef0450-5269-11df-83c6-080069138b88" uid="16314"/>
-    </category>
-    <category value="21" description="Limber" uuid="e2f0b94e-5269-11df-b56f-080069138b88" uid="16315"/>
-    <category value="22" description="Chemical decontamination trailer" uuid="e2f1c38e-5269-11df-9b66-080069138b88" uid="16316"/>
-    <category value="27" description="Civilian Vehicle" uuid="e2f2d44a-5269-11df-93a6-080069138b88" uid="16317">
-      <subcategory value="1" description="Truck" uuid="e2f3e358-5269-11df-ba90-080069138b88" uid="16318"/>
-      <subcategory value="2" description="Bus" uuid="e2f4f11c-5269-11df-888c-080069138b88" uid="16319"/>
-      <subcategory value="3" description="Car" uuid="e2f5ffa8-5269-11df-b3eb-080069138b88" uid="16320"/>
-    </category>
-    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="e2f7aec0-5269-11df-b033-080069138b88" uid="16321">
-      <subcategory value="1" description="Self-Propelled VSHORAD Gun/Missile System" uuid="e2f8c530-5269-11df-b8d1-080069138b88" uid="16322">
-        <specific value="1" description="Roland AD System missile" uuid="e2f9d1e6-5269-11df-aebf-080069138b88" uid="16323"/>
-        <specific value="2" description="Gepard armored AD gun" uuid="e2faef7c-5269-11df-a5ef-080069138b88" uid="16324"/>
-      </subcategory>
-      <subcategory value="2" description="Towed VSHORAD Gun / Missile System" uuid="e2fca1aa-5269-11df-a1a3-080069138b88" uid="16325">
-        <specific value="1" description="Rheinmetal 20mm twin Rh202" uuid="e2fdb252-5269-11df-9e72-080069138b88" uid="16326"/>
-      </subcategory>
-      <subcategory value="3" description="Wiesel 2 LeFlaSys (SAM)" status="new" uuid="d464faec-5218-41e0-9549-f770fcbaf746" uid="22769">
-        <cr value="1627"/>
-        <specific value="1" description="Wiesel 2 LeFlaSys BF/UF command post" status="new" uuid="ec4e1995-908b-4174-81f3-0991c699a442" uid="22770">
-          <cr value="1627"/>
-        </specific>
-        <specific value="2" description="Wiesel 2 LeFlaSys AFF air defence radar" status="new" uuid="e7a30c8b-dae5-45bc-8f69-9f31ad6d14ce" uid="22771">
-          <cr value="1627"/>
-        </specific>
-        <specific value="3" description="Wiesel 2 LeFlaSys Ozelot launcher vehicle" status="new" uuid="e7dc9c1e-660d-43a5-bcd2-b912f38c7828" uid="22772">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="78" uuid="e300a4d0-5269-11df-8411-080069138b88" uid="16327">
-    <category value="1" description="Fighter/Air Defense" uuid="e301b38e-5269-11df-a30a-080069138b88" uid="16328">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="e302c7c4-5269-11df-a178-080069138b88" uid="16329"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="e303d9fc-5269-11df-a5fa-080069138b88" uid="16330"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e304e798-5269-11df-90df-080069138b88" uid="16331"/>
-      <subcategory value="4" description="EFM (Enhanced Fighter Maneuverability) X-31A" uuid="e305fd72-5269-11df-a1e8-080069138b88" uid="16332"/>
-    </category>
-    <category value="2" description="Attack/Strike" uuid="e307b07c-5269-11df-b2a7-080069138b88" uid="16333">
-      <subcategory value="1" description="Dassault/Dornier Alpha Jet" uuid="e308c02a-5269-11df-abac-080069138b88" uid="16334">
-        <specific value="1" description="Alpha Jet E trainer/attack" uuid="e309d082-5269-11df-aea8-080069138b88" uid="16335"/>
-        <specific value="2" description="Alpha Jet MS1" uuid="e30ae21a-5269-11df-b118-080069138b88" uid="16336"/>
-        <specific value="3" description="Alpha Jet A" uuid="e30bf290-5269-11df-8a7a-080069138b88" uid="16337"/>
-        <specific value="4" description="Alpha Jet MS2" uuid="e30cfbc2-5269-11df-b67d-080069138b88" uid="16338"/>
-        <specific value="5" description="Alpha Jet 2" uuid="e30e0f30-5269-11df-98b1-080069138b88" uid="16339"/>
-      </subcategory>
-      <subcategory value="2" description="Panavia Tornado IDS" uuid="e30fbf56-5269-11df-a783-080069138b88" uid="16340">
-        <specific value="1" description="Tornado IDS GR. Mk 1" uuid="e310d0a8-5269-11df-b1a9-080069138b88" uid="16341"/>
-        <specific value="2" description="Tornado IDS GR. 1A" uuid="e311db42-5269-11df-8ed3-080069138b88" uid="16342"/>
-        <specific value="3" description="Tornado IDS GR. 4" uuid="e312ec76-5269-11df-8157-080069138b88" uid="16343"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Electronic Warfare (EW)" uuid="e315411a-5269-11df-bbca-080069138b88" uid="16344">
-      <subcategory value="1" description="Panavia Tornado ECR" uuid="e31651c2-5269-11df-b59d-080069138b88" uid="16345"/>
-    </category>
-    <category value="8" description="Surveillance/C2" uuid="e3180468-5269-11df-a626-080069138b88" uid="16346">
-      <subcategory value="1" description="Transall C-160" uuid="e3191bdc-5269-11df-94a0-080069138b88" uid="16347">
-        <specific value="1" description="C-160S. Maritime" uuid="e31a2f04-5269-11df-8ffe-080069138b88" uid="16348"/>
-        <specific value="2" description="C-160SE. Electronic" uuid="e31b3ade-5269-11df-99bc-080069138b88" uid="16349"/>
-        <specific value="3" description="C-160AAA AEW" uuid="e31c4adc-5269-11df-b5c7-080069138b88" uid="16350"/>
-      </subcategory>
-      <subcategory value="2" description="Egrett II" uuid="e31dff1c-5269-11df-8c23-080069138b88" uid="16351">
-        <specific value="1" description="Strato 1" uuid="e31f0cfe-5269-11df-a322-080069138b88" uid="16352"/>
-      </subcategory>
-    </category>
-    <category value="20" description="Attack Helicopter" uuid="e3216026-5269-11df-aa8b-080069138b88" uid="16353">
-      <subcategory value="1" description="Eurocopter BO 105/PAH-1/VBH/BSH-1" uuid="e32270e2-5269-11df-a4f2-080069138b88" uid="16354">
-        <specific value="1" description="PAH-1" uuid="e3237afa-5269-11df-84e5-080069138b88" uid="16355"/>
-        <specific value="2" description="PAH-1A1" uuid="e3248c06-5269-11df-8aeb-080069138b88" uid="16356"/>
-        <specific value="3" description="BSH" uuid="e325a050-5269-11df-b3ff-080069138b88" uid="16357"/>
-        <specific value="4" description="(deprecated)" deprecated="1" uuid="e326a950-5269-11df-a914-080069138b88" uid="16358"/>
-        <specific value="5" description="(deprecated)" deprecated="1" uuid="e327bbd8-5269-11df-8517-080069138b88" uid="16359"/>
-        <specific value="6" description="(deprecated)" deprecated="1" uuid="e328cfa0-5269-11df-be16-080069138b88" uid="16360"/>
-        <specific value="7" description="Hkp 9" uuid="e329dc56-5269-11df-9a4c-080069138b88" uid="16361"/>
-      </subcategory>
-      <subcategory value="2" description="Eurocopter Tigre" uuid="e32b8dbc-5269-11df-8c55-080069138b88" uid="16362">
-        <specific value="1" description="PAH-2" uuid="e32c9d7e-5269-11df-a958-080069138b88" uid="16363"/>
-        <specific value="2" description="HAC" uuid="e32dad72-5269-11df-96e3-080069138b88" uid="16364"/>
-        <specific value="3" description="HAP" uuid="e32eb974-5269-11df-a99f-080069138b88" uid="16365"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Utility Helicopter" uuid="e3310f58-5269-11df-8c75-080069138b88" uid="16366">
-      <subcategory value="1" description="NH 90" uuid="e3321c9a-5269-11df-a0c6-080069138b88" uid="16367">
-        <specific value="1" description="TTH 90 medium helicopter" uuid="e3332b80-5269-11df-8519-080069138b88" uid="16368"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="e334df48-5269-11df-ac9c-080069138b88" uid="16369"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e335ef32-5269-11df-bf8c-080069138b88" uid="16370"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="e336fe68-5269-11df-be27-080069138b88" uid="16371"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="e3381cf8-5269-11df-be9f-080069138b88" uid="16372"/>
-      <subcategory value="6" description="Eurocopter BO 105" uuid="e3393462-5269-11df-9517-080069138b88" uid="16373">
-        <specific value="1" description="BO 105CB" uuid="e33a3fa6-5269-11df-aa99-080069138b88" uid="16374"/>
-        <specific value="2" description="BO 105CBS" uuid="e33b4eb4-5269-11df-9aaf-080069138b88" uid="16375"/>
-      </subcategory>
-      <subcategory value="7" description="Eurocopter/Kawasaki BK 117" uuid="e33d0132-5269-11df-88a3-080069138b88" uid="16376">
-        <specific value="1" description="BK 117 M" uuid="e33e152c-5269-11df-ba85-080069138b88" uid="16377"/>
-        <specific value="2" description="NBK-117" uuid="e33f1fc6-5269-11df-85fd-080069138b88" uid="16378"/>
-      </subcategory>
-    </category>
-    <category value="22" description="Antisubmarine Warfare / Patrol Helicopter" uuid="e34173f2-5269-11df-846b-080069138b88" uid="16379">
-      <subcategory value="1" description="NH 90" uuid="e34284c2-5269-11df-87e2-080069138b88" uid="16380"/>
-      <subcategory value="2" description="NFH 90" uuid="e343947a-5269-11df-8a61-080069138b88" uid="16381"/>
-    </category>
-    <category value="40" description="Trainer" uuid="e345455e-5269-11df-9866-080069138b88" uid="16382">
-      <subcategory value="1" description="Dassault/Dornier Alpha Jet" uuid="e3465566-5269-11df-b885-080069138b88" uid="16383">
-        <specific value="1" description="Alpha Jet E" uuid="e34765f0-5269-11df-b7e6-080069138b88" uid="16384"/>
-        <specific value="2" description="Alpha Jet 3" uuid="e3487620-5269-11df-82bb-080069138b88" uid="16385"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Unmanned" status="new" uuid="a3ee974b-c841-4201-a0d4-7f6ad87dc07d" uid="22773">
-      <cr value="1627"/>
-      <subcategory value="1" description="CL 289" status="new" uuid="c48b671f-87d6-4f82-a930-9f38a9c1e1ad" uid="22774">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="2" description="EMT Luna" status="new" uuid="aeed466a-9ace-4955-8687-f82f1b895be7" uid="22775">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="3" description="EMT Aladin" status="new" uuid="845da22f-9b08-47c3-9164-c015c12a9261" uid="22776">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="4" description="RDE KZO" status="new" uuid="6c0b8214-9b2a-4534-97d8-8aa5019c5b4c" uid="22777">
-        <cr value="1627"/>
-      </subcategory>
-      <subcategory value="5" description="Northrop Grumman RQ-4 Global Hawk" status="new" uuid="29a073d7-fb52-4fbc-93dd-5818f92e6c24" uid="22778">
-        <cr value="1627"/>
-        <specific value="1" description="EuroHawk" status="new" uuid="6a2406ef-ce75-4cf1-898f-ccd7076df2c9" uid="22779">
-          <cr value="1627"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="78" uuid="e34b6a42-5269-11df-a008-080069138b88" uid="16386">
-    <category value="4" description="Guided Missile Destroyer" uuid="e34c7b26-5269-11df-99fa-080069138b88" uid="16387">
-      <subcategory value="1" description="Ex-US Modified Charles F. Adams class (type 103B) (DDGs)" uuid="e34d8778-5269-11df-aa59-080069138b88" uid="16388">
-        <specific value="1" description="D 185 Lutjens (ex-US DDG 28)" uuid="e34e9ae6-5269-11df-b5b8-080069138b88" uid="16389"/>
-        <specific value="2" description="D 186 Molders (ex-US DDG 29)" uuid="e34fad50-5269-11df-9dc3-080069138b88" uid="16390"/>
-        <specific value="3" description="D 187 Rommel (ex-US DDG 30)" uuid="e350b7ea-5269-11df-ac13-080069138b88" uid="16391"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Destroyer" uuid="e35311b6-5269-11df-bfa3-080069138b88" uid="16392">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="e3541b38-5269-11df-8c58-080069138b88" uid="16393"/>
-      <subcategory value="2" description="Hamburg class (Type 101A)" uuid="e3553022-5269-11df-ac5a-080069138b88" uid="16394">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="e3564bec-5269-11df-acfc-080069138b88" uid="16395"/>
-        <specific value="2" description="D 182 Schleswig-Hostein" uuid="e357599c-5269-11df-bd85-080069138b88" uid="16396"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided Missile Frigate" uuid="e359b2fa-5269-11df-ae59-080069138b88" uid="16397">
-      <subcategory value="1" description="Brandenburg class (Type 123)" uuid="e35abe8e-5269-11df-8413-080069138b88" uid="16398">
-        <specific value="1" description="F 215 Brandenburg" uuid="e35bd030-5269-11df-a045-080069138b88" uid="16399"/>
-        <specific value="2" description="F 216 Schleswig-Holstein" uuid="e35cdfe8-5269-11df-b383-080069138b88" uid="16400"/>
-        <specific value="3" description="F 217 Bayern" uuid="e35df086-5269-11df-9778-080069138b88" uid="16401"/>
-        <specific value="4" description="F 218 Mecklenburg-Vorpommern" uuid="e35f00a2-5269-11df-8cbb-080069138b88" uid="16402"/>
-      </subcategory>
-      <subcategory value="2" description="Bremen class (Type 122)" uuid="e360b2bc-5269-11df-a1d2-080069138b88" uid="16403">
-        <specific value="1" description="F 207 Bremen" uuid="e361c1ca-5269-11df-9201-080069138b88" uid="16404"/>
-        <specific value="2" description="F 208 Niedersachsen" uuid="e362d254-5269-11df-b595-080069138b88" uid="16405"/>
-        <specific value="3" description="F 209 Rheinland-Pfalz" uuid="e363e266-5269-11df-bb91-080069138b88" uid="16406"/>
-        <specific value="4" description="F 210 Emden" uuid="e364f1b0-5269-11df-bf42-080069138b88" uid="16407"/>
-        <specific value="5" description="F 211 Koln" uuid="e366019a-5269-11df-b008-080069138b88" uid="16408"/>
-        <specific value="6" description="F 212 Karlsruhe" uuid="e36712d8-5269-11df-a74b-080069138b88" uid="16409"/>
-        <specific value="7" description="F 213 Augsburg" uuid="e368224a-5269-11df-af7a-080069138b88" uid="16410"/>
-        <specific value="8" description="F 214 Lubeck" uuid="e3692b18-5269-11df-a29c-080069138b88" uid="16411"/>
-      </subcategory>
-      <subcategory value="3" description="Sachsen Class (Type 124) (FFG)" uuid="e36adecc-5269-11df-b4fb-080069138b88" uid="16412">
-        <specific value="1" description="F219 Sachsen" uuid="e36bef4c-5269-11df-a6d9-080069138b88" uid="16413"/>
-        <specific value="2" description="F220 Hamburg" uuid="e36d0062-5269-11df-9eec-080069138b88" uid="16414"/>
-        <specific value="3" description="F221 Hessen" uuid="e36e0962-5269-11df-b819-080069138b88" uid="16415"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/patrol craft" uuid="e37060e0-5269-11df-9ad4-080069138b88" uid="16416">
-      <subcategory value="1" description="Gepard class (type 143 A) (fast attack craft, missile)" uuid="e3716c1a-5269-11df-91bb-080069138b88" uid="16417">
-        <specific value="1" description="P 6121 Gepard" uuid="e37283c0-5269-11df-a141-080069138b88" uid="16418"/>
-        <specific value="2" description="P 6122 Puma" uuid="e3739288-5269-11df-9216-080069138b88" uid="16419"/>
-        <specific value="3" description="P 6123 Hermelin" uuid="e3749ce6-5269-11df-ad2a-080069138b88" uid="16420"/>
-        <specific value="4" description="P 6124 Nerz" uuid="e375bad6-5269-11df-9438-080069138b88" uid="16421"/>
-        <specific value="5" description="P 6125 Zobel" uuid="e376cc8c-5269-11df-9e89-080069138b88" uid="16422"/>
-        <specific value="6" description="P 6126 Frettechen" uuid="e377d65e-5269-11df-b895-080069138b88" uid="16423"/>
-        <specific value="7" description="P 6127 Dachs" uuid="e378e9a4-5269-11df-a23a-080069138b88" uid="16424"/>
-        <specific value="8" description="P 6128 Ozelot" uuid="e379fa06-5269-11df-9045-080069138b88" uid="16425"/>
-        <specific value="9" description="P 6129 Wiesel" uuid="e37b0554-5269-11df-a705-080069138b88" uid="16426"/>
-        <specific value="10" description="P 6130 Hyane" uuid="e37c13f4-5269-11df-b435-080069138b88" uid="16427"/>
-      </subcategory>
-      <subcategory value="2" description="Albatros class (type 143/143B) (fast attack craft, missile)" uuid="e37dc8d4-5269-11df-bbc6-080069138b88" uid="16428">
-        <specific value="1" description="P 6111 Albatros" uuid="e37edc6a-5269-11df-b93a-080069138b88" uid="16429"/>
-        <specific value="2" description="P 6122 Falke" uuid="e37fe880-5269-11df-9d4b-080069138b88" uid="16430"/>
-        <specific value="3" description="P 6113 Geier" uuid="e380f8e2-5269-11df-81f8-080069138b88" uid="16431"/>
-        <specific value="4" description="P 6114 Bussard" uuid="e3821ede-5269-11df-b4b9-080069138b88" uid="16432"/>
-        <specific value="5" description="P 6115 Sperber" uuid="e3832b9e-5269-11df-8188-080069138b88" uid="16433"/>
-        <specific value="6" description="P 6116 Greif" uuid="e3843c82-5269-11df-b8f7-080069138b88" uid="16434"/>
-        <specific value="7" description="P 6117 Kondor" uuid="e3854c26-5269-11df-909b-080069138b88" uid="16435"/>
-        <specific value="8" description="P 6118 Seeadler" uuid="e386563e-5269-11df-a5c9-080069138b88" uid="16436"/>
-        <specific value="9" description="P 6119 Habicht" uuid="e38764b6-5269-11df-8782-080069138b88" uid="16437"/>
-        <specific value="10" description="P 6120 Kormoran" uuid="e38876bc-5269-11df-be03-080069138b88" uid="16438"/>
-      </subcategory>
-      <subcategory value="3" description="Tiger class (type 148) (fast attack craft, missile)" uuid="e38a2386-5269-11df-b1fd-080069138b88" uid="16439">
-        <specific value="1" description="P 6141 Tiger" uuid="e38b2f10-5269-11df-ba9b-080069138b88" uid="16440"/>
-        <specific value="2" description="P 6142 Iltis" uuid="e38c415c-5269-11df-94f5-080069138b88" uid="16441"/>
-        <specific value="3" description="P 6143 Luchs" uuid="e38d4eda-5269-11df-a8ea-080069138b88" uid="16442"/>
-        <specific value="4" description="P 6144 Marder" uuid="e38e5726-5269-11df-9204-080069138b88" uid="16443"/>
-        <specific value="5" description="P 6145 Leopard" uuid="e38f6954-5269-11df-99cb-080069138b88" uid="16444"/>
-        <specific value="6" description="P 6146 Fuchs" uuid="e39077ae-5269-11df-93fc-080069138b88" uid="16445"/>
-        <specific value="7" description="P 6147 Jaguar" uuid="e3917ef6-5269-11df-a3b8-080069138b88" uid="16446"/>
-        <specific value="8" description="P 6148 Lowe" uuid="e3928d50-5269-11df-ad7d-080069138b88" uid="16447"/>
-        <specific value="9" description="P 6149 Wolf" uuid="e393a76c-5269-11df-b0af-080069138b88" uid="16448"/>
-        <specific value="10" description="P 6150 Panther" uuid="e394b288-5269-11df-a891-080069138b88" uid="16449"/>
-        <specific value="11" description="P 6151 Haher" uuid="e395c164-5269-11df-a4e2-080069138b88" uid="16450"/>
-        <specific value="12" description="P 6152 Storch" uuid="e396d342-5269-11df-a2ad-080069138b88" uid="16451"/>
-        <specific value="13" description="P 6153 Pelikan" uuid="e397e0e8-5269-11df-b6d8-080069138b88" uid="16452"/>
-        <specific value="14" description="P 6154 Elster" uuid="e398f06e-5269-11df-b32b-080069138b88" uid="16453"/>
-        <specific value="15" description="P 6155 Alk" uuid="e399fd06-5269-11df-a687-080069138b88" uid="16454"/>
-        <specific value="16" description="P 6156 Dommel" uuid="e39b0624-5269-11df-b7e1-080069138b88" uid="16455"/>
-        <specific value="17" description="P 6157 Weihe" uuid="e39c1960-5269-11df-af7e-080069138b88" uid="16456"/>
-        <specific value="18" description="P 6158 Pinguin" uuid="e39d27a6-5269-11df-98ce-080069138b88" uid="16457"/>
-        <specific value="19" description="P 6159 Reiher" uuid="e39e3010-5269-11df-82a0-080069138b88" uid="16458"/>
-        <specific value="20" description="P 6160 Kranich" uuid="e39f42f2-5269-11df-9d0b-080069138b88" uid="16459"/>
-      </subcategory>
-      <subcategory value="4" description="Bredstedt class (large patrol craft, Coast Guard vessels)" uuid="e3a0f1d8-5269-11df-a1b6-080069138b88" uid="16460">
-        <specific value="1" description="BG 21 Bredstedt" uuid="e3a20280-5269-11df-b243-080069138b88" uid="16461"/>
-      </subcategory>
-      <subcategory value="5" description="Sassnitz class (Coast Guard vessels)" uuid="e3a3b30a-5269-11df-a35f-080069138b88" uid="16462">
-        <specific value="1" description="Sassnitz (ex-P 6165, ex-591)" uuid="e3a4be58-5269-11df-9bdb-080069138b88" uid="16463"/>
-        <specific value="2" description="Sellin (ex-592)" uuid="e3a5cdac-5269-11df-9469-080069138b88" uid="16464"/>
-        <specific value="3" description="Binz (ex-593)" uuid="e3a6de9a-5269-11df-8393-080069138b88" uid="16465"/>
-      </subcategory>
-      <subcategory value="6" description="Neustadt class (large patrol craft, Coast Guard vessels)" uuid="e3a88bdc-5269-11df-9e28-080069138b88" uid="16466">
-        <specific value="1" description="BG 11 Neustadt" uuid="e3a99838-5269-11df-89b8-080069138b88" uid="16467"/>
-        <specific value="2" description="BG 12 Bad Bramstedt" uuid="e3aaaa7a-5269-11df-a498-080069138b88" uid="16468"/>
-        <specific value="3" description="BG 14 Duderstadt" uuid="e3abb8b6-5269-11df-ace2-080069138b88" uid="16469"/>
-        <specific value="4" description="BG 15 Eschwege" uuid="e3acc242-5269-11df-80cb-080069138b88" uid="16470"/>
-        <specific value="5" description="BG 16 Alsfeld" uuid="e3add362-5269-11df-8202-080069138b88" uid="16471"/>
-        <specific value="6" description="BG 17 Bayreuth" uuid="e3aee220-5269-11df-9032-080069138b88" uid="16472"/>
-        <specific value="7" description="BG 18 Rosenheim" uuid="e3afe95e-5269-11df-aa09-080069138b88" uid="16473"/>
-      </subcategory>
-      <subcategory value="7" description="Bremse class (harbor patrol craft, Coast Guard vessels)" uuid="e3b19bb4-5269-11df-b5af-080069138b88" uid="16474">
-        <specific value="1" description="GS 23" uuid="e3b2b5f8-5269-11df-8327-080069138b88" uid="16475"/>
-        <specific value="2" description="GS 30" uuid="e3b3c3ee-5269-11df-b527-080069138b88" uid="16476"/>
-        <specific value="3" description="GS 31" uuid="e3b4cbf4-5269-11df-8081-080069138b88" uid="16477"/>
-        <specific value="4" description="GS 32" uuid="e3b5dc10-5269-11df-bc5d-080069138b88" uid="16478"/>
-        <specific value="5" description="GS 40" uuid="e3b6ee34-5269-11df-a565-080069138b88" uid="16479"/>
-        <specific value="6" description="GS 41" uuid="e3b7f57c-5269-11df-8068-080069138b88" uid="16480"/>
-        <specific value="7" description="GS 42" uuid="e3b90264-5269-11df-9c10-080069138b88" uid="16481"/>
-        <specific value="8" description="GS 51" uuid="e3ba0eac-5269-11df-8ee7-080069138b88" uid="16482"/>
-        <specific value="9" description="GS 52" uuid="e3bb1bb2-5269-11df-8eb2-080069138b88" uid="16483"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship / Craft" uuid="e3bd6a3e-5269-11df-a556-080069138b88" uid="16484">
-      <subcategory value="1" description="Schutze class (type 340-341, minesweepers, coastal)" uuid="e3be7898-5269-11df-83e3-080069138b88" uid="16485">
-        <specific value="1" description="M 1059 Spica" uuid="e3bf8990-5269-11df-bcb4-080069138b88" uid="16486"/>
-        <specific value="2" description="M 1062 Schutze" uuid="e3c09862-5269-11df-bd14-080069138b88" uid="16487"/>
-        <specific value="3" description="M 1063 Waage" uuid="e3c1a07c-5269-11df-88f6-080069138b88" uid="16488"/>
-      </subcategory>
-      <subcategory value="2" description="Lindau class (coastal minesweepers and minehunters: type 331, minehunters; and type 351, Troika)" uuid="e3c354b2-5269-11df-a200-080069138b88" uid="16489">
-        <specific value="1" description="M 1070 Gottingen" uuid="e3c46abe-5269-11df-8bea-080069138b88" uid="16490"/>
-        <specific value="2" description="M 1071 Koblenz" uuid="e3c57936-5269-11df-a441-080069138b88" uid="16491"/>
-        <specific value="3" description="M 1072 Lindau" uuid="e3c6818c-5269-11df-8da2-080069138b88" uid="16492"/>
-        <specific value="4" description="M 1073 Schleswig" uuid="e3c7911c-5269-11df-b18b-080069138b88" uid="16493"/>
-        <specific value="5" description="M 1074 Tubingen" uuid="e3c8a3f4-5269-11df-8001-080069138b88" uid="16494"/>
-        <specific value="6" description="M 1075 Wetzlar" uuid="e3c9acc2-5269-11df-af36-080069138b88" uid="16495"/>
-        <specific value="7" description="M 1076 Paderborn" uuid="e3caba04-5269-11df-80ec-080069138b88" uid="16496"/>
-        <specific value="8" description="M 1077 Weilheim" uuid="e3cbcac0-5269-11df-bcf0-080069138b88" uid="16497"/>
-        <specific value="9" description="M 1078 Cuxhaven" uuid="e3ccd47e-5269-11df-a17d-080069138b88" uid="16498"/>
-        <specific value="10" description="M 1079 Duren" uuid="e3cde21a-5269-11df-964b-080069138b88" uid="16499"/>
-        <specific value="11" description="M 1080 Marburg" uuid="e3cef3ee-5269-11df-8e23-080069138b88" uid="16500"/>
-        <specific value="12" description="M 1081 Konstanz" uuid="e3cffd3e-5269-11df-b689-080069138b88" uid="16501"/>
-        <specific value="13" description="M 1082 Wolfsburg" uuid="e3d11570-5269-11df-af8d-080069138b88" uid="16502"/>
-        <specific value="14" description="M 1083 Ulm" uuid="e3d228a2-5269-11df-af2d-080069138b88" uid="16503"/>
-        <specific value="15" description="M 1085 Minden" uuid="e3d331ca-5269-11df-88e7-080069138b88" uid="16504"/>
-      </subcategory>
-      <subcategory value="3" description="Kondor II class (minesweeper, coastal)" uuid="e3d4e0ba-5269-11df-b0c4-080069138b88" uid="16505">
-        <specific value="1" description="M2670 Sommerda (ex-311)" uuid="e3d5f3e2-5269-11df-9fd4-080069138b88" uid="16506"/>
-      </subcategory>
-      <subcategory value="4" description="Frauenlob class (type 394 minesweepers, inshore)" uuid="e3d7a0f2-5269-11df-bd2b-080069138b88" uid="16507">
-        <specific value="1" description="M 2658 Frauenlob" uuid="e3d8b4b0-5269-11df-bce6-080069138b88" uid="16508"/>
-        <specific value="2" description="M 2659 Nautilus" uuid="e3d9be3c-5269-11df-9145-080069138b88" uid="16509"/>
-        <specific value="3" description="M 2660 Gefion" uuid="e3dacbce-5269-11df-800c-080069138b88" uid="16510"/>
-        <specific value="4" description="M 2661 Medusa" uuid="e3dbd992-5269-11df-933b-080069138b88" uid="16511"/>
-        <specific value="5" description="M 2662 Undine" uuid="e3dce742-5269-11df-aa73-080069138b88" uid="16512"/>
-        <specific value="6" description="M 2663 Minerva" uuid="e3ddf66e-5269-11df-8fa2-080069138b88" uid="16513"/>
-        <specific value="7" description="M 2664 Diana" uuid="e3df0324-5269-11df-8ccc-080069138b88" uid="16514"/>
-        <specific value="8" description="M 2665 Loreley" uuid="e3e00cb0-5269-11df-a01c-080069138b88" uid="16515"/>
-        <specific value="9" description="M 2666 Atlantis" uuid="e3e11eb6-5269-11df-8253-080069138b88" uid="16516"/>
-        <specific value="10" description="M 2667" uuid="e3e22d88-5269-11df-80d7-080069138b88" uid="16517"/>
-      </subcategory>
-      <subcategory value="5" description="Ariadne Class (Type 393 minesweepers, inshore)" uuid="e3e3da0c-5269-11df-aa36-080069138b88" uid="16518">
-        <specific value="1" description="M 2651 Freya" uuid="e3e4e884-5269-11df-a032-080069138b88" uid="16519"/>
-        <specific value="2" description="M 2653 Hertha" uuid="e3e5f6f2-5269-11df-a927-080069138b88" uid="16520"/>
-        <specific value="3" description="M 2654 Nymphe" uuid="e3e704f2-5269-11df-9f28-080069138b88" uid="16521"/>
-        <specific value="4" description="M 2655 Hertha" uuid="e3e8111c-5269-11df-9f20-080069138b88" uid="16522"/>
-      </subcategory>
-      <subcategory value="6" description="Frankenthal class (type 332 minehunters, coastal)" uuid="e3e9c00c-5269-11df-97d1-080069138b88" uid="16523">
-        <specific value="1" description="M 1060 Weiden" uuid="e3ead028-5269-11df-8866-080069138b88" uid="16524"/>
-        <specific value="2" description="M 1061 Rottweil" uuid="e3ebe15c-5269-11df-acc0-080069138b88" uid="16525"/>
-        <specific value="3" description="M 1062 Sulzbach-Rosenberg" uuid="e3ece9d0-5269-11df-968d-080069138b88" uid="16526"/>
-        <specific value="4" description="M 1063 Bad Bevensen" uuid="e3edfbae-5269-11df-8772-080069138b88" uid="16527"/>
-        <specific value="5" description="M 1064 Gromitz" uuid="e3ef0c6a-5269-11df-91e5-080069138b88" uid="16528"/>
-        <specific value="6" description="M 1065 Dillingen" uuid="e3f01d30-5269-11df-a6a7-080069138b88" uid="16529"/>
-        <specific value="7" description="M 1066 Frankenthal" uuid="e3f12e1e-5269-11df-9adf-080069138b88" uid="16530"/>
-        <specific value="8" description="M 1067 Bad Rappenau" uuid="e3f23ed0-5269-11df-ab7e-080069138b88" uid="16531"/>
-        <specific value="9" description="M 1068 Datteln" uuid="e3f34dfc-5269-11df-952a-080069138b88" uid="16532"/>
-        <specific value="10" description="M 1069 Homburg" uuid="e3f45be8-5269-11df-b8cb-080069138b88" uid="16533"/>
-      </subcategory>
-      <subcategory value="7" description="Hameln class (type 343 minesweepers, coastal)" uuid="e3f60aa6-5269-11df-a8d0-080069138b88" uid="16534">
-        <specific value="1" description="M 1090 Pegnitz" uuid="e3f71e5a-5269-11df-bb06-080069138b88" uid="16535"/>
-        <specific value="2" description="M 1091 Kulmbach" uuid="e3f827e6-5269-11df-8b3d-080069138b88" uid="16536"/>
-        <specific value="3" description="M 1092 Hameln" uuid="e3f93596-5269-11df-8fef-080069138b88" uid="16537"/>
-        <specific value="4" description="M 1093 Auerbach" uuid="e3fa4634-5269-11df-b1a9-080069138b88" uid="16538"/>
-        <specific value="5" description="M 1094 Ensdorf" uuid="e3fb53a8-5269-11df-81cc-080069138b88" uid="16539"/>
-        <specific value="6" description="M 1095 Uberherrn" uuid="e3fc61e4-5269-11df-8f25-080069138b88" uid="16540"/>
-        <specific value="7" description="M 1096 Passau" uuid="e3fd6ff8-5269-11df-aada-080069138b88" uid="16541"/>
-        <specific value="8" description="M 1097 Laboe" uuid="e3fe78c6-5269-11df-96f1-080069138b88" uid="16542"/>
-        <specific value="9" description="M 1098 Siegburg" uuid="e3ff8afe-5269-11df-a1e6-080069138b88" uid="16543"/>
-        <specific value="10" description="M 1099 Herten" uuid="e4009886-5269-11df-9be7-080069138b88" uid="16544"/>
-      </subcategory>
-      <subcategory value="8" description="Trials ship (type 740, ex-minesweeper)" uuid="e402469a-5269-11df-9505-080069138b88" uid="16545">
-        <specific value="1" description="A 1400 Holnis (ex-A 836)" uuid="e4035620-5269-11df-ac70-080069138b88" uid="16546"/>
-      </subcategory>
-      <subcategory value="9" description="Schutze class (type 732, diver-support ship)" uuid="e4050646-5269-11df-a9e7-080069138b88" uid="16547">
-        <specific value="1" description="M 1053 Stier (ex-Y 849)" uuid="e4061518-5269-11df-b30d-080069138b88" uid="16548"/>
-      </subcategory>
-      <subcategory value="10" description="Sachsenwald class (type 762, mine transport)" uuid="e407c7a0-5269-11df-bab1-080069138b88" uid="16549">
-        <specific value="1" description="A 1438 Steigerwald" uuid="e408d852-5269-11df-ac37-080069138b88" uid="16550"/>
-      </subcategory>
-      <subcategory value="11" description="Kondor I class (minesweeper/patrol craft; Coast Guard vessels)" uuid="e40a89e0-5269-11df-aa82-080069138b88" uid="16551">
-        <specific value="1" description="BG 31 Templin (ex-GS 06, ex-G 442)" uuid="e40b9722-5269-11df-97e1-080069138b88" uid="16552"/>
-        <specific value="2" description="BG 32 Kuhlungsborn (ex-GS 07, ex-G 445)" uuid="e40ca694-5269-11df-9e1c-080069138b88" uid="16553"/>
-        <specific value="3" description="BG 33 Ahrenshoop (ex-GS 08, ex-G 415)" uuid="e40db868-5269-11df-8878-080069138b88" uid="16554"/>
-        <specific value="4" description="GS 01 Uckermunde (ex-G 411)" uuid="e40ece56-5269-11df-9230-080069138b88" uid="16555"/>
-        <specific value="5" description="GS 02 Demmin (ex-G 422)" uuid="e40fe28c-5269-11df-8cc2-080069138b88" uid="16556"/>
-        <specific value="6" description="GS 03 Malchin (ex-G 441)" uuid="e410f17c-5269-11df-9473-080069138b88" uid="16557"/>
-        <specific value="7" description="GS 04 Altentreptow (ex-G 414)" uuid="e411fe5a-5269-11df-83ce-080069138b88" uid="16558"/>
-        <specific value="8" description="GS 05 Pasewalk (ex-G 423)" uuid="e41316f0-5269-11df-b5cd-080069138b88" uid="16559"/>
-        <specific value="9" description="GS 09 Boltenhagen (ex-G 443)" uuid="e414268a-5269-11df-8633-080069138b88" uid="16560"/>
-      </subcategory>
-      <subcategory value="12" description="Seehund (Minesweepers - Drones)(MSD)" uuid="e415d5de-5269-11df-a2e7-080069138b88" uid="16561"/>
-    </category>
-    <category value="11" description="Landing Craft" uuid="e417899c-5269-11df-b33c-080069138b88" uid="16562">
-      <subcategory value="1" description="Type 521 (LCMs)" uuid="e4189274-5269-11df-ad3a-080069138b88" uid="16563">
-        <specific value="1" description="LCM 12 Sprotte" uuid="e419a2ea-5269-11df-ae7c-080069138b88" uid="16564"/>
-        <specific value="2" description="LCM 13 Sardine" uuid="e41ab126-5269-11df-b9b9-080069138b88" uid="16565"/>
-        <specific value="3" description="LCM 14 Sardelle" uuid="e41bbe72-5269-11df-a8cc-080069138b88" uid="16566"/>
-        <specific value="4" description="LCM 15 Hering" uuid="e41ccdbc-5269-11df-8fb6-080069138b88" uid="16567"/>
-        <specific value="5" description="LCM 16 Orfe" uuid="e41ddbee-5269-11df-8d3b-080069138b88" uid="16568"/>
-        <specific value="6" description="LCM 17 Marane" uuid="e41eea52-5269-11df-9b92-080069138b88" uid="16569"/>
-        <specific value="7" description="LCM 18 Saibling" uuid="e41ff9a6-5269-11df-be15-080069138b88" uid="16570"/>
-        <specific value="8" description="LCM 19 Stint" uuid="e42107f6-5269-11df-bab3-080069138b88" uid="16571"/>
-        <specific value="9" description="LCM 20 Aesche" uuid="e4221196-5269-11df-a5db-080069138b88" uid="16572"/>
-        <specific value="10" description="L 780 Hummer" uuid="e423222a-5269-11df-9302-080069138b88" uid="16573"/>
-        <specific value="11" description="L 781 Krill" uuid="e4243534-5269-11df-bb50-080069138b88" uid="16574"/>
-        <specific value="12" description="L 782 Krabbe" uuid="e4253e3e-5269-11df-bf0c-080069138b88" uid="16575"/>
-        <specific value="13" description="L 783 Auster" uuid="e4264be4-5269-11df-a65f-080069138b88" uid="16576"/>
-        <specific value="14" description="L 784 Muschel" uuid="e4275cb4-5269-11df-983a-080069138b88" uid="16577"/>
-        <specific value="15" description="L 785 Koralle" uuid="e42868ca-5269-11df-a45d-080069138b88" uid="16578"/>
-        <specific value="16" description="L 786 Garnele" uuid="e4297710-5269-11df-8010-080069138b88" uid="16579"/>
-        <specific value="17" description="L 787 Languste" uuid="e42a886c-5269-11df-8ba6-080069138b88" uid="16580"/>
-      </subcategory>
-      <subcategory value="2" description="Type 520 (LCUs)" uuid="e42c39b4-5269-11df-a159-080069138b88" uid="16581">
-        <specific value="1" description="L 760 Flunder" uuid="e42d4c00-5269-11df-b963-080069138b88" uid="16582"/>
-        <specific value="2" description="L 761 Karpfen" uuid="e42e5a14-5269-11df-8b19-080069138b88" uid="16583"/>
-        <specific value="3" description="L 762 Lachs" uuid="e42f6940-5269-11df-8a0e-080069138b88" uid="16584"/>
-        <specific value="4" description="L 763 Plotze" uuid="e43076dc-5269-11df-9157-080069138b88" uid="16585"/>
-        <specific value="5" description="L 766 Stor" uuid="e4318720-5269-11df-9a8a-080069138b88" uid="16586"/>
-        <specific value="6" description="L 767 Tummler" uuid="e432958e-5269-11df-bd02-080069138b88" uid="16587"/>
-        <specific value="7" description="L 768 Wels" uuid="e433a26c-5269-11df-ad96-080069138b88" uid="16588"/>
-        <specific value="8" description="L 769 Zander" uuid="e434b224-5269-11df-a3d3-080069138b88" uid="16589"/>
-        <specific value="9" description="L 788 Butt" uuid="e435c128-5269-11df-82cc-080069138b88" uid="16590"/>
-        <specific value="10" description="L 795 Inger" uuid="e436c938-5269-11df-8e63-080069138b88" uid="16591"/>
-      </subcategory>
-      <subcategory value="3" description="Mannheim 59 class (river landing craft, LCMs)" uuid="e4387d14-5269-11df-a1a7-080069138b88" uid="16592"/>
-      <subcategory value="4" description="Bodan class (river landing craft, LCMs)" uuid="e4398f9c-5269-11df-b1cb-080069138b88" uid="16593"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="e43b3ea0-5269-11df-8616-080069138b88" uid="16594">
-      <subcategory value="1" description="Elbe class (type 404, tenders)" uuid="e43c4cd2-5269-11df-97fc-080069138b88" uid="16595">
-        <specific value="1" description="A 511 Elbe" uuid="e43d5bf4-5269-11df-8d4c-080069138b88" uid="16596"/>
-        <specific value="2" description="A 512 Mosel" uuid="e43e6a76-5269-11df-bc4d-080069138b88" uid="16597"/>
-        <specific value="3" description="A 513 Rhein" uuid="e43f7934-5269-11df-91cb-080069138b88" uid="16598"/>
-        <specific value="4" description="A 514 Werra" uuid="e44080c2-5269-11df-80d2-080069138b88" uid="16599"/>
-        <specific value="5" description="A 515 Main" uuid="e44191ec-5269-11df-bbdd-080069138b88" uid="16600"/>
-        <specific value="6" description="A 516 Donau" uuid="e442a47e-5269-11df-9a81-080069138b88" uid="16601"/>
-      </subcategory>
-      <subcategory value="2" description="Rhein class (type 401, tenders)" uuid="e44450bc-5269-11df-955c-080069138b88" uid="16602">
-        <specific value="1" description="A 58 Rhein" uuid="e4455c0a-5269-11df-b16b-080069138b88" uid="16603"/>
-        <specific value="2" description="A 61 Elbe" uuid="e4466ed8-5269-11df-99c3-080069138b88" uid="16604"/>
-        <specific value="3" description="A 63 Main" uuid="e4477d28-5269-11df-a59b-080069138b88" uid="16605"/>
-        <specific value="4" description="A 69 Donau" uuid="e448852e-5269-11df-bf02-080069138b88" uid="16606"/>
-      </subcategory>
-      <subcategory value="3" description="Replenishment tankers (type 704)" uuid="e44a35e0-5269-11df-9c0f-080069138b88" uid="16607">
-        <specific value="1" description="A 1442 Spessart (ex-Okapi)" uuid="e44b467e-5269-11df-b032-080069138b88" uid="16608"/>
-        <specific value="2" description="A 1443 Rhon (ex-Okene)" uuid="e44c5e92-5269-11df-a09e-080069138b88" uid="16609"/>
-      </subcategory>
-      <subcategory value="4" description="Walchensee class (type 703, replenishment tankers)" uuid="e44e125a-5269-11df-bef5-080069138b88" uid="16610">
-        <specific value="1" description="A 1424 Walchensee" uuid="e44f1eb6-5269-11df-8800-080069138b88" uid="16611"/>
-        <specific value="2" description="A 1425 Ammersee" uuid="e4502e64-5269-11df-aebc-080069138b88" uid="16612"/>
-        <specific value="3" description="A 1426 Tegernsee" uuid="e451438a-5269-11df-9ae4-080069138b88" uid="16613"/>
-        <specific value="4" description="A 1427 Westensee" uuid="e452511c-5269-11df-833b-080069138b88" uid="16614"/>
-      </subcategory>
-      <subcategory value="5" description="Type 763 (support tanker)" uuid="e45403a4-5269-11df-8cdc-080069138b88" uid="16615">
-        <specific value="1" description="A 1407 Wittensee (ex-Sioux)" uuid="e456fc30-5269-11df-a987-080069138b88" uid="16616"/>
-      </subcategory>
-      <subcategory value="6" description="Luneburg class (type 701, support ships)" uuid="e458b9ee-5269-11df-804b-080069138b88" uid="16617">
-        <specific value="1" description="A 1411 Luneburg" uuid="e459cd66-5269-11df-be7a-080069138b88" uid="16618"/>
-        <specific value="2" description="A 1413 Freiburg" uuid="e45addaa-5269-11df-8dc5-080069138b88" uid="16619"/>
-        <specific value="3" description="A 1414 Glucksburg" uuid="e45beb78-5269-11df-af21-080069138b88" uid="16620"/>
-        <specific value="4" description="A 1415 Saarburg" uuid="e45cfb8a-5269-11df-9b0e-080069138b88" uid="16621"/>
-        <specific value="5" description="A 1416 Nienburg" uuid="e45e0c46-5269-11df-919e-080069138b88" uid="16622"/>
-        <specific value="6" description="A 1417 Offenburg" uuid="e45f1992-5269-11df-adfc-080069138b88" uid="16623"/>
-        <specific value="7" description="A 1418 Meersburg" uuid="e46029ea-5269-11df-83f7-080069138b88" uid="16624"/>
-      </subcategory>
-      <subcategory value="7" description="Westerwald class (type 760, ammunition, transports)" uuid="e461d97a-5269-11df-83d8-080069138b88" uid="16625">
-        <specific value="1" description="A 1435 Westerwald" uuid="e462ed74-5269-11df-9aa3-080069138b88" uid="16626"/>
-        <specific value="2" description="A 1436 Odenwald" uuid="e463f64c-5269-11df-8364-080069138b88" uid="16627"/>
-      </subcategory>
-      <subcategory value="8" description="Towing launches (type 946)" uuid="e465a550-5269-11df-b355-080069138b88" uid="16628">
-        <specific value="1" description="AK 1 Y 1671" uuid="e466b83c-5269-11df-b071-080069138b88" uid="16629"/>
-        <specific value="2" description="AK 3 Y 1672" uuid="e467c6f0-5269-11df-bef6-080069138b88" uid="16630"/>
-        <specific value="3" description="MA 2 Y 1676" uuid="e468cf32-5269-11df-af67-080069138b88" uid="16631"/>
-        <specific value="4" description="MA 3 Y 1677" uuid="e469e2f0-5269-11df-91a5-080069138b88" uid="16632"/>
-        <specific value="5" description="Borby Y 1687" uuid="e46afbc2-5269-11df-b470-080069138b88" uid="16633"/>
-      </subcategory>
-      <subcategory value="9" description="Oste Class (type 423, AGI)" uuid="e46caa30-5269-11df-9a21-080069138b88" uid="16634">
-        <specific value="1" description="A 50 Alster" uuid="e46db6e6-5269-11df-a393-080069138b88" uid="16635"/>
-        <specific value="2" description="A 52 Oste" uuid="e46ec66c-5269-11df-bc7e-080069138b88" uid="16636"/>
-        <specific value="3" description="A 53 Oker" uuid="e46fd4f8-5269-11df-bc54-080069138b88" uid="16637"/>
-      </subcategory>
-      <subcategory value="10" description="Trials ship (type 742)" uuid="e471860e-5269-11df-9732-080069138b88" uid="16638">
-        <specific value="1" description="A 1410 Walther Von Ledebur (ex-Y 841)" uuid="e4728fea-5269-11df-b1bb-080069138b88" uid="16639"/>
-      </subcategory>
-      <subcategory value="11" description="Research ship (type 750)" uuid="e4743fe8-5269-11df-90ab-080069138b88" uid="16640">
-        <specific value="1" description="A 1450 Planet" uuid="e4755252-5269-11df-98d7-080069138b88" uid="16641"/>
-      </subcategory>
-      <subcategory value="12" description="Trials ship (type 741)" uuid="e476fefe-5269-11df-853c-080069138b88" uid="16642">
-        <specific value="1" description="A 1408 SP 1 (ex-A 837)" uuid="e4780f10-5269-11df-ac0e-080069138b88" uid="16643"/>
-        <specific value="2" description="A 1409 Wilhelm Pullwer (ex-Y 838)" uuid="e4791cb6-5269-11df-a014-080069138b88" uid="16644"/>
-      </subcategory>
-      <subcategory value="13" description="Diving tender (type 732)" uuid="e47acbba-5269-11df-ae4f-080069138b88" uid="16645">
-        <specific value="1" description="M 1050 TB1" uuid="e47bda1e-5269-11df-8156-080069138b88" uid="16646"/>
-      </subcategory>
-      <subcategory value="14" description="Helgoland class (type 720, salvage tugs)" uuid="e47d8c56-5269-11df-9c3f-080069138b88" uid="16647">
-        <specific value="1" description="A 1457 Helgoland" uuid="e47e9c9a-5269-11df-9774-080069138b88" uid="16648"/>
-        <specific value="2" description="A 1458 Fehmarn" uuid="e47fa996-5269-11df-8c58-080069138b88" uid="16649"/>
-      </subcategory>
-      <subcategory value="15" description="Wangerooge class (type 722, type 754; tugs)" uuid="e4815b4c-5269-11df-9371-080069138b88" uid="16650">
-        <specific value="1" description="A 1439 Baltrum" uuid="e4826b04-5269-11df-ad92-080069138b88" uid="16651"/>
-        <specific value="2" description="A 1440 Juist" uuid="e48379ae-5269-11df-b04c-080069138b88" uid="16652"/>
-        <specific value="3" description="A 1441 Langeoog" uuid="e4848646-5269-11df-aa97-080069138b88" uid="16653"/>
-        <specific value="4" description="A 1451 Wangerooge" uuid="e485940a-5269-11df-a0e5-080069138b88" uid="16654"/>
-        <specific value="5" description="A 1452 Spiekeroog" uuid="e486a2e6-5269-11df-b5be-080069138b88" uid="16655"/>
-        <specific value="6" description="A 1455 Rderney" uuid="e487b1fe-5269-11df-93bb-080069138b88" uid="16656"/>
-      </subcategory>
-      <subcategory value="16" description="Berlin Class (Type 702)(AOR)" uuid="e48968dc-5269-11df-b4f1-080069138b88" uid="16657">
-        <specific value="1" description="A1411 Berlin" uuid="e48a78f8-5269-11df-906b-080069138b88" uid="16658"/>
-      </subcategory>
-    </category>
-    <category value="17" description="Auxiliary, Merchant Marine" uuid="e48cc8ec-5269-11df-b8fb-080069138b88" uid="16659">
-      <subcategory value="1" description="Harbor tugs (type 724)" uuid="e48dd912-5269-11df-a14c-080069138b88" uid="16660">
-        <specific value="1" description="Y 820 Sylt" uuid="e48eec3a-5269-11df-b1d6-080069138b88" uid="16661"/>
-        <specific value="2" description="Y 821 Fohr" uuid="e48ff9d6-5269-11df-8730-080069138b88" uid="16662"/>
-        <specific value="3" description="Y 822 Amrum" uuid="e4910312-5269-11df-a433-080069138b88" uid="16663"/>
-        <specific value="4" description="Y 823 Neuwerk" uuid="e49214a0-5269-11df-a3bd-080069138b88" uid="16664"/>
-        <specific value="5" description="Y 1680 Neuende" uuid="e493234a-5269-11df-9b0e-080069138b88" uid="16665"/>
-        <specific value="6" description="Y 1681 Heppens" uuid="e4942ce0-5269-11df-9fc5-080069138b88" uid="16666"/>
-        <specific value="7" description="Y 1682 Ellerbek" uuid="e4953c8e-5269-11df-a517-080069138b88" uid="16667"/>
-      </subcategory>
-      <subcategory value="2" description="Harbor tugs (type 725)" uuid="e496eeb2-5269-11df-a10f-080069138b88" uid="16668">
-        <specific value="1" description="Y 812 Lutjehorn" uuid="e497fd70-5269-11df-92b3-080069138b88" uid="16669"/>
-        <specific value="2" description="Y 814 Knechtsand" uuid="e4990594-5269-11df-a02f-080069138b88" uid="16670"/>
-        <specific value="3" description="Y 815 Scharhorn" uuid="e49a15a6-5269-11df-af1f-080069138b88" uid="16671"/>
-        <specific value="4" description="Y 816 Vogelsand" uuid="e49b2874-5269-11df-bb44-080069138b88" uid="16672"/>
-        <specific value="5" description="Y 817 Rdstrand" uuid="e49c3070-5269-11df-8f11-080069138b88" uid="16673"/>
-        <specific value="6" description="Y 819 Langeness" uuid="e49d3f88-5269-11df-8536-080069138b88" uid="16674"/>
-      </subcategory>
-      <subcategory value="3" description="Harbor tugs (type 414)" uuid="e49ef15c-5269-11df-844f-080069138b88" uid="16675">
-        <specific value="1" description="Koos (ex-Delphin)" uuid="e4a00006-5269-11df-9eb7-080069138b88" uid="16676"/>
-        <specific value="2" description="Wustrow (ex-Zander)" uuid="e4a10938-5269-11df-906a-080069138b88" uid="16677"/>
-        <specific value="3" description="Drankse (ex-Kormoran)" uuid="e4a21c24-5269-11df-9d1d-080069138b88" uid="16678"/>
-        <specific value="4" description="Y 1651 (ex-A 08)" uuid="e4a32bc8-5269-11df-b991-080069138b88" uid="16679"/>
-        <specific value="5" description="Y 1656 (ex-A 45)" uuid="e4a434f0-5269-11df-969a-080069138b88" uid="16680"/>
-        <specific value="6" description="Y 1658 (ex-A 68)" uuid="e4a541b0-5269-11df-9295-080069138b88" uid="16681"/>
-      </subcategory>
-      <subcategory value="4" description="Icebreaking tug (type 724; Coast Guard vessels)" uuid="e4a6f442-5269-11df-8f57-080069138b88" uid="16682">
-        <specific value="1" description="BG 5 Rettin" uuid="e4a80ddc-5269-11df-9bce-080069138b88" uid="16683"/>
-      </subcategory>
-    </category>
-    <category value="18" description="Utility" uuid="e4aa5c2c-5269-11df-a88a-080069138b88" uid="16684">
-      <subcategory value="1" description="Gustav Konigs class (harbor tankers)" uuid="e4ab69d2-5269-11df-85af-080069138b88" uid="16685">
-        <specific value="1" description="Y 1652 Kolpinsee (ex-C 11)" uuid="e4ac7962-5269-11df-944d-080069138b88" uid="16686"/>
-        <specific value="2" description="Y 1657 Fleesensee (ex-C 40)" uuid="e4ad8a14-5269-11df-ba61-080069138b88" uid="16687"/>
-      </subcategory>
-      <subcategory value="2" description="Ohre class (accommodation ships)" uuid="e4af3b0c-5269-11df-ae84-080069138b88" uid="16688">
-        <specific value="1" description="Y 890 Vogtland (ex-H 71)" uuid="e4b04ac4-5269-11df-ad3e-080069138b88" uid="16689"/>
-        <specific value="2" description="Y 891 Altmark (ex-H 11)" uuid="e4b159f0-5269-11df-80b0-080069138b88" uid="16690"/>
-        <specific value="3" description="Y 892 Havelland (ex-H 51)" uuid="e4b29586-5269-11df-bffb-080069138b88" uid="16691"/>
-        <specific value="4" description="Y 893 Uckermark (ex-H 91)" uuid="e4b3aa02-5269-11df-b71e-080069138b88" uid="16692"/>
-        <specific value="5" description="Y 894 Borde (ex-H 72)" uuid="e4b4b8f2-5269-11df-a730-080069138b88" uid="16693"/>
-        <specific value="6" description="Y 895 Wische (ex-H 31)" uuid="e4b5c7ba-5269-11df-858d-080069138b88" uid="16694"/>
-      </subcategory>
-      <subcategory value="3" description="Type 705 (water boats)" uuid="e4b776be-5269-11df-8e4c-080069138b88" uid="16695">
-        <specific value="1" description="FW 1 A 1403 (ex-Y 864)" uuid="e4b889fa-5269-11df-9585-080069138b88" uid="16696"/>
-        <specific value="2" description="FW 5 A 1405 (ex-Y 868)" uuid="e4b99548-5269-11df-8228-080069138b88" uid="16697"/>
-      </subcategory>
-      <subcategory value="4" description="Knurrhahn Class (type 730, accommodation ship)" uuid="e4bb42a8-5269-11df-be00-080069138b88" uid="16698">
-        <specific value="1" description="Y 811 Knurrhahn" uuid="e4bc54ae-5269-11df-a80a-080069138b88" uid="16699"/>
-      </subcategory>
-      <subcategory value="5" description="Battery-charging craft (type 718)" uuid="e4be08e4-5269-11df-af45-080069138b88" uid="16700">
-        <specific value="1" description="LP 1" uuid="e4bf17f2-5269-11df-bab9-080069138b88" uid="16701"/>
-        <specific value="2" description="LP 2" uuid="e4c01f6c-5269-11df-a076-080069138b88" uid="16702"/>
-        <specific value="3" description="Y 1690 LP 3" uuid="e4c12f7e-5269-11df-990e-080069138b88" uid="16703"/>
-      </subcategory>
-      <subcategory value="6" description="Schwedeneck class (type 748, multipurpose)" uuid="e4c2e288-5269-11df-97fa-080069138b88" uid="16704">
-        <specific value="1" description="Y 860 Schwedeneck" uuid="e4c3f290-5269-11df-a32e-080069138b88" uid="16705"/>
-        <specific value="2" description="Y 861 Kronsort" uuid="e4c4fabe-5269-11df-a45c-080069138b88" uid="16706"/>
-        <specific value="3" description="Y 862 Helmsand" uuid="e4c60ab2-5269-11df-a8f4-080069138b88" uid="16707"/>
-      </subcategory>
-      <subcategory value="7" description="Stollergrund class (type 745, multipurpose)" uuid="e4c7c6d6-5269-11df-996e-080069138b88" uid="16708">
-        <specific value="1" description="Y 863 Stollergrund" uuid="e4c8d774-5269-11df-afad-080069138b88" uid="16709"/>
-        <specific value="2" description="Y 864 Mittelgrund" uuid="e4c9e146-5269-11df-ac74-080069138b88" uid="16710"/>
-        <specific value="3" description="Y 865 Kalkgrund" uuid="e4caf1a8-5269-11df-baa8-080069138b88" uid="16711"/>
-        <specific value="4" description="Y 866 Breitgrund" uuid="e4cc044e-5269-11df-ba09-080069138b88" uid="16712"/>
-        <specific value="5" description="Y 867 Bant" uuid="e4cd0c90-5269-11df-931a-080069138b88" uid="16713"/>
-      </subcategory>
-      <subcategory value="8" description="Trials ship (type 740)" uuid="e4ceba40-5269-11df-944c-080069138b88" uid="16714">
-        <specific value="1" description="Y 871 Heinz Roggenkamp" uuid="e4cfcb9c-5269-11df-b41b-080069138b88" uid="16715"/>
-      </subcategory>
-      <subcategory value="9" description="Floating docks (types 712-715) and cranes (type 711)" uuid="e4d17dca-5269-11df-979f-080069138b88" uid="16716">
-        <specific value="1" description="A Y 842 Schwimmdocks" uuid="e4d28dbe-5269-11df-b87a-080069138b88" uid="16717"/>
-        <specific value="2" description="Y 875 Hiev" uuid="e4d39a10-5269-11df-b862-080069138b88" uid="16718"/>
-        <specific value="3" description="B Y 879 Schwimmdocks" uuid="e4d4a888-5269-11df-bb18-080069138b88" uid="16719"/>
-        <specific value="4" description="Y 876 Griep" uuid="e4d5b764-5269-11df-a7d0-080069138b88" uid="16720"/>
-        <specific value="5" description="c, 2 and 3" uuid="e4d6c21c-5269-11df-9180-080069138b88" uid="16721"/>
-      </subcategory>
-      <subcategory value="10" description="Tank cleaning vessels (type 710)" uuid="e4d87008-5269-11df-b8a3-080069138b88" uid="16722">
-        <specific value="1" description="Y 1641 Forde" uuid="e4d98178-5269-11df-8942-080069138b88" uid="16723"/>
-        <specific value="2" description="Y 1642 Jade" uuid="e4da9306-5269-11df-a85d-080069138b88" uid="16724"/>
-      </subcategory>
-      <subcategory value="11" description="Trial boat (type 740)" uuid="e4dc3ed6-5269-11df-ae2d-080069138b88" uid="16725">
-        <specific value="1" description="Y 1689 Bums" uuid="e4dd4ccc-5269-11df-81f6-080069138b88" uid="16726"/>
-      </subcategory>
-      <subcategory value="12" description="General service launches (types 740, 743, 744, 744a)" uuid="e4defc52-5269-11df-85d8-080069138b88" uid="16727">
-        <specific value="1" description="Y 1670 MT-BOOT" uuid="e4e00d86-5269-11df-9084-080069138b88" uid="16728"/>
-        <specific value="2" description="Y 1673 AK 5" uuid="e4e11bc2-5269-11df-9b67-080069138b88" uid="16729"/>
-        <specific value="3" description="Y 1674 AK 6" uuid="e4e2290e-5269-11df-a72d-080069138b88" uid="16730"/>
-        <specific value="4" description="Y 1675 AM 8" uuid="e4e3370e-5269-11df-8bef-080069138b88" uid="16731"/>
-        <specific value="5" description="Y 1679 AM 7" uuid="e4e44612-5269-11df-b836-080069138b88" uid="16732"/>
-        <specific value="6" description="Y 1683 AK 6" uuid="e4e55c1e-5269-11df-831d-080069138b88" uid="16733"/>
-        <specific value="7" description="Y 1684 Peter Bachmann" uuid="e4e66cda-5269-11df-aa7a-080069138b88" uid="16734"/>
-        <specific value="8" description="Y 1686 AK 2 Y" uuid="e4e77c4c-5269-11df-8702-080069138b88" uid="16735"/>
-      </subcategory>
-      <subcategory value="13" description="Range-safety craft (5 type 369, 1 type 909)" uuid="e4e92d4e-5269-11df-a109-080069138b88" uid="16736">
-        <specific value="1" description="Y 827 KW 15" uuid="e4ea37fc-5269-11df-bd32-080069138b88" uid="16737"/>
-        <specific value="2" description="Y 830 KW 16" uuid="e4eb4778-5269-11df-9bb7-080069138b88" uid="16738"/>
-        <specific value="3" description="Y 845 KW 17" uuid="e4ec57f8-5269-11df-b8f0-080069138b88" uid="16739"/>
-        <specific value="4" description="Y 832 KW 18" uuid="e4ed6184-5269-11df-bd8b-080069138b88" uid="16740"/>
-        <specific value="5" description="Y 846 KW 20" uuid="e4ee7182-5269-11df-a3a1-080069138b88" uid="16741"/>
-        <specific value="6" description="Y 857 H 11" uuid="e4ef8126-5269-11df-8e46-080069138b88" uid="16742"/>
-      </subcategory>
-      <subcategory value="14" description="Twin-hull oil-recovery ships (type 738)" uuid="e4f13034-5269-11df-a4df-080069138b88" uid="16743">
-        <specific value="1" description="Y 1643 Bottsand" uuid="e4f23d4e-5269-11df-96e8-080069138b88" uid="16744"/>
-        <specific value="2" description="Y 1644 Eversand" uuid="e4f34c70-5269-11df-9664-080069138b88" uid="16745"/>
-      </subcategory>
-      <subcategory value="15" description="Torpedo recovery vessels (type 430A)" uuid="e4f4fac0-5269-11df-9f40-080069138b88" uid="16746">
-        <specific value="1" description="Y 851 TF 1" uuid="e4f60d3e-5269-11df-9039-080069138b88" uid="16747"/>
-        <specific value="2" description="Y 852 TF 2" uuid="e4f714ea-5269-11df-82dc-080069138b88" uid="16748"/>
-        <specific value="3" description="Y 853 TF 3" uuid="e4f8236c-5269-11df-81d3-080069138b88" uid="16749"/>
-        <specific value="4" description="Y 855 TF 5" uuid="e4f934be-5269-11df-bfe7-080069138b88" uid="16750"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate" uuid="e4fb7fc6-5269-11df-987d-080069138b88" uid="16751">
-      <subcategory value="1" description="Thetis class (type 420)" uuid="e4fc8da8-5269-11df-9309-080069138b88" uid="16752">
-        <specific value="1" description="P 6053 Hermes" uuid="e4fd9b62-5269-11df-9fe6-080069138b88" uid="16753"/>
-        <specific value="2" description="P 6055 Triton" uuid="e4fea926-5269-11df-b9b8-080069138b88" uid="16754"/>
-        <specific value="3" description="P 6056 Theseus" uuid="e4ffb726-5269-11df-be34-080069138b88" uid="16755"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="78" uuid="e502a260-5269-11df-85d5-080069138b88" uid="16756">
-    <category value="5" description="SS (Conventional attack-torpedo patrol)" uuid="e503b970-5269-11df-9d62-080069138b88" uid="16757">
-      <subcategory value="1" description="Type 206" uuid="e504ccde-5269-11df-8b1e-080069138b88" uid="16758">
-        <specific value="1" description="S 192 U 13" uuid="e505df20-5269-11df-b062-080069138b88" uid="16759"/>
-        <specific value="2" description="S 193 U 14" uuid="e506e74e-5269-11df-ae08-080069138b88" uid="16760"/>
-        <specific value="3" description="S 198 U 19" uuid="e507f51c-5269-11df-a1cc-080069138b88" uid="16761"/>
-        <specific value="4" description="S 199 U 20" uuid="e5090790-5269-11df-9267-080069138b88" uid="16762"/>
-        <specific value="5" description="S 170 U 21" uuid="e50a0f3c-5269-11df-aa29-080069138b88" uid="16763"/>
-        <specific value="6" description="S 176 U 27" uuid="e50b1d78-5269-11df-b212-080069138b88" uid="16764"/>
-      </subcategory>
-      <subcategory value="2" description="Type 206A" uuid="e50cd0be-5269-11df-ad60-080069138b88" uid="16765">
-        <specific value="1" description="S 194 U 15" uuid="e50dde82-5269-11df-bb1a-080069138b88" uid="16766"/>
-        <specific value="2" description="S 195 U 16" uuid="e50ee5d4-5269-11df-bf8d-080069138b88" uid="16767"/>
-        <specific value="3" description="S 196 U 17" uuid="e50ff672-5269-11df-b5c2-080069138b88" uid="16768"/>
-        <specific value="4" description="S 197 U 18" uuid="e5110968-5269-11df-b23c-080069138b88" uid="16769"/>
-        <specific value="5" description="S 171 U 22" uuid="e51211d2-5269-11df-ab06-080069138b88" uid="16770"/>
-        <specific value="6" description="S 172 U 23" uuid="e5131ef6-5269-11df-afe6-080069138b88" uid="16771"/>
-        <specific value="7" description="S 173 U 24" uuid="e5142f08-5269-11df-9325-080069138b88" uid="16772"/>
-        <specific value="8" description="S 174 U 25" uuid="e5153a92-5269-11df-9423-080069138b88" uid="16773"/>
-        <specific value="9" description="S 175 U 26" uuid="e5164842-5269-11df-90bc-080069138b88" uid="16774"/>
-        <specific value="10" description="S 177 U 28" uuid="e5175868-5269-11df-ad27-080069138b88" uid="16775"/>
-        <specific value="11" description="S 178 U 29" uuid="e5186230-5269-11df-b3d9-080069138b88" uid="16776"/>
-        <specific value="12" description="S 179 U 30" uuid="e519736e-5269-11df-9621-080069138b88" uid="16777"/>
-      </subcategory>
-      <subcategory value="3" description="Type 205" uuid="e51b1f20-5269-11df-af1a-080069138b88" uid="16778">
-        <specific value="1" description="S 188 U 9" uuid="e51c2d48-5269-11df-8f43-080069138b88" uid="16779"/>
-        <specific value="2" description="S 189 U 10" uuid="e51d397c-5269-11df-8f3f-080069138b88" uid="16780"/>
-        <specific value="3" description="S 190 U 11" uuid="e51e470e-5269-11df-afba-080069138b88" uid="16781"/>
-        <specific value="4" description="S 191 U 12" uuid="e51f5478-5269-11df-9bca-080069138b88" uid="16782"/>
-      </subcategory>
-      <subcategory value="4" description="Type 209" uuid="e5210796-5269-11df-8ba8-080069138b88" uid="16783">
-        <specific value="1" description="1500" uuid="e522100a-5269-11df-801c-080069138b88" uid="16784">
-          <extra value="1" description="S44 Shishumar (India)" uuid="e52326fc-5269-11df-8560-080069138b88" uid="16785"/>
-        </specific>
-        <specific value="2" description="1200" uuid="e524d4c0-5269-11df-b85a-080069138b88" uid="16786"/>
-      </subcategory>
-      <subcategory value="5" description="Modernized Kobben class (type 207)" uuid="e52685e0-5269-11df-9f9e-080069138b88" uid="16787">
-        <specific value="1" description="Sklinna (Norway)" uuid="e5279598-5269-11df-9431-080069138b88" uid="16788"/>
-        <specific value="2" description="Skolpen (Norway)" uuid="e5289dc6-5269-11df-b94f-080069138b88" uid="16789"/>
-        <specific value="3" description="Stord (Norway)" uuid="e529af7c-5269-11df-8d35-080069138b88" uid="16790"/>
-        <specific value="4" description="Svenner (Norway)" uuid="e52abd9a-5269-11df-bced-080069138b88" uid="16791"/>
-        <specific value="5" description="Kobben (Norway)" uuid="e52bc8fc-5269-11df-bb57-080069138b88" uid="16792"/>
-        <specific value="6" description="Kunna (Norway)" uuid="e52cd97c-5269-11df-8f28-080069138b88" uid="16793"/>
-      </subcategory>
-      <subcategory value="6" description="Type 212A" uuid="e52e92c6-5269-11df-952b-080069138b88" uid="16794">
-        <specific value="1" description="U-31" uuid="e52fa35a-5269-11df-af5b-080069138b88" uid="16795"/>
-        <specific value="2" description="U-32" uuid="e530b1f0-5269-11df-8189-080069138b88" uid="16796"/>
-        <specific value="3" description="U-33" uuid="e531c1bc-5269-11df-bde0-080069138b88" uid="16797"/>
-        <specific value="4" description="U-34" uuid="e532d200-5269-11df-bbd3-080069138b88" uid="16798"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="5" country="78" uuid="e535cf46-5269-11df-99bf-080069138b88" uid="16799">
-    <category value="1" description="Manned" uuid="e536df58-5269-11df-8446-080069138b88" uid="16800">
-      <subcategory value="1" description="Space vehicles" uuid="e537f38e-5269-11df-875c-080069138b88" uid="16801">
-        <specific value="1" description="Hermes" uuid="e5390364-5269-11df-bf7f-080069138b88" uid="16802"/>
-        <specific value="2" description="Saenger Spaceplane" uuid="e53a0e76-5269-11df-b340-080069138b88" uid="16803"/>
-      </subcategory>
-      <subcategory value="2" description="Space Station" uuid="e53bc3b0-5269-11df-97a9-080069138b88" uid="16804">
-        <specific value="1" description="Columbus" uuid="e53cd39a-5269-11df-a02f-080069138b88" uid="16805"/>
-      </subcategory>
-      <subcategory value="3" description="Space Lab" uuid="e53e8334-5269-11df-8b80-080069138b88" uid="16806">
-        <specific value="1" description="D1" uuid="e53f96d4-5269-11df-b0e5-080069138b88" uid="16807"/>
-        <specific value="2" description="D2" uuid="e540a0ec-5269-11df-8f7e-080069138b88" uid="16808"/>
-        <specific value="3" description="D3" uuid="e541b9aa-5269-11df-ae3f-080069138b88" uid="16809"/>
-        <specific value="4" description="IML 1" uuid="e542cb1a-5269-11df-a462-080069138b88" uid="16810"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Unmanned" uuid="e5451bfe-5269-11df-afae-080069138b88" uid="16811">
-      <subcategory value="1" description="Communication satellite" uuid="e5463084-5269-11df-abde-080069138b88" uid="16812">
-        <specific value="1" description="DFS-Kopernikus" uuid="e5473d58-5269-11df-9741-080069138b88" uid="16813"/>
-        <specific value="2" description="Artemis" uuid="e5484d1a-5269-11df-804b-080069138b88" uid="16814"/>
-        <specific value="3" description="DRS" uuid="e5495ee4-5269-11df-a8cb-080069138b88" uid="16815"/>
-      </subcategory>
-      <subcategory value="5" description="Meteorology satellite" uuid="e54cbada-5269-11df-a7cb-080069138b88" uid="16816">
-        <specific value="1" description="Atmos" uuid="e54dcef2-5269-11df-b40e-080069138b88" uid="16817"/>
-        <specific value="2" description="Azur" uuid="e54edc5c-5269-11df-8da3-080069138b88" uid="16818"/>
-        <specific value="3" description="X-SAR" uuid="e54ff2d6-5269-11df-b2be-080069138b88" uid="16819"/>
-        <specific value="4" description="ERS" uuid="e55103ba-5269-11df-a29e-080069138b88" uid="16820"/>
-        <specific value="5" description="POEM" uuid="e5520dfa-5269-11df-a0ed-080069138b88" uid="16821"/>
-      </subcategory>
-      <subcategory value="7" description="Imaging Radar Surveillance Satellite" uuid="e553c316-5269-11df-acf4-080069138b88" uid="16822">
-        <specific value="1" description="Rosat" uuid="e554d4cc-5269-11df-953f-080069138b88" uid="16823"/>
-      </subcategory>
-      <subcategory value="13" description="Science satellite" uuid="e5568966-5269-11df-9289-080069138b88" uid="16824">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="e5579a18-5269-11df-8aa3-080069138b88" uid="16825"/>
-        <specific value="2" description="Ulysses" uuid="e558a6ec-5269-11df-9f5f-080069138b88" uid="16826"/>
-        <specific value="3" description="Galileo" uuid="e559b708-5269-11df-81b4-080069138b88" uid="16827"/>
-        <specific value="4" description="Soho &amp; Cluster" uuid="e55acc9c-5269-11df-bcb2-080069138b88" uid="16828"/>
-        <specific value="5" description="Eureca" uuid="e55bd86c-5269-11df-9cfa-080069138b88" uid="16829"/>
-        <specific value="6" description="Astro-SPAS" uuid="e55ce9dc-5269-11df-ae89-080069138b88" uid="16830"/>
-        <specific value="7" description="HST" uuid="e55dfade-5269-11df-9ea5-080069138b88" uid="16831"/>
-        <specific value="8" description="Mars-94/96" uuid="e55f0802-5269-11df-82e3-080069138b88" uid="16832"/>
-        <specific value="9" description="ISO" uuid="e5602264-5269-11df-96e2-080069138b88" uid="16833"/>
-        <specific value="10" description="Huygens/Cassini" uuid="e56138ac-5269-11df-8a61-080069138b88" uid="16834"/>
-        <specific value="11" description="Giotto" uuid="e5624a08-5269-11df-8a68-080069138b88" uid="16835"/>
-        <specific value="12" description="Hipparcos" uuid="e5635682-5269-11df-8c68-080069138b88" uid="16836"/>
-        <specific value="13" description="Compton" uuid="e5646996-5269-11df-9256-080069138b88" uid="16837"/>
-        <specific value="14" description="(deprecated)" deprecated="1" uuid="e5657a84-5269-11df-abea-080069138b88" uid="16838"/>
-        <specific value="15" description="Bremsat" uuid="e56687ee-5269-11df-b452-080069138b88" uid="16839"/>
-      </subcategory>
-      <subcategory value="15" description="Microgravity Satellite" uuid="e5683bc0-5269-11df-9872-080069138b88" uid="16840">
-        <specific value="1" description="Spacelab" uuid="e5694f6a-5269-11df-ae00-080069138b88" uid="16841"/>
-        <specific value="2" description="Eureca" uuid="e56a6120-5269-11df-8e86-080069138b88" uid="16842"/>
-        <specific value="3" description="SPAS" uuid="e56b6cfa-5269-11df-8cce-080069138b88" uid="16843"/>
-        <specific value="4" description="Maxus" uuid="e56c804a-5269-11df-9f62-080069138b88" uid="16844"/>
-        <specific value="5" description="Texus" uuid="e56d9002-5269-11df-9aa6-080069138b88" uid="16845"/>
-        <specific value="6" description="Mikroba" uuid="e56e9b96-5269-11df-b93a-080069138b88" uid="16846"/>
-        <specific value="7" description="Mir-92" uuid="e56fabd0-5269-11df-92db-080069138b88" uid="16847"/>
-        <specific value="8" description="MAUS" uuid="e570bf20-5269-11df-b92e-080069138b88" uid="16848"/>
-        <specific value="9" description="Express" uuid="e571c91a-5269-11df-89b7-080069138b88" uid="16849"/>
-      </subcategory>
-      <subcategory value="16" description="Miscellaneous" uuid="e573799a-5269-11df-b368-080069138b88" uid="16850">
-        <specific value="1" description="Shuttle Pallet (SPAS)" uuid="e5748df8-5269-11df-abdc-080069138b88" uid="16851"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Booster" uuid="e576df22-5269-11df-affc-080069138b88" uid="16852">
-      <subcategory value="1" description="Ariane" uuid="e577f0d8-5269-11df-b1ab-080069138b88" uid="16853"/>
-      <subcategory value="2" description="Maxus" uuid="e5790108-5269-11df-8a46-080069138b88" uid="16854"/>
-      <subcategory value="3" description="Saenger" uuid="e57a1638-5269-11df-91da-080069138b88" uid="16855"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="45" uuid="e57c6abe-5269-11df-9c95-080069138b88" uid="16856">
-    <category value="1" description="Tank" uuid="e57d78c8-5269-11df-b279-080069138b88" uid="16857">
-      <subcategory value="1" description="Type 59" uuid="e57e8b6e-5269-11df-8ff8-080069138b88" uid="16858">
-        <specific value="1" description="Type 59-I" uuid="e57fa0bc-5269-11df-bfa4-080069138b88" uid="16859"/>
-        <specific value="2" description="Type 59-II" uuid="e580b0e2-5269-11df-9eaa-080069138b88" uid="16860"/>
-      </subcategory>
-      <subcategory value="2" description="Type 69" uuid="e58262f2-5269-11df-b69a-080069138b88" uid="16861">
-        <specific value="1" description="Type 69-I" uuid="e5836d8c-5269-11df-83b1-080069138b88" uid="16862"/>
-        <specific value="2" description="Type 69-II" uuid="e5847fc4-5269-11df-964e-080069138b88" uid="16863"/>
-      </subcategory>
-      <subcategory value="3" description="Type 79" uuid="e586344a-5269-11df-9876-080069138b88" uid="16864"/>
-      <subcategory value="4" description="Type 80" uuid="e5874448-5269-11df-8fb2-080069138b88" uid="16865">
-        <specific value="1" description="Type 80" uuid="e5884d66-5269-11df-a515-080069138b88" uid="16866"/>
-        <specific value="2" description="Type 80-II" uuid="e58961b0-5269-11df-ba35-080069138b88" uid="16867"/>
-      </subcategory>
-      <subcategory value="5" description="Type 85-II" uuid="e58b169a-5269-11df-b997-080069138b88" uid="16868">
-        <specific value="1" description="Type 85-II" uuid="e58c268e-5269-11df-b667-080069138b88" uid="16869"/>
-        <specific value="2" description="Type 85-IIA" uuid="e58d304c-5269-11df-96fe-080069138b88" uid="16870"/>
-        <specific value="3" description="Type 85-11M (w/125mm gun)" uuid="e58e4298-5269-11df-85e8-080069138b88" uid="16871"/>
-        <specific value="4" description="Type 85-III" uuid="e58f580e-5269-11df-8eee-080069138b88" uid="16872"/>
-      </subcategory>
-      <subcategory value="6" description="Type 63 (light amphibious)" uuid="e5910906-5269-11df-b2d7-080069138b88" uid="16873">
-        <specific value="1" description="Type 63A" uuid="e59214cc-5269-11df-a281-080069138b88" uid="16874"/>
-      </subcategory>
-      <subcategory value="7" description="Type 62 (light)" uuid="e593c934-5269-11df-88aa-080069138b88" uid="16875"/>
-    </category>
-    <category value="2" description="Armored Fighting Vehicle" uuid="e59599b2-5269-11df-bfef-080069138b88" uid="16876">
-      <subcategory value="1" description="NORINCO YW 531 Armored Personnel Carrier (APC)" uuid="e596ac6c-5269-11df-ac4e-080069138b88" uid="16877"/>
-      <subcategory value="2" description="NORINCO Type 85 (YW 531H) Armored Personnel Carrier (APC)" uuid="e597c41c-5269-11df-b39e-080069138b88" uid="16878"/>
-      <subcategory value="3" description="NORINCO YW 534 Armored Personnel Carrier (APC)" uuid="e598d460-5269-11df-b4ff-080069138b88" uid="16879"/>
-      <subcategory value="4" description="NORINCO Type 77 (M1974) Armored Personnel Carrier (APC)" uuid="e599ea3a-5269-11df-ae1a-080069138b88" uid="16880"/>
-      <subcategory value="5" description="NORINCO Type WZ 501 Infantry Fighting Vehicle (IFV)" uuid="e59b02d0-5269-11df-821d-080069138b88" uid="16881"/>
-      <subcategory value="6" description="NORINCO WZ 551 Armored Personnel Carrier (APC)" uuid="e59c1102-5269-11df-8d27-080069138b88" uid="16882"/>
-      <subcategory value="7" description="NORINCO Type WZ 523 Armored Personnel Carrier (APC)" uuid="e59d2e2a-5269-11df-98c1-080069138b88" uid="16883"/>
-    </category>
-    <category value="4" description="Self-propelled Artillery" uuid="e59ee756-5269-11df-b51a-080069138b88" uid="16884">
-      <subcategory value="1" description="Type 54-1 122mm SP Howitzer" uuid="e59ff876-5269-11df-ae90-080069138b88" uid="16885"/>
-      <subcategory value="2" description="Type 83 152mm SP Gun-Howitzer" uuid="e5a105f4-5269-11df-9ae9-080069138b88" uid="16886"/>
-      <subcategory value="3" description="Type 81 122mm Multiple Rocket Launcher (MRL)" uuid="e5a21962-5269-11df-b5c4-080069138b88" uid="16887"/>
-      <subcategory value="4" description="Type 63 130mm Multiple Rocket Launcher (MRL)" uuid="e5a32d84-5269-11df-92fe-080069138b88" uid="16888"/>
-      <subcategory value="5" description="Type 87 253mm Mine Clearing System (MRL)" uuid="e5a44034-5269-11df-9074-080069138b88" uid="16889"/>
-      <subcategory value="6" description="Type 74 284mm Minelaying Rocket System" uuid="e5a55438-5269-11df-b648-080069138b88" uid="16890"/>
-      <subcategory value="7" description="Type 75 105mm Recoilless Rifle" uuid="e5a666e8-5269-11df-9141-080069138b88" uid="16891"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="e5a777c2-5269-11df-8910-080069138b88" uid="16892"/>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="e5a88cd4-5269-11df-990f-080069138b88" uid="16893"/>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="e5a9a006-5269-11df-a4aa-080069138b88" uid="16894"/>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="e5aaad8e-5269-11df-88a1-080069138b88" uid="16895"/>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="e5abbf62-5269-11df-bf78-080069138b88" uid="16896"/>
-      <subcategory value="13" description="SY-1 (Styx) ASCM launcher" uuid="e5acd60e-5269-11df-aa48-080069138b88" uid="16897"/>
-      <subcategory value="14" description="YJ-1/C-802/CSS-N-8 Saccade ASCM launcher" uuid="e5ade38c-5269-11df-a391-080069138b88" uid="16898"/>
-      <subcategory value="15" description="CSS-8 (M-7) surface-to-surface missile launcher" uuid="e5aef6b4-5269-11df-8ba1-080069138b88" uid="16899"/>
-      <subcategory value="16" description="DF-15 (M9) launcher" uuid="e5b00c70-5269-11df-940d-080069138b88" uid="16900"/>
-      <subcategory value="17" description="CSSC-5 (YJ-16/C-101) Saples launcher" uuid="e5b118fe-5269-11df-a226-080069138b88" uid="16901"/>
-      <subcategory value="18" description="CSSC-6 (HY-3) Sawhorse launcher" uuid="e5b22bc2-5269-11df-99b0-080069138b88" uid="16902"/>
-      <subcategory value="19" description="CSSC-7 (HY-4) Sadsack launcher" uuid="e5b33f3a-5269-11df-bfb7-080069138b88" uid="16903"/>
-    </category>
-    <category value="5" description="Towed Artillery" uuid="e5b4f10e-5269-11df-95e2-080069138b88" uid="16904">
-      <subcategory value="1" description="Type 54 122mm Howitzer" uuid="e5b6008a-5269-11df-9976-080069138b88" uid="16905"/>
-      <subcategory value="2" description="Type 59 130mm Gun" uuid="e5b712e0-5269-11df-bc14-080069138b88" uid="16906">
-        <specific value="1" description="Type 59" uuid="e5b82464-5269-11df-8117-080069138b88" uid="16907"/>
-        <specific value="2" description="Type 59-1" uuid="e5b93070-5269-11df-a13c-080069138b88" uid="16908"/>
-      </subcategory>
-      <subcategory value="3" description="Type 54 152mm Howitzer" uuid="e5bae604-5269-11df-b597-080069138b88" uid="16909"/>
-      <subcategory value="4" description="Type 66 152mm Gun-Howitzer" uuid="e5bbffbc-5269-11df-abc7-080069138b88" uid="16910"/>
-      <subcategory value="5" description="Type WA 021 (WAC 21) 155mm Gun-Howitzer" uuid="e5bd15a0-5269-11df-8047-080069138b88" uid="16911"/>
-      <subcategory value="6" description="Type 63 107mm Multiple Rocket Launcher (MRL)" uuid="e5be238c-5269-11df-afda-080069138b88" uid="16912"/>
-      <subcategory value="7" description="Type 65 82mm Recoilless Rifle" uuid="e5bf386c-5269-11df-a0f5-080069138b88" uid="16913"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="e5c04b58-5269-11df-be26-080069138b88" uid="16914"/>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="e5c15c3c-5269-11df-b87c-080069138b88" uid="16915"/>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="e5c26ffa-5269-11df-ab0d-080069138b88" uid="16916"/>
-      <subcategory value="11" description="Type 55 57mm Anti-Tank Gun (ATG)" uuid="e5c3821e-5269-11df-b1fb-080069138b88" uid="16917"/>
-      <subcategory value="12" description="Type 54 76mm ATG" uuid="e5c4923a-5269-11df-a0a6-080069138b88" uid="16918"/>
-      <subcategory value="13" description="Type 56 85mm ATG" uuid="e5c5a3c8-5269-11df-8628-080069138b88" uid="16919"/>
-      <subcategory value="14" description="Type 73 100mm ATG" uuid="e5c6b6aa-5269-11df-844f-080069138b88" uid="16920"/>
-      <subcategory value="15" description="Type 86 100mm ATG" uuid="e5c7c66c-5269-11df-b349-080069138b88" uid="16921"/>
-      <subcategory value="16" description="HY-series ASCM launcher" uuid="e5c8d8ae-5269-11df-9778-080069138b88" uid="16922">
-        <specific value="1" description="HY-1/CSSC-2 Silkworm launcher" uuid="e5c9eabe-5269-11df-a6a2-080069138b88" uid="16923"/>
-        <specific value="2" description="HY-2/CSSC-3 Seersucker launcher" uuid="e5caf81e-5269-11df-94b8-080069138b88" uid="16924"/>
-      </subcategory>
-      <subcategory value="17" description="C-801/YJ-1/CSS-N-4 Sardine launcher" uuid="e5ccad26-5269-11df-ab09-080069138b88" uid="16925"/>
-    </category>
-    <category value="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)" uuid="e5ce5f86-5269-11df-85ef-080069138b88" uid="16926">
-      <subcategory value="1" description="BJ212 4x4" uuid="e5cf75b0-5269-11df-99e5-080069138b88" uid="16927"/>
-    </category>
-    <category value="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)" uuid="e5d1275c-5269-11df-9e7a-080069138b88" uid="16928">
-      <subcategory value="1" description="Jiefang CA-10" uuid="e5d23818-5269-11df-a217-080069138b88" uid="16929"/>
-      <subcategory value="2" description="Jiefang CA-30 6x6 2500kg cargo/utility truck" uuid="e5d348de-5269-11df-a867-080069138b88" uid="16930">
-        <specific value="1" description="CA-30" uuid="e5d45c2e-5269-11df-b9c5-080069138b88" uid="16931"/>
-        <specific value="2" description="CA-30A" uuid="e5d56cf4-5269-11df-9d79-080069138b88" uid="16932"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Mortar" uuid="e5d7be6e-5269-11df-956d-080069138b88" uid="16933">
-      <subcategory value="1" description="100 mm type 71 mortar" uuid="e5d8cdcc-5269-11df-803c-080069138b88" uid="16934"/>
-      <subcategory value="2" description="120 mm type 55 mortar" uuid="e5d9dd8e-5269-11df-ba45-080069138b88" uid="16935"/>
-      <subcategory value="3" description="160 mm type 56 mortar" uuid="e5daf782-5269-11df-ae13-080069138b88" uid="16936"/>
-    </category>
-    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="e5dcaa3c-5269-11df-82d1-080069138b88" uid="16937">
-      <subcategory value="1" description="HQ-2/CSA-1 SAM System" uuid="e5ddc02a-5269-11df-9b7a-080069138b88" uid="16938">
-        <specific value="1" description="Battalion C3 Vehicle" uuid="e5decc04-5269-11df-ac92-080069138b88" uid="16939"/>
-        <specific value="2" description="HQ-2 Launcher" uuid="e5dfdd38-5269-11df-b04f-080069138b88" uid="16940">
-          <extra value="1" description="HQ-2 Launcher (standard)" uuid="e5e0f056-5269-11df-88c9-080069138b88" uid="16941"/>
-          <extra value="2" description="HQ-2B SP Launcher (tracked)" uuid="e5e1fb5e-5269-11df-a169-080069138b88" uid="16942"/>
-        </specific>
-        <specific value="3" description="Gin Sling Engagement Radar" uuid="e5e3afd0-5269-11df-8adf-080069138b88" uid="16943">
-          <extra value="1" description="Gin Sling A" uuid="e5e4c7f8-5269-11df-a958-080069138b88" uid="16944"/>
-          <extra value="2" description="Gin Sling B" uuid="e5e5d850-5269-11df-a93e-080069138b88" uid="16945"/>
-        </specific>
-      </subcategory>
-      <subcategory value="2" description="HQ-61/CSA-2 SAM System" uuid="e5e82ace-5269-11df-9540-080069138b88" uid="16946">
-        <specific value="1" description="Battery Command Post Vehicle" uuid="e5e93c84-5269-11df-940e-080069138b88" uid="16947"/>
-        <specific value="2" description="HQ-61 Twin-Rail Launcher Vehicle" uuid="e5ea49c6-5269-11df-9e4d-080069138b88" uid="16948"/>
-        <specific value="3" description="HQ-61 Engagement Radar" uuid="e5eb5d5c-5269-11df-a39c-080069138b88" uid="16949"/>
-      </subcategory>
-      <subcategory value="3" description="LY-60 SAM System" uuid="e5ed11b0-5269-11df-891f-080069138b88" uid="16950">
-        <specific value="1" description="LY-60 Battery C3 Vehicle" uuid="e5ee2230-5269-11df-a990-080069138b88" uid="16951"/>
-        <specific value="2" description="LY-60 5-Round SP Launcher" uuid="e5ef2fae-5269-11df-85a2-080069138b88" uid="16952"/>
-        <specific value="3" description="LY-60 Engagement Radar Vehicle" uuid="e5f04178-5269-11df-b529-080069138b88" uid="16953"/>
-        <specific value="4" description="LY-60 Surveillance Radar Vehicle" uuid="e5f152e8-5269-11df-b64e-080069138b88" uid="16954"/>
-      </subcategory>
-      <subcategory value="4" description="Self-Propelled VSHORAD Gun/Missile System" uuid="e5f309b2-5269-11df-b4ee-080069138b88" uid="16955">
-        <specific value="1" description="PL-9 SAM System (quad-rail)" uuid="e5f416b8-5269-11df-ba79-080069138b88" uid="16956"/>
-        <specific value="2" description="HN-5C SAM System" uuid="e5f52a26-5269-11df-a668-080069138b88" uid="16957"/>
-      </subcategory>
-      <subcategory value="5" description="Towed VSHORAD Gun/Missile System" uuid="e5f6e064-5269-11df-89e2-080069138b88" uid="16958">
-        <specific value="1" description="Type 59 57mm AA Gun (similar to CIS S-60)" uuid="e5f7f224-5269-11df-9fd4-080069138b88" uid="16959"/>
-        <specific value="2" description="NORINCO 37mm AA Guns" uuid="e5f9001a-5269-11df-a9bc-080069138b88" uid="16960">
-          <extra value="1" description="Type 55" uuid="e5fa1b1c-5269-11df-9aca-080069138b88" uid="16961"/>
-          <extra value="2" description="Type 65 (twin)" uuid="e5fb2b7e-5269-11df-ab38-080069138b88" uid="16962"/>
-          <extra value="3" description="Type 74 (twin)" uuid="e5fc37bc-5269-11df-8884-080069138b88" uid="16963"/>
-          <extra value="4" description="Type P793 (twin)" uuid="e5fd47e2-5269-11df-a7dd-080069138b88" uid="16964"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="45" uuid="e600dccc-5269-11df-820d-080069138b88" uid="16965">
-    <category value="1" description="Fighter/Air Defense" uuid="e601eec8-5269-11df-bbec-080069138b88" uid="16966">
-      <subcategory value="1" description="Shenyang F-6 (Farmer)" uuid="e602fe1c-5269-11df-a429-080069138b88" uid="16967"/>
-      <subcategory value="2" description="Xien J-7 (Fishbed)" uuid="e6040dde-5269-11df-aee8-080069138b88" uid="16968">
-        <specific value="1" description="J-7 II" uuid="e60522fa-5269-11df-90ee-080069138b88" uid="16969"/>
-        <specific value="2" description="J-7 E" uuid="e6063492-5269-11df-a2ca-080069138b88" uid="16970"/>
-        <specific value="3" description="J-7 / F-7 III" uuid="e6073ed2-5269-11df-8be5-080069138b88" uid="16971"/>
-        <specific value="4" description="F-7 III" deprecated="1" uuid="e6085326-5269-11df-a19d-080069138b88" uid="16972"/>
-      </subcategory>
-      <subcategory value="3" description="Shenyang J-8 (Finback)" uuid="e60a0590-5269-11df-91ec-080069138b88" uid="16973">
-        <specific value="1" description="J-8 I Finback A" uuid="e60b173c-5269-11df-80dd-080069138b88" uid="16974"/>
-        <specific value="2" description="J-8 II Finback B" uuid="e60c25c8-5269-11df-95d9-080069138b88" uid="16975"/>
-      </subcategory>
-      <subcategory value="4" description="Chengdu Aircraft Industrial Corp. J-9" uuid="e60dd738-5269-11df-b5f4-080069138b88" uid="16976"/>
-    </category>
-    <category value="2" description="Attack/Strike" uuid="e60f8c0e-5269-11df-ba52-080069138b88" uid="16977">
-      <subcategory value="1" description="Harbin H-5" deprecated="1" uuid="e6109c48-5269-11df-87ca-080069138b88" uid="16978"/>
-      <subcategory value="2" description="Nanchang Q-5 (Fantan)" uuid="e611acbe-5269-11df-b887-080069138b88" uid="16979">
-        <specific value="1" description="Q-5" uuid="e612b910-5269-11df-9689-080069138b88" uid="16980"/>
-        <specific value="2" description="Q-5I" uuid="e613cc7e-5269-11df-9bd2-080069138b88" uid="16981"/>
-        <specific value="3" description="Q-5IA" uuid="e614dca4-5269-11df-80ff-080069138b88" uid="16982"/>
-        <specific value="4" description="Q-5 II" uuid="e615e770-5269-11df-8980-080069138b88" uid="16983"/>
-        <specific value="5" description="A-5C Fantan" uuid="e616fa5c-5269-11df-8aec-080069138b88" uid="16984"/>
-      </subcategory>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e618b46e-5269-11df-aacb-080069138b88" uid="16985"/>
-      <subcategory value="4" description="Xian Aircraft Company JH-7" uuid="e619c73c-5269-11df-803a-080069138b88" uid="16986"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="e61ad73a-5269-11df-a269-080069138b88" uid="16987"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="e61be8c8-5269-11df-a092-080069138b88" uid="16988"/>
-    </category>
-    <category value="3" description="Bomber" uuid="e61da2d0-5269-11df-bc48-080069138b88" uid="16989">
-      <subcategory value="1" description="Harbin H-5 (B-5) Beagle" uuid="e61eb68e-5269-11df-b653-080069138b88" uid="16990"/>
-      <subcategory value="2" description="Xian H-6 (B-6) Badger" uuid="e61fc268-5269-11df-8671-080069138b88" uid="16991">
-        <specific value="1" description="B-6 Badger A" uuid="e620d25c-5269-11df-9599-080069138b88" uid="16992"/>
-        <specific value="2" description="B-6D Badger (ASM platform)" uuid="e621e5e8-5269-11df-81bb-080069138b88" uid="16993"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Cargo/Tanker" uuid="e62437c6-5269-11df-bdc8-080069138b88" uid="16994">
-      <subcategory value="1" description="Shaanxi Aircraft Company Y-8" uuid="e6254a62-5269-11df-907e-080069138b88" uid="16995">
-        <specific value="1" description="Y-8A (helicopter carrier)" uuid="e62658a8-5269-11df-86be-080069138b88" uid="16996"/>
-        <specific value="2" description="Y-8E (drone carrier)" uuid="e6276a0e-5269-11df-bb37-080069138b88" uid="16997"/>
-      </subcategory>
-      <subcategory value="2" description="Xian Aircraft Company Y-7" uuid="e6291d54-5269-11df-8149-080069138b88" uid="16998">
-        <specific value="1" description="Y-7 (cargo)" uuid="e62a3324-5269-11df-a885-080069138b88" uid="16999"/>
-        <specific value="2" description="Y-7H-500 (cargo)" uuid="e62b3d32-5269-11df-8bce-080069138b88" uid="17000"/>
-      </subcategory>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e62cf118-5269-11df-a8fa-080069138b88" uid="17001"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="e62e02f6-5269-11df-ab9c-080069138b88" uid="17002"/>
-      <subcategory value="5" description="ASW/Patrol/Observation" uuid="e62f15b0-5269-11df-bba7-080069138b88" uid="17003">
-        <specific value="1" description="Harbin Aircraft Manufacturing Corp. SH-5" uuid="e63024be-5269-11df-afa7-080069138b88" uid="17004"/>
-        <specific value="2" description="Shannxi Aircraft Company Y-8X" uuid="e63137e6-5269-11df-99ed-080069138b88" uid="17005"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Utility helicopter" uuid="e6338d02-5269-11df-aee5-080069138b88" uid="17006">
-      <subcategory value="1" description="Changhe Aircraft Factory Z-8" uuid="e6349fbc-5269-11df-9a75-080069138b88" uid="17007"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="e635b226-5269-11df-94d0-080069138b88" uid="17008"/>
-      <subcategory value="3" description="Nanchang Aircraft Manufacturing Company CJ-6" deprecated="1" uuid="e636ce68-5269-11df-b91f-080069138b88" uid="17009">
-        <specific value="1" description="CJ-6A" deprecated="1" uuid="e637e1e0-5269-11df-a1fd-080069138b88" uid="17010"/>
-        <specific value="2" description="CJ-6B" deprecated="1" uuid="e638f4ea-5269-11df-8746-080069138b88" uid="17011"/>
-        <specific value="3" description="K-8" deprecated="1" uuid="e63a0574-5269-11df-8eca-080069138b88" uid="17012"/>
-      </subcategory>
-    </category>
-    <category value="40" description="Trainer" uuid="e63c598c-5269-11df-9188-080069138b88" uid="17013">
-      <subcategory value="1" description="Chengdu Aircraft Industrial Corp. JJ-5" uuid="e63d6a66-5269-11df-a983-080069138b88" uid="17014"/>
-      <subcategory value="2" description="Changdu Aircraft Industrial Corp. JJ-7/FT-7" uuid="e63e7a6e-5269-11df-919d-080069138b88" uid="17015"/>
-      <subcategory value="3" description="Guizhou Aviation Industry Corp JJ-7" uuid="e63f8f58-5269-11df-951f-080069138b88" uid="17016"/>
-      <subcategory value="4" description="Nanchang Aircraft Manufacturing Company CJ-6" uuid="e640a2e4-5269-11df-929d-080069138b88" uid="17017">
-        <specific value="1" description="CJ-6A" uuid="e641b116-5269-11df-8eb9-080069138b88" uid="17018"/>
-        <specific value="2" description="CJ-6B" uuid="e642c38a-5269-11df-aa53-080069138b88" uid="17019"/>
-      </subcategory>
-      <subcategory value="5" description="Nanchang AMC / PAK K-8" uuid="e6447748-5269-11df-89b9-080069138b88" uid="17020"/>
-    </category>
-    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="e6462c64-5269-11df-b62e-080069138b88" uid="17021">
-      <subcategory value="1" description="Passenger Airline" uuid="e6473d16-5269-11df-85b2-080069138b88" uid="17022">
-        <specific value="1" description="Harbin Aircraft Manufacturing Corp. Y-12(I)" uuid="e64849b8-5269-11df-ab4f-080069138b88" uid="17023"/>
-        <specific value="2" description="Harbin Aircraft Manufacturing Corp. Y-12 (II)" uuid="e6495ea2-5269-11df-94f7-080069138b88" uid="17024"/>
-        <specific value="3" description="Harbin Aircraft Manufacturing Corp. Y-12 (IV)" uuid="e64a7526-5269-11df-ba9d-080069138b88" uid="17025"/>
-        <specific value="4" description="Shaanxi Aircraft Company Y-8B" uuid="e64b85c4-5269-11df-998c-080069138b88" uid="17026"/>
-        <specific value="5" description="Shaanxi Aircraft Company Y-8C" uuid="e64c9784-5269-11df-aa9c-080069138b88" uid="17027"/>
-        <specific value="6" description="Xian Aircraft Company Y7-100" uuid="e64da9a8-5269-11df-9a5f-080069138b88" uid="17028"/>
-        <specific value="7" description="Xian Aircraft Company Y7-100C" uuid="e64eb9d8-5269-11df-bf2d-080069138b88" uid="17029"/>
-        <specific value="8" description="Xian Aircraft Compnay Y7-200" uuid="e64fcc10-5269-11df-be12-080069138b88" uid="17030"/>
-        <specific value="9" description="Xian Aircraft Company Y7-200B" uuid="e650df10-5269-11df-99c6-080069138b88" uid="17031"/>
-        <specific value="10" description="A. S. Yakovlev Design Bureau YAK-42 Clobber" deprecated="1" uuid="e651ef22-5269-11df-b037-080069138b88" uid="17032"/>
-        <specific value="11" description="Tupolev TU-154M Careless" deprecated="1" uuid="e65303a8-5269-11df-ba22-080069138b88" uid="17033"/>
-      </subcategory>
-      <subcategory value="2" description="Agriculture" uuid="e654ba54-5269-11df-8be0-080069138b88" uid="17034">
-        <specific value="1" description="Nanching Aircraft Manufacturing Company N-5A" uuid="e655d40c-5269-11df-9c94-080069138b88" uid="17035"/>
-        <specific value="2" description="Harbin Aircraft Manufacturing Corp. Y-11B (I)" uuid="e656e702-5269-11df-884b-080069138b88" uid="17036"/>
-        <specific value="3" description="WSK-PZL Mielec M-18 Dromader" uuid="e657fab6-5269-11df-b168-080069138b88" uid="17037"/>
-      </subcategory>
-      <subcategory value="3" description="Helicopter" uuid="e659ac30-5269-11df-a8ab-080069138b88" uid="17038">
-        <specific value="1" description="Harbin Aircraft Co. Z-9/Z-9A (Eurocopter AS 365N2)" uuid="e65ac016-5269-11df-83aa-080069138b88" uid="17039"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="e65c737a-5269-11df-8c96-080069138b88" uid="17040"/>
-      <subcategory value="5" description="Special Purpose" uuid="e65d80a8-5269-11df-8c25-080069138b88" uid="17041">
-        <specific value="1" description="Shaanxi Aircraft Company Y-8F (livestock carrier)" uuid="e65e9196-5269-11df-bc28-080069138b88" uid="17042"/>
-        <specific value="2" description="Shaanxi Aircraft Company Y-8H (aerial survey)" uuid="e65fa946-5269-11df-a8c8-080069138b88" uid="17043"/>
-        <specific value="3" description="Xian Aircraft Company Y-7 (cargo)" uuid="e660bbba-5269-11df-9bcc-080069138b88" uid="17044"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="45" uuid="e663b342-5269-11df-ac10-080069138b88" uid="17045">
-    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="e664c23c-5269-11df-85ce-080069138b88" uid="17046">
-      <subcategory value="1" description="Luhu (Type 052)" uuid="e665ce5c-5269-11df-a2ea-080069138b88" uid="17047">
-        <specific value="1" description="112 Luhu" uuid="e666df4a-5269-11df-8d5d-080069138b88" uid="17048"/>
-      </subcategory>
-      <subcategory value="2" description="Luda (Type 051)" uuid="e6689394-5269-11df-9a8d-080069138b88" uid="17049">
-        <specific value="1" description="Jinan" uuid="e669a216-5269-11df-a66d-080069138b88" uid="17050"/>
-        <specific value="2" description="Xian" uuid="e66aad28-5269-11df-8961-080069138b88" uid="17051"/>
-        <specific value="3" description="Yinchuan" uuid="e66bc0e6-5269-11df-aefd-080069138b88" uid="17052"/>
-        <specific value="4" description="Xinging" uuid="e66cd0d0-5269-11df-8af3-080069138b88" uid="17053"/>
-        <specific value="5" description="Kaifeng" uuid="e66dda98-5269-11df-964d-080069138b88" uid="17054"/>
-        <specific value="6" description="Dalien" uuid="e66eee74-5269-11df-ab7c-080069138b88" uid="17055"/>
-        <specific value="7" description="Nanjing" uuid="e66ffe36-5269-11df-9f49-080069138b88" uid="17056"/>
-        <specific value="8" description="Hefei" uuid="e671090c-5269-11df-8e55-080069138b88" uid="17057"/>
-        <specific value="9" description="Chongqing" uuid="e67218c4-5269-11df-aa6f-080069138b88" uid="17058"/>
-        <specific value="10" description="Zunyi" uuid="e6732e44-5269-11df-b266-080069138b88" uid="17059"/>
-        <specific value="11" description="Changsha" uuid="e6744072-5269-11df-943b-080069138b88" uid="17060"/>
-        <specific value="12" description="Nanning" uuid="e675523c-5269-11df-98a5-080069138b88" uid="17061"/>
-        <specific value="13" description="Nanchang" uuid="e676637a-5269-11df-bbe1-080069138b88" uid="17062"/>
-        <specific value="14" description="Guilin" uuid="e677727e-5269-11df-af6e-080069138b88" uid="17063"/>
-        <specific value="15" description="Zangjiang" uuid="e6788222-5269-11df-a3b6-080069138b88" uid="17064"/>
-        <specific value="16" description="Zhuhei" uuid="e6799234-5269-11df-b882-080069138b88" uid="17065"/>
-      </subcategory>
-      <subcategory value="3" description="Luhia Class DDG" uuid="e67b4318-5269-11df-af3a-080069138b88" uid="17066">
-        <specific value="1" description="Shenzhen" uuid="e67c52e4-5269-11df-979f-080069138b88" uid="17067"/>
-        <specific value="2" description="H2 (2003)" uuid="e67d62f6-5269-11df-bd65-080069138b88" uid="17068"/>
-        <specific value="3" description="H3 (2005)" uuid="e67e7484-5269-11df-b8da-080069138b88" uid="17069"/>
-        <specific value="4" description="H4 (2007)" uuid="e67f7e88-5269-11df-8448-080069138b88" uid="17070"/>
-        <specific value="5" description="H5 (2007)" uuid="e6808fd0-5269-11df-b3f5-080069138b88" uid="17071"/>
-        <specific value="6" description="H6 (2009)" uuid="e681a3b6-5269-11df-b366-080069138b88" uid="17072"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e683f4fe-5269-11df-a4d4-080069138b88" uid="17073">
-      <subcategory value="1" description="Jianghu (Type 053)" uuid="e68504f2-5269-11df-b964-080069138b88" uid="17074">
-        <specific value="1" description="Chang De" uuid="e68613c4-5269-11df-83ec-080069138b88" uid="17075"/>
-        <specific value="2" description="Shaoxing" uuid="e687241c-5269-11df-ba9e-080069138b88" uid="17076"/>
-        <specific value="3" description="Nantong" uuid="e6883460-5269-11df-9bc0-080069138b88" uid="17077"/>
-        <specific value="4" description="Wuxi" uuid="e6893d9c-5269-11df-a9e1-080069138b88" uid="17078"/>
-        <specific value="5" description="Huayin" uuid="e68a4dfe-5269-11df-ab59-080069138b88" uid="17079"/>
-        <specific value="6" description="Zhenjiang" uuid="e68b6298-5269-11df-ac49-080069138b88" uid="17080"/>
-        <specific value="7" description="Xiamen" uuid="e68c6c56-5269-11df-af8c-080069138b88" uid="17081"/>
-        <specific value="8" description="Jiujiang" uuid="e68d7c72-5269-11df-8e95-080069138b88" uid="17082"/>
-        <specific value="9" description="Nanping" uuid="e68e8d60-5269-11df-9402-080069138b88" uid="17083"/>
-        <specific value="10" description="Jian" uuid="e68f998a-5269-11df-b58c-080069138b88" uid="17084"/>
-        <specific value="11" description="Changzhi" uuid="e690aa96-5269-11df-99c0-080069138b88" uid="17085"/>
-        <specific value="12" description="Ningpo" uuid="e691be0e-5269-11df-bf33-080069138b88" uid="17086"/>
-        <specific value="13" description="Jinhua" uuid="e692d0fa-5269-11df-bebb-080069138b88" uid="17087"/>
-        <specific value="14" description="Dandong" uuid="e693e36e-5269-11df-82ae-080069138b88" uid="17088"/>
-        <specific value="15" description="Tinashan" uuid="e694f6e6-5269-11df-a463-080069138b88" uid="17089"/>
-        <specific value="16" description="Maoming" uuid="e696016c-5269-11df-aed3-080069138b88" uid="17090"/>
-        <specific value="17" description="Yibin" uuid="e6971124-5269-11df-857d-080069138b88" uid="17091"/>
-        <specific value="18" description="Shaoguan" uuid="e6982230-5269-11df-8a4f-080069138b88" uid="17092"/>
-        <specific value="19" description="Anshun" uuid="e6992b8a-5269-11df-9b4b-080069138b88" uid="17093"/>
-        <specific value="20" description="Zhaotong" uuid="e69a3d04-5269-11df-93bf-080069138b88" uid="17094"/>
-        <specific value="21" description="Jishao" uuid="e69b514e-5269-11df-bf9b-080069138b88" uid="17095"/>
-        <specific value="22" description="Zigong" uuid="e69c5a9e-5269-11df-8304-080069138b88" uid="17096"/>
-        <specific value="23" description="Kangding" uuid="e69d6998-5269-11df-b03e-080069138b88" uid="17097"/>
-        <specific value="24" description="Dongguan" uuid="e69e7af4-5269-11df-8281-080069138b88" uid="17098"/>
-        <specific value="25" description="Shantou" uuid="e69f8818-5269-11df-b89f-080069138b88" uid="17099"/>
-      </subcategory>
-      <subcategory value="2" description="Jianghu II (Type 053)" uuid="e6a13938-5269-11df-bb3c-080069138b88" uid="17100">
-        <specific value="1" description="Siping" uuid="e6a249cc-5269-11df-86ab-080069138b88" uid="17101"/>
-      </subcategory>
-      <subcategory value="3" description="Jianghu III" uuid="e6a3fca4-5269-11df-8c68-080069138b88" uid="17102">
-        <specific value="1" description="Huangshi" uuid="e6a5101c-5269-11df-be30-080069138b88" uid="17103"/>
-        <specific value="2" description="WuHu" uuid="e6a61a7a-5269-11df-884a-080069138b88" uid="17104"/>
-      </subcategory>
-      <subcategory value="4" description="Jianghu IV" uuid="e6a7c7da-5269-11df-8fb0-080069138b88" uid="17105">
-        <specific value="1" description="Zhoushan" uuid="e6a8d9fe-5269-11df-937d-080069138b88" uid="17106"/>
-      </subcategory>
-      <subcategory value="5" description="Jiangwei" uuid="e6aa8f2e-5269-11df-9327-080069138b88" uid="17107">
-        <specific value="1" description="Anging" uuid="e6ab9e46-5269-11df-9e20-080069138b88" uid="17108"/>
-        <specific value="2" description="Huainan" uuid="e6aca6c4-5269-11df-ae92-080069138b88" uid="17109"/>
-        <specific value="3" description="Huaibei" uuid="e6adb834-5269-11df-b19f-080069138b88" uid="17110"/>
-        <specific value="4" description="Tongling" uuid="e6aeccd8-5269-11df-980d-080069138b88" uid="17111"/>
-      </subcategory>
-      <subcategory value="6" description="Jiavgnan (Type 065)" uuid="e6b07ce0-5269-11df-9d8c-080069138b88" uid="17112">
-        <specific value="1" description="Nanchong" uuid="e6b18f72-5269-11df-b343-080069138b88" uid="17113"/>
-        <specific value="2" description="Dongchuan" uuid="e6b2a326-5269-11df-b3a7-080069138b88" uid="17114"/>
-      </subcategory>
-      <subcategory value="7" description="Chengdu (Type 01)" uuid="e6b4581a-5269-11df-b771-080069138b88" uid="17115">
-        <specific value="1" description="Chengdu" uuid="e6b567c8-5269-11df-b70d-080069138b88" uid="17116"/>
-        <specific value="2" description="Pingxiang" uuid="e6b67212-5269-11df-a8ea-080069138b88" uid="17117"/>
-      </subcategory>
-      <subcategory value="8" description="Jiangdong (Type 053K)" uuid="e6b8274c-5269-11df-9cc6-080069138b88" uid="17118">
-        <specific value="1" description="Yingtan" uuid="e6b93880-5269-11df-9ac7-080069138b88" uid="17119"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="e6bb88f6-5269-11df-8ecb-080069138b88" uid="17120">
-      <subcategory value="1" description="Huang class Type 037/2 (fast attack missile)" uuid="e6bc99a8-5269-11df-9735-080069138b88" uid="17121">
-        <specific value="1" description="770" uuid="e6bdafbe-5269-11df-8466-080069138b88" uid="17122"/>
-      </subcategory>
-      <subcategory value="2" description="Houxin class (fast attack missile)" uuid="e6bf5f26-5269-11df-91c2-080069138b88" uid="17123">
-        <specific value="1" description="751-758" uuid="e6c0751e-5269-11df-b3b7-080069138b88" uid="17124"/>
-      </subcategory>
-      <subcategory value="3" description="Hola class (fast attach missile)" uuid="e6c2242c-5269-11df-a038-080069138b88" uid="17125">
-        <specific value="1" description="5100" uuid="e6c332d6-5269-11df-85e2-080069138b88" uid="17126"/>
-      </subcategory>
-      <subcategory value="4" description="Hegu/Hoku class Type 024 (fast attack missile)" uuid="e6c4e3e2-5269-11df-8ef0-080069138b88" uid="17127"/>
-      <subcategory value="5" description="Haijui class (fast attack patrol)" uuid="e6c5fad4-5269-11df-963e-080069138b88" uid="17128">
-        <specific value="1" description="688" uuid="e6c70bc2-5269-11df-9e08-080069138b88" uid="17129"/>
-        <specific value="2" description="693" uuid="e6c816c0-5269-11df-9238-080069138b88" uid="17130"/>
-        <specific value="3" description="694" uuid="e6c92790-5269-11df-97c6-080069138b88" uid="17131"/>
-        <specific value="4" description="697" uuid="e6ca3964-5269-11df-857d-080069138b88" uid="17132"/>
-      </subcategory>
-      <subcategory value="6" description="Hainan class Type 037 (fast attack patrol)" uuid="e6cbe836-5269-11df-bbd0-080069138b88" uid="17133">
-        <specific value="1" description="267-285" uuid="e6ccf47e-5269-11df-bbed-080069138b88" uid="17134"/>
-        <specific value="2" description="290" uuid="e6ce0788-5269-11df-ae1c-080069138b88" uid="17135"/>
-        <specific value="3" description="302" uuid="e6cf1790-5269-11df-8c70-080069138b88" uid="17136"/>
-        <specific value="4" description="305" uuid="e6d027fc-5269-11df-834d-080069138b88" uid="17137"/>
-        <specific value="5" description="609" uuid="e6d13af2-5269-11df-aed7-080069138b88" uid="17138"/>
-        <specific value="6" description="610" uuid="e6d24ece-5269-11df-a6f7-080069138b88" uid="17139"/>
-        <specific value="7" description="622" uuid="e6d35972-5269-11df-a0cb-080069138b88" uid="17140"/>
-        <specific value="8" description="628" uuid="e6d46736-5269-11df-846b-080069138b88" uid="17141"/>
-        <specific value="9" description="636-698" uuid="e6d576b2-5269-11df-8b08-080069138b88" uid="17142"/>
-        <specific value="10" description="689-692" uuid="e6d68598-5269-11df-8dcc-080069138b88" uid="17143"/>
-        <specific value="11" description="695" uuid="e6d79604-5269-11df-8cf9-080069138b88" uid="17144"/>
-        <specific value="12" description="696" uuid="e6d8a486-5269-11df-a68a-080069138b88" uid="17145"/>
-        <specific value="13" description="698" uuid="e6d9b218-5269-11df-b86d-080069138b88" uid="17146"/>
-        <specific value="14" description="699" uuid="e6dac13a-5269-11df-bcd7-080069138b88" uid="17147"/>
-        <specific value="15" description="701" uuid="e6dbd0de-5269-11df-bf72-080069138b88" uid="17148"/>
-        <specific value="16" description="702" uuid="e6dcd920-5269-11df-ac8e-080069138b88" uid="17149"/>
-        <specific value="17" description="707" uuid="e6dde964-5269-11df-8f4b-080069138b88" uid="17150"/>
-        <specific value="18" description="723-730" uuid="e6defd04-5269-11df-9419-080069138b88" uid="17151"/>
-      </subcategory>
-      <subcategory value="7" description="Shanghai class Type 062 (fast attack gun)" uuid="e6e0b2fc-5269-11df-9626-080069138b88" uid="17152">
-        <specific value="1" description="E227" uuid="e6e1bc60-5269-11df-b233-080069138b88" uid="17153"/>
-        <specific value="2" description="301" uuid="e6e2cc86-5269-11df-b8cb-080069138b88" uid="17154"/>
-        <specific value="3" description="321" uuid="e6e3de28-5269-11df-9077-080069138b88" uid="17155"/>
-        <specific value="4" description="N1121" uuid="e6e4e412-5269-11df-b7c4-080069138b88" uid="17156"/>
-        <specific value="5" description="1127" uuid="e6e5f0dc-5269-11df-a017-080069138b88" uid="17157"/>
-        <specific value="6" description="3140" uuid="e6e7024c-5269-11df-b5ea-080069138b88" uid="17158"/>
-        <specific value="7" description="3141" uuid="e6e809d0-5269-11df-bfe3-080069138b88" uid="17159"/>
-        <specific value="8" description="N3215" uuid="e6e915e6-5269-11df-a783-080069138b88" uid="17160"/>
-        <specific value="9" description="N3313" uuid="e6ea27c4-5269-11df-be5c-080069138b88" uid="17161"/>
-        <specific value="10" description="N4301" uuid="e6eb31d2-5269-11df-8ef2-080069138b88" uid="17162"/>
-        <specific value="11" description="4324" uuid="e6ec3ec4-5269-11df-a797-080069138b88" uid="17163"/>
-        <specific value="12" description="9342 et al" uuid="e6ed4d5a-5269-11df-8269-080069138b88" uid="17164"/>
-      </subcategory>
-      <subcategory value="8" description="Huludao class Type 206 (fast attack patrol)" uuid="e6ef053c-5269-11df-bea1-080069138b88" uid="17165">
-        <specific value="1" description="65" uuid="e6f0115c-5269-11df-963c-080069138b88" uid="17166"/>
-        <specific value="2" description="77" uuid="e6f11e08-5269-11df-9863-080069138b88" uid="17167"/>
-        <specific value="3" description="101" uuid="e6f22b72-5269-11df-8a44-080069138b88" uid="17168"/>
-        <specific value="4" description="109" uuid="e6f337e2-5269-11df-9957-080069138b88" uid="17169"/>
-      </subcategory>
-      <subcategory value="9" description="Huxin class (river patrol)" uuid="e6f4e416-5269-11df-8af2-080069138b88" uid="17170">
-        <specific value="1" description="62 et al" uuid="e6f5f16c-5269-11df-ad12-080069138b88" uid="17171"/>
-      </subcategory>
-      <subcategory value="10" description="Huangfen Class (Pakistan)" uuid="e6f7a386-5269-11df-82a9-080069138b88" uid="17172"/>
-      <subcategory value="11" description="Haiqing (Type 037/1) Class (Fast Attack Craft-Patrol)(PC)" uuid="e6f8b596-5269-11df-b94c-080069138b88" uid="17173">
-        <specific value="1" description="710" uuid="e6f9c1ca-5269-11df-b533-080069138b88" uid="17174"/>
-      </subcategory>
-      <subcategory value="12" description="Huchuan (Type 025/026) Class (Fast Attack Craft-Torpedo)" uuid="e6fb7222-5269-11df-b456-080069138b88" uid="17175">
-        <specific value="1" description="205" uuid="e6fc831a-5269-11df-b7aa-080069138b88" uid="17176"/>
-      </subcategory>
-      <subcategory value="13" description="Houku Class Type 024 Fast Attack Missile" uuid="e6fe2fee-5269-11df-a59c-080069138b88" uid="17177"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e6ffe1f4-5269-11df-af70-080069138b88" uid="17178">
-      <subcategory value="1" description="Beleijan class (minelayer)" uuid="e700eee6-5269-11df-bfee-080069138b88" uid="17179">
-        <specific value="1" description="814" uuid="e701f94e-5269-11df-85d1-080069138b88" uid="17180"/>
-      </subcategory>
-      <subcategory value="2" description="Wosao class (minesweeper-coastal)" uuid="e703a910-5269-11df-af0e-080069138b88" uid="17181">
-        <specific value="1" description="4422 et al" uuid="e704b922-5269-11df-bcd0-080069138b88" uid="17182"/>
-      </subcategory>
-      <subcategory value="3" description="Fushun class (minesweeper-coastal)" uuid="e706684e-5269-11df-801e-080069138b88" uid="17183">
-        <specific value="1" description="E303 et al" uuid="e70776f8-5269-11df-aecd-080069138b88" uid="17184"/>
-      </subcategory>
-      <subcategory value="4" description="Lienyou class (minesweeper-coastal)" uuid="e70923a4-5269-11df-bbdc-080069138b88" uid="17185"/>
-      <subcategory value="5" description="Futi class Type 312 (minesweeper-drone)" uuid="e70a326c-5269-11df-8d0c-080069138b88" uid="17186"/>
-      <subcategory value="6" description="T-43 MSO Type 010" uuid="e70b41f2-5269-11df-9909-080069138b88" uid="17187">
-        <specific value="1" description="830" uuid="e70c4fc0-5269-11df-9fdf-080069138b88" uid="17188"/>
-        <specific value="2" description="831" uuid="e70d599c-5269-11df-aaf3-080069138b88" uid="17189"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Tank Landing Ship" uuid="e70fb5b6-5269-11df-b9ce-080069138b88" uid="17190">
-      <subcategory value="1" description="Yuting class" uuid="e710bdf8-5269-11df-b936-080069138b88" uid="17191">
-        <specific value="1" description="991" uuid="e711cf18-5269-11df-995f-080069138b88" uid="17192"/>
-      </subcategory>
-      <subcategory value="2" description="Yukan class Type 072" uuid="e7137b9c-5269-11df-8c33-080069138b88" uid="17193">
-        <specific value="1" description="927" uuid="e7149e0a-5269-11df-aa4a-080069138b88" uid="17194"/>
-        <specific value="2" description="928" uuid="e715b380-5269-11df-bfae-080069138b88" uid="17195"/>
-        <specific value="3" description="929" uuid="e716c87e-5269-11df-a5cf-080069138b88" uid="17196"/>
-        <specific value="4" description="930" uuid="e717d64c-5269-11df-9bd2-080069138b88" uid="17197"/>
-      </subcategory>
-      <subcategory value="3" description="US 1-511 (Shan) Class (LST)" uuid="e7198348-5269-11df-b47b-080069138b88" uid="17198">
-        <specific value="1" description="US1" uuid="e71a8c16-5269-11df-a930-080069138b88" uid="17199"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="e71ce0ce-5269-11df-81cb-080069138b88" uid="17200">
-      <subcategory value="1" description="Yudao class (landing ship medium)" uuid="e71de974-5269-11df-ae37-080069138b88" uid="17201"/>
-      <subcategory value="2" description="Yuliang class Type 079 (landing ship medium)" uuid="e71efaa8-5269-11df-a4be-080069138b88" uid="17202"/>
-      <subcategory value="3" description="Yuling class (landing ship medium)" uuid="e7200f2e-5269-11df-824c-080069138b88" uid="17203"/>
-      <subcategory value="4" description="Chinese Type class (landing ship medium)" uuid="e7211e46-5269-11df-a41a-080069138b88" uid="17204">
-        <specific value="1" description="972" uuid="e7222dc2-5269-11df-9d55-080069138b88" uid="17205"/>
-        <specific value="2" description="990 et al" uuid="e7233ba4-5269-11df-b019-080069138b88" uid="17206"/>
-      </subcategory>
-      <subcategory value="5" description="Yunnan class Type 067 (landing craft utility)" uuid="e724e8fa-5269-11df-9d08-080069138b88" uid="17207">
-        <specific value="1" description="3313" uuid="e725f6c8-5269-11df-a6a2-080069138b88" uid="17208"/>
-        <specific value="2" description="3321" uuid="e72704f0-5269-11df-8264-080069138b88" uid="17209"/>
-        <specific value="3" description="3344" uuid="e7281124-5269-11df-8d5c-080069138b88" uid="17210"/>
-        <specific value="4" description="5526" uuid="e7291b14-5269-11df-b733-080069138b88" uid="17211"/>
-        <specific value="5" description="7566" uuid="e72a2ce8-5269-11df-a441-080069138b88" uid="17212"/>
-        <specific value="6" description="7568 et al" uuid="e72b3a48-5269-11df-a195-080069138b88" uid="17213"/>
-      </subcategory>
-      <subcategory value="6" description="Yuch'in class Type 068/069 (landing craft utility)" uuid="e72cf00e-5269-11df-82a8-080069138b88" uid="17214">
-        <specific value="1" description="Y765 et al" uuid="e72dfe86-5269-11df-988d-080069138b88" uid="17215"/>
-      </subcategory>
-    </category>
-    <category value="14" description="Hydrofoil" uuid="e7304e2a-5269-11df-a81b-080069138b88" uid="17216">
-      <subcategory value="1" description="Huchuan class Type 025/026 (fast attack-torpedo)" uuid="e7315a2c-5269-11df-ae42-080069138b88" uid="17217">
-        <specific value="1" description="205" uuid="e7326962-5269-11df-a0f7-080069138b88" uid="17218"/>
-        <specific value="2" description="207-209" uuid="e7337708-5269-11df-9c7c-080069138b88" uid="17219"/>
-        <specific value="3" description="248" uuid="e73481d4-5269-11df-985b-080069138b88" uid="17220"/>
-        <specific value="4" description="1247" uuid="e7358fa2-5269-11df-8a13-080069138b88" uid="17221"/>
-        <specific value="5" description="2201" uuid="e7369b40-5269-11df-8127-080069138b88" uid="17222"/>
-        <specific value="6" description="2203" uuid="e737a36e-5269-11df-a3a0-080069138b88" uid="17223"/>
-        <specific value="7" description="3206" uuid="e738b448-5269-11df-a7a9-080069138b88" uid="17224"/>
-        <specific value="8" description="3214" uuid="e739c090-5269-11df-a1b2-080069138b88" uid="17225"/>
-        <specific value="9" description="6218" uuid="e73ac8dc-5269-11df-b5c3-080069138b88" uid="17226"/>
-        <specific value="10" description="7230 et al" uuid="e73bd934-5269-11df-a37b-080069138b88" uid="17227"/>
-      </subcategory>
-    </category>
-    <category value="15" description="Air Cushion/Surface Effect" uuid="e73e23d8-5269-11df-98cc-080069138b88" uid="17228">
-      <subcategory value="1" description="Jingsah II class" uuid="e73f3160-5269-11df-8570-080069138b88" uid="17229">
-        <specific value="1" description="452" uuid="e740414a-5269-11df-a63b-080069138b88" uid="17230"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="e7428de2-5269-11df-b97a-080069138b88" uid="17231">
-      <subcategory value="1" description="Daxin class (training ship)" uuid="e7439b88-5269-11df-9c43-080069138b88" uid="17232">
-        <specific value="1" description="81 Zhenghe" uuid="e744ad8e-5269-11df-b9ed-080069138b88" uid="17233"/>
-      </subcategory>
-      <subcategory value="2" description="Dajiang class (submarine support)" uuid="e7465a26-5269-11df-bec0-080069138b88" uid="17234">
-        <specific value="1" description="J121 Changxingdao" uuid="e74769b6-5269-11df-afef-080069138b88" uid="17235"/>
-        <specific value="2" description="J122 Chongmingdao" uuid="e748759a-5269-11df-93b0-080069138b88" uid="17236"/>
-        <specific value="3" description="J506 Yongxingdao" uuid="e7498282-5269-11df-9e4c-080069138b88" uid="17237"/>
-      </subcategory>
-      <subcategory value="3" description="Da Dong class (salvage)" uuid="e74b376c-5269-11df-b512-080069138b88" uid="17238">
-        <specific value="1" description="J304" uuid="e74c4a58-5269-11df-9ec8-080069138b88" uid="17239"/>
-      </subcategory>
-      <subcategory value="4" description="Dadao class (salvage)" uuid="e74df6c8-5269-11df-8ae3-080069138b88" uid="17240">
-        <specific value="1" description="Dadao" uuid="e74eff1e-5269-11df-9238-080069138b88" uid="17241"/>
-      </subcategory>
-      <subcategory value="5" description="Dalang class (submarine support)" uuid="e750bd36-5269-11df-a0b9-080069138b88" uid="17242">
-        <specific value="1" description="J503 Dalang" uuid="e751ccc6-5269-11df-9eca-080069138b88" uid="17243"/>
-        <specific value="2" description="J504" uuid="e752db34-5269-11df-8d03-080069138b88" uid="17244"/>
-      </subcategory>
-      <subcategory value="6" description="Dongxiu class (submarine support)" uuid="e754870e-5269-11df-8ae3-080069138b88" uid="17245">
-        <specific value="1" description="U911 Dongxiu" uuid="e7559432-5269-11df-9f8d-080069138b88" uid="17246"/>
-      </subcategory>
-      <subcategory value="7" description="Dazhi class (submarine support)" uuid="e757405c-5269-11df-bcce-080069138b88" uid="17247">
-        <specific value="1" description="920 Dazhi" uuid="e7584de4-5269-11df-9997-080069138b88" uid="17248"/>
-      </subcategory>
-      <subcategory value="8" description="Hudung class (submarine rescue)" uuid="e759fb8a-5269-11df-9ce4-080069138b88" uid="17249">
-        <specific value="1" description="403 Haijui" uuid="e75b0da4-5269-11df-8257-080069138b88" uid="17250"/>
-        <specific value="2" description="512 Haijui" uuid="e75c173a-5269-11df-943f-080069138b88" uid="17251"/>
-      </subcategory>
-      <subcategory value="9" description="DSRV (salvage submarine)" uuid="e75dc350-5269-11df-8654-080069138b88" uid="17252"/>
-      <subcategory value="10" description="Ten Ting class (salvage)" uuid="e75ed5c4-5269-11df-8901-080069138b88" uid="17253">
-        <specific value="1" description="456 Hai Lao" uuid="e75fe400-5269-11df-8342-080069138b88" uid="17254"/>
-        <specific value="2" description="520 Hai Lao" uuid="e760ec9c-5269-11df-9e59-080069138b88" uid="17255"/>
-        <specific value="3" description="523 Hai Lao" uuid="e761fcb8-5269-11df-b23b-080069138b88" uid="17256"/>
-        <specific value="4" description="666 Hai Lao" uuid="e7630a22-5269-11df-94e8-080069138b88" uid="17257"/>
-      </subcategory>
-      <subcategory value="11" description="Kansha class (salvage)" uuid="e764b6f6-5269-11df-8695-080069138b88" uid="17258">
-        <specific value="1" description="Kansha" uuid="e765c280-5269-11df-90f2-080069138b88" uid="17259"/>
-        <specific value="2" description="304 Haito" uuid="e766ce6e-5269-11df-98d9-080069138b88" uid="17260"/>
-        <specific value="3" description="403" uuid="e767db6a-5269-11df-8f20-080069138b88" uid="17261"/>
-      </subcategory>
-      <subcategory value="12" description="Jin Jian Xun 05 class (salvage)" uuid="e7698a50-5269-11df-9f14-080069138b88" uid="17262"/>
-      <subcategory value="13" description="Qionshe class (attack transport)" uuid="e76a9c2e-5269-11df-b89a-080069138b88" uid="17263">
-        <specific value="1" description="Y830" uuid="e76bae34-5269-11df-aa9e-080069138b88" uid="17264"/>
-        <specific value="2" description="Y831" uuid="e76cbba8-5269-11df-8cac-080069138b88" uid="17265"/>
-        <specific value="3" description="Y833 et al" uuid="e76dc494-5269-11df-b1d2-080069138b88" uid="17266"/>
-      </subcategory>
-      <subcategory value="14" description="Qionshe class (hospital)" uuid="e76f72ee-5269-11df-9fa4-080069138b88" uid="17267">
-        <specific value="1" description="Y833" uuid="e7708166-5269-11df-8632-080069138b88" uid="17268"/>
-      </subcategory>
-      <subcategory value="15" description="Fuqing class (replenishment oiler)" uuid="e7722e6c-5269-11df-9305-080069138b88" uid="17269">
-        <specific value="1" description="X575 Taicang" uuid="e7733ff0-5269-11df-a511-080069138b88" uid="17270"/>
-        <specific value="2" description="X615 Dongyun" uuid="e7744828-5269-11df-ad0b-080069138b88" uid="17271"/>
-      </subcategory>
-      <subcategory value="16" description="Shengli class (transport oiler)" uuid="e775f484-5269-11df-be58-080069138b88" uid="17272">
-        <specific value="1" description="X620" uuid="e77706c6-5269-11df-a5f5-080069138b88" uid="17273"/>
-        <specific value="2" description="X621" uuid="e7781336-5269-11df-8dc1-080069138b88" uid="17274"/>
-      </subcategory>
-      <subcategory value="17" description="Fulin class (transport oiler)" uuid="e779bd9e-5269-11df-a0b9-080069138b88" uid="17275">
-        <specific value="1" description="X583" uuid="e77acb58-5269-11df-883c-080069138b88" uid="17276"/>
-        <specific value="2" description="X606" uuid="e77bd804-5269-11df-8e08-080069138b88" uid="17277"/>
-        <specific value="3" description="X607" uuid="e77ce474-5269-11df-bd5c-080069138b88" uid="17278"/>
-        <specific value="4" description="X609" uuid="e77deec8-5269-11df-9a74-080069138b88" uid="17279"/>
-        <specific value="5" description="X628" uuid="e77efc96-5269-11df-a7eb-080069138b88" uid="17280"/>
-        <specific value="6" description="X629" uuid="e7800924-5269-11df-af4e-080069138b88" uid="17281"/>
-        <specific value="7" description="X633" uuid="e7810ee6-5269-11df-93ee-080069138b88" uid="17282"/>
-      </subcategory>
-      <subcategory value="18" description="Fuzhou class (transport oiler)" uuid="e782c0b0-5269-11df-a41f-080069138b88" uid="17283">
-        <specific value="1" description="X573" uuid="e783d108-5269-11df-8e11-080069138b88" uid="17284"/>
-        <specific value="2" description="X580" uuid="e784dbb6-5269-11df-acdc-080069138b88" uid="17285"/>
-        <specific value="3" description="X606" uuid="e785e3d0-5269-11df-9e6f-080069138b88" uid="17286"/>
-        <specific value="4" description="X629 et al" uuid="e786f3f6-5269-11df-955b-080069138b88" uid="17287"/>
-      </subcategory>
-      <subcategory value="19" description="Jinyou class (transport oiler)" uuid="e788a7aa-5269-11df-abf5-080069138b88" uid="17288">
-        <specific value="1" description="X622" uuid="e789b6cc-5269-11df-9405-080069138b88" uid="17289"/>
-        <specific value="2" description="X625" uuid="e78ac24c-5269-11df-bb11-080069138b88" uid="17290"/>
-        <specific value="3" description="X675" uuid="e78bd038-5269-11df-a8e7-080069138b88" uid="17291"/>
-      </subcategory>
-      <subcategory value="20" description="Leizhou class (transport oiler-light)" uuid="e78d7ef6-5269-11df-b00b-080069138b88" uid="17292">
-        <specific value="1" description="N1101 Liezhou et al" uuid="e78e8d78-5269-11df-a1a3-080069138b88" uid="17293"/>
-      </subcategory>
-      <subcategory value="21" description="Fuzhou class (water transport)" uuid="e7903f56-5269-11df-aa3b-080069138b88" uid="17294">
-        <specific value="1" description="416 Hai Shui" uuid="e7914a22-5269-11df-8bc9-080069138b88" uid="17295"/>
-        <specific value="2" description="419 Hai Shui" uuid="e7925804-5269-11df-8d76-080069138b88" uid="17296"/>
-        <specific value="3" description="556 Hai Shui" uuid="e7936500-5269-11df-ac05-080069138b88" uid="17297"/>
-        <specific value="4" description="557 Hai Shui" uuid="e79471d4-5269-11df-8ceb-080069138b88" uid="17298"/>
-        <specific value="5" description="608 Hai Shui et al" uuid="e7957e9e-5269-11df-a2df-080069138b88" uid="17299"/>
-      </subcategory>
-      <subcategory value="22" description="Leizhou class (water transport)" uuid="e7972a1e-5269-11df-a8ea-080069138b88" uid="17300">
-        <specific value="1" description="412 Hai Shui" uuid="e7983c06-5269-11df-8178-080069138b88" uid="17301"/>
-        <specific value="2" description="555 Hai Shui" uuid="e79943ee-5269-11df-adbc-080069138b88" uid="17302"/>
-        <specific value="3" description="558 Hai Shui" uuid="e79a51ee-5269-11df-99a0-080069138b88" uid="17303"/>
-      </subcategory>
-      <subcategory value="23" description="Yen Pai class (degaussing)" uuid="e79c0160-5269-11df-a716-080069138b88" uid="17304">
-        <specific value="1" description="746 Hai Dzu" uuid="e79d0e2a-5269-11df-a5a6-080069138b88" uid="17305"/>
-        <specific value="2" description="863 Dong Qin" uuid="e79e1932-5269-11df-a568-080069138b88" uid="17306"/>
-      </subcategory>
-      <subcategory value="24" description="Yenka class (degaussing)" uuid="e79fc4bc-5269-11df-a49c-080069138b88" uid="17307">
-        <specific value="1" description="745 Hai Dzu" uuid="e7a0d280-5269-11df-ba47-080069138b88" uid="17308"/>
-        <specific value="2" description="Hai Dzu" uuid="e7a1e10c-5269-11df-89ad-080069138b88" uid="17309"/>
-      </subcategory>
-      <subcategory value="25" description="Yen Fang class (degaussing)" uuid="e7a38f34-5269-11df-a3bf-080069138b88" uid="17310">
-        <specific value="1" description="950 Hai Dzu" uuid="e7a49816-5269-11df-9212-080069138b88" uid="17311"/>
-        <specific value="2" description="951 Hai Dzu" uuid="e7a5a6e8-5269-11df-89e1-080069138b88" uid="17312"/>
-      </subcategory>
-      <subcategory value="26" description="Haibing class (icebreaker)" uuid="e7a75d76-5269-11df-ae19-080069138b88" uid="17313">
-        <specific value="1" description="101" uuid="e7a86fae-5269-11df-989d-080069138b88" uid="17314"/>
-        <specific value="2" description="102" uuid="e7a976ba-5269-11df-9dc2-080069138b88" uid="17315"/>
-      </subcategory>
-      <subcategory value="27" description="Mod Yanha class (icebreaker)" uuid="e7ab2212-5269-11df-9429-080069138b88" uid="17316">
-        <specific value="1" description="723" uuid="e7ac3328-5269-11df-9947-080069138b88" uid="17317"/>
-      </subcategory>
-      <subcategory value="28" description="Yanha class (icebreaker)" uuid="e7adf104-5269-11df-8b09-080069138b88" uid="17318">
-        <specific value="1" description="519" uuid="e7aefe64-5269-11df-bb9b-080069138b88" uid="17319"/>
-      </subcategory>
-      <subcategory value="29" description="Galait class (cargo)" uuid="e7b0ac1e-5269-11df-aced-080069138b88" uid="17320">
-        <specific value="1" description="318 Haiyun" uuid="e7b1b820-5269-11df-8b1e-080069138b88" uid="17321"/>
-        <specific value="2" description="600 Haiyun" uuid="e7b2c5f8-5269-11df-83b5-080069138b88" uid="17322"/>
-      </subcategory>
-      <subcategory value="30" description="Dayun class (cargo)" uuid="e7b470e2-5269-11df-8b2a-080069138b88" uid="17323">
-        <specific value="1" description="951" uuid="e7b582ac-5269-11df-8a19-080069138b88" uid="17324"/>
-        <specific value="2" description="952" uuid="e7b689f4-5269-11df-9bcd-080069138b88" uid="17325"/>
-      </subcategory>
-      <subcategory value="31" description="Yukan class (cargo)" uuid="e7b834ac-5269-11df-9864-080069138b88" uid="17326">
-        <specific value="1" description="801" uuid="e7b944f0-5269-11df-924e-080069138b88" uid="17327"/>
-      </subcategory>
-      <subcategory value="32" description="Danlin class (cargo)" uuid="e7baefc6-5269-11df-8003-080069138b88" uid="17328">
-        <specific value="1" description="L191 Hai Leng" uuid="e7bbfefc-5269-11df-8661-080069138b88" uid="17329"/>
-        <specific value="2" description="L201 Hai Leng" uuid="e7bd0ab8-5269-11df-a035-080069138b88" uid="17330"/>
-        <specific value="3" description="L790 Hai Yun" uuid="e7be1778-5269-11df-b7d8-080069138b88" uid="17331"/>
-        <specific value="4" description="L795 Hai Yun" uuid="e7bf2618-5269-11df-b624-080069138b88" uid="17332"/>
-      </subcategory>
-      <subcategory value="33" description="Hongqi class (cargo)" uuid="e7c0d576-5269-11df-8e70-080069138b88" uid="17333">
-        <specific value="1" description="Y433" uuid="e7c1dd9a-5269-11df-a579-080069138b88" uid="17334"/>
-        <specific value="2" description="Y528" uuid="e7c2ef64-5269-11df-8335-080069138b88" uid="17335"/>
-        <specific value="3" description="Y755" uuid="e7c3fdc8-5269-11df-9f45-080069138b88" uid="17336"/>
-        <specific value="4" description="Y771" uuid="e7c505ba-5269-11df-b052-080069138b88" uid="17337"/>
-      </subcategory>
-      <subcategory value="34" description="Damen class (cargo)" uuid="e7c6bde2-5269-11df-9bba-080069138b88" uid="17338">
-        <specific value="1" description="Y529" uuid="e7c7cd0e-5269-11df-8da4-080069138b88" uid="17339"/>
-      </subcategory>
-      <subcategory value="35" description="Wulai class (cable)" uuid="e7c978a2-5269-11df-8390-080069138b88" uid="17340">
-        <specific value="1" description="230" uuid="e7ca895e-5269-11df-9b88-080069138b88" uid="17341"/>
-      </subcategory>
-      <subcategory value="36" description="Yan Jiu class (ocean tug)" uuid="e7cc34de-5269-11df-9d8c-080069138b88" uid="17342">
-        <specific value="1" description="14 Jan Jiu" uuid="e7cd40cc-5269-11df-866f-080069138b88" uid="17343"/>
-      </subcategory>
-      <subcategory value="37" description="Gromovoy class (ocean tug)" uuid="e7ceec9c-5269-11df-9df4-080069138b88" uid="17344">
-        <specific value="1" description="210 Haito" uuid="e7cffc86-5269-11df-8b43-080069138b88" uid="17345"/>
-        <specific value="2" description="221 Haito" uuid="e7d108a6-5269-11df-8a25-080069138b88" uid="17346"/>
-        <specific value="3" description="230 Haito" uuid="e7d21458-5269-11df-bcf3-080069138b88" uid="17347"/>
-        <specific value="4" description="231 Haito" uuid="e7d322c6-5269-11df-afd9-080069138b88" uid="17348"/>
-        <specific value="5" description="235 Haito" uuid="e7d42f22-5269-11df-902e-080069138b88" uid="17349"/>
-        <specific value="6" description="319 Haito" uuid="e7d53a8e-5269-11df-a8c0-080069138b88" uid="17350"/>
-        <specific value="7" description="T147 Haito" uuid="e7d647ee-5269-11df-9ca4-080069138b88" uid="17351"/>
-        <specific value="8" description="T716 Haito" uuid="e7d755b2-5269-11df-b81d-080069138b88" uid="17352"/>
-        <specific value="9" description="T802 Haito" uuid="e7d85ce6-5269-11df-8490-080069138b88" uid="17353"/>
-        <specific value="10" description="T814 Haito et al" uuid="e7d96ae6-5269-11df-8ac5-080069138b88" uid="17354"/>
-      </subcategory>
-      <subcategory value="38" description="Yung Gang (ocean tug)" uuid="e7db1bf2-5269-11df-9c22-080069138b88" uid="17355"/>
-      <subcategory value="39" description="Hujiu class (tug)" uuid="e7dc2ad8-5269-11df-a90d-080069138b88" uid="17356">
-        <specific value="1" description="T155" uuid="e7dd319e-5269-11df-98dc-080069138b88" uid="17357"/>
-        <specific value="2" description="T711" uuid="e7de408e-5269-11df-9fd2-080069138b88" uid="17358"/>
-        <specific value="3" description="T842" uuid="e7df5122-5269-11df-b40b-080069138b88" uid="17359"/>
-        <specific value="4" description="T867" uuid="e7e057d4-5269-11df-9707-080069138b88" uid="17360"/>
-      </subcategory>
-      <subcategory value="40" description="Tuzhong class (ocean tug-towing)" uuid="e7e203fe-5269-11df-8935-080069138b88" uid="17361">
-        <specific value="1" description="T154" uuid="e7e315aa-5269-11df-b156-080069138b88" uid="17362"/>
-        <specific value="2" description="T710" uuid="e7e421f2-5269-11df-bf03-080069138b88" uid="17363"/>
-        <specific value="3" description="T830" uuid="e7e53100-5269-11df-bfee-080069138b88" uid="17364"/>
-        <specific value="4" description="T890" uuid="e7e64298-5269-11df-b430-080069138b88" uid="17365"/>
-      </subcategory>
-      <subcategory value="41" description="Harbor tug" uuid="e7e7ee2c-5269-11df-80e1-080069138b88" uid="17366"/>
-    </category>
-    <category value="17" description="Auxiliary, Merchant Marine" uuid="e7e99ab0-5269-11df-a2f7-080069138b88" uid="17367">
-      <subcategory value="1" description="Ji Di Hao class (research)" uuid="e7eaa8c4-5269-11df-b871-080069138b88" uid="17368">
-        <specific value="1" description="Ji Di Hao" uuid="e7ebb53e-5269-11df-b723-080069138b88" uid="17369"/>
-      </subcategory>
-      <subcategory value="2" description="Dajiang class (research)" uuid="e7ed617c-5269-11df-974d-080069138b88" uid="17370">
-        <specific value="1" description="R327" uuid="e7ee6f40-5269-11df-b11d-080069138b88" uid="17371"/>
-        <specific value="2" description="3 Yuan Wang" uuid="e7ef7fde-5269-11df-84bb-080069138b88" uid="17372"/>
-      </subcategory>
-      <subcategory value="3" description="Yuan Wang class (space event)" uuid="e7f12b68-5269-11df-abe8-080069138b88" uid="17373">
-        <specific value="1" description="1 Yuan Wang" uuid="e7f2388c-5269-11df-a6c3-080069138b88" uid="17374"/>
-        <specific value="2" description="2 Yuan Wang" uuid="e7f34466-5269-11df-9955-080069138b88" uid="17375"/>
-      </subcategory>
-      <subcategory value="4" description="Shijian class (oceanographic research)" uuid="e7f4f464-5269-11df-b7d6-080069138b88" uid="17376">
-        <specific value="1" description="Shijian" uuid="e7f60430-5269-11df-99f7-080069138b88" uid="17377"/>
-        <specific value="2" description="Kexueyihao" uuid="e7f70af6-5269-11df-a38b-080069138b88" uid="17378"/>
-      </subcategory>
-      <subcategory value="5" description="Hai Ying class (oceanographic research)" uuid="e7f8b8ec-5269-11df-a352-080069138b88" uid="17379">
-        <specific value="1" description="Ke Xue Yihao" uuid="e7f9c8cc-5269-11df-b885-080069138b88" uid="17380"/>
-        <specific value="2" description="Ke Xue Yijao" uuid="e7fad848-5269-11df-9e73-080069138b88" uid="17381"/>
-      </subcategory>
-      <subcategory value="6" description="Kan class (oceanographic research)" uuid="e7fc8620-5269-11df-9eb4-080069138b88" uid="17382">
-        <specific value="1" description="102 Kan" uuid="e7fd8d90-5269-11df-b2a6-080069138b88" uid="17383"/>
-      </subcategory>
-      <subcategory value="7" description="Shuguang 04 class (oceanographic research)" uuid="e7ff3d48-5269-11df-89e8-080069138b88" uid="17384">
-        <specific value="1" description="04 Shuguang" uuid="e8004c24-5269-11df-bc41-080069138b88" uid="17385"/>
-        <specific value="2" description="05 Shuguang" uuid="e80157a4-5269-11df-ac5e-080069138b88" uid="17386"/>
-        <specific value="3" description="06 Shuguang" uuid="e8026004-5269-11df-aa6e-080069138b88" uid="17387"/>
-        <specific value="4" description="07 Shuguang" uuid="e80378f4-5269-11df-87ef-080069138b88" uid="17388"/>
-        <specific value="5" description="08 Shuguang" uuid="e80487f8-5269-11df-a453-080069138b88" uid="17389"/>
-      </subcategory>
-      <subcategory value="8" description="Hai Yang class (oceanographic research)" uuid="e8063396-5269-11df-9c21-080069138b88" uid="17390">
-        <specific value="1" description="01 Hai Yang" uuid="e807410a-5269-11df-8a55-080069138b88" uid="17391"/>
-        <specific value="2" description="02 Hai Yang" uuid="e8084ec4-5269-11df-8a01-080069138b88" uid="17392"/>
-      </subcategory>
-      <subcategory value="9" description="Hai class (oceanographic research)" uuid="e809fe2c-5269-11df-bcdc-080069138b88" uid="17393">
-        <specific value="1" description="521 Hai" uuid="e80b0baa-5269-11df-a35f-080069138b88" uid="17394"/>
-      </subcategory>
-      <subcategory value="10" description="Dong Fang Hong class (oceanographic research)" uuid="e80cbd24-5269-11df-b259-080069138b88" uid="17395">
-        <specific value="1" description="Dong Fang Hong" uuid="e80dc732-5269-11df-8f59-080069138b88" uid="17396"/>
-      </subcategory>
-      <subcategory value="11" description="Dadie (intelligence collection)" uuid="e80f744c-5269-11df-8369-080069138b88" uid="17397">
-        <specific value="1" description="841" uuid="e8108508-5269-11df-bae5-080069138b88" uid="17398"/>
-      </subcategory>
-      <subcategory value="12" description="Xing Fengshan class (intelligence collection)" uuid="e8123150-5269-11df-ba79-080069138b88" uid="17399">
-        <specific value="1" description="V856 Xing Fengshan" uuid="e813405e-5269-11df-b817-080069138b88" uid="17400"/>
-        <specific value="2" description="01 Xiangyang Hong" uuid="e8144b0c-5269-11df-b02b-080069138b88" uid="17401"/>
-        <specific value="3" description="04, 06 Yiangyang Hong" uuid="e8155902-5269-11df-827a-080069138b88" uid="17402"/>
-        <specific value="4" description="02, 03, 08 Xiangyang Hong" uuid="e816689c-5269-11df-9245-080069138b88" uid="17403"/>
-        <specific value="5" description="05 Xiangyang Hong" uuid="e8177200-5269-11df-b25e-080069138b88" uid="17404"/>
-        <specific value="6" description="09 Xiangyang Hong" uuid="e8187eca-5269-11df-8c44-080069138b88" uid="17405"/>
-        <specific value="7" description="10 Xiangyang Hong" uuid="e8199184-5269-11df-ba47-080069138b88" uid="17406"/>
-        <specific value="8" description="11-16 Xiangyang Hong" uuid="e81a9aac-5269-11df-9dbf-080069138b88" uid="17407"/>
-      </subcategory>
-      <subcategory value="13" description="Hen Hsi class (missile range instrumentation)" uuid="e81c4adc-5269-11df-a376-080069138b88" uid="17408">
-        <specific value="1" description="701 Hsun" uuid="e81d59a4-5269-11df-aeed-080069138b88" uid="17409"/>
-      </subcategory>
-      <subcategory value="14" description="Nan Hai class (geophysical research)" uuid="e81f0a88-5269-11df-bbf1-080069138b88" uid="17410">
-        <specific value="1" description="502 Han Hai" uuid="e82019d2-5269-11df-8951-080069138b88" uid="17411"/>
-        <specific value="2" description="511 Bin Hai" uuid="e82122aa-5269-11df-80fb-080069138b88" uid="17412"/>
-      </subcategory>
-      <subcategory value="15" description="Yenlai class (survey)" uuid="e822da64-5269-11df-bd53-080069138b88" uid="17413">
-        <specific value="1" description="K200" uuid="e823ead0-5269-11df-ba8f-080069138b88" uid="17414"/>
-        <specific value="2" description="226" uuid="e824f876-5269-11df-9cef-080069138b88" uid="17415"/>
-        <specific value="3" description="426" uuid="e825feba-5269-11df-b600-080069138b88" uid="17416"/>
-        <specific value="4" description="427" uuid="e8270f80-5269-11df-8556-080069138b88" uid="17417"/>
-        <specific value="5" description="943" uuid="e8281bdc-5269-11df-aabe-080069138b88" uid="17418"/>
-      </subcategory>
-      <subcategory value="16" description="Yenlun class (survey)" uuid="e829c95a-5269-11df-8ac2-080069138b88" uid="17419">
-        <specific value="1" description="583 Haitse" uuid="e82ad25a-5269-11df-bbf9-080069138b88" uid="17420"/>
-      </subcategory>
-      <subcategory value="17" description="King Hai class (survey)" uuid="e82c81d6-5269-11df-a20e-080069138b88" uid="17421">
-        <specific value="1" description="701 Hai Sheng" uuid="e82d8ea0-5269-11df-8a5e-080069138b88" uid="17422"/>
-        <specific value="2" description="702 Hai Sheng" uuid="e82eaa88-5269-11df-ba07-080069138b88" uid="17423"/>
-      </subcategory>
-      <subcategory value="18" description="Kaiboban class (survey)" uuid="e8305572-5269-11df-9a00-080069138b88" uid="17424">
-        <specific value="1" description="623 Hai Sheng" uuid="e8316110-5269-11df-9e6e-080069138b88" uid="17425"/>
-      </subcategory>
-      <subcategory value="19" description="Ganzhu class (survey)" uuid="e8330e02-5269-11df-ad7a-080069138b88" uid="17426">
-        <specific value="1" description="K420" uuid="e8341d24-5269-11df-a810-080069138b88" uid="17427"/>
-      </subcategory>
-      <subcategory value="20" description="Yanxi class (survey)" uuid="e835cb1a-5269-11df-bc86-080069138b88" uid="17428">
-        <specific value="1" description="V201" uuid="e836d884-5269-11df-97da-080069138b88" uid="17429"/>
-      </subcategory>
-      <subcategory value="21" description="Yannan class (survey)" uuid="e83884b8-5269-11df-a869-080069138b88" uid="17430">
-        <specific value="1" description="K982" uuid="e83990a6-5269-11df-b697-080069138b88" uid="17431"/>
-        <specific value="2" description="983" uuid="e83a9c26-5269-11df-9df3-080069138b88" uid="17432"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="e83ce8be-5269-11df-a82f-080069138b88" uid="17433">
-      <subcategory value="1" description="Container class" uuid="e83df682-5269-11df-9051-080069138b88" uid="17434">
-        <specific value="1" description="Bai Yu Lan" uuid="e83f0324-5269-11df-9cf3-080069138b88" uid="17435"/>
-        <specific value="2" description="Donghai" uuid="e8400fd0-5269-11df-896f-080069138b88" uid="17436"/>
-        <specific value="3" description="Keisho" uuid="e84123ca-5269-11df-a227-080069138b88" uid="17437"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker class" uuid="e842cf90-5269-11df-b1a6-080069138b88" uid="17438">
-        <specific value="1" description="Bin Hai 517" uuid="e843da8e-5269-11df-a2a8-080069138b88" uid="17439"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="45" uuid="e846d11c-5269-11df-bf74-080069138b88" uid="17440">
-    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="e847deea-5269-11df-8305-080069138b88" uid="17441">
-      <subcategory value="1" description="Xia Class (Type 092)" uuid="e848ebdc-5269-11df-bf2a-080069138b88" uid="17442">
-        <specific value="1" description="Xia" uuid="e849f932-5269-11df-aac3-080069138b88" uid="17443"/>
-      </subcategory>
-    </category>
-    <category value="3" description="SSN (Nuclear Attack - Torpedo)" uuid="e84c43ae-5269-11df-9f05-080069138b88" uid="17444">
-      <subcategory value="1" description="Han Class" uuid="e84d5582-5269-11df-a54b-080069138b88" uid="17445">
-        <specific value="1" description="Han 401" uuid="e84e62e2-5269-11df-90f5-080069138b88" uid="17446"/>
-        <specific value="2" description="Han 402" uuid="e84f6e8a-5269-11df-999b-080069138b88" uid="17447"/>
-        <specific value="3" description="Han 403" uuid="e850764a-5269-11df-9b02-080069138b88" uid="17448"/>
-        <specific value="4" description="Han 404" uuid="e85186e8-5269-11df-8d54-080069138b88" uid="17449"/>
-        <specific value="5" description="Han 405" uuid="e8529416-5269-11df-9f95-080069138b88" uid="17450"/>
-      </subcategory>
-    </category>
-    <category value="5" description="SS (Conventional Attack - Torpedo, Patrol)" uuid="e854e0cc-5269-11df-842e-080069138b88" uid="17451">
-      <subcategory value="1" description="Ming Class (Type 035)" uuid="e855f002-5269-11df-bdda-080069138b88" uid="17452">
-        <specific value="1" description="Ming 232" uuid="e856f8e4-5269-11df-b13b-080069138b88" uid="17453"/>
-        <specific value="2" description="Ming 233" uuid="e8580450-5269-11df-b1d3-080069138b88" uid="17454"/>
-        <specific value="3" description="Ming 342" uuid="e8591476-5269-11df-b876-080069138b88" uid="17455"/>
-        <specific value="4" description="Ming 352" uuid="e85a1d12-5269-11df-b7e0-080069138b88" uid="17456"/>
-        <specific value="5" description="Ming 353" uuid="e85b2a4a-5269-11df-8a82-080069138b88" uid="17457"/>
-        <specific value="6" description="Ming 354" uuid="e85c3782-5269-11df-871e-080069138b88" uid="17458"/>
-        <specific value="7" description="Ming 356" uuid="e85d4366-5269-11df-bf03-080069138b88" uid="17459"/>
-        <specific value="8" description="Ming 357" uuid="e85e510c-5269-11df-a280-080069138b88" uid="17460"/>
-        <specific value="9" description="Ming 358" uuid="e85f6740-5269-11df-97e9-080069138b88" uid="17461"/>
-      </subcategory>
-      <subcategory value="2" description="Song Class (Type 039) (SSG)" uuid="e86116f8-5269-11df-8765-080069138b88" uid="17462">
-        <specific value="1" description="Song 320" uuid="e8622106-5269-11df-a84d-080069138b88" uid="17463"/>
-        <specific value="2" description="Song 321" uuid="e8632e16-5269-11df-9014-080069138b88" uid="17464"/>
-        <specific value="3" description="Song 322" uuid="e8643a40-5269-11df-9a78-080069138b88" uid="17465"/>
-        <specific value="4" description="Song 323" uuid="e8654584-5269-11df-aff5-080069138b88" uid="17466"/>
-      </subcategory>
-      <subcategory value="3" description="KILO CLASS" status="new" uuid="2a1bf029-49c1-4c48-8509-0790bd163dac" uid="22798">
-        <cr value="1662"/>
-        <specific value="1" description="364" status="new" uuid="09749215-27d7-42b0-94e8-5cffe8800da0" uid="22799">
-          <cr value="1662"/>
-        </specific>
-        <specific value="2" description="365" status="new" uuid="5687bef8-76e1-43d7-923a-344483d62904" uid="22800">
-          <cr value="1662"/>
-        </specific>
-        <specific value="3" description="366" status="new" uuid="6c2f1e9f-5dca-442d-8d84-9550086e68e2" uid="22801">
-          <cr value="1662"/>
-        </specific>
-        <specific value="4" description="367" status="new" uuid="0843fc72-8561-45e8-9a63-201480436f8f" uid="22802">
-          <cr value="1662"/>
-        </specific>
-        <specific value="5" description="H5" status="new" uuid="3951716b-2329-4a24-a0dc-366d084e8f5c" uid="22803">
-          <cr value="1662"/>
-        </specific>
-        <specific value="6" description="H6" status="new" uuid="b39b5baf-3ce2-481b-837f-980afc394905" uid="22804">
-          <cr value="1662"/>
-        </specific>
-        <specific value="7" description="H7" status="new" uuid="79276dfb-e461-4ad2-952d-b42682c9d6b5" uid="22805">
-          <cr value="1662"/>
-        </specific>
-        <specific value="8" description="H8" status="new" uuid="f494b6fb-30bc-437e-b001-aef3f292d579" uid="22806">
-          <cr value="1662"/>
-        </specific>
-        <specific value="9" description="H9" status="new" uuid="f335267d-0ab6-4dbe-ae11-82793a71a729" uid="22807">
-          <cr value="1662"/>
-        </specific>
-        <specific value="10" description="H10" status="new" uuid="797240e2-bb20-47db-a753-f006ed7d0c4b" uid="22808">
-          <cr value="1662"/>
-        </specific>
-        <specific value="11" description="H11" status="new" uuid="dfcbddf1-30d5-4c6c-8c02-d808eb679d48" uid="22809">
-          <cr value="1662"/>
-        </specific>
-        <specific value="12" description="H12" status="new" uuid="3f6a0547-34a6-45ec-8365-7b4a3a74bb9a" uid="22810">
-          <cr value="1662"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="205" uuid="e86835dc-5269-11df-846e-080069138b88" uid="17467">
-    <category value="0" description="Other" uuid="e8694224-5269-11df-ba3c-080069138b88" uid="17468"/>
-    <category value="1" description="Tank" uuid="e86a482c-5269-11df-ada0-080069138b88" uid="17469">
-      <subcategory value="1" description="Leopard 2 MBT (variation)" status="new" uuid="a007ee8d-7cb8-4a0a-a3ee-41a8a37747f3" uid="22784">
-        <cr value="1633"/>
-        <specific value="1" description="Stridsvagn 121" status="new" uuid="a40b4f80-e4d8-4c00-b869-6fb791b80f90" uid="22785">
-          <cr value="1633"/>
-        </specific>
-        <specific value="2" description="Stridsvagn 122" status="new" uuid="7a7540bf-2d5b-4acb-b7e4-085ac10981dc" uid="22786">
-          <cr value="1633"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="2" description="Armored Fighting Vehicle" uuid="e86b558c-5269-11df-8ac5-080069138b88" uid="17470">
-      <subcategory value="1" description="Stridsfordon 90" uuid="e86c6878-5269-11df-aedf-080069138b88" uid="17471"/>
-      <subcategory value="2" description="Pansarbandvagn 302" uuid="e86d710a-5269-11df-8d04-080069138b88" uid="17472"/>
-    </category>
-    <category value="4" description="Self-propelled Artillery" uuid="e86f1c8a-5269-11df-b9ef-080069138b88" uid="17473">
-      <subcategory value="1" description="RBS-70 launcher" deprecated="1" uuid="e8702ca6-5269-11df-ae3b-080069138b88" uid="17474"/>
-      <subcategory value="2" description="RBS-15K launcher" uuid="e8713f4c-5269-11df-a496-080069138b88" uid="17475"/>
-    </category>
-    <category value="5" description="Towed Artillery" uuid="e872eb12-5269-11df-95cb-080069138b88" uid="17476">
-      <subcategory value="1" description="40mm Bofors" deprecated="1" uuid="e873f250-5269-11df-83c1-080069138b88" uid="17477"/>
-      <subcategory value="2" description="57mm Bofors" deprecated="1" uuid="e8750280-5269-11df-808b-080069138b88" uid="17478"/>
-    </category>
-    <category value="27" description="Civilian Vehicle" uuid="e876b24c-5269-11df-addc-080069138b88" uid="17479">
-      <subcategory value="1" description="Truck" uuid="e877bee4-5269-11df-8c4e-080069138b88" uid="17480"/>
-      <subcategory value="2" description="Bus" uuid="e878c99c-5269-11df-b265-080069138b88" uid="17481"/>
-      <subcategory value="3" description="Car" uuid="e879d6c0-5269-11df-8c8d-080069138b88" uid="17482"/>
-    </category>
-    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="e87b8312-5269-11df-b9c8-080069138b88" uid="17483">
-      <subcategory value="1" description="Towed VSHORAD Gun/Missile System" uuid="e87c90f4-5269-11df-b57b-080069138b88" uid="17484">
-        <specific value="1" description="40mm Bofors" uuid="e87d9ed6-5269-11df-821a-080069138b88" uid="17485">
-          <extra value="1" description="L/70 AA Gun" uuid="e87eb4b0-5269-11df-97a0-080069138b88" uid="17486"/>
-          <extra value="2" description="L/60 AA Gun" uuid="e87fc288-5269-11df-9757-080069138b88" uid="17487"/>
-        </specific>
-        <specific value="2" description="57mm Bofors" uuid="e88170ce-5269-11df-aa2b-080069138b88" uid="17488"/>
-        <specific value="3" description="RBS-70 Launcher" uuid="e8827898-5269-11df-94ed-080069138b88" uid="17489"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="205" uuid="e88566a2-5269-11df-92e0-080069138b88" uid="17490">
-    <category value="0" description="Other" uuid="e8867326-5269-11df-b997-080069138b88" uid="17491"/>
-    <category value="1" description="Fighter/Air Defense" uuid="e8877992-5269-11df-82f4-080069138b88" uid="17492">
-      <subcategory value="1" description="SAAB J 35 Draken" uuid="e8888972-5269-11df-bb97-080069138b88" uid="17493"/>
-      <subcategory value="2" description="SAAB JA 37 Viggen" uuid="e8899c40-5269-11df-bc3c-080069138b88" uid="17494"/>
-      <subcategory value="3" description="SAAB JAS 39 Gripen" uuid="e88aa3f6-5269-11df-bde9-080069138b88" uid="17495"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="205" uuid="e88cf5e8-5269-11df-8109-080069138b88" uid="17496">
-    <category value="0" description="Other" uuid="e88dfe48-5269-11df-85fd-080069138b88" uid="17497"/>
-    <category value="1" description="Carrier" uuid="e88f0af4-5269-11df-b426-080069138b88" uid="17498">
-      <subcategory value="1" description="Stockholm" uuid="e89017be-5269-11df-9f7e-080069138b88" uid="17499"/>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="e891c76c-5269-11df-b708-080069138b88" uid="17500"/>
-  </entity>
-  <entity kind="1" domain="4" country="205" uuid="e89372c4-5269-11df-b11b-080069138b88" uid="17501">
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="e8947d54-5269-11df-b03e-080069138b88" uid="17502">
-      <subcategory value="1" description="Nachen (Denmark)" uuid="e8958ba4-5269-11df-a25b-080069138b88" uid="17503"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="13" uuid="e897da62-5269-11df-a654-080069138b88" uid="17504">
-    <category value="4" description="Cargo/Tanker" uuid="e898e5ec-5269-11df-b25a-080069138b88" uid="17505">
-      <subcategory value="0" description="Other" uuid="e899f202-5269-11df-a180-080069138b88" uid="17506"/>
-      <subcategory value="1" description="GAF Normad" uuid="e89b039a-5269-11df-b051-080069138b88" uid="17507">
-        <specific value="1" description="N22B" uuid="e89c0b78-5269-11df-9dfa-080069138b88" uid="17508"/>
-        <specific value="2" description="N24A" uuid="e89d2012-5269-11df-9f5d-080069138b88" uid="17509"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="13" uuid="e8a00fa2-5269-11df-97f8-080069138b88" uid="17510">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e8a11d84-5269-11df-8e2a-080069138b88" uid="17511">
-      <subcategory value="0" description="Other" uuid="e8a22ada-5269-11df-a222-080069138b88" uid="17512"/>
-      <subcategory value="1" description="ANZAC Class (Meko 200)" uuid="e8a33970-5269-11df-84b5-080069138b88" uid="17513">
-        <specific value="1" description="FFH 150 Anzac" uuid="e8a44b62-5269-11df-af98-080069138b88" uid="17514"/>
-        <specific value="2" description="FFH 151 Arunta" uuid="e8a55746-5269-11df-9960-080069138b88" uid="17515"/>
-        <specific value="3" description="FFH 152 Warumungu" uuid="e8a66622-5269-11df-9b10-080069138b88" uid="17516"/>
-        <specific value="4" description="FFH 153 Stuart" uuid="e8a774f4-5269-11df-af37-080069138b88" uid="17517"/>
-        <specific value="5" description="FFH 154 Parramatta" uuid="e8a87c78-5269-11df-ad32-080069138b88" uid="17518"/>
-        <specific value="6" description="FFH 155 Ballarat" uuid="e8a98d8e-5269-11df-bc58-080069138b88" uid="17519"/>
-        <specific value="7" description="FFH 156 Toowoomba" uuid="e8aa9ff8-5269-11df-b55c-080069138b88" uid="17520"/>
-        <specific value="8" description="FFH 157 Perth" uuid="e8aba768-5269-11df-a8ab-080069138b88" uid="17521"/>
-        <specific value="9" description="Te Kaha (New Zealand)" uuid="e8acb518-5269-11df-920d-080069138b88" uid="17522"/>
-        <specific value="10" description="Te Mana (new Zealand)" uuid="e8adc50c-5269-11df-9c22-080069138b88" uid="17523"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="e8b0123a-5269-11df-a97e-080069138b88" uid="17524">
-      <subcategory value="0" description="Other" uuid="e8b11f04-5269-11df-8cd7-080069138b88" uid="17525"/>
-      <subcategory value="1" description="Fremantle Class (Large Patrol Craft)" uuid="e8b22886-5269-11df-a0bf-080069138b88" uid="17526">
-        <specific value="1" description="P 203 Fremantle" uuid="e8b33884-5269-11df-aa72-080069138b88" uid="17527"/>
-        <specific value="2" description="P 204 Warrnambool" uuid="e8b44a80-5269-11df-9c08-080069138b88" uid="17528"/>
-        <specific value="3" description="P 205 Townsville" uuid="e8b55574-5269-11df-a303-080069138b88" uid="17529"/>
-        <specific value="4" description="P 206 Wollongong" uuid="e8b6641e-5269-11df-b452-080069138b88" uid="17530"/>
-        <specific value="5" description="P 207 Launceston" uuid="e8b77502-5269-11df-bad0-080069138b88" uid="17531"/>
-        <specific value="6" description="P 208 Whyalla" uuid="e8b87e20-5269-11df-9bba-080069138b88" uid="17532"/>
-        <specific value="7" description="P 209 Ipswich" uuid="e8b98b30-5269-11df-8066-080069138b88" uid="17533"/>
-        <specific value="8" description="P 210 Cessnock" uuid="e8ba98f4-5269-11df-add2-080069138b88" uid="17534"/>
-        <specific value="9" description="P 211 Bendigo" uuid="e8bba58c-5269-11df-a70a-080069138b88" uid="17535"/>
-        <specific value="10" description="P 212 Gawler" uuid="e8bcbaf8-5269-11df-9264-080069138b88" uid="17536"/>
-        <specific value="11" description="P 213 Geraldton" uuid="e8bdcaec-5269-11df-91a6-080069138b88" uid="17537"/>
-        <specific value="12" description="P 214 Dubbo" uuid="e8bed7fc-5269-11df-a8f6-080069138b88" uid="17538"/>
-        <specific value="13" description="P 215 Geelong" uuid="e8bfe61a-5269-11df-9375-080069138b88" uid="17539"/>
-        <specific value="14" description="P 216 Gladstone" uuid="e8c0f348-5269-11df-a220-080069138b88" uid="17540"/>
-        <specific value="15" description="P 217 Bunbury" uuid="e8c1fc5c-5269-11df-b62c-080069138b88" uid="17541"/>
-      </subcategory>
-      <subcategory value="2" description="Fremantle Class (Modified)" uuid="e8c3ae26-5269-11df-8fd1-080069138b88" uid="17542">
-        <specific value="1" description="Kula (Fiji)" uuid="e8c4bcd0-5269-11df-a60e-080069138b88" uid="17543"/>
-        <specific value="2" description="Kikau (Fiji)" uuid="e8c5cb7a-5269-11df-85cf-080069138b88" uid="17544"/>
-        <specific value="3" description="Kiro (Fiji)" uuid="e8c6d862-5269-11df-99ae-080069138b88" uid="17545"/>
-        <specific value="4" description="Tukoro (Vanuatu)" uuid="e8c7e57c-5269-11df-a82f-080069138b88" uid="17546"/>
-        <specific value="5" description="Teanaoai (Kiribati)" uuid="e8c8f28c-5269-11df-95dc-080069138b88" uid="17547"/>
-        <specific value="6" description="Lomor (Marshall Islands)" uuid="e8c9ff74-5269-11df-82cf-080069138b88" uid="17548"/>
-        <specific value="7" description="Palikir (Micronesia)" uuid="e8cb0dba-5269-11df-8285-080069138b88" uid="17549"/>
-        <specific value="8" description="Micronesia (Micronesia)" uuid="e8cc1cb4-5269-11df-8c9b-080069138b88" uid="17550"/>
-        <specific value="9" description="Independence (Micronesia)" uuid="e8cd2438-5269-11df-a14f-080069138b88" uid="17551"/>
-        <specific value="10" description="Neiafu (Tonga)" uuid="e8ce34cc-5269-11df-b630-080069138b88" uid="17552"/>
-        <specific value="11" description="Pangui (Tonga)" uuid="e8cf4768-5269-11df-ae4a-080069138b88" uid="17553"/>
-        <specific value="12" description="Savea (Tonga)" uuid="e8d04fd2-5269-11df-b558-080069138b88" uid="17554"/>
-        <specific value="13" description="Te Mataili (Tuvalu)" uuid="e8d15d82-5269-11df-bd93-080069138b88" uid="17555"/>
-        <specific value="14" description="President HI Remeliik (Palau)" uuid="e8d26e16-5269-11df-a089-080069138b88" uid="17556"/>
-        <specific value="15" description="Nalanva (Western Samoa)" uuid="e8d37bd0-5269-11df-83aa-080069138b88" uid="17557"/>
-        <specific value="16" description="Te Kukupa (Cook Islands)" uuid="e8d489da-5269-11df-aa13-080069138b88" uid="17558"/>
-        <specific value="17" description="Tarangau (PNG)" uuid="e8d59b22-5269-11df-9176-080069138b88" uid="17559"/>
-        <specific value="18" description="Dregen (PNG)" uuid="e8d6a436-5269-11df-b9b4-080069138b88" uid="17560"/>
-        <specific value="19" description="Seeadler (PNG)" uuid="e8d7b448-5269-11df-9e2b-080069138b88" uid="17561"/>
-        <specific value="20" description="Baslislk (PNG)" uuid="e8d8c0f4-5269-11df-88ce-080069138b88" uid="17562"/>
-        <specific value="21" description="Lata (Solomon Islands)" uuid="e8d9ca12-5269-11df-a2a7-080069138b88" uid="17563"/>
-        <specific value="22" description="Auki (Solomon Islands)" uuid="e8dae528-5269-11df-86c6-080069138b88" uid="17564"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e8dd3170-5269-11df-9f61-080069138b88" uid="17565">
-      <subcategory value="0" description="Other" uuid="e8de43f8-5269-11df-9c10-080069138b88" uid="17566"/>
-      <subcategory value="1" description="Huon Class (Minehunters-Coastal)" uuid="e8df56e4-5269-11df-b0d4-080069138b88" uid="17567">
-        <specific value="1" description="M 82 Huon" uuid="e8e0662e-5269-11df-8a3a-080069138b88" uid="17568"/>
-        <specific value="2" description="M 83 Hawkesbury" uuid="e8e1703c-5269-11df-94e5-080069138b88" uid="17569"/>
-        <specific value="3" description="M 84 Norman" uuid="e8e27cd4-5269-11df-98e9-080069138b88" uid="17570"/>
-        <specific value="4" description="M 85 Gascoyne" uuid="e8e38ec6-5269-11df-a422-080069138b88" uid="17571"/>
-        <specific value="5" description="M 86 Diamantina" uuid="e8e498ca-5269-11df-b5fe-080069138b88" uid="17572"/>
-        <specific value="6" description="M 87 Yarra" uuid="e8e5a724-5269-11df-85c6-080069138b88" uid="17573"/>
-      </subcategory>
-      <subcategory value="2" description="Bay Class (Minehunters - Inshore)" uuid="e8e753f8-5269-11df-9fa1-080069138b88" uid="17574">
-        <specific value="1" description="M 80 Rushcutter" uuid="e8e86658-5269-11df-bdfd-080069138b88" uid="17575"/>
-        <specific value="2" description="M 81 Shoalwater" uuid="e8e96f1c-5269-11df-8e1f-080069138b88" uid="17576"/>
-      </subcategory>
-      <subcategory value="3" description="COOP Class (Minesweepers - Auxiliary)" uuid="e8eb1a7e-5269-11df-9560-080069138b88" uid="17577">
-        <specific value="1" description="1102 Brolga" uuid="e8ec2cd4-5269-11df-a659-080069138b88" uid="17578"/>
-        <specific value="2" description="1185 Koraaga" uuid="e8ed3bba-5269-11df-970c-080069138b88" uid="17579"/>
-        <specific value="3" description="Y 298 Bandicoot" uuid="e8ee4474-5269-11df-a37d-080069138b88" uid="17580"/>
-        <specific value="4" description="Y 299 Wallaroo" uuid="e8ef5472-5269-11df-b263-080069138b88" uid="17581"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Landing Craft" uuid="e8f19de0-5269-11df-a0c7-080069138b88" uid="17582">
-      <subcategory value="1" description="Modified Sir Bedivere Class" uuid="e8f2af14-5269-11df-8594-080069138b88" uid="17583">
-        <specific value="1" description="LSH 50 Tobruk Tank landing ship" uuid="e8f3be40-5269-11df-8be2-080069138b88" uid="17584"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="e8f60e70-5269-11df-b758-080069138b88" uid="17585">
-      <subcategory value="0" description="Other" uuid="e8f71b76-5269-11df-a24d-080069138b88" uid="17586"/>
-      <subcategory value="1" description="LCH Type" uuid="e8f82a3e-5269-11df-985d-080069138b88" uid="17587">
-        <specific value="1" description="L 126 Balikpapan" uuid="e8f94040-5269-11df-889c-080069138b88" uid="17588"/>
-        <specific value="2" description="L 127 Brunei" uuid="e8fa49cc-5269-11df-8e70-080069138b88" uid="17589"/>
-        <specific value="3" description="L 128 Labuan" uuid="e8fb5a10-5269-11df-8b05-080069138b88" uid="17590"/>
-        <specific value="4" description="L 129 Tarakan" uuid="e8fc6c20-5269-11df-b225-080069138b88" uid="17591"/>
-        <specific value="5" description="L 130 Wewak" uuid="e8fd7520-5269-11df-b519-080069138b88" uid="17592"/>
-        <specific value="6" description="L 133 Betano" uuid="e8fe8212-5269-11df-8253-080069138b88" uid="17593"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="e900d22e-5269-11df-bea6-080069138b88" uid="17594">
-      <subcategory value="1" description="Incat class: Fast Sealift Catamaran" uuid="e901df84-5269-11df-819e-080069138b88" uid="17595">
-        <specific value="1" description="AKR45 Jervis Bay" uuid="e902ee6a-5269-11df-92a1-080069138b88" uid="17596"/>
-      </subcategory>
-      <subcategory value="2" description="Austal class: Fast Sealift Catamaran" uuid="e904a002-5269-11df-bece-080069138b88" uid="17597">
-        <specific value="1" description="Westpac Express" uuid="e905af1a-5269-11df-8913-080069138b88" uid="17598"/>
-      </subcategory>
-      <subcategory value="3" description="Durance class (Underway Replenishment Tanker) AOR" uuid="e9075c70-5269-11df-9c17-080069138b88" uid="17599"/>
-      <subcategory value="4" description="Leaf class (Underway Replenishment Tanker) AOR/AOT" uuid="e9086a8e-5269-11df-b8d6-080069138b88" uid="17600"/>
-    </category>
-    <category value="50" description="Frigate" uuid="e90a18d4-5269-11df-a085-080069138b88" uid="17601">
-      <subcategory value="0" description="Other" uuid="e90b25b2-5269-11df-b35d-080069138b88" uid="17602"/>
-      <subcategory value="1" description="River Class (FF)" uuid="e90c3826-5269-11df-aea6-080069138b88" uid="17603"/>
-    </category>
-    <category value="54" description="Amphibious Assault Ship" uuid="e90de374-5269-11df-ada6-080069138b88" uid="17604">
-      <subcategory value="0" description="Other" uuid="e90eeefe-5269-11df-a35d-080069138b88" uid="17605"/>
-      <subcategory value="1" description="Modified Sir Bedivere Class" deprecated="1" uuid="e90ffe70-5269-11df-b7b4-080069138b88" uid="17606">
-        <specific value="1" description="LSH 50 Tobruk" deprecated="1" uuid="e9110e5a-5269-11df-97b8-080069138b88" uid="17607"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="13" uuid="e913f836-5269-11df-83a5-080069138b88" uid="17608">
-    <category value="4" description="SSG (Conventional Guided Missile)" uuid="e915087a-5269-11df-89fc-080069138b88" uid="17609">
-      <subcategory value="0" description="Other" uuid="e91617b0-5269-11df-854d-080069138b88" uid="17610"/>
-      <subcategory value="1" description="Collins Class" uuid="e917209c-5269-11df-ab3f-080069138b88" uid="17611">
-        <specific value="1" description="S 71 Collins" uuid="e9183518-5269-11df-8e2d-080069138b88" uid="17612"/>
-        <specific value="2" description="S 72 Farncomb" uuid="e9194570-5269-11df-9dc3-080069138b88" uid="17613"/>
-        <specific value="3" description="S 73 Waller" uuid="e91a57a8-5269-11df-aa4e-080069138b88" uid="17614"/>
-        <specific value="4" description="S 74 Dechaineux" uuid="e91b61c0-5269-11df-8967-080069138b88" uid="17615"/>
-        <specific value="5" description="S 75 Sheean" uuid="e91c6f16-5269-11df-afaa-080069138b88" uid="17616"/>
-        <specific value="6" description="S 76 Rankin" uuid="e91d7df2-5269-11df-910b-080069138b88" uid="17617"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="120" uuid="e92069e0-5269-11df-85af-080069138b88" uid="17618">
-    <category value="1" description="Tank" uuid="e921742a-5269-11df-a945-080069138b88" uid="17619">
-      <subcategory value="1" description="Type 88" uuid="e9228220-5269-11df-9952-080069138b88" uid="17620"/>
-      <subcategory value="2" description="K1 105mm MBT" uuid="e923935e-5269-11df-93d1-080069138b88" uid="17621"/>
-      <subcategory value="3" description="K1A1 120mm MBT" uuid="e9249dc6-5269-11df-9f05-080069138b88" uid="17622"/>
-    </category>
-    <category value="2" description="Armored Fighting Vehicle" uuid="e9264d10-5269-11df-ae6c-080069138b88" uid="17623">
-      <subcategory value="1" description="KM900 Armored Personnel Carrier" uuid="e9275c1e-5269-11df-9200-080069138b88" uid="17624"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="120" uuid="e929ad70-5269-11df-88cc-080069138b88" uid="17625">
-    <category value="4" description="Cargo/Tanker" uuid="e92ab9fe-5269-11df-bf20-080069138b88" uid="17626">
-      <subcategory value="1" description="Aircraft Technologies Industries (Airtech) CN-235" uuid="e92bc7cc-5269-11df-8d83-080069138b88" uid="17627">
-        <specific value="1" description="CN-235 M" uuid="e92cd9b4-5269-11df-9152-080069138b88" uid="17628"/>
-      </subcategory>
-    </category>
-    <category value="21" description="Utility Helicopter" uuid="e92f2660-5269-11df-b276-080069138b88" uid="17629">
-      <subcategory value="1" description="Kawasaki BK 117" uuid="e930350a-5269-11df-8ad9-080069138b88" uid="17630"/>
-    </category>
-    <category value="40" description="Trainer" uuid="e931e1b6-5269-11df-8cc0-080069138b88" uid="17631">
-      <subcategory value="1" description="KTX-1 Yeo-Myoung (Dawn)" uuid="e932ede0-5269-11df-8f8a-080069138b88" uid="17632"/>
-    </category>
-    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="e9349b86-5269-11df-b2c3-080069138b88" uid="17633">
-      <subcategory value="1" description="Passenger Airline" uuid="e935ab98-5269-11df-a079-080069138b88" uid="17634">
-        <specific value="1" description="Fokker 1000" uuid="e936c51e-5269-11df-89fd-080069138b88" uid="17635"/>
-        <specific value="2" description="CHK-91 Chang-Gong 91 (Blue Sky 91)" uuid="e937cebe-5269-11df-8138-080069138b88" uid="17636"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="120" uuid="e93ac04c-5269-11df-abb5-080069138b88" uid="17637">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e93bccda-5269-11df-8a02-080069138b88" uid="17638">
-      <subcategory value="1" description="Ulsan Class" uuid="e93cd42c-5269-11df-bf9d-080069138b88" uid="17639">
-        <specific value="1" description="FF 951 Ulsan" uuid="e93de42a-5269-11df-9085-080069138b88" uid="17640"/>
-        <specific value="2" description="FF 952 Seoul" uuid="e93ef716-5269-11df-9d51-080069138b88" uid="17641"/>
-        <specific value="3" description="FF 953 Chung Nam" uuid="e93ffeea-5269-11df-a49a-080069138b88" uid="17642"/>
-        <specific value="4" description="FF 955 Masan" uuid="e9410ca4-5269-11df-9b8d-080069138b88" uid="17643"/>
-        <specific value="5" description="FF 956 Kyong Buk" uuid="e9421d56-5269-11df-a802-080069138b88" uid="17644"/>
-        <specific value="6" description="FF 957 Chon Nam" uuid="e94327c8-5269-11df-8724-080069138b88" uid="17645"/>
-        <specific value="7" description="FF 958 Che Ju" uuid="e94434ba-5269-11df-9610-080069138b88" uid="17646"/>
-        <specific value="8" description="FF 959 Busan" uuid="e9454648-5269-11df-8fd6-080069138b88" uid="17647"/>
-        <specific value="9" description="FF 961 Chung Ju" uuid="e9464f20-5269-11df-832f-080069138b88" uid="17648"/>
-      </subcategory>
-      <subcategory value="2" description="Po Hang Class (Corvette)" uuid="e947fcd0-5269-11df-bdd7-080069138b88" uid="17649">
-        <specific value="1" description="756 Po Hang" uuid="e9490a9e-5269-11df-a734-080069138b88" uid="17650"/>
-        <specific value="2" description="757 Kun San" uuid="e94a1c40-5269-11df-81f3-080069138b88" uid="17651"/>
-        <specific value="3" description="758 Kyong Ju" uuid="e94b24be-5269-11df-9f0f-080069138b88" uid="17652"/>
-        <specific value="4" description="759 Mok Po" uuid="e94c32aa-5269-11df-85f5-080069138b88" uid="17653"/>
-        <specific value="5" description="761 Kim Chon" uuid="e94d40a0-5269-11df-9e3d-080069138b88" uid="17654"/>
-        <specific value="6" description="762 Chung Ju" uuid="e94e4ec8-5269-11df-a08d-080069138b88" uid="17655"/>
-        <specific value="7" description="763 Jin Ju" uuid="e94f5c28-5269-11df-ab54-080069138b88" uid="17656"/>
-        <specific value="8" description="765 Yo Su" uuid="e950682a-5269-11df-986b-080069138b88" uid="17657"/>
-        <specific value="9" description="766 An Dong" uuid="e95170f8-5269-11df-8eda-080069138b88" uid="17658"/>
-        <specific value="10" description="767 Sun Chon" uuid="e9528538-5269-11df-9bb6-080069138b88" uid="17659"/>
-        <specific value="11" description="768 Yee Ree" uuid="e953936a-5269-11df-87b3-080069138b88" uid="17660"/>
-        <specific value="12" description="769 Won Ju" uuid="e9549a1c-5269-11df-9b65-080069138b88" uid="17661"/>
-        <specific value="13" description="771 Je Chon" uuid="e955b3c0-5269-11df-9e5e-080069138b88" uid="17662"/>
-        <specific value="14" description="772 Chon An" uuid="e956c2ce-5269-11df-b47e-080069138b88" uid="17663"/>
-        <specific value="15" description="773 Song Nam" uuid="e957cb6a-5269-11df-9581-080069138b88" uid="17664"/>
-        <specific value="16" description="775 Bu Chon" uuid="e958d956-5269-11df-bf2d-080069138b88" uid="17665"/>
-        <specific value="17" description="776 Dae Chon" uuid="e959ea9e-5269-11df-bf6f-080069138b88" uid="17666"/>
-        <specific value="18" description="777 Jin Hae" uuid="e95af3e4-5269-11df-b8f5-080069138b88" uid="17667"/>
-        <specific value="19" description="778 Sok Cho" uuid="e95c019e-5269-11df-9715-080069138b88" uid="17668"/>
-        <specific value="20" description="779 Yong Ju" uuid="e95d1138-5269-11df-b60e-080069138b88" uid="17669"/>
-        <specific value="21" description="781 Nam Won" uuid="e95e1d8a-5269-11df-8c65-080069138b88" uid="17670"/>
-        <specific value="22" description="782 Kwan Myong" uuid="e95f2bbc-5269-11df-9821-080069138b88" uid="17671"/>
-        <specific value="23" description="783" uuid="e96037c8-5269-11df-8bac-080069138b88" uid="17672"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="e96286cc-5269-11df-a7f9-080069138b88" uid="17673">
-      <subcategory value="1" description="Pae Ku (PSMM 5) Class (fast attack craft-missile)" uuid="e96394d6-5269-11df-a8d0-080069138b88" uid="17674">
-        <specific value="1" description="PGM 582 Pae Ku 52" uuid="e964a074-5269-11df-8c6f-080069138b88" uid="17675"/>
-        <specific value="2" description="PGM 583 Pae Ku 53" uuid="e965b194-5269-11df-b77d-080069138b88" uid="17676"/>
-        <specific value="3" description="PGM 585 Pae Ku 55" uuid="e966bfc6-5269-11df-9d73-080069138b88" uid="17677"/>
-        <specific value="4" description="PGM 586 Pae Ku 56" uuid="e967c89e-5269-11df-9304-080069138b88" uid="17678"/>
-        <specific value="5" description="PGM 587 Pae Ku 57" uuid="e968d55e-5269-11df-b1aa-080069138b88" uid="17679"/>
-        <specific value="6" description="PGM 588 Pae Ku 58" uuid="e969e7f0-5269-11df-9a6e-080069138b88" uid="17680"/>
-        <specific value="7" description="PGM 589 Pae Ku 59" uuid="e96af050-5269-11df-a847-080069138b88" uid="17681"/>
-        <specific value="8" description="PGM 591 Pae Ku 51" uuid="e96bfeb4-5269-11df-8282-080069138b88" uid="17682"/>
-      </subcategory>
-      <subcategory value="2" description="Sea Dolphin Class (fast attack craft-patrol)" uuid="e96dac82-5269-11df-b4da-080069138b88" uid="17683">
-        <specific value="1" description="PKM 212-358 series" uuid="e96ebfd2-5269-11df-ace3-080069138b88" uid="17684"/>
-      </subcategory>
-      <subcategory value="3" description="Wildcat Class (fast attack craft-missile)" uuid="e9706cf6-5269-11df-8d2f-080069138b88" uid="17685">
-        <specific value="1" description="PKM 271-72" uuid="e97178bc-5269-11df-9cbb-080069138b88" uid="17686"/>
-      </subcategory>
-      <subcategory value="4" description="Sea Hawk Class (fast attack craft-patrol)" uuid="e97328e2-5269-11df-a71f-080069138b88" uid="17687">
-        <specific value="1" description="PK 161-189 series" uuid="e97440e2-5269-11df-ab77-080069138b88" uid="17688"/>
-      </subcategory>
-      <subcategory value="5" description="Sea Fox Class (fast attack craft-patrol)" uuid="e975ef1e-5269-11df-9780-080069138b88" uid="17689">
-        <specific value="1" description="PK 161-189 series" uuid="e9770fb6-5269-11df-a66e-080069138b88" uid="17690"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e9795ef6-5269-11df-a4e0-080069138b88" uid="17691">
-      <subcategory value="1" description="Swallow Class (minehunter)" uuid="e97a6ecc-5269-11df-ae80-080069138b88" uid="17692">
-        <specific value="1" description="561 Kang Keong" uuid="e97b7ce0-5269-11df-b39c-080069138b88" uid="17693"/>
-        <specific value="2" description="562 Kang Jin" uuid="e97c8b8a-5269-11df-9c3c-080069138b88" uid="17694"/>
-        <specific value="3" description="563 Ko Ryeong" uuid="e97d984a-5269-11df-8472-080069138b88" uid="17695"/>
-        <specific value="4" description="565 Kim Po" uuid="e97ea0b4-5269-11df-ba98-080069138b88" uid="17696"/>
-        <specific value="5" description="566 Ko Chang" uuid="e97fb2c4-5269-11df-b2c9-080069138b88" uid="17697"/>
-        <specific value="6" description="567 Kum Cha" uuid="e980c16e-5269-11df-bba6-080069138b88" uid="17698"/>
-      </subcategory>
-      <subcategory value="2" description="US MSC 268 Class (minesweeper-coastal)" uuid="e9826e88-5269-11df-bee8-080069138b88" uid="17699">
-        <specific value="1" description="MSC 551 Kum San" uuid="e9837cc4-5269-11df-9dd1-080069138b88" uid="17700"/>
-        <specific value="2" description="MSC 552 Ko Hung" uuid="e9848b5a-5269-11df-a1df-080069138b88" uid="17701"/>
-        <specific value="3" description="MSC 553 Kum Kok" uuid="e9859950-5269-11df-96d2-080069138b88" uid="17702"/>
-      </subcategory>
-      <subcategory value="3" description="US MSC 389 Class (minesweeper-coastal)" uuid="e987491c-5269-11df-b73b-080069138b88" uid="17703">
-        <specific value="1" description="MSC 555 Nam Yang" uuid="e9885352-5269-11df-8ac4-080069138b88" uid="17704"/>
-        <specific value="2" description="MSC 556 Ha Dong" uuid="e98960e4-5269-11df-bffc-080069138b88" uid="17705"/>
-        <specific value="3" description="MSC 557 Sam Kok" uuid="e98a70e2-5269-11df-94ab-080069138b88" uid="17706"/>
-        <specific value="4" description="MSC 558 Yong Dong" uuid="e98b78f2-5269-11df-b19f-080069138b88" uid="17707"/>
-        <specific value="5" description="MSC 559 Ok Cheon" uuid="e98c8800-5269-11df-ae61-080069138b88" uid="17708"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Tank Landing Ship" uuid="e98ed5ec-5269-11df-8bd1-080069138b88" uid="17709">
-      <subcategory value="1" description="Alligator Class (LST)" uuid="e98fe2ac-5269-11df-aeba-080069138b88" uid="17710"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="e9919520-5269-11df-ba99-080069138b88" uid="17711">
-      <subcategory value="1" description="Chun Jee Class (HDA 8000) (AOE)" uuid="e992aa3c-5269-11df-91a9-080069138b88" uid="17712">
-        <specific value="1" description="AO 57 Chun Jee" uuid="e993bdb4-5269-11df-b93d-080069138b88" uid="17713"/>
-        <specific value="2" description="AO 53" uuid="e994c5c4-5269-11df-af08-080069138b88" uid="17714"/>
-      </subcategory>
-      <subcategory value="2" description="Furseal Class (LCU)" uuid="e99673c4-5269-11df-8165-080069138b88" uid="17715">
-        <specific value="1" description="72, 73-75-78 Mulkae" uuid="e9978606-5269-11df-8999-080069138b88" uid="17716"/>
-      </subcategory>
-      <subcategory value="3" description="Surveying Ship" uuid="e999329e-5269-11df-a98d-080069138b88" uid="17717">
-        <specific value="1" description="801-803, 805, 806 Pusan" uuid="e99a403a-5269-11df-9aba-080069138b88" uid="17718"/>
-        <specific value="2" description="821 Ch'ungnam" uuid="e99b4d5e-5269-11df-aca9-080069138b88" uid="17719"/>
-        <specific value="3" description="831 Kangwon" uuid="e99c5b54-5269-11df-85fe-080069138b88" uid="17720"/>
-      </subcategory>
-      <subcategory value="4" description="Trials Support Ship" uuid="e99e07ce-5269-11df-9db2-080069138b88" uid="17721">
-        <specific value="1" description="Sunjin" uuid="e99f1506-5269-11df-b3d8-080069138b88" uid="17722"/>
-      </subcategory>
-      <subcategory value="5" description="Salvage Ship" uuid="e9a0c5fe-5269-11df-b809-080069138b88" uid="17723">
-        <specific value="1" description="ARS 26 GUMI" uuid="e9a1ce40-5269-11df-b331-080069138b88" uid="17724"/>
-        <specific value="2" description="ARS 25 CHANG WON" uuid="e9a2da88-5269-11df-af86-080069138b88" uid="17725"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="e9a52950-5269-11df-87a5-080069138b88" uid="17726">
-      <subcategory value="1" description="Dong Hae Class (Corvette)" uuid="e9a63836-5269-11df-ab53-080069138b88" uid="17727">
-        <specific value="1" description="751 Dong Hae" uuid="e9a74776-5269-11df-be07-080069138b88" uid="17728"/>
-        <specific value="2" description="752 Su Won" uuid="e9a854c2-5269-11df-b180-080069138b88" uid="17729"/>
-        <specific value="3" description="753 Kang Reung" uuid="e9a96074-5269-11df-8f2f-080069138b88" uid="17730"/>
-        <specific value="4" description="755 An Yang" uuid="e9aa6e1a-5269-11df-b8b0-080069138b88" uid="17731"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-combatant Ship" uuid="e9acb97c-5269-11df-87ea-080069138b88" uid="17732">
-      <subcategory value="1" description="Container Class" uuid="e9adca10-5269-11df-8fc8-080069138b88" uid="17733">
-        <specific value="1" description="Chung Gu" uuid="e9aed838-5269-11df-a61c-080069138b88" uid="17734"/>
-        <specific value="2" description="Ga Yang" uuid="e9afe228-5269-11df-b52b-080069138b88" uid="17735"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="120" uuid="e9b2e252-5269-11df-9081-080069138b88" uid="17736">
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="e9b3ef9e-5269-11df-8c46-080069138b88" uid="17737">
-      <subcategory value="1" description="Chang Bogo (Type 209) Class)" uuid="e9b5001e-5269-11df-990e-080069138b88" uid="17738">
-        <specific value="1" description="061 Chang Bogo" uuid="e9b612b0-5269-11df-9a4e-080069138b88" uid="17739"/>
-        <specific value="2" description="062 Yi Chon" uuid="e9b71cfa-5269-11df-983b-080069138b88" uid="17740"/>
-        <specific value="3" description="063 Choi Muson" uuid="e9b82a46-5269-11df-83b5-080069138b88" uid="17741"/>
-      </subcategory>
-    </category>
-    <category value="7" description="SSA (Conventional Auxiliary)" uuid="e9ba7760-5269-11df-8974-080069138b88" uid="17742">
-      <subcategory value="1" description="KSS-1 Tolgorae Class (midget submarine)" uuid="e9bb87b8-5269-11df-be5a-080069138b88" uid="17743">
-        <specific value="1" description="051-053" uuid="e9bc9a36-5269-11df-8709-080069138b88" uid="17744"/>
-      </subcategory>
-      <subcategory value="2" description="Cosmos Class (midget submarine)" uuid="e9be45e8-5269-11df-aa1f-080069138b88" uid="17745"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="119" uuid="e9c0955a-5269-11df-8f89-080069138b88" uid="17746">
-    <category value="1" description="Tank" uuid="e9c1a27e-5269-11df-b6e0-080069138b88" uid="17747">
-      <subcategory value="1" description="M1985 Light tank" uuid="e9c2afe8-5269-11df-ab1d-080069138b88" uid="17748"/>
-      <subcategory value="2" description="Type-63 Light amphibious tank" uuid="e9c3c298-5269-11df-9483-080069138b88" uid="17749"/>
-    </category>
-    <category value="4" description="Self-propelled artillery" uuid="e9c56fb2-5269-11df-9549-080069138b88" uid="17750">
-      <subcategory value="1" description="170 mm Self Propelled Gun" uuid="e9c67a6a-5269-11df-b3dc-080069138b88" uid="17751">
-        <specific value="1" description="M-1978 SP &quot;Koksan&quot;" uuid="e9c78d38-5269-11df-b398-080069138b88" uid="17752"/>
-        <specific value="2" description="M-1989" uuid="e9c89c64-5269-11df-a1e7-080069138b88" uid="17753"/>
-      </subcategory>
-      <subcategory value="2" description="240 mm Rocket Launcher" uuid="e9ca4bb8-5269-11df-bb91-080069138b88" uid="17754">
-        <specific value="1" description="M-1985" uuid="e9cb547c-5269-11df-a5cb-080069138b88" uid="17755"/>
-        <specific value="2" description="M-1991" uuid="e9cc62ae-5269-11df-8f2b-080069138b88" uid="17756"/>
-      </subcategory>
-      <subcategory value="3" description="BM-11 122 mm Multiple Rocket Launcher" uuid="e9ce0f8c-5269-11df-ba0c-080069138b88" uid="17757"/>
-      <subcategory value="4" description="M-1992 Self Propelled Combination Gun" uuid="e9cf2200-5269-11df-a05e-080069138b88" uid="17758"/>
-      <subcategory value="5" description="Taepo Dong I Launcher" uuid="e9d03938-5269-11df-8a04-080069138b88" uid="17759"/>
-      <subcategory value="6" description="Taepo Dong II Launcher (2-stage version)" uuid="e9d14a3a-5269-11df-949f-080069138b88" uid="17760"/>
-      <subcategory value="7" description="Taepo Dong II Launcher (3-stage version)" uuid="e9d25b1e-5269-11df-939f-080069138b88" uid="17761"/>
-      <subcategory value="8" description="No Dong Launcher" uuid="e9d36996-5269-11df-b4dd-080069138b88" uid="17762"/>
-      <subcategory value="9" description="SCUB-B Launcher" uuid="e9d4782c-5269-11df-b151-080069138b88" uid="17763"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="119" uuid="e9d6c23a-5269-11df-b465-080069138b88" uid="17764">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e9d7ce5a-5269-11df-99c1-080069138b88" uid="17765">
-      <subcategory value="1" description="Soho Class" uuid="e9d8dec6-5269-11df-a926-080069138b88" uid="17766"/>
-      <subcategory value="2" description="Najin Class" uuid="e9d9f0c2-5269-11df-86ea-080069138b88" uid="17767"/>
-    </category>
-    <category value="7" description="Light/patrol Craft" uuid="e9db9bca-5269-11df-ae0e-080069138b88" uid="17768">
-      <subcategory value="1" description="So 1 Class (large patrol craft)" uuid="e9dca4a2-5269-11df-9f3c-080069138b88" uid="17769"/>
-      <subcategory value="2" description="Soju Class (fast attack craft-missile)" uuid="e9ddb888-5269-11df-995e-080069138b88" uid="17770"/>
-      <subcategory value="3" description="Sohung Class (fast attack craft-missile)" uuid="e9deca84-5269-11df-915a-080069138b88" uid="17771"/>
-      <subcategory value="4" description="Sariwon Class (large patrol craft)" uuid="e9dfd4ec-5269-11df-afe9-080069138b88" uid="17772">
-        <specific value="1" description="725-27" uuid="e9e0e8d2-5269-11df-bbcd-080069138b88" uid="17773"/>
-      </subcategory>
-      <subcategory value="5" description="Soman Class (large patrol craft)" uuid="e9e2965a-5269-11df-baf2-080069138b88" uid="17774"/>
-      <subcategory value="6" description="Taechong I (large patrol craft)" uuid="e9e3a61c-5269-11df-a181-080069138b88" uid="17775"/>
-      <subcategory value="7" description="Taechong II (Mayang) (large patrol craft)" uuid="e9e4b494-5269-11df-af37-080069138b88" uid="17776"/>
-      <subcategory value="8" description="Chodo Class (fast attack craft-gun)" uuid="e9e5c64a-5269-11df-b950-080069138b88" uid="17777"/>
-      <subcategory value="9" description="Chaho Class (fast attack craft-gun)" uuid="e9e6d936-5269-11df-bc13-080069138b88" uid="17778"/>
-      <subcategory value="10" description="Chong-Jin Class (fast attack craft-gun)" uuid="e9e7e5d8-5269-11df-bc27-080069138b88" uid="17779"/>
-      <subcategory value="11" description="Chong-Ju Class (fast attack craft-gun)" uuid="e9e8f5fe-5269-11df-8a51-080069138b88" uid="17780"/>
-      <subcategory value="12" description="Sinpo (Sinnam) Class (fast attack craft-gun)" uuid="e9ea0c5a-5269-11df-b0af-080069138b88" uid="17781"/>
-      <subcategory value="13" description="Ku Song Class (fast attack craft-torpedo)" uuid="e9eb18e8-5269-11df-beb5-080069138b88" uid="17782"/>
-      <subcategory value="14" description="Sin Hung Class (fast attack craft-torpedo)" uuid="e9ec29f4-5269-11df-b408-080069138b88" uid="17783"/>
-      <subcategory value="15" description="Mod Sin Hung Class (fast attack craft-torpedo)" uuid="e9ed3ec0-5269-11df-8353-080069138b88" uid="17784"/>
-      <subcategory value="16" description="TB 11PA Class (inshore patrol craft)" uuid="e9ee4bda-5269-11df-8ae1-080069138b88" uid="17785"/>
-      <subcategory value="17" description="TB 40A Class (inshore patrol craft)" uuid="e9ef6650-5269-11df-9aba-080069138b88" uid="17786"/>
-      <subcategory value="18" description="Modified Fishing Vessels (coastal patrol craft)" uuid="e9f077de-5269-11df-a0ec-080069138b88" uid="17787"/>
-      <subcategory value="19" description="High Speed Infiltration Craft (HSIC)" uuid="e9f183a4-5269-11df-bd35-080069138b88" uid="17788"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e9f3374e-5269-11df-a947-080069138b88" uid="17789">
-      <subcategory value="1" description="Yukto I Class (coastal minesweeper)" uuid="e9f446b6-5269-11df-90f7-080069138b88" uid="17790"/>
-      <subcategory value="2" description="Yukto II Class (coastal minesweeper)" uuid="e9f559c0-5269-11df-bbec-080069138b88" uid="17791"/>
-      <subcategory value="3" description="Pipa-Got Class (inshore minesweeper)" uuid="e9f6645a-5269-11df-89c8-080069138b88" uid="17792"/>
-    </category>
-    <category value="10" description="Tank Landing Ship" uuid="e9f8166a-5269-11df-ad24-080069138b88" uid="17793">
-      <subcategory value="1" description="Hungnam Class (LSM)" uuid="e9f92474-5269-11df-a8b8-080069138b88" uid="17794"/>
-      <subcategory value="2" description="Hantae Class (LSM)" uuid="e9fa3512-5269-11df-adf8-080069138b88" uid="17795"/>
-    </category>
-    <category value="11" description="Landing Craft" uuid="e9fbe29a-5269-11df-9c22-080069138b88" uid="17796">
-      <subcategory value="1" description="Hanchon Class (LCM)" uuid="e9fcef1e-5269-11df-a289-080069138b88" uid="17797"/>
-      <subcategory value="2" description="Nampo Class (LCP)" uuid="e9fdff6c-5269-11df-9e8b-080069138b88" uid="17798"/>
-    </category>
-    <category value="15" description="Air Cushion/Surface Effect" uuid="e9ffadda-5269-11df-aee3-080069138b88" uid="17799">
-      <subcategory value="1" description="Songjong Class (Type I-III) (LCP-hovercraft)" uuid="ea00bce8-5269-11df-ac3c-080069138b88" uid="17800"/>
-      <subcategory value="2" description="Kongbang Class (LCPA-hovercraft)" status="new" uuid="a385d1ca-0faa-4c5d-94b1-5a91e2481ba0" uid="22780">
-        <cr value="1632"/>
-        <specific value="1" description="KongBang I" status="new" uuid="dcd0c466-00b5-4f8c-9abd-cad520d9f674" uid="22781">
-          <cr value="1632"/>
-        </specific>
-        <specific value="2" description="KongBang II" status="new" uuid="9081423b-7236-4d27-b052-c6e720a338e7" uid="22782">
-          <cr value="1632"/>
-        </specific>
-        <specific value="3" description="KongBang III" status="new" uuid="b33c15c9-2b69-46ba-b1ef-7688e0b8c9a2" uid="22783">
-          <cr value="1632"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="ea026e94-5269-11df-b655-080069138b88" uid="17801">
-      <subcategory value="1" description="Depot Ship for Midget Submarine" uuid="ea03774e-5269-11df-a094-080069138b88" uid="17802">
-        <specific value="1" description="Soo Gun-Ho" uuid="ea0487c4-5269-11df-97d8-080069138b88" uid="17803"/>
-        <specific value="2" description="Dong Geon Ae Gook-Ho" uuid="ea059718-5269-11df-90b7-080069138b88" uid="17804"/>
-        <specific value="3" description="Dong Hae-Ho" uuid="ea06a392-5269-11df-af32-080069138b88" uid="17805"/>
-        <specific value="4" description="Chong Seong-Ho Number One" uuid="ea07b228-5269-11df-bb2f-080069138b88" uid="17806"/>
-        <specific value="5" description="Chong Seong-Ho Number Two" uuid="ea08c046-5269-11df-b3b3-080069138b88" uid="17807"/>
-        <specific value="6" description="Chong Seong-Ho Humber Three" uuid="ea09ca18-5269-11df-b1bd-080069138b88" uid="17808"/>
-        <specific value="7" description="Hae Gum Gong-Ho" uuid="ea0adc8c-5269-11df-afa6-080069138b88" uid="17809"/>
-        <specific value="8" description="Song Rim-Ho" uuid="ea0bead2-5269-11df-951f-080069138b88" uid="17810"/>
-      </subcategory>
-      <subcategory value="2" description="Surveying Ship" uuid="ea0d9e0e-5269-11df-9341-080069138b88" uid="17811">
-        <specific value="1" description="101 Donghae" uuid="ea0eacc2-5269-11df-9d0e-080069138b88" uid="17812"/>
-        <specific value="2" description="102 Donghae" uuid="ea0fc7a6-5269-11df-a75d-080069138b88" uid="17813"/>
-        <specific value="3" description="201 Sohai" uuid="ea10d736-5269-11df-b2de-080069138b88" uid="17814"/>
-        <specific value="4" description="202 Sohai" uuid="ea11e23e-5269-11df-a585-080069138b88" uid="17815"/>
-      </subcategory>
-      <subcategory value="3" description="Coastal Patrol Craft" uuid="ea1392a0-5269-11df-9871-080069138b88" uid="17816">
-        <specific value="1" description="177" uuid="ea14a186-5269-11df-9e89-080069138b88" uid="17817"/>
-        <specific value="2" description="801" uuid="ea15b288-5269-11df-ad5d-080069138b88" uid="17818"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-combatant ship" uuid="ea17fb10-5269-11df-96bf-080069138b88" uid="17819">
-      <subcategory value="1" description="Container class" uuid="ea190bd6-5269-11df-9f82-080069138b88" uid="17820">
-        <specific value="1" description="Chong Jin" uuid="ea1a145e-5269-11df-9021-080069138b88" uid="17821"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="119" uuid="ea1d063c-5269-11df-8213-080069138b88" uid="17822">
-    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="ea1e136a-5269-11df-82de-080069138b88" uid="17823">
-      <subcategory value="1" description="Sang-O class (midget submarine)" uuid="ea1f2200-5269-11df-8769-080069138b88" uid="17824"/>
-    </category>
-    <category value="7" description="SSA (Conventional Auxiliary)" uuid="ea20cfb0-5269-11df-a540-080069138b88" uid="17825">
-      <subcategory value="1" description="North Korean Design (midget submarine)" uuid="ea21e2a6-5269-11df-9859-080069138b88" uid="17826"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="178" uuid="ea242d90-5269-11df-a4e6-080069138b88" uid="17827">
-    <category value="7" description="Light/Patrol Craft" uuid="ea253cda-5269-11df-8b62-080069138b88" uid="17828">
-      <subcategory value="1" description="Damsah (Combattante III M) Class (fast attack craft-missile)" uuid="ea264d32-5269-11df-98e9-080069138b88" uid="17829">
-        <specific value="1" description="Q01 Damsah" uuid="ea275f6a-5269-11df-a29a-080069138b88" uid="17830"/>
-        <specific value="2" description="Q02 AL Ghariyah" uuid="ea286ad6-5269-11df-9f00-080069138b88" uid="17831"/>
-        <specific value="3" description="Q03 Rbigah" uuid="ea29798a-5269-11df-a16f-080069138b88" uid="17832"/>
-      </subcategory>
-      <subcategory value="2" description="Barzan Class (large patrol craft)" uuid="ea2b276c-5269-11df-a038-080069138b88" uid="17833">
-        <specific value="1" description="Q11 Barzan" uuid="ea2c42f0-5269-11df-a51e-080069138b88" uid="17834"/>
-        <specific value="2" description="Q12 Hwar" uuid="ea2d4c40-5269-11df-80fe-080069138b88" uid="17835"/>
-        <specific value="3" description="Q13 That Assuari" uuid="ea2e5a40-5269-11df-a781-080069138b88" uid="17836"/>
-        <specific value="4" description="Q14 AL Wusail" uuid="ea2f6c32-5269-11df-bf03-080069138b88" uid="17837"/>
-        <specific value="5" description="Q15 Fateh-AL-Khair" uuid="ea307456-5269-11df-b16a-080069138b88" uid="17838"/>
-        <specific value="6" description="Q16 Tariq" uuid="ea318364-5269-11df-a011-080069138b88" uid="17839"/>
-      </subcategory>
-      <subcategory value="3" description="Damen Polycat 1450 Class (coastal patrolcraft)" uuid="ea333506-5269-11df-b4fe-080069138b88" uid="17840">
-        <specific value="1" description="Q31-36" uuid="ea34450e-5269-11df-86f4-080069138b88" uid="17841"/>
-      </subcategory>
-      <subcategory value="4" description="Fairey Marine Spear Class (coastal patrol craft)" uuid="ea35f156-5269-11df-8884-080069138b88" uid="17842">
-        <specific value="1" description="Q71-95" uuid="ea36ff6a-5269-11df-83ab-080069138b88" uid="17843"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="189" uuid="ea39ec52-5269-11df-9199-080069138b88" uid="17844">
-    <category value="40" description="Trainer" uuid="ea3afb56-5269-11df-acb1-080069138b88" uid="17845">
-      <subcategory value="1" description="Pilatus Flugzeugwerke SA PC-9" uuid="ea3c0410-5269-11df-b593-080069138b88" uid="17846">
-        <specific value="1" description="PC-9" uuid="ea3d1436-5269-11df-a49d-080069138b88" uid="17847"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="189" uuid="ea4004ca-5269-11df-a76a-080069138b88" uid="17848">
-    <category value="6" description="Guided Missile Frigate" uuid="ea41113a-5269-11df-9373-080069138b88" uid="17849">
-      <subcategory value="1" description="Madina (Type F 2000S) Class" uuid="ea421922-5269-11df-8636-080069138b88" uid="17850">
-        <specific value="1" description="702 Madina" uuid="ea432c4a-5269-11df-8fb7-080069138b88" uid="17851"/>
-        <specific value="2" description="704 Hofouf" uuid="ea44390a-5269-11df-8c03-080069138b88" uid="17852"/>
-        <specific value="3" description="706 Abha" uuid="ea4541d8-5269-11df-8fac-080069138b88" uid="17853"/>
-        <specific value="4" description="708 Taif" uuid="ea465258-5269-11df-98df-080069138b88" uid="17854"/>
-      </subcategory>
-      <subcategory value="2" description="Badr Class (Corvette)" uuid="ea47febe-5269-11df-ad51-080069138b88" uid="17855">
-        <specific value="1" description="612 Badr" uuid="ea490d36-5269-11df-9ab1-080069138b88" uid="17856"/>
-        <specific value="2" description="614 Al Yarmook" uuid="ea4a1956-5269-11df-971d-080069138b88" uid="17857"/>
-        <specific value="3" description="616 Hitteen" uuid="ea4b2ef4-5269-11df-99a2-080069138b88" uid="17858"/>
-        <specific value="4" description="618 Tabuk" uuid="ea4c5702-5269-11df-9b72-080069138b88" uid="17859"/>
-      </subcategory>
-      <subcategory value="3" description="Arriyad Class (Type F-3000S)" uuid="ea4e36b2-5269-11df-aba3-080069138b88" uid="17860">
-        <specific value="1" description="812 Al Ryadh" uuid="ea4f5a06-5269-11df-a279-080069138b88" uid="17861"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="ea51c93a-5269-11df-a936-080069138b88" uid="17862">
-      <subcategory value="1" description="Jaguar Class (fast attack craft-torpedo)" uuid="ea52d8ac-5269-11df-8f79-080069138b88" uid="17863">
-        <specific value="1" description="90 Dammam" uuid="ea53e5e4-5269-11df-9bd4-080069138b88" uid="17864"/>
-        <specific value="2" description="50 Khabar" uuid="ea54f3a8-5269-11df-bfb4-080069138b88" uid="17865"/>
-        <specific value="3" description="10 Maccah" uuid="ea5607ac-5269-11df-b346-080069138b88" uid="17866"/>
-      </subcategory>
-      <subcategory value="2" description="Halter Type (coastal patrol craft)" uuid="ea57b7c8-5269-11df-9971-080069138b88" uid="17867"/>
-      <subcategory value="3" description="Simmoneau 51 Type (inshore patrol craft)" uuid="ea58c474-5269-11df-92be-080069138b88" uid="17868"/>
-      <subcategory value="4" description="Al Siddiq (fast attack craft-missile)" uuid="ea59d6b6-5269-11df-b04f-080069138b88" uid="17869">
-        <specific value="1" description="511 Al Siddiq" uuid="ea5aec36-5269-11df-b633-080069138b88" uid="17870"/>
-        <specific value="2" description="513 Al Farouq" uuid="ea5bf572-5269-11df-8e0f-080069138b88" uid="17871"/>
-        <specific value="3" description="515 Abdul Aziz" uuid="ea5d0354-5269-11df-97fa-080069138b88" uid="17872"/>
-        <specific value="4" description="517 Faisal" uuid="ea5e13ac-5269-11df-b002-080069138b88" uid="17873"/>
-        <specific value="5" description="519 Kahlid" uuid="ea5f2166-5269-11df-a211-080069138b88" uid="17874"/>
-        <specific value="6" description="521 Amyr" uuid="ea6030a6-5269-11df-925f-080069138b88" uid="17875"/>
-        <specific value="7" description="523 Taiq" uuid="ea613e56-5269-11df-aa4b-080069138b88" uid="17876"/>
-        <specific value="8" description="525 Oqbah" uuid="ea6247c4-5269-11df-9d82-080069138b88" uid="17877"/>
-        <specific value="9" description="527 Abu Abaidah" uuid="ea635ac4-5269-11df-afb5-080069138b88" uid="17878"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure/Ship Craft" uuid="ea65a90a-5269-11df-8fb7-080069138b88" uid="17879">
-      <subcategory value="1" description="Sandown Class (minehunters-coastal)" uuid="ea66bb56-5269-11df-8b37-080069138b88" uid="17880">
-        <specific value="1" description="420 Al Jawf" uuid="ea67ccbc-5269-11df-837f-080069138b88" uid="17881"/>
-        <specific value="2" description="422 Shaqra" uuid="ea68dbfc-5269-11df-8677-080069138b88" uid="17882"/>
-        <specific value="3" description="424 Al Kharj" uuid="ea69f050-5269-11df-9232-080069138b88" uid="17883"/>
-      </subcategory>
-      <subcategory value="2" description="MSC 322 Class (minesweeper/hunter-coastal)" uuid="ea6ba62a-5269-11df-b554-080069138b88" uid="17884">
-        <specific value="1" description="MSC 412 Addriyah" uuid="ea6cb7fe-5269-11df-abe0-080069138b88" uid="17885"/>
-        <specific value="2" description="MSC 414 Al Quysumah" uuid="ea6dc7fc-5269-11df-888b-080069138b88" uid="17886"/>
-        <specific value="3" description="MSC 416 Al Wadeeah" uuid="ea6ed548-5269-11df-9086-080069138b88" uid="17887"/>
-        <specific value="4" description="MSC 418 Safwa" uuid="ea6fe474-5269-11df-b101-080069138b88" uid="17888"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="ea723666-5269-11df-9c3a-080069138b88" uid="17889">
-      <subcategory value="1" description="Mod Durance Class (replenishment ship)" uuid="ea73460a-5269-11df-9fbc-080069138b88" uid="17890">
-        <specific value="1" description="902 Boraida" uuid="ea745aa4-5269-11df-a432-080069138b88" uid="17891"/>
-        <specific value="2" description="904 Yunbou" uuid="ea7569b2-5269-11df-b173-080069138b88" uid="17892"/>
-      </subcategory>
-      <subcategory value="2" description="LCM 6 Class" uuid="ea77188e-5269-11df-bbfe-080069138b88" uid="17893">
-        <specific value="1" description="220 Dheba" uuid="ea7826ac-5269-11df-9039-080069138b88" uid="17894"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="ea7a79f2-5269-11df-a7e2-080069138b88" uid="17895">
-      <subcategory value="1" description="Container class" uuid="ea7b822a-5269-11df-8a1b-080069138b88" uid="17896">
-        <specific value="1" description="Admai" uuid="ea7c9480-5269-11df-b853-080069138b88" uid="17897"/>
-        <specific value="2" description="Abu Mariam" uuid="ea7da38e-5269-11df-9dc3-080069138b88" uid="17898"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker class" uuid="ea7f51f2-5269-11df-8689-080069138b88" uid="17899">
-        <specific value="1" description="Nur Al Jubail" uuid="ea805f5c-5269-11df-a3b4-080069138b88" uid="17900"/>
-        <specific value="2" description="Al Saudia" uuid="ea816e92-5269-11df-8908-080069138b88" uid="17901"/>
-        <specific value="3" description="Al Widadia" uuid="ea827e5e-5269-11df-add7-080069138b88" uid="17902"/>
-        <specific value="4" description="Al-Zait Al-Araby 5" uuid="ea838952-5269-11df-ac80-080069138b88" uid="17903"/>
-        <specific value="5" description="Adel" uuid="ea84975c-5269-11df-b2c9-080069138b88" uid="17904"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="121" uuid="ea878c14-5269-11df-ae48-080069138b88" uid="17905">
-    <category value="40" description="Trainer" uuid="ea88a612-5269-11df-8484-080069138b88" uid="17906">
-      <subcategory value="1" description="Short Brothers :LC T.MK 52 Toucan" uuid="ea89b0c0-5269-11df-8553-080069138b88" uid="17907">
-        <specific value="1" description="T.MK 52" uuid="ea8ac10e-5269-11df-8173-080069138b88" uid="17908"/>
-      </subcategory>
-      <subcategory value="2" description="Empresa Brasileria de Aeronautica SA EMB-312 Toucan" uuid="ea8c7166-5269-11df-b61c-080069138b88" uid="17909">
-        <specific value="1" description="EMB-S312" uuid="ea8d8772-5269-11df-89bc-080069138b88" uid="17910"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="121" uuid="ea907400-5269-11df-844b-080069138b88" uid="17911">
-    <category value="7" description="Light/Patrol Craft" uuid="ea91808e-5269-11df-975d-080069138b88" uid="17912">
-      <subcategory value="1" description="OPV 310 Class (large patrol craft)" uuid="ea929014-5269-11df-a965-080069138b88" uid="17913">
-        <specific value="1" description="P301 Inttisar" uuid="ea93a184-5269-11df-a677-080069138b88" uid="17914"/>
-        <specific value="2" description="P302 Aman" uuid="ea94aed0-5269-11df-bc92-080069138b88" uid="17915"/>
-        <specific value="3" description="P303 Maimom" uuid="ea95bd8e-5269-11df-8f35-080069138b88" uid="17916"/>
-        <specific value="4" description="P304 Mobark" uuid="ea96cd32-5269-11df-af7c-080069138b88" uid="17917"/>
-      </subcategory>
-      <subcategory value="2" description="TNC 45 Type (fast attack craft-missile)" uuid="ea987ff6-5269-11df-b10b-080069138b88" uid="17918">
-        <specific value="1" description="P3404 Al Sanbouk" uuid="ea998b9e-5269-11df-a2e9-080069138b88" uid="17919"/>
-      </subcategory>
-      <subcategory value="3" description="Simmoneau Standard 12 Class (inshore patrol craft)" uuid="ea9b3ce6-5269-11df-bb4d-080069138b88" uid="17920"/>
-      <subcategory value="4" description="FPB 57 Type (fast attack craft-missile)" uuid="ea9c532e-5269-11df-85d7-080069138b88" uid="17921">
-        <specific value="1" description="P5702 Istiqlal" uuid="ea9d64c6-5269-11df-8435-080069138b88" uid="17922"/>
-      </subcategory>
-      <subcategory value="5" description="Cougar Type (inshore patrol craft)" uuid="ea9f14ba-5269-11df-8eef-080069138b88" uid="17923"/>
-      <subcategory value="6" description="Al-Shaali Type (inshore patrol craft)" uuid="eaa023b4-5269-11df-a98f-080069138b88" uid="17924"/>
-      <subcategory value="7" description="UM Almaradim Class (PCFG)" uuid="eaa13600-5269-11df-bbad-080069138b88" uid="17925">
-        <specific value="1" description="P3711 Um Almaradim" uuid="eaa24748-5269-11df-a207-080069138b88" uid="17926"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="eaa49926-5269-11df-93b6-080069138b88" uid="17927">
-      <subcategory value="1" description="AL Tahaddy Class (LCM/AKL)" uuid="eaa5a76c-5269-11df-8704-080069138b88" uid="17928">
-        <specific value="1" description="L401 AL Soumood" uuid="eaa6b27e-5269-11df-ba6c-080069138b88" uid="17929"/>
-      </subcategory>
-      <subcategory value="2" description="Support Ship (AG)" uuid="eaa87c4e-5269-11df-a401-080069138b88" uid="17930">
-        <specific value="1" description="S5509 Qaruh" uuid="eaa98e9a-5269-11df-9949-080069138b88" uid="17931"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="eaabde7a-5269-11df-8162-080069138b88" uid="17932">
-      <subcategory value="1" description="Container class" uuid="eaacecf2-5269-11df-8f74-080069138b88" uid="17933">
-        <specific value="1" description="Na Hai Fa Xian" uuid="eaae01d2-5269-11df-99eb-080069138b88" uid="17934"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker class" uuid="eaafb14e-5269-11df-aca2-080069138b88" uid="17935">
-        <specific value="1" description="Gas Al Mutlaa" uuid="eab0c142-5269-11df-ba5e-080069138b88" uid="17936"/>
-        <specific value="2" description="Al Shuhadaa" uuid="eab1caec-5269-11df-97a2-080069138b88" uid="17937"/>
-        <specific value="3" description="Al Shegaya" uuid="eab2ddce-5269-11df-8c01-080069138b88" uid="17938">
-          <extra value="4" description="Al Awdah" uuid="eab3ebd8-5269-11df-9803-080069138b88" uid="17939"/>
-        </specific>
-        <specific value="5" description="Al Bida" uuid="eab59a50-5269-11df-8f23-080069138b88" uid="17940"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="164" uuid="eab88c9c-5269-11df-a762-080069138b88" uid="17941">
-    <category value="7" description="Light/Patrol Craft" uuid="eab99b3c-5269-11df-b971-080069138b88" uid="17942">
-      <subcategory value="1" description="Patrol Ship" uuid="eabaac48-5269-11df-8157-080069138b88" uid="17943">
-        <specific value="1" description="A1 AL Mabrukak" uuid="eabbbfe8-5269-11df-9189-080069138b88" uid="17944"/>
-      </subcategory>
-      <subcategory value="2" description="AL Waafi (Brooke Marine) Class (fast attack craft-gun)" uuid="eabd6dc0-5269-11df-88fe-080069138b88" uid="17945">
-        <specific value="1" description="B4 AL Waafi" uuid="eabe7de6-5269-11df-8d23-080069138b88" uid="17946"/>
-        <specific value="2" description="B5 AL Fulk" uuid="eabf8d76-5269-11df-b867-080069138b88" uid="17947"/>
-        <specific value="3" description="B6 AL Mujahid" uuid="eac09cb6-5269-11df-8d2b-080069138b88" uid="17948"/>
-        <specific value="4" description="B7 AL Jabbar" uuid="eac1a70a-5269-11df-970b-080069138b88" uid="17949"/>
-      </subcategory>
-      <subcategory value="3" description="Seeb (Vosper 25) Class (inshore patrol craft)" uuid="eac35910-5269-11df-955a-080069138b88" uid="17950">
-        <specific value="1" description="B20 Seeb" uuid="eac46b3e-5269-11df-bfb0-080069138b88" uid="17951"/>
-        <specific value="2" description="B21 Shinas" uuid="eac585fa-5269-11df-a625-080069138b88" uid="17952"/>
-        <specific value="3" description="B22 Sadh" uuid="eac68fd6-5269-11df-b74f-080069138b88" uid="17953"/>
-        <specific value="4" description="B23 Khassab" uuid="eac7a07e-5269-11df-8d70-080069138b88" uid="17954"/>
-      </subcategory>
-      <subcategory value="4" description="Dhofar (Province) Class (fast attack craft-missile)" uuid="eac957f2-5269-11df-a2d9-080069138b88" uid="17955">
-        <specific value="1" description="B10 Dhofar" uuid="eaca68cc-5269-11df-abc6-080069138b88" uid="17956"/>
-        <specific value="2" description="B11 AL Sharqiyah" uuid="eacb7140-5269-11df-9cb2-080069138b88" uid="17957"/>
-        <specific value="3" description="B12 AL Bat'nah" uuid="eacc821a-5269-11df-93be-080069138b88" uid="17958"/>
-        <specific value="4" description="B14 Mussandam" uuid="eacd951a-5269-11df-a5dd-080069138b88" uid="17959"/>
-      </subcategory>
-      <subcategory value="5" description="Tyler-Vortex Type (inshore patrol craft)" uuid="eacf4496-5269-11df-a050-080069138b88" uid="17960">
-        <specific value="1" description="Q2" uuid="ead04fa8-5269-11df-9860-080069138b88" uid="17961"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="ead2a4d8-5269-11df-979a-080069138b88" uid="17962">
-      <subcategory value="1" description="LCM" uuid="ead3af2c-5269-11df-aa2f-080069138b88" uid="17963">
-        <specific value="1" description="C8 Saba AL Bahr" uuid="ead4c20e-5269-11df-9b5f-080069138b88" uid="17964"/>
-        <specific value="2" description="C9 AL Doghas" uuid="ead5d1da-5269-11df-92e3-080069138b88" uid="17965"/>
-        <specific value="3" description="C10 AL Temsah" uuid="ead6db98-5269-11df-a6a3-080069138b88" uid="17966"/>
-      </subcategory>
-      <subcategory value="2" description="LCU" uuid="ead88e70-5269-11df-b9f2-080069138b88" uid="17967">
-        <specific value="1" description="C7 AL Neemran" uuid="ead99d2e-5269-11df-a816-080069138b88" uid="17968"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate (including Corvettes)" uuid="eadbeef8-5269-11df-a5be-080069138b88" uid="17969">
-      <subcategory value="1" description="Qahir Class (FSG)" uuid="eadcff0a-5269-11df-af56-080069138b88" uid="17970">
-        <specific value="1" description="Q-31 Qahir Al Amwaj" uuid="eade0e54-5269-11df-8cb2-080069138b88" uid="17971"/>
-      </subcategory>
-    </category>
-    <category value="55" description="Amphibious Cargo Ship" uuid="eae05f56-5269-11df-b7cc-080069138b88" uid="17972">
-      <subcategory value="1" description="Landing Ship-Logistic" uuid="eae16d56-5269-11df-9fd5-080069138b88" uid="17973">
-        <specific value="1" description="L2 Nasar AL Bahr" uuid="eae28146-5269-11df-8483-080069138b88" uid="17974"/>
-      </subcategory>
-    </category>
-    <category value="58" description="Combat Stores Ship" uuid="eae4d8ba-5269-11df-bc62-080069138b88" uid="17975">
-      <subcategory value="1" description="Supply Ship" uuid="eae5ed72-5269-11df-a9f3-080069138b88" uid="17976">
-        <specific value="1" description="A2 AL Sultana" uuid="eae70176-5269-11df-b3bb-080069138b88" uid="17977"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="123" uuid="eae9f066-5269-11df-b96b-080069138b88" uid="17978">
-    <category value="7" description="Light/Patrol Craft" uuid="eaeafe7a-5269-11df-b74f-080069138b88" uid="17979">
-      <subcategory value="1" description="Tracker Mk2 (coastal patrol craft)" uuid="eaec0f90-5269-11df-b43d-080069138b88" uid="17980"/>
-      <subcategory value="2" description="Aztec Class (coastal patrol craft)" uuid="eaed2204-5269-11df-9d20-080069138b88" uid="17981"/>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="eaeed234-5269-11df-9845-080069138b88" uid="17982">
-      <subcategory value="1" description="Container class" uuid="eaefe03e-5269-11df-be8d-080069138b88" uid="17983">
-        <specific value="1" description="Perla" uuid="eaf0f0a0-5269-11df-83cb-080069138b88" uid="17984"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="102" uuid="eaf3e206-5269-11df-af83-080069138b88" uid="17985">
-    <category value="2" description="Armored Fighting Vehicle" uuid="eaf4f2c2-5269-11df-8caf-080069138b88" uid="17986">
-      <subcategory value="1" description="EE-3 JARARACA" uuid="eaf5fcf8-5269-11df-85e4-080069138b88" uid="17987"/>
-      <subcategory value="2" description="EE-9 CASCAVELEE - 11URUTRU" uuid="eaf70d78-5269-11df-b10f-080069138b88" uid="17988"/>
-      <subcategory value="3" description="EE-11 URUTRU" uuid="eaf82136-5269-11df-82a7-080069138b88" uid="17989"/>
-    </category>
-    <category value="4" description="Self-propelled Artillery" uuid="eaf9d120-5269-11df-a975-080069138b88" uid="17990">
-      <subcategory value="1" description="127 mm ASTROS II" uuid="eafae07e-5269-11df-ab10-080069138b88" uid="17991"/>
-      <subcategory value="2" description="262 mm ABABEEL" uuid="eafbf1a8-5269-11df-855c-080069138b88" uid="17992"/>
-      <subcategory value="3" description="160 mm mortar" uuid="eafd026e-5269-11df-9e77-080069138b88" uid="17993"/>
-      <subcategory value="4" description="FAW 70 launcher" uuid="eafe0c72-5269-11df-a6f6-080069138b88" uid="17994"/>
-      <subcategory value="5" description="FAW 150 launcher" uuid="eaff1d56-5269-11df-a4dd-080069138b88" uid="17995"/>
-      <subcategory value="6" description="FAW 200 launcher" uuid="eb00313c-5269-11df-b1dd-080069138b88" uid="17996"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="102" uuid="eb027e2e-5269-11df-9123-080069138b88" uid="17997">
-    <category value="1" description="Fighter/Air Defense" uuid="eb03980e-5269-11df-a3ce-080069138b88" uid="17998"/>
-    <category value="8" description="Surveillance/C2 (Airborne Early Warning)" uuid="eb04a29e-5269-11df-94c4-080069138b88" uid="17999">
-      <subcategory value="1" description="Iraqui Air Force Adnan 1" uuid="eb05b58a-5269-11df-9af8-080069138b88" uid="18000">
-        <specific value="1" description="Adnan I" uuid="eb06c6dc-5269-11df-9062-080069138b88" uid="18001"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="102" uuid="eb09b612-5269-11df-9f40-080069138b88" uid="18002">
-    <category value="6" description="Guided Missile Frigate" uuid="eb0ac53e-5269-11df-a29a-080069138b88" uid="18003">
-      <subcategory value="1" description="Assad Class" uuid="eb0bd5e6-5269-11df-a7f3-080069138b88" uid="18004">
-        <specific value="1" description="F210 Mussa Ben Nussair" uuid="eb0ce62a-5269-11df-b9d3-080069138b88" uid="18005"/>
-        <specific value="2" description="F212 Tariq lbn Ziad" uuid="eb0df09c-5269-11df-906e-080069138b88" uid="18006"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="eb10477a-5269-11df-85c0-080069138b88" uid="18007">
-      <subcategory value="1" description="Bogomol Class (large patrol craft)" uuid="eb115124-5269-11df-beee-080069138b88" uid="18008"/>
-      <subcategory value="2" description="PB 90 Class (coastal patrol craft)" uuid="eb126762-5269-11df-a9c0-080069138b88" uid="18009"/>
-      <subcategory value="3" description="Sawari Class (inshore patrol boat)" uuid="eb137800-5269-11df-b2c6-080069138b88" uid="18010"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="eb152b3c-5269-11df-8a60-080069138b88" uid="18011">
-      <subcategory value="1" description="Nestin Class (minesweeper-inshore)" uuid="eb16378e-5269-11df-9e10-080069138b88" uid="18012"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="eb17ea98-5269-11df-ae2e-080069138b88" uid="18013">
-      <subcategory value="1" description="Transport Ship" uuid="eb18f8e8-5269-11df-8f1e-080069138b88" uid="18014">
-        <specific value="1" description="426 Al Zahraa" uuid="eb1a09f4-5269-11df-bd7d-080069138b88" uid="18015"/>
-        <specific value="2" description="428 Khawla" uuid="eb1b1556-5269-11df-9ba4-080069138b88" uid="18016"/>
-        <specific value="3" description="429 Balqees" uuid="eb1c2a4a-5269-11df-8bcd-080069138b88" uid="18017"/>
-      </subcategory>
-      <subcategory value="2" description="Spasilac Class (salvage ship)" uuid="eb1dd872-5269-11df-91ba-080069138b88" uid="18018">
-        <specific value="1" description="A81 Aka" uuid="eb1ee8c0-5269-11df-8542-080069138b88" uid="18019"/>
-      </subcategory>
-      <subcategory value="3" description="Diving Tender" uuid="eb209b02-5269-11df-9a3b-080069138b88" uid="18020"/>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="eb22528a-5269-11df-9249-080069138b88" uid="18021">
-      <subcategory value="1" description="Yugoslav Type" uuid="eb235fb8-5269-11df-8d08-080069138b88" uid="18022">
-        <specific value="1" description="507 lbn Marjid" uuid="eb24701a-5269-11df-a9ad-080069138b88" uid="18023"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-combatant Ship" uuid="eb26c482-5269-11df-94b4-080069138b88" uid="18024">
-      <subcategory value="1" description="Container Class" uuid="eb27d52a-5269-11df-a6c2-080069138b88" uid="18025"/>
-      <subcategory value="2" description="Tanker Class" uuid="eb28f0a4-5269-11df-b8ab-080069138b88" uid="18026">
-        <specific value="1" description="Al Thirthar" uuid="eb29ff30-5269-11df-a42d-080069138b88" uid="18027"/>
-        <specific value="2" description="1 Athar" uuid="eb2b0c04-5269-11df-bd3b-080069138b88" uid="18028"/>
-        <specific value="3" description="1 Hurizan" uuid="eb2c1b44-5269-11df-837e-080069138b88" uid="18029"/>
-        <specific value="4" description="7 Nissan" uuid="eb2d2a98-5269-11df-a5b6-080069138b88" uid="18030"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="101" uuid="eb3015a0-5269-11df-be9e-080069138b88" uid="18031">
-    <category value="4" description="Self-propelled Artillery" uuid="eb312440-5269-11df-b028-080069138b88" uid="18032">
-      <subcategory value="1" description="320 mm OGHAB Multiple Rocket Launcher" uuid="eb3235f6-5269-11df-b8e3-080069138b88" uid="18033"/>
-      <subcategory value="2" description="330 mm SHAHIN Multiple Rocket Launcher" uuid="eb334bd0-5269-11df-a5ba-080069138b88" uid="18034"/>
-      <subcategory value="3" description="330 mm NAZEAT" uuid="eb345598-5269-11df-bb69-080069138b88" uid="18035"/>
-      <subcategory value="4" description="Shahab TEL" uuid="eb35658c-5269-11df-8651-080069138b88" uid="18036"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="101" uuid="eb37b800-5269-11df-89c1-080069138b88" uid="18037">
-    <category value="5" description="Destroyer (DD)" uuid="eb38c63c-5269-11df-8814-080069138b88" uid="18038">
-      <subcategory value="1" description="Damavand" uuid="eb39d5c2-5269-11df-a27f-080069138b88" uid="18039"/>
-      <subcategory value="2" description="Babr" uuid="eb3aea5c-5269-11df-b132-080069138b88" uid="18040"/>
-    </category>
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="eb3c978a-5269-11df-8ed7-080069138b88" uid="18041">
-      <subcategory value="1" description="Avland (vosper Mk 5) Class" uuid="eb3da2b0-5269-11df-8f6f-080069138b88" uid="18042">
-        <specific value="1" description="71 Alvand" uuid="eb3eb2a4-5269-11df-8f64-080069138b88" uid="18043"/>
-        <specific value="2" description="72 Alborz" uuid="eb3fc644-5269-11df-86cf-080069138b88" uid="18044"/>
-        <specific value="3" description="73 Sabalan" uuid="eb40d764-5269-11df-936a-080069138b88" uid="18045"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="eb432ba4-5269-11df-9dd3-080069138b88" uid="18046">
-      <subcategory value="1" description="Kaman (Combattante II) Class" uuid="eb443a30-5269-11df-a50a-080069138b88" uid="18047">
-        <specific value="1" description="P221 Kaman" uuid="eb454b28-5269-11df-90f2-080069138b88" uid="18048"/>
-        <specific value="2" description="P222 Zoubin" uuid="eb465c0c-5269-11df-a4e2-080069138b88" uid="18049"/>
-        <specific value="3" description="P223 Khadang" uuid="eb47671e-5269-11df-a8e1-080069138b88" uid="18050"/>
-        <specific value="4" description="P226 Falakhon" uuid="eb4875aa-5269-11df-a5d7-080069138b88" uid="18051"/>
-        <specific value="5" description="P227 Shamshir" uuid="eb498990-5269-11df-9094-080069138b88" uid="18052"/>
-        <specific value="6" description="P228 Gorz" uuid="eb4a9308-5269-11df-99cc-080069138b88" uid="18053"/>
-        <specific value="7" description="P229 Gardouneh" uuid="eb4ba112-5269-11df-b56e-080069138b88" uid="18054"/>
-        <specific value="8" description="P230 Khanjar" uuid="eb4cb264-5269-11df-9f6b-080069138b88" uid="18055"/>
-        <specific value="9" description="P231 Neyzeh" uuid="eb4dbf92-5269-11df-8f0f-080069138b88" uid="18056"/>
-        <specific value="10" description="P232 Tabarzin" uuid="eb4ece96-5269-11df-8556-080069138b88" uid="18057"/>
-      </subcategory>
-      <subcategory value="2" description="Parvin (PGM-71) Class (large patrol craft)" uuid="eb507d86-5269-11df-8f43-080069138b88" uid="18058">
-        <specific value="1" description="211 Parvin" uuid="eb5191c6-5269-11df-a40e-080069138b88" uid="18059"/>
-        <specific value="2" description="212 Bahram" uuid="eb529b8e-5269-11df-90d7-080069138b88" uid="18060"/>
-        <specific value="3" description="213 Nahid" uuid="eb53aac4-5269-11df-9847-080069138b88" uid="18061"/>
-      </subcategory>
-      <subcategory value="3" description="MK II Class (Coastal patrol craft)" uuid="eb555af4-5269-11df-b786-080069138b88" uid="18062"/>
-      <subcategory value="4" description="MIG-S-1800 Class (coastal patrol craft)" uuid="eb567038-5269-11df-8b2d-080069138b88" uid="18063"/>
-      <subcategory value="5" description="MK III Class (coastal patrol craft)" uuid="eb577db6-5269-11df-9c79-080069138b88" uid="18064"/>
-      <subcategory value="6" description="MIG-G-1900 Class (coastal patrol craft)" uuid="eb588fee-5269-11df-90f9-080069138b88" uid="18065"/>
-      <subcategory value="7" description="PBI Type (coastal patrol craft)" uuid="eb59a12c-5269-11df-b7cb-080069138b88" uid="18066"/>
-      <subcategory value="8" description="Enforcer Type (inshore patrol craft)" uuid="eb5ab0ee-5269-11df-9537-080069138b88" uid="18067"/>
-      <subcategory value="9" description="Stewart Type (inshore patrol craft)" uuid="eb5bc3a8-5269-11df-970a-080069138b88" uid="18068">
-        <specific value="1" description="Mahnavi-Hamraz" uuid="eb5cd4f0-5269-11df-aabc-080069138b88" uid="18069"/>
-        <specific value="2" description="Mahnavi-Vahedi" uuid="eb5de1c4-5269-11df-84d2-080069138b88" uid="18070"/>
-        <specific value="3" description="Mahnavi-Taheri" uuid="eb5efa14-5269-11df-9cda-080069138b88" uid="18071"/>
-      </subcategory>
-      <subcategory value="10" description="Boghammar Craft" uuid="eb60aa08-5269-11df-9958-080069138b88" uid="18072"/>
-      <subcategory value="11" description="Boston Whaler Craft (Type I)" uuid="eb61bcd6-5269-11df-9a59-080069138b88" uid="18073"/>
-      <subcategory value="12" description="HUDONG Class" uuid="eb62c7f2-5269-11df-b285-080069138b88" uid="18074">
-        <specific value="1" description="P3131" uuid="eb63d700-5269-11df-806a-080069138b88" uid="18075"/>
-        <specific value="2" description="P3132" uuid="eb64eb86-5269-11df-b1a6-080069138b88" uid="18076"/>
-        <specific value="3" description="P3133" uuid="eb65f40e-5269-11df-b874-080069138b88" uid="18077"/>
-        <specific value="4" description="P3134" uuid="eb67010a-5269-11df-8808-080069138b88" uid="18078"/>
-        <specific value="5" description="P3135" uuid="eb6813b0-5269-11df-8f2b-080069138b88" uid="18079"/>
-        <specific value="6" description="P3136" uuid="eb69203e-5269-11df-9620-080069138b88" uid="18080"/>
-        <specific value="7" description="P3137" uuid="eb6a2dda-5269-11df-ac7b-080069138b88" uid="18081"/>
-        <specific value="8" description="P3138" uuid="eb6b3c52-5269-11df-a403-080069138b88" uid="18082"/>
-        <specific value="9" description="P3139" uuid="eb6c46ce-5269-11df-9398-080069138b88" uid="18083"/>
-        <specific value="10" description="P3140" uuid="eb6d596a-5269-11df-857a-080069138b88" uid="18084"/>
-      </subcategory>
-      <subcategory value="13" description="TAEDONG" uuid="eb6f05d0-5269-11df-b7a1-080069138b88" uid="18085"/>
-      <subcategory value="14" description="TIR" uuid="eb701538-5269-11df-9fd2-080069138b88" uid="18086"/>
-      <subcategory value="15" description="PEYKAAP WPT" uuid="eb712374-5269-11df-83d0-080069138b88" uid="18087"/>
-      <subcategory value="16" description="BANDAR-A Corvette (FFL)" uuid="eb723354-5269-11df-9c3a-080069138b88" uid="18088"/>
-      <subcategory value="17" description="KASHDOM WPBG" uuid="eb734370-5269-11df-a82d-080069138b88" uid="18089"/>
-      <subcategory value="18" description="MIG-S-2600 Class" uuid="eb7452c4-5269-11df-be0a-080069138b88" uid="18090"/>
-      <subcategory value="19" description="CHINA CAT Class" uuid="eb7565ce-5269-11df-a4dc-080069138b88" uid="18091"/>
-      <subcategory value="20" description="ASHOORA I PBR" uuid="eb767644-5269-11df-a2e5-080069138b88" uid="18092"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="eb78257a-5269-11df-bc85-080069138b88" uid="18093">
-      <subcategory value="1" description="Cape Class (minesweeper-inshore)" uuid="eb79346a-5269-11df-98ae-080069138b88" uid="18094">
-        <specific value="1" description="311 Harischi" uuid="eb7a45e4-5269-11df-83ba-080069138b88" uid="18095"/>
-        <specific value="2" description="312 Raizi" uuid="eb7b55ba-5269-11df-9bc5-080069138b88" uid="18096"/>
-      </subcategory>
-      <subcategory value="2" description="MSC 268/292 Class" uuid="eb7d052c-5269-11df-9241-080069138b88" uid="18097"/>
-    </category>
-    <category value="10" description="Tank Landing Ship" uuid="eb7ebff2-5269-11df-a97c-080069138b88" uid="18098">
-      <subcategory value="1" description="Iran Air Class (LST)" uuid="eb7fca32-5269-11df-90b1-080069138b88" uid="18099">
-        <specific value="1" description="Iran Asir" uuid="eb80da26-5269-11df-8983-080069138b88" uid="18100"/>
-        <specific value="2" description="Iran Ghaydr" uuid="eb81ece0-5269-11df-a524-080069138b88" uid="18101"/>
-      </subcategory>
-      <subcategory value="2" description="Iran Hormuz 24 Class (LST)" uuid="eb839b94-5269-11df-8a2c-080069138b88" uid="18102">
-        <specific value="1" description="24-26" uuid="eb84a804-5269-11df-b719-080069138b88" uid="18103"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="eb86fd5c-5269-11df-90dd-080069138b88" uid="18104">
-      <subcategory value="1" description="Rotork Craft (LCU)" uuid="eb88056c-5269-11df-a9d5-080069138b88" uid="18105"/>
-      <subcategory value="2" description="MIG-S-3700 Class (LCT)" uuid="eb891876-5269-11df-bd01-080069138b88" uid="18106"/>
-      <subcategory value="3" description="Iran Hormuz 21 Class (LCT)" uuid="eb8a2a54-5269-11df-8c7b-080069138b88" uid="18107">
-        <specific value="1" description="21-23" uuid="eb8b35fc-5269-11df-b0e7-080069138b88" uid="18108"/>
-      </subcategory>
-    </category>
-    <category value="15" description="Air Cushion/Surface Effect" uuid="eb8d89ce-5269-11df-b9cc-080069138b88" uid="18109">
-      <subcategory value="1" description="Winchester (SR. N6) Class (hovercraft)" uuid="eb8e95c6-5269-11df-819e-080069138b88" uid="18110">
-        <specific value="1" description="01-08" uuid="eb8fa97a-5269-11df-b668-080069138b88" uid="18111"/>
-      </subcategory>
-      <subcategory value="2" description="Wellington (BH.7) Class (hovercraft)" uuid="eb9158d8-5269-11df-bc85-080069138b88" uid="18112">
-        <specific value="1" description="101-106" uuid="eb92684a-5269-11df-8a3e-080069138b88" uid="18113"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="eb94b9f6-5269-11df-8656-080069138b88" uid="18114">
-      <subcategory value="1" description="Replenishment Ship" uuid="eb95c922-5269-11df-a6e8-080069138b88" uid="18115">
-        <specific value="1" description="431 Kharg" uuid="eb96d6be-5269-11df-a5fb-080069138b88" uid="18116"/>
-      </subcategory>
-      <subcategory value="2" description="Hendijan Class (AG) (tenders)" uuid="eb9884dc-5269-11df-97df-080069138b88" uid="18117">
-        <specific value="1" description="Hendijan" uuid="eb9995a2-5269-11df-a9d6-080069138b88" uid="18118"/>
-        <specific value="2" description="Konarak" uuid="eb9aa712-5269-11df-91a6-080069138b88" uid="18119"/>
-        <specific value="3" description="Sirik" uuid="eb9bb15c-5269-11df-a5ca-080069138b88" uid="18120"/>
-        <specific value="4" description="Geno" uuid="eb9cc74a-5269-11df-8758-080069138b88" uid="18121"/>
-        <specific value="5" description="Kalat" uuid="eb9dd7f2-5269-11df-8328-080069138b88" uid="18122"/>
-        <specific value="6" description="Genaveh" uuid="eb9ee444-5269-11df-a0f3-080069138b88" uid="18123"/>
-        <specific value="7" description="Savatar" uuid="eb9ff3c0-5269-11df-a417-080069138b88" uid="18124"/>
-        <specific value="8" description="Mogam" uuid="eba101e8-5269-11df-a280-080069138b88" uid="18125"/>
-        <specific value="9" description="Rostani" uuid="eba20b60-5269-11df-bc44-080069138b88" uid="18126"/>
-        <specific value="10" description="Mayband" uuid="eba31d8e-5269-11df-a4cc-080069138b88" uid="18127"/>
-        <specific value="11" description="Maqam" uuid="eba42dc8-5269-11df-bbd3-080069138b88" uid="18128"/>
-        <specific value="12" description="Koramshahr" uuid="eba53858-5269-11df-acbc-080069138b88" uid="18129"/>
-        <specific value="13" description="Bamregan" uuid="eba64a0e-5269-11df-845a-080069138b88" uid="18130"/>
-      </subcategory>
-      <subcategory value="3" description="Kangan Class (water tanker)" uuid="eba7fa2a-5269-11df-9f5c-080069138b88" uid="18131">
-        <specific value="1" description="411 Kangan" uuid="eba90a50-5269-11df-9c33-080069138b88" uid="18132"/>
-        <specific value="2" description="412 Teheri" uuid="ebaa17f6-5269-11df-b5ae-080069138b88" uid="18133"/>
-        <specific value="3" description="xxx Shahid Marjani" uuid="ebab2718-5269-11df-b9cd-080069138b88" uid="18134"/>
-        <specific value="4" description="xxx Amir" uuid="ebac3702-5269-11df-bd27-080069138b88" uid="18135"/>
-      </subcategory>
-      <subcategory value="4" description="Delvar Class (support ship)" uuid="ebade8ea-5269-11df-a421-080069138b88" uid="18136">
-        <specific value="1" description="Chark (AK) (cargo)" uuid="ebaef3ca-5269-11df-b166-080069138b88" uid="18137"/>
-        <specific value="2" description="Chiroo (AK) (cargo)" uuid="ebb00486-5269-11df-ab33-080069138b88" uid="18138"/>
-        <specific value="3" description="Souru (AK) (cargo)" uuid="ebb114f2-5269-11df-bc17-080069138b88" uid="18139"/>
-        <specific value="4" description="Dilim (AW) (water)" uuid="ebb220f4-5269-11df-850f-080069138b88" uid="18140"/>
-        <specific value="5" description="Dayer (AW) (water)" uuid="ebb335d4-5269-11df-9feb-080069138b88" uid="18141"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="ebb58500-5269-11df-9602-080069138b88" uid="18142">
-      <subcategory value="1" description="Bayandor Class" uuid="ebb6990e-5269-11df-a959-080069138b88" uid="18143"/>
-    </category>
-    <category value="55" description="Amphibious Cargo Ship" uuid="ebb847ae-5269-11df-953b-080069138b88" uid="18144">
-      <subcategory value="1" description="Hengam Class (LSL)" uuid="ebb95798-5269-11df-990a-080069138b88" uid="18145">
-        <specific value="1" description="511 Hengam" uuid="ebba731c-5269-11df-8ae5-080069138b88" uid="18146"/>
-        <specific value="2" description="512 Larak" uuid="ebbb7e60-5269-11df-9bd5-080069138b88" uid="18147"/>
-        <specific value="3" description="513 Tonb" uuid="ebbc8e18-5269-11df-8ac9-080069138b88" uid="18148"/>
-        <specific value="4" description="514 Lavan" uuid="ebbd9e7a-5269-11df-bde3-080069138b88" uid="18149"/>
-      </subcategory>
-    </category>
-    <category value="57" description="Ammunition Ship" uuid="ebbff1fc-5269-11df-bfab-080069138b88" uid="18150">
-      <subcategory value="1" description="Delvar Class (support ship)" uuid="ebc100d8-5269-11df-9d76-080069138b88" uid="18151">
-        <specific value="1" description="Delvar (AE)" uuid="ebc20ab4-5269-11df-b62d-080069138b88" uid="18152"/>
-        <specific value="2" description="Sirjan (AE)" uuid="ebc31f4e-5269-11df-848c-080069138b88" uid="18153"/>
-      </subcategory>
-    </category>
-    <category value="58" description="Combat Stores Ship" uuid="ebc57014-5269-11df-8d5b-080069138b88" uid="18154">
-      <subcategory value="1" description="Fleet Supply Ship" uuid="ebc67efa-5269-11df-9e72-080069138b88" uid="18155">
-        <specific value="1" description="421 Bandar Abbas" uuid="ebc78e94-5269-11df-a25b-080069138b88" uid="18156"/>
-        <specific value="2" description="422 Boushehr" uuid="ebc89f6e-5269-11df-a0c1-080069138b88" uid="18157"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-combatant Ship" uuid="ebcaf17e-5269-11df-9cc2-080069138b88" uid="18158">
-      <subcategory value="1" description="Container Class" uuid="ebcc0136-5269-11df-b61d-080069138b88" uid="18159">
-        <specific value="1" description="ADIR" uuid="ebcd0a9a-5269-11df-b86a-080069138b88" uid="18160"/>
-        <specific value="2" description="IRAN ABOZAR" uuid="ebce1d2c-5269-11df-9131-080069138b88" uid="18161"/>
-        <specific value="3" description="IRAN AKHAVAN" uuid="ebcf2cbc-5269-11df-b947-080069138b88" uid="18162"/>
-        <specific value="4" description="IRAN FALLAHI" uuid="ebd037c4-5269-11df-ab8a-080069138b88" uid="18163"/>
-        <specific value="5" description="IRAN TALEGHANI" uuid="ebd146e6-5269-11df-9222-080069138b88" uid="18164"/>
-        <specific value="6" description="IRAN SHARIATI" uuid="ebd25bc6-5269-11df-bf62-080069138b88" uid="18165"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="101" uuid="ebd54b60-5269-11df-8611-080069138b88" uid="18166">
-    <category value="5" description="SS (Conventional, Attack-Torpedo, Patrol)" uuid="ebd65ad2-5269-11df-8b99-080069138b88" uid="18167">
-      <subcategory value="1" description="901 Tareq" uuid="ebd769cc-5269-11df-b494-080069138b88" uid="18168"/>
-      <subcategory value="2" description="902 Noor" uuid="ebd87ad8-5269-11df-b38e-080069138b88" uid="18169"/>
-    </category>
-    <category value="7" description="SSA (Conventional Auxiliary)" uuid="ebda46ce-5269-11df-aba9-080069138b88" uid="18170">
-      <subcategory value="1" description="Midget Submarine" uuid="ebdb533e-5269-11df-aeae-080069138b88" uid="18171">
-        <specific value="1" description="Semi Submersible TAEDONG-B" uuid="ebdc6328-5269-11df-808f-080069138b88" uid="18172"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="105" uuid="ebdf58b2-5269-11df-9981-080069138b88" uid="18173">
-    <category value="4" description="Self-propelled Artillery" uuid="ebe06752-5269-11df-9e0e-080069138b88" uid="18174">
-      <subcategory value="1" description="Gabriel Mk 1 launcher" uuid="ebe174f8-5269-11df-aa05-080069138b88" uid="18175"/>
-      <subcategory value="2" description="Gabriel Mk 2 launcher" uuid="ebe28910-5269-11df-b055-080069138b88" uid="18176"/>
-      <subcategory value="3" description="Gabriel Mk 3 launcher" uuid="ebe398fa-5269-11df-b780-080069138b88" uid="18177"/>
-      <subcategory value="4" description="Gabriel Mk LR launcher" uuid="ebe4a48e-5269-11df-b45e-080069138b88" uid="18178"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="105" uuid="ebe6fb8a-5269-11df-aa1f-080069138b88" uid="18179">
-    <category value="1" description="Fighter/Air Defense" uuid="ebe80494-5269-11df-b963-080069138b88" uid="18180">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="ebe9165e-5269-11df-aee1-080069138b88" uid="18181"/>
-      <subcategory value="2" description="Israel Aircraft Industries C-7 Kifr" uuid="ebea2846-5269-11df-bc07-080069138b88" uid="18182">
-        <specific value="1" description="C-7" uuid="ebeb33ee-5269-11df-9731-080069138b88" uid="18183"/>
-      </subcategory>
-      <subcategory value="3" description="I A I Lavi" uuid="ebece662-5269-11df-8ada-080069138b88" uid="18184"/>
-    </category>
-    <category value="4" description="Cargo/Tanker" uuid="ebee93c2-5269-11df-83d3-080069138b88" uid="18185">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="ebefa69a-5269-11df-82c3-080069138b88" uid="18186"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="ebf0b800-5269-11df-883a-080069138b88" uid="18187"/>
-      <subcategory value="3" description="Israel Aircraft Industries 707" uuid="ebf1c600-5269-11df-90a0-080069138b88" uid="18188">
-        <specific value="1" description="707-320C" uuid="ebf2d3ce-5269-11df-bdbd-080069138b88" uid="18189"/>
-        <specific value="2" description="ARAVA IAI-202" uuid="ebf3e6a6-5269-11df-a777-080069138b88" uid="18190"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Surveillance/C2 (Airborne Early Warning)" uuid="ebf6350a-5269-11df-a725-080069138b88" uid="18191">
-      <subcategory value="1" description="707" uuid="ebf74828-5269-11df-a3cf-080069138b88" uid="18192"/>
-      <subcategory value="2" description="720" uuid="ebf8592a-5269-11df-aa72-080069138b88" uid="18193"/>
-      <subcategory value="3" description="ARAVA IAI-201" uuid="ebf96a2c-5269-11df-90bf-080069138b88" uid="18194"/>
-    </category>
-    <category value="21" description="Utility Helicopter" uuid="ebfb19da-5269-11df-bc27-080069138b88" uid="18195">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="ebfc2d84-5269-11df-b21b-080069138b88" uid="18196"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="ebfd38d2-5269-11df-9cda-080069138b88" uid="18197"/>
-      <subcategory value="3" description="Bell Helicopter Textron Canada Ltd. Twin Two Twelve" uuid="ebfe4b0a-5269-11df-a2f9-080069138b88" uid="18198"/>
-    </category>
-    <category value="23" description="Cargo Helicopter" uuid="ec0000bc-5269-11df-baa9-080069138b88" uid="18199">
-      <subcategory value="1" description="Israel Aircraft Industries Yasur 2000" uuid="ec0111d2-5269-11df-8b27-080069138b88" uid="18200">
-        <specific value="1" description="Yasur 2000" uuid="ec021e2e-5269-11df-8cb5-080069138b88" uid="18201"/>
-      </subcategory>
-    </category>
-    <category value="40" description="Trainer" uuid="ec0472c8-5269-11df-a77b-080069138b88" uid="18202">
-      <subcategory value="1" description="Israel Aircraft Industries C-7 Kifr" uuid="ec057d62-5269-11df-b2a5-080069138b88" uid="18203">
-        <specific value="1" description="TC-7" uuid="ec06927e-5269-11df-9e68-080069138b88" uid="18204"/>
-      </subcategory>
-    </category>
-    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="ec08de8a-5269-11df-aa24-080069138b88" uid="18205">
-      <subcategory value="1" description="Passenger Airline" uuid="ec09f252-5269-11df-b28f-080069138b88" uid="18206">
-        <specific value="1" description="Israel Aircraft Industries 1125 Astra SP" uuid="ec0b0430-5269-11df-8c3b-080069138b88" uid="18207"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="105" uuid="ec0df9c4-5269-11df-bd5f-080069138b88" uid="18208">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ec0f0a08-5269-11df-9fb6-080069138b88" uid="18209">
-      <subcategory value="1" description="Eilat (Saar 5) Class (Corvette)" uuid="ec1014ca-5269-11df-b723-080069138b88" uid="18210">
-        <specific value="1" description="501 Eilat" uuid="ec112932-5269-11df-90c6-080069138b88" uid="18211"/>
-        <specific value="2" description="503 Hanit" uuid="ec1233cc-5269-11df-9cb5-080069138b88" uid="18212"/>
-        <specific value="3" description="502 Lahav" uuid="ec134370-5269-11df-a1d2-080069138b88" uid="18213"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="ec1597b0-5269-11df-87c6-080069138b88" uid="18214">
-      <subcategory value="1" description="Aliya (Saar 4.5) (fast attack craft-missile)" uuid="ec16aa4c-5269-11df-bb65-080069138b88" uid="18215">
-        <specific value="1" description="Aliya" uuid="ec17bdce-5269-11df-954b-080069138b88" uid="18216"/>
-        <specific value="2" description="Geoula" uuid="ec18d024-5269-11df-8f29-080069138b88" uid="18217"/>
-      </subcategory>
-      <subcategory value="2" description="Hetz (Saar 4.5) (fast attack craft-missile)" uuid="ec1a7d70-5269-11df-ab76-080069138b88" uid="18218">
-        <specific value="1" description="Romat" uuid="ec1b8ae4-5269-11df-a7ac-080069138b88" uid="18219"/>
-        <specific value="2" description="Keshet" uuid="ec1c9d3a-5269-11df-98ed-080069138b88" uid="18220"/>
-        <specific value="3" description="Hetz" uuid="ec1dac34-5269-11df-ab6f-080069138b88" uid="18221"/>
-      </subcategory>
-      <subcategory value="3" description="Mivtach (Saar 2) Class (fast attack craft-missile)" uuid="ec1f59f8-5269-11df-9893-080069138b88" uid="18222">
-        <specific value="1" description="311 Mivtach" uuid="ec206ab4-5269-11df-8be1-080069138b88" uid="18223"/>
-        <specific value="2" description="312 Miznag" uuid="ec217ada-5269-11df-aa1e-080069138b88" uid="18224"/>
-        <specific value="3" description="313 Mifgav" uuid="ec2289a2-5269-11df-8331-080069138b88" uid="18225"/>
-        <specific value="4" description="321 Eilath" uuid="ec2396b2-5269-11df-b9cd-080069138b88" uid="18226"/>
-        <specific value="5" description="322 Haifa" uuid="ec24a62e-5269-11df-ac8e-080069138b88" uid="18227"/>
-        <specific value="6" description="323 Akko" uuid="ec25b5a0-5269-11df-b811-080069138b88" uid="18228"/>
-      </subcategory>
-      <subcategory value="4" description="Reshef (Saar 4) (fast attack craft-missile)" uuid="ec27674c-5269-11df-b0d6-080069138b88" uid="18229">
-        <specific value="1" description="Reshef" uuid="ec28724a-5269-11df-8150-080069138b88" uid="18230"/>
-        <specific value="2" description="Kidon" uuid="ec29831a-5269-11df-a62c-080069138b88" uid="18231"/>
-        <specific value="3" description="Tarshish" uuid="ec2a94b2-5269-11df-9575-080069138b88" uid="18232"/>
-        <specific value="4" description="Yaffo" uuid="ec2b9ccc-5269-11df-8115-080069138b88" uid="18233"/>
-        <specific value="5" description="Nitzhon" uuid="ec2caca2-5269-11df-b3ef-080069138b88" uid="18234"/>
-        <specific value="6" description="Atsmount" uuid="ec2dbcf0-5269-11df-ad21-080069138b88" uid="18235"/>
-        <specific value="7" description="Moledet" uuid="ec2ec9f6-5269-11df-b87c-080069138b88" uid="18236"/>
-        <specific value="8" description="Komemiut" uuid="ec2fd968-5269-11df-8712-080069138b88" uid="18237"/>
-      </subcategory>
-      <subcategory value="5" description="Super Dvora Class (fast attack craft-gun)" uuid="ec318b50-5269-11df-a737-080069138b88" uid="18238">
-        <specific value="1" description="810-821" uuid="ec329ef0-5269-11df-a9d7-080069138b88" uid="18239"/>
-      </subcategory>
-      <subcategory value="6" description="Dabur Class (coastal patrol craft)" uuid="ec344e44-5269-11df-81cd-080069138b88" uid="18240"/>
-      <subcategory value="7" description="Iquique (Saar3)" uuid="ec35613a-5269-11df-9510-080069138b88" uid="18241">
-        <specific value="1" description="Iquique" uuid="ec36761a-5269-11df-bee1-080069138b88" uid="18242"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="ec38c47e-5269-11df-a7a1-080069138b88" uid="18243">
-      <subcategory value="1" description="Ashdod Class (LCT)" uuid="ec39d6de-5269-11df-bc0d-080069138b88" uid="18244">
-        <specific value="1" description="61 Ashdod" uuid="ec3ae56a-5269-11df-8d83-080069138b88" uid="18245"/>
-        <specific value="2" description="63 Ashkelon" uuid="ec3bf464-5269-11df-a1c9-080069138b88" uid="18246"/>
-        <specific value="3" description="65 Achziv" uuid="ec3d0192-5269-11df-9a73-080069138b88" uid="18247"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="105" uuid="ec3ff2e4-5269-11df-8adc-080069138b88" uid="18248">
-    <category value="4" description="SSG (Conventional Guided Missile)" uuid="ec4104cc-5269-11df-811c-080069138b88" uid="18249">
-      <subcategory value="1" description="Gal (Vickers Type 540) Class" uuid="ec4210b0-5269-11df-bc59-080069138b88" uid="18250">
-        <specific value="1" description="Gal" uuid="ec432090-5269-11df-bd95-080069138b88" uid="18251"/>
-        <specific value="2" description="Tanin" uuid="ec4434ee-5269-11df-9719-080069138b88" uid="18252"/>
-        <specific value="3" description="Rahav" uuid="ec453cf4-5269-11df-925c-080069138b88" uid="18253"/>
-      </subcategory>
-    </category>
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="ec479364-5269-11df-abf1-080069138b88" uid="18254">
-      <subcategory value="1" description="Dolphin Type 800" uuid="ec489f34-5269-11df-8702-080069138b88" uid="18255">
-        <specific value="1" description="Dolphin" uuid="ec49af78-5269-11df-b88a-080069138b88" uid="18256"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="114" uuid="ec4ca5ac-5269-11df-9b25-080069138b88" uid="18257">
-    <category value="2" description="Attack/Strike" uuid="ec4db3c0-5269-11df-9619-080069138b88" uid="18258">
-      <subcategory value="1" description="Construcciones Aeronauticas CC-04 Aviojet" uuid="ec4ec0ee-5269-11df-bc9a-080069138b88" uid="18259">
-        <specific value="1" description="CC-04" uuid="ec4fd33a-5269-11df-be01-080069138b88" uid="18260"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="114" uuid="ec52c568-5269-11df-b088-080069138b88" uid="18261">
-    <category value="7" description="Light/Patrol Craft" uuid="ec53d2b4-5269-11df-81af-080069138b88" uid="18262">
-      <subcategory value="1" description="Faysal" uuid="ec54e60e-5269-11df-b2f9-080069138b88" uid="18263">
-        <specific value="1" description="Faysal" uuid="ec55fa30-5269-11df-a175-080069138b88" uid="18264"/>
-        <specific value="2" description="Han" uuid="ec570984-5269-11df-8c61-080069138b88" uid="18265"/>
-        <specific value="3" description="Hasayu" uuid="ec58123e-5269-11df-b08f-080069138b88" uid="18266"/>
-        <specific value="4" description="Muhammed" uuid="ec592610-5269-11df-a65e-080069138b88" uid="18267"/>
-      </subcategory>
-      <subcategory value="2" description="AL Hussein (Hawk) Class (fast attack craft-gun)" uuid="ec5ad528-5269-11df-a53e-080069138b88" uid="18268">
-        <specific value="1" description="101 AL Hussein" uuid="ec5be63e-5269-11df-a6bb-080069138b88" uid="18269"/>
-        <specific value="2" description="102 AL Hussan" uuid="ec5cf27c-5269-11df-8a32-080069138b88" uid="18270"/>
-        <specific value="3" description="103 Abdullah" uuid="ec5e0270-5269-11df-93d0-080069138b88" uid="18271"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="ec6054f8-5269-11df-a004-080069138b88" uid="18272">
-      <subcategory value="1" description="AL Hashim (Rotork) Class (LCU)" uuid="ec6164b0-5269-11df-ac22-080069138b88" uid="18273">
-        <specific value="1" description="AL Hashim" uuid="ec627512-5269-11df-be67-080069138b88" uid="18274"/>
-        <specific value="2" description="AL Faisal" uuid="ec6384ca-5269-11df-972a-080069138b88" uid="18275"/>
-        <specific value="3" description="AL Hamza" uuid="ec649180-5269-11df-b4a2-080069138b88" uid="18276"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="106" uuid="ec67835e-5269-11df-aee7-080069138b88" uid="18277">
-    <category value="1" description="Tank" uuid="ec689082-5269-11df-b66b-080069138b88" uid="18278">
-      <subcategory value="1" description="Light Tank/Recon" uuid="ec699dba-5269-11df-a841-080069138b88" uid="18279">
-        <specific value="1" description="Centauro B-1" uuid="ec6aadd6-5269-11df-baad-080069138b88" uid="18280"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Armored Fighting Vehicle" uuid="ec6cfc6c-5269-11df-b1cf-080069138b88" uid="18281">
-      <subcategory value="1" description="Armored Personnel Carrier (APC)" uuid="ec6e0bac-5269-11df-91c1-080069138b88" uid="18282">
-        <specific value="1" description="VCC 1/2" uuid="ec6f1d76-5269-11df-8047-080069138b88" uid="18283"/>
-        <specific value="2" description="Fiat 6614" uuid="ec7030bc-5269-11df-aa20-080069138b88" uid="18284"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Self Propelled Artillery (guns and howitzers)" uuid="ec729532-5269-11df-8519-080069138b88" uid="18285">
-      <subcategory value="1" description="M-109G" uuid="ec73a7ce-5269-11df-83d6-080069138b88" uid="18286"/>
-      <subcategory value="2" description="M-109L" uuid="ec74bc40-5269-11df-bcbc-080069138b88" uid="18287"/>
-      <subcategory value="3" description="M-110A2" uuid="ec75c752-5269-11df-8447-080069138b88" uid="18288"/>
-    </category>
-    <category value="5" description="Towed Artillery (anti-tank guns, guns and howitzers)" uuid="ec777778-5269-11df-a511-080069138b88" uid="18289">
-      <subcategory value="1" description="Model 56 PACK" uuid="ec788c94-5269-11df-84e7-080069138b88" uid="18290"/>
-      <subcategory value="2" description="FH-70" uuid="ec799db4-5269-11df-b787-080069138b88" uid="18291"/>
-      <subcategory value="3" description="SPADA" deprecated="1" uuid="ec7aa81c-5269-11df-8af0-080069138b88" uid="18292"/>
-    </category>
-    <category value="10" description="Mortar" uuid="ec7c57b6-5269-11df-9954-080069138b88" uid="18293">
-      <subcategory value="1" description="120 mm" uuid="ec7d68ea-5269-11df-ad1e-080069138b88" uid="18294"/>
-      <subcategory value="2" description="81 mm" uuid="ec7e7938-5269-11df-91b0-080069138b88" uid="18295"/>
-    </category>
-    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="ec802ad0-5269-11df-8229-080069138b88" uid="18296">
-      <subcategory value="1" description="SPADA SAM System" uuid="ec813718-5269-11df-bcac-080069138b88" uid="18297">
-        <specific value="1" description="Detection Center (DC)" uuid="ec824590-5269-11df-994c-080069138b88" uid="18298">
-          <extra value="1" description="Operational Control Center (OCC)" uuid="ec835700-5269-11df-9d06-080069138b88" uid="18299"/>
-          <extra value="2" description="Search and Interrogation Radar (SIR)" uuid="ec846712-5269-11df-9741-080069138b88" uid="18300"/>
-        </specific>
-        <specific value="2" description="SPADA Firing Section" uuid="ec86176a-5269-11df-898d-080069138b88" uid="18301">
-          <extra value="1" description="Aspide 6-Round Missile Launcher" uuid="ec872646-5269-11df-87f6-080069138b88" uid="18302"/>
-          <extra value="2" description="Tracking and Illumination Radar (TIR)" uuid="ec883874-5269-11df-9d3c-080069138b88" uid="18303"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="106" uuid="ec8bcdb8-5269-11df-b04c-080069138b88" uid="18304">
-    <category value="1" description="Fighter/Air Defense" uuid="ec8ce04a-5269-11df-be35-080069138b88" uid="18305">
-      <subcategory value="1" description="AMX" uuid="ec8deaa8-5269-11df-8ef1-080069138b88" uid="18306">
-        <specific value="1" description="AMX-T" uuid="ec8ef98e-5269-11df-8187-080069138b88" uid="18307"/>
-      </subcategory>
-      <subcategory value="2" description="MB 339" uuid="ec90abbc-5269-11df-8c21-080069138b88" uid="18308"/>
-      <subcategory value="3" description="MB-326" uuid="ec91c66e-5269-11df-a846-080069138b88" uid="18309"/>
-    </category>
-    <category value="2" description="Attack/Strike" uuid="ec93768a-5269-11df-9cb6-080069138b88" uid="18310"/>
-    <category value="4" description="Cargo/Tanker" uuid="ec947eea-5269-11df-81d8-080069138b88" uid="18311">
-      <subcategory value="1" description="G.222/C-27 Spartan" uuid="ec958fb0-5269-11df-b641-080069138b88" uid="18312" status="new">
-        <cr value="2337"/>
-        <specific value="1" description="G.222A" status="new" uuid="c46d62c5-c8f0-426e-bf1c-4055158dbc3f" uid="22921">
-          <cr value="2337"/>
-        </specific>
-        <specific value="2" description="C-27A Spartan" status="new" uuid="c2639efe-a48e-4114-bbc5-8c796c02ea82" uid="22922">
-          <cr value="2337"/>
-        </specific>
-        <specific value="3" description="C-27J Spartan" status="new" uuid="c0856200-ebe7-4e99-b8c9-0729d1e70de8" uid="22923">
-          <cr value="2337"/>
-        </specific>
-        <specific value="4" description="G.222TCM" status="new" uuid="6171a8c0-65e9-4bf7-839b-0080cbe50f15" uid="22924">
-          <cr value="2337"/>
-        </specific>
-        <specific value="5" description="G.222RM" status="new" uuid="dec943b0-1112-4ec4-aad4-1f312a1995c1" uid="22925">
-          <cr value="2337"/>
-        </specific>
-        <specific value="6" description="G.222SAA" status="new" uuid="7ff49822-ee44-4737-bcc4-16e33ef6907b" uid="22926">
-          <cr value="2337"/>
-        </specific>
-        <specific value="7" description="G.222T (aka G.222L)" status="new" uuid="6085f355-c735-42b9-819a-b156f37f608b" uid="22927">
-          <cr value="2337"/>
-        </specific>
-        <specific value="8" description="G.222VS (aka G.222GE)" status="new" uuid="b9bdeae5-29fd-4865-a3a4-7d90df88bfe6" uid="22928">
-          <cr value="2337"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="20" description="Attack Helicopter" uuid="ec9741ac-5269-11df-b132-080069138b88" uid="18313">
-      <subcategory value="1" description="Agusta Bell 412SP" uuid="ec985088-5269-11df-a26e-080069138b88" uid="18314"/>
-    </category>
-    <category value="21" description="Utility Helicopter" uuid="ec99ff6e-5269-11df-8385-080069138b88" uid="18315">
-      <subcategory value="1" description="Agusta A139" uuid="ec9b0cb0-5269-11df-a005-080069138b88" uid="18316"/>
-      <subcategory value="2" description="Agusta-Bell 206B" uuid="ec9c1cc2-5269-11df-a5b3-080069138b88" uid="18317"/>
-      <subcategory value="3" description="Agusta-Bell 212" uuid="ec9d2b3a-5269-11df-a1ad-080069138b88" uid="18318"/>
-      <subcategory value="4" description="HA-3F" uuid="ec9e3624-5269-11df-9acb-080069138b88" uid="18319"/>
-      <subcategory value="5" description="A-109" uuid="ec9f4a50-5269-11df-94d8-080069138b88" uid="18320"/>
-      <subcategory value="6" description="A-129" uuid="eca0592c-5269-11df-bede-080069138b88" uid="18321"/>
-      <subcategory value="7" description="AB-205A" uuid="eca1620e-5269-11df-abb0-080069138b88" uid="18322"/>
-      <subcategory value="8" description="Agusta-Bell 214" uuid="eca274fa-5269-11df-ab93-080069138b88" uid="18323"/>
-    </category>
-    <category value="22" description="Anti-submarine Warfare/Patrol Helicopter" uuid="eca42552-5269-11df-a612-080069138b88" uid="18324">
-      <subcategory value="1" description="Agusta Bell 212 ASW" uuid="eca53654-5269-11df-bc41-080069138b88" uid="18325"/>
-      <subcategory value="2" description="AS-61" uuid="eca6433c-5269-11df-8ad3-080069138b88" uid="18326"/>
-      <subcategory value="3" description="ASH-3H" uuid="eca75290-5269-11df-bd58-080069138b88" uid="18327"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="106" uuid="eca9a3b0-5269-11df-89b3-080069138b88" uid="18328">
-    <category value="1" description="Carrier" uuid="ecaab23c-5269-11df-a192-080069138b88" uid="18329">
-      <subcategory value="1" description="Luigi Einaudi Class (CV)" uuid="ecabc050-5269-11df-82bd-080069138b88" uid="18330">
-        <specific value="1" description="C552 Luigi Einaudi" uuid="ecacd2b0-5269-11df-a849-080069138b88" uid="18331"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Command Ship/Cruiser" uuid="ecaf24ca-5269-11df-9423-080069138b88" uid="18332">
-      <subcategory value="1" description="C 550 Vittorio Veneto" uuid="ecb03bf8-5269-11df-9e24-080069138b88" uid="18333"/>
-    </category>
-    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="ecb1efac-5269-11df-889f-080069138b88" uid="18334">
-      <subcategory value="1" description="Audace class" uuid="ecb2f9d8-5269-11df-ab70-080069138b88" uid="18335">
-        <specific value="1" description="D 550 Ardito" uuid="ecb40882-5269-11df-9840-080069138b88" uid="18336"/>
-        <specific value="2" description="D 551 Audace" uuid="ecb51b5a-5269-11df-830d-080069138b88" uid="18337"/>
-      </subcategory>
-      <subcategory value="2" description="Animoso class" uuid="ecb6c84c-5269-11df-a4c2-080069138b88" uid="18338">
-        <specific value="1" description="D 560 Luigi Durand De La Penne" uuid="ecb7d534-5269-11df-ae28-080069138b88" uid="18339"/>
-        <specific value="2" description="D 561 Francisco Mimbelli" uuid="ecb8e71c-5269-11df-be52-080069138b88" uid="18340"/>
-      </subcategory>
-      <subcategory value="3" description="Andrea Doria (Horizon) Class" status="new" uuid="27cac77c-a3a4-49b7-965a-13a3332ac032" uid="22714">
-        <cr value="1621"/>
-        <specific value="1" description="D553 Andrea Doria" status="new" uuid="218f6cde-ef39-44b1-b09a-0eb6b52e1a2e" uid="22715">
-          <cr value="1621"/>
-        </specific>
-        <specific value="2" description="D554 Caio Duilio" status="new" uuid="9d1b04bf-1d3d-4ded-8f26-78a4a5850d1f" uid="22716">
-          <cr value="1621"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="ecbb347c-5269-11df-a113-080069138b88" uid="18341">
-      <subcategory value="1" description="Cassiopea Class (Offshore Patrol Vessels) (OPV)" uuid="ecbc46d2-5269-11df-a9c9-080069138b88" uid="18342">
-        <specific value="1" description="P401 Cassiopea" uuid="ecbd587e-5269-11df-b9d3-080069138b88" uid="18343"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="ecbfa8ae-5269-11df-ba13-080069138b88" uid="18344">
-      <subcategory value="1" description="Gaeta Class" uuid="ecc0b79e-5269-11df-a813-080069138b88" uid="18345">
-        <specific value="1" description="M5550 Lerici" uuid="ecc1c698-5269-11df-9edd-080069138b88" uid="18346"/>
-        <specific value="2" description="M5551 Sapri" uuid="ecc2d844-5269-11df-a741-080069138b88" uid="18347"/>
-        <specific value="3" description="M5552 Milazzo" uuid="ecc3e54a-5269-11df-b3c0-080069138b88" uid="18348"/>
-        <specific value="4" description="M5553 Viesta" uuid="ecc4f480-5269-11df-bcda-080069138b88" uid="18349"/>
-        <specific value="5" description="M5554 Gaeta" uuid="ecc60352-5269-11df-bcaa-080069138b88" uid="18350"/>
-        <specific value="6" description="M5555 Termoli" uuid="ecc70f40-5269-11df-85b1-080069138b88" uid="18351"/>
-        <specific value="7" description="M5556 Alghero" uuid="ecc81f0c-5269-11df-9514-080069138b88" uid="18352"/>
-        <specific value="8" description="M5557 Numana" uuid="ecc92db6-5269-11df-a546-080069138b88" uid="18353"/>
-        <specific value="9" description="M5558 Crotone" uuid="ecca39ea-5269-11df-93f0-080069138b88" uid="18354"/>
-        <specific value="10" description="M5559 Viareggio" uuid="eccb4998-5269-11df-bf4c-080069138b88" uid="18355"/>
-        <specific value="11" description="M5560 Chioggia" uuid="eccc59fa-5269-11df-b7d8-080069138b88" uid="18356"/>
-        <specific value="12" description="M5561 Rimini" uuid="eccd63cc-5269-11df-830f-080069138b88" uid="18357"/>
-      </subcategory>
-      <subcategory value="2" description="Adjutant Class" uuid="eccf1af0-5269-11df-860f-080069138b88" uid="18358">
-        <specific value="1" description="M5504 Castagno" uuid="ecd02c88-5269-11df-9aa0-080069138b88" uid="18359"/>
-        <specific value="2" description="M5505 Cedro" uuid="ecd14000-5269-11df-9056-080069138b88" uid="18360"/>
-        <specific value="3" description="M5509 Gelso" uuid="ecd248ba-5269-11df-b6ae-080069138b88" uid="18361"/>
-        <specific value="4" description="M5516 Platano" uuid="ecd35782-5269-11df-926a-080069138b88" uid="18362"/>
-        <specific value="5" description="M5519 Mandorlo" uuid="ecd46834-5269-11df-acca-080069138b88" uid="18363"/>
-      </subcategory>
-    </category>
-    <category value="12" description="Light Carrier" uuid="ecd6b828-5269-11df-8075-080069138b88" uid="18364">
-      <subcategory value="1" description="C551 Giuseppe Garibaldi" uuid="ecd7c61e-5269-11df-a22e-080069138b88" uid="18365"/>
-    </category>
-    <category value="14" description="Hydrofoil" uuid="ecd97982-5269-11df-afbb-080069138b88" uid="18366">
-      <subcategory value="1" description="Sparviero Class (Hydrofoil-Missile)" uuid="ecda832c-5269-11df-9329-080069138b88" uid="18367">
-        <specific value="1" description="P421 Nibbio" uuid="ecdb93ac-5269-11df-bfb8-080069138b88" uid="18368"/>
-        <specific value="2" description="P422 Falcone" uuid="ecdca508-5269-11df-b3e2-080069138b88" uid="18369"/>
-        <specific value="3" description="P423 Astore" uuid="ecddaf66-5269-11df-b592-080069138b88" uid="18370"/>
-        <specific value="4" description="P424 Grifone" uuid="ecdebf00-5269-11df-91ff-080069138b88" uid="18371"/>
-        <specific value="5" description="P425 Cheppio" uuid="ecdfcefe-5269-11df-a79d-080069138b88" uid="18372"/>
-        <specific value="6" description="P426 Condor" uuid="ece0d740-5269-11df-b06f-080069138b88" uid="18373"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="ece33134-5269-11df-b0c5-080069138b88" uid="18374">
-      <subcategory value="1" description="Etna Class (Replenishment Tanker)" uuid="ece43a02-5269-11df-8fc3-080069138b88" uid="18375">
-        <specific value="1" description="Lieut Comdr Erminio Bagnasco" uuid="ece54b68-5269-11df-9718-080069138b88" uid="18376"/>
-      </subcategory>
-      <subcategory value="2" description="Stromboli Class" uuid="ece6fddc-5269-11df-9609-080069138b88" uid="18377">
-        <specific value="1" description="A5327 Stromboli" uuid="ece80c86-5269-11df-9f5a-080069138b88" uid="18378"/>
-        <specific value="2" description="A5329 Vesuvio" uuid="ece91766-5269-11df-b099-080069138b88" uid="18379"/>
-      </subcategory>
-      <subcategory value="3" description="Experimental Ship" uuid="eceac9e4-5269-11df-b3c1-080069138b88" uid="18380">
-        <specific value="1" description="A5325 Raffaele Rossetti" uuid="ecebd8d4-5269-11df-9779-080069138b88" uid="18381"/>
-        <specific value="2" description="A5320 Vincenzo Martellotta" uuid="ececea30-5269-11df-81d8-080069138b88" uid="18382"/>
-        <specific value="3" description="P492 Barbara" uuid="ecee003c-5269-11df-90d8-080069138b88" uid="18383"/>
-        <specific value="4" description="A5305 Murena" uuid="ecef1152-5269-11df-ab24-080069138b88" uid="18384"/>
-      </subcategory>
-      <subcategory value="4" description="Barngat Class (Support Ship)" uuid="ecf0c0b0-5269-11df-ae92-080069138b88" uid="18385">
-        <specific value="1" description="A5301 Pietro Cavezzali" uuid="ecf1d5ae-5269-11df-a671-080069138b88" uid="18386"/>
-      </subcategory>
-      <subcategory value="5" description="MTC 1011 Class (Ramped Transport)" uuid="ecf386f6-5269-11df-8fe7-080069138b88" uid="18387">
-        <specific value="1" description="A5347 Gorgona" uuid="ecf49276-5269-11df-9602-080069138b88" uid="18388"/>
-        <specific value="2" description="A5348 Tremiti" uuid="ecf5a33c-5269-11df-b526-080069138b88" uid="18389"/>
-        <specific value="3" description="A5349 Capera" uuid="ecf6b268-5269-11df-b33d-080069138b88" uid="18390"/>
-        <specific value="4" description="A5351 Pantelleria" uuid="ecf7bd3e-5269-11df-9c90-080069138b88" uid="18391"/>
-        <specific value="5" description="A5352 Lipari" uuid="ecf8cd5a-5269-11df-bbdd-080069138b88" uid="18392"/>
-        <specific value="6" description="A5353 Capri" uuid="ecf9dbf0-5269-11df-918f-080069138b88" uid="18393"/>
-      </subcategory>
-      <subcategory value="6" description="Pedretti Class (Commando Support Craft)" uuid="ecfb9148-5269-11df-8a2c-080069138b88" uid="18394">
-        <specific value="1" description="Y499 Alcide Pedretti" uuid="ecfc9d2c-5269-11df-914e-080069138b88" uid="18395"/>
-        <specific value="2" description="Y498 Mario Marino" uuid="ecfdadac-5269-11df-8104-080069138b88" uid="18396"/>
-      </subcategory>
-      <subcategory value="7" description="Men 215 Class (LCVP)" uuid="ecff60ac-5269-11df-b157-080069138b88" uid="18397">
-        <specific value="1" description="MEN 215" uuid="ed007064-5269-11df-b0ac-080069138b88" uid="18398"/>
-        <specific value="2" description="MEN 216" uuid="ed017a4a-5269-11df-afd6-080069138b88" uid="18399"/>
-      </subcategory>
-      <subcategory value="8" description="SAR CRAFT (Air/Sea rescue)" uuid="ed032af2-5269-11df-a7dc-080069138b88" uid="18400">
-        <specific value="1" description="Paolucci" uuid="ed043e7e-5269-11df-81b8-080069138b88" uid="18401"/>
-      </subcategory>
-      <subcategory value="9" description="Men 212 Class (TRV)" uuid="ed05edbe-5269-11df-9dab-080069138b88" uid="18402">
-        <specific value="1" description="MEN 212" uuid="ed06fc4a-5269-11df-9228-080069138b88" uid="18403"/>
-      </subcategory>
-      <subcategory value="10" description="Ex-Us LCM" uuid="ed08ae14-5269-11df-b3bc-080069138b88" uid="18404">
-        <specific value="1" description="MTM 542" uuid="ed09b624-5269-11df-a2aa-080069138b88" uid="18405"/>
-        <specific value="2" description="MTM 543" uuid="ed0ac942-5269-11df-98a5-080069138b88" uid="18406"/>
-        <specific value="3" description="MTM 544" uuid="ed0beaca-5269-11df-8c2d-080069138b88" uid="18407"/>
-        <specific value="4" description="MTM 545" uuid="ed0cfc80-5269-11df-ac16-080069138b88" uid="18408"/>
-        <specific value="5" description="MTM 546" uuid="ed0e0bca-5269-11df-bb8c-080069138b88" uid="18409"/>
-        <specific value="6" description="MTM 547" uuid="ed0f1d30-5269-11df-9664-080069138b88" uid="18410"/>
-        <specific value="7" description="MTM 548" uuid="ed102ac2-5269-11df-8421-080069138b88" uid="18411"/>
-        <specific value="8" description="MTM 549" uuid="ed113a84-5269-11df-9f47-080069138b88" uid="18412"/>
-        <specific value="9" description="MTM 550" uuid="ed12487a-5269-11df-9de3-080069138b88" uid="18413"/>
-        <specific value="10" description="MTM 551" uuid="ed1352d8-5269-11df-bc80-080069138b88" uid="18414"/>
-        <specific value="11" description="MTM 552" uuid="ed14668c-5269-11df-a9db-080069138b88" uid="18415"/>
-        <specific value="12" description="MTM 553" uuid="ed157658-5269-11df-9e85-080069138b88" uid="18416"/>
-        <specific value="13" description="MTM 554" uuid="ed168002-5269-11df-a95b-080069138b88" uid="18417"/>
-        <specific value="14" description="MTM 555" uuid="ed179230-5269-11df-9a32-080069138b88" uid="18418"/>
-        <specific value="15" description="MTM 556" uuid="ed18a26a-5269-11df-a172-080069138b88" uid="18419"/>
-      </subcategory>
-      <subcategory value="11" description="MTM 217 Class (LCMs)" uuid="ed1a51b4-5269-11df-8d15-080069138b88" uid="18420">
-        <specific value="1" description="MTM 217" uuid="ed1b5e88-5269-11df-93de-080069138b88" uid="18421"/>
-        <specific value="2" description="MTM 218" uuid="ed1c6daa-5269-11df-8705-080069138b88" uid="18422"/>
-        <specific value="3" description="MTM 219" uuid="ed1d7df8-5269-11df-8756-080069138b88" uid="18423"/>
-        <specific value="4" description="MTM 220" uuid="ed1e8612-5269-11df-a018-080069138b88" uid="18424"/>
-        <specific value="5" description="MTM 221" uuid="ed1f97f0-5269-11df-9316-080069138b88" uid="18425"/>
-        <specific value="6" description="MTM 222" uuid="ed20a64a-5269-11df-a89f-080069138b88" uid="18426"/>
-        <specific value="7" description="MTM 223" uuid="ed21b062-5269-11df-9cd1-080069138b88" uid="18427"/>
-        <specific value="8" description="MTM 224" uuid="ed22c204-5269-11df-9425-080069138b88" uid="18428"/>
-        <specific value="9" description="MTM 225" uuid="ed23d16c-5269-11df-b99e-080069138b88" uid="18429"/>
-        <specific value="10" description="MTM 226" uuid="ed24dc06-5269-11df-8f65-080069138b88" uid="18430"/>
-        <specific value="11" description="MTM 227" uuid="ed25eb0a-5269-11df-ad6e-080069138b88" uid="18431"/>
-      </subcategory>
-      <subcategory value="12" description="US LCVP Type" uuid="ed279ce8-5269-11df-9991-080069138b88" uid="18432">
-        <specific value="1" description="MTP 9726" uuid="ed28ac28-5269-11df-b107-080069138b88" uid="18433"/>
-        <specific value="2" description="MTP 9731" uuid="ed29b5f0-5269-11df-bb32-080069138b88" uid="18434"/>
-        <specific value="3" description="MTP 9748" uuid="ed2ac684-5269-11df-88d7-080069138b88" uid="18435"/>
-        <specific value="4" description="MTP 9749" uuid="ed2be21c-5269-11df-85cb-080069138b88" uid="18436"/>
-        <specific value="5" description="MTP 9750" uuid="ed2cec84-5269-11df-9ae7-080069138b88" uid="18437"/>
-        <specific value="6" description="MTP 9751" uuid="ed2dfbec-5269-11df-93aa-080069138b88" uid="18438"/>
-      </subcategory>
-      <subcategory value="13" description="MTP 96 Class (LCVP)" uuid="ed2faf32-5269-11df-9b5e-080069138b88" uid="18439">
-        <specific value="1" description="MTP 96" uuid="ed30bcce-5269-11df-87d4-080069138b88" uid="18440"/>
-        <specific value="2" description="MTP 97" uuid="ed31c812-5269-11df-a1ac-080069138b88" uid="18441"/>
-        <specific value="3" description="MTP 98" uuid="ed32dac2-5269-11df-aabe-080069138b88" uid="18442"/>
-        <specific value="4" description="MTP 99" uuid="ed33e926-5269-11df-9a56-080069138b88" uid="18443"/>
-        <specific value="5" description="MTP 100" uuid="ed34f2e4-5269-11df-a29c-080069138b88" uid="18444"/>
-        <specific value="6" description="MTP 101" uuid="ed3604e0-5269-11df-8598-080069138b88" uid="18445"/>
-        <specific value="7" description="MTP 102" uuid="ed37143e-5269-11df-b9c9-080069138b88" uid="18446"/>
-        <specific value="8" description="MTP 103" uuid="ed381c80-5269-11df-bb8f-080069138b88" uid="18447"/>
-        <specific value="9" description="MTP 104" uuid="ed392c9c-5269-11df-8226-080069138b88" uid="18448"/>
-        <specific value="10" description="MTP 105" uuid="ed3a3e7a-5269-11df-94d9-080069138b88" uid="18449"/>
-        <specific value="11" description="MTP 106" uuid="ed3b4c20-5269-11df-9808-080069138b88" uid="18450"/>
-        <specific value="12" description="MTP 107" uuid="ed3c5962-5269-11df-aa41-080069138b88" uid="18451"/>
-      </subcategory>
-      <subcategory value="14" description="Harbor Tanker" uuid="ed3e0c30-5269-11df-99e4-080069138b88" uid="18452">
-        <specific value="1" description="GRS Type" uuid="ed3f1aa8-5269-11df-9eb1-080069138b88" uid="18453"/>
-      </subcategory>
-      <subcategory value="15" description="Training Ship" uuid="ed40c9a2-5269-11df-85d7-080069138b88" uid="18454">
-        <specific value="1" description="A5312 Amerigo Vespucci" uuid="ed41d3ce-5269-11df-8b86-080069138b88" uid="18455"/>
-        <specific value="2" description="A5311 Palinuro" uuid="ed42e6d8-5269-11df-a350-080069138b88" uid="18456"/>
-        <specific value="3" description="A5378 Aragosta" uuid="ed43fc9e-5269-11df-a001-080069138b88" uid="18457"/>
-        <specific value="4" description="A5379 Astice" uuid="ed450f9e-5269-11df-a7b6-080069138b88" uid="18458"/>
-        <specific value="5" description="A5380 Mitilo" uuid="ed461f24-5269-11df-8055-080069138b88" uid="18459"/>
-        <specific value="6" description="A5381 Polipo" uuid="ed473012-5269-11df-b2f5-080069138b88" uid="18460"/>
-        <specific value="7" description="A5382 Porpora" uuid="ed483d36-5269-11df-aba0-080069138b88" uid="18461"/>
-        <specific value="8" description="A5308 Alloro" uuid="ed495a40-5269-11df-9717-080069138b88" uid="18462"/>
-        <specific value="9" description="A5302 Caroly" uuid="ed4a7948-5269-11df-b34f-080069138b88" uid="18463"/>
-        <specific value="10" description="A5313 Stella Polare" uuid="ed4b84fa-5269-11df-8384-080069138b88" uid="18464"/>
-        <specific value="11" description="A5316 Corsaro II" uuid="ed4c994e-5269-11df-b82a-080069138b88" uid="18465"/>
-        <specific value="12" description="Cristofore Colombo II" uuid="ed4da9d8-5269-11df-882c-080069138b88" uid="18466"/>
-      </subcategory>
-      <subcategory value="16" description="Salvage Ship" uuid="ed4f5940-5269-11df-8765-080069138b88" uid="18467">
-        <specific value="1" description="A5310 Proteo" uuid="ed5065f6-5269-11df-867c-080069138b88" uid="18468"/>
-        <specific value="2" description="A5309 Anteo" uuid="ed517586-5269-11df-9191-080069138b88" uid="18469"/>
-      </subcategory>
-      <subcategory value="17" description="Lighthouse Tender" uuid="ed532688-5269-11df-bc1e-080069138b88" uid="18470">
-        <specific value="1" description="A5364 Ponza" uuid="ed54346a-5269-11df-bf0b-080069138b88" uid="18471"/>
-        <specific value="2" description="A5366 Levanzo" uuid="ed554328-5269-11df-8605-080069138b88" uid="18472"/>
-        <specific value="3" description="A5367 Tavolara" uuid="ed5652fe-5269-11df-a00e-080069138b88" uid="18473"/>
-        <specific value="4" description="A5368 Palmaria" uuid="ed5762fc-5269-11df-93b9-080069138b88" uid="18474"/>
-        <specific value="5" description="A5383 Procida" uuid="ed5870de-5269-11df-8b67-080069138b88" uid="18475"/>
-      </subcategory>
-      <subcategory value="18" description="Repair Craft (LCT 3 Type)" uuid="ed5a221c-5269-11df-b1a9-080069138b88" uid="18476">
-        <specific value="1" description="A5331 MOC 1201" uuid="ed5b32c4-5269-11df-a525-080069138b88" uid="18477"/>
-        <specific value="2" description="A5332 MOC 1202" uuid="ed5c46d2-5269-11df-a973-080069138b88" uid="18478"/>
-        <specific value="3" description="A5333 MOC 1203" uuid="ed5d4f3c-5269-11df-8d9c-080069138b88" uid="18479"/>
-        <specific value="4" description="A5334 MOC 1204" uuid="ed5e603e-5269-11df-a558-080069138b88" uid="18480"/>
-        <specific value="5" description="A5335 MOC 1205" uuid="ed5f7384-5269-11df-9150-080069138b88" uid="18481"/>
-      </subcategory>
-      <subcategory value="19" description="Ferry" uuid="ed6122ce-5269-11df-adbf-080069138b88" uid="18482">
-        <specific value="1" description="Tarantola" uuid="ed622b92-5269-11df-a923-080069138b88" uid="18483"/>
-      </subcategory>
-      <subcategory value="20" description="Water Carrier" uuid="ed63df82-5269-11df-a946-080069138b88" uid="18484">
-        <specific value="1" description="A5354 Piave" uuid="ed64ee90-5269-11df-acb4-080069138b88" uid="18485"/>
-        <specific value="2" description="A5356 Basento" uuid="ed65fcfe-5269-11df-8295-080069138b88" uid="18486"/>
-        <specific value="3" description="A5357 Bradano" uuid="ed670bda-5269-11df-9c57-080069138b88" uid="18487"/>
-        <specific value="4" description="A5358 Brenta" uuid="ed681bec-5269-11df-9791-080069138b88" uid="18488"/>
-        <specific value="5" description="A5359 Bormida" uuid="ed6935d6-5269-11df-a7d4-080069138b88" uid="18489"/>
-      </subcategory>
-      <subcategory value="21" description="Water Carrier Tug" uuid="ed6ae908-5269-11df-a5fc-080069138b88" uid="18490">
-        <specific value="1" description="A5370 MCC 1101" uuid="ed6bf32a-5269-11df-9ed6-080069138b88" uid="18491"/>
-        <specific value="2" description="A5371 MCC 1102" uuid="ed6d0382-5269-11df-aee6-080069138b88" uid="18492"/>
-        <specific value="3" description="A5372 MCC 1103" uuid="ed6e1498-5269-11df-8879-080069138b88" uid="18493"/>
-        <specific value="4" description="A5373 MCC 1104" uuid="ed6f1dd4-5269-11df-b5d4-080069138b88" uid="18494"/>
-      </subcategory>
-      <subcategory value="22" description="Tug" uuid="ed70ce36-5269-11df-9599-080069138b88" uid="18495">
-        <specific value="1" description="A5319 Ciclope" uuid="ed71dd94-5269-11df-b212-080069138b88" uid="18496"/>
-        <specific value="2" description="A5324 Titano" uuid="ed72f1c0-5269-11df-a240-080069138b88" uid="18497"/>
-        <specific value="3" description="A5325 Polifemo" uuid="ed73fbf6-5269-11df-afc9-080069138b88" uid="18498"/>
-        <specific value="4" description="A5328 Gigante" uuid="ed750c80-5269-11df-95d5-080069138b88" uid="18499"/>
-        <specific value="5" description="A5330 Saturno" uuid="ed761fb2-5269-11df-86dc-080069138b88" uid="18500"/>
-        <specific value="6" description="A5365 Tenace" uuid="ed772948-5269-11df-abb2-080069138b88" uid="18501"/>
-        <specific value="7" description="A5317 Atlante" uuid="ed78389c-5269-11df-9e78-080069138b88" uid="18502"/>
-        <specific value="8" description="A5318 Prometeo" uuid="ed794930-5269-11df-9f1c-080069138b88" uid="18503"/>
-      </subcategory>
-      <subcategory value="23" description="Coastal Tug" uuid="ed7afcc6-5269-11df-a1ac-080069138b88" uid="18504">
-        <specific value="1" description="Y421 Porto Empedocle" uuid="ed7c08f0-5269-11df-9c71-080069138b88" uid="18505"/>
-        <specific value="2" description="Y422 Porto Pisano" uuid="ed7d17f4-5269-11df-bda2-080069138b88" uid="18506"/>
-        <specific value="3" description="Y423 Porto Conte" uuid="ed7e2bf8-5269-11df-847e-080069138b88" uid="18507"/>
-        <specific value="4" description="Y425 Porto Ferraio" uuid="ed7f3750-5269-11df-b86c-080069138b88" uid="18508"/>
-        <specific value="5" description="Y426 Porto Venere" uuid="ed804686-5269-11df-993c-080069138b88" uid="18509"/>
-        <specific value="6" description="Y413 Porto Fossone" uuid="ed8156ca-5269-11df-8e43-080069138b88" uid="18510"/>
-        <specific value="7" description="Y416 Porto Torres" uuid="ed82654c-5269-11df-8484-080069138b88" uid="18511"/>
-        <specific value="8" description="Y417 Porto Corsini" uuid="ed8374dc-5269-11df-9e73-080069138b88" uid="18512"/>
-        <specific value="9" description="Y436 Porto D'ischia" uuid="ed8484a8-5269-11df-94a6-080069138b88" uid="18513"/>
-        <specific value="10" description="Y443 Riva Trigoso" uuid="ed858eca-5269-11df-9e09-080069138b88" uid="18514"/>
-        <specific value="11" description="Y428 Porto Salvo" uuid="ed86a0b2-5269-11df-a976-080069138b88" uid="18515"/>
-      </subcategory>
-      <subcategory value="24" description="Harbour Tug" uuid="ed885efc-5269-11df-b17b-080069138b88" uid="18516">
-        <specific value="1" description="Y403 RP 101" uuid="ed896df6-5269-11df-a61b-080069138b88" uid="18517"/>
-        <specific value="2" description="Y404 RP 102" uuid="ed8a7890-5269-11df-bab7-080069138b88" uid="18518"/>
-        <specific value="3" description="Y406 RP 103" uuid="ed8b8a6e-5269-11df-8951-080069138b88" uid="18519"/>
-        <specific value="4" description="Y407 RP 104" uuid="ed8c9e72-5269-11df-a5cf-080069138b88" uid="18520"/>
-        <specific value="5" description="Y408 RP 105" uuid="ed8da862-5269-11df-a9de-080069138b88" uid="18521"/>
-        <specific value="6" description="Y410 RP 106" uuid="ed8eb7fc-5269-11df-9be0-080069138b88" uid="18522"/>
-        <specific value="7" description="Y452 RP 108" uuid="ed8fca66-5269-11df-b81c-080069138b88" uid="18523"/>
-        <specific value="8" description="Y456 RP 109" uuid="ed90d5fa-5269-11df-be72-080069138b88" uid="18524"/>
-        <specific value="9" description="Y458 RP 110" uuid="ed91e47c-5269-11df-bf06-080069138b88" uid="18525"/>
-        <specific value="10" description="Y460 RP 111" uuid="ed92f79a-5269-11df-9b42-080069138b88" uid="18526"/>
-        <specific value="11" description="Y462 RP 112" uuid="ed9402ca-5269-11df-948d-080069138b88" uid="18527"/>
-        <specific value="12" description="Y463 RP 113" uuid="ed951304-5269-11df-84b4-080069138b88" uid="18528"/>
-        <specific value="13" description="Y464 RP 114" uuid="ed9624b0-5269-11df-89ee-080069138b88" uid="18529"/>
-        <specific value="14" description="Y465 RP 115" uuid="ed972e64-5269-11df-a05e-080069138b88" uid="18530"/>
-        <specific value="15" description="Y466 RP 116" uuid="ed984114-5269-11df-99ae-080069138b88" uid="18531"/>
-        <specific value="16" description="Y468 RP 118" uuid="ed9951da-5269-11df-a29c-080069138b88" uid="18532"/>
-        <specific value="17" description="Y470 RP 119" uuid="ed9a5ac6-5269-11df-baab-080069138b88" uid="18533"/>
-        <specific value="18" description="Y471 RP 120" uuid="ed9b6b5a-5269-11df-a10f-080069138b88" uid="18534"/>
-        <specific value="19" description="RP 121" uuid="ed9c7efa-5269-11df-93a3-080069138b88" uid="18535"/>
-        <specific value="20" description="Y473 RP 122" uuid="ed9d87fa-5269-11df-853c-080069138b88" uid="18536"/>
-        <specific value="21" description="Y467 RP 123" uuid="ed9e9712-5269-11df-a648-080069138b88" uid="18537"/>
-        <specific value="22" description="Y477 RP 124" uuid="ed9fa800-5269-11df-9619-080069138b88" uid="18538"/>
-        <specific value="23" description="Y478 RP 125" uuid="eda0b3bc-5269-11df-a14c-080069138b88" uid="18539"/>
-        <specific value="24" description="Y479 RP 126" uuid="eda1c2d4-5269-11df-a008-080069138b88" uid="18540"/>
-        <specific value="25" description="Y480 RP 127" uuid="eda2d5ca-5269-11df-bed2-080069138b88" uid="18541"/>
-        <specific value="26" description="Y481 RP 128" uuid="eda3e0a0-5269-11df-9906-080069138b88" uid="18542"/>
-        <specific value="27" description="Y482 RP 129" uuid="eda4eff4-5269-11df-88fd-080069138b88" uid="18543"/>
-        <specific value="28" description="Y483 RP 130" uuid="eda60a38-5269-11df-b9dc-080069138b88" uid="18544"/>
-        <specific value="29" description="Y484 RP 131" uuid="eda71752-5269-11df-b5dd-080069138b88" uid="18545"/>
-        <specific value="30" description="Y485 RP 132" uuid="eda828a4-5269-11df-8286-080069138b88" uid="18546"/>
-        <specific value="31" description="Y486 RP 133" uuid="eda9394c-5269-11df-9bcb-080069138b88" uid="18547"/>
-        <specific value="32" description="Y487 RP 134" uuid="edaa42ba-5269-11df-9a2d-080069138b88" uid="18548"/>
-      </subcategory>
-      <subcategory value="25" description="(deprecated)" deprecated="1" uuid="edabf8f8-5269-11df-b904-080069138b88" uid="18549"/>
-      <subcategory value="26" description="Floating Dock" uuid="edad09d2-5269-11df-9e6e-080069138b88" uid="18550">
-        <specific value="1" description="GO 1" uuid="edae18cc-5269-11df-bcaa-080069138b88" uid="18551"/>
-        <specific value="2" description="GO 5" uuid="edaf2190-5269-11df-924b-080069138b88" uid="18552"/>
-        <specific value="3" description="GO 8" uuid="edb031c0-5269-11df-9838-080069138b88" uid="18553"/>
-        <specific value="4" description="GO 10" uuid="edb14448-5269-11df-b333-080069138b88" uid="18554"/>
-        <specific value="5" description="GO 11" uuid="edb24d8e-5269-11df-9ea0-080069138b88" uid="18555"/>
-        <specific value="6" description="GO 17" uuid="edb35c88-5269-11df-b380-080069138b88" uid="18556"/>
-        <specific value="7" description="GO 18A" uuid="edb46d9e-5269-11df-86ea-080069138b88" uid="18557"/>
-        <specific value="8" description="GO 18B" uuid="edb57946-5269-11df-8056-080069138b88" uid="18558"/>
-        <specific value="9" description="GO 20" uuid="edb687fa-5269-11df-92dc-080069138b88" uid="18559"/>
-        <specific value="10" description="GO 22" uuid="edb7994c-5269-11df-b9bc-080069138b88" uid="18560"/>
-        <specific value="11" description="GO 23" uuid="edb8a3e6-5269-11df-9849-080069138b88" uid="18561"/>
-        <specific value="12" description="GO 51" uuid="edb9b52e-5269-11df-8d7d-080069138b88" uid="18562"/>
-        <specific value="13" description="GO 52" uuid="edbac360-5269-11df-92c1-080069138b88" uid="18563"/>
-        <specific value="14" description="GO 53" uuid="edbbcdbe-5269-11df-b272-080069138b88" uid="18564"/>
-      </subcategory>
-      <subcategory value="27" description="Guardia Costiera-Capitaneria Di porto (Coast Guard)" uuid="edbd7fc4-5269-11df-a233-080069138b88" uid="18565">
-        <specific value="1" description="CP 406" uuid="edbe91fc-5269-11df-acba-080069138b88" uid="18566"/>
-        <specific value="2" description="CP 251" uuid="edbfa06a-5269-11df-8849-080069138b88" uid="18567"/>
-      </subcategory>
-      <subcategory value="28" description="Servizio Navale Carabinieri" uuid="edc1537e-5269-11df-a842-080069138b88" uid="18568">
-        <specific value="1" description="S500" uuid="edc25ed6-5269-11df-ab63-080069138b88" uid="18569"/>
-        <specific value="2" description="S400" uuid="edc36db2-5269-11df-adad-080069138b88" uid="18570"/>
-      </subcategory>
-      <subcategory value="29" description="Servizio Navale Guardia Di Finanza" uuid="edc524a4-5269-11df-aab9-080069138b88" uid="18571">
-        <specific value="1" description="Gian Maria Paolini" uuid="edc63b50-5269-11df-8f30-080069138b88" uid="18572"/>
-      </subcategory>
-      <subcategory value="30" description="Antonio Zara Class" uuid="edc7ea18-5269-11df-b4e7-080069138b88" uid="18573">
-        <specific value="1" description="Antonio Zara P 01" uuid="edc8f822-5269-11df-b889-080069138b88" uid="18574"/>
-        <specific value="2" description="Vezzari P 02" uuid="edca0668-5269-11df-b5df-080069138b88" uid="18575"/>
-      </subcategory>
-      <subcategory value="31" description="Corrubia &amp; Bigliani Classes" uuid="edcbb8fa-5269-11df-ac3d-080069138b88" uid="18576">
-        <specific value="1" description="Bigliani G 80" uuid="edccc8f8-5269-11df-89be-080069138b88" uid="18577"/>
-        <specific value="2" description="Cavaglia G 81" uuid="edcdd306-5269-11df-a3f1-080069138b88" uid="18578"/>
-        <specific value="3" description="Corrubia G 90" uuid="edcee214-5269-11df-9bd1-080069138b88" uid="18579"/>
-        <specific value="4" description="Guidice G 91" uuid="edcff406-5269-11df-b950-080069138b88" uid="18580"/>
-      </subcategory>
-      <subcategory value="32" description="Alpino Class (MCS)" uuid="edd1a1c0-5269-11df-888a-080069138b88" uid="18581">
-        <specific value="1" description="A5384 Alpino" uuid="edd2acb4-5269-11df-bfbe-080069138b88" uid="18582"/>
-      </subcategory>
-    </category>
-    <category value="17" description="Auxiliary, Merchant Marine" uuid="edd5036a-5269-11df-b071-080069138b88" uid="18583">
-      <subcategory value="1" description="A5303 Ammiraglio Magnaghi" uuid="edd60f44-5269-11df-b721-080069138b88" uid="18584"/>
-      <subcategory value="2" description="A5306 Mirto" uuid="edd72078-5269-11df-ab9c-080069138b88" uid="18585"/>
-      <subcategory value="3" description="A5307 Pioppo" uuid="edd833b4-5269-11df-8390-080069138b88" uid="18586"/>
-    </category>
-    <category value="18" description="Utility" uuid="edd9df84-5269-11df-a930-080069138b88" uid="18587">
-      <subcategory value="1" description="Cassiopea Class" uuid="eddae92e-5269-11df-bbad-080069138b88" uid="18588">
-        <specific value="1" description="P401 Cassiopea" uuid="eddbfa94-5269-11df-b9ec-080069138b88" uid="18589"/>
-        <specific value="2" description="P402 Libra" uuid="eddd0d08-5269-11df-b6c7-080069138b88" uid="18590"/>
-        <specific value="3" description="P403 Spica" uuid="edde14fa-5269-11df-9c09-080069138b88" uid="18591"/>
-        <specific value="4" description="P404 Vega" uuid="eddf2480-5269-11df-a5c5-080069138b88" uid="18592"/>
-      </subcategory>
-      <subcategory value="2" description="Agave Class" uuid="ede0d5c8-5269-11df-b2c7-080069138b88" uid="18593">
-        <specific value="1" description="P495 Bambu" uuid="ede1e328-5269-11df-b874-080069138b88" uid="18594"/>
-        <specific value="2" description="P496 Mango" uuid="ede2ed36-5269-11df-a579-080069138b88" uid="18595"/>
-        <specific value="3" description="P497 Mogano" uuid="ede408ec-5269-11df-84e1-080069138b88" uid="18596"/>
-        <specific value="4" description="P500 Palma" uuid="ede51868-5269-11df-9476-080069138b88" uid="18597"/>
-      </subcategory>
-      <subcategory value="3" description="Aggressive Class" uuid="ede6c7ee-5269-11df-b7e2-080069138b88" uid="18598">
-        <specific value="1" description="Storione" uuid="ede7d56c-5269-11df-8005-080069138b88" uid="18599"/>
-        <specific value="2" description="Squalo" uuid="ede8e48e-5269-11df-9411-080069138b88" uid="18600"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="edeb3324-5269-11df-95c0-080069138b88" uid="18601">
-      <subcategory value="1" description="Alpino class" uuid="edec41c4-5269-11df-ace8-080069138b88" uid="18602">
-        <specific value="1" description="F 580 Alpino" uuid="eded5190-5269-11df-823b-080069138b88" uid="18603"/>
-        <specific value="2" description="F 581 Carabiniere" uuid="edee61f2-5269-11df-9261-080069138b88" uid="18604"/>
-      </subcategory>
-      <subcategory value="2" description="Maestrale class" uuid="edf014a2-5269-11df-b57d-080069138b88" uid="18605">
-        <specific value="1" description="F 570 Maestrale" uuid="edf11d5c-5269-11df-8c3f-080069138b88" uid="18606"/>
-        <specific value="2" description="F 571 Gricale" uuid="edf22d8c-5269-11df-ab10-080069138b88" uid="18607"/>
-        <specific value="3" description="F 572 Libeccio" uuid="edf3408c-5269-11df-8fcf-080069138b88" uid="18608"/>
-        <specific value="4" description="F 573 Scirocco" uuid="edf44a54-5269-11df-8a22-080069138b88" uid="18609"/>
-        <specific value="5" description="F 574 Aliseo" uuid="edf55a34-5269-11df-b4f0-080069138b88" uid="18610"/>
-        <specific value="6" description="F 575 Euro" uuid="edf66afa-5269-11df-bef5-080069138b88" uid="18611"/>
-        <specific value="7" description="F 576 Espero" uuid="edf77792-5269-11df-9560-080069138b88" uid="18612"/>
-        <specific value="8" description="F 577 Zeffiro" uuid="edf886aa-5269-11df-aabe-080069138b88" uid="18613"/>
-      </subcategory>
-      <subcategory value="3" description="Lupo class" uuid="edfa3496-5269-11df-a75d-080069138b88" uid="18614">
-        <specific value="1" description="F 564 Lupo" uuid="edfb46ec-5269-11df-8ca6-080069138b88" uid="18615"/>
-        <specific value="2" description="F 565 Sagittario" uuid="edfc508c-5269-11df-9c1e-080069138b88" uid="18616"/>
-        <specific value="3" description="F 566 Perseo" uuid="edfd60bc-5269-11df-a043-080069138b88" uid="18617"/>
-        <specific value="4" description="F 567 Orsa" uuid="edfe6e30-5269-11df-93ac-080069138b88" uid="18618"/>
-      </subcategory>
-      <subcategory value="4" description="Artigliere (Lupo) class" uuid="ee001fd2-5269-11df-8bfe-080069138b88" uid="18619">
-        <specific value="1" description="F 582 Artigliere" uuid="ee012a76-5269-11df-8c19-080069138b88" uid="18620"/>
-        <specific value="2" description="F 583 Aviere" uuid="ee0241e0-5269-11df-9e4e-080069138b88" uid="18621"/>
-        <specific value="3" description="F 584 Bersagliere" uuid="ee035256-5269-11df-be5a-080069138b88" uid="18622"/>
-        <specific value="4" description="F 585 Granatiere" uuid="ee04648e-5269-11df-9118-080069138b88" uid="18623"/>
-      </subcategory>
-      <subcategory value="5" description="Minerva class" uuid="ee061716-5269-11df-8aa2-080069138b88" uid="18624">
-        <specific value="1" description="F 551 Minerva" uuid="ee0727be-5269-11df-af66-080069138b88" uid="18625"/>
-        <specific value="2" description="F 552 Urania" uuid="ee08362c-5269-11df-82ff-080069138b88" uid="18626"/>
-        <specific value="3" description="F 553 Danaide" uuid="ee094486-5269-11df-96e8-080069138b88" uid="18627"/>
-        <specific value="4" description="F 554 Sfinge" uuid="ee0a54e8-5269-11df-b907-080069138b88" uid="18628"/>
-        <specific value="5" description="F 555 Driade" uuid="ee0b63d8-5269-11df-89b4-080069138b88" uid="18629"/>
-        <specific value="6" description="F 556 Chimera" uuid="ee0c70b6-5269-11df-b32e-080069138b88" uid="18630"/>
-        <specific value="7" description="F 557 Fenice" uuid="ee0d7fa6-5269-11df-a33e-080069138b88" uid="18631"/>
-        <specific value="8" description="F 558 Sibella" uuid="ee0e8f0e-5269-11df-ad87-080069138b88" uid="18632"/>
-      </subcategory>
-      <subcategory value="6" description="De Cristofaro class" uuid="ee104038-5269-11df-9383-080069138b88" uid="18633">
-        <specific value="1" description="F 550 Salvatore Todaro" uuid="ee114abe-5269-11df-8af2-080069138b88" uid="18634"/>
-      </subcategory>
-    </category>
-    <category value="56" description="Amphibious Transport Dock" uuid="ee13a08e-5269-11df-a014-080069138b88" uid="18635">
-      <subcategory value="1" description="San Giorgio Class (LPDs)" uuid="ee14abfa-5269-11df-afbc-080069138b88" uid="18636">
-        <specific value="1" description="L9892 San Giorgio" uuid="ee15bcca-5269-11df-bacb-080069138b88" uid="18637"/>
-        <specific value="2" description="L9893 San Marco" uuid="ee16cdf4-5269-11df-8013-080069138b88" uid="18638"/>
-        <specific value="3" description="L9894 San Giusto" uuid="ee17dc3a-5269-11df-9e26-080069138b88" uid="18639"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="ee1a2e5e-5269-11df-96b5-080069138b88" uid="18640">
-      <subcategory value="1" description="Container class" uuid="ee1b3b96-5269-11df-a193-080069138b88" uid="18641">
-        <specific value="1" description="Bulkignazio" uuid="ee1c4ba8-5269-11df-9992-080069138b88" uid="18642"/>
-        <specific value="2" description="Bulk Genova" uuid="ee1d5aac-5269-11df-861f-080069138b88" uid="18643"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker class" uuid="ee1f0a50-5269-11df-a71a-080069138b88" uid="18644">
-        <specific value="1" description="Eco Europa" uuid="ee2017e2-5269-11df-8970-080069138b88" uid="18645"/>
-        <specific value="2" description="Pantelleria" uuid="ee212efc-5269-11df-ac5e-080069138b88" uid="18646"/>
-        <specific value="3" description="Agip Siracusa" uuid="ee223fae-5269-11df-a403-080069138b88" uid="18647"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="106" uuid="ee253c9a-5269-11df-8551-080069138b88" uid="18648">
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="ee264b94-5269-11df-8575-080069138b88" uid="18649">
-      <subcategory value="1" description="Improved Sauro Class" uuid="ee275c32-5269-11df-8b82-080069138b88" uid="18650">
-        <specific value="1" description="S 522 Salvatore Pelosi" uuid="ee286ea6-5269-11df-afaa-080069138b88" uid="18651"/>
-        <specific value="2" description="S 523 Giuliano Prini" uuid="ee297d0a-5269-11df-a9a6-080069138b88" uid="18652"/>
-        <specific value="3" description="S 524 Primo Longobrado" uuid="ee2a8d80-5269-11df-a879-080069138b88" uid="18653"/>
-        <specific value="4" description="S 525 Gazzana Priaroggia" uuid="ee2b9bee-5269-11df-8024-080069138b88" uid="18654"/>
-      </subcategory>
-      <subcategory value="2" description="Sauro Class (1081 Type)" uuid="ee2d4f34-5269-11df-a43e-080069138b88" uid="18655">
-        <specific value="1" description="S 518 Nazario Sauro" uuid="ee2e5a96-5269-11df-b8eb-080069138b88" uid="18656"/>
-        <specific value="2" description="S 519 Fecia Di Cossato" uuid="ee2f6a1c-5269-11df-9371-080069138b88" uid="18657"/>
-        <specific value="3" description="S 520 Leonardo Da Vinci" uuid="ee3079de-5269-11df-b613-080069138b88" uid="18658"/>
-        <specific value="4" description="S 521 Guglielmo Marconi" uuid="ee3188f6-5269-11df-a0a0-080069138b88" uid="18659"/>
-      </subcategory>
-      <subcategory value="3" description="Toti Class (1075 class)" uuid="ee333886-5269-11df-a847-080069138b88" uid="18660">
-        <specific value="1" description="S 506 Enrico Toti" uuid="ee34480c-5269-11df-af12-080069138b88" uid="18661"/>
-        <specific value="2" description="S 513 Enrico Dandolo" uuid="ee355b7a-5269-11df-aee9-080069138b88" uid="18662"/>
-      </subcategory>
-      <subcategory value="4" description="Type 212A SSK" uuid="ee370b14-5269-11df-89b4-080069138b88" uid="18663">
-        <specific value="1" description="Salvatore Todaro" uuid="ee3817b6-5269-11df-8373-080069138b88" uid="18664"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="16" uuid="ee3b0e94-5269-11df-a402-080069138b88" uid="18665">
-    <category value="7" description="Light/Patrol Craft" uuid="ee3c2ef0-5269-11df-b01c-080069138b88" uid="18666">
-      <subcategory value="1" description="AL Manama (FPB 62) Class (fast attack craft-missile)" uuid="ee3d3eb2-5269-11df-8feb-080069138b88" uid="18667">
-        <specific value="1" description="50 AL Manama" uuid="ee3e5126-5269-11df-9afa-080069138b88" uid="18668"/>
-        <specific value="2" description="51 AL Muharraq" uuid="ee3f6ae8-5269-11df-8bc4-080069138b88" uid="18669"/>
-      </subcategory>
-      <subcategory value="2" description="Almad EL Fateh (FPB 45) Class (fast attack craft-missile)" uuid="ee412036-5269-11df-ab03-080069138b88" uid="18670">
-        <specific value="1" description="20 Admad El Fateh" uuid="ee422bd4-5269-11df-acb4-080069138b88" uid="18671"/>
-        <specific value="2" description="21 Al Jabiri" uuid="ee433e52-5269-11df-9746-080069138b88" uid="18672"/>
-        <specific value="3" description="22 Abdul Rahman AL Fadel" uuid="ee445274-5269-11df-974b-080069138b88" uid="18673"/>
-        <specific value="4" description="23 Al Taweelah" uuid="ee455c50-5269-11df-9870-080069138b88" uid="18674"/>
-      </subcategory>
-      <subcategory value="3" description="AL Riffa (FPB 38) Class (fast attack craft-gun)" uuid="ee470c94-5269-11df-857e-080069138b88" uid="18675">
-        <specific value="1" description="10 AL Riffa" uuid="ee481ff8-5269-11df-a3d8-080069138b88" uid="18676"/>
-        <specific value="2" description="11 Hawar" uuid="ee493244-5269-11df-b00e-080069138b88" uid="18677"/>
-      </subcategory>
-      <subcategory value="4" description="AL Jarim (FPB 20) Class (fast attack craft-gun)" uuid="ee4ae152-5269-11df-b9e2-080069138b88" uid="18678">
-        <specific value="1" description="30 AL Jarim" uuid="ee4bed4a-5269-11df-98ae-080069138b88" uid="18679"/>
-        <specific value="2" description="31 AL Jasrah" uuid="ee4cfffa-5269-11df-9cc9-080069138b88" uid="18680"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="ee4f4de6-5269-11df-9d78-080069138b88" uid="18681">
-      <subcategory value="1" description="Support Ship" uuid="ee505f4c-5269-11df-b6de-080069138b88" uid="18682">
-        <specific value="1" description="41 Ajeera" uuid="ee516dd8-5269-11df-be89-080069138b88" uid="18683"/>
-        <specific value="2" description="42 Mashtan" uuid="ee527d0e-5269-11df-8db5-080069138b88" uid="18684"/>
-        <specific value="3" description="43 Rubodh" uuid="ee538906-5269-11df-ad78-080069138b88" uid="18685"/>
-        <specific value="4" description="44 Suwad" uuid="ee549724-5269-11df-8ca2-080069138b88" uid="18686"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="223" uuid="ee578c86-5269-11df-a011-080069138b88" uid="18687">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ee58a06c-5269-11df-84e0-080069138b88" uid="18688">
-      <subcategory value="1" description="Muray Jip (Lurssen 62) Class (Corvette)" uuid="ee59ac50-5269-11df-94dd-080069138b88" uid="18689">
-        <specific value="1" description="P6501 Muray Jip" uuid="ee5abd5c-5269-11df-84ec-080069138b88" uid="18690"/>
-        <specific value="2" description="P6502 Das" uuid="ee5bcddc-5269-11df-a672-080069138b88" uid="18691"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="ee5e25fa-5269-11df-97e3-080069138b88" uid="18692">
-      <subcategory value="1" description="Kawkab Class (coastal patrol craft)" uuid="ee5f3756-5269-11df-a879-080069138b88" uid="18693">
-        <specific value="1" description="P561 Kawkab" uuid="ee6046dc-5269-11df-a577-080069138b88" uid="18694"/>
-        <specific value="2" description="P562 Thoaban" uuid="ee615536-5269-11df-ad1e-080069138b88" uid="18695"/>
-        <specific value="3" description="P563 Bani Yas" uuid="ee62675a-5269-11df-afe1-080069138b88" uid="18696"/>
-      </subcategory>
-      <subcategory value="2" description="Murbarraz Class (fast attack craft-missile)" uuid="ee641a0a-5269-11df-9d38-080069138b88" uid="18697">
-        <specific value="1" description="P4401 Murbarraz" uuid="ee652576-5269-11df-aab0-080069138b88" uid="18698"/>
-        <specific value="2" description="P4402 Makasib" uuid="ee663538-5269-11df-a372-080069138b88" uid="18699"/>
-      </subcategory>
-      <subcategory value="3" description="Ban Yas (Lurssen TNC 45) Class (fast attack craft-missile)" uuid="ee67e6d0-5269-11df-8c8e-080069138b88" uid="18700">
-        <specific value="1" description="P4501 Ban Yas" uuid="ee68fc32-5269-11df-b38f-080069138b88" uid="18701"/>
-        <specific value="2" description="P4502 Marban" uuid="ee6a0654-5269-11df-a2f6-080069138b88" uid="18702"/>
-        <specific value="3" description="P4503 Rodqm" uuid="ee6b1724-5269-11df-a09a-080069138b88" uid="18703"/>
-        <specific value="4" description="P4504 Shaheen" uuid="ee6c27e0-5269-11df-90c7-080069138b88" uid="18704"/>
-        <specific value="5" description="P4505 Sagar" uuid="ee6d34c8-5269-11df-a01d-080069138b88" uid="18705"/>
-        <specific value="6" description="P4506 Tarif" uuid="ee6e432c-5269-11df-a0f2-080069138b88" uid="18706"/>
-      </subcategory>
-      <subcategory value="4" description="Ardhana Class (large patrol craft)" uuid="ee6ff3f2-5269-11df-b70b-080069138b88" uid="18707">
-        <specific value="1" description="P1101 Ardana" uuid="ee710738-5269-11df-9fc2-080069138b88" uid="18708"/>
-        <specific value="2" description="P1102 Zurara" uuid="ee7211c8-5269-11df-a149-080069138b88" uid="18709"/>
-        <specific value="3" description="P1103 Murban" uuid="ee732022-5269-11df-b3f4-080069138b88" uid="18710"/>
-        <specific value="4" description="P1104 Al Ghullan" uuid="ee742b16-5269-11df-8219-080069138b88" uid="18711"/>
-        <specific value="5" description="P1105 Radoom" uuid="ee753dc6-5269-11df-8db2-080069138b88" uid="18712"/>
-        <specific value="6" description="P1105 Ghanadhah" uuid="ee764c98-5269-11df-866d-080069138b88" uid="18713"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Tank Landing Ship" uuid="ee789e4e-5269-11df-84f4-080069138b88" uid="18714">
-      <subcategory value="1" description="LSL/LST" uuid="ee79ad7a-5269-11df-b1f8-080069138b88" uid="18715">
-        <specific value="1" description="L5401 Al Feyi" uuid="ee7abca6-5269-11df-b7b1-080069138b88" uid="18716"/>
-        <specific value="2" description="L5402 Jananah" uuid="ee7bcd30-5269-11df-83ae-080069138b88" uid="18717"/>
-        <specific value="3" description="L5403 Dayyinah" uuid="ee7cde82-5269-11df-b785-080069138b88" uid="18718"/>
-      </subcategory>
-    </category>
-    <category value="11" description="Landing Craft" uuid="ee7f35ce-5269-11df-ac02-080069138b88" uid="18719">
-      <subcategory value="1" description="LCM" uuid="ee80414e-5269-11df-95f6-080069138b88" uid="18720">
-        <specific value="1" description="Ghagha II" uuid="ee815098-5269-11df-a736-080069138b88" uid="18721"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="ee83a0c8-5269-11df-9773-080069138b88" uid="18722">
-      <subcategory value="1" description="Cheverton Type (Tender)" uuid="ee84aef0-5269-11df-8689-080069138b88" uid="18723">
-        <specific value="1" description="A271" uuid="ee85c056-5269-11df-aba2-080069138b88" uid="18724"/>
-        <specific value="2" description="A272" uuid="ee86d0b8-5269-11df-9236-080069138b88" uid="18725"/>
-      </subcategory>
-      <subcategory value="2" description="Diving Tender" uuid="ee8880fc-5269-11df-bdff-080069138b88" uid="18726">
-        <specific value="1" description="D1051" uuid="ee898af6-5269-11df-8232-080069138b88" uid="18727"/>
-      </subcategory>
-      <subcategory value="3" description="Support Craft" uuid="ee8b3d56-5269-11df-a2f6-080069138b88" uid="18728">
-        <specific value="1" description="Baracuda" uuid="ee8c4cd2-5269-11df-b256-080069138b88" uid="18729"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-combatant Ship" uuid="ee8e9bfe-5269-11df-822a-080069138b88" uid="18730">
-      <subcategory value="1" description="Container Class" uuid="ee8fabac-5269-11df-9269-080069138b88" uid="18731">
-        <specific value="1" description="Julphara" uuid="ee90bae2-5269-11df-a6f2-080069138b88" uid="18732"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="ee926b62-5269-11df-a9a1-080069138b88" uid="18733">
-        <specific value="1" description="Al Dhabiyyah" uuid="ee937d36-5269-11df-85b8-080069138b88" uid="18734"/>
-        <specific value="2" description="Al Dhibyaniyyah" uuid="ee948730-5269-11df-a058-080069138b88" uid="18735"/>
-        <specific value="3" description="Al Markhaniya" uuid="ee95962a-5269-11df-a488-080069138b88" uid="18736"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="237" uuid="ee988998-5269-11df-9114-080069138b88" uid="18737">
-    <category value="7" description="Light/Patrol Craft" uuid="ee9999fa-5269-11df-9637-080069138b88" uid="18738">
-      <subcategory value="1" description="Broadsword Class (coastal patrol craft)" uuid="ee9aa3fe-5269-11df-96a7-080069138b88" uid="18739">
-        <specific value="1" description="141 26 September" uuid="ee9bbc3a-5269-11df-8270-080069138b88" uid="18740"/>
-        <specific value="2" description="142 Ramadan" uuid="ee9cd03e-5269-11df-8e5e-080069138b88" uid="18741"/>
-        <specific value="3" description="143 Sana's" uuid="ee9dd948-5269-11df-b6fc-080069138b88" uid="18742"/>
-      </subcategory>
-      <subcategory value="2" description="Baklan Class (PCF)" uuid="ee9f8734-5269-11df-b81f-080069138b88" uid="18743">
-        <specific value="1" description="1201 Baklan" uuid="eea09be2-5269-11df-8367-080069138b88" uid="18744"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="eea2e988-5269-11df-bd88-080069138b88" uid="18745">
-      <subcategory value="1" description="Toplivo Class" uuid="eea3f7ba-5269-11df-bfc5-080069138b88" uid="18746">
-        <specific value="1" description="135 (tanker-water)" uuid="eea50b5a-5269-11df-8ca3-080069138b88" uid="18747"/>
-        <specific value="2" description="140 (tanker-oil)" uuid="eea61b62-5269-11df-bd70-080069138b88" uid="18748"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-combatant Ship" uuid="eea86b2e-5269-11df-a6d7-080069138b88" uid="18749">
-      <subcategory value="1" description="Container Class" uuid="eea97960-5269-11df-8f11-080069138b88" uid="18750">
-        <specific value="1" description="Kedah Cement I" uuid="eeaa8404-5269-11df-acb1-080069138b88" uid="18751"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker" uuid="eeac34d4-5269-11df-8751-080069138b88" uid="18752">
-        <specific value="1" description="Abc Al-Rodha" uuid="eead4400-5269-11df-8075-080069138b88" uid="18753"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="10" uuid="eeb038f4-5269-11df-be72-080069138b88" uid="18754">
-    <category value="4" description="Guided Missile Destroyer" uuid="eeb14712-5269-11df-9e98-080069138b88" uid="18755">
-      <subcategory value="1" description="Almirante Brown (Meko 360)" uuid="eeb252b0-5269-11df-a9b3-080069138b88" uid="18756"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="eeb40448-5269-11df-8065-080069138b88" uid="18757">
-      <subcategory value="1" description="Costa Sur" uuid="eeb51216-5269-11df-b515-080069138b88" uid="18758"/>
-      <subcategory value="2" description="Puerto Deseado" uuid="eeb622c8-5269-11df-8077-080069138b88" uid="18759"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="10" uuid="eeb8715e-5269-11df-9d6b-080069138b88" uid="18760">
-    <category value="5" description="SS (Conventional Attack - Torpedo, Patrol" uuid="eeb98012-5269-11df-a885-080069138b88" uid="18761">
-      <subcategory value="1" description="Santa Cruz (TR 1700) Class (SS)" uuid="eeba94a2-5269-11df-ab3d-080069138b88" uid="18762"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="21" uuid="eebced7e-5269-11df-8311-080069138b88" uid="18763">
-    <category value="50" description="Frigate (including Corvette)" uuid="eebdf778-5269-11df-8aa0-080069138b88" uid="18764">
-      <subcategory value="1" description="Wielingen Class (FF)" uuid="eebf08d4-5269-11df-8ec0-080069138b88" uid="18765"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="39" uuid="eec15a6c-5269-11df-a9ef-080069138b88" uid="18766">
-    <category value="4" description="Cargo/Tanker" uuid="eec26894-5269-11df-952e-080069138b88" uid="18767">
-      <subcategory value="1" description="CC144 Challenger" uuid="eec37b80-5269-11df-97b4-080069138b88" uid="18768"/>
-    </category>
-    <category value="5" description="ASW/Patrol/Observation" uuid="eec52ab6-5269-11df-987b-080069138b88" uid="18769">
-      <subcategory value="1" description="CP-140 Arcturus/Aurora" deprecated="1" uuid="eec63adc-5269-11df-8ca1-080069138b88" uid="18770"/>
-      <subcategory value="2" description="CP144 Challenger" uuid="eec74a6c-5269-11df-a983-080069138b88" uid="18771"/>
-    </category>
-    <category value="6" description="Electronic Warfare (EW)" uuid="eec8f8a8-5269-11df-aadc-080069138b88" uid="18772">
-      <subcategory value="1" description="CE144 Challenger" uuid="eeca07e8-5269-11df-a80e-080069138b88" uid="18773"/>
-    </category>
-    <category value="22" description="Antisubmarine Warfare/Patrol Helicopter" uuid="eecbba52-5269-11df-8486-080069138b88" uid="18774">
-      <subcategory value="1" description="CH-124 (HELO)" uuid="eeccc910-5269-11df-87ea-080069138b88" uid="18775"/>
-    </category>
-    <category value="57" description="Non-combatant Commercial Aircraft" uuid="eece7ad0-5269-11df-84ea-080069138b88" uid="18776">
-      <subcategory value="1" description="Passenger Airline" uuid="eecf8678-5269-11df-8605-080069138b88" uid="18777">
-        <specific value="1" description="DASH-8" uuid="eed096da-5269-11df-a6fe-080069138b88" uid="18778"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="39" uuid="eed389e4-5269-11df-b151-080069138b88" uid="18779">
-    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="eed4a41e-5269-11df-97e5-080069138b88" uid="18780">
-      <subcategory value="1" description="Iroquis Class (DDG)" uuid="eed5b3e0-5269-11df-8b8f-080069138b88" uid="18781"/>
-    </category>
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="eed76438-5269-11df-bbd2-080069138b88" uid="18782">
-      <subcategory value="1" description="Halifax Class (FFG)" uuid="eed873d2-5269-11df-bc6a-080069138b88" uid="18783"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="eeda2e34-5269-11df-a8a0-080069138b88" uid="18784">
-      <subcategory value="1" description="Provider Class (AOR)" uuid="eedb4094-5269-11df-9da2-080069138b88" uid="18785"/>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="eedcf128-5269-11df-bd0f-080069138b88" uid="18786">
-      <subcategory value="1" description="Annapolis Class (FF)" uuid="eeddfd7a-5269-11df-ab54-080069138b88" uid="18787"/>
-      <subcategory value="2" description="Restigouche Class (FF)" uuid="eedf0cce-5269-11df-b250-080069138b88" uid="18788"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="57" uuid="eee16136-5269-11df-bae7-080069138b88" uid="18789">
-    <category value="7" description="Light/ Patrol Craft" uuid="eee26f7c-5269-11df-892b-080069138b88" uid="18790">
-      <subcategory value="1" description="Willemoes Class" uuid="eee37ebc-5269-11df-9532-080069138b88" uid="18791"/>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="eee52e6a-5269-11df-b61b-080069138b88" uid="18792">
-      <subcategory value="1" description="Container class" uuid="eee642aa-5269-11df-9c4e-080069138b88" uid="18793">
-        <specific value="1" description="Lindo Maersk" uuid="eee74cfe-5269-11df-bd40-080069138b88" uid="18794"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="62" uuid="eeea3ebe-5269-11df-8e94-080069138b88" uid="18795">
-    <category value="5" description="Destroyer" uuid="eeeb4b4c-5269-11df-9720-080069138b88" uid="18796">
-      <subcategory value="1" description="Z Class (DD)" uuid="eeec585c-5269-11df-ae90-080069138b88" uid="18797">
-        <specific value="1" description="921 El Fateh" uuid="eeed683c-5269-11df-820f-080069138b88" uid="18798"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided Missile Frigates" uuid="eeefb808-5269-11df-be5d-080069138b88" uid="18799">
-      <subcategory value="1" description="Descubierta Class (FFG)" uuid="eef0c9e6-5269-11df-b221-080069138b88" uid="18800">
-        <specific value="1" description="F946 Abu Qir" uuid="eef1d9e4-5269-11df-bd9f-080069138b88" uid="18801"/>
-      </subcategory>
-      <subcategory value="2" description="Jianghu I Class (FFG)" uuid="eef38a3c-5269-11df-b936-080069138b88" uid="18802">
-        <specific value="1" description="951 Najim Al Zaffer" uuid="eef49c9c-5269-11df-a9f3-080069138b88" uid="18803"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="eef6e9c0-5269-11df-aca9-080069138b88" uid="18804">
-      <subcategory value="1" description="Ramadan Class" uuid="eef80508-5269-11df-a4ba-080069138b88" uid="18805"/>
-    </category>
-    <category value="61" description="Non-combatant Ship" uuid="eef9b4ca-5269-11df-8f77-080069138b88" uid="18806">
-      <subcategory value="1" description="Container Class" uuid="eefac4d2-5269-11df-9b51-080069138b88" uid="18807">
-        <specific value="1" description="Abydos" uuid="eefbd188-5269-11df-b86b-080069138b88" uid="18808"/>
-        <specific value="2" description="Esna" uuid="eefcdfb0-5269-11df-a42e-080069138b88" uid="18809"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="eefe8dd8-5269-11df-a86c-080069138b88" uid="18810">
-        <specific value="1" description="Al Sharifa II" uuid="eeffa25e-5269-11df-8887-080069138b88" uid="18811"/>
-        <specific value="2" description="Abu Khalid" uuid="ef00ab40-5269-11df-9ee8-080069138b88" uid="18812"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="62" uuid="ef039dbe-5269-11df-af38-080069138b88" uid="18813">
-    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="ef04abfa-5269-11df-bdc2-080069138b88" uid="18814">
-      <subcategory value="1" description="Improved Romeo Class (Type 033) (SSK)" uuid="ef05bacc-5269-11df-a4a3-080069138b88" uid="18815">
-        <specific value="1" description="849" uuid="ef06c976-5269-11df-8cd9-080069138b88" uid="18816"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="99" uuid="ef09bc9e-5269-11df-aea3-080069138b88" uid="18817">
-    <category value="2" description="Attack/Strike" uuid="ef0aca76-5269-11df-adbe-080069138b88" uid="18818">
-      <subcategory value="1" description="HAL Jaguar" uuid="ef0bd3e4-5269-11df-a461-080069138b88" uid="18819"/>
-      <subcategory value="2" description="HAL Kiran Mk II" uuid="ef0ce5fe-5269-11df-a2fd-080069138b88" uid="18820"/>
-    </category>
-    <category value="21" description="Utility Helicopter" uuid="ef0e96ba-5269-11df-952c-080069138b88" uid="18821">
-      <subcategory value="1" description="HAL SA 316 Alouette III" uuid="ef0fa6f4-5269-11df-bc1d-080069138b88" uid="18822"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="99" uuid="ef11f846-5269-11df-928e-080069138b88" uid="18823">
-    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="ef130614-5269-11df-a73c-080069138b88" uid="18824">
-      <subcategory value="1" description="Delhi Class" uuid="ef141374-5269-11df-aced-080069138b88" uid="18825"/>
-      <subcategory value="2" description="Rajput Class" uuid="ef1523ae-5269-11df-9467-080069138b88" uid="18826"/>
-    </category>
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ef16ddb6-5269-11df-bc3d-080069138b88" uid="18827">
-      <subcategory value="1" description="Godavari Class" uuid="ef17ed5a-5269-11df-a64c-080069138b88" uid="18828"/>
-      <subcategory value="2" description="Talwar (Type 1135.6/Project 17) Class (FFG)" uuid="ef18f934-5269-11df-94e0-080069138b88" uid="18829">
-        <specific value="1" description="Talwar" uuid="ef1a0a7c-5269-11df-9ea7-080069138b88" uid="18830"/>
-      </subcategory>
-      <subcategory value="3" description="Brahmaputra Class (FFG)" uuid="ef1bbcc8-5269-11df-9e8e-080069138b88" uid="18831">
-        <specific value="1" description="F31 Brahmaputra" uuid="ef1ccb22-5269-11df-9f92-080069138b88" uid="18832"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft(PC)" uuid="ef1f1fb2-5269-11df-a8df-080069138b88" uid="18833">
-      <subcategory value="1" description="Sukanya Class" uuid="ef203226-5269-11df-ba38-080069138b88" uid="18834"/>
-      <subcategory value="2" description="Samar Class" uuid="ef213cac-5269-11df-9dbb-080069138b88" uid="18835"/>
-      <subcategory value="3" description="Abhay (Pauk II) Class (FS)" uuid="ef224fd4-5269-11df-b131-080069138b88" uid="18836">
-        <specific value="1" description="P33 Abhay" uuid="ef235f78-5269-11df-bb94-080069138b88" uid="18837"/>
-      </subcategory>
-      <subcategory value="4" description="Durg (Nanuchka II) Class (FSG)" uuid="ef250e90-5269-11df-aecc-080069138b88" uid="18838">
-        <specific value="1" description="K72 Sindhudurg" uuid="ef261c18-5269-11df-aa5c-080069138b88" uid="18839"/>
-      </subcategory>
-      <subcategory value="5" description="SDB Mk 3/T 60 Class (Large Patrol Craft) (PC)" uuid="ef27cc2a-5269-11df-a429-080069138b88" uid="18840">
-        <specific value="1" description="Y61 Trinkat" uuid="ef28df84-5269-11df-9a08-080069138b88" uid="18841"/>
-      </subcategory>
-      <subcategory value="6" description="Super Dvora MkII Class (PFC)" uuid="ef2a8e7e-5269-11df-a313-080069138b88" uid="18842">
-        <specific value="1" description="T80" uuid="ef2ba034-5269-11df-be05-080069138b88" uid="18843"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="ef2df046-5269-11df-9e16-080069138b88" uid="18844">
-      <subcategory value="1" description="Mahe (Yevgenya) Class (Type 1258)" uuid="ef2effc2-5269-11df-aee8-080069138b88" uid="18845">
-        <specific value="1" description="M83 Mahe" uuid="ef300ebc-5269-11df-9582-080069138b88" uid="18846"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliary" uuid="ef326018-5269-11df-b5f2-080069138b88" uid="18847">
-      <subcategory value="1" description="Deepak Class (Replenishment Tanker) ( AOR)" uuid="ef336d82-5269-11df-b43b-080069138b88" uid="18848">
-        <specific value="1" description="A57 Shakti" uuid="ef347dbc-5269-11df-8f95-080069138b88" uid="18849"/>
-      </subcategory>
-      <subcategory value="2" description="Jyoti Class (Replenishment Tanker ) (AOR)" uuid="ef363972-5269-11df-9da7-080069138b88" uid="18850">
-        <specific value="1" description="A58 Jyoti" uuid="ef3749a2-5269-11df-8211-080069138b88" uid="18851"/>
-      </subcategory>
-      <subcategory value="3" description="Aditya Class (Replenishment and Repair Ship) (AOR/AR)" uuid="ef38fac2-5269-11df-adb7-080069138b88" uid="18852">
-        <specific value="1" description="A59 Aditya" uuid="ef3a058e-5269-11df-81c3-080069138b88" uid="18853"/>
-      </subcategory>
-      <subcategory value="4" description="Support Tanker (AOTL)" uuid="ef3bb8d4-5269-11df-8f1e-080069138b88" uid="18854">
-        <specific value="1" description="Poshak" uuid="ef3cc86e-5269-11df-9990-080069138b88" uid="18855"/>
-      </subcategory>
-      <subcategory value="5" description="Transport Ship (AP)" uuid="ef3e7844-5269-11df-8bb3-080069138b88" uid="18856">
-        <specific value="1" description="Nicobar" uuid="ef3f8a4a-5269-11df-80a4-080069138b88" uid="18857"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="ef41d6ce-5269-11df-9cd2-080069138b88" uid="18858">
-      <subcategory value="1" description="Khukri Class" uuid="ef42eac8-5269-11df-9a1f-080069138b88" uid="18859"/>
-      <subcategory value="2" description="Kora Class (Project 25A) ( FSG)" uuid="ef43f60c-5269-11df-b6f2-080069138b88" uid="18860">
-        <specific value="1" description="P61 Kora" uuid="ef4504fc-5269-11df-be9e-080069138b88" uid="18861"/>
-      </subcategory>
-    </category>
-    <category value="54" description="Amphibious Assault Ship" uuid="ef47586a-5269-11df-917f-080069138b88" uid="18862">
-      <subcategory value="1" description="Magar Class (LST)" uuid="ef4867be-5269-11df-897c-080069138b88" uid="18863">
-        <specific value="1" description="L20 Magar" uuid="ef497726-5269-11df-b781-080069138b88" uid="18864"/>
-      </subcategory>
-      <subcategory value="2" description="Mk 3 Landing Craft (LCU/LSM)" uuid="ef4b28a0-5269-11df-8e8d-080069138b88" uid="18865">
-        <specific value="1" description="L34 Vasco Da Gama" uuid="ef4c383a-5269-11df-af75-080069138b88" uid="18866"/>
-      </subcategory>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="ef4e896e-5269-11df-8f7d-080069138b88" uid="18867">
-      <subcategory value="1" description="Container class" uuid="ef4f9804-5269-11df-9c0d-080069138b88" uid="18868">
-        <specific value="1" description="Pearl Grace" uuid="ef50a140-5269-11df-b976-080069138b88" uid="18869"/>
-        <specific value="2" description="Aditya Gaurav" uuid="ef51b2c4-5269-11df-bd52-080069138b88" uid="18870"/>
-        <specific value="3" description="Aditya Gautam" uuid="ef52c29a-5269-11df-9eb8-080069138b88" uid="18871"/>
-        <specific value="4" description="Aditya Gopal" uuid="ef53d4e6-5269-11df-96e5-080069138b88" uid="18872"/>
-        <specific value="5" description="Aditya Prakash" uuid="ef54e584-5269-11df-b8b4-080069138b88" uid="18873"/>
-        <specific value="6" description="Fomento Sharad" uuid="ef55f8ca-5269-11df-bf5d-080069138b88" uid="18874"/>
-        <specific value="7" description="ICL Parthibhan" uuid="ef57031e-5269-11df-ba4d-080069138b88" uid="18875"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker class" uuid="ef58b2e0-5269-11df-a2f5-080069138b88" uid="18876">
-        <specific value="1" description="Ankleshwar" uuid="ef59c0cc-5269-11df-ad25-080069138b88" uid="18877"/>
-        <specific value="2" description="Annapurna" uuid="ef5ad462-5269-11df-8b3a-080069138b88" uid="18878"/>
-        <specific value="3" description="Jag Leela" uuid="ef5bde70-5269-11df-afe6-080069138b88" uid="18879"/>
-        <specific value="4" description="Abul Kalam Azad" uuid="ef5ceec8-5269-11df-b770-080069138b88" uid="18880"/>
-        <specific value="5" description="Aditya Vikram" uuid="ef5dfef8-5269-11df-8bd3-080069138b88" uid="18881"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="110" uuid="ef60ed20-5269-11df-8808-080069138b88" uid="18882">
-    <category value="4" description="Self-propelled Artillery" uuid="ef61fae4-5269-11df-942b-080069138b88" uid="18883">
-      <subcategory value="1" description="SSM-1A/1B (type 88/90) launcher" uuid="ef630e7a-5269-11df-b277-080069138b88" uid="18884"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="110" uuid="ef655b08-5269-11df-a864-080069138b88" uid="18885">
-    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="ef666c0a-5269-11df-86e4-080069138b88" uid="18886">
-      <subcategory value="1" description="Kongo Class (DDG)" uuid="ef677c1c-5269-11df-8b26-080069138b88" uid="18887"/>
-      <subcategory value="2" description="Tachikaze Class (DDG)" uuid="ef688ca6-5269-11df-a810-080069138b88" uid="18888"/>
-      <subcategory value="3" description="Hatakaze Class (DDG)" uuid="ef699ab0-5269-11df-89e0-080069138b88" uid="18889"/>
-    </category>
-    <category value="5" description="Destroyer (DD)" uuid="ef6b48ec-5269-11df-b4ce-080069138b88" uid="18890">
-      <subcategory value="1" description="Shirane Class (DD)" uuid="ef6c5ee4-5269-11df-921f-080069138b88" uid="18891"/>
-      <subcategory value="2" description="Haruna Class (DD)" uuid="ef6d763a-5269-11df-bab1-080069138b88" uid="18892"/>
-      <subcategory value="3" description="Asagiri Class (DD)" uuid="ef6e80de-5269-11df-97ae-080069138b88" uid="18893"/>
-      <subcategory value="4" description="Hatsuyuki Class (DD)" uuid="ef6f919a-5269-11df-baec-080069138b88" uid="18894"/>
-      <subcategory value="5" description="Minegumo Class (DD)" uuid="ef70a508-5269-11df-84d9-080069138b88" uid="18895"/>
-      <subcategory value="6" description="Takasuki Class (DD)" uuid="ef71b0a6-5269-11df-820d-080069138b88" uid="18896"/>
-      <subcategory value="7" description="Yamagumo Class (DD)" uuid="ef72c86a-5269-11df-ae95-080069138b88" uid="18897"/>
-      <subcategory value="8" description="Murasame Class" uuid="ef73d958-5269-11df-bb72-080069138b88" uid="18898"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="ef758df2-5269-11df-88a7-080069138b88" uid="18899">
-      <subcategory value="1" description="Souya Class" deprecated="1" uuid="ef769922-5269-11df-85c7-080069138b88" uid="18900"/>
-      <subcategory value="2" description="Hatsushima Class (Minesweeper)" uuid="ef77a8a8-5269-11df-88e0-080069138b88" uid="18901"/>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="ef7960ee-5269-11df-a9bf-080069138b88" uid="18902">
-      <subcategory value="1" description="Abukuma Class (FF)" uuid="ef7a70ba-5269-11df-a21d-080069138b88" uid="18903"/>
-      <subcategory value="2" description="Yubari Class (FF)" uuid="ef7b7ca8-5269-11df-935b-080069138b88" uid="18904"/>
-      <subcategory value="3" description="Chikugo Class (FF)" uuid="ef7c8d50-5269-11df-b9ad-080069138b88" uid="18905"/>
-    </category>
-    <category value="61" description="Non-Combatant Ship" uuid="ef7e41a4-5269-11df-a4c9-080069138b88" uid="18906">
-      <subcategory value="1" description="Supertanker" uuid="ef7f5062-5269-11df-be04-080069138b88" uid="18907">
-        <specific value="1" description="Kota Mutiara" uuid="ef805af2-5269-11df-b054-080069138b88" uid="18908"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="110" uuid="ef834dd4-5269-11df-9b32-080069138b88" uid="18909">
-    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="ef845c42-5269-11df-ac21-080069138b88" uid="18910">
-      <subcategory value="1" description="Harushio Class (SS)" uuid="ef856b32-5269-11df-be48-080069138b88" uid="18911"/>
-      <subcategory value="2" description="Yuushio Class (SS)" uuid="ef867cd4-5269-11df-bc31-080069138b88" uid="18912"/>
-      <subcategory value="3" description="Uzushio Class (SS)" uuid="ef878c32-5269-11df-a1ec-080069138b88" uid="18913"/>
-      <subcategory value="4" description="Oyashio Class" uuid="ef8896c2-5269-11df-af76-080069138b88" uid="18914"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="126" uuid="ef8aead0-5269-11df-8c91-080069138b88" uid="18915">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ef8bf59c-5269-11df-9fd7-080069138b88" uid="18916">
-      <subcategory value="1" description="Dat Assawari" uuid="ef8d07d4-5269-11df-aeb1-080069138b88" uid="18917"/>
-    </category>
-    <category value="7" description="Light/Patrol Craft (PC)" uuid="ef8eb6f6-5269-11df-a665-080069138b88" uid="18918">
-      <subcategory value="1" description="Combattante 2 G Class" uuid="ef8fc6a4-5269-11df-8887-080069138b88" uid="18919">
-        <specific value="1" description="Laheeb" uuid="ef90d47c-5269-11df-9899-080069138b88" uid="18920"/>
-        <specific value="2" description="Shafak" uuid="ef91e9b6-5269-11df-b107-080069138b88" uid="18921"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate(including Corvette)" uuid="ef943c70-5269-11df-91b5-080069138b88" uid="18922">
-      <subcategory value="1" description="Assad Class" uuid="ef954cd2-5269-11df-a4b8-080069138b88" uid="18923">
-        <specific value="1" description="Assad AL BIHAR" uuid="ef965b90-5269-11df-adca-080069138b88" uid="18924"/>
-        <specific value="2" description="Assad ELTOUGOUR" uuid="ef976a26-5269-11df-85f2-080069138b88" uid="18925"/>
-        <specific value="3" description="Assad AL KHALI" uuid="ef987830-5269-11df-925d-080069138b88" uid="18926"/>
-        <specific value="4" description="Assad AL HUDUD" uuid="ef9987ca-5269-11df-a540-080069138b88" uid="18927"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="153" uuid="ef9c7b4c-5269-11df-9f7b-080069138b88" uid="18928">
-    <category value="23" description="Warning System" uuid="ef9d88b6-5269-11df-9dba-080069138b88" uid="18929">
-      <subcategory value="1" description="CRC" uuid="ef9e96ac-5269-11df-8726-080069138b88" uid="18930">
-        <specific value="1" description="CRC (NL)" uuid="ef9fa4de-5269-11df-ace2-080069138b88" uid="18931"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="153" uuid="efa2978e-5269-11df-a55a-080069138b88" uid="18932">
-    <category value="4" description="Cargo/Tanker" uuid="efa3a3b8-5269-11df-94f1-080069138b88" uid="18933">
-      <subcategory value="1" description="Fokker F27" uuid="efa4b492-5269-11df-8e34-080069138b88" uid="18934"/>
-    </category>
-    <category value="21" description="Utility Helicopter" uuid="efa66436-5269-11df-b4d3-080069138b88" uid="18935">
-      <subcategory value="1" description="SH 14 (Mk27 Lynx)" uuid="efa77326-5269-11df-a09c-080069138b88" uid="18936"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="153" uuid="efa9c2de-5269-11df-8324-080069138b88" uid="18937">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="efaad2dc-5269-11df-b805-080069138b88" uid="18938">
-      <subcategory value="1" description="Tromp Class" uuid="efabe348-5269-11df-ade6-080069138b88" uid="18939"/>
-      <subcategory value="2" description="Kortenaer Class" uuid="efacf65c-5269-11df-9ae5-080069138b88" uid="18940"/>
-      <subcategory value="3" description="Jacob Van Heemskerck Class" uuid="efae00d8-5269-11df-8829-080069138b88" uid="18941"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="efafb81a-5269-11df-b443-080069138b88" uid="18942">
-      <subcategory value="1" description="A20 Moawin (ex. Poolster) Pakistan" uuid="efb0cc82-5269-11df-990d-080069138b88" uid="18943"/>
-      <subcategory value="2" description="Amsterdam" uuid="efb1de9c-5269-11df-84bc-080069138b88" uid="18944"/>
-      <subcategory value="3" description="Tanker (AOT)" uuid="efb2e936-5269-11df-ab6c-080069138b88" uid="18945">
-        <specific value="1" description="A40 Attock" uuid="efb3fb82-5269-11df-b68b-080069138b88" uid="18946"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="153" uuid="efb6ee46-5269-11df-b93e-080069138b88" uid="18947">
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="efb80056-5269-11df-ae56-080069138b88" uid="18948">
-      <subcategory value="1" description="Walrus Class" uuid="efb90a3c-5269-11df-96ef-080069138b88" uid="18949"/>
-      <subcategory value="2" description="Hai Lung Class" uuid="efba1a9e-5269-11df-a483-080069138b88" uid="18950">
-        <specific value="1" description="793 Hai Lung (Taiwan)" uuid="efbb2dee-5269-11df-a1c5-080069138b88" uid="18951"/>
-        <specific value="2" description="794 Hai Hu (Taiwan)" uuid="efbc391e-5269-11df-8a56-080069138b88" uid="18952"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="163" uuid="efbf2c28-5269-11df-9ff1-080069138b88" uid="18953">
-    <category value="4" description="Self-propelled Artillery" uuid="efc03a78-5269-11df-b5b8-080069138b88" uid="18954">
-      <subcategory value="1" description="Penguin Mk 2 launcher" uuid="efc145a8-5269-11df-9ef7-080069138b88" uid="18955"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="163" uuid="efc39c4a-5269-11df-b676-080069138b88" uid="18956">
-    <category value="7" description="Light/Patrol Craft" uuid="efc4a3ba-5269-11df-b2e2-080069138b88" uid="18957">
-      <subcategory value="1" description="Snogg Class" uuid="efc5b61a-5269-11df-9b10-080069138b88" uid="18958"/>
-      <subcategory value="2" description="Hauk Class" uuid="efc6c56e-5269-11df-8621-080069138b88" uid="18959">
-        <specific value="1" description="Hauk" uuid="efc7cf5e-5269-11df-b40e-080069138b88" uid="18960"/>
-        <specific value="2" description="Orn" uuid="efc8e07e-5269-11df-b3e0-080069138b88" uid="18961"/>
-        <specific value="3" description="Terne" uuid="efc9f02c-5269-11df-928f-080069138b88" uid="18962"/>
-        <specific value="4" description="Tjeld" uuid="efcafa26-5269-11df-8f3b-080069138b88" uid="18963"/>
-        <specific value="5" description="Skarv" uuid="efcc09e8-5269-11df-b70f-080069138b88" uid="18964"/>
-        <specific value="6" description="Teist" uuid="efcd18c4-5269-11df-ab62-080069138b88" uid="18965"/>
-        <specific value="7" description="Jo" uuid="efce275a-5269-11df-843d-080069138b88" uid="18966"/>
-        <specific value="8" description="Lom" uuid="efcf3da2-5269-11df-9ad0-080069138b88" uid="18967"/>
-        <specific value="9" description="Stegg" uuid="efd04c56-5269-11df-b11f-080069138b88" uid="18968"/>
-        <specific value="10" description="Falk" uuid="efd1584e-5269-11df-a6bc-080069138b88" uid="18969"/>
-        <specific value="11" description="Ravn" uuid="efd267c0-5269-11df-a67d-080069138b88" uid="18970"/>
-        <specific value="12" description="Gribb" uuid="efd376c4-5269-11df-9f2c-080069138b88" uid="18971"/>
-        <specific value="13" description="Geir" uuid="efd47f4c-5269-11df-ae01-080069138b88" uid="18972"/>
-        <specific value="14" description="Erle" uuid="efd59166-5269-11df-973f-080069138b88" uid="18973"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="efd7dde0-5269-11df-be19-080069138b88" uid="18974">
-      <subcategory value="1" description="Vidar Class" uuid="efd8f090-5269-11df-832e-080069138b88" uid="18975"/>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="efda9ee0-5269-11df-afb8-080069138b88" uid="18976">
-      <subcategory value="1" description="Oslo Class" uuid="efdbae84-5269-11df-9c5b-080069138b88" uid="18977"/>
-    </category>
-    <category value="61" description="Non-combatant Ship" uuid="efdd613e-5269-11df-bc76-080069138b88" uid="18978">
-      <subcategory value="1" description="Container Class" uuid="efde6fb6-5269-11df-8534-080069138b88" uid="18979">
-        <specific value="1" description="Amber Fin" uuid="efdf7c26-5269-11df-84cb-080069138b88" uid="18980"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="efe12ef4-5269-11df-bac5-080069138b88" uid="18981">
-        <specific value="1" description="Berge Sisar" uuid="efe23e52-5269-11df-adb6-080069138b88" uid="18982"/>
-        <specific value="2" description="Bow Century" uuid="efe34f90-5269-11df-9212-080069138b88" uid="18983"/>
-        <specific value="3" description="Hebris" uuid="efe4598a-5269-11df-b181-080069138b88" uid="18984"/>
-        <specific value="4" description="Norgas Energy" uuid="efe56c1c-5269-11df-8644-080069138b88" uid="18985"/>
-        <specific value="5" description="Sitalene" uuid="efe67bde-5269-11df-9cbd-080069138b88" uid="18986"/>
-        <specific value="6" description="Solviken" uuid="efe786fa-5269-11df-b64f-080069138b88" uid="18987"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="163" uuid="efea7ab8-5269-11df-b638-080069138b88" uid="18988">
-    <category value="5" description="SS(Conventional Attack-Torpedo Patrol)" uuid="efeb88ae-5269-11df-bc70-080069138b88" uid="18989">
-      <subcategory value="1" description="Modernized Kobben Class (type 207)" deprecated="1" uuid="efec962c-5269-11df-8e75-080069138b88" uid="18990">
-        <specific value="1" description="Sklinna" deprecated="1" uuid="efedb2e6-5269-11df-b4c8-080069138b88" uid="18991"/>
-        <specific value="2" description="Skolpen" deprecated="1" uuid="efeec2b2-5269-11df-988b-080069138b88" uid="18992"/>
-        <specific value="3" description="Stord" deprecated="1" uuid="efefd22e-5269-11df-bb59-080069138b88" uid="18993"/>
-        <specific value="4" description="Svenner" deprecated="1" uuid="eff0e29a-5269-11df-95a4-080069138b88" uid="18994"/>
-        <specific value="5" description="Kobben" deprecated="1" uuid="eff1f338-5269-11df-88aa-080069138b88" uid="18995"/>
-        <specific value="6" description="Kunna" deprecated="1" uuid="eff3000c-5269-11df-b939-080069138b88" uid="18996"/>
-      </subcategory>
-      <subcategory value="2" description="S300 Ula" uuid="eff4af2e-5269-11df-8667-080069138b88" uid="18997"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="198" status="new" uuid="d267a7a5-6cc2-4aa6-a9a2-f0af4b0261c3" uid="22787">
-    <cr value="1633"/>
-    <category value="1" description="Tank" status="new" uuid="10102615-cfca-4a7f-baa6-953f2f02f47d" uid="22788">
-      <cr value="1633"/>
-      <subcategory value="1" description="Leopard 2 MBT (variation)" status="new" uuid="fbdaf3c4-ed35-43cd-a823-5720af6bc46e" uid="22789">
-        <cr value="1633"/>
-        <specific value="1" description="Leopard 2E" status="new" uuid="1aee8af4-d77a-49d2-8b71-f022c19e4700" uid="22790">
-          <cr value="1633"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="198" uuid="eff70404-5269-11df-92e9-080069138b88" uid="18998">
-    <category value="4" description="Cargo/Tanker" uuid="eff80c32-5269-11df-bf8d-080069138b88" uid="18999">
-      <subcategory value="1" description="CASA C-212" uuid="eff91b90-5269-11df-8c6f-080069138b88" uid="19000"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="198" uuid="effb6c4c-5269-11df-a99c-080069138b88" uid="19001">
-    <category value="1" description="Carrier" uuid="effc7b1e-5269-11df-bb57-080069138b88" uid="19002">
-      <subcategory value="1" description="Principe De Asturias Class (CVS)" uuid="effd8dba-5269-11df-83a6-080069138b88" uid="19003">
-        <specific value="1" description="R11 Principe De Asturias" uuid="effe9e4e-5269-11df-b130-080069138b88" uid="19004"/>
-      </subcategory>
-    </category>
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f000ef6e-5269-11df-9dc1-080069138b88" uid="19005">
-      <subcategory value="1" description="Baleares Class" uuid="f0020052-5269-11df-85a6-080069138b88" uid="19006"/>
-      <subcategory value="2" description="Alvaro De Bazan Class (FFG)" uuid="f0030ace-5269-11df-897c-080069138b88" uid="19007">
-        <specific value="1" description="F101 Alvaro De Bazan" uuid="f00419be-5269-11df-8e73-080069138b88" uid="19008"/>
-      </subcategory>
-      <subcategory value="3" description="Santa Maria Class (FFG)" uuid="f005d254-5269-11df-a75c-080069138b88" uid="19009">
-        <specific value="1" description="F81 Santa Maria" uuid="f006e34c-5269-11df-8e21-080069138b88" uid="19010"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="f00935c0-5269-11df-a5a8-080069138b88" uid="19011">
-      <subcategory value="1" description="Barcelo Class" uuid="f00a447e-5269-11df-9188-080069138b88" uid="19012"/>
-      <subcategory value="2" description="Serviola Class" uuid="f00b4edc-5269-11df-b000-080069138b88" uid="19013">
-        <specific value="1" description="P71 Serviola" uuid="f00c6ad8-5269-11df-802a-080069138b88" uid="19014"/>
-      </subcategory>
-      <subcategory value="3" description="Conejera Class (Coastal Patrol)" uuid="f00e1a4a-5269-11df-a741-080069138b88" uid="19015">
-        <specific value="1" description="P31 Conejera" uuid="f00f2b38-5269-11df-9b18-080069138b88" uid="19016"/>
-      </subcategory>
-      <subcategory value="4" description="Anaga Class" uuid="f010da00-5269-11df-a17d-080069138b88" uid="19017">
-        <specific value="1" description="P21 Anaga" uuid="f011e8fa-5269-11df-81c5-080069138b88" uid="19018"/>
-      </subcategory>
-      <subcategory value="5" description="Toralla Class (Coastal Patrol Craft) ( PC)" uuid="f0139952-5269-11df-bdbb-080069138b88" uid="19019">
-        <specific value="1" description="P81 Tortalla" uuid="f014ab58-5269-11df-b5d9-080069138b88" uid="19020"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship" uuid="f016fdae-5269-11df-aeac-080069138b88" uid="19021">
-      <subcategory value="1" description="Segura Class (Minehunters) (MHC)" uuid="f0180f46-5269-11df-8606-080069138b88" uid="19022">
-        <specific value="1" description="M31 Segura" uuid="f0192084-5269-11df-9452-080069138b88" uid="19023"/>
-      </subcategory>
-      <subcategory value="2" description="Adjutant, Redwing and MSC 268 Class" uuid="f01ad140-5269-11df-86ae-080069138b88" uid="19024">
-        <specific value="1" description="M22 Ebro" uuid="f01be47c-5269-11df-ad0e-080069138b88" uid="19025"/>
-      </subcategory>
-    </category>
-    <category value="16" description="Auxiliry" uuid="f01e320e-5269-11df-a8b8-080069138b88" uid="19026">
-      <subcategory value="1" description="Patino Class (Fleet Logistic Tanker) (AOR)" uuid="f01f4450-5269-11df-968d-080069138b88" uid="19027">
-        <specific value="1" description="A14 Patino" uuid="f02050ac-5269-11df-b0ec-080069138b88" uid="19028"/>
-      </subcategory>
-      <subcategory value="2" description="Transport Ship (AP)" uuid="f021fe16-5269-11df-a6dd-080069138b88" uid="19029">
-        <specific value="1" description="A04 Martin Posadillo" uuid="f02310a8-5269-11df-967d-080069138b88" uid="19030"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="f0256132-5269-11df-9f46-080069138b88" uid="19031">
-      <subcategory value="1" description="Descubierto Class" uuid="f026743c-5269-11df-b3ad-080069138b88" uid="19032"/>
-    </category>
-    <category value="56" description="Amphibious Transport Dock" uuid="f02823ae-5269-11df-9b17-080069138b88" uid="19033">
-      <subcategory value="1" description="Galicia Class (LPD)" uuid="f02934ba-5269-11df-8dbb-080069138b88" uid="19034">
-        <specific value="1" description="L51 Galicia" uuid="f02a4a08-5269-11df-b156-080069138b88" uid="19035"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="206" uuid="f02d4294-5269-11df-913c-080069138b88" uid="19036">
-    <category value="5" description="Towed Artillery" uuid="f02e508a-5269-11df-b669-080069138b88" uid="19037">
-      <subcategory value="1" description="NORICUM GH N-45 155mm gun-howitzer" uuid="f02f5f98-5269-11df-9477-080069138b88" uid="19038"/>
-    </category>
-    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="f0311554-5269-11df-a183-080069138b88" uid="19039">
-      <subcategory value="1" description="Towed VSHORAD Gun/Missile System" uuid="f03226e2-5269-11df-a75f-080069138b88" uid="19040">
-        <specific value="1" description="Oerlikon-Contraves 35mm" uuid="f03332ee-5269-11df-8afa-080069138b88" uid="19041">
-          <extra value="1" description="GDF-Series Twin-35mm" uuid="f0344166-5269-11df-ac50-080069138b88" uid="19042"/>
-          <extra value="2" description="Skyshield 35 Revolver Gun Mount (RGM)" uuid="f03555f6-5269-11df-b511-080069138b88" uid="19043"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="206" uuid="f038ea90-5269-11df-b651-080069138b88" uid="19044">
-    <category value="4" description="Cargo / Tanker" uuid="f039f9bc-5269-11df-b05c-080069138b88" uid="19045">
-      <subcategory value="1" description="Pilatus PC-6" uuid="f03b02e4-5269-11df-b14f-080069138b88" uid="19046">
-        <specific value="1" description="Pilatus PC-6 Turbo Porter" uuid="f03c162a-5269-11df-999e-080069138b88" uid="19047"/>
-      </subcategory>
-    </category>
-    <category value="40" description="Trainer" uuid="f03e6420-5269-11df-ade1-080069138b88" uid="19048">
-      <subcategory value="1" description="Pilatus PC-7" uuid="f03f7626-5269-11df-8993-080069138b88" uid="19049">
-        <specific value="1" description="Pilatus PC-7 Turbo Trainer" uuid="f04084f8-5269-11df-9ae3-080069138b88" uid="19050"/>
-        <specific value="2" description="PC-7 Mk II" uuid="f0419046-5269-11df-a87e-080069138b88" uid="19051"/>
-      </subcategory>
-      <subcategory value="2" description="Pilatus PC-9" uuid="f0434364-5269-11df-85ff-080069138b88" uid="19052">
-        <specific value="1" description="Pilatus PC-9 Turbo Trainer" uuid="f044518c-5269-11df-b0c1-080069138b88" uid="19053"/>
-        <specific value="2" description="PC-9 Mk II" uuid="f0456c98-5269-11df-a822-080069138b88" uid="19054"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="210" uuid="f0486330-5269-11df-a1fb-080069138b88" uid="19055">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f0497d10-5269-11df-88ba-080069138b88" uid="19056">
-      <subcategory value="1" description="Naresuan Class" uuid="f04a9006-5269-11df-8ac2-080069138b88" uid="19057"/>
-      <subcategory value="2" description="Chao Phraya Class" uuid="f04ba1ee-5269-11df-93a3-080069138b88" uid="19058"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="218" uuid="f04def3a-5269-11df-90f6-080069138b88" uid="19059">
-    <category value="5" description="Destroyer (DD)" uuid="f04f01d6-5269-11df-9571-080069138b88" uid="19060">
-      <subcategory value="1" description="Mod Gearing Fram" uuid="f0500c70-5269-11df-86c1-080069138b88" uid="19061"/>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="f051bb56-5269-11df-8754-080069138b88" uid="19062">
-      <subcategory value="1" description="Dogan Class" uuid="f052c9e2-5269-11df-a8b0-080069138b88" uid="19063"/>
-    </category>
-    <category value="50" description="Frigate (including Corvette)" uuid="f0547e54-5269-11df-a48b-080069138b88" uid="19064">
-      <subcategory value="1" description="Yavuz" uuid="f0558dd0-5269-11df-bcaf-080069138b88" uid="19065"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="218" uuid="f057ddd8-5269-11df-8bcd-080069138b88" uid="19066">
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="f058ea98-5269-11df-9cc5-080069138b88" uid="19067">
-      <subcategory value="1" description="Modified Guppy III Class" uuid="f059fa96-5269-11df-9357-080069138b88" uid="19068"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="240" uuid="f05c4d32-5269-11df-90da-080069138b88" uid="19069">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f05d5a60-5269-11df-b87b-080069138b88" uid="19070">
-      <subcategory value="1" description="Split/Kotor" uuid="f05e690a-5269-11df-bdf9-080069138b88" uid="19071"/>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="f0601854-5269-11df-b0bc-080069138b88" uid="19072">
-      <subcategory value="1" description="Koncar Class" uuid="f0612a96-5269-11df-9c0d-080069138b88" uid="19073"/>
-      <subcategory value="2" description="Mirna Class Type 140 PCF" uuid="f0623526-5269-11df-a8bd-080069138b88" uid="19074">
-        <specific value="1" description="Ucka 174" uuid="f0634498-5269-11df-83f1-080069138b88" uid="19075"/>
-        <specific value="2" description="Grmec 175" uuid="f06455b8-5269-11df-a785-080069138b88" uid="19076"/>
-        <specific value="3" description="Gora 177" uuid="f065632c-5269-11df-83f8-080069138b88" uid="19077"/>
-        <specific value="4" description="Kosmaj 178" uuid="f06673d4-5269-11df-927e-080069138b88" uid="19078"/>
-        <specific value="5" description="Zelengora 179" uuid="f06781f2-5269-11df-936f-080069138b88" uid="19079"/>
-      </subcategory>
-      <subcategory value="3" description="Damen Class" uuid="f0693e0c-5269-11df-9f58-080069138b88" uid="19080"/>
-    </category>
-    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="f06aec3e-5269-11df-bc9a-080069138b88" uid="19081">
-      <subcategory value="1" description="Silba Class (LCT)" uuid="f06bf7f0-5269-11df-a37e-080069138b88" uid="19082"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="f06da992-5269-11df-96f2-080069138b88" uid="19083">
-      <subcategory value="1" description="Spasilac Class (ASR)" uuid="f06eb800-5269-11df-b373-080069138b88" uid="19084"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="240" uuid="f07108d0-5269-11df-91a7-080069138b88" uid="19085">
-    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="f0721702-5269-11df-92f8-080069138b88" uid="19086">
-      <subcategory value="1" description="Heroj Class" uuid="f07327c8-5269-11df-a088-080069138b88" uid="19087"/>
-      <subcategory value="2" description="Sava Class" uuid="f07438a2-5269-11df-93c5-080069138b88" uid="19088"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="197" uuid="f0768b02-5269-11df-b6ed-080069138b88" uid="19089">
-    <category value="1" description="Tank" uuid="f07798c6-5269-11df-9e40-080069138b88" uid="19090">
-      <subcategory value="1" description="Olifant" uuid="f078a630-5269-11df-9be5-080069138b88" uid="19091">
-        <specific value="1" description="Mk 1" uuid="f079b516-5269-11df-b167-080069138b88" uid="19092"/>
-        <specific value="2" description="Mk 2" uuid="f07ac578-5269-11df-94ef-080069138b88" uid="19093"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Armored Fighting Vehicle" uuid="f07d136e-5269-11df-8af6-080069138b88" uid="19094">
-      <subcategory value="1" description="Rooikat" uuid="f07e2254-5269-11df-b3f8-080069138b88" uid="19095">
-        <specific value="1" description="76 mm" uuid="f07f30fe-5269-11df-a958-080069138b88" uid="19096"/>
-      </subcategory>
-      <subcategory value="2" description="Ratel" uuid="f080e00c-5269-11df-9450-080069138b88" uid="19097">
-        <specific value="1" description="20 mm" uuid="f081efa6-5269-11df-962a-080069138b88" uid="19098"/>
-        <specific value="2" description="60 mm" uuid="f082feb4-5269-11df-87a6-080069138b88" uid="19099"/>
-        <specific value="3" description="90 mm" uuid="f0840cd2-5269-11df-a8d1-080069138b88" uid="19100"/>
-        <specific value="4" description="Ratel ZT-6 ATGM (Mokopa)" status="new" uuid="efd56657-dead-41e2-9596-c041ab4aae5a" uid="22819">
-          <cr value="1698"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="3" description="Armored Utility Vehicle" uuid="f08667d4-5269-11df-87ee-080069138b88" uid="19101">
-      <subcategory value="1" description="BLV" uuid="f087770a-5269-11df-adc3-080069138b88" uid="19102"/>
-    </category>
-    <category value="4" description="Self-propelled Artillery" uuid="f0892adc-5269-11df-bb2e-080069138b88" uid="19103">
-      <subcategory value="1" description="G6 155-mm Howitzer" uuid="f08a3828-5269-11df-bf39-080069138b88" uid="19104"/>
-    </category>
-    <category value="5" description="Towed Artillery" uuid="f08be81c-5269-11df-abb2-080069138b88" uid="19105">
-      <subcategory value="1" description="G5" uuid="f08cf75c-5269-11df-8460-080069138b88" uid="19106"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="197" uuid="f08f4818-5269-11df-aa0d-080069138b88" uid="19107">
-    <category value="1" description="Fighter / Air Defense" uuid="f09056f4-5269-11df-8329-080069138b88" uid="19108">
-      <subcategory value="1" description="Cheetah" uuid="f09166f2-5269-11df-84df-080069138b88" uid="19109">
-        <specific value="1" description="C" uuid="f092792a-5269-11df-bc91-080069138b88" uid="19110"/>
-        <specific value="2" description="D" uuid="f09380f4-5269-11df-b19f-080069138b88" uid="19111"/>
-      </subcategory>
-    </category>
-    <category value="20" description="Attack Helicopter" uuid="f095d8e0-5269-11df-bb57-080069138b88" uid="19112">
-      <subcategory value="1" description="Rooivalk" uuid="f096e2d0-5269-11df-a7f5-080069138b88" uid="19113"/>
-    </category>
-    <category value="50" description="Unmanned" uuid="f098909e-5269-11df-b895-080069138b88" uid="19114">
-      <subcategory value="1" description="RPV" uuid="f099a0ce-5269-11df-84b8-080069138b88" uid="19115">
-        <specific value="1" description="Seeker" uuid="f09aae92-5269-11df-8966-080069138b88" uid="19116"/>
-        <specific value="2" description="Vulture" uuid="f09bb8be-5269-11df-a5c7-080069138b88" uid="19117"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="56" status="new" uuid="b5fca155-afd2-47a6-b867-e6b756d5b235" uid="22828">
-    <cr value="2166"/>
-    <category value="4" description="Self-propelled Artillery - (guns and howitzers)" status="new" uuid="5a33af0a-d960-4d9a-a5bc-17d29e4feecf" uid="22829">
-      <cr value="2166"/>
-      <subcategory value="1" description="Tatra T815 8x8 SP Howitzer" status="new" uuid="ab04985e-de59-4568-887c-aaaa2acff72a" uid="22830">
-        <cr value="2166"/>
-        <specific value="1" description="ShKH-77 DANA 152 mm SP Howitzer" status="new" uuid="f9e8bb5a-a94f-4fc3-af5f-827477b98d00" uid="22831">
-          <cr value="2166"/>
-        </specific>
-        <specific value="2" description="ShKH-77 ZUZANA 155 mm SP Howitzer" status="new" uuid="790417ab-05ba-4c2a-90e5-46a95d4d6dea" uid="22832">
-          <cr value="2166"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="56" uuid="f09ebcda-5269-11df-896d-080069138b88" uid="19118">
-    <category value="1" description="Fighter / Air Defense" uuid="f09fcf62-5269-11df-a7b8-080069138b88" uid="19119">
-      <subcategory value="1" description="Aero L-159" uuid="f0a0d826-5269-11df-90a4-080069138b88" uid="19120"/>
-    </category>
-    <category value="2" description="Attack / Strike" uuid="f0a28766-5269-11df-9026-080069138b88" uid="19121">
-      <subcategory value="1" description="Aero L-39Z Albatros" uuid="f0a399d0-5269-11df-83fc-080069138b88" uid="19122">
-        <specific value="1" description="Aero L-39ZO" uuid="f0a4aae6-5269-11df-957c-080069138b88" uid="19123"/>
-        <specific value="2" description="Aero L-39ZA" uuid="f0a5bd5a-5269-11df-a5c0-080069138b88" uid="19124"/>
-      </subcategory>
-      <subcategory value="2" description="Aero L-59" uuid="f0a770e6-5269-11df-ac8b-080069138b88" uid="19125"/>
-    </category>
-    <category value="4" description="Cargo / Tanker" uuid="f0a91f2c-5269-11df-bb3b-080069138b88" uid="19126">
-      <subcategory value="1" description="Let L-410 Turbolet" uuid="f0aa2f16-5269-11df-b0fd-080069138b88" uid="19127"/>
-    </category>
-    <category value="40" description="Trainer" uuid="f0abe216-5269-11df-8a87-080069138b88" uid="19128">
-      <subcategory value="1" description="Zlin Z-142" uuid="f0acef76-5269-11df-b404-080069138b88" uid="19129"/>
-      <subcategory value="2" description="Aero L-29 Delphin" uuid="f0adf9f2-5269-11df-86de-080069138b88" uid="19130"/>
-      <subcategory value="3" description="Aero L-39C Albatros" uuid="f0af095a-5269-11df-8856-080069138b88" uid="19131"/>
-      <subcategory value="4" description="Aero L-59" uuid="f0b01e1c-5269-11df-b596-080069138b88" uid="19132"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="208" uuid="f0b26a82-5269-11df-833e-080069138b88" uid="19133">
-    <category value="4" description="Self-propelled Artillery" uuid="f0b37ba2-5269-11df-9945-080069138b88" uid="19134">
-      <subcategory value="1" description="Hsiung Feng I launcher" uuid="f0b48682-5269-11df-826a-080069138b88" uid="19135"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="2" country="208" uuid="f0b6db6c-5269-11df-8468-080069138b88" uid="19136">
-    <category value="1" description="Fighter/Air Defense" uuid="f0b7e840-5269-11df-aa40-080069138b88" uid="19137">
-      <subcategory value="1" description="Ching-kuo (IDF)" uuid="f0b8f97e-5269-11df-845c-080069138b88" uid="19138"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="208" uuid="f0bb48f0-5269-11df-965b-080069138b88" uid="19139">
-    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f0bc5682-5269-11df-87e3-080069138b88" uid="19140">
-      <subcategory value="1" description="Cheng Kung Class (Kwang Hua Project)" uuid="f0bd6860-5269-11df-86f0-080069138b88" uid="19141">
-        <specific value="1" description="FFG 1101 Cheng Kung" uuid="f0be7d40-5269-11df-8bad-080069138b88" uid="19142"/>
-        <specific value="2" description="FFG 1103 Cheng Ho" uuid="f0bf86b8-5269-11df-8c82-080069138b88" uid="19143"/>
-        <specific value="3" description="FFG 1105 Chi Kuang" uuid="f0c09706-5269-11df-bbf8-080069138b88" uid="19144"/>
-        <specific value="4" description="FFG 1106 Yueh Fei" uuid="f0c1a812-5269-11df-939b-080069138b88" uid="19145"/>
-        <specific value="5" description="FFG 1107 Tzu-I" uuid="f0c2b6d0-5269-11df-92d0-080069138b88" uid="19146"/>
-        <specific value="6" description="FFG 1108 Pan Chao" uuid="f0c3cebc-5269-11df-a453-080069138b88" uid="19147"/>
-        <specific value="7" description="FFG 1109 Chang Chien" uuid="f0c4e0c2-5269-11df-868c-080069138b88" uid="19148"/>
-      </subcategory>
-      <subcategory value="2" description="Kang Ding (La Fayette) Class" uuid="f0c695fc-5269-11df-af09-080069138b88" uid="19149">
-        <specific value="1" description="FFG 1202 Kang Ding" uuid="f0c7a17c-5269-11df-b7b1-080069138b88" uid="19150"/>
-        <specific value="2" description="FFG 1203 Si Ning" uuid="f0c8b076-5269-11df-b8a7-080069138b88" uid="19151"/>
-        <specific value="3" description="FFG 1205 Kun Ming" uuid="f0c9c1e6-5269-11df-9946-080069138b88" uid="19152"/>
-        <specific value="4" description="FFG 1206 Di Hua" uuid="f0cad162-5269-11df-802d-080069138b88" uid="19153"/>
-        <specific value="5" description="FFG 1207 Wu Chang" uuid="f0cbe214-5269-11df-b99d-080069138b88" uid="19154"/>
-        <specific value="6" description="FFG 1208 Chen Te" uuid="f0ccf064-5269-11df-b4da-080069138b88" uid="19155"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Light/Patrol Craft" uuid="f0cf435a-5269-11df-ac22-080069138b88" uid="19156">
-      <subcategory value="1" description="Hai Ou Class" uuid="f0d05290-5269-11df-9b48-080069138b88" uid="19157">
-        <specific value="1" description="FABG 5" uuid="f0d15bea-5269-11df-b4c5-080069138b88" uid="19158"/>
-        <specific value="2" description="FABG 6" uuid="f0d26d14-5269-11df-88fc-080069138b88" uid="19159"/>
-        <specific value="3" description="FABG 7" uuid="f0d37d08-5269-11df-bb84-080069138b88" uid="19160"/>
-        <specific value="4" description="FABG 8" uuid="f0d4887e-5269-11df-bd3c-080069138b88" uid="19161"/>
-        <specific value="5" description="FABG 9" uuid="f0d59818-5269-11df-8352-080069138b88" uid="19162"/>
-        <specific value="6" description="FABG 10" uuid="f0d6a1f4-5269-11df-a662-080069138b88" uid="19163"/>
-        <specific value="7" description="FABG 11" uuid="f0d7c1c4-5269-11df-810b-080069138b88" uid="19164"/>
-        <specific value="8" description="FABG 12" uuid="f0d8d226-5269-11df-a82a-080069138b88" uid="19165"/>
-        <specific value="9" description="FABG 14" uuid="f0d9e238-5269-11df-b7e5-080069138b88" uid="19166"/>
-        <specific value="10" description="FABG 15" uuid="f0daf7fe-5269-11df-9249-080069138b88" uid="19167"/>
-        <specific value="11" description="FABG 16" uuid="f0dc1850-5269-11df-ae4a-080069138b88" uid="19168"/>
-        <specific value="12" description="FABG 17" uuid="f0dd3e56-5269-11df-909a-080069138b88" uid="19169"/>
-        <specific value="13" description="FABG 18" uuid="f0defa3e-5269-11df-895e-080069138b88" uid="19170"/>
-        <specific value="14" description="FABG 19" uuid="f0e006fe-5269-11df-99c4-080069138b88" uid="19171"/>
-        <specific value="15" description="FABG 20" uuid="f0e115a8-5269-11df-be16-080069138b88" uid="19172"/>
-        <specific value="16" description="FABG 21" uuid="f0e22e7a-5269-11df-8ec7-080069138b88" uid="19173"/>
-        <specific value="17" description="FABG 23" uuid="f0e33f04-5269-11df-a9e8-080069138b88" uid="19174"/>
-        <specific value="18" description="FABG 24" uuid="f0e44e80-5269-11df-9002-080069138b88" uid="19175"/>
-        <specific value="19" description="FABG 25" uuid="f0e55d52-5269-11df-8191-080069138b88" uid="19176"/>
-        <specific value="20" description="FABG 26" uuid="f0e66b02-5269-11df-b7a6-080069138b88" uid="19177"/>
-        <specific value="21" description="FABG 27" uuid="f0e779c0-5269-11df-b331-080069138b88" uid="19178"/>
-        <specific value="22" description="FABG 28" uuid="f0e88946-5269-11df-8e15-080069138b88" uid="19179"/>
-        <specific value="23" description="FABG 29" uuid="f0e990a2-5269-11df-b7b9-080069138b88" uid="19180"/>
-        <specific value="24" description="FABG 30" uuid="f0eaa140-5269-11df-be43-080069138b88" uid="19181"/>
-        <specific value="25" description="FABG 32" uuid="f0ebb4d6-5269-11df-b34f-080069138b88" uid="19182"/>
-        <specific value="26" description="FABG 33" uuid="f0ecbe30-5269-11df-a62d-080069138b88" uid="19183"/>
-        <specific value="27" description="FABG 34" uuid="f0edcd02-5269-11df-8c50-080069138b88" uid="19184"/>
-        <specific value="28" description="FABG 35" uuid="f0eedde6-5269-11df-81a5-080069138b88" uid="19185"/>
-        <specific value="29" description="FABG 36" uuid="f0efea88-5269-11df-911d-080069138b88" uid="19186"/>
-        <specific value="30" description="FABG 37" uuid="f0f0f7f2-5269-11df-b83b-080069138b88" uid="19187"/>
-        <specific value="31" description="FABG 38" uuid="f0f206f6-5269-11df-aa0b-080069138b88" uid="19188"/>
-        <specific value="32" description="FABG 39" uuid="f0f31122-5269-11df-af01-080069138b88" uid="19189"/>
-        <specific value="33" description="FABG 41" uuid="f0f42328-5269-11df-ae49-080069138b88" uid="19190"/>
-        <specific value="34" description="FABG 42" uuid="f0f5309c-5269-11df-b3fe-080069138b88" uid="19191"/>
-        <specific value="35" description="FABG 43" uuid="f0f639ec-5269-11df-85f3-080069138b88" uid="19192"/>
-        <specific value="36" description="FABG 44" uuid="f0f74ba2-5269-11df-9a99-080069138b88" uid="19193"/>
-        <specific value="37" description="FABG 45" uuid="f0f85a7e-5269-11df-9b02-080069138b88" uid="19194"/>
-        <specific value="38" description="FABG 46" uuid="f0f96248-5269-11df-8d1b-080069138b88" uid="19195"/>
-        <specific value="39" description="FABG 47" uuid="f0fa716a-5269-11df-bfc4-080069138b88" uid="19196"/>
-        <specific value="40" description="FABG 48" uuid="f0fb83d4-5269-11df-a364-080069138b88" uid="19197"/>
-        <specific value="41" description="FABG 49" uuid="f0fc8c16-5269-11df-816b-080069138b88" uid="19198"/>
-        <specific value="42" description="FABG 50" uuid="f0fd99b2-5269-11df-ac25-080069138b88" uid="19199"/>
-        <specific value="43" description="FABG 51" uuid="f0fea9c4-5269-11df-af4f-080069138b88" uid="19200"/>
-        <specific value="44" description="FABG 52" uuid="f0ffb3f0-5269-11df-add7-080069138b88" uid="19201"/>
-        <specific value="45" description="FABG 53" uuid="f100ca24-5269-11df-b46e-080069138b88" uid="19202"/>
-        <specific value="46" description="FABG 54" uuid="f101deaa-5269-11df-b656-080069138b88" uid="19203"/>
-        <specific value="47" description="FABG 55" uuid="f102e8ae-5269-11df-b2c1-080069138b88" uid="19204"/>
-        <specific value="48" description="FABG 56" uuid="f103f87a-5269-11df-8345-080069138b88" uid="19205"/>
-        <specific value="49" description="FABG 57" uuid="f10509d6-5269-11df-965c-080069138b88" uid="19206"/>
-        <specific value="50" description="FABG 58" uuid="f10612b8-5269-11df-9762-080069138b88" uid="19207"/>
-      </subcategory>
-      <subcategory value="2" description="Jin Chiang Class" uuid="f107c036-5269-11df-bc41-080069138b88" uid="19208">
-        <specific value="1" description="603 Jin Chiang" uuid="f108d34a-5269-11df-a714-080069138b88" uid="19209"/>
-      </subcategory>
-      <subcategory value="3" description="PCL Type" uuid="f10a801e-5269-11df-9a0f-080069138b88" uid="19210">
-        <specific value="1" description="1 PCL" uuid="f10b8ea0-5269-11df-b885-080069138b88" uid="19211"/>
-        <specific value="2" description="2 PCL" uuid="f10c9c32-5269-11df-9adf-080069138b88" uid="19212"/>
-        <specific value="3" description="3 PCL" uuid="f10da898-5269-11df-9002-080069138b88" uid="19213"/>
-        <specific value="4" description="5 PCL" uuid="f10eb6de-5269-11df-8c63-080069138b88" uid="19214"/>
-        <specific value="5" description="6 PCL" uuid="f10fc2ae-5269-11df-89e5-080069138b88" uid="19215"/>
-        <specific value="6" description="7 PCL" uuid="f110d19e-5269-11df-8fb6-080069138b88" uid="19216"/>
-        <specific value="7" description="8 PCL" uuid="f111e0f2-5269-11df-80c9-080069138b88" uid="19217"/>
-        <specific value="8" description="9 PCL" uuid="f112ea7e-5269-11df-999b-080069138b88" uid="19218"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Mine Coutermeasures Ship/Craft" uuid="f1153f4a-5269-11df-b11f-080069138b88" uid="19219">
-      <subcategory value="1" description="Yun Feng Class" uuid="f116499e-5269-11df-a64c-080069138b88" uid="19220">
-        <specific value="1" description="1301 Yung Feng" uuid="f1175a8c-5269-11df-954a-080069138b88" uid="19221"/>
-        <specific value="2" description="1302 Yung Chia" uuid="f11869e0-5269-11df-96ad-080069138b88" uid="19222"/>
-        <specific value="3" description="1303 Yung Nieng" uuid="f11973a8-5269-11df-9cf7-080069138b88" uid="19223"/>
-        <specific value="4" description="1305 Yung Shoen" uuid="f11a850e-5269-11df-bf39-080069138b88" uid="19224"/>
-      </subcategory>
-    </category>
-    <category value="56" description="Amphibious Transport Dock" uuid="f11cd0ac-5269-11df-acff-080069138b88" uid="19225">
-      <subcategory value="1" description="Tai Wu Class" uuid="f11de4ba-5269-11df-a215-080069138b88" uid="19226">
-        <specific value="1" description="518 Tai Wu" uuid="f11f0066-5269-11df-91b7-080069138b88" uid="19227"/>
-        <specific value="2" description="522 Ling Yuen" uuid="f12017ee-5269-11df-a66e-080069138b88" uid="19228"/>
-        <specific value="3" description="523 Wan An" uuid="f121218e-5269-11df-954c-080069138b88" uid="19229"/>
-      </subcategory>
-      <subcategory value="2" description="Wu Kang Class" uuid="f122d45c-5269-11df-8d26-080069138b88" uid="19230">
-        <specific value="1" description="524 Yuen Feng" uuid="f123e31a-5269-11df-9aba-080069138b88" uid="19231"/>
-        <specific value="2" description="525 Wu Kang" uuid="f124f390-5269-11df-aa48-080069138b88" uid="19232"/>
-        <specific value="3" description="526 Hsin Kang" uuid="f125fbbe-5269-11df-adb0-080069138b88" uid="19233"/>
-      </subcategory>
-    </category>
-    <category value="60" description="Fast Combat Support Ship" uuid="f128527e-5269-11df-aedc-080069138b88" uid="19234">
-      <subcategory value="1" description="Wu Yi Class" uuid="f1295cc8-5269-11df-a8d8-080069138b88" uid="19235">
-        <specific value="1" description="530 Wu Yi" uuid="f12a6c76-5269-11df-9ea9-080069138b88" uid="19236"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="4" country="208" uuid="f12d5d96-5269-11df-8a94-080069138b88" uid="19237">
-    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="f12e6bfa-5269-11df-a527-080069138b88" uid="19238">
-      <subcategory value="1" description="Hai Shih (ex. Guppy II)" uuid="f12f7bf8-5269-11df-9674-080069138b88" uid="19239">
-        <specific value="1" description="791 Hai Shih" uuid="f1308aa2-5269-11df-a50a-080069138b88" uid="19240"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="2" uuid="f1337d8e-5269-11df-bfb0-080069138b88" uid="19241">
-    <category value="61" description="Non-Combatant Ship" uuid="f1348a08-5269-11df-8395-080069138b88" uid="19242">
-      <subcategory value="1" description="Container Class" uuid="f1359452-5269-11df-ba85-080069138b88" uid="19243">
-        <specific value="1" description="Florida" uuid="f136b24c-5269-11df-9ac9-080069138b88" uid="19244"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="15" uuid="f139a682-5269-11df-939c-080069138b88" uid="19245">
-    <category value="61" description="Non-Combatant Ship" uuid="f13ab36a-5269-11df-afba-080069138b88" uid="19246">
-      <subcategory value="1" description="Container Class" uuid="f13bbdbe-5269-11df-8ab4-080069138b88" uid="19247">
-        <specific value="1" description="Chicago Express" uuid="f13cd05a-5269-11df-805b-080069138b88" uid="19248"/>
-        <specific value="2" description="Sea Leader" uuid="f13ddec8-5269-11df-8fb4-080069138b88" uid="19249"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="f13f96aa-5269-11df-91c2-080069138b88" uid="19250">
-        <specific value="1" description="Berge Hus" uuid="f140a4e6-5269-11df-9b44-080069138b88" uid="19251"/>
-        <specific value="2" description="Mosocean" uuid="f141b43a-5269-11df-9c97-080069138b88" uid="19252"/>
-        <specific value="3" description="Orient Tiger" uuid="f142c23a-5269-11df-be4a-080069138b88" uid="19253"/>
-        <specific value="4" description="Ramlah" uuid="f143cbc6-5269-11df-96ad-080069138b88" uid="19254"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="22" uuid="f146bdf4-5269-11df-bc41-080069138b88" uid="19255">
-    <category value="61" description="Non-Combatant Ship" uuid="f147cb68-5269-11df-bb17-080069138b88" uid="19256">
-      <subcategory value="1" description="Container Class" uuid="f148d45e-5269-11df-b748-080069138b88" uid="19257">
-        <specific value="1" description="Boka Star" uuid="f149e790-5269-11df-910e-080069138b88" uid="19258"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="24" uuid="f14cd982-5269-11df-b488-080069138b88" uid="19259">
-    <category value="61" description="Non-Combatant Ship" uuid="f14de7e6-5269-11df-aa2a-080069138b88" uid="19260">
-      <subcategory value="1" description="Container Class" uuid="f14ef096-5269-11df-aadc-080069138b88" uid="19261">
-        <specific value="1" description="Corner Brook" uuid="f15002ec-5269-11df-9998-080069138b88" uid="19262"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="55" uuid="f152f65a-5269-11df-8a2a-080069138b88" uid="19263">
-    <category value="61" description="Non-Combatant Ship" uuid="f1540428-5269-11df-817f-080069138b88" uid="19264">
-      <subcategory value="1" description="Container Class" uuid="f1550cc4-5269-11df-aaff-080069138b88" uid="19265">
-        <specific value="1" description="Yukon" uuid="f1561cfe-5269-11df-a5b8-080069138b88" uid="19266"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="f157ce14-5269-11df-a26c-080069138b88" uid="19267">
-        <specific value="1" description="Beltrade" uuid="f158dcaa-5269-11df-b83c-080069138b88" uid="19268"/>
-        <specific value="2" description="Fulmar" uuid="f159e51e-5269-11df-88d8-080069138b88" uid="19269"/>
-        <specific value="3" description="Messiniakos" uuid="f15af792-5269-11df-ac5f-080069138b88" uid="19270"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="1" country="82" status="new" uuid="4be1ddb6-d85b-41e6-bc27-5b732876d485" uid="22791">
-    <cr value="1633"/>
-    <category value="1" description="Tank" status="new" uuid="c8ad4788-8049-4cc3-807c-4a505ff763d4" uid="22792">
-      <cr value="1633"/>
-      <subcategory value="1" description="Leopard 2 MBT (variation)" status="new" uuid="b405af7b-7f23-4d00-b417-e7b934fb819a" uid="22793">
-        <cr value="1633"/>
-        <specific value="1" description="Leopard 2 A6 HEL" status="new" uuid="2f60b565-31f7-4bfa-a6a1-35e6c3ce521b" uid="22794">
-          <cr value="1633"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="82" uuid="f15df2da-5269-11df-8efc-080069138b88" uid="19271">
-    <category value="61" description="Non-Combatant Ship" uuid="f15f013e-5269-11df-a94e-080069138b88" uid="19272">
-      <subcategory value="1" description="Container Class" uuid="f1600ae8-5269-11df-b3d0-080069138b88" uid="19273">
-        <specific value="1" description="Daedalus" uuid="f1611afa-5269-11df-9420-080069138b88" uid="19274"/>
-        <specific value="2" description="Fedra" uuid="f1622cba-5269-11df-ab2a-080069138b88" uid="19275"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="f163d952-5269-11df-8d58-080069138b88" uid="19276">
-        <specific value="1" description="Althea" uuid="f164e086-5269-11df-a416-080069138b88" uid="19277"/>
-        <specific value="2" description="Olympic Loyalty" uuid="f165f188-5269-11df-9220-080069138b88" uid="19278"/>
-        <specific value="3" description="Peaceventure L" uuid="f16700d2-5269-11df-800f-080069138b88" uid="19279"/>
-      </subcategory>
-      <subcategory value="3" description="Supertanker" uuid="f168b076-5269-11df-a783-080069138b88" uid="19280">
-        <specific value="1" description="H. Alhambra" uuid="f169b8f4-5269-11df-bb8d-080069138b88" uid="19281"/>
-        <specific value="2" description="H. Metropolis" uuid="f16ac91a-5269-11df-bf01-080069138b88" uid="19282"/>
-        <specific value="3" description="H. Fairfax" uuid="f16bdc10-5269-11df-9971-080069138b88" uid="19283"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="125" uuid="f16ec7ea-5269-11df-b3a0-080069138b88" uid="19284">
-    <category value="61" description="Non-Combatant Ship" uuid="f16fd5e0-5269-11df-b700-080069138b88" uid="19285">
-      <subcategory value="1" description="Container Class" uuid="f170e976-5269-11df-a2eb-080069138b88" uid="19286">
-        <specific value="1" description="Jolly Orca" uuid="f171f550-5269-11df-818b-080069138b88" uid="19287"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="f173a3dc-5269-11df-a398-080069138b88" uid="19288">
-        <specific value="1" description="Almak" uuid="f174b088-5269-11df-9f58-080069138b88" uid="19289"/>
-        <specific value="2" description="Alphard Star" uuid="f175c36a-5269-11df-877e-080069138b88" uid="19290"/>
-        <specific value="3" description="Amber Lady" uuid="f176ccb0-5269-11df-b419-080069138b88" uid="19291"/>
-        <specific value="4" description="Front Chief" uuid="f177d9e8-5269-11df-a287-080069138b88" uid="19292"/>
-        <specific value="5" description="Ish" uuid="f178e9b4-5269-11df-8586-080069138b88" uid="19293"/>
-        <specific value="6" description="Khannur" uuid="f179f642-5269-11df-b629-080069138b88" uid="19294"/>
-        <specific value="7" description="Kuban" uuid="f17b0456-5269-11df-b9c3-080069138b88" uid="19295"/>
-        <specific value="8" description="New Vitality" uuid="f17c1896-5269-11df-8b51-080069138b88" uid="19296"/>
-        <specific value="9" description="Ocean Guardian" uuid="f17d24ac-5269-11df-86d9-080069138b88" uid="19297"/>
-        <specific value="10" description="Polaris Star" uuid="f17e389c-5269-11df-9ec8-080069138b88" uid="19298"/>
-        <specific value="11" description="Shahamah" uuid="f17f4804-5269-11df-95b5-080069138b88" uid="19299"/>
-        <specific value="12" description="Tarquin Navigator" uuid="f18052d0-5269-11df-b4fb-080069138b88" uid="19300"/>
-        <specific value="13" description="Igloo Star" uuid="f18165a8-5269-11df-ad00-080069138b88" uid="19301"/>
-        <specific value="14" description="SC Breeze" uuid="f18274de-5269-11df-b381-080069138b88" uid="19302"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="168" uuid="f1855ff0-5269-11df-b409-080069138b88" uid="19303">
-    <category value="61" description="Non-Combatant Ship" uuid="f186707a-5269-11df-aab1-080069138b88" uid="19304">
-      <subcategory value="1" description="Container Class" uuid="f187806e-5269-11df-a114-080069138b88" uid="19305">
-        <specific value="1" description="Pollux" uuid="f1888f54-5269-11df-b956-080069138b88" uid="19306"/>
-        <specific value="2" description="Sima Roja" uuid="f18999a8-5269-11df-97a4-080069138b88" uid="19307"/>
-        <specific value="3" description="Stellar Might" uuid="f18aa7b2-5269-11df-b1a0-080069138b88" uid="19308"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="f18c5af8-5269-11df-9fdb-080069138b88" uid="19309">
-        <specific value="1" description="Navix Astral" uuid="f18d6984-5269-11df-9ef9-080069138b88" uid="19310"/>
-        <specific value="2" description="Oriental Daisy" uuid="f18e720c-5269-11df-ac32-080069138b88" uid="19311"/>
-        <specific value="3" description="Pacific Lagoon" uuid="f18f8624-5269-11df-aa1d-080069138b88" uid="19312"/>
-        <specific value="4" description="World Princess" uuid="f1909546-5269-11df-a53d-080069138b88" uid="19313"/>
-        <specific value="5" description="Nereo" uuid="f1919eaa-5269-11df-8215-080069138b88" uid="19314"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="173" uuid="f1949092-5269-11df-8652-080069138b88" uid="19315">
-    <category value="61" description="Non-Combatant Ship" uuid="f1959c94-5269-11df-984c-080069138b88" uid="19316">
-      <subcategory value="1" description="Container Class" uuid="f196aa26-5269-11df-84f7-080069138b88" uid="19317">
-        <specific value="1" description="Endeavour" uuid="f197b948-5269-11df-a790-080069138b88" uid="19318"/>
-        <specific value="2" description="General Villa" uuid="f198c7a2-5269-11df-b855-080069138b88" uid="19319"/>
-        <specific value="3" description="Handy Gunner" uuid="f199d41c-5269-11df-a11e-080069138b88" uid="19320"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="193" uuid="f19ccc76-5269-11df-8e6f-080069138b88" uid="19321">
-    <category value="61" description="Non-Combatant Ship" uuid="f19dde5e-5269-11df-a7f6-080069138b88" uid="19322">
-      <subcategory value="1" description="Container Class" uuid="f19ee7fe-5269-11df-9a18-080069138b88" uid="19323">
-        <specific value="1" description="Neptune Pearl" uuid="f19ff7f2-5269-11df-9f04-080069138b88" uid="19324"/>
-      </subcategory>
-      <subcategory value="2" description="Tanker Class" uuid="f1a1a85e-5269-11df-af0b-080069138b88" uid="19325">
-        <specific value="1" description="Argo Pallas" uuid="f1a2ba1e-5269-11df-a1d2-080069138b88" uid="19326"/>
-        <specific value="2" description="Evelyn Maersk" uuid="f1a3c2f6-5269-11df-9bcb-080069138b88" uid="19327"/>
-        <specific value="3" description="Jront Highness" uuid="f1a4d330-5269-11df-83d9-080069138b88" uid="19328"/>
-        <specific value="4" description="Pacific Harmony" uuid="f1a5e66c-5269-11df-8f1d-080069138b88" uid="19329"/>
-        <specific value="5" description="Fidelity" uuid="f1a6f020-5269-11df-acea-080069138b88" uid="19330"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="249" uuid="f1a9e1d6-5269-11df-9a76-080069138b88" uid="19331">
-    <category value="7" description="Light/Patrol Craft" uuid="f1aaf0bc-5269-11df-9c2c-080069138b88" uid="19332">
-      <subcategory value="1" description="Koncar (Type R-02) Class (Fast Attack Craft-Missile) (PCFG)" uuid="f1abfbc4-5269-11df-9f2b-080069138b88" uid="19333">
-        <specific value="1" description="RTOP 21 Sibenik" uuid="f1ad1158-5269-11df-a62d-080069138b88" uid="19334"/>
-      </subcategory>
-    </category>
-    <category value="50" description="Frigate (including Corvettes)" uuid="f1af5dc8-5269-11df-9e76-080069138b88" uid="19335">
-      <subcategory value="1" description="Kralj (Type R-03) Class (FSG)" uuid="f1b07190-5269-11df-afdd-080069138b88" uid="19336">
-        <specific value="1" description="RTOP 11 Kralj Petar Kresimir IV" uuid="f1b182d8-5269-11df-afcd-080069138b88" uid="19337"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="165" uuid="f1b477b8-5269-11df-9e93-080069138b88" uid="19338">
-    <category value="7" description="Light/Patrol Craft" uuid="f1b58694-5269-11df-9dc6-080069138b88" uid="19339">
-      <subcategory value="1" description="Town Class (Large Patrol Craft) (PC)" uuid="f1b69016-5269-11df-b864-080069138b88" uid="19340"/>
-      <subcategory value="2" description="Larkana Class (Large Patrol Class) (PC)" uuid="f1b7a3f2-5269-11df-b877-080069138b88" uid="19341"/>
-      <subcategory value="3" description="Barkat Class" uuid="f1b8ba58-5269-11df-bd37-080069138b88" uid="19342"/>
-    </category>
-    <category value="16" description="Auxiliary" uuid="f1ba71c2-5269-11df-a653-080069138b88" uid="19343">
-      <subcategory value="1" description="Fuqing Class (AOR)" uuid="f1bb7a90-5269-11df-bf9b-080069138b88" uid="19344">
-        <specific value="1" description="A47 Nasr" uuid="f1bc8c14-5269-11df-b9ce-080069138b88" uid="19345"/>
-      </subcategory>
-      <subcategory value="2" description="Coastal Tankers (AOTL)" uuid="f1be4040-5269-11df-9c56-080069138b88" uid="19346">
-        <specific value="1" description="A49 Gwadar" uuid="f1bf4f44-5269-11df-b28c-080069138b88" uid="19347"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="29" uuid="f1c23f7e-5269-11df-83d8-080069138b88" uid="19348">
-    <category value="4" description="Self-propelled Artillery" uuid="f1c34d6a-5269-11df-a477-080069138b88" uid="19349">
-      <subcategory value="1" description="Launcher ASTROS AV-LMU" uuid="f1c45ea8-5269-11df-8144-080069138b88" uid="19350"/>
-    </category>
-    <category value="7" description="Large Wheeled Utility Vehicle" uuid="f1c60f50-5269-11df-8081-080069138b88" uid="19351">
-      <subcategory value="1" description="Tectran Enginharia" uuid="f1c721d8-5269-11df-a538-080069138b88" uid="19352">
-        <specific value="1" description="ASTROS Resupply AV-RMD" uuid="f1c82c7c-5269-11df-9091-080069138b88" uid="19353"/>
-      </subcategory>
-    </category>
-    <category value="37" description="Fire Control Facility" uuid="f1ca81ca-5269-11df-88aa-080069138b88" uid="19354">
-      <subcategory value="1" description="ASTROS Fire Control Vehicle AV-VCC" uuid="f1cb8e62-5269-11df-bdd5-080069138b88" uid="19355"/>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="176" uuid="f1cde414-5269-11df-a3bb-080069138b88" uid="19356">
-    <category value="61" description="PRT Non-Combatant Ship" uuid="f1cef7f0-5269-11df-97d4-080069138b88" uid="19357">
-      <subcategory value="1" description="PRT Ship Container Class" uuid="f1d009e2-5269-11df-8562-080069138b88" uid="19358"/>
-      <subcategory value="2" description="PRT Ship Tanker Class" uuid="f1d11d78-5269-11df-9e9b-080069138b88" uid="19359"/>
-      <subcategory value="3" description="PRT Ship Commercial Large (&gt; 30m)" uuid="f1d22786-5269-11df-b9d2-080069138b88" uid="19360"/>
-      <subcategory value="4" description="PRT Boat Commercial Medium (10m to 29m)" uuid="f1d33aea-5269-11df-be9e-080069138b88" uid="19361"/>
-      <subcategory value="5" description="PRT Boat Commercial Small (&lt;10m)" uuid="f1d44e76-5269-11df-86f6-080069138b88" uid="19362"/>
-      <subcategory value="6" description="PRT Sailboat Commercial Two-Mast" uuid="f1d55b0e-5269-11df-971d-080069138b88" uid="19363"/>
-      <subcategory value="7" description="PRT Sailboat Commercial One-Mast" uuid="f1d66b20-5269-11df-b770-080069138b88" uid="19364"/>
-      <subcategory value="9" description="PRT Boat Private Very Small (&lt; 3m)" uuid="f1d78122-5269-11df-9082-080069138b88" uid="19365">
-        <specific value="1" description="PRT Boat Private Very Small Outboard" uuid="f1d894c2-5269-11df-be7e-080069138b88" uid="19366"/>
-        <specific value="2" description="PRT Boat Private Very Small Inboard" uuid="f1d9a84e-5269-11df-baf8-080069138b88" uid="19367"/>
-      </subcategory>
-      <subcategory value="10" description="PRT Boat Private Small (3m to 5m)" uuid="f1db5cb6-5269-11df-b523-080069138b88" uid="19368">
-        <specific value="1" description="PRT Boat Private Very Small Outboard" uuid="f1dc6b74-5269-11df-9a09-080069138b88" uid="19369"/>
-        <specific value="2" description="PRT Boat Private Very Small Inboard" uuid="f1dd79ba-5269-11df-979b-080069138b88" uid="19370"/>
-      </subcategory>
-      <subcategory value="11" description="PRT Boat Private Medium (6m to 10m)" uuid="f1df2e68-5269-11df-bdd4-080069138b88" uid="19371">
-        <specific value="1" description="PRT Boat Private Medium Motor Yacht" uuid="f1e03f10-5269-11df-aace-080069138b88" uid="19372"/>
-      </subcategory>
-      <subcategory value="12" description="PRT Boat Private Large (11m to 15m)" uuid="f1e1f3c8-5269-11df-a1e9-080069138b88" uid="19373">
-        <specific value="1" description="PRT Boat Private Large Yacht" uuid="f1e30498-5269-11df-99b7-080069138b88" uid="19374"/>
-      </subcategory>
-      <subcategory value="13" description="PRT Boat Private Very Large (&gt; 15m)" uuid="f1e4b45a-5269-11df-a115-080069138b88" uid="19375">
-        <specific value="1" description="PRT Boat Private Very Large Yacht" uuid="f1e5c368-5269-11df-acae-080069138b88" uid="19376"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="1" domain="3" country="0" uuid="f1e8b32a-5269-11df-bc86-080069138b88" uid="19377">
-    <category value="61" description="Non-Combatant Ship" uuid="f1e9c4cc-5269-11df-a225-080069138b88" uid="19378">
-      <subcategory value="1" description="Generic Ship Container Class" uuid="f1eacf20-5269-11df-a845-080069138b88" uid="19379"/>
-      <subcategory value="2" description="Generic Ship Tanker Class" uuid="f1ebdfaa-5269-11df-8dab-080069138b88" uid="19380"/>
-      <subcategory value="3" description="Generic Ship Commercial Large (&gt; 30m)" uuid="f1ecf41c-5269-11df-8641-080069138b88" uid="19381"/>
-      <subcategory value="4" description="Generic Boat Commercial Medium (10m to 29m)" uuid="f1ee05a0-5269-11df-950c-080069138b88" uid="19382"/>
-      <subcategory value="5" description="Generic Boat Commercial Small (&lt;10m)" uuid="f1ef18e6-5269-11df-b90f-080069138b88" uid="19383"/>
-      <subcategory value="6" description="Generic Sailboat Commercial Two-Mast" uuid="f1f02bdc-5269-11df-8f7e-080069138b88" uid="19384"/>
-      <subcategory value="7" description="Generic Sailboat Commercial One-Mast" uuid="f1f1378e-5269-11df-bcb8-080069138b88" uid="19385"/>
-      <subcategory value="9" description="Generic Boat Private Very Small (&lt; 3m)" uuid="f1f24b1a-5269-11df-827e-080069138b88" uid="19386">
-        <specific value="1" description="Generic Boat Private Very Small Outboard" uuid="f1f361a8-5269-11df-b027-080069138b88" uid="19387"/>
-        <specific value="2" description="Generic Boat Private Very Small Inboard" uuid="f1f46d46-5269-11df-b28c-080069138b88" uid="19388"/>
-      </subcategory>
-      <subcategory value="10" description="Generic Boat Private Small (3m to 5m)" uuid="f1f61ba0-5269-11df-989f-080069138b88" uid="19389">
-        <specific value="1" description="Generic Boat Private Very Small Outboard" uuid="f1f7367a-5269-11df-a639-080069138b88" uid="19390"/>
-        <specific value="2" description="Generic Boat Private Very Small Inboard" uuid="f1f84d26-5269-11df-b0b6-080069138b88" uid="19391"/>
-      </subcategory>
-      <subcategory value="11" description="Generic Boat Private Medium (6m to 10m)" uuid="f1f9fd7e-5269-11df-9017-080069138b88" uid="19392">
-        <specific value="1" description="Generic Boat Private Medium Motor Yacht" uuid="f1fb08d6-5269-11df-bd51-080069138b88" uid="19393"/>
-      </subcategory>
-      <subcategory value="12" description="Generic Boat Private Large (11m to 15m)" uuid="f1fcbd16-5269-11df-a9b1-080069138b88" uid="19394">
-        <specific value="1" description="Generic Boat Private Large Yacht" uuid="f1fdcec2-5269-11df-a7fa-080069138b88" uid="19395"/>
-      </subcategory>
-      <subcategory value="13" description="Generic Boat Private Very Large (&gt; 15m)" uuid="f1ff8064-5269-11df-bacc-080069138b88" uid="19396">
-        <specific value="1" description="Generic Boat Private Very Large Yacht" uuid="f2009364-5269-11df-8f24-080069138b88" uid="19397"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="0" country="225" uuid="f203810a-5269-11df-9517-080069138b88" uid="19398">
-    <category value="1" description="Guided" uuid="f2048f0a-5269-11df-a488-080069138b88" uid="19399">
-      <subcategory value="1" description="Deadeye 5-in. projectile" uuid="f2059ddc-5269-11df-955a-080069138b88" uid="19400"/>
-    </category>
-    <category value="3" description="Fixed" uuid="f2074f1a-5269-11df-b367-080069138b88" uid="19401">
-      <subcategory value="1" description="Mine-clearing torpedo, Bangalore" uuid="f2085c34-5269-11df-9f9b-080069138b88" uid="19402">
-        <specific value="1" description="M1A1" uuid="f209680e-5269-11df-9dec-080069138b88" uid="19403"/>
-        <specific value="2" description="M1A2" uuid="f20a76ae-5269-11df-833d-080069138b88" uid="19404"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="225" uuid="f20d6ada-5269-11df-910e-080069138b88" uid="19405">
-    <category value="1" description="Guided" uuid="f20e76dc-5269-11df-bf89-080069138b88" uid="19406">
-      <subcategory value="1" description="AIM-9 Sidewinder" uuid="f20f839c-5269-11df-9cbd-080069138b88" uid="19407">
-        <specific value="1" description="AIM-9B" uuid="f210923c-5269-11df-9e8a-080069138b88" uid="19408"/>
-        <specific value="2" description="AIM-9D" uuid="f211a046-5269-11df-8e91-080069138b88" uid="19409"/>
-        <specific value="3" description="AIM-9L/M/S" uuid="f212ad24-5269-11df-8f66-080069138b88" uid="19410">
-          <extra value="1" description="AIM-9L" uuid="f213bad4-5269-11df-bedd-080069138b88" uid="19411"/>
-          <extra value="2" description="AIM-9M" uuid="f214cc3a-5269-11df-9053-080069138b88" uid="19412"/>
-          <extra value="3" description="AIM-9M-7" uuid="f215db16-5269-11df-857d-080069138b88" uid="19413"/>
-          <extra value="4" description="AIM-9S" uuid="f216ece0-5269-11df-bc3c-080069138b88" uid="19414"/>
-        </specific>
-        <specific value="4" description="AIM-9P" uuid="f2189e6e-5269-11df-8100-080069138b88" uid="19415"/>
-        <specific value="5" description="AIM-9R" uuid="f219aca0-5269-11df-9869-080069138b88" uid="19416"/>
-        <specific value="6" description="AIM-9X" uuid="f21ab4a6-5269-11df-90d9-080069138b88" uid="19417"/>
-        <specific value="7" description="AIM-9J" uuid="f21bc67a-5269-11df-a5fd-080069138b88" uid="19418"/>
-      </subcategory>
-      <subcategory value="2" description="AIM-120 Advanced Medium-Range Air-to-Air Missile (AMRAAM)" uuid="f21d7a56-5269-11df-9297-080069138b88" uid="19419">
-        <specific value="1" description="AIM-120A" uuid="f21e8bc6-5269-11df-8297-080069138b88" uid="19420"/>
-        <specific value="2" description="AIM-120B" uuid="f21f94e4-5269-11df-a8c2-080069138b88" uid="19421"/>
-        <specific value="3" description="AIM-120C" uuid="f220a53c-5269-11df-be2f-080069138b88" uid="19422"/>
-      </subcategory>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f222577e-5269-11df-8878-080069138b88" uid="19423"/>
-      <subcategory value="4" description="Falcon" uuid="f223679a-5269-11df-aef1-080069138b88" uid="19424">
-        <specific value="1" description="AIM-4D" uuid="f2246e9c-5269-11df-9d30-080069138b88" uid="19425"/>
-        <specific value="2" description="AIM-4F" uuid="f2257db4-5269-11df-8dce-080069138b88" uid="19426"/>
-        <specific value="3" description="AIM-4G" uuid="f2268f9c-5269-11df-991d-080069138b88" uid="19427"/>
-        <specific value="4" description="AIM-26" uuid="f2279ec8-5269-11df-b684-080069138b88" uid="19428"/>
-        <specific value="5" description="AIM-26B" uuid="f228b07e-5269-11df-a79d-080069138b88" uid="19429"/>
-      </subcategory>
-      <subcategory value="5" description="MIM-72 Chaparral" uuid="f22a62b6-5269-11df-8f97-080069138b88" uid="19430"/>
-      <subcategory value="6" description="MIM-23 Hawk C/E/F/G/H" uuid="f22b76ce-5269-11df-81a0-080069138b88" uid="19431">
-        <specific value="1" description="MIM-23B I-Hawk" uuid="f22c8190-5269-11df-92df-080069138b88" uid="19432"/>
-        <specific value="2" description="Hawk PIP" uuid="f22d91a2-5269-11df-836f-080069138b88" uid="19433"/>
-      </subcategory>
-      <subcategory value="7" description="MLMS" uuid="f22f4466-5269-11df-baa0-080069138b88" uid="19434"/>
-      <subcategory value="8" description="AIM-54 Phoenix" uuid="f2305716-5269-11df-ab6a-080069138b88" uid="19435">
-        <specific value="1" description="AIM-54A" uuid="f23160b6-5269-11df-aa3f-080069138b88" uid="19436"/>
-        <specific value="2" description="AIM-54C" uuid="f232706e-5269-11df-a319-080069138b88" uid="19437"/>
-      </subcategory>
-      <subcategory value="9" description="Rapier UK" uuid="f234218e-5269-11df-95ee-080069138b88" uid="19438"/>
-      <subcategory value="10" description="FIM-43 Redeye" uuid="f2353f42-5269-11df-b270-080069138b88" uid="19439"/>
-      <subcategory value="11" description="Roland" uuid="f23649fa-5269-11df-8c39-080069138b88" uid="19440"/>
-      <subcategory value="12" description="Sea Sparrow" uuid="f2375a84-5269-11df-91e9-080069138b88" uid="19441">
-        <specific value="1" description="RIM-7H" uuid="f2386d16-5269-11df-84a2-080069138b88" uid="19442"/>
-        <specific value="2" description="Evolved Sea Sparrow Missile (ESSM)" uuid="f2397ad0-5269-11df-a7a1-080069138b88" uid="19443">
-          <extra value="1" description="RIM-162A" uuid="f23a8ae2-5269-11df-af9c-080069138b88" uid="19444"/>
-          <extra value="2" description="RIM-162B" uuid="f23b9d74-5269-11df-8345-080069138b88" uid="19445"/>
-          <extra value="3" description="RIM-162C" uuid="f23ca908-5269-11df-aec8-080069138b88" uid="19446"/>
-          <extra value="4" description="RIM-162D" uuid="f23dbaaa-5269-11df-b07b-080069138b88" uid="19447"/>
-        </specific>
-      </subcategory>
-      <subcategory value="13" description="Sparrow" uuid="f24008aa-5269-11df-a465-080069138b88" uid="19448">
-        <specific value="1" description="AIM-7F" uuid="f2411ba0-5269-11df-99f0-080069138b88" uid="19449"/>
-        <specific value="2" description="AIM-7M" uuid="f2422bb2-5269-11df-9328-080069138b88" uid="19450"/>
-        <specific value="3" description="AIM-7P" uuid="f2433dfe-5269-11df-80e4-080069138b88" uid="19451"/>
-        <specific value="4" description="AIM-7R (multimode seeker)" uuid="f24446fe-5269-11df-b3f0-080069138b88" uid="19452"/>
-        <specific value="5" description="AIM-7MH" uuid="f2455a9e-5269-11df-a9ea-080069138b88" uid="19453"/>
-      </subcategory>
-      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="f2470bc8-5269-11df-8cbd-080069138b88" uid="19454"/>
-      <subcategory value="15" description="Stinger" uuid="f2481d4c-5269-11df-b424-080069138b88" uid="19455">
-        <specific value="1" description="FIM-92 Stinger A/B/C" uuid="f2492688-5269-11df-bf89-080069138b88" uid="19456"/>
-        <specific value="2" description="Stinger Post" uuid="f24a3ac8-5269-11df-9389-080069138b88" uid="19457"/>
-        <specific value="3" description="Stinger RMP" uuid="f24b4b0c-5269-11df-a4af-080069138b88" uid="19458"/>
-        <specific value="4" description="Stinger ATAS" uuid="f24c561e-5269-11df-a54a-080069138b88" uid="19459"/>
-      </subcategory>
-      <subcategory value="16" description="MIM-104 Patriot" uuid="f24e0aa4-5269-11df-a7fa-080069138b88" uid="19460">
-        <specific value="1" description="PAC-2" uuid="f24f1a7a-5269-11df-8da8-080069138b88" uid="19461">
-          <extra value="1" description="Standard" uuid="f25028e8-5269-11df-a058-080069138b88" uid="19462"/>
-          <extra value="2" description="GEM" uuid="f251349a-5269-11df-8be5-080069138b88" uid="19463"/>
-        </specific>
-        <specific value="2" description="PAC-3 (ERINT)" uuid="f252e5c4-5269-11df-b84e-080069138b88" uid="19464"/>
-      </subcategory>
-      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="f254a170-5269-11df-a8db-080069138b88" uid="19465"/>
-      <subcategory value="18" description="(deprecated)" deprecated="1" uuid="f255b42a-5269-11df-b56c-080069138b88" uid="19466"/>
-      <subcategory value="19" description="ADATS" uuid="f256c798-5269-11df-865c-080069138b88" uid="19467"/>
-      <subcategory value="20" description="MIM-14B Nike-Hercules" uuid="f257dade-5269-11df-921e-080069138b88" uid="19468"/>
-      <subcategory value="21" description="Theater High-Altitude Area Defense (THAAD)" uuid="f258e730-5269-11df-8b31-080069138b88" uid="19469"/>
-      <subcategory value="22" description="LTV Extended Range Interceptor (ERINT)" deprecated="1" uuid="f259fb52-5269-11df-bf84-080069138b88" uid="19470"/>
-      <subcategory value="23" description="(deprecated)" deprecated="1" uuid="f25b1578-5269-11df-8848-080069138b88" uid="19471"/>
-      <subcategory value="24" description="(deprecated)" deprecated="1" uuid="f25c21ca-5269-11df-9abf-080069138b88" uid="19472"/>
-      <subcategory value="25" description="(deprecated)" deprecated="1" uuid="f25d3330-5269-11df-a44f-080069138b88" uid="19473"/>
-      <subcategory value="26" description="(deprecated)" deprecated="1" uuid="f25e45ea-5269-11df-846a-080069138b88" uid="19474"/>
-      <subcategory value="27" description="Standard Missile" uuid="f25f56ce-5269-11df-9b3e-080069138b88" uid="19475">
-        <specific value="1" description="Standard MR (RIM-66)" uuid="f260660e-5269-11df-b70a-080069138b88" uid="19476">
-          <extra value="1" description="SM-1 Block 5 MR" uuid="f2617710-5269-11df-a1ea-080069138b88" uid="19477"/>
-          <extra value="2" description="SM-1 Block 6B" uuid="f26283d0-5269-11df-bbb3-080069138b88" uid="19478"/>
-          <extra value="3" description="SM-2 Block 2 MR" uuid="f26394d2-5269-11df-996b-080069138b88" uid="19479"/>
-          <extra value="4" description="SM-2 Block 3 MR" uuid="f264a368-5269-11df-bf08-080069138b88" uid="19480"/>
-          <extra value="5" description="SM-2 Block 3A MR" uuid="f265ae52-5269-11df-aee4-080069138b88" uid="19481"/>
-          <extra value="6" description="SM-2 Block 3B" uuid="f266c2b0-5269-11df-be98-080069138b88" uid="19482"/>
-          <extra value="7" description="SM-2 Block 4" deprecated="1" uuid="f267d1dc-5269-11df-bc34-080069138b88" uid="19483"/>
-          <extra value="8" description="SM-2 Block 6 MR" uuid="f268dc3a-5269-11df-b54d-080069138b88" uid="19484"/>
-          <extra value="9" description="SM-2 Block 4A" deprecated="1" uuid="f269ee2c-5269-11df-935b-080069138b88" uid="19485"/>
-        </specific>
-        <specific value="2" description="Standard ER (RIM-67)" uuid="f26ba17c-5269-11df-99b7-080069138b88" uid="19486">
-          <extra value="1" description="SM-2 Block 4" uuid="f26cb134-5269-11df-8dac-080069138b88" uid="19487"/>
-          <extra value="2" description="SM-2 Block 4A" uuid="f26dbab6-5269-11df-8874-080069138b88" uid="19488"/>
-        </specific>
-        <specific value="3" description="Standard BMD (RIM-61)" uuid="f26f6cf8-5269-11df-a888-080069138b88" uid="19489">
-          <extra value="1" description="SM-3 Boost Phase Vehicle" uuid="f2707d50-5269-11df-8127-080069138b88" uid="19490"/>
-          <extra value="2" description="SM-3 Second Stage Vehicle" uuid="f2718e98-5269-11df-92d7-080069138b88" uid="19491"/>
-          <extra value="3" description="SM-3 Third Stage Vehicle" uuid="f272a4fe-5269-11df-9b2b-080069138b88" uid="19492"/>
-          <extra value="4" description="SM-3 Separated Kill Vehicle (KV)" uuid="f273b61e-5269-11df-ac70-080069138b88" uid="19493"/>
-          <extra value="5" description="SM-3 Jettisoned first stage" uuid="f274c7fc-5269-11df-963c-080069138b88" uid="19494"/>
-          <extra value="6" description="SM-3 Jettisoned second stage" uuid="f275d5c0-5269-11df-8dfa-080069138b88" uid="19495"/>
-          <extra value="7" description="SM-3 Jettisoned third stage" uuid="f276e5e6-5269-11df-95eb-080069138b88" uid="19496"/>
-          <extra value="8" description="SM-3 Block 1 Kill Weapon (KW)" uuid="f277faf8-5269-11df-8ebe-080069138b88" uid="19497"/>
-        </specific>
-      </subcategory>
-      <subcategory value="28" description="Mk 49 RAM" uuid="f27a4bdc-5269-11df-9357-080069138b88" uid="19498"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f27bfdb0-5269-11df-9db2-080069138b88" uid="19499">
-      <subcategory value="1" description="3-in, .50 caliber" uuid="f27d0b10-5269-11df-9528-080069138b88" uid="19500"/>
-      <subcategory value="2" description="12.7-mm/.50 caliber" uuid="f27e1a00-5269-11df-b403-080069138b88" uid="19501">
-        <specific value="1" description="M2 AP" uuid="f27f2b20-5269-11df-8f38-080069138b88" uid="19502"/>
-        <specific value="2" description="M8 API" uuid="f28039f2-5269-11df-a29d-080069138b88" uid="19503"/>
-        <specific value="3" description="M20 API-T" uuid="f28145c2-5269-11df-9a06-080069138b88" uid="19504"/>
-        <specific value="4" description="M2 ball" uuid="f282569c-5269-11df-9e10-080069138b88" uid="19505"/>
-        <specific value="5" description="M33 ball" uuid="f2836640-5269-11df-a1ef-080069138b88" uid="19506"/>
-        <specific value="6" description="M1 incediary" uuid="f284710c-5269-11df-9ef5-080069138b88" uid="19507"/>
-        <specific value="7" description="M23 incendiary" uuid="f2858060-5269-11df-beb0-080069138b88" uid="19508"/>
-      </subcategory>
-      <subcategory value="3" description="20-mm" uuid="f287355e-5269-11df-925b-080069138b88" uid="19509">
-        <specific value="1" description="M56A4 HEI/M242 HEI-T 7:1 ratio" uuid="f28844d0-5269-11df-b5b0-080069138b88" uid="19510"/>
-        <specific value="2" description="PGU-28/B SAPHEI" uuid="f2895456-5269-11df-8457-080069138b88" uid="19511"/>
-        <specific value="3" description="M246 HEIT-SD" uuid="f28a6468-5269-11df-8297-080069138b88" uid="19512"/>
-        <specific value="4" description="M940 MPT-SD" uuid="f28b78da-5269-11df-a1b3-080069138b88" uid="19513"/>
-        <specific value="5" description="MK149 APDS" uuid="f28c8392-5269-11df-88ac-080069138b88" uid="19514"/>
-        <specific value="6" description="MK244 Mod 0 (tungsten)" uuid="f28d941c-5269-11df-8119-080069138b88" uid="19515"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Fixed" uuid="f28fe816-5269-11df-8070-080069138b88" uid="19516">
-      <subcategory value="1" description="Anti-helicopter mine (AHM)" uuid="f290ffda-5269-11df-97f9-080069138b88" uid="19517"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="225" uuid="f2935a6e-5269-11df-be97-080069138b88" uid="19518">
-    <category value="1" description="Guided" uuid="f29463fa-5269-11df-b012-080069138b88" uid="19519">
-      <subcategory value="1" description="BGM-71 TOW" uuid="f2957218-5269-11df-9c04-080069138b88" uid="19520">
-        <specific value="1" description="BGM-71A/B" uuid="f2968162-5269-11df-9501-080069138b88" uid="19521"/>
-        <specific value="2" description="BGM-71C ITOW" uuid="f2978f80-5269-11df-9ef4-080069138b88" uid="19522"/>
-        <specific value="3" description="BGM-71D TOW 2" uuid="f298a12c-5269-11df-a7d0-080069138b88" uid="19523"/>
-        <specific value="4" description="BGM-71E TOW 2-A" uuid="f299b0e4-5269-11df-88da-080069138b88" uid="19524"/>
-        <specific value="5" description="BGM-71F TOW 2-B" uuid="f29abf84-5269-11df-bd00-080069138b88" uid="19525"/>
-      </subcategory>
-      <subcategory value="2" description="Dragon ATGW" uuid="f29c6ffa-5269-11df-9115-080069138b88" uid="19526">
-        <specific value="1" description="M222 Dragon" uuid="f29d8098-5269-11df-ad86-080069138b88" uid="19527"/>
-        <specific value="2" description="Dragon II" uuid="f29e9032-5269-11df-b7ee-080069138b88" uid="19528"/>
-        <specific value="3" description="Dragon III" uuid="f29f9eaa-5269-11df-a331-080069138b88" uid="19529"/>
-      </subcategory>
-      <subcategory value="3" description="AGM-114 Hellfire" uuid="f2a14f52-5269-11df-b128-080069138b88" uid="19530">
-        <specific value="1" description="AGM-114A" uuid="f2a25faa-5269-11df-b339-080069138b88" uid="19531"/>
-        <specific value="2" description="AGM-114B" uuid="f2a36f76-5269-11df-8901-080069138b88" uid="19532"/>
-        <specific value="3" description="AGM-114C" uuid="f2a47e0c-5269-11df-b644-080069138b88" uid="19533"/>
-        <specific value="4" description="AGM-114F" uuid="f2a58e1e-5269-11df-8072-080069138b88" uid="19534"/>
-        <specific value="5" description="AGM-114K" uuid="f2a69e62-5269-11df-941b-080069138b88" uid="19535">
-          <extra value="1" description="AGM-114K SAL" uuid="f2a7a758-5269-11df-99e8-080069138b88" uid="19536"/>
-          <extra value="2" description="AGM-114K RF" uuid="f2a8b940-5269-11df-a23b-080069138b88" uid="19537"/>
-        </specific>
-        <specific value="6" description="AGM-114L, Laser Guided Hellfire" uuid="f2aa6d1c-5269-11df-8308-080069138b88" uid="19538"/>
-      </subcategory>
-      <subcategory value="4" description="AGM-65 Maverick" uuid="f2ac1cde-5269-11df-8ff9-080069138b88" uid="19539">
-        <specific value="1" description="AGM-65A" uuid="f2ad2c1e-5269-11df-b1c7-080069138b88" uid="19540"/>
-        <specific value="2" description="AGM-65B" uuid="f2ae3974-5269-11df-92b0-080069138b88" uid="19541"/>
-        <specific value="3" description="AGM-65D" uuid="f2af49e0-5269-11df-9b1b-080069138b88" uid="19542"/>
-        <specific value="4" description="AGM-65E" uuid="f2b06316-5269-11df-b8a6-080069138b88" uid="19543"/>
-        <specific value="5" description="AGM-65F" uuid="f2b16c5c-5269-11df-ab52-080069138b88" uid="19544"/>
-        <specific value="6" description="AGM-65G" uuid="f2b27df4-5269-11df-b174-080069138b88" uid="19545"/>
-      </subcategory>
-      <subcategory value="5" description="M712 Copperhead Cannon Launched Guided Projectile" uuid="f2b4327a-5269-11df-8b2e-080069138b88" uid="19546"/>
-      <subcategory value="6" description="AAWS-M" uuid="f2b544c6-5269-11df-8f3a-080069138b88" uid="19547"/>
-      <subcategory value="7" description="High Velocity Missile (HVM)" uuid="f2b64f60-5269-11df-b122-080069138b88" uid="19548"/>
-      <subcategory value="8" description="Javelin" uuid="f2b762a6-5269-11df-b1d7-080069138b88" uid="19549"/>
-      <subcategory value="9" description="Stinger ATAS" deprecated="1" uuid="f2b876b4-5269-11df-a3f5-080069138b88" uid="19550"/>
-      <subcategory value="10" description="Rocket, Loitering Attack Munition" uuid="f2b98770-5269-11df-a325-080069138b88" uid="19551"/>
-      <subcategory value="11" description="Rocket, Precision Attack Munition" uuid="f2ba98fe-5269-11df-9068-080069138b88" uid="19552"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f2bc4aa0-5269-11df-9320-080069138b88" uid="19553">
-      <subcategory value="1" description="12.7-mm (.50 Cal)" uuid="f2bd5d28-5269-11df-a963-080069138b88" uid="19554">
-        <specific value="1" description="M2 AP" uuid="f2be661e-5269-11df-85ab-080069138b88" uid="19555"/>
-        <specific value="2" description="M8 API" uuid="f2bf75cc-5269-11df-bde5-080069138b88" uid="19556"/>
-        <specific value="3" description="M17" uuid="f2c087aa-5269-11df-9f5e-080069138b88" uid="19557"/>
-        <specific value="4" description="M20 API-T" uuid="f2c19276-5269-11df-bd55-080069138b88" uid="19558"/>
-        <specific value="5" description="A534 (4 ball &amp; 1 tracer mix)" uuid="f2c2a198-5269-11df-8a28-080069138b88" uid="19559"/>
-      </subcategory>
-      <subcategory value="2" description="20 mm" uuid="f2c456b4-5269-11df-b726-080069138b88" uid="19560">
-        <specific value="1" description="M39" uuid="f2c56644-5269-11df-907f-080069138b88" uid="19561"/>
-        <specific value="2" description="M53 API" uuid="f2c671ba-5269-11df-a847-080069138b88" uid="19562"/>
-        <specific value="3" description="M601 API-T" uuid="f2c77f60-5269-11df-acba-080069138b88" uid="19563"/>
-        <specific value="4" description="M775 API-T" uuid="f2c892ce-5269-11df-ad56-080069138b88" uid="19564"/>
-        <specific value="5" description="M940 MP-T-SD" uuid="f2c99e12-5269-11df-9278-080069138b88" uid="19565"/>
-        <specific value="6" description="MK149 Mod 4 APDS" uuid="f2caae24-5269-11df-b3f7-080069138b88" uid="19566"/>
-        <specific value="7" description="Oerlikon S" uuid="f2cbc0ca-5269-11df-b057-080069138b88" uid="19567"/>
-        <specific value="8" description="PGU-28/B SAP-HE" uuid="f2cccba0-5269-11df-abd4-080069138b88" uid="19568"/>
-        <specific value="9" description="U.S. Navy Mark 100" uuid="f2cddc0c-5269-11df-9442-080069138b88" uid="19569"/>
-      </subcategory>
-      <subcategory value="3" description="25 mm" uuid="f2cf9632-5269-11df-9d93-080069138b88" uid="19570">
-        <specific value="1" description="Oerlikon KBA" uuid="f2d0a89c-5269-11df-8d87-080069138b88" uid="19571"/>
-        <specific value="2" description="M791 APDS-T" uuid="f2d1b46c-5269-11df-972b-080069138b88" uid="19572"/>
-        <specific value="3" description="M919 APFSDS-T" uuid="f2d2c564-5269-11df-b32a-080069138b88" uid="19573"/>
-        <specific value="4" description="PGU-20/U API" uuid="f2d3d684-5269-11df-84b7-080069138b88" uid="19574"/>
-        <specific value="5" description="PGU-32/U SAPHEI" uuid="f2d4e056-5269-11df-b482-080069138b88" uid="19575"/>
-        <specific value="6" description="Mk 96" uuid="f2d5f162-5269-11df-a6c8-080069138b88" uid="19576"/>
-      </subcategory>
-      <subcategory value="4" description="30 mm" uuid="f2d7a5de-5269-11df-b4f2-080069138b88" uid="19577">
-        <specific value="1" description="173 Mauser model F APDS-T" uuid="f2d8b5be-5269-11df-9974-080069138b88" uid="19578"/>
-        <specific value="2" description="PGU-14/B API, PGU-13/B HEI 4:1 ratio" uuid="f2d9c102-5269-11df-9d05-080069138b88" uid="19579"/>
-        <specific value="3" description="GPU 5A" uuid="f2dad3bc-5269-11df-abe4-080069138b88" uid="19580"/>
-        <specific value="4" description="PGU-15/B TP" uuid="f2dbe950-5269-11df-8d43-080069138b88" uid="19581"/>
-      </subcategory>
-      <subcategory value="5" description="66 mm 72 LAW" uuid="f2dd996c-5269-11df-b917-080069138b88" uid="19582"/>
-      <subcategory value="6" description="76 mm" uuid="f2dea3a2-5269-11df-aec0-080069138b88" uid="19583">
-        <specific value="1" description="M319, HVAP-T" uuid="f2dfb4c2-5269-11df-b75a-080069138b88" uid="19584"/>
-        <specific value="2" description="M331A1, HVAP-DS-T" uuid="f2e0c858-5269-11df-86c0-080069138b88" uid="19585"/>
-        <specific value="3" description="M331A2, HVAP-DS-T" uuid="f2e1d446-5269-11df-8790-080069138b88" uid="19586"/>
-        <specific value="4" description="M339, AP-T" uuid="f2e2e3cc-5269-11df-b953-080069138b88" uid="19587"/>
-        <specific value="5" description="M464, APFSDS-T" uuid="f2e3f578-5269-11df-bb4f-080069138b88" uid="19588"/>
-        <specific value="6" description="M496, HEAT-T" uuid="f2e502e2-5269-11df-a135-080069138b88" uid="19589"/>
-      </subcategory>
-      <subcategory value="7" description="81 mm" uuid="f2e6b560-5269-11df-a062-080069138b88" uid="19590"/>
-      <subcategory value="8" description="84 mm" uuid="f2e7c41e-5269-11df-af98-080069138b88" uid="19591">
-        <specific value="1" description="M136, HEAT" uuid="f2e8d688-5269-11df-a6f0-080069138b88" uid="19592"/>
-      </subcategory>
-      <subcategory value="9" description="90 mm" uuid="f2ea89c4-5269-11df-b1b3-080069138b88" uid="19593">
-        <specific value="1" description="M77 AP-T" uuid="f2eb9526-5269-11df-a8d2-080069138b88" uid="19594"/>
-        <specific value="2" description="M82 APC-T" uuid="f2eca344-5269-11df-b191-080069138b88" uid="19595"/>
-        <specific value="3" description="M318 AP-T" uuid="f2edbcfc-5269-11df-b371-080069138b88" uid="19596"/>
-        <specific value="4" description="M318A1 AP-T" uuid="f2eecca0-5269-11df-b650-080069138b88" uid="19597"/>
-        <specific value="5" description="M332A1 HVAP-T" uuid="f2efdd16-5269-11df-9792-080069138b88" uid="19598"/>
-        <specific value="6" description="M348 HEAT" uuid="f2f0ec1a-5269-11df-836a-080069138b88" uid="19599"/>
-        <specific value="7" description="M348A1 HEAT" uuid="f2f1fb14-5269-11df-a65d-080069138b88" uid="19600"/>
-        <specific value="8" description="M431 HEAT-T" uuid="f2f30bf8-5269-11df-ad2f-080069138b88" uid="19601"/>
-        <specific value="9" description="RCL M67" uuid="f2f41b42-5269-11df-806a-080069138b88" uid="19602"/>
-      </subcategory>
-      <subcategory value="10" description="105 mm" uuid="f2f5cdf2-5269-11df-8ed0-080069138b88" uid="19603">
-        <specific value="1" description="FP105, APFSDS" uuid="f2f6d8fa-5269-11df-b0fe-080069138b88" uid="19604"/>
-        <specific value="2" description="M392 APDS-T" uuid="f2f7ef88-5269-11df-9c63-080069138b88" uid="19605"/>
-        <specific value="3" description="M392A2 APDS-T" uuid="f2f901ac-5269-11df-b485-080069138b88" uid="19606"/>
-        <specific value="4" description="M456 HEAT-T" uuid="f2fa0bb0-5269-11df-a0ed-080069138b88" uid="19607"/>
-        <specific value="5" description="M456A2 HEAT-T" uuid="f2fb1cee-5269-11df-a32e-080069138b88" uid="19608"/>
-        <specific value="6" description="M662 HEAT-T" uuid="f2fc3070-5269-11df-9711-080069138b88" uid="19609"/>
-        <specific value="7" description="M728 APDS-T" uuid="f2fd3a2e-5269-11df-b275-080069138b88" uid="19610"/>
-        <specific value="8" description="M735 APFSDS-T" uuid="f2fe496e-5269-11df-aecc-080069138b88" uid="19611"/>
-        <specific value="9" description="M774 APFSDS-T" uuid="f2ff5bc4-5269-11df-b050-080069138b88" uid="19612"/>
-        <specific value="10" description="M833 APFSDS-T" uuid="f3007e28-5269-11df-ad11-080069138b88" uid="19613"/>
-        <specific value="11" description="M900 APFSDS-T" uuid="f301934e-5269-11df-a635-080069138b88" uid="19614"/>
-        <specific value="12" description="Olin 105, APFSDS" uuid="f302a32e-5269-11df-ac8a-080069138b88" uid="19615"/>
-        <specific value="13" description="XM815 HEAT-MP" uuid="f303b200-5269-11df-916f-080069138b88" uid="19616"/>
-      </subcategory>
-      <subcategory value="11" description="106 mm RCL40 (M40)" uuid="f3056370-5269-11df-ad29-080069138b88" uid="19617"/>
-      <subcategory value="12" description="107 mm" uuid="f3067666-5269-11df-9e83-080069138b88" uid="19618"/>
-      <subcategory value="13" description="120 mm" uuid="f307851a-5269-11df-b1ac-080069138b88" uid="19619">
-        <specific value="1" description="M829 APFSDS-T" uuid="f30893f6-5269-11df-a5dc-080069138b88" uid="19620"/>
-        <specific value="2" description="M829A1 APFSDS-T" uuid="f309a430-5269-11df-aac6-080069138b88" uid="19621"/>
-        <specific value="3" description="M830 HEAT-MP-T" uuid="f30ab442-5269-11df-b49f-080069138b88" uid="19622"/>
-        <specific value="4" description="Olin 120 APFSDS" uuid="f30bc896-5269-11df-a9bf-080069138b88" uid="19623"/>
-        <specific value="5" description="Olin 120+ APFSDS" uuid="f30cde34-5269-11df-bbe8-080069138b88" uid="19624"/>
-        <specific value="6" description="M830A1 HEAT-MP-T" uuid="f30deef0-5269-11df-a2d4-080069138b88" uid="19625"/>
-        <specific value="7" description="XM943 STAFF" uuid="f30ef9d0-5269-11df-9ec5-080069138b88" uid="19626"/>
-      </subcategory>
-      <subcategory value="14" description="152 mm" uuid="f310abc2-5269-11df-aaf2-080069138b88" uid="19627">
-        <specific value="1" description="M409 Series HEAT-T-MP" uuid="f311bb66-5269-11df-b5d0-080069138b88" uid="19628"/>
-      </subcategory>
-      <subcategory value="15" description="155 mm" uuid="f3136bc8-5269-11df-9d65-080069138b88" uid="19629">
-        <specific value="1" description="M898 SADARM" uuid="f3147e3c-5269-11df-bd78-080069138b88" uid="19630"/>
-      </subcategory>
-      <subcategory value="16" description="227-mm rocket" uuid="f3162d90-5269-11df-ae3e-080069138b88" uid="19631">
-        <specific value="1" description="AT2" uuid="f3173960-5269-11df-9264-080069138b88" uid="19632"/>
-        <specific value="2" description="M77" uuid="f3184dbe-5269-11df-80fb-080069138b88" uid="19633"/>
-        <specific value="3" description="TGW" uuid="f3195c7c-5269-11df-bb2e-080069138b88" uid="19634"/>
-        <specific value="4" description="SADARM" uuid="f31a661c-5269-11df-8be4-080069138b88" uid="19635"/>
-      </subcategory>
-      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="f31c1854-5269-11df-870b-080069138b88" uid="19636"/>
-      <subcategory value="18" description="(deprecated)" deprecated="1" uuid="f31d29d8-5269-11df-beec-080069138b88" uid="19637"/>
-      <subcategory value="19" description="(deprecated)" deprecated="1" uuid="f31e3c38-5269-11df-b8e2-080069138b88" uid="19638"/>
-      <subcategory value="20" description="Hydra 70 Rocket System" uuid="f31f4b64-5269-11df-bbbe-080069138b88" uid="19639">
-        <specific value="1" description="Hydra Rocket w/M156 WP smoke warhead" uuid="f3205d42-5269-11df-a0c4-080069138b88" uid="19640"/>
-        <specific value="2" description="Hydra Rocket w/M67 Mod WP smoke warhead" uuid="f3216ebc-5269-11df-8256-080069138b88" uid="19641"/>
-        <specific value="3" description="Hydra Rocket w/M67 Mod 1 RP smoke warhead" uuid="f3227bb8-5269-11df-a586-080069138b88" uid="19642"/>
-        <specific value="4" description="Hydra Rocket w/M151 HE frag warhead" uuid="f32393cc-5269-11df-8806-080069138b88" uid="19643"/>
-        <specific value="5" description="Hydra Rocket w/M257 visible flare warhead" uuid="f324a5dc-5269-11df-b444-080069138b88" uid="19644"/>
-        <specific value="6" description="Hydra Rocket w/M278 infrared flare warhead" uuid="f325b3aa-5269-11df-a8c4-080069138b88" uid="19645"/>
-        <specific value="7" description="Hydra Rocket w/WDU-4A/A flechette warhead" uuid="f326c92a-5269-11df-963f-080069138b88" uid="19646"/>
-        <specific value="8" description="Hydra Rocket w/WTU-1/B practice warhead" uuid="f327db8a-5269-11df-af94-080069138b88" uid="19647"/>
-      </subcategory>
-      <subcategory value="50" description="Rockeye II Mk 20 cluster weapon" uuid="f3298dd6-5269-11df-8ac3-080069138b88" uid="19648"/>
-      <subcategory value="51" description="SUU-65/B TAC Munition Dispenser (TMD) Wide Area Antiarmor Munition (WAAM)" uuid="f32aa64e-5269-11df-9499-080069138b88" uid="19649"/>
-    </category>
-    <category value="3" description="Fixed" uuid="f32c5e3a-5269-11df-940a-080069138b88" uid="19650">
-      <subcategory value="1" description="Area Denial Artillery Munition (ADAM)" uuid="f32d6c1c-5269-11df-a31e-080069138b88" uid="19651"/>
-      <subcategory value="2" description="Extended Range Anti-armor Munition (ERAM)" uuid="f32e8228-5269-11df-86a9-080069138b88" uid="19652"/>
-      <subcategory value="3" description="GATOR Anti-armor System" uuid="f32f908c-5269-11df-9ee4-080069138b88" uid="19653"/>
-      <subcategory value="4" description="XM93 Wide Area Mine (WAM)" uuid="f330a3c8-5269-11df-b710-080069138b88" uid="19654"/>
-      <subcategory value="5" description="M21 Heavy Antitank mine" uuid="f331b448-5269-11df-aa9a-080069138b88" uid="19655"/>
-      <subcategory value="6" description="Off-route Antitank mine" uuid="f332c3a6-5269-11df-83d9-080069138b88" uid="19656">
-        <specific value="1" description="M24" uuid="f333d3ea-5269-11df-afb8-080069138b88" uid="19657"/>
-        <specific value="2" description="M66" uuid="f334e438-5269-11df-9d6d-080069138b88" uid="19658"/>
-      </subcategory>
-      <subcategory value="7" description="M19 Antitank mine" uuid="f33694ae-5269-11df-baec-080069138b88" uid="19659"/>
-      <subcategory value="8" description="M15 Antitank mine" uuid="f337a024-5269-11df-a028-080069138b88" uid="19660"/>
-      <subcategory value="9" description="M86 Pursuit Deterrent Munition (PDM)" uuid="f338b2a2-5269-11df-822b-080069138b88" uid="19661"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="225" uuid="f33b0494-5269-11df-b97c-080069138b88" uid="19662">
-    <category value="1" description="Guided" uuid="f33c11c2-5269-11df-bcf1-080069138b88" uid="19663">
-      <subcategory value="1" description="Decoys" uuid="f33d2468-5269-11df-9816-080069138b88" uid="19664">
-        <specific value="1" description="Anti-Radiation Missile Decoy (ARM-D)" uuid="f33e2f2a-5269-11df-85fa-080069138b88" uid="19665"/>
-        <specific value="2" description="Mk-57 (MOSS)" uuid="f33f40f4-5269-11df-b716-080069138b88" uid="19666"/>
-      </subcategory>
-      <subcategory value="2" description="RIM-72 Sea Chaparral" uuid="f340f322-5269-11df-a619-080069138b88" uid="19667"/>
-      <subcategory value="3" description="RIM-116A RAM" uuid="f3420dac-5269-11df-9487-080069138b88" uid="19668"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="225" uuid="f34466ba-5269-11df-b68b-080069138b88" uid="19669">
-    <category value="1" description="Guided" uuid="f34575dc-5269-11df-a24e-080069138b88" uid="19670">
-      <subcategory value="1" description="AGM-88 High-speed Antiradiation Missile (HARM)" uuid="f3468062-5269-11df-841c-080069138b88" uid="19671">
-        <specific value="1" description="AGM-88A" uuid="f347951a-5269-11df-b1c0-080069138b88" uid="19672"/>
-        <specific value="2" description="AGM-88B" uuid="f348a540-5269-11df-aba2-080069138b88" uid="19673"/>
-        <specific value="3" description="AGM-88C" uuid="f349b818-5269-11df-bdad-080069138b88" uid="19674"/>
-      </subcategory>
-      <subcategory value="2" description="AGM-45 Shrike" uuid="f34b6bea-5269-11df-9c54-080069138b88" uid="19675">
-        <specific value="1" description="AGM-45A" uuid="f34c7a9e-5269-11df-a22a-080069138b88" uid="19676"/>
-        <specific value="2" description="AGM-45B" uuid="f34d8ad8-5269-11df-8982-080069138b88" uid="19677"/>
-      </subcategory>
-      <subcategory value="3" description="AGM-78 Standard ARM" uuid="f34f3d92-5269-11df-8754-080069138b88" uid="19678"/>
-      <subcategory value="4" description="AGM-122 Sidearm" uuid="f3504c28-5269-11df-b2aa-080069138b88" uid="19679">
-        <specific value="1" description="AGM-122A" uuid="f3515aa0-5269-11df-8314-080069138b88" uid="19680"/>
-      </subcategory>
-      <subcategory value="5" description="AGM-136 TACIT RAINBOW" deprecated="1" uuid="f3530d78-5269-11df-a359-080069138b88" uid="19681">
-        <specific value="1" description="AGM 136A" deprecated="1" uuid="f35422da-5269-11df-8b0e-080069138b88" uid="19682"/>
-      </subcategory>
-      <subcategory value="6" description="Stinger" uuid="f355d198-5269-11df-bde7-080069138b88" uid="19683">
-        <specific value="1" description="Air Defense Suppression Missile (ADSM)" uuid="f356db1a-5269-11df-af7c-080069138b88" uid="19684"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="5" country="225" uuid="f359d3ec-5269-11df-9ec0-080069138b88" uid="19685">
-    <category value="1" description="Guided" uuid="f35ae1c4-5269-11df-9eb1-080069138b88" uid="19686">
-      <subcategory value="1" description="Asat" uuid="f35bebe6-5269-11df-9ef4-080069138b88" uid="19687"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="225" uuid="f35e4148-5269-11df-bcb8-080069138b88" uid="19688">
-    <category value="1" description="Guided" uuid="f35f4912-5269-11df-be7a-080069138b88" uid="19689">
-      <subcategory value="1" description="Harpoon" uuid="f36058ac-5269-11df-b449-080069138b88" uid="19690">
-        <specific value="1" description="AGM-84A" uuid="f3616c74-5269-11df-a96a-080069138b88" uid="19691"/>
-        <specific value="2" description="UGM-84A" uuid="f3627588-5269-11df-b191-080069138b88" uid="19692"/>
-        <specific value="3" description="RGM-84A" uuid="f36384b4-5269-11df-a941-080069138b88" uid="19693"/>
-        <specific value="4" description="AGM-84B" uuid="f3649818-5269-11df-b053-080069138b88" uid="19694"/>
-        <specific value="5" description="UGM-84B" uuid="f365a1cc-5269-11df-b1ab-080069138b88" uid="19695"/>
-        <specific value="6" description="AGM-84C" uuid="f366b04e-5269-11df-b737-080069138b88" uid="19696"/>
-        <specific value="7" description="UGM-84C" uuid="f367c998-5269-11df-93e5-080069138b88" uid="19697"/>
-        <specific value="8" description="AGM-84D" uuid="f368d914-5269-11df-af9b-080069138b88" uid="19698"/>
-        <specific value="9" description="UGM-84D" uuid="f369e78c-5269-11df-8fbe-080069138b88" uid="19699"/>
-        <specific value="10" description="AGM-84E" uuid="f36af730-5269-11df-aa89-080069138b88" uid="19700"/>
-        <specific value="11" description="UGM-84E" uuid="f36c0454-5269-11df-8b67-080069138b88" uid="19701"/>
-        <specific value="12" description="RGM-84E" uuid="f36d1452-5269-11df-b487-080069138b88" uid="19702"/>
-        <specific value="13" description="AGHM-84F" uuid="f36e2270-5269-11df-9024-080069138b88" uid="19703"/>
-        <specific value="14" description="UGM-84F" uuid="f36f2d64-5269-11df-91fa-080069138b88" uid="19704"/>
-        <specific value="15" description="RGM-84F" uuid="f3704096-5269-11df-9255-080069138b88" uid="19705"/>
-        <specific value="16" description="AGM-84G" uuid="f3714fe0-5269-11df-9855-080069138b88" uid="19706"/>
-        <specific value="17" description="UGM-84G" uuid="f37258fe-5269-11df-b8a3-080069138b88" uid="19707"/>
-        <specific value="18" description="RGM-84G" uuid="f3736b40-5269-11df-9598-080069138b88" uid="19708"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f3751ce2-5269-11df-8162-080069138b88" uid="19709"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f3762f2e-5269-11df-80d0-080069138b88" uid="19710"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f3773d42-5269-11df-866f-080069138b88" uid="19711"/>
-      <subcategory value="5" description="NT 37F torpedo" uuid="f3784ffc-5269-11df-a867-080069138b88" uid="19712">
-        <specific value="1" description="Mod 2" uuid="f3795fb4-5269-11df-a1a6-080069138b88" uid="19713"/>
-        <specific value="2" description="Mod 3" uuid="f37a6a80-5269-11df-8706-080069138b88" uid="19714"/>
-        <specific value="3" description="NT 37E" uuid="f37b7966-5269-11df-bd32-080069138b88" uid="19715"/>
-      </subcategory>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f37d2f72-5269-11df-b4ef-080069138b88" uid="19716"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="f37e401a-5269-11df-a904-080069138b88" uid="19717"/>
-      <subcategory value="8" description="AGM-142 Popeye" uuid="f37f4d34-5269-11df-8679-080069138b88" uid="19718"/>
-      <subcategory value="9" description="AGM-119 Penguin" uuid="f3805e2c-5269-11df-9898-080069138b88" uid="19719"/>
-      <subcategory value="10" description="AGM-123 Skipper" uuid="f381733e-5269-11df-824a-080069138b88" uid="19720">
-        <specific value="1" description="AGM-123A" uuid="f3827f7c-5269-11df-be8e-080069138b88" uid="19721"/>
-      </subcategory>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f38430c4-5269-11df-9e80-080069138b88" uid="19722"/>
-      <subcategory value="12" description="BGM-109B Tomahawk Antiship Missile (TASM)" uuid="f3854374-5269-11df-8bf6-080069138b88" uid="19723"/>
-      <subcategory value="13" description="ADCAP" uuid="f386639e-5269-11df-a5a7-080069138b88" uid="19724">
-        <specific value="1" description="Mod 5" uuid="f3876e6a-5269-11df-bae9-080069138b88" uid="19725"/>
-        <specific value="2" description="Mod 6" uuid="f3887e04-5269-11df-a83d-080069138b88" uid="19726"/>
-      </subcategory>
-      <subcategory value="14" description="Mk 48" uuid="f38a2e3e-5269-11df-9b89-080069138b88" uid="19727">
-        <specific value="1" description="Mod 4" uuid="f38b40ee-5269-11df-95bb-080069138b88" uid="19728"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Ballistic" uuid="f38d8f52-5269-11df-83db-080069138b88" uid="19729">
-      <subcategory value="1" description="5-in .38 caliber" uuid="f38ea14e-5269-11df-bc37-080069138b88" uid="19730"/>
-      <subcategory value="2" description="5-in .54 caliber" uuid="f38fab34-5269-11df-9cba-080069138b88" uid="19731">
-        <specific value="1" description="AAC" uuid="f390baba-5269-11df-a639-080069138b88" uid="19732"/>
-        <specific value="2" description="HC" uuid="f391ce50-5269-11df-958f-080069138b88" uid="19733"/>
-        <specific value="3" description="HE-IR" uuid="f392d8c2-5269-11df-8392-080069138b88" uid="19734"/>
-        <specific value="4" description="HE-PD" uuid="f393e74e-5269-11df-bb0d-080069138b88" uid="19735"/>
-        <specific value="5" description="HE" uuid="f394f990-5269-11df-99c4-080069138b88" uid="19736"/>
-        <specific value="6" description="HE-CVT" uuid="f396057e-5269-11df-8e6b-080069138b88" uid="19737"/>
-        <specific value="7" description="IR" uuid="f397154a-5269-11df-b877-080069138b88" uid="19738"/>
-        <specific value="8" description="VT (Variable Time)" uuid="f3982336-5269-11df-a620-080069138b88" uid="19739"/>
-        <specific value="9" description="VT-IR (Variable Time, Infrared)" uuid="f3993cc6-5269-11df-9378-080069138b88" uid="19740"/>
-        <specific value="10" description="VT-RF" uuid="f39a541c-5269-11df-8c99-080069138b88" uid="19741"/>
-      </subcategory>
-      <subcategory value="3" description="76 mm" uuid="f39c03de-5269-11df-8bec-080069138b88" uid="19742">
-        <specific value="1" description="AAC" uuid="f39d1dc8-5269-11df-baa7-080069138b88" uid="19743"/>
-        <specific value="2" description="HE" uuid="f39e2c22-5269-11df-bde1-080069138b88" uid="19744"/>
-        <specific value="3" description="HE-PD" uuid="f39f3bbc-5269-11df-abb1-080069138b88" uid="19745"/>
-        <specific value="4" description="VT fragmentation" uuid="f3a04cd2-5269-11df-aed7-080069138b88" uid="19746"/>
-        <specific value="5" description="VT IR" uuid="f3a15974-5269-11df-b8ff-080069138b88" uid="19747"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Fixed" uuid="f3a3ae36-5269-11df-8606-080069138b88" uid="19748">
-      <subcategory value="1" description="DST Mk 36 mine" uuid="f3a4c3ca-5269-11df-b826-080069138b88" uid="19749"/>
-      <subcategory value="2" description="DST Mk 40 mine" uuid="f3a5d5da-5269-11df-b7e1-080069138b88" uid="19750"/>
-      <subcategory value="3" description="DST Mk 41 mine" uuid="f3a6e4de-5269-11df-9d0e-080069138b88" uid="19751"/>
-      <subcategory value="4" description="DST 115A mine" uuid="f3a7f068-5269-11df-9bee-080069138b88" uid="19752"/>
-      <subcategory value="5" description="Mk 52 bottom mine" uuid="f3a90606-5269-11df-bc98-080069138b88" uid="19753">
-        <specific value="1" description="Mod 1" uuid="f3aa1532-5269-11df-b636-080069138b88" uid="19754"/>
-        <specific value="2" description="Mod 2" uuid="f3ab1f9a-5269-11df-a492-080069138b88" uid="19755"/>
-        <specific value="3" description="Mod 3" uuid="f3ac32c2-5269-11df-a197-080069138b88" uid="19756"/>
-      </subcategory>
-      <subcategory value="6" description="Mk 55 bottom mine" uuid="f3ade36a-5269-11df-ac3d-080069138b88" uid="19757">
-        <specific value="1" description="Mod 2" uuid="f3aef2aa-5269-11df-98b6-080069138b88" uid="19758"/>
-        <specific value="2" description="Mod 3" uuid="f3afff06-5269-11df-b1e3-080069138b88" uid="19759"/>
-        <specific value="3" description="Mod 5" uuid="f3b10fe0-5269-11df-b27b-080069138b88" uid="19760"/>
-        <specific value="4" description="Mod 6" uuid="f3b220ba-5269-11df-92ac-080069138b88" uid="19761"/>
-        <specific value="5" description="Mod 7" uuid="f3b32b72-5269-11df-8de0-080069138b88" uid="19762"/>
-      </subcategory>
-      <subcategory value="7" description="Mk 57 moored mine" uuid="f3b4dd28-5269-11df-9700-080069138b88" uid="19763">
-        <specific value="1" description="Mod 0" uuid="f3b5ed26-5269-11df-99b8-080069138b88" uid="19764"/>
-      </subcategory>
-      <subcategory value="8" description="Quickstrike mines" uuid="f3b79c7a-5269-11df-af26-080069138b88" uid="19765">
-        <specific value="1" description="Mk 62" uuid="f3b8aed0-5269-11df-b672-080069138b88" uid="19766"/>
-        <specific value="2" description="Mk 63" uuid="f3b9b7e4-5269-11df-86bc-080069138b88" uid="19767"/>
-        <specific value="3" description="Mk 64" uuid="f3bac81e-5269-11df-9c2e-080069138b88" uid="19768"/>
-        <specific value="4" description="Mk 65" uuid="f3bbd934-5269-11df-8015-080069138b88" uid="19769"/>
-      </subcategory>
-      <subcategory value="9" description="CAPTOR - Encapsulated Torpedo moored mine" uuid="f3bd8ab8-5269-11df-8638-080069138b88" uid="19770"/>
-      <subcategory value="10" description="Advanced sea mine" uuid="f3be97aa-5269-11df-8bb8-080069138b88" uid="19771"/>
-      <subcategory value="11" description="Mk 56 Mod 0 moored mine" uuid="f3bfaaa0-5269-11df-8b48-080069138b88" uid="19772"/>
-      <subcategory value="12" description="Mk 67 Submarine Launched Mobile Mine" uuid="f3c0c00c-5269-11df-8a82-080069138b88" uid="19773"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="225" uuid="f3c310a0-5269-11df-8b5f-080069138b88" uid="19774">
-    <category value="1" description="Guided" uuid="f3c429d6-5269-11df-82e5-080069138b88" uid="19775">
-      <subcategory value="1" description="Mk 46 torpedo" uuid="f3c53466-5269-11df-b55a-080069138b88" uid="19776">
-        <specific value="1" description="Mk 46 Mod 0" uuid="f3c6459a-5269-11df-a8e0-080069138b88" uid="19777"/>
-        <specific value="2" description="Mk 46 Mod 5 (NEARTIP)" uuid="f3c75642-5269-11df-b7ae-080069138b88" uid="19778"/>
-        <specific value="3" description="Mk 46 Mod 7" uuid="f3c860aa-5269-11df-847c-080069138b88" uid="19779"/>
-        <specific value="4" description="Mk 46 Mod 6" uuid="f3c971f2-5269-11df-88b9-080069138b88" uid="19780"/>
-      </subcategory>
-      <subcategory value="2" description="Mk 48 torpedo" uuid="f3cb2600-5269-11df-bfeb-080069138b88" uid="19781">
-        <specific value="1" description="Mod 4" uuid="f3cc3536-5269-11df-ab3d-080069138b88" uid="19782"/>
-      </subcategory>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f3cde52a-5269-11df-b4af-080069138b88" uid="19783"/>
-      <subcategory value="4" description="MK37 torpedo" uuid="f3cef4ba-5269-11df-b52f-080069138b88" uid="19784">
-        <specific value="1" description="Mod 0" uuid="f3d004b8-5269-11df-a786-080069138b88" uid="19785"/>
-        <specific value="2" description="Mod 1" uuid="f3d10d90-5269-11df-9962-080069138b88" uid="19786"/>
-        <specific value="3" description="Mod 2" uuid="f3d21d0c-5269-11df-90a5-080069138b88" uid="19787"/>
-        <specific value="4" description="Mod 3" uuid="f3d32e68-5269-11df-95a4-080069138b88" uid="19788"/>
-      </subcategory>
-      <subcategory value="5" description="RUR-5A ASROC" uuid="f3d4e1ea-5269-11df-b793-080069138b88" uid="19789"/>
-      <subcategory value="6" description="CASW/SOW" uuid="f3d5eff4-5269-11df-958c-080069138b88" uid="19790"/>
-      <subcategory value="7" description="SUBROC" uuid="f3d6fa84-5269-11df-ab51-080069138b88" uid="19791">
-        <specific value="1" description="UUM-44A" uuid="f3d80b54-5269-11df-a707-080069138b88" uid="19792"/>
-      </subcategory>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="f3d9be5e-5269-11df-b0a6-080069138b88" uid="19793"/>
-      <subcategory value="9" description="Mk 44 torpedo" uuid="f3daccea-5269-11df-bd22-080069138b88" uid="19794"/>
-      <subcategory value="10" description="Mk 48 ADCAP torpedo" uuid="f3dbd766-5269-11df-ab2f-080069138b88" uid="19795">
-        <specific value="1" description="Mod 5 ADCAP" uuid="f3dceb92-5269-11df-b4b7-080069138b88" uid="19796"/>
-        <specific value="2" description="Mod 6 ADCAP/MODS" uuid="f3ddfbea-5269-11df-a61a-080069138b88" uid="19797"/>
-      </subcategory>
-      <subcategory value="11" description="Mk 50 Advanced lightweight torpedo" uuid="f3dfaba2-5269-11df-82e0-080069138b88" uid="19798">
-        <specific value="1" description="100S" uuid="f3e0bccc-5269-11df-a0a4-080069138b88" uid="19799"/>
-        <specific value="2" description="200S" uuid="f3e1cc20-5269-11df-8451-080069138b88" uid="19800"/>
-      </subcategory>
-      <subcategory value="12" description="NT 37F" uuid="f3e386fa-5269-11df-a996-080069138b88" uid="19801">
-        <specific value="1" description="Mod 2" uuid="f3e495cc-5269-11df-b1f2-080069138b88" uid="19802"/>
-        <specific value="2" description="Mod 3" uuid="f3e5a0de-5269-11df-8fb4-080069138b88" uid="19803"/>
-        <specific value="3" description="NT 37E" uuid="f3e6b078-5269-11df-ba76-080069138b88" uid="19804"/>
-      </subcategory>
-      <subcategory value="13" description="HOTTORP torpedo" uuid="f3e86300-5269-11df-8dd3-080069138b88" uid="19805"/>
-      <subcategory value="14" description="Sea Lance ASW" uuid="f3e971c8-5269-11df-92c8-080069138b88" uid="19806"/>
-      <subcategory value="18" description="Mk 32 torpedo" uuid="f3ea7d70-5269-11df-91fe-080069138b88" uid="19807">
-        <specific value="1" description="Mod 2" uuid="f3eb90a2-5269-11df-9ae3-080069138b88" uid="19808"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="225" uuid="f3ee84b0-5269-11df-a5df-080069138b88" uid="19809">
-    <category value="2" description="Ballistic" uuid="f3ef91ca-5269-11df-abd6-080069138b88" uid="19810">
-      <subcategory value="1" description="5.56 mm" uuid="f3f09c64-5269-11df-9279-080069138b88" uid="19811">
-        <specific value="1" description="M193" uuid="f3f1ac44-5269-11df-b3ac-080069138b88" uid="19812"/>
-        <specific value="2" description="M193 Tracer" uuid="f3f2c020-5269-11df-bba9-080069138b88" uid="19813"/>
-        <specific value="3" description="(deprecated)" deprecated="1" uuid="f3f3c902-5269-11df-a894-080069138b88" uid="19814"/>
-        <specific value="4" description="5.56 x 45" uuid="f3f4d9b4-5269-11df-b35e-080069138b88" uid="19815"/>
-        <specific value="5" description="M855" uuid="f3f5ecaa-5269-11df-9f94-080069138b88" uid="19816"/>
-        <specific value="6" description="M856" uuid="f3f6f6b8-5269-11df-8a21-080069138b88" uid="19817"/>
-        <specific value="7" description="A064" uuid="f3f803c8-5269-11df-8873-080069138b88" uid="19818"/>
-      </subcategory>
-      <subcategory value="2" description="7.62 mm" uuid="f3f9b72c-5269-11df-a914-080069138b88" uid="19819">
-        <specific value="1" description=".30 Carbine" uuid="f3fac5b8-5269-11df-bde8-080069138b88" uid="19820"/>
-        <specific value="2" description=".308 Winchester" uuid="f3fbd034-5269-11df-841b-080069138b88" uid="19821"/>
-        <specific value="3" description=".30-06 Springfield" uuid="f3fcde98-5269-11df-a50a-080069138b88" uid="19822"/>
-        <specific value="4" description="A131 M80/M62 4:1 ratio (for M60, M240, etc.)" uuid="f3fdf3be-5269-11df-89bf-080069138b88" uid="19823"/>
-        <specific value="5" description="A130 M80 NATO ball (for M14, etc.)" uuid="f3ff006a-5269-11df-aa7f-080069138b88" uid="19824"/>
-        <specific value="6" description="A122 M59 ball (for AR-10, M14, etc.)" uuid="f4001342-5269-11df-8dac-080069138b88" uid="19825"/>
-        <specific value="7" description="A141" uuid="f4012f3e-5269-11df-a729-080069138b88" uid="19826"/>
-        <specific value="8" description="4 ball +1tracer linked" uuid="f4023f1e-5269-11df-bc5a-080069138b88" uid="19827"/>
-        <specific value="9" description="AA11 M118 Long Range (for M86, M14, etc.)" uuid="f40351ce-5269-11df-bf94-080069138b88" uid="19828"/>
-      </subcategory>
-      <subcategory value="3" description="9.0 mm" uuid="f4050398-5269-11df-bbde-080069138b88" uid="19829">
-        <specific value="1" description=".380 Auto" uuid="f4061486-5269-11df-b138-080069138b88" uid="19830"/>
-        <specific value="2" description="Browning Short" uuid="f4071f20-5269-11df-babf-080069138b88" uid="19831"/>
-        <specific value="3" description="Parabellum" uuid="f4083040-5269-11df-bf1d-080069138b88" uid="19832"/>
-        <specific value="4" description="Winchester Magnum" uuid="f40940d4-5269-11df-83b1-080069138b88" uid="19833"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f40af10e-5269-11df-ad1b-080069138b88" uid="19834"/>
-      <subcategory value="5" description="12.7 mm" uuid="f40c00d0-5269-11df-a4af-080069138b88" uid="19835">
-        <specific value="1" description="A605 .50 ball M33 (for .50 Spotting rifle, etc.)" uuid="f40d11d2-5269-11df-9599-080069138b88" uid="19836"/>
-        <specific value="2" description="A556 .50 4 ball M2/M1 4:1 ratio (for M2 MG, etc.)" uuid="f40e27ac-5269-11df-a03f-080069138b88" uid="19837"/>
-        <specific value="3" description="A534 .50 API M8/M20 4:1 ratio (for M2, , etc.)" uuid="f40f3462-5269-11df-ae55-080069138b88" uid="19838"/>
-      </subcategory>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f410ee56-5269-11df-b170-080069138b88" uid="19839"/>
-      <subcategory value="7" description="90 mm" uuid="f411ff3a-5269-11df-88d0-080069138b88" uid="19840">
-        <specific value="1" description="M580 APERS-T" uuid="f4130dda-5269-11df-99f6-080069138b88" uid="19841"/>
-      </subcategory>
-      <subcategory value="8" description="105 mm" uuid="f414bd60-5269-11df-8781-080069138b88" uid="19842">
-        <specific value="1" description="M336 canister" uuid="f415caca-5269-11df-8f85-080069138b88" uid="19843"/>
-        <specific value="2" description="M377 canister" uuid="f416db22-5269-11df-93f3-080069138b88" uid="19844"/>
-        <specific value="3" description="M494 APERS-T" uuid="f417eab2-5269-11df-b89f-080069138b88" uid="19845"/>
-        <specific value="4" description="M546 APERS-T" uuid="f418f40c-5269-11df-8f91-080069138b88" uid="19846"/>
-      </subcategory>
-      <subcategory value="9" description="152 mm" uuid="f41ab33c-5269-11df-ad1f-080069138b88" uid="19847">
-        <specific value="1" description="M625A1 cannister (flechettes)" uuid="f41bc498-5269-11df-9c47-080069138b88" uid="19848"/>
-      </subcategory>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f41d7644-5269-11df-acfb-080069138b88" uid="19849"/>
-      <subcategory value="11" description=".357" uuid="f41e8b2e-5269-11df-b540-080069138b88" uid="19850">
-        <specific value="1" description="Magnum" uuid="f41f9df2-5269-11df-8a96-080069138b88" uid="19851"/>
-      </subcategory>
-      <subcategory value="12" description=".38 Cal" uuid="f4214f58-5269-11df-b365-080069138b88" uid="19852">
-        <specific value="1" description="Auto" uuid="f42262da-5269-11df-8ede-080069138b88" uid="19853"/>
-        <specific value="2" description="Super Auto" uuid="f423709e-5269-11df-b260-080069138b88" uid="19854"/>
-        <specific value="3" description="Special" uuid="f4247af2-5269-11df-af55-080069138b88" uid="19855"/>
-      </subcategory>
-      <subcategory value="13" description=".45" uuid="f4262c8a-5269-11df-94dc-080069138b88" uid="19856">
-        <specific value="1" description="Auto Colt" uuid="f4273b70-5269-11df-bc2d-080069138b88" uid="19857"/>
-      </subcategory>
-      <subcategory value="14" description="12 ga shotgun shells" uuid="f428ee8e-5269-11df-a0ae-080069138b88" uid="19858"/>
-      <subcategory value="50" description="BLU-97 Submunition" uuid="f429ff36-5269-11df-9aef-080069138b88" uid="19859">
-        <specific value="1" description="BLU-97A" uuid="f42b0994-5269-11df-a9e6-080069138b88" uid="19860"/>
-        <specific value="2" description="BLU-97B" uuid="f42c19a6-5269-11df-b37c-080069138b88" uid="19861"/>
-      </subcategory>
-      <subcategory value="51" description="ISCB-1 Area Denial Cluster Weapon" uuid="f42dcdb4-5269-11df-8942-080069138b88" uid="19862"/>
-    </category>
-    <category value="3" description="Fixed" uuid="f42f7d76-5269-11df-bd34-080069138b88" uid="19863">
-      <subcategory value="1" description="Bounding mines" uuid="f4308f4a-5269-11df-b426-080069138b88" uid="19864">
-        <specific value="1" description="M16" uuid="f4319e26-5269-11df-bfc4-080069138b88" uid="19865"/>
-        <specific value="2" description="M16A1" uuid="f432af82-5269-11df-9675-080069138b88" uid="19866"/>
-        <specific value="3" description="M16A2" uuid="f433bfee-5269-11df-8a90-080069138b88" uid="19867"/>
-        <specific value="4" description="M2A4" uuid="f434cd94-5269-11df-9fdf-080069138b88" uid="19868"/>
-      </subcategory>
-      <subcategory value="2" description="Claymore mine" uuid="f4367c7a-5269-11df-88e2-080069138b88" uid="19869"/>
-      <subcategory value="3" description="M15 heavy AT mine" uuid="f4378b56-5269-11df-8b6e-080069138b88" uid="19870"/>
-      <subcategory value="4" description="M19 nonmetallic AT mine" uuid="f4389eba-5269-11df-8faf-080069138b88" uid="19871"/>
-      <subcategory value="5" description="M21 heavy AT mine" uuid="f439ae7c-5269-11df-abd3-080069138b88" uid="19872"/>
-      <subcategory value="6" description="M741 scatterable AT mine" uuid="f43ac078-5269-11df-af76-080069138b88" uid="19873"/>
-      <subcategory value="7" description="M718 scatterable AT mine" uuid="f43bd058-5269-11df-b8e7-080069138b88" uid="19874"/>
-      <subcategory value="8" description="M75 scatterable AT mine" uuid="f43cdf02-5269-11df-b5db-080069138b88" uid="19875"/>
-      <subcategory value="9" description="Nonmetallic &quot;Toe Popper&quot; mine" uuid="f43df234-5269-11df-9c04-080069138b88" uid="19876">
-        <specific value="1" description="M14" uuid="f43f0eee-5269-11df-8250-080069138b88" uid="19877"/>
-      </subcategory>
-      <subcategory value="10" description="M731 scatterable mine" uuid="f440bf96-5269-11df-886e-080069138b88" uid="19878"/>
-      <subcategory value="11" description="M692 scatterable mine" uuid="f441ccba-5269-11df-b8f4-080069138b88" uid="19879"/>
-      <subcategory value="12" description="M74 scatterable mine" uuid="f442de8e-5269-11df-b503-080069138b88" uid="19880"/>
-      <subcategory value="13" description="M1 one-gallon chemical mine" uuid="f443f3be-5269-11df-92a8-080069138b88" uid="19881"/>
-      <subcategory value="14" description="M18A1 mine" uuid="f444fec6-5269-11df-bef4-080069138b88" uid="19882"/>
-      <subcategory value="15" description="M23 chemical-agent mine" uuid="f4460e1a-5269-11df-8d30-080069138b88" uid="19883"/>
-      <subcategory value="16" description="M26 mine" uuid="f4472296-5269-11df-82db-080069138b88" uid="19884"/>
-      <subcategory value="17" description="M131 Modular Pack Mine System (MOPMS)" uuid="f4482eb6-5269-11df-b6e9-080069138b88" uid="19885"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="225" uuid="f44a867a-5269-11df-9928-080069138b88" uid="19886">
-    <category value="1" description="Guided" uuid="f44b8e9e-5269-11df-a693-080069138b88" uid="19887">
-      <subcategory value="1" description="AGM-86 Air Launched Cruise Missile (ALCM)" uuid="f44c9ed8-5269-11df-b22d-080069138b88" uid="19888">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="f44db106-5269-11df-98c8-080069138b88" uid="19889"/>
-        <specific value="2" description="AGM-86C" uuid="f44ebc22-5269-11df-885f-080069138b88" uid="19890"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f4506ec8-5269-11df-ae59-080069138b88" uid="19891"/>
-      <subcategory value="3" description="MGM-52C Lance" uuid="f4517f70-5269-11df-b468-080069138b88" uid="19892"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f45291f8-5269-11df-8a6b-080069138b88" uid="19893"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="f4539d82-5269-11df-8497-080069138b88" uid="19894"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f454b30c-5269-11df-b1ce-080069138b88" uid="19895"/>
-      <subcategory value="7" description="AGM-62 Walleye" uuid="f455c47c-5269-11df-943d-080069138b88" uid="19896"/>
-      <subcategory value="8" description="SRAM-A" uuid="f456cf84-5269-11df-9a9a-080069138b88" uid="19897">
-        <specific value="1" description="AGM-69A" uuid="f457dd70-5269-11df-856f-080069138b88" uid="19898"/>
-        <specific value="2" description="AGM-69B" uuid="f458f0d4-5269-11df-97e7-080069138b88" uid="19899"/>
-      </subcategory>
-      <subcategory value="9" description="SLAM" uuid="f45a9eb6-5269-11df-ae77-080069138b88" uid="19900">
-        <specific value="1" description="AGM/RGM 84E" uuid="f45ba96e-5269-11df-bad8-080069138b88" uid="19901"/>
-      </subcategory>
-      <subcategory value="10" description="Advanced Cruise Missile" uuid="f45d648e-5269-11df-998c-080069138b88" uid="19902">
-        <specific value="1" description="AGM-129A" uuid="f45e7798-5269-11df-9f2b-080069138b88" uid="19903"/>
-      </subcategory>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f46027be-5269-11df-995a-080069138b88" uid="19904"/>
-      <subcategory value="12" description="AGM 130" uuid="f4613b68-5269-11df-9bf8-080069138b88" uid="19905">
-        <specific value="1" description="AGM-130A" uuid="f46244d6-5269-11df-aef2-080069138b88" uid="19906"/>
-        <specific value="2" description="AGM-130C" uuid="f46353f8-5269-11df-9c2e-080069138b88" uid="19907"/>
-      </subcategory>
-      <subcategory value="13" description="Boeing 120-mm Fiber Optic Mortar Projectile (FOMP)" uuid="f4650720-5269-11df-b201-080069138b88" uid="19908"/>
-      <subcategory value="14" description="Mk-82" uuid="f46618fe-5269-11df-b69b-080069138b88" uid="19909">
-        <specific value="1" description="GBU-12 Mk 82 500-lb" uuid="f4672316-5269-11df-b901-080069138b88" uid="19910">
-          <extra value="1" description="Impact fuse" deprecated="1" uuid="f4683a12-5269-11df-b7b6-080069138b88" uid="19911"/>
-          <extra value="2" description=".10 sec delay" uuid="f4694b78-5269-11df-b2ff-080069138b88" uid="19912"/>
-          <extra value="3" description=".25 sec delay" uuid="f46a563a-5269-11df-b3b3-080069138b88" uid="19913"/>
-        </specific>
-        <specific value="2" description="GBU-38/B JDAM" uuid="f46c0d54-5269-11df-9c3b-080069138b88" uid="19914"/>
-      </subcategory>
-      <subcategory value="15" description="Mk-84 bomb" uuid="f46dbe24-5269-11df-8fa9-080069138b88" uid="19915">
-        <specific value="1" description="GBU-15 Glide Bomb" uuid="f46ece72-5269-11df-92eb-080069138b88" uid="19916"/>
-        <specific value="2" description="GBU-24A/B Glide Bomb" uuid="f46fe244-5269-11df-b968-080069138b88" uid="19917"/>
-        <specific value="3" description="PAVEWAY II laser-guided" uuid="f470ed2e-5269-11df-8338-080069138b88" uid="19918"/>
-        <specific value="4" description="GBU-10 Mk 84 2000-lb" uuid="f471fd68-5269-11df-aec1-080069138b88" uid="19919">
-          <extra value="1" description="Impact fuse" uuid="f4731108-5269-11df-8f53-080069138b88" uid="19920"/>
-          <extra value="2" description=".10 sec delay" uuid="f4741b16-5269-11df-ae6a-080069138b88" uid="19921"/>
-          <extra value="3" description=".25 sec delay" uuid="f47528ee-5269-11df-b76b-080069138b88" uid="19922"/>
-        </specific>
-        <specific value="5" description="Mk-84 GAMS" uuid="f476dbbc-5269-11df-a4f7-080069138b88" uid="19923"/>
-        <specific value="6" description="GBU-31A JDAM" uuid="f477ee62-5269-11df-99ef-080069138b88" uid="19924"/>
-      </subcategory>
-      <subcategory value="16" description="Paveway III" uuid="f4799bcc-5269-11df-b749-080069138b88" uid="19925">
-        <specific value="1" description="GBU-24A/B Mk 109/B 2000-lb pen Bm" uuid="f47aa4ae-5269-11df-902f-080069138b88" uid="19926"/>
-        <specific value="2" description="GBU-24B Mk 84 2000-lb HE bomb" uuid="f47bc0fa-5269-11df-8586-080069138b88" uid="19927"/>
-        <specific value="3" description="GBU-28B (BLU-113/B)" uuid="f47cd814-5269-11df-887b-080069138b88" uid="19928"/>
-      </subcategory>
-      <subcategory value="17" description="Army TACMS" uuid="f47e8858-5269-11df-99c6-080069138b88" uid="19929">
-        <specific value="1" description="M39" uuid="f47f90ea-5269-11df-83b6-080069138b88" uid="19930"/>
-        <specific value="2" description="Block IA" uuid="f480a39a-5269-11df-a220-080069138b88" uid="19931"/>
-        <specific value="3" description="Block II" uuid="f481b352-5269-11df-86c4-080069138b88" uid="19932"/>
-        <specific value="4" description="Block IIA" uuid="f482bd9c-5269-11df-957e-080069138b88" uid="19933"/>
-        <specific value="5" description="Block IA Unitary" uuid="f483cfde-5269-11df-8daf-080069138b88" uid="19934"/>
-      </subcategory>
-      <subcategory value="18" description="Mk-83 1000-lb LGB" uuid="f4857f8c-5269-11df-9f01-080069138b88" uid="19935">
-        <specific value="1" description="GBU - 16Mk 83" uuid="f48690de-5269-11df-bcf1-080069138b88" uid="19936"/>
-        <specific value="2" description="Mk 13/18" uuid="f4879e70-5269-11df-bf8a-080069138b88" uid="19937"/>
-        <specific value="3" description="GBU-32 JDAM" uuid="f488acd4-5269-11df-b158-080069138b88" uid="19938"/>
-      </subcategory>
-      <subcategory value="19" description="Tomahawk" uuid="f48a5f8e-5269-11df-8018-080069138b88" uid="19939">
-        <specific value="1" description="BGM - 109C (TLAM-C)" uuid="f48b6e74-5269-11df-bbf9-080069138b88" uid="19940"/>
-        <specific value="2" description="BGM - 109D (TLAM-D)" uuid="f48c79cc-5269-11df-a56d-080069138b88" uid="19941"/>
-        <specific value="3" description="Tactical Tomahawk Penetrator Variant Mk14" uuid="f48d8dbc-5269-11df-b682-080069138b88" uid="19942"/>
-        <specific value="4" description="Tactical Tomahawk Penatrator Variant Mk45 Mod1" uuid="f48ea0ee-5269-11df-adea-080069138b88" uid="19943"/>
-        <specific value="5" description="TACTOM BGM 109E" uuid="f48fae76-5269-11df-9646-080069138b88" uid="19944"/>
-      </subcategory>
-      <subcategory value="20" description="BLU-109/B Bomb" uuid="f4915e88-5269-11df-abf3-080069138b88" uid="19945">
-        <specific value="1" description="GBU-10G" uuid="f492714c-5269-11df-a4b2-080069138b88" uid="19946"/>
-        <specific value="2" description="GBU-10H" uuid="f49381fe-5269-11df-8cba-080069138b88" uid="19947"/>
-        <specific value="3" description="GBU-10J" uuid="f4948b94-5269-11df-b845-080069138b88" uid="19948"/>
-        <specific value="4" description="GBU-24A" uuid="f4959b56-5269-11df-ad78-080069138b88" uid="19949"/>
-        <specific value="5" description="GBU-27A" uuid="f496aa64-5269-11df-aa8c-080069138b88" uid="19950"/>
-        <specific value="6" description="GBU-15(V)-31" uuid="f497b81e-5269-11df-835c-080069138b88" uid="19951"/>
-        <specific value="7" description="GBU-15(V)-32" uuid="f498c7a4-5269-11df-ba0d-080069138b88" uid="19952"/>
-        <specific value="8" description="GBU-31B JDAM" uuid="f499d61c-5269-11df-be51-080069138b88" uid="19953"/>
-      </subcategory>
-      <subcategory value="21" description="AGM-154 Joint Standoff Munition" uuid="f49b9312-5269-11df-8bfa-080069138b88" uid="19954">
-        <specific value="1" description="AGM-154A (w/BLU-97 CEM)" uuid="f49ca054-5269-11df-940b-080069138b88" uid="19955"/>
-        <specific value="2" description="AGM-154B (w/BLU-108 SFW)" uuid="f49db0fc-5269-11df-a88c-080069138b88" uid="19956"/>
-        <specific value="3" description="AGM-154C (unitary w/BLU-111)" uuid="f49ec794-5269-11df-a532-080069138b88" uid="19957"/>
-      </subcategory>
-      <subcategory value="22" description="Wind-Corrected Munitions Dispenser (WCMD)" uuid="f4a076a2-5269-11df-8269-080069138b88" uid="19958">
-        <specific value="1" description="WCMD with Gator mines (BLU-91/92)" uuid="f4a1845c-5269-11df-80c6-080069138b88" uid="19959"/>
-        <specific value="2" description="WCMD with Combined Effects Munition (BLU-97/B)" uuid="f4a29b30-5269-11df-af98-080069138b88" uid="19960"/>
-        <specific value="3" description="CBU-105 (WCMD w/BLU-108 SFW)" uuid="f4a3ae12-5269-11df-af85-080069138b88" uid="19961"/>
-      </subcategory>
-      <subcategory value="23" description="Low Cost Autonomous Attack System (LOCAAS)" uuid="f4a55e7e-5269-11df-9e9b-080069138b88" uid="19962"/>
-      <subcategory value="24" description="Small Diameter Bomb" uuid="f4a66f26-5269-11df-aafe-080069138b88" uid="19963">
-        <specific value="1" description="GBU-39/B" uuid="f4a781f4-5269-11df-b7d2-080069138b88" uid="19964"/>
-        <specific value="2" description="GBU-40/B" uuid="f4a89198-5269-11df-8043-080069138b88" uid="19965"/>
-      </subcategory>
-      <subcategory value="25" description="Massive Ordnance Air Blast (MOAB)" uuid="f4aa4448-5269-11df-89c1-080069138b88" uid="19966">
-        <specific value="1" description="GBU-43/B" uuid="f4ab4f3c-5269-11df-8a83-080069138b88" uid="19967"/>
-      </subcategory>
-      <subcategory value="26" description="AGM-158 Joint Air-to-Surface Standoff Missile (JASSM)" uuid="f4ad0480-5269-11df-bf21-080069138b88" uid="19968">
-        <specific value="1" description="AGM-158A JASSM" uuid="f4ae1776-5269-11df-a0a0-080069138b88" uid="19969"/>
-        <specific value="2" description="AGM-158B JASSM-ER" uuid="f4af2616-5269-11df-b819-080069138b88" uid="19970"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Ballistic" uuid="f4b17a7e-5269-11df-a3da-080069138b88" uid="19971">
-      <subcategory value="1" description="20 mm" uuid="f4b28888-5269-11df-9eb2-080069138b88" uid="19972">
-        <specific value="1" description="M39" uuid="f4b3914c-5269-11df-90d7-080069138b88" uid="19973"/>
-        <specific value="2" description="M56 HEI" uuid="f4b4a3d4-5269-11df-a54b-080069138b88" uid="19974"/>
-        <specific value="3" description="M56A3 HE/I" uuid="f4b5b346-5269-11df-99ff-080069138b88" uid="19975"/>
-        <specific value="4" description="M210 HEI" uuid="f4b6bd90-5269-11df-81a6-080069138b88" uid="19976"/>
-        <specific value="5" description="M242 HE-I-T" uuid="f4b7cd66-5269-11df-8738-080069138b88" uid="19977"/>
-        <specific value="6" description="M246 HEIT-SD" uuid="f4b8dc42-5269-11df-9d3e-080069138b88" uid="19978"/>
-        <specific value="7" description="M246 HEI-T" uuid="f4b9f33e-5269-11df-ab96-080069138b88" uid="19979"/>
-        <specific value="8" description="M940 MPT-SD" uuid="f4bb0300-5269-11df-bc63-080069138b88" uid="19980"/>
-        <specific value="9" description="Mk 149 (Mod2, 4) CIWS" uuid="f4bc140c-5269-11df-870f-080069138b88" uid="19981"/>
-      </subcategory>
-      <subcategory value="2" description="25 mm" uuid="f4bdc766-5269-11df-971d-080069138b88" uid="19982">
-        <specific value="1" description="M792 HEI-T" uuid="f4bed0c0-5269-11df-a6f0-080069138b88" uid="19983"/>
-        <specific value="2" description="PGU-22/25 HE-I" uuid="f4bfe03c-5269-11df-adb1-080069138b88" uid="19984"/>
-        <specific value="3" description="M791 APDS-T" uuid="f4c0f3d2-5269-11df-a260-080069138b88" uid="19985"/>
-        <specific value="4" description="M919 APFSDS-T" uuid="f4c1fd86-5269-11df-90c9-080069138b88" uid="19986"/>
-      </subcategory>
-      <subcategory value="3" description="30 mm" uuid="f4c3ad7a-5269-11df-863a-080069138b88" uid="19987">
-        <specific value="1" description="M789 HEDP" uuid="f4c4bfee-5269-11df-91b0-080069138b88" uid="19988"/>
-        <specific value="2" description="M799 HE-I" uuid="f4c5ce66-5269-11df-a236-080069138b88" uid="19989"/>
-      </subcategory>
-      <subcategory value="4" description="40 mm" uuid="f4c77d42-5269-11df-b42e-080069138b88" uid="19990">
-        <specific value="1" description="Grenade cartridges" uuid="f4c88a3e-5269-11df-9b73-080069138b88" uid="19991"/>
-        <specific value="2" description="M433 HEDP" uuid="f4c999a6-5269-11df-a4d2-080069138b88" uid="19992"/>
-        <specific value="3" description="M397 Airburst" uuid="f4caa8aa-5269-11df-9200-080069138b88" uid="19993"/>
-        <specific value="4" description="M397A1 Airburst" uuid="f4cbb704-5269-11df-a9c1-080069138b88" uid="19994"/>
-        <specific value="5" description="M381 HE" uuid="f4ccc66c-5269-11df-93af-080069138b88" uid="19995"/>
-        <specific value="6" description="M386 HE" uuid="f4cdd5de-5269-11df-b9c8-080069138b88" uid="19996"/>
-        <specific value="7" description="M406 HE" uuid="f4cedf1a-5269-11df-aa77-080069138b88" uid="19997"/>
-        <specific value="8" description="(deprecated)" deprecated="1" uuid="f4cff008-5269-11df-9c04-080069138b88" uid="19998"/>
-        <specific value="9" description="M441 HE" uuid="f4d103a8-5269-11df-ad8f-080069138b88" uid="19999"/>
-        <specific value="10" description="M576 Buckshot" uuid="f4d20e60-5269-11df-9473-080069138b88" uid="20000"/>
-        <specific value="11" description="M583 White star parachute" uuid="f4d31e18-5269-11df-a125-080069138b88" uid="20001"/>
-        <specific value="12" description="M583A1 White star parachute" uuid="f4d4315e-5269-11df-aeab-080069138b88" uid="20002"/>
-        <specific value="13" description="M585 Star cluster" uuid="f4d53f86-5269-11df-8682-080069138b88" uid="20003"/>
-        <specific value="14" description="M651 Tactical CS" uuid="f4d64f02-5269-11df-833c-080069138b88" uid="20004"/>
-        <specific value="15" description="M661 Green star parachute" uuid="f4d75f8c-5269-11df-aadf-080069138b88" uid="20005"/>
-        <specific value="16" description="M662 Red star parachute" uuid="f4d873b8-5269-11df-8b3d-080069138b88" uid="20006"/>
-        <specific value="17" description="M676 Yellow smoke canopy" uuid="f4d988f2-5269-11df-b0d3-080069138b88" uid="20007"/>
-        <specific value="18" description="M680 White smoke canopy" uuid="f4da9a80-5269-11df-971f-080069138b88" uid="20008"/>
-        <specific value="19" description="M682 Red smoke canopy" uuid="f4dba6fa-5269-11df-92dd-080069138b88" uid="20009"/>
-        <specific value="20" description="M713 Red ground smoke marker" uuid="f4dcbbbc-5269-11df-aee3-080069138b88" uid="20010"/>
-        <specific value="21" description="M715 Green ground smoke marker" uuid="f4ddccaa-5269-11df-a92e-080069138b88" uid="20011"/>
-        <specific value="22" description="M716 Yellow ground smoke marker" uuid="f4ded9ce-5269-11df-9853-080069138b88" uid="20012"/>
-        <specific value="23" description="Grenade, HE, 40mm, M383" uuid="f4dfe9f4-5269-11df-afd4-080069138b88" uid="20013"/>
-      </subcategory>
-      <subcategory value="5" description="60 mm" uuid="f4e19e84-5269-11df-88b9-080069138b88" uid="20014">
-        <specific value="1" description="M49A4 HE bomb" uuid="f4e2ad4c-5269-11df-8bfa-080069138b88" uid="20015"/>
-        <specific value="2" description="M49A5 HE bomb" uuid="f4e3b61a-5269-11df-b398-080069138b88" uid="20016"/>
-        <specific value="3" description="M83A3 illuminating bomb" uuid="f4e4ca46-5269-11df-ba88-080069138b88" uid="20017"/>
-        <specific value="4" description="M302A2 smoke bomb" uuid="f4e5db2a-5269-11df-8c78-080069138b88" uid="20018"/>
-        <specific value="5" description="M720 HE bomb" uuid="f4e6e556-5269-11df-ad39-080069138b88" uid="20019"/>
-        <specific value="6" description="Projectile, 60-mm, HE-Frag, M888" uuid="f4e7f7a2-5269-11df-b0f1-080069138b88" uid="20020"/>
-      </subcategory>
-      <subcategory value="6" description="66 mm rocket" uuid="f4e9a926-5269-11df-a6fe-080069138b88" uid="20021"/>
-      <subcategory value="7" description="76 mm" uuid="f4eaba1e-5269-11df-95d2-080069138b88" uid="20022">
-        <specific value="1" description="M352 HE" uuid="f4ebc6e8-5269-11df-99d3-080069138b88" uid="20023"/>
-        <specific value="2" description="M361 smoke" uuid="f4ecd510-5269-11df-aff1-080069138b88" uid="20024"/>
-        <specific value="3" description="M361A1 smoke" uuid="f4ede4d2-5269-11df-af37-080069138b88" uid="20025"/>
-        <specific value="4" description="M363 HE" uuid="f4eef264-5269-11df-909e-080069138b88" uid="20026"/>
-      </subcategory>
-      <subcategory value="8" description="81 mm" uuid="f4f09fd8-5269-11df-a847-080069138b88" uid="20027">
-        <specific value="1" description="M43A1 HE bomb" uuid="f4f1aee6-5269-11df-8ff6-080069138b88" uid="20028"/>
-        <specific value="2" description="M43A1B1 HE bomb" uuid="f4f2c1dc-5269-11df-83b3-080069138b88" uid="20029"/>
-        <specific value="3" description="M57 smoke WP bomb" uuid="f4f3cc3a-5269-11df-9795-080069138b88" uid="20030"/>
-        <specific value="4" description="M57A1 smoke WP bomb" uuid="f4f4dd5a-5269-11df-b115-080069138b88" uid="20031"/>
-        <specific value="5" description="M301A1 illuminating bomb" uuid="f4f5ede4-5269-11df-b32c-080069138b88" uid="20032"/>
-        <specific value="6" description="M301A2 illuminating bomb" uuid="f4f70616-5269-11df-be8c-080069138b88" uid="20033"/>
-        <specific value="7" description="M301A3 illuminating bomb" uuid="f4f817fe-5269-11df-bbe4-080069138b88" uid="20034"/>
-        <specific value="8" description="M362 HE bomb" uuid="f4f928a6-5269-11df-9328-080069138b88" uid="20035"/>
-        <specific value="9" description="M362A1 HE bomb" uuid="f4fa33b8-5269-11df-87d4-080069138b88" uid="20036"/>
-        <specific value="10" description="M370 smoke bomb" uuid="f4fb44d8-5269-11df-a882-080069138b88" uid="20037"/>
-        <specific value="11" description="M374 HE bomb" uuid="f4fc588c-5269-11df-adf3-080069138b88" uid="20038"/>
-        <specific value="12" description="M374A2 HE bomb" uuid="f4fd6204-5269-11df-8491-080069138b88" uid="20039"/>
-        <specific value="13" description="M374A3 HE bomb" uuid="f4fe70fe-5269-11df-9d2a-080069138b88" uid="20040"/>
-        <specific value="14" description="M375 smoke bomb" uuid="f4ff83d6-5269-11df-bcf9-080069138b88" uid="20041"/>
-        <specific value="15" description="M375A1 smoke bomb" uuid="f50091e0-5269-11df-a43d-080069138b88" uid="20042"/>
-        <specific value="16" description="M375A2 smoke bomb" uuid="f501a1e8-5269-11df-ac7c-080069138b88" uid="20043"/>
-        <specific value="17" description="M445 training bomb" uuid="f502ab42-5269-11df-a3d0-080069138b88" uid="20044"/>
-        <specific value="18" description="Projectile, Mortar, 81mm, High Explosive M889A1" uuid="f503bc94-5269-11df-8090-080069138b88" uid="20045"/>
-      </subcategory>
-      <subcategory value="9" description="90 mm" uuid="f50572e6-5269-11df-b0ff-080069138b88" uid="20046">
-        <specific value="1" description="M71 HE" uuid="f50680aa-5269-11df-a2dc-080069138b88" uid="20047"/>
-        <specific value="2" description="M71 A1 HE-T" uuid="f5079094-5269-11df-9637-080069138b88" uid="20048"/>
-        <specific value="3" description="M313 smoke" uuid="f5089bf6-5269-11df-a4ae-080069138b88" uid="20049"/>
-        <specific value="4" description="M313C smoke" uuid="f509b07c-5269-11df-95e3-080069138b88" uid="20050"/>
-      </subcategory>
-      <subcategory value="10" description="105 mm" uuid="f50b5e72-5269-11df-be49-080069138b88" uid="20051">
-        <specific value="1" description="M1 HE" uuid="f50c6d8a-5269-11df-bcac-080069138b88" uid="20052"/>
-        <specific value="2" description="M60 Agent H/HD" uuid="f50d7b9e-5269-11df-a45b-080069138b88" uid="20053"/>
-        <specific value="3" description="M60 smoke" uuid="f50e8c82-5269-11df-8297-080069138b88" uid="20054"/>
-        <specific value="4" description="M84 smoke" uuid="f50f9b90-5269-11df-b531-080069138b88" uid="20055"/>
-        <specific value="5" description="M314 illumination" uuid="f510a9ea-5269-11df-9e6e-080069138b88" uid="20056"/>
-        <specific value="6" description="M314A3, illuminating cartridge" uuid="f511b9b6-5269-11df-9327-080069138b88" uid="20057"/>
-        <specific value="7" description="M327 HEP/HEP-T" uuid="f512caea-5269-11df-a8ef-080069138b88" uid="20058"/>
-        <specific value="8" description="M360 Agent GB" uuid="f513d3fe-5269-11df-9728-080069138b88" uid="20059"/>
-        <specific value="9" description="M393 HEP-T" uuid="f514ebc2-5269-11df-bbe3-080069138b88" uid="20060"/>
-        <specific value="10" description="M413 HE" uuid="f5160124-5269-11df-b23c-080069138b88" uid="20061"/>
-        <specific value="11" description="M416 smoke WP" uuid="f5170b50-5269-11df-bd8b-080069138b88" uid="20062"/>
-        <specific value="12" description="M444 HE" uuid="f5181d2e-5269-11df-bdc7-080069138b88" uid="20063"/>
-        <specific value="13" description="M548 HERA" uuid="f5192f8e-5269-11df-b184-080069138b88" uid="20064"/>
-        <specific value="14" description="M629 tactical CS" uuid="f51a3ce4-5269-11df-bb23-080069138b88" uid="20065"/>
-        <specific value="15" description="M657 HE-T" uuid="f51b4d46-5269-11df-be1b-080069138b88" uid="20066"/>
-        <specific value="16" description="M760 HE" uuid="f51c5b5a-5269-11df-b3df-080069138b88" uid="20067"/>
-        <specific value="17" description="M913 RAP" uuid="f51d6590-5269-11df-a0d4-080069138b88" uid="20068"/>
-        <specific value="18" description="XM872 KE" uuid="f51e7926-5269-11df-beeb-080069138b88" uid="20069"/>
-      </subcategory>
-      <subcategory value="11" description="120 mm" uuid="f520280c-5269-11df-a715-080069138b88" uid="20070">
-        <specific value="1" description="M933HE" uuid="f5213508-5269-11df-a382-080069138b88" uid="20071"/>
-        <specific value="2" description="M934HE" uuid="f52243d0-5269-11df-9e45-080069138b88" uid="20072"/>
-        <specific value="3" description="M57 HE" uuid="f52352a2-5269-11df-9715-080069138b88" uid="20073"/>
-        <specific value="4" description="M68 WP" uuid="f52461b0-5269-11df-baf1-080069138b88" uid="20074"/>
-        <specific value="5" description="M929 WP" uuid="f5256e8e-5269-11df-afb8-080069138b88" uid="20075"/>
-        <specific value="6" description="M91 Illumination" uuid="f5267f90-5269-11df-b584-080069138b88" uid="20076"/>
-        <specific value="7" description="M930 Illumination" uuid="f5278fca-5269-11df-b3d4-080069138b88" uid="20077"/>
-      </subcategory>
-      <subcategory value="12" description="127 mm (5.0 in)" uuid="f5293fc8-5269-11df-aa95-080069138b88" uid="20078">
-        <specific value="1" description="Zuni rocket" uuid="f52a4e2c-5269-11df-84fe-080069138b88" uid="20079"/>
-      </subcategory>
-      <subcategory value="13" description="152 mm" uuid="f52bfd58-5269-11df-b09d-080069138b88" uid="20080"/>
-      <subcategory value="14" description="155 mm" uuid="f52d0cde-5269-11df-b755-080069138b88" uid="20081">
-        <specific value="1" description="BGD155C ICM" uuid="f52e1e26-5269-11df-a649-080069138b88" uid="20082"/>
-        <specific value="2" description="M107 HE" uuid="f52f28ac-5269-11df-bccf-080069138b88" uid="20083">
-          <extra value="1" description="Variable time" uuid="f53038b4-5269-11df-8c58-080069138b88" uid="20084"/>
-          <extra value="2" description="Point detonating" uuid="f5314952-5269-11df-ae78-080069138b88" uid="20085"/>
-        </specific>
-        <specific value="3" description="M483A1 HE DP (ICM)" uuid="f532f7fc-5269-11df-b4a4-080069138b88" uid="20086"/>
-        <specific value="4" description="M485 illumination" uuid="f5340f02-5269-11df-ba75-080069138b88" uid="20087"/>
-        <specific value="5" description="M485A1 illumination" uuid="f53521e4-5269-11df-a434-080069138b88" uid="20088"/>
-        <specific value="6" description="M485A2 illumination" uuid="f53632be-5269-11df-95f7-080069138b88" uid="20089"/>
-        <specific value="7" description="M549 HE RA" uuid="f5373bd2-5269-11df-b6eb-080069138b88" uid="20090"/>
-        <specific value="8" description="M549A1 HE RA" uuid="f5384db0-5269-11df-a024-080069138b88" uid="20091"/>
-        <specific value="9" description="M864 BB ICM" uuid="f539636c-5269-11df-afbd-080069138b88" uid="20092"/>
-        <specific value="10" description="M449 APICM" uuid="f53a6d8e-5269-11df-ad62-080069138b88" uid="20093"/>
-        <specific value="11" description="M731 FASCAM ADAM" uuid="f53b7c1a-5269-11df-8567-080069138b88" uid="20094"/>
-        <specific value="12" description="M741" uuid="f53c8d8a-5269-11df-842a-080069138b88" uid="20095"/>
-        <specific value="13" description="M116A1 HC Smoke" uuid="f53d9b30-5269-11df-ab28-080069138b88" uid="20096"/>
-        <specific value="14" description="M825 WP" uuid="f53eaade-5269-11df-aaa0-080069138b88" uid="20097"/>
-        <specific value="15" description="Projectile, 155-mm, Extended Range, XM982" uuid="f53fbbae-5269-11df-8a96-080069138b88" uid="20098"/>
-        <specific value="16" description="M121 VX" uuid="f540c8b4-5269-11df-91c8-080069138b88" uid="20099"/>
-        <specific value="17" description="M121 GB" uuid="f541dce0-5269-11df-9ebb-080069138b88" uid="20100"/>
-        <specific value="18" description="M692 ADAM" uuid="f542eb12-5269-11df-a636-080069138b88" uid="20101"/>
-        <specific value="19" description="M718 RAAM-L" uuid="f543f520-5269-11df-a0a3-080069138b88" uid="20102"/>
-        <specific value="20" description="M795 HE" uuid="f545076c-5269-11df-8bfc-080069138b88" uid="20103">
-          <extra value="1" description="Variable time" uuid="f54615e4-5269-11df-96bf-080069138b88" uid="20104"/>
-          <extra value="2" description="Point detonating" uuid="f5471e76-5269-11df-93e8-080069138b88" uid="20105"/>
-        </specific>
-        <specific value="21" description="M687 BINARY" uuid="f548d1e4-5269-11df-8a99-080069138b88" uid="20106"/>
-      </subcategory>
-      <subcategory value="15" description="203 mm" uuid="f54a8052-5269-11df-84ad-080069138b88" uid="20107">
-        <specific value="1" description="M106 HE" uuid="f54b8f7e-5269-11df-99a8-080069138b88" uid="20108"/>
-        <specific value="2" description="M404 HE/ICM" uuid="f54ca076-5269-11df-ac7c-080069138b88" uid="20109"/>
-        <specific value="3" description="M422 nuclear" uuid="f54dab1a-5269-11df-a9cd-080069138b88" uid="20110"/>
-        <specific value="4" description="M426 Agent GB" uuid="f54ebbc2-5269-11df-b484-080069138b88" uid="20111"/>
-        <specific value="5" description="M509 HE/ICM" uuid="f54fcca6-5269-11df-a3ed-080069138b88" uid="20112"/>
-        <specific value="6" description="M509 A1, HE/ICM" uuid="f550d5ce-5269-11df-9d87-080069138b88" uid="20113"/>
-        <specific value="7" description="M650 HERA" uuid="f551e6e4-5269-11df-93c6-080069138b88" uid="20114"/>
-        <specific value="8" description="M753 nuclear" uuid="f553036c-5269-11df-91db-080069138b88" uid="20115"/>
-      </subcategory>
-      <subcategory value="16" description="227 mm rocket" uuid="f554b40a-5269-11df-8e08-080069138b88" uid="20116"/>
-      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="f555bd96-5269-11df-83ff-080069138b88" uid="20117"/>
-      <subcategory value="18" description="107 mm" uuid="f556d08c-5269-11df-a785-080069138b88" uid="20118">
-        <specific value="1" description="M328 smoke bomb" uuid="f557e562-5269-11df-af9b-080069138b88" uid="20119"/>
-        <specific value="2" description="M328 A1 smoke bomb" uuid="f558ef98-5269-11df-adab-080069138b88" uid="20120"/>
-        <specific value="3" description="M329 A1 HE bomb" uuid="f559fece-5269-11df-8337-080069138b88" uid="20121"/>
-        <specific value="4" description="M329 A2 HE bomb" uuid="f55b100c-5269-11df-9c71-080069138b88" uid="20122"/>
-        <specific value="5" description="M335 illuminating bomb" uuid="f55c1d80-5269-11df-a6ba-080069138b88" uid="20123"/>
-        <specific value="6" description="M335 A2 illuminating bomb" uuid="f55d2fae-5269-11df-8782-080069138b88" uid="20124"/>
-        <specific value="7" description="M630 tactical CS bomb" uuid="f55e3f66-5269-11df-9900-080069138b88" uid="20125"/>
-      </subcategory>
-      <subcategory value="19" description="7.62 mm" uuid="f55ff43c-5269-11df-a894-080069138b88" uid="20126">
-        <specific value="1" description="A131 (4 Ball &amp; 1 Tracer Mix)" uuid="f560ffa8-5269-11df-ab99-080069138b88" uid="20127"/>
-        <specific value="2" description="M62 (4 Ball &amp; 1 Tracer)" uuid="f5621492-5269-11df-b176-080069138b88" uid="20128"/>
-        <specific value="3" description="M80" uuid="f56336c4-5269-11df-9731-080069138b88" uid="20129"/>
-        <specific value="4" description="A131" uuid="f56444e2-5269-11df-a1e8-080069138b88" uid="20130"/>
-      </subcategory>
-      <subcategory value="20" description="12.7 mm" uuid="f565f418-5269-11df-a839-080069138b88" uid="20131">
-        <specific value="1" description="M2 ball" uuid="f567045c-5269-11df-9ca5-080069138b88" uid="20132"/>
-        <specific value="2" description="M17 tracer" uuid="f5681400-5269-11df-862f-080069138b88" uid="20133"/>
-        <specific value="3" description="M33 ball" uuid="f5692192-5269-11df-833d-080069138b88" uid="20134"/>
-        <specific value="4" description="A621 .50 4 Ball M33/1 Tr M17" uuid="f56a3280-5269-11df-8bb8-080069138b88" uid="20135"/>
-        <specific value="5" description=".50 Inc M1" uuid="f56b4210-5269-11df-9003-080069138b88" uid="20136"/>
-        <specific value="6" description=".50 Tr M1" uuid="f56c4e30-5269-11df-818c-080069138b88" uid="20137"/>
-        <specific value="7" description=".50 AP M2" uuid="f56d5d84-5269-11df-b8c6-080069138b88" uid="20138"/>
-        <specific value="8" description=".50 API M8" uuid="f56e6d64-5269-11df-81cf-080069138b88" uid="20139"/>
-        <specific value="9" description=".50 API-T M20" uuid="f56f763c-5269-11df-8b06-080069138b88" uid="20140"/>
-        <specific value="10" description=".50 Inc M23" uuid="f570893c-5269-11df-bdcf-080069138b88" uid="20141"/>
-        <specific value="11" description="A530 .50 4 AP M2/1 Tr M17" uuid="f571a31c-5269-11df-9e71-080069138b88" uid="20142"/>
-        <specific value="12" description="A534 .50 4 API M8/1 API-T M20" uuid="f572b040-5269-11df-a4ae-080069138b88" uid="20143"/>
-        <specific value="13" description="A539 .50 3 API M8/1 Tr M17" uuid="f573c49e-5269-11df-b85c-080069138b88" uid="20144"/>
-        <specific value="14" description="A540 .50 4 API M8/1 Tr M1" uuid="f574d582-5269-11df-986f-080069138b88" uid="20145"/>
-        <specific value="15" description="A547 .50 1 API M8/1 Inc M1" uuid="f575e29c-5269-11df-9094-080069138b88" uid="20146"/>
-        <specific value="16" description="A549 .50 2 AP M2/2 Inc M1/1 Tr M1" uuid="f576f74a-5269-11df-af29-080069138b88" uid="20147"/>
-        <specific value="17" description="A556 .50 4 Ball M2/1 Tr M1" uuid="f5780842-5269-11df-93e2-080069138b88" uid="20148"/>
-        <specific value="18" description="A557 .50 4 Ball M2/1 Tr M17" uuid="f57914a8-5269-11df-a619-080069138b88" uid="20149"/>
-      </subcategory>
-      <subcategory value="21" description="70 mm (2.75 in) rocket" uuid="f57aca00-5269-11df-b0a9-080069138b88" uid="20150">
-        <specific value="1" description="M 151 HE" uuid="f57bd9d6-5269-11df-bb21-080069138b88" uid="20151"/>
-        <specific value="2" description="M 255 flechette" uuid="f57ce772-5269-11df-916b-080069138b88" uid="20152"/>
-        <specific value="3" description="M 261 submunitions" uuid="f57df2b6-5269-11df-a1fe-080069138b88" uid="20153"/>
-        <specific value="4" description="M 262" uuid="f57f05ca-5269-11df-ae9c-080069138b88" uid="20154"/>
-        <specific value="5" description="M229 HE" uuid="f58014ec-5269-11df-86ac-080069138b88" uid="20155"/>
-        <specific value="6" description="Rocket, 2.75in, Smoke, WP, M264" uuid="f5811ea0-5269-11df-8f13-080069138b88" uid="20156"/>
-      </subcategory>
-      <subcategory value="22" description="175 mm" footnote="The M107 175-mm gun is no longer in service with the U.S. Army but is still used by some other nations." uuid="f582d57e-5269-11df-a809-080069138b88" uid="20157">
-        <specific value="1" description="M437A1 HE" uuid="f583eb30-5269-11df-9b8b-080069138b88" uid="20158"/>
-        <specific value="2" description="M437A2 HE" uuid="f584f99e-5269-11df-89b4-080069138b88" uid="20159"/>
-      </subcategory>
-      <subcategory value="23" description="165 mm" uuid="f586b22a-5269-11df-9c40-080069138b88" uid="20160">
-        <specific value="1" description="HEP" uuid="f587bad0-5269-11df-9130-080069138b88" uid="20161"/>
-      </subcategory>
-      <subcategory value="24" description="(deprecated)" deprecated="1" uuid="f5896d12-5269-11df-baa7-080069138b88" uid="20162"/>
-      <subcategory value="25" description="(deprecated)" deprecated="1" uuid="f58a8c92-5269-11df-8a6f-080069138b88" uid="20163"/>
-      <subcategory value="26" description="(deprecated)" deprecated="1" uuid="f58b9fe2-5269-11df-9586-080069138b88" uid="20164"/>
-      <subcategory value="27" description="(deprecated)" deprecated="1" uuid="f58d220e-5269-11df-b6fd-080069138b88" uid="20165"/>
-      <subcategory value="28" description="(deprecated)" deprecated="1" uuid="f58e3180-5269-11df-8ab8-080069138b88" uid="20166"/>
-      <subcategory value="29" description="(deprecated)" deprecated="1" uuid="f58f7b62-5269-11df-a81b-080069138b88" uid="20167"/>
-      <subcategory value="30" description="(deprecated)" deprecated="1" uuid="f5909d4e-5269-11df-86fe-080069138b88" uid="20168"/>
-      <subcategory value="31" description="(deprecated)" deprecated="1" uuid="f591a86a-5269-11df-89f1-080069138b88" uid="20169"/>
-      <subcategory value="32" description="(deprecated)" deprecated="1" uuid="f592ba7a-5269-11df-8eb9-080069138b88" uid="20170"/>
-      <subcategory value="33" description="(deprecated)" deprecated="1" uuid="f593d388-5269-11df-9e35-080069138b88" uid="20171"/>
-      <subcategory value="34" description="(deprecated)" deprecated="1" uuid="f594e2f0-5269-11df-b42c-080069138b88" uid="20172"/>
-      <subcategory value="35" description="(deprecated)" deprecated="1" uuid="f595f474-5269-11df-aa9f-080069138b88" uid="20173"/>
-      <subcategory value="36" description="(deprecated)" deprecated="1" uuid="f597067a-5269-11df-8d97-080069138b88" uid="20174"/>
-      <subcategory value="37" description="(deprecated)" deprecated="1" uuid="f5981330-5269-11df-babc-080069138b88" uid="20175"/>
-      <subcategory value="38" description="(deprecated)" deprecated="1" uuid="f5992996-5269-11df-bb17-080069138b88" uid="20176"/>
-      <subcategory value="39" description="(deprecated)" deprecated="1" uuid="f59a39f8-5269-11df-89a5-080069138b88" uid="20177"/>
-      <subcategory value="40" description="M76 vehicle smoke grenade" uuid="f59b44ba-5269-11df-8ab2-080069138b88" uid="20178"/>
-      <subcategory value="41" description="M243 smoke grenade" uuid="f59c594a-5269-11df-82c9-080069138b88" uid="20179"/>
-      <subcategory value="42" description="M250 smoke grenade" uuid="f59d6a10-5269-11df-9aa0-080069138b88" uid="20180"/>
-      <subcategory value="43" description="M257 grenade" uuid="f59e72ca-5269-11df-a84e-080069138b88" uid="20181">
-        <specific value="1" description="L8A1/A3 red phosphorous smoke grenade" uuid="f59f82a0-5269-11df-93db-080069138b88" uid="20182"/>
-        <specific value="2" description="L8A1/A3 WP smoke grenade" uuid="f5a09848-5269-11df-a681-080069138b88" uid="20183"/>
-      </subcategory>
-      <subcategory value="44" description="M545 universal fragmentation grenade" uuid="f5a247a6-5269-11df-afee-080069138b88" uid="20184"/>
-      <subcategory value="45" description="M560-series antipersonnel fragmentation grenades" uuid="f5a35290-5269-11df-a738-080069138b88" uid="20185"/>
-      <subcategory value="46" description="Ring Airfoil Grenade (RAG)" uuid="f5a46856-5269-11df-9d9a-080069138b88" uid="20186"/>
-      <subcategory value="47" description="(deprecated)" deprecated="1" uuid="f5a5791c-5269-11df-8f0d-080069138b88" uid="20187"/>
-      <subcategory value="48" description="(deprecated)" deprecated="1" uuid="f5a6862c-5269-11df-9dea-080069138b88" uid="20188"/>
-      <subcategory value="49" description="(deprecated)" deprecated="1" uuid="f5a799d6-5269-11df-9bc4-080069138b88" uid="20189"/>
-      <subcategory value="50" description="B28 nuclear bomb" uuid="f5a8aa24-5269-11df-ba01-080069138b88" uid="20190">
-        <specific value="1" description="B28 EX" uuid="f5a9b4c8-5269-11df-a663-080069138b88" uid="20191"/>
-        <specific value="2" description="B28 FI" uuid="f5aac386-5269-11df-b409-080069138b88" uid="20192"/>
-        <specific value="3" description="B28 IN" uuid="f5abd0f0-5269-11df-85be-080069138b88" uid="20193"/>
-        <specific value="4" description="B28 RE" uuid="f5acde0a-5269-11df-8a48-080069138b88" uid="20194"/>
-        <specific value="5" description="B28 RI" uuid="f5adec50-5269-11df-bb4f-080069138b88" uid="20195"/>
-      </subcategory>
-      <subcategory value="51" description="B43 nuclear bomb" uuid="f5afa61c-5269-11df-920a-080069138b88" uid="20196"/>
-      <subcategory value="52" description="B53 nuclear bomb" uuid="f5b0b50c-5269-11df-9ad8-080069138b88" uid="20197"/>
-      <subcategory value="53" description="B57 nuclear bomb" uuid="f5b1c3c0-5269-11df-a6b0-080069138b88" uid="20198"/>
-      <subcategory value="54" description="B61 nuclear bomb" uuid="f5b2d49a-5269-11df-916a-080069138b88" uid="20199">
-        <specific value="1" description="mod O" uuid="f5b3e3d0-5269-11df-ae4a-080069138b88" uid="20200"/>
-        <specific value="2" description="mod 1" uuid="f5b4ef8c-5269-11df-942f-080069138b88" uid="20201"/>
-        <specific value="3" description="mod 2" uuid="f5b5fe90-5269-11df-aba9-080069138b88" uid="20202"/>
-        <specific value="4" description="mod 3" uuid="f5b70d76-5269-11df-b764-080069138b88" uid="20203"/>
-        <specific value="5" description="mod 4" uuid="f5b814aa-5269-11df-8ba9-080069138b88" uid="20204"/>
-        <specific value="6" description="mod 5" uuid="f5b92688-5269-11df-835e-080069138b88" uid="20205"/>
-      </subcategory>
-      <subcategory value="55" description="B83 nuclear bomb" uuid="f5bad56e-5269-11df-9e55-080069138b88" uid="20206"/>
-      <subcategory value="56" description="BLU-73/B FAE Bomb" uuid="f5bbe6ac-5269-11df-a22d-080069138b88" uid="20207"/>
-      <subcategory value="57" description="BLU-109/B Bomb" uuid="f5bcf01a-5269-11df-8b36-080069138b88" uid="20208">
-        <specific value="1" description="GBU-10G" deprecated="1" uuid="f5be0360-5269-11df-80a6-080069138b88" uid="20209"/>
-        <specific value="2" description="GBU-10H" deprecated="1" uuid="f5bf12fa-5269-11df-a858-080069138b88" uid="20210"/>
-        <specific value="3" description="GBU-10J" deprecated="1" uuid="f5c01f60-5269-11df-bab0-080069138b88" uid="20211"/>
-        <specific value="4" description="GBU-24A" deprecated="1" uuid="f5c12ebe-5269-11df-bfdd-080069138b88" uid="20212"/>
-        <specific value="5" description="GBU-27A" deprecated="1" uuid="f5c24344-5269-11df-b7fe-080069138b88" uid="20213"/>
-        <specific value="6" description="GBU-15(V)-31" deprecated="1" uuid="f5c34e1a-5269-11df-af30-080069138b88" uid="20214"/>
-        <specific value="7" description="GBU-15(V)-32" deprecated="1" uuid="f5c45ec2-5269-11df-af51-080069138b88" uid="20215"/>
-        <specific value="8" description="BLU-109/B Low Drag" uuid="f5c570d2-5269-11df-b510-080069138b88" uid="20216">
-          <extra value="1" description="Impact fuse" uuid="f5c67de2-5269-11df-9779-080069138b88" uid="20217"/>
-          <extra value="2" description=".10 sec delay" uuid="f5c78cd2-5269-11df-b321-080069138b88" uid="20218"/>
-          <extra value="3" description=".25 sec delay" uuid="f5c89c4e-5269-11df-a957-080069138b88" uid="20219"/>
-        </specific>
-      </subcategory>
-      <subcategory value="58" description="CBU 15" uuid="f5cae92c-5269-11df-bf90-080069138b88" uid="20220"/>
-      <subcategory value="59" description="CBU 52" uuid="f5cbfb8c-5269-11df-9efe-080069138b88" uid="20221"/>
-      <subcategory value="60" description="CBU-55" uuid="f5cd0586-5269-11df-86c1-080069138b88" uid="20222">
-        <specific value="1" description="CBU-55/B" uuid="f5ce1cbe-5269-11df-962e-080069138b88" uid="20223"/>
-        <specific value="2" description="CBU-72" uuid="f5cf2c62-5269-11df-9088-080069138b88" uid="20224"/>
-      </subcategory>
-      <subcategory value="61" description="CBU 58" uuid="f5d0de18-5269-11df-a07f-080069138b88" uid="20225"/>
-      <subcategory value="62" description="CBU 71" uuid="f5d1e7cc-5269-11df-8355-080069138b88" uid="20226"/>
-      <subcategory value="63" description="CBU 75" uuid="f5d2f536-5269-11df-97be-080069138b88" uid="20227"/>
-      <subcategory value="64" description="CBU 87" uuid="f5d407c8-5269-11df-ac9d-080069138b88" uid="20228">
-        <specific value="1" description="CBU-87/B (CEM)" uuid="f5d5117c-5269-11df-b58c-080069138b88" uid="20229"/>
-      </subcategory>
-      <subcategory value="65" description="(deprecated)" deprecated="1" uuid="f5d6c0e4-5269-11df-ba60-080069138b88" uid="20230"/>
-      <subcategory value="66" description="CBU 89" uuid="f5d7d092-5269-11df-8b7b-080069138b88" uid="20231"/>
-      <subcategory value="67" description="CBU-97/B" uuid="f5d8e554-5269-11df-86b7-080069138b88" uid="20232"/>
-      <subcategory value="68" description="Direct Airfield Attack Combined Munition Weapon (DAACM)" uuid="f5d9f0ac-5269-11df-97d7-080069138b88" uid="20233"/>
-      <subcategory value="69" description="Durandal" uuid="f5db0492-5269-11df-bbc6-080069138b88" uid="20234"/>
-      <subcategory value="70" description="M117 GP bomb" uuid="f5dc13aa-5269-11df-8146-080069138b88" uid="20235">
-        <specific value="1" description="M117R" uuid="f5dd20f6-5269-11df-8ffb-080069138b88" uid="20236"/>
-      </subcategory>
-      <subcategory value="71" description="Mk-7 Dispenser" uuid="f5decf6e-5269-11df-85eb-080069138b88" uid="20237">
-        <specific value="1" description="CBU-78/B Gator mines (USN)" uuid="f5dfe0a2-5269-11df-afd0-080069138b88" uid="20238"/>
-        <specific value="2" description="CBU-59/B APAM" uuid="f5e0f000-5269-11df-8e29-080069138b88" uid="20239"/>
-      </subcategory>
-      <subcategory value="72" description="Mk-81" uuid="f5e2a36e-5269-11df-8490-080069138b88" uid="20240">
-        <specific value="1" description="Mk-81 Low Drag General Purpose" uuid="f5e3acc8-5269-11df-9873-080069138b88" uid="20241"/>
-        <specific value="2" description="Mk-81 Snakeye" uuid="f5e4bfa0-5269-11df-bda0-080069138b88" uid="20242"/>
-      </subcategory>
-      <subcategory value="73" description="Mk-82" uuid="f5e671d8-5269-11df-9dc8-080069138b88" uid="20243">
-        <specific value="1" description="Mk-82 air inflatable retard" uuid="f5e78050-5269-11df-81ef-080069138b88" uid="20244">
-          <extra value="1" description="Impact fuse" uuid="f5e88aa4-5269-11df-b235-080069138b88" uid="20245"/>
-          <extra value="4" description="Proximity fuse" uuid="f5e99b42-5269-11df-90d7-080069138b88" uid="20246"/>
-        </specific>
-        <specific value="2" description="Mk-82 Low Drag General Purpose" uuid="f5eb4c76-5269-11df-b965-080069138b88" uid="20247">
-          <extra value="1" description="Impact fuse" uuid="f5ec65d4-5269-11df-9de4-080069138b88" uid="20248"/>
-          <extra value="2" description=".10 sec. delay" uuid="f5ed6fe2-5269-11df-aaa9-080069138b88" uid="20249"/>
-          <extra value="3" description=".25 sec. delay" uuid="f5ee7f04-5269-11df-b86c-080069138b88" uid="20250"/>
-        </specific>
-        <specific value="3" description="MK-82 Snakeye" uuid="f5f02f66-5269-11df-beab-080069138b88" uid="20251">
-          <extra value="1" description="Impact fuse" uuid="f5f14432-5269-11df-bc1d-080069138b88" uid="20252"/>
-          <extra value="4" description="Proximity fuse" uuid="f5f24df0-5269-11df-8e0a-080069138b88" uid="20253"/>
-        </specific>
-        <specific value="4" description="BLU-111/B" uuid="f5f3fd8a-5269-11df-9286-080069138b88" uid="20254"/>
-      </subcategory>
-      <subcategory value="74" description="Mk-83" uuid="f5f5aedc-5269-11df-ae05-080069138b88" uid="20255">
-        <specific value="1" description="BLU-110/B" uuid="f5f6bd72-5269-11df-85ed-080069138b88" uid="20256"/>
-      </subcategory>
-      <subcategory value="75" description="Mk-84" uuid="f5f86e74-5269-11df-8714-080069138b88" uid="20257">
-        <specific value="1" description="Mk-84 air inflatable retard" uuid="f5f97ce2-5269-11df-9fdf-080069138b88" uid="20258">
-          <extra value="1" description="Impact fuse" uuid="f5fa866e-5269-11df-86a1-080069138b88" uid="20259"/>
-          <extra value="4" description="Proximity fuse" uuid="f5fba242-5269-11df-a00c-080069138b88" uid="20260"/>
-        </specific>
-        <specific value="2" description="MK-84 Low Drag General Purpose" uuid="f5fd56dc-5269-11df-ae71-080069138b88" uid="20261">
-          <extra value="1" description="Impact fuse" uuid="f5fe672a-5269-11df-90f0-080069138b88" uid="20262"/>
-          <extra value="2" description=".10 sec. delay" uuid="f5ff6e7c-5269-11df-90f4-080069138b88" uid="20263"/>
-          <extra value="3" description=".25 sec delay" uuid="f6007f9c-5269-11df-97ad-080069138b88" uid="20264"/>
-        </specific>
-      </subcategory>
-      <subcategory value="76" description="Sensor Fused Weapon (SFW)" uuid="f602d15c-5269-11df-9f1a-080069138b88" uid="20265"/>
-      <subcategory value="77" description="165mm HEP" uuid="f603e218-5269-11df-8e17-080069138b88" uid="20266"/>
-      <subcategory value="78" description="Napalm" uuid="f604f46e-5269-11df-99fa-080069138b88" uid="20267"/>
-      <subcategory value="79" description="Mine Clearing Lane Charge" uuid="f60603ea-5269-11df-be43-080069138b88" uid="20268"/>
-      <subcategory value="80" description="MLRS Rocket" uuid="f6070f24-5269-11df-b322-080069138b88" uid="20269">
-        <specific value="1" description="M26" uuid="f6081e82-5269-11df-90a2-080069138b88" uid="20270"/>
-        <specific value="2" description="M28A1" uuid="f6092bce-5269-11df-9d12-080069138b88" uid="20271"/>
-        <specific value="3" description="MLRS-ER" uuid="f60a39a6-5269-11df-8582-080069138b88" uid="20272"/>
-      </subcategory>
-      <subcategory value="81" description="5.56 MM" uuid="f60bf0ca-5269-11df-a131-080069138b88" uid="20273">
-        <specific value="1" description="M855 Ball" uuid="f60d006e-5269-11df-9edb-080069138b88" uid="20274"/>
-        <specific value="2" description="M856 Tracer" uuid="f60e0e0a-5269-11df-95ed-080069138b88" uid="20275"/>
-        <specific value="3" description="A064 (4 ball &amp; 1 tracer mix)" uuid="f60f1cc8-5269-11df-963b-080069138b88" uid="20276"/>
-      </subcategory>
-      <subcategory value="82" description="M87 mine canister" uuid="f610cce4-5269-11df-af27-080069138b88" uid="20277"/>
-      <subcategory value="83" description="BLU-82/B" uuid="f611dd5a-5269-11df-a82a-080069138b88" uid="20278"/>
-    </category>
-    <category value="3" description="Fixed" uuid="f6138d1c-5269-11df-ac7a-080069138b88" uid="20279">
-      <subcategory value="1" description="SLAM" uuid="f6149f90-5269-11df-b873-080069138b88" uid="20280"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="225" uuid="f616eaf2-5269-11df-b0bc-080069138b88" uid="20281">
-    <category value="1" description="Guided" uuid="f617f9ba-5269-11df-a562-080069138b88" uid="20282">
-      <subcategory value="1" description="AGM-86B ALCM" uuid="f6190058-5269-11df-a544-080069138b88" uid="20283"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f61a1182-5269-11df-9bd2-080069138b88" uid="20284"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f61b26da-5269-11df-8ffb-080069138b88" uid="20285"/>
-      <subcategory value="4" description="Tomahawk" uuid="f61c30ca-5269-11df-923b-080069138b88" uid="20286">
-        <specific value="1" description="BGM-109A (TLAM-N)" uuid="f61d3f56-5269-11df-beff-080069138b88" uid="20287"/>
-      </subcategory>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="f61ef0c6-5269-11df-ae93-080069138b88" uid="20288"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f620086c-5269-11df-aa4c-080069138b88" uid="20289"/>
-      <subcategory value="7" description="LGM-30G Minuteman III" uuid="f621131a-5269-11df-9b01-080069138b88" uid="20290"/>
-      <subcategory value="8" description="MGM-118 Peacekeeper" uuid="f62222aa-5269-11df-aa09-080069138b88" uid="20291"/>
-      <subcategory value="9" description="UGM-73 Poseidon" uuid="f623382a-5269-11df-826a-080069138b88" uid="20292"/>
-      <subcategory value="10" description="UGM-93A Trident (II)" uuid="f624431e-5269-11df-8f83-080069138b88" uid="20293"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="12" country="225" uuid="f626977c-5269-11df-9e5c-080069138b88" uid="20294">
-    <category value="1" description="Point Effect DE Weapon" uuid="f6279fe6-5269-11df-be8b-080069138b88" uid="20295">
-      <subcategory value="1" description="Laser Weapon" uuid="f628af4e-5269-11df-8bbd-080069138b88" uid="20296">
-        <specific value="1" description="Chemical Oxygen Iodine Laser (COIL)" uuid="f629ca64-5269-11df-a0fc-080069138b88" uid="20297"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Area Effect DE Weapon" uuid="f62c1a76-5269-11df-b738-080069138b88" uid="20298">
-      <subcategory value="1" description="High Power Microwave (HPM) Weapon" uuid="f62d28b2-5269-11df-ad90-080069138b88" uid="20299"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="222" uuid="f62f7a36-5269-11df-9da8-080069138b88" uid="20300">
-    <category value="1" description="Guided" uuid="f63087e6-5269-11df-bf31-080069138b88" uid="20301">
-      <subcategory value="1" description="AA-1 Alkali" uuid="f631937a-5269-11df-baed-080069138b88" uid="20302"/>
-      <subcategory value="2" description="AA-2 Atoll" uuid="f632a3fa-5269-11df-afa1-080069138b88" uid="20303">
-        <specific value="1" description="AA-2C" uuid="f633adae-5269-11df-aa18-080069138b88" uid="20304"/>
-        <specific value="2" description="AA-2D" uuid="f634c00e-5269-11df-85ff-080069138b88" uid="20305"/>
-      </subcategory>
-      <subcategory value="3" description="AA-3 Anab" uuid="f6366b66-5269-11df-888d-080069138b88" uid="20306">
-        <specific value="1" description="AA-3, IR" uuid="f6377cd6-5269-11df-adc2-080069138b88" uid="20307"/>
-        <specific value="2" description="AA-3, radar" uuid="f6388b30-5269-11df-acda-080069138b88" uid="20308"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f63a3a3e-5269-11df-8975-080069138b88" uid="20309"/>
-      <subcategory value="5" description="AA-5 Ash" uuid="f63b43b6-5269-11df-9b46-080069138b88" uid="20310">
-        <specific value="1" description="AA-5, IR" uuid="f63c5670-5269-11df-889f-080069138b88" uid="20311"/>
-        <specific value="2" description="AA-5, radar" uuid="f63d64fc-5269-11df-91d2-080069138b88" uid="20312"/>
-      </subcategory>
-      <subcategory value="6" description="AA-6 Acrid" uuid="f63f25b2-5269-11df-ae46-080069138b88" uid="20313">
-        <specific value="1" description="AA-6, IR" uuid="f6402ee4-5269-11df-80a2-080069138b88" uid="20314"/>
-        <specific value="2" description="AA-6, radar" uuid="f6413e7e-5269-11df-8b06-080069138b88" uid="20315"/>
-      </subcategory>
-      <subcategory value="7" description="AA-7 Apex" uuid="f642f1b0-5269-11df-9140-080069138b88" uid="20316">
-        <specific value="1" description="AA-7, IR" uuid="f6440028-5269-11df-a882-080069138b88" uid="20317"/>
-        <specific value="2" description="AA-7, radar" uuid="f645087e-5269-11df-969a-080069138b88" uid="20318"/>
-      </subcategory>
-      <subcategory value="8" description="AA-8 Aphid" uuid="f646bb7e-5269-11df-bb53-080069138b88" uid="20319">
-        <specific value="1" description="AA-8A Aphid" uuid="f647cb04-5269-11df-84ab-080069138b88" uid="20320"/>
-        <specific value="2" description="AA-8B Aphid" uuid="f648e21e-5269-11df-b3fd-080069138b88" uid="20321"/>
-        <specific value="3" description="AA-8C Aphid" uuid="f649ea9c-5269-11df-afb3-080069138b88" uid="20322"/>
-      </subcategory>
-      <subcategory value="9" description="AA-9 Amos" uuid="f64b9c7a-5269-11df-876a-080069138b88" uid="20323">
-        <specific value="1" description="AA-9, inertial" uuid="f64caad4-5269-11df-94b3-080069138b88" uid="20324"/>
-        <specific value="2" description="AA-9, command update" uuid="f64dba78-5269-11df-bcbf-080069138b88" uid="20325"/>
-        <specific value="3" description="AA-9, radar" uuid="f64ec422-5269-11df-9a23-080069138b88" uid="20326"/>
-      </subcategory>
-      <subcategory value="10" description="AA-10 Alamo" uuid="f6507790-5269-11df-96b3-080069138b88" uid="20327">
-        <specific value="1" description="AA-10A, short burn radar" uuid="f65185e0-5269-11df-89b4-080069138b88" uid="20328"/>
-        <specific value="2" description="AA-10B, short burn, IR" uuid="f6529836-5269-11df-a87d-080069138b88" uid="20329"/>
-        <specific value="3" description="AA-10C, long burn radar" uuid="f653a1fe-5269-11df-a093-080069138b88" uid="20330"/>
-        <specific value="4" description="AA-10D, long burn, IR" uuid="f654b350-5269-11df-8035-080069138b88" uid="20331"/>
-      </subcategory>
-      <subcategory value="11" description="AA-11 Archer" uuid="f656660a-5269-11df-860e-080069138b88" uid="20332"/>
-      <subcategory value="12" description="AA-X-12" uuid="f65774fa-5269-11df-bf1f-080069138b88" uid="20333"/>
-      <subcategory value="13" description="SA-1 Guild" deprecated="1" uuid="f6587f76-5269-11df-83d4-080069138b88" uid="20334"/>
-      <subcategory value="14" description="SA-2 Guideline" uuid="f6599190-5269-11df-af88-080069138b88" uid="20335">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="f65aa526-5269-11df-8ff8-080069138b88" uid="20336"/>
-        <specific value="2" description="SA-2b Guideline Mod 1" uuid="f65baf8e-5269-11df-a8c7-080069138b88" uid="20337"/>
-        <specific value="3" description="SA-2d Guideline Mod3" uuid="f65cbf5a-5269-11df-8ea8-080069138b88" uid="20338"/>
-        <specific value="4" description="SA-2f Guideline Mod5" uuid="f65dd0d4-5269-11df-9d67-080069138b88" uid="20339"/>
-      </subcategory>
-      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="f65f81ea-5269-11df-a57d-080069138b88" uid="20340"/>
-      <subcategory value="16" description="SA-4 Ganef" uuid="f6608fae-5269-11df-a967-080069138b88" uid="20341">
-        <specific value="1" description="SA-4A" uuid="f6619f8e-5269-11df-bc24-080069138b88" uid="20342"/>
-        <specific value="2" description="SA-4B" uuid="f662aea6-5269-11df-8ba3-080069138b88" uid="20343"/>
-      </subcategory>
-      <subcategory value="17" description="SA-5 Gammon" uuid="f6645d8c-5269-11df-ba1f-080069138b88" uid="20344">
-        <specific value="1" description="SA-5A" uuid="f6656984-5269-11df-a5a1-080069138b88" uid="20345"/>
-        <specific value="2" description="SA-5B" uuid="f6667838-5269-11df-8057-080069138b88" uid="20346"/>
-        <specific value="3" description="SA-5C" uuid="f6678e4e-5269-11df-a977-080069138b88" uid="20347"/>
-      </subcategory>
-      <subcategory value="18" description="SA-6 Gainful" uuid="f6694036-5269-11df-80b2-080069138b88" uid="20348">
-        <specific value="1" description="SA-6A" uuid="f66a48f0-5269-11df-91a4-080069138b88" uid="20349"/>
-        <specific value="2" description="SA-6B" uuid="f66b5a38-5269-11df-91ac-080069138b88" uid="20350"/>
-      </subcategory>
-      <subcategory value="19" description="SA-7 Grail" uuid="f66d0798-5269-11df-a5f0-080069138b88" uid="20351">
-        <specific value="1" description="SA-7A" uuid="f66e167e-5269-11df-b0e6-080069138b88" uid="20352"/>
-        <specific value="2" description="SA-7B" uuid="f66f20fa-5269-11df-aeed-080069138b88" uid="20353"/>
-        <specific value="3" description="SA-7B (Spetsnaz mod)" uuid="f6702fc2-5269-11df-a7c5-080069138b88" uid="20354"/>
-        <specific value="4" description="SA-7C" uuid="f6714290-5269-11df-8c1d-080069138b88" uid="20355"/>
-      </subcategory>
-      <subcategory value="20" description="SA-8 Gecko" uuid="f672f464-5269-11df-b395-080069138b88" uid="20356">
-        <specific value="1" description="SA-8A mod 0" uuid="f673fc24-5269-11df-894b-080069138b88" uid="20357"/>
-        <specific value="2" description="SA-8B mod 1" uuid="f6750b5a-5269-11df-a4cb-080069138b88" uid="20358"/>
-      </subcategory>
-      <subcategory value="21" description="SA-9 Gaskin" uuid="f676be14-5269-11df-a35c-080069138b88" uid="20359"/>
-      <subcategory value="22" description="SA-10 Grumble" uuid="f677ccf0-5269-11df-9584-080069138b88" uid="20360">
-        <specific value="1" description="SA-10a Grumble Mod 0" uuid="f678d5dc-5269-11df-a448-080069138b88" uid="20361"/>
-        <specific value="2" description="SA-10b Grumble Mod 1" uuid="f679e74c-5269-11df-8df7-080069138b88" uid="20362"/>
-        <specific value="3" description="SA-10c Grumble Mod 2" uuid="f67afb64-5269-11df-b35f-080069138b88" uid="20363"/>
-      </subcategory>
-      <subcategory value="23" description="SA-11 Gadfly" uuid="f67ca9fa-5269-11df-9559-080069138b88" uid="20364"/>
-      <subcategory value="24" description="SA-12 Gladiator/Giant" uuid="f67db282-5269-11df-b750-080069138b88" uid="20365">
-        <specific value="1" description="SA-12A Gladiator SAM" uuid="f67ec5e6-5269-11df-acf0-080069138b88" uid="20366"/>
-        <specific value="2" description="(deprecated)" deprecated="1" uuid="f67fd9ea-5269-11df-8f2a-080069138b88" uid="20367"/>
-        <specific value="3" description="SA-X-12B Giant SAM" uuid="f680e4c0-5269-11df-a5a8-080069138b88" uid="20368"/>
-        <specific value="4" description="SA-X-12B Giant SAM (rail w/ SS-24)" uuid="f681f4be-5269-11df-9558-080069138b88" uid="20369"/>
-      </subcategory>
-      <subcategory value="25" description="SA-13 Gopher" uuid="f683aa3e-5269-11df-bae6-080069138b88" uid="20370">
-        <specific value="1" description="Strela 10M2" uuid="f684b82a-5269-11df-ac7a-080069138b88" uid="20371"/>
-        <specific value="2" description="Strela 10M3" uuid="f685c9fe-5269-11df-a9f7-080069138b88" uid="20372"/>
-      </subcategory>
-      <subcategory value="26" description="SA-14 Gremlin" uuid="f6877c18-5269-11df-afd2-080069138b88" uid="20373"/>
-      <subcategory value="27" description="SA-15 Gauntlet" uuid="f6888c2a-5269-11df-a285-080069138b88" uid="20374"/>
-      <subcategory value="28" description="SA-16 Gimlet" uuid="f6899dfe-5269-11df-9019-080069138b88" uid="20375"/>
-      <subcategory value="29" description="SA-17 Grizzly" uuid="f68aa6e0-5269-11df-affd-080069138b88" uid="20376"/>
-      <subcategory value="30" description="SA-18" uuid="f68bb6fc-5269-11df-a6a3-080069138b88" uid="20377"/>
-      <subcategory value="31" description="SA-19 Grison" uuid="f68cc678-5269-11df-af7f-080069138b88" uid="20378">
-        <specific value="1" description="SA-N-11" uuid="f68dd360-5269-11df-915a-080069138b88" uid="20379"/>
-      </subcategory>
-      <subcategory value="32" description="SA-N-1 Goa (M-1 Volga-M)" uuid="f68f7f76-5269-11df-a8e3-080069138b88" uid="20380"/>
-      <subcategory value="33" description="SA-N-3 Goblet" uuid="f6909050-5269-11df-a547-080069138b88" uid="20381">
-        <specific value="1" description="SA-N-3 Mod 0" uuid="f691a328-5269-11df-baee-080069138b88" uid="20382"/>
-        <specific value="2" description="SA-N-3B Mod 1" uuid="f692adf4-5269-11df-807c-080069138b88" uid="20383"/>
-      </subcategory>
-      <subcategory value="34" description="SA-N-4 (OSA-M)" uuid="f6946144-5269-11df-a3a7-080069138b88" uid="20384"/>
-      <subcategory value="35" description="SA-N-5 Grail (Strela 2)" uuid="f6957624-5269-11df-9856-080069138b88" uid="20385"/>
-      <subcategory value="36" description="SA-N-6" uuid="f69686ea-5269-11df-b815-080069138b88" uid="20386"/>
-      <subcategory value="37" description="SA-N-7 Gadfly (Smerch/Shtil)" uuid="f6979120-5269-11df-bcd6-080069138b88" uid="20387"/>
-      <subcategory value="38" description="SA-N-8 Gremlin (Strela 3)" uuid="f698a420-5269-11df-886c-080069138b88" uid="20388"/>
-      <subcategory value="39" description="SA-N-9 Tor-M/Klinok" uuid="f699b568-5269-11df-8bf9-080069138b88" uid="20389"/>
-      <subcategory value="40" description="SA-N-11 (9M311)" uuid="f69ac052-5269-11df-89c7-080069138b88" uid="20390"/>
-      <subcategory value="41" description="SA-3 Goa" uuid="f69bd096-5269-11df-81ea-080069138b88" uid="20391"/>
-      <subcategory value="42" description="SA-20 Gargoyle" uuid="f69cdf7c-5269-11df-bb7a-080069138b88" uid="20392"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f69e911e-5269-11df-8a5f-080069138b88" uid="20393">
-      <subcategory value="1" description="12.7 mm" uuid="f69f991a-5269-11df-ab99-080069138b88" uid="20394"/>
-      <subcategory value="2" description="14.5 mm" uuid="f6a0a738-5269-11df-a4c2-080069138b88" uid="20395">
-        <specific value="1" description="API" uuid="f6a1b8ee-5269-11df-9035-080069138b88" uid="20396"/>
-        <specific value="2" description="API-T" uuid="f6a2c1f8-5269-11df-84fa-080069138b88" uid="20397"/>
-        <specific value="3" description="I-T" uuid="f6a3d0c0-5269-11df-a857-080069138b88" uid="20398"/>
-      </subcategory>
-      <subcategory value="3" description="23 mm" uuid="f6a58956-5269-11df-8503-080069138b88" uid="20399">
-        <specific value="1" description="NS HE-I-T OZT" uuid="f6a697e2-5269-11df-90ba-080069138b88" uid="20400"/>
-        <specific value="2" description="NS AP-I BZ" uuid="f6a7a43e-5269-11df-9f0c-080069138b88" uid="20401"/>
-        <specific value="3" description="VYa HE-I-T OZT" uuid="f6a8b36a-5269-11df-8ebd-080069138b88" uid="20402"/>
-        <specific value="4" description="VYa AP-I BZ" uuid="f6a9c138-5269-11df-99f6-080069138b88" uid="20403"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f6ab7758-5269-11df-bd75-080069138b88" uid="20404"/>
-      <subcategory value="5" description="25 mm" uuid="f6ac82ce-5269-11df-9ab2-080069138b88" uid="20405">
-        <specific value="1" description="M1940 HE-I-T UOZR-132" uuid="f6ad90ec-5269-11df-ba96-080069138b88" uid="20406"/>
-        <specific value="2" description="M1940 AP-T UZR-132" uuid="f6ae9ef6-5269-11df-90c2-080069138b88" uid="20407"/>
-        <specific value="3" description="2-M3" uuid="f6afadaa-5269-11df-8ad5-080069138b88" uid="20408"/>
-        <specific value="4" description="2-M8" uuid="f6b0bb78-5269-11df-8acc-080069138b88" uid="20409"/>
-      </subcategory>
-      <subcategory value="6" description="30 mm" uuid="f6b2696e-5269-11df-a219-080069138b88" uid="20410">
-        <specific value="1" description="BR-83 AP-T" uuid="f6b37688-5269-11df-995d-080069138b88" uid="20411"/>
-        <specific value="2" description="OF-83D HE" uuid="f6b48456-5269-11df-a97a-080069138b88" uid="20412"/>
-      </subcategory>
-      <subcategory value="7" description="57 mm" uuid="f6b631d4-5269-11df-91b3-080069138b88" uid="20413"/>
-      <subcategory value="8" description="76 mm" uuid="f6b74114-5269-11df-8152-080069138b88" uid="20414"/>
-      <subcategory value="9" description="85 mm" uuid="f6b85162-5269-11df-ad03-080069138b88" uid="20415"/>
-      <subcategory value="10" description="100 mm" uuid="f6b95aa8-5269-11df-b7b0-080069138b88" uid="20416"/>
-      <subcategory value="11" description="130 mm" uuid="f6ba6a1a-5269-11df-8c08-080069138b88" uid="20417">
-        <specific value="1" description="SM-4-1" uuid="f6bb7a68-5269-11df-9ca8-080069138b88" uid="20418"/>
-      </subcategory>
-      <subcategory value="12" description="37 mm" uuid="f6bd2804-5269-11df-8452-080069138b88" uid="20419"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="222" uuid="f6bf75dc-5269-11df-8420-080069138b88" uid="20420">
-    <category value="1" description="Guided" uuid="f6c0833c-5269-11df-b701-080069138b88" uid="20421">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f6c18a8e-5269-11df-a088-080069138b88" uid="20422"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f6c2a6b2-5269-11df-9328-080069138b88" uid="20423"/>
-      <subcategory value="3" description="AT-1 Snapper" uuid="f6c3b8a4-5269-11df-a7db-080069138b88" uid="20424"/>
-      <subcategory value="4" description="AT-2 Swatter" uuid="f6c4c294-5269-11df-b846-080069138b88" uid="20425">
-        <specific value="1" description="Swatter A/B (radio command)" uuid="f6c5d486-5269-11df-b3b3-080069138b88" uid="20426"/>
-        <specific value="2" description="Swatter C (SACLOS)" uuid="f6c6e470-5269-11df-be11-080069138b88" uid="20427"/>
-      </subcategory>
-      <subcategory value="5" description="AT-3 Sagger" uuid="f6c892de-5269-11df-a06a-080069138b88" uid="20428">
-        <specific value="1" description="Sagger (MCLOS)" uuid="f6c9a03e-5269-11df-a4a6-080069138b88" uid="20429"/>
-      </subcategory>
-      <subcategory value="6" description="AT-4 Spigot" uuid="f6cb4c22-5269-11df-8efc-080069138b88" uid="20430">
-        <specific value="1" description="Spigot A" uuid="f6cc5cd4-5269-11df-98ed-080069138b88" uid="20431"/>
-        <specific value="2" description="Spigot B" uuid="f6cd6732-5269-11df-a319-080069138b88" uid="20432"/>
-      </subcategory>
-      <subcategory value="7" description="AT-5 Spandrel" uuid="f6cf1bcc-5269-11df-9f64-080069138b88" uid="20433"/>
-      <subcategory value="8" description="AT-6 Spiral" uuid="f6d02490-5269-11df-ad9d-080069138b88" uid="20434"/>
-      <subcategory value="9" description="AT-7 Saxhorn" uuid="f6d134de-5269-11df-a5d2-080069138b88" uid="20435">
-        <specific value="1" description="AT-13 Metis-M" uuid="f6d24784-5269-11df-83d5-080069138b88" uid="20436"/>
-      </subcategory>
-      <subcategory value="10" description="AT-8 Songster" uuid="f6d3f4da-5269-11df-8c58-080069138b88" uid="20437"/>
-      <subcategory value="11" description="AT-9" uuid="f6d4fd26-5269-11df-82ef-080069138b88" uid="20438"/>
-      <subcategory value="12" description="AT -10 Stabber" uuid="f6d60df6-5269-11df-8cc2-080069138b88" uid="20439"/>
-      <subcategory value="13" description="AT-11 Sniper" uuid="f6d72146-5269-11df-a664-080069138b88" uid="20440"/>
-      <subcategory value="14" description="AT-12" uuid="f6d82a00-5269-11df-b69f-080069138b88" uid="20441"/>
-      <subcategory value="15" description="AT-14" uuid="f6d93828-5269-11df-be93-080069138b88" uid="20442">
-        <specific value="1" description="AT-14 KORNET-LR" uuid="f6da4a56-5269-11df-aad7-080069138b88" uid="20443"/>
-        <specific value="2" description="AT-14 FAE" uuid="f6db5392-5269-11df-895c-080069138b88" uid="20444"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Ballistic" uuid="f6dda64c-5269-11df-8822-080069138b88" uid="20445">
-      <subcategory value="1" description="23 mm" uuid="f6deb492-5269-11df-a294-080069138b88" uid="20446"/>
-      <subcategory value="2" description="30 mm" uuid="f6dfc3dc-5269-11df-a9d2-080069138b88" uid="20447">
-        <specific value="1" description="30mm AP-T" uuid="f6e0d20e-5269-11df-b9f7-080069138b88" uid="20448"/>
-        <specific value="2" description="30mm APDS-T" uuid="f6e1e220-5269-11df-a4e9-080069138b88" uid="20449"/>
-        <specific value="3" description="30mm APFSDS-T" uuid="f6e2f412-5269-11df-ad39-080069138b88" uid="20450"/>
-      </subcategory>
-      <subcategory value="3" description="64 mm" uuid="f6e4a794-5269-11df-a275-080069138b88" uid="20451">
-        <specific value="1" description="(w/ RPG-18 light anti-armor weapon)" uuid="f6e5b580-5269-11df-8c0a-080069138b88" uid="20452"/>
-      </subcategory>
-      <subcategory value="4" description="73 mm" uuid="f6e764ac-5269-11df-b852-080069138b88" uid="20453">
-        <specific value="1" description="HEAT FS" uuid="f6e87202-5269-11df-9ce7-080069138b88" uid="20454"/>
-        <specific value="2" description="HEAT-FS, PG-7VL" uuid="f6e980de-5269-11df-9295-080069138b88" uid="20455"/>
-      </subcategory>
-      <subcategory value="5" description="76 mm" uuid="f6eb2ee8-5269-11df-9f5b-080069138b88" uid="20456"/>
-      <subcategory value="6" description="80 mm" uuid="f6ec3d56-5269-11df-a859-080069138b88" uid="20457"/>
-      <subcategory value="7" description="82 mm" uuid="f6ed49da-5269-11df-ba01-080069138b88" uid="20458">
-        <specific value="1" description="BK-881 HEAT" uuid="f6ee596a-5269-11df-b1bd-080069138b88" uid="20459"/>
-        <specific value="2" description="BK-881M HEAT" uuid="f6ef65f8-5269-11df-bbc9-080069138b88" uid="20460"/>
-      </subcategory>
-      <subcategory value="8" description="85 mm" uuid="f6f1151a-5269-11df-9c5d-080069138b88" uid="20461">
-        <specific value="1" description="HEAT" uuid="f6f221a8-5269-11df-ae18-080069138b88" uid="20462"/>
-      </subcategory>
-      <subcategory value="9" description="107 mm" uuid="f6f3cd8c-5269-11df-acf4-080069138b88" uid="20463"/>
-      <subcategory value="10" description="115 mm" uuid="f6f4dba0-5269-11df-b220-080069138b88" uid="20464">
-        <specific value="1" description="HEAT-FS" uuid="f6f5ec3e-5269-11df-b7cc-080069138b88" uid="20465"/>
-        <specific value="2" description="HVAPFSDS" uuid="f6f6f8cc-5269-11df-a3c7-080069138b88" uid="20466"/>
-      </subcategory>
-      <subcategory value="11" description="125 mm" uuid="f6f8a5a0-5269-11df-b217-080069138b88" uid="20467">
-        <specific value="1" description="APFSDS-T BM-9" uuid="f6f9b328-5269-11df-85e6-080069138b88" uid="20468"/>
-        <specific value="2" description="APFSDS-T BM-12" uuid="f6fac592-5269-11df-b9a2-080069138b88" uid="20469"/>
-        <specific value="3" description="HEAT-FS BM-14m" uuid="f6fbce60-5269-11df-b2c7-080069138b88" uid="20470"/>
-        <specific value="4" description="HVAPFSDS" uuid="f6fcdd32-5269-11df-bc03-080069138b88" uid="20471"/>
-        <specific value="5" description="APFSDS-T, BM-42M" uuid="f6fdece0-5269-11df-9837-080069138b88" uid="20472"/>
-        <specific value="6" description="HEAT-T, BK-29M" uuid="f6fefaf4-5269-11df-95d0-080069138b88" uid="20473"/>
-        <specific value="7" description="HEAT-T, BK-27" uuid="f7001218-5269-11df-a2bd-080069138b88" uid="20474"/>
-      </subcategory>
-      <subcategory value="12" description="BRAB-200DS HE AP" uuid="f701c216-5269-11df-818c-080069138b88" uid="20475"/>
-      <subcategory value="13" description="BRAB-220 HE AP" uuid="f702d26e-5269-11df-9ca6-080069138b88" uid="20476"/>
-      <subcategory value="14" description="BRAB-500 HE AP" uuid="f703e10e-5269-11df-b6ff-080069138b88" uid="20477"/>
-      <subcategory value="15" description="BRAB-1000 HE AP" uuid="f704f058-5269-11df-b9ab-080069138b88" uid="20478"/>
-      <subcategory value="16" description="PTAB-2.5 bomblet HE anti-armor" uuid="f706004c-5269-11df-9eb4-080069138b88" uid="20479"/>
-      <subcategory value="17" description="122mm" uuid="f70709c4-5269-11df-b856-080069138b88" uid="20480">
-        <specific value="1" description="HEAT" uuid="f7081a44-5269-11df-8295-080069138b88" uid="20481"/>
-      </subcategory>
-      <subcategory value="18" description="120mm" uuid="f709ce16-5269-11df-936c-080069138b88" uid="20482">
-        <specific value="1" description="HEAT-FS" uuid="f70ada68-5269-11df-8a86-080069138b88" uid="20483"/>
-      </subcategory>
-      <subcategory value="19" description="100mm" uuid="f70c8bc4-5269-11df-9fe7-080069138b88" uid="20484">
-        <specific value="1" description="APFSDS-T" uuid="f70d9604-5269-11df-9260-080069138b88" uid="20485"/>
-        <specific value="2" description="HEAT" uuid="f70ea3fa-5269-11df-9441-080069138b88" uid="20486"/>
-        <specific value="3" description="HEAT-FS" uuid="f70fb1dc-5269-11df-be3e-080069138b88" uid="20487"/>
-      </subcategory>
-      <subcategory value="20" description="RPG-7VAT Grenade Launcher" uuid="f711631a-5269-11df-9099-080069138b88" uid="20488"/>
-      <subcategory value="21" description="130 mm" uuid="f7126e36-5269-11df-b517-080069138b88" uid="20489">
-        <specific value="1" description="APC-T BR-482B" uuid="f7137d9e-5269-11df-bb70-080069138b88" uid="20490"/>
-      </subcategory>
-      <subcategory value="22" description="152mm" uuid="f7153ab2-5269-11df-ba21-080069138b88" uid="20491">
-        <specific value="1" description="Projectile, 152-mm, HEAT-FS" uuid="f71648bc-5269-11df-ae6a-080069138b88" uid="20492"/>
-        <specific value="2" description="APC-T, 3BR-540, 152mm" uuid="f71753a6-5269-11df-985a-080069138b88" uid="20493"/>
-      </subcategory>
-      <subcategory value="23" description="105mm" uuid="f719049e-5269-11df-97e0-080069138b88" uid="20494">
-        <specific value="1" description="PG-29V 105mm HEAT (Tandem)" uuid="f71a1546-5269-11df-b7a5-080069138b88" uid="20495"/>
-      </subcategory>
-      <subcategory value="24" description="57mm Air to ground rockets" uuid="f71bc594-5269-11df-bfa7-080069138b88" uid="20496">
-        <specific value="1" description="57mm HEAT rocket, S-5" uuid="f71cd93e-5269-11df-9df4-080069138b88" uid="20497"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="222" uuid="f71fcd9c-5269-11df-9328-080069138b88" uid="20498">
-    <category value="1" description="Guided" uuid="f720df52-5269-11df-b34c-080069138b88" uid="20499">
-      <subcategory value="1" description="SH-01 Galosh (UR-96)" uuid="f721ec30-5269-11df-bb84-080069138b88" uid="20500">
-        <specific value="1" description="(deprecated)" deprecated="1" uuid="f722fcba-5269-11df-a7e2-080069138b88" uid="20501"/>
-        <specific value="2" description="SH-08" uuid="f7240a88-5269-11df-9889-080069138b88" uid="20502"/>
-        <specific value="3" description="SH-11 Gorgon" uuid="f72517ac-5269-11df-a921-080069138b88" uid="20503"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Ballistic" uuid="f72767be-5269-11df-8546-080069138b88" uid="20504">
-      <subcategory value="1" description="30 mm" uuid="f728756e-5269-11df-9b95-080069138b88" uid="20505">
-        <specific value="1" description="UOF-84 HE-I" uuid="f7298530-5269-11df-968c-080069138b88" uid="20506"/>
-        <specific value="2" description="UOR-84 HE-T" uuid="f72a9696-5269-11df-b185-080069138b88" uid="20507"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="222" uuid="f72f2c9c-5269-11df-aea3-080069138b88" uid="20508">
-    <category value="1" description="Guided" uuid="f73039de-5269-11df-956b-080069138b88" uid="20509">
-      <subcategory value="1" description="AS-4 Kitchen" uuid="f7314a9a-5269-11df-97f6-080069138b88" uid="20510"/>
-      <subcategory value="2" description="AS-9 Kyle" uuid="f7326178-5269-11df-a2b7-080069138b88" uid="20511"/>
-      <subcategory value="3" description="AS-12 Kegler" uuid="f7336d52-5269-11df-8135-080069138b88" uid="20512"/>
-      <subcategory value="4" description="AS-11 Kilter" uuid="f7347e5e-5269-11df-bab5-080069138b88" uid="20513">
-        <specific value="1" description="AS-11A, Mod 1 Kilter" uuid="f7358eca-5269-11df-8767-080069138b88" uid="20514"/>
-        <specific value="2" description="AS-11B, Mod 2 Kilter" uuid="f7369e82-5269-11df-b7d9-080069138b88" uid="20515"/>
-      </subcategory>
-      <subcategory value="5" description="KH-31P/X-31 or possibly AS-17" uuid="f738502e-5269-11df-9a0d-080069138b88" uid="20516"/>
-      <subcategory value="6" description="SS-21 Scarab" uuid="f739652c-5269-11df-b50b-080069138b88" uid="20517">
-        <specific value="1" description="Tochka-R" uuid="f73a752a-5269-11df-ace6-080069138b88" uid="20518"/>
-      </subcategory>
-      <subcategory value="7" description="Kh-29MP Kedge anti-radar" uuid="f73c27bc-5269-11df-8aed-080069138b88" uid="20519">
-        <specific value="1" description="Kh-29T Kedge (AS-14A) TV-guided" uuid="f73d38aa-5269-11df-807e-080069138b88" uid="20520"/>
-        <specific value="2" description="Kh-29L Kedge (AS-14B) laser-guided" uuid="f73e5528-5269-11df-a44b-080069138b88" uid="20521"/>
-        <specific value="3" description="Kh-29D Kedge infrared guided" uuid="f73f68be-5269-11df-a7de-080069138b88" uid="20522"/>
-        <specific value="4" description="Kh-29LE Kedge laser guided export" uuid="f74074de-5269-11df-b3be-080069138b88" uid="20523"/>
-        <specific value="5" description="Kh-29ML Kedge" uuid="f7418838-5269-11df-9916-080069138b88" uid="20524"/>
-        <specific value="6" description="Kh-29TE Kedge TV guided" uuid="f7429e4e-5269-11df-b2cd-080069138b88" uid="20525"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="5" country="222" uuid="f745902c-5269-11df-8ee2-080069138b88" uid="20526">
-    <category value="1" description="Guided" uuid="f7469dfa-5269-11df-87fd-080069138b88" uid="20527">
-      <subcategory value="1" description="Antisatellite System" uuid="f747b23a-5269-11df-9091-080069138b88" uid="20528"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="222" uuid="f74a030a-5269-11df-934e-080069138b88" uid="20529">
-    <category value="1" description="Guided" uuid="f74b1718-5269-11df-9f59-080069138b88" uid="20530">
-      <subcategory value="1" description="AS-2 Kipper" uuid="f74c272a-5269-11df-b470-080069138b88" uid="20531"/>
-      <subcategory value="2" description="AS-4 Kitchen" uuid="f74d3958-5269-11df-a590-080069138b88" uid="20532"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f74e4866-5269-11df-8afa-080069138b88" uid="20533"/>
-      <subcategory value="4" description="AS-6 Kingfish" uuid="f74f5b3e-5269-11df-9e12-080069138b88" uid="20534"/>
-      <subcategory value="5" description="AS-13 Kingbolt" uuid="f7506ad8-5269-11df-a60d-080069138b88" uid="20535"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f75178b0-5269-11df-883f-080069138b88" uid="20536"/>
-      <subcategory value="7" description="AS-15 Kent" uuid="f7528f16-5269-11df-bffa-080069138b88" uid="20537">
-        <specific value="1" description="Kh-55 Kent (AS-15A)" uuid="f753a054-5269-11df-b95d-080069138b88" uid="20538"/>
-        <specific value="2" description="Kh-55SM Kent Mod 1 (AS-15B)" uuid="f754abf2-5269-11df-9212-080069138b88" uid="20539"/>
-        <specific value="3" description="Kent Mod 2" uuid="f755c0f0-5269-11df-963a-080069138b88" uid="20540"/>
-      </subcategory>
-      <subcategory value="8" description="SS-N-2 Styx" uuid="f757712a-5269-11df-992e-080069138b88" uid="20541">
-        <specific value="1" description="SS-N-2a" uuid="f75881c8-5269-11df-af23-080069138b88" uid="20542"/>
-        <specific value="2" description="SS-N-2b" uuid="f7598ece-5269-11df-b91d-080069138b88" uid="20543"/>
-        <specific value="3" description="SS-N-2c" uuid="f75a9eea-5269-11df-8c0e-080069138b88" uid="20544"/>
-        <specific value="4" description="SS-N-2d" uuid="f75bb122-5269-11df-81c6-080069138b88" uid="20545"/>
-      </subcategory>
-      <subcategory value="9" description="SS-N-7 Starbright" uuid="f75d6ca6-5269-11df-80d4-080069138b88" uid="20546"/>
-      <subcategory value="10" description="SS-N-9 Siren" uuid="f75e7d08-5269-11df-815f-080069138b88" uid="20547"/>
-      <subcategory value="11" description="SS-N-12 Sandbox" uuid="f75f8c52-5269-11df-988b-080069138b88" uid="20548"/>
-      <subcategory value="12" description="SS-N-19 Shipwreck" uuid="f7609dea-5269-11df-a2df-080069138b88" uid="20549">
-        <specific value="1" description="Boost phase vehicle" uuid="f761ae56-5269-11df-a588-080069138b88" uid="20550"/>
-        <specific value="2" description="Jettisoned vehicle" uuid="f762be68-5269-11df-af80-080069138b88" uid="20551"/>
-        <specific value="3" description="Separated warhead" uuid="f763cf56-5269-11df-b700-080069138b88" uid="20552"/>
-      </subcategory>
-      <subcategory value="13" description="SS-N-22 Sunburn" uuid="f7658418-5269-11df-a5c3-080069138b88" uid="20553"/>
-      <subcategory value="14" description="SS-N-3 Shaddock" uuid="f7668f84-5269-11df-ae69-080069138b88" uid="20554">
-        <specific value="1" description="SS-N-3a" uuid="f7679fdc-5269-11df-9fd2-080069138b88" uid="20555"/>
-        <specific value="2" description="SS-N-3b" uuid="f768b304-5269-11df-934d-080069138b88" uid="20556"/>
-        <specific value="3" description="SS-N-3c" uuid="f769bde4-5269-11df-ab46-080069138b88" uid="20557"/>
-      </subcategory>
-      <subcategory value="15" description="SSC-2b Samlet Cruise" uuid="f76b72d8-5269-11df-af7d-080069138b88" uid="20558"/>
-      <subcategory value="16" description="SSC-1b Sepal" uuid="f76c8434-5269-11df-b10d-080069138b88" uid="20559"/>
-      <subcategory value="17" description="SSC-3 Styx" uuid="f76d96bc-5269-11df-a807-080069138b88" uid="20560"/>
-      <subcategory value="18" description="533-mm torpedo" uuid="f76ea3ae-5269-11df-88de-080069138b88" uid="20561">
-        <specific value="1" description="TE-2" status="new" uuid="977b310c-503c-4ee3-9dd0-6b766d97da3f" uid="22818">
-          <cr value="1674"/>
-        </specific>
-      </subcategory>
-      <subcategory value="19" description="406-mm torpedo" uuid="f76fb924-5269-11df-be93-080069138b88" uid="20562"/>
-      <subcategory value="20" description="(deprecated)" deprecated="1" uuid="f770ca76-5269-11df-a6b6-080069138b88" uid="20563"/>
-      <subcategory value="21" description="(deprecated)" deprecated="1" uuid="f771d8f8-5269-11df-83c4-080069138b88" uid="20564"/>
-      <subcategory value="22" description="SS-N-21 Sampson" uuid="f772edf6-5269-11df-b76e-080069138b88" uid="20565"/>
-      <subcategory value="23" description="SS-N-25 (Kh 35)" uuid="f773ffac-5269-11df-982c-080069138b88" uid="20566"/>
-      <subcategory value="24" description="AS-5 Kelt" uuid="f7750a32-5269-11df-939a-080069138b88" uid="20567"/>
-      <subcategory value="25" description="AS-10 Karen" uuid="f7761d46-5269-11df-984c-080069138b88" uid="20568"/>
-      <subcategory value="26" description="Kh-31 Krypton (AS-17) Non-ARM" uuid="f777338e-5269-11df-8ba1-080069138b88" uid="20569">
-        <specific value="1" description="Kh-31A Krypton (AS-17A)" uuid="f7783fea-5269-11df-97c6-080069138b88" uid="20570"/>
-        <specific value="2" description="Kh-31AD Krypton (AS-17B)" uuid="f77950ec-5269-11df-a9e0-080069138b88" uid="20571"/>
-      </subcategory>
-      <subcategory value="27" description="53 CM Torpedo Thermal (turbine)" uuid="f77b0e3c-5269-11df-aba5-080069138b88" uid="20572"/>
-      <subcategory value="28" description="65 CM Torpedo Thermal" uuid="f77c272c-5269-11df-abc0-080069138b88" uid="20573"/>
-      <subcategory value="29" description="SSC-X-5 (SS-NX-26)" uuid="f77d3478-5269-11df-a114-080069138b88" uid="20574">
-        <specific value="1" description="Yakhont" uuid="f77e4598-5269-11df-a809-080069138b88" uid="20575"/>
-      </subcategory>
-      <subcategory value="30" description="SSC-6 (SS-N-25)" uuid="f77ff8e8-5269-11df-9428-080069138b88" uid="20576"/>
-      <subcategory value="31" description="P-270 Moskit (Kh-41)" uuid="f7810f3a-5269-11df-b987-080069138b88" uid="20577"/>
-      <subcategory value="32" description="M51" uuid="f7821b32-5269-11df-8527-080069138b88" uid="20578"/>
-      <subcategory value="33" description="53-56/51 Torpedo" uuid="f7832af4-5269-11df-9590-080069138b88" uid="20579"/>
-      <subcategory value="34" description="Kh-59M Kazoo (AS-18)" uuid="f784401a-5269-11df-8f4e-080069138b88" uid="20580"/>
-      <subcategory value="35" description="Kh-35 Kayak (AS-20)" uuid="f7854d52-5269-11df-a811-080069138b88" uid="20581"/>
-      <subcategory value="36" description="SS-NX-30 Conventional LACM" uuid="f7865f94-5269-11df-bc3c-080069138b88" uid="20582"/>
-      <subcategory value="37" description="PJ-10" uuid="f787730c-5269-11df-831b-080069138b88" uid="20583"/>
-      <subcategory value="38" description="M-5 Torpedo" uuid="f7887dce-5269-11df-b65a-080069138b88" uid="20584"/>
-      <subcategory value="39" description="USET-80 Torpedo" uuid="f7899150-5269-11df-8d71-080069138b88" uid="20585"/>
-      <subcategory value="40" description="SAET-50 Torpedo" uuid="f78aa7f2-5269-11df-99e1-080069138b88" uid="20586"/>
-      <subcategory value="41" description="SET 53A Torpedo" uuid="f78bb3d6-5269-11df-910e-080069138b88" uid="20587"/>
-      <subcategory value="42" description="3M-14E (Klub) SS-N-17" uuid="f78cc442-5269-11df-8aae-080069138b88" uid="20588"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f78e77b0-5269-11df-99ae-080069138b88" uid="20589">
-      <subcategory value="1" description="12.7 mm" uuid="f78f8b28-5269-11df-b773-080069138b88" uid="20590"/>
-      <subcategory value="2" description="14.5 mm" uuid="f7909644-5269-11df-8865-080069138b88" uid="20591"/>
-      <subcategory value="3" description="23 mm" uuid="f791a692-5269-11df-8ec5-080069138b88" uid="20592"/>
-      <subcategory value="4" description="25 mm" uuid="f792b942-5269-11df-8aab-080069138b88" uid="20593"/>
-      <subcategory value="5" description="30 mm" uuid="f793c6f2-5269-11df-bc83-080069138b88" uid="20594">
-        <specific value="1" description="BR-83 AP-T" uuid="f794d6be-5269-11df-827d-080069138b88" uid="20595"/>
-        <specific value="2" description="OF-83D HE" uuid="f795e68a-5269-11df-ad29-080069138b88" uid="20596"/>
-      </subcategory>
-      <subcategory value="6" description="57 mm" uuid="f7979c3c-5269-11df-8e6b-080069138b88" uid="20597"/>
-      <subcategory value="7" description="76 mm" uuid="f798a6c2-5269-11df-9dcc-080069138b88" uid="20598"/>
-      <subcategory value="8" description="85 mm" uuid="f799bfda-5269-11df-8e6f-080069138b88" uid="20599"/>
-      <subcategory value="9" description="100 mm" uuid="f79ad24e-5269-11df-b1c3-080069138b88" uid="20600"/>
-      <subcategory value="10" description="130 mm" uuid="f79be1b6-5269-11df-b7cf-080069138b88" uid="20601">
-        <specific value="1" description="SM-4-1" uuid="f79cf18c-5269-11df-bca0-080069138b88" uid="20602"/>
-      </subcategory>
-    </category>
-    <category value="3" description="Fixed" uuid="f79f4252-5269-11df-b3d5-080069138b88" uid="20603">
-      <subcategory value="1" description="M-26 mine" uuid="f7a05408-5269-11df-b62e-080069138b88" uid="20604"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="222" uuid="f7a2aaaa-5269-11df-8217-080069138b88" uid="20605">
-    <category value="1" description="Guided" uuid="f7a3b81e-5269-11df-a395-080069138b88" uid="20606">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f7a4c8da-5269-11df-81ae-080069138b88" uid="20607"/>
-      <subcategory value="2" description="SS-N-14 Silex" uuid="f7a5da22-5269-11df-97e3-080069138b88" uid="20608"/>
-      <subcategory value="3" description="SS-N-15 Starfish" uuid="f7a6e930-5269-11df-97df-080069138b88" uid="20609"/>
-      <subcategory value="4" description="SS-N-16 Stallion" uuid="f7a7fbb8-5269-11df-81d2-080069138b88" uid="20610"/>
-      <subcategory value="5" description="533-mm torpedo" uuid="f7a90ddc-5269-11df-80ab-080069138b88" uid="20611">
-        <specific value="1" description="Type 3" uuid="f7aa179a-5269-11df-8b41-080069138b88" uid="20612"/>
-        <specific value="2" description="Type 3 nuclear" uuid="f7ab2d24-5269-11df-9315-080069138b88" uid="20613"/>
-        <specific value="3" description="new passive wake-homing turbine" uuid="f7ac3ef8-5269-11df-91a6-080069138b88" uid="20614"/>
-        <specific value="4" description="new electric" uuid="f7ad4afa-5269-11df-9a32-080069138b88" uid="20615"/>
-      </subcategory>
-      <subcategory value="6" description="406-mm Type 40 torpedo" uuid="f7aefd78-5269-11df-bad3-080069138b88" uid="20616"/>
-      <subcategory value="7" description="650-mm submarine-launched torpedo" uuid="f7b00f6a-5269-11df-9370-080069138b88" uid="20617"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="f7b125b2-5269-11df-acc2-080069138b88" uid="20618"/>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="f7b2365a-5269-11df-b2e7-080069138b88" uid="20619"/>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f7b34798-5269-11df-b133-080069138b88" uid="20620"/>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f7b45a66-5269-11df-b9a1-080069138b88" uid="20621"/>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="f7b56afa-5269-11df-a71d-080069138b88" uid="20622"/>
-      <subcategory value="13" description="Type 45 (light, air-launched)" uuid="f7b67d28-5269-11df-8516-080069138b88" uid="20623"/>
-      <subcategory value="14" description="Type E53 (light, air-launched)" uuid="f7b78f2e-5269-11df-b52f-080069138b88" uid="20624"/>
-      <subcategory value="15" description="Test 71 Torpedo" uuid="f7b8a4cc-5269-11df-b14a-080069138b88" uid="20625"/>
-      <subcategory value="16" description="APR-2 Torpedo" uuid="f7b9bdda-5269-11df-ade1-080069138b88" uid="20626"/>
-      <subcategory value="17" description="APR-3 Torpedo" uuid="f7bacf86-5269-11df-b4fd-080069138b88" uid="20627"/>
-      <subcategory value="18" description="E40-79 Torpedo" uuid="f7bbda70-5269-11df-b68e-080069138b88" uid="20628"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f7bd8fbe-5269-11df-aed8-080069138b88" uid="20629">
-      <subcategory value="1" description="FRAS-1/SUW-N-1 (VETER)" uuid="f7bea084-5269-11df-97d7-080069138b88" uid="20630"/>
-      <subcategory value="2" description="RBU 1000" uuid="f7bfb19a-5269-11df-91e4-080069138b88" uid="20631"/>
-      <subcategory value="3" description="RBU 1200" uuid="f7c0bfae-5269-11df-90c9-080069138b88" uid="20632"/>
-      <subcategory value="4" description="RBU 2500" uuid="f7c1d0c4-5269-11df-86aa-080069138b88" uid="20633"/>
-      <subcategory value="5" description="RBU 6000" uuid="f7c2e2de-5269-11df-aad7-080069138b88" uid="20634"/>
-      <subcategory value="6" description="RBU 12000" uuid="f7c3f002-5269-11df-b9e8-080069138b88" uid="20635"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="222" uuid="f7c65a04-5269-11df-8c44-080069138b88" uid="20636">
-    <category value="2" description="Ballistic" uuid="f7c7628c-5269-11df-8236-080069138b88" uid="20637">
-      <subcategory value="1" description="5.45 mm" uuid="f7c87604-5269-11df-86c2-080069138b88" uid="20638">
-        <specific value="1" description="5.45-mm Soviet pistol (aka 5.45 x 18 mm)" uuid="f7c988d2-5269-11df-bcf5-080069138b88" uid="20639"/>
-        <specific value="2" description="5.45-mm Soviet rifle (aka 5.45 x 39.5 mm and 5.45-mm M74)" uuid="f7ca9786-5269-11df-b610-080069138b88" uid="20640"/>
-      </subcategory>
-      <subcategory value="2" description="7.62 mm" uuid="f7cc4c34-5269-11df-bce6-080069138b88" uid="20641">
-        <specific value="1" description="7.62 x 25-mm Soviet pistol (aka 7.62-mm Tokarev)" uuid="f7cd5d54-5269-11df-b87c-080069138b88" uid="20642"/>
-        <specific value="2" description="7.62 x 38R Nagant Revolver (aka 7.62-mm Soviet revolver and 7.62-mm Nagant gas-seal)" uuid="f7ce722a-5269-11df-961b-080069138b88" uid="20643"/>
-        <specific value="3" description="7.62-mm Soviet M1943 (aka 7.62 x 39 mm, 7.62-mm Kalashnikov, and 7.62-mm obr 43g)" uuid="f7cf876e-5269-11df-b586-080069138b88" uid="20644"/>
-        <specific value="4" description="7.62-mm Mosin-Nagant (aka 7.62 x 54R, 7.62-mm Soviet Rimmed, and 7.62-mm obr 1891)" uuid="f7d09d5c-5269-11df-b823-080069138b88" uid="20645"/>
-      </subcategory>
-      <subcategory value="3" description="9 mm" uuid="f7d2557a-5269-11df-84d9-080069138b88" uid="20646">
-        <specific value="1" description="9-mm Makarov (aka 9 x 18 mm Soviet, 9-mm Stechkin, and 9-mm Type 59)" uuid="f7d36690-5269-11df-9e7c-080069138b88" uid="20647"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f7d51c2e-5269-11df-b15a-080069138b88" uid="20648"/>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="f7d62bdc-5269-11df-8d16-080069138b88" uid="20649"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f7d7458a-5269-11df-802e-080069138b88" uid="20650"/>
-      <subcategory value="7" description="82 mm" uuid="f7d85a88-5269-11df-838e-080069138b88" uid="20651">
-        <specific value="1" description="HE fragmentation (O-881A)" uuid="f7d96914-5269-11df-8cd4-080069138b88" uid="20652"/>
-      </subcategory>
-      <subcategory value="8" description="107-mm M-38 mortar" uuid="f7db1ade-5269-11df-bbc2-080069138b88" uid="20653"/>
-      <subcategory value="9" description="AO-1 SCH bomblet HE submunition" uuid="f7dc2c58-5269-11df-828e-080069138b88" uid="20654"/>
-      <subcategory value="10" description="AO-2.5 bomblet" uuid="f7dd4192-5269-11df-b199-080069138b88" uid="20655"/>
-      <subcategory value="11" description="AO-2.5 HE submunition" uuid="f7de50f0-5269-11df-a75a-080069138b88" uid="20656"/>
-      <subcategory value="12" description="AO-2.5-2 HE submunition" uuid="f7df635a-5269-11df-9abd-080069138b88" uid="20657"/>
-      <subcategory value="13" description="AO-8M2 HE" uuid="f7e07448-5269-11df-bf9e-080069138b88" uid="20658"/>
-      <subcategory value="14" description="AO-10 HE" uuid="f7e183a6-5269-11df-aa4f-080069138b88" uid="20659"/>
-      <subcategory value="15" description="AO-10-6.5 HE" uuid="f7e29408-5269-11df-ba02-080069138b88" uid="20660"/>
-      <subcategory value="16" description="AO-20 HE" uuid="f7e3a4c4-5269-11df-8a00-080069138b88" uid="20661"/>
-      <subcategory value="17" description="AO-20M3 HE" uuid="f7e4afcc-5269-11df-b02e-080069138b88" uid="20662"/>
-      <subcategory value="18" description="AO-25M1 HE" uuid="f7e5c484-5269-11df-91a6-080069138b88" uid="20663"/>
-      <subcategory value="19" description="AO-25M2 HE" uuid="f7e6d5b8-5269-11df-bb08-080069138b88" uid="20664"/>
-      <subcategory value="20" description="AO-100 HE" uuid="f7e7e0d4-5269-11df-8e92-080069138b88" uid="20665"/>
-      <subcategory value="21" description="FAB-50 HE" uuid="f7e8f51e-5269-11df-8f1c-080069138b88" uid="20666"/>
-      <subcategory value="22" description="FAB-70 HE" uuid="f7ea05d0-5269-11df-9af5-080069138b88" uid="20667"/>
-      <subcategory value="23" description="FAB-100 M43 HE" uuid="f7eb1182-5269-11df-b987-080069138b88" uid="20668"/>
-      <subcategory value="24" description="FAB-100 M62 HE" uuid="f7ec2342-5269-11df-aa71-080069138b88" uid="20669"/>
-      <subcategory value="25" description="FAB-250 HE" uuid="f7ed33f4-5269-11df-b539-080069138b88" uid="20670"/>
-      <subcategory value="26" description="FAB-250 M43 HE" uuid="f7ee446a-5269-11df-a777-080069138b88" uid="20671"/>
-      <subcategory value="27" description="FAB-250 M46 HE" uuid="f7ef54fe-5269-11df-a74b-080069138b88" uid="20672"/>
-      <subcategory value="28" description="FAB-250 M54 HE" uuid="f7f0661e-5269-11df-bcd8-080069138b88" uid="20673"/>
-      <subcategory value="29" description="FAB-250 M62 HE" uuid="f7f1740a-5269-11df-9957-080069138b88" uid="20674"/>
-      <subcategory value="30" description="FAB-500 HE" uuid="f7f285fc-5269-11df-b644-080069138b88" uid="20675"/>
-      <subcategory value="31" description="FAB-500 M46 HE" uuid="f7f3978a-5269-11df-b205-080069138b88" uid="20676"/>
-      <subcategory value="32" description="FAB-500 M54 HE" uuid="f7f4a0e4-5269-11df-ac76-080069138b88" uid="20677"/>
-      <subcategory value="33" description="FAB-500 M62 HE" uuid="f7f5b5b0-5269-11df-9655-080069138b88" uid="20678"/>
-      <subcategory value="34" description="FAB-1000 M62 HE" uuid="f7f6ce82-5269-11df-8c99-080069138b88" uid="20679"/>
-      <subcategory value="35" description="FAB-1500 M46 HE" uuid="f7f7dcbe-5269-11df-a46b-080069138b88" uid="20680"/>
-      <subcategory value="36" description="FAB-1500 M54 HE" uuid="f7f8f14e-5269-11df-bfdc-080069138b88" uid="20681"/>
-      <subcategory value="37" description="FAB-3000 M46 HE" uuid="f7fa01d8-5269-11df-b8a1-080069138b88" uid="20682"/>
-      <subcategory value="38" description="KhAB 100-kg (80) mustard gas/lewisite HL" uuid="f7fb0f88-5269-11df-b7b4-080069138b88" uid="20683"/>
-      <subcategory value="39" description="KhAB 100-kg (100) mustard gas/lewisite HL" uuid="f7fc26e8-5269-11df-afcc-080069138b88" uid="20684"/>
-      <subcategory value="40" description="KhAB 250-kg Sarin (GB)" uuid="f7fd34ca-5269-11df-a29a-080069138b88" uid="20685"/>
-      <subcategory value="41" description="M-1 bomblet (35-40 g of liquid explosive)" uuid="f7fe4bf8-5269-11df-86bb-080069138b88" uid="20686"/>
-      <subcategory value="42" description="Mustard gas/lewisite HL (from 500- and 1500-kg spray tanks)" uuid="f7ff6560-5269-11df-94b0-080069138b88" uid="20687"/>
-      <subcategory value="43" description="OFAB-100M HE" uuid="f8007a04-5269-11df-be4d-080069138b88" uid="20688"/>
-      <subcategory value="44" description="OFAB-100MH HE" uuid="f8018476-5269-11df-b508-080069138b88" uid="20689"/>
-      <subcategory value="45" description="OFAB-100NV HE" uuid="f80294d8-5269-11df-be4a-080069138b88" uid="20690"/>
-      <subcategory value="46" description="OFAB-250M HE" uuid="f803a9b8-5269-11df-a185-080069138b88" uid="20691"/>
-      <subcategory value="47" description="OKT-11 bomblet (incendiary or chemical)" uuid="f804b5b0-5269-11df-85ae-080069138b88" uid="20692"/>
-      <subcategory value="48" description="ROSAB bomblet HE" uuid="f805c748-5269-11df-be73-080069138b88" uid="20693"/>
-      <subcategory value="49" description="Soman (GD) (from 250-kg spray tank)" uuid="f806d93a-5269-11df-92bb-080069138b88" uid="20694"/>
-      <subcategory value="50" description="ZAB-1E incendiary (1.5 kg)" uuid="f807ed02-5269-11df-8fb3-080069138b88" uid="20695"/>
-      <subcategory value="51" description="ZAB 500 T Shch incendiary (500 kg)" uuid="f80900f2-5269-11df-a864-080069138b88" uid="20696"/>
-    </category>
-    <category value="3" description="Fixed" uuid="f80ab258-5269-11df-9b31-080069138b88" uid="20697">
-      <subcategory value="1" description="Wooden TMD-B AT mine" uuid="f80bc3a0-5269-11df-8dd8-080069138b88" uid="20698"/>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f80cd092-5269-11df-97ce-080069138b88" uid="20699"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f80de374-5269-11df-8cc9-080069138b88" uid="20700"/>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f80ef6a6-5269-11df-872f-080069138b88" uid="20701"/>
-      <subcategory value="5" description="TM-46 AT-blast mine" uuid="f810023a-5269-11df-8a18-080069138b88" uid="20702"/>
-      <subcategory value="6" description="TMN-46 AT-blast mine" uuid="f811153a-5269-11df-bc09-080069138b88" uid="20703"/>
-      <subcategory value="7" description="TM-57 AT mine" uuid="f8122a6a-5269-11df-b322-080069138b88" uid="20704"/>
-      <subcategory value="8" description="TM-62M AT mine (metal casing)" uuid="f813368a-5269-11df-9bdd-080069138b88" uid="20705"/>
-      <subcategory value="9" description="TMK-2 AT shaped-charge mine" uuid="f81448f4-5269-11df-a8c4-080069138b88" uid="20706"/>
-      <subcategory value="10" description="Area-type POMZ-2 AP-fragmentation mine" uuid="f8156680-5269-11df-8f9f-080069138b88" uid="20707"/>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f8167908-5269-11df-b3eb-080069138b88" uid="20708"/>
-      <subcategory value="12" description="MON series AP mine (directional) (MON-50/MON-90/MON-100/MON-200)" uuid="f8178d16-5269-11df-a1d5-080069138b88" uid="20709"/>
-      <subcategory value="13" description="PMN AP-blast mine" uuid="f818a0ac-5269-11df-9974-080069138b88" uid="20710"/>
-      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="f819ad8a-5269-11df-a3f2-080069138b88" uid="20711"/>
-      <subcategory value="15" description="AMD-500" uuid="f81ac350-5269-11df-bbf7-080069138b88" uid="20712"/>
-      <subcategory value="16" description="AMD-1000" uuid="f81bd416-5269-11df-9e8a-080069138b88" uid="20713"/>
-      <subcategory value="17" description="AMG-1" uuid="f81cddde-5269-11df-a9e8-080069138b88" uid="20714"/>
-      <subcategory value="18" description="BDT mine-clearance charge" uuid="f81df26e-5269-11df-beeb-080069138b88" uid="20715"/>
-      <subcategory value="19" description="ITB-2 mine-clearance charge" uuid="f81f05dc-5269-11df-87a6-080069138b88" uid="20716"/>
-      <subcategory value="20" description="KMD-500" uuid="f820126a-5269-11df-961b-080069138b88" uid="20717"/>
-      <subcategory value="21" description="KMD-1000" uuid="f8212150-5269-11df-a73e-080069138b88" uid="20718"/>
-      <subcategory value="22" description="M-08" uuid="f822357c-5269-11df-a64b-080069138b88" uid="20719"/>
-      <subcategory value="23" description="M-12" uuid="f8234034-5269-11df-bd64-080069138b88" uid="20720"/>
-      <subcategory value="24" description="M-16" uuid="f8245172-5269-11df-a337-080069138b88" uid="20721"/>
-      <subcategory value="25" description="M-AG" uuid="f8256382-5269-11df-8316-080069138b88" uid="20722"/>
-      <subcategory value="26" description="M-KB" uuid="f8266d68-5269-11df-ae2f-080069138b88" uid="20723"/>
-      <subcategory value="27" description="M-KB-3" uuid="f8277ffa-5269-11df-83c6-080069138b88" uid="20724"/>
-      <subcategory value="28" description="Mirab" uuid="f8289192-5269-11df-a5cf-080069138b88" uid="20725"/>
-      <subcategory value="29" description="MYaM" uuid="f8299b96-5269-11df-a88a-080069138b88" uid="20726"/>
-      <subcategory value="30" description="MYaRM" uuid="f82aae28-5269-11df-8ff3-080069138b88" uid="20727"/>
-      <subcategory value="31" description="MZ-26" uuid="f82bc308-5269-11df-a810-080069138b88" uid="20728"/>
-      <subcategory value="32" description="OZM bounding AP mine" uuid="f82ccec4-5269-11df-b88d-080069138b88" uid="20729"/>
-      <subcategory value="33" description="OZM-3 bounding AP mine" uuid="f82ddf58-5269-11df-9220-080069138b88" uid="20730"/>
-      <subcategory value="34" description="OZM-4 bounding AP mine" uuid="f82ef3e8-5269-11df-9a19-080069138b88" uid="20731"/>
-      <subcategory value="35" description="OZM-72 bounding AP mine" uuid="f83003d2-5269-11df-8baf-080069138b88" uid="20732"/>
-      <subcategory value="36" description="OZM-160 bounding AP mine" uuid="f83115ba-5269-11df-91d0-080069138b88" uid="20733"/>
-      <subcategory value="37" description="PFM-1 or PMZ AP mine/bomblet" uuid="f8322644-5269-11df-838b-080069138b88" uid="20734"/>
-      <subcategory value="38" description="PGMDM scatterable Anti-tank mine" uuid="f8333be2-5269-11df-9567-080069138b88" uid="20735"/>
-      <subcategory value="39" description="PLT" uuid="f8345432-5269-11df-8ef0-080069138b88" uid="20736"/>
-      <subcategory value="40" description="PLT-3" uuid="f8356534-5269-11df-9e02-080069138b88" uid="20737"/>
-      <subcategory value="41" description="PMD-6 wooden AP mine" uuid="f8367032-5269-11df-86dc-080069138b88" uid="20738"/>
-      <subcategory value="42" description="PMD-6M wooden AP mine" uuid="f8378670-5269-11df-be11-080069138b88" uid="20739"/>
-      <subcategory value="43" description="PMD-7 wooden AP mine" uuid="f8389844-5269-11df-bf2a-080069138b88" uid="20740"/>
-      <subcategory value="44" description="PMD-7ts wooden AP mine" uuid="f839a504-5269-11df-9f81-080069138b88" uid="20741"/>
-      <subcategory value="45" description="PMD-57 wooden AP mine" uuid="f83ab4b2-5269-11df-a1ea-080069138b88" uid="20742"/>
-      <subcategory value="46" description="PMN AP mine" uuid="f83bcd2a-5269-11df-b3d5-080069138b88" uid="20743"/>
-      <subcategory value="47" description="PMN-2 AP mine" uuid="f83cd8a0-5269-11df-b989-080069138b88" uid="20744"/>
-      <subcategory value="48" description="PMN-6" uuid="f83de948-5269-11df-947a-080069138b88" uid="20745"/>
-      <subcategory value="49" description="POMZ-2 AP stake mine" uuid="f83ef9e6-5269-11df-b7ce-080069138b88" uid="20746"/>
-      <subcategory value="50" description="POMZ-2M AP stake mine" uuid="f8400962-5269-11df-be9a-080069138b88" uid="20747"/>
-      <subcategory value="51" description="SPZ-2 mine-clearance charge" uuid="f8411bea-5269-11df-ad36-080069138b88" uid="20748"/>
-      <subcategory value="52" description="SPZ-4 mine-clearance charge" uuid="f8422ecc-5269-11df-acf9-080069138b88" uid="20749"/>
-      <subcategory value="53" description="TM-62 AT mine P2 (plastic casing)" uuid="f8433a1a-5269-11df-92f8-080069138b88" uid="20750"/>
-      <subcategory value="54" description="TM-62B waterproof cardboard casing" uuid="f8444e1e-5269-11df-bfa6-080069138b88" uid="20751"/>
-      <subcategory value="55" description="TM-62D rectangular wooden case" uuid="f8456556-5269-11df-a373-080069138b88" uid="20752"/>
-      <subcategory value="56" description="TM-62 P3 plastic casing" uuid="f84673d8-5269-11df-a543-080069138b88" uid="20753"/>
-      <subcategory value="57" description="TMD-B Anti-tank mine" uuid="f847846c-5269-11df-8b04-080069138b88" uid="20754"/>
-      <subcategory value="58" description="TMD-44 Anti-tank mine" uuid="f8489898-5269-11df-b85e-080069138b88" uid="20755"/>
-      <subcategory value="59" description="UEP" uuid="f849a972-5269-11df-bafb-080069138b88" uid="20756"/>
-      <subcategory value="60" description="UZ-1 Bangalore torpedo" uuid="f84ab9f2-5269-11df-93fb-080069138b88" uid="20757"/>
-      <subcategory value="61" description="UZ-2 Bangalore torpedo" uuid="f84bca72-5269-11df-b7d8-080069138b88" uid="20758"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="222" uuid="f84e1da4-5269-11df-a77f-080069138b88" uid="20759">
-    <category value="1" description="Guided" uuid="f84f2c30-5269-11df-b59c-080069138b88" uid="20760">
-      <subcategory value="1" description="AS-3 Kangaroo" uuid="f850359e-5269-11df-934e-080069138b88" uid="20761"/>
-      <subcategory value="2" description="AS-4 Kitchen" uuid="f8514998-5269-11df-a4d5-080069138b88" uid="20762"/>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f85263b4-5269-11df-8c10-080069138b88" uid="20763"/>
-      <subcategory value="4" description="AS-7 Kerry" uuid="f8537128-5269-11df-9cd5-080069138b88" uid="20764"/>
-      <subcategory value="5" description="AS-10 Karen" uuid="f8548248-5269-11df-bdb5-080069138b88" uid="20765">
-        <specific value="1" description="AS-10 (radio)" uuid="f855935e-5269-11df-a820-080069138b88" uid="20766"/>
-        <specific value="2" description="AS-10 (laser)" uuid="f856a2ee-5269-11df-841b-080069138b88" uid="20767"/>
-      </subcategory>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f8585382-5269-11df-b644-080069138b88" uid="20768"/>
-      <subcategory value="7" description="AS-14 Kedge" deprecated="1" uuid="f859660a-5269-11df-95b8-080069138b88" uid="20769"/>
-      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="f85a78ba-5269-11df-b948-080069138b88" uid="20770"/>
-      <subcategory value="9" description="AS-16 Kickback" uuid="f85b898a-5269-11df-b80d-080069138b88" uid="20771">
-        <specific value="1" description="Kh-15 Kickback (AS-16A) nuclear" uuid="f85c9b2c-5269-11df-8d2a-080069138b88" uid="20772"/>
-        <specific value="2" description="Kh-15 Kickback (AS-16B) conventional" uuid="f85db9da-5269-11df-b828-080069138b88" uid="20773"/>
-      </subcategory>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f85f72ca-5269-11df-a7ad-080069138b88" uid="20774"/>
-      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f8607e54-5269-11df-a8bb-080069138b88" uid="20775"/>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="f86191ea-5269-11df-845f-080069138b88" uid="20776"/>
-      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="f862a8d2-5269-11df-bebd-080069138b88" uid="20777"/>
-      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="f863b51a-5269-11df-b824-080069138b88" uid="20778"/>
-      <subcategory value="15" description="KAB-500N laser-guided HE" uuid="f864c6d0-5269-11df-968e-080069138b88" uid="20779"/>
-      <subcategory value="16" description="KAB-500T TV-guided HE" uuid="f865ddcc-5269-11df-ad5d-080069138b88" uid="20780"/>
-      <subcategory value="17" description="SS-21 Scarab" uuid="f866ebcc-5269-11df-8607-080069138b88" uid="20781">
-        <specific value="1" description="SS-21 W/HE Warhead (9M79F)" uuid="f867fbe8-5269-11df-ac6b-080069138b88" uid="20782"/>
-        <specific value="2" description="SS-21 W/sub-munition warhead (9M79K)" uuid="f8690fb0-5269-11df-94bb-080069138b88" uid="20783"/>
-        <specific value="3" description="SS-21 W/nuclear warhead (9M79B)" uuid="f86a1cfc-5269-11df-965d-080069138b88" uid="20784"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Ballistic" uuid="f86c7650-5269-11df-8a69-080069138b88" uid="20785">
-      <subcategory value="1" description="12.7 mm Soviet machine gun (aka 12.7 x 107mm)" uuid="f86d80e0-5269-11df-a5a8-080069138b88" uid="20786">
-        <specific value="1" description="API type Bz" uuid="f86e95ac-5269-11df-ab65-080069138b88" uid="20787"/>
-        <specific value="2" description="API - T type BZT" uuid="f86fa712-5269-11df-bf09-080069138b88" uid="20788"/>
-      </subcategory>
-      <subcategory value="2" description="14.5 mm Soviet machine gun (aka 14.5 x 114mm)" uuid="f871620a-5269-11df-99a4-080069138b88" uid="20789">
-        <specific value="1" description="API type BS41" uuid="f87273e8-5269-11df-a92f-080069138b88" uid="20790"/>
-        <specific value="2" description="API-T type BZT" uuid="f8738350-5269-11df-a7bb-080069138b88" uid="20791"/>
-        <specific value="3" description="Incendiary type ZP" uuid="f8749600-5269-11df-9ca6-080069138b88" uid="20792"/>
-      </subcategory>
-      <subcategory value="3" description="23 mm" uuid="f8764bf8-5269-11df-a650-080069138b88" uid="20793"/>
-      <subcategory value="4" description="25 mm" uuid="f87756a6-5269-11df-a672-080069138b88" uid="20794">
-        <specific value="1" description="25 mm Soviet 2-M3" uuid="f8786618-5269-11df-9257-080069138b88" uid="20795"/>
-        <specific value="2" description="25 mm Soviet 2-M8" uuid="f87978aa-5269-11df-9561-080069138b88" uid="20796"/>
-      </subcategory>
-      <subcategory value="5" description="30 mm grenade" uuid="f87b2cf4-5269-11df-98a1-080069138b88" uid="20797">
-        <specific value="1" description="HE FRAG" uuid="f87c36ee-5269-11df-b1b5-080069138b88" uid="20798"/>
-      </subcategory>
-      <subcategory value="6" description="37 mm" uuid="f87de7d2-5269-11df-99a9-080069138b88" uid="20799"/>
-      <subcategory value="7" description="40-mm rocket" uuid="f87ef8b6-5269-11df-b982-080069138b88" uid="20800"/>
-      <subcategory value="8" description="45 mm" uuid="f88009c2-5269-11df-8353-080069138b88" uid="20801"/>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="f881159c-5269-11df-a53e-080069138b88" uid="20802"/>
-      <subcategory value="10" description="82 mm (mortar)" uuid="f88226c6-5269-11df-bbe7-080069138b88" uid="20803">
-        <specific value="1" description="82-mm model 0-832 DU HE fragmentation bomb" uuid="f8833c6e-5269-11df-bd33-080069138b88" uid="20804"/>
-      </subcategory>
-      <subcategory value="11" description="100 mm" uuid="f884f310-5269-11df-baaa-080069138b88" uid="20805">
-        <specific value="1" description="HE-FRAG OF-412" uuid="f885fe86-5269-11df-a0bb-080069138b88" uid="20806"/>
-        <specific value="2" description="HE-FRAG OF-17" uuid="f8870ee8-5269-11df-b99c-080069138b88" uid="20807"/>
-      </subcategory>
-      <subcategory value="12" description="107 mm" uuid="f888c36e-5269-11df-8650-080069138b88" uid="20808"/>
-      <subcategory value="13" description="120 mm (mortar)" uuid="f889d3da-5269-11df-abe1-080069138b88" uid="20809">
-        <specific value="1" description="HE bomb F-843" uuid="f88ae04a-5269-11df-a9d3-080069138b88" uid="20810"/>
-        <specific value="2" description="HE bomb OF-843" uuid="f88bf0a2-5269-11df-9435-080069138b88" uid="20811"/>
-        <specific value="3" description="HE bomb OF-843A" uuid="f88d04f6-5269-11df-9732-080069138b88" uid="20812"/>
-        <specific value="4" description="WP" uuid="f88e106c-5269-11df-a4d1-080069138b88" uid="20813"/>
-        <specific value="5" description="HE FRAG" uuid="f88f27f4-5269-11df-8233-080069138b88" uid="20814"/>
-        <specific value="6" description="Illumination" uuid="f8903950-5269-11df-a854-080069138b88" uid="20815"/>
-        <specific value="7" description="Incendiary" uuid="f89148cc-5269-11df-b62f-080069138b88" uid="20816"/>
-        <specific value="8" description="HE-Frag, OF-843B" uuid="f89258fc-5269-11df-8d06-080069138b88" uid="20817"/>
-        <specific value="9" description="HE-Frag, RAP" uuid="f893695e-5269-11df-bfc2-080069138b88" uid="20818"/>
-      </subcategory>
-      <subcategory value="14" description="122 mm" uuid="f8951ca4-5269-11df-b6b2-080069138b88" uid="20819">
-        <specific value="1" description="122mm, High Explosive, 30F-56" uuid="f8962734-5269-11df-8e0b-080069138b88" uid="20820"/>
-        <specific value="2" description="122mm, High Explosive - FRAG, 53-VOF-471G" uuid="f8973a20-5269-11df-aa35-080069138b88" uid="20821"/>
-        <specific value="3" description="122mm, DPICM" uuid="f89850a4-5269-11df-bd5d-080069138b88" uid="20822"/>
-        <specific value="4" description="122mm, HE -Rocket Assist Projectile, 3OF-463" uuid="f8995b84-5269-11df-9f2f-080069138b88" uid="20823"/>
-        <specific value="5" description="122mm, DPICM-ER" uuid="f89a6e2a-5269-11df-936c-080069138b88" uid="20824"/>
-        <specific value="6" description="122mm, Incendiary" uuid="f89b817a-5269-11df-a523-080069138b88" uid="20825"/>
-        <specific value="7" description="122mm, Smoke, S-463" uuid="f89c8d0e-5269-11df-9338-080069138b88" uid="20826"/>
-        <specific value="8" description="122mm, Smoke WP, 3D-4" uuid="f89d9cbc-5269-11df-9006-080069138b88" uid="20827"/>
-        <specific value="9" description="122mm, Laser Guided, KITOLOV-2M" uuid="f89eb192-5269-11df-8862-080069138b88" uid="20828"/>
-      </subcategory>
-      <subcategory value="15" description="122-mm rocket" uuid="f8a06622-5269-11df-a7da-080069138b88" uid="20829">
-        <specific value="1" description="M-21-OF (9M22M)" uuid="f8a1710c-5269-11df-a54a-080069138b88" uid="20830"/>
-        <specific value="2" description="M-21-OF (9M22U)" uuid="f8a281a0-5269-11df-93f1-080069138b88" uid="20831"/>
-        <specific value="3" description="Smoke" uuid="f8a39522-5269-11df-b4dc-080069138b88" uid="20832"/>
-        <specific value="4" description="HE FRAG" uuid="f8a4a2f0-5269-11df-aca0-080069138b88" uid="20833"/>
-        <specific value="5" description="ICM" uuid="f8a5b320-5269-11df-8e6b-080069138b88" uid="20834"/>
-        <specific value="6" description="Illumination" uuid="f8a6c1fc-5269-11df-8a89-080069138b88" uid="20835"/>
-        <specific value="7" description="Incendiary" uuid="f8a7d024-5269-11df-983c-080069138b88" uid="20836"/>
-        <specific value="8" description="Chemical" uuid="f8a8e112-5269-11df-b0ed-080069138b88" uid="20837"/>
-        <specific value="9" description="Jammer" uuid="f8a9f192-5269-11df-9e02-080069138b88" uid="20838"/>
-      </subcategory>
-      <subcategory value="16" description="125 mm" uuid="f8aba280-5269-11df-a045-080069138b88" uid="20839">
-        <specific value="1" description="HE-FRAG OF-19" uuid="f8acafcc-5269-11df-b1e3-080069138b88" uid="20840"/>
-        <specific value="2" description="FRAG-HE-T, OF-26" uuid="f8adc240-5269-11df-af6f-080069138b88" uid="20841"/>
-      </subcategory>
-      <subcategory value="17" description="130 mm" uuid="f8af7bd0-5269-11df-91f8-080069138b88" uid="20842">
-        <specific value="1" description="FRAG-HE OF-482M" uuid="f8b08d0e-5269-11df-ac0d-080069138b88" uid="20843"/>
-      </subcategory>
-      <subcategory value="18" description="139.7-mm rocket" uuid="f8b23df2-5269-11df-ba43-080069138b88" uid="20844">
-        <specific value="1" description="M-14-OF" uuid="f8b34a9e-5269-11df-bf73-080069138b88" uid="20845"/>
-      </subcategory>
-      <subcategory value="19" description="152 mm" uuid="f8b4fd9e-5269-11df-8f10-080069138b88" uid="20846">
-        <specific value="1" description="HE" uuid="f8b60bc6-5269-11df-a739-080069138b88" uid="20847"/>
-        <specific value="2" description="Projectile, 152-mm, Flechette" uuid="f8b71d68-5269-11df-92c3-080069138b88" uid="20848"/>
-        <specific value="3" description="Projectile, 152-mm, ICM" uuid="f8b82d52-5269-11df-a14f-080069138b88" uid="20849"/>
-        <specific value="4" description="Projectile, 152-mm, Incendiary" uuid="f8b93f6c-5269-11df-9918-080069138b88" uid="20850"/>
-        <specific value="5" description="Projectile, 152-mm, Concrete Piercing" uuid="f8ba5064-5269-11df-89f8-080069138b88" uid="20851"/>
-        <specific value="6" description="Projectile, 152-mm, Illuminating" uuid="f8bb5d92-5269-11df-a8e5-080069138b88" uid="20852"/>
-        <specific value="7" description="Projectile, 152-mm, Chemical: VX" uuid="f8bc73e4-5269-11df-bf7d-080069138b88" uid="20853"/>
-        <specific value="8" description="Projectile, 152-mm, Chemical: GD" uuid="f8bd86c6-5269-11df-960c-080069138b88" uid="20854"/>
-        <specific value="9" description="Projectile, 152-mm, Chemical: AC" uuid="f8be9246-5269-11df-802a-080069138b88" uid="20855"/>
-        <specific value="10" description="Projectile, 152-mm, DPICM" uuid="f8bfa7ee-5269-11df-8cca-080069138b88" uid="20856"/>
-        <specific value="11" description="Projectile, 152-mm, DPICM, Base Bleed" uuid="f8c0bb3e-5269-11df-a637-080069138b88" uid="20857"/>
-        <specific value="12" description="Projectile, 152-mm, HE, Base Bleed" uuid="f8c1c858-5269-11df-82eb-080069138b88" uid="20858"/>
-        <specific value="13" description="Projectile, 152-mm, HE-Frag, RAP" uuid="f8c2d9c8-5269-11df-8316-080069138b88" uid="20859"/>
-        <specific value="14" description="Projectile, 152-mm, HE-Frag, 3OF-45" uuid="f8c3f010-5269-11df-a10d-080069138b88" uid="20860"/>
-      </subcategory>
-      <subcategory value="20" description="160 mm (mortar)" uuid="f8c5a108-5269-11df-9146-080069138b88" uid="20861">
-        <specific value="1" description="HE BOMB F-853U" uuid="f8c6ad0a-5269-11df-ac11-080069138b88" uid="20862"/>
-        <specific value="2" description="HE BOMB F-853A" uuid="f8c7bc2c-5269-11df-8df4-080069138b88" uid="20863"/>
-        <specific value="3" description="HE Bomb F-852" uuid="f8c8d134-5269-11df-b67c-080069138b88" uid="20864"/>
-      </subcategory>
-      <subcategory value="21" description="180 mm" uuid="f8ca815a-5269-11df-b025-080069138b88" uid="20865"/>
-      <subcategory value="22" description="203-mm Howitzer" uuid="f8cb8c8a-5269-11df-b5ba-080069138b88" uid="20866">
-        <specific value="1" description="203-mm, High Explosive-Frag" uuid="f8cca476-5269-11df-8a9a-080069138b88" uid="20867"/>
-        <specific value="2" description="203-mm, DPICM" uuid="f8cdbb04-5269-11df-96ce-080069138b88" uid="20868"/>
-        <specific value="3" description="203-mm, HE-Concrete Piercing" uuid="f8cec5d0-5269-11df-b5c4-080069138b88" uid="20869"/>
-        <specific value="4" description="203-mm, HE, OF-43" uuid="f8cfd7ea-5269-11df-9854-080069138b88" uid="20870"/>
-        <specific value="5" description="203-mm, HE-RAP" uuid="f8d0ec52-5269-11df-9387-080069138b88" uid="20871"/>
-        <specific value="6" description="203-mm, HE-Frag, Base Bleed" uuid="f8d1f804-5269-11df-99b8-080069138b88" uid="20872"/>
-        <specific value="7" description="203-mm, DPICM, Base Bleed" uuid="f8d30b68-5269-11df-88b8-080069138b88" uid="20873"/>
-      </subcategory>
-      <subcategory value="23" description="220-mm rocket" uuid="f8d4bf3a-5269-11df-8aba-080069138b88" uid="20874"/>
-      <subcategory value="24" description="240 mm (mortar)" uuid="f8d5d262-5269-11df-af7d-080069138b88" uid="20875">
-        <specific value="1" description="F-864 HE bomb" uuid="f8d6dd92-5269-11df-b422-080069138b88" uid="20876"/>
-      </subcategory>
-      <subcategory value="25" description="240-mm rocket" uuid="f8d890a6-5269-11df-a0e3-080069138b88" uid="20877"/>
-      <subcategory value="26" description="250-mm rocket" uuid="f8d9a1c6-5269-11df-95a6-080069138b88" uid="20878"/>
-      <subcategory value="27" description="400-mm rocket" uuid="f8dab278-5269-11df-8601-080069138b88" uid="20879"/>
-      <subcategory value="28" description="550-mm rocket" uuid="f8dbc10e-5269-11df-8cad-080069138b88" uid="20880"/>
-      <subcategory value="29" description="600-mm rocket" uuid="f8dcd206-5269-11df-b175-080069138b88" uid="20881"/>
-      <subcategory value="30" description="850-mm missile" uuid="f8dde326-5269-11df-8773-080069138b88" uid="20882"/>
-      <subcategory value="31" description="1100-mm missile" uuid="f8deee4c-5269-11df-8e98-080069138b88" uid="20883"/>
-      <subcategory value="32" description="250 SHN HE (parachute-retarded)" uuid="f8e00462-5269-11df-b488-080069138b88" uid="20884"/>
-      <subcategory value="33" description="500 SH HE (parachute-retarded)" uuid="f8e11640-5269-11df-9c46-080069138b88" uid="20885"/>
-      <subcategory value="34" description="BETAB-150DS HE concrete-piercing" uuid="f8e224cc-5269-11df-8bef-080069138b88" uid="20886"/>
-      <subcategory value="35" description="OF-841A HE fragmentation bomb" uuid="f8e33f38-5269-11df-90c2-080069138b88" uid="20887"/>
-      <subcategory value="36" description="81mm smoke grenade" uuid="f8e45238-5269-11df-91ff-080069138b88" uid="20888"/>
-      <subcategory value="37" description="Frog-7" uuid="f8e55f34-5269-11df-8c41-080069138b88" uid="20889"/>
-      <subcategory value="38" description="57 mm rocket" uuid="f8e6714e-5269-11df-9c37-080069138b88" uid="20890">
-        <specific value="1" description="S5" uuid="f8e780fc-5269-11df-a538-080069138b88" uid="20891"/>
-      </subcategory>
-      <subcategory value="39" description="73mm" uuid="f8e9335c-5269-11df-b593-080069138b88" uid="20892">
-        <specific value="1" description="HE FRAG" uuid="f8ea3da6-5269-11df-b526-080069138b88" uid="20893"/>
-      </subcategory>
-      <subcategory value="40" description="80mm rocket" uuid="f8ebf9ac-5269-11df-a130-080069138b88" uid="20894">
-        <specific value="1" description="S8" uuid="f8ed08c4-5269-11df-9d1e-080069138b88" uid="20895"/>
-      </subcategory>
-      <subcategory value="41" description="8/mm grenade" uuid="f8eeb9bc-5269-11df-b7e7-080069138b88" uid="20896">
-        <specific value="1" description="RP" uuid="f8efcdd4-5269-11df-9597-080069138b88" uid="20897"/>
-      </subcategory>
-      <subcategory value="42" description="115mm" uuid="f8f17d64-5269-11df-a7b1-080069138b88" uid="20898">
-        <specific value="1" description="HE FRAG" uuid="f8f2875e-5269-11df-be90-080069138b88" uid="20899"/>
-      </subcategory>
-      <subcategory value="43" description="120mm (gun/mortar)" uuid="f8f43a22-5269-11df-9a51-080069138b88" uid="20900">
-        <specific value="1" description="Incendiary" uuid="f8f54aac-5269-11df-947d-080069138b88" uid="20901"/>
-        <specific value="2" description="HE FRAG" uuid="f8f6689c-5269-11df-99b0-080069138b88" uid="20902"/>
-        <specific value="3" description="Illumination" uuid="f8f7816e-5269-11df-b207-080069138b88" uid="20903"/>
-        <specific value="4" description="WP" uuid="f8f8914e-5269-11df-ae74-080069138b88" uid="20904"/>
-        <specific value="5" description="HE-Frag-RAP" uuid="f8f9a2b4-5269-11df-a09b-080069138b88" uid="20905"/>
-        <specific value="6" description="HE-Frag-Laser Guided" uuid="f8fab2c6-5269-11df-9825-080069138b88" uid="20906"/>
-      </subcategory>
-      <subcategory value="44" description="MCLC" uuid="f8fc62d8-5269-11df-81fa-080069138b88" uid="20907"/>
-      <subcategory value="45" description="300-mm rocket" uuid="f8fd7146-5269-11df-9110-080069138b88" uid="20908">
-        <specific value="1" description="9M5K1 rocket" uuid="f8fe8658-5269-11df-a5b1-080069138b88" uid="20909"/>
-      </subcategory>
-      <subcategory value="46" description="200-mm rocket" uuid="f90035d4-5269-11df-875d-080069138b88" uid="20910"/>
-      <subcategory value="47" description="30mm autocannon ammunition" uuid="f9014410-5269-11df-9f98-080069138b88" uid="20911">
-        <specific value="1" description="30mm HE-Frag" uuid="f902553a-5269-11df-9a09-080069138b88" uid="20912"/>
-      </subcategory>
-      <subcategory value="48" description="40mm" uuid="f9040984-5269-11df-b9b9-080069138b88" uid="20913">
-        <specific value="1" description="40mm VOG-25" uuid="f9051932-5269-11df-9d91-080069138b88" uid="20914"/>
-        <specific value="2" description="40mm VOG-25P" uuid="f90624b2-5269-11df-b850-080069138b88" uid="20915"/>
-      </subcategory>
-      <subcategory value="49" description="Flame weapons" uuid="f907d7f8-5269-11df-8ab1-080069138b88" uid="20916">
-        <specific value="1" description="Rocket, incendiary, 93mm (RPO)" uuid="f908e85a-5269-11df-a994-080069138b88" uid="20917"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="222" uuid="f90bea14-5269-11df-beda-080069138b88" uid="20918">
-    <category value="1" description="Guided" uuid="f90cf8a0-5269-11df-a001-080069138b88" uid="20919">
-      <subcategory value="1" description="SS-N-5 Sark" uuid="f90e0394-5269-11df-a165-080069138b88" uid="20920"/>
-      <subcategory value="2" description="SS-N-6 Serb" uuid="f90f1658-5269-11df-8ccb-080069138b88" uid="20921">
-        <specific value="1" description="SS-N-6" uuid="f9102746-5269-11df-80c8-080069138b88" uid="20922"/>
-        <specific value="2" description="SS-N-6 Mod 1" uuid="f911328a-5269-11df-8408-080069138b88" uid="20923"/>
-        <specific value="3" description="SS-N-6 Mod 2" uuid="f9124134-5269-11df-80b6-080069138b88" uid="20924"/>
-      </subcategory>
-      <subcategory value="3" description="SS-N-8 Sawfly" uuid="f913f448-5269-11df-b0e3-080069138b88" uid="20925"/>
-      <subcategory value="4" description="SS-N-17 Snipe" uuid="f9150658-5269-11df-9806-080069138b88" uid="20926"/>
-      <subcategory value="5" description="SS-N-18 Stingray" uuid="f91613fe-5269-11df-86ea-080069138b88" uid="20927"/>
-      <subcategory value="6" description="SS-N-20 Sturgeon" uuid="f9172488-5269-11df-b55e-080069138b88" uid="20928"/>
-      <subcategory value="7" description="SS-N-23 Skiff" uuid="f918365c-5269-11df-ae02-080069138b88" uid="20929"/>
-      <subcategory value="8" description="SS-N-21 Sampson" uuid="f91942d6-5269-11df-be4b-080069138b88" uid="20930"/>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="f91a5586-5269-11df-87fb-080069138b88" uid="20931"/>
-      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f91b66ce-5269-11df-beee-080069138b88" uid="20932"/>
-      <subcategory value="11" description="AS-15 Kent" uuid="f91c769a-5269-11df-9d28-080069138b88" uid="20933">
-        <specific value="1" description="AS-15A (Tu-95 Bear-H) w/nuclear warhead" uuid="f91d8724-5269-11df-859b-080069138b88" uid="20934"/>
-        <specific value="2" description="AS-15B (Tu-160 Blackjack) w/nuclear warhead" uuid="f91e9b6e-5269-11df-8d22-080069138b88" uid="20935"/>
-      </subcategory>
-      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="f9204fc2-5269-11df-a514-080069138b88" uid="20936"/>
-      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="f9215c96-5269-11df-a2a4-080069138b88" uid="20937"/>
-      <subcategory value="14" description="SS-11 Sego" uuid="f9226ed8-5269-11df-ad53-080069138b88" uid="20938"/>
-      <subcategory value="15" description="SS-13 Savage" uuid="f92383a4-5269-11df-b397-080069138b88" uid="20939"/>
-      <subcategory value="16" description="SS-16 Sinner" uuid="f9248dda-5269-11df-925b-080069138b88" uid="20940"/>
-      <subcategory value="17" description="SS-17 Spanker" uuid="f9259ea0-5269-11df-aac8-080069138b88" uid="20941"/>
-      <subcategory value="18" description="SS-18 Satan" uuid="f926b376-5269-11df-ade8-080069138b88" uid="20942"/>
-      <subcategory value="19" description="SS-19 Stiletto" uuid="f927beb0-5269-11df-bb22-080069138b88" uid="20943"/>
-      <subcategory value="20" description="SS-20 Saber" uuid="f928d548-5269-11df-bbd2-080069138b88" uid="20944"/>
-      <subcategory value="21" description="SS-24 Scapel" uuid="f929e802-5269-11df-823c-080069138b88" uid="20945"/>
-      <subcategory value="22" description="SS-25 Sickle" uuid="f92af83c-5269-11df-b229-080069138b88" uid="20946">
-        <specific value="1" description="RS-12m (Topol)" uuid="f92c0826-5269-11df-a8fa-080069138b88" uid="20947"/>
-        <specific value="2" description="RS-12 M1 (Topol-M)" uuid="f92d17a2-5269-11df-a45f-080069138b88" uid="20948"/>
-        <specific value="3" description="RS-12 M2 (Topol-M, silo based)" uuid="f92e27aa-5269-11df-b968-080069138b88" uid="20949"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="222" uuid="f9311c44-5269-11df-882a-080069138b88" uid="20950">
-    <category value="2" description="Ballistic" uuid="f9322ec2-5269-11df-819c-080069138b88" uid="20951">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f933388a-5269-11df-adc0-080069138b88" uid="20952"/>
-      <subcategory value="2" description="SCUD-B" uuid="f9344b08-5269-11df-b103-080069138b88" uid="20953"/>
-      <subcategory value="3" description="SCUD-C" deprecated="1" uuid="f9355c5a-5269-11df-a9ae-080069138b88" uid="20954"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="224" uuid="f937b2de-5269-11df-85fb-080069138b88" uid="20955">
-    <category value="1" description="Guided" uuid="f938c1b0-5269-11df-ba28-080069138b88" uid="20956">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f939d58c-5269-11df-9057-080069138b88" uid="20957"/>
-      <subcategory value="2" description="Rapier Mk 1" uuid="f93aee22-5269-11df-9c00-080069138b88" uid="20958"/>
-      <subcategory value="3" description="Rapier Mk 2" uuid="f93c03b6-5269-11df-b458-080069138b88" uid="20959">
-        <specific value="1" description="Rapier Mk 2A (impact fuze)" uuid="f93d0e14-5269-11df-8504-080069138b88" uid="20960"/>
-        <specific value="2" description="Rapier Mk 2B (proximity fuze)" uuid="f93e1e58-5269-11df-ab0f-080069138b88" uid="20961"/>
-      </subcategory>
-      <subcategory value="4" description="Seacat/Tigercat" uuid="f93fd144-5269-11df-a8a4-080069138b88" uid="20962"/>
-      <subcategory value="5" description="Blowpipe" uuid="f940e5de-5269-11df-a16e-080069138b88" uid="20963"/>
-      <subcategory value="6" description="Javelin" uuid="f941f078-5269-11df-b587-080069138b88" uid="20964"/>
-      <subcategory value="7" description="Star Streak" uuid="f942ff18-5269-11df-a9d1-080069138b88" uid="20965"/>
-      <subcategory value="8" description="Sea Dart" uuid="f9441100-5269-11df-b6c2-080069138b88" uid="20966">
-        <specific value="1" description="GWS 30" uuid="f9451fa0-5269-11df-a3da-080069138b88" uid="20967"/>
-      </subcategory>
-      <subcategory value="9" description="Sea Wolf" uuid="f946cfa8-5269-11df-8a4e-080069138b88" uid="20968">
-        <specific value="1" description="GWS 25" uuid="f947e780-5269-11df-a949-080069138b88" uid="20969"/>
-        <specific value="2" description="GWS 26 Mod 1" uuid="f948f936-5269-11df-a9b1-080069138b88" uid="20970"/>
-      </subcategory>
-      <subcategory value="10" description="Sky Flash" uuid="f94aac54-5269-11df-bfee-080069138b88" uid="20971"/>
-      <subcategory value="11" description="ASRAAM" uuid="f94bb658-5269-11df-bbe7-080069138b88" uid="20972"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="224" uuid="f94e0aa2-5269-11df-9f7d-080069138b88" uid="20973">
-    <category value="1" description="Guided" uuid="f94f16fe-5269-11df-8046-080069138b88" uid="20974">
-      <subcategory value="1" description="Milan missile" uuid="f9502918-5269-11df-9513-080069138b88" uid="20975"/>
-      <subcategory value="2" description="Swingfire missile" uuid="f9513a88-5269-11df-b26f-080069138b88" uid="20976"/>
-      <subcategory value="3" description="Merlin" uuid="f9524518-5269-11df-b329-080069138b88" uid="20977"/>
-      <subcategory value="4" description="FI TOW" uuid="f953576e-5269-11df-8bd3-080069138b88" uid="20978"/>
-      <subcategory value="5" description="Trigat" uuid="f9546bcc-5269-11df-817e-080069138b88" uid="20979"/>
-      <subcategory value="6" description="LAW 80" uuid="f9557616-5269-11df-ab88-080069138b88" uid="20980"/>
-      <subcategory value="7" description="SWAARM" uuid="f95684ca-5269-11df-aae4-080069138b88" uid="20981"/>
-      <subcategory value="8" description="Wolverine" uuid="f95796e4-5269-11df-b9bc-080069138b88" uid="20982"/>
-      <subcategory value="9" description="Brimstone" uuid="f958a53e-5269-11df-b5cb-080069138b88" uid="20983"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f95a533e-5269-11df-a5e7-080069138b88" uid="20984">
-      <subcategory value="1" description="30mm RARDEN APDS" uuid="f95b62d8-5269-11df-bbda-080069138b88" uid="20985"/>
-      <subcategory value="2" description="120mm APFSDS-T (L23A1)" uuid="f95c7678-5269-11df-aa0b-080069138b88" uid="20986"/>
-      <subcategory value="3" description="120mm HESH- T(L31)" uuid="f95d8590-5269-11df-92c7-080069138b88" uid="20987"/>
-      <subcategory value="4" description="27mm Mauser HE" uuid="f95e9714-5269-11df-bf41-080069138b88" uid="20988"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="224" uuid="f960e622-5269-11df-9531-080069138b88" uid="20989">
-    <category value="1" description="Guided" uuid="f961f88c-5269-11df-a27c-080069138b88" uid="20990">
-      <subcategory value="1" description="Decoys" uuid="f9630718-5269-11df-bab3-080069138b88" uid="20991">
-        <specific value="1" description="Towed radar decoy" uuid="f964173e-5269-11df-95e4-080069138b88" uid="20992"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="224" uuid="f9670fca-5269-11df-af59-080069138b88" uid="20993">
-    <category value="1" description="Guided" uuid="f9681e74-5269-11df-a75d-080069138b88" uid="20994">
-      <subcategory value="1" description="ALARM" uuid="f9692fd0-5269-11df-aa6d-080069138b88" uid="20995"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="224" uuid="f96b821c-5269-11df-837b-080069138b88" uid="20996">
-    <category value="1" description="Guided" uuid="f96c8ec8-5269-11df-9ce8-080069138b88" uid="20997">
-      <subcategory value="1" description="Vosper Thorny Croft Excalibur Coast Defense Missile System" uuid="f96da57e-5269-11df-9640-080069138b88" uid="20998"/>
-      <subcategory value="2" description="Sea Eagle" uuid="f96ebae0-5269-11df-939c-080069138b88" uid="20999"/>
-      <subcategory value="3" description="Sea Eagle SL" uuid="f96fc61a-5269-11df-90c8-080069138b88" uid="21000"/>
-      <subcategory value="4" description="Sea Skua" uuid="f970d8d4-5269-11df-ac0b-080069138b88" uid="21001"/>
-      <subcategory value="5" description="Martel" uuid="f971e8fa-5269-11df-8f8b-080069138b88" uid="21002"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="224" uuid="f9743b78-5269-11df-bfc7-080069138b88" uid="21003">
-    <category value="1" description="Guided" uuid="f97549a0-5269-11df-bdb4-080069138b88" uid="21004">
-      <subcategory value="1" description="Tigerfish torpedo" uuid="f9765368-5269-11df-8650-080069138b88" uid="21005"/>
-      <subcategory value="2" description="Spear Fish torpedo" uuid="f977674e-5269-11df-86a7-080069138b88" uid="21006"/>
-      <subcategory value="3" description="Sting Ray torpedo" uuid="f978785a-5269-11df-8f63-080069138b88" uid="21007"/>
-      <subcategory value="4" description="Mk 24 torpedo" uuid="f97983b2-5269-11df-9f47-080069138b88" uid="21008"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="224" uuid="f97bd8d8-5269-11df-9c35-080069138b88" uid="21009">
-    <category value="2" description="Ballistic" uuid="f97ce25a-5269-11df-ae8e-080069138b88" uid="21010">
-      <subcategory value="1" description="7.62 mm" uuid="f97df532-5269-11df-b437-080069138b88" uid="21011"/>
-      <subcategory value="2" description="9.0 mm" uuid="f97f06d4-5269-11df-9395-080069138b88" uid="21012"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="224" uuid="f9815722-5269-11df-bc7d-080069138b88" uid="21013">
-    <category value="1" description="Guided" uuid="f98265c2-5269-11df-8cb8-080069138b88" uid="21014">
-      <subcategory value="1" description="Storm-Shadow" uuid="f9837002-5269-11df-a358-080069138b88" uid="21015"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f985294c-5269-11df-8db4-080069138b88" uid="21016">
-      <subcategory value="1" description="51 mm" uuid="f9863bb6-5269-11df-b157-080069138b88" uid="21017"/>
-      <subcategory value="2" description="89 mm" uuid="f9874c68-5269-11df-b34c-080069138b88" uid="21018"/>
-      <subcategory value="3" description="105 mm" uuid="f98858d8-5269-11df-aba1-080069138b88" uid="21019"/>
-      <subcategory value="4" description="155 mm" uuid="f98969b2-5269-11df-95e6-080069138b88" uid="21020"/>
-      <subcategory value="5" description="175 mm" uuid="f98a7884-5269-11df-a479-080069138b88" uid="21021"/>
-      <subcategory value="6" description="30 mm RARDEN HE" uuid="f98b877e-5269-11df-bcf3-080069138b88" uid="21022"/>
-      <subcategory value="7" description="120 mm smoke WP (L34)" uuid="f98c992a-5269-11df-889d-080069138b88" uid="21023"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="224" uuid="f98eec34-5269-11df-a4b3-080069138b88" uid="21024">
-    <category value="1" description="Guided" uuid="f98ffa98-5269-11df-a84c-080069138b88" uid="21025">
-      <subcategory value="1" description="A-3TK Polaris" uuid="f9910afa-5269-11df-b5eb-080069138b88" uid="21026"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="71" uuid="f9935e4a-5269-11df-b9a5-080069138b88" uid="21027">
-    <category value="1" description="Guided" uuid="f9946c40-5269-11df-9a69-080069138b88" uid="21028">
-      <subcategory value="1" description="Aster 15" uuid="f9957b8a-5269-11df-bb3f-080069138b88" uid="21029"/>
-      <subcategory value="2" description="Aster 30" uuid="f9968c5a-5269-11df-ab6c-080069138b88" uid="21030"/>
-      <subcategory value="3" description="Crotale" uuid="f9979a96-5269-11df-a17c-080069138b88" uid="21031">
-        <specific value="1" description="Crotale R440 missile" uuid="f998aaee-5269-11df-9461-080069138b88" uid="21032"/>
-        <specific value="2" description="VT-1 (Crotale NG) missile" uuid="f999bb78-5269-11df-894f-080069138b88" uid="21033"/>
-      </subcategory>
-      <subcategory value="4" description="Roland" uuid="f99b6f0e-5269-11df-acdb-080069138b88" uid="21034"/>
-      <subcategory value="5" description="Mistral" uuid="f99c794e-5269-11df-b492-080069138b88" uid="21035"/>
-      <subcategory value="6" description="Masurca" uuid="f99d8b2c-5269-11df-8e00-080069138b88" uid="21036"/>
-      <subcategory value="7" description="Mica Missile" uuid="f99e9b20-5269-11df-9267-080069138b88" uid="21037">
-        <specific value="1" description="Radar" uuid="f99fa894-5269-11df-bafc-080069138b88" uid="21038"/>
-        <specific value="2" description="IR" uuid="f9a0b842-5269-11df-8aea-080069138b88" uid="21039"/>
-      </subcategory>
-      <subcategory value="8" description="R530" uuid="f9a26994-5269-11df-a8c7-080069138b88" uid="21040"/>
-      <subcategory value="9" description="R-550 Magic" uuid="f9a38022-5269-11df-8317-080069138b88" uid="21041">
-        <specific value="1" description="R-550 Magic 1" uuid="f9a4900c-5269-11df-8e57-080069138b88" uid="21042"/>
-        <specific value="2" description="R-550 Magic 2" uuid="f9a5a082-5269-11df-b219-080069138b88" uid="21043"/>
-      </subcategory>
-      <subcategory value="10" description="Super 530" uuid="f9a751b6-5269-11df-9afc-080069138b88" uid="21044">
-        <specific value="1" description="Super 530F" uuid="f9a86330-5269-11df-8337-080069138b88" uid="21045"/>
-        <specific value="2" description="Super 530D" uuid="f9a96eec-5269-11df-9989-080069138b88" uid="21046"/>
-      </subcategory>
-      <subcategory value="11" description="Shahine R460 missile" uuid="f9ab2110-5269-11df-932f-080069138b88" uid="21047"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f9acd0e6-5269-11df-9f85-080069138b88" uid="21048">
-      <subcategory value="1" description="20 mm" uuid="f9ade0a8-5269-11df-8b99-080069138b88" uid="21049"/>
-      <subcategory value="2" description="25 mm" uuid="f9aef254-5269-11df-bfa0-080069138b88" uid="21050"/>
-      <subcategory value="3" description="30 mm" uuid="f9affff0-5269-11df-b214-080069138b88" uid="21051"/>
-      <subcategory value="9" description="90" uuid="f9b1100c-5269-11df-93f4-080069138b88" uid="21052"/>
-      <subcategory value="30" description=".50 Cal." uuid="f9b21efc-5269-11df-8709-080069138b88" uid="21053"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="71" uuid="f9b46fea-5269-11df-853c-080069138b88" uid="21054">
-    <category value="1" description="Guided" uuid="f9b57e1c-5269-11df-b04a-080069138b88" uid="21055">
-      <subcategory value="1" description="SS-11/AS-11" uuid="f9b68b54-5269-11df-b962-080069138b88" uid="21056"/>
-      <subcategory value="2" description="Eryx missile" uuid="f9b79a08-5269-11df-a626-080069138b88" uid="21057"/>
-      <subcategory value="3" description="HOT missile" uuid="f9b8aaf6-5269-11df-a76e-080069138b88" uid="21058"/>
-      <subcategory value="4" description="Milan missile" uuid="f9b9b8d8-5269-11df-9a4a-080069138b88" uid="21059"/>
-      <subcategory value="5" description="ACL-STRIM" uuid="f9bacb1a-5269-11df-885f-080069138b88" uid="21060"/>
-      <subcategory value="6" description="Entac" uuid="f9bbda6e-5269-11df-8d68-080069138b88" uid="21061"/>
-      <subcategory value="7" description="AS-15" uuid="f9bce5e4-5269-11df-8ba1-080069138b88" uid="21062">
-        <specific value="1" description="AS-15 TT" uuid="f9bdf9de-5269-11df-bfd5-080069138b88" uid="21063"/>
-      </subcategory>
-      <subcategory value="8" description="BAT 120 anti-armor bomb" uuid="f9bfa9f0-5269-11df-b43c-080069138b88" uid="21064"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f9c15c50-5269-11df-86b7-080069138b88" uid="21065">
-      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f9c27446-5269-11df-967c-080069138b88" uid="21066"/>
-      <subcategory value="2" description="8 in." uuid="f9c381d8-5269-11df-811b-080069138b88" uid="21067"/>
-      <subcategory value="3" description="20 mm" uuid="f9c4924e-5269-11df-a544-080069138b88" uid="21068"/>
-      <subcategory value="4" description="25 mm" uuid="f9c5a198-5269-11df-8f39-080069138b88" uid="21069"/>
-      <subcategory value="5" description="30 mm" uuid="f9c6bc68-5269-11df-aaf0-080069138b88" uid="21070"/>
-      <subcategory value="6" description="60 mm" uuid="f9c7cfc2-5269-11df-b88b-080069138b88" uid="21071"/>
-      <subcategory value="7" description="68 mm" uuid="f9c8e3c6-5269-11df-b879-080069138b88" uid="21072"/>
-      <subcategory value="8" description="74 mm" uuid="f9c9ece4-5269-11df-89ab-080069138b88" uid="21073"/>
-      <subcategory value="9" description="90 mm" uuid="f9cafde6-5269-11df-afad-080069138b88" uid="21074"/>
-      <subcategory value="10" description="105 mm" uuid="f9cc1154-5269-11df-b3a6-080069138b88" uid="21075"/>
-      <subcategory value="11" description="106 mm" uuid="f9cd1d7e-5269-11df-aac6-080069138b88" uid="21076"/>
-      <subcategory value="12" description="120 mm" uuid="f9ce2c96-5269-11df-b286-080069138b88" uid="21077"/>
-      <subcategory value="13" description="155 mm" uuid="f9cf3d52-5269-11df-9356-080069138b88" uid="21078"/>
-      <subcategory value="14" description="175 mm" uuid="f9d04bc0-5269-11df-b836-080069138b88" uid="21079"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="71" uuid="f9d29ede-5269-11df-9561-080069138b88" uid="21080">
-    <category value="1" description="Guided" uuid="f9d3ab6c-5269-11df-bd0a-080069138b88" uid="21081">
-      <subcategory value="1" description="Decoys" uuid="f9d4bade-5269-11df-9275-080069138b88" uid="21082"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="71" uuid="f9d70c08-5269-11df-8cb1-080069138b88" uid="21083">
-    <category value="1" description="Guided" uuid="f9d81a30-5269-11df-9ab7-080069138b88" uid="21084">
-      <subcategory value="1" description="Armat" uuid="f9d928c6-5269-11df-ad45-080069138b88" uid="21085"/>
-      <subcategory value="2" description="AS 37 Martel" uuid="f9da3a04-5269-11df-92ac-080069138b88" uid="21086"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="71" uuid="f9dc8ed0-5269-11df-8c5a-080069138b88" uid="21087">
-    <category value="1" description="Guided" uuid="f9dd9ea6-5269-11df-8f64-080069138b88" uid="21088">
-      <subcategory value="1" description="Exocet" uuid="f9dea8f0-5269-11df-ab08-080069138b88" uid="21089">
-        <specific value="1" description="MM-38" uuid="f9dfbbfa-5269-11df-aef1-080069138b88" uid="21090"/>
-        <specific value="2" description="AM-39" uuid="f9e0d3b4-5269-11df-b41e-080069138b88" uid="21091"/>
-        <specific value="3" description="SM-39 Exocet" uuid="f9e1df34-5269-11df-9b41-080069138b88" uid="21092"/>
-        <specific value="4" description="MM-40" uuid="f9e2f298-5269-11df-98c7-080069138b88" uid="21093"/>
-      </subcategory>
-      <subcategory value="2" description="AS-11" uuid="f9e4a1c4-5269-11df-8f4a-080069138b88" uid="21094"/>
-      <subcategory value="3" description="SS-12M" uuid="f9e5b1ea-5269-11df-959b-080069138b88" uid="21095"/>
-      <subcategory value="4" description="AS-15" uuid="f9e6c06c-5269-11df-9748-080069138b88" uid="21096"/>
-      <subcategory value="5" description="AS-30" uuid="f9e7d024-5269-11df-8d2f-080069138b88" uid="21097"/>
-      <subcategory value="6" description="AS-37 Martel" uuid="f9e8df96-5269-11df-8e4d-080069138b88" uid="21098"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="f9e9eeae-5269-11df-9d2d-080069138b88" uid="21099"/>
-      <subcategory value="8" description="Otomat" uuid="f9eaffd8-5269-11df-8cae-080069138b88" uid="21100">
-        <specific value="1" description="Mk1" uuid="f9ec0ef0-5269-11df-8bbb-080069138b88" uid="21101"/>
-        <specific value="2" description="Mk2" uuid="f9ed1c8c-5269-11df-a4d0-080069138b88" uid="21102"/>
-      </subcategory>
-      <subcategory value="9" description="E-14 torpedo" uuid="f9eecc3a-5269-11df-a4ce-080069138b88" uid="21103"/>
-      <subcategory value="10" description="E-15 torpedo" uuid="f9efdd1e-5269-11df-91d8-080069138b88" uid="21104"/>
-      <subcategory value="11" description="F-17 torpedo" uuid="f9f0ee48-5269-11df-ad2b-080069138b88" uid="21105">
-        <specific value="1" description="F-17 mod 2" uuid="f9f1fc98-5269-11df-a72a-080069138b88" uid="21106"/>
-      </subcategory>
-      <subcategory value="12" description="L-5 torpedo" uuid="f9f3acfa-5269-11df-bb32-080069138b88" uid="21107">
-        <specific value="1" description="L-5 mod 3" uuid="f9f4bcd0-5269-11df-82ba-080069138b88" uid="21108"/>
-        <specific value="2" description="L-5 mod 5" uuid="f9f5cdd2-5269-11df-8359-080069138b88" uid="21109"/>
-      </subcategory>
-      <subcategory value="13" description="Z-16 torpedo" uuid="f9f7826c-5269-11df-bd7e-080069138b88" uid="21110"/>
-      <subcategory value="14" description="AS-12" uuid="f9f88d2e-5269-11df-a77f-080069138b88" uid="21111"/>
-      <subcategory value="15" description="MU-90 Torpedo" uuid="f9f99d2c-5269-11df-a8fb-080069138b88" uid="21112"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="f9fb50b8-5269-11df-82c6-080069138b88" uid="21113">
-      <subcategory value="1" description="20 mm" uuid="f9fc6516-5269-11df-9e3f-080069138b88" uid="21114"/>
-      <subcategory value="2" description="25 mm" uuid="f9fd6f6a-5269-11df-8aa7-080069138b88" uid="21115"/>
-      <subcategory value="3" description="30 mm" uuid="f9fe7f36-5269-11df-9368-080069138b88" uid="21116"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="71" uuid="fa00dad8-5269-11df-844a-080069138b88" uid="21117">
-    <category value="1" description="Guided" uuid="fa01ea0e-5269-11df-9473-080069138b88" uid="21118">
-      <subcategory value="1" description="Malafon" uuid="fa02f994-5269-11df-b266-080069138b88" uid="21119"/>
-      <subcategory value="2" description="E-14 torpedo" uuid="fa040a96-5269-11df-9292-080069138b88" uid="21120"/>
-      <subcategory value="3" description="E-15 torpedo" uuid="fa051508-5269-11df-b235-080069138b88" uid="21121"/>
-      <subcategory value="4" description="F-17 torpedo" uuid="fa062862-5269-11df-9fee-080069138b88" uid="21122"/>
-      <subcategory value="5" description="L3 torpedo" uuid="fa073cde-5269-11df-a493-080069138b88" uid="21123"/>
-      <subcategory value="6" description="L4 torpedo" uuid="fa08475a-5269-11df-b148-080069138b88" uid="21124"/>
-      <subcategory value="7" description="L5 torpedo" uuid="fa095726-5269-11df-b7d6-080069138b88" uid="21125"/>
-      <subcategory value="8" description="Murene torpedo" uuid="fa0a69fe-5269-11df-8c51-080069138b88" uid="21126"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="71" uuid="fa0cbd08-5269-11df-9301-080069138b88" uid="21127">
-    <category value="2" description="Ballistic" uuid="fa0dcc84-5269-11df-8d79-080069138b88" uid="21128">
-      <subcategory value="1" description=".22 cal. Long Rifle" uuid="fa0ed5d4-5269-11df-ad37-080069138b88" uid="21129"/>
-      <subcategory value="2" description=".30-06" uuid="fa0ff3a6-5269-11df-8f17-080069138b88" uid="21130"/>
-      <subcategory value="3" description=".380 cal." uuid="fa1107d2-5269-11df-8c07-080069138b88" uid="21131"/>
-      <subcategory value="4" description=".38" uuid="fa121262-5269-11df-9b26-080069138b88" uid="21132"/>
-      <subcategory value="5" description=".45 cal." uuid="fa13212a-5269-11df-a493-080069138b88" uid="21133"/>
-      <subcategory value="6" description=".50 cal." uuid="fa14325e-5269-11df-9d5b-080069138b88" uid="21134"/>
-      <subcategory value="7" description="5.56 mm" uuid="fa15428e-5269-11df-b902-080069138b88" uid="21135"/>
-      <subcategory value="8" description="6.35 mm" uuid="fa1652fa-5269-11df-b119-080069138b88" uid="21136"/>
-      <subcategory value="9" description="7.5 mm" uuid="fa176172-5269-11df-aaae-080069138b88" uid="21137"/>
-      <subcategory value="10" description="7.62 mm" uuid="fa186bb2-5269-11df-b0d5-080069138b88" uid="21138"/>
-      <subcategory value="11" description="7.65 mm" uuid="fa1980ba-5269-11df-bc47-080069138b88" uid="21139"/>
-      <subcategory value="12" description="8 mm" uuid="fa1a91da-5269-11df-a2e2-080069138b88" uid="21140"/>
-      <subcategory value="13" description="9 mm" uuid="fa1b9c10-5269-11df-846f-080069138b88" uid="21141"/>
-      <subcategory value="14" description="20 mm" uuid="fa1cb05a-5269-11df-990a-080069138b88" uid="21142"/>
-      <subcategory value="15" description="25 mm" uuid="fa1dc1ca-5269-11df-bc0e-080069138b88" uid="21143"/>
-      <subcategory value="16" description="30 mm" uuid="fa1ed362-5269-11df-93a6-080069138b88" uid="21144"/>
-      <subcategory value="17" description="60 mm" uuid="fa1fe392-5269-11df-bea3-080069138b88" uid="21145"/>
-      <subcategory value="18" description="68 mm" uuid="fa20f7aa-5269-11df-8350-080069138b88" uid="21146"/>
-      <subcategory value="19" description="81 mm" uuid="fa2201b8-5269-11df-9d97-080069138b88" uid="21147"/>
-      <subcategory value="20" description="90 mm" uuid="fa231198-5269-11df-8cfb-080069138b88" uid="21148"/>
-      <subcategory value="21" description="120 mm" uuid="fa24243e-5269-11df-950c-080069138b88" uid="21149"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="71" uuid="fa26761c-5269-11df-b1c0-080069138b88" uid="21150">
-    <category value="1" description="Guided" uuid="fa27911e-5269-11df-8ba9-080069138b88" uid="21151">
-      <subcategory value="1" description="Hades missile" uuid="fa28a126-5269-11df-b74f-080069138b88" uid="21152"/>
-      <subcategory value="2" description="Pluton missile" uuid="fa29b200-5269-11df-bb5c-080069138b88" uid="21153"/>
-      <subcategory value="3" description="AS 30L (laser guided)" uuid="fa2ac58c-5269-11df-8e95-080069138b88" uid="21154"/>
-      <subcategory value="4" description="ASMP" uuid="fa2bd576-5269-11df-804a-080069138b88" uid="21155"/>
-      <subcategory value="5" description="Excalibur MP 22 bomb" uuid="fa2ce6c8-5269-11df-a0a1-080069138b88" uid="21156"/>
-      <subcategory value="6" description="Matra laser-guided bomb (LGB)" uuid="fa2df748-5269-11df-9c7f-080069138b88" uid="21157"/>
-      <subcategory value="7" description="French Apache GLCM" uuid="fa2f0796-5269-11df-bc0d-080069138b88" uid="21158"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fa30b816-5269-11df-80f2-080069138b88" uid="21159">
-      <subcategory value="1" description=".50 Cal." uuid="fa31c6fc-5269-11df-bc0f-080069138b88" uid="21160"/>
-      <subcategory value="2" description="20 mm" uuid="fa32d772-5269-11df-a023-080069138b88" uid="21161"/>
-      <subcategory value="3" description="25 mm" uuid="fa33e5cc-5269-11df-be89-080069138b88" uid="21162"/>
-      <subcategory value="4" description="30 mm" uuid="fa34f5f2-5269-11df-8865-080069138b88" uid="21163"/>
-      <subcategory value="5" description="58 mm" uuid="fa360460-5269-11df-91b5-080069138b88" uid="21164"/>
-      <subcategory value="6" description="74 mm" uuid="fa370f7c-5269-11df-9191-080069138b88" uid="21165"/>
-      <subcategory value="7" description="90 mm" uuid="fa382394-5269-11df-89d3-080069138b88" uid="21166"/>
-      <subcategory value="8" description="105 mm" uuid="fa393374-5269-11df-bc50-080069138b88" uid="21167"/>
-      <subcategory value="9" description="106 mm" uuid="fa3a3e40-5269-11df-8f67-080069138b88" uid="21168"/>
-      <subcategory value="10" description="155 mm" uuid="fa3b52b2-5269-11df-9d8c-080069138b88" uid="21169"/>
-      <subcategory value="11" description="175 mm" uuid="fa3c63b4-5269-11df-a14d-080069138b88" uid="21170"/>
-      <subcategory value="12" description="8 in." uuid="fa3d7704-5269-11df-9d13-080069138b88" uid="21171"/>
-      <subcategory value="13" description="120mm Mortar Ammunition" uuid="fa3e8680-5269-11df-b45a-080069138b88" uid="21172">
-        <specific value="1" description="120mm FRAG-HE, PR14" uuid="fa3f9c00-5269-11df-a285-080069138b88" uid="21173"/>
-        <specific value="2" description="120mm HE-RA, PRPA" uuid="fa40a726-5269-11df-b65d-080069138b88" uid="21174"/>
-      </subcategory>
-      <subcategory value="50" description="BAP 100-mm airfield attack bomb" uuid="fa4259c2-5269-11df-a3a3-080069138b88" uid="21175"/>
-      <subcategory value="51" description="BLG 66 Belouga bomb" uuid="fa436a4c-5269-11df-90f3-080069138b88" uid="21176"/>
-      <subcategory value="52" description="BM 400 bomb" uuid="fa447f22-5269-11df-8bc9-080069138b88" uid="21177"/>
-      <subcategory value="53" description="CASCAD Mk 1" uuid="fa458a8e-5269-11df-84ca-080069138b88" uid="21178"/>
-      <subcategory value="54" description="CASCAD Mk 2" uuid="fa469c30-5269-11df-9c00-080069138b88" uid="21179"/>
-      <subcategory value="55" description="CH-TABO Pod" uuid="fa47ac38-5269-11df-b932-080069138b88" uid="21180"/>
-      <subcategory value="56" description="Durandal penetration bomb" uuid="fa48bbaa-5269-11df-8145-080069138b88" uid="21181"/>
-      <subcategory value="57" description="LU 250 EG-FT bomb" uuid="fa49ce32-5269-11df-8f4b-080069138b88" uid="21182"/>
-      <subcategory value="58" description="SAMP BL 61 125-kg fragmentation bomb" uuid="fa4ae182-5269-11df-bb50-080069138b88" uid="21183"/>
-      <subcategory value="59" description="SAMP BL 70 400-kg fragmentation bomb" uuid="fa4bf022-5269-11df-9c73-080069138b88" uid="21184"/>
-      <subcategory value="60" description="SAMP BL 99 450-kg bomb" uuid="fa4d02f0-5269-11df-8d4e-080069138b88" uid="21185"/>
-      <subcategory value="61" description="SAMP BL EU4 1000-kg bomb" uuid="fa4e155a-5269-11df-a6b3-080069138b88" uid="21186"/>
-      <subcategory value="62" description="T 15 SAMP fragmentation bomb" uuid="fa4f229c-5269-11df-a87e-080069138b88" uid="21187"/>
-      <subcategory value="63" description="BL 8 SAMP fragmentation bomb" uuid="fa503466-5269-11df-8f04-080069138b88" uid="21188"/>
-      <subcategory value="64" description="BL 9 SAMP fragmentation bomb" uuid="fa514ba8-5269-11df-8f31-080069138b88" uid="21189"/>
-      <subcategory value="65" description="BL 18 SAMP fragmentation bomb" uuid="fa52591c-5269-11df-b14a-080069138b88" uid="21190"/>
-      <subcategory value="66" description="SAMP GP bomb family" uuid="fa536c12-5269-11df-93be-080069138b88" uid="21191"/>
-      <subcategory value="67" description="SAMP 81 AF 125-kg bomb" uuid="fa547ca6-5269-11df-9bc6-080069138b88" uid="21192"/>
-      <subcategory value="68" description="TBA retarded 125-kg close-support bomb" uuid="fa558d3a-5269-11df-b6fc-080069138b88" uid="21193"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="71" uuid="fa57e1b6-5269-11df-98e9-080069138b88" uid="21194">
-    <category value="1" description="Guided" uuid="fa58ee94-5269-11df-95da-080069138b88" uid="21195">
-      <subcategory value="1" description="SSBS Type S-30D/TN-61" uuid="fa59fdc0-5269-11df-8d98-080069138b88" uid="21196"/>
-      <subcategory value="2" description="SSBS Type S-4(SX)" uuid="fa5b1070-5269-11df-bb7c-080069138b88" uid="21197"/>
-      <subcategory value="3" description="SLBM M-20" uuid="fa5c26b8-5269-11df-82ec-080069138b88" uid="21198"/>
-      <subcategory value="4" description="SLBM M-4" uuid="fa5d381e-5269-11df-a84b-080069138b88" uid="21199"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="78" uuid="fa5f84f2-5269-11df-8298-080069138b88" uid="21200">
-    <category value="1" description="Guided" uuid="fa609680-5269-11df-b141-080069138b88" uid="21201">
-      <subcategory value="1" description="Roland" uuid="fa61a4c6-5269-11df-9059-080069138b88" uid="21202">
-        <specific value="1" description="Roland 1" uuid="fa62b0c8-5269-11df-842a-080069138b88" uid="21203"/>
-        <specific value="2" description="Roland 2" uuid="fa63bf90-5269-11df-8633-080069138b88" uid="21204"/>
-        <specific value="3" description="Roland 3" uuid="fa64d3a8-5269-11df-9f35-080069138b88" uid="21205"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Ballistic" uuid="fa672180-5269-11df-9a16-080069138b88" uid="21206">
-      <subcategory value="1" description="20 mm" uuid="fa6833ae-5269-11df-a76a-080069138b88" uid="21207"/>
-      <subcategory value="2" description="35 mm" uuid="fa693eb6-5269-11df-ba58-080069138b88" uid="21208"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="78" uuid="fa6b94ea-5269-11df-a28f-080069138b88" uid="21209">
-    <category value="1" description="Guided" uuid="fa6c9dcc-5269-11df-a0ae-080069138b88" uid="21210">
-      <subcategory value="1" description="Milan missile" uuid="fa6dadde-5269-11df-ad0e-080069138b88" uid="21211"/>
-      <subcategory value="2" description="HOT missile" uuid="fa6ebcb0-5269-11df-a682-080069138b88" uid="21212"/>
-      <subcategory value="3" description="TOW missile" uuid="fa6fcbc8-5269-11df-80d5-080069138b88" uid="21213"/>
-      <subcategory value="4" description="Pars 3 missile" uuid="fa70ecce-5269-11df-9365-080069138b88" uid="21214"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fa72b0ae-5269-11df-87f1-080069138b88" uid="21215">
-      <subcategory value="1" description="110-mm rocket" uuid="fa73c110-5269-11df-8817-080069138b88" uid="21216"/>
-      <subcategory value="2" description="105-mm APDS-T" uuid="fa74cbdc-5269-11df-97cc-080069138b88" uid="21217"/>
-      <subcategory value="3" description="105-mm APFSDS-T" uuid="fa75dcd4-5269-11df-ab84-080069138b88" uid="21218"/>
-      <subcategory value="4" description="105-mm HEAT-T" uuid="fa76f150-5269-11df-a7d2-080069138b88" uid="21219"/>
-      <subcategory value="5" description="120-mm HEAT-MP-T DM12" uuid="fa77fc80-5269-11df-8969-080069138b88" uid="21220"/>
-      <subcategory value="6" description="120-mm APFSDS-T DM13" uuid="fa790eea-5269-11df-88e4-080069138b88" uid="21221"/>
-      <subcategory value="7" description="120-mm APFSDS-T DM23" uuid="fa7a2a46-5269-11df-9802-080069138b88" uid="21222"/>
-      <subcategory value="8" description="120-mm APFSDS-T DM33" uuid="fa7b3a9e-5269-11df-942c-080069138b88" uid="21223"/>
-      <subcategory value="9" description="110mm" uuid="fa7c4c9a-5269-11df-956d-080069138b88" uid="21224">
-        <specific value="1" description="110mm Tandem HEAT, 3-T for PzFst-3" uuid="fa7d5bda-5269-11df-a84a-080069138b88" uid="21225"/>
-        <specific value="2" description="110mm HEAT, PZF-3" uuid="fa7e6908-5269-11df-a92d-080069138b88" uid="21226"/>
-        <specific value="3" description="110mm SAL-H" uuid="fa7f7c76-5269-11df-b720-080069138b88" uid="21227"/>
-      </subcategory>
-      <subcategory value="10" description="Armbrust 67mm HEAT rocket" uuid="fa812d96-5269-11df-9acd-080069138b88" uid="21228"/>
-    </category>
-    <category value="3" description="Fixed" uuid="fa82e03c-5269-11df-b640-080069138b88" uid="21229">
-      <subcategory value="1" description="Anti-tank mine" uuid="fa83efc2-5269-11df-811d-080069138b88" uid="21230">
-        <specific value="1" description="MIFF" uuid="fa84fac0-5269-11df-97cd-080069138b88" uid="21231"/>
-        <specific value="2" description="KB44" uuid="fa860c12-5269-11df-a7c9-080069138b88" uid="21232"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="78" uuid="fa8901e2-5269-11df-a8d7-080069138b88" uid="21233">
-    <category value="1" description="Guided" uuid="fa8a1104-5269-11df-a60a-080069138b88" uid="21234">
-      <subcategory value="1" description="Kormoran" uuid="fa8b1e00-5269-11df-980a-080069138b88" uid="21235"/>
-      <subcategory value="2" description="AEG Seeal 533 mm Torpedo" uuid="fa8c2d72-5269-11df-988b-080069138b88" uid="21236"/>
-      <subcategory value="3" description="SST-3 Torpedo" uuid="fa8d3d66-5269-11df-9c2f-080069138b88" uid="21237"/>
-      <subcategory value="4" description="SST-4 Torpedo" uuid="fa8e49d6-5269-11df-b963-080069138b88" uid="21238"/>
-      <subcategory value="5" description="DM2A1 Seal Torpedo" uuid="fa8f5eac-5269-11df-929f-080069138b88" uid="21239"/>
-      <subcategory value="6" description="DM2A3 Seehecht Torpedo" uuid="fa906fae-5269-11df-b3e7-080069138b88" uid="21240"/>
-      <subcategory value="7" description="SUT Torpedo" uuid="fa917a02-5269-11df-90ef-080069138b88" uid="21241"/>
-      <subcategory value="8" description="G7e Torpedo" uuid="fa928dfc-5269-11df-961e-080069138b88" uid="21242"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="78" uuid="fa94dd32-5269-11df-a05d-080069138b88" uid="21243">
-    <category value="1" description="Guided" uuid="fa95ec40-5269-11df-938a-080069138b88" uid="21244">
-      <subcategory value="1" description="AEG Seeschlange 533 mm Torpedo" uuid="fa96fb58-5269-11df-9721-080069138b88" uid="21245"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="78" uuid="fa995948-5269-11df-8969-080069138b88" uid="21246">
-    <category value="2" description="Ballistic" uuid="fa9a67d4-5269-11df-8d17-080069138b88" uid="21247">
-      <subcategory value="1" description="5.56 mm" uuid="fa9b79ee-5269-11df-88bf-080069138b88" uid="21248"/>
-      <subcategory value="2" description="7.62 mm" uuid="fa9c8d02-5269-11df-8529-080069138b88" uid="21249"/>
-      <subcategory value="3" description="9 mm" uuid="fa9d972e-5269-11df-a42e-080069138b88" uid="21250"/>
-    </category>
-    <category value="3" description="Fixed" uuid="fa9f47ea-5269-11df-be24-080069138b88" uid="21251">
-      <subcategory value="1" description="Mine" uuid="faa05ac2-5269-11df-82df-080069138b88" uid="21252"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="78" uuid="faa2a746-5269-11df-a77c-080069138b88" uid="21253">
-    <category value="1" description="Guided" uuid="faa3b942-5269-11df-bd2c-080069138b88" uid="21254">
-      <subcategory value="1" description="Parachute signal rocket, white" uuid="faa4c95e-5269-11df-b4d5-080069138b88" uid="21255"/>
-      <subcategory value="2" description="Taurus" uuid="faa5dae2-5269-11df-87b8-080069138b88" uid="21256"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="faa78d9c-5269-11df-a044-080069138b88" uid="21257">
-      <subcategory value="1" description="20 mm" uuid="faa896e2-5269-11df-bb11-080069138b88" uid="21258"/>
-      <subcategory value="2" description="35 mm" uuid="faa9a758-5269-11df-9ebe-080069138b88" uid="21259"/>
-      <subcategory value="3" description="73 mm" uuid="faaab878-5269-11df-9aa3-080069138b88" uid="21260"/>
-      <subcategory value="4" description="105 mm" uuid="faabc22c-5269-11df-8106-080069138b88" uid="21261"/>
-      <subcategory value="5" description="120 mm" uuid="faacd694-5269-11df-a3d9-080069138b88" uid="21262">
-        <specific value="1" description="HE" uuid="faade5f2-5269-11df-bf7a-080069138b88" uid="21263"/>
-        <specific value="2" description="APFSDS-P" uuid="faaef168-5269-11df-bdf1-080069138b88" uid="21264"/>
-        <specific value="3" description="TRCSDS-T" uuid="fab00026-5269-11df-91ca-080069138b88" uid="21265"/>
-        <specific value="4" description="SABOT" uuid="fab114ac-5269-11df-a871-080069138b88" uid="21266"/>
-        <specific value="5" description="Heat (MZ)" uuid="fab21eec-5269-11df-9a8b-080069138b88" uid="21267"/>
-      </subcategory>
-      <subcategory value="6" description="110 mm" uuid="fab3cf44-5269-11df-9558-080069138b88" uid="21268">
-        <specific value="1" description="110mm HE-Frag, MZ-110" uuid="fab4dee8-5269-11df-bf34-080069138b88" uid="21269"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="102" uuid="fab7e052-5269-11df-807e-080069138b88" uid="21270">
-    <category value="2" description="Ballistic" uuid="fab8f370-5269-11df-b215-080069138b88" uid="21271">
-      <subcategory value="1" description="Al Abbas" uuid="fab9fe00-5269-11df-b7ab-080069138b88" uid="21272"/>
-      <subcategory value="2" description="Al Hussein" uuid="fabb0e8a-5269-11df-b93d-080069138b88" uid="21273"/>
-      <subcategory value="3" description="Scud-B (SS-1C)" deprecated="1" uuid="fabc20b8-5269-11df-8184-080069138b88" uid="21274"/>
-      <subcategory value="4" description="Scud-C (SS-1D)" deprecated="1" uuid="fabd30ca-5269-11df-ac55-080069138b88" uid="21275"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="102" uuid="fabf9342-5269-11df-9138-080069138b88" uid="21276">
-    <category value="1" description="Guided" uuid="fac09f4e-5269-11df-a1d5-080069138b88" uid="21277">
-      <subcategory value="1" description="FAW 70" uuid="fac1ae2a-5269-11df-85cf-080069138b88" uid="21278"/>
-      <subcategory value="2" description="FAW 150" uuid="fac2c378-5269-11df-9e40-080069138b88" uid="21279"/>
-      <subcategory value="3" description="FAW 200" uuid="fac3cea8-5269-11df-95ba-080069138b88" uid="21280"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="105" uuid="fac623ba-5269-11df-95cd-080069138b88" uid="21281">
-    <category value="1" description="Guided" uuid="fac730de-5269-11df-be45-080069138b88" uid="21282">
-      <subcategory value="1" description="Shafrir 2" uuid="fac8400a-5269-11df-80e2-080069138b88" uid="21283"/>
-      <subcategory value="2" description="Python III" uuid="fac95026-5269-11df-9175-080069138b88" uid="21284"/>
-      <subcategory value="3" description="Python IV" uuid="faca5dd6-5269-11df-a837-080069138b88" uid="21285"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="105" uuid="faccb0ea-5269-11df-9018-080069138b88" uid="21286">
-    <category value="1" description="Guided" uuid="facdbc7e-5269-11df-b40c-080069138b88" uid="21287">
-      <subcategory value="1" description="TOW (Ramata) M-113" uuid="facecc68-5269-11df-93a5-080069138b88" uid="21288"/>
-      <subcategory value="2" description="Picket 81 mm" uuid="facfde14-5269-11df-ad05-080069138b88" uid="21289"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="105" uuid="fad22bce-5269-11df-92be-080069138b88" uid="21290">
-    <category value="1" description="Guided" uuid="fad33dfc-5269-11df-9b29-080069138b88" uid="21291">
-      <subcategory value="1" description="Surface to Air" uuid="fad448d2-5269-11df-be36-080069138b88" uid="21292">
-        <specific value="1" description="Barak" uuid="fad55830-5269-11df-804e-080069138b88" uid="21293"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="105" uuid="fad85ac6-5269-11df-8cc5-080069138b88" uid="21294">
-    <category value="1" description="Guided" uuid="fad96a42-5269-11df-8095-080069138b88" uid="21295">
-      <subcategory value="1" description="Gabriel" uuid="fada740a-5269-11df-b4cd-080069138b88" uid="21296">
-        <specific value="1" description="Gabriel I" uuid="fadb8822-5269-11df-b278-080069138b88" uid="21297"/>
-        <specific value="2" description="Gabriel II" uuid="fadc96ea-5269-11df-99ed-080069138b88" uid="21298"/>
-        <specific value="3" description="Gabriel III (Mod)" uuid="fadda22e-5269-11df-b258-080069138b88" uid="21299"/>
-        <specific value="4" description="Gabriel Mk 4 LR" uuid="fadeb510-5269-11df-8aab-080069138b88" uid="21300"/>
-      </subcategory>
-      <subcategory value="2" description="LUZ" uuid="fae06504-5269-11df-a4b1-080069138b88" uid="21301"/>
-      <subcategory value="3" description="Gabriel III (mod)" deprecated="1" uuid="fae17426-5269-11df-8452-080069138b88" uid="21302"/>
-      <subcategory value="4" description="1A1 Gabriel II" deprecated="1" uuid="fae2849c-5269-11df-8d5e-080069138b88" uid="21303"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="105" uuid="fae4d99a-5269-11df-b667-080069138b88" uid="21304">
-    <category value="2" description="Ballistic" uuid="fae5e4b6-5269-11df-991f-080069138b88" uid="21305">
-      <subcategory value="1" description="Jericho 2" uuid="fae6f2fc-5269-11df-9cea-080069138b88" uid="21306"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="45" uuid="fae94516-5269-11df-ade0-080069138b88" uid="21307">
-    <category value="1" description="Guided" uuid="faea53c0-5269-11df-9c8b-080069138b88" uid="21308">
-      <subcategory value="1" description="HQ-2 (CSA-1)" uuid="faeb660c-5269-11df-8cb8-080069138b88" uid="21309">
-        <specific value="1" description="HQ-2" uuid="faec74f2-5269-11df-9471-080069138b88" uid="21310"/>
-        <specific value="2" description="HQ-2J" uuid="faed7f8c-5269-11df-b1d3-080069138b88" uid="21311"/>
-        <specific value="3" description="HQ-2B" uuid="faee91ba-5269-11df-95fa-080069138b88" uid="21312"/>
-      </subcategory>
-      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="faf0415e-5269-11df-9f84-080069138b88" uid="21313"/>
-      <subcategory value="3" description="HQ-61 SAM" uuid="faf15260-5269-11df-8661-080069138b88" uid="21314"/>
-      <subcategory value="4" description="HN-5 (SA-7 type)" uuid="faf262a4-5269-11df-95d3-080069138b88" uid="21315">
-        <specific value="1" description="HN-5" uuid="faf3745a-5269-11df-8f98-080069138b88" uid="21316"/>
-        <specific value="2" description="HN-5A" uuid="faf4846c-5269-11df-9307-080069138b88" uid="21317"/>
-      </subcategory>
-      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="faf63dc0-5269-11df-bd91-080069138b88" uid="21318"/>
-      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="faf74ef4-5269-11df-a338-080069138b88" uid="21319"/>
-      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="faf861a4-5269-11df-8f71-080069138b88" uid="21320"/>
-      <subcategory value="8" description="PL-2 ATOLL type" uuid="faf96d1a-5269-11df-8bee-080069138b88" uid="21321">
-        <specific value="1" description="PL-2" uuid="fafa7c14-5269-11df-a8e8-080069138b88" uid="21322"/>
-        <specific value="2" description="PL-2A" uuid="fafb8e74-5269-11df-8e7d-080069138b88" uid="21323"/>
-      </subcategory>
-      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="fafd3e54-5269-11df-984a-080069138b88" uid="21324"/>
-      <subcategory value="10" description="PL-5B ATOLL Type" uuid="fafe5168-5269-11df-90fe-080069138b88" uid="21325"/>
-      <subcategory value="11" description="PL-7" uuid="faff5b76-5269-11df-9104-080069138b88" uid="21326"/>
-      <subcategory value="12" description="PL-9" uuid="fb006ffc-5269-11df-9fd5-080069138b88" uid="21327"/>
-      <subcategory value="13" description="PL-8 (python-III type)" uuid="fb01804a-5269-11df-a729-080069138b88" uid="21328"/>
-      <subcategory value="14" description="PL-4 (Aspide type)" uuid="fb028b70-5269-11df-9694-080069138b88" uid="21329"/>
-      <subcategory value="15" description="LY-60" uuid="fb039d8a-5269-11df-a6d1-080069138b88" uid="21330">
-        <specific value="1" description="LY-60N" uuid="fb04acd4-5269-11df-8889-080069138b88" uid="21331"/>
-      </subcategory>
-      <subcategory value="16" description="FM-80 / HQ-7 (Crotale type)" uuid="fb065e1c-5269-11df-8e9a-080069138b88" uid="21332"/>
-      <subcategory value="17" description="QW-1 Vanguard" uuid="fb076d8e-5269-11df-91d3-080069138b88" uid="21333"/>
-      <subcategory value="18" description="PL-11" uuid="fb087c74-5269-11df-98ca-080069138b88" uid="21334"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fb0a2fd8-5269-11df-983b-080069138b88" uid="21335">
-      <subcategory value="1" description="12.7 mm Type 54" uuid="fb0b3ed2-5269-11df-9ecc-080069138b88" uid="21336">
-        <specific value="1" description="API" uuid="fb0c49bc-5269-11df-b328-080069138b88" uid="21337"/>
-        <specific value="2" description="API-T" uuid="fb0d5be0-5269-11df-bb7c-080069138b88" uid="21338"/>
-      </subcategory>
-      <subcategory value="2" description="14.5 mm Type 56" uuid="fb0f0ada-5269-11df-ab43-080069138b88" uid="21339">
-        <specific value="1" description="API" uuid="fb101a74-5269-11df-a018-080069138b88" uid="21340"/>
-        <specific value="2" description="API-T" uuid="fb1127fc-5269-11df-9d65-080069138b88" uid="21341"/>
-        <specific value="3" description="Incendiary" uuid="fb12366a-5269-11df-847a-080069138b88" uid="21342"/>
-      </subcategory>
-      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="fb13f270-5269-11df-a4e8-080069138b88" uid="21343"/>
-      <subcategory value="4" description="57 mm" uuid="fb150548-5269-11df-ab0f-080069138b88" uid="21344"/>
-      <subcategory value="5" description="85 mm" uuid="fb16105a-5269-11df-b4c0-080069138b88" uid="21345"/>
-      <subcategory value="6" description="100 mm" uuid="fb172274-5269-11df-9f33-080069138b88" uid="21346"/>
-      <subcategory value="7" description="37 mm Type 55" uuid="fb183222-5269-11df-9825-080069138b88" uid="21347">
-        <specific value="1" description="HE" uuid="fb193d3e-5269-11df-a0b2-080069138b88" uid="21348"/>
-        <specific value="2" description="HE-T" uuid="fb1a4a80-5269-11df-b425-080069138b88" uid="21349"/>
-        <specific value="3" description="APHE" uuid="fb1b5cc2-5269-11df-ae3b-080069138b88" uid="21350"/>
-        <specific value="4" description="AP-T" uuid="fb1c66e4-5269-11df-8ad2-080069138b88" uid="21351"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="45" uuid="fb1f5cf0-5269-11df-9a53-080069138b88" uid="21352">
-    <category value="1" description="Guided" uuid="fb206c3a-5269-11df-8834-080069138b88" uid="21353">
-      <subcategory value="1" description="HJ-7S (Sagger type)" uuid="fb21751c-5269-11df-8105-080069138b88" uid="21354"/>
-      <subcategory value="2" description="HJ-8 (TOW/Milan type)" uuid="fb2287b8-5269-11df-8386-080069138b88" uid="21355"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fb243cca-5269-11df-919a-080069138b88" uid="21356">
-      <subcategory value="1" description="57 mm type 55" uuid="fb254cd2-5269-11df-a2d5-080069138b88" uid="21357"/>
-      <subcategory value="2" description="76 mm type 54" uuid="fb265604-5269-11df-9e95-080069138b88" uid="21358"/>
-      <subcategory value="3" description="100 mm" uuid="fb2767b0-5269-11df-8c63-080069138b88" uid="21359">
-        <specific value="1" description="HE Type 73" uuid="fb287b0a-5269-11df-9462-080069138b88" uid="21360"/>
-        <specific value="2" description="HEAT Type 73" uuid="fb298360-5269-11df-87af-080069138b88" uid="21361"/>
-        <specific value="3" description="APDS Type 73" uuid="fb2a92fa-5269-11df-b351-080069138b88" uid="21362"/>
-        <specific value="4" description="APFSDS Type 73" uuid="fb2ba64a-5269-11df-add9-080069138b88" uid="21363"/>
-        <specific value="5" description="APFSDS Type 86" uuid="fb2cb184-5269-11df-9075-080069138b88" uid="21364"/>
-        <specific value="6" description="APFSDS-T Type AP100-2" uuid="fb2dbfa2-5269-11df-88ff-080069138b88" uid="21365"/>
-        <specific value="7" description="APFSDS-T (for Type 59 MBT)" uuid="fb2ed022-5269-11df-8da1-080069138b88" uid="21366"/>
-        <specific value="8" description="HE (for Type 69 MBT)" uuid="fb2fdfe4-5269-11df-9bf8-080069138b88" uid="21367"/>
-        <specific value="9" description="HEAT (for Type 69 MBT)" uuid="fb30efa6-5269-11df-9f68-080069138b88" uid="21368"/>
-        <specific value="10" description="APHE (for Type 69 MBT)" uuid="fb320792-5269-11df-9b20-080069138b88" uid="21369"/>
-        <specific value="11" description="APFSDS (for Type 69 MBT)" uuid="fb3318ee-5269-11df-9829-080069138b88" uid="21370"/>
-        <specific value="12" description="HVAPDS (for Type 69 MBT)" uuid="fb342b80-5269-11df-847d-080069138b88" uid="21371"/>
-      </subcategory>
-      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="fb35dd4a-5269-11df-866f-080069138b88" uid="21372"/>
-      <subcategory value="5" description="105 mm" uuid="fb36effa-5269-11df-84b4-080069138b88" uid="21373">
-        <specific value="1" description="HE" uuid="fb37f9d6-5269-11df-8b7d-080069138b88" uid="21374"/>
-        <specific value="2" description="HESH" uuid="fb390b46-5269-11df-a9d4-080069138b88" uid="21375"/>
-        <specific value="3" description="HEAT" uuid="fb3a1c2a-5269-11df-82f3-080069138b88" uid="21376"/>
-        <specific value="4" description="HEAT-T" uuid="fb3b2516-5269-11df-b990-080069138b88" uid="21377"/>
-        <specific value="5" description="APDS" uuid="fb3c35d2-5269-11df-b386-080069138b88" uid="21378"/>
-        <specific value="6" description="APFSDS" uuid="fb3d488c-5269-11df-9fc5-080069138b88" uid="21379"/>
-        <specific value="7" description="APFSDS-T" uuid="fb3e5358-5269-11df-9298-080069138b88" uid="21380"/>
-        <specific value="8" description="Type 75" uuid="fb3f6130-5269-11df-afa0-080069138b88" uid="21381"/>
-      </subcategory>
-      <subcategory value="6" description="82 mm Type 65 (recoilless rifle)" uuid="fb411174-5269-11df-b8c0-080069138b88" uid="21382"/>
-      <subcategory value="7" description="85 mm Type 56 ATG" uuid="fb422672-5269-11df-b478-080069138b88" uid="21383">
-        <specific value="1" description="HE" uuid="fb432fcc-5269-11df-a915-080069138b88" uid="21384"/>
-        <specific value="2" description="HEAT-FS" uuid="fb443f52-5269-11df-aca2-080069138b88" uid="21385"/>
-        <specific value="3" description="HESH" uuid="fb4550a4-5269-11df-8c6d-080069138b88" uid="21386"/>
-      </subcategory>
-      <subcategory value="8" description="90 mm Type 51" uuid="fb470296-5269-11df-af14-080069138b88" uid="21387"/>
-      <subcategory value="9" description="35mm Grenade Launcher Ammunition" uuid="fb481000-5269-11df-9b64-080069138b88" uid="21388">
-        <specific value="1" description="Grenade, 35mm, HEAT" uuid="fb492238-5269-11df-ab0f-080069138b88" uid="21389"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="45" uuid="fb4c19ca-5269-11df-b8f2-080069138b88" uid="21390">
-    <category value="1" description="Guided" uuid="fb4d2806-5269-11df-b127-080069138b88" uid="21391">
-      <subcategory value="1" description="HQ-2" deprecated="1" uuid="fb4e3192-5269-11df-a79e-080069138b88" uid="21392"/>
-      <subcategory value="2" description="HQ-2J (CSA-1)" deprecated="1" uuid="fb4f44d8-5269-11df-b146-080069138b88" uid="21393"/>
-      <subcategory value="3" description="HQ-61" deprecated="1" uuid="fb5056a2-5269-11df-8a63-080069138b88" uid="21394"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fb520eca-5269-11df-98bb-080069138b88" uid="21395">
-      <subcategory value="1" description="57 mm" deprecated="1" uuid="fb531cfc-5269-11df-a6d5-080069138b88" uid="21396"/>
-      <subcategory value="2" description="85 mm" deprecated="1" uuid="fb542e80-5269-11df-b9be-080069138b88" uid="21397"/>
-      <subcategory value="3" description="100 mm" deprecated="1" uuid="fb554090-5269-11df-9f69-080069138b88" uid="21398"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="4" country="45" uuid="fb579386-5269-11df-83df-080069138b88" uid="21399">
-    <category value="1" description="Guided" uuid="fb58a4a6-5269-11df-9540-080069138b88" uid="21400">
-      <subcategory value="1" description="HQ-2" deprecated="1" uuid="fb59b24c-5269-11df-86bf-080069138b88" uid="21401"/>
-      <subcategory value="2" description="HQ-2J" deprecated="1" uuid="fb5ac72c-5269-11df-86d5-080069138b88" uid="21402"/>
-      <subcategory value="3" description="HQ-61" deprecated="1" uuid="fb5bd8c4-5269-11df-a50e-080069138b88" uid="21403"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fb5d8a70-5269-11df-9e47-080069138b88" uid="21404">
-      <subcategory value="1" description="57 mm" deprecated="1" uuid="fb5e9604-5269-11df-a548-080069138b88" uid="21405"/>
-      <subcategory value="2" description="85 mm" deprecated="1" uuid="fb5fa724-5269-11df-958e-080069138b88" uid="21406"/>
-      <subcategory value="3" description="100 mm" deprecated="1" uuid="fb60b894-5269-11df-9e7b-080069138b88" uid="21407"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="45" uuid="fb630f40-5269-11df-83e8-080069138b88" uid="21408">
-    <category value="1" description="Guided" uuid="fb641cbe-5269-11df-b8aa-080069138b88" uid="21409">
-      <subcategory value="1" description="C-601 ALCM" deprecated="1" uuid="fb652a64-5269-11df-80ce-080069138b88" uid="21410"/>
-      <subcategory value="2" description="YJ-1/C-801/CSS-N-4 Sardine (Exocet type)" uuid="fb663d5a-5269-11df-bc7d-080069138b88" uid="21411"/>
-      <subcategory value="3" description="Z-9A" deprecated="1" uuid="fb674f38-5269-11df-9411-080069138b88" uid="21412"/>
-      <subcategory value="4" description="CSS-N-2 (HY-2 Styx derivative Silkworm)" uuid="fb685a54-5269-11df-9017-080069138b88" uid="21413"/>
-      <subcategory value="5" description="SY-2 Eagle Strike (C-801 Anti-Ship ASM)" deprecated="1" uuid="fb69711e-5269-11df-8f1e-080069138b88" uid="21414"/>
-      <subcategory value="6" description="YJ-1 Eagle Strike (C-801 Anti-Ship SSM)" deprecated="1" uuid="fb6a84fa-5269-11df-9a24-080069138b88" uid="21415"/>
-      <subcategory value="7" description="SY-1/FL-1" uuid="fb6b92c8-5269-11df-8f35-080069138b88" uid="21416">
-        <specific value="1" description="CSSC-1B mod 1/2 Coastal Defense missile" uuid="fb6ca4a6-5269-11df-8246-080069138b88" uid="21417"/>
-        <specific value="2" description="CSS-N-1 Scrubbrush mod 1/2" uuid="fb6db756-5269-11df-b54b-080069138b88" uid="21418"/>
-      </subcategory>
-      <subcategory value="8" description="HY-1" uuid="fb6f70dc-5269-11df-9e1e-080069138b88" uid="21419">
-        <specific value="1" description="HY-1/CSSC-2A Silkworm" uuid="fb707fcc-5269-11df-8276-080069138b88" uid="21420"/>
-        <specific value="2" description="HY-1A/CSSC-2B Silkworm" uuid="fb719006-5269-11df-963d-080069138b88" uid="21421"/>
-        <specific value="3" description="CSS-N-2 Safflower" uuid="fb72a1c6-5269-11df-aaab-080069138b88" uid="21422"/>
-      </subcategory>
-      <subcategory value="9" description="HY-2/CSSC-3" uuid="fb74555c-5269-11df-bd64-080069138b88" uid="21423">
-        <specific value="1" description="HY-2A/CSSC-3A" uuid="fb7567b2-5269-11df-bc6c-080069138b88" uid="21424"/>
-        <specific value="2" description="HY-2G/CSSC-3B" uuid="fb7671d4-5269-11df-bcde-080069138b88" uid="21425"/>
-        <specific value="3" description="HY-2B/CSSC-3C" uuid="fb778128-5269-11df-b5eb-080069138b88" uid="21426"/>
-        <specific value="4" description="C-601/CAS-1 Kraken" uuid="fb7892de-5269-11df-99d1-080069138b88" uid="21427"/>
-      </subcategory>
-      <subcategory value="10" description="HY-4" uuid="fb7a432c-5269-11df-91bf-080069138b88" uid="21428">
-        <specific value="1" description="HY-4/CSSC-7 Sadsack" uuid="fb7b4f74-5269-11df-8230-080069138b88" uid="21429"/>
-        <specific value="2" description="C-611 (air launched variant)" uuid="fb7c5ffe-5269-11df-ba63-080069138b88" uid="21430"/>
-      </subcategory>
-      <subcategory value="11" description="YJ-2/C-802/CSS-N-8 Saccade" uuid="fb7e111e-5269-11df-81d3-080069138b88" uid="21431"/>
-      <subcategory value="12" description="CH/SS-N-6/C802(YJ-8A)" uuid="fb7f2572-5269-11df-af23-080069138b88" uid="21432"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fb80d336-5269-11df-a8f6-080069138b88" uid="21433">
-      <subcategory value="1" description="100 mm Gun" uuid="fb81e0dc-5269-11df-b6a1-080069138b88" uid="21434"/>
-      <subcategory value="2" description="130 mm Gun" uuid="fb82f170-5269-11df-ac1e-080069138b88" uid="21435"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="45" uuid="fb8541f0-5269-11df-a737-080069138b88" uid="21436">
-    <category value="1" description="Guided" uuid="fb864e60-5269-11df-88d0-080069138b88" uid="21437">
-      <subcategory value="1" description="CY-1 ASW Msl Torpedo" uuid="fb875fa8-5269-11df-b522-080069138b88" uid="21438"/>
-      <subcategory value="2" description="Yu-1 Torpedo" uuid="fb887244-5269-11df-ad30-080069138b88" uid="21439"/>
-      <subcategory value="3" description="Yu-3 Torpedo" uuid="fb898116-5269-11df-9ec8-080069138b88" uid="21440"/>
-      <subcategory value="4" description="Yu-4 Torpedo" uuid="fb8a8f98-5269-11df-bc45-080069138b88" uid="21441"/>
-      <subcategory value="5" description="Yu-6 Torpedo" uuid="fb8b9ff0-5269-11df-809d-080069138b88" uid="21442"/>
-      <subcategory value="6" description="TEST-96 Torpedo" uuid="fb8caec2-5269-11df-bbb0-080069138b88" uid="21443"/>
-      <subcategory value="7" description="YU-7 Torpedo" uuid="fb8dc622-5269-11df-ad25-080069138b88" uid="21444"/>
-      <subcategory value="8" description="LE-2 Torpedo" uuid="fb8ed68e-5269-11df-a0e4-080069138b88" uid="21445"/>
-      <subcategory value="9" description="L-5 Torpedo" uuid="fb8fe240-5269-11df-9eb4-080069138b88" uid="21446"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="45" uuid="fb9242d8-5269-11df-82cc-080069138b88" uid="21447">
-    <category value="1" description="Guided" uuid="fb934bba-5269-11df-8b83-080069138b88" uid="21448">
-      <subcategory value="1" description="HN 5" deprecated="1" uuid="fb945ece-5269-11df-b556-080069138b88" uid="21449"/>
-      <subcategory value="2" description="HN-5A (SA-7 type)" deprecated="1" uuid="fb956f26-5269-11df-969a-080069138b88" uid="21450"/>
-      <subcategory value="3" description="HN-5C (SA-7 type)" deprecated="1" uuid="fb967d1c-5269-11df-b7e3-080069138b88" uid="21451"/>
-      <subcategory value="4" description="HQ-61 twin SP" deprecated="1" uuid="fb979166-5269-11df-b5d4-080069138b88" uid="21452"/>
-      <subcategory value="5" description="M-9" deprecated="1" uuid="fb98a24a-5269-11df-bc8b-080069138b88" uid="21453"/>
-      <subcategory value="6" description="M-11" deprecated="1" uuid="fb99ade8-5269-11df-9e4d-080069138b88" uid="21454"/>
-      <subcategory value="7" description="CSSC-1B mod 1/2 (CSTL DEF MSL)" deprecated="1" uuid="fb9ac35e-5269-11df-bbba-080069138b88" uid="21455"/>
-      <subcategory value="8" description="CSSC-2A (CSTL DEF MSL)" deprecated="1" uuid="fb9bd622-5269-11df-a770-080069138b88" uid="21456"/>
-      <subcategory value="9" description="CSSC-2B (CSTL DEF MSL)" deprecated="1" uuid="fb9ce0b2-5269-11df-bf6c-080069138b88" uid="21457"/>
-      <subcategory value="10" description="CSSC-3 mod 1/2 (CSTL DEF MSL)" deprecated="1" uuid="fb9df448-5269-11df-a7b8-080069138b88" uid="21458"/>
-      <subcategory value="11" description="CSSC-3A mod 1/2 (CSTL DEF MSL)" deprecated="1" uuid="fb9f0c7a-5269-11df-bfc6-080069138b88" uid="21459"/>
-      <subcategory value="12" description="CSSC-3B (CSTL DEF MSL)" deprecated="1" uuid="fba01ac0-5269-11df-a888-080069138b88" uid="21460"/>
-      <subcategory value="13" description="CSSC-3C (CSTL DEF MSL)" deprecated="1" uuid="fba12d66-5269-11df-b574-080069138b88" uid="21461"/>
-      <subcategory value="14" description="CSSC-5 (YJ-16/C-101) Saples" uuid="fba24110-5269-11df-aacc-080069138b88" uid="21462"/>
-      <subcategory value="15" description="CSSC-6 (HY-3) Sawhorse" uuid="fba35212-5269-11df-9a74-080069138b88" uid="21463"/>
-      <subcategory value="16" description="CSSC-7 (HY-4) Sadsack" uuid="fba46300-5269-11df-83fa-080069138b88" uid="21464"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fba6131c-5269-11df-86fb-080069138b88" uid="21465">
-      <subcategory value="1" description="Towed Artillery" deprecated="1" uuid="fba7241e-5269-11df-86c2-080069138b88" uid="21466">
-        <specific value="1" description="100 mm type 59 (fd/ATK)" deprecated="1" uuid="fba83214-5269-11df-af1c-080069138b88" uid="21467"/>
-        <specific value="2" description="122 mm type 54" deprecated="1" uuid="fba943b6-5269-11df-8f77-080069138b88" uid="21468"/>
-        <specific value="3" description="130 mm type 59" deprecated="1" uuid="fbaa53c8-5269-11df-b1bd-080069138b88" uid="21469"/>
-        <specific value="4" description="152 mm type 54" deprecated="1" uuid="fbab6268-5269-11df-9029-080069138b88" uid="21470"/>
-      </subcategory>
-      <subcategory value="2" description="Self-Propelled Artillery" deprecated="1" uuid="fbad1c98-5269-11df-9b35-080069138b88" uid="21471">
-        <specific value="1" description="122 mm type 54-1" deprecated="1" uuid="fbae3236-5269-11df-9342-080069138b88" uid="21472"/>
-        <specific value="2" description="152 mm type 83" deprecated="1" uuid="fbaf44be-5269-11df-b357-080069138b88" uid="21473"/>
-      </subcategory>
-      <subcategory value="3" description="Multiple Rocket Launchers" deprecated="1" uuid="fbb0f69c-5269-11df-87a9-080069138b88" uid="21474">
-        <specific value="1" description="107 mm type 63 towed" deprecated="1" uuid="fbb2080c-5269-11df-b1fd-080069138b88" uid="21475"/>
-        <specific value="2" description="122 mm type 81" deprecated="1" uuid="fbb31aee-5269-11df-a06c-080069138b88" uid="21476"/>
-        <specific value="3" description="130 mm type 63" deprecated="1" uuid="fbb42c90-5269-11df-a4ab-080069138b88" uid="21477"/>
-        <specific value="4" description="132 mm BM-13-16" deprecated="1" uuid="fbb5377a-5269-11df-b3f0-080069138b88" uid="21478"/>
-        <specific value="5" description="140 mm BM-14-16" deprecated="1" uuid="fbb64a66-5269-11df-9e1c-080069138b88" uid="21479"/>
-        <specific value="6" description="253 mm Minelayer" deprecated="1" uuid="fbb75faa-5269-11df-a714-080069138b88" uid="21480"/>
-        <specific value="7" description="284 mm type 74 minelayer" deprecated="1" uuid="fbb86c60-5269-11df-8429-080069138b88" uid="21481"/>
-      </subcategory>
-      <subcategory value="4" description="Mortar" deprecated="1" uuid="fbba1c7c-5269-11df-a39b-080069138b88" uid="21482">
-        <specific value="1" description="100 mm type 71" deprecated="1" uuid="fbbb2e0a-5269-11df-b6eb-080069138b88" uid="21483"/>
-        <specific value="2" description="120 mm type 55" deprecated="1" uuid="fbbc438a-5269-11df-b18a-080069138b88" uid="21484"/>
-        <specific value="3" description="160 mm type 56" deprecated="1" uuid="fbbd4f64-5269-11df-89ec-080069138b88" uid="21485"/>
-      </subcategory>
-      <subcategory value="5" description="Recoiless Launcher" deprecated="1" uuid="fbbefe40-5269-11df-a99d-080069138b88" uid="21486">
-        <specific value="1" description="82 mm type 65" deprecated="1" uuid="fbc010be-5269-11df-91bc-080069138b88" uid="21487"/>
-        <specific value="2" description="105 mm type 75 SP" deprecated="1" uuid="fbc125b2-5269-11df-9c31-080069138b88" uid="21488"/>
-      </subcategory>
-      <subcategory value="6" description="Rocket Launcher" deprecated="1" uuid="fbc2da60-5269-11df-af79-080069138b88" uid="21489">
-        <specific value="1" description="90 mm type 51" deprecated="1" uuid="fbc3e4dc-5269-11df-8cec-080069138b88" uid="21490"/>
-      </subcategory>
-      <subcategory value="7" description="7.62 mm" uuid="fbc59930-5269-11df-a800-080069138b88" uid="21491"/>
-      <subcategory value="8" description="12.7 mm" uuid="fbc6a820-5269-11df-8eb7-080069138b88" uid="21492"/>
-      <subcategory value="9" description="73 mm" uuid="fbc7b76a-5269-11df-b954-080069138b88" uid="21493"/>
-      <subcategory value="10" description="100 mm" uuid="fbc8bf98-5269-11df-bec2-080069138b88" uid="21494">
-        <specific value="1" description="Mortar bomb (Type 71)" uuid="fbc9d0e0-5269-11df-8e58-080069138b88" uid="21495"/>
-      </subcategory>
-      <subcategory value="11" description="107 mm Rocket" uuid="fbcb8cbe-5269-11df-8817-080069138b88" uid="21496">
-        <specific value="1" description="HE-Frag" uuid="fbcc9c44-5269-11df-ac55-080069138b88" uid="21497"/>
-        <specific value="2" description="Type 63 HEI" uuid="fbcda5c6-5269-11df-8cab-080069138b88" uid="21498"/>
-        <specific value="3" description="Type 63-I HEI" uuid="fbceb6fa-5269-11df-b6eb-080069138b88" uid="21499"/>
-        <specific value="4" description="Type 63-II HE" uuid="fbcfcafe-5269-11df-9732-080069138b88" uid="21500"/>
-        <specific value="5" description="Type 63-III HE" uuid="fbd0d71e-5269-11df-b0d4-080069138b88" uid="21501"/>
-        <specific value="6" description="Jamming rocket" uuid="fbd1e74e-5269-11df-8b73-080069138b88" uid="21502"/>
-      </subcategory>
-      <subcategory value="12" description="120 mm" uuid="fbd398aa-5269-11df-80fd-080069138b88" uid="21503">
-        <specific value="1" description="Mortar bomb (Type 55)" uuid="fbd4ac18-5269-11df-9407-080069138b88" uid="21504"/>
-      </subcategory>
-      <subcategory value="13" description="122 mm" uuid="fbd65b76-5269-11df-9ea6-080069138b88" uid="21505">
-        <specific value="1" description="HE Type 54" uuid="fbd763c2-5269-11df-8350-080069138b88" uid="21506"/>
-        <specific value="2" description="Smoke Type 54" uuid="fbd8751e-5269-11df-9dba-080069138b88" uid="21507"/>
-        <specific value="3" description="Illuminating Type 54" uuid="fbd989cc-5269-11df-8b7e-080069138b88" uid="21508"/>
-      </subcategory>
-      <subcategory value="14" description="122 mm Rocket" uuid="fbdb3876-5269-11df-8616-080069138b88" uid="21509">
-        <specific value="1" description="HE" uuid="fbdc4130-5269-11df-92d1-080069138b88" uid="21510"/>
-        <specific value="2" description="HE-Frag" uuid="fbdd5214-5269-11df-99c0-080069138b88" uid="21511"/>
-        <specific value="3" description="HEI" uuid="fbde64b0-5269-11df-8af2-080069138b88" uid="21512"/>
-        <specific value="4" description="HE Cargo" uuid="fbdf6d1a-5269-11df-821d-080069138b88" uid="21513"/>
-        <specific value="5" description="HEI-Frag" uuid="fbe07e62-5269-11df-8810-080069138b88" uid="21514"/>
-        <specific value="6" description="Minelaying" uuid="fbe19068-5269-11df-b8a8-080069138b88" uid="21515"/>
-        <specific value="7" description="Minelaying Type 84" uuid="fbe29c4c-5269-11df-b0cb-080069138b88" uid="21516"/>
-      </subcategory>
-      <subcategory value="15" description="130 mm" uuid="fbe44e20-5269-11df-9637-080069138b88" uid="21517">
-        <specific value="1" description="HE Type 59" uuid="fbe55d42-5269-11df-9380-080069138b88" uid="21518"/>
-        <specific value="2" description="Illunination Type 59" uuid="fbe66d5e-5269-11df-b74a-080069138b88" uid="21519"/>
-        <specific value="3" description="MP-130 RAP" uuid="fbe779e2-5269-11df-86f7-080069138b88" uid="21520"/>
-        <specific value="4" description="ERFB-HE" uuid="fbe887c4-5269-11df-8bfd-080069138b88" uid="21521"/>
-      </subcategory>
-      <subcategory value="16" description="130 mm rocket" uuid="fbea424e-5269-11df-a9be-080069138b88" uid="21522">
-        <specific value="1" description="HE Type 63" uuid="fbeb5454-5269-11df-bf93-080069138b88" uid="21523"/>
-        <specific value="2" description="HE-Frag Type 82" uuid="fbec6060-5269-11df-b3d1-080069138b88" uid="21524"/>
-        <specific value="3" description="HEI Type 82" uuid="fbed6f00-5269-11df-8bc7-080069138b88" uid="21525"/>
-        <specific value="4" description="Extended-range HE-Frag" uuid="fbee8386-5269-11df-a319-080069138b88" uid="21526"/>
-      </subcategory>
-      <subcategory value="17" description="152 mm" uuid="fbf03460-5269-11df-898c-080069138b88" uid="21527">
-        <specific value="1" description="HE Type 66" uuid="fbf14184-5269-11df-bedb-080069138b88" uid="21528"/>
-        <specific value="2" description="Smoke Type 66" uuid="fbf2507e-5269-11df-80e7-080069138b88" uid="21529"/>
-        <specific value="3" description="Type MP-152 RAP" uuid="fbf36180-5269-11df-ad35-080069138b88" uid="21530"/>
-        <specific value="4" description="NORINCO Incendiary" uuid="fbf46f94-5269-11df-9030-080069138b88" uid="21531"/>
-        <specific value="5" description="NORINCO Smoke" uuid="fbf57f60-5269-11df-9816-080069138b88" uid="21532"/>
-        <specific value="6" description="NORINCO Illuminating" uuid="fbf68e46-5269-11df-a375-080069138b88" uid="21533"/>
-        <specific value="7" description="HE Type 83" uuid="fbf79cbe-5269-11df-a93a-080069138b88" uid="21534"/>
-        <specific value="8" description="NORINCO ERFB-BB" uuid="fbf8ac8a-5269-11df-8f62-080069138b88" uid="21535"/>
-      </subcategory>
-      <subcategory value="18" description="155 mm" uuid="fbfa5c2e-5269-11df-a222-080069138b88" uid="21536">
-        <specific value="1" description="ERFB" uuid="fbfb6e3e-5269-11df-9d41-080069138b88" uid="21537"/>
-        <specific value="2" description="ERFB-BB" uuid="fbfc7860-5269-11df-84a9-080069138b88" uid="21538"/>
-        <specific value="3" description="ERFB-WP" uuid="fbfd882c-5269-11df-ab6a-080069138b88" uid="21539"/>
-        <specific value="4" description="ERFB Illuminating" uuid="fbfe9924-5269-11df-bed6-080069138b88" uid="21540"/>
-      </subcategory>
-      <subcategory value="19" description="160 mm" uuid="fc004ada-5269-11df-8c79-080069138b88" uid="21541">
-        <specific value="1" description="Mortar bomb type 56" uuid="fc0159b6-5269-11df-af5f-080069138b88" uid="21542"/>
-      </subcategory>
-      <subcategory value="20" description="253 mm" uuid="fc0309b4-5269-11df-9e15-080069138b88" uid="21543">
-        <specific value="1" description="Minesweeping rocket Type 81" uuid="fc0419b2-5269-11df-b76c-080069138b88" uid="21544"/>
-        <specific value="2" description="Minesweeping rocket Type 81-II" uuid="fc052bea-5269-11df-ab23-080069138b88" uid="21545"/>
-      </subcategory>
-      <subcategory value="21" description="284 mm" uuid="fc06e0fc-5269-11df-8542-080069138b88" uid="21546">
-        <specific value="1" description="Minelaying rocket Type 74" uuid="fc07eb3c-5269-11df-af45-080069138b88" uid="21547"/>
-        <specific value="2" description="Minelaying rocket Type 85" uuid="fc0906de-5269-11df-a258-080069138b88" uid="21548"/>
-      </subcategory>
-      <subcategory value="22" description="M-7/CSS-8 (HQ-2 SSM variant)" uuid="fc0aba88-5269-11df-9be4-080069138b88" uid="21549">
-        <specific value="1" description="Booster phase vehicle" uuid="fc0bcbee-5269-11df-9f19-080069138b88" uid="21550"/>
-        <specific value="2" description="Jettisoned booster" uuid="fc0cd782-5269-11df-af5d-080069138b88" uid="21551"/>
-        <specific value="3" description="Separated warhead" uuid="fc0deb9a-5269-11df-a42b-080069138b88" uid="21552"/>
-      </subcategory>
-      <subcategory value="23" description="35mm Grenade Launcher Ammunition" uuid="fc0f9cce-5269-11df-a8fc-080069138b88" uid="21553">
-        <specific value="1" description="Grenade, 35mm, HE" uuid="fc10b14a-5269-11df-ba45-080069138b88" uid="21554"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="45" uuid="fc13a26a-5269-11df-9b69-080069138b88" uid="21555">
-    <category value="1" description="Guided" uuid="fc14b09c-5269-11df-853b-080069138b88" uid="21556">
-      <subcategory value="1" description="CSS-1 (DF-2)" deprecated="1" uuid="fc15bf00-5269-11df-9a6c-080069138b88" uid="21557"/>
-      <subcategory value="2" description="CSS-2 (DF-3)" uuid="fc16d110-5269-11df-87ae-080069138b88" uid="21558"/>
-      <subcategory value="3" description="CSS-3 (DF-4)" uuid="fc17dfb0-5269-11df-a276-080069138b88" uid="21559"/>
-      <subcategory value="4" description="CSS-4 (DF-5)" uuid="fc18eff4-5269-11df-9748-080069138b88" uid="21560">
-        <specific value="1" description="DF-5" uuid="fc19fe8a-5269-11df-ab39-080069138b88" uid="21561"/>
-        <specific value="2" description="DF-5A" uuid="fc1b0aaa-5269-11df-b345-080069138b88" uid="21562"/>
-      </subcategory>
-      <subcategory value="5" description="DF-21" uuid="fc1cb990-5269-11df-8000-080069138b88" uid="21563">
-        <specific value="1" description="Booster phase vehicle" uuid="fc1dc858-5269-11df-9c6b-080069138b88" uid="21564"/>
-        <specific value="3" description="Separated warhead" uuid="fc1edb58-5269-11df-b70c-080069138b88" uid="21565"/>
-        <specific value="4" description="Jettisoned first stage" uuid="fc1fe5f2-5269-11df-bd76-080069138b88" uid="21566"/>
-        <specific value="5" description="Second stage vehicle" uuid="fc20f80c-5269-11df-a45b-080069138b88" uid="21567"/>
-        <specific value="6" description="Jettisoned second stage" uuid="fc220904-5269-11df-848f-080069138b88" uid="21568"/>
-      </subcategory>
-      <subcategory value="6" description="DF-31" uuid="fc23b81c-5269-11df-8ef3-080069138b88" uid="21569"/>
-      <subcategory value="7" description="DF-41" uuid="fc24c676-5269-11df-b386-080069138b88" uid="21570"/>
-      <subcategory value="8" description="JL-1 (CSS-N-1)" uuid="fc25d67e-5269-11df-9ff2-080069138b88" uid="21571"/>
-      <subcategory value="9" description="DF-11 (M-11)" deprecated="1" uuid="fc26ee9c-5269-11df-a111-080069138b88" uid="21572"/>
-      <subcategory value="10" description="CSS-NX-3" uuid="fc27f9ae-5269-11df-b2f2-080069138b88" uid="21573"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="45" uuid="fc2a5280-5269-11df-8ac1-080069138b88" uid="21574">
-    <category value="2" description="Ballistic" uuid="fc2b5af4-5269-11df-a113-080069138b88" uid="21575">
-      <subcategory value="1" description="DF-15 (M-9)" uuid="fc2c6b60-5269-11df-969c-080069138b88" uid="21576">
-        <specific value="1" description="Booster phase vehicle" uuid="fc2d7dc0-5269-11df-ae05-080069138b88" uid="21577"/>
-        <specific value="3" description="Separated warhead" uuid="fc2ea3a8-5269-11df-9bca-080069138b88" uid="21578"/>
-        <specific value="4" description="Jettisoned first stage" uuid="fc2fc9cc-5269-11df-b5a1-080069138b88" uid="21579"/>
-        <specific value="5" description="Second stage vehicle" uuid="fc30ed84-5269-11df-847b-080069138b88" uid="21580"/>
-        <specific value="6" description="Jettisoned second stage" uuid="fc321812-5269-11df-8c8e-080069138b88" uid="21581"/>
-      </subcategory>
-      <subcategory value="2" description="M-11 / DF-11 / CSS-7" uuid="fc33c946-5269-11df-b82b-080069138b88" uid="21582">
-        <specific value="1" description="Booster phase vehicle" uuid="fc34d610-5269-11df-a262-080069138b88" uid="21583"/>
-        <specific value="2" description="Jettisoned booster" uuid="fc35eea6-5269-11df-9216-080069138b88" uid="21584"/>
-        <specific value="3" description="Separated warhead" uuid="fc370598-5269-11df-a912-080069138b88" uid="21585"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="119" uuid="fc39f578-5269-11df-9ae1-080069138b88" uid="21586">
-    <category value="2" description="Ballistic" uuid="fc3b0544-5269-11df-9ea9-080069138b88" uid="21587">
-      <subcategory value="1" description="Scud-B (SS-1C)" deprecated="1" uuid="fc3c1772-5269-11df-b629-080069138b88" uid="21588"/>
-      <subcategory value="2" description="Scud-C (SS-1D)" uuid="fc3d2900-5269-11df-acdc-080069138b88" uid="21589"/>
-      <subcategory value="3" description="No Dong" deprecated="1" uuid="fc3e3534-5269-11df-aaba-080069138b88" uid="21590">
-        <specific value="1" description="Booster phase vehicle" deprecated="1" uuid="fc3f46b8-5269-11df-b14c-080069138b88" uid="21591"/>
-        <specific value="2" description="Jettisoned booster" deprecated="1" uuid="fc405760-5269-11df-a9be-080069138b88" uid="21592"/>
-        <specific value="3" description="Separated warhead" deprecated="1" uuid="fc416722-5269-11df-9a68-080069138b88" uid="21593"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="119" uuid="fc445c7a-5269-11df-9a82-080069138b88" uid="21594">
-    <category value="2" description="Ballistic" uuid="fc457222-5269-11df-bd54-080069138b88" uid="21595">
-      <subcategory value="1" description="240 mm rocket" uuid="fc467c3a-5269-11df-80b2-080069138b88" uid="21596"/>
-      <subcategory value="2" description="170mm Koksan round" uuid="fc4790d4-5269-11df-9a00-080069138b88" uid="21597">
-        <specific value="1" description="HE" uuid="fc48a15e-5269-11df-a840-080069138b88" uid="21598"/>
-        <specific value="2" description="ICM" uuid="fc49ab94-5269-11df-b326-080069138b88" uid="21599"/>
-        <specific value="3" description="Chem-Bio" uuid="fc4abc6e-5269-11df-ab53-080069138b88" uid="21600"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="119" uuid="fc4db054-5269-11df-97c9-080069138b88" uid="21601">
-    <category value="1" description="Guided" uuid="fc4ec1d8-5269-11df-a8c3-080069138b88" uid="21602">
-      <subcategory value="1" description="Taepo Dong I" uuid="fc4fcb0a-5269-11df-bbb7-080069138b88" uid="21603">
-        <specific value="1" description="Booster phase vehicle" uuid="fc50d9d2-5269-11df-99ac-080069138b88" uid="21604"/>
-        <specific value="3" description="Separated warhead" uuid="fc51ec00-5269-11df-a2de-080069138b88" uid="21605"/>
-        <specific value="4" description="Jettisoned first stage" uuid="fc52faa0-5269-11df-a484-080069138b88" uid="21606"/>
-        <specific value="5" description="Second stage vehicle" uuid="fc540b0c-5269-11df-84f5-080069138b88" uid="21607"/>
-        <specific value="6" description="Jettisoned second stage" uuid="fc551a24-5269-11df-8390-080069138b88" uid="21608"/>
-      </subcategory>
-      <subcategory value="2" description="No Dong" uuid="fc56ce78-5269-11df-b24e-080069138b88" uid="21609">
-        <specific value="1" description="Booster phase vehicle" uuid="fc57d82c-5269-11df-9911-080069138b88" uid="21610"/>
-        <specific value="2" description="Jettisoned booster" uuid="fc58e816-5269-11df-bf0c-080069138b88" uid="21611"/>
-        <specific value="3" description="Separated warhead" uuid="fc59f71a-5269-11df-bf92-080069138b88" uid="21612"/>
-      </subcategory>
-      <subcategory value="3" description="Scud-D" uuid="fc5bab46-5269-11df-af36-080069138b88" uid="21613">
-        <specific value="1" description="Booster phase vehicle" uuid="fc5cb586-5269-11df-9a67-080069138b88" uid="21614"/>
-        <specific value="2" description="Jettisoned booster" uuid="fc5dc476-5269-11df-a89e-080069138b88" uid="21615"/>
-        <specific value="3" description="Separated warhead" uuid="fc5ed7e4-5269-11df-bddf-080069138b88" uid="21616"/>
-      </subcategory>
-      <subcategory value="4" description="Taepo Dong II (2-stage version)" uuid="fc60888c-5269-11df-8205-080069138b88" uid="21617">
-        <specific value="1" description="Stage 2 and warhead only" uuid="fc619600-5269-11df-a4eb-080069138b88" uid="21618"/>
-        <specific value="2" description="Separated warhead only" uuid="fc62a630-5269-11df-9d69-080069138b88" uid="21619"/>
-        <specific value="3" description="Jettisoned booster (first stage)" uuid="fc63b9a8-5269-11df-ab01-080069138b88" uid="21620"/>
-        <specific value="4" description="Jettisoned second stage" uuid="fc64cef6-5269-11df-b03a-080069138b88" uid="21621"/>
-      </subcategory>
-      <subcategory value="5" description="Taepo Dong II (3-stage version)" uuid="fc6683ae-5269-11df-a632-080069138b88" uid="21622">
-        <specific value="1" description="Stage 2, 3 and warhead" uuid="fc6794c4-5269-11df-84ed-080069138b88" uid="21623"/>
-        <specific value="2" description="Stage 3 and warhead" uuid="fc68a5a8-5269-11df-814b-080069138b88" uid="21624"/>
-        <specific value="3" description="Separated warhead" uuid="fc69b452-5269-11df-9870-080069138b88" uid="21625"/>
-        <specific value="4" description="Jettisoned booster (first stage)" uuid="fc6ac6d0-5269-11df-90df-080069138b88" uid="21626"/>
-        <specific value="5" description="Jettisoned second stage" uuid="fc6bd868-5269-11df-a579-080069138b88" uid="21627"/>
-        <specific value="6" description="Jettisoned third stage" uuid="fc6ce3c0-5269-11df-ba83-080069138b88" uid="21628"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="205" uuid="fc6fdabc-5269-11df-a77a-080069138b88" uid="21629">
-    <category value="1" description="Guided" uuid="fc70e93e-5269-11df-9d16-080069138b88" uid="21630">
-      <subcategory value="1" description="RBS-70" uuid="fc71f43c-5269-11df-8c61-080069138b88" uid="21631">
-        <specific value="1" description="RBS-70 Mk 1" uuid="fc73021e-5269-11df-abd2-080069138b88" uid="21632"/>
-        <specific value="2" description="RBS-70 Mk 2" uuid="fc74164a-5269-11df-b7fd-080069138b88" uid="21633"/>
-      </subcategory>
-      <subcategory value="2" description="RBS-15" uuid="fc75c4e0-5269-11df-93cb-080069138b88" uid="21634">
-        <specific value="1" description="RBS-15K" uuid="fc76cc3c-5269-11df-91ec-080069138b88" uid="21635"/>
-        <specific value="2" description="RBS-15M" uuid="fc77df14-5269-11df-87eb-080069138b88" uid="21636"/>
-        <specific value="3" description="RBS-15F" uuid="fc78ef4e-5269-11df-a142-080069138b88" uid="21637"/>
-        <specific value="4" description="RBS-15F MK1" uuid="fc79f98e-5269-11df-9e02-080069138b88" uid="21638"/>
-        <specific value="5" description="RBS-15K MK1" uuid="fc7b0b12-5269-11df-9812-080069138b88" uid="21639"/>
-        <specific value="6" description="RBS-15M MK2" uuid="fc7c1ade-5269-11df-927e-080069138b88" uid="21640"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Ballistic" uuid="fc7e6d16-5269-11df-aed1-080069138b88" uid="21641">
-      <subcategory value="1" description="40 mm" uuid="fc7f7aa8-5269-11df-b138-080069138b88" uid="21642">
-        <specific value="1" description="PFHE mk 2" uuid="fc80831c-5269-11df-af10-080069138b88" uid="21643"/>
-        <specific value="2" description="3P" uuid="fc81952c-5269-11df-9a74-080069138b88" uid="21644"/>
-      </subcategory>
-      <subcategory value="2" description="57 mm" uuid="fc834b74-5269-11df-8156-080069138b88" uid="21645"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="205" uuid="fc859d16-5269-11df-b362-080069138b88" uid="21646">
-    <category value="2" description="Ballistic" uuid="fc86aac6-5269-11df-b0aa-080069138b88" uid="21647">
-      <subcategory value="1" description="40 mm" uuid="fc87bac4-5269-11df-a5e7-080069138b88" uid="21648">
-        <specific value="1" description="APFSDS-T" uuid="fc88ca4a-5269-11df-a3b6-080069138b88" uid="21649"/>
-      </subcategory>
-      <subcategory value="2" description="84mm Carl Gustav rounds" uuid="fc8a950a-5269-11df-bac7-080069138b88" uid="21650">
-        <specific value="1" description="FFV 441B HE" uuid="fc8ba1de-5269-11df-b227-080069138b88" uid="21651"/>
-        <specific value="2" description="FFV 469B Smoke" uuid="fc8cb060-5269-11df-8209-080069138b88" uid="21652"/>
-        <specific value="3" description="FFV 545 IL" uuid="fc8dc450-5269-11df-a0db-080069138b88" uid="21653"/>
-        <specific value="4" description="FFV 502 HEDP" uuid="fc8ecf9e-5269-11df-b71c-080069138b88" uid="21654"/>
-        <specific value="5" description="FFV 551 HEAT" uuid="fc8fdeca-5269-11df-b9db-080069138b88" uid="21655"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="205" uuid="fc92d3aa-5269-11df-b4eb-080069138b88" uid="21656">
-    <category value="2" description="Ballistic" uuid="fc93e182-5269-11df-9043-080069138b88" uid="21657">
-      <subcategory value="1" description="40 mm" uuid="fc94ea78-5269-11df-be4d-080069138b88" uid="21658">
-        <specific value="1" description="HE" uuid="fc95fca6-5269-11df-8022-080069138b88" uid="21659"/>
-        <specific value="2" description="MP-T" uuid="fc970a6a-5269-11df-a1f6-080069138b88" uid="21660"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="106" uuid="fc99f8f6-5269-11df-b791-080069138b88" uid="21661">
-    <category value="1" description="Guided" uuid="fc9b06e2-5269-11df-b928-080069138b88" uid="21662">
-      <subcategory value="1" description="SPADA" deprecated="1" uuid="fc9c17f8-5269-11df-a28b-080069138b88" uid="21663"/>
-      <subcategory value="2" description="ASPIDE" uuid="fc9d297c-5269-11df-9452-080069138b88" uid="21664"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="3" country="106" uuid="fc9f7c18-5269-11df-a708-080069138b88" uid="21665">
-    <category value="1" description="Guided" uuid="fca089e6-5269-11df-8cac-080069138b88" uid="21666">
-      <subcategory value="1" description="Decoy" uuid="fca194a8-5269-11df-8da1-080069138b88" uid="21667">
-        <specific value="1" description="BREDA SCLAR 105 mm" uuid="fca2ad5c-5269-11df-81ec-080069138b88" uid="21668"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="106" uuid="fca5a520-5269-11df-884d-080069138b88" uid="21669">
-    <category value="1" description="Guided" uuid="fca6b654-5269-11df-b558-080069138b88" uid="21670">
-      <subcategory value="1" description="OTO Melara Teseo MK 2" uuid="fca7c01c-5269-11df-8ef0-080069138b88" uid="21671"/>
-      <subcategory value="2" description="MILAS" uuid="fca8cfc0-5269-11df-8264-080069138b88" uid="21672"/>
-      <subcategory value="3" description="324 mm B-515 Torpedo" uuid="fca9df64-5269-11df-aa6c-080069138b88" uid="21673"/>
-      <subcategory value="4" description="MARTE 2" uuid="fcaaef44-5269-11df-9796-080069138b88" uid="21674"/>
-      <subcategory value="5" description="Sistel Sea Killer" uuid="fcabff60-5269-11df-9dbb-080069138b88" uid="21675"/>
-    </category>
-    <category value="2" description="Ballistic" uuid="fcadade2-5269-11df-bd38-080069138b88" uid="21676">
-      <subcategory value="1" description="40 mm/70 BREDA" uuid="fcaebf7a-5269-11df-a7bf-080069138b88" uid="21677"/>
-      <subcategory value="2" description="3 in/62 MMK OTO Melara" uuid="fcafca00-5269-11df-8dcb-080069138b88" uid="21678"/>
-      <subcategory value="3" description="5 in/54 OTO Melara" uuid="fcb0dd14-5269-11df-8550-080069138b88" uid="21679"/>
-      <subcategory value="4" description="25 mm twin" uuid="fcb1efce-5269-11df-b0cc-080069138b88" uid="21680"/>
-      <subcategory value="5" description="30 mm twin" uuid="fcb2f9e6-5269-11df-9a25-080069138b88" uid="21681"/>
-      <subcategory value="6" description="Whitehead K113" uuid="fcb40994-5269-11df-b518-080069138b88" uid="21682"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="7" country="106" uuid="fcb65b72-5269-11df-a8de-080069138b88" uid="21683">
-    <category value="1" description="Guided" uuid="fcb767f6-5269-11df-9343-080069138b88" uid="21684">
-      <subcategory value="1" description="324 mm B-515" uuid="fcb87a10-5269-11df-b603-080069138b88" uid="21685"/>
-      <subcategory value="2" description="Whitehead A290" uuid="fcb98eb4-5269-11df-b5d2-080069138b88" uid="21686"/>
-      <subcategory value="3" description="Whitehead A184" uuid="fcba99d0-5269-11df-950a-080069138b88" uid="21687"/>
-      <subcategory value="4" description="Whitehead A-244/s Torpedo" uuid="fcbba8e8-5269-11df-9825-080069138b88" uid="21688"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="110" uuid="fcbdfca6-5269-11df-99e9-080069138b88" uid="21689">
-    <category value="1" description="Guided" uuid="fcbf0ace-5269-11df-94d4-080069138b88" uid="21690">
-      <subcategory value="1" description="Type 89 Torpedo" uuid="fcc019aa-5269-11df-8b8b-080069138b88" uid="21691"/>
-      <subcategory value="2" description="SSM-1A/1B (type 88/90)" uuid="fcc13164-5269-11df-8a12-080069138b88" uid="21692"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="240" uuid="fcc38432-5269-11df-b2ce-080069138b88" uid="21693">
-    <category value="3" description="Fixed" uuid="fcc4926e-5269-11df-a7bd-080069138b88" uid="21694">
-      <subcategory value="1" description="TMRP-6 Anti-tank mine" uuid="fcc59f38-5269-11df-b0f9-080069138b88" uid="21695"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="8" country="0" uuid="fcc7f184-5269-11df-8fbb-080069138b88" uid="21696">
-    <category value="3" description="Fixed" uuid="fcc8fc64-5269-11df-8eb2-080069138b88" uid="21697">
-      <subcategory value="1" description="AN/FO (94% ammonium nitrate, 6% fuel oil)" uuid="fcca0d8e-5269-11df-b834-080069138b88" uid="21698">
-        <specific value="1" description="1 000 lbs. Explosive" uuid="fccb211a-5269-11df-86b8-080069138b88" uid="21699"/>
-        <specific value="2" description="2 000 lbs. Explosive" uuid="fccc2b28-5269-11df-8b50-080069138b88" uid="21700"/>
-        <specific value="3" description="5 000 lbs. Explosive" uuid="fccd3c84-5269-11df-8391-080069138b88" uid="21701"/>
-        <specific value="4" description="10 000 lbs. Explosive" uuid="fcce5178-5269-11df-9391-080069138b88" uid="21702"/>
-        <specific value="5" description="15 000 lbs. Explosive" uuid="fccf5c8a-5269-11df-a184-080069138b88" uid="21703"/>
-        <specific value="6" description="20 000 lbs. Explosive" uuid="fcd06b52-5269-11df-ad36-080069138b88" uid="21704"/>
-        <specific value="7" description="25 000 lbs. Explosive" uuid="fcd17ce0-5269-11df-ac2f-080069138b88" uid="21705"/>
-        <specific value="8" description="30 000 lbs. Explosive" uuid="fcd28b80-5269-11df-89a4-080069138b88" uid="21706"/>
-        <specific value="9" description="35 000 lbs. Explosive" uuid="fcd39d18-5269-11df-ad52-080069138b88" uid="21707"/>
-        <specific value="10" description="40 000 lbs. Explosive" uuid="fcd4ac9e-5269-11df-bdee-080069138b88" uid="21708"/>
-        <specific value="11" description="45 000 lbs. Explosive" uuid="fcd5b724-5269-11df-a054-080069138b88" uid="21709"/>
-        <specific value="12" description="50 000 lbs. Explosive" uuid="fcd6cc2c-5269-11df-ad08-080069138b88" uid="21710"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="101" uuid="fcd9bf18-5269-11df-9c03-080069138b88" uid="21711">
-    <category value="3" description="Fixed" uuid="fcdacc8c-5269-11df-8d7e-080069138b88" uid="21712">
-      <subcategory value="1" description="SADAF-02 mine" uuid="fcdbda46-5269-11df-afe3-080069138b88" uid="21713"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="101" uuid="fcde2b20-5269-11df-ad86-080069138b88" uid="21714">
-    <category value="1" description="Guided" uuid="fcdf3d62-5269-11df-84e8-080069138b88" uid="21715">
-      <subcategory value="1" description="Shahab 4" uuid="fce04d6a-5269-11df-9698-080069138b88" uid="21716"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="101" uuid="fce29d86-5269-11df-93b5-080069138b88" uid="21717">
-    <category value="2" description="Ballistic" uuid="fce3acc6-5269-11df-be14-080069138b88" uid="21718">
-      <subcategory value="1" description="Shahab 3" uuid="fce4bbfc-5269-11df-a1f0-080069138b88" uid="21719">
-        <specific value="1" description="Boost phase vehicle" uuid="fce5cb8c-5269-11df-869d-080069138b88" uid="21720"/>
-        <specific value="2" description="Jettisoned booster" uuid="fce6da4a-5269-11df-9a94-080069138b88" uid="21721"/>
-        <specific value="3" description="Separated warhead" uuid="fce7ea34-5269-11df-b080-080069138b88" uid="21722"/>
-      </subcategory>
-      <subcategory value="2" description="Iran 170" uuid="fce99c44-5269-11df-9036-080069138b88" uid="21723"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="206" uuid="fcebeb98-5269-11df-9014-080069138b88" uid="21724">
-    <category value="2" description="Ballistic" uuid="fcecfa7e-5269-11df-9596-080069138b88" uid="21725">
-      <subcategory value="1" description="35 mm" uuid="fcee09d2-5269-11df-a371-080069138b88" uid="21726">
-        <specific value="1" description="HEI-T" uuid="fcef1aca-5269-11df-a5a0-080069138b88" uid="21727"/>
-        <specific value="2" description="SAPHEI-T" uuid="fcf0237a-5269-11df-84e0-080069138b88" uid="21728"/>
-        <specific value="3" description="FAPDS" uuid="fcf132f6-5269-11df-8d95-080069138b88" uid="21729"/>
-        <specific value="4" description="AHEAD" uuid="fcf24420-5269-11df-866d-080069138b88" uid="21730"/>
-        <specific value="5" description="HEI" uuid="fcf34c1c-5269-11df-b326-080069138b88" uid="21731"/>
-        <specific value="6" description="HEI-BF" uuid="fcf45ae4-5269-11df-b635-080069138b88" uid="21732"/>
-        <specific value="7" description="TP-T" uuid="fcf569fc-5269-11df-9a5b-080069138b88" uid="21733"/>
-        <specific value="8" description="APDS-T" uuid="fcf676e4-5269-11df-8a96-080069138b88" uid="21734"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="10" country="99" uuid="fcf9655c-5269-11df-89a2-080069138b88" uid="21735">
-    <category value="1" description="Guided" uuid="fcfa75d2-5269-11df-932d-080069138b88" uid="21736">
-      <subcategory value="1" description="Agni" uuid="fcfb7ebe-5269-11df-a901-080069138b88" uid="21737"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="99" uuid="fcfdd150-5269-11df-ac69-080069138b88" uid="21738">
-    <category value="2" description="Ballistic" uuid="fcfee4be-5269-11df-90ad-080069138b88" uid="21739">
-      <subcategory value="1" description="Prithvi" uuid="fcfff372-5269-11df-99aa-080069138b88" uid="21740"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="99" uuid="fd02447e-5269-11df-afcb-080069138b88" uid="21741">
-    <category value="1" description="Guided" uuid="fd03540e-5269-11df-8b5d-080069138b88" uid="21742">
-      <subcategory value="1" description="Trishul" uuid="fd046114-5269-11df-9a24-080069138b88" uid="21743"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="165" uuid="fd06b0e0-5269-11df-b7f1-080069138b88" uid="21744">
-    <category value="2" description="Ballistic" uuid="fd07bf9e-5269-11df-984d-080069138b88" uid="21745">
-      <subcategory value="1" description="Hatf-1" uuid="fd08d0e6-5269-11df-a589-080069138b88" uid="21746"/>
-      <subcategory value="2" description="Hatf-2" uuid="fd09e2d8-5269-11df-b9e6-080069138b88" uid="21747"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="11" country="165" uuid="fd0c397a-5269-11df-98de-080069138b88" uid="21748">
-    <category value="2" description="Ballistic" uuid="fd0d4acc-5269-11df-8d0c-080069138b88" uid="21749">
-      <subcategory value="1" description="Hatf-3" uuid="fd0e53a4-5269-11df-b86f-080069138b88" uid="21750"/>
-      <subcategory value="2" description="Ghauri" uuid="fd0f628a-5269-11df-a1c7-080069138b88" uid="21751"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="1" country="208" uuid="fd11b30a-5269-11df-b760-080069138b88" uid="21752">
-    <category value="1" description="Guided" uuid="fd12c57e-5269-11df-90c4-080069138b88" uid="21753">
-      <subcategory value="1" description="Sky Bow II / Tien Kung II" uuid="fd13d4be-5269-11df-86d0-080069138b88" uid="21754"/>
-      <subcategory value="2" description="Tien Chien II / Sky Sword II" uuid="fd14e62e-5269-11df-b287-080069138b88" uid="21755"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="208" uuid="fd1732e4-5269-11df-aa26-080069138b88" uid="21756">
-    <category value="1" description="Guided" uuid="fd184670-5269-11df-b660-080069138b88" uid="21757">
-      <subcategory value="1" description="Hsiung-Feng II" uuid="fd195038-5269-11df-889d-080069138b88" uid="21758"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="39" uuid="fd1ba50e-5269-11df-ae0f-080069138b88" uid="21759">
-    <category value="2" description="Ballistic" uuid="fd1cb49e-5269-11df-9841-080069138b88" uid="21760">
-      <subcategory value="1" description="70 mm(2.75in)" uuid="fd1dc564-5269-11df-afb5-080069138b88" uid="21761">
-        <specific value="1" description="CRV7 WTU-5001/B: Practice" uuid="fd1ed9ae-5269-11df-874b-080069138b88" uid="21762"/>
-        <specific value="2" description="CRV7 WTU-5001 A/B: Hardened Rod Practice" uuid="fd1fe628-5269-11df-ab10-080069138b88" uid="21763"/>
-        <specific value="3" description="CRV7 WAU-5001/B KEP: Kinetic Energy Penetrator" uuid="fd20f77a-5269-11df-863f-080069138b88" uid="21764"/>
-        <specific value="4" description="CRV7 WDU-500X/B GPF: General Purpose Flechette" uuid="fd221696-5269-11df-9ec9-080069138b88" uid="21765"/>
-        <specific value="5" description="CRV7 WDU-5002/B FAT: Flechette Anti-Tank" uuid="fd232950-5269-11df-acbd-080069138b88" uid="21766"/>
-        <specific value="6" description="CRV7 RA-70 HEISAP: High Explosive Incendiary Semi-Armor Piercing" uuid="fd243c46-5269-11df-b06c-080069138b88" uid="21767"/>
-        <specific value="7" description="CRV7 WDU-5001/B PHEI: Penetrator High Explosive Incendiary" uuid="fd25500e-5269-11df-8dc8-080069138b88" uid="21768"/>
-        <specific value="8" description="CRV7 M151 HEPD: High/Explosive Point Detonating" uuid="fd26611a-5269-11df-8fef-080069138b88" uid="21769"/>
-        <specific value="9" description="CRV7 M156: SMOKE (White Phosphorus)" uuid="fd277384-5269-11df-b7eb-080069138b88" uid="21770"/>
-        <specific value="10" description="CRV7 M257 (M442 Fuze): Illumination" uuid="fd288602-5269-11df-992e-080069138b88" uid="21771"/>
-        <specific value="11" description="CRV7 M261 HE MPSM: High Explosive Multipurpose Submunition" uuid="fd29925e-5269-11df-9a47-080069138b88" uid="21772"/>
-        <specific value="12" description="CRV7 M267 PRACTICE MPSM: Practice Multipurpose Submunition" uuid="fd2aa946-5269-11df-ba4c-080069138b88" uid="21773"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="6" country="163" uuid="fd2da04c-5269-11df-b29c-080069138b88" uid="21774">
-    <category value="1" description="Guided" uuid="fd2eaf28-5269-11df-a148-080069138b88" uid="21775">
-      <subcategory value="1" description="Penguin MK 2" uuid="fd2fb698-5269-11df-8e4e-080069138b88" uid="21776"/>
-    </category>
-  </entity>
-  <entity kind="2" domain="9" country="29" uuid="fd320c5e-5269-11df-ba53-080069138b88" uid="21777">
-    <category value="2" description="Ballistic" uuid="fd331540-5269-11df-9f39-080069138b88" uid="21778">
-      <subcategory value="1" description="Rocket ASTROS" uuid="fd34234a-5269-11df-a705-080069138b88" uid="21779">
-        <specific value="1" description="127 mm SS-30" uuid="fd3534ba-5269-11df-85d5-080069138b88" uid="21780">
-          <extra value="1" description="HE Frag" uuid="fd363e28-5269-11df-a382-080069138b88" uid="21781"/>
-        </specific>
-        <specific value="2" description="180 mm SS-40" uuid="fd37eee4-5269-11df-950e-080069138b88" uid="21782">
-          <extra value="1" description="HE Frag" uuid="fd38fcf8-5269-11df-ac1b-080069138b88" uid="21783"/>
-          <extra value="2" description="HE Incendiary" uuid="fd3a0bf2-5269-11df-9e72-080069138b88" uid="21784"/>
-          <extra value="3" description="DPICM" uuid="fd3b1600-5269-11df-ba27-080069138b88" uid="21785"/>
-          <extra value="4" description="Mine Anti-tank" uuid="fd3c315c-5269-11df-8b12-080069138b88" uid="21786"/>
-          <extra value="5" description="Mine Anti-personnel" uuid="fd3d4196-5269-11df-aae4-080069138b88" uid="21787"/>
-          <extra value="6" description="Runway Denial" uuid="fd3e4b18-5269-11df-b0c9-080069138b88" uid="21788"/>
-        </specific>
-        <specific value="3" description="3 mm SS-60" uuid="fd3ffe0e-5269-11df-93a6-080069138b88" uid="21789">
-          <extra value="1" description="HE Frag" uuid="fd410c54-5269-11df-a834-080069138b88" uid="21790"/>
-          <extra value="2" description="HE Incendiary" uuid="fd421af4-5269-11df-a3aa-080069138b88" uid="21791"/>
-          <extra value="3" description="DPICM" uuid="fd43269c-5269-11df-b2e0-080069138b88" uid="21792"/>
-          <extra value="4" description="Mine Anti-tank" uuid="fd4435c8-5269-11df-820f-080069138b88" uid="21793"/>
-          <extra value="5" description="Mine Anti-personnel" uuid="fd454508-5269-11df-ae1b-080069138b88" uid="21794"/>
-          <extra value="6" description="Runway Denial" uuid="fd464cbe-5269-11df-817e-080069138b88" uid="21795"/>
-        </specific>
-        <specific value="4" description="3 mm SS-80" uuid="fd47fdb6-5269-11df-9bb7-080069138b88" uid="21796">
-          <extra value="1" description="HE Frag" uuid="fd490ca6-5269-11df-9070-080069138b88" uid="21797"/>
-          <extra value="2" description="HE Incendiary" uuid="fd4a1c18-5269-11df-9f75-080069138b88" uid="21798"/>
-          <extra value="3" description="DPICM" uuid="fd4b23ec-5269-11df-acb6-080069138b88" uid="21799"/>
-          <extra value="4" description="Mine Anti-tank" uuid="fd4c3624-5269-11df-96fd-080069138b88" uid="21800"/>
-          <extra value="5" description="Mine Anti-personnel" uuid="fd4d4532-5269-11df-aed0-080069138b88" uid="21801"/>
-          <extra value="6" description="Runway Denial" uuid="fd4e506c-5269-11df-a588-080069138b88" uid="21802"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="2" domain="2" country="197" status="new" uuid="5c06f5c8-d631-47c8-9282-c08380ac299a" uid="22823">
-    <cr value="1830"/>
-    <category value="1" description="Guided" status="new" uuid="19097a23-86c8-46f5-a8a9-59758ce8f00c" uid="22824">
-      <cr value="1830"/>
-      <subcategory value="1" description="Mokopa ZT-6 ATGM" status="new" uuid="2afd7a0d-e413-4368-997d-19150cee0ea1" uid="22825">
-        <cr value="1830"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="0" country="0" uuid="fd51e114-5269-11df-b349-080069138b88" uid="21803">
-    <category value="0" description="Other" uuid="fd52ee2e-5269-11df-9ac6-080069138b88" uid="21804"/>
-  </entity>
-  <entity kind="3" domain="1" country="0" uuid="fd54a020-5269-11df-bf29-080069138b88" uid="21805">
-    <category value="0" description="Other" uuid="fd55ad58-5269-11df-abf0-080069138b88" uid="21806"/>
-    <category value="1" description="Dismounted Infantry (with)" uuid="fd56bc0c-5269-11df-85ab-080069138b88" uid="21807">
-      <subcategory value="0" description="Other" uuid="fd57c9da-5269-11df-8b01-080069138b88" uid="21808"/>
-      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd58db86-5269-11df-b759-080069138b88" uid="21809">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fd59f4f8-5269-11df-9a76-080069138b88" uid="21810"/>
-        <specific value="101" description="Fire Team" uuid="fd5b04a6-5269-11df-b78d-080069138b88" uid="21811"/>
-        <specific value="102" description="Squad" uuid="fd5c13e6-5269-11df-836b-080069138b88" uid="21812"/>
-        <specific value="103" description="Platoon" uuid="fd5d2466-5269-11df-8fef-080069138b88" uid="21813"/>
-        <specific value="104" description="Company" uuid="fd5e2f78-5269-11df-b355-080069138b88" uid="21814"/>
-        <specific value="105" description="Battalion" uuid="fd5f3c4c-5269-11df-94de-080069138b88" uid="21815"/>
-        <specific value="106" description="Regiment" uuid="fd604f06-5269-11df-80fa-080069138b88" uid="21816"/>
-        <specific value="107" description="Division" uuid="fd615914-5269-11df-8458-080069138b88" uid="21817"/>
-        <specific value="108" description="Corps" uuid="fd62675a-5269-11df-a0c3-080069138b88" uid="21818"/>
-        <specific value="109" description="Army" uuid="fd637622-5269-11df-bd95-080069138b88" uid="21819"/>
-      </subcategory_range>
-    </category>
-    <category value="2" description="Dismounted Infantry (non-visible)" uuid="fd65c7ba-5269-11df-88c6-080069138b88" uid="21820">
-      <subcategory value="0" description="Other-Observation Post" uuid="fd66d97a-5269-11df-9380-080069138b88" uid="21821"/>
-    </category>
-    <category value="3" description="Civilian, unarmed" uuid="fd688b76-5269-11df-9440-080069138b88" uid="21822">
-      <subcategory value="1" description="Civilian, non government" uuid="fd6993e0-5269-11df-bdcc-080069138b88" uid="21823">
-        <specific value="1" description="Contractor" uuid="fd6aa50a-5269-11df-9ce4-080069138b88" uid="21824"/>
-        <specific value="2" description="Media" uuid="fd6bb5e4-5269-11df-823f-080069138b88" uid="21825"/>
-      </subcategory>
-      <subcategory value="2" description="Local Officials" uuid="fd6d6862-5269-11df-b489-080069138b88" uid="21826">
-        <specific value="1" description="Mayor" uuid="fd6e7194-5269-11df-a7e4-080069138b88" uid="21827"/>
-        <specific value="2" description="Policeman." uuid="fd6f8214-5269-11df-b144-080069138b88" uid="21828"/>
-        <specific value="3" description="Police Chief" uuid="fd709488-5269-11df-9221-080069138b88" uid="21829"/>
-        <specific value="4" description="VIP" uuid="fd719d24-5269-11df-9c47-080069138b88" uid="21830"/>
-        <specific value="5" description="Religious Leader." uuid="fd72ad04-5269-11df-b40b-080069138b88" uid="21831"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Civilian, w/weapons" uuid="fd74fd7a-5269-11df-955c-080069138b88" uid="21832">
-      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd760f58-5269-11df-9740-080069138b88" uid="21833"/>
-    </category>
-    <category value="5" description="Animal" uuid="fd77c2b2-5269-11df-8495-080069138b88" uid="21834">
-      <subcategory value="1" description="Domesticated Animal" uuid="fd78d8d2-5269-11df-ad22-080069138b88" uid="21835">
-        <specific value="1" description="Dog" uuid="fd79e9a2-5269-11df-8613-080069138b88" uid="21836"/>
-        <specific value="2" description="Cat" uuid="fd7af5b8-5269-11df-aee6-080069138b88" uid="21837"/>
-        <specific value="3" description="Cow" uuid="fd7c03ea-5269-11df-a4e6-080069138b88" uid="21838"/>
-        <specific value="4" description="Horse" uuid="fd7d121c-5269-11df-938c-080069138b88" uid="21839"/>
-        <specific value="5" description="Camel" uuid="fd7e1edc-5269-11df-a019-080069138b88" uid="21840"/>
-      </subcategory>
-      <subcategory value="2" description="Wild Animal" uuid="fd7fccd2-5269-11df-9bc9-080069138b88" uid="21841">
-        <specific value="1" description="Canine" uuid="fd80dc94-5269-11df-9b73-080069138b88" uid="21842"/>
-        <specific value="2" description="Feline" uuid="fd81edbe-5269-11df-a303-080069138b88" uid="21843"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="2" country="0" uuid="fd84dd4e-5269-11df-9bbe-080069138b88" uid="21844">
-    <category value="0" description="Other" uuid="fd85eb8a-5269-11df-b6c7-080069138b88" uid="21845"/>
-    <category value="1" description="Parachutist (with)" uuid="fd86f94e-5269-11df-8006-080069138b88" uid="21846">
-      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd880a46-5269-11df-a901-080069138b88" uid="21847">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fd891bc0-5269-11df-b60c-080069138b88" uid="21848"/>
-        <specific value="101" description="Fire Team" uuid="fd8a2d44-5269-11df-b8de-080069138b88" uid="21849"/>
-        <specific value="102" description="Squad" uuid="fd8b3b80-5269-11df-9103-080069138b88" uid="21850"/>
-        <specific value="103" description="Platoon" uuid="fd8c4890-5269-11df-a8b5-080069138b88" uid="21851"/>
-        <specific value="104" description="Company" uuid="fd8d5898-5269-11df-8a63-080069138b88" uid="21852"/>
-        <specific value="105" description="Battalion" uuid="fd8e67d8-5269-11df-a5bc-080069138b88" uid="21853"/>
-        <specific value="106" description="Regiment" uuid="fd8f7060-5269-11df-9e11-080069138b88" uid="21854"/>
-        <specific value="107" description="Division" uuid="fd90811c-5269-11df-aa09-080069138b88" uid="21855"/>
-        <specific value="108" description="Corps" uuid="fd9193fe-5269-11df-b424-080069138b88" uid="21856"/>
-        <specific value="109" description="Army" uuid="fd929c90-5269-11df-b2ff-080069138b88" uid="21857"/>
-      </subcategory_range>
-    </category>
-    <category value="2" description="A bird" uuid="fd94f080-5269-11df-9ac9-080069138b88" uid="21858"/>
-    <category value="3" description="Flock of birds" uuid="fd95ff70-5269-11df-88bb-080069138b88" uid="21859">
-      <subcategory value="0" description="Unspecified size" uuid="fd970f14-5269-11df-92c2-080069138b88" uid="21860">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fd982872-5269-11df-af1e-080069138b88" uid="21861"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="3" country="0" uuid="fd9b1bc2-5269-11df-8a1e-080069138b88" uid="21862">
-    <category value="0" description="Other" uuid="fd9c2bfc-5269-11df-9ed7-080069138b88" uid="21863"/>
-    <category value="1" description="Swimmer (with)" uuid="fd9d3b14-5269-11df-9fa8-080069138b88" uid="21864">
-      <subcategory value="0" description="Other" uuid="fd9e4b8a-5269-11df-bef7-080069138b88" uid="21865"/>
-      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd9f55f2-5269-11df-9970-080069138b88" uid="21866">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fda069d8-5269-11df-8598-080069138b88" uid="21867"/>
-        <specific value="101" description="Fire Team" uuid="fda17f8a-5269-11df-9b31-080069138b88" uid="21868"/>
-        <specific value="102" description="Squad" uuid="fda2898e-5269-11df-bef4-080069138b88" uid="21869"/>
-        <specific value="103" description="Platoon" uuid="fda397d4-5269-11df-9c17-080069138b88" uid="21870"/>
-        <specific value="104" description="Company" uuid="fda4a7dc-5269-11df-8c5f-080069138b88" uid="21871"/>
-        <specific value="105" description="Battalion" uuid="fda5b58c-5269-11df-81fb-080069138b88" uid="21872"/>
-        <specific value="106" description="Regiment" uuid="fda6c580-5269-11df-b81f-080069138b88" uid="21873"/>
-        <specific value="107" description="Division" uuid="fda7d3a8-5269-11df-8a0b-080069138b88" uid="21874"/>
-        <specific value="108" description="Corps" uuid="fda8ddfc-5269-11df-b51f-080069138b88" uid="21875"/>
-        <specific value="109" description="Army" uuid="fda9f0a2-5269-11df-ace8-080069138b88" uid="21876"/>
-      </subcategory_range>
-    </category>
-    <category value="2" description="Occupied life raft" uuid="fdac3fd8-5269-11df-be83-080069138b88" uid="21877">
-      <subcategory value="0" description="Unused" uuid="fdad524c-5269-11df-8031-080069138b88" uid="21878">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdae627c-5269-11df-8a27-080069138b88" uid="21879"/>
-        <specific value="101" description="Fire Team" uuid="fdaf743c-5269-11df-af86-080069138b88" uid="21880"/>
-        <specific value="102" description="Squad" uuid="fdb07dbe-5269-11df-a8ca-080069138b88" uid="21881"/>
-        <specific value="103" description="Platoon" uuid="fdb19014-5269-11df-82c3-080069138b88" uid="21882"/>
-        <specific value="104" description="Company" uuid="fdb29f40-5269-11df-b5fb-080069138b88" uid="21883"/>
-        <specific value="105" description="Battalion" uuid="fdb3a96c-5269-11df-988a-080069138b88" uid="21884"/>
-        <specific value="106" description="Regiment" uuid="fdb4bc80-5269-11df-b2af-080069138b88" uid="21885"/>
-        <specific value="107" description="Division" uuid="fdb5cc42-5269-11df-9697-080069138b88" uid="21886"/>
-        <specific value="108" description="Corps" uuid="fdb6de0c-5269-11df-8868-080069138b88" uid="21887"/>
-        <specific value="109" description="Army" uuid="fdb7f15c-5269-11df-9ed5-080069138b88" uid="21888"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="3" domain="4" country="0" uuid="fdbae54c-5269-11df-a71d-080069138b88" uid="21889">
-    <category value="0" description="Other" uuid="fdbbfa2c-5269-11df-9a8d-080069138b88" uid="21890"/>
-    <category value="1" description="Diver (with)" uuid="fdbd04bc-5269-11df-b81b-080069138b88" uid="21891">
-      <subcategory value="0" description="Other" uuid="fdbe135c-5269-11df-baae-080069138b88" uid="21892"/>
-      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fdbf2558-5269-11df-876c-080069138b88" uid="21893">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdc031c8-5269-11df-ac4e-080069138b88" uid="21894"/>
-      </subcategory_range>
-    </category>
-    <category value="2" description="School of Fish" uuid="fdc28f04-5269-11df-8a07-080069138b88" uid="21895">
-      <subcategory value="0" description="Unspecified size" uuid="fdc397dc-5269-11df-a166-080069138b88" uid="21896">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdc4a910-5269-11df-a1f0-080069138b88" uid="21897"/>
-      </subcategory>
-    </category>
-    <category value="3" description="School of Shrimp" uuid="fdc6ff76-5269-11df-97c6-080069138b88" uid="21898">
-      <subcategory value="0" description="Unspecified size" uuid="fdc80e16-5269-11df-8d8a-080069138b88" uid="21899">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdc91e0a-5269-11df-8461-080069138b88" uid="21900"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Whale" uuid="fdcb70b0-5269-11df-b5f2-080069138b88" uid="21901"/>
-  </entity>
-  <entity kind="3" domain="5" country="0" uuid="fdcd2446-5269-11df-aba7-080069138b88" uid="21902">
-    <category value="0" description="Other" uuid="fdce3110-5269-11df-8f57-080069138b88" uid="21903"/>
-    <category value="1" description="Astronaut (with)" uuid="fdcf4136-5269-11df-a325-080069138b88" uid="21904">
-      <subcategory value="0" description="Other" uuid="fdd0504e-5269-11df-bab2-080069138b88" uid="21905"/>
-      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fdd15a34-5269-11df-aad8-080069138b88" uid="21906">
-        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdd26e88-5269-11df-9745-080069138b88" uid="21907"/>
-      </subcategory_range>
-    </category>
-  </entity>
-  <entity kind="4" domain="1" country="0" uuid="fdd57024-5269-11df-a634-080069138b88" uid="21908">
-    <category value="0" description="Other" uuid="fdd6819e-5269-11df-bb17-080069138b88" uid="21909"/>
-    <category value="1" description="Radar collected noise" uuid="fdd78bac-5269-11df-a755-080069138b88" uid="21910"/>
-  </entity>
-  <entity kind="4" domain="2" country="0" uuid="fdd93c86-5269-11df-bd97-080069138b88" uid="21911">
-    <category value="0" description="Other" uuid="fdda4edc-5269-11df-b39d-080069138b88" uid="21912"/>
-    <category value="1" description="Smoke" uuid="fddb5d9a-5269-11df-b451-080069138b88" uid="21913"/>
-    <category value="2" description="Fog" uuid="fddc6618-5269-11df-9d6a-080069138b88" uid="21914"/>
-    <category value="3" description="Cloud" uuid="fddd747c-5269-11df-83dc-080069138b88" uid="21915"/>
-    <category value="4" description="Cloud With Rain Falling" uuid="fdde877c-5269-11df-b260-080069138b88" uid="21916"/>
-    <category value="5" description="Cloud With Snow Falling" uuid="fddf9248-5269-11df-bc88-080069138b88" uid="21917"/>
-    <category value="6" description="Haze" uuid="fde0a0e8-5269-11df-a94f-080069138b88" uid="21918"/>
-    <category value="7" description="Dust/Sandstorm" uuid="fde1b212-5269-11df-9089-080069138b88" uid="21919"/>
-    <category value="8" description="Cloud with sleet falling" uuid="fde2c044-5269-11df-a6d7-080069138b88" uid="21920"/>
-  </entity>
-  <entity kind="4" domain="3" country="0" uuid="fde4704c-5269-11df-b62d-080069138b88" uid="21921">
-    <category value="0" description="Other" uuid="fde57d8e-5269-11df-b927-080069138b88" uid="21922"/>
-    <category value="1" description="Sea State" uuid="fde68d0a-5269-11df-b38d-080069138b88" uid="21923"/>
-    <category value="2" description="Oil Slick" uuid="fde7995c-5269-11df-9675-080069138b88" uid="21924"/>
-    <category value="3" description="Ice" uuid="fde8a7ac-5269-11df-b1aa-080069138b88" uid="21925"/>
-    <category value="4" description="Debris" uuid="fde9b886-5269-11df-b14e-080069138b88" uid="21926"/>
-    <category value="5" description="Surf Noise" uuid="fdeac334-5269-11df-9241-080069138b88" uid="21927"/>
-    <category value="6" description="Island" uuid="fdebd5bc-5269-11df-982d-080069138b88" uid="21928"/>
-  </entity>
-  <entity kind="4" domain="4" country="0" uuid="fded81fa-5269-11df-ac95-080069138b88" uid="21929">
-    <category value="0" description="Other" uuid="fdee8f0a-5269-11df-921b-080069138b88" uid="21930"/>
-    <category value="1" description="Sound Velocity Profile" uuid="fdef9c4c-5269-11df-b038-080069138b88" uid="21931"/>
-    <category value="2" description="Ice Berg" uuid="fdf0abe6-5269-11df-afb2-080069138b88" uid="21932"/>
-    <category value="3" description="Current Profile" uuid="fdf1ba22-5269-11df-8bb1-080069138b88" uid="21933"/>
-    <category value="4" description="Biologics" uuid="fdf2c6f6-5269-11df-8fb7-080069138b88" uid="21934">
-      <subcategory value="0" description="Bioluminescence" uuid="fdf3df00-5269-11df-8b7d-080069138b88" uid="21935"/>
-    </category>
-    <category value="5" description="Transmissivity profile" uuid="fdf590c0-5269-11df-9a96-080069138b88" uid="21936"/>
-    <category value="6" description="Ice Merchant" uuid="fdf6a302-5269-11df-8c1f-080069138b88" uid="21937"/>
-    <category value="7" description="Kelp Bed" uuid="fdf7acf2-5269-11df-a2ae-080069138b88" uid="21938"/>
-    <category value="8" description="Knuckle" uuid="fdf8bc5a-5269-11df-bda4-080069138b88" uid="21939"/>
-    <category value="9" description="Debris/Clutter" uuid="fdf9cc44-5269-11df-963d-080069138b88" uid="21940"/>
-  </entity>
-  <entity kind="4" domain="5" country="0" uuid="fdfb7a62-5269-11df-82ab-080069138b88" uid="21941">
-    <category value="0" description="Unused" uuid="fdfc8600-5269-11df-b89a-080069138b88" uid="21942"/>
-  </entity>
-  <entity kind="5" domain="1" country="0" uuid="fdfe3360-5269-11df-b8bd-080069138b88" uid="21943">
-    <category value="0" description="Other" uuid="fdff4016-5269-11df-a8a3-080069138b88" uid="21944"/>
-    <category value="1" description="Bridge" uuid="fe004efc-5269-11df-8ae6-080069138b88" uid="21945">
-      <subcategory value="0" description="Other" uuid="fe015c48-5269-11df-91fa-080069138b88" uid="21946"/>
-      <subcategory value="1" description="Concrete, two-lane" uuid="fe026bb0-5269-11df-bab6-080069138b88" uid="21947"/>
-      <subcategory value="2" description="Concrete, four-lane" uuid="fe037b5e-5269-11df-b103-080069138b88" uid="21948"/>
-      <subcategory value="3" description="Truss, two-lane" uuid="fe048670-5269-11df-854d-080069138b88" uid="21949"/>
-      <subcategory value="4" description="Truss, four-lane" uuid="fe059b0a-5269-11df-a773-080069138b88" uid="21950"/>
-      <subcategory value="5" description="Suspension, two-lane" uuid="fe06ab62-5269-11df-bb39-080069138b88" uid="21951"/>
-      <subcategory value="6" description="Suspension, four-lane" uuid="fe07b5ac-5269-11df-897e-080069138b88" uid="21952"/>
-    </category>
-    <category value="2" description="Building" uuid="fe096866-5269-11df-b4dc-080069138b88" uid="21953">
-      <subcategory value="0" description="Other" uuid="fe0a76ca-5269-11df-b8f5-080069138b88" uid="21954"/>
-      <subcategory value="1" description="One-story" uuid="fe0b86c8-5269-11df-8702-080069138b88" uid="21955">
-        <specific value="1" description="Trapezoidal Aircraft Shelter (Trihangar)" uuid="fe0c92fc-5269-11df-af5c-080069138b88" uid="21956"/>
-        <specific value="2" description="Curvilinear Aircraft Shelter" uuid="fe0da584-5269-11df-82aa-080069138b88" uid="21957"/>
-        <specific value="3" description="Bermed Storage Bunker" uuid="fe0eb5f0-5269-11df-ae2e-080069138b88" uid="21958"/>
-        <specific value="4" description="Hardened Curvilinear Munitions Bunker" uuid="fe0fc30a-5269-11df-8d16-080069138b88" uid="21959"/>
-      </subcategory>
-      <subcategory value="2" description="Two-story" uuid="fe11763c-5269-11df-908a-080069138b88" uid="21960"/>
-      <subcategory value="3" description="Three-story" uuid="fe128e46-5269-11df-a80b-080069138b88" uid="21961"/>
-      <subcategory value="4" description="Four-story" uuid="fe13a07e-5269-11df-bd6e-080069138b88" uid="21962"/>
-      <subcategory value="5" description="Five story" uuid="fe14ac26-5269-11df-afc5-080069138b88" uid="21963"/>
-      <subcategory value="6" description="Six story" uuid="fe15bc10-5269-11df-8d56-080069138b88" uid="21964"/>
-      <subcategory value="7" description="Seven story" uuid="fe16d078-5269-11df-98c2-080069138b88" uid="21965"/>
-      <subcategory value="8" description="Eight story" uuid="fe17db08-5269-11df-85ad-080069138b88" uid="21966"/>
-      <subcategory value="9" description="Nine story" uuid="fe18eac0-5269-11df-aa1a-080069138b88" uid="21967"/>
-      <subcategory value="10" description="Ten story" uuid="fe19fb86-5269-11df-ac31-080069138b88" uid="21968"/>
-    </category>
-    <category value="3" description="Tracks" uuid="fe1bae9a-5269-11df-a4ce-080069138b88" uid="21969">
-      <subcategory value="0" description="Other" uuid="fe1cb6f0-5269-11df-9326-080069138b88" uid="21970"/>
-      <subcategory value="1" description="Tank" uuid="fe1dc4e6-5269-11df-a706-080069138b88" uid="21971"/>
-    </category>
-    <category value="4" description="Crater" uuid="fe1f7476-5269-11df-8b6e-080069138b88" uid="21972"/>
-    <category value="5" description="Obstacle" uuid="fe208730-5269-11df-aca3-080069138b88" uid="21973">
-      <subcategory value="0" description="Other" uuid="fe218f5e-5269-11df-aecd-080069138b88" uid="21974"/>
-      <subcategory value="1" description="Ditch" uuid="fe229ec6-5269-11df-9187-080069138b88" uid="21975"/>
-      <subcategory value="2" description="Tank ditch, 100x4 M" uuid="fe23b0f4-5269-11df-8dda-080069138b88" uid="21976"/>
-      <subcategory value="3" description="Tank ditch, 200x4 M" uuid="fe24befe-5269-11df-83a3-080069138b88" uid="21977"/>
-      <subcategory value="4" description="Tank ditch, 300x4 M" uuid="fe25cfe2-5269-11df-9746-080069138b88" uid="21978"/>
-      <subcategory value="5" description="Abatis, 8-tree" uuid="fe26df54-5269-11df-aaf8-080069138b88" uid="21979"/>
-      <subcategory value="6" description="Concertina fence, 3-roll" uuid="fe27ea16-5269-11df-999c-080069138b88" uid="21980"/>
-      <subcategory value="7" description="Log crib, rectangular" uuid="fe28ff00-5269-11df-a684-080069138b88" uid="21981"/>
-      <subcategory value="8" description="Ammo prestock" uuid="fe2a0f94-5269-11df-9381-080069138b88" uid="21982"/>
-      <subcategory value="9" description="Fuel prestock" uuid="fe2b1952-5269-11df-8083-080069138b88" uid="21983"/>
-      <subcategory value="10" description="Minefield, hasty, 0-300 M" uuid="fe2c2d2e-5269-11df-bd05-080069138b88" uid="21984"/>
-      <subcategory value="11" description="Minefield, prepared, 0-500 M" uuid="fe2d3eee-5269-11df-b54b-080069138b88" uid="21985"/>
-      <subcategory value="12" description="Minefield, scatterable oval" uuid="fe2e4ae6-5269-11df-892d-080069138b88" uid="21986"/>
-      <subcategory value="13" description="Barbed wire" uuid="fe2f59e0-5269-11df-a84c-080069138b88" uid="21987"/>
-      <subcategory value="14" description="Dragon's teeth" uuid="fe306ce0-5269-11df-ae27-080069138b88" uid="21988"/>
-      <subcategory value="15" description="Jersey Barrier" uuid="fe3180a8-5269-11df-841b-080069138b88" uid="21989"/>
-    </category>
-    <category value="6" description="Flags/markers" uuid="fe333100-5269-11df-9e46-080069138b88" uid="21990">
-      <subcategory value="0" description="Other" uuid="fe343f28-5269-11df-957b-080069138b88" uid="21991"/>
-      <subcategory value="1" description="Breached lane" uuid="fe355476-5269-11df-a43a-080069138b88" uid="21992"/>
-      <subcategory value="2" description="Minefield" uuid="fe365fd8-5269-11df-b408-080069138b88" uid="21993">
-        <specific value="1" description="Minefield markers, Oval" status="new" uuid="6722932f-c94b-4700-b002-58cf87da3b4a" uid="22886">
-          <cr value="2237"/>
-        </specific>
-        <specific value="2" description="Minefield markers, Rectangular" status="new" uuid="531e4bc6-2788-49ab-807b-493eaff83a5d" uid="22887">
-          <cr value="2237"/>
-        </specific>
-      </subcategory>
-      <subcategory value="3" description="NBC Hazard Markers" status="new" uuid="10efa2ab-f91d-4500-92fc-5443615dfe4b" uid="22888">
-        <cr value="2237"/>
-      </subcategory>
-      <subcategory value="4" description="Ground Markings" status="new" uuid="c8a92c10-f5a5-4315-8549-179a7bbf3215" uid="22889">
-        <cr value="2237"/>
-        <specific value="1" description="Panel" status="new" uuid="7968e655-44c3-4bae-a216-845218d597ff" uid="22890">
-          <cr value="2237"/>
-          <extra value="0" description="Panel (Other)" status="new" uuid="78d724d9-068d-46bd-90c4-3d88c144bcb5" uid="22891">
-            <cr value="2237"/>
-          </extra>
-          <extra value="1" description="Panel (Olive Drab)" status="new" uuid="80d47519-f98f-47c1-bbe8-7d73928bccb4" uid="22892">
-            <cr value="2237"/>
-          </extra>
-          <extra value="2" description="Panel (Orange)" status="new" uuid="3d7afae9-ca24-425b-aa45-e922967c9374" uid="22893">
-            <cr value="2237"/>
-          </extra>
-          <extra value="3" description="Panel (Tan)" status="new" uuid="4c974de1-9bf1-432e-924e-487042cbef3c" uid="22894">
-            <cr value="2237"/>
-          </extra>
-        </specific>
-        <specific value="2" description="Half Panel" status="new" uuid="b70f2149-8264-47c8-973a-b2c5f20605e1" uid="22895">
-          <cr value="2237"/>
-          <extra value="0" description="Half Panel (Other)" status="new" uuid="1a369246-2c47-44c4-b517-114c5c0c6a54" uid="22896">
-            <cr value="2237"/>
-          </extra>
-          <extra value="1" description="Half Panel (Olive Drab)" status="new" uuid="cd9e72a1-051e-4e61-adbe-d7d41a5e1d87" uid="22897">
-            <cr value="2237"/>
-          </extra>
-          <extra value="2" description="Half Panel (Orange)" status="new" uuid="81acc539-c68d-4928-a2a2-1d30728dd0c6" uid="22898">
-            <cr value="2237"/>
-          </extra>
-          <extra value="3" description="Half Panel (Tan)" status="new" uuid="9849a546-cca4-475e-8d80-c119945c6c45" uid="22899">
-            <cr value="2237"/>
-          </extra>
-        </specific>
-      </subcategory>
-      <subcategory value="5" description="Light Point" status="new" uuid="64361cef-5cb0-4b99-88b8-e3d83b81490e" uid="22900">
-        <cr value="2237"/>
-        <specific value="1" description="Light Point, Single" status="new" uuid="96bcad68-aa9f-49bf-8e23-21b47501bc5d" uid="22901">
-          <cr value="2237"/>
-          <extra value="1" description="Light Point, Single, White" status="new" uuid="8577e9cc-fc19-4c77-a984-2cb2efb6d23c" uid="22902">
-            <cr value="2237"/>
-          </extra>
-          <extra value="2" description="Light Point, Single, Red" status="new" uuid="5d2acd3a-a9a3-4508-8475-cee85faa04db" uid="22903">
-            <cr value="2237"/>
-          </extra>
-          <extra value="3" description="Light Point, Single, Blue" status="new" uuid="c194b979-d550-4804-9220-144b4f4f7a95" uid="22904">
-            <cr value="2237"/>
-          </extra>
-          <extra value="4" description="Light Point, Single, Green" status="new" uuid="141afe32-b678-4764-8463-56c1ea1e83b3" uid="22905">
-            <cr value="2237"/>
-          </extra>
-          <extra value="5" description="Light Point, Single, Yellow" status="new" uuid="d482cef3-d92b-41cd-9567-38ef2d317d9a" uid="22906">
-            <cr value="2237"/>
-          </extra>
-          <extra value="6" description="Light Point, Single, Infrared" status="new" uuid="f64fcd8c-3d0c-4455-b5b4-8c8bb07e5a66" uid="22907">
-            <cr value="2237"/>
-          </extra>
-        </specific>
-        <specific value="2" description="Y Light Point" status="new" uuid="7d1ac875-fd09-461f-adf5-1adfb13777a0" uid="22908">
-          <cr value="2237"/>
-          <extra value="1" description="Y Light Point, White" status="new" uuid="4dfc4d16-095e-427e-8910-1aba07b36ccf" uid="22909">
-            <cr value="2237"/>
-          </extra>
-          <extra value="2" description="Y Light Point, Red" status="new" uuid="0c98c3b8-f40a-4224-ab8a-55e3db73cf7d" uid="22910">
-            <cr value="2237"/>
-          </extra>
-          <extra value="3" description="Y Light Point, Blue" status="new" uuid="eaae9f04-6cb6-4964-86f3-8a48ac854549" uid="22911">
-            <cr value="2237"/>
-          </extra>
-          <extra value="4" description="Y Light Point, Green" status="new" uuid="93fab0d4-2bed-4e31-8c2a-9baf5469ac91" uid="22912">
-            <cr value="2237"/>
-          </extra>
-          <extra value="5" description="Y Light Point, Yellow" status="new" uuid="c41f5d65-5f83-42e3-99db-9c588d187ec9" uid="22913">
-            <cr value="2237"/>
-          </extra>
-          <extra value="6" description="Y Light Point, Infrared" status="new" uuid="4b13dbda-f99e-4350-8fe0-28c3a75aecec" uid="22914">
-            <cr value="2237"/>
-          </extra>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="7" description="Prepared positions" uuid="fe380e6e-5269-11df-b871-080069138b88" uid="21994">
-      <subcategory value="0" description="Other" uuid="fe391c14-5269-11df-9f5f-080069138b88" uid="21995"/>
-      <subcategory value="1" description="Armored, hull defilade" uuid="fe3a3036-5269-11df-9530-080069138b88" uid="21996"/>
-      <subcategory value="2" description="Fighting, hull defilade" uuid="fe3b3c6a-5269-11df-a433-080069138b88" uid="21997"/>
-      <subcategory value="3" description="Mortar carrier, hull defilade" uuid="fe3c4c9a-5269-11df-9720-080069138b88" uid="21998"/>
-      <subcategory value="4" description="Tank, hull defilade" uuid="fe3d5ebe-5269-11df-bd80-080069138b88" uid="21999"/>
-      <subcategory value="5" description="Infantry fighting" uuid="fe3e6d90-5269-11df-a100-080069138b88" uid="22000"/>
-      <subcategory value="6" description="Machine gun" uuid="fe3f7e7e-5269-11df-abfc-080069138b88" uid="22001"/>
-      <subcategory value="7" description="Covered machine gun bunker" uuid="fe408c06-5269-11df-a2c6-080069138b88" uid="22002"/>
-      <subcategory value="8" description="Overhead covered infantry" uuid="fe4198c6-5269-11df-bc5c-080069138b88" uid="22003"/>
-      <subcategory value="9" description="Forward Area Re-arming Point (FARD)" uuid="fe42ae6e-5269-11df-9edc-080069138b88" uid="22004"/>
-    </category>
-    <category value="8" description="Underground facility" uuid="fe445fe8-5269-11df-89d3-080069138b88" uid="22005">
-      <subcategory value="0" description="Other" uuid="fe456d84-5269-11df-863f-080069138b88" uid="22006"/>
-      <subcategory value="1" description="Single level" uuid="fe467bf2-5269-11df-9fa6-080069138b88" uid="22007"/>
-      <subcategory value="2" description="Two levels" uuid="fe478ac4-5269-11df-9f03-080069138b88" uid="22008"/>
-      <subcategory value="3" description="Three levels" uuid="fe489aa4-5269-11df-8b5c-080069138b88" uid="22009"/>
-    </category>
-    <category value="9" description="SSM Site" uuid="fe4a4a5c-5269-11df-84f2-080069138b88" uid="22010">
-      <subcategory value="0" description="Other" uuid="fe4b529e-5269-11df-9933-080069138b88" uid="22011"/>
-      <subcategory value="1" description="Fixed" uuid="fe4c6224-5269-11df-9836-080069138b88" uid="22012"/>
-      <subcategory value="2" description="Towed" uuid="fe4d73e4-5269-11df-aa6c-080069138b88" uid="22013"/>
-      <subcategory value="3" description="Self-propelled" uuid="fe4e7c58-5269-11df-8012-080069138b88" uid="22014"/>
-    </category>
-    <category value="10" description="Runway" uuid="fe50366a-5269-11df-b196-080069138b88" uid="22015">
-      <subcategory value="0" description="Other" uuid="fe51478a-5269-11df-8ad8-080069138b88" uid="22016"/>
-      <subcategory value="1" description="5m x 150m" uuid="fe5255f8-5269-11df-863c-080069138b88" uid="22017"/>
-    </category>
-    <category value="11" description="SAM Site" uuid="fe54108c-5269-11df-b315-080069138b88" uid="22018">
-      <subcategory value="0" description="Other" uuid="fe551dce-5269-11df-94fa-080069138b88" uid="22019"/>
-      <subcategory value="1" description="Fixed" uuid="fe562ca0-5269-11df-b367-080069138b88" uid="22020"/>
-      <subcategory value="2" description="Towed" uuid="fe573afa-5269-11df-aa0f-080069138b88" uid="22021"/>
-      <subcategory value="3" description="Self-propelled" uuid="fe58422e-5269-11df-9e4e-080069138b88" uid="22022"/>
-    </category>
-    <category value="12" description="Nuclear Power Plant" uuid="fe59f452-5269-11df-b800-080069138b88" uid="22023">
-      <subcategory value="0" description="Other" uuid="fe5b0324-5269-11df-bca8-080069138b88" uid="22024"/>
-      <subcategory value="1" description="Pressurized Water Reactor" uuid="fe5c119c-5269-11df-8b52-080069138b88" uid="22025">
-        <specific value="1" description="One Reactor Unit" uuid="fe5d1ad8-5269-11df-aced-080069138b88" uid="22026"/>
-        <specific value="2" description="Two Reactor Units" uuid="fe5e2a72-5269-11df-9a50-080069138b88" uid="22027"/>
-      </subcategory>
-      <subcategory value="2" description="Gas-Cooled Graphite Reactor" uuid="fe5fdca0-5269-11df-9fcf-080069138b88" uid="22028">
-        <specific value="1" description="One Reactor Unit" uuid="fe60ea50-5269-11df-95fe-080069138b88" uid="22029"/>
-        <specific value="2" description="Two Reactor Units" uuid="fe61f3be-5269-11df-ab98-080069138b88" uid="22030"/>
-      </subcategory>
-      <subcategory value="3" description="High Temperature Gas-cooled Reactor (HTGR)" uuid="fe63a72c-5269-11df-b401-080069138b88" uid="22031">
-        <specific value="0" description="Other" uuid="fe64b798-5269-11df-aaa5-080069138b88" uid="22032"/>
-        <specific value="1" description="One Reactor Unit" uuid="fe65c3d6-5269-11df-b2b2-080069138b88" uid="22033"/>
-        <specific value="2" description="Two Reactor Units" uuid="fe66cd1c-5269-11df-a790-080069138b88" uid="22034"/>
-      </subcategory>
-      <subcategory value="4" description="Boiling Water Reactor" uuid="fe687df6-5269-11df-b442-080069138b88" uid="22035">
-        <specific value="0" description="Other" uuid="fe698c6e-5269-11df-9e06-080069138b88" uid="22036"/>
-        <specific value="1" description="One Reactor Unit" uuid="fe6a985c-5269-11df-9fc5-080069138b88" uid="22037"/>
-        <specific value="2" description="Two Reactor Units" uuid="fe6ba62a-5269-11df-ab3c-080069138b88" uid="22038"/>
-      </subcategory>
-    </category>
-    <category value="13" description="Railyard" uuid="fe6df498-5269-11df-9d5b-080069138b88" uid="22039"/>
-    <category value="14" description="Camp Lejeune MOUT Collective Training Facility (CTF)" uuid="fe6f0a86-5269-11df-a381-080069138b88" uid="22040">
-      <subcategory value="1" description="Public Building" uuid="fe701c32-5269-11df-88c3-080069138b88" uid="22041">
-        <specific value="1" description="City Hall" uuid="fe712a82-5269-11df-9b3a-080069138b88" uid="22042"/>
-        <specific value="2" description="Church" uuid="fe7236ac-5269-11df-a429-080069138b88" uid="22043"/>
-        <specific value="3" description="School" uuid="fe734452-5269-11df-b2cd-080069138b88" uid="22044"/>
-        <specific value="4" description="School Gymnasium" uuid="fe745162-5269-11df-8d45-080069138b88" uid="22045"/>
-      </subcategory>
-      <subcategory value="2" description="Commercial Building" uuid="fe760322-5269-11df-8d80-080069138b88" uid="22046">
-        <specific value="1" description="Bank" uuid="fe770c36-5269-11df-8fc8-080069138b88" uid="22047"/>
-        <specific value="2" description="Hotel" uuid="fe781a5e-5269-11df-925f-080069138b88" uid="22048"/>
-        <specific value="3" description="Strip Mall" uuid="fe792980-5269-11df-9f52-080069138b88" uid="22049"/>
-        <specific value="4" description="Service Station" uuid="fe7a35d2-5269-11df-b89f-080069138b88" uid="22050"/>
-        <specific value="5" description="Warehouse" uuid="fe7b44f4-5269-11df-bb19-080069138b88" uid="22051"/>
-        <specific value="6" description="2-story Office Building" uuid="fe7c5196-5269-11df-ab0b-080069138b88" uid="22052"/>
-        <specific value="7" description="3-story Office Building" uuid="fe7d5bd6-5269-11df-a955-080069138b88" uid="22053"/>
-      </subcategory>
-      <subcategory value="3" description="Residential Building" uuid="fe7f0d1e-5269-11df-acb2-080069138b88" uid="22054">
-        <specific value="1" description="1-story House" uuid="fe801c36-5269-11df-9d34-080069138b88" uid="22055"/>
-        <specific value="2" description="1-story House with Fireplace" uuid="fe812ab8-5269-11df-8fcd-080069138b88" uid="22056"/>
-        <specific value="3" description="2-story House" uuid="fe8238fe-5269-11df-b335-080069138b88" uid="22057"/>
-        <specific value="4" description="Town House" uuid="fe8346d6-5269-11df-b7b5-080069138b88" uid="22058"/>
-        <specific value="5" description="2-story Apartment Building" uuid="fe845468-5269-11df-824c-080069138b88" uid="22059"/>
-        <specific value="6" description="3-story Apartment Building" uuid="fe8560ce-5269-11df-a4d1-080069138b88" uid="22060"/>
-      </subcategory>
-    </category>
-    <category value="15" description="POL Storage Tank" uuid="fe87b158-5269-11df-b3f4-080069138b88" uid="22061"/>
-    <category value="16" description="Cargo Container" uuid="fe88bbd4-5269-11df-88a6-080069138b88" uid="22062">
-      <subcategory value="1" description="MILVAN" status="new" uuid="52b82ca7-2180-4991-8052-b5d6db91853d" uid="22915">
-        <cr value="2239"/>
-        <specific value="1" description="MILVAN, Empty" status="new" uuid="cc1b20ce-a242-4263-82a7-8251dd6e8194" uid="22916">
-          <cr value="2239"/>
-        </specific>
-        <specific value="2" description="MILVAN, Full" status="new" uuid="e604e4de-b683-4f61-93b7-ef614490c4b8" uid="22917">
-          <cr value="2239"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="17" description="Tower" uuid="fe89c83a-5269-11df-b233-080069138b88" uid="22063">
-      <subcategory value="0" description="Other" uuid="fe8ad70c-5269-11df-a570-080069138b88" uid="22064"/>
-      <subcategory value="1" description="Antenna" uuid="fe8be02a-5269-11df-9252-080069138b88" uid="22065"/>
-      <subcategory value="2" description="Water" uuid="fe8cf032-5269-11df-95d2-080069138b88" uid="22066"/>
-      <subcategory value="3" description="Observation" uuid="fe8e06de-5269-11df-8c34-080069138b88" uid="22067"/>
-    </category>
-    <category value="18" description="AAA site" uuid="fe8fb57e-5269-11df-b697-080069138b88" uid="22068">
-      <subcategory value="0" description="Other" uuid="fe90c0d6-5269-11df-9670-080069138b88" uid="22069"/>
-      <subcategory value="1" description="Fixed" uuid="fe91ceea-5269-11df-9eed-080069138b88" uid="22070"/>
-      <subcategory value="2" description="Towed" uuid="fe92dbaa-5269-11df-92fb-080069138b88" uid="22071"/>
-      <subcategory value="3" description="Self-propelled" uuid="fe93e892-5269-11df-b009-080069138b88" uid="22072"/>
-    </category>
-    <category value="19" description="Bridge Span" uuid="fe959598-5269-11df-9bd1-080069138b88" uid="22073">
-      <subcategory value="0" description="Other" uuid="fe96a280-5269-11df-8614-080069138b88" uid="22074"/>
-      <subcategory value="1" description="Single Lane Each Way" uuid="fe97b116-5269-11df-a462-080069138b88" uid="22075">
-        <specific value="1" description="Single Lane Concrete Girder Bridge Span" uuid="fe98bebc-5269-11df-a687-080069138b88" uid="22076"/>
-        <specific value="2" description="Single Lane Concrete Pier Bridge Span" uuid="fe99cf00-5269-11df-9aab-080069138b88" uid="22077"/>
-        <specific value="3" description="Single Lane Masonary Arch Bridge Span" uuid="fe9adde6-5269-11df-b290-080069138b88" uid="22078"/>
-        <specific value="4" description="Single Lane Steel Floating Bridge Span" uuid="fe9be952-5269-11df-aed5-080069138b88" uid="22079"/>
-        <specific value="5" description="Single Lane Steel Girder Bridge Span" uuid="fe9cfe82-5269-11df-8339-080069138b88" uid="22080"/>
-        <specific value="6" description="Single Lane Steel Pier Bridge Span" uuid="fe9e0ebc-5269-11df-a4e2-080069138b88" uid="22081"/>
-        <specific value="7" description="Single Lane Steel Suspension Bridge Span" uuid="fe9f1942-5269-11df-a9ef-080069138b88" uid="22082"/>
-        <specific value="8" description="Single Lane Steel Trestle Bridge Span" uuid="fea02d8c-5269-11df-9fa6-080069138b88" uid="22083"/>
-        <specific value="9" description="Rope Suspension Bridge Span" uuid="fea13ed4-5269-11df-b4c9-080069138b88" uid="22084"/>
-        <specific value="10" description="Single Lane Wood Girder Bridge Span" uuid="fea2493c-5269-11df-bb31-080069138b88" uid="22085"/>
-        <specific value="11" description="Single Lane Wood Pier Bridge Span" uuid="fea357aa-5269-11df-9bd2-080069138b88" uid="22086"/>
-        <specific value="12" description="Single Lane Wood Trestle Bridge Span" uuid="fea46bb8-5269-11df-915f-080069138b88" uid="22087"/>
-      </subcategory>
-      <subcategory value="2" description="Double Lane Each Way" uuid="fea61a8a-5269-11df-8655-080069138b88" uid="22088">
-        <specific value="1" description="Double Lane Concrete Girder Bridge Span" uuid="fea724fc-5269-11df-ae06-080069138b88" uid="22089"/>
-        <specific value="2" description="Double Lane Concrete Pier Bridge Span" uuid="fea83586-5269-11df-abf2-080069138b88" uid="22090"/>
-        <specific value="3" description="Double Lane Masonary Arch Bridge Span" uuid="fea9498a-5269-11df-a211-080069138b88" uid="22091"/>
-        <specific value="4" description="Double Lane Steel Floating Bridge Span" uuid="feaa542e-5269-11df-8883-080069138b88" uid="22092"/>
-        <specific value="5" description="Double Lane Steel Girder Bridge Span" uuid="feab64ae-5269-11df-b79d-080069138b88" uid="22093"/>
-        <specific value="6" description="Double Lane Steel Pier Bridge Span" uuid="feac7e5c-5269-11df-ba77-080069138b88" uid="22094"/>
-        <specific value="7" description="Double Lane Steel Suspension Bridge Span" uuid="fead8d42-5269-11df-a6e8-080069138b88" uid="22095"/>
-        <specific value="8" description="Double Lane Steel Trestle Bridge Span" uuid="feae9ef8-5269-11df-bec4-080069138b88" uid="22096"/>
-        <specific value="9" description="Double Lane Wood Girder Bridge Span" uuid="feafaf8c-5269-11df-85f4-080069138b88" uid="22097"/>
-        <specific value="10" description="Double Lane Wood Pier Bridge Span" uuid="feb0ba08-5269-11df-b88d-080069138b88" uid="22098"/>
-        <specific value="11" description="Double Lane Wood Pier Trestle Span" uuid="feb1cb0a-5269-11df-959b-080069138b88" uid="22099"/>
-      </subcategory>
-    </category>
-    <category value="20" description="Road element" uuid="feb41b30-5269-11df-91c4-080069138b88" uid="22100">
-      <subcategory value="1" description="Road Section Straight" uuid="feb528f4-5269-11df-b026-080069138b88" uid="22101">
-        <specific value="1" description="One Lane" uuid="feb63b2c-5269-11df-a8c6-080069138b88" uid="22102"/>
-        <specific value="2" description="Two Lane" uuid="feb7490e-5269-11df-83d8-080069138b88" uid="22103"/>
-        <specific value="3" description="Three Lane" uuid="feb85132-5269-11df-9826-080069138b88" uid="22104"/>
-        <specific value="4" description="Four Lane" uuid="feb95de8-5269-11df-ae81-080069138b88" uid="22105"/>
-      </subcategory>
-      <subcategory value="2" description="Road Section Curved" uuid="febb0e86-5269-11df-ac3d-080069138b88" uid="22106">
-        <specific value="1" description="Road Section Curved, One Lane" uuid="febc1ce0-5269-11df-a5e3-080069138b88" uid="22107"/>
-        <specific value="2" description="Road Section Curved, Two Lane" uuid="febd2734-5269-11df-94f8-080069138b88" uid="22108"/>
-        <specific value="3" description="Road Section Curved, Three Lane" uuid="febe380e-5269-11df-910d-080069138b88" uid="22109"/>
-        <specific value="4" description="Road Section Curved, Four Lane" uuid="febf4c44-5269-11df-a366-080069138b88" uid="22110"/>
-      </subcategory>
-      <subcategory value="3" description="Intersection" uuid="fec0f972-5269-11df-a261-080069138b88" uid="22111">
-        <specific value="11" description="Intersection, One Lane to One Lane" uuid="fec20308-5269-11df-a430-080069138b88" uid="22112"/>
-        <specific value="12" description="Intersection, One Lane to Two Lane" uuid="fec312e8-5269-11df-a9e1-080069138b88" uid="22113"/>
-        <specific value="13" description="Intersection, One Lane to Three Lane" uuid="fec426a6-5269-11df-af07-080069138b88" uid="22114"/>
-        <specific value="14" description="Intersection, One Lane to Four Lane" uuid="fec5329e-5269-11df-93ec-080069138b88" uid="22115"/>
-        <specific value="22" description="Intersection, Two Lane to Two Lane" uuid="fec642d8-5269-11df-a33b-080069138b88" uid="22116"/>
-        <specific value="23" description="Intersection, Two Lane to Three Lane" uuid="fec7539e-5269-11df-b246-080069138b88" uid="22117"/>
-        <specific value="24" description="Intersection, Two Lane to Four Lane" uuid="fec8632e-5269-11df-aa4a-080069138b88" uid="22118"/>
-        <specific value="33" description="Intersection, Three Lane to Three Lane" uuid="fec973a4-5269-11df-b0dc-080069138b88" uid="22119"/>
-        <specific value="34" description="Intersection, Three Lane to Four Lane" uuid="feca84e2-5269-11df-ac2b-080069138b88" uid="22120"/>
-        <specific value="44" description="Intersection, Four Lane to Four Lane" uuid="fecb967a-5269-11df-8db3-080069138b88" uid="22121"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="5" domain="3" country="0" uuid="fece8df8-5269-11df-97c0-080069138b88" uid="22122">
-    <category value="0" description="Other" uuid="fecf9a22-5269-11df-9510-080069138b88" uid="22123"/>
-    <category value="1" description="Oil derrick" uuid="fed0a3ea-5269-11df-a16f-080069138b88" uid="22124"/>
-    <category value="2" description="Buoy" uuid="fed1b0e6-5269-11df-b544-080069138b88" uid="22125">
-      <subcategory value="1" description="Lighted buoy" uuid="fed2c184-5269-11df-9608-080069138b88" uid="22126">
-        <specific value="1" description="Fixed Light" uuid="fed3ca84-5269-11df-82a0-080069138b88" uid="22127"/>
-        <specific value="2" description="Flashing Light" uuid="fed4d776-5269-11df-9167-080069138b88" uid="22128"/>
-        <specific value="3" description="Red lighted (flashing)" uuid="fed5e83c-5269-11df-8148-080069138b88" uid="22129"/>
-        <specific value="4" description="Green lighted (flashing)" uuid="fed6f542-5269-11df-b5bd-080069138b88" uid="22130"/>
-        <specific value="5" description="Yellow lighted (flashing)" uuid="fed80446-5269-11df-8c2f-080069138b88" uid="22131"/>
-      </subcategory>
-      <subcategory value="2" description="Can" uuid="fed9b0ac-5269-11df-8e8b-080069138b88" uid="22132">
-        <specific value="1" description="Black buoy" uuid="fedac140-5269-11df-942c-080069138b88" uid="22133"/>
-        <specific value="2" description="Green buoy" uuid="fedbc914-5269-11df-9e8e-080069138b88" uid="22134"/>
-      </subcategory>
-      <subcategory value="3" description="Sound buoy" uuid="fedd77a0-5269-11df-a4b5-080069138b88" uid="22135"/>
-      <subcategory value="4" description="Nun" uuid="fede888e-5269-11df-ac89-080069138b88" uid="22136"/>
-      <subcategory value="5" description="Spherical" uuid="fedf9706-5269-11df-b61a-080069138b88" uid="22137"/>
-    </category>
-    <category value="3" description="Pier" uuid="fee142e0-5269-11df-b16b-080069138b88" uid="22138"/>
-    <category value="4" description="Marker" uuid="fee24d2a-5269-11df-aa89-080069138b88" uid="22139">
-      <subcategory value="1" description="Center channel marker" uuid="fee35a9e-5269-11df-ac55-080069138b88" uid="22140"/>
-      <subcategory value="2" description="Range marker" uuid="fee46a88-5269-11df-8266-080069138b88" uid="22141"/>
-      <subcategory value="3" description="Day marker" uuid="fee573ba-5269-11df-80d8-080069138b88" uid="22142"/>
-    </category>
-    <category value="5" description="Datum" uuid="fee725ca-5269-11df-aba0-080069138b88" uid="22143" status="new" deprecated="true">
-      <cr value="1615"/>
-    </category>
-    <category value="6" description="Special Point" uuid="fee83988-5269-11df-881d-080069138b88" uid="22144" deprecated="true">
-      <cr value="1615"/>
-      <subcategory value="1" description="Mine" uuid="fee94f62-5269-11df-8f34-080069138b88" uid="22145" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="2" description="DLRP" uuid="feea59fc-5269-11df-a793-080069138b88" uid="22146" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="3" description="Navigation Hazard" uuid="feeb6acc-5269-11df-b923-080069138b88" uid="22147" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="4" description="Downed A/C" uuid="feec8a4c-5269-11df-90bd-080069138b88" uid="22148" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="5" description="Man in Water" uuid="feed9fc2-5269-11df-b169-080069138b88" uid="22149" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="6" description="Distressed Vessel" uuid="feeeb0c4-5269-11df-b567-080069138b88" uid="22150" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="7" description="Reference Point" uuid="feefc414-5269-11df-8691-080069138b88" uid="22151" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="8" description="Waypoint" uuid="fef0cbca-5269-11df-8f19-080069138b88" uid="22152" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="9" description="Position of Intended Movement (PIM)" uuid="fef1daec-5269-11df-8b18-080069138b88" uid="22153" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="10" description="Combat Air Patrol (CAP)" uuid="fef2ee14-5269-11df-a7e2-080069138b88" uid="22154" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="11" description="Strike Initial Point (SIP)" uuid="fef3f70a-5269-11df-929a-080069138b88" uid="22155" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="12" description="Flight Rendezvous Point" uuid="fef507ee-5269-11df-b55e-080069138b88" uid="22156" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="13" description="Orbit Point" uuid="fef61774-5269-11df-a2cb-080069138b88" uid="22157" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-      <subcategory value="14" description="Radar Site" uuid="fef7247a-5269-11df-8133-080069138b88" uid="22158" deprecated="true">
-        <cr value="1615"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="5" domain="4" country="0" uuid="fef972d4-5269-11df-9523-080069138b88" uid="22159">
-    <category value="0" description="Other" uuid="fefa7de6-5269-11df-8bd8-080069138b88" uid="22160"/>
-    <category value="1" description="Oil derrick" uuid="fefb8b64-5269-11df-b2f8-080069138b88" uid="22161"/>
-    <category value="2" description="Buoy" uuid="fefc9a18-5269-11df-8db8-080069138b88" uid="22162"/>
-    <category value="3" description="Sunken ship" uuid="fefda174-5269-11df-815e-080069138b88" uid="22163"/>
-  </entity>
-  <entity kind="6" domain="0" country="0" uuid="feff51b8-5269-11df-8345-080069138b88" uid="22164">
-    <category value="0" description="Other" uuid="ff005df6-5269-11df-9120-080069138b88" uid="22165">
-      <subcategory value="1" description="Fuels" uuid="ff0169f8-5269-11df-a95d-080069138b88" uid="22166">
-        <specific value="0" description="Other" uuid="ff0271cc-5269-11df-8278-080069138b88" uid="22167"/>
-        <specific value="1" description="Gasoline" uuid="ff038418-5269-11df-be8f-080069138b88" uid="22168"/>
-        <specific value="2" description="Diesel Fuel" uuid="ff04938a-5269-11df-8a4e-080069138b88" uid="22169"/>
-        <specific value="3" description="JP4" uuid="ff059b22-5269-11df-8530-080069138b88" uid="22170"/>
-        <specific value="4" description="Fuel Oil" uuid="ff06acb0-5269-11df-9400-080069138b88" uid="22171"/>
-        <specific value="5" description="JP-8 Fuel" uuid="ff07bab0-5269-11df-b28d-080069138b88" uid="22172"/>
-        <specific value="6" description="Fog oil" uuid="ff08cbe4-5269-11df-a2e3-080069138b88" uid="22173"/>
-        <specific value="7" description="Multi-Spectral Fog Oil" uuid="ff09d8ea-5269-11df-a8ef-080069138b88" uid="22174"/>
-      </subcategory>
-      <subcategory value="2" description="Oils" uuid="ff0b8a96-5269-11df-a7cd-080069138b88" uid="22175"/>
-      <subcategory value="3" description="Lubricants" uuid="ff0c9968-5269-11df-80de-080069138b88" uid="22176"/>
-      <subcategory value="4" description="Food" uuid="ff0da222-5269-11df-962e-080069138b88" uid="22177">
-        <specific value="1" description="Water, Drinking, Sterile, Clear Colorless (bulk)" uuid="ff0eb36a-5269-11df-9bd1-080069138b88" uid="22178"/>
-        <specific value="2" description="Water, Drinking, Distilled or Sparkling" uuid="ff0fc458-5269-11df-81a4-080069138b88" uid="22179"/>
-        <specific value="3" description="Meal Ready To Eat Individuals Menus NO.1" uuid="ff10cf42-5269-11df-b2a0-080069138b88" uid="22180"/>
-        <specific value="4" description="Humanitarian Daily Ration" uuid="ff11e10c-5269-11df-b72c-080069138b88" uid="22181"/>
-        <specific value="5" description="Vegetarian MRE" uuid="ff12f02e-5269-11df-8b20-080069138b88" uid="22182"/>
-        <specific value="6" description="Bread, Shelf-Stable White" uuid="ff13f9ce-5269-11df-8671-080069138b88" uid="22183"/>
-        <specific value="7" description="Meal, Cold Weather" uuid="ff150bca-5269-11df-b1d5-080069138b88" uid="22184"/>
-        <specific value="8" description="Long Range Patrol Ration" uuid="ff1619f2-5269-11df-a54c-080069138b88" uid="22185"/>
-      </subcategory>
-      <subcategory value="5" description="Spare Parts" uuid="ff17c7ac-5269-11df-a0b9-080069138b88" uid="22186"/>
-      <subcategory value="6" description="Personnel" uuid="ff18d462-5269-11df-9e5c-080069138b88" uid="22187">
-        <specific value="0" description="Other" uuid="ff19e140-5269-11df-a45f-080069138b88" uid="22188"/>
-        <specific value="1" description="Dismounted Infantry" uuid="ff1aeebe-5269-11df-8386-080069138b88" uid="22189"/>
-      </subcategory>
-      <subcategory value="7" description="Equipment" uuid="ff1c9e80-5269-11df-9b10-080069138b88" uid="22190">
-        <specific value="0" description="Other" uuid="ff1da956-5269-11df-9582-080069138b88" uid="22191"/>
-        <specific value="1" description="Mine Plow" uuid="ff1eb594-5269-11df-956b-080069138b88" uid="22192"/>
-        <specific value="2" description="Mine Rollers" uuid="ff1fc33a-5269-11df-ad68-080069138b88" uid="22193"/>
-      </subcategory>
-      <subcategory value="8" description="Pallets with ammunition" uuid="ff2172a2-5269-11df-b007-080069138b88" uid="22194"/>
-      <subcategory value="9" description="Pallets with water" uuid="ff227cce-5269-11df-a98a-080069138b88" uid="22195"/>
-      <subcategory value="10" description="Pallets of fuel (JP8)" uuid="ff238b0a-5269-11df-8474-080069138b88" uid="22196"/>
-      <subcategory value="11" description="Decontamination supplies" uuid="ff2498a6-5269-11df-9d69-080069138b88" uid="22197">
-        <specific value="1" description="Decon Agent STB" uuid="ff25ae12-5269-11df-8cad-080069138b88" uid="22198"/>
-        <specific value="2" description="Ferric Chloride AN 100 1 LB" uuid="ff26c4a0-5269-11df-bf83-080069138b88" uid="22199"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="7" domain="1" country="225" uuid="ff29b688-5269-11df-9421-080069138b88" uid="22200">
-    <category value="1" description="Voice Transmission/Reception" uuid="ff2ac49c-5269-11df-8afa-080069138b88" uid="22201">
-      <subcategory value="0" description="Other" uuid="ff2bd274-5269-11df-965b-080069138b88" uid="22202">
-        <specific value="3" description="Typical DAFIF Derived Traffic Control Voice Radio" uuid="ff2ce1dc-5269-11df-bc02-080069138b88" uid="22203"/>
-      </subcategory>
-    </category>
-    <category value="4" description="Instrumented Landing System (ILS) Glideslope" uuid="ff2f3252-5269-11df-80e5-080069138b88" uid="22204">
-      <subcategory value="0" description="Other" uuid="ff30414c-5269-11df-88c8-080069138b88" uid="22205">
-        <specific value="3" description="Typical DAFIF Derived ILS Glideslope Transmitter" uuid="ff315136-5269-11df-9dd6-080069138b88" uid="22206"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Instrumented Landing System (ILS) Localizer Transmitter" uuid="ff33b386-5269-11df-b5f3-080069138b88" uid="22207">
-      <subcategory value="0" description="Other" uuid="ff34c604-5269-11df-8fe0-080069138b88" uid="22208">
-        <specific value="3" description="Typical DAFIF Derived ILS Localizer Transmitter" uuid="ff35d440-5269-11df-ab80-080069138b88" uid="22209"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment)" uuid="ff38275e-5269-11df-a154-080069138b88" uid="22210">
-      <subcategory value="0" description="Other" uuid="ff393824-5269-11df-829b-080069138b88" uid="22211">
-        <specific value="3" description="Typical DAFIF Derived TACAN" uuid="ff3a4a7a-5269-11df-aeb8-080069138b88" uid="22212"/>
-      </subcategory>
-    </category>
-    <category value="12" description="Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment)" uuid="ff3c979e-5269-11df-90d2-080069138b88" uid="22213">
-      <subcategory value="0" description="Other" uuid="ff3dabd4-5269-11df-828b-080069138b88" uid="22214"/>
-      <subcategory value="1" description="Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196)" uuid="ff3ebbdc-5269-11df-95ce-080069138b88" uid="22215">
-        <specific value="1" description="AN/ARN-118" uuid="ff3fce96-5269-11df-9dca-080069138b88" uid="22216"/>
-        <specific value="2" description="AN/ARN-139" uuid="ff40d89a-5269-11df-9679-080069138b88" uid="22217"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="8" domain="2" country="225" uuid="ff43c60e-5269-11df-bf6a-080069138b88" uid="22218">
-    <category value="0" description="Other" uuid="ff44d666-5269-11df-be5a-080069138b88" uid="22219"/>
-    <category value="1" description="Chaff" uuid="ff45e6dc-5269-11df-a673-080069138b88" uid="22220">
-      <subcategory value="1" description="Bundle" uuid="ff46f478-5269-11df-9ab3-080069138b88" uid="22221">
-        <specific value="0" description="Other" uuid="ff4803a4-5269-11df-abf5-080069138b88" uid="22222">
-          <extra value="1" description="TACCSF notional friendly chaff" uuid="ff490f88-5269-11df-aa69-080069138b88" uid="22223"/>
-        </specific>
-        <specific value="1" description="Very small" uuid="ff4abd24-5269-11df-aee3-080069138b88" uid="22224"/>
-        <specific value="2" description="Small" uuid="ff4bc94e-5269-11df-af95-080069138b88" uid="22225"/>
-        <specific value="3" description="Medium" uuid="ff4cd91a-5269-11df-aca2-080069138b88" uid="22226"/>
-        <specific value="4" description="Large" uuid="ff4de35a-5269-11df-88d3-080069138b88" uid="22227"/>
-        <specific value="5" description="Very Large" uuid="ff4ef092-5269-11df-aac8-080069138b88" uid="22228"/>
-        <specific value="6" description="RR-170 Chaff" uuid="ff500086-5269-11df-b6b4-080069138b88" uid="22229"/>
-        <specific value="7" description="RR-180 Chaff" uuid="ff510a30-5269-11df-beca-080069138b88" uid="22230"/>
-        <specific value="8" description="RR-188 Chaff" uuid="ff521af6-5269-11df-873e-080069138b88" uid="22231"/>
-        <specific value="9" description="RR-129 Chaff" uuid="ff532752-5269-11df-b164-080069138b88" uid="22232"/>
-        <specific value="10" description="RR-144 Chaff" uuid="ff54307a-5269-11df-86f0-080069138b88" uid="22233"/>
-        <specific value="11" description="M-1 Chaff" uuid="ff5542da-5269-11df-a4d2-080069138b88" uid="22234"/>
-      </subcategory>
-      <subcategory value="2" description="Corridor" uuid="ff56eedc-5269-11df-9e5a-080069138b88" uid="22235">
-        <specific value="0" description="Other" uuid="ff57fbec-5269-11df-a20c-080069138b88" uid="22236"/>
-        <specific value="1" description="Very small" uuid="ff590802-5269-11df-bb09-080069138b88" uid="22237"/>
-        <specific value="2" description="Small" uuid="ff5a1616-5269-11df-9d94-080069138b88" uid="22238"/>
-        <specific value="3" description="Medium" uuid="ff5b2362-5269-11df-8ba4-080069138b88" uid="22239"/>
-        <specific value="4" description="Large" uuid="ff5c2b5e-5269-11df-a6f5-080069138b88" uid="22240"/>
-        <specific value="5" description="Very Large" uuid="ff5d3d3c-5269-11df-8de7-080069138b88" uid="22241"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Flare" uuid="ff5f85ba-5269-11df-8a46-080069138b88" uid="22242">
-      <subcategory value="0" description="Other" uuid="ff6095c2-5269-11df-9e91-080069138b88" uid="22243">
-        <specific value="1" description="TACCSF notional friendly flare" uuid="ff61a32c-5269-11df-a3b0-080069138b88" uid="22244"/>
-      </subcategory>
-      <subcategory value="1" description="M-206 Flare" uuid="ff6353ac-5269-11df-9677-080069138b88" uid="22245"/>
-      <subcategory value="2" description="MJU-7 Flare" uuid="ff6468be-5269-11df-b3dd-080069138b88" uid="22246"/>
-      <subcategory value="3" description="MJU-10 Flare" uuid="ff657218-5269-11df-812d-080069138b88" uid="22247"/>
-      <subcategory value="4" description="MJU-8 / Mk46 Flare" uuid="ff6682fc-5269-11df-9117-080069138b88" uid="22248"/>
-      <subcategory value="5" description="Mk47 Flare" uuid="ff6798b8-5269-11df-90e6-080069138b88" uid="22249"/>
-    </category>
-    <category value="3" description="Combined chaff/flare" uuid="ff694564-5269-11df-824c-080069138b88" uid="22250"/>
-    <category value="4" description="Active emitter" uuid="ff6a4e00-5269-11df-96d8-080069138b88" uid="22251">
-      <subcategory value="1" description="Towed Decoy" uuid="ff6b5e80-5269-11df-a427-080069138b88" uid="22252">
-        <specific value="1" description="AN/ALE-50 Advanced Airborne Expendable Decoy (AAED)" uuid="ff6c7298-5269-11df-8a08-080069138b88" uid="22253"/>
-        <specific value="2" description="AN/ALE-55 Fiber Optic Towed Decoy (FOTD)" uuid="ff6d7e68-5269-11df-a58c-080069138b88" uid="22254"/>
-        <specific value="3" description="High Power Fiber Optic Towed Decoy (HPFOTD)" uuid="ff6e8e2a-5269-11df-bc3f-080069138b88" uid="22255"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Passive decoy" uuid="ff70e0bc-5269-11df-8b4c-080069138b88" uid="22256"/>
-    <category value="6" description="Winged Decoy" uuid="ff71ede0-5269-11df-a5ee-080069138b88" uid="22257">
-      <subcategory value="1" description="Tactical Air-Launched Decoy" uuid="ff72fd16-5269-11df-8f21-080069138b88" uid="22258">
-        <specific value="1" description="A/B37U-1(V)1 chaff-dispensing" uuid="ff740b7a-5269-11df-bb5c-080069138b88" uid="22259"/>
-        <specific value="2" description="A/B37U-1(V)2 passive RF augmentation" uuid="ff751ad8-5269-11df-a4b7-080069138b88" uid="22260"/>
-        <specific value="3" description="ADM-141A passive and active RF augmentation" uuid="ff762cc0-5269-11df-811a-080069138b88" uid="22261"/>
-        <specific value="4" description="ADM-141B chaff-dispensing" uuid="ff773c50-5269-11df-af1a-080069138b88" uid="22262"/>
-        <specific value="5" description="ADM-141C Improved TALD" uuid="ff7849e2-5269-11df-95f6-080069138b88" uid="22263"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="8" domain="3" country="225" uuid="ff7b38be-5269-11df-a678-080069138b88" uid="22264">
-    <category value="0" description="Other" uuid="ff7c489e-5269-11df-817b-080069138b88" uid="22265"/>
-    <category value="2" description="Flare" uuid="ff7d4ef6-5269-11df-a52a-080069138b88" uid="22266"/>
-    <category value="4" description="Active emitter" uuid="ff7e5d82-5269-11df-b986-080069138b88" uid="22267">
-      <subcategory value="0" description="Other" uuid="ff7f6c18-5269-11df-b41f-080069138b88" uid="22268">
-        <specific value="1" description="Nixie SLQ 25" uuid="ff80750e-5269-11df-b2d5-080069138b88" uid="22269"/>
-      </subcategory>
-    </category>
-    <category value="5" description="Passive decoy" uuid="ff82ca0c-5269-11df-b3d2-080069138b88" uid="22270"/>
-  </entity>
-  <entity kind="8" domain="4" country="225" uuid="ff8488e2-5269-11df-bc87-080069138b88" uid="22271">
-    <category value="4" description="Active Emitter" uuid="ff85962e-5269-11df-8dee-080069138b88" uid="22272">
-      <subcategory value="1" description="CM NAE" uuid="ff86a4ba-5269-11df-86c4-080069138b88" uid="22273"/>
-      <subcategory value="2" description="CM ADC Mk 3 T" uuid="ff87b1ac-5269-11df-8627-080069138b88" uid="22274"/>
-      <subcategory value="3" description="CM ADC Mk 3 S" uuid="ff88bbc4-5269-11df-a4b9-080069138b88" uid="22275"/>
-      <subcategory value="4" description="CM ADC Mk 3 N" uuid="ff89cd0c-5269-11df-8827-080069138b88" uid="22276"/>
-      <subcategory value="5" description="CM ADC Mk 4" uuid="ff8ae02a-5269-11df-9a2b-080069138b88" uid="22277">
-        <specific value="1" description="CM ADC MK-4 BBNR" uuid="ff8be812-5269-11df-9a3d-080069138b88" uid="22278"/>
-        <specific value="2" description="CM ADC MK-4 BBN" uuid="ff8cf680-5269-11df-b9ea-080069138b88" uid="22279"/>
-        <specific value="3" description="CM ADC MK-4 SFJR" uuid="ff8e089a-5269-11df-91f4-080069138b88" uid="22280"/>
-        <specific value="4" description="CM ADC MK-4 SFJ" uuid="ff8f1136-5269-11df-9af8-080069138b88" uid="22281"/>
-      </subcategory>
-      <subcategory value="6" description="CM ADC MK-3" uuid="ff90bcca-5269-11df-8822-080069138b88" uid="22282">
-        <specific value="1" description="CM ADC MK-3 R3" uuid="ff91ce76-5269-11df-a5f1-080069138b88" uid="22283"/>
-        <specific value="2" description="CM ADC MK-3 BN" uuid="ff92dcf8-5269-11df-98c3-080069138b88" uid="22284"/>
-        <specific value="3" description="CM ADC MK-3 NPN" uuid="ff93e5bc-5269-11df-96e6-080069138b88" uid="22285"/>
-        <specific value="4" description="CM ADC MK-3 IR 3" uuid="ff94f394-5269-11df-ad81-080069138b88" uid="22286"/>
-      </subcategory>
-      <subcategory value="7" description="CM ADC MK-1" uuid="ff96a4fa-5269-11df-849b-080069138b88" uid="22287"/>
-    </category>
-  </entity>
-  <entity kind="8" domain="2" country="222" uuid="ff98f30e-5269-11df-955e-080069138b88" uid="22288">
-    <category value="0" description="Other" uuid="ff9a0032-5269-11df-908d-080069138b88" uid="22289"/>
-    <category value="1" description="Chaff" uuid="ff9b0f4a-5269-11df-849b-080069138b88" uid="22290">
-      <subcategory value="1" description="Bundle" uuid="ff9c1cdc-5269-11df-b424-080069138b88" uid="22291">
-        <specific value="0" description="Other" uuid="ff9d2a00-5269-11df-9afa-080069138b88" uid="22292">
-          <extra value="1" description="TACCSF notional hostile chaff" uuid="ff9e365c-5269-11df-b771-080069138b88" uid="22293"/>
-        </specific>
-        <specific value="1" description="Very small" uuid="ff9fe56a-5269-11df-b98b-080069138b88" uid="22294"/>
-        <specific value="2" description="Small" uuid="ffa0f720-5269-11df-bf5c-080069138b88" uid="22295"/>
-        <specific value="3" description="Medium" uuid="ffa2082c-5269-11df-a46e-080069138b88" uid="22296"/>
-        <specific value="4" description="Large" uuid="ffa3150a-5269-11df-8d55-080069138b88" uid="22297"/>
-        <specific value="5" description="Very Large" uuid="ffa424d6-5269-11df-ad3a-080069138b88" uid="22298"/>
-        <specific value="6" description="26mm chaff cartridge" uuid="ffa53236-5269-11df-b4d1-080069138b88" uid="22299"/>
-        <specific value="7" description="50mm chaff cartridge" uuid="ffa641f8-5269-11df-b795-080069138b88" uid="22300"/>
-      </subcategory>
-    </category>
-    <category value="2" description="Flare" uuid="ffa88d32-5269-11df-b25c-080069138b88" uid="22301">
-      <subcategory value="0" description="Other" uuid="ffa99e84-5269-11df-8eb5-080069138b88" uid="22302">
-        <specific value="1" description="TACCSF notional hostile flare" uuid="ffaaacb6-5269-11df-94ab-080069138b88" uid="22303"/>
-      </subcategory>
-      <subcategory value="1" description="26mm Flare" uuid="ffac5b56-5269-11df-98b5-080069138b88" uid="22304"/>
-      <subcategory value="2" description="50mm Flare" uuid="ffad699c-5269-11df-9e2f-080069138b88" uid="22305"/>
-    </category>
-  </entity>
-  <entity kind="8" domain="4" country="222" uuid="ffafb828-5269-11df-9c87-080069138b88" uid="22306">
-    <category value="4" description="Active Emitter" uuid="ffb0c4ac-5269-11df-89c6-080069138b88" uid="22307">
-      <subcategory value="1" description="UC-2S" uuid="ffb1cf5a-5269-11df-b0a3-080069138b88" uid="22308"/>
-      <subcategory value="2" description="UC-5M" uuid="ffb2dd64-5269-11df-80a6-080069138b88" uid="22309"/>
-      <subcategory value="3" description="UC-2 Countermeasure" uuid="ffb3eb46-5269-11df-bd9c-080069138b88" uid="22310"/>
-    </category>
-  </entity>
-  <entity kind="8" domain="3" country="13" uuid="ffb638ec-5269-11df-bcfa-080069138b88" uid="22311">
-    <category value="0" description="Other" uuid="ffb74430-5269-11df-9d7b-080069138b88" uid="22312">
-      <subcategory value="0" description="Other" uuid="ffb84f7e-5269-11df-a767-080069138b88" uid="22313">
-        <specific value="1" description="Nulka" uuid="ffb95c84-5269-11df-b2be-080069138b88" uid="22314"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="225" uuid="ffbc4d68-5269-11df-8682-080069138b88" uid="22315">
-    <category value="0" description="Other" uuid="ffbd5370-5269-11df-ad47-080069138b88" uid="22316"/>
-    <category value="2" description="RF Active" uuid="ffbe6792-5269-11df-956d-080069138b88" uid="22317">
-      <subcategory value="1" description="Multi-function" uuid="ffbf75a6-5269-11df-96e0-080069138b88" uid="22318">
-        <specific value="1" description="Fixed" uuid="ffc08cca-5269-11df-91bb-080069138b88" uid="22319"/>
-        <specific value="2" description="Mobile" uuid="ffc1993a-5269-11df-8db4-080069138b88" uid="22320"/>
-      </subcategory>
-      <subcategory value="2" description="Early Warning / Surveillance Radar" uuid="ffc34686-5269-11df-aea2-080069138b88" uid="22321">
-        <specific value="1" description="AN/TPS-43" uuid="ffc45710-5269-11df-bdfc-080069138b88" uid="22322"/>
-        <specific value="2" description="AN/TPS-59" uuid="ffc5693e-5269-11df-a18c-080069138b88" uid="22323"/>
-        <specific value="3" description="AN/TPS-63" uuid="ffc67040-5269-11df-aaac-080069138b88" uid="22324"/>
-        <specific value="4" description="AN/TPS-75" uuid="ffc77f12-5269-11df-aecf-080069138b88" uid="22325"/>
-        <specific value="5" description="AN/FPS-117" uuid="ffc890be-5269-11df-893f-080069138b88" uid="22326"/>
-        <specific value="6" description="AN/FPS-89" uuid="ffc9989c-5269-11df-ba46-080069138b88" uid="22327"/>
-        <specific value="7" description="AN/TPS-70" uuid="ffcaa80e-5269-11df-bc0c-080069138b88" uid="22328"/>
-        <specific value="8" description="AN/TPS-24" uuid="ffcbb6fe-5269-11df-ac08-080069138b88" uid="22329"/>
-        <specific value="9" description="AN/TPS-65" uuid="ffccc148-5269-11df-b174-080069138b88" uid="22330"/>
-        <specific value="10" description="ASR-4" uuid="ffcdce8a-5269-11df-96f3-080069138b88" uid="22331">
-          <extra value="1" description="ASR-4D" uuid="ffcee072-5269-11df-80b8-080069138b88" uid="22332"/>
-          <extra value="2" description="ASR-4 LRSR" uuid="ffcfe922-5269-11df-a11b-080069138b88" uid="22333"/>
-        </specific>
-        <specific value="11" description="ASR-5" uuid="ffd195a6-5269-11df-80c8-080069138b88" uid="22334"/>
-        <specific value="12" description="ASR-7" uuid="ffd2a252-5269-11df-9aa1-080069138b88" uid="22335"/>
-        <specific value="13" description="ASR-8" uuid="ffd3b458-5269-11df-bb09-080069138b88" uid="22336"/>
-        <specific value="14" description="ASR-9" uuid="ffd4bd6c-5269-11df-8fe9-080069138b88" uid="22337"/>
-        <specific value="15" description="ASR-10" uuid="ffd5ca5e-5269-11df-a0b4-080069138b88" uid="22338">
-          <extra value="1" description="ASR-10 SS" uuid="ffd6d87c-5269-11df-994f-080069138b88" uid="22339"/>
-        </specific>
-        <specific value="16" description="ASR-11" uuid="ffd8885c-5269-11df-8c6a-080069138b88" uid="22340">
-          <extra value="1" description="ASR-11/DASR" uuid="ffd990bc-5269-11df-a57c-080069138b88" uid="22341"/>
-        </specific>
-        <specific value="17" description="ASR-12" uuid="ffdb3bf6-5269-11df-aeac-080069138b88" uid="22342"/>
-        <specific value="18" description="ASR-23" uuid="ffdc4ae6-5269-11df-9963-080069138b88" uid="22343">
-          <extra value="1" description="ASR-23 SS" uuid="ffdd5cb0-5269-11df-b6e0-080069138b88" uid="22344"/>
-        </specific>
-      </subcategory>
-      <subcategory value="5" description="Target Acquisition Radar" uuid="ffdfb03c-5269-11df-91d1-080069138b88" uid="22345">
-        <specific value="1" description="AN/MPQ-64 FAAD GBS" uuid="ffe0c256-5269-11df-b35d-080069138b88" uid="22346"/>
-      </subcategory>
-      <subcategory value="8" description="Firing Point/Launch Point Determination Sensor" uuid="ffe27128-5269-11df-be96-080069138b88" uid="22347">
-        <specific value="1" description="AN/TPQ-36" uuid="ffe37c3a-5269-11df-8b16-080069138b88" uid="22348"/>
-        <specific value="2" description="AN/TPQ-37 Firefinder" uuid="ffe48e86-5269-11df-9239-080069138b88" uid="22349"/>
-        <specific value="3" description="Trailer mounted AN/TPQ-38 (V8)" uuid="ffe59c22-5269-11df-9313-080069138b88" uid="22350"/>
-        <specific value="4" description="Trailer mounted AN/TPQ-47" uuid="ffe6a6a8-5269-11df-b94c-080069138b88" uid="22351"/>
-        <specific value="5" description="AN/TPQ-47" uuid="ffe7ba84-5269-11df-928d-080069138b88" uid="22352"/>
-      </subcategory>
-      <subcategory value="24" description="Battlefield Surveillance" uuid="ffe9678a-5269-11df-832c-080069138b88" uid="22353">
-        <specific value="1" description="AN/PPS-5" uuid="ffea77f6-5269-11df-997c-080069138b88" uid="22354"/>
-        <specific value="2" description="AN/PPS-15A (V1)" uuid="ffeb857e-5269-11df-981c-080069138b88" uid="22355"/>
-      </subcategory>
-    </category>
-    <category value="3" description="RF Passive" uuid="ffedd676-5269-11df-875a-080069138b88" uid="22356">
-      <subcategory value="8" description="Firing Point/Launch Point Determination Sensor" uuid="ffeee0ac-5269-11df-84f3-080069138b88" uid="22357">
-        <specific value="1" description="Expert Missile Tracker (adjunct to AN/TPS-75)" uuid="ffeff15e-5269-11df-b970-080069138b88" uid="22358"/>
-      </subcategory>
-    </category>
-    <category value="7" description="Chemical, point detector" uuid="fff24350-5269-11df-8e92-080069138b88" uid="22359">
-      <subcategory value="1" description="ACADA" uuid="fff351f0-5269-11df-99e7-080069138b88" uid="22360">
-        <specific value="1" description="w/Telemetry Link" uuid="fff46374-5269-11df-8df5-080069138b88" uid="22361"/>
-      </subcategory>
-      <subcategory value="2" description="M44A1" uuid="fff60f1c-5269-11df-906c-080069138b88" uid="22362">
-        <specific value="1" description="w/Telemetry Link" uuid="fff72136-5269-11df-b79e-080069138b88" uid="22363"/>
-      </subcategory>
-    </category>
-    <category value="8" description="Chemical, standoff" uuid="fff96cb6-5269-11df-9337-080069138b88" uid="22364">
-      <subcategory value="1" description="M21" uuid="fffa7da4-5269-11df-9974-080069138b88" uid="22365"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="2" country="225" uuid="fffcc758-5269-11df-b7eb-080069138b88" uid="22366">
-    <category value="0" description="Other" uuid="fffde0fc-5269-11df-bfef-080069138b88" uid="22367"/>
-    <category value="2" description="RF active" uuid="fffeeb00-5269-11df-8814-080069138b88" uid="22368">
-      <subcategory value="2" description="Early Warning/Surveillance" uuid="fffffc48-5269-11df-baca-080069138b88" uid="22369">
-        <specific value="1" description="JLENS PTIR Sensor" uuid="00010a3e-526a-11df-82f8-080069138b88" uid="22370"/>
-        <specific value="2" description="JLENS SuR Sensor" uuid="00021d5c-526a-11df-8a27-080069138b88" uid="22371"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="3" country="225" uuid="00050ac6-526a-11df-92c1-080069138b88" uid="22372">
-    <category value="0" description="Other" uuid="00062276-526a-11df-ad72-080069138b88" uid="22373"/>
-    <category value="10" description="Acoustic, active" uuid="00073076-526a-11df-91bf-080069138b88" uid="22374">
-      <subcategory value="77" description="Sonobuoy" uuid="00083ffc-526a-11df-b655-080069138b88" uid="22375">
-        <specific value="1" description="ICEPICK (GEOBUOY)" uuid="00094c94-526a-11df-901f-080069138b88" uid="22376"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="225" uuid="000c3ab2-526a-11df-819f-080069138b88" uid="22377">
-    <category value="0" description="Other" uuid="000d4790-526a-11df-b879-080069138b88" uid="22378"/>
-    <category value="9" description="Thermal (temperature sensing)" uuid="000e55c2-526a-11df-a61f-080069138b88" uid="22379">
-      <subcategory value="78" description="Bathythermal Sensor" uuid="000f64ee-526a-11df-9cf5-080069138b88" uid="22380">
-        <specific value="1" description="AN/SSQ-36B BTS (Bathythermograph Transmitting Set)" uuid="001075be-526a-11df-b8f4-080069138b88" uid="22381"/>
-      </subcategory>
-    </category>
-    <category value="10" description="Acoustic, active" uuid="0012c67a-526a-11df-a802-080069138b88" uid="22382">
-      <subcategory value="5" description="Acquisition / detection" uuid="0013d880-526a-11df-9c7f-080069138b88" uid="22383"/>
-      <subcategory value="77" description="Sonobuoy" uuid="0014e2fc-526a-11df-abb0-080069138b88" uid="22384">
-        <specific value="1" description="AN/SSQ-62 DICASS (Directional Command Active Sonobuoy System)" uuid="0015f4da-526a-11df-ba3a-080069138b88" uid="22385">
-          <extra value="1" description="AN/SSQ-62D DICASS" uuid="00170744-526a-11df-b144-080069138b88" uid="22386"/>
-          <extra value="2" description="AN/SSQ-62D1 DICASS" uuid="00181396-526a-11df-ba17-080069138b88" uid="22387"/>
-          <extra value="3" description="AN/SSQ-62D2 DICASS" uuid="00192344-526a-11df-a7fc-080069138b88" uid="22388"/>
-          <extra value="4" description="AN/SSQ-62E DICASS" uuid="001a2ff0-526a-11df-98ce-080069138b88" uid="22389"/>
-          <extra value="5" description="AN/SSQ-62E1 DICASS" uuid="001b38e6-526a-11df-9f67-080069138b88" uid="22390"/>
-          <extra value="6" description="AN/SSQ-62E2 DICASS" uuid="001c5370-526a-11df-9341-080069138b88" uid="22391"/>
-        </specific>
-        <specific value="2" description="AN/SSQ-110 EER (Extended Echo Ranging), a.k.a. SUS (Signal, Underwater Sound)" uuid="001e1228-526a-11df-8da1-080069138b88" uid="22392">
-          <extra value="1" description="AN/SSQ-110A EER" uuid="001f25be-526a-11df-924c-080069138b88" uid="22393"/>
-          <extra value="2" description="AN/SSQ-110B EER" uuid="00202db0-526a-11df-9e01-080069138b88" uid="22394"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="11" description="Acoustic, Passive" uuid="00232254-526a-11df-abf5-080069138b88" uid="22395">
-      <subcategory value="77" description="Sonobuoy" uuid="00243022-526a-11df-b223-080069138b88" uid="22396">
-        <specific value="1" description="AN/SSQ-53 DIFAR (Directional Frequency Analysis Recording)" uuid="00253b02-526a-11df-ae06-080069138b88" uid="22397">
-          <extra value="1" description="AN/SSQ-53D DIFAR" uuid="00264c36-526a-11df-a810-080069138b88" uid="22398"/>
-          <extra value="2" description="AN/SSQ-53E DIFAR" uuid="00275de2-526a-11df-bf41-080069138b88" uid="22399"/>
-          <extra value="3" description="AN/SSQ-53F DIFAR" uuid="0028669c-526a-11df-9fce-080069138b88" uid="22400"/>
-        </specific>
-        <specific value="2" description="AN/SSQ-57 ANM (Ambient Noise Measurement)" uuid="002a15a0-526a-11df-9094-080069138b88" uid="22401">
-          <extra value="1" description="AN/SSQ-57C1 ANM" uuid="002b242c-526a-11df-88f2-080069138b88" uid="22402"/>
-        </specific>
-        <specific value="3" description="AN/SSQ-77 VLAD (Vertical Line Array DIFAR)" uuid="002cd574-526a-11df-9d3a-080069138b88" uid="22403">
-          <extra value="1" description="AN/SSQ-77B VLAD" uuid="002de554-526a-11df-8c3b-080069138b88" uid="22404"/>
-          <extra value="2" description="AN/SSQ-77C VLAD" uuid="002eed46-526a-11df-9c3b-080069138b88" uid="22405"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="222" uuid="00327d3a-526a-11df-9930-080069138b88" uid="22406">
-    <category value="0" description="Other" uuid="00338ec8-526a-11df-9deb-080069138b88" uid="22407"/>
-    <category value="1" description="Multi-spectral" uuid="00349d72-526a-11df-a19e-080069138b88" uid="22408">
-      <subcategory value="1" description="Land Radar Hostile Fixed" uuid="0035ad20-526a-11df-a517-080069138b88" uid="22409"/>
-      <subcategory value="2" description="Land Radar Hostile Dynamic" uuid="0036bb0c-526a-11df-a40c-080069138b88" uid="22410"/>
-    </category>
-    <category value="2" description="RF Active" uuid="0038697a-526a-11df-a182-080069138b88" uid="22411">
-      <subcategory value="1" description="Multi-function" uuid="003976a8-526a-11df-88d3-080069138b88" uid="22412">
-        <specific value="1" description="Fixed" uuid="003a8700-526a-11df-8069-080069138b88" uid="22413"/>
-        <specific value="2" description="Mobile" uuid="003b9762-526a-11df-8a28-080069138b88" uid="22414"/>
-      </subcategory>
-      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="003d4724-526a-11df-ae56-080069138b88" uid="22415">
-        <specific value="1" description="Back Trap" uuid="003e5aa6-526a-11df-a084-080069138b88" uid="22416"/>
-        <specific value="2" description="Bar Lock (P-35/P-37/P-50)" uuid="003f689c-526a-11df-8fc0-080069138b88" uid="22417"/>
-        <specific value="3" description="Flat Face (P-15, CASTA-2E1)" uuid="0040730e-526a-11df-8d04-080069138b88" uid="22418"/>
-        <specific value="4" description="Long Track" uuid="00418618-526a-11df-9116-080069138b88" uid="22419"/>
-        <specific value="5" description="Spoon Rest (P-12)" uuid="00429472-526a-11df-a626-080069138b88" uid="22420"/>
-        <specific value="6" description="Squat Eye (P-15M)" uuid="00439c64-526a-11df-82fc-080069138b88" uid="22421"/>
-        <specific value="7" description="Tall King (P-14)" uuid="0044ace4-526a-11df-b796-080069138b88" uid="22422"/>
-        <specific value="8" description="Tin Shield" uuid="0045bf9e-526a-11df-ba83-080069138b88" uid="22423"/>
-        <specific value="9" description="Knife Rest (P-10)" uuid="0046c862-526a-11df-89ca-080069138b88" uid="22424"/>
-        <specific value="10" description="Tin Trap" uuid="0047d680-526a-11df-b520-080069138b88" uid="22425"/>
-        <specific value="11" description="Box Spring" uuid="0048e6c4-526a-11df-9e02-080069138b88" uid="22426"/>
-      </subcategory>
-      <subcategory value="3" description="Height Finding Radar" uuid="004a9726-526a-11df-9d15-080069138b88" uid="22427">
-        <specific value="1" description="Odd Group" uuid="004ba04e-526a-11df-a8a7-080069138b88" uid="22428"/>
-        <specific value="2" description="Odd Pair" uuid="004caffc-526a-11df-9238-080069138b88" uid="22429"/>
-        <specific value="3" description="Side Net (PRV-11)" uuid="004dbed8-526a-11df-b0d3-080069138b88" uid="22430"/>
-        <specific value="4" description="Thin Skin" uuid="004ecc7e-526a-11df-a7cd-080069138b88" uid="22431"/>
-      </subcategory>
-      <subcategory value="4" description="Fire Control Radar" uuid="005077f4-526a-11df-ab5c-080069138b88" uid="22432">
-        <specific value="1" description="Fire Can" uuid="0051878e-526a-11df-ba7b-080069138b88" uid="22433"/>
-        <specific value="2" description="Flap Wheel" uuid="00529944-526a-11df-b937-080069138b88" uid="22434"/>
-        <specific value="3" description="Whiff" uuid="0053a1d6-526a-11df-995d-080069138b88" uid="22435"/>
-        <specific value="4" description="Gun Dish (RPK-2)" deprecated="1" uuid="0054afae-526a-11df-9742-080069138b88" uid="22436"/>
-      </subcategory>
-      <subcategory value="5" description="Target Acquisition Radar" uuid="005661e6-526a-11df-8642-080069138b88" uid="22437">
-        <specific value="1" description="Dog Ear" uuid="005770f4-526a-11df-95c2-080069138b88" uid="22438"/>
-        <specific value="2" description="Snow Drift (9S18M1)" uuid="00587986-526a-11df-b5f3-080069138b88" uid="22439"/>
-        <specific value="3" description="MT-LB mounted ARK-1" uuid="00598baa-526a-11df-a6d1-080069138b88" uid="22440"/>
-        <specific value="4" description="MT-LB mounted ZOOPARK" uuid="005aa3dc-526a-11df-b0ae-080069138b88" uid="22441"/>
-        <specific value="5" description="Truck/trailer mounted SNAR-10" uuid="005bae4e-526a-11df-b581-080069138b88" uid="22442"/>
-        <specific value="6" description="MT-LB mounted BIG FRED" uuid="005cbece-526a-11df-a4ba-080069138b88" uid="22443"/>
-      </subcategory>
-      <subcategory value="8" description="Firing point/launch point location" status="new" uuid="d68d3c1a-d6cd-4e44-8121-07cb4420f730" uid="22850">
-        <cr value="2178"/>
-        <specific value="1" description="IL-220U CM/CB Radar" status="new" uuid="57c1c710-db36-4141-93b4-69bd36e195c8" uid="22851">
-          <cr value="2178"/>
-        </specific>
-      </subcategory>
-      <subcategory value="14" description="Meteorological Radar" uuid="005e708e-526a-11df-812e-080069138b88" uid="22444">
-        <specific value="1" description="End Tray" uuid="005f7fec-526a-11df-ad8f-080069138b88" uid="22445"/>
-      </subcategory>
-      <subcategory value="18" description="Surface Search Radar" uuid="00612cca-526a-11df-ade1-080069138b88" uid="22446">
-        <specific value="1" description="Sheet Bend" uuid="0062385e-526a-11df-a926-080069138b88" uid="22447"/>
-      </subcategory>
-      <subcategory value="24" description="Battlefield Surveillance" uuid="0063e672-526a-11df-a526-080069138b88" uid="22448">
-        <specific value="1" description="PSNR-5K (TALL MIKE)" uuid="0064f6c0-526a-11df-93d3-080069138b88" uid="22449"/>
-        <specific value="2" description="FARA-1 (SBR-3)" uuid="00660998-526a-11df-8abf-080069138b88" uid="22450"/>
-        <specific value="3" description="Pork Trough (SNAR-1/2/6)" status="new" uuid="05c099a2-54ef-4f81-a123-793f2289fcb7" uid="22847">
-          <cr value="2178"/>
-        </specific>
-      </subcategory>
-    </category>
-    <category value="3" description="RF Passive (intercept and DF)" status="new" uuid="451d68eb-0cf5-472b-be8f-02e8989a4d08" uid="22833">
-      <cr value="2170"/>
-      <subcategory value="16" description="Identification/Classification (including IFF)" status="new" uuid="db75a75f-52c4-4197-b9a4-17a71cfc31e9" uid="22834">
-        <cr value="2170"/>
-        <specific value="1" description="Turn Cut R-381-1" status="new" uuid="17c7f90d-4053-4086-9723-63913ba9801b" uid="22835">
-          <cr value="2170"/>
-        </specific>
-        <specific value="2" description="Turn Spike R-381-2" status="new" uuid="3bb04477-c60d-459d-949c-956121c82c3a" uid="22836">
-          <cr value="2170"/>
-        </specific>
-        <specific value="3" description="Turn Twist R-381-3" status="new" uuid="f886f429-bd4d-4a48-88e1-ed361f389a23" uid="22837">
-          <cr value="2170"/>
-        </specific>
-        <specific value="4" description="Turn Pole R-381-4" status="new" uuid="e6499144-394f-40bd-9f00-bea844f7e27c" uid="22838">
-          <cr value="2170"/>
-        </specific>
-        <specific value="5" description="Full House R-339" status="new" uuid="d5e643a3-0fde-405a-8058-f4d974c6f418" uid="22839">
-          <cr value="2170"/>
-        </specific>
-        <specific value="6" description="Spike Square R-363" status="new" uuid="eee014f1-7130-49d4-bf4e-8ab8edd95771" uid="22840">
-          <cr value="2170"/>
-        </specific>
-        <specific value="7" description="Lone Box SRTR-2" status="new" uuid="d1658843-be85-4ab8-92dc-c31e5d82484b" uid="22841">
-          <cr value="2170"/>
-        </specific>
-        <specific value="8" description="Twin Box RPS-5M" status="new" uuid="2039de69-3487-405e-86de-4098ea36f07e" uid="22842">
-          <cr value="2170"/>
-        </specific>
-        <specific value="9" description="Twin Box RPS-6" status="new" uuid="9d4190a9-74f1-4c2f-8222-ddb8168c616c" uid="22843">
-          <cr value="2170"/>
-        </specific>
-        <specific value="10" description="Tube Tree" status="new" uuid="9f894c07-5394-49b5-9a7d-b6b93274de43" uid="22844">
-          <cr value="2170"/>
-        </specific>
-        <specific value="11" description="Pole Dish (NRS-1)" status="new" uuid="bcfdac7c-3238-43fe-8984-1f0ec8de5c46" uid="22848">
-          <cr value="2178"/>
-        </specific>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="3" country="222" uuid="0068f626-526a-11df-ab1f-080069138b88" uid="22451">
-    <category value="0" description="Other" uuid="006a023c-526a-11df-8632-080069138b88" uid="22452"/>
-    <category value="10" description="Acoustic active" uuid="006b11e0-526a-11df-8a73-080069138b88" uid="22453">
-      <subcategory value="77" description="Sonobuoy" uuid="006c24ae-526a-11df-82af-080069138b88" uid="22454"/>
-      <subcategory value="79" description="Towed Counter Measure" uuid="006d2d90-526a-11df-8871-080069138b88" uid="22455">
-        <specific value="1" description="Towed CM BAT-1" uuid="006e3c80-526a-11df-8cd3-080069138b88" uid="22456"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="222" uuid="00712fee-526a-11df-a2b4-080069138b88" uid="22457">
-    <category value="10" description="Acoustic, active" uuid="00723c7c-526a-11df-9659-080069138b88" uid="22458">
-      <subcategory value="28" description="Decoy/Mimic" uuid="00734496-526a-11df-ba14-080069138b88" uid="22459"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="224" uuid="0075985e-526a-11df-b895-080069138b88" uid="22460">
-    <category value="0" description="Other" uuid="0076a03c-526a-11df-8ce1-080069138b88" uid="22461"/>
-    <category value="2" description="RF Active" uuid="0077b10c-526a-11df-a0d2-080069138b88" uid="22462">
-      <subcategory value="1" description="Multi-function" uuid="0078c70e-526a-11df-b7c6-080069138b88" uid="22463">
-        <specific value="1" description="Fixed" uuid="0079d0ae-526a-11df-93bf-080069138b88" uid="22464"/>
-        <specific value="2" description="Mobile" uuid="007ae1ba-526a-11df-bdbd-080069138b88" uid="22465"/>
-      </subcategory>
-      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="007c9078-526a-11df-8ba7-080069138b88" uid="22466">
-        <specific value="1" description="Plessey AR-5" uuid="007d9f36-526a-11df-bf6e-080069138b88" uid="22467"/>
-      </subcategory>
-      <subcategory value="3" description="Height Finding" uuid="007f506a-526a-11df-9923-080069138b88" uid="22468">
-        <specific value="1" description="Decca HF 200" uuid="008059c4-526a-11df-a635-080069138b88" uid="22469"/>
-      </subcategory>
-      <subcategory value="6" description="Target Tracking Radar" uuid="0082085a-526a-11df-97ee-080069138b88" uid="22470"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="224" uuid="00845c72-526a-11df-8bf3-080069138b88" uid="22471">
-    <category value="11" description="Acoustic, Passive" uuid="0085643c-526a-11df-a719-080069138b88" uid="22472">
-      <subcategory value="77" description="Sonobuoy" uuid="00867296-526a-11df-b0cb-080069138b88" uid="22473">
-        <specific value="1" description="AN/SSQ-955 HIDAR (High Instantaneous Dynamic Range)" uuid="008784ba-526a-11df-9727-080069138b88" uid="22474"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="71" uuid="008a6df6-526a-11df-b622-080069138b88" uid="22475">
-    <category value="0" description="Other" uuid="008b7e6c-526a-11df-ae87-080069138b88" uid="22476"/>
-    <category value="2" description="RF Active" uuid="008c8b9a-526a-11df-a35e-080069138b88" uid="22477">
-      <subcategory value="1" description="Multi-function" uuid="008d99ae-526a-11df-8c96-080069138b88" uid="22478">
-        <specific value="1" description="Fixed" uuid="008ea560-526a-11df-99f6-080069138b88" uid="22479"/>
-        <specific value="2" description="Mobile" uuid="008fb37e-526a-11df-a9a7-080069138b88" uid="22480"/>
-      </subcategory>
-      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="009160f2-526a-11df-9492-080069138b88" uid="22481">
-        <specific value="1" description="Thompson LP-23 (TRS-2050)" uuid="009273e8-526a-11df-a9f7-080069138b88" uid="22482"/>
-        <specific value="2" description="Tiger-S (TRS-2100)" uuid="00937dce-526a-11df-a68f-080069138b88" uid="22483"/>
-        <specific value="3" description="Tiger-G (TRS-2105)" uuid="00948d9a-526a-11df-855a-080069138b88" uid="22484"/>
-        <specific value="4" description="THD 1940 (Picador)" uuid="00959ce4-526a-11df-a68c-080069138b88" uid="22485"/>
-        <specific value="5" description="Volex III/IV" uuid="0096a54e-526a-11df-bc17-080069138b88" uid="22486"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="78" uuid="0099a1f4-526a-11df-a516-080069138b88" uid="22487">
-    <category value="0" description="Other" uuid="009ab2a6-526a-11df-a16c-080069138b88" uid="22488"/>
-    <category value="2" description="RF Active" uuid="009bbb42-526a-11df-9dfb-080069138b88" uid="22489">
-      <subcategory value="1" description="Multifunction Radar" uuid="009cc7ee-526a-11df-85b7-080069138b88" uid="22490">
-        <specific value="1" description="Roland II radar" deprecated="1" uuid="009dd9f4-526a-11df-9139-080069138b88" uid="22491"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="206" uuid="00a0c786-526a-11df-89f1-080069138b88" uid="22492">
-    <category value="0" description="Other" uuid="00a1d3e2-526a-11df-9d10-080069138b88" uid="22493"/>
-    <category value="2" description="RF Active" uuid="00a2e4c6-526a-11df-90d3-080069138b88" uid="22494">
-      <subcategory value="4" description="Fire Control Radar" uuid="00a3f1ea-526a-11df-afbd-080069138b88" uid="22495">
-        <specific value="1" description="Skyguard" uuid="00a4fc84-526a-11df-9d74-080069138b88" uid="22496"/>
-        <specific value="2" description="Super Fledermaus" uuid="00a60e3a-526a-11df-90ee-080069138b88" uid="22497"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="56" uuid="00a8ff50-526a-11df-a3bb-080069138b88" uid="22498">
-    <category value="0" description="Other" uuid="00aa0c56-526a-11df-a367-080069138b88" uid="22499"/>
-    <category value="3" description="RF Passive (intercept and DF)" uuid="00ab157e-526a-11df-8cae-080069138b88" uid="22500">
-      <subcategory value="16" description="Identification/Classification Radar" uuid="00ac26ee-526a-11df-9130-080069138b88" uid="22501">
-        <specific value="1" description="Ramona (Soft Ball)" uuid="00ad35f2-526a-11df-a2d6-080069138b88" uid="22502"/>
-        <specific value="2" description="Tamara (Trash Drum)" uuid="00ae43a2-526a-11df-90f9-080069138b88" uid="22503"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="45" uuid="00b13468-526a-11df-80bb-080069138b88" uid="22504">
-    <category value="0" description="Other" uuid="00b2429a-526a-11df-b42d-080069138b88" uid="22505"/>
-    <category value="2" description="RF Active" uuid="00b349d8-526a-11df-8c7e-080069138b88" uid="22506">
-      <subcategory value="1" description="Multi-function" uuid="00b45a9e-526a-11df-9693-080069138b88" uid="22507">
-        <specific value="1" description="Fixed" uuid="00b56aba-526a-11df-8984-080069138b88" uid="22508"/>
-        <specific value="2" description="Mobile" uuid="00b67bee-526a-11df-ad1c-080069138b88" uid="22509"/>
-      </subcategory>
-      <subcategory value="2" description="Early Warning / Surveillance Radar" uuid="00b82c28-526a-11df-a119-080069138b88" uid="22510">
-        <specific value="1" description="Cross Legs" uuid="00b93c6c-526a-11df-9fab-080069138b88" uid="22511"/>
-        <specific value="2" description="HN-503" uuid="00ba4dfa-526a-11df-9d07-080069138b88" uid="22512"/>
-        <specific value="3" description="JY-8" uuid="00bb5524-526a-11df-8464-080069138b88" uid="22513">
-          <extra value="1" description="JY-8A" uuid="00bc6216-526a-11df-94f6-080069138b88" uid="22514"/>
-        </specific>
-        <specific value="4" description="JY-9" uuid="00be11d8-526a-11df-9a9c-080069138b88" uid="22515"/>
-        <specific value="5" description="JY-14" uuid="00bf1f24-526a-11df-8b59-080069138b88" uid="22516"/>
-        <specific value="6" description="Nanjing B/C" uuid="00c0275c-526a-11df-a020-080069138b88" uid="22517">
-          <extra value="1" description="Nanjing B" uuid="00c13674-526a-11df-a4c7-080069138b88" uid="22518"/>
-          <extra value="2" description="Nanjing C" uuid="00c246fe-526a-11df-a302-080069138b88" uid="22519"/>
-        </specific>
-        <specific value="7" description="Pin Jib" uuid="00c3f6e8-526a-11df-b3ba-080069138b88" uid="22520"/>
-        <specific value="8" description="Slot Rest" uuid="00c4fdd6-526a-11df-b8c0-080069138b88" uid="22521"/>
-      </subcategory>
-      <subcategory value="4" description="Fire Control Radar" uuid="00c6adca-526a-11df-9408-080069138b88" uid="22522">
-        <specific value="1" description="Team Work" uuid="00c7bc74-526a-11df-ad9a-080069138b88" uid="22523"/>
-      </subcategory>
-      <subcategory value="5" description="Target Acquisition Radar" uuid="00c96b32-526a-11df-b682-080069138b88" uid="22524">
-        <specific value="1" description="Rice Pad" uuid="00ca78a6-526a-11df-98d0-080069138b88" uid="22525"/>
-      </subcategory>
-      <subcategory value="18" description="Surface-Search Radar" uuid="00cc2b10-526a-11df-a3ed-080069138b88" uid="22526">
-        <specific value="1" description="Cross Slot" uuid="00cd356e-526a-11df-8b01-080069138b88" uid="22527"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="119" uuid="00d024f4-526a-11df-8fd6-080069138b88" uid="22528">
-    <category value="0" description="Other" uuid="00d1324a-526a-11df-a148-080069138b88" uid="22529"/>
-    <category value="2" description="RF Active" uuid="00d23f5a-526a-11df-81fc-080069138b88" uid="22530">
-      <subcategory value="1" description="Multi-function" uuid="00d34d8c-526a-11df-ba89-080069138b88" uid="22531">
-        <specific value="1" description="Fixed" uuid="00d46456-526a-11df-8eca-080069138b88" uid="22532"/>
-        <specific value="2" description="Mobile" uuid="00d56df6-526a-11df-b947-080069138b88" uid="22533"/>
-      </subcategory>
-      <subcategory value="4" description="Fire Control Radar" uuid="00d720ec-526a-11df-bf68-080069138b88" uid="22534">
-        <specific value="1" description="Drum Tilt B" uuid="00d830fe-526a-11df-b1ed-080069138b88" uid="22535"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="106" uuid="00db2070-526a-11df-95d8-080069138b88" uid="22536">
-    <category value="0" description="Other" uuid="00dc2f88-526a-11df-8a5e-080069138b88" uid="22537"/>
-    <category value="2" description="RF Active" uuid="00dd3d24-526a-11df-97b0-080069138b88" uid="22538">
-      <subcategory value="1" description="Multi-function" uuid="00de4b1a-526a-11df-ab60-080069138b88" uid="22539">
-        <specific value="1" description="Fixed" uuid="00df59e2-526a-11df-bec4-080069138b88" uid="22540"/>
-      </subcategory>
-      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="00e10a76-526a-11df-b75e-080069138b88" uid="22541">
-        <specific value="1" description="Pluto" uuid="00e2183a-526a-11df-a01d-080069138b88" uid="22542"/>
-        <specific value="2" description="RAT-31S" uuid="00e32662-526a-11df-89e4-080069138b88" uid="22543"/>
-        <specific value="3" description="ATCR-33 (Selenia)" uuid="00e432d2-526a-11df-8210-080069138b88" uid="22544"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="205" uuid="00e720f0-526a-11df-bc7a-080069138b88" uid="22545">
-    <category value="0" description="Other" uuid="00e82e1e-526a-11df-a3ed-080069138b88" uid="22546"/>
-    <category value="2" description="RF Active" uuid="00e93e9e-526a-11df-adcb-080069138b88" uid="22547">
-      <subcategory value="5" description="Target Acquisition Radar" uuid="00ea4c8a-526a-11df-bf4c-080069138b88" uid="22548">
-        <specific value="1" description="Giraffe" uuid="00eb56b6-526a-11df-a9fa-080069138b88" uid="22549">
-          <extra value="1" description="Giraffe-40" uuid="00ec9fd0-526a-11df-9d15-080069138b88" uid="22550"/>
-          <extra value="2" description="Giraffe-50 AT" uuid="00edb622-526a-11df-9318-080069138b88" uid="22551"/>
-          <extra value="3" description="Giraffe-75" uuid="00eebfd6-526a-11df-88ee-080069138b88" uid="22552"/>
-        </specific>
-        <specific value="2" description="HARD (PS-91)" uuid="00f06c50-526a-11df-9cf4-080069138b88" uid="22553"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="13" uuid="00f3691e-526a-11df-b60e-080069138b88" uid="22554">
-    <category value="0" description="Other" uuid="00f47a8e-526a-11df-bf06-080069138b88" uid="22555"/>
-    <category value="11" description="Acoustic, passive" uuid="00f583de-526a-11df-8b90-080069138b88" uid="22556">
-      <subcategory value="77" description="Sonobuoy" uuid="00f6929c-526a-11df-bf51-080069138b88" uid="22557">
-        <specific value="1" description="AN/SSQ-801B Barra" uuid="00f7a02e-526a-11df-9e21-080069138b88" uid="22558"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="0" uuid="00fa8e38-526a-11df-a06f-080069138b88" uid="22559">
-    <category value="0" description="Other" uuid="00fb9ecc-526a-11df-b9af-080069138b88" uid="22560"/>
-    <category value="2" description="RF Active" uuid="00fcad08-526a-11df-ab6c-080069138b88" uid="22561">
-      <subcategory value="1" description="Multi-function" uuid="00fdb978-526a-11df-a047-080069138b88" uid="22562">
-        <specific value="1" description="Fixed" uuid="00fec638-526a-11df-8666-080069138b88" uid="22563"/>
-        <specific value="2" description="Mobile" uuid="00ffd49c-526a-11df-b402-080069138b88" uid="22564"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="0" uuid="0102c68e-526a-11df-936a-080069138b88" uid="22565">
-    <category value="10" description="Acoustic, active" uuid="0103d38a-526a-11df-82bc-080069138b88" uid="22566">
-      <subcategory value="64" description="Jamming noise" uuid="0104dd2a-526a-11df-9a3e-080069138b88" uid="22567"/>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="153" uuid="010730c0-526a-11df-95d1-080069138b88" uid="22568">
-    <category value="0" description="Other" uuid="0108375e-526a-11df-8bd3-080069138b88" uid="22569"/>
-    <category value="2" description="RF Active" uuid="010948b0-526a-11df-97b8-080069138b88" uid="22570">
-      <subcategory value="1" description="Multi-function" uuid="010a5638-526a-11df-8565-080069138b88" uid="22571">
-        <specific value="1" description="Fixed" uuid="010b5f7e-526a-11df-8acc-080069138b88" uid="22572"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="101" uuid="010e521a-526a-11df-a7ef-080069138b88" uid="22573">
-    <category value="0" description="Other" uuid="010f5eda-526a-11df-b644-080069138b88" uid="22574"/>
-    <category value="2" description="RF Active" uuid="01106c1c-526a-11df-9d1c-080069138b88" uid="22575">
-      <subcategory value="1" description="Multi-function" uuid="01118278-526a-11df-9bce-080069138b88" uid="22576">
-        <specific value="1" description="Fixed" uuid="011291d6-526a-11df-8a0a-080069138b88" uid="22577"/>
-        <specific value="2" description="Mobile" uuid="01139aae-526a-11df-a6d4-080069138b88" uid="22578"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="102" uuid="01168d18-526a-11df-8e9d-080069138b88" uid="22579">
-    <category value="0" description="Other" uuid="01179b72-526a-11df-af5f-080069138b88" uid="22580"/>
-    <category value="2" description="RF Active" uuid="0118a396-526a-11df-87e9-080069138b88" uid="22581">
-      <subcategory value="1" description="Multi-function" uuid="0119b66e-526a-11df-ba68-080069138b88" uid="22582">
-        <specific value="1" description="Fixed" uuid="011ac5d6-526a-11df-84cf-080069138b88" uid="22583"/>
-        <specific value="2" description="Mobile" uuid="011bce90-526a-11df-80fa-080069138b88" uid="22584"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="240" uuid="011ebf38-526a-11df-abf9-080069138b88" uid="22585">
-    <category value="0" description="Other" uuid="011fcd38-526a-11df-9c7c-080069138b88" uid="22586"/>
-    <category value="2" description="RF Active" uuid="0120d9b2-526a-11df-84b9-080069138b88" uid="22587">
-      <subcategory value="1" description="Multi-function" uuid="0121e762-526a-11df-8c70-080069138b88" uid="22588">
-        <specific value="1" description="Fixed" uuid="0122f562-526a-11df-bc37-080069138b88" uid="22589"/>
-        <specific value="2" description="Mobile" uuid="012400ec-526a-11df-b02f-080069138b88" uid="22590"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="1" country="110" uuid="0126ede8-526a-11df-b573-080069138b88" uid="22591">
-    <category value="2" description="RF Active" uuid="0127fdc8-526a-11df-9e55-080069138b88" uid="22592">
-      <subcategory value="2" description="Multi-function" uuid="012905c4-526a-11df-a270-080069138b88" uid="22593">
-        <specific value="1" description="FR-2855W" uuid="012a13c4-526a-11df-b750-080069138b88" uid="22594"/>
-      </subcategory>
-    </category>
-  </entity>
-  <entity kind="9" domain="4" country="39" uuid="012d0610-526a-11df-9384-080069138b88" uid="22595">
-    <category value="9" description="Thermal (temperature sensing)" uuid="012e1730-526a-11df-9250-080069138b88" uid="22596">
-      <subcategory value="78" description="Bathythermal Sensor" uuid="012f212a-526a-11df-b821-080069138b88" uid="22597">
-        <specific value="1" description="AN/SSQ-536B BTS (Bathythermograph Transmitting Set)" uuid="013039fc-526a-11df-8fff-080069138b88" uid="22598"/>
-      </subcategory>
-    </category>
-  </entity>
-</cet>
+<?xml version="1.0" encoding="utf-8"?>
+<cet uid="30" name="Comprehensive Entity Types">
+  <entity kind="1" domain="1" country="225" uuid="c55fe33c-5269-11df-9704-080069138b88" uid="10000">
+    <category value="0" description="Other" uuid="c560f038-5269-11df-80e7-080069138b88" uid="10001">
+      <subcategory value="1" description="Miscellaneous guns" uuid="c561feec-5269-11df-810f-080069138b88" uid="10002">
+        <specific value="1" description="M901 40-mm machine gun" uuid="c5630efe-5269-11df-b52e-080069138b88" uid="10003"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="c564265e-5269-11df-8d66-080069138b88" uid="10004"/>
+        <specific value="3" description="Liquid propellant guns" uuid="c565377e-5269-11df-a84a-080069138b88" uid="10005"/>
+        <specific value="4" description="Phalanx (Close-In Weapons Systems (CIWS) Mk15)" uuid="c56648e4-5269-11df-b01f-080069138b88" uid="10006"/>
+      </subcategory>
+      <subcategory value="2" description="Grenade launchers" uuid="c567fdce-5269-11df-98c6-080069138b88" uid="10007">
+        <specific value="1" description="Mk 19 40-mm" uuid="c5690624-5269-11df-ab99-080069138b88" uid="10008"/>
+        <specific value="2" description="Brunswick Multisalvo Smoke Grenade Launcher" uuid="c56a1668-5269-11df-86cb-080069138b88" uid="10009"/>
+        <specific value="3" description="Tracor Aerospace Advanced Smoke Launcher System" uuid="c56b2b34-5269-11df-b38e-080069138b88" uid="10010"/>
+      </subcategory>
+      <subcategory value="3" description="Other missile systems" uuid="c56cdc54-5269-11df-a974-080069138b88" uid="10011">
+        <specific value="1" description="McDonnell-Douglas Harpoon Coastal Defense System" uuid="c56de888-5269-11df-85b9-080069138b88" uid="10012"/>
+      </subcategory>
+      <subcategory value="4" description="Bridges" uuid="c56f9d40-5269-11df-8b3c-080069138b88" uid="10013">
+        <specific value="1" description="Trailer Launched Bridge (TLB)" uuid="c570ac08-5269-11df-9960-080069138b88" uid="10014"/>
+        <specific value="2" description="Mobile assault bridge" uuid="c571bc9c-5269-11df-8e81-080069138b88" uid="10015"/>
+        <specific value="3" description="M60 bridge" uuid="c572c934-5269-11df-83a9-080069138b88" uid="10016"/>
+      </subcategory>
+      <subcategory value="5" description="Command Post" uuid="c57476bc-5269-11df-b63c-080069138b88" uid="10017"/>
+      <subcategory value="7" description="Decontamination equipment" status="new" uuid="6c36cef6-04c0-4eee-97e0-945142140d9e" uid="22821">
+        <cr value="1767"/>
+        <specific value="1" description="M17 Lightweight Decontamination" status="new" uuid="3cb4faad-1ad8-4bbf-b4fa-623987aa2e24" uid="22822">
+          <cr value="1767"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="1" description="Tank" uuid="c5762778-5269-11df-a96f-080069138b88" uid="10018">
+      <subcategory value="1" description="M1 Abrams" uuid="c5773514-5269-11df-8c70-080069138b88" uid="10019">
+        <specific value="1" description="M1 Abrams" uuid="c578453a-5269-11df-8adc-080069138b88" uid="10020"/>
+        <specific value="2" description="M1A1 Abrams" uuid="c5795308-5269-11df-9659-080069138b88" uid="10021"/>
+        <specific value="3" description="M1A2" uuid="c57a668a-5269-11df-83c7-080069138b88" uid="10022"/>
+        <specific value="4" description="M1A1 w/ mine rollers" uuid="c57b73f4-5269-11df-b2a8-080069138b88" uid="10023"/>
+        <specific value="5" description="M1A1 w/ mine plows" uuid="c57c7f1a-5269-11df-89e0-080069138b88" uid="10024"/>
+        <specific value="6" description="M1A1 w/ DU armor" uuid="c57d9396-5269-11df-9d94-080069138b88" uid="10025"/>
+        <specific value="7" description="M1A2 w/ Combat Vehicle Command and Control (CVCC)" uuid="c57ea3d0-5269-11df-b170-080069138b88" uid="10026"/>
+        <specific value="8" description="M1A2 SEP" uuid="c57faeb0-5269-11df-ac46-080069138b88" uid="10027"/>
+        <specific value="9" description="M1A1D" uuid="c580bdbe-5269-11df-bee1-080069138b88" uid="10028"/>
+      </subcategory>
+      <subcategory value="2" description="M60 Main Battle Tank (MBT)" uuid="c582794c-5269-11df-97ad-080069138b88" uid="10029">
+        <specific value="1" description="M60A3" uuid="c5838a08-5269-11df-81b8-080069138b88" uid="10030"/>
+        <specific value="2" description="M60A1" uuid="c584924a-5269-11df-9714-080069138b88" uid="10031"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="c585a518-5269-11df-9d61-080069138b88" uid="10032"/>
+        <specific value="4" description="M60A1 with ERA" uuid="c586b638-5269-11df-b433-080069138b88" uid="10033"/>
+      </subcategory>
+      <subcategory value="3" description="M551 Sheridan light tank/reconnaissance vehicle" uuid="c588682a-5269-11df-90ec-080069138b88" uid="10034">
+        <specific value="1" description="M551A1" uuid="c5897256-5269-11df-b369-080069138b88" uid="10035"/>
+      </subcategory>
+      <subcategory value="4" description="M48 medium tank" uuid="c58b2358-5269-11df-a9eb-080069138b88" uid="10036">
+        <specific value="1" description="M48C" uuid="c58c3324-5269-11df-8c90-080069138b88" uid="10037"/>
+        <specific value="2" description="M48A1" uuid="c58d43cc-5269-11df-a3e9-080069138b88" uid="10038"/>
+        <specific value="3" description="M48A2" uuid="c58e4c40-5269-11df-99cc-080069138b88" uid="10039"/>
+        <specific value="4" description="M48A2C" uuid="c58f5c5c-5269-11df-8501-080069138b88" uid="10040"/>
+        <specific value="5" description="M48A3" uuid="c590707e-5269-11df-9e2c-080069138b88" uid="10041"/>
+        <specific value="6" description="M48A4" uuid="c59178ca-5269-11df-b471-080069138b88" uid="10042"/>
+        <specific value="7" description="M48A5" uuid="c592871a-5269-11df-91dc-080069138b88" uid="10043"/>
+        <specific value="8" description="M48H" uuid="c5939736-5269-11df-b74c-080069138b88" uid="10044"/>
+        <specific value="9" description="M48 AVLB" uuid="c594a1bc-5269-11df-b83f-080069138b88" uid="10045"/>
+        <specific value="10" description="M48 ARV" uuid="c595aff8-5269-11df-b965-080069138b88" uid="10046"/>
+        <specific value="11" description="M48 mine clearing vehicle" uuid="c596c370-5269-11df-9cb2-080069138b88" uid="10047"/>
+        <specific value="12" description="M48A2GA2" uuid="c597ce0a-5269-11df-864b-080069138b88" uid="10048"/>
+        <specific value="13" description="M48A5E" uuid="c598dbd8-5269-11df-92ca-080069138b88" uid="10049"/>
+      </subcategory>
+      <subcategory value="5" description="M47 medium tank" uuid="c59a8c94-5269-11df-a0d0-080069138b88" uid="10050">
+        <specific value="1" description="M47" uuid="c59b9b48-5269-11df-821a-080069138b88" uid="10051"/>
+        <specific value="2" description="M47M" uuid="c59ca452-5269-11df-bc33-080069138b88" uid="10052"/>
+        <specific value="3" description="GLS M47 ARV" uuid="c59db7e8-5269-11df-9fb2-080069138b88" uid="10053"/>
+      </subcategory>
+      <subcategory value="6" description="M41 light tank" uuid="c59f64da-5269-11df-8210-080069138b88" uid="10054">
+        <specific value="1" description="M41C" uuid="c5a07dca-5269-11df-8b40-080069138b88" uid="10055"/>
+        <specific value="2" description="M41E W/8V-71T Engine" uuid="c5a18c74-5269-11df-9740-080069138b88" uid="10056"/>
+        <specific value="3" description="QM41" uuid="c5a29cc2-5269-11df-b8f6-080069138b88" uid="10057"/>
+        <specific value="4" description="M41B" uuid="c5a3aa36-5269-11df-967f-080069138b88" uid="10058"/>
+        <specific value="5" description="(deprecated)" deprecated="1" uuid="c5a4e068-5269-11df-abaf-080069138b88" uid="10059"/>
+        <specific value="6" description="M41 German Tank Improvement (GTI)" uuid="c5a5f534-5269-11df-b0fa-080069138b88" uid="10060"/>
+      </subcategory>
+      <subcategory value="7" description="Cadillac Gage Commando Stingray light tank" uuid="c5a7a6fe-5269-11df-ae6f-080069138b88" uid="10061"/>
+      <subcategory value="8" description="FMC Close Combat Vehicle Light VFM 5 tank" uuid="c5a8b9e0-5269-11df-920e-080069138b88" uid="10062"/>
+      <subcategory value="9" description="AAI Rapid Deployment Force Light Tank (RDF/LT) Combined Arms Team/Lightweight Combat Vehicle (CAT/LCV)" uuid="c5a9d0f0-5269-11df-b679-080069138b88" uid="10063">
+        <specific value="1" description="Prototype" uuid="c5aadf40-5269-11df-b2b3-080069138b88" uid="10064"/>
+      </subcategory>
+      <subcategory value="10" description="Teledyne Continental Armored Gun System" uuid="c5ac8fc0-5269-11df-a4dd-080069138b88" uid="10065"/>
+      <subcategory value="11" description="FCS Mounted Combat System" uuid="c5ada536-5269-11df-8d29-080069138b88" uid="10066"/>
+    </category>
+    <category value="2" description="Armored fighting vehicle" uuid="c5af53f4-5269-11df-82cb-080069138b88" uid="10067">
+      <subcategory value="1" description="FMC M2/M3 Bradley" uuid="c5b0660e-5269-11df-8234-080069138b88" uid="10068">
+        <specific value="1" description="M2A2 Bradley Infantry Fighting Vehicle (IFV)" uuid="c5b1709e-5269-11df-b31b-080069138b88" uid="10069"/>
+        <specific value="2" description="M3A2 Bradley Cavalry Fighting Vehicle (CFV)" uuid="c5b28182-5269-11df-9872-080069138b88" uid="10070"/>
+        <specific value="3" description="FMC Bradley IFV" uuid="c5b3a1d4-5269-11df-b841-080069138b88" uid="10071"/>
+        <specific value="4" description="M2 Bradley IFV" uuid="c5b4b07e-5269-11df-a751-080069138b88" uid="10072"/>
+        <specific value="5" description="M2A1 Bradley IFV" uuid="c5b5c086-5269-11df-831e-080069138b88" uid="10073"/>
+        <specific value="6" description="M3 Bradley CFV" uuid="c5b6d1b0-5269-11df-b99f-080069138b88" uid="10074"/>
+        <specific value="7" description="M3A1 Bradley CFV" uuid="c5b7da38-5269-11df-991e-080069138b88" uid="10075"/>
+        <specific value="8" description="M7 BFIST" uuid="c5b8ecf2-5269-11df-b6bc-080069138b88" uid="10076"/>
+        <specific value="9" description="M2A3 Bradley IFV" uuid="c5b9fb56-5269-11df-b029-080069138b88" uid="10077"/>
+        <specific value="10" description="M3A3 Bradley CFV" uuid="c5bb05c8-5269-11df-b345-080069138b88" uid="10078"/>
+        <specific value="11" description="M2A2ODS Bradley IFV" uuid="c5bc17a6-5269-11df-897d-080069138b88" uid="10079"/>
+      </subcategory>
+      <subcategory value="3" description="FMC M113 Armored Personnel Carrier (APC)" uuid="c5bdc632-5269-11df-b819-080069138b88" uid="10080">
+        <specific value="1" description="M113A2" uuid="c5bed720-5269-11df-bd30-080069138b88" uid="10081"/>
+        <specific value="2" description="M113A3" uuid="c5bfed22-5269-11df-b53e-080069138b88" uid="10082"/>
+        <specific value="3" description="M113A3 w/ M105 trailer" uuid="c5c0fbea-5269-11df-98b2-080069138b88" uid="10083"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="c5c20cd8-5269-11df-8273-080069138b88" uid="10084"/>
+        <specific value="5" description="(deprecated)" deprecated="1" uuid="c5c31c54-5269-11df-b409-080069138b88" uid="10085"/>
+        <specific value="6" description="M113A1 Improved TOW Vehicle (ITV)" uuid="c5c42c5c-5269-11df-82a5-080069138b88" uid="10086"/>
+        <specific value="7" description="M113A1 TOW" uuid="c5c53bce-5269-11df-a0ab-080069138b88" uid="10087"/>
+        <specific value="8" description="M113A2 ITV" uuid="c5c6494c-5269-11df-a973-080069138b88" uid="10088"/>
+        <specific value="9" description="M113A2 TOW" uuid="c5c758b4-5269-11df-b2ef-080069138b88" uid="10089"/>
+        <specific value="10" description="M730 Chaparral Surface-to-Air Missile (SAM) launcher" uuid="c5c868a8-5269-11df-a8ff-080069138b88" uid="10090"/>
+        <specific value="11" description="M113" uuid="c5c97356-5269-11df-87a4-080069138b88" uid="10091"/>
+        <specific value="12" description="M113A1" uuid="c5ca82d2-5269-11df-8cc9-080069138b88" uid="10092"/>
+        <specific value="13" description="M113A1R" uuid="c5cb9622-5269-11df-bdb9-080069138b88" uid="10093"/>
+        <specific value="14" description="M113A2DR" uuid="c5cc9f4a-5269-11df-aca4-080069138b88" uid="10094"/>
+        <specific value="15" description="M113A2H" uuid="c5cdaeda-5269-11df-9dd1-080069138b88" uid="10095"/>
+        <specific value="16" description="M113A2IT" uuid="c5cec1ee-5269-11df-b50c-080069138b88" uid="10096"/>
+        <specific value="17" description="M113A2MK" uuid="c5cfcbb6-5269-11df-8a56-080069138b88" uid="10097"/>
+        <specific value="18" description="M113A2R" uuid="c5d0d902-5269-11df-92e3-080069138b88" uid="10098"/>
+        <specific value="19" description="M132/M132A1 Flamethrower" uuid="c5d1eacc-5269-11df-b60d-080069138b88" uid="10099"/>
+        <specific value="20" description="M667" uuid="c5d2f962-5269-11df-851b-080069138b88" uid="10100"/>
+        <specific value="21" description="(deprecated)" deprecated="1" uuid="c5d407e4-5269-11df-ad68-080069138b88" uid="10101"/>
+        <specific value="22" description="(deprecated)" deprecated="1" uuid="c5d51788-5269-11df-8432-080069138b88" uid="10102"/>
+        <specific value="23" description="M741" uuid="c5d625ce-5269-11df-a13d-080069138b88" uid="10103"/>
+        <specific value="24" description="M741A1" uuid="c5d73450-5269-11df-b1a4-080069138b88" uid="10104"/>
+        <specific value="25" description="M741A2" uuid="c5d84142-5269-11df-8cde-080069138b88" uid="10105"/>
+        <specific value="26" description="RTL" uuid="c5d94b28-5269-11df-8d3e-080069138b88" uid="10106"/>
+        <specific value="27" description="XM474" uuid="c5da5d10-5269-11df-a881-080069138b88" uid="10107"/>
+        <specific value="28" description="XM474E2" uuid="c5db6be2-5269-11df-b6c5-080069138b88" uid="10108"/>
+        <specific value="29" description="XM667E1" uuid="c5dc7410-5269-11df-be9c-080069138b88" uid="10109"/>
+        <specific value="30" description="XM727" uuid="c5dd8788-5269-11df-b4b9-080069138b88" uid="10110"/>
+        <specific value="31" description="(deprecated)" deprecated="1" uuid="c5dea028-5269-11df-8fa1-080069138b88" uid="10111"/>
+        <specific value="32" description="XM741" uuid="c5dfaacc-5269-11df-a0e7-080069138b88" uid="10112"/>
+        <specific value="33" description="XM806E1" uuid="c5e0b912-5269-11df-bfce-080069138b88" uid="10113"/>
+        <specific value="34" description="XM806E2" uuid="c5e1cb0e-5269-11df-9735-080069138b88" uid="10114"/>
+        <specific value="35" description="M58A3 Wolf Smoke" status="new" uuid="b96b4e70-d9ed-4f37-b291-aedd67a7bf64" uid="22857">
+          <cr value="2224"/>
+        </specific>
+      </subcategory>
+      <subcategory value="5" description="Light Armored Vehicle (LAV) TOW" uuid="c5e378a0-5269-11df-8c96-080069138b88" uid="10115">
+        <specific value="1" description="FIST" uuid="c5e4848e-5269-11df-88a3-080069138b88" uid="10116"/>
+        <specific value="2" description="MGS" uuid="c5e590c2-5269-11df-9cbe-080069138b88" uid="10117"/>
+        <specific value="3" description="ATGM" uuid="c5e6a46c-5269-11df-8c15-080069138b88" uid="10118"/>
+        <specific value="4" description="Ambulance" uuid="c5e7ae5c-5269-11df-a1c2-080069138b88" uid="10119"/>
+        <specific value="5" description="Medical Team" uuid="c5e8bbe4-5269-11df-911b-080069138b88" uid="10120"/>
+        <specific value="6" description="PROPHET" uuid="c5e9cbd8-5269-11df-9cf9-080069138b88" uid="10121"/>
+        <specific value="7" description="REMBASS/GSR" uuid="c5ead848-5269-11df-a59b-080069138b88" uid="10122"/>
+        <specific value="8" description="NBC" uuid="c5ebef26-5269-11df-93d8-080069138b88" uid="10123"/>
+        <specific value="9" description="155SP HOW" uuid="c5ecf7c2-5269-11df-8201-080069138b88" uid="10124"/>
+        <specific value="10" description="Plow" uuid="c5ee061c-5269-11df-b383-080069138b88" uid="10125"/>
+        <specific value="11" description="Roller" uuid="c5ef167e-5269-11df-b828-080069138b88" uid="10126"/>
+        <specific value="12" description="Wrecker" uuid="c5f02960-5269-11df-bfdc-080069138b88" uid="10127"/>
+        <specific value="13" description="Logistics" uuid="c5f131de-5269-11df-9c3e-080069138b88" uid="10128"/>
+        <specific value="14" description="Reconnaissance Vehicle" uuid="c5f2410a-5269-11df-a24b-080069138b88" uid="10129"/>
+        <specific value="15" description="Command and Control TOC Vehicle" uuid="c5f354e6-5269-11df-86cd-080069138b88" uid="10130"/>
+        <specific value="16" description="Mortar Carrier" uuid="c5f46016-5269-11df-90a1-080069138b88" uid="10131"/>
+        <specific value="17" description="Striker/Fire Support Team Vehicle" uuid="c5f56f1a-5269-11df-8d52-080069138b88" uid="10132"/>
+        <specific value="18" description="Stryker Personnel Carrier w/MK 19 mod 3 40-mm grenade launcher" uuid="c5f6815c-5269-11df-9df4-080069138b88" uid="10133"/>
+        <specific value="19" description="Stryker Personnel Carrier w/M2 .50 cal heavy machine gun" uuid="c5f792b8-5269-11df-b568-080069138b88" uid="10134"/>
+        <specific value="20" description="Stryker Personnel Carrier w/MK 240 7.62 mm machine gun" uuid="c5f8a57c-5269-11df-a32c-080069138b88" uid="10135"/>
+        <specific value="21" description="Stryker Personnel Carrier w/automatic cannon" uuid="c5f9b796-5269-11df-9056-080069138b88" uid="10136"/>
+        <specific value="22" description="Stryker Mobile Gun System w/M68A1E4 105-mm cannon; MK 240 7.62 mm co-axial machine gun; and M2 .50 cal heavy machine gun" uuid="c5faca6e-5269-11df-bc37-080069138b88" uid="10137"/>
+        <specific value="23" description="Stryker Reconnaissance Vehicle w/MK 240 7.62-mm machine gun" uuid="c5fbe598-5269-11df-ad5b-080069138b88" uid="10138"/>
+        <specific value="24" description="Stryker Mortar Carrier w/120-mm mortar" uuid="c5fd0216-5269-11df-ba7f-080069138b88" uid="10139"/>
+        <specific value="25" description="Stryker Mortar Carrier w/81-mm mortar" uuid="c5fe0e0e-5269-11df-bf57-080069138b88" uid="10140"/>
+        <specific value="26" description="Stryker Mortar Carrier w/60-mm mortar" uuid="c5ff2154-5269-11df-b4eb-080069138b88" uid="10141"/>
+        <specific value="27" description="Stryker Command Vehicle w/MK 240 7.62-mm machine gun" uuid="c60054fc-5269-11df-8d80-080069138b88" uid="10142"/>
+        <specific value="28" description="Stryker Fire Support w/ MK 240 7.62-mm machine gun" uuid="c6016824-5269-11df-a34a-080069138b88" uid="10143"/>
+        <specific value="29" description="Stryker Engineer w/MK 240 7.62-mm machine gun" uuid="c6027dea-5269-11df-ad87-080069138b88" uid="10144"/>
+        <specific value="30" description="Stryker Ambulance" uuid="c60394c8-5269-11df-9513-080069138b88" uid="10145"/>
+        <specific value="31" description="Stryker Anti-tank Guided Missile" uuid="c604a502-5269-11df-bfbc-080069138b88" uid="10146"/>
+        <specific value="32" description="Stryker NBC Reconnaissance w/240 7.62-mm machine gun" uuid="c605b276-5269-11df-bfb9-080069138b88" uid="10147"/>
+        <specific value="33" description="LAV-Assault Gun (LAV-AG)" status="new" uuid="94b1162c-df7a-47f8-b747-ecb25cd4e0b3" uid="22858">
+          <cr value="2225"/>
+        </specific>
+      </subcategory>
+      <subcategory value="6" description="FMC Armored IFV" uuid="c60764e0-5269-11df-b145-080069138b88" uid="10148">
+        <specific value="1" description="YPR 765 PRI" uuid="c6087678-5269-11df-87b4-080069138b88" uid="10149"/>
+        <specific value="2" description="YPR 765 PRCO-B command vehicle" uuid="c6098676-5269-11df-ae84-080069138b88" uid="10150"/>
+        <specific value="3" description="YPR 765 PRCO-C1 to C5" uuid="c60a9444-5269-11df-a547-080069138b88" uid="10151"/>
+        <specific value="4" description="YPR 765 PRRDR radar vehicle" uuid="c60ba852-5269-11df-bf29-080069138b88" uid="10152"/>
+        <specific value="5" description="YPR 765 PRRDR-C radar/command vehicle" uuid="c60cb896-5269-11df-a15a-080069138b88" uid="10153"/>
+        <specific value="6" description="YPR 765 PRGWT ambulance" uuid="c60dc3ee-5269-11df-967c-080069138b88" uid="10154"/>
+        <specific value="7" description="YPR 765 PRI/I" uuid="c60ed7c0-5269-11df-92a1-080069138b88" uid="10155"/>
+        <specific value="8" description="YPR 765 PRMR mortar tractor" uuid="c60fe700-5269-11df-97b6-080069138b88" uid="10156"/>
+        <specific value="9" description="YPR 765 PRVR-A cargo vehicle" uuid="c610f046-5269-11df-b4bc-080069138b88" uid="10157"/>
+        <specific value="10" description="YPR 765 PRVR-B cargo vehicle" uuid="c61203d2-5269-11df-9687-080069138b88" uid="10158"/>
+        <specific value="11" description="YPR 765 PRAT" uuid="c61318a8-5269-11df-9161-080069138b88" uid="10159"/>
+      </subcategory>
+      <subcategory value="7" description="FMC Lynx (or M113) Command and Reconnaissance Vehicle" uuid="c614c734-5269-11df-95df-080069138b88" uid="10160"/>
+      <subcategory value="8" description="M981 FIST-V" uuid="c615d354-5269-11df-be0b-080069138b88" uid="10161"/>
+      <subcategory value="9" description="M106 mortar carrier" uuid="c616e6fe-5269-11df-ba95-080069138b88" uid="10162">
+        <specific value="1" description="M106 107-mm" uuid="c617f6de-5269-11df-b673-080069138b88" uid="10163"/>
+        <specific value="2" description="M106A1 107-mm" uuid="c6190010-5269-11df-bcd3-080069138b88" uid="10164"/>
+        <specific value="3" description="M106A2 107-mm" uuid="c61a1162-5269-11df-b060-080069138b88" uid="10165"/>
+        <specific value="4" description="M1064 120-mm" uuid="c61b2b9c-5269-11df-bbf9-080069138b88" uid="10166"/>
+        <specific value="5" description="M1064A2" status="new" uuid="4ffbc4d2-3e94-4cf3-b7bb-1702354b2d3b" uid="22859">
+          <cr value="2225"/>
+        </specific>
+        <specific value="6" description="M1064A3" status="new" uuid="db72c0ca-3bee-4b84-bb29-0a2a9eb63c2b" uid="22860">
+          <cr value="2225"/>
+        </specific>
+      </subcategory>
+      <subcategory value="10" description="Electronics &amp; Space Corp M901 ITV" uuid="c61ce0ae-5269-11df-b28f-080069138b88" uid="10167">
+        <specific value="1" description="M901" uuid="c61deb3e-5269-11df-b5fd-080069138b88" uid="10168"/>
+        <specific value="2" description="M901A1" uuid="c61ef984-5269-11df-b001-080069138b88" uid="10169"/>
+        <specific value="3" description="M901A3" status="new" uuid="ab52c7a5-9025-459e-8b7a-cb5fed1b3a38" uid="22861">
+          <cr value="2225"/>
+        </specific>
+      </subcategory>
+      <subcategory value="11" description="M125 81-mm mortar carrier" uuid="c620ac20-5269-11df-b61b-080069138b88" uid="10170">
+        <specific value="1" description="M125A1" uuid="c621bb92-5269-11df-a393-080069138b88" uid="10171"/>
+        <specific value="2" description="M125A2" uuid="c622c69a-5269-11df-b05b-080069138b88" uid="10172"/>
+      </subcategory>
+      <subcategory value="12" description="Cadillac Gage V-600 Armored Car" uuid="c62477c4-5269-11df-8fbe-080069138b88" uid="10173"/>
+      <subcategory value="13" description="Cadillac Gage LAV Assault Gun LAV-105" uuid="c62589ac-5269-11df-911e-080069138b88" uid="10174"/>
+      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="c6269bd0-5269-11df-b06f-080069138b88" uid="10175"/>
+      <subcategory value="15" description="LAV-105" uuid="c627a71e-5269-11df-b076-080069138b88" uid="10176"/>
+      <subcategory value="16" description="Chrysler MAC-1 armored car" uuid="c628b776-5269-11df-a740-080069138b88" uid="10177"/>
+      <subcategory value="17" description="Cadillac Gage Commando Scout" uuid="c629cd5a-5269-11df-8701-080069138b88" uid="10178"/>
+      <subcategory value="18" description="Cadillac Gage Commando V-300" uuid="c62ad894-5269-11df-b4ca-080069138b88" uid="10179">
+        <specific value="1" description="V-300 w/ TOW" uuid="c62be9a0-5269-11df-909c-080069138b88" uid="10180"/>
+        <specific value="2" description="V-300 w/ 81-mm mortar" uuid="c62cf93a-5269-11df-ae7e-080069138b88" uid="10181"/>
+        <specific value="3" description="V-300 ambulance" uuid="c62e080c-5269-11df-8935-080069138b88" uid="10182"/>
+      </subcategory>
+      <subcategory value="19" description="Cadillac Gage Commando V-150" uuid="c62fb7ba-5269-11df-8193-080069138b88" uid="10183">
+        <specific value="1" description="Commando w/ MG turret" uuid="c630c830-5269-11df-8fe1-080069138b88" uid="10184"/>
+        <specific value="2" description="Commando w/ 1-m MG turret" uuid="c631d928-5269-11df-a0ef-080069138b88" uid="10185"/>
+        <specific value="3" description="Commando w/ 1-m 20-mm turret" uuid="c632e804-5269-11df-92ae-080069138b88" uid="10186"/>
+        <specific value="4" description="Commando w/ 20-mm turret" uuid="c633f816-5269-11df-9753-080069138b88" uid="10187"/>
+        <specific value="5" description="Commando w/ 25-mm turret" uuid="c63506e8-5269-11df-97ca-080069138b88" uid="10188"/>
+        <specific value="6" description="Commando w/ 40-mm/12.7-mm turret" uuid="c636122c-5269-11df-bc46-080069138b88" uid="10189"/>
+        <specific value="7" description="Commando V-150 S" uuid="c637266c-5269-11df-a714-080069138b88" uid="10190"/>
+        <specific value="8" description="Commando air defense vehicle" uuid="c6383610-5269-11df-87d6-080069138b88" uid="10191"/>
+        <specific value="9" description="Commando with 76-mm turret-mounted gun" uuid="c639414a-5269-11df-9c0f-080069138b88" uid="10192"/>
+        <specific value="10" description="Commando with 90-mm turret-mounted gun" uuid="c63a6034-5269-11df-899c-080069138b88" uid="10193"/>
+        <specific value="11" description="Commando with 81-mm mortar" uuid="c63b71cc-5269-11df-b2bc-080069138b88" uid="10194"/>
+        <specific value="12" description="Commando with TOW" uuid="c63c827e-5269-11df-b95b-080069138b88" uid="10195"/>
+        <specific value="13" description="Commando command vehicle" uuid="c63d8c96-5269-11df-848c-080069138b88" uid="10196"/>
+        <specific value="14" description="Base security vehicle" uuid="c63ea13a-5269-11df-a1d1-080069138b88" uid="10197"/>
+        <specific value="15" description="Malaysian upgraded V-150 Commando" uuid="c63fb20a-5269-11df-b72a-080069138b88" uid="10198"/>
+      </subcategory>
+      <subcategory value="20" description="AV Technology Corporation Dragoon" uuid="c641660e-5269-11df-965c-080069138b88" uid="10199">
+        <specific value="1" description="APC" uuid="c642709e-5269-11df-b183-080069138b88" uid="10200"/>
+        <specific value="2" description="ASV-XC extended cab" uuid="c643807e-5269-11df-8db9-080069138b88" uid="10201"/>
+        <specific value="3" description="Dragoon Armored Command Vehicle (ACV)" uuid="c6449144-5269-11df-9bdf-080069138b88" uid="10202"/>
+        <specific value="4" description="Dragoon Armored Mortar Carrier (AMC)" uuid="c645a05c-5269-11df-9752-080069138b88" uid="10203"/>
+        <specific value="5" description="Dragoon TOW Carrier" uuid="c646af74-5269-11df-b6b5-080069138b88" uid="10204"/>
+      </subcategory>
+      <subcategory value="21" description="Half-track APCs" uuid="c6485edc-5269-11df-af6f-080069138b88" uid="10205"/>
+      <subcategory value="22" description="Cadillac Gage Commando Ranger APC" uuid="c64971be-5269-11df-8a7e-080069138b88" uid="10206"/>
+      <subcategory value="23" description="Vehicle Sys Development Corp Lancer Armored Patrol Vehicle (APV)" uuid="c64a82ca-5269-11df-8892-080069138b88" uid="10207"/>
+      <subcategory value="24" description="AAI Propulsion System Demonstrator Amphibious Assault Vehicle (AAV)" uuid="c64b962e-5269-11df-a867-080069138b88" uid="10208"/>
+      <subcategory value="25" description="Advanced AAV" uuid="c64cb6b2-5269-11df-8424-080069138b88" uid="10209"/>
+      <subcategory value="26" description="FMC AAV7A1 (LVTP7A1)" uuid="c64dc4e4-5269-11df-b151-080069138b88" uid="10210">
+        <specific value="1" description="AAVC7A1 command vehicle" uuid="c64ed4ec-5269-11df-98a9-080069138b88" uid="10211"/>
+        <specific value="2" description="AAVR7A1 recovery vehicle" uuid="c64fe652-5269-11df-b757-080069138b88" uid="10212"/>
+        <specific value="3" description="AAV7A1 with mine plow" uuid="c650f114-5269-11df-89c9-080069138b88" uid="10213"/>
+        <specific value="4" description="AAV7A1 with VEMASID" uuid="c652031a-5269-11df-befc-080069138b88" uid="10214"/>
+        <specific value="5" description="AAV7A1 with mine-clearance-system kit" uuid="c65318b8-5269-11df-be48-080069138b88" uid="10215"/>
+        <specific value="6" description="AAVP7A1" uuid="c6542320-5269-11df-a40d-080069138b88" uid="10216"/>
+      </subcategory>
+      <subcategory value="27" description="LVTP5A1 Armored AAV" uuid="c655d15c-5269-11df-978d-080069138b88" uid="10217">
+        <specific value="1" description="LVTC5 (Command, Model 5)" uuid="c656e1e6-5269-11df-a3ea-080069138b88" uid="10218"/>
+        <specific value="2" description="LVTE1 (Engineer, Model 1)" uuid="c657f5f4-5269-11df-b001-080069138b88" uid="10219"/>
+        <specific value="3" description="LVTH6 (Howitzer, Model 6)" uuid="c659099e-5269-11df-affd-080069138b88" uid="10220"/>
+        <specific value="4" description="LVTR1 (Recovery, Model 1)" uuid="c65a1b40-5269-11df-a638-080069138b88" uid="10221"/>
+      </subcategory>
+      <subcategory value="28" description="Composite Armored Vehicle (CAV)" uuid="c65bf460-5269-11df-90dc-080069138b88" uid="10222"/>
+      <subcategory value="29" description="(deprecated)" deprecated="1" uuid="c65d0b98-5269-11df-94f9-080069138b88" uid="10223"/>
+      <subcategory value="30" description="M93 Armored Reconnaissance Vehicle" uuid="c65e22bc-5269-11df-a659-080069138b88" uid="10224">
+        <specific value="1" description="M93A1 Fox" status="new" uuid="902e2505-ac5d-475a-b050-15c661f82401" uid="22862">
+          <cr value="2225"/>
+        </specific>
+      </subcategory>
+      <subcategory value="31" description="M1117 Armored Security Vehicle" uuid="c65f2fa4-5269-11df-a8f6-080069138b88" uid="10225"/>
+      <subcategory value="32" description="FCS Infantry Combat Vehicle" uuid="c6604010-5269-11df-b214-080069138b88" uid="10226"/>
+      <subcategory value="33" description="FCS Armed Robotic Vehicle - RSTA" uuid="c6615360-5269-11df-8be2-080069138b88" uid="10227"/>
+      <subcategory value="34" description="FCS Armed Robotic Vehicle - Assault" uuid="c66263c2-5269-11df-b00a-080069138b88" uid="10228"/>
+      <subcategory value="35" description="FCS Armed Robotic Vehicle - Light" uuid="c66374b0-5269-11df-aeeb-080069138b88" uid="10229"/>
+      <subcategory value="36" description="FCS Recon and Surveillance Vehicle" uuid="c6648724-5269-11df-aa9c-080069138b88" uid="10230"/>
+      <subcategory value="37" description="FCS Command &amp; Control Vehicle" uuid="c6659498-5269-11df-b762-080069138b88" uid="10231"/>
+      <subcategory value="38" description="FCS Medical Vehicle - Evacuation" uuid="c666a9aa-5269-11df-893e-080069138b88" uid="10232"/>
+    </category>
+    <category value="3" description="Armored utility vehicle" uuid="c6685bd8-5269-11df-aab8-080069138b88" uid="10233">
+      <subcategory value="1" description="M88 medium recovery vehicle" uuid="c669699c-5269-11df-b976-080069138b88" uid="10234">
+        <specific value="1" description="M88A1" uuid="c66a7774-5269-11df-ac6b-080069138b88" uid="10235"/>
+        <specific value="2" description="M88A2" uuid="c66b8538-5269-11df-9b15-080069138b88" uid="10236"/>
+        <specific value="3" description="M88A1E1" uuid="c66c92d4-5269-11df-894c-080069138b88" uid="10237"/>
+      </subcategory>
+      <subcategory value="2" description="M578 light armored recovery vehicle" uuid="c66e44f8-5269-11df-9c99-080069138b88" uid="10238"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="c66f5136-5269-11df-8024-080069138b88" uid="10239"/>
+      <subcategory value="4" description="AVLB" uuid="c6706256-5269-11df-9269-080069138b88" uid="10240">
+        <specific value="1" description="M1 AVLB bridge layer" uuid="c671743e-5269-11df-bb15-080069138b88" uid="10241"/>
+        <specific value="2" description="M60 AVLB" uuid="c6727e56-5269-11df-b7de-080069138b88" uid="10242"/>
+        <specific value="3" description="M48 AVLB" uuid="c6738d6e-5269-11df-a2bc-080069138b88" uid="10243"/>
+        <specific value="4" description="M60 AVLB w/o bridge" uuid="c6749d94-5269-11df-bbdf-080069138b88" uid="10244"/>
+        <specific value="5" description="M104 Wolverine" uuid="c675a644-5269-11df-a073-080069138b88" uid="10245"/>
+      </subcategory>
+      <subcategory value="5" description="M728 combat engineer vehicle" uuid="c6776114-5269-11df-b468-080069138b88" uid="10246"/>
+      <subcategory value="6" description="M9 armored combat earthmover" uuid="c6787446-5269-11df-8f30-080069138b88" uid="10247"/>
+      <subcategory value="7" description="Cadillac Gage Commando V-150 Recovery Vehicle" uuid="c67988b8-5269-11df-acb7-080069138b88" uid="10248"/>
+      <subcategory value="8" description="AV Technology Corporation Dragoon" uuid="c67a9c94-5269-11df-a4b2-080069138b88" uid="10249">
+        <specific value="1" description="Armored Logistics Support Vehicle (ALSV)" uuid="c67bb4da-5269-11df-bebd-080069138b88" uid="10250"/>
+      </subcategory>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="c67d6c08-5269-11df-bcfd-080069138b88" uid="10251"/>
+      <subcategory value="10" description="M113/M113A1/M113A2 bulldozer" uuid="c67e7e36-5269-11df-9e38-080069138b88" uid="10252"/>
+      <subcategory value="11" description="M577/M577A1/M577A2 command post" uuid="c67f8aba-5269-11df-8cb6-080069138b88" uid="10253">
+        <specific value="1" description="M577 Command Post (MLRS Bn CP)" uuid="c6809afe-5269-11df-909b-080069138b88" uid="10254"/>
+        <specific value="2" description="M577 Command Post (MLRS Btry CP)" uuid="c681affc-5269-11df-8b70-080069138b88" uid="10255"/>
+        <specific value="3" description="M577A2 FDC" status="new" uuid="fd57c53c-1ebf-41fc-b2b7-7d3a08bfddca" uid="22863">
+          <cr value="2227"/>
+        </specific>
+        <specific value="4" description="M577A3" status="new" uuid="b6e305f7-b6fb-4904-9e77-eb83eb1605f6" uid="22864">
+          <cr value="2227"/>
+        </specific>
+      </subcategory>
+      <subcategory value="12" description="Stretched M577A2E2 command post" uuid="c6836176-5269-11df-a758-080069138b88" uid="10256"/>
+      <subcategory value="13" description="M1068" uuid="c6846ea4-5269-11df-94ff-080069138b88" uid="10257" status="new">
+        <cr value="2227"/>
+        <specific value="1" description="M1068A3 SICPS" status="new" uuid="76f14bc0-e647-460e-930b-4e160ad9a9b7" uid="22865">
+          <cr value="2227"/>
+        </specific>
+      </subcategory>
+      <subcategory value="14" description="FMC (M113) APC ambulance" uuid="c6857efc-5269-11df-8c5f-080069138b88" uid="10258"/>
+      <subcategory value="15" description="M113A2 recovery vehicle" uuid="c68693be-5269-11df-a266-080069138b88" uid="10259"/>
+      <subcategory value="16" description="Abrams Recovery Vehicle" uuid="c687a1d2-5269-11df-aeeb-080069138b88" uid="10260"/>
+      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="c688b27a-5269-11df-9495-080069138b88" uid="10261"/>
+      <subcategory value="18" description="Fitter's vehicle" uuid="c689c44e-5269-11df-aea2-080069138b88" uid="10262"/>
+      <subcategory value="19" description="Armored Maintenance Vehicle (AMV)" uuid="c68ad3fc-5269-11df-9f28-080069138b88" uid="10263"/>
+      <subcategory value="20" description="M1059 smoke-generating system" uuid="c68be5bc-5269-11df-98a2-080069138b88" uid="10264"/>
+      <subcategory value="21" description="Armored Bulldozer, D7 MCAP" uuid="c68cf70e-5269-11df-b92d-080069138b88" uid="10265"/>
+      <subcategory value="22" description="Armored Bulldozer, D9R" uuid="c68e025c-5269-11df-8042-080069138b88" uid="10266"/>
+      <subcategory value="23" description="Armored Obstacle Breacher, Grizzly" uuid="c68f14d0-5269-11df-bacc-080069138b88" uid="10267"/>
+      <subcategory value="24" description="Deployable Universal Combat Earthmover (DEUCE)" uuid="c6902b68-5269-11df-8b87-080069138b88" uid="10268"/>
+      <subcategory value="25" description="FCS Recovery and Maintenance Vehicle" uuid="c6913792-5269-11df-9637-080069138b88" uid="10269"/>
+    </category>
+    <category value="4" description="Self-propelled artillery" uuid="c692e70e-5269-11df-8e8a-080069138b88" uid="10270">
+      <subcategory value="1" description="M270 Multiple Launch Rocket System (MLRS)" uuid="c693f928-5269-11df-b1df-080069138b88" uid="10271">
+        <specific value="1" description="ATACMS" uuid="c6950ebc-5269-11df-9fde-080069138b88" uid="10272"/>
+      </subcategory>
+      <subcategory value="2" description="M110 203-mm (8-inch) SP Howitzer" uuid="c696c824-5269-11df-b550-080069138b88" uid="10273">
+        <specific value="1" description="M110" uuid="c697d250-5269-11df-86b9-080069138b88" uid="10274"/>
+        <specific value="2" description="M110A2" uuid="c698e2da-5269-11df-8bd7-080069138b88" uid="10275"/>
+      </subcategory>
+      <subcategory value="3" description="M109 155-mm SP Howitzer" uuid="c69a942c-5269-11df-8cd4-080069138b88" uid="10276">
+        <specific value="1" description="M109" uuid="c69ba3d0-5269-11df-b750-080069138b88" uid="10277"/>
+        <specific value="2" description="M109A1" uuid="c69cabd6-5269-11df-815d-080069138b88" uid="10278"/>
+        <specific value="3" description="M109A2" uuid="c69dbc88-5269-11df-8b3f-080069138b88" uid="10279"/>
+        <specific value="4" description="M109A3" uuid="c69ed000-5269-11df-87ec-080069138b88" uid="10280"/>
+        <specific value="5" description="M109A4" uuid="c69fd7e8-5269-11df-ad21-080069138b88" uid="10281"/>
+        <specific value="6" description="M109A5" uuid="c6a0e69c-5269-11df-9184-080069138b88" uid="10282"/>
+        <specific value="7" description="M109A6" uuid="c6a1f65e-5269-11df-9e57-080069138b88" uid="10283"/>
+        <specific value="8" description="M109L" uuid="c6a30080-5269-11df-9860-080069138b88" uid="10284"/>
+      </subcategory>
+      <subcategory value="4" description="Ground Launched Cruise Missile (GLCM) launcher" deprecated="1" uuid="c6a4b326-5269-11df-9128-080069138b88" uid="10285"/>
+      <subcategory value="5" description="M163 Vulcan Anti aircraft gun" deprecated="1" uuid="c6a5c662-5269-11df-aa4c-080069138b88" uid="10286"/>
+      <subcategory value="6" description="M107-175 mm gun" uuid="c6a6da7a-5269-11df-a51c-080069138b88" uid="10287"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="c6a7e6a4-5269-11df-ad8d-080069138b88" uid="10288"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="c6a8f5da-5269-11df-9af6-080069138b88" uid="10289"/>
+      <subcategory value="9" description="155-mm SP Howitzer XM2001 Crusader" uuid="c6aa0b8c-5269-11df-bd10-080069138b88" uid="10290"/>
+      <subcategory value="10" description="Liquid-propellant Artillery System" uuid="c6ab1a04-5269-11df-afc4-080069138b88" uid="10291"/>
+      <subcategory value="11" description="M42 twin 40-mm SP anti-aircraft gun" deprecated="1" uuid="c6ac2cf0-5269-11df-80f2-080069138b88" uid="10292"/>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="c6ad4356-5269-11df-9aec-080069138b88" uid="10293"/>
+      <subcategory value="13" description="General Electric Vulcan-Commando 20-mm SP Air Defense (AD) system" deprecated="1" uuid="c6ae503e-5269-11df-87c5-080069138b88" uid="10294"/>
+      <subcategory value="14" description="Boeing Avenger pedestal-mounted Stinger SP AD System" deprecated="1" uuid="c6af65f0-5269-11df-b65a-080069138b88" uid="10295"/>
+      <subcategory value="15" description="Raytheon/Loral Aeronutronic Saber AD missile system" deprecated="1" uuid="c6b07d1e-5269-11df-bb59-080069138b88" uid="10296"/>
+      <subcategory value="16" description="LTV Crossbow pedestal-mounted weapon system" deprecated="1" uuid="c6b18d94-5269-11df-9ce4-080069138b88" uid="10297"/>
+      <subcategory value="17" description="Fiber Optic Guided Missile (FOG-M)" uuid="c6b29fcc-5269-11df-a858-080069138b88" uid="10298"/>
+      <subcategory value="18" description="Loral Aeronutronic M48 Chaparral" deprecated="1" uuid="c6b3b290-5269-11df-b578-080069138b88" uid="10299">
+        <specific value="1" description="M48" deprecated="1" uuid="c6b4cb62-5269-11df-9707-080069138b88" uid="10300"/>
+        <specific value="2" description="M48A1" deprecated="1" uuid="c6b5dc14-5269-11df-9e58-080069138b88" uid="10301"/>
+        <specific value="3" description="M48A2" deprecated="1" uuid="c6b6ed16-5269-11df-bbf7-080069138b88" uid="10302"/>
+        <specific value="4" description="M48A3" deprecated="1" uuid="c6b820e6-5269-11df-a5d9-080069138b88" uid="10303"/>
+      </subcategory>
+      <subcategory value="19" description="Block VII Low-Altitude SAM System" deprecated="1" uuid="c6b9dbb6-5269-11df-a7b3-080069138b88" uid="10304"/>
+      <subcategory value="20" description="Loral Aeronutronic SAM System" deprecated="1" uuid="c6baea6a-5269-11df-bdae-080069138b88" uid="10305"/>
+      <subcategory value="21" description="Electronic &amp; Space Corp Ground-Launched Hellfire: Heavy (GLH:H)" uuid="c6bc01f2-5269-11df-9e48-080069138b88" uid="10306"/>
+      <subcategory value="22" description="Line-of-Sight Anti-Tank (LOSAT)" uuid="c6bd14de-5269-11df-bfa8-080069138b88" uid="10307"/>
+      <subcategory value="23" description="RGM-84 Harpoon Launcher" uuid="c6be2112-5269-11df-8205-080069138b88" uid="10308"/>
+      <subcategory value="24" description="HIMARS" uuid="c6bf34d0-5269-11df-9d2e-080069138b88" uid="10309"/>
+      <subcategory value="25" description="FCS NLOS - Cannon" uuid="c6c04410-5269-11df-8139-080069138b88" uid="10310"/>
+      <subcategory value="26" description="FCS NLOS - Mortar" uuid="c6c14e00-5269-11df-bdd3-080069138b88" uid="10311"/>
+    </category>
+    <category value="5" description="Towed artillery" uuid="c6c300ec-5269-11df-98bb-080069138b88" uid="10312">
+      <subcategory value="1" description="M114 155-mm Howitzer" uuid="c6c40ff0-5269-11df-8d8b-080069138b88" uid="10313"/>
+      <subcategory value="2" description="M198 155-mm towed Howitzer" uuid="c6c52066-5269-11df-b867-080069138b88" uid="10314"/>
+      <subcategory value="3" description="M101 105-mm Howitzer" uuid="c6c62c36-5269-11df-9753-080069138b88" uid="10315">
+        <specific value="1" description="M101" uuid="c6c73db0-5269-11df-b9a5-080069138b88" uid="10316"/>
+        <specific value="2" description="M101A1" uuid="c6c850d8-5269-11df-9a2d-080069138b88" uid="10317"/>
+      </subcategory>
+      <subcategory value="4" description="M119 105-mm light Howitzer" uuid="c6ca005e-5269-11df-b41b-080069138b88" uid="10318"/>
+      <subcategory value="5" description="M115 8-inch Howitzer" uuid="c6cb0b52-5269-11df-a258-080069138b88" uid="10319"/>
+      <subcategory value="6" description="XM777 155-mm Lightweight Towed Howitzer" uuid="c6cc1e02-5269-11df-a0be-080069138b88" uid="10320"/>
+      <subcategory value="7" description="M59 155-mm gun" uuid="c6cd33be-5269-11df-9bfb-080069138b88" uid="10321"/>
+      <subcategory value="8" description="M102 105-mm Howitzer" uuid="c6ce3dfe-5269-11df-8536-080069138b88" uid="10322"/>
+      <subcategory value="9" description="M1 40-mm Automatic Anti aircraft gun" deprecated="1" uuid="c6cf4e56-5269-11df-ac04-080069138b88" uid="10323"/>
+      <subcategory value="10" description="M167 20-mm Vulcan Anti aircraft gun" deprecated="1" uuid="c6d0630e-5269-11df-a71f-080069138b88" uid="10324"/>
+      <subcategory value="11" description="M55 12.7-mm (Quad) Anti aircraft MG" deprecated="1" uuid="c6d17550-5269-11df-b6b5-080069138b88" uid="10325"/>
+      <subcategory value="12" description="MIM 23 Raytheon Hawk Low-to-Medium Altitude SAM System" deprecated="1" uuid="c6d2895e-5269-11df-b770-080069138b88" uid="10326">
+        <specific value="1" description="Battalion" deprecated="1" uuid="c6d3a3a2-5269-11df-8b3a-080069138b88" uid="10327">
+          <extra value="1" description="Hawk BN/ADCP" deprecated="1" uuid="c6d4b12a-5269-11df-af38-080069138b88" uid="10328"/>
+        </specific>
+        <specific value="2" description="Battery" deprecated="1" uuid="c6d665b0-5269-11df-9845-080069138b88" uid="10329">
+          <extra value="1" description="Hawk BCP" deprecated="1" uuid="c6d77540-5269-11df-be63-080069138b88" uid="10330"/>
+          <extra value="2" description="Hawk CWAR" deprecated="1" uuid="c6d884bc-5269-11df-9b83-080069138b88" uid="10331"/>
+          <extra value="3" description="Hawk HPI" deprecated="1" uuid="c6d9938e-5269-11df-b3ec-080069138b88" uid="10332"/>
+          <extra value="4" description="Hawk Lehr" deprecated="1" uuid="c6daa3fa-5269-11df-a3f1-080069138b88" uid="10333"/>
+        </specific>
+      </subcategory>
+      <subcategory value="13" description="MIM 104 Raytheon Patriot High-to-Medium Altitude Air Defense (HIMAD) System" deprecated="1" uuid="c6dcf614-5269-11df-96a6-080069138b88" uid="10334">
+        <specific value="1" description="Patriot Command Center" deprecated="1" uuid="c6de0c8e-5269-11df-80f4-080069138b88" uid="10335">
+          <extra value="1" description="Patriot ICC" deprecated="1" uuid="c6df1d86-5269-11df-bb9c-080069138b88" uid="10336"/>
+          <extra value="2" description="Patriot BTOC" deprecated="1" uuid="c6e02d7a-5269-11df-af4b-080069138b88" uid="10337"/>
+        </specific>
+        <specific value="2" description="Patriot Battery" deprecated="1" uuid="c6e1e084-5269-11df-9de6-080069138b88" uid="10338">
+          <extra value="1" description="Patriot ECS" deprecated="1" uuid="c6e2eaec-5269-11df-9953-080069138b88" uid="10339"/>
+          <extra value="2" description="Patriot LS" deprecated="1" uuid="c6e3fb76-5269-11df-bd33-080069138b88" uid="10340"/>
+        </specific>
+      </subcategory>
+      <subcategory value="14" description="MIM 14B Nike Hercules SAM System" deprecated="1" uuid="c6e65db2-5269-11df-9cef-080069138b88" uid="10341"/>
+      <subcategory value="15" description="M993 70-mm Rapid Deployment Multiple Launch Rocket System (MLRS)" uuid="c6e771ca-5269-11df-861c-080069138b88" uid="10342"/>
+      <subcategory value="16" description="Theatre-High Altitude Area Defense(THAAD) System" deprecated="1" uuid="c6e88a2e-5269-11df-bb96-080069138b88" uid="10343">
+        <specific value="1" description="THAAD Battery TOC" deprecated="1" uuid="c6e99cfc-5269-11df-99e2-080069138b88" uid="10344"/>
+        <specific value="2" description="THAAD Radar" deprecated="1" uuid="c6eaa926-5269-11df-b2b8-080069138b88" uid="10345"/>
+        <specific value="3" description="THAAD Launcher" deprecated="1" uuid="c6ebbdca-5269-11df-8d5f-080069138b88" uid="10346"/>
+      </subcategory>
+      <subcategory value="17" description="FCS NLOS-LS-Launcher" uuid="c6ed6e54-5269-11df-aaf8-080069138b88" uid="10347"/>
+    </category>
+    <category value="6" description="Small wheeled utility vehicle" uuid="c6ef1cfe-5269-11df-a8da-080069138b88" uid="10348">
+      <subcategory value="1" description="LTV HMMWV M998-series multipurpose wheeled vehicles" uuid="c6f031ca-5269-11df-a8dd-080069138b88" uid="10349">
+        <specific value="1" description="M998 cargo/troop carrier without winch" uuid="c6f13e9e-5269-11df-aa1c-080069138b88" uid="10350"/>
+        <specific value="2" description="M1038 cargo/troop carrier with winch" uuid="c6f258ba-5269-11df-8268-080069138b88" uid="10351"/>
+        <specific value="3" description="M966 TOW missile carrier, basic armor, without winch" uuid="c6f36f0c-5269-11df-9ef0-080069138b88" uid="10352"/>
+        <specific value="4" description="M1036 TOW missile carrier, basic armor, with winch" uuid="c6f47cb2-5269-11df-a515-080069138b88" uid="10353"/>
+        <specific value="5" description="M1045 TOW missile carrier, supplemental armor, without winch" uuid="c6f59246-5269-11df-abcd-080069138b88" uid="10354"/>
+        <specific value="6" description="M1046 TOW missile carrier, supplemental armor, with winch" uuid="c6f6a8de-5269-11df-8441-080069138b88" uid="10355"/>
+        <specific value="7" description="M1025 armament carrier, basic armor, without winch" uuid="c6f7b666-5269-11df-8e2f-080069138b88" uid="10356"/>
+        <specific value="8" description="M1026 armament carrier, basic armor, with winch" uuid="c6f8ca7e-5269-11df-8d1d-080069138b88" uid="10357">
+          <extra value="1" description="M1026 CROWS" status="new" uuid="0a2d8594-8fb4-4584-a70c-3bf9434e6b0d" uid="22866">
+            <cr value="2230"/>
+          </extra>
+        </specific>
+        <specific value="9" description="M1043 armament carrier, supplemental armor, without winch" uuid="c6f9df68-5269-11df-8ec3-080069138b88" uid="10358"/>
+        <specific value="10" description="M1044 armament carrier, supplemental armor, with winch" uuid="c6faf164-5269-11df-85f8-080069138b88" uid="10359"/>
+        <specific value="11" description="M996 mini-ambulance, 2-litter, basic armor" uuid="c6fc03ce-5269-11df-b043-080069138b88" uid="10360"/>
+        <specific value="12" description="M997 maxi-ambulance, 4-litter, basic armor" uuid="c6fd1638-5269-11df-96d0-080069138b88" uid="10361"/>
+        <specific value="13" description="M1035 soft-top ambulance, 2-litter" uuid="c6fe271c-5269-11df-9504-080069138b88" uid="10362"/>
+        <specific value="14" description="M1037 S-250 shelter carrier, without winch" uuid="c6ff3846-5269-11df-909a-080069138b88" uid="10363"/>
+        <specific value="15" description="M1042 S-250 shelter carrier, with winch" uuid="c7004a2e-5269-11df-be83-080069138b88" uid="10364"/>
+        <specific value="16" description="M1069 tractor for M119 105-mm light gun" uuid="c7015540-5269-11df-acb6-080069138b88" uid="10365"/>
+        <specific value="17" description="M1025 Armament carrier, basic armor w/o winch, w/MK 19 40-mm grenade launcher" uuid="c7026d0e-5269-11df-bfdc-080069138b88" uid="10366"/>
+        <specific value="18" description="M1025 Armament carrier, basic armor w/o winch, w/M2 .50 cal heavy machine gun" uuid="c70386ee-5269-11df-99bb-080069138b88" uid="10367"/>
+        <specific value="19" description="M1025 armament carrier, basic armor w/o winch, w/M-60 7.62 mm medium machine gun" uuid="c7049746-5269-11df-a902-080069138b88" uid="10368"/>
+        <specific value="20" description="M707 Striker" uuid="c705ab18-5269-11df-bfaa-080069138b88" uid="10369"/>
+        <specific value="21" description="M1114 armament carrier, armored" uuid="c706bc60-5269-11df-af0b-080069138b88" uid="10370">
+          <extra value="1" description="M1114 w/ M240" status="new" uuid="6292f633-f553-4f76-adae-832f7daaf3c3" uid="22867">
+            <cr value="2230"/>
+          </extra>
+          <extra value="2" description="M1114 w/ .50 Cal" status="new" uuid="41d32f04-e2d4-4871-86e7-b5bafd5d634a" uid="22868">
+            <cr value="2230"/>
+          </extra>
+        </specific>
+        <specific value="22" description="HMMWV w/M56 Coyote Smoke Generator" uuid="c707cb82-5269-11df-9586-080069138b88" uid="10371"/>
+        <specific value="23" description="HMMWV w/M31 Biological Integrated Detection System (BIDS)" uuid="c708dd92-5269-11df-81da-080069138b88" uid="10372"/>
+        <specific value="24" description="HMMWV w/M157 Smoke Generator" uuid="c709eeda-5269-11df-947f-080069138b88" uid="10373"/>
+        <specific value="31" description="M997A2 Ambulance" status="new" uuid="b05fec3b-e0d4-4bee-85da-b12ba3f0bf60" uid="22869">
+          <cr value="2230"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="Warrior NMC-40 Long-range Fast Attack Vehicle (FAV)" uuid="c70ba5a4-5269-11df-a24b-080069138b88" uid="10374"/>
+      <subcategory value="3" description="Chenowith FAV/Light Strike Vehicle (LSV)" uuid="c70cb264-5269-11df-85d7-080069138b88" uid="10375"/>
+      <subcategory value="4" description="M58/M59 Mine-clearing charge (MICLIC) (towed)" uuid="c70dc3f2-5269-11df-ba05-080069138b88" uid="10376">
+        <specific value="1" description="M58A3 w/rocket" uuid="c70ed4fe-5269-11df-9c81-080069138b88" uid="10377"/>
+        <specific value="2" description="M58A4" uuid="c70fe268-5269-11df-9104-080069138b88" uid="10378"/>
+        <specific value="3" description="M59" uuid="c710f8d8-5269-11df-91f0-080069138b88" uid="10379"/>
+        <specific value="4" description="M58A3 w/o rocket" uuid="c7120a84-5269-11df-9287-080069138b88" uid="10380"/>
+      </subcategory>
+      <subcategory value="5" description="Teledyne 4x4 725-kg light forces vehicle" uuid="c713e49e-5269-11df-89b1-080069138b88" uid="10381"/>
+      <subcategory value="6" description="TPC 4x4 909-kg Rapid Multi-purpose Vehicle (RAMP-V)" uuid="c714f852-5269-11df-9184-080069138b88" uid="10382"/>
+      <subcategory value="7" description="M151 4x4 362-kg light vehicle and variants" uuid="c71606ca-5269-11df-a119-080069138b88" uid="10383"/>
+      <subcategory value="8" description="Jeep 4x4 light vehicle" uuid="c7171cf4-5269-11df-bbaa-080069138b88" uid="10384"/>
+      <subcategory value="9" description="Jeep XJ 4x4 light truck/wagon series" uuid="c7182df6-5269-11df-b9e3-080069138b88" uid="10385"/>
+      <subcategory value="10" description="M38-series 4x4 363-kg light vehicle (CJ-3A)" uuid="c71939d0-5269-11df-98af-080069138b88" uid="10386"/>
+      <subcategory value="11" description="Cargo truck and variants: 4x4, 680-kg" uuid="c71a5108-5269-11df-af0c-080069138b88" uid="10387">
+        <specific value="1" description="M37" uuid="c71b625a-5269-11df-9fed-080069138b88" uid="10388"/>
+        <specific value="2" description="M42" uuid="c71c6aa6-5269-11df-aad4-080069138b88" uid="10389"/>
+        <specific value="3" description="M43" uuid="c71d784c-5269-11df-abda-080069138b88" uid="10390"/>
+        <specific value="4" description="M201" uuid="c71e899e-5269-11df-b6f4-080069138b88" uid="10391"/>
+      </subcategory>
+      <subcategory value="12" description="Stewart &amp; Stevenson Services Inc. SS-200 6x6 multi-purpose light vehicle" uuid="c72039a6-5269-11df-8d0b-080069138b88" uid="10392"/>
+      <subcategory value="13" description="Commercial Utility Cargo Vehicle (CUCV)" uuid="c7214a6c-5269-11df-beba-080069138b88" uid="10393"/>
+      <subcategory value="14" description="M1008, truck, cargo, tactical 1-1/4 ton, 4x4" uuid="c7225b78-5269-11df-95a4-080069138b88" uid="10394"/>
+      <subcategory value="15" description="M1009, truck, utility, tactical 3/4 ton, 4x4" uuid="c7237468-5269-11df-813f-080069138b88" uid="10395"/>
+      <subcategory value="16" description="M1010, truck, ambulance, tactical 1-1/4 ton, 4x4" uuid="c72482c2-5269-11df-b44b-080069138b88" uid="10396"/>
+      <subcategory value="17" description="M1031, truck, chassis, tactical 1-1/4 ton, 4x4" uuid="c72596c6-5269-11df-867d-080069138b88" uid="10397"/>
+      <subcategory value="18" description="M1028, truck, cargo, shelter carrier, tactical 1-1/4" uuid="c726ac82-5269-11df-b03d-080069138b88" uid="10398"/>
+      <subcategory value="19" description="M715 4x4 1-1/4 ton truck, AM715-series 4x4 1-1/4 ton cargo trucks" uuid="c727ba8c-5269-11df-98c9-080069138b88" uid="10399"/>
+      <subcategory value="20" description="Jeep AM 720 4x4 1135-kg light truck" uuid="c728cfa8-5269-11df-bb1a-080069138b88" uid="10400"/>
+      <subcategory value="21" description="M880 4x4 1133 kg" uuid="c729e1f4-5269-11df-b6bf-080069138b88" uid="10401"/>
+      <subcategory value="22" description="M890 4x2 1133 kg" uuid="c72aebda-5269-11df-8b4d-080069138b88" uid="10402"/>
+      <subcategory value="23" description="Tractor, aircraft towing" uuid="c72c0088-5269-11df-b977-080069138b88" uid="10403">
+        <specific value="1" description="A/S32A-31" uuid="c72d1086-5269-11df-b79d-080069138b88" uid="10404"/>
+      </subcategory>
+      <subcategory value="24" description="Ordnance Trailer" uuid="c72ebfda-5269-11df-8e75-080069138b88" uid="10405"/>
+      <subcategory value="25" description="Motorcycle" uuid="c72fd226-5269-11df-947e-080069138b88" uid="10406">
+        <specific value="1" description="M1030B1 Motorcycle" uuid="c730e706-5269-11df-bde3-080069138b88" uid="10407"/>
+        <specific value="2" description="Motorcycle Trail Kawasaki KLR 250" status="new" uuid="6c6eb6d1-8190-484d-971d-0949b5429e7e" uid="22870">
+          <cr value="2230"/>
+        </specific>
+      </subcategory>
+      <subcategory value="26" description="All Terrain Vehicle" uuid="c73296f0-5269-11df-b292-080069138b88" uid="10408">
+        <specific value="1" description="ATV 4X4" uuid="c733a928-5269-11df-8af5-080069138b88" uid="10409"/>
+        <specific value="2" description="ATV 6X6" uuid="c734b26e-5269-11df-a7e1-080069138b88" uid="10410">
+          <extra value="1" description="Military Gator (basic)" uuid="c735c5fa-5269-11df-b8ee-080069138b88" uid="10411"/>
+          <extra value="2" description="Military Gator First Response Expeditionary" uuid="c736d616-5269-11df-8f14-080069138b88" uid="10412"/>
+        </specific>
+        <specific value="3" description="ATV 6X4" status="new" uuid="3b0ea861-a796-479c-9a45-97777aebcdf6" uid="22871">
+          <cr value="2230"/>
+          <extra value="1" description="M-Gator A1" status="new" uuid="c8fdabd1-cdfe-445b-9860-df1c01c37dd6" uid="22872">
+            <cr value="2230"/>
+          </extra>
+        </specific>
+      </subcategory>
+      <subcategory value="27" description="FCS MULE" uuid="c739268c-5269-11df-a462-080069138b88" uid="10413">
+        <specific value="1" description="FCS MULE Retransmission" uuid="c73a37fc-5269-11df-a734-080069138b88" uid="10414"/>
+        <specific value="2" description="FCS MULE Countermine" uuid="c73b4340-5269-11df-a2ee-080069138b88" uid="10415"/>
+        <specific value="3" description="FCS MULE Transport" uuid="c73c546a-5269-11df-872c-080069138b88" uid="10416"/>
+      </subcategory>
+      <subcategory value="28" description="FCS Small Unattended Ground Vehicle" uuid="c73e07c4-5269-11df-8f61-080069138b88" uid="10417"/>
+    </category>
+    <category value="7" description="Large wheeled utility vehicle" uuid="c73fb704-5269-11df-9d62-080069138b88" uid="10418">
+      <subcategory value="1" description="M35/M44A2 6x6 2-1/2 ton cargo truck series" uuid="c740cb12-5269-11df-beaf-080069138b88" uid="10419">
+        <specific value="1" description="M34: cargo truck with an unladen weight of 5332 kg, chassis designated M44" uuid="c741d8e0-5269-11df-93e9-080069138b88" uid="10420"/>
+        <specific value="2" description="M47: dump truck with an unladen weight of 6100 kg, chassis designated M57" uuid="c742ee1a-5269-11df-87d4-080069138b88" uid="10421"/>
+        <specific value="3" description="Truck, maintenance: earth-boring machine and pole setter V18A/MTQ, chassis M44" uuid="c74403d6-5269-11df-8a61-080069138b88" uid="10422"/>
+        <specific value="4" description="Truck, maintenance: telephone construction and maintenance V17A/MTQ, chassis M44." uuid="c74515e6-5269-11df-ac5c-080069138b88" uid="10423"/>
+        <specific value="5" description="M35 truck: basic M45 chassis" uuid="c7462a94-5269-11df-8d28-080069138b88" uid="10424"/>
+        <specific value="6" description="M35A2" uuid="c7473b96-5269-11df-9d33-080069138b88" uid="10425"/>
+        <specific value="7" description="M35A2C" uuid="c7484752-5269-11df-a0bb-080069138b88" uid="10426"/>
+        <specific value="8" description="M36" uuid="c74956f6-5269-11df-b13e-080069138b88" uid="10427"/>
+        <specific value="9" description="M36A2" uuid="c74a6686-5269-11df-afaf-080069138b88" uid="10428"/>
+        <specific value="10" description="M48: tractor truck" uuid="c74b71e8-5269-11df-92c2-080069138b88" uid="10429"/>
+        <specific value="11" description="M49: fuel tanker" uuid="c74c8042-5269-11df-96f3-080069138b88" uid="10430"/>
+        <specific value="12" description="M49A2C" uuid="c74d9400-5269-11df-84b4-080069138b88" uid="10431"/>
+      </subcategory>
+      <subcategory value="2" description="M816, truck, wrecker, 5-ton, 6x6" uuid="c74f4c3c-5269-11df-bfa5-080069138b88" uid="10432"/>
+      <subcategory value="3" description="M819, tractor, wrecker, 5-ton, 6x6" uuid="c7505bb8-5269-11df-8efd-080069138b88" uid="10433"/>
+      <subcategory value="4" description="M817 engineer dump truck" uuid="c7516e36-5269-11df-9db4-080069138b88" uid="10434"/>
+      <subcategory value="5" description="M939 6X6 5-ton cargo truck" uuid="c75281fe-5269-11df-9a93-080069138b88" uid="10435">
+        <specific value="1" description="M923 - Truck, 5-ton, 6x6, Cargo dropside" uuid="c753913e-5269-11df-9632-080069138b88" uid="10436"/>
+        <specific value="2" description="M923A1 - Version with single rear wheels" uuid="c754a2e0-5269-11df-bb50-080069138b88" uid="10437"/>
+        <specific value="3" description="M923A2 - Version with CTIS" uuid="c755b2f2-5269-11df-8714-080069138b88" uid="10438"/>
+        <specific value="4" description="M932A2 [Guntruck] - Modified version for convoy defence" uuid="c756c340-5269-11df-8edd-080069138b88" uid="10439"/>
+        <specific value="5" description="M923A3 - Version with brake modifications" uuid="c757d546-5269-11df-b71e-080069138b88" uid="10440"/>
+        <specific value="6" description="M924 - Truck, 5-ton, 6x6, LWB, Cargo w/o winch" uuid="c758e792-5269-11df-b531-080069138b88" uid="10441"/>
+        <specific value="7" description="M925 - Truck, 5-ton, 6x6, Cargo dropside w/winch" uuid="c759f394-5269-11df-937f-080069138b88" uid="10442"/>
+        <specific value="8" description="M925A1 - Version with single rear wheels" uuid="c75b08ec-5269-11df-868e-080069138b88" uid="10443"/>
+        <specific value="9" description="M925A2 - Version with CTIS" uuid="c75c1ab6-5269-11df-a94d-080069138b88" uid="10444"/>
+        <specific value="10" description="M926 - Truck, 5-ton, 6x6, cargo, lwb, w/winch, w/e" uuid="c75d26c2-5269-11df-8905-080069138b88" uid="10445"/>
+        <specific value="11" description="M927 - Truck, 5-ton, 6x6, Cargo, XLWB w/o winch" uuid="c75e3ada-5269-11df-9782-080069138b88" uid="10446"/>
+        <specific value="12" description="M927 [Winch Equipped] - Truck, 5-ton, 6x6, Cargo, XLWB w/winch" uuid="c75f4d1c-5269-11df-8a70-080069138b88" uid="10447"/>
+        <specific value="13" description="M928 - Truck, 5-ton, 6x6, Cargo, XLWB w/winch" uuid="c7605b1c-5269-11df-9e0b-080069138b88" uid="10448"/>
+        <specific value="14" description="M929 - Truck, 5-ton, 6x6, Dump w/o winch" uuid="c7616e44-5269-11df-b405-080069138b88" uid="10449"/>
+        <specific value="15" description="M929A2 - Version with CTIS plate on front hubs" uuid="c762809a-5269-11df-bbb3-080069138b88" uid="10450"/>
+        <specific value="16" description="M930 - Truck, 5-ton, 6x6, Dump w/winch" uuid="c763912e-5269-11df-ad86-080069138b88" uid="10451"/>
+        <specific value="17" description="M931 - Truck, 5-ton, 6x6, Tractor w/o winch" uuid="c764a29e-5269-11df-99ca-080069138b88" uid="10452"/>
+        <specific value="18" description="M931A1 - Version with single rear wheels" uuid="c765c110-5269-11df-83a9-080069138b88" uid="10453"/>
+        <specific value="19" description="M932 - Truck, 5-ton, 6x6, Tractor w/winch" uuid="c766cca4-5269-11df-aebc-080069138b88" uid="10454"/>
+        <specific value="20" description="M933 - Truck, 5-ton, 6x6, Tractor-wrecker w/winch" uuid="c767e2f6-5269-11df-b19c-080069138b88" uid="10455"/>
+        <specific value="21" description="M934 - Truck, 5-ton, 6x6, Van, expandable w/winch" uuid="c768f5b0-5269-11df-9cfa-080069138b88" uid="10456"/>
+        <specific value="22" description="M935 - Truck, 5-ton, 6x6, Van, expandable w/o winch" uuid="c76a0374-5269-11df-bd5f-080069138b88" uid="10457"/>
+        <specific value="23" description="M936 - Truck, 5-ton, 6x6, Wrecker, medium w/winch" uuid="c76b1a02-5269-11df-9880-080069138b88" uid="10458"/>
+        <specific value="24" description="M939 - Truck, 5-ton, 6x6, chassis, w/e" uuid="c76c2c12-5269-11df-9584-080069138b88" uid="10459"/>
+        <specific value="25" description="M939 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c76d4250-5269-11df-baf4-080069138b88" uid="10460"/>
+        <specific value="26" description="M940 - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c76e5be0-5269-11df-a7fd-080069138b88" uid="10461"/>
+        <specific value="27" description="M941 - Truck, 5-ton, 6x6, chassis, w/e" uuid="c76f924e-5269-11df-9156-080069138b88" uid="10462"/>
+        <specific value="28" description="M941 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c770a238-5269-11df-bfad-080069138b88" uid="10463"/>
+        <specific value="29" description="M942 Truck, 5-ton, 6x6, chassis, w/e" uuid="c771b6a0-5269-11df-a4b7-080069138b88" uid="10464"/>
+        <specific value="30" description="M942 [Winch Equipped] - Truck, 5-ton, 6x6, chassis, w/winch, w/e" uuid="c772cd42-5269-11df-9c26-080069138b88" uid="10465"/>
+        <specific value="31" description="M944 - Truck, 5-ton, 6x6, chassis" uuid="c773db06-5269-11df-851b-080069138b88" uid="10466"/>
+        <specific value="32" description="OE-MRC PATRIOT Antenna Mast Group (AMG) on M942 chassis" uuid="c774ecda-5269-11df-a7b6-080069138b88" uid="10467"/>
+      </subcategory>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="c776a340-5269-11df-b2e9-080069138b88" uid="10468"/>
+      <subcategory value="7" description="M543, truck, wrecker: medium, 5-ton, 6x6" uuid="c777b4ba-5269-11df-851d-080069138b88" uid="10469"/>
+      <subcategory value="8" description="M915 series of 5-ton trucks" uuid="c778c292-5269-11df-b412-080069138b88" uid="10470">
+        <specific value="1" description="Cargo" uuid="c779d66e-5269-11df-9233-080069138b88" uid="10471"/>
+        <specific value="2" description="w/ FS pods" uuid="c77ae4a0-5269-11df-b650-080069138b88" uid="10472"/>
+        <specific value="3" description="w/ shelter" uuid="c77bee72-5269-11df-8cbc-080069138b88" uid="10473"/>
+        <specific value="4" description="M915, tractor, truck, 14-ton, 6x4" uuid="c77d0262-5269-11df-9242-080069138b88" uid="10474"/>
+        <specific value="5" description="M915A1, tractor, truck, 14-ton, 6x4" uuid="c77e13dc-5269-11df-83ff-080069138b88" uid="10475"/>
+        <specific value="6" description="M915 (Eng Loader)" uuid="c77f1dd6-5269-11df-b4c9-080069138b88" uid="10476"/>
+      </subcategory>
+      <subcategory value="9" description="LTV Hummer cab-over 4x4 2268-kg cargo truck" uuid="c780d270-5269-11df-8d4f-080069138b88" uid="10477"/>
+      <subcategory value="10" description="Freightliner All-Terrain Tow Vehicle (ATTV)" uuid="c781e5ca-5269-11df-a503-080069138b88" uid="10478">
+        <specific value="1" description="Kamaz-4310 with generator set" uuid="c782f74e-5269-11df-8183-080069138b88" uid="10479"/>
+      </subcategory>
+      <subcategory value="11" description="Stewart &amp; Stevenson SS-300 8x8 2268-kg All-Terrain Vehicle" uuid="c784a8f0-5269-11df-9379-080069138b88" uid="10480"/>
+      <subcategory value="12" description="Stewart &amp; Stevenson Family of Medium Tactical Vehicles (FMTV)" uuid="c785bb5a-5269-11df-8a5a-080069138b88" uid="10481">
+        <specific value="1" description="M1078 Truck, Cargo; LMTV w/ Equip" uuid="c786ce64-5269-11df-b725-080069138b88" uid="10482"/>
+        <specific value="2" description="M1078 Truck, Cargo; LMTV w/ Equip, w/ Winch" uuid="c787e060-5269-11df-80cf-080069138b88" uid="10483"/>
+        <specific value="3" description="M1079 Truck, Van; LMTV w/ Equip" uuid="c788eb5e-5269-11df-bb27-080069138b88" uid="10484"/>
+        <specific value="4" description="M1079 Truck, Van; LMTV w/ Equip, w/ Winch" uuid="c78a0138-5269-11df-a4ce-080069138b88" uid="10485"/>
+        <specific value="5" description="M1080 Truck, Chassis; LMTV w/ Equip" uuid="c78b13e8-5269-11df-b785-080069138b88" uid="10486"/>
+        <specific value="6" description="M1081 Truck, Cargo; LMTV, LAPES/AD, w/ Equip" uuid="c78c2922-5269-11df-af18-080069138b88" uid="10487"/>
+        <specific value="7" description="M1082 Trailer; LMTV" uuid="c78d3f60-5269-11df-bab7-080069138b88" uid="10488"/>
+        <specific value="8" description="M1083 Truck, Cargo; MTV w/ Equip" uuid="c78e508a-5269-11df-a9a3-080069138b88" uid="10489"/>
+        <specific value="9" description="M1083 Truck, Cargo; MTV w/ Equip, w/ winch" uuid="c78f5d90-5269-11df-92c6-080069138b88" uid="10490"/>
+        <specific value="10" description="M1084 Truck, Cargo; w/ MHE w/ Equip" uuid="c7907112-5269-11df-af04-080069138b88" uid="10491"/>
+        <specific value="11" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip" uuid="c791832c-5269-11df-9037-080069138b88" uid="10492"/>
+        <specific value="12" description="M1085 Truck, Cargo; MTV, LWB, w/ Equip, w/ Winch" uuid="c79293fc-5269-11df-ae4f-080069138b88" uid="10493"/>
+        <specific value="13" description="M1086 Truck, Cargo; MTV, LWB, w/MHE, w/ Equip" uuid="c793a72e-5269-11df-b1e6-080069138b88" uid="10494"/>
+        <specific value="14" description="M1087 Truck, Van; MTV, Expansible" uuid="c794bd62-5269-11df-93b5-080069138b88" uid="10495"/>
+        <specific value="15" description="M1088 Truck, Tractor; MTV, w/ Equip" uuid="c795c7fc-5269-11df-b771-080069138b88" uid="10496"/>
+        <specific value="16" description="M1088 Truck, Tractor; MTV, w/ Equip, w/ Winch" uuid="c796da70-5269-11df-a2a3-080069138b88" uid="10497"/>
+        <specific value="17" description="M1089 Truck, Wrecker; MTV, w/ Equip, w/ Winch" uuid="c797ed98-5269-11df-9d18-080069138b88" uid="10498"/>
+        <specific value="18" description="M1090 Truck, Dump; MTV w/ Equip" uuid="c798fd8c-5269-11df-a622-080069138b88" uid="10499"/>
+        <specific value="19" description="M1090 Truck, Dump; MTV w/ Equip, w/ Winch" uuid="c79a0d44-5269-11df-93db-080069138b88" uid="10500"/>
+        <specific value="20" description="M1091 Truck, Tanker; MTV w/ Equip, w/ Winch" uuid="c79b1ee6-5269-11df-9617-080069138b88" uid="10501"/>
+        <specific value="21" description="M1092 Truck, Chassis; MTV w/ Equip" uuid="c79c2ed0-5269-11df-95d5-080069138b88" uid="10502"/>
+        <specific value="22" description="M1093 Truck, Cargo; MTV, LAPES/AD, w/ Equip" uuid="c79d4004-5269-11df-9756-080069138b88" uid="10503"/>
+        <specific value="23" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip, w/ Winch" uuid="c79e5106-5269-11df-a731-080069138b88" uid="10504"/>
+        <specific value="24" description="M1094 Truck, Dump; MTV, LAPES/AD, w/ Equip" uuid="c79f5f56-5269-11df-8b11-080069138b88" uid="10505"/>
+        <specific value="25" description="M1095 Trailer, MTV" uuid="c7a075bc-5269-11df-b7d6-080069138b88" uid="10506"/>
+        <specific value="26" description="M1096 Truck, Chassis; MTV, LWB, w/ Equip" uuid="c7a18614-5269-11df-ba3f-080069138b88" uid="10507"/>
+        <specific value="27" description="M1083 Truck, Cargo; MTV, w/ Equip, w/ Volcano" uuid="c7a291d0-5269-11df-8991-080069138b88" uid="10508"/>
+        <specific value="28" description="M1078 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun" uuid="c7a3a890-5269-11df-a29d-080069138b88" uid="10509"/>
+        <specific value="29" description="M1083 Truck, Cargo; LMTV, w/Equip, w/winch, w/M2 .50 cal heavy machine gun" uuid="c7a4be06-5269-11df-861b-080069138b88" uid="10510"/>
+      </subcategory>
+      <subcategory value="13" description="TTC FMTV" uuid="c7a67098-5269-11df-b24b-080069138b88" uid="10511">
+        <specific value="1" description="LMTV" uuid="c7a77bd2-5269-11df-9db0-080069138b88" uid="10512"/>
+        <specific value="2" description="MTV" uuid="c7a88aa4-5269-11df-84dd-080069138b88" uid="10513"/>
+      </subcategory>
+      <subcategory value="14" description="M54 6x6 5-ton cargo truck series" uuid="c7aa3a0c-5269-11df-87dc-080069138b88" uid="10514">
+        <specific value="1" description="M41, cargo" uuid="c7ab5748-5269-11df-afa2-080069138b88" uid="10515"/>
+        <specific value="2" description="M41, dump6" uuid="c7ac60b6-5269-11df-a229-080069138b88" uid="10516"/>
+        <specific value="3" description="M52, tractor" uuid="c7ad6f60-5269-11df-a637-080069138b88" uid="10517"/>
+        <specific value="4" description="M54, cargo " uuid="c7ae81c0-5269-11df-9bdf-080069138b88" uid="10518"/>
+        <specific value="5" description="M55, cargo" uuid="c7af8ba6-5269-11df-a353-080069138b88" uid="10519"/>
+        <specific value="6" description="M62k, wrecker, medium" uuid="c7b09a50-5269-11df-9b0e-080069138b88" uid="10520"/>
+        <specific value="7" description="M64, cargo, van" uuid="c7b1adfa-5269-11df-8f71-080069138b88" uid="10521"/>
+        <specific value="8" description="M246, tractor, wrecker" uuid="c7b2b93e-5269-11df-ae53-080069138b88" uid="10522"/>
+        <specific value="9" description="M291, van, expansible" uuid="c7b3ca36-5269-11df-a141-080069138b88" uid="10523"/>
+        <specific value="10" description="M328, stake, bridging" uuid="c7b4d8cc-5269-11df-859e-080069138b88" uid="10524"/>
+        <specific value="11" description="M543, wrecker, medium" uuid="c7b5e79e-5269-11df-b986-080069138b88" uid="10525"/>
+        <specific value="12" description="M748, bolster" uuid="c7b6f6ac-5269-11df-80af-080069138b88" uid="10526"/>
+        <specific value="13" description="M139 chassis" uuid="c7b8063c-5269-11df-bd17-080069138b88" uid="10527"/>
+      </subcategory>
+      <subcategory value="15" description="M809 6x6 5-ton cargo truck series" uuid="c7b9b7e8-5269-11df-be8f-080069138b88" uid="10528">
+        <specific value="1" description="M809" uuid="c7bac232-5269-11df-b8e9-080069138b88" uid="10529"/>
+        <specific value="2" description="M810" uuid="c7bbd078-5269-11df-859f-080069138b88" uid="10530"/>
+        <specific value="3" description="M811/M812" uuid="c7bce292-5269-11df-aed6-080069138b88" uid="10531"/>
+      </subcategory>
+      <subcategory value="16" description="M813 cargo truck, 5-ton, 6x6" uuid="c7be910a-5269-11df-9cb5-080069138b88" uid="10532"/>
+      <subcategory value="17" description="Standard Trailing Arm Drive (TAD) vehicle series" uuid="c7bf9f3c-5269-11df-aebb-080069138b88" uid="10533">
+        <specific value="1" description="Modular wheeled carrier" uuid="c7c0b660-5269-11df-8a8e-080069138b88" uid="10534"/>
+        <specific value="2" description="Forward Area Multi-purpose Vehicle (FAMV)" uuid="c7c1c758-5269-11df-82f3-080069138b88" uid="10535"/>
+        <specific value="3" description="Medium Combat Truck (MCT)" uuid="c7c2d238-5269-11df-86c2-080069138b88" uid="10536"/>
+      </subcategory>
+      <subcategory value="18" description="Oshkosh MK48-series articulated 8x8 vehicle" uuid="c7c48650-5269-11df-bf6d-080069138b88" uid="10537">
+        <specific value="1" description="MK48/14: logistics platform truck" uuid="c7c596c6-5269-11df-9f52-080069138b88" uid="10538"/>
+        <specific value="2" description="MK48/15: recovery vehicle" uuid="c7c6a8ae-5269-11df-8c32-080069138b88" uid="10539"/>
+        <specific value="3" description="MK48/16: truck tractor" uuid="c7c7b852-5269-11df-baa4-080069138b88" uid="10540"/>
+        <specific value="4" description="MK48/17: cargo truck with Material Handling Crane (MHC)" uuid="c7c8ca3a-5269-11df-ba35-080069138b88" uid="10541"/>
+        <specific value="5" description="MK48/18: load handling system vehicle." uuid="c7c9e618-5269-11df-9432-080069138b88" uid="10542"/>
+      </subcategory>
+      <subcategory value="19" description="Oshkosh Heavy Expanded Mobility Tactical Truck (HEMTT) 8x8 9979-kg" uuid="c7cbc37a-5269-11df-8bbf-080069138b88" uid="10543">
+        <specific value="1" description="M977 cargo" uuid="c7ccd9a4-5269-11df-a271-080069138b88" uid="10544"/>
+        <specific value="2" description="M978 fuel-servicing" uuid="c7cde4f2-5269-11df-8357-080069138b88" uid="10545"/>
+        <specific value="3" description="M983 tractor" uuid="c7cef9c8-5269-11df-961d-080069138b88" uid="10546"/>
+        <specific value="4" description="M984A1 wrecker" uuid="c7d00b1a-5269-11df-ae1a-080069138b88" uid="10547"/>
+        <specific value="5" description="M985 cargo" uuid="c7d115b4-5269-11df-8eb4-080069138b88" uid="10548"/>
+        <specific value="6" description="M977 w/ Mine Plow" uuid="c7d223fa-5269-11df-994b-080069138b88" uid="10549"/>
+        <specific value="7" description="M977 w/ Mine Roller" uuid="c7d337a4-5269-11df-9a03-080069138b88" uid="10550"/>
+        <specific value="8" description="M985 w/ Mine Roller" uuid="c7d441f8-5269-11df-996f-080069138b88" uid="10551"/>
+        <specific value="9" description="M985 w/ Mine Plow" uuid="c7d5526e-5269-11df-982d-080069138b88" uid="10552"/>
+        <specific value="10" description="Truck, Heavy, M1074 PLS" uuid="c7d663fc-5269-11df-9e04-080069138b88" uid="10553"/>
+      </subcategory>
+      <subcategory value="20" description="Mack RM6866SX 6x6 10000-kg truck" uuid="c7d81774-5269-11df-b61c-080069138b88" uid="10554"/>
+      <subcategory value="21" description="M1070 8x8 Heavy Equipment Transporter (HET)" uuid="c7d923da-5269-11df-a989-080069138b88" uid="10555"/>
+      <subcategory value="22" description="M911 8x6 truck tractor" uuid="c7da363a-5269-11df-a142-080069138b88" uid="10556"/>
+      <subcategory value="23" description="M746 8x8 22-1/2 ton tractor truck (HET)" uuid="c7db4796-5269-11df-a2d8-080069138b88" uid="10557"/>
+      <subcategory value="24" description="Mack RD8226SX 52000-kg 6x6 tank transporter" uuid="c7dc58a2-5269-11df-aed8-080069138b88" uid="10558"/>
+      <subcategory value="25" description="Navistar International Corporation F5070 6x4 tank transporter" uuid="c7dd6e0e-5269-11df-9924-080069138b88" uid="10559"/>
+      <subcategory value="26" description="LARC-5 4x4 4545-kg amphibious cargo carrier" uuid="c7de8230-5269-11df-a81b-080069138b88" uid="10560"/>
+      <subcategory value="27" description="Variable Reach Rough Terrain Forklift Truck (VRRTFLT)" uuid="c7df9030-5269-11df-9c4e-080069138b88" uid="10561"/>
+      <subcategory value="28" description="Rough Terrain Container Straddle Truck (RTCST)" uuid="c7e0a4ac-5269-11df-9cbb-080069138b88" uid="10562"/>
+      <subcategory value="29" description="Truck, tractor, yard type, 4x2" uuid="c7e1bbd0-5269-11df-bae7-080069138b88" uid="10563">
+        <specific value="1" description="M878" uuid="c7e2c5fc-5269-11df-8cf5-080069138b88" uid="10564"/>
+        <specific value="2" description="M878A1" uuid="c7e3d42e-5269-11df-9064-080069138b88" uid="10565"/>
+      </subcategory>
+      <subcategory value="30" description="Case MC2500 30-ton rough terrain crane" uuid="c7e5859e-5269-11df-95d8-080069138b88" uid="10566"/>
+      <subcategory value="31" description="Crane, truck-mounted, hydraulic, 25-ton (CCE) (Grove TMS 300-5)" uuid="c7e69c90-5269-11df-93a8-080069138b88" uid="10567"/>
+      <subcategory value="32" description="Rough terrain crane 4x4 5-ton Hanson H-446A" uuid="c7e7abbc-5269-11df-95db-080069138b88" uid="10568"/>
+      <subcategory value="33" description="Wreckers, 2-1/2 ton 6x6" uuid="c7e8c704-5269-11df-86df-080069138b88" uid="10569">
+        <specific value="1" description="M60" uuid="c7e9daa4-5269-11df-bda1-080069138b88" uid="10570"/>
+        <specific value="2" description="M108" uuid="c7eae7f0-5269-11df-a27b-080069138b88" uid="10571"/>
+      </subcategory>
+      <subcategory value="34" description="M62, truck, wrecker, medium, 5-ton, 6x6" uuid="c7ec964a-5269-11df-afc8-080069138b88" uid="10572"/>
+      <subcategory value="35" description="M246, truck, tractor, wrecker, 5-ton, 6x6" uuid="c7eda882-5269-11df-a6a7-080069138b88" uid="10573"/>
+      <subcategory value="36" description="M916 Series trucks" uuid="c7eebe7a-5269-11df-a045-080069138b88" uid="10574"/>
+      <subcategory value="37" description="Small Emplacement Excavator (SEE)" uuid="c7efcec8-5269-11df-94ee-080069138b88" uid="10575"/>
+      <subcategory value="38" description="Truck, cargo; heavy PLS transporter 16.5T 8x8, M1075" uuid="c7f0e114-5269-11df-8f78-080069138b88" uid="10576"/>
+    </category>
+    <category value="8" description="Small tracked utility vehicle" uuid="c7f29162-5269-11df-bdd2-080069138b88" uid="10577"/>
+    <category value="9" description="Large tracked utility vehicle" uuid="c7f3a4e4-5269-11df-a1b5-080069138b88" uid="10578">
+      <subcategory value="1" description="M548 tracked cargo carrier" uuid="c7f4af60-5269-11df-95a2-080069138b88" uid="10579">
+        <specific value="1" description="M1015" uuid="c7f5bfae-5269-11df-a048-080069138b88" uid="10580"/>
+        <specific value="2" description="Stretched M548A1E1" uuid="c7f6d15a-5269-11df-aa5f-080069138b88" uid="10581"/>
+        <specific value="3" description="M667" uuid="c7f7db68-5269-11df-8598-080069138b88" uid="10582"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="c7f8eb98-5269-11df-9964-080069138b88" uid="10583"/>
+        <specific value="5" description="Recovery vehicles" uuid="c7f9fd12-5269-11df-9e27-080069138b88" uid="10584"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="c7fb06f8-5269-11df-a98b-080069138b88" uid="10585"/>
+        <specific value="7" description="Radar vehicles" uuid="c7fc184a-5269-11df-ae92-080069138b88" uid="10586"/>
+        <specific value="8" description="M45" uuid="c7fd2c3a-5269-11df-9770-080069138b88" uid="10587"/>
+        <specific value="9" description="M548A1" uuid="c7fe3576-5269-11df-ae00-080069138b88" uid="10588"/>
+        <specific value="10" description="M548GA1" uuid="c7ff459c-5269-11df-a8d2-080069138b88" uid="10589"/>
+        <specific value="11" description="M548/S" uuid="c800577a-5269-11df-8ad8-080069138b88" uid="10590"/>
+        <specific value="12" description="LAR 160" uuid="c80163ae-5269-11df-8de6-080069138b88" uid="10591"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="c80314a6-5269-11df-bab2-080069138b88" uid="10592"/>
+      <subcategory value="3" description="M992 Field Artillery Ammunition Support Vehicle (FAASV)" uuid="c80425f8-5269-11df-8825-080069138b88" uid="10593">
+        <specific value="1" description="M993 MLRS carrier" uuid="c8053b0a-5269-11df-8e85-080069138b88" uid="10594"/>
+        <specific value="2" description="XM987 cargo carrier" uuid="c8064900-5269-11df-a4d4-080069138b88" uid="10595"/>
+        <specific value="3" description="Armored, Forward-Area, Rearm Vehicle (AFARV)" uuid="c80763da-5269-11df-a524-080069138b88" uid="10596"/>
+        <specific value="4" description="Armored Maintenance Vehicle" uuid="c8087590-5269-11df-9756-080069138b88" uid="10597"/>
+        <specific value="5" description="XM1070 Electronic Fighting Vehicle System (EFVS)" uuid="c809826e-5269-11df-9824-080069138b88" uid="10598"/>
+        <specific value="6" description="Command-post vehicle" uuid="c80a9802-5269-11df-9188-080069138b88" uid="10599"/>
+      </subcategory>
+      <subcategory value="4" description="M973 Small Unit Support Vehicle (SUSV)" uuid="c80c4832-5269-11df-967f-080069138b88" uid="10600"/>
+      <subcategory value="5" description="LMC 1500 Over-snow vehicle" uuid="c80d597a-5269-11df-ad8d-080069138b88" uid="10601"/>
+      <subcategory value="6" description="Caterpillar 988 50 000-lb (22 680-kg) rough terrain container handler" uuid="c80e6900-5269-11df-a3b2-080069138b88" uid="10602"/>
+    </category>
+    <category value="10" description="Mortar" uuid="c8101f52-5269-11df-9639-080069138b88" uid="10603">
+      <subcategory value="1" description="M29 81-mm" uuid="c8112e88-5269-11df-ab4d-080069138b88" uid="10604"/>
+      <subcategory value="2" description="M224 60-mm light company mortar" uuid="c8123ea4-5269-11df-bbe3-080069138b88" uid="10605"/>
+      <subcategory value="3" description="M1 81-mm" uuid="c8134e16-5269-11df-b730-080069138b88" uid="10606"/>
+      <subcategory value="4" description="M2 60-mm" uuid="c8145d10-5269-11df-98fa-080069138b88" uid="10607"/>
+      <subcategory value="5" description="M19 60-mm" uuid="c815710a-5269-11df-8aad-080069138b88" uid="10608"/>
+      <subcategory value="6" description="M29A1 81-mm" uuid="c81687e8-5269-11df-969e-080069138b88" uid="10609"/>
+      <subcategory value="7" description="M30 107-mm rifled" uuid="c8179c64-5269-11df-890f-080069138b88" uid="10610"/>
+      <subcategory value="8" description="M252 81-mm" uuid="c818ad7a-5269-11df-a795-080069138b88" uid="10611"/>
+      <subcategory value="9" description="120mm Mortar, M120" uuid="c819bad0-5269-11df-92c1-080069138b88" uid="10612"/>
+    </category>
+    <category value="11" description="Mine plow" uuid="c81b6d9e-5269-11df-91cc-080069138b88" uid="10613"/>
+    <category value="12" description="Mine rake" uuid="c81c7c66-5269-11df-b02f-080069138b88" uid="10614"/>
+    <category value="13" description="Mine roller" uuid="c81d8d7c-5269-11df-99e3-080069138b88" uid="10615"/>
+    <category value="14" description="Cargo trailer" uuid="c81e9816-5269-11df-8742-080069138b88" uid="10616">
+      <subcategory value="1" description="0 - 0.5 ton" uuid="c81fa670-5269-11df-b8a0-080069138b88" uid="10617">
+        <specific value="1" description="Trailer, M1100 with M120" status="new" uuid="1eb4f692-bd34-4c8d-a3ba-f76c3fbe8e1f" uid="22873">
+          <cr value="2233"/>
+        </specific>
+        <specific value="2" description="Trailer, M1100, Empty" status="new" uuid="9f2fab76-e69f-4e09-82ca-a78bc670333f" uid="22874">
+          <cr value="2233"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="0.51 - 2 ton" uuid="c820bb46-5269-11df-89c6-080069138b88" uid="10618">
+        <specific value="1" description="Trailer cargo; high mobility, 3/4 ton, M1102" uuid="c821c6b2-5269-11df-b435-080069138b88" uid="10619"/>
+        <specific value="3" description="Trailer, Cargo, 1 1/2 ton, M105A2" status="new" uuid="08c1d871-1c01-49bc-9d1b-abc6bc55878b" uid="22875">
+          <cr value="2233"/>
+        </specific>
+      </subcategory>
+      <subcategory value="3" description="2.01 - 5 ton" uuid="c8237962-5269-11df-aaf2-080069138b88" uid="10620">
+        <specific value="1" description="Trailer, cargo; 2 1/2 ton, M1082" uuid="c8248870-5269-11df-a34b-080069138b88" uid="10621"/>
+        <specific value="2" description="Trailer, cargo; 5 ton, M1095" uuid="c825a6e2-5269-11df-8944-080069138b88" uid="10622"/>
+      </subcategory>
+      <subcategory value="4" description="5.02 - 10 ton" uuid="c8277d50-5269-11df-9e49-080069138b88" uid="10623"/>
+      <subcategory value="5" description="greater than 10 tons" uuid="c82894a6-5269-11df-bd6b-080069138b88" uid="10624">
+        <specific value="1" description="M871, 22 1/2 ton" status="new" uuid="05ad5fe5-8eb1-47ec-8c72-38cf6c4950ae" uid="22876">
+          <cr value="2233"/>
+        </specific>
+        <specific value="2" description="M872, 34 ton" status="new" uuid="69ebbfc9-33c2-4e53-9748-0eee45a8f247" uid="22877">
+          <cr value="2233"/>
+        </specific>
+        <specific value="3" description="M127A2C, 12 ton" status="new" uuid="f79248f4-75d4-4215-8e90-a35d803b9bfb" uid="22878">
+          <cr value="2233"/>
+        </specific>
+        <specific value="4" description="M1076, PLS, 16 1/2 ton" status="new" uuid="63127117-d536-43e3-81bd-2d3bba10b301" uid="22879">
+          <cr value="2233"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="15" description="Fuel trailer" uuid="c82a4634-5269-11df-9ffd-080069138b88" uid="10625">
+      <subcategory value="1" description="1-1000 gallons" uuid="c82b4fe8-5269-11df-8889-080069138b88" uid="10626"/>
+      <subcategory value="2" description="1001 - 5000 gallons" uuid="c82c6428-5269-11df-adae-080069138b88" uid="10627">
+        <specific value="1" description="Semi-trailer, fuel service, 5000 gallons, M969" uuid="c82d76c4-5269-11df-8440-080069138b88" uid="10628"/>
+      </subcategory>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="c82f297e-5269-11df-bbbb-080069138b88" uid="10629"/>
+    </category>
+    <category value="16" description="Generator trailer" uuid="c830dc7e-5269-11df-94ea-080069138b88" uid="10630">
+      <subcategory value="1" description="0 - 100 kW" uuid="c831e5a6-5269-11df-a6a8-080069138b88" uid="10631">
+        <specific value="1" description="TES Main Generator" status="new" uuid="26f3020d-df66-4a43-a9d6-f02d92c25292" uid="22880">
+          <cr value="2233"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="greater than 100 KW" uuid="c832f63a-5269-11df-b4ed-080069138b88" uid="10632"/>
+    </category>
+    <category value="17" description="Water trailer" uuid="c834a91c-5269-11df-9ff3-080069138b88" uid="10633">
+      <subcategory value="1" description="1-1000 gallons" uuid="c835b762-5269-11df-baa5-080069138b88" uid="10634">
+        <specific value="1" description="Trailer, tank; 1 1/2 ton, water, 400 gallons, M149A2" uuid="c836c59e-5269-11df-9d34-080069138b88" uid="10635"/>
+      </subcategory>
+      <subcategory value="2" description="1001- 5000 gallons" uuid="c83875e2-5269-11df-b734-080069138b88" uid="10636"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="c83987fc-5269-11df-b43a-080069138b88" uid="10637"/>
+    </category>
+    <category value="18" description="Engineer equipment" uuid="c83b3bce-5269-11df-8df5-080069138b88" uid="10638">
+      <subcategory value="1" description="Mine clearing line charge" uuid="c83c4974-5269-11df-9c56-080069138b88" uid="10639"/>
+      <subcategory value="2" description="Dozer blade kit" uuid="c83d57e2-5269-11df-894f-080069138b88" uid="10640"/>
+      <subcategory value="3" description="Lane marking system" uuid="c83e6c04-5269-11df-b997-080069138b88" uid="10641"/>
+      <subcategory value="4" description="High Mobility Engineer Excavator" uuid="c83f7c5c-5269-11df-a80a-080069138b88" uid="10642"/>
+      <subcategory value="5" description="Road Grader" uuid="c8408836-5269-11df-bf71-080069138b88" uid="10643"/>
+    </category>
+    <category value="19" description="Heavy equipment transport trailer" uuid="c8423c08-5269-11df-83c9-080069138b88" uid="10644">
+      <subcategory value="1" description="Heavy Equipment Trailer, M1000" uuid="c8434ca6-5269-11df-88bd-080069138b88" uid="10645"/>
+      <subcategory value="2" description="Semi-trailer, M870A1, 40-ton" status="new" uuid="70987829-d649-4953-963c-88100a7d27e9" uid="22918">
+        <cr value="2246"/>
+      </subcategory>
+      <subcategory value="3" description="Semi-trailer, M172A1, 25-ton" status="new" uuid="2d23f1bb-2ac3-4043-b95a-65fbd4dc0179" uid="22919">
+        <cr value="2246"/>
+      </subcategory>
+    </category>
+    <category value="20" description="Maintenance equipment trailer" uuid="c84509ec-5269-11df-a4fd-080069138b88" uid="10646">
+      <subcategory value="1" description="Welding trailer" uuid="c8461990-5269-11df-94db-080069138b88" uid="10647"/>
+      <subcategory value="2" description="Compressor" uuid="c847286c-5269-11df-aee1-080069138b88" uid="10648"/>
+      <subcategory value="3" description="Tools/parts trailer" uuid="c84839aa-5269-11df-b47f-080069138b88" uid="10649">
+        <specific value="1" description="Semi-trailer, Van, 12-ton, M129A2C" uuid="c8494ba6-5269-11df-b79e-080069138b88" uid="10650" status="new">
+          <cr value="2246"/>
+        </specific>
+        <specific value="2" description="Semi-trailer, Van, 6-ton, M146" status="new" uuid="4e62e414-7dcc-420e-ac31-3f854e11f520" uid="22920">
+          <cr value="2246"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="21" description="Limber" uuid="c84b9d02-5269-11df-9210-080069138b88" uid="10651"/>
+    <category value="22" description="Chemical decontamination trailer" uuid="c84cae40-5269-11df-98d8-080069138b88" uid="10652"/>
+    <category value="23" description="Warning System" uuid="c84dbccc-5269-11df-87e3-080069138b88" uid="10653">
+      <subcategory value="1" description="JTAGS" uuid="c84ecbe4-5269-11df-8384-080069138b88" uid="10654"/>
+      <subcategory value="2" description="SHIELD/ALERT" uuid="c84fdab6-5269-11df-b300-080069138b88" uid="10655"/>
+      <subcategory value="3" description="FCS Intelligent Munitions System" uuid="c850e6b8-5269-11df-bbd0-080069138b88" uid="10656"/>
+      <subcategory value="4" description="Urban Unattended Ground Sensor (U-UGS)" uuid="c851fb3e-5269-11df-94c4-080069138b88" uid="10657" footnote="This is the gateway node" status="new">
+        <cr value="2234"/>
+        <specific value="1" description="U-UGS Imaging Node" status="new" uuid="add32c22-23bd-4093-9d2c-4b5ced2a7af0" uid="22881">
+          <cr value="2234"/>
+        </specific>
+        <specific value="2" description="U-UGS Motion Sensor" status="new" uuid="4649c30d-8d5f-4f05-8cb5-d8eb240b5f60" uid="22882">
+          <cr value="2234"/>
+        </specific>
+      </subcategory>
+      <subcategory value="5" description="Tactical Unattended Ground Sensor (T-UGS)" uuid="c8530d08-5269-11df-8768-080069138b88" uid="10658" footnote="This is the gateway node" status="new">
+        <cr value="2234"/>
+        <specific value="1" description="T-UGS Electro-Optic/Infrared Node" status="new" uuid="cd1efb5e-33c5-4321-9ae1-8d554f2d7fee" uid="22883">
+          <cr value="2234"/>
+        </specific>
+        <specific value="2" description="T-UGS ISR Node" status="new" uuid="bbbade62-4a69-482f-891b-f529f6592f1d" uid="22884">
+          <cr value="2234"/>
+        </specific>
+        <specific value="3" description="T-UGS Radiological Nuclear Node" status="new" uuid="9ab7750b-9a06-4970-80bc-c72b6066b5dd" uid="22885">
+          <cr value="2234"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="27" description="Civilian Vehicle" uuid="c854bc84-5269-11df-8012-080069138b88" uid="10659">
+      <subcategory value="1" description="Sedan" uuid="c855c994-5269-11df-b173-080069138b88" uid="10660"/>
+      <subcategory value="2" description="Sport Utility Vehicle" uuid="c856d9a6-5269-11df-9726-080069138b88" uid="10661"/>
+      <subcategory value="3" description="Truck Cargo" uuid="c857ea08-5269-11df-9d42-080069138b88" uid="10662">
+        <specific value="1" description="Truck Small" uuid="c858f6a0-5269-11df-be59-080069138b88" uid="10663">
+          <extra value="1" description="Pickup Mini" uuid="c85a05e0-5269-11df-9734-080069138b88" uid="10664"/>
+          <extra value="2" description="Pickup Medium" uuid="c85b14d0-5269-11df-bb8b-080069138b88" uid="10665"/>
+          <extra value="3" description="Pickup Large" uuid="c85c1df8-5269-11df-9b9b-080069138b88" uid="10666"/>
+        </specific>
+        <specific value="2" description="Truck Cargo Medium" uuid="c85dcfcc-5269-11df-99b5-080069138b88" uid="10667"/>
+        <specific value="3" description="Truck Cargo Large" uuid="c85edfde-5269-11df-b736-080069138b88" uid="10668"/>
+      </subcategory>
+      <subcategory value="4" description="Tractor Trailer Combination" uuid="c860914e-5269-11df-b4fd-080069138b88" uid="10669"/>
+      <subcategory value="5" description="All Terrain Vehicle" uuid="c861a408-5269-11df-bf52-080069138b88" uid="10670">
+        <specific value="1" description="ATV 4X4" uuid="c862aeb6-5269-11df-9c39-080069138b88" uid="10671">
+          <extra value="1" description="Polaris Sportsman MV" uuid="c863c760-5269-11df-83b8-080069138b88" uid="10672"/>
+        </specific>
+        <specific value="2" description="ATV 6X6" uuid="c8657c2c-5269-11df-9e21-080069138b88" uid="10673">
+          <extra value="1" description="M-Gator" uuid="c86688c4-5269-11df-bf3b-080069138b88" uid="10674"/>
+        </specific>
+      </subcategory>
+      <subcategory value="6" description="Motorcycle" uuid="c868d8ae-5269-11df-a050-080069138b88" uid="10675">
+        <specific value="1" description="Motorcycle Street" uuid="c869e7f8-5269-11df-9c13-080069138b88" uid="10676"/>
+        <specific value="2" description="Motorcycle Trail" uuid="c86af440-5269-11df-9d0f-080069138b88" uid="10677">
+          <extra value="1" description="Kawasaki KLR 250" uuid="c86c0362-5269-11df-a806-080069138b88" uid="10678"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="28" description="Air Defense / Missile Defense Unit Equipment" uuid="c86ef982-5269-11df-a8be-080069138b88" uid="10679">
+      <subcategory value="1" description="MIM-23 Raytheon HAWK Low-to-Medium Altitude SAM System" uuid="c8700f52-5269-11df-bce3-080069138b88" uid="10680">
+        <specific value="1" description="Batallion" uuid="c8711bfe-5269-11df-b654-080069138b88" uid="10681">
+          <extra value="1" description="HAWK BN/ADCP" uuid="c8722b02-5269-11df-8394-080069138b88" uid="10682"/>
+        </specific>
+        <specific value="2" description="Battery" uuid="c873dbaa-5269-11df-bc56-080069138b88" uid="10683">
+          <extra value="1" description="HAWK Battery Command Post (BCP)" uuid="c874ee1e-5269-11df-87c0-080069138b88" uid="10684"/>
+          <extra value="2" description="HAWK CWAR (Continuous Wave Acquisition Radar) AN/MPQ-34/48/55/62" uuid="c875fc78-5269-11df-8bf4-080069138b88" uid="10685"/>
+          <extra value="3" description="HAWK HPI (High-Power Illuminator) AN/MPQ-33/39/46/57/61 -" uuid="c8771040-5269-11df-88e7-080069138b88" uid="10686"/>
+          <extra value="4" description="HAWK Launcher" uuid="c8782386-5269-11df-8ef6-080069138b88" uid="10687"/>
+          <extra value="5" description="HAWK PAR (Pulse Acquisition Radar) AN/MQP-50" uuid="c879323a-5269-11df-85e4-080069138b88" uid="10688"/>
+          <extra value="6" description="HAWK ROR (Range-Only-Radar) AN/MPQ-37/51" uuid="c87a44cc-5269-11df-a909-080069138b88" uid="10689"/>
+          <extra value="7" description="HAWK PCP (Platoon Command Post)" uuid="c87b5858-5269-11df-bc70-080069138b88" uid="10690"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="MIM-104 Raytheon Patriot High-to-Medium Altitude Air Defense (HIMAD) System" uuid="c87da824-5269-11df-b8dc-080069138b88" uid="10691">
+        <specific value="1" description="Patriot Command Center" uuid="c87ebf84-5269-11df-9fee-080069138b88" uid="10692">
+          <extra value="1" description="Patriot ICC (Information Coordination Central)" uuid="c87fca1e-5269-11df-bcc5-080069138b88" uid="10693"/>
+          <extra value="2" description="Patriot BTOC" uuid="c880dc10-5269-11df-9a7c-080069138b88" uid="10694"/>
+        </specific>
+        <specific value="2" description="Patriot Battery" uuid="c882b95e-5269-11df-b657-080069138b88" uid="10695">
+          <extra value="1" description="Patriot ECS (Engagement Control Station) AN/MSQ-104" uuid="c883cdee-5269-11df-834d-080069138b88" uid="10696"/>
+          <extra value="2" description="Patriot LS (Launcher Station)" uuid="c884e526-5269-11df-b07e-080069138b88" uid="10697"/>
+          <extra value="3" description="Patriot Radar AN/MPQ-53" uuid="c885f13c-5269-11df-b171-080069138b88" uid="10698"/>
+          <extra value="4" description="Patriot Radar AN/MPQ-63" uuid="c887027a-5269-11df-b467-080069138b88" uid="10699"/>
+        </specific>
+      </subcategory>
+      <subcategory value="3" description="MIM-14B Nike-Hercules SAM System" uuid="c88955c0-5269-11df-b4df-080069138b88" uid="10700"/>
+      <subcategory value="4" description="Theater High Altitude Area Defense (THAAD) System" uuid="c88a68b6-5269-11df-a644-080069138b88" uid="10701">
+        <specific value="1" description="THAAD Battery TOC" uuid="c88b7fb2-5269-11df-9718-080069138b88" uid="10702"/>
+        <specific value="2" description="THAAD ground-based radar (GBR)" uuid="c88c908c-5269-11df-bc2b-080069138b88" uid="10703"/>
+        <specific value="3" description="THAAD Launcher" uuid="c88d9b26-5269-11df-a484-080069138b88" uid="10704"/>
+      </subcategory>
+      <subcategory value="5" description="Self -Propelled VSHORAD Gun / Missile System" uuid="c88f4eee-5269-11df-bf95-080069138b88" uid="10705">
+        <specific value="1" description="M163 Vulcan SP Anti-Aircraft Gun" uuid="c8906072-5269-11df-b605-080069138b88" uid="10706"/>
+        <specific value="2" description="M42 Twin-40mm SP Anti-Aricraft Gun" uuid="c8917368-5269-11df-95aa-080069138b88" uid="10707"/>
+        <specific value="3" description="General Electric Vulcan-Commando 20 mm SP Air Defense (AD) System" uuid="c8928320-5269-11df-8973-080069138b88" uid="10708"/>
+        <specific value="4" description="Boeing Avenger Pedestal-Mounted Stinger SP Air Defense (AD) System" uuid="c89397b0-5269-11df-8ae1-080069138b88" uid="10709"/>
+        <specific value="5" description="Raytheon / Loral Aeronutronic Saber Air Defense (AD) System" uuid="c894ada8-5269-11df-9943-080069138b88" uid="10710"/>
+        <specific value="6" description="LTV Crossbow pedestal-mounted weapon system" uuid="c895be5a-5269-11df-9457-080069138b88" uid="10711"/>
+        <specific value="7" description="Loral Aeronutronic 48 Chaparral" uuid="c896d09c-5269-11df-9791-080069138b88" uid="10712">
+          <extra value="1" description="M48" uuid="c897df5a-5269-11df-b4f6-080069138b88" uid="10713"/>
+          <extra value="2" description="M48A1" uuid="c898e864-5269-11df-99de-080069138b88" uid="10714"/>
+          <extra value="3" description="M48A2" uuid="c899faa6-5269-11df-91c6-080069138b88" uid="10715"/>
+          <extra value="4" description="M48A3" uuid="c89b07b6-5269-11df-aa6f-080069138b88" uid="10716"/>
+        </specific>
+        <specific value="8" description="Block VII Low-Altitude SAM System" uuid="c89cb552-5269-11df-b4bd-080069138b88" uid="10717"/>
+        <specific value="9" description="Loral Aeronutronic SAM System" uuid="c89dc550-5269-11df-bf8a-080069138b88" uid="10718"/>
+        <specific value="10" description="M6 Linebacker" uuid="c89ed6f2-5269-11df-94bf-080069138b88" uid="10719"/>
+      </subcategory>
+      <subcategory value="6" description="Towed VSHORAD Gun / Missile System" uuid="c8a09280-5269-11df-bcbc-080069138b88" uid="10720">
+        <specific value="1" description="M1 40mm Automatic Anti-Aircraft Gun" uuid="c8a1a4fe-5269-11df-8320-080069138b88" uid="10721"/>
+        <specific value="2" description="M167 20mm Vulcan Anti-Aircraft Gun" uuid="c8a2b632-5269-11df-a723-080069138b88" uid="10722"/>
+        <specific value="3" description="M55 Quad 12.7mm Anti-Aircraft MG" uuid="c8a3c81a-5269-11df-8184-080069138b88" uid="10723"/>
+        <specific value="4" description="AN/MPQ-64 Phased Array SHORAD Radar" uuid="c8a4da02-5269-11df-8a5e-080069138b88" uid="10724"/>
+      </subcategory>
+      <subcategory value="7" description="HMWWV with AMRAAM" uuid="c8a68eba-5269-11df-bc51-080069138b88" uid="10725">
+        <specific value="1" description="USMC Complementary Low Altitude Weapon System (CLAWS)" uuid="c8a79a1c-5269-11df-b681-080069138b88" uid="10726"/>
+        <specific value="2" description="US Army HUMRAAM" uuid="c8a8acf4-5269-11df-afe7-080069138b88" uid="10727"/>
+      </subcategory>
+    </category>
+    <category value="29" description="Command, Control, Communications, and Intelligence (C3I) System" uuid="c8ab0170-5269-11df-bafc-080069138b88" uid="10728">
+      <subcategory value="1" description="Control and Reporting Center / Modular Control Equipment (CRC / MCE)" uuid="c8ac14e8-5269-11df-9f61-080069138b88" uid="10729"/>
+      <subcategory value="2" description="Control and Reporting Element (CRE)" uuid="c8ad2d42-5269-11df-b9ca-080069138b88" uid="10730"/>
+      <subcategory value="3" description="Control and Reporting Post (CRP)" uuid="c8ae4cd6-5269-11df-9bbd-080069138b88" uid="10731"/>
+      <subcategory value="4" description="USMC Tactical Air Operation Center (TAOC)" uuid="c8af5bbc-5269-11df-acc4-080069138b88" uid="10732"/>
+      <subcategory value="5" description="AN/TSQ-73 Missile Minder" uuid="c8b07114-5269-11df-a53f-080069138b88" uid="10733"/>
+      <subcategory value="6" description="JSTARS Ground Station Module (GSM) AN/TSQ-178" uuid="c8b182ca-5269-11df-859f-080069138b88" uid="10734"/>
+      <subcategory value="7" description="JSTARS Common Ground Station (CGS)" uuid="c8b295b6-5269-11df-be2c-080069138b88" uid="10735"/>
+      <subcategory value="8" description="UAV Ground Control Station" uuid="c8b3a88e-5269-11df-b4a4-080069138b88" uid="10736">
+        <specific value="1" description="Predator Ground Control Station" uuid="c8b4ba1c-5269-11df-b553-080069138b88" uid="10737"/>
+        <specific value="2" description="Hunter Ground Control Station" uuid="c8b5c95c-5269-11df-b47a-080069138b88" uid="10738"/>
+        <specific value="3" description="Shadow Ground Control Station" uuid="c8b6db6c-5269-11df-afd0-080069138b88" uid="10739"/>
+      </subcategory>
+    </category>
+    <category value="30" description="Operations Facility" uuid="c8b930a6-5269-11df-a166-080069138b88" uid="10740"/>
+    <category value="31" description="Intelligence Facility" uuid="c8ba4202-5269-11df-83db-080069138b88" uid="10741"/>
+    <category value="32" description="Surveillance Facility" uuid="c8bb5264-5269-11df-9f90-080069138b88" uid="10742">
+      <subcategory value="1" description="JLENS Processing Stations (General)" uuid="c8bc63de-5269-11df-865c-080069138b88" uid="10743">
+        <specific value="1" description="JLENS PTIR Processing Station" uuid="c8bd747c-5269-11df-80cd-080069138b88" uid="10744"/>
+        <specific value="2" description="JLENS SuR Processing Station" uuid="c8be860a-5269-11df-815a-080069138b88" uid="10745"/>
+      </subcategory>
+    </category>
+    <category value="33" description="Communications Facility" uuid="c8c0e530-5269-11df-9438-080069138b88" uid="10746"/>
+    <category value="34" description="Command Facility" uuid="c8c1f59c-5269-11df-9ef1-080069138b88" uid="10747"/>
+    <category value="35" description="C4I Facility" uuid="c8c3069e-5269-11df-a070-080069138b88" uid="10748"/>
+    <category value="36" description="Control Facility" uuid="c8c419c6-5269-11df-8f07-080069138b88" uid="10749"/>
+    <category value="37" description="Fire Control Facility" uuid="c8c5242e-5269-11df-80b3-080069138b88" uid="10750"/>
+    <category value="38" description="Missile Defense Facility" uuid="c8c63760-5269-11df-bdfc-080069138b88" uid="10751"/>
+    <category value="39" description="Field Command Post" uuid="c8c74a24-5269-11df-865b-080069138b88" uid="10752"/>
+    <category value="40" description="Observation Post" uuid="c8c856c6-5269-11df-96de-080069138b88" uid="10753"/>
+  </entity>
+  <entity kind="1" domain="2" country="225" uuid="c8ca08fe-5269-11df-86e8-080069138b88" uid="10754">
+    <category value="1" description="Fighter/Air Defense" uuid="c8cb1820-5269-11df-a9c8-080069138b88" uid="10755">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="c8cc2a76-5269-11df-a608-080069138b88" uid="10756"/>
+      <subcategory value="2" description="Grumman F-14 Tomcat" uuid="c8cd37fe-5269-11df-8d42-080069138b88" uid="10757">
+        <specific value="1" description="F-14A" uuid="c8ce4752-5269-11df-9f51-080069138b88" uid="10758"/>
+        <specific value="2" description="F-14D" uuid="c8cf5b4c-5269-11df-ac9c-080069138b88" uid="10759"/>
+        <specific value="3" description="F-14B" uuid="c8d0650a-5269-11df-9fe0-080069138b88" uid="10760"/>
+      </subcategory>
+      <subcategory value="3" description="General Dynamics F-16 Fighting Falcon" uuid="c8d2176a-5269-11df-a35d-080069138b88" uid="10761">
+        <specific value="1" description="F-16A" uuid="c8d3283a-5269-11df-b2b9-080069138b88" uid="10762"/>
+        <specific value="2" description="F-16B" uuid="c8d43b94-5269-11df-b3b6-080069138b88" uid="10763"/>
+        <specific value="3" description="F-16C" uuid="c8d545a2-5269-11df-8df4-080069138b88" uid="10764"/>
+        <specific value="4" description="F-16D" uuid="c8d655be-5269-11df-b44b-080069138b88" uid="10765"/>
+        <specific value="5" description="F-16E" uuid="c8d763dc-5269-11df-ae49-080069138b88" uid="10766"/>
+        <specific value="6" description="F-16N" uuid="c8d87222-5269-11df-bb0b-080069138b88" uid="10767"/>
+        <specific value="7" description="F-16 (ADF)" uuid="c8d982d4-5269-11df-a473-080069138b88" uid="10768"/>
+        <specific value="8" description="F-16 RECCE" uuid="c8da932c-5269-11df-9b9f-080069138b88" uid="10769"/>
+        <specific value="9" description="F/A-16" uuid="c8db9fc4-5269-11df-8425-080069138b88" uid="10770"/>
+        <specific value="10" description="F-16CJ (dedicated SEAD)" uuid="c8dcaff4-5269-11df-be4b-080069138b88" uid="10771"/>
+        <specific value="11" description="F-16CG" uuid="c8ddc9ca-5269-11df-980a-080069138b88" uid="10772"/>
+      </subcategory>
+      <subcategory value="4" description="McDonnell-Douglas F-4 Phantom II" uuid="c8dfa524-5269-11df-8ac9-080069138b88" uid="10773">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="c8e0b824-5269-11df-b800-080069138b88" uid="10774"/>
+        <specific value="2" description="F-4B" uuid="c8e1c39a-5269-11df-ad4b-080069138b88" uid="10775"/>
+        <specific value="3" description="F-4C" uuid="c8e2d712-5269-11df-af68-080069138b88" uid="10776"/>
+        <specific value="4" description="F-4D" uuid="c8e3e79c-5269-11df-9328-080069138b88" uid="10777"/>
+        <specific value="5" description="F-4E" uuid="c8e4f1e6-5269-11df-ae18-080069138b88" uid="10778"/>
+        <specific value="6" description="F-4F" uuid="c8e60090-5269-11df-a19a-080069138b88" uid="10779"/>
+        <specific value="7" description="F-4J" uuid="c8e70fbc-5269-11df-8845-080069138b88" uid="10780"/>
+        <specific value="8" description="(deprecated)" deprecated="1" uuid="c8e82028-5269-11df-82d1-080069138b88" uid="10781"/>
+        <specific value="9" description="(deprecated)" deprecated="1" uuid="c8e932ce-5269-11df-8cdc-080069138b88" uid="10782"/>
+        <specific value="10" description="F-4N" uuid="c8ea44ca-5269-11df-9b64-080069138b88" uid="10783"/>
+        <specific value="11" description="F-4S" uuid="c8eb55ae-5269-11df-bf25-080069138b88" uid="10784"/>
+      </subcategory>
+      <subcategory value="5" description="McDonnell-Douglas F-15 Eagle" uuid="c8ed05f2-5269-11df-aac9-080069138b88" uid="10785">
+        <specific value="1" description="F-15A" uuid="c8ee17c6-5269-11df-8fb8-080069138b88" uid="10786"/>
+        <specific value="2" description="F-15B" uuid="c8ef27c4-5269-11df-a423-080069138b88" uid="10787"/>
+        <specific value="3" description="F-15C" uuid="c8f035d8-5269-11df-87ca-080069138b88" uid="10788"/>
+        <specific value="4" description="F-15D" uuid="c8f14572-5269-11df-903c-080069138b88" uid="10789"/>
+        <specific value="5" description="F-15E" uuid="c8f253d6-5269-11df-893f-080069138b88" uid="10790"/>
+        <specific value="6" description="F-15F" uuid="c8f35db2-5269-11df-b50b-080069138b88" uid="10791"/>
+        <specific value="7" description="F-15H" uuid="c8f46e78-5269-11df-a07c-080069138b88" uid="10792"/>
+      </subcategory>
+      <subcategory value="6" description="Lockheed F-22 Raptor" uuid="c8f62236-5269-11df-8a38-080069138b88" uid="10793">
+        <specific value="1" description="F-22A" uuid="c8f730c2-5269-11df-b063-080069138b88" uid="10794"/>
+        <specific value="2" description="F-22B" uuid="c8f83c88-5269-11df-964f-080069138b88" uid="10795"/>
+      </subcategory>
+      <subcategory value="7" description="Lockheed F-104 Starfighter" uuid="c8f9f028-5269-11df-8e1f-080069138b88" uid="10796"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="c8fb01fc-5269-11df-ade2-080069138b88" uid="10797"/>
+      <subcategory value="9" description="McDonnell-Douglas F/A-18 Hornet" uuid="c8fc15a6-5269-11df-a6fc-080069138b88" uid="10798">
+        <specific value="1" description="F/A-18A" uuid="c8fd2fcc-5269-11df-b545-080069138b88" uid="10799"/>
+        <specific value="2" description="F/A-18B" uuid="c8fe4060-5269-11df-acda-080069138b88" uid="10800"/>
+        <specific value="3" description="F/A-18C" uuid="c8ff516c-5269-11df-8360-080069138b88" uid="10801"/>
+        <specific value="4" description="F/A-18D" uuid="c9005f58-5269-11df-b055-080069138b88" uid="10802"/>
+        <specific value="5" description="AF-18A" uuid="c9017122-5269-11df-aa72-080069138b88" uid="10803"/>
+        <specific value="6" description="ATF-18A" uuid="c90281de-5269-11df-baec-080069138b88" uid="10804"/>
+        <specific value="7" description="CF-188A/B" uuid="c9038f3e-5269-11df-aca4-080069138b88" uid="10805"/>
+        <specific value="8" description="C.15" uuid="c9049f28-5269-11df-adbd-080069138b88" uid="10806"/>
+        <specific value="9" description="CE.15" uuid="c905b142-5269-11df-91f7-080069138b88" uid="10807"/>
+        <specific value="10" description="F/A-18E" uuid="c906bcf4-5269-11df-b850-080069138b88" uid="10808"/>
+        <specific value="11" description="F/A-18F" uuid="c907d09e-5269-11df-9276-080069138b88" uid="10809"/>
+      </subcategory>
+      <subcategory value="10" description="Northrop F-5 Freedom Fighter/Tiger II" uuid="c9097ff2-5269-11df-a6ae-080069138b88" uid="10810">
+        <specific value="1" description="F-5A" uuid="c90a9194-5269-11df-bbbe-080069138b88" uid="10811"/>
+        <specific value="2" description="F-5B" uuid="c90b9f58-5269-11df-98ce-080069138b88" uid="10812"/>
+        <specific value="3" description="F-5E Tiger II" uuid="c90caede-5269-11df-9073-080069138b88" uid="10813"/>
+        <specific value="4" description="F-5F" uuid="c90dbec8-5269-11df-9986-080069138b88" uid="10814"/>
+        <specific value="5" description="RF-5A" uuid="c90ecc96-5269-11df-aa8a-080069138b88" uid="10815"/>
+        <specific value="6" description="RF-5E Tigereye" uuid="c90fdfe6-5269-11df-8e25-080069138b88" uid="10816"/>
+        <specific value="7" description="RF-5F" uuid="c910f2fa-5269-11df-8390-080069138b88" uid="10817"/>
+      </subcategory>
+      <subcategory value="11" description="Vought Crusader F-8" uuid="c912a302-5269-11df-98d9-080069138b88" uid="10818">
+        <specific value="1" description="Crusader (Vought F-8E (FN))" uuid="c913b2ce-5269-11df-a878-080069138b88" uid="10819"/>
+      </subcategory>
+      <subcategory value="12" description="F-35 Joint Strike Fighter (JSF)" uuid="c9156498-5269-11df-a54b-080069138b88" uid="10820">
+        <specific value="1" description="F-35A CTOL" uuid="c916755e-5269-11df-9a83-080069138b88" uid="10821"/>
+        <specific value="2" description="F-35C Naval" uuid="c9178976-5269-11df-a875-080069138b88" uid="10822"/>
+        <specific value="3" description="F-35B STOVL" uuid="c918938e-5269-11df-83fe-080069138b88" uid="10823"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Attack/Strike" uuid="c91af138-5269-11df-850d-080069138b88" uid="10824">
+      <subcategory value="1" description="McDonnell-Douglas A-4 Skyhawk" uuid="c91c0280-5269-11df-9743-080069138b88" uid="10825"/>
+      <subcategory value="2" description="A-6 Intruder" uuid="c91d1472-5269-11df-9cee-080069138b88" uid="10826">
+        <specific value="1" description="A-6A" uuid="c91e247a-5269-11df-b05a-080069138b88" uid="10827"/>
+        <specific value="2" description="A-6B" uuid="c91f3202-5269-11df-ac39-080069138b88" uid="10828"/>
+        <specific value="3" description="A-6C" uuid="c920419c-5269-11df-a03b-080069138b88" uid="10829"/>
+        <specific value="4" description="A-6E" uuid="c9214ee8-5269-11df-947b-080069138b88" uid="10830"/>
+      </subcategory>
+      <subcategory value="3" description="Vought A-7 Corsair II" uuid="c9230274-5269-11df-9d1a-080069138b88" uid="10831">
+        <specific value="1" description="A-7D" uuid="c9240df4-5269-11df-b46e-080069138b88" uid="10832"/>
+      </subcategory>
+      <subcategory value="4" description="Fairchild Republic A-10 Thunderbolt II" uuid="c925c0fe-5269-11df-a83f-080069138b88" uid="10833">
+        <specific value="1" description="A-10A" uuid="c926d3a4-5269-11df-9766-080069138b88" uid="10834"/>
+        <specific value="2" description="OA-10A" uuid="c927e2f8-5269-11df-942d-080069138b88" uid="10835"/>
+      </subcategory>
+      <subcategory value="5" description="Cessna 318E Dragonfly" uuid="c92998c8-5269-11df-8670-080069138b88" uid="10836">
+        <specific value="1" description="A-37" uuid="c92aa416-5269-11df-bd7d-080069138b88" uid="10837"/>
+      </subcategory>
+      <subcategory value="6" description="Grumman EA-6 Prowler" deprecated="1" uuid="c92c531a-5269-11df-8d20-080069138b88" uid="10838">
+        <specific value="1" description="EA-6A" deprecated="1" uuid="c92d687c-5269-11df-8ded-080069138b88" uid="10839"/>
+        <specific value="2" description="EA-6B" deprecated="1" uuid="c92e7a64-5269-11df-9929-080069138b88" uid="10840"/>
+      </subcategory>
+      <subcategory value="7" description="Grumman A-6 Intruder Tanker" deprecated="1" uuid="c9302bac-5269-11df-9daf-080069138b88" uid="10841">
+        <specific value="1" description="KA-6D" deprecated="1" uuid="c9313b6e-5269-11df-b640-080069138b88" uid="10842"/>
+        <specific value="2" description="KA-6H" deprecated="1" uuid="c9324b4e-5269-11df-b9f3-080069138b88" uid="10843"/>
+      </subcategory>
+      <subcategory value="8" description="McDonnell-Douglas AV-8B Harrier II" uuid="c933fd54-5269-11df-b790-080069138b88" uid="10844">
+        <specific value="1" description="AV-8B" uuid="c93510fe-5269-11df-9721-080069138b88" uid="10845"/>
+        <specific value="2" description="TAV-8B" uuid="c9361b52-5269-11df-9817-080069138b88" uid="10846"/>
+        <specific value="3" description="Harrier GR. Mk 5" uuid="c9372c0e-5269-11df-91ae-080069138b88" uid="10847"/>
+        <specific value="4" description="Harrier GR. Mk 5A" uuid="c9383e32-5269-11df-b401-080069138b88" uid="10848"/>
+        <specific value="5" description="Harrier GR. Mk 7" uuid="c9394cf0-5269-11df-90fd-080069138b88" uid="10849"/>
+        <specific value="6" description="Harrier T. Mk 10" uuid="c93a866a-5269-11df-85e6-080069138b88" uid="10850"/>
+        <specific value="7" description="VA.2 Matador II" uuid="c93b9cc6-5269-11df-a832-080069138b88" uid="10851"/>
+      </subcategory>
+      <subcategory value="9" description="Rockwell (Lockheed) AC-130U Spectre" deprecated="1" uuid="c93d5002-5269-11df-a6fa-080069138b88" uid="10852"/>
+      <subcategory value="10" description="McDonnell-Douglas F-4 Phantom II" uuid="c93e6348-5269-11df-a6e3-080069138b88" uid="10853">
+        <specific value="1" description="F-4G Wild Weasel" uuid="c93f75ee-5269-11df-ba59-080069138b88" uid="10854"/>
+      </subcategory>
+      <subcategory value="11" description="Lockheed F-117A" uuid="c94127ea-5269-11df-ab50-080069138b88" uid="10855"/>
+      <subcategory value="12" description="General Dynamics F-111" uuid="c9423acc-5269-11df-9335-080069138b88" uid="10856">
+        <specific value="1" description="F-111E" uuid="c943457a-5269-11df-94ed-080069138b88" uid="10857"/>
+        <specific value="2" description="F-111F" uuid="c94455e6-5269-11df-acc1-080069138b88" uid="10858"/>
+        <specific value="3" description="F-111C" uuid="c9456774-5269-11df-ac54-080069138b88" uid="10859"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Bomber" uuid="c947cf78-5269-11df-8efa-080069138b88" uid="10860">
+      <subcategory value="1" description="Rockwell International B-1" uuid="c948dea4-5269-11df-8659-080069138b88" uid="10861">
+        <specific value="1" description="B-1B" uuid="c949e9ca-5269-11df-9f3e-080069138b88" uid="10862"/>
+      </subcategory>
+      <subcategory value="2" description="Northrop B-2" uuid="c94b9d06-5269-11df-84e8-080069138b88" uid="10863"/>
+      <subcategory value="3" description="Boeing B-52 Stratofortress" uuid="c94cad90-5269-11df-8ca2-080069138b88" uid="10864">
+        <specific value="1" description="B-52G" uuid="c94dbdde-5269-11df-89f6-080069138b88" uid="10865"/>
+        <specific value="2" description="B-52H" uuid="c94ecb66-5269-11df-8487-080069138b88" uid="10866"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Cargo/Tanker" uuid="c9511d4e-5269-11df-a480-080069138b88" uid="10867">
+      <subcategory value="1" description="Lockheed C-130 (Model 382) Hercules" uuid="c9522b1c-5269-11df-9bbc-080069138b88" uid="10868">
+        <specific value="1" description="C-130" uuid="c9533b92-5269-11df-bbc4-080069138b88" uid="10869"/>
+        <specific value="2" description="AC-130" uuid="c9544a14-5269-11df-aeb3-080069138b88" uid="10870">
+          <extra value="1" description="AC-130A" uuid="c95557b0-5269-11df-a66e-080069138b88" uid="10871"/>
+          <extra value="2" description="AC-130E" uuid="c95665a6-5269-11df-8020-080069138b88" uid="10872"/>
+          <extra value="3" description="AC-130H" uuid="c957746e-5269-11df-82bf-080069138b88" uid="10873"/>
+          <extra value="4" description="AC-130U" uuid="c95888e0-5269-11df-a79b-080069138b88" uid="10874"/>
+        </specific>
+        <specific value="3" description="DC-130" uuid="c95a3c12-5269-11df-99e0-080069138b88" uid="10875"/>
+        <specific value="4" description="EC-130E Commando Solo" uuid="c95b4a08-5269-11df-91d2-080069138b88" uid="10876"/>
+        <specific value="5" description="HC-130" uuid="c95c5b8c-5269-11df-aa6e-080069138b88" uid="10877"/>
+        <specific value="6" description="JC-130" uuid="c95d6964-5269-11df-b8ac-080069138b88" uid="10878"/>
+        <specific value="7" description="LC-130" uuid="c95e7958-5269-11df-a109-080069138b88" uid="10879"/>
+        <specific value="8" description="MC-130" uuid="c95f88f2-5269-11df-988e-080069138b88" uid="10880">
+          <extra value="1" description="MC-130E" uuid="c9609620-5269-11df-a582-080069138b88" uid="10881"/>
+          <extra value="2" description="MC-130P" uuid="c961a4d4-5269-11df-9f8b-080069138b88" uid="10882"/>
+          <extra value="3" description="MC-130H" uuid="c962b342-5269-11df-866d-080069138b88" uid="10883"/>
+        </specific>
+        <specific value="9" description="NC-130" uuid="c9646188-5269-11df-890b-080069138b88" uid="10884"/>
+        <specific value="10" description="RC-130" uuid="c9656fa6-5269-11df-b846-080069138b88" uid="10885"/>
+        <specific value="11" description="WC-130" uuid="c96680c6-5269-11df-9eb5-080069138b88" uid="10886"/>
+        <specific value="12" description="TC-130" uuid="c96790ba-5269-11df-beab-080069138b88" uid="10887"/>
+        <specific value="13" description="KC-130" uuid="c96898d4-5269-11df-9c02-080069138b88" uid="10888"/>
+        <specific value="14" description="CC-130" uuid="c969a904-5269-11df-977e-080069138b88" uid="10889"/>
+        <specific value="15" description="Hercules C. Mk 1" uuid="c96abd12-5269-11df-9959-080069138b88" uid="10890"/>
+        <specific value="16" description="Hercules C. Mk 2" uuid="c96bc5fe-5269-11df-b358-080069138b88" uid="10891"/>
+        <specific value="17" description="Hercules C. Mk 3P" uuid="c96cd700-5269-11df-8861-080069138b88" uid="10892"/>
+        <specific value="18" description="(deprecated)" deprecated="1" uuid="c96dea32-5269-11df-a7a4-080069138b88" uid="10893"/>
+        <specific value="19" description="T.10" uuid="c96ef616-5269-11df-adc0-080069138b88" uid="10894"/>
+        <specific value="20" description="TK.10" uuid="c97003ee-5269-11df-a267-080069138b88" uid="10895"/>
+        <specific value="21" description="TL.10" uuid="c97117c0-5269-11df-a18b-080069138b88" uid="10896"/>
+        <specific value="22" description="Tp 84" uuid="c972208e-5269-11df-a27a-080069138b88" uid="10897"/>
+        <specific value="23" description="C-130H" uuid="c9732f88-5269-11df-935a-080069138b88" uid="10898"/>
+        <specific value="24" description="C-130H-30" uuid="c97441de-5269-11df-9c9f-080069138b88" uid="10899"/>
+        <specific value="25" description="KC-130H" uuid="c9754d86-5269-11df-bdfc-080069138b88" uid="10900"/>
+        <specific value="26" description="C-130H-MP" uuid="c97667f2-5269-11df-9ca9-080069138b88" uid="10901"/>
+        <specific value="27" description="VC-130H" uuid="c9778aba-5269-11df-9413-080069138b88" uid="10902"/>
+        <specific value="28" description="C-130J" uuid="c978943c-5269-11df-8625-080069138b88" uid="10903"/>
+        <specific value="29" description="C-130J-30" uuid="c979a408-5269-11df-92b9-080069138b88" uid="10904"/>
+        <specific value="30" description="EC-130J Commando Solo" uuid="c97ab4d8-5269-11df-908c-080069138b88" uid="10905"/>
+        <specific value="31" description="KC-130T" status="new" uuid="46c096f6-2570-4595-a835-b991b7f54832" uid="22852">
+          <cr value="2194"/>
+        </specific>
+        <specific value="32" description="EC-130 Senior Scout" status="new" uuid="9d9f7289-cd15-460b-8174-e35ffcea2600" uid="22853">
+          <cr value="2194"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="Lockheed C-5 Galaxy" uuid="c97c699a-5269-11df-a5a3-080069138b88" uid="10906">
+        <specific value="1" description="C-5A" uuid="c97d72f4-5269-11df-b289-080069138b88" uid="10907"/>
+        <specific value="2" description="C-5B" uuid="c97e827a-5269-11df-a352-080069138b88" uid="10908"/>
+      </subcategory>
+      <subcategory value="3" description="Lockheed C-141 Starlifter" uuid="c9803b2e-5269-11df-a3cf-080069138b88" uid="10909">
+        <specific value="1" description="C-141A" uuid="c9814c62-5269-11df-bc0e-080069138b88" uid="10910"/>
+        <specific value="2" description="C-141B" uuid="c9825490-5269-11df-ab66-080069138b88" uid="10911"/>
+      </subcategory>
+      <subcategory value="4" description="C-135" uuid="c98405d8-5269-11df-a03c-080069138b88" uid="10912"/>
+      <subcategory value="5" description="Boeing KC-135 Stratotanker" uuid="c9851856-5269-11df-9523-080069138b88" uid="10913">
+        <specific value="1" description="KC-135A" uuid="c9862b9c-5269-11df-98e2-080069138b88" uid="10914"/>
+        <specific value="2" description="KC-135E" uuid="c987347e-5269-11df-91d4-080069138b88" uid="10915"/>
+        <specific value="3" description="KC-135Q" uuid="c98844d6-5269-11df-ac3f-080069138b88" uid="10916"/>
+        <specific value="4" description="KC-135R" uuid="c9895394-5269-11df-8093-080069138b88" uid="10917"/>
+      </subcategory>
+      <subcategory value="6" description="McDonnell-Douglas KC-10 Extender" uuid="c98b059a-5269-11df-960c-080069138b88" uid="10918">
+        <specific value="1" description="KC-10A" uuid="c98c1002-5269-11df-831c-080069138b88" uid="10919"/>
+      </subcategory>
+      <subcategory value="7" description="Boeing 707 tanker/transport" uuid="c98dc38e-5269-11df-9ff7-080069138b88" uid="10920">
+        <specific value="1" description="KE-3A" deprecated="1" uuid="c98ed378-5269-11df-a1a0-080069138b88" uid="10921"/>
+        <specific value="2" description="T.17" uuid="c98fe3da-5269-11df-92e5-080069138b88" uid="10922"/>
+      </subcategory>
+      <subcategory value="8" description="Boeing 707" uuid="c991920c-5269-11df-b1f4-080069138b88" uid="10923">
+        <specific value="1" description="VC-137" uuid="c9929eae-5269-11df-acb2-080069138b88" uid="10924"/>
+        <specific value="2" description="E-6A" deprecated="1" uuid="c993af24-5269-11df-bc3e-080069138b88" uid="10925"/>
+        <specific value="3" description="E-8" deprecated="1" uuid="c994c116-5269-11df-a444-080069138b88" uid="10926"/>
+      </subcategory>
+      <subcategory value="9" description="McDonnell-Douglas C-17A" uuid="c9969f90-5269-11df-b1e7-080069138b88" uid="10927"/>
+      <subcategory value="10" description="Boeing 747" uuid="c997af3e-5269-11df-bc75-080069138b88" uid="10928">
+        <specific value="1" description="C-25A" uuid="c998c14e-5269-11df-8f9a-080069138b88" uid="10929"/>
+        <specific value="2" description="VC-25A &quot;Air Force One&quot;" uuid="c999d5d4-5269-11df-9fae-080069138b88" uid="10930"/>
+        <specific value="3" description="Boeing/Rockwell YAL-1 Airborne Laser (ABL)" uuid="c99ae992-5269-11df-a6b4-080069138b88" uid="10931"/>
+      </subcategory>
+      <subcategory value="11" description="Gulfstream Aerospace Gulfstream III" uuid="c99c9b3e-5269-11df-b1db-080069138b88" uid="10932">
+        <specific value="1" description="C-20" uuid="c99daa10-5269-11df-84d8-080069138b88" uid="10933"/>
+      </subcategory>
+      <subcategory value="12" description="Learjet 35A/36A" uuid="c99f5d1a-5269-11df-b08c-080069138b88" uid="10934">
+        <specific value="1" description="C-21A" uuid="c9a06d18-5269-11df-b279-080069138b88" uid="10935"/>
+      </subcategory>
+      <subcategory value="13" description="Lockheed Model 1329-25 Jetstar II" uuid="c9a22072-5269-11df-a772-080069138b88" uid="10936">
+        <specific value="1" description="C-140" uuid="c9a32f44-5269-11df-a2a9-080069138b88" uid="10937"/>
+      </subcategory>
+      <subcategory value="14" description="Douglas DC-3" uuid="c9a4e3ca-5269-11df-abd5-080069138b88" uid="10938">
+        <specific value="1" description="C-47" uuid="c9a5eda6-5269-11df-bbbf-080069138b88" uid="10939"/>
+        <specific value="2" description="R4D" uuid="c9a6fb2e-5269-11df-84b1-080069138b88" uid="10940"/>
+        <specific value="3" description="Dakota" uuid="c9a80dc0-5269-11df-a2cb-080069138b88" uid="10941"/>
+      </subcategory>
+      <subcategory value="15" description="McDonnell-Douglas DC-9" uuid="c9a9bfb2-5269-11df-9306-080069138b88" uid="10942">
+        <specific value="1" description="C-9A" uuid="c9aac998-5269-11df-8723-080069138b88" uid="10943"/>
+        <specific value="2" description="VC-9C" uuid="c9abd784-5269-11df-b5d4-080069138b88" uid="10944"/>
+        <specific value="3" description="C-9B" uuid="c9acea34-5269-11df-991c-080069138b88" uid="10945"/>
+      </subcategory>
+      <subcategory value="16" description="Beechcraft Super King Air 200/B200" uuid="c9ae99ba-5269-11df-b283-080069138b88" uid="10946">
+        <specific value="1" description="C-12" uuid="c9afa710-5269-11df-ba0e-080069138b88" uid="10947"/>
+      </subcategory>
+      <subcategory value="17" description="Bell/Boeing V-22 Osprey" uuid="c9b15894-5269-11df-b872-080069138b88" uid="10948">
+        <specific value="1" description="CV-22A" uuid="c9b26856-5269-11df-b693-080069138b88" uid="10949"/>
+        <specific value="2" description="CV-22B" uuid="c9b376b0-5269-11df-b84c-080069138b88" uid="10950"/>
+        <specific value="11" description="MV-22A" uuid="c9b48fdc-5269-11df-896e-080069138b88" uid="10951"/>
+        <specific value="12" description="MV-22B" uuid="c9b59f62-5269-11df-bf5a-080069138b88" uid="10952"/>
+        <specific value="21" description="HV-22A" uuid="c9b6af7e-5269-11df-ae83-080069138b88" uid="10953"/>
+        <specific value="22" description="HV-22B" uuid="c9b7bd06-5269-11df-b0b1-080069138b88" uid="10954"/>
+      </subcategory>
+      <subcategory value="18" description="Rockwell T-39 Saberliner" uuid="c9b96b06-5269-11df-bf99-080069138b88" uid="10955"/>
+      <subcategory value="19" description="Grumman C-2A Greyhound (COD)" uuid="c9ba7c4e-5269-11df-b8fa-080069138b88" uid="10956"/>
+      <subcategory value="20" description="(deprecated)" deprecated="1" uuid="c9bb9106-5269-11df-a9ce-080069138b88" uid="10957"/>
+      <subcategory value="21" description="Lockheed Model L100" uuid="c9bc9bb4-5269-11df-8773-080069138b88" uid="10958">
+        <specific value="1" description="L100-30 (hospital)" uuid="c9bdab44-5269-11df-87bc-080069138b88" uid="10959"/>
+      </subcategory>
+      <subcategory value="22" description="Grumman KA-6 Intruder Tanker" deprecated="1" uuid="c9bf5d72-5269-11df-ab91-080069138b88" uid="10960">
+        <specific value="1" description="KA-6D" deprecated="1" uuid="c9c06dc0-5269-11df-a48f-080069138b88" uid="10961"/>
+        <specific value="2" description="KA-6H" deprecated="1" uuid="c9c179e0-5269-11df-b96e-080069138b88" uid="10962"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Antisubmarine/patrol/observation" uuid="c9c3d0a0-5269-11df-ab2c-080069138b88" uid="10963">
+      <subcategory value="1" description="Lockheed Model 185/285 Orion" uuid="c9c4db58-5269-11df-a6b6-080069138b88" uid="10964">
+        <specific value="1" description="P-3" uuid="c9c5ef20-5269-11df-bdba-080069138b88" uid="10965"/>
+        <specific value="2" description="P-3C" uuid="c9c6fdd4-5269-11df-bc1a-080069138b88" uid="10966"/>
+        <specific value="3" description="UP-3" uuid="c9c80742-5269-11df-9489-080069138b88" uid="10967"/>
+        <specific value="4" description="UP-3C" uuid="c9c91952-5269-11df-a3a9-080069138b88" uid="10968"/>
+        <specific value="5" description="EP-3" uuid="c9ca2752-5269-11df-8faa-080069138b88" uid="10969"/>
+        <specific value="6" description="P-3J" uuid="c9cb30f2-5269-11df-a8ea-080069138b88" uid="10970"/>
+        <specific value="7" description="P-3W" uuid="c9cc40c8-5269-11df-b4ff-080069138b88" uid="10971"/>
+        <specific value="8" description="P-3 AEW&amp;C" uuid="c9cd4dce-5269-11df-acb0-080069138b88" uid="10972"/>
+        <specific value="9" description="CF-140 Aurora" uuid="c9ce5b6a-5269-11df-835d-080069138b88" uid="10973"/>
+        <specific value="10" description="CP-140 Arcturus" uuid="c9cf6a96-5269-11df-8cfc-080069138b88" uid="10974"/>
+        <specific value="11" description="EP-3E" uuid="c9d079c2-5269-11df-aac1-080069138b88" uid="10975"/>
+        <specific value="12" description="AP-3C (Australia)" uuid="c9d187a4-5269-11df-b8fc-080069138b88" uid="10976"/>
+        <specific value="13" description="P3-K (Canada)" uuid="c9d297de-5269-11df-af42-080069138b88" uid="10977"/>
+        <specific value="14" description="P-3F (Iran)" uuid="c9d3b22c-5269-11df-a044-080069138b88" uid="10978"/>
+      </subcategory>
+      <subcategory value="2" description="Lockheed S-3 Viking" uuid="c9d56540-5269-11df-aab7-080069138b88" uid="10979">
+        <specific value="1" description="S-3B" uuid="c9d66d5a-5269-11df-b8c7-080069138b88" uid="10980"/>
+        <specific value="2" description="ES-3" uuid="c9d77da8-5269-11df-b0a8-080069138b88" uid="10981"/>
+        <specific value="3" description="KS-3" uuid="c9d88d38-5269-11df-9fc5-080069138b88" uid="10982"/>
+      </subcategory>
+      <subcategory value="3" description="Rockwell International OV-10 Bronco" uuid="c9da3e8a-5269-11df-9ed8-080069138b88" uid="10983">
+        <specific value="1" description="OV-10" uuid="c9db497e-5269-11df-a825-080069138b88" uid="10984"/>
+        <specific value="2" description="OV-10D Plus" uuid="c9dc585a-5269-11df-a818-080069138b88" uid="10985"/>
+      </subcategory>
+      <subcategory value="4" description="Schweizer SA 2-37A" uuid="c9de0a10-5269-11df-9e1a-080069138b88" uid="10986">
+        <specific value="1" description="RG-8A" uuid="c9df17e8-5269-11df-a19d-080069138b88" uid="10987"/>
+      </subcategory>
+      <subcategory value="5" description="Boeing P-8 Multi-Mission Maritime Aircraft (MMA)" uuid="c9e0ca0c-5269-11df-b44c-080069138b88" uid="10988">
+        <specific value="1" description="P-8A" uuid="c9e1d4ba-5269-11df-893e-080069138b88" uid="10989"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Electronic Warfare (EW)" uuid="c9e42b3e-5269-11df-8c8b-080069138b88" uid="10990">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="c9e534f2-5269-11df-9f10-080069138b88" uid="10991"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="c9e645fe-5269-11df-9f1e-080069138b88" uid="10992"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="c9e758e0-5269-11df-98ab-080069138b88" uid="10993"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="c9e86a14-5269-11df-a166-080069138b88" uid="10994"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="c9e97954-5269-11df-9e33-080069138b88" uid="10995"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="c9ea8b46-5269-11df-aafb-080069138b88" uid="10996"/>
+      <subcategory value="7" description="Grumman (General Dynamics) EF-111 Raven" uuid="c9eb9af4-5269-11df-b466-080069138b88" uid="10997">
+        <specific value="1" description="EF-111A" uuid="c9ecac50-5269-11df-b22a-080069138b88" uid="10998"/>
+      </subcategory>
+      <subcategory value="8" description="EC-130 Compass Call Electronic Combat (C2W)" uuid="c9ee5a6e-5269-11df-91fb-080069138b88" uid="10999"/>
+      <subcategory value="9" description="Grumman EA-6 Prowler" uuid="c9ef6f76-5269-11df-bd60-080069138b88" uid="11000">
+        <specific value="1" description="EA-6A" uuid="c9f079fc-5269-11df-8190-080069138b88" uid="11001"/>
+        <specific value="2" description="EA-6B" uuid="c9f19008-5269-11df-8e07-080069138b88" uid="11002"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Reconnaissance" uuid="c9f40af4-5269-11df-8db4-080069138b88" uid="11003">
+      <subcategory value="1" description="Lockheed SR-71 Blackbird" uuid="c9f51ae8-5269-11df-bcf2-080069138b88" uid="11004">
+        <specific value="1" description="SR-71B" uuid="c9f62dca-5269-11df-b0f4-080069138b88" uid="11005"/>
+      </subcategory>
+      <subcategory value="2" description="Lockheed TR-1" deprecated="1" uuid="c9f7e21e-5269-11df-a7a4-080069138b88" uid="11006">
+        <specific value="1" description="TR-1A" deprecated="1" uuid="c9f8f1ae-5269-11df-b88d-080069138b88" uid="11007"/>
+        <specific value="2" description="TR-1B" deprecated="1" uuid="c9f9fbe4-5269-11df-895f-080069138b88" uid="11008"/>
+      </subcategory>
+      <subcategory value="3" description="Lockheed U-2" uuid="c9fbb088-5269-11df-a6ea-080069138b88" uid="11009">
+        <specific value="1" description="U-2R" uuid="c9fcbfc8-5269-11df-a5c3-080069138b88" uid="11010"/>
+        <specific value="2" description="ER-2" uuid="c9fdcf6c-5269-11df-8974-080069138b88" uid="11011"/>
+        <specific value="3" description="U-2S" uuid="c9fed75e-5269-11df-82ef-080069138b88" uid="11012"/>
+      </subcategory>
+      <subcategory value="4" description="McDonnell-Douglas F-4 Phantom II" uuid="ca0089f0-5269-11df-83cc-080069138b88" uid="11013">
+        <specific value="1" description="RF-4B" uuid="ca019aac-5269-11df-b272-080069138b88" uid="11014"/>
+        <specific value="2" description="YRF-4C" uuid="ca02acb2-5269-11df-b66a-080069138b88" uid="11015"/>
+        <specific value="3" description="RF-4C" uuid="ca03b5c6-5269-11df-aba5-080069138b88" uid="11016"/>
+        <specific value="4" description="RF-4E" uuid="ca04c894-5269-11df-80aa-080069138b88" uid="11017"/>
+        <specific value="5" description="RF-4EJ" uuid="ca05d7b6-5269-11df-9008-080069138b88" uid="11018"/>
+      </subcategory>
+      <subcategory value="5" description="Sadler A-22 LASA" uuid="ca0787c8-5269-11df-bad6-080069138b88" uid="11019"/>
+      <subcategory value="6" description="Boeing Canada DHC-7 Airborne Reconnaissance--Low (ARL)" uuid="ca089582-5269-11df-8f6c-080069138b88" uid="11020"/>
+      <subcategory value="7" description="Boeing RC-135" uuid="ca09a918-5269-11df-8227-080069138b88" uid="11021">
+        <specific value="1" description="RC-135S Cobra Ball" uuid="ca0ab89e-5269-11df-85cd-080069138b88" uid="11022"/>
+        <specific value="2" description="RC-135U Combat Sent" uuid="ca0bc626-5269-11df-80d1-080069138b88" uid="11023"/>
+        <specific value="3" description="RC-135 V/W Rivet Joint" uuid="ca0cd584-5269-11df-b870-080069138b88" uid="11024"/>
+        <specific value="4" description="RC-135X Cobra Eye" uuid="ca0de64a-5269-11df-aeb6-080069138b88" uid="11025"/>
+      </subcategory>
+      <subcategory value="8" description="Beechcraft Super King AIR 200/B200" uuid="ca0f9a1c-5269-11df-8c64-080069138b88" uid="11026">
+        <specific value="1" description="RC-12H Guardrail Common Sensor" uuid="ca10af38-5269-11df-a455-080069138b88" uid="11027"/>
+        <specific value="2" description="RC-12D" uuid="ca11c238-5269-11df-abea-080069138b88" uid="11028"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Surveillance / C2 (Airborne Early Warning)" uuid="ca141538-5269-11df-9136-080069138b88" uid="11029">
+      <subcategory value="1" description="Grumman E-2 Hawkeye" uuid="ca1525b8-5269-11df-884c-080069138b88" uid="11030">
+        <specific value="1" description="E-2C" uuid="ca1635b6-5269-11df-8251-080069138b88" uid="11031"/>
+        <specific value="2" description="TE-2C" uuid="ca174492-5269-11df-8a2b-080069138b88" uid="11032"/>
+      </subcategory>
+      <subcategory value="2" description="EA-3" uuid="ca18f6f2-5269-11df-8618-080069138b88" uid="11033">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="ca1a00c4-5269-11df-adf8-080069138b88" uid="11034"/>
+        <specific value="2" description="EA-3B" uuid="ca1b12ca-5269-11df-a87a-080069138b88" uid="11035"/>
+      </subcategory>
+      <subcategory value="3" description="Boeing E-6A Mercury (TACAMO II)" uuid="ca1cc46c-5269-11df-8b2e-080069138b88" uid="11036"/>
+      <subcategory value="4" description="Boeing E-3 Sentry" uuid="ca1dd4e2-5269-11df-9e07-080069138b88" uid="11037">
+        <specific value="1" description="E-3A Airborne Warning and Control System (AWACS)" uuid="ca1ee080-5269-11df-ac1c-080069138b88" uid="11038"/>
+        <specific value="2" description="E-3B AWACS" uuid="ca1ff614-5269-11df-89f3-080069138b88" uid="11039"/>
+        <specific value="3" description="E-3C AWACS" uuid="ca210518-5269-11df-aabc-080069138b88" uid="11040"/>
+        <specific value="4" description="E-3D Sentry AEW. Mk 1" uuid="ca220fa8-5269-11df-a0ce-080069138b88" uid="11041"/>
+        <specific value="5" description="E-3F System de Detection Aeroporte" uuid="ca232442-5269-11df-bc3b-080069138b88" uid="11042"/>
+        <specific value="6" description="KE-3A AWACS (Saudi Arabia)" uuid="ca243508-5269-11df-b58e-080069138b88" uid="11043"/>
+      </subcategory>
+      <subcategory value="5" description="Boeing E-4 Advanced Airborne Command Post (AABNCP)" uuid="ca25e54c-5269-11df-8b6c-080069138b88" uid="11044">
+        <specific value="1" description="E-4A" uuid="ca26f5fe-5269-11df-88d0-080069138b88" uid="11045"/>
+        <specific value="2" description="E-4B" uuid="ca28071e-5269-11df-a87e-080069138b88" uid="11046"/>
+      </subcategory>
+      <subcategory value="6" description="E-8 (Joint STARS/JSTARS)" uuid="ca29b6b8-5269-11df-b7d3-080069138b88" uid="11047">
+        <specific value="1" description="E-8A" uuid="ca2ac882-5269-11df-b5ce-080069138b88" uid="11048"/>
+        <specific value="2" description="E-8C" uuid="ca2bd236-5269-11df-96c1-080069138b88" uid="11049"/>
+      </subcategory>
+      <subcategory value="7" description="Aerostat" uuid="ca2d8068-5269-11df-bd47-080069138b88" uid="11050"/>
+      <subcategory value="8" description="EC-130E Airborne Command, Control and Communications (ABCCC)" uuid="ca2e9494-5269-11df-a8a9-080069138b88" uid="11051"/>
+      <subcategory value="9" description="EC-135 Airborne Command Post" uuid="ca2fb0ea-5269-11df-a9e3-080069138b88" uid="11052"/>
+      <subcategory value="10" description="JLENS Aerostats" uuid="ca30be9a-5269-11df-ad56-080069138b88" uid="11053">
+        <specific value="1" description="JLENS PTIR Aerostat Platform" uuid="ca31d280-5269-11df-a7fb-080069138b88" uid="11054"/>
+        <specific value="2" description="JLENS SuR Aerostat Plaftorm" uuid="ca32e396-5269-11df-97d8-080069138b88" uid="11055"/>
+      </subcategory>
+    </category>
+    <category value="20" description="Attack helicopter" uuid="ca35359c-5269-11df-b933-080069138b88" uid="11056">
+      <subcategory value="1" description="McDonnell-Douglas AH-64 Apache" uuid="ca364450-5269-11df-ae66-080069138b88" uid="11057">
+        <specific value="1" description="AH-64A" uuid="ca374f9e-5269-11df-ac90-080069138b88" uid="11058"/>
+        <specific value="2" description="AH-64B" uuid="ca3863a2-5269-11df-9f54-080069138b88" uid="11059"/>
+        <specific value="3" description="AH-64C" uuid="ca3971de-5269-11df-8823-080069138b88" uid="11060"/>
+        <specific value="4" description="AH-64D with Longbow Radar" uuid="ca3a7c78-5269-11df-b4f5-080069138b88" uid="11061"/>
+        <specific value="5" description="Petan (Cobra)" uuid="ca3b8d48-5269-11df-84d2-080069138b88" uid="11062"/>
+        <specific value="6" description="AH-64D without Longbow Radar" uuid="ca3ca03e-5269-11df-8712-080069138b88" uid="11063"/>
+      </subcategory>
+      <subcategory value="2" description="Bell Model 209 Hueycobra, Seacobra, Supercobra" uuid="ca3e4fb0-5269-11df-bfe4-080069138b88" uid="11064">
+        <specific value="1" description="AH-1E" uuid="ca3f5bda-5269-11df-b8fe-080069138b88" uid="11065"/>
+        <specific value="2" description="AH-1F" uuid="ca4070a6-5269-11df-9b0d-080069138b88" uid="11066"/>
+        <specific value="3" description="AH-1G" uuid="ca4180b8-5269-11df-bac6-080069138b88" uid="11067"/>
+        <specific value="4" description="AH-1J" uuid="ca4289c2-5269-11df-95b2-080069138b88" uid="11068"/>
+        <specific value="5" description="AH-1P" uuid="ca439c04-5269-11df-a1db-080069138b88" uid="11069"/>
+        <specific value="6" description="AH-1Q" uuid="ca44ab1c-5269-11df-9f58-080069138b88" uid="11070"/>
+        <specific value="7" description="AH-1R" uuid="ca45b3fe-5269-11df-88d5-080069138b88" uid="11071"/>
+        <specific value="8" description="AH-1S" uuid="ca46c1d6-5269-11df-9262-080069138b88" uid="11072"/>
+        <specific value="9" description="AH-1T" uuid="ca47d44a-5269-11df-8255-080069138b88" uid="11073"/>
+        <specific value="10" description="AH-1W" uuid="ca48ddb8-5269-11df-a100-080069138b88" uid="11074"/>
+        <specific value="11" description="AH-1W Venom" uuid="ca49ead2-5269-11df-8550-080069138b88" uid="11075"/>
+        <specific value="12" description="TH-1S" uuid="ca4afc60-5269-11df-96ae-080069138b88" uid="11076"/>
+        <specific value="13" description="TH-1W" uuid="ca4c08e4-5269-11df-9ea9-080069138b88" uid="11077"/>
+      </subcategory>
+      <subcategory value="3" description="Bell AH-1(4B)W Viper" uuid="ca4dc09e-5269-11df-894e-080069138b88" uid="11078"/>
+      <subcategory value="4" description="Boeing/Sikorsky RAH-66 Comanche" uuid="ca4ef644-5269-11df-b5f0-080069138b88" uid="11079">
+        <specific value="1" description="RAH-66 with LONGBOW radar" uuid="ca500ec6-5269-11df-85bf-080069138b88" uid="11080"/>
+      </subcategory>
+      <subcategory value="5" description="McDonnell-Douglas 500/530 Defender" uuid="ca51c14e-5269-11df-94c8-080069138b88" uid="11081">
+        <specific value="1" description="MH-6" deprecated="1" uuid="ca52d32c-5269-11df-ab2d-080069138b88" uid="11082"/>
+        <specific value="2" description="AH-6" uuid="ca53e190-5269-11df-b6c7-080069138b88" uid="11083"/>
+        <specific value="3" description="500MG" uuid="ca54f030-5269-11df-9f56-080069138b88" uid="11084"/>
+        <specific value="4" description="530MG" uuid="ca55ffd4-5269-11df-8e20-080069138b88" uid="11085"/>
+        <specific value="5" description="MH-6J" deprecated="1" uuid="ca570ece-5269-11df-8ee1-080069138b88" uid="11086"/>
+        <specific value="6" description="500 D/E" uuid="ca581e90-5269-11df-a9f0-080069138b88" uid="11087"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Utility helicopter" uuid="ca5a6d30-5269-11df-87b7-080069138b88" uid="11088">
+      <subcategory value="1" description="Bell model 204 Iroquois" uuid="ca5b8058-5269-11df-8c7b-080069138b88" uid="11089">
+        <specific value="1" description="UH-1A" uuid="ca5c90ce-5269-11df-81af-080069138b88" uid="11090"/>
+        <specific value="2" description="UH-1B" uuid="ca5da00e-5269-11df-a496-080069138b88" uid="11091"/>
+        <specific value="3" description="UH-1C" uuid="ca5eacc4-5269-11df-86d1-080069138b88" uid="11092"/>
+        <specific value="4" description="UH-1E" uuid="ca5fbccc-5269-11df-a756-080069138b88" uid="11093"/>
+        <specific value="5" description="UH-1F" uuid="ca60d864-5269-11df-88dd-080069138b88" uid="11094"/>
+        <specific value="6" description="UH-1L" uuid="ca61e4ca-5269-11df-b63f-080069138b88" uid="11095"/>
+        <specific value="7" description="HH-1K" uuid="ca62f342-5269-11df-ae12-080069138b88" uid="11096"/>
+        <specific value="8" description="TH-1F" uuid="ca640390-5269-11df-8efc-080069138b88" uid="11097"/>
+        <specific value="9" description="TH-1L" uuid="ca650df8-5269-11df-a2c1-080069138b88" uid="11098"/>
+        <specific value="10" description="UH-1HP" uuid="ca66203a-5269-11df-860b-080069138b88" uid="11099"/>
+      </subcategory>
+      <subcategory value="2" description="Sikorsky S-70A" uuid="ca67ce80-5269-11df-80c5-080069138b88" uid="11100">
+        <specific value="1" description="UH-60A Blackhawk" uuid="ca68dd66-5269-11df-be94-080069138b88" uid="11101"/>
+        <specific value="2" description="UH-60L Blackhawk" uuid="ca69eb8e-5269-11df-b5a5-080069138b88" uid="11102"/>
+        <specific value="3" description="EH-60C" uuid="ca6afb50-5269-11df-9be4-080069138b88" uid="11103"/>
+        <specific value="4" description="MH-60K" deprecated="1" uuid="ca6c0a72-5269-11df-bda3-080069138b88" uid="11104"/>
+        <specific value="5" description="VH-60N" uuid="ca6d236c-5269-11df-a059-080069138b88" uid="11105"/>
+        <specific value="6" description="UH-60P" uuid="ca6e3324-5269-11df-8c82-080069138b88" uid="11106"/>
+        <specific value="7" description="S-70A-1" uuid="ca6f443a-5269-11df-b185-080069138b88" uid="11107"/>
+        <specific value="8" description="S-70A-1L" uuid="ca704b78-5269-11df-bdfa-080069138b88" uid="11108"/>
+        <specific value="9" description="S-70A-5" uuid="ca715c84-5269-11df-8b57-080069138b88" uid="11109"/>
+        <specific value="10" description="S-70A-6" uuid="ca72701a-5269-11df-9565-080069138b88" uid="11110"/>
+        <specific value="11" description="S-70A-9" uuid="ca7379ce-5269-11df-8498-080069138b88" uid="11111"/>
+        <specific value="12" description="S-70A-A9" uuid="ca7488e6-5269-11df-b26f-080069138b88" uid="11112"/>
+        <specific value="13" description="S-70A-A11" uuid="ca7598f8-5269-11df-8b4c-080069138b88" uid="11113"/>
+        <specific value="14" description="S-70A-A12" uuid="ca76a522-5269-11df-8da4-080069138b88" uid="11114"/>
+        <specific value="15" description="S-70A-A14" uuid="ca77ba52-5269-11df-83fc-080069138b88" uid="11115"/>
+        <specific value="16" description="S-70A-A16" uuid="ca78dc02-5269-11df-9300-080069138b88" uid="11116"/>
+        <specific value="17" description="S-70A-A17" uuid="ca79e886-5269-11df-8cd4-080069138b88" uid="11117"/>
+        <specific value="18" description="S-70A-A18" uuid="ca7afbc2-5269-11df-942d-080069138b88" uid="11118"/>
+        <specific value="19" description="S-70A-A19" uuid="ca7c0bac-5269-11df-95ab-080069138b88" uid="11119"/>
+        <specific value="20" description="S-70A-A20" uuid="ca7d13d0-5269-11df-9d22-080069138b88" uid="11120"/>
+        <specific value="21" description="S-70A-A21" uuid="ca7e2432-5269-11df-b3d2-080069138b88" uid="11121"/>
+        <specific value="22" description="S-70A-A22" uuid="ca7f3818-5269-11df-b9ea-080069138b88" uid="11122"/>
+        <specific value="23" description="S-70A-A24" uuid="ca80403c-5269-11df-8cb3-080069138b88" uid="11123"/>
+      </subcategory>
+      <subcategory value="3" description="Boeing model 107" uuid="ca81eefa-5269-11df-b885-080069138b88" uid="11124">
+        <specific value="1" description="UH-46 Sea Knight" uuid="ca83002e-5269-11df-bf10-080069138b88" uid="11125"/>
+        <specific value="2" description="CH-46 Sea Knight" uuid="ca8413ce-5269-11df-938b-080069138b88" uid="11126">
+          <extra value="1" description="CH-46D" uuid="ca851c88-5269-11df-8059-080069138b88" uid="11127"/>
+          <extra value="2" description="CH-46E" uuid="ca862b1e-5269-11df-b0d6-080069138b88" uid="11128"/>
+        </specific>
+      </subcategory>
+      <subcategory value="4" description="S-70C" uuid="ca887a68-5269-11df-9b8e-080069138b88" uid="11129">
+        <specific value="1" description="H-60" uuid="ca898a0c-5269-11df-a62a-080069138b88" uid="11130"/>
+      </subcategory>
+      <subcategory value="5" description="Sikorsky H-76 Eagle" uuid="ca8b45ea-5269-11df-bf36-080069138b88" uid="11131"/>
+      <subcategory value="6" description="Sikorsky-S-76b" uuid="ca8c56a6-5269-11df-b7fc-080069138b88" uid="11132"/>
+    </category>
+    <category value="22" description="Antisubmarine Warfare/patrol helicopter" uuid="ca8e09d8-5269-11df-84eb-080069138b88" uid="11133">
+      <subcategory value="1" description="Kaman Seasprite and Super Seasprite" uuid="ca8f1bd4-5269-11df-8884-080069138b88" uid="11134">
+        <specific value="1" description="SH-2" uuid="ca9027d6-5269-11df-adce-080069138b88" uid="11135"/>
+      </subcategory>
+      <subcategory value="2" description="Agusta Sikorsky AS-61/ASH-3H Sea King" uuid="ca91d91e-5269-11df-bb0a-080069138b88" uid="11136">
+        <specific value="1" description="SH-3D" uuid="ca92e958-5269-11df-bdbc-080069138b88" uid="11137"/>
+        <specific value="2" description="SH-3H" uuid="ca93fc76-5269-11df-a1df-080069138b88" uid="11138"/>
+        <specific value="3" description="SH-3D/TS" uuid="ca9504f4-5269-11df-9127-080069138b88" uid="11139"/>
+        <specific value="4" description="ASH-3D" uuid="ca9613e4-5269-11df-af37-080069138b88" uid="11140"/>
+        <specific value="5" description="AS-61" uuid="ca972360-5269-11df-9028-080069138b88" uid="11141"/>
+        <specific value="6" description="SH-3B" uuid="ca983048-5269-11df-8fbb-080069138b88" uid="11142"/>
+      </subcategory>
+      <subcategory value="3" description="Sikorsky S-70B" uuid="ca99dd1c-5269-11df-9784-080069138b88" uid="11143">
+        <specific value="1" description="SH-60B Seahawk" uuid="ca9aed60-5269-11df-86e1-080069138b88" uid="11144"/>
+        <specific value="2" description="SH-60F Oceanhawk" uuid="ca9c0010-5269-11df-bd42-080069138b88" uid="11145"/>
+        <specific value="3" description="HH-60H" uuid="ca9d0adc-5269-11df-8f48-080069138b88" uid="11146"/>
+        <specific value="4" description="HH-60J Jayhawk" uuid="ca9e19f4-5269-11df-9e4b-080069138b88" uid="11147"/>
+        <specific value="5" description="HS.23" uuid="ca9f2b3c-5269-11df-ac51-080069138b88" uid="11148"/>
+        <specific value="6" description="XSH-60J" uuid="caa0387e-5269-11df-adad-080069138b88" uid="11149"/>
+        <specific value="7" description="UH-60J" uuid="caa1475a-5269-11df-b7cc-080069138b88" uid="11150"/>
+        <specific value="8" description="S-70B-2" uuid="caa25596-5269-11df-a573-080069138b88" uid="11151"/>
+        <specific value="9" description="MH-60R Seahawk" uuid="caa35fea-5269-11df-80da-080069138b88" uid="11152"/>
+      </subcategory>
+    </category>
+    <category value="23" description="Cargo helicopter" uuid="caa5b63c-5269-11df-a4c3-080069138b88" uid="11153">
+      <subcategory value="1" description="Boeing Models 114/414" uuid="caa6c0e0-5269-11df-9669-080069138b88" uid="11154">
+        <specific value="1" description="CH-47 Chinook" uuid="caa7d3cc-5269-11df-9a5a-080069138b88" uid="11155"/>
+        <specific value="2" description="CH-47B" uuid="caa8e2c6-5269-11df-b3a2-080069138b88" uid="11156"/>
+        <specific value="3" description="CH-47C" uuid="caaa17d6-5269-11df-8b16-080069138b88" uid="11157"/>
+        <specific value="4" description="CH-47D" uuid="caab2f36-5269-11df-8033-080069138b88" uid="11158"/>
+        <specific value="5" description="CH-147" uuid="caac3fa2-5269-11df-a3c0-080069138b88" uid="11159"/>
+        <specific value="6" description="Chinook HC.Mk 1" uuid="caad4df2-5269-11df-a280-080069138b88" uid="11160"/>
+        <specific value="7" description="Chinook HC.Mk 2" uuid="caae59e0-5269-11df-b8e6-080069138b88" uid="11161"/>
+        <specific value="8" description="HT.17" uuid="caaf6d8a-5269-11df-8dd7-080069138b88" uid="11162"/>
+      </subcategory>
+      <subcategory value="2" description="Sikorsky S-80/H-53" uuid="cab119fa-5269-11df-b070-080069138b88" uid="11163">
+        <specific value="1" description="CH-53E Super Stallion" uuid="cab229b2-5269-11df-af87-080069138b88" uid="11164"/>
+        <specific value="2" description="MH-53E Sea Dragon" uuid="cab338fc-5269-11df-973a-080069138b88" uid="11165"/>
+        <specific value="3" description="S-80E" uuid="cab4495e-5269-11df-8aa5-080069138b88" uid="11166"/>
+        <specific value="4" description="S-80M" uuid="cab557ae-5269-11df-8edc-080069138b88" uid="11167"/>
+      </subcategory>
+      <subcategory value="3" description="Sikorsky S-65A" uuid="cab70996-5269-11df-9351-080069138b88" uid="11168">
+        <specific value="1" description="CH-53A Sea Stallion" uuid="cab81368-5269-11df-90d5-080069138b88" uid="11169"/>
+        <specific value="2" description="HH-53B" uuid="cab92384-5269-11df-a72f-080069138b88" uid="11170"/>
+        <specific value="3" description="HH-53C" uuid="caba354e-5269-11df-93a4-080069138b88" uid="11171"/>
+        <specific value="4" description="CH-53A" uuid="cabb3dea-5269-11df-95e2-080069138b88" uid="11172"/>
+        <specific value="5" description="CH-53D" uuid="cabc4eb0-5269-11df-bfec-080069138b88" uid="11173"/>
+      </subcategory>
+    </category>
+    <category value="24" description="Observation helicopter" uuid="cabe9fd0-5269-11df-99ee-080069138b88" uid="11174">
+      <subcategory value="1" description="Bell Kiowa" uuid="cabfaefc-5269-11df-bd16-080069138b88" uid="11175">
+        <specific value="1" description="OH-58" uuid="cac0c198-5269-11df-846e-080069138b88" uid="11176"/>
+        <specific value="2" description="CH-136" uuid="cac1d150-5269-11df-83d1-080069138b88" uid="11177"/>
+        <specific value="3" description="OH-58C" uuid="cac2db36-5269-11df-b36b-080069138b88" uid="11178"/>
+      </subcategory>
+      <subcategory value="2" description="Bell Model 406 AHIP" uuid="cac48cc4-5269-11df-840b-080069138b88" uid="11179">
+        <specific value="1" description="OH-58D Kiowa/Kiowa Warrior" uuid="cac59dc6-5269-11df-9bf5-080069138b88" uid="11180"/>
+      </subcategory>
+      <subcategory value="3" description="Bell Model 406 CS Combat Scout" uuid="cac75288-5269-11df-b1b0-080069138b88" uid="11181">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="cac86d30-5269-11df-abf3-080069138b88" uid="11182"/>
+        <specific value="2" description="MH-58D Combat Scout" uuid="cac97806-5269-11df-8b10-080069138b88" uid="11183"/>
+      </subcategory>
+    </category>
+    <category value="25" description="Special Operations helicopter" uuid="cacbd088-5269-11df-b50f-080069138b88" uid="11184">
+      <subcategory value="1" description="Sikorsky S-70A" uuid="caccdc80-5269-11df-a655-080069138b88" uid="11185">
+        <specific value="1" description="MH-60A" uuid="cacded5a-5269-11df-935a-080069138b88" uid="11186"/>
+        <specific value="2" description="MH-60G Pave Hawk" uuid="caceffd8-5269-11df-98ea-080069138b88" uid="11187"/>
+        <specific value="3" description="MH-60K" uuid="cad00ae0-5269-11df-9df7-080069138b88" uid="11188"/>
+        <specific value="4" description="MH-60L" uuid="cad11a52-5269-11df-b9b6-080069138b88" uid="11189"/>
+        <specific value="5" description="HH-60G" uuid="cad22ae6-5269-11df-b374-080069138b88" uid="11190"/>
+        <specific value="6" description="MH 60S Knight Hawk" uuid="cad332e2-5269-11df-a6bf-080069138b88" uid="11191"/>
+      </subcategory>
+      <subcategory value="2" description="Boeing models 114/414" uuid="cad4e7ea-5269-11df-90d0-080069138b88" uid="11192">
+        <specific value="1" description="MH-47E" uuid="cad5f7d4-5269-11df-9f2a-080069138b88" uid="11193"/>
+      </subcategory>
+      <subcategory value="3" description="Sikorsky S-65/MH-53 Pave Low" uuid="cad7a728-5269-11df-9ed1-080069138b88" uid="11194">
+        <specific value="1" description="HH-53B" uuid="cad8ba5a-5269-11df-b812-080069138b88" uid="11195"/>
+        <specific value="2" description="HH-53C" uuid="cad9c6f2-5269-11df-8530-080069138b88" uid="11196"/>
+        <specific value="3" description="CH-53C" uuid="cadad6fa-5269-11df-8c17-080069138b88" uid="11197"/>
+        <specific value="4" description="MH-53J Pave Low III" uuid="cadbe784-5269-11df-9585-080069138b88" uid="11198"/>
+        <specific value="5" description="MH-53M Pave Low IV" uuid="cadcf340-5269-11df-911b-080069138b88" uid="11199"/>
+        <specific value="6" description="RH-53D" uuid="cade03d4-5269-11df-a901-080069138b88" uid="11200"/>
+      </subcategory>
+      <subcategory value="4" description="McDonnell-Douglas 500/530 Defender" uuid="cadfb6de-5269-11df-97af-080069138b88" uid="11201">
+        <specific value="1" description="MH-6" uuid="cae0c79a-5269-11df-9203-080069138b88" uid="11202"/>
+        <specific value="2" description="500MD" deprecated="1" uuid="cae1d02c-5269-11df-975f-080069138b88" uid="11203"/>
+        <specific value="3" description="MH-6J" uuid="cae2e296-5269-11df-862f-080069138b88" uid="11204"/>
+      </subcategory>
+    </category>
+    <category value="40" description="Trainer" uuid="cae5342e-5269-11df-b228-080069138b88" uid="11205">
+      <subcategory value="1" description="Cessna 172" uuid="cae64422-5269-11df-a1f5-080069138b88" uid="11206">
+        <specific value="1" description="T-41" uuid="cae75f10-5269-11df-bfc6-080069138b88" uid="11207"/>
+      </subcategory>
+      <subcategory value="2" description="Cessna 318" uuid="cae90d74-5269-11df-87fe-080069138b88" uid="11208">
+        <specific value="1" description="T-37" uuid="caea1de0-5269-11df-a5ab-080069138b88" uid="11209"/>
+      </subcategory>
+      <subcategory value="3" description="Northrop Talon" uuid="caebcfd2-5269-11df-894d-080069138b88" uid="11210">
+        <specific value="1" description="T-38" uuid="caecd954-5269-11df-aa60-080069138b88" uid="11211"/>
+      </subcategory>
+      <subcategory value="4" description="McDonnell-Douglas/BAe T45TS" uuid="caee8b32-5269-11df-8bd4-080069138b88" uid="11212">
+        <specific value="1" description="T-45 Goshawk" uuid="caef9b6c-5269-11df-922f-080069138b88" uid="11213"/>
+      </subcategory>
+      <subcategory value="5" description="Beechcraft T-34C" uuid="caf14c32-5269-11df-9d80-080069138b88" uid="11214">
+        <specific value="1" description="T-34C" uuid="caf25e24-5269-11df-83ff-080069138b88" uid="11215"/>
+      </subcategory>
+      <subcategory value="6" description="Beechcraft Sierrra 200/Sundowner 180" uuid="caf40d28-5269-11df-a6f1-080069138b88" uid="11216">
+        <specific value="1" description="CT-134A Musketeer II" uuid="caf519f2-5269-11df-a7b1-080069138b88" uid="11217"/>
+      </subcategory>
+      <subcategory value="7" description="Lockheed T-33" uuid="caf6cca2-5269-11df-8651-080069138b88" uid="11218">
+        <specific value="1" description="Silver Star" uuid="caf7dac0-5269-11df-a4f8-080069138b88" uid="11219"/>
+      </subcategory>
+      <subcategory value="8" description="Beechcraft Model 400A Beechjet" uuid="caf98b7c-5269-11df-ae69-080069138b88" uid="11220">
+        <specific value="1" description="T-1A Jayhawk" uuid="cafa9f1c-5269-11df-906f-080069138b88" uid="11221"/>
+      </subcategory>
+      <subcategory value="9" description="Boeing TC-135" uuid="cafc50a0-5269-11df-a926-080069138b88" uid="11222">
+        <specific value="1" description="TC-135W Rivet Joint Trainer" uuid="cafd59a0-5269-11df-b3ad-080069138b88" uid="11223"/>
+        <specific value="2" description="TC-135S Cobra Ball Trainer" uuid="cafe6e80-5269-11df-95c1-080069138b88" uid="11224"/>
+      </subcategory>
+      <subcategory value="10" description="Beachcraft Super King AIR 200/B200" deprecated="1" uuid="cb002072-5269-11df-9efd-080069138b88" uid="11225">
+        <specific value="1" description="RC-12H Guardrail Common Sensor" deprecated="1" uuid="cb0134e4-5269-11df-9f11-080069138b88" uid="11226"/>
+        <specific value="2" description="RC-12D" deprecated="1" uuid="cb02400a-5269-11df-b18b-080069138b88" uid="11227"/>
+      </subcategory>
+      <subcategory value="11" description="Cessna 208 Caravan" uuid="cb03f0ee-5269-11df-aed8-080069138b88" uid="11228"/>
+      <subcategory value="12" description="Cessna Citation" uuid="cb0505a6-5269-11df-b513-080069138b88" uid="11229"/>
+      <subcategory value="13" description="Raytheon / Pilatus PC-9 Mk II (Beech Mk II)" uuid="cb063f2a-5269-11df-96ef-080069138b88" uid="11230">
+        <specific value="1" description="T-6A Texan II" uuid="cb074d2a-5269-11df-aa62-080069138b88" uid="11231"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Unmanned" uuid="cb09a4e4-5269-11df-83ca-080069138b88" uid="11232">
+      <subcategory value="1" description="RQ-5A Hunter" uuid="cb0aad44-5269-11df-a4a6-080069138b88" uid="11233"/>
+      <subcategory value="2" description="TRW/IAI Hunter - shipboard variant" deprecated="1" uuid="cb0bbfea-5269-11df-884b-080069138b88" uid="11234"/>
+      <subcategory value="3" description="Maneuver UAV" uuid="cb0cd6aa-5269-11df-824c-080069138b88" uid="11235"/>
+      <subcategory value="4" description="Predator Medium Altitude Endurance UAV" uuid="cb0de09a-5269-11df-aa7e-080069138b88" uid="11236">
+        <specific value="1" description="RQ-1K Predator" uuid="cb0ef25a-5269-11df-842b-080069138b88" uid="11237"/>
+        <specific value="2" description="RQ-1L Predator" uuid="cb100410-5269-11df-b4ec-080069138b88" uid="11238"/>
+        <specific value="3" description="MQ-1L Armed Predator" uuid="cb111fe4-5269-11df-b9cd-080069138b88" uid="11239"/>
+        <specific value="4" description="MQ-9A Predator B" uuid="cb123154-5269-11df-9e7c-080069138b88" uid="11240"/>
+      </subcategory>
+      <subcategory value="5" description="Lockheed Martin / Boeing Darkstar UAV" uuid="cb13e148-5269-11df-8ce5-080069138b88" uid="11241"/>
+      <subcategory value="6" description="Global Hawk UAV" uuid="cb14f678-5269-11df-82f3-080069138b88" uid="11242">
+        <specific value="1" description="RQ-4A" uuid="cb1600f4-5269-11df-b902-080069138b88" uid="11243"/>
+      </subcategory>
+      <subcategory value="7" description="Alliant Techsystems Outrider UAV (formerly known as the Tactical UAV or TUAV)" uuid="cb17b11a-5269-11df-90be-080069138b88" uid="11244"/>
+      <subcategory value="8" description="RQ-7 Shadow UAV" uuid="cb18c712-5269-11df-bf2c-080069138b88" uid="11245">
+        <specific value="1" description="RQ-7A" uuid="cb19d620-5269-11df-9ad7-080069138b88" uid="11246"/>
+        <specific value="2" description="RQ-7B" uuid="cb1ae0ce-5269-11df-8a4d-080069138b88" uid="11247"/>
+      </subcategory>
+      <subcategory value="9" description="Pioneer UAV" uuid="cb1c90cc-5269-11df-b132-080069138b88" uid="11248"/>
+      <subcategory value="10" description="BQM-74 Chukar" uuid="cb1da2aa-5269-11df-9539-080069138b88" uid="11249"/>
+      <subcategory value="11" description="MQM-107 Streaker" uuid="cb1eb28a-5269-11df-9a6c-080069138b88" uid="11250"/>
+      <subcategory value="12" description="MTR-15 Ballistic Aerial Target System (BATS)" uuid="cb1fbea0-5269-11df-96c8-080069138b88" uid="11251"/>
+      <subcategory value="13" description="FQM-117 Radio Controlled Minature Aerial Target (RCMAT)" uuid="cb20d3ee-5269-11df-a7f7-080069138b88" uid="11252"/>
+      <subcategory value="14" description="QUH-1 Iroquois Target" uuid="cb21e5cc-5269-11df-add8-080069138b88" uid="11253"/>
+      <subcategory value="15" description="QF-4 Phantom Target" uuid="cb22f52a-5269-11df-af70-080069138b88" uid="11254"/>
+      <subcategory value="16" description="QF-106 Delta Dart Target" uuid="cb240f6e-5269-11df-af61-080069138b88" uid="11255"/>
+      <subcategory value="17" description="MQM-8 Vandel" uuid="cb252250-5269-11df-b669-080069138b88" uid="11256"/>
+      <subcategory value="18" description="AQM-37 Challenger" uuid="cb262f88-5269-11df-8861-080069138b88" uid="11257"/>
+      <subcategory value="19" description="TDU-34 Rigid Tow Target" uuid="cb273fcc-5269-11df-8a21-080069138b88" uid="11258"/>
+      <subcategory value="20" description="Javelin (BAI Aerosystems lightweight airborne video system)" uuid="cb2852e0-5269-11df-b29f-080069138b88" uid="11259"/>
+      <subcategory value="21" description="X-47A Pegasus UCAV" uuid="cb2961d0-5269-11df-8a51-080069138b88" uid="11260"/>
+      <subcategory value="22" description="FQM-151 Pointer" uuid="cb2a717e-5269-11df-8a44-080069138b88" uid="11261"/>
+      <subcategory value="23" description="BQM-34 Firebee" uuid="cb2b846a-5269-11df-89a4-080069138b88" uid="11262"/>
+      <subcategory value="24" description="X-45 UCAV" uuid="cb2c9346-5269-11df-9c99-080069138b88" uid="11263">
+        <specific value="1" description="X-45A" uuid="cb2da2f4-5269-11df-b052-080069138b88" uid="11264"/>
+        <specific value="2" description="X-45C" uuid="cb2eb18a-5269-11df-887d-080069138b88" uid="11265"/>
+      </subcategory>
+      <subcategory value="25" description="Boeing ScanEagle" uuid="cb3064d0-5269-11df-aa6d-080069138b88" uid="11266">
+        <specific value="1" description="ScanEagle A-15" uuid="cb316f56-5269-11df-9f6b-080069138b88" uid="11267"/>
+        <specific value="2" description="ScanEagle Dual-Bay" uuid="cb327ebe-5269-11df-8b17-080069138b88" uid="11268"/>
+      </subcategory>
+      <subcategory value="26" description="Boeing A-160 Hummingbird" uuid="cb342ff2-5269-11df-bc50-080069138b88" uid="11269"/>
+      <subcategory value="27" description="Interim Small UAV, Raven" uuid="cb3544d2-5269-11df-9a40-080069138b88" uid="11270"/>
+      <subcategory value="28" description="FCS UAV Class I" uuid="cb365002-5269-11df-99b1-080069138b88" uid="11271"/>
+      <subcategory value="29" description="FCS UAV Class II" uuid="cb375f92-5269-11df-8318-080069138b88" uid="11272"/>
+      <subcategory value="30" description="FCS UAV Class III" uuid="cb38722e-5269-11df-ae18-080069138b88" uid="11273"/>
+      <subcategory value="31" description="FCS UAV Class IV" uuid="cb39804c-5269-11df-b973-080069138b88" uid="11274">
+        <specific value="1" description="FCS UAV Class IV-a" uuid="cb3a925c-5269-11df-af46-080069138b88" uid="11275"/>
+        <specific value="2" description="FCS UAV Class IV-b" uuid="cb3ba598-5269-11df-8217-080069138b88" uid="11276"/>
+      </subcategory>
+    </category>
+    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="cb3df7d0-5269-11df-8c60-080069138b88" uid="11277">
+      <subcategory value="1" description="Passenger Airline" uuid="cb3f07f6-5269-11df-8f27-080069138b88" uid="11278">
+        <specific value="1" description="Boeing 747-400" uuid="cb401678-5269-11df-931c-080069138b88" uid="11279"/>
+        <specific value="2" description="Boeing 757-200" uuid="cb4124d2-5269-11df-8cda-080069138b88" uid="11280"/>
+        <specific value="3" description="MD-82" uuid="cb423548-5269-11df-bda6-080069138b88" uid="11281"/>
+        <specific value="4" description="MD-82T" uuid="cb434bea-5269-11df-ba17-080069138b88" uid="11282"/>
+        <specific value="5" description="MD-90-30-T" uuid="cb445b98-5269-11df-932b-080069138b88" uid="11283"/>
+        <specific value="6" description="Boeing 727" uuid="cb456a38-5269-11df-9faf-080069138b88" uid="11284"/>
+        <specific value="7" description="Boeing 737" uuid="cb467392-5269-11df-bb00-080069138b88" uid="11285"/>
+        <specific value="8" description="Boeing 767" uuid="cb4786e2-5269-11df-b5b9-080069138b88" uid="11286"/>
+        <specific value="9" description="DC-10" uuid="cb4896a4-5269-11df-9a15-080069138b88" uid="11287"/>
+        <specific value="10" description="Lockheed L-1011 Tristar" uuid="cb49a080-5269-11df-83f6-080069138b88" uid="11288"/>
+        <specific value="11" description="Boeing 707" uuid="cb4ab5e2-5269-11df-adbe-080069138b88" uid="11289"/>
+        <specific value="12" description="Boeing 717" uuid="cb4bc52c-5269-11df-831a-080069138b88" uid="11290"/>
+        <specific value="13" description="Beech 1900" uuid="cb4cd016-5269-11df-9a13-080069138b88" uid="11291"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="225" uuid="cb4fc514-5269-11df-8b11-080069138b88" uid="11292">
+    <category value="1" description="Carrier" uuid="cb50d3be-5269-11df-95c9-080069138b88" uid="11293">
+      <subcategory value="1" description="Nimitz Class" uuid="cb51e092-5269-11df-a846-080069138b88" uid="11294">
+        <specific value="1" description="CVN 68 Nimitz" uuid="cb52efa0-5269-11df-81c8-080069138b88" uid="11295"/>
+        <specific value="2" description="CVN 69 Dwight D. Eisenhower" uuid="cb53feea-5269-11df-94bd-080069138b88" uid="11296"/>
+        <specific value="3" description="CVN 70 Carl Vinson" uuid="cb550d1c-5269-11df-874c-080069138b88" uid="11297"/>
+        <specific value="4" description="CVN 71 Theodore Roosevelt" uuid="cb56213e-5269-11df-be08-080069138b88" uid="11298"/>
+        <specific value="5" description="CVN 72 Abraham Lincoln" uuid="cb573178-5269-11df-aad2-080069138b88" uid="11299"/>
+        <specific value="6" description="CVN 73 George Washington" uuid="cb587db2-5269-11df-b3e9-080069138b88" uid="11300"/>
+        <specific value="7" description="CVN 74 John C. Stennis" uuid="cb599d8c-5269-11df-904e-080069138b88" uid="11301"/>
+        <specific value="8" description="CVN 75 Harry S. Truman" uuid="cb5aaf74-5269-11df-a086-080069138b88" uid="11302"/>
+        <specific value="9" description="CVN 76 Ronald Reagen" uuid="cb5bc2c4-5269-11df-99d9-080069138b88" uid="11303"/>
+      </subcategory>
+      <subcategory value="2" description="Enterprise Class" uuid="cb5d77e0-5269-11df-ab93-080069138b88" uid="11304">
+        <specific value="1" description="CVN 65 Enterprise" uuid="cb5e822a-5269-11df-a2a7-080069138b88" uid="11305"/>
+      </subcategory>
+      <subcategory value="3" description="Kitty Hawk/John F. Kennedy Class" uuid="cb603156-5269-11df-bc5f-080069138b88" uid="11306">
+        <specific value="1" description="CV 63 Kitty Hawk" uuid="cb6146b8-5269-11df-a868-080069138b88" uid="11307"/>
+        <specific value="2" description="CV 64 Constellation" uuid="cb669532-5269-11df-9622-080069138b88" uid="11308"/>
+        <specific value="3" description="CV 66 America" uuid="cb6f8e94-5269-11df-9781-080069138b88" uid="11309"/>
+        <specific value="4" description="CV 67 John F. Kennedy" uuid="cb753362-5269-11df-90b5-080069138b88" uid="11310"/>
+      </subcategory>
+      <subcategory value="4" description="Forrestal Class" uuid="cb7b5404-5269-11df-b469-080069138b88" uid="11311">
+        <specific value="1" description="AVT 59 Forrestal" uuid="cb7c68f8-5269-11df-9e85-080069138b88" uid="11312"/>
+        <specific value="2" description="CV 60 Saratoga" uuid="cb7d7c2a-5269-11df-beb5-080069138b88" uid="11313"/>
+        <specific value="3" description="CV 61 Ranger" uuid="cb7eb0ea-5269-11df-a9bf-080069138b88" uid="11314"/>
+        <specific value="4" description="CV 62 Independence" uuid="cb7fc340-5269-11df-913f-080069138b88" uid="11315"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Command Ship/Cruiser" uuid="cb822bda-5269-11df-a47d-080069138b88" uid="11316">
+      <subcategory value="1" description="Blue Ridge Class" uuid="cb833c82-5269-11df-a3b6-080069138b88" uid="11317">
+        <specific value="1" description="LCC 19 Blue Ridge" uuid="cb844e7e-5269-11df-9952-080069138b88" uid="11318"/>
+        <specific value="2" description="LLC 20 Mount Whitney" uuid="cb856002-5269-11df-81a9-080069138b88" uid="11319"/>
+      </subcategory>
+      <subcategory value="2" description="Raleigh and Austin Classes" uuid="cb871582-5269-11df-9bd5-080069138b88" uid="11320">
+        <specific value="1" description="AGF 11 Coronado" uuid="cb882184-5269-11df-acef-080069138b88" uid="11321"/>
+        <specific value="2" description="AGF 3 La Salle" uuid="cb893542-5269-11df-84ee-080069138b88" uid="11322"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Guided Missile Cruiser" uuid="cb8b8c66-5269-11df-9fe6-080069138b88" uid="11323">
+      <subcategory value="1" description="Ticonderoga Class" uuid="cb8c9d18-5269-11df-8bf4-080069138b88" uid="11324">
+        <specific value="1" description="CG 47 Ticonderoga" uuid="cb8daec4-5269-11df-93f0-080069138b88" uid="11325"/>
+        <specific value="2" description="CG 48 Yorktown" uuid="cb8ec156-5269-11df-b47b-080069138b88" uid="11326"/>
+        <specific value="3" description="CG 49 Vincennes" uuid="cb8fcb46-5269-11df-a4e1-080069138b88" uid="11327"/>
+        <specific value="4" description="CG 50 Valley Forge" uuid="cb90dd9c-5269-11df-9727-080069138b88" uid="11328"/>
+        <specific value="5" description="CG 51 Thomas S. Gates" uuid="cb91f3bc-5269-11df-b4b6-080069138b88" uid="11329"/>
+        <specific value="6" description="CG 52 Bunker Hill" uuid="cb92ff0a-5269-11df-a635-080069138b88" uid="11330"/>
+        <specific value="7" description="CG 53 Mobile Bay" uuid="cb94107a-5269-11df-bb5d-080069138b88" uid="11331"/>
+        <specific value="8" description="CG 54 Antietam" uuid="cb95235c-5269-11df-9e09-080069138b88" uid="11332"/>
+        <specific value="9" description="CG 55 Leyte Gulf" uuid="cb9632ec-5269-11df-9b6b-080069138b88" uid="11333"/>
+        <specific value="10" description="CG 56 San Jacinto" uuid="cb9744d4-5269-11df-b714-080069138b88" uid="11334"/>
+        <specific value="11" description="CG 57 Lake Champlain" uuid="cb985694-5269-11df-88e1-080069138b88" uid="11335"/>
+        <specific value="12" description="CG 58 Philippine Sea" uuid="cb99630e-5269-11df-a3be-080069138b88" uid="11336"/>
+        <specific value="13" description="CG 59 Princeton" uuid="cb9a796a-5269-11df-a366-080069138b88" uid="11337"/>
+        <specific value="14" description="CG 60 Normandy" uuid="cb9b8b34-5269-11df-ac54-080069138b88" uid="11338"/>
+        <specific value="15" description="CG 61 Monterey" uuid="cb9c95ec-5269-11df-b897-080069138b88" uid="11339"/>
+        <specific value="16" description="CG 62 Chancellorsville" uuid="cb9dabbc-5269-11df-a045-080069138b88" uid="11340"/>
+        <specific value="17" description="CG 63 Cowpens" uuid="cb9ebdb8-5269-11df-9a07-080069138b88" uid="11341"/>
+        <specific value="18" description="CG 64 Gettysburg" uuid="cb9fd310-5269-11df-95b8-080069138b88" uid="11342"/>
+        <specific value="19" description="CG 65 Chosin" uuid="cba0e430-5269-11df-9993-080069138b88" uid="11343"/>
+        <specific value="20" description="CG 66 Hue City" uuid="cba1f988-5269-11df-988b-080069138b88" uid="11344"/>
+        <specific value="21" description="CG 67 Shiloh" uuid="cba30508-5269-11df-a4fa-080069138b88" uid="11345"/>
+        <specific value="22" description="CG 68 Anzio" uuid="cba4168c-5269-11df-8585-080069138b88" uid="11346"/>
+        <specific value="23" description="CG 69 Vicksburg" uuid="cba52810-5269-11df-8d5c-080069138b88" uid="11347"/>
+        <specific value="24" description="CG 70 Lake Erie" uuid="cba6382c-5269-11df-9920-080069138b88" uid="11348"/>
+        <specific value="25" description="CG 71 Cape St. George" uuid="cba74a32-5269-11df-b61d-080069138b88" uid="11349"/>
+        <specific value="26" description="CG 72 Vella Gulf" uuid="cba85daa-5269-11df-aac6-080069138b88" uid="11350"/>
+        <specific value="27" description="CG 73 Port Royal" uuid="cba96dee-5269-11df-9ad6-080069138b88" uid="11351"/>
+      </subcategory>
+      <subcategory value="2" description="Virginia Class" deprecated="1" uuid="cbab28be-5269-11df-bb52-080069138b88" uid="11352">
+        <specific value="1" description="CGN 38 Virginia" deprecated="1" uuid="cbac3b96-5269-11df-b8b1-080069138b88" uid="11353"/>
+        <specific value="2" description="CGN 39 Texas" deprecated="1" uuid="cbad4df6-5269-11df-a0ac-080069138b88" uid="11354"/>
+        <specific value="3" description="CGN 40 Mississippi" deprecated="1" uuid="cbae5a20-5269-11df-af8d-080069138b88" uid="11355"/>
+        <specific value="4" description="CGN 41 Arkansas" deprecated="1" uuid="cbaf75d6-5269-11df-bf7c-080069138b88" uid="11356"/>
+      </subcategory>
+      <subcategory value="3" description="California Class" uuid="cbb12a0c-5269-11df-b94c-080069138b88" uid="11357">
+        <specific value="1" description="CGN 36 California" uuid="cbb23e6a-5269-11df-bf5b-080069138b88" uid="11358"/>
+        <specific value="2" description="CGN 37 South Carolina" uuid="cbb349d6-5269-11df-b95c-080069138b88" uid="11359"/>
+      </subcategory>
+      <subcategory value="4" description="Truxtun Class" uuid="cbb4fb64-5269-11df-b7aa-080069138b88" uid="11360">
+        <specific value="1" description="CGN 35 Truxtun" uuid="cbb6108a-5269-11df-8528-080069138b88" uid="11361"/>
+      </subcategory>
+      <subcategory value="5" description="Belknap Class" deprecated="1" uuid="cbb7c29a-5269-11df-812a-080069138b88" uid="11362">
+        <specific value="1" description="CG 26 Belknap" deprecated="1" uuid="cbb8d4dc-5269-11df-9f83-080069138b88" uid="11363"/>
+      </subcategory>
+      <subcategory value="6" description="Bainbridge Class" uuid="cbba8a8e-5269-11df-95cf-080069138b88" uid="11364">
+        <specific value="1" description="CGN 25 Bainbridge" uuid="cbbbacca-5269-11df-9bec-080069138b88" uid="11365"/>
+      </subcategory>
+      <subcategory value="7" description="Leahy Class" uuid="cbbd63ee-5269-11df-a0b8-080069138b88" uid="11366">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="cbbe7dc4-5269-11df-85e4-080069138b88" uid="11367"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="cbbf90ba-5269-11df-9e2b-080069138b88" uid="11368"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="cbc09d70-5269-11df-a796-080069138b88" uid="11369"/>
+        <specific value="4" description="CG 19 Dale" uuid="cbc1b1ba-5269-11df-b2e8-080069138b88" uid="11370"/>
+        <specific value="5" description="CG 20 R. K. Turner" uuid="cbc2c636-5269-11df-9653-080069138b88" uid="11371"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Guided Missile Destroyer" uuid="cbc51832-5269-11df-aa64-080069138b88" uid="11372">
+      <subcategory value="1" description="Arleigh Burke Class" uuid="cbc62dda-5269-11df-8d35-080069138b88" uid="11373">
+        <specific value="1" description="DDG 51 Arleigh Burke" uuid="cbc73d24-5269-11df-a7a3-080069138b88" uid="11374"/>
+        <specific value="2" description="DDG 52 Barry" uuid="cbc84f84-5269-11df-bf7b-080069138b88" uid="11375"/>
+        <specific value="3" description="DDG 53 John Paul Jones" uuid="cbc962ac-5269-11df-8cd7-080069138b88" uid="11376"/>
+        <specific value="4" description="DDG 54 Curtis Wilbur" uuid="cbca6d6e-5269-11df-84dc-080069138b88" uid="11377"/>
+        <specific value="5" description="DDG 55 Stout" uuid="cbcb8302-5269-11df-9541-080069138b88" uid="11378"/>
+        <specific value="6" description="DDG 56 John S. McCain" uuid="cbcc93d2-5269-11df-9ae8-080069138b88" uid="11379"/>
+        <specific value="7" description="DDG 57 Mitscher" uuid="cbcd9fa2-5269-11df-b64b-080069138b88" uid="11380"/>
+        <specific value="8" description="DDG 58 Laboon" uuid="cbceafb4-5269-11df-a3a1-080069138b88" uid="11381"/>
+        <specific value="9" description="DDG 59 Russell" uuid="cbcfc368-5269-11df-9ca7-080069138b88" uid="11382"/>
+        <specific value="10" description="DDG 60 Paul Hamilton" uuid="cbd0cf6a-5269-11df-a69a-080069138b88" uid="11383"/>
+        <specific value="11" description="DDG 61 Ramage" uuid="cbd1e13e-5269-11df-b137-080069138b88" uid="11384"/>
+        <specific value="12" description="DDG 62 Fitzgerald" uuid="cbd2f484-5269-11df-8a14-080069138b88" uid="11385"/>
+        <specific value="13" description="DDG 63 Stethem" uuid="cbd40040-5269-11df-b8b7-080069138b88" uid="11386"/>
+        <specific value="14" description="DDG 64 Carney" uuid="cbd5116a-5269-11df-a166-080069138b88" uid="11387"/>
+        <specific value="15" description="DDG 65 Benfold" uuid="cbd623e8-5269-11df-93b4-080069138b88" uid="11388"/>
+        <specific value="16" description="DDG 66 Gonzalez" uuid="cbd72ee6-5269-11df-a122-080069138b88" uid="11389"/>
+        <specific value="17" description="DDG 67 Cole" uuid="cbd840ec-5269-11df-9c94-080069138b88" uid="11390"/>
+        <specific value="18" description="DDG 68 The Sullivans" uuid="cbd95554-5269-11df-8215-080069138b88" uid="11391"/>
+        <specific value="19" description="DDG 69 Milius" uuid="cbda6052-5269-11df-a5f5-080069138b88" uid="11392"/>
+        <specific value="20" description="DDG 70 Hopper" uuid="cbdb7014-5269-11df-8a25-080069138b88" uid="11393"/>
+        <specific value="21" description="DDG 71 Ross" uuid="cbdc8bde-5269-11df-b914-080069138b88" uid="11394"/>
+        <specific value="22" description="DDG 72 Mahan" uuid="cbdd9c18-5269-11df-ba4d-080069138b88" uid="11395"/>
+        <specific value="23" description="DDG 73 DeCatur" uuid="cbdeae32-5269-11df-9b25-080069138b88" uid="11396"/>
+        <specific value="24" description="DDG 74 McFaul" uuid="cbdfbf02-5269-11df-8b49-080069138b88" uid="11397"/>
+        <specific value="25" description="DDG 75 Donald Cook" uuid="cbe0cba4-5269-11df-9e3e-080069138b88" uid="11398"/>
+        <specific value="26" description="DDG 76 Higgins" uuid="cbe1e0c0-5269-11df-a9eb-080069138b88" uid="11399"/>
+        <specific value="27" description="DDG 77 O'Kane" uuid="cbe2ebb4-5269-11df-a2f2-080069138b88" uid="11400"/>
+        <specific value="28" description="DDG 78 Porter" uuid="cbe3fa90-5269-11df-b8fe-080069138b88" uid="11401"/>
+        <specific value="29" description="DDG 79 Oscar Austin" uuid="cbe51060-5269-11df-bd64-080069138b88" uid="11402"/>
+        <specific value="30" description="DDG 80 Roosevelt" uuid="cbe621d0-5269-11df-b7ef-080069138b88" uid="11403"/>
+        <specific value="31" description="DDG 81 Winston Churchill" uuid="cbe72f3a-5269-11df-913e-080069138b88" uid="11404"/>
+        <specific value="32" description="DDG 82 Lassen" uuid="cbe83fec-5269-11df-bec2-080069138b88" uid="11405"/>
+        <specific value="33" description="DDG 83 Howard" uuid="cbe95508-5269-11df-ba9c-080069138b88" uid="11406"/>
+        <specific value="34" description="DDG 84 Buckeley" uuid="cbea6056-5269-11df-809c-080069138b88" uid="11407"/>
+        <specific value="35" description="DDG 85 McCampbell" uuid="cbeb711c-5269-11df-a134-080069138b88" uid="11408"/>
+        <specific value="36" description="DDG 86 Shoup" uuid="cbec82dc-5269-11df-8217-080069138b88" uid="11409"/>
+        <specific value="37" description="DDG 87 Mason" uuid="cbed92e4-5269-11df-9a4c-080069138b88" uid="11410"/>
+        <specific value="38" description="DDG 88 Preble" uuid="cbeea396-5269-11df-9b68-080069138b88" uid="11411"/>
+        <specific value="39" description="DDG 89 Mustin" uuid="cbefb3d0-5269-11df-83b1-080069138b88" uid="11412"/>
+        <specific value="40" description="DDG 90 Chafee" uuid="cbf0c05e-5269-11df-b124-080069138b88" uid="11413"/>
+        <specific value="41" description="DDG 91 Pinckney" uuid="cbf1d50c-5269-11df-a223-080069138b88" uid="11414"/>
+        <specific value="42" description="DDG 92 Momsen" uuid="cbf2e550-5269-11df-9aca-080069138b88" uid="11415"/>
+        <specific value="43" description="DDG 93 Chung-Hoon" uuid="cbf3f026-5269-11df-8a47-080069138b88" uid="11416"/>
+        <specific value="44" description="DDG 94 Nitze" uuid="cbf504de-5269-11df-93bb-080069138b88" uid="11417"/>
+        <specific value="45" description="DDG 95 James E. Williams" uuid="cbf61662-5269-11df-8657-080069138b88" uid="11418"/>
+        <specific value="46" description="DDG 96 Bainbridge" uuid="cbf722be-5269-11df-8358-080069138b88" uid="11419"/>
+        <specific value="47" description="DDG 97 Halsey" uuid="cbf83226-5269-11df-8b44-080069138b88" uid="11420"/>
+        <specific value="48" description="DDG 98 Forest Sherman" uuid="cbf946ac-5269-11df-b244-080069138b88" uid="11421"/>
+        <specific value="49" description="DDG 99 Farragut" uuid="cbfa5290-5269-11df-96ce-080069138b88" uid="11422"/>
+        <specific value="50" description="DDG 100 Kidd" uuid="cbfb6c84-5269-11df-b684-080069138b88" uid="11423"/>
+        <specific value="51" description="DDG 101 Gridley" uuid="cbfc8146-5269-11df-8ece-080069138b88" uid="11424"/>
+        <specific value="52" description="DDG 102 Sampson" uuid="cbfd8d02-5269-11df-bbbc-080069138b88" uid="11425"/>
+        <specific value="53" description="DDG 103 Truxtun" uuid="cbfe9f9e-5269-11df-a0b7-080069138b88" uid="11426"/>
+        <specific value="54" description="DDG 104 Sterett" uuid="cbffb14a-5269-11df-88e9-080069138b88" uid="11427"/>
+        <specific value="55" description="DDG 105 Dewey" uuid="cc00bbc6-5269-11df-915c-080069138b88" uid="11428"/>
+      </subcategory>
+      <subcategory value="2" description="Kidd Class" deprecated="1" uuid="cc026ff2-5269-11df-84d8-080069138b88" uid="11429">
+        <specific value="1" description="DDG 993 Kidd" deprecated="1" uuid="cc0381ee-5269-11df-af11-080069138b88" uid="11430"/>
+        <specific value="2" description="DDG 994 Callaghan" deprecated="1" uuid="cc0497dc-5269-11df-88d1-080069138b88" uid="11431"/>
+        <specific value="3" description="DDG 995 Scott" deprecated="1" uuid="cc05a4ec-5269-11df-9ea0-080069138b88" uid="11432"/>
+        <specific value="4" description="DDG 996 Chandler" deprecated="1" uuid="cc07067a-5269-11df-afa2-080069138b88" uid="11433"/>
+      </subcategory>
+      <subcategory value="3" description="Coontz Class" uuid="cc08c64a-5269-11df-a1b2-080069138b88" uid="11434">
+        <specific value="1" description="DDG 39 MacDonough" uuid="cc09d92c-5269-11df-8e9b-080069138b88" uid="11435"/>
+        <specific value="2" description="DDG 43 Dahlgren" uuid="cc0aef88-5269-11df-8bca-080069138b88" uid="11436"/>
+      </subcategory>
+      <subcategory value="4" description="Charles F. Adams Class" uuid="cc0ca4fe-5269-11df-94dd-080069138b88" uid="11437">
+        <specific value="1" description="DDG 2 Charles F. Adams" uuid="cc0db182-5269-11df-ae84-080069138b88" uid="11438"/>
+      </subcategory>
+      <subcategory value="5" description="Modified Charles F. Adams Class" uuid="cc0f771a-5269-11df-80d4-080069138b88" uid="11439">
+        <specific value="1" description="DDG 38 Perth (Australia)" uuid="cc108bc8-5269-11df-b0b2-080069138b88" uid="11440"/>
+        <specific value="2" description="DDG 39 Hobart (Australia)" uuid="cc153ea2-5269-11df-97d1-080069138b88" uid="11441"/>
+        <specific value="3" description="DDG 41 Brisbane (Australia)" uuid="cc1654a4-5269-11df-a6ac-080069138b88" uid="11442"/>
+      </subcategory>
+      <subcategory value="6" description="Fletcher and Allen M Summer Class" uuid="cc180d94-5269-11df-abd4-080069138b88" uid="11443">
+        <specific value="1" description="DDG 906 Huei Yang (ex. English DDG 696) (Taiwan)" uuid="cc191b62-5269-11df-941a-080069138b88" uid="11444"/>
+        <specific value="2" description="DDG 908 Kuei Yang (ex. Twining DD 540) (Taiwan)" uuid="cc1a3ce0-5269-11df-bd64-080069138b88" uid="11445"/>
+        <specific value="3" description="DDG 909 Chin Yang (ex. Mullany DD 528) (Taiwan)" uuid="cc1b6ca0-5269-11df-8fb3-080069138b88" uid="11446"/>
+        <specific value="4" description="DDG 914 Loa Yang (ex. Taussig DD 746) (Taiwan)" uuid="cc1c7dfc-5269-11df-8e92-080069138b88" uid="11447"/>
+        <specific value="5" description="DDG 917 Nan Yang (ex.Thomason DD760) (Taiwan)" uuid="cc1d946c-5269-11df-b5d7-080069138b88" uid="11448"/>
+        <specific value="6" description="DDG 918 An Yang (ex. Kimberly DD 521) (Taiwan)" uuid="cc1ea7c6-5269-11df-b239-080069138b88" uid="11449"/>
+        <specific value="7" description="DDG 919 Kun Yang (ex. Yarnall DD 541) (Taiwan)" uuid="cc1fbaee-5269-11df-8021-080069138b88" uid="11450"/>
+      </subcategory>
+      <subcategory value="7" description="Gearing (Wu Chin I and II Conversions) (FRAM I and II) Class" uuid="cc217280-5269-11df-8e6b-080069138b88" uid="11451">
+        <specific value="1" description="DDG 907 Fu Yang (ex. Ernest G. Small DD 838) (FRAM II) (Taiwan)" uuid="cc228c4c-5269-11df-9e5f-080069138b88" uid="11452"/>
+        <specific value="2" description="DDG 915 Han Yang (ex. Herbert J. Thomas DD 833) (Taiwan)" uuid="cc23a280-5269-11df-aeeb-080069138b88" uid="11453"/>
+        <specific value="3" description="DDG 924 Kai Yang (ex. Richard B. Anderson DD 786) (Taiwan)" uuid="cc24b21a-5269-11df-b4d8-080069138b88" uid="11454"/>
+        <specific value="4" description="DDG 926 Shuei Yang (ex. Hawkins DD 873) (Taiwan)" uuid="cc25c7c2-5269-11df-ae5b-080069138b88" uid="11455"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Destroyer" uuid="cc281e0a-5269-11df-a351-080069138b88" uid="11456">
+      <subcategory value="1" description="Spruance Class" uuid="cc292dd6-5269-11df-a932-080069138b88" uid="11457">
+        <specific value="1" description="DD 963 Spruance" uuid="cc2a427a-5269-11df-b027-080069138b88" uid="11458"/>
+        <specific value="2" description="DD 964 Paul F. Foster" uuid="cc2b5386-5269-11df-95c0-080069138b88" uid="11459"/>
+        <specific value="3" description="DD 965 Kinkaid" uuid="cc2c60b4-5269-11df-97e9-080069138b88" uid="11460"/>
+        <specific value="4" description="DD 966 Hewitt" uuid="cc2d7256-5269-11df-9b55-080069138b88" uid="11461"/>
+        <specific value="5" description="DD 967 Elliott" uuid="cc2e8434-5269-11df-a7ba-080069138b88" uid="11462"/>
+        <specific value="6" description="DD 968 A. W. Radford" uuid="cc341a7a-5269-11df-9df4-080069138b88" uid="11463"/>
+        <specific value="7" description="DD 969 Peterson" uuid="cc352f14-5269-11df-b347-080069138b88" uid="11464"/>
+        <specific value="8" description="DD 970 Caron" uuid="cc3640f2-5269-11df-877b-080069138b88" uid="11465"/>
+        <specific value="9" description="DD 971 David R. Ray" uuid="cc375672-5269-11df-aa9d-080069138b88" uid="11466"/>
+        <specific value="10" description="DD 972 Olendorf" uuid="cc386fda-5269-11df-83a4-080069138b88" uid="11467"/>
+        <specific value="11" description="DD 973 John Young" uuid="cc39986a-5269-11df-bcff-080069138b88" uid="11468"/>
+        <specific value="12" description="DD 974 Comte De Grasse" uuid="cc3aaf34-5269-11df-91ea-080069138b88" uid="11469"/>
+        <specific value="13" description="DD 975 O'Brien" uuid="cc3bc040-5269-11df-80d2-080069138b88" uid="11470"/>
+        <specific value="14" description="DD 976 Merrill" uuid="cc3ccbde-5269-11df-954d-080069138b88" uid="11471"/>
+        <specific value="15" description="DD 977 Briscoe" uuid="cc3ddd26-5269-11df-8ea4-080069138b88" uid="11472"/>
+        <specific value="16" description="DD 978 Stump" uuid="cc3eeb9e-5269-11df-8b5b-080069138b88" uid="11473"/>
+        <specific value="17" description="DD 979 Conolly" uuid="cc3ffa20-5269-11df-9484-080069138b88" uid="11474"/>
+        <specific value="18" description="DD 980 Moosebrugger" uuid="cc4109ba-5269-11df-9baa-080069138b88" uid="11475"/>
+        <specific value="19" description="DD 981 John Hancock" uuid="cc4221f6-5269-11df-853e-080069138b88" uid="11476"/>
+        <specific value="20" description="DD 982 Nicholson" uuid="cc43303c-5269-11df-a6e8-080069138b88" uid="11477"/>
+        <specific value="21" description="DD 983 John Rodgers" uuid="cc44429c-5269-11df-ba50-080069138b88" uid="11478"/>
+        <specific value="22" description="DD 984 Leftwich" uuid="cc455358-5269-11df-a8bc-080069138b88" uid="11479"/>
+        <specific value="23" description="DD 985 Cushing" uuid="cc465c30-5269-11df-9840-080069138b88" uid="11480"/>
+        <specific value="24" description="DD 986 Harry W. Hill" uuid="cc476f76-5269-11df-a1e4-080069138b88" uid="11481"/>
+        <specific value="25" description="DD 987 O'Bannon" uuid="cc487f6a-5269-11df-8406-080069138b88" uid="11482"/>
+        <specific value="26" description="DD 988 Thorn" uuid="cc498aae-5269-11df-992f-080069138b88" uid="11483"/>
+        <specific value="27" description="DD 989 Deyo" uuid="cc4a9c64-5269-11df-b2d3-080069138b88" uid="11484"/>
+        <specific value="28" description="DD 990 Ingersoll" uuid="cc4bac26-5269-11df-ae72-080069138b88" uid="11485"/>
+        <specific value="29" description="DD 991 Fife" uuid="cc4cb5e4-5269-11df-b0af-080069138b88" uid="11486"/>
+        <specific value="30" description="DD 992 Fletcher" uuid="cc4dc8d0-5269-11df-a509-080069138b88" uid="11487"/>
+        <specific value="31" description="DD 997 Hayler" uuid="cc4ed7a2-5269-11df-9177-080069138b88" uid="11488"/>
+      </subcategory>
+      <subcategory value="2" description="Modified Gearing FRAM I Class (Turkey)" uuid="cc508890-5269-11df-b0c1-080069138b88" uid="11489"/>
+      <subcategory value="3" description="Gearing (Wu Chin III Conversion) (FRAM I) Class" uuid="cc519924-5269-11df-8778-080069138b88" uid="11490">
+        <specific value="1" description="DD 912 Chien Yang (ex. James E. Kyes DD 787) (Taiwan)" uuid="cc52ad82-5269-11df-8249-080069138b88" uid="11491"/>
+        <specific value="2" description="DD 921 Liao Yang (ex. Hanson DD 832) (Taiwan)" uuid="cc53c0dc-5269-11df-adae-080069138b88" uid="11492"/>
+        <specific value="3" description="DD 929 Shao Yang (ex. Hollister DD 788) (Taiwan)" uuid="cc54d1b6-5269-11df-9dca-080069138b88" uid="11493"/>
+        <specific value="4" description="DD 925 Te Yang (ex. Sarsfield DD 837) (Taiwan)" uuid="cc5b16b6-5269-11df-8fad-080069138b88" uid="11494"/>
+        <specific value="5" description="DD 928 Chen Yang (ex. Johnston DD 821) (Taiwan)" uuid="cc601404-5269-11df-bfe9-080069138b88" uid="11495"/>
+        <specific value="6" description="DD 923 Shen Yang (ex. Power DD 839) (Taiwan)" uuid="cc676682-5269-11df-9457-080069138b88" uid="11496"/>
+        <specific value="7" description="DD 927 Yun Yang (ex. Hamner DD 718 ) (Taiwan)" uuid="cc6b37bc-5269-11df-b0ff-080069138b88" uid="11497"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided Missile Frigate" uuid="cc6dd918-5269-11df-94c0-080069138b88" uid="11498">
+      <subcategory value="1" description="Oliver Perry Class" uuid="cc6eea4c-5269-11df-bf0e-080069138b88" uid="11499">
+        <specific value="1" description="FFG 7 O.H. Perry" uuid="cc6ffe00-5269-11df-8f7b-080069138b88" uid="11500"/>
+        <specific value="2" description="FFG 8 McInerney" uuid="cc710eda-5269-11df-bb6a-080069138b88" uid="11501"/>
+        <specific value="3" description="FFG 9 Wadsworth" uuid="cc7226b2-5269-11df-9ca1-080069138b88" uid="11502"/>
+        <specific value="4" description="FFG 10 Duncan" uuid="cc73459c-5269-11df-ba09-080069138b88" uid="11503"/>
+        <specific value="5" description="FFG 11 Clark" uuid="cc745752-5269-11df-9888-080069138b88" uid="11504"/>
+        <specific value="6" description="FFG 12 George Philip" uuid="cc7563ae-5269-11df-a31e-080069138b88" uid="11505"/>
+        <specific value="7" description="FFG 13 Sam E. Morison" uuid="cc768a0e-5269-11df-8c5a-080069138b88" uid="11506"/>
+        <specific value="8" description="FFG 14 Sides" uuid="cc779d5e-5269-11df-bfa4-080069138b88" uid="11507"/>
+        <specific value="9" description="FFG 15 Estocin" uuid="cc78aa00-5269-11df-9604-080069138b88" uid="11508"/>
+        <specific value="10" description="FFG 16 Clifton Sprauge" uuid="cc79bcd8-5269-11df-b0d1-080069138b88" uid="11509"/>
+        <specific value="11" description="FFG 19 John A. Moore" uuid="cc7ac952-5269-11df-a4e5-080069138b88" uid="11510"/>
+        <specific value="12" description="FFG 20 Antrim" uuid="cc7be486-5269-11df-b2d0-080069138b88" uid="11511"/>
+        <specific value="13" description="FFG 21 Flatley" uuid="cc7cf6d2-5269-11df-a2a7-080069138b88" uid="11512"/>
+        <specific value="14" description="FFG 22 Fahrion" uuid="cc7e0a40-5269-11df-ba35-080069138b88" uid="11513"/>
+        <specific value="15" description="FFG 23 Lewis B. Puller" uuid="cc7f15e8-5269-11df-aee5-080069138b88" uid="11514"/>
+        <specific value="16" description="FFG 24 Jack Williams" uuid="cc802b36-5269-11df-8175-080069138b88" uid="11515"/>
+        <specific value="17" description="FFG 25 Copeland" uuid="cc813c42-5269-11df-bcab-080069138b88" uid="11516"/>
+        <specific value="18" description="FFG 26 Gallery" uuid="cc8248ee-5269-11df-8ac1-080069138b88" uid="11517"/>
+        <specific value="19" description="FFG 27 M. S. Tisdale" uuid="cc835e64-5269-11df-b281-080069138b88" uid="11518"/>
+        <specific value="20" description="FFG 28 Boone" uuid="cc84710a-5269-11df-aa35-080069138b88" uid="11519"/>
+        <specific value="21" description="FFG 29 S. W. Groves" uuid="cc857cf8-5269-11df-80dd-080069138b88" uid="11520"/>
+        <specific value="22" description="FFG 30 Reid" uuid="cc86902a-5269-11df-a5bc-080069138b88" uid="11521"/>
+        <specific value="23" description="FFG 31 Stark" uuid="cc87a08c-5269-11df-9351-080069138b88" uid="11522"/>
+        <specific value="24" description="FFG 32 John L. Hall" uuid="cc88b012-5269-11df-87b2-080069138b88" uid="11523"/>
+        <specific value="25" description="FFG 33 Jarrett" uuid="cc89c290-5269-11df-b1e1-080069138b88" uid="11524"/>
+        <specific value="26" description="FFG 34 Aubrey Fitch" uuid="cc8ad5ae-5269-11df-8307-080069138b88" uid="11525"/>
+        <specific value="27" description="FFG 36 Underwood" uuid="cc8be084-5269-11df-a6cf-080069138b88" uid="11526"/>
+        <specific value="28" description="FFG 37 Crommelin" uuid="cc8cf5a0-5269-11df-a7be-080069138b88" uid="11527"/>
+        <specific value="29" description="FFG 38 Curts" uuid="cc8e060c-5269-11df-8d62-080069138b88" uid="11528"/>
+        <specific value="30" description="FFG 39 Doyle" uuid="cc8f11aa-5269-11df-bd68-080069138b88" uid="11529"/>
+        <specific value="31" description="FFG 40 Halyburton" uuid="cc9026d0-5269-11df-99eb-080069138b88" uid="11530"/>
+        <specific value="32" description="FFG 41 McClusky" uuid="cc91396c-5269-11df-bb8d-080069138b88" uid="11531"/>
+        <specific value="33" description="FFG 42 Klakring" uuid="cc9248d4-5269-11df-b84a-080069138b88" uid="11532"/>
+        <specific value="34" description="FFG 43 Thatch" uuid="cc935b48-5269-11df-a438-080069138b88" uid="11533"/>
+        <specific value="35" description="FFG 45 De Wert" uuid="cc947474-5269-11df-ad4f-080069138b88" uid="11534"/>
+        <specific value="36" description="FFG 46 Rentz" uuid="cc95853a-5269-11df-ae9c-080069138b88" uid="11535"/>
+        <specific value="37" description="FFG 47 Nicholas" uuid="cc969600-5269-11df-988f-080069138b88" uid="11536"/>
+        <specific value="38" description="FFG 48 Vandegrift" uuid="cc97a842-5269-11df-95e9-080069138b88" uid="11537"/>
+        <specific value="39" description="FFG 49 R. G. Bradley" uuid="cc98b390-5269-11df-a33e-080069138b88" uid="11538"/>
+        <specific value="40" description="FFG 50 Jesse L. Taylor" uuid="cc99c8c0-5269-11df-aeaf-080069138b88" uid="11539"/>
+        <specific value="41" description="FFG 51 Gary" uuid="cc9ada44-5269-11df-9365-080069138b88" uid="11540"/>
+        <specific value="42" description="FFG 52 Carr" uuid="cc9be6c8-5269-11df-8a35-080069138b88" uid="11541"/>
+        <specific value="43" description="FFG 53 Hawes" uuid="cc9cf9aa-5269-11df-bbb6-080069138b88" uid="11542"/>
+        <specific value="44" description="FFG 54 Ford" uuid="cc9e0aac-5269-11df-945e-080069138b88" uid="11543"/>
+        <specific value="45" description="FFG 55 Elrod" uuid="cca033cc-5269-11df-abef-080069138b88" uid="11544"/>
+        <specific value="46" description="FFG 56 Simpson" uuid="cca149a6-5269-11df-bc4b-080069138b88" uid="11545"/>
+        <specific value="47" description="FFG 57 Reuben James" uuid="cca2614c-5269-11df-91a9-080069138b88" uid="11546"/>
+        <specific value="48" description="FFG 58 Sam B. Roberts" uuid="cca3758c-5269-11df-814d-080069138b88" uid="11547"/>
+        <specific value="49" description="FFG 59 Kauffman" uuid="cca48ecc-5269-11df-9a4a-080069138b88" uid="11548"/>
+        <specific value="50" description="FFG 60 Rodney M. Davis" uuid="cca59b0a-5269-11df-b124-080069138b88" uid="11549"/>
+        <specific value="51" description="FFG 61 Ingraham" uuid="cca6acd4-5269-11df-9d6b-080069138b88" uid="11550"/>
+        <specific value="52" description="F 81 Santa Maria (Spain)" uuid="cca7d640-5269-11df-8fee-080069138b88" uid="11551"/>
+        <specific value="53" description="F 82 Victoria (Spain)" uuid="cca8e94a-5269-11df-b7d3-080069138b88" uid="11552"/>
+        <specific value="54" description="F 83 Numancia (Spain)" uuid="cca9fbd2-5269-11df-a95e-080069138b88" uid="11553"/>
+        <specific value="55" description="F 84 Reina Sofia (Spain)" uuid="ccab0d74-5269-11df-aaaf-080069138b88" uid="11554"/>
+        <specific value="56" description="F 85 Navarra (Spain)" uuid="ccac1f70-5269-11df-912e-080069138b88" uid="11555"/>
+        <specific value="57" description="F 86 Canarias (Spain)" uuid="ccad31da-5269-11df-b075-080069138b88" uid="11556"/>
+        <specific value="58" description="FFG 01 Adelaide (Australia)" uuid="ccae43cc-5269-11df-a5ac-080069138b88" uid="11557"/>
+        <specific value="59" description="FFG 02 Canberra (Australia)" uuid="ccaf4f7e-5269-11df-b3e7-080069138b88" uid="11558"/>
+        <specific value="60" description="FFG 03 Sydney (Australia)" uuid="ccb065b2-5269-11df-b8a9-080069138b88" uid="11559"/>
+        <specific value="61" description="FFG 04 Darwin (Australia)" uuid="ccb45ffa-5269-11df-a290-080069138b88" uid="11560"/>
+        <specific value="62" description="FFG 05 Melbourne (Australia)" uuid="ccb5cdea-5269-11df-88bd-080069138b88" uid="11561"/>
+        <specific value="63" description="FFG 06 Newcastle (Australia)" uuid="ccb6e798-5269-11df-a4be-080069138b88" uid="11562"/>
+      </subcategory>
+      <subcategory value="2" description="Knox Class" uuid="ccb89fca-5269-11df-a648-080069138b88" uid="11563">
+        <specific value="1" description="FFG 932 Chin Yang (ex. Robert E. Perry FF 1073) (Taiwan)" uuid="ccb9b84c-5269-11df-b0b4-080069138b88" uid="11564"/>
+        <specific value="2" description="FFG 933 Fong Yang (ex. Brewton FF 1086) (Taiwan)" uuid="ccbac8f4-5269-11df-bcb2-080069138b88" uid="11565"/>
+        <specific value="3" description="FFG 934 Feng Yang (ex. Kirk FF 1087) (Taiwan)" uuid="ccbbdf6e-5269-11df-bf13-080069138b88" uid="11566"/>
+        <specific value="4" description="FFG 935 Lan Yang (ex. Joseph Hewes FF 1078) (Taiwan)" uuid="ccbcf8e0-5269-11df-a84f-080069138b88" uid="11567"/>
+        <specific value="5" description="FFG 936 Hae Yang (ex. Cook FF 1083) (Taiwan)" uuid="ccbe1fd6-5269-11df-84ef-080069138b88" uid="11568"/>
+        <specific value="6" description="FFG 937 Hwai Yang (ex. Barbey FF 1088) (Taiwan)" uuid="ccbf3ce0-5269-11df-93bb-080069138b88" uid="11569"/>
+        <specific value="7" description="FFG 938 (ex. Downes FF 1070) (Taiwan)" uuid="ccc052ce-5269-11df-a789-080069138b88" uid="11570"/>
+        <specific value="8" description="FFG 939 (ex. Aylwin FF 1081) (Taiwan)" uuid="ccc16bb4-5269-11df-8d50-080069138b88" uid="11571"/>
+      </subcategory>
+      <subcategory value="3" description="Modified Oliver Perry Class" uuid="ccc32102-5269-11df-88b2-080069138b88" uid="11572"/>
+    </category>
+    <category value="7" description="Light/patrol craft" uuid="ccc4d592-5269-11df-a941-080069138b88" uid="11573">
+      <subcategory value="1" description="PC Class" uuid="ccc5e464-5269-11df-b04b-080069138b88" uid="11574">
+        <specific value="1" description="PC 1 Cyclone" uuid="ccc6f610-5269-11df-87e8-080069138b88" uid="11575"/>
+        <specific value="2" description="PC 2 Tempest" uuid="ccc80a00-5269-11df-b770-080069138b88" uid="11576"/>
+        <specific value="3" description="PC 3 Hurricane" uuid="ccc91a44-5269-11df-886c-080069138b88" uid="11577"/>
+        <specific value="4" description="PC 4 Monsoon" uuid="ccca2b32-5269-11df-968a-080069138b88" uid="11578"/>
+        <specific value="5" description="PC 5 Typhoon" uuid="cccb3dec-5269-11df-82ee-080069138b88" uid="11579"/>
+        <specific value="6" description="PC 6 Sirocco" uuid="cccc4dcc-5269-11df-b710-080069138b88" uid="11580"/>
+        <specific value="7" description="PC 7 Squall" uuid="cccd5faa-5269-11df-9859-080069138b88" uid="11581"/>
+        <specific value="8" description="PC 8 Zephyr" uuid="ccd2c094-5269-11df-8d6d-080069138b88" uid="11582"/>
+        <specific value="9" description="PC 9 Chinook" uuid="ccd3da7e-5269-11df-a6ae-080069138b88" uid="11583"/>
+        <specific value="10" description="PC 10 Firebolt" uuid="ccd4ef86-5269-11df-98fc-080069138b88" uid="11584"/>
+        <specific value="11" description="PC 11 Whirlwind" uuid="ccd6038a-5269-11df-b4f0-080069138b88" uid="11585"/>
+        <specific value="12" description="PC 12 Thunderbolt" uuid="ccd71702-5269-11df-aa07-080069138b88" uid="11586"/>
+        <specific value="13" description="PC 13 Shamal" uuid="ccd8435c-5269-11df-8e52-080069138b88" uid="11587"/>
+        <specific value="14" description="PC 14 Tornado" status="new" uuid="71bf9521-122c-4a64-8854-9238d5f46f52" uid="22796">
+          <cr value="1642"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine countermeasure ship/craft" uuid="ccdaa868-5269-11df-b47b-080069138b88" uid="11588">
+      <subcategory value="1" description="Osprey class" uuid="ccdbc400-5269-11df-9a9c-080069138b88" uid="11589">
+        <specific value="1" description="MHC 51 Osprey" uuid="ccdcd638-5269-11df-94d3-080069138b88" uid="11590"/>
+        <specific value="2" description="MHC 52 Heron" uuid="ccdde3ac-5269-11df-ab56-080069138b88" uid="11591"/>
+        <specific value="3" description="MHC 53 Pelican" uuid="ccdef9ae-5269-11df-93eb-080069138b88" uid="11592"/>
+        <specific value="4" description="MHC 54 Robin" uuid="cce00b1e-5269-11df-98b5-080069138b88" uid="11593"/>
+        <specific value="5" description="MHC 55 Oriole" uuid="cce119dc-5269-11df-842f-080069138b88" uid="11594"/>
+        <specific value="6" description="MHC 56 Kingfisher" uuid="cce22fa2-5269-11df-9999-080069138b88" uid="11595"/>
+        <specific value="7" description="MHC 57 Cormorant" uuid="cce341ee-5269-11df-b0c7-080069138b88" uid="11596"/>
+        <specific value="8" description="MHC 58 Blackhawk" uuid="cce44d46-5269-11df-bb52-080069138b88" uid="11597"/>
+        <specific value="9" description="MHC 59 Falcon" uuid="cce56028-5269-11df-a4e6-080069138b88" uid="11598"/>
+        <specific value="10" description="MHC 60 Cardinal" uuid="cce67800-5269-11df-9554-080069138b88" uid="11599"/>
+        <specific value="11" description="MHC 61 Raven" uuid="cced7236-5269-11df-aa07-080069138b88" uid="11600"/>
+        <specific value="12" description="MHC 62 Shrike" uuid="ccee8392-5269-11df-89ba-080069138b88" uid="11601"/>
+      </subcategory>
+      <subcategory value="2" description="Avenger Class" uuid="ccf03ae8-5269-11df-a120-080069138b88" uid="11602">
+        <specific value="1" description="MCM 1 Avenger" uuid="ccf15a9a-5269-11df-bb27-080069138b88" uid="11603"/>
+        <specific value="2" description="MCM 2 Defender" uuid="ccf26e12-5269-11df-96b5-080069138b88" uid="11604"/>
+        <specific value="3" description="MCM 3 Sentry" uuid="ccf37bc2-5269-11df-975a-080069138b88" uid="11605"/>
+        <specific value="4" description="MCM 4 Champion" uuid="ccf49192-5269-11df-a275-080069138b88" uid="11606"/>
+        <specific value="5" description="MCM 5 Guardian" uuid="ccf5a58c-5269-11df-bab9-080069138b88" uid="11607"/>
+        <specific value="6" description="MCM 6 Devastator" uuid="ccf6ca70-5269-11df-bb03-080069138b88" uid="11608"/>
+        <specific value="7" description="MCM 7 Patriot" uuid="ccf7dd34-5269-11df-b3c6-080069138b88" uid="11609"/>
+        <specific value="8" description="MCM 8 Scout" uuid="ccf8f642-5269-11df-b60d-080069138b88" uid="11610"/>
+        <specific value="9" description="MCM 9 Pioneer" uuid="ccfa02f8-5269-11df-bafd-080069138b88" uid="11611"/>
+        <specific value="10" description="MCM 10 Warrior" uuid="ccfb159e-5269-11df-96b3-080069138b88" uid="11612"/>
+        <specific value="11" description="MCM 11 Gladiator" uuid="ccfc32d0-5269-11df-9b1c-080069138b88" uid="11613"/>
+        <specific value="12" description="MCM 12 Ardent" uuid="ccfd3fb8-5269-11df-bc97-080069138b88" uid="11614"/>
+        <specific value="13" description="MCM 13 Dextrous" uuid="ccfe52cc-5269-11df-b062-080069138b88" uid="11615"/>
+        <specific value="14" description="MCM 14 Chief" uuid="ccff67de-5269-11df-a38b-080069138b88" uid="11616"/>
+      </subcategory>
+      <subcategory value="3" description="Acme Class" uuid="cd011bec-5269-11df-bca8-080069138b88" uid="11617">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="cd022d02-5269-11df-ac90-080069138b88" uid="11618"/>
+        <specific value="2" description="MSO 511 Affray" uuid="cd033ff8-5269-11df-9478-080069138b88" uid="11619"/>
+      </subcategory>
+      <subcategory value="4" description="Agile/Aggressive Class" deprecated="1" uuid="cd04f294-5269-11df-b95d-080069138b88" uid="11620">
+        <specific value="1" description="MSO 427 Constant" deprecated="1" uuid="cd0609ea-5269-11df-a2ed-080069138b88" uid="11621"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="cd071646-5269-11df-b658-080069138b88" uid="11622"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="cd0c9daa-5269-11df-b3f9-080069138b88" uid="11623"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="cd1148e6-5269-11df-821e-080069138b88" uid="11624"/>
+        <specific value="5" description="MSO 439 Excel" deprecated="1" uuid="cd19950a-5269-11df-9fb9-080069138b88" uid="11625"/>
+        <specific value="6" description="MSO 440 Exploit" deprecated="1" uuid="cd1aac88-5269-11df-8a5a-080069138b88" uid="11626"/>
+        <specific value="7" description="(deprecated)" deprecated="1" uuid="cd1bbbb4-5269-11df-bd41-080069138b88" uid="11627"/>
+        <specific value="8" description="(deprecated)" deprecated="1" uuid="cd1cd2b0-5269-11df-8267-080069138b88" uid="11628"/>
+        <specific value="9" description="(deprecated)" deprecated="1" uuid="cd1de5f6-5269-11df-8d3c-080069138b88" uid="11629"/>
+        <specific value="10" description="MSO 446 Fortify" deprecated="1" uuid="cd1ef46e-5269-11df-b8cb-080069138b88" uid="11630"/>
+        <specific value="11" description="(deprecated)" deprecated="1" uuid="cd200c1e-5269-11df-b3ac-080069138b88" uid="11631"/>
+        <specific value="12" description="MSO 449 Impervious" deprecated="1" uuid="cd211fb4-5269-11df-b38f-080069138b88" uid="11632"/>
+        <specific value="13" description="(deprecated)" deprecated="1" uuid="cd222d28-5269-11df-80f7-080069138b88" uid="11633"/>
+        <specific value="14" description="(deprecated)" deprecated="1" uuid="cd233ea2-5269-11df-9eb6-080069138b88" uid="11634"/>
+        <specific value="15" description="(deprecated)" deprecated="1" uuid="cd24551c-5269-11df-a880-080069138b88" uid="11635"/>
+        <specific value="16" description="MSO 488 Conquest" deprecated="1" uuid="cd2562c2-5269-11df-8337-080069138b88" uid="11636"/>
+        <specific value="17" description="MSO 489 Gallant" deprecated="1" uuid="cd26754a-5269-11df-a99d-080069138b88" uid="11637"/>
+        <specific value="18" description="(deprecated)" deprecated="1" uuid="cd278a48-5269-11df-82fa-080069138b88" uid="11638"/>
+        <specific value="19" description="MSO 492 Pledge" deprecated="1" uuid="cd289758-5269-11df-ab06-080069138b88" uid="11639"/>
+      </subcategory>
+    </category>
+    <category value="9" description="Dock Landing Ship" uuid="cd2af3ae-5269-11df-916c-080069138b88" uid="11640">
+      <subcategory value="1" description="Whidbey Island Class" uuid="cd2bff1a-5269-11df-b895-080069138b88" uid="11641">
+        <specific value="1" description="LSD 41 Whidbey Island" uuid="cd2d0fcc-5269-11df-9227-080069138b88" uid="11642"/>
+        <specific value="2" description="LSD 42 Germantown" uuid="cd2e22ea-5269-11df-bd3e-080069138b88" uid="11643"/>
+        <specific value="3" description="LSD 43 Fort McHenry" uuid="cd2f3360-5269-11df-82fa-080069138b88" uid="11644"/>
+        <specific value="4" description="LSD 44 Gunston Hall" uuid="cd304dfe-5269-11df-93e4-080069138b88" uid="11645"/>
+        <specific value="5" description="LSD 45 Comstock" uuid="cd3161e4-5269-11df-a071-080069138b88" uid="11646"/>
+        <specific value="6" description="LSD 46 Tortuga" uuid="cd326c60-5269-11df-99a6-080069138b88" uid="11647"/>
+        <specific value="7" description="LSD 47 Rushmore" uuid="cd33844c-5269-11df-ad22-080069138b88" uid="11648"/>
+        <specific value="8" description="LSD 48 Ashland" uuid="cd349b52-5269-11df-bd80-080069138b88" uid="11649"/>
+        <specific value="9" description="LSD 49 Harpers Ferry" uuid="cd35a7cc-5269-11df-a7f6-080069138b88" uid="11650"/>
+        <specific value="10" description="LSD 50 Carter Hall" uuid="cd36b874-5269-11df-ae78-080069138b88" uid="11651"/>
+        <specific value="11" description="LSD 51 Oak Hill" uuid="cd37cbf6-5269-11df-8452-080069138b88" uid="11652"/>
+        <specific value="12" description="LSD 52 Pearl Harbor" uuid="cd38db90-5269-11df-90e9-080069138b88" uid="11653"/>
+      </subcategory>
+      <subcategory value="2" description="Anchorage Class" uuid="cd3a8d5a-5269-11df-97e2-080069138b88" uid="11654">
+        <specific value="1" description="LSD 36 Anchorage" uuid="cd3b9ea2-5269-11df-9d32-080069138b88" uid="11655"/>
+        <specific value="2" description="LSD 37 Portland" uuid="cd3cb0e4-5269-11df-9966-080069138b88" uid="11656"/>
+        <specific value="3" description="LSD 38 Pensacola" uuid="cd3dc27c-5269-11df-856a-080069138b88" uid="11657"/>
+        <specific value="4" description="LSD 39 Mount Vernon" uuid="cd3ed4fa-5269-11df-85e2-080069138b88" uid="11658"/>
+        <specific value="5" description="LSD 40 Fort Fisher" uuid="cd3fe584-5269-11df-8168-080069138b88" uid="11659"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Tank Landing Ship" uuid="cd423af0-5269-11df-ab42-080069138b88" uid="11660">
+      <subcategory value="1" description="Newport Class" uuid="cd434b48-5269-11df-94c0-080069138b88" uid="11661">
+        <specific value="1" description="LST 1179 Newport" uuid="cd445718-5269-11df-ac5e-080069138b88" uid="11662"/>
+        <specific value="2" description="LST 1180 Manitowac" uuid="cd4569b4-5269-11df-8d65-080069138b88" uid="11663"/>
+        <specific value="3" description="LST 1181 Sumter" uuid="cd467ade-5269-11df-b572-080069138b88" uid="11664"/>
+        <specific value="4" description="LST 1182 Fresno" uuid="cd478708-5269-11df-a045-080069138b88" uid="11665"/>
+        <specific value="5" description="LST 1183 Peoria" uuid="cd4898aa-5269-11df-9b71-080069138b88" uid="11666"/>
+        <specific value="6" description="LST 1184 Frederick" uuid="cd49a998-5269-11df-9184-080069138b88" uid="11667"/>
+        <specific value="7" description="LST 1185 Schenectady" uuid="cd4ab9be-5269-11df-ae4f-080069138b88" uid="11668"/>
+        <specific value="8" description="LST 1186 Cayuga" uuid="cd4bcbd8-5269-11df-98c3-080069138b88" uid="11669"/>
+        <specific value="9" description="LST 1187 Tuscaloosa" uuid="cd4cdd16-5269-11df-b3f6-080069138b88" uid="11670"/>
+        <specific value="10" description="LST 1188 Saginaw" uuid="cd4dea44-5269-11df-a5e7-080069138b88" uid="11671"/>
+        <specific value="11" description="LST 1189 San Bernardino" uuid="cd4f056e-5269-11df-9020-080069138b88" uid="11672"/>
+        <specific value="12" description="LST 1190 Boulder" uuid="cd501c74-5269-11df-b948-080069138b88" uid="11673"/>
+        <specific value="13" description="LST 1191 Racine" uuid="cd51289e-5269-11df-97ac-080069138b88" uid="11674"/>
+        <specific value="14" description="LST 1192 Spartanburg County" uuid="cd523982-5269-11df-b45e-080069138b88" uid="11675"/>
+        <specific value="15" description="LST 1193 Fairfax County" uuid="cd534d18-5269-11df-973b-080069138b88" uid="11676"/>
+        <specific value="16" description="LST 1194 La Moure County" uuid="cd545d0c-5269-11df-82df-080069138b88" uid="11677"/>
+        <specific value="17" description="(deprecated)" deprecated="1" uuid="cd556e7c-5269-11df-864d-080069138b88" uid="11678"/>
+        <specific value="18" description="LST 1196 Harlan County" uuid="cd56800a-5269-11df-88c7-080069138b88" uid="11679"/>
+        <specific value="19" description="LST 1197 Barnstable County" uuid="cd578c66-5269-11df-b500-080069138b88" uid="11680"/>
+        <specific value="20" description="LST 1198 Bristol County" uuid="cd58a240-5269-11df-8967-080069138b88" uid="11681"/>
+      </subcategory>
+      <subcategory value="2" description="Newport Class LPA/LST (modified)" uuid="cd5a55a4-5269-11df-b10b-080069138b88" uid="11682">
+        <specific value="1" description="L51 Kanimbla (ex. Saginaw)" uuid="cd5b8974-5269-11df-b49e-080069138b88" uid="11683"/>
+        <specific value="2" description="L52 Manoora (ex. Fairfax County)" uuid="cd5c9ce2-5269-11df-b03d-080069138b88" uid="11684"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="cd5ef460-5269-11df-846f-080069138b88" uid="11685">
+      <subcategory value="1" description="Landing Craft Air Cusion (LCAC)" uuid="cd60054e-5269-11df-9ffe-080069138b88" uid="11686"/>
+      <subcategory value="2" description="LCU 1600 Class: Utility Landing Craft" uuid="cd6115e2-5269-11df-b6e3-080069138b88" uid="11687"/>
+      <subcategory value="3" description="LCU 6 Type: Mechanized Landing Craft" uuid="cd622928-5269-11df-9c4e-080069138b88" uid="11688"/>
+      <subcategory value="4" description="Landing Craft Personnel (LCPL)" uuid="cd633dd6-5269-11df-b1d2-080069138b88" uid="11689"/>
+      <subcategory value="5" description="Amphibious Assault Vehicle (AAV)" uuid="cd644ea6-5269-11df-b4d1-080069138b88" uid="11690"/>
+      <subcategory value="6" description="LCU 1610 Class (Transport) (YFU) (Saudia Arabia)" uuid="cd656296-5269-11df-ad48-080069138b88" uid="11691">
+        <specific value="1" description="212 Al Qiaq (Saudia Arabia)" uuid="cd6674ce-5269-11df-867e-080069138b88" uid="11692"/>
+      </subcategory>
+    </category>
+    <category value="14" description="Hydrofoil" uuid="cd68ca30-5269-11df-8f3c-080069138b88" uid="11693">
+      <subcategory value="1" description="Pegasus class" uuid="cd69da1a-5269-11df-9fe6-080069138b88" uid="11694">
+        <specific value="1" description="PHM 1 Pegasus" uuid="cd6aed06-5269-11df-a1a0-080069138b88" uid="11695"/>
+        <specific value="2" description="PHM 2 Hercules" uuid="cd6bfdea-5269-11df-b597-080069138b88" uid="11696"/>
+        <specific value="3" description="PHM 3 Taurus" uuid="cd6d0ece-5269-11df-a832-080069138b88" uid="11697"/>
+        <specific value="4" description="PHM 4 Aquila" uuid="cd6e2408-5269-11df-881a-080069138b88" uid="11698"/>
+        <specific value="5" description="PHM 5 Aries" uuid="cd6f3a32-5269-11df-b2c7-080069138b88" uid="11699"/>
+        <specific value="6" description="PHM 6 Gemini" uuid="cd704b8e-5269-11df-b9cc-080069138b88" uid="11700"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="cd72a942-5269-11df-8289-080069138b88" uid="11701">
+      <subcategory value="1" description="Cimarron class (Fleet Oilers)" uuid="cd73c12e-5269-11df-b49d-080069138b88" uid="11702">
+        <specific value="1" description="AO 177 Cimarron" uuid="cd74cfd8-5269-11df-b838-080069138b88" uid="11703"/>
+        <specific value="2" description="AO 178 Monongahela" uuid="cd75e1e8-5269-11df-a8fe-080069138b88" uid="11704"/>
+        <specific value="3" description="AO 179 Merrimack" uuid="cd76f10a-5269-11df-a003-080069138b88" uid="11705"/>
+        <specific value="4" description="AO 180 Willamette" uuid="cd7800b8-5269-11df-b32a-080069138b88" uid="11706"/>
+        <specific value="5" description="AO 186 Platte" uuid="cd7911e2-5269-11df-99b6-080069138b88" uid="11707"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="cd7ac5be-5269-11df-818e-080069138b88" uid="11708"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="cd7bd9f4-5269-11df-b9a4-080069138b88" uid="11709"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="cd7ce722-5269-11df-a7c1-080069138b88" uid="11710"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="cd7dfa90-5269-11df-9d63-080069138b88" uid="11711"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="cd7f1128-5269-11df-b08e-080069138b88" uid="11712"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="cd807f7c-5269-11df-a7b2-080069138b88" uid="11713"/>
+      <subcategory value="8" description="Wichita class (Replenishment Oilers)" uuid="cd819d08-5269-11df-8432-080069138b88" uid="11714">
+        <specific value="1" description="AOR 1 Wichita" uuid="cd82b652-5269-11df-826d-080069138b88" uid="11715"/>
+        <specific value="2" description="AOR 2 Milwaukee" uuid="cd84465c-5269-11df-a229-080069138b88" uid="11716"/>
+        <specific value="3" description="AOR 3 Kansas City" uuid="cd855be6-5269-11df-af79-080069138b88" uid="11717"/>
+        <specific value="4" description="AOR 4 Savannah" uuid="cd86af64-5269-11df-b7f1-080069138b88" uid="11718"/>
+        <specific value="5" description="AOR 5 Wabash" uuid="cd87c958-5269-11df-b76d-080069138b88" uid="11719"/>
+        <specific value="6" description="AOR 6 Kalamazoo" uuid="cd88da5a-5269-11df-9628-080069138b88" uid="11720"/>
+        <specific value="7" description="AOR 7 Roanoke" uuid="cd89ebd4-5269-11df-97b7-080069138b88" uid="11721"/>
+      </subcategory>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="cd8ba668-5269-11df-b5ce-080069138b88" uid="11722"/>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="cd8cdd58-5269-11df-b845-080069138b88" uid="11723"/>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="cd8df4e0-5269-11df-9480-080069138b88" uid="11724"/>
+      <subcategory value="12" description="Vulcan class (Repair Ship)" uuid="cd8f0998-5269-11df-929e-080069138b88" uid="11725">
+        <specific value="1" description="AR 8 Jason" uuid="cd901fcc-5269-11df-ab4a-080069138b88" uid="11726"/>
+      </subcategory>
+      <subcategory value="13" description="Fulton class (Submarine Tenders)" uuid="cd91d218-5269-11df-820d-080069138b88" uid="11727">
+        <specific value="1" description="AS 18 Orion" uuid="cd92e112-5269-11df-b5fb-080069138b88" uid="11728"/>
+      </subcategory>
+      <subcategory value="14" description="Proteus class (Submarine Tenders)" uuid="cd949232-5269-11df-a40e-080069138b88" uid="11729">
+        <specific value="1" description="AS 19 Proteus" uuid="cd95a492-5269-11df-9ebc-080069138b88" uid="11730"/>
+      </subcategory>
+      <subcategory value="15" description="Hunley class (Submarine Tenders)" uuid="cd975882-5269-11df-9dfd-080069138b88" uid="11731">
+        <specific value="1" description="AS 31 Hunley" uuid="cd9868b2-5269-11df-a9aa-080069138b88" uid="11732"/>
+        <specific value="2" description="AS 32 Holland" uuid="cd99737e-5269-11df-9f99-080069138b88" uid="11733"/>
+      </subcategory>
+      <subcategory value="16" description="Simon Lake class (Submarine Tenders)" uuid="cd9b275a-5269-11df-976c-080069138b88" uid="11734">
+        <specific value="1" description="AS 33 Simon Lake" uuid="cd9c3a82-5269-11df-80e8-080069138b88" uid="11735"/>
+        <specific value="2" description="AS 34 Canopus" uuid="cd9d497c-5269-11df-ae3e-080069138b88" uid="11736"/>
+      </subcategory>
+      <subcategory value="17" description="Spear class (Submarine Tenders)" uuid="cd9efd12-5269-11df-af02-080069138b88" uid="11737">
+        <specific value="1" description="AS 36 L. Y. Spear" uuid="cda009b4-5269-11df-9e36-080069138b88" uid="11738"/>
+        <specific value="2" description="AS 37 Dixon" uuid="cda11b4c-5269-11df-92cf-080069138b88" uid="11739"/>
+      </subcategory>
+      <subcategory value="18" description="Emory S. Land class (Submarine Tenders)" uuid="cda2cf0a-5269-11df-8d02-080069138b88" uid="11740">
+        <specific value="1" description="AS 39 Emory S. Land" uuid="cda3e124-5269-11df-9d00-080069138b88" uid="11741"/>
+        <specific value="2" description="AS 40 Frank Cable" uuid="cda4ecd6-5269-11df-99d3-080069138b88" uid="11742"/>
+        <specific value="3" description="AS 41 McKee" uuid="cda60076-5269-11df-8b55-080069138b88" uid="11743"/>
+      </subcategory>
+      <subcategory value="19" description="Bolster class (Salvage Ships)" uuid="cda7b416-5269-11df-95fe-080069138b88" uid="11744">
+        <specific value="1" description="ARS 8 Preserver" uuid="cda8c978-5269-11df-a6d5-080069138b88" uid="11745"/>
+        <specific value="2" description="ARS 38 Bolster" uuid="cda9d52a-5269-11df-a259-080069138b88" uid="11746"/>
+        <specific value="3" description="ARS 39 Conserver" uuid="cdaaf0b8-5269-11df-81d6-080069138b88" uid="11747"/>
+        <specific value="4" description="ARS 40 Hoist" uuid="cdabfd78-5269-11df-a3f5-080069138b88" uid="11748"/>
+        <specific value="5" description="ARS 41 Opportune" uuid="cdad11cc-5269-11df-9662-080069138b88" uid="11749"/>
+        <specific value="6" description="ARS 42 Reclaimer" uuid="cdae2256-5269-11df-9b53-080069138b88" uid="11750"/>
+        <specific value="7" description="ARS 43 Recovery" uuid="cdaf3330-5269-11df-b6ca-080069138b88" uid="11751"/>
+      </subcategory>
+      <subcategory value="20" description="Safeguard class (Salvage Ships)" uuid="cdb0e5f4-5269-11df-b82f-080069138b88" uid="11752">
+        <specific value="1" description="ARS 50 Safeguard" uuid="cdb2660e-5269-11df-ba06-080069138b88" uid="11753"/>
+        <specific value="2" description="ARS 51 Grasp" uuid="cdb37508-5269-11df-9854-080069138b88" uid="11754"/>
+        <specific value="3" description="ARS 52 Salvor" uuid="cdb485f6-5269-11df-9ecb-080069138b88" uid="11755"/>
+        <specific value="4" description="ARS 53 Grapple" uuid="cdb59af4-5269-11df-a11a-080069138b88" uid="11756"/>
+      </subcategory>
+      <subcategory value="21" description="Edenton class (Salvage Ships)" uuid="cdb7674e-5269-11df-96ea-080069138b88" uid="11757">
+        <specific value="1" description="ATS 1 Edenton" uuid="cdb92fca-5269-11df-814d-080069138b88" uid="11758"/>
+        <specific value="2" description="ATS 2 Beaufort" uuid="cdba4c16-5269-11df-8178-080069138b88" uid="11759"/>
+        <specific value="3" description="ATS 3 Brunswick" uuid="cdbba584-5269-11df-854e-080069138b88" uid="11760"/>
+      </subcategory>
+      <subcategory value="22" description="Chanticleer class (Submarine Rescue)" uuid="cdbd9e52-5269-11df-9048-080069138b88" uid="11761">
+        <specific value="1" description="ASR 13 Kittiwake" uuid="cdbeacb6-5269-11df-b7b0-080069138b88" uid="11762"/>
+        <specific value="2" description="ASR 15 Sunbird" uuid="cdbfc60a-5269-11df-988e-080069138b88" uid="11763"/>
+      </subcategory>
+      <subcategory value="23" description="Pigeon class (Submarine Rescue)" uuid="cdc17856-5269-11df-bda0-080069138b88" uid="11764">
+        <specific value="1" description="ASR 21 Pigeon" uuid="cdc28930-5269-11df-ba80-080069138b88" uid="11765"/>
+        <specific value="2" description="ASR 22 Ortolan" uuid="cdc39816-5269-11df-a383-080069138b88" uid="11766"/>
+      </subcategory>
+      <subcategory value="24" description="Abnaki class (Fleet Ocean Tugs)" uuid="cdc549b8-5269-11df-bdb2-080069138b88" uid="11767">
+        <specific value="1" description="ATF 159 Paiute" uuid="cdc65bbe-5269-11df-b54e-080069138b88" uid="11768"/>
+        <specific value="2" description="ATF 160 Papago" uuid="cdc76f2c-5269-11df-89d3-080069138b88" uid="11769"/>
+      </subcategory>
+    </category>
+    <category value="17" description="Auxiliary, Merchant Marine" uuid="cdc9c7fe-5269-11df-be28-080069138b88" uid="11770">
+      <subcategory value="1" description="Fleet Ballistic Missile Support Ships (Naval Fleet)" uuid="cdcae058-5269-11df-9654-080069138b88" uid="11771">
+        <specific value="1" description="TAK 282 Marshfield" uuid="cdcbef3e-5269-11df-9d43-080069138b88" uid="11772"/>
+        <specific value="2" description="TAK 286 Vega" uuid="cdcd0478-5269-11df-99e1-080069138b88" uid="11773"/>
+      </subcategory>
+      <subcategory value="2" description="Ammunition Ship (Naval Fleet)" uuid="cdceb822-5269-11df-aa51-080069138b88" uid="11774">
+        <specific value="1" description="TAE 26 Kilauea" deprecated="1" uuid="cdcfc9b0-5269-11df-969f-080069138b88" uid="11775"/>
+      </subcategory>
+      <subcategory value="3" description="Fleet Stores Ship (Naval Fleet)" uuid="cdd17bd4-5269-11df-b1d6-080069138b88" uid="11776">
+        <specific value="1" description="TAF 58 Rigel" uuid="cdd28a42-5269-11df-86b6-080069138b88" uid="11777"/>
+      </subcategory>
+      <subcategory value="4" description="Combat Stores Ships (Naval Fleet)" uuid="cdd43982-5269-11df-9083-080069138b88" uid="11778">
+        <specific value="1" description="TAFS 8 Sirius" uuid="cdd54b38-5269-11df-9307-080069138b88" uid="11779"/>
+        <specific value="2" description="TAFS 9 Spica" uuid="cdd661f8-5269-11df-a452-080069138b88" uid="11780"/>
+        <specific value="3" description="TAFS 10 Saturn" uuid="cdd76bfc-5269-11df-9ddf-080069138b88" uid="11781"/>
+      </subcategory>
+      <subcategory value="5" description="Neosho class (Naval Fleet Oilers)" uuid="cdd91bdc-5269-11df-aa6c-080069138b88" uid="11782">
+        <specific value="1" description="TAO 143 Neosho" uuid="cdda3134-5269-11df-8747-080069138b88" uid="11783"/>
+        <specific value="2" description="TAO 146 Kawishiwi" uuid="cddb6892-5269-11df-bdbf-080069138b88" uid="11784"/>
+        <specific value="3" description="TAO 148 Ponchatoula" uuid="cddc7a66-5269-11df-984b-080069138b88" uid="11785"/>
+      </subcategory>
+      <subcategory value="6" description="Henry J. Kaiser class (Naval Fleet Oilers)" uuid="cdde3662-5269-11df-8c26-080069138b88" uid="11786">
+        <specific value="1" description="TAO 187 Henry J. Kaiser" uuid="cddf4250-5269-11df-a5c4-080069138b88" uid="11787"/>
+        <specific value="2" description="TAO 188 Joshua Humphreys" uuid="cde05834-5269-11df-8c70-080069138b88" uid="11788"/>
+        <specific value="3" description="TAO 189 John Lenthall" uuid="cde16a1c-5269-11df-b44c-080069138b88" uid="11789"/>
+        <specific value="4" description="TAO 190 Andrew J. Higgins" uuid="cde27574-5269-11df-a25d-080069138b88" uid="11790"/>
+        <specific value="5" description="TAO 191 Benjamin Isherwood" uuid="cde38a90-5269-11df-8756-080069138b88" uid="11791"/>
+        <specific value="6" description="TAO 192 Henry Eckford" uuid="cde49b7e-5269-11df-a1e1-080069138b88" uid="11792"/>
+        <specific value="7" description="TAO 193 Walter S. Diehl" uuid="cde5a7c6-5269-11df-9d6b-080069138b88" uid="11793"/>
+        <specific value="8" description="TAO 194 John Ericsson" uuid="cde6b9e0-5269-11df-ab07-080069138b88" uid="11794"/>
+        <specific value="9" description="TAO 195 Leroy Grumman" uuid="cde7c9de-5269-11df-9c82-080069138b88" uid="11795"/>
+        <specific value="10" description="TAO 196 Kanawha" uuid="cde8e2ba-5269-11df-bb2b-080069138b88" uid="11796"/>
+        <specific value="11" description="TAO 197 Pecos" uuid="cde9f6f0-5269-11df-b10b-080069138b88" uid="11797"/>
+        <specific value="12" description="TAO 198 Big Horn" uuid="cdeb0964-5269-11df-a9c1-080069138b88" uid="11798"/>
+        <specific value="13" description="TAO 199 Tippecanoe" uuid="cdec12c8-5269-11df-8c95-080069138b88" uid="11799"/>
+        <specific value="14" description="TAO 200 Guadaloupe" uuid="cded2776-5269-11df-90f4-080069138b88" uid="11800"/>
+        <specific value="15" description="TAO 201 Patuxent" uuid="cdee385a-5269-11df-9a8e-080069138b88" uid="11801"/>
+        <specific value="16" description="TAO 202 Yukon" uuid="cdef43d0-5269-11df-98ae-080069138b88" uid="11802"/>
+        <specific value="17" description="TAO 203 Laramie" uuid="cdf0569e-5269-11df-82dd-080069138b88" uid="11803"/>
+        <specific value="18" description="TAO 204 Rappahannock" uuid="cdf1680e-5269-11df-a383-080069138b88" uid="11804"/>
+      </subcategory>
+      <subcategory value="7" description="Powhatan class (Fleet Ocean Tugs)" uuid="cdf31a82-5269-11df-a27e-080069138b88" uid="11805">
+        <specific value="1" description="TATF 166 Powhatan" uuid="cdf429a4-5269-11df-9902-080069138b88" uid="11806"/>
+        <specific value="2" description="TATF 167 Narragansett" uuid="cdf538d0-5269-11df-94d9-080069138b88" uid="11807"/>
+        <specific value="3" description="TATF 168 Catawba" uuid="cdf649a0-5269-11df-8e58-080069138b88" uid="11808"/>
+        <specific value="4" description="TATF 169 Navajo" uuid="cdf7580e-5269-11df-bca2-080069138b88" uid="11809"/>
+        <specific value="5" description="TATF 170 Mohawk" uuid="cdf86776-5269-11df-8dd8-080069138b88" uid="11810"/>
+        <specific value="6" description="TATF 171 Sioux" uuid="cdf97792-5269-11df-bcd6-080069138b88" uid="11811"/>
+        <specific value="7" description="TATF 172 Apache" uuid="cdfa860a-5269-11df-8819-080069138b88" uid="11812"/>
+      </subcategory>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="cdfc354a-5269-11df-b473-080069138b88" uid="11813"/>
+      <subcategory value="9" description="Maritime Prepositioning Ships (MPS)" uuid="cdfd4908-5269-11df-b5f3-080069138b88" uid="11814">
+        <specific value="1" description="TAK 3000 Cpl Louis Hauge Jr." uuid="cdfe5e56-5269-11df-97db-080069138b88" uid="11815"/>
+        <specific value="2" description="TAK 3001 Pfc William Baugh" uuid="cdff69b8-5269-11df-b0e3-080069138b88" uid="11816"/>
+        <specific value="3" description="TAK 3002 Pfc James Anderson Jr." uuid="ce007ba0-5269-11df-a8a3-080069138b88" uid="11817"/>
+        <specific value="4" description="TAK 3003 1st Lt Alexander Bonnyman Jr." uuid="ce018ec8-5269-11df-be42-080069138b88" uid="11818"/>
+        <specific value="5" description="TAK 3004 Pvt Harry Fisher" uuid="ce029a0c-5269-11df-b923-080069138b88" uid="11819"/>
+        <specific value="6" description="TAK 3005 Sgt Matej Kocak" uuid="ce03abae-5269-11df-b629-080069138b88" uid="11820"/>
+        <specific value="7" description="TAK 3006 Pfc Eugene A. Obregon" uuid="ce04c0fc-5269-11df-9b66-080069138b88" uid="11821"/>
+        <specific value="8" description="TAK 3007 Maj Stephen W. Pless" uuid="ce05cd26-5269-11df-8274-080069138b88" uid="11822"/>
+        <specific value="9" description="TAK 3008 2nd Lt John P. Bobo" uuid="ce06df5e-5269-11df-890d-080069138b88" uid="11823"/>
+        <specific value="10" description="TAK 3009 Pfc Dewayne T. Williams" uuid="ce07fb96-5269-11df-b4c8-080069138b88" uid="11824"/>
+        <specific value="11" description="TAK 3010 1st Lt Baldomero Lopez" uuid="ce090c16-5269-11df-8530-080069138b88" uid="11825"/>
+        <specific value="12" description="TAK 3011 1st Lt Jack Lummus" uuid="ce0a1ebc-5269-11df-bf8c-080069138b88" uid="11826"/>
+        <specific value="13" description="TAK 3012 Staff Sgt William R. Button" uuid="ce0b3338-5269-11df-a5fe-080069138b88" uid="11827"/>
+      </subcategory>
+      <subcategory value="10" description="Lash (Preposition)" uuid="ce0cf4a2-5269-11df-811e-080069138b88" uid="11828">
+        <specific value="1" description="TAK 1015 Green Island" uuid="ce0e007c-5269-11df-8a31-080069138b88" uid="11829"/>
+        <specific value="2" description="TAK 2043 American Kestrel" uuid="ce0f1228-5269-11df-8b6c-080069138b88" uid="11830"/>
+        <specific value="3" description="TAK 2046 Austral Rainbow" uuid="ce102276-5269-11df-9bc3-080069138b88" uid="11831"/>
+        <specific value="4" description="TAK 2064 Green Harbour" uuid="ce11318e-5269-11df-b5ff-080069138b88" uid="11832"/>
+      </subcategory>
+      <subcategory value="11" description="Freighters (Preposition)" uuid="ce12e236-5269-11df-b72b-080069138b88" uid="11833">
+        <specific value="1" description="TAK 5076 Noble Star" uuid="ce13f4b4-5269-11df-bc37-080069138b88" uid="11834"/>
+        <specific value="2" description="TAK 2040 Advantage" uuid="ce1504ee-5269-11df-8c41-080069138b88" uid="11835"/>
+        <specific value="3" description="TAK 2062 American Cormorant" uuid="ce161050-5269-11df-b6fe-080069138b88" uid="11836"/>
+      </subcategory>
+      <subcategory value="12" description="Tankers (PRE-POSITION)" uuid="ce17c440-5269-11df-a5c7-080069138b88" uid="11837">
+        <specific value="1" description="TAOT 170 Sealift China Sea" uuid="ce18d632-5269-11df-bd3a-080069138b88" uid="11838"/>
+        <specific value="2" description="TAOT 181 Potomac" uuid="ce19e5fe-5269-11df-8413-080069138b88" uid="11839"/>
+      </subcategory>
+      <subcategory value="13" description="Tankers (Ocean Transportation)" uuid="ce1b993a-5269-11df-bcb4-080069138b88" uid="11840">
+        <specific value="1" description="TAOT 168 Sealift Pacific" uuid="ce1ca4b0-5269-11df-bbe7-080069138b88" uid="11841"/>
+        <specific value="2" description="TAOT 169 Sealift Arabian Sea" uuid="ce1db620-5269-11df-8a1b-080069138b88" uid="11842"/>
+        <specific value="3" description="TAOT 171 Sealift Indian Ocean" uuid="ce1ec844-5269-11df-a6ba-080069138b88" uid="11843"/>
+        <specific value="4" description="TAOT 172 Sealift Atlantic" uuid="ce1fd748-5269-11df-bc9f-080069138b88" uid="11844"/>
+        <specific value="5" description="TAOT 173 Sealift Mediterranean" uuid="ce20e70a-5269-11df-a84f-080069138b88" uid="11845"/>
+        <specific value="6" description="TAOT 174 Sealift Caribbean" uuid="ce21f9d8-5269-11df-8463-080069138b88" uid="11846"/>
+        <specific value="7" description="TAOT 175 Sealift Arctic" uuid="ce230724-5269-11df-84c3-080069138b88" uid="11847"/>
+        <specific value="8" description="TAOT 176 Sealift Antarctic" uuid="ce2418bc-5269-11df-b4cb-080069138b88" uid="11848"/>
+        <specific value="9" description="TAOT 1121 Gus W. Darnell" uuid="ce252a72-5269-11df-84af-080069138b88" uid="11849"/>
+        <specific value="10" description="TAOT 1122 Paul Buck" uuid="ce2641d2-5269-11df-ac91-080069138b88" uid="11850"/>
+        <specific value="11" description="TAOT 1123 Samuel L. Cobb" uuid="ce275310-5269-11df-adcb-080069138b88" uid="11851"/>
+        <specific value="12" description="TAOT 1124 Richard G. Matthieson" uuid="ce286610-5269-11df-ba30-080069138b88" uid="11852"/>
+        <specific value="13" description="TAOT 1125 Lawrence H. Gianella" uuid="ce2972bc-5269-11df-9d75-080069138b88" uid="11853"/>
+      </subcategory>
+      <subcategory value="14" description="Fast Sealift Ships (Strategic Sealift)" uuid="ce2b280a-5269-11df-a7fc-080069138b88" uid="11854">
+        <specific value="1" description="TAKR 287 Algol" uuid="ce2c3772-5269-11df-a67d-080069138b88" uid="11855"/>
+        <specific value="2" description="TAKR 288 Bellatrix" uuid="ce2d48c4-5269-11df-821a-080069138b88" uid="11856"/>
+        <specific value="3" description="TAKR 289 Denebola" uuid="ce2e576e-5269-11df-8188-080069138b88" uid="11857"/>
+        <specific value="4" description="TAKR 290 Pollux" uuid="ce2f66f4-5269-11df-9d70-080069138b88" uid="11858"/>
+        <specific value="5" description="TAKR 291 Altair" uuid="ce30762a-5269-11df-82d1-080069138b88" uid="11859"/>
+        <specific value="6" description="TAKR 292 Regulus" uuid="ce31834e-5269-11df-8e5d-080069138b88" uid="11860"/>
+        <specific value="7" description="TAKR 293 Capella" uuid="ce32945a-5269-11df-8102-080069138b88" uid="11861"/>
+        <specific value="8" description="TAKR 294 Antares" uuid="ce33a520-5269-11df-9085-080069138b88" uid="11862"/>
+      </subcategory>
+      <subcategory value="15" description="Aviation Support Ships (Strategic Sealift)" uuid="ce3554ec-5269-11df-baf3-080069138b88" uid="11863">
+        <specific value="1" description="TAVB 3 Wright" uuid="ce366486-5269-11df-865a-080069138b88" uid="11864"/>
+        <specific value="2" description="TAVB 4 Curtiss" uuid="ce38b894-5269-11df-b01b-080069138b88" uid="11865"/>
+      </subcategory>
+      <subcategory value="16" description="Hospital Ships (Strategic Sealift)" uuid="ce3a72d8-5269-11df-8833-080069138b88" uid="11866">
+        <specific value="1" description="TAH 19 Mercy" uuid="ce3b85e2-5269-11df-9e85-080069138b88" uid="11867"/>
+        <specific value="2" description="TAH 20 Comfort" uuid="ce3c8fc8-5269-11df-be42-080069138b88" uid="11868"/>
+      </subcategory>
+      <subcategory value="17" description="Frigate Research Ship (Special Mission Support)" uuid="ce3e4430-5269-11df-81a4-080069138b88" uid="11869">
+        <specific value="1" description="T-AGFF1 Glover" uuid="ce3f56f4-5269-11df-acf5-080069138b88" uid="11870"/>
+      </subcategory>
+      <subcategory value="18" description="Missile Range Instrumentation Ships (Special Mission Support)" uuid="ce410ad0-5269-11df-96ca-080069138b88" uid="11871">
+        <specific value="1" description="TAGM 20 Redstone" uuid="ce421baa-5269-11df-807c-080069138b88" uid="11872"/>
+        <specific value="2" description="TAGM 22 Range Sentinel" uuid="ce432ab8-5269-11df-86ab-080069138b88" uid="11873"/>
+        <specific value="3" description="TAGM 23 Observation Island" uuid="ce443d7c-5269-11df-85c4-080069138b88" uid="11874"/>
+      </subcategory>
+      <subcategory value="19" description="Oceanographic Research Ships (Special Mission Support)" uuid="ce45f9f0-5269-11df-90d1-080069138b88" uid="11875">
+        <specific value="1" description="TAGOR 10 Thomas Washington (loan)" uuid="ce470ba6-5269-11df-b238-080069138b88" uid="11876"/>
+        <specific value="2" description="TAGOR 12 De Steigeur" uuid="ce481d48-5269-11df-8384-080069138b88" uid="11877"/>
+        <specific value="3" description="TAGOR 13 Bartlett" uuid="ce492f9e-5269-11df-be3a-080069138b88" uid="11878"/>
+        <specific value="4" description="TAGOR 14 Melville (loan)" uuid="ce4a40be-5269-11df-8c45-080069138b88" uid="11879"/>
+        <specific value="5" description="TAGOR 15 Knorr (loan)" uuid="ce4b4f86-5269-11df-9978-080069138b88" uid="11880"/>
+        <specific value="6" description="TAGOR 21 Gyre (loan)" uuid="ce4c60c4-5269-11df-9ae3-080069138b88" uid="11881"/>
+        <specific value="7" description="TAGOR 22 Moana Wave (loan)" uuid="ce4d728e-5269-11df-a5ae-080069138b88" uid="11882"/>
+        <specific value="8" description="TAGOR 23 Thomas G. Thompson (loan)" uuid="ce4e7ea4-5269-11df-8443-080069138b88" uid="11883"/>
+        <specific value="9" description="TAGOR 195 Hayes" uuid="ce4f8f1a-5269-11df-8f9b-080069138b88" uid="11884"/>
+      </subcategory>
+      <subcategory value="20" description="Surveying Ships (Special Mission Support)" uuid="ce514346-5269-11df-bc27-080069138b88" uid="11885">
+        <specific value="1" description="TAGS 26 Silas Bent" uuid="ce52540c-5269-11df-9e6a-080069138b88" uid="11886"/>
+        <specific value="2" description="TAGS 27 Kane" uuid="ce536306-5269-11df-8eac-080069138b88" uid="11887"/>
+        <specific value="3" description="TAGS 29 Chauvenet" uuid="ce54716a-5269-11df-b35e-080069138b88" uid="11888"/>
+        <specific value="4" description="TAGS 32 Harkness" uuid="ce5581b8-5269-11df-97d7-080069138b88" uid="11889"/>
+        <specific value="5" description="TAGS 33 Wilkes" uuid="ce568ff4-5269-11df-880f-080069138b88" uid="11890"/>
+        <specific value="6" description="TAGS 34 Wyman" uuid="ce57a0d8-5269-11df-a960-080069138b88" uid="11891"/>
+        <specific value="7" description="TAGS 39 Maury" uuid="ce58afb4-5269-11df-a371-080069138b88" uid="11892"/>
+        <specific value="8" description="TAGS 40 Tanner" uuid="ce59bdc8-5269-11df-9e34-080069138b88" uid="11893"/>
+        <specific value="9" description="TAGS 45 Waters" uuid="ce5acde4-5269-11df-8725-080069138b88" uid="11894"/>
+        <specific value="10" description="TAGS 51 John McDonnell" uuid="ce5bdf18-5269-11df-906a-080069138b88" uid="11895"/>
+        <specific value="11" description="TAGS 52 Littlehales" uuid="ce5ce944-5269-11df-9209-080069138b88" uid="11896"/>
+        <specific value="12" description="TAGS 60 Pathfinder" uuid="ce5dfb2c-5269-11df-a21a-080069138b88" uid="11897"/>
+        <specific value="13" description="TAGS 61 Sumner" uuid="ce5f0fe4-5269-11df-ab99-080069138b88" uid="11898"/>
+      </subcategory>
+      <subcategory value="21" description="Navigation Test Support Ship (Special Mission Support)" uuid="ce60c122-5269-11df-9467-080069138b88" uid="11899">
+        <specific value="1" description="TAG 194 Vanguard" uuid="ce61cd4c-5269-11df-a38f-080069138b88" uid="11900"/>
+      </subcategory>
+      <subcategory value="22" description="Cable Repair Ships (Special Mission Support)" uuid="ce638b0a-5269-11df-8cc9-080069138b88" uid="11901">
+        <specific value="1" description="TARC 6 Albert J. Myer" uuid="ce649de2-5269-11df-b6d8-080069138b88" uid="11902"/>
+        <specific value="2" description="TARC 7 Zeus" uuid="ce65af3e-5269-11df-b122-080069138b88" uid="11903"/>
+      </subcategory>
+      <subcategory value="23" description="Deep Submergence Support Ship (Special Mission Support)" uuid="ce676130-5269-11df-a943-080069138b88" uid="11904">
+        <specific value="1" description="TAGDS 2 Point Loma" uuid="ce6871a6-5269-11df-9118-080069138b88" uid="11905"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate" uuid="ce6ac44c-5269-11df-9085-080069138b88" uid="11906">
+      <subcategory value="1" description="Knox Class" uuid="ce6bcde2-5269-11df-b3e3-080069138b88" uid="11907">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="ce6cdcb4-5269-11df-b3d4-080069138b88" uid="11908"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="ce6df2b6-5269-11df-8921-080069138b88" uid="11909"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="ce6f00de-5269-11df-98e0-080069138b88" uid="11910"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="ce7013a2-5269-11df-827b-080069138b88" uid="11911"/>
+        <specific value="5" description="FF 1056 Connole" uuid="ce71247c-5269-11df-ab17-080069138b88" uid="11912"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="ce72334e-5269-11df-a309-080069138b88" uid="11913"/>
+        <specific value="7" description="(deprecated)" deprecated="1" uuid="ce7343ec-5269-11df-b6a8-080069138b88" uid="11914"/>
+        <specific value="8" description="(deprecated)" deprecated="1" uuid="ce74566a-5269-11df-9338-080069138b88" uid="11915"/>
+        <specific value="9" description="(deprecated)" deprecated="1" uuid="ce756438-5269-11df-b8c2-080069138b88" uid="11916"/>
+        <specific value="10" description="(deprecated)" deprecated="1" uuid="ce7676de-5269-11df-8fe6-080069138b88" uid="11917"/>
+        <specific value="11" description="(deprecated)" deprecated="1" uuid="ce778880-5269-11df-adef-080069138b88" uid="11918"/>
+        <specific value="12" description="FF 1063 Reasoner" uuid="ce789568-5269-11df-96a7-080069138b88" uid="11919"/>
+        <specific value="13" description="FF 1064 Lockwood" uuid="ce79a584-5269-11df-8b03-080069138b88" uid="11920"/>
+        <specific value="14" description="FF 1065 Stein" uuid="ce7ab9ec-5269-11df-939a-080069138b88" uid="11921"/>
+        <specific value="15" description="FF 1066 Marvin Shields" uuid="ce7bc616-5269-11df-aaef-080069138b88" uid="11922"/>
+        <specific value="16" description="FF 1067 F. Hammond" uuid="ce7cd72c-5269-11df-be37-080069138b88" uid="11923"/>
+        <specific value="17" description="FF 1068 Vreeland" uuid="ce7de7e8-5269-11df-a146-080069138b88" uid="11924"/>
+        <specific value="18" description="(deprecated)" deprecated="1" uuid="ce7ef70a-5269-11df-943b-080069138b88" uid="11925"/>
+        <specific value="19" description="FF 1070 Downes" uuid="ce80071c-5269-11df-a090-080069138b88" uid="11926"/>
+        <specific value="20" description="(deprecated)" deprecated="1" uuid="ce8117ec-5269-11df-81ad-080069138b88" uid="11927"/>
+        <specific value="21" description="(deprecated)" deprecated="1" uuid="ce822c04-5269-11df-b88a-080069138b88" uid="11928"/>
+        <specific value="22" description="FF 1073 R. E. Peary" uuid="ce833f40-5269-11df-82b7-080069138b88" uid="11929"/>
+        <specific value="23" description="FF 1074 Harold E. Holt" uuid="ce845434-5269-11df-bcb3-080069138b88" uid="11930"/>
+        <specific value="24" description="FF 1075 Trippe" uuid="ce855e56-5269-11df-81a3-080069138b88" uid="11931"/>
+        <specific value="25" description="FF 1076 Fanning" uuid="ce866f12-5269-11df-a863-080069138b88" uid="11932"/>
+        <specific value="26" description="FF 1077 Ouellet" uuid="ce8780b4-5269-11df-9bb9-080069138b88" uid="11933"/>
+        <specific value="27" description="FF 1078 Joseph Hewes" uuid="ce888f22-5269-11df-bce8-080069138b88" uid="11934"/>
+        <specific value="28" description="FF 1079 Bowen" uuid="ce899f20-5269-11df-8b83-080069138b88" uid="11935"/>
+        <specific value="29" description="FF 1080 Paul" uuid="ce8aae9c-5269-11df-a6db-080069138b88" uid="11936"/>
+        <specific value="30" description="FF 1081 Aylwin" uuid="ce8bb97c-5269-11df-ab47-080069138b88" uid="11937"/>
+        <specific value="31" description="FF 1082 E. Montgomery" uuid="ce8ccd3a-5269-11df-ba41-080069138b88" uid="11938"/>
+        <specific value="32" description="FF 1083 Cook" uuid="ce8ddd7e-5269-11df-a364-080069138b88" uid="11939"/>
+        <specific value="33" description="FF 1084 McCandless" uuid="ce8ee804-5269-11df-9f2f-080069138b88" uid="11940"/>
+        <specific value="34" description="FF 1085 D. B. Beary" uuid="ce8ffb4a-5269-11df-aa07-080069138b88" uid="11941"/>
+        <specific value="35" description="(deprecated)" deprecated="1" uuid="ce910c42-5269-11df-822b-080069138b88" uid="11942"/>
+        <specific value="36" description="FF 1087 Kirk" uuid="ce9216dc-5269-11df-86e4-080069138b88" uid="11943"/>
+        <specific value="37" description="(deprecated)" deprecated="1" uuid="ce934ea8-5269-11df-bdee-080069138b88" uid="11944"/>
+        <specific value="38" description="FF 1089 J. L. Brown" uuid="ce9466b2-5269-11df-99c1-080069138b88" uid="11945"/>
+        <specific value="39" description="FF 1090 Ainsworth" uuid="ce957296-5269-11df-abba-080069138b88" uid="11946"/>
+        <specific value="40" description="(deprecated)" deprecated="1" uuid="ce9685dc-5269-11df-a5a5-080069138b88" uid="11947"/>
+        <specific value="41" description="FF 1092 T. C. Hart" uuid="ce979a1c-5269-11df-9cd8-080069138b88" uid="11948"/>
+        <specific value="42" description="FF 1093 Capodanno" uuid="ce98a484-5269-11df-a2bb-080069138b88" uid="11949"/>
+        <specific value="43" description="FF 1094 Pharris" uuid="ce99b54a-5269-11df-b8d6-080069138b88" uid="11950"/>
+        <specific value="44" description="FF 1095 Truett" uuid="ce9ac778-5269-11df-a8bc-080069138b88" uid="11951"/>
+        <specific value="45" description="(deprecated)" deprecated="1" uuid="ce9bd19a-5269-11df-bc9c-080069138b88" uid="11952"/>
+        <specific value="46" description="FF 1097 Moinester" uuid="ce9ce436-5269-11df-9596-080069138b88" uid="11953"/>
+      </subcategory>
+    </category>
+    <category value="51" description="Battleship" uuid="ce9f3808-5269-11df-82e1-080069138b88" uid="11954"/>
+    <category value="52" description="Heavy Cruiser" uuid="cea0504e-5269-11df-ac52-080069138b88" uid="11955"/>
+    <category value="53" description="Destroyer Tender" uuid="cea1643e-5269-11df-886d-080069138b88" uid="11956">
+      <subcategory value="1" description="Sam Gompers/Yellowstone Class" uuid="cea27540-5269-11df-8568-080069138b88" uid="11957">
+        <specific value="1" description="AD 37 Samuel Gompers" uuid="cea381ce-5269-11df-a949-080069138b88" uid="11958"/>
+        <specific value="2" description="AD 38 Puget Sound" uuid="cea4955a-5269-11df-8827-080069138b88" uid="11959"/>
+        <specific value="3" description="AD 41 Yellowstone" uuid="cea5a616-5269-11df-b0b1-080069138b88" uid="11960"/>
+        <specific value="4" description="AD 42 Acadia" uuid="cea6bbbe-5269-11df-8821-080069138b88" uid="11961"/>
+        <specific value="5" description="AD 43 Cape Cod" uuid="cea7cdd8-5269-11df-b515-080069138b88" uid="11962"/>
+        <specific value="6" description="AD 44 Shenandoah" uuid="cea8de08-5269-11df-ba62-080069138b88" uid="11963"/>
+      </subcategory>
+      <subcategory value="2" description="Dixie Class" uuid="ceaa91b2-5269-11df-8510-080069138b88" uid="11964">
+        <specific value="1" description="AD 15 Prairie" uuid="ceab9aa8-5269-11df-acdc-080069138b88" uid="11965"/>
+        <specific value="2" description="AD 18 Sierra" uuid="ceacaca4-5269-11df-a6d2-080069138b88" uid="11966"/>
+        <specific value="3" description="AD 19 Yosemite" uuid="ceadbf90-5269-11df-be2a-080069138b88" uid="11967"/>
+      </subcategory>
+    </category>
+    <category value="54" description="Amphibious Assault Ship" uuid="ceb00d0e-5269-11df-a0ea-080069138b88" uid="11968">
+      <subcategory value="1" description="Tarawa Class" uuid="ceb11f82-5269-11df-b59e-080069138b88" uid="11969">
+        <specific value="1" description="LHA 1 Tarawa" uuid="ceb2295e-5269-11df-8112-080069138b88" uid="11970"/>
+        <specific value="2" description="LHA 2 Saipan" uuid="ceb33a56-5269-11df-bdfe-080069138b88" uid="11971"/>
+        <specific value="3" description="LHA 3 Belleau Wood" uuid="ceb44d92-5269-11df-a5db-080069138b88" uid="11972"/>
+        <specific value="4" description="LHA 4 Nassau" uuid="ceb558ae-5269-11df-854f-080069138b88" uid="11973"/>
+        <specific value="5" description="LHA 5 Peleliu" uuid="ceb668ac-5269-11df-bc86-080069138b88" uid="11974"/>
+      </subcategory>
+      <subcategory value="2" description="Iwo Jima Class" uuid="ceb81b20-5269-11df-95cb-080069138b88" uid="11975">
+        <specific value="1" description="LPH 2 Iwo Jima" uuid="ceb927e0-5269-11df-a6fc-080069138b88" uid="11976"/>
+        <specific value="2" description="LPH 3 Okinawa" uuid="ceba32de-5269-11df-ad2a-080069138b88" uid="11977"/>
+        <specific value="3" description="LPH 7 Guadalcanal" uuid="cebb473c-5269-11df-a498-080069138b88" uid="11978"/>
+        <specific value="4" description="LPH 9 Guam" uuid="cebc57ee-5269-11df-9ff8-080069138b88" uid="11979"/>
+        <specific value="5" description="LPH 10 Tripoli" uuid="cebd618e-5269-11df-a5bb-080069138b88" uid="11980"/>
+        <specific value="6" description="LPH 11 New Orleans" uuid="cebe7452-5269-11df-8943-080069138b88" uid="11981"/>
+        <specific value="7" description="LPH 12 Inchon" deprecated="1" uuid="cebf8f86-5269-11df-9d68-080069138b88" uid="11982"/>
+      </subcategory>
+      <subcategory value="3" description="Wasp Class" uuid="cec14042-5269-11df-9f92-080069138b88" uid="11983">
+        <specific value="1" description="LHD 1 Wasp" uuid="cec24c44-5269-11df-8d80-080069138b88" uid="11984"/>
+        <specific value="2" description="LHD 2 Essex" uuid="cec35bde-5269-11df-b81d-080069138b88" uid="11985"/>
+        <specific value="3" description="LHD 3 Kearsage" uuid="cec46c7c-5269-11df-9dc2-080069138b88" uid="11986"/>
+        <specific value="4" description="LHD 4 Boxer" uuid="cec578d8-5269-11df-8ffe-080069138b88" uid="11987"/>
+        <specific value="5" description="LHD 5 Bataan" uuid="cec68750-5269-11df-956c-080069138b88" uid="11988"/>
+        <specific value="6" description="LHD 6 Bonhomme Richard" uuid="cec79adc-5269-11df-ba15-080069138b88" uid="11989"/>
+        <specific value="7" description="LHD 7 Iwo Jima" uuid="cec8a652-5269-11df-9fd9-080069138b88" uid="11990"/>
+      </subcategory>
+      <subcategory value="4" description="MCS Class" uuid="ceca566e-5269-11df-922a-080069138b88" uid="11991">
+        <specific value="1" description="MCS 12 Inchon" uuid="cecb63e2-5269-11df-ba12-080069138b88" uid="11992"/>
+      </subcategory>
+    </category>
+    <category value="55" description="Amphibious Cargo Ship" uuid="cecdb71e-5269-11df-95ff-080069138b88" uid="11993">
+      <subcategory value="1" description="Charleston Class" deprecated="1" uuid="cecec78a-5269-11df-8e7c-080069138b88" uid="11994">
+        <specific value="1" description="LKA 113 Charleston" deprecated="1" uuid="cecfddaa-5269-11df-9f47-080069138b88" uid="11995"/>
+        <specific value="2" description="LKA 114 Durham" deprecated="1" uuid="ced0edb2-5269-11df-8b99-080069138b88" uid="11996"/>
+        <specific value="3" description="LKA 115 Mobile" deprecated="1" uuid="ced1f95a-5269-11df-8843-080069138b88" uid="11997"/>
+        <specific value="4" description="LKA 116 St. Louis" deprecated="1" uuid="ced30e62-5269-11df-a57b-080069138b88" uid="11998"/>
+        <specific value="5" description="LKA 117 El Paso" deprecated="1" uuid="ced41fdc-5269-11df-be37-080069138b88" uid="11999"/>
+      </subcategory>
+    </category>
+    <category value="56" description="Amphibious Transport Dock" uuid="ced670c0-5269-11df-b3f4-080069138b88" uid="12000">
+      <subcategory value="1" description="Austin Class" uuid="ced784b0-5269-11df-87d2-080069138b88" uid="12001">
+        <specific value="1" description="LPD 4 Austin" uuid="ced88e96-5269-11df-a209-080069138b88" uid="12002"/>
+        <specific value="2" description="LPD 5 Ogden" uuid="ced99e6c-5269-11df-a580-080069138b88" uid="12003"/>
+        <specific value="3" description="LPD 6 Duluth" uuid="cedaad34-5269-11df-af06-080069138b88" uid="12004"/>
+        <specific value="4" description="LPD 7 Cleveland" uuid="cedbbaee-5269-11df-bd98-080069138b88" uid="12005"/>
+        <specific value="5" description="LPD 8 Dubuque" uuid="cedcca7e-5269-11df-b99e-080069138b88" uid="12006"/>
+        <specific value="6" description="LPD 9 Denver" uuid="cedddd10-5269-11df-a539-080069138b88" uid="12007"/>
+        <specific value="7" description="LPD 10 Juneau" uuid="cedef15a-5269-11df-9e73-080069138b88" uid="12008"/>
+        <specific value="8" description="LPD 12 Shreveport" uuid="cee0020c-5269-11df-a0ac-080069138b88" uid="12009"/>
+        <specific value="9" description="LPD 13 Nashville" uuid="cee11322-5269-11df-8c8a-080069138b88" uid="12010"/>
+        <specific value="10" description="LPD 14 Trenton" uuid="cee21eca-5269-11df-979b-080069138b88" uid="12011"/>
+        <specific value="11" description="LPD 15 Ponce" uuid="cee32d24-5269-11df-a3a8-080069138b88" uid="12012"/>
+        <specific value="12" description="LPD 17 San Antonio" deprecated="1" uuid="cee442e0-5269-11df-b0ab-080069138b88" uid="12013"/>
+        <specific value="13" description="LPD 18 New Orleans" deprecated="1" uuid="cee54e42-5269-11df-a615-080069138b88" uid="12014"/>
+      </subcategory>
+      <subcategory value="2" description="San Antonio Class" uuid="cee6ffa8-5269-11df-9538-080069138b88" uid="12015">
+        <specific value="1" description="LPD 17 San Antonio" uuid="cee80e3e-5269-11df-9849-080069138b88" uid="12016"/>
+        <specific value="2" description="LPD 18 New Orleans" uuid="cee9233c-5269-11df-9c29-080069138b88" uid="12017"/>
+        <specific value="3" description="LPD 19 Mesa Verde" uuid="ceea2caa-5269-11df-8378-080069138b88" uid="12018"/>
+      </subcategory>
+    </category>
+    <category value="57" description="Ammunition Ship" uuid="ceec83a6-5269-11df-9ee0-080069138b88" uid="12019">
+      <subcategory value="1" description="Kilauea Class" uuid="ceed8c7e-5269-11df-a137-080069138b88" uid="12020">
+        <specific value="1" description="T-AE 26 Kilauea" uuid="ceeed764-5269-11df-92af-080069138b88" uid="12021"/>
+        <specific value="2" description="AE 27 Butte" uuid="ceeff504-5269-11df-bf19-080069138b88" uid="12022"/>
+        <specific value="3" description="AE 28 Santa Barbara" uuid="cef1011a-5269-11df-bc92-080069138b88" uid="12023"/>
+        <specific value="4" description="AE 29 Mount Hood" uuid="cef21258-5269-11df-8584-080069138b88" uid="12024"/>
+        <specific value="5" description="AE 32 Flint" uuid="cef3226a-5269-11df-af8d-080069138b88" uid="12025"/>
+        <specific value="6" description="AE 33 Shasta" uuid="cef432c2-5269-11df-836c-080069138b88" uid="12026"/>
+        <specific value="7" description="AE 34 Mount Baker" uuid="cef54342-5269-11df-9f0c-080069138b88" uid="12027"/>
+        <specific value="8" description="AE 35 Kiska" uuid="cef65444-5269-11df-884f-080069138b88" uid="12028"/>
+      </subcategory>
+      <subcategory value="2" description="Suribachi Class" uuid="cef80640-5269-11df-b879-080069138b88" uid="12029">
+        <specific value="1" description="AE 21 Suribachi" uuid="cef91058-5269-11df-b527-080069138b88" uid="12030"/>
+        <specific value="2" description="AE 22 Mauna Kea" uuid="cefa20ba-5269-11df-bdf4-080069138b88" uid="12031"/>
+        <specific value="3" description="AE 23 Nitro" uuid="cefb341e-5269-11df-8c0f-080069138b88" uid="12032"/>
+        <specific value="4" description="AE 24 Pyro" uuid="cefc3e54-5269-11df-8d36-080069138b88" uid="12033"/>
+        <specific value="5" description="AE 25 Haleakala" uuid="cefd57e4-5269-11df-baef-080069138b88" uid="12034"/>
+      </subcategory>
+      <subcategory value="3" description="Nitro Class" deprecated="1" uuid="ceff0daa-5269-11df-8a9d-080069138b88" uid="12035">
+        <specific value="1" description="AE 23 Nitro" deprecated="1" uuid="cf001e2a-5269-11df-bfa0-080069138b88" uid="12036"/>
+        <specific value="2" description="AE 24 Pyro" deprecated="1" uuid="cf012aea-5269-11df-8e12-080069138b88" uid="12037"/>
+        <specific value="3" description="AE 25 Haleakala" deprecated="1" uuid="cf023f16-5269-11df-ac37-080069138b88" uid="12038"/>
+      </subcategory>
+    </category>
+    <category value="58" description="Combat Stores Ship" uuid="cf0490ae-5269-11df-8abb-080069138b88" uid="12039">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="cf05a476-5269-11df-9092-080069138b88" uid="12040"/>
+      <subcategory value="2" description="Mars Class" uuid="cf06b654-5269-11df-8da9-080069138b88" uid="12041">
+        <specific value="1" description="AFS 1 Mars" uuid="cf07c8fa-5269-11df-9d06-080069138b88" uid="12042"/>
+        <specific value="2" description="AFS 2 Sylvania" uuid="cf08d7ae-5269-11df-b741-080069138b88" uid="12043"/>
+        <specific value="3" description="AFS 3 Niagara Falls" uuid="cf09e81a-5269-11df-a5b8-080069138b88" uid="12044"/>
+        <specific value="4" description="AFS 4 White Plains" uuid="cf0af7f0-5269-11df-b2e1-080069138b88" uid="12045"/>
+        <specific value="5" description="AFS 5 Concord" uuid="cf0c0334-5269-11df-93fb-080069138b88" uid="12046"/>
+        <specific value="6" description="AFS 6 San Diego" uuid="cf0d1706-5269-11df-95e3-080069138b88" uid="12047"/>
+        <specific value="7" description="AFS 7 San Jose" uuid="cf0e281c-5269-11df-8abf-080069138b88" uid="12048"/>
+      </subcategory>
+    </category>
+    <category value="59" description="Surveillance Towed Array Sonar System (SURTASS)" uuid="cf1079dc-5269-11df-848b-080069138b88" uid="12049">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="cf118bba-5269-11df-9ea8-080069138b88" uid="12050"/>
+      <subcategory value="2" description="SWATH-S (Small) class" uuid="cf129884-5269-11df-b687-080069138b88" uid="12051">
+        <specific value="1" description="TAGOS 19 Victorious" uuid="cf13ad00-5269-11df-b26d-080069138b88" uid="12052"/>
+        <specific value="2" description="TAGOS 20 Able" uuid="cf14be8e-5269-11df-88cc-080069138b88" uid="12053"/>
+        <specific value="3" description="TAGOS 21 Effective" uuid="cf15c9fa-5269-11df-86dc-080069138b88" uid="12054"/>
+        <specific value="4" description="TAGOS 22 Loyal" uuid="cf16db06-5269-11df-8223-080069138b88" uid="12055"/>
+      </subcategory>
+      <subcategory value="3" description="SWATH-L (Large) class" uuid="cf188e38-5269-11df-a8e3-080069138b88" uid="12056">
+        <specific value="1" description="TAGOS 23 Impeccable" uuid="cf199c7e-5269-11df-ad4c-080069138b88" uid="12057"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="cf1b5a64-5269-11df-8d35-080069138b88" uid="12058"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="cf1c683c-5269-11df-adca-080069138b88" uid="12059"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="cf1d7b46-5269-11df-bf25-080069138b88" uid="12060"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="cf1e8f04-5269-11df-b60a-080069138b88" uid="12061"/>
+      <subcategory value="8" description="Stalwart Class (Ocean Surveillance)" uuid="cf1f9a3e-5269-11df-bd8b-080069138b88" uid="12062">
+        <specific value="1" description="TAGOS 1 Stalwart" uuid="cf20acee-5269-11df-b753-080069138b88" uid="12063"/>
+        <specific value="2" description="TAGOS 2 Contender" uuid="cf21c142-5269-11df-8084-080069138b88" uid="12064"/>
+        <specific value="3" description="TAGOS 3 Vindicator" uuid="cf22cc04-5269-11df-8be7-080069138b88" uid="12065"/>
+        <specific value="4" description="TAGOS 4 Triumph" uuid="cf23dd06-5269-11df-87c7-080069138b88" uid="12066"/>
+        <specific value="5" description="TAGOS 5 Assurance" uuid="cf24ef2a-5269-11df-b60f-080069138b88" uid="12067"/>
+        <specific value="6" description="TAGOS 6 Persistent" uuid="cf25fcee-5269-11df-86e4-080069138b88" uid="12068"/>
+        <specific value="7" description="TAGOS 7 Indomitable" uuid="cf270c6a-5269-11df-9abe-080069138b88" uid="12069"/>
+        <specific value="8" description="TAGOS 8 Prevail" uuid="cf281eb6-5269-11df-93ad-080069138b88" uid="12070"/>
+        <specific value="9" description="TAGOS 9 Assertive" uuid="cf292b08-5269-11df-a18f-080069138b88" uid="12071"/>
+        <specific value="10" description="TAGOS 10 Invincible" uuid="cf2a3ea8-5269-11df-84aa-080069138b88" uid="12072"/>
+        <specific value="11" description="TAGOS 11 Audacious" uuid="cf2b4e60-5269-11df-8dc9-080069138b88" uid="12073"/>
+        <specific value="12" description="TAGOS 12 Bold" uuid="cf2c58be-5269-11df-8e49-080069138b88" uid="12074"/>
+        <specific value="13" description="TAGOS 13 Adventurous" uuid="cf2d6bfa-5269-11df-9af6-080069138b88" uid="12075"/>
+        <specific value="14" description="TAGOS 14 Worthy" uuid="cf2e7cfc-5269-11df-97ea-080069138b88" uid="12076"/>
+        <specific value="15" description="TAGOS 15 Titan" uuid="cf2f8660-5269-11df-aa93-080069138b88" uid="12077"/>
+        <specific value="16" description="TAGOS 16 Capable" uuid="cf309712-5269-11df-ad4e-080069138b88" uid="12078"/>
+        <specific value="17" description="TAGOS 17 Intrepid" uuid="cf31abfc-5269-11df-a8bd-080069138b88" uid="12079"/>
+        <specific value="18" description="TAGOS 18 Relentless" uuid="cf32b812-5269-11df-aa66-080069138b88" uid="12080"/>
+      </subcategory>
+    </category>
+    <category value="60" description="Fast Combat Support Ship" uuid="cf350e6e-5269-11df-8e16-080069138b88" uid="12081">
+      <subcategory value="1" description="Sacramento Class" uuid="cf361d90-5269-11df-bb71-080069138b88" uid="12082">
+        <specific value="1" description="AOE 1 Sacramento" uuid="cf372dd4-5269-11df-b5bd-080069138b88" uid="12083"/>
+        <specific value="2" description="AOE 2 Camden" uuid="cf383f1c-5269-11df-a6a1-080069138b88" uid="12084"/>
+        <specific value="3" description="AOE 3 Seattle" uuid="cf394826-5269-11df-b3d4-080069138b88" uid="12085"/>
+        <specific value="4" description="AOE 4 Detroit" uuid="cf3a6346-5269-11df-86ba-080069138b88" uid="12086"/>
+      </subcategory>
+      <subcategory value="2" description="Supply Class" uuid="cf3c18f8-5269-11df-af06-080069138b88" uid="12087">
+        <specific value="1" description="AOE 6 Supply" uuid="cf3d37a6-5269-11df-952c-080069138b88" uid="12088"/>
+        <specific value="2" description="AOE 7 Rainier" uuid="cf3e5366-5269-11df-b201-080069138b88" uid="12089"/>
+        <specific value="3" description="AOE 8 Arctic" uuid="cf3f647c-5269-11df-a0ef-080069138b88" uid="12090"/>
+        <specific value="4" description="AOE 10 Bridge" uuid="cf40795c-5269-11df-81b1-080069138b88" uid="12091"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="cf42cafe-5269-11df-8e5a-080069138b88" uid="12092">
+      <subcategory value="1" description="Container Class" uuid="cf43de44-5269-11df-8f19-080069138b88" uid="12093">
+        <specific value="1" description="American Kentucky" uuid="cf44e834-5269-11df-8588-080069138b88" uid="12094"/>
+        <specific value="2" description="Ocean City" uuid="cf45f8a0-5269-11df-b2c2-080069138b88" uid="12095"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker" uuid="cf47acd6-5269-11df-89d9-080069138b88" uid="12096">
+        <specific value="1" description="Texaco Georgia" uuid="cf48bb9e-5269-11df-aede-080069138b88" uid="12097"/>
+      </subcategory>
+      <subcategory value="3" description="Large Fishing Trawler" uuid="cf4a9176-5269-11df-9b93-080069138b88" uid="12098"/>
+      <subcategory value="4" description="Medium Fishing Boat" uuid="cf4ba200-5269-11df-81fb-080069138b88" uid="12099"/>
+      <subcategory value="5" description="Small Fishing Boat" uuid="cf4cb9f6-5269-11df-8491-080069138b88" uid="12100"/>
+      <subcategory value="6" description="Two Masted Fishing Boat" uuid="cf4dcbca-5269-11df-9573-080069138b88" uid="12101"/>
+      <subcategory value="7" description="Single Masted Fishing Boat" uuid="cf4ed7ea-5269-11df-9e6d-080069138b88" uid="12102"/>
+      <subcategory value="8" description="Cigarette Boat" uuid="cf4fe8ba-5269-11df-b9fd-080069138b88" uid="12103"/>
+    </category>
+    <category value="62" description="Coast Guard Cutters" uuid="cf519e44-5269-11df-a0c1-080069138b88" uid="12104">
+      <subcategory value="1" description="378-foot High Endurance (WHEC)" uuid="cf52af64-5269-11df-8cc6-080069138b88" uid="12105">
+        <specific value="1" description="Boutwell (WHEC 719)" uuid="cf53bd82-5269-11df-a75d-080069138b88" uid="12106"/>
+        <specific value="2" description="Chase (WHEC 718)" uuid="cf54ce20-5269-11df-920d-080069138b88" uid="12107"/>
+        <specific value="3" description="Dallas (WHEC 716)" uuid="cf55e3c8-5269-11df-8c41-080069138b88" uid="12108"/>
+        <specific value="4" description="Gallatin (WHEC 721)" uuid="cf56ef16-5269-11df-adf4-080069138b88" uid="12109"/>
+        <specific value="5" description="Hamilton (WHEC 715)" uuid="cf580086-5269-11df-9d49-080069138b88" uid="12110"/>
+        <specific value="6" description="Jarvis (WHEC 725)" uuid="cf591ae8-5269-11df-a94b-080069138b88" uid="12111"/>
+        <specific value="7" description="Mellon (WHEC 717)" uuid="cf5a6074-5269-11df-8930-080069138b88" uid="12112"/>
+        <specific value="8" description="Midgett (WHEC 726)" uuid="cf5b8b70-5269-11df-90d2-080069138b88" uid="12113"/>
+        <specific value="9" description="Morgenthau (WHEC 722)" uuid="cf5d0cfc-5269-11df-8df9-080069138b88" uid="12114"/>
+        <specific value="10" description="Munro (WHEC 724)" uuid="cf5e2902-5269-11df-ac8f-080069138b88" uid="12115"/>
+        <specific value="11" description="Rush (WHEC 723)" uuid="cf5f7366-5269-11df-8b21-080069138b88" uid="12116"/>
+        <specific value="12" description="Sherman (WHEC 720)" uuid="cf60886e-5269-11df-ac96-080069138b88" uid="12117"/>
+      </subcategory>
+      <subcategory value="2" description="282-foot Medium Endurance (WMEC)" uuid="cf62406e-5269-11df-82b9-080069138b88" uid="12118">
+        <specific value="1" description="Alex Haley" uuid="cf63513e-5269-11df-926e-080069138b88" uid="12119"/>
+      </subcategory>
+      <subcategory value="3" description="Famous Class (WMEC)" uuid="cf65084e-5269-11df-b569-080069138b88" uid="12120">
+        <specific value="1" description="Bear (WMEC 901)" uuid="cf661f18-5269-11df-8a34-080069138b88" uid="12121"/>
+        <specific value="2" description="Campbell (WMEC 909)" uuid="cf6728e0-5269-11df-a3f3-080069138b88" uid="12122"/>
+        <specific value="3" description="Escanaba (WMEC 907)" uuid="cf683938-5269-11df-be87-080069138b88" uid="12123"/>
+        <specific value="4" description="Forward (WMEC 911)" uuid="cf698c02-5269-11df-8031-080069138b88" uid="12124"/>
+        <specific value="5" description="Harriet Lane (WMEC 903)" uuid="cf6aaa4c-5269-11df-a539-080069138b88" uid="12125"/>
+        <specific value="6" description="Legare (WMEC 912)" uuid="cf6bbcc0-5269-11df-a6b6-080069138b88" uid="12126"/>
+        <specific value="7" description="Mohawk (WMEC 913)" uuid="cf6d3956-5269-11df-a762-080069138b88" uid="12127"/>
+        <specific value="8" description="Northland (WMEC 904)" uuid="cf6e5b38-5269-11df-b449-080069138b88" uid="12128"/>
+        <specific value="9" description="Seneca (WMEC 906)" uuid="cf6fa722-5269-11df-9cfd-080069138b88" uid="12129"/>
+        <specific value="10" description="Spencer (WMEC 905)" uuid="cf70b7b6-5269-11df-a4e5-080069138b88" uid="12130"/>
+        <specific value="11" description="Tahoma (WMEC 908)" uuid="cf71cd7c-5269-11df-adb3-080069138b88" uid="12131"/>
+        <specific value="12" description="Tampa (WMEC 902)" uuid="cf72fdc8-5269-11df-8518-080069138b88" uid="12132"/>
+        <specific value="13" description="Thetis (WMEC 910)" uuid="cf741334-5269-11df-9d7d-080069138b88" uid="12133"/>
+      </subcategory>
+      <subcategory value="4" description="Reliance Class (WMEC)" uuid="cf75c9b8-5269-11df-a744-080069138b88" uid="12134">
+        <specific value="1" description="Active (WMEC 618)" uuid="cf76d97a-5269-11df-a1d1-080069138b88" uid="12135"/>
+        <specific value="2" description="Alert (WMEC 630)" uuid="cf780e9e-5269-11df-9ca9-080069138b88" uid="12136"/>
+        <specific value="3" description="Confidence (WMEC 619)" uuid="cf7925cc-5269-11df-94f4-080069138b88" uid="12137"/>
+        <specific value="4" description="Dauntless (WMEC 624)" uuid="cf7a6d42-5269-11df-bc55-080069138b88" uid="12138"/>
+        <specific value="5" description="Decisive (WMEC 629)" uuid="cf7b9032-5269-11df-b821-080069138b88" uid="12139"/>
+        <specific value="6" description="Dependable (WMEC 626)" uuid="cf7d0e6c-5269-11df-ae82-080069138b88" uid="12140"/>
+        <specific value="7" description="Diligence (WMEC 616)" uuid="cf7e2a36-5269-11df-a89f-080069138b88" uid="12141"/>
+        <specific value="8" description="Reliance (WMEC 615)" uuid="cf7f6aa4-5269-11df-b7fd-080069138b88" uid="12142"/>
+        <specific value="9" description="Resolute (WMEC 620)" uuid="cf8083a8-5269-11df-bcac-080069138b88" uid="12143"/>
+        <specific value="10" description="Steadfast (WMEC 623)" uuid="cf81b714-5269-11df-b56e-080069138b88" uid="12144"/>
+        <specific value="11" description="Valiant (WMEC 621)" uuid="cf82c92e-5269-11df-8639-080069138b88" uid="12145"/>
+        <specific value="12" description="Venturous (WMEC 625)" uuid="cf83e08e-5269-11df-98d3-080069138b88" uid="12146"/>
+        <specific value="13" description="Vigilant (WMEC 617)" uuid="cf84ebd2-5269-11df-afaf-080069138b88" uid="12147"/>
+        <specific value="14" description="Vigorous (WMEC 627)" uuid="cf85fe64-5269-11df-a329-080069138b88" uid="12148"/>
+      </subcategory>
+      <subcategory value="5" description="Island Class (WPB)" uuid="cf87b416-5269-11df-ae12-080069138b88" uid="12149">
+        <specific value="1" description="Adak (WPB 1333)" uuid="cf88c3c4-5269-11df-9f5f-080069138b88" uid="12150"/>
+        <specific value="2" description="Anacapa (WPB 1335)" uuid="cf89cd14-5269-11df-8a57-080069138b88" uid="12151"/>
+        <specific value="3" description="Aquidneck (WPB 1309)" uuid="cf8adf2e-5269-11df-8523-080069138b88" uid="12152"/>
+        <specific value="4" description="Assateague (WPB 1337)" uuid="cf8bf4cc-5269-11df-9120-080069138b88" uid="12153"/>
+        <specific value="5" description="Attu (WPB 1317)" uuid="cf8cff02-5269-11df-8832-080069138b88" uid="12154"/>
+        <specific value="6" description="Bainbridge Island (WPB 1343)" uuid="cf8e0fbe-5269-11df-98b4-080069138b88" uid="12155"/>
+        <specific value="7" description="Baranof (WPB 1318)" uuid="cf8f219c-5269-11df-aa61-080069138b88" uid="12156"/>
+        <specific value="8" description="Block Island (WPB 1344)" uuid="cf903014-5269-11df-8666-080069138b88" uid="12157"/>
+        <specific value="9" description="Chandeleur (WPB 1319)" uuid="cf917fa0-5269-11df-8de6-080069138b88" uid="12158"/>
+        <specific value="10" description="Chincoteague (WPB 1320)" uuid="cf92a182-5269-11df-8638-080069138b88" uid="12159"/>
+        <specific value="11" description="Cushing (WPB 1321)" uuid="cf94199a-5269-11df-b2b3-080069138b88" uid="12160"/>
+        <specific value="12" description="Cuttyhunk(WPB 1322)" uuid="cf955666-5269-11df-bc53-080069138b88" uid="12161"/>
+        <specific value="13" description="Drummond (WPB 1323)" uuid="cf969c6a-5269-11df-b453-080069138b88" uid="12162"/>
+        <specific value="14" description="Edisto (WPB 1313)" uuid="cf97b56e-5269-11df-9ed7-080069138b88" uid="12163"/>
+        <specific value="15" description="Faralon (WPB 1301)" uuid="cf98c79c-5269-11df-b74a-080069138b88" uid="12164"/>
+        <specific value="16" description="Galveston Island (WPB 1343)" uuid="cf99dc22-5269-11df-bb39-080069138b88" uid="12165"/>
+        <specific value="17" description="Grand Isle (WPB 1338)" uuid="cf9ae824-5269-11df-95a8-080069138b88" uid="12166"/>
+        <specific value="18" description="Jefferson Island (WPB 1340)" uuid="cf9bfea8-5269-11df-89cd-080069138b88" uid="12167"/>
+        <specific value="19" description="Key Biscayne (WPB 1339)" uuid="cf9d140a-5269-11df-bcc2-080069138b88" uid="12168"/>
+        <specific value="20" description="Key Largo (WPB 1324)" uuid="cf9e1eea-5269-11df-bbc7-080069138b88" uid="12169"/>
+        <specific value="21" description="Kiska (WPB 1336)" uuid="cf9f2f6a-5269-11df-a5e9-080069138b88" uid="12170"/>
+        <specific value="22" description="Knight Island (WPB 1348)" uuid="cfa08356-5269-11df-a612-080069138b88" uid="12171"/>
+        <specific value="23" description="Kodiak Island (WPB 1341)" uuid="cfa1a326-5269-11df-8627-080069138b88" uid="12172"/>
+        <specific value="24" description="Liberty (WPB 1334)" uuid="cfa2b662-5269-11df-930b-080069138b88" uid="12173"/>
+        <specific value="25" description="Long Island (WPB 1342)" uuid="cfa474c0-5269-11df-9ac5-080069138b88" uid="12174"/>
+        <specific value="26" description="Manitou (WPB 1302)" uuid="cfa8ce30-5269-11df-b93f-080069138b88" uid="12175"/>
+        <specific value="27" description="Matagorda (WPB 1303)" uuid="cfaa481e-5269-11df-a2bb-080069138b88" uid="12176"/>
+        <specific value="28" description="Matinicus (WPB 1315)" uuid="cfabb866-5269-11df-bad5-080069138b88" uid="12177"/>
+        <specific value="29" description="Maui (WPB 1304)" uuid="cfacfa50-5269-11df-9197-080069138b88" uid="12178"/>
+        <specific value="30" description="Metompkin (WPB 1325)" uuid="cfaf6bdc-5269-11df-b901-080069138b88" uid="12179"/>
+        <specific value="31" description="Monhegan (WPB 1305)" uuid="cfb0ba64-5269-11df-8bb2-080069138b88" uid="12180"/>
+        <specific value="32" description="Monomoy (WPB 1326)" uuid="cfb206a8-5269-11df-8104-080069138b88" uid="12181"/>
+        <specific value="33" description="Mustang (WPB 1310)" uuid="cfb32204-5269-11df-839f-080069138b88" uid="12182"/>
+        <specific value="34" description="Nantucket (WPB 1316)" uuid="cfb43432-5269-11df-badb-080069138b88" uid="12183"/>
+        <specific value="35" description="Naushon (WPB 1311)" uuid="cfb54d86-5269-11df-9ba8-080069138b88" uid="12184"/>
+        <specific value="36" description="Nunivak (WPB 1306)" uuid="cfb65dd4-5269-11df-b142-080069138b88" uid="12185"/>
+        <specific value="37" description="Ocracoke (WPB 1307)" uuid="cfb76ff8-5269-11df-af64-080069138b88" uid="12186"/>
+        <specific value="38" description="Orcas (WPB 1327)" uuid="cfb881a4-5269-11df-96be-080069138b88" uid="12187"/>
+        <specific value="39" description="Padre (WPB 1328)" uuid="cfb98ae0-5269-11df-9351-080069138b88" uid="12188"/>
+        <specific value="40" description="Pea Island (WPB 1347)" uuid="cfba9ea8-5269-11df-a131-080069138b88" uid="12189"/>
+        <specific value="41" description="Roanoke Island (WPB 1346)" uuid="cfbbb086-5269-11df-a86a-080069138b88" uid="12190"/>
+        <specific value="42" description="Sanibel (WPB 1312)" uuid="cfbcbcba-5269-11df-9358-080069138b88" uid="12191"/>
+        <specific value="43" description="Sapelo (WPB 1314)" uuid="cfbdcf88-5269-11df-95c3-080069138b88" uid="12192"/>
+        <specific value="44" description="Sitkinak (WPB 1329)" uuid="cfbee0ee-5269-11df-b717-080069138b88" uid="12193"/>
+        <specific value="45" description="Staten Island (WPB 1345)" uuid="cfbff1f0-5269-11df-af68-080069138b88" uid="12194"/>
+        <specific value="46" description="Tybee (WPB 1330)" uuid="cfc1057c-5269-11df-8a8a-080069138b88" uid="12195"/>
+        <specific value="47" description="Vashon (WPB 1308)" uuid="cfc21570-5269-11df-a419-080069138b88" uid="12196"/>
+        <specific value="48" description="Washington (WPB 1331)" uuid="cfc32172-5269-11df-97a2-080069138b88" uid="12197"/>
+        <specific value="49" description="Wrangell (WPB 1332)" uuid="cfc4326a-5269-11df-939a-080069138b88" uid="12198"/>
+      </subcategory>
+      <subcategory value="6" description="Marine Protector Class (WPB)" uuid="cfc5e7e0-5269-11df-ba94-080069138b88" uid="12199">
+        <specific value="1" description="Adelie (WPB 87333)" uuid="cfc6f784-5269-11df-aa70-080069138b88" uid="12200"/>
+        <specific value="2" description="Albacore (WPB 87309)" uuid="cfc803f4-5269-11df-80da-080069138b88" uid="12201"/>
+        <specific value="3" description="Amberjack (WPB 87315)" uuid="cfc918d4-5269-11df-ad05-080069138b88" uid="12202"/>
+        <specific value="4" description="Barracuda (WPB 87301)" uuid="cfca29d6-5269-11df-aa9f-080069138b88" uid="12203"/>
+        <specific value="5" description="Beluga (WPB 87325)" uuid="cfcb359c-5269-11df-a672-080069138b88" uid="12204"/>
+        <specific value="6" description="Blackfin (WPB 87317)" uuid="cfcc49d2-5269-11df-851a-080069138b88" uid="12205"/>
+        <specific value="7" description="Blacktip (WPB 87326)" uuid="cfcd596c-5269-11df-94c6-080069138b88" uid="12206"/>
+        <specific value="8" description="Bluefin (WPB 87318)" uuid="cfce660e-5269-11df-8a7d-080069138b88" uid="12207"/>
+        <specific value="9" description="Bonito (WPB 87341)" uuid="cfcf7512-5269-11df-be82-080069138b88" uid="12208"/>
+        <specific value="10" description="Brant (WPB 87348)" uuid="cfd08844-5269-11df-9282-080069138b88" uid="12209"/>
+        <specific value="11" description="Chinook (WPB 87308)" uuid="cfd192ac-5269-11df-b3e7-080069138b88" uid="12210"/>
+        <specific value="12" description="Cobia (WPB 87311)" uuid="cfd2a372-5269-11df-9b9d-080069138b88" uid="12211"/>
+        <specific value="13" description="Cochito (WPB 87329)" uuid="cfd3bbf4-5269-11df-b9c6-080069138b88" uid="12212"/>
+        <specific value="14" description="Coho (WPB 87321)" uuid="cfd4d052-5269-11df-b047-080069138b88" uid="12213"/>
+        <specific value="15" description="Cormorant (WPB 87313)" uuid="cfd5f158-5269-11df-88d6-080069138b88" uid="12214"/>
+        <specific value="16" description="Dorado (WPB 87306)" uuid="cfd70688-5269-11df-9c9d-080069138b88" uid="12215"/>
+        <specific value="17" description="Finback (WPB 87314)" uuid="cfd8105a-5269-11df-98ee-080069138b88" uid="12216"/>
+        <specific value="18" description="Flyingfish (WPB 87346)" uuid="cfd921e8-5269-11df-8465-080069138b88" uid="12217"/>
+        <specific value="19" description="Gannet (WPB 87334)" uuid="cfda32ae-5269-11df-88ab-080069138b88" uid="12218"/>
+        <specific value="20" description="Haddock (WPB 87347)" uuid="cfdb4180-5269-11df-8d7d-080069138b88" uid="12219"/>
+        <specific value="21" description="Halibut (WPB 8734008)" uuid="cfdc50e8-5269-11df-bfca-080069138b88" uid="12220"/>
+        <specific value="22" description="Hammerhead (WPB 87302)" uuid="cfdd62a8-5269-11df-86d1-080069138b88" uid="12221"/>
+        <specific value="23" description="Hawksbill (WPB 87312)" uuid="cfde7206-5269-11df-8ed6-080069138b88" uid="12222"/>
+        <specific value="24" description="Heron (WPB 87344)" uuid="cfdf82ae-5269-11df-9b5e-080069138b88" uid="12223"/>
+        <specific value="25" description="Ibis (WPB 87338)" uuid="cfe092ac-5269-11df-a973-080069138b88" uid="12224"/>
+        <specific value="26" description="Kingfisher (WPB 87322)" uuid="cfe19e04-5269-11df-97ad-080069138b88" uid="12225"/>
+        <specific value="27" description="Kittiwake (WPB 87316)" uuid="cfe2b2d0-5269-11df-bb45-080069138b88" uid="12226"/>
+        <specific value="28" description="Mako (WPB 87303)" uuid="cfe3c36e-5269-11df-8b49-080069138b88" uid="12227"/>
+        <specific value="29" description="Manowar (WPB 87330)" uuid="cfe4cde0-5269-11df-8844-080069138b88" uid="12228"/>
+        <specific value="30" description="Manta (WPB 87320)" uuid="cfe5e1e4-5269-11df-ba8a-080069138b88" uid="12229"/>
+        <specific value="31" description="Marlin (WPB 87304)" uuid="cfe6f278-5269-11df-b4bf-080069138b88" uid="12230"/>
+        <specific value="32" description="Moray (WPB 87331)" uuid="cfe7fe20-5269-11df-bda5-080069138b88" uid="12231"/>
+        <specific value="33" description="Narwhal (WPB 87335)" uuid="cfe90cfc-5269-11df-95bc-080069138b88" uid="12232"/>
+        <specific value="34" description="Osprey (WPB 87307)" uuid="cfea2272-5269-11df-9a54-080069138b88" uid="12233"/>
+        <specific value="35" description="Pelican (WPB 87327)" uuid="cfeb2d0c-5269-11df-a19b-080069138b88" uid="12234"/>
+        <specific value="36" description="Petrel (WPB 87350)" uuid="cfec435e-5269-11df-91f6-080069138b88" uid="12235"/>
+        <specific value="37" description="Pompano (WPB 87339)" uuid="cfed553c-5269-11df-9785-080069138b88" uid="12236"/>
+        <specific value="38" description="Razorbill (WPB 87332)" uuid="cfee65da-5269-11df-8dce-080069138b88" uid="12237"/>
+        <specific value="39" description="Ridley (WPB 87328)" uuid="cfef766e-5269-11df-b69e-080069138b88" uid="12238"/>
+        <specific value="40" description="Seahawk (WPB 87323)" uuid="cff087a2-5269-11df-be6a-080069138b88" uid="12239"/>
+        <specific value="41" description="Shearwater (WPB 87349)" uuid="cff1917e-5269-11df-980b-080069138b88" uid="12240"/>
+        <specific value="42" description="Shrike (WPB 87342)" uuid="cff2abc2-5269-11df-84c8-080069138b88" uid="12241"/>
+        <specific value="43" description="Sockeye (WPB 87337)" uuid="cff3c246-5269-11df-9493-080069138b88" uid="12242"/>
+        <specific value="44" description="Steelhead (WPB 87324)" uuid="cff4ce2a-5269-11df-9b1e-080069138b88" uid="12243"/>
+        <specific value="45" description="Stingray (WPB 87305)" uuid="cff5de64-5269-11df-baae-080069138b88" uid="12244"/>
+        <specific value="46" description="Sturgeon (WPB 87336)" uuid="cff6f114-5269-11df-898e-080069138b88" uid="12245"/>
+        <specific value="47" description="Tarpon (WPB 87310)" uuid="cff80004-5269-11df-b138-080069138b88" uid="12246"/>
+        <specific value="48" description="Tern (WPB 87343)" uuid="cff91034-5269-11df-94f3-080069138b88" uid="12247"/>
+        <specific value="49" description="Wahoo (WPB 87345)" uuid="cffa2032-5269-11df-8447-080069138b88" uid="12248"/>
+        <specific value="50" description="Yellowfin (WPB 87319)" uuid="cffb4f98-5269-11df-b77d-080069138b88" uid="12249"/>
+      </subcategory>
+      <subcategory value="7" description="Point Class (WPB)" uuid="cffd142c-5269-11df-ad46-080069138b88" uid="12250">
+        <specific value="1" description="Point Brower (WPB 87372)" uuid="cffe2150-5269-11df-ac2d-080069138b88" uid="12251"/>
+      </subcategory>
+    </category>
+    <category value="63" description="Coast Guard Boats" uuid="d000793c-5269-11df-be41-080069138b88" uid="12252">
+      <subcategory value="1" description="52-foot Motor Life Boats (MLB)" uuid="d0018372-5269-11df-b31b-080069138b88" uid="12253"/>
+      <subcategory value="2" description="47-foot Motor Life Boats (MLB)" uuid="d00298fc-5269-11df-81e8-080069138b88" uid="12254"/>
+      <subcategory value="3" description="44-foot Motor Life Boats (MLB)" uuid="d003aaee-5269-11df-a3cd-080069138b88" uid="12255"/>
+      <subcategory value="4" description="41-foot Utility Boats (UTB)" uuid="d004b7ea-5269-11df-89cd-080069138b88" uid="12256"/>
+      <subcategory value="5" description="38-foot Deployable Pursuit Boat (DPB)" uuid="d005cca2-5269-11df-ac2d-080069138b88" uid="12257"/>
+      <subcategory value="6" description="21-64-foot Aids to Navigation Boats" uuid="d006df8e-5269-11df-9402-080069138b88" uid="12258"/>
+      <subcategory value="7" description="25-foot Transportable Port Security Boats (TPSB)" uuid="d007ed8e-5269-11df-a7ac-080069138b88" uid="12259"/>
+      <subcategory value="8" description="Rigid Hull Inflatable Boats (RHI)" uuid="d00901b0-5269-11df-a4ea-080069138b88" uid="12260"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="225" uuid="d00b542e-5269-11df-a7c3-080069138b88" uid="12261">
+    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="d00c6346-5269-11df-8f03-080069138b88" uid="12262">
+      <subcategory value="1" description="James Madison class" deprecated="1" uuid="d00d7934-5269-11df-b59b-080069138b88" uid="12263">
+        <specific value="1" description="SSBN 629 Daniel Boone" deprecated="1" uuid="d00e8694-5269-11df-aee9-080069138b88" uid="12264"/>
+        <specific value="2" description="SSBN 630 John C. Calhoun" deprecated="1" uuid="d00f9750-5269-11df-8394-080069138b88" uid="12265"/>
+        <specific value="3" description="SSBN 632 Von Steuben" deprecated="1" uuid="d010acc6-5269-11df-8536-080069138b88" uid="12266"/>
+        <specific value="4" description="SSBN 633 Casimir Pulaski" deprecated="1" uuid="d011c980-5269-11df-8344-080069138b88" uid="12267"/>
+        <specific value="5" description="SSBN 634 Stonewall Jackson" deprecated="1" uuid="d012d816-5269-11df-80b2-080069138b88" uid="12268"/>
+      </subcategory>
+      <subcategory value="2" description="Benjamin Franklin class" deprecated="1" uuid="d0148dc8-5269-11df-91aa-080069138b88" uid="12269">
+        <specific value="1" description="SSBN 640 Benjamin Franklin" deprecated="1" uuid="d015a046-5269-11df-918a-080069138b88" uid="12270"/>
+        <specific value="2" description="SSBN 641 Simon Bolivar" deprecated="1" uuid="d016b3d2-5269-11df-922c-080069138b88" uid="12271"/>
+        <specific value="3" description="SSBN 642 Kamehameha" deprecated="1" uuid="d017c3ee-5269-11df-88f4-080069138b88" uid="12272"/>
+        <specific value="4" description="SSBN 643 George Bancroft" deprecated="1" uuid="d018d54a-5269-11df-97ac-080069138b88" uid="12273"/>
+        <specific value="5" description="SSBN 645 James K. Polk" deprecated="1" uuid="d019e69c-5269-11df-b8ef-080069138b88" uid="12274"/>
+        <specific value="6" description="SSBN 655 Henry L. Stimson" deprecated="1" uuid="d01af3e8-5269-11df-8abc-080069138b88" uid="12275"/>
+        <specific value="7" description="SSBN 657 Francis Scott Key" deprecated="1" uuid="d01c09c2-5269-11df-ad70-080069138b88" uid="12276"/>
+        <specific value="8" description="SSBN 658 Mariano G. Vallejo" deprecated="1" uuid="d01d1d8a-5269-11df-9efa-080069138b88" uid="12277"/>
+      </subcategory>
+      <subcategory value="3" description="Ohio class" uuid="d01ecefa-5269-11df-80f1-080069138b88" uid="12278">
+        <specific value="1" description="SSBN 726 Ohio" deprecated="1" uuid="d01fdc1e-5269-11df-98e8-080069138b88" uid="12279"/>
+        <specific value="2" description="SSBN 727 Michigan" deprecated="1" uuid="d020ed48-5269-11df-afb6-080069138b88" uid="12280"/>
+        <specific value="3" description="SSBN 728 Florida" deprecated="1" uuid="d021fe68-5269-11df-b1e5-080069138b88" uid="12281"/>
+        <specific value="4" description="SSBN 729 Georgia" deprecated="1" uuid="d0230d1c-5269-11df-927d-080069138b88" uid="12282"/>
+        <specific value="5" description="SSBN 730 Henry M. Jackson" uuid="d0241e6e-5269-11df-8aa5-080069138b88" uid="12283"/>
+        <specific value="6" description="SSBN 731 Alabama" uuid="d0252f2a-5269-11df-b3c8-080069138b88" uid="12284"/>
+        <specific value="7" description="SSBN 732 Alaska" uuid="d0263a82-5269-11df-810b-080069138b88" uid="12285"/>
+        <specific value="8" description="SSBN 733 Nevada" uuid="d02749e0-5269-11df-8056-080069138b88" uid="12286"/>
+        <specific value="9" description="SSBN 734 Tennessee" uuid="d0285e02-5269-11df-bde2-080069138b88" uid="12287"/>
+        <specific value="10" description="SSBN 735 Pennsylvania" uuid="d0296888-5269-11df-bdc5-080069138b88" uid="12288"/>
+        <specific value="11" description="SSBN 736 West Virginia" uuid="d02a77be-5269-11df-b483-080069138b88" uid="12289"/>
+        <specific value="12" description="SSBN 737 Kentucky" uuid="d02b89ec-5269-11df-9072-080069138b88" uid="12290"/>
+        <specific value="13" description="SSBN 738 Maryland" uuid="d02c98dc-5269-11df-9e47-080069138b88" uid="12291"/>
+        <specific value="14" description="SSBN 739 Nebraska" uuid="d02da9d4-5269-11df-99e6-080069138b88" uid="12292"/>
+        <specific value="15" description="SSBN 740 Rhode Island" uuid="d02eb9c8-5269-11df-a284-080069138b88" uid="12293"/>
+        <specific value="16" description="SSBN 741 Maine" uuid="d02fc6c4-5269-11df-8fac-080069138b88" uid="12294"/>
+        <specific value="17" description="SSBN 742 Wyoming" uuid="d030e39c-5269-11df-b8be-080069138b88" uid="12295"/>
+      </subcategory>
+    </category>
+    <category value="2" description="SSGN (Nuclear Guided Missile)" uuid="d03333e0-5269-11df-a808-080069138b88" uid="12296">
+      <subcategory value="1" description="Ohio 726" uuid="d03447e4-5269-11df-937d-080069138b88" uid="12297"/>
+      <subcategory value="2" description="Michigan 727" uuid="d0355670-5269-11df-9015-080069138b88" uid="12298"/>
+      <subcategory value="3" description="Florida 728" uuid="d0366650-5269-11df-bd63-080069138b88" uid="12299"/>
+      <subcategory value="4" description="Georgia 729" uuid="d037748c-5269-11df-a703-080069138b88" uid="12300"/>
+    </category>
+    <category value="3" description="SSN (Nuclear Attack-Torpedo)" uuid="d0392368-5269-11df-aa4a-080069138b88" uid="12301">
+      <subcategory value="1" description="Seawolf class" uuid="d03a3668-5269-11df-882c-080069138b88" uid="12302">
+        <specific value="1" description="SSN 21 Seawolf" uuid="d03b49a4-5269-11df-a099-080069138b88" uid="12303"/>
+        <specific value="2" description="SSN 22 Connecticut" uuid="d03c563c-5269-11df-93b2-080069138b88" uid="12304"/>
+        <specific value="3" description="SSN 23 Jimmy Carter" uuid="d03d6644-5269-11df-a0b4-080069138b88" uid="12305"/>
+      </subcategory>
+      <subcategory value="2" description="Sturgeon class" uuid="d03f15f2-5269-11df-b5a3-080069138b88" uid="12306">
+        <specific value="1" description="SSN 637 Sturgeon" deprecated="1" uuid="d0402a3c-5269-11df-8d5a-080069138b88" uid="12307"/>
+        <specific value="2" description="SSN 638 Whale" deprecated="1" uuid="d04135a8-5269-11df-a25f-080069138b88" uid="12308"/>
+        <specific value="3" description="SSN 639 Tautog" deprecated="1" uuid="d042460a-5269-11df-ba7a-080069138b88" uid="12309"/>
+        <specific value="4" description="SSN 646 Grayling" deprecated="1" uuid="d04359a0-5269-11df-ab70-080069138b88" uid="12310"/>
+        <specific value="5" description="SSN 647 Pogy" deprecated="1" uuid="d0446962-5269-11df-b3e7-080069138b88" uid="12311"/>
+        <specific value="6" description="SSN 648 Aspro" deprecated="1" uuid="d0457ac8-5269-11df-9ec5-080069138b88" uid="12312"/>
+        <specific value="7" description="SSN 649 Sunfish" deprecated="1" uuid="d0468c4c-5269-11df-82b3-080069138b88" uid="12313"/>
+        <specific value="8" description="SSN 650 Pargo" deprecated="1" uuid="d04798da-5269-11df-befb-080069138b88" uid="12314"/>
+        <specific value="9" description="SSN 652 Puffer" deprecated="1" uuid="d048ab80-5269-11df-9716-080069138b88" uid="12315"/>
+        <specific value="10" description="SSN 653 Ray" deprecated="1" uuid="d049c0ba-5269-11df-bdd0-080069138b88" uid="12316"/>
+        <specific value="11" description="SSN 660 Sand Lance" deprecated="1" uuid="d04acbf4-5269-11df-9028-080069138b88" uid="12317"/>
+        <specific value="12" description="SSN 662 Gurnard" deprecated="1" uuid="d04bdf3a-5269-11df-9660-080069138b88" uid="12318"/>
+        <specific value="13" description="SSN 663 Hammerhead" deprecated="1" uuid="d04cf30c-5269-11df-b285-080069138b88" uid="12319"/>
+        <specific value="14" description="SSN 666 Hawkbill" deprecated="1" uuid="d04e001c-5269-11df-b1ae-080069138b88" uid="12320"/>
+        <specific value="15" description="SSN 667 Bergall" deprecated="1" uuid="d04f1ccc-5269-11df-8261-080069138b88" uid="12321"/>
+        <specific value="16" description="SSN 668 Spadefish" deprecated="1" uuid="d0502e46-5269-11df-af9f-080069138b88" uid="12322"/>
+        <specific value="17" description="SSN 669 Seahorse" deprecated="1" uuid="d0513e9e-5269-11df-8eca-080069138b88" uid="12323"/>
+        <specific value="18" description="SSN 670 Finback" deprecated="1" uuid="d05251a8-5269-11df-8599-080069138b88" uid="12324"/>
+        <specific value="19" description="SSN 672 Pintado" deprecated="1" uuid="d053641c-5269-11df-a689-080069138b88" uid="12325"/>
+        <specific value="20" description="SSN 673 Flying Fish" deprecated="1" uuid="d0547276-5269-11df-83f1-080069138b88" uid="12326"/>
+        <specific value="21" description="SSN 674 Trepang" deprecated="1" uuid="d0558684-5269-11df-b7d3-080069138b88" uid="12327"/>
+        <specific value="22" description="SSN 675 Bluefish" deprecated="1" uuid="d056e6c8-5269-11df-b61e-080069138b88" uid="12328"/>
+        <specific value="23" description="SSN 676 Billfish" deprecated="1" uuid="d057f8f6-5269-11df-a457-080069138b88" uid="12329"/>
+        <specific value="24" description="SSN 677 Drum" deprecated="1" uuid="d0590c14-5269-11df-8b97-080069138b88" uid="12330"/>
+        <specific value="25" description="SSN 678 Archerfish" deprecated="1" uuid="d05a1f0a-5269-11df-857e-080069138b88" uid="12331"/>
+        <specific value="26" description="SSN 679 Silversides" deprecated="1" uuid="d05b2b70-5269-11df-93b9-080069138b88" uid="12332"/>
+        <specific value="27" description="SSN 680 William H. Bates" deprecated="1" uuid="d05c3efc-5269-11df-a7ba-080069138b88" uid="12333"/>
+        <specific value="28" description="SSN 681 Batfish" deprecated="1" uuid="d05d560c-5269-11df-8e00-080069138b88" uid="12334"/>
+        <specific value="29" description="SSN 682 Tunny" deprecated="1" uuid="d05e6236-5269-11df-9b95-080069138b88" uid="12335"/>
+        <specific value="30" description="SSN 683 Parche" uuid="d05f7432-5269-11df-86fb-080069138b88" uid="12336"/>
+        <specific value="31" description="SSN 684 Cavalla" uuid="d067ab34-5269-11df-8b45-080069138b88" uid="12337"/>
+        <specific value="32" description="SSN 686 L. Mendel Rivers" deprecated="1" uuid="d06e531c-5269-11df-a48e-080069138b88" uid="12338"/>
+        <specific value="33" description="SSN 687 Richard B. Russell" deprecated="1" uuid="d073261c-5269-11df-ac62-080069138b88" uid="12339"/>
+      </subcategory>
+      <subcategory value="3" description="Narwhal class" deprecated="1" uuid="d07b1926-5269-11df-a4ea-080069138b88" uid="12340">
+        <specific value="1" description="SSN 671 Narwhal" deprecated="1" uuid="d07ca020-5269-11df-9117-080069138b88" uid="12341"/>
+      </subcategory>
+      <subcategory value="4" description="Los Angeles class" uuid="d07e5c08-5269-11df-93d7-080069138b88" uid="12342">
+        <specific value="1" description="SSN 688 Los Angeles" uuid="d07f6e22-5269-11df-8a18-080069138b88" uid="12343"/>
+        <specific value="2" description="SSN 689 Baton Rouge" deprecated="1" uuid="d08080fa-5269-11df-b4f3-080069138b88" uid="12344"/>
+        <specific value="3" description="SSN 690 Philadelphia" uuid="d0819648-5269-11df-8857-080069138b88" uid="12345"/>
+        <specific value="4" description="SSN 691 Memphis" uuid="d082a696-5269-11df-954c-080069138b88" uid="12346"/>
+        <specific value="5" description="SSN 692 Omaha" deprecated="1" uuid="d083ba04-5269-11df-ba87-080069138b88" uid="12347"/>
+        <specific value="6" description="SSN 693 Cincinnati" deprecated="1" uuid="d084cbec-5269-11df-94e9-080069138b88" uid="12348"/>
+        <specific value="7" description="SSN 694 Groton" deprecated="1" uuid="d085db04-5269-11df-b5b2-080069138b88" uid="12349"/>
+        <specific value="8" description="SSN 695 Birmingham" deprecated="1" uuid="d086f2c8-5269-11df-b0ca-080069138b88" uid="12350"/>
+        <specific value="9" description="SSN 696 New York City" deprecated="1" uuid="d0880640-5269-11df-802b-080069138b88" uid="12351"/>
+        <specific value="10" description="SSN 697 Indianapolis" deprecated="1" uuid="d089136e-5269-11df-b2b0-080069138b88" uid="12352"/>
+        <specific value="11" description="SSN 698 Bremerton" uuid="d08a2cd6-5269-11df-b183-080069138b88" uid="12353"/>
+        <specific value="12" description="SSN 699 Jacksonville" uuid="d08b404e-5269-11df-b718-080069138b88" uid="12354"/>
+        <specific value="13" description="SSN 700 Dallas" uuid="d08c4d54-5269-11df-a561-080069138b88" uid="12355"/>
+        <specific value="14" description="SSN 701 La Jolla" uuid="d08d6004-5269-11df-b425-080069138b88" uid="12356"/>
+        <specific value="15" description="SSN 702 Phoenix" deprecated="1" uuid="d08e71ce-5269-11df-9264-080069138b88" uid="12357"/>
+        <specific value="16" description="SSN 703 Boston" deprecated="1" uuid="d08f83a2-5269-11df-9563-080069138b88" uid="12358"/>
+        <specific value="17" description="SSN 704 Baltimore" deprecated="1" uuid="d0909792-5269-11df-bf50-080069138b88" uid="12359"/>
+        <specific value="18" description="SSN 705 City of Corpus Christi" uuid="d091ab64-5269-11df-afad-080069138b88" uid="12360"/>
+        <specific value="19" description="SSN 706 Albuquerque" uuid="d092bb9e-5269-11df-8b4c-080069138b88" uid="12361"/>
+        <specific value="20" description="SSN 707 Portsmouth" uuid="d093d09c-5269-11df-b1db-080069138b88" uid="12362"/>
+        <specific value="21" description="SSN 708 Minneapolis-Saint Paul" uuid="d094ed9c-5269-11df-8740-080069138b88" uid="12363"/>
+        <specific value="22" description="SSN 709 Hyman G. Rickover" uuid="d095ffb6-5269-11df-9993-080069138b88" uid="12364"/>
+        <specific value="23" description="SSN 710 Augusta" uuid="d0972170-5269-11df-a624-080069138b88" uid="12365"/>
+        <specific value="24" description="SSN 711 San Francisco" uuid="d0983c18-5269-11df-8dd2-080069138b88" uid="12366"/>
+        <specific value="25" description="SSN 712 Atlanta" uuid="d099540e-5269-11df-a796-080069138b88" uid="12367"/>
+        <specific value="26" description="SSN 713 Houston" uuid="d09a6efc-5269-11df-b88e-080069138b88" uid="12368"/>
+        <specific value="27" description="SSN 714 Norfolk" uuid="d09b8440-5269-11df-8b5f-080069138b88" uid="12369"/>
+        <specific value="28" description="SSN 715 Buffalo" uuid="d09cf6f4-5269-11df-a997-080069138b88" uid="12370"/>
+        <specific value="29" description="SSN 716 Salt Lake City" uuid="d09e08e6-5269-11df-a21a-080069138b88" uid="12371"/>
+        <specific value="30" description="SSN 717 Olympia" uuid="d09ff08e-5269-11df-813f-080069138b88" uid="12372"/>
+        <specific value="31" description="SSN 718 Honolulu" uuid="d0a11fa4-5269-11df-b49e-080069138b88" uid="12373"/>
+        <specific value="32" description="SSN 719 Providence" uuid="d0a23722-5269-11df-b4c4-080069138b88" uid="12374"/>
+        <specific value="33" description="SSN 720 Pittsburgh" uuid="d0a3e928-5269-11df-a573-080069138b88" uid="12375"/>
+        <specific value="34" description="SSN 721 Chicago" uuid="d0a58df0-5269-11df-9bbe-080069138b88" uid="12376"/>
+        <specific value="35" description="SSN 722 Key West" uuid="d0a6c008-5269-11df-914a-080069138b88" uid="12377"/>
+        <specific value="36" description="SSN 723 Oklahoma City" uuid="d0a7e064-5269-11df-8051-080069138b88" uid="12378"/>
+        <specific value="37" description="SSN 724 Louisville" uuid="d0a90e4e-5269-11df-ac2b-080069138b88" uid="12379"/>
+        <specific value="38" description="SSN 725 Helena" uuid="d0aa24aa-5269-11df-a292-080069138b88" uid="12380"/>
+        <specific value="39" description="SSN 750 Newport News" uuid="d0abc418-5269-11df-a967-080069138b88" uid="12381"/>
+        <specific value="40" description="SSN 751 San Juan" uuid="d0acfb44-5269-11df-9041-080069138b88" uid="12382"/>
+        <specific value="41" description="SSN 752 Pasadena" uuid="d0ae10f6-5269-11df-9927-080069138b88" uid="12383"/>
+        <specific value="42" description="SSN 753 Albany" uuid="d0af2612-5269-11df-a56e-080069138b88" uid="12384"/>
+        <specific value="43" description="SSN 754 Topeka" uuid="d0b03976-5269-11df-aa04-080069138b88" uid="12385"/>
+        <specific value="44" description="SSN 755 Miami" uuid="d0b14fc8-5269-11df-a1a1-080069138b88" uid="12386"/>
+        <specific value="45" description="SSN 756 Scranton" uuid="d0b25f26-5269-11df-9891-080069138b88" uid="12387"/>
+        <specific value="46" description="SSN 757 Alexandria" uuid="d0b389dc-5269-11df-86fa-080069138b88" uid="12388"/>
+        <specific value="47" description="SSN 758 Asheville" uuid="d0b4a182-5269-11df-9487-080069138b88" uid="12389"/>
+        <specific value="48" description="SSN 759 Jefferson City" uuid="d0b6449c-5269-11df-9989-080069138b88" uid="12390"/>
+        <specific value="49" description="SSN 760 Annapolis" uuid="d0b81a9c-5269-11df-b74b-080069138b88" uid="12391"/>
+        <specific value="50" description="SSN 761 Springfield" uuid="d0b9a75e-5269-11df-b510-080069138b88" uid="12392"/>
+        <specific value="51" description="SSN 762 Columbus" uuid="d0bad7f0-5269-11df-afe8-080069138b88" uid="12393"/>
+        <specific value="52" description="SSN 763 Santa Fe" uuid="d0bbeb18-5269-11df-99bf-080069138b88" uid="12394"/>
+        <specific value="53" description="SSN 764 Boise" uuid="d0bd1b5a-5269-11df-bf5b-080069138b88" uid="12395"/>
+        <specific value="54" description="SSN 765 Montpelier" uuid="d0be3422-5269-11df-b7d3-080069138b88" uid="12396"/>
+        <specific value="55" description="SSN 766 Charlotte" uuid="d0bf5ad2-5269-11df-997a-080069138b88" uid="12397"/>
+        <specific value="56" description="SSN 767 Hampton" uuid="d0c0723c-5269-11df-a0d5-080069138b88" uid="12398"/>
+        <specific value="57" description="SSN 768 Hartford" uuid="d0c1a256-5269-11df-812c-080069138b88" uid="12399"/>
+        <specific value="58" description="SSN 769 Toledo" uuid="d0c2cc12-5269-11df-94ec-080069138b88" uid="12400"/>
+        <specific value="59" description="SSN 770 Tucson" uuid="d0c3edea-5269-11df-8334-080069138b88" uid="12401"/>
+        <specific value="60" description="SSN 771 Columbia" uuid="d0c51ce2-5269-11df-a18b-080069138b88" uid="12402"/>
+        <specific value="61" description="SSN 772 Greeneville" uuid="d0c6341a-5269-11df-90f3-080069138b88" uid="12403"/>
+        <specific value="62" description="SSN 773 Cheyenne" uuid="d0c75ed0-5269-11df-82e1-080069138b88" uid="12404"/>
+      </subcategory>
+      <subcategory value="5" description="Virginia Class" uuid="d0c9302a-5269-11df-afe1-080069138b88" uid="12405">
+        <specific value="1" description="SSN 774 Virginia" uuid="d0ca419a-5269-11df-b4eb-080069138b88" uid="12406"/>
+        <specific value="2" description="SSN 775 Texas" uuid="d0cb707e-5269-11df-99a0-080069138b88" uid="12407"/>
+        <specific value="3" description="SSN 776 Hawaii" uuid="d0cc889c-5269-11df-95b7-080069138b88" uid="12408"/>
+        <specific value="4" description="SSN 777 No. Carolina" uuid="d0cdae66-5269-11df-8732-080069138b88" uid="12409"/>
+      </subcategory>
+    </category>
+    <category value="7" description="SSA(Conventional Auxiliary)" uuid="d0d02b96-5269-11df-9fee-080069138b88" uid="12410">
+      <subcategory value="1" description="Dolphin Class" uuid="d0d14f4e-5269-11df-aa34-080069138b88" uid="12411">
+        <specific value="1" description="AGSS 555 Dolphin" uuid="d0d2683e-5269-11df-a802-080069138b88" uid="12412"/>
+      </subcategory>
+      <subcategory value="2" description="Advanced SEAL Delivery System Class" uuid="d0d44d5c-5269-11df-b7af-080069138b88" uid="12413">
+        <specific value="1" description="ASDS-1" uuid="d0d56e1c-5269-11df-9005-080069138b88" uid="12414"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="225" uuid="d0d89628-5269-11df-99fd-080069138b88" uid="12415">
+    <category value="0" description="Other" uuid="d0d9bfe4-5269-11df-a645-080069138b88" uid="12416">
+      <subcategory value="1" description="Space Shuttle Vehicle" uuid="d0dad208-5269-11df-a31f-080069138b88" uid="12417"/>
+      <subcategory value="2" description="National Launch System (NLS)" uuid="d0dbfa20-5269-11df-9741-080069138b88" uid="12418"/>
+      <subcategory value="3" description="National Aerospace Plane (NASP)" deprecated="1" uuid="d0dd14e6-5269-11df-8fd3-080069138b88" uid="12419"/>
+      <subcategory value="4" description="SOTV" uuid="d0de40d2-5269-11df-aaa2-080069138b88" uid="12420"/>
+      <subcategory value="5" description="SMV" uuid="d0df6caa-5269-11df-b93c-080069138b88" uid="12421"/>
+    </category>
+    <category value="1" description="Manned" uuid="d0e128b0-5269-11df-8f18-080069138b88" uid="12422">
+      <subcategory value="1" description="Space Shuttle Orbiter" uuid="d0e281e2-5269-11df-bf7a-080069138b88" uid="12423">
+        <specific value="1" description="Atlantis" uuid="d0e3b666-5269-11df-902d-080069138b88" uid="12424"/>
+        <specific value="2" description="Discovery" uuid="d0e4d0d2-5269-11df-96a7-080069138b88" uid="12425"/>
+        <specific value="3" description="Columbia" uuid="d0e602ea-5269-11df-a0bd-080069138b88" uid="12426"/>
+        <specific value="4" description="Endeavor" uuid="d0e71220-5269-11df-80b4-080069138b88" uid="12427"/>
+        <specific value="5" description="Enterprise" uuid="d0e84ce4-5269-11df-bdd1-080069138b88" uid="12428"/>
+      </subcategory>
+      <subcategory value="2" description="Space Station" uuid="d0ea212c-5269-11df-9cc7-080069138b88" uid="12429">
+        <specific value="1" description="Freedom" uuid="d0eb3328-5269-11df-b4ce-080069138b88" uid="12430"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Unmanned" uuid="d0edc7e6-5269-11df-a40a-080069138b88" uid="12431">
+      <subcategory value="1" description="Communication satellite" uuid="d0eee306-5269-11df-9863-080069138b88" uid="12432">
+        <specific value="1" description="Leasat" uuid="d0f013ca-5269-11df-86e2-080069138b88" uid="12433"/>
+        <specific value="2" description="DSCS" uuid="d0f129a4-5269-11df-a501-080069138b88" uid="12434"/>
+        <specific value="3" description="Fleetsatcom" uuid="d0f25c52-5269-11df-9690-080069138b88" uid="12435"/>
+        <specific value="4" description="Milstar" uuid="d0f37556-5269-11df-85d3-080069138b88" uid="12436"/>
+        <specific value="5" description="SDS" uuid="d0f4ab4c-5269-11df-847c-080069138b88" uid="12437"/>
+        <specific value="6" description="Tactical Data Relay Satellite System (TDRSS)" uuid="d0f5d724-5269-11df-835b-080069138b88" uid="12438"/>
+        <specific value="7" description="Lightsat" uuid="d0f6e98e-5269-11df-839c-080069138b88" uid="12439"/>
+        <specific value="8" description="STEP/Eagle" uuid="d0f81a52-5269-11df-b618-080069138b88" uid="12440"/>
+        <specific value="9" description="LES/Tacsat" uuid="d0f9366c-5269-11df-8f1e-080069138b88" uid="12441"/>
+      </subcategory>
+      <subcategory value="2" description="Navigation satellite" uuid="d0fb0942-5269-11df-9f90-080069138b88" uid="12442">
+        <specific value="1" description="Transit" uuid="d0fc3a4c-5269-11df-8e4a-080069138b88" uid="12443"/>
+        <specific value="2" description="Global Positioning System (GPS)" uuid="d0fd4e50-5269-11df-8429-080069138b88" uid="12444"/>
+        <specific value="3" description="Navstar 41-60 (launch 1996 or 1997)" uuid="d0fe81ee-5269-11df-96ff-080069138b88" uid="12445"/>
+      </subcategory>
+      <subcategory value="3" description="Early Warning satellite" uuid="d1005622-5269-11df-aa49-080069138b88" uid="12446">
+        <specific value="1" description="DSP" uuid="d1017192-5269-11df-9827-080069138b88" uid="12447"/>
+        <specific value="2" description="MICRO-SAT" uuid="d102a332-5269-11df-948f-080069138b88" uid="12448"/>
+        <specific value="3" description="SIBRS" uuid="d103b0f6-5269-11df-a059-080069138b88" uid="12449"/>
+      </subcategory>
+      <subcategory value="4" description="Electronic Intelligence (ELINT) satellite" uuid="d1058688-5269-11df-9310-080069138b88" uid="12450">
+        <specific value="1" description="Rhyolite" uuid="d106b846-5269-11df-be27-080069138b88" uid="12451"/>
+        <specific value="2" description="Magnum" uuid="d107cfce-5269-11df-8667-080069138b88" uid="12452"/>
+        <specific value="3" description="Challet/Vortex" uuid="d10905f6-5269-11df-a4c5-080069138b88" uid="12453"/>
+        <specific value="4" description="Jumpseat" uuid="d10a3084-5269-11df-9c4b-080069138b88" uid="12454"/>
+      </subcategory>
+      <subcategory value="5" description="Meteorology satellite" uuid="d10bfed2-5269-11df-be40-080069138b88" uid="12455">
+        <specific value="1" description="Defense Meteorological Satellite Program (DMSP)" uuid="d10eb104-5269-11df-bb83-080069138b88" uid="12456"/>
+      </subcategory>
+      <subcategory value="6" description="Ocean Surveillance satellite" uuid="d1109492-5269-11df-b2b8-080069138b88" uid="12457">
+        <specific value="1" description="White Cloud" uuid="d111b0d4-5269-11df-99cb-080069138b88" uid="12458"/>
+      </subcategory>
+      <subcategory value="7" description="Imaging Radar Surveillance satellite" uuid="d1139386-5269-11df-b9d8-080069138b88" uid="12459">
+        <specific value="1" description="Lacrosse" uuid="d114c396-5269-11df-9154-080069138b88" uid="12460"/>
+      </subcategory>
+      <subcategory value="8" description="Optical Imaging Surveillance satellite" uuid="d116a378-5269-11df-af48-080069138b88" uid="12461">
+        <specific value="1" description="KH11" uuid="d117b75e-5269-11df-b892-080069138b88" uid="12462"/>
+        <specific value="2" description="Advanced KH11" uuid="d1190406-5269-11df-8e52-080069138b88" uid="12463"/>
+      </subcategory>
+      <subcategory value="9" description="SDI satellite" uuid="d11adef2-5269-11df-9d74-080069138b88" uid="12464">
+        <specific value="1" description="Delta 181" uuid="d11bf4e0-5269-11df-907c-080069138b88" uid="12465"/>
+        <specific value="2" description="E2I (Endo-Exoatmospheric Interceptor)" uuid="d11d2a7c-5269-11df-99d2-080069138b88" uid="12466"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Booster" uuid="d11fad6a-5269-11df-8bf0-080069138b88" uid="12467">
+      <subcategory value="1" description="Atlas" uuid="d120e8f6-5269-11df-9b53-080069138b88" uid="12468"/>
+      <subcategory value="2" description="Conestoga" uuid="d12200c4-5269-11df-ac9d-080069138b88" uid="12469"/>
+      <subcategory value="3" description="Delta" uuid="d12334c6-5269-11df-b326-080069138b88" uid="12470"/>
+      <subcategory value="4" description="Pegasus" uuid="d12465a8-5269-11df-b548-080069138b88" uid="12471"/>
+      <subcategory value="5" description="Scout" uuid="d1259018-5269-11df-bb27-080069138b88" uid="12472"/>
+      <subcategory value="6" description="Taurus" uuid="d126c8c0-5269-11df-9f55-080069138b88" uid="12473"/>
+      <subcategory value="7" description="Titan" uuid="d127ddf0-5269-11df-a065-080069138b88" uid="12474"/>
+      <subcategory value="8" description="Tomahawk" uuid="d129136e-5269-11df-b08a-080069138b88" uid="12475"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="222" uuid="d12b8da6-5269-11df-a19d-080069138b88" uid="12476">
+    <category value="0" description="Other" uuid="d12cbf14-5269-11df-b636-080069138b88" uid="12477">
+      <subcategory value="1" description="Bridges" uuid="d12dd48a-5269-11df-a864-080069138b88" uid="12478">
+        <specific value="1" description="PMM-2 Amphibious Bridging and Ferry System" uuid="d12f04fe-5269-11df-9a2b-080069138b88" uid="12479"/>
+        <specific value="2" description="Amphibious Bridging System (Wheeled) (ABS(W))" uuid="d13024d8-5269-11df-8ab8-080069138b88" uid="12480"/>
+        <specific value="3" description="MTU-72 armored bridgelayer" uuid="d133cca0-5269-11df-9f80-080069138b88" uid="12481"/>
+        <specific value="4" description="MTU-20 armored bridgelayer w/bridge" uuid="d1350c8c-5269-11df-a865-080069138b88" uid="12482"/>
+        <specific value="5" description="MTU armored bridgelayer" uuid="d13629f0-5269-11df-ba27-080069138b88" uid="12483"/>
+        <specific value="6" description="TMM truck-mounted treadway" uuid="d1375ece-5269-11df-9722-080069138b88" uid="12484"/>
+        <specific value="7" description="KMM truck-mounted treadway" uuid="d13876d8-5269-11df-bbd8-080069138b88" uid="12485"/>
+        <specific value="8" description="DPP-40 floating bridge equipment" uuid="d13b245a-5269-11df-8bc6-080069138b88" uid="12486"/>
+        <specific value="9" description="GSP heavy amphibious ferry" uuid="d13c3d72-5269-11df-bbc2-080069138b88" uid="12487"/>
+        <specific value="10" description="PVD-20 airportable" uuid="d13d68d2-5269-11df-bacb-080069138b88" uid="12488"/>
+        <specific value="11" description="PMP heavy folding pontoon" uuid="d13e8474-5269-11df-9a01-080069138b88" uid="12489"/>
+        <specific value="12" description="PPS heavy girder floating" uuid="d13f9f6c-5269-11df-9e85-080069138b88" uid="12490"/>
+        <specific value="13" description="PVM foot suspension" uuid="d140b262-5269-11df-a650-080069138b88" uid="12491"/>
+        <specific value="14" description="LVM light suspension" uuid="d141c86e-5269-11df-8bb5-080069138b88" uid="12492"/>
+        <specific value="15" description="TVM heavy suspension" uuid="d142e50a-5269-11df-bcb5-080069138b88" uid="12493"/>
+        <specific value="16" description="Underwater bridge set" uuid="d143fdaa-5269-11df-a81a-080069138b88" uid="12494"/>
+        <specific value="17" description="MARM sectional arch" uuid="d14511c2-5269-11df-a544-080069138b88" uid="12495"/>
+        <specific value="18" description="RMM-4 portable steel fixed" uuid="d1462706-5269-11df-8468-080069138b88" uid="12496"/>
+        <specific value="19" description="SARM sectional deck truss" uuid="d1474294-5269-11df-a3a9-080069138b88" uid="12497"/>
+        <specific value="20" description="REM-500 railway and road-section" uuid="d148522e-5269-11df-86a9-080069138b88" uid="12498"/>
+        <specific value="21" description="NZhM-56 heavy floating railway and road" uuid="d1496f9c-5269-11df-a0bc-080069138b88" uid="12499"/>
+        <specific value="22" description="Heavy barge" uuid="d14a840e-5269-11df-9dfd-080069138b88" uid="12500"/>
+        <specific value="23" description="BMK-T bridging boat" uuid="d14b9e34-5269-11df-b83b-080069138b88" uid="12501"/>
+        <specific value="24" description="BMK-130 bridging boat" uuid="d14cb2ec-5269-11df-92a2-080069138b88" uid="12502"/>
+        <specific value="25" description="BMK-150 bridging boat" uuid="d14dcd08-5269-11df-9e2b-080069138b88" uid="12503"/>
+        <specific value="26" description="BMK-70 bridging boat" uuid="d14eeac6-5269-11df-b06a-080069138b88" uid="12504"/>
+        <specific value="27" description="BMK-90 bridging boat" uuid="d14ffd26-5269-11df-9776-080069138b88" uid="12505"/>
+        <specific value="28" description="MTU-20 armored bridgelayer w/o bridge" uuid="d1511300-5269-11df-a572-080069138b88" uid="12506"/>
+        <specific value="29" description="MTU-20 bridge" uuid="d1522b1e-5269-11df-9823-080069138b88" uid="12507"/>
+      </subcategory>
+      <subcategory value="2" description="Missile Transporter/Launcher" uuid="d153e4a4-5269-11df-8d3e-080069138b88" uid="12508">
+        <specific value="1" description="SS-25 TEL" uuid="d154f9b6-5269-11df-adcc-080069138b88" uid="12509"/>
+      </subcategory>
+    </category>
+    <category value="1" description="Tank" uuid="d1574f4a-5269-11df-9483-080069138b88" uid="12510">
+      <subcategory value="1" description="T-80 MBT" uuid="d15861aa-5269-11df-a6a2-080069138b88" uid="12511">
+        <specific value="1" description="T-80" uuid="d1597734-5269-11df-9969-080069138b88" uid="12512"/>
+        <specific value="2" description="T-80B" uuid="d15a894e-5269-11df-8a73-080069138b88" uid="12513"/>
+        <specific value="3" description="T-80BK" uuid="d15b93b6-5269-11df-9a13-080069138b88" uid="12514"/>
+        <specific value="4" description="T-80BV" uuid="d15ca68e-5269-11df-8803-080069138b88" uid="12515"/>
+        <specific value="5" description="T-80BVK" uuid="d15db970-5269-11df-b4a9-080069138b88" uid="12516"/>
+        <specific value="6" description="T-80U" uuid="d15ec73e-5269-11df-b22a-080069138b88" uid="12517"/>
+        <specific value="7" description="T-80Uv" uuid="d15fdbc4-5269-11df-8738-080069138b88" uid="12518"/>
+        <specific value="8" description="T-80 w/mine plow roller" uuid="d160ee56-5269-11df-8f6a-080069138b88" uid="12519"/>
+        <specific value="9" description="T-80Uv w/mine plow roller" uuid="d161fc60-5269-11df-8522-080069138b88" uid="12520"/>
+        <specific value="10" description="T-80U w/Reactive Armor" uuid="d1631186-5269-11df-ac7f-080069138b88" uid="12521"/>
+      </subcategory>
+      <subcategory value="2" description="T-72 MBT" uuid="d164c8c8-5269-11df-bae3-080069138b88" uid="12522">
+        <specific value="1" description="T-72" uuid="d165d8bc-5269-11df-b1a1-080069138b88" uid="12523"/>
+        <specific value="2" description="T-72M" uuid="d166e5d6-5269-11df-aa02-080069138b88" uid="12524"/>
+        <specific value="3" description="T-72K" uuid="d167f778-5269-11df-849f-080069138b88" uid="12525"/>
+        <specific value="4" description="T-72A" uuid="d1690870-5269-11df-8e7a-080069138b88" uid="12526"/>
+        <specific value="5" description="T-72AK" uuid="d16a181e-5269-11df-93f0-080069138b88" uid="12527"/>
+        <specific value="6" description="T-72B" uuid="d16b2ab0-5269-11df-9d50-080069138b88" uid="12528"/>
+        <specific value="7" description="T-72BK" uuid="d16c4526-5269-11df-9d4c-080069138b88" uid="12529"/>
+        <specific value="8" description="T-72B1" uuid="d16d5128-5269-11df-987f-080069138b88" uid="12530"/>
+        <specific value="9" description="T-72B1K" uuid="d16e6d60-5269-11df-95de-080069138b88" uid="12531"/>
+        <specific value="10" description="T-72 Bv" uuid="d16f80a6-5269-11df-9774-080069138b88" uid="12532"/>
+        <specific value="11" description="T-72 Bv w/mine plow roller" uuid="d17090f4-5269-11df-8c98-080069138b88" uid="12533"/>
+        <specific value="12" description="T-72 w/mine plow roller" uuid="d171a502-5269-11df-9ceb-080069138b88" uid="12534"/>
+        <specific value="13" description="T-72S" uuid="d172b686-5269-11df-94b0-080069138b88" uid="12535"/>
+        <specific value="14" description="BMP-T Fire Support Vehicle" status="new" uuid="286b2b1b-735a-4410-816a-5ad0cc8f35bd" uid="22827">
+          <cr value="2120"/>
+        </specific>
+      </subcategory>
+      <subcategory value="3" description="T-64 MBT" uuid="d1746ddc-5269-11df-b0c8-080069138b88" uid="12536">
+        <specific value="1" description="T-64A" uuid="d1757ac4-5269-11df-aa37-080069138b88" uid="12537"/>
+        <specific value="2" description="T-64AK" uuid="d1768c2a-5269-11df-a99e-080069138b88" uid="12538"/>
+        <specific value="3" description="T-64B" uuid="d1779f8e-5269-11df-a819-080069138b88" uid="12539"/>
+        <specific value="4" description="T-64BV" uuid="d178adde-5269-11df-be82-080069138b88" uid="12540"/>
+        <specific value="5" description="T-64B1" uuid="d179c386-5269-11df-bbd0-080069138b88" uid="12541"/>
+        <specific value="6" description="T-64B1K" uuid="d17ad4c4-5269-11df-8062-080069138b88" uid="12542"/>
+        <specific value="7" description="T-64BV1K" uuid="d17bdef0-5269-11df-9456-080069138b88" uid="12543"/>
+        <specific value="8" description="T-64R" uuid="d17cf1a0-5269-11df-a76a-080069138b88" uid="12544"/>
+        <specific value="9" description="T-64 Bv w/mine plow roller" uuid="d17e06d0-5269-11df-9933-080069138b88" uid="12545"/>
+      </subcategory>
+      <subcategory value="4" description="T-62 MBT" uuid="d17fb930-5269-11df-ae43-080069138b88" uid="12546">
+        <specific value="1" description="T-62" uuid="d180c3fc-5269-11df-bf55-080069138b88" uid="12547"/>
+        <specific value="2" description="T-62K" uuid="d181e192-5269-11df-a82f-080069138b88" uid="12548"/>
+        <specific value="3" description="T-62M" uuid="d182f5e6-5269-11df-805d-080069138b88" uid="12549"/>
+        <specific value="4" description="T-62MK" uuid="d18404fe-5269-11df-afa3-080069138b88" uid="12550"/>
+        <specific value="5" description="T-62MV" uuid="d185156a-5269-11df-8382-080069138b88" uid="12551"/>
+        <specific value="6" description="T-62M1" uuid="d1862b26-5269-11df-9b6e-080069138b88" uid="12552"/>
+        <specific value="7" description="T-62 Bv w/mine plow roller" uuid="d1873872-5269-11df-82e2-080069138b88" uid="12553"/>
+      </subcategory>
+      <subcategory value="5" description="T-54 MBT" uuid="d188ec8a-5269-11df-8238-080069138b88" uid="12554">
+        <specific value="1" description="T-54" uuid="d189fcd8-5269-11df-915a-080069138b88" uid="12555"/>
+        <specific value="2" description="T-54K" uuid="d18b1154-5269-11df-82f2-080069138b88" uid="12556"/>
+        <specific value="3" description="T-54B" uuid="d18c23a0-5269-11df-8c22-080069138b88" uid="12557"/>
+        <specific value="4" description="T-54BK" uuid="d18d3718-5269-11df-bda4-080069138b88" uid="12558"/>
+        <specific value="5" description="T-54M" uuid="d18e4ab8-5269-11df-bf55-080069138b88" uid="12559"/>
+        <specific value="6" description="T-54MK" uuid="d18f5746-5269-11df-839c-080069138b88" uid="12560"/>
+      </subcategory>
+      <subcategory value="6" description="T-55 MBT" uuid="d1910938-5269-11df-8a56-080069138b88" uid="12561">
+        <specific value="1" description="T-55" uuid="d1921c60-5269-11df-9693-080069138b88" uid="12562"/>
+        <specific value="2" description="T-55K" uuid="d1933046-5269-11df-991c-080069138b88" uid="12563"/>
+        <specific value="3" description="T-55A" uuid="d1943ef0-5269-11df-8660-080069138b88" uid="12564"/>
+        <specific value="4" description="T-55AD" uuid="d1954fac-5269-11df-b335-080069138b88" uid="12565"/>
+        <specific value="5" description="T-55AK" uuid="d1966676-5269-11df-ad53-080069138b88" uid="12566"/>
+        <specific value="6" description="T-55AM" uuid="d19770a2-5269-11df-94c6-080069138b88" uid="12567"/>
+        <specific value="7" description="T-55AMD" uuid="d1988230-5269-11df-b449-080069138b88" uid="12568"/>
+        <specific value="8" description="T-55AMK" uuid="d199965c-5269-11df-b5cc-080069138b88" uid="12569"/>
+        <specific value="9" description="T-55AMV" uuid="d19aa326-5269-11df-ba52-080069138b88" uid="12570"/>
+        <specific value="10" description="T-55M" uuid="d19bb400-5269-11df-ad7b-080069138b88" uid="12571"/>
+        <specific value="11" description="T-55MK" uuid="d19cc714-5269-11df-86bf-080069138b88" uid="12572"/>
+        <specific value="12" description="T-55MVK" uuid="d19dd3d4-5269-11df-91bc-080069138b88" uid="12573"/>
+        <specific value="13" description="BTR-T Heavy APC" status="new" uuid="720e7412-dcd8-41e9-b336-ed5429d12c61" uid="22826">
+          <cr value="2119"/>
+        </specific>
+      </subcategory>
+      <subcategory value="8" description="PT-76 Amphibious light tank" uuid="d19f9d68-5269-11df-a656-080069138b88" uid="12574">
+        <specific value="1" description="PT-76A" uuid="d1a0b3e2-5269-11df-9b3a-080069138b88" uid="12575"/>
+        <specific value="2" description="PT-76B" uuid="d1a1c4c6-5269-11df-ab80-080069138b88" uid="12576"/>
+      </subcategory>
+      <subcategory value="9" description="T-90 MBT" uuid="d1a37b0e-5269-11df-a3df-080069138b88" uid="12577"/>
+      <subcategory value="10" description="T-34/85" uuid="d1a4879c-5269-11df-9a32-080069138b88" uid="12578"/>
+      <subcategory value="11" description="T-80UK Command Tank" uuid="d1a59ac4-5269-11df-af28-080069138b88" uid="12579"/>
+    </category>
+    <category value="2" description="Armored fighting vehicle" uuid="d1a75094-5269-11df-9b27-080069138b88" uid="12580">
+      <subcategory value="1" description="BMP-1" uuid="d1a86268-5269-11df-8878-080069138b88" uid="12581">
+        <specific value="1" description="BMP-1, basic model 1970" uuid="d1a96dde-5269-11df-b8c6-080069138b88" uid="12582"/>
+        <specific value="2" description="BMP-1K command" uuid="d1aa8336-5269-11df-9767-080069138b88" uid="12583"/>
+        <specific value="3" description="BMP-1K3 command" uuid="d1aba37e-5269-11df-bfcb-080069138b88" uid="12584"/>
+        <specific value="4" description="BMP-1P w/ AT-4 ATGW" uuid="d1acb14c-5269-11df-9a0b-080069138b88" uid="12585"/>
+        <specific value="5" description="BMP-1PK command" uuid="d1adc4a6-5269-11df-9849-080069138b88" uid="12586"/>
+        <specific value="6" description="BRM-1K recon (aka M-1976)" uuid="d1aeda3a-5269-11df-b0e0-080069138b88" uid="12587"/>
+        <specific value="7" description="(deprecated)" deprecated="1" uuid="d1afe830-5269-11df-bd88-080069138b88" uid="12588"/>
+        <specific value="8" description="(deprecated)" deprecated="1" uuid="d1b0f978-5269-11df-ba38-080069138b88" uid="12589"/>
+        <specific value="9" description="BMP-1KShM unarmed command" uuid="d1b20e8a-5269-11df-85b8-080069138b88" uid="12590"/>
+      </subcategory>
+      <subcategory value="2" description="BMP-2" uuid="d1b3c7ca-5269-11df-a082-080069138b88" uid="12591">
+        <specific value="1" description="BMP-2" uuid="d1b4d336-5269-11df-89e8-080069138b88" uid="12592"/>
+        <specific value="2" description="BMP-2D" uuid="d1b5e334-5269-11df-9879-080069138b88" uid="12593"/>
+        <specific value="3" description="BMP-2K" uuid="d1b6f63e-5269-11df-90c1-080069138b88" uid="12594"/>
+        <specific value="4" description="BMP-2 w/ KMT-8/KMT-10" uuid="d1b8039e-5269-11df-ba08-080069138b88" uid="12595"/>
+        <specific value="5" description="BVP-2 (Czech)" uuid="d1b919d2-5269-11df-a5f7-080069138b88" uid="12596"/>
+        <specific value="6" description="BRM-2" status="new" uuid="2517f137-952c-4b6f-91b8-13a207bed262" uid="22854">
+          <cr value="2210"/>
+        </specific>
+      </subcategory>
+      <subcategory value="3" description="BMP-3" uuid="d1bacb4c-5269-11df-89ef-080069138b88" uid="12597">
+        <specific value="1" description="BMP-3 [(SIFV) M1990/1]" uuid="d1bbdd5c-5269-11df-b78d-080069138b88" uid="12598"/>
+        <specific value="2" description="BRM-3K Reconnaissance Vehicle" uuid="d1bcedd2-5269-11df-88be-080069138b88" uid="12599"/>
+        <specific value="3" description="BMP-3K Command variant" uuid="d1bdff92-5269-11df-97a3-080069138b88" uid="12600"/>
+      </subcategory>
+      <subcategory value="4" description="BRDM-2 Reconnaissance vehicle" uuid="d1bfb382-5269-11df-bee0-080069138b88" uid="12601">
+        <specific value="1" description="BRDM-2 w/ AT-2 ATGM" uuid="d1c0c998-5269-11df-931c-080069138b88" uid="12602"/>
+        <specific value="2" description="BRDM-2 w/ AT-3 ATGM" uuid="d1c1d928-5269-11df-9e66-080069138b88" uid="12603"/>
+        <specific value="3" description="BRDM-2 w/ AT-5 ATGM" uuid="d1c2ee26-5269-11df-8773-080069138b88" uid="12604"/>
+        <specific value="4" description="BRDM-2-RKhb NBC" uuid="d1c40018-5269-11df-a902-080069138b88" uid="12605"/>
+        <specific value="5" description="BRDM-2U command" uuid="d1c51016-5269-11df-b498-080069138b88" uid="12606"/>
+        <specific value="6" description="BRDM-2 w/14.5mm" uuid="d1c6224e-5269-11df-8d57-080069138b88" uid="12607"/>
+      </subcategory>
+      <subcategory value="5" description="BTR-40 Reconnaissance vehicle" uuid="d1c7e7aa-5269-11df-b144-080069138b88" uid="12608">
+        <specific value="1" description="BTR-40" uuid="d1c8fff0-5269-11df-b847-080069138b88" uid="12609"/>
+        <specific value="2" description="BTR-40B" uuid="d1ca88f2-5269-11df-b0e0-080069138b88" uid="12610"/>
+        <specific value="3" description="BTR-40A anti-air" uuid="d1cb9fda-5269-11df-8a3f-080069138b88" uid="12611"/>
+        <specific value="4" description="BTR-40Kh chemical reconnaissance" uuid="d1cd191e-5269-11df-abf1-080069138b88" uid="12612"/>
+        <specific value="5" description="BTR-40zhd railroad" uuid="d1ce2f98-5269-11df-aaf0-080069138b88" uid="12613"/>
+      </subcategory>
+      <subcategory value="6" description="BTR-152" uuid="d1cfe702-5269-11df-946d-080069138b88" uid="12614">
+        <specific value="1" description="BTR-152" uuid="d1d103d0-5269-11df-b6cd-080069138b88" uid="12615"/>
+        <specific value="2" description="BTR-152V" uuid="d1d2184c-5269-11df-b9e8-080069138b88" uid="12616"/>
+        <specific value="3" description="BTR-152V1" uuid="d1d324e4-5269-11df-bca3-080069138b88" uid="12617"/>
+        <specific value="4" description="BTR-152V2" uuid="d1d43942-5269-11df-b2cd-080069138b88" uid="12618"/>
+        <specific value="5" description="BTR-152V3" uuid="d1d54e9a-5269-11df-a4b3-080069138b88" uid="12619"/>
+        <specific value="6" description="BTR-152K" uuid="d1d66064-5269-11df-8369-080069138b88" uid="12620"/>
+        <specific value="7" description="BTR-152U" uuid="d1d77120-5269-11df-a628-080069138b88" uid="12621"/>
+        <specific value="8" description="BTR-152A" uuid="d1d87e6c-5269-11df-832a-080069138b88" uid="12622"/>
+      </subcategory>
+      <subcategory value="7" description="MT-LB tracked vehicle" uuid="d1da3dce-5269-11df-9331-080069138b88" uid="12623">
+        <specific value="1" description="MT-LB 1V12" uuid="d1db4cf0-5269-11df-87c3-080069138b88" uid="12624"/>
+        <specific value="2" description="MT-LB 1V13 (battery Fire Direction Center (FDC))" uuid="d1dc5ff0-5269-11df-8da3-080069138b88" uid="12625"/>
+        <specific value="3" description="MT-LB 1V14 (battery Command Post)" uuid="d1dd764c-5269-11df-a5d3-080069138b88" uid="12626"/>
+        <specific value="4" description="MT-LB 1V15 (battalion command)" uuid="d1de8910-5269-11df-a63f-080069138b88" uid="12627"/>
+        <specific value="5" description="MT-LB 1V16 (battalion FDC)" uuid="d1dfa124-5269-11df-9d5e-080069138b88" uid="12628"/>
+        <specific value="6" description="MT-LB 1V12M (artillery C2)" uuid="d1e0b276-5269-11df-80db-080069138b88" uid="12629"/>
+        <specific value="7" description="MT-LB 1V13M (artillery C2)" uuid="d1e1c17a-5269-11df-a9fa-080069138b88" uid="12630"/>
+        <specific value="8" description="MT-LB 1V14M (artillery C2)" uuid="d1e2d826-5269-11df-8158-080069138b88" uid="12631"/>
+        <specific value="9" description="MT-LB 1V15M (artillery C2)" uuid="d1e3eab8-5269-11df-86e7-080069138b88" uid="12632"/>
+        <specific value="10" description="MT-LB 1V16M (artillery C2)" uuid="d1e4f6f6-5269-11df-a95a-080069138b88" uid="12633"/>
+        <specific value="11" description="MT-LB 1V21 staff command" uuid="d1e60b04-5269-11df-b347-080069138b88" uid="12634"/>
+        <specific value="12" description="MT-LB 1V22 air defense management" uuid="d1e7232c-5269-11df-9c9e-080069138b88" uid="12635"/>
+        <specific value="13" description="MT-LB 1V23 C2" uuid="d1e830dc-5269-11df-bd70-080069138b88" uid="12636"/>
+        <specific value="14" description="MT-LB 1V24 artillery C3" uuid="d1e94ee0-5269-11df-a683-080069138b88" uid="12637"/>
+        <specific value="15" description="MT-LB 1V25 AD management" uuid="d1ea5f1a-5269-11df-8aa7-080069138b88" uid="12638"/>
+        <specific value="16" description="(deprecated)" deprecated="1" uuid="d1eb7904-5269-11df-beeb-080069138b88" uid="12639"/>
+        <specific value="17" description="(deprecated)" deprecated="1" uuid="d1ec8e0c-5269-11df-b2fe-080069138b88" uid="12640"/>
+        <specific value="18" description="MT-LB SNAR-10 radar" uuid="d1ed9d1a-5269-11df-9bc0-080069138b88" uid="12641"/>
+        <specific value="19" description="MT-LBV snow/swamp" uuid="d1eeaf02-5269-11df-99a5-080069138b88" uid="12642"/>
+        <specific value="20" description="MT-LB engineer" deprecated="1" uuid="d1efc27a-5269-11df-8d8e-080069138b88" uid="12643"/>
+        <specific value="21" description="MT-LB ambulance" uuid="d1f0d41c-5269-11df-b74a-080069138b88" uid="12644"/>
+        <specific value="22" description="MT-LBR repair" uuid="d1f1e852-5269-11df-8337-080069138b88" uid="12645"/>
+        <specific value="23" description="MT-LB w/ AT-6 (Anti-Tank Guided Weapon) ATGW" uuid="d1f2fa94-5269-11df-994c-080069138b88" uid="12646"/>
+        <specific value="24" description="RKhM (Chemical Recon)" uuid="d1f40cc2-5269-11df-9bee-080069138b88" uid="12647"/>
+      </subcategory>
+      <subcategory value="8" description="BTR-60" uuid="d1f5befa-5269-11df-bc28-080069138b88" uid="12648">
+        <specific value="1" description="BTR-60" uuid="d1f6cf70-5269-11df-8663-080069138b88" uid="12649"/>
+        <specific value="2" description="BTR-60P" uuid="d1f7e31a-5269-11df-b02a-080069138b88" uid="12650"/>
+        <specific value="3" description="BTR-60PA" uuid="d1f8ee68-5269-11df-ac57-080069138b88" uid="12651"/>
+        <specific value="4" description="BTR-60PB" uuid="d1f9ff10-5269-11df-bfa8-080069138b88" uid="12652"/>
+        <specific value="5" description="BTR-60PU" uuid="d1fb1134-5269-11df-8076-080069138b88" uid="12653"/>
+        <specific value="6" description="BTR-60PBK command" uuid="d1fc1aca-5269-11df-ba43-080069138b88" uid="12654"/>
+        <specific value="7" description="BTR-60PU command" uuid="d1fd3090-5269-11df-96b9-080069138b88" uid="12655"/>
+        <specific value="8" description="BTR-60PU-12 air defense command" uuid="d1fe41d8-5269-11df-ac19-080069138b88" uid="12656"/>
+        <specific value="9" description="BTR-601V19 FDC" uuid="d1ff4ff6-5269-11df-844d-080069138b88" uid="12657"/>
+        <specific value="10" description="BTR-601V18 artillery observation" uuid="d20060a8-5269-11df-9e2f-080069138b88" uid="12658"/>
+        <specific value="11" description="BTR-60 R-145BM communications" uuid="d20177ea-5269-11df-8efd-080069138b88" uid="12659"/>
+        <specific value="12" description="BTR-60 R-975 forward air controller" uuid="d202861c-5269-11df-8d0b-080069138b88" uid="12660"/>
+        <specific value="13" description="BTR-60-E-351BR generator" uuid="d20399c6-5269-11df-bb4a-080069138b88" uid="12661"/>
+        <specific value="14" description="BTR-60-P-238T switchboard" uuid="d204b1ee-5269-11df-a8a4-080069138b88" uid="12662"/>
+        <specific value="15" description="BTR-60-P-240T switchboard" uuid="d205be86-5269-11df-ada0-080069138b88" uid="12663"/>
+        <specific value="16" description="BTR-60-P-241T field telephone" uuid="d206d140-5269-11df-9835-080069138b88" uid="12664"/>
+      </subcategory>
+      <subcategory value="9" description="BTR-50 Amphibious Tracked APC" uuid="d20892d2-5269-11df-9d51-080069138b88" uid="12665">
+        <specific value="1" description="BTR-50P" uuid="d209a47e-5269-11df-be91-080069138b88" uid="12666"/>
+        <specific value="2" description="BTR-50PA" uuid="d20aaf36-5269-11df-8390-080069138b88" uid="12667"/>
+        <specific value="3" description="BTR-50PK" uuid="d20bc452-5269-11df-8912-080069138b88" uid="12668"/>
+        <specific value="4" description="BTR-50PU" uuid="d20cd590-5269-11df-a05c-080069138b88" uid="12669"/>
+        <specific value="5" description="BTR-50PU R82" uuid="d20de070-5269-11df-896c-080069138b88" uid="12670"/>
+        <specific value="6" description="BTR-50PU-11" uuid="d20ef0e6-5269-11df-9a2a-080069138b88" uid="12671"/>
+        <specific value="7" description="BTR-50PUM" uuid="d21005a8-5269-11df-878f-080069138b88" uid="12672"/>
+        <specific value="8" description="BTR-50PUR" uuid="d211147a-5269-11df-b633-080069138b88" uid="12673"/>
+        <specific value="9" description="BTR-50PK(B)" uuid="d21223d8-5269-11df-b668-080069138b88" uid="12674"/>
+        <specific value="10" description="MTP technical support" uuid="d2133796-5269-11df-8aea-080069138b88" uid="12675"/>
+        <specific value="11" description="MTK mineclearing" uuid="d2144898-5269-11df-a674-080069138b88" uid="12676"/>
+        <specific value="12" description="MTR-1 repair" uuid="d2155a08-5269-11df-ab9f-080069138b88" uid="12677"/>
+      </subcategory>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="d2170d62-5269-11df-a4e0-080069138b88" uid="12678"/>
+      <subcategory value="11" description="BMD airborne fire support vehicle" uuid="d218203a-5269-11df-a629-080069138b88" uid="12679">
+        <specific value="1" description="BMD-1" uuid="d21930c4-5269-11df-a7f1-080069138b88" uid="12680"/>
+        <specific value="2" description="BMD-1P w/ AT-3 ATGW" uuid="d21a41b2-5269-11df-bf93-080069138b88" uid="12681"/>
+        <specific value="3" description="BMD-2" uuid="d21b53c2-5269-11df-8405-080069138b88" uid="12682"/>
+        <specific value="4" description="BMD w/ 82-mm mortar" uuid="d21c5e5c-5269-11df-8667-080069138b88" uid="12683"/>
+        <specific value="5" description="BMD KShM command" uuid="d21d7256-5269-11df-bc68-080069138b88" uid="12684"/>
+        <specific value="6" description="BTR-D" uuid="d21e875e-5269-11df-813d-080069138b88" uid="12685"/>
+        <specific value="7" description="BMD-3" uuid="d21f9108-5269-11df-8c08-080069138b88" uid="12686"/>
+        <specific value="8" description="BTR-RD ATGM section vehicle" uuid="d220a386-5269-11df-8845-080069138b88" uid="12687"/>
+        <specific value="9" description="BTR-ZD MANPADS section vehicle" uuid="d221b852-5269-11df-bbf6-080069138b88" uid="12688"/>
+        <specific value="10" description="BTR-D with 23-mm ZU-23" uuid="d222c7ec-5269-11df-9c93-080069138b88" uid="12689"/>
+        <specific value="11" description="ACRV, 1V119" uuid="d223dae2-5269-11df-b964-080069138b88" uid="12690"/>
+        <specific value="12" description="BMD w/ UAV launcher (Sterkh)" status="new" uuid="398e37fb-64ad-497b-a7db-620e17674517" uid="22845">
+          <cr value="2177"/>
+        </specific>
+        <specific value="13" description="2S25 Tank Destroyer" status="new" uuid="8ab6ff2e-47d0-4008-95ad-17ea2538966e" uid="22855">
+          <cr value="2210"/>
+        </specific>
+        <specific value="14" description="BTR-D Kliver turret / Kornet ATGM" status="new" uuid="60f2fe8e-6481-4a60-92c8-34756a0473f0" uid="22856">
+          <cr value="2210"/>
+        </specific>
+      </subcategory>
+      <subcategory value="12" description="BTR-70" uuid="d225906c-5269-11df-ac67-080069138b88" uid="12691">
+        <specific value="1" description="BTR-70" uuid="d226ae84-5269-11df-a652-080069138b88" uid="12692"/>
+        <specific value="2" description="BTR-70 M1986/1" uuid="d227baea-5269-11df-b559-080069138b88" uid="12693"/>
+        <specific value="3" description="BTR-70Kh chemical reconnaissance" uuid="d228ccdc-5269-11df-a6fd-080069138b88" uid="12694"/>
+        <specific value="4" description="BTR-70 w/ AGS-17" uuid="d229de4c-5269-11df-a020-080069138b88" uid="12695"/>
+        <specific value="5" description="SPR-2 (poss jammer)" uuid="d22aee04-5269-11df-aed9-080069138b88" uid="12696"/>
+        <specific value="6" description="BTR-70MS communications" uuid="d22bffce-5269-11df-8023-080069138b88" uid="12697"/>
+        <specific value="7" description="BTR-70KShM command/staff" uuid="d22d1170-5269-11df-b917-080069138b88" uid="12698"/>
+        <specific value="8" description="BTR-70 BREM repair" uuid="d22e2024-5269-11df-80f8-080069138b88" uid="12699"/>
+      </subcategory>
+      <subcategory value="13" description="BTR-80" uuid="d22fd1e4-5269-11df-b5e6-080069138b88" uid="12700">
+        <specific value="1" description="BTR-80" uuid="d230e278-5269-11df-89f4-080069138b88" uid="12701"/>
+        <specific value="2" description="BTR-80 M1981/1 command" uuid="d231f762-5269-11df-bba4-080069138b88" uid="12702"/>
+        <specific value="3" description="BTR-80 RKhM-4 chemical &amp; reconnaissance" uuid="d233033c-5269-11df-9c8a-080069138b88" uid="12703"/>
+        <specific value="4" description="BTR-80 UNSh" uuid="d2341614-5269-11df-8535-080069138b88" uid="12704"/>
+        <specific value="5" description="BMM-1 Ambulance" uuid="d2352b1c-5269-11df-9a00-080069138b88" uid="12705"/>
+        <specific value="6" description="BMM-2 Bn Aid Station" uuid="d23636f6-5269-11df-b5c6-080069138b88" uid="12706"/>
+        <specific value="7" description="BMM-3 Mobile Dressing Station" uuid="d237487a-5269-11df-af70-080069138b88" uid="12707"/>
+        <specific value="8" description="BTR-80A" uuid="d2386bf6-5269-11df-9b28-080069138b88" uid="12708"/>
+      </subcategory>
+      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="d23a1ed8-5269-11df-8fc0-080069138b88" uid="12709"/>
+      <subcategory value="15" description="BRDM-1 Reconnaissance vehicle" uuid="d23b30a2-5269-11df-a4bd-080069138b88" uid="12710">
+        <specific value="1" description="BRDM-1" uuid="d23c4348-5269-11df-bc25-080069138b88" uid="12711"/>
+        <specific value="2" description="BRDM-1-RKhb" uuid="d23d52d8-5269-11df-9d5f-080069138b88" uid="12712"/>
+        <specific value="3" description="BRDM-U" uuid="d23e61fa-5269-11df-8516-080069138b88" uid="12713"/>
+      </subcategory>
+      <subcategory value="16" description="BTR-90" uuid="d240128e-5269-11df-b590-080069138b88" uid="12714"/>
+      <subcategory value="17" description="GMZ TML" uuid="d2412282-5269-11df-b808-080069138b88" uid="12715">
+        <specific value="1" description="GMZ-3" uuid="d2423550-5269-11df-9d62-080069138b88" uid="12716"/>
+      </subcategory>
+      <subcategory value="18" description="MT-LBu Tracked Vehicle" uuid="d243eac6-5269-11df-be7a-080069138b88" uid="12717">
+        <specific value="1" description="Rangir (9S737) C3 Battery Command Post" uuid="d244ff56-5269-11df-8f59-080069138b88" uid="12718"/>
+        <specific value="2" description="R-330 B Jammer" uuid="d24615b2-5269-11df-86d1-080069138b88" uid="12719"/>
+        <specific value="3" description="MP22R (1V22R) Division AD" uuid="d2472628-5269-11df-bb3c-080069138b88" uid="12720"/>
+        <specific value="4" description="MP23R (1V23R) GCI C3" uuid="d24836da-5269-11df-9019-080069138b88" uid="12721"/>
+        <specific value="5" description="MP24R (1V24R) Artillery Control" uuid="d2494962-5269-11df-b5c4-080069138b88" uid="12722"/>
+        <specific value="6" description="MP25R (1V25R) Division AD" uuid="d24a5bfe-5269-11df-bcbd-080069138b88" uid="12723"/>
+        <specific value="7" description="9S80 MT-LBu with DOG EAR radar" uuid="d24b6d96-5269-11df-bd05-080069138b88" uid="12724"/>
+      </subcategory>
+      <subcategory value="19" description="PRP-3 with Small Fred radar" uuid="d24d2122-5269-11df-a389-080069138b88" uid="12725"/>
+      <subcategory value="20" description="PRP-4" uuid="d24e330a-5269-11df-8830-080069138b88" uid="12726"/>
+    </category>
+    <category value="3" description="Armored utility vehicle" uuid="d24fea42-5269-11df-aa66-080069138b88" uid="12727">
+      <subcategory value="1" description="BTS-2 medium armored tractor" uuid="d250fb1c-5269-11df-805d-080069138b88" uid="12728"/>
+      <subcategory value="2" description="MTP maintenance vehicle" uuid="d25208c2-5269-11df-b272-080069138b88" uid="12729"/>
+      <subcategory value="3" description="IMR combat engineer vehicle" uuid="d25322e8-5269-11df-b3f3-080069138b88" uid="12730">
+        <specific value="1" description="IMR-2 combat engineer vehicle" uuid="d2543688-5269-11df-8931-080069138b88" uid="12731"/>
+      </subcategory>
+      <subcategory value="4" description="IRM engineer reconnaissance vehicle" uuid="d255ea5a-5269-11df-b33d-080069138b88" uid="12732"/>
+      <subcategory value="5" description="BAT-2 combat engineer vehicle" uuid="d256f7ce-5269-11df-b1c8-080069138b88" uid="12733"/>
+      <subcategory value="6" description="MT-LB engineer vehicle" uuid="d2580cae-5269-11df-9e1a-080069138b88" uid="12734"/>
+      <subcategory value="7" description="BTU tank-mounted bulldozer" uuid="d2592378-5269-11df-a5c8-080069138b88" uid="12735"/>
+      <subcategory value="8" description="BTU-55 tank-mounted bulldozer" uuid="d25a306a-5269-11df-8e95-080069138b88" uid="12736"/>
+      <subcategory value="9" description="BREM-1 recovery and repair vehicle" uuid="d25b4266-5269-11df-bdff-080069138b88" uid="12737"/>
+      <subcategory value="10" description="M1977 armored recovery vehicle" uuid="d25c570a-5269-11df-966a-080069138b88" uid="12738"/>
+      <subcategory value="11" description="T-54-T armored recovery vehicle" uuid="d25d67bc-5269-11df-bbd0-080069138b88" uid="12739"/>
+      <subcategory value="12" description="T-55-T armored recovery vehicle" uuid="d25e7ad0-5269-11df-8ce9-080069138b88" uid="12740"/>
+      <subcategory value="13" description="T-55-TK armored recovery vehicle" uuid="d25f8d80-5269-11df-88fb-080069138b88" uid="12741"/>
+      <subcategory value="14" description="BTR-50PK(B) amphibious recovery vehicle" uuid="d2609b9e-5269-11df-a520-080069138b88" uid="12742"/>
+      <subcategory value="15" description="BREM-4 light recovery vehicle" uuid="d261b33a-5269-11df-a30e-080069138b88" uid="12743"/>
+      <subcategory value="16" description="MTP-LB technical support vehicle" uuid="d262c5cc-5269-11df-b579-080069138b88" uid="12744"/>
+      <subcategory value="17" description="GM-5951 w/ IL-220U CM/CB Radar" status="new" uuid="570e8335-5afd-41a9-b37d-0cf06a90c4b7" uid="22849">
+        <cr value="2178"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Self-propelled artillery" uuid="d2648150-5269-11df-9401-080069138b88" uid="12745">
+      <subcategory value="1" description="M-1973 152-mm gun (2S3) (SO-152)" uuid="d265923e-5269-11df-97c7-080069138b88" uid="12746"/>
+      <subcategory value="2" description="M-1974 122-mm Howitzer (2S1) (SO-122)" uuid="d266a66a-5269-11df-9a17-080069138b88" uid="12747"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d267baf0-5269-11df-a4dc-080069138b88" uid="12748"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d268cb20-5269-11df-929f-080069138b88" uid="12749"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="d269dd58-5269-11df-8ad5-080069138b88" uid="12750"/>
+      <subcategory value="6" description="Frog-3 rocket launcher" uuid="d26afb5c-5269-11df-9f6a-080069138b88" uid="12751"/>
+      <subcategory value="7" description="Frog-4 rocket launcher" uuid="d26c1258-5269-11df-ab5e-080069138b88" uid="12752"/>
+      <subcategory value="8" description="Frog-5 rocket launcher" uuid="d26d2512-5269-11df-8fa6-080069138b88" uid="12753"/>
+      <subcategory value="9" description="Frog-7 rocket launcher" uuid="d26e35ec-5269-11df-9e33-080069138b88" uid="12754"/>
+      <subcategory value="10" description="SS-1 Scud missile launcher" uuid="d26f4360-5269-11df-a0bb-080069138b88" uid="12755">
+        <specific value="1" description="Scud A" uuid="d27059b2-5269-11df-883e-080069138b88" uid="12756"/>
+        <specific value="2" description="Scud B" uuid="d27164b0-5269-11df-9261-080069138b88" uid="12757">
+          <extra value="1" description="TEL Decoy" uuid="d2727346-5269-11df-8c8e-080069138b88" uid="12758"/>
+        </specific>
+        <specific value="3" description="Scud C" uuid="d2742790-5269-11df-b9e8-080069138b88" uid="12759"/>
+      </subcategory>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="d275d810-5269-11df-92fd-080069138b88" uid="12760"/>
+      <subcategory value="12" description="BM-14-17 140-mm rocket launcher" uuid="d276ecf0-5269-11df-a6b8-080069138b88" uid="12761"/>
+      <subcategory value="13" description="BM-21 122-mm rocket launcher" uuid="d277ff96-5269-11df-bd4c-080069138b88" uid="12762"/>
+      <subcategory value="14" description="M-1975 120-mm rocket launcher" uuid="d2791048-5269-11df-a8e4-080069138b88" uid="12763"/>
+      <subcategory value="15" description="BM-24 240-mm rocket launcher" uuid="d27a22da-5269-11df-9bdc-080069138b88" uid="12764"/>
+      <subcategory value="16" description="BM-25 250-mm rocket launcher" uuid="d27b363e-5269-11df-8cfd-080069138b88" uid="12765"/>
+      <subcategory value="17" description="GMZ TML" deprecated="1" uuid="d27c4506-5269-11df-91d9-080069138b88" uid="12766"/>
+      <subcategory value="18" description="ZSU-23/4 Quad 23-mm AAA" deprecated="1" uuid="d27d573e-5269-11df-8ef0-080069138b88" uid="12767"/>
+      <subcategory value="19" description="SA-6 SAM" deprecated="1" uuid="d27e6c78-5269-11df-b1df-080069138b88" uid="12768">
+        <specific value="1" description="SA-6A" deprecated="1" uuid="d27f78de-5269-11df-93f7-080069138b88" uid="12769"/>
+        <specific value="2" description="SA-6B" deprecated="1" uuid="d28089a4-5269-11df-917e-080069138b88" uid="12770"/>
+      </subcategory>
+      <subcategory value="20" description="SA-9 SAM" deprecated="1" uuid="d2824064-5269-11df-965d-080069138b88" uid="12771"/>
+      <subcategory value="21" description="SA-13 SAM" deprecated="1" uuid="d2835bc0-5269-11df-af60-080069138b88" uid="12772">
+        <specific value="1" description="Strela-10M2" deprecated="1" uuid="d2846c90-5269-11df-838c-080069138b88" uid="12773"/>
+        <specific value="2" description="Strela-10M3" deprecated="1" uuid="d2857d74-5269-11df-b83f-080069138b88" uid="12774"/>
+      </subcategory>
+      <subcategory value="22" description="2S6 Quad 30-mm/SA‑19 AD system" deprecated="1" uuid="d2873254-5269-11df-9f3a-080069138b88" uid="12775"/>
+      <subcategory value="23" description="2S4 M-1975 240-mm mortar" uuid="d2884a22-5269-11df-8a69-080069138b88" uid="12776"/>
+      <subcategory value="24" description="2S7 M-1975 203-mm gun" uuid="d2895728-5269-11df-ac4a-080069138b88" uid="12777"/>
+      <subcategory value="25" description="M-1976 152-mm gun (2S5)(MSTA-B)" uuid="d28a6a6e-5269-11df-988c-080069138b88" uid="12778"/>
+      <subcategory value="26" description="152-mm 2S19 (aka MSTA-S)" uuid="d28b7c4c-5269-11df-8084-080069138b88" uid="12779"/>
+      <subcategory value="27" description="120-mm Howitzer/mortar (2S9) (SO-120)" uuid="d28c8cea-5269-11df-9a1b-080069138b88" uid="12780"/>
+      <subcategory value="28" description="120-mm Howitzer/mortar (2S23)" uuid="d28da206-5269-11df-8031-080069138b88" uid="12781"/>
+      <subcategory value="29" description="300-mm BM-30 14/12-round multiple rocket systems (9A52 Smerch)" uuid="d28eb650-5269-11df-85a7-080069138b88" uid="12782"/>
+      <subcategory value="30" description="220-mm BM-22 16-round multiple rocket system (M1977 Uragan)" uuid="d28fca04-5269-11df-b532-080069138b88" uid="12783"/>
+      <subcategory value="31" description="200-mm 4-round BMD-20 multiple rocket system" uuid="d290dfa2-5269-11df-8a8b-080069138b88" uid="12784"/>
+      <subcategory value="32" description="140-mm 16‑round RPU‑14 multiple rocket system" deprecated="1" uuid="d291f4f0-5269-11df-9468-080069138b88" uid="12785"/>
+      <subcategory value="33" description="(deprecated)" deprecated="1" uuid="d2930502-5269-11df-98a0-080069138b88" uid="12786"/>
+      <subcategory value="34" description="ZSU‑57‑2 twin 57-mm anti‑aircraft gun system" deprecated="1" uuid="d29416d6-5269-11df-818e-080069138b88" uid="12787"/>
+      <subcategory value="35" description="BTR-40A w/ ZTPU‑2 mount" deprecated="1" uuid="d2952f58-5269-11df-af08-080069138b88" uid="12788"/>
+      <subcategory value="36" description="BTR-152A w/ ZTPU‑2 mount" deprecated="1" uuid="d2963dc6-5269-11df-b137-080069138b88" uid="12789"/>
+      <subcategory value="37" description="BTR‑152D w/ twin 14.5-mm ZPU‑2 mount" deprecated="1" uuid="d29751a2-5269-11df-a551-080069138b88" uid="12790"/>
+      <subcategory value="38" description="BTR‑152 w/ twin 23-mm ZU‑23" deprecated="1" uuid="d29868bc-5269-11df-972f-080069138b88" uid="12791"/>
+      <subcategory value="39" description="BTR‑152 with M53 MGs" deprecated="1" uuid="d299769e-5269-11df-891b-080069138b88" uid="12792"/>
+      <subcategory value="40" description="SA‑4  Ganef SAM" deprecated="1" uuid="d29a89d0-5269-11df-9c26-080069138b88" uid="12793"/>
+      <subcategory value="41" description="SA‑8 Gecko SAM" deprecated="1" uuid="d29b9e7e-5269-11df-b3d4-080069138b88" uid="12794">
+        <specific value="1" description="SA-8" deprecated="1" uuid="d29caab2-5269-11df-ab49-080069138b88" uid="12795"/>
+        <specific value="2" description="SA-8A" deprecated="1" uuid="d29dc05a-5269-11df-ae5f-080069138b88" uid="12796"/>
+        <specific value="3" description="SA-8B" deprecated="1" uuid="d29ed2b0-5269-11df-829d-080069138b88" uid="12797"/>
+      </subcategory>
+      <subcategory value="42" description="SA‑10B Mod 1 Grumble SAM" deprecated="1" uuid="d2a08a2e-5269-11df-8843-080069138b88" uid="12798"/>
+      <subcategory value="43" description="SA‑11 Gadfly SAM" deprecated="1" uuid="d2a1a12a-5269-11df-811d-080069138b88" uid="12799"/>
+      <subcategory value="44" description="SA‑12A Gladiator SAM" deprecated="1" uuid="d2a2b3d0-5269-11df-baa0-080069138b88" uid="12800"/>
+      <subcategory value="45" description="(deprecated)" deprecated="1" uuid="d2a3cb26-5269-11df-a34c-080069138b88" uid="12801"/>
+      <subcategory value="46" description="SA‑X‑12B Giant SAM" deprecated="1" uuid="d2a4d84a-5269-11df-8c07-080069138b88" uid="12802"/>
+      <subcategory value="47" description="SA‑X‑12B SAM (rail w/ SS-24)" deprecated="1" uuid="d2a5eb68-5269-11df-82b1-080069138b88" uid="12803"/>
+      <subcategory value="48" description="SA‑15 Gauntlet SAM" deprecated="1" uuid="d2a702f0-5269-11df-8972-080069138b88" uid="12804"/>
+      <subcategory value="49" description="SA‑X‑17 SAM (replaces SA-11)" deprecated="1" uuid="d2a8105a-5269-11df-b569-080069138b88" uid="12805"/>
+      <subcategory value="50" description="(deprecated)" deprecated="1" uuid="d2a9242c-5269-11df-ac76-080069138b88" uid="12806"/>
+      <subcategory value="51" description="SS-21" uuid="d2aa3948-5269-11df-97f6-080069138b88" uid="12807"/>
+      <subcategory value="52" description="2S31 120-mm Combination Gun" uuid="d2ab4324-5269-11df-b219-080069138b88" uid="12808"/>
+      <subcategory value="53" description="9A51 Prima, 122-mm MRL, 50 tube" uuid="d2ac59e4-5269-11df-a565-080069138b88" uid="12809"/>
+    </category>
+    <category value="5" description="Towed artillery" uuid="d2ae0df2-5269-11df-84c1-080069138b88" uid="12810">
+      <subcategory value="1" description="S-23 180-mm field gun" uuid="d2af1ecc-5269-11df-9e1b-080069138b88" uid="12811"/>
+      <subcategory value="2" description="2A36 (M1976) 152-mm field gun" uuid="d2b02a88-5269-11df-b517-080069138b88" uid="12812"/>
+      <subcategory value="3" description="D-20 152-mm gun-Howitzer" uuid="d2b1404e-5269-11df-bdd0-080069138b88" uid="12813"/>
+      <subcategory value="4" description="D-30 122-mm gun-Howitzer" uuid="d2b2522c-5269-11df-8154-080069138b88" uid="12814"/>
+      <subcategory value="5" description="M-46 130-mm field gun" uuid="d2b35f46-5269-11df-9409-080069138b88" uid="12815"/>
+      <subcategory value="6" description="D-30 field Howitzer" uuid="d2b47430-5269-11df-bc62-080069138b88" uid="12816"/>
+      <subcategory value="7" description="T-12/MT-12 100-mm antitank gun" uuid="d2b5858c-5269-11df-a097-080069138b88" uid="12817"/>
+      <subcategory value="8" description="SD-44 gun" uuid="d2b69238-5269-11df-a33e-080069138b88" uid="12818">
+        <specific value="1" description="SD-44 85-mm auxiliary-propelled field gun" uuid="d2b7a47a-5269-11df-88e5-080069138b88" uid="12819"/>
+      </subcategory>
+      <subcategory value="9" description="M-1966 76.2-mm mountain gun" uuid="d2b95964-5269-11df-a46a-080069138b88" uid="12820"/>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="d2ba69bc-5269-11df-b59d-080069138b88" uid="12821"/>
+      <subcategory value="11" description="M-240 (aka M1953 or M53) 240-mm mortar" uuid="d2bb773a-5269-11df-b414-080069138b88" uid="12822"/>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="d2bc8e72-5269-11df-9eb0-080069138b88" uid="12823"/>
+      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="d2bda00a-5269-11df-a83d-080069138b88" uid="12824"/>
+      <subcategory value="14" description="2A65 (M1987) 152-mm gun/Howitzer" uuid="d2bead4c-5269-11df-9445-080069138b88" uid="12825"/>
+      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="d2bfcb50-5269-11df-b9f2-080069138b88" uid="12826"/>
+      <subcategory value="16" description="M1943 (D-1) 152-mm Howitzer" uuid="d2c0df86-5269-11df-8b3a-080069138b88" uid="12827"/>
+      <subcategory value="17" description="M1937 (ML-20) 152-mm gun/Howitzer" uuid="d2c1eb74-5269-11df-a5f2-080069138b88" uid="12828"/>
+      <subcategory value="18" description="(deprecated)" deprecated="1" uuid="d2c2ff50-5269-11df-9c06-080069138b88" uid="12829"/>
+      <subcategory value="19" description="D-74 122-mm field gun" uuid="d2c415d4-5269-11df-b54f-080069138b88" uid="12830"/>
+      <subcategory value="20" description="(deprecated)" deprecated="1" uuid="d2c523d4-5269-11df-8e3b-080069138b88" uid="12831"/>
+      <subcategory value="21" description="M1938 (M-30) 122-mm Howitzer" uuid="d2c6363e-5269-11df-b265-080069138b88" uid="12832"/>
+      <subcategory value="22" description="2B16 120-mm combination gun" uuid="d2c74920-5269-11df-b7d8-080069138b88" uid="12833"/>
+      <subcategory value="23" description="M1944 (BS-3) 100-mm field gun" uuid="d2c85b44-5269-11df-9301-080069138b88" uid="12834"/>
+      <subcategory value="24" description="D-48 85-mm antitank gun" uuid="d2c96ed0-5269-11df-aedc-080069138b88" uid="12835"/>
+      <subcategory value="25" description="M-1945 (D-44) 85-mm antitank gun" uuid="d2ca8090-5269-11df-89c0-080069138b88" uid="12836"/>
+      <subcategory value="26" description="Vasilyek 82-mm automatic mortar" deprecated="1" uuid="d2cb8e0e-5269-11df-9712-080069138b88" uid="12837"/>
+      <subcategory value="27" description="M1942 (ZIS-3) 76-mm divisional gun" uuid="d2cca424-5269-11df-b331-080069138b88" uid="12838"/>
+      <subcategory value="28" description="SM-4-1 130-mm coastal gun" uuid="d2cdbb70-5269-11df-9673-080069138b88" uid="12839"/>
+      <subcategory value="29" description="SPG-9 73-mm recoilless gun" uuid="d2cec790-5269-11df-b21e-080069138b88" uid="12840"/>
+      <subcategory value="30" description="B-10 82-mm recoilless gun" uuid="d2cfd9aa-5269-11df-8d3e-080069138b88" uid="12841"/>
+      <subcategory value="31" description="B-11 107-mm recoilless gun" uuid="d2d0f236-5269-11df-8f34-080069138b88" uid="12842"/>
+      <subcategory value="32" description="KS‑30 130-mm AA gun" deprecated="1" uuid="d2d206bc-5269-11df-b9da-080069138b88" uid="12843"/>
+      <subcategory value="33" description="KS‑19 100-mm AA gun" deprecated="1" uuid="d2d31ac0-5269-11df-b138-080069138b88" uid="12844"/>
+      <subcategory value="34" description="S‑60 57-mm AAA gun" deprecated="1" uuid="d2d42d2a-5269-11df-841d-080069138b88" uid="12845"/>
+      <subcategory value="35" description="M1939 37-mm AAA gun" deprecated="1" uuid="d2d53ba2-5269-11df-bf41-080069138b88" uid="12846"/>
+      <subcategory value="36" description="ZU‑23 twin 23-mm AAA gun" deprecated="1" uuid="d2d65366-5269-11df-aca5-080069138b88" uid="12847"/>
+      <subcategory value="37" description="14.5-mm ZPU AA MG" deprecated="1" uuid="d2d768dc-5269-11df-8a7b-080069138b88" uid="12848">
+        <specific value="1" description="ZPU‑1" deprecated="1" uuid="d2d87560-5269-11df-9bdd-080069138b88" uid="12849"/>
+        <specific value="2" description="ZPU‑2" deprecated="1" uuid="d2d98ad6-5269-11df-a970-080069138b88" uid="12850"/>
+        <specific value="3" description="ZPU‑3" deprecated="1" uuid="d2da9c3c-5269-11df-a46d-080069138b88" uid="12851"/>
+      </subcategory>
+      <subcategory value="38" description="125-mm AT Gun 2A45M" uuid="d2dc4e74-5269-11df-83df-080069138b88" uid="12852"/>
+      <subcategory value="39" description="140-mm 16-round RPU-14 multiple rocket system" uuid="d2dd5da0-5269-11df-82b8-080069138b88" uid="12853"/>
+    </category>
+    <category value="6" description="Small wheeled utility vehicle" uuid="d2df18d4-5269-11df-b3bd-080069138b88" uid="12854">
+      <subcategory value="1" description="GAZ-69 4x4 light vehicle" uuid="d2e02cf6-5269-11df-8520-080069138b88" uid="12855">
+        <specific value="1" description="Command vehicle" uuid="d2e14352-5269-11df-a3e4-080069138b88" uid="12856"/>
+      </subcategory>
+      <subcategory value="2" description="UAZ-469B 4x4 600-kg light vehicle" uuid="d2e2f30a-5269-11df-8687-080069138b88" uid="12857">
+        <specific value="1" description="Mine detecting system, DIM, on UAZ-469" uuid="d2e4007e-5269-11df-b5e2-080069138b88" uid="12858"/>
+      </subcategory>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d2e5b81a-5269-11df-b74c-080069138b88" uid="12859"/>
+      <subcategory value="4" description="LuAZ-967M amphibious battlefield support vehicle" uuid="d2e6cb06-5269-11df-9d02-080069138b88" uid="12860"/>
+      <subcategory value="5" description="LuAZ-969 4x4 light vehicle" uuid="d2e7deec-5269-11df-9ce1-080069138b88" uid="12861"/>
+      <subcategory value="6" description="GAZ-69A 4x4 light vehicle" uuid="d2e8eae4-5269-11df-ae2b-080069138b88" uid="12862"/>
+      <subcategory value="7" description="UAZ-452D 4x4 800-kg light vehicle" uuid="d2ea005a-5269-11df-8db4-080069138b88" uid="12863">
+        <specific value="1" description="Ambulance" uuid="d2eb1314-5269-11df-a890-080069138b88" uid="12864"/>
+      </subcategory>
+      <subcategory value="8" description="Motorcycles" uuid="d2ecc542-5269-11df-b418-080069138b88" uid="12865">
+        <specific value="1" description="IMZ-8" uuid="d2edce06-5269-11df-8d2b-080069138b88" uid="12866"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Large wheeled utility vehicle" uuid="d2f028f4-5269-11df-942b-080069138b88" uid="12867">
+      <subcategory value="1" description="PZM-2 regimental trench-digging machine" uuid="d2f13910-5269-11df-8189-080069138b88" uid="12868"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d2f24cc4-5269-11df-bf4f-080069138b88" uid="12869"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d2f35f38-5269-11df-b22d-080069138b88" uid="12870"/>
+      <subcategory value="4" description="ZIL-131 6x6 3500-kg truck" uuid="d2f46e32-5269-11df-8797-080069138b88" uid="12871">
+        <specific value="1" description="Missile fuel truck" uuid="d2f57fe8-5269-11df-855a-080069138b88" uid="12872"/>
+        <specific value="2" description="Calibration vehicle" uuid="d2f69018-5269-11df-a4dc-080069138b88" uid="12873"/>
+        <specific value="3" description="Fuel tanker" uuid="d2f79b98-5269-11df-81aa-080069138b88" uid="12874"/>
+        <specific value="4" description="Compressor Truck" uuid="d2f8ae66-5269-11df-9a1e-080069138b88" uid="12875"/>
+        <specific value="5" description="Firing Truck" uuid="d2f9bf2c-5269-11df-85e0-080069138b88" uid="12876"/>
+        <specific value="6" description="Special Fuel Truck" uuid="d2facb06-5269-11df-8a99-080069138b88" uid="12877"/>
+        <specific value="7" description="Autonomous Test Truck" uuid="d2fbdf5a-5269-11df-9866-080069138b88" uid="12878"/>
+        <specific value="8" description="Oxidizer Truck" uuid="d2fcf0b6-5269-11df-9b94-080069138b88" uid="12879"/>
+        <specific value="9" description="Transporter Truck" uuid="d2fe0500-5269-11df-a3c1-080069138b88" uid="12880"/>
+      </subcategory>
+      <subcategory value="5" description="ZIL-151 6x6 2500-kg truck" uuid="d2ffb99a-5269-11df-97ee-080069138b88" uid="12881"/>
+      <subcategory value="6" description="ZIL-157 6x6 2500-kg truck" uuid="d300cc7c-5269-11df-bf2c-080069138b88" uid="12882"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d301de8c-5269-11df-8cdc-080069138b88" uid="12883"/>
+      <subcategory value="8" description="GAZ-66 4x4 2000-kg truck" uuid="d302ef98-5269-11df-bc4f-080069138b88" uid="12884">
+        <specific value="1" description="GAZ-66 Signals van" uuid="d304019e-5269-11df-9f48-080069138b88" uid="12885"/>
+        <specific value="2" description="GAZ-66 Command van" uuid="d30512b4-5269-11df-8e03-080069138b88" uid="12886"/>
+        <specific value="3" description="DKV Decon truck" uuid="d3061d62-5269-11df-b6bb-080069138b88" uid="12887"/>
+        <specific value="4" description="ACRV, 1V110" uuid="d3072f72-5269-11df-a69a-080069138b88" uid="12888"/>
+        <specific value="5" description="TDA-M Smoke" uuid="d3084402-5269-11df-a7ee-080069138b88" uid="12889"/>
+      </subcategory>
+      <subcategory value="9" description="Ural-375 6x6 4000-kg truck" uuid="d309f3d8-5269-11df-b4d9-080069138b88" uid="12890">
+        <specific value="1" description="Field artillery support" uuid="d30b0156-5269-11df-99d9-080069138b88" uid="12891"/>
+        <specific value="2" description="URAL-375D van" uuid="d30c1690-5269-11df-a47f-080069138b88" uid="12892"/>
+        <specific value="3" description="URAL-375D hospital van" uuid="d30d2742-5269-11df-b42f-080069138b88" uid="12893"/>
+        <specific value="4" description="1V111 URAL-375-D FDC" uuid="d30e324a-5269-11df-b25f-080069138b88" uid="12894"/>
+        <specific value="5" description="URAL-375D maintenance van" uuid="d30f46da-5269-11df-bbc4-080069138b88" uid="12895"/>
+        <specific value="6" description="URAL-375 tranker truck" uuid="d310587c-5269-11df-9577-080069138b88" uid="12896"/>
+        <specific value="7" description="MAF-S water purification truck" uuid="d31164ce-5269-11df-b8e2-080069138b88" uid="12897"/>
+        <specific value="8" description="URAL-375D meteorological van" uuid="d31275c6-5269-11df-ba99-080069138b88" uid="12898"/>
+        <specific value="9" description="URAL-375 propellant tanker" uuid="d3138b28-5269-11df-88d2-080069138b88" uid="12899"/>
+        <specific value="10" description="URAL-375 oxidizer tanker" uuid="d3149784-5269-11df-95e5-080069138b88" uid="12900"/>
+        <specific value="11" description="TMS-65 Decontamination truck" status="new" uuid="1ce6b8e7-0f12-49fe-bff7-d1e8f4731582" uid="22795">
+          <cr value="1636"/>
+        </specific>
+      </subcategory>
+      <subcategory value="10" description="KamAZ-4310" uuid="d3164b2e-5269-11df-92fe-080069138b88" uid="12901"/>
+      <subcategory value="11" description="Ural-4320 6x6 4500-kg trucks" uuid="d3175be0-5269-11df-97f2-080069138b88" uid="12902"/>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="d3186fb2-5269-11df-be3a-080069138b88" uid="12903"/>
+      <subcategory value="13" description="KrAZ-255B 6x6 7500-kg truck" uuid="d3197cf4-5269-11df-85a2-080069138b88" uid="12904">
+        <specific value="1" description="Fuel service" uuid="d31a9238-5269-11df-9058-080069138b88" uid="12905"/>
+        <specific value="2" description="Aviation fuel support" uuid="d31bb078-5269-11df-b85f-080069138b88" uid="12906"/>
+        <specific value="3" description="KrAZ-255 Computer Van" uuid="d31cbdce-5269-11df-90a4-080069138b88" uid="12907"/>
+        <specific value="4" description="KrAZ-255 Crane Truck" uuid="d31dd06a-5269-11df-97b1-080069138b88" uid="12908"/>
+        <specific value="5" description="KrAZ-255 Dump truck" uuid="d31ee5cc-5269-11df-8535-080069138b88" uid="12909"/>
+      </subcategory>
+      <subcategory value="14" description="Ural-375D 6x6 recovery vehicle" uuid="d320976e-5269-11df-8761-080069138b88" uid="12910">
+        <specific value="1" description="Crane/wrecker" uuid="d321a3a2-5269-11df-b6e8-080069138b88" uid="12911"/>
+      </subcategory>
+      <subcategory value="15" description="Ural-4320 6x6 recovery vehicle" uuid="d32358d2-5269-11df-a0ce-080069138b88" uid="12912"/>
+      <subcategory value="16" description="KET-L 6x6 recovery truck" uuid="d3246ae2-5269-11df-93c9-080069138b88" uid="12913"/>
+      <subcategory value="17" description="GAZ-53 4x2 3000-kg truck" uuid="d3257d92-5269-11df-a456-080069138b88" uid="12914"/>
+      <subcategory value="18" description="Ural-377 6x4 7500-kg truck" uuid="d3268c50-5269-11df-916b-080069138b88" uid="12915"/>
+      <subcategory value="19" description="ZIL-133 6x4 8000 kg-truck" uuid="d3279e60-5269-11df-b2a6-080069138b88" uid="12916"/>
+      <subcategory value="20" description="YaAZ-214 6x6 7000-kg truck" uuid="d328b1e2-5269-11df-a7c5-080069138b88" uid="12917"/>
+      <subcategory value="21" description="KrAZ-214 6x6 7000-kg truck" uuid="d329c104-5269-11df-8a9c-080069138b88" uid="12918"/>
+      <subcategory value="22" description="KrAZ-206V 6x6 tractor truck" uuid="d32ad378-5269-11df-a6de-080069138b88" uid="12919"/>
+      <subcategory value="23" description="KamAZ-5320 6x4 8000-kg truck" uuid="d32bea42-5269-11df-8e08-080069138b88" uid="12920"/>
+      <subcategory value="24" description="KrAZ-260 6x6 9000-kg truck" uuid="d32cf766-5269-11df-8120-080069138b88" uid="12921"/>
+      <subcategory value="25" description="KrAZ-240 6x6 9000-kg truck" uuid="d32e0912-5269-11df-8456-080069138b88" uid="12922"/>
+      <subcategory value="26" description="Ural-5323 8x8 9000-kg truck" uuid="d32f1e06-5269-11df-bf76-080069138b88" uid="12923"/>
+      <subcategory value="27" description="KrAZ-257 6x4 12000-kg truck" uuid="d3302ada-5269-11df-bd5d-080069138b88" uid="12924"/>
+      <subcategory value="28" description="ZIL-135 series 8x8 truck" uuid="d3313e8e-5269-11df-915b-080069138b88" uid="12925"/>
+      <subcategory value="29" description="MAZ-543 8x8 truck" uuid="d33251de-5269-11df-b859-080069138b88" uid="12926"/>
+      <subcategory value="30" description="BAZ-5937 6x6 special purpose vehicle" uuid="d3335dc2-5269-11df-aa1d-080069138b88" uid="12927"/>
+      <subcategory value="31" description="BAZ-5939 6x6 special purpose vehicle" uuid="d33474f0-5269-11df-b262-080069138b88" uid="12928"/>
+      <subcategory value="32" description="MAZ-535 and MAZ-537 8x8 series" uuid="d33588ae-5269-11df-b5f7-080069138b88" uid="12929"/>
+      <subcategory value="33" description="TMK-2 trench-digging machine" uuid="d3369794-5269-11df-b96a-080069138b88" uid="12930"/>
+      <subcategory value="34" description="PZM regimental trench-digging machine" uuid="d337ad64-5269-11df-9d7d-080069138b88" uid="12931"/>
+      <subcategory value="35" description="OPS mobile water-desalination plant" uuid="d338bff6-5269-11df-a667-080069138b88" uid="12932"/>
+      <subcategory value="36" description="POU mobile water-desalination plant" uuid="d339cfb8-5269-11df-82ed-080069138b88" uid="12933"/>
+      <subcategory value="37" description="LBU-200 mobile well-drilling equipment" uuid="d33aef88-5269-11df-855a-080069138b88" uid="12934"/>
+    </category>
+    <category value="8" description="Small tracked utility vehicle" uuid="d33ca4ae-5269-11df-b401-080069138b88" uid="12935">
+      <subcategory value="1" description="AT-L light artillery tractor" uuid="d33db5f6-5269-11df-aeb8-080069138b88" uid="12936">
+        <specific value="1" description="AT-L w/ Pork Trough GSR" status="new" uuid="7f6628b0-95c0-4125-842b-c7b01e198609" uid="22846">
+          <cr value="2178"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="AT-LM light artillery tractor" uuid="d33eca90-5269-11df-9928-080069138b88" uid="12937"/>
+      <subcategory value="3" description="ATS-59G medium artillery tractor" uuid="d33fdc64-5269-11df-9ae7-080069138b88" uid="12938"/>
+      <subcategory value="4" description="ATS-59 medium artillery tractor" uuid="d340effa-5269-11df-bc53-080069138b88" uid="12939"/>
+      <subcategory value="5" description="MT-S medium transporter" uuid="d342011a-5269-11df-81bc-080069138b88" uid="12940"/>
+      <subcategory value="6" description="GT-SM amphibious over-snow vehicle" uuid="d343137a-5269-11df-83a7-080069138b88" uid="12941"/>
+      <subcategory value="7" description="GT-T amphibious over-snow vehicle" uuid="d34427e2-5269-11df-b0af-080069138b88" uid="12942"/>
+      <subcategory value="8" description="MT-L amphibious over-snow vehicle" uuid="d3453ba0-5269-11df-995c-080069138b88" uid="12943"/>
+    </category>
+    <category value="9" description="Large tracked utility vehicle" uuid="d346efae-5269-11df-b923-080069138b88" uid="12944">
+      <subcategory value="1" description="PTS amphibious transport" uuid="d347fb9c-5269-11df-bb26-080069138b88" uid="12945"/>
+      <subcategory value="2" description="PTS-M amphibious vehicle" uuid="d3490f96-5269-11df-a1f6-080069138b88" uid="12946"/>
+      <subcategory value="3" description="PTS-2 amphibious vehicle" uuid="d34a269c-5269-11df-a9e2-080069138b88" uid="12947"/>
+      <subcategory value="4" description="MTK-2 armored mineclearing vehicle" uuid="d34b31a4-5269-11df-b247-080069138b88" uid="12948"/>
+      <subcategory value="5" description="AT-T heavy artillery tractor" uuid="d34c44cc-5269-11df-8e80-080069138b88" uid="12949"/>
+      <subcategory value="6" description="MT-T heavy transporter" uuid="d34d5b96-5269-11df-bb66-080069138b88" uid="12950"/>
+      <subcategory value="7" description="GM-569 tractor" uuid="d34e67ac-5269-11df-93c0-080069138b88" uid="12951"/>
+      <subcategory value="8" description="BTM high-speed ditching machine" uuid="d34f7822-5269-11df-b4a0-080069138b88" uid="12952"/>
+      <subcategory value="9" description="BTM-3 high-speed ditching machine" uuid="d3508b72-5269-11df-b24d-080069138b88" uid="12953"/>
+      <subcategory value="10" description="BTM-TMG high-speed ditching machine" uuid="d351a890-5269-11df-aaa3-080069138b88" uid="12954"/>
+      <subcategory value="11" description="BTM-TMG2S high-speed ditching machine" uuid="d352bbe0-5269-11df-b514-080069138b88" uid="12955"/>
+      <subcategory value="12" description="MDK-2 trench-digging machine" uuid="d353cf6c-5269-11df-bfc5-080069138b88" uid="12956"/>
+      <subcategory value="13" description="MDK-2M trench-digging machine" uuid="d354e03c-5269-11df-8d0d-080069138b88" uid="12957"/>
+      <subcategory value="14" description="MDK-3 trench-digging machine" uuid="d355f29c-5269-11df-94de-080069138b88" uid="12958"/>
+      <subcategory value="15" description="BAT-1 high-speed tractor-mounted bulldozer" uuid="d35706f0-5269-11df-9f34-080069138b88" uid="12959"/>
+      <subcategory value="16" description="BAT-M high-speed tractor-mounted bulldozer" uuid="d3581626-5269-11df-8a6d-080069138b88" uid="12960"/>
+      <subcategory value="17" description="OLT high-speed tractor-mounted bulldozer" uuid="d359334e-5269-11df-a4ef-080069138b88" uid="12961"/>
+      <subcategory value="18" description="OST high-speed tractor-mounted bulldozer" uuid="d35a4bb2-5269-11df-bc2e-080069138b88" uid="12962"/>
+      <subcategory value="19" description="OTT high-speed tractor-mounted bulldozer" uuid="d35b599e-5269-11df-a0f4-080069138b88" uid="12963"/>
+      <subcategory value="20" description="GMZ Mine Layer" deprecated="1" uuid="d35c6d48-5269-11df-897b-080069138b88" uid="12964"/>
+      <subcategory value="21" description="PMR Minelayer" uuid="d35d8192-5269-11df-8388-080069138b88" uid="12965"/>
+      <subcategory value="22" description="AT-S Medium Tractor" uuid="d35e8cd6-5269-11df-b637-080069138b88" uid="12966"/>
+      <subcategory value="23" description="K-61 Amphibious" uuid="d35f9f04-5269-11df-ae56-080069138b88" uid="12967"/>
+    </category>
+    <category value="10" description="Mortar" uuid="d3614f8e-5269-11df-88d9-080069138b88" uid="12968">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d36261c6-5269-11df-b137-080069138b88" uid="12969"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d36371d8-5269-11df-bf09-080069138b88" uid="12970"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d3651f24-5269-11df-8fef-080069138b88" uid="12971"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d3663896-5269-11df-bed9-080069138b88" uid="12972"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="d3674d08-5269-11df-b26c-080069138b88" uid="12973"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="d3685e3c-5269-11df-996c-080069138b88" uid="12974"/>
+      <subcategory value="7" description="M-36 82-mm" uuid="d369e298-5269-11df-b68d-080069138b88" uid="12975"/>
+      <subcategory value="8" description="M-37 82-mm" uuid="d36b1136-5269-11df-8645-080069138b88" uid="12976"/>
+      <subcategory value="9" description="M-37 82-mm &quot;new&quot;" uuid="d36c251c-5269-11df-98be-080069138b88" uid="12977"/>
+      <subcategory value="10" description="M-41 82-mm" uuid="d399d5c0-5269-11df-9f65-080069138b88" uid="12978"/>
+      <subcategory value="11" description="AM 2B9 &quot;Vasilek&quot; 82-mm automatic" uuid="d39aec76-5269-11df-b22f-080069138b88" uid="12979"/>
+      <subcategory value="12" description="M-38 107-mm" uuid="d39bfa9e-5269-11df-905a-080069138b88" uid="12980"/>
+      <subcategory value="13" description="2S12 120-mm" uuid="d39d2496-5269-11df-a82d-080069138b88" uid="12981"/>
+      <subcategory value="15" description="120mm Mortar M1943" uuid="d39e3700-5269-11df-84b0-080069138b88" uid="12982"/>
+    </category>
+    <category value="11" description="Mine plow" uuid="d39feb9a-5269-11df-9af7-080069138b88" uid="12983">
+      <subcategory value="1" description="KMT-5M" uuid="d3a0f576-5269-11df-b861-080069138b88" uid="12984"/>
+    </category>
+    <category value="12" description="Mine rake" uuid="d3a41fa8-5269-11df-add7-080069138b88" uid="12985"/>
+    <category value="13" description="Mine roller" uuid="d3a56df4-5269-11df-8a8c-080069138b88" uid="12986"/>
+    <category value="14" description="Cargo trailer" uuid="d3a679ce-5269-11df-9a4d-080069138b88" uid="12987">
+      <subcategory value="1" description="0 - 0.5 ton" uuid="d3a78c9c-5269-11df-911b-080069138b88" uid="12988">
+        <specific value="1" description="Trailer, cargo, 1 axle, 0.5 ton, GAZ-704" uuid="d3a8b810-5269-11df-a331-080069138b88" uid="12989"/>
+      </subcategory>
+      <subcategory value="2" description="0.51 - 2 ton" uuid="d3aa6c46-5269-11df-b508-080069138b88" uid="12990"/>
+      <subcategory value="3" description="2.01 - 5 ton" uuid="d3ab7708-5269-11df-aa4e-080069138b88" uid="12991">
+        <specific value="1" description="Trailer, cargo, 2 axle, 4 ton, SMZ-710Z" uuid="d3ad0884-5269-11df-9ebe-080069138b88" uid="12992"/>
+        <specific value="2" description="Amphibious trailer PKP" uuid="d3ae1b7a-5269-11df-b234-080069138b88" uid="12993"/>
+      </subcategory>
+      <subcategory value="4" description="5.02 - 10 ton" uuid="d3afcfb0-5269-11df-b79c-080069138b88" uid="12994"/>
+      <subcategory value="5" description="greater than 10 tons" uuid="d3b0ef94-5269-11df-8754-080069138b88" uid="12995"/>
+    </category>
+    <category value="15" description="Fuel trailer" uuid="d3b2d552-5269-11df-9b8e-080069138b88" uid="12996">
+      <subcategory value="1" description="1-1000 gallons" uuid="d3b3e744-5269-11df-99ee-080069138b88" uid="12997">
+        <specific value="1" description="MNUM-50M" uuid="d3b4f7c4-5269-11df-a4c3-080069138b88" uid="12998"/>
+      </subcategory>
+      <subcategory value="2" description="1001 - 5000 gallons" uuid="d3b6b2bc-5269-11df-b2c8-080069138b88" uid="12999">
+        <specific value="1" description="PTs-4.2-754V, 4200 liter trailer" uuid="d3b7befa-5269-11df-98c3-080069138b88" uid="13000"/>
+      </subcategory>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="d3b978bc-5269-11df-ab50-080069138b88" uid="13001"/>
+    </category>
+    <category value="16" description="Generator trailer" uuid="d3bb6e60-5269-11df-b2b3-080069138b88" uid="13002">
+      <subcategory value="1" description="0 - 100 KW" uuid="d3bc84e4-5269-11df-8959-080069138b88" uid="13003"/>
+      <subcategory value="2" description="greater than 100 KW" uuid="d3bd969a-5269-11df-9661-080069138b88" uid="13004"/>
+    </category>
+    <category value="17" description="Water trailer" uuid="d3bf4e90-5269-11df-ad14-080069138b88" uid="13005">
+      <subcategory value="1" description="1-1000 gallons" uuid="d3c05ede-5269-11df-912f-080069138b88" uid="13006">
+        <specific value="1" description="Trailer, water, 1200 liter, ACMAT-ALM" uuid="d3c16a04-5269-11df-9e34-080069138b88" uid="13007"/>
+        <specific value="2" description="Trailer, water, 950 liter, VMG-40-51" uuid="d3c28b0a-5269-11df-922c-080069138b88" uid="13008"/>
+      </subcategory>
+      <subcategory value="2" description="1001- 5000 gallons" uuid="d3c44a9e-5269-11df-866e-080069138b88" uid="13009"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="d3c55b46-5269-11df-aff0-080069138b88" uid="13010"/>
+    </category>
+    <category value="18" description="Engineer equipment" uuid="d3c7165c-5269-11df-a5b3-080069138b88" uid="13011">
+      <subcategory value="1" description="Mine clearing line charge" uuid="d3c845b8-5269-11df-adf8-080069138b88" uid="13012"/>
+      <subcategory value="2" description="Dozer blade kit" uuid="d3c97154-5269-11df-95f2-080069138b88" uid="13013"/>
+      <subcategory value="3" description="Lane marking system" uuid="d3ca84fe-5269-11df-968a-080069138b88" uid="13014"/>
+    </category>
+    <category value="19" description="Heavy equipment transport trailer" uuid="d3cc3286-5269-11df-8ebb-080069138b88" uid="13015">
+      <subcategory value="1" description="Reload vehicle" uuid="d3cd4a22-5269-11df-bc9f-080069138b88" uid="13016"/>
+      <subcategory value="2" description="Lowboy, Heavy Equipment, Transporter, ChMZAP-5247C" uuid="d3cfbe42-5269-11df-97fc-080069138b88" uid="13017"/>
+    </category>
+    <category value="20" description="Maintenance equipment trailer" uuid="d3d17552-5269-11df-8ea5-080069138b88" uid="13018">
+      <subcategory value="1" description="Welding trailer" uuid="d3d2810e-5269-11df-8e97-080069138b88" uid="13019"/>
+      <subcategory value="2" description="Compressor" uuid="d3d49e3a-5269-11df-9dc3-080069138b88" uid="13020"/>
+      <subcategory value="3" description="Tools/parts trailer" uuid="d3d5ac94-5269-11df-952f-080069138b88" uid="13021">
+        <specific value="1" description="Trailer, van, missile, OdAZ-740" uuid="d3d6c020-5269-11df-97bc-080069138b88" uid="13022"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Limber" uuid="d3da3944-5269-11df-af5b-080069138b88" uid="13023"/>
+    <category value="22" description="Chemical decontamination trailer" uuid="d3db4ad2-5269-11df-9265-080069138b88" uid="13024"/>
+    <category value="23" description="(deprecated)" deprecated="1" uuid="d3dc60ca-5269-11df-bf11-080069138b88" uid="13025"/>
+    <category value="24" description="(deprecated)" deprecated="1" uuid="d3dd6b8c-5269-11df-b559-080069138b88" uid="13026"/>
+    <category value="25" description="Train-Car" uuid="d3de7b6c-5269-11df-a5b0-080069138b88" uid="13027">
+      <subcategory value="1" description="Boxcar" uuid="d3df8b38-5269-11df-9946-080069138b88" uid="13028"/>
+      <subcategory value="2" description="Tanker" uuid="d3e0941a-5269-11df-9de1-080069138b88" uid="13029"/>
+      <subcategory value="3" description="Passenger" uuid="d3e1ad6e-5269-11df-ac3b-080069138b88" uid="13030"/>
+    </category>
+    <category value="26" description="Train-Caboose" uuid="d3e35df8-5269-11df-bf7d-080069138b88" uid="13031"/>
+    <category value="27" description="Civilian Vehicle" uuid="d3e46af4-5269-11df-a829-080069138b88" uid="13032">
+      <subcategory value="1" description="Sedan" uuid="d3e57462-5269-11df-8aa7-080069138b88" uid="13033"/>
+    </category>
+    <category value="28" description="Air Defense / Missile Defense Unit Equipment" uuid="d3e727ee-5269-11df-8261-080069138b88" uid="13034">
+      <subcategory value="1" description="SA-2 Guideline SAM System" uuid="d3e83800-5269-11df-8ad3-080069138b88" uid="13035">
+        <specific value="1" description="SA-2 Battery C3 Van" uuid="d3e94632-5269-11df-b6b3-080069138b88" uid="13036"/>
+        <specific value="2" description="SA-2 Missile Launcher" uuid="d3ea5054-5269-11df-bc1c-080069138b88" uid="13037"/>
+        <specific value="3" description="Fan Song Engagement Radar" uuid="d3eb630e-5269-11df-9b5b-080069138b88" uid="13038">
+          <extra value="1" description="Fan Song B" uuid="d3ec7136-5269-11df-8fac-080069138b88" uid="13039"/>
+          <extra value="2" description="Fan Song C/E" uuid="d3ed78ba-5269-11df-ba8b-080069138b88" uid="13040"/>
+          <extra value="3" description="Fan Song F" uuid="d3ee8a48-5269-11df-848c-080069138b88" uid="13041"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="SA-3 Goa SAM System" uuid="d3f0d514-5269-11df-b2c7-080069138b88" uid="13042">
+        <specific value="1" description="SA-3 Battery C3 Van" uuid="d3f1e4c2-5269-11df-ba87-080069138b88" uid="13043"/>
+        <specific value="2" description="SA-3 Missile Launcher" uuid="d3f2f31c-5269-11df-85f7-080069138b88" uid="13044">
+          <extra value="1" description="Twin-Rail Launcher" uuid="d3f405ae-5269-11df-9e50-080069138b88" uid="13045"/>
+          <extra value="2" description="Quad-Rail Launcher" uuid="d3f51106-5269-11df-82ce-080069138b88" uid="13046"/>
+        </specific>
+        <specific value="3" description="Low Blow Engagement Radar" uuid="d3f6bc40-5269-11df-a4f2-080069138b88" uid="13047"/>
+      </subcategory>
+      <subcategory value="3" description="SA-5 Gammon SAM System" uuid="d3f86c0c-5269-11df-a95b-080069138b88" uid="13048">
+        <specific value="1" description="SA-5 Battalion C3 Van" uuid="d3f97a84-5269-11df-b3bf-080069138b88" uid="13049"/>
+        <specific value="2" description="SA-5 Missile Launcher" uuid="d3fa8cda-5269-11df-8b69-080069138b88" uid="13050"/>
+        <specific value="3" description="Square Pair Engagement Radar" uuid="d3fb9576-5269-11df-96d3-080069138b88" uid="13051"/>
+      </subcategory>
+      <subcategory value="4" description="SA-10 Grumble SAM System" uuid="d3fd44fc-5269-11df-9b70-080069138b88" uid="13052">
+        <specific value="1" description="SA-10 Battery C3 Vehicle" uuid="d3fe52e8-5269-11df-934f-080069138b88" uid="13053"/>
+        <specific value="2" description="SA-10 Missile Launcher" uuid="d3ff60fc-5269-11df-b6d7-080069138b88" uid="13054">
+          <extra value="1" description="SA-10A Towed TEL (5P85T)" uuid="d40072b2-5269-11df-b59e-080069138b88" uid="13055"/>
+          <extra value="2" description="SA-10B SP TEL (5P85S)" uuid="d4018f62-5269-11df-a38e-080069138b88" uid="13056"/>
+        </specific>
+        <specific value="3" description="Flap Lid Engagement Radar (36N6E)" uuid="d40342e4-5269-11df-9567-080069138b88" uid="13057">
+          <extra value="1" description="Flap Lid A Radar (tower mounted)" uuid="d40454f4-5269-11df-acb8-080069138b88" uid="13058"/>
+          <extra value="2" description="Flap Lid B (SP vehicle)" uuid="d4055e1c-5269-11df-b318-080069138b88" uid="13059"/>
+          <extra value="3" description="Tomb Stone Radar (SA-10C)" uuid="d4066d0c-5269-11df-9a37-080069138b88" uid="13060"/>
+        </specific>
+        <specific value="4" description="Clam Shell Acquisition Radar" uuid="d4081d46-5269-11df-9c18-080069138b88" uid="13061"/>
+        <specific value="5" description="SA-10 Missile Transport/Reload Vehicle" uuid="d4092cfe-5269-11df-9e7c-080069138b88" uid="13062"/>
+      </subcategory>
+      <subcategory value="5" description="SA-4 Ganef SAM System" uuid="d40adb3a-5269-11df-b024-080069138b88" uid="13063">
+        <specific value="1" description="SA-4 Battery C3 Vehicle" uuid="d40be890-5269-11df-b0cf-080069138b88" uid="13064"/>
+        <specific value="2" description="SA-4 TEL (2P24)" uuid="d40cf7ee-5269-11df-83cb-080069138b88" uid="13065"/>
+        <specific value="3" description="Pat Hand Engagement Radar (1S32M)" uuid="d40e0710-5269-11df-839b-080069138b88" uid="13066"/>
+        <specific value="4" description="SA-4 Missile Transporter/Loader Vehicle (2T6)" uuid="d40f1056-5269-11df-ac53-080069138b88" uid="13067"/>
+      </subcategory>
+      <subcategory value="6" description="SA-6 Gainful SAM System" uuid="d410c4a0-5269-11df-b75d-080069138b88" uid="13068">
+        <specific value="1" description="SA-6 Battery C3 Vehicle" uuid="d411d3fe-5269-11df-bd5c-080069138b88" uid="13069"/>
+        <specific value="2" description="SA-6 TEL" uuid="d412e30c-5269-11df-a3ed-080069138b88" uid="13070">
+          <extra value="1" description="SA-6A TEL (2P25)" uuid="d413e9dc-5269-11df-a437-080069138b88" uid="13071"/>
+          <extra value="2" description="SA-6B TEL (9A310M1 w/Fire Dome Radar)" uuid="d414fb38-5269-11df-8c63-080069138b88" uid="13072"/>
+        </specific>
+        <specific value="3" description="Straight Flush Engagement Radar" uuid="d416ad8e-5269-11df-a155-080069138b88" uid="13073"/>
+        <specific value="4" description="SA-6 Missile Transporter/Loader Vehicle" uuid="d417bc88-5269-11df-88c4-080069138b88" uid="13074"/>
+      </subcategory>
+      <subcategory value="7" description="SA-8 Gecko SAM System" uuid="d4196b28-5269-11df-93df-080069138b88" uid="13075">
+        <specific value="1" description="SA-8 Battery C3 Vehicle" uuid="d41a7856-5269-11df-8937-080069138b88" uid="13076"/>
+        <specific value="2" description="SA-8 TLAR" uuid="d41b864c-5269-11df-8acc-080069138b88" uid="13077">
+          <extra value="1" description="SA-8A TLAR" uuid="d41c928a-5269-11df-a3b6-080069138b88" uid="13078"/>
+          <extra value="2" description="SA-8B TLAR" uuid="d41d9a86-5269-11df-a823-080069138b88" uid="13079"/>
+        </specific>
+        <specific value="3" description="SA-8 Transloader Vehicle" uuid="d41f540c-5269-11df-8cfe-080069138b88" uid="13080"/>
+      </subcategory>
+      <subcategory value="8" description="SA-11 Gadfly SAM System" uuid="d421020c-5269-11df-ab6f-080069138b88" uid="13081">
+        <specific value="1" description="SA-11 Battery C3 Vehicle (9S470M1)" uuid="d42213f4-5269-11df-8b68-080069138b88" uid="13082"/>
+        <specific value="2" description="SA-11 TELAR (9A310M1)" uuid="d423237a-5269-11df-ad16-080069138b88" uid="13083"/>
+        <specific value="3" description="SA-11 Loader/Launcher (9A39M1)" uuid="d4242f36-5269-11df-ae42-080069138b88" uid="13084"/>
+        <specific value="4" description="TUBE ARM Radar" uuid="d4253fa2-5269-11df-8937-080069138b88" uid="13085"/>
+      </subcategory>
+      <subcategory value="9" description="SA-12 Gladiator/Giant SAM System (S-300V)" uuid="d426f004-5269-11df-ae0a-080069138b88" uid="13086">
+        <specific value="1" description="Battalion" uuid="d427fe90-5269-11df-a0b5-080069138b88" uid="13087">
+          <extra value="1" description="Battalion Command Post Vehicle (9S457-1)" uuid="d42907e0-5269-11df-9ec7-080069138b88" uid="13088"/>
+          <extra value="2" description="Bill Board Acquisition Radar (9S15MT)" uuid="d42a189c-5269-11df-93c8-080069138b88" uid="13089"/>
+          <extra value="3" description="High Screen Sector Search Radar (9S19MT)" uuid="d42b27d2-5269-11df-ab3d-080069138b88" uid="13090"/>
+        </specific>
+        <specific value="2" description="Battery" uuid="d42cd8c0-5269-11df-be82-080069138b88" uid="13091">
+          <extra value="1" description="Grill Pan Engagement Radar (9S32)" uuid="d42de094-5269-11df-8c2d-080069138b88" uid="13092"/>
+          <extra value="2" description="SA-12A Gladiator TELAR (9A83-1)" uuid="d42ef16e-5269-11df-916b-080069138b88" uid="13093"/>
+          <extra value="3" description="SA-12B Giant TELAR (9A82)" uuid="d430005e-5269-11df-82c6-080069138b88" uid="13094"/>
+          <extra value="4" description="Gladiator Missile Loader/Launcher (9A85)" uuid="d4310dfa-5269-11df-968a-080069138b88" uid="13095"/>
+          <extra value="5" description="Giant Missile Loader/Launcher (9A84)" uuid="d4321d94-5269-11df-9389-080069138b88" uid="13096"/>
+          <extra value="6" description="SA-12B (rail w/SS-24)" uuid="d4332c7a-5269-11df-a689-080069138b88" uid="13097"/>
+        </specific>
+      </subcategory>
+      <subcategory value="10" description="SA-15 Gauntlet SAM System" uuid="d4357ac0-5269-11df-a17a-080069138b88" uid="13098">
+        <specific value="1" description="SA-15 Battery C3 Vehicle" uuid="d4368a14-5269-11df-8f0a-080069138b88" uid="13099"/>
+        <specific value="2" description="SA-15 TELAR" uuid="d4379486-5269-11df-8dc6-080069138b88" uid="13100"/>
+        <specific value="3" description="8-Round Missile Reload Vehicle (9T224)" uuid="d438a1aa-5269-11df-831f-080069138b88" uid="13101"/>
+        <specific value="4" description="28-Round Missile Reload Transporter (9T225)" uuid="d439b68a-5269-11df-99a8-080069138b88" uid="13102"/>
+      </subcategory>
+      <subcategory value="11" description="SA-17 Grizzly SAM System" uuid="d43ba7d8-5269-11df-8df3-080069138b88" uid="13103">
+        <specific value="1" description="SA-17 Command Post Vehicle" uuid="d43cb8b2-5269-11df-9150-080069138b88" uid="13104"/>
+        <specific value="2" description="Chair Back Engagement Radar" uuid="d43dd2c4-5269-11df-9c95-080069138b88" uid="13105">
+          <extra value="1" description="Tracked (SP) Chair Back Vehicle" uuid="d43ee358-5269-11df-9084-080069138b88" uid="13106"/>
+          <extra value="2" description="Wheeled (towed) Chair Back Trailer" uuid="d43fed0c-5269-11df-b9f4-080069138b88" uid="13107"/>
+        </specific>
+        <specific value="3" description="SA-17 TELAR" uuid="d4419ed6-5269-11df-8dde-080069138b88" uid="13108"/>
+        <specific value="4" description="SA-17 Launcher/Loader Vehicle (TEL)" uuid="d442ad62-5269-11df-8cfe-080069138b88" uid="13109">
+          <extra value="1" description="Tracked (SP) LL" uuid="d443be32-5269-11df-a081-080069138b88" uid="13110"/>
+          <extra value="2" description="Wheeled (towed) LL" uuid="d444c598-5269-11df-a717-080069138b88" uid="13111"/>
+        </specific>
+      </subcategory>
+      <subcategory value="12" description="Self-Propelled VSHORAD Gun/Missile System" uuid="d4471b54-5269-11df-8e5f-080069138b88" uid="13112">
+        <specific value="1" description="ZSU-23/4 Quad 23mm AAA" uuid="d4482666-5269-11df-978d-080069138b88" uid="13113"/>
+        <specific value="2" description="SA-9 Gaskin SAM System" uuid="d4493560-5269-11df-8f66-080069138b88" uid="13114">
+          <extra value="1" description="SA-9A TEL (w/Flat Box-A)" uuid="d44a4478-5269-11df-ba65-080069138b88" uid="13115"/>
+          <extra value="2" description="SA-9B TEL (w/o Flat Box-A)" uuid="d44b516a-5269-11df-8fbe-080069138b88" uid="13116"/>
+        </specific>
+        <specific value="3" description="SA-13 Gopher SAM System" uuid="d44cfe66-5269-11df-91c2-080069138b88" uid="13117">
+          <extra value="1" description="SA-13 TELAR w/Flat Box B" uuid="d44e0dec-5269-11df-ac5e-080069138b88" uid="13118"/>
+          <extra value="2" description="SA-13 TELAR w/o Flat Box" uuid="d44f1d04-5269-11df-a252-080069138b88" uid="13119"/>
+        </specific>
+        <specific value="4" description="2S6 &quot;Tunguska&quot; Quad 30mm/SA-19 AD System" uuid="d450cdd4-5269-11df-8181-080069138b88" uid="13120"/>
+        <specific value="5" description="ZSU-57/2 twin-57mm AA Gun System" uuid="d451d9fe-5269-11df-ac06-080069138b88" uid="13121"/>
+        <specific value="6" description="BTR-40A w/ZPTU-2 twin-14.5mm AA mount" uuid="d452ef4c-5269-11df-9694-080069138b88" uid="13122"/>
+        <specific value="7" description="BTR-152A w/ZPTU-2 twin-14.5mm AA mount" uuid="d4540242-5269-11df-85ee-080069138b88" uid="13123"/>
+        <specific value="8" description="BTR-152D w/ZPU-2 twin-14.5mm AA mount" uuid="d45510d8-5269-11df-8287-080069138b88" uid="13124"/>
+        <specific value="9" description="BTR-152 w/ZU-23 twin-23mm AA mount" uuid="d4562158-5269-11df-977b-080069138b88" uid="13125"/>
+        <specific value="10" description="BTR-152 w/M53 quad-12.7mm MG mount" uuid="d4573020-5269-11df-a784-080069138b88" uid="13126"/>
+      </subcategory>
+      <subcategory value="13" description="Towed VSHORAD Gun/Missile System" uuid="d458e212-5269-11df-936f-080069138b88" uid="13127">
+        <specific value="1" description="KS-30 130mm AA Gun" uuid="d459ebb2-5269-11df-b5bf-080069138b88" uid="13128"/>
+        <specific value="2" description="KS-19 100mm AA Gun" uuid="d45afdea-5269-11df-b007-080069138b88" uid="13129"/>
+        <specific value="3" description="KS-12 85mm AA Gun" uuid="d45c1446-5269-11df-8716-080069138b88" uid="13130"/>
+        <specific value="4" description="S-60 57mm AA Gun" uuid="d45d1fda-5269-11df-b2c5-080069138b88" uid="13131"/>
+        <specific value="5" description="M1939 37mm AA Gun" uuid="d45e301e-5269-11df-9b17-080069138b88" uid="13132"/>
+        <specific value="6" description="ZU-23 twin 23mm AA Gun" uuid="d45f42ec-5269-11df-b934-080069138b88" uid="13133"/>
+        <specific value="7" description="14.5mm ZPU AA MG" uuid="d4604bf6-5269-11df-be15-080069138b88" uid="13134">
+          <extra value="1" description="ZPU-1" uuid="d4615960-5269-11df-888c-080069138b88" uid="13135"/>
+          <extra value="2" description="ZPU-2" uuid="d4626a08-5269-11df-a324-080069138b88" uid="13136"/>
+          <extra value="3" description="ZPU-4" uuid="d46371a0-5269-11df-bf53-080069138b88" uid="13137"/>
+        </specific>
+      </subcategory>
+      <subcategory value="14" description="SSC-3 Styx A/B/C/ variant launcher" uuid="d465c1c6-5269-11df-8d53-080069138b88" uid="13138"/>
+      <subcategory value="15" description="SS-N-3B/C Shaddock/Sepal launcher" uuid="d466cf76-5269-11df-9cd4-080069138b88" uid="13139"/>
+      <subcategory value="16" description="SS-N-22 Sunburn launcher" uuid="d467e23a-5269-11df-abfa-080069138b88" uid="13140"/>
+      <subcategory value="17" description="SSC-X-5 (SS-NX-26) launcher" uuid="d468f292-5269-11df-b0dc-080069138b88" uid="13141"/>
+      <subcategory value="18" description="SSC-6 (SS-N-25) launcher" uuid="d469fb88-5269-11df-9a38-080069138b88" uid="13142"/>
+      <subcategory value="19" description="P-270 Moskit (Kh-41) launcher" uuid="d46b0d0c-5269-11df-8992-080069138b88" uid="13143"/>
+      <subcategory value="20" description="M51 launcher" uuid="d46c207a-5269-11df-ac26-080069138b88" uid="13144"/>
+      <subcategory value="21" description="SA-20 Gargoyle SAM System" uuid="d46d283a-5269-11df-a617-080069138b88" uid="13145">
+        <specific value="1" description="SA-20 Group of Battalions CP Vehicle (54K6)" uuid="d46e37a2-5269-11df-ab24-080069138b88" uid="13146"/>
+        <specific value="2" description="SA-20 Missile Launcher (5P85)" uuid="d46f4a16-5269-11df-a63f-080069138b88" uid="13147"/>
+        <specific value="3" description="SA-20 Tomb Stone Engagement Radar/Battalion CP (30N6E1)" uuid="d4705618-5269-11df-831a-080069138b88" uid="13148"/>
+        <specific value="4" description="SA-20 Missile Transport/Reload Vehicle (22T6)" uuid="d4716648-5269-11df-83fe-080069138b88" uid="13149"/>
+        <specific value="5" description="SA-20 Big Bird Acquisition Radar (64N6)" uuid="d4727c68-5269-11df-b87a-080069138b88" uid="13150"/>
+      </subcategory>
+    </category>
+    <category value="29" description="Command, Control, Communications and Intelligence (C3I) System" uuid="d474caae-5269-11df-b767-080069138b88" uid="13151"/>
+    <category value="30" description="Operations Facility" uuid="d475dec6-5269-11df-a609-080069138b88" uid="13152"/>
+    <category value="31" description="Intelligence Facility" uuid="d476e6a4-5269-11df-8621-080069138b88" uid="13153"/>
+    <category value="32" description="Surveillance Facility" uuid="d477f576-5269-11df-8b05-080069138b88" uid="13154"/>
+    <category value="33" description="Communications Facility" uuid="d47905ba-5269-11df-8f4e-080069138b88" uid="13155"/>
+    <category value="34" description="Command Facility" uuid="d47a105e-5269-11df-9e19-080069138b88" uid="13156"/>
+    <category value="35" description="C4I Facility" uuid="d47b262e-5269-11df-b5d4-080069138b88" uid="13157"/>
+    <category value="36" description="Control Facility" uuid="d47c3898-5269-11df-b2fa-080069138b88" uid="13158"/>
+    <category value="37" description="Fire Control Facility" uuid="d47d41e8-5269-11df-a217-080069138b88" uid="13159"/>
+    <category value="38" description="Missile Defense Facility" uuid="d47e50ba-5269-11df-99e8-080069138b88" uid="13160"/>
+    <category value="39" description="Field Command Post" uuid="d47f604a-5269-11df-807a-080069138b88" uid="13161"/>
+    <category value="40" description="Observation Post" uuid="d4806d28-5269-11df-9499-080069138b88" uid="13162"/>
+    <category value="41" description="General Wheeled Vehicles" uuid="d4817ccc-5269-11df-b0d4-080069138b88" uid="13163">
+      <subcategory value="1" description="Small truck" uuid="d4828af4-5269-11df-b3c9-080069138b88" uid="13164"/>
+      <subcategory value="2" description="Medium truck" uuid="d48392c8-5269-11df-9b28-080069138b88" uid="13165"/>
+      <subcategory value="3" description="Large truck" uuid="d484a2da-5269-11df-9053-080069138b88" uid="13166"/>
+      <subcategory value="4" description="TEL crane truck" uuid="d485b526-5269-11df-9895-080069138b88" uid="13167"/>
+      <subcategory value="5" description="Missile fuel truck" uuid="d486bd2c-5269-11df-aa8b-080069138b88" uid="13168"/>
+      <subcategory value="6" description="Tractor trailer truck" uuid="d487cd5c-5269-11df-b59f-080069138b88" uid="13169"/>
+      <subcategory value="7" description="Missile command truck" uuid="d488e0f2-5269-11df-8ed6-080069138b88" uid="13170"/>
+      <subcategory value="8" description="Missile warhead truck" uuid="d489eae2-5269-11df-a4ac-080069138b88" uid="13171"/>
+      <subcategory value="9" description="Artillery command and reconnaissance vehicle" uuid="d48af8ec-5269-11df-a43b-080069138b88" uid="13172"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="222" uuid="d48d4a20-5269-11df-a0eb-080069138b88" uid="13173">
+    <category value="1" description="Fighter/Air Defense" uuid="d48e56d6-5269-11df-8ee3-080069138b88" uid="13174">
+      <subcategory value="1" description="MiG-31 Foxhound" uuid="d48f6620-5269-11df-8b75-080069138b88" uid="13175">
+        <specific value="1" description="MiG-31 Foxhound-A" uuid="d49074f2-5269-11df-a7b5-080069138b88" uid="13176"/>
+        <specific value="2" description="MiG-31M Foxhound-B" uuid="d4918234-5269-11df-983b-080069138b88" uid="13177"/>
+      </subcategory>
+      <subcategory value="2" description="MiG-29 Fulcrum" uuid="d4932df0-5269-11df-ae6a-080069138b88" uid="13178">
+        <specific value="1" description="MiG-29 Fulcrum A" uuid="d4943cc2-5269-11df-9302-080069138b88" uid="13179"/>
+        <specific value="2" description="MiG-29UB Fulcrum B" uuid="d4954b9e-5269-11df-8a18-080069138b88" uid="13180"/>
+        <specific value="3" description="MiG-29 Fulcrum C" uuid="d496580e-5269-11df-a8c9-080069138b88" uid="13181"/>
+        <specific value="4" description="MiG-29K Fulcrum D" uuid="d49766b8-5269-11df-bb01-080069138b88" uid="13182"/>
+        <specific value="5" description="MiG-29M advanced version" uuid="d4987382-5269-11df-975e-080069138b88" uid="13183"/>
+        <specific value="6" description="MiG-29 thrust vectoring" uuid="d4998560-5269-11df-85a3-080069138b88" uid="13184"/>
+        <specific value="7" description="MiG-29KU ship-based trainer" uuid="d49aa800-5269-11df-9df7-080069138b88" uid="13185"/>
+      </subcategory>
+      <subcategory value="3" description="Su-27 Flanker" uuid="d49c579a-5269-11df-94ad-080069138b88" uid="13186">
+        <specific value="1" description="Su-27 Flanker A prototypes" uuid="d49d66b2-5269-11df-a50f-080069138b88" uid="13187"/>
+        <specific value="2" description="Su-27 Flanker B production" uuid="d49e7002-5269-11df-8d6d-080069138b88" uid="13188"/>
+        <specific value="3" description="Su-27UB Flanker C" uuid="d49f803c-5269-11df-971a-080069138b88" uid="13189"/>
+        <specific value="4" description="Su-27K Flanker D" uuid="d4a09314-5269-11df-921c-080069138b88" uid="13190"/>
+        <specific value="5" description="Su-27IB" uuid="d4a19aa2-5269-11df-99ea-080069138b88" uid="13191"/>
+      </subcategory>
+      <subcategory value="4" description="MiG-25 Foxbat" uuid="d4a34640-5269-11df-b219-080069138b88" uid="13192">
+        <specific value="1" description="MiG-25P Foxbat A" uuid="d4a45864-5269-11df-ad01-080069138b88" uid="13193"/>
+        <specific value="2" description="MiG-25RB Foxbat B" uuid="d4a566e6-5269-11df-8c17-080069138b88" uid="13194"/>
+        <specific value="3" description="MiG-25RBV Foxbat B" uuid="d4a66f14-5269-11df-9d4d-080069138b88" uid="13195"/>
+        <specific value="4" description="MiG-25BBT Foxbat B" uuid="d4a78110-5269-11df-8f7b-080069138b88" uid="13196"/>
+        <specific value="5" description="MiG-25R Foxbat B" uuid="d4a88f6a-5269-11df-945b-080069138b88" uid="13197"/>
+        <specific value="6" description="MiG-25PU Foxbat C" uuid="d4a99716-5269-11df-b724-080069138b88" uid="13198"/>
+        <specific value="7" description="MiG-25RU Foxbat C" uuid="d4aaa516-5269-11df-baaf-080069138b88" uid="13199"/>
+        <specific value="8" description="MiG-25U Foxbat C" uuid="d4abb7a8-5269-11df-91ab-080069138b88" uid="13200"/>
+        <specific value="9" description="MiG-25RBK Foxbat D" uuid="d4acc026-5269-11df-9f57-080069138b88" uid="13201"/>
+        <specific value="10" description="MiG-25RBS Foxbat D" uuid="d4adcde0-5269-11df-829c-080069138b88" uid="13202"/>
+        <specific value="11" description="MiG-25RBSh Foxbat D" uuid="d4aede10-5269-11df-b95e-080069138b88" uid="13203"/>
+        <specific value="12" description="MiG-25RBF Foxbat D" uuid="d4afeac6-5269-11df-93de-080069138b88" uid="13204"/>
+        <specific value="13" description="MiG-25PD Foxbat E" uuid="d4b0fa1a-5269-11df-9de3-080069138b88" uid="13205"/>
+        <specific value="14" description="MiG-25PDS Foxbat E" uuid="d4b207ca-5269-11df-b47d-080069138b88" uid="13206"/>
+        <specific value="15" description="MiG-25BM Foxbat F" uuid="d4b3119c-5269-11df-b6c2-080069138b88" uid="13207"/>
+      </subcategory>
+      <subcategory value="5" description="MiG-23/24 Flogger" uuid="d4b4c212-5269-11df-ad66-080069138b88" uid="13208">
+        <specific value="1" description="MiG-23M Flogger B" uuid="d4b5cfae-5269-11df-9373-080069138b88" uid="13209"/>
+        <specific value="2" description="MiG-23MF Flogger B" uuid="d4b6de1c-5269-11df-9828-080069138b88" uid="13210"/>
+        <specific value="3" description="MiG-23UB Flogger C" uuid="d4b7ec08-5269-11df-9c3d-080069138b88" uid="13211"/>
+        <specific value="4" description="MiG-23UM Flogger C" uuid="d4b9035e-5269-11df-97e3-080069138b88" uid="13212"/>
+        <specific value="5" description="MiG-23MF Flogger E" uuid="d4ba1262-5269-11df-9b54-080069138b88" uid="13213"/>
+        <specific value="6" description="MiG-23MS Flogger E" uuid="d4bb1f40-5269-11df-a423-080069138b88" uid="13214"/>
+        <specific value="7" description="MiG-23BN Flogger F" uuid="d4bc2e08-5269-11df-91fc-080069138b88" uid="13215"/>
+        <specific value="8" description="MiG-23BM Flogger F" uuid="d4bd3c94-5269-11df-be14-080069138b88" uid="13216"/>
+        <specific value="9" description="MiG-23B Flogger F" uuid="d4be4486-5269-11df-82eb-080069138b88" uid="13217"/>
+        <specific value="10" description="MiG-23ML Flogger G" uuid="d4bf56a0-5269-11df-a1f9-080069138b88" uid="13218"/>
+        <specific value="11" description="MiG-23P Flogger G" uuid="d4c06734-5269-11df-9789-080069138b88" uid="13219"/>
+        <specific value="12" description="MiG-23BK Flogger H" uuid="d4c17084-5269-11df-922d-080069138b88" uid="13220"/>
+        <specific value="13" description="MiG-23BN Flogger H" uuid="d4c28186-5269-11df-9259-080069138b88" uid="13221"/>
+        <specific value="14" description="MiG-23MLD Flogger K" uuid="d4c39026-5269-11df-a800-080069138b88" uid="13222"/>
+        <specific value="15" description="MiG-24 (export MiG-23)" uuid="d4c4996c-5269-11df-bae1-080069138b88" uid="13223"/>
+      </subcategory>
+      <subcategory value="6" description="MiG-21 Fishbed/Mongol" uuid="d4c64992-5269-11df-89ed-080069138b88" uid="13224">
+        <specific value="1" description="MiG-21F Fishbed C" uuid="d4c756a2-5269-11df-a15d-080069138b88" uid="13225"/>
+        <specific value="2" description="MiG-21PF Fishbed D" uuid="d4c86588-5269-11df-bc24-080069138b88" uid="13226"/>
+        <specific value="3" description="MiG-21PFM Fishbed F" uuid="d4c96f28-5269-11df-97b7-080069138b88" uid="13227"/>
+        <specific value="4" description="MiG-21R Fishbed H" uuid="d4ca7d28-5269-11df-8f56-080069138b88" uid="13228"/>
+        <specific value="5" description="MiG-21S Fishbed H" uuid="d4cb8ec0-5269-11df-94e9-080069138b88" uid="13229"/>
+        <specific value="6" description="MiG-21RF Fishbed H" uuid="d4cc98c4-5269-11df-a694-080069138b88" uid="13230"/>
+        <specific value="7" description="MiG-21SM Fishbed J" uuid="d4cda7aa-5269-11df-b592-080069138b88" uid="13231"/>
+        <specific value="8" description="MiG-21M (Type 96/Hindustan Aeronautics-India)" uuid="d4ceb672-5269-11df-b44e-080069138b88" uid="13232"/>
+        <specific value="9" description="MiG-21PFMA Fishbed J" uuid="d4cfc616-5269-11df-96a9-080069138b88" uid="13233"/>
+        <specific value="10" description="MiG-21MF Fishbed J" uuid="d4d0d3e4-5269-11df-ad0c-080069138b88" uid="13234"/>
+        <specific value="11" description="MiG-21SMT Fishbed K" uuid="d4d1e2e8-5269-11df-bb8b-080069138b88" uid="13235"/>
+        <specific value="12" description="MiG-21SMB Fishbed K" uuid="d4d2eef4-5269-11df-b371-080069138b88" uid="13236"/>
+        <specific value="13" description="MiG-21bis-A Fishbed L" uuid="d4d3fdd0-5269-11df-85e0-080069138b88" uid="13237"/>
+        <specific value="14" description="MiG-21bis-B Fishbed N" uuid="d4d50c16-5269-11df-927d-080069138b88" uid="13238"/>
+        <specific value="15" description="MiG-21U Mongol A" uuid="d4d61444-5269-11df-bd81-080069138b88" uid="13239"/>
+        <specific value="16" description="MiG-21US Mongol B" uuid="d4d72f14-5269-11df-9847-080069138b88" uid="13240"/>
+        <specific value="17" description="MiG-21UM Mongol B" uuid="d4d83d00-5269-11df-a1e3-080069138b88" uid="13241"/>
+      </subcategory>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d4d9ec90-5269-11df-96f2-080069138b88" uid="13242"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="d4daf644-5269-11df-b455-080069138b88" uid="13243"/>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="d4dc091c-5269-11df-a046-080069138b88" uid="13244"/>
+      <subcategory value="10" description="Su-15 Flagon" deprecated="1" uuid="d4dd18c0-5269-11df-a940-080069138b88" uid="13245">
+        <specific value="1" description="Su-15TM Flagon E" deprecated="1" uuid="d4de236e-5269-11df-8cad-080069138b88" uid="13246"/>
+        <specific value="2" description="Su-15bis Flagon F" deprecated="1" uuid="d4df32fe-5269-11df-81e6-080069138b88" uid="13247"/>
+        <specific value="3" description="Su-15 trainer" deprecated="1" uuid="d4e04734-5269-11df-adae-080069138b88" uid="13248"/>
+      </subcategory>
+      <subcategory value="11" description="Tu-128 Fiddler" deprecated="1" uuid="d4e1f5b6-5269-11df-9c20-080069138b88" uid="13249">
+        <specific value="1" description="Tu-128P Fiddler" deprecated="1" uuid="d4e3006e-5269-11df-822b-080069138b88" uid="13250"/>
+      </subcategory>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="d4e4b166-5269-11df-a8f3-080069138b88" uid="13251"/>
+      <subcategory value="13" description="Yak-28 Firebar" deprecated="1" uuid="d4e5c088-5269-11df-ae22-080069138b88" uid="13252">
+        <specific value="1" description="Yak-28P" deprecated="1" uuid="d4e6cfe6-5269-11df-85f8-080069138b88" uid="13253"/>
+        <specific value="2" description="Yak-28PA" deprecated="1" uuid="d4e7d7e2-5269-11df-aca2-080069138b88" uid="13254"/>
+        <specific value="3" description="Yak-28PB" deprecated="1" uuid="d4e8e95c-5269-11df-80f7-080069138b88" uid="13255"/>
+      </subcategory>
+      <subcategory value="14" description="MiG-19 Farmer" uuid="d4ea95fe-5269-11df-b849-080069138b88" uid="13256"/>
+      <subcategory value="15" description="MiG-17 Fresco" uuid="d4eba624-5269-11df-be09-080069138b88" uid="13257"/>
+      <subcategory value="16" description="MiG15 Fagot" uuid="d4ecae3e-5269-11df-9e16-080069138b88" uid="13258"/>
+    </category>
+    <category value="2" description="Attack/Strike" uuid="d4ee5aae-5269-11df-b90c-080069138b88" uid="13259">
+      <subcategory value="1" description="MiG-27 Flogger" uuid="d4ef6cc8-5269-11df-92a1-080069138b88" uid="13260">
+        <specific value="1" description="MiG-27 Flogger D" uuid="d4f07a64-5269-11df-b7de-080069138b88" uid="13261"/>
+        <specific value="2" description="MiG-27K Flogger D" uuid="d4f18242-5269-11df-8517-080069138b88" uid="13262"/>
+        <specific value="3" description="MiG-27D Flogger J" uuid="d4f29128-5269-11df-8783-080069138b88" uid="13263"/>
+        <specific value="4" description="MiG-27M (Bahadur-India)" uuid="d4f3a324-5269-11df-b6d2-080069138b88" uid="13264"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d4f558d6-5269-11df-bea9-080069138b88" uid="13265"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d4f66280-5269-11df-a162-080069138b88" uid="13266"/>
+      <subcategory value="4" description="Su-17 Fitter" uuid="d4f77684-5269-11df-8ef1-080069138b88" uid="13267">
+        <specific value="1" description="Su-17 (S-32, Fitter C)" uuid="d4f884d4-5269-11df-935b-080069138b88" uid="13268"/>
+        <specific value="2" description="Su-17M (S-32M, Fitter C)" uuid="d4f9937e-5269-11df-80b8-080069138b88" uid="13269"/>
+        <specific value="3" description="Su-17R Fitter C" uuid="d4fa9f9e-5269-11df-8dd9-080069138b88" uid="13270"/>
+        <specific value="4" description="Su-17M-2/M-2D (S-32M2, Fitter D)" uuid="d4fbae70-5269-11df-81c2-080069138b88" uid="13271"/>
+        <specific value="5" description="Su-17UM-2D (U-32, Fitter E)" uuid="d4fcbde2-5269-11df-a14a-080069138b88" uid="13272"/>
+        <specific value="6" description="Su-17UM-3 Fitter G" uuid="d4fdc606-5269-11df-a823-080069138b88" uid="13273"/>
+        <specific value="7" description="Su-17M-3 (S-52, Fitter H)" uuid="d4fed834-5269-11df-842f-080069138b88" uid="13274"/>
+        <specific value="8" description="Su-17-1/M-2 Fitter H" uuid="d4ffe742-5269-11df-8de3-080069138b88" uid="13275"/>
+        <specific value="9" description="Su-17M-4 (S-54, Fitter K)" uuid="d500f380-5269-11df-b330-080069138b88" uid="13276"/>
+      </subcategory>
+      <subcategory value="5" description="Su-20 Fitter C (Export Su-17)" uuid="d502a284-5269-11df-817c-080069138b88" uid="13277">
+        <specific value="1" description="Su-20 (S32Mk, Fitter-C)" uuid="d503b160-5269-11df-8586-080069138b88" uid="13278"/>
+        <specific value="2" description="Su-20R" uuid="d504c0c8-5269-11df-932d-080069138b88" uid="13279"/>
+      </subcategory>
+      <subcategory value="6" description="Su-22 Fitter" uuid="d5066f18-5269-11df-9309-080069138b88" uid="13280">
+        <specific value="1" description="Su-22U Fitter E" uuid="d5077606-5269-11df-8538-080069138b88" uid="13281"/>
+        <specific value="2" description="Su-22 Fitter F" uuid="d50887d0-5269-11df-aa9b-080069138b88" uid="13282"/>
+        <specific value="3" description="Su-22UM-3K Fitter G" uuid="d50995a8-5269-11df-a329-080069138b88" uid="13283"/>
+        <specific value="4" description="Su-22 Fitter G" uuid="d50a9d04-5269-11df-9f48-080069138b88" uid="13284"/>
+        <specific value="5" description="Su-22M-3 Fitter J" uuid="d50bae1a-5269-11df-a780-080069138b88" uid="13285"/>
+        <specific value="6" description="Su-22M-4 Fitter K" uuid="d50cbcc4-5269-11df-b04c-080069138b88" uid="13286"/>
+      </subcategory>
+      <subcategory value="7" description="Su-24 Fencer" uuid="d50e6ad8-5269-11df-8a8a-080069138b88" uid="13287">
+        <specific value="1" description="Su-24 Fencer B" uuid="d50f7662-5269-11df-bcb1-080069138b88" uid="13288"/>
+        <specific value="2" description="Su-24 Fencer C" uuid="d5108476-5269-11df-8bbc-080069138b88" uid="13289"/>
+        <specific value="3" description="Su-24MK Fencer D" uuid="d5119258-5269-11df-b845-080069138b88" uid="13290"/>
+        <specific value="4" description="Su-24MR Fencer E" uuid="d5129da6-5269-11df-994e-080069138b88" uid="13291"/>
+        <specific value="5" description="Su-24MP Fencer F" uuid="d513ab60-5269-11df-8645-080069138b88" uid="13292"/>
+        <specific value="6" description="Su-24K Fencer K" uuid="d514c23e-5269-11df-9775-080069138b88" uid="13293"/>
+      </subcategory>
+      <subcategory value="8" description="Su-25 Frogfoot" uuid="d51671ec-5269-11df-8ca8-080069138b88" uid="13294">
+        <specific value="1" description="Su-25 Frogfoot A" uuid="d5177a42-5269-11df-9b05-080069138b88" uid="13295"/>
+        <specific value="2" description="Su-25UB Frogfoot B" uuid="d51887b6-5269-11df-bbed-080069138b88" uid="13296"/>
+        <specific value="3" description="Su-25K (export &quot;A&quot;)" uuid="d51998a4-5269-11df-9832-080069138b88" uid="13297"/>
+        <specific value="4" description="Su-25UBK (export &quot;UB&quot;)" uuid="d51aa514-5269-11df-bd51-080069138b88" uid="13298"/>
+        <specific value="5" description="Su-25UT Frogfoot B" uuid="d51bb314-5269-11df-b2ac-080069138b88" uid="13299"/>
+        <specific value="6" description="Su-25UTG (tailhook)" uuid="d51cc2d6-5269-11df-90a5-080069138b88" uid="13300"/>
+        <specific value="7" description="Su-25T (Su-34) (antitank)" uuid="d51dcd70-5269-11df-a600-080069138b88" uid="13301"/>
+        <specific value="8" description="Su-25BM (target towing)" uuid="d51ede04-5269-11df-8a45-080069138b88" uid="13302"/>
+      </subcategory>
+      <subcategory value="9" description="Su-37 multirole fighter" uuid="d5208a60-5269-11df-9240-080069138b88" uid="13303"/>
+      <subcategory value="10" description="Yak-38 Forger" uuid="d5219888-5269-11df-b296-080069138b88" uid="13304">
+        <specific value="1" description="Yak-38 Forger A" uuid="d522a476-5269-11df-9c27-080069138b88" uid="13305"/>
+        <specific value="2" description="Yak-38 Forger B" uuid="d523b21c-5269-11df-af05-080069138b88" uid="13306"/>
+      </subcategory>
+      <subcategory value="11" description="Su-35" uuid="d5255d2e-5269-11df-b4d7-080069138b88" uid="13307"/>
+      <subcategory value="12" description="Su-7 Fitter A" uuid="d5266e44-5269-11df-8a95-080069138b88" uid="13308"/>
+    </category>
+    <category value="3" description="Bomber" uuid="d5281a14-5269-11df-907a-080069138b88" uid="13309">
+      <subcategory value="1" description="Tu-160 Blackjack" uuid="d5291fd6-5269-11df-9b9f-080069138b88" uid="13310"/>
+      <subcategory value="2" description="Tu-16 Badger" uuid="d52a3132-5269-11df-80bf-080069138b88" uid="13311">
+        <specific value="1" description="Tu-16A Badger A" uuid="d52b3e38-5269-11df-9595-080069138b88" uid="13312"/>
+        <specific value="2" description="Tu-16N Badger A, tanker" uuid="d52c4742-5269-11df-998f-080069138b88" uid="13313"/>
+        <specific value="3" description="Tu-16T Badger A, torpedo" uuid="d52d597a-5269-11df-a8f1-080069138b88" uid="13314"/>
+        <specific value="4" description="Tu-16KS-1 Badger B" uuid="d52e684c-5269-11df-b501-080069138b88" uid="13315"/>
+        <specific value="5" description="Tu-16 Korvet, Search and Rescue (SAR)" uuid="d52f7160-5269-11df-807f-080069138b88" uid="13316"/>
+        <specific value="6" description="Tu-16 K-10 Badger C" uuid="d5308424-5269-11df-9d3e-080069138b88" uid="13317"/>
+        <specific value="7" description="Tu-16R Badger D" uuid="d53191ac-5269-11df-8245-080069138b88" uid="13318"/>
+        <specific value="8" description="Tu-16 Badger E, photo reconnaissance" uuid="d532dca6-5269-11df-8aff-080069138b88" uid="13319"/>
+        <specific value="9" description="Tu-16R Badger F, ELINT" uuid="d533f852-5269-11df-a271-080069138b88" uid="13320"/>
+        <specific value="10" description="Tu-16 Badger-G, ASM carrier" uuid="d5350990-5269-11df-8cb5-080069138b88" uid="13321"/>
+        <specific value="11" description="Tu-16K Badger G Mod" uuid="d536198e-5269-11df-b00b-080069138b88" uid="13322"/>
+        <specific value="12" description="Tu-16PP Badger H, chaff dispenser" uuid="d53721bc-5269-11df-b677-080069138b88" uid="13323"/>
+        <specific value="13" description="Tu-16PP Badger J, ECM" uuid="d53834a8-5269-11df-a7a1-080069138b88" uid="13324"/>
+        <specific value="14" description="Tu-16R Badger K, reconnaissance" uuid="d5394438-5269-11df-ae22-080069138b88" uid="13325"/>
+        <specific value="15" description="Tu-16 Badger L, EW" uuid="d53a4f40-5269-11df-adff-080069138b88" uid="13326"/>
+      </subcategory>
+      <subcategory value="3" description="Tu-26 (Tu-22M) Backfire" uuid="d53bfe1c-5269-11df-8cab-080069138b88" uid="13327">
+        <specific value="1" description="Tu-22M-1 Backfire A" uuid="d53d0d70-5269-11df-9f4b-080069138b88" uid="13328"/>
+        <specific value="2" description="Tu-22M-2 Backfire B" uuid="d53e1d3c-5269-11df-97ea-080069138b88" uid="13329"/>
+        <specific value="3" description="Tu-22M-3 Backfire C" uuid="d53f2948-5269-11df-b7a7-080069138b88" uid="13330"/>
+      </subcategory>
+      <subcategory value="4" description="Tu-22 Blinder" uuid="d540d4f0-5269-11df-a6e5-080069138b88" uid="13331">
+        <specific value="1" description="Tu-22 Blinder-A" uuid="d541e5c0-5269-11df-8b43-080069138b88" uid="13332"/>
+        <specific value="2" description="Tu-22 Blinder-B" uuid="d542f406-5269-11df-9349-080069138b88" uid="13333"/>
+        <specific value="3" description="Tu-22 Blinder-C, reconnaissance" uuid="d543fb44-5269-11df-9389-080069138b88" uid="13334"/>
+        <specific value="4" description="Tu-22U Blinder-D" uuid="d5450d40-5269-11df-8395-080069138b88" uid="13335"/>
+        <specific value="5" description="Tu-22 Blinder-E, EW/reconnaissance" uuid="d5461bc2-5269-11df-a2cf-080069138b88" uid="13336"/>
+      </subcategory>
+      <subcategory value="5" description="Tu-95 or Tu-142 Bear" uuid="d547c8b4-5269-11df-a9ec-080069138b88" uid="13337">
+        <specific value="1" description="Tu-95 Bear D, sea reconnaissance" uuid="d548d4c0-5269-11df-8b54-080069138b88" uid="13338"/>
+        <specific value="2" description="Tu-95 Bear E (&quot;A&quot; conversion)" uuid="d549e374-5269-11df-a1b6-080069138b88" uid="13339"/>
+        <specific value="3" description="Tu-95 Bear G (&quot;B/C&quot; ELINT conversion)" uuid="d54af462-5269-11df-8ffe-080069138b88" uid="13340"/>
+        <specific value="4" description="Tu-95MS Bear H" uuid="d54c01c2-5269-11df-86ca-080069138b88" uid="13341"/>
+        <specific value="5" description="Tu-142 Bear F, ASW" uuid="d54d0f36-5269-11df-bc29-080069138b88" uid="13342"/>
+        <specific value="6" description="Tu-142 Bear F Mod 1" uuid="d54e1dc2-5269-11df-b68a-080069138b88" uid="13343"/>
+        <specific value="7" description="Tu-142M Bear F Mod 2" uuid="d54f28f2-5269-11df-a473-080069138b88" uid="13344"/>
+        <specific value="8" description="Tu-142 Bear F Mod 3" uuid="d550362a-5269-11df-b2f8-080069138b88" uid="13345"/>
+        <specific value="9" description="Tu-142 Bear F Mod 4" uuid="d5514c2c-5269-11df-a4ae-080069138b88" uid="13346"/>
+        <specific value="10" description="Tu-142 Bear J, VLF Communications" uuid="d55257ac-5269-11df-b806-080069138b88" uid="13347"/>
+        <specific value="11" description="Tu-142K Bear H" uuid="d5536b2e-5269-11df-9daa-080069138b88" uid="13348"/>
+      </subcategory>
+      <subcategory value="6" description="Il-28 Beagle" uuid="d5551668-5269-11df-933c-080069138b88" uid="13349"/>
+    </category>
+    <category value="4" description="Cargo/Tanker" uuid="d556c5bc-5269-11df-899a-080069138b88" uid="13350">
+      <subcategory value="1" description="An-124 Condor" uuid="d557d286-5269-11df-a4fd-080069138b88" uid="13351">
+        <specific value="1" description="An-124" uuid="d558da82-5269-11df-9dd4-080069138b88" uid="13352"/>
+      </subcategory>
+      <subcategory value="2" description="An-22 Cock" uuid="d55a8896-5269-11df-a21a-080069138b88" uid="13353">
+        <specific value="1" description="An-22" uuid="d55b9682-5269-11df-a862-080069138b88" uid="13354"/>
+      </subcategory>
+      <subcategory value="3" description="Il-76 Candid" uuid="d55d441e-5269-11df-9b69-080069138b88" uid="13355">
+        <specific value="1" description="Il-76 Candid A" uuid="d55e5426-5269-11df-9c57-080069138b88" uid="13356"/>
+        <specific value="2" description="Il-76T Candid A, civil reserve" uuid="d55f5baa-5269-11df-bd32-080069138b88" uid="13357"/>
+        <specific value="3" description="Il-76M Candid B" uuid="d5606acc-5269-11df-9039-080069138b88" uid="13358"/>
+        <specific value="4" description="Il-76TD Candid A, civil reserve" uuid="d5617bba-5269-11df-96eb-080069138b88" uid="13359"/>
+        <specific value="5" description="Il-76MD Candid B" uuid="d562849c-5269-11df-8c0b-080069138b88" uid="13360"/>
+      </subcategory>
+      <subcategory value="4" description="Il-20/22 Coot" uuid="d56430f8-5269-11df-9a9d-080069138b88" uid="13361">
+        <specific value="1" description="Il-20 Coot A, ELINT/recon (Il-18 variant)" uuid="d5654222-5269-11df-a666-080069138b88" uid="13362"/>
+        <specific value="2" description="Il-22 Coot B" uuid="d5665202-5269-11df-be7a-080069138b88" uid="13363"/>
+      </subcategory>
+      <subcategory value="5" description="An-12 Cub" uuid="d5680b24-5269-11df-b8dc-080069138b88" uid="13364">
+        <specific value="1" description="An-12BP" uuid="d5691564-5269-11df-a91c-080069138b88" uid="13365"/>
+        <specific value="2" description="An-12A Cub A, ELINT" uuid="d56a2314-5269-11df-96ba-080069138b88" uid="13366"/>
+        <specific value="3" description="An-12B Cub B, SNA ELINT" uuid="d56b2c0a-5269-11df-b180-080069138b88" uid="13367"/>
+        <specific value="4" description="An-12C Cub C, SNA ECM" uuid="d56c3a5a-5269-11df-a8dc-080069138b88" uid="13368"/>
+        <specific value="5" description="An-12D Cub D, SNA ECM" uuid="d56d4d0a-5269-11df-9ad3-080069138b88" uid="13369"/>
+      </subcategory>
+      <subcategory value="6" description="An-24 Coke" uuid="d56ef916-5269-11df-b423-080069138b88" uid="13370">
+        <specific value="1" description="An-24" uuid="d5700e78-5269-11df-810a-080069138b88" uid="13371"/>
+      </subcategory>
+      <subcategory value="7" description="An-26 Curl" uuid="d571bc50-5269-11df-8ee3-080069138b88" uid="13372">
+        <specific value="1" description="An-26 Curl A, manual" uuid="d572c848-5269-11df-bd49-080069138b88" uid="13373"/>
+        <specific value="2" description="An-26B Curl A, pallets" uuid="d573d62a-5269-11df-bd14-080069138b88" uid="13374"/>
+        <specific value="3" description="An-26 Curl B, SIGINT" uuid="d574e54c-5269-11df-8e7b-080069138b88" uid="13375"/>
+      </subcategory>
+      <subcategory value="8" description="An-32 Cline" uuid="d5769220-5269-11df-9cb0-080069138b88" uid="13376">
+        <specific value="1" description="An-32" uuid="d5779cf6-5269-11df-9f7d-080069138b88" uid="13377"/>
+        <specific value="2" description="An-32 Sutlej (India)" uuid="d578aace-5269-11df-b823-080069138b88" uid="13378"/>
+      </subcategory>
+      <subcategory value="9" description="An-70T" uuid="d57a5586-5269-11df-b01e-080069138b88" uid="13379">
+        <specific value="1" description="An-70T" uuid="d57b657a-5269-11df-85fe-080069138b88" uid="13380"/>
+      </subcategory>
+      <subcategory value="10" description="An-72 Coaler" uuid="d57d10c8-5269-11df-9f2a-080069138b88" uid="13381">
+        <specific value="1" description="An-72" uuid="d57e18b0-5269-11df-86af-080069138b88" uid="13382"/>
+      </subcategory>
+      <subcategory value="11" description="An-225 Cossack" uuid="d57fc58e-5269-11df-ba7b-080069138b88" uid="13383">
+        <specific value="1" description="An-225" uuid="d580d244-5269-11df-97b0-080069138b88" uid="13384"/>
+      </subcategory>
+      <subcategory value="12" description="Il-78 Midas" uuid="d58281c0-5269-11df-a527-080069138b88" uid="13385">
+        <specific value="1" description="Il-78 (tanker)" uuid="d5838ea8-5269-11df-9c77-080069138b88" uid="13386"/>
+      </subcategory>
+      <subcategory value="13" description="An-2/3 Colt" uuid="d5853974-5269-11df-808f-080069138b88" uid="13387">
+        <specific value="1" description="An-2 Colt" uuid="d58644fe-5269-11df-ac61-080069138b88" uid="13388"/>
+        <specific value="2" description="An-3 Colt" uuid="d5875236-5269-11df-97a4-080069138b88" uid="13389"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Antisubmarine/patrol/observation" uuid="d5899d20-5269-11df-b1da-080069138b88" uid="13390">
+      <subcategory value="1" description="II-38 May" uuid="d58aadfa-5269-11df-95b0-080069138b88" uid="13391">
+        <specific value="1" description="Il-38" uuid="d58bbc0e-5269-11df-9b5f-080069138b88" uid="13392"/>
+      </subcategory>
+      <subcategory value="2" description="Be-12 Mail" uuid="d58d6662-5269-11df-bbba-080069138b88" uid="13393">
+        <specific value="1" description="Be-12" uuid="d58e75b6-5269-11df-9fe5-080069138b88" uid="13394"/>
+      </subcategory>
+      <subcategory value="3" description="Be-42 Mermaid" uuid="d590287a-5269-11df-97d4-080069138b88" uid="13395">
+        <specific value="1" description="Be-42" uuid="d59130da-5269-11df-8b7f-080069138b88" uid="13396"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d592e060-5269-11df-a424-080069138b88" uid="13397"/>
+      <subcategory value="5" description="A-40 Albatross" uuid="d593ee42-5269-11df-9d55-080069138b88" uid="13398">
+        <specific value="1" description="A-40" uuid="d594fcec-5269-11df-be0d-080069138b88" uid="13399"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Surveillance/C2" uuid="d5974952-5269-11df-b92a-080069138b88" uid="13400">
+      <subcategory value="1" description="A-50 Mainstay" uuid="d5985662-5269-11df-ae3b-080069138b88" uid="13401">
+        <specific value="1" description="A-50 AEW&amp;C" uuid="d5995ddc-5269-11df-9bd9-080069138b88" uid="13402"/>
+      </subcategory>
+      <subcategory value="2" description="An-74 Madcap" uuid="d59b11ae-5269-11df-ae5c-080069138b88" uid="13403">
+        <specific value="1" description="An-74" uuid="d59c1e8c-5269-11df-9ab9-080069138b88" uid="13404"/>
+      </subcategory>
+      <subcategory value="3" description="TU-126 Moss" uuid="d59dc99e-5269-11df-bafa-080069138b88" uid="13405">
+        <specific value="1" description="Tu-126" uuid="d59ed6d6-5269-11df-8522-080069138b88" uid="13406"/>
+      </subcategory>
+    </category>
+    <category value="20" description="Attack helicopter" uuid="d5a122e2-5269-11df-82ec-080069138b88" uid="13407">
+      <subcategory value="1" description="Mi-28 Havoc" uuid="d5a231aa-5269-11df-b5c6-080069138b88" uid="13408">
+        <specific value="1" description="Mi-28" uuid="d5a33816-5269-11df-8216-080069138b88" uid="13409"/>
+      </subcategory>
+      <subcategory value="2" description="Mi-24/25/35 Hind" uuid="d5a4e6ac-5269-11df-bde7-080069138b88" uid="13410">
+        <specific value="1" description="Mi-24 Hind A" uuid="d5a5f3d0-5269-11df-95f1-080069138b88" uid="13411"/>
+        <specific value="2" description="Mi-24 Hind B" uuid="d5a70626-5269-11df-b63b-080069138b88" uid="13412"/>
+        <specific value="3" description="Mi-24 Hind C" uuid="d5a80cb0-5269-11df-80d9-080069138b88" uid="13413"/>
+        <specific value="4" description="Mi-24D Hind D (1st gunship)" uuid="d5a91a1a-5269-11df-b0d3-080069138b88" uid="13414"/>
+        <specific value="5" description="Mi-24W Hind E" uuid="d5aa2bf8-5269-11df-97a5-080069138b88" uid="13415"/>
+        <specific value="6" description="Mi-24P Hind F" uuid="d5ab348a-5269-11df-a1a0-080069138b88" uid="13416"/>
+        <specific value="7" description="Mi-24RSH Hind G1 (NBC armored)" uuid="d5ac4118-5269-11df-8a65-080069138b88" uid="13417"/>
+        <specific value="8" description="Mi-24RSH Hind G2 (reconnaissance/spotter)" uuid="d5ad5a58-5269-11df-b18e-080069138b88" uid="13418"/>
+        <specific value="9" description="Mi-25 (export Mi-24D)" uuid="d5ae6984-5269-11df-aaf2-080069138b88" uid="13419"/>
+        <specific value="10" description="Mi-35 (export Mi-24W)" uuid="d5af7874-5269-11df-bf21-080069138b88" uid="13420"/>
+        <specific value="11" description="Mi-35P (export Mi-24P)" uuid="d5b08516-5269-11df-a4be-080069138b88" uid="13421"/>
+      </subcategory>
+      <subcategory value="3" description="Ka-50 Hokum" uuid="d5b235b4-5269-11df-a4f5-080069138b88" uid="13422">
+        <specific value="1" description="Ka-50 Hokum A close air support" uuid="d5b33e32-5269-11df-9980-080069138b88" uid="13423"/>
+        <specific value="2" description="Ka-50 Hokum B tandem trainer" uuid="d5b44b4c-5269-11df-8e3c-080069138b88" uid="13424"/>
+      </subcategory>
+      <subcategory value="4" description="Ka-25 Hormone" uuid="d5b5fbea-5269-11df-88f5-080069138b88" uid="13425">
+        <specific value="1" description="Ka-25BSh Hormone A, ASW" uuid="d5b70896-5269-11df-83a9-080069138b88" uid="13426"/>
+        <specific value="2" description="Ka-25 Hormone B (targeting &amp; missile guidance)" uuid="d5b81178-5269-11df-b180-080069138b88" uid="13427"/>
+        <specific value="3" description="Ka-25PS Hormone C (targeting &amp; missile guidance)" uuid="d5b92112-5269-11df-9351-080069138b88" uid="13428"/>
+        <specific value="4" description="Ka-25PL Hormone A" uuid="d5ba352a-5269-11df-a3d5-080069138b88" uid="13429"/>
+        <specific value="5" description="Ka-25TS Hormone B" uuid="d5bb3d44-5269-11df-af12-080069138b88" uid="13430"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Utility helicopter" uuid="d5bd8c0c-5269-11df-b25e-080069138b88" uid="13431">
+      <subcategory value="1" description="Mi-8/9/17/171 Hip" uuid="d5be9728-5269-11df-962e-080069138b88" uid="13432">
+        <specific value="1" description="Mi-8 Hip C (assault)" uuid="d5bfa53c-5269-11df-b773-080069138b88" uid="13433"/>
+        <specific value="2" description="Mi-8 Hip D (airborne communications)" uuid="d5c0b314-5269-11df-a19f-080069138b88" uid="13434"/>
+        <specific value="3" description="Mi-8 Hip E &quot;C&quot; development, 12.7" uuid="d5c1bcdc-5269-11df-99aa-080069138b88" uid="13435"/>
+        <specific value="4" description="Mi-8TBK (Mi-17) (&quot;E&quot; uprated)" uuid="d5c2cf46-5269-11df-b3bb-080069138b88" uid="13436"/>
+        <specific value="5" description="Mi-8 Hip F (&quot;E&quot; export)" uuid="d5c3de5e-5269-11df-ae7f-080069138b88" uid="13437"/>
+        <specific value="6" description="Mi-8 Hip J (ECM)" uuid="d5c4e7b8-5269-11df-b8c4-080069138b88" uid="13438"/>
+        <specific value="7" description="Mi-8PP Hip K (ECM)" uuid="d5c5f7fc-5269-11df-a9b9-080069138b88" uid="13439"/>
+        <specific value="8" description="Mi-9 Hip G (special duty &amp; airborne communications)" uuid="d5c706ec-5269-11df-942f-080069138b88" uid="13440"/>
+        <specific value="9" description="Mi-17 Hip H (MI-8 update)" uuid="d5c8110e-5269-11df-bbdb-080069138b88" uid="13441"/>
+        <specific value="10" description="Mi-17P (Hip K derivative)" uuid="d5c92292-5269-11df-bbd1-080069138b88" uid="13442"/>
+        <specific value="11" description="Mi-171 Hip H (hospital)" uuid="d5ca30d8-5269-11df-bf8e-080069138b88" uid="13443"/>
+        <specific value="12" description="Mi-17 (EW)" uuid="d5cb3988-5269-11df-b2f8-080069138b88" uid="13444"/>
+      </subcategory>
+      <subcategory value="2" description="Mi-14 Haze" uuid="d5ccef08-5269-11df-b808-080069138b88" uid="13445">
+        <specific value="1" description="Mi-14PL Haze A (ASW)" uuid="d5cdfd1c-5269-11df-8afe-080069138b88" uid="13446"/>
+        <specific value="2" description="Mi-14PW (Polish Mi-14PL)" uuid="d5cf0b80-5269-11df-a803-080069138b88" uid="13447"/>
+        <specific value="3" description="Mi-14BT Haze B (MCM)" uuid="d5d01836-5269-11df-ba91-080069138b88" uid="13448"/>
+        <specific value="4" description="Mi-14PS Haze C (SAR)" uuid="d5d125be-5269-11df-969b-080069138b88" uid="13449"/>
+      </subcategory>
+      <subcategory value="3" description="Mi-26 Halo" uuid="d5d2d0da-5269-11df-bb69-080069138b88" uid="13450">
+        <specific value="1" description="Mi-26 heavy transport" uuid="d5d3e11e-5269-11df-9e4d-080069138b88" uid="13451"/>
+        <specific value="2" description="Mi-26TZ tanker" uuid="d5d4e960-5269-11df-b879-080069138b88" uid="13452"/>
+        <specific value="3" description="Mi-26 communications &amp; support" uuid="d5d5f7d8-5269-11df-bb0e-080069138b88" uid="13453"/>
+      </subcategory>
+      <subcategory value="4" description="Mi-6 Hook" uuid="d5d7a70e-5269-11df-a8eb-080069138b88" uid="13454">
+        <specific value="1" description="Mi-6 Hook A (export)" uuid="d5d8b2fc-5269-11df-bbcf-080069138b88" uid="13455"/>
+        <specific value="2" description="Mi-6 Hook B (command support)" uuid="d5d9bcc4-5269-11df-9b28-080069138b88" uid="13456"/>
+        <specific value="3" description="Mi-6 Hook C (&quot;B&quot; development, command support)" uuid="d5daccae-5269-11df-a4eb-080069138b88" uid="13457"/>
+      </subcategory>
+      <subcategory value="5" description="Mi-2 Hoplite" uuid="d5dc7e28-5269-11df-830d-080069138b88" uid="13458">
+        <specific value="1" description="Mi-2 (only mfg in Poland)" uuid="d5dd8b4c-5269-11df-a989-080069138b88" uid="13459"/>
+      </subcategory>
+      <subcategory value="6" description="Mi-4 Hound" uuid="d5df3762-5269-11df-b20a-080069138b88" uid="13460">
+        <specific value="1" description="Mi-4" uuid="d5e04062-5269-11df-942a-080069138b88" uid="13461"/>
+      </subcategory>
+      <subcategory value="7" description="Mi-10 Harke" uuid="d5e1ea8e-5269-11df-b917-080069138b88" uid="13462">
+        <specific value="1" description="Mi-10" uuid="d5e2f834-5269-11df-b92b-080069138b88" uid="13463"/>
+        <specific value="2" description="Mi-10K" uuid="d5e408b4-5269-11df-8fcf-080069138b88" uid="13464"/>
+      </subcategory>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="d5e5b290-5269-11df-9ee2-080069138b88" uid="13465"/>
+      <subcategory value="9" description="Ka-27/28/29 Helix" uuid="d5e6bc94-5269-11df-8009-080069138b88" uid="13466">
+        <specific value="1" description="Ka-27PL Helix A (ASW)" uuid="d5e7ce2c-5269-11df-a125-080069138b88" uid="13467"/>
+        <specific value="2" description="Ka-27PS Helix D (SAR)" uuid="d5e8dc90-5269-11df-9823-080069138b88" uid="13468"/>
+        <specific value="3" description="Ka-28 Helix A (export Ka-27PL)" uuid="d5e9e5ea-5269-11df-9b6e-080069138b88" uid="13469"/>
+        <specific value="4" description="Ka-29TB Helix B (EW &amp; assault)" uuid="d5eb01c8-5269-11df-9595-080069138b88" uid="13470"/>
+      </subcategory>
+      <subcategory value="10" description="Mi-34 Hermit" uuid="d5ecaf28-5269-11df-a66d-080069138b88" uid="13471">
+        <specific value="1" description="Mi-34 (1 engine)" uuid="d5edbbfc-5269-11df-96f1-080069138b88" uid="13472"/>
+        <specific value="2" description="Mi-34V (2 engine)" uuid="d5eec6be-5269-11df-9ff0-080069138b88" uid="13473"/>
+      </subcategory>
+      <subcategory value="11" description="Mi-38" uuid="d5f07162-5269-11df-8cfa-080069138b88" uid="13474">
+        <specific value="1" description="Mi-38 (2 turbine, replaces Mi-8/17)" uuid="d5f17e0e-5269-11df-bcc5-080069138b88" uid="13475"/>
+      </subcategory>
+      <subcategory value="12" description="Ka-26/126 Hoodlum" uuid="d5f32ccc-5269-11df-8e2a-080069138b88" uid="13476">
+        <specific value="1" description="Ka-26 Hoodlum A (reciprocating)" uuid="d5f439b4-5269-11df-9f4d-080069138b88" uid="13477"/>
+        <specific value="2" description="Ka-126 Hoodlum B (turbine)" uuid="d5f543d6-5269-11df-9443-080069138b88" uid="13478"/>
+      </subcategory>
+    </category>
+    <category value="40" description="Trainer" uuid="d5f79442-5269-11df-b19e-080069138b88" uid="13479">
+      <subcategory value="1" description="Tu-134 Crusty" uuid="d5f89af4-5269-11df-b72e-080069138b88" uid="13480">
+        <specific value="1" description="Tu-134UBL (bomber pilot)" uuid="d5f9abec-5269-11df-86bb-080069138b88" uid="13481"/>
+        <specific value="2" description="Tu-134Bsh (bomber navigator)" uuid="d5fabb40-5269-11df-a177-080069138b88" uid="13482"/>
+      </subcategory>
+      <subcategory value="2" description="Yak-18 Max" uuid="d5fc680a-5269-11df-adb9-080069138b88" uid="13483"/>
+    </category>
+    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="d5fe1362-5269-11df-8d87-080069138b88" uid="13484">
+      <subcategory value="1" description="Tupolev TU-154" deprecated="1" uuid="d5ff2086-5269-11df-82f0-080069138b88" uid="13485">
+        <specific value="1" description="TU-154M Careless" deprecated="1" uuid="d6002fbc-5269-11df-b31c-080069138b88" uid="13486"/>
+        <specific value="2" description="Illyuskin IL-62 Classic" deprecated="1" uuid="d6013e84-5269-11df-9887-080069138b88" uid="13487"/>
+        <specific value="3" description="Yakovlev YAK-42 Clobber" deprecated="1" uuid="d602477a-5269-11df-971f-080069138b88" uid="13488"/>
+      </subcategory>
+      <subcategory value="2" description="Passenger Airliner" uuid="d603f9c6-5269-11df-902f-080069138b88" uid="13489">
+        <specific value="1" description="Tupolev TU-154 Careless" uuid="d6050762-5269-11df-af87-080069138b88" uid="13490">
+          <extra value="1" description="Tupolev TU-154M Careless" uuid="d60612d8-5269-11df-badd-080069138b88" uid="13491"/>
+        </specific>
+        <specific value="2" description="Illyushin IL-62 Classic" uuid="d607c2ea-5269-11df-b3ec-080069138b88" uid="13492"/>
+        <specific value="3" description="Yakovlev Yak-42 Clobber" uuid="d608cc9e-5269-11df-a539-080069138b88" uid="13493"/>
+        <specific value="4" description="Illyushin IL-86 Camber" uuid="d609e214-5269-11df-9a9e-080069138b88" uid="13494"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="222" uuid="d60ccfba-5269-11df-a120-080069138b88" uid="13495">
+    <category value="1" description="Carrier" uuid="d60ddb8a-5269-11df-95a3-080069138b88" uid="13496">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d60ee6ce-5269-11df-8120-080069138b88" uid="13497"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d60ff64a-5269-11df-ad4d-080069138b88" uid="13498"/>
+      <subcategory value="3" description="Kuznetsov class (CV)" uuid="d6110404-5269-11df-a9bd-080069138b88" uid="13499">
+        <specific value="1" description="Admiral Kuznetsov (ex-Tbilisi, ex-Leonid Brezhnev)" uuid="d6121056-5269-11df-8f99-080069138b88" uid="13500"/>
+        <specific value="2" description="Varyag (ex-Riga)" uuid="d613200e-5269-11df-b617-080069138b88" uid="13501"/>
+      </subcategory>
+      <subcategory value="4" description="Modified Kiev class (CV)" uuid="d614cc74-5269-11df-a76e-080069138b88" uid="13502">
+        <specific value="1" description="Admiral Gorshkov (ex-Baku)" uuid="d615d934-5269-11df-91d8-080069138b88" uid="13503"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Guided-missile Cruiser" uuid="d6182752-5269-11df-8d3d-080069138b88" uid="13504">
+      <subcategory value="1" description="Slava class (CG)" uuid="d6193476-5269-11df-97ae-080069138b88" uid="13505">
+        <specific value="1" description="Slava" uuid="d61a3e66-5269-11df-999c-080069138b88" uid="13506"/>
+        <specific value="2" description="Marshal Ustinov" uuid="d61b4b9e-5269-11df-9743-080069138b88" uid="13507"/>
+        <specific value="3" description="Chervona Ukraina" uuid="d61c5840-5269-11df-8656-080069138b88" uid="13508"/>
+        <specific value="4" description="Vilna Ukraina" uuid="d61d6370-5269-11df-b340-080069138b88" uid="13509"/>
+      </subcategory>
+      <subcategory value="2" description="Kirov class" uuid="d61f0c8e-5269-11df-b3ff-080069138b88" uid="13510">
+        <specific value="1" description="Admiral Ushakov" uuid="d6201c78-5269-11df-908b-080069138b88" uid="13511"/>
+        <specific value="2" description="Admiral Lazarev" uuid="d621297e-5269-11df-9e2b-080069138b88" uid="13512"/>
+        <specific value="3" description="Admiral Nakimov" uuid="d62230da-5269-11df-ad2d-080069138b88" uid="13513"/>
+        <specific value="4" description="Peter Velikiy" uuid="d6234074-5269-11df-a717-080069138b88" uid="13514"/>
+      </subcategory>
+      <subcategory value="3" description="Kara class" uuid="d624ea78-5269-11df-8ba0-080069138b88" uid="13515">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="d625f724-5269-11df-9520-080069138b88" uid="13516"/>
+        <specific value="2" description="Ochakov" uuid="d627022c-5269-11df-a54d-080069138b88" uid="13517"/>
+        <specific value="3" description="Kerch" uuid="d62817ac-5269-11df-b681-080069138b88" uid="13518"/>
+        <specific value="4" description="Azov" uuid="d6292502-5269-11df-b009-080069138b88" uid="13519"/>
+        <specific value="5" description="Petropavlovsk" uuid="d62a2ff6-5269-11df-bce0-080069138b88" uid="13520"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="d62b3c66-5269-11df-9e4f-080069138b88" uid="13521"/>
+        <specific value="7" description="Vladivostok (ex-Tallinn)" uuid="d62c4b92-5269-11df-8355-080069138b88" uid="13522"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d62dfaa0-5269-11df-bb8c-080069138b88" uid="13523"/>
+      <subcategory value="5" description="Kresta I class" uuid="d62f04c2-5269-11df-b875-080069138b88" uid="13524">
+        <specific value="1" description="Admiral Zozulya" uuid="d630127c-5269-11df-ac5a-080069138b88" uid="13525"/>
+      </subcategory>
+      <subcategory value="6" description="Kynda class" uuid="d631bf28-5269-11df-9aa6-080069138b88" uid="13526">
+        <specific value="1" description="Grozny" uuid="d632d156-5269-11df-8572-080069138b88" uid="13527"/>
+        <specific value="2" description="Admiral Fokin" uuid="d633d786-5269-11df-9c0d-080069138b88" uid="13528"/>
+        <specific value="3" description="Admiral Golovko" uuid="d634e522-5269-11df-b761-080069138b88" uid="13529"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Guided-missile Destroyer" uuid="d637321e-5269-11df-8ac1-080069138b88" uid="13530">
+      <subcategory value="1" description="Udaloy class" uuid="d6383f9c-5269-11df-a393-080069138b88" uid="13531">
+        <specific value="1" description="Udaloy" uuid="d6394bb2-5269-11df-960e-080069138b88" uid="13532"/>
+        <specific value="2" description="Vitse Admiral Kulakov" uuid="d63a5c3c-5269-11df-88f0-080069138b88" uid="13533"/>
+        <specific value="3" description="Marshal Vasilevsky" uuid="d63b6474-5269-11df-824c-080069138b88" uid="13534"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="d63c7274-5269-11df-ad6d-080069138b88" uid="13535"/>
+        <specific value="5" description="Admiral Spiridonov" uuid="d63d80ce-5269-11df-85c3-080069138b88" uid="13536"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="d63e8cee-5269-11df-a2db-080069138b88" uid="13537"/>
+        <specific value="7" description="Marshal Shaposhnikov" uuid="d63f9d1e-5269-11df-9d7b-080069138b88" uid="13538"/>
+        <specific value="8" description="Simferopol (ex-Marshal Buokenny)" uuid="d640aa60-5269-11df-8bce-080069138b88" uid="13539"/>
+        <specific value="9" description="Admiral Levchenko" uuid="d641b40a-5269-11df-8e8e-080069138b88" uid="13540"/>
+        <specific value="10" description="Admiral Vinogradov" uuid="d642c4d0-5269-11df-aac0-080069138b88" uid="13541"/>
+        <specific value="11" description="Admiral Kharlamov" uuid="d643d258-5269-11df-aece-080069138b88" uid="13542"/>
+        <specific value="12" description="Admiral Panteleyev" uuid="d644d9b4-5269-11df-95a4-080069138b88" uid="13543"/>
+      </subcategory>
+      <subcategory value="2" description="Sovremennyy class" uuid="d646898a-5269-11df-87ed-080069138b88" uid="13544">
+        <specific value="1" description="Sovremennyy" uuid="d647a0c2-5269-11df-a345-080069138b88" uid="13545"/>
+        <specific value="2" description="Otchayannyy" uuid="d648ae86-5269-11df-b569-080069138b88" uid="13546"/>
+        <specific value="3" description="Otlichnny" uuid="d649b880-5269-11df-af3b-080069138b88" uid="13547"/>
+        <specific value="4" description="Osmotritelny" uuid="d64ac522-5269-11df-bf7e-080069138b88" uid="13548"/>
+        <specific value="5" description="Bezuprechny" uuid="d64bd214-5269-11df-97e5-080069138b88" uid="13549"/>
+        <specific value="6" description="Boyevoy" uuid="d64ce442-5269-11df-b546-080069138b88" uid="13550"/>
+        <specific value="7" description="Stoyky" uuid="d64df40e-5269-11df-a43a-080069138b88" uid="13551"/>
+        <specific value="8" description="Okrylenny" uuid="d64f0092-5269-11df-986b-080069138b88" uid="13552"/>
+        <specific value="9" description="Burny" uuid="d650083e-5269-11df-b0b4-080069138b88" uid="13553"/>
+        <specific value="10" description="Gremyashchy" uuid="d6511788-5269-11df-a3ec-080069138b88" uid="13554"/>
+        <specific value="11" description="Bystry" uuid="d65224c0-5269-11df-ada4-080069138b88" uid="13555"/>
+        <specific value="12" description="Rastoropny" uuid="d6532bea-5269-11df-953b-080069138b88" uid="13556"/>
+        <specific value="13" description="Bezboyaznenny" uuid="d6543c4c-5269-11df-a0f8-080069138b88" uid="13557"/>
+        <specific value="14" description="Bezuderzhny" uuid="d6554830-5269-11df-9251-080069138b88" uid="13558"/>
+        <specific value="15" description="Bespokoiny" uuid="d6565176-5269-11df-b2f7-080069138b88" uid="13559"/>
+        <specific value="16" description="Nastoichivyy" uuid="d6575f80-5269-11df-b78f-080069138b88" uid="13560"/>
+        <specific value="17" description="Besstrashnyy" uuid="d6586bdc-5269-11df-9c10-080069138b88" uid="13561"/>
+        <specific value="18" description="Vazhnyy" uuid="d65977a2-5269-11df-88e7-080069138b88" uid="13562"/>
+        <specific value="19" description="Udumchivyy" uuid="d65a841c-5269-11df-a734-080069138b88" uid="13563"/>
+        <specific value="20" description="136 Hangzhou (China) (ex-Vazhny)" uuid="d65b919a-5269-11df-9c88-080069138b88" uid="13564"/>
+        <specific value="21" description="137 Fuzhou (China) (ex-Alexandr Nevsky)" uuid="d65c9e32-5269-11df-89c7-080069138b88" uid="13565"/>
+      </subcategory>
+      <subcategory value="3" description="Modified Kashin class" uuid="d65e4bba-5269-11df-80c5-080069138b88" uid="13566">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="d65f5a64-5269-11df-aa4d-080069138b88" uid="13567"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="d6606ad0-5269-11df-9d2d-080069138b88" uid="13568"/>
+        <specific value="3" description="Sderzhandoyy" uuid="d661747a-5269-11df-95c6-080069138b88" uid="13569"/>
+      </subcategory>
+      <subcategory value="4" description="Kashin class" uuid="d6632004-5269-11df-82cb-080069138b88" uid="13570">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="d6643e80-5269-11df-915e-080069138b88" uid="13571"/>
+        <specific value="2" description="Krasnyy Kavkaz" uuid="d66559f0-5269-11df-bfa1-080069138b88" uid="13572"/>
+        <specific value="3" description="Krasnyy Krym" uuid="d666639a-5269-11df-9ad7-080069138b88" uid="13573"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="d667753c-5269-11df-9ccc-080069138b88" uid="13574"/>
+        <specific value="5" description="(deprecated)" deprecated="1" uuid="d66884f4-5269-11df-b2ec-080069138b88" uid="13575"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="d6698c64-5269-11df-8d9e-080069138b88" uid="13576"/>
+        <specific value="7" description="(deprecated)" deprecated="1" uuid="d66a9bf4-5269-11df-9e7c-080069138b88" uid="13577"/>
+        <specific value="8" description="Skoryy" uuid="d66badd2-5269-11df-9dc4-080069138b88" uid="13578"/>
+        <specific value="9" description="Smetlivvy" uuid="d66cb4f2-5269-11df-83ad-080069138b88" uid="13579"/>
+      </subcategory>
+      <subcategory value="5" description="Udaloy II" uuid="d66e5ea6-5269-11df-bc22-080069138b88" uid="13580">
+        <specific value="1" description="Admiral Chabenenko" uuid="d66f6ce2-5269-11df-a695-080069138b88" uid="13581"/>
+      </subcategory>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="d6711c86-5269-11df-b11e-080069138b88" uid="13582"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d6722a9a-5269-11df-ab81-080069138b88" uid="13583"/>
+      <subcategory value="8" description="SAM Kotlin class" uuid="d67332dc-5269-11df-96d5-080069138b88" uid="13584">
+        <specific value="1" description="Bravyy" uuid="d67440d2-5269-11df-997e-080069138b88" uid="13585"/>
+        <specific value="2" description="Nakhodchivyy" uuid="d6755300-5269-11df-9b2d-080069138b88" uid="13586"/>
+        <specific value="3" description="Nastochivyy" uuid="d6765cd2-5269-11df-b3f4-080069138b88" uid="13587"/>
+        <specific value="4" description="Hesokrushimyy" uuid="d6776aaa-5269-11df-bc17-080069138b88" uid="13588"/>
+        <specific value="5" description="Skromnyy" uuid="d6787a76-5269-11df-a961-080069138b88" uid="13589"/>
+        <specific value="6" description="Skrytnyy" uuid="d67981be-5269-11df-aa61-080069138b88" uid="13590"/>
+        <specific value="7" description="Soznatel'nyy" uuid="d67a8da2-5269-11df-b55a-080069138b88" uid="13591"/>
+        <specific value="8" description="Vozbuzhdennyy" uuid="d67b9b48-5269-11df-ad52-080069138b88" uid="13592"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided-missile Frigate (includes Corvette)" uuid="d67de86c-5269-11df-b8a2-080069138b88" uid="13593">
+      <subcategory value="1" description="Krivak I class" uuid="d67ef75c-5269-11df-8ab8-080069138b88" uid="13594">
+        <specific value="1" description="Bditelny" uuid="d6800174-5269-11df-821c-080069138b88" uid="13595"/>
+        <specific value="2" description="Bezukoriznenny" uuid="d6810dc6-5269-11df-9ff6-080069138b88" uid="13596"/>
+        <specific value="3" description="Bezzavetny" uuid="d6821b12-5269-11df-9abb-080069138b88" uid="13597"/>
+        <specific value="4" description="Bodry" uuid="d6832106-5269-11df-950f-080069138b88" uid="13598"/>
+        <specific value="5" description="Deyatelny" uuid="d6843744-5269-11df-84ef-080069138b88" uid="13599"/>
+        <specific value="6" description="Doblestny" uuid="d6854a8a-5269-11df-a82d-080069138b88" uid="13600"/>
+        <specific value="7" description="Dostoyny" uuid="d6865240-5269-11df-baf6-080069138b88" uid="13601"/>
+        <specific value="8" description="Druzhny" uuid="d6875ee2-5269-11df-a731-080069138b88" uid="13602"/>
+        <specific value="9" description="Ladny" uuid="d6886d0a-5269-11df-abfd-080069138b88" uid="13603"/>
+        <specific value="10" description="Legky" uuid="d689770e-5269-11df-8cf4-080069138b88" uid="13604"/>
+        <specific value="11" description="(deprecated)" deprecated="1" uuid="d68a8388-5269-11df-beaf-080069138b88" uid="13605"/>
+        <specific value="12" description="Letuchy" uuid="d68b939a-5269-11df-a62e-080069138b88" uid="13606"/>
+        <specific value="13" description="(deprecated)" deprecated="1" uuid="d68c9d94-5269-11df-a64a-080069138b88" uid="13607"/>
+        <specific value="14" description="Razumny" uuid="d68dad4c-5269-11df-a083-080069138b88" uid="13608"/>
+        <specific value="15" description="Razyashchiy" uuid="d68eb9a8-5269-11df-b2ef-080069138b88" uid="13609"/>
+        <specific value="16" description="Retivy" uuid="d68fc4ce-5269-11df-9f06-080069138b88" uid="13610"/>
+        <specific value="17" description="Silnyy" uuid="d690d184-5269-11df-b021-080069138b88" uid="13611"/>
+        <specific value="18" description="Storozhevoy" uuid="d691dd86-5269-11df-8d59-080069138b88" uid="13612"/>
+        <specific value="19" description="Svirepyy" uuid="d692e942-5269-11df-a514-080069138b88" uid="13613"/>
+        <specific value="20" description="Zadorny" uuid="d693f5e4-5269-11df-8bfe-080069138b88" uid="13614"/>
+        <specific value="21" description="Zharky" uuid="d69503b2-5269-11df-bb7e-080069138b88" uid="13615"/>
+        <specific value="22" description="Pylky" uuid="d6960a64-5269-11df-adae-080069138b88" uid="13616"/>
+        <specific value="23" description="Poryvisty" uuid="d697188c-5269-11df-9786-080069138b88" uid="13617"/>
+      </subcategory>
+      <subcategory value="2" description="Krivak II class" uuid="d698c7fe-5269-11df-b805-080069138b88" uid="13618">
+        <specific value="1" description="Bessmenny" deprecated="1" uuid="d699d518-5269-11df-bd10-080069138b88" uid="13619"/>
+        <specific value="2" description="Gordelivy" deprecated="1" uuid="d69adcce-5269-11df-ab2f-080069138b88" uid="13620"/>
+        <specific value="3" description="Gromky" deprecated="1" uuid="d69beca4-5269-11df-8ea0-080069138b88" uid="13621"/>
+        <specific value="4" description="Grozyashchy" deprecated="1" uuid="d69cf96e-5269-11df-b88d-080069138b88" uid="13622"/>
+        <specific value="5" description="Neukrotimy" uuid="d69e05d4-5269-11df-b008-080069138b88" uid="13623"/>
+        <specific value="6" description="Pitlivy" uuid="d69f137a-5269-11df-ae1e-080069138b88" uid="13624"/>
+        <specific value="7" description="Razitelny" deprecated="1" uuid="d6a023a0-5269-11df-a6bb-080069138b88" uid="13625"/>
+        <specific value="8" description="Revnosttny" deprecated="1" uuid="d6a12cb4-5269-11df-a86f-080069138b88" uid="13626"/>
+        <specific value="9" description="Rezky" deprecated="1" uuid="d6a239ba-5269-11df-b022-080069138b88" uid="13627"/>
+        <specific value="10" description="Rezvy" deprecated="1" uuid="d6a351a6-5269-11df-8f70-080069138b88" uid="13628"/>
+        <specific value="11" description="Ryanny" deprecated="1" uuid="d6a45ff6-5269-11df-9bd1-080069138b88" uid="13629"/>
+      </subcategory>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d6a60c70-5269-11df-8ecc-080069138b88" uid="13630"/>
+      <subcategory value="4" description="Neustrashimy class (FFG)" uuid="d6a71a02-5269-11df-8778-080069138b88" uid="13631">
+        <specific value="1" description="Neustrashimy" uuid="d6a82bf4-5269-11df-8659-080069138b88" uid="13632"/>
+        <specific value="2" description="Nepristupnyy" uuid="d6a93328-5269-11df-ac97-080069138b88" uid="13633"/>
+      </subcategory>
+      <subcategory value="5" description="Tarantul I class (Corvette)" uuid="d6aaddc2-5269-11df-bd9d-080069138b88" uid="13634"/>
+      <subcategory value="6" description="Tarantul II class (Corvette)" uuid="d6abf018-5269-11df-9704-080069138b88" uid="13635"/>
+      <subcategory value="7" description="Nanuchka I class (Corvette)" uuid="d6acfec2-5269-11df-b338-080069138b88" uid="13636">
+        <specific value="1" description="Grad" uuid="d6ae08d0-5269-11df-b1d9-080069138b88" uid="13637"/>
+        <specific value="2" description="Raduga" uuid="d6af1478-5269-11df-b180-080069138b88" uid="13638"/>
+        <specific value="3" description="Suval" uuid="d6b02516-5269-11df-9669-080069138b88" uid="13639"/>
+        <specific value="4" description="Storm" uuid="d6b12c9a-5269-11df-bd1d-080069138b88" uid="13640"/>
+        <specific value="5" description="Taifun" uuid="d6b237e8-5269-11df-a9ec-080069138b88" uid="13641"/>
+        <specific value="6" description="Zyklon" uuid="d6b34660-5269-11df-ae2b-080069138b88" uid="13642"/>
+        <specific value="7" description="Metl" uuid="d6b45244-5269-11df-a6a9-080069138b88" uid="13643"/>
+        <specific value="8" description="Zarnitsa" uuid="d6b55ee6-5269-11df-9629-080069138b88" uid="13644"/>
+        <specific value="9" description="Grom" uuid="d6b66a98-5269-11df-b8b5-080069138b88" uid="13645"/>
+        <specific value="10" description="Molnija" uuid="d6b772bc-5269-11df-9ce7-080069138b88" uid="13646"/>
+        <specific value="11" description="Musson" uuid="d6b88396-5269-11df-a740-080069138b88" uid="13647"/>
+        <specific value="12" description="Vichr" uuid="d6b98fd4-5269-11df-a682-080069138b88" uid="13648"/>
+        <specific value="13" description="Bora" uuid="d6ba9636-5269-11df-a9e5-080069138b88" uid="13649"/>
+        <specific value="14" description="Briz" uuid="d6bba698-5269-11df-b2f3-080069138b88" uid="13650"/>
+      </subcategory>
+      <subcategory value="8" description="Nanuchka III class (Corvette)" uuid="d6bd51b4-5269-11df-8d28-080069138b88" uid="13651">
+        <specific value="1" description="Mirazh-617" uuid="d6be5f14-5269-11df-a012-080069138b88" uid="13652"/>
+        <specific value="2" description="Zyb-560" uuid="d6bf6a44-5269-11df-92d4-080069138b88" uid="13653"/>
+        <specific value="3" description="Tucha" deprecated="1" uuid="d6c077ae-5269-11df-abb9-080069138b88" uid="13654"/>
+        <specific value="4" description="Priliv Burun-562" uuid="d6c18e0a-5269-11df-8f2d-080069138b88" uid="13655"/>
+        <specific value="5" description="Burun-566" uuid="d6c29548-5269-11df-8c8e-080069138b88" uid="13656"/>
+        <specific value="6" description="Liven-551" uuid="d6c3a514-5269-11df-b0e5-080069138b88" uid="13657"/>
+        <specific value="7" description="Passat-570" uuid="d6c4b5f8-5269-11df-a688-080069138b88" uid="13658"/>
+        <specific value="8" description="Moroz-409" uuid="d6c5bc3c-5269-11df-a9f2-080069138b88" uid="13659"/>
+        <specific value="9" description="Smerch-423" uuid="d6c6c9ba-5269-11df-b5f2-080069138b88" uid="13660"/>
+        <specific value="10" description="Inej-432" uuid="d6c7d8be-5269-11df-91bd-080069138b88" uid="13661"/>
+        <specific value="11" description="Rasssvet-520" uuid="d6c8e100-5269-11df-87bf-080069138b88" uid="13662"/>
+        <specific value="12" description="Razliv-450" uuid="d6c9ed84-5269-11df-94fa-080069138b88" uid="13663"/>
+        <specific value="13" description="Veter" uuid="d6caff08-5269-11df-9803-080069138b88" uid="13664"/>
+      </subcategory>
+      <subcategory value="9" description="Nanuchka IV class (Corvette)" uuid="d6ccac18-5269-11df-a983-080069138b88" uid="13665"/>
+      <subcategory value="10" description="Tarantul III class (Corvette)" uuid="d6cdb676-5269-11df-9b1e-080069138b88" uid="13666"/>
+      <subcategory value="11" description="Gepard Class" uuid="d6cec49e-5269-11df-9fd2-080069138b88" uid="13667">
+        <specific value="1" description="Gepard" uuid="d6cfd5d2-5269-11df-8847-080069138b88" uid="13668"/>
+      </subcategory>
+      <subcategory value="12" description="Nanuchka II class (Corvette)" uuid="d6d18062-5269-11df-8b05-080069138b88" uid="13669"/>
+    </category>
+    <category value="7" description="Light/Patrol craft" uuid="d6d3315a-5269-11df-b0e1-080069138b88" uid="13670">
+      <subcategory value="1" description="2/3 T 58 PGF/PGR class (patrol)" uuid="d6d43898-5269-11df-8b1f-080069138b88" uid="13671"/>
+      <subcategory value="2" description="Dergach class (light missile force)" uuid="d6d54774-5269-11df-a923-080069138b88" uid="13672">
+        <specific value="1" description="Sivuch" uuid="d6d659e8-5269-11df-b1a8-080069138b88" uid="13673"/>
+      </subcategory>
+      <subcategory value="3" description="OSA I class" uuid="d6d804dc-5269-11df-8e95-080069138b88" uid="13674"/>
+      <subcategory value="4" description="OSA II class" uuid="d6d90fe4-5269-11df-b54b-080069138b88" uid="13675"/>
+      <subcategory value="5" description="Poti class (fast attack craft--patrol)" uuid="d6da1e70-5269-11df-89aa-080069138b88" uid="13676"/>
+      <subcategory value="6" description="Svetlyak class (fast attack craft--patrol)" uuid="d6db2e50-5269-11df-9caf-080069138b88" uid="13677"/>
+      <subcategory value="7" description="Pauk I class (fast attack craft--patrol)" uuid="d6dc3962-5269-11df-92ff-080069138b88" uid="13678"/>
+      <subcategory value="8" description="Zhuk class" uuid="d6dd4a32-5269-11df-bd3c-080069138b88" uid="13679"/>
+      <subcategory value="9" description="Yaz class" uuid="d6de5a76-5269-11df-9a16-080069138b88" uid="13680"/>
+      <subcategory value="10" description="Stenka class" uuid="d6df61b4-5269-11df-883f-080069138b88" uid="13681"/>
+      <subcategory value="11" description="Piyavka class (river patrol craft)" uuid="d6e07860-5269-11df-8c96-080069138b88" uid="13682"/>
+      <subcategory value="12" description="SO 1 class" uuid="d6e18a3e-5269-11df-bc26-080069138b88" uid="13683"/>
+      <subcategory value="13" description="Shmel class (river patrol craft)" uuid="d6e295c8-5269-11df-8c34-080069138b88" uid="13684"/>
+      <subcategory value="14" description="TR 40 class (river patrol craft)" uuid="d6e3a5da-5269-11df-9bac-080069138b88" uid="13685"/>
+      <subcategory value="15" description="Command ship (river patrol craft)" uuid="d6e4b7cc-5269-11df-95be-080069138b88" uid="13686">
+        <specific value="1" description="SSV-10" uuid="d6e5c1ee-5269-11df-943f-080069138b88" uid="13687"/>
+      </subcategory>
+      <subcategory value="16" description="Potok class (torpedo experimental ships)" uuid="d6e7705c-5269-11df-8606-080069138b88" uid="13688">
+        <specific value="1" description="OS-100" uuid="d6e87e0c-5269-11df-b7ad-080069138b88" uid="13689"/>
+        <specific value="2" description="OS-138" uuid="d6e98b62-5269-11df-8878-080069138b88" uid="13690"/>
+        <specific value="3" description="OS-145" uuid="d6ea96f6-5269-11df-8a91-080069138b88" uid="13691"/>
+        <specific value="4" description="OS-225" uuid="d6eba366-5269-11df-9083-080069138b88" uid="13692"/>
+      </subcategory>
+      <subcategory value="17" description="Shelon class (torpedo operating/patrol &amp; target craft)" uuid="d6ed4f40-5269-11df-b650-080069138b88" uid="13693">
+        <specific value="1" description="YPT Weapon Recovery" uuid="d6ee62e0-5269-11df-b54b-080069138b88" uid="13694"/>
+        <specific value="2" description="Shelon II (Environmental Research)" uuid="d6ef6ba4-5269-11df-a376-080069138b88" uid="13695"/>
+      </subcategory>
+      <subcategory value="18" description="Poluchat I/II/III classes (torpedo operating/patrol &amp; target craft)" uuid="d6f119b8-5269-11df-9fa4-080069138b88" uid="13696"/>
+      <subcategory value="19" description="Pozharny I class" uuid="d6f22a38-5269-11df-99c1-080069138b88" uid="13697"/>
+      <subcategory value="20" description="Iva class (fire/patrol craft)" uuid="d6f33e00-5269-11df-afd5-080069138b88" uid="13698">
+        <specific value="1" description="PZHK 415" uuid="d6f446ec-5269-11df-a26d-080069138b88" uid="13699"/>
+        <specific value="2" description="1514" uuid="d6f55262-5269-11df-9fb9-080069138b88" uid="13700"/>
+        <specific value="3" description="1544" uuid="d6f65fb8-5269-11df-a943-080069138b88" uid="13701"/>
+        <specific value="4" description="1547" uuid="d6f76a52-5269-11df-bb56-080069138b88" uid="13702"/>
+        <specific value="5" description="1859" uuid="d6f87712-5269-11df-9ab6-080069138b88" uid="13703"/>
+      </subcategory>
+      <subcategory value="21" description="Vikhr class" uuid="d6fa213e-5269-11df-964c-080069138b88" uid="13704"/>
+      <subcategory value="22" description="Vosh class (river patrol craft)" uuid="d6fb3290-5269-11df-b430-080069138b88" uid="13705"/>
+      <subcategory value="23" description="Shershen class" uuid="d6fc455e-5269-11df-b546-080069138b88" uid="13706"/>
+      <subcategory value="24" description="Komar class" uuid="d6fd5930-5269-11df-a03a-080069138b88" uid="13707"/>
+      <subcategory value="25" description="Matka class" uuid="d6fe665e-5269-11df-939a-080069138b88" uid="13708"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship / Craft" uuid="d700205c-5269-11df-9bdd-080069138b88" uid="13709">
+      <subcategory value="1" description="Alesha Class" uuid="d7012916-5269-11df-a5de-080069138b88" uid="13710">
+        <specific value="1" description="Pripyat" uuid="d7023982-5269-11df-a0e4-080069138b88" uid="13711"/>
+        <specific value="2" description="Vychegda" uuid="d70346ec-5269-11df-84ce-080069138b88" uid="13712"/>
+        <specific value="3" description="Pechora" uuid="d70452b2-5269-11df-ad7f-080069138b88" uid="13713"/>
+      </subcategory>
+      <subcategory value="2" description="Natya I class" uuid="d705fd74-5269-11df-abf2-080069138b88" uid="13714">
+        <specific value="1" description="Dizelist" uuid="d70708ea-5269-11df-b9fa-080069138b88" uid="13715"/>
+        <specific value="2" description="Miner" uuid="d7081960-5269-11df-b718-080069138b88" uid="13716"/>
+        <specific value="3" description="Starshkiy" uuid="d7092058-5269-11df-8ccf-080069138b88" uid="13717"/>
+        <specific value="4" description="Snaypr" uuid="d70a2db8-5269-11df-901d-080069138b88" uid="13718"/>
+        <specific value="5" description="Elektrik" uuid="d70b3a3c-5269-11df-a2b4-080069138b88" uid="13719"/>
+        <specific value="6" description="Motorist" uuid="d70c45a8-5269-11df-a4cc-080069138b88" uid="13720"/>
+        <specific value="7" description="Signalshik" uuid="d70d5236-5269-11df-b6a7-080069138b88" uid="13721"/>
+        <specific value="8" description="Turbinist" uuid="d70e5e1a-5269-11df-a975-080069138b88" uid="13722"/>
+        <specific value="9" description="Polemetchiz" uuid="d70f692c-5269-11df-8e6c-080069138b88" uid="13723"/>
+        <specific value="10" description="Rulevoy" uuid="d7107646-5269-11df-b0d2-080069138b88" uid="13724"/>
+        <specific value="11" description="Zapal" uuid="d71182de-5269-11df-bb2c-080069138b88" uid="13725"/>
+        <specific value="12" description="Zenitchik" uuid="d7128a44-5269-11df-88c1-080069138b88" uid="13726"/>
+        <specific value="13" description="Radist" uuid="d713993e-5269-11df-9b05-080069138b88" uid="13727"/>
+        <specific value="14" description="Dobrotay" uuid="d714aa72-5269-11df-8ea3-080069138b88" uid="13728"/>
+        <specific value="15" description="Zaryad" uuid="d715b08e-5269-11df-91a9-080069138b88" uid="13729"/>
+      </subcategory>
+      <subcategory value="3" description="Natya II class" uuid="d7175b14-5269-11df-8554-080069138b88" uid="13730"/>
+      <subcategory value="4" description="Yurka class" uuid="d7186a54-5269-11df-b128-080069138b88" uid="13731">
+        <specific value="1" description="Gafel" uuid="d7197ba6-5269-11df-9ff2-080069138b88" uid="13732"/>
+        <specific value="2" description="Evgeniy Nikonov" uuid="d71a8262-5269-11df-8c28-080069138b88" uid="13733"/>
+        <specific value="3" description="Mazlov" uuid="d71b8fb8-5269-11df-9267-080069138b88" uid="13734"/>
+        <specific value="4" description="Navodchik" uuid="d71ca024-5269-11df-bb5c-080069138b88" uid="13735"/>
+        <specific value="5" description="Semen Rosal" uuid="d71db04a-5269-11df-84da-080069138b88" uid="13736"/>
+      </subcategory>
+      <subcategory value="5" description="T-43 class" uuid="d71f5ca6-5269-11df-ad5b-080069138b88" uid="13737"/>
+      <subcategory value="6" description="Sonya class" uuid="d7206b00-5269-11df-a3de-080069138b88" uid="13738"/>
+      <subcategory value="7" description="Baltika class" uuid="d7217cd4-5269-11df-98b4-080069138b88" uid="13739"/>
+      <subcategory value="8" description="Vanya I class" uuid="d7228430-5269-11df-82af-080069138b88" uid="13740"/>
+      <subcategory value="9" description="Vanya II class" uuid="d7239208-5269-11df-9109-080069138b88" uid="13741"/>
+      <subcategory value="10" description="Sasha class" uuid="d724a1ca-5269-11df-8a5a-080069138b88" uid="13742"/>
+      <subcategory value="11" description="Yevgenya class" uuid="d725ab42-5269-11df-bbd6-080069138b88" uid="13743"/>
+      <subcategory value="12" description="Pelikan class ACV (minesweeper, inshore)" uuid="d726b906-5269-11df-99d8-080069138b88" uid="13744"/>
+      <subcategory value="13" description="Lida class (minehunter, inshore)" uuid="d727cce2-5269-11df-b173-080069138b88" uid="13745"/>
+      <subcategory value="14" description="Ilyusha class (minesweeper, inshore)" uuid="d728d736-5269-11df-a641-080069138b88" uid="13746"/>
+      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="d729e658-5269-11df-a4b7-080069138b88" uid="13747"/>
+      <subcategory value="16" description="Olya class (minesweeper, inshore)" uuid="d72af692-5269-11df-94bf-080069138b88" uid="13748"/>
+      <subcategory value="17" description="Tanya class (minesweeper, inshore)" uuid="d72c0492-5269-11df-b5c6-080069138b88" uid="13749"/>
+      <subcategory value="18" description="K 8 class (minesweeping boat)" uuid="d72d1382-5269-11df-9174-080069138b88" uid="13750"/>
+      <subcategory value="19" description="Gorya class (minehunter, ocean)" uuid="d72e2268-5269-11df-8b37-080069138b88" uid="13751">
+        <specific value="1" description="Zheleznyakov" uuid="d72f2a46-5269-11df-80c2-080069138b88" uid="13752"/>
+      </subcategory>
+    </category>
+    <category value="9" description="Dock landing ship" uuid="d7317ddc-5269-11df-855b-080069138b88" uid="13753">
+      <subcategory value="1" description="Ivan Rogov class" uuid="d7328510-5269-11df-93c6-080069138b88" uid="13754">
+        <specific value="1" description="Ivan Rogov" uuid="d7339248-5269-11df-b4c1-080069138b88" uid="13755"/>
+        <specific value="2" description="Aleksandr Nikolay" uuid="d734a0b6-5269-11df-bd08-080069138b88" uid="13756"/>
+        <specific value="3" description="Mitrofan Moskalenko" uuid="d735ac40-5269-11df-8110-080069138b88" uid="13757"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Tank landing ship" uuid="d737f9e6-5269-11df-ab16-080069138b88" uid="13758">
+      <subcategory value="1" description="Ropucha class" uuid="d7390368-5269-11df-93ee-080069138b88" uid="13759">
+        <specific value="1" description="Aleksandr Shabalin" uuid="d73a0ff6-5269-11df-b7b8-080069138b88" uid="13760"/>
+        <specific value="2" description="Constantin Olshanskiy" uuid="d73b1e46-5269-11df-807e-080069138b88" uid="13761"/>
+        <specific value="3" description="Tsesar Kunikov" uuid="d73c2fe8-5269-11df-bc87-080069138b88" uid="13762"/>
+        <specific value="4" description="Bobruisk" uuid="d73d3d5c-5269-11df-83ae-080069138b88" uid="13763"/>
+      </subcategory>
+      <subcategory value="2" description="Alligator class" uuid="d73eedc8-5269-11df-8fcf-080069138b88" uid="13764">
+        <specific value="1" description="Aleksandr Tortsev" uuid="d73ffaa6-5269-11df-b8e1-080069138b88" uid="13765"/>
+        <specific value="2" description="Donetskiy Shakhter" uuid="d74102c0-5269-11df-9e4b-080069138b88" uid="13766"/>
+        <specific value="3" description="Krasnaya Presnya" uuid="d7421408-5269-11df-a205-080069138b88" uid="13767"/>
+        <specific value="4" description="Krymskiy Kom." uuid="d743244c-5269-11df-813f-080069138b88" uid="13768"/>
+        <specific value="5" description="Nikolay Fil'chenkov" uuid="d7442d88-5269-11df-b595-080069138b88" uid="13769"/>
+        <specific value="6" description="Nikolay Vilkov" uuid="d7453a16-5269-11df-8b74-080069138b88" uid="13770"/>
+        <specific value="7" description="50 Let Sheftsva Vlksm" uuid="d7464bea-5269-11df-b1f8-080069138b88" uid="13771"/>
+        <specific value="8" description="Petr Il'ichyev" uuid="d74754f4-5269-11df-9860-080069138b88" uid="13772"/>
+        <specific value="9" description="Sergei Lazo" uuid="d74861dc-5269-11df-918b-080069138b88" uid="13773"/>
+        <specific value="10" description="Tomskiy Kom." uuid="d7496ef6-5269-11df-9ba2-080069138b88" uid="13774"/>
+        <specific value="11" description="Ilya Azarov" uuid="d74a7b16-5269-11df-9491-080069138b88" uid="13775"/>
+      </subcategory>
+      <subcategory value="3" description="Polnocny class" uuid="d74c26a0-5269-11df-9343-080069138b88" uid="13776"/>
+    </category>
+    <category value="11" description="Landing craft" uuid="d74dd090-5269-11df-9071-080069138b88" uid="13777">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d74ee142-5269-11df-8f4f-080069138b88" uid="13778"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d74fef88-5269-11df-ad2b-080069138b88" uid="13779"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="d750fb12-5269-11df-900a-080069138b88" uid="13780"/>
+      <subcategory value="4" description="Vydra class" uuid="d7520908-5269-11df-9925-080069138b88" uid="13781"/>
+      <subcategory value="5" description="Ondatra class" uuid="d7531b40-5269-11df-b33c-080069138b88" uid="13782"/>
+    </category>
+    <category value="13" description="Cruiser/Helicopter Carrier" uuid="d754c6ac-5269-11df-a2a1-080069138b88" uid="13783">
+      <subcategory value="1" description="Moskva class" deprecated="1" uuid="d755d04c-5269-11df-bfc8-080069138b88" uid="13784"/>
+    </category>
+    <category value="14" description="Hydrofoil" uuid="d75782e8-5269-11df-88e3-080069138b88" uid="13785">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="d7588ff8-5269-11df-8105-080069138b88" uid="13786"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="d7599fec-5269-11df-9bdd-080069138b88" uid="13787"/>
+      <subcategory value="3" description="Matka class (fast attack craft, missile hydrofoil)" uuid="d75ab2f6-5269-11df-b84f-080069138b88" uid="13788"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="d75bc416-5269-11df-9e58-080069138b88" uid="13789"/>
+      <subcategory value="5" description="Mukha class (fast attack craft, patrol hydrofoil)" uuid="d75cd874-5269-11df-94d1-080069138b88" uid="13790"/>
+      <subcategory value="6" description="Turya class (fast attack craft, torpedo hydrofoil)" uuid="d75de444-5269-11df-bf7f-080069138b88" uid="13791"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="d75ef3c0-5269-11df-94ed-080069138b88" uid="13792"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="d7600512-5269-11df-941c-080069138b88" uid="13793"/>
+      <subcategory value="9" description="Babochka class (fast attack craft, patrol hydrofoil)" uuid="d7611380-5269-11df-adfa-080069138b88" uid="13794"/>
+      <subcategory value="10" description="Muravey class (fast attack craft, patrol hydrofoil)" uuid="d7622478-5269-11df-bbe1-080069138b88" uid="13795"/>
+    </category>
+    <category value="15" description="Air cushion/Surface effect" uuid="d763d17e-5269-11df-9a51-080069138b88" uid="13796">
+      <subcategory value="1" description="Pomornik class (air-cushion vehicles)" uuid="d764e618-5269-11df-85aa-080069138b88" uid="13797"/>
+      <subcategory value="2" description="Aist class (air-cushion vehicles)" uuid="d765f06c-5269-11df-a816-080069138b88" uid="13798"/>
+      <subcategory value="3" description="Tsaplya class (air-cushion vehicles)" uuid="d766ffca-5269-11df-89d3-080069138b88" uid="13799"/>
+      <subcategory value="4" description="Lebed class (air-cushion vehicles)" deprecated="1" uuid="d7680df2-5269-11df-a9cf-080069138b88" uid="13800"/>
+      <subcategory value="5" description="Utenok class (air-cushion vehicles)" deprecated="1" uuid="d7691cc4-5269-11df-98fe-080069138b88" uid="13801"/>
+      <subcategory value="6" description="Gus class (air-cushion vehicles)" deprecated="1" uuid="d76a2dda-5269-11df-9366-080069138b88" uid="13802"/>
+      <subcategory value="7" description="Utka class (wing-in-ground-effect craft) (air cushion)" uuid="d76b3f5e-5269-11df-9459-080069138b88" uid="13803"/>
+      <subcategory value="8" description="Orlan class (wing-in-ground-effect craft) (air cushion)" uuid="d76c4d54-5269-11df-96eb-080069138b88" uid="13804"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="d76dfa46-5269-11df-a404-080069138b88" uid="13805">
+      <subcategory value="1" description="Ugra class (submarine depot ships)" uuid="d76f079c-5269-11df-91c1-080069138b88" uid="13806">
+        <specific value="1" description="Ivan Kolyshkin" uuid="d7701c22-5269-11df-b3d6-080069138b88" uid="13807"/>
+        <specific value="2" description="Ivan Vakhrameev" uuid="d77124be-5269-11df-ac91-080069138b88" uid="13808"/>
+        <specific value="3" description="Volga" uuid="d7723232-5269-11df-b297-080069138b88" uid="13809"/>
+        <specific value="4" description="Ivan Kucherenko" uuid="d77342f8-5269-11df-8e47-080069138b88" uid="13810"/>
+        <specific value="5" description="(deprecated)" deprecated="1" uuid="d7744a2c-5269-11df-815b-080069138b88" uid="13811"/>
+        <specific value="6" description="Lentra" uuid="d7755818-5269-11df-bd5c-080069138b88" uid="13812"/>
+      </subcategory>
+      <subcategory value="2" description="Don class (submarine depot ships)" uuid="d7770686-5269-11df-a1f1-080069138b88" uid="13813">
+        <specific value="1" description="Dmitry Galkin" uuid="d778177e-5269-11df-af9d-080069138b88" uid="13814"/>
+        <specific value="2" description="Kamchatsky Kkomsomolets" uuid="d7791ffc-5269-11df-ae6a-080069138b88" uid="13815"/>
+        <specific value="3" description="Magomet Gadzhiev (ex-Mikhail Tukhachevsky)" uuid="d77a370c-5269-11df-95b4-080069138b88" uid="13816"/>
+        <specific value="4" description="Viktor Kotelnikov" uuid="d77b498a-5269-11df-adbd-080069138b88" uid="13817"/>
+        <specific value="5" description="Fedor Vidyayev" uuid="d77c5212-5269-11df-adee-080069138b88" uid="13818"/>
+        <specific value="6" description="Magadansky Komsomolets" uuid="d77d5f04-5269-11df-8bbb-080069138b88" uid="13819"/>
+      </subcategory>
+      <subcategory value="3" description="Aleksandr Brykin class (missile support ship)" uuid="d77f1196-5269-11df-b070-080069138b88" uid="13820">
+        <specific value="1" description="Aleksandr Brykin" uuid="d78020ea-5269-11df-a889-080069138b88" uid="13821"/>
+      </subcategory>
+      <subcategory value="4" description="Amga class (missile support ships)" uuid="d781cd1e-5269-11df-9c8e-080069138b88" uid="13822">
+        <specific value="1" description="Amga" uuid="d782d9a2-5269-11df-8bf3-080069138b88" uid="13823"/>
+        <specific value="2" description="Vetluga" uuid="d783e680-5269-11df-a764-080069138b88" uid="13824"/>
+        <specific value="3" description="Daugava" uuid="d784f2d2-5269-11df-87bc-080069138b88" uid="13825"/>
+      </subcategory>
+      <subcategory value="5" description="Malina class (nuclear submarine support ships)" uuid="d786a1f4-5269-11df-8a3b-080069138b88" uid="13826">
+        <specific value="1" description="PM 63" uuid="d787aae0-5269-11df-9846-080069138b88" uid="13827"/>
+        <specific value="2" description="PM 74" uuid="d788b6d8-5269-11df-a0ea-080069138b88" uid="13828"/>
+        <specific value="3" description="PM 12" uuid="d789c492-5269-11df-8584-080069138b88" uid="13829"/>
+      </subcategory>
+      <subcategory value="6" description="Pinega class (nuclear submarine support ships)" uuid="d78b712a-5269-11df-a027-080069138b88" uid="13830">
+        <specific value="1" description="Pinega" uuid="d78c7dc2-5269-11df-b51e-080069138b88" uid="13831"/>
+        <specific value="2" description="Amur" uuid="d78d8b04-5269-11df-83f9-080069138b88" uid="13832"/>
+      </subcategory>
+      <subcategory value="7" description="Lama class (missile support ships)" uuid="d78f3792-5269-11df-99bd-080069138b88" uid="13833">
+        <specific value="1" description="General Ryabakov" uuid="d790461e-5269-11df-95a4-080069138b88" uid="13834"/>
+        <specific value="2" description="Voronesh" uuid="d7915252-5269-11df-81f0-080069138b88" uid="13835"/>
+        <specific value="3" description="PM 44" uuid="d7925f1c-5269-11df-9451-080069138b88" uid="13836"/>
+        <specific value="4" description="PM 93" uuid="d7936ab0-5269-11df-951e-080069138b88" uid="13837"/>
+        <specific value="5" description="PM 131" uuid="d794723e-5269-11df-b0f9-080069138b88" uid="13838"/>
+        <specific value="6" description="PM 150" uuid="d7958624-5269-11df-a25e-080069138b88" uid="13839"/>
+        <specific value="7" description="PM 154" uuid="d79696b8-5269-11df-8cc7-080069138b88" uid="13840"/>
+      </subcategory>
+      <subcategory value="8" description="Modified Andizhan class (missile support ships)" uuid="d7984a62-5269-11df-b134-080069138b88" uid="13841">
+        <specific value="1" description="Venta" uuid="d79958e4-5269-11df-b661-080069138b88" uid="13842"/>
+        <specific value="2" description="Vilyuy" uuid="d79a6626-5269-11df-8bf7-080069138b88" uid="13843"/>
+      </subcategory>
+      <subcategory value="9" description="Amur I Class (Repair Ship)" uuid="d79c1386-5269-11df-893b-080069138b88" uid="13844">
+        <specific value="1" description="PM 9" uuid="d79d1fa6-5269-11df-bfb9-080069138b88" uid="13845"/>
+        <specific value="2" description="PM 10" uuid="d79e2aea-5269-11df-8c0d-080069138b88" uid="13846"/>
+        <specific value="3" description="PM 15" uuid="d79f3886-5269-11df-a4d5-080069138b88" uid="13847"/>
+        <specific value="4" description="PM 37" uuid="d7a04604-5269-11df-b72d-080069138b88" uid="13848"/>
+        <specific value="5" description="PM 49" uuid="d7a15094-5269-11df-98ca-080069138b88" uid="13849"/>
+        <specific value="6" description="PM 52" uuid="d7a25d5e-5269-11df-896c-080069138b88" uid="13850"/>
+        <specific value="7" description="PM 56" uuid="d7a36a5a-5269-11df-9437-080069138b88" uid="13851"/>
+        <specific value="8" description="PM 75" uuid="d7a47026-5269-11df-ab75-080069138b88" uid="13852"/>
+        <specific value="9" description="PM 94" uuid="d7a57e12-5269-11df-8639-080069138b88" uid="13853"/>
+        <specific value="10" description="PM 138" uuid="d7a68f1e-5269-11df-bbe1-080069138b88" uid="13854"/>
+        <specific value="11" description="PM 161" uuid="d7a79594-5269-11df-80fa-080069138b88" uid="13855"/>
+        <specific value="12" description="PM 163" uuid="d7a8a272-5269-11df-8864-080069138b88" uid="13856"/>
+        <specific value="13" description="5" uuid="d7a9b0c2-5269-11df-9f0e-080069138b88" uid="13857"/>
+        <specific value="14" description="30" uuid="d7aab954-5269-11df-8684-080069138b88" uid="13858"/>
+        <specific value="15" description="34" uuid="d7abc484-5269-11df-9fea-080069138b88" uid="13859"/>
+        <specific value="16" description="40" uuid="d7acd63a-5269-11df-8629-080069138b88" uid="13860"/>
+        <specific value="17" description="64" uuid="d7adde72-5269-11df-b42d-080069138b88" uid="13861"/>
+        <specific value="18" description="73" uuid="d7aeec40-5269-11df-861f-080069138b88" uid="13862"/>
+        <specific value="19" description="81" uuid="d7aff928-5269-11df-b013-080069138b88" uid="13863"/>
+        <specific value="20" description="82" uuid="d7b10412-5269-11df-9b7a-080069138b88" uid="13864"/>
+        <specific value="21" description="129" uuid="d7b2108c-5269-11df-984b-080069138b88" uid="13865"/>
+        <specific value="22" description="139" uuid="d7b31bee-5269-11df-9a6f-080069138b88" uid="13866"/>
+        <specific value="23" description="140" uuid="d7b4239a-5269-11df-b077-080069138b88" uid="13867"/>
+        <specific value="24" description="156" uuid="d7b53488-5269-11df-86f1-080069138b88" uid="13868"/>
+      </subcategory>
+      <subcategory value="10" description="Amur II Class (repair ship)" uuid="d7b6e7e2-5269-11df-b00f-080069138b88" uid="13869">
+        <specific value="1" description="59" uuid="d7b7f600-5269-11df-94f3-080069138b88" uid="13870"/>
+        <specific value="2" description="69" uuid="d7b90194-5269-11df-8bc1-080069138b88" uid="13871"/>
+        <specific value="3" description="86" uuid="d7ba0daa-5269-11df-ae6e-080069138b88" uid="13872"/>
+        <specific value="4" description="92" uuid="d7bb195c-5269-11df-a633-080069138b88" uid="13873"/>
+        <specific value="5" description="97" uuid="d7bc243c-5269-11df-bb8e-080069138b88" uid="13874"/>
+      </subcategory>
+      <subcategory value="11" description="Oskol class (repair ships)" uuid="d7bdcfee-5269-11df-adf5-080069138b88" uid="13875">
+        <specific value="1" description="PM 2" uuid="d7beddda-5269-11df-984b-080069138b88" uid="13876"/>
+        <specific value="2" description="PM 24" uuid="d7bfec34-5269-11df-9485-080069138b88" uid="13877"/>
+        <specific value="3" description="PM 26" uuid="d7c0f35e-5269-11df-a764-080069138b88" uid="13878"/>
+        <specific value="4" description="PM 42" uuid="d7c2014a-5269-11df-a01c-080069138b88" uid="13879"/>
+        <specific value="5" description="PM 147" uuid="d7c30d06-5269-11df-a2e0-080069138b88" uid="13880"/>
+        <specific value="6" description="PM 148" uuid="d7c417d2-5269-11df-9415-080069138b88" uid="13881"/>
+        <specific value="7" description="20" uuid="d7c523b6-5269-11df-b487-080069138b88" uid="13882"/>
+        <specific value="8" description="21" uuid="d7c630ee-5269-11df-ade4-080069138b88" uid="13883"/>
+        <specific value="9" description="51" uuid="d7c73a02-5269-11df-9fcf-080069138b88" uid="13884"/>
+        <specific value="10" description="68" uuid="d7c84640-5269-11df-99d0-080069138b88" uid="13885"/>
+        <specific value="11" description="146" uuid="d7c951f2-5269-11df-a132-080069138b88" uid="13886"/>
+      </subcategory>
+      <subcategory value="12" description="Tomba class (support ships)" uuid="d7cb00b0-5269-11df-afed-080069138b88" uid="13887">
+        <specific value="1" description="244" uuid="d7cc07f8-5269-11df-b7c2-080069138b88" uid="13888"/>
+        <specific value="2" description="254" uuid="d7cd15a8-5269-11df-86da-080069138b88" uid="13889"/>
+        <specific value="3" description="348" uuid="d7ce20b0-5269-11df-858f-080069138b88" uid="13890"/>
+        <specific value="4" description="357" uuid="d7cf6f42-5269-11df-97ad-080069138b88" uid="13891"/>
+      </subcategory>
+      <subcategory value="13" description="Vytegrales class (support &amp; depot)" uuid="d7d11eb4-5269-11df-afb9-080069138b88" uid="13892">
+        <specific value="1" description="Apsheron (ex-Vagales)" uuid="d7d231f0-5269-11df-a525-080069138b88" uid="13893"/>
+        <specific value="2" description="Baskunchak (ex-Kirishi)" uuid="d7d342ca-5269-11df-bf11-080069138b88" uid="13894"/>
+        <specific value="3" description="Dauriya (ex-Vyborgles)" uuid="d7d44d0a-5269-11df-944f-080069138b88" uid="13895"/>
+        <specific value="4" description="Dikson (ex-Vostok 3)" uuid="d7d56442-5269-11df-879c-080069138b88" uid="13896"/>
+        <specific value="5" description="Donbas (ex-Vostok 4)" uuid="d7d674b8-5269-11df-a4c4-080069138b88" uid="13897"/>
+        <specific value="6" description="Sevan (ex-Siverles)" uuid="d7d78268-5269-11df-be2f-080069138b88" uid="13898"/>
+        <specific value="7" description="Taman (ex-Suzdal)" uuid="d7d89040-5269-11df-8ef3-080069138b88" uid="13899"/>
+        <specific value="8" description="Yamal (ex-Tosnoles)" uuid="d7d99cce-5269-11df-a89b-080069138b88" uid="13900"/>
+      </subcategory>
+      <subcategory value="14" description="Vishnya class (AGIs)" uuid="d7db4c5e-5269-11df-b120-080069138b88" uid="13901">
+        <specific value="1" description="SSV 169" uuid="d7dc54e6-5269-11df-bc2b-080069138b88" uid="13902"/>
+        <specific value="2" description="SSV 175" uuid="d7dd62be-5269-11df-aa40-080069138b88" uid="13903"/>
+        <specific value="3" description="SSV 201" uuid="d7de72e4-5269-11df-afd3-080069138b88" uid="13904"/>
+        <specific value="4" description="SSV 208" uuid="d7df7aa4-5269-11df-887d-080069138b88" uid="13905"/>
+        <specific value="5" description="SSV 231" uuid="d7e087a0-5269-11df-93bd-080069138b88" uid="13906"/>
+        <specific value="6" description="SSV 520" uuid="d7e19604-5269-11df-b42a-080069138b88" uid="13907"/>
+        <specific value="7" description="SSV 535" uuid="d7e29d10-5269-11df-a5ff-080069138b88" uid="13908"/>
+      </subcategory>
+      <subcategory value="15" description="Balzam class (AGIs)" uuid="d7e44e12-5269-11df-9cfc-080069138b88" uid="13909">
+        <specific value="1" description="SSV 80" uuid="d7e55cd0-5269-11df-9a45-080069138b88" uid="13910"/>
+        <specific value="2" description="SSV 493" uuid="d7e66896-5269-11df-b375-080069138b88" uid="13911"/>
+        <specific value="3" description="SSV 516" uuid="d7e77128-5269-11df-8960-080069138b88" uid="13912"/>
+        <specific value="4" description="SSV 571" uuid="d7e881bc-5269-11df-ab1a-080069138b88" uid="13913"/>
+      </subcategory>
+      <subcategory value="16" description="Primorye class (AGIs)" uuid="d7ea2ddc-5269-11df-82a2-080069138b88" uid="13914">
+        <specific value="1" description="SSV 464 Zabaykalye" uuid="d7eb3aba-5269-11df-bed2-080069138b88" uid="13915"/>
+        <specific value="2" description="SSV 465 Primorye" uuid="d7ec4752-5269-11df-bd3d-080069138b88" uid="13916"/>
+        <specific value="3" description="SSV 501 Zaporozhye" uuid="d7ed566a-5269-11df-abe2-080069138b88" uid="13917"/>
+        <specific value="4" description="SSV 502 Zakarpatye" uuid="d7ee644c-5269-11df-9b31-080069138b88" uid="13918"/>
+        <specific value="5" description="SSV 590 Krym" uuid="d7ef6f90-5269-11df-8be9-080069138b88" uid="13919"/>
+        <specific value="6" description="SSV 591 Kavkaz" uuid="d7f07ce6-5269-11df-862b-080069138b88" uid="13920"/>
+      </subcategory>
+      <subcategory value="17" description="Nikolay Zubov class (AGIs)" uuid="d7f22906-5269-11df-a0d1-080069138b88" uid="13921">
+        <specific value="1" description="SSV 468 Gavril Sarychev (mod)" uuid="d7f33954-5269-11df-8cb4-080069138b88" uid="13922"/>
+        <specific value="2" description="SSV 469 Semen Chelyuskin" uuid="d7f44a2e-5269-11df-bac3-080069138b88" uid="13923"/>
+        <specific value="3" description="SSV 503 Khariton Laptev (mod)" uuid="d7f55bc6-5269-11df-b52d-080069138b88" uid="13924"/>
+      </subcategory>
+      <subcategory value="18" description="Modified Pamir class (AGIs)" uuid="d7f70a3e-5269-11df-8573-080069138b88" uid="13925">
+        <specific value="1" description="SSV 477 Peleng (ex-Arban)" uuid="d7f81b68-5269-11df-bc82-080069138b88" uid="13926"/>
+      </subcategory>
+      <subcategory value="19" description="Moma class (AGIs)" uuid="d7f9c706-5269-11df-8303-080069138b88" uid="13927">
+        <specific value="1" description="Ekvator" uuid="d7fad0a6-5269-11df-8e68-080069138b88" uid="13928"/>
+        <specific value="2" description="Yupiter (mod)" uuid="d7fbe158-5269-11df-9b0d-080069138b88" uid="13929"/>
+        <specific value="3" description="Kildin (mod)" uuid="d7fcef62-5269-11df-a7b9-080069138b88" uid="13930"/>
+        <specific value="4" description="SSV 472 (ex-Ilmen) (mod)" uuid="d7fdf9f2-5269-11df-8b3d-080069138b88" uid="13931"/>
+        <specific value="5" description="SSV 474 (ex-Vega) (mod)" uuid="d7ff0c84-5269-11df-ae0a-080069138b88" uid="13932"/>
+        <specific value="6" description="SSV 506 (ex-Nakhodka)" uuid="d8001afc-5269-11df-8ab4-080069138b88" uid="13933"/>
+        <specific value="7" description="SSV 509 (ex-Pelorus) (mod)" uuid="d801233e-5269-11df-832b-080069138b88" uid="13934"/>
+        <specific value="8" description="SSV 512 (ex-Arkhipelag) (mod)" uuid="d802329c-5269-11df-98c3-080069138b88" uid="13935"/>
+        <specific value="9" description="SSV 514 (ex-Seliger) (mod)" uuid="d80345d8-5269-11df-b447-080069138b88" uid="13936"/>
+      </subcategory>
+      <subcategory value="20" description="Alpinist class (AGIs)" uuid="d804f23e-5269-11df-bad8-080069138b88" uid="13937">
+        <specific value="1" description="GS 7 (mod)" uuid="d805fb48-5269-11df-9dbb-080069138b88" uid="13938"/>
+        <specific value="2" description="GS 8" uuid="d8070c4a-5269-11df-be89-080069138b88" uid="13939"/>
+        <specific value="3" description="GS 19 (mod)" uuid="d80819c8-5269-11df-b434-080069138b88" uid="13940"/>
+        <specific value="4" description="GS 39 (mod)" uuid="d8092034-5269-11df-b039-080069138b88" uid="13941"/>
+      </subcategory>
+      <subcategory value="21" description="Mayak class" uuid="d80ad08c-5269-11df-8084-080069138b88" uid="13942">
+        <specific value="1" description="Khersones" uuid="d80bdf40-5269-11df-9287-080069138b88" uid="13943"/>
+        <specific value="2" description="Kurs" uuid="d80cec96-5269-11df-b447-080069138b88" uid="13944"/>
+        <specific value="3" description="Kursograf" uuid="d80df6fe-5269-11df-94eb-080069138b88" uid="13945"/>
+        <specific value="4" description="Ladoga" uuid="d80f0440-5269-11df-bdbe-080069138b88" uid="13946"/>
+        <specific value="5" description="GS 239" uuid="d8101128-5269-11df-b196-080069138b88" uid="13947"/>
+        <specific value="6" description="GS 242" uuid="d8111794-5269-11df-9827-080069138b88" uid="13948"/>
+        <specific value="7" description="Girorulevoy" uuid="d81225bc-5269-11df-aeda-080069138b88" uid="13949"/>
+        <specific value="8" description="Aneroid" uuid="d8134050-5269-11df-98e3-080069138b88" uid="13950"/>
+      </subcategory>
+      <subcategory value="22" description="Okean class (AGIs)" uuid="d814ed88-5269-11df-a71a-080069138b88" uid="13951">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="d815f4e4-5269-11df-aa8d-080069138b88" uid="13952"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="d8170640-5269-11df-8984-080069138b88" uid="13953"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="d818195e-5269-11df-a1e0-080069138b88" uid="13954"/>
+        <specific value="4" description="Ekholot" uuid="d8192204-5269-11df-a550-080069138b88" uid="13955"/>
+        <specific value="5" description="Krenometr" uuid="d81a2e1a-5269-11df-9bd8-080069138b88" uid="13956"/>
+        <specific value="6" description="Linza (mod)" uuid="d81b3d5a-5269-11df-99a4-080069138b88" uid="13957"/>
+        <specific value="7" description="Lotlin (mod)" uuid="d81c46fa-5269-11df-9dc3-080069138b88" uid="13958"/>
+        <specific value="8" description="Reduktor (mod)" uuid="d81d53ba-5269-11df-8048-080069138b88" uid="13959"/>
+        <specific value="9" description="Repiter" uuid="d81e65c0-5269-11df-a917-080069138b88" uid="13960"/>
+        <specific value="10" description="Teodolit" uuid="d81f6e02-5269-11df-b053-080069138b88" uid="13961"/>
+        <specific value="11" description="Traverz" uuid="d8207b30-5269-11df-9007-080069138b88" uid="13962"/>
+        <specific value="12" description="Zond (mod) no missiles" uuid="d821893a-5269-11df-9163-080069138b88" uid="13963"/>
+      </subcategory>
+      <subcategory value="23" description="Lentra class (AGIs)" uuid="d8233a00-5269-11df-b79d-080069138b88" uid="13964">
+        <specific value="1" description="GS 41" uuid="d82441e8-5269-11df-ab58-080069138b88" uid="13965"/>
+        <specific value="2" description="GS 43 (mod)" uuid="d8254e80-5269-11df-924d-080069138b88" uid="13966"/>
+        <specific value="3" description="GS 55" uuid="d8265ce4-5269-11df-a351-080069138b88" uid="13967"/>
+        <specific value="4" description="GS 59" uuid="d8276882-5269-11df-b9d7-080069138b88" uid="13968"/>
+      </subcategory>
+      <subcategory value="24" description="Akademik Krylov class (naval research)" uuid="d82913c6-5269-11df-8a77-080069138b88" uid="13969">
+        <specific value="1" description="Admiral Vladimirsky" uuid="d82a2248-5269-11df-9e4f-080069138b88" uid="13970"/>
+        <specific value="2" description="Ivan Kruzenshtern" uuid="d82b337c-5269-11df-b2ce-080069138b88" uid="13971"/>
+        <specific value="3" description="Leonid Demin" uuid="d82c3f7e-5269-11df-a68f-080069138b88" uid="13972"/>
+        <specific value="4" description="Akademik Krylov" uuid="d82d4d38-5269-11df-b3ae-080069138b88" uid="13973"/>
+        <specific value="5" description="Leonid Sobolev" uuid="d82e5994-5269-11df-abe5-080069138b88" uid="13974"/>
+        <specific value="6" description="Mikhail Krupsky" uuid="d82f64ec-5269-11df-a597-080069138b88" uid="13975"/>
+      </subcategory>
+      <subcategory value="25" description="Abkhaziya class (naval research)" uuid="d8311184-5269-11df-9b35-080069138b88" uid="13976">
+        <specific value="1" description="Abkhaziya" uuid="d83229f2-5269-11df-922a-080069138b88" uid="13977"/>
+        <specific value="2" description="Adzhariya" uuid="d833387e-5269-11df-a1c2-080069138b88" uid="13978"/>
+        <specific value="3" description="Bashkiriya" uuid="d8344520-5269-11df-8960-080069138b88" uid="13979"/>
+        <specific value="4" description="Moldavia" uuid="d8355262-5269-11df-8031-080069138b88" uid="13980"/>
+      </subcategory>
+      <subcategory value="26" description="Polyus class (Kovel type) (naval research)" uuid="d836fd6a-5269-11df-9a50-080069138b88" uid="13981">
+        <specific value="1" description="Baykal (mod)" uuid="d8381042-5269-11df-9d28-080069138b88" uid="13982"/>
+        <specific value="2" description="Balkhash (mod)" uuid="d8391898-5269-11df-a1dd-080069138b88" uid="13983"/>
+        <specific value="3" description="Polyus" uuid="d83a25e4-5269-11df-a668-080069138b88" uid="13984"/>
+      </subcategory>
+      <subcategory value="27" description="Modified Dobrynya Nikitich class (naval research)" uuid="d83bd678-5269-11df-ab3b-080069138b88" uid="13985">
+        <specific value="1" description="Vladimir Kavraysky" uuid="d83ce69e-5269-11df-8317-080069138b88" uid="13986"/>
+      </subcategory>
+      <subcategory value="28" description="Nikolay Zubov class (naval research)" uuid="d83e96b0-5269-11df-b253-080069138b88" uid="13987">
+        <specific value="1" description="Aleksey Chirikov" uuid="d83fa000-5269-11df-b994-080069138b88" uid="13988"/>
+        <specific value="2" description="Fedor Litke" uuid="d840ad06-5269-11df-b7af-080069138b88" uid="13989"/>
+        <specific value="3" description="Andrey Vilkitsky" uuid="d841bb74-5269-11df-b37c-080069138b88" uid="13990"/>
+        <specific value="4" description="Nikolay Zubov" uuid="d842c726-5269-11df-ab4a-080069138b88" uid="13991"/>
+        <specific value="5" description="Boris Davidov" uuid="d843d38c-5269-11df-a0e5-080069138b88" uid="13992"/>
+        <specific value="6" description="Semen Dezhnev" uuid="d844e100-5269-11df-b9ad-080069138b88" uid="13993"/>
+        <specific value="7" description="Faddey Bellinsgausen" uuid="d845eac8-5269-11df-8711-080069138b88" uid="13994"/>
+        <specific value="8" description="Vasily Golovnin" uuid="d846fc92-5269-11df-9f2b-080069138b88" uid="13995"/>
+      </subcategory>
+      <subcategory value="29" description="Yug class (naval research)" uuid="d848a81c-5269-11df-9d95-080069138b88" uid="13996">
+        <specific value="1" description="V Adm Vorontsov (ex-Briz)" uuid="d849b658-5269-11df-ac87-080069138b88" uid="13997"/>
+        <specific value="2" description="Donuzlav" uuid="d84ac2fa-5269-11df-9614-080069138b88" uid="13998"/>
+        <specific value="3" description="Gals" uuid="d84bd10e-5269-11df-8ee1-080069138b88" uid="13999"/>
+        <specific value="4" description="Gidrolog" uuid="d84cdc7a-5269-11df-bf42-080069138b88" uid="14000"/>
+        <specific value="5" description="Gorizont" uuid="d84de78c-5269-11df-a010-080069138b88" uid="14001"/>
+        <specific value="6" description="Mangyshlak" uuid="d84ef460-5269-11df-8aef-080069138b88" uid="14002"/>
+        <specific value="7" description="Marshal Gelovani" uuid="d85000da-5269-11df-8759-080069138b88" uid="14003"/>
+        <specific value="8" description="Nikolay Matusevich" uuid="d8511222-5269-11df-a416-080069138b88" uid="14004"/>
+        <specific value="9" description="Pegas" uuid="d85224c8-5269-11df-b0d3-080069138b88" uid="14005"/>
+        <specific value="10" description="Persey" uuid="d853328c-5269-11df-81b8-080069138b88" uid="14006"/>
+        <specific value="11" description="Pluton" uuid="d854390c-5269-11df-b528-080069138b88" uid="14007"/>
+        <specific value="12" description="Senezh" uuid="d85549c8-5269-11df-91f5-080069138b88" uid="14008"/>
+        <specific value="13" description="Strelets" uuid="d856571e-5269-11df-a9b2-080069138b88" uid="14009"/>
+        <specific value="14" description="Tayga" uuid="d8575e02-5269-11df-9cbc-080069138b88" uid="14010"/>
+        <specific value="15" description="Vizir" uuid="d8586b30-5269-11df-80fa-080069138b88" uid="14011"/>
+        <specific value="16" description="Zodiak" uuid="d8597bec-5269-11df-87f7-080069138b88" uid="14012"/>
+        <specific value="17" description="Stvor" uuid="d85a838e-5269-11df-9d65-080069138b88" uid="14013"/>
+        <specific value="18" description="704 (ex-SSV 328)" uuid="d85b9030-5269-11df-bd3c-080069138b88" uid="14014"/>
+      </subcategory>
+      <subcategory value="30" description="Mod Sorum class (naval research)" uuid="d85d3f02-5269-11df-935f-080069138b88" uid="14015">
+        <specific value="1" description="OS 572" uuid="d85e516c-5269-11df-bb8b-080069138b88" uid="14016"/>
+      </subcategory>
+      <subcategory value="31" description="Moma class (+9 AGIs) (naval survey)" uuid="d85ffda0-5269-11df-8a73-080069138b88" uid="14017">
+        <specific value="1" description="Altair" uuid="d8610538-5269-11df-8948-080069138b88" uid="14018"/>
+        <specific value="2" description="Anadyr" uuid="d86214dc-5269-11df-9c4d-080069138b88" uid="14019"/>
+        <specific value="3" description="Andromeda" uuid="d863313c-5269-11df-8509-080069138b88" uid="14020"/>
+        <specific value="4" description="Antares" uuid="d8643fbe-5269-11df-b18b-080069138b88" uid="14021"/>
+        <specific value="5" description="Antarktyda" uuid="d8654c88-5269-11df-8ce8-080069138b88" uid="14022"/>
+        <specific value="6" description="Arktika" uuid="d866586c-5269-11df-95d1-080069138b88" uid="14023"/>
+        <specific value="7" description="Askold" uuid="d8677ab2-5269-11df-84bb-080069138b88" uid="14024"/>
+        <specific value="8" description="Berezan" uuid="d8689cd0-5269-11df-a595-080069138b88" uid="14025"/>
+        <specific value="9" description="Cheleken" uuid="d869bcbe-5269-11df-8a86-080069138b88" uid="14026"/>
+        <specific value="10" description="Elton" uuid="d86b0362-5269-11df-8211-080069138b88" uid="14027"/>
+        <specific value="11" description="Kolguev (mod)" uuid="d86c1324-5269-11df-8c57-080069138b88" uid="14028"/>
+        <specific value="12" description="Krilon" uuid="d86d26d8-5269-11df-a010-080069138b88" uid="14029"/>
+        <specific value="13" description="Liman" uuid="d86e34c4-5269-11df-bc8a-080069138b88" uid="14030"/>
+        <specific value="14" description="Mars" uuid="d86f4620-5269-11df-a0be-080069138b88" uid="14031"/>
+        <specific value="15" description="Morzhovets" uuid="d870552e-5269-11df-9409-080069138b88" uid="14032"/>
+        <specific value="16" description="Okean" uuid="d87166c6-5269-11df-a0ef-080069138b88" uid="14033"/>
+        <specific value="17" description="Rybachi (mod)" uuid="d8726f58-5269-11df-953a-080069138b88" uid="14034"/>
+        <specific value="18" description="Sever" uuid="d8737e02-5269-11df-85c9-080069138b88" uid="14035"/>
+        <specific value="19" description="Taymyr" uuid="d8748c02-5269-11df-a6e4-080069138b88" uid="14036"/>
+        <specific value="20" description="Zapolyarye" uuid="d875984a-5269-11df-a112-080069138b88" uid="14037"/>
+      </subcategory>
+      <subcategory value="32" description="Samara class (naval survey)" uuid="d877442e-5269-11df-99dc-080069138b88" uid="14038">
+        <specific value="1" description="Azimut" uuid="d87851b6-5269-11df-b294-080069138b88" uid="14039"/>
+        <specific value="2" description="Glubomer" uuid="d87961d2-5269-11df-9503-080069138b88" uid="14040"/>
+        <specific value="3" description="Tropik" uuid="d87a6d34-5269-11df-8258-080069138b88" uid="14041"/>
+        <specific value="4" description="Deviator" uuid="d87b7af8-5269-11df-9745-080069138b88" uid="14042"/>
+        <specific value="5" description="Gradus" uuid="d87c86c8-5269-11df-8dec-080069138b88" uid="14043"/>
+        <specific value="6" description="Vostok" uuid="d87d8f14-5269-11df-880a-080069138b88" uid="14044"/>
+        <specific value="7" description="Gigrometr" uuid="d87ea0ac-5269-11df-ab21-080069138b88" uid="14045"/>
+        <specific value="8" description="Kompas" uuid="d87fad30-5269-11df-a2c3-080069138b88" uid="14046"/>
+        <specific value="9" description="Vaygach (mod)" uuid="d880b46e-5269-11df-ad40-080069138b88" uid="14047"/>
+        <specific value="10" description="Moskovsky Universitet" uuid="d881c610-5269-11df-aa67-080069138b88" uid="14048"/>
+        <specific value="11" description="Pamyat Merkuryia" uuid="d882d532-5269-11df-b535-080069138b88" uid="14049"/>
+        <specific value="12" description="Zenit (ex-Gorizont) (mod)" uuid="d883dc5c-5269-11df-80ee-080069138b88" uid="14050"/>
+        <specific value="13" description="Rumb" uuid="d884eb7e-5269-11df-8b0b-080069138b88" uid="14051"/>
+      </subcategory>
+      <subcategory value="33" description="Finik class (naval survey)" uuid="d8869bcc-5269-11df-be09-080069138b88" uid="14052">
+        <specific value="1" description="GS 44" uuid="d887a922-5269-11df-8955-080069138b88" uid="14053"/>
+        <specific value="2" description="47" uuid="d888b092-5269-11df-908a-080069138b88" uid="14054"/>
+        <specific value="3" description="84" uuid="d889bf32-5269-11df-bc07-080069138b88" uid="14055"/>
+        <specific value="4" description="86" uuid="d88ad00c-5269-11df-9adb-080069138b88" uid="14056"/>
+        <specific value="5" description="87" uuid="d88bd60a-5269-11df-8e44-080069138b88" uid="14057"/>
+        <specific value="6" description="260" uuid="d88ce342-5269-11df-85bb-080069138b88" uid="14058"/>
+        <specific value="7" description="265" uuid="d88dfaa2-5269-11df-a675-080069138b88" uid="14059"/>
+        <specific value="8" description="270" uuid="d88f042e-5269-11df-ab82-080069138b88" uid="14060"/>
+        <specific value="9" description="272" uuid="d89010a8-5269-11df-a423-080069138b88" uid="14061"/>
+        <specific value="10" description="278" uuid="d8912268-5269-11df-a783-080069138b88" uid="14062"/>
+        <specific value="11" description="296" uuid="d89229f6-5269-11df-8791-080069138b88" uid="14063"/>
+        <specific value="12" description="297" uuid="d8933864-5269-11df-9d14-080069138b88" uid="14064"/>
+        <specific value="13" description="301" uuid="d894466e-5269-11df-92f2-080069138b88" uid="14065"/>
+        <specific value="14" description="388" uuid="d89552a2-5269-11df-83a6-080069138b88" uid="14066"/>
+        <specific value="15" description="392" uuid="d8966214-5269-11df-b9c1-080069138b88" uid="14067"/>
+        <specific value="16" description="397" uuid="d8976d30-5269-11df-9ce8-080069138b88" uid="14068"/>
+        <specific value="17" description="398" uuid="d898769e-5269-11df-b53a-080069138b88" uid="14069"/>
+        <specific value="18" description="399" uuid="d89987aa-5269-11df-bc18-080069138b88" uid="14070"/>
+        <specific value="19" description="400" uuid="d89a94ba-5269-11df-bc23-080069138b88" uid="14071"/>
+        <specific value="20" description="401" uuid="d89b9a68-5269-11df-8cb2-080069138b88" uid="14072"/>
+        <specific value="21" description="402" uuid="d89cab60-5269-11df-a52b-080069138b88" uid="14073"/>
+        <specific value="22" description="403" uuid="d89db8fc-5269-11df-9458-080069138b88" uid="14074"/>
+        <specific value="23" description="404" uuid="d89ebf18-5269-11df-a7ad-080069138b88" uid="14075"/>
+        <specific value="24" description="405" uuid="d89fcc3c-5269-11df-8ec0-080069138b88" uid="14076"/>
+      </subcategory>
+      <subcategory value="34" description="Biya class (naval survey)" uuid="d8a17c1c-5269-11df-b820-080069138b88" uid="14077">
+        <specific value="1" description="GS 182" uuid="d8a28ac6-5269-11df-909e-080069138b88" uid="14078"/>
+        <specific value="2" description="193" uuid="d8a39164-5269-11df-8840-080069138b88" uid="14079"/>
+        <specific value="3" description="194" uuid="d8a49fc8-5269-11df-89ee-080069138b88" uid="14080"/>
+        <specific value="4" description="198" uuid="d8a5b0ac-5269-11df-b125-080069138b88" uid="14081"/>
+        <specific value="5" description="200" uuid="d8a6b6a0-5269-11df-bb31-080069138b88" uid="14082"/>
+        <specific value="6" description="202" uuid="d8a7c2f2-5269-11df-870c-080069138b88" uid="14083"/>
+        <specific value="7" description="204" uuid="d8a8d282-5269-11df-b7ba-080069138b88" uid="14084"/>
+        <specific value="8" description="206" uuid="d8a9dac4-5269-11df-96d2-080069138b88" uid="14085"/>
+        <specific value="9" description="210" uuid="d8aae68a-5269-11df-9cf3-080069138b88" uid="14086"/>
+        <specific value="10" description="212" uuid="d8abf75a-5269-11df-a521-080069138b88" uid="14087"/>
+        <specific value="11" description="214" uuid="d8ad07da-5269-11df-9aff-080069138b88" uid="14088"/>
+        <specific value="12" description="271" uuid="d8ae156c-5269-11df-aa5e-080069138b88" uid="14089"/>
+        <specific value="13" description="273" uuid="d8af22ea-5269-11df-a190-080069138b88" uid="14090"/>
+        <specific value="14" description="275" uuid="d8b02e88-5269-11df-8566-080069138b88" uid="14091"/>
+      </subcategory>
+      <subcategory value="35" description="Kamenka class (naval survey)" uuid="d8b1d9c2-5269-11df-b504-080069138b88" uid="14092">
+        <specific value="1" description="GS 66" uuid="d8b2e736-5269-11df-89d2-080069138b88" uid="14093"/>
+        <specific value="2" description="74" uuid="d8b3f608-5269-11df-97d2-080069138b88" uid="14094"/>
+        <specific value="3" description="78" uuid="d8b500b6-5269-11df-b3f6-080069138b88" uid="14095"/>
+        <specific value="4" description="82" uuid="d8b60da8-5269-11df-98fa-080069138b88" uid="14096"/>
+        <specific value="5" description="107" uuid="d8b718f6-5269-11df-991d-080069138b88" uid="14097"/>
+        <specific value="6" description="108 (ex-Vernier)" uuid="d8b82872-5269-11df-b5eb-080069138b88" uid="14098"/>
+        <specific value="7" description="113 (ex-Belbeck)" uuid="d8b9371c-5269-11df-91e0-080069138b88" uid="14099"/>
+        <specific value="8" description="118" uuid="d8ba4422-5269-11df-8b03-080069138b88" uid="14100"/>
+        <specific value="9" description="199 (ex-Sima)" uuid="d8bb4e4e-5269-11df-b4c8-080069138b88" uid="14101"/>
+        <specific value="10" description="207" uuid="d8bc5b7c-5269-11df-a68c-080069138b88" uid="14102"/>
+        <specific value="11" description="211" uuid="d8bd6850-5269-11df-bb2e-080069138b88" uid="14103"/>
+        <specific value="12" description="Astronom (mod)" uuid="d8be6f34-5269-11df-b6cb-080069138b88" uid="14104"/>
+      </subcategory>
+      <subcategory value="36" description="Vinograd class (naval survey)" uuid="d8c01d84-5269-11df-82d9-080069138b88" uid="14105">
+        <specific value="1" description="GS 525" uuid="d8c13016-5269-11df-869d-080069138b88" uid="14106"/>
+        <specific value="2" description="GS 526" uuid="d8c23cb8-5269-11df-9484-080069138b88" uid="14107"/>
+      </subcategory>
+      <subcategory value="37" description="Melitopol class (naval survey)" uuid="d8c3e6ee-5269-11df-a760-080069138b88" uid="14108">
+        <specific value="1" description="Mayak" uuid="d8c4f41c-5269-11df-9146-080069138b88" uid="14109"/>
+        <specific value="2" description="Nivelir" uuid="d8c611e4-5269-11df-926a-080069138b88" uid="14110"/>
+        <specific value="3" description="Prizma" uuid="d8c72552-5269-11df-8940-080069138b88" uid="14111"/>
+        <specific value="4" description="Indigurka (mod)" uuid="d8c82d76-5269-11df-bafb-080069138b88" uid="14112"/>
+        <specific value="5" description="Shevchenoko (mod)" uuid="d8c93d42-5269-11df-8caf-080069138b88" uid="14113"/>
+      </subcategory>
+      <subcategory value="38" description="Nyryat 1 class (naval survey)" uuid="d8caeeee-5269-11df-b3f0-080069138b88" uid="14114"/>
+      <subcategory value="39" description="Nyryat 2 class (naval survey)" uuid="d8cc0946-5269-11df-affe-080069138b88" uid="14115"/>
+      <subcategory value="40" description="Sibir class (naval missile range)" uuid="d8cd1318-5269-11df-9ed8-080069138b88" uid="14116">
+        <specific value="1" description="Sakhalin" uuid="d8ce2398-5269-11df-9a0b-080069138b88" uid="14117"/>
+        <specific value="2" description="Spassk (ex-Suchan)" uuid="d8cf35c6-5269-11df-9984-080069138b88" uid="14118"/>
+      </subcategory>
+      <subcategory value="41" description="Marshal Nedelin class (naval missile range)" uuid="d8d0e2cc-5269-11df-af2f-080069138b88" uid="14119">
+        <specific value="1" description="Marshal Nedelin" uuid="d8d1eb9a-5269-11df-a6db-080069138b88" uid="14120"/>
+        <specific value="2" description="Marshal Krylov" uuid="d8d2fbb6-5269-11df-9439-080069138b88" uid="14121"/>
+        <specific value="3" description="Akademik Nicolai Pilyugin" uuid="d8d40cea-5269-11df-a1ce-080069138b88" uid="14122"/>
+      </subcategory>
+      <subcategory value="42" description="Kamchatka class (AG) (naval missile range)" uuid="d8d5b9a0-5269-11df-814b-080069138b88" uid="14123">
+        <specific value="1" description="SSV 391 Kamchatka" uuid="d8d6c3ae-5269-11df-9bec-080069138b88" uid="14124"/>
+      </subcategory>
+      <subcategory value="43" description="Kapusta class (naval missile range)" uuid="d8d8769a-5269-11df-aa47-080069138b88" uid="14125">
+        <specific value="1" description="SSV 33 Ural" uuid="d8d98486-5269-11df-955e-080069138b88" uid="14126"/>
+      </subcategory>
+      <subcategory value="44" description="Ugra II class (AXT) (training)" uuid="d8db3038-5269-11df-8222-080069138b88" uid="14127">
+        <specific value="1" description="Borodino" uuid="d8dc41f8-5269-11df-8a5a-080069138b88" uid="14128"/>
+        <specific value="2" description="Gangut" uuid="d8dd495e-5269-11df-85f2-080069138b88" uid="14129"/>
+      </subcategory>
+      <subcategory value="45" description="Smolny class (AXT) (training)" uuid="d8def75e-5269-11df-9a41-080069138b88" uid="14130">
+        <specific value="1" description="Khasan" uuid="d8e004dc-5269-11df-96e4-080069138b88" uid="14131"/>
+        <specific value="2" description="Perekop" uuid="d8e1155c-5269-11df-a1d3-080069138b88" uid="14132"/>
+        <specific value="3" description="Smolny" uuid="d8e21d62-5269-11df-b5fa-080069138b88" uid="14133"/>
+      </subcategory>
+      <subcategory value="46" description="Wodnik II class (AXT) (training)" uuid="d8e3c900-5269-11df-a4a9-080069138b88" uid="14134">
+        <specific value="1" description="Luga" uuid="d8e4d9f8-5269-11df-bbd5-080069138b88" uid="14135"/>
+        <specific value="2" description="Oka" uuid="d8e5e79e-5269-11df-b398-080069138b88" uid="14136"/>
+      </subcategory>
+      <subcategory value="47" description="Sail training ships" uuid="d8e79350-5269-11df-a8b5-080069138b88" uid="14137">
+        <specific value="1" description="Mir" uuid="d8e89da4-5269-11df-8b0a-080069138b88" uid="14138"/>
+        <specific value="2" description="Druzjba" uuid="d8e9b2de-5269-11df-b766-080069138b88" uid="14139"/>
+        <specific value="3" description="Khersones" uuid="d8eac264-5269-11df-aadf-080069138b88" uid="14140"/>
+        <specific value="4" description="Pallada" uuid="d8ebcb82-5269-11df-8dac-080069138b88" uid="14141"/>
+      </subcategory>
+      <subcategory value="48" description="Klasma class (cable ships)" uuid="d8ed7a36-5269-11df-86cb-080069138b88" uid="14142">
+        <specific value="1" description="Donets" uuid="d8ee8822-5269-11df-840c-080069138b88" uid="14143"/>
+        <specific value="2" description="Ingul" uuid="d8ef94b0-5269-11df-b34c-080069138b88" uid="14144"/>
+        <specific value="3" description="Inguri" uuid="d8f09ff4-5269-11df-8c10-080069138b88" uid="14145"/>
+        <specific value="4" description="Katun" uuid="d8f1ab56-5269-11df-8ea1-080069138b88" uid="14146"/>
+        <specific value="5" description="Tavda" uuid="d8f2b82a-5269-11df-9261-080069138b88" uid="14147"/>
+        <specific value="6" description="Tsna" uuid="d8f3c3b4-5269-11df-99da-080069138b88" uid="14148"/>
+        <specific value="7" description="Yana type I" uuid="d8f4cf2a-5269-11df-b3ef-080069138b88" uid="14149"/>
+        <specific value="8" description="Zeya" uuid="d8f5dc58-5269-11df-b075-080069138b88" uid="14150"/>
+      </subcategory>
+      <subcategory value="49" description="Emba I class (cable ships)" uuid="d8f78d78-5269-11df-8d5e-080069138b88" uid="14151">
+        <specific value="1" description="Emba" uuid="d8f89588-5269-11df-ab1d-080069138b88" uid="14152"/>
+        <specific value="2" description="Nepryadva" uuid="d8f9a2b6-5269-11df-9c84-080069138b88" uid="14153"/>
+        <specific value="3" description="Setun" uuid="d8fab2e6-5269-11df-a605-080069138b88" uid="14154"/>
+      </subcategory>
+      <subcategory value="50" description="Emba II class (cable ships)" uuid="d8fc5e98-5269-11df-96c2-080069138b88" uid="14155">
+        <specific value="1" description="Biriusa" uuid="d8fd6914-5269-11df-a5ff-080069138b88" uid="14156"/>
+        <specific value="2" description="Kemj" uuid="d8fe74da-5269-11df-8330-080069138b88" uid="14157"/>
+      </subcategory>
+      <subcategory value="51" description="Berezina class (replenishment ships)" uuid="d9002500-5269-11df-ba3f-080069138b88" uid="14158">
+        <specific value="1" description="Berezina" uuid="d90134c2-5269-11df-a8d7-080069138b88" uid="14159"/>
+      </subcategory>
+      <subcategory value="52" description="Boris Chilikin class (replenishment ships)" uuid="d902e4de-5269-11df-9845-080069138b88" uid="14160">
+        <specific value="1" description="Boris Butoma" uuid="d903ed5c-5269-11df-844c-080069138b88" uid="14161"/>
+        <specific value="2" description="Genrich Gasanov" uuid="d904fa9e-5269-11df-b491-080069138b88" uid="14162"/>
+        <specific value="3" description="Boris Chilikin" uuid="d9060d8a-5269-11df-bb29-080069138b88" uid="14163"/>
+        <specific value="4" description="Ivan Bubnov" uuid="d90714dc-5269-11df-9db9-080069138b88" uid="14164"/>
+        <specific value="5" description="Dnestr" uuid="d908228c-5269-11df-aa3f-080069138b88" uid="14165"/>
+        <specific value="6" description="Vladimir Kolechitsky" uuid="d9093bfe-5269-11df-bdd4-080069138b88" uid="14166"/>
+      </subcategory>
+      <subcategory value="53" description="Dubna class (replenishment tankers)" uuid="d90ae986-5269-11df-9cb0-080069138b88" uid="14167">
+        <specific value="1" description="Dubna" uuid="d90bf2d6-5269-11df-bf72-080069138b88" uid="14168"/>
+        <specific value="2" description="Pechenga" uuid="d90d00c2-5269-11df-b1ac-080069138b88" uid="14169"/>
+        <specific value="3" description="Irkut" uuid="d90e0f80-5269-11df-8548-080069138b88" uid="14170"/>
+        <specific value="4" description="Sventa" uuid="d90f1b6e-5269-11df-ac69-080069138b88" uid="14171"/>
+      </subcategory>
+      <subcategory value="54" description="Mod Kazbek class (replenishment tankers)" uuid="d910c5a4-5269-11df-b59a-080069138b88" uid="14172">
+        <specific value="1" description="Alatyr" uuid="d911d57a-5269-11df-8908-080069138b88" uid="14173"/>
+        <specific value="2" description="Desna" uuid="d912e6a4-5269-11df-a6ae-080069138b88" uid="14174"/>
+        <specific value="3" description="Volkhov" uuid="d913ec5c-5269-11df-94f2-080069138b88" uid="14175"/>
+      </subcategory>
+      <subcategory value="55" description="Mod Altay class (replenishment tankers)" uuid="d9159930-5269-11df-9b1f-080069138b88" uid="14176">
+        <specific value="1" description="Elnya" uuid="d916acc6-5269-11df-a02b-080069138b88" uid="14177"/>
+        <specific value="2" description="Ilim" uuid="d917b954-5269-11df-be5c-080069138b88" uid="14178"/>
+        <specific value="3" description="Izhora" uuid="d918bfe8-5269-11df-a0d9-080069138b88" uid="14179"/>
+        <specific value="4" description="Kola" uuid="d919d054-5269-11df-8b23-080069138b88" uid="14180"/>
+        <specific value="5" description="Prut" uuid="d91adde6-5269-11df-be7a-080069138b88" uid="14181"/>
+        <specific value="6" description="Yegorlik" uuid="d91be38a-5269-11df-a5d4-080069138b88" uid="14182"/>
+      </subcategory>
+      <subcategory value="56" description="Uda class (replenishment tankers)" uuid="d91d9388-5269-11df-86e5-080069138b88" uid="14183">
+        <specific value="1" description="Dunay (mod)" uuid="d91ea250-5269-11df-acc4-080069138b88" uid="14184"/>
+        <specific value="2" description="Koida" uuid="d91faf88-5269-11df-91a4-080069138b88" uid="14185"/>
+        <specific value="3" description="Lena (mod)" uuid="d920b554-5269-11df-bae2-080069138b88" uid="14186"/>
+        <specific value="4" description="Terek (mod)" uuid="d921c70a-5269-11df-aad5-080069138b88" uid="14187"/>
+        <specific value="5" description="Vishera" uuid="d922d406-5269-11df-8a3a-080069138b88" uid="14188"/>
+      </subcategory>
+      <subcategory value="57" description="Olekma class (replenishment tankers)" uuid="d9248184-5269-11df-b171-080069138b88" uid="14189">
+        <specific value="1" description="Olekma (mod)" uuid="d9258b24-5269-11df-b7bb-080069138b88" uid="14190"/>
+        <specific value="2" description="Iman" uuid="d9269a00-5269-11df-9fe7-080069138b88" uid="14191"/>
+        <specific value="3" description="Zolotoy rog" uuid="d927b570-5269-11df-87ca-080069138b88" uid="14192"/>
+      </subcategory>
+      <subcategory value="58" description="Kaliningradneft class (support tankers)" uuid="d929628a-5269-11df-aed9-080069138b88" uid="14193">
+        <specific value="1" description="Argun" uuid="d92a6b62-5269-11df-98a5-080069138b88" uid="14194"/>
+        <specific value="2" description="Vyazma" uuid="d92b7a8e-5269-11df-ad62-080069138b88" uid="14195"/>
+      </subcategory>
+      <subcategory value="59" description="Sofya class (support tanker)" uuid="d92d2ac8-5269-11df-848d-080069138b88" uid="14196">
+        <specific value="1" description="Akhtyuba (ex-Hanoi)" uuid="d92e38d2-5269-11df-bd1a-080069138b88" uid="14197"/>
+      </subcategory>
+      <subcategory value="60" description="Nercha class (support tankers)" uuid="d92fe74a-5269-11df-bad5-080069138b88" uid="14198">
+        <specific value="1" description="Nara" uuid="d930f4b4-5269-11df-9d7f-080069138b88" uid="14199"/>
+        <specific value="2" description="Nercha" uuid="d9320188-5269-11df-a644-080069138b88" uid="14200"/>
+      </subcategory>
+      <subcategory value="61" description="Konda class (support tankers)" uuid="d933accc-5269-11df-88f3-080069138b88" uid="14201">
+        <specific value="1" description="Konda" uuid="d934bd7e-5269-11df-9135-080069138b88" uid="14202"/>
+        <specific value="2" description="Rossosh" uuid="d935c91c-5269-11df-ac87-080069138b88" uid="14203"/>
+        <specific value="3" description="Soyana" uuid="d936d690-5269-11df-815a-080069138b88" uid="14204"/>
+        <specific value="4" description="Yakhroma" uuid="d937e2e2-5269-11df-b699-080069138b88" uid="14205"/>
+      </subcategory>
+      <subcategory value="62" description="Khobi class (support tankers)" uuid="d9399290-5269-11df-a7ae-080069138b88" uid="14206">
+        <specific value="1" description="Cheremshan" uuid="d93a9b86-5269-11df-8bcd-080069138b88" uid="14207"/>
+        <specific value="2" description="Orsha" uuid="d93baae4-5269-11df-b1f9-080069138b88" uid="14208"/>
+        <specific value="3" description="Shelon" uuid="d93cb6b4-5269-11df-94c9-080069138b88" uid="14209"/>
+        <specific value="4" description="Tartu" uuid="d93dc270-5269-11df-99bc-080069138b88" uid="14210"/>
+        <specific value="5" description="Khobi" uuid="d93ecf9e-5269-11df-a549-080069138b88" uid="14211"/>
+        <specific value="6" description="Seima" uuid="d93fdc40-5269-11df-ad6c-080069138b88" uid="14212"/>
+        <specific value="7" description="Sosva" uuid="d940e7ca-5269-11df-97a2-080069138b88" uid="14213"/>
+        <specific value="8" description="Titan 150" uuid="d941f4a8-5269-11df-b7f6-080069138b88" uid="14214"/>
+        <specific value="9" description="Lovat" uuid="d9430212-5269-11df-b7c2-080069138b88" uid="14215"/>
+        <specific value="10" description="Shacha" uuid="d944082e-5269-11df-a93e-080069138b88" uid="14216"/>
+        <specific value="11" description="Sysola" uuid="d94517a0-5269-11df-96ad-080069138b88" uid="14217"/>
+        <specific value="12" description="Tunguska" uuid="d94630d6-5269-11df-a61f-080069138b88" uid="14218"/>
+        <specific value="13" description="Metan" uuid="d9473968-5269-11df-bb79-080069138b88" uid="14219"/>
+      </subcategory>
+      <subcategory value="63" description="Irtysh class (support tanker)" uuid="d948f0be-5269-11df-953a-080069138b88" uid="14220">
+        <specific value="1" description="Narva" uuid="d94a01b6-5269-11df-99bb-080069138b88" uid="14221"/>
+      </subcategory>
+      <subcategory value="64" description="Baskunchak class (support tankers)" uuid="d94bb286-5269-11df-ac4d-080069138b88" uid="14222">
+        <specific value="1" description="Ivan Golubets" uuid="d94cc13a-5269-11df-9635-080069138b88" uid="14223"/>
+        <specific value="2" description="Sovietsky Pogranichnik" uuid="d94dc99a-5269-11df-9280-080069138b88" uid="14224"/>
+      </subcategory>
+      <subcategory value="65" description="Luza class (special tankers)" uuid="d94f7b64-5269-11df-a057-080069138b88" uid="14225">
+        <specific value="1" description="Alambai" uuid="d95088f6-5269-11df-b446-080069138b88" uid="14226"/>
+        <specific value="2" description="Barguzin" uuid="d95194c6-5269-11df-8b10-080069138b88" uid="14227"/>
+        <specific value="3" description="Kama" uuid="d9529c86-5269-11df-a4af-080069138b88" uid="14228"/>
+        <specific value="4" description="Aragvi" uuid="d953adce-5269-11df-815b-080069138b88" uid="14229"/>
+        <specific value="5" description="Don" uuid="d954bbba-5269-11df-b5e1-080069138b88" uid="14230"/>
+        <specific value="6" description="Selenga" uuid="d955c302-5269-11df-bb9f-080069138b88" uid="14231"/>
+      </subcategory>
+      <subcategory value="66" description="Vala class (special tankers)" uuid="d957727e-5269-11df-827c-080069138b88" uid="14232">
+        <specific value="1" description="Vala" uuid="d9588114-5269-11df-be08-080069138b88" uid="14233"/>
+        <specific value="2" description="TNT 11" uuid="d9598ee2-5269-11df-bbb8-080069138b88" uid="14234"/>
+        <specific value="3" description="TNT 27" uuid="d95a9a4e-5269-11df-9b99-080069138b88" uid="14235"/>
+        <specific value="4" description="12" uuid="d95ba74a-5269-11df-b159-080069138b88" uid="14236"/>
+        <specific value="5" description="19" uuid="d95cb432-5269-11df-bba4-080069138b88" uid="14237"/>
+        <specific value="6" description="25" uuid="d95dba44-5269-11df-b067-080069138b88" uid="14238"/>
+        <specific value="7" description="29" uuid="d95ed3fc-5269-11df-86d6-080069138b88" uid="14239"/>
+      </subcategory>
+      <subcategory value="67" description="OB class (AH)" uuid="d96086c0-5269-11df-8359-080069138b88" uid="14240">
+        <specific value="1" description="OB" uuid="d96193c6-5269-11df-a585-080069138b88" uid="14241"/>
+        <specific value="2" description="Yenisei" uuid="d9629abe-5269-11df-9e12-080069138b88" uid="14242"/>
+        <specific value="3" description="Svir" uuid="d963ab3e-5269-11df-aeae-080069138b88" uid="14243"/>
+        <specific value="4" description="Irtysh" uuid="d964c4a6-5269-11df-a035-080069138b88" uid="14244"/>
+      </subcategory>
+      <subcategory value="68" description="Mikhail Rudnitsky class (ARs)" uuid="d96672ce-5269-11df-b7a3-080069138b88" uid="14245">
+        <specific value="1" description="Mikhail Rudnitsky" uuid="d9677c00-5269-11df-b1e0-080069138b88" uid="14246"/>
+        <specific value="2" description="Georgy Kozmin" uuid="d9688b40-5269-11df-b5ee-080069138b88" uid="14247"/>
+        <specific value="3" description="Georgy Titov" uuid="d9699ce2-5269-11df-980e-080069138b88" uid="14248"/>
+        <specific value="4" description="Sayany" uuid="d96aa498-5269-11df-abc7-080069138b88" uid="14249"/>
+      </subcategory>
+      <subcategory value="69" description="Pamir class (salvage, rescue &amp; mooring)" uuid="d96c4f50-5269-11df-b0bc-080069138b88" uid="14250">
+        <specific value="1" description="Agatan" uuid="d96d6070-5269-11df-960a-080069138b88" uid="14251"/>
+        <specific value="2" description="Aldan" uuid="d96e71a4-5269-11df-821d-080069138b88" uid="14252"/>
+      </subcategory>
+      <subcategory value="70" description="Ingul class (salvage, rescue &amp; mooring)" uuid="d9701cac-5269-11df-969f-080069138b88" uid="14253">
+        <specific value="1" description="Pamir" uuid="d97126ce-5269-11df-b0b4-080069138b88" uid="14254"/>
+        <specific value="2" description="Mashuk" uuid="d97237d0-5269-11df-a442-080069138b88" uid="14255"/>
+        <specific value="3" description="Alatau" uuid="d9734580-5269-11df-ba1c-080069138b88" uid="14256"/>
+        <specific value="4" description="Karakh" uuid="d9744caa-5269-11df-975c-080069138b88" uid="14257"/>
+      </subcategory>
+      <subcategory value="71" description="Sliva class (salvage, rescue &amp; mooring)" uuid="d975fc4e-5269-11df-8732-080069138b88" uid="14258">
+        <specific value="1" description="SB 406" uuid="d9770b84-5269-11df-ac6e-080069138b88" uid="14259"/>
+        <specific value="2" description="SB 408" uuid="d9781934-5269-11df-816d-080069138b88" uid="14260"/>
+        <specific value="3" description="SB 921" uuid="d9792342-5269-11df-9d91-080069138b88" uid="14261"/>
+        <specific value="4" description="SB 922 Shakhter" uuid="d97a3070-5269-11df-9f08-080069138b88" uid="14262"/>
+      </subcategory>
+      <subcategory value="72" description="Kashtan class (buoy tenders)" uuid="d97bdd1c-5269-11df-803f-080069138b88" uid="14263">
+        <specific value="1" description="KIL 926" uuid="d97cec7a-5269-11df-a3c6-080069138b88" uid="14264"/>
+        <specific value="2" description="KIL 143" uuid="d97df412-5269-11df-aaf8-080069138b88" uid="14265"/>
+        <specific value="3" description="KIL 164" uuid="d97f01a4-5269-11df-8749-080069138b88" uid="14266"/>
+        <specific value="4" description="KIL 498" uuid="d9800fea-5269-11df-87b9-080069138b88" uid="14267"/>
+        <specific value="5" description="KIL 927" uuid="d9811692-5269-11df-ab6d-080069138b88" uid="14268"/>
+        <specific value="6" description="KIL 158" uuid="d98224ba-5269-11df-9d5e-080069138b88" uid="14269"/>
+        <specific value="7" description="KIL 140" uuid="d98335d0-5269-11df-8cc1-080069138b88" uid="14270"/>
+        <specific value="8" description="KIL 168" uuid="d9844902-5269-11df-93e5-080069138b88" uid="14271"/>
+      </subcategory>
+      <subcategory value="73" description="Sura class (buoy tenders)" uuid="d985f374-5269-11df-8465-080069138b88" uid="14272">
+        <specific value="1" description="KIL 1" uuid="d9870214-5269-11df-ac1e-080069138b88" uid="14273"/>
+        <specific value="2" description="2" uuid="d988130c-5269-11df-bb1a-080069138b88" uid="14274"/>
+        <specific value="3" description="21" uuid="d989196e-5269-11df-ad64-080069138b88" uid="14275"/>
+        <specific value="4" description="22" uuid="d98a25f2-5269-11df-8ce0-080069138b88" uid="14276"/>
+        <specific value="5" description="25" uuid="d98b3596-5269-11df-81e3-080069138b88" uid="14277"/>
+        <specific value="6" description="27" uuid="d98c3db0-5269-11df-80e6-080069138b88" uid="14278"/>
+        <specific value="7" description="29" uuid="d98d4962-5269-11df-ad6a-080069138b88" uid="14279"/>
+        <specific value="8" description="31" uuid="d98e56c2-5269-11df-ad90-080069138b88" uid="14280"/>
+        <specific value="9" description="32" uuid="d98f61d4-5269-11df-9e4c-080069138b88" uid="14281"/>
+        <specific value="10" description="33" uuid="d9906d86-5269-11df-b605-080069138b88" uid="14282"/>
+      </subcategory>
+      <subcategory value="74" description="Orel class (salvage tugs)" uuid="d9921a28-5269-11df-8ca5-080069138b88" uid="14283">
+        <specific value="1" description="SB 38" uuid="d9932df0-5269-11df-9541-080069138b88" uid="14284"/>
+        <specific value="2" description="SB 43" uuid="d9943524-5269-11df-89e0-080069138b88" uid="14285"/>
+      </subcategory>
+      <subcategory value="75" description="Katun I class (salvage &amp; rescue tugs)" uuid="d995dffa-5269-11df-8032-080069138b88" uid="14286">
+        <specific value="1" description="PZHS 96" uuid="d996f098-5269-11df-ac75-080069138b88" uid="14287"/>
+        <specific value="2" description="98" uuid="d997fb8c-5269-11df-970e-080069138b88" uid="14288"/>
+        <specific value="3" description="123" uuid="d9990752-5269-11df-8141-080069138b88" uid="14289"/>
+        <specific value="4" description="124" uuid="d99a12fa-5269-11df-9aab-080069138b88" uid="14290"/>
+        <specific value="5" description="209" uuid="d99b2186-5269-11df-866c-080069138b88" uid="14291"/>
+        <specific value="6" description="273" uuid="d99c2978-5269-11df-bef1-080069138b88" uid="14292"/>
+        <specific value="7" description="279" uuid="d99d3534-5269-11df-972b-080069138b88" uid="14293"/>
+        <specific value="8" description="282" uuid="d99e46a4-5269-11df-a1fc-080069138b88" uid="14294"/>
+        <specific value="9" description="551" uuid="d99f4dec-5269-11df-b515-080069138b88" uid="14295"/>
+      </subcategory>
+      <subcategory value="76" description="Katun II (salvage &amp; rescue tugs)" uuid="d9a0fad4-5269-11df-bd90-080069138b88" uid="14296">
+        <specific value="1" description="PZHS 64" uuid="d9a211f8-5269-11df-b3ef-080069138b88" uid="14297"/>
+        <specific value="2" description="92" uuid="d9a32480-5269-11df-bbec-080069138b88" uid="14298"/>
+      </subcategory>
+      <subcategory value="77" description="Neptun class (salvage, rescue &amp; mooring)" uuid="d9a4d0a0-5269-11df-84b7-080069138b88" uid="14299">
+        <specific value="1" description="KIL 3" uuid="d9a5dba8-5269-11df-a5b3-080069138b88" uid="14300"/>
+        <specific value="2" description="6" uuid="d9a6e714-5269-11df-ad32-080069138b88" uid="14301"/>
+        <specific value="3" description="7" uuid="d9a7f816-5269-11df-aaf0-080069138b88" uid="14302"/>
+        <specific value="4" description="9" uuid="d9a90094-5269-11df-b436-080069138b88" uid="14303"/>
+        <specific value="5" description="11" uuid="d9aa0cdc-5269-11df-a84a-080069138b88" uid="14304"/>
+        <specific value="6" description="13" uuid="d9ab1b7c-5269-11df-9f59-080069138b88" uid="14305"/>
+        <specific value="7" description="15" uuid="d9ac25bc-5269-11df-82cb-080069138b88" uid="14306"/>
+        <specific value="8" description="17" uuid="d9ad3268-5269-11df-9d2e-080069138b88" uid="14307"/>
+        <specific value="9" description="18" uuid="d9ae3d84-5269-11df-800c-080069138b88" uid="14308"/>
+      </subcategory>
+      <subcategory value="78" description="Elbrus class (submarine rescue ships)" uuid="d9afee2c-5269-11df-843c-080069138b88" uid="14309">
+        <specific value="1" description="Elbrus" uuid="d9b0f826-5269-11df-aaf6-080069138b88" uid="14310"/>
+        <specific value="2" description="Alagez" uuid="d9b20496-5269-11df-bb6a-080069138b88" uid="14311"/>
+      </subcategory>
+      <subcategory value="79" description="Nepa class (submarine rescue ships)" uuid="d9b3b50c-5269-11df-84fc-080069138b88" uid="14312">
+        <specific value="1" description="Karpaty" uuid="d9b4c33e-5269-11df-992c-080069138b88" uid="14313"/>
+      </subcategory>
+      <subcategory value="80" description="Prut class (submarine rescue ships)" uuid="d9b66eb4-5269-11df-9faf-080069138b88" uid="14314">
+        <specific value="1" description="Altay" uuid="d9b77a0c-5269-11df-bab5-080069138b88" uid="14315"/>
+        <specific value="2" description="Beshtau" uuid="d9b886f4-5269-11df-a918-080069138b88" uid="14316"/>
+        <specific value="3" description="Vladimir Trefolev" uuid="d9b994e0-5269-11df-bf54-080069138b88" uid="14317"/>
+        <specific value="4" description="Zhiguli" uuid="d9ba9dd6-5269-11df-816e-080069138b88" uid="14318"/>
+        <specific value="5" description="SS 21" uuid="d9bba9b0-5269-11df-ab62-080069138b88" uid="14319"/>
+        <specific value="6" description="Epron (ex-SS 26)" uuid="d9bcbad0-5269-11df-9ac9-080069138b88" uid="14320"/>
+        <specific value="7" description="SS 83" uuid="d9bdc2a4-5269-11df-a7a5-080069138b88" uid="14321"/>
+      </subcategory>
+      <subcategory value="81" description="Valday class (ex-T 58)" uuid="d9bf6e2e-5269-11df-9876-080069138b88" uid="14322">
+        <specific value="1" description="Kazbek" uuid="d9c0871e-5269-11df-8e85-080069138b88" uid="14323"/>
+        <specific value="2" description="Khibiny" uuid="d9c1974e-5269-11df-8852-080069138b88" uid="14324"/>
+        <specific value="3" description="Valday" uuid="d9c29fb8-5269-11df-a66b-080069138b88" uid="14325"/>
+        <specific value="4" description="Zangezur" uuid="d9c3af8e-5269-11df-bd5c-080069138b88" uid="14326"/>
+        <specific value="5" description="Pulkovo (ex-SS 38)" uuid="d9c4bcee-5269-11df-9557-080069138b88" uid="14327"/>
+        <specific value="6" description="SS 30" uuid="d9c5c58a-5269-11df-a6d9-080069138b88" uid="14328"/>
+        <specific value="7" description="35" uuid="d9c6d3b2-5269-11df-ad23-080069138b88" uid="14329"/>
+        <specific value="8" description="40" uuid="d9c7df96-5269-11df-9594-080069138b88" uid="14330"/>
+        <specific value="9" description="47" uuid="d9c8ecd8-5269-11df-8e33-080069138b88" uid="14331"/>
+        <specific value="10" description="50" uuid="d9c9f95c-5269-11df-b2f4-080069138b88" uid="14332"/>
+      </subcategory>
+      <subcategory value="82" description="Anadyr class (transports)" uuid="d9cba3f6-5269-11df-8099-080069138b88" uid="14333">
+        <specific value="1" description="Anadyr" uuid="d9ccb764-5269-11df-b9fe-080069138b88" uid="14334"/>
+      </subcategory>
+      <subcategory value="83" description="Angara class (transports)" uuid="d9ce626c-5269-11df-8a8a-080069138b88" uid="14335">
+        <specific value="1" description="Angara (ex-Hela)" uuid="d9cf6edc-5269-11df-9439-080069138b88" uid="14336"/>
+      </subcategory>
+      <subcategory value="84" description="Amguema class (transports)" uuid="d9d11b06-5269-11df-8519-080069138b88" uid="14337">
+        <specific value="1" description="Yauza" uuid="d9d22c8a-5269-11df-a9e8-080069138b88" uid="14338"/>
+      </subcategory>
+      <subcategory value="85" description="Chulym class (transports)" uuid="d9d3d918-5269-11df-b06b-080069138b88" uid="14339">
+        <specific value="1" description="Severodonetsk" uuid="d9d4e952-5269-11df-aea1-080069138b88" uid="14340"/>
+      </subcategory>
+      <subcategory value="86" description="Andizan class (transports)" uuid="d9d69572-5269-11df-a21a-080069138b88" uid="14341">
+        <specific value="1" description="Onda" uuid="d9d7a2f0-5269-11df-9271-080069138b88" uid="14342"/>
+        <specific value="2" description="Posyet" uuid="d9d8b0d2-5269-11df-b51d-080069138b88" uid="14343"/>
+      </subcategory>
+      <subcategory value="87" description="Kalinin class (transports)" uuid="d9da5bbc-5269-11df-b462-080069138b88" uid="14344">
+        <specific value="1" description="Kuban (ex-Nadeshda-Krupskaya)" uuid="d9db6b06-5269-11df-9697-080069138b88" uid="14345"/>
+      </subcategory>
+      <subcategory value="88" description="Antonov class (transports)" uuid="d9dd1cb2-5269-11df-8bce-080069138b88" uid="14346">
+        <specific value="1" description="Neon Antonov" uuid="d9de2562-5269-11df-b2ae-080069138b88" uid="14347"/>
+        <specific value="2" description="Irbit" uuid="d9df3b46-5269-11df-a7e2-080069138b88" uid="14348"/>
+        <specific value="3" description="Nicolay Starshinov" uuid="d9e04ba8-5269-11df-9499-080069138b88" uid="14349"/>
+        <specific value="4" description="Ivan Lednev" uuid="d9e158f4-5269-11df-aaf2-080069138b88" uid="14350"/>
+        <specific value="5" description="Nikolay Sipyagin" uuid="d9e266b8-5269-11df-a2f6-080069138b88" uid="14351"/>
+        <specific value="6" description="Ivan Sudtsov" uuid="d9e3735a-5269-11df-ab1d-080069138b88" uid="14352"/>
+        <specific value="7" description="Ivan Odtejev" uuid="d9e47ce6-5269-11df-9a7c-080069138b88" uid="14353"/>
+        <specific value="8" description="Victor Denison" uuid="d9e58ee2-5269-11df-b834-080069138b88" uid="14354"/>
+        <specific value="9" description="Sergey Sudetsky" uuid="d9e69c60-5269-11df-9720-080069138b88" uid="14355"/>
+        <specific value="10" description="Dvina" uuid="d9e7a416-5269-11df-ac86-080069138b88" uid="14356"/>
+        <specific value="11" description="Mikhail Konovalov" uuid="d9e8b4a0-5269-11df-8417-080069138b88" uid="14357"/>
+      </subcategory>
+      <subcategory value="89" description="Partizan class (transports)" uuid="d9ea6160-5269-11df-b298-080069138b88" uid="14358">
+        <specific value="1" description="Pechora" uuid="d9eb6fa6-5269-11df-acaa-080069138b88" uid="14359"/>
+        <specific value="2" description="Turgay" uuid="d9ec79aa-5269-11df-b566-080069138b88" uid="14360"/>
+        <specific value="3" description="Ufa" uuid="d9ed8732-5269-11df-b02c-080069138b88" uid="14361"/>
+        <specific value="4" description="V Adm Fomin (ex-Pinega) (mod)" uuid="d9ee9460-5269-11df-8caa-080069138b88" uid="14362"/>
+      </subcategory>
+      <subcategory value="90" description="Keyla class (transports)" uuid="d9f04404-5269-11df-9fe6-080069138b88" uid="14363">
+        <specific value="1" description="Mezen" uuid="d9f15100-5269-11df-b6ed-080069138b88" uid="14364"/>
+        <specific value="2" description="Onega" uuid="d9f25ec4-5269-11df-b3a7-080069138b88" uid="14365"/>
+        <specific value="3" description="Ponoi" uuid="d9f36bf2-5269-11df-8291-080069138b88" uid="14366"/>
+        <specific value="4" description="Ritsa (AGI)" uuid="d9f47326-5269-11df-864a-080069138b88" uid="14367"/>
+        <specific value="5" description="Teriberka" uuid="d9f5818a-5269-11df-82e9-080069138b88" uid="14368"/>
+        <specific value="6" description="Tuloma" uuid="d9f6937c-5269-11df-809c-080069138b88" uid="14369"/>
+        <specific value="7" description="Tvertsa" uuid="d9f79eca-5269-11df-b030-080069138b88" uid="14370"/>
+        <specific value="8" description="Unza" uuid="d9f8aff4-5269-11df-9b96-080069138b88" uid="14371"/>
+        <specific value="9" description="Ussury" uuid="d9f9bf02-5269-11df-b2c8-080069138b88" uid="14372"/>
+        <specific value="10" description="Yeruslan" uuid="d9fac820-5269-11df-8932-080069138b88" uid="14373"/>
+      </subcategory>
+      <subcategory value="91" description="Muna class (transports)" uuid="d9fc7738-5269-11df-9f07-080069138b88" uid="14374">
+        <specific value="1" description="VTR 28" uuid="d9fd8556-5269-11df-8925-080069138b88" uid="14375"/>
+        <specific value="2" description="48" uuid="d9fe9af4-5269-11df-8b5e-080069138b88" uid="14376"/>
+        <specific value="3" description="81" uuid="d9ffa570-5269-11df-9424-080069138b88" uid="14377"/>
+        <specific value="4" description="82" uuid="da00b1c2-5269-11df-814d-080069138b88" uid="14378"/>
+        <specific value="5" description="83" uuid="da01c2f6-5269-11df-a499-080069138b88" uid="14379"/>
+        <specific value="6" description="84" uuid="da02ca8e-5269-11df-a69a-080069138b88" uid="14380"/>
+        <specific value="7" description="85" uuid="da03d76c-5269-11df-9539-080069138b88" uid="14381"/>
+        <specific value="8" description="86" uuid="da04e56c-5269-11df-9a68-080069138b88" uid="14382"/>
+        <specific value="9" description="91" uuid="da05f038-5269-11df-8f79-080069138b88" uid="14383"/>
+        <specific value="10" description="92" uuid="da06fd3e-5269-11df-821a-080069138b88" uid="14384"/>
+        <specific value="11" description="93" uuid="da0809a4-5269-11df-abc8-080069138b88" uid="14385"/>
+        <specific value="12" description="94" uuid="da09116e-5269-11df-add2-080069138b88" uid="14386"/>
+        <specific value="13" description="148" uuid="da0a22ca-5269-11df-a6a4-080069138b88" uid="14387"/>
+      </subcategory>
+      <subcategory value="92" description="Mayak class (transports)" uuid="da0bce7c-5269-11df-bbdc-080069138b88" uid="14388">
+        <specific value="1" description="Buzuluk" uuid="da0cdb5a-5269-11df-b872-080069138b88" uid="14389"/>
+        <specific value="2" description="Ishim" uuid="da0de766-5269-11df-bd4b-080069138b88" uid="14390"/>
+        <specific value="3" description="Lama" uuid="da0ef4bc-5269-11df-8dfb-080069138b88" uid="14391"/>
+        <specific value="4" description="Mius" uuid="da100406-5269-11df-9ea6-080069138b88" uid="14392"/>
+        <specific value="5" description="Neman" uuid="da110f4a-5269-11df-b6bb-080069138b88" uid="14393"/>
+        <specific value="6" description="Rioni" uuid="da121cbe-5269-11df-ab21-080069138b88" uid="14394"/>
+        <specific value="7" description="Ulma" uuid="da132960-5269-11df-b783-080069138b88" uid="14395"/>
+        <specific value="8" description="Vytegra" uuid="da142fd6-5269-11df-9976-080069138b88" uid="14396"/>
+      </subcategory>
+      <subcategory value="93" description="Lentra class (transports)" uuid="da15e13c-5269-11df-9117-080069138b88" uid="14397">
+        <specific value="1" description="Alma" uuid="da16ef32-5269-11df-8efe-080069138b88" uid="14398"/>
+        <specific value="2" description="Kacha" uuid="da17fc24-5269-11df-97a6-080069138b88" uid="14399"/>
+        <specific value="3" description="Ufa" uuid="da19031c-5269-11df-8b36-080069138b88" uid="14400"/>
+        <specific value="4" description="Ugra" uuid="da1a10c2-5269-11df-aa55-080069138b88" uid="14401"/>
+        <specific value="5" description="VTR 1" uuid="da1b21ec-5269-11df-847d-080069138b88" uid="14402"/>
+        <specific value="6" description="28" uuid="da1c28bc-5269-11df-9bac-080069138b88" uid="14403"/>
+        <specific value="7" description="32" uuid="da1d3f90-5269-11df-9302-080069138b88" uid="14404"/>
+        <specific value="8" description="143" uuid="da1e50a6-5269-11df-b44e-080069138b88" uid="14405"/>
+        <specific value="9" description="144" uuid="da1f594c-5269-11df-b8f4-080069138b88" uid="14406"/>
+        <specific value="10" description="145" uuid="da20654e-5269-11df-b934-080069138b88" uid="14407"/>
+      </subcategory>
+      <subcategory value="94" description="MP 4 class (transports)" uuid="da2216c8-5269-11df-aeb6-080069138b88" uid="14408">
+        <specific value="1" description="VTR 294" uuid="da2325ae-5269-11df-b8b4-080069138b88" uid="14409"/>
+        <specific value="2" description="VTR 295" uuid="da242c88-5269-11df-be0b-080069138b88" uid="14410"/>
+      </subcategory>
+      <subcategory value="95" description="MP 6 class (transports)" uuid="da25dc40-5269-11df-bfb7-080069138b88" uid="14411">
+        <specific value="1" description="Bira" uuid="da26ea90-5269-11df-999d-080069138b88" uid="14412"/>
+        <specific value="2" description="Vologda" uuid="da27f796-5269-11df-a4a0-080069138b88" uid="14413"/>
+      </subcategory>
+      <subcategory value="96" description="Telnovsk class (transports)" uuid="da29a604-5269-11df-a915-080069138b88" uid="14414">
+        <specific value="1" description="Burovestnik" uuid="da2aaf22-5269-11df-bc73-080069138b88" uid="14415"/>
+        <specific value="2" description="Lag" uuid="da2bbcdc-5269-11df-89c6-080069138b88" uid="14416"/>
+        <specific value="3" description="VTR 73" uuid="da2ccb2c-5269-11df-b4f8-080069138b88" uid="14417"/>
+        <specific value="4" description="VTR 74 (ex-Jan Kreuks)" uuid="da2dd27e-5269-11df-8e27-080069138b88" uid="14418"/>
+      </subcategory>
+      <subcategory value="97" description="Khabarov class (transports)" uuid="da2f85d8-5269-11df-8b0e-080069138b88" uid="14419">
+        <specific value="1" description="VTR 8" uuid="da3094dc-5269-11df-98cd-080069138b88" uid="14420"/>
+        <specific value="2" description="13" uuid="da31a200-5269-11df-a0af-080069138b88" uid="14421"/>
+        <specific value="3" description="15" uuid="da32a8da-5269-11df-b28c-080069138b88" uid="14422"/>
+        <specific value="4" description="25" uuid="da33b748-5269-11df-971c-080069138b88" uid="14423"/>
+      </subcategory>
+      <subcategory value="98" description="Komandor class" uuid="da356750-5269-11df-b1d4-080069138b88" uid="14424">
+        <specific value="1" description="Komandor" uuid="da3673ca-5269-11df-a675-080069138b88" uid="14425"/>
+        <specific value="2" description="Shkiper Gyek" uuid="da377c0c-5269-11df-9a82-080069138b88" uid="14426"/>
+        <specific value="3" description="Herluf Bidstrup" uuid="da388d86-5269-11df-a561-080069138b88" uid="14427"/>
+      </subcategory>
+      <subcategory value="99" description="Onega class" uuid="da3a3a5a-5269-11df-899e-080069138b88" uid="14428">
+        <specific value="1" description="GKS 52" uuid="da3b4dbe-5269-11df-ac9e-080069138b88" uid="14429"/>
+        <specific value="2" description="SFP 95" uuid="da3c5ac4-5269-11df-a307-080069138b88" uid="14430"/>
+        <specific value="3" description="SFP 224" uuid="da3d682e-5269-11df-aa6a-080069138b88" uid="14431"/>
+        <specific value="4" description="SFP 240" uuid="da3e76d8-5269-11df-93a5-080069138b88" uid="14432"/>
+        <specific value="5" description="SFP 283" uuid="da3f821c-5269-11df-aae6-080069138b88" uid="14433"/>
+        <specific value="6" description="GKS 286" uuid="da408f72-5269-11df-a934-080069138b88" uid="14434"/>
+        <specific value="7" description="SFP 295" uuid="da419cdc-5269-11df-b7cf-080069138b88" uid="14435"/>
+        <specific value="8" description="SFP 322" uuid="da42a32a-5269-11df-b0c4-080069138b88" uid="14436"/>
+        <specific value="9" description="SFP 340" uuid="da43b40e-5269-11df-9cff-080069138b88" uid="14437"/>
+        <specific value="10" description="SFP 173" uuid="da44c100-5269-11df-b7fd-080069138b88" uid="14438"/>
+        <specific value="11" description="SFP 511" uuid="da45c924-5269-11df-9c83-080069138b88" uid="14439"/>
+        <specific value="12" description="SFP 542" uuid="da46d968-5269-11df-b574-080069138b88" uid="14440"/>
+        <specific value="13" description="SFP 562" uuid="da47e6be-5269-11df-b0f6-080069138b88" uid="14441"/>
+        <specific value="14" description="SFP 177" uuid="da48eef6-5269-11df-a907-080069138b88" uid="14442"/>
+      </subcategory>
+      <subcategory value="100" description="T 43 class" uuid="da4a9e18-5269-11df-92e5-080069138b88" uid="14443">
+        <specific value="1" description="GKS 11" uuid="da4bab46-5269-11df-af47-080069138b88" uid="14444"/>
+        <specific value="2" description="12" uuid="da4cb950-5269-11df-a12a-080069138b88" uid="14445"/>
+        <specific value="3" description="14-24" uuid="da4dc23c-5269-11df-8222-080069138b88" uid="14446"/>
+        <specific value="4" description="26" uuid="da4ecea2-5269-11df-8fc8-080069138b88" uid="14447"/>
+        <specific value="5" description="45" uuid="da4fe012-5269-11df-afba-080069138b88" uid="14448"/>
+      </subcategory>
+      <subcategory value="101" description="(deprecated)" deprecated="1" uuid="da518bd8-5269-11df-93e4-080069138b88" uid="14449"/>
+      <subcategory value="102" description="(deprecated)" deprecated="1" uuid="da5296cc-5269-11df-9d07-080069138b88" uid="14450"/>
+      <subcategory value="103" description="(deprecated)" deprecated="1" uuid="da53a602-5269-11df-8324-080069138b88" uid="14451"/>
+      <subcategory value="104" description="PO 2 class" uuid="da54b920-5269-11df-9d66-080069138b88" uid="14452"/>
+      <subcategory value="105" description="Nyryat 2 class" uuid="da55c338-5269-11df-b4be-080069138b88" uid="14453"/>
+      <subcategory value="106" description="Nyryat 1 class" uuid="da56d0ca-5269-11df-a8f6-080069138b88" uid="14454"/>
+      <subcategory value="107" description="Petrushka class" uuid="da57e12c-5269-11df-b0f3-080069138b88" uid="14455"/>
+      <subcategory value="108" description="Miernyk class" uuid="da58eee6-5269-11df-9b30-080069138b88" uid="14456"/>
+      <subcategory value="109" description="Daldyn class" uuid="da5a0524-5269-11df-87d6-080069138b88" uid="14457">
+        <specific value="1" description="Daldyn" uuid="da5b1338-5269-11df-a09b-080069138b88" uid="14458"/>
+      </subcategory>
+      <subcategory value="110" description="Yelva class" uuid="da5cc3ae-5269-11df-99df-080069138b88" uid="14459">
+        <specific value="1" description="VM 143" uuid="da5dcd76-5269-11df-8438-080069138b88" uid="14460"/>
+        <specific value="2" description="146" uuid="da5edbc6-5269-11df-a9e7-080069138b88" uid="14461"/>
+        <specific value="3" description="154" uuid="da5fe7fa-5269-11df-a2e1-080069138b88" uid="14462"/>
+        <specific value="4" description="266" uuid="da60f5dc-5269-11df-97a4-080069138b88" uid="14463"/>
+        <specific value="5" description="268" uuid="da620328-5269-11df-ada9-080069138b88" uid="14464"/>
+        <specific value="6" description="413" uuid="da631088-5269-11df-a39b-080069138b88" uid="14465"/>
+        <specific value="7" description="414" uuid="da641b2c-5269-11df-8e88-080069138b88" uid="14466"/>
+        <specific value="8" description="416" uuid="da652828-5269-11df-8ef5-080069138b88" uid="14467"/>
+        <specific value="9" description="420" uuid="da66352e-5269-11df-8c03-080069138b88" uid="14468"/>
+        <specific value="10" description="425" uuid="da673bea-5269-11df-8ae2-080069138b88" uid="14469"/>
+        <specific value="11" description="907" uuid="da684a3a-5269-11df-8b08-080069138b88" uid="14470"/>
+        <specific value="12" description="909" uuid="da695baa-5269-11df-acc3-080069138b88" uid="14471"/>
+      </subcategory>
+      <subcategory value="111" description="Bolva (barracks ships)" uuid="da6b07c0-5269-11df-ac14-080069138b88" uid="14472">
+        <specific value="1" description="Bolva 1" uuid="da6c0fee-5269-11df-ac0e-080069138b88" uid="14473"/>
+        <specific value="2" description="Bolva 2" uuid="da6d20e6-5269-11df-b00d-080069138b88" uid="14474"/>
+        <specific value="3" description="Bolva 3" uuid="da6e31fc-5269-11df-b4db-080069138b88" uid="14475"/>
+      </subcategory>
+      <subcategory value="112" description="Target Barge" uuid="da6fdc82-5269-11df-bbed-080069138b88" uid="14476"/>
+    </category>
+    <category value="17" description="Auxiliary, Merchant Marine" uuid="da718c08-5269-11df-b2b5-080069138b88" uid="14477">
+      <subcategory value="1" description="Tamyr class (ice breakers)" uuid="da72959e-5269-11df-9ecc-080069138b88" uid="14478">
+        <specific value="1" description="Tamyr" uuid="da73a498-5269-11df-9240-080069138b88" uid="14479"/>
+        <specific value="2" description="Vaygach" uuid="da74b0cc-5269-11df-9572-080069138b88" uid="14480"/>
+      </subcategory>
+      <subcategory value="2" description="Arktika class (ice breakers)" uuid="da766070-5269-11df-b11d-080069138b88" uid="14481">
+        <specific value="1" description="Arktika" uuid="da776a42-5269-11df-8d51-080069138b88" uid="14482"/>
+        <specific value="2" description="Sibir" uuid="da787964-5269-11df-914b-080069138b88" uid="14483"/>
+        <specific value="3" description="Rossiya" uuid="da798e76-5269-11df-a415-080069138b88" uid="14484"/>
+        <specific value="4" description="Sovetskiy Soyuz" uuid="da7a9b7c-5269-11df-aa89-080069138b88" uid="14485"/>
+        <specific value="5" description="Oktyabryskaya Revolutsiya" uuid="da7bab16-5269-11df-8bd5-080069138b88" uid="14486"/>
+        <specific value="6" description="Ural (1996)" uuid="da7cbae2-5269-11df-b99b-080069138b88" uid="14487"/>
+      </subcategory>
+      <subcategory value="3" description="Yermak class (ice breakers)" uuid="da7e6a86-5269-11df-9532-080069138b88" uid="14488">
+        <specific value="1" description="Yermak" uuid="da7f73d6-5269-11df-9efb-080069138b88" uid="14489"/>
+        <specific value="2" description="Admiral Makarov" uuid="da8081e0-5269-11df-93db-080069138b88" uid="14490"/>
+        <specific value="3" description="Krasin" uuid="da819486-5269-11df-ba74-080069138b88" uid="14491"/>
+      </subcategory>
+      <subcategory value="4" description="Moskva class (ice breakers)" uuid="da833eee-5269-11df-9d71-080069138b88" uid="14492">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="da844942-5269-11df-973f-080069138b88" uid="14493"/>
+        <specific value="2" description="Leningrad" uuid="da855bca-5269-11df-a473-080069138b88" uid="14494"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="da86686c-5269-11df-a56d-080069138b88" uid="14495"/>
+        <specific value="4" description="Murmansk" uuid="da877306-5269-11df-8d14-080069138b88" uid="14496"/>
+        <specific value="5" description="Vladivostok" uuid="da888462-5269-11df-9a3e-080069138b88" uid="14497"/>
+      </subcategory>
+      <subcategory value="5" description="Kapitan Sorokin class (ice breakers)" uuid="da8a30d2-5269-11df-8fde-080069138b88" uid="14498">
+        <specific value="1" description="Kapitan Sorokin (mod)" uuid="da8b3fea-5269-11df-82e6-080069138b88" uid="14499"/>
+        <specific value="2" description="Kapitan Nikolayev" uuid="da8c4e4e-5269-11df-b5cd-080069138b88" uid="14500"/>
+        <specific value="3" description="Kapitan Dranitsyn" uuid="da8d5d3e-5269-11df-9544-080069138b88" uid="14501"/>
+        <specific value="4" description="Kapitan Khlebnikov" uuid="da8e6bde-5269-11df-8650-080069138b88" uid="14502"/>
+      </subcategory>
+      <subcategory value="6" description="Mudyug class (ice breakers)" uuid="da901de4-5269-11df-b347-080069138b88" uid="14503">
+        <specific value="1" description="Mudyug" uuid="da912bda-5269-11df-9280-080069138b88" uid="14504"/>
+        <specific value="2" description="Magadan" uuid="da9239a8-5269-11df-a791-080069138b88" uid="14505"/>
+        <specific value="3" description="Dikson" uuid="da934708-5269-11df-95a2-080069138b88" uid="14506"/>
+      </subcategory>
+      <subcategory value="7" description="Kapitan Belousov class (ice breakers)" uuid="da94f3fa-5269-11df-ab20-080069138b88" uid="14507">
+        <specific value="1" description="Kapitan Belousov" uuid="da960290-5269-11df-96a8-080069138b88" uid="14508"/>
+        <specific value="2" description="Kapitan Melekhov" uuid="da9717c0-5269-11df-aa9a-080069138b88" uid="14509"/>
+        <specific value="3" description="Kapitan Voronin" uuid="da982930-5269-11df-bfe1-080069138b88" uid="14510"/>
+      </subcategory>
+      <subcategory value="8" description="Dobrynya Nikitich class (ice breakers)" uuid="da99d712-5269-11df-aa0a-080069138b88" uid="14511">
+        <specific value="1" description="Afanasy Nikitin (ex-Ledokol 2)" uuid="da9ae512-5269-11df-bff9-080069138b88" uid="14512"/>
+        <specific value="2" description="Purga (1961)" uuid="da9bf4ac-5269-11df-afb3-080069138b88" uid="14513"/>
+        <specific value="3" description="Buran (1966)" uuid="da9d0234-5269-11df-bc43-080069138b88" uid="14514"/>
+        <specific value="4" description="Sadko (1968)" uuid="da9e0a58-5269-11df-8690-080069138b88" uid="14515"/>
+        <specific value="5" description="Dobrynya Nikitich (1960)" uuid="da9f1ca4-5269-11df-a80d-080069138b88" uid="14516"/>
+        <specific value="6" description="Semen Chelyuskin (ex-Ledokol 8)(1965)" uuid="daa02c70-5269-11df-912c-080069138b88" uid="14517"/>
+        <specific value="7" description="Fedor Litke (1970)" uuid="daa1364c-5269-11df-a987-080069138b88" uid="14518"/>
+        <specific value="8" description="Georgy Sedov (1967)" uuid="daa2485c-5269-11df-bbb5-080069138b88" uid="14519"/>
+        <specific value="9" description="Semen Dezhnev (1971)" uuid="daa356ac-5269-11df-ac9e-080069138b88" uid="14520"/>
+        <specific value="10" description="Ilya Muromets (1966)" uuid="daa45fe8-5269-11df-b73a-080069138b88" uid="14521"/>
+        <specific value="11" description="Vasily Poyarkov (ex-Ledokol 4) (1963)" uuid="daa56d8e-5269-11df-bf92-080069138b88" uid="14522"/>
+        <specific value="12" description="Ivan Moskvitin (1971)" uuid="daa6811a-5269-11df-acc3-080069138b88" uid="14523"/>
+        <specific value="13" description="Vladimir Rusanov (ex-Ledokol 7) (1964)" uuid="daa78a6a-5269-11df-be9d-080069138b88" uid="14524"/>
+        <specific value="14" description="Ivan Kruzenshtern (ex-Ledokol 6) (1964)" uuid="daa89a68-5269-11df-8046-080069138b88" uid="14525"/>
+        <specific value="15" description="Khariton Laptev (ex-Ledokol 3) (1962)" uuid="daa9ac1e-5269-11df-9f0a-080069138b88" uid="14526"/>
+        <specific value="16" description="Vyuga (1961) (ex-Ledokol 5) (1963)" uuid="daaab9f6-5269-11df-8dcf-080069138b88" uid="14527"/>
+        <specific value="17" description="P Pakhtusov (1966)" uuid="daabca4e-5269-11df-ac5b-080069138b88" uid="14528"/>
+        <specific value="18" description="Peresvet (1969)" uuid="daacd790-5269-11df-ac88-080069138b88" uid="14529"/>
+        <specific value="19" description="Yerofei Khabarov" uuid="daade130-5269-11df-9da4-080069138b88" uid="14530"/>
+        <specific value="20" description="Yury Lisyansky (ex-Ledokol 9) (1965)" uuid="daaef408-5269-11df-97a2-080069138b88" uid="14531"/>
+        <specific value="21" description="Plug (1961)" uuid="dab00334-5269-11df-bf2a-080069138b88" uid="14532"/>
+      </subcategory>
+      <subcategory value="9" description="Kapitan Chechkin class (ice breakers)" uuid="dab1aff4-5269-11df-8de3-080069138b88" uid="14533">
+        <specific value="1" description="Kapitan Chechkin" uuid="dab2bdc2-5269-11df-a974-080069138b88" uid="14534"/>
+        <specific value="2" description="Kapitan Plakhin" uuid="dab3cbae-5269-11df-b43e-080069138b88" uid="14535"/>
+        <specific value="3" description="Kapitan Chadayev" uuid="dab4daee-5269-11df-89e4-080069138b88" uid="14536"/>
+        <specific value="4" description="Kapitan Krutov" uuid="dab5ecc2-5269-11df-8558-080069138b88" uid="14537"/>
+        <specific value="5" description="Kapitan Bukayev" uuid="dab7008a-5269-11df-b7ca-080069138b88" uid="14538"/>
+        <specific value="6" description="Kapitan Zarubin" uuid="dab80f5c-5269-11df-bd2a-080069138b88" uid="14539"/>
+      </subcategory>
+      <subcategory value="10" description="Kapitan Yevdokimov class (ice breakers)" uuid="dab9bc4e-5269-11df-a4ce-080069138b88" uid="14540">
+        <specific value="1" description="Kapitan Uevdokimov" uuid="dabaca26-5269-11df-8e0e-080069138b88" uid="14541"/>
+        <specific value="2" description="Kapitan Babichev" uuid="dabbd9fc-5269-11df-b043-080069138b88" uid="14542"/>
+        <specific value="3" description="Kapitan Chudinov" uuid="dabce770-5269-11df-aa71-080069138b88" uid="14543"/>
+        <specific value="4" description="Kapitan Borodkin" uuid="dabdef4e-5269-11df-988f-080069138b88" uid="14544"/>
+        <specific value="5" description="Avramiy Zavenyagin (ex-Kapitan Krylov)" uuid="dabf015e-5269-11df-9a10-080069138b88" uid="14545"/>
+        <specific value="6" description="Kapitan Metsayk" uuid="dac010a8-5269-11df-9a7d-080069138b88" uid="14546"/>
+        <specific value="7" description="Kapitan Demidov" uuid="dac1196c-5269-11df-bdfa-080069138b88" uid="14547"/>
+        <specific value="8" description="Kapitan Moshkin" uuid="dac22a6e-5269-11df-9a28-080069138b88" uid="14548"/>
+      </subcategory>
+      <subcategory value="11" description="Kapitan Izmaylov class (ice breakers)" uuid="dac3d850-5269-11df-aac1-080069138b88" uid="14549">
+        <specific value="1" description="Kapitan M. Izmaylov" uuid="dac4e7a4-5269-11df-a032-080069138b88" uid="14550"/>
+        <specific value="2" description="Kapitan Kosolapov" uuid="dac5f3d8-5269-11df-b699-080069138b88" uid="14551"/>
+        <specific value="3" description="Kapitan A. Radzabov" uuid="dac70192-5269-11df-a22d-080069138b88" uid="14552"/>
+      </subcategory>
+      <subcategory value="12" description="Stroptivy class (ice breakers)" uuid="dac8af7e-5269-11df-82d0-080069138b88" uid="14553">
+        <specific value="1" description="Stroptivy" uuid="dac9c1fc-5269-11df-b346-080069138b88" uid="14554"/>
+        <specific value="2" description="Stakhanovets" uuid="dacacad4-5269-11df-97cf-080069138b88" uid="14555"/>
+        <specific value="3" description="Sibirsky" uuid="dacbd988-5269-11df-842c-080069138b88" uid="14556"/>
+        <specific value="4" description="Spravedlivy" uuid="dacce846-5269-11df-9320-080069138b88" uid="14557"/>
+        <specific value="5" description="Suvorovets" uuid="dacdf218-5269-11df-82e4-080069138b88" uid="14558"/>
+        <specific value="6" description="Fobos" uuid="daceff14-5269-11df-b714-080069138b88" uid="14559"/>
+        <specific value="7" description="Deymos" uuid="dad00fb2-5269-11df-ad55-080069138b88" uid="14560"/>
+      </subcategory>
+      <subcategory value="13" description="Ivan Susanin class (armed ice breakers)" uuid="dad1bcae-5269-11df-aaa4-080069138b88" uid="14561">
+        <specific value="1" description="Zaisberg" uuid="dad2c6da-5269-11df-bd26-080069138b88" uid="14562"/>
+        <specific value="2" description="Neva" uuid="dad3d3e0-5269-11df-b710-080069138b88" uid="14563"/>
+        <specific value="3" description="Dunay" uuid="dad4eba4-5269-11df-8691-080069138b88" uid="14564"/>
+        <specific value="4" description="Ruslan" uuid="dad5f850-5269-11df-9753-080069138b88" uid="14565"/>
+        <specific value="5" description="Imeni XXVI Syezda KPSS" uuid="dad705e2-5269-11df-82a5-080069138b88" uid="14566"/>
+        <specific value="6" description="Volga" uuid="dad8137e-5269-11df-8b87-080069138b88" uid="14567"/>
+        <specific value="7" description="Ivan Susanin" uuid="dad91f76-5269-11df-a862-080069138b88" uid="14568"/>
+        <specific value="8" description="Imeni XXV Syezda KPSS" uuid="dada2d76-5269-11df-8ea3-080069138b88" uid="14569"/>
+      </subcategory>
+    </category>
+    <category value="18" description="Utility" uuid="dadc793c-5269-11df-81ab-080069138b88" uid="14570">
+      <subcategory value="1" description="Manych class (water tankers)" uuid="dadd8ae8-5269-11df-8e6a-080069138b88" uid="14571">
+        <specific value="1" description="Manych" uuid="dade9a3c-5269-11df-bd26-080069138b88" uid="14572"/>
+        <specific value="2" description="Tagil" uuid="dadfa81e-5269-11df-93c1-080069138b88" uid="14573"/>
+      </subcategory>
+      <subcategory value="2" description="Voda class (water carriers)" uuid="dae154ac-5269-11df-98fc-080069138b88" uid="14574">
+        <specific value="1" description="Abakan" uuid="dae26180-5269-11df-9538-080069138b88" uid="14575"/>
+        <specific value="2" description="Sura" uuid="dae36f62-5269-11df-be8c-080069138b88" uid="14576"/>
+        <specific value="3" description="MVT 6" uuid="dae47cae-5269-11df-bf3f-080069138b88" uid="14577"/>
+        <specific value="4" description="9" uuid="dae58342-5269-11df-9dad-080069138b88" uid="14578"/>
+        <specific value="5" description="10" uuid="dae6919c-5269-11df-958e-080069138b88" uid="14579"/>
+        <specific value="6" description="16" uuid="dae7a28a-5269-11df-977a-080069138b88" uid="14580"/>
+        <specific value="7" description="17" uuid="dae8a874-5269-11df-aada-080069138b88" uid="14581"/>
+        <specific value="8" description="18" uuid="dae9b5fc-5269-11df-a9ef-080069138b88" uid="14582"/>
+        <specific value="9" description="20" uuid="daeac6e0-5269-11df-9797-080069138b88" uid="14583"/>
+        <specific value="10" description="21" uuid="daebcec8-5269-11df-a948-080069138b88" uid="14584"/>
+        <specific value="11" description="24" uuid="daecd9da-5269-11df-8b84-080069138b88" uid="14585"/>
+        <specific value="12" description="134" uuid="daede776-5269-11df-8da3-080069138b88" uid="14586"/>
+        <specific value="13" description="135" uuid="daeef328-5269-11df-a939-080069138b88" uid="14587"/>
+        <specific value="14" description="138" uuid="daefff84-5269-11df-bec8-080069138b88" uid="14588"/>
+      </subcategory>
+      <subcategory value="3" description="Pelym class (degaussing ships (YDG))" uuid="daf1abea-5269-11df-9edd-080069138b88" uid="14589">
+        <specific value="1" description="SR 70" uuid="daf2bf4e-5269-11df-9821-080069138b88" uid="14590"/>
+        <specific value="2" description="SR 111" uuid="daf3ce52-5269-11df-8d6b-080069138b88" uid="14591"/>
+        <specific value="3" description="SR 179" uuid="daf4db44-5269-11df-9fe3-080069138b88" uid="14592"/>
+        <specific value="4" description="SR 180" uuid="daf5e98a-5269-11df-9cc7-080069138b88" uid="14593"/>
+        <specific value="5" description="SR 191" uuid="daf6f5dc-5269-11df-92fc-080069138b88" uid="14594"/>
+        <specific value="6" description="SR 203" uuid="daf80300-5269-11df-a381-080069138b88" uid="14595"/>
+        <specific value="7" description="SR 215" uuid="daf90f0c-5269-11df-881e-080069138b88" uid="14596"/>
+        <specific value="8" description="SR 218" uuid="dafa1a6e-5269-11df-af8d-080069138b88" uid="14597"/>
+        <specific value="9" description="SR 221" uuid="dafb2c06-5269-11df-9d58-080069138b88" uid="14598"/>
+        <specific value="10" description="SR 222" uuid="dafc3862-5269-11df-bfdb-080069138b88" uid="14599"/>
+        <specific value="11" description="SR 233" uuid="dafd3fdc-5269-11df-9a25-080069138b88" uid="14600"/>
+        <specific value="12" description="SR 241" uuid="dafe50c0-5269-11df-a3ce-080069138b88" uid="14601"/>
+        <specific value="13" description="SR 276" uuid="daff5e98-5269-11df-81ee-080069138b88" uid="14602"/>
+        <specific value="14" description="SR 280" uuid="db006518-5269-11df-bffb-080069138b88" uid="14603"/>
+        <specific value="15" description="SR 281" uuid="db0172e6-5269-11df-948f-080069138b88" uid="14604"/>
+        <specific value="16" description="SR 407" uuid="db0283d4-5269-11df-9cba-080069138b88" uid="14605"/>
+        <specific value="17" description="SR 409" uuid="db038ae0-5269-11df-a1da-080069138b88" uid="14606"/>
+        <specific value="18" description="SR 455" uuid="db0497b4-5269-11df-b0a7-080069138b88" uid="14607"/>
+      </subcategory>
+      <subcategory value="4" description="Bereza Class (degaussing ships (YDG))" uuid="db06473a-5269-11df-a723-080069138b88" uid="14608">
+        <specific value="1" description="SR 28" uuid="db0759d6-5269-11df-918a-080069138b88" uid="14609"/>
+        <specific value="2" description="SR 59" uuid="db086010-5269-11df-ae6e-080069138b88" uid="14610"/>
+        <specific value="3" description="SR 74" uuid="db096e60-5269-11df-9bf5-080069138b88" uid="14611"/>
+        <specific value="4" description="SR 120" uuid="db0a7fa8-5269-11df-9fe8-080069138b88" uid="14612"/>
+        <specific value="5" description="SR 137" uuid="db0b86f0-5269-11df-991b-080069138b88" uid="14613"/>
+        <specific value="6" description="SR 188" uuid="db0c9298-5269-11df-ab48-080069138b88" uid="14614"/>
+        <specific value="7" description="SR 216" uuid="db0da2d2-5269-11df-9483-080069138b88" uid="14615"/>
+        <specific value="8" description="SR 370" uuid="db0eabb4-5269-11df-add8-080069138b88" uid="14616"/>
+        <specific value="9" description="SR 478" uuid="db0fb748-5269-11df-88e5-080069138b88" uid="14617"/>
+        <specific value="10" description="SR 479" uuid="db10caac-5269-11df-98a2-080069138b88" uid="14618"/>
+        <specific value="11" description="SR 541" uuid="db11dbe0-5269-11df-8f8f-080069138b88" uid="14619"/>
+        <specific value="12" description="SR 548" uuid="db12eb70-5269-11df-8e26-080069138b88" uid="14620"/>
+        <specific value="13" description="SR 568" uuid="db13f844-5269-11df-88b4-080069138b88" uid="14621"/>
+        <specific value="14" description="SR 569" uuid="db1504be-5269-11df-a28c-080069138b88" uid="14622"/>
+        <specific value="15" description="SR 570" uuid="db161372-5269-11df-91ab-080069138b88" uid="14623"/>
+        <specific value="16" description="SR 936" uuid="db17217c-5269-11df-bb78-080069138b88" uid="14624"/>
+        <specific value="17" description="SR 939" uuid="db182c52-5269-11df-8d4d-080069138b88" uid="14625"/>
+      </subcategory>
+      <subcategory value="5" description="Khabarov class (degaussing ships (YDG))" uuid="db19d96c-5269-11df-9c57-080069138b88" uid="14626">
+        <specific value="1" description="Khabarov" uuid="db1ae8f2-5269-11df-8170-080069138b88" uid="14627"/>
+        <specific value="2" description="SR 164" uuid="db1bf882-5269-11df-95ad-080069138b88" uid="14628"/>
+      </subcategory>
+      <subcategory value="6" description="Sekstan class" uuid="db1da236-5269-11df-a1b3-080069138b88" uid="14629"/>
+      <subcategory value="7" description="Korall class" uuid="db1eabfe-5269-11df-9621-080069138b88" uid="14630"/>
+      <subcategory value="8" description="Baklazhan class (tugs)" uuid="db1fbe22-5269-11df-b104-080069138b88" uid="14631">
+        <specific value="1" description="SB 131 Nikolai Chiker" uuid="db20cb6e-5269-11df-b3cf-080069138b88" uid="14632"/>
+        <specific value="2" description="SB 135" uuid="db21d39c-5269-11df-bda8-080069138b88" uid="14633"/>
+      </subcategory>
+      <subcategory value="9" description="Neftegaz class (tugs)" uuid="db2382dc-5269-11df-a836-080069138b88" uid="14634">
+        <specific value="1" description="Aleksey Kortunov" uuid="db249050-5269-11df-8b40-080069138b88" uid="14635"/>
+        <specific value="2" description="Ilga" uuid="db259d24-5269-11df-8cbf-080069138b88" uid="14636"/>
+        <specific value="3" description="Umka" uuid="db26a8c2-5269-11df-8cd4-080069138b88" uid="14637"/>
+        <specific value="4" description="Kalar" uuid="db27b64a-5269-11df-b850-080069138b88" uid="14638"/>
+      </subcategory>
+      <subcategory value="10" description="Goryn class (tugs)" uuid="db297390-5269-11df-a9e5-080069138b88" uid="14639">
+        <specific value="1" description="MB 15" uuid="db2a9022-5269-11df-8b87-080069138b88" uid="14640"/>
+        <specific value="2" description="MB 119" uuid="db2b9936-5269-11df-a6f8-080069138b88" uid="14641"/>
+        <specific value="3" description="MB 18" uuid="db2ca66e-5269-11df-af57-080069138b88" uid="14642"/>
+        <specific value="4" description="SB 365 (ex-MB 29)" uuid="db2db52c-5269-11df-bf79-080069138b88" uid="14643"/>
+        <specific value="5" description="MB 32" uuid="db2ebcd8-5269-11df-8ce6-080069138b88" uid="14644"/>
+        <specific value="6" description="SB 521 (ex-MB 61)" uuid="db2fcc0e-5269-11df-9a8b-080069138b88" uid="14645"/>
+        <specific value="7" description="MB 35" uuid="db30e670-5269-11df-b7db-080069138b88" uid="14646"/>
+        <specific value="8" description="SB 522 (ex-MB 62)" uuid="db31ed7c-5269-11df-a5c5-080069138b88" uid="14647"/>
+        <specific value="9" description="MB 36" uuid="db32fbf4-5269-11df-8561-080069138b88" uid="14648"/>
+        <specific value="10" description="SB 523 (ex-MB 64)" uuid="db340aa8-5269-11df-8cf3-080069138b88" uid="14649"/>
+        <specific value="11" description="MB 38" uuid="db351466-5269-11df-9d0e-080069138b88" uid="14650"/>
+        <specific value="12" description="SB 524 (ex-MB 108)" uuid="db3620fe-5269-11df-a790-080069138b88" uid="14651"/>
+        <specific value="13" description="MB 105" uuid="db3734a8-5269-11df-b96f-080069138b88" uid="14652"/>
+      </subcategory>
+      <subcategory value="11" description="Sorum class (tugs)" uuid="db38e212-5269-11df-9d6c-080069138b88" uid="14653">
+        <specific value="1" description="Amur" uuid="db39eb1c-5269-11df-ba3f-080069138b88" uid="14654"/>
+        <specific value="2" description="Primorye" uuid="db3af7be-5269-11df-bfbe-080069138b88" uid="14655"/>
+        <specific value="3" description="Brest" uuid="db3c09d8-5269-11df-a43c-080069138b88" uid="14656"/>
+        <specific value="4" description="Bug" uuid="db3d1184-5269-11df-8dbf-080069138b88" uid="14657"/>
+        <specific value="5" description="Burya" uuid="db3e1dae-5269-11df-86e9-080069138b88" uid="14658"/>
+        <specific value="6" description="Chukotka" uuid="db3f2cd0-5269-11df-a47e-080069138b88" uid="14659"/>
+        <specific value="7" description="Kamchatka" uuid="db4038a0-5269-11df-977b-080069138b88" uid="14660"/>
+        <specific value="8" description="Karelia" uuid="db414556-5269-11df-b8e6-080069138b88" uid="14661"/>
+        <specific value="9" description="Ladoga" uuid="db42516c-5269-11df-8585-080069138b88" uid="14662"/>
+        <specific value="10" description="Neman" uuid="db435a44-5269-11df-bd24-080069138b88" uid="14663"/>
+        <specific value="11" description="Sakhalin" uuid="db446b3c-5269-11df-96cd-080069138b88" uid="14664"/>
+        <specific value="12" description="Ural" uuid="db4577fc-5269-11df-82b1-080069138b88" uid="14665"/>
+        <specific value="13" description="Victor Kingsiepp" uuid="db468110-5269-11df-bdc9-080069138b88" uid="14666"/>
+        <specific value="14" description="Yan Berzin" uuid="db479398-5269-11df-82ca-080069138b88" uid="14667"/>
+        <specific value="15" description="Yenisey" uuid="db48a210-5269-11df-b1ce-080069138b88" uid="14668"/>
+        <specific value="16" description="Zabaykalye" uuid="db49a908-5269-11df-8c6c-080069138b88" uid="14669"/>
+        <specific value="17" description="Zapolarye" uuid="db4ab6a4-5269-11df-a110-080069138b88" uid="14670"/>
+        <specific value="18" description="MB 4" uuid="db4bc742-5269-11df-a79b-080069138b88" uid="14671"/>
+        <specific value="19" description="MB 6" uuid="db4ccd86-5269-11df-a867-080069138b88" uid="14672"/>
+        <specific value="20" description="MB 13" uuid="db4dda0a-5269-11df-88ca-080069138b88" uid="14673"/>
+        <specific value="21" description="MB 19" uuid="db4ee94a-5269-11df-9467-080069138b88" uid="14674"/>
+        <specific value="22" description="MB 25" uuid="db4ffa92-5269-11df-8068-080069138b88" uid="14675"/>
+        <specific value="23" description="MB 26" uuid="db510720-5269-11df-80cb-080069138b88" uid="14676"/>
+        <specific value="24" description="MB 28" uuid="db5218cc-5269-11df-b137-080069138b88" uid="14677"/>
+        <specific value="25" description="MB 30" uuid="db532028-5269-11df-8b95-080069138b88" uid="14678"/>
+        <specific value="26" description="MB 31" uuid="db542db0-5269-11df-bfac-080069138b88" uid="14679"/>
+        <specific value="27" description="MB 37" uuid="db553af2-5269-11df-b7ec-080069138b88" uid="14680"/>
+        <specific value="28" description="MB 56" uuid="db5646cc-5269-11df-b095-080069138b88" uid="14681"/>
+        <specific value="29" description="MB 58" uuid="db575512-5269-11df-ba35-080069138b88" uid="14682"/>
+        <specific value="30" description="MB 61" uuid="db5861b4-5269-11df-9be7-080069138b88" uid="14683"/>
+        <specific value="31" description="MB 76" uuid="db596a0a-5269-11df-83a3-080069138b88" uid="14684"/>
+        <specific value="32" description="MB 99" uuid="db5a7ad0-5269-11df-8e11-080069138b88" uid="14685"/>
+        <specific value="33" description="MB 110" uuid="db5b8790-5269-11df-a028-080069138b88" uid="14686"/>
+        <specific value="34" description="MB 147" uuid="db5c8eba-5269-11df-bc1e-080069138b88" uid="14687"/>
+        <specific value="35" description="MB 148" uuid="db5d9f62-5269-11df-9661-080069138b88" uid="14688"/>
+        <specific value="36" description="MB 196" uuid="db5eadee-5269-11df-9016-080069138b88" uid="14689"/>
+        <specific value="37" description="MB 236" uuid="db5fc076-5269-11df-9459-080069138b88" uid="14690"/>
+        <specific value="38" description="MB 304" uuid="db60d36c-5269-11df-90dc-080069138b88" uid="14691"/>
+        <specific value="39" description="MB 307" uuid="db621f56-5269-11df-8869-080069138b88" uid="14692"/>
+      </subcategory>
+      <subcategory value="12" description="Okhtensky class (tugs)" uuid="db63d468-5269-11df-9d54-080069138b88" uid="14693">
+        <specific value="1" description="Loksa" uuid="db64e15a-5269-11df-986e-080069138b88" uid="14694"/>
+        <specific value="2" description="Orion" uuid="db65ef28-5269-11df-afd9-080069138b88" uid="14695"/>
+        <specific value="3" description="Saturn" uuid="db66fb66-5269-11df-aa07-080069138b88" uid="14696"/>
+        <specific value="4" description="Neptun" uuid="db680538-5269-11df-8e37-080069138b88" uid="14697"/>
+        <specific value="5" description="Pochetny" uuid="db69178e-5269-11df-86f1-080069138b88" uid="14698"/>
+        <specific value="6" description="Tyulen" uuid="db6a24da-5269-11df-bfa5-080069138b88" uid="14699"/>
+      </subcategory>
+      <subcategory value="13" description="Roslavl class (tugs)" uuid="db6bcfba-5269-11df-bbdc-080069138b88" uid="14700">
+        <specific value="1" description="MB 50" uuid="db6cdcf2-5269-11df-a8e8-080069138b88" uid="14701"/>
+        <specific value="2" description="MB 94" uuid="db6df1c8-5269-11df-8db0-080069138b88" uid="14702"/>
+        <specific value="3" description="MB 95" uuid="db6f00b8-5269-11df-9720-080069138b88" uid="14703"/>
+        <specific value="4" description="MB 102" uuid="db700c74-5269-11df-bf1d-080069138b88" uid="14704"/>
+        <specific value="5" description="MB 125" uuid="db711a7e-5269-11df-8d2d-080069138b88" uid="14705"/>
+        <specific value="6" description="MB 145" uuid="db7227c0-5269-11df-b8ac-080069138b88" uid="14706"/>
+        <specific value="7" description="MB 146" uuid="db732f12-5269-11df-b935-080069138b88" uid="14707"/>
+        <specific value="8" description="MB 147" uuid="db743d62-5269-11df-82bd-080069138b88" uid="14708"/>
+        <specific value="9" description="SB 41" uuid="db754e96-5269-11df-aa9e-080069138b88" uid="14709"/>
+        <specific value="10" description="SB 46" uuid="db7655de-5269-11df-9a9e-080069138b88" uid="14710"/>
+      </subcategory>
+      <subcategory value="14" description="Zenit class (tugs)" uuid="db7801f4-5269-11df-9b48-080069138b88" uid="14711"/>
+      <subcategory value="15" description="Scholle class (harbor tugs)" uuid="db7913fa-5269-11df-97f6-080069138b88" uid="14712"/>
+      <subcategory value="16" description="Tugur class (harbor tugs)" uuid="db7a28d0-5269-11df-9845-080069138b88" uid="14713"/>
+      <subcategory value="17" description="Sidehole (1, 2) classes (harbor tugs)" uuid="db7b328e-5269-11df-b7ee-080069138b88" uid="14714"/>
+    </category>
+    <category value="50" description="Frigate" uuid="db7ce05c-5269-11df-a16d-080069138b88" uid="14715">
+      <subcategory value="1" description="Grisha I class" uuid="db7def38-5269-11df-9385-080069138b88" uid="14716"/>
+      <subcategory value="2" description="Grisha II class" uuid="db7f0170-5269-11df-ab33-080069138b88" uid="14717">
+        <specific value="1" description="Ametyst" deprecated="1" uuid="db800958-5269-11df-89dd-080069138b88" uid="14718"/>
+        <specific value="2" description="Brilliant" deprecated="1" uuid="db811802-5269-11df-ac60-080069138b88" uid="14719"/>
+        <specific value="3" description="Izumrud" deprecated="1" uuid="db8229c2-5269-11df-aec8-080069138b88" uid="14720"/>
+        <specific value="4" description="Predanny" deprecated="1" uuid="db833308-5269-11df-b263-080069138b88" uid="14721"/>
+        <specific value="5" description="Rubin" deprecated="1" uuid="db843fdc-5269-11df-a7e7-080069138b88" uid="14722"/>
+        <specific value="6" description="Sapfir" deprecated="1" uuid="db854eae-5269-11df-9baf-080069138b88" uid="14723"/>
+        <specific value="7" description="Zhemchug" deprecated="1" uuid="db865cd6-5269-11df-858e-080069138b88" uid="14724"/>
+        <specific value="8" description="Provorny" deprecated="1" uuid="db876bbc-5269-11df-a6a5-080069138b88" uid="14725"/>
+        <specific value="9" description="Izmail" deprecated="1" uuid="db8879d0-5269-11df-a4ea-080069138b88" uid="14726"/>
+        <specific value="10" description="U-200 Vinnitsa (Ukraine) (Ex-Dneper)" uuid="db8987d0-5269-11df-ac55-080069138b88" uid="14727"/>
+        <specific value="11" description="Resitelny" deprecated="1" uuid="db8a976a-5269-11df-94b9-080069138b88" uid="14728"/>
+        <specific value="12" description="Primerny" deprecated="1" uuid="db8ba4fc-5269-11df-80ec-080069138b88" uid="14729"/>
+      </subcategory>
+      <subcategory value="3" description="Grisha III class" uuid="db8d6008-5269-11df-a6a3-080069138b88" uid="14730"/>
+      <subcategory value="4" description="Grisha V class" uuid="db8e6962-5269-11df-b8bd-080069138b88" uid="14731"/>
+      <subcategory value="5" description="Mirka II class" deprecated="1" uuid="db8f7834-5269-11df-89e6-080069138b88" uid="14732"/>
+      <subcategory value="6" description="Petya I class" uuid="db9086ca-5269-11df-b591-080069138b88" uid="14733"/>
+      <subcategory value="7" description="Petya II class" uuid="db9192ae-5269-11df-bb53-080069138b88" uid="14734"/>
+      <subcategory value="8" description="Riga class" uuid="db92a2d4-5269-11df-a516-080069138b88" uid="14735"/>
+      <subcategory value="9" description="Krivak III (Zaliv (Kerch))" uuid="db93b200-5269-11df-bb22-080069138b88" uid="14736">
+        <specific value="1" description="Menzhinsky" uuid="db94bd8a-5269-11df-9c70-080069138b88" uid="14737"/>
+        <specific value="2" description="Derzhinsky" uuid="db95cb8a-5269-11df-ab06-080069138b88" uid="14738"/>
+        <specific value="3" description="Orel" uuid="db96da7a-5269-11df-9796-080069138b88" uid="14739"/>
+        <specific value="4" description="Imeni lXX Letiya Vchk-Kgb" uuid="db97e172-5269-11df-8ab9-080069138b88" uid="14740"/>
+        <specific value="5" description="Imeni lXX Letiya Pogranvoysk" uuid="db98f328-5269-11df-ac46-080069138b88" uid="14741"/>
+        <specific value="6" description="Kedrov" uuid="db9a0204-5269-11df-9d13-080069138b88" uid="14742"/>
+        <specific value="7" description="Vorovsky" uuid="db9b0ad2-5269-11df-a678-080069138b88" uid="14743"/>
+        <specific value="8" description="Hetman Dorosenko" uuid="db9c1ac6-5269-11df-8ed3-080069138b88" uid="14744"/>
+        <specific value="9" description="Hetman Petr Sagadachny" uuid="db9d29ca-5269-11df-b11a-080069138b88" uid="14745"/>
+      </subcategory>
+      <subcategory value="10" description="Parchim II Class" uuid="db9edb6c-5269-11df-8ada-080069138b88" uid="14746"/>
+      <subcategory value="11" description="Petya III Class" uuid="db9fe3fe-5269-11df-af5d-080069138b88" uid="14747"/>
+      <subcategory value="12" description="Koni Class" uuid="dba0f190-5269-11df-afcd-080069138b88" uid="14748"/>
+    </category>
+    <category value="52" description="Heavy Cruiser" uuid="dba2a198-5269-11df-a31b-080069138b88" uid="14749"/>
+    <category value="61" description="Non-Combatant Ship" uuid="dba3ae94-5269-11df-a8cd-080069138b88" uid="14750">
+      <subcategory value="1" description="Container Class" uuid="dba4b712-5269-11df-995e-080069138b88" uid="14751">
+        <specific value="1" description="Akvamarinovyy" uuid="dba5c5d0-5269-11df-843c-080069138b88" uid="14752"/>
+        <specific value="2" description="Ivan Susanin" uuid="dba6d8da-5269-11df-9500-080069138b88" uid="14753"/>
+        <specific value="3" description="Kapitan Chukhchin" uuid="dba7e1da-5269-11df-9d5c-080069138b88" uid="14754"/>
+      </subcategory>
+      <subcategory value="2" description="Small Fishing Boat" uuid="dba98d00-5269-11df-a605-080069138b88" uid="14755"/>
+      <subcategory value="3" description="Medium Fishing Boat" uuid="dbaa9fa6-5269-11df-a6c5-080069138b88" uid="14756"/>
+      <subcategory value="4" description="Large Fishing Boat" uuid="dbabb7d8-5269-11df-b55e-080069138b88" uid="14757"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="222" uuid="dbae06a0-5269-11df-99f4-080069138b88" uid="14758">
+    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="dbaf11f8-5269-11df-8b39-080069138b88" uid="14759">
+      <subcategory value="1" description="Typhoon class" uuid="dbb01bac-5269-11df-ba72-080069138b88" uid="14760"/>
+      <subcategory value="2" description="Delta IV class" uuid="dbb12a1a-5269-11df-89b2-080069138b88" uid="14761"/>
+      <subcategory value="3" description="Delta III class" uuid="dbb23c66-5269-11df-91c4-080069138b88" uid="14762"/>
+      <subcategory value="4" description="Delta II class" uuid="dbb3453e-5269-11df-b76d-080069138b88" uid="14763"/>
+      <subcategory value="5" description="Delta I class" uuid="dbb453f2-5269-11df-8fb6-080069138b88" uid="14764"/>
+      <subcategory value="6" description="Yankee I class" uuid="dbb566c0-5269-11df-af18-080069138b88" uid="14765"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="dbb67038-5269-11df-89aa-080069138b88" uid="14766"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="dbb77eb0-5269-11df-8187-080069138b88" uid="14767"/>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="dbb88eb8-5269-11df-8369-080069138b88" uid="14768"/>
+      <subcategory value="10" description="Golf I class" deprecated="1" uuid="dbb99d1c-5269-11df-a2b3-080069138b88" uid="14769"/>
+      <subcategory value="11" description="Golf II class" deprecated="1" uuid="dbbaac52-5269-11df-b0db-080069138b88" uid="14770"/>
+    </category>
+    <category value="2" description="SSGN (Nuclear Guided Missile)" uuid="dbbc599e-5269-11df-83f2-080069138b88" uid="14771">
+      <subcategory value="1" description="Oscar II class" uuid="dbbd6bd6-5269-11df-be15-080069138b88" uid="14772"/>
+      <subcategory value="2" description="Oscar I class" deprecated="1" uuid="dbbe7512-5269-11df-a6e9-080069138b88" uid="14773"/>
+      <subcategory value="3" description="Charlie II class" deprecated="1" uuid="dbbf834e-5269-11df-8114-080069138b88" uid="14774"/>
+      <subcategory value="4" description="Charlie I class" deprecated="1" uuid="dbc09478-5269-11df-8428-080069138b88" uid="14775"/>
+      <subcategory value="5" description="Echo II class" deprecated="1" uuid="dbc1afa2-5269-11df-8a39-080069138b88" uid="14776"/>
+      <subcategory value="6" description="Yankee conversion class" uuid="dbc2c09a-5269-11df-af06-080069138b88" uid="14777"/>
+      <subcategory value="7" description="Severodvinsk class" uuid="dbc3cf08-5269-11df-a480-080069138b88" uid="14778"/>
+    </category>
+    <category value="3" description="SSN (Nuclear Attack-Torpedo)" uuid="dbc580d2-5269-11df-8b0b-080069138b88" uid="14779">
+      <subcategory value="1" description="Victor III Class" uuid="dbc689f0-5269-11df-9b39-080069138b88" uid="14780"/>
+      <subcategory value="2" description="Victor II class" uuid="dbc7989a-5269-11df-8d01-080069138b88" uid="14781"/>
+      <subcategory value="3" description="Victor I class" deprecated="1" uuid="dbc8a60e-5269-11df-aeb1-080069138b88" uid="14782"/>
+      <subcategory value="4" description="Yankee Notch class" uuid="dbc9b440-5269-11df-89aa-080069138b88" uid="14783"/>
+      <subcategory value="5" description="Sierra II class" uuid="dbcacc54-5269-11df-b9c8-080069138b88" uid="14784">
+        <specific value="1" description="Orel" uuid="dbcbdb4e-5269-11df-9020-080069138b88" uid="14785"/>
+        <specific value="2" description="Kasatka" uuid="dbcce5ac-5269-11df-9626-080069138b88" uid="14786"/>
+      </subcategory>
+      <subcategory value="6" description="Sierra I class" deprecated="1" uuid="dbce91ae-5269-11df-b0fe-080069138b88" uid="14787"/>
+      <subcategory value="7" description="Alfa class" uuid="dbcfa0f8-5269-11df-9578-080069138b88" uid="14788"/>
+      <subcategory value="8" description="Akula class" uuid="dbd0b27c-5269-11df-afdc-080069138b88" uid="14789">
+        <specific value="1" description="Bars" uuid="dbd1b924-5269-11df-9e31-080069138b88" uid="14790"/>
+        <specific value="2" description="Leopard" uuid="dbd2c74c-5269-11df-9b57-080069138b88" uid="14791"/>
+        <specific value="3" description="Pantera" uuid="dbd3d8e4-5269-11df-9be2-080069138b88" uid="14792"/>
+        <specific value="4" description="Puma" uuid="dbd4e036-5269-11df-9de5-080069138b88" uid="14793"/>
+        <specific value="5" description="Volk" uuid="dbd5ecb0-5269-11df-8104-080069138b88" uid="14794"/>
+        <specific value="6" description="Tigr" uuid="dbd6fc68-5269-11df-b1c8-080069138b88" uid="14795"/>
+      </subcategory>
+      <subcategory value="9" description="Akula II Class" uuid="dbd8a770-5269-11df-931d-080069138b88" uid="14796"/>
+    </category>
+    <category value="4" description="SSG (Conventional Guided Missile)" uuid="dbda5584-5269-11df-9474-080069138b88" uid="14797">
+      <subcategory value="1" description="Juliett Class" deprecated="1" uuid="dbdb6280-5269-11df-81e1-080069138b88" uid="14798"/>
+    </category>
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="dbdd0fd6-5269-11df-98ff-080069138b88" uid="14799">
+      <subcategory value="1" description="Kilo class" uuid="dbde1e94-5269-11df-bf07-080069138b88" uid="14800"/>
+      <subcategory value="2" description="Tango class" uuid="dbdf2cf8-5269-11df-9184-080069138b88" uid="14801"/>
+      <subcategory value="3" description="Foxtrot class" uuid="dbe038f0-5269-11df-be36-080069138b88" uid="14802"/>
+      <subcategory value="4" description="Romeo class" uuid="dbe146aa-5269-11df-b4e7-080069138b88" uid="14803">
+        <specific value="1" description="(North Korean Romeo SS (Snorkle))" uuid="dbe252ca-5269-11df-a5b4-080069138b88" uid="14804"/>
+        <specific value="2" description="(North Korean Romeo SS (Split Plant))" uuid="dbe35de6-5269-11df-ad7b-080069138b88" uid="14805"/>
+        <specific value="3" description="Romeo" uuid="dbe47212-5269-11df-bcf9-080069138b88" uid="14806"/>
+      </subcategory>
+      <subcategory value="5" description="Whiskey Class" uuid="dbe61dec-5269-11df-9dc6-080069138b88" uid="14807"/>
+    </category>
+    <category value="6" description="SSAN (Nuclear Auxiliary)" uuid="dbe7cc6e-5269-11df-bf59-080069138b88" uid="14808">
+      <subcategory value="1" description="Yankee class (ex-SSBN)" uuid="dbe8e324-5269-11df-baee-080069138b88" uid="14809"/>
+      <subcategory value="2" description="Uniform class" uuid="dbe9edb4-5269-11df-8f96-080069138b88" uid="14810"/>
+      <subcategory value="3" description="Paltus class" uuid="dbeafd12-5269-11df-8786-080069138b88" uid="14811"/>
+    </category>
+    <category value="7" description="SSA (Conventional Auxiliary)" uuid="dbecad42-5269-11df-a982-080069138b88" uid="14812">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="dbedbbce-5269-11df-8f9d-080069138b88" uid="14813"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="dbeec62c-5269-11df-a226-080069138b88" uid="14814"/>
+      <subcategory value="3" description="Lima class" uuid="dbefd65c-5269-11df-9bcd-080069138b88" uid="14815"/>
+      <subcategory value="4" description="Beluga class" uuid="dbf0e36c-5269-11df-8337-080069138b88" uid="14816"/>
+      <subcategory value="5" description="X-Ray class" uuid="dbf1f14e-5269-11df-94a6-080069138b88" uid="14817"/>
+      <subcategory value="6" description="India class" uuid="dbf2ff12-5269-11df-9dce-080069138b88" uid="14818"/>
+      <subcategory value="7" description="Bravo class (target sub)" uuid="dbf40e8e-5269-11df-b0e4-080069138b88" uid="14819"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="222" uuid="dbf65a40-5269-11df-9aa5-080069138b88" uid="14820">
+    <category value="0" description="Other" uuid="dbf76692-5269-11df-bc60-080069138b88" uid="14821">
+      <subcategory value="1" description="Astronomical Module" uuid="dbf86f4c-5269-11df-aff6-080069138b88" uid="14822">
+        <specific value="1" description="Kavant 1" uuid="dbf97c5c-5269-11df-b703-080069138b88" uid="14823"/>
+        <specific value="2" description="Kavant 2" uuid="dbfa8868-5269-11df-807a-080069138b88" uid="14824"/>
+        <specific value="3" description="Priroda" uuid="dbfb94ec-5269-11df-8a79-080069138b88" uid="14825"/>
+        <specific value="4" description="Spektrum" uuid="dbfca350-5269-11df-98a7-080069138b88" uid="14826"/>
+        <specific value="5" description="Kristall" uuid="dbfdaf48-5269-11df-bfc5-080069138b88" uid="14827"/>
+      </subcategory>
+    </category>
+    <category value="1" description="Manned" uuid="dbfffb72-5269-11df-9ae8-080069138b88" uid="14828">
+      <subcategory value="1" description="Space Shuttle" uuid="dc01071a-5269-11df-8e1c-080069138b88" uid="14829">
+        <specific value="1" description="Buran" uuid="dc0211dc-5269-11df-9e72-080069138b88" uid="14830"/>
+      </subcategory>
+      <subcategory value="2" description="Space Station" uuid="dc03bdac-5269-11df-92de-080069138b88" uid="14831">
+        <specific value="1" description="Mir" uuid="dc04ce2c-5269-11df-aab0-080069138b88" uid="14832"/>
+        <specific value="2" description="Kvant" uuid="dc05dbdc-5269-11df-9c0d-080069138b88" uid="14833"/>
+        <specific value="3" description="Resurs-F2" uuid="dc06e306-5269-11df-9c90-080069138b88" uid="14834"/>
+      </subcategory>
+      <subcategory value="3" description="Space vehicles" uuid="dc089a2a-5269-11df-b625-080069138b88" uid="14835">
+        <specific value="1" description="Phobos 2" uuid="dc09a7d0-5269-11df-a25d-080069138b88" uid="14836"/>
+        <specific value="2" description="Soyuz-TM" uuid="dc0ab5c6-5269-11df-b190-080069138b88" uid="14837"/>
+        <specific value="3" description="Phobos" uuid="dc0bbcbe-5269-11df-b76f-080069138b88" uid="14838"/>
+        <specific value="4" description="Progress" uuid="dc0ccb7c-5269-11df-8b2b-080069138b88" uid="14839"/>
+        <specific value="5" description="Progress-M" uuid="dc0ddcd8-5269-11df-a41d-080069138b88" uid="14840"/>
+        <specific value="6" description="Prognaz" uuid="dc0ee47a-5269-11df-970b-080069138b88" uid="14841"/>
+        <specific value="7" description="Vostok" uuid="dc0ff20c-5269-11df-a3d5-080069138b88" uid="14842"/>
+        <specific value="8" description="Molniya" uuid="dc1100de-5269-11df-9545-080069138b88" uid="14843"/>
+        <specific value="9" description="Cosmos" uuid="dc120a60-5269-11df-addc-080069138b88" uid="14844"/>
+        <specific value="10" description="Proton K" uuid="dc1317f2-5269-11df-888e-080069138b88" uid="14845"/>
+        <specific value="11" description="Proton KM" uuid="dc1429d0-5269-11df-85a8-080069138b88" uid="14846"/>
+        <specific value="12" description="Tsyklon" uuid="dc1530dc-5269-11df-ba07-080069138b88" uid="14847"/>
+        <specific value="13" description="Zenit" uuid="dc163e5a-5269-11df-a662-080069138b88" uid="14848"/>
+        <specific value="14" description="Lomonosov (MHB)" uuid="dc174bb0-5269-11df-b357-080069138b88" uid="14849"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Unmanned" uuid="dc199866-5269-11df-91ca-080069138b88" uid="14850">
+      <subcategory value="1" description="Communication satellite" uuid="dc1aa4ea-5269-11df-8df4-080069138b88" uid="14851">
+        <specific value="1" description="Molniya" uuid="dc1bac3c-5269-11df-8aa7-080069138b88" uid="14852"/>
+      </subcategory>
+      <subcategory value="2" description="Navigation satellite" uuid="dc1d5a00-5269-11df-869c-080069138b88" uid="14853">
+        <specific value="1" description="GEO-IK Geodedic Cosmos" uuid="dc1e68d2-5269-11df-971b-080069138b88" uid="14854"/>
+        <specific value="2" description="Elektron" uuid="dc1f7af6-5269-11df-b369-080069138b88" uid="14855"/>
+      </subcategory>
+      <subcategory value="3" description="Early Warning satellite" uuid="dc2124f0-5269-11df-9ab4-080069138b88" uid="14856">
+        <specific value="1" description="Cosmos" uuid="dc2230ac-5269-11df-8078-080069138b88" uid="14857"/>
+      </subcategory>
+      <subcategory value="4" description="Electronic Intelligence satellite" uuid="dc23dd76-5269-11df-9abf-080069138b88" uid="14858">
+        <specific value="1" description="Elints" uuid="dc24ecb6-5269-11df-95e8-080069138b88" uid="14859"/>
+      </subcategory>
+      <subcategory value="6" description="Ocean surveillance satellite" uuid="dc26a59c-5269-11df-b003-080069138b88" uid="14860">
+        <specific value="1" description="Okean" uuid="dc27b40a-5269-11df-8f9c-080069138b88" uid="14861"/>
+        <specific value="2" description="Eorsats" uuid="dc28bc7e-5269-11df-90ce-080069138b88" uid="14862"/>
+      </subcategory>
+      <subcategory value="8" description="Optical imaging surveillance satellite" uuid="dc2a6a10-5269-11df-9ddc-080069138b88" uid="14863">
+        <specific value="1" description="Venera" uuid="dc2b7b26-5269-11df-b7be-080069138b88" uid="14864"/>
+        <specific value="2" description="Generation" uuid="dc2c8b2e-5269-11df-950a-080069138b88" uid="14865"/>
+      </subcategory>
+      <subcategory value="10" description="Minor military satellite" uuid="dc2e3abe-5269-11df-b91f-080069138b88" uid="14866">
+        <specific value="1" description="C2093" uuid="dc2f4314-5269-11df-85fd-080069138b88" uid="14867"/>
+        <specific value="2" description="C2002" uuid="dc304f8e-5269-11df-abee-080069138b88" uid="14868"/>
+        <specific value="3" description="C2059" uuid="dc315e42-5269-11df-91ab-080069138b88" uid="14869"/>
+        <specific value="4" description="C2075" uuid="dc326850-5269-11df-b3ed-080069138b88" uid="14870"/>
+        <specific value="5" description="C2137" uuid="dc3374b6-5269-11df-bd68-080069138b88" uid="14871"/>
+        <specific value="6" description="C2164" uuid="dc34850e-5269-11df-b4eb-080069138b88" uid="14872"/>
+        <specific value="7" description="C1985" uuid="dc358c42-5269-11df-b0d6-080069138b88" uid="14873"/>
+        <specific value="8" description="C2053" uuid="dc369998-5269-11df-a272-080069138b88" uid="14874"/>
+        <specific value="9" description="C2106" uuid="dc37a98c-5269-11df-9002-080069138b88" uid="14875"/>
+      </subcategory>
+      <subcategory value="11" description="Illuminating satellite" uuid="dc395980-5269-11df-b650-080069138b88" uid="14876">
+        <specific value="1" description="Reflector" uuid="dc3a626c-5269-11df-ad8a-080069138b88" uid="14877"/>
+        <specific value="2" description="Energia" uuid="dc3b6fcc-5269-11df-a502-080069138b88" uid="14878"/>
+      </subcategory>
+      <subcategory value="12" description="Microwave activity" uuid="dc3d1d04-5269-11df-a118-080069138b88" uid="14879">
+        <specific value="1" description="Relikt" uuid="dc3e2eec-5269-11df-9377-080069138b88" uid="14880"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="224" uuid="dc41186e-5269-11df-a96f-080069138b88" uid="14881">
+    <category value="1" description="Tank" uuid="dc422466-5269-11df-b9f3-080069138b88" uid="14882">
+      <subcategory value="1" description="Chieftain MBT" uuid="dc433ce8-5269-11df-9ff2-080069138b88" uid="14883"/>
+      <subcategory value="2" description="Challenger MBT" uuid="dc4452d6-5269-11df-b78a-080069138b88" uid="14884">
+        <specific value="1" description="Mark I" uuid="dc4560a4-5269-11df-a0bb-080069138b88" uid="14885"/>
+        <specific value="2" description="Mark II" uuid="dc466c92-5269-11df-8132-080069138b88" uid="14886"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Armored fighting vehicle" uuid="dc48ba1a-5269-11df-b953-080069138b88" uid="14887">
+      <subcategory value="1" description="FV 432 (APC)" uuid="dc49c7e8-5269-11df-af75-080069138b88" uid="14888">
+        <specific value="1" description="Ambulance" uuid="dc4ad5ac-5269-11df-867d-080069138b88" uid="14889"/>
+        <specific value="2" description="81mm mortar carrier" uuid="dc4be230-5269-11df-b10c-080069138b88" uid="14890"/>
+      </subcategory>
+      <subcategory value="2" description="FV 103 Spartan (APC)" uuid="dc4d918e-5269-11df-9caa-080069138b88" uid="14891"/>
+      <subcategory value="3" description="FV 601 Saladin" uuid="dc4e9b1a-5269-11df-a0f3-080069138b88" uid="14892"/>
+      <subcategory value="4" description="FV 107 Scimitar" uuid="dc4faa0a-5269-11df-98b5-080069138b88" uid="14893"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="dc50b8f0-5269-11df-a97d-080069138b88" uid="14894"/>
+      <subcategory value="6" description="FV 603 Saracen" uuid="dc51c7d6-5269-11df-b3d3-080069138b88" uid="14895"/>
+      <subcategory value="7" description="AT 105 Saxon" uuid="dc52d694-5269-11df-81d5-080069138b88" uid="14896"/>
+      <subcategory value="8" description="FV 510 Warrior" uuid="dc53e480-5269-11df-9dca-080069138b88" uid="14897"/>
+      <subcategory value="9" description="FV 711 Ferret" uuid="dc54f014-5269-11df-9f3d-080069138b88" uid="14898"/>
+      <subcategory value="10" description="FV 721 Fox" uuid="dc55fe14-5269-11df-917a-080069138b88" uid="14899"/>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="dc570bec-5269-11df-84cc-080069138b88" uid="14900"/>
+      <subcategory value="12" description="FV 102 Striker" uuid="dc581488-5269-11df-986e-080069138b88" uid="14901"/>
+      <subcategory value="13" description="FV 101 Scorpion" uuid="dc592652-5269-11df-ac8a-080069138b88" uid="14902"/>
+      <subcategory value="14" description="FV 106 Samson" uuid="dc5a3fce-5269-11df-b32f-080069138b88" uid="14903"/>
+    </category>
+    <category value="3" description="Armored utility vehicle" uuid="dc5bf300-5269-11df-ae3f-080069138b88" uid="14904">
+      <subcategory value="1" description="FV 4204 Chieftain ARV" uuid="dc5cfb10-5269-11df-a6a0-080069138b88" uid="14905"/>
+      <subcategory value="2" description="Challenger ARV" uuid="dc5e0a5a-5269-11df-98eb-080069138b88" uid="14906"/>
+      <subcategory value="3" description="FV 4003 Centurion (MK 5) AVRE" uuid="dc5f18dc-5269-11df-bfa1-080069138b88" uid="14907"/>
+      <subcategory value="4" description="Chieftain AVRE" uuid="dc60263c-5269-11df-bc36-080069138b88" uid="14908"/>
+      <subcategory value="5" description="Combat Engineer tractor" uuid="dc613504-5269-11df-8652-080069138b88" uid="14909"/>
+      <subcategory value="6" description="FV 4205 Chieftain AVLB" uuid="dc6244da-5269-11df-852f-080069138b88" uid="14910"/>
+      <subcategory value="7" description="Mobile bridge" uuid="dc635a8c-5269-11df-a7f2-080069138b88" uid="14911">
+        <specific value="1" description="M2" uuid="dc6468a0-5269-11df-8f8d-080069138b88" uid="14912"/>
+        <specific value="2" description="M3" uuid="dc65752e-5269-11df-810f-080069138b88" uid="14913"/>
+      </subcategory>
+      <subcategory value="8" description="FV 105 Sultan" uuid="dc6724be-5269-11df-82ce-080069138b88" uid="14914"/>
+      <subcategory value="9" description="FV 104 Samaritan" uuid="dc682e18-5269-11df-ad52-080069138b88" uid="14915"/>
+      <subcategory value="10" description="FV 512 Warrior Repair Vehicle" uuid="dc693cb8-5269-11df-b40d-080069138b88" uid="14916"/>
+      <subcategory value="11" description="FV 513 Warrior Recovery Vehicle" uuid="dc6a4e1e-5269-11df-a8f9-080069138b88" uid="14917"/>
+    </category>
+    <category value="4" description="Self-propelled artillery" uuid="dc6bff48-5269-11df-bec9-080069138b88" uid="14918">
+      <subcategory value="1" description="FV 433 Abbot 105-mm Howitzer" uuid="dc6d07f8-5269-11df-a3be-080069138b88" uid="14919"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="dc6e1652-5269-11df-9e65-080069138b88" uid="14920"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="dc6f2902-5269-11df-9b5c-080069138b88" uid="14921"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="dc7032de-5269-11df-8136-080069138b88" uid="14922"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="dc7146b0-5269-11df-b82c-080069138b88" uid="14923"/>
+      <subcategory value="6" description="Stormer HVM Carrier" uuid="dc7255e6-5269-11df-9809-080069138b88" uid="14924"/>
+      <subcategory value="7" description="AS90 155-mm" uuid="dc736224-5269-11df-adba-080069138b88" uid="14925"/>
+    </category>
+    <category value="5" description="Towed artillery" uuid="dc750e8a-5269-11df-af24-080069138b88" uid="14926">
+      <subcategory value="1" description="FH-70 155-mm gun" uuid="dc761c62-5269-11df-8105-080069138b88" uid="14927"/>
+      <subcategory value="2" description="L-118 105-mm" uuid="dc7729c2-5269-11df-a0b0-080069138b88" uid="14928"/>
+      <subcategory value="3" description="M-56 105-mm" uuid="dc78366e-5269-11df-ac4f-080069138b88" uid="14929"/>
+      <subcategory value="4" description="5.5-in/140-mm" uuid="dc794554-5269-11df-a223-080069138b88" uid="14930"/>
+    </category>
+    <category value="6" description="Small wheeled utility vehicle" uuid="dc7af26e-5269-11df-89ea-080069138b88" uid="14931">
+      <subcategory value="1" description="LWB Land Rover" uuid="dc7bff4c-5269-11df-a428-080069138b88" uid="14932"/>
+      <subcategory value="2" description="Land Rover 6x6 truck" uuid="dc7d0cfc-5269-11df-af7b-080069138b88" uid="14933"/>
+      <subcategory value="3" description="Tractor, aircraft towing" uuid="dc7e1bce-5269-11df-b85e-080069138b88" uid="14934"/>
+    </category>
+    <category value="7" description="Large wheeled utility vehicle" uuid="dc7fc780-5269-11df-b3c8-080069138b88" uid="14935">
+      <subcategory value="1" description="4 Tonne" uuid="dc80da12-5269-11df-b2bb-080069138b88" uid="14936"/>
+      <subcategory value="2" description="8 Tonne" uuid="dc81eb00-5269-11df-bb0e-080069138b88" uid="14937"/>
+      <subcategory value="3" description="8 Tonne fuel" uuid="dc82fa86-5269-11df-8907-080069138b88" uid="14938"/>
+      <subcategory value="4" description="14 Tonne" uuid="dc840bf6-5269-11df-aa71-080069138b88" uid="14939"/>
+      <subcategory value="5" description="14 Tonne with bridge trailer" uuid="dc851500-5269-11df-837c-080069138b88" uid="14940"/>
+    </category>
+    <category value="8" description="Small tracked utility vehicle" uuid="dc86c274-5269-11df-b049-080069138b88" uid="14941"/>
+    <category value="9" description="Large tracked utility vehicle" uuid="dc87d4d4-5269-11df-834a-080069138b88" uid="14942"/>
+    <category value="10" description="Mortar" uuid="dc88e234-5269-11df-a9d2-080069138b88" uid="14943"/>
+    <category value="11" description="Mine plow" uuid="dc89e9cc-5269-11df-bd97-080069138b88" uid="14944">
+      <subcategory value="1" description="Mortar, 51mm, L10A1" uuid="dc8afa9c-5269-11df-90b7-080069138b88" uid="14945"/>
+    </category>
+    <category value="12" description="Mine rake" uuid="dc8ca69e-5269-11df-82ea-080069138b88" uid="14946"/>
+    <category value="13" description="Mine roller" uuid="dc8db322-5269-11df-9a0b-080069138b88" uid="14947"/>
+    <category value="14" description="Cargo trailer" uuid="dc8ebf24-5269-11df-86ef-080069138b88" uid="14948">
+      <subcategory value="1" description="0 - 0.5 ton" uuid="dc8fcc7a-5269-11df-9486-080069138b88" uid="14949"/>
+      <subcategory value="2" description="0.51 - 2 ton" uuid="dc90dac0-5269-11df-ab75-080069138b88" uid="14950"/>
+      <subcategory value="3" description="2.01 - 5 ton" uuid="dc91e33e-5269-11df-97d0-080069138b88" uid="14951"/>
+      <subcategory value="4" description="5.02 - 10 ton" uuid="dc92f31e-5269-11df-8b47-080069138b88" uid="14952"/>
+      <subcategory value="5" description="greater than 10 tons" uuid="dc940560-5269-11df-a33a-080069138b88" uid="14953"/>
+    </category>
+    <category value="15" description="Fuel trailer" uuid="dc95b0fe-5269-11df-a224-080069138b88" uid="14954">
+      <subcategory value="1" description="1-1000 gallons" uuid="dc96bd5a-5269-11df-a8bf-080069138b88" uid="14955"/>
+      <subcategory value="2" description="1001 - 5000 gallons" uuid="dc97cc86-5269-11df-80b3-080069138b88" uid="14956"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="dc98db1c-5269-11df-b51b-080069138b88" uid="14957"/>
+    </category>
+    <category value="16" description="Generator trailer" uuid="dc9a898a-5269-11df-861a-080069138b88" uid="14958">
+      <subcategory value="1" description="0 - 100 KW" uuid="dc9b917c-5269-11df-b84a-080069138b88" uid="14959"/>
+      <subcategory value="2" description="greater than 100 KW" uuid="dc9c9fb8-5269-11df-ac06-080069138b88" uid="14960"/>
+    </category>
+    <category value="17" description="Water trailer" uuid="dc9e4e30-5269-11df-99fc-080069138b88" uid="14961">
+      <subcategory value="1" description="1-1000 gallons" uuid="dc9f5a8c-5269-11df-968f-080069138b88" uid="14962"/>
+      <subcategory value="2" description="1001- 5000 gallons" uuid="dca06f80-5269-11df-812f-080069138b88" uid="14963"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="dca17fb0-5269-11df-a09b-080069138b88" uid="14964"/>
+    </category>
+    <category value="18" description="Engineer equipment" uuid="dca32c70-5269-11df-b6b0-080069138b88" uid="14965">
+      <subcategory value="1" description="Mine clearing line charge" uuid="dca43e62-5269-11df-88d9-080069138b88" uid="14966"/>
+      <subcategory value="2" description="Dozer blade kit" uuid="dca54884-5269-11df-a029-080069138b88" uid="14967"/>
+      <subcategory value="3" description="Lane marking system" uuid="dca65706-5269-11df-9a11-080069138b88" uid="14968"/>
+    </category>
+    <category value="19" description="Heavy equipment transport trailer" uuid="dca806be-5269-11df-9204-080069138b88" uid="14969"/>
+    <category value="20" description="Maintenance equipment trailer" uuid="dca91586-5269-11df-b97b-080069138b88" uid="14970">
+      <subcategory value="1" description="Welding trailer" uuid="dcaa1fd0-5269-11df-8b6e-080069138b88" uid="14971"/>
+      <subcategory value="2" description="Compressor" uuid="dcab2e0c-5269-11df-9f6c-080069138b88" uid="14972"/>
+      <subcategory value="3" description="Tools/parts trailer" uuid="dcac3ba8-5269-11df-931a-080069138b88" uid="14973"/>
+    </category>
+    <category value="21" description="Limber" uuid="dcadec6e-5269-11df-aadf-080069138b88" uid="14974"/>
+    <category value="22" description="Chemical decontamination trailer" uuid="dcaef442-5269-11df-b60a-080069138b88" uid="14975"/>
+    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="dcb0030a-5269-11df-9787-080069138b88" uid="14976">
+      <subcategory value="1" description="Rapier SAM System" uuid="dcb11628-5269-11df-a5e9-080069138b88" uid="14977">
+        <specific value="1" description="Rapier Battery Command Post (BCP)" uuid="dcb21f14-5269-11df-945c-080069138b88" uid="14978"/>
+        <specific value="2" description="Rapier Launcher" uuid="dcb32e72-5269-11df-92ba-080069138b88" uid="14979">
+          <extra value="1" description="Standard 4-Round Launcher" uuid="dcb43bbe-5269-11df-899a-080069138b88" uid="14980"/>
+          <extra value="2" description="6-Round Launcher (Darkfire variant)" uuid="dcb54946-5269-11df-a85f-080069138b88" uid="14981"/>
+          <extra value="3" description="8-Round Launcher (Rapier 2000/JERNAS)" uuid="dcb6580e-5269-11df-bf58-080069138b88" uid="14982"/>
+          <extra value="4" description="Tracked Rapier" uuid="dcb76762-5269-11df-874f-080069138b88" uid="14983"/>
+        </specific>
+        <specific value="3" description="Blindfire Engagement Radar (DN-181)" uuid="dcb915f8-5269-11df-b7e7-080069138b88" uid="14984"/>
+        <specific value="4" description="Dagger Surveillance Radar (Rapier 2000/JERNAS)" uuid="dcba1fca-5269-11df-9e95-080069138b88" uid="14985"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="224" uuid="dcbd1068-5269-11df-8fbf-080069138b88" uid="14986">
+    <category value="1" description="Fighter/Air Defense" uuid="dcbe1ca6-5269-11df-9b6a-080069138b88" uid="14987">
+      <subcategory value="1" description="Tornado ADV" uuid="dcbf2d26-5269-11df-a693-080069138b88" uid="14988">
+        <specific value="1" description="Tornado F. Mk2" uuid="dcc03db0-5269-11df-82b9-080069138b88" uid="14989"/>
+        <specific value="2" description="Tornado F. Mk 2A" uuid="dcc14fde-5269-11df-be80-080069138b88" uid="14990"/>
+        <specific value="3" description="Tornado F. Mk 3" uuid="dcc2578a-5269-11df-8f8e-080069138b88" uid="14991"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="dcc40472-5269-11df-a138-080069138b88" uid="14992"/>
+      <subcategory value="3" description="Eurofighter 2000" uuid="dcc51696-5269-11df-b628-080069138b88" uid="14993"/>
+    </category>
+    <category value="2" description="Attack/Strike" uuid="dcc6c6ee-5269-11df-8f5a-080069138b88" uid="14994">
+      <subcategory value="1" description="Sea Harrier" uuid="dcc7d278-5269-11df-a6e0-080069138b88" uid="14995">
+        <specific value="1" description="Sea Harrier FRS. Mk 1" uuid="dcc8daec-5269-11df-aca0-080069138b88" uid="14996"/>
+        <specific value="2" description="Sea Harrier T. Mk 4" uuid="dcc9ede2-5269-11df-9e4c-080069138b88" uid="14997"/>
+        <specific value="3" description="Sea Harrier FRS. Mk 51" uuid="dccafc78-5269-11df-800e-080069138b88" uid="14998"/>
+      </subcategory>
+      <subcategory value="2" description="Harrier" uuid="dccca834-5269-11df-bbf6-080069138b88" uid="14999">
+        <specific value="1" description="Harrier GR. Mk 3" uuid="dccdb346-5269-11df-87d2-080069138b88" uid="15000"/>
+        <specific value="2" description="Harrier T. Mk 4" uuid="dccec268-5269-11df-b225-080069138b88" uid="15001"/>
+        <specific value="3" description="Harrier GR. 5" uuid="dccfd0a4-5269-11df-84dc-080069138b88" uid="15002"/>
+        <specific value="4" description="Harrier GR. 7" uuid="dcd0dcec-5269-11df-900e-080069138b88" uid="15003"/>
+        <specific value="5" description="VA.1 Matador (AV-8S &amp; TAV-8S)" uuid="dcd1eaf6-5269-11df-a708-080069138b88" uid="15004"/>
+        <specific value="6" description="Harrier GR. Mk9" uuid="dcd2fa72-5269-11df-bec6-080069138b88" uid="15005"/>
+      </subcategory>
+      <subcategory value="3" description="BAe HS Buccaneer" uuid="dcd4a872-5269-11df-a5fa-080069138b88" uid="15006"/>
+      <subcategory value="4" description="Tornado" uuid="dcd5b136-5269-11df-a44f-080069138b88" uid="15007">
+        <specific value="1" description="Tornado GR Mk 1" uuid="dcd6bec8-5269-11df-a892-080069138b88" uid="15008"/>
+        <specific value="2" description="Tornado GR Mk 1A" uuid="dcd7cd86-5269-11df-9f8d-080069138b88" uid="15009"/>
+        <specific value="3" description="Tornado GR Mk 4" uuid="dcd8d528-5269-11df-84a1-080069138b88" uid="15010"/>
+      </subcategory>
+      <subcategory value="5" description="Jaguar" uuid="dcda862a-5269-11df-b156-080069138b88" uid="15011">
+        <specific value="1" description="Jaguar GR1 Mk 1" uuid="dcdb92b8-5269-11df-ba4f-080069138b88" uid="15012"/>
+        <specific value="2" description="Jaguar GR1 Mk 1A" uuid="dcdca072-5269-11df-89db-080069138b88" uid="15013"/>
+        <specific value="3" description="Jaguar GR Mk3" uuid="dcddb052-5269-11df-ac4e-080069138b88" uid="15014"/>
+        <specific value="4" description="Jaguar GR Mk3A" uuid="dcdec190-5269-11df-86e8-080069138b88" uid="15015"/>
+      </subcategory>
+      <subcategory value="6" description="BAe Hawk" uuid="dce0721a-5269-11df-93f3-080069138b88" uid="15016">
+        <specific value="1" description="Hawk T Mk 1" uuid="dce17f5c-5269-11df-b7b3-080069138b88" uid="15017"/>
+        <specific value="2" description="Hawk T Mk 1A" uuid="dce2860e-5269-11df-b883-080069138b88" uid="15018"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Cargo/Tanker" uuid="dce4da30-5269-11df-b267-080069138b88" uid="15019">
+      <subcategory value="1" description="K-2 Victor" uuid="dce5e1be-5269-11df-8f9b-080069138b88" uid="15020"/>
+      <subcategory value="2" description="Hercules C130" uuid="dce6ef64-5269-11df-aced-080069138b88" uid="15021">
+        <specific value="1" description="Hercules C. Mk 1" uuid="dce7fe18-5269-11df-a83d-080069138b88" uid="15022"/>
+        <specific value="2" description="Hercules C. Mk 1P" uuid="dce90a9c-5269-11df-86b8-080069138b88" uid="15023"/>
+        <specific value="3" description="Hercules C. MK 1K" uuid="dcea18c4-5269-11df-8c47-080069138b88" uid="15024"/>
+        <specific value="4" description="Hercules C. Mk 3P" uuid="dceb253e-5269-11df-8dfb-080069138b88" uid="15025"/>
+      </subcategory>
+      <subcategory value="3" description="BAe 146" uuid="dcecd424-5269-11df-8e11-080069138b88" uid="15026">
+        <specific value="1" description="BAe 146 CC. Mk 2" uuid="dceddd4c-5269-11df-a150-080069138b88" uid="15027"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="dcef8a16-5269-11df-8c51-080069138b88" uid="15028"/>
+      <subcategory value="5" description="Sea Devon" uuid="dcf097bc-5269-11df-b294-080069138b88" uid="15029"/>
+      <subcategory value="6" description="Sea Heron" uuid="dcf1aae4-5269-11df-9ea3-080069138b88" uid="15030"/>
+      <subcategory value="7" description="V-22 Osprey" uuid="dcf2b34e-5269-11df-95ae-080069138b88" uid="15031"/>
+      <subcategory value="8" description="BAe (BAC/Vickers) VC-10" uuid="dcf3c0a4-5269-11df-8db2-080069138b88" uid="15032">
+        <specific value="1" description="VC-10 C. Mk1(K)" uuid="dcf4d0c0-5269-11df-8965-080069138b88" uid="15033"/>
+        <specific value="2" description="VC-10 K. Mk 2" uuid="dcf5dd3a-5269-11df-8dcb-080069138b88" uid="15034"/>
+        <specific value="3" description="VC-10 K. Mk 3" uuid="dcf6eb30-5269-11df-9c02-080069138b88" uid="15035"/>
+        <specific value="4" description="VC-10 K. Mk 4" uuid="dcf7f7b4-5269-11df-a693-080069138b88" uid="15036"/>
+      </subcategory>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="dcf9a834-5269-11df-b313-080069138b88" uid="15037"/>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="dcfab300-5269-11df-975c-080069138b88" uid="15038"/>
+      <subcategory value="11" description="Pilatus Britten-Norman Defender" uuid="dcfbc2e0-5269-11df-80ca-080069138b88" uid="15039">
+        <specific value="1" description="Islander CC. Mk 2" uuid="dcfcda18-5269-11df-a997-080069138b88" uid="15040"/>
+        <specific value="2" description="Islander AL. Mk 1" uuid="dcfde5ac-5269-11df-ae57-080069138b88" uid="15041"/>
+        <specific value="3" description="Maritime Defender" uuid="dcfef80c-5269-11df-ab1d-080069138b88" uid="15042"/>
+        <specific value="4" description="Turbine Defender" uuid="dd00059e-5269-11df-9a3a-080069138b88" uid="15043"/>
+      </subcategory>
+      <subcategory value="12" description="Shorts 330 Sherpa" uuid="dd01b100-5269-11df-9fab-080069138b88" uid="15044">
+        <specific value="1" description="C-23A" uuid="dd02bdca-5269-11df-93be-080069138b88" uid="15045"/>
+        <specific value="2" description="C-23B" uuid="dd03cabc-5269-11df-ab0f-080069138b88" uid="15046"/>
+        <specific value="3" description="Shorts 330-UTT" uuid="dd04d79a-5269-11df-9919-080069138b88" uid="15047"/>
+        <specific value="4" description="Skyvan SC7" uuid="dd05e3a6-5269-11df-bf22-080069138b88" uid="15048"/>
+      </subcategory>
+      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="dd078fee-5269-11df-a3eb-080069138b88" uid="15049"/>
+      <subcategory value="14" description="BAe HS 748MF" uuid="dd089ec0-5269-11df-9277-080069138b88" uid="15050">
+        <specific value="1" description="Andover C. Mk 1" uuid="dd09af18-5269-11df-92c4-080069138b88" uid="15051"/>
+      </subcategory>
+      <subcategory value="15" description="Vickers VC2 Viscount" uuid="dd0b5b1a-5269-11df-afc1-080069138b88" uid="15052"/>
+      <subcategory value="16" description="L-1011 TriStar" uuid="dd0c64e2-5269-11df-93c9-080069138b88" uid="15053">
+        <specific value="1" description="TriStar KC Mk 1" uuid="dd0d75ee-5269-11df-afd6-080069138b88" uid="15054"/>
+        <specific value="2" description="TriStar K Mk 1" uuid="dd0e845c-5269-11df-8abe-080069138b88" uid="15055"/>
+        <specific value="3" description="TriStar C Mk 2" uuid="dd0f90f4-5269-11df-90c6-080069138b88" uid="15056"/>
+      </subcategory>
+    </category>
+    <category value="5" description="ASW/patrol/observation" uuid="dd11df9e-5269-11df-a914-080069138b88" uid="15057">
+      <subcategory value="1" description="Nimrod" uuid="dd12e736-5269-11df-a4a4-080069138b88" uid="15058">
+        <specific value="1" description="Nimrod R Mk 1" uuid="dd13f7a2-5269-11df-b5e6-080069138b88" uid="15059"/>
+        <specific value="2" description="Nimrod MR Mk 2" uuid="dd15050c-5269-11df-9ea0-080069138b88" uid="15060"/>
+        <specific value="3" description="Nimrod MR Mk 2P" uuid="dd160e16-5269-11df-9b16-080069138b88" uid="15061"/>
+        <specific value="4" description="Nimrod MR Mk 3" uuid="dd171b6c-5269-11df-bc8d-080069138b88" uid="15062"/>
+      </subcategory>
+      <subcategory value="2" description="BAe P. 132" uuid="dd18ca8e-5269-11df-8c50-080069138b88" uid="15063"/>
+    </category>
+    <category value="7" description="Reconnaissance" uuid="dd1a75b4-5269-11df-8815-080069138b88" uid="15064">
+      <subcategory value="1" description="English Electric Canberra" uuid="dd1b9070-5269-11df-9bf5-080069138b88" uid="15065">
+        <specific value="1" description="Canberra PR Mk 7" uuid="dd1c9b28-5269-11df-b248-080069138b88" uid="15066"/>
+        <specific value="2" description="Canberra PR Mk 9" uuid="dd1da9d2-5269-11df-8c50-080069138b88" uid="15067"/>
+      </subcategory>
+      <subcategory value="2" description="HS Buccaneer" uuid="dd1f5ade-5269-11df-b8cb-080069138b88" uid="15068">
+        <specific value="1" description="Buccaneer S. Mk 2A" uuid="dd2067a8-5269-11df-80e5-080069138b88" uid="15069"/>
+      </subcategory>
+      <subcategory value="3" description="Tornado" uuid="dd221512-5269-11df-a75d-080069138b88" uid="15070">
+        <specific value="1" description="Tornado GR Mk 1 w/recon pod" uuid="dd232088-5269-11df-89ae-080069138b88" uid="15071"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Surveillance/C2" uuid="dd256f96-5269-11df-ac3e-080069138b88" uid="15072">
+      <subcategory value="1" description="E-3D Sentry AEW Mk 1" uuid="dd26781e-5269-11df-9440-080069138b88" uid="15073"/>
+      <subcategory value="2" description="Andover" uuid="dd278614-5269-11df-b70f-080069138b88" uid="15074">
+        <specific value="1" description="Andover C. Mk1" uuid="dd289892-5269-11df-ab34-080069138b88" uid="15075"/>
+      </subcategory>
+      <subcategory value="3" description="Canberra" uuid="dd2a4494-5269-11df-976b-080069138b88" uid="15076">
+        <specific value="1" description="B Mk 2" uuid="dd2b4b32-5269-11df-9633-080069138b88" uid="15077"/>
+        <specific value="2" description="T Mk 4" uuid="dd2c5ebe-5269-11df-bb3c-080069138b88" uid="15078"/>
+        <specific value="3" description="E Mk 15" uuid="dd2d6b4c-5269-11df-add1-080069138b88" uid="15079"/>
+        <specific value="4" description="E Mk 17" uuid="dd2e7456-5269-11df-b93f-080069138b88" uid="15080"/>
+        <specific value="5" description="TT Mk 18" uuid="dd2f80e4-5269-11df-86e1-080069138b88" uid="15081"/>
+        <specific value="6" description="TT Mk 22" uuid="dd30922c-5269-11df-a619-080069138b88" uid="15082"/>
+      </subcategory>
+      <subcategory value="4" description="Hawker Hunter" uuid="dd323dc0-5269-11df-b0d6-080069138b88" uid="15083">
+        <specific value="1" description="GA 11" uuid="dd33468e-5269-11df-a0f4-080069138b88" uid="15084"/>
+        <specific value="2" description="T. Mk 7" uuid="dd3452e0-5269-11df-ab4e-080069138b88" uid="15085"/>
+        <specific value="3" description="T. Mk 8" uuid="dd356400-5269-11df-b426-080069138b88" uid="15086"/>
+        <specific value="4" description="PR Mk 11" uuid="dd366b5c-5269-11df-a7e9-080069138b88" uid="15087"/>
+      </subcategory>
+    </category>
+    <category value="20" description="Attack Helicopter" uuid="dd38bbd2-5269-11df-8970-080069138b88" uid="15088">
+      <subcategory value="1" description="Boeing" uuid="dd39cca2-5269-11df-9d8a-080069138b88" uid="15089">
+        <specific value="1" description="WAH64" uuid="dd3ade4e-5269-11df-add7-080069138b88" uid="15090"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Utility helicopter" uuid="dd3d2d84-5269-11df-b406-080069138b88" uid="15091">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="dd3e3a62-5269-11df-af31-080069138b88" uid="15092"/>
+      <subcategory value="2" description="Westland Lynx" uuid="dd3f4ad8-5269-11df-8d46-080069138b88" uid="15093">
+        <specific value="1" description="Mk 5" uuid="dd40598c-5269-11df-9d6d-080069138b88" uid="15094"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="dd416548-5269-11df-8671-080069138b88" uid="15095"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="dd427352-5269-11df-a276-080069138b88" uid="15096"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="dd438260-5269-11df-bbe3-080069138b88" uid="15097"/>
+        <specific value="5" description="(deprecated)" deprecated="1" uuid="dd448fb6-5269-11df-9027-080069138b88" uid="15098"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="dd459ed8-5269-11df-a663-080069138b88" uid="15099"/>
+        <specific value="7" description="(deprecated)" deprecated="1" uuid="dd46ac88-5269-11df-b52c-080069138b88" uid="15100"/>
+        <specific value="8" description="(deprecated)" deprecated="1" uuid="dd47b722-5269-11df-9bd0-080069138b88" uid="15101"/>
+        <specific value="9" description="(deprecated)" deprecated="1" uuid="dd48c9dc-5269-11df-80ee-080069138b88" uid="15102"/>
+        <specific value="10" description="(deprecated)" deprecated="1" uuid="dd49d7f0-5269-11df-8769-080069138b88" uid="15103"/>
+        <specific value="11" description="Mk 28" uuid="dd4ae0f0-5269-11df-b133-080069138b88" uid="15104"/>
+        <specific value="12" description="(deprecated)" deprecated="1" uuid="dd4bf2e2-5269-11df-8157-080069138b88" uid="15105"/>
+        <specific value="13" description="Mk 90" uuid="dd4d015a-5269-11df-a2c5-080069138b88" uid="15106"/>
+        <specific value="14" description="Mk 86" uuid="dd4e0816-5269-11df-9e58-080069138b88" uid="15107"/>
+        <specific value="15" description="Mk 95" uuid="dd4f15c6-5269-11df-909d-080069138b88" uid="15108"/>
+        <specific value="16" description="Mk 99" uuid="dd502718-5269-11df-ad1b-080069138b88" uid="15109"/>
+        <specific value="17" description="AH. Mk1" uuid="dd512ece-5269-11df-a224-080069138b88" uid="15110"/>
+        <specific value="18" description="AH. Mk 7" uuid="dd523b0c-5269-11df-8d9f-080069138b88" uid="15111"/>
+        <specific value="19" description="AH. Mk 9" uuid="dd534998-5269-11df-984f-080069138b88" uid="15112"/>
+      </subcategory>
+      <subcategory value="8" description="Westland Wessex" uuid="dd54f680-5269-11df-9a61-080069138b88" uid="15113">
+        <specific value="1" description="HC.MK 2" uuid="dd560200-5269-11df-9fbd-080069138b88" uid="15114"/>
+        <specific value="2" description="HC.MK 5" uuid="dd570efc-5269-11df-81dd-080069138b88" uid="15115"/>
+      </subcategory>
+      <subcategory value="9" description="Scout" uuid="dd58c382-5269-11df-9b49-080069138b88" uid="15116"/>
+      <subcategory value="10" description="Wasp" uuid="dd59d632-5269-11df-bb3a-080069138b88" uid="15117"/>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="dd5adde8-5269-11df-97ac-080069138b88" uid="15118"/>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="dd5beef4-5269-11df-a784-080069138b88" uid="15119"/>
+      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="dd5d07c6-5269-11df-8f62-080069138b88" uid="15120"/>
+      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="dd5e1300-5269-11df-b831-080069138b88" uid="15121"/>
+      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="dd5f2128-5269-11df-8fb1-080069138b88" uid="15122"/>
+      <subcategory value="16" description="(deprecated)" deprecated="1" uuid="dd603252-5269-11df-87be-080069138b88" uid="15123"/>
+      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="dd6140e8-5269-11df-b111-080069138b88" uid="15124"/>
+      <subcategory value="18" description="SA 330" uuid="dd624f10-5269-11df-8c54-080069138b88" uid="15125"/>
+      <subcategory value="19" description="Westland Super Lynx" uuid="dd635c20-5269-11df-84ab-080069138b88" uid="15126">
+        <specific value="1" description="Mk 95" uuid="dd646886-5269-11df-a51b-080069138b88" uid="15127"/>
+        <specific value="2" description="Mk 99" uuid="dd657636-5269-11df-830c-080069138b88" uid="15128"/>
+      </subcategory>
+    </category>
+    <category value="22" description="Antisubmarine Warfare / Patrol Helicopter" uuid="dd67bebe-5269-11df-a9a9-080069138b88" uid="15129">
+      <subcategory value="1" description="Westland Sea King" uuid="dd68d2e0-5269-11df-8726-080069138b88" uid="15130">
+        <specific value="1" description="HAS. Mk 1" uuid="dd69e0d6-5269-11df-ba21-080069138b88" uid="15131"/>
+        <specific value="2" description="HAS. Mk 2" uuid="dd6aeff8-5269-11df-8ed9-080069138b88" uid="15132"/>
+        <specific value="3" description="HAS. Mk 5" uuid="dd6bfa7e-5269-11df-a515-080069138b88" uid="15133"/>
+        <specific value="4" description="HAS. Mk 6" uuid="dd6d0888-5269-11df-b51c-080069138b88" uid="15134"/>
+        <specific value="5" description="AEW. Mk 2A" uuid="dd6e15d4-5269-11df-8b0f-080069138b88" uid="15135"/>
+        <specific value="6" description="HAR. Mk 3" uuid="dd6f20c8-5269-11df-82ca-080069138b88" uid="15136"/>
+        <specific value="7" description="HAR. Mk 5" uuid="dd702d4c-5269-11df-a8b1-080069138b88" uid="15137"/>
+        <specific value="8" description="Mk 41" uuid="dd713b24-5269-11df-8993-080069138b88" uid="15138"/>
+        <specific value="9" description="Mk 42" uuid="dd724550-5269-11df-b29a-080069138b88" uid="15139"/>
+        <specific value="10" description="Mk 42A" uuid="dd735148-5269-11df-a1b8-080069138b88" uid="15140"/>
+        <specific value="11" description="Mk 42B" uuid="dd746038-5269-11df-8272-080069138b88" uid="15141"/>
+        <specific value="12" description="Mk 43" uuid="dd756956-5269-11df-9aa6-080069138b88" uid="15142"/>
+        <specific value="13" description="Mk 43A" uuid="dd767940-5269-11df-99ea-080069138b88" uid="15143"/>
+        <specific value="14" description="Mk 43B" uuid="dd778f06-5269-11df-93ea-080069138b88" uid="15144"/>
+        <specific value="15" description="Mk 45" uuid="dd7897ca-5269-11df-b329-080069138b88" uid="15145"/>
+        <specific value="16" description="Mk 47" uuid="dd79a91c-5269-11df-9cd3-080069138b88" uid="15146"/>
+        <specific value="17" description="Mk 48" uuid="dd7ab780-5269-11df-af7d-080069138b88" uid="15147"/>
+        <specific value="18" description="Mk 50" uuid="dd7bbe50-5269-11df-9cf6-080069138b88" uid="15148"/>
+      </subcategory>
+      <subcategory value="2" description="Westland Lynx (Naval)" uuid="dd7d6e76-5269-11df-bc13-080069138b88" uid="15149">
+        <specific value="1" description="HAS Mk 2" uuid="dd7e7d20-5269-11df-b217-080069138b88" uid="15150"/>
+        <specific value="2" description="HAS Mk 3" uuid="dd7f8940-5269-11df-9dcd-080069138b88" uid="15151"/>
+        <specific value="3" description="HAS Mk 2 (FN)" uuid="dd809204-5269-11df-8433-080069138b88" uid="15152"/>
+        <specific value="4" description="HAS Mk 3 (FN)" uuid="dd81a388-5269-11df-91bc-080069138b88" uid="15153"/>
+        <specific value="5" description="Mk 21 (Brazil)" uuid="dd82b110-5269-11df-92fe-080069138b88" uid="15154"/>
+        <specific value="6" description="Mk 23 (Argentina)" uuid="dd83b8bc-5269-11df-a4fd-080069138b88" uid="15155"/>
+        <specific value="7" description="Mk 25 (Netherlands)" uuid="dd84cb8a-5269-11df-a9af-080069138b88" uid="15156"/>
+        <specific value="8" description="Mk 27 (Netherlands)" uuid="dd85daf2-5269-11df-b38c-080069138b88" uid="15157"/>
+        <specific value="9" description="MK 81 (Netherlands)" uuid="dd86e398-5269-11df-a10c-080069138b88" uid="15158"/>
+        <specific value="10" description="MK 80 (Denmark)" uuid="dd87f030-5269-11df-90f8-080069138b88" uid="15159"/>
+        <specific value="11" description="MK 8" uuid="dd8902d6-5269-11df-a434-080069138b88" uid="15160"/>
+      </subcategory>
+      <subcategory value="3" description="EH101 Merlin" uuid="dd8abd38-5269-11df-a534-080069138b88" uid="15161"/>
+    </category>
+    <category value="23" description="Cargo Helicopter" uuid="dd8c6eee-5269-11df-891d-080069138b88" uid="15162">
+      <subcategory value="1" description="Westland Commando" uuid="dd8d7a6e-5269-11df-9338-080069138b88" uid="15163">
+        <specific value="1" description="Commando Mk 1" uuid="dd8e8940-5269-11df-b27c-080069138b88" uid="15164"/>
+        <specific value="2" description="Commando Mk 2" uuid="dd8f97c2-5269-11df-8d38-080069138b88" uid="15165"/>
+        <specific value="3" description="Commando Mk 2B" uuid="dd909f1e-5269-11df-847c-080069138b88" uid="15166"/>
+        <specific value="4" description="Commando Mk 2E" uuid="dd91b034-5269-11df-9c43-080069138b88" uid="15167"/>
+        <specific value="5" description="Commando Mk 2A" uuid="dd92be34-5269-11df-8699-080069138b88" uid="15168"/>
+        <specific value="6" description="Commando Mk 2C" uuid="dd93c702-5269-11df-be92-080069138b88" uid="15169"/>
+        <specific value="7" description="Commando Mk 3" uuid="dd94d728-5269-11df-bfef-080069138b88" uid="15170"/>
+        <specific value="8" description="Indian Sea King Mk 42C" uuid="dd95ee38-5269-11df-9205-080069138b88" uid="15171"/>
+        <specific value="9" description="Sea King HC. Mk" uuid="dd96f864-5269-11df-b1f2-080069138b88" uid="15172"/>
+      </subcategory>
+    </category>
+    <category value="40" description="Trainer" uuid="dd994a2e-5269-11df-a394-080069138b88" uid="15173">
+      <subcategory value="1" description="Shorts S312 Tucano" uuid="dd9a5266-5269-11df-acd6-080069138b88" uid="15174">
+        <specific value="1" description="T. Mk 1" uuid="dd9b63cc-5269-11df-8e5a-080069138b88" uid="15175"/>
+      </subcategory>
+      <subcategory value="2" description="Bulldog" uuid="dd9d0fce-5269-11df-b0c5-080069138b88" uid="15176">
+        <specific value="1" description="T. MK 1" uuid="dd9e1d2e-5269-11df-84f9-080069138b88" uid="15177"/>
+      </subcategory>
+      <subcategory value="3" description="Chipmunk" uuid="dd9fcbc4-5269-11df-ac7e-080069138b88" uid="15178"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="dda0d424-5269-11df-bb94-080069138b88" uid="15179"/>
+      <subcategory value="5" description="BAe Hawk" uuid="dda1e396-5269-11df-8ec1-080069138b88" uid="15180">
+        <specific value="1" description="Hawk T. Mk 1" uuid="dda2f434-5269-11df-af8c-080069138b88" uid="15181"/>
+        <specific value="2" description="Hawk T. Mk 1A" uuid="dda3fcf8-5269-11df-816c-080069138b88" uid="15182"/>
+        <specific value="3" description="Goshawk T-45A" uuid="dda50ba2-5269-11df-937d-080069138b88" uid="15183"/>
+      </subcategory>
+      <subcategory value="6" description="BAe Jetstream Super 31" uuid="dda6b98e-5269-11df-ad1c-080069138b88" uid="15184">
+        <specific value="1" description="Jetstream T Mk 2" uuid="dda7ca04-5269-11df-b270-080069138b88" uid="15185"/>
+        <specific value="2" description="Jetstream T Mk 3" uuid="dda8d296-5269-11df-89d1-080069138b88" uid="15186"/>
+      </subcategory>
+      <subcategory value="7" description="Chieftain" uuid="ddaa8028-5269-11df-83dc-080069138b88" uid="15187"/>
+      <subcategory value="8" description="BAe 125-800" uuid="ddab918e-5269-11df-ab14-080069138b88" uid="15188">
+        <specific value="1" description="C-29A" uuid="ddac9dcc-5269-11df-ba20-080069138b88" uid="15189"/>
+        <specific value="2" description="U-125A" uuid="ddada5fa-5269-11df-b15c-080069138b88" uid="15190"/>
+      </subcategory>
+      <subcategory value="9" description="Slingsby T67 Firefly" uuid="ddaf5468-5269-11df-b498-080069138b88" uid="15191">
+        <specific value="1" description="T67M Mk II" uuid="ddb061be-5269-11df-bd32-080069138b88" uid="15192"/>
+        <specific value="2" description="T67M260" uuid="ddb16f5a-5269-11df-9da8-080069138b88" uid="15193"/>
+      </subcategory>
+      <subcategory value="10" description="Provost" uuid="ddb31fd0-5269-11df-a4b8-080069138b88" uid="15194">
+        <specific value="1" description="T Mk 5" uuid="ddb42f6a-5269-11df-af23-080069138b88" uid="15195"/>
+      </subcategory>
+    </category>
+    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="ddb6813e-5269-11df-ac27-080069138b88" uid="15196">
+      <subcategory value="1" description="Passenger Airline" uuid="ddb78a16-5269-11df-a05d-080069138b88" uid="15197">
+        <specific value="1" description="British Aerospace 146-100" uuid="ddb89a00-5269-11df-9a4a-080069138b88" uid="15198"/>
+        <specific value="2" description="BAC-111" uuid="ddb9ae72-5269-11df-a1d3-080069138b88" uid="15199"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="224" uuid="ddbc92b8-5269-11df-b85d-080069138b88" uid="15200">
+    <category value="4" description="Guided-missile Destroyer" uuid="ddbda3d8-5269-11df-8bf4-080069138b88" uid="15201">
+      <subcategory value="1" description="Type 42" uuid="ddbeb28c-5269-11df-b5fc-080069138b88" uid="15202">
+        <specific value="1" description="D 86 Birmingham" uuid="ddbfc046-5269-11df-9c17-080069138b88" uid="15203"/>
+        <specific value="2" description="D 87 Newcastle" uuid="ddc0cafe-5269-11df-82ff-080069138b88" uid="15204"/>
+        <specific value="3" description="D 88 Glasgow" uuid="ddc1d87c-5269-11df-ae6b-080069138b88" uid="15205"/>
+        <specific value="4" description="D 108 Cardiff" uuid="ddc2e67c-5269-11df-a34d-080069138b88" uid="15206"/>
+        <specific value="5" description="D 89 Exeter" uuid="ddc3f224-5269-11df-a31b-080069138b88" uid="15207"/>
+        <specific value="6" description="D 90 Southampton" uuid="ddc4fe8a-5269-11df-bb5c-080069138b88" uid="15208"/>
+        <specific value="7" description="D 91 Nottingham" uuid="ddc60d70-5269-11df-bf02-080069138b88" uid="15209"/>
+        <specific value="8" description="D 92 Liverpool" uuid="ddc71698-5269-11df-8751-080069138b88" uid="15210"/>
+        <specific value="9" description="D 95 Manchester" uuid="ddc8233a-5269-11df-a0d5-080069138b88" uid="15211"/>
+        <specific value="10" description="D 96 Gloucester" uuid="ddc935b8-5269-11df-8a92-080069138b88" uid="15212"/>
+        <specific value="11" description="D 97 Edinburgh" uuid="ddca3e0e-5269-11df-ac29-080069138b88" uid="15213"/>
+        <specific value="12" description="D 98 York" uuid="ddcb4d62-5269-11df-aa64-080069138b88" uid="15214"/>
+      </subcategory>
+      <subcategory value="2" description="Type 45" uuid="ddccfc98-5269-11df-b7a3-080069138b88" uid="15215">
+        <specific value="1" description="D 32 Daring" uuid="ddce08e0-5269-11df-8a5b-080069138b88" uid="15216"/>
+        <specific value="2" description="D 33 Dauntless" uuid="ddcf117c-5269-11df-8392-080069138b88" uid="15217"/>
+        <specific value="3" description="D 34 Diamond" uuid="ddd01d60-5269-11df-bef5-080069138b88" uid="15218"/>
+        <specific value="4" description="D 35 Dragon" uuid="ddd12e4e-5269-11df-bcbe-080069138b88" uid="15219"/>
+        <specific value="5" description="D 36 Defender" uuid="ddd235a0-5269-11df-b434-080069138b88" uid="15220"/>
+        <specific value="6" description="D 37 Duncan" uuid="ddd34cd8-5269-11df-9edb-080069138b88" uid="15221"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided-missile Frigate" uuid="ddd597b8-5269-11df-b4c5-080069138b88" uid="15222">
+      <subcategory value="1" description="Duke class (Type 23)" uuid="ddd6a630-5269-11df-959e-080069138b88" uid="15223">
+        <specific value="1" description="F 230 Norfolk" uuid="ddd7b656-5269-11df-bf46-080069138b88" uid="15224"/>
+        <specific value="2" description="F 231 Argyll" uuid="ddd8c906-5269-11df-98b1-080069138b88" uid="15225"/>
+        <specific value="3" description="F 229 Lancaster (ex-F 232)" uuid="ddd9d06c-5269-11df-9662-080069138b88" uid="15226"/>
+        <specific value="4" description="F 233 Marlborough" uuid="dddadfb6-5269-11df-84ba-080069138b88" uid="15227"/>
+        <specific value="5" description="F 234 Iron Duke" uuid="dddbf1e4-5269-11df-8288-080069138b88" uid="15228"/>
+        <specific value="6" description="F 235 Monmouth" uuid="dddcfa30-5269-11df-a6b8-080069138b88" uid="15229"/>
+        <specific value="7" description="F 236 Montrose" uuid="ddde06dc-5269-11df-b7a2-080069138b88" uid="15230"/>
+        <specific value="8" description="F 237 Westminster" uuid="dddf1734-5269-11df-b5dd-080069138b88" uid="15231"/>
+        <specific value="9" description="F 238 Northumberland" uuid="dde02282-5269-11df-a4cc-080069138b88" uid="15232"/>
+        <specific value="10" description="F 239 Richmond" uuid="dde12f1a-5269-11df-b43d-080069138b88" uid="15233"/>
+        <specific value="11" description="F 240 Somerset" uuid="dde23e6e-5269-11df-849d-080069138b88" uid="15234"/>
+        <specific value="12" description="F 241 Grafton" uuid="dde3484a-5269-11df-b218-080069138b88" uid="15235"/>
+        <specific value="13" description="F 242 Sutherland" uuid="dde458fc-5269-11df-b599-080069138b88" uid="15236"/>
+      </subcategory>
+      <subcategory value="2" description="Broadsword class (Type 22)" uuid="dde6045e-5269-11df-8092-080069138b88" uid="15237">
+        <specific value="1" description="F 88 Broadsword" uuid="dde712ae-5269-11df-9214-080069138b88" uid="15238"/>
+        <specific value="2" description="F 89 Battleaxe" uuid="dde81fa0-5269-11df-a457-080069138b88" uid="15239"/>
+        <specific value="3" description="F 90 Brilliant" uuid="dde92d78-5269-11df-91cc-080069138b88" uid="15240"/>
+        <specific value="4" description="F 91 Brazen" uuid="ddea3998-5269-11df-a00f-080069138b88" uid="15241"/>
+        <specific value="5" description="F 92 Boxer" uuid="ddeb461c-5269-11df-9f3b-080069138b88" uid="15242"/>
+        <specific value="6" description="F 93 Beaver" uuid="ddec550c-5269-11df-b0e2-080069138b88" uid="15243"/>
+        <specific value="7" description="F 94 Brave" uuid="dded61f4-5269-11df-8ff0-080069138b88" uid="15244"/>
+        <specific value="8" description="F 95 London (ex-Bloodhound)" uuid="ddee6a54-5269-11df-bb9c-080069138b88" uid="15245"/>
+        <specific value="9" description="F 96 Sheffield" uuid="ddef7cdc-5269-11df-9762-080069138b88" uid="15246"/>
+        <specific value="10" description="F 98 Coventry" uuid="ddf08a6e-5269-11df-bdcb-080069138b88" uid="15247"/>
+        <specific value="11" description="F 85 Cumberland" uuid="ddf19936-5269-11df-ba51-080069138b88" uid="15248"/>
+        <specific value="12" description="F 86 Campbeltown" uuid="ddf2ac4a-5269-11df-8923-080069138b88" uid="15249"/>
+        <specific value="13" description="F 87 Chatham" uuid="ddf3baea-5269-11df-aae1-080069138b88" uid="15250"/>
+        <specific value="14" description="F 99 Cornwall" uuid="ddf4c340-5269-11df-80ab-080069138b88" uid="15251"/>
+      </subcategory>
+      <subcategory value="3" description="Amazon class (Type 21)" uuid="ddf6738e-5269-11df-adb4-080069138b88" uid="15252">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="ddf78436-5269-11df-a077-080069138b88" uid="15253"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="ddf89362-5269-11df-a6a5-080069138b88" uid="15254"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="ddf99bea-5269-11df-9211-080069138b88" uid="15255"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="ddfaada0-5269-11df-81a6-080069138b88" uid="15256"/>
+        <specific value="5" description="(deprecated)" deprecated="1" uuid="ddfbbc86-5269-11df-b049-080069138b88" uid="15257"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="ddfcc66c-5269-11df-acb6-080069138b88" uid="15258"/>
+        <specific value="7" description="F 181 Tariq (Pak.)" uuid="ddfdd7aa-5269-11df-ac9d-080069138b88" uid="15259"/>
+        <specific value="8" description="F 182 Babur (Pak.)" uuid="ddfee5dc-5269-11df-86f8-080069138b88" uid="15260"/>
+        <specific value="9" description="F 183 Khaibir (Pak.)" uuid="ddffee00-5269-11df-a7a9-080069138b88" uid="15261"/>
+        <specific value="10" description="F 184 Badr (Pak.)" uuid="de00ffca-5269-11df-9a59-080069138b88" uid="15262"/>
+        <specific value="11" description="F 185 Shahjahan (Pak.)" uuid="de020e6a-5269-11df-a618-080069138b88" uid="15263"/>
+        <specific value="12" description="F 186 Tippu Sultan (Pak.)" uuid="de0317ce-5269-11df-9ec1-080069138b88" uid="15264"/>
+      </subcategory>
+      <subcategory value="4" description="Leander Class" uuid="de04c6fa-5269-11df-a744-080069138b88" uid="15265">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="de05d4aa-5269-11df-a973-080069138b88" uid="15266"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="de06e50c-5269-11df-84ab-080069138b88" uid="15267"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="de07ef60-5269-11df-8734-080069138b88" uid="15268"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="de0901ac-5269-11df-8ef5-080069138b88" uid="15269"/>
+        <specific value="5" description="Condell (Chile)" uuid="de0a0f2a-5269-11df-8abb-080069138b88" uid="15270"/>
+        <specific value="6" description="Lynch (Chile)" uuid="de0b16fe-5269-11df-ae9c-080069138b88" uid="15271"/>
+        <specific value="7" description="Ministro Zenteno (Chile)" uuid="de0c2846-5269-11df-9d77-080069138b88" uid="15272"/>
+        <specific value="8" description="General Baquedano (Chile)" uuid="de0d3754-5269-11df-bd74-080069138b88" uid="15273"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/patrol craft" uuid="de0f80ea-5269-11df-8f61-080069138b88" uid="15274">
+      <subcategory value="1" description="Antarctic patrol ship" uuid="de1098fe-5269-11df-af0d-080069138b88" uid="15275">
+        <specific value="1" description="A 176 Polar Circle" uuid="de11a758-5269-11df-8f41-080069138b88" uid="15276"/>
+      </subcategory>
+      <subcategory value="2" description="Castle class (offshore patrol vessels MK 2)" uuid="de1353e6-5269-11df-9ba8-080069138b88" uid="15277">
+        <specific value="1" description="P 258 Leeds Castle" uuid="de1461fa-5269-11df-be9b-080069138b88" uid="15278"/>
+        <specific value="2" description="Dumbarton Castle" uuid="de157450-5269-11df-b316-080069138b88" uid="15279"/>
+      </subcategory>
+      <subcategory value="3" description="Island class (offshore patrol vessels)" uuid="de1721a6-5269-11df-bcc7-080069138b88" uid="15280">
+        <specific value="1" description="P 277 Anglesey" uuid="de182c72-5269-11df-9048-080069138b88" uid="15281"/>
+        <specific value="2" description="P 278 Alderney" uuid="de1939fa-5269-11df-9276-080069138b88" uid="15282"/>
+        <specific value="3" description="P 295 Jersey" uuid="de1a4bf6-5269-11df-9a51-080069138b88" uid="15283"/>
+        <specific value="4" description="P 297 Guernsey" uuid="de1b5410-5269-11df-9f2a-080069138b88" uid="15284"/>
+        <specific value="5" description="P 298 Shetland" uuid="de1c6152-5269-11df-a1b2-080069138b88" uid="15285"/>
+        <specific value="6" description="P 299 Orkney" uuid="de1d7218-5269-11df-9c06-080069138b88" uid="15286"/>
+        <specific value="7" description="P 300 Lindisfarne" uuid="de1e7e1a-5269-11df-9544-080069138b88" uid="15287"/>
+      </subcategory>
+      <subcategory value="4" description="Peacock class (large patrol craft)" uuid="de202a30-5269-11df-bbae-080069138b88" uid="15288">
+        <specific value="1" description="P 239 Peacock" uuid="de213880-5269-11df-86de-080069138b88" uid="15289"/>
+        <specific value="2" description="P 240 Plover" uuid="de2247a2-5269-11df-ab0b-080069138b88" uid="15290"/>
+        <specific value="3" description="P 241 Starling" uuid="de235d4a-5269-11df-8e28-080069138b88" uid="15291"/>
+      </subcategory>
+      <subcategory value="5" description="Bird and Seal class (large patrol craft)" uuid="de250eec-5269-11df-8cba-080069138b88" uid="15292">
+        <specific value="1" description="P 259 Redpole (ex-Sea Otter)" uuid="de261f08-5269-11df-9293-080069138b88" uid="15293"/>
+        <specific value="2" description="P 260 Kingfisher" uuid="de27315e-5269-11df-8f75-080069138b88" uid="15294"/>
+        <specific value="3" description="P 261 Cygnet" uuid="de283932-5269-11df-987a-080069138b88" uid="15295"/>
+      </subcategory>
+      <subcategory value="6" description="Archer class (training and patrol craft)" uuid="de29e796-5269-11df-a75d-080069138b88" uid="15296">
+        <specific value="1" description="P 264 Archer" uuid="de2af618-5269-11df-a9ed-080069138b88" uid="15297"/>
+        <specific value="2" description="P 270 Biter" uuid="de2c07c4-5269-11df-baac-080069138b88" uid="15298"/>
+        <specific value="3" description="P 272 Smiter" uuid="de2d107e-5269-11df-94e7-080069138b88" uid="15299"/>
+        <specific value="4" description="P 273 Pursuer" uuid="de2e1dde-5269-11df-a854-080069138b88" uid="15300"/>
+        <specific value="5" description="P 279 Blazer" uuid="de2f3674-5269-11df-883f-080069138b88" uid="15301"/>
+        <specific value="6" description="P 280 Dasher" uuid="de3043ac-5269-11df-992c-080069138b88" uid="15302"/>
+        <specific value="7" description="P 291 Puncher" uuid="de315152-5269-11df-b6ea-080069138b88" uid="15303"/>
+        <specific value="8" description="P 292 Charger" uuid="de325db8-5269-11df-83d5-080069138b88" uid="15304"/>
+        <specific value="9" description="P 293 Ranger" uuid="de3366b8-5269-11df-a465-080069138b88" uid="15305"/>
+        <specific value="10" description="P 294 Trumpeter" uuid="de3478c8-5269-11df-8fda-080069138b88" uid="15306"/>
+        <specific value="11" description="A 153 Example (RNXS)" uuid="de3586b4-5269-11df-a8d5-080069138b88" uid="15307"/>
+        <specific value="12" description="A 154 Explorer (RNXS)" uuid="de368faa-5269-11df-bed8-080069138b88" uid="15308"/>
+        <specific value="13" description="A 163 Express (RNXS)" uuid="de37a1ba-5269-11df-8b0f-080069138b88" uid="15309"/>
+        <specific value="14" description="A 167 Exploit (RNXS)" uuid="de38af9c-5269-11df-a495-080069138b88" uid="15310"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="de3afaae-5269-11df-a2f0-080069138b88" uid="15311">
+      <subcategory value="1" description="Hunt class (minesweepers/minehunters, coastal)" uuid="de3c08b8-5269-11df-964a-080069138b88" uid="15312">
+        <specific value="1" description="M 29 Brecon" uuid="de3d17a8-5269-11df-b292-080069138b88" uid="15313"/>
+        <specific value="2" description="M 30 Ledbury" uuid="de3e24a4-5269-11df-848f-080069138b88" uid="15314"/>
+        <specific value="3" description="M 31 Cattistock" uuid="de3f322c-5269-11df-804e-080069138b88" uid="15315"/>
+        <specific value="4" description="M 32 Cottesmore" uuid="de403e60-5269-11df-9256-080069138b88" uid="15316"/>
+        <specific value="5" description="M 33 Brocklesby" uuid="de414c1a-5269-11df-b83e-080069138b88" uid="15317"/>
+        <specific value="6" description="M 34 Middleton" uuid="de4259fc-5269-11df-9ef0-080069138b88" uid="15318"/>
+        <specific value="7" description="M 35 Dulverton" uuid="de4360b8-5269-11df-8fb0-080069138b88" uid="15319"/>
+        <specific value="8" description="M 36 Bicester" uuid="de446f6c-5269-11df-a432-080069138b88" uid="15320"/>
+        <specific value="9" description="M 37 Chiddingfold" uuid="de4581cc-5269-11df-97ff-080069138b88" uid="15321"/>
+        <specific value="10" description="M 38 Atherstone" uuid="de468b4e-5269-11df-b9ab-080069138b88" uid="15322"/>
+        <specific value="11" description="M 39 Hurworth" uuid="de479890-5269-11df-9a38-080069138b88" uid="15323"/>
+        <specific value="12" description="M 40 Berkeley" uuid="de48a7ee-5269-11df-89ce-080069138b88" uid="15324"/>
+        <specific value="13" description="M 41 Quorn" uuid="de49b170-5269-11df-bf0f-080069138b88" uid="15325"/>
+      </subcategory>
+      <subcategory value="2" description="River class (minesweepers, coastal)" uuid="de4b604c-5269-11df-a555-080069138b88" uid="15326">
+        <specific value="1" description="M 2003 Waveney" uuid="de4c6f1e-5269-11df-8f6e-080069138b88" uid="15327"/>
+        <specific value="2" description="M 2004 Carron" uuid="de4d8516-5269-11df-abeb-080069138b88" uid="15328"/>
+        <specific value="3" description="M 2005 Dovey" uuid="de4e9014-5269-11df-a8db-080069138b88" uid="15329"/>
+        <specific value="4" description="M 2006 Helford" uuid="de4f9cc0-5269-11df-b291-080069138b88" uid="15330"/>
+        <specific value="5" description="M 2007 Humber" uuid="de50ae62-5269-11df-9b56-080069138b88" uid="15331"/>
+        <specific value="6" description="M 2008 Blackwater" uuid="de51b690-5269-11df-bb7e-080069138b88" uid="15332"/>
+        <specific value="7" description="M 2009 Itchen" uuid="de52c3e6-5269-11df-a91c-080069138b88" uid="15333"/>
+        <specific value="8" description="M 2010 Helmsdale" uuid="de53d1f0-5269-11df-879c-080069138b88" uid="15334"/>
+        <specific value="9" description="M 2011 Orwell" uuid="de54dd7a-5269-11df-bdc3-080069138b88" uid="15335"/>
+        <specific value="10" description="M2012 Ribble" uuid="de55ebb6-5269-11df-ad4a-080069138b88" uid="15336"/>
+        <specific value="11" description="M 2013 Spey" uuid="de56f8bc-5269-11df-81b3-080069138b88" uid="15337"/>
+        <specific value="12" description="M 2014 Arun" uuid="de58002c-5269-11df-b053-080069138b88" uid="15338"/>
+      </subcategory>
+      <subcategory value="3" description="Ton class (coastal minehunters)" uuid="de59aff8-5269-11df-92c3-080069138b88" uid="15339">
+        <specific value="1" description="M 1114 Brinton" uuid="de5abf1a-5269-11df-89c2-080069138b88" uid="15340"/>
+        <specific value="2" description="M 1151 Iveston" uuid="de5bd5f8-5269-11df-be4e-080069138b88" uid="15341"/>
+        <specific value="3" description="M 1154 Kellington" uuid="de5ce894-5269-11df-85bd-080069138b88" uid="15342"/>
+        <specific value="4" description="M 1166 Nurton" uuid="de5df734-5269-11df-9bd5-080069138b88" uid="15343"/>
+        <specific value="5" description="M 1181 Sheraton" uuid="de5f0520-5269-11df-bd6d-080069138b88" uid="15344"/>
+      </subcategory>
+      <subcategory value="4" description="Sandown class (minehunters)" uuid="de60b406-5269-11df-aedd-080069138b88" uid="15345">
+        <specific value="1" description="M 101 Sandown" uuid="de61bcc0-5269-11df-9e8c-080069138b88" uid="15346"/>
+        <specific value="2" description="M 102 Inverness" uuid="de62c9e4-5269-11df-a925-080069138b88" uid="15347"/>
+        <specific value="3" description="M 103 Cromer" uuid="de63dab4-5269-11df-85da-080069138b88" uid="15348"/>
+        <specific value="4" description="M 104 Walney" uuid="de64e198-5269-11df-bb89-080069138b88" uid="15349"/>
+        <specific value="5" description="M 105 Bridport" uuid="de65efca-5269-11df-9a48-080069138b88" uid="15350"/>
+        <specific value="6" description="M 106 Penzance" uuid="de66fe1a-5269-11df-a353-080069138b88" uid="15351"/>
+        <specific value="7" description="M 107 Pembroke" uuid="de6804d6-5269-11df-ae38-080069138b88" uid="15352"/>
+        <specific value="8" description="M 108 Grimsby" uuid="de6913b2-5269-11df-879b-080069138b88" uid="15353"/>
+        <specific value="9" description="M 109 Bangor" uuid="de6a24f0-5269-11df-9191-080069138b88" uid="15354"/>
+      </subcategory>
+    </category>
+    <category value="9" description="Dock Landing Ship" uuid="de6c7534-5269-11df-8525-080069138b88" uid="15355">
+      <subcategory value="1" description="Bay Class" uuid="de6d86f4-5269-11df-bdd7-080069138b88" uid="15356">
+        <specific value="1" description="Largs Bay" uuid="de6e8f90-5269-11df-8f40-080069138b88" uid="15357"/>
+        <specific value="2" description="Lyme Bay" uuid="de6f9cc8-5269-11df-b74e-080069138b88" uid="15358"/>
+        <specific value="3" description="Mounts Bay" uuid="de70ab7c-5269-11df-bad8-080069138b88" uid="15359"/>
+        <specific value="4" description="Cardigan Bay" uuid="de71b2ce-5269-11df-b188-080069138b88" uid="15360"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Tank landing ship" uuid="de74065a-5269-11df-9d26-080069138b88" uid="15361">
+      <subcategory value="1" description="Sir Bedivere Class (LSL)" uuid="de750f64-5269-11df-b1d2-080069138b88" uid="15362"/>
+      <subcategory value="2" description="Sir Galahad Class (LSL)" uuid="de761d96-5269-11df-9696-080069138b88" uid="15363"/>
+    </category>
+    <category value="12" description="Light carrier" uuid="de77cd1c-5269-11df-bc9b-080069138b88" uid="15364">
+      <subcategory value="1" description="Light aircraft carrier (CVSG)" uuid="de78de00-5269-11df-82cc-080069138b88" uid="15365">
+        <specific value="1" description="R 05 Invincible" uuid="de79e78c-5269-11df-a020-080069138b88" uid="15366"/>
+        <specific value="2" description="R 06 Illustrious" uuid="de7af4f6-5269-11df-a5dc-080069138b88" uid="15367"/>
+        <specific value="3" description="R 07 Ark Royal" uuid="de7c049a-5269-11df-b891-080069138b88" uid="15368"/>
+        <specific value="4" description="R 22 VIRAAT (India)" uuid="de7d106a-5269-11df-a257-080069138b88" uid="15369"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="de7f5ee2-5269-11df-89a5-080069138b88" uid="15370">
+      <subcategory value="1" description="Leander class (training ships)" uuid="de806562-5269-11df-8720-080069138b88" uid="15371">
+        <specific value="1" description="F 52 Juno" uuid="de8175f6-5269-11df-995c-080069138b88" uid="15372"/>
+      </subcategory>
+      <subcategory value="2" description="Dartmouth training ship" uuid="de832572-5269-11df-ad2b-080069138b88" uid="15373">
+        <specific value="1" description="M1116 Wilton" uuid="de8432a0-5269-11df-8273-080069138b88" uid="15374"/>
+      </subcategory>
+      <subcategory value="3" description="Improved Hecla class (survey)" uuid="de85de8e-5269-11df-a167-080069138b88" uid="15375">
+        <specific value="1" description="A 138 Herald" uuid="de86ec70-5269-11df-a545-080069138b88" uid="15376"/>
+      </subcategory>
+      <subcategory value="4" description="Hecla class (survey)" uuid="de8897be-5269-11df-be3b-080069138b88" uid="15377">
+        <specific value="1" description="A 133 Hecla" uuid="de89a492-5269-11df-8939-080069138b88" uid="15378"/>
+      </subcategory>
+      <subcategory value="5" description="A 317 Bulldog class (survey)" uuid="de8b5a44-5269-11df-985d-080069138b88" uid="15379">
+        <specific value="1" description="A 317 Bulldog" uuid="de8c6eca-5269-11df-bfba-080069138b88" uid="15380"/>
+        <specific value="2" description="A 319 Beagle" uuid="de8d76bc-5269-11df-ba44-080069138b88" uid="15381"/>
+      </subcategory>
+      <subcategory value="6" description="Roebuck class (survey)" uuid="de8f23fe-5269-11df-9f23-080069138b88" uid="15382">
+        <specific value="1" description="A 130 Roebuck" uuid="de9035b4-5269-11df-92db-080069138b88" uid="15383"/>
+      </subcategory>
+      <subcategory value="7" description="Ol class (large fleet tankers (AO))" uuid="de91e288-5269-11df-ad2c-080069138b88" uid="15384">
+        <specific value="1" description="A 122 Olwen" uuid="de92f218-5269-11df-ba12-080069138b88" uid="15385"/>
+        <specific value="2" description="A 123 Olna" uuid="de93fa50-5269-11df-a835-080069138b88" uid="15386"/>
+        <specific value="3" description="A 124 Olmeda" uuid="de950b0c-5269-11df-a9bc-080069138b88" uid="15387"/>
+      </subcategory>
+      <subcategory value="8" description="Appleleaf class (support tankers (AOT))" uuid="de96b722-5269-11df-a418-080069138b88" uid="15388">
+        <specific value="1" description="A 81 Brambleleaf (ex-Hudson Cavalier)" uuid="de97c978-5269-11df-82b4-080069138b88" uid="15389"/>
+        <specific value="2" description="A 109 Bayleaf" uuid="de98d23c-5269-11df-85e3-080069138b88" uid="15390"/>
+        <specific value="3" description="A 110 Orangeleaf (ex-Balder London, ex-Hudson Progress)" uuid="de99e0e6-5269-11df-8145-080069138b88" uid="15391"/>
+        <specific value="4" description="O 195 Westralia (ex. A79 Hudson Cavalier)" uuid="de9af6fc-5269-11df-8da3-080069138b88" uid="15392"/>
+      </subcategory>
+      <subcategory value="9" description="Rover class (small fleet tankers (AOL))" uuid="de9ca4d4-5269-11df-a227-080069138b88" uid="15393">
+        <specific value="1" description="A 269 Grey Rover" uuid="de9dadd4-5269-11df-b617-080069138b88" uid="15394"/>
+        <specific value="2" description="A 270 Blue rover" uuid="de9ebd64-5269-11df-9da0-080069138b88" uid="15395"/>
+        <specific value="3" description="A 271 Gold rover" uuid="de9fcede-5269-11df-b1f4-080069138b88" uid="15396"/>
+        <specific value="4" description="A 273 Black rover" uuid="dea0d61c-5269-11df-92b2-080069138b88" uid="15397"/>
+      </subcategory>
+      <subcategory value="10" description="Fort Victoria class (fleet replenishment)" uuid="dea282c8-5269-11df-891e-080069138b88" uid="15398">
+        <specific value="1" description="A 387 Fort Victoria" uuid="dea394c4-5269-11df-8a74-080069138b88" uid="15399"/>
+        <specific value="2" description="A 388 Fort George" uuid="dea4a634-5269-11df-a71f-080069138b88" uid="15400"/>
+      </subcategory>
+      <subcategory value="11" description="Fort Grange class (AFS(H))" uuid="dea6516e-5269-11df-a81e-080069138b88" uid="15401">
+        <specific value="1" description="A 385 Fort Grange" uuid="dea75f0a-5269-11df-83eb-080069138b88" uid="15402"/>
+        <specific value="2" description="A 386 Fort Austin" uuid="dea86da0-5269-11df-87aa-080069138b88" uid="15403"/>
+      </subcategory>
+      <subcategory value="12" description="Regent class (AFS(H))" uuid="deaa22d0-5269-11df-ab51-080069138b88" uid="15404">
+        <specific value="1" description="A 480 Resource" uuid="deab313e-5269-11df-80da-080069138b88" uid="15405"/>
+        <specific value="2" description="A 486 Regent" uuid="deac3d0e-5269-11df-8b4a-080069138b88" uid="15406"/>
+      </subcategory>
+      <subcategory value="13" description="Stena type (forward repair ship)" uuid="deade9d8-5269-11df-833d-080069138b88" uid="15407">
+        <specific value="1" description="A 132 Diligence (ex-Stena Inspector)" uuid="deaefa26-5269-11df-b49a-080069138b88" uid="15408"/>
+      </subcategory>
+      <subcategory value="14" description="Sal Class (salvage &amp; mooring)" uuid="deb0ab0a-5269-11df-8f90-080069138b88" uid="15409">
+        <specific value="1" description="A 185 Salmoor" uuid="deb1b8c4-5269-11df-b05d-080069138b88" uid="15410"/>
+        <specific value="2" description="A 186 Salmaster" uuid="deb2c1e2-5269-11df-a179-080069138b88" uid="15411"/>
+        <specific value="3" description="A 187 Salmaid" uuid="deb3d064-5269-11df-a37b-080069138b88" uid="15412"/>
+      </subcategory>
+      <subcategory value="15" description="Wild Duck class (salvage &amp; mooring)" uuid="deb57fc2-5269-11df-9863-080069138b88" uid="15413">
+        <specific value="1" description="A 164 Goosander" uuid="deb68e6c-5269-11df-b4fa-080069138b88" uid="15414"/>
+        <specific value="2" description="A 165 Pochard" uuid="deb79712-5269-11df-90d4-080069138b88" uid="15415"/>
+      </subcategory>
+      <subcategory value="16" description="Moorhen class (salvage &amp; mooring)" uuid="deb94580-5269-11df-9dea-080069138b88" uid="15416">
+        <specific value="1" description="Y 32 Moorhen" uuid="deba5420-5269-11df-a4f7-080069138b88" uid="15417"/>
+        <specific value="2" description="Y 33 Moorfowl" uuid="debb622a-5269-11df-992d-080069138b88" uid="15418"/>
+        <specific value="3" description="A 72 Cameron" uuid="debc6fbc-5269-11df-be4b-080069138b88" uid="15419"/>
+      </subcategory>
+      <subcategory value="17" description="Oilpress class (coastal tankers)" uuid="debe21cc-5269-11df-b751-080069138b88" uid="15420">
+        <specific value="1" description="Y 21 Oilpress" uuid="debf3120-5269-11df-a62b-080069138b88" uid="15421"/>
+        <specific value="2" description="Y 22 Oilstone" uuid="dec03ebc-5269-11df-a997-080069138b88" uid="15422"/>
+        <specific value="3" description="Y 23 Oilwell" uuid="dec14a82-5269-11df-a9c7-080069138b88" uid="15423"/>
+        <specific value="4" description="Y 25 Oilbird" uuid="dec25706-5269-11df-9ed1-080069138b88" uid="15424"/>
+        <specific value="5" description="Y 26 Oilman" uuid="dec364de-5269-11df-846e-080069138b88" uid="15425"/>
+      </subcategory>
+      <subcategory value="18" description="Tornado class (torpedo recovery)" uuid="dec51536-5269-11df-8bc1-080069138b88" uid="15426">
+        <specific value="1" description="A 140 Tornado" uuid="dec61e22-5269-11df-b6af-080069138b88" uid="15427"/>
+        <specific value="2" description="A 141 Torch a 141" uuid="dec72bc8-5269-11df-b00a-080069138b88" uid="15428"/>
+        <specific value="3" description="A 142 Tormentor" uuid="dec83db0-5269-11df-9e4e-080069138b88" uid="15429"/>
+        <specific value="4" description="A 143 Toreador" uuid="dec94e9e-5269-11df-8396-080069138b88" uid="15430"/>
+      </subcategory>
+      <subcategory value="19" description="Water class (water carriers)" uuid="decafa5a-5269-11df-aef7-080069138b88" uid="15431">
+        <specific value="1" description="Y 17 Waterfall" uuid="decc0ca6-5269-11df-be57-080069138b88" uid="15432"/>
+        <specific value="2" description="Y 18 Watershed" uuid="decd1a1a-5269-11df-a3d3-080069138b88" uid="15433"/>
+        <specific value="3" description="Y 19 Waterspout" uuid="dece237e-5269-11df-8b3f-080069138b88" uid="15434"/>
+        <specific value="4" description="Y 30 Watercourse" uuid="decf332c-5269-11df-a273-080069138b88" uid="15435"/>
+        <specific value="5" description="Y 31 Waterfowl" uuid="ded041ae-5269-11df-a06b-080069138b88" uid="15436"/>
+        <specific value="6" description="A 146 Waterman" uuid="ded149b4-5269-11df-a7a2-080069138b88" uid="15437"/>
+      </subcategory>
+      <subcategory value="20" description="Seal class (lrrsc) (aviation support)" uuid="ded2f94e-5269-11df-a0e6-080069138b88" uid="15438">
+        <specific value="1" description="5000 Seal" uuid="ded407d0-5269-11df-a74a-080069138b88" uid="15439"/>
+        <specific value="2" description="5001 Seagull" uuid="ded5163e-5269-11df-9eb0-080069138b88" uid="15440"/>
+      </subcategory>
+      <subcategory value="21" description="Spitfire class (rttl mk 3) (aviation support)" uuid="ded6c628-5269-11df-aa6d-080069138b88" uid="15441">
+        <specific value="1" description="4000 Spitfire" uuid="ded7d0c2-5269-11df-8e9b-080069138b88" uid="15442"/>
+        <specific value="2" description="4003 Halifax" uuid="ded8ddaa-5269-11df-82ca-080069138b88" uid="15443"/>
+        <specific value="3" description="4004 Hampden" uuid="ded9ef38-5269-11df-8116-080069138b88" uid="15444"/>
+        <specific value="4" description="4005 Hurricane" uuid="dedaf770-5269-11df-9964-080069138b88" uid="15445"/>
+        <specific value="5" description="4006 Lancaster" uuid="dedc039a-5269-11df-8ef4-080069138b88" uid="15446"/>
+        <specific value="6" description="4007 Wellington" uuid="dedd12ee-5269-11df-9343-080069138b88" uid="15447"/>
+      </subcategory>
+      <subcategory value="22" description="Insect class (fleet tenders)" uuid="dedec1fc-5269-11df-b5c6-080069138b88" uid="15448">
+        <specific value="1" description="A 216 Bee" uuid="dedfca2a-5269-11df-9a34-080069138b88" uid="15449"/>
+        <specific value="2" description="A 229 Cricket" uuid="dee0d67c-5269-11df-b7a2-080069138b88" uid="15450"/>
+        <specific value="3" description="A 230 Cockchafer" uuid="dee1e6de-5269-11df-a3fd-080069138b88" uid="15451"/>
+        <specific value="4" description="A 239 Gnat" uuid="dee2f2ea-5269-11df-b930-080069138b88" uid="15452"/>
+        <specific value="5" description="A 253 Ladybird" uuid="dee3ff78-5269-11df-8ac0-080069138b88" uid="15453"/>
+        <specific value="6" description="A 263 Cicada" uuid="dee50cf6-5269-11df-85e4-080069138b88" uid="15454"/>
+        <specific value="7" description="A 272 Scarab" uuid="dee61894-5269-11df-afac-080069138b88" uid="15455"/>
+      </subcategory>
+      <subcategory value="23" description="Loyal class (RNXs) (fleet tenders)" uuid="dee7cc48-5269-11df-aaff-080069138b88" uid="15456">
+        <specific value="1" description="A 157 Loyal Helper" uuid="dee8dbec-5269-11df-903c-080069138b88" uid="15457"/>
+        <specific value="2" description="A 158 Supporter (ex-Loyal Supporter)" uuid="dee9ecee-5269-11df-9479-080069138b88" uid="15458"/>
+        <specific value="3" description="A 159 Loyal Watcher" uuid="deeafb2a-5269-11df-8e8a-080069138b88" uid="15459"/>
+        <specific value="4" description="A 160 Loyal Volunteer" uuid="deec08ee-5269-11df-89d7-080069138b88" uid="15460"/>
+        <specific value="5" description="A 161 Loyal Mediator" uuid="deed16a8-5269-11df-8c0d-080069138b88" uid="15461"/>
+        <specific value="6" description="A 220 Loyal Moderator" uuid="deee22aa-5269-11df-b3ef-080069138b88" uid="15462"/>
+        <specific value="7" description="A 1770 Loyal Chancellor" uuid="deef3172-5269-11df-a042-080069138b88" uid="15463"/>
+        <specific value="8" description="A 1771 Loyal Proctor" uuid="def03f18-5269-11df-b3e1-080069138b88" uid="15464"/>
+      </subcategory>
+      <subcategory value="24" description="Clovelly class (fleet tenders)" uuid="def1ef5c-5269-11df-8918-080069138b88" uid="15465">
+        <specific value="1" description="A 207 Llandovery" uuid="def2f9a6-5269-11df-a49c-080069138b88" uid="15466"/>
+        <specific value="2" description="A 208 Lamlash" uuid="def407c4-5269-11df-9ede-080069138b88" uid="15467"/>
+        <specific value="3" description="A 211 Lechlade" uuid="def51178-5269-11df-a492-080069138b88" uid="15468"/>
+        <specific value="4" description="A 251 Lydford (ex-Loyal Governor, ex-Alert)" uuid="def660b4-5269-11df-9717-080069138b88" uid="15469"/>
+        <specific value="5" description="A 254 Meavy (ex-Loyal Factor, ex-Vigilant)" uuid="def7807a-5269-11df-8c76-080069138b88" uid="15470"/>
+        <specific value="6" description="A 274 Ettrick" uuid="def8aa5e-5269-11df-846a-080069138b88" uid="15471"/>
+        <specific value="7" description="A 277 Elsing" uuid="def9c95c-5269-11df-95ee-080069138b88" uid="15472"/>
+        <specific value="8" description="A 341 Fotherby" uuid="defb849a-5269-11df-90aa-080069138b88" uid="15473"/>
+        <specific value="9" description="A 348 Felsted" uuid="defc9a74-5269-11df-bb85-080069138b88" uid="15474"/>
+        <specific value="10" description="A 353 Elkstone" uuid="defdabf8-5269-11df-bc2e-080069138b88" uid="15475"/>
+        <specific value="11" description="A 354 Froxfield" uuid="defebc46-5269-11df-9831-080069138b88" uid="15476"/>
+        <specific value="12" description="A 355 Epworth" uuid="deffcc12-5269-11df-8848-080069138b88" uid="15477"/>
+        <specific value="13" description="A 365 Fulbeck" uuid="df00dddc-5269-11df-b037-080069138b88" uid="15478"/>
+        <specific value="14" description="A 381 Cricklade" uuid="df01ed44-5269-11df-a29f-080069138b88" uid="15479"/>
+        <specific value="15" description="A 391 Criccieth" uuid="df02f7ca-5269-11df-9957-080069138b88" uid="15480"/>
+        <specific value="16" description="A 392 Glencoe" uuid="df0409a8-5269-11df-9795-080069138b88" uid="15481"/>
+        <specific value="17" description="A 393 Dunster" uuid="df052090-5269-11df-a06e-080069138b88" uid="15482"/>
+        <specific value="18" description="A 394 Fintry" uuid="df06297c-5269-11df-9e20-080069138b88" uid="15483"/>
+        <specific value="19" description="A 402 Grasmere" uuid="df07447e-5269-11df-9849-080069138b88" uid="15484"/>
+        <specific value="20" description="A 488 Cromarty" uuid="df0856f2-5269-11df-a157-080069138b88" uid="15485"/>
+        <specific value="21" description="A 490 Dornoch" uuid="df096380-5269-11df-9cd3-080069138b88" uid="15486"/>
+        <specific value="22" description="A 1766 Headcorn" uuid="df0a723e-5269-11df-86fa-080069138b88" uid="15487"/>
+        <specific value="23" description="A 1767 Hever" uuid="df0b83d6-5269-11df-af4f-080069138b88" uid="15488"/>
+        <specific value="24" description="A 1768 Harlech" uuid="df0c8fe2-5269-11df-85fa-080069138b88" uid="15489"/>
+        <specific value="25" description="A 1769 Hambledon" uuid="df0da29c-5269-11df-83c0-080069138b88" uid="15490"/>
+        <specific value="26" description="A 1772 Holmwood" uuid="df0eb178-5269-11df-a9bd-080069138b88" uid="15491"/>
+        <specific value="27" description="A 1773 Horning" uuid="df0fbc80-5269-11df-a0f5-080069138b88" uid="15492"/>
+      </subcategory>
+      <subcategory value="25" description="Manly class (fleet tenders)" uuid="df116ff8-5269-11df-b784-080069138b88" uid="15493">
+        <specific value="1" description="A 83 Melton" uuid="df127f24-5269-11df-b9d6-080069138b88" uid="15494"/>
+        <specific value="2" description="A 84 Menai" uuid="df138e5a-5269-11df-a1e7-080069138b88" uid="15495"/>
+        <specific value="3" description="A 87 Meon" uuid="df149c1e-5269-11df-abff-080069138b88" uid="15496"/>
+        <specific value="4" description="A 91 Milford" uuid="df15ac3a-5269-11df-bb18-080069138b88" uid="15497"/>
+        <specific value="5" description="A 107 Messina" uuid="df16bbd4-5269-11df-8d2c-080069138b88" uid="15498"/>
+      </subcategory>
+      <subcategory value="26" description="Magnet class (degaussing vessels)" uuid="df186b1e-5269-11df-ae6f-080069138b88" uid="15499">
+        <specific value="1" description="A 114 Magnet" uuid="df197a18-5269-11df-98f4-080069138b88" uid="15500"/>
+        <specific value="2" description="A 115 Lodestone" uuid="df1a8a66-5269-11df-b9c8-080069138b88" uid="15501"/>
+      </subcategory>
+      <subcategory value="27" description="Aberdovey class (auxiliary training vessels)" uuid="df1c3a3c-5269-11df-a882-080069138b88" uid="15502">
+        <specific value="1" description="A 100 Beddgelert" uuid="df1d4cec-5269-11df-9996-080069138b88" uid="15503"/>
+        <specific value="2" description="A 103 Sultan Venturer (ex-Bibury)" uuid="df1e5858-5269-11df-8db1-080069138b88" uid="15504"/>
+        <specific value="3" description="A 383 Appleby" uuid="df1f6810-5269-11df-8d7a-080069138b88" uid="15505"/>
+        <specific value="4" description="Y 10 Aberdovey" uuid="df2079f8-5269-11df-9288-080069138b88" uid="15506"/>
+        <specific value="5" description="Y 11 Abinger" uuid="df218316-5269-11df-b4ee-080069138b88" uid="15507"/>
+        <specific value="6" description="Y 13 Alnmouth" uuid="df22936e-5269-11df-b146-080069138b88" uid="15508"/>
+      </subcategory>
+      <subcategory value="28" description="Wave Class (Large Fleet Tankers )(AO)" uuid="df244768-5269-11df-bf66-080069138b88" uid="15509">
+        <specific value="1" description="A390 Wave Knight" uuid="df2561c0-5269-11df-b52b-080069138b88" uid="15510"/>
+      </subcategory>
+      <subcategory value="29" description="Oakleaf Class (Support Tanker)(AOT)" uuid="df2712d6-5269-11df-960b-080069138b88" uid="15511">
+        <specific value="1" description="A111 Oakleaf" uuid="df2823ce-5269-11df-89c7-080069138b88" uid="15512"/>
+      </subcategory>
+    </category>
+    <category value="17" description="Auxiliary, Merchant Marine" uuid="df2a77dc-5269-11df-b812-080069138b88" uid="15513">
+      <subcategory value="1" description="Avon class (Royal Corps of Transport)" uuid="df2b83c0-5269-11df-8595-080069138b88" uid="15514">
+        <specific value="1" description="RPL 05 Eden" uuid="df2c93be-5269-11df-8f12-080069138b88" uid="15515"/>
+        <specific value="2" description="RPL 06 Forth" uuid="df2da6f0-5269-11df-b189-080069138b88" uid="15516"/>
+        <specific value="3" description="RPL 12 Medway" uuid="df2eb112-5269-11df-9d8f-080069138b88" uid="15517"/>
+      </subcategory>
+      <subcategory value="2" description="Adept class (TUTT) (tugs)" uuid="df306160-5269-11df-a350-080069138b88" uid="15518">
+        <specific value="1" description="A 221 Forceful" uuid="df31735c-5269-11df-9ba8-080069138b88" uid="15519"/>
+        <specific value="2" description="A 222 Nimble" uuid="df328364-5269-11df-bea8-080069138b88" uid="15520"/>
+        <specific value="3" description="A 223 Powerful" uuid="df338d9a-5269-11df-825c-080069138b88" uid="15521"/>
+        <specific value="4" description="A 224 Adept" uuid="df34a158-5269-11df-82fa-080069138b88" uid="15522"/>
+        <specific value="5" description="A 225 Bustler" uuid="df35b02a-5269-11df-9650-080069138b88" uid="15523"/>
+        <specific value="6" description="A 226 Capable" uuid="df36bb46-5269-11df-8341-080069138b88" uid="15524"/>
+        <specific value="7" description="A 227 Careful" uuid="df37cdce-5269-11df-97be-080069138b88" uid="15525"/>
+        <specific value="8" description="A 228 Faithful" uuid="df38dd40-5269-11df-8ba4-080069138b88" uid="15526"/>
+        <specific value="9" description="A 231 Dexterous" uuid="df39e6b8-5269-11df-8042-080069138b88" uid="15527"/>
+      </subcategory>
+      <subcategory value="3" description="Dog class (tugs and range-trials vessels)" uuid="df3b9b7a-5269-11df-b451-080069138b88" uid="15528">
+        <specific value="1" description="A 106 Alsatian" uuid="df3cacfe-5269-11df-ae95-080069138b88" uid="15529"/>
+        <specific value="2" description="A 126 Cairn" uuid="df3dc8be-5269-11df-9fe9-080069138b88" uid="15530"/>
+        <specific value="3" description="A 129 Dalmatian" uuid="df3ed1b4-5269-11df-b4bb-080069138b88" uid="15531"/>
+        <specific value="4" description="A 155 Deerhound" uuid="df3fe2fc-5269-11df-9df8-080069138b88" uid="15532"/>
+        <specific value="5" description="A 162 Elkhound" uuid="df40f688-5269-11df-8126-080069138b88" uid="15533"/>
+        <specific value="6" description="A 168 Labrador" uuid="df41ff1a-5269-11df-908f-080069138b88" uid="15534"/>
+        <specific value="7" description="A 178 Husky" uuid="df430ee6-5269-11df-9f97-080069138b88" uid="15535"/>
+        <specific value="8" description="A 180 Mastiff" uuid="df4428f8-5269-11df-8ffc-080069138b88" uid="15536"/>
+        <specific value="9" description="A 182 Saluki" uuid="df45375c-5269-11df-be38-080069138b88" uid="15537"/>
+        <specific value="10" description="A 188 Pointer" uuid="df464732-5269-11df-b912-080069138b88" uid="15538"/>
+        <specific value="11" description="A 189 Setter" uuid="df475618-5269-11df-a90b-080069138b88" uid="15539"/>
+        <specific value="12" description="A 197 Sealyham" uuid="df4860a8-5269-11df-b92d-080069138b88" uid="15540"/>
+        <specific value="13" description="A 201 Spaniel" uuid="df497420-5269-11df-aae8-080069138b88" uid="15541"/>
+        <specific value="14" description="A 250 Sheepdog" uuid="df4a8360-5269-11df-923d-080069138b88" uid="15542"/>
+        <specific value="15" description="A 326 Foxhound (ex-Boxer)" uuid="df4b8e0e-5269-11df-948e-080069138b88" uid="15543"/>
+        <specific value="16" description="A 327 Basset (ex-Beagle)" uuid="df4ca262-5269-11df-bfa6-080069138b88" uid="15544"/>
+        <specific value="17" description="A 328 Collie" uuid="df4db2ba-5269-11df-a563-080069138b88" uid="15545"/>
+        <specific value="18" description="A 330 Corgi" uuid="df4ebc46-5269-11df-b1ca-080069138b88" uid="15546"/>
+      </subcategory>
+      <subcategory value="4" description="Modified Girl Class" uuid="df50700e-5269-11df-9a9b-080069138b88" uid="15547">
+        <specific value="1" description="A 156 Daphne" uuid="df518070-5269-11df-b167-080069138b88" uid="15548"/>
+        <specific value="2" description="A 177 Edith" uuid="df528fe2-5269-11df-8c12-080069138b88" uid="15549"/>
+      </subcategory>
+      <subcategory value="5" description="Triton class" uuid="df543e28-5269-11df-ac7e-080069138b88" uid="15550">
+        <specific value="1" description="A 166 Kathleen" uuid="df554bd8-5269-11df-8b99-080069138b88" uid="15551"/>
+        <specific value="2" description="A 170 Kitty" uuid="df565c08-5269-11df-a6b5-080069138b88" uid="15552"/>
+        <specific value="3" description="A 172 Lesley" uuid="df576b16-5269-11df-a64a-080069138b88" uid="15553"/>
+        <specific value="4" description="A 174 Lilah" uuid="df587330-5269-11df-b402-080069138b88" uid="15554"/>
+        <specific value="5" description="A 175 Mary" uuid="df5984f0-5269-11df-b29b-080069138b88" uid="15555"/>
+        <specific value="6" description="A 181 Irene" uuid="df5a9994-5269-11df-b8ae-080069138b88" uid="15556"/>
+        <specific value="7" description="A 183 Isabel" uuid="df5ba1ae-5269-11df-952a-080069138b88" uid="15557"/>
+        <specific value="8" description="A 190 Joan" uuid="df5cb134-5269-11df-9a9f-080069138b88" uid="15558"/>
+        <specific value="9" description="A 193 Joyce" uuid="df5dc196-5269-11df-9f3b-080069138b88" uid="15559"/>
+        <specific value="10" description="A 199 Myrtle" uuid="df5eceba-5269-11df-9e90-080069138b88" uid="15560"/>
+        <specific value="11" description="A 202 Nancy" uuid="df5fdbca-5269-11df-b5ae-080069138b88" uid="15561"/>
+        <specific value="12" description="A 205 Norah" uuid="df60ee5c-5269-11df-ae62-080069138b88" uid="15562"/>
+      </subcategory>
+      <subcategory value="6" description="Felicity class" uuid="df62a6a2-5269-11df-bd41-080069138b88" uid="15563">
+        <specific value="1" description="A 112 Felicity" uuid="df63b3e4-5269-11df-be9b-080069138b88" uid="15564"/>
+        <specific value="2" description="A 147 Frances" uuid="df64c4aa-5269-11df-b81d-080069138b88" uid="15565"/>
+        <specific value="3" description="A 148 Fiona" uuid="df65d674-5269-11df-8167-080069138b88" uid="15566"/>
+        <specific value="4" description="A 149 Florence" uuid="df66e26c-5269-11df-b247-080069138b88" uid="15567"/>
+        <specific value="5" description="A 150 Genevieve" uuid="df67f53a-5269-11df-8d95-080069138b88" uid="15568"/>
+        <specific value="6" description="A 152 Georgina" uuid="df690344-5269-11df-808d-080069138b88" uid="15569"/>
+        <specific value="7" description="A 196 Gwendoline" uuid="df6a0e9c-5269-11df-b917-080069138b88" uid="15570"/>
+        <specific value="8" description="A 198 Helen" uuid="df6b2200-5269-11df-86e3-080069138b88" uid="15571"/>
+      </subcategory>
+    </category>
+    <category value="54" description="Amphibious Assault Ship" uuid="df6d6fb0-5269-11df-a901-080069138b88" uid="15572">
+      <subcategory value="1" description="LPH01 Ocean" uuid="df6e7fc2-5269-11df-ae71-080069138b88" uid="15573"/>
+      <subcategory value="2" description="Helicopter Carrier (LPH)" uuid="df6f942a-5269-11df-949e-080069138b88" uid="15574">
+        <specific value="1" description="L12 Ocean" uuid="df70a50e-5269-11df-aa6f-080069138b88" uid="15575"/>
+      </subcategory>
+    </category>
+    <category value="56" description="Amphibious transport dock" uuid="df72f642-5269-11df-a9f3-080069138b88" uid="15576">
+      <subcategory value="1" description="Assault ships (LPD)" uuid="df740514-5269-11df-abdf-080069138b88" uid="15577">
+        <specific value="1" description="L 10 Fearless" uuid="df751058-5269-11df-920a-080069138b88" uid="15578"/>
+        <specific value="2" description="L 11 Intrepid" uuid="df7620d8-5269-11df-998c-080069138b88" uid="15579"/>
+        <specific value="3" description="L 14 Albion" uuid="df773464-5269-11df-83e8-080069138b88" uid="15580"/>
+        <specific value="4" description="L 15 Bulwalk" uuid="df783d50-5269-11df-84be-080069138b88" uid="15581"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="df7a921c-5269-11df-804f-080069138b88" uid="15582">
+      <subcategory value="1" description="Container class" uuid="df7b9cac-5269-11df-a8c9-080069138b88" uid="15583">
+        <specific value="1" description="Adi Eu" uuid="df7cab74-5269-11df-8ca3-080069138b88" uid="15584"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="224" uuid="df7fa130-5269-11df-b767-080069138b88" uid="15585">
+    <category value="1" description="SSBN (Nuclear Ballistic Missiles)" uuid="df80af44-5269-11df-9728-080069138b88" uid="15586">
+      <subcategory value="1" description="Vanguard Class" uuid="df81c38e-5269-11df-8023-080069138b88" uid="15587">
+        <specific value="1" description="05 Vanguard" uuid="df82d800-5269-11df-81e8-080069138b88" uid="15588"/>
+        <specific value="2" description="06 Victorious" uuid="df83e68c-5269-11df-b888-080069138b88" uid="15589"/>
+        <specific value="3" description="07 Vigilant" uuid="df84f0a4-5269-11df-8d60-080069138b88" uid="15590"/>
+        <specific value="4" description="08" uuid="df860372-5269-11df-966d-080069138b88" uid="15591"/>
+      </subcategory>
+      <subcategory value="2" description="Resolution Class" uuid="df87b280-5269-11df-9feb-080069138b88" uid="15592">
+        <specific value="1" description="S 22 Resolution" uuid="df88c1de-5269-11df-a6ac-080069138b88" uid="15593"/>
+        <specific value="2" description="S 23 Repulse" uuid="df89cf84-5269-11df-bb90-080069138b88" uid="15594"/>
+        <specific value="3" description="S 26 Renown" uuid="df8adfbe-5269-11df-b402-080069138b88" uid="15595"/>
+        <specific value="4" description="S 27 Revenge" uuid="df8bf1ce-5269-11df-af88-080069138b88" uid="15596"/>
+      </subcategory>
+    </category>
+    <category value="3" description="SSN (Nuclear Attack-Torpedo)" uuid="df8e4410-5269-11df-ad16-080069138b88" uid="15597">
+      <subcategory value="1" description="Trafalgar Class" uuid="df8f5490-5269-11df-ae7b-080069138b88" uid="15598">
+        <specific value="1" description="S 87 Turbulent" uuid="df906204-5269-11df-bf56-080069138b88" uid="15599"/>
+        <specific value="2" description="S 88 Tireless" uuid="df917162-5269-11df-9895-080069138b88" uid="15600"/>
+        <specific value="3" description="S 90 Torbay" uuid="df928016-5269-11df-befd-080069138b88" uid="15601"/>
+        <specific value="4" description="S 91 Trenchant" uuid="df938dd0-5269-11df-9eef-080069138b88" uid="15602"/>
+        <specific value="5" description="S 92 Talent" uuid="df949e6e-5269-11df-87ad-080069138b88" uid="15603"/>
+        <specific value="6" description="S 93 Triumph" uuid="df95ae9e-5269-11df-b70c-080069138b88" uid="15604"/>
+        <specific value="7" description="S 107 Trafalgar" uuid="df96bd2a-5269-11df-8ad8-080069138b88" uid="15605"/>
+      </subcategory>
+      <subcategory value="2" description="Swiftsure Class" uuid="df986ddc-5269-11df-bffc-080069138b88" uid="15606">
+        <specific value="1" description="S 104 Sceptre" uuid="df997ef2-5269-11df-be39-080069138b88" uid="15607"/>
+        <specific value="2" description="S 105 Spartan" uuid="df9a90e4-5269-11df-9163-080069138b88" uid="15608"/>
+        <specific value="3" description="S 106 Splendid" uuid="df9b9a16-5269-11df-804f-080069138b88" uid="15609"/>
+        <specific value="4" description="S 108 Sovereign" uuid="df9caa1e-5269-11df-bbf9-080069138b88" uid="15610"/>
+        <specific value="5" description="S 109 Superb" uuid="df9dbcb0-5269-11df-8534-080069138b88" uid="15611"/>
+      </subcategory>
+      <subcategory value="3" description="Valiant Class" uuid="df9f75fa-5269-11df-8469-080069138b88" uid="15612">
+        <specific value="1" description="S 102 Valiant" uuid="dfa088a0-5269-11df-90d7-080069138b88" uid="15613"/>
+      </subcategory>
+    </category>
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="dfa2e208-5269-11df-862c-080069138b88" uid="15614">
+      <subcategory value="1" description="Upholder class (Type 2400)" uuid="dfa3ee3c-5269-11df-b8a1-080069138b88" uid="15615">
+        <specific value="1" description="S 40 Upholder" uuid="dfa4ff3e-5269-11df-ad7e-080069138b88" uid="15616"/>
+        <specific value="2" description="S 41 Unseen" uuid="dfa6122a-5269-11df-92f3-080069138b88" uid="15617"/>
+        <specific value="3" description="S 42 Ursula" uuid="dfa71b7a-5269-11df-b750-080069138b88" uid="15618"/>
+        <specific value="4" description="S 43 Unicorn" uuid="dfa82c18-5269-11df-8497-080069138b88" uid="15619"/>
+      </subcategory>
+      <subcategory value="2" description="Oberon Class" uuid="dfa9dcde-5269-11df-886b-080069138b88" uid="15620">
+        <specific value="1" description="S 16 Oracle" uuid="dfaaee44-5269-11df-b71c-080069138b88" uid="15621"/>
+        <specific value="2" description="S 19 Opossum" uuid="dfabf7e4-5269-11df-9cfa-080069138b88" uid="15622"/>
+        <specific value="3" description="S 20 Opportune" uuid="dfad0904-5269-11df-9ec6-080069138b88" uid="15623"/>
+        <specific value="60" description="Onslow (Australia)" uuid="dfae1cfe-5269-11df-8c3a-080069138b88" uid="15624"/>
+        <specific value="62" description="Otama (Australia)" uuid="dfaf25a4-5269-11df-84fd-080069138b88" uid="15625"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="224" uuid="dfb21a16-5269-11df-b7df-080069138b88" uid="15626">
+    <category value="0" description="Other" uuid="dfb3274e-5269-11df-97b0-080069138b88" uid="15627"/>
+    <category value="1" description="Manned" uuid="dfb43436-5269-11df-acd2-080069138b88" uid="15628"/>
+    <category value="2" description="Unmanned" uuid="dfb54286-5269-11df-8d35-080069138b88" uid="15629">
+      <subcategory value="1" description="Communication satellite" uuid="dfb6527a-5269-11df-87ce-080069138b88" uid="15630">
+        <specific value="1" description="Skynet 4" uuid="dfb761d8-5269-11df-a7e3-080069138b88" uid="15631"/>
+        <specific value="2" description="Skynet 4A" uuid="dfb870fa-5269-11df-b538-080069138b88" uid="15632"/>
+        <specific value="3" description="Skynet 4B" uuid="dfb97f04-5269-11df-9b61-080069138b88" uid="15633"/>
+        <specific value="4" description="Skynet 4C" uuid="dfba89d0-5269-11df-bfb0-080069138b88" uid="15634"/>
+        <specific value="5" description="NATO 4" uuid="dfbb9c76-5269-11df-b1ca-080069138b88" uid="15635"/>
+        <specific value="6" description="ECS" uuid="dfbcab66-5269-11df-bdf3-080069138b88" uid="15636"/>
+        <specific value="7" description="Eurostar" uuid="dfbdb628-5269-11df-8d76-080069138b88" uid="15637"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="71" uuid="dfc0b4d6-5269-11df-8176-080069138b88" uid="15638">
+    <category value="1" description="Tank" uuid="dfc1c402-5269-11df-9767-080069138b88" uid="15639">
+      <subcategory value="1" description="AMX-30" uuid="dfc2d0e0-5269-11df-b73c-080069138b88" uid="15640">
+        <specific value="1" description="AMX-30B2" uuid="dfc3deea-5269-11df-82ca-080069138b88" uid="15641"/>
+      </subcategory>
+      <subcategory value="2" description="AMX-13 Light Tank" uuid="dfc5917c-5269-11df-96ba-080069138b88" uid="15642"/>
+      <subcategory value="3" description="AMX-40 MBT" uuid="dfc6a210-5269-11df-96b6-080069138b88" uid="15643"/>
+      <subcategory value="4" description="Le Clerc" uuid="dfc7aca0-5269-11df-a200-080069138b88" uid="15644"/>
+    </category>
+    <category value="2" description="Armored fighting vehicle" uuid="dfc95da2-5269-11df-95ae-080069138b88" uid="15645">
+      <subcategory value="1" description="VBC-90 armored car" uuid="dfca6dc8-5269-11df-9014-080069138b88" uid="15646"/>
+      <subcategory value="2" description="ERC-90 armored car" uuid="dfcb7f60-5269-11df-a051-080069138b88" uid="15647"/>
+      <subcategory value="3" description="AML-90 armored car" uuid="dfcc8e82-5269-11df-a2d0-080069138b88" uid="15648"/>
+      <subcategory value="4" description="AML-60 armored car" uuid="dfcd9fa2-5269-11df-b1e9-080069138b88" uid="15649"/>
+      <subcategory value="5" description="VAB APC" uuid="dfceb248-5269-11df-8ce3-080069138b88" uid="15650"/>
+      <subcategory value="6" description="AMX-10RC armored car" uuid="dfcfbf6c-5269-11df-892a-080069138b88" uid="15651"/>
+      <subcategory value="7" description="AMX-13 IFV" uuid="dfd0cf38-5269-11df-893f-080069138b88" uid="15652"/>
+      <subcategory value="8" description="AMX-10 IFV" uuid="dfd1e0a8-5269-11df-b549-080069138b88" uid="15653">
+        <specific value="1" description="with two-rail MILAN anti-tank missile launcher" uuid="dfd2ed2c-5269-11df-966e-080069138b88" uid="15654"/>
+        <specific value="2" description="with HOT: ATGM launcher vehicle" uuid="dfd40298-5269-11df-8853-080069138b88" uid="15655"/>
+        <specific value="3" description="AMX-10/PAC 90" status="new" uuid="e267c0b6-cc2c-4219-9018-26e4f77716fc" uid="22820">
+          <cr value="1699"/>
+        </specific>
+      </subcategory>
+      <subcategory value="9" description="EBR armored car" uuid="dfd5b200-5269-11df-b89f-080069138b88" uid="15656"/>
+      <subcategory value="10" description="AMX-13 VCI APC" uuid="dfd6c1f4-5269-11df-851b-080069138b88" uid="15657"/>
+      <subcategory value="11" description="AMX-13 DCA" uuid="dfd7d13e-5269-11df-82e7-080069138b88" uid="15658"/>
+      <subcategory value="12" description="Berliet VXB armored car" uuid="dfd8e0ec-5269-11df-b3d9-080069138b88" uid="15659"/>
+      <subcategory value="13" description="Panhard EBR" uuid="dfd9f108-5269-11df-8f38-080069138b88" uid="15660"/>
+    </category>
+    <category value="3" description="Armored utility vehicle" uuid="dfdba53e-5269-11df-b25d-080069138b88" uid="15661">
+      <subcategory value="1" description="AMX-10 ECH Recovery Vehicle" uuid="dfdcaf88-5269-11df-a8e2-080069138b88" uid="15662"/>
+    </category>
+    <category value="4" description="Self-propelled artillery" uuid="dfde6c38-5269-11df-bde8-080069138b88" uid="15663">
+      <subcategory value="1" description="A UF1 155-mm Howitzer" uuid="dfdf7d08-5269-11df-b1f8-080069138b88" uid="15664"/>
+      <subcategory value="2" description="AMX 105-mm Howitzer" uuid="dfe08c48-5269-11df-84f7-080069138b88" uid="15665"/>
+      <subcategory value="3" description="AU-50 105-mm Howitzer" uuid="dfe197f0-5269-11df-bdc4-080069138b88" uid="15666"/>
+      <subcategory value="4" description="F-3 155-mm gun" uuid="dfe2ad2a-5269-11df-91cd-080069138b88" uid="15667"/>
+      <subcategory value="5" description="MM 38 Exocet launcher" uuid="dfe3bc42-5269-11df-a483-080069138b88" uid="15668"/>
+      <subcategory value="6" description="MM 40 Exocet launcher" uuid="dfe4c7f4-5269-11df-8c2d-080069138b88" uid="15669"/>
+      <subcategory value="7" description="Otomat Mk 1 launcher" uuid="dfe5dd2e-5269-11df-90d2-080069138b88" uid="15670"/>
+      <subcategory value="8" description="Otomat Mk 2/3 launcher" uuid="dfe6eec6-5269-11df-9622-080069138b88" uid="15671"/>
+    </category>
+    <category value="5" description="Towed artillery" uuid="dfe89cd0-5269-11df-9c8b-080069138b88" uid="15672">
+      <subcategory value="1" description="TR 155-mm Howitzer" uuid="dfe9a9ea-5269-11df-beb4-080069138b88" uid="15673"/>
+    </category>
+    <category value="6" description="Small wheeled utility vehicle" uuid="dfeb5a7e-5269-11df-a94d-080069138b88" uid="15674"/>
+    <category value="7" description="Large wheeled utility vehicle" uuid="dfec6b30-5269-11df-a2dd-080069138b88" uid="15675"/>
+    <category value="8" description="Small tracked utility vehicle" uuid="dfed93c0-5269-11df-b6f6-080069138b88" uid="15676"/>
+    <category value="9" description="Large tracked utility vehicle" uuid="dfeea24c-5269-11df-81f0-080069138b88" uid="15677"/>
+    <category value="10" description="Mortar" uuid="dfefb57e-5269-11df-a7b2-080069138b88" uid="15678">
+      <subcategory value="1" description="120mm Mortar RT-61" uuid="dff0c8e2-5269-11df-b4ea-080069138b88" uid="15679"/>
+    </category>
+    <category value="11" description="Mine plow" uuid="dff27836-5269-11df-a834-080069138b88" uid="15680"/>
+    <category value="12" description="Mine rake" uuid="dff3819a-5269-11df-809c-080069138b88" uid="15681"/>
+    <category value="13" description="Mine roller" uuid="dff495bc-5269-11df-a421-080069138b88" uid="15682"/>
+    <category value="14" description="Cargo trailer" uuid="dff5a506-5269-11df-bf63-080069138b88" uid="15683">
+      <subcategory value="1" description="0 - 0.5 ton" uuid="dff6af14-5269-11df-8da1-080069138b88" uid="15684"/>
+      <subcategory value="2" description="0.51 - 2 ton" uuid="dff7be4a-5269-11df-a5cc-080069138b88" uid="15685"/>
+      <subcategory value="3" description="2.01 - 5 ton" uuid="dff8d2a8-5269-11df-aaa1-080069138b88" uid="15686"/>
+      <subcategory value="4" description="5.02 - 10 ton" uuid="dff9dcca-5269-11df-a875-080069138b88" uid="15687"/>
+      <subcategory value="5" description="greater than 10 tons" uuid="dffaed5e-5269-11df-b981-080069138b88" uid="15688"/>
+    </category>
+    <category value="15" description="Fuel trailer" uuid="dffca87e-5269-11df-8f86-080069138b88" uid="15689">
+      <subcategory value="1" description="1-1000 gallons" uuid="dffdbb56-5269-11df-8364-080069138b88" uid="15690"/>
+      <subcategory value="2" description="1001 - 5000 gallons" uuid="dffecd5c-5269-11df-a539-080069138b88" uid="15691"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="dfffdbac-5269-11df-a14f-080069138b88" uid="15692"/>
+    </category>
+    <category value="16" description="Generator trailer" uuid="e0018b28-5269-11df-ae17-080069138b88" uid="15693">
+      <subcategory value="1" description="0 - 100 KW" uuid="e0029ab8-5269-11df-9834-080069138b88" uid="15694"/>
+      <subcategory value="2" description="greater than 100 KW" uuid="e003af02-5269-11df-a1fe-080069138b88" uid="15695"/>
+    </category>
+    <category value="17" description="Water trailer" uuid="e0055ec4-5269-11df-a635-080069138b88" uid="15696">
+      <subcategory value="1" description="1-1000 gallons" uuid="e00666c0-5269-11df-8bfa-080069138b88" uid="15697"/>
+      <subcategory value="2" description="1001- 5000 gallons" uuid="e0077948-5269-11df-b678-080069138b88" uid="15698"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="e0088e46-5269-11df-83ce-080069138b88" uid="15699"/>
+    </category>
+    <category value="18" description="Engineer equipment" uuid="e00a3c78-5269-11df-9953-080069138b88" uid="15700">
+      <subcategory value="1" description="Mine clearing line charge" uuid="e00b474e-5269-11df-9575-080069138b88" uid="15701"/>
+      <subcategory value="2" description="Dozer blade kit" uuid="e00c5986-5269-11df-a838-080069138b88" uid="15702"/>
+      <subcategory value="3" description="Lane marking system" uuid="e00d6d30-5269-11df-9311-080069138b88" uid="15703"/>
+    </category>
+    <category value="19" description="Heavy equipment transport trailer" uuid="e00f1dce-5269-11df-8248-080069138b88" uid="15704"/>
+    <category value="20" description="Maintenance equipment trailer" uuid="e0102980-5269-11df-8b38-080069138b88" uid="15705">
+      <subcategory value="1" description="Welding trailer" uuid="e0113b9a-5269-11df-bfc7-080069138b88" uid="15706"/>
+      <subcategory value="2" description="Compressor" uuid="e0124f80-5269-11df-9732-080069138b88" uid="15707"/>
+      <subcategory value="3" description="Tools/parts trailer" uuid="e0135a4c-5269-11df-958a-080069138b88" uid="15708"/>
+    </category>
+    <category value="21" description="Limber" uuid="e015091e-5269-11df-a5d7-080069138b88" uid="15709"/>
+    <category value="22" description="Chemical decontamination trailer" uuid="e01619c6-5269-11df-a6dc-080069138b88" uid="15710"/>
+    <category value="28" description="Air Defense / Missile Defense Unit Equipment" uuid="e0172f00-5269-11df-a7e6-080069138b88" uid="15711">
+      <subcategory value="1" description="Crotale SAM System" uuid="e01839e0-5269-11df-af44-080069138b88" uid="15712">
+        <specific value="1" description="Crotale P4R Missile Firing System" uuid="e0194af6-5269-11df-ae9d-080069138b88" uid="15713"/>
+        <specific value="2" description="Crotale P4R Radar System" uuid="e01a5ebe-5269-11df-b3fa-080069138b88" uid="15714"/>
+      </subcategory>
+      <subcategory value="2" description="Crotale NG SAM System" uuid="e01c1c68-5269-11df-a310-080069138b88" uid="15715"/>
+      <subcategory value="3" description="Shahine SAM System" uuid="e01d27ca-5269-11df-90b5-080069138b88" uid="15716">
+        <specific value="1" description="Shahine Acquisition Radar/AMX-30 chassis" uuid="e01e37a0-5269-11df-a1e2-080069138b88" uid="15717"/>
+        <specific value="2" description="Shahine Launcher/AMX-30 chassis" uuid="e01f4b5e-5269-11df-af83-080069138b88" uid="15718"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="71" uuid="e0223abc-5269-11df-a2dc-080069138b88" uid="15719">
+    <category value="1" description="Fighter/Air Defense" uuid="e0234984-5269-11df-b5c0-080069138b88" uid="15720">
+      <subcategory value="1" description="Mirage F-1" uuid="e0245d56-5269-11df-8801-080069138b88" uid="15721">
+        <specific value="1" description="F1-AD" uuid="e0256ca0-5269-11df-b877-080069138b88" uid="15722"/>
+        <specific value="2" description="F1-AZ" uuid="e0267686-5269-11df-816f-080069138b88" uid="15723"/>
+        <specific value="3" description="F1-B" uuid="e027867a-5269-11df-a26a-080069138b88" uid="15724"/>
+        <specific value="4" description="F1-BD" uuid="e0289524-5269-11df-9750-080069138b88" uid="15725"/>
+        <specific value="5" description="F1-BE" uuid="e029a338-5269-11df-a18b-080069138b88" uid="15726"/>
+        <specific value="6" description="F1-BJ" uuid="e02ab4ee-5269-11df-a2c5-080069138b88" uid="15727"/>
+        <specific value="7" description="F1-BK" uuid="e02bc4a6-5269-11df-a44c-080069138b88" uid="15728"/>
+        <specific value="8" description="F1-BQ" uuid="e02cd094-5269-11df-9639-080069138b88" uid="15729"/>
+        <specific value="9" description="F1-B &amp; E" uuid="e02de088-5269-11df-b351-080069138b88" uid="15730"/>
+        <specific value="10" description="F1-C" uuid="e02eef1e-5269-11df-9c10-080069138b88" uid="15731"/>
+        <specific value="11" description="F1-CE" uuid="e02ff76a-5269-11df-93d2-080069138b88" uid="15732"/>
+        <specific value="12" description="F1-CG" uuid="e03109fc-5269-11df-8cc7-080069138b88" uid="15733"/>
+        <specific value="13" description="F1-CH" uuid="e032191e-5269-11df-9bb4-080069138b88" uid="15734"/>
+        <specific value="14" description="F1-CJ" uuid="e03322dc-5269-11df-bdac-080069138b88" uid="15735"/>
+        <specific value="15" description="F1-CK" uuid="e034342e-5269-11df-b5d1-080069138b88" uid="15736"/>
+        <specific value="16" description="F1-CR-200" uuid="e035442c-5269-11df-b238-080069138b88" uid="15737"/>
+        <specific value="17" description="F1-CZ" uuid="e0364d68-5269-11df-82c2-080069138b88" uid="15738"/>
+        <specific value="18" description="F1-C-200s" uuid="e0375a50-5269-11df-8b1d-080069138b88" uid="15739"/>
+        <specific value="19" description="F1-DDA" uuid="e0386d46-5269-11df-8175-080069138b88" uid="15740"/>
+        <specific value="20" description="F1-ED" uuid="e0397fce-5269-11df-a0bd-080069138b88" uid="15741"/>
+        <specific value="21" description="F1-EDA" uuid="e03a91c0-5269-11df-b854-080069138b88" uid="15742"/>
+        <specific value="22" description="F1-EE" uuid="e03ba416-5269-11df-ab4e-080069138b88" uid="15743"/>
+        <specific value="23" description="F1-EH" uuid="e03cad98-5269-11df-ad8f-080069138b88" uid="15744"/>
+        <specific value="24" description="F1-EJ" uuid="e03dbe54-5269-11df-9858-080069138b88" uid="15745"/>
+        <specific value="25" description="F1-EQ" uuid="e03ecd8a-5269-11df-aa9f-080069138b88" uid="15746"/>
+        <specific value="26" description="F1-JA" uuid="e03fd658-5269-11df-b1a0-080069138b88" uid="15747"/>
+        <specific value="27" description="F1-JE" uuid="e040e9e4-5269-11df-b226-080069138b88" uid="15748"/>
+      </subcategory>
+      <subcategory value="3" description="Mirage III" uuid="e04298f2-5269-11df-80ae-080069138b88" uid="15749">
+        <specific value="1" description="Mirage III-D" uuid="e043aa30-5269-11df-b7e8-080069138b88" uid="15750"/>
+        <specific value="2" description="Mirage III-E" uuid="e044b344-5269-11df-ad0c-080069138b88" uid="15751"/>
+      </subcategory>
+      <subcategory value="4" description="Mirage 2000" uuid="e0466644-5269-11df-be31-080069138b88" uid="15752">
+        <specific value="1" description="Mirage 2000AD" uuid="e047750c-5269-11df-b74d-080069138b88" uid="15753"/>
+        <specific value="2" description="Mirage 2000BGM" uuid="e0488474-5269-11df-a77a-080069138b88" uid="15754"/>
+        <specific value="3" description="Mirage 2000C" uuid="e0499238-5269-11df-83e9-080069138b88" uid="15755"/>
+        <specific value="4" description="Mirage 2000D" uuid="e04aa182-5269-11df-8972-080069138b88" uid="15756"/>
+        <specific value="5" description="Mirage 2000DAD" uuid="e04bb09a-5269-11df-8c98-080069138b88" uid="15757"/>
+        <specific value="6" description="Mirage 2000DP" uuid="e04cbc56-5269-11df-9583-080069138b88" uid="15758"/>
+        <specific value="7" description="Mirage 2000E" uuid="e04dca60-5269-11df-bd63-080069138b88" uid="15759"/>
+        <specific value="8" description="Mirage 2000EAD" uuid="e04edd6a-5269-11df-82a6-080069138b88" uid="15760"/>
+        <specific value="9" description="Mirage 2000EGM" uuid="e04fe7b4-5269-11df-8316-080069138b88" uid="15761"/>
+        <specific value="10" description="Mirage 2000H (KF-101)" uuid="e050f6ae-5269-11df-8855-080069138b88" uid="15762"/>
+        <specific value="11" description="Mirage 2000N" uuid="e0520922-5269-11df-a9ac-080069138b88" uid="15763"/>
+        <specific value="12" description="Mirage 2000P" uuid="e05315e2-5269-11df-9d4b-080069138b88" uid="15764"/>
+        <specific value="13" description="Mirage 2000RAD" uuid="e0542612-5269-11df-82d5-080069138b88" uid="15765"/>
+        <specific value="14" description="Mirage 2000TH (KT-201)" uuid="e05534f8-5269-11df-a50b-080069138b88" uid="15766"/>
+        <specific value="15" description="Mirage 2000-5" uuid="e0564096-5269-11df-a202-080069138b88" uid="15767"/>
+        <specific value="16" description="Vajra (Divine Thunder)" uuid="e0575436-5269-11df-a46b-080069138b88" uid="15768"/>
+      </subcategory>
+      <subcategory value="5" description="Dassault Rafale (Squall)" uuid="e0590f42-5269-11df-a2fa-080069138b88" uid="15769">
+        <specific value="1" description="Rafale B" uuid="e05a1f04-5269-11df-9d81-080069138b88" uid="15770"/>
+        <specific value="2" description="Rafale C" uuid="e05b2e80-5269-11df-a4f4-080069138b88" uid="15771"/>
+        <specific value="3" description="Rafale S-1 Standard" uuid="e05c3e1a-5269-11df-8d84-080069138b88" uid="15772"/>
+        <specific value="4" description="Rafale M" uuid="e05d4e72-5269-11df-9c07-080069138b88" uid="15773"/>
+      </subcategory>
+      <subcategory value="6" description="Mirage 50" uuid="e05eff38-5269-11df-9416-080069138b88" uid="15774"/>
+      <subcategory value="7" description="Mirage 4000" deprecated="1" uuid="e06009aa-5269-11df-827e-080069138b88" uid="15775"/>
+    </category>
+    <category value="2" description="Attack/Strike" uuid="e061bdae-5269-11df-a4f6-080069138b88" uid="15776">
+      <subcategory value="1" description="Dassault/BAe Jaguar" uuid="e062cd98-5269-11df-9d99-080069138b88" uid="15777"/>
+      <subcategory value="2" description="Etendard IV-P" uuid="e063dcf6-5269-11df-8a0c-080069138b88" uid="15778"/>
+      <subcategory value="3" description="Dassault Super Etendard" uuid="e064ea38-5269-11df-898e-080069138b88" uid="15779">
+        <specific value="1" description="Super Etendard" uuid="e065fb94-5269-11df-afe8-080069138b88" uid="15780"/>
+      </subcategory>
+      <subcategory value="4" description="Dassault/Dornier Alpha Jet" uuid="e067ad2c-5269-11df-ada1-080069138b88" uid="15781">
+        <specific value="1" description="Alpha Jet 2" uuid="e068bc44-5269-11df-b9e4-080069138b88" uid="15782"/>
+        <specific value="2" description="Alpha Jet E" uuid="e069c990-5269-11df-b352-080069138b88" uid="15783"/>
+        <specific value="3" description="Alpha Jet A" uuid="e06ad952-5269-11df-b363-080069138b88" uid="15784"/>
+        <specific value="4" description="Alpha Jet 3" uuid="e06be9f0-5269-11df-b3d0-080069138b88" uid="15785"/>
+      </subcategory>
+      <subcategory value="5" description="Mirage 5" uuid="e06d9bd8-5269-11df-92a9-080069138b88" uid="15786"/>
+      <subcategory value="6" description="Crusader (Vought F-8E(FN))" deprecated="1" uuid="e06ea668-5269-11df-8827-080069138b88" uid="15787"/>
+      <subcategory value="7" description="Mirage IV" uuid="e06fb904-5269-11df-a722-080069138b88" uid="15788"/>
+    </category>
+    <category value="3" description="Bomber" uuid="e0716ace-5269-11df-91c9-080069138b88" uid="15789">
+      <subcategory value="1" description="Mirage IV" deprecated="1" uuid="e07277fc-5269-11df-a5f2-080069138b88" uid="15790"/>
+    </category>
+    <category value="4" description="Cargo/Tanker" uuid="e0742b88-5269-11df-8653-080069138b88" uid="15791">
+      <subcategory value="1" description="Transall C-160" uuid="e0753596-5269-11df-a46c-080069138b88" uid="15792"/>
+      <subcategory value="2" description="Dassault Mystere-Falcon 50" uuid="e076459e-5269-11df-96c1-080069138b88" uid="15793"/>
+      <subcategory value="3" description="T.16 air ambulance." uuid="e0775e84-5269-11df-a055-080069138b88" uid="15794"/>
+      <subcategory value="4" description="Reims F 406 Caravan II" uuid="e078708a-5269-11df-b8d1-080069138b88" uid="15795">
+        <specific value="1" description="Reims F 406 Vigilante" uuid="e07980e2-5269-11df-9757-080069138b88" uid="15796"/>
+      </subcategory>
+      <subcategory value="5" description="SECA/Fokker F27 Friendship Arat" uuid="e07b32a2-5269-11df-9f31-080069138b88" uid="15797"/>
+      <subcategory value="6" description="Dassault Mystere-Falcon 20" uuid="e07c42e6-5269-11df-b926-080069138b88" uid="15798">
+        <specific value="1" description="HU-25 Guardian" uuid="e07d51cc-5269-11df-880c-080069138b88" uid="15799"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Antisubmarine/patrol/observation" uuid="e07fa648-5269-11df-a264-080069138b88" uid="15800">
+      <subcategory value="1" description="Dassault Alantique 2" uuid="e080b538-5269-11df-b9e1-080069138b88" uid="15801"/>
+      <subcategory value="2" description="Dassault (Breguet) Alize" uuid="e081c55e-5269-11df-b88e-080069138b88" uid="15802"/>
+      <subcategory value="3" description="Dassault (Breguet) (1050) Atlantic" uuid="e082d5e8-5269-11df-acf2-080069138b88" uid="15803"/>
+      <subcategory value="4" description="Dassault Mystere-Falcon 900" uuid="e083e5a0-5269-11df-ba3c-080069138b88" uid="15804">
+        <specific value="1" description="T.18" uuid="e084f5bc-5269-11df-9255-080069138b88" uid="15805"/>
+      </subcategory>
+      <subcategory value="5" description="Dassault Gardian 2" uuid="e086b01e-5269-11df-a966-080069138b88" uid="15806"/>
+    </category>
+    <category value="6" description="Electronic Warfare (EW)" uuid="e08862c4-5269-11df-85cb-080069138b88" uid="15807">
+      <subcategory value="1" description="Transall C-160" uuid="e0897678-5269-11df-b737-080069138b88" uid="15808"/>
+      <subcategory value="2" description="Dassault (Breguet 1050) Alize" uuid="e08a814e-5269-11df-badd-080069138b88" uid="15809"/>
+      <subcategory value="3" description="Dassault Mystere-Falcon 20 (ECM)" uuid="e08b9318-5269-11df-9932-080069138b88" uid="15810"/>
+    </category>
+    <category value="7" description="Reconnaissance" uuid="e08d473a-5269-11df-a06f-080069138b88" uid="15811">
+      <subcategory value="1" description="Dassault Mystere-Falcon 900" uuid="e08e5a08-5269-11df-b87b-080069138b88" uid="15812"/>
+      <subcategory value="2" description="Mirage III" uuid="e08f6600-5269-11df-9273-080069138b88" uid="15813">
+        <specific value="1" description="Mirage III-R" uuid="e090743c-5269-11df-9996-080069138b88" uid="15814"/>
+        <specific value="2" description="Mirage III-R2Z" uuid="e091850c-5269-11df-9854-080069138b88" uid="15815"/>
+        <specific value="3" description="Mirage III-RD" uuid="e0929276-5269-11df-811c-080069138b88" uid="15816"/>
+      </subcategory>
+      <subcategory value="3" description="Dassault Mystere-Falcon 20SNR" uuid="e09441c0-5269-11df-b59e-080069138b88" uid="15817"/>
+    </category>
+    <category value="20" description="Attack Helicopter" uuid="e095fac4-5269-11df-be89-080069138b88" uid="15818">
+      <subcategory value="1" description="Eurocopter AS 532 Cougar" uuid="e0970e78-5269-11df-ba02-080069138b88" uid="15819">
+        <specific value="1" description="AS 532AC" uuid="e0981f3e-5269-11df-ab0e-080069138b88" uid="15820"/>
+        <specific value="2" description="AS 532AL" uuid="e09929ce-5269-11df-b518-080069138b88" uid="15821"/>
+      </subcategory>
+      <subcategory value="2" description="Eurocopter SA342 Gazelle" uuid="e09adbc0-5269-11df-ac8c-080069138b88" uid="15822">
+        <specific value="1" description="SA 342ATAM" uuid="e09beb82-5269-11df-bfcc-080069138b88" uid="15823"/>
+        <specific value="2" description="SA 342M Viviane" uuid="e09cfbbc-5269-11df-9bf9-080069138b88" uid="15824"/>
+      </subcategory>
+      <subcategory value="3" description="Eurocopter BO 105/PAH-1/VBH/BSH-1" uuid="e09eae80-5269-11df-abb4-080069138b88" uid="15825">
+        <specific value="1" description="BO 105 PAH-1A1" uuid="e09fb9c4-5269-11df-b34f-080069138b88" uid="15826"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Utility Helicopter" uuid="e0a20e18-5269-11df-a7d8-080069138b88" uid="15827">
+      <subcategory value="1" description="Aerospatiale SA 313B Alouette II" uuid="e0a31bc8-5269-11df-8362-080069138b88" uid="15828"/>
+      <subcategory value="2" description="Aerospatiale SA 315B" uuid="e0a42e5a-5269-11df-bd1f-080069138b88" uid="15829">
+        <specific value="1" description="Cheetah" uuid="e0a53df4-5269-11df-8b93-080069138b88" uid="15830"/>
+      </subcategory>
+      <subcategory value="3" description="Aerospatiale SA 316B Alouette III" uuid="e0a6f04a-5269-11df-8217-080069138b88" uid="15831"/>
+      <subcategory value="4" description="Aerospatiale SA 321 Super Frelon" uuid="e0a7fd32-5269-11df-baf5-080069138b88" uid="15832">
+        <specific value="1" description="SA 321H" uuid="e0a90da8-5269-11df-8bc1-080069138b88" uid="15833"/>
+      </subcategory>
+      <subcategory value="5" description="Aerospatiale SA 330 Puma" uuid="e0aabffe-5269-11df-804c-080069138b88" uid="15834">
+        <specific value="1" description="330 Puma" uuid="e0abcdea-5269-11df-a6cc-080069138b88" uid="15835"/>
+        <specific value="2" description="332M Super Puma" uuid="e0acd8f2-5269-11df-9ed4-080069138b88" uid="15836"/>
+        <specific value="3" description="Super Puma/Puma" uuid="e0adec56-5269-11df-b015-080069138b88" uid="15837"/>
+      </subcategory>
+      <subcategory value="6" description="Aerospatiale SA 341 Gazelle" uuid="e0af9c22-5269-11df-82c1-080069138b88" uid="15838">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="e0b0aac2-5269-11df-b387-080069138b88" uid="15839"/>
+        <specific value="2" description="SA 341B" uuid="e0b1ba20-5269-11df-b21a-080069138b88" uid="15840"/>
+        <specific value="3" description="Gazelle HT. Mk 3" uuid="e0b2c910-5269-11df-82c8-080069138b88" uid="15841"/>
+        <specific value="4" description="Gazelle HCC. Mk4" uuid="e0b3d6fc-5269-11df-a44e-080069138b88" uid="15842"/>
+        <specific value="5" description="SA 341 F" uuid="e0b4eea2-5269-11df-9c53-080069138b88" uid="15843"/>
+        <specific value="6" description="SA 341 H" uuid="e0b5fe78-5269-11df-b616-080069138b88" uid="15844"/>
+      </subcategory>
+      <subcategory value="7" description="Eurocopter AS 332L Super Puma MK II and AS 532 Cougar MkII" uuid="e0b7af3e-5269-11df-a267-080069138b88" uid="15845">
+        <specific value="1" description="532U2 Cougar MK II" uuid="e0b8c536-5269-11df-bbb7-080069138b88" uid="15846"/>
+        <specific value="2" description="532A2 Cougar Mk II" uuid="e0b9ceb8-5269-11df-a670-080069138b88" uid="15847"/>
+      </subcategory>
+      <subcategory value="8" description="Eurocopter SA 342 Gazelle" uuid="e0bb7e70-5269-11df-950d-080069138b88" uid="15848">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="e0bc94e0-5269-11df-ac51-080069138b88" uid="15849"/>
+        <specific value="2" description="SA 342M" uuid="e0bda588-5269-11df-9db8-080069138b88" uid="15850"/>
+      </subcategory>
+      <subcategory value="9" description="Eurocopter AS 532 Cougar" uuid="e0bf53ce-5269-11df-a902-080069138b88" uid="15851">
+        <specific value="1" description="AS 532UC" uuid="e0c06322-5269-11df-b093-080069138b88" uid="15852"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="e0c172f8-5269-11df-a3c9-080069138b88" uid="15853"/>
+        <specific value="3" description="AS 532MC" uuid="e0c2827e-5269-11df-8619-080069138b88" uid="15854"/>
+        <specific value="4" description="AS 532UL" uuid="e0c38f3e-5269-11df-a103-080069138b88" uid="15855"/>
+      </subcategory>
+      <subcategory value="10" description="Eurocopter AS 565 Panther" uuid="e0c53d48-5269-11df-ac43-080069138b88" uid="15856">
+        <specific value="1" description="AS 365N2 Dauphin 2" uuid="e0c64f30-5269-11df-88d5-080069138b88" uid="15857"/>
+        <specific value="2" description="AS 565MA" uuid="e0c7615e-5269-11df-a385-080069138b88" uid="15858"/>
+      </subcategory>
+      <subcategory value="11" description="Eurocopter 365N2 Dauphin 2" uuid="e0c91116-5269-11df-aeff-080069138b88" uid="15859">
+        <specific value="1" description="AS 366G1 (HH-65A Dolphin)" uuid="e0ca1d54-5269-11df-a889-080069138b88" uid="15860"/>
+      </subcategory>
+      <subcategory value="12" description="Eurocopter BO 105" uuid="e0cbd05e-5269-11df-8d02-080069138b88" uid="15861"/>
+      <subcategory value="13" description="Eurocopter AS 350 Ecureuil/Astar and AS 550 Fennec" uuid="e0cce098-5269-11df-91e8-080069138b88" uid="15862">
+        <specific value="1" description="CH-50" uuid="e0cdf42e-5269-11df-a7a9-080069138b88" uid="15863"/>
+        <specific value="2" description="TH-50 Esquilo" uuid="e0cf01ac-5269-11df-8fee-080069138b88" uid="15864"/>
+        <specific value="3" description="HA-1 Esquilo" uuid="e0d0111e-5269-11df-a53a-080069138b88" uid="15865"/>
+        <specific value="4" description="UH-12 Esquilo" uuid="e0d11fc8-5269-11df-812f-080069138b88" uid="15866"/>
+        <specific value="5" description="AS 350BA Ecureuil" uuid="e0d22abc-5269-11df-8dce-080069138b88" uid="15867"/>
+        <specific value="6" description="AS 350B2 Ecureuil" uuid="e0d344d8-5269-11df-b2c3-080069138b88" uid="15868"/>
+        <specific value="7" description="AS 350 B3 Ecureuil" uuid="e0d45918-5269-11df-8371-080069138b88" uid="15869"/>
+        <specific value="8" description="AS 350D Astar" uuid="e0d562d6-5269-11df-8f95-080069138b88" uid="15870"/>
+        <specific value="9" description="AS 350 Firefighter" uuid="e0d674c8-5269-11df-96a3-080069138b88" uid="15871"/>
+        <specific value="10" description="AS 550 Fennec" uuid="e0d7880e-5269-11df-b69e-080069138b88" uid="15872"/>
+        <specific value="11" description="550A2" uuid="e0d89122-5269-11df-b516-080069138b88" uid="15873"/>
+        <specific value="12" description="AS 550C2" uuid="e0d99f0e-5269-11df-9541-080069138b88" uid="15874"/>
+        <specific value="13" description="AS 550M2" uuid="e0dab1be-5269-11df-a9bb-080069138b88" uid="15875"/>
+        <specific value="14" description="AS 550S2" uuid="e0dbbe56-5269-11df-9053-080069138b88" uid="15876"/>
+      </subcategory>
+      <subcategory value="14" description="Eurocopter AS 355 Ecureuil 2 Twinstar and AS 555 Fennec" uuid="e0dd6e04-5269-11df-8606-080069138b88" uid="15877">
+        <specific value="1" description="CH-55" uuid="e0de7eac-5269-11df-aa82-080069138b88" uid="15878"/>
+        <specific value="2" description="VH-55 Esquilo" uuid="e0df901c-5269-11df-90f6-080069138b88" uid="15879"/>
+        <specific value="3" description="UH-12B Esquilo" uuid="e0e09e58-5269-11df-885c-080069138b88" uid="15880"/>
+        <specific value="4" description="AS 555UN Fennec" uuid="e0e1add4-5269-11df-9d9e-080069138b88" uid="15881"/>
+        <specific value="5" description="AS 555AN Fennec" uuid="e0e2bc88-5269-11df-a01c-080069138b88" uid="15882"/>
+        <specific value="6" description="AS 555CN Fennec" uuid="e0e3c7ae-5269-11df-aa65-080069138b88" uid="15883"/>
+        <specific value="7" description="AS 555MN Fennec" uuid="e0e4dbb2-5269-11df-b48e-080069138b88" uid="15884"/>
+        <specific value="8" description="AS 555SN Fennec naval ASW" uuid="e0e5ec82-5269-11df-827e-080069138b88" uid="15885"/>
+      </subcategory>
+      <subcategory value="15" description="Eurocopter AS 365N2 Dauphin 2" uuid="e0e79b54-5269-11df-be2a-080069138b88" uid="15886">
+        <specific value="1" description="AS 366G1 (HH-65A Dolphin)" uuid="e0e8aaf8-5269-11df-b099-080069138b88" uid="15887"/>
+        <specific value="2" description="AS 565 Panther" uuid="e0e9bc04-5269-11df-ade0-080069138b88" uid="15888"/>
+        <specific value="3" description="HM-1" uuid="e0eacb4e-5269-11df-9d4a-080069138b88" uid="15889"/>
+        <specific value="4" description="AS 565AA" uuid="e0ebd9a8-5269-11df-a35e-080069138b88" uid="15890"/>
+        <specific value="5" description="AS 565CA" uuid="e0ece8de-5269-11df-bcfc-080069138b88" uid="15891"/>
+        <specific value="6" description="AS 565 Panther 807, AS 565MA Panther" uuid="e0edf904-5269-11df-a4f6-080069138b88" uid="15892"/>
+        <specific value="7" description="(deprecated)" deprecated="1" uuid="e0ef0416-5269-11df-8b34-080069138b88" uid="15893"/>
+        <specific value="8" description="AS 565SA Panter" uuid="e0f01900-5269-11df-abed-080069138b88" uid="15894"/>
+      </subcategory>
+    </category>
+    <category value="22" description="Antisubmarine Warfare / Patrol Helicopter" uuid="e0f27196-5269-11df-b9fc-080069138b88" uid="15895">
+      <subcategory value="1" description="Aerospatiale SA 319B ASTAZOU" uuid="e0f387ac-5269-11df-9c23-080069138b88" uid="15896"/>
+      <subcategory value="2" description="Aerospatiale SA 321 Super Frelon" uuid="e0f498ea-5269-11df-954c-080069138b88" uid="15897">
+        <specific value="1" description="AS 32" uuid="e0f5aa6e-5269-11df-b0a3-080069138b88" uid="15898"/>
+      </subcategory>
+      <subcategory value="3" description="Eurocopter AS 532 Cougar" uuid="e0f75d96-5269-11df-b339-080069138b88" uid="15899">
+        <specific value="1" description="AS 532SC" uuid="e0f868ee-5269-11df-a316-080069138b88" uid="15900"/>
+      </subcategory>
+      <subcategory value="4" description="Eurocopter AS 565 Panther" uuid="e0fa18b0-5269-11df-843c-080069138b88" uid="15901">
+        <specific value="1" description="AS 565SA" uuid="e0fb289a-5269-11df-a241-080069138b88" uid="15902"/>
+        <specific value="2" description="AS 565F (MA)" uuid="e0fc3cbc-5269-11df-9c77-080069138b88" uid="15903"/>
+      </subcategory>
+    </category>
+    <category value="40" description="Trainer" uuid="e0fe8a58-5269-11df-9fa9-080069138b88" uid="15904">
+      <subcategory value="1" description="Mudry CAP 10 B" uuid="e0ff9c9a-5269-11df-9144-080069138b88" uid="15905"/>
+      <subcategory value="2" description="Socata TB 30 Epsilon" uuid="e100a5b8-5269-11df-9625-080069138b88" uid="15906"/>
+      <subcategory value="3" description="Socata TB 31 Omega" uuid="e101b692-5269-11df-8216-080069138b88" uid="15907"/>
+      <subcategory value="4" description="SEPECAT Jaguar International" uuid="e102ccc6-5269-11df-8274-080069138b88" uid="15908">
+        <specific value="1" description="Jaguar GR. Mk 1A" uuid="e103d8a0-5269-11df-b47b-080069138b88" uid="15909"/>
+      </subcategory>
+      <subcategory value="5" description="Dassault Mystere-Falcon 20SNA" uuid="e105890c-5269-11df-bbcc-080069138b88" uid="15910"/>
+    </category>
+    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="e1073e1e-5269-11df-8def-080069138b88" uid="15911">
+      <subcategory value="1" description="Passenger Airline" uuid="e1084f16-5269-11df-a4dd-080069138b88" uid="15912">
+        <specific value="1" description="A320 Air Bus" uuid="e1095ed8-5269-11df-8bf0-080069138b88" uid="15913"/>
+        <specific value="2" description="Airbus A300" uuid="e10a686e-5269-11df-a4b5-080069138b88" uid="15914"/>
+        <specific value="3" description="Airbus A310" uuid="e10b7a06-5269-11df-9695-080069138b88" uid="15915"/>
+        <specific value="4" description="Airbus A318" uuid="e10c8dec-5269-11df-bb8e-080069138b88" uid="15916"/>
+        <specific value="5" description="Airbus A319" uuid="e10d96ec-5269-11df-92b6-080069138b88" uid="15917"/>
+        <specific value="6" description="Airbus A321" uuid="e10ea71c-5269-11df-a550-080069138b88" uid="15918"/>
+        <specific value="7" description="Airbus A330" uuid="e10fb7ce-5269-11df-9346-080069138b88" uid="15919"/>
+        <specific value="8" description="Airbus A340" uuid="e110ce98-5269-11df-b254-080069138b88" uid="15920"/>
+        <specific value="9" description="Airbus A380" uuid="e111dec8-5269-11df-84f3-080069138b88" uid="15921"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="71" uuid="e114d704-5269-11df-8940-080069138b88" uid="15922">
+    <category value="1" description="Carrier (Porte-Avions)" uuid="e115e608-5269-11df-9c7f-080069138b88" uid="15923">
+      <subcategory value="1" description="Nuclear-Propelled Aircraft Carriers (CVN)" uuid="e116f192-5269-11df-8605-080069138b88" uid="15924">
+        <specific value="1" description="R 91 Charles De Gaulle" uuid="e118049c-5269-11df-826b-080069138b88" uid="15925"/>
+      </subcategory>
+      <subcategory value="2" description="Clemenceau class (CV)" uuid="e119b832-5269-11df-8a64-080069138b88" uid="15926">
+        <specific value="1" description="R 98 Clemenceau" uuid="e11ac7ae-5269-11df-9b6b-080069138b88" uid="15927"/>
+        <specific value="2" description="R 99 Foch" uuid="e11bd2a2-5269-11df-81f1-080069138b88" uid="15928"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Guided Missile Destroyer (Fregates or Escorteurs D'escadres)" uuid="e11e2886-5269-11df-a28a-080069138b88" uid="15929">
+      <subcategory value="1" description="Georges Leygues Class (Type f 70 (ASW))" uuid="e11f4662-5269-11df-ae3c-080069138b88" uid="15930">
+        <specific value="1" description="D 640 Georges Leygues" uuid="e1205df4-5269-11df-a824-080069138b88" uid="15931"/>
+        <specific value="2" description="D 641 Dupleix" uuid="e1216f0a-5269-11df-b421-080069138b88" uid="15932"/>
+        <specific value="3" description="D 642 Montcalm" uuid="e12279d6-5269-11df-8288-080069138b88" uid="15933"/>
+        <specific value="4" description="D 643 Jean de vienne" uuid="e1238c72-5269-11df-883b-080069138b88" uid="15934"/>
+        <specific value="5" description="D 644 Primauguet" uuid="e1249ec8-5269-11df-ab00-080069138b88" uid="15935"/>
+        <specific value="6" description="D 645 La motte-picquet" uuid="e125a962-5269-11df-bcbb-080069138b88" uid="15936"/>
+        <specific value="7" description="D 646 Latouche-treville" uuid="e126bbf4-5269-11df-a5b5-080069138b88" uid="15937"/>
+      </subcategory>
+      <subcategory value="2" description="Cassard class (Type F 70 (A/A))" uuid="e1286ff8-5269-11df-b475-080069138b88" uid="15938">
+        <specific value="1" description="D 614 Cassard" uuid="e1297f60-5269-11df-9203-080069138b88" uid="15939"/>
+        <specific value="2" description="D 615 Jean Bart" uuid="e12a8914-5269-11df-96ea-080069138b88" uid="15940"/>
+      </subcategory>
+      <subcategory value="3" description="Suffren class" uuid="e12c3c78-5269-11df-acad-080069138b88" uid="15941">
+        <specific value="1" description="D 602 Suffren" uuid="e12d4a28-5269-11df-afa7-080069138b88" uid="15942"/>
+        <specific value="2" description="D 603 Duquesne" uuid="e12e5b48-5269-11df-a942-080069138b88" uid="15943"/>
+      </subcategory>
+      <subcategory value="4" description="Tourville class (Type F 67)" uuid="e13018a2-5269-11df-ba87-080069138b88" uid="15944">
+        <specific value="1" description="D 610 Tourville" uuid="e1312396-5269-11df-8cf9-080069138b88" uid="15945"/>
+        <specific value="2" description="D 611 Duguay-Trouin" uuid="e1323380-5269-11df-b167-080069138b88" uid="15946"/>
+        <specific value="3" description="D 612 De grasse" uuid="e13345ea-5269-11df-9e2e-080069138b88" uid="15947"/>
+      </subcategory>
+      <subcategory value="5" description="Type F 65 (ASW)" uuid="e134fa7a-5269-11df-a4dc-080069138b88" uid="15948">
+        <specific value="1" description="D 609 Aconit (ex-F 703)" uuid="e1360456-5269-11df-9c43-080069138b88" uid="15949"/>
+      </subcategory>
+      <subcategory value="6" description="Forbin (Horizon) Class" status="new" uuid="8d5bc0f5-95a0-47d2-9229-31e805f2360d" uid="22711">
+        <cr value="1620"/>
+        <specific value="1" description="D620 Forbin" status="new" uuid="42196b9f-b8ad-4147-a7dc-696941735b37" uid="22712">
+          <cr value="1620"/>
+        </specific>
+        <specific value="2" description="D620 Chevalier Paul" status="new" uuid="c63ba4b5-0970-4c81-a6c4-1e8d0d37b0d6" uid="22713">
+          <cr value="1620"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided-missile Frigate" uuid="e1385cd8-5269-11df-afa3-080069138b88" uid="15950">
+      <subcategory value="1" description="La Fayette class (light frigates)" uuid="e13966b4-5269-11df-985b-080069138b88" uid="15951">
+        <specific value="1" description="F 710 Lafayette" uuid="e13a786a-5269-11df-a88a-080069138b88" uid="15952"/>
+        <specific value="2" description="F 711 Surcouf" uuid="e13b8c32-5269-11df-ab51-080069138b88" uid="15953"/>
+        <specific value="3" description="F 712 Courbet" uuid="e13c962c-5269-11df-9a31-080069138b88" uid="15954"/>
+      </subcategory>
+      <subcategory value="2" description="Floreal class (patrol frigates)" uuid="e13e46fc-5269-11df-be7e-080069138b88" uid="15955">
+        <specific value="1" description="F 730 Floreal" uuid="e13f586c-5269-11df-9e3c-080069138b88" uid="15956"/>
+        <specific value="2" description="F 731 Prairial" uuid="e1406c20-5269-11df-95e7-080069138b88" uid="15957"/>
+        <specific value="3" description="F 732 Nivose" uuid="e1417570-5269-11df-8345-080069138b88" uid="15958"/>
+        <specific value="4" description="F 733 Ventose" uuid="e142858c-5269-11df-ba72-080069138b88" uid="15959"/>
+        <specific value="5" description="F 734 Vendemiaire" uuid="e14398aa-5269-11df-bf72-080069138b88" uid="15960"/>
+        <specific value="6" description="F 735 Germinal" uuid="e144a420-5269-11df-9b1b-080069138b88" uid="15961"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/patrol craft" uuid="e146fd74-5269-11df-872d-080069138b88" uid="15962">
+      <subcategory value="1" description="P 400 class (fast attack craft--patrol)" uuid="e14806ec-5269-11df-a8aa-080069138b88" uid="15963">
+        <specific value="1" description="P 682 L'audacieuse" uuid="e1491910-5269-11df-8845-080069138b88" uid="15964"/>
+        <specific value="2" description="P 683 La boudeuse" uuid="e14a2c92-5269-11df-8b1c-080069138b88" uid="15965"/>
+        <specific value="3" description="P 684 La capricieuse" uuid="e14b35e2-5269-11df-88e4-080069138b88" uid="15966"/>
+        <specific value="4" description="P 685 La fougueuse" uuid="e14c45b8-5269-11df-aad0-080069138b88" uid="15967"/>
+        <specific value="5" description="P 686 La glorieuse" uuid="e14d62cc-5269-11df-85f9-080069138b88" uid="15968"/>
+        <specific value="6" description="P 687 La gracieuse" uuid="e14e6e7e-5269-11df-b45c-080069138b88" uid="15969"/>
+        <specific value="7" description="P 688 La moqueuse" uuid="e14f7e7c-5269-11df-ba3e-080069138b88" uid="15970"/>
+        <specific value="8" description="P 689 La railleuse" uuid="e150910e-5269-11df-bfbe-080069138b88" uid="15971"/>
+        <specific value="9" description="P 690 La rieuse" uuid="e151a0c6-5269-11df-8b7e-080069138b88" uid="15972"/>
+        <specific value="10" description="P 691 La tapageuse" uuid="e152b222-5269-11df-aa12-080069138b88" uid="15973"/>
+        <specific value="11" description="B1 AI Bushra (OMAN)" uuid="e153c20c-5269-11df-8c61-080069138b88" uid="15974"/>
+      </subcategory>
+      <subcategory value="2" description="Thomson-CSF Type (large patrol craft)" uuid="e1557692-5269-11df-acd9-080069138b88" uid="15975">
+        <specific value="1" description="P 696 Iris" uuid="e156824e-5269-11df-aee4-080069138b88" uid="15976"/>
+      </subcategory>
+      <subcategory value="3" description="Combattante IIG Class" uuid="e1583382-5269-11df-92bc-080069138b88" uid="15977"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship / Craft" uuid="e159f244-5269-11df-858d-080069138b88" uid="15978">
+      <subcategory value="1" description="Narvik class (minehunter/sweeper)" uuid="e15b029c-5269-11df-925b-080069138b88" uid="15979">
+        <specific value="1" description="M 660 Narvik" uuid="e15c1592-5269-11df-8a26-080069138b88" uid="15980"/>
+        <specific value="2" description="Bir Hakeim" uuid="e15d246e-5269-11df-ae8b-080069138b88" uid="15981"/>
+        <specific value="3" description="Garigliano" uuid="e15e3462-5269-11df-96ea-080069138b88" uid="15982"/>
+        <specific value="4" description="Autun" uuid="e15f429e-5269-11df-9cdb-080069138b88" uid="15983"/>
+        <specific value="5" description="Colmar" uuid="e1604cb6-5269-11df-9a4d-080069138b88" uid="15984"/>
+        <specific value="6" description="Berlaimont" uuid="e1615ffc-5269-11df-9b88-080069138b88" uid="15985"/>
+      </subcategory>
+      <subcategory value="2" description="Eridan (Tripartite) class (minehunters)" uuid="e1631108-5269-11df-bed0-080069138b88" uid="15986">
+        <specific value="1" description="M 641 Eridan" uuid="e164205c-5269-11df-8938-080069138b88" uid="15987"/>
+        <specific value="2" description="M 642 Cassiopee" uuid="e1652f74-5269-11df-8571-080069138b88" uid="15988"/>
+        <specific value="3" description="M 643 Andromede" uuid="e1663efa-5269-11df-82a4-080069138b88" uid="15989"/>
+        <specific value="4" description="M 644 Pegase" uuid="e1674d7c-5269-11df-956d-080069138b88" uid="15990"/>
+        <specific value="5" description="M 645 Orion" uuid="e1685afa-5269-11df-bce9-080069138b88" uid="15991"/>
+        <specific value="6" description="M 646 Croix du sud" uuid="e16969fe-5269-11df-9a42-080069138b88" uid="15992"/>
+        <specific value="7" description="M 647 Aigle" uuid="e16a79f2-5269-11df-a1b3-080069138b88" uid="15993"/>
+        <specific value="8" description="M 648 Lyre" uuid="e16b81ee-5269-11df-86a0-080069138b88" uid="15994"/>
+        <specific value="9" description="M 649 Persee" uuid="e16c9f8e-5269-11df-ae10-080069138b88" uid="15995"/>
+      </subcategory>
+      <subcategory value="3" description="Circe class (minehunters)" uuid="e16e500e-5269-11df-a5b5-080069138b88" uid="15996">
+        <specific value="1" description="M 712 Cybele" uuid="e16f639a-5269-11df-9ee6-080069138b88" uid="15997"/>
+        <specific value="2" description="M 713 Calliope" uuid="e1706cc2-5269-11df-b2c7-080069138b88" uid="15998"/>
+        <specific value="3" description="M 714 Clio" uuid="e1717d56-5269-11df-ad4d-080069138b88" uid="15999"/>
+        <specific value="4" description="M 715 Circe" uuid="e1728f20-5269-11df-a13d-080069138b88" uid="16000"/>
+        <specific value="5" description="M 716 Ceres" uuid="e1739cd0-5269-11df-813d-080069138b88" uid="16001"/>
+      </subcategory>
+      <subcategory value="4" description="ex-US Aggressive class (minesweepers)" uuid="e1754c56-5269-11df-a895-080069138b88" uid="16002">
+        <specific value="1" description="M 610 Ouistreham (ex-MSO 513)" uuid="e1765e98-5269-11df-a54f-080069138b88" uid="16003"/>
+        <specific value="2" description="M 612 Alencon (ex-MSO 453)" uuid="e1777364-5269-11df-b93b-080069138b88" uid="16004"/>
+        <specific value="3" description="M 623 Baccarat (ex-MSO 505)" uuid="e1787f8e-5269-11df-84e5-080069138b88" uid="16005"/>
+      </subcategory>
+      <subcategory value="5" description="MCM diving support ships" uuid="e17a2e7e-5269-11df-95e0-080069138b88" uid="16006">
+        <specific value="1" description="A 613 Acheron" uuid="e17b423c-5269-11df-b6bf-080069138b88" uid="16007"/>
+        <specific value="2" description="M 611 Vulcain" uuid="e17c526c-5269-11df-a3a3-080069138b88" uid="16008"/>
+        <specific value="3" description="M 614 Styx" uuid="e17d5c2a-5269-11df-8eef-080069138b88" uid="16009"/>
+        <specific value="4" description="M 622 Pluton" uuid="e17e6eee-5269-11df-9f6f-080069138b88" uid="16010"/>
+      </subcategory>
+    </category>
+    <category value="9" description="Dock Landing Ship" uuid="e180bc3a-5269-11df-b4c5-080069138b88" uid="16011">
+      <subcategory value="1" description="Foudre class (Type TCD 90)" uuid="e181cf58-5269-11df-9586-080069138b88" uid="16012">
+        <specific value="1" description="L 9011 Foudre" uuid="e182e014-5269-11df-9b81-080069138b88" uid="16013"/>
+      </subcategory>
+      <subcategory value="2" description="Ouragan class (TCDs)" uuid="e1848cc0-5269-11df-ae80-080069138b88" uid="16014">
+        <specific value="1" description="L 9021 Ouragan" uuid="e1859fca-5269-11df-8f0d-080069138b88" uid="16015"/>
+        <specific value="2" description="L 9022 Orage" uuid="e186aa5a-5269-11df-ae09-080069138b88" uid="16016"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="e188fe36-5269-11df-8b62-080069138b88" uid="16017">
+      <subcategory value="1" description="Bougainville class (BTs)" uuid="e18a0a9c-5269-11df-966b-080069138b88" uid="16018">
+        <specific value="1" description="L 9077 Bougainville" uuid="e18b2562-5269-11df-ac1d-080069138b88" uid="16019"/>
+      </subcategory>
+      <subcategory value="2" description="Batral type (light transports and landing ships)" uuid="e18cda74-5269-11df-a1af-080069138b88" uid="16020">
+        <specific value="1" description="L 9030 Champlain" uuid="e18dec66-5269-11df-b655-080069138b88" uid="16021"/>
+        <specific value="2" description="L 9031 Francis Garnier" uuid="e18ef674-5269-11df-aaf1-080069138b88" uid="16022"/>
+        <specific value="3" description="L 9032 Dumont D'urville" uuid="e1900a32-5269-11df-804f-080069138b88" uid="16023"/>
+        <specific value="4" description="L 9033 Jacques Cartier" uuid="e1911c10-5269-11df-8e73-080069138b88" uid="16024"/>
+        <specific value="5" description="L 9034 La grandiere" uuid="e1922772-5269-11df-9351-080069138b88" uid="16025"/>
+      </subcategory>
+      <subcategory value="3" description="Edic 700 class (LCT)" uuid="e193da18-5269-11df-86b4-080069138b88" uid="16026">
+        <specific value="1" description="L 9051" uuid="e194ea20-5269-11df-aa43-080069138b88" uid="16027"/>
+        <specific value="2" description="L 9052" uuid="e195f9e2-5269-11df-8424-080069138b88" uid="16028"/>
+      </subcategory>
+      <subcategory value="4" description="Edic class (LCT)" uuid="e197ab98-5269-11df-bb9e-080069138b88" uid="16029">
+        <specific value="1" description="L 9070" uuid="e198b98e-5269-11df-82a4-080069138b88" uid="16030"/>
+        <specific value="2" description="L 9072" uuid="e199c82e-5269-11df-99c3-080069138b88" uid="16031"/>
+        <specific value="3" description="L 9074" uuid="e19ad714-5269-11df-9434-080069138b88" uid="16032"/>
+      </subcategory>
+      <subcategory value="5" description="CDIC class (LCT)" uuid="e19c897e-5269-11df-83e8-080069138b88" uid="16033">
+        <specific value="1" description="L 9061" uuid="e19d9206-5269-11df-af70-080069138b88" uid="16034"/>
+        <specific value="2" description="L 9062" uuid="e19ea31c-5269-11df-b1dd-080069138b88" uid="16035"/>
+      </subcategory>
+      <subcategory value="6" description="Transport landing ship" uuid="e1a05234-5269-11df-a9a4-080069138b88" uid="16036">
+        <specific value="1" description="L 9090 Gapeau" uuid="e1a16412-5269-11df-9ddd-080069138b88" uid="16037"/>
+      </subcategory>
+    </category>
+    <category value="13" description="Cruiser/Helicopter Carrier" uuid="e1a3b1a4-5269-11df-93e7-080069138b88" uid="16038">
+      <subcategory value="1" description="Jeanne D'Arc Class (Helo CV)" uuid="e1a4c5f8-5269-11df-95de-080069138b88" uid="16039"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="e1a67588-5269-11df-91be-080069138b88" uid="16040">
+      <subcategory value="1" description="BH2 class (Batiments Hydrographiques De 2E class) (oceanographic &amp; survey)" uuid="e1a781c6-5269-11df-a185-080069138b88" uid="16041">
+        <specific value="1" description="A 791 Laperouse" uuid="e1a894da-5269-11df-b5f3-080069138b88" uid="16042"/>
+        <specific value="2" description="A 792 Borda" uuid="e1a9b0cc-5269-11df-9dd8-080069138b88" uid="16043"/>
+        <specific value="3" description="A 793 Laplace" uuid="e1aabba2-5269-11df-937b-080069138b88" uid="16044"/>
+        <specific value="4" description="A 795 Arago" uuid="e1abcb6e-5269-11df-8424-080069138b88" uid="16045"/>
+      </subcategory>
+      <subcategory value="2" description="Durance class (underway replenishment tankers)" uuid="e1ad7eb4-5269-11df-be3d-080069138b88" uid="16046">
+        <specific value="1" description="A 607 Meuse" uuid="e1ae9024-5269-11df-b46d-080069138b88" uid="16047"/>
+        <specific value="2" description="A 608 Var" uuid="e1af9d98-5269-11df-9f9d-080069138b88" uid="16048"/>
+        <specific value="3" description="A 629 Durance" uuid="e1b0ae86-5269-11df-a49f-080069138b88" uid="16049"/>
+        <specific value="4" description="A 630 Marne" uuid="e1b1bd80-5269-11df-acab-080069138b88" uid="16050"/>
+        <specific value="5" description="A 631 Somme" uuid="e1b2c77a-5269-11df-9cae-080069138b88" uid="16051"/>
+      </subcategory>
+      <subcategory value="3" description="Maintenance and repair ship" uuid="e1b47bf6-5269-11df-8a83-080069138b88" uid="16052">
+        <specific value="1" description="A 620 Jules Verne (ex-Acheron)" uuid="e1b58d5c-5269-11df-88f3-080069138b88" uid="16053"/>
+      </subcategory>
+      <subcategory value="4" description="Rhin class (depot and support ships)" uuid="e1b74692-5269-11df-98ee-080069138b88" uid="16054">
+        <specific value="1" description="A 615 Loire" uuid="e1b85672-5269-11df-860e-080069138b88" uid="16055"/>
+        <specific value="2" description="A 617 Garonne" uuid="e1b961de-5269-11df-8406-080069138b88" uid="16056"/>
+        <specific value="3" description="A 618 Rance" uuid="e1ba7286-5269-11df-ac08-080069138b88" uid="16057"/>
+        <specific value="4" description="A 621 Rhin" uuid="e1bb90da-5269-11df-9849-080069138b88" uid="16058"/>
+        <specific value="5" description="A 622 Rhone" uuid="e1bc9b38-5269-11df-8f3a-080069138b88" uid="16059"/>
+      </subcategory>
+      <subcategory value="5" description="Chamois class (supply tenders)" uuid="e1be509a-5269-11df-8b4f-080069138b88" uid="16060">
+        <specific value="1" description="A 633 Taape" uuid="e1bf619c-5269-11df-b8e1-080069138b88" uid="16061"/>
+        <specific value="2" description="A 767 Chamois" uuid="e1c07352-5269-11df-b265-080069138b88" uid="16062"/>
+        <specific value="3" description="A 768 Elan" uuid="e1c17c34-5269-11df-9670-080069138b88" uid="16063"/>
+        <specific value="4" description="A 774 Chevreuil" uuid="e1c28df4-5269-11df-a91c-080069138b88" uid="16064"/>
+        <specific value="5" description="A 775 Gazelle" uuid="e1c3a22a-5269-11df-a0c0-080069138b88" uid="16065"/>
+        <specific value="6" description="A 776 Isard" uuid="e1c4ab0c-5269-11df-99b0-080069138b88" uid="16066"/>
+        <specific value="7" description="A 779 Tapatai (ex-Silver Fish)" uuid="e1c5bbbe-5269-11df-a0b9-080069138b88" uid="16067"/>
+      </subcategory>
+      <subcategory value="6" description="RR 4000 type (supply tenders)" uuid="e1c76e82-5269-11df-82b0-080069138b88" uid="16068">
+        <specific value="1" description="A 634 Rari" uuid="e1c88bbe-5269-11df-9a68-080069138b88" uid="16069"/>
+        <specific value="2" description="A 635 Revi" uuid="e1c99766-5269-11df-a35e-080069138b88" uid="16070"/>
+      </subcategory>
+      <subcategory value="7" description="Leopard class (training ships)" uuid="e1cb473c-5269-11df-842b-080069138b88" uid="16071">
+        <specific value="1" description="A 748 Leopard" uuid="e1cc5924-5269-11df-8abe-080069138b88" uid="16072"/>
+        <specific value="2" description="A 749 Panthere" uuid="e1cd6c7e-5269-11df-8ddf-080069138b88" uid="16073"/>
+        <specific value="3" description="A 750 Jaguar" uuid="e1ce75c4-5269-11df-99a3-080069138b88" uid="16074"/>
+        <specific value="4" description="A 751 Lynx" uuid="e1cf85e0-5269-11df-8035-080069138b88" uid="16075"/>
+        <specific value="5" description="A 752 Guepard" uuid="e1d09840-5269-11df-9f57-080069138b88" uid="16076"/>
+        <specific value="6" description="A 753 Chacal" uuid="e1d1a3de-5269-11df-9175-080069138b88" uid="16077"/>
+        <specific value="7" description="A 754 Tigre" uuid="e1d2b30a-5269-11df-8e62-080069138b88" uid="16078"/>
+        <specific value="8" description="A 755 Lion" uuid="e1d3c63c-5269-11df-b5f6-080069138b88" uid="16079"/>
+      </subcategory>
+    </category>
+    <category value="17" description="Auxiliary, Merchant Marine" uuid="e1d6150e-5269-11df-a026-080069138b88" uid="16080">
+      <subcategory value="1" description="Government Maritime Forces" uuid="e1d728e0-5269-11df-a407-080069138b88" uid="16081">
+        <specific value="1" description="Patra Class (fast patrol craft)" uuid="e1d83280-5269-11df-92c9-080069138b88" uid="16082">
+          <extra value="1" description="P 670 Trident" uuid="e1d94742-5269-11df-a420-080069138b88" uid="16083"/>
+          <extra value="2" description="P 671 Glaive" uuid="e1da58ee-5269-11df-b99d-080069138b88" uid="16084"/>
+          <extra value="3" description="P 672 Epee" uuid="e1db63e2-5269-11df-b08d-080069138b88" uid="16085"/>
+          <extra value="4" description="P 673 Pertuisane" uuid="e1dc71ba-5269-11df-baab-080069138b88" uid="16086"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="Harbour tugs (Remorqueurs De Port)" uuid="e1dec47e-5269-11df-80f3-080069138b88" uid="16087">
+        <specific value="1" description="105-ton type" uuid="e1dfd724-5269-11df-b926-080069138b88" uid="16088">
+          <extra value="1" description="Y 601 Acajou" uuid="e1e0e7ea-5269-11df-bc56-080069138b88" uid="16089"/>
+          <extra value="2" description="Y 620 Chataigner" uuid="e1e1fa40-5269-11df-9555-080069138b88" uid="16090"/>
+          <extra value="3" description="Y 623 Charme" uuid="e1e304bc-5269-11df-a1c8-080069138b88" uid="16091"/>
+          <extra value="4" description="Y 624 Chene" uuid="e1e412bc-5269-11df-b100-080069138b88" uid="16092"/>
+          <extra value="5" description="Y 629 Cormier" uuid="e1e52594-5269-11df-a6dc-080069138b88" uid="16093"/>
+          <extra value="6" description="Y 644 Frene" uuid="e1e62d54-5269-11df-9b3e-080069138b88" uid="16094"/>
+          <extra value="7" description="Y 654 Hetre" uuid="e1e74770-5269-11df-8909-080069138b88" uid="16095"/>
+          <extra value="8" description="Y 655 Hevea" uuid="e1e8593a-5269-11df-902e-080069138b88" uid="16096"/>
+          <extra value="9" description="Y 663 Latanier" uuid="e1e96410-5269-11df-9a74-080069138b88" uid="16097"/>
+          <extra value="10" description="Y 666 Manguier" uuid="e1ea72c4-5269-11df-83ea-080069138b88" uid="16098"/>
+          <extra value="11" description="Y 668 Meleze" uuid="e1eb8222-5269-11df-b6c7-080069138b88" uid="16099"/>
+          <extra value="12" description="Y 669 Merisier" uuid="e1ec902c-5269-11df-acfa-080069138b88" uid="16100"/>
+          <extra value="13" description="Y 686 Paletuvier" uuid="e1ed9f30-5269-11df-9cd3-080069138b88" uid="16101"/>
+          <extra value="14" description="Y 688 Peuplier" uuid="e1eeae98-5269-11df-a956-080069138b88" uid="16102"/>
+          <extra value="15" description="Y 689 Pin" uuid="e1efbcf2-5269-11df-b64a-080069138b88" uid="16103"/>
+          <extra value="16" description="Y 695 Platane" uuid="e1f0cb9c-5269-11df-a42f-080069138b88" uid="16104"/>
+          <extra value="17" description="Y 708 Saule" uuid="e1f1da46-5269-11df-b634-080069138b88" uid="16105"/>
+          <extra value="18" description="Y 709 Sycomore" uuid="e1f2e3b4-5269-11df-acf9-080069138b88" uid="16106"/>
+          <extra value="19" description="Y 717 Ebene" uuid="e1f3f61e-5269-11df-ba06-080069138b88" uid="16107"/>
+          <extra value="20" description="Y 718 Erable" uuid="e1f50522-5269-11df-8cbc-080069138b88" uid="16108"/>
+          <extra value="21" description="Y 719 Olivier" uuid="e1f60e18-5269-11df-a618-080069138b88" uid="16109"/>
+          <extra value="22" description="Y 720 Santal" uuid="e1f721c2-5269-11df-be22-080069138b88" uid="16110"/>
+          <extra value="23" description="Y 738 Maronnier" uuid="e1f830c6-5269-11df-80fe-080069138b88" uid="16111"/>
+          <extra value="24" description="Y 739 Noyer" uuid="e1f93bd8-5269-11df-ac5b-080069138b88" uid="16112"/>
+          <extra value="25" description="Y 740 Papayer" uuid="e1fa4a50-5269-11df-b44c-080069138b88" uid="16113"/>
+        </specific>
+        <specific value="2" description="93-ton type" uuid="e1fbfcb0-5269-11df-a949-080069138b88" uid="16114">
+          <extra value="1" description="Y 630 Bonite" uuid="e1fd0a9c-5269-11df-9029-080069138b88" uid="16115"/>
+          <extra value="2" description="Y 634 Rouget" uuid="e1fe14aa-5269-11df-b241-080069138b88" uid="16116"/>
+        </specific>
+        <specific value="3" description="65-ton type" uuid="e1ffc76e-5269-11df-be84-080069138b88" uid="16117">
+          <extra value="1" description="Y 611 Bengali" uuid="e200d6ae-5269-11df-b0ef-080069138b88" uid="16118"/>
+          <extra value="2" description="Y 617 Mouette" uuid="e201e67a-5269-11df-8432-080069138b88" uid="16119"/>
+          <extra value="3" description="Y 621 Mesange" uuid="e202f04c-5269-11df-b585-080069138b88" uid="16120"/>
+          <extra value="4" description="Y 625 Cigogne" uuid="e204037e-5269-11df-a1e8-080069138b88" uid="16121"/>
+          <extra value="5" description="Y 628 Colibri" uuid="e2051296-5269-11df-be5f-080069138b88" uid="16122"/>
+          <extra value="6" description="Y 632 Cygne" uuid="e206258c-5269-11df-bfd1-080069138b88" uid="16123"/>
+          <extra value="7" description="Y 636 Martinet" uuid="e2073814-5269-11df-b550-080069138b88" uid="16124"/>
+          <extra value="8" description="Y 637 Fauvette" uuid="e2084754-5269-11df-952d-080069138b88" uid="16125"/>
+          <extra value="9" description="Y 648 Goeland" uuid="e2095298-5269-11df-b464-080069138b88" uid="16126"/>
+          <extra value="10" description="Y 670 Merle" uuid="e20a6336-5269-11df-b9bc-080069138b88" uid="16127"/>
+          <extra value="11" description="Y 673 Moineau" uuid="e20b7168-5269-11df-a207-080069138b88" uid="16128"/>
+          <extra value="12" description="Y 675 Martin Pecheur" uuid="e20c7efa-5269-11df-9ca7-080069138b88" uid="16129"/>
+          <extra value="13" description="Y 687 Passereau" uuid="e20d8de0-5269-11df-8e8f-080069138b88" uid="16130"/>
+          <extra value="14" description="Y 691 Pinson" uuid="e20e9faa-5269-11df-8595-080069138b88" uid="16131"/>
+          <extra value="15" description="Y 694 Pivert" uuid="e20fa9e0-5269-11df-b61f-080069138b88" uid="16132"/>
+          <extra value="16" description="Y 721 Alouette" uuid="e210bb64-5269-11df-b1e8-080069138b88" uid="16133"/>
+          <extra value="17" description="Y 722 Vanneau" uuid="e211ced2-5269-11df-96ba-080069138b88" uid="16134"/>
+          <extra value="18" description="Y 723 Engoulevent" uuid="e212d930-5269-11df-8564-080069138b88" uid="16135"/>
+          <extra value="19" description="Y 724 Sarcelle" uuid="e213e8a2-5269-11df-bcbf-080069138b88" uid="16136"/>
+          <extra value="20" description="Y 725 Marabout" uuid="e214f9ae-5269-11df-9867-080069138b88" uid="16137"/>
+          <extra value="21" description="Y 726 Toucan" uuid="e21605b0-5269-11df-b6d0-080069138b88" uid="16138"/>
+          <extra value="22" description="Y 727 Macreuse" uuid="e217143c-5269-11df-9ee8-080069138b88" uid="16139"/>
+          <extra value="23" description="Y 728 Grand Duc" uuid="e2182606-5269-11df-adff-080069138b88" uid="16140"/>
+          <extra value="24" description="Y 729 Eider" uuid="e21930f0-5269-11df-995a-080069138b88" uid="16141"/>
+          <extra value="25" description="Y 730 Ara" uuid="e21a438c-5269-11df-af29-080069138b88" uid="16142"/>
+          <extra value="26" description="Y 747 Loriot" uuid="e21b51aa-5269-11df-9d5d-080069138b88" uid="16143"/>
+          <extra value="27" description="Y 748 Gelinotte" uuid="e21c5c44-5269-11df-9212-080069138b88" uid="16144"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate" uuid="e21f51a6-5269-11df-8f2c-080069138b88" uid="16145">
+      <subcategory value="1" description="D'estienne D'orves (Type A 69) class" uuid="e2206064-5269-11df-bd51-080069138b88" uid="16146">
+        <specific value="1" description="F 781 D'estienne D'orves" uuid="e2216fae-5269-11df-964c-080069138b88" uid="16147"/>
+        <specific value="2" description="F 782 Amyot d'inville" uuid="e2228010-5269-11df-8454-080069138b88" uid="16148"/>
+        <specific value="3" description="F 783 Drogou" uuid="e223943c-5269-11df-8ae5-080069138b88" uid="16149"/>
+        <specific value="4" description="F 784 Detroyat" uuid="e224a9bc-5269-11df-97eb-080069138b88" uid="16150"/>
+        <specific value="5" description="F 785 Jean Moulin" uuid="e225b96a-5269-11df-bcbf-080069138b88" uid="16151"/>
+        <specific value="6" description="F 786 Quartier Maitre Anquetil" uuid="e226cb48-5269-11df-9011-080069138b88" uid="16152"/>
+        <specific value="7" description="F 787 Commandant de Pimodan" uuid="e227d8c6-5269-11df-a6fd-080069138b88" uid="16153"/>
+        <specific value="8" description="F 788 Second Maitre Le Bihan" uuid="e228ed88-5269-11df-80d4-080069138b88" uid="16154"/>
+        <specific value="9" description="F 789 Lieutenant De Vaisseau Le Henaff" uuid="e229fdea-5269-11df-9e36-080069138b88" uid="16155"/>
+        <specific value="10" description="F 790 Lieutenant De Vaisseau Lavallee" uuid="e22b0b68-5269-11df-924f-080069138b88" uid="16156"/>
+        <specific value="11" description="F 791 Commandant L'herminier" uuid="e22c20f2-5269-11df-bb80-080069138b88" uid="16157"/>
+        <specific value="12" description="F 792 Premier Maitre L'her" uuid="e22d3226-5269-11df-93cd-080069138b88" uid="16158"/>
+        <specific value="13" description="F 793 Commandant Blaison" uuid="e22e3cca-5269-11df-8b2b-080069138b88" uid="16159"/>
+        <specific value="14" description="F 794 Enseigne De Vaisseau Jacoubet" uuid="e22f4e26-5269-11df-8fbd-080069138b88" uid="16160"/>
+        <specific value="15" description="F 795 Commandant Ducuing" uuid="e23064aa-5269-11df-a3b7-080069138b88" uid="16161"/>
+        <specific value="16" description="F 796 Commandant Birot" uuid="e2317052-5269-11df-9486-080069138b88" uid="16162"/>
+        <specific value="17" description="F 797 Commandant Bouan" uuid="e2327fec-5269-11df-92da-080069138b88" uid="16163"/>
+      </subcategory>
+      <subcategory value="2" description="Commandant Riviere class (Avisos Escorteurs)" uuid="e23433b4-5269-11df-8c3f-080069138b88" uid="16164">
+        <specific value="1" description="F 726 Commandant Bory" uuid="e2354948-5269-11df-9429-080069138b88" uid="16165"/>
+        <specific value="2" description="F 729 Balny" uuid="e23653a6-5269-11df-a4b6-080069138b88" uid="16166"/>
+        <specific value="3" description="F 749 Enseigne de Vaisseau Henry" uuid="e23762c8-5269-11df-ad69-080069138b88" uid="16167"/>
+      </subcategory>
+    </category>
+    <category value="54" description="Amphibious Assault Ship" status="new" uuid="1ef58b6e-d93a-49cf-b3d5-97d0612f27cc" uid="22707">
+      <cr value="1619"/>
+      <subcategory value="1" description="Mistral class" status="new" uuid="72d90f84-3e3f-4319-b9be-2bc2028e3bd4" uid="22708">
+        <cr value="1619"/>
+        <specific value="1" description="L9013 Mistral" status="new" uuid="5a0888ed-01f6-4555-8a7e-2a519dee820a" uid="22709">
+          <cr value="1619"/>
+        </specific>
+        <specific value="2" description="L9014 Tonnerre" status="new" uuid="a6f0ffef-ed75-414e-a6ea-ffe3e4483157" uid="22710">
+          <cr value="1619"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="e239c2a2-5269-11df-8c9a-080069138b88" uid="16168">
+      <subcategory value="1" description="Container class" uuid="e23ad20a-5269-11df-80aa-080069138b88" uid="16169">
+        <specific value="1" description="Descrates" uuid="e23be19a-5269-11df-aaff-080069138b88" uid="16170"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker class" uuid="e23d951c-5269-11df-856c-080069138b88" uid="16171">
+        <specific value="1" description="Athos" uuid="e23ea2fe-5269-11df-99e4-080069138b88" uid="16172"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="71" uuid="e24192ca-5269-11df-8179-080069138b88" uid="16173">
+    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="e242a8ae-5269-11df-8d0c-080069138b88" uid="16174">
+      <subcategory value="1" description="Le Triomphant class (SNLE-NG)" uuid="e243bbae-5269-11df-97f4-080069138b88" uid="16175">
+        <specific value="1" description="S 616 Le Triomphant" uuid="e244d0fc-5269-11df-9023-080069138b88" uid="16176" status="new">
+          <cr value="1654"/>
+        </specific>
+        <specific value="2" description="S 617 Le Temeraire" uuid="e245dc54-5269-11df-b737-080069138b88" uid="16177" status="new">
+          <cr value="1654"/>
+        </specific>
+        <specific value="3" description="S 618 Le Vigilant" uuid="e246ecf2-5269-11df-a1ee-080069138b88" uid="16178" status="new">
+          <cr value="1654"/>
+        </specific>
+        <specific value="4" description="S 619 Le Terrible" status="new" uuid="f5a9d0bf-7c60-42fa-ad30-e646415c393b" uid="22797">
+          <cr value="1654"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="2" description="SSGN (Nuclear Guided Missile)" uuid="e2493fa2-5269-11df-9dc1-080069138b88" uid="16179">
+      <subcategory value="1" description="L'inflexible class (SNLE)" uuid="e24a4f1e-5269-11df-8288-080069138b88" uid="16180">
+        <specific value="1" description="S 610 Le foudroyant" uuid="e24b63cc-5269-11df-b5eb-080069138b88" uid="16181"/>
+        <specific value="2" description="S 612 Le terrible" uuid="e24c741a-5269-11df-a027-080069138b88" uid="16182"/>
+        <specific value="3" description="S 613 L'indomptable" uuid="e24d80bc-5269-11df-a674-080069138b88" uid="16183"/>
+        <specific value="4" description="S 614 Le tonnant" uuid="e24e9362-5269-11df-8f40-080069138b88" uid="16184"/>
+        <specific value="5" description="S 615 L'inflexible" uuid="e24faf86-5269-11df-9595-080069138b88" uid="16185"/>
+      </subcategory>
+    </category>
+    <category value="3" description="SSN (Nuclear Attack Ballistic Missile) (Sous-Marins Nucleaires D'attaque (SNA))" uuid="e2520948-5269-11df-9fb3-080069138b88" uid="16186">
+      <subcategory value="1" description="Rubis Class (SNA 72)" uuid="e2531d60-5269-11df-8570-080069138b88" uid="16187">
+        <specific value="1" description="S 601 Rubis" uuid="e25426ec-5269-11df-845b-080069138b88" uid="16188"/>
+        <specific value="2" description="S 602 Saphir" uuid="e2553a1e-5269-11df-94eb-080069138b88" uid="16189"/>
+        <specific value="3" description="S 603 Casabianca" uuid="e2564af8-5269-11df-bfa8-080069138b88" uid="16190"/>
+        <specific value="4" description="S 604 Emeraude" uuid="e2575542-5269-11df-bb3a-080069138b88" uid="16191"/>
+        <specific value="5" description="S 605 Amethyste" uuid="e258648c-5269-11df-a44c-080069138b88" uid="16192"/>
+        <specific value="6" description="S 606 Perle" uuid="e259778c-5269-11df-bd24-080069138b88" uid="16193"/>
+        <specific value="7" description="S 607 Turquoise" uuid="e25a8208-5269-11df-b5df-080069138b88" uid="16194"/>
+      </subcategory>
+    </category>
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol) (Sous-Marins D'attaque)" uuid="e25cd936-5269-11df-8d11-080069138b88" uid="16195">
+      <subcategory value="1" description="Agosta Class" uuid="e25de7ae-5269-11df-b54d-080069138b88" uid="16196">
+        <specific value="1" description="S 620 Agosta" uuid="e25ef752-5269-11df-a9e5-080069138b88" uid="16197"/>
+        <specific value="2" description="S 621 Beveziers" uuid="e26008cc-5269-11df-8ea4-080069138b88" uid="16198"/>
+        <specific value="3" description="S 622 La praya" uuid="e2611d84-5269-11df-b8db-080069138b88" uid="16199"/>
+        <specific value="4" description="S 623 Ouessant" uuid="e2623002-5269-11df-a309-080069138b88" uid="16200"/>
+      </subcategory>
+      <subcategory value="2" description="Daphne Class" uuid="e263df9c-5269-11df-b45f-080069138b88" uid="16201">
+        <specific value="1" description="S 643 Doris" uuid="e264f314-5269-11df-82c1-080069138b88" uid="16202"/>
+        <specific value="2" description="S 648 Jun" uuid="e265fdae-5269-11df-9437-080069138b88" uid="16203"/>
+        <specific value="3" description="S 650 Psyche" uuid="e2670c4e-5269-11df-9918-080069138b88" uid="16204"/>
+        <specific value="4" description="S 651 Sirene" uuid="e2681c9c-5269-11df-9150-080069138b88" uid="16205"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="71" uuid="e26b0dbc-5269-11df-a887-080069138b88" uid="16206">
+    <category value="0" description="Other" uuid="e26c1fcc-5269-11df-8ce5-080069138b88" uid="16207"/>
+    <category value="1" description="Manned" uuid="e26d2f48-5269-11df-817c-080069138b88" uid="16208">
+      <subcategory value="6" description="Space Plane" uuid="e26e3cc6-5269-11df-beea-080069138b88" uid="16209">
+        <specific value="1" description="Hermes" uuid="e26f4a1c-5269-11df-b8a3-080069138b88" uid="16210"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Unmanned" uuid="e2719c72-5269-11df-a82f-080069138b88" uid="16211">
+      <subcategory value="1" description="Communication satellite" uuid="e272a5d6-5269-11df-9cd3-080069138b88" uid="16212">
+        <specific value="1" description="Telecom" uuid="e273ba0c-5269-11df-a84d-080069138b88" uid="16213"/>
+        <specific value="2" description="Hispasat" uuid="e274c910-5269-11df-b157-080069138b88" uid="16214"/>
+        <specific value="3" description="Eutelsat" uuid="e275d53a-5269-11df-84e4-080069138b88" uid="16215"/>
+        <specific value="4" description="Turksat" uuid="e276e4d4-5269-11df-acac-080069138b88" uid="16216"/>
+        <specific value="6" description="Argos" uuid="e277f5a4-5269-11df-b21f-080069138b88" uid="16217"/>
+        <specific value="7" description="S80/T" uuid="e278ffee-5269-11df-80b7-080069138b88" uid="16218"/>
+        <specific value="8" description="Arsene" uuid="e27a126c-5269-11df-a706-080069138b88" uid="16219"/>
+        <specific value="9" description="Syracuse" uuid="e27b215c-5269-11df-89f2-080069138b88" uid="16220"/>
+      </subcategory>
+      <subcategory value="2" description="Navigation satellite" uuid="e27cd254-5269-11df-9b68-080069138b88" uid="16221"/>
+      <subcategory value="4" description="Electronic Intelligence satellite" uuid="e27de18a-5269-11df-9af8-080069138b88" uid="16222">
+        <specific value="1" description="Cerise" uuid="e27ef318-5269-11df-b8d3-080069138b88" uid="16223"/>
+      </subcategory>
+      <subcategory value="7" description="Imaging Radar surveillance satellite" uuid="e280abcc-5269-11df-839d-080069138b88" uid="16224">
+        <specific value="1" description="Helios" uuid="e281c0e8-5269-11df-9c6c-080069138b88" uid="16225"/>
+        <specific value="2" description="Osiris SAR" uuid="e282cb5a-5269-11df-8c2e-080069138b88" uid="16226"/>
+      </subcategory>
+      <subcategory value="8" description="Optical imaging surveillance satellite" uuid="e2847e1e-5269-11df-8654-080069138b88" uid="16227">
+        <specific value="1" description="Syracuse 3" uuid="e2858dc2-5269-11df-8462-080069138b88" uid="16228"/>
+      </subcategory>
+      <subcategory value="13" description="Science satellite" uuid="e2873f1e-5269-11df-8a12-080069138b88" uid="16229">
+        <specific value="1" description="Hipparcos" uuid="e2885250-5269-11df-8afc-080069138b88" uid="16230"/>
+        <specific value="2" description="Titan" uuid="e28963e8-5269-11df-bb6b-080069138b88" uid="16231"/>
+        <specific value="3" description="Topex/Poseidon" uuid="e28a72f6-5269-11df-bf9b-080069138b88" uid="16232"/>
+        <specific value="4" description="Starlette" uuid="e28b861e-5269-11df-9982-080069138b88" uid="16233"/>
+        <specific value="5" description="SRAT 2" uuid="e28c94b4-5269-11df-8885-080069138b88" uid="16234"/>
+      </subcategory>
+      <subcategory value="14" description="Survey satellite" uuid="e28e4354-5269-11df-b2fb-080069138b88" uid="16235">
+        <specific value="1" description="Stella" uuid="e28f52d0-5269-11df-8b6c-080069138b88" uid="16236"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Booster" uuid="e291a440-5269-11df-a928-080069138b88" uid="16237">
+      <subcategory value="1" description="Ariane" uuid="e292b43e-5269-11df-9e4a-080069138b88" uid="16238"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="78" uuid="e2950c0c-5269-11df-9aea-080069138b88" uid="16239">
+    <category value="1" description="Tank" uuid="e2961444-5269-11df-9dc8-080069138b88" uid="16240">
+      <subcategory value="1" description="Leopard 1 MBT" uuid="e29721e0-5269-11df-95cf-080069138b88" uid="16241">
+        <specific value="1" description="A1" uuid="e2983620-5269-11df-a356-080069138b88" uid="16242"/>
+        <specific value="2" description="A2" uuid="e2993f48-5269-11df-8212-080069138b88" uid="16243"/>
+        <specific value="3" description="A3" uuid="e29a4f46-5269-11df-9cbd-080069138b88" uid="16244"/>
+        <specific value="4" description="A4" uuid="e29b6106-5269-11df-a427-080069138b88" uid="16245"/>
+        <specific value="5" description="A5" uuid="e29c6ed4-5269-11df-9565-080069138b88" uid="16246"/>
+        <specific value="6" description="Leopard 1 A5 Observer" status="new" uuid="e343f192-8fee-4d7d-bce0-4bfc051312d3" uid="22717">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="Leopard 2 MBT" uuid="e29e1d06-5269-11df-be72-080069138b88" uid="16247">
+        <specific value="1" description="Leopard 2 A1" status="new" uuid="f458a828-e4ad-4c44-b2b7-dd33fbc54fc8" uid="22718">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Leopard 2 A2" status="new" uuid="660757a1-79ec-4e7e-ad92-97ae4a8338e3" uid="22719">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Leopard 2 A3" status="new" uuid="3d41cc6b-a3e2-479b-afd4-a733d61319b7" uid="22720">
+          <cr value="1627"/>
+        </specific>
+        <specific value="4" description="Leopard 2 A4" status="new" uuid="17e6e863-19c1-4d4a-949f-94f8fd912af9" uid="22721">
+          <cr value="1627"/>
+        </specific>
+        <specific value="5" description="Leopard 2 A5" status="new" uuid="d0679ccc-8622-4ce9-b72a-f9d8ec563c4c" uid="22722">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="3" description="Leopard 2 (improved) MBT" uuid="e29f384e-5269-11df-a8a9-080069138b88" uid="16248">
+        <specific value="1" description="Stridsvagn 122 (replaced)" uuid="e2a049a0-5269-11df-a78b-080069138b88" uid="16249" status="new">
+          <cr value="1633"/>
+        </specific>
+        <specific value="2" description="Leopard 2 A6" status="new" uuid="4df7775a-2055-47ec-97e1-e9ddbb2ca813" uid="22723">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Leopard 2 A6M" status="new" uuid="26502dc1-289f-403d-af66-5e5662408fad" uid="22724">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="2" description="Armored Fighting Vehicle" uuid="e2a29c50-5269-11df-a7e4-080069138b88" uid="16250">
+      <subcategory value="1" description="Marder 1" uuid="e2a3ad0c-5269-11df-a522-080069138b88" uid="16251" status="new">
+        <cr value="1627"/>
+        <specific value="1" description="Marder 1 A1" status="new" uuid="6c32219a-0143-4a21-933d-3d947ab4f8f6" uid="22725">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Marder 1 A2" status="new" uuid="f831c1fe-5f52-4e91-9bbb-0ca30d5a469b" uid="22726">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Marder 1 A3" status="new" uuid="deb5d218-10b1-466e-bddb-f12bd1546e2e" uid="22727">
+          <cr value="1627"/>
+        </specific>
+        <specific value="4" description="Marder 1 A4" status="new" uuid="b3674416-d5c0-4b6e-9f84-4362206f3634" uid="22728">
+          <cr value="1627"/>
+        </specific>
+        <specific value="5" description="Marder 1 A5" status="new" uuid="6a870d2b-5488-4ac4-9918-d459d2b6e9e0" uid="22729">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="Marder 2" uuid="e2a4bc38-5269-11df-b189-080069138b88" uid="16252" deprecated="true">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="3" description="BMP 1" uuid="e2a5cb0a-5269-11df-88d3-080069138b88" uid="16253" deprecated="true">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="4" description="Jaguar 1 tank destroyer, missile" uuid="e2a6dc52-5269-11df-a91d-080069138b88" uid="16254"/>
+      <subcategory value="5" description="Jaguar 2" uuid="e2a7ec64-5269-11df-8f4e-080069138b88" uid="16255"/>
+      <subcategory value="6" description="Luchs armored reconnaissance vehicle" uuid="e2a8fde8-5269-11df-ba9e-080069138b88" uid="16256"/>
+      <subcategory value="7" description="Zobel armored reconnaissance vehicle" uuid="e2aa0f08-5269-11df-84d0-080069138b88" uid="16257" deprecated="true">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="8" description="Roland AD system, missile" deprecated="1" uuid="e2ab1e2a-5269-11df-ab61-080069138b88" uid="16258"/>
+      <subcategory value="9" description="Gepard armored AD, gun" deprecated="1" uuid="e2ac358a-5269-11df-af26-080069138b88" uid="16259"/>
+      <subcategory value="10" description="Wiesel" uuid="e2ad4812-5269-11df-b322-080069138b88" uid="16260">
+        <specific value="1" description="Wiesel with 20mm" uuid="e2ae519e-5269-11df-90f9-080069138b88" uid="16261"/>
+        <specific value="2" description="Wiesel with TOW" uuid="e2af65c0-5269-11df-83df-080069138b88" uid="16262"/>
+      </subcategory>
+      <subcategory value="11" description="Wiesel 2 armoured weapons carrier" status="new" uuid="0df0e9ff-e0ee-438b-b0ea-9d92429683e3" uid="22730">
+        <cr value="1627"/>
+        <specific value="1" description="Wiesel 2 ambulance" status="new" uuid="78de3021-642e-42bd-91bd-3434aa1ec20d" uid="22731">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Wiesel 2 lePzMrs 120 mm (mortar)" status="new" uuid="51f6ac7e-9766-4661-9491-f1ee598cd5a1" uid="22732">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Wiesel 2 command post" status="new" uuid="0e9a9b62-f58b-43d1-a85a-d744378ee1c0" uid="22733">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="12" description="Puma IFV" status="new" uuid="04a97c96-b9ca-4bc1-9f15-9bbe5fae9835" uid="22734">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="13" description="Fennek light armoured reconnaissance vehicle" status="new" uuid="bbae7a34-eaf0-474f-a5ad-3f0ae11071f1" uid="22735">
+        <cr value="1627"/>
+        <specific value="1" description="Fennek LVB (reconnaissance)" status="new" uuid="3b2edc9e-043d-473f-a31c-943568c15696" uid="22736">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Fennek JFST (joint fire support team)" status="new" uuid="8dc4e8e9-5db0-4fde-99b8-d89b5adf8351" uid="22737">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Fennek Fü-/ErkdFzg Pi (combat engineer)" status="new" uuid="e610c7ec-ce8d-40bb-abc7-66c992fd367b" uid="22738">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="3" description="Armored Utility Vehicle" uuid="e2b1b582-5269-11df-a851-080069138b88" uid="16263">
+      <subcategory value="1" description="Biber armored bridge layer" uuid="e2b2c544-5269-11df-92fe-080069138b88" uid="16264"/>
+      <subcategory value="2" description="Dachs armored engineer tank" uuid="e2b3d650-5269-11df-b131-080069138b88" uid="16265"/>
+      <subcategory value="3" description="Keiler armored minesweeper" uuid="e2b4ec98-5269-11df-83af-080069138b88" uid="16266"/>
+      <subcategory value="4" description="Skorpion armored minelayer" uuid="e2b5f8fe-5269-11df-a652-080069138b88" uid="16267"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="e2b70c4e-5269-11df-b972-080069138b88" uid="16268"/>
+      <subcategory value="6" description="M113 armored motor-ambulance" uuid="e2b81e86-5269-11df-87bd-080069138b88" uid="16269"/>
+      <subcategory value="7" description="M113 armored artillery observer" uuid="e2b92fa6-5269-11df-803d-080069138b88" uid="16270"/>
+      <subcategory value="8" description="Transportpanzer 1 &quot;Fuchs&quot;" uuid="e2ba4152-5269-11df-9ef2-080069138b88" uid="16271">
+        <specific value="1" description="Fuchs APC" status="new" uuid="5a757188-ab16-4fe4-968e-7971e0fb18a5" uid="22739">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Fuchs NBC reconaissance" status="new" uuid="3066c717-98d5-4016-8707-fb668689ad6f" uid="22740">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Hummel EloKa electronic warfare" status="new" uuid="1eb61ca6-42ef-429c-ac22-4169002fb1d1" uid="22741">
+          <cr value="1627"/>
+        </specific>
+        <specific value="4" description="Fuchs PARA RASIT battlefield radar" status="new" uuid="90aa516f-928c-411b-8abc-8a9c251c69d9" uid="22742">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="9" description="Buffel ARV" uuid="e2bb539e-5269-11df-8a95-080069138b88" uid="16272"/>
+      <subcategory value="10" description="GTK Boxer armoured fighting vehicle" status="new" uuid="34470edb-0513-42c7-bf4e-4eb5f03fc33a" uid="22743">
+        <cr value="1627"/>
+        <specific value="1" description="GTK Boxer APC" status="new" uuid="5b54de28-7260-4f30-b50c-af1860a7d9e0" uid="22744">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="GTK Boxer ambulance" status="new" uuid="9fe6e94c-0a33-4d25-8e01-9432a27b2d1e" uid="22745">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="GTK Boxer command post" status="new" uuid="4eefefb9-1736-40a4-9259-5c8b98460409" uid="22746">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="11" description="ATF Dingo armoured infantry mobility vehicle" status="new" uuid="6700e320-3379-4454-b99d-deafe29f7a48" uid="22747">
+        <cr value="1627"/>
+        <specific value="1" description="ATF Dingo 1" status="new" uuid="57b7304f-41e5-4be4-a788-26963900ba81" uid="22748">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="ATF Dingo 2" status="new" uuid="01768bf5-60fe-4900-8cad-790d3c9068b7" uid="22749">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="12" description="MOWAG Eagle armoured infantry mobility vehicle" status="new" uuid="f70aa469-0536-4877-bde5-aa1dc01fada9" uid="22750">
+        <cr value="1627"/>
+        <specific value="1" description="Eagle IV" status="new" uuid="14159c8e-da5f-4a67-aaa9-25cef7e324ec" uid="22751">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Eagle IV BAT (ambulance)" status="new" uuid="1e2d5c24-f090-4c13-82f6-4b1674b33f32" uid="22752">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="13" description="MOWAG Duro" status="new" uuid="263ad96d-caca-4238-932f-190ce99c7aaa" uid="22753">
+        <cr value="1627"/>
+        <specific value="1" description="YAK" status="new" uuid="f3da0165-cb2f-48c3-9c39-0a2324ff39ab" uid="22754">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="YAK BAT (ambulance)" status="new" uuid="2dfeb6ab-5a14-4376-988e-06d7a48a2738" uid="22755">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="YAK EOD" status="new" uuid="eac2e9af-5ffa-419c-b599-cfbd00974bc6" uid="22756">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="14" description="ESK Mungo armoured multirole transport vehicle" status="new" uuid="a41aa7e6-6ddf-4d38-9e8b-922b7b7e5617" uid="22757">
+        <cr value="1627"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Self-propelled Artillery" uuid="e2bd05c2-5269-11df-a707-080069138b88" uid="16273">
+      <subcategory value="1" description="Panzerhaubitze 2000" uuid="e2be1cb4-5269-11df-a116-080069138b88" uid="16274"/>
+      <subcategory value="2" description="M109 self-propelled 155 mm howitzer" status="new" uuid="96db5293-7f8f-4991-a1a4-b8c0080460ef" uid="22758">
+        <cr value="1627"/>
+        <specific value="1" description="M109G" status="new" uuid="c2c78da6-8faa-42ff-a5fd-66b619d47f1d" uid="22759">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="M109GEA1" status="new" uuid="c00ba6f2-5b55-4dd7-a097-43d98bf296b2" uid="22760">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="M109GEA2" status="new" uuid="8e7f0052-d3cb-4664-96b8-2f973c6f38d3" uid="22761">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+      <subcategory value="3" description="M270 Multiple Launch Rocket System (MLRS)" status="new" uuid="d4a168e9-4507-463b-af5a-b42d900ed0ff" uid="22762">
+        <cr value="1627"/>
+        <specific value="1" description="MARS (Mittleres Artillerieraketensystem)" status="new" uuid="76d03b7c-4223-4384-bded-3796872c0e4a" uid="22763">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="5" description="Towed Artillery" uuid="e2bfce56-5269-11df-bee8-080069138b88" uid="16275">
+      <subcategory value="1" description="Rheinmetal 20mm twin Rh202" deprecated="1" uuid="e2c0dee0-5269-11df-8956-080069138b88" uid="16276"/>
+    </category>
+    <category value="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)" uuid="e2c29384-5269-11df-8391-080069138b88" uid="16277">
+      <subcategory value="1" description="Wolf (Mercedes Benz G-Class 4x4)" uuid="e2c3a38c-5269-11df-8a35-080069138b88" uid="16278" status="new">
+        <cr value="1627"/>
+        <specific value="1" description="Wolf kurz offen" status="new" uuid="e8765425-6eff-43fa-bb23-bb6ff2c5315d" uid="22764">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Wolf kurz offen LL" status="new" uuid="e323fa17-3b33-4258-8113-d9ef9087740d" uid="22765">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Wolf lang offen" status="new" uuid="1ad77beb-be94-4f6b-95c9-b479f88d58e9" uid="22766">
+          <cr value="1627"/>
+        </specific>
+        <specific value="4" description="Wolf ambulance" status="new" uuid="595dea4c-d7f0-4d1a-9bdf-6966b819b87f" uid="22767">
+          <cr value="1627"/>
+        </specific>
+        <specific value="5" description="Wolf ambulance box body" status="new" uuid="3d681fe4-9e30-4857-95e8-98f0d90eab35" uid="22768">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)" uuid="e2c559d4-5269-11df-a138-080069138b88" uid="16279">
+      <subcategory value="1" description="IVECO Magirus 110-16 AWM (4x4) 5000kg truck (aka 168M11FAL)" uuid="e2c667c0-5269-11df-99ac-080069138b88" uid="16280"/>
+      <subcategory value="2" description="MAN 5 ton" uuid="e2c77836-5269-11df-b8ea-080069138b88" uid="16281"/>
+      <subcategory value="3" description="MAN 7 ton" uuid="e2c88a50-5269-11df-9fc3-080069138b88" uid="16282"/>
+      <subcategory value="4" description="MAN 10 ton" uuid="e2c99b70-5269-11df-90a3-080069138b88" uid="16283"/>
+    </category>
+    <category value="10" description="Mortar" uuid="e2cb49ca-5269-11df-9fb6-080069138b88" uid="16284">
+      <subcategory value="1" description="M113 armored mortar" uuid="e2cc57c0-5269-11df-bd48-080069138b88" uid="16285"/>
+    </category>
+    <category value="11" description="Mine plow" uuid="e2ce09b2-5269-11df-a985-080069138b88" uid="16286"/>
+    <category value="12" description="Mine rake" uuid="e2cf1c30-5269-11df-bdfe-080069138b88" uid="16287"/>
+    <category value="13" description="Mine roller" uuid="e2d024fe-5269-11df-9e95-080069138b88" uid="16288"/>
+    <category value="14" description="Cargo trailer" uuid="e2d134f2-5269-11df-a1c4-080069138b88" uid="16289">
+      <subcategory value="1" description="0 - 0.5 ton" uuid="e2d246da-5269-11df-a364-080069138b88" uid="16290"/>
+      <subcategory value="2" description="0.51 - 2 ton" uuid="e2d35520-5269-11df-aa6c-080069138b88" uid="16291"/>
+      <subcategory value="3" description="2.01 - 5 ton" uuid="e2d465dc-5269-11df-a0f0-080069138b88" uid="16292"/>
+      <subcategory value="4" description="5.02 - 10 ton" uuid="e2d57562-5269-11df-82c7-080069138b88" uid="16293"/>
+      <subcategory value="5" description="greater than 10 tons" uuid="e2d680b0-5269-11df-9278-080069138b88" uid="16294"/>
+    </category>
+    <category value="15" description="Fuel trailer" uuid="e2d8339c-5269-11df-9096-080069138b88" uid="16295">
+      <subcategory value="1" description="1-1000 gallons" uuid="e2d94444-5269-11df-b76d-080069138b88" uid="16296"/>
+      <subcategory value="2" description="1001 - 5000 gallons" uuid="e2da541a-5269-11df-95aa-080069138b88" uid="16297"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="e2db63a0-5269-11df-ac74-080069138b88" uid="16298"/>
+    </category>
+    <category value="16" description="Generator trailer" uuid="e2dd1dbc-5269-11df-b7d2-080069138b88" uid="16299">
+      <subcategory value="1" description="0 - 100 KW" uuid="e2de2f4a-5269-11df-93ee-080069138b88" uid="16300"/>
+      <subcategory value="2" description="greater than 100 KW" uuid="e2df3e62-5269-11df-b37f-080069138b88" uid="16301"/>
+    </category>
+    <category value="17" description="Water trailer" uuid="e2e0f2d4-5269-11df-a883-080069138b88" uid="16302">
+      <subcategory value="1" description="1-1000 gallons" uuid="e2e20304-5269-11df-be79-080069138b88" uid="16303"/>
+      <subcategory value="2" description="1001- 5000 gallons" uuid="e2e30f06-5269-11df-b13d-080069138b88" uid="16304"/>
+      <subcategory value="3" description="greater than 5000 gallons" uuid="e2e41f36-5269-11df-8258-080069138b88" uid="16305"/>
+    </category>
+    <category value="18" description="Engineer equipment" uuid="e2e5d29a-5269-11df-88c1-080069138b88" uid="16306">
+      <subcategory value="1" description="Mine clearing line charge" uuid="e2e6e2ca-5269-11df-a7f0-080069138b88" uid="16307"/>
+      <subcategory value="2" description="Dozer blade kit" uuid="e2e7f2aa-5269-11df-8103-080069138b88" uid="16308"/>
+      <subcategory value="3" description="Lane marking system" uuid="e2e910ea-5269-11df-8c32-080069138b88" uid="16309"/>
+    </category>
+    <category value="19" description="Heavy equipment transport trailer" uuid="e2eac55c-5269-11df-a995-080069138b88" uid="16310"/>
+    <category value="20" description="Maintenance equipment trailer" uuid="e2ebd6e0-5269-11df-8ee7-080069138b88" uid="16311">
+      <subcategory value="1" description="Welding trailer" uuid="e2ece2ce-5269-11df-b239-080069138b88" uid="16312"/>
+      <subcategory value="2" description="Compressor" uuid="e2edf4de-5269-11df-aefe-080069138b88" uid="16313"/>
+      <subcategory value="3" description="Tools/parts trailer" uuid="e2ef0450-5269-11df-83c6-080069138b88" uid="16314"/>
+    </category>
+    <category value="21" description="Limber" uuid="e2f0b94e-5269-11df-b56f-080069138b88" uid="16315"/>
+    <category value="22" description="Chemical decontamination trailer" uuid="e2f1c38e-5269-11df-9b66-080069138b88" uid="16316"/>
+    <category value="27" description="Civilian Vehicle" uuid="e2f2d44a-5269-11df-93a6-080069138b88" uid="16317">
+      <subcategory value="1" description="Truck" uuid="e2f3e358-5269-11df-ba90-080069138b88" uid="16318"/>
+      <subcategory value="2" description="Bus" uuid="e2f4f11c-5269-11df-888c-080069138b88" uid="16319"/>
+      <subcategory value="3" description="Car" uuid="e2f5ffa8-5269-11df-b3eb-080069138b88" uid="16320"/>
+    </category>
+    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="e2f7aec0-5269-11df-b033-080069138b88" uid="16321">
+      <subcategory value="1" description="Self-Propelled VSHORAD Gun/Missile System" uuid="e2f8c530-5269-11df-b8d1-080069138b88" uid="16322">
+        <specific value="1" description="Roland AD System missile" uuid="e2f9d1e6-5269-11df-aebf-080069138b88" uid="16323"/>
+        <specific value="2" description="Gepard armored AD gun" uuid="e2faef7c-5269-11df-a5ef-080069138b88" uid="16324"/>
+      </subcategory>
+      <subcategory value="2" description="Towed VSHORAD Gun / Missile System" uuid="e2fca1aa-5269-11df-a1a3-080069138b88" uid="16325">
+        <specific value="1" description="Rheinmetal 20mm twin Rh202" uuid="e2fdb252-5269-11df-9e72-080069138b88" uid="16326"/>
+      </subcategory>
+      <subcategory value="3" description="Wiesel 2 LeFlaSys (SAM)" status="new" uuid="d464faec-5218-41e0-9549-f770fcbaf746" uid="22769">
+        <cr value="1627"/>
+        <specific value="1" description="Wiesel 2 LeFlaSys BF/UF command post" status="new" uuid="ec4e1995-908b-4174-81f3-0991c699a442" uid="22770">
+          <cr value="1627"/>
+        </specific>
+        <specific value="2" description="Wiesel 2 LeFlaSys AFF air defence radar" status="new" uuid="e7a30c8b-dae5-45bc-8f69-9f31ad6d14ce" uid="22771">
+          <cr value="1627"/>
+        </specific>
+        <specific value="3" description="Wiesel 2 LeFlaSys Ozelot launcher vehicle" status="new" uuid="e7dc9c1e-660d-43a5-bcd2-b912f38c7828" uid="22772">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="78" uuid="e300a4d0-5269-11df-8411-080069138b88" uid="16327">
+    <category value="1" description="Fighter/Air Defense" uuid="e301b38e-5269-11df-a30a-080069138b88" uid="16328">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="e302c7c4-5269-11df-a178-080069138b88" uid="16329"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="e303d9fc-5269-11df-a5fa-080069138b88" uid="16330"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e304e798-5269-11df-90df-080069138b88" uid="16331"/>
+      <subcategory value="4" description="EFM (Enhanced Fighter Maneuverability) X-31A" uuid="e305fd72-5269-11df-a1e8-080069138b88" uid="16332"/>
+    </category>
+    <category value="2" description="Attack/Strike" uuid="e307b07c-5269-11df-b2a7-080069138b88" uid="16333">
+      <subcategory value="1" description="Dassault/Dornier Alpha Jet" uuid="e308c02a-5269-11df-abac-080069138b88" uid="16334">
+        <specific value="1" description="Alpha Jet E trainer/attack" uuid="e309d082-5269-11df-aea8-080069138b88" uid="16335"/>
+        <specific value="2" description="Alpha Jet MS1" uuid="e30ae21a-5269-11df-b118-080069138b88" uid="16336"/>
+        <specific value="3" description="Alpha Jet A" uuid="e30bf290-5269-11df-8a7a-080069138b88" uid="16337"/>
+        <specific value="4" description="Alpha Jet MS2" uuid="e30cfbc2-5269-11df-b67d-080069138b88" uid="16338"/>
+        <specific value="5" description="Alpha Jet 2" uuid="e30e0f30-5269-11df-98b1-080069138b88" uid="16339"/>
+      </subcategory>
+      <subcategory value="2" description="Panavia Tornado IDS" uuid="e30fbf56-5269-11df-a783-080069138b88" uid="16340">
+        <specific value="1" description="Tornado IDS GR. Mk 1" uuid="e310d0a8-5269-11df-b1a9-080069138b88" uid="16341"/>
+        <specific value="2" description="Tornado IDS GR. 1A" uuid="e311db42-5269-11df-8ed3-080069138b88" uid="16342"/>
+        <specific value="3" description="Tornado IDS GR. 4" uuid="e312ec76-5269-11df-8157-080069138b88" uid="16343"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Electronic Warfare (EW)" uuid="e315411a-5269-11df-bbca-080069138b88" uid="16344">
+      <subcategory value="1" description="Panavia Tornado ECR" uuid="e31651c2-5269-11df-b59d-080069138b88" uid="16345"/>
+    </category>
+    <category value="8" description="Surveillance/C2" uuid="e3180468-5269-11df-a626-080069138b88" uid="16346">
+      <subcategory value="1" description="Transall C-160" uuid="e3191bdc-5269-11df-94a0-080069138b88" uid="16347">
+        <specific value="1" description="C-160S. Maritime" uuid="e31a2f04-5269-11df-8ffe-080069138b88" uid="16348"/>
+        <specific value="2" description="C-160SE. Electronic" uuid="e31b3ade-5269-11df-99bc-080069138b88" uid="16349"/>
+        <specific value="3" description="C-160AAA AEW" uuid="e31c4adc-5269-11df-b5c7-080069138b88" uid="16350"/>
+      </subcategory>
+      <subcategory value="2" description="Egrett II" uuid="e31dff1c-5269-11df-8c23-080069138b88" uid="16351">
+        <specific value="1" description="Strato 1" uuid="e31f0cfe-5269-11df-a322-080069138b88" uid="16352"/>
+      </subcategory>
+    </category>
+    <category value="20" description="Attack Helicopter" uuid="e3216026-5269-11df-aa8b-080069138b88" uid="16353">
+      <subcategory value="1" description="Eurocopter BO 105/PAH-1/VBH/BSH-1" uuid="e32270e2-5269-11df-a4f2-080069138b88" uid="16354">
+        <specific value="1" description="PAH-1" uuid="e3237afa-5269-11df-84e5-080069138b88" uid="16355"/>
+        <specific value="2" description="PAH-1A1" uuid="e3248c06-5269-11df-8aeb-080069138b88" uid="16356"/>
+        <specific value="3" description="BSH" uuid="e325a050-5269-11df-b3ff-080069138b88" uid="16357"/>
+        <specific value="4" description="(deprecated)" deprecated="1" uuid="e326a950-5269-11df-a914-080069138b88" uid="16358"/>
+        <specific value="5" description="(deprecated)" deprecated="1" uuid="e327bbd8-5269-11df-8517-080069138b88" uid="16359"/>
+        <specific value="6" description="(deprecated)" deprecated="1" uuid="e328cfa0-5269-11df-be16-080069138b88" uid="16360"/>
+        <specific value="7" description="Hkp 9" uuid="e329dc56-5269-11df-9a4c-080069138b88" uid="16361"/>
+      </subcategory>
+      <subcategory value="2" description="Eurocopter Tigre" uuid="e32b8dbc-5269-11df-8c55-080069138b88" uid="16362">
+        <specific value="1" description="PAH-2" uuid="e32c9d7e-5269-11df-a958-080069138b88" uid="16363"/>
+        <specific value="2" description="HAC" uuid="e32dad72-5269-11df-96e3-080069138b88" uid="16364"/>
+        <specific value="3" description="HAP" uuid="e32eb974-5269-11df-a99f-080069138b88" uid="16365"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Utility Helicopter" uuid="e3310f58-5269-11df-8c75-080069138b88" uid="16366">
+      <subcategory value="1" description="NH 90" uuid="e3321c9a-5269-11df-a0c6-080069138b88" uid="16367">
+        <specific value="1" description="TTH 90 medium helicopter" uuid="e3332b80-5269-11df-8519-080069138b88" uid="16368"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="e334df48-5269-11df-ac9c-080069138b88" uid="16369"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e335ef32-5269-11df-bf8c-080069138b88" uid="16370"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="e336fe68-5269-11df-be27-080069138b88" uid="16371"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="e3381cf8-5269-11df-be9f-080069138b88" uid="16372"/>
+      <subcategory value="6" description="Eurocopter BO 105" uuid="e3393462-5269-11df-9517-080069138b88" uid="16373">
+        <specific value="1" description="BO 105CB" uuid="e33a3fa6-5269-11df-aa99-080069138b88" uid="16374"/>
+        <specific value="2" description="BO 105CBS" uuid="e33b4eb4-5269-11df-9aaf-080069138b88" uid="16375"/>
+      </subcategory>
+      <subcategory value="7" description="Eurocopter/Kawasaki BK 117" uuid="e33d0132-5269-11df-88a3-080069138b88" uid="16376">
+        <specific value="1" description="BK 117 M" uuid="e33e152c-5269-11df-ba85-080069138b88" uid="16377"/>
+        <specific value="2" description="NBK-117" uuid="e33f1fc6-5269-11df-85fd-080069138b88" uid="16378"/>
+      </subcategory>
+    </category>
+    <category value="22" description="Antisubmarine Warfare / Patrol Helicopter" uuid="e34173f2-5269-11df-846b-080069138b88" uid="16379">
+      <subcategory value="1" description="NH 90" uuid="e34284c2-5269-11df-87e2-080069138b88" uid="16380"/>
+      <subcategory value="2" description="NFH 90" uuid="e343947a-5269-11df-8a61-080069138b88" uid="16381"/>
+    </category>
+    <category value="40" description="Trainer" uuid="e345455e-5269-11df-9866-080069138b88" uid="16382">
+      <subcategory value="1" description="Dassault/Dornier Alpha Jet" uuid="e3465566-5269-11df-b885-080069138b88" uid="16383">
+        <specific value="1" description="Alpha Jet E" uuid="e34765f0-5269-11df-b7e6-080069138b88" uid="16384"/>
+        <specific value="2" description="Alpha Jet 3" uuid="e3487620-5269-11df-82bb-080069138b88" uid="16385"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Unmanned" status="new" uuid="a3ee974b-c841-4201-a0d4-7f6ad87dc07d" uid="22773">
+      <cr value="1627"/>
+      <subcategory value="1" description="CL 289" status="new" uuid="c48b671f-87d6-4f82-a930-9f38a9c1e1ad" uid="22774">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="2" description="EMT Luna" status="new" uuid="aeed466a-9ace-4955-8687-f82f1b895be7" uid="22775">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="3" description="EMT Aladin" status="new" uuid="845da22f-9b08-47c3-9164-c015c12a9261" uid="22776">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="4" description="RDE KZO" status="new" uuid="6c0b8214-9b2a-4534-97d8-8aa5019c5b4c" uid="22777">
+        <cr value="1627"/>
+      </subcategory>
+      <subcategory value="5" description="Northrop Grumman RQ-4 Global Hawk" status="new" uuid="29a073d7-fb52-4fbc-93dd-5818f92e6c24" uid="22778">
+        <cr value="1627"/>
+        <specific value="1" description="EuroHawk" status="new" uuid="6a2406ef-ce75-4cf1-898f-ccd7076df2c9" uid="22779">
+          <cr value="1627"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="78" uuid="e34b6a42-5269-11df-a008-080069138b88" uid="16386">
+    <category value="4" description="Guided Missile Destroyer" uuid="e34c7b26-5269-11df-99fa-080069138b88" uid="16387">
+      <subcategory value="1" description="Ex-US Modified Charles F. Adams class (type 103B) (DDGs)" uuid="e34d8778-5269-11df-aa59-080069138b88" uid="16388">
+        <specific value="1" description="D 185 Lutjens (ex-US DDG 28)" uuid="e34e9ae6-5269-11df-b5b8-080069138b88" uid="16389"/>
+        <specific value="2" description="D 186 Molders (ex-US DDG 29)" uuid="e34fad50-5269-11df-9dc3-080069138b88" uid="16390"/>
+        <specific value="3" description="D 187 Rommel (ex-US DDG 30)" uuid="e350b7ea-5269-11df-ac13-080069138b88" uid="16391"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Destroyer" uuid="e35311b6-5269-11df-bfa3-080069138b88" uid="16392">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="e3541b38-5269-11df-8c58-080069138b88" uid="16393"/>
+      <subcategory value="2" description="Hamburg class (Type 101A)" uuid="e3553022-5269-11df-ac5a-080069138b88" uid="16394">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="e3564bec-5269-11df-acfc-080069138b88" uid="16395"/>
+        <specific value="2" description="D 182 Schleswig-Hostein" uuid="e357599c-5269-11df-bd85-080069138b88" uid="16396"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided Missile Frigate" uuid="e359b2fa-5269-11df-ae59-080069138b88" uid="16397">
+      <subcategory value="1" description="Brandenburg class (Type 123)" uuid="e35abe8e-5269-11df-8413-080069138b88" uid="16398">
+        <specific value="1" description="F 215 Brandenburg" uuid="e35bd030-5269-11df-a045-080069138b88" uid="16399"/>
+        <specific value="2" description="F 216 Schleswig-Holstein" uuid="e35cdfe8-5269-11df-b383-080069138b88" uid="16400"/>
+        <specific value="3" description="F 217 Bayern" uuid="e35df086-5269-11df-9778-080069138b88" uid="16401"/>
+        <specific value="4" description="F 218 Mecklenburg-Vorpommern" uuid="e35f00a2-5269-11df-8cbb-080069138b88" uid="16402"/>
+      </subcategory>
+      <subcategory value="2" description="Bremen class (Type 122)" uuid="e360b2bc-5269-11df-a1d2-080069138b88" uid="16403">
+        <specific value="1" description="F 207 Bremen" uuid="e361c1ca-5269-11df-9201-080069138b88" uid="16404"/>
+        <specific value="2" description="F 208 Niedersachsen" uuid="e362d254-5269-11df-b595-080069138b88" uid="16405"/>
+        <specific value="3" description="F 209 Rheinland-Pfalz" uuid="e363e266-5269-11df-bb91-080069138b88" uid="16406"/>
+        <specific value="4" description="F 210 Emden" uuid="e364f1b0-5269-11df-bf42-080069138b88" uid="16407"/>
+        <specific value="5" description="F 211 Koln" uuid="e366019a-5269-11df-b008-080069138b88" uid="16408"/>
+        <specific value="6" description="F 212 Karlsruhe" uuid="e36712d8-5269-11df-a74b-080069138b88" uid="16409"/>
+        <specific value="7" description="F 213 Augsburg" uuid="e368224a-5269-11df-af7a-080069138b88" uid="16410"/>
+        <specific value="8" description="F 214 Lubeck" uuid="e3692b18-5269-11df-a29c-080069138b88" uid="16411"/>
+      </subcategory>
+      <subcategory value="3" description="Sachsen Class (Type 124) (FFG)" uuid="e36adecc-5269-11df-b4fb-080069138b88" uid="16412">
+        <specific value="1" description="F219 Sachsen" uuid="e36bef4c-5269-11df-a6d9-080069138b88" uid="16413"/>
+        <specific value="2" description="F220 Hamburg" uuid="e36d0062-5269-11df-9eec-080069138b88" uid="16414"/>
+        <specific value="3" description="F221 Hessen" uuid="e36e0962-5269-11df-b819-080069138b88" uid="16415"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/patrol craft" uuid="e37060e0-5269-11df-9ad4-080069138b88" uid="16416">
+      <subcategory value="1" description="Gepard class (type 143 A) (fast attack craft, missile)" uuid="e3716c1a-5269-11df-91bb-080069138b88" uid="16417">
+        <specific value="1" description="P 6121 Gepard" uuid="e37283c0-5269-11df-a141-080069138b88" uid="16418"/>
+        <specific value="2" description="P 6122 Puma" uuid="e3739288-5269-11df-9216-080069138b88" uid="16419"/>
+        <specific value="3" description="P 6123 Hermelin" uuid="e3749ce6-5269-11df-ad2a-080069138b88" uid="16420"/>
+        <specific value="4" description="P 6124 Nerz" uuid="e375bad6-5269-11df-9438-080069138b88" uid="16421"/>
+        <specific value="5" description="P 6125 Zobel" uuid="e376cc8c-5269-11df-9e89-080069138b88" uid="16422"/>
+        <specific value="6" description="P 6126 Frettechen" uuid="e377d65e-5269-11df-b895-080069138b88" uid="16423"/>
+        <specific value="7" description="P 6127 Dachs" uuid="e378e9a4-5269-11df-a23a-080069138b88" uid="16424"/>
+        <specific value="8" description="P 6128 Ozelot" uuid="e379fa06-5269-11df-9045-080069138b88" uid="16425"/>
+        <specific value="9" description="P 6129 Wiesel" uuid="e37b0554-5269-11df-a705-080069138b88" uid="16426"/>
+        <specific value="10" description="P 6130 Hyane" uuid="e37c13f4-5269-11df-b435-080069138b88" uid="16427"/>
+      </subcategory>
+      <subcategory value="2" description="Albatros class (type 143/143B) (fast attack craft, missile)" uuid="e37dc8d4-5269-11df-bbc6-080069138b88" uid="16428">
+        <specific value="1" description="P 6111 Albatros" uuid="e37edc6a-5269-11df-b93a-080069138b88" uid="16429"/>
+        <specific value="2" description="P 6122 Falke" uuid="e37fe880-5269-11df-9d4b-080069138b88" uid="16430"/>
+        <specific value="3" description="P 6113 Geier" uuid="e380f8e2-5269-11df-81f8-080069138b88" uid="16431"/>
+        <specific value="4" description="P 6114 Bussard" uuid="e3821ede-5269-11df-b4b9-080069138b88" uid="16432"/>
+        <specific value="5" description="P 6115 Sperber" uuid="e3832b9e-5269-11df-8188-080069138b88" uid="16433"/>
+        <specific value="6" description="P 6116 Greif" uuid="e3843c82-5269-11df-b8f7-080069138b88" uid="16434"/>
+        <specific value="7" description="P 6117 Kondor" uuid="e3854c26-5269-11df-909b-080069138b88" uid="16435"/>
+        <specific value="8" description="P 6118 Seeadler" uuid="e386563e-5269-11df-a5c9-080069138b88" uid="16436"/>
+        <specific value="9" description="P 6119 Habicht" uuid="e38764b6-5269-11df-8782-080069138b88" uid="16437"/>
+        <specific value="10" description="P 6120 Kormoran" uuid="e38876bc-5269-11df-be03-080069138b88" uid="16438"/>
+      </subcategory>
+      <subcategory value="3" description="Tiger class (type 148) (fast attack craft, missile)" uuid="e38a2386-5269-11df-b1fd-080069138b88" uid="16439">
+        <specific value="1" description="P 6141 Tiger" uuid="e38b2f10-5269-11df-ba9b-080069138b88" uid="16440"/>
+        <specific value="2" description="P 6142 Iltis" uuid="e38c415c-5269-11df-94f5-080069138b88" uid="16441"/>
+        <specific value="3" description="P 6143 Luchs" uuid="e38d4eda-5269-11df-a8ea-080069138b88" uid="16442"/>
+        <specific value="4" description="P 6144 Marder" uuid="e38e5726-5269-11df-9204-080069138b88" uid="16443"/>
+        <specific value="5" description="P 6145 Leopard" uuid="e38f6954-5269-11df-99cb-080069138b88" uid="16444"/>
+        <specific value="6" description="P 6146 Fuchs" uuid="e39077ae-5269-11df-93fc-080069138b88" uid="16445"/>
+        <specific value="7" description="P 6147 Jaguar" uuid="e3917ef6-5269-11df-a3b8-080069138b88" uid="16446"/>
+        <specific value="8" description="P 6148 Lowe" uuid="e3928d50-5269-11df-ad7d-080069138b88" uid="16447"/>
+        <specific value="9" description="P 6149 Wolf" uuid="e393a76c-5269-11df-b0af-080069138b88" uid="16448"/>
+        <specific value="10" description="P 6150 Panther" uuid="e394b288-5269-11df-a891-080069138b88" uid="16449"/>
+        <specific value="11" description="P 6151 Haher" uuid="e395c164-5269-11df-a4e2-080069138b88" uid="16450"/>
+        <specific value="12" description="P 6152 Storch" uuid="e396d342-5269-11df-a2ad-080069138b88" uid="16451"/>
+        <specific value="13" description="P 6153 Pelikan" uuid="e397e0e8-5269-11df-b6d8-080069138b88" uid="16452"/>
+        <specific value="14" description="P 6154 Elster" uuid="e398f06e-5269-11df-b32b-080069138b88" uid="16453"/>
+        <specific value="15" description="P 6155 Alk" uuid="e399fd06-5269-11df-a687-080069138b88" uid="16454"/>
+        <specific value="16" description="P 6156 Dommel" uuid="e39b0624-5269-11df-b7e1-080069138b88" uid="16455"/>
+        <specific value="17" description="P 6157 Weihe" uuid="e39c1960-5269-11df-af7e-080069138b88" uid="16456"/>
+        <specific value="18" description="P 6158 Pinguin" uuid="e39d27a6-5269-11df-98ce-080069138b88" uid="16457"/>
+        <specific value="19" description="P 6159 Reiher" uuid="e39e3010-5269-11df-82a0-080069138b88" uid="16458"/>
+        <specific value="20" description="P 6160 Kranich" uuid="e39f42f2-5269-11df-9d0b-080069138b88" uid="16459"/>
+      </subcategory>
+      <subcategory value="4" description="Bredstedt class (large patrol craft, Coast Guard vessels)" uuid="e3a0f1d8-5269-11df-a1b6-080069138b88" uid="16460">
+        <specific value="1" description="BG 21 Bredstedt" uuid="e3a20280-5269-11df-b243-080069138b88" uid="16461"/>
+      </subcategory>
+      <subcategory value="5" description="Sassnitz class (Coast Guard vessels)" uuid="e3a3b30a-5269-11df-a35f-080069138b88" uid="16462">
+        <specific value="1" description="Sassnitz (ex-P 6165, ex-591)" uuid="e3a4be58-5269-11df-9bdb-080069138b88" uid="16463"/>
+        <specific value="2" description="Sellin (ex-592)" uuid="e3a5cdac-5269-11df-9469-080069138b88" uid="16464"/>
+        <specific value="3" description="Binz (ex-593)" uuid="e3a6de9a-5269-11df-8393-080069138b88" uid="16465"/>
+      </subcategory>
+      <subcategory value="6" description="Neustadt class (large patrol craft, Coast Guard vessels)" uuid="e3a88bdc-5269-11df-9e28-080069138b88" uid="16466">
+        <specific value="1" description="BG 11 Neustadt" uuid="e3a99838-5269-11df-89b8-080069138b88" uid="16467"/>
+        <specific value="2" description="BG 12 Bad Bramstedt" uuid="e3aaaa7a-5269-11df-a498-080069138b88" uid="16468"/>
+        <specific value="3" description="BG 14 Duderstadt" uuid="e3abb8b6-5269-11df-ace2-080069138b88" uid="16469"/>
+        <specific value="4" description="BG 15 Eschwege" uuid="e3acc242-5269-11df-80cb-080069138b88" uid="16470"/>
+        <specific value="5" description="BG 16 Alsfeld" uuid="e3add362-5269-11df-8202-080069138b88" uid="16471"/>
+        <specific value="6" description="BG 17 Bayreuth" uuid="e3aee220-5269-11df-9032-080069138b88" uid="16472"/>
+        <specific value="7" description="BG 18 Rosenheim" uuid="e3afe95e-5269-11df-aa09-080069138b88" uid="16473"/>
+      </subcategory>
+      <subcategory value="7" description="Bremse class (harbor patrol craft, Coast Guard vessels)" uuid="e3b19bb4-5269-11df-b5af-080069138b88" uid="16474">
+        <specific value="1" description="GS 23" uuid="e3b2b5f8-5269-11df-8327-080069138b88" uid="16475"/>
+        <specific value="2" description="GS 30" uuid="e3b3c3ee-5269-11df-b527-080069138b88" uid="16476"/>
+        <specific value="3" description="GS 31" uuid="e3b4cbf4-5269-11df-8081-080069138b88" uid="16477"/>
+        <specific value="4" description="GS 32" uuid="e3b5dc10-5269-11df-bc5d-080069138b88" uid="16478"/>
+        <specific value="5" description="GS 40" uuid="e3b6ee34-5269-11df-a565-080069138b88" uid="16479"/>
+        <specific value="6" description="GS 41" uuid="e3b7f57c-5269-11df-8068-080069138b88" uid="16480"/>
+        <specific value="7" description="GS 42" uuid="e3b90264-5269-11df-9c10-080069138b88" uid="16481"/>
+        <specific value="8" description="GS 51" uuid="e3ba0eac-5269-11df-8ee7-080069138b88" uid="16482"/>
+        <specific value="9" description="GS 52" uuid="e3bb1bb2-5269-11df-8eb2-080069138b88" uid="16483"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship / Craft" uuid="e3bd6a3e-5269-11df-a556-080069138b88" uid="16484">
+      <subcategory value="1" description="Schutze class (type 340-341, minesweepers, coastal)" uuid="e3be7898-5269-11df-83e3-080069138b88" uid="16485">
+        <specific value="1" description="M 1059 Spica" uuid="e3bf8990-5269-11df-bcb4-080069138b88" uid="16486"/>
+        <specific value="2" description="M 1062 Schutze" uuid="e3c09862-5269-11df-bd14-080069138b88" uid="16487"/>
+        <specific value="3" description="M 1063 Waage" uuid="e3c1a07c-5269-11df-88f6-080069138b88" uid="16488"/>
+      </subcategory>
+      <subcategory value="2" description="Lindau class (coastal minesweepers and minehunters: type 331, minehunters; and type 351, Troika)" uuid="e3c354b2-5269-11df-a200-080069138b88" uid="16489">
+        <specific value="1" description="M 1070 Gottingen" uuid="e3c46abe-5269-11df-8bea-080069138b88" uid="16490"/>
+        <specific value="2" description="M 1071 Koblenz" uuid="e3c57936-5269-11df-a441-080069138b88" uid="16491"/>
+        <specific value="3" description="M 1072 Lindau" uuid="e3c6818c-5269-11df-8da2-080069138b88" uid="16492"/>
+        <specific value="4" description="M 1073 Schleswig" uuid="e3c7911c-5269-11df-b18b-080069138b88" uid="16493"/>
+        <specific value="5" description="M 1074 Tubingen" uuid="e3c8a3f4-5269-11df-8001-080069138b88" uid="16494"/>
+        <specific value="6" description="M 1075 Wetzlar" uuid="e3c9acc2-5269-11df-af36-080069138b88" uid="16495"/>
+        <specific value="7" description="M 1076 Paderborn" uuid="e3caba04-5269-11df-80ec-080069138b88" uid="16496"/>
+        <specific value="8" description="M 1077 Weilheim" uuid="e3cbcac0-5269-11df-bcf0-080069138b88" uid="16497"/>
+        <specific value="9" description="M 1078 Cuxhaven" uuid="e3ccd47e-5269-11df-a17d-080069138b88" uid="16498"/>
+        <specific value="10" description="M 1079 Duren" uuid="e3cde21a-5269-11df-964b-080069138b88" uid="16499"/>
+        <specific value="11" description="M 1080 Marburg" uuid="e3cef3ee-5269-11df-8e23-080069138b88" uid="16500"/>
+        <specific value="12" description="M 1081 Konstanz" uuid="e3cffd3e-5269-11df-b689-080069138b88" uid="16501"/>
+        <specific value="13" description="M 1082 Wolfsburg" uuid="e3d11570-5269-11df-af8d-080069138b88" uid="16502"/>
+        <specific value="14" description="M 1083 Ulm" uuid="e3d228a2-5269-11df-af2d-080069138b88" uid="16503"/>
+        <specific value="15" description="M 1085 Minden" uuid="e3d331ca-5269-11df-88e7-080069138b88" uid="16504"/>
+      </subcategory>
+      <subcategory value="3" description="Kondor II class (minesweeper, coastal)" uuid="e3d4e0ba-5269-11df-b0c4-080069138b88" uid="16505">
+        <specific value="1" description="M2670 Sommerda (ex-311)" uuid="e3d5f3e2-5269-11df-9fd4-080069138b88" uid="16506"/>
+      </subcategory>
+      <subcategory value="4" description="Frauenlob class (type 394 minesweepers, inshore)" uuid="e3d7a0f2-5269-11df-bd2b-080069138b88" uid="16507">
+        <specific value="1" description="M 2658 Frauenlob" uuid="e3d8b4b0-5269-11df-bce6-080069138b88" uid="16508"/>
+        <specific value="2" description="M 2659 Nautilus" uuid="e3d9be3c-5269-11df-9145-080069138b88" uid="16509"/>
+        <specific value="3" description="M 2660 Gefion" uuid="e3dacbce-5269-11df-800c-080069138b88" uid="16510"/>
+        <specific value="4" description="M 2661 Medusa" uuid="e3dbd992-5269-11df-933b-080069138b88" uid="16511"/>
+        <specific value="5" description="M 2662 Undine" uuid="e3dce742-5269-11df-aa73-080069138b88" uid="16512"/>
+        <specific value="6" description="M 2663 Minerva" uuid="e3ddf66e-5269-11df-8fa2-080069138b88" uid="16513"/>
+        <specific value="7" description="M 2664 Diana" uuid="e3df0324-5269-11df-8ccc-080069138b88" uid="16514"/>
+        <specific value="8" description="M 2665 Loreley" uuid="e3e00cb0-5269-11df-a01c-080069138b88" uid="16515"/>
+        <specific value="9" description="M 2666 Atlantis" uuid="e3e11eb6-5269-11df-8253-080069138b88" uid="16516"/>
+        <specific value="10" description="M 2667" uuid="e3e22d88-5269-11df-80d7-080069138b88" uid="16517"/>
+      </subcategory>
+      <subcategory value="5" description="Ariadne Class (Type 393 minesweepers, inshore)" uuid="e3e3da0c-5269-11df-aa36-080069138b88" uid="16518">
+        <specific value="1" description="M 2651 Freya" uuid="e3e4e884-5269-11df-a032-080069138b88" uid="16519"/>
+        <specific value="2" description="M 2653 Hertha" uuid="e3e5f6f2-5269-11df-a927-080069138b88" uid="16520"/>
+        <specific value="3" description="M 2654 Nymphe" uuid="e3e704f2-5269-11df-9f28-080069138b88" uid="16521"/>
+        <specific value="4" description="M 2655 Hertha" uuid="e3e8111c-5269-11df-9f20-080069138b88" uid="16522"/>
+      </subcategory>
+      <subcategory value="6" description="Frankenthal class (type 332 minehunters, coastal)" uuid="e3e9c00c-5269-11df-97d1-080069138b88" uid="16523">
+        <specific value="1" description="M 1060 Weiden" uuid="e3ead028-5269-11df-8866-080069138b88" uid="16524"/>
+        <specific value="2" description="M 1061 Rottweil" uuid="e3ebe15c-5269-11df-acc0-080069138b88" uid="16525"/>
+        <specific value="3" description="M 1062 Sulzbach-Rosenberg" uuid="e3ece9d0-5269-11df-968d-080069138b88" uid="16526"/>
+        <specific value="4" description="M 1063 Bad Bevensen" uuid="e3edfbae-5269-11df-8772-080069138b88" uid="16527"/>
+        <specific value="5" description="M 1064 Gromitz" uuid="e3ef0c6a-5269-11df-91e5-080069138b88" uid="16528"/>
+        <specific value="6" description="M 1065 Dillingen" uuid="e3f01d30-5269-11df-a6a7-080069138b88" uid="16529"/>
+        <specific value="7" description="M 1066 Frankenthal" uuid="e3f12e1e-5269-11df-9adf-080069138b88" uid="16530"/>
+        <specific value="8" description="M 1067 Bad Rappenau" uuid="e3f23ed0-5269-11df-ab7e-080069138b88" uid="16531"/>
+        <specific value="9" description="M 1068 Datteln" uuid="e3f34dfc-5269-11df-952a-080069138b88" uid="16532"/>
+        <specific value="10" description="M 1069 Homburg" uuid="e3f45be8-5269-11df-b8cb-080069138b88" uid="16533"/>
+      </subcategory>
+      <subcategory value="7" description="Hameln class (type 343 minesweepers, coastal)" uuid="e3f60aa6-5269-11df-a8d0-080069138b88" uid="16534">
+        <specific value="1" description="M 1090 Pegnitz" uuid="e3f71e5a-5269-11df-bb06-080069138b88" uid="16535"/>
+        <specific value="2" description="M 1091 Kulmbach" uuid="e3f827e6-5269-11df-8b3d-080069138b88" uid="16536"/>
+        <specific value="3" description="M 1092 Hameln" uuid="e3f93596-5269-11df-8fef-080069138b88" uid="16537"/>
+        <specific value="4" description="M 1093 Auerbach" uuid="e3fa4634-5269-11df-b1a9-080069138b88" uid="16538"/>
+        <specific value="5" description="M 1094 Ensdorf" uuid="e3fb53a8-5269-11df-81cc-080069138b88" uid="16539"/>
+        <specific value="6" description="M 1095 Uberherrn" uuid="e3fc61e4-5269-11df-8f25-080069138b88" uid="16540"/>
+        <specific value="7" description="M 1096 Passau" uuid="e3fd6ff8-5269-11df-aada-080069138b88" uid="16541"/>
+        <specific value="8" description="M 1097 Laboe" uuid="e3fe78c6-5269-11df-96f1-080069138b88" uid="16542"/>
+        <specific value="9" description="M 1098 Siegburg" uuid="e3ff8afe-5269-11df-a1e6-080069138b88" uid="16543"/>
+        <specific value="10" description="M 1099 Herten" uuid="e4009886-5269-11df-9be7-080069138b88" uid="16544"/>
+      </subcategory>
+      <subcategory value="8" description="Trials ship (type 740, ex-minesweeper)" uuid="e402469a-5269-11df-9505-080069138b88" uid="16545">
+        <specific value="1" description="A 1400 Holnis (ex-A 836)" uuid="e4035620-5269-11df-ac70-080069138b88" uid="16546"/>
+      </subcategory>
+      <subcategory value="9" description="Schutze class (type 732, diver-support ship)" uuid="e4050646-5269-11df-a9e7-080069138b88" uid="16547">
+        <specific value="1" description="M 1053 Stier (ex-Y 849)" uuid="e4061518-5269-11df-b30d-080069138b88" uid="16548"/>
+      </subcategory>
+      <subcategory value="10" description="Sachsenwald class (type 762, mine transport)" uuid="e407c7a0-5269-11df-bab1-080069138b88" uid="16549">
+        <specific value="1" description="A 1438 Steigerwald" uuid="e408d852-5269-11df-ac37-080069138b88" uid="16550"/>
+      </subcategory>
+      <subcategory value="11" description="Kondor I class (minesweeper/patrol craft; Coast Guard vessels)" uuid="e40a89e0-5269-11df-aa82-080069138b88" uid="16551">
+        <specific value="1" description="BG 31 Templin (ex-GS 06, ex-G 442)" uuid="e40b9722-5269-11df-97e1-080069138b88" uid="16552"/>
+        <specific value="2" description="BG 32 Kuhlungsborn (ex-GS 07, ex-G 445)" uuid="e40ca694-5269-11df-9e1c-080069138b88" uid="16553"/>
+        <specific value="3" description="BG 33 Ahrenshoop (ex-GS 08, ex-G 415)" uuid="e40db868-5269-11df-8878-080069138b88" uid="16554"/>
+        <specific value="4" description="GS 01 Uckermunde (ex-G 411)" uuid="e40ece56-5269-11df-9230-080069138b88" uid="16555"/>
+        <specific value="5" description="GS 02 Demmin (ex-G 422)" uuid="e40fe28c-5269-11df-8cc2-080069138b88" uid="16556"/>
+        <specific value="6" description="GS 03 Malchin (ex-G 441)" uuid="e410f17c-5269-11df-9473-080069138b88" uid="16557"/>
+        <specific value="7" description="GS 04 Altentreptow (ex-G 414)" uuid="e411fe5a-5269-11df-83ce-080069138b88" uid="16558"/>
+        <specific value="8" description="GS 05 Pasewalk (ex-G 423)" uuid="e41316f0-5269-11df-b5cd-080069138b88" uid="16559"/>
+        <specific value="9" description="GS 09 Boltenhagen (ex-G 443)" uuid="e414268a-5269-11df-8633-080069138b88" uid="16560"/>
+      </subcategory>
+      <subcategory value="12" description="Seehund (Minesweepers - Drones)(MSD)" uuid="e415d5de-5269-11df-a2e7-080069138b88" uid="16561"/>
+    </category>
+    <category value="11" description="Landing Craft" uuid="e417899c-5269-11df-b33c-080069138b88" uid="16562">
+      <subcategory value="1" description="Type 521 (LCMs)" uuid="e4189274-5269-11df-ad3a-080069138b88" uid="16563">
+        <specific value="1" description="LCM 12 Sprotte" uuid="e419a2ea-5269-11df-ae7c-080069138b88" uid="16564"/>
+        <specific value="2" description="LCM 13 Sardine" uuid="e41ab126-5269-11df-b9b9-080069138b88" uid="16565"/>
+        <specific value="3" description="LCM 14 Sardelle" uuid="e41bbe72-5269-11df-a8cc-080069138b88" uid="16566"/>
+        <specific value="4" description="LCM 15 Hering" uuid="e41ccdbc-5269-11df-8fb6-080069138b88" uid="16567"/>
+        <specific value="5" description="LCM 16 Orfe" uuid="e41ddbee-5269-11df-8d3b-080069138b88" uid="16568"/>
+        <specific value="6" description="LCM 17 Marane" uuid="e41eea52-5269-11df-9b92-080069138b88" uid="16569"/>
+        <specific value="7" description="LCM 18 Saibling" uuid="e41ff9a6-5269-11df-be15-080069138b88" uid="16570"/>
+        <specific value="8" description="LCM 19 Stint" uuid="e42107f6-5269-11df-bab3-080069138b88" uid="16571"/>
+        <specific value="9" description="LCM 20 Aesche" uuid="e4221196-5269-11df-a5db-080069138b88" uid="16572"/>
+        <specific value="10" description="L 780 Hummer" uuid="e423222a-5269-11df-9302-080069138b88" uid="16573"/>
+        <specific value="11" description="L 781 Krill" uuid="e4243534-5269-11df-bb50-080069138b88" uid="16574"/>
+        <specific value="12" description="L 782 Krabbe" uuid="e4253e3e-5269-11df-bf0c-080069138b88" uid="16575"/>
+        <specific value="13" description="L 783 Auster" uuid="e4264be4-5269-11df-a65f-080069138b88" uid="16576"/>
+        <specific value="14" description="L 784 Muschel" uuid="e4275cb4-5269-11df-983a-080069138b88" uid="16577"/>
+        <specific value="15" description="L 785 Koralle" uuid="e42868ca-5269-11df-a45d-080069138b88" uid="16578"/>
+        <specific value="16" description="L 786 Garnele" uuid="e4297710-5269-11df-8010-080069138b88" uid="16579"/>
+        <specific value="17" description="L 787 Languste" uuid="e42a886c-5269-11df-8ba6-080069138b88" uid="16580"/>
+      </subcategory>
+      <subcategory value="2" description="Type 520 (LCUs)" uuid="e42c39b4-5269-11df-a159-080069138b88" uid="16581">
+        <specific value="1" description="L 760 Flunder" uuid="e42d4c00-5269-11df-b963-080069138b88" uid="16582"/>
+        <specific value="2" description="L 761 Karpfen" uuid="e42e5a14-5269-11df-8b19-080069138b88" uid="16583"/>
+        <specific value="3" description="L 762 Lachs" uuid="e42f6940-5269-11df-8a0e-080069138b88" uid="16584"/>
+        <specific value="4" description="L 763 Plotze" uuid="e43076dc-5269-11df-9157-080069138b88" uid="16585"/>
+        <specific value="5" description="L 766 Stor" uuid="e4318720-5269-11df-9a8a-080069138b88" uid="16586"/>
+        <specific value="6" description="L 767 Tummler" uuid="e432958e-5269-11df-bd02-080069138b88" uid="16587"/>
+        <specific value="7" description="L 768 Wels" uuid="e433a26c-5269-11df-ad96-080069138b88" uid="16588"/>
+        <specific value="8" description="L 769 Zander" uuid="e434b224-5269-11df-a3d3-080069138b88" uid="16589"/>
+        <specific value="9" description="L 788 Butt" uuid="e435c128-5269-11df-82cc-080069138b88" uid="16590"/>
+        <specific value="10" description="L 795 Inger" uuid="e436c938-5269-11df-8e63-080069138b88" uid="16591"/>
+      </subcategory>
+      <subcategory value="3" description="Mannheim 59 class (river landing craft, LCMs)" uuid="e4387d14-5269-11df-a1a7-080069138b88" uid="16592"/>
+      <subcategory value="4" description="Bodan class (river landing craft, LCMs)" uuid="e4398f9c-5269-11df-b1cb-080069138b88" uid="16593"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="e43b3ea0-5269-11df-8616-080069138b88" uid="16594">
+      <subcategory value="1" description="Elbe class (type 404, tenders)" uuid="e43c4cd2-5269-11df-97fc-080069138b88" uid="16595">
+        <specific value="1" description="A 511 Elbe" uuid="e43d5bf4-5269-11df-8d4c-080069138b88" uid="16596"/>
+        <specific value="2" description="A 512 Mosel" uuid="e43e6a76-5269-11df-bc4d-080069138b88" uid="16597"/>
+        <specific value="3" description="A 513 Rhein" uuid="e43f7934-5269-11df-91cb-080069138b88" uid="16598"/>
+        <specific value="4" description="A 514 Werra" uuid="e44080c2-5269-11df-80d2-080069138b88" uid="16599"/>
+        <specific value="5" description="A 515 Main" uuid="e44191ec-5269-11df-bbdd-080069138b88" uid="16600"/>
+        <specific value="6" description="A 516 Donau" uuid="e442a47e-5269-11df-9a81-080069138b88" uid="16601"/>
+      </subcategory>
+      <subcategory value="2" description="Rhein class (type 401, tenders)" uuid="e44450bc-5269-11df-955c-080069138b88" uid="16602">
+        <specific value="1" description="A 58 Rhein" uuid="e4455c0a-5269-11df-b16b-080069138b88" uid="16603"/>
+        <specific value="2" description="A 61 Elbe" uuid="e4466ed8-5269-11df-99c3-080069138b88" uid="16604"/>
+        <specific value="3" description="A 63 Main" uuid="e4477d28-5269-11df-a59b-080069138b88" uid="16605"/>
+        <specific value="4" description="A 69 Donau" uuid="e448852e-5269-11df-bf02-080069138b88" uid="16606"/>
+      </subcategory>
+      <subcategory value="3" description="Replenishment tankers (type 704)" uuid="e44a35e0-5269-11df-9c0f-080069138b88" uid="16607">
+        <specific value="1" description="A 1442 Spessart (ex-Okapi)" uuid="e44b467e-5269-11df-b032-080069138b88" uid="16608"/>
+        <specific value="2" description="A 1443 Rhon (ex-Okene)" uuid="e44c5e92-5269-11df-a09e-080069138b88" uid="16609"/>
+      </subcategory>
+      <subcategory value="4" description="Walchensee class (type 703, replenishment tankers)" uuid="e44e125a-5269-11df-bef5-080069138b88" uid="16610">
+        <specific value="1" description="A 1424 Walchensee" uuid="e44f1eb6-5269-11df-8800-080069138b88" uid="16611"/>
+        <specific value="2" description="A 1425 Ammersee" uuid="e4502e64-5269-11df-aebc-080069138b88" uid="16612"/>
+        <specific value="3" description="A 1426 Tegernsee" uuid="e451438a-5269-11df-9ae4-080069138b88" uid="16613"/>
+        <specific value="4" description="A 1427 Westensee" uuid="e452511c-5269-11df-833b-080069138b88" uid="16614"/>
+      </subcategory>
+      <subcategory value="5" description="Type 763 (support tanker)" uuid="e45403a4-5269-11df-8cdc-080069138b88" uid="16615">
+        <specific value="1" description="A 1407 Wittensee (ex-Sioux)" uuid="e456fc30-5269-11df-a987-080069138b88" uid="16616"/>
+      </subcategory>
+      <subcategory value="6" description="Luneburg class (type 701, support ships)" uuid="e458b9ee-5269-11df-804b-080069138b88" uid="16617">
+        <specific value="1" description="A 1411 Luneburg" uuid="e459cd66-5269-11df-be7a-080069138b88" uid="16618"/>
+        <specific value="2" description="A 1413 Freiburg" uuid="e45addaa-5269-11df-8dc5-080069138b88" uid="16619"/>
+        <specific value="3" description="A 1414 Glucksburg" uuid="e45beb78-5269-11df-af21-080069138b88" uid="16620"/>
+        <specific value="4" description="A 1415 Saarburg" uuid="e45cfb8a-5269-11df-9b0e-080069138b88" uid="16621"/>
+        <specific value="5" description="A 1416 Nienburg" uuid="e45e0c46-5269-11df-919e-080069138b88" uid="16622"/>
+        <specific value="6" description="A 1417 Offenburg" uuid="e45f1992-5269-11df-adfc-080069138b88" uid="16623"/>
+        <specific value="7" description="A 1418 Meersburg" uuid="e46029ea-5269-11df-83f7-080069138b88" uid="16624"/>
+      </subcategory>
+      <subcategory value="7" description="Westerwald class (type 760, ammunition, transports)" uuid="e461d97a-5269-11df-83d8-080069138b88" uid="16625">
+        <specific value="1" description="A 1435 Westerwald" uuid="e462ed74-5269-11df-9aa3-080069138b88" uid="16626"/>
+        <specific value="2" description="A 1436 Odenwald" uuid="e463f64c-5269-11df-8364-080069138b88" uid="16627"/>
+      </subcategory>
+      <subcategory value="8" description="Towing launches (type 946)" uuid="e465a550-5269-11df-b355-080069138b88" uid="16628">
+        <specific value="1" description="AK 1 Y 1671" uuid="e466b83c-5269-11df-b071-080069138b88" uid="16629"/>
+        <specific value="2" description="AK 3 Y 1672" uuid="e467c6f0-5269-11df-bef6-080069138b88" uid="16630"/>
+        <specific value="3" description="MA 2 Y 1676" uuid="e468cf32-5269-11df-af67-080069138b88" uid="16631"/>
+        <specific value="4" description="MA 3 Y 1677" uuid="e469e2f0-5269-11df-91a5-080069138b88" uid="16632"/>
+        <specific value="5" description="Borby Y 1687" uuid="e46afbc2-5269-11df-b470-080069138b88" uid="16633"/>
+      </subcategory>
+      <subcategory value="9" description="Oste Class (type 423, AGI)" uuid="e46caa30-5269-11df-9a21-080069138b88" uid="16634">
+        <specific value="1" description="A 50 Alster" uuid="e46db6e6-5269-11df-a393-080069138b88" uid="16635"/>
+        <specific value="2" description="A 52 Oste" uuid="e46ec66c-5269-11df-bc7e-080069138b88" uid="16636"/>
+        <specific value="3" description="A 53 Oker" uuid="e46fd4f8-5269-11df-bc54-080069138b88" uid="16637"/>
+      </subcategory>
+      <subcategory value="10" description="Trials ship (type 742)" uuid="e471860e-5269-11df-9732-080069138b88" uid="16638">
+        <specific value="1" description="A 1410 Walther Von Ledebur (ex-Y 841)" uuid="e4728fea-5269-11df-b1bb-080069138b88" uid="16639"/>
+      </subcategory>
+      <subcategory value="11" description="Research ship (type 750)" uuid="e4743fe8-5269-11df-90ab-080069138b88" uid="16640">
+        <specific value="1" description="A 1450 Planet" uuid="e4755252-5269-11df-98d7-080069138b88" uid="16641"/>
+      </subcategory>
+      <subcategory value="12" description="Trials ship (type 741)" uuid="e476fefe-5269-11df-853c-080069138b88" uid="16642">
+        <specific value="1" description="A 1408 SP 1 (ex-A 837)" uuid="e4780f10-5269-11df-ac0e-080069138b88" uid="16643"/>
+        <specific value="2" description="A 1409 Wilhelm Pullwer (ex-Y 838)" uuid="e4791cb6-5269-11df-a014-080069138b88" uid="16644"/>
+      </subcategory>
+      <subcategory value="13" description="Diving tender (type 732)" uuid="e47acbba-5269-11df-ae4f-080069138b88" uid="16645">
+        <specific value="1" description="M 1050 TB1" uuid="e47bda1e-5269-11df-8156-080069138b88" uid="16646"/>
+      </subcategory>
+      <subcategory value="14" description="Helgoland class (type 720, salvage tugs)" uuid="e47d8c56-5269-11df-9c3f-080069138b88" uid="16647">
+        <specific value="1" description="A 1457 Helgoland" uuid="e47e9c9a-5269-11df-9774-080069138b88" uid="16648"/>
+        <specific value="2" description="A 1458 Fehmarn" uuid="e47fa996-5269-11df-8c58-080069138b88" uid="16649"/>
+      </subcategory>
+      <subcategory value="15" description="Wangerooge class (type 722, type 754; tugs)" uuid="e4815b4c-5269-11df-9371-080069138b88" uid="16650">
+        <specific value="1" description="A 1439 Baltrum" uuid="e4826b04-5269-11df-ad92-080069138b88" uid="16651"/>
+        <specific value="2" description="A 1440 Juist" uuid="e48379ae-5269-11df-b04c-080069138b88" uid="16652"/>
+        <specific value="3" description="A 1441 Langeoog" uuid="e4848646-5269-11df-aa97-080069138b88" uid="16653"/>
+        <specific value="4" description="A 1451 Wangerooge" uuid="e485940a-5269-11df-a0e5-080069138b88" uid="16654"/>
+        <specific value="5" description="A 1452 Spiekeroog" uuid="e486a2e6-5269-11df-b5be-080069138b88" uid="16655"/>
+        <specific value="6" description="A 1455 Rderney" uuid="e487b1fe-5269-11df-93bb-080069138b88" uid="16656"/>
+      </subcategory>
+      <subcategory value="16" description="Berlin Class (Type 702)(AOR)" uuid="e48968dc-5269-11df-b4f1-080069138b88" uid="16657">
+        <specific value="1" description="A1411 Berlin" uuid="e48a78f8-5269-11df-906b-080069138b88" uid="16658"/>
+      </subcategory>
+    </category>
+    <category value="17" description="Auxiliary, Merchant Marine" uuid="e48cc8ec-5269-11df-b8fb-080069138b88" uid="16659">
+      <subcategory value="1" description="Harbor tugs (type 724)" uuid="e48dd912-5269-11df-a14c-080069138b88" uid="16660">
+        <specific value="1" description="Y 820 Sylt" uuid="e48eec3a-5269-11df-b1d6-080069138b88" uid="16661"/>
+        <specific value="2" description="Y 821 Fohr" uuid="e48ff9d6-5269-11df-8730-080069138b88" uid="16662"/>
+        <specific value="3" description="Y 822 Amrum" uuid="e4910312-5269-11df-a433-080069138b88" uid="16663"/>
+        <specific value="4" description="Y 823 Neuwerk" uuid="e49214a0-5269-11df-a3bd-080069138b88" uid="16664"/>
+        <specific value="5" description="Y 1680 Neuende" uuid="e493234a-5269-11df-9b0e-080069138b88" uid="16665"/>
+        <specific value="6" description="Y 1681 Heppens" uuid="e4942ce0-5269-11df-9fc5-080069138b88" uid="16666"/>
+        <specific value="7" description="Y 1682 Ellerbek" uuid="e4953c8e-5269-11df-a517-080069138b88" uid="16667"/>
+      </subcategory>
+      <subcategory value="2" description="Harbor tugs (type 725)" uuid="e496eeb2-5269-11df-a10f-080069138b88" uid="16668">
+        <specific value="1" description="Y 812 Lutjehorn" uuid="e497fd70-5269-11df-92b3-080069138b88" uid="16669"/>
+        <specific value="2" description="Y 814 Knechtsand" uuid="e4990594-5269-11df-a02f-080069138b88" uid="16670"/>
+        <specific value="3" description="Y 815 Scharhorn" uuid="e49a15a6-5269-11df-af1f-080069138b88" uid="16671"/>
+        <specific value="4" description="Y 816 Vogelsand" uuid="e49b2874-5269-11df-bb44-080069138b88" uid="16672"/>
+        <specific value="5" description="Y 817 Rdstrand" uuid="e49c3070-5269-11df-8f11-080069138b88" uid="16673"/>
+        <specific value="6" description="Y 819 Langeness" uuid="e49d3f88-5269-11df-8536-080069138b88" uid="16674"/>
+      </subcategory>
+      <subcategory value="3" description="Harbor tugs (type 414)" uuid="e49ef15c-5269-11df-844f-080069138b88" uid="16675">
+        <specific value="1" description="Koos (ex-Delphin)" uuid="e4a00006-5269-11df-9eb7-080069138b88" uid="16676"/>
+        <specific value="2" description="Wustrow (ex-Zander)" uuid="e4a10938-5269-11df-906a-080069138b88" uid="16677"/>
+        <specific value="3" description="Drankse (ex-Kormoran)" uuid="e4a21c24-5269-11df-9d1d-080069138b88" uid="16678"/>
+        <specific value="4" description="Y 1651 (ex-A 08)" uuid="e4a32bc8-5269-11df-b991-080069138b88" uid="16679"/>
+        <specific value="5" description="Y 1656 (ex-A 45)" uuid="e4a434f0-5269-11df-969a-080069138b88" uid="16680"/>
+        <specific value="6" description="Y 1658 (ex-A 68)" uuid="e4a541b0-5269-11df-9295-080069138b88" uid="16681"/>
+      </subcategory>
+      <subcategory value="4" description="Icebreaking tug (type 724; Coast Guard vessels)" uuid="e4a6f442-5269-11df-8f57-080069138b88" uid="16682">
+        <specific value="1" description="BG 5 Rettin" uuid="e4a80ddc-5269-11df-9bce-080069138b88" uid="16683"/>
+      </subcategory>
+    </category>
+    <category value="18" description="Utility" uuid="e4aa5c2c-5269-11df-a88a-080069138b88" uid="16684">
+      <subcategory value="1" description="Gustav Konigs class (harbor tankers)" uuid="e4ab69d2-5269-11df-85af-080069138b88" uid="16685">
+        <specific value="1" description="Y 1652 Kolpinsee (ex-C 11)" uuid="e4ac7962-5269-11df-944d-080069138b88" uid="16686"/>
+        <specific value="2" description="Y 1657 Fleesensee (ex-C 40)" uuid="e4ad8a14-5269-11df-ba61-080069138b88" uid="16687"/>
+      </subcategory>
+      <subcategory value="2" description="Ohre class (accommodation ships)" uuid="e4af3b0c-5269-11df-ae84-080069138b88" uid="16688">
+        <specific value="1" description="Y 890 Vogtland (ex-H 71)" uuid="e4b04ac4-5269-11df-ad3e-080069138b88" uid="16689"/>
+        <specific value="2" description="Y 891 Altmark (ex-H 11)" uuid="e4b159f0-5269-11df-80b0-080069138b88" uid="16690"/>
+        <specific value="3" description="Y 892 Havelland (ex-H 51)" uuid="e4b29586-5269-11df-bffb-080069138b88" uid="16691"/>
+        <specific value="4" description="Y 893 Uckermark (ex-H 91)" uuid="e4b3aa02-5269-11df-b71e-080069138b88" uid="16692"/>
+        <specific value="5" description="Y 894 Borde (ex-H 72)" uuid="e4b4b8f2-5269-11df-a730-080069138b88" uid="16693"/>
+        <specific value="6" description="Y 895 Wische (ex-H 31)" uuid="e4b5c7ba-5269-11df-858d-080069138b88" uid="16694"/>
+      </subcategory>
+      <subcategory value="3" description="Type 705 (water boats)" uuid="e4b776be-5269-11df-8e4c-080069138b88" uid="16695">
+        <specific value="1" description="FW 1 A 1403 (ex-Y 864)" uuid="e4b889fa-5269-11df-9585-080069138b88" uid="16696"/>
+        <specific value="2" description="FW 5 A 1405 (ex-Y 868)" uuid="e4b99548-5269-11df-8228-080069138b88" uid="16697"/>
+      </subcategory>
+      <subcategory value="4" description="Knurrhahn Class (type 730, accommodation ship)" uuid="e4bb42a8-5269-11df-be00-080069138b88" uid="16698">
+        <specific value="1" description="Y 811 Knurrhahn" uuid="e4bc54ae-5269-11df-a80a-080069138b88" uid="16699"/>
+      </subcategory>
+      <subcategory value="5" description="Battery-charging craft (type 718)" uuid="e4be08e4-5269-11df-af45-080069138b88" uid="16700">
+        <specific value="1" description="LP 1" uuid="e4bf17f2-5269-11df-bab9-080069138b88" uid="16701"/>
+        <specific value="2" description="LP 2" uuid="e4c01f6c-5269-11df-a076-080069138b88" uid="16702"/>
+        <specific value="3" description="Y 1690 LP 3" uuid="e4c12f7e-5269-11df-990e-080069138b88" uid="16703"/>
+      </subcategory>
+      <subcategory value="6" description="Schwedeneck class (type 748, multipurpose)" uuid="e4c2e288-5269-11df-97fa-080069138b88" uid="16704">
+        <specific value="1" description="Y 860 Schwedeneck" uuid="e4c3f290-5269-11df-a32e-080069138b88" uid="16705"/>
+        <specific value="2" description="Y 861 Kronsort" uuid="e4c4fabe-5269-11df-a45c-080069138b88" uid="16706"/>
+        <specific value="3" description="Y 862 Helmsand" uuid="e4c60ab2-5269-11df-a8f4-080069138b88" uid="16707"/>
+      </subcategory>
+      <subcategory value="7" description="Stollergrund class (type 745, multipurpose)" uuid="e4c7c6d6-5269-11df-996e-080069138b88" uid="16708">
+        <specific value="1" description="Y 863 Stollergrund" uuid="e4c8d774-5269-11df-afad-080069138b88" uid="16709"/>
+        <specific value="2" description="Y 864 Mittelgrund" uuid="e4c9e146-5269-11df-ac74-080069138b88" uid="16710"/>
+        <specific value="3" description="Y 865 Kalkgrund" uuid="e4caf1a8-5269-11df-baa8-080069138b88" uid="16711"/>
+        <specific value="4" description="Y 866 Breitgrund" uuid="e4cc044e-5269-11df-ba09-080069138b88" uid="16712"/>
+        <specific value="5" description="Y 867 Bant" uuid="e4cd0c90-5269-11df-931a-080069138b88" uid="16713"/>
+      </subcategory>
+      <subcategory value="8" description="Trials ship (type 740)" uuid="e4ceba40-5269-11df-944c-080069138b88" uid="16714">
+        <specific value="1" description="Y 871 Heinz Roggenkamp" uuid="e4cfcb9c-5269-11df-b41b-080069138b88" uid="16715"/>
+      </subcategory>
+      <subcategory value="9" description="Floating docks (types 712-715) and cranes (type 711)" uuid="e4d17dca-5269-11df-979f-080069138b88" uid="16716">
+        <specific value="1" description="A Y 842 Schwimmdocks" uuid="e4d28dbe-5269-11df-b87a-080069138b88" uid="16717"/>
+        <specific value="2" description="Y 875 Hiev" uuid="e4d39a10-5269-11df-b862-080069138b88" uid="16718"/>
+        <specific value="3" description="B Y 879 Schwimmdocks" uuid="e4d4a888-5269-11df-bb18-080069138b88" uid="16719"/>
+        <specific value="4" description="Y 876 Griep" uuid="e4d5b764-5269-11df-a7d0-080069138b88" uid="16720"/>
+        <specific value="5" description="c, 2 and 3" uuid="e4d6c21c-5269-11df-9180-080069138b88" uid="16721"/>
+      </subcategory>
+      <subcategory value="10" description="Tank cleaning vessels (type 710)" uuid="e4d87008-5269-11df-b8a3-080069138b88" uid="16722">
+        <specific value="1" description="Y 1641 Forde" uuid="e4d98178-5269-11df-8942-080069138b88" uid="16723"/>
+        <specific value="2" description="Y 1642 Jade" uuid="e4da9306-5269-11df-a85d-080069138b88" uid="16724"/>
+      </subcategory>
+      <subcategory value="11" description="Trial boat (type 740)" uuid="e4dc3ed6-5269-11df-ae2d-080069138b88" uid="16725">
+        <specific value="1" description="Y 1689 Bums" uuid="e4dd4ccc-5269-11df-81f6-080069138b88" uid="16726"/>
+      </subcategory>
+      <subcategory value="12" description="General service launches (types 740, 743, 744, 744a)" uuid="e4defc52-5269-11df-85d8-080069138b88" uid="16727">
+        <specific value="1" description="Y 1670 MT-BOOT" uuid="e4e00d86-5269-11df-9084-080069138b88" uid="16728"/>
+        <specific value="2" description="Y 1673 AK 5" uuid="e4e11bc2-5269-11df-9b67-080069138b88" uid="16729"/>
+        <specific value="3" description="Y 1674 AK 6" uuid="e4e2290e-5269-11df-a72d-080069138b88" uid="16730"/>
+        <specific value="4" description="Y 1675 AM 8" uuid="e4e3370e-5269-11df-8bef-080069138b88" uid="16731"/>
+        <specific value="5" description="Y 1679 AM 7" uuid="e4e44612-5269-11df-b836-080069138b88" uid="16732"/>
+        <specific value="6" description="Y 1683 AK 6" uuid="e4e55c1e-5269-11df-831d-080069138b88" uid="16733"/>
+        <specific value="7" description="Y 1684 Peter Bachmann" uuid="e4e66cda-5269-11df-aa7a-080069138b88" uid="16734"/>
+        <specific value="8" description="Y 1686 AK 2 Y" uuid="e4e77c4c-5269-11df-8702-080069138b88" uid="16735"/>
+      </subcategory>
+      <subcategory value="13" description="Range-safety craft (5 type 369, 1 type 909)" uuid="e4e92d4e-5269-11df-a109-080069138b88" uid="16736">
+        <specific value="1" description="Y 827 KW 15" uuid="e4ea37fc-5269-11df-bd32-080069138b88" uid="16737"/>
+        <specific value="2" description="Y 830 KW 16" uuid="e4eb4778-5269-11df-9bb7-080069138b88" uid="16738"/>
+        <specific value="3" description="Y 845 KW 17" uuid="e4ec57f8-5269-11df-b8f0-080069138b88" uid="16739"/>
+        <specific value="4" description="Y 832 KW 18" uuid="e4ed6184-5269-11df-bd8b-080069138b88" uid="16740"/>
+        <specific value="5" description="Y 846 KW 20" uuid="e4ee7182-5269-11df-a3a1-080069138b88" uid="16741"/>
+        <specific value="6" description="Y 857 H 11" uuid="e4ef8126-5269-11df-8e46-080069138b88" uid="16742"/>
+      </subcategory>
+      <subcategory value="14" description="Twin-hull oil-recovery ships (type 738)" uuid="e4f13034-5269-11df-a4df-080069138b88" uid="16743">
+        <specific value="1" description="Y 1643 Bottsand" uuid="e4f23d4e-5269-11df-96e8-080069138b88" uid="16744"/>
+        <specific value="2" description="Y 1644 Eversand" uuid="e4f34c70-5269-11df-9664-080069138b88" uid="16745"/>
+      </subcategory>
+      <subcategory value="15" description="Torpedo recovery vessels (type 430A)" uuid="e4f4fac0-5269-11df-9f40-080069138b88" uid="16746">
+        <specific value="1" description="Y 851 TF 1" uuid="e4f60d3e-5269-11df-9039-080069138b88" uid="16747"/>
+        <specific value="2" description="Y 852 TF 2" uuid="e4f714ea-5269-11df-82dc-080069138b88" uid="16748"/>
+        <specific value="3" description="Y 853 TF 3" uuid="e4f8236c-5269-11df-81d3-080069138b88" uid="16749"/>
+        <specific value="4" description="Y 855 TF 5" uuid="e4f934be-5269-11df-bfe7-080069138b88" uid="16750"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate" uuid="e4fb7fc6-5269-11df-987d-080069138b88" uid="16751">
+      <subcategory value="1" description="Thetis class (type 420)" uuid="e4fc8da8-5269-11df-9309-080069138b88" uid="16752">
+        <specific value="1" description="P 6053 Hermes" uuid="e4fd9b62-5269-11df-9fe6-080069138b88" uid="16753"/>
+        <specific value="2" description="P 6055 Triton" uuid="e4fea926-5269-11df-b9b8-080069138b88" uid="16754"/>
+        <specific value="3" description="P 6056 Theseus" uuid="e4ffb726-5269-11df-be34-080069138b88" uid="16755"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="78" uuid="e502a260-5269-11df-85d5-080069138b88" uid="16756">
+    <category value="5" description="SS (Conventional attack-torpedo patrol)" uuid="e503b970-5269-11df-9d62-080069138b88" uid="16757">
+      <subcategory value="1" description="Type 206" uuid="e504ccde-5269-11df-8b1e-080069138b88" uid="16758">
+        <specific value="1" description="S 192 U 13" uuid="e505df20-5269-11df-b062-080069138b88" uid="16759"/>
+        <specific value="2" description="S 193 U 14" uuid="e506e74e-5269-11df-ae08-080069138b88" uid="16760"/>
+        <specific value="3" description="S 198 U 19" uuid="e507f51c-5269-11df-a1cc-080069138b88" uid="16761"/>
+        <specific value="4" description="S 199 U 20" uuid="e5090790-5269-11df-9267-080069138b88" uid="16762"/>
+        <specific value="5" description="S 170 U 21" uuid="e50a0f3c-5269-11df-aa29-080069138b88" uid="16763"/>
+        <specific value="6" description="S 176 U 27" uuid="e50b1d78-5269-11df-b212-080069138b88" uid="16764"/>
+      </subcategory>
+      <subcategory value="2" description="Type 206A" uuid="e50cd0be-5269-11df-ad60-080069138b88" uid="16765">
+        <specific value="1" description="S 194 U 15" uuid="e50dde82-5269-11df-bb1a-080069138b88" uid="16766"/>
+        <specific value="2" description="S 195 U 16" uuid="e50ee5d4-5269-11df-bf8d-080069138b88" uid="16767"/>
+        <specific value="3" description="S 196 U 17" uuid="e50ff672-5269-11df-b5c2-080069138b88" uid="16768"/>
+        <specific value="4" description="S 197 U 18" uuid="e5110968-5269-11df-b23c-080069138b88" uid="16769"/>
+        <specific value="5" description="S 171 U 22" uuid="e51211d2-5269-11df-ab06-080069138b88" uid="16770"/>
+        <specific value="6" description="S 172 U 23" uuid="e5131ef6-5269-11df-afe6-080069138b88" uid="16771"/>
+        <specific value="7" description="S 173 U 24" uuid="e5142f08-5269-11df-9325-080069138b88" uid="16772"/>
+        <specific value="8" description="S 174 U 25" uuid="e5153a92-5269-11df-9423-080069138b88" uid="16773"/>
+        <specific value="9" description="S 175 U 26" uuid="e5164842-5269-11df-90bc-080069138b88" uid="16774"/>
+        <specific value="10" description="S 177 U 28" uuid="e5175868-5269-11df-ad27-080069138b88" uid="16775"/>
+        <specific value="11" description="S 178 U 29" uuid="e5186230-5269-11df-b3d9-080069138b88" uid="16776"/>
+        <specific value="12" description="S 179 U 30" uuid="e519736e-5269-11df-9621-080069138b88" uid="16777"/>
+      </subcategory>
+      <subcategory value="3" description="Type 205" uuid="e51b1f20-5269-11df-af1a-080069138b88" uid="16778">
+        <specific value="1" description="S 188 U 9" uuid="e51c2d48-5269-11df-8f43-080069138b88" uid="16779"/>
+        <specific value="2" description="S 189 U 10" uuid="e51d397c-5269-11df-8f3f-080069138b88" uid="16780"/>
+        <specific value="3" description="S 190 U 11" uuid="e51e470e-5269-11df-afba-080069138b88" uid="16781"/>
+        <specific value="4" description="S 191 U 12" uuid="e51f5478-5269-11df-9bca-080069138b88" uid="16782"/>
+      </subcategory>
+      <subcategory value="4" description="Type 209" uuid="e5210796-5269-11df-8ba8-080069138b88" uid="16783">
+        <specific value="1" description="1500" uuid="e522100a-5269-11df-801c-080069138b88" uid="16784">
+          <extra value="1" description="S44 Shishumar (India)" uuid="e52326fc-5269-11df-8560-080069138b88" uid="16785"/>
+        </specific>
+        <specific value="2" description="1200" uuid="e524d4c0-5269-11df-b85a-080069138b88" uid="16786"/>
+      </subcategory>
+      <subcategory value="5" description="Modernized Kobben class (type 207)" uuid="e52685e0-5269-11df-9f9e-080069138b88" uid="16787">
+        <specific value="1" description="Sklinna (Norway)" uuid="e5279598-5269-11df-9431-080069138b88" uid="16788"/>
+        <specific value="2" description="Skolpen (Norway)" uuid="e5289dc6-5269-11df-b94f-080069138b88" uid="16789"/>
+        <specific value="3" description="Stord (Norway)" uuid="e529af7c-5269-11df-8d35-080069138b88" uid="16790"/>
+        <specific value="4" description="Svenner (Norway)" uuid="e52abd9a-5269-11df-bced-080069138b88" uid="16791"/>
+        <specific value="5" description="Kobben (Norway)" uuid="e52bc8fc-5269-11df-bb57-080069138b88" uid="16792"/>
+        <specific value="6" description="Kunna (Norway)" uuid="e52cd97c-5269-11df-8f28-080069138b88" uid="16793"/>
+      </subcategory>
+      <subcategory value="6" description="Type 212A" uuid="e52e92c6-5269-11df-952b-080069138b88" uid="16794">
+        <specific value="1" description="U-31" uuid="e52fa35a-5269-11df-af5b-080069138b88" uid="16795"/>
+        <specific value="2" description="U-32" uuid="e530b1f0-5269-11df-8189-080069138b88" uid="16796"/>
+        <specific value="3" description="U-33" uuid="e531c1bc-5269-11df-bde0-080069138b88" uid="16797"/>
+        <specific value="4" description="U-34" uuid="e532d200-5269-11df-bbd3-080069138b88" uid="16798"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="5" country="78" uuid="e535cf46-5269-11df-99bf-080069138b88" uid="16799">
+    <category value="1" description="Manned" uuid="e536df58-5269-11df-8446-080069138b88" uid="16800">
+      <subcategory value="1" description="Space vehicles" uuid="e537f38e-5269-11df-875c-080069138b88" uid="16801">
+        <specific value="1" description="Hermes" uuid="e5390364-5269-11df-bf7f-080069138b88" uid="16802"/>
+        <specific value="2" description="Saenger Spaceplane" uuid="e53a0e76-5269-11df-b340-080069138b88" uid="16803"/>
+      </subcategory>
+      <subcategory value="2" description="Space Station" uuid="e53bc3b0-5269-11df-97a9-080069138b88" uid="16804">
+        <specific value="1" description="Columbus" uuid="e53cd39a-5269-11df-a02f-080069138b88" uid="16805"/>
+      </subcategory>
+      <subcategory value="3" description="Space Lab" uuid="e53e8334-5269-11df-8b80-080069138b88" uid="16806">
+        <specific value="1" description="D1" uuid="e53f96d4-5269-11df-b0e5-080069138b88" uid="16807"/>
+        <specific value="2" description="D2" uuid="e540a0ec-5269-11df-8f7e-080069138b88" uid="16808"/>
+        <specific value="3" description="D3" uuid="e541b9aa-5269-11df-ae3f-080069138b88" uid="16809"/>
+        <specific value="4" description="IML 1" uuid="e542cb1a-5269-11df-a462-080069138b88" uid="16810"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Unmanned" uuid="e5451bfe-5269-11df-afae-080069138b88" uid="16811">
+      <subcategory value="1" description="Communication satellite" uuid="e5463084-5269-11df-abde-080069138b88" uid="16812">
+        <specific value="1" description="DFS-Kopernikus" uuid="e5473d58-5269-11df-9741-080069138b88" uid="16813"/>
+        <specific value="2" description="Artemis" uuid="e5484d1a-5269-11df-804b-080069138b88" uid="16814"/>
+        <specific value="3" description="DRS" uuid="e5495ee4-5269-11df-a8cb-080069138b88" uid="16815"/>
+      </subcategory>
+      <subcategory value="5" description="Meteorology satellite" uuid="e54cbada-5269-11df-a7cb-080069138b88" uid="16816">
+        <specific value="1" description="Atmos" uuid="e54dcef2-5269-11df-b40e-080069138b88" uid="16817"/>
+        <specific value="2" description="Azur" uuid="e54edc5c-5269-11df-8da3-080069138b88" uid="16818"/>
+        <specific value="3" description="X-SAR" uuid="e54ff2d6-5269-11df-b2be-080069138b88" uid="16819"/>
+        <specific value="4" description="ERS" uuid="e55103ba-5269-11df-a29e-080069138b88" uid="16820"/>
+        <specific value="5" description="POEM" uuid="e5520dfa-5269-11df-a0ed-080069138b88" uid="16821"/>
+      </subcategory>
+      <subcategory value="7" description="Imaging Radar Surveillance Satellite" uuid="e553c316-5269-11df-acf4-080069138b88" uid="16822">
+        <specific value="1" description="Rosat" uuid="e554d4cc-5269-11df-953f-080069138b88" uid="16823"/>
+      </subcategory>
+      <subcategory value="13" description="Science satellite" uuid="e5568966-5269-11df-9289-080069138b88" uid="16824">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="e5579a18-5269-11df-8aa3-080069138b88" uid="16825"/>
+        <specific value="2" description="Ulysses" uuid="e558a6ec-5269-11df-9f5f-080069138b88" uid="16826"/>
+        <specific value="3" description="Galileo" uuid="e559b708-5269-11df-81b4-080069138b88" uid="16827"/>
+        <specific value="4" description="Soho &amp; Cluster" uuid="e55acc9c-5269-11df-bcb2-080069138b88" uid="16828"/>
+        <specific value="5" description="Eureca" uuid="e55bd86c-5269-11df-9cfa-080069138b88" uid="16829"/>
+        <specific value="6" description="Astro-SPAS" uuid="e55ce9dc-5269-11df-ae89-080069138b88" uid="16830"/>
+        <specific value="7" description="HST" uuid="e55dfade-5269-11df-9ea5-080069138b88" uid="16831"/>
+        <specific value="8" description="Mars-94/96" uuid="e55f0802-5269-11df-82e3-080069138b88" uid="16832"/>
+        <specific value="9" description="ISO" uuid="e5602264-5269-11df-96e2-080069138b88" uid="16833"/>
+        <specific value="10" description="Huygens/Cassini" uuid="e56138ac-5269-11df-8a61-080069138b88" uid="16834"/>
+        <specific value="11" description="Giotto" uuid="e5624a08-5269-11df-8a68-080069138b88" uid="16835"/>
+        <specific value="12" description="Hipparcos" uuid="e5635682-5269-11df-8c68-080069138b88" uid="16836"/>
+        <specific value="13" description="Compton" uuid="e5646996-5269-11df-9256-080069138b88" uid="16837"/>
+        <specific value="14" description="(deprecated)" deprecated="1" uuid="e5657a84-5269-11df-abea-080069138b88" uid="16838"/>
+        <specific value="15" description="Bremsat" uuid="e56687ee-5269-11df-b452-080069138b88" uid="16839"/>
+      </subcategory>
+      <subcategory value="15" description="Microgravity Satellite" uuid="e5683bc0-5269-11df-9872-080069138b88" uid="16840">
+        <specific value="1" description="Spacelab" uuid="e5694f6a-5269-11df-ae00-080069138b88" uid="16841"/>
+        <specific value="2" description="Eureca" uuid="e56a6120-5269-11df-8e86-080069138b88" uid="16842"/>
+        <specific value="3" description="SPAS" uuid="e56b6cfa-5269-11df-8cce-080069138b88" uid="16843"/>
+        <specific value="4" description="Maxus" uuid="e56c804a-5269-11df-9f62-080069138b88" uid="16844"/>
+        <specific value="5" description="Texus" uuid="e56d9002-5269-11df-9aa6-080069138b88" uid="16845"/>
+        <specific value="6" description="Mikroba" uuid="e56e9b96-5269-11df-b93a-080069138b88" uid="16846"/>
+        <specific value="7" description="Mir-92" uuid="e56fabd0-5269-11df-92db-080069138b88" uid="16847"/>
+        <specific value="8" description="MAUS" uuid="e570bf20-5269-11df-b92e-080069138b88" uid="16848"/>
+        <specific value="9" description="Express" uuid="e571c91a-5269-11df-89b7-080069138b88" uid="16849"/>
+      </subcategory>
+      <subcategory value="16" description="Miscellaneous" uuid="e573799a-5269-11df-b368-080069138b88" uid="16850">
+        <specific value="1" description="Shuttle Pallet (SPAS)" uuid="e5748df8-5269-11df-abdc-080069138b88" uid="16851"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Booster" uuid="e576df22-5269-11df-affc-080069138b88" uid="16852">
+      <subcategory value="1" description="Ariane" uuid="e577f0d8-5269-11df-b1ab-080069138b88" uid="16853"/>
+      <subcategory value="2" description="Maxus" uuid="e5790108-5269-11df-8a46-080069138b88" uid="16854"/>
+      <subcategory value="3" description="Saenger" uuid="e57a1638-5269-11df-91da-080069138b88" uid="16855"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="45" uuid="e57c6abe-5269-11df-9c95-080069138b88" uid="16856">
+    <category value="1" description="Tank" uuid="e57d78c8-5269-11df-b279-080069138b88" uid="16857">
+      <subcategory value="1" description="Type 59" uuid="e57e8b6e-5269-11df-8ff8-080069138b88" uid="16858">
+        <specific value="1" description="Type 59-I" uuid="e57fa0bc-5269-11df-bfa4-080069138b88" uid="16859"/>
+        <specific value="2" description="Type 59-II" uuid="e580b0e2-5269-11df-9eaa-080069138b88" uid="16860"/>
+      </subcategory>
+      <subcategory value="2" description="Type 69" uuid="e58262f2-5269-11df-b69a-080069138b88" uid="16861">
+        <specific value="1" description="Type 69-I" uuid="e5836d8c-5269-11df-83b1-080069138b88" uid="16862"/>
+        <specific value="2" description="Type 69-II" uuid="e5847fc4-5269-11df-964e-080069138b88" uid="16863"/>
+      </subcategory>
+      <subcategory value="3" description="Type 79" uuid="e586344a-5269-11df-9876-080069138b88" uid="16864"/>
+      <subcategory value="4" description="Type 80" uuid="e5874448-5269-11df-8fb2-080069138b88" uid="16865">
+        <specific value="1" description="Type 80" uuid="e5884d66-5269-11df-a515-080069138b88" uid="16866"/>
+        <specific value="2" description="Type 80-II" uuid="e58961b0-5269-11df-ba35-080069138b88" uid="16867"/>
+      </subcategory>
+      <subcategory value="5" description="Type 85-II" uuid="e58b169a-5269-11df-b997-080069138b88" uid="16868">
+        <specific value="1" description="Type 85-II" uuid="e58c268e-5269-11df-b667-080069138b88" uid="16869"/>
+        <specific value="2" description="Type 85-IIA" uuid="e58d304c-5269-11df-96fe-080069138b88" uid="16870"/>
+        <specific value="3" description="Type 85-11M (w/125mm gun)" uuid="e58e4298-5269-11df-85e8-080069138b88" uid="16871"/>
+        <specific value="4" description="Type 85-III" uuid="e58f580e-5269-11df-8eee-080069138b88" uid="16872"/>
+      </subcategory>
+      <subcategory value="6" description="Type 63 (light amphibious)" uuid="e5910906-5269-11df-b2d7-080069138b88" uid="16873">
+        <specific value="1" description="Type 63A" uuid="e59214cc-5269-11df-a281-080069138b88" uid="16874"/>
+      </subcategory>
+      <subcategory value="7" description="Type 62 (light)" uuid="e593c934-5269-11df-88aa-080069138b88" uid="16875"/>
+    </category>
+    <category value="2" description="Armored Fighting Vehicle" uuid="e59599b2-5269-11df-bfef-080069138b88" uid="16876">
+      <subcategory value="1" description="NORINCO YW 531 Armored Personnel Carrier (APC)" uuid="e596ac6c-5269-11df-ac4e-080069138b88" uid="16877"/>
+      <subcategory value="2" description="NORINCO Type 85 (YW 531H) Armored Personnel Carrier (APC)" uuid="e597c41c-5269-11df-b39e-080069138b88" uid="16878"/>
+      <subcategory value="3" description="NORINCO YW 534 Armored Personnel Carrier (APC)" uuid="e598d460-5269-11df-b4ff-080069138b88" uid="16879"/>
+      <subcategory value="4" description="NORINCO Type 77 (M1974) Armored Personnel Carrier (APC)" uuid="e599ea3a-5269-11df-ae1a-080069138b88" uid="16880"/>
+      <subcategory value="5" description="NORINCO Type WZ 501 Infantry Fighting Vehicle (IFV)" uuid="e59b02d0-5269-11df-821d-080069138b88" uid="16881"/>
+      <subcategory value="6" description="NORINCO WZ 551 Armored Personnel Carrier (APC)" uuid="e59c1102-5269-11df-8d27-080069138b88" uid="16882"/>
+      <subcategory value="7" description="NORINCO Type WZ 523 Armored Personnel Carrier (APC)" uuid="e59d2e2a-5269-11df-98c1-080069138b88" uid="16883"/>
+    </category>
+    <category value="4" description="Self-propelled Artillery" uuid="e59ee756-5269-11df-b51a-080069138b88" uid="16884">
+      <subcategory value="1" description="Type 54-1 122mm SP Howitzer" uuid="e59ff876-5269-11df-ae90-080069138b88" uid="16885"/>
+      <subcategory value="2" description="Type 83 152mm SP Gun-Howitzer" uuid="e5a105f4-5269-11df-9ae9-080069138b88" uid="16886"/>
+      <subcategory value="3" description="Type 81 122mm Multiple Rocket Launcher (MRL)" uuid="e5a21962-5269-11df-b5c4-080069138b88" uid="16887"/>
+      <subcategory value="4" description="Type 63 130mm Multiple Rocket Launcher (MRL)" uuid="e5a32d84-5269-11df-92fe-080069138b88" uid="16888"/>
+      <subcategory value="5" description="Type 87 253mm Mine Clearing System (MRL)" uuid="e5a44034-5269-11df-9074-080069138b88" uid="16889"/>
+      <subcategory value="6" description="Type 74 284mm Minelaying Rocket System" uuid="e5a55438-5269-11df-b648-080069138b88" uid="16890"/>
+      <subcategory value="7" description="Type 75 105mm Recoilless Rifle" uuid="e5a666e8-5269-11df-9141-080069138b88" uid="16891"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="e5a777c2-5269-11df-8910-080069138b88" uid="16892"/>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="e5a88cd4-5269-11df-990f-080069138b88" uid="16893"/>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="e5a9a006-5269-11df-a4aa-080069138b88" uid="16894"/>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="e5aaad8e-5269-11df-88a1-080069138b88" uid="16895"/>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="e5abbf62-5269-11df-bf78-080069138b88" uid="16896"/>
+      <subcategory value="13" description="SY-1 (Styx) ASCM launcher" uuid="e5acd60e-5269-11df-aa48-080069138b88" uid="16897"/>
+      <subcategory value="14" description="YJ-1/C-802/CSS-N-8 Saccade ASCM launcher" uuid="e5ade38c-5269-11df-a391-080069138b88" uid="16898"/>
+      <subcategory value="15" description="CSS-8 (M-7) surface-to-surface missile launcher" uuid="e5aef6b4-5269-11df-8ba1-080069138b88" uid="16899"/>
+      <subcategory value="16" description="DF-15 (M9) launcher" uuid="e5b00c70-5269-11df-940d-080069138b88" uid="16900"/>
+      <subcategory value="17" description="CSSC-5 (YJ-16/C-101) Saples launcher" uuid="e5b118fe-5269-11df-a226-080069138b88" uid="16901"/>
+      <subcategory value="18" description="CSSC-6 (HY-3) Sawhorse launcher" uuid="e5b22bc2-5269-11df-99b0-080069138b88" uid="16902"/>
+      <subcategory value="19" description="CSSC-7 (HY-4) Sadsack launcher" uuid="e5b33f3a-5269-11df-bfb7-080069138b88" uid="16903"/>
+    </category>
+    <category value="5" description="Towed Artillery" uuid="e5b4f10e-5269-11df-95e2-080069138b88" uid="16904">
+      <subcategory value="1" description="Type 54 122mm Howitzer" uuid="e5b6008a-5269-11df-9976-080069138b88" uid="16905"/>
+      <subcategory value="2" description="Type 59 130mm Gun" uuid="e5b712e0-5269-11df-bc14-080069138b88" uid="16906">
+        <specific value="1" description="Type 59" uuid="e5b82464-5269-11df-8117-080069138b88" uid="16907"/>
+        <specific value="2" description="Type 59-1" uuid="e5b93070-5269-11df-a13c-080069138b88" uid="16908"/>
+      </subcategory>
+      <subcategory value="3" description="Type 54 152mm Howitzer" uuid="e5bae604-5269-11df-b597-080069138b88" uid="16909"/>
+      <subcategory value="4" description="Type 66 152mm Gun-Howitzer" uuid="e5bbffbc-5269-11df-abc7-080069138b88" uid="16910"/>
+      <subcategory value="5" description="Type WA 021 (WAC 21) 155mm Gun-Howitzer" uuid="e5bd15a0-5269-11df-8047-080069138b88" uid="16911"/>
+      <subcategory value="6" description="Type 63 107mm Multiple Rocket Launcher (MRL)" uuid="e5be238c-5269-11df-afda-080069138b88" uid="16912"/>
+      <subcategory value="7" description="Type 65 82mm Recoilless Rifle" uuid="e5bf386c-5269-11df-a0f5-080069138b88" uid="16913"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="e5c04b58-5269-11df-be26-080069138b88" uid="16914"/>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="e5c15c3c-5269-11df-b87c-080069138b88" uid="16915"/>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="e5c26ffa-5269-11df-ab0d-080069138b88" uid="16916"/>
+      <subcategory value="11" description="Type 55 57mm Anti-Tank Gun (ATG)" uuid="e5c3821e-5269-11df-b1fb-080069138b88" uid="16917"/>
+      <subcategory value="12" description="Type 54 76mm ATG" uuid="e5c4923a-5269-11df-a0a6-080069138b88" uid="16918"/>
+      <subcategory value="13" description="Type 56 85mm ATG" uuid="e5c5a3c8-5269-11df-8628-080069138b88" uid="16919"/>
+      <subcategory value="14" description="Type 73 100mm ATG" uuid="e5c6b6aa-5269-11df-844f-080069138b88" uid="16920"/>
+      <subcategory value="15" description="Type 86 100mm ATG" uuid="e5c7c66c-5269-11df-b349-080069138b88" uid="16921"/>
+      <subcategory value="16" description="HY-series ASCM launcher" uuid="e5c8d8ae-5269-11df-9778-080069138b88" uid="16922">
+        <specific value="1" description="HY-1/CSSC-2 Silkworm launcher" uuid="e5c9eabe-5269-11df-a6a2-080069138b88" uid="16923"/>
+        <specific value="2" description="HY-2/CSSC-3 Seersucker launcher" uuid="e5caf81e-5269-11df-94b8-080069138b88" uid="16924"/>
+      </subcategory>
+      <subcategory value="17" description="C-801/YJ-1/CSS-N-4 Sardine launcher" uuid="e5ccad26-5269-11df-ab09-080069138b88" uid="16925"/>
+    </category>
+    <category value="6" description="Small Wheeled Utility Vehicle (0 - 1.25 tons)" uuid="e5ce5f86-5269-11df-85ef-080069138b88" uid="16926">
+      <subcategory value="1" description="BJ212 4x4" uuid="e5cf75b0-5269-11df-99e5-080069138b88" uid="16927"/>
+    </category>
+    <category value="7" description="Large Wheeled Utility Vehicle (greater than 1.25 tons)" uuid="e5d1275c-5269-11df-9e7a-080069138b88" uid="16928">
+      <subcategory value="1" description="Jiefang CA-10" uuid="e5d23818-5269-11df-a217-080069138b88" uid="16929"/>
+      <subcategory value="2" description="Jiefang CA-30 6x6 2500kg cargo/utility truck" uuid="e5d348de-5269-11df-a867-080069138b88" uid="16930">
+        <specific value="1" description="CA-30" uuid="e5d45c2e-5269-11df-b9c5-080069138b88" uid="16931"/>
+        <specific value="2" description="CA-30A" uuid="e5d56cf4-5269-11df-9d79-080069138b88" uid="16932"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Mortar" uuid="e5d7be6e-5269-11df-956d-080069138b88" uid="16933">
+      <subcategory value="1" description="100 mm type 71 mortar" uuid="e5d8cdcc-5269-11df-803c-080069138b88" uid="16934"/>
+      <subcategory value="2" description="120 mm type 55 mortar" uuid="e5d9dd8e-5269-11df-ba45-080069138b88" uid="16935"/>
+      <subcategory value="3" description="160 mm type 56 mortar" uuid="e5daf782-5269-11df-ae13-080069138b88" uid="16936"/>
+    </category>
+    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="e5dcaa3c-5269-11df-82d1-080069138b88" uid="16937">
+      <subcategory value="1" description="HQ-2/CSA-1 SAM System" uuid="e5ddc02a-5269-11df-9b7a-080069138b88" uid="16938">
+        <specific value="1" description="Battalion C3 Vehicle" uuid="e5decc04-5269-11df-ac92-080069138b88" uid="16939"/>
+        <specific value="2" description="HQ-2 Launcher" uuid="e5dfdd38-5269-11df-b04f-080069138b88" uid="16940">
+          <extra value="1" description="HQ-2 Launcher (standard)" uuid="e5e0f056-5269-11df-88c9-080069138b88" uid="16941"/>
+          <extra value="2" description="HQ-2B SP Launcher (tracked)" uuid="e5e1fb5e-5269-11df-a169-080069138b88" uid="16942"/>
+        </specific>
+        <specific value="3" description="Gin Sling Engagement Radar" uuid="e5e3afd0-5269-11df-8adf-080069138b88" uid="16943">
+          <extra value="1" description="Gin Sling A" uuid="e5e4c7f8-5269-11df-a958-080069138b88" uid="16944"/>
+          <extra value="2" description="Gin Sling B" uuid="e5e5d850-5269-11df-a93e-080069138b88" uid="16945"/>
+        </specific>
+      </subcategory>
+      <subcategory value="2" description="HQ-61/CSA-2 SAM System" uuid="e5e82ace-5269-11df-9540-080069138b88" uid="16946">
+        <specific value="1" description="Battery Command Post Vehicle" uuid="e5e93c84-5269-11df-940e-080069138b88" uid="16947"/>
+        <specific value="2" description="HQ-61 Twin-Rail Launcher Vehicle" uuid="e5ea49c6-5269-11df-9e4d-080069138b88" uid="16948"/>
+        <specific value="3" description="HQ-61 Engagement Radar" uuid="e5eb5d5c-5269-11df-a39c-080069138b88" uid="16949"/>
+      </subcategory>
+      <subcategory value="3" description="LY-60 SAM System" uuid="e5ed11b0-5269-11df-891f-080069138b88" uid="16950">
+        <specific value="1" description="LY-60 Battery C3 Vehicle" uuid="e5ee2230-5269-11df-a990-080069138b88" uid="16951"/>
+        <specific value="2" description="LY-60 5-Round SP Launcher" uuid="e5ef2fae-5269-11df-85a2-080069138b88" uid="16952"/>
+        <specific value="3" description="LY-60 Engagement Radar Vehicle" uuid="e5f04178-5269-11df-b529-080069138b88" uid="16953"/>
+        <specific value="4" description="LY-60 Surveillance Radar Vehicle" uuid="e5f152e8-5269-11df-b64e-080069138b88" uid="16954"/>
+      </subcategory>
+      <subcategory value="4" description="Self-Propelled VSHORAD Gun/Missile System" uuid="e5f309b2-5269-11df-b4ee-080069138b88" uid="16955">
+        <specific value="1" description="PL-9 SAM System (quad-rail)" uuid="e5f416b8-5269-11df-ba79-080069138b88" uid="16956"/>
+        <specific value="2" description="HN-5C SAM System" uuid="e5f52a26-5269-11df-a668-080069138b88" uid="16957"/>
+      </subcategory>
+      <subcategory value="5" description="Towed VSHORAD Gun/Missile System" uuid="e5f6e064-5269-11df-89e2-080069138b88" uid="16958">
+        <specific value="1" description="Type 59 57mm AA Gun (similar to CIS S-60)" uuid="e5f7f224-5269-11df-9fd4-080069138b88" uid="16959"/>
+        <specific value="2" description="NORINCO 37mm AA Guns" uuid="e5f9001a-5269-11df-a9bc-080069138b88" uid="16960">
+          <extra value="1" description="Type 55" uuid="e5fa1b1c-5269-11df-9aca-080069138b88" uid="16961"/>
+          <extra value="2" description="Type 65 (twin)" uuid="e5fb2b7e-5269-11df-ab38-080069138b88" uid="16962"/>
+          <extra value="3" description="Type 74 (twin)" uuid="e5fc37bc-5269-11df-8884-080069138b88" uid="16963"/>
+          <extra value="4" description="Type P793 (twin)" uuid="e5fd47e2-5269-11df-a7dd-080069138b88" uid="16964"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="45" uuid="e600dccc-5269-11df-820d-080069138b88" uid="16965">
+    <category value="1" description="Fighter/Air Defense" uuid="e601eec8-5269-11df-bbec-080069138b88" uid="16966">
+      <subcategory value="1" description="Shenyang F-6 (Farmer)" uuid="e602fe1c-5269-11df-a429-080069138b88" uid="16967"/>
+      <subcategory value="2" description="Xien J-7 (Fishbed)" uuid="e6040dde-5269-11df-aee8-080069138b88" uid="16968">
+        <specific value="1" description="J-7 II" uuid="e60522fa-5269-11df-90ee-080069138b88" uid="16969"/>
+        <specific value="2" description="J-7 E" uuid="e6063492-5269-11df-a2ca-080069138b88" uid="16970"/>
+        <specific value="3" description="J-7 / F-7 III" uuid="e6073ed2-5269-11df-8be5-080069138b88" uid="16971"/>
+        <specific value="4" description="F-7 III" deprecated="1" uuid="e6085326-5269-11df-a19d-080069138b88" uid="16972"/>
+      </subcategory>
+      <subcategory value="3" description="Shenyang J-8 (Finback)" uuid="e60a0590-5269-11df-91ec-080069138b88" uid="16973">
+        <specific value="1" description="J-8 I Finback A" uuid="e60b173c-5269-11df-80dd-080069138b88" uid="16974"/>
+        <specific value="2" description="J-8 II Finback B" uuid="e60c25c8-5269-11df-95d9-080069138b88" uid="16975"/>
+      </subcategory>
+      <subcategory value="4" description="Chengdu Aircraft Industrial Corp. J-9" uuid="e60dd738-5269-11df-b5f4-080069138b88" uid="16976"/>
+    </category>
+    <category value="2" description="Attack/Strike" uuid="e60f8c0e-5269-11df-ba52-080069138b88" uid="16977">
+      <subcategory value="1" description="Harbin H-5" deprecated="1" uuid="e6109c48-5269-11df-87ca-080069138b88" uid="16978"/>
+      <subcategory value="2" description="Nanchang Q-5 (Fantan)" uuid="e611acbe-5269-11df-b887-080069138b88" uid="16979">
+        <specific value="1" description="Q-5" uuid="e612b910-5269-11df-9689-080069138b88" uid="16980"/>
+        <specific value="2" description="Q-5I" uuid="e613cc7e-5269-11df-9bd2-080069138b88" uid="16981"/>
+        <specific value="3" description="Q-5IA" uuid="e614dca4-5269-11df-80ff-080069138b88" uid="16982"/>
+        <specific value="4" description="Q-5 II" uuid="e615e770-5269-11df-8980-080069138b88" uid="16983"/>
+        <specific value="5" description="A-5C Fantan" uuid="e616fa5c-5269-11df-8aec-080069138b88" uid="16984"/>
+      </subcategory>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e618b46e-5269-11df-aacb-080069138b88" uid="16985"/>
+      <subcategory value="4" description="Xian Aircraft Company JH-7" uuid="e619c73c-5269-11df-803a-080069138b88" uid="16986"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="e61ad73a-5269-11df-a269-080069138b88" uid="16987"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="e61be8c8-5269-11df-a092-080069138b88" uid="16988"/>
+    </category>
+    <category value="3" description="Bomber" uuid="e61da2d0-5269-11df-bc48-080069138b88" uid="16989">
+      <subcategory value="1" description="Harbin H-5 (B-5) Beagle" uuid="e61eb68e-5269-11df-b653-080069138b88" uid="16990"/>
+      <subcategory value="2" description="Xian H-6 (B-6) Badger" uuid="e61fc268-5269-11df-8671-080069138b88" uid="16991">
+        <specific value="1" description="B-6 Badger A" uuid="e620d25c-5269-11df-9599-080069138b88" uid="16992"/>
+        <specific value="2" description="B-6D Badger (ASM platform)" uuid="e621e5e8-5269-11df-81bb-080069138b88" uid="16993"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Cargo/Tanker" uuid="e62437c6-5269-11df-bdc8-080069138b88" uid="16994">
+      <subcategory value="1" description="Shaanxi Aircraft Company Y-8" uuid="e6254a62-5269-11df-907e-080069138b88" uid="16995">
+        <specific value="1" description="Y-8A (helicopter carrier)" uuid="e62658a8-5269-11df-86be-080069138b88" uid="16996"/>
+        <specific value="2" description="Y-8E (drone carrier)" uuid="e6276a0e-5269-11df-bb37-080069138b88" uid="16997"/>
+      </subcategory>
+      <subcategory value="2" description="Xian Aircraft Company Y-7" uuid="e6291d54-5269-11df-8149-080069138b88" uid="16998">
+        <specific value="1" description="Y-7 (cargo)" uuid="e62a3324-5269-11df-a885-080069138b88" uid="16999"/>
+        <specific value="2" description="Y-7H-500 (cargo)" uuid="e62b3d32-5269-11df-8bce-080069138b88" uid="17000"/>
+      </subcategory>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="e62cf118-5269-11df-a8fa-080069138b88" uid="17001"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="e62e02f6-5269-11df-ab9c-080069138b88" uid="17002"/>
+      <subcategory value="5" description="ASW/Patrol/Observation" uuid="e62f15b0-5269-11df-bba7-080069138b88" uid="17003">
+        <specific value="1" description="Harbin Aircraft Manufacturing Corp. SH-5" uuid="e63024be-5269-11df-afa7-080069138b88" uid="17004"/>
+        <specific value="2" description="Shannxi Aircraft Company Y-8X" uuid="e63137e6-5269-11df-99ed-080069138b88" uid="17005"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Utility helicopter" uuid="e6338d02-5269-11df-aee5-080069138b88" uid="17006">
+      <subcategory value="1" description="Changhe Aircraft Factory Z-8" uuid="e6349fbc-5269-11df-9a75-080069138b88" uid="17007"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="e635b226-5269-11df-94d0-080069138b88" uid="17008"/>
+      <subcategory value="3" description="Nanchang Aircraft Manufacturing Company CJ-6" deprecated="1" uuid="e636ce68-5269-11df-b91f-080069138b88" uid="17009">
+        <specific value="1" description="CJ-6A" deprecated="1" uuid="e637e1e0-5269-11df-a1fd-080069138b88" uid="17010"/>
+        <specific value="2" description="CJ-6B" deprecated="1" uuid="e638f4ea-5269-11df-8746-080069138b88" uid="17011"/>
+        <specific value="3" description="K-8" deprecated="1" uuid="e63a0574-5269-11df-8eca-080069138b88" uid="17012"/>
+      </subcategory>
+    </category>
+    <category value="40" description="Trainer" uuid="e63c598c-5269-11df-9188-080069138b88" uid="17013">
+      <subcategory value="1" description="Chengdu Aircraft Industrial Corp. JJ-5" uuid="e63d6a66-5269-11df-a983-080069138b88" uid="17014"/>
+      <subcategory value="2" description="Changdu Aircraft Industrial Corp. JJ-7/FT-7" uuid="e63e7a6e-5269-11df-919d-080069138b88" uid="17015"/>
+      <subcategory value="3" description="Guizhou Aviation Industry Corp JJ-7" uuid="e63f8f58-5269-11df-951f-080069138b88" uid="17016"/>
+      <subcategory value="4" description="Nanchang Aircraft Manufacturing Company CJ-6" uuid="e640a2e4-5269-11df-929d-080069138b88" uid="17017">
+        <specific value="1" description="CJ-6A" uuid="e641b116-5269-11df-8eb9-080069138b88" uid="17018"/>
+        <specific value="2" description="CJ-6B" uuid="e642c38a-5269-11df-aa53-080069138b88" uid="17019"/>
+      </subcategory>
+      <subcategory value="5" description="Nanchang AMC / PAK K-8" uuid="e6447748-5269-11df-89b9-080069138b88" uid="17020"/>
+    </category>
+    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="e6462c64-5269-11df-b62e-080069138b88" uid="17021">
+      <subcategory value="1" description="Passenger Airline" uuid="e6473d16-5269-11df-85b2-080069138b88" uid="17022">
+        <specific value="1" description="Harbin Aircraft Manufacturing Corp. Y-12(I)" uuid="e64849b8-5269-11df-ab4f-080069138b88" uid="17023"/>
+        <specific value="2" description="Harbin Aircraft Manufacturing Corp. Y-12 (II)" uuid="e6495ea2-5269-11df-94f7-080069138b88" uid="17024"/>
+        <specific value="3" description="Harbin Aircraft Manufacturing Corp. Y-12 (IV)" uuid="e64a7526-5269-11df-ba9d-080069138b88" uid="17025"/>
+        <specific value="4" description="Shaanxi Aircraft Company Y-8B" uuid="e64b85c4-5269-11df-998c-080069138b88" uid="17026"/>
+        <specific value="5" description="Shaanxi Aircraft Company Y-8C" uuid="e64c9784-5269-11df-aa9c-080069138b88" uid="17027"/>
+        <specific value="6" description="Xian Aircraft Company Y7-100" uuid="e64da9a8-5269-11df-9a5f-080069138b88" uid="17028"/>
+        <specific value="7" description="Xian Aircraft Company Y7-100C" uuid="e64eb9d8-5269-11df-bf2d-080069138b88" uid="17029"/>
+        <specific value="8" description="Xian Aircraft Compnay Y7-200" uuid="e64fcc10-5269-11df-be12-080069138b88" uid="17030"/>
+        <specific value="9" description="Xian Aircraft Company Y7-200B" uuid="e650df10-5269-11df-99c6-080069138b88" uid="17031"/>
+        <specific value="10" description="A. S. Yakovlev Design Bureau YAK-42 Clobber" deprecated="1" uuid="e651ef22-5269-11df-b037-080069138b88" uid="17032"/>
+        <specific value="11" description="Tupolev TU-154M Careless" deprecated="1" uuid="e65303a8-5269-11df-ba22-080069138b88" uid="17033"/>
+      </subcategory>
+      <subcategory value="2" description="Agriculture" uuid="e654ba54-5269-11df-8be0-080069138b88" uid="17034">
+        <specific value="1" description="Nanching Aircraft Manufacturing Company N-5A" uuid="e655d40c-5269-11df-9c94-080069138b88" uid="17035"/>
+        <specific value="2" description="Harbin Aircraft Manufacturing Corp. Y-11B (I)" uuid="e656e702-5269-11df-884b-080069138b88" uid="17036"/>
+        <specific value="3" description="WSK-PZL Mielec M-18 Dromader" uuid="e657fab6-5269-11df-b168-080069138b88" uid="17037"/>
+      </subcategory>
+      <subcategory value="3" description="Helicopter" uuid="e659ac30-5269-11df-a8ab-080069138b88" uid="17038">
+        <specific value="1" description="Harbin Aircraft Co. Z-9/Z-9A (Eurocopter AS 365N2)" uuid="e65ac016-5269-11df-83aa-080069138b88" uid="17039"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="e65c737a-5269-11df-8c96-080069138b88" uid="17040"/>
+      <subcategory value="5" description="Special Purpose" uuid="e65d80a8-5269-11df-8c25-080069138b88" uid="17041">
+        <specific value="1" description="Shaanxi Aircraft Company Y-8F (livestock carrier)" uuid="e65e9196-5269-11df-bc28-080069138b88" uid="17042"/>
+        <specific value="2" description="Shaanxi Aircraft Company Y-8H (aerial survey)" uuid="e65fa946-5269-11df-a8c8-080069138b88" uid="17043"/>
+        <specific value="3" description="Xian Aircraft Company Y-7 (cargo)" uuid="e660bbba-5269-11df-9bcc-080069138b88" uid="17044"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="45" uuid="e663b342-5269-11df-ac10-080069138b88" uid="17045">
+    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="e664c23c-5269-11df-85ce-080069138b88" uid="17046">
+      <subcategory value="1" description="Luhu (Type 052)" uuid="e665ce5c-5269-11df-a2ea-080069138b88" uid="17047">
+        <specific value="1" description="112 Luhu" uuid="e666df4a-5269-11df-8d5d-080069138b88" uid="17048"/>
+      </subcategory>
+      <subcategory value="2" description="Luda (Type 051)" uuid="e6689394-5269-11df-9a8d-080069138b88" uid="17049">
+        <specific value="1" description="Jinan" uuid="e669a216-5269-11df-a66d-080069138b88" uid="17050"/>
+        <specific value="2" description="Xian" uuid="e66aad28-5269-11df-8961-080069138b88" uid="17051"/>
+        <specific value="3" description="Yinchuan" uuid="e66bc0e6-5269-11df-aefd-080069138b88" uid="17052"/>
+        <specific value="4" description="Xinging" uuid="e66cd0d0-5269-11df-8af3-080069138b88" uid="17053"/>
+        <specific value="5" description="Kaifeng" uuid="e66dda98-5269-11df-964d-080069138b88" uid="17054"/>
+        <specific value="6" description="Dalien" uuid="e66eee74-5269-11df-ab7c-080069138b88" uid="17055"/>
+        <specific value="7" description="Nanjing" uuid="e66ffe36-5269-11df-9f49-080069138b88" uid="17056"/>
+        <specific value="8" description="Hefei" uuid="e671090c-5269-11df-8e55-080069138b88" uid="17057"/>
+        <specific value="9" description="Chongqing" uuid="e67218c4-5269-11df-aa6f-080069138b88" uid="17058"/>
+        <specific value="10" description="Zunyi" uuid="e6732e44-5269-11df-b266-080069138b88" uid="17059"/>
+        <specific value="11" description="Changsha" uuid="e6744072-5269-11df-943b-080069138b88" uid="17060"/>
+        <specific value="12" description="Nanning" uuid="e675523c-5269-11df-98a5-080069138b88" uid="17061"/>
+        <specific value="13" description="Nanchang" uuid="e676637a-5269-11df-bbe1-080069138b88" uid="17062"/>
+        <specific value="14" description="Guilin" uuid="e677727e-5269-11df-af6e-080069138b88" uid="17063"/>
+        <specific value="15" description="Zangjiang" uuid="e6788222-5269-11df-a3b6-080069138b88" uid="17064"/>
+        <specific value="16" description="Zhuhei" uuid="e6799234-5269-11df-b882-080069138b88" uid="17065"/>
+      </subcategory>
+      <subcategory value="3" description="Luhia Class DDG" uuid="e67b4318-5269-11df-af3a-080069138b88" uid="17066">
+        <specific value="1" description="Shenzhen" uuid="e67c52e4-5269-11df-979f-080069138b88" uid="17067"/>
+        <specific value="2" description="H2 (2003)" uuid="e67d62f6-5269-11df-bd65-080069138b88" uid="17068"/>
+        <specific value="3" description="H3 (2005)" uuid="e67e7484-5269-11df-b8da-080069138b88" uid="17069"/>
+        <specific value="4" description="H4 (2007)" uuid="e67f7e88-5269-11df-8448-080069138b88" uid="17070"/>
+        <specific value="5" description="H5 (2007)" uuid="e6808fd0-5269-11df-b3f5-080069138b88" uid="17071"/>
+        <specific value="6" description="H6 (2009)" uuid="e681a3b6-5269-11df-b366-080069138b88" uid="17072"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e683f4fe-5269-11df-a4d4-080069138b88" uid="17073">
+      <subcategory value="1" description="Jianghu (Type 053)" uuid="e68504f2-5269-11df-b964-080069138b88" uid="17074">
+        <specific value="1" description="Chang De" uuid="e68613c4-5269-11df-83ec-080069138b88" uid="17075"/>
+        <specific value="2" description="Shaoxing" uuid="e687241c-5269-11df-ba9e-080069138b88" uid="17076"/>
+        <specific value="3" description="Nantong" uuid="e6883460-5269-11df-9bc0-080069138b88" uid="17077"/>
+        <specific value="4" description="Wuxi" uuid="e6893d9c-5269-11df-a9e1-080069138b88" uid="17078"/>
+        <specific value="5" description="Huayin" uuid="e68a4dfe-5269-11df-ab59-080069138b88" uid="17079"/>
+        <specific value="6" description="Zhenjiang" uuid="e68b6298-5269-11df-ac49-080069138b88" uid="17080"/>
+        <specific value="7" description="Xiamen" uuid="e68c6c56-5269-11df-af8c-080069138b88" uid="17081"/>
+        <specific value="8" description="Jiujiang" uuid="e68d7c72-5269-11df-8e95-080069138b88" uid="17082"/>
+        <specific value="9" description="Nanping" uuid="e68e8d60-5269-11df-9402-080069138b88" uid="17083"/>
+        <specific value="10" description="Jian" uuid="e68f998a-5269-11df-b58c-080069138b88" uid="17084"/>
+        <specific value="11" description="Changzhi" uuid="e690aa96-5269-11df-99c0-080069138b88" uid="17085"/>
+        <specific value="12" description="Ningpo" uuid="e691be0e-5269-11df-bf33-080069138b88" uid="17086"/>
+        <specific value="13" description="Jinhua" uuid="e692d0fa-5269-11df-bebb-080069138b88" uid="17087"/>
+        <specific value="14" description="Dandong" uuid="e693e36e-5269-11df-82ae-080069138b88" uid="17088"/>
+        <specific value="15" description="Tinashan" uuid="e694f6e6-5269-11df-a463-080069138b88" uid="17089"/>
+        <specific value="16" description="Maoming" uuid="e696016c-5269-11df-aed3-080069138b88" uid="17090"/>
+        <specific value="17" description="Yibin" uuid="e6971124-5269-11df-857d-080069138b88" uid="17091"/>
+        <specific value="18" description="Shaoguan" uuid="e6982230-5269-11df-8a4f-080069138b88" uid="17092"/>
+        <specific value="19" description="Anshun" uuid="e6992b8a-5269-11df-9b4b-080069138b88" uid="17093"/>
+        <specific value="20" description="Zhaotong" uuid="e69a3d04-5269-11df-93bf-080069138b88" uid="17094"/>
+        <specific value="21" description="Jishao" uuid="e69b514e-5269-11df-bf9b-080069138b88" uid="17095"/>
+        <specific value="22" description="Zigong" uuid="e69c5a9e-5269-11df-8304-080069138b88" uid="17096"/>
+        <specific value="23" description="Kangding" uuid="e69d6998-5269-11df-b03e-080069138b88" uid="17097"/>
+        <specific value="24" description="Dongguan" uuid="e69e7af4-5269-11df-8281-080069138b88" uid="17098"/>
+        <specific value="25" description="Shantou" uuid="e69f8818-5269-11df-b89f-080069138b88" uid="17099"/>
+      </subcategory>
+      <subcategory value="2" description="Jianghu II (Type 053)" uuid="e6a13938-5269-11df-bb3c-080069138b88" uid="17100">
+        <specific value="1" description="Siping" uuid="e6a249cc-5269-11df-86ab-080069138b88" uid="17101"/>
+      </subcategory>
+      <subcategory value="3" description="Jianghu III" uuid="e6a3fca4-5269-11df-8c68-080069138b88" uid="17102">
+        <specific value="1" description="Huangshi" uuid="e6a5101c-5269-11df-be30-080069138b88" uid="17103"/>
+        <specific value="2" description="WuHu" uuid="e6a61a7a-5269-11df-884a-080069138b88" uid="17104"/>
+      </subcategory>
+      <subcategory value="4" description="Jianghu IV" uuid="e6a7c7da-5269-11df-8fb0-080069138b88" uid="17105">
+        <specific value="1" description="Zhoushan" uuid="e6a8d9fe-5269-11df-937d-080069138b88" uid="17106"/>
+      </subcategory>
+      <subcategory value="5" description="Jiangwei" uuid="e6aa8f2e-5269-11df-9327-080069138b88" uid="17107">
+        <specific value="1" description="Anging" uuid="e6ab9e46-5269-11df-9e20-080069138b88" uid="17108"/>
+        <specific value="2" description="Huainan" uuid="e6aca6c4-5269-11df-ae92-080069138b88" uid="17109"/>
+        <specific value="3" description="Huaibei" uuid="e6adb834-5269-11df-b19f-080069138b88" uid="17110"/>
+        <specific value="4" description="Tongling" uuid="e6aeccd8-5269-11df-980d-080069138b88" uid="17111"/>
+      </subcategory>
+      <subcategory value="6" description="Jiavgnan (Type 065)" uuid="e6b07ce0-5269-11df-9d8c-080069138b88" uid="17112">
+        <specific value="1" description="Nanchong" uuid="e6b18f72-5269-11df-b343-080069138b88" uid="17113"/>
+        <specific value="2" description="Dongchuan" uuid="e6b2a326-5269-11df-b3a7-080069138b88" uid="17114"/>
+      </subcategory>
+      <subcategory value="7" description="Chengdu (Type 01)" uuid="e6b4581a-5269-11df-b771-080069138b88" uid="17115">
+        <specific value="1" description="Chengdu" uuid="e6b567c8-5269-11df-b70d-080069138b88" uid="17116"/>
+        <specific value="2" description="Pingxiang" uuid="e6b67212-5269-11df-a8ea-080069138b88" uid="17117"/>
+      </subcategory>
+      <subcategory value="8" description="Jiangdong (Type 053K)" uuid="e6b8274c-5269-11df-9cc6-080069138b88" uid="17118">
+        <specific value="1" description="Yingtan" uuid="e6b93880-5269-11df-9ac7-080069138b88" uid="17119"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="e6bb88f6-5269-11df-8ecb-080069138b88" uid="17120">
+      <subcategory value="1" description="Huang class Type 037/2 (fast attack missile)" uuid="e6bc99a8-5269-11df-9735-080069138b88" uid="17121">
+        <specific value="1" description="770" uuid="e6bdafbe-5269-11df-8466-080069138b88" uid="17122"/>
+      </subcategory>
+      <subcategory value="2" description="Houxin class (fast attack missile)" uuid="e6bf5f26-5269-11df-91c2-080069138b88" uid="17123">
+        <specific value="1" description="751-758" uuid="e6c0751e-5269-11df-b3b7-080069138b88" uid="17124"/>
+      </subcategory>
+      <subcategory value="3" description="Hola class (fast attach missile)" uuid="e6c2242c-5269-11df-a038-080069138b88" uid="17125">
+        <specific value="1" description="5100" uuid="e6c332d6-5269-11df-85e2-080069138b88" uid="17126"/>
+      </subcategory>
+      <subcategory value="4" description="Hegu/Hoku class Type 024 (fast attack missile)" uuid="e6c4e3e2-5269-11df-8ef0-080069138b88" uid="17127"/>
+      <subcategory value="5" description="Haijui class (fast attack patrol)" uuid="e6c5fad4-5269-11df-963e-080069138b88" uid="17128">
+        <specific value="1" description="688" uuid="e6c70bc2-5269-11df-9e08-080069138b88" uid="17129"/>
+        <specific value="2" description="693" uuid="e6c816c0-5269-11df-9238-080069138b88" uid="17130"/>
+        <specific value="3" description="694" uuid="e6c92790-5269-11df-97c6-080069138b88" uid="17131"/>
+        <specific value="4" description="697" uuid="e6ca3964-5269-11df-857d-080069138b88" uid="17132"/>
+      </subcategory>
+      <subcategory value="6" description="Hainan class Type 037 (fast attack patrol)" uuid="e6cbe836-5269-11df-bbd0-080069138b88" uid="17133">
+        <specific value="1" description="267-285" uuid="e6ccf47e-5269-11df-bbed-080069138b88" uid="17134"/>
+        <specific value="2" description="290" uuid="e6ce0788-5269-11df-ae1c-080069138b88" uid="17135"/>
+        <specific value="3" description="302" uuid="e6cf1790-5269-11df-8c70-080069138b88" uid="17136"/>
+        <specific value="4" description="305" uuid="e6d027fc-5269-11df-834d-080069138b88" uid="17137"/>
+        <specific value="5" description="609" uuid="e6d13af2-5269-11df-aed7-080069138b88" uid="17138"/>
+        <specific value="6" description="610" uuid="e6d24ece-5269-11df-a6f7-080069138b88" uid="17139"/>
+        <specific value="7" description="622" uuid="e6d35972-5269-11df-a0cb-080069138b88" uid="17140"/>
+        <specific value="8" description="628" uuid="e6d46736-5269-11df-846b-080069138b88" uid="17141"/>
+        <specific value="9" description="636-698" uuid="e6d576b2-5269-11df-8b08-080069138b88" uid="17142"/>
+        <specific value="10" description="689-692" uuid="e6d68598-5269-11df-8dcc-080069138b88" uid="17143"/>
+        <specific value="11" description="695" uuid="e6d79604-5269-11df-8cf9-080069138b88" uid="17144"/>
+        <specific value="12" description="696" uuid="e6d8a486-5269-11df-a68a-080069138b88" uid="17145"/>
+        <specific value="13" description="698" uuid="e6d9b218-5269-11df-b86d-080069138b88" uid="17146"/>
+        <specific value="14" description="699" uuid="e6dac13a-5269-11df-bcd7-080069138b88" uid="17147"/>
+        <specific value="15" description="701" uuid="e6dbd0de-5269-11df-bf72-080069138b88" uid="17148"/>
+        <specific value="16" description="702" uuid="e6dcd920-5269-11df-ac8e-080069138b88" uid="17149"/>
+        <specific value="17" description="707" uuid="e6dde964-5269-11df-8f4b-080069138b88" uid="17150"/>
+        <specific value="18" description="723-730" uuid="e6defd04-5269-11df-9419-080069138b88" uid="17151"/>
+      </subcategory>
+      <subcategory value="7" description="Shanghai class Type 062 (fast attack gun)" uuid="e6e0b2fc-5269-11df-9626-080069138b88" uid="17152">
+        <specific value="1" description="E227" uuid="e6e1bc60-5269-11df-b233-080069138b88" uid="17153"/>
+        <specific value="2" description="301" uuid="e6e2cc86-5269-11df-b8cb-080069138b88" uid="17154"/>
+        <specific value="3" description="321" uuid="e6e3de28-5269-11df-9077-080069138b88" uid="17155"/>
+        <specific value="4" description="N1121" uuid="e6e4e412-5269-11df-b7c4-080069138b88" uid="17156"/>
+        <specific value="5" description="1127" uuid="e6e5f0dc-5269-11df-a017-080069138b88" uid="17157"/>
+        <specific value="6" description="3140" uuid="e6e7024c-5269-11df-b5ea-080069138b88" uid="17158"/>
+        <specific value="7" description="3141" uuid="e6e809d0-5269-11df-bfe3-080069138b88" uid="17159"/>
+        <specific value="8" description="N3215" uuid="e6e915e6-5269-11df-a783-080069138b88" uid="17160"/>
+        <specific value="9" description="N3313" uuid="e6ea27c4-5269-11df-be5c-080069138b88" uid="17161"/>
+        <specific value="10" description="N4301" uuid="e6eb31d2-5269-11df-8ef2-080069138b88" uid="17162"/>
+        <specific value="11" description="4324" uuid="e6ec3ec4-5269-11df-a797-080069138b88" uid="17163"/>
+        <specific value="12" description="9342 et al" uuid="e6ed4d5a-5269-11df-8269-080069138b88" uid="17164"/>
+      </subcategory>
+      <subcategory value="8" description="Huludao class Type 206 (fast attack patrol)" uuid="e6ef053c-5269-11df-bea1-080069138b88" uid="17165">
+        <specific value="1" description="65" uuid="e6f0115c-5269-11df-963c-080069138b88" uid="17166"/>
+        <specific value="2" description="77" uuid="e6f11e08-5269-11df-9863-080069138b88" uid="17167"/>
+        <specific value="3" description="101" uuid="e6f22b72-5269-11df-8a44-080069138b88" uid="17168"/>
+        <specific value="4" description="109" uuid="e6f337e2-5269-11df-9957-080069138b88" uid="17169"/>
+      </subcategory>
+      <subcategory value="9" description="Huxin class (river patrol)" uuid="e6f4e416-5269-11df-8af2-080069138b88" uid="17170">
+        <specific value="1" description="62 et al" uuid="e6f5f16c-5269-11df-ad12-080069138b88" uid="17171"/>
+      </subcategory>
+      <subcategory value="10" description="Huangfen Class (Pakistan)" uuid="e6f7a386-5269-11df-82a9-080069138b88" uid="17172"/>
+      <subcategory value="11" description="Haiqing (Type 037/1) Class (Fast Attack Craft-Patrol)(PC)" uuid="e6f8b596-5269-11df-b94c-080069138b88" uid="17173">
+        <specific value="1" description="710" uuid="e6f9c1ca-5269-11df-b533-080069138b88" uid="17174"/>
+      </subcategory>
+      <subcategory value="12" description="Huchuan (Type 025/026) Class (Fast Attack Craft-Torpedo)" uuid="e6fb7222-5269-11df-b456-080069138b88" uid="17175">
+        <specific value="1" description="205" uuid="e6fc831a-5269-11df-b7aa-080069138b88" uid="17176"/>
+      </subcategory>
+      <subcategory value="13" description="Houku Class Type 024 Fast Attack Missile" uuid="e6fe2fee-5269-11df-a59c-080069138b88" uid="17177"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e6ffe1f4-5269-11df-af70-080069138b88" uid="17178">
+      <subcategory value="1" description="Beleijan class (minelayer)" uuid="e700eee6-5269-11df-bfee-080069138b88" uid="17179">
+        <specific value="1" description="814" uuid="e701f94e-5269-11df-85d1-080069138b88" uid="17180"/>
+      </subcategory>
+      <subcategory value="2" description="Wosao class (minesweeper-coastal)" uuid="e703a910-5269-11df-af0e-080069138b88" uid="17181">
+        <specific value="1" description="4422 et al" uuid="e704b922-5269-11df-bcd0-080069138b88" uid="17182"/>
+      </subcategory>
+      <subcategory value="3" description="Fushun class (minesweeper-coastal)" uuid="e706684e-5269-11df-801e-080069138b88" uid="17183">
+        <specific value="1" description="E303 et al" uuid="e70776f8-5269-11df-aecd-080069138b88" uid="17184"/>
+      </subcategory>
+      <subcategory value="4" description="Lienyou class (minesweeper-coastal)" uuid="e70923a4-5269-11df-bbdc-080069138b88" uid="17185"/>
+      <subcategory value="5" description="Futi class Type 312 (minesweeper-drone)" uuid="e70a326c-5269-11df-8d0c-080069138b88" uid="17186"/>
+      <subcategory value="6" description="T-43 MSO Type 010" uuid="e70b41f2-5269-11df-9909-080069138b88" uid="17187">
+        <specific value="1" description="830" uuid="e70c4fc0-5269-11df-9fdf-080069138b88" uid="17188"/>
+        <specific value="2" description="831" uuid="e70d599c-5269-11df-aaf3-080069138b88" uid="17189"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Tank Landing Ship" uuid="e70fb5b6-5269-11df-b9ce-080069138b88" uid="17190">
+      <subcategory value="1" description="Yuting class" uuid="e710bdf8-5269-11df-b936-080069138b88" uid="17191">
+        <specific value="1" description="991" uuid="e711cf18-5269-11df-995f-080069138b88" uid="17192"/>
+      </subcategory>
+      <subcategory value="2" description="Yukan class Type 072" uuid="e7137b9c-5269-11df-8c33-080069138b88" uid="17193">
+        <specific value="1" description="927" uuid="e7149e0a-5269-11df-aa4a-080069138b88" uid="17194"/>
+        <specific value="2" description="928" uuid="e715b380-5269-11df-bfae-080069138b88" uid="17195"/>
+        <specific value="3" description="929" uuid="e716c87e-5269-11df-a5cf-080069138b88" uid="17196"/>
+        <specific value="4" description="930" uuid="e717d64c-5269-11df-9bd2-080069138b88" uid="17197"/>
+      </subcategory>
+      <subcategory value="3" description="US 1-511 (Shan) Class (LST)" uuid="e7198348-5269-11df-b47b-080069138b88" uid="17198">
+        <specific value="1" description="US1" uuid="e71a8c16-5269-11df-a930-080069138b88" uid="17199"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="e71ce0ce-5269-11df-81cb-080069138b88" uid="17200">
+      <subcategory value="1" description="Yudao class (landing ship medium)" uuid="e71de974-5269-11df-ae37-080069138b88" uid="17201"/>
+      <subcategory value="2" description="Yuliang class Type 079 (landing ship medium)" uuid="e71efaa8-5269-11df-a4be-080069138b88" uid="17202"/>
+      <subcategory value="3" description="Yuling class (landing ship medium)" uuid="e7200f2e-5269-11df-824c-080069138b88" uid="17203"/>
+      <subcategory value="4" description="Chinese Type class (landing ship medium)" uuid="e7211e46-5269-11df-a41a-080069138b88" uid="17204">
+        <specific value="1" description="972" uuid="e7222dc2-5269-11df-9d55-080069138b88" uid="17205"/>
+        <specific value="2" description="990 et al" uuid="e7233ba4-5269-11df-b019-080069138b88" uid="17206"/>
+      </subcategory>
+      <subcategory value="5" description="Yunnan class Type 067 (landing craft utility)" uuid="e724e8fa-5269-11df-9d08-080069138b88" uid="17207">
+        <specific value="1" description="3313" uuid="e725f6c8-5269-11df-a6a2-080069138b88" uid="17208"/>
+        <specific value="2" description="3321" uuid="e72704f0-5269-11df-8264-080069138b88" uid="17209"/>
+        <specific value="3" description="3344" uuid="e7281124-5269-11df-8d5c-080069138b88" uid="17210"/>
+        <specific value="4" description="5526" uuid="e7291b14-5269-11df-b733-080069138b88" uid="17211"/>
+        <specific value="5" description="7566" uuid="e72a2ce8-5269-11df-a441-080069138b88" uid="17212"/>
+        <specific value="6" description="7568 et al" uuid="e72b3a48-5269-11df-a195-080069138b88" uid="17213"/>
+      </subcategory>
+      <subcategory value="6" description="Yuch'in class Type 068/069 (landing craft utility)" uuid="e72cf00e-5269-11df-82a8-080069138b88" uid="17214">
+        <specific value="1" description="Y765 et al" uuid="e72dfe86-5269-11df-988d-080069138b88" uid="17215"/>
+      </subcategory>
+    </category>
+    <category value="14" description="Hydrofoil" uuid="e7304e2a-5269-11df-a81b-080069138b88" uid="17216">
+      <subcategory value="1" description="Huchuan class Type 025/026 (fast attack-torpedo)" uuid="e7315a2c-5269-11df-ae42-080069138b88" uid="17217">
+        <specific value="1" description="205" uuid="e7326962-5269-11df-a0f7-080069138b88" uid="17218"/>
+        <specific value="2" description="207-209" uuid="e7337708-5269-11df-9c7c-080069138b88" uid="17219"/>
+        <specific value="3" description="248" uuid="e73481d4-5269-11df-985b-080069138b88" uid="17220"/>
+        <specific value="4" description="1247" uuid="e7358fa2-5269-11df-8a13-080069138b88" uid="17221"/>
+        <specific value="5" description="2201" uuid="e7369b40-5269-11df-8127-080069138b88" uid="17222"/>
+        <specific value="6" description="2203" uuid="e737a36e-5269-11df-a3a0-080069138b88" uid="17223"/>
+        <specific value="7" description="3206" uuid="e738b448-5269-11df-a7a9-080069138b88" uid="17224"/>
+        <specific value="8" description="3214" uuid="e739c090-5269-11df-a1b2-080069138b88" uid="17225"/>
+        <specific value="9" description="6218" uuid="e73ac8dc-5269-11df-b5c3-080069138b88" uid="17226"/>
+        <specific value="10" description="7230 et al" uuid="e73bd934-5269-11df-a37b-080069138b88" uid="17227"/>
+      </subcategory>
+    </category>
+    <category value="15" description="Air Cushion/Surface Effect" uuid="e73e23d8-5269-11df-98cc-080069138b88" uid="17228">
+      <subcategory value="1" description="Jingsah II class" uuid="e73f3160-5269-11df-8570-080069138b88" uid="17229">
+        <specific value="1" description="452" uuid="e740414a-5269-11df-a63b-080069138b88" uid="17230"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="e7428de2-5269-11df-b97a-080069138b88" uid="17231">
+      <subcategory value="1" description="Daxin class (training ship)" uuid="e7439b88-5269-11df-9c43-080069138b88" uid="17232">
+        <specific value="1" description="81 Zhenghe" uuid="e744ad8e-5269-11df-b9ed-080069138b88" uid="17233"/>
+      </subcategory>
+      <subcategory value="2" description="Dajiang class (submarine support)" uuid="e7465a26-5269-11df-bec0-080069138b88" uid="17234">
+        <specific value="1" description="J121 Changxingdao" uuid="e74769b6-5269-11df-afef-080069138b88" uid="17235"/>
+        <specific value="2" description="J122 Chongmingdao" uuid="e748759a-5269-11df-93b0-080069138b88" uid="17236"/>
+        <specific value="3" description="J506 Yongxingdao" uuid="e7498282-5269-11df-9e4c-080069138b88" uid="17237"/>
+      </subcategory>
+      <subcategory value="3" description="Da Dong class (salvage)" uuid="e74b376c-5269-11df-b512-080069138b88" uid="17238">
+        <specific value="1" description="J304" uuid="e74c4a58-5269-11df-9ec8-080069138b88" uid="17239"/>
+      </subcategory>
+      <subcategory value="4" description="Dadao class (salvage)" uuid="e74df6c8-5269-11df-8ae3-080069138b88" uid="17240">
+        <specific value="1" description="Dadao" uuid="e74eff1e-5269-11df-9238-080069138b88" uid="17241"/>
+      </subcategory>
+      <subcategory value="5" description="Dalang class (submarine support)" uuid="e750bd36-5269-11df-a0b9-080069138b88" uid="17242">
+        <specific value="1" description="J503 Dalang" uuid="e751ccc6-5269-11df-9eca-080069138b88" uid="17243"/>
+        <specific value="2" description="J504" uuid="e752db34-5269-11df-8d03-080069138b88" uid="17244"/>
+      </subcategory>
+      <subcategory value="6" description="Dongxiu class (submarine support)" uuid="e754870e-5269-11df-8ae3-080069138b88" uid="17245">
+        <specific value="1" description="U911 Dongxiu" uuid="e7559432-5269-11df-9f8d-080069138b88" uid="17246"/>
+      </subcategory>
+      <subcategory value="7" description="Dazhi class (submarine support)" uuid="e757405c-5269-11df-bcce-080069138b88" uid="17247">
+        <specific value="1" description="920 Dazhi" uuid="e7584de4-5269-11df-9997-080069138b88" uid="17248"/>
+      </subcategory>
+      <subcategory value="8" description="Hudung class (submarine rescue)" uuid="e759fb8a-5269-11df-9ce4-080069138b88" uid="17249">
+        <specific value="1" description="403 Haijui" uuid="e75b0da4-5269-11df-8257-080069138b88" uid="17250"/>
+        <specific value="2" description="512 Haijui" uuid="e75c173a-5269-11df-943f-080069138b88" uid="17251"/>
+      </subcategory>
+      <subcategory value="9" description="DSRV (salvage submarine)" uuid="e75dc350-5269-11df-8654-080069138b88" uid="17252"/>
+      <subcategory value="10" description="Ten Ting class (salvage)" uuid="e75ed5c4-5269-11df-8901-080069138b88" uid="17253">
+        <specific value="1" description="456 Hai Lao" uuid="e75fe400-5269-11df-8342-080069138b88" uid="17254"/>
+        <specific value="2" description="520 Hai Lao" uuid="e760ec9c-5269-11df-9e59-080069138b88" uid="17255"/>
+        <specific value="3" description="523 Hai Lao" uuid="e761fcb8-5269-11df-b23b-080069138b88" uid="17256"/>
+        <specific value="4" description="666 Hai Lao" uuid="e7630a22-5269-11df-94e8-080069138b88" uid="17257"/>
+      </subcategory>
+      <subcategory value="11" description="Kansha class (salvage)" uuid="e764b6f6-5269-11df-8695-080069138b88" uid="17258">
+        <specific value="1" description="Kansha" uuid="e765c280-5269-11df-90f2-080069138b88" uid="17259"/>
+        <specific value="2" description="304 Haito" uuid="e766ce6e-5269-11df-98d9-080069138b88" uid="17260"/>
+        <specific value="3" description="403" uuid="e767db6a-5269-11df-8f20-080069138b88" uid="17261"/>
+      </subcategory>
+      <subcategory value="12" description="Jin Jian Xun 05 class (salvage)" uuid="e7698a50-5269-11df-9f14-080069138b88" uid="17262"/>
+      <subcategory value="13" description="Qionshe class (attack transport)" uuid="e76a9c2e-5269-11df-b89a-080069138b88" uid="17263">
+        <specific value="1" description="Y830" uuid="e76bae34-5269-11df-aa9e-080069138b88" uid="17264"/>
+        <specific value="2" description="Y831" uuid="e76cbba8-5269-11df-8cac-080069138b88" uid="17265"/>
+        <specific value="3" description="Y833 et al" uuid="e76dc494-5269-11df-b1d2-080069138b88" uid="17266"/>
+      </subcategory>
+      <subcategory value="14" description="Qionshe class (hospital)" uuid="e76f72ee-5269-11df-9fa4-080069138b88" uid="17267">
+        <specific value="1" description="Y833" uuid="e7708166-5269-11df-8632-080069138b88" uid="17268"/>
+      </subcategory>
+      <subcategory value="15" description="Fuqing class (replenishment oiler)" uuid="e7722e6c-5269-11df-9305-080069138b88" uid="17269">
+        <specific value="1" description="X575 Taicang" uuid="e7733ff0-5269-11df-a511-080069138b88" uid="17270"/>
+        <specific value="2" description="X615 Dongyun" uuid="e7744828-5269-11df-ad0b-080069138b88" uid="17271"/>
+      </subcategory>
+      <subcategory value="16" description="Shengli class (transport oiler)" uuid="e775f484-5269-11df-be58-080069138b88" uid="17272">
+        <specific value="1" description="X620" uuid="e77706c6-5269-11df-a5f5-080069138b88" uid="17273"/>
+        <specific value="2" description="X621" uuid="e7781336-5269-11df-8dc1-080069138b88" uid="17274"/>
+      </subcategory>
+      <subcategory value="17" description="Fulin class (transport oiler)" uuid="e779bd9e-5269-11df-a0b9-080069138b88" uid="17275">
+        <specific value="1" description="X583" uuid="e77acb58-5269-11df-883c-080069138b88" uid="17276"/>
+        <specific value="2" description="X606" uuid="e77bd804-5269-11df-8e08-080069138b88" uid="17277"/>
+        <specific value="3" description="X607" uuid="e77ce474-5269-11df-bd5c-080069138b88" uid="17278"/>
+        <specific value="4" description="X609" uuid="e77deec8-5269-11df-9a74-080069138b88" uid="17279"/>
+        <specific value="5" description="X628" uuid="e77efc96-5269-11df-a7eb-080069138b88" uid="17280"/>
+        <specific value="6" description="X629" uuid="e7800924-5269-11df-af4e-080069138b88" uid="17281"/>
+        <specific value="7" description="X633" uuid="e7810ee6-5269-11df-93ee-080069138b88" uid="17282"/>
+      </subcategory>
+      <subcategory value="18" description="Fuzhou class (transport oiler)" uuid="e782c0b0-5269-11df-a41f-080069138b88" uid="17283">
+        <specific value="1" description="X573" uuid="e783d108-5269-11df-8e11-080069138b88" uid="17284"/>
+        <specific value="2" description="X580" uuid="e784dbb6-5269-11df-acdc-080069138b88" uid="17285"/>
+        <specific value="3" description="X606" uuid="e785e3d0-5269-11df-9e6f-080069138b88" uid="17286"/>
+        <specific value="4" description="X629 et al" uuid="e786f3f6-5269-11df-955b-080069138b88" uid="17287"/>
+      </subcategory>
+      <subcategory value="19" description="Jinyou class (transport oiler)" uuid="e788a7aa-5269-11df-abf5-080069138b88" uid="17288">
+        <specific value="1" description="X622" uuid="e789b6cc-5269-11df-9405-080069138b88" uid="17289"/>
+        <specific value="2" description="X625" uuid="e78ac24c-5269-11df-bb11-080069138b88" uid="17290"/>
+        <specific value="3" description="X675" uuid="e78bd038-5269-11df-a8e7-080069138b88" uid="17291"/>
+      </subcategory>
+      <subcategory value="20" description="Leizhou class (transport oiler-light)" uuid="e78d7ef6-5269-11df-b00b-080069138b88" uid="17292">
+        <specific value="1" description="N1101 Liezhou et al" uuid="e78e8d78-5269-11df-a1a3-080069138b88" uid="17293"/>
+      </subcategory>
+      <subcategory value="21" description="Fuzhou class (water transport)" uuid="e7903f56-5269-11df-aa3b-080069138b88" uid="17294">
+        <specific value="1" description="416 Hai Shui" uuid="e7914a22-5269-11df-8bc9-080069138b88" uid="17295"/>
+        <specific value="2" description="419 Hai Shui" uuid="e7925804-5269-11df-8d76-080069138b88" uid="17296"/>
+        <specific value="3" description="556 Hai Shui" uuid="e7936500-5269-11df-ac05-080069138b88" uid="17297"/>
+        <specific value="4" description="557 Hai Shui" uuid="e79471d4-5269-11df-8ceb-080069138b88" uid="17298"/>
+        <specific value="5" description="608 Hai Shui et al" uuid="e7957e9e-5269-11df-a2df-080069138b88" uid="17299"/>
+      </subcategory>
+      <subcategory value="22" description="Leizhou class (water transport)" uuid="e7972a1e-5269-11df-a8ea-080069138b88" uid="17300">
+        <specific value="1" description="412 Hai Shui" uuid="e7983c06-5269-11df-8178-080069138b88" uid="17301"/>
+        <specific value="2" description="555 Hai Shui" uuid="e79943ee-5269-11df-adbc-080069138b88" uid="17302"/>
+        <specific value="3" description="558 Hai Shui" uuid="e79a51ee-5269-11df-99a0-080069138b88" uid="17303"/>
+      </subcategory>
+      <subcategory value="23" description="Yen Pai class (degaussing)" uuid="e79c0160-5269-11df-a716-080069138b88" uid="17304">
+        <specific value="1" description="746 Hai Dzu" uuid="e79d0e2a-5269-11df-a5a6-080069138b88" uid="17305"/>
+        <specific value="2" description="863 Dong Qin" uuid="e79e1932-5269-11df-a568-080069138b88" uid="17306"/>
+      </subcategory>
+      <subcategory value="24" description="Yenka class (degaussing)" uuid="e79fc4bc-5269-11df-a49c-080069138b88" uid="17307">
+        <specific value="1" description="745 Hai Dzu" uuid="e7a0d280-5269-11df-ba47-080069138b88" uid="17308"/>
+        <specific value="2" description="Hai Dzu" uuid="e7a1e10c-5269-11df-89ad-080069138b88" uid="17309"/>
+      </subcategory>
+      <subcategory value="25" description="Yen Fang class (degaussing)" uuid="e7a38f34-5269-11df-a3bf-080069138b88" uid="17310">
+        <specific value="1" description="950 Hai Dzu" uuid="e7a49816-5269-11df-9212-080069138b88" uid="17311"/>
+        <specific value="2" description="951 Hai Dzu" uuid="e7a5a6e8-5269-11df-89e1-080069138b88" uid="17312"/>
+      </subcategory>
+      <subcategory value="26" description="Haibing class (icebreaker)" uuid="e7a75d76-5269-11df-ae19-080069138b88" uid="17313">
+        <specific value="1" description="101" uuid="e7a86fae-5269-11df-989d-080069138b88" uid="17314"/>
+        <specific value="2" description="102" uuid="e7a976ba-5269-11df-9dc2-080069138b88" uid="17315"/>
+      </subcategory>
+      <subcategory value="27" description="Mod Yanha class (icebreaker)" uuid="e7ab2212-5269-11df-9429-080069138b88" uid="17316">
+        <specific value="1" description="723" uuid="e7ac3328-5269-11df-9947-080069138b88" uid="17317"/>
+      </subcategory>
+      <subcategory value="28" description="Yanha class (icebreaker)" uuid="e7adf104-5269-11df-8b09-080069138b88" uid="17318">
+        <specific value="1" description="519" uuid="e7aefe64-5269-11df-bb9b-080069138b88" uid="17319"/>
+      </subcategory>
+      <subcategory value="29" description="Galait class (cargo)" uuid="e7b0ac1e-5269-11df-aced-080069138b88" uid="17320">
+        <specific value="1" description="318 Haiyun" uuid="e7b1b820-5269-11df-8b1e-080069138b88" uid="17321"/>
+        <specific value="2" description="600 Haiyun" uuid="e7b2c5f8-5269-11df-83b5-080069138b88" uid="17322"/>
+      </subcategory>
+      <subcategory value="30" description="Dayun class (cargo)" uuid="e7b470e2-5269-11df-8b2a-080069138b88" uid="17323">
+        <specific value="1" description="951" uuid="e7b582ac-5269-11df-8a19-080069138b88" uid="17324"/>
+        <specific value="2" description="952" uuid="e7b689f4-5269-11df-9bcd-080069138b88" uid="17325"/>
+      </subcategory>
+      <subcategory value="31" description="Yukan class (cargo)" uuid="e7b834ac-5269-11df-9864-080069138b88" uid="17326">
+        <specific value="1" description="801" uuid="e7b944f0-5269-11df-924e-080069138b88" uid="17327"/>
+      </subcategory>
+      <subcategory value="32" description="Danlin class (cargo)" uuid="e7baefc6-5269-11df-8003-080069138b88" uid="17328">
+        <specific value="1" description="L191 Hai Leng" uuid="e7bbfefc-5269-11df-8661-080069138b88" uid="17329"/>
+        <specific value="2" description="L201 Hai Leng" uuid="e7bd0ab8-5269-11df-a035-080069138b88" uid="17330"/>
+        <specific value="3" description="L790 Hai Yun" uuid="e7be1778-5269-11df-b7d8-080069138b88" uid="17331"/>
+        <specific value="4" description="L795 Hai Yun" uuid="e7bf2618-5269-11df-b624-080069138b88" uid="17332"/>
+      </subcategory>
+      <subcategory value="33" description="Hongqi class (cargo)" uuid="e7c0d576-5269-11df-8e70-080069138b88" uid="17333">
+        <specific value="1" description="Y433" uuid="e7c1dd9a-5269-11df-a579-080069138b88" uid="17334"/>
+        <specific value="2" description="Y528" uuid="e7c2ef64-5269-11df-8335-080069138b88" uid="17335"/>
+        <specific value="3" description="Y755" uuid="e7c3fdc8-5269-11df-9f45-080069138b88" uid="17336"/>
+        <specific value="4" description="Y771" uuid="e7c505ba-5269-11df-b052-080069138b88" uid="17337"/>
+      </subcategory>
+      <subcategory value="34" description="Damen class (cargo)" uuid="e7c6bde2-5269-11df-9bba-080069138b88" uid="17338">
+        <specific value="1" description="Y529" uuid="e7c7cd0e-5269-11df-8da4-080069138b88" uid="17339"/>
+      </subcategory>
+      <subcategory value="35" description="Wulai class (cable)" uuid="e7c978a2-5269-11df-8390-080069138b88" uid="17340">
+        <specific value="1" description="230" uuid="e7ca895e-5269-11df-9b88-080069138b88" uid="17341"/>
+      </subcategory>
+      <subcategory value="36" description="Yan Jiu class (ocean tug)" uuid="e7cc34de-5269-11df-9d8c-080069138b88" uid="17342">
+        <specific value="1" description="14 Jan Jiu" uuid="e7cd40cc-5269-11df-866f-080069138b88" uid="17343"/>
+      </subcategory>
+      <subcategory value="37" description="Gromovoy class (ocean tug)" uuid="e7ceec9c-5269-11df-9df4-080069138b88" uid="17344">
+        <specific value="1" description="210 Haito" uuid="e7cffc86-5269-11df-8b43-080069138b88" uid="17345"/>
+        <specific value="2" description="221 Haito" uuid="e7d108a6-5269-11df-8a25-080069138b88" uid="17346"/>
+        <specific value="3" description="230 Haito" uuid="e7d21458-5269-11df-bcf3-080069138b88" uid="17347"/>
+        <specific value="4" description="231 Haito" uuid="e7d322c6-5269-11df-afd9-080069138b88" uid="17348"/>
+        <specific value="5" description="235 Haito" uuid="e7d42f22-5269-11df-902e-080069138b88" uid="17349"/>
+        <specific value="6" description="319 Haito" uuid="e7d53a8e-5269-11df-a8c0-080069138b88" uid="17350"/>
+        <specific value="7" description="T147 Haito" uuid="e7d647ee-5269-11df-9ca4-080069138b88" uid="17351"/>
+        <specific value="8" description="T716 Haito" uuid="e7d755b2-5269-11df-b81d-080069138b88" uid="17352"/>
+        <specific value="9" description="T802 Haito" uuid="e7d85ce6-5269-11df-8490-080069138b88" uid="17353"/>
+        <specific value="10" description="T814 Haito et al" uuid="e7d96ae6-5269-11df-8ac5-080069138b88" uid="17354"/>
+      </subcategory>
+      <subcategory value="38" description="Yung Gang (ocean tug)" uuid="e7db1bf2-5269-11df-9c22-080069138b88" uid="17355"/>
+      <subcategory value="39" description="Hujiu class (tug)" uuid="e7dc2ad8-5269-11df-a90d-080069138b88" uid="17356">
+        <specific value="1" description="T155" uuid="e7dd319e-5269-11df-98dc-080069138b88" uid="17357"/>
+        <specific value="2" description="T711" uuid="e7de408e-5269-11df-9fd2-080069138b88" uid="17358"/>
+        <specific value="3" description="T842" uuid="e7df5122-5269-11df-b40b-080069138b88" uid="17359"/>
+        <specific value="4" description="T867" uuid="e7e057d4-5269-11df-9707-080069138b88" uid="17360"/>
+      </subcategory>
+      <subcategory value="40" description="Tuzhong class (ocean tug-towing)" uuid="e7e203fe-5269-11df-8935-080069138b88" uid="17361">
+        <specific value="1" description="T154" uuid="e7e315aa-5269-11df-b156-080069138b88" uid="17362"/>
+        <specific value="2" description="T710" uuid="e7e421f2-5269-11df-bf03-080069138b88" uid="17363"/>
+        <specific value="3" description="T830" uuid="e7e53100-5269-11df-bfee-080069138b88" uid="17364"/>
+        <specific value="4" description="T890" uuid="e7e64298-5269-11df-b430-080069138b88" uid="17365"/>
+      </subcategory>
+      <subcategory value="41" description="Harbor tug" uuid="e7e7ee2c-5269-11df-80e1-080069138b88" uid="17366"/>
+    </category>
+    <category value="17" description="Auxiliary, Merchant Marine" uuid="e7e99ab0-5269-11df-a2f7-080069138b88" uid="17367">
+      <subcategory value="1" description="Ji Di Hao class (research)" uuid="e7eaa8c4-5269-11df-b871-080069138b88" uid="17368">
+        <specific value="1" description="Ji Di Hao" uuid="e7ebb53e-5269-11df-b723-080069138b88" uid="17369"/>
+      </subcategory>
+      <subcategory value="2" description="Dajiang class (research)" uuid="e7ed617c-5269-11df-974d-080069138b88" uid="17370">
+        <specific value="1" description="R327" uuid="e7ee6f40-5269-11df-b11d-080069138b88" uid="17371"/>
+        <specific value="2" description="3 Yuan Wang" uuid="e7ef7fde-5269-11df-84bb-080069138b88" uid="17372"/>
+      </subcategory>
+      <subcategory value="3" description="Yuan Wang class (space event)" uuid="e7f12b68-5269-11df-abe8-080069138b88" uid="17373">
+        <specific value="1" description="1 Yuan Wang" uuid="e7f2388c-5269-11df-a6c3-080069138b88" uid="17374"/>
+        <specific value="2" description="2 Yuan Wang" uuid="e7f34466-5269-11df-9955-080069138b88" uid="17375"/>
+      </subcategory>
+      <subcategory value="4" description="Shijian class (oceanographic research)" uuid="e7f4f464-5269-11df-b7d6-080069138b88" uid="17376">
+        <specific value="1" description="Shijian" uuid="e7f60430-5269-11df-99f7-080069138b88" uid="17377"/>
+        <specific value="2" description="Kexueyihao" uuid="e7f70af6-5269-11df-a38b-080069138b88" uid="17378"/>
+      </subcategory>
+      <subcategory value="5" description="Hai Ying class (oceanographic research)" uuid="e7f8b8ec-5269-11df-a352-080069138b88" uid="17379">
+        <specific value="1" description="Ke Xue Yihao" uuid="e7f9c8cc-5269-11df-b885-080069138b88" uid="17380"/>
+        <specific value="2" description="Ke Xue Yijao" uuid="e7fad848-5269-11df-9e73-080069138b88" uid="17381"/>
+      </subcategory>
+      <subcategory value="6" description="Kan class (oceanographic research)" uuid="e7fc8620-5269-11df-9eb4-080069138b88" uid="17382">
+        <specific value="1" description="102 Kan" uuid="e7fd8d90-5269-11df-b2a6-080069138b88" uid="17383"/>
+      </subcategory>
+      <subcategory value="7" description="Shuguang 04 class (oceanographic research)" uuid="e7ff3d48-5269-11df-89e8-080069138b88" uid="17384">
+        <specific value="1" description="04 Shuguang" uuid="e8004c24-5269-11df-bc41-080069138b88" uid="17385"/>
+        <specific value="2" description="05 Shuguang" uuid="e80157a4-5269-11df-ac5e-080069138b88" uid="17386"/>
+        <specific value="3" description="06 Shuguang" uuid="e8026004-5269-11df-aa6e-080069138b88" uid="17387"/>
+        <specific value="4" description="07 Shuguang" uuid="e80378f4-5269-11df-87ef-080069138b88" uid="17388"/>
+        <specific value="5" description="08 Shuguang" uuid="e80487f8-5269-11df-a453-080069138b88" uid="17389"/>
+      </subcategory>
+      <subcategory value="8" description="Hai Yang class (oceanographic research)" uuid="e8063396-5269-11df-9c21-080069138b88" uid="17390">
+        <specific value="1" description="01 Hai Yang" uuid="e807410a-5269-11df-8a55-080069138b88" uid="17391"/>
+        <specific value="2" description="02 Hai Yang" uuid="e8084ec4-5269-11df-8a01-080069138b88" uid="17392"/>
+      </subcategory>
+      <subcategory value="9" description="Hai class (oceanographic research)" uuid="e809fe2c-5269-11df-bcdc-080069138b88" uid="17393">
+        <specific value="1" description="521 Hai" uuid="e80b0baa-5269-11df-a35f-080069138b88" uid="17394"/>
+      </subcategory>
+      <subcategory value="10" description="Dong Fang Hong class (oceanographic research)" uuid="e80cbd24-5269-11df-b259-080069138b88" uid="17395">
+        <specific value="1" description="Dong Fang Hong" uuid="e80dc732-5269-11df-8f59-080069138b88" uid="17396"/>
+      </subcategory>
+      <subcategory value="11" description="Dadie (intelligence collection)" uuid="e80f744c-5269-11df-8369-080069138b88" uid="17397">
+        <specific value="1" description="841" uuid="e8108508-5269-11df-bae5-080069138b88" uid="17398"/>
+      </subcategory>
+      <subcategory value="12" description="Xing Fengshan class (intelligence collection)" uuid="e8123150-5269-11df-ba79-080069138b88" uid="17399">
+        <specific value="1" description="V856 Xing Fengshan" uuid="e813405e-5269-11df-b817-080069138b88" uid="17400"/>
+        <specific value="2" description="01 Xiangyang Hong" uuid="e8144b0c-5269-11df-b02b-080069138b88" uid="17401"/>
+        <specific value="3" description="04, 06 Yiangyang Hong" uuid="e8155902-5269-11df-827a-080069138b88" uid="17402"/>
+        <specific value="4" description="02, 03, 08 Xiangyang Hong" uuid="e816689c-5269-11df-9245-080069138b88" uid="17403"/>
+        <specific value="5" description="05 Xiangyang Hong" uuid="e8177200-5269-11df-b25e-080069138b88" uid="17404"/>
+        <specific value="6" description="09 Xiangyang Hong" uuid="e8187eca-5269-11df-8c44-080069138b88" uid="17405"/>
+        <specific value="7" description="10 Xiangyang Hong" uuid="e8199184-5269-11df-ba47-080069138b88" uid="17406"/>
+        <specific value="8" description="11-16 Xiangyang Hong" uuid="e81a9aac-5269-11df-9dbf-080069138b88" uid="17407"/>
+      </subcategory>
+      <subcategory value="13" description="Hen Hsi class (missile range instrumentation)" uuid="e81c4adc-5269-11df-a376-080069138b88" uid="17408">
+        <specific value="1" description="701 Hsun" uuid="e81d59a4-5269-11df-aeed-080069138b88" uid="17409"/>
+      </subcategory>
+      <subcategory value="14" description="Nan Hai class (geophysical research)" uuid="e81f0a88-5269-11df-bbf1-080069138b88" uid="17410">
+        <specific value="1" description="502 Han Hai" uuid="e82019d2-5269-11df-8951-080069138b88" uid="17411"/>
+        <specific value="2" description="511 Bin Hai" uuid="e82122aa-5269-11df-80fb-080069138b88" uid="17412"/>
+      </subcategory>
+      <subcategory value="15" description="Yenlai class (survey)" uuid="e822da64-5269-11df-bd53-080069138b88" uid="17413">
+        <specific value="1" description="K200" uuid="e823ead0-5269-11df-ba8f-080069138b88" uid="17414"/>
+        <specific value="2" description="226" uuid="e824f876-5269-11df-9cef-080069138b88" uid="17415"/>
+        <specific value="3" description="426" uuid="e825feba-5269-11df-b600-080069138b88" uid="17416"/>
+        <specific value="4" description="427" uuid="e8270f80-5269-11df-8556-080069138b88" uid="17417"/>
+        <specific value="5" description="943" uuid="e8281bdc-5269-11df-aabe-080069138b88" uid="17418"/>
+      </subcategory>
+      <subcategory value="16" description="Yenlun class (survey)" uuid="e829c95a-5269-11df-8ac2-080069138b88" uid="17419">
+        <specific value="1" description="583 Haitse" uuid="e82ad25a-5269-11df-bbf9-080069138b88" uid="17420"/>
+      </subcategory>
+      <subcategory value="17" description="King Hai class (survey)" uuid="e82c81d6-5269-11df-a20e-080069138b88" uid="17421">
+        <specific value="1" description="701 Hai Sheng" uuid="e82d8ea0-5269-11df-8a5e-080069138b88" uid="17422"/>
+        <specific value="2" description="702 Hai Sheng" uuid="e82eaa88-5269-11df-ba07-080069138b88" uid="17423"/>
+      </subcategory>
+      <subcategory value="18" description="Kaiboban class (survey)" uuid="e8305572-5269-11df-9a00-080069138b88" uid="17424">
+        <specific value="1" description="623 Hai Sheng" uuid="e8316110-5269-11df-9e6e-080069138b88" uid="17425"/>
+      </subcategory>
+      <subcategory value="19" description="Ganzhu class (survey)" uuid="e8330e02-5269-11df-ad7a-080069138b88" uid="17426">
+        <specific value="1" description="K420" uuid="e8341d24-5269-11df-a810-080069138b88" uid="17427"/>
+      </subcategory>
+      <subcategory value="20" description="Yanxi class (survey)" uuid="e835cb1a-5269-11df-bc86-080069138b88" uid="17428">
+        <specific value="1" description="V201" uuid="e836d884-5269-11df-97da-080069138b88" uid="17429"/>
+      </subcategory>
+      <subcategory value="21" description="Yannan class (survey)" uuid="e83884b8-5269-11df-a869-080069138b88" uid="17430">
+        <specific value="1" description="K982" uuid="e83990a6-5269-11df-b697-080069138b88" uid="17431"/>
+        <specific value="2" description="983" uuid="e83a9c26-5269-11df-9df3-080069138b88" uid="17432"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="e83ce8be-5269-11df-a82f-080069138b88" uid="17433">
+      <subcategory value="1" description="Container class" uuid="e83df682-5269-11df-9051-080069138b88" uid="17434">
+        <specific value="1" description="Bai Yu Lan" uuid="e83f0324-5269-11df-9cf3-080069138b88" uid="17435"/>
+        <specific value="2" description="Donghai" uuid="e8400fd0-5269-11df-896f-080069138b88" uid="17436"/>
+        <specific value="3" description="Keisho" uuid="e84123ca-5269-11df-a227-080069138b88" uid="17437"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker class" uuid="e842cf90-5269-11df-b1a6-080069138b88" uid="17438">
+        <specific value="1" description="Bin Hai 517" uuid="e843da8e-5269-11df-a2a8-080069138b88" uid="17439"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="45" uuid="e846d11c-5269-11df-bf74-080069138b88" uid="17440">
+    <category value="1" description="SSBN (Nuclear Ballistic Missile)" uuid="e847deea-5269-11df-8305-080069138b88" uid="17441">
+      <subcategory value="1" description="Xia Class (Type 092)" uuid="e848ebdc-5269-11df-bf2a-080069138b88" uid="17442">
+        <specific value="1" description="Xia" uuid="e849f932-5269-11df-aac3-080069138b88" uid="17443"/>
+      </subcategory>
+    </category>
+    <category value="3" description="SSN (Nuclear Attack - Torpedo)" uuid="e84c43ae-5269-11df-9f05-080069138b88" uid="17444">
+      <subcategory value="1" description="Han Class" uuid="e84d5582-5269-11df-a54b-080069138b88" uid="17445">
+        <specific value="1" description="Han 401" uuid="e84e62e2-5269-11df-90f5-080069138b88" uid="17446"/>
+        <specific value="2" description="Han 402" uuid="e84f6e8a-5269-11df-999b-080069138b88" uid="17447"/>
+        <specific value="3" description="Han 403" uuid="e850764a-5269-11df-9b02-080069138b88" uid="17448"/>
+        <specific value="4" description="Han 404" uuid="e85186e8-5269-11df-8d54-080069138b88" uid="17449"/>
+        <specific value="5" description="Han 405" uuid="e8529416-5269-11df-9f95-080069138b88" uid="17450"/>
+      </subcategory>
+    </category>
+    <category value="5" description="SS (Conventional Attack - Torpedo, Patrol)" uuid="e854e0cc-5269-11df-842e-080069138b88" uid="17451">
+      <subcategory value="1" description="Ming Class (Type 035)" uuid="e855f002-5269-11df-bdda-080069138b88" uid="17452">
+        <specific value="1" description="Ming 232" uuid="e856f8e4-5269-11df-b13b-080069138b88" uid="17453"/>
+        <specific value="2" description="Ming 233" uuid="e8580450-5269-11df-b1d3-080069138b88" uid="17454"/>
+        <specific value="3" description="Ming 342" uuid="e8591476-5269-11df-b876-080069138b88" uid="17455"/>
+        <specific value="4" description="Ming 352" uuid="e85a1d12-5269-11df-b7e0-080069138b88" uid="17456"/>
+        <specific value="5" description="Ming 353" uuid="e85b2a4a-5269-11df-8a82-080069138b88" uid="17457"/>
+        <specific value="6" description="Ming 354" uuid="e85c3782-5269-11df-871e-080069138b88" uid="17458"/>
+        <specific value="7" description="Ming 356" uuid="e85d4366-5269-11df-bf03-080069138b88" uid="17459"/>
+        <specific value="8" description="Ming 357" uuid="e85e510c-5269-11df-a280-080069138b88" uid="17460"/>
+        <specific value="9" description="Ming 358" uuid="e85f6740-5269-11df-97e9-080069138b88" uid="17461"/>
+      </subcategory>
+      <subcategory value="2" description="Song Class (Type 039) (SSG)" uuid="e86116f8-5269-11df-8765-080069138b88" uid="17462">
+        <specific value="1" description="Song 320" uuid="e8622106-5269-11df-a84d-080069138b88" uid="17463"/>
+        <specific value="2" description="Song 321" uuid="e8632e16-5269-11df-9014-080069138b88" uid="17464"/>
+        <specific value="3" description="Song 322" uuid="e8643a40-5269-11df-9a78-080069138b88" uid="17465"/>
+        <specific value="4" description="Song 323" uuid="e8654584-5269-11df-aff5-080069138b88" uid="17466"/>
+      </subcategory>
+      <subcategory value="3" description="KILO CLASS" status="new" uuid="2a1bf029-49c1-4c48-8509-0790bd163dac" uid="22798">
+        <cr value="1662"/>
+        <specific value="1" description="364" status="new" uuid="09749215-27d7-42b0-94e8-5cffe8800da0" uid="22799">
+          <cr value="1662"/>
+        </specific>
+        <specific value="2" description="365" status="new" uuid="5687bef8-76e1-43d7-923a-344483d62904" uid="22800">
+          <cr value="1662"/>
+        </specific>
+        <specific value="3" description="366" status="new" uuid="6c2f1e9f-5dca-442d-8d84-9550086e68e2" uid="22801">
+          <cr value="1662"/>
+        </specific>
+        <specific value="4" description="367" status="new" uuid="0843fc72-8561-45e8-9a63-201480436f8f" uid="22802">
+          <cr value="1662"/>
+        </specific>
+        <specific value="5" description="H5" status="new" uuid="3951716b-2329-4a24-a0dc-366d084e8f5c" uid="22803">
+          <cr value="1662"/>
+        </specific>
+        <specific value="6" description="H6" status="new" uuid="b39b5baf-3ce2-481b-837f-980afc394905" uid="22804">
+          <cr value="1662"/>
+        </specific>
+        <specific value="7" description="H7" status="new" uuid="79276dfb-e461-4ad2-952d-b42682c9d6b5" uid="22805">
+          <cr value="1662"/>
+        </specific>
+        <specific value="8" description="H8" status="new" uuid="f494b6fb-30bc-437e-b001-aef3f292d579" uid="22806">
+          <cr value="1662"/>
+        </specific>
+        <specific value="9" description="H9" status="new" uuid="f335267d-0ab6-4dbe-ae11-82793a71a729" uid="22807">
+          <cr value="1662"/>
+        </specific>
+        <specific value="10" description="H10" status="new" uuid="797240e2-bb20-47db-a753-f006ed7d0c4b" uid="22808">
+          <cr value="1662"/>
+        </specific>
+        <specific value="11" description="H11" status="new" uuid="dfcbddf1-30d5-4c6c-8c02-d808eb679d48" uid="22809">
+          <cr value="1662"/>
+        </specific>
+        <specific value="12" description="H12" status="new" uuid="3f6a0547-34a6-45ec-8365-7b4a3a74bb9a" uid="22810">
+          <cr value="1662"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="205" uuid="e86835dc-5269-11df-846e-080069138b88" uid="17467">
+    <category value="0" description="Other" uuid="e8694224-5269-11df-ba3c-080069138b88" uid="17468"/>
+    <category value="1" description="Tank" uuid="e86a482c-5269-11df-ada0-080069138b88" uid="17469">
+      <subcategory value="1" description="Leopard 2 MBT (variation)" status="new" uuid="a007ee8d-7cb8-4a0a-a3ee-41a8a37747f3" uid="22784">
+        <cr value="1633"/>
+        <specific value="1" description="Stridsvagn 121" status="new" uuid="a40b4f80-e4d8-4c00-b869-6fb791b80f90" uid="22785">
+          <cr value="1633"/>
+        </specific>
+        <specific value="2" description="Stridsvagn 122" status="new" uuid="7a7540bf-2d5b-4acb-b7e4-085ac10981dc" uid="22786">
+          <cr value="1633"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="2" description="Armored Fighting Vehicle" uuid="e86b558c-5269-11df-8ac5-080069138b88" uid="17470">
+      <subcategory value="1" description="Stridsfordon 90" uuid="e86c6878-5269-11df-aedf-080069138b88" uid="17471"/>
+      <subcategory value="2" description="Pansarbandvagn 302" uuid="e86d710a-5269-11df-8d04-080069138b88" uid="17472"/>
+    </category>
+    <category value="4" description="Self-propelled Artillery" uuid="e86f1c8a-5269-11df-b9ef-080069138b88" uid="17473">
+      <subcategory value="1" description="RBS-70 launcher" deprecated="1" uuid="e8702ca6-5269-11df-ae3b-080069138b88" uid="17474"/>
+      <subcategory value="2" description="RBS-15K launcher" uuid="e8713f4c-5269-11df-a496-080069138b88" uid="17475"/>
+    </category>
+    <category value="5" description="Towed Artillery" uuid="e872eb12-5269-11df-95cb-080069138b88" uid="17476">
+      <subcategory value="1" description="40mm Bofors" deprecated="1" uuid="e873f250-5269-11df-83c1-080069138b88" uid="17477"/>
+      <subcategory value="2" description="57mm Bofors" deprecated="1" uuid="e8750280-5269-11df-808b-080069138b88" uid="17478"/>
+    </category>
+    <category value="27" description="Civilian Vehicle" uuid="e876b24c-5269-11df-addc-080069138b88" uid="17479">
+      <subcategory value="1" description="Truck" uuid="e877bee4-5269-11df-8c4e-080069138b88" uid="17480"/>
+      <subcategory value="2" description="Bus" uuid="e878c99c-5269-11df-b265-080069138b88" uid="17481"/>
+      <subcategory value="3" description="Car" uuid="e879d6c0-5269-11df-8c8d-080069138b88" uid="17482"/>
+    </category>
+    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="e87b8312-5269-11df-b9c8-080069138b88" uid="17483">
+      <subcategory value="1" description="Towed VSHORAD Gun/Missile System" uuid="e87c90f4-5269-11df-b57b-080069138b88" uid="17484">
+        <specific value="1" description="40mm Bofors" uuid="e87d9ed6-5269-11df-821a-080069138b88" uid="17485">
+          <extra value="1" description="L/70 AA Gun" uuid="e87eb4b0-5269-11df-97a0-080069138b88" uid="17486"/>
+          <extra value="2" description="L/60 AA Gun" uuid="e87fc288-5269-11df-9757-080069138b88" uid="17487"/>
+        </specific>
+        <specific value="2" description="57mm Bofors" uuid="e88170ce-5269-11df-aa2b-080069138b88" uid="17488"/>
+        <specific value="3" description="RBS-70 Launcher" uuid="e8827898-5269-11df-94ed-080069138b88" uid="17489"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="205" uuid="e88566a2-5269-11df-92e0-080069138b88" uid="17490">
+    <category value="0" description="Other" uuid="e8867326-5269-11df-b997-080069138b88" uid="17491"/>
+    <category value="1" description="Fighter/Air Defense" uuid="e8877992-5269-11df-82f4-080069138b88" uid="17492">
+      <subcategory value="1" description="SAAB J 35 Draken" uuid="e8888972-5269-11df-bb97-080069138b88" uid="17493"/>
+      <subcategory value="2" description="SAAB JA 37 Viggen" uuid="e8899c40-5269-11df-bc3c-080069138b88" uid="17494"/>
+      <subcategory value="3" description="SAAB JAS 39 Gripen" uuid="e88aa3f6-5269-11df-bde9-080069138b88" uid="17495"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="205" uuid="e88cf5e8-5269-11df-8109-080069138b88" uid="17496">
+    <category value="0" description="Other" uuid="e88dfe48-5269-11df-85fd-080069138b88" uid="17497"/>
+    <category value="1" description="Carrier" uuid="e88f0af4-5269-11df-b426-080069138b88" uid="17498">
+      <subcategory value="1" description="Stockholm" uuid="e89017be-5269-11df-9f7e-080069138b88" uid="17499"/>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="e891c76c-5269-11df-b708-080069138b88" uid="17500"/>
+  </entity>
+  <entity kind="1" domain="4" country="205" uuid="e89372c4-5269-11df-b11b-080069138b88" uid="17501">
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="e8947d54-5269-11df-b03e-080069138b88" uid="17502">
+      <subcategory value="1" description="Nachen (Denmark)" uuid="e8958ba4-5269-11df-a25b-080069138b88" uid="17503"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="13" uuid="e897da62-5269-11df-a654-080069138b88" uid="17504">
+    <category value="4" description="Cargo/Tanker" uuid="e898e5ec-5269-11df-b25a-080069138b88" uid="17505">
+      <subcategory value="0" description="Other" uuid="e899f202-5269-11df-a180-080069138b88" uid="17506"/>
+      <subcategory value="1" description="GAF Normad" uuid="e89b039a-5269-11df-b051-080069138b88" uid="17507">
+        <specific value="1" description="N22B" uuid="e89c0b78-5269-11df-9dfa-080069138b88" uid="17508"/>
+        <specific value="2" description="N24A" uuid="e89d2012-5269-11df-9f5d-080069138b88" uid="17509"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="13" uuid="e8a00fa2-5269-11df-97f8-080069138b88" uid="17510">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e8a11d84-5269-11df-8e2a-080069138b88" uid="17511">
+      <subcategory value="0" description="Other" uuid="e8a22ada-5269-11df-a222-080069138b88" uid="17512"/>
+      <subcategory value="1" description="ANZAC Class (Meko 200)" uuid="e8a33970-5269-11df-84b5-080069138b88" uid="17513">
+        <specific value="1" description="FFH 150 Anzac" uuid="e8a44b62-5269-11df-af98-080069138b88" uid="17514"/>
+        <specific value="2" description="FFH 151 Arunta" uuid="e8a55746-5269-11df-9960-080069138b88" uid="17515"/>
+        <specific value="3" description="FFH 152 Warumungu" uuid="e8a66622-5269-11df-9b10-080069138b88" uid="17516"/>
+        <specific value="4" description="FFH 153 Stuart" uuid="e8a774f4-5269-11df-af37-080069138b88" uid="17517"/>
+        <specific value="5" description="FFH 154 Parramatta" uuid="e8a87c78-5269-11df-ad32-080069138b88" uid="17518"/>
+        <specific value="6" description="FFH 155 Ballarat" uuid="e8a98d8e-5269-11df-bc58-080069138b88" uid="17519"/>
+        <specific value="7" description="FFH 156 Toowoomba" uuid="e8aa9ff8-5269-11df-b55c-080069138b88" uid="17520"/>
+        <specific value="8" description="FFH 157 Perth" uuid="e8aba768-5269-11df-a8ab-080069138b88" uid="17521"/>
+        <specific value="9" description="Te Kaha (New Zealand)" uuid="e8acb518-5269-11df-920d-080069138b88" uid="17522"/>
+        <specific value="10" description="Te Mana (new Zealand)" uuid="e8adc50c-5269-11df-9c22-080069138b88" uid="17523"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="e8b0123a-5269-11df-a97e-080069138b88" uid="17524">
+      <subcategory value="0" description="Other" uuid="e8b11f04-5269-11df-8cd7-080069138b88" uid="17525"/>
+      <subcategory value="1" description="Fremantle Class (Large Patrol Craft)" uuid="e8b22886-5269-11df-a0bf-080069138b88" uid="17526">
+        <specific value="1" description="P 203 Fremantle" uuid="e8b33884-5269-11df-aa72-080069138b88" uid="17527"/>
+        <specific value="2" description="P 204 Warrnambool" uuid="e8b44a80-5269-11df-9c08-080069138b88" uid="17528"/>
+        <specific value="3" description="P 205 Townsville" uuid="e8b55574-5269-11df-a303-080069138b88" uid="17529"/>
+        <specific value="4" description="P 206 Wollongong" uuid="e8b6641e-5269-11df-b452-080069138b88" uid="17530"/>
+        <specific value="5" description="P 207 Launceston" uuid="e8b77502-5269-11df-bad0-080069138b88" uid="17531"/>
+        <specific value="6" description="P 208 Whyalla" uuid="e8b87e20-5269-11df-9bba-080069138b88" uid="17532"/>
+        <specific value="7" description="P 209 Ipswich" uuid="e8b98b30-5269-11df-8066-080069138b88" uid="17533"/>
+        <specific value="8" description="P 210 Cessnock" uuid="e8ba98f4-5269-11df-add2-080069138b88" uid="17534"/>
+        <specific value="9" description="P 211 Bendigo" uuid="e8bba58c-5269-11df-a70a-080069138b88" uid="17535"/>
+        <specific value="10" description="P 212 Gawler" uuid="e8bcbaf8-5269-11df-9264-080069138b88" uid="17536"/>
+        <specific value="11" description="P 213 Geraldton" uuid="e8bdcaec-5269-11df-91a6-080069138b88" uid="17537"/>
+        <specific value="12" description="P 214 Dubbo" uuid="e8bed7fc-5269-11df-a8f6-080069138b88" uid="17538"/>
+        <specific value="13" description="P 215 Geelong" uuid="e8bfe61a-5269-11df-9375-080069138b88" uid="17539"/>
+        <specific value="14" description="P 216 Gladstone" uuid="e8c0f348-5269-11df-a220-080069138b88" uid="17540"/>
+        <specific value="15" description="P 217 Bunbury" uuid="e8c1fc5c-5269-11df-b62c-080069138b88" uid="17541"/>
+      </subcategory>
+      <subcategory value="2" description="Fremantle Class (Modified)" uuid="e8c3ae26-5269-11df-8fd1-080069138b88" uid="17542">
+        <specific value="1" description="Kula (Fiji)" uuid="e8c4bcd0-5269-11df-a60e-080069138b88" uid="17543"/>
+        <specific value="2" description="Kikau (Fiji)" uuid="e8c5cb7a-5269-11df-85cf-080069138b88" uid="17544"/>
+        <specific value="3" description="Kiro (Fiji)" uuid="e8c6d862-5269-11df-99ae-080069138b88" uid="17545"/>
+        <specific value="4" description="Tukoro (Vanuatu)" uuid="e8c7e57c-5269-11df-a82f-080069138b88" uid="17546"/>
+        <specific value="5" description="Teanaoai (Kiribati)" uuid="e8c8f28c-5269-11df-95dc-080069138b88" uid="17547"/>
+        <specific value="6" description="Lomor (Marshall Islands)" uuid="e8c9ff74-5269-11df-82cf-080069138b88" uid="17548"/>
+        <specific value="7" description="Palikir (Micronesia)" uuid="e8cb0dba-5269-11df-8285-080069138b88" uid="17549"/>
+        <specific value="8" description="Micronesia (Micronesia)" uuid="e8cc1cb4-5269-11df-8c9b-080069138b88" uid="17550"/>
+        <specific value="9" description="Independence (Micronesia)" uuid="e8cd2438-5269-11df-a14f-080069138b88" uid="17551"/>
+        <specific value="10" description="Neiafu (Tonga)" uuid="e8ce34cc-5269-11df-b630-080069138b88" uid="17552"/>
+        <specific value="11" description="Pangui (Tonga)" uuid="e8cf4768-5269-11df-ae4a-080069138b88" uid="17553"/>
+        <specific value="12" description="Savea (Tonga)" uuid="e8d04fd2-5269-11df-b558-080069138b88" uid="17554"/>
+        <specific value="13" description="Te Mataili (Tuvalu)" uuid="e8d15d82-5269-11df-bd93-080069138b88" uid="17555"/>
+        <specific value="14" description="President HI Remeliik (Palau)" uuid="e8d26e16-5269-11df-a089-080069138b88" uid="17556"/>
+        <specific value="15" description="Nalanva (Western Samoa)" uuid="e8d37bd0-5269-11df-83aa-080069138b88" uid="17557"/>
+        <specific value="16" description="Te Kukupa (Cook Islands)" uuid="e8d489da-5269-11df-aa13-080069138b88" uid="17558"/>
+        <specific value="17" description="Tarangau (PNG)" uuid="e8d59b22-5269-11df-9176-080069138b88" uid="17559"/>
+        <specific value="18" description="Dregen (PNG)" uuid="e8d6a436-5269-11df-b9b4-080069138b88" uid="17560"/>
+        <specific value="19" description="Seeadler (PNG)" uuid="e8d7b448-5269-11df-9e2b-080069138b88" uid="17561"/>
+        <specific value="20" description="Baslislk (PNG)" uuid="e8d8c0f4-5269-11df-88ce-080069138b88" uid="17562"/>
+        <specific value="21" description="Lata (Solomon Islands)" uuid="e8d9ca12-5269-11df-a2a7-080069138b88" uid="17563"/>
+        <specific value="22" description="Auki (Solomon Islands)" uuid="e8dae528-5269-11df-86c6-080069138b88" uid="17564"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e8dd3170-5269-11df-9f61-080069138b88" uid="17565">
+      <subcategory value="0" description="Other" uuid="e8de43f8-5269-11df-9c10-080069138b88" uid="17566"/>
+      <subcategory value="1" description="Huon Class (Minehunters-Coastal)" uuid="e8df56e4-5269-11df-b0d4-080069138b88" uid="17567">
+        <specific value="1" description="M 82 Huon" uuid="e8e0662e-5269-11df-8a3a-080069138b88" uid="17568"/>
+        <specific value="2" description="M 83 Hawkesbury" uuid="e8e1703c-5269-11df-94e5-080069138b88" uid="17569"/>
+        <specific value="3" description="M 84 Norman" uuid="e8e27cd4-5269-11df-98e9-080069138b88" uid="17570"/>
+        <specific value="4" description="M 85 Gascoyne" uuid="e8e38ec6-5269-11df-a422-080069138b88" uid="17571"/>
+        <specific value="5" description="M 86 Diamantina" uuid="e8e498ca-5269-11df-b5fe-080069138b88" uid="17572"/>
+        <specific value="6" description="M 87 Yarra" uuid="e8e5a724-5269-11df-85c6-080069138b88" uid="17573"/>
+      </subcategory>
+      <subcategory value="2" description="Bay Class (Minehunters - Inshore)" uuid="e8e753f8-5269-11df-9fa1-080069138b88" uid="17574">
+        <specific value="1" description="M 80 Rushcutter" uuid="e8e86658-5269-11df-bdfd-080069138b88" uid="17575"/>
+        <specific value="2" description="M 81 Shoalwater" uuid="e8e96f1c-5269-11df-8e1f-080069138b88" uid="17576"/>
+      </subcategory>
+      <subcategory value="3" description="COOP Class (Minesweepers - Auxiliary)" uuid="e8eb1a7e-5269-11df-9560-080069138b88" uid="17577">
+        <specific value="1" description="1102 Brolga" uuid="e8ec2cd4-5269-11df-a659-080069138b88" uid="17578"/>
+        <specific value="2" description="1185 Koraaga" uuid="e8ed3bba-5269-11df-970c-080069138b88" uid="17579"/>
+        <specific value="3" description="Y 298 Bandicoot" uuid="e8ee4474-5269-11df-a37d-080069138b88" uid="17580"/>
+        <specific value="4" description="Y 299 Wallaroo" uuid="e8ef5472-5269-11df-b263-080069138b88" uid="17581"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Landing Craft" uuid="e8f19de0-5269-11df-a0c7-080069138b88" uid="17582">
+      <subcategory value="1" description="Modified Sir Bedivere Class" uuid="e8f2af14-5269-11df-8594-080069138b88" uid="17583">
+        <specific value="1" description="LSH 50 Tobruk Tank landing ship" uuid="e8f3be40-5269-11df-8be2-080069138b88" uid="17584"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="e8f60e70-5269-11df-b758-080069138b88" uid="17585">
+      <subcategory value="0" description="Other" uuid="e8f71b76-5269-11df-a24d-080069138b88" uid="17586"/>
+      <subcategory value="1" description="LCH Type" uuid="e8f82a3e-5269-11df-985d-080069138b88" uid="17587">
+        <specific value="1" description="L 126 Balikpapan" uuid="e8f94040-5269-11df-889c-080069138b88" uid="17588"/>
+        <specific value="2" description="L 127 Brunei" uuid="e8fa49cc-5269-11df-8e70-080069138b88" uid="17589"/>
+        <specific value="3" description="L 128 Labuan" uuid="e8fb5a10-5269-11df-8b05-080069138b88" uid="17590"/>
+        <specific value="4" description="L 129 Tarakan" uuid="e8fc6c20-5269-11df-b225-080069138b88" uid="17591"/>
+        <specific value="5" description="L 130 Wewak" uuid="e8fd7520-5269-11df-b519-080069138b88" uid="17592"/>
+        <specific value="6" description="L 133 Betano" uuid="e8fe8212-5269-11df-8253-080069138b88" uid="17593"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="e900d22e-5269-11df-bea6-080069138b88" uid="17594">
+      <subcategory value="1" description="Incat class: Fast Sealift Catamaran" uuid="e901df84-5269-11df-819e-080069138b88" uid="17595">
+        <specific value="1" description="AKR45 Jervis Bay" uuid="e902ee6a-5269-11df-92a1-080069138b88" uid="17596"/>
+      </subcategory>
+      <subcategory value="2" description="Austal class: Fast Sealift Catamaran" uuid="e904a002-5269-11df-bece-080069138b88" uid="17597">
+        <specific value="1" description="Westpac Express" uuid="e905af1a-5269-11df-8913-080069138b88" uid="17598"/>
+      </subcategory>
+      <subcategory value="3" description="Durance class (Underway Replenishment Tanker) AOR" uuid="e9075c70-5269-11df-9c17-080069138b88" uid="17599"/>
+      <subcategory value="4" description="Leaf class (Underway Replenishment Tanker) AOR/AOT" uuid="e9086a8e-5269-11df-b8d6-080069138b88" uid="17600"/>
+    </category>
+    <category value="50" description="Frigate" uuid="e90a18d4-5269-11df-a085-080069138b88" uid="17601">
+      <subcategory value="0" description="Other" uuid="e90b25b2-5269-11df-b35d-080069138b88" uid="17602"/>
+      <subcategory value="1" description="River Class (FF)" uuid="e90c3826-5269-11df-aea6-080069138b88" uid="17603"/>
+    </category>
+    <category value="54" description="Amphibious Assault Ship" uuid="e90de374-5269-11df-ada6-080069138b88" uid="17604">
+      <subcategory value="0" description="Other" uuid="e90eeefe-5269-11df-a35d-080069138b88" uid="17605"/>
+      <subcategory value="1" description="Modified Sir Bedivere Class" deprecated="1" uuid="e90ffe70-5269-11df-b7b4-080069138b88" uid="17606">
+        <specific value="1" description="LSH 50 Tobruk" deprecated="1" uuid="e9110e5a-5269-11df-97b8-080069138b88" uid="17607"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="13" uuid="e913f836-5269-11df-83a5-080069138b88" uid="17608">
+    <category value="4" description="SSG (Conventional Guided Missile)" uuid="e915087a-5269-11df-89fc-080069138b88" uid="17609">
+      <subcategory value="0" description="Other" uuid="e91617b0-5269-11df-854d-080069138b88" uid="17610"/>
+      <subcategory value="1" description="Collins Class" uuid="e917209c-5269-11df-ab3f-080069138b88" uid="17611">
+        <specific value="1" description="S 71 Collins" uuid="e9183518-5269-11df-8e2d-080069138b88" uid="17612"/>
+        <specific value="2" description="S 72 Farncomb" uuid="e9194570-5269-11df-9dc3-080069138b88" uid="17613"/>
+        <specific value="3" description="S 73 Waller" uuid="e91a57a8-5269-11df-aa4e-080069138b88" uid="17614"/>
+        <specific value="4" description="S 74 Dechaineux" uuid="e91b61c0-5269-11df-8967-080069138b88" uid="17615"/>
+        <specific value="5" description="S 75 Sheean" uuid="e91c6f16-5269-11df-afaa-080069138b88" uid="17616"/>
+        <specific value="6" description="S 76 Rankin" uuid="e91d7df2-5269-11df-910b-080069138b88" uid="17617"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="120" uuid="e92069e0-5269-11df-85af-080069138b88" uid="17618">
+    <category value="1" description="Tank" uuid="e921742a-5269-11df-a945-080069138b88" uid="17619">
+      <subcategory value="1" description="Type 88" uuid="e9228220-5269-11df-9952-080069138b88" uid="17620"/>
+      <subcategory value="2" description="K1 105mm MBT" uuid="e923935e-5269-11df-93d1-080069138b88" uid="17621"/>
+      <subcategory value="3" description="K1A1 120mm MBT" uuid="e9249dc6-5269-11df-9f05-080069138b88" uid="17622"/>
+    </category>
+    <category value="2" description="Armored Fighting Vehicle" uuid="e9264d10-5269-11df-ae6c-080069138b88" uid="17623">
+      <subcategory value="1" description="KM900 Armored Personnel Carrier" uuid="e9275c1e-5269-11df-9200-080069138b88" uid="17624"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="120" uuid="e929ad70-5269-11df-88cc-080069138b88" uid="17625">
+    <category value="4" description="Cargo/Tanker" uuid="e92ab9fe-5269-11df-bf20-080069138b88" uid="17626">
+      <subcategory value="1" description="Aircraft Technologies Industries (Airtech) CN-235" uuid="e92bc7cc-5269-11df-8d83-080069138b88" uid="17627">
+        <specific value="1" description="CN-235 M" uuid="e92cd9b4-5269-11df-9152-080069138b88" uid="17628"/>
+      </subcategory>
+    </category>
+    <category value="21" description="Utility Helicopter" uuid="e92f2660-5269-11df-b276-080069138b88" uid="17629">
+      <subcategory value="1" description="Kawasaki BK 117" uuid="e930350a-5269-11df-8ad9-080069138b88" uid="17630"/>
+    </category>
+    <category value="40" description="Trainer" uuid="e931e1b6-5269-11df-8cc0-080069138b88" uid="17631">
+      <subcategory value="1" description="KTX-1 Yeo-Myoung (Dawn)" uuid="e932ede0-5269-11df-8f8a-080069138b88" uid="17632"/>
+    </category>
+    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="e9349b86-5269-11df-b2c3-080069138b88" uid="17633">
+      <subcategory value="1" description="Passenger Airline" uuid="e935ab98-5269-11df-a079-080069138b88" uid="17634">
+        <specific value="1" description="Fokker 1000" uuid="e936c51e-5269-11df-89fd-080069138b88" uid="17635"/>
+        <specific value="2" description="CHK-91 Chang-Gong 91 (Blue Sky 91)" uuid="e937cebe-5269-11df-8138-080069138b88" uid="17636"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="120" uuid="e93ac04c-5269-11df-abb5-080069138b88" uid="17637">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e93bccda-5269-11df-8a02-080069138b88" uid="17638">
+      <subcategory value="1" description="Ulsan Class" uuid="e93cd42c-5269-11df-bf9d-080069138b88" uid="17639">
+        <specific value="1" description="FF 951 Ulsan" uuid="e93de42a-5269-11df-9085-080069138b88" uid="17640"/>
+        <specific value="2" description="FF 952 Seoul" uuid="e93ef716-5269-11df-9d51-080069138b88" uid="17641"/>
+        <specific value="3" description="FF 953 Chung Nam" uuid="e93ffeea-5269-11df-a49a-080069138b88" uid="17642"/>
+        <specific value="4" description="FF 955 Masan" uuid="e9410ca4-5269-11df-9b8d-080069138b88" uid="17643"/>
+        <specific value="5" description="FF 956 Kyong Buk" uuid="e9421d56-5269-11df-a802-080069138b88" uid="17644"/>
+        <specific value="6" description="FF 957 Chon Nam" uuid="e94327c8-5269-11df-8724-080069138b88" uid="17645"/>
+        <specific value="7" description="FF 958 Che Ju" uuid="e94434ba-5269-11df-9610-080069138b88" uid="17646"/>
+        <specific value="8" description="FF 959 Busan" uuid="e9454648-5269-11df-8fd6-080069138b88" uid="17647"/>
+        <specific value="9" description="FF 961 Chung Ju" uuid="e9464f20-5269-11df-832f-080069138b88" uid="17648"/>
+      </subcategory>
+      <subcategory value="2" description="Po Hang Class (Corvette)" uuid="e947fcd0-5269-11df-bdd7-080069138b88" uid="17649">
+        <specific value="1" description="756 Po Hang" uuid="e9490a9e-5269-11df-a734-080069138b88" uid="17650"/>
+        <specific value="2" description="757 Kun San" uuid="e94a1c40-5269-11df-81f3-080069138b88" uid="17651"/>
+        <specific value="3" description="758 Kyong Ju" uuid="e94b24be-5269-11df-9f0f-080069138b88" uid="17652"/>
+        <specific value="4" description="759 Mok Po" uuid="e94c32aa-5269-11df-85f5-080069138b88" uid="17653"/>
+        <specific value="5" description="761 Kim Chon" uuid="e94d40a0-5269-11df-9e3d-080069138b88" uid="17654"/>
+        <specific value="6" description="762 Chung Ju" uuid="e94e4ec8-5269-11df-a08d-080069138b88" uid="17655"/>
+        <specific value="7" description="763 Jin Ju" uuid="e94f5c28-5269-11df-ab54-080069138b88" uid="17656"/>
+        <specific value="8" description="765 Yo Su" uuid="e950682a-5269-11df-986b-080069138b88" uid="17657"/>
+        <specific value="9" description="766 An Dong" uuid="e95170f8-5269-11df-8eda-080069138b88" uid="17658"/>
+        <specific value="10" description="767 Sun Chon" uuid="e9528538-5269-11df-9bb6-080069138b88" uid="17659"/>
+        <specific value="11" description="768 Yee Ree" uuid="e953936a-5269-11df-87b3-080069138b88" uid="17660"/>
+        <specific value="12" description="769 Won Ju" uuid="e9549a1c-5269-11df-9b65-080069138b88" uid="17661"/>
+        <specific value="13" description="771 Je Chon" uuid="e955b3c0-5269-11df-9e5e-080069138b88" uid="17662"/>
+        <specific value="14" description="772 Chon An" uuid="e956c2ce-5269-11df-b47e-080069138b88" uid="17663"/>
+        <specific value="15" description="773 Song Nam" uuid="e957cb6a-5269-11df-9581-080069138b88" uid="17664"/>
+        <specific value="16" description="775 Bu Chon" uuid="e958d956-5269-11df-bf2d-080069138b88" uid="17665"/>
+        <specific value="17" description="776 Dae Chon" uuid="e959ea9e-5269-11df-bf6f-080069138b88" uid="17666"/>
+        <specific value="18" description="777 Jin Hae" uuid="e95af3e4-5269-11df-b8f5-080069138b88" uid="17667"/>
+        <specific value="19" description="778 Sok Cho" uuid="e95c019e-5269-11df-9715-080069138b88" uid="17668"/>
+        <specific value="20" description="779 Yong Ju" uuid="e95d1138-5269-11df-b60e-080069138b88" uid="17669"/>
+        <specific value="21" description="781 Nam Won" uuid="e95e1d8a-5269-11df-8c65-080069138b88" uid="17670"/>
+        <specific value="22" description="782 Kwan Myong" uuid="e95f2bbc-5269-11df-9821-080069138b88" uid="17671"/>
+        <specific value="23" description="783" uuid="e96037c8-5269-11df-8bac-080069138b88" uid="17672"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="e96286cc-5269-11df-a7f9-080069138b88" uid="17673">
+      <subcategory value="1" description="Pae Ku (PSMM 5) Class (fast attack craft-missile)" uuid="e96394d6-5269-11df-a8d0-080069138b88" uid="17674">
+        <specific value="1" description="PGM 582 Pae Ku 52" uuid="e964a074-5269-11df-8c6f-080069138b88" uid="17675"/>
+        <specific value="2" description="PGM 583 Pae Ku 53" uuid="e965b194-5269-11df-b77d-080069138b88" uid="17676"/>
+        <specific value="3" description="PGM 585 Pae Ku 55" uuid="e966bfc6-5269-11df-9d73-080069138b88" uid="17677"/>
+        <specific value="4" description="PGM 586 Pae Ku 56" uuid="e967c89e-5269-11df-9304-080069138b88" uid="17678"/>
+        <specific value="5" description="PGM 587 Pae Ku 57" uuid="e968d55e-5269-11df-b1aa-080069138b88" uid="17679"/>
+        <specific value="6" description="PGM 588 Pae Ku 58" uuid="e969e7f0-5269-11df-9a6e-080069138b88" uid="17680"/>
+        <specific value="7" description="PGM 589 Pae Ku 59" uuid="e96af050-5269-11df-a847-080069138b88" uid="17681"/>
+        <specific value="8" description="PGM 591 Pae Ku 51" uuid="e96bfeb4-5269-11df-8282-080069138b88" uid="17682"/>
+      </subcategory>
+      <subcategory value="2" description="Sea Dolphin Class (fast attack craft-patrol)" uuid="e96dac82-5269-11df-b4da-080069138b88" uid="17683">
+        <specific value="1" description="PKM 212-358 series" uuid="e96ebfd2-5269-11df-ace3-080069138b88" uid="17684"/>
+      </subcategory>
+      <subcategory value="3" description="Wildcat Class (fast attack craft-missile)" uuid="e9706cf6-5269-11df-8d2f-080069138b88" uid="17685">
+        <specific value="1" description="PKM 271-72" uuid="e97178bc-5269-11df-9cbb-080069138b88" uid="17686"/>
+      </subcategory>
+      <subcategory value="4" description="Sea Hawk Class (fast attack craft-patrol)" uuid="e97328e2-5269-11df-a71f-080069138b88" uid="17687">
+        <specific value="1" description="PK 161-189 series" uuid="e97440e2-5269-11df-ab77-080069138b88" uid="17688"/>
+      </subcategory>
+      <subcategory value="5" description="Sea Fox Class (fast attack craft-patrol)" uuid="e975ef1e-5269-11df-9780-080069138b88" uid="17689">
+        <specific value="1" description="PK 161-189 series" uuid="e9770fb6-5269-11df-a66e-080069138b88" uid="17690"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e9795ef6-5269-11df-a4e0-080069138b88" uid="17691">
+      <subcategory value="1" description="Swallow Class (minehunter)" uuid="e97a6ecc-5269-11df-ae80-080069138b88" uid="17692">
+        <specific value="1" description="561 Kang Keong" uuid="e97b7ce0-5269-11df-b39c-080069138b88" uid="17693"/>
+        <specific value="2" description="562 Kang Jin" uuid="e97c8b8a-5269-11df-9c3c-080069138b88" uid="17694"/>
+        <specific value="3" description="563 Ko Ryeong" uuid="e97d984a-5269-11df-8472-080069138b88" uid="17695"/>
+        <specific value="4" description="565 Kim Po" uuid="e97ea0b4-5269-11df-ba98-080069138b88" uid="17696"/>
+        <specific value="5" description="566 Ko Chang" uuid="e97fb2c4-5269-11df-b2c9-080069138b88" uid="17697"/>
+        <specific value="6" description="567 Kum Cha" uuid="e980c16e-5269-11df-bba6-080069138b88" uid="17698"/>
+      </subcategory>
+      <subcategory value="2" description="US MSC 268 Class (minesweeper-coastal)" uuid="e9826e88-5269-11df-bee8-080069138b88" uid="17699">
+        <specific value="1" description="MSC 551 Kum San" uuid="e9837cc4-5269-11df-9dd1-080069138b88" uid="17700"/>
+        <specific value="2" description="MSC 552 Ko Hung" uuid="e9848b5a-5269-11df-a1df-080069138b88" uid="17701"/>
+        <specific value="3" description="MSC 553 Kum Kok" uuid="e9859950-5269-11df-96d2-080069138b88" uid="17702"/>
+      </subcategory>
+      <subcategory value="3" description="US MSC 389 Class (minesweeper-coastal)" uuid="e987491c-5269-11df-b73b-080069138b88" uid="17703">
+        <specific value="1" description="MSC 555 Nam Yang" uuid="e9885352-5269-11df-8ac4-080069138b88" uid="17704"/>
+        <specific value="2" description="MSC 556 Ha Dong" uuid="e98960e4-5269-11df-bffc-080069138b88" uid="17705"/>
+        <specific value="3" description="MSC 557 Sam Kok" uuid="e98a70e2-5269-11df-94ab-080069138b88" uid="17706"/>
+        <specific value="4" description="MSC 558 Yong Dong" uuid="e98b78f2-5269-11df-b19f-080069138b88" uid="17707"/>
+        <specific value="5" description="MSC 559 Ok Cheon" uuid="e98c8800-5269-11df-ae61-080069138b88" uid="17708"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Tank Landing Ship" uuid="e98ed5ec-5269-11df-8bd1-080069138b88" uid="17709">
+      <subcategory value="1" description="Alligator Class (LST)" uuid="e98fe2ac-5269-11df-aeba-080069138b88" uid="17710"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="e9919520-5269-11df-ba99-080069138b88" uid="17711">
+      <subcategory value="1" description="Chun Jee Class (HDA 8000) (AOE)" uuid="e992aa3c-5269-11df-91a9-080069138b88" uid="17712">
+        <specific value="1" description="AO 57 Chun Jee" uuid="e993bdb4-5269-11df-b93d-080069138b88" uid="17713"/>
+        <specific value="2" description="AO 53" uuid="e994c5c4-5269-11df-af08-080069138b88" uid="17714"/>
+      </subcategory>
+      <subcategory value="2" description="Furseal Class (LCU)" uuid="e99673c4-5269-11df-8165-080069138b88" uid="17715">
+        <specific value="1" description="72, 73-75-78 Mulkae" uuid="e9978606-5269-11df-8999-080069138b88" uid="17716"/>
+      </subcategory>
+      <subcategory value="3" description="Surveying Ship" uuid="e999329e-5269-11df-a98d-080069138b88" uid="17717">
+        <specific value="1" description="801-803, 805, 806 Pusan" uuid="e99a403a-5269-11df-9aba-080069138b88" uid="17718"/>
+        <specific value="2" description="821 Ch'ungnam" uuid="e99b4d5e-5269-11df-aca9-080069138b88" uid="17719"/>
+        <specific value="3" description="831 Kangwon" uuid="e99c5b54-5269-11df-85fe-080069138b88" uid="17720"/>
+      </subcategory>
+      <subcategory value="4" description="Trials Support Ship" uuid="e99e07ce-5269-11df-9db2-080069138b88" uid="17721">
+        <specific value="1" description="Sunjin" uuid="e99f1506-5269-11df-b3d8-080069138b88" uid="17722"/>
+      </subcategory>
+      <subcategory value="5" description="Salvage Ship" uuid="e9a0c5fe-5269-11df-b809-080069138b88" uid="17723">
+        <specific value="1" description="ARS 26 GUMI" uuid="e9a1ce40-5269-11df-b331-080069138b88" uid="17724"/>
+        <specific value="2" description="ARS 25 CHANG WON" uuid="e9a2da88-5269-11df-af86-080069138b88" uid="17725"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="e9a52950-5269-11df-87a5-080069138b88" uid="17726">
+      <subcategory value="1" description="Dong Hae Class (Corvette)" uuid="e9a63836-5269-11df-ab53-080069138b88" uid="17727">
+        <specific value="1" description="751 Dong Hae" uuid="e9a74776-5269-11df-be07-080069138b88" uid="17728"/>
+        <specific value="2" description="752 Su Won" uuid="e9a854c2-5269-11df-b180-080069138b88" uid="17729"/>
+        <specific value="3" description="753 Kang Reung" uuid="e9a96074-5269-11df-8f2f-080069138b88" uid="17730"/>
+        <specific value="4" description="755 An Yang" uuid="e9aa6e1a-5269-11df-b8b0-080069138b88" uid="17731"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-combatant Ship" uuid="e9acb97c-5269-11df-87ea-080069138b88" uid="17732">
+      <subcategory value="1" description="Container Class" uuid="e9adca10-5269-11df-8fc8-080069138b88" uid="17733">
+        <specific value="1" description="Chung Gu" uuid="e9aed838-5269-11df-a61c-080069138b88" uid="17734"/>
+        <specific value="2" description="Ga Yang" uuid="e9afe228-5269-11df-b52b-080069138b88" uid="17735"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="120" uuid="e9b2e252-5269-11df-9081-080069138b88" uid="17736">
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="e9b3ef9e-5269-11df-8c46-080069138b88" uid="17737">
+      <subcategory value="1" description="Chang Bogo (Type 209) Class)" uuid="e9b5001e-5269-11df-990e-080069138b88" uid="17738">
+        <specific value="1" description="061 Chang Bogo" uuid="e9b612b0-5269-11df-9a4e-080069138b88" uid="17739"/>
+        <specific value="2" description="062 Yi Chon" uuid="e9b71cfa-5269-11df-983b-080069138b88" uid="17740"/>
+        <specific value="3" description="063 Choi Muson" uuid="e9b82a46-5269-11df-83b5-080069138b88" uid="17741"/>
+      </subcategory>
+    </category>
+    <category value="7" description="SSA (Conventional Auxiliary)" uuid="e9ba7760-5269-11df-8974-080069138b88" uid="17742">
+      <subcategory value="1" description="KSS-1 Tolgorae Class (midget submarine)" uuid="e9bb87b8-5269-11df-be5a-080069138b88" uid="17743">
+        <specific value="1" description="051-053" uuid="e9bc9a36-5269-11df-8709-080069138b88" uid="17744"/>
+      </subcategory>
+      <subcategory value="2" description="Cosmos Class (midget submarine)" uuid="e9be45e8-5269-11df-aa1f-080069138b88" uid="17745"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="119" uuid="e9c0955a-5269-11df-8f89-080069138b88" uid="17746">
+    <category value="1" description="Tank" uuid="e9c1a27e-5269-11df-b6e0-080069138b88" uid="17747">
+      <subcategory value="1" description="M1985 Light tank" uuid="e9c2afe8-5269-11df-ab1d-080069138b88" uid="17748"/>
+      <subcategory value="2" description="Type-63 Light amphibious tank" uuid="e9c3c298-5269-11df-9483-080069138b88" uid="17749"/>
+    </category>
+    <category value="4" description="Self-propelled artillery" uuid="e9c56fb2-5269-11df-9549-080069138b88" uid="17750">
+      <subcategory value="1" description="170 mm Self Propelled Gun" uuid="e9c67a6a-5269-11df-b3dc-080069138b88" uid="17751">
+        <specific value="1" description="M-1978 SP &quot;Koksan&quot;" uuid="e9c78d38-5269-11df-b398-080069138b88" uid="17752"/>
+        <specific value="2" description="M-1989" uuid="e9c89c64-5269-11df-a1e7-080069138b88" uid="17753"/>
+      </subcategory>
+      <subcategory value="2" description="240 mm Rocket Launcher" uuid="e9ca4bb8-5269-11df-bb91-080069138b88" uid="17754">
+        <specific value="1" description="M-1985" uuid="e9cb547c-5269-11df-a5cb-080069138b88" uid="17755"/>
+        <specific value="2" description="M-1991" uuid="e9cc62ae-5269-11df-8f2b-080069138b88" uid="17756"/>
+      </subcategory>
+      <subcategory value="3" description="BM-11 122 mm Multiple Rocket Launcher" uuid="e9ce0f8c-5269-11df-ba0c-080069138b88" uid="17757"/>
+      <subcategory value="4" description="M-1992 Self Propelled Combination Gun" uuid="e9cf2200-5269-11df-a05e-080069138b88" uid="17758"/>
+      <subcategory value="5" description="Taepo Dong I Launcher" uuid="e9d03938-5269-11df-8a04-080069138b88" uid="17759"/>
+      <subcategory value="6" description="Taepo Dong II Launcher (2-stage version)" uuid="e9d14a3a-5269-11df-949f-080069138b88" uid="17760"/>
+      <subcategory value="7" description="Taepo Dong II Launcher (3-stage version)" uuid="e9d25b1e-5269-11df-939f-080069138b88" uid="17761"/>
+      <subcategory value="8" description="No Dong Launcher" uuid="e9d36996-5269-11df-b4dd-080069138b88" uid="17762"/>
+      <subcategory value="9" description="SCUB-B Launcher" uuid="e9d4782c-5269-11df-b151-080069138b88" uid="17763"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="119" uuid="e9d6c23a-5269-11df-b465-080069138b88" uid="17764">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="e9d7ce5a-5269-11df-99c1-080069138b88" uid="17765">
+      <subcategory value="1" description="Soho Class" uuid="e9d8dec6-5269-11df-a926-080069138b88" uid="17766"/>
+      <subcategory value="2" description="Najin Class" uuid="e9d9f0c2-5269-11df-86ea-080069138b88" uid="17767"/>
+    </category>
+    <category value="7" description="Light/patrol Craft" uuid="e9db9bca-5269-11df-ae0e-080069138b88" uid="17768">
+      <subcategory value="1" description="So 1 Class (large patrol craft)" uuid="e9dca4a2-5269-11df-9f3c-080069138b88" uid="17769"/>
+      <subcategory value="2" description="Soju Class (fast attack craft-missile)" uuid="e9ddb888-5269-11df-995e-080069138b88" uid="17770"/>
+      <subcategory value="3" description="Sohung Class (fast attack craft-missile)" uuid="e9deca84-5269-11df-915a-080069138b88" uid="17771"/>
+      <subcategory value="4" description="Sariwon Class (large patrol craft)" uuid="e9dfd4ec-5269-11df-afe9-080069138b88" uid="17772">
+        <specific value="1" description="725-27" uuid="e9e0e8d2-5269-11df-bbcd-080069138b88" uid="17773"/>
+      </subcategory>
+      <subcategory value="5" description="Soman Class (large patrol craft)" uuid="e9e2965a-5269-11df-baf2-080069138b88" uid="17774"/>
+      <subcategory value="6" description="Taechong I (large patrol craft)" uuid="e9e3a61c-5269-11df-a181-080069138b88" uid="17775"/>
+      <subcategory value="7" description="Taechong II (Mayang) (large patrol craft)" uuid="e9e4b494-5269-11df-af37-080069138b88" uid="17776"/>
+      <subcategory value="8" description="Chodo Class (fast attack craft-gun)" uuid="e9e5c64a-5269-11df-b950-080069138b88" uid="17777"/>
+      <subcategory value="9" description="Chaho Class (fast attack craft-gun)" uuid="e9e6d936-5269-11df-bc13-080069138b88" uid="17778"/>
+      <subcategory value="10" description="Chong-Jin Class (fast attack craft-gun)" uuid="e9e7e5d8-5269-11df-bc27-080069138b88" uid="17779"/>
+      <subcategory value="11" description="Chong-Ju Class (fast attack craft-gun)" uuid="e9e8f5fe-5269-11df-8a51-080069138b88" uid="17780"/>
+      <subcategory value="12" description="Sinpo (Sinnam) Class (fast attack craft-gun)" uuid="e9ea0c5a-5269-11df-b0af-080069138b88" uid="17781"/>
+      <subcategory value="13" description="Ku Song Class (fast attack craft-torpedo)" uuid="e9eb18e8-5269-11df-beb5-080069138b88" uid="17782"/>
+      <subcategory value="14" description="Sin Hung Class (fast attack craft-torpedo)" uuid="e9ec29f4-5269-11df-b408-080069138b88" uid="17783"/>
+      <subcategory value="15" description="Mod Sin Hung Class (fast attack craft-torpedo)" uuid="e9ed3ec0-5269-11df-8353-080069138b88" uid="17784"/>
+      <subcategory value="16" description="TB 11PA Class (inshore patrol craft)" uuid="e9ee4bda-5269-11df-8ae1-080069138b88" uid="17785"/>
+      <subcategory value="17" description="TB 40A Class (inshore patrol craft)" uuid="e9ef6650-5269-11df-9aba-080069138b88" uid="17786"/>
+      <subcategory value="18" description="Modified Fishing Vessels (coastal patrol craft)" uuid="e9f077de-5269-11df-a0ec-080069138b88" uid="17787"/>
+      <subcategory value="19" description="High Speed Infiltration Craft (HSIC)" uuid="e9f183a4-5269-11df-bd35-080069138b88" uid="17788"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="e9f3374e-5269-11df-a947-080069138b88" uid="17789">
+      <subcategory value="1" description="Yukto I Class (coastal minesweeper)" uuid="e9f446b6-5269-11df-90f7-080069138b88" uid="17790"/>
+      <subcategory value="2" description="Yukto II Class (coastal minesweeper)" uuid="e9f559c0-5269-11df-bbec-080069138b88" uid="17791"/>
+      <subcategory value="3" description="Pipa-Got Class (inshore minesweeper)" uuid="e9f6645a-5269-11df-89c8-080069138b88" uid="17792"/>
+    </category>
+    <category value="10" description="Tank Landing Ship" uuid="e9f8166a-5269-11df-ad24-080069138b88" uid="17793">
+      <subcategory value="1" description="Hungnam Class (LSM)" uuid="e9f92474-5269-11df-a8b8-080069138b88" uid="17794"/>
+      <subcategory value="2" description="Hantae Class (LSM)" uuid="e9fa3512-5269-11df-adf8-080069138b88" uid="17795"/>
+    </category>
+    <category value="11" description="Landing Craft" uuid="e9fbe29a-5269-11df-9c22-080069138b88" uid="17796">
+      <subcategory value="1" description="Hanchon Class (LCM)" uuid="e9fcef1e-5269-11df-a289-080069138b88" uid="17797"/>
+      <subcategory value="2" description="Nampo Class (LCP)" uuid="e9fdff6c-5269-11df-9e8b-080069138b88" uid="17798"/>
+    </category>
+    <category value="15" description="Air Cushion/Surface Effect" uuid="e9ffadda-5269-11df-aee3-080069138b88" uid="17799">
+      <subcategory value="1" description="Songjong Class (Type I-III) (LCP-hovercraft)" uuid="ea00bce8-5269-11df-ac3c-080069138b88" uid="17800"/>
+      <subcategory value="2" description="Kongbang Class (LCPA-hovercraft)" status="new" uuid="a385d1ca-0faa-4c5d-94b1-5a91e2481ba0" uid="22780">
+        <cr value="1632"/>
+        <specific value="1" description="KongBang I" status="new" uuid="dcd0c466-00b5-4f8c-9abd-cad520d9f674" uid="22781">
+          <cr value="1632"/>
+        </specific>
+        <specific value="2" description="KongBang II" status="new" uuid="9081423b-7236-4d27-b052-c6e720a338e7" uid="22782">
+          <cr value="1632"/>
+        </specific>
+        <specific value="3" description="KongBang III" status="new" uuid="b33c15c9-2b69-46ba-b1ef-7688e0b8c9a2" uid="22783">
+          <cr value="1632"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="ea026e94-5269-11df-b655-080069138b88" uid="17801">
+      <subcategory value="1" description="Depot Ship for Midget Submarine" uuid="ea03774e-5269-11df-a094-080069138b88" uid="17802">
+        <specific value="1" description="Soo Gun-Ho" uuid="ea0487c4-5269-11df-97d8-080069138b88" uid="17803"/>
+        <specific value="2" description="Dong Geon Ae Gook-Ho" uuid="ea059718-5269-11df-90b7-080069138b88" uid="17804"/>
+        <specific value="3" description="Dong Hae-Ho" uuid="ea06a392-5269-11df-af32-080069138b88" uid="17805"/>
+        <specific value="4" description="Chong Seong-Ho Number One" uuid="ea07b228-5269-11df-bb2f-080069138b88" uid="17806"/>
+        <specific value="5" description="Chong Seong-Ho Number Two" uuid="ea08c046-5269-11df-b3b3-080069138b88" uid="17807"/>
+        <specific value="6" description="Chong Seong-Ho Humber Three" uuid="ea09ca18-5269-11df-b1bd-080069138b88" uid="17808"/>
+        <specific value="7" description="Hae Gum Gong-Ho" uuid="ea0adc8c-5269-11df-afa6-080069138b88" uid="17809"/>
+        <specific value="8" description="Song Rim-Ho" uuid="ea0bead2-5269-11df-951f-080069138b88" uid="17810"/>
+      </subcategory>
+      <subcategory value="2" description="Surveying Ship" uuid="ea0d9e0e-5269-11df-9341-080069138b88" uid="17811">
+        <specific value="1" description="101 Donghae" uuid="ea0eacc2-5269-11df-9d0e-080069138b88" uid="17812"/>
+        <specific value="2" description="102 Donghae" uuid="ea0fc7a6-5269-11df-a75d-080069138b88" uid="17813"/>
+        <specific value="3" description="201 Sohai" uuid="ea10d736-5269-11df-b2de-080069138b88" uid="17814"/>
+        <specific value="4" description="202 Sohai" uuid="ea11e23e-5269-11df-a585-080069138b88" uid="17815"/>
+      </subcategory>
+      <subcategory value="3" description="Coastal Patrol Craft" uuid="ea1392a0-5269-11df-9871-080069138b88" uid="17816">
+        <specific value="1" description="177" uuid="ea14a186-5269-11df-9e89-080069138b88" uid="17817"/>
+        <specific value="2" description="801" uuid="ea15b288-5269-11df-ad5d-080069138b88" uid="17818"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-combatant ship" uuid="ea17fb10-5269-11df-96bf-080069138b88" uid="17819">
+      <subcategory value="1" description="Container class" uuid="ea190bd6-5269-11df-9f82-080069138b88" uid="17820">
+        <specific value="1" description="Chong Jin" uuid="ea1a145e-5269-11df-9021-080069138b88" uid="17821"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="119" uuid="ea1d063c-5269-11df-8213-080069138b88" uid="17822">
+    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="ea1e136a-5269-11df-82de-080069138b88" uid="17823">
+      <subcategory value="1" description="Sang-O class (midget submarine)" uuid="ea1f2200-5269-11df-8769-080069138b88" uid="17824"/>
+    </category>
+    <category value="7" description="SSA (Conventional Auxiliary)" uuid="ea20cfb0-5269-11df-a540-080069138b88" uid="17825">
+      <subcategory value="1" description="North Korean Design (midget submarine)" uuid="ea21e2a6-5269-11df-9859-080069138b88" uid="17826"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="178" uuid="ea242d90-5269-11df-a4e6-080069138b88" uid="17827">
+    <category value="7" description="Light/Patrol Craft" uuid="ea253cda-5269-11df-8b62-080069138b88" uid="17828">
+      <subcategory value="1" description="Damsah (Combattante III M) Class (fast attack craft-missile)" uuid="ea264d32-5269-11df-98e9-080069138b88" uid="17829">
+        <specific value="1" description="Q01 Damsah" uuid="ea275f6a-5269-11df-a29a-080069138b88" uid="17830"/>
+        <specific value="2" description="Q02 AL Ghariyah" uuid="ea286ad6-5269-11df-9f00-080069138b88" uid="17831"/>
+        <specific value="3" description="Q03 Rbigah" uuid="ea29798a-5269-11df-a16f-080069138b88" uid="17832"/>
+      </subcategory>
+      <subcategory value="2" description="Barzan Class (large patrol craft)" uuid="ea2b276c-5269-11df-a038-080069138b88" uid="17833">
+        <specific value="1" description="Q11 Barzan" uuid="ea2c42f0-5269-11df-a51e-080069138b88" uid="17834"/>
+        <specific value="2" description="Q12 Hwar" uuid="ea2d4c40-5269-11df-80fe-080069138b88" uid="17835"/>
+        <specific value="3" description="Q13 That Assuari" uuid="ea2e5a40-5269-11df-a781-080069138b88" uid="17836"/>
+        <specific value="4" description="Q14 AL Wusail" uuid="ea2f6c32-5269-11df-bf03-080069138b88" uid="17837"/>
+        <specific value="5" description="Q15 Fateh-AL-Khair" uuid="ea307456-5269-11df-b16a-080069138b88" uid="17838"/>
+        <specific value="6" description="Q16 Tariq" uuid="ea318364-5269-11df-a011-080069138b88" uid="17839"/>
+      </subcategory>
+      <subcategory value="3" description="Damen Polycat 1450 Class (coastal patrolcraft)" uuid="ea333506-5269-11df-b4fe-080069138b88" uid="17840">
+        <specific value="1" description="Q31-36" uuid="ea34450e-5269-11df-86f4-080069138b88" uid="17841"/>
+      </subcategory>
+      <subcategory value="4" description="Fairey Marine Spear Class (coastal patrol craft)" uuid="ea35f156-5269-11df-8884-080069138b88" uid="17842">
+        <specific value="1" description="Q71-95" uuid="ea36ff6a-5269-11df-83ab-080069138b88" uid="17843"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="189" uuid="ea39ec52-5269-11df-9199-080069138b88" uid="17844">
+    <category value="40" description="Trainer" uuid="ea3afb56-5269-11df-acb1-080069138b88" uid="17845">
+      <subcategory value="1" description="Pilatus Flugzeugwerke SA PC-9" uuid="ea3c0410-5269-11df-b593-080069138b88" uid="17846">
+        <specific value="1" description="PC-9" uuid="ea3d1436-5269-11df-a49d-080069138b88" uid="17847"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="189" uuid="ea4004ca-5269-11df-a76a-080069138b88" uid="17848">
+    <category value="6" description="Guided Missile Frigate" uuid="ea41113a-5269-11df-9373-080069138b88" uid="17849">
+      <subcategory value="1" description="Madina (Type F 2000S) Class" uuid="ea421922-5269-11df-8636-080069138b88" uid="17850">
+        <specific value="1" description="702 Madina" uuid="ea432c4a-5269-11df-8fb7-080069138b88" uid="17851"/>
+        <specific value="2" description="704 Hofouf" uuid="ea44390a-5269-11df-8c03-080069138b88" uid="17852"/>
+        <specific value="3" description="706 Abha" uuid="ea4541d8-5269-11df-8fac-080069138b88" uid="17853"/>
+        <specific value="4" description="708 Taif" uuid="ea465258-5269-11df-98df-080069138b88" uid="17854"/>
+      </subcategory>
+      <subcategory value="2" description="Badr Class (Corvette)" uuid="ea47febe-5269-11df-ad51-080069138b88" uid="17855">
+        <specific value="1" description="612 Badr" uuid="ea490d36-5269-11df-9ab1-080069138b88" uid="17856"/>
+        <specific value="2" description="614 Al Yarmook" uuid="ea4a1956-5269-11df-971d-080069138b88" uid="17857"/>
+        <specific value="3" description="616 Hitteen" uuid="ea4b2ef4-5269-11df-99a2-080069138b88" uid="17858"/>
+        <specific value="4" description="618 Tabuk" uuid="ea4c5702-5269-11df-9b72-080069138b88" uid="17859"/>
+      </subcategory>
+      <subcategory value="3" description="Arriyad Class (Type F-3000S)" uuid="ea4e36b2-5269-11df-aba3-080069138b88" uid="17860">
+        <specific value="1" description="812 Al Ryadh" uuid="ea4f5a06-5269-11df-a279-080069138b88" uid="17861"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="ea51c93a-5269-11df-a936-080069138b88" uid="17862">
+      <subcategory value="1" description="Jaguar Class (fast attack craft-torpedo)" uuid="ea52d8ac-5269-11df-8f79-080069138b88" uid="17863">
+        <specific value="1" description="90 Dammam" uuid="ea53e5e4-5269-11df-9bd4-080069138b88" uid="17864"/>
+        <specific value="2" description="50 Khabar" uuid="ea54f3a8-5269-11df-bfb4-080069138b88" uid="17865"/>
+        <specific value="3" description="10 Maccah" uuid="ea5607ac-5269-11df-b346-080069138b88" uid="17866"/>
+      </subcategory>
+      <subcategory value="2" description="Halter Type (coastal patrol craft)" uuid="ea57b7c8-5269-11df-9971-080069138b88" uid="17867"/>
+      <subcategory value="3" description="Simmoneau 51 Type (inshore patrol craft)" uuid="ea58c474-5269-11df-92be-080069138b88" uid="17868"/>
+      <subcategory value="4" description="Al Siddiq (fast attack craft-missile)" uuid="ea59d6b6-5269-11df-b04f-080069138b88" uid="17869">
+        <specific value="1" description="511 Al Siddiq" uuid="ea5aec36-5269-11df-b633-080069138b88" uid="17870"/>
+        <specific value="2" description="513 Al Farouq" uuid="ea5bf572-5269-11df-8e0f-080069138b88" uid="17871"/>
+        <specific value="3" description="515 Abdul Aziz" uuid="ea5d0354-5269-11df-97fa-080069138b88" uid="17872"/>
+        <specific value="4" description="517 Faisal" uuid="ea5e13ac-5269-11df-b002-080069138b88" uid="17873"/>
+        <specific value="5" description="519 Kahlid" uuid="ea5f2166-5269-11df-a211-080069138b88" uid="17874"/>
+        <specific value="6" description="521 Amyr" uuid="ea6030a6-5269-11df-925f-080069138b88" uid="17875"/>
+        <specific value="7" description="523 Taiq" uuid="ea613e56-5269-11df-aa4b-080069138b88" uid="17876"/>
+        <specific value="8" description="525 Oqbah" uuid="ea6247c4-5269-11df-9d82-080069138b88" uid="17877"/>
+        <specific value="9" description="527 Abu Abaidah" uuid="ea635ac4-5269-11df-afb5-080069138b88" uid="17878"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure/Ship Craft" uuid="ea65a90a-5269-11df-8fb7-080069138b88" uid="17879">
+      <subcategory value="1" description="Sandown Class (minehunters-coastal)" uuid="ea66bb56-5269-11df-8b37-080069138b88" uid="17880">
+        <specific value="1" description="420 Al Jawf" uuid="ea67ccbc-5269-11df-837f-080069138b88" uid="17881"/>
+        <specific value="2" description="422 Shaqra" uuid="ea68dbfc-5269-11df-8677-080069138b88" uid="17882"/>
+        <specific value="3" description="424 Al Kharj" uuid="ea69f050-5269-11df-9232-080069138b88" uid="17883"/>
+      </subcategory>
+      <subcategory value="2" description="MSC 322 Class (minesweeper/hunter-coastal)" uuid="ea6ba62a-5269-11df-b554-080069138b88" uid="17884">
+        <specific value="1" description="MSC 412 Addriyah" uuid="ea6cb7fe-5269-11df-abe0-080069138b88" uid="17885"/>
+        <specific value="2" description="MSC 414 Al Quysumah" uuid="ea6dc7fc-5269-11df-888b-080069138b88" uid="17886"/>
+        <specific value="3" description="MSC 416 Al Wadeeah" uuid="ea6ed548-5269-11df-9086-080069138b88" uid="17887"/>
+        <specific value="4" description="MSC 418 Safwa" uuid="ea6fe474-5269-11df-b101-080069138b88" uid="17888"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="ea723666-5269-11df-9c3a-080069138b88" uid="17889">
+      <subcategory value="1" description="Mod Durance Class (replenishment ship)" uuid="ea73460a-5269-11df-9fbc-080069138b88" uid="17890">
+        <specific value="1" description="902 Boraida" uuid="ea745aa4-5269-11df-a432-080069138b88" uid="17891"/>
+        <specific value="2" description="904 Yunbou" uuid="ea7569b2-5269-11df-b173-080069138b88" uid="17892"/>
+      </subcategory>
+      <subcategory value="2" description="LCM 6 Class" uuid="ea77188e-5269-11df-bbfe-080069138b88" uid="17893">
+        <specific value="1" description="220 Dheba" uuid="ea7826ac-5269-11df-9039-080069138b88" uid="17894"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="ea7a79f2-5269-11df-a7e2-080069138b88" uid="17895">
+      <subcategory value="1" description="Container class" uuid="ea7b822a-5269-11df-8a1b-080069138b88" uid="17896">
+        <specific value="1" description="Admai" uuid="ea7c9480-5269-11df-b853-080069138b88" uid="17897"/>
+        <specific value="2" description="Abu Mariam" uuid="ea7da38e-5269-11df-9dc3-080069138b88" uid="17898"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker class" uuid="ea7f51f2-5269-11df-8689-080069138b88" uid="17899">
+        <specific value="1" description="Nur Al Jubail" uuid="ea805f5c-5269-11df-a3b4-080069138b88" uid="17900"/>
+        <specific value="2" description="Al Saudia" uuid="ea816e92-5269-11df-8908-080069138b88" uid="17901"/>
+        <specific value="3" description="Al Widadia" uuid="ea827e5e-5269-11df-add7-080069138b88" uid="17902"/>
+        <specific value="4" description="Al-Zait Al-Araby 5" uuid="ea838952-5269-11df-ac80-080069138b88" uid="17903"/>
+        <specific value="5" description="Adel" uuid="ea84975c-5269-11df-b2c9-080069138b88" uid="17904"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="121" uuid="ea878c14-5269-11df-ae48-080069138b88" uid="17905">
+    <category value="40" description="Trainer" uuid="ea88a612-5269-11df-8484-080069138b88" uid="17906">
+      <subcategory value="1" description="Short Brothers :LC T.MK 52 Toucan" uuid="ea89b0c0-5269-11df-8553-080069138b88" uid="17907">
+        <specific value="1" description="T.MK 52" uuid="ea8ac10e-5269-11df-8173-080069138b88" uid="17908"/>
+      </subcategory>
+      <subcategory value="2" description="Empresa Brasileria de Aeronautica SA EMB-312 Toucan" uuid="ea8c7166-5269-11df-b61c-080069138b88" uid="17909">
+        <specific value="1" description="EMB-S312" uuid="ea8d8772-5269-11df-89bc-080069138b88" uid="17910"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="121" uuid="ea907400-5269-11df-844b-080069138b88" uid="17911">
+    <category value="7" description="Light/Patrol Craft" uuid="ea91808e-5269-11df-975d-080069138b88" uid="17912">
+      <subcategory value="1" description="OPV 310 Class (large patrol craft)" uuid="ea929014-5269-11df-a965-080069138b88" uid="17913">
+        <specific value="1" description="P301 Inttisar" uuid="ea93a184-5269-11df-a677-080069138b88" uid="17914"/>
+        <specific value="2" description="P302 Aman" uuid="ea94aed0-5269-11df-bc92-080069138b88" uid="17915"/>
+        <specific value="3" description="P303 Maimom" uuid="ea95bd8e-5269-11df-8f35-080069138b88" uid="17916"/>
+        <specific value="4" description="P304 Mobark" uuid="ea96cd32-5269-11df-af7c-080069138b88" uid="17917"/>
+      </subcategory>
+      <subcategory value="2" description="TNC 45 Type (fast attack craft-missile)" uuid="ea987ff6-5269-11df-b10b-080069138b88" uid="17918">
+        <specific value="1" description="P3404 Al Sanbouk" uuid="ea998b9e-5269-11df-a2e9-080069138b88" uid="17919"/>
+      </subcategory>
+      <subcategory value="3" description="Simmoneau Standard 12 Class (inshore patrol craft)" uuid="ea9b3ce6-5269-11df-bb4d-080069138b88" uid="17920"/>
+      <subcategory value="4" description="FPB 57 Type (fast attack craft-missile)" uuid="ea9c532e-5269-11df-85d7-080069138b88" uid="17921">
+        <specific value="1" description="P5702 Istiqlal" uuid="ea9d64c6-5269-11df-8435-080069138b88" uid="17922"/>
+      </subcategory>
+      <subcategory value="5" description="Cougar Type (inshore patrol craft)" uuid="ea9f14ba-5269-11df-8eef-080069138b88" uid="17923"/>
+      <subcategory value="6" description="Al-Shaali Type (inshore patrol craft)" uuid="eaa023b4-5269-11df-a98f-080069138b88" uid="17924"/>
+      <subcategory value="7" description="UM Almaradim Class (PCFG)" uuid="eaa13600-5269-11df-bbad-080069138b88" uid="17925">
+        <specific value="1" description="P3711 Um Almaradim" uuid="eaa24748-5269-11df-a207-080069138b88" uid="17926"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="eaa49926-5269-11df-93b6-080069138b88" uid="17927">
+      <subcategory value="1" description="AL Tahaddy Class (LCM/AKL)" uuid="eaa5a76c-5269-11df-8704-080069138b88" uid="17928">
+        <specific value="1" description="L401 AL Soumood" uuid="eaa6b27e-5269-11df-ba6c-080069138b88" uid="17929"/>
+      </subcategory>
+      <subcategory value="2" description="Support Ship (AG)" uuid="eaa87c4e-5269-11df-a401-080069138b88" uid="17930">
+        <specific value="1" description="S5509 Qaruh" uuid="eaa98e9a-5269-11df-9949-080069138b88" uid="17931"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="eaabde7a-5269-11df-8162-080069138b88" uid="17932">
+      <subcategory value="1" description="Container class" uuid="eaacecf2-5269-11df-8f74-080069138b88" uid="17933">
+        <specific value="1" description="Na Hai Fa Xian" uuid="eaae01d2-5269-11df-99eb-080069138b88" uid="17934"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker class" uuid="eaafb14e-5269-11df-aca2-080069138b88" uid="17935">
+        <specific value="1" description="Gas Al Mutlaa" uuid="eab0c142-5269-11df-ba5e-080069138b88" uid="17936"/>
+        <specific value="2" description="Al Shuhadaa" uuid="eab1caec-5269-11df-97a2-080069138b88" uid="17937"/>
+        <specific value="3" description="Al Shegaya" uuid="eab2ddce-5269-11df-8c01-080069138b88" uid="17938">
+          <extra value="4" description="Al Awdah" uuid="eab3ebd8-5269-11df-9803-080069138b88" uid="17939"/>
+        </specific>
+        <specific value="5" description="Al Bida" uuid="eab59a50-5269-11df-8f23-080069138b88" uid="17940"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="164" uuid="eab88c9c-5269-11df-a762-080069138b88" uid="17941">
+    <category value="7" description="Light/Patrol Craft" uuid="eab99b3c-5269-11df-b971-080069138b88" uid="17942">
+      <subcategory value="1" description="Patrol Ship" uuid="eabaac48-5269-11df-8157-080069138b88" uid="17943">
+        <specific value="1" description="A1 AL Mabrukak" uuid="eabbbfe8-5269-11df-9189-080069138b88" uid="17944"/>
+      </subcategory>
+      <subcategory value="2" description="AL Waafi (Brooke Marine) Class (fast attack craft-gun)" uuid="eabd6dc0-5269-11df-88fe-080069138b88" uid="17945">
+        <specific value="1" description="B4 AL Waafi" uuid="eabe7de6-5269-11df-8d23-080069138b88" uid="17946"/>
+        <specific value="2" description="B5 AL Fulk" uuid="eabf8d76-5269-11df-b867-080069138b88" uid="17947"/>
+        <specific value="3" description="B6 AL Mujahid" uuid="eac09cb6-5269-11df-8d2b-080069138b88" uid="17948"/>
+        <specific value="4" description="B7 AL Jabbar" uuid="eac1a70a-5269-11df-970b-080069138b88" uid="17949"/>
+      </subcategory>
+      <subcategory value="3" description="Seeb (Vosper 25) Class (inshore patrol craft)" uuid="eac35910-5269-11df-955a-080069138b88" uid="17950">
+        <specific value="1" description="B20 Seeb" uuid="eac46b3e-5269-11df-bfb0-080069138b88" uid="17951"/>
+        <specific value="2" description="B21 Shinas" uuid="eac585fa-5269-11df-a625-080069138b88" uid="17952"/>
+        <specific value="3" description="B22 Sadh" uuid="eac68fd6-5269-11df-b74f-080069138b88" uid="17953"/>
+        <specific value="4" description="B23 Khassab" uuid="eac7a07e-5269-11df-8d70-080069138b88" uid="17954"/>
+      </subcategory>
+      <subcategory value="4" description="Dhofar (Province) Class (fast attack craft-missile)" uuid="eac957f2-5269-11df-a2d9-080069138b88" uid="17955">
+        <specific value="1" description="B10 Dhofar" uuid="eaca68cc-5269-11df-abc6-080069138b88" uid="17956"/>
+        <specific value="2" description="B11 AL Sharqiyah" uuid="eacb7140-5269-11df-9cb2-080069138b88" uid="17957"/>
+        <specific value="3" description="B12 AL Bat'nah" uuid="eacc821a-5269-11df-93be-080069138b88" uid="17958"/>
+        <specific value="4" description="B14 Mussandam" uuid="eacd951a-5269-11df-a5dd-080069138b88" uid="17959"/>
+      </subcategory>
+      <subcategory value="5" description="Tyler-Vortex Type (inshore patrol craft)" uuid="eacf4496-5269-11df-a050-080069138b88" uid="17960">
+        <specific value="1" description="Q2" uuid="ead04fa8-5269-11df-9860-080069138b88" uid="17961"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="ead2a4d8-5269-11df-979a-080069138b88" uid="17962">
+      <subcategory value="1" description="LCM" uuid="ead3af2c-5269-11df-aa2f-080069138b88" uid="17963">
+        <specific value="1" description="C8 Saba AL Bahr" uuid="ead4c20e-5269-11df-9b5f-080069138b88" uid="17964"/>
+        <specific value="2" description="C9 AL Doghas" uuid="ead5d1da-5269-11df-92e3-080069138b88" uid="17965"/>
+        <specific value="3" description="C10 AL Temsah" uuid="ead6db98-5269-11df-a6a3-080069138b88" uid="17966"/>
+      </subcategory>
+      <subcategory value="2" description="LCU" uuid="ead88e70-5269-11df-b9f2-080069138b88" uid="17967">
+        <specific value="1" description="C7 AL Neemran" uuid="ead99d2e-5269-11df-a816-080069138b88" uid="17968"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate (including Corvettes)" uuid="eadbeef8-5269-11df-a5be-080069138b88" uid="17969">
+      <subcategory value="1" description="Qahir Class (FSG)" uuid="eadcff0a-5269-11df-af56-080069138b88" uid="17970">
+        <specific value="1" description="Q-31 Qahir Al Amwaj" uuid="eade0e54-5269-11df-8cb2-080069138b88" uid="17971"/>
+      </subcategory>
+    </category>
+    <category value="55" description="Amphibious Cargo Ship" uuid="eae05f56-5269-11df-b7cc-080069138b88" uid="17972">
+      <subcategory value="1" description="Landing Ship-Logistic" uuid="eae16d56-5269-11df-9fd5-080069138b88" uid="17973">
+        <specific value="1" description="L2 Nasar AL Bahr" uuid="eae28146-5269-11df-8483-080069138b88" uid="17974"/>
+      </subcategory>
+    </category>
+    <category value="58" description="Combat Stores Ship" uuid="eae4d8ba-5269-11df-bc62-080069138b88" uid="17975">
+      <subcategory value="1" description="Supply Ship" uuid="eae5ed72-5269-11df-a9f3-080069138b88" uid="17976">
+        <specific value="1" description="A2 AL Sultana" uuid="eae70176-5269-11df-b3bb-080069138b88" uid="17977"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="123" uuid="eae9f066-5269-11df-b96b-080069138b88" uid="17978">
+    <category value="7" description="Light/Patrol Craft" uuid="eaeafe7a-5269-11df-b74f-080069138b88" uid="17979">
+      <subcategory value="1" description="Tracker Mk2 (coastal patrol craft)" uuid="eaec0f90-5269-11df-b43d-080069138b88" uid="17980"/>
+      <subcategory value="2" description="Aztec Class (coastal patrol craft)" uuid="eaed2204-5269-11df-9d20-080069138b88" uid="17981"/>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="eaeed234-5269-11df-9845-080069138b88" uid="17982">
+      <subcategory value="1" description="Container class" uuid="eaefe03e-5269-11df-be8d-080069138b88" uid="17983">
+        <specific value="1" description="Perla" uuid="eaf0f0a0-5269-11df-83cb-080069138b88" uid="17984"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="102" uuid="eaf3e206-5269-11df-af83-080069138b88" uid="17985">
+    <category value="2" description="Armored Fighting Vehicle" uuid="eaf4f2c2-5269-11df-8caf-080069138b88" uid="17986">
+      <subcategory value="1" description="EE-3 JARARACA" uuid="eaf5fcf8-5269-11df-85e4-080069138b88" uid="17987"/>
+      <subcategory value="2" description="EE-9 CASCAVELEE - 11URUTRU" uuid="eaf70d78-5269-11df-b10f-080069138b88" uid="17988"/>
+      <subcategory value="3" description="EE-11 URUTRU" uuid="eaf82136-5269-11df-82a7-080069138b88" uid="17989"/>
+    </category>
+    <category value="4" description="Self-propelled Artillery" uuid="eaf9d120-5269-11df-a975-080069138b88" uid="17990">
+      <subcategory value="1" description="127 mm ASTROS II" uuid="eafae07e-5269-11df-ab10-080069138b88" uid="17991"/>
+      <subcategory value="2" description="262 mm ABABEEL" uuid="eafbf1a8-5269-11df-855c-080069138b88" uid="17992"/>
+      <subcategory value="3" description="160 mm mortar" uuid="eafd026e-5269-11df-9e77-080069138b88" uid="17993"/>
+      <subcategory value="4" description="FAW 70 launcher" uuid="eafe0c72-5269-11df-a6f6-080069138b88" uid="17994"/>
+      <subcategory value="5" description="FAW 150 launcher" uuid="eaff1d56-5269-11df-a4dd-080069138b88" uid="17995"/>
+      <subcategory value="6" description="FAW 200 launcher" uuid="eb00313c-5269-11df-b1dd-080069138b88" uid="17996"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="102" uuid="eb027e2e-5269-11df-9123-080069138b88" uid="17997">
+    <category value="1" description="Fighter/Air Defense" uuid="eb03980e-5269-11df-a3ce-080069138b88" uid="17998"/>
+    <category value="8" description="Surveillance/C2 (Airborne Early Warning)" uuid="eb04a29e-5269-11df-94c4-080069138b88" uid="17999">
+      <subcategory value="1" description="Iraqui Air Force Adnan 1" uuid="eb05b58a-5269-11df-9af8-080069138b88" uid="18000">
+        <specific value="1" description="Adnan I" uuid="eb06c6dc-5269-11df-9062-080069138b88" uid="18001"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="102" uuid="eb09b612-5269-11df-9f40-080069138b88" uid="18002">
+    <category value="6" description="Guided Missile Frigate" uuid="eb0ac53e-5269-11df-a29a-080069138b88" uid="18003">
+      <subcategory value="1" description="Assad Class" uuid="eb0bd5e6-5269-11df-a7f3-080069138b88" uid="18004">
+        <specific value="1" description="F210 Mussa Ben Nussair" uuid="eb0ce62a-5269-11df-b9d3-080069138b88" uid="18005"/>
+        <specific value="2" description="F212 Tariq lbn Ziad" uuid="eb0df09c-5269-11df-906e-080069138b88" uid="18006"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="eb10477a-5269-11df-85c0-080069138b88" uid="18007">
+      <subcategory value="1" description="Bogomol Class (large patrol craft)" uuid="eb115124-5269-11df-beee-080069138b88" uid="18008"/>
+      <subcategory value="2" description="PB 90 Class (coastal patrol craft)" uuid="eb126762-5269-11df-a9c0-080069138b88" uid="18009"/>
+      <subcategory value="3" description="Sawari Class (inshore patrol boat)" uuid="eb137800-5269-11df-b2c6-080069138b88" uid="18010"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="eb152b3c-5269-11df-8a60-080069138b88" uid="18011">
+      <subcategory value="1" description="Nestin Class (minesweeper-inshore)" uuid="eb16378e-5269-11df-9e10-080069138b88" uid="18012"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="eb17ea98-5269-11df-ae2e-080069138b88" uid="18013">
+      <subcategory value="1" description="Transport Ship" uuid="eb18f8e8-5269-11df-8f1e-080069138b88" uid="18014">
+        <specific value="1" description="426 Al Zahraa" uuid="eb1a09f4-5269-11df-bd7d-080069138b88" uid="18015"/>
+        <specific value="2" description="428 Khawla" uuid="eb1b1556-5269-11df-9ba4-080069138b88" uid="18016"/>
+        <specific value="3" description="429 Balqees" uuid="eb1c2a4a-5269-11df-8bcd-080069138b88" uid="18017"/>
+      </subcategory>
+      <subcategory value="2" description="Spasilac Class (salvage ship)" uuid="eb1dd872-5269-11df-91ba-080069138b88" uid="18018">
+        <specific value="1" description="A81 Aka" uuid="eb1ee8c0-5269-11df-8542-080069138b88" uid="18019"/>
+      </subcategory>
+      <subcategory value="3" description="Diving Tender" uuid="eb209b02-5269-11df-9a3b-080069138b88" uid="18020"/>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="eb22528a-5269-11df-9249-080069138b88" uid="18021">
+      <subcategory value="1" description="Yugoslav Type" uuid="eb235fb8-5269-11df-8d08-080069138b88" uid="18022">
+        <specific value="1" description="507 lbn Marjid" uuid="eb24701a-5269-11df-a9ad-080069138b88" uid="18023"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-combatant Ship" uuid="eb26c482-5269-11df-94b4-080069138b88" uid="18024">
+      <subcategory value="1" description="Container Class" uuid="eb27d52a-5269-11df-a6c2-080069138b88" uid="18025"/>
+      <subcategory value="2" description="Tanker Class" uuid="eb28f0a4-5269-11df-b8ab-080069138b88" uid="18026">
+        <specific value="1" description="Al Thirthar" uuid="eb29ff30-5269-11df-a42d-080069138b88" uid="18027"/>
+        <specific value="2" description="1 Athar" uuid="eb2b0c04-5269-11df-bd3b-080069138b88" uid="18028"/>
+        <specific value="3" description="1 Hurizan" uuid="eb2c1b44-5269-11df-837e-080069138b88" uid="18029"/>
+        <specific value="4" description="7 Nissan" uuid="eb2d2a98-5269-11df-a5b6-080069138b88" uid="18030"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="101" uuid="eb3015a0-5269-11df-be9e-080069138b88" uid="18031">
+    <category value="4" description="Self-propelled Artillery" uuid="eb312440-5269-11df-b028-080069138b88" uid="18032">
+      <subcategory value="1" description="320 mm OGHAB Multiple Rocket Launcher" uuid="eb3235f6-5269-11df-b8e3-080069138b88" uid="18033"/>
+      <subcategory value="2" description="330 mm SHAHIN Multiple Rocket Launcher" uuid="eb334bd0-5269-11df-a5ba-080069138b88" uid="18034"/>
+      <subcategory value="3" description="330 mm NAZEAT" uuid="eb345598-5269-11df-bb69-080069138b88" uid="18035"/>
+      <subcategory value="4" description="Shahab TEL" uuid="eb35658c-5269-11df-8651-080069138b88" uid="18036"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="101" uuid="eb37b800-5269-11df-89c1-080069138b88" uid="18037">
+    <category value="5" description="Destroyer (DD)" uuid="eb38c63c-5269-11df-8814-080069138b88" uid="18038">
+      <subcategory value="1" description="Damavand" uuid="eb39d5c2-5269-11df-a27f-080069138b88" uid="18039"/>
+      <subcategory value="2" description="Babr" uuid="eb3aea5c-5269-11df-b132-080069138b88" uid="18040"/>
+    </category>
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="eb3c978a-5269-11df-8ed7-080069138b88" uid="18041">
+      <subcategory value="1" description="Avland (vosper Mk 5) Class" uuid="eb3da2b0-5269-11df-8f6f-080069138b88" uid="18042">
+        <specific value="1" description="71 Alvand" uuid="eb3eb2a4-5269-11df-8f64-080069138b88" uid="18043"/>
+        <specific value="2" description="72 Alborz" uuid="eb3fc644-5269-11df-86cf-080069138b88" uid="18044"/>
+        <specific value="3" description="73 Sabalan" uuid="eb40d764-5269-11df-936a-080069138b88" uid="18045"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="eb432ba4-5269-11df-9dd3-080069138b88" uid="18046">
+      <subcategory value="1" description="Kaman (Combattante II) Class" uuid="eb443a30-5269-11df-a50a-080069138b88" uid="18047">
+        <specific value="1" description="P221 Kaman" uuid="eb454b28-5269-11df-90f2-080069138b88" uid="18048"/>
+        <specific value="2" description="P222 Zoubin" uuid="eb465c0c-5269-11df-a4e2-080069138b88" uid="18049"/>
+        <specific value="3" description="P223 Khadang" uuid="eb47671e-5269-11df-a8e1-080069138b88" uid="18050"/>
+        <specific value="4" description="P226 Falakhon" uuid="eb4875aa-5269-11df-a5d7-080069138b88" uid="18051"/>
+        <specific value="5" description="P227 Shamshir" uuid="eb498990-5269-11df-9094-080069138b88" uid="18052"/>
+        <specific value="6" description="P228 Gorz" uuid="eb4a9308-5269-11df-99cc-080069138b88" uid="18053"/>
+        <specific value="7" description="P229 Gardouneh" uuid="eb4ba112-5269-11df-b56e-080069138b88" uid="18054"/>
+        <specific value="8" description="P230 Khanjar" uuid="eb4cb264-5269-11df-9f6b-080069138b88" uid="18055"/>
+        <specific value="9" description="P231 Neyzeh" uuid="eb4dbf92-5269-11df-8f0f-080069138b88" uid="18056"/>
+        <specific value="10" description="P232 Tabarzin" uuid="eb4ece96-5269-11df-8556-080069138b88" uid="18057"/>
+      </subcategory>
+      <subcategory value="2" description="Parvin (PGM-71) Class (large patrol craft)" uuid="eb507d86-5269-11df-8f43-080069138b88" uid="18058">
+        <specific value="1" description="211 Parvin" uuid="eb5191c6-5269-11df-a40e-080069138b88" uid="18059"/>
+        <specific value="2" description="212 Bahram" uuid="eb529b8e-5269-11df-90d7-080069138b88" uid="18060"/>
+        <specific value="3" description="213 Nahid" uuid="eb53aac4-5269-11df-9847-080069138b88" uid="18061"/>
+      </subcategory>
+      <subcategory value="3" description="MK II Class (Coastal patrol craft)" uuid="eb555af4-5269-11df-b786-080069138b88" uid="18062"/>
+      <subcategory value="4" description="MIG-S-1800 Class (coastal patrol craft)" uuid="eb567038-5269-11df-8b2d-080069138b88" uid="18063"/>
+      <subcategory value="5" description="MK III Class (coastal patrol craft)" uuid="eb577db6-5269-11df-9c79-080069138b88" uid="18064"/>
+      <subcategory value="6" description="MIG-G-1900 Class (coastal patrol craft)" uuid="eb588fee-5269-11df-90f9-080069138b88" uid="18065"/>
+      <subcategory value="7" description="PBI Type (coastal patrol craft)" uuid="eb59a12c-5269-11df-b7cb-080069138b88" uid="18066"/>
+      <subcategory value="8" description="Enforcer Type (inshore patrol craft)" uuid="eb5ab0ee-5269-11df-9537-080069138b88" uid="18067"/>
+      <subcategory value="9" description="Stewart Type (inshore patrol craft)" uuid="eb5bc3a8-5269-11df-970a-080069138b88" uid="18068">
+        <specific value="1" description="Mahnavi-Hamraz" uuid="eb5cd4f0-5269-11df-aabc-080069138b88" uid="18069"/>
+        <specific value="2" description="Mahnavi-Vahedi" uuid="eb5de1c4-5269-11df-84d2-080069138b88" uid="18070"/>
+        <specific value="3" description="Mahnavi-Taheri" uuid="eb5efa14-5269-11df-9cda-080069138b88" uid="18071"/>
+      </subcategory>
+      <subcategory value="10" description="Boghammar Craft" uuid="eb60aa08-5269-11df-9958-080069138b88" uid="18072"/>
+      <subcategory value="11" description="Boston Whaler Craft (Type I)" uuid="eb61bcd6-5269-11df-9a59-080069138b88" uid="18073"/>
+      <subcategory value="12" description="HUDONG Class" uuid="eb62c7f2-5269-11df-b285-080069138b88" uid="18074">
+        <specific value="1" description="P3131" uuid="eb63d700-5269-11df-806a-080069138b88" uid="18075"/>
+        <specific value="2" description="P3132" uuid="eb64eb86-5269-11df-b1a6-080069138b88" uid="18076"/>
+        <specific value="3" description="P3133" uuid="eb65f40e-5269-11df-b874-080069138b88" uid="18077"/>
+        <specific value="4" description="P3134" uuid="eb67010a-5269-11df-8808-080069138b88" uid="18078"/>
+        <specific value="5" description="P3135" uuid="eb6813b0-5269-11df-8f2b-080069138b88" uid="18079"/>
+        <specific value="6" description="P3136" uuid="eb69203e-5269-11df-9620-080069138b88" uid="18080"/>
+        <specific value="7" description="P3137" uuid="eb6a2dda-5269-11df-ac7b-080069138b88" uid="18081"/>
+        <specific value="8" description="P3138" uuid="eb6b3c52-5269-11df-a403-080069138b88" uid="18082"/>
+        <specific value="9" description="P3139" uuid="eb6c46ce-5269-11df-9398-080069138b88" uid="18083"/>
+        <specific value="10" description="P3140" uuid="eb6d596a-5269-11df-857a-080069138b88" uid="18084"/>
+      </subcategory>
+      <subcategory value="13" description="TAEDONG" uuid="eb6f05d0-5269-11df-b7a1-080069138b88" uid="18085"/>
+      <subcategory value="14" description="TIR" uuid="eb701538-5269-11df-9fd2-080069138b88" uid="18086"/>
+      <subcategory value="15" description="PEYKAAP WPT" uuid="eb712374-5269-11df-83d0-080069138b88" uid="18087"/>
+      <subcategory value="16" description="BANDAR-A Corvette (FFL)" uuid="eb723354-5269-11df-9c3a-080069138b88" uid="18088"/>
+      <subcategory value="17" description="KASHDOM WPBG" uuid="eb734370-5269-11df-a82d-080069138b88" uid="18089"/>
+      <subcategory value="18" description="MIG-S-2600 Class" uuid="eb7452c4-5269-11df-be0a-080069138b88" uid="18090"/>
+      <subcategory value="19" description="CHINA CAT Class" uuid="eb7565ce-5269-11df-a4dc-080069138b88" uid="18091"/>
+      <subcategory value="20" description="ASHOORA I PBR" uuid="eb767644-5269-11df-a2e5-080069138b88" uid="18092"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="eb78257a-5269-11df-bc85-080069138b88" uid="18093">
+      <subcategory value="1" description="Cape Class (minesweeper-inshore)" uuid="eb79346a-5269-11df-98ae-080069138b88" uid="18094">
+        <specific value="1" description="311 Harischi" uuid="eb7a45e4-5269-11df-83ba-080069138b88" uid="18095"/>
+        <specific value="2" description="312 Raizi" uuid="eb7b55ba-5269-11df-9bc5-080069138b88" uid="18096"/>
+      </subcategory>
+      <subcategory value="2" description="MSC 268/292 Class" uuid="eb7d052c-5269-11df-9241-080069138b88" uid="18097"/>
+    </category>
+    <category value="10" description="Tank Landing Ship" uuid="eb7ebff2-5269-11df-a97c-080069138b88" uid="18098">
+      <subcategory value="1" description="Iran Air Class (LST)" uuid="eb7fca32-5269-11df-90b1-080069138b88" uid="18099">
+        <specific value="1" description="Iran Asir" uuid="eb80da26-5269-11df-8983-080069138b88" uid="18100"/>
+        <specific value="2" description="Iran Ghaydr" uuid="eb81ece0-5269-11df-a524-080069138b88" uid="18101"/>
+      </subcategory>
+      <subcategory value="2" description="Iran Hormuz 24 Class (LST)" uuid="eb839b94-5269-11df-8a2c-080069138b88" uid="18102">
+        <specific value="1" description="24-26" uuid="eb84a804-5269-11df-b719-080069138b88" uid="18103"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="eb86fd5c-5269-11df-90dd-080069138b88" uid="18104">
+      <subcategory value="1" description="Rotork Craft (LCU)" uuid="eb88056c-5269-11df-a9d5-080069138b88" uid="18105"/>
+      <subcategory value="2" description="MIG-S-3700 Class (LCT)" uuid="eb891876-5269-11df-bd01-080069138b88" uid="18106"/>
+      <subcategory value="3" description="Iran Hormuz 21 Class (LCT)" uuid="eb8a2a54-5269-11df-8c7b-080069138b88" uid="18107">
+        <specific value="1" description="21-23" uuid="eb8b35fc-5269-11df-b0e7-080069138b88" uid="18108"/>
+      </subcategory>
+    </category>
+    <category value="15" description="Air Cushion/Surface Effect" uuid="eb8d89ce-5269-11df-b9cc-080069138b88" uid="18109">
+      <subcategory value="1" description="Winchester (SR. N6) Class (hovercraft)" uuid="eb8e95c6-5269-11df-819e-080069138b88" uid="18110">
+        <specific value="1" description="01-08" uuid="eb8fa97a-5269-11df-b668-080069138b88" uid="18111"/>
+      </subcategory>
+      <subcategory value="2" description="Wellington (BH.7) Class (hovercraft)" uuid="eb9158d8-5269-11df-bc85-080069138b88" uid="18112">
+        <specific value="1" description="101-106" uuid="eb92684a-5269-11df-8a3e-080069138b88" uid="18113"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="eb94b9f6-5269-11df-8656-080069138b88" uid="18114">
+      <subcategory value="1" description="Replenishment Ship" uuid="eb95c922-5269-11df-a6e8-080069138b88" uid="18115">
+        <specific value="1" description="431 Kharg" uuid="eb96d6be-5269-11df-a5fb-080069138b88" uid="18116"/>
+      </subcategory>
+      <subcategory value="2" description="Hendijan Class (AG) (tenders)" uuid="eb9884dc-5269-11df-97df-080069138b88" uid="18117">
+        <specific value="1" description="Hendijan" uuid="eb9995a2-5269-11df-a9d6-080069138b88" uid="18118"/>
+        <specific value="2" description="Konarak" uuid="eb9aa712-5269-11df-91a6-080069138b88" uid="18119"/>
+        <specific value="3" description="Sirik" uuid="eb9bb15c-5269-11df-a5ca-080069138b88" uid="18120"/>
+        <specific value="4" description="Geno" uuid="eb9cc74a-5269-11df-8758-080069138b88" uid="18121"/>
+        <specific value="5" description="Kalat" uuid="eb9dd7f2-5269-11df-8328-080069138b88" uid="18122"/>
+        <specific value="6" description="Genaveh" uuid="eb9ee444-5269-11df-a0f3-080069138b88" uid="18123"/>
+        <specific value="7" description="Savatar" uuid="eb9ff3c0-5269-11df-a417-080069138b88" uid="18124"/>
+        <specific value="8" description="Mogam" uuid="eba101e8-5269-11df-a280-080069138b88" uid="18125"/>
+        <specific value="9" description="Rostani" uuid="eba20b60-5269-11df-bc44-080069138b88" uid="18126"/>
+        <specific value="10" description="Mayband" uuid="eba31d8e-5269-11df-a4cc-080069138b88" uid="18127"/>
+        <specific value="11" description="Maqam" uuid="eba42dc8-5269-11df-bbd3-080069138b88" uid="18128"/>
+        <specific value="12" description="Koramshahr" uuid="eba53858-5269-11df-acbc-080069138b88" uid="18129"/>
+        <specific value="13" description="Bamregan" uuid="eba64a0e-5269-11df-845a-080069138b88" uid="18130"/>
+      </subcategory>
+      <subcategory value="3" description="Kangan Class (water tanker)" uuid="eba7fa2a-5269-11df-9f5c-080069138b88" uid="18131">
+        <specific value="1" description="411 Kangan" uuid="eba90a50-5269-11df-9c33-080069138b88" uid="18132"/>
+        <specific value="2" description="412 Teheri" uuid="ebaa17f6-5269-11df-b5ae-080069138b88" uid="18133"/>
+        <specific value="3" description="xxx Shahid Marjani" uuid="ebab2718-5269-11df-b9cd-080069138b88" uid="18134"/>
+        <specific value="4" description="xxx Amir" uuid="ebac3702-5269-11df-bd27-080069138b88" uid="18135"/>
+      </subcategory>
+      <subcategory value="4" description="Delvar Class (support ship)" uuid="ebade8ea-5269-11df-a421-080069138b88" uid="18136">
+        <specific value="1" description="Chark (AK) (cargo)" uuid="ebaef3ca-5269-11df-b166-080069138b88" uid="18137"/>
+        <specific value="2" description="Chiroo (AK) (cargo)" uuid="ebb00486-5269-11df-ab33-080069138b88" uid="18138"/>
+        <specific value="3" description="Souru (AK) (cargo)" uuid="ebb114f2-5269-11df-bc17-080069138b88" uid="18139"/>
+        <specific value="4" description="Dilim (AW) (water)" uuid="ebb220f4-5269-11df-850f-080069138b88" uid="18140"/>
+        <specific value="5" description="Dayer (AW) (water)" uuid="ebb335d4-5269-11df-9feb-080069138b88" uid="18141"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="ebb58500-5269-11df-9602-080069138b88" uid="18142">
+      <subcategory value="1" description="Bayandor Class" uuid="ebb6990e-5269-11df-a959-080069138b88" uid="18143"/>
+    </category>
+    <category value="55" description="Amphibious Cargo Ship" uuid="ebb847ae-5269-11df-953b-080069138b88" uid="18144">
+      <subcategory value="1" description="Hengam Class (LSL)" uuid="ebb95798-5269-11df-990a-080069138b88" uid="18145">
+        <specific value="1" description="511 Hengam" uuid="ebba731c-5269-11df-8ae5-080069138b88" uid="18146"/>
+        <specific value="2" description="512 Larak" uuid="ebbb7e60-5269-11df-9bd5-080069138b88" uid="18147"/>
+        <specific value="3" description="513 Tonb" uuid="ebbc8e18-5269-11df-8ac9-080069138b88" uid="18148"/>
+        <specific value="4" description="514 Lavan" uuid="ebbd9e7a-5269-11df-bde3-080069138b88" uid="18149"/>
+      </subcategory>
+    </category>
+    <category value="57" description="Ammunition Ship" uuid="ebbff1fc-5269-11df-bfab-080069138b88" uid="18150">
+      <subcategory value="1" description="Delvar Class (support ship)" uuid="ebc100d8-5269-11df-9d76-080069138b88" uid="18151">
+        <specific value="1" description="Delvar (AE)" uuid="ebc20ab4-5269-11df-b62d-080069138b88" uid="18152"/>
+        <specific value="2" description="Sirjan (AE)" uuid="ebc31f4e-5269-11df-848c-080069138b88" uid="18153"/>
+      </subcategory>
+    </category>
+    <category value="58" description="Combat Stores Ship" uuid="ebc57014-5269-11df-8d5b-080069138b88" uid="18154">
+      <subcategory value="1" description="Fleet Supply Ship" uuid="ebc67efa-5269-11df-9e72-080069138b88" uid="18155">
+        <specific value="1" description="421 Bandar Abbas" uuid="ebc78e94-5269-11df-a25b-080069138b88" uid="18156"/>
+        <specific value="2" description="422 Boushehr" uuid="ebc89f6e-5269-11df-a0c1-080069138b88" uid="18157"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-combatant Ship" uuid="ebcaf17e-5269-11df-9cc2-080069138b88" uid="18158">
+      <subcategory value="1" description="Container Class" uuid="ebcc0136-5269-11df-b61d-080069138b88" uid="18159">
+        <specific value="1" description="ADIR" uuid="ebcd0a9a-5269-11df-b86a-080069138b88" uid="18160"/>
+        <specific value="2" description="IRAN ABOZAR" uuid="ebce1d2c-5269-11df-9131-080069138b88" uid="18161"/>
+        <specific value="3" description="IRAN AKHAVAN" uuid="ebcf2cbc-5269-11df-b947-080069138b88" uid="18162"/>
+        <specific value="4" description="IRAN FALLAHI" uuid="ebd037c4-5269-11df-ab8a-080069138b88" uid="18163"/>
+        <specific value="5" description="IRAN TALEGHANI" uuid="ebd146e6-5269-11df-9222-080069138b88" uid="18164"/>
+        <specific value="6" description="IRAN SHARIATI" uuid="ebd25bc6-5269-11df-bf62-080069138b88" uid="18165"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="101" uuid="ebd54b60-5269-11df-8611-080069138b88" uid="18166">
+    <category value="5" description="SS (Conventional, Attack-Torpedo, Patrol)" uuid="ebd65ad2-5269-11df-8b99-080069138b88" uid="18167">
+      <subcategory value="1" description="901 Tareq" uuid="ebd769cc-5269-11df-b494-080069138b88" uid="18168"/>
+      <subcategory value="2" description="902 Noor" uuid="ebd87ad8-5269-11df-b38e-080069138b88" uid="18169"/>
+    </category>
+    <category value="7" description="SSA (Conventional Auxiliary)" uuid="ebda46ce-5269-11df-aba9-080069138b88" uid="18170">
+      <subcategory value="1" description="Midget Submarine" uuid="ebdb533e-5269-11df-aeae-080069138b88" uid="18171">
+        <specific value="1" description="Semi Submersible TAEDONG-B" uuid="ebdc6328-5269-11df-808f-080069138b88" uid="18172"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="105" uuid="ebdf58b2-5269-11df-9981-080069138b88" uid="18173">
+    <category value="4" description="Self-propelled Artillery" uuid="ebe06752-5269-11df-9e0e-080069138b88" uid="18174">
+      <subcategory value="1" description="Gabriel Mk 1 launcher" uuid="ebe174f8-5269-11df-aa05-080069138b88" uid="18175"/>
+      <subcategory value="2" description="Gabriel Mk 2 launcher" uuid="ebe28910-5269-11df-b055-080069138b88" uid="18176"/>
+      <subcategory value="3" description="Gabriel Mk 3 launcher" uuid="ebe398fa-5269-11df-b780-080069138b88" uid="18177"/>
+      <subcategory value="4" description="Gabriel Mk LR launcher" uuid="ebe4a48e-5269-11df-b45e-080069138b88" uid="18178"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="105" uuid="ebe6fb8a-5269-11df-aa1f-080069138b88" uid="18179">
+    <category value="1" description="Fighter/Air Defense" uuid="ebe80494-5269-11df-b963-080069138b88" uid="18180">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="ebe9165e-5269-11df-aee1-080069138b88" uid="18181"/>
+      <subcategory value="2" description="Israel Aircraft Industries C-7 Kifr" uuid="ebea2846-5269-11df-bc07-080069138b88" uid="18182">
+        <specific value="1" description="C-7" uuid="ebeb33ee-5269-11df-9731-080069138b88" uid="18183"/>
+      </subcategory>
+      <subcategory value="3" description="I A I Lavi" uuid="ebece662-5269-11df-8ada-080069138b88" uid="18184"/>
+    </category>
+    <category value="4" description="Cargo/Tanker" uuid="ebee93c2-5269-11df-83d3-080069138b88" uid="18185">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="ebefa69a-5269-11df-82c3-080069138b88" uid="18186"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="ebf0b800-5269-11df-883a-080069138b88" uid="18187"/>
+      <subcategory value="3" description="Israel Aircraft Industries 707" uuid="ebf1c600-5269-11df-90a0-080069138b88" uid="18188">
+        <specific value="1" description="707-320C" uuid="ebf2d3ce-5269-11df-bdbd-080069138b88" uid="18189"/>
+        <specific value="2" description="ARAVA IAI-202" uuid="ebf3e6a6-5269-11df-a777-080069138b88" uid="18190"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Surveillance/C2 (Airborne Early Warning)" uuid="ebf6350a-5269-11df-a725-080069138b88" uid="18191">
+      <subcategory value="1" description="707" uuid="ebf74828-5269-11df-a3cf-080069138b88" uid="18192"/>
+      <subcategory value="2" description="720" uuid="ebf8592a-5269-11df-aa72-080069138b88" uid="18193"/>
+      <subcategory value="3" description="ARAVA IAI-201" uuid="ebf96a2c-5269-11df-90bf-080069138b88" uid="18194"/>
+    </category>
+    <category value="21" description="Utility Helicopter" uuid="ebfb19da-5269-11df-bc27-080069138b88" uid="18195">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="ebfc2d84-5269-11df-b21b-080069138b88" uid="18196"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="ebfd38d2-5269-11df-9cda-080069138b88" uid="18197"/>
+      <subcategory value="3" description="Bell Helicopter Textron Canada Ltd. Twin Two Twelve" uuid="ebfe4b0a-5269-11df-a2f9-080069138b88" uid="18198"/>
+    </category>
+    <category value="23" description="Cargo Helicopter" uuid="ec0000bc-5269-11df-baa9-080069138b88" uid="18199">
+      <subcategory value="1" description="Israel Aircraft Industries Yasur 2000" uuid="ec0111d2-5269-11df-8b27-080069138b88" uid="18200">
+        <specific value="1" description="Yasur 2000" uuid="ec021e2e-5269-11df-8cb5-080069138b88" uid="18201"/>
+      </subcategory>
+    </category>
+    <category value="40" description="Trainer" uuid="ec0472c8-5269-11df-a77b-080069138b88" uid="18202">
+      <subcategory value="1" description="Israel Aircraft Industries C-7 Kifr" uuid="ec057d62-5269-11df-b2a5-080069138b88" uid="18203">
+        <specific value="1" description="TC-7" uuid="ec06927e-5269-11df-9e68-080069138b88" uid="18204"/>
+      </subcategory>
+    </category>
+    <category value="57" description="Non-Combatant Commercial Aircraft" uuid="ec08de8a-5269-11df-aa24-080069138b88" uid="18205">
+      <subcategory value="1" description="Passenger Airline" uuid="ec09f252-5269-11df-b28f-080069138b88" uid="18206">
+        <specific value="1" description="Israel Aircraft Industries 1125 Astra SP" uuid="ec0b0430-5269-11df-8c3b-080069138b88" uid="18207"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="105" uuid="ec0df9c4-5269-11df-bd5f-080069138b88" uid="18208">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ec0f0a08-5269-11df-9fb6-080069138b88" uid="18209">
+      <subcategory value="1" description="Eilat (Saar 5) Class (Corvette)" uuid="ec1014ca-5269-11df-b723-080069138b88" uid="18210">
+        <specific value="1" description="501 Eilat" uuid="ec112932-5269-11df-90c6-080069138b88" uid="18211"/>
+        <specific value="2" description="503 Hanit" uuid="ec1233cc-5269-11df-9cb5-080069138b88" uid="18212"/>
+        <specific value="3" description="502 Lahav" uuid="ec134370-5269-11df-a1d2-080069138b88" uid="18213"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="ec1597b0-5269-11df-87c6-080069138b88" uid="18214">
+      <subcategory value="1" description="Aliya (Saar 4.5) (fast attack craft-missile)" uuid="ec16aa4c-5269-11df-bb65-080069138b88" uid="18215">
+        <specific value="1" description="Aliya" uuid="ec17bdce-5269-11df-954b-080069138b88" uid="18216"/>
+        <specific value="2" description="Geoula" uuid="ec18d024-5269-11df-8f29-080069138b88" uid="18217"/>
+      </subcategory>
+      <subcategory value="2" description="Hetz (Saar 4.5) (fast attack craft-missile)" uuid="ec1a7d70-5269-11df-ab76-080069138b88" uid="18218">
+        <specific value="1" description="Romat" uuid="ec1b8ae4-5269-11df-a7ac-080069138b88" uid="18219"/>
+        <specific value="2" description="Keshet" uuid="ec1c9d3a-5269-11df-98ed-080069138b88" uid="18220"/>
+        <specific value="3" description="Hetz" uuid="ec1dac34-5269-11df-ab6f-080069138b88" uid="18221"/>
+      </subcategory>
+      <subcategory value="3" description="Mivtach (Saar 2) Class (fast attack craft-missile)" uuid="ec1f59f8-5269-11df-9893-080069138b88" uid="18222">
+        <specific value="1" description="311 Mivtach" uuid="ec206ab4-5269-11df-8be1-080069138b88" uid="18223"/>
+        <specific value="2" description="312 Miznag" uuid="ec217ada-5269-11df-aa1e-080069138b88" uid="18224"/>
+        <specific value="3" description="313 Mifgav" uuid="ec2289a2-5269-11df-8331-080069138b88" uid="18225"/>
+        <specific value="4" description="321 Eilath" uuid="ec2396b2-5269-11df-b9cd-080069138b88" uid="18226"/>
+        <specific value="5" description="322 Haifa" uuid="ec24a62e-5269-11df-ac8e-080069138b88" uid="18227"/>
+        <specific value="6" description="323 Akko" uuid="ec25b5a0-5269-11df-b811-080069138b88" uid="18228"/>
+      </subcategory>
+      <subcategory value="4" description="Reshef (Saar 4) (fast attack craft-missile)" uuid="ec27674c-5269-11df-b0d6-080069138b88" uid="18229">
+        <specific value="1" description="Reshef" uuid="ec28724a-5269-11df-8150-080069138b88" uid="18230"/>
+        <specific value="2" description="Kidon" uuid="ec29831a-5269-11df-a62c-080069138b88" uid="18231"/>
+        <specific value="3" description="Tarshish" uuid="ec2a94b2-5269-11df-9575-080069138b88" uid="18232"/>
+        <specific value="4" description="Yaffo" uuid="ec2b9ccc-5269-11df-8115-080069138b88" uid="18233"/>
+        <specific value="5" description="Nitzhon" uuid="ec2caca2-5269-11df-b3ef-080069138b88" uid="18234"/>
+        <specific value="6" description="Atsmount" uuid="ec2dbcf0-5269-11df-ad21-080069138b88" uid="18235"/>
+        <specific value="7" description="Moledet" uuid="ec2ec9f6-5269-11df-b87c-080069138b88" uid="18236"/>
+        <specific value="8" description="Komemiut" uuid="ec2fd968-5269-11df-8712-080069138b88" uid="18237"/>
+      </subcategory>
+      <subcategory value="5" description="Super Dvora Class (fast attack craft-gun)" uuid="ec318b50-5269-11df-a737-080069138b88" uid="18238">
+        <specific value="1" description="810-821" uuid="ec329ef0-5269-11df-a9d7-080069138b88" uid="18239"/>
+      </subcategory>
+      <subcategory value="6" description="Dabur Class (coastal patrol craft)" uuid="ec344e44-5269-11df-81cd-080069138b88" uid="18240"/>
+      <subcategory value="7" description="Iquique (Saar3)" uuid="ec35613a-5269-11df-9510-080069138b88" uid="18241">
+        <specific value="1" description="Iquique" uuid="ec36761a-5269-11df-bee1-080069138b88" uid="18242"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="ec38c47e-5269-11df-a7a1-080069138b88" uid="18243">
+      <subcategory value="1" description="Ashdod Class (LCT)" uuid="ec39d6de-5269-11df-bc0d-080069138b88" uid="18244">
+        <specific value="1" description="61 Ashdod" uuid="ec3ae56a-5269-11df-8d83-080069138b88" uid="18245"/>
+        <specific value="2" description="63 Ashkelon" uuid="ec3bf464-5269-11df-a1c9-080069138b88" uid="18246"/>
+        <specific value="3" description="65 Achziv" uuid="ec3d0192-5269-11df-9a73-080069138b88" uid="18247"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="105" uuid="ec3ff2e4-5269-11df-8adc-080069138b88" uid="18248">
+    <category value="4" description="SSG (Conventional Guided Missile)" uuid="ec4104cc-5269-11df-811c-080069138b88" uid="18249">
+      <subcategory value="1" description="Gal (Vickers Type 540) Class" uuid="ec4210b0-5269-11df-bc59-080069138b88" uid="18250">
+        <specific value="1" description="Gal" uuid="ec432090-5269-11df-bd95-080069138b88" uid="18251"/>
+        <specific value="2" description="Tanin" uuid="ec4434ee-5269-11df-9719-080069138b88" uid="18252"/>
+        <specific value="3" description="Rahav" uuid="ec453cf4-5269-11df-925c-080069138b88" uid="18253"/>
+      </subcategory>
+    </category>
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="ec479364-5269-11df-abf1-080069138b88" uid="18254">
+      <subcategory value="1" description="Dolphin Type 800" uuid="ec489f34-5269-11df-8702-080069138b88" uid="18255">
+        <specific value="1" description="Dolphin" uuid="ec49af78-5269-11df-b88a-080069138b88" uid="18256"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="114" uuid="ec4ca5ac-5269-11df-9b25-080069138b88" uid="18257">
+    <category value="2" description="Attack/Strike" uuid="ec4db3c0-5269-11df-9619-080069138b88" uid="18258">
+      <subcategory value="1" description="Construcciones Aeronauticas CC-04 Aviojet" uuid="ec4ec0ee-5269-11df-bc9a-080069138b88" uid="18259">
+        <specific value="1" description="CC-04" uuid="ec4fd33a-5269-11df-be01-080069138b88" uid="18260"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="114" uuid="ec52c568-5269-11df-b088-080069138b88" uid="18261">
+    <category value="7" description="Light/Patrol Craft" uuid="ec53d2b4-5269-11df-81af-080069138b88" uid="18262">
+      <subcategory value="1" description="Faysal" uuid="ec54e60e-5269-11df-b2f9-080069138b88" uid="18263">
+        <specific value="1" description="Faysal" uuid="ec55fa30-5269-11df-a175-080069138b88" uid="18264"/>
+        <specific value="2" description="Han" uuid="ec570984-5269-11df-8c61-080069138b88" uid="18265"/>
+        <specific value="3" description="Hasayu" uuid="ec58123e-5269-11df-b08f-080069138b88" uid="18266"/>
+        <specific value="4" description="Muhammed" uuid="ec592610-5269-11df-a65e-080069138b88" uid="18267"/>
+      </subcategory>
+      <subcategory value="2" description="AL Hussein (Hawk) Class (fast attack craft-gun)" uuid="ec5ad528-5269-11df-a53e-080069138b88" uid="18268">
+        <specific value="1" description="101 AL Hussein" uuid="ec5be63e-5269-11df-a6bb-080069138b88" uid="18269"/>
+        <specific value="2" description="102 AL Hussan" uuid="ec5cf27c-5269-11df-8a32-080069138b88" uid="18270"/>
+        <specific value="3" description="103 Abdullah" uuid="ec5e0270-5269-11df-93d0-080069138b88" uid="18271"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="ec6054f8-5269-11df-a004-080069138b88" uid="18272">
+      <subcategory value="1" description="AL Hashim (Rotork) Class (LCU)" uuid="ec6164b0-5269-11df-ac22-080069138b88" uid="18273">
+        <specific value="1" description="AL Hashim" uuid="ec627512-5269-11df-be67-080069138b88" uid="18274"/>
+        <specific value="2" description="AL Faisal" uuid="ec6384ca-5269-11df-972a-080069138b88" uid="18275"/>
+        <specific value="3" description="AL Hamza" uuid="ec649180-5269-11df-b4a2-080069138b88" uid="18276"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="106" uuid="ec67835e-5269-11df-aee7-080069138b88" uid="18277">
+    <category value="1" description="Tank" uuid="ec689082-5269-11df-b66b-080069138b88" uid="18278">
+      <subcategory value="1" description="Light Tank/Recon" uuid="ec699dba-5269-11df-a841-080069138b88" uid="18279">
+        <specific value="1" description="Centauro B-1" uuid="ec6aadd6-5269-11df-baad-080069138b88" uid="18280"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Armored Fighting Vehicle" uuid="ec6cfc6c-5269-11df-b1cf-080069138b88" uid="18281">
+      <subcategory value="1" description="Armored Personnel Carrier (APC)" uuid="ec6e0bac-5269-11df-91c1-080069138b88" uid="18282">
+        <specific value="1" description="VCC 1/2" uuid="ec6f1d76-5269-11df-8047-080069138b88" uid="18283"/>
+        <specific value="2" description="Fiat 6614" uuid="ec7030bc-5269-11df-aa20-080069138b88" uid="18284"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Self Propelled Artillery (guns and howitzers)" uuid="ec729532-5269-11df-8519-080069138b88" uid="18285">
+      <subcategory value="1" description="M-109G" uuid="ec73a7ce-5269-11df-83d6-080069138b88" uid="18286"/>
+      <subcategory value="2" description="M-109L" uuid="ec74bc40-5269-11df-bcbc-080069138b88" uid="18287"/>
+      <subcategory value="3" description="M-110A2" uuid="ec75c752-5269-11df-8447-080069138b88" uid="18288"/>
+    </category>
+    <category value="5" description="Towed Artillery (anti-tank guns, guns and howitzers)" uuid="ec777778-5269-11df-a511-080069138b88" uid="18289">
+      <subcategory value="1" description="Model 56 PACK" uuid="ec788c94-5269-11df-84e7-080069138b88" uid="18290"/>
+      <subcategory value="2" description="FH-70" uuid="ec799db4-5269-11df-b787-080069138b88" uid="18291"/>
+      <subcategory value="3" description="SPADA" deprecated="1" uuid="ec7aa81c-5269-11df-8af0-080069138b88" uid="18292"/>
+    </category>
+    <category value="10" description="Mortar" uuid="ec7c57b6-5269-11df-9954-080069138b88" uid="18293">
+      <subcategory value="1" description="120 mm" uuid="ec7d68ea-5269-11df-ad1e-080069138b88" uid="18294"/>
+      <subcategory value="2" description="81 mm" uuid="ec7e7938-5269-11df-91b0-080069138b88" uid="18295"/>
+    </category>
+    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="ec802ad0-5269-11df-8229-080069138b88" uid="18296">
+      <subcategory value="1" description="SPADA SAM System" uuid="ec813718-5269-11df-bcac-080069138b88" uid="18297">
+        <specific value="1" description="Detection Center (DC)" uuid="ec824590-5269-11df-994c-080069138b88" uid="18298">
+          <extra value="1" description="Operational Control Center (OCC)" uuid="ec835700-5269-11df-9d06-080069138b88" uid="18299"/>
+          <extra value="2" description="Search and Interrogation Radar (SIR)" uuid="ec846712-5269-11df-9741-080069138b88" uid="18300"/>
+        </specific>
+        <specific value="2" description="SPADA Firing Section" uuid="ec86176a-5269-11df-898d-080069138b88" uid="18301">
+          <extra value="1" description="Aspide 6-Round Missile Launcher" uuid="ec872646-5269-11df-87f6-080069138b88" uid="18302"/>
+          <extra value="2" description="Tracking and Illumination Radar (TIR)" uuid="ec883874-5269-11df-9d3c-080069138b88" uid="18303"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="106" uuid="ec8bcdb8-5269-11df-b04c-080069138b88" uid="18304">
+    <category value="1" description="Fighter/Air Defense" uuid="ec8ce04a-5269-11df-be35-080069138b88" uid="18305">
+      <subcategory value="1" description="AMX" uuid="ec8deaa8-5269-11df-8ef1-080069138b88" uid="18306">
+        <specific value="1" description="AMX-T" uuid="ec8ef98e-5269-11df-8187-080069138b88" uid="18307"/>
+      </subcategory>
+      <subcategory value="2" description="MB 339" uuid="ec90abbc-5269-11df-8c21-080069138b88" uid="18308"/>
+      <subcategory value="3" description="MB-326" uuid="ec91c66e-5269-11df-a846-080069138b88" uid="18309"/>
+    </category>
+    <category value="2" description="Attack/Strike" uuid="ec93768a-5269-11df-9cb6-080069138b88" uid="18310"/>
+    <category value="4" description="Cargo/Tanker" uuid="ec947eea-5269-11df-81d8-080069138b88" uid="18311">
+      <subcategory value="1" description="G.222/C-27 Spartan" uuid="ec958fb0-5269-11df-b641-080069138b88" uid="18312" status="new">
+        <cr value="2337"/>
+        <specific value="1" description="G.222A" status="new" uuid="c46d62c5-c8f0-426e-bf1c-4055158dbc3f" uid="22921">
+          <cr value="2337"/>
+        </specific>
+        <specific value="2" description="C-27A Spartan" status="new" uuid="c2639efe-a48e-4114-bbc5-8c796c02ea82" uid="22922">
+          <cr value="2337"/>
+        </specific>
+        <specific value="3" description="C-27J Spartan" status="new" uuid="c0856200-ebe7-4e99-b8c9-0729d1e70de8" uid="22923">
+          <cr value="2337"/>
+        </specific>
+        <specific value="4" description="G.222TCM" status="new" uuid="6171a8c0-65e9-4bf7-839b-0080cbe50f15" uid="22924">
+          <cr value="2337"/>
+        </specific>
+        <specific value="5" description="G.222RM" status="new" uuid="dec943b0-1112-4ec4-aad4-1f312a1995c1" uid="22925">
+          <cr value="2337"/>
+        </specific>
+        <specific value="6" description="G.222SAA" status="new" uuid="7ff49822-ee44-4737-bcc4-16e33ef6907b" uid="22926">
+          <cr value="2337"/>
+        </specific>
+        <specific value="7" description="G.222T (aka G.222L)" status="new" uuid="6085f355-c735-42b9-819a-b156f37f608b" uid="22927">
+          <cr value="2337"/>
+        </specific>
+        <specific value="8" description="G.222VS (aka G.222GE)" status="new" uuid="b9bdeae5-29fd-4865-a3a4-7d90df88bfe6" uid="22928">
+          <cr value="2337"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="20" description="Attack Helicopter" uuid="ec9741ac-5269-11df-b132-080069138b88" uid="18313">
+      <subcategory value="1" description="Agusta Bell 412SP" uuid="ec985088-5269-11df-a26e-080069138b88" uid="18314"/>
+    </category>
+    <category value="21" description="Utility Helicopter" uuid="ec99ff6e-5269-11df-8385-080069138b88" uid="18315">
+      <subcategory value="1" description="Agusta A139" uuid="ec9b0cb0-5269-11df-a005-080069138b88" uid="18316"/>
+      <subcategory value="2" description="Agusta-Bell 206B" uuid="ec9c1cc2-5269-11df-a5b3-080069138b88" uid="18317"/>
+      <subcategory value="3" description="Agusta-Bell 212" uuid="ec9d2b3a-5269-11df-a1ad-080069138b88" uid="18318"/>
+      <subcategory value="4" description="HA-3F" uuid="ec9e3624-5269-11df-9acb-080069138b88" uid="18319"/>
+      <subcategory value="5" description="A-109" uuid="ec9f4a50-5269-11df-94d8-080069138b88" uid="18320"/>
+      <subcategory value="6" description="A-129" uuid="eca0592c-5269-11df-bede-080069138b88" uid="18321"/>
+      <subcategory value="7" description="AB-205A" uuid="eca1620e-5269-11df-abb0-080069138b88" uid="18322"/>
+      <subcategory value="8" description="Agusta-Bell 214" uuid="eca274fa-5269-11df-ab93-080069138b88" uid="18323"/>
+    </category>
+    <category value="22" description="Anti-submarine Warfare/Patrol Helicopter" uuid="eca42552-5269-11df-a612-080069138b88" uid="18324">
+      <subcategory value="1" description="Agusta Bell 212 ASW" uuid="eca53654-5269-11df-bc41-080069138b88" uid="18325"/>
+      <subcategory value="2" description="AS-61" uuid="eca6433c-5269-11df-8ad3-080069138b88" uid="18326"/>
+      <subcategory value="3" description="ASH-3H" uuid="eca75290-5269-11df-bd58-080069138b88" uid="18327"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="106" uuid="eca9a3b0-5269-11df-89b3-080069138b88" uid="18328">
+    <category value="1" description="Carrier" uuid="ecaab23c-5269-11df-a192-080069138b88" uid="18329">
+      <subcategory value="1" description="Luigi Einaudi Class (CV)" uuid="ecabc050-5269-11df-82bd-080069138b88" uid="18330">
+        <specific value="1" description="C552 Luigi Einaudi" uuid="ecacd2b0-5269-11df-a849-080069138b88" uid="18331"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Command Ship/Cruiser" uuid="ecaf24ca-5269-11df-9423-080069138b88" uid="18332">
+      <subcategory value="1" description="C 550 Vittorio Veneto" uuid="ecb03bf8-5269-11df-9e24-080069138b88" uid="18333"/>
+    </category>
+    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="ecb1efac-5269-11df-889f-080069138b88" uid="18334">
+      <subcategory value="1" description="Audace class" uuid="ecb2f9d8-5269-11df-ab70-080069138b88" uid="18335">
+        <specific value="1" description="D 550 Ardito" uuid="ecb40882-5269-11df-9840-080069138b88" uid="18336"/>
+        <specific value="2" description="D 551 Audace" uuid="ecb51b5a-5269-11df-830d-080069138b88" uid="18337"/>
+      </subcategory>
+      <subcategory value="2" description="Animoso class" uuid="ecb6c84c-5269-11df-a4c2-080069138b88" uid="18338">
+        <specific value="1" description="D 560 Luigi Durand De La Penne" uuid="ecb7d534-5269-11df-ae28-080069138b88" uid="18339"/>
+        <specific value="2" description="D 561 Francisco Mimbelli" uuid="ecb8e71c-5269-11df-be52-080069138b88" uid="18340"/>
+      </subcategory>
+      <subcategory value="3" description="Andrea Doria (Horizon) Class" status="new" uuid="27cac77c-a3a4-49b7-965a-13a3332ac032" uid="22714">
+        <cr value="1621"/>
+        <specific value="1" description="D553 Andrea Doria" status="new" uuid="218f6cde-ef39-44b1-b09a-0eb6b52e1a2e" uid="22715">
+          <cr value="1621"/>
+        </specific>
+        <specific value="2" description="D554 Caio Duilio" status="new" uuid="9d1b04bf-1d3d-4ded-8f26-78a4a5850d1f" uid="22716">
+          <cr value="1621"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="ecbb347c-5269-11df-a113-080069138b88" uid="18341">
+      <subcategory value="1" description="Cassiopea Class (Offshore Patrol Vessels) (OPV)" uuid="ecbc46d2-5269-11df-a9c9-080069138b88" uid="18342">
+        <specific value="1" description="P401 Cassiopea" uuid="ecbd587e-5269-11df-b9d3-080069138b88" uid="18343"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="ecbfa8ae-5269-11df-ba13-080069138b88" uid="18344">
+      <subcategory value="1" description="Gaeta Class" uuid="ecc0b79e-5269-11df-a813-080069138b88" uid="18345">
+        <specific value="1" description="M5550 Lerici" uuid="ecc1c698-5269-11df-9edd-080069138b88" uid="18346"/>
+        <specific value="2" description="M5551 Sapri" uuid="ecc2d844-5269-11df-a741-080069138b88" uid="18347"/>
+        <specific value="3" description="M5552 Milazzo" uuid="ecc3e54a-5269-11df-b3c0-080069138b88" uid="18348"/>
+        <specific value="4" description="M5553 Viesta" uuid="ecc4f480-5269-11df-bcda-080069138b88" uid="18349"/>
+        <specific value="5" description="M5554 Gaeta" uuid="ecc60352-5269-11df-bcaa-080069138b88" uid="18350"/>
+        <specific value="6" description="M5555 Termoli" uuid="ecc70f40-5269-11df-85b1-080069138b88" uid="18351"/>
+        <specific value="7" description="M5556 Alghero" uuid="ecc81f0c-5269-11df-9514-080069138b88" uid="18352"/>
+        <specific value="8" description="M5557 Numana" uuid="ecc92db6-5269-11df-a546-080069138b88" uid="18353"/>
+        <specific value="9" description="M5558 Crotone" uuid="ecca39ea-5269-11df-93f0-080069138b88" uid="18354"/>
+        <specific value="10" description="M5559 Viareggio" uuid="eccb4998-5269-11df-bf4c-080069138b88" uid="18355"/>
+        <specific value="11" description="M5560 Chioggia" uuid="eccc59fa-5269-11df-b7d8-080069138b88" uid="18356"/>
+        <specific value="12" description="M5561 Rimini" uuid="eccd63cc-5269-11df-830f-080069138b88" uid="18357"/>
+      </subcategory>
+      <subcategory value="2" description="Adjutant Class" uuid="eccf1af0-5269-11df-860f-080069138b88" uid="18358">
+        <specific value="1" description="M5504 Castagno" uuid="ecd02c88-5269-11df-9aa0-080069138b88" uid="18359"/>
+        <specific value="2" description="M5505 Cedro" uuid="ecd14000-5269-11df-9056-080069138b88" uid="18360"/>
+        <specific value="3" description="M5509 Gelso" uuid="ecd248ba-5269-11df-b6ae-080069138b88" uid="18361"/>
+        <specific value="4" description="M5516 Platano" uuid="ecd35782-5269-11df-926a-080069138b88" uid="18362"/>
+        <specific value="5" description="M5519 Mandorlo" uuid="ecd46834-5269-11df-acca-080069138b88" uid="18363"/>
+      </subcategory>
+    </category>
+    <category value="12" description="Light Carrier" uuid="ecd6b828-5269-11df-8075-080069138b88" uid="18364">
+      <subcategory value="1" description="C551 Giuseppe Garibaldi" uuid="ecd7c61e-5269-11df-a22e-080069138b88" uid="18365"/>
+    </category>
+    <category value="14" description="Hydrofoil" uuid="ecd97982-5269-11df-afbb-080069138b88" uid="18366">
+      <subcategory value="1" description="Sparviero Class (Hydrofoil-Missile)" uuid="ecda832c-5269-11df-9329-080069138b88" uid="18367">
+        <specific value="1" description="P421 Nibbio" uuid="ecdb93ac-5269-11df-bfb8-080069138b88" uid="18368"/>
+        <specific value="2" description="P422 Falcone" uuid="ecdca508-5269-11df-b3e2-080069138b88" uid="18369"/>
+        <specific value="3" description="P423 Astore" uuid="ecddaf66-5269-11df-b592-080069138b88" uid="18370"/>
+        <specific value="4" description="P424 Grifone" uuid="ecdebf00-5269-11df-91ff-080069138b88" uid="18371"/>
+        <specific value="5" description="P425 Cheppio" uuid="ecdfcefe-5269-11df-a79d-080069138b88" uid="18372"/>
+        <specific value="6" description="P426 Condor" uuid="ece0d740-5269-11df-b06f-080069138b88" uid="18373"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="ece33134-5269-11df-b0c5-080069138b88" uid="18374">
+      <subcategory value="1" description="Etna Class (Replenishment Tanker)" uuid="ece43a02-5269-11df-8fc3-080069138b88" uid="18375">
+        <specific value="1" description="Lieut Comdr Erminio Bagnasco" uuid="ece54b68-5269-11df-9718-080069138b88" uid="18376"/>
+      </subcategory>
+      <subcategory value="2" description="Stromboli Class" uuid="ece6fddc-5269-11df-9609-080069138b88" uid="18377">
+        <specific value="1" description="A5327 Stromboli" uuid="ece80c86-5269-11df-9f5a-080069138b88" uid="18378"/>
+        <specific value="2" description="A5329 Vesuvio" uuid="ece91766-5269-11df-b099-080069138b88" uid="18379"/>
+      </subcategory>
+      <subcategory value="3" description="Experimental Ship" uuid="eceac9e4-5269-11df-b3c1-080069138b88" uid="18380">
+        <specific value="1" description="A5325 Raffaele Rossetti" uuid="ecebd8d4-5269-11df-9779-080069138b88" uid="18381"/>
+        <specific value="2" description="A5320 Vincenzo Martellotta" uuid="ececea30-5269-11df-81d8-080069138b88" uid="18382"/>
+        <specific value="3" description="P492 Barbara" uuid="ecee003c-5269-11df-90d8-080069138b88" uid="18383"/>
+        <specific value="4" description="A5305 Murena" uuid="ecef1152-5269-11df-ab24-080069138b88" uid="18384"/>
+      </subcategory>
+      <subcategory value="4" description="Barngat Class (Support Ship)" uuid="ecf0c0b0-5269-11df-ae92-080069138b88" uid="18385">
+        <specific value="1" description="A5301 Pietro Cavezzali" uuid="ecf1d5ae-5269-11df-a671-080069138b88" uid="18386"/>
+      </subcategory>
+      <subcategory value="5" description="MTC 1011 Class (Ramped Transport)" uuid="ecf386f6-5269-11df-8fe7-080069138b88" uid="18387">
+        <specific value="1" description="A5347 Gorgona" uuid="ecf49276-5269-11df-9602-080069138b88" uid="18388"/>
+        <specific value="2" description="A5348 Tremiti" uuid="ecf5a33c-5269-11df-b526-080069138b88" uid="18389"/>
+        <specific value="3" description="A5349 Capera" uuid="ecf6b268-5269-11df-b33d-080069138b88" uid="18390"/>
+        <specific value="4" description="A5351 Pantelleria" uuid="ecf7bd3e-5269-11df-9c90-080069138b88" uid="18391"/>
+        <specific value="5" description="A5352 Lipari" uuid="ecf8cd5a-5269-11df-bbdd-080069138b88" uid="18392"/>
+        <specific value="6" description="A5353 Capri" uuid="ecf9dbf0-5269-11df-918f-080069138b88" uid="18393"/>
+      </subcategory>
+      <subcategory value="6" description="Pedretti Class (Commando Support Craft)" uuid="ecfb9148-5269-11df-8a2c-080069138b88" uid="18394">
+        <specific value="1" description="Y499 Alcide Pedretti" uuid="ecfc9d2c-5269-11df-914e-080069138b88" uid="18395"/>
+        <specific value="2" description="Y498 Mario Marino" uuid="ecfdadac-5269-11df-8104-080069138b88" uid="18396"/>
+      </subcategory>
+      <subcategory value="7" description="Men 215 Class (LCVP)" uuid="ecff60ac-5269-11df-b157-080069138b88" uid="18397">
+        <specific value="1" description="MEN 215" uuid="ed007064-5269-11df-b0ac-080069138b88" uid="18398"/>
+        <specific value="2" description="MEN 216" uuid="ed017a4a-5269-11df-afd6-080069138b88" uid="18399"/>
+      </subcategory>
+      <subcategory value="8" description="SAR CRAFT (Air/Sea rescue)" uuid="ed032af2-5269-11df-a7dc-080069138b88" uid="18400">
+        <specific value="1" description="Paolucci" uuid="ed043e7e-5269-11df-81b8-080069138b88" uid="18401"/>
+      </subcategory>
+      <subcategory value="9" description="Men 212 Class (TRV)" uuid="ed05edbe-5269-11df-9dab-080069138b88" uid="18402">
+        <specific value="1" description="MEN 212" uuid="ed06fc4a-5269-11df-9228-080069138b88" uid="18403"/>
+      </subcategory>
+      <subcategory value="10" description="Ex-Us LCM" uuid="ed08ae14-5269-11df-b3bc-080069138b88" uid="18404">
+        <specific value="1" description="MTM 542" uuid="ed09b624-5269-11df-a2aa-080069138b88" uid="18405"/>
+        <specific value="2" description="MTM 543" uuid="ed0ac942-5269-11df-98a5-080069138b88" uid="18406"/>
+        <specific value="3" description="MTM 544" uuid="ed0beaca-5269-11df-8c2d-080069138b88" uid="18407"/>
+        <specific value="4" description="MTM 545" uuid="ed0cfc80-5269-11df-ac16-080069138b88" uid="18408"/>
+        <specific value="5" description="MTM 546" uuid="ed0e0bca-5269-11df-bb8c-080069138b88" uid="18409"/>
+        <specific value="6" description="MTM 547" uuid="ed0f1d30-5269-11df-9664-080069138b88" uid="18410"/>
+        <specific value="7" description="MTM 548" uuid="ed102ac2-5269-11df-8421-080069138b88" uid="18411"/>
+        <specific value="8" description="MTM 549" uuid="ed113a84-5269-11df-9f47-080069138b88" uid="18412"/>
+        <specific value="9" description="MTM 550" uuid="ed12487a-5269-11df-9de3-080069138b88" uid="18413"/>
+        <specific value="10" description="MTM 551" uuid="ed1352d8-5269-11df-bc80-080069138b88" uid="18414"/>
+        <specific value="11" description="MTM 552" uuid="ed14668c-5269-11df-a9db-080069138b88" uid="18415"/>
+        <specific value="12" description="MTM 553" uuid="ed157658-5269-11df-9e85-080069138b88" uid="18416"/>
+        <specific value="13" description="MTM 554" uuid="ed168002-5269-11df-a95b-080069138b88" uid="18417"/>
+        <specific value="14" description="MTM 555" uuid="ed179230-5269-11df-9a32-080069138b88" uid="18418"/>
+        <specific value="15" description="MTM 556" uuid="ed18a26a-5269-11df-a172-080069138b88" uid="18419"/>
+      </subcategory>
+      <subcategory value="11" description="MTM 217 Class (LCMs)" uuid="ed1a51b4-5269-11df-8d15-080069138b88" uid="18420">
+        <specific value="1" description="MTM 217" uuid="ed1b5e88-5269-11df-93de-080069138b88" uid="18421"/>
+        <specific value="2" description="MTM 218" uuid="ed1c6daa-5269-11df-8705-080069138b88" uid="18422"/>
+        <specific value="3" description="MTM 219" uuid="ed1d7df8-5269-11df-8756-080069138b88" uid="18423"/>
+        <specific value="4" description="MTM 220" uuid="ed1e8612-5269-11df-a018-080069138b88" uid="18424"/>
+        <specific value="5" description="MTM 221" uuid="ed1f97f0-5269-11df-9316-080069138b88" uid="18425"/>
+        <specific value="6" description="MTM 222" uuid="ed20a64a-5269-11df-a89f-080069138b88" uid="18426"/>
+        <specific value="7" description="MTM 223" uuid="ed21b062-5269-11df-9cd1-080069138b88" uid="18427"/>
+        <specific value="8" description="MTM 224" uuid="ed22c204-5269-11df-9425-080069138b88" uid="18428"/>
+        <specific value="9" description="MTM 225" uuid="ed23d16c-5269-11df-b99e-080069138b88" uid="18429"/>
+        <specific value="10" description="MTM 226" uuid="ed24dc06-5269-11df-8f65-080069138b88" uid="18430"/>
+        <specific value="11" description="MTM 227" uuid="ed25eb0a-5269-11df-ad6e-080069138b88" uid="18431"/>
+      </subcategory>
+      <subcategory value="12" description="US LCVP Type" uuid="ed279ce8-5269-11df-9991-080069138b88" uid="18432">
+        <specific value="1" description="MTP 9726" uuid="ed28ac28-5269-11df-b107-080069138b88" uid="18433"/>
+        <specific value="2" description="MTP 9731" uuid="ed29b5f0-5269-11df-bb32-080069138b88" uid="18434"/>
+        <specific value="3" description="MTP 9748" uuid="ed2ac684-5269-11df-88d7-080069138b88" uid="18435"/>
+        <specific value="4" description="MTP 9749" uuid="ed2be21c-5269-11df-85cb-080069138b88" uid="18436"/>
+        <specific value="5" description="MTP 9750" uuid="ed2cec84-5269-11df-9ae7-080069138b88" uid="18437"/>
+        <specific value="6" description="MTP 9751" uuid="ed2dfbec-5269-11df-93aa-080069138b88" uid="18438"/>
+      </subcategory>
+      <subcategory value="13" description="MTP 96 Class (LCVP)" uuid="ed2faf32-5269-11df-9b5e-080069138b88" uid="18439">
+        <specific value="1" description="MTP 96" uuid="ed30bcce-5269-11df-87d4-080069138b88" uid="18440"/>
+        <specific value="2" description="MTP 97" uuid="ed31c812-5269-11df-a1ac-080069138b88" uid="18441"/>
+        <specific value="3" description="MTP 98" uuid="ed32dac2-5269-11df-aabe-080069138b88" uid="18442"/>
+        <specific value="4" description="MTP 99" uuid="ed33e926-5269-11df-9a56-080069138b88" uid="18443"/>
+        <specific value="5" description="MTP 100" uuid="ed34f2e4-5269-11df-a29c-080069138b88" uid="18444"/>
+        <specific value="6" description="MTP 101" uuid="ed3604e0-5269-11df-8598-080069138b88" uid="18445"/>
+        <specific value="7" description="MTP 102" uuid="ed37143e-5269-11df-b9c9-080069138b88" uid="18446"/>
+        <specific value="8" description="MTP 103" uuid="ed381c80-5269-11df-bb8f-080069138b88" uid="18447"/>
+        <specific value="9" description="MTP 104" uuid="ed392c9c-5269-11df-8226-080069138b88" uid="18448"/>
+        <specific value="10" description="MTP 105" uuid="ed3a3e7a-5269-11df-94d9-080069138b88" uid="18449"/>
+        <specific value="11" description="MTP 106" uuid="ed3b4c20-5269-11df-9808-080069138b88" uid="18450"/>
+        <specific value="12" description="MTP 107" uuid="ed3c5962-5269-11df-aa41-080069138b88" uid="18451"/>
+      </subcategory>
+      <subcategory value="14" description="Harbor Tanker" uuid="ed3e0c30-5269-11df-99e4-080069138b88" uid="18452">
+        <specific value="1" description="GRS Type" uuid="ed3f1aa8-5269-11df-9eb1-080069138b88" uid="18453"/>
+      </subcategory>
+      <subcategory value="15" description="Training Ship" uuid="ed40c9a2-5269-11df-85d7-080069138b88" uid="18454">
+        <specific value="1" description="A5312 Amerigo Vespucci" uuid="ed41d3ce-5269-11df-8b86-080069138b88" uid="18455"/>
+        <specific value="2" description="A5311 Palinuro" uuid="ed42e6d8-5269-11df-a350-080069138b88" uid="18456"/>
+        <specific value="3" description="A5378 Aragosta" uuid="ed43fc9e-5269-11df-a001-080069138b88" uid="18457"/>
+        <specific value="4" description="A5379 Astice" uuid="ed450f9e-5269-11df-a7b6-080069138b88" uid="18458"/>
+        <specific value="5" description="A5380 Mitilo" uuid="ed461f24-5269-11df-8055-080069138b88" uid="18459"/>
+        <specific value="6" description="A5381 Polipo" uuid="ed473012-5269-11df-b2f5-080069138b88" uid="18460"/>
+        <specific value="7" description="A5382 Porpora" uuid="ed483d36-5269-11df-aba0-080069138b88" uid="18461"/>
+        <specific value="8" description="A5308 Alloro" uuid="ed495a40-5269-11df-9717-080069138b88" uid="18462"/>
+        <specific value="9" description="A5302 Caroly" uuid="ed4a7948-5269-11df-b34f-080069138b88" uid="18463"/>
+        <specific value="10" description="A5313 Stella Polare" uuid="ed4b84fa-5269-11df-8384-080069138b88" uid="18464"/>
+        <specific value="11" description="A5316 Corsaro II" uuid="ed4c994e-5269-11df-b82a-080069138b88" uid="18465"/>
+        <specific value="12" description="Cristofore Colombo II" uuid="ed4da9d8-5269-11df-882c-080069138b88" uid="18466"/>
+      </subcategory>
+      <subcategory value="16" description="Salvage Ship" uuid="ed4f5940-5269-11df-8765-080069138b88" uid="18467">
+        <specific value="1" description="A5310 Proteo" uuid="ed5065f6-5269-11df-867c-080069138b88" uid="18468"/>
+        <specific value="2" description="A5309 Anteo" uuid="ed517586-5269-11df-9191-080069138b88" uid="18469"/>
+      </subcategory>
+      <subcategory value="17" description="Lighthouse Tender" uuid="ed532688-5269-11df-bc1e-080069138b88" uid="18470">
+        <specific value="1" description="A5364 Ponza" uuid="ed54346a-5269-11df-bf0b-080069138b88" uid="18471"/>
+        <specific value="2" description="A5366 Levanzo" uuid="ed554328-5269-11df-8605-080069138b88" uid="18472"/>
+        <specific value="3" description="A5367 Tavolara" uuid="ed5652fe-5269-11df-a00e-080069138b88" uid="18473"/>
+        <specific value="4" description="A5368 Palmaria" uuid="ed5762fc-5269-11df-93b9-080069138b88" uid="18474"/>
+        <specific value="5" description="A5383 Procida" uuid="ed5870de-5269-11df-8b67-080069138b88" uid="18475"/>
+      </subcategory>
+      <subcategory value="18" description="Repair Craft (LCT 3 Type)" uuid="ed5a221c-5269-11df-b1a9-080069138b88" uid="18476">
+        <specific value="1" description="A5331 MOC 1201" uuid="ed5b32c4-5269-11df-a525-080069138b88" uid="18477"/>
+        <specific value="2" description="A5332 MOC 1202" uuid="ed5c46d2-5269-11df-a973-080069138b88" uid="18478"/>
+        <specific value="3" description="A5333 MOC 1203" uuid="ed5d4f3c-5269-11df-8d9c-080069138b88" uid="18479"/>
+        <specific value="4" description="A5334 MOC 1204" uuid="ed5e603e-5269-11df-a558-080069138b88" uid="18480"/>
+        <specific value="5" description="A5335 MOC 1205" uuid="ed5f7384-5269-11df-9150-080069138b88" uid="18481"/>
+      </subcategory>
+      <subcategory value="19" description="Ferry" uuid="ed6122ce-5269-11df-adbf-080069138b88" uid="18482">
+        <specific value="1" description="Tarantola" uuid="ed622b92-5269-11df-a923-080069138b88" uid="18483"/>
+      </subcategory>
+      <subcategory value="20" description="Water Carrier" uuid="ed63df82-5269-11df-a946-080069138b88" uid="18484">
+        <specific value="1" description="A5354 Piave" uuid="ed64ee90-5269-11df-acb4-080069138b88" uid="18485"/>
+        <specific value="2" description="A5356 Basento" uuid="ed65fcfe-5269-11df-8295-080069138b88" uid="18486"/>
+        <specific value="3" description="A5357 Bradano" uuid="ed670bda-5269-11df-9c57-080069138b88" uid="18487"/>
+        <specific value="4" description="A5358 Brenta" uuid="ed681bec-5269-11df-9791-080069138b88" uid="18488"/>
+        <specific value="5" description="A5359 Bormida" uuid="ed6935d6-5269-11df-a7d4-080069138b88" uid="18489"/>
+      </subcategory>
+      <subcategory value="21" description="Water Carrier Tug" uuid="ed6ae908-5269-11df-a5fc-080069138b88" uid="18490">
+        <specific value="1" description="A5370 MCC 1101" uuid="ed6bf32a-5269-11df-9ed6-080069138b88" uid="18491"/>
+        <specific value="2" description="A5371 MCC 1102" uuid="ed6d0382-5269-11df-aee6-080069138b88" uid="18492"/>
+        <specific value="3" description="A5372 MCC 1103" uuid="ed6e1498-5269-11df-8879-080069138b88" uid="18493"/>
+        <specific value="4" description="A5373 MCC 1104" uuid="ed6f1dd4-5269-11df-b5d4-080069138b88" uid="18494"/>
+      </subcategory>
+      <subcategory value="22" description="Tug" uuid="ed70ce36-5269-11df-9599-080069138b88" uid="18495">
+        <specific value="1" description="A5319 Ciclope" uuid="ed71dd94-5269-11df-b212-080069138b88" uid="18496"/>
+        <specific value="2" description="A5324 Titano" uuid="ed72f1c0-5269-11df-a240-080069138b88" uid="18497"/>
+        <specific value="3" description="A5325 Polifemo" uuid="ed73fbf6-5269-11df-afc9-080069138b88" uid="18498"/>
+        <specific value="4" description="A5328 Gigante" uuid="ed750c80-5269-11df-95d5-080069138b88" uid="18499"/>
+        <specific value="5" description="A5330 Saturno" uuid="ed761fb2-5269-11df-86dc-080069138b88" uid="18500"/>
+        <specific value="6" description="A5365 Tenace" uuid="ed772948-5269-11df-abb2-080069138b88" uid="18501"/>
+        <specific value="7" description="A5317 Atlante" uuid="ed78389c-5269-11df-9e78-080069138b88" uid="18502"/>
+        <specific value="8" description="A5318 Prometeo" uuid="ed794930-5269-11df-9f1c-080069138b88" uid="18503"/>
+      </subcategory>
+      <subcategory value="23" description="Coastal Tug" uuid="ed7afcc6-5269-11df-a1ac-080069138b88" uid="18504">
+        <specific value="1" description="Y421 Porto Empedocle" uuid="ed7c08f0-5269-11df-9c71-080069138b88" uid="18505"/>
+        <specific value="2" description="Y422 Porto Pisano" uuid="ed7d17f4-5269-11df-bda2-080069138b88" uid="18506"/>
+        <specific value="3" description="Y423 Porto Conte" uuid="ed7e2bf8-5269-11df-847e-080069138b88" uid="18507"/>
+        <specific value="4" description="Y425 Porto Ferraio" uuid="ed7f3750-5269-11df-b86c-080069138b88" uid="18508"/>
+        <specific value="5" description="Y426 Porto Venere" uuid="ed804686-5269-11df-993c-080069138b88" uid="18509"/>
+        <specific value="6" description="Y413 Porto Fossone" uuid="ed8156ca-5269-11df-8e43-080069138b88" uid="18510"/>
+        <specific value="7" description="Y416 Porto Torres" uuid="ed82654c-5269-11df-8484-080069138b88" uid="18511"/>
+        <specific value="8" description="Y417 Porto Corsini" uuid="ed8374dc-5269-11df-9e73-080069138b88" uid="18512"/>
+        <specific value="9" description="Y436 Porto D'ischia" uuid="ed8484a8-5269-11df-94a6-080069138b88" uid="18513"/>
+        <specific value="10" description="Y443 Riva Trigoso" uuid="ed858eca-5269-11df-9e09-080069138b88" uid="18514"/>
+        <specific value="11" description="Y428 Porto Salvo" uuid="ed86a0b2-5269-11df-a976-080069138b88" uid="18515"/>
+      </subcategory>
+      <subcategory value="24" description="Harbour Tug" uuid="ed885efc-5269-11df-b17b-080069138b88" uid="18516">
+        <specific value="1" description="Y403 RP 101" uuid="ed896df6-5269-11df-a61b-080069138b88" uid="18517"/>
+        <specific value="2" description="Y404 RP 102" uuid="ed8a7890-5269-11df-bab7-080069138b88" uid="18518"/>
+        <specific value="3" description="Y406 RP 103" uuid="ed8b8a6e-5269-11df-8951-080069138b88" uid="18519"/>
+        <specific value="4" description="Y407 RP 104" uuid="ed8c9e72-5269-11df-a5cf-080069138b88" uid="18520"/>
+        <specific value="5" description="Y408 RP 105" uuid="ed8da862-5269-11df-a9de-080069138b88" uid="18521"/>
+        <specific value="6" description="Y410 RP 106" uuid="ed8eb7fc-5269-11df-9be0-080069138b88" uid="18522"/>
+        <specific value="7" description="Y452 RP 108" uuid="ed8fca66-5269-11df-b81c-080069138b88" uid="18523"/>
+        <specific value="8" description="Y456 RP 109" uuid="ed90d5fa-5269-11df-be72-080069138b88" uid="18524"/>
+        <specific value="9" description="Y458 RP 110" uuid="ed91e47c-5269-11df-bf06-080069138b88" uid="18525"/>
+        <specific value="10" description="Y460 RP 111" uuid="ed92f79a-5269-11df-9b42-080069138b88" uid="18526"/>
+        <specific value="11" description="Y462 RP 112" uuid="ed9402ca-5269-11df-948d-080069138b88" uid="18527"/>
+        <specific value="12" description="Y463 RP 113" uuid="ed951304-5269-11df-84b4-080069138b88" uid="18528"/>
+        <specific value="13" description="Y464 RP 114" uuid="ed9624b0-5269-11df-89ee-080069138b88" uid="18529"/>
+        <specific value="14" description="Y465 RP 115" uuid="ed972e64-5269-11df-a05e-080069138b88" uid="18530"/>
+        <specific value="15" description="Y466 RP 116" uuid="ed984114-5269-11df-99ae-080069138b88" uid="18531"/>
+        <specific value="16" description="Y468 RP 118" uuid="ed9951da-5269-11df-a29c-080069138b88" uid="18532"/>
+        <specific value="17" description="Y470 RP 119" uuid="ed9a5ac6-5269-11df-baab-080069138b88" uid="18533"/>
+        <specific value="18" description="Y471 RP 120" uuid="ed9b6b5a-5269-11df-a10f-080069138b88" uid="18534"/>
+        <specific value="19" description="RP 121" uuid="ed9c7efa-5269-11df-93a3-080069138b88" uid="18535"/>
+        <specific value="20" description="Y473 RP 122" uuid="ed9d87fa-5269-11df-853c-080069138b88" uid="18536"/>
+        <specific value="21" description="Y467 RP 123" uuid="ed9e9712-5269-11df-a648-080069138b88" uid="18537"/>
+        <specific value="22" description="Y477 RP 124" uuid="ed9fa800-5269-11df-9619-080069138b88" uid="18538"/>
+        <specific value="23" description="Y478 RP 125" uuid="eda0b3bc-5269-11df-a14c-080069138b88" uid="18539"/>
+        <specific value="24" description="Y479 RP 126" uuid="eda1c2d4-5269-11df-a008-080069138b88" uid="18540"/>
+        <specific value="25" description="Y480 RP 127" uuid="eda2d5ca-5269-11df-bed2-080069138b88" uid="18541"/>
+        <specific value="26" description="Y481 RP 128" uuid="eda3e0a0-5269-11df-9906-080069138b88" uid="18542"/>
+        <specific value="27" description="Y482 RP 129" uuid="eda4eff4-5269-11df-88fd-080069138b88" uid="18543"/>
+        <specific value="28" description="Y483 RP 130" uuid="eda60a38-5269-11df-b9dc-080069138b88" uid="18544"/>
+        <specific value="29" description="Y484 RP 131" uuid="eda71752-5269-11df-b5dd-080069138b88" uid="18545"/>
+        <specific value="30" description="Y485 RP 132" uuid="eda828a4-5269-11df-8286-080069138b88" uid="18546"/>
+        <specific value="31" description="Y486 RP 133" uuid="eda9394c-5269-11df-9bcb-080069138b88" uid="18547"/>
+        <specific value="32" description="Y487 RP 134" uuid="edaa42ba-5269-11df-9a2d-080069138b88" uid="18548"/>
+      </subcategory>
+      <subcategory value="25" description="(deprecated)" deprecated="1" uuid="edabf8f8-5269-11df-b904-080069138b88" uid="18549"/>
+      <subcategory value="26" description="Floating Dock" uuid="edad09d2-5269-11df-9e6e-080069138b88" uid="18550">
+        <specific value="1" description="GO 1" uuid="edae18cc-5269-11df-bcaa-080069138b88" uid="18551"/>
+        <specific value="2" description="GO 5" uuid="edaf2190-5269-11df-924b-080069138b88" uid="18552"/>
+        <specific value="3" description="GO 8" uuid="edb031c0-5269-11df-9838-080069138b88" uid="18553"/>
+        <specific value="4" description="GO 10" uuid="edb14448-5269-11df-b333-080069138b88" uid="18554"/>
+        <specific value="5" description="GO 11" uuid="edb24d8e-5269-11df-9ea0-080069138b88" uid="18555"/>
+        <specific value="6" description="GO 17" uuid="edb35c88-5269-11df-b380-080069138b88" uid="18556"/>
+        <specific value="7" description="GO 18A" uuid="edb46d9e-5269-11df-86ea-080069138b88" uid="18557"/>
+        <specific value="8" description="GO 18B" uuid="edb57946-5269-11df-8056-080069138b88" uid="18558"/>
+        <specific value="9" description="GO 20" uuid="edb687fa-5269-11df-92dc-080069138b88" uid="18559"/>
+        <specific value="10" description="GO 22" uuid="edb7994c-5269-11df-b9bc-080069138b88" uid="18560"/>
+        <specific value="11" description="GO 23" uuid="edb8a3e6-5269-11df-9849-080069138b88" uid="18561"/>
+        <specific value="12" description="GO 51" uuid="edb9b52e-5269-11df-8d7d-080069138b88" uid="18562"/>
+        <specific value="13" description="GO 52" uuid="edbac360-5269-11df-92c1-080069138b88" uid="18563"/>
+        <specific value="14" description="GO 53" uuid="edbbcdbe-5269-11df-b272-080069138b88" uid="18564"/>
+      </subcategory>
+      <subcategory value="27" description="Guardia Costiera-Capitaneria Di porto (Coast Guard)" uuid="edbd7fc4-5269-11df-a233-080069138b88" uid="18565">
+        <specific value="1" description="CP 406" uuid="edbe91fc-5269-11df-acba-080069138b88" uid="18566"/>
+        <specific value="2" description="CP 251" uuid="edbfa06a-5269-11df-8849-080069138b88" uid="18567"/>
+      </subcategory>
+      <subcategory value="28" description="Servizio Navale Carabinieri" uuid="edc1537e-5269-11df-a842-080069138b88" uid="18568">
+        <specific value="1" description="S500" uuid="edc25ed6-5269-11df-ab63-080069138b88" uid="18569"/>
+        <specific value="2" description="S400" uuid="edc36db2-5269-11df-adad-080069138b88" uid="18570"/>
+      </subcategory>
+      <subcategory value="29" description="Servizio Navale Guardia Di Finanza" uuid="edc524a4-5269-11df-aab9-080069138b88" uid="18571">
+        <specific value="1" description="Gian Maria Paolini" uuid="edc63b50-5269-11df-8f30-080069138b88" uid="18572"/>
+      </subcategory>
+      <subcategory value="30" description="Antonio Zara Class" uuid="edc7ea18-5269-11df-b4e7-080069138b88" uid="18573">
+        <specific value="1" description="Antonio Zara P 01" uuid="edc8f822-5269-11df-b889-080069138b88" uid="18574"/>
+        <specific value="2" description="Vezzari P 02" uuid="edca0668-5269-11df-b5df-080069138b88" uid="18575"/>
+      </subcategory>
+      <subcategory value="31" description="Corrubia &amp; Bigliani Classes" uuid="edcbb8fa-5269-11df-ac3d-080069138b88" uid="18576">
+        <specific value="1" description="Bigliani G 80" uuid="edccc8f8-5269-11df-89be-080069138b88" uid="18577"/>
+        <specific value="2" description="Cavaglia G 81" uuid="edcdd306-5269-11df-a3f1-080069138b88" uid="18578"/>
+        <specific value="3" description="Corrubia G 90" uuid="edcee214-5269-11df-9bd1-080069138b88" uid="18579"/>
+        <specific value="4" description="Guidice G 91" uuid="edcff406-5269-11df-b950-080069138b88" uid="18580"/>
+      </subcategory>
+      <subcategory value="32" description="Alpino Class (MCS)" uuid="edd1a1c0-5269-11df-888a-080069138b88" uid="18581">
+        <specific value="1" description="A5384 Alpino" uuid="edd2acb4-5269-11df-bfbe-080069138b88" uid="18582"/>
+      </subcategory>
+    </category>
+    <category value="17" description="Auxiliary, Merchant Marine" uuid="edd5036a-5269-11df-b071-080069138b88" uid="18583">
+      <subcategory value="1" description="A5303 Ammiraglio Magnaghi" uuid="edd60f44-5269-11df-b721-080069138b88" uid="18584"/>
+      <subcategory value="2" description="A5306 Mirto" uuid="edd72078-5269-11df-ab9c-080069138b88" uid="18585"/>
+      <subcategory value="3" description="A5307 Pioppo" uuid="edd833b4-5269-11df-8390-080069138b88" uid="18586"/>
+    </category>
+    <category value="18" description="Utility" uuid="edd9df84-5269-11df-a930-080069138b88" uid="18587">
+      <subcategory value="1" description="Cassiopea Class" uuid="eddae92e-5269-11df-bbad-080069138b88" uid="18588">
+        <specific value="1" description="P401 Cassiopea" uuid="eddbfa94-5269-11df-b9ec-080069138b88" uid="18589"/>
+        <specific value="2" description="P402 Libra" uuid="eddd0d08-5269-11df-b6c7-080069138b88" uid="18590"/>
+        <specific value="3" description="P403 Spica" uuid="edde14fa-5269-11df-9c09-080069138b88" uid="18591"/>
+        <specific value="4" description="P404 Vega" uuid="eddf2480-5269-11df-a5c5-080069138b88" uid="18592"/>
+      </subcategory>
+      <subcategory value="2" description="Agave Class" uuid="ede0d5c8-5269-11df-b2c7-080069138b88" uid="18593">
+        <specific value="1" description="P495 Bambu" uuid="ede1e328-5269-11df-b874-080069138b88" uid="18594"/>
+        <specific value="2" description="P496 Mango" uuid="ede2ed36-5269-11df-a579-080069138b88" uid="18595"/>
+        <specific value="3" description="P497 Mogano" uuid="ede408ec-5269-11df-84e1-080069138b88" uid="18596"/>
+        <specific value="4" description="P500 Palma" uuid="ede51868-5269-11df-9476-080069138b88" uid="18597"/>
+      </subcategory>
+      <subcategory value="3" description="Aggressive Class" uuid="ede6c7ee-5269-11df-b7e2-080069138b88" uid="18598">
+        <specific value="1" description="Storione" uuid="ede7d56c-5269-11df-8005-080069138b88" uid="18599"/>
+        <specific value="2" description="Squalo" uuid="ede8e48e-5269-11df-9411-080069138b88" uid="18600"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="edeb3324-5269-11df-95c0-080069138b88" uid="18601">
+      <subcategory value="1" description="Alpino class" uuid="edec41c4-5269-11df-ace8-080069138b88" uid="18602">
+        <specific value="1" description="F 580 Alpino" uuid="eded5190-5269-11df-823b-080069138b88" uid="18603"/>
+        <specific value="2" description="F 581 Carabiniere" uuid="edee61f2-5269-11df-9261-080069138b88" uid="18604"/>
+      </subcategory>
+      <subcategory value="2" description="Maestrale class" uuid="edf014a2-5269-11df-b57d-080069138b88" uid="18605">
+        <specific value="1" description="F 570 Maestrale" uuid="edf11d5c-5269-11df-8c3f-080069138b88" uid="18606"/>
+        <specific value="2" description="F 571 Gricale" uuid="edf22d8c-5269-11df-ab10-080069138b88" uid="18607"/>
+        <specific value="3" description="F 572 Libeccio" uuid="edf3408c-5269-11df-8fcf-080069138b88" uid="18608"/>
+        <specific value="4" description="F 573 Scirocco" uuid="edf44a54-5269-11df-8a22-080069138b88" uid="18609"/>
+        <specific value="5" description="F 574 Aliseo" uuid="edf55a34-5269-11df-b4f0-080069138b88" uid="18610"/>
+        <specific value="6" description="F 575 Euro" uuid="edf66afa-5269-11df-bef5-080069138b88" uid="18611"/>
+        <specific value="7" description="F 576 Espero" uuid="edf77792-5269-11df-9560-080069138b88" uid="18612"/>
+        <specific value="8" description="F 577 Zeffiro" uuid="edf886aa-5269-11df-aabe-080069138b88" uid="18613"/>
+      </subcategory>
+      <subcategory value="3" description="Lupo class" uuid="edfa3496-5269-11df-a75d-080069138b88" uid="18614">
+        <specific value="1" description="F 564 Lupo" uuid="edfb46ec-5269-11df-8ca6-080069138b88" uid="18615"/>
+        <specific value="2" description="F 565 Sagittario" uuid="edfc508c-5269-11df-9c1e-080069138b88" uid="18616"/>
+        <specific value="3" description="F 566 Perseo" uuid="edfd60bc-5269-11df-a043-080069138b88" uid="18617"/>
+        <specific value="4" description="F 567 Orsa" uuid="edfe6e30-5269-11df-93ac-080069138b88" uid="18618"/>
+      </subcategory>
+      <subcategory value="4" description="Artigliere (Lupo) class" uuid="ee001fd2-5269-11df-8bfe-080069138b88" uid="18619">
+        <specific value="1" description="F 582 Artigliere" uuid="ee012a76-5269-11df-8c19-080069138b88" uid="18620"/>
+        <specific value="2" description="F 583 Aviere" uuid="ee0241e0-5269-11df-9e4e-080069138b88" uid="18621"/>
+        <specific value="3" description="F 584 Bersagliere" uuid="ee035256-5269-11df-be5a-080069138b88" uid="18622"/>
+        <specific value="4" description="F 585 Granatiere" uuid="ee04648e-5269-11df-9118-080069138b88" uid="18623"/>
+      </subcategory>
+      <subcategory value="5" description="Minerva class" uuid="ee061716-5269-11df-8aa2-080069138b88" uid="18624">
+        <specific value="1" description="F 551 Minerva" uuid="ee0727be-5269-11df-af66-080069138b88" uid="18625"/>
+        <specific value="2" description="F 552 Urania" uuid="ee08362c-5269-11df-82ff-080069138b88" uid="18626"/>
+        <specific value="3" description="F 553 Danaide" uuid="ee094486-5269-11df-96e8-080069138b88" uid="18627"/>
+        <specific value="4" description="F 554 Sfinge" uuid="ee0a54e8-5269-11df-b907-080069138b88" uid="18628"/>
+        <specific value="5" description="F 555 Driade" uuid="ee0b63d8-5269-11df-89b4-080069138b88" uid="18629"/>
+        <specific value="6" description="F 556 Chimera" uuid="ee0c70b6-5269-11df-b32e-080069138b88" uid="18630"/>
+        <specific value="7" description="F 557 Fenice" uuid="ee0d7fa6-5269-11df-a33e-080069138b88" uid="18631"/>
+        <specific value="8" description="F 558 Sibella" uuid="ee0e8f0e-5269-11df-ad87-080069138b88" uid="18632"/>
+      </subcategory>
+      <subcategory value="6" description="De Cristofaro class" uuid="ee104038-5269-11df-9383-080069138b88" uid="18633">
+        <specific value="1" description="F 550 Salvatore Todaro" uuid="ee114abe-5269-11df-8af2-080069138b88" uid="18634"/>
+      </subcategory>
+    </category>
+    <category value="56" description="Amphibious Transport Dock" uuid="ee13a08e-5269-11df-a014-080069138b88" uid="18635">
+      <subcategory value="1" description="San Giorgio Class (LPDs)" uuid="ee14abfa-5269-11df-afbc-080069138b88" uid="18636">
+        <specific value="1" description="L9892 San Giorgio" uuid="ee15bcca-5269-11df-bacb-080069138b88" uid="18637"/>
+        <specific value="2" description="L9893 San Marco" uuid="ee16cdf4-5269-11df-8013-080069138b88" uid="18638"/>
+        <specific value="3" description="L9894 San Giusto" uuid="ee17dc3a-5269-11df-9e26-080069138b88" uid="18639"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="ee1a2e5e-5269-11df-96b5-080069138b88" uid="18640">
+      <subcategory value="1" description="Container class" uuid="ee1b3b96-5269-11df-a193-080069138b88" uid="18641">
+        <specific value="1" description="Bulkignazio" uuid="ee1c4ba8-5269-11df-9992-080069138b88" uid="18642"/>
+        <specific value="2" description="Bulk Genova" uuid="ee1d5aac-5269-11df-861f-080069138b88" uid="18643"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker class" uuid="ee1f0a50-5269-11df-a71a-080069138b88" uid="18644">
+        <specific value="1" description="Eco Europa" uuid="ee2017e2-5269-11df-8970-080069138b88" uid="18645"/>
+        <specific value="2" description="Pantelleria" uuid="ee212efc-5269-11df-ac5e-080069138b88" uid="18646"/>
+        <specific value="3" description="Agip Siracusa" uuid="ee223fae-5269-11df-a403-080069138b88" uid="18647"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="106" uuid="ee253c9a-5269-11df-8551-080069138b88" uid="18648">
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="ee264b94-5269-11df-8575-080069138b88" uid="18649">
+      <subcategory value="1" description="Improved Sauro Class" uuid="ee275c32-5269-11df-8b82-080069138b88" uid="18650">
+        <specific value="1" description="S 522 Salvatore Pelosi" uuid="ee286ea6-5269-11df-afaa-080069138b88" uid="18651"/>
+        <specific value="2" description="S 523 Giuliano Prini" uuid="ee297d0a-5269-11df-a9a6-080069138b88" uid="18652"/>
+        <specific value="3" description="S 524 Primo Longobrado" uuid="ee2a8d80-5269-11df-a879-080069138b88" uid="18653"/>
+        <specific value="4" description="S 525 Gazzana Priaroggia" uuid="ee2b9bee-5269-11df-8024-080069138b88" uid="18654"/>
+      </subcategory>
+      <subcategory value="2" description="Sauro Class (1081 Type)" uuid="ee2d4f34-5269-11df-a43e-080069138b88" uid="18655">
+        <specific value="1" description="S 518 Nazario Sauro" uuid="ee2e5a96-5269-11df-b8eb-080069138b88" uid="18656"/>
+        <specific value="2" description="S 519 Fecia Di Cossato" uuid="ee2f6a1c-5269-11df-9371-080069138b88" uid="18657"/>
+        <specific value="3" description="S 520 Leonardo Da Vinci" uuid="ee3079de-5269-11df-b613-080069138b88" uid="18658"/>
+        <specific value="4" description="S 521 Guglielmo Marconi" uuid="ee3188f6-5269-11df-a0a0-080069138b88" uid="18659"/>
+      </subcategory>
+      <subcategory value="3" description="Toti Class (1075 class)" uuid="ee333886-5269-11df-a847-080069138b88" uid="18660">
+        <specific value="1" description="S 506 Enrico Toti" uuid="ee34480c-5269-11df-af12-080069138b88" uid="18661"/>
+        <specific value="2" description="S 513 Enrico Dandolo" uuid="ee355b7a-5269-11df-aee9-080069138b88" uid="18662"/>
+      </subcategory>
+      <subcategory value="4" description="Type 212A SSK" uuid="ee370b14-5269-11df-89b4-080069138b88" uid="18663">
+        <specific value="1" description="Salvatore Todaro" uuid="ee3817b6-5269-11df-8373-080069138b88" uid="18664"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="16" uuid="ee3b0e94-5269-11df-a402-080069138b88" uid="18665">
+    <category value="7" description="Light/Patrol Craft" uuid="ee3c2ef0-5269-11df-b01c-080069138b88" uid="18666">
+      <subcategory value="1" description="AL Manama (FPB 62) Class (fast attack craft-missile)" uuid="ee3d3eb2-5269-11df-8feb-080069138b88" uid="18667">
+        <specific value="1" description="50 AL Manama" uuid="ee3e5126-5269-11df-9afa-080069138b88" uid="18668"/>
+        <specific value="2" description="51 AL Muharraq" uuid="ee3f6ae8-5269-11df-8bc4-080069138b88" uid="18669"/>
+      </subcategory>
+      <subcategory value="2" description="Almad EL Fateh (FPB 45) Class (fast attack craft-missile)" uuid="ee412036-5269-11df-ab03-080069138b88" uid="18670">
+        <specific value="1" description="20 Admad El Fateh" uuid="ee422bd4-5269-11df-acb4-080069138b88" uid="18671"/>
+        <specific value="2" description="21 Al Jabiri" uuid="ee433e52-5269-11df-9746-080069138b88" uid="18672"/>
+        <specific value="3" description="22 Abdul Rahman AL Fadel" uuid="ee445274-5269-11df-974b-080069138b88" uid="18673"/>
+        <specific value="4" description="23 Al Taweelah" uuid="ee455c50-5269-11df-9870-080069138b88" uid="18674"/>
+      </subcategory>
+      <subcategory value="3" description="AL Riffa (FPB 38) Class (fast attack craft-gun)" uuid="ee470c94-5269-11df-857e-080069138b88" uid="18675">
+        <specific value="1" description="10 AL Riffa" uuid="ee481ff8-5269-11df-a3d8-080069138b88" uid="18676"/>
+        <specific value="2" description="11 Hawar" uuid="ee493244-5269-11df-b00e-080069138b88" uid="18677"/>
+      </subcategory>
+      <subcategory value="4" description="AL Jarim (FPB 20) Class (fast attack craft-gun)" uuid="ee4ae152-5269-11df-b9e2-080069138b88" uid="18678">
+        <specific value="1" description="30 AL Jarim" uuid="ee4bed4a-5269-11df-98ae-080069138b88" uid="18679"/>
+        <specific value="2" description="31 AL Jasrah" uuid="ee4cfffa-5269-11df-9cc9-080069138b88" uid="18680"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="ee4f4de6-5269-11df-9d78-080069138b88" uid="18681">
+      <subcategory value="1" description="Support Ship" uuid="ee505f4c-5269-11df-b6de-080069138b88" uid="18682">
+        <specific value="1" description="41 Ajeera" uuid="ee516dd8-5269-11df-be89-080069138b88" uid="18683"/>
+        <specific value="2" description="42 Mashtan" uuid="ee527d0e-5269-11df-8db5-080069138b88" uid="18684"/>
+        <specific value="3" description="43 Rubodh" uuid="ee538906-5269-11df-ad78-080069138b88" uid="18685"/>
+        <specific value="4" description="44 Suwad" uuid="ee549724-5269-11df-8ca2-080069138b88" uid="18686"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="223" uuid="ee578c86-5269-11df-a011-080069138b88" uid="18687">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ee58a06c-5269-11df-84e0-080069138b88" uid="18688">
+      <subcategory value="1" description="Muray Jip (Lurssen 62) Class (Corvette)" uuid="ee59ac50-5269-11df-94dd-080069138b88" uid="18689">
+        <specific value="1" description="P6501 Muray Jip" uuid="ee5abd5c-5269-11df-84ec-080069138b88" uid="18690"/>
+        <specific value="2" description="P6502 Das" uuid="ee5bcddc-5269-11df-a672-080069138b88" uid="18691"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="ee5e25fa-5269-11df-97e3-080069138b88" uid="18692">
+      <subcategory value="1" description="Kawkab Class (coastal patrol craft)" uuid="ee5f3756-5269-11df-a879-080069138b88" uid="18693">
+        <specific value="1" description="P561 Kawkab" uuid="ee6046dc-5269-11df-a577-080069138b88" uid="18694"/>
+        <specific value="2" description="P562 Thoaban" uuid="ee615536-5269-11df-ad1e-080069138b88" uid="18695"/>
+        <specific value="3" description="P563 Bani Yas" uuid="ee62675a-5269-11df-afe1-080069138b88" uid="18696"/>
+      </subcategory>
+      <subcategory value="2" description="Murbarraz Class (fast attack craft-missile)" uuid="ee641a0a-5269-11df-9d38-080069138b88" uid="18697">
+        <specific value="1" description="P4401 Murbarraz" uuid="ee652576-5269-11df-aab0-080069138b88" uid="18698"/>
+        <specific value="2" description="P4402 Makasib" uuid="ee663538-5269-11df-a372-080069138b88" uid="18699"/>
+      </subcategory>
+      <subcategory value="3" description="Ban Yas (Lurssen TNC 45) Class (fast attack craft-missile)" uuid="ee67e6d0-5269-11df-8c8e-080069138b88" uid="18700">
+        <specific value="1" description="P4501 Ban Yas" uuid="ee68fc32-5269-11df-b38f-080069138b88" uid="18701"/>
+        <specific value="2" description="P4502 Marban" uuid="ee6a0654-5269-11df-a2f6-080069138b88" uid="18702"/>
+        <specific value="3" description="P4503 Rodqm" uuid="ee6b1724-5269-11df-a09a-080069138b88" uid="18703"/>
+        <specific value="4" description="P4504 Shaheen" uuid="ee6c27e0-5269-11df-90c7-080069138b88" uid="18704"/>
+        <specific value="5" description="P4505 Sagar" uuid="ee6d34c8-5269-11df-a01d-080069138b88" uid="18705"/>
+        <specific value="6" description="P4506 Tarif" uuid="ee6e432c-5269-11df-a0f2-080069138b88" uid="18706"/>
+      </subcategory>
+      <subcategory value="4" description="Ardhana Class (large patrol craft)" uuid="ee6ff3f2-5269-11df-b70b-080069138b88" uid="18707">
+        <specific value="1" description="P1101 Ardana" uuid="ee710738-5269-11df-9fc2-080069138b88" uid="18708"/>
+        <specific value="2" description="P1102 Zurara" uuid="ee7211c8-5269-11df-a149-080069138b88" uid="18709"/>
+        <specific value="3" description="P1103 Murban" uuid="ee732022-5269-11df-b3f4-080069138b88" uid="18710"/>
+        <specific value="4" description="P1104 Al Ghullan" uuid="ee742b16-5269-11df-8219-080069138b88" uid="18711"/>
+        <specific value="5" description="P1105 Radoom" uuid="ee753dc6-5269-11df-8db2-080069138b88" uid="18712"/>
+        <specific value="6" description="P1105 Ghanadhah" uuid="ee764c98-5269-11df-866d-080069138b88" uid="18713"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Tank Landing Ship" uuid="ee789e4e-5269-11df-84f4-080069138b88" uid="18714">
+      <subcategory value="1" description="LSL/LST" uuid="ee79ad7a-5269-11df-b1f8-080069138b88" uid="18715">
+        <specific value="1" description="L5401 Al Feyi" uuid="ee7abca6-5269-11df-b7b1-080069138b88" uid="18716"/>
+        <specific value="2" description="L5402 Jananah" uuid="ee7bcd30-5269-11df-83ae-080069138b88" uid="18717"/>
+        <specific value="3" description="L5403 Dayyinah" uuid="ee7cde82-5269-11df-b785-080069138b88" uid="18718"/>
+      </subcategory>
+    </category>
+    <category value="11" description="Landing Craft" uuid="ee7f35ce-5269-11df-ac02-080069138b88" uid="18719">
+      <subcategory value="1" description="LCM" uuid="ee80414e-5269-11df-95f6-080069138b88" uid="18720">
+        <specific value="1" description="Ghagha II" uuid="ee815098-5269-11df-a736-080069138b88" uid="18721"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="ee83a0c8-5269-11df-9773-080069138b88" uid="18722">
+      <subcategory value="1" description="Cheverton Type (Tender)" uuid="ee84aef0-5269-11df-8689-080069138b88" uid="18723">
+        <specific value="1" description="A271" uuid="ee85c056-5269-11df-aba2-080069138b88" uid="18724"/>
+        <specific value="2" description="A272" uuid="ee86d0b8-5269-11df-9236-080069138b88" uid="18725"/>
+      </subcategory>
+      <subcategory value="2" description="Diving Tender" uuid="ee8880fc-5269-11df-bdff-080069138b88" uid="18726">
+        <specific value="1" description="D1051" uuid="ee898af6-5269-11df-8232-080069138b88" uid="18727"/>
+      </subcategory>
+      <subcategory value="3" description="Support Craft" uuid="ee8b3d56-5269-11df-a2f6-080069138b88" uid="18728">
+        <specific value="1" description="Baracuda" uuid="ee8c4cd2-5269-11df-b256-080069138b88" uid="18729"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-combatant Ship" uuid="ee8e9bfe-5269-11df-822a-080069138b88" uid="18730">
+      <subcategory value="1" description="Container Class" uuid="ee8fabac-5269-11df-9269-080069138b88" uid="18731">
+        <specific value="1" description="Julphara" uuid="ee90bae2-5269-11df-a6f2-080069138b88" uid="18732"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="ee926b62-5269-11df-a9a1-080069138b88" uid="18733">
+        <specific value="1" description="Al Dhabiyyah" uuid="ee937d36-5269-11df-85b8-080069138b88" uid="18734"/>
+        <specific value="2" description="Al Dhibyaniyyah" uuid="ee948730-5269-11df-a058-080069138b88" uid="18735"/>
+        <specific value="3" description="Al Markhaniya" uuid="ee95962a-5269-11df-a488-080069138b88" uid="18736"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="237" uuid="ee988998-5269-11df-9114-080069138b88" uid="18737">
+    <category value="7" description="Light/Patrol Craft" uuid="ee9999fa-5269-11df-9637-080069138b88" uid="18738">
+      <subcategory value="1" description="Broadsword Class (coastal patrol craft)" uuid="ee9aa3fe-5269-11df-96a7-080069138b88" uid="18739">
+        <specific value="1" description="141 26 September" uuid="ee9bbc3a-5269-11df-8270-080069138b88" uid="18740"/>
+        <specific value="2" description="142 Ramadan" uuid="ee9cd03e-5269-11df-8e5e-080069138b88" uid="18741"/>
+        <specific value="3" description="143 Sana's" uuid="ee9dd948-5269-11df-b6fc-080069138b88" uid="18742"/>
+      </subcategory>
+      <subcategory value="2" description="Baklan Class (PCF)" uuid="ee9f8734-5269-11df-b81f-080069138b88" uid="18743">
+        <specific value="1" description="1201 Baklan" uuid="eea09be2-5269-11df-8367-080069138b88" uid="18744"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="eea2e988-5269-11df-bd88-080069138b88" uid="18745">
+      <subcategory value="1" description="Toplivo Class" uuid="eea3f7ba-5269-11df-bfc5-080069138b88" uid="18746">
+        <specific value="1" description="135 (tanker-water)" uuid="eea50b5a-5269-11df-8ca3-080069138b88" uid="18747"/>
+        <specific value="2" description="140 (tanker-oil)" uuid="eea61b62-5269-11df-bd70-080069138b88" uid="18748"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-combatant Ship" uuid="eea86b2e-5269-11df-a6d7-080069138b88" uid="18749">
+      <subcategory value="1" description="Container Class" uuid="eea97960-5269-11df-8f11-080069138b88" uid="18750">
+        <specific value="1" description="Kedah Cement I" uuid="eeaa8404-5269-11df-acb1-080069138b88" uid="18751"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker" uuid="eeac34d4-5269-11df-8751-080069138b88" uid="18752">
+        <specific value="1" description="Abc Al-Rodha" uuid="eead4400-5269-11df-8075-080069138b88" uid="18753"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="10" uuid="eeb038f4-5269-11df-be72-080069138b88" uid="18754">
+    <category value="4" description="Guided Missile Destroyer" uuid="eeb14712-5269-11df-9e98-080069138b88" uid="18755">
+      <subcategory value="1" description="Almirante Brown (Meko 360)" uuid="eeb252b0-5269-11df-a9b3-080069138b88" uid="18756"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="eeb40448-5269-11df-8065-080069138b88" uid="18757">
+      <subcategory value="1" description="Costa Sur" uuid="eeb51216-5269-11df-b515-080069138b88" uid="18758"/>
+      <subcategory value="2" description="Puerto Deseado" uuid="eeb622c8-5269-11df-8077-080069138b88" uid="18759"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="10" uuid="eeb8715e-5269-11df-9d6b-080069138b88" uid="18760">
+    <category value="5" description="SS (Conventional Attack - Torpedo, Patrol" uuid="eeb98012-5269-11df-a885-080069138b88" uid="18761">
+      <subcategory value="1" description="Santa Cruz (TR 1700) Class (SS)" uuid="eeba94a2-5269-11df-ab3d-080069138b88" uid="18762"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="21" uuid="eebced7e-5269-11df-8311-080069138b88" uid="18763">
+    <category value="50" description="Frigate (including Corvette)" uuid="eebdf778-5269-11df-8aa0-080069138b88" uid="18764">
+      <subcategory value="1" description="Wielingen Class (FF)" uuid="eebf08d4-5269-11df-8ec0-080069138b88" uid="18765"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="39" uuid="eec15a6c-5269-11df-a9ef-080069138b88" uid="18766">
+    <category value="4" description="Cargo/Tanker" uuid="eec26894-5269-11df-952e-080069138b88" uid="18767">
+      <subcategory value="1" description="CC144 Challenger" uuid="eec37b80-5269-11df-97b4-080069138b88" uid="18768"/>
+    </category>
+    <category value="5" description="ASW/Patrol/Observation" uuid="eec52ab6-5269-11df-987b-080069138b88" uid="18769">
+      <subcategory value="1" description="CP-140 Arcturus/Aurora" deprecated="1" uuid="eec63adc-5269-11df-8ca1-080069138b88" uid="18770"/>
+      <subcategory value="2" description="CP144 Challenger" uuid="eec74a6c-5269-11df-a983-080069138b88" uid="18771"/>
+    </category>
+    <category value="6" description="Electronic Warfare (EW)" uuid="eec8f8a8-5269-11df-aadc-080069138b88" uid="18772">
+      <subcategory value="1" description="CE144 Challenger" uuid="eeca07e8-5269-11df-a80e-080069138b88" uid="18773"/>
+    </category>
+    <category value="22" description="Antisubmarine Warfare/Patrol Helicopter" uuid="eecbba52-5269-11df-8486-080069138b88" uid="18774">
+      <subcategory value="1" description="CH-124 (HELO)" uuid="eeccc910-5269-11df-87ea-080069138b88" uid="18775"/>
+    </category>
+    <category value="57" description="Non-combatant Commercial Aircraft" uuid="eece7ad0-5269-11df-84ea-080069138b88" uid="18776">
+      <subcategory value="1" description="Passenger Airline" uuid="eecf8678-5269-11df-8605-080069138b88" uid="18777">
+        <specific value="1" description="DASH-8" uuid="eed096da-5269-11df-a6fe-080069138b88" uid="18778"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="39" uuid="eed389e4-5269-11df-b151-080069138b88" uid="18779">
+    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="eed4a41e-5269-11df-97e5-080069138b88" uid="18780">
+      <subcategory value="1" description="Iroquis Class (DDG)" uuid="eed5b3e0-5269-11df-8b8f-080069138b88" uid="18781"/>
+    </category>
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="eed76438-5269-11df-bbd2-080069138b88" uid="18782">
+      <subcategory value="1" description="Halifax Class (FFG)" uuid="eed873d2-5269-11df-bc6a-080069138b88" uid="18783"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="eeda2e34-5269-11df-a8a0-080069138b88" uid="18784">
+      <subcategory value="1" description="Provider Class (AOR)" uuid="eedb4094-5269-11df-9da2-080069138b88" uid="18785"/>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="eedcf128-5269-11df-bd0f-080069138b88" uid="18786">
+      <subcategory value="1" description="Annapolis Class (FF)" uuid="eeddfd7a-5269-11df-ab54-080069138b88" uid="18787"/>
+      <subcategory value="2" description="Restigouche Class (FF)" uuid="eedf0cce-5269-11df-b250-080069138b88" uid="18788"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="57" uuid="eee16136-5269-11df-bae7-080069138b88" uid="18789">
+    <category value="7" description="Light/ Patrol Craft" uuid="eee26f7c-5269-11df-892b-080069138b88" uid="18790">
+      <subcategory value="1" description="Willemoes Class" uuid="eee37ebc-5269-11df-9532-080069138b88" uid="18791"/>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="eee52e6a-5269-11df-b61b-080069138b88" uid="18792">
+      <subcategory value="1" description="Container class" uuid="eee642aa-5269-11df-9c4e-080069138b88" uid="18793">
+        <specific value="1" description="Lindo Maersk" uuid="eee74cfe-5269-11df-bd40-080069138b88" uid="18794"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="62" uuid="eeea3ebe-5269-11df-8e94-080069138b88" uid="18795">
+    <category value="5" description="Destroyer" uuid="eeeb4b4c-5269-11df-9720-080069138b88" uid="18796">
+      <subcategory value="1" description="Z Class (DD)" uuid="eeec585c-5269-11df-ae90-080069138b88" uid="18797">
+        <specific value="1" description="921 El Fateh" uuid="eeed683c-5269-11df-820f-080069138b88" uid="18798"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided Missile Frigates" uuid="eeefb808-5269-11df-be5d-080069138b88" uid="18799">
+      <subcategory value="1" description="Descubierta Class (FFG)" uuid="eef0c9e6-5269-11df-b221-080069138b88" uid="18800">
+        <specific value="1" description="F946 Abu Qir" uuid="eef1d9e4-5269-11df-bd9f-080069138b88" uid="18801"/>
+      </subcategory>
+      <subcategory value="2" description="Jianghu I Class (FFG)" uuid="eef38a3c-5269-11df-b936-080069138b88" uid="18802">
+        <specific value="1" description="951 Najim Al Zaffer" uuid="eef49c9c-5269-11df-a9f3-080069138b88" uid="18803"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="eef6e9c0-5269-11df-aca9-080069138b88" uid="18804">
+      <subcategory value="1" description="Ramadan Class" uuid="eef80508-5269-11df-a4ba-080069138b88" uid="18805"/>
+    </category>
+    <category value="61" description="Non-combatant Ship" uuid="eef9b4ca-5269-11df-8f77-080069138b88" uid="18806">
+      <subcategory value="1" description="Container Class" uuid="eefac4d2-5269-11df-9b51-080069138b88" uid="18807">
+        <specific value="1" description="Abydos" uuid="eefbd188-5269-11df-b86b-080069138b88" uid="18808"/>
+        <specific value="2" description="Esna" uuid="eefcdfb0-5269-11df-a42e-080069138b88" uid="18809"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="eefe8dd8-5269-11df-a86c-080069138b88" uid="18810">
+        <specific value="1" description="Al Sharifa II" uuid="eeffa25e-5269-11df-8887-080069138b88" uid="18811"/>
+        <specific value="2" description="Abu Khalid" uuid="ef00ab40-5269-11df-9ee8-080069138b88" uid="18812"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="62" uuid="ef039dbe-5269-11df-af38-080069138b88" uid="18813">
+    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="ef04abfa-5269-11df-bdc2-080069138b88" uid="18814">
+      <subcategory value="1" description="Improved Romeo Class (Type 033) (SSK)" uuid="ef05bacc-5269-11df-a4a3-080069138b88" uid="18815">
+        <specific value="1" description="849" uuid="ef06c976-5269-11df-8cd9-080069138b88" uid="18816"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="99" uuid="ef09bc9e-5269-11df-aea3-080069138b88" uid="18817">
+    <category value="2" description="Attack/Strike" uuid="ef0aca76-5269-11df-adbe-080069138b88" uid="18818">
+      <subcategory value="1" description="HAL Jaguar" uuid="ef0bd3e4-5269-11df-a461-080069138b88" uid="18819"/>
+      <subcategory value="2" description="HAL Kiran Mk II" uuid="ef0ce5fe-5269-11df-a2fd-080069138b88" uid="18820"/>
+    </category>
+    <category value="21" description="Utility Helicopter" uuid="ef0e96ba-5269-11df-952c-080069138b88" uid="18821">
+      <subcategory value="1" description="HAL SA 316 Alouette III" uuid="ef0fa6f4-5269-11df-bc1d-080069138b88" uid="18822"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="99" uuid="ef11f846-5269-11df-928e-080069138b88" uid="18823">
+    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="ef130614-5269-11df-a73c-080069138b88" uid="18824">
+      <subcategory value="1" description="Delhi Class" uuid="ef141374-5269-11df-aced-080069138b88" uid="18825"/>
+      <subcategory value="2" description="Rajput Class" uuid="ef1523ae-5269-11df-9467-080069138b88" uid="18826"/>
+    </category>
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ef16ddb6-5269-11df-bc3d-080069138b88" uid="18827">
+      <subcategory value="1" description="Godavari Class" uuid="ef17ed5a-5269-11df-a64c-080069138b88" uid="18828"/>
+      <subcategory value="2" description="Talwar (Type 1135.6/Project 17) Class (FFG)" uuid="ef18f934-5269-11df-94e0-080069138b88" uid="18829">
+        <specific value="1" description="Talwar" uuid="ef1a0a7c-5269-11df-9ea7-080069138b88" uid="18830"/>
+      </subcategory>
+      <subcategory value="3" description="Brahmaputra Class (FFG)" uuid="ef1bbcc8-5269-11df-9e8e-080069138b88" uid="18831">
+        <specific value="1" description="F31 Brahmaputra" uuid="ef1ccb22-5269-11df-9f92-080069138b88" uid="18832"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft(PC)" uuid="ef1f1fb2-5269-11df-a8df-080069138b88" uid="18833">
+      <subcategory value="1" description="Sukanya Class" uuid="ef203226-5269-11df-ba38-080069138b88" uid="18834"/>
+      <subcategory value="2" description="Samar Class" uuid="ef213cac-5269-11df-9dbb-080069138b88" uid="18835"/>
+      <subcategory value="3" description="Abhay (Pauk II) Class (FS)" uuid="ef224fd4-5269-11df-b131-080069138b88" uid="18836">
+        <specific value="1" description="P33 Abhay" uuid="ef235f78-5269-11df-bb94-080069138b88" uid="18837"/>
+      </subcategory>
+      <subcategory value="4" description="Durg (Nanuchka II) Class (FSG)" uuid="ef250e90-5269-11df-aecc-080069138b88" uid="18838">
+        <specific value="1" description="K72 Sindhudurg" uuid="ef261c18-5269-11df-aa5c-080069138b88" uid="18839"/>
+      </subcategory>
+      <subcategory value="5" description="SDB Mk 3/T 60 Class (Large Patrol Craft) (PC)" uuid="ef27cc2a-5269-11df-a429-080069138b88" uid="18840">
+        <specific value="1" description="Y61 Trinkat" uuid="ef28df84-5269-11df-9a08-080069138b88" uid="18841"/>
+      </subcategory>
+      <subcategory value="6" description="Super Dvora MkII Class (PFC)" uuid="ef2a8e7e-5269-11df-a313-080069138b88" uid="18842">
+        <specific value="1" description="T80" uuid="ef2ba034-5269-11df-be05-080069138b88" uid="18843"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="ef2df046-5269-11df-9e16-080069138b88" uid="18844">
+      <subcategory value="1" description="Mahe (Yevgenya) Class (Type 1258)" uuid="ef2effc2-5269-11df-aee8-080069138b88" uid="18845">
+        <specific value="1" description="M83 Mahe" uuid="ef300ebc-5269-11df-9582-080069138b88" uid="18846"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliary" uuid="ef326018-5269-11df-b5f2-080069138b88" uid="18847">
+      <subcategory value="1" description="Deepak Class (Replenishment Tanker) ( AOR)" uuid="ef336d82-5269-11df-b43b-080069138b88" uid="18848">
+        <specific value="1" description="A57 Shakti" uuid="ef347dbc-5269-11df-8f95-080069138b88" uid="18849"/>
+      </subcategory>
+      <subcategory value="2" description="Jyoti Class (Replenishment Tanker ) (AOR)" uuid="ef363972-5269-11df-9da7-080069138b88" uid="18850">
+        <specific value="1" description="A58 Jyoti" uuid="ef3749a2-5269-11df-8211-080069138b88" uid="18851"/>
+      </subcategory>
+      <subcategory value="3" description="Aditya Class (Replenishment and Repair Ship) (AOR/AR)" uuid="ef38fac2-5269-11df-adb7-080069138b88" uid="18852">
+        <specific value="1" description="A59 Aditya" uuid="ef3a058e-5269-11df-81c3-080069138b88" uid="18853"/>
+      </subcategory>
+      <subcategory value="4" description="Support Tanker (AOTL)" uuid="ef3bb8d4-5269-11df-8f1e-080069138b88" uid="18854">
+        <specific value="1" description="Poshak" uuid="ef3cc86e-5269-11df-9990-080069138b88" uid="18855"/>
+      </subcategory>
+      <subcategory value="5" description="Transport Ship (AP)" uuid="ef3e7844-5269-11df-8bb3-080069138b88" uid="18856">
+        <specific value="1" description="Nicobar" uuid="ef3f8a4a-5269-11df-80a4-080069138b88" uid="18857"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="ef41d6ce-5269-11df-9cd2-080069138b88" uid="18858">
+      <subcategory value="1" description="Khukri Class" uuid="ef42eac8-5269-11df-9a1f-080069138b88" uid="18859"/>
+      <subcategory value="2" description="Kora Class (Project 25A) ( FSG)" uuid="ef43f60c-5269-11df-b6f2-080069138b88" uid="18860">
+        <specific value="1" description="P61 Kora" uuid="ef4504fc-5269-11df-be9e-080069138b88" uid="18861"/>
+      </subcategory>
+    </category>
+    <category value="54" description="Amphibious Assault Ship" uuid="ef47586a-5269-11df-917f-080069138b88" uid="18862">
+      <subcategory value="1" description="Magar Class (LST)" uuid="ef4867be-5269-11df-897c-080069138b88" uid="18863">
+        <specific value="1" description="L20 Magar" uuid="ef497726-5269-11df-b781-080069138b88" uid="18864"/>
+      </subcategory>
+      <subcategory value="2" description="Mk 3 Landing Craft (LCU/LSM)" uuid="ef4b28a0-5269-11df-8e8d-080069138b88" uid="18865">
+        <specific value="1" description="L34 Vasco Da Gama" uuid="ef4c383a-5269-11df-af75-080069138b88" uid="18866"/>
+      </subcategory>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="ef4e896e-5269-11df-8f7d-080069138b88" uid="18867">
+      <subcategory value="1" description="Container class" uuid="ef4f9804-5269-11df-9c0d-080069138b88" uid="18868">
+        <specific value="1" description="Pearl Grace" uuid="ef50a140-5269-11df-b976-080069138b88" uid="18869"/>
+        <specific value="2" description="Aditya Gaurav" uuid="ef51b2c4-5269-11df-bd52-080069138b88" uid="18870"/>
+        <specific value="3" description="Aditya Gautam" uuid="ef52c29a-5269-11df-9eb8-080069138b88" uid="18871"/>
+        <specific value="4" description="Aditya Gopal" uuid="ef53d4e6-5269-11df-96e5-080069138b88" uid="18872"/>
+        <specific value="5" description="Aditya Prakash" uuid="ef54e584-5269-11df-b8b4-080069138b88" uid="18873"/>
+        <specific value="6" description="Fomento Sharad" uuid="ef55f8ca-5269-11df-bf5d-080069138b88" uid="18874"/>
+        <specific value="7" description="ICL Parthibhan" uuid="ef57031e-5269-11df-ba4d-080069138b88" uid="18875"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker class" uuid="ef58b2e0-5269-11df-a2f5-080069138b88" uid="18876">
+        <specific value="1" description="Ankleshwar" uuid="ef59c0cc-5269-11df-ad25-080069138b88" uid="18877"/>
+        <specific value="2" description="Annapurna" uuid="ef5ad462-5269-11df-8b3a-080069138b88" uid="18878"/>
+        <specific value="3" description="Jag Leela" uuid="ef5bde70-5269-11df-afe6-080069138b88" uid="18879"/>
+        <specific value="4" description="Abul Kalam Azad" uuid="ef5ceec8-5269-11df-b770-080069138b88" uid="18880"/>
+        <specific value="5" description="Aditya Vikram" uuid="ef5dfef8-5269-11df-8bd3-080069138b88" uid="18881"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="110" uuid="ef60ed20-5269-11df-8808-080069138b88" uid="18882">
+    <category value="4" description="Self-propelled Artillery" uuid="ef61fae4-5269-11df-942b-080069138b88" uid="18883">
+      <subcategory value="1" description="SSM-1A/1B (type 88/90) launcher" uuid="ef630e7a-5269-11df-b277-080069138b88" uid="18884"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="110" uuid="ef655b08-5269-11df-a864-080069138b88" uid="18885">
+    <category value="4" description="Guided Missile Destroyer (DDG)" uuid="ef666c0a-5269-11df-86e4-080069138b88" uid="18886">
+      <subcategory value="1" description="Kongo Class (DDG)" uuid="ef677c1c-5269-11df-8b26-080069138b88" uid="18887"/>
+      <subcategory value="2" description="Tachikaze Class (DDG)" uuid="ef688ca6-5269-11df-a810-080069138b88" uid="18888"/>
+      <subcategory value="3" description="Hatakaze Class (DDG)" uuid="ef699ab0-5269-11df-89e0-080069138b88" uid="18889"/>
+    </category>
+    <category value="5" description="Destroyer (DD)" uuid="ef6b48ec-5269-11df-b4ce-080069138b88" uid="18890">
+      <subcategory value="1" description="Shirane Class (DD)" uuid="ef6c5ee4-5269-11df-921f-080069138b88" uid="18891"/>
+      <subcategory value="2" description="Haruna Class (DD)" uuid="ef6d763a-5269-11df-bab1-080069138b88" uid="18892"/>
+      <subcategory value="3" description="Asagiri Class (DD)" uuid="ef6e80de-5269-11df-97ae-080069138b88" uid="18893"/>
+      <subcategory value="4" description="Hatsuyuki Class (DD)" uuid="ef6f919a-5269-11df-baec-080069138b88" uid="18894"/>
+      <subcategory value="5" description="Minegumo Class (DD)" uuid="ef70a508-5269-11df-84d9-080069138b88" uid="18895"/>
+      <subcategory value="6" description="Takasuki Class (DD)" uuid="ef71b0a6-5269-11df-820d-080069138b88" uid="18896"/>
+      <subcategory value="7" description="Yamagumo Class (DD)" uuid="ef72c86a-5269-11df-ae95-080069138b88" uid="18897"/>
+      <subcategory value="8" description="Murasame Class" uuid="ef73d958-5269-11df-bb72-080069138b88" uid="18898"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="ef758df2-5269-11df-88a7-080069138b88" uid="18899">
+      <subcategory value="1" description="Souya Class" deprecated="1" uuid="ef769922-5269-11df-85c7-080069138b88" uid="18900"/>
+      <subcategory value="2" description="Hatsushima Class (Minesweeper)" uuid="ef77a8a8-5269-11df-88e0-080069138b88" uid="18901"/>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="ef7960ee-5269-11df-a9bf-080069138b88" uid="18902">
+      <subcategory value="1" description="Abukuma Class (FF)" uuid="ef7a70ba-5269-11df-a21d-080069138b88" uid="18903"/>
+      <subcategory value="2" description="Yubari Class (FF)" uuid="ef7b7ca8-5269-11df-935b-080069138b88" uid="18904"/>
+      <subcategory value="3" description="Chikugo Class (FF)" uuid="ef7c8d50-5269-11df-b9ad-080069138b88" uid="18905"/>
+    </category>
+    <category value="61" description="Non-Combatant Ship" uuid="ef7e41a4-5269-11df-a4c9-080069138b88" uid="18906">
+      <subcategory value="1" description="Supertanker" uuid="ef7f5062-5269-11df-be04-080069138b88" uid="18907">
+        <specific value="1" description="Kota Mutiara" uuid="ef805af2-5269-11df-b054-080069138b88" uid="18908"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="110" uuid="ef834dd4-5269-11df-9b32-080069138b88" uid="18909">
+    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="ef845c42-5269-11df-ac21-080069138b88" uid="18910">
+      <subcategory value="1" description="Harushio Class (SS)" uuid="ef856b32-5269-11df-be48-080069138b88" uid="18911"/>
+      <subcategory value="2" description="Yuushio Class (SS)" uuid="ef867cd4-5269-11df-bc31-080069138b88" uid="18912"/>
+      <subcategory value="3" description="Uzushio Class (SS)" uuid="ef878c32-5269-11df-a1ec-080069138b88" uid="18913"/>
+      <subcategory value="4" description="Oyashio Class" uuid="ef8896c2-5269-11df-af76-080069138b88" uid="18914"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="126" uuid="ef8aead0-5269-11df-8c91-080069138b88" uid="18915">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="ef8bf59c-5269-11df-9fd7-080069138b88" uid="18916">
+      <subcategory value="1" description="Dat Assawari" uuid="ef8d07d4-5269-11df-aeb1-080069138b88" uid="18917"/>
+    </category>
+    <category value="7" description="Light/Patrol Craft (PC)" uuid="ef8eb6f6-5269-11df-a665-080069138b88" uid="18918">
+      <subcategory value="1" description="Combattante 2 G Class" uuid="ef8fc6a4-5269-11df-8887-080069138b88" uid="18919">
+        <specific value="1" description="Laheeb" uuid="ef90d47c-5269-11df-9899-080069138b88" uid="18920"/>
+        <specific value="2" description="Shafak" uuid="ef91e9b6-5269-11df-b107-080069138b88" uid="18921"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate(including Corvette)" uuid="ef943c70-5269-11df-91b5-080069138b88" uid="18922">
+      <subcategory value="1" description="Assad Class" uuid="ef954cd2-5269-11df-a4b8-080069138b88" uid="18923">
+        <specific value="1" description="Assad AL BIHAR" uuid="ef965b90-5269-11df-adca-080069138b88" uid="18924"/>
+        <specific value="2" description="Assad ELTOUGOUR" uuid="ef976a26-5269-11df-85f2-080069138b88" uid="18925"/>
+        <specific value="3" description="Assad AL KHALI" uuid="ef987830-5269-11df-925d-080069138b88" uid="18926"/>
+        <specific value="4" description="Assad AL HUDUD" uuid="ef9987ca-5269-11df-a540-080069138b88" uid="18927"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="153" uuid="ef9c7b4c-5269-11df-9f7b-080069138b88" uid="18928">
+    <category value="23" description="Warning System" uuid="ef9d88b6-5269-11df-9dba-080069138b88" uid="18929">
+      <subcategory value="1" description="CRC" uuid="ef9e96ac-5269-11df-8726-080069138b88" uid="18930">
+        <specific value="1" description="CRC (NL)" uuid="ef9fa4de-5269-11df-ace2-080069138b88" uid="18931"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="153" uuid="efa2978e-5269-11df-a55a-080069138b88" uid="18932">
+    <category value="4" description="Cargo/Tanker" uuid="efa3a3b8-5269-11df-94f1-080069138b88" uid="18933">
+      <subcategory value="1" description="Fokker F27" uuid="efa4b492-5269-11df-8e34-080069138b88" uid="18934"/>
+    </category>
+    <category value="21" description="Utility Helicopter" uuid="efa66436-5269-11df-b4d3-080069138b88" uid="18935">
+      <subcategory value="1" description="SH 14 (Mk27 Lynx)" uuid="efa77326-5269-11df-a09c-080069138b88" uid="18936"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="153" uuid="efa9c2de-5269-11df-8324-080069138b88" uid="18937">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="efaad2dc-5269-11df-b805-080069138b88" uid="18938">
+      <subcategory value="1" description="Tromp Class" uuid="efabe348-5269-11df-ade6-080069138b88" uid="18939"/>
+      <subcategory value="2" description="Kortenaer Class" uuid="efacf65c-5269-11df-9ae5-080069138b88" uid="18940"/>
+      <subcategory value="3" description="Jacob Van Heemskerck Class" uuid="efae00d8-5269-11df-8829-080069138b88" uid="18941"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="efafb81a-5269-11df-b443-080069138b88" uid="18942">
+      <subcategory value="1" description="A20 Moawin (ex. Poolster) Pakistan" uuid="efb0cc82-5269-11df-990d-080069138b88" uid="18943"/>
+      <subcategory value="2" description="Amsterdam" uuid="efb1de9c-5269-11df-84bc-080069138b88" uid="18944"/>
+      <subcategory value="3" description="Tanker (AOT)" uuid="efb2e936-5269-11df-ab6c-080069138b88" uid="18945">
+        <specific value="1" description="A40 Attock" uuid="efb3fb82-5269-11df-b68b-080069138b88" uid="18946"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="153" uuid="efb6ee46-5269-11df-b93e-080069138b88" uid="18947">
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="efb80056-5269-11df-ae56-080069138b88" uid="18948">
+      <subcategory value="1" description="Walrus Class" uuid="efb90a3c-5269-11df-96ef-080069138b88" uid="18949"/>
+      <subcategory value="2" description="Hai Lung Class" uuid="efba1a9e-5269-11df-a483-080069138b88" uid="18950">
+        <specific value="1" description="793 Hai Lung (Taiwan)" uuid="efbb2dee-5269-11df-a1c5-080069138b88" uid="18951"/>
+        <specific value="2" description="794 Hai Hu (Taiwan)" uuid="efbc391e-5269-11df-8a56-080069138b88" uid="18952"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="163" uuid="efbf2c28-5269-11df-9ff1-080069138b88" uid="18953">
+    <category value="4" description="Self-propelled Artillery" uuid="efc03a78-5269-11df-b5b8-080069138b88" uid="18954">
+      <subcategory value="1" description="Penguin Mk 2 launcher" uuid="efc145a8-5269-11df-9ef7-080069138b88" uid="18955"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="163" uuid="efc39c4a-5269-11df-b676-080069138b88" uid="18956">
+    <category value="7" description="Light/Patrol Craft" uuid="efc4a3ba-5269-11df-b2e2-080069138b88" uid="18957">
+      <subcategory value="1" description="Snogg Class" uuid="efc5b61a-5269-11df-9b10-080069138b88" uid="18958"/>
+      <subcategory value="2" description="Hauk Class" uuid="efc6c56e-5269-11df-8621-080069138b88" uid="18959">
+        <specific value="1" description="Hauk" uuid="efc7cf5e-5269-11df-b40e-080069138b88" uid="18960"/>
+        <specific value="2" description="Orn" uuid="efc8e07e-5269-11df-b3e0-080069138b88" uid="18961"/>
+        <specific value="3" description="Terne" uuid="efc9f02c-5269-11df-928f-080069138b88" uid="18962"/>
+        <specific value="4" description="Tjeld" uuid="efcafa26-5269-11df-8f3b-080069138b88" uid="18963"/>
+        <specific value="5" description="Skarv" uuid="efcc09e8-5269-11df-b70f-080069138b88" uid="18964"/>
+        <specific value="6" description="Teist" uuid="efcd18c4-5269-11df-ab62-080069138b88" uid="18965"/>
+        <specific value="7" description="Jo" uuid="efce275a-5269-11df-843d-080069138b88" uid="18966"/>
+        <specific value="8" description="Lom" uuid="efcf3da2-5269-11df-9ad0-080069138b88" uid="18967"/>
+        <specific value="9" description="Stegg" uuid="efd04c56-5269-11df-b11f-080069138b88" uid="18968"/>
+        <specific value="10" description="Falk" uuid="efd1584e-5269-11df-a6bc-080069138b88" uid="18969"/>
+        <specific value="11" description="Ravn" uuid="efd267c0-5269-11df-a67d-080069138b88" uid="18970"/>
+        <specific value="12" description="Gribb" uuid="efd376c4-5269-11df-9f2c-080069138b88" uid="18971"/>
+        <specific value="13" description="Geir" uuid="efd47f4c-5269-11df-ae01-080069138b88" uid="18972"/>
+        <specific value="14" description="Erle" uuid="efd59166-5269-11df-973f-080069138b88" uid="18973"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="efd7dde0-5269-11df-be19-080069138b88" uid="18974">
+      <subcategory value="1" description="Vidar Class" uuid="efd8f090-5269-11df-832e-080069138b88" uid="18975"/>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="efda9ee0-5269-11df-afb8-080069138b88" uid="18976">
+      <subcategory value="1" description="Oslo Class" uuid="efdbae84-5269-11df-9c5b-080069138b88" uid="18977"/>
+    </category>
+    <category value="61" description="Non-combatant Ship" uuid="efdd613e-5269-11df-bc76-080069138b88" uid="18978">
+      <subcategory value="1" description="Container Class" uuid="efde6fb6-5269-11df-8534-080069138b88" uid="18979">
+        <specific value="1" description="Amber Fin" uuid="efdf7c26-5269-11df-84cb-080069138b88" uid="18980"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="efe12ef4-5269-11df-bac5-080069138b88" uid="18981">
+        <specific value="1" description="Berge Sisar" uuid="efe23e52-5269-11df-adb6-080069138b88" uid="18982"/>
+        <specific value="2" description="Bow Century" uuid="efe34f90-5269-11df-9212-080069138b88" uid="18983"/>
+        <specific value="3" description="Hebris" uuid="efe4598a-5269-11df-b181-080069138b88" uid="18984"/>
+        <specific value="4" description="Norgas Energy" uuid="efe56c1c-5269-11df-8644-080069138b88" uid="18985"/>
+        <specific value="5" description="Sitalene" uuid="efe67bde-5269-11df-9cbd-080069138b88" uid="18986"/>
+        <specific value="6" description="Solviken" uuid="efe786fa-5269-11df-b64f-080069138b88" uid="18987"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="163" uuid="efea7ab8-5269-11df-b638-080069138b88" uid="18988">
+    <category value="5" description="SS(Conventional Attack-Torpedo Patrol)" uuid="efeb88ae-5269-11df-bc70-080069138b88" uid="18989">
+      <subcategory value="1" description="Modernized Kobben Class (type 207)" deprecated="1" uuid="efec962c-5269-11df-8e75-080069138b88" uid="18990">
+        <specific value="1" description="Sklinna" deprecated="1" uuid="efedb2e6-5269-11df-b4c8-080069138b88" uid="18991"/>
+        <specific value="2" description="Skolpen" deprecated="1" uuid="efeec2b2-5269-11df-988b-080069138b88" uid="18992"/>
+        <specific value="3" description="Stord" deprecated="1" uuid="efefd22e-5269-11df-bb59-080069138b88" uid="18993"/>
+        <specific value="4" description="Svenner" deprecated="1" uuid="eff0e29a-5269-11df-95a4-080069138b88" uid="18994"/>
+        <specific value="5" description="Kobben" deprecated="1" uuid="eff1f338-5269-11df-88aa-080069138b88" uid="18995"/>
+        <specific value="6" description="Kunna" deprecated="1" uuid="eff3000c-5269-11df-b939-080069138b88" uid="18996"/>
+      </subcategory>
+      <subcategory value="2" description="S300 Ula" uuid="eff4af2e-5269-11df-8667-080069138b88" uid="18997"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="198" status="new" uuid="d267a7a5-6cc2-4aa6-a9a2-f0af4b0261c3" uid="22787">
+    <cr value="1633"/>
+    <category value="1" description="Tank" status="new" uuid="10102615-cfca-4a7f-baa6-953f2f02f47d" uid="22788">
+      <cr value="1633"/>
+      <subcategory value="1" description="Leopard 2 MBT (variation)" status="new" uuid="fbdaf3c4-ed35-43cd-a823-5720af6bc46e" uid="22789">
+        <cr value="1633"/>
+        <specific value="1" description="Leopard 2E" status="new" uuid="1aee8af4-d77a-49d2-8b71-f022c19e4700" uid="22790">
+          <cr value="1633"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="198" uuid="eff70404-5269-11df-92e9-080069138b88" uid="18998">
+    <category value="4" description="Cargo/Tanker" uuid="eff80c32-5269-11df-bf8d-080069138b88" uid="18999">
+      <subcategory value="1" description="CASA C-212" uuid="eff91b90-5269-11df-8c6f-080069138b88" uid="19000"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="198" uuid="effb6c4c-5269-11df-a99c-080069138b88" uid="19001">
+    <category value="1" description="Carrier" uuid="effc7b1e-5269-11df-bb57-080069138b88" uid="19002">
+      <subcategory value="1" description="Principe De Asturias Class (CVS)" uuid="effd8dba-5269-11df-83a6-080069138b88" uid="19003">
+        <specific value="1" description="R11 Principe De Asturias" uuid="effe9e4e-5269-11df-b130-080069138b88" uid="19004"/>
+      </subcategory>
+    </category>
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f000ef6e-5269-11df-9dc1-080069138b88" uid="19005">
+      <subcategory value="1" description="Baleares Class" uuid="f0020052-5269-11df-85a6-080069138b88" uid="19006"/>
+      <subcategory value="2" description="Alvaro De Bazan Class (FFG)" uuid="f0030ace-5269-11df-897c-080069138b88" uid="19007">
+        <specific value="1" description="F101 Alvaro De Bazan" uuid="f00419be-5269-11df-8e73-080069138b88" uid="19008"/>
+      </subcategory>
+      <subcategory value="3" description="Santa Maria Class (FFG)" uuid="f005d254-5269-11df-a75c-080069138b88" uid="19009">
+        <specific value="1" description="F81 Santa Maria" uuid="f006e34c-5269-11df-8e21-080069138b88" uid="19010"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="f00935c0-5269-11df-a5a8-080069138b88" uid="19011">
+      <subcategory value="1" description="Barcelo Class" uuid="f00a447e-5269-11df-9188-080069138b88" uid="19012"/>
+      <subcategory value="2" description="Serviola Class" uuid="f00b4edc-5269-11df-b000-080069138b88" uid="19013">
+        <specific value="1" description="P71 Serviola" uuid="f00c6ad8-5269-11df-802a-080069138b88" uid="19014"/>
+      </subcategory>
+      <subcategory value="3" description="Conejera Class (Coastal Patrol)" uuid="f00e1a4a-5269-11df-a741-080069138b88" uid="19015">
+        <specific value="1" description="P31 Conejera" uuid="f00f2b38-5269-11df-9b18-080069138b88" uid="19016"/>
+      </subcategory>
+      <subcategory value="4" description="Anaga Class" uuid="f010da00-5269-11df-a17d-080069138b88" uid="19017">
+        <specific value="1" description="P21 Anaga" uuid="f011e8fa-5269-11df-81c5-080069138b88" uid="19018"/>
+      </subcategory>
+      <subcategory value="5" description="Toralla Class (Coastal Patrol Craft) ( PC)" uuid="f0139952-5269-11df-bdbb-080069138b88" uid="19019">
+        <specific value="1" description="P81 Tortalla" uuid="f014ab58-5269-11df-b5d9-080069138b88" uid="19020"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship" uuid="f016fdae-5269-11df-aeac-080069138b88" uid="19021">
+      <subcategory value="1" description="Segura Class (Minehunters) (MHC)" uuid="f0180f46-5269-11df-8606-080069138b88" uid="19022">
+        <specific value="1" description="M31 Segura" uuid="f0192084-5269-11df-9452-080069138b88" uid="19023"/>
+      </subcategory>
+      <subcategory value="2" description="Adjutant, Redwing and MSC 268 Class" uuid="f01ad140-5269-11df-86ae-080069138b88" uid="19024">
+        <specific value="1" description="M22 Ebro" uuid="f01be47c-5269-11df-ad0e-080069138b88" uid="19025"/>
+      </subcategory>
+    </category>
+    <category value="16" description="Auxiliry" uuid="f01e320e-5269-11df-a8b8-080069138b88" uid="19026">
+      <subcategory value="1" description="Patino Class (Fleet Logistic Tanker) (AOR)" uuid="f01f4450-5269-11df-968d-080069138b88" uid="19027">
+        <specific value="1" description="A14 Patino" uuid="f02050ac-5269-11df-b0ec-080069138b88" uid="19028"/>
+      </subcategory>
+      <subcategory value="2" description="Transport Ship (AP)" uuid="f021fe16-5269-11df-a6dd-080069138b88" uid="19029">
+        <specific value="1" description="A04 Martin Posadillo" uuid="f02310a8-5269-11df-967d-080069138b88" uid="19030"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="f0256132-5269-11df-9f46-080069138b88" uid="19031">
+      <subcategory value="1" description="Descubierto Class" uuid="f026743c-5269-11df-b3ad-080069138b88" uid="19032"/>
+    </category>
+    <category value="56" description="Amphibious Transport Dock" uuid="f02823ae-5269-11df-9b17-080069138b88" uid="19033">
+      <subcategory value="1" description="Galicia Class (LPD)" uuid="f02934ba-5269-11df-8dbb-080069138b88" uid="19034">
+        <specific value="1" description="L51 Galicia" uuid="f02a4a08-5269-11df-b156-080069138b88" uid="19035"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="206" uuid="f02d4294-5269-11df-913c-080069138b88" uid="19036">
+    <category value="5" description="Towed Artillery" uuid="f02e508a-5269-11df-b669-080069138b88" uid="19037">
+      <subcategory value="1" description="NORICUM GH N-45 155mm gun-howitzer" uuid="f02f5f98-5269-11df-9477-080069138b88" uid="19038"/>
+    </category>
+    <category value="28" description="Air Defense/Missile Defense Unit Equipment" uuid="f0311554-5269-11df-a183-080069138b88" uid="19039">
+      <subcategory value="1" description="Towed VSHORAD Gun/Missile System" uuid="f03226e2-5269-11df-a75f-080069138b88" uid="19040">
+        <specific value="1" description="Oerlikon-Contraves 35mm" uuid="f03332ee-5269-11df-8afa-080069138b88" uid="19041">
+          <extra value="1" description="GDF-Series Twin-35mm" uuid="f0344166-5269-11df-ac50-080069138b88" uid="19042"/>
+          <extra value="2" description="Skyshield 35 Revolver Gun Mount (RGM)" uuid="f03555f6-5269-11df-b511-080069138b88" uid="19043"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="206" uuid="f038ea90-5269-11df-b651-080069138b88" uid="19044">
+    <category value="4" description="Cargo / Tanker" uuid="f039f9bc-5269-11df-b05c-080069138b88" uid="19045">
+      <subcategory value="1" description="Pilatus PC-6" uuid="f03b02e4-5269-11df-b14f-080069138b88" uid="19046">
+        <specific value="1" description="Pilatus PC-6 Turbo Porter" uuid="f03c162a-5269-11df-999e-080069138b88" uid="19047"/>
+      </subcategory>
+    </category>
+    <category value="40" description="Trainer" uuid="f03e6420-5269-11df-ade1-080069138b88" uid="19048">
+      <subcategory value="1" description="Pilatus PC-7" uuid="f03f7626-5269-11df-8993-080069138b88" uid="19049">
+        <specific value="1" description="Pilatus PC-7 Turbo Trainer" uuid="f04084f8-5269-11df-9ae3-080069138b88" uid="19050"/>
+        <specific value="2" description="PC-7 Mk II" uuid="f0419046-5269-11df-a87e-080069138b88" uid="19051"/>
+      </subcategory>
+      <subcategory value="2" description="Pilatus PC-9" uuid="f0434364-5269-11df-85ff-080069138b88" uid="19052">
+        <specific value="1" description="Pilatus PC-9 Turbo Trainer" uuid="f044518c-5269-11df-b0c1-080069138b88" uid="19053"/>
+        <specific value="2" description="PC-9 Mk II" uuid="f0456c98-5269-11df-a822-080069138b88" uid="19054"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="210" uuid="f0486330-5269-11df-a1fb-080069138b88" uid="19055">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f0497d10-5269-11df-88ba-080069138b88" uid="19056">
+      <subcategory value="1" description="Naresuan Class" uuid="f04a9006-5269-11df-8ac2-080069138b88" uid="19057"/>
+      <subcategory value="2" description="Chao Phraya Class" uuid="f04ba1ee-5269-11df-93a3-080069138b88" uid="19058"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="218" uuid="f04def3a-5269-11df-90f6-080069138b88" uid="19059">
+    <category value="5" description="Destroyer (DD)" uuid="f04f01d6-5269-11df-9571-080069138b88" uid="19060">
+      <subcategory value="1" description="Mod Gearing Fram" uuid="f0500c70-5269-11df-86c1-080069138b88" uid="19061"/>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="f051bb56-5269-11df-8754-080069138b88" uid="19062">
+      <subcategory value="1" description="Dogan Class" uuid="f052c9e2-5269-11df-a8b0-080069138b88" uid="19063"/>
+    </category>
+    <category value="50" description="Frigate (including Corvette)" uuid="f0547e54-5269-11df-a48b-080069138b88" uid="19064">
+      <subcategory value="1" description="Yavuz" uuid="f0558dd0-5269-11df-bcaf-080069138b88" uid="19065"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="218" uuid="f057ddd8-5269-11df-8bcd-080069138b88" uid="19066">
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="f058ea98-5269-11df-9cc5-080069138b88" uid="19067">
+      <subcategory value="1" description="Modified Guppy III Class" uuid="f059fa96-5269-11df-9357-080069138b88" uid="19068"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="240" uuid="f05c4d32-5269-11df-90da-080069138b88" uid="19069">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f05d5a60-5269-11df-b87b-080069138b88" uid="19070">
+      <subcategory value="1" description="Split/Kotor" uuid="f05e690a-5269-11df-bdf9-080069138b88" uid="19071"/>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="f0601854-5269-11df-b0bc-080069138b88" uid="19072">
+      <subcategory value="1" description="Koncar Class" uuid="f0612a96-5269-11df-9c0d-080069138b88" uid="19073"/>
+      <subcategory value="2" description="Mirna Class Type 140 PCF" uuid="f0623526-5269-11df-a8bd-080069138b88" uid="19074">
+        <specific value="1" description="Ucka 174" uuid="f0634498-5269-11df-83f1-080069138b88" uid="19075"/>
+        <specific value="2" description="Grmec 175" uuid="f06455b8-5269-11df-a785-080069138b88" uid="19076"/>
+        <specific value="3" description="Gora 177" uuid="f065632c-5269-11df-83f8-080069138b88" uid="19077"/>
+        <specific value="4" description="Kosmaj 178" uuid="f06673d4-5269-11df-927e-080069138b88" uid="19078"/>
+        <specific value="5" description="Zelengora 179" uuid="f06781f2-5269-11df-936f-080069138b88" uid="19079"/>
+      </subcategory>
+      <subcategory value="3" description="Damen Class" uuid="f0693e0c-5269-11df-9f58-080069138b88" uid="19080"/>
+    </category>
+    <category value="8" description="Mine Countermeasure Ship/Craft" uuid="f06aec3e-5269-11df-bc9a-080069138b88" uid="19081">
+      <subcategory value="1" description="Silba Class (LCT)" uuid="f06bf7f0-5269-11df-a37e-080069138b88" uid="19082"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="f06da992-5269-11df-96f2-080069138b88" uid="19083">
+      <subcategory value="1" description="Spasilac Class (ASR)" uuid="f06eb800-5269-11df-b373-080069138b88" uid="19084"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="240" uuid="f07108d0-5269-11df-91a7-080069138b88" uid="19085">
+    <category value="5" description="SS (Conventional Attack-Torpedo, Patrol)" uuid="f0721702-5269-11df-92f8-080069138b88" uid="19086">
+      <subcategory value="1" description="Heroj Class" uuid="f07327c8-5269-11df-a088-080069138b88" uid="19087"/>
+      <subcategory value="2" description="Sava Class" uuid="f07438a2-5269-11df-93c5-080069138b88" uid="19088"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="197" uuid="f0768b02-5269-11df-b6ed-080069138b88" uid="19089">
+    <category value="1" description="Tank" uuid="f07798c6-5269-11df-9e40-080069138b88" uid="19090">
+      <subcategory value="1" description="Olifant" uuid="f078a630-5269-11df-9be5-080069138b88" uid="19091">
+        <specific value="1" description="Mk 1" uuid="f079b516-5269-11df-b167-080069138b88" uid="19092"/>
+        <specific value="2" description="Mk 2" uuid="f07ac578-5269-11df-94ef-080069138b88" uid="19093"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Armored Fighting Vehicle" uuid="f07d136e-5269-11df-8af6-080069138b88" uid="19094">
+      <subcategory value="1" description="Rooikat" uuid="f07e2254-5269-11df-b3f8-080069138b88" uid="19095">
+        <specific value="1" description="76 mm" uuid="f07f30fe-5269-11df-a958-080069138b88" uid="19096"/>
+      </subcategory>
+      <subcategory value="2" description="Ratel" uuid="f080e00c-5269-11df-9450-080069138b88" uid="19097">
+        <specific value="1" description="20 mm" uuid="f081efa6-5269-11df-962a-080069138b88" uid="19098"/>
+        <specific value="2" description="60 mm" uuid="f082feb4-5269-11df-87a6-080069138b88" uid="19099"/>
+        <specific value="3" description="90 mm" uuid="f0840cd2-5269-11df-a8d1-080069138b88" uid="19100"/>
+        <specific value="4" description="Ratel ZT-6 ATGM (Mokopa)" status="new" uuid="efd56657-dead-41e2-9596-c041ab4aae5a" uid="22819">
+          <cr value="1698"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="3" description="Armored Utility Vehicle" uuid="f08667d4-5269-11df-87ee-080069138b88" uid="19101">
+      <subcategory value="1" description="BLV" uuid="f087770a-5269-11df-adc3-080069138b88" uid="19102"/>
+    </category>
+    <category value="4" description="Self-propelled Artillery" uuid="f0892adc-5269-11df-bb2e-080069138b88" uid="19103">
+      <subcategory value="1" description="G6 155-mm Howitzer" uuid="f08a3828-5269-11df-bf39-080069138b88" uid="19104"/>
+    </category>
+    <category value="5" description="Towed Artillery" uuid="f08be81c-5269-11df-abb2-080069138b88" uid="19105">
+      <subcategory value="1" description="G5" uuid="f08cf75c-5269-11df-8460-080069138b88" uid="19106"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="197" uuid="f08f4818-5269-11df-aa0d-080069138b88" uid="19107">
+    <category value="1" description="Fighter / Air Defense" uuid="f09056f4-5269-11df-8329-080069138b88" uid="19108">
+      <subcategory value="1" description="Cheetah" uuid="f09166f2-5269-11df-84df-080069138b88" uid="19109">
+        <specific value="1" description="C" uuid="f092792a-5269-11df-bc91-080069138b88" uid="19110"/>
+        <specific value="2" description="D" uuid="f09380f4-5269-11df-b19f-080069138b88" uid="19111"/>
+      </subcategory>
+    </category>
+    <category value="20" description="Attack Helicopter" uuid="f095d8e0-5269-11df-bb57-080069138b88" uid="19112">
+      <subcategory value="1" description="Rooivalk" uuid="f096e2d0-5269-11df-a7f5-080069138b88" uid="19113"/>
+    </category>
+    <category value="50" description="Unmanned" uuid="f098909e-5269-11df-b895-080069138b88" uid="19114">
+      <subcategory value="1" description="RPV" uuid="f099a0ce-5269-11df-84b8-080069138b88" uid="19115">
+        <specific value="1" description="Seeker" uuid="f09aae92-5269-11df-8966-080069138b88" uid="19116"/>
+        <specific value="2" description="Vulture" uuid="f09bb8be-5269-11df-a5c7-080069138b88" uid="19117"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="56" status="new" uuid="b5fca155-afd2-47a6-b867-e6b756d5b235" uid="22828">
+    <cr value="2166"/>
+    <category value="4" description="Self-propelled Artillery - (guns and howitzers)" status="new" uuid="5a33af0a-d960-4d9a-a5bc-17d29e4feecf" uid="22829">
+      <cr value="2166"/>
+      <subcategory value="1" description="Tatra T815 8x8 SP Howitzer" status="new" uuid="ab04985e-de59-4568-887c-aaaa2acff72a" uid="22830">
+        <cr value="2166"/>
+        <specific value="1" description="ShKH-77 DANA 152 mm SP Howitzer" status="new" uuid="f9e8bb5a-a94f-4fc3-af5f-827477b98d00" uid="22831">
+          <cr value="2166"/>
+        </specific>
+        <specific value="2" description="ShKH-77 ZUZANA 155 mm SP Howitzer" status="new" uuid="790417ab-05ba-4c2a-90e5-46a95d4d6dea" uid="22832">
+          <cr value="2166"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="56" uuid="f09ebcda-5269-11df-896d-080069138b88" uid="19118">
+    <category value="1" description="Fighter / Air Defense" uuid="f09fcf62-5269-11df-a7b8-080069138b88" uid="19119">
+      <subcategory value="1" description="Aero L-159" uuid="f0a0d826-5269-11df-90a4-080069138b88" uid="19120"/>
+    </category>
+    <category value="2" description="Attack / Strike" uuid="f0a28766-5269-11df-9026-080069138b88" uid="19121">
+      <subcategory value="1" description="Aero L-39Z Albatros" uuid="f0a399d0-5269-11df-83fc-080069138b88" uid="19122">
+        <specific value="1" description="Aero L-39ZO" uuid="f0a4aae6-5269-11df-957c-080069138b88" uid="19123"/>
+        <specific value="2" description="Aero L-39ZA" uuid="f0a5bd5a-5269-11df-a5c0-080069138b88" uid="19124"/>
+      </subcategory>
+      <subcategory value="2" description="Aero L-59" uuid="f0a770e6-5269-11df-ac8b-080069138b88" uid="19125"/>
+    </category>
+    <category value="4" description="Cargo / Tanker" uuid="f0a91f2c-5269-11df-bb3b-080069138b88" uid="19126">
+      <subcategory value="1" description="Let L-410 Turbolet" uuid="f0aa2f16-5269-11df-b0fd-080069138b88" uid="19127"/>
+    </category>
+    <category value="40" description="Trainer" uuid="f0abe216-5269-11df-8a87-080069138b88" uid="19128">
+      <subcategory value="1" description="Zlin Z-142" uuid="f0acef76-5269-11df-b404-080069138b88" uid="19129"/>
+      <subcategory value="2" description="Aero L-29 Delphin" uuid="f0adf9f2-5269-11df-86de-080069138b88" uid="19130"/>
+      <subcategory value="3" description="Aero L-39C Albatros" uuid="f0af095a-5269-11df-8856-080069138b88" uid="19131"/>
+      <subcategory value="4" description="Aero L-59" uuid="f0b01e1c-5269-11df-b596-080069138b88" uid="19132"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="208" uuid="f0b26a82-5269-11df-833e-080069138b88" uid="19133">
+    <category value="4" description="Self-propelled Artillery" uuid="f0b37ba2-5269-11df-9945-080069138b88" uid="19134">
+      <subcategory value="1" description="Hsiung Feng I launcher" uuid="f0b48682-5269-11df-826a-080069138b88" uid="19135"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="2" country="208" uuid="f0b6db6c-5269-11df-8468-080069138b88" uid="19136">
+    <category value="1" description="Fighter/Air Defense" uuid="f0b7e840-5269-11df-aa40-080069138b88" uid="19137">
+      <subcategory value="1" description="Ching-kuo (IDF)" uuid="f0b8f97e-5269-11df-845c-080069138b88" uid="19138"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="208" uuid="f0bb48f0-5269-11df-965b-080069138b88" uid="19139">
+    <category value="6" description="Guided Missile Frigate (FFG)" uuid="f0bc5682-5269-11df-87e3-080069138b88" uid="19140">
+      <subcategory value="1" description="Cheng Kung Class (Kwang Hua Project)" uuid="f0bd6860-5269-11df-86f0-080069138b88" uid="19141">
+        <specific value="1" description="FFG 1101 Cheng Kung" uuid="f0be7d40-5269-11df-8bad-080069138b88" uid="19142"/>
+        <specific value="2" description="FFG 1103 Cheng Ho" uuid="f0bf86b8-5269-11df-8c82-080069138b88" uid="19143"/>
+        <specific value="3" description="FFG 1105 Chi Kuang" uuid="f0c09706-5269-11df-bbf8-080069138b88" uid="19144"/>
+        <specific value="4" description="FFG 1106 Yueh Fei" uuid="f0c1a812-5269-11df-939b-080069138b88" uid="19145"/>
+        <specific value="5" description="FFG 1107 Tzu-I" uuid="f0c2b6d0-5269-11df-92d0-080069138b88" uid="19146"/>
+        <specific value="6" description="FFG 1108 Pan Chao" uuid="f0c3cebc-5269-11df-a453-080069138b88" uid="19147"/>
+        <specific value="7" description="FFG 1109 Chang Chien" uuid="f0c4e0c2-5269-11df-868c-080069138b88" uid="19148"/>
+      </subcategory>
+      <subcategory value="2" description="Kang Ding (La Fayette) Class" uuid="f0c695fc-5269-11df-af09-080069138b88" uid="19149">
+        <specific value="1" description="FFG 1202 Kang Ding" uuid="f0c7a17c-5269-11df-b7b1-080069138b88" uid="19150"/>
+        <specific value="2" description="FFG 1203 Si Ning" uuid="f0c8b076-5269-11df-b8a7-080069138b88" uid="19151"/>
+        <specific value="3" description="FFG 1205 Kun Ming" uuid="f0c9c1e6-5269-11df-9946-080069138b88" uid="19152"/>
+        <specific value="4" description="FFG 1206 Di Hua" uuid="f0cad162-5269-11df-802d-080069138b88" uid="19153"/>
+        <specific value="5" description="FFG 1207 Wu Chang" uuid="f0cbe214-5269-11df-b99d-080069138b88" uid="19154"/>
+        <specific value="6" description="FFG 1208 Chen Te" uuid="f0ccf064-5269-11df-b4da-080069138b88" uid="19155"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Light/Patrol Craft" uuid="f0cf435a-5269-11df-ac22-080069138b88" uid="19156">
+      <subcategory value="1" description="Hai Ou Class" uuid="f0d05290-5269-11df-9b48-080069138b88" uid="19157">
+        <specific value="1" description="FABG 5" uuid="f0d15bea-5269-11df-b4c5-080069138b88" uid="19158"/>
+        <specific value="2" description="FABG 6" uuid="f0d26d14-5269-11df-88fc-080069138b88" uid="19159"/>
+        <specific value="3" description="FABG 7" uuid="f0d37d08-5269-11df-bb84-080069138b88" uid="19160"/>
+        <specific value="4" description="FABG 8" uuid="f0d4887e-5269-11df-bd3c-080069138b88" uid="19161"/>
+        <specific value="5" description="FABG 9" uuid="f0d59818-5269-11df-8352-080069138b88" uid="19162"/>
+        <specific value="6" description="FABG 10" uuid="f0d6a1f4-5269-11df-a662-080069138b88" uid="19163"/>
+        <specific value="7" description="FABG 11" uuid="f0d7c1c4-5269-11df-810b-080069138b88" uid="19164"/>
+        <specific value="8" description="FABG 12" uuid="f0d8d226-5269-11df-a82a-080069138b88" uid="19165"/>
+        <specific value="9" description="FABG 14" uuid="f0d9e238-5269-11df-b7e5-080069138b88" uid="19166"/>
+        <specific value="10" description="FABG 15" uuid="f0daf7fe-5269-11df-9249-080069138b88" uid="19167"/>
+        <specific value="11" description="FABG 16" uuid="f0dc1850-5269-11df-ae4a-080069138b88" uid="19168"/>
+        <specific value="12" description="FABG 17" uuid="f0dd3e56-5269-11df-909a-080069138b88" uid="19169"/>
+        <specific value="13" description="FABG 18" uuid="f0defa3e-5269-11df-895e-080069138b88" uid="19170"/>
+        <specific value="14" description="FABG 19" uuid="f0e006fe-5269-11df-99c4-080069138b88" uid="19171"/>
+        <specific value="15" description="FABG 20" uuid="f0e115a8-5269-11df-be16-080069138b88" uid="19172"/>
+        <specific value="16" description="FABG 21" uuid="f0e22e7a-5269-11df-8ec7-080069138b88" uid="19173"/>
+        <specific value="17" description="FABG 23" uuid="f0e33f04-5269-11df-a9e8-080069138b88" uid="19174"/>
+        <specific value="18" description="FABG 24" uuid="f0e44e80-5269-11df-9002-080069138b88" uid="19175"/>
+        <specific value="19" description="FABG 25" uuid="f0e55d52-5269-11df-8191-080069138b88" uid="19176"/>
+        <specific value="20" description="FABG 26" uuid="f0e66b02-5269-11df-b7a6-080069138b88" uid="19177"/>
+        <specific value="21" description="FABG 27" uuid="f0e779c0-5269-11df-b331-080069138b88" uid="19178"/>
+        <specific value="22" description="FABG 28" uuid="f0e88946-5269-11df-8e15-080069138b88" uid="19179"/>
+        <specific value="23" description="FABG 29" uuid="f0e990a2-5269-11df-b7b9-080069138b88" uid="19180"/>
+        <specific value="24" description="FABG 30" uuid="f0eaa140-5269-11df-be43-080069138b88" uid="19181"/>
+        <specific value="25" description="FABG 32" uuid="f0ebb4d6-5269-11df-b34f-080069138b88" uid="19182"/>
+        <specific value="26" description="FABG 33" uuid="f0ecbe30-5269-11df-a62d-080069138b88" uid="19183"/>
+        <specific value="27" description="FABG 34" uuid="f0edcd02-5269-11df-8c50-080069138b88" uid="19184"/>
+        <specific value="28" description="FABG 35" uuid="f0eedde6-5269-11df-81a5-080069138b88" uid="19185"/>
+        <specific value="29" description="FABG 36" uuid="f0efea88-5269-11df-911d-080069138b88" uid="19186"/>
+        <specific value="30" description="FABG 37" uuid="f0f0f7f2-5269-11df-b83b-080069138b88" uid="19187"/>
+        <specific value="31" description="FABG 38" uuid="f0f206f6-5269-11df-aa0b-080069138b88" uid="19188"/>
+        <specific value="32" description="FABG 39" uuid="f0f31122-5269-11df-af01-080069138b88" uid="19189"/>
+        <specific value="33" description="FABG 41" uuid="f0f42328-5269-11df-ae49-080069138b88" uid="19190"/>
+        <specific value="34" description="FABG 42" uuid="f0f5309c-5269-11df-b3fe-080069138b88" uid="19191"/>
+        <specific value="35" description="FABG 43" uuid="f0f639ec-5269-11df-85f3-080069138b88" uid="19192"/>
+        <specific value="36" description="FABG 44" uuid="f0f74ba2-5269-11df-9a99-080069138b88" uid="19193"/>
+        <specific value="37" description="FABG 45" uuid="f0f85a7e-5269-11df-9b02-080069138b88" uid="19194"/>
+        <specific value="38" description="FABG 46" uuid="f0f96248-5269-11df-8d1b-080069138b88" uid="19195"/>
+        <specific value="39" description="FABG 47" uuid="f0fa716a-5269-11df-bfc4-080069138b88" uid="19196"/>
+        <specific value="40" description="FABG 48" uuid="f0fb83d4-5269-11df-a364-080069138b88" uid="19197"/>
+        <specific value="41" description="FABG 49" uuid="f0fc8c16-5269-11df-816b-080069138b88" uid="19198"/>
+        <specific value="42" description="FABG 50" uuid="f0fd99b2-5269-11df-ac25-080069138b88" uid="19199"/>
+        <specific value="43" description="FABG 51" uuid="f0fea9c4-5269-11df-af4f-080069138b88" uid="19200"/>
+        <specific value="44" description="FABG 52" uuid="f0ffb3f0-5269-11df-add7-080069138b88" uid="19201"/>
+        <specific value="45" description="FABG 53" uuid="f100ca24-5269-11df-b46e-080069138b88" uid="19202"/>
+        <specific value="46" description="FABG 54" uuid="f101deaa-5269-11df-b656-080069138b88" uid="19203"/>
+        <specific value="47" description="FABG 55" uuid="f102e8ae-5269-11df-b2c1-080069138b88" uid="19204"/>
+        <specific value="48" description="FABG 56" uuid="f103f87a-5269-11df-8345-080069138b88" uid="19205"/>
+        <specific value="49" description="FABG 57" uuid="f10509d6-5269-11df-965c-080069138b88" uid="19206"/>
+        <specific value="50" description="FABG 58" uuid="f10612b8-5269-11df-9762-080069138b88" uid="19207"/>
+      </subcategory>
+      <subcategory value="2" description="Jin Chiang Class" uuid="f107c036-5269-11df-bc41-080069138b88" uid="19208">
+        <specific value="1" description="603 Jin Chiang" uuid="f108d34a-5269-11df-a714-080069138b88" uid="19209"/>
+      </subcategory>
+      <subcategory value="3" description="PCL Type" uuid="f10a801e-5269-11df-9a0f-080069138b88" uid="19210">
+        <specific value="1" description="1 PCL" uuid="f10b8ea0-5269-11df-b885-080069138b88" uid="19211"/>
+        <specific value="2" description="2 PCL" uuid="f10c9c32-5269-11df-9adf-080069138b88" uid="19212"/>
+        <specific value="3" description="3 PCL" uuid="f10da898-5269-11df-9002-080069138b88" uid="19213"/>
+        <specific value="4" description="5 PCL" uuid="f10eb6de-5269-11df-8c63-080069138b88" uid="19214"/>
+        <specific value="5" description="6 PCL" uuid="f10fc2ae-5269-11df-89e5-080069138b88" uid="19215"/>
+        <specific value="6" description="7 PCL" uuid="f110d19e-5269-11df-8fb6-080069138b88" uid="19216"/>
+        <specific value="7" description="8 PCL" uuid="f111e0f2-5269-11df-80c9-080069138b88" uid="19217"/>
+        <specific value="8" description="9 PCL" uuid="f112ea7e-5269-11df-999b-080069138b88" uid="19218"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Mine Coutermeasures Ship/Craft" uuid="f1153f4a-5269-11df-b11f-080069138b88" uid="19219">
+      <subcategory value="1" description="Yun Feng Class" uuid="f116499e-5269-11df-a64c-080069138b88" uid="19220">
+        <specific value="1" description="1301 Yung Feng" uuid="f1175a8c-5269-11df-954a-080069138b88" uid="19221"/>
+        <specific value="2" description="1302 Yung Chia" uuid="f11869e0-5269-11df-96ad-080069138b88" uid="19222"/>
+        <specific value="3" description="1303 Yung Nieng" uuid="f11973a8-5269-11df-9cf7-080069138b88" uid="19223"/>
+        <specific value="4" description="1305 Yung Shoen" uuid="f11a850e-5269-11df-bf39-080069138b88" uid="19224"/>
+      </subcategory>
+    </category>
+    <category value="56" description="Amphibious Transport Dock" uuid="f11cd0ac-5269-11df-acff-080069138b88" uid="19225">
+      <subcategory value="1" description="Tai Wu Class" uuid="f11de4ba-5269-11df-a215-080069138b88" uid="19226">
+        <specific value="1" description="518 Tai Wu" uuid="f11f0066-5269-11df-91b7-080069138b88" uid="19227"/>
+        <specific value="2" description="522 Ling Yuen" uuid="f12017ee-5269-11df-a66e-080069138b88" uid="19228"/>
+        <specific value="3" description="523 Wan An" uuid="f121218e-5269-11df-954c-080069138b88" uid="19229"/>
+      </subcategory>
+      <subcategory value="2" description="Wu Kang Class" uuid="f122d45c-5269-11df-8d26-080069138b88" uid="19230">
+        <specific value="1" description="524 Yuen Feng" uuid="f123e31a-5269-11df-9aba-080069138b88" uid="19231"/>
+        <specific value="2" description="525 Wu Kang" uuid="f124f390-5269-11df-aa48-080069138b88" uid="19232"/>
+        <specific value="3" description="526 Hsin Kang" uuid="f125fbbe-5269-11df-adb0-080069138b88" uid="19233"/>
+      </subcategory>
+    </category>
+    <category value="60" description="Fast Combat Support Ship" uuid="f128527e-5269-11df-aedc-080069138b88" uid="19234">
+      <subcategory value="1" description="Wu Yi Class" uuid="f1295cc8-5269-11df-a8d8-080069138b88" uid="19235">
+        <specific value="1" description="530 Wu Yi" uuid="f12a6c76-5269-11df-9ea9-080069138b88" uid="19236"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="4" country="208" uuid="f12d5d96-5269-11df-8a94-080069138b88" uid="19237">
+    <category value="5" description="SS (Conventional Attack-Torpedo Patrol)" uuid="f12e6bfa-5269-11df-a527-080069138b88" uid="19238">
+      <subcategory value="1" description="Hai Shih (ex. Guppy II)" uuid="f12f7bf8-5269-11df-9674-080069138b88" uid="19239">
+        <specific value="1" description="791 Hai Shih" uuid="f1308aa2-5269-11df-a50a-080069138b88" uid="19240"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="2" uuid="f1337d8e-5269-11df-bfb0-080069138b88" uid="19241">
+    <category value="61" description="Non-Combatant Ship" uuid="f1348a08-5269-11df-8395-080069138b88" uid="19242">
+      <subcategory value="1" description="Container Class" uuid="f1359452-5269-11df-ba85-080069138b88" uid="19243">
+        <specific value="1" description="Florida" uuid="f136b24c-5269-11df-9ac9-080069138b88" uid="19244"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="15" uuid="f139a682-5269-11df-939c-080069138b88" uid="19245">
+    <category value="61" description="Non-Combatant Ship" uuid="f13ab36a-5269-11df-afba-080069138b88" uid="19246">
+      <subcategory value="1" description="Container Class" uuid="f13bbdbe-5269-11df-8ab4-080069138b88" uid="19247">
+        <specific value="1" description="Chicago Express" uuid="f13cd05a-5269-11df-805b-080069138b88" uid="19248"/>
+        <specific value="2" description="Sea Leader" uuid="f13ddec8-5269-11df-8fb4-080069138b88" uid="19249"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="f13f96aa-5269-11df-91c2-080069138b88" uid="19250">
+        <specific value="1" description="Berge Hus" uuid="f140a4e6-5269-11df-9b44-080069138b88" uid="19251"/>
+        <specific value="2" description="Mosocean" uuid="f141b43a-5269-11df-9c97-080069138b88" uid="19252"/>
+        <specific value="3" description="Orient Tiger" uuid="f142c23a-5269-11df-be4a-080069138b88" uid="19253"/>
+        <specific value="4" description="Ramlah" uuid="f143cbc6-5269-11df-96ad-080069138b88" uid="19254"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="22" uuid="f146bdf4-5269-11df-bc41-080069138b88" uid="19255">
+    <category value="61" description="Non-Combatant Ship" uuid="f147cb68-5269-11df-bb17-080069138b88" uid="19256">
+      <subcategory value="1" description="Container Class" uuid="f148d45e-5269-11df-b748-080069138b88" uid="19257">
+        <specific value="1" description="Boka Star" uuid="f149e790-5269-11df-910e-080069138b88" uid="19258"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="24" uuid="f14cd982-5269-11df-b488-080069138b88" uid="19259">
+    <category value="61" description="Non-Combatant Ship" uuid="f14de7e6-5269-11df-aa2a-080069138b88" uid="19260">
+      <subcategory value="1" description="Container Class" uuid="f14ef096-5269-11df-aadc-080069138b88" uid="19261">
+        <specific value="1" description="Corner Brook" uuid="f15002ec-5269-11df-9998-080069138b88" uid="19262"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="55" uuid="f152f65a-5269-11df-8a2a-080069138b88" uid="19263">
+    <category value="61" description="Non-Combatant Ship" uuid="f1540428-5269-11df-817f-080069138b88" uid="19264">
+      <subcategory value="1" description="Container Class" uuid="f1550cc4-5269-11df-aaff-080069138b88" uid="19265">
+        <specific value="1" description="Yukon" uuid="f1561cfe-5269-11df-a5b8-080069138b88" uid="19266"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="f157ce14-5269-11df-a26c-080069138b88" uid="19267">
+        <specific value="1" description="Beltrade" uuid="f158dcaa-5269-11df-b83c-080069138b88" uid="19268"/>
+        <specific value="2" description="Fulmar" uuid="f159e51e-5269-11df-88d8-080069138b88" uid="19269"/>
+        <specific value="3" description="Messiniakos" uuid="f15af792-5269-11df-ac5f-080069138b88" uid="19270"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="1" country="82" status="new" uuid="4be1ddb6-d85b-41e6-bc27-5b732876d485" uid="22791">
+    <cr value="1633"/>
+    <category value="1" description="Tank" status="new" uuid="c8ad4788-8049-4cc3-807c-4a505ff763d4" uid="22792">
+      <cr value="1633"/>
+      <subcategory value="1" description="Leopard 2 MBT (variation)" status="new" uuid="b405af7b-7f23-4d00-b417-e7b934fb819a" uid="22793">
+        <cr value="1633"/>
+        <specific value="1" description="Leopard 2 A6 HEL" status="new" uuid="2f60b565-31f7-4bfa-a6a1-35e6c3ce521b" uid="22794">
+          <cr value="1633"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="82" uuid="f15df2da-5269-11df-8efc-080069138b88" uid="19271">
+    <category value="61" description="Non-Combatant Ship" uuid="f15f013e-5269-11df-a94e-080069138b88" uid="19272">
+      <subcategory value="1" description="Container Class" uuid="f1600ae8-5269-11df-b3d0-080069138b88" uid="19273">
+        <specific value="1" description="Daedalus" uuid="f1611afa-5269-11df-9420-080069138b88" uid="19274"/>
+        <specific value="2" description="Fedra" uuid="f1622cba-5269-11df-ab2a-080069138b88" uid="19275"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="f163d952-5269-11df-8d58-080069138b88" uid="19276">
+        <specific value="1" description="Althea" uuid="f164e086-5269-11df-a416-080069138b88" uid="19277"/>
+        <specific value="2" description="Olympic Loyalty" uuid="f165f188-5269-11df-9220-080069138b88" uid="19278"/>
+        <specific value="3" description="Peaceventure L" uuid="f16700d2-5269-11df-800f-080069138b88" uid="19279"/>
+      </subcategory>
+      <subcategory value="3" description="Supertanker" uuid="f168b076-5269-11df-a783-080069138b88" uid="19280">
+        <specific value="1" description="H. Alhambra" uuid="f169b8f4-5269-11df-bb8d-080069138b88" uid="19281"/>
+        <specific value="2" description="H. Metropolis" uuid="f16ac91a-5269-11df-bf01-080069138b88" uid="19282"/>
+        <specific value="3" description="H. Fairfax" uuid="f16bdc10-5269-11df-9971-080069138b88" uid="19283"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="125" uuid="f16ec7ea-5269-11df-b3a0-080069138b88" uid="19284">
+    <category value="61" description="Non-Combatant Ship" uuid="f16fd5e0-5269-11df-b700-080069138b88" uid="19285">
+      <subcategory value="1" description="Container Class" uuid="f170e976-5269-11df-a2eb-080069138b88" uid="19286">
+        <specific value="1" description="Jolly Orca" uuid="f171f550-5269-11df-818b-080069138b88" uid="19287"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="f173a3dc-5269-11df-a398-080069138b88" uid="19288">
+        <specific value="1" description="Almak" uuid="f174b088-5269-11df-9f58-080069138b88" uid="19289"/>
+        <specific value="2" description="Alphard Star" uuid="f175c36a-5269-11df-877e-080069138b88" uid="19290"/>
+        <specific value="3" description="Amber Lady" uuid="f176ccb0-5269-11df-b419-080069138b88" uid="19291"/>
+        <specific value="4" description="Front Chief" uuid="f177d9e8-5269-11df-a287-080069138b88" uid="19292"/>
+        <specific value="5" description="Ish" uuid="f178e9b4-5269-11df-8586-080069138b88" uid="19293"/>
+        <specific value="6" description="Khannur" uuid="f179f642-5269-11df-b629-080069138b88" uid="19294"/>
+        <specific value="7" description="Kuban" uuid="f17b0456-5269-11df-b9c3-080069138b88" uid="19295"/>
+        <specific value="8" description="New Vitality" uuid="f17c1896-5269-11df-8b51-080069138b88" uid="19296"/>
+        <specific value="9" description="Ocean Guardian" uuid="f17d24ac-5269-11df-86d9-080069138b88" uid="19297"/>
+        <specific value="10" description="Polaris Star" uuid="f17e389c-5269-11df-9ec8-080069138b88" uid="19298"/>
+        <specific value="11" description="Shahamah" uuid="f17f4804-5269-11df-95b5-080069138b88" uid="19299"/>
+        <specific value="12" description="Tarquin Navigator" uuid="f18052d0-5269-11df-b4fb-080069138b88" uid="19300"/>
+        <specific value="13" description="Igloo Star" uuid="f18165a8-5269-11df-ad00-080069138b88" uid="19301"/>
+        <specific value="14" description="SC Breeze" uuid="f18274de-5269-11df-b381-080069138b88" uid="19302"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="168" uuid="f1855ff0-5269-11df-b409-080069138b88" uid="19303">
+    <category value="61" description="Non-Combatant Ship" uuid="f186707a-5269-11df-aab1-080069138b88" uid="19304">
+      <subcategory value="1" description="Container Class" uuid="f187806e-5269-11df-a114-080069138b88" uid="19305">
+        <specific value="1" description="Pollux" uuid="f1888f54-5269-11df-b956-080069138b88" uid="19306"/>
+        <specific value="2" description="Sima Roja" uuid="f18999a8-5269-11df-97a4-080069138b88" uid="19307"/>
+        <specific value="3" description="Stellar Might" uuid="f18aa7b2-5269-11df-b1a0-080069138b88" uid="19308"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="f18c5af8-5269-11df-9fdb-080069138b88" uid="19309">
+        <specific value="1" description="Navix Astral" uuid="f18d6984-5269-11df-9ef9-080069138b88" uid="19310"/>
+        <specific value="2" description="Oriental Daisy" uuid="f18e720c-5269-11df-ac32-080069138b88" uid="19311"/>
+        <specific value="3" description="Pacific Lagoon" uuid="f18f8624-5269-11df-aa1d-080069138b88" uid="19312"/>
+        <specific value="4" description="World Princess" uuid="f1909546-5269-11df-a53d-080069138b88" uid="19313"/>
+        <specific value="5" description="Nereo" uuid="f1919eaa-5269-11df-8215-080069138b88" uid="19314"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="173" uuid="f1949092-5269-11df-8652-080069138b88" uid="19315">
+    <category value="61" description="Non-Combatant Ship" uuid="f1959c94-5269-11df-984c-080069138b88" uid="19316">
+      <subcategory value="1" description="Container Class" uuid="f196aa26-5269-11df-84f7-080069138b88" uid="19317">
+        <specific value="1" description="Endeavour" uuid="f197b948-5269-11df-a790-080069138b88" uid="19318"/>
+        <specific value="2" description="General Villa" uuid="f198c7a2-5269-11df-b855-080069138b88" uid="19319"/>
+        <specific value="3" description="Handy Gunner" uuid="f199d41c-5269-11df-a11e-080069138b88" uid="19320"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="193" uuid="f19ccc76-5269-11df-8e6f-080069138b88" uid="19321">
+    <category value="61" description="Non-Combatant Ship" uuid="f19dde5e-5269-11df-a7f6-080069138b88" uid="19322">
+      <subcategory value="1" description="Container Class" uuid="f19ee7fe-5269-11df-9a18-080069138b88" uid="19323">
+        <specific value="1" description="Neptune Pearl" uuid="f19ff7f2-5269-11df-9f04-080069138b88" uid="19324"/>
+      </subcategory>
+      <subcategory value="2" description="Tanker Class" uuid="f1a1a85e-5269-11df-af0b-080069138b88" uid="19325">
+        <specific value="1" description="Argo Pallas" uuid="f1a2ba1e-5269-11df-a1d2-080069138b88" uid="19326"/>
+        <specific value="2" description="Evelyn Maersk" uuid="f1a3c2f6-5269-11df-9bcb-080069138b88" uid="19327"/>
+        <specific value="3" description="Jront Highness" uuid="f1a4d330-5269-11df-83d9-080069138b88" uid="19328"/>
+        <specific value="4" description="Pacific Harmony" uuid="f1a5e66c-5269-11df-8f1d-080069138b88" uid="19329"/>
+        <specific value="5" description="Fidelity" uuid="f1a6f020-5269-11df-acea-080069138b88" uid="19330"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="249" uuid="f1a9e1d6-5269-11df-9a76-080069138b88" uid="19331">
+    <category value="7" description="Light/Patrol Craft" uuid="f1aaf0bc-5269-11df-9c2c-080069138b88" uid="19332">
+      <subcategory value="1" description="Koncar (Type R-02) Class (Fast Attack Craft-Missile) (PCFG)" uuid="f1abfbc4-5269-11df-9f2b-080069138b88" uid="19333">
+        <specific value="1" description="RTOP 21 Sibenik" uuid="f1ad1158-5269-11df-a62d-080069138b88" uid="19334"/>
+      </subcategory>
+    </category>
+    <category value="50" description="Frigate (including Corvettes)" uuid="f1af5dc8-5269-11df-9e76-080069138b88" uid="19335">
+      <subcategory value="1" description="Kralj (Type R-03) Class (FSG)" uuid="f1b07190-5269-11df-afdd-080069138b88" uid="19336">
+        <specific value="1" description="RTOP 11 Kralj Petar Kresimir IV" uuid="f1b182d8-5269-11df-afcd-080069138b88" uid="19337"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="165" uuid="f1b477b8-5269-11df-9e93-080069138b88" uid="19338">
+    <category value="7" description="Light/Patrol Craft" uuid="f1b58694-5269-11df-9dc6-080069138b88" uid="19339">
+      <subcategory value="1" description="Town Class (Large Patrol Craft) (PC)" uuid="f1b69016-5269-11df-b864-080069138b88" uid="19340"/>
+      <subcategory value="2" description="Larkana Class (Large Patrol Class) (PC)" uuid="f1b7a3f2-5269-11df-b877-080069138b88" uid="19341"/>
+      <subcategory value="3" description="Barkat Class" uuid="f1b8ba58-5269-11df-bd37-080069138b88" uid="19342"/>
+    </category>
+    <category value="16" description="Auxiliary" uuid="f1ba71c2-5269-11df-a653-080069138b88" uid="19343">
+      <subcategory value="1" description="Fuqing Class (AOR)" uuid="f1bb7a90-5269-11df-bf9b-080069138b88" uid="19344">
+        <specific value="1" description="A47 Nasr" uuid="f1bc8c14-5269-11df-b9ce-080069138b88" uid="19345"/>
+      </subcategory>
+      <subcategory value="2" description="Coastal Tankers (AOTL)" uuid="f1be4040-5269-11df-9c56-080069138b88" uid="19346">
+        <specific value="1" description="A49 Gwadar" uuid="f1bf4f44-5269-11df-b28c-080069138b88" uid="19347"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="29" uuid="f1c23f7e-5269-11df-83d8-080069138b88" uid="19348">
+    <category value="4" description="Self-propelled Artillery" uuid="f1c34d6a-5269-11df-a477-080069138b88" uid="19349">
+      <subcategory value="1" description="Launcher ASTROS AV-LMU" uuid="f1c45ea8-5269-11df-8144-080069138b88" uid="19350"/>
+    </category>
+    <category value="7" description="Large Wheeled Utility Vehicle" uuid="f1c60f50-5269-11df-8081-080069138b88" uid="19351">
+      <subcategory value="1" description="Tectran Enginharia" uuid="f1c721d8-5269-11df-a538-080069138b88" uid="19352">
+        <specific value="1" description="ASTROS Resupply AV-RMD" uuid="f1c82c7c-5269-11df-9091-080069138b88" uid="19353"/>
+      </subcategory>
+    </category>
+    <category value="37" description="Fire Control Facility" uuid="f1ca81ca-5269-11df-88aa-080069138b88" uid="19354">
+      <subcategory value="1" description="ASTROS Fire Control Vehicle AV-VCC" uuid="f1cb8e62-5269-11df-bdd5-080069138b88" uid="19355"/>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="176" uuid="f1cde414-5269-11df-a3bb-080069138b88" uid="19356">
+    <category value="61" description="PRT Non-Combatant Ship" uuid="f1cef7f0-5269-11df-97d4-080069138b88" uid="19357">
+      <subcategory value="1" description="PRT Ship Container Class" uuid="f1d009e2-5269-11df-8562-080069138b88" uid="19358"/>
+      <subcategory value="2" description="PRT Ship Tanker Class" uuid="f1d11d78-5269-11df-9e9b-080069138b88" uid="19359"/>
+      <subcategory value="3" description="PRT Ship Commercial Large (&gt; 30m)" uuid="f1d22786-5269-11df-b9d2-080069138b88" uid="19360"/>
+      <subcategory value="4" description="PRT Boat Commercial Medium (10m to 29m)" uuid="f1d33aea-5269-11df-be9e-080069138b88" uid="19361"/>
+      <subcategory value="5" description="PRT Boat Commercial Small (&lt;10m)" uuid="f1d44e76-5269-11df-86f6-080069138b88" uid="19362"/>
+      <subcategory value="6" description="PRT Sailboat Commercial Two-Mast" uuid="f1d55b0e-5269-11df-971d-080069138b88" uid="19363"/>
+      <subcategory value="7" description="PRT Sailboat Commercial One-Mast" uuid="f1d66b20-5269-11df-b770-080069138b88" uid="19364"/>
+      <subcategory value="9" description="PRT Boat Private Very Small (&lt; 3m)" uuid="f1d78122-5269-11df-9082-080069138b88" uid="19365">
+        <specific value="1" description="PRT Boat Private Very Small Outboard" uuid="f1d894c2-5269-11df-be7e-080069138b88" uid="19366"/>
+        <specific value="2" description="PRT Boat Private Very Small Inboard" uuid="f1d9a84e-5269-11df-baf8-080069138b88" uid="19367"/>
+      </subcategory>
+      <subcategory value="10" description="PRT Boat Private Small (3m to 5m)" uuid="f1db5cb6-5269-11df-b523-080069138b88" uid="19368">
+        <specific value="1" description="PRT Boat Private Very Small Outboard" uuid="f1dc6b74-5269-11df-9a09-080069138b88" uid="19369"/>
+        <specific value="2" description="PRT Boat Private Very Small Inboard" uuid="f1dd79ba-5269-11df-979b-080069138b88" uid="19370"/>
+      </subcategory>
+      <subcategory value="11" description="PRT Boat Private Medium (6m to 10m)" uuid="f1df2e68-5269-11df-bdd4-080069138b88" uid="19371">
+        <specific value="1" description="PRT Boat Private Medium Motor Yacht" uuid="f1e03f10-5269-11df-aace-080069138b88" uid="19372"/>
+      </subcategory>
+      <subcategory value="12" description="PRT Boat Private Large (11m to 15m)" uuid="f1e1f3c8-5269-11df-a1e9-080069138b88" uid="19373">
+        <specific value="1" description="PRT Boat Private Large Yacht" uuid="f1e30498-5269-11df-99b7-080069138b88" uid="19374"/>
+      </subcategory>
+      <subcategory value="13" description="PRT Boat Private Very Large (&gt; 15m)" uuid="f1e4b45a-5269-11df-a115-080069138b88" uid="19375">
+        <specific value="1" description="PRT Boat Private Very Large Yacht" uuid="f1e5c368-5269-11df-acae-080069138b88" uid="19376"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="1" domain="3" country="0" uuid="f1e8b32a-5269-11df-bc86-080069138b88" uid="19377">
+    <category value="61" description="Non-Combatant Ship" uuid="f1e9c4cc-5269-11df-a225-080069138b88" uid="19378">
+      <subcategory value="1" description="Generic Ship Container Class" uuid="f1eacf20-5269-11df-a845-080069138b88" uid="19379"/>
+      <subcategory value="2" description="Generic Ship Tanker Class" uuid="f1ebdfaa-5269-11df-8dab-080069138b88" uid="19380"/>
+      <subcategory value="3" description="Generic Ship Commercial Large (&gt; 30m)" uuid="f1ecf41c-5269-11df-8641-080069138b88" uid="19381"/>
+      <subcategory value="4" description="Generic Boat Commercial Medium (10m to 29m)" uuid="f1ee05a0-5269-11df-950c-080069138b88" uid="19382"/>
+      <subcategory value="5" description="Generic Boat Commercial Small (&lt;10m)" uuid="f1ef18e6-5269-11df-b90f-080069138b88" uid="19383"/>
+      <subcategory value="6" description="Generic Sailboat Commercial Two-Mast" uuid="f1f02bdc-5269-11df-8f7e-080069138b88" uid="19384"/>
+      <subcategory value="7" description="Generic Sailboat Commercial One-Mast" uuid="f1f1378e-5269-11df-bcb8-080069138b88" uid="19385"/>
+      <subcategory value="9" description="Generic Boat Private Very Small (&lt; 3m)" uuid="f1f24b1a-5269-11df-827e-080069138b88" uid="19386">
+        <specific value="1" description="Generic Boat Private Very Small Outboard" uuid="f1f361a8-5269-11df-b027-080069138b88" uid="19387"/>
+        <specific value="2" description="Generic Boat Private Very Small Inboard" uuid="f1f46d46-5269-11df-b28c-080069138b88" uid="19388"/>
+      </subcategory>
+      <subcategory value="10" description="Generic Boat Private Small (3m to 5m)" uuid="f1f61ba0-5269-11df-989f-080069138b88" uid="19389">
+        <specific value="1" description="Generic Boat Private Very Small Outboard" uuid="f1f7367a-5269-11df-a639-080069138b88" uid="19390"/>
+        <specific value="2" description="Generic Boat Private Very Small Inboard" uuid="f1f84d26-5269-11df-b0b6-080069138b88" uid="19391"/>
+      </subcategory>
+      <subcategory value="11" description="Generic Boat Private Medium (6m to 10m)" uuid="f1f9fd7e-5269-11df-9017-080069138b88" uid="19392">
+        <specific value="1" description="Generic Boat Private Medium Motor Yacht" uuid="f1fb08d6-5269-11df-bd51-080069138b88" uid="19393"/>
+      </subcategory>
+      <subcategory value="12" description="Generic Boat Private Large (11m to 15m)" uuid="f1fcbd16-5269-11df-a9b1-080069138b88" uid="19394">
+        <specific value="1" description="Generic Boat Private Large Yacht" uuid="f1fdcec2-5269-11df-a7fa-080069138b88" uid="19395"/>
+      </subcategory>
+      <subcategory value="13" description="Generic Boat Private Very Large (&gt; 15m)" uuid="f1ff8064-5269-11df-bacc-080069138b88" uid="19396">
+        <specific value="1" description="Generic Boat Private Very Large Yacht" uuid="f2009364-5269-11df-8f24-080069138b88" uid="19397"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="0" country="225" uuid="f203810a-5269-11df-9517-080069138b88" uid="19398">
+    <category value="1" description="Guided" uuid="f2048f0a-5269-11df-a488-080069138b88" uid="19399">
+      <subcategory value="1" description="Deadeye 5-in. projectile" uuid="f2059ddc-5269-11df-955a-080069138b88" uid="19400"/>
+    </category>
+    <category value="3" description="Fixed" uuid="f2074f1a-5269-11df-b367-080069138b88" uid="19401">
+      <subcategory value="1" description="Mine-clearing torpedo, Bangalore" uuid="f2085c34-5269-11df-9f9b-080069138b88" uid="19402">
+        <specific value="1" description="M1A1" uuid="f209680e-5269-11df-9dec-080069138b88" uid="19403"/>
+        <specific value="2" description="M1A2" uuid="f20a76ae-5269-11df-833d-080069138b88" uid="19404"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="225" uuid="f20d6ada-5269-11df-910e-080069138b88" uid="19405">
+    <category value="1" description="Guided" uuid="f20e76dc-5269-11df-bf89-080069138b88" uid="19406">
+      <subcategory value="1" description="AIM-9 Sidewinder" uuid="f20f839c-5269-11df-9cbd-080069138b88" uid="19407">
+        <specific value="1" description="AIM-9B" uuid="f210923c-5269-11df-9e8a-080069138b88" uid="19408"/>
+        <specific value="2" description="AIM-9D" uuid="f211a046-5269-11df-8e91-080069138b88" uid="19409"/>
+        <specific value="3" description="AIM-9L/M/S" uuid="f212ad24-5269-11df-8f66-080069138b88" uid="19410">
+          <extra value="1" description="AIM-9L" uuid="f213bad4-5269-11df-bedd-080069138b88" uid="19411"/>
+          <extra value="2" description="AIM-9M" uuid="f214cc3a-5269-11df-9053-080069138b88" uid="19412"/>
+          <extra value="3" description="AIM-9M-7" uuid="f215db16-5269-11df-857d-080069138b88" uid="19413"/>
+          <extra value="4" description="AIM-9S" uuid="f216ece0-5269-11df-bc3c-080069138b88" uid="19414"/>
+        </specific>
+        <specific value="4" description="AIM-9P" uuid="f2189e6e-5269-11df-8100-080069138b88" uid="19415"/>
+        <specific value="5" description="AIM-9R" uuid="f219aca0-5269-11df-9869-080069138b88" uid="19416"/>
+        <specific value="6" description="AIM-9X" uuid="f21ab4a6-5269-11df-90d9-080069138b88" uid="19417"/>
+        <specific value="7" description="AIM-9J" uuid="f21bc67a-5269-11df-a5fd-080069138b88" uid="19418"/>
+      </subcategory>
+      <subcategory value="2" description="AIM-120 Advanced Medium-Range Air-to-Air Missile (AMRAAM)" uuid="f21d7a56-5269-11df-9297-080069138b88" uid="19419">
+        <specific value="1" description="AIM-120A" uuid="f21e8bc6-5269-11df-8297-080069138b88" uid="19420"/>
+        <specific value="2" description="AIM-120B" uuid="f21f94e4-5269-11df-a8c2-080069138b88" uid="19421"/>
+        <specific value="3" description="AIM-120C" uuid="f220a53c-5269-11df-be2f-080069138b88" uid="19422"/>
+      </subcategory>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f222577e-5269-11df-8878-080069138b88" uid="19423"/>
+      <subcategory value="4" description="Falcon" uuid="f223679a-5269-11df-aef1-080069138b88" uid="19424">
+        <specific value="1" description="AIM-4D" uuid="f2246e9c-5269-11df-9d30-080069138b88" uid="19425"/>
+        <specific value="2" description="AIM-4F" uuid="f2257db4-5269-11df-8dce-080069138b88" uid="19426"/>
+        <specific value="3" description="AIM-4G" uuid="f2268f9c-5269-11df-991d-080069138b88" uid="19427"/>
+        <specific value="4" description="AIM-26" uuid="f2279ec8-5269-11df-b684-080069138b88" uid="19428"/>
+        <specific value="5" description="AIM-26B" uuid="f228b07e-5269-11df-a79d-080069138b88" uid="19429"/>
+      </subcategory>
+      <subcategory value="5" description="MIM-72 Chaparral" uuid="f22a62b6-5269-11df-8f97-080069138b88" uid="19430"/>
+      <subcategory value="6" description="MIM-23 Hawk C/E/F/G/H" uuid="f22b76ce-5269-11df-81a0-080069138b88" uid="19431">
+        <specific value="1" description="MIM-23B I-Hawk" uuid="f22c8190-5269-11df-92df-080069138b88" uid="19432"/>
+        <specific value="2" description="Hawk PIP" uuid="f22d91a2-5269-11df-836f-080069138b88" uid="19433"/>
+      </subcategory>
+      <subcategory value="7" description="MLMS" uuid="f22f4466-5269-11df-baa0-080069138b88" uid="19434"/>
+      <subcategory value="8" description="AIM-54 Phoenix" uuid="f2305716-5269-11df-ab6a-080069138b88" uid="19435">
+        <specific value="1" description="AIM-54A" uuid="f23160b6-5269-11df-aa3f-080069138b88" uid="19436"/>
+        <specific value="2" description="AIM-54C" uuid="f232706e-5269-11df-a319-080069138b88" uid="19437"/>
+      </subcategory>
+      <subcategory value="9" description="Rapier UK" uuid="f234218e-5269-11df-95ee-080069138b88" uid="19438"/>
+      <subcategory value="10" description="FIM-43 Redeye" uuid="f2353f42-5269-11df-b270-080069138b88" uid="19439"/>
+      <subcategory value="11" description="Roland" uuid="f23649fa-5269-11df-8c39-080069138b88" uid="19440"/>
+      <subcategory value="12" description="Sea Sparrow" uuid="f2375a84-5269-11df-91e9-080069138b88" uid="19441">
+        <specific value="1" description="RIM-7H" uuid="f2386d16-5269-11df-84a2-080069138b88" uid="19442"/>
+        <specific value="2" description="Evolved Sea Sparrow Missile (ESSM)" uuid="f2397ad0-5269-11df-a7a1-080069138b88" uid="19443">
+          <extra value="1" description="RIM-162A" uuid="f23a8ae2-5269-11df-af9c-080069138b88" uid="19444"/>
+          <extra value="2" description="RIM-162B" uuid="f23b9d74-5269-11df-8345-080069138b88" uid="19445"/>
+          <extra value="3" description="RIM-162C" uuid="f23ca908-5269-11df-aec8-080069138b88" uid="19446"/>
+          <extra value="4" description="RIM-162D" uuid="f23dbaaa-5269-11df-b07b-080069138b88" uid="19447"/>
+        </specific>
+      </subcategory>
+      <subcategory value="13" description="Sparrow" uuid="f24008aa-5269-11df-a465-080069138b88" uid="19448">
+        <specific value="1" description="AIM-7F" uuid="f2411ba0-5269-11df-99f0-080069138b88" uid="19449"/>
+        <specific value="2" description="AIM-7M" uuid="f2422bb2-5269-11df-9328-080069138b88" uid="19450"/>
+        <specific value="3" description="AIM-7P" uuid="f2433dfe-5269-11df-80e4-080069138b88" uid="19451"/>
+        <specific value="4" description="AIM-7R (multimode seeker)" uuid="f24446fe-5269-11df-b3f0-080069138b88" uid="19452"/>
+        <specific value="5" description="AIM-7MH" uuid="f2455a9e-5269-11df-a9ea-080069138b88" uid="19453"/>
+      </subcategory>
+      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="f2470bc8-5269-11df-8cbd-080069138b88" uid="19454"/>
+      <subcategory value="15" description="Stinger" uuid="f2481d4c-5269-11df-b424-080069138b88" uid="19455">
+        <specific value="1" description="FIM-92 Stinger A/B/C" uuid="f2492688-5269-11df-bf89-080069138b88" uid="19456"/>
+        <specific value="2" description="Stinger Post" uuid="f24a3ac8-5269-11df-9389-080069138b88" uid="19457"/>
+        <specific value="3" description="Stinger RMP" uuid="f24b4b0c-5269-11df-a4af-080069138b88" uid="19458"/>
+        <specific value="4" description="Stinger ATAS" uuid="f24c561e-5269-11df-a54a-080069138b88" uid="19459"/>
+      </subcategory>
+      <subcategory value="16" description="MIM-104 Patriot" uuid="f24e0aa4-5269-11df-a7fa-080069138b88" uid="19460">
+        <specific value="1" description="PAC-2" uuid="f24f1a7a-5269-11df-8da8-080069138b88" uid="19461">
+          <extra value="1" description="Standard" uuid="f25028e8-5269-11df-a058-080069138b88" uid="19462"/>
+          <extra value="2" description="GEM" uuid="f251349a-5269-11df-8be5-080069138b88" uid="19463"/>
+        </specific>
+        <specific value="2" description="PAC-3 (ERINT)" uuid="f252e5c4-5269-11df-b84e-080069138b88" uid="19464"/>
+      </subcategory>
+      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="f254a170-5269-11df-a8db-080069138b88" uid="19465"/>
+      <subcategory value="18" description="(deprecated)" deprecated="1" uuid="f255b42a-5269-11df-b56c-080069138b88" uid="19466"/>
+      <subcategory value="19" description="ADATS" uuid="f256c798-5269-11df-865c-080069138b88" uid="19467"/>
+      <subcategory value="20" description="MIM-14B Nike-Hercules" uuid="f257dade-5269-11df-921e-080069138b88" uid="19468"/>
+      <subcategory value="21" description="Theater High-Altitude Area Defense (THAAD)" uuid="f258e730-5269-11df-8b31-080069138b88" uid="19469"/>
+      <subcategory value="22" description="LTV Extended Range Interceptor (ERINT)" deprecated="1" uuid="f259fb52-5269-11df-bf84-080069138b88" uid="19470"/>
+      <subcategory value="23" description="(deprecated)" deprecated="1" uuid="f25b1578-5269-11df-8848-080069138b88" uid="19471"/>
+      <subcategory value="24" description="(deprecated)" deprecated="1" uuid="f25c21ca-5269-11df-9abf-080069138b88" uid="19472"/>
+      <subcategory value="25" description="(deprecated)" deprecated="1" uuid="f25d3330-5269-11df-a44f-080069138b88" uid="19473"/>
+      <subcategory value="26" description="(deprecated)" deprecated="1" uuid="f25e45ea-5269-11df-846a-080069138b88" uid="19474"/>
+      <subcategory value="27" description="Standard Missile" uuid="f25f56ce-5269-11df-9b3e-080069138b88" uid="19475">
+        <specific value="1" description="Standard MR (RIM-66)" uuid="f260660e-5269-11df-b70a-080069138b88" uid="19476">
+          <extra value="1" description="SM-1 Block 5 MR" uuid="f2617710-5269-11df-a1ea-080069138b88" uid="19477"/>
+          <extra value="2" description="SM-1 Block 6B" uuid="f26283d0-5269-11df-bbb3-080069138b88" uid="19478"/>
+          <extra value="3" description="SM-2 Block 2 MR" uuid="f26394d2-5269-11df-996b-080069138b88" uid="19479"/>
+          <extra value="4" description="SM-2 Block 3 MR" uuid="f264a368-5269-11df-bf08-080069138b88" uid="19480"/>
+          <extra value="5" description="SM-2 Block 3A MR" uuid="f265ae52-5269-11df-aee4-080069138b88" uid="19481"/>
+          <extra value="6" description="SM-2 Block 3B" uuid="f266c2b0-5269-11df-be98-080069138b88" uid="19482"/>
+          <extra value="7" description="SM-2 Block 4" deprecated="1" uuid="f267d1dc-5269-11df-bc34-080069138b88" uid="19483"/>
+          <extra value="8" description="SM-2 Block 6 MR" uuid="f268dc3a-5269-11df-b54d-080069138b88" uid="19484"/>
+          <extra value="9" description="SM-2 Block 4A" deprecated="1" uuid="f269ee2c-5269-11df-935b-080069138b88" uid="19485"/>
+        </specific>
+        <specific value="2" description="Standard ER (RIM-67)" uuid="f26ba17c-5269-11df-99b7-080069138b88" uid="19486">
+          <extra value="1" description="SM-2 Block 4" uuid="f26cb134-5269-11df-8dac-080069138b88" uid="19487"/>
+          <extra value="2" description="SM-2 Block 4A" uuid="f26dbab6-5269-11df-8874-080069138b88" uid="19488"/>
+        </specific>
+        <specific value="3" description="Standard BMD (RIM-61)" uuid="f26f6cf8-5269-11df-a888-080069138b88" uid="19489">
+          <extra value="1" description="SM-3 Boost Phase Vehicle" uuid="f2707d50-5269-11df-8127-080069138b88" uid="19490"/>
+          <extra value="2" description="SM-3 Second Stage Vehicle" uuid="f2718e98-5269-11df-92d7-080069138b88" uid="19491"/>
+          <extra value="3" description="SM-3 Third Stage Vehicle" uuid="f272a4fe-5269-11df-9b2b-080069138b88" uid="19492"/>
+          <extra value="4" description="SM-3 Separated Kill Vehicle (KV)" uuid="f273b61e-5269-11df-ac70-080069138b88" uid="19493"/>
+          <extra value="5" description="SM-3 Jettisoned first stage" uuid="f274c7fc-5269-11df-963c-080069138b88" uid="19494"/>
+          <extra value="6" description="SM-3 Jettisoned second stage" uuid="f275d5c0-5269-11df-8dfa-080069138b88" uid="19495"/>
+          <extra value="7" description="SM-3 Jettisoned third stage" uuid="f276e5e6-5269-11df-95eb-080069138b88" uid="19496"/>
+          <extra value="8" description="SM-3 Block 1 Kill Weapon (KW)" uuid="f277faf8-5269-11df-8ebe-080069138b88" uid="19497"/>
+        </specific>
+      </subcategory>
+      <subcategory value="28" description="Mk 49 RAM" uuid="f27a4bdc-5269-11df-9357-080069138b88" uid="19498"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f27bfdb0-5269-11df-9db2-080069138b88" uid="19499">
+      <subcategory value="1" description="3-in, .50 caliber" uuid="f27d0b10-5269-11df-9528-080069138b88" uid="19500"/>
+      <subcategory value="2" description="12.7-mm/.50 caliber" uuid="f27e1a00-5269-11df-b403-080069138b88" uid="19501">
+        <specific value="1" description="M2 AP" uuid="f27f2b20-5269-11df-8f38-080069138b88" uid="19502"/>
+        <specific value="2" description="M8 API" uuid="f28039f2-5269-11df-a29d-080069138b88" uid="19503"/>
+        <specific value="3" description="M20 API-T" uuid="f28145c2-5269-11df-9a06-080069138b88" uid="19504"/>
+        <specific value="4" description="M2 ball" uuid="f282569c-5269-11df-9e10-080069138b88" uid="19505"/>
+        <specific value="5" description="M33 ball" uuid="f2836640-5269-11df-a1ef-080069138b88" uid="19506"/>
+        <specific value="6" description="M1 incediary" uuid="f284710c-5269-11df-9ef5-080069138b88" uid="19507"/>
+        <specific value="7" description="M23 incendiary" uuid="f2858060-5269-11df-beb0-080069138b88" uid="19508"/>
+      </subcategory>
+      <subcategory value="3" description="20-mm" uuid="f287355e-5269-11df-925b-080069138b88" uid="19509">
+        <specific value="1" description="M56A4 HEI/M242 HEI-T 7:1 ratio" uuid="f28844d0-5269-11df-b5b0-080069138b88" uid="19510"/>
+        <specific value="2" description="PGU-28/B SAPHEI" uuid="f2895456-5269-11df-8457-080069138b88" uid="19511"/>
+        <specific value="3" description="M246 HEIT-SD" uuid="f28a6468-5269-11df-8297-080069138b88" uid="19512"/>
+        <specific value="4" description="M940 MPT-SD" uuid="f28b78da-5269-11df-a1b3-080069138b88" uid="19513"/>
+        <specific value="5" description="MK149 APDS" uuid="f28c8392-5269-11df-88ac-080069138b88" uid="19514"/>
+        <specific value="6" description="MK244 Mod 0 (tungsten)" uuid="f28d941c-5269-11df-8119-080069138b88" uid="19515"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Fixed" uuid="f28fe816-5269-11df-8070-080069138b88" uid="19516">
+      <subcategory value="1" description="Anti-helicopter mine (AHM)" uuid="f290ffda-5269-11df-97f9-080069138b88" uid="19517"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="225" uuid="f2935a6e-5269-11df-be97-080069138b88" uid="19518">
+    <category value="1" description="Guided" uuid="f29463fa-5269-11df-b012-080069138b88" uid="19519">
+      <subcategory value="1" description="BGM-71 TOW" uuid="f2957218-5269-11df-9c04-080069138b88" uid="19520">
+        <specific value="1" description="BGM-71A/B" uuid="f2968162-5269-11df-9501-080069138b88" uid="19521"/>
+        <specific value="2" description="BGM-71C ITOW" uuid="f2978f80-5269-11df-9ef4-080069138b88" uid="19522"/>
+        <specific value="3" description="BGM-71D TOW 2" uuid="f298a12c-5269-11df-a7d0-080069138b88" uid="19523"/>
+        <specific value="4" description="BGM-71E TOW 2-A" uuid="f299b0e4-5269-11df-88da-080069138b88" uid="19524"/>
+        <specific value="5" description="BGM-71F TOW 2-B" uuid="f29abf84-5269-11df-bd00-080069138b88" uid="19525"/>
+      </subcategory>
+      <subcategory value="2" description="Dragon ATGW" uuid="f29c6ffa-5269-11df-9115-080069138b88" uid="19526">
+        <specific value="1" description="M222 Dragon" uuid="f29d8098-5269-11df-ad86-080069138b88" uid="19527"/>
+        <specific value="2" description="Dragon II" uuid="f29e9032-5269-11df-b7ee-080069138b88" uid="19528"/>
+        <specific value="3" description="Dragon III" uuid="f29f9eaa-5269-11df-a331-080069138b88" uid="19529"/>
+      </subcategory>
+      <subcategory value="3" description="AGM-114 Hellfire" uuid="f2a14f52-5269-11df-b128-080069138b88" uid="19530">
+        <specific value="1" description="AGM-114A" uuid="f2a25faa-5269-11df-b339-080069138b88" uid="19531"/>
+        <specific value="2" description="AGM-114B" uuid="f2a36f76-5269-11df-8901-080069138b88" uid="19532"/>
+        <specific value="3" description="AGM-114C" uuid="f2a47e0c-5269-11df-b644-080069138b88" uid="19533"/>
+        <specific value="4" description="AGM-114F" uuid="f2a58e1e-5269-11df-8072-080069138b88" uid="19534"/>
+        <specific value="5" description="AGM-114K" uuid="f2a69e62-5269-11df-941b-080069138b88" uid="19535">
+          <extra value="1" description="AGM-114K SAL" uuid="f2a7a758-5269-11df-99e8-080069138b88" uid="19536"/>
+          <extra value="2" description="AGM-114K RF" uuid="f2a8b940-5269-11df-a23b-080069138b88" uid="19537"/>
+        </specific>
+        <specific value="6" description="AGM-114L, Laser Guided Hellfire" uuid="f2aa6d1c-5269-11df-8308-080069138b88" uid="19538"/>
+      </subcategory>
+      <subcategory value="4" description="AGM-65 Maverick" uuid="f2ac1cde-5269-11df-8ff9-080069138b88" uid="19539">
+        <specific value="1" description="AGM-65A" uuid="f2ad2c1e-5269-11df-b1c7-080069138b88" uid="19540"/>
+        <specific value="2" description="AGM-65B" uuid="f2ae3974-5269-11df-92b0-080069138b88" uid="19541"/>
+        <specific value="3" description="AGM-65D" uuid="f2af49e0-5269-11df-9b1b-080069138b88" uid="19542"/>
+        <specific value="4" description="AGM-65E" uuid="f2b06316-5269-11df-b8a6-080069138b88" uid="19543"/>
+        <specific value="5" description="AGM-65F" uuid="f2b16c5c-5269-11df-ab52-080069138b88" uid="19544"/>
+        <specific value="6" description="AGM-65G" uuid="f2b27df4-5269-11df-b174-080069138b88" uid="19545"/>
+      </subcategory>
+      <subcategory value="5" description="M712 Copperhead Cannon Launched Guided Projectile" uuid="f2b4327a-5269-11df-8b2e-080069138b88" uid="19546"/>
+      <subcategory value="6" description="AAWS-M" uuid="f2b544c6-5269-11df-8f3a-080069138b88" uid="19547"/>
+      <subcategory value="7" description="High Velocity Missile (HVM)" uuid="f2b64f60-5269-11df-b122-080069138b88" uid="19548"/>
+      <subcategory value="8" description="Javelin" uuid="f2b762a6-5269-11df-b1d7-080069138b88" uid="19549"/>
+      <subcategory value="9" description="Stinger ATAS" deprecated="1" uuid="f2b876b4-5269-11df-a3f5-080069138b88" uid="19550"/>
+      <subcategory value="10" description="Rocket, Loitering Attack Munition" uuid="f2b98770-5269-11df-a325-080069138b88" uid="19551"/>
+      <subcategory value="11" description="Rocket, Precision Attack Munition" uuid="f2ba98fe-5269-11df-9068-080069138b88" uid="19552"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f2bc4aa0-5269-11df-9320-080069138b88" uid="19553">
+      <subcategory value="1" description="12.7-mm (.50 Cal)" uuid="f2bd5d28-5269-11df-a963-080069138b88" uid="19554">
+        <specific value="1" description="M2 AP" uuid="f2be661e-5269-11df-85ab-080069138b88" uid="19555"/>
+        <specific value="2" description="M8 API" uuid="f2bf75cc-5269-11df-bde5-080069138b88" uid="19556"/>
+        <specific value="3" description="M17" uuid="f2c087aa-5269-11df-9f5e-080069138b88" uid="19557"/>
+        <specific value="4" description="M20 API-T" uuid="f2c19276-5269-11df-bd55-080069138b88" uid="19558"/>
+        <specific value="5" description="A534 (4 ball &amp; 1 tracer mix)" uuid="f2c2a198-5269-11df-8a28-080069138b88" uid="19559"/>
+      </subcategory>
+      <subcategory value="2" description="20 mm" uuid="f2c456b4-5269-11df-b726-080069138b88" uid="19560">
+        <specific value="1" description="M39" uuid="f2c56644-5269-11df-907f-080069138b88" uid="19561"/>
+        <specific value="2" description="M53 API" uuid="f2c671ba-5269-11df-a847-080069138b88" uid="19562"/>
+        <specific value="3" description="M601 API-T" uuid="f2c77f60-5269-11df-acba-080069138b88" uid="19563"/>
+        <specific value="4" description="M775 API-T" uuid="f2c892ce-5269-11df-ad56-080069138b88" uid="19564"/>
+        <specific value="5" description="M940 MP-T-SD" uuid="f2c99e12-5269-11df-9278-080069138b88" uid="19565"/>
+        <specific value="6" description="MK149 Mod 4 APDS" uuid="f2caae24-5269-11df-b3f7-080069138b88" uid="19566"/>
+        <specific value="7" description="Oerlikon S" uuid="f2cbc0ca-5269-11df-b057-080069138b88" uid="19567"/>
+        <specific value="8" description="PGU-28/B SAP-HE" uuid="f2cccba0-5269-11df-abd4-080069138b88" uid="19568"/>
+        <specific value="9" description="U.S. Navy Mark 100" uuid="f2cddc0c-5269-11df-9442-080069138b88" uid="19569"/>
+      </subcategory>
+      <subcategory value="3" description="25 mm" uuid="f2cf9632-5269-11df-9d93-080069138b88" uid="19570">
+        <specific value="1" description="Oerlikon KBA" uuid="f2d0a89c-5269-11df-8d87-080069138b88" uid="19571"/>
+        <specific value="2" description="M791 APDS-T" uuid="f2d1b46c-5269-11df-972b-080069138b88" uid="19572"/>
+        <specific value="3" description="M919 APFSDS-T" uuid="f2d2c564-5269-11df-b32a-080069138b88" uid="19573"/>
+        <specific value="4" description="PGU-20/U API" uuid="f2d3d684-5269-11df-84b7-080069138b88" uid="19574"/>
+        <specific value="5" description="PGU-32/U SAPHEI" uuid="f2d4e056-5269-11df-b482-080069138b88" uid="19575"/>
+        <specific value="6" description="Mk 96" uuid="f2d5f162-5269-11df-a6c8-080069138b88" uid="19576"/>
+      </subcategory>
+      <subcategory value="4" description="30 mm" uuid="f2d7a5de-5269-11df-b4f2-080069138b88" uid="19577">
+        <specific value="1" description="173 Mauser model F APDS-T" uuid="f2d8b5be-5269-11df-9974-080069138b88" uid="19578"/>
+        <specific value="2" description="PGU-14/B API, PGU-13/B HEI 4:1 ratio" uuid="f2d9c102-5269-11df-9d05-080069138b88" uid="19579"/>
+        <specific value="3" description="GPU 5A" uuid="f2dad3bc-5269-11df-abe4-080069138b88" uid="19580"/>
+        <specific value="4" description="PGU-15/B TP" uuid="f2dbe950-5269-11df-8d43-080069138b88" uid="19581"/>
+      </subcategory>
+      <subcategory value="5" description="66 mm 72 LAW" uuid="f2dd996c-5269-11df-b917-080069138b88" uid="19582"/>
+      <subcategory value="6" description="76 mm" uuid="f2dea3a2-5269-11df-aec0-080069138b88" uid="19583">
+        <specific value="1" description="M319, HVAP-T" uuid="f2dfb4c2-5269-11df-b75a-080069138b88" uid="19584"/>
+        <specific value="2" description="M331A1, HVAP-DS-T" uuid="f2e0c858-5269-11df-86c0-080069138b88" uid="19585"/>
+        <specific value="3" description="M331A2, HVAP-DS-T" uuid="f2e1d446-5269-11df-8790-080069138b88" uid="19586"/>
+        <specific value="4" description="M339, AP-T" uuid="f2e2e3cc-5269-11df-b953-080069138b88" uid="19587"/>
+        <specific value="5" description="M464, APFSDS-T" uuid="f2e3f578-5269-11df-bb4f-080069138b88" uid="19588"/>
+        <specific value="6" description="M496, HEAT-T" uuid="f2e502e2-5269-11df-a135-080069138b88" uid="19589"/>
+      </subcategory>
+      <subcategory value="7" description="81 mm" uuid="f2e6b560-5269-11df-a062-080069138b88" uid="19590"/>
+      <subcategory value="8" description="84 mm" uuid="f2e7c41e-5269-11df-af98-080069138b88" uid="19591">
+        <specific value="1" description="M136, HEAT" uuid="f2e8d688-5269-11df-a6f0-080069138b88" uid="19592"/>
+      </subcategory>
+      <subcategory value="9" description="90 mm" uuid="f2ea89c4-5269-11df-b1b3-080069138b88" uid="19593">
+        <specific value="1" description="M77 AP-T" uuid="f2eb9526-5269-11df-a8d2-080069138b88" uid="19594"/>
+        <specific value="2" description="M82 APC-T" uuid="f2eca344-5269-11df-b191-080069138b88" uid="19595"/>
+        <specific value="3" description="M318 AP-T" uuid="f2edbcfc-5269-11df-b371-080069138b88" uid="19596"/>
+        <specific value="4" description="M318A1 AP-T" uuid="f2eecca0-5269-11df-b650-080069138b88" uid="19597"/>
+        <specific value="5" description="M332A1 HVAP-T" uuid="f2efdd16-5269-11df-9792-080069138b88" uid="19598"/>
+        <specific value="6" description="M348 HEAT" uuid="f2f0ec1a-5269-11df-836a-080069138b88" uid="19599"/>
+        <specific value="7" description="M348A1 HEAT" uuid="f2f1fb14-5269-11df-a65d-080069138b88" uid="19600"/>
+        <specific value="8" description="M431 HEAT-T" uuid="f2f30bf8-5269-11df-ad2f-080069138b88" uid="19601"/>
+        <specific value="9" description="RCL M67" uuid="f2f41b42-5269-11df-806a-080069138b88" uid="19602"/>
+      </subcategory>
+      <subcategory value="10" description="105 mm" uuid="f2f5cdf2-5269-11df-8ed0-080069138b88" uid="19603">
+        <specific value="1" description="FP105, APFSDS" uuid="f2f6d8fa-5269-11df-b0fe-080069138b88" uid="19604"/>
+        <specific value="2" description="M392 APDS-T" uuid="f2f7ef88-5269-11df-9c63-080069138b88" uid="19605"/>
+        <specific value="3" description="M392A2 APDS-T" uuid="f2f901ac-5269-11df-b485-080069138b88" uid="19606"/>
+        <specific value="4" description="M456 HEAT-T" uuid="f2fa0bb0-5269-11df-a0ed-080069138b88" uid="19607"/>
+        <specific value="5" description="M456A2 HEAT-T" uuid="f2fb1cee-5269-11df-a32e-080069138b88" uid="19608"/>
+        <specific value="6" description="M662 HEAT-T" uuid="f2fc3070-5269-11df-9711-080069138b88" uid="19609"/>
+        <specific value="7" description="M728 APDS-T" uuid="f2fd3a2e-5269-11df-b275-080069138b88" uid="19610"/>
+        <specific value="8" description="M735 APFSDS-T" uuid="f2fe496e-5269-11df-aecc-080069138b88" uid="19611"/>
+        <specific value="9" description="M774 APFSDS-T" uuid="f2ff5bc4-5269-11df-b050-080069138b88" uid="19612"/>
+        <specific value="10" description="M833 APFSDS-T" uuid="f3007e28-5269-11df-ad11-080069138b88" uid="19613"/>
+        <specific value="11" description="M900 APFSDS-T" uuid="f301934e-5269-11df-a635-080069138b88" uid="19614"/>
+        <specific value="12" description="Olin 105, APFSDS" uuid="f302a32e-5269-11df-ac8a-080069138b88" uid="19615"/>
+        <specific value="13" description="XM815 HEAT-MP" uuid="f303b200-5269-11df-916f-080069138b88" uid="19616"/>
+      </subcategory>
+      <subcategory value="11" description="106 mm RCL40 (M40)" uuid="f3056370-5269-11df-ad29-080069138b88" uid="19617"/>
+      <subcategory value="12" description="107 mm" uuid="f3067666-5269-11df-9e83-080069138b88" uid="19618"/>
+      <subcategory value="13" description="120 mm" uuid="f307851a-5269-11df-b1ac-080069138b88" uid="19619">
+        <specific value="1" description="M829 APFSDS-T" uuid="f30893f6-5269-11df-a5dc-080069138b88" uid="19620"/>
+        <specific value="2" description="M829A1 APFSDS-T" uuid="f309a430-5269-11df-aac6-080069138b88" uid="19621"/>
+        <specific value="3" description="M830 HEAT-MP-T" uuid="f30ab442-5269-11df-b49f-080069138b88" uid="19622"/>
+        <specific value="4" description="Olin 120 APFSDS" uuid="f30bc896-5269-11df-a9bf-080069138b88" uid="19623"/>
+        <specific value="5" description="Olin 120+ APFSDS" uuid="f30cde34-5269-11df-bbe8-080069138b88" uid="19624"/>
+        <specific value="6" description="M830A1 HEAT-MP-T" uuid="f30deef0-5269-11df-a2d4-080069138b88" uid="19625"/>
+        <specific value="7" description="XM943 STAFF" uuid="f30ef9d0-5269-11df-9ec5-080069138b88" uid="19626"/>
+      </subcategory>
+      <subcategory value="14" description="152 mm" uuid="f310abc2-5269-11df-aaf2-080069138b88" uid="19627">
+        <specific value="1" description="M409 Series HEAT-T-MP" uuid="f311bb66-5269-11df-b5d0-080069138b88" uid="19628"/>
+      </subcategory>
+      <subcategory value="15" description="155 mm" uuid="f3136bc8-5269-11df-9d65-080069138b88" uid="19629">
+        <specific value="1" description="M898 SADARM" uuid="f3147e3c-5269-11df-bd78-080069138b88" uid="19630"/>
+      </subcategory>
+      <subcategory value="16" description="227-mm rocket" uuid="f3162d90-5269-11df-ae3e-080069138b88" uid="19631">
+        <specific value="1" description="AT2" uuid="f3173960-5269-11df-9264-080069138b88" uid="19632"/>
+        <specific value="2" description="M77" uuid="f3184dbe-5269-11df-80fb-080069138b88" uid="19633"/>
+        <specific value="3" description="TGW" uuid="f3195c7c-5269-11df-bb2e-080069138b88" uid="19634"/>
+        <specific value="4" description="SADARM" uuid="f31a661c-5269-11df-8be4-080069138b88" uid="19635"/>
+      </subcategory>
+      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="f31c1854-5269-11df-870b-080069138b88" uid="19636"/>
+      <subcategory value="18" description="(deprecated)" deprecated="1" uuid="f31d29d8-5269-11df-beec-080069138b88" uid="19637"/>
+      <subcategory value="19" description="(deprecated)" deprecated="1" uuid="f31e3c38-5269-11df-b8e2-080069138b88" uid="19638"/>
+      <subcategory value="20" description="Hydra 70 Rocket System" uuid="f31f4b64-5269-11df-bbbe-080069138b88" uid="19639">
+        <specific value="1" description="Hydra Rocket w/M156 WP smoke warhead" uuid="f3205d42-5269-11df-a0c4-080069138b88" uid="19640"/>
+        <specific value="2" description="Hydra Rocket w/M67 Mod WP smoke warhead" uuid="f3216ebc-5269-11df-8256-080069138b88" uid="19641"/>
+        <specific value="3" description="Hydra Rocket w/M67 Mod 1 RP smoke warhead" uuid="f3227bb8-5269-11df-a586-080069138b88" uid="19642"/>
+        <specific value="4" description="Hydra Rocket w/M151 HE frag warhead" uuid="f32393cc-5269-11df-8806-080069138b88" uid="19643"/>
+        <specific value="5" description="Hydra Rocket w/M257 visible flare warhead" uuid="f324a5dc-5269-11df-b444-080069138b88" uid="19644"/>
+        <specific value="6" description="Hydra Rocket w/M278 infrared flare warhead" uuid="f325b3aa-5269-11df-a8c4-080069138b88" uid="19645"/>
+        <specific value="7" description="Hydra Rocket w/WDU-4A/A flechette warhead" uuid="f326c92a-5269-11df-963f-080069138b88" uid="19646"/>
+        <specific value="8" description="Hydra Rocket w/WTU-1/B practice warhead" uuid="f327db8a-5269-11df-af94-080069138b88" uid="19647"/>
+      </subcategory>
+      <subcategory value="50" description="Rockeye II Mk 20 cluster weapon" uuid="f3298dd6-5269-11df-8ac3-080069138b88" uid="19648"/>
+      <subcategory value="51" description="SUU-65/B TAC Munition Dispenser (TMD) Wide Area Antiarmor Munition (WAAM)" uuid="f32aa64e-5269-11df-9499-080069138b88" uid="19649"/>
+    </category>
+    <category value="3" description="Fixed" uuid="f32c5e3a-5269-11df-940a-080069138b88" uid="19650">
+      <subcategory value="1" description="Area Denial Artillery Munition (ADAM)" uuid="f32d6c1c-5269-11df-a31e-080069138b88" uid="19651"/>
+      <subcategory value="2" description="Extended Range Anti-armor Munition (ERAM)" uuid="f32e8228-5269-11df-86a9-080069138b88" uid="19652"/>
+      <subcategory value="3" description="GATOR Anti-armor System" uuid="f32f908c-5269-11df-9ee4-080069138b88" uid="19653"/>
+      <subcategory value="4" description="XM93 Wide Area Mine (WAM)" uuid="f330a3c8-5269-11df-b710-080069138b88" uid="19654"/>
+      <subcategory value="5" description="M21 Heavy Antitank mine" uuid="f331b448-5269-11df-aa9a-080069138b88" uid="19655"/>
+      <subcategory value="6" description="Off-route Antitank mine" uuid="f332c3a6-5269-11df-83d9-080069138b88" uid="19656">
+        <specific value="1" description="M24" uuid="f333d3ea-5269-11df-afb8-080069138b88" uid="19657"/>
+        <specific value="2" description="M66" uuid="f334e438-5269-11df-9d6d-080069138b88" uid="19658"/>
+      </subcategory>
+      <subcategory value="7" description="M19 Antitank mine" uuid="f33694ae-5269-11df-baec-080069138b88" uid="19659"/>
+      <subcategory value="8" description="M15 Antitank mine" uuid="f337a024-5269-11df-a028-080069138b88" uid="19660"/>
+      <subcategory value="9" description="M86 Pursuit Deterrent Munition (PDM)" uuid="f338b2a2-5269-11df-822b-080069138b88" uid="19661"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="225" uuid="f33b0494-5269-11df-b97c-080069138b88" uid="19662">
+    <category value="1" description="Guided" uuid="f33c11c2-5269-11df-bcf1-080069138b88" uid="19663">
+      <subcategory value="1" description="Decoys" uuid="f33d2468-5269-11df-9816-080069138b88" uid="19664">
+        <specific value="1" description="Anti-Radiation Missile Decoy (ARM-D)" uuid="f33e2f2a-5269-11df-85fa-080069138b88" uid="19665"/>
+        <specific value="2" description="Mk-57 (MOSS)" uuid="f33f40f4-5269-11df-b716-080069138b88" uid="19666"/>
+      </subcategory>
+      <subcategory value="2" description="RIM-72 Sea Chaparral" uuid="f340f322-5269-11df-a619-080069138b88" uid="19667"/>
+      <subcategory value="3" description="RIM-116A RAM" uuid="f3420dac-5269-11df-9487-080069138b88" uid="19668"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="225" uuid="f34466ba-5269-11df-b68b-080069138b88" uid="19669">
+    <category value="1" description="Guided" uuid="f34575dc-5269-11df-a24e-080069138b88" uid="19670">
+      <subcategory value="1" description="AGM-88 High-speed Antiradiation Missile (HARM)" uuid="f3468062-5269-11df-841c-080069138b88" uid="19671">
+        <specific value="1" description="AGM-88A" uuid="f347951a-5269-11df-b1c0-080069138b88" uid="19672"/>
+        <specific value="2" description="AGM-88B" uuid="f348a540-5269-11df-aba2-080069138b88" uid="19673"/>
+        <specific value="3" description="AGM-88C" uuid="f349b818-5269-11df-bdad-080069138b88" uid="19674"/>
+      </subcategory>
+      <subcategory value="2" description="AGM-45 Shrike" uuid="f34b6bea-5269-11df-9c54-080069138b88" uid="19675">
+        <specific value="1" description="AGM-45A" uuid="f34c7a9e-5269-11df-a22a-080069138b88" uid="19676"/>
+        <specific value="2" description="AGM-45B" uuid="f34d8ad8-5269-11df-8982-080069138b88" uid="19677"/>
+      </subcategory>
+      <subcategory value="3" description="AGM-78 Standard ARM" uuid="f34f3d92-5269-11df-8754-080069138b88" uid="19678"/>
+      <subcategory value="4" description="AGM-122 Sidearm" uuid="f3504c28-5269-11df-b2aa-080069138b88" uid="19679">
+        <specific value="1" description="AGM-122A" uuid="f3515aa0-5269-11df-8314-080069138b88" uid="19680"/>
+      </subcategory>
+      <subcategory value="5" description="AGM-136 TACIT RAINBOW" deprecated="1" uuid="f3530d78-5269-11df-a359-080069138b88" uid="19681">
+        <specific value="1" description="AGM 136A" deprecated="1" uuid="f35422da-5269-11df-8b0e-080069138b88" uid="19682"/>
+      </subcategory>
+      <subcategory value="6" description="Stinger" uuid="f355d198-5269-11df-bde7-080069138b88" uid="19683">
+        <specific value="1" description="Air Defense Suppression Missile (ADSM)" uuid="f356db1a-5269-11df-af7c-080069138b88" uid="19684"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="5" country="225" uuid="f359d3ec-5269-11df-9ec0-080069138b88" uid="19685">
+    <category value="1" description="Guided" uuid="f35ae1c4-5269-11df-9eb1-080069138b88" uid="19686">
+      <subcategory value="1" description="Asat" uuid="f35bebe6-5269-11df-9ef4-080069138b88" uid="19687"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="225" uuid="f35e4148-5269-11df-bcb8-080069138b88" uid="19688">
+    <category value="1" description="Guided" uuid="f35f4912-5269-11df-be7a-080069138b88" uid="19689">
+      <subcategory value="1" description="Harpoon" uuid="f36058ac-5269-11df-b449-080069138b88" uid="19690">
+        <specific value="1" description="AGM-84A" uuid="f3616c74-5269-11df-a96a-080069138b88" uid="19691"/>
+        <specific value="2" description="UGM-84A" uuid="f3627588-5269-11df-b191-080069138b88" uid="19692"/>
+        <specific value="3" description="RGM-84A" uuid="f36384b4-5269-11df-a941-080069138b88" uid="19693"/>
+        <specific value="4" description="AGM-84B" uuid="f3649818-5269-11df-b053-080069138b88" uid="19694"/>
+        <specific value="5" description="UGM-84B" uuid="f365a1cc-5269-11df-b1ab-080069138b88" uid="19695"/>
+        <specific value="6" description="AGM-84C" uuid="f366b04e-5269-11df-b737-080069138b88" uid="19696"/>
+        <specific value="7" description="UGM-84C" uuid="f367c998-5269-11df-93e5-080069138b88" uid="19697"/>
+        <specific value="8" description="AGM-84D" uuid="f368d914-5269-11df-af9b-080069138b88" uid="19698"/>
+        <specific value="9" description="UGM-84D" uuid="f369e78c-5269-11df-8fbe-080069138b88" uid="19699"/>
+        <specific value="10" description="AGM-84E" uuid="f36af730-5269-11df-aa89-080069138b88" uid="19700"/>
+        <specific value="11" description="UGM-84E" uuid="f36c0454-5269-11df-8b67-080069138b88" uid="19701"/>
+        <specific value="12" description="RGM-84E" uuid="f36d1452-5269-11df-b487-080069138b88" uid="19702"/>
+        <specific value="13" description="AGHM-84F" uuid="f36e2270-5269-11df-9024-080069138b88" uid="19703"/>
+        <specific value="14" description="UGM-84F" uuid="f36f2d64-5269-11df-91fa-080069138b88" uid="19704"/>
+        <specific value="15" description="RGM-84F" uuid="f3704096-5269-11df-9255-080069138b88" uid="19705"/>
+        <specific value="16" description="AGM-84G" uuid="f3714fe0-5269-11df-9855-080069138b88" uid="19706"/>
+        <specific value="17" description="UGM-84G" uuid="f37258fe-5269-11df-b8a3-080069138b88" uid="19707"/>
+        <specific value="18" description="RGM-84G" uuid="f3736b40-5269-11df-9598-080069138b88" uid="19708"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f3751ce2-5269-11df-8162-080069138b88" uid="19709"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f3762f2e-5269-11df-80d0-080069138b88" uid="19710"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f3773d42-5269-11df-866f-080069138b88" uid="19711"/>
+      <subcategory value="5" description="NT 37F torpedo" uuid="f3784ffc-5269-11df-a867-080069138b88" uid="19712">
+        <specific value="1" description="Mod 2" uuid="f3795fb4-5269-11df-a1a6-080069138b88" uid="19713"/>
+        <specific value="2" description="Mod 3" uuid="f37a6a80-5269-11df-8706-080069138b88" uid="19714"/>
+        <specific value="3" description="NT 37E" uuid="f37b7966-5269-11df-bd32-080069138b88" uid="19715"/>
+      </subcategory>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f37d2f72-5269-11df-b4ef-080069138b88" uid="19716"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="f37e401a-5269-11df-a904-080069138b88" uid="19717"/>
+      <subcategory value="8" description="AGM-142 Popeye" uuid="f37f4d34-5269-11df-8679-080069138b88" uid="19718"/>
+      <subcategory value="9" description="AGM-119 Penguin" uuid="f3805e2c-5269-11df-9898-080069138b88" uid="19719"/>
+      <subcategory value="10" description="AGM-123 Skipper" uuid="f381733e-5269-11df-824a-080069138b88" uid="19720">
+        <specific value="1" description="AGM-123A" uuid="f3827f7c-5269-11df-be8e-080069138b88" uid="19721"/>
+      </subcategory>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f38430c4-5269-11df-9e80-080069138b88" uid="19722"/>
+      <subcategory value="12" description="BGM-109B Tomahawk Antiship Missile (TASM)" uuid="f3854374-5269-11df-8bf6-080069138b88" uid="19723"/>
+      <subcategory value="13" description="ADCAP" uuid="f386639e-5269-11df-a5a7-080069138b88" uid="19724">
+        <specific value="1" description="Mod 5" uuid="f3876e6a-5269-11df-bae9-080069138b88" uid="19725"/>
+        <specific value="2" description="Mod 6" uuid="f3887e04-5269-11df-a83d-080069138b88" uid="19726"/>
+      </subcategory>
+      <subcategory value="14" description="Mk 48" uuid="f38a2e3e-5269-11df-9b89-080069138b88" uid="19727">
+        <specific value="1" description="Mod 4" uuid="f38b40ee-5269-11df-95bb-080069138b88" uid="19728"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Ballistic" uuid="f38d8f52-5269-11df-83db-080069138b88" uid="19729">
+      <subcategory value="1" description="5-in .38 caliber" uuid="f38ea14e-5269-11df-bc37-080069138b88" uid="19730"/>
+      <subcategory value="2" description="5-in .54 caliber" uuid="f38fab34-5269-11df-9cba-080069138b88" uid="19731">
+        <specific value="1" description="AAC" uuid="f390baba-5269-11df-a639-080069138b88" uid="19732"/>
+        <specific value="2" description="HC" uuid="f391ce50-5269-11df-958f-080069138b88" uid="19733"/>
+        <specific value="3" description="HE-IR" uuid="f392d8c2-5269-11df-8392-080069138b88" uid="19734"/>
+        <specific value="4" description="HE-PD" uuid="f393e74e-5269-11df-bb0d-080069138b88" uid="19735"/>
+        <specific value="5" description="HE" uuid="f394f990-5269-11df-99c4-080069138b88" uid="19736"/>
+        <specific value="6" description="HE-CVT" uuid="f396057e-5269-11df-8e6b-080069138b88" uid="19737"/>
+        <specific value="7" description="IR" uuid="f397154a-5269-11df-b877-080069138b88" uid="19738"/>
+        <specific value="8" description="VT (Variable Time)" uuid="f3982336-5269-11df-a620-080069138b88" uid="19739"/>
+        <specific value="9" description="VT-IR (Variable Time, Infrared)" uuid="f3993cc6-5269-11df-9378-080069138b88" uid="19740"/>
+        <specific value="10" description="VT-RF" uuid="f39a541c-5269-11df-8c99-080069138b88" uid="19741"/>
+      </subcategory>
+      <subcategory value="3" description="76 mm" uuid="f39c03de-5269-11df-8bec-080069138b88" uid="19742">
+        <specific value="1" description="AAC" uuid="f39d1dc8-5269-11df-baa7-080069138b88" uid="19743"/>
+        <specific value="2" description="HE" uuid="f39e2c22-5269-11df-bde1-080069138b88" uid="19744"/>
+        <specific value="3" description="HE-PD" uuid="f39f3bbc-5269-11df-abb1-080069138b88" uid="19745"/>
+        <specific value="4" description="VT fragmentation" uuid="f3a04cd2-5269-11df-aed7-080069138b88" uid="19746"/>
+        <specific value="5" description="VT IR" uuid="f3a15974-5269-11df-b8ff-080069138b88" uid="19747"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Fixed" uuid="f3a3ae36-5269-11df-8606-080069138b88" uid="19748">
+      <subcategory value="1" description="DST Mk 36 mine" uuid="f3a4c3ca-5269-11df-b826-080069138b88" uid="19749"/>
+      <subcategory value="2" description="DST Mk 40 mine" uuid="f3a5d5da-5269-11df-b7e1-080069138b88" uid="19750"/>
+      <subcategory value="3" description="DST Mk 41 mine" uuid="f3a6e4de-5269-11df-9d0e-080069138b88" uid="19751"/>
+      <subcategory value="4" description="DST 115A mine" uuid="f3a7f068-5269-11df-9bee-080069138b88" uid="19752"/>
+      <subcategory value="5" description="Mk 52 bottom mine" uuid="f3a90606-5269-11df-bc98-080069138b88" uid="19753">
+        <specific value="1" description="Mod 1" uuid="f3aa1532-5269-11df-b636-080069138b88" uid="19754"/>
+        <specific value="2" description="Mod 2" uuid="f3ab1f9a-5269-11df-a492-080069138b88" uid="19755"/>
+        <specific value="3" description="Mod 3" uuid="f3ac32c2-5269-11df-a197-080069138b88" uid="19756"/>
+      </subcategory>
+      <subcategory value="6" description="Mk 55 bottom mine" uuid="f3ade36a-5269-11df-ac3d-080069138b88" uid="19757">
+        <specific value="1" description="Mod 2" uuid="f3aef2aa-5269-11df-98b6-080069138b88" uid="19758"/>
+        <specific value="2" description="Mod 3" uuid="f3afff06-5269-11df-b1e3-080069138b88" uid="19759"/>
+        <specific value="3" description="Mod 5" uuid="f3b10fe0-5269-11df-b27b-080069138b88" uid="19760"/>
+        <specific value="4" description="Mod 6" uuid="f3b220ba-5269-11df-92ac-080069138b88" uid="19761"/>
+        <specific value="5" description="Mod 7" uuid="f3b32b72-5269-11df-8de0-080069138b88" uid="19762"/>
+      </subcategory>
+      <subcategory value="7" description="Mk 57 moored mine" uuid="f3b4dd28-5269-11df-9700-080069138b88" uid="19763">
+        <specific value="1" description="Mod 0" uuid="f3b5ed26-5269-11df-99b8-080069138b88" uid="19764"/>
+      </subcategory>
+      <subcategory value="8" description="Quickstrike mines" uuid="f3b79c7a-5269-11df-af26-080069138b88" uid="19765">
+        <specific value="1" description="Mk 62" uuid="f3b8aed0-5269-11df-b672-080069138b88" uid="19766"/>
+        <specific value="2" description="Mk 63" uuid="f3b9b7e4-5269-11df-86bc-080069138b88" uid="19767"/>
+        <specific value="3" description="Mk 64" uuid="f3bac81e-5269-11df-9c2e-080069138b88" uid="19768"/>
+        <specific value="4" description="Mk 65" uuid="f3bbd934-5269-11df-8015-080069138b88" uid="19769"/>
+      </subcategory>
+      <subcategory value="9" description="CAPTOR - Encapsulated Torpedo moored mine" uuid="f3bd8ab8-5269-11df-8638-080069138b88" uid="19770"/>
+      <subcategory value="10" description="Advanced sea mine" uuid="f3be97aa-5269-11df-8bb8-080069138b88" uid="19771"/>
+      <subcategory value="11" description="Mk 56 Mod 0 moored mine" uuid="f3bfaaa0-5269-11df-8b48-080069138b88" uid="19772"/>
+      <subcategory value="12" description="Mk 67 Submarine Launched Mobile Mine" uuid="f3c0c00c-5269-11df-8a82-080069138b88" uid="19773"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="225" uuid="f3c310a0-5269-11df-8b5f-080069138b88" uid="19774">
+    <category value="1" description="Guided" uuid="f3c429d6-5269-11df-82e5-080069138b88" uid="19775">
+      <subcategory value="1" description="Mk 46 torpedo" uuid="f3c53466-5269-11df-b55a-080069138b88" uid="19776">
+        <specific value="1" description="Mk 46 Mod 0" uuid="f3c6459a-5269-11df-a8e0-080069138b88" uid="19777"/>
+        <specific value="2" description="Mk 46 Mod 5 (NEARTIP)" uuid="f3c75642-5269-11df-b7ae-080069138b88" uid="19778"/>
+        <specific value="3" description="Mk 46 Mod 7" uuid="f3c860aa-5269-11df-847c-080069138b88" uid="19779"/>
+        <specific value="4" description="Mk 46 Mod 6" uuid="f3c971f2-5269-11df-88b9-080069138b88" uid="19780"/>
+      </subcategory>
+      <subcategory value="2" description="Mk 48 torpedo" uuid="f3cb2600-5269-11df-bfeb-080069138b88" uid="19781">
+        <specific value="1" description="Mod 4" uuid="f3cc3536-5269-11df-ab3d-080069138b88" uid="19782"/>
+      </subcategory>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f3cde52a-5269-11df-b4af-080069138b88" uid="19783"/>
+      <subcategory value="4" description="MK37 torpedo" uuid="f3cef4ba-5269-11df-b52f-080069138b88" uid="19784">
+        <specific value="1" description="Mod 0" uuid="f3d004b8-5269-11df-a786-080069138b88" uid="19785"/>
+        <specific value="2" description="Mod 1" uuid="f3d10d90-5269-11df-9962-080069138b88" uid="19786"/>
+        <specific value="3" description="Mod 2" uuid="f3d21d0c-5269-11df-90a5-080069138b88" uid="19787"/>
+        <specific value="4" description="Mod 3" uuid="f3d32e68-5269-11df-95a4-080069138b88" uid="19788"/>
+      </subcategory>
+      <subcategory value="5" description="RUR-5A ASROC" uuid="f3d4e1ea-5269-11df-b793-080069138b88" uid="19789"/>
+      <subcategory value="6" description="CASW/SOW" uuid="f3d5eff4-5269-11df-958c-080069138b88" uid="19790"/>
+      <subcategory value="7" description="SUBROC" uuid="f3d6fa84-5269-11df-ab51-080069138b88" uid="19791">
+        <specific value="1" description="UUM-44A" uuid="f3d80b54-5269-11df-a707-080069138b88" uid="19792"/>
+      </subcategory>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="f3d9be5e-5269-11df-b0a6-080069138b88" uid="19793"/>
+      <subcategory value="9" description="Mk 44 torpedo" uuid="f3daccea-5269-11df-bd22-080069138b88" uid="19794"/>
+      <subcategory value="10" description="Mk 48 ADCAP torpedo" uuid="f3dbd766-5269-11df-ab2f-080069138b88" uid="19795">
+        <specific value="1" description="Mod 5 ADCAP" uuid="f3dceb92-5269-11df-b4b7-080069138b88" uid="19796"/>
+        <specific value="2" description="Mod 6 ADCAP/MODS" uuid="f3ddfbea-5269-11df-a61a-080069138b88" uid="19797"/>
+      </subcategory>
+      <subcategory value="11" description="Mk 50 Advanced lightweight torpedo" uuid="f3dfaba2-5269-11df-82e0-080069138b88" uid="19798">
+        <specific value="1" description="100S" uuid="f3e0bccc-5269-11df-a0a4-080069138b88" uid="19799"/>
+        <specific value="2" description="200S" uuid="f3e1cc20-5269-11df-8451-080069138b88" uid="19800"/>
+      </subcategory>
+      <subcategory value="12" description="NT 37F" uuid="f3e386fa-5269-11df-a996-080069138b88" uid="19801">
+        <specific value="1" description="Mod 2" uuid="f3e495cc-5269-11df-b1f2-080069138b88" uid="19802"/>
+        <specific value="2" description="Mod 3" uuid="f3e5a0de-5269-11df-8fb4-080069138b88" uid="19803"/>
+        <specific value="3" description="NT 37E" uuid="f3e6b078-5269-11df-ba76-080069138b88" uid="19804"/>
+      </subcategory>
+      <subcategory value="13" description="HOTTORP torpedo" uuid="f3e86300-5269-11df-8dd3-080069138b88" uid="19805"/>
+      <subcategory value="14" description="Sea Lance ASW" uuid="f3e971c8-5269-11df-92c8-080069138b88" uid="19806"/>
+      <subcategory value="18" description="Mk 32 torpedo" uuid="f3ea7d70-5269-11df-91fe-080069138b88" uid="19807">
+        <specific value="1" description="Mod 2" uuid="f3eb90a2-5269-11df-9ae3-080069138b88" uid="19808"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="225" uuid="f3ee84b0-5269-11df-a5df-080069138b88" uid="19809">
+    <category value="2" description="Ballistic" uuid="f3ef91ca-5269-11df-abd6-080069138b88" uid="19810">
+      <subcategory value="1" description="5.56 mm" uuid="f3f09c64-5269-11df-9279-080069138b88" uid="19811">
+        <specific value="1" description="M193" uuid="f3f1ac44-5269-11df-b3ac-080069138b88" uid="19812"/>
+        <specific value="2" description="M193 Tracer" uuid="f3f2c020-5269-11df-bba9-080069138b88" uid="19813"/>
+        <specific value="3" description="(deprecated)" deprecated="1" uuid="f3f3c902-5269-11df-a894-080069138b88" uid="19814"/>
+        <specific value="4" description="5.56 x 45" uuid="f3f4d9b4-5269-11df-b35e-080069138b88" uid="19815"/>
+        <specific value="5" description="M855" uuid="f3f5ecaa-5269-11df-9f94-080069138b88" uid="19816"/>
+        <specific value="6" description="M856" uuid="f3f6f6b8-5269-11df-8a21-080069138b88" uid="19817"/>
+        <specific value="7" description="A064" uuid="f3f803c8-5269-11df-8873-080069138b88" uid="19818"/>
+      </subcategory>
+      <subcategory value="2" description="7.62 mm" uuid="f3f9b72c-5269-11df-a914-080069138b88" uid="19819">
+        <specific value="1" description=".30 Carbine" uuid="f3fac5b8-5269-11df-bde8-080069138b88" uid="19820"/>
+        <specific value="2" description=".308 Winchester" uuid="f3fbd034-5269-11df-841b-080069138b88" uid="19821"/>
+        <specific value="3" description=".30-06 Springfield" uuid="f3fcde98-5269-11df-a50a-080069138b88" uid="19822"/>
+        <specific value="4" description="A131 M80/M62 4:1 ratio (for M60, M240, etc.)" uuid="f3fdf3be-5269-11df-89bf-080069138b88" uid="19823"/>
+        <specific value="5" description="A130 M80 NATO ball (for M14, etc.)" uuid="f3ff006a-5269-11df-aa7f-080069138b88" uid="19824"/>
+        <specific value="6" description="A122 M59 ball (for AR-10, M14, etc.)" uuid="f4001342-5269-11df-8dac-080069138b88" uid="19825"/>
+        <specific value="7" description="A141" uuid="f4012f3e-5269-11df-a729-080069138b88" uid="19826"/>
+        <specific value="8" description="4 ball +1tracer linked" uuid="f4023f1e-5269-11df-bc5a-080069138b88" uid="19827"/>
+        <specific value="9" description="AA11 M118 Long Range (for M86, M14, etc.)" uuid="f40351ce-5269-11df-bf94-080069138b88" uid="19828"/>
+      </subcategory>
+      <subcategory value="3" description="9.0 mm" uuid="f4050398-5269-11df-bbde-080069138b88" uid="19829">
+        <specific value="1" description=".380 Auto" uuid="f4061486-5269-11df-b138-080069138b88" uid="19830"/>
+        <specific value="2" description="Browning Short" uuid="f4071f20-5269-11df-babf-080069138b88" uid="19831"/>
+        <specific value="3" description="Parabellum" uuid="f4083040-5269-11df-bf1d-080069138b88" uid="19832"/>
+        <specific value="4" description="Winchester Magnum" uuid="f40940d4-5269-11df-83b1-080069138b88" uid="19833"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f40af10e-5269-11df-ad1b-080069138b88" uid="19834"/>
+      <subcategory value="5" description="12.7 mm" uuid="f40c00d0-5269-11df-a4af-080069138b88" uid="19835">
+        <specific value="1" description="A605 .50 ball M33 (for .50 Spotting rifle, etc.)" uuid="f40d11d2-5269-11df-9599-080069138b88" uid="19836"/>
+        <specific value="2" description="A556 .50 4 ball M2/M1 4:1 ratio (for M2 MG, etc.)" uuid="f40e27ac-5269-11df-a03f-080069138b88" uid="19837"/>
+        <specific value="3" description="A534 .50 API M8/M20 4:1 ratio (for M2, , etc.)" uuid="f40f3462-5269-11df-ae55-080069138b88" uid="19838"/>
+      </subcategory>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f410ee56-5269-11df-b170-080069138b88" uid="19839"/>
+      <subcategory value="7" description="90 mm" uuid="f411ff3a-5269-11df-88d0-080069138b88" uid="19840">
+        <specific value="1" description="M580 APERS-T" uuid="f4130dda-5269-11df-99f6-080069138b88" uid="19841"/>
+      </subcategory>
+      <subcategory value="8" description="105 mm" uuid="f414bd60-5269-11df-8781-080069138b88" uid="19842">
+        <specific value="1" description="M336 canister" uuid="f415caca-5269-11df-8f85-080069138b88" uid="19843"/>
+        <specific value="2" description="M377 canister" uuid="f416db22-5269-11df-93f3-080069138b88" uid="19844"/>
+        <specific value="3" description="M494 APERS-T" uuid="f417eab2-5269-11df-b89f-080069138b88" uid="19845"/>
+        <specific value="4" description="M546 APERS-T" uuid="f418f40c-5269-11df-8f91-080069138b88" uid="19846"/>
+      </subcategory>
+      <subcategory value="9" description="152 mm" uuid="f41ab33c-5269-11df-ad1f-080069138b88" uid="19847">
+        <specific value="1" description="M625A1 cannister (flechettes)" uuid="f41bc498-5269-11df-9c47-080069138b88" uid="19848"/>
+      </subcategory>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f41d7644-5269-11df-acfb-080069138b88" uid="19849"/>
+      <subcategory value="11" description=".357" uuid="f41e8b2e-5269-11df-b540-080069138b88" uid="19850">
+        <specific value="1" description="Magnum" uuid="f41f9df2-5269-11df-8a96-080069138b88" uid="19851"/>
+      </subcategory>
+      <subcategory value="12" description=".38 Cal" uuid="f4214f58-5269-11df-b365-080069138b88" uid="19852">
+        <specific value="1" description="Auto" uuid="f42262da-5269-11df-8ede-080069138b88" uid="19853"/>
+        <specific value="2" description="Super Auto" uuid="f423709e-5269-11df-b260-080069138b88" uid="19854"/>
+        <specific value="3" description="Special" uuid="f4247af2-5269-11df-af55-080069138b88" uid="19855"/>
+      </subcategory>
+      <subcategory value="13" description=".45" uuid="f4262c8a-5269-11df-94dc-080069138b88" uid="19856">
+        <specific value="1" description="Auto Colt" uuid="f4273b70-5269-11df-bc2d-080069138b88" uid="19857"/>
+      </subcategory>
+      <subcategory value="14" description="12 ga shotgun shells" uuid="f428ee8e-5269-11df-a0ae-080069138b88" uid="19858"/>
+      <subcategory value="50" description="BLU-97 Submunition" uuid="f429ff36-5269-11df-9aef-080069138b88" uid="19859">
+        <specific value="1" description="BLU-97A" uuid="f42b0994-5269-11df-a9e6-080069138b88" uid="19860"/>
+        <specific value="2" description="BLU-97B" uuid="f42c19a6-5269-11df-b37c-080069138b88" uid="19861"/>
+      </subcategory>
+      <subcategory value="51" description="ISCB-1 Area Denial Cluster Weapon" uuid="f42dcdb4-5269-11df-8942-080069138b88" uid="19862"/>
+    </category>
+    <category value="3" description="Fixed" uuid="f42f7d76-5269-11df-bd34-080069138b88" uid="19863">
+      <subcategory value="1" description="Bounding mines" uuid="f4308f4a-5269-11df-b426-080069138b88" uid="19864">
+        <specific value="1" description="M16" uuid="f4319e26-5269-11df-bfc4-080069138b88" uid="19865"/>
+        <specific value="2" description="M16A1" uuid="f432af82-5269-11df-9675-080069138b88" uid="19866"/>
+        <specific value="3" description="M16A2" uuid="f433bfee-5269-11df-8a90-080069138b88" uid="19867"/>
+        <specific value="4" description="M2A4" uuid="f434cd94-5269-11df-9fdf-080069138b88" uid="19868"/>
+      </subcategory>
+      <subcategory value="2" description="Claymore mine" uuid="f4367c7a-5269-11df-88e2-080069138b88" uid="19869"/>
+      <subcategory value="3" description="M15 heavy AT mine" uuid="f4378b56-5269-11df-8b6e-080069138b88" uid="19870"/>
+      <subcategory value="4" description="M19 nonmetallic AT mine" uuid="f4389eba-5269-11df-8faf-080069138b88" uid="19871"/>
+      <subcategory value="5" description="M21 heavy AT mine" uuid="f439ae7c-5269-11df-abd3-080069138b88" uid="19872"/>
+      <subcategory value="6" description="M741 scatterable AT mine" uuid="f43ac078-5269-11df-af76-080069138b88" uid="19873"/>
+      <subcategory value="7" description="M718 scatterable AT mine" uuid="f43bd058-5269-11df-b8e7-080069138b88" uid="19874"/>
+      <subcategory value="8" description="M75 scatterable AT mine" uuid="f43cdf02-5269-11df-b5db-080069138b88" uid="19875"/>
+      <subcategory value="9" description="Nonmetallic &quot;Toe Popper&quot; mine" uuid="f43df234-5269-11df-9c04-080069138b88" uid="19876">
+        <specific value="1" description="M14" uuid="f43f0eee-5269-11df-8250-080069138b88" uid="19877"/>
+      </subcategory>
+      <subcategory value="10" description="M731 scatterable mine" uuid="f440bf96-5269-11df-886e-080069138b88" uid="19878"/>
+      <subcategory value="11" description="M692 scatterable mine" uuid="f441ccba-5269-11df-b8f4-080069138b88" uid="19879"/>
+      <subcategory value="12" description="M74 scatterable mine" uuid="f442de8e-5269-11df-b503-080069138b88" uid="19880"/>
+      <subcategory value="13" description="M1 one-gallon chemical mine" uuid="f443f3be-5269-11df-92a8-080069138b88" uid="19881"/>
+      <subcategory value="14" description="M18A1 mine" uuid="f444fec6-5269-11df-bef4-080069138b88" uid="19882"/>
+      <subcategory value="15" description="M23 chemical-agent mine" uuid="f4460e1a-5269-11df-8d30-080069138b88" uid="19883"/>
+      <subcategory value="16" description="M26 mine" uuid="f4472296-5269-11df-82db-080069138b88" uid="19884"/>
+      <subcategory value="17" description="M131 Modular Pack Mine System (MOPMS)" uuid="f4482eb6-5269-11df-b6e9-080069138b88" uid="19885"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="225" uuid="f44a867a-5269-11df-9928-080069138b88" uid="19886">
+    <category value="1" description="Guided" uuid="f44b8e9e-5269-11df-a693-080069138b88" uid="19887">
+      <subcategory value="1" description="AGM-86 Air Launched Cruise Missile (ALCM)" uuid="f44c9ed8-5269-11df-b22d-080069138b88" uid="19888">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="f44db106-5269-11df-98c8-080069138b88" uid="19889"/>
+        <specific value="2" description="AGM-86C" uuid="f44ebc22-5269-11df-885f-080069138b88" uid="19890"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f4506ec8-5269-11df-ae59-080069138b88" uid="19891"/>
+      <subcategory value="3" description="MGM-52C Lance" uuid="f4517f70-5269-11df-b468-080069138b88" uid="19892"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f45291f8-5269-11df-8a6b-080069138b88" uid="19893"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="f4539d82-5269-11df-8497-080069138b88" uid="19894"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f454b30c-5269-11df-b1ce-080069138b88" uid="19895"/>
+      <subcategory value="7" description="AGM-62 Walleye" uuid="f455c47c-5269-11df-943d-080069138b88" uid="19896"/>
+      <subcategory value="8" description="SRAM-A" uuid="f456cf84-5269-11df-9a9a-080069138b88" uid="19897">
+        <specific value="1" description="AGM-69A" uuid="f457dd70-5269-11df-856f-080069138b88" uid="19898"/>
+        <specific value="2" description="AGM-69B" uuid="f458f0d4-5269-11df-97e7-080069138b88" uid="19899"/>
+      </subcategory>
+      <subcategory value="9" description="SLAM" uuid="f45a9eb6-5269-11df-ae77-080069138b88" uid="19900">
+        <specific value="1" description="AGM/RGM 84E" uuid="f45ba96e-5269-11df-bad8-080069138b88" uid="19901"/>
+      </subcategory>
+      <subcategory value="10" description="Advanced Cruise Missile" uuid="f45d648e-5269-11df-998c-080069138b88" uid="19902">
+        <specific value="1" description="AGM-129A" uuid="f45e7798-5269-11df-9f2b-080069138b88" uid="19903"/>
+      </subcategory>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f46027be-5269-11df-995a-080069138b88" uid="19904"/>
+      <subcategory value="12" description="AGM 130" uuid="f4613b68-5269-11df-9bf8-080069138b88" uid="19905">
+        <specific value="1" description="AGM-130A" uuid="f46244d6-5269-11df-aef2-080069138b88" uid="19906"/>
+        <specific value="2" description="AGM-130C" uuid="f46353f8-5269-11df-9c2e-080069138b88" uid="19907"/>
+      </subcategory>
+      <subcategory value="13" description="Boeing 120-mm Fiber Optic Mortar Projectile (FOMP)" uuid="f4650720-5269-11df-b201-080069138b88" uid="19908"/>
+      <subcategory value="14" description="Mk-82" uuid="f46618fe-5269-11df-b69b-080069138b88" uid="19909">
+        <specific value="1" description="GBU-12 Mk 82 500-lb" uuid="f4672316-5269-11df-b901-080069138b88" uid="19910">
+          <extra value="1" description="Impact fuse" deprecated="1" uuid="f4683a12-5269-11df-b7b6-080069138b88" uid="19911"/>
+          <extra value="2" description=".10 sec delay" uuid="f4694b78-5269-11df-b2ff-080069138b88" uid="19912"/>
+          <extra value="3" description=".25 sec delay" uuid="f46a563a-5269-11df-b3b3-080069138b88" uid="19913"/>
+        </specific>
+        <specific value="2" description="GBU-38/B JDAM" uuid="f46c0d54-5269-11df-9c3b-080069138b88" uid="19914"/>
+      </subcategory>
+      <subcategory value="15" description="Mk-84 bomb" uuid="f46dbe24-5269-11df-8fa9-080069138b88" uid="19915">
+        <specific value="1" description="GBU-15 Glide Bomb" uuid="f46ece72-5269-11df-92eb-080069138b88" uid="19916"/>
+        <specific value="2" description="GBU-24A/B Glide Bomb" uuid="f46fe244-5269-11df-b968-080069138b88" uid="19917"/>
+        <specific value="3" description="PAVEWAY II laser-guided" uuid="f470ed2e-5269-11df-8338-080069138b88" uid="19918"/>
+        <specific value="4" description="GBU-10 Mk 84 2000-lb" uuid="f471fd68-5269-11df-aec1-080069138b88" uid="19919">
+          <extra value="1" description="Impact fuse" uuid="f4731108-5269-11df-8f53-080069138b88" uid="19920"/>
+          <extra value="2" description=".10 sec delay" uuid="f4741b16-5269-11df-ae6a-080069138b88" uid="19921"/>
+          <extra value="3" description=".25 sec delay" uuid="f47528ee-5269-11df-b76b-080069138b88" uid="19922"/>
+        </specific>
+        <specific value="5" description="Mk-84 GAMS" uuid="f476dbbc-5269-11df-a4f7-080069138b88" uid="19923"/>
+        <specific value="6" description="GBU-31A JDAM" uuid="f477ee62-5269-11df-99ef-080069138b88" uid="19924"/>
+      </subcategory>
+      <subcategory value="16" description="Paveway III" uuid="f4799bcc-5269-11df-b749-080069138b88" uid="19925">
+        <specific value="1" description="GBU-24A/B Mk 109/B 2000-lb pen Bm" uuid="f47aa4ae-5269-11df-902f-080069138b88" uid="19926"/>
+        <specific value="2" description="GBU-24B Mk 84 2000-lb HE bomb" uuid="f47bc0fa-5269-11df-8586-080069138b88" uid="19927"/>
+        <specific value="3" description="GBU-28B (BLU-113/B)" uuid="f47cd814-5269-11df-887b-080069138b88" uid="19928"/>
+      </subcategory>
+      <subcategory value="17" description="Army TACMS" uuid="f47e8858-5269-11df-99c6-080069138b88" uid="19929">
+        <specific value="1" description="M39" uuid="f47f90ea-5269-11df-83b6-080069138b88" uid="19930"/>
+        <specific value="2" description="Block IA" uuid="f480a39a-5269-11df-a220-080069138b88" uid="19931"/>
+        <specific value="3" description="Block II" uuid="f481b352-5269-11df-86c4-080069138b88" uid="19932"/>
+        <specific value="4" description="Block IIA" uuid="f482bd9c-5269-11df-957e-080069138b88" uid="19933"/>
+        <specific value="5" description="Block IA Unitary" uuid="f483cfde-5269-11df-8daf-080069138b88" uid="19934"/>
+      </subcategory>
+      <subcategory value="18" description="Mk-83 1000-lb LGB" uuid="f4857f8c-5269-11df-9f01-080069138b88" uid="19935">
+        <specific value="1" description="GBU - 16Mk 83" uuid="f48690de-5269-11df-bcf1-080069138b88" uid="19936"/>
+        <specific value="2" description="Mk 13/18" uuid="f4879e70-5269-11df-bf8a-080069138b88" uid="19937"/>
+        <specific value="3" description="GBU-32 JDAM" uuid="f488acd4-5269-11df-b158-080069138b88" uid="19938"/>
+      </subcategory>
+      <subcategory value="19" description="Tomahawk" uuid="f48a5f8e-5269-11df-8018-080069138b88" uid="19939">
+        <specific value="1" description="BGM - 109C (TLAM-C)" uuid="f48b6e74-5269-11df-bbf9-080069138b88" uid="19940"/>
+        <specific value="2" description="BGM - 109D (TLAM-D)" uuid="f48c79cc-5269-11df-a56d-080069138b88" uid="19941"/>
+        <specific value="3" description="Tactical Tomahawk Penetrator Variant Mk14" uuid="f48d8dbc-5269-11df-b682-080069138b88" uid="19942"/>
+        <specific value="4" description="Tactical Tomahawk Penatrator Variant Mk45 Mod1" uuid="f48ea0ee-5269-11df-adea-080069138b88" uid="19943"/>
+        <specific value="5" description="TACTOM BGM 109E" uuid="f48fae76-5269-11df-9646-080069138b88" uid="19944"/>
+      </subcategory>
+      <subcategory value="20" description="BLU-109/B Bomb" uuid="f4915e88-5269-11df-abf3-080069138b88" uid="19945">
+        <specific value="1" description="GBU-10G" uuid="f492714c-5269-11df-a4b2-080069138b88" uid="19946"/>
+        <specific value="2" description="GBU-10H" uuid="f49381fe-5269-11df-8cba-080069138b88" uid="19947"/>
+        <specific value="3" description="GBU-10J" uuid="f4948b94-5269-11df-b845-080069138b88" uid="19948"/>
+        <specific value="4" description="GBU-24A" uuid="f4959b56-5269-11df-ad78-080069138b88" uid="19949"/>
+        <specific value="5" description="GBU-27A" uuid="f496aa64-5269-11df-aa8c-080069138b88" uid="19950"/>
+        <specific value="6" description="GBU-15(V)-31" uuid="f497b81e-5269-11df-835c-080069138b88" uid="19951"/>
+        <specific value="7" description="GBU-15(V)-32" uuid="f498c7a4-5269-11df-ba0d-080069138b88" uid="19952"/>
+        <specific value="8" description="GBU-31B JDAM" uuid="f499d61c-5269-11df-be51-080069138b88" uid="19953"/>
+      </subcategory>
+      <subcategory value="21" description="AGM-154 Joint Standoff Munition" uuid="f49b9312-5269-11df-8bfa-080069138b88" uid="19954">
+        <specific value="1" description="AGM-154A (w/BLU-97 CEM)" uuid="f49ca054-5269-11df-940b-080069138b88" uid="19955"/>
+        <specific value="2" description="AGM-154B (w/BLU-108 SFW)" uuid="f49db0fc-5269-11df-a88c-080069138b88" uid="19956"/>
+        <specific value="3" description="AGM-154C (unitary w/BLU-111)" uuid="f49ec794-5269-11df-a532-080069138b88" uid="19957"/>
+      </subcategory>
+      <subcategory value="22" description="Wind-Corrected Munitions Dispenser (WCMD)" uuid="f4a076a2-5269-11df-8269-080069138b88" uid="19958">
+        <specific value="1" description="WCMD with Gator mines (BLU-91/92)" uuid="f4a1845c-5269-11df-80c6-080069138b88" uid="19959"/>
+        <specific value="2" description="WCMD with Combined Effects Munition (BLU-97/B)" uuid="f4a29b30-5269-11df-af98-080069138b88" uid="19960"/>
+        <specific value="3" description="CBU-105 (WCMD w/BLU-108 SFW)" uuid="f4a3ae12-5269-11df-af85-080069138b88" uid="19961"/>
+      </subcategory>
+      <subcategory value="23" description="Low Cost Autonomous Attack System (LOCAAS)" uuid="f4a55e7e-5269-11df-9e9b-080069138b88" uid="19962"/>
+      <subcategory value="24" description="Small Diameter Bomb" uuid="f4a66f26-5269-11df-aafe-080069138b88" uid="19963">
+        <specific value="1" description="GBU-39/B" uuid="f4a781f4-5269-11df-b7d2-080069138b88" uid="19964"/>
+        <specific value="2" description="GBU-40/B" uuid="f4a89198-5269-11df-8043-080069138b88" uid="19965"/>
+      </subcategory>
+      <subcategory value="25" description="Massive Ordnance Air Blast (MOAB)" uuid="f4aa4448-5269-11df-89c1-080069138b88" uid="19966">
+        <specific value="1" description="GBU-43/B" uuid="f4ab4f3c-5269-11df-8a83-080069138b88" uid="19967"/>
+      </subcategory>
+      <subcategory value="26" description="AGM-158 Joint Air-to-Surface Standoff Missile (JASSM)" uuid="f4ad0480-5269-11df-bf21-080069138b88" uid="19968">
+        <specific value="1" description="AGM-158A JASSM" uuid="f4ae1776-5269-11df-a0a0-080069138b88" uid="19969"/>
+        <specific value="2" description="AGM-158B JASSM-ER" uuid="f4af2616-5269-11df-b819-080069138b88" uid="19970"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Ballistic" uuid="f4b17a7e-5269-11df-a3da-080069138b88" uid="19971">
+      <subcategory value="1" description="20 mm" uuid="f4b28888-5269-11df-9eb2-080069138b88" uid="19972">
+        <specific value="1" description="M39" uuid="f4b3914c-5269-11df-90d7-080069138b88" uid="19973"/>
+        <specific value="2" description="M56 HEI" uuid="f4b4a3d4-5269-11df-a54b-080069138b88" uid="19974"/>
+        <specific value="3" description="M56A3 HE/I" uuid="f4b5b346-5269-11df-99ff-080069138b88" uid="19975"/>
+        <specific value="4" description="M210 HEI" uuid="f4b6bd90-5269-11df-81a6-080069138b88" uid="19976"/>
+        <specific value="5" description="M242 HE-I-T" uuid="f4b7cd66-5269-11df-8738-080069138b88" uid="19977"/>
+        <specific value="6" description="M246 HEIT-SD" uuid="f4b8dc42-5269-11df-9d3e-080069138b88" uid="19978"/>
+        <specific value="7" description="M246 HEI-T" uuid="f4b9f33e-5269-11df-ab96-080069138b88" uid="19979"/>
+        <specific value="8" description="M940 MPT-SD" uuid="f4bb0300-5269-11df-bc63-080069138b88" uid="19980"/>
+        <specific value="9" description="Mk 149 (Mod2, 4) CIWS" uuid="f4bc140c-5269-11df-870f-080069138b88" uid="19981"/>
+      </subcategory>
+      <subcategory value="2" description="25 mm" uuid="f4bdc766-5269-11df-971d-080069138b88" uid="19982">
+        <specific value="1" description="M792 HEI-T" uuid="f4bed0c0-5269-11df-a6f0-080069138b88" uid="19983"/>
+        <specific value="2" description="PGU-22/25 HE-I" uuid="f4bfe03c-5269-11df-adb1-080069138b88" uid="19984"/>
+        <specific value="3" description="M791 APDS-T" uuid="f4c0f3d2-5269-11df-a260-080069138b88" uid="19985"/>
+        <specific value="4" description="M919 APFSDS-T" uuid="f4c1fd86-5269-11df-90c9-080069138b88" uid="19986"/>
+      </subcategory>
+      <subcategory value="3" description="30 mm" uuid="f4c3ad7a-5269-11df-863a-080069138b88" uid="19987">
+        <specific value="1" description="M789 HEDP" uuid="f4c4bfee-5269-11df-91b0-080069138b88" uid="19988"/>
+        <specific value="2" description="M799 HE-I" uuid="f4c5ce66-5269-11df-a236-080069138b88" uid="19989"/>
+      </subcategory>
+      <subcategory value="4" description="40 mm" uuid="f4c77d42-5269-11df-b42e-080069138b88" uid="19990">
+        <specific value="1" description="Grenade cartridges" uuid="f4c88a3e-5269-11df-9b73-080069138b88" uid="19991"/>
+        <specific value="2" description="M433 HEDP" uuid="f4c999a6-5269-11df-a4d2-080069138b88" uid="19992"/>
+        <specific value="3" description="M397 Airburst" uuid="f4caa8aa-5269-11df-9200-080069138b88" uid="19993"/>
+        <specific value="4" description="M397A1 Airburst" uuid="f4cbb704-5269-11df-a9c1-080069138b88" uid="19994"/>
+        <specific value="5" description="M381 HE" uuid="f4ccc66c-5269-11df-93af-080069138b88" uid="19995"/>
+        <specific value="6" description="M386 HE" uuid="f4cdd5de-5269-11df-b9c8-080069138b88" uid="19996"/>
+        <specific value="7" description="M406 HE" uuid="f4cedf1a-5269-11df-aa77-080069138b88" uid="19997"/>
+        <specific value="8" description="(deprecated)" deprecated="1" uuid="f4cff008-5269-11df-9c04-080069138b88" uid="19998"/>
+        <specific value="9" description="M441 HE" uuid="f4d103a8-5269-11df-ad8f-080069138b88" uid="19999"/>
+        <specific value="10" description="M576 Buckshot" uuid="f4d20e60-5269-11df-9473-080069138b88" uid="20000"/>
+        <specific value="11" description="M583 White star parachute" uuid="f4d31e18-5269-11df-a125-080069138b88" uid="20001"/>
+        <specific value="12" description="M583A1 White star parachute" uuid="f4d4315e-5269-11df-aeab-080069138b88" uid="20002"/>
+        <specific value="13" description="M585 Star cluster" uuid="f4d53f86-5269-11df-8682-080069138b88" uid="20003"/>
+        <specific value="14" description="M651 Tactical CS" uuid="f4d64f02-5269-11df-833c-080069138b88" uid="20004"/>
+        <specific value="15" description="M661 Green star parachute" uuid="f4d75f8c-5269-11df-aadf-080069138b88" uid="20005"/>
+        <specific value="16" description="M662 Red star parachute" uuid="f4d873b8-5269-11df-8b3d-080069138b88" uid="20006"/>
+        <specific value="17" description="M676 Yellow smoke canopy" uuid="f4d988f2-5269-11df-b0d3-080069138b88" uid="20007"/>
+        <specific value="18" description="M680 White smoke canopy" uuid="f4da9a80-5269-11df-971f-080069138b88" uid="20008"/>
+        <specific value="19" description="M682 Red smoke canopy" uuid="f4dba6fa-5269-11df-92dd-080069138b88" uid="20009"/>
+        <specific value="20" description="M713 Red ground smoke marker" uuid="f4dcbbbc-5269-11df-aee3-080069138b88" uid="20010"/>
+        <specific value="21" description="M715 Green ground smoke marker" uuid="f4ddccaa-5269-11df-a92e-080069138b88" uid="20011"/>
+        <specific value="22" description="M716 Yellow ground smoke marker" uuid="f4ded9ce-5269-11df-9853-080069138b88" uid="20012"/>
+        <specific value="23" description="Grenade, HE, 40mm, M383" uuid="f4dfe9f4-5269-11df-afd4-080069138b88" uid="20013"/>
+      </subcategory>
+      <subcategory value="5" description="60 mm" uuid="f4e19e84-5269-11df-88b9-080069138b88" uid="20014">
+        <specific value="1" description="M49A4 HE bomb" uuid="f4e2ad4c-5269-11df-8bfa-080069138b88" uid="20015"/>
+        <specific value="2" description="M49A5 HE bomb" uuid="f4e3b61a-5269-11df-b398-080069138b88" uid="20016"/>
+        <specific value="3" description="M83A3 illuminating bomb" uuid="f4e4ca46-5269-11df-ba88-080069138b88" uid="20017"/>
+        <specific value="4" description="M302A2 smoke bomb" uuid="f4e5db2a-5269-11df-8c78-080069138b88" uid="20018"/>
+        <specific value="5" description="M720 HE bomb" uuid="f4e6e556-5269-11df-ad39-080069138b88" uid="20019"/>
+        <specific value="6" description="Projectile, 60-mm, HE-Frag, M888" uuid="f4e7f7a2-5269-11df-b0f1-080069138b88" uid="20020"/>
+      </subcategory>
+      <subcategory value="6" description="66 mm rocket" uuid="f4e9a926-5269-11df-a6fe-080069138b88" uid="20021"/>
+      <subcategory value="7" description="76 mm" uuid="f4eaba1e-5269-11df-95d2-080069138b88" uid="20022">
+        <specific value="1" description="M352 HE" uuid="f4ebc6e8-5269-11df-99d3-080069138b88" uid="20023"/>
+        <specific value="2" description="M361 smoke" uuid="f4ecd510-5269-11df-aff1-080069138b88" uid="20024"/>
+        <specific value="3" description="M361A1 smoke" uuid="f4ede4d2-5269-11df-af37-080069138b88" uid="20025"/>
+        <specific value="4" description="M363 HE" uuid="f4eef264-5269-11df-909e-080069138b88" uid="20026"/>
+      </subcategory>
+      <subcategory value="8" description="81 mm" uuid="f4f09fd8-5269-11df-a847-080069138b88" uid="20027">
+        <specific value="1" description="M43A1 HE bomb" uuid="f4f1aee6-5269-11df-8ff6-080069138b88" uid="20028"/>
+        <specific value="2" description="M43A1B1 HE bomb" uuid="f4f2c1dc-5269-11df-83b3-080069138b88" uid="20029"/>
+        <specific value="3" description="M57 smoke WP bomb" uuid="f4f3cc3a-5269-11df-9795-080069138b88" uid="20030"/>
+        <specific value="4" description="M57A1 smoke WP bomb" uuid="f4f4dd5a-5269-11df-b115-080069138b88" uid="20031"/>
+        <specific value="5" description="M301A1 illuminating bomb" uuid="f4f5ede4-5269-11df-b32c-080069138b88" uid="20032"/>
+        <specific value="6" description="M301A2 illuminating bomb" uuid="f4f70616-5269-11df-be8c-080069138b88" uid="20033"/>
+        <specific value="7" description="M301A3 illuminating bomb" uuid="f4f817fe-5269-11df-bbe4-080069138b88" uid="20034"/>
+        <specific value="8" description="M362 HE bomb" uuid="f4f928a6-5269-11df-9328-080069138b88" uid="20035"/>
+        <specific value="9" description="M362A1 HE bomb" uuid="f4fa33b8-5269-11df-87d4-080069138b88" uid="20036"/>
+        <specific value="10" description="M370 smoke bomb" uuid="f4fb44d8-5269-11df-a882-080069138b88" uid="20037"/>
+        <specific value="11" description="M374 HE bomb" uuid="f4fc588c-5269-11df-adf3-080069138b88" uid="20038"/>
+        <specific value="12" description="M374A2 HE bomb" uuid="f4fd6204-5269-11df-8491-080069138b88" uid="20039"/>
+        <specific value="13" description="M374A3 HE bomb" uuid="f4fe70fe-5269-11df-9d2a-080069138b88" uid="20040"/>
+        <specific value="14" description="M375 smoke bomb" uuid="f4ff83d6-5269-11df-bcf9-080069138b88" uid="20041"/>
+        <specific value="15" description="M375A1 smoke bomb" uuid="f50091e0-5269-11df-a43d-080069138b88" uid="20042"/>
+        <specific value="16" description="M375A2 smoke bomb" uuid="f501a1e8-5269-11df-ac7c-080069138b88" uid="20043"/>
+        <specific value="17" description="M445 training bomb" uuid="f502ab42-5269-11df-a3d0-080069138b88" uid="20044"/>
+        <specific value="18" description="Projectile, Mortar, 81mm, High Explosive M889A1" uuid="f503bc94-5269-11df-8090-080069138b88" uid="20045"/>
+      </subcategory>
+      <subcategory value="9" description="90 mm" uuid="f50572e6-5269-11df-b0ff-080069138b88" uid="20046">
+        <specific value="1" description="M71 HE" uuid="f50680aa-5269-11df-a2dc-080069138b88" uid="20047"/>
+        <specific value="2" description="M71 A1 HE-T" uuid="f5079094-5269-11df-9637-080069138b88" uid="20048"/>
+        <specific value="3" description="M313 smoke" uuid="f5089bf6-5269-11df-a4ae-080069138b88" uid="20049"/>
+        <specific value="4" description="M313C smoke" uuid="f509b07c-5269-11df-95e3-080069138b88" uid="20050"/>
+      </subcategory>
+      <subcategory value="10" description="105 mm" uuid="f50b5e72-5269-11df-be49-080069138b88" uid="20051">
+        <specific value="1" description="M1 HE" uuid="f50c6d8a-5269-11df-bcac-080069138b88" uid="20052"/>
+        <specific value="2" description="M60 Agent H/HD" uuid="f50d7b9e-5269-11df-a45b-080069138b88" uid="20053"/>
+        <specific value="3" description="M60 smoke" uuid="f50e8c82-5269-11df-8297-080069138b88" uid="20054"/>
+        <specific value="4" description="M84 smoke" uuid="f50f9b90-5269-11df-b531-080069138b88" uid="20055"/>
+        <specific value="5" description="M314 illumination" uuid="f510a9ea-5269-11df-9e6e-080069138b88" uid="20056"/>
+        <specific value="6" description="M314A3, illuminating cartridge" uuid="f511b9b6-5269-11df-9327-080069138b88" uid="20057"/>
+        <specific value="7" description="M327 HEP/HEP-T" uuid="f512caea-5269-11df-a8ef-080069138b88" uid="20058"/>
+        <specific value="8" description="M360 Agent GB" uuid="f513d3fe-5269-11df-9728-080069138b88" uid="20059"/>
+        <specific value="9" description="M393 HEP-T" uuid="f514ebc2-5269-11df-bbe3-080069138b88" uid="20060"/>
+        <specific value="10" description="M413 HE" uuid="f5160124-5269-11df-b23c-080069138b88" uid="20061"/>
+        <specific value="11" description="M416 smoke WP" uuid="f5170b50-5269-11df-bd8b-080069138b88" uid="20062"/>
+        <specific value="12" description="M444 HE" uuid="f5181d2e-5269-11df-bdc7-080069138b88" uid="20063"/>
+        <specific value="13" description="M548 HERA" uuid="f5192f8e-5269-11df-b184-080069138b88" uid="20064"/>
+        <specific value="14" description="M629 tactical CS" uuid="f51a3ce4-5269-11df-bb23-080069138b88" uid="20065"/>
+        <specific value="15" description="M657 HE-T" uuid="f51b4d46-5269-11df-be1b-080069138b88" uid="20066"/>
+        <specific value="16" description="M760 HE" uuid="f51c5b5a-5269-11df-b3df-080069138b88" uid="20067"/>
+        <specific value="17" description="M913 RAP" uuid="f51d6590-5269-11df-a0d4-080069138b88" uid="20068"/>
+        <specific value="18" description="XM872 KE" uuid="f51e7926-5269-11df-beeb-080069138b88" uid="20069"/>
+      </subcategory>
+      <subcategory value="11" description="120 mm" uuid="f520280c-5269-11df-a715-080069138b88" uid="20070">
+        <specific value="1" description="M933HE" uuid="f5213508-5269-11df-a382-080069138b88" uid="20071"/>
+        <specific value="2" description="M934HE" uuid="f52243d0-5269-11df-9e45-080069138b88" uid="20072"/>
+        <specific value="3" description="M57 HE" uuid="f52352a2-5269-11df-9715-080069138b88" uid="20073"/>
+        <specific value="4" description="M68 WP" uuid="f52461b0-5269-11df-baf1-080069138b88" uid="20074"/>
+        <specific value="5" description="M929 WP" uuid="f5256e8e-5269-11df-afb8-080069138b88" uid="20075"/>
+        <specific value="6" description="M91 Illumination" uuid="f5267f90-5269-11df-b584-080069138b88" uid="20076"/>
+        <specific value="7" description="M930 Illumination" uuid="f5278fca-5269-11df-b3d4-080069138b88" uid="20077"/>
+      </subcategory>
+      <subcategory value="12" description="127 mm (5.0 in)" uuid="f5293fc8-5269-11df-aa95-080069138b88" uid="20078">
+        <specific value="1" description="Zuni rocket" uuid="f52a4e2c-5269-11df-84fe-080069138b88" uid="20079"/>
+      </subcategory>
+      <subcategory value="13" description="152 mm" uuid="f52bfd58-5269-11df-b09d-080069138b88" uid="20080"/>
+      <subcategory value="14" description="155 mm" uuid="f52d0cde-5269-11df-b755-080069138b88" uid="20081">
+        <specific value="1" description="BGD155C ICM" uuid="f52e1e26-5269-11df-a649-080069138b88" uid="20082"/>
+        <specific value="2" description="M107 HE" uuid="f52f28ac-5269-11df-bccf-080069138b88" uid="20083">
+          <extra value="1" description="Variable time" uuid="f53038b4-5269-11df-8c58-080069138b88" uid="20084"/>
+          <extra value="2" description="Point detonating" uuid="f5314952-5269-11df-ae78-080069138b88" uid="20085"/>
+        </specific>
+        <specific value="3" description="M483A1 HE DP (ICM)" uuid="f532f7fc-5269-11df-b4a4-080069138b88" uid="20086"/>
+        <specific value="4" description="M485 illumination" uuid="f5340f02-5269-11df-ba75-080069138b88" uid="20087"/>
+        <specific value="5" description="M485A1 illumination" uuid="f53521e4-5269-11df-a434-080069138b88" uid="20088"/>
+        <specific value="6" description="M485A2 illumination" uuid="f53632be-5269-11df-95f7-080069138b88" uid="20089"/>
+        <specific value="7" description="M549 HE RA" uuid="f5373bd2-5269-11df-b6eb-080069138b88" uid="20090"/>
+        <specific value="8" description="M549A1 HE RA" uuid="f5384db0-5269-11df-a024-080069138b88" uid="20091"/>
+        <specific value="9" description="M864 BB ICM" uuid="f539636c-5269-11df-afbd-080069138b88" uid="20092"/>
+        <specific value="10" description="M449 APICM" uuid="f53a6d8e-5269-11df-ad62-080069138b88" uid="20093"/>
+        <specific value="11" description="M731 FASCAM ADAM" uuid="f53b7c1a-5269-11df-8567-080069138b88" uid="20094"/>
+        <specific value="12" description="M741" uuid="f53c8d8a-5269-11df-842a-080069138b88" uid="20095"/>
+        <specific value="13" description="M116A1 HC Smoke" uuid="f53d9b30-5269-11df-ab28-080069138b88" uid="20096"/>
+        <specific value="14" description="M825 WP" uuid="f53eaade-5269-11df-aaa0-080069138b88" uid="20097"/>
+        <specific value="15" description="Projectile, 155-mm, Extended Range, XM982" uuid="f53fbbae-5269-11df-8a96-080069138b88" uid="20098"/>
+        <specific value="16" description="M121 VX" uuid="f540c8b4-5269-11df-91c8-080069138b88" uid="20099"/>
+        <specific value="17" description="M121 GB" uuid="f541dce0-5269-11df-9ebb-080069138b88" uid="20100"/>
+        <specific value="18" description="M692 ADAM" uuid="f542eb12-5269-11df-a636-080069138b88" uid="20101"/>
+        <specific value="19" description="M718 RAAM-L" uuid="f543f520-5269-11df-a0a3-080069138b88" uid="20102"/>
+        <specific value="20" description="M795 HE" uuid="f545076c-5269-11df-8bfc-080069138b88" uid="20103">
+          <extra value="1" description="Variable time" uuid="f54615e4-5269-11df-96bf-080069138b88" uid="20104"/>
+          <extra value="2" description="Point detonating" uuid="f5471e76-5269-11df-93e8-080069138b88" uid="20105"/>
+        </specific>
+        <specific value="21" description="M687 BINARY" uuid="f548d1e4-5269-11df-8a99-080069138b88" uid="20106"/>
+      </subcategory>
+      <subcategory value="15" description="203 mm" uuid="f54a8052-5269-11df-84ad-080069138b88" uid="20107">
+        <specific value="1" description="M106 HE" uuid="f54b8f7e-5269-11df-99a8-080069138b88" uid="20108"/>
+        <specific value="2" description="M404 HE/ICM" uuid="f54ca076-5269-11df-ac7c-080069138b88" uid="20109"/>
+        <specific value="3" description="M422 nuclear" uuid="f54dab1a-5269-11df-a9cd-080069138b88" uid="20110"/>
+        <specific value="4" description="M426 Agent GB" uuid="f54ebbc2-5269-11df-b484-080069138b88" uid="20111"/>
+        <specific value="5" description="M509 HE/ICM" uuid="f54fcca6-5269-11df-a3ed-080069138b88" uid="20112"/>
+        <specific value="6" description="M509 A1, HE/ICM" uuid="f550d5ce-5269-11df-9d87-080069138b88" uid="20113"/>
+        <specific value="7" description="M650 HERA" uuid="f551e6e4-5269-11df-93c6-080069138b88" uid="20114"/>
+        <specific value="8" description="M753 nuclear" uuid="f553036c-5269-11df-91db-080069138b88" uid="20115"/>
+      </subcategory>
+      <subcategory value="16" description="227 mm rocket" uuid="f554b40a-5269-11df-8e08-080069138b88" uid="20116"/>
+      <subcategory value="17" description="(deprecated)" deprecated="1" uuid="f555bd96-5269-11df-83ff-080069138b88" uid="20117"/>
+      <subcategory value="18" description="107 mm" uuid="f556d08c-5269-11df-a785-080069138b88" uid="20118">
+        <specific value="1" description="M328 smoke bomb" uuid="f557e562-5269-11df-af9b-080069138b88" uid="20119"/>
+        <specific value="2" description="M328 A1 smoke bomb" uuid="f558ef98-5269-11df-adab-080069138b88" uid="20120"/>
+        <specific value="3" description="M329 A1 HE bomb" uuid="f559fece-5269-11df-8337-080069138b88" uid="20121"/>
+        <specific value="4" description="M329 A2 HE bomb" uuid="f55b100c-5269-11df-9c71-080069138b88" uid="20122"/>
+        <specific value="5" description="M335 illuminating bomb" uuid="f55c1d80-5269-11df-a6ba-080069138b88" uid="20123"/>
+        <specific value="6" description="M335 A2 illuminating bomb" uuid="f55d2fae-5269-11df-8782-080069138b88" uid="20124"/>
+        <specific value="7" description="M630 tactical CS bomb" uuid="f55e3f66-5269-11df-9900-080069138b88" uid="20125"/>
+      </subcategory>
+      <subcategory value="19" description="7.62 mm" uuid="f55ff43c-5269-11df-a894-080069138b88" uid="20126">
+        <specific value="1" description="A131 (4 Ball &amp; 1 Tracer Mix)" uuid="f560ffa8-5269-11df-ab99-080069138b88" uid="20127"/>
+        <specific value="2" description="M62 (4 Ball &amp; 1 Tracer)" uuid="f5621492-5269-11df-b176-080069138b88" uid="20128"/>
+        <specific value="3" description="M80" uuid="f56336c4-5269-11df-9731-080069138b88" uid="20129"/>
+        <specific value="4" description="A131" uuid="f56444e2-5269-11df-a1e8-080069138b88" uid="20130"/>
+      </subcategory>
+      <subcategory value="20" description="12.7 mm" uuid="f565f418-5269-11df-a839-080069138b88" uid="20131">
+        <specific value="1" description="M2 ball" uuid="f567045c-5269-11df-9ca5-080069138b88" uid="20132"/>
+        <specific value="2" description="M17 tracer" uuid="f5681400-5269-11df-862f-080069138b88" uid="20133"/>
+        <specific value="3" description="M33 ball" uuid="f5692192-5269-11df-833d-080069138b88" uid="20134"/>
+        <specific value="4" description="A621 .50 4 Ball M33/1 Tr M17" uuid="f56a3280-5269-11df-8bb8-080069138b88" uid="20135"/>
+        <specific value="5" description=".50 Inc M1" uuid="f56b4210-5269-11df-9003-080069138b88" uid="20136"/>
+        <specific value="6" description=".50 Tr M1" uuid="f56c4e30-5269-11df-818c-080069138b88" uid="20137"/>
+        <specific value="7" description=".50 AP M2" uuid="f56d5d84-5269-11df-b8c6-080069138b88" uid="20138"/>
+        <specific value="8" description=".50 API M8" uuid="f56e6d64-5269-11df-81cf-080069138b88" uid="20139"/>
+        <specific value="9" description=".50 API-T M20" uuid="f56f763c-5269-11df-8b06-080069138b88" uid="20140"/>
+        <specific value="10" description=".50 Inc M23" uuid="f570893c-5269-11df-bdcf-080069138b88" uid="20141"/>
+        <specific value="11" description="A530 .50 4 AP M2/1 Tr M17" uuid="f571a31c-5269-11df-9e71-080069138b88" uid="20142"/>
+        <specific value="12" description="A534 .50 4 API M8/1 API-T M20" uuid="f572b040-5269-11df-a4ae-080069138b88" uid="20143"/>
+        <specific value="13" description="A539 .50 3 API M8/1 Tr M17" uuid="f573c49e-5269-11df-b85c-080069138b88" uid="20144"/>
+        <specific value="14" description="A540 .50 4 API M8/1 Tr M1" uuid="f574d582-5269-11df-986f-080069138b88" uid="20145"/>
+        <specific value="15" description="A547 .50 1 API M8/1 Inc M1" uuid="f575e29c-5269-11df-9094-080069138b88" uid="20146"/>
+        <specific value="16" description="A549 .50 2 AP M2/2 Inc M1/1 Tr M1" uuid="f576f74a-5269-11df-af29-080069138b88" uid="20147"/>
+        <specific value="17" description="A556 .50 4 Ball M2/1 Tr M1" uuid="f5780842-5269-11df-93e2-080069138b88" uid="20148"/>
+        <specific value="18" description="A557 .50 4 Ball M2/1 Tr M17" uuid="f57914a8-5269-11df-a619-080069138b88" uid="20149"/>
+      </subcategory>
+      <subcategory value="21" description="70 mm (2.75 in) rocket" uuid="f57aca00-5269-11df-b0a9-080069138b88" uid="20150">
+        <specific value="1" description="M 151 HE" uuid="f57bd9d6-5269-11df-bb21-080069138b88" uid="20151"/>
+        <specific value="2" description="M 255 flechette" uuid="f57ce772-5269-11df-916b-080069138b88" uid="20152"/>
+        <specific value="3" description="M 261 submunitions" uuid="f57df2b6-5269-11df-a1fe-080069138b88" uid="20153"/>
+        <specific value="4" description="M 262" uuid="f57f05ca-5269-11df-ae9c-080069138b88" uid="20154"/>
+        <specific value="5" description="M229 HE" uuid="f58014ec-5269-11df-86ac-080069138b88" uid="20155"/>
+        <specific value="6" description="Rocket, 2.75in, Smoke, WP, M264" uuid="f5811ea0-5269-11df-8f13-080069138b88" uid="20156"/>
+      </subcategory>
+      <subcategory value="22" description="175 mm" footnote="The M107 175-mm gun is no longer in service with the U.S. Army but is still used by some other nations." uuid="f582d57e-5269-11df-a809-080069138b88" uid="20157">
+        <specific value="1" description="M437A1 HE" uuid="f583eb30-5269-11df-9b8b-080069138b88" uid="20158"/>
+        <specific value="2" description="M437A2 HE" uuid="f584f99e-5269-11df-89b4-080069138b88" uid="20159"/>
+      </subcategory>
+      <subcategory value="23" description="165 mm" uuid="f586b22a-5269-11df-9c40-080069138b88" uid="20160">
+        <specific value="1" description="HEP" uuid="f587bad0-5269-11df-9130-080069138b88" uid="20161"/>
+      </subcategory>
+      <subcategory value="24" description="(deprecated)" deprecated="1" uuid="f5896d12-5269-11df-baa7-080069138b88" uid="20162"/>
+      <subcategory value="25" description="(deprecated)" deprecated="1" uuid="f58a8c92-5269-11df-8a6f-080069138b88" uid="20163"/>
+      <subcategory value="26" description="(deprecated)" deprecated="1" uuid="f58b9fe2-5269-11df-9586-080069138b88" uid="20164"/>
+      <subcategory value="27" description="(deprecated)" deprecated="1" uuid="f58d220e-5269-11df-b6fd-080069138b88" uid="20165"/>
+      <subcategory value="28" description="(deprecated)" deprecated="1" uuid="f58e3180-5269-11df-8ab8-080069138b88" uid="20166"/>
+      <subcategory value="29" description="(deprecated)" deprecated="1" uuid="f58f7b62-5269-11df-a81b-080069138b88" uid="20167"/>
+      <subcategory value="30" description="(deprecated)" deprecated="1" uuid="f5909d4e-5269-11df-86fe-080069138b88" uid="20168"/>
+      <subcategory value="31" description="(deprecated)" deprecated="1" uuid="f591a86a-5269-11df-89f1-080069138b88" uid="20169"/>
+      <subcategory value="32" description="(deprecated)" deprecated="1" uuid="f592ba7a-5269-11df-8eb9-080069138b88" uid="20170"/>
+      <subcategory value="33" description="(deprecated)" deprecated="1" uuid="f593d388-5269-11df-9e35-080069138b88" uid="20171"/>
+      <subcategory value="34" description="(deprecated)" deprecated="1" uuid="f594e2f0-5269-11df-b42c-080069138b88" uid="20172"/>
+      <subcategory value="35" description="(deprecated)" deprecated="1" uuid="f595f474-5269-11df-aa9f-080069138b88" uid="20173"/>
+      <subcategory value="36" description="(deprecated)" deprecated="1" uuid="f597067a-5269-11df-8d97-080069138b88" uid="20174"/>
+      <subcategory value="37" description="(deprecated)" deprecated="1" uuid="f5981330-5269-11df-babc-080069138b88" uid="20175"/>
+      <subcategory value="38" description="(deprecated)" deprecated="1" uuid="f5992996-5269-11df-bb17-080069138b88" uid="20176"/>
+      <subcategory value="39" description="(deprecated)" deprecated="1" uuid="f59a39f8-5269-11df-89a5-080069138b88" uid="20177"/>
+      <subcategory value="40" description="M76 vehicle smoke grenade" uuid="f59b44ba-5269-11df-8ab2-080069138b88" uid="20178"/>
+      <subcategory value="41" description="M243 smoke grenade" uuid="f59c594a-5269-11df-82c9-080069138b88" uid="20179"/>
+      <subcategory value="42" description="M250 smoke grenade" uuid="f59d6a10-5269-11df-9aa0-080069138b88" uid="20180"/>
+      <subcategory value="43" description="M257 grenade" uuid="f59e72ca-5269-11df-a84e-080069138b88" uid="20181">
+        <specific value="1" description="L8A1/A3 red phosphorous smoke grenade" uuid="f59f82a0-5269-11df-93db-080069138b88" uid="20182"/>
+        <specific value="2" description="L8A1/A3 WP smoke grenade" uuid="f5a09848-5269-11df-a681-080069138b88" uid="20183"/>
+      </subcategory>
+      <subcategory value="44" description="M545 universal fragmentation grenade" uuid="f5a247a6-5269-11df-afee-080069138b88" uid="20184"/>
+      <subcategory value="45" description="M560-series antipersonnel fragmentation grenades" uuid="f5a35290-5269-11df-a738-080069138b88" uid="20185"/>
+      <subcategory value="46" description="Ring Airfoil Grenade (RAG)" uuid="f5a46856-5269-11df-9d9a-080069138b88" uid="20186"/>
+      <subcategory value="47" description="(deprecated)" deprecated="1" uuid="f5a5791c-5269-11df-8f0d-080069138b88" uid="20187"/>
+      <subcategory value="48" description="(deprecated)" deprecated="1" uuid="f5a6862c-5269-11df-9dea-080069138b88" uid="20188"/>
+      <subcategory value="49" description="(deprecated)" deprecated="1" uuid="f5a799d6-5269-11df-9bc4-080069138b88" uid="20189"/>
+      <subcategory value="50" description="B28 nuclear bomb" uuid="f5a8aa24-5269-11df-ba01-080069138b88" uid="20190">
+        <specific value="1" description="B28 EX" uuid="f5a9b4c8-5269-11df-a663-080069138b88" uid="20191"/>
+        <specific value="2" description="B28 FI" uuid="f5aac386-5269-11df-b409-080069138b88" uid="20192"/>
+        <specific value="3" description="B28 IN" uuid="f5abd0f0-5269-11df-85be-080069138b88" uid="20193"/>
+        <specific value="4" description="B28 RE" uuid="f5acde0a-5269-11df-8a48-080069138b88" uid="20194"/>
+        <specific value="5" description="B28 RI" uuid="f5adec50-5269-11df-bb4f-080069138b88" uid="20195"/>
+      </subcategory>
+      <subcategory value="51" description="B43 nuclear bomb" uuid="f5afa61c-5269-11df-920a-080069138b88" uid="20196"/>
+      <subcategory value="52" description="B53 nuclear bomb" uuid="f5b0b50c-5269-11df-9ad8-080069138b88" uid="20197"/>
+      <subcategory value="53" description="B57 nuclear bomb" uuid="f5b1c3c0-5269-11df-a6b0-080069138b88" uid="20198"/>
+      <subcategory value="54" description="B61 nuclear bomb" uuid="f5b2d49a-5269-11df-916a-080069138b88" uid="20199">
+        <specific value="1" description="mod O" uuid="f5b3e3d0-5269-11df-ae4a-080069138b88" uid="20200"/>
+        <specific value="2" description="mod 1" uuid="f5b4ef8c-5269-11df-942f-080069138b88" uid="20201"/>
+        <specific value="3" description="mod 2" uuid="f5b5fe90-5269-11df-aba9-080069138b88" uid="20202"/>
+        <specific value="4" description="mod 3" uuid="f5b70d76-5269-11df-b764-080069138b88" uid="20203"/>
+        <specific value="5" description="mod 4" uuid="f5b814aa-5269-11df-8ba9-080069138b88" uid="20204"/>
+        <specific value="6" description="mod 5" uuid="f5b92688-5269-11df-835e-080069138b88" uid="20205"/>
+      </subcategory>
+      <subcategory value="55" description="B83 nuclear bomb" uuid="f5bad56e-5269-11df-9e55-080069138b88" uid="20206"/>
+      <subcategory value="56" description="BLU-73/B FAE Bomb" uuid="f5bbe6ac-5269-11df-a22d-080069138b88" uid="20207"/>
+      <subcategory value="57" description="BLU-109/B Bomb" uuid="f5bcf01a-5269-11df-8b36-080069138b88" uid="20208">
+        <specific value="1" description="GBU-10G" deprecated="1" uuid="f5be0360-5269-11df-80a6-080069138b88" uid="20209"/>
+        <specific value="2" description="GBU-10H" deprecated="1" uuid="f5bf12fa-5269-11df-a858-080069138b88" uid="20210"/>
+        <specific value="3" description="GBU-10J" deprecated="1" uuid="f5c01f60-5269-11df-bab0-080069138b88" uid="20211"/>
+        <specific value="4" description="GBU-24A" deprecated="1" uuid="f5c12ebe-5269-11df-bfdd-080069138b88" uid="20212"/>
+        <specific value="5" description="GBU-27A" deprecated="1" uuid="f5c24344-5269-11df-b7fe-080069138b88" uid="20213"/>
+        <specific value="6" description="GBU-15(V)-31" deprecated="1" uuid="f5c34e1a-5269-11df-af30-080069138b88" uid="20214"/>
+        <specific value="7" description="GBU-15(V)-32" deprecated="1" uuid="f5c45ec2-5269-11df-af51-080069138b88" uid="20215"/>
+        <specific value="8" description="BLU-109/B Low Drag" uuid="f5c570d2-5269-11df-b510-080069138b88" uid="20216">
+          <extra value="1" description="Impact fuse" uuid="f5c67de2-5269-11df-9779-080069138b88" uid="20217"/>
+          <extra value="2" description=".10 sec delay" uuid="f5c78cd2-5269-11df-b321-080069138b88" uid="20218"/>
+          <extra value="3" description=".25 sec delay" uuid="f5c89c4e-5269-11df-a957-080069138b88" uid="20219"/>
+        </specific>
+      </subcategory>
+      <subcategory value="58" description="CBU 15" uuid="f5cae92c-5269-11df-bf90-080069138b88" uid="20220"/>
+      <subcategory value="59" description="CBU 52" uuid="f5cbfb8c-5269-11df-9efe-080069138b88" uid="20221"/>
+      <subcategory value="60" description="CBU-55" uuid="f5cd0586-5269-11df-86c1-080069138b88" uid="20222">
+        <specific value="1" description="CBU-55/B" uuid="f5ce1cbe-5269-11df-962e-080069138b88" uid="20223"/>
+        <specific value="2" description="CBU-72" uuid="f5cf2c62-5269-11df-9088-080069138b88" uid="20224"/>
+      </subcategory>
+      <subcategory value="61" description="CBU 58" uuid="f5d0de18-5269-11df-a07f-080069138b88" uid="20225"/>
+      <subcategory value="62" description="CBU 71" uuid="f5d1e7cc-5269-11df-8355-080069138b88" uid="20226"/>
+      <subcategory value="63" description="CBU 75" uuid="f5d2f536-5269-11df-97be-080069138b88" uid="20227"/>
+      <subcategory value="64" description="CBU 87" uuid="f5d407c8-5269-11df-ac9d-080069138b88" uid="20228">
+        <specific value="1" description="CBU-87/B (CEM)" uuid="f5d5117c-5269-11df-b58c-080069138b88" uid="20229"/>
+      </subcategory>
+      <subcategory value="65" description="(deprecated)" deprecated="1" uuid="f5d6c0e4-5269-11df-ba60-080069138b88" uid="20230"/>
+      <subcategory value="66" description="CBU 89" uuid="f5d7d092-5269-11df-8b7b-080069138b88" uid="20231"/>
+      <subcategory value="67" description="CBU-97/B" uuid="f5d8e554-5269-11df-86b7-080069138b88" uid="20232"/>
+      <subcategory value="68" description="Direct Airfield Attack Combined Munition Weapon (DAACM)" uuid="f5d9f0ac-5269-11df-97d7-080069138b88" uid="20233"/>
+      <subcategory value="69" description="Durandal" uuid="f5db0492-5269-11df-bbc6-080069138b88" uid="20234"/>
+      <subcategory value="70" description="M117 GP bomb" uuid="f5dc13aa-5269-11df-8146-080069138b88" uid="20235">
+        <specific value="1" description="M117R" uuid="f5dd20f6-5269-11df-8ffb-080069138b88" uid="20236"/>
+      </subcategory>
+      <subcategory value="71" description="Mk-7 Dispenser" uuid="f5decf6e-5269-11df-85eb-080069138b88" uid="20237">
+        <specific value="1" description="CBU-78/B Gator mines (USN)" uuid="f5dfe0a2-5269-11df-afd0-080069138b88" uid="20238"/>
+        <specific value="2" description="CBU-59/B APAM" uuid="f5e0f000-5269-11df-8e29-080069138b88" uid="20239"/>
+      </subcategory>
+      <subcategory value="72" description="Mk-81" uuid="f5e2a36e-5269-11df-8490-080069138b88" uid="20240">
+        <specific value="1" description="Mk-81 Low Drag General Purpose" uuid="f5e3acc8-5269-11df-9873-080069138b88" uid="20241"/>
+        <specific value="2" description="Mk-81 Snakeye" uuid="f5e4bfa0-5269-11df-bda0-080069138b88" uid="20242"/>
+      </subcategory>
+      <subcategory value="73" description="Mk-82" uuid="f5e671d8-5269-11df-9dc8-080069138b88" uid="20243">
+        <specific value="1" description="Mk-82 air inflatable retard" uuid="f5e78050-5269-11df-81ef-080069138b88" uid="20244">
+          <extra value="1" description="Impact fuse" uuid="f5e88aa4-5269-11df-b235-080069138b88" uid="20245"/>
+          <extra value="4" description="Proximity fuse" uuid="f5e99b42-5269-11df-90d7-080069138b88" uid="20246"/>
+        </specific>
+        <specific value="2" description="Mk-82 Low Drag General Purpose" uuid="f5eb4c76-5269-11df-b965-080069138b88" uid="20247">
+          <extra value="1" description="Impact fuse" uuid="f5ec65d4-5269-11df-9de4-080069138b88" uid="20248"/>
+          <extra value="2" description=".10 sec. delay" uuid="f5ed6fe2-5269-11df-aaa9-080069138b88" uid="20249"/>
+          <extra value="3" description=".25 sec. delay" uuid="f5ee7f04-5269-11df-b86c-080069138b88" uid="20250"/>
+        </specific>
+        <specific value="3" description="MK-82 Snakeye" uuid="f5f02f66-5269-11df-beab-080069138b88" uid="20251">
+          <extra value="1" description="Impact fuse" uuid="f5f14432-5269-11df-bc1d-080069138b88" uid="20252"/>
+          <extra value="4" description="Proximity fuse" uuid="f5f24df0-5269-11df-8e0a-080069138b88" uid="20253"/>
+        </specific>
+        <specific value="4" description="BLU-111/B" uuid="f5f3fd8a-5269-11df-9286-080069138b88" uid="20254"/>
+      </subcategory>
+      <subcategory value="74" description="Mk-83" uuid="f5f5aedc-5269-11df-ae05-080069138b88" uid="20255">
+        <specific value="1" description="BLU-110/B" uuid="f5f6bd72-5269-11df-85ed-080069138b88" uid="20256"/>
+      </subcategory>
+      <subcategory value="75" description="Mk-84" uuid="f5f86e74-5269-11df-8714-080069138b88" uid="20257">
+        <specific value="1" description="Mk-84 air inflatable retard" uuid="f5f97ce2-5269-11df-9fdf-080069138b88" uid="20258">
+          <extra value="1" description="Impact fuse" uuid="f5fa866e-5269-11df-86a1-080069138b88" uid="20259"/>
+          <extra value="4" description="Proximity fuse" uuid="f5fba242-5269-11df-a00c-080069138b88" uid="20260"/>
+        </specific>
+        <specific value="2" description="MK-84 Low Drag General Purpose" uuid="f5fd56dc-5269-11df-ae71-080069138b88" uid="20261">
+          <extra value="1" description="Impact fuse" uuid="f5fe672a-5269-11df-90f0-080069138b88" uid="20262"/>
+          <extra value="2" description=".10 sec. delay" uuid="f5ff6e7c-5269-11df-90f4-080069138b88" uid="20263"/>
+          <extra value="3" description=".25 sec delay" uuid="f6007f9c-5269-11df-97ad-080069138b88" uid="20264"/>
+        </specific>
+      </subcategory>
+      <subcategory value="76" description="Sensor Fused Weapon (SFW)" uuid="f602d15c-5269-11df-9f1a-080069138b88" uid="20265"/>
+      <subcategory value="77" description="165mm HEP" uuid="f603e218-5269-11df-8e17-080069138b88" uid="20266"/>
+      <subcategory value="78" description="Napalm" uuid="f604f46e-5269-11df-99fa-080069138b88" uid="20267"/>
+      <subcategory value="79" description="Mine Clearing Lane Charge" uuid="f60603ea-5269-11df-be43-080069138b88" uid="20268"/>
+      <subcategory value="80" description="MLRS Rocket" uuid="f6070f24-5269-11df-b322-080069138b88" uid="20269">
+        <specific value="1" description="M26" uuid="f6081e82-5269-11df-90a2-080069138b88" uid="20270"/>
+        <specific value="2" description="M28A1" uuid="f6092bce-5269-11df-9d12-080069138b88" uid="20271"/>
+        <specific value="3" description="MLRS-ER" uuid="f60a39a6-5269-11df-8582-080069138b88" uid="20272"/>
+      </subcategory>
+      <subcategory value="81" description="5.56 MM" uuid="f60bf0ca-5269-11df-a131-080069138b88" uid="20273">
+        <specific value="1" description="M855 Ball" uuid="f60d006e-5269-11df-9edb-080069138b88" uid="20274"/>
+        <specific value="2" description="M856 Tracer" uuid="f60e0e0a-5269-11df-95ed-080069138b88" uid="20275"/>
+        <specific value="3" description="A064 (4 ball &amp; 1 tracer mix)" uuid="f60f1cc8-5269-11df-963b-080069138b88" uid="20276"/>
+      </subcategory>
+      <subcategory value="82" description="M87 mine canister" uuid="f610cce4-5269-11df-af27-080069138b88" uid="20277"/>
+      <subcategory value="83" description="BLU-82/B" uuid="f611dd5a-5269-11df-a82a-080069138b88" uid="20278"/>
+    </category>
+    <category value="3" description="Fixed" uuid="f6138d1c-5269-11df-ac7a-080069138b88" uid="20279">
+      <subcategory value="1" description="SLAM" uuid="f6149f90-5269-11df-b873-080069138b88" uid="20280"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="225" uuid="f616eaf2-5269-11df-b0bc-080069138b88" uid="20281">
+    <category value="1" description="Guided" uuid="f617f9ba-5269-11df-a562-080069138b88" uid="20282">
+      <subcategory value="1" description="AGM-86B ALCM" uuid="f6190058-5269-11df-a544-080069138b88" uid="20283"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f61a1182-5269-11df-9bd2-080069138b88" uid="20284"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f61b26da-5269-11df-8ffb-080069138b88" uid="20285"/>
+      <subcategory value="4" description="Tomahawk" uuid="f61c30ca-5269-11df-923b-080069138b88" uid="20286">
+        <specific value="1" description="BGM-109A (TLAM-N)" uuid="f61d3f56-5269-11df-beff-080069138b88" uid="20287"/>
+      </subcategory>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="f61ef0c6-5269-11df-ae93-080069138b88" uid="20288"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f620086c-5269-11df-aa4c-080069138b88" uid="20289"/>
+      <subcategory value="7" description="LGM-30G Minuteman III" uuid="f621131a-5269-11df-9b01-080069138b88" uid="20290"/>
+      <subcategory value="8" description="MGM-118 Peacekeeper" uuid="f62222aa-5269-11df-aa09-080069138b88" uid="20291"/>
+      <subcategory value="9" description="UGM-73 Poseidon" uuid="f623382a-5269-11df-826a-080069138b88" uid="20292"/>
+      <subcategory value="10" description="UGM-93A Trident (II)" uuid="f624431e-5269-11df-8f83-080069138b88" uid="20293"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="12" country="225" uuid="f626977c-5269-11df-9e5c-080069138b88" uid="20294">
+    <category value="1" description="Point Effect DE Weapon" uuid="f6279fe6-5269-11df-be8b-080069138b88" uid="20295">
+      <subcategory value="1" description="Laser Weapon" uuid="f628af4e-5269-11df-8bbd-080069138b88" uid="20296">
+        <specific value="1" description="Chemical Oxygen Iodine Laser (COIL)" uuid="f629ca64-5269-11df-a0fc-080069138b88" uid="20297"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Area Effect DE Weapon" uuid="f62c1a76-5269-11df-b738-080069138b88" uid="20298">
+      <subcategory value="1" description="High Power Microwave (HPM) Weapon" uuid="f62d28b2-5269-11df-ad90-080069138b88" uid="20299"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="222" uuid="f62f7a36-5269-11df-9da8-080069138b88" uid="20300">
+    <category value="1" description="Guided" uuid="f63087e6-5269-11df-bf31-080069138b88" uid="20301">
+      <subcategory value="1" description="AA-1 Alkali" uuid="f631937a-5269-11df-baed-080069138b88" uid="20302"/>
+      <subcategory value="2" description="AA-2 Atoll" uuid="f632a3fa-5269-11df-afa1-080069138b88" uid="20303">
+        <specific value="1" description="AA-2C" uuid="f633adae-5269-11df-aa18-080069138b88" uid="20304"/>
+        <specific value="2" description="AA-2D" uuid="f634c00e-5269-11df-85ff-080069138b88" uid="20305"/>
+      </subcategory>
+      <subcategory value="3" description="AA-3 Anab" uuid="f6366b66-5269-11df-888d-080069138b88" uid="20306">
+        <specific value="1" description="AA-3, IR" uuid="f6377cd6-5269-11df-adc2-080069138b88" uid="20307"/>
+        <specific value="2" description="AA-3, radar" uuid="f6388b30-5269-11df-acda-080069138b88" uid="20308"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f63a3a3e-5269-11df-8975-080069138b88" uid="20309"/>
+      <subcategory value="5" description="AA-5 Ash" uuid="f63b43b6-5269-11df-9b46-080069138b88" uid="20310">
+        <specific value="1" description="AA-5, IR" uuid="f63c5670-5269-11df-889f-080069138b88" uid="20311"/>
+        <specific value="2" description="AA-5, radar" uuid="f63d64fc-5269-11df-91d2-080069138b88" uid="20312"/>
+      </subcategory>
+      <subcategory value="6" description="AA-6 Acrid" uuid="f63f25b2-5269-11df-ae46-080069138b88" uid="20313">
+        <specific value="1" description="AA-6, IR" uuid="f6402ee4-5269-11df-80a2-080069138b88" uid="20314"/>
+        <specific value="2" description="AA-6, radar" uuid="f6413e7e-5269-11df-8b06-080069138b88" uid="20315"/>
+      </subcategory>
+      <subcategory value="7" description="AA-7 Apex" uuid="f642f1b0-5269-11df-9140-080069138b88" uid="20316">
+        <specific value="1" description="AA-7, IR" uuid="f6440028-5269-11df-a882-080069138b88" uid="20317"/>
+        <specific value="2" description="AA-7, radar" uuid="f645087e-5269-11df-969a-080069138b88" uid="20318"/>
+      </subcategory>
+      <subcategory value="8" description="AA-8 Aphid" uuid="f646bb7e-5269-11df-bb53-080069138b88" uid="20319">
+        <specific value="1" description="AA-8A Aphid" uuid="f647cb04-5269-11df-84ab-080069138b88" uid="20320"/>
+        <specific value="2" description="AA-8B Aphid" uuid="f648e21e-5269-11df-b3fd-080069138b88" uid="20321"/>
+        <specific value="3" description="AA-8C Aphid" uuid="f649ea9c-5269-11df-afb3-080069138b88" uid="20322"/>
+      </subcategory>
+      <subcategory value="9" description="AA-9 Amos" uuid="f64b9c7a-5269-11df-876a-080069138b88" uid="20323">
+        <specific value="1" description="AA-9, inertial" uuid="f64caad4-5269-11df-94b3-080069138b88" uid="20324"/>
+        <specific value="2" description="AA-9, command update" uuid="f64dba78-5269-11df-bcbf-080069138b88" uid="20325"/>
+        <specific value="3" description="AA-9, radar" uuid="f64ec422-5269-11df-9a23-080069138b88" uid="20326"/>
+      </subcategory>
+      <subcategory value="10" description="AA-10 Alamo" uuid="f6507790-5269-11df-96b3-080069138b88" uid="20327">
+        <specific value="1" description="AA-10A, short burn radar" uuid="f65185e0-5269-11df-89b4-080069138b88" uid="20328"/>
+        <specific value="2" description="AA-10B, short burn, IR" uuid="f6529836-5269-11df-a87d-080069138b88" uid="20329"/>
+        <specific value="3" description="AA-10C, long burn radar" uuid="f653a1fe-5269-11df-a093-080069138b88" uid="20330"/>
+        <specific value="4" description="AA-10D, long burn, IR" uuid="f654b350-5269-11df-8035-080069138b88" uid="20331"/>
+      </subcategory>
+      <subcategory value="11" description="AA-11 Archer" uuid="f656660a-5269-11df-860e-080069138b88" uid="20332"/>
+      <subcategory value="12" description="AA-X-12" uuid="f65774fa-5269-11df-bf1f-080069138b88" uid="20333"/>
+      <subcategory value="13" description="SA-1 Guild" deprecated="1" uuid="f6587f76-5269-11df-83d4-080069138b88" uid="20334"/>
+      <subcategory value="14" description="SA-2 Guideline" uuid="f6599190-5269-11df-af88-080069138b88" uid="20335">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="f65aa526-5269-11df-8ff8-080069138b88" uid="20336"/>
+        <specific value="2" description="SA-2b Guideline Mod 1" uuid="f65baf8e-5269-11df-a8c7-080069138b88" uid="20337"/>
+        <specific value="3" description="SA-2d Guideline Mod3" uuid="f65cbf5a-5269-11df-8ea8-080069138b88" uid="20338"/>
+        <specific value="4" description="SA-2f Guideline Mod5" uuid="f65dd0d4-5269-11df-9d67-080069138b88" uid="20339"/>
+      </subcategory>
+      <subcategory value="15" description="(deprecated)" deprecated="1" uuid="f65f81ea-5269-11df-a57d-080069138b88" uid="20340"/>
+      <subcategory value="16" description="SA-4 Ganef" uuid="f6608fae-5269-11df-a967-080069138b88" uid="20341">
+        <specific value="1" description="SA-4A" uuid="f6619f8e-5269-11df-bc24-080069138b88" uid="20342"/>
+        <specific value="2" description="SA-4B" uuid="f662aea6-5269-11df-8ba3-080069138b88" uid="20343"/>
+      </subcategory>
+      <subcategory value="17" description="SA-5 Gammon" uuid="f6645d8c-5269-11df-ba1f-080069138b88" uid="20344">
+        <specific value="1" description="SA-5A" uuid="f6656984-5269-11df-a5a1-080069138b88" uid="20345"/>
+        <specific value="2" description="SA-5B" uuid="f6667838-5269-11df-8057-080069138b88" uid="20346"/>
+        <specific value="3" description="SA-5C" uuid="f6678e4e-5269-11df-a977-080069138b88" uid="20347"/>
+      </subcategory>
+      <subcategory value="18" description="SA-6 Gainful" uuid="f6694036-5269-11df-80b2-080069138b88" uid="20348">
+        <specific value="1" description="SA-6A" uuid="f66a48f0-5269-11df-91a4-080069138b88" uid="20349"/>
+        <specific value="2" description="SA-6B" uuid="f66b5a38-5269-11df-91ac-080069138b88" uid="20350"/>
+      </subcategory>
+      <subcategory value="19" description="SA-7 Grail" uuid="f66d0798-5269-11df-a5f0-080069138b88" uid="20351">
+        <specific value="1" description="SA-7A" uuid="f66e167e-5269-11df-b0e6-080069138b88" uid="20352"/>
+        <specific value="2" description="SA-7B" uuid="f66f20fa-5269-11df-aeed-080069138b88" uid="20353"/>
+        <specific value="3" description="SA-7B (Spetsnaz mod)" uuid="f6702fc2-5269-11df-a7c5-080069138b88" uid="20354"/>
+        <specific value="4" description="SA-7C" uuid="f6714290-5269-11df-8c1d-080069138b88" uid="20355"/>
+      </subcategory>
+      <subcategory value="20" description="SA-8 Gecko" uuid="f672f464-5269-11df-b395-080069138b88" uid="20356">
+        <specific value="1" description="SA-8A mod 0" uuid="f673fc24-5269-11df-894b-080069138b88" uid="20357"/>
+        <specific value="2" description="SA-8B mod 1" uuid="f6750b5a-5269-11df-a4cb-080069138b88" uid="20358"/>
+      </subcategory>
+      <subcategory value="21" description="SA-9 Gaskin" uuid="f676be14-5269-11df-a35c-080069138b88" uid="20359"/>
+      <subcategory value="22" description="SA-10 Grumble" uuid="f677ccf0-5269-11df-9584-080069138b88" uid="20360">
+        <specific value="1" description="SA-10a Grumble Mod 0" uuid="f678d5dc-5269-11df-a448-080069138b88" uid="20361"/>
+        <specific value="2" description="SA-10b Grumble Mod 1" uuid="f679e74c-5269-11df-8df7-080069138b88" uid="20362"/>
+        <specific value="3" description="SA-10c Grumble Mod 2" uuid="f67afb64-5269-11df-b35f-080069138b88" uid="20363"/>
+      </subcategory>
+      <subcategory value="23" description="SA-11 Gadfly" uuid="f67ca9fa-5269-11df-9559-080069138b88" uid="20364"/>
+      <subcategory value="24" description="SA-12 Gladiator/Giant" uuid="f67db282-5269-11df-b750-080069138b88" uid="20365">
+        <specific value="1" description="SA-12A Gladiator SAM" uuid="f67ec5e6-5269-11df-acf0-080069138b88" uid="20366"/>
+        <specific value="2" description="(deprecated)" deprecated="1" uuid="f67fd9ea-5269-11df-8f2a-080069138b88" uid="20367"/>
+        <specific value="3" description="SA-X-12B Giant SAM" uuid="f680e4c0-5269-11df-a5a8-080069138b88" uid="20368"/>
+        <specific value="4" description="SA-X-12B Giant SAM (rail w/ SS-24)" uuid="f681f4be-5269-11df-9558-080069138b88" uid="20369"/>
+      </subcategory>
+      <subcategory value="25" description="SA-13 Gopher" uuid="f683aa3e-5269-11df-bae6-080069138b88" uid="20370">
+        <specific value="1" description="Strela 10M2" uuid="f684b82a-5269-11df-ac7a-080069138b88" uid="20371"/>
+        <specific value="2" description="Strela 10M3" uuid="f685c9fe-5269-11df-a9f7-080069138b88" uid="20372"/>
+      </subcategory>
+      <subcategory value="26" description="SA-14 Gremlin" uuid="f6877c18-5269-11df-afd2-080069138b88" uid="20373"/>
+      <subcategory value="27" description="SA-15 Gauntlet" uuid="f6888c2a-5269-11df-a285-080069138b88" uid="20374"/>
+      <subcategory value="28" description="SA-16 Gimlet" uuid="f6899dfe-5269-11df-9019-080069138b88" uid="20375"/>
+      <subcategory value="29" description="SA-17 Grizzly" uuid="f68aa6e0-5269-11df-affd-080069138b88" uid="20376"/>
+      <subcategory value="30" description="SA-18" uuid="f68bb6fc-5269-11df-a6a3-080069138b88" uid="20377"/>
+      <subcategory value="31" description="SA-19 Grison" uuid="f68cc678-5269-11df-af7f-080069138b88" uid="20378">
+        <specific value="1" description="SA-N-11" uuid="f68dd360-5269-11df-915a-080069138b88" uid="20379"/>
+      </subcategory>
+      <subcategory value="32" description="SA-N-1 Goa (M-1 Volga-M)" uuid="f68f7f76-5269-11df-a8e3-080069138b88" uid="20380"/>
+      <subcategory value="33" description="SA-N-3 Goblet" uuid="f6909050-5269-11df-a547-080069138b88" uid="20381">
+        <specific value="1" description="SA-N-3 Mod 0" uuid="f691a328-5269-11df-baee-080069138b88" uid="20382"/>
+        <specific value="2" description="SA-N-3B Mod 1" uuid="f692adf4-5269-11df-807c-080069138b88" uid="20383"/>
+      </subcategory>
+      <subcategory value="34" description="SA-N-4 (OSA-M)" uuid="f6946144-5269-11df-a3a7-080069138b88" uid="20384"/>
+      <subcategory value="35" description="SA-N-5 Grail (Strela 2)" uuid="f6957624-5269-11df-9856-080069138b88" uid="20385"/>
+      <subcategory value="36" description="SA-N-6" uuid="f69686ea-5269-11df-b815-080069138b88" uid="20386"/>
+      <subcategory value="37" description="SA-N-7 Gadfly (Smerch/Shtil)" uuid="f6979120-5269-11df-bcd6-080069138b88" uid="20387"/>
+      <subcategory value="38" description="SA-N-8 Gremlin (Strela 3)" uuid="f698a420-5269-11df-886c-080069138b88" uid="20388"/>
+      <subcategory value="39" description="SA-N-9 Tor-M/Klinok" uuid="f699b568-5269-11df-8bf9-080069138b88" uid="20389"/>
+      <subcategory value="40" description="SA-N-11 (9M311)" uuid="f69ac052-5269-11df-89c7-080069138b88" uid="20390"/>
+      <subcategory value="41" description="SA-3 Goa" uuid="f69bd096-5269-11df-81ea-080069138b88" uid="20391"/>
+      <subcategory value="42" description="SA-20 Gargoyle" uuid="f69cdf7c-5269-11df-bb7a-080069138b88" uid="20392"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f69e911e-5269-11df-8a5f-080069138b88" uid="20393">
+      <subcategory value="1" description="12.7 mm" uuid="f69f991a-5269-11df-ab99-080069138b88" uid="20394"/>
+      <subcategory value="2" description="14.5 mm" uuid="f6a0a738-5269-11df-a4c2-080069138b88" uid="20395">
+        <specific value="1" description="API" uuid="f6a1b8ee-5269-11df-9035-080069138b88" uid="20396"/>
+        <specific value="2" description="API-T" uuid="f6a2c1f8-5269-11df-84fa-080069138b88" uid="20397"/>
+        <specific value="3" description="I-T" uuid="f6a3d0c0-5269-11df-a857-080069138b88" uid="20398"/>
+      </subcategory>
+      <subcategory value="3" description="23 mm" uuid="f6a58956-5269-11df-8503-080069138b88" uid="20399">
+        <specific value="1" description="NS HE-I-T OZT" uuid="f6a697e2-5269-11df-90ba-080069138b88" uid="20400"/>
+        <specific value="2" description="NS AP-I BZ" uuid="f6a7a43e-5269-11df-9f0c-080069138b88" uid="20401"/>
+        <specific value="3" description="VYa HE-I-T OZT" uuid="f6a8b36a-5269-11df-8ebd-080069138b88" uid="20402"/>
+        <specific value="4" description="VYa AP-I BZ" uuid="f6a9c138-5269-11df-99f6-080069138b88" uid="20403"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f6ab7758-5269-11df-bd75-080069138b88" uid="20404"/>
+      <subcategory value="5" description="25 mm" uuid="f6ac82ce-5269-11df-9ab2-080069138b88" uid="20405">
+        <specific value="1" description="M1940 HE-I-T UOZR-132" uuid="f6ad90ec-5269-11df-ba96-080069138b88" uid="20406"/>
+        <specific value="2" description="M1940 AP-T UZR-132" uuid="f6ae9ef6-5269-11df-90c2-080069138b88" uid="20407"/>
+        <specific value="3" description="2-M3" uuid="f6afadaa-5269-11df-8ad5-080069138b88" uid="20408"/>
+        <specific value="4" description="2-M8" uuid="f6b0bb78-5269-11df-8acc-080069138b88" uid="20409"/>
+      </subcategory>
+      <subcategory value="6" description="30 mm" uuid="f6b2696e-5269-11df-a219-080069138b88" uid="20410">
+        <specific value="1" description="BR-83 AP-T" uuid="f6b37688-5269-11df-995d-080069138b88" uid="20411"/>
+        <specific value="2" description="OF-83D HE" uuid="f6b48456-5269-11df-a97a-080069138b88" uid="20412"/>
+      </subcategory>
+      <subcategory value="7" description="57 mm" uuid="f6b631d4-5269-11df-91b3-080069138b88" uid="20413"/>
+      <subcategory value="8" description="76 mm" uuid="f6b74114-5269-11df-8152-080069138b88" uid="20414"/>
+      <subcategory value="9" description="85 mm" uuid="f6b85162-5269-11df-ad03-080069138b88" uid="20415"/>
+      <subcategory value="10" description="100 mm" uuid="f6b95aa8-5269-11df-b7b0-080069138b88" uid="20416"/>
+      <subcategory value="11" description="130 mm" uuid="f6ba6a1a-5269-11df-8c08-080069138b88" uid="20417">
+        <specific value="1" description="SM-4-1" uuid="f6bb7a68-5269-11df-9ca8-080069138b88" uid="20418"/>
+      </subcategory>
+      <subcategory value="12" description="37 mm" uuid="f6bd2804-5269-11df-8452-080069138b88" uid="20419"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="222" uuid="f6bf75dc-5269-11df-8420-080069138b88" uid="20420">
+    <category value="1" description="Guided" uuid="f6c0833c-5269-11df-b701-080069138b88" uid="20421">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f6c18a8e-5269-11df-a088-080069138b88" uid="20422"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f6c2a6b2-5269-11df-9328-080069138b88" uid="20423"/>
+      <subcategory value="3" description="AT-1 Snapper" uuid="f6c3b8a4-5269-11df-a7db-080069138b88" uid="20424"/>
+      <subcategory value="4" description="AT-2 Swatter" uuid="f6c4c294-5269-11df-b846-080069138b88" uid="20425">
+        <specific value="1" description="Swatter A/B (radio command)" uuid="f6c5d486-5269-11df-b3b3-080069138b88" uid="20426"/>
+        <specific value="2" description="Swatter C (SACLOS)" uuid="f6c6e470-5269-11df-be11-080069138b88" uid="20427"/>
+      </subcategory>
+      <subcategory value="5" description="AT-3 Sagger" uuid="f6c892de-5269-11df-a06a-080069138b88" uid="20428">
+        <specific value="1" description="Sagger (MCLOS)" uuid="f6c9a03e-5269-11df-a4a6-080069138b88" uid="20429"/>
+      </subcategory>
+      <subcategory value="6" description="AT-4 Spigot" uuid="f6cb4c22-5269-11df-8efc-080069138b88" uid="20430">
+        <specific value="1" description="Spigot A" uuid="f6cc5cd4-5269-11df-98ed-080069138b88" uid="20431"/>
+        <specific value="2" description="Spigot B" uuid="f6cd6732-5269-11df-a319-080069138b88" uid="20432"/>
+      </subcategory>
+      <subcategory value="7" description="AT-5 Spandrel" uuid="f6cf1bcc-5269-11df-9f64-080069138b88" uid="20433"/>
+      <subcategory value="8" description="AT-6 Spiral" uuid="f6d02490-5269-11df-ad9d-080069138b88" uid="20434"/>
+      <subcategory value="9" description="AT-7 Saxhorn" uuid="f6d134de-5269-11df-a5d2-080069138b88" uid="20435">
+        <specific value="1" description="AT-13 Metis-M" uuid="f6d24784-5269-11df-83d5-080069138b88" uid="20436"/>
+      </subcategory>
+      <subcategory value="10" description="AT-8 Songster" uuid="f6d3f4da-5269-11df-8c58-080069138b88" uid="20437"/>
+      <subcategory value="11" description="AT-9" uuid="f6d4fd26-5269-11df-82ef-080069138b88" uid="20438"/>
+      <subcategory value="12" description="AT -10 Stabber" uuid="f6d60df6-5269-11df-8cc2-080069138b88" uid="20439"/>
+      <subcategory value="13" description="AT-11 Sniper" uuid="f6d72146-5269-11df-a664-080069138b88" uid="20440"/>
+      <subcategory value="14" description="AT-12" uuid="f6d82a00-5269-11df-b69f-080069138b88" uid="20441"/>
+      <subcategory value="15" description="AT-14" uuid="f6d93828-5269-11df-be93-080069138b88" uid="20442">
+        <specific value="1" description="AT-14 KORNET-LR" uuid="f6da4a56-5269-11df-aad7-080069138b88" uid="20443"/>
+        <specific value="2" description="AT-14 FAE" uuid="f6db5392-5269-11df-895c-080069138b88" uid="20444"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Ballistic" uuid="f6dda64c-5269-11df-8822-080069138b88" uid="20445">
+      <subcategory value="1" description="23 mm" uuid="f6deb492-5269-11df-a294-080069138b88" uid="20446"/>
+      <subcategory value="2" description="30 mm" uuid="f6dfc3dc-5269-11df-a9d2-080069138b88" uid="20447">
+        <specific value="1" description="30mm AP-T" uuid="f6e0d20e-5269-11df-b9f7-080069138b88" uid="20448"/>
+        <specific value="2" description="30mm APDS-T" uuid="f6e1e220-5269-11df-a4e9-080069138b88" uid="20449"/>
+        <specific value="3" description="30mm APFSDS-T" uuid="f6e2f412-5269-11df-ad39-080069138b88" uid="20450"/>
+      </subcategory>
+      <subcategory value="3" description="64 mm" uuid="f6e4a794-5269-11df-a275-080069138b88" uid="20451">
+        <specific value="1" description="(w/ RPG-18 light anti-armor weapon)" uuid="f6e5b580-5269-11df-8c0a-080069138b88" uid="20452"/>
+      </subcategory>
+      <subcategory value="4" description="73 mm" uuid="f6e764ac-5269-11df-b852-080069138b88" uid="20453">
+        <specific value="1" description="HEAT FS" uuid="f6e87202-5269-11df-9ce7-080069138b88" uid="20454"/>
+        <specific value="2" description="HEAT-FS, PG-7VL" uuid="f6e980de-5269-11df-9295-080069138b88" uid="20455"/>
+      </subcategory>
+      <subcategory value="5" description="76 mm" uuid="f6eb2ee8-5269-11df-9f5b-080069138b88" uid="20456"/>
+      <subcategory value="6" description="80 mm" uuid="f6ec3d56-5269-11df-a859-080069138b88" uid="20457"/>
+      <subcategory value="7" description="82 mm" uuid="f6ed49da-5269-11df-ba01-080069138b88" uid="20458">
+        <specific value="1" description="BK-881 HEAT" uuid="f6ee596a-5269-11df-b1bd-080069138b88" uid="20459"/>
+        <specific value="2" description="BK-881M HEAT" uuid="f6ef65f8-5269-11df-bbc9-080069138b88" uid="20460"/>
+      </subcategory>
+      <subcategory value="8" description="85 mm" uuid="f6f1151a-5269-11df-9c5d-080069138b88" uid="20461">
+        <specific value="1" description="HEAT" uuid="f6f221a8-5269-11df-ae18-080069138b88" uid="20462"/>
+      </subcategory>
+      <subcategory value="9" description="107 mm" uuid="f6f3cd8c-5269-11df-acf4-080069138b88" uid="20463"/>
+      <subcategory value="10" description="115 mm" uuid="f6f4dba0-5269-11df-b220-080069138b88" uid="20464">
+        <specific value="1" description="HEAT-FS" uuid="f6f5ec3e-5269-11df-b7cc-080069138b88" uid="20465"/>
+        <specific value="2" description="HVAPFSDS" uuid="f6f6f8cc-5269-11df-a3c7-080069138b88" uid="20466"/>
+      </subcategory>
+      <subcategory value="11" description="125 mm" uuid="f6f8a5a0-5269-11df-b217-080069138b88" uid="20467">
+        <specific value="1" description="APFSDS-T BM-9" uuid="f6f9b328-5269-11df-85e6-080069138b88" uid="20468"/>
+        <specific value="2" description="APFSDS-T BM-12" uuid="f6fac592-5269-11df-b9a2-080069138b88" uid="20469"/>
+        <specific value="3" description="HEAT-FS BM-14m" uuid="f6fbce60-5269-11df-b2c7-080069138b88" uid="20470"/>
+        <specific value="4" description="HVAPFSDS" uuid="f6fcdd32-5269-11df-bc03-080069138b88" uid="20471"/>
+        <specific value="5" description="APFSDS-T, BM-42M" uuid="f6fdece0-5269-11df-9837-080069138b88" uid="20472"/>
+        <specific value="6" description="HEAT-T, BK-29M" uuid="f6fefaf4-5269-11df-95d0-080069138b88" uid="20473"/>
+        <specific value="7" description="HEAT-T, BK-27" uuid="f7001218-5269-11df-a2bd-080069138b88" uid="20474"/>
+      </subcategory>
+      <subcategory value="12" description="BRAB-200DS HE AP" uuid="f701c216-5269-11df-818c-080069138b88" uid="20475"/>
+      <subcategory value="13" description="BRAB-220 HE AP" uuid="f702d26e-5269-11df-9ca6-080069138b88" uid="20476"/>
+      <subcategory value="14" description="BRAB-500 HE AP" uuid="f703e10e-5269-11df-b6ff-080069138b88" uid="20477"/>
+      <subcategory value="15" description="BRAB-1000 HE AP" uuid="f704f058-5269-11df-b9ab-080069138b88" uid="20478"/>
+      <subcategory value="16" description="PTAB-2.5 bomblet HE anti-armor" uuid="f706004c-5269-11df-9eb4-080069138b88" uid="20479"/>
+      <subcategory value="17" description="122mm" uuid="f70709c4-5269-11df-b856-080069138b88" uid="20480">
+        <specific value="1" description="HEAT" uuid="f7081a44-5269-11df-8295-080069138b88" uid="20481"/>
+      </subcategory>
+      <subcategory value="18" description="120mm" uuid="f709ce16-5269-11df-936c-080069138b88" uid="20482">
+        <specific value="1" description="HEAT-FS" uuid="f70ada68-5269-11df-8a86-080069138b88" uid="20483"/>
+      </subcategory>
+      <subcategory value="19" description="100mm" uuid="f70c8bc4-5269-11df-9fe7-080069138b88" uid="20484">
+        <specific value="1" description="APFSDS-T" uuid="f70d9604-5269-11df-9260-080069138b88" uid="20485"/>
+        <specific value="2" description="HEAT" uuid="f70ea3fa-5269-11df-9441-080069138b88" uid="20486"/>
+        <specific value="3" description="HEAT-FS" uuid="f70fb1dc-5269-11df-be3e-080069138b88" uid="20487"/>
+      </subcategory>
+      <subcategory value="20" description="RPG-7VAT Grenade Launcher" uuid="f711631a-5269-11df-9099-080069138b88" uid="20488"/>
+      <subcategory value="21" description="130 mm" uuid="f7126e36-5269-11df-b517-080069138b88" uid="20489">
+        <specific value="1" description="APC-T BR-482B" uuid="f7137d9e-5269-11df-bb70-080069138b88" uid="20490"/>
+      </subcategory>
+      <subcategory value="22" description="152mm" uuid="f7153ab2-5269-11df-ba21-080069138b88" uid="20491">
+        <specific value="1" description="Projectile, 152-mm, HEAT-FS" uuid="f71648bc-5269-11df-ae6a-080069138b88" uid="20492"/>
+        <specific value="2" description="APC-T, 3BR-540, 152mm" uuid="f71753a6-5269-11df-985a-080069138b88" uid="20493"/>
+      </subcategory>
+      <subcategory value="23" description="105mm" uuid="f719049e-5269-11df-97e0-080069138b88" uid="20494">
+        <specific value="1" description="PG-29V 105mm HEAT (Tandem)" uuid="f71a1546-5269-11df-b7a5-080069138b88" uid="20495"/>
+      </subcategory>
+      <subcategory value="24" description="57mm Air to ground rockets" uuid="f71bc594-5269-11df-bfa7-080069138b88" uid="20496">
+        <specific value="1" description="57mm HEAT rocket, S-5" uuid="f71cd93e-5269-11df-9df4-080069138b88" uid="20497"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="222" uuid="f71fcd9c-5269-11df-9328-080069138b88" uid="20498">
+    <category value="1" description="Guided" uuid="f720df52-5269-11df-b34c-080069138b88" uid="20499">
+      <subcategory value="1" description="SH-01 Galosh (UR-96)" uuid="f721ec30-5269-11df-bb84-080069138b88" uid="20500">
+        <specific value="1" description="(deprecated)" deprecated="1" uuid="f722fcba-5269-11df-a7e2-080069138b88" uid="20501"/>
+        <specific value="2" description="SH-08" uuid="f7240a88-5269-11df-9889-080069138b88" uid="20502"/>
+        <specific value="3" description="SH-11 Gorgon" uuid="f72517ac-5269-11df-a921-080069138b88" uid="20503"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Ballistic" uuid="f72767be-5269-11df-8546-080069138b88" uid="20504">
+      <subcategory value="1" description="30 mm" uuid="f728756e-5269-11df-9b95-080069138b88" uid="20505">
+        <specific value="1" description="UOF-84 HE-I" uuid="f7298530-5269-11df-968c-080069138b88" uid="20506"/>
+        <specific value="2" description="UOR-84 HE-T" uuid="f72a9696-5269-11df-b185-080069138b88" uid="20507"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="222" uuid="f72f2c9c-5269-11df-aea3-080069138b88" uid="20508">
+    <category value="1" description="Guided" uuid="f73039de-5269-11df-956b-080069138b88" uid="20509">
+      <subcategory value="1" description="AS-4 Kitchen" uuid="f7314a9a-5269-11df-97f6-080069138b88" uid="20510"/>
+      <subcategory value="2" description="AS-9 Kyle" uuid="f7326178-5269-11df-a2b7-080069138b88" uid="20511"/>
+      <subcategory value="3" description="AS-12 Kegler" uuid="f7336d52-5269-11df-8135-080069138b88" uid="20512"/>
+      <subcategory value="4" description="AS-11 Kilter" uuid="f7347e5e-5269-11df-bab5-080069138b88" uid="20513">
+        <specific value="1" description="AS-11A, Mod 1 Kilter" uuid="f7358eca-5269-11df-8767-080069138b88" uid="20514"/>
+        <specific value="2" description="AS-11B, Mod 2 Kilter" uuid="f7369e82-5269-11df-b7d9-080069138b88" uid="20515"/>
+      </subcategory>
+      <subcategory value="5" description="KH-31P/X-31 or possibly AS-17" uuid="f738502e-5269-11df-9a0d-080069138b88" uid="20516"/>
+      <subcategory value="6" description="SS-21 Scarab" uuid="f739652c-5269-11df-b50b-080069138b88" uid="20517">
+        <specific value="1" description="Tochka-R" uuid="f73a752a-5269-11df-ace6-080069138b88" uid="20518"/>
+      </subcategory>
+      <subcategory value="7" description="Kh-29MP Kedge anti-radar" uuid="f73c27bc-5269-11df-8aed-080069138b88" uid="20519">
+        <specific value="1" description="Kh-29T Kedge (AS-14A) TV-guided" uuid="f73d38aa-5269-11df-807e-080069138b88" uid="20520"/>
+        <specific value="2" description="Kh-29L Kedge (AS-14B) laser-guided" uuid="f73e5528-5269-11df-a44b-080069138b88" uid="20521"/>
+        <specific value="3" description="Kh-29D Kedge infrared guided" uuid="f73f68be-5269-11df-a7de-080069138b88" uid="20522"/>
+        <specific value="4" description="Kh-29LE Kedge laser guided export" uuid="f74074de-5269-11df-b3be-080069138b88" uid="20523"/>
+        <specific value="5" description="Kh-29ML Kedge" uuid="f7418838-5269-11df-9916-080069138b88" uid="20524"/>
+        <specific value="6" description="Kh-29TE Kedge TV guided" uuid="f7429e4e-5269-11df-b2cd-080069138b88" uid="20525"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="5" country="222" uuid="f745902c-5269-11df-8ee2-080069138b88" uid="20526">
+    <category value="1" description="Guided" uuid="f7469dfa-5269-11df-87fd-080069138b88" uid="20527">
+      <subcategory value="1" description="Antisatellite System" uuid="f747b23a-5269-11df-9091-080069138b88" uid="20528"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="222" uuid="f74a030a-5269-11df-934e-080069138b88" uid="20529">
+    <category value="1" description="Guided" uuid="f74b1718-5269-11df-9f59-080069138b88" uid="20530">
+      <subcategory value="1" description="AS-2 Kipper" uuid="f74c272a-5269-11df-b470-080069138b88" uid="20531"/>
+      <subcategory value="2" description="AS-4 Kitchen" uuid="f74d3958-5269-11df-a590-080069138b88" uid="20532"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f74e4866-5269-11df-8afa-080069138b88" uid="20533"/>
+      <subcategory value="4" description="AS-6 Kingfish" uuid="f74f5b3e-5269-11df-9e12-080069138b88" uid="20534"/>
+      <subcategory value="5" description="AS-13 Kingbolt" uuid="f7506ad8-5269-11df-a60d-080069138b88" uid="20535"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f75178b0-5269-11df-883f-080069138b88" uid="20536"/>
+      <subcategory value="7" description="AS-15 Kent" uuid="f7528f16-5269-11df-bffa-080069138b88" uid="20537">
+        <specific value="1" description="Kh-55 Kent (AS-15A)" uuid="f753a054-5269-11df-b95d-080069138b88" uid="20538"/>
+        <specific value="2" description="Kh-55SM Kent Mod 1 (AS-15B)" uuid="f754abf2-5269-11df-9212-080069138b88" uid="20539"/>
+        <specific value="3" description="Kent Mod 2" uuid="f755c0f0-5269-11df-963a-080069138b88" uid="20540"/>
+      </subcategory>
+      <subcategory value="8" description="SS-N-2 Styx" uuid="f757712a-5269-11df-992e-080069138b88" uid="20541">
+        <specific value="1" description="SS-N-2a" uuid="f75881c8-5269-11df-af23-080069138b88" uid="20542"/>
+        <specific value="2" description="SS-N-2b" uuid="f7598ece-5269-11df-b91d-080069138b88" uid="20543"/>
+        <specific value="3" description="SS-N-2c" uuid="f75a9eea-5269-11df-8c0e-080069138b88" uid="20544"/>
+        <specific value="4" description="SS-N-2d" uuid="f75bb122-5269-11df-81c6-080069138b88" uid="20545"/>
+      </subcategory>
+      <subcategory value="9" description="SS-N-7 Starbright" uuid="f75d6ca6-5269-11df-80d4-080069138b88" uid="20546"/>
+      <subcategory value="10" description="SS-N-9 Siren" uuid="f75e7d08-5269-11df-815f-080069138b88" uid="20547"/>
+      <subcategory value="11" description="SS-N-12 Sandbox" uuid="f75f8c52-5269-11df-988b-080069138b88" uid="20548"/>
+      <subcategory value="12" description="SS-N-19 Shipwreck" uuid="f7609dea-5269-11df-a2df-080069138b88" uid="20549">
+        <specific value="1" description="Boost phase vehicle" uuid="f761ae56-5269-11df-a588-080069138b88" uid="20550"/>
+        <specific value="2" description="Jettisoned vehicle" uuid="f762be68-5269-11df-af80-080069138b88" uid="20551"/>
+        <specific value="3" description="Separated warhead" uuid="f763cf56-5269-11df-b700-080069138b88" uid="20552"/>
+      </subcategory>
+      <subcategory value="13" description="SS-N-22 Sunburn" uuid="f7658418-5269-11df-a5c3-080069138b88" uid="20553"/>
+      <subcategory value="14" description="SS-N-3 Shaddock" uuid="f7668f84-5269-11df-ae69-080069138b88" uid="20554">
+        <specific value="1" description="SS-N-3a" uuid="f7679fdc-5269-11df-9fd2-080069138b88" uid="20555"/>
+        <specific value="2" description="SS-N-3b" uuid="f768b304-5269-11df-934d-080069138b88" uid="20556"/>
+        <specific value="3" description="SS-N-3c" uuid="f769bde4-5269-11df-ab46-080069138b88" uid="20557"/>
+      </subcategory>
+      <subcategory value="15" description="SSC-2b Samlet Cruise" uuid="f76b72d8-5269-11df-af7d-080069138b88" uid="20558"/>
+      <subcategory value="16" description="SSC-1b Sepal" uuid="f76c8434-5269-11df-b10d-080069138b88" uid="20559"/>
+      <subcategory value="17" description="SSC-3 Styx" uuid="f76d96bc-5269-11df-a807-080069138b88" uid="20560"/>
+      <subcategory value="18" description="533-mm torpedo" uuid="f76ea3ae-5269-11df-88de-080069138b88" uid="20561">
+        <specific value="1" description="TE-2" status="new" uuid="977b310c-503c-4ee3-9dd0-6b766d97da3f" uid="22818">
+          <cr value="1674"/>
+        </specific>
+      </subcategory>
+      <subcategory value="19" description="406-mm torpedo" uuid="f76fb924-5269-11df-be93-080069138b88" uid="20562"/>
+      <subcategory value="20" description="(deprecated)" deprecated="1" uuid="f770ca76-5269-11df-a6b6-080069138b88" uid="20563"/>
+      <subcategory value="21" description="(deprecated)" deprecated="1" uuid="f771d8f8-5269-11df-83c4-080069138b88" uid="20564"/>
+      <subcategory value="22" description="SS-N-21 Sampson" uuid="f772edf6-5269-11df-b76e-080069138b88" uid="20565"/>
+      <subcategory value="23" description="SS-N-25 (Kh 35)" uuid="f773ffac-5269-11df-982c-080069138b88" uid="20566"/>
+      <subcategory value="24" description="AS-5 Kelt" uuid="f7750a32-5269-11df-939a-080069138b88" uid="20567"/>
+      <subcategory value="25" description="AS-10 Karen" uuid="f7761d46-5269-11df-984c-080069138b88" uid="20568"/>
+      <subcategory value="26" description="Kh-31 Krypton (AS-17) Non-ARM" uuid="f777338e-5269-11df-8ba1-080069138b88" uid="20569">
+        <specific value="1" description="Kh-31A Krypton (AS-17A)" uuid="f7783fea-5269-11df-97c6-080069138b88" uid="20570"/>
+        <specific value="2" description="Kh-31AD Krypton (AS-17B)" uuid="f77950ec-5269-11df-a9e0-080069138b88" uid="20571"/>
+      </subcategory>
+      <subcategory value="27" description="53 CM Torpedo Thermal (turbine)" uuid="f77b0e3c-5269-11df-aba5-080069138b88" uid="20572"/>
+      <subcategory value="28" description="65 CM Torpedo Thermal" uuid="f77c272c-5269-11df-abc0-080069138b88" uid="20573"/>
+      <subcategory value="29" description="SSC-X-5 (SS-NX-26)" uuid="f77d3478-5269-11df-a114-080069138b88" uid="20574">
+        <specific value="1" description="Yakhont" uuid="f77e4598-5269-11df-a809-080069138b88" uid="20575"/>
+      </subcategory>
+      <subcategory value="30" description="SSC-6 (SS-N-25)" uuid="f77ff8e8-5269-11df-9428-080069138b88" uid="20576"/>
+      <subcategory value="31" description="P-270 Moskit (Kh-41)" uuid="f7810f3a-5269-11df-b987-080069138b88" uid="20577"/>
+      <subcategory value="32" description="M51" uuid="f7821b32-5269-11df-8527-080069138b88" uid="20578"/>
+      <subcategory value="33" description="53-56/51 Torpedo" uuid="f7832af4-5269-11df-9590-080069138b88" uid="20579"/>
+      <subcategory value="34" description="Kh-59M Kazoo (AS-18)" uuid="f784401a-5269-11df-8f4e-080069138b88" uid="20580"/>
+      <subcategory value="35" description="Kh-35 Kayak (AS-20)" uuid="f7854d52-5269-11df-a811-080069138b88" uid="20581"/>
+      <subcategory value="36" description="SS-NX-30 Conventional LACM" uuid="f7865f94-5269-11df-bc3c-080069138b88" uid="20582"/>
+      <subcategory value="37" description="PJ-10" uuid="f787730c-5269-11df-831b-080069138b88" uid="20583"/>
+      <subcategory value="38" description="M-5 Torpedo" uuid="f7887dce-5269-11df-b65a-080069138b88" uid="20584"/>
+      <subcategory value="39" description="USET-80 Torpedo" uuid="f7899150-5269-11df-8d71-080069138b88" uid="20585"/>
+      <subcategory value="40" description="SAET-50 Torpedo" uuid="f78aa7f2-5269-11df-99e1-080069138b88" uid="20586"/>
+      <subcategory value="41" description="SET 53A Torpedo" uuid="f78bb3d6-5269-11df-910e-080069138b88" uid="20587"/>
+      <subcategory value="42" description="3M-14E (Klub) SS-N-17" uuid="f78cc442-5269-11df-8aae-080069138b88" uid="20588"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f78e77b0-5269-11df-99ae-080069138b88" uid="20589">
+      <subcategory value="1" description="12.7 mm" uuid="f78f8b28-5269-11df-b773-080069138b88" uid="20590"/>
+      <subcategory value="2" description="14.5 mm" uuid="f7909644-5269-11df-8865-080069138b88" uid="20591"/>
+      <subcategory value="3" description="23 mm" uuid="f791a692-5269-11df-8ec5-080069138b88" uid="20592"/>
+      <subcategory value="4" description="25 mm" uuid="f792b942-5269-11df-8aab-080069138b88" uid="20593"/>
+      <subcategory value="5" description="30 mm" uuid="f793c6f2-5269-11df-bc83-080069138b88" uid="20594">
+        <specific value="1" description="BR-83 AP-T" uuid="f794d6be-5269-11df-827d-080069138b88" uid="20595"/>
+        <specific value="2" description="OF-83D HE" uuid="f795e68a-5269-11df-ad29-080069138b88" uid="20596"/>
+      </subcategory>
+      <subcategory value="6" description="57 mm" uuid="f7979c3c-5269-11df-8e6b-080069138b88" uid="20597"/>
+      <subcategory value="7" description="76 mm" uuid="f798a6c2-5269-11df-9dcc-080069138b88" uid="20598"/>
+      <subcategory value="8" description="85 mm" uuid="f799bfda-5269-11df-8e6f-080069138b88" uid="20599"/>
+      <subcategory value="9" description="100 mm" uuid="f79ad24e-5269-11df-b1c3-080069138b88" uid="20600"/>
+      <subcategory value="10" description="130 mm" uuid="f79be1b6-5269-11df-b7cf-080069138b88" uid="20601">
+        <specific value="1" description="SM-4-1" uuid="f79cf18c-5269-11df-bca0-080069138b88" uid="20602"/>
+      </subcategory>
+    </category>
+    <category value="3" description="Fixed" uuid="f79f4252-5269-11df-b3d5-080069138b88" uid="20603">
+      <subcategory value="1" description="M-26 mine" uuid="f7a05408-5269-11df-b62e-080069138b88" uid="20604"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="222" uuid="f7a2aaaa-5269-11df-8217-080069138b88" uid="20605">
+    <category value="1" description="Guided" uuid="f7a3b81e-5269-11df-a395-080069138b88" uid="20606">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f7a4c8da-5269-11df-81ae-080069138b88" uid="20607"/>
+      <subcategory value="2" description="SS-N-14 Silex" uuid="f7a5da22-5269-11df-97e3-080069138b88" uid="20608"/>
+      <subcategory value="3" description="SS-N-15 Starfish" uuid="f7a6e930-5269-11df-97df-080069138b88" uid="20609"/>
+      <subcategory value="4" description="SS-N-16 Stallion" uuid="f7a7fbb8-5269-11df-81d2-080069138b88" uid="20610"/>
+      <subcategory value="5" description="533-mm torpedo" uuid="f7a90ddc-5269-11df-80ab-080069138b88" uid="20611">
+        <specific value="1" description="Type 3" uuid="f7aa179a-5269-11df-8b41-080069138b88" uid="20612"/>
+        <specific value="2" description="Type 3 nuclear" uuid="f7ab2d24-5269-11df-9315-080069138b88" uid="20613"/>
+        <specific value="3" description="new passive wake-homing turbine" uuid="f7ac3ef8-5269-11df-91a6-080069138b88" uid="20614"/>
+        <specific value="4" description="new electric" uuid="f7ad4afa-5269-11df-9a32-080069138b88" uid="20615"/>
+      </subcategory>
+      <subcategory value="6" description="406-mm Type 40 torpedo" uuid="f7aefd78-5269-11df-bad3-080069138b88" uid="20616"/>
+      <subcategory value="7" description="650-mm submarine-launched torpedo" uuid="f7b00f6a-5269-11df-9370-080069138b88" uid="20617"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="f7b125b2-5269-11df-acc2-080069138b88" uid="20618"/>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="f7b2365a-5269-11df-b2e7-080069138b88" uid="20619"/>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f7b34798-5269-11df-b133-080069138b88" uid="20620"/>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f7b45a66-5269-11df-b9a1-080069138b88" uid="20621"/>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="f7b56afa-5269-11df-a71d-080069138b88" uid="20622"/>
+      <subcategory value="13" description="Type 45 (light, air-launched)" uuid="f7b67d28-5269-11df-8516-080069138b88" uid="20623"/>
+      <subcategory value="14" description="Type E53 (light, air-launched)" uuid="f7b78f2e-5269-11df-b52f-080069138b88" uid="20624"/>
+      <subcategory value="15" description="Test 71 Torpedo" uuid="f7b8a4cc-5269-11df-b14a-080069138b88" uid="20625"/>
+      <subcategory value="16" description="APR-2 Torpedo" uuid="f7b9bdda-5269-11df-ade1-080069138b88" uid="20626"/>
+      <subcategory value="17" description="APR-3 Torpedo" uuid="f7bacf86-5269-11df-b4fd-080069138b88" uid="20627"/>
+      <subcategory value="18" description="E40-79 Torpedo" uuid="f7bbda70-5269-11df-b68e-080069138b88" uid="20628"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f7bd8fbe-5269-11df-aed8-080069138b88" uid="20629">
+      <subcategory value="1" description="FRAS-1/SUW-N-1 (VETER)" uuid="f7bea084-5269-11df-97d7-080069138b88" uid="20630"/>
+      <subcategory value="2" description="RBU 1000" uuid="f7bfb19a-5269-11df-91e4-080069138b88" uid="20631"/>
+      <subcategory value="3" description="RBU 1200" uuid="f7c0bfae-5269-11df-90c9-080069138b88" uid="20632"/>
+      <subcategory value="4" description="RBU 2500" uuid="f7c1d0c4-5269-11df-86aa-080069138b88" uid="20633"/>
+      <subcategory value="5" description="RBU 6000" uuid="f7c2e2de-5269-11df-aad7-080069138b88" uid="20634"/>
+      <subcategory value="6" description="RBU 12000" uuid="f7c3f002-5269-11df-b9e8-080069138b88" uid="20635"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="222" uuid="f7c65a04-5269-11df-8c44-080069138b88" uid="20636">
+    <category value="2" description="Ballistic" uuid="f7c7628c-5269-11df-8236-080069138b88" uid="20637">
+      <subcategory value="1" description="5.45 mm" uuid="f7c87604-5269-11df-86c2-080069138b88" uid="20638">
+        <specific value="1" description="5.45-mm Soviet pistol (aka 5.45 x 18 mm)" uuid="f7c988d2-5269-11df-bcf5-080069138b88" uid="20639"/>
+        <specific value="2" description="5.45-mm Soviet rifle (aka 5.45 x 39.5 mm and 5.45-mm M74)" uuid="f7ca9786-5269-11df-b610-080069138b88" uid="20640"/>
+      </subcategory>
+      <subcategory value="2" description="7.62 mm" uuid="f7cc4c34-5269-11df-bce6-080069138b88" uid="20641">
+        <specific value="1" description="7.62 x 25-mm Soviet pistol (aka 7.62-mm Tokarev)" uuid="f7cd5d54-5269-11df-b87c-080069138b88" uid="20642"/>
+        <specific value="2" description="7.62 x 38R Nagant Revolver (aka 7.62-mm Soviet revolver and 7.62-mm Nagant gas-seal)" uuid="f7ce722a-5269-11df-961b-080069138b88" uid="20643"/>
+        <specific value="3" description="7.62-mm Soviet M1943 (aka 7.62 x 39 mm, 7.62-mm Kalashnikov, and 7.62-mm obr 43g)" uuid="f7cf876e-5269-11df-b586-080069138b88" uid="20644"/>
+        <specific value="4" description="7.62-mm Mosin-Nagant (aka 7.62 x 54R, 7.62-mm Soviet Rimmed, and 7.62-mm obr 1891)" uuid="f7d09d5c-5269-11df-b823-080069138b88" uid="20645"/>
+      </subcategory>
+      <subcategory value="3" description="9 mm" uuid="f7d2557a-5269-11df-84d9-080069138b88" uid="20646">
+        <specific value="1" description="9-mm Makarov (aka 9 x 18 mm Soviet, 9-mm Stechkin, and 9-mm Type 59)" uuid="f7d36690-5269-11df-9e7c-080069138b88" uid="20647"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f7d51c2e-5269-11df-b15a-080069138b88" uid="20648"/>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="f7d62bdc-5269-11df-8d16-080069138b88" uid="20649"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f7d7458a-5269-11df-802e-080069138b88" uid="20650"/>
+      <subcategory value="7" description="82 mm" uuid="f7d85a88-5269-11df-838e-080069138b88" uid="20651">
+        <specific value="1" description="HE fragmentation (O-881A)" uuid="f7d96914-5269-11df-8cd4-080069138b88" uid="20652"/>
+      </subcategory>
+      <subcategory value="8" description="107-mm M-38 mortar" uuid="f7db1ade-5269-11df-bbc2-080069138b88" uid="20653"/>
+      <subcategory value="9" description="AO-1 SCH bomblet HE submunition" uuid="f7dc2c58-5269-11df-828e-080069138b88" uid="20654"/>
+      <subcategory value="10" description="AO-2.5 bomblet" uuid="f7dd4192-5269-11df-b199-080069138b88" uid="20655"/>
+      <subcategory value="11" description="AO-2.5 HE submunition" uuid="f7de50f0-5269-11df-a75a-080069138b88" uid="20656"/>
+      <subcategory value="12" description="AO-2.5-2 HE submunition" uuid="f7df635a-5269-11df-9abd-080069138b88" uid="20657"/>
+      <subcategory value="13" description="AO-8M2 HE" uuid="f7e07448-5269-11df-bf9e-080069138b88" uid="20658"/>
+      <subcategory value="14" description="AO-10 HE" uuid="f7e183a6-5269-11df-aa4f-080069138b88" uid="20659"/>
+      <subcategory value="15" description="AO-10-6.5 HE" uuid="f7e29408-5269-11df-ba02-080069138b88" uid="20660"/>
+      <subcategory value="16" description="AO-20 HE" uuid="f7e3a4c4-5269-11df-8a00-080069138b88" uid="20661"/>
+      <subcategory value="17" description="AO-20M3 HE" uuid="f7e4afcc-5269-11df-b02e-080069138b88" uid="20662"/>
+      <subcategory value="18" description="AO-25M1 HE" uuid="f7e5c484-5269-11df-91a6-080069138b88" uid="20663"/>
+      <subcategory value="19" description="AO-25M2 HE" uuid="f7e6d5b8-5269-11df-bb08-080069138b88" uid="20664"/>
+      <subcategory value="20" description="AO-100 HE" uuid="f7e7e0d4-5269-11df-8e92-080069138b88" uid="20665"/>
+      <subcategory value="21" description="FAB-50 HE" uuid="f7e8f51e-5269-11df-8f1c-080069138b88" uid="20666"/>
+      <subcategory value="22" description="FAB-70 HE" uuid="f7ea05d0-5269-11df-9af5-080069138b88" uid="20667"/>
+      <subcategory value="23" description="FAB-100 M43 HE" uuid="f7eb1182-5269-11df-b987-080069138b88" uid="20668"/>
+      <subcategory value="24" description="FAB-100 M62 HE" uuid="f7ec2342-5269-11df-aa71-080069138b88" uid="20669"/>
+      <subcategory value="25" description="FAB-250 HE" uuid="f7ed33f4-5269-11df-b539-080069138b88" uid="20670"/>
+      <subcategory value="26" description="FAB-250 M43 HE" uuid="f7ee446a-5269-11df-a777-080069138b88" uid="20671"/>
+      <subcategory value="27" description="FAB-250 M46 HE" uuid="f7ef54fe-5269-11df-a74b-080069138b88" uid="20672"/>
+      <subcategory value="28" description="FAB-250 M54 HE" uuid="f7f0661e-5269-11df-bcd8-080069138b88" uid="20673"/>
+      <subcategory value="29" description="FAB-250 M62 HE" uuid="f7f1740a-5269-11df-9957-080069138b88" uid="20674"/>
+      <subcategory value="30" description="FAB-500 HE" uuid="f7f285fc-5269-11df-b644-080069138b88" uid="20675"/>
+      <subcategory value="31" description="FAB-500 M46 HE" uuid="f7f3978a-5269-11df-b205-080069138b88" uid="20676"/>
+      <subcategory value="32" description="FAB-500 M54 HE" uuid="f7f4a0e4-5269-11df-ac76-080069138b88" uid="20677"/>
+      <subcategory value="33" description="FAB-500 M62 HE" uuid="f7f5b5b0-5269-11df-9655-080069138b88" uid="20678"/>
+      <subcategory value="34" description="FAB-1000 M62 HE" uuid="f7f6ce82-5269-11df-8c99-080069138b88" uid="20679"/>
+      <subcategory value="35" description="FAB-1500 M46 HE" uuid="f7f7dcbe-5269-11df-a46b-080069138b88" uid="20680"/>
+      <subcategory value="36" description="FAB-1500 M54 HE" uuid="f7f8f14e-5269-11df-bfdc-080069138b88" uid="20681"/>
+      <subcategory value="37" description="FAB-3000 M46 HE" uuid="f7fa01d8-5269-11df-b8a1-080069138b88" uid="20682"/>
+      <subcategory value="38" description="KhAB 100-kg (80) mustard gas/lewisite HL" uuid="f7fb0f88-5269-11df-b7b4-080069138b88" uid="20683"/>
+      <subcategory value="39" description="KhAB 100-kg (100) mustard gas/lewisite HL" uuid="f7fc26e8-5269-11df-afcc-080069138b88" uid="20684"/>
+      <subcategory value="40" description="KhAB 250-kg Sarin (GB)" uuid="f7fd34ca-5269-11df-a29a-080069138b88" uid="20685"/>
+      <subcategory value="41" description="M-1 bomblet (35-40 g of liquid explosive)" uuid="f7fe4bf8-5269-11df-86bb-080069138b88" uid="20686"/>
+      <subcategory value="42" description="Mustard gas/lewisite HL (from 500- and 1500-kg spray tanks)" uuid="f7ff6560-5269-11df-94b0-080069138b88" uid="20687"/>
+      <subcategory value="43" description="OFAB-100M HE" uuid="f8007a04-5269-11df-be4d-080069138b88" uid="20688"/>
+      <subcategory value="44" description="OFAB-100MH HE" uuid="f8018476-5269-11df-b508-080069138b88" uid="20689"/>
+      <subcategory value="45" description="OFAB-100NV HE" uuid="f80294d8-5269-11df-be4a-080069138b88" uid="20690"/>
+      <subcategory value="46" description="OFAB-250M HE" uuid="f803a9b8-5269-11df-a185-080069138b88" uid="20691"/>
+      <subcategory value="47" description="OKT-11 bomblet (incendiary or chemical)" uuid="f804b5b0-5269-11df-85ae-080069138b88" uid="20692"/>
+      <subcategory value="48" description="ROSAB bomblet HE" uuid="f805c748-5269-11df-be73-080069138b88" uid="20693"/>
+      <subcategory value="49" description="Soman (GD) (from 250-kg spray tank)" uuid="f806d93a-5269-11df-92bb-080069138b88" uid="20694"/>
+      <subcategory value="50" description="ZAB-1E incendiary (1.5 kg)" uuid="f807ed02-5269-11df-8fb3-080069138b88" uid="20695"/>
+      <subcategory value="51" description="ZAB 500 T Shch incendiary (500 kg)" uuid="f80900f2-5269-11df-a864-080069138b88" uid="20696"/>
+    </category>
+    <category value="3" description="Fixed" uuid="f80ab258-5269-11df-9b31-080069138b88" uid="20697">
+      <subcategory value="1" description="Wooden TMD-B AT mine" uuid="f80bc3a0-5269-11df-8dd8-080069138b88" uid="20698"/>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="f80cd092-5269-11df-97ce-080069138b88" uid="20699"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f80de374-5269-11df-8cc9-080069138b88" uid="20700"/>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="f80ef6a6-5269-11df-872f-080069138b88" uid="20701"/>
+      <subcategory value="5" description="TM-46 AT-blast mine" uuid="f810023a-5269-11df-8a18-080069138b88" uid="20702"/>
+      <subcategory value="6" description="TMN-46 AT-blast mine" uuid="f811153a-5269-11df-bc09-080069138b88" uid="20703"/>
+      <subcategory value="7" description="TM-57 AT mine" uuid="f8122a6a-5269-11df-b322-080069138b88" uid="20704"/>
+      <subcategory value="8" description="TM-62M AT mine (metal casing)" uuid="f813368a-5269-11df-9bdd-080069138b88" uid="20705"/>
+      <subcategory value="9" description="TMK-2 AT shaped-charge mine" uuid="f81448f4-5269-11df-a8c4-080069138b88" uid="20706"/>
+      <subcategory value="10" description="Area-type POMZ-2 AP-fragmentation mine" uuid="f8156680-5269-11df-8f9f-080069138b88" uid="20707"/>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f8167908-5269-11df-b3eb-080069138b88" uid="20708"/>
+      <subcategory value="12" description="MON series AP mine (directional) (MON-50/MON-90/MON-100/MON-200)" uuid="f8178d16-5269-11df-a1d5-080069138b88" uid="20709"/>
+      <subcategory value="13" description="PMN AP-blast mine" uuid="f818a0ac-5269-11df-9974-080069138b88" uid="20710"/>
+      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="f819ad8a-5269-11df-a3f2-080069138b88" uid="20711"/>
+      <subcategory value="15" description="AMD-500" uuid="f81ac350-5269-11df-bbf7-080069138b88" uid="20712"/>
+      <subcategory value="16" description="AMD-1000" uuid="f81bd416-5269-11df-9e8a-080069138b88" uid="20713"/>
+      <subcategory value="17" description="AMG-1" uuid="f81cddde-5269-11df-a9e8-080069138b88" uid="20714"/>
+      <subcategory value="18" description="BDT mine-clearance charge" uuid="f81df26e-5269-11df-beeb-080069138b88" uid="20715"/>
+      <subcategory value="19" description="ITB-2 mine-clearance charge" uuid="f81f05dc-5269-11df-87a6-080069138b88" uid="20716"/>
+      <subcategory value="20" description="KMD-500" uuid="f820126a-5269-11df-961b-080069138b88" uid="20717"/>
+      <subcategory value="21" description="KMD-1000" uuid="f8212150-5269-11df-a73e-080069138b88" uid="20718"/>
+      <subcategory value="22" description="M-08" uuid="f822357c-5269-11df-a64b-080069138b88" uid="20719"/>
+      <subcategory value="23" description="M-12" uuid="f8234034-5269-11df-bd64-080069138b88" uid="20720"/>
+      <subcategory value="24" description="M-16" uuid="f8245172-5269-11df-a337-080069138b88" uid="20721"/>
+      <subcategory value="25" description="M-AG" uuid="f8256382-5269-11df-8316-080069138b88" uid="20722"/>
+      <subcategory value="26" description="M-KB" uuid="f8266d68-5269-11df-ae2f-080069138b88" uid="20723"/>
+      <subcategory value="27" description="M-KB-3" uuid="f8277ffa-5269-11df-83c6-080069138b88" uid="20724"/>
+      <subcategory value="28" description="Mirab" uuid="f8289192-5269-11df-a5cf-080069138b88" uid="20725"/>
+      <subcategory value="29" description="MYaM" uuid="f8299b96-5269-11df-a88a-080069138b88" uid="20726"/>
+      <subcategory value="30" description="MYaRM" uuid="f82aae28-5269-11df-8ff3-080069138b88" uid="20727"/>
+      <subcategory value="31" description="MZ-26" uuid="f82bc308-5269-11df-a810-080069138b88" uid="20728"/>
+      <subcategory value="32" description="OZM bounding AP mine" uuid="f82ccec4-5269-11df-b88d-080069138b88" uid="20729"/>
+      <subcategory value="33" description="OZM-3 bounding AP mine" uuid="f82ddf58-5269-11df-9220-080069138b88" uid="20730"/>
+      <subcategory value="34" description="OZM-4 bounding AP mine" uuid="f82ef3e8-5269-11df-9a19-080069138b88" uid="20731"/>
+      <subcategory value="35" description="OZM-72 bounding AP mine" uuid="f83003d2-5269-11df-8baf-080069138b88" uid="20732"/>
+      <subcategory value="36" description="OZM-160 bounding AP mine" uuid="f83115ba-5269-11df-91d0-080069138b88" uid="20733"/>
+      <subcategory value="37" description="PFM-1 or PMZ AP mine/bomblet" uuid="f8322644-5269-11df-838b-080069138b88" uid="20734"/>
+      <subcategory value="38" description="PGMDM scatterable Anti-tank mine" uuid="f8333be2-5269-11df-9567-080069138b88" uid="20735"/>
+      <subcategory value="39" description="PLT" uuid="f8345432-5269-11df-8ef0-080069138b88" uid="20736"/>
+      <subcategory value="40" description="PLT-3" uuid="f8356534-5269-11df-9e02-080069138b88" uid="20737"/>
+      <subcategory value="41" description="PMD-6 wooden AP mine" uuid="f8367032-5269-11df-86dc-080069138b88" uid="20738"/>
+      <subcategory value="42" description="PMD-6M wooden AP mine" uuid="f8378670-5269-11df-be11-080069138b88" uid="20739"/>
+      <subcategory value="43" description="PMD-7 wooden AP mine" uuid="f8389844-5269-11df-bf2a-080069138b88" uid="20740"/>
+      <subcategory value="44" description="PMD-7ts wooden AP mine" uuid="f839a504-5269-11df-9f81-080069138b88" uid="20741"/>
+      <subcategory value="45" description="PMD-57 wooden AP mine" uuid="f83ab4b2-5269-11df-a1ea-080069138b88" uid="20742"/>
+      <subcategory value="46" description="PMN AP mine" uuid="f83bcd2a-5269-11df-b3d5-080069138b88" uid="20743"/>
+      <subcategory value="47" description="PMN-2 AP mine" uuid="f83cd8a0-5269-11df-b989-080069138b88" uid="20744"/>
+      <subcategory value="48" description="PMN-6" uuid="f83de948-5269-11df-947a-080069138b88" uid="20745"/>
+      <subcategory value="49" description="POMZ-2 AP stake mine" uuid="f83ef9e6-5269-11df-b7ce-080069138b88" uid="20746"/>
+      <subcategory value="50" description="POMZ-2M AP stake mine" uuid="f8400962-5269-11df-be9a-080069138b88" uid="20747"/>
+      <subcategory value="51" description="SPZ-2 mine-clearance charge" uuid="f8411bea-5269-11df-ad36-080069138b88" uid="20748"/>
+      <subcategory value="52" description="SPZ-4 mine-clearance charge" uuid="f8422ecc-5269-11df-acf9-080069138b88" uid="20749"/>
+      <subcategory value="53" description="TM-62 AT mine P2 (plastic casing)" uuid="f8433a1a-5269-11df-92f8-080069138b88" uid="20750"/>
+      <subcategory value="54" description="TM-62B waterproof cardboard casing" uuid="f8444e1e-5269-11df-bfa6-080069138b88" uid="20751"/>
+      <subcategory value="55" description="TM-62D rectangular wooden case" uuid="f8456556-5269-11df-a373-080069138b88" uid="20752"/>
+      <subcategory value="56" description="TM-62 P3 plastic casing" uuid="f84673d8-5269-11df-a543-080069138b88" uid="20753"/>
+      <subcategory value="57" description="TMD-B Anti-tank mine" uuid="f847846c-5269-11df-8b04-080069138b88" uid="20754"/>
+      <subcategory value="58" description="TMD-44 Anti-tank mine" uuid="f8489898-5269-11df-b85e-080069138b88" uid="20755"/>
+      <subcategory value="59" description="UEP" uuid="f849a972-5269-11df-bafb-080069138b88" uid="20756"/>
+      <subcategory value="60" description="UZ-1 Bangalore torpedo" uuid="f84ab9f2-5269-11df-93fb-080069138b88" uid="20757"/>
+      <subcategory value="61" description="UZ-2 Bangalore torpedo" uuid="f84bca72-5269-11df-b7d8-080069138b88" uid="20758"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="222" uuid="f84e1da4-5269-11df-a77f-080069138b88" uid="20759">
+    <category value="1" description="Guided" uuid="f84f2c30-5269-11df-b59c-080069138b88" uid="20760">
+      <subcategory value="1" description="AS-3 Kangaroo" uuid="f850359e-5269-11df-934e-080069138b88" uid="20761"/>
+      <subcategory value="2" description="AS-4 Kitchen" uuid="f8514998-5269-11df-a4d5-080069138b88" uid="20762"/>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="f85263b4-5269-11df-8c10-080069138b88" uid="20763"/>
+      <subcategory value="4" description="AS-7 Kerry" uuid="f8537128-5269-11df-9cd5-080069138b88" uid="20764"/>
+      <subcategory value="5" description="AS-10 Karen" uuid="f8548248-5269-11df-bdb5-080069138b88" uid="20765">
+        <specific value="1" description="AS-10 (radio)" uuid="f855935e-5269-11df-a820-080069138b88" uid="20766"/>
+        <specific value="2" description="AS-10 (laser)" uuid="f856a2ee-5269-11df-841b-080069138b88" uid="20767"/>
+      </subcategory>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="f8585382-5269-11df-b644-080069138b88" uid="20768"/>
+      <subcategory value="7" description="AS-14 Kedge" deprecated="1" uuid="f859660a-5269-11df-95b8-080069138b88" uid="20769"/>
+      <subcategory value="8" description="(deprecated)" deprecated="1" uuid="f85a78ba-5269-11df-b948-080069138b88" uid="20770"/>
+      <subcategory value="9" description="AS-16 Kickback" uuid="f85b898a-5269-11df-b80d-080069138b88" uid="20771">
+        <specific value="1" description="Kh-15 Kickback (AS-16A) nuclear" uuid="f85c9b2c-5269-11df-8d2a-080069138b88" uid="20772"/>
+        <specific value="2" description="Kh-15 Kickback (AS-16B) conventional" uuid="f85db9da-5269-11df-b828-080069138b88" uid="20773"/>
+      </subcategory>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f85f72ca-5269-11df-a7ad-080069138b88" uid="20774"/>
+      <subcategory value="11" description="(deprecated)" deprecated="1" uuid="f8607e54-5269-11df-a8bb-080069138b88" uid="20775"/>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="f86191ea-5269-11df-845f-080069138b88" uid="20776"/>
+      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="f862a8d2-5269-11df-bebd-080069138b88" uid="20777"/>
+      <subcategory value="14" description="(deprecated)" deprecated="1" uuid="f863b51a-5269-11df-b824-080069138b88" uid="20778"/>
+      <subcategory value="15" description="KAB-500N laser-guided HE" uuid="f864c6d0-5269-11df-968e-080069138b88" uid="20779"/>
+      <subcategory value="16" description="KAB-500T TV-guided HE" uuid="f865ddcc-5269-11df-ad5d-080069138b88" uid="20780"/>
+      <subcategory value="17" description="SS-21 Scarab" uuid="f866ebcc-5269-11df-8607-080069138b88" uid="20781">
+        <specific value="1" description="SS-21 W/HE Warhead (9M79F)" uuid="f867fbe8-5269-11df-ac6b-080069138b88" uid="20782"/>
+        <specific value="2" description="SS-21 W/sub-munition warhead (9M79K)" uuid="f8690fb0-5269-11df-94bb-080069138b88" uid="20783"/>
+        <specific value="3" description="SS-21 W/nuclear warhead (9M79B)" uuid="f86a1cfc-5269-11df-965d-080069138b88" uid="20784"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Ballistic" uuid="f86c7650-5269-11df-8a69-080069138b88" uid="20785">
+      <subcategory value="1" description="12.7 mm Soviet machine gun (aka 12.7 x 107mm)" uuid="f86d80e0-5269-11df-a5a8-080069138b88" uid="20786">
+        <specific value="1" description="API type Bz" uuid="f86e95ac-5269-11df-ab65-080069138b88" uid="20787"/>
+        <specific value="2" description="API - T type BZT" uuid="f86fa712-5269-11df-bf09-080069138b88" uid="20788"/>
+      </subcategory>
+      <subcategory value="2" description="14.5 mm Soviet machine gun (aka 14.5 x 114mm)" uuid="f871620a-5269-11df-99a4-080069138b88" uid="20789">
+        <specific value="1" description="API type BS41" uuid="f87273e8-5269-11df-a92f-080069138b88" uid="20790"/>
+        <specific value="2" description="API-T type BZT" uuid="f8738350-5269-11df-a7bb-080069138b88" uid="20791"/>
+        <specific value="3" description="Incendiary type ZP" uuid="f8749600-5269-11df-9ca6-080069138b88" uid="20792"/>
+      </subcategory>
+      <subcategory value="3" description="23 mm" uuid="f8764bf8-5269-11df-a650-080069138b88" uid="20793"/>
+      <subcategory value="4" description="25 mm" uuid="f87756a6-5269-11df-a672-080069138b88" uid="20794">
+        <specific value="1" description="25 mm Soviet 2-M3" uuid="f8786618-5269-11df-9257-080069138b88" uid="20795"/>
+        <specific value="2" description="25 mm Soviet 2-M8" uuid="f87978aa-5269-11df-9561-080069138b88" uid="20796"/>
+      </subcategory>
+      <subcategory value="5" description="30 mm grenade" uuid="f87b2cf4-5269-11df-98a1-080069138b88" uid="20797">
+        <specific value="1" description="HE FRAG" uuid="f87c36ee-5269-11df-b1b5-080069138b88" uid="20798"/>
+      </subcategory>
+      <subcategory value="6" description="37 mm" uuid="f87de7d2-5269-11df-99a9-080069138b88" uid="20799"/>
+      <subcategory value="7" description="40-mm rocket" uuid="f87ef8b6-5269-11df-b982-080069138b88" uid="20800"/>
+      <subcategory value="8" description="45 mm" uuid="f88009c2-5269-11df-8353-080069138b88" uid="20801"/>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="f881159c-5269-11df-a53e-080069138b88" uid="20802"/>
+      <subcategory value="10" description="82 mm (mortar)" uuid="f88226c6-5269-11df-bbe7-080069138b88" uid="20803">
+        <specific value="1" description="82-mm model 0-832 DU HE fragmentation bomb" uuid="f8833c6e-5269-11df-bd33-080069138b88" uid="20804"/>
+      </subcategory>
+      <subcategory value="11" description="100 mm" uuid="f884f310-5269-11df-baaa-080069138b88" uid="20805">
+        <specific value="1" description="HE-FRAG OF-412" uuid="f885fe86-5269-11df-a0bb-080069138b88" uid="20806"/>
+        <specific value="2" description="HE-FRAG OF-17" uuid="f8870ee8-5269-11df-b99c-080069138b88" uid="20807"/>
+      </subcategory>
+      <subcategory value="12" description="107 mm" uuid="f888c36e-5269-11df-8650-080069138b88" uid="20808"/>
+      <subcategory value="13" description="120 mm (mortar)" uuid="f889d3da-5269-11df-abe1-080069138b88" uid="20809">
+        <specific value="1" description="HE bomb F-843" uuid="f88ae04a-5269-11df-a9d3-080069138b88" uid="20810"/>
+        <specific value="2" description="HE bomb OF-843" uuid="f88bf0a2-5269-11df-9435-080069138b88" uid="20811"/>
+        <specific value="3" description="HE bomb OF-843A" uuid="f88d04f6-5269-11df-9732-080069138b88" uid="20812"/>
+        <specific value="4" description="WP" uuid="f88e106c-5269-11df-a4d1-080069138b88" uid="20813"/>
+        <specific value="5" description="HE FRAG" uuid="f88f27f4-5269-11df-8233-080069138b88" uid="20814"/>
+        <specific value="6" description="Illumination" uuid="f8903950-5269-11df-a854-080069138b88" uid="20815"/>
+        <specific value="7" description="Incendiary" uuid="f89148cc-5269-11df-b62f-080069138b88" uid="20816"/>
+        <specific value="8" description="HE-Frag, OF-843B" uuid="f89258fc-5269-11df-8d06-080069138b88" uid="20817"/>
+        <specific value="9" description="HE-Frag, RAP" uuid="f893695e-5269-11df-bfc2-080069138b88" uid="20818"/>
+      </subcategory>
+      <subcategory value="14" description="122 mm" uuid="f8951ca4-5269-11df-b6b2-080069138b88" uid="20819">
+        <specific value="1" description="122mm, High Explosive, 30F-56" uuid="f8962734-5269-11df-8e0b-080069138b88" uid="20820"/>
+        <specific value="2" description="122mm, High Explosive - FRAG, 53-VOF-471G" uuid="f8973a20-5269-11df-aa35-080069138b88" uid="20821"/>
+        <specific value="3" description="122mm, DPICM" uuid="f89850a4-5269-11df-bd5d-080069138b88" uid="20822"/>
+        <specific value="4" description="122mm, HE -Rocket Assist Projectile, 3OF-463" uuid="f8995b84-5269-11df-9f2f-080069138b88" uid="20823"/>
+        <specific value="5" description="122mm, DPICM-ER" uuid="f89a6e2a-5269-11df-936c-080069138b88" uid="20824"/>
+        <specific value="6" description="122mm, Incendiary" uuid="f89b817a-5269-11df-a523-080069138b88" uid="20825"/>
+        <specific value="7" description="122mm, Smoke, S-463" uuid="f89c8d0e-5269-11df-9338-080069138b88" uid="20826"/>
+        <specific value="8" description="122mm, Smoke WP, 3D-4" uuid="f89d9cbc-5269-11df-9006-080069138b88" uid="20827"/>
+        <specific value="9" description="122mm, Laser Guided, KITOLOV-2M" uuid="f89eb192-5269-11df-8862-080069138b88" uid="20828"/>
+      </subcategory>
+      <subcategory value="15" description="122-mm rocket" uuid="f8a06622-5269-11df-a7da-080069138b88" uid="20829">
+        <specific value="1" description="M-21-OF (9M22M)" uuid="f8a1710c-5269-11df-a54a-080069138b88" uid="20830"/>
+        <specific value="2" description="M-21-OF (9M22U)" uuid="f8a281a0-5269-11df-93f1-080069138b88" uid="20831"/>
+        <specific value="3" description="Smoke" uuid="f8a39522-5269-11df-b4dc-080069138b88" uid="20832"/>
+        <specific value="4" description="HE FRAG" uuid="f8a4a2f0-5269-11df-aca0-080069138b88" uid="20833"/>
+        <specific value="5" description="ICM" uuid="f8a5b320-5269-11df-8e6b-080069138b88" uid="20834"/>
+        <specific value="6" description="Illumination" uuid="f8a6c1fc-5269-11df-8a89-080069138b88" uid="20835"/>
+        <specific value="7" description="Incendiary" uuid="f8a7d024-5269-11df-983c-080069138b88" uid="20836"/>
+        <specific value="8" description="Chemical" uuid="f8a8e112-5269-11df-b0ed-080069138b88" uid="20837"/>
+        <specific value="9" description="Jammer" uuid="f8a9f192-5269-11df-9e02-080069138b88" uid="20838"/>
+      </subcategory>
+      <subcategory value="16" description="125 mm" uuid="f8aba280-5269-11df-a045-080069138b88" uid="20839">
+        <specific value="1" description="HE-FRAG OF-19" uuid="f8acafcc-5269-11df-b1e3-080069138b88" uid="20840"/>
+        <specific value="2" description="FRAG-HE-T, OF-26" uuid="f8adc240-5269-11df-af6f-080069138b88" uid="20841"/>
+      </subcategory>
+      <subcategory value="17" description="130 mm" uuid="f8af7bd0-5269-11df-91f8-080069138b88" uid="20842">
+        <specific value="1" description="FRAG-HE OF-482M" uuid="f8b08d0e-5269-11df-ac0d-080069138b88" uid="20843"/>
+      </subcategory>
+      <subcategory value="18" description="139.7-mm rocket" uuid="f8b23df2-5269-11df-ba43-080069138b88" uid="20844">
+        <specific value="1" description="M-14-OF" uuid="f8b34a9e-5269-11df-bf73-080069138b88" uid="20845"/>
+      </subcategory>
+      <subcategory value="19" description="152 mm" uuid="f8b4fd9e-5269-11df-8f10-080069138b88" uid="20846">
+        <specific value="1" description="HE" uuid="f8b60bc6-5269-11df-a739-080069138b88" uid="20847"/>
+        <specific value="2" description="Projectile, 152-mm, Flechette" uuid="f8b71d68-5269-11df-92c3-080069138b88" uid="20848"/>
+        <specific value="3" description="Projectile, 152-mm, ICM" uuid="f8b82d52-5269-11df-a14f-080069138b88" uid="20849"/>
+        <specific value="4" description="Projectile, 152-mm, Incendiary" uuid="f8b93f6c-5269-11df-9918-080069138b88" uid="20850"/>
+        <specific value="5" description="Projectile, 152-mm, Concrete Piercing" uuid="f8ba5064-5269-11df-89f8-080069138b88" uid="20851"/>
+        <specific value="6" description="Projectile, 152-mm, Illuminating" uuid="f8bb5d92-5269-11df-a8e5-080069138b88" uid="20852"/>
+        <specific value="7" description="Projectile, 152-mm, Chemical: VX" uuid="f8bc73e4-5269-11df-bf7d-080069138b88" uid="20853"/>
+        <specific value="8" description="Projectile, 152-mm, Chemical: GD" uuid="f8bd86c6-5269-11df-960c-080069138b88" uid="20854"/>
+        <specific value="9" description="Projectile, 152-mm, Chemical: AC" uuid="f8be9246-5269-11df-802a-080069138b88" uid="20855"/>
+        <specific value="10" description="Projectile, 152-mm, DPICM" uuid="f8bfa7ee-5269-11df-8cca-080069138b88" uid="20856"/>
+        <specific value="11" description="Projectile, 152-mm, DPICM, Base Bleed" uuid="f8c0bb3e-5269-11df-a637-080069138b88" uid="20857"/>
+        <specific value="12" description="Projectile, 152-mm, HE, Base Bleed" uuid="f8c1c858-5269-11df-82eb-080069138b88" uid="20858"/>
+        <specific value="13" description="Projectile, 152-mm, HE-Frag, RAP" uuid="f8c2d9c8-5269-11df-8316-080069138b88" uid="20859"/>
+        <specific value="14" description="Projectile, 152-mm, HE-Frag, 3OF-45" uuid="f8c3f010-5269-11df-a10d-080069138b88" uid="20860"/>
+      </subcategory>
+      <subcategory value="20" description="160 mm (mortar)" uuid="f8c5a108-5269-11df-9146-080069138b88" uid="20861">
+        <specific value="1" description="HE BOMB F-853U" uuid="f8c6ad0a-5269-11df-ac11-080069138b88" uid="20862"/>
+        <specific value="2" description="HE BOMB F-853A" uuid="f8c7bc2c-5269-11df-8df4-080069138b88" uid="20863"/>
+        <specific value="3" description="HE Bomb F-852" uuid="f8c8d134-5269-11df-b67c-080069138b88" uid="20864"/>
+      </subcategory>
+      <subcategory value="21" description="180 mm" uuid="f8ca815a-5269-11df-b025-080069138b88" uid="20865"/>
+      <subcategory value="22" description="203-mm Howitzer" uuid="f8cb8c8a-5269-11df-b5ba-080069138b88" uid="20866">
+        <specific value="1" description="203-mm, High Explosive-Frag" uuid="f8cca476-5269-11df-8a9a-080069138b88" uid="20867"/>
+        <specific value="2" description="203-mm, DPICM" uuid="f8cdbb04-5269-11df-96ce-080069138b88" uid="20868"/>
+        <specific value="3" description="203-mm, HE-Concrete Piercing" uuid="f8cec5d0-5269-11df-b5c4-080069138b88" uid="20869"/>
+        <specific value="4" description="203-mm, HE, OF-43" uuid="f8cfd7ea-5269-11df-9854-080069138b88" uid="20870"/>
+        <specific value="5" description="203-mm, HE-RAP" uuid="f8d0ec52-5269-11df-9387-080069138b88" uid="20871"/>
+        <specific value="6" description="203-mm, HE-Frag, Base Bleed" uuid="f8d1f804-5269-11df-99b8-080069138b88" uid="20872"/>
+        <specific value="7" description="203-mm, DPICM, Base Bleed" uuid="f8d30b68-5269-11df-88b8-080069138b88" uid="20873"/>
+      </subcategory>
+      <subcategory value="23" description="220-mm rocket" uuid="f8d4bf3a-5269-11df-8aba-080069138b88" uid="20874"/>
+      <subcategory value="24" description="240 mm (mortar)" uuid="f8d5d262-5269-11df-af7d-080069138b88" uid="20875">
+        <specific value="1" description="F-864 HE bomb" uuid="f8d6dd92-5269-11df-b422-080069138b88" uid="20876"/>
+      </subcategory>
+      <subcategory value="25" description="240-mm rocket" uuid="f8d890a6-5269-11df-a0e3-080069138b88" uid="20877"/>
+      <subcategory value="26" description="250-mm rocket" uuid="f8d9a1c6-5269-11df-95a6-080069138b88" uid="20878"/>
+      <subcategory value="27" description="400-mm rocket" uuid="f8dab278-5269-11df-8601-080069138b88" uid="20879"/>
+      <subcategory value="28" description="550-mm rocket" uuid="f8dbc10e-5269-11df-8cad-080069138b88" uid="20880"/>
+      <subcategory value="29" description="600-mm rocket" uuid="f8dcd206-5269-11df-b175-080069138b88" uid="20881"/>
+      <subcategory value="30" description="850-mm missile" uuid="f8dde326-5269-11df-8773-080069138b88" uid="20882"/>
+      <subcategory value="31" description="1100-mm missile" uuid="f8deee4c-5269-11df-8e98-080069138b88" uid="20883"/>
+      <subcategory value="32" description="250 SHN HE (parachute-retarded)" uuid="f8e00462-5269-11df-b488-080069138b88" uid="20884"/>
+      <subcategory value="33" description="500 SH HE (parachute-retarded)" uuid="f8e11640-5269-11df-9c46-080069138b88" uid="20885"/>
+      <subcategory value="34" description="BETAB-150DS HE concrete-piercing" uuid="f8e224cc-5269-11df-8bef-080069138b88" uid="20886"/>
+      <subcategory value="35" description="OF-841A HE fragmentation bomb" uuid="f8e33f38-5269-11df-90c2-080069138b88" uid="20887"/>
+      <subcategory value="36" description="81mm smoke grenade" uuid="f8e45238-5269-11df-91ff-080069138b88" uid="20888"/>
+      <subcategory value="37" description="Frog-7" uuid="f8e55f34-5269-11df-8c41-080069138b88" uid="20889"/>
+      <subcategory value="38" description="57 mm rocket" uuid="f8e6714e-5269-11df-9c37-080069138b88" uid="20890">
+        <specific value="1" description="S5" uuid="f8e780fc-5269-11df-a538-080069138b88" uid="20891"/>
+      </subcategory>
+      <subcategory value="39" description="73mm" uuid="f8e9335c-5269-11df-b593-080069138b88" uid="20892">
+        <specific value="1" description="HE FRAG" uuid="f8ea3da6-5269-11df-b526-080069138b88" uid="20893"/>
+      </subcategory>
+      <subcategory value="40" description="80mm rocket" uuid="f8ebf9ac-5269-11df-a130-080069138b88" uid="20894">
+        <specific value="1" description="S8" uuid="f8ed08c4-5269-11df-9d1e-080069138b88" uid="20895"/>
+      </subcategory>
+      <subcategory value="41" description="8/mm grenade" uuid="f8eeb9bc-5269-11df-b7e7-080069138b88" uid="20896">
+        <specific value="1" description="RP" uuid="f8efcdd4-5269-11df-9597-080069138b88" uid="20897"/>
+      </subcategory>
+      <subcategory value="42" description="115mm" uuid="f8f17d64-5269-11df-a7b1-080069138b88" uid="20898">
+        <specific value="1" description="HE FRAG" uuid="f8f2875e-5269-11df-be90-080069138b88" uid="20899"/>
+      </subcategory>
+      <subcategory value="43" description="120mm (gun/mortar)" uuid="f8f43a22-5269-11df-9a51-080069138b88" uid="20900">
+        <specific value="1" description="Incendiary" uuid="f8f54aac-5269-11df-947d-080069138b88" uid="20901"/>
+        <specific value="2" description="HE FRAG" uuid="f8f6689c-5269-11df-99b0-080069138b88" uid="20902"/>
+        <specific value="3" description="Illumination" uuid="f8f7816e-5269-11df-b207-080069138b88" uid="20903"/>
+        <specific value="4" description="WP" uuid="f8f8914e-5269-11df-ae74-080069138b88" uid="20904"/>
+        <specific value="5" description="HE-Frag-RAP" uuid="f8f9a2b4-5269-11df-a09b-080069138b88" uid="20905"/>
+        <specific value="6" description="HE-Frag-Laser Guided" uuid="f8fab2c6-5269-11df-9825-080069138b88" uid="20906"/>
+      </subcategory>
+      <subcategory value="44" description="MCLC" uuid="f8fc62d8-5269-11df-81fa-080069138b88" uid="20907"/>
+      <subcategory value="45" description="300-mm rocket" uuid="f8fd7146-5269-11df-9110-080069138b88" uid="20908">
+        <specific value="1" description="9M5K1 rocket" uuid="f8fe8658-5269-11df-a5b1-080069138b88" uid="20909"/>
+      </subcategory>
+      <subcategory value="46" description="200-mm rocket" uuid="f90035d4-5269-11df-875d-080069138b88" uid="20910"/>
+      <subcategory value="47" description="30mm autocannon ammunition" uuid="f9014410-5269-11df-9f98-080069138b88" uid="20911">
+        <specific value="1" description="30mm HE-Frag" uuid="f902553a-5269-11df-9a09-080069138b88" uid="20912"/>
+      </subcategory>
+      <subcategory value="48" description="40mm" uuid="f9040984-5269-11df-b9b9-080069138b88" uid="20913">
+        <specific value="1" description="40mm VOG-25" uuid="f9051932-5269-11df-9d91-080069138b88" uid="20914"/>
+        <specific value="2" description="40mm VOG-25P" uuid="f90624b2-5269-11df-b850-080069138b88" uid="20915"/>
+      </subcategory>
+      <subcategory value="49" description="Flame weapons" uuid="f907d7f8-5269-11df-8ab1-080069138b88" uid="20916">
+        <specific value="1" description="Rocket, incendiary, 93mm (RPO)" uuid="f908e85a-5269-11df-a994-080069138b88" uid="20917"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="222" uuid="f90bea14-5269-11df-beda-080069138b88" uid="20918">
+    <category value="1" description="Guided" uuid="f90cf8a0-5269-11df-a001-080069138b88" uid="20919">
+      <subcategory value="1" description="SS-N-5 Sark" uuid="f90e0394-5269-11df-a165-080069138b88" uid="20920"/>
+      <subcategory value="2" description="SS-N-6 Serb" uuid="f90f1658-5269-11df-8ccb-080069138b88" uid="20921">
+        <specific value="1" description="SS-N-6" uuid="f9102746-5269-11df-80c8-080069138b88" uid="20922"/>
+        <specific value="2" description="SS-N-6 Mod 1" uuid="f911328a-5269-11df-8408-080069138b88" uid="20923"/>
+        <specific value="3" description="SS-N-6 Mod 2" uuid="f9124134-5269-11df-80b6-080069138b88" uid="20924"/>
+      </subcategory>
+      <subcategory value="3" description="SS-N-8 Sawfly" uuid="f913f448-5269-11df-b0e3-080069138b88" uid="20925"/>
+      <subcategory value="4" description="SS-N-17 Snipe" uuid="f9150658-5269-11df-9806-080069138b88" uid="20926"/>
+      <subcategory value="5" description="SS-N-18 Stingray" uuid="f91613fe-5269-11df-86ea-080069138b88" uid="20927"/>
+      <subcategory value="6" description="SS-N-20 Sturgeon" uuid="f9172488-5269-11df-b55e-080069138b88" uid="20928"/>
+      <subcategory value="7" description="SS-N-23 Skiff" uuid="f918365c-5269-11df-ae02-080069138b88" uid="20929"/>
+      <subcategory value="8" description="SS-N-21 Sampson" uuid="f91942d6-5269-11df-be4b-080069138b88" uid="20930"/>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="f91a5586-5269-11df-87fb-080069138b88" uid="20931"/>
+      <subcategory value="10" description="(deprecated)" deprecated="1" uuid="f91b66ce-5269-11df-beee-080069138b88" uid="20932"/>
+      <subcategory value="11" description="AS-15 Kent" uuid="f91c769a-5269-11df-9d28-080069138b88" uid="20933">
+        <specific value="1" description="AS-15A (Tu-95 Bear-H) w/nuclear warhead" uuid="f91d8724-5269-11df-859b-080069138b88" uid="20934"/>
+        <specific value="2" description="AS-15B (Tu-160 Blackjack) w/nuclear warhead" uuid="f91e9b6e-5269-11df-8d22-080069138b88" uid="20935"/>
+      </subcategory>
+      <subcategory value="12" description="(deprecated)" deprecated="1" uuid="f9204fc2-5269-11df-a514-080069138b88" uid="20936"/>
+      <subcategory value="13" description="(deprecated)" deprecated="1" uuid="f9215c96-5269-11df-a2a4-080069138b88" uid="20937"/>
+      <subcategory value="14" description="SS-11 Sego" uuid="f9226ed8-5269-11df-ad53-080069138b88" uid="20938"/>
+      <subcategory value="15" description="SS-13 Savage" uuid="f92383a4-5269-11df-b397-080069138b88" uid="20939"/>
+      <subcategory value="16" description="SS-16 Sinner" uuid="f9248dda-5269-11df-925b-080069138b88" uid="20940"/>
+      <subcategory value="17" description="SS-17 Spanker" uuid="f9259ea0-5269-11df-aac8-080069138b88" uid="20941"/>
+      <subcategory value="18" description="SS-18 Satan" uuid="f926b376-5269-11df-ade8-080069138b88" uid="20942"/>
+      <subcategory value="19" description="SS-19 Stiletto" uuid="f927beb0-5269-11df-bb22-080069138b88" uid="20943"/>
+      <subcategory value="20" description="SS-20 Saber" uuid="f928d548-5269-11df-bbd2-080069138b88" uid="20944"/>
+      <subcategory value="21" description="SS-24 Scapel" uuid="f929e802-5269-11df-823c-080069138b88" uid="20945"/>
+      <subcategory value="22" description="SS-25 Sickle" uuid="f92af83c-5269-11df-b229-080069138b88" uid="20946">
+        <specific value="1" description="RS-12m (Topol)" uuid="f92c0826-5269-11df-a8fa-080069138b88" uid="20947"/>
+        <specific value="2" description="RS-12 M1 (Topol-M)" uuid="f92d17a2-5269-11df-a45f-080069138b88" uid="20948"/>
+        <specific value="3" description="RS-12 M2 (Topol-M, silo based)" uuid="f92e27aa-5269-11df-b968-080069138b88" uid="20949"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="222" uuid="f9311c44-5269-11df-882a-080069138b88" uid="20950">
+    <category value="2" description="Ballistic" uuid="f9322ec2-5269-11df-819c-080069138b88" uid="20951">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f933388a-5269-11df-adc0-080069138b88" uid="20952"/>
+      <subcategory value="2" description="SCUD-B" uuid="f9344b08-5269-11df-b103-080069138b88" uid="20953"/>
+      <subcategory value="3" description="SCUD-C" deprecated="1" uuid="f9355c5a-5269-11df-a9ae-080069138b88" uid="20954"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="224" uuid="f937b2de-5269-11df-85fb-080069138b88" uid="20955">
+    <category value="1" description="Guided" uuid="f938c1b0-5269-11df-ba28-080069138b88" uid="20956">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f939d58c-5269-11df-9057-080069138b88" uid="20957"/>
+      <subcategory value="2" description="Rapier Mk 1" uuid="f93aee22-5269-11df-9c00-080069138b88" uid="20958"/>
+      <subcategory value="3" description="Rapier Mk 2" uuid="f93c03b6-5269-11df-b458-080069138b88" uid="20959">
+        <specific value="1" description="Rapier Mk 2A (impact fuze)" uuid="f93d0e14-5269-11df-8504-080069138b88" uid="20960"/>
+        <specific value="2" description="Rapier Mk 2B (proximity fuze)" uuid="f93e1e58-5269-11df-ab0f-080069138b88" uid="20961"/>
+      </subcategory>
+      <subcategory value="4" description="Seacat/Tigercat" uuid="f93fd144-5269-11df-a8a4-080069138b88" uid="20962"/>
+      <subcategory value="5" description="Blowpipe" uuid="f940e5de-5269-11df-a16e-080069138b88" uid="20963"/>
+      <subcategory value="6" description="Javelin" uuid="f941f078-5269-11df-b587-080069138b88" uid="20964"/>
+      <subcategory value="7" description="Star Streak" uuid="f942ff18-5269-11df-a9d1-080069138b88" uid="20965"/>
+      <subcategory value="8" description="Sea Dart" uuid="f9441100-5269-11df-b6c2-080069138b88" uid="20966">
+        <specific value="1" description="GWS 30" uuid="f9451fa0-5269-11df-a3da-080069138b88" uid="20967"/>
+      </subcategory>
+      <subcategory value="9" description="Sea Wolf" uuid="f946cfa8-5269-11df-8a4e-080069138b88" uid="20968">
+        <specific value="1" description="GWS 25" uuid="f947e780-5269-11df-a949-080069138b88" uid="20969"/>
+        <specific value="2" description="GWS 26 Mod 1" uuid="f948f936-5269-11df-a9b1-080069138b88" uid="20970"/>
+      </subcategory>
+      <subcategory value="10" description="Sky Flash" uuid="f94aac54-5269-11df-bfee-080069138b88" uid="20971"/>
+      <subcategory value="11" description="ASRAAM" uuid="f94bb658-5269-11df-bbe7-080069138b88" uid="20972"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="224" uuid="f94e0aa2-5269-11df-9f7d-080069138b88" uid="20973">
+    <category value="1" description="Guided" uuid="f94f16fe-5269-11df-8046-080069138b88" uid="20974">
+      <subcategory value="1" description="Milan missile" uuid="f9502918-5269-11df-9513-080069138b88" uid="20975"/>
+      <subcategory value="2" description="Swingfire missile" uuid="f9513a88-5269-11df-b26f-080069138b88" uid="20976"/>
+      <subcategory value="3" description="Merlin" uuid="f9524518-5269-11df-b329-080069138b88" uid="20977"/>
+      <subcategory value="4" description="FI TOW" uuid="f953576e-5269-11df-8bd3-080069138b88" uid="20978"/>
+      <subcategory value="5" description="Trigat" uuid="f9546bcc-5269-11df-817e-080069138b88" uid="20979"/>
+      <subcategory value="6" description="LAW 80" uuid="f9557616-5269-11df-ab88-080069138b88" uid="20980"/>
+      <subcategory value="7" description="SWAARM" uuid="f95684ca-5269-11df-aae4-080069138b88" uid="20981"/>
+      <subcategory value="8" description="Wolverine" uuid="f95796e4-5269-11df-b9bc-080069138b88" uid="20982"/>
+      <subcategory value="9" description="Brimstone" uuid="f958a53e-5269-11df-b5cb-080069138b88" uid="20983"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f95a533e-5269-11df-a5e7-080069138b88" uid="20984">
+      <subcategory value="1" description="30mm RARDEN APDS" uuid="f95b62d8-5269-11df-bbda-080069138b88" uid="20985"/>
+      <subcategory value="2" description="120mm APFSDS-T (L23A1)" uuid="f95c7678-5269-11df-aa0b-080069138b88" uid="20986"/>
+      <subcategory value="3" description="120mm HESH- T(L31)" uuid="f95d8590-5269-11df-92c7-080069138b88" uid="20987"/>
+      <subcategory value="4" description="27mm Mauser HE" uuid="f95e9714-5269-11df-bf41-080069138b88" uid="20988"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="224" uuid="f960e622-5269-11df-9531-080069138b88" uid="20989">
+    <category value="1" description="Guided" uuid="f961f88c-5269-11df-a27c-080069138b88" uid="20990">
+      <subcategory value="1" description="Decoys" uuid="f9630718-5269-11df-bab3-080069138b88" uid="20991">
+        <specific value="1" description="Towed radar decoy" uuid="f964173e-5269-11df-95e4-080069138b88" uid="20992"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="224" uuid="f9670fca-5269-11df-af59-080069138b88" uid="20993">
+    <category value="1" description="Guided" uuid="f9681e74-5269-11df-a75d-080069138b88" uid="20994">
+      <subcategory value="1" description="ALARM" uuid="f9692fd0-5269-11df-aa6d-080069138b88" uid="20995"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="224" uuid="f96b821c-5269-11df-837b-080069138b88" uid="20996">
+    <category value="1" description="Guided" uuid="f96c8ec8-5269-11df-9ce8-080069138b88" uid="20997">
+      <subcategory value="1" description="Vosper Thorny Croft Excalibur Coast Defense Missile System" uuid="f96da57e-5269-11df-9640-080069138b88" uid="20998"/>
+      <subcategory value="2" description="Sea Eagle" uuid="f96ebae0-5269-11df-939c-080069138b88" uid="20999"/>
+      <subcategory value="3" description="Sea Eagle SL" uuid="f96fc61a-5269-11df-90c8-080069138b88" uid="21000"/>
+      <subcategory value="4" description="Sea Skua" uuid="f970d8d4-5269-11df-ac0b-080069138b88" uid="21001"/>
+      <subcategory value="5" description="Martel" uuid="f971e8fa-5269-11df-8f8b-080069138b88" uid="21002"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="224" uuid="f9743b78-5269-11df-bfc7-080069138b88" uid="21003">
+    <category value="1" description="Guided" uuid="f97549a0-5269-11df-bdb4-080069138b88" uid="21004">
+      <subcategory value="1" description="Tigerfish torpedo" uuid="f9765368-5269-11df-8650-080069138b88" uid="21005"/>
+      <subcategory value="2" description="Spear Fish torpedo" uuid="f977674e-5269-11df-86a7-080069138b88" uid="21006"/>
+      <subcategory value="3" description="Sting Ray torpedo" uuid="f978785a-5269-11df-8f63-080069138b88" uid="21007"/>
+      <subcategory value="4" description="Mk 24 torpedo" uuid="f97983b2-5269-11df-9f47-080069138b88" uid="21008"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="224" uuid="f97bd8d8-5269-11df-9c35-080069138b88" uid="21009">
+    <category value="2" description="Ballistic" uuid="f97ce25a-5269-11df-ae8e-080069138b88" uid="21010">
+      <subcategory value="1" description="7.62 mm" uuid="f97df532-5269-11df-b437-080069138b88" uid="21011"/>
+      <subcategory value="2" description="9.0 mm" uuid="f97f06d4-5269-11df-9395-080069138b88" uid="21012"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="224" uuid="f9815722-5269-11df-bc7d-080069138b88" uid="21013">
+    <category value="1" description="Guided" uuid="f98265c2-5269-11df-8cb8-080069138b88" uid="21014">
+      <subcategory value="1" description="Storm-Shadow" uuid="f9837002-5269-11df-a358-080069138b88" uid="21015"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f985294c-5269-11df-8db4-080069138b88" uid="21016">
+      <subcategory value="1" description="51 mm" uuid="f9863bb6-5269-11df-b157-080069138b88" uid="21017"/>
+      <subcategory value="2" description="89 mm" uuid="f9874c68-5269-11df-b34c-080069138b88" uid="21018"/>
+      <subcategory value="3" description="105 mm" uuid="f98858d8-5269-11df-aba1-080069138b88" uid="21019"/>
+      <subcategory value="4" description="155 mm" uuid="f98969b2-5269-11df-95e6-080069138b88" uid="21020"/>
+      <subcategory value="5" description="175 mm" uuid="f98a7884-5269-11df-a479-080069138b88" uid="21021"/>
+      <subcategory value="6" description="30 mm RARDEN HE" uuid="f98b877e-5269-11df-bcf3-080069138b88" uid="21022"/>
+      <subcategory value="7" description="120 mm smoke WP (L34)" uuid="f98c992a-5269-11df-889d-080069138b88" uid="21023"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="224" uuid="f98eec34-5269-11df-a4b3-080069138b88" uid="21024">
+    <category value="1" description="Guided" uuid="f98ffa98-5269-11df-a84c-080069138b88" uid="21025">
+      <subcategory value="1" description="A-3TK Polaris" uuid="f9910afa-5269-11df-b5eb-080069138b88" uid="21026"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="71" uuid="f9935e4a-5269-11df-b9a5-080069138b88" uid="21027">
+    <category value="1" description="Guided" uuid="f9946c40-5269-11df-9a69-080069138b88" uid="21028">
+      <subcategory value="1" description="Aster 15" uuid="f9957b8a-5269-11df-bb3f-080069138b88" uid="21029"/>
+      <subcategory value="2" description="Aster 30" uuid="f9968c5a-5269-11df-ab6c-080069138b88" uid="21030"/>
+      <subcategory value="3" description="Crotale" uuid="f9979a96-5269-11df-a17c-080069138b88" uid="21031">
+        <specific value="1" description="Crotale R440 missile" uuid="f998aaee-5269-11df-9461-080069138b88" uid="21032"/>
+        <specific value="2" description="VT-1 (Crotale NG) missile" uuid="f999bb78-5269-11df-894f-080069138b88" uid="21033"/>
+      </subcategory>
+      <subcategory value="4" description="Roland" uuid="f99b6f0e-5269-11df-acdb-080069138b88" uid="21034"/>
+      <subcategory value="5" description="Mistral" uuid="f99c794e-5269-11df-b492-080069138b88" uid="21035"/>
+      <subcategory value="6" description="Masurca" uuid="f99d8b2c-5269-11df-8e00-080069138b88" uid="21036"/>
+      <subcategory value="7" description="Mica Missile" uuid="f99e9b20-5269-11df-9267-080069138b88" uid="21037">
+        <specific value="1" description="Radar" uuid="f99fa894-5269-11df-bafc-080069138b88" uid="21038"/>
+        <specific value="2" description="IR" uuid="f9a0b842-5269-11df-8aea-080069138b88" uid="21039"/>
+      </subcategory>
+      <subcategory value="8" description="R530" uuid="f9a26994-5269-11df-a8c7-080069138b88" uid="21040"/>
+      <subcategory value="9" description="R-550 Magic" uuid="f9a38022-5269-11df-8317-080069138b88" uid="21041">
+        <specific value="1" description="R-550 Magic 1" uuid="f9a4900c-5269-11df-8e57-080069138b88" uid="21042"/>
+        <specific value="2" description="R-550 Magic 2" uuid="f9a5a082-5269-11df-b219-080069138b88" uid="21043"/>
+      </subcategory>
+      <subcategory value="10" description="Super 530" uuid="f9a751b6-5269-11df-9afc-080069138b88" uid="21044">
+        <specific value="1" description="Super 530F" uuid="f9a86330-5269-11df-8337-080069138b88" uid="21045"/>
+        <specific value="2" description="Super 530D" uuid="f9a96eec-5269-11df-9989-080069138b88" uid="21046"/>
+      </subcategory>
+      <subcategory value="11" description="Shahine R460 missile" uuid="f9ab2110-5269-11df-932f-080069138b88" uid="21047"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f9acd0e6-5269-11df-9f85-080069138b88" uid="21048">
+      <subcategory value="1" description="20 mm" uuid="f9ade0a8-5269-11df-8b99-080069138b88" uid="21049"/>
+      <subcategory value="2" description="25 mm" uuid="f9aef254-5269-11df-bfa0-080069138b88" uid="21050"/>
+      <subcategory value="3" description="30 mm" uuid="f9affff0-5269-11df-b214-080069138b88" uid="21051"/>
+      <subcategory value="9" description="90" uuid="f9b1100c-5269-11df-93f4-080069138b88" uid="21052"/>
+      <subcategory value="30" description=".50 Cal." uuid="f9b21efc-5269-11df-8709-080069138b88" uid="21053"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="71" uuid="f9b46fea-5269-11df-853c-080069138b88" uid="21054">
+    <category value="1" description="Guided" uuid="f9b57e1c-5269-11df-b04a-080069138b88" uid="21055">
+      <subcategory value="1" description="SS-11/AS-11" uuid="f9b68b54-5269-11df-b962-080069138b88" uid="21056"/>
+      <subcategory value="2" description="Eryx missile" uuid="f9b79a08-5269-11df-a626-080069138b88" uid="21057"/>
+      <subcategory value="3" description="HOT missile" uuid="f9b8aaf6-5269-11df-a76e-080069138b88" uid="21058"/>
+      <subcategory value="4" description="Milan missile" uuid="f9b9b8d8-5269-11df-9a4a-080069138b88" uid="21059"/>
+      <subcategory value="5" description="ACL-STRIM" uuid="f9bacb1a-5269-11df-885f-080069138b88" uid="21060"/>
+      <subcategory value="6" description="Entac" uuid="f9bbda6e-5269-11df-8d68-080069138b88" uid="21061"/>
+      <subcategory value="7" description="AS-15" uuid="f9bce5e4-5269-11df-8ba1-080069138b88" uid="21062">
+        <specific value="1" description="AS-15 TT" uuid="f9bdf9de-5269-11df-bfd5-080069138b88" uid="21063"/>
+      </subcategory>
+      <subcategory value="8" description="BAT 120 anti-armor bomb" uuid="f9bfa9f0-5269-11df-b43c-080069138b88" uid="21064"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f9c15c50-5269-11df-86b7-080069138b88" uid="21065">
+      <subcategory value="1" description="(deprecated)" deprecated="1" uuid="f9c27446-5269-11df-967c-080069138b88" uid="21066"/>
+      <subcategory value="2" description="8 in." uuid="f9c381d8-5269-11df-811b-080069138b88" uid="21067"/>
+      <subcategory value="3" description="20 mm" uuid="f9c4924e-5269-11df-a544-080069138b88" uid="21068"/>
+      <subcategory value="4" description="25 mm" uuid="f9c5a198-5269-11df-8f39-080069138b88" uid="21069"/>
+      <subcategory value="5" description="30 mm" uuid="f9c6bc68-5269-11df-aaf0-080069138b88" uid="21070"/>
+      <subcategory value="6" description="60 mm" uuid="f9c7cfc2-5269-11df-b88b-080069138b88" uid="21071"/>
+      <subcategory value="7" description="68 mm" uuid="f9c8e3c6-5269-11df-b879-080069138b88" uid="21072"/>
+      <subcategory value="8" description="74 mm" uuid="f9c9ece4-5269-11df-89ab-080069138b88" uid="21073"/>
+      <subcategory value="9" description="90 mm" uuid="f9cafde6-5269-11df-afad-080069138b88" uid="21074"/>
+      <subcategory value="10" description="105 mm" uuid="f9cc1154-5269-11df-b3a6-080069138b88" uid="21075"/>
+      <subcategory value="11" description="106 mm" uuid="f9cd1d7e-5269-11df-aac6-080069138b88" uid="21076"/>
+      <subcategory value="12" description="120 mm" uuid="f9ce2c96-5269-11df-b286-080069138b88" uid="21077"/>
+      <subcategory value="13" description="155 mm" uuid="f9cf3d52-5269-11df-9356-080069138b88" uid="21078"/>
+      <subcategory value="14" description="175 mm" uuid="f9d04bc0-5269-11df-b836-080069138b88" uid="21079"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="71" uuid="f9d29ede-5269-11df-9561-080069138b88" uid="21080">
+    <category value="1" description="Guided" uuid="f9d3ab6c-5269-11df-bd0a-080069138b88" uid="21081">
+      <subcategory value="1" description="Decoys" uuid="f9d4bade-5269-11df-9275-080069138b88" uid="21082"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="71" uuid="f9d70c08-5269-11df-8cb1-080069138b88" uid="21083">
+    <category value="1" description="Guided" uuid="f9d81a30-5269-11df-9ab7-080069138b88" uid="21084">
+      <subcategory value="1" description="Armat" uuid="f9d928c6-5269-11df-ad45-080069138b88" uid="21085"/>
+      <subcategory value="2" description="AS 37 Martel" uuid="f9da3a04-5269-11df-92ac-080069138b88" uid="21086"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="71" uuid="f9dc8ed0-5269-11df-8c5a-080069138b88" uid="21087">
+    <category value="1" description="Guided" uuid="f9dd9ea6-5269-11df-8f64-080069138b88" uid="21088">
+      <subcategory value="1" description="Exocet" uuid="f9dea8f0-5269-11df-ab08-080069138b88" uid="21089">
+        <specific value="1" description="MM-38" uuid="f9dfbbfa-5269-11df-aef1-080069138b88" uid="21090"/>
+        <specific value="2" description="AM-39" uuid="f9e0d3b4-5269-11df-b41e-080069138b88" uid="21091"/>
+        <specific value="3" description="SM-39 Exocet" uuid="f9e1df34-5269-11df-9b41-080069138b88" uid="21092"/>
+        <specific value="4" description="MM-40" uuid="f9e2f298-5269-11df-98c7-080069138b88" uid="21093"/>
+      </subcategory>
+      <subcategory value="2" description="AS-11" uuid="f9e4a1c4-5269-11df-8f4a-080069138b88" uid="21094"/>
+      <subcategory value="3" description="SS-12M" uuid="f9e5b1ea-5269-11df-959b-080069138b88" uid="21095"/>
+      <subcategory value="4" description="AS-15" uuid="f9e6c06c-5269-11df-9748-080069138b88" uid="21096"/>
+      <subcategory value="5" description="AS-30" uuid="f9e7d024-5269-11df-8d2f-080069138b88" uid="21097"/>
+      <subcategory value="6" description="AS-37 Martel" uuid="f9e8df96-5269-11df-8e4d-080069138b88" uid="21098"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="f9e9eeae-5269-11df-9d2d-080069138b88" uid="21099"/>
+      <subcategory value="8" description="Otomat" uuid="f9eaffd8-5269-11df-8cae-080069138b88" uid="21100">
+        <specific value="1" description="Mk1" uuid="f9ec0ef0-5269-11df-8bbb-080069138b88" uid="21101"/>
+        <specific value="2" description="Mk2" uuid="f9ed1c8c-5269-11df-a4d0-080069138b88" uid="21102"/>
+      </subcategory>
+      <subcategory value="9" description="E-14 torpedo" uuid="f9eecc3a-5269-11df-a4ce-080069138b88" uid="21103"/>
+      <subcategory value="10" description="E-15 torpedo" uuid="f9efdd1e-5269-11df-91d8-080069138b88" uid="21104"/>
+      <subcategory value="11" description="F-17 torpedo" uuid="f9f0ee48-5269-11df-ad2b-080069138b88" uid="21105">
+        <specific value="1" description="F-17 mod 2" uuid="f9f1fc98-5269-11df-a72a-080069138b88" uid="21106"/>
+      </subcategory>
+      <subcategory value="12" description="L-5 torpedo" uuid="f9f3acfa-5269-11df-bb32-080069138b88" uid="21107">
+        <specific value="1" description="L-5 mod 3" uuid="f9f4bcd0-5269-11df-82ba-080069138b88" uid="21108"/>
+        <specific value="2" description="L-5 mod 5" uuid="f9f5cdd2-5269-11df-8359-080069138b88" uid="21109"/>
+      </subcategory>
+      <subcategory value="13" description="Z-16 torpedo" uuid="f9f7826c-5269-11df-bd7e-080069138b88" uid="21110"/>
+      <subcategory value="14" description="AS-12" uuid="f9f88d2e-5269-11df-a77f-080069138b88" uid="21111"/>
+      <subcategory value="15" description="MU-90 Torpedo" uuid="f9f99d2c-5269-11df-a8fb-080069138b88" uid="21112"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="f9fb50b8-5269-11df-82c6-080069138b88" uid="21113">
+      <subcategory value="1" description="20 mm" uuid="f9fc6516-5269-11df-9e3f-080069138b88" uid="21114"/>
+      <subcategory value="2" description="25 mm" uuid="f9fd6f6a-5269-11df-8aa7-080069138b88" uid="21115"/>
+      <subcategory value="3" description="30 mm" uuid="f9fe7f36-5269-11df-9368-080069138b88" uid="21116"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="71" uuid="fa00dad8-5269-11df-844a-080069138b88" uid="21117">
+    <category value="1" description="Guided" uuid="fa01ea0e-5269-11df-9473-080069138b88" uid="21118">
+      <subcategory value="1" description="Malafon" uuid="fa02f994-5269-11df-b266-080069138b88" uid="21119"/>
+      <subcategory value="2" description="E-14 torpedo" uuid="fa040a96-5269-11df-9292-080069138b88" uid="21120"/>
+      <subcategory value="3" description="E-15 torpedo" uuid="fa051508-5269-11df-b235-080069138b88" uid="21121"/>
+      <subcategory value="4" description="F-17 torpedo" uuid="fa062862-5269-11df-9fee-080069138b88" uid="21122"/>
+      <subcategory value="5" description="L3 torpedo" uuid="fa073cde-5269-11df-a493-080069138b88" uid="21123"/>
+      <subcategory value="6" description="L4 torpedo" uuid="fa08475a-5269-11df-b148-080069138b88" uid="21124"/>
+      <subcategory value="7" description="L5 torpedo" uuid="fa095726-5269-11df-b7d6-080069138b88" uid="21125"/>
+      <subcategory value="8" description="Murene torpedo" uuid="fa0a69fe-5269-11df-8c51-080069138b88" uid="21126"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="71" uuid="fa0cbd08-5269-11df-9301-080069138b88" uid="21127">
+    <category value="2" description="Ballistic" uuid="fa0dcc84-5269-11df-8d79-080069138b88" uid="21128">
+      <subcategory value="1" description=".22 cal. Long Rifle" uuid="fa0ed5d4-5269-11df-ad37-080069138b88" uid="21129"/>
+      <subcategory value="2" description=".30-06" uuid="fa0ff3a6-5269-11df-8f17-080069138b88" uid="21130"/>
+      <subcategory value="3" description=".380 cal." uuid="fa1107d2-5269-11df-8c07-080069138b88" uid="21131"/>
+      <subcategory value="4" description=".38" uuid="fa121262-5269-11df-9b26-080069138b88" uid="21132"/>
+      <subcategory value="5" description=".45 cal." uuid="fa13212a-5269-11df-a493-080069138b88" uid="21133"/>
+      <subcategory value="6" description=".50 cal." uuid="fa14325e-5269-11df-9d5b-080069138b88" uid="21134"/>
+      <subcategory value="7" description="5.56 mm" uuid="fa15428e-5269-11df-b902-080069138b88" uid="21135"/>
+      <subcategory value="8" description="6.35 mm" uuid="fa1652fa-5269-11df-b119-080069138b88" uid="21136"/>
+      <subcategory value="9" description="7.5 mm" uuid="fa176172-5269-11df-aaae-080069138b88" uid="21137"/>
+      <subcategory value="10" description="7.62 mm" uuid="fa186bb2-5269-11df-b0d5-080069138b88" uid="21138"/>
+      <subcategory value="11" description="7.65 mm" uuid="fa1980ba-5269-11df-bc47-080069138b88" uid="21139"/>
+      <subcategory value="12" description="8 mm" uuid="fa1a91da-5269-11df-a2e2-080069138b88" uid="21140"/>
+      <subcategory value="13" description="9 mm" uuid="fa1b9c10-5269-11df-846f-080069138b88" uid="21141"/>
+      <subcategory value="14" description="20 mm" uuid="fa1cb05a-5269-11df-990a-080069138b88" uid="21142"/>
+      <subcategory value="15" description="25 mm" uuid="fa1dc1ca-5269-11df-bc0e-080069138b88" uid="21143"/>
+      <subcategory value="16" description="30 mm" uuid="fa1ed362-5269-11df-93a6-080069138b88" uid="21144"/>
+      <subcategory value="17" description="60 mm" uuid="fa1fe392-5269-11df-bea3-080069138b88" uid="21145"/>
+      <subcategory value="18" description="68 mm" uuid="fa20f7aa-5269-11df-8350-080069138b88" uid="21146"/>
+      <subcategory value="19" description="81 mm" uuid="fa2201b8-5269-11df-9d97-080069138b88" uid="21147"/>
+      <subcategory value="20" description="90 mm" uuid="fa231198-5269-11df-8cfb-080069138b88" uid="21148"/>
+      <subcategory value="21" description="120 mm" uuid="fa24243e-5269-11df-950c-080069138b88" uid="21149"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="71" uuid="fa26761c-5269-11df-b1c0-080069138b88" uid="21150">
+    <category value="1" description="Guided" uuid="fa27911e-5269-11df-8ba9-080069138b88" uid="21151">
+      <subcategory value="1" description="Hades missile" uuid="fa28a126-5269-11df-b74f-080069138b88" uid="21152"/>
+      <subcategory value="2" description="Pluton missile" uuid="fa29b200-5269-11df-bb5c-080069138b88" uid="21153"/>
+      <subcategory value="3" description="AS 30L (laser guided)" uuid="fa2ac58c-5269-11df-8e95-080069138b88" uid="21154"/>
+      <subcategory value="4" description="ASMP" uuid="fa2bd576-5269-11df-804a-080069138b88" uid="21155"/>
+      <subcategory value="5" description="Excalibur MP 22 bomb" uuid="fa2ce6c8-5269-11df-a0a1-080069138b88" uid="21156"/>
+      <subcategory value="6" description="Matra laser-guided bomb (LGB)" uuid="fa2df748-5269-11df-9c7f-080069138b88" uid="21157"/>
+      <subcategory value="7" description="French Apache GLCM" uuid="fa2f0796-5269-11df-bc0d-080069138b88" uid="21158"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fa30b816-5269-11df-80f2-080069138b88" uid="21159">
+      <subcategory value="1" description=".50 Cal." uuid="fa31c6fc-5269-11df-bc0f-080069138b88" uid="21160"/>
+      <subcategory value="2" description="20 mm" uuid="fa32d772-5269-11df-a023-080069138b88" uid="21161"/>
+      <subcategory value="3" description="25 mm" uuid="fa33e5cc-5269-11df-be89-080069138b88" uid="21162"/>
+      <subcategory value="4" description="30 mm" uuid="fa34f5f2-5269-11df-8865-080069138b88" uid="21163"/>
+      <subcategory value="5" description="58 mm" uuid="fa360460-5269-11df-91b5-080069138b88" uid="21164"/>
+      <subcategory value="6" description="74 mm" uuid="fa370f7c-5269-11df-9191-080069138b88" uid="21165"/>
+      <subcategory value="7" description="90 mm" uuid="fa382394-5269-11df-89d3-080069138b88" uid="21166"/>
+      <subcategory value="8" description="105 mm" uuid="fa393374-5269-11df-bc50-080069138b88" uid="21167"/>
+      <subcategory value="9" description="106 mm" uuid="fa3a3e40-5269-11df-8f67-080069138b88" uid="21168"/>
+      <subcategory value="10" description="155 mm" uuid="fa3b52b2-5269-11df-9d8c-080069138b88" uid="21169"/>
+      <subcategory value="11" description="175 mm" uuid="fa3c63b4-5269-11df-a14d-080069138b88" uid="21170"/>
+      <subcategory value="12" description="8 in." uuid="fa3d7704-5269-11df-9d13-080069138b88" uid="21171"/>
+      <subcategory value="13" description="120mm Mortar Ammunition" uuid="fa3e8680-5269-11df-b45a-080069138b88" uid="21172">
+        <specific value="1" description="120mm FRAG-HE, PR14" uuid="fa3f9c00-5269-11df-a285-080069138b88" uid="21173"/>
+        <specific value="2" description="120mm HE-RA, PRPA" uuid="fa40a726-5269-11df-b65d-080069138b88" uid="21174"/>
+      </subcategory>
+      <subcategory value="50" description="BAP 100-mm airfield attack bomb" uuid="fa4259c2-5269-11df-a3a3-080069138b88" uid="21175"/>
+      <subcategory value="51" description="BLG 66 Belouga bomb" uuid="fa436a4c-5269-11df-90f3-080069138b88" uid="21176"/>
+      <subcategory value="52" description="BM 400 bomb" uuid="fa447f22-5269-11df-8bc9-080069138b88" uid="21177"/>
+      <subcategory value="53" description="CASCAD Mk 1" uuid="fa458a8e-5269-11df-84ca-080069138b88" uid="21178"/>
+      <subcategory value="54" description="CASCAD Mk 2" uuid="fa469c30-5269-11df-9c00-080069138b88" uid="21179"/>
+      <subcategory value="55" description="CH-TABO Pod" uuid="fa47ac38-5269-11df-b932-080069138b88" uid="21180"/>
+      <subcategory value="56" description="Durandal penetration bomb" uuid="fa48bbaa-5269-11df-8145-080069138b88" uid="21181"/>
+      <subcategory value="57" description="LU 250 EG-FT bomb" uuid="fa49ce32-5269-11df-8f4b-080069138b88" uid="21182"/>
+      <subcategory value="58" description="SAMP BL 61 125-kg fragmentation bomb" uuid="fa4ae182-5269-11df-bb50-080069138b88" uid="21183"/>
+      <subcategory value="59" description="SAMP BL 70 400-kg fragmentation bomb" uuid="fa4bf022-5269-11df-9c73-080069138b88" uid="21184"/>
+      <subcategory value="60" description="SAMP BL 99 450-kg bomb" uuid="fa4d02f0-5269-11df-8d4e-080069138b88" uid="21185"/>
+      <subcategory value="61" description="SAMP BL EU4 1000-kg bomb" uuid="fa4e155a-5269-11df-a6b3-080069138b88" uid="21186"/>
+      <subcategory value="62" description="T 15 SAMP fragmentation bomb" uuid="fa4f229c-5269-11df-a87e-080069138b88" uid="21187"/>
+      <subcategory value="63" description="BL 8 SAMP fragmentation bomb" uuid="fa503466-5269-11df-8f04-080069138b88" uid="21188"/>
+      <subcategory value="64" description="BL 9 SAMP fragmentation bomb" uuid="fa514ba8-5269-11df-8f31-080069138b88" uid="21189"/>
+      <subcategory value="65" description="BL 18 SAMP fragmentation bomb" uuid="fa52591c-5269-11df-b14a-080069138b88" uid="21190"/>
+      <subcategory value="66" description="SAMP GP bomb family" uuid="fa536c12-5269-11df-93be-080069138b88" uid="21191"/>
+      <subcategory value="67" description="SAMP 81 AF 125-kg bomb" uuid="fa547ca6-5269-11df-9bc6-080069138b88" uid="21192"/>
+      <subcategory value="68" description="TBA retarded 125-kg close-support bomb" uuid="fa558d3a-5269-11df-b6fc-080069138b88" uid="21193"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="71" uuid="fa57e1b6-5269-11df-98e9-080069138b88" uid="21194">
+    <category value="1" description="Guided" uuid="fa58ee94-5269-11df-95da-080069138b88" uid="21195">
+      <subcategory value="1" description="SSBS Type S-30D/TN-61" uuid="fa59fdc0-5269-11df-8d98-080069138b88" uid="21196"/>
+      <subcategory value="2" description="SSBS Type S-4(SX)" uuid="fa5b1070-5269-11df-bb7c-080069138b88" uid="21197"/>
+      <subcategory value="3" description="SLBM M-20" uuid="fa5c26b8-5269-11df-82ec-080069138b88" uid="21198"/>
+      <subcategory value="4" description="SLBM M-4" uuid="fa5d381e-5269-11df-a84b-080069138b88" uid="21199"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="78" uuid="fa5f84f2-5269-11df-8298-080069138b88" uid="21200">
+    <category value="1" description="Guided" uuid="fa609680-5269-11df-b141-080069138b88" uid="21201">
+      <subcategory value="1" description="Roland" uuid="fa61a4c6-5269-11df-9059-080069138b88" uid="21202">
+        <specific value="1" description="Roland 1" uuid="fa62b0c8-5269-11df-842a-080069138b88" uid="21203"/>
+        <specific value="2" description="Roland 2" uuid="fa63bf90-5269-11df-8633-080069138b88" uid="21204"/>
+        <specific value="3" description="Roland 3" uuid="fa64d3a8-5269-11df-9f35-080069138b88" uid="21205"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Ballistic" uuid="fa672180-5269-11df-9a16-080069138b88" uid="21206">
+      <subcategory value="1" description="20 mm" uuid="fa6833ae-5269-11df-a76a-080069138b88" uid="21207"/>
+      <subcategory value="2" description="35 mm" uuid="fa693eb6-5269-11df-ba58-080069138b88" uid="21208"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="78" uuid="fa6b94ea-5269-11df-a28f-080069138b88" uid="21209">
+    <category value="1" description="Guided" uuid="fa6c9dcc-5269-11df-a0ae-080069138b88" uid="21210">
+      <subcategory value="1" description="Milan missile" uuid="fa6dadde-5269-11df-ad0e-080069138b88" uid="21211"/>
+      <subcategory value="2" description="HOT missile" uuid="fa6ebcb0-5269-11df-a682-080069138b88" uid="21212"/>
+      <subcategory value="3" description="TOW missile" uuid="fa6fcbc8-5269-11df-80d5-080069138b88" uid="21213"/>
+      <subcategory value="4" description="Pars 3 missile" uuid="fa70ecce-5269-11df-9365-080069138b88" uid="21214"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fa72b0ae-5269-11df-87f1-080069138b88" uid="21215">
+      <subcategory value="1" description="110-mm rocket" uuid="fa73c110-5269-11df-8817-080069138b88" uid="21216"/>
+      <subcategory value="2" description="105-mm APDS-T" uuid="fa74cbdc-5269-11df-97cc-080069138b88" uid="21217"/>
+      <subcategory value="3" description="105-mm APFSDS-T" uuid="fa75dcd4-5269-11df-ab84-080069138b88" uid="21218"/>
+      <subcategory value="4" description="105-mm HEAT-T" uuid="fa76f150-5269-11df-a7d2-080069138b88" uid="21219"/>
+      <subcategory value="5" description="120-mm HEAT-MP-T DM12" uuid="fa77fc80-5269-11df-8969-080069138b88" uid="21220"/>
+      <subcategory value="6" description="120-mm APFSDS-T DM13" uuid="fa790eea-5269-11df-88e4-080069138b88" uid="21221"/>
+      <subcategory value="7" description="120-mm APFSDS-T DM23" uuid="fa7a2a46-5269-11df-9802-080069138b88" uid="21222"/>
+      <subcategory value="8" description="120-mm APFSDS-T DM33" uuid="fa7b3a9e-5269-11df-942c-080069138b88" uid="21223"/>
+      <subcategory value="9" description="110mm" uuid="fa7c4c9a-5269-11df-956d-080069138b88" uid="21224">
+        <specific value="1" description="110mm Tandem HEAT, 3-T for PzFst-3" uuid="fa7d5bda-5269-11df-a84a-080069138b88" uid="21225"/>
+        <specific value="2" description="110mm HEAT, PZF-3" uuid="fa7e6908-5269-11df-a92d-080069138b88" uid="21226"/>
+        <specific value="3" description="110mm SAL-H" uuid="fa7f7c76-5269-11df-b720-080069138b88" uid="21227"/>
+      </subcategory>
+      <subcategory value="10" description="Armbrust 67mm HEAT rocket" uuid="fa812d96-5269-11df-9acd-080069138b88" uid="21228"/>
+    </category>
+    <category value="3" description="Fixed" uuid="fa82e03c-5269-11df-b640-080069138b88" uid="21229">
+      <subcategory value="1" description="Anti-tank mine" uuid="fa83efc2-5269-11df-811d-080069138b88" uid="21230">
+        <specific value="1" description="MIFF" uuid="fa84fac0-5269-11df-97cd-080069138b88" uid="21231"/>
+        <specific value="2" description="KB44" uuid="fa860c12-5269-11df-a7c9-080069138b88" uid="21232"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="78" uuid="fa8901e2-5269-11df-a8d7-080069138b88" uid="21233">
+    <category value="1" description="Guided" uuid="fa8a1104-5269-11df-a60a-080069138b88" uid="21234">
+      <subcategory value="1" description="Kormoran" uuid="fa8b1e00-5269-11df-980a-080069138b88" uid="21235"/>
+      <subcategory value="2" description="AEG Seeal 533 mm Torpedo" uuid="fa8c2d72-5269-11df-988b-080069138b88" uid="21236"/>
+      <subcategory value="3" description="SST-3 Torpedo" uuid="fa8d3d66-5269-11df-9c2f-080069138b88" uid="21237"/>
+      <subcategory value="4" description="SST-4 Torpedo" uuid="fa8e49d6-5269-11df-b963-080069138b88" uid="21238"/>
+      <subcategory value="5" description="DM2A1 Seal Torpedo" uuid="fa8f5eac-5269-11df-929f-080069138b88" uid="21239"/>
+      <subcategory value="6" description="DM2A3 Seehecht Torpedo" uuid="fa906fae-5269-11df-b3e7-080069138b88" uid="21240"/>
+      <subcategory value="7" description="SUT Torpedo" uuid="fa917a02-5269-11df-90ef-080069138b88" uid="21241"/>
+      <subcategory value="8" description="G7e Torpedo" uuid="fa928dfc-5269-11df-961e-080069138b88" uid="21242"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="78" uuid="fa94dd32-5269-11df-a05d-080069138b88" uid="21243">
+    <category value="1" description="Guided" uuid="fa95ec40-5269-11df-938a-080069138b88" uid="21244">
+      <subcategory value="1" description="AEG Seeschlange 533 mm Torpedo" uuid="fa96fb58-5269-11df-9721-080069138b88" uid="21245"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="78" uuid="fa995948-5269-11df-8969-080069138b88" uid="21246">
+    <category value="2" description="Ballistic" uuid="fa9a67d4-5269-11df-8d17-080069138b88" uid="21247">
+      <subcategory value="1" description="5.56 mm" uuid="fa9b79ee-5269-11df-88bf-080069138b88" uid="21248"/>
+      <subcategory value="2" description="7.62 mm" uuid="fa9c8d02-5269-11df-8529-080069138b88" uid="21249"/>
+      <subcategory value="3" description="9 mm" uuid="fa9d972e-5269-11df-a42e-080069138b88" uid="21250"/>
+    </category>
+    <category value="3" description="Fixed" uuid="fa9f47ea-5269-11df-be24-080069138b88" uid="21251">
+      <subcategory value="1" description="Mine" uuid="faa05ac2-5269-11df-82df-080069138b88" uid="21252"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="78" uuid="faa2a746-5269-11df-a77c-080069138b88" uid="21253">
+    <category value="1" description="Guided" uuid="faa3b942-5269-11df-bd2c-080069138b88" uid="21254">
+      <subcategory value="1" description="Parachute signal rocket, white" uuid="faa4c95e-5269-11df-b4d5-080069138b88" uid="21255"/>
+      <subcategory value="2" description="Taurus" uuid="faa5dae2-5269-11df-87b8-080069138b88" uid="21256"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="faa78d9c-5269-11df-a044-080069138b88" uid="21257">
+      <subcategory value="1" description="20 mm" uuid="faa896e2-5269-11df-bb11-080069138b88" uid="21258"/>
+      <subcategory value="2" description="35 mm" uuid="faa9a758-5269-11df-9ebe-080069138b88" uid="21259"/>
+      <subcategory value="3" description="73 mm" uuid="faaab878-5269-11df-9aa3-080069138b88" uid="21260"/>
+      <subcategory value="4" description="105 mm" uuid="faabc22c-5269-11df-8106-080069138b88" uid="21261"/>
+      <subcategory value="5" description="120 mm" uuid="faacd694-5269-11df-a3d9-080069138b88" uid="21262">
+        <specific value="1" description="HE" uuid="faade5f2-5269-11df-bf7a-080069138b88" uid="21263"/>
+        <specific value="2" description="APFSDS-P" uuid="faaef168-5269-11df-bdf1-080069138b88" uid="21264"/>
+        <specific value="3" description="TRCSDS-T" uuid="fab00026-5269-11df-91ca-080069138b88" uid="21265"/>
+        <specific value="4" description="SABOT" uuid="fab114ac-5269-11df-a871-080069138b88" uid="21266"/>
+        <specific value="5" description="Heat (MZ)" uuid="fab21eec-5269-11df-9a8b-080069138b88" uid="21267"/>
+      </subcategory>
+      <subcategory value="6" description="110 mm" uuid="fab3cf44-5269-11df-9558-080069138b88" uid="21268">
+        <specific value="1" description="110mm HE-Frag, MZ-110" uuid="fab4dee8-5269-11df-bf34-080069138b88" uid="21269"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="102" uuid="fab7e052-5269-11df-807e-080069138b88" uid="21270">
+    <category value="2" description="Ballistic" uuid="fab8f370-5269-11df-b215-080069138b88" uid="21271">
+      <subcategory value="1" description="Al Abbas" uuid="fab9fe00-5269-11df-b7ab-080069138b88" uid="21272"/>
+      <subcategory value="2" description="Al Hussein" uuid="fabb0e8a-5269-11df-b93d-080069138b88" uid="21273"/>
+      <subcategory value="3" description="Scud-B (SS-1C)" deprecated="1" uuid="fabc20b8-5269-11df-8184-080069138b88" uid="21274"/>
+      <subcategory value="4" description="Scud-C (SS-1D)" deprecated="1" uuid="fabd30ca-5269-11df-ac55-080069138b88" uid="21275"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="102" uuid="fabf9342-5269-11df-9138-080069138b88" uid="21276">
+    <category value="1" description="Guided" uuid="fac09f4e-5269-11df-a1d5-080069138b88" uid="21277">
+      <subcategory value="1" description="FAW 70" uuid="fac1ae2a-5269-11df-85cf-080069138b88" uid="21278"/>
+      <subcategory value="2" description="FAW 150" uuid="fac2c378-5269-11df-9e40-080069138b88" uid="21279"/>
+      <subcategory value="3" description="FAW 200" uuid="fac3cea8-5269-11df-95ba-080069138b88" uid="21280"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="105" uuid="fac623ba-5269-11df-95cd-080069138b88" uid="21281">
+    <category value="1" description="Guided" uuid="fac730de-5269-11df-be45-080069138b88" uid="21282">
+      <subcategory value="1" description="Shafrir 2" uuid="fac8400a-5269-11df-80e2-080069138b88" uid="21283"/>
+      <subcategory value="2" description="Python III" uuid="fac95026-5269-11df-9175-080069138b88" uid="21284"/>
+      <subcategory value="3" description="Python IV" uuid="faca5dd6-5269-11df-a837-080069138b88" uid="21285"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="105" uuid="faccb0ea-5269-11df-9018-080069138b88" uid="21286">
+    <category value="1" description="Guided" uuid="facdbc7e-5269-11df-b40c-080069138b88" uid="21287">
+      <subcategory value="1" description="TOW (Ramata) M-113" uuid="facecc68-5269-11df-93a5-080069138b88" uid="21288"/>
+      <subcategory value="2" description="Picket 81 mm" uuid="facfde14-5269-11df-ad05-080069138b88" uid="21289"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="105" uuid="fad22bce-5269-11df-92be-080069138b88" uid="21290">
+    <category value="1" description="Guided" uuid="fad33dfc-5269-11df-9b29-080069138b88" uid="21291">
+      <subcategory value="1" description="Surface to Air" uuid="fad448d2-5269-11df-be36-080069138b88" uid="21292">
+        <specific value="1" description="Barak" uuid="fad55830-5269-11df-804e-080069138b88" uid="21293"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="105" uuid="fad85ac6-5269-11df-8cc5-080069138b88" uid="21294">
+    <category value="1" description="Guided" uuid="fad96a42-5269-11df-8095-080069138b88" uid="21295">
+      <subcategory value="1" description="Gabriel" uuid="fada740a-5269-11df-b4cd-080069138b88" uid="21296">
+        <specific value="1" description="Gabriel I" uuid="fadb8822-5269-11df-b278-080069138b88" uid="21297"/>
+        <specific value="2" description="Gabriel II" uuid="fadc96ea-5269-11df-99ed-080069138b88" uid="21298"/>
+        <specific value="3" description="Gabriel III (Mod)" uuid="fadda22e-5269-11df-b258-080069138b88" uid="21299"/>
+        <specific value="4" description="Gabriel Mk 4 LR" uuid="fadeb510-5269-11df-8aab-080069138b88" uid="21300"/>
+      </subcategory>
+      <subcategory value="2" description="LUZ" uuid="fae06504-5269-11df-a4b1-080069138b88" uid="21301"/>
+      <subcategory value="3" description="Gabriel III (mod)" deprecated="1" uuid="fae17426-5269-11df-8452-080069138b88" uid="21302"/>
+      <subcategory value="4" description="1A1 Gabriel II" deprecated="1" uuid="fae2849c-5269-11df-8d5e-080069138b88" uid="21303"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="105" uuid="fae4d99a-5269-11df-b667-080069138b88" uid="21304">
+    <category value="2" description="Ballistic" uuid="fae5e4b6-5269-11df-991f-080069138b88" uid="21305">
+      <subcategory value="1" description="Jericho 2" uuid="fae6f2fc-5269-11df-9cea-080069138b88" uid="21306"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="45" uuid="fae94516-5269-11df-ade0-080069138b88" uid="21307">
+    <category value="1" description="Guided" uuid="faea53c0-5269-11df-9c8b-080069138b88" uid="21308">
+      <subcategory value="1" description="HQ-2 (CSA-1)" uuid="faeb660c-5269-11df-8cb8-080069138b88" uid="21309">
+        <specific value="1" description="HQ-2" uuid="faec74f2-5269-11df-9471-080069138b88" uid="21310"/>
+        <specific value="2" description="HQ-2J" uuid="faed7f8c-5269-11df-b1d3-080069138b88" uid="21311"/>
+        <specific value="3" description="HQ-2B" uuid="faee91ba-5269-11df-95fa-080069138b88" uid="21312"/>
+      </subcategory>
+      <subcategory value="2" description="(deprecated)" deprecated="1" uuid="faf0415e-5269-11df-9f84-080069138b88" uid="21313"/>
+      <subcategory value="3" description="HQ-61 SAM" uuid="faf15260-5269-11df-8661-080069138b88" uid="21314"/>
+      <subcategory value="4" description="HN-5 (SA-7 type)" uuid="faf262a4-5269-11df-95d3-080069138b88" uid="21315">
+        <specific value="1" description="HN-5" uuid="faf3745a-5269-11df-8f98-080069138b88" uid="21316"/>
+        <specific value="2" description="HN-5A" uuid="faf4846c-5269-11df-9307-080069138b88" uid="21317"/>
+      </subcategory>
+      <subcategory value="5" description="(deprecated)" deprecated="1" uuid="faf63dc0-5269-11df-bd91-080069138b88" uid="21318"/>
+      <subcategory value="6" description="(deprecated)" deprecated="1" uuid="faf74ef4-5269-11df-a338-080069138b88" uid="21319"/>
+      <subcategory value="7" description="(deprecated)" deprecated="1" uuid="faf861a4-5269-11df-8f71-080069138b88" uid="21320"/>
+      <subcategory value="8" description="PL-2 ATOLL type" uuid="faf96d1a-5269-11df-8bee-080069138b88" uid="21321">
+        <specific value="1" description="PL-2" uuid="fafa7c14-5269-11df-a8e8-080069138b88" uid="21322"/>
+        <specific value="2" description="PL-2A" uuid="fafb8e74-5269-11df-8e7d-080069138b88" uid="21323"/>
+      </subcategory>
+      <subcategory value="9" description="(deprecated)" deprecated="1" uuid="fafd3e54-5269-11df-984a-080069138b88" uid="21324"/>
+      <subcategory value="10" description="PL-5B ATOLL Type" uuid="fafe5168-5269-11df-90fe-080069138b88" uid="21325"/>
+      <subcategory value="11" description="PL-7" uuid="faff5b76-5269-11df-9104-080069138b88" uid="21326"/>
+      <subcategory value="12" description="PL-9" uuid="fb006ffc-5269-11df-9fd5-080069138b88" uid="21327"/>
+      <subcategory value="13" description="PL-8 (python-III type)" uuid="fb01804a-5269-11df-a729-080069138b88" uid="21328"/>
+      <subcategory value="14" description="PL-4 (Aspide type)" uuid="fb028b70-5269-11df-9694-080069138b88" uid="21329"/>
+      <subcategory value="15" description="LY-60" uuid="fb039d8a-5269-11df-a6d1-080069138b88" uid="21330">
+        <specific value="1" description="LY-60N" uuid="fb04acd4-5269-11df-8889-080069138b88" uid="21331"/>
+      </subcategory>
+      <subcategory value="16" description="FM-80 / HQ-7 (Crotale type)" uuid="fb065e1c-5269-11df-8e9a-080069138b88" uid="21332"/>
+      <subcategory value="17" description="QW-1 Vanguard" uuid="fb076d8e-5269-11df-91d3-080069138b88" uid="21333"/>
+      <subcategory value="18" description="PL-11" uuid="fb087c74-5269-11df-98ca-080069138b88" uid="21334"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fb0a2fd8-5269-11df-983b-080069138b88" uid="21335">
+      <subcategory value="1" description="12.7 mm Type 54" uuid="fb0b3ed2-5269-11df-9ecc-080069138b88" uid="21336">
+        <specific value="1" description="API" uuid="fb0c49bc-5269-11df-b328-080069138b88" uid="21337"/>
+        <specific value="2" description="API-T" uuid="fb0d5be0-5269-11df-bb7c-080069138b88" uid="21338"/>
+      </subcategory>
+      <subcategory value="2" description="14.5 mm Type 56" uuid="fb0f0ada-5269-11df-ab43-080069138b88" uid="21339">
+        <specific value="1" description="API" uuid="fb101a74-5269-11df-a018-080069138b88" uid="21340"/>
+        <specific value="2" description="API-T" uuid="fb1127fc-5269-11df-9d65-080069138b88" uid="21341"/>
+        <specific value="3" description="Incendiary" uuid="fb12366a-5269-11df-847a-080069138b88" uid="21342"/>
+      </subcategory>
+      <subcategory value="3" description="(deprecated)" deprecated="1" uuid="fb13f270-5269-11df-a4e8-080069138b88" uid="21343"/>
+      <subcategory value="4" description="57 mm" uuid="fb150548-5269-11df-ab0f-080069138b88" uid="21344"/>
+      <subcategory value="5" description="85 mm" uuid="fb16105a-5269-11df-b4c0-080069138b88" uid="21345"/>
+      <subcategory value="6" description="100 mm" uuid="fb172274-5269-11df-9f33-080069138b88" uid="21346"/>
+      <subcategory value="7" description="37 mm Type 55" uuid="fb183222-5269-11df-9825-080069138b88" uid="21347">
+        <specific value="1" description="HE" uuid="fb193d3e-5269-11df-a0b2-080069138b88" uid="21348"/>
+        <specific value="2" description="HE-T" uuid="fb1a4a80-5269-11df-b425-080069138b88" uid="21349"/>
+        <specific value="3" description="APHE" uuid="fb1b5cc2-5269-11df-ae3b-080069138b88" uid="21350"/>
+        <specific value="4" description="AP-T" uuid="fb1c66e4-5269-11df-8ad2-080069138b88" uid="21351"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="45" uuid="fb1f5cf0-5269-11df-9a53-080069138b88" uid="21352">
+    <category value="1" description="Guided" uuid="fb206c3a-5269-11df-8834-080069138b88" uid="21353">
+      <subcategory value="1" description="HJ-7S (Sagger type)" uuid="fb21751c-5269-11df-8105-080069138b88" uid="21354"/>
+      <subcategory value="2" description="HJ-8 (TOW/Milan type)" uuid="fb2287b8-5269-11df-8386-080069138b88" uid="21355"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fb243cca-5269-11df-919a-080069138b88" uid="21356">
+      <subcategory value="1" description="57 mm type 55" uuid="fb254cd2-5269-11df-a2d5-080069138b88" uid="21357"/>
+      <subcategory value="2" description="76 mm type 54" uuid="fb265604-5269-11df-9e95-080069138b88" uid="21358"/>
+      <subcategory value="3" description="100 mm" uuid="fb2767b0-5269-11df-8c63-080069138b88" uid="21359">
+        <specific value="1" description="HE Type 73" uuid="fb287b0a-5269-11df-9462-080069138b88" uid="21360"/>
+        <specific value="2" description="HEAT Type 73" uuid="fb298360-5269-11df-87af-080069138b88" uid="21361"/>
+        <specific value="3" description="APDS Type 73" uuid="fb2a92fa-5269-11df-b351-080069138b88" uid="21362"/>
+        <specific value="4" description="APFSDS Type 73" uuid="fb2ba64a-5269-11df-add9-080069138b88" uid="21363"/>
+        <specific value="5" description="APFSDS Type 86" uuid="fb2cb184-5269-11df-9075-080069138b88" uid="21364"/>
+        <specific value="6" description="APFSDS-T Type AP100-2" uuid="fb2dbfa2-5269-11df-88ff-080069138b88" uid="21365"/>
+        <specific value="7" description="APFSDS-T (for Type 59 MBT)" uuid="fb2ed022-5269-11df-8da1-080069138b88" uid="21366"/>
+        <specific value="8" description="HE (for Type 69 MBT)" uuid="fb2fdfe4-5269-11df-9bf8-080069138b88" uid="21367"/>
+        <specific value="9" description="HEAT (for Type 69 MBT)" uuid="fb30efa6-5269-11df-9f68-080069138b88" uid="21368"/>
+        <specific value="10" description="APHE (for Type 69 MBT)" uuid="fb320792-5269-11df-9b20-080069138b88" uid="21369"/>
+        <specific value="11" description="APFSDS (for Type 69 MBT)" uuid="fb3318ee-5269-11df-9829-080069138b88" uid="21370"/>
+        <specific value="12" description="HVAPDS (for Type 69 MBT)" uuid="fb342b80-5269-11df-847d-080069138b88" uid="21371"/>
+      </subcategory>
+      <subcategory value="4" description="(deprecated)" deprecated="1" uuid="fb35dd4a-5269-11df-866f-080069138b88" uid="21372"/>
+      <subcategory value="5" description="105 mm" uuid="fb36effa-5269-11df-84b4-080069138b88" uid="21373">
+        <specific value="1" description="HE" uuid="fb37f9d6-5269-11df-8b7d-080069138b88" uid="21374"/>
+        <specific value="2" description="HESH" uuid="fb390b46-5269-11df-a9d4-080069138b88" uid="21375"/>
+        <specific value="3" description="HEAT" uuid="fb3a1c2a-5269-11df-82f3-080069138b88" uid="21376"/>
+        <specific value="4" description="HEAT-T" uuid="fb3b2516-5269-11df-b990-080069138b88" uid="21377"/>
+        <specific value="5" description="APDS" uuid="fb3c35d2-5269-11df-b386-080069138b88" uid="21378"/>
+        <specific value="6" description="APFSDS" uuid="fb3d488c-5269-11df-9fc5-080069138b88" uid="21379"/>
+        <specific value="7" description="APFSDS-T" uuid="fb3e5358-5269-11df-9298-080069138b88" uid="21380"/>
+        <specific value="8" description="Type 75" uuid="fb3f6130-5269-11df-afa0-080069138b88" uid="21381"/>
+      </subcategory>
+      <subcategory value="6" description="82 mm Type 65 (recoilless rifle)" uuid="fb411174-5269-11df-b8c0-080069138b88" uid="21382"/>
+      <subcategory value="7" description="85 mm Type 56 ATG" uuid="fb422672-5269-11df-b478-080069138b88" uid="21383">
+        <specific value="1" description="HE" uuid="fb432fcc-5269-11df-a915-080069138b88" uid="21384"/>
+        <specific value="2" description="HEAT-FS" uuid="fb443f52-5269-11df-aca2-080069138b88" uid="21385"/>
+        <specific value="3" description="HESH" uuid="fb4550a4-5269-11df-8c6d-080069138b88" uid="21386"/>
+      </subcategory>
+      <subcategory value="8" description="90 mm Type 51" uuid="fb470296-5269-11df-af14-080069138b88" uid="21387"/>
+      <subcategory value="9" description="35mm Grenade Launcher Ammunition" uuid="fb481000-5269-11df-9b64-080069138b88" uid="21388">
+        <specific value="1" description="Grenade, 35mm, HEAT" uuid="fb492238-5269-11df-ab0f-080069138b88" uid="21389"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="45" uuid="fb4c19ca-5269-11df-b8f2-080069138b88" uid="21390">
+    <category value="1" description="Guided" uuid="fb4d2806-5269-11df-b127-080069138b88" uid="21391">
+      <subcategory value="1" description="HQ-2" deprecated="1" uuid="fb4e3192-5269-11df-a79e-080069138b88" uid="21392"/>
+      <subcategory value="2" description="HQ-2J (CSA-1)" deprecated="1" uuid="fb4f44d8-5269-11df-b146-080069138b88" uid="21393"/>
+      <subcategory value="3" description="HQ-61" deprecated="1" uuid="fb5056a2-5269-11df-8a63-080069138b88" uid="21394"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fb520eca-5269-11df-98bb-080069138b88" uid="21395">
+      <subcategory value="1" description="57 mm" deprecated="1" uuid="fb531cfc-5269-11df-a6d5-080069138b88" uid="21396"/>
+      <subcategory value="2" description="85 mm" deprecated="1" uuid="fb542e80-5269-11df-b9be-080069138b88" uid="21397"/>
+      <subcategory value="3" description="100 mm" deprecated="1" uuid="fb554090-5269-11df-9f69-080069138b88" uid="21398"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="4" country="45" uuid="fb579386-5269-11df-83df-080069138b88" uid="21399">
+    <category value="1" description="Guided" uuid="fb58a4a6-5269-11df-9540-080069138b88" uid="21400">
+      <subcategory value="1" description="HQ-2" deprecated="1" uuid="fb59b24c-5269-11df-86bf-080069138b88" uid="21401"/>
+      <subcategory value="2" description="HQ-2J" deprecated="1" uuid="fb5ac72c-5269-11df-86d5-080069138b88" uid="21402"/>
+      <subcategory value="3" description="HQ-61" deprecated="1" uuid="fb5bd8c4-5269-11df-a50e-080069138b88" uid="21403"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fb5d8a70-5269-11df-9e47-080069138b88" uid="21404">
+      <subcategory value="1" description="57 mm" deprecated="1" uuid="fb5e9604-5269-11df-a548-080069138b88" uid="21405"/>
+      <subcategory value="2" description="85 mm" deprecated="1" uuid="fb5fa724-5269-11df-958e-080069138b88" uid="21406"/>
+      <subcategory value="3" description="100 mm" deprecated="1" uuid="fb60b894-5269-11df-9e7b-080069138b88" uid="21407"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="45" uuid="fb630f40-5269-11df-83e8-080069138b88" uid="21408">
+    <category value="1" description="Guided" uuid="fb641cbe-5269-11df-b8aa-080069138b88" uid="21409">
+      <subcategory value="1" description="C-601 ALCM" deprecated="1" uuid="fb652a64-5269-11df-80ce-080069138b88" uid="21410"/>
+      <subcategory value="2" description="YJ-1/C-801/CSS-N-4 Sardine (Exocet type)" uuid="fb663d5a-5269-11df-bc7d-080069138b88" uid="21411"/>
+      <subcategory value="3" description="Z-9A" deprecated="1" uuid="fb674f38-5269-11df-9411-080069138b88" uid="21412"/>
+      <subcategory value="4" description="CSS-N-2 (HY-2 Styx derivative Silkworm)" uuid="fb685a54-5269-11df-9017-080069138b88" uid="21413"/>
+      <subcategory value="5" description="SY-2 Eagle Strike (C-801 Anti-Ship ASM)" deprecated="1" uuid="fb69711e-5269-11df-8f1e-080069138b88" uid="21414"/>
+      <subcategory value="6" description="YJ-1 Eagle Strike (C-801 Anti-Ship SSM)" deprecated="1" uuid="fb6a84fa-5269-11df-9a24-080069138b88" uid="21415"/>
+      <subcategory value="7" description="SY-1/FL-1" uuid="fb6b92c8-5269-11df-8f35-080069138b88" uid="21416">
+        <specific value="1" description="CSSC-1B mod 1/2 Coastal Defense missile" uuid="fb6ca4a6-5269-11df-8246-080069138b88" uid="21417"/>
+        <specific value="2" description="CSS-N-1 Scrubbrush mod 1/2" uuid="fb6db756-5269-11df-b54b-080069138b88" uid="21418"/>
+      </subcategory>
+      <subcategory value="8" description="HY-1" uuid="fb6f70dc-5269-11df-9e1e-080069138b88" uid="21419">
+        <specific value="1" description="HY-1/CSSC-2A Silkworm" uuid="fb707fcc-5269-11df-8276-080069138b88" uid="21420"/>
+        <specific value="2" description="HY-1A/CSSC-2B Silkworm" uuid="fb719006-5269-11df-963d-080069138b88" uid="21421"/>
+        <specific value="3" description="CSS-N-2 Safflower" uuid="fb72a1c6-5269-11df-aaab-080069138b88" uid="21422"/>
+      </subcategory>
+      <subcategory value="9" description="HY-2/CSSC-3" uuid="fb74555c-5269-11df-bd64-080069138b88" uid="21423">
+        <specific value="1" description="HY-2A/CSSC-3A" uuid="fb7567b2-5269-11df-bc6c-080069138b88" uid="21424"/>
+        <specific value="2" description="HY-2G/CSSC-3B" uuid="fb7671d4-5269-11df-bcde-080069138b88" uid="21425"/>
+        <specific value="3" description="HY-2B/CSSC-3C" uuid="fb778128-5269-11df-b5eb-080069138b88" uid="21426"/>
+        <specific value="4" description="C-601/CAS-1 Kraken" uuid="fb7892de-5269-11df-99d1-080069138b88" uid="21427"/>
+      </subcategory>
+      <subcategory value="10" description="HY-4" uuid="fb7a432c-5269-11df-91bf-080069138b88" uid="21428">
+        <specific value="1" description="HY-4/CSSC-7 Sadsack" uuid="fb7b4f74-5269-11df-8230-080069138b88" uid="21429"/>
+        <specific value="2" description="C-611 (air launched variant)" uuid="fb7c5ffe-5269-11df-ba63-080069138b88" uid="21430"/>
+      </subcategory>
+      <subcategory value="11" description="YJ-2/C-802/CSS-N-8 Saccade" uuid="fb7e111e-5269-11df-81d3-080069138b88" uid="21431"/>
+      <subcategory value="12" description="CH/SS-N-6/C802(YJ-8A)" uuid="fb7f2572-5269-11df-af23-080069138b88" uid="21432"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fb80d336-5269-11df-a8f6-080069138b88" uid="21433">
+      <subcategory value="1" description="100 mm Gun" uuid="fb81e0dc-5269-11df-b6a1-080069138b88" uid="21434"/>
+      <subcategory value="2" description="130 mm Gun" uuid="fb82f170-5269-11df-ac1e-080069138b88" uid="21435"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="45" uuid="fb8541f0-5269-11df-a737-080069138b88" uid="21436">
+    <category value="1" description="Guided" uuid="fb864e60-5269-11df-88d0-080069138b88" uid="21437">
+      <subcategory value="1" description="CY-1 ASW Msl Torpedo" uuid="fb875fa8-5269-11df-b522-080069138b88" uid="21438"/>
+      <subcategory value="2" description="Yu-1 Torpedo" uuid="fb887244-5269-11df-ad30-080069138b88" uid="21439"/>
+      <subcategory value="3" description="Yu-3 Torpedo" uuid="fb898116-5269-11df-9ec8-080069138b88" uid="21440"/>
+      <subcategory value="4" description="Yu-4 Torpedo" uuid="fb8a8f98-5269-11df-bc45-080069138b88" uid="21441"/>
+      <subcategory value="5" description="Yu-6 Torpedo" uuid="fb8b9ff0-5269-11df-809d-080069138b88" uid="21442"/>
+      <subcategory value="6" description="TEST-96 Torpedo" uuid="fb8caec2-5269-11df-bbb0-080069138b88" uid="21443"/>
+      <subcategory value="7" description="YU-7 Torpedo" uuid="fb8dc622-5269-11df-ad25-080069138b88" uid="21444"/>
+      <subcategory value="8" description="LE-2 Torpedo" uuid="fb8ed68e-5269-11df-a0e4-080069138b88" uid="21445"/>
+      <subcategory value="9" description="L-5 Torpedo" uuid="fb8fe240-5269-11df-9eb4-080069138b88" uid="21446"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="45" uuid="fb9242d8-5269-11df-82cc-080069138b88" uid="21447">
+    <category value="1" description="Guided" uuid="fb934bba-5269-11df-8b83-080069138b88" uid="21448">
+      <subcategory value="1" description="HN 5" deprecated="1" uuid="fb945ece-5269-11df-b556-080069138b88" uid="21449"/>
+      <subcategory value="2" description="HN-5A (SA-7 type)" deprecated="1" uuid="fb956f26-5269-11df-969a-080069138b88" uid="21450"/>
+      <subcategory value="3" description="HN-5C (SA-7 type)" deprecated="1" uuid="fb967d1c-5269-11df-b7e3-080069138b88" uid="21451"/>
+      <subcategory value="4" description="HQ-61 twin SP" deprecated="1" uuid="fb979166-5269-11df-b5d4-080069138b88" uid="21452"/>
+      <subcategory value="5" description="M-9" deprecated="1" uuid="fb98a24a-5269-11df-bc8b-080069138b88" uid="21453"/>
+      <subcategory value="6" description="M-11" deprecated="1" uuid="fb99ade8-5269-11df-9e4d-080069138b88" uid="21454"/>
+      <subcategory value="7" description="CSSC-1B mod 1/2 (CSTL DEF MSL)" deprecated="1" uuid="fb9ac35e-5269-11df-bbba-080069138b88" uid="21455"/>
+      <subcategory value="8" description="CSSC-2A (CSTL DEF MSL)" deprecated="1" uuid="fb9bd622-5269-11df-a770-080069138b88" uid="21456"/>
+      <subcategory value="9" description="CSSC-2B (CSTL DEF MSL)" deprecated="1" uuid="fb9ce0b2-5269-11df-bf6c-080069138b88" uid="21457"/>
+      <subcategory value="10" description="CSSC-3 mod 1/2 (CSTL DEF MSL)" deprecated="1" uuid="fb9df448-5269-11df-a7b8-080069138b88" uid="21458"/>
+      <subcategory value="11" description="CSSC-3A mod 1/2 (CSTL DEF MSL)" deprecated="1" uuid="fb9f0c7a-5269-11df-bfc6-080069138b88" uid="21459"/>
+      <subcategory value="12" description="CSSC-3B (CSTL DEF MSL)" deprecated="1" uuid="fba01ac0-5269-11df-a888-080069138b88" uid="21460"/>
+      <subcategory value="13" description="CSSC-3C (CSTL DEF MSL)" deprecated="1" uuid="fba12d66-5269-11df-b574-080069138b88" uid="21461"/>
+      <subcategory value="14" description="CSSC-5 (YJ-16/C-101) Saples" uuid="fba24110-5269-11df-aacc-080069138b88" uid="21462"/>
+      <subcategory value="15" description="CSSC-6 (HY-3) Sawhorse" uuid="fba35212-5269-11df-9a74-080069138b88" uid="21463"/>
+      <subcategory value="16" description="CSSC-7 (HY-4) Sadsack" uuid="fba46300-5269-11df-83fa-080069138b88" uid="21464"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fba6131c-5269-11df-86fb-080069138b88" uid="21465">
+      <subcategory value="1" description="Towed Artillery" deprecated="1" uuid="fba7241e-5269-11df-86c2-080069138b88" uid="21466">
+        <specific value="1" description="100 mm type 59 (fd/ATK)" deprecated="1" uuid="fba83214-5269-11df-af1c-080069138b88" uid="21467"/>
+        <specific value="2" description="122 mm type 54" deprecated="1" uuid="fba943b6-5269-11df-8f77-080069138b88" uid="21468"/>
+        <specific value="3" description="130 mm type 59" deprecated="1" uuid="fbaa53c8-5269-11df-b1bd-080069138b88" uid="21469"/>
+        <specific value="4" description="152 mm type 54" deprecated="1" uuid="fbab6268-5269-11df-9029-080069138b88" uid="21470"/>
+      </subcategory>
+      <subcategory value="2" description="Self-Propelled Artillery" deprecated="1" uuid="fbad1c98-5269-11df-9b35-080069138b88" uid="21471">
+        <specific value="1" description="122 mm type 54-1" deprecated="1" uuid="fbae3236-5269-11df-9342-080069138b88" uid="21472"/>
+        <specific value="2" description="152 mm type 83" deprecated="1" uuid="fbaf44be-5269-11df-b357-080069138b88" uid="21473"/>
+      </subcategory>
+      <subcategory value="3" description="Multiple Rocket Launchers" deprecated="1" uuid="fbb0f69c-5269-11df-87a9-080069138b88" uid="21474">
+        <specific value="1" description="107 mm type 63 towed" deprecated="1" uuid="fbb2080c-5269-11df-b1fd-080069138b88" uid="21475"/>
+        <specific value="2" description="122 mm type 81" deprecated="1" uuid="fbb31aee-5269-11df-a06c-080069138b88" uid="21476"/>
+        <specific value="3" description="130 mm type 63" deprecated="1" uuid="fbb42c90-5269-11df-a4ab-080069138b88" uid="21477"/>
+        <specific value="4" description="132 mm BM-13-16" deprecated="1" uuid="fbb5377a-5269-11df-b3f0-080069138b88" uid="21478"/>
+        <specific value="5" description="140 mm BM-14-16" deprecated="1" uuid="fbb64a66-5269-11df-9e1c-080069138b88" uid="21479"/>
+        <specific value="6" description="253 mm Minelayer" deprecated="1" uuid="fbb75faa-5269-11df-a714-080069138b88" uid="21480"/>
+        <specific value="7" description="284 mm type 74 minelayer" deprecated="1" uuid="fbb86c60-5269-11df-8429-080069138b88" uid="21481"/>
+      </subcategory>
+      <subcategory value="4" description="Mortar" deprecated="1" uuid="fbba1c7c-5269-11df-a39b-080069138b88" uid="21482">
+        <specific value="1" description="100 mm type 71" deprecated="1" uuid="fbbb2e0a-5269-11df-b6eb-080069138b88" uid="21483"/>
+        <specific value="2" description="120 mm type 55" deprecated="1" uuid="fbbc438a-5269-11df-b18a-080069138b88" uid="21484"/>
+        <specific value="3" description="160 mm type 56" deprecated="1" uuid="fbbd4f64-5269-11df-89ec-080069138b88" uid="21485"/>
+      </subcategory>
+      <subcategory value="5" description="Recoiless Launcher" deprecated="1" uuid="fbbefe40-5269-11df-a99d-080069138b88" uid="21486">
+        <specific value="1" description="82 mm type 65" deprecated="1" uuid="fbc010be-5269-11df-91bc-080069138b88" uid="21487"/>
+        <specific value="2" description="105 mm type 75 SP" deprecated="1" uuid="fbc125b2-5269-11df-9c31-080069138b88" uid="21488"/>
+      </subcategory>
+      <subcategory value="6" description="Rocket Launcher" deprecated="1" uuid="fbc2da60-5269-11df-af79-080069138b88" uid="21489">
+        <specific value="1" description="90 mm type 51" deprecated="1" uuid="fbc3e4dc-5269-11df-8cec-080069138b88" uid="21490"/>
+      </subcategory>
+      <subcategory value="7" description="7.62 mm" uuid="fbc59930-5269-11df-a800-080069138b88" uid="21491"/>
+      <subcategory value="8" description="12.7 mm" uuid="fbc6a820-5269-11df-8eb7-080069138b88" uid="21492"/>
+      <subcategory value="9" description="73 mm" uuid="fbc7b76a-5269-11df-b954-080069138b88" uid="21493"/>
+      <subcategory value="10" description="100 mm" uuid="fbc8bf98-5269-11df-bec2-080069138b88" uid="21494">
+        <specific value="1" description="Mortar bomb (Type 71)" uuid="fbc9d0e0-5269-11df-8e58-080069138b88" uid="21495"/>
+      </subcategory>
+      <subcategory value="11" description="107 mm Rocket" uuid="fbcb8cbe-5269-11df-8817-080069138b88" uid="21496">
+        <specific value="1" description="HE-Frag" uuid="fbcc9c44-5269-11df-ac55-080069138b88" uid="21497"/>
+        <specific value="2" description="Type 63 HEI" uuid="fbcda5c6-5269-11df-8cab-080069138b88" uid="21498"/>
+        <specific value="3" description="Type 63-I HEI" uuid="fbceb6fa-5269-11df-b6eb-080069138b88" uid="21499"/>
+        <specific value="4" description="Type 63-II HE" uuid="fbcfcafe-5269-11df-9732-080069138b88" uid="21500"/>
+        <specific value="5" description="Type 63-III HE" uuid="fbd0d71e-5269-11df-b0d4-080069138b88" uid="21501"/>
+        <specific value="6" description="Jamming rocket" uuid="fbd1e74e-5269-11df-8b73-080069138b88" uid="21502"/>
+      </subcategory>
+      <subcategory value="12" description="120 mm" uuid="fbd398aa-5269-11df-80fd-080069138b88" uid="21503">
+        <specific value="1" description="Mortar bomb (Type 55)" uuid="fbd4ac18-5269-11df-9407-080069138b88" uid="21504"/>
+      </subcategory>
+      <subcategory value="13" description="122 mm" uuid="fbd65b76-5269-11df-9ea6-080069138b88" uid="21505">
+        <specific value="1" description="HE Type 54" uuid="fbd763c2-5269-11df-8350-080069138b88" uid="21506"/>
+        <specific value="2" description="Smoke Type 54" uuid="fbd8751e-5269-11df-9dba-080069138b88" uid="21507"/>
+        <specific value="3" description="Illuminating Type 54" uuid="fbd989cc-5269-11df-8b7e-080069138b88" uid="21508"/>
+      </subcategory>
+      <subcategory value="14" description="122 mm Rocket" uuid="fbdb3876-5269-11df-8616-080069138b88" uid="21509">
+        <specific value="1" description="HE" uuid="fbdc4130-5269-11df-92d1-080069138b88" uid="21510"/>
+        <specific value="2" description="HE-Frag" uuid="fbdd5214-5269-11df-99c0-080069138b88" uid="21511"/>
+        <specific value="3" description="HEI" uuid="fbde64b0-5269-11df-8af2-080069138b88" uid="21512"/>
+        <specific value="4" description="HE Cargo" uuid="fbdf6d1a-5269-11df-821d-080069138b88" uid="21513"/>
+        <specific value="5" description="HEI-Frag" uuid="fbe07e62-5269-11df-8810-080069138b88" uid="21514"/>
+        <specific value="6" description="Minelaying" uuid="fbe19068-5269-11df-b8a8-080069138b88" uid="21515"/>
+        <specific value="7" description="Minelaying Type 84" uuid="fbe29c4c-5269-11df-b0cb-080069138b88" uid="21516"/>
+      </subcategory>
+      <subcategory value="15" description="130 mm" uuid="fbe44e20-5269-11df-9637-080069138b88" uid="21517">
+        <specific value="1" description="HE Type 59" uuid="fbe55d42-5269-11df-9380-080069138b88" uid="21518"/>
+        <specific value="2" description="Illunination Type 59" uuid="fbe66d5e-5269-11df-b74a-080069138b88" uid="21519"/>
+        <specific value="3" description="MP-130 RAP" uuid="fbe779e2-5269-11df-86f7-080069138b88" uid="21520"/>
+        <specific value="4" description="ERFB-HE" uuid="fbe887c4-5269-11df-8bfd-080069138b88" uid="21521"/>
+      </subcategory>
+      <subcategory value="16" description="130 mm rocket" uuid="fbea424e-5269-11df-a9be-080069138b88" uid="21522">
+        <specific value="1" description="HE Type 63" uuid="fbeb5454-5269-11df-bf93-080069138b88" uid="21523"/>
+        <specific value="2" description="HE-Frag Type 82" uuid="fbec6060-5269-11df-b3d1-080069138b88" uid="21524"/>
+        <specific value="3" description="HEI Type 82" uuid="fbed6f00-5269-11df-8bc7-080069138b88" uid="21525"/>
+        <specific value="4" description="Extended-range HE-Frag" uuid="fbee8386-5269-11df-a319-080069138b88" uid="21526"/>
+      </subcategory>
+      <subcategory value="17" description="152 mm" uuid="fbf03460-5269-11df-898c-080069138b88" uid="21527">
+        <specific value="1" description="HE Type 66" uuid="fbf14184-5269-11df-bedb-080069138b88" uid="21528"/>
+        <specific value="2" description="Smoke Type 66" uuid="fbf2507e-5269-11df-80e7-080069138b88" uid="21529"/>
+        <specific value="3" description="Type MP-152 RAP" uuid="fbf36180-5269-11df-ad35-080069138b88" uid="21530"/>
+        <specific value="4" description="NORINCO Incendiary" uuid="fbf46f94-5269-11df-9030-080069138b88" uid="21531"/>
+        <specific value="5" description="NORINCO Smoke" uuid="fbf57f60-5269-11df-9816-080069138b88" uid="21532"/>
+        <specific value="6" description="NORINCO Illuminating" uuid="fbf68e46-5269-11df-a375-080069138b88" uid="21533"/>
+        <specific value="7" description="HE Type 83" uuid="fbf79cbe-5269-11df-a93a-080069138b88" uid="21534"/>
+        <specific value="8" description="NORINCO ERFB-BB" uuid="fbf8ac8a-5269-11df-8f62-080069138b88" uid="21535"/>
+      </subcategory>
+      <subcategory value="18" description="155 mm" uuid="fbfa5c2e-5269-11df-a222-080069138b88" uid="21536">
+        <specific value="1" description="ERFB" uuid="fbfb6e3e-5269-11df-9d41-080069138b88" uid="21537"/>
+        <specific value="2" description="ERFB-BB" uuid="fbfc7860-5269-11df-84a9-080069138b88" uid="21538"/>
+        <specific value="3" description="ERFB-WP" uuid="fbfd882c-5269-11df-ab6a-080069138b88" uid="21539"/>
+        <specific value="4" description="ERFB Illuminating" uuid="fbfe9924-5269-11df-bed6-080069138b88" uid="21540"/>
+      </subcategory>
+      <subcategory value="19" description="160 mm" uuid="fc004ada-5269-11df-8c79-080069138b88" uid="21541">
+        <specific value="1" description="Mortar bomb type 56" uuid="fc0159b6-5269-11df-af5f-080069138b88" uid="21542"/>
+      </subcategory>
+      <subcategory value="20" description="253 mm" uuid="fc0309b4-5269-11df-9e15-080069138b88" uid="21543">
+        <specific value="1" description="Minesweeping rocket Type 81" uuid="fc0419b2-5269-11df-b76c-080069138b88" uid="21544"/>
+        <specific value="2" description="Minesweeping rocket Type 81-II" uuid="fc052bea-5269-11df-ab23-080069138b88" uid="21545"/>
+      </subcategory>
+      <subcategory value="21" description="284 mm" uuid="fc06e0fc-5269-11df-8542-080069138b88" uid="21546">
+        <specific value="1" description="Minelaying rocket Type 74" uuid="fc07eb3c-5269-11df-af45-080069138b88" uid="21547"/>
+        <specific value="2" description="Minelaying rocket Type 85" uuid="fc0906de-5269-11df-a258-080069138b88" uid="21548"/>
+      </subcategory>
+      <subcategory value="22" description="M-7/CSS-8 (HQ-2 SSM variant)" uuid="fc0aba88-5269-11df-9be4-080069138b88" uid="21549">
+        <specific value="1" description="Booster phase vehicle" uuid="fc0bcbee-5269-11df-9f19-080069138b88" uid="21550"/>
+        <specific value="2" description="Jettisoned booster" uuid="fc0cd782-5269-11df-af5d-080069138b88" uid="21551"/>
+        <specific value="3" description="Separated warhead" uuid="fc0deb9a-5269-11df-a42b-080069138b88" uid="21552"/>
+      </subcategory>
+      <subcategory value="23" description="35mm Grenade Launcher Ammunition" uuid="fc0f9cce-5269-11df-a8fc-080069138b88" uid="21553">
+        <specific value="1" description="Grenade, 35mm, HE" uuid="fc10b14a-5269-11df-ba45-080069138b88" uid="21554"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="45" uuid="fc13a26a-5269-11df-9b69-080069138b88" uid="21555">
+    <category value="1" description="Guided" uuid="fc14b09c-5269-11df-853b-080069138b88" uid="21556">
+      <subcategory value="1" description="CSS-1 (DF-2)" deprecated="1" uuid="fc15bf00-5269-11df-9a6c-080069138b88" uid="21557"/>
+      <subcategory value="2" description="CSS-2 (DF-3)" uuid="fc16d110-5269-11df-87ae-080069138b88" uid="21558"/>
+      <subcategory value="3" description="CSS-3 (DF-4)" uuid="fc17dfb0-5269-11df-a276-080069138b88" uid="21559"/>
+      <subcategory value="4" description="CSS-4 (DF-5)" uuid="fc18eff4-5269-11df-9748-080069138b88" uid="21560">
+        <specific value="1" description="DF-5" uuid="fc19fe8a-5269-11df-ab39-080069138b88" uid="21561"/>
+        <specific value="2" description="DF-5A" uuid="fc1b0aaa-5269-11df-b345-080069138b88" uid="21562"/>
+      </subcategory>
+      <subcategory value="5" description="DF-21" uuid="fc1cb990-5269-11df-8000-080069138b88" uid="21563">
+        <specific value="1" description="Booster phase vehicle" uuid="fc1dc858-5269-11df-9c6b-080069138b88" uid="21564"/>
+        <specific value="3" description="Separated warhead" uuid="fc1edb58-5269-11df-b70c-080069138b88" uid="21565"/>
+        <specific value="4" description="Jettisoned first stage" uuid="fc1fe5f2-5269-11df-bd76-080069138b88" uid="21566"/>
+        <specific value="5" description="Second stage vehicle" uuid="fc20f80c-5269-11df-a45b-080069138b88" uid="21567"/>
+        <specific value="6" description="Jettisoned second stage" uuid="fc220904-5269-11df-848f-080069138b88" uid="21568"/>
+      </subcategory>
+      <subcategory value="6" description="DF-31" uuid="fc23b81c-5269-11df-8ef3-080069138b88" uid="21569"/>
+      <subcategory value="7" description="DF-41" uuid="fc24c676-5269-11df-b386-080069138b88" uid="21570"/>
+      <subcategory value="8" description="JL-1 (CSS-N-1)" uuid="fc25d67e-5269-11df-9ff2-080069138b88" uid="21571"/>
+      <subcategory value="9" description="DF-11 (M-11)" deprecated="1" uuid="fc26ee9c-5269-11df-a111-080069138b88" uid="21572"/>
+      <subcategory value="10" description="CSS-NX-3" uuid="fc27f9ae-5269-11df-b2f2-080069138b88" uid="21573"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="45" uuid="fc2a5280-5269-11df-8ac1-080069138b88" uid="21574">
+    <category value="2" description="Ballistic" uuid="fc2b5af4-5269-11df-a113-080069138b88" uid="21575">
+      <subcategory value="1" description="DF-15 (M-9)" uuid="fc2c6b60-5269-11df-969c-080069138b88" uid="21576">
+        <specific value="1" description="Booster phase vehicle" uuid="fc2d7dc0-5269-11df-ae05-080069138b88" uid="21577"/>
+        <specific value="3" description="Separated warhead" uuid="fc2ea3a8-5269-11df-9bca-080069138b88" uid="21578"/>
+        <specific value="4" description="Jettisoned first stage" uuid="fc2fc9cc-5269-11df-b5a1-080069138b88" uid="21579"/>
+        <specific value="5" description="Second stage vehicle" uuid="fc30ed84-5269-11df-847b-080069138b88" uid="21580"/>
+        <specific value="6" description="Jettisoned second stage" uuid="fc321812-5269-11df-8c8e-080069138b88" uid="21581"/>
+      </subcategory>
+      <subcategory value="2" description="M-11 / DF-11 / CSS-7" uuid="fc33c946-5269-11df-b82b-080069138b88" uid="21582">
+        <specific value="1" description="Booster phase vehicle" uuid="fc34d610-5269-11df-a262-080069138b88" uid="21583"/>
+        <specific value="2" description="Jettisoned booster" uuid="fc35eea6-5269-11df-9216-080069138b88" uid="21584"/>
+        <specific value="3" description="Separated warhead" uuid="fc370598-5269-11df-a912-080069138b88" uid="21585"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="119" uuid="fc39f578-5269-11df-9ae1-080069138b88" uid="21586">
+    <category value="2" description="Ballistic" uuid="fc3b0544-5269-11df-9ea9-080069138b88" uid="21587">
+      <subcategory value="1" description="Scud-B (SS-1C)" deprecated="1" uuid="fc3c1772-5269-11df-b629-080069138b88" uid="21588"/>
+      <subcategory value="2" description="Scud-C (SS-1D)" uuid="fc3d2900-5269-11df-acdc-080069138b88" uid="21589"/>
+      <subcategory value="3" description="No Dong" deprecated="1" uuid="fc3e3534-5269-11df-aaba-080069138b88" uid="21590">
+        <specific value="1" description="Booster phase vehicle" deprecated="1" uuid="fc3f46b8-5269-11df-b14c-080069138b88" uid="21591"/>
+        <specific value="2" description="Jettisoned booster" deprecated="1" uuid="fc405760-5269-11df-a9be-080069138b88" uid="21592"/>
+        <specific value="3" description="Separated warhead" deprecated="1" uuid="fc416722-5269-11df-9a68-080069138b88" uid="21593"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="119" uuid="fc445c7a-5269-11df-9a82-080069138b88" uid="21594">
+    <category value="2" description="Ballistic" uuid="fc457222-5269-11df-bd54-080069138b88" uid="21595">
+      <subcategory value="1" description="240 mm rocket" uuid="fc467c3a-5269-11df-80b2-080069138b88" uid="21596"/>
+      <subcategory value="2" description="170mm Koksan round" uuid="fc4790d4-5269-11df-9a00-080069138b88" uid="21597">
+        <specific value="1" description="HE" uuid="fc48a15e-5269-11df-a840-080069138b88" uid="21598"/>
+        <specific value="2" description="ICM" uuid="fc49ab94-5269-11df-b326-080069138b88" uid="21599"/>
+        <specific value="3" description="Chem-Bio" uuid="fc4abc6e-5269-11df-ab53-080069138b88" uid="21600"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="119" uuid="fc4db054-5269-11df-97c9-080069138b88" uid="21601">
+    <category value="1" description="Guided" uuid="fc4ec1d8-5269-11df-a8c3-080069138b88" uid="21602">
+      <subcategory value="1" description="Taepo Dong I" uuid="fc4fcb0a-5269-11df-bbb7-080069138b88" uid="21603">
+        <specific value="1" description="Booster phase vehicle" uuid="fc50d9d2-5269-11df-99ac-080069138b88" uid="21604"/>
+        <specific value="3" description="Separated warhead" uuid="fc51ec00-5269-11df-a2de-080069138b88" uid="21605"/>
+        <specific value="4" description="Jettisoned first stage" uuid="fc52faa0-5269-11df-a484-080069138b88" uid="21606"/>
+        <specific value="5" description="Second stage vehicle" uuid="fc540b0c-5269-11df-84f5-080069138b88" uid="21607"/>
+        <specific value="6" description="Jettisoned second stage" uuid="fc551a24-5269-11df-8390-080069138b88" uid="21608"/>
+      </subcategory>
+      <subcategory value="2" description="No Dong" uuid="fc56ce78-5269-11df-b24e-080069138b88" uid="21609">
+        <specific value="1" description="Booster phase vehicle" uuid="fc57d82c-5269-11df-9911-080069138b88" uid="21610"/>
+        <specific value="2" description="Jettisoned booster" uuid="fc58e816-5269-11df-bf0c-080069138b88" uid="21611"/>
+        <specific value="3" description="Separated warhead" uuid="fc59f71a-5269-11df-bf92-080069138b88" uid="21612"/>
+      </subcategory>
+      <subcategory value="3" description="Scud-D" uuid="fc5bab46-5269-11df-af36-080069138b88" uid="21613">
+        <specific value="1" description="Booster phase vehicle" uuid="fc5cb586-5269-11df-9a67-080069138b88" uid="21614"/>
+        <specific value="2" description="Jettisoned booster" uuid="fc5dc476-5269-11df-a89e-080069138b88" uid="21615"/>
+        <specific value="3" description="Separated warhead" uuid="fc5ed7e4-5269-11df-bddf-080069138b88" uid="21616"/>
+      </subcategory>
+      <subcategory value="4" description="Taepo Dong II (2-stage version)" uuid="fc60888c-5269-11df-8205-080069138b88" uid="21617">
+        <specific value="1" description="Stage 2 and warhead only" uuid="fc619600-5269-11df-a4eb-080069138b88" uid="21618"/>
+        <specific value="2" description="Separated warhead only" uuid="fc62a630-5269-11df-9d69-080069138b88" uid="21619"/>
+        <specific value="3" description="Jettisoned booster (first stage)" uuid="fc63b9a8-5269-11df-ab01-080069138b88" uid="21620"/>
+        <specific value="4" description="Jettisoned second stage" uuid="fc64cef6-5269-11df-b03a-080069138b88" uid="21621"/>
+      </subcategory>
+      <subcategory value="5" description="Taepo Dong II (3-stage version)" uuid="fc6683ae-5269-11df-a632-080069138b88" uid="21622">
+        <specific value="1" description="Stage 2, 3 and warhead" uuid="fc6794c4-5269-11df-84ed-080069138b88" uid="21623"/>
+        <specific value="2" description="Stage 3 and warhead" uuid="fc68a5a8-5269-11df-814b-080069138b88" uid="21624"/>
+        <specific value="3" description="Separated warhead" uuid="fc69b452-5269-11df-9870-080069138b88" uid="21625"/>
+        <specific value="4" description="Jettisoned booster (first stage)" uuid="fc6ac6d0-5269-11df-90df-080069138b88" uid="21626"/>
+        <specific value="5" description="Jettisoned second stage" uuid="fc6bd868-5269-11df-a579-080069138b88" uid="21627"/>
+        <specific value="6" description="Jettisoned third stage" uuid="fc6ce3c0-5269-11df-ba83-080069138b88" uid="21628"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="205" uuid="fc6fdabc-5269-11df-a77a-080069138b88" uid="21629">
+    <category value="1" description="Guided" uuid="fc70e93e-5269-11df-9d16-080069138b88" uid="21630">
+      <subcategory value="1" description="RBS-70" uuid="fc71f43c-5269-11df-8c61-080069138b88" uid="21631">
+        <specific value="1" description="RBS-70 Mk 1" uuid="fc73021e-5269-11df-abd2-080069138b88" uid="21632"/>
+        <specific value="2" description="RBS-70 Mk 2" uuid="fc74164a-5269-11df-b7fd-080069138b88" uid="21633"/>
+      </subcategory>
+      <subcategory value="2" description="RBS-15" uuid="fc75c4e0-5269-11df-93cb-080069138b88" uid="21634">
+        <specific value="1" description="RBS-15K" uuid="fc76cc3c-5269-11df-91ec-080069138b88" uid="21635"/>
+        <specific value="2" description="RBS-15M" uuid="fc77df14-5269-11df-87eb-080069138b88" uid="21636"/>
+        <specific value="3" description="RBS-15F" uuid="fc78ef4e-5269-11df-a142-080069138b88" uid="21637"/>
+        <specific value="4" description="RBS-15F MK1" uuid="fc79f98e-5269-11df-9e02-080069138b88" uid="21638"/>
+        <specific value="5" description="RBS-15K MK1" uuid="fc7b0b12-5269-11df-9812-080069138b88" uid="21639"/>
+        <specific value="6" description="RBS-15M MK2" uuid="fc7c1ade-5269-11df-927e-080069138b88" uid="21640"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Ballistic" uuid="fc7e6d16-5269-11df-aed1-080069138b88" uid="21641">
+      <subcategory value="1" description="40 mm" uuid="fc7f7aa8-5269-11df-b138-080069138b88" uid="21642">
+        <specific value="1" description="PFHE mk 2" uuid="fc80831c-5269-11df-af10-080069138b88" uid="21643"/>
+        <specific value="2" description="3P" uuid="fc81952c-5269-11df-9a74-080069138b88" uid="21644"/>
+      </subcategory>
+      <subcategory value="2" description="57 mm" uuid="fc834b74-5269-11df-8156-080069138b88" uid="21645"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="205" uuid="fc859d16-5269-11df-b362-080069138b88" uid="21646">
+    <category value="2" description="Ballistic" uuid="fc86aac6-5269-11df-b0aa-080069138b88" uid="21647">
+      <subcategory value="1" description="40 mm" uuid="fc87bac4-5269-11df-a5e7-080069138b88" uid="21648">
+        <specific value="1" description="APFSDS-T" uuid="fc88ca4a-5269-11df-a3b6-080069138b88" uid="21649"/>
+      </subcategory>
+      <subcategory value="2" description="84mm Carl Gustav rounds" uuid="fc8a950a-5269-11df-bac7-080069138b88" uid="21650">
+        <specific value="1" description="FFV 441B HE" uuid="fc8ba1de-5269-11df-b227-080069138b88" uid="21651"/>
+        <specific value="2" description="FFV 469B Smoke" uuid="fc8cb060-5269-11df-8209-080069138b88" uid="21652"/>
+        <specific value="3" description="FFV 545 IL" uuid="fc8dc450-5269-11df-a0db-080069138b88" uid="21653"/>
+        <specific value="4" description="FFV 502 HEDP" uuid="fc8ecf9e-5269-11df-b71c-080069138b88" uid="21654"/>
+        <specific value="5" description="FFV 551 HEAT" uuid="fc8fdeca-5269-11df-b9db-080069138b88" uid="21655"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="205" uuid="fc92d3aa-5269-11df-b4eb-080069138b88" uid="21656">
+    <category value="2" description="Ballistic" uuid="fc93e182-5269-11df-9043-080069138b88" uid="21657">
+      <subcategory value="1" description="40 mm" uuid="fc94ea78-5269-11df-be4d-080069138b88" uid="21658">
+        <specific value="1" description="HE" uuid="fc95fca6-5269-11df-8022-080069138b88" uid="21659"/>
+        <specific value="2" description="MP-T" uuid="fc970a6a-5269-11df-a1f6-080069138b88" uid="21660"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="106" uuid="fc99f8f6-5269-11df-b791-080069138b88" uid="21661">
+    <category value="1" description="Guided" uuid="fc9b06e2-5269-11df-b928-080069138b88" uid="21662">
+      <subcategory value="1" description="SPADA" deprecated="1" uuid="fc9c17f8-5269-11df-a28b-080069138b88" uid="21663"/>
+      <subcategory value="2" description="ASPIDE" uuid="fc9d297c-5269-11df-9452-080069138b88" uid="21664"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="3" country="106" uuid="fc9f7c18-5269-11df-a708-080069138b88" uid="21665">
+    <category value="1" description="Guided" uuid="fca089e6-5269-11df-8cac-080069138b88" uid="21666">
+      <subcategory value="1" description="Decoy" uuid="fca194a8-5269-11df-8da1-080069138b88" uid="21667">
+        <specific value="1" description="BREDA SCLAR 105 mm" uuid="fca2ad5c-5269-11df-81ec-080069138b88" uid="21668"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="106" uuid="fca5a520-5269-11df-884d-080069138b88" uid="21669">
+    <category value="1" description="Guided" uuid="fca6b654-5269-11df-b558-080069138b88" uid="21670">
+      <subcategory value="1" description="OTO Melara Teseo MK 2" uuid="fca7c01c-5269-11df-8ef0-080069138b88" uid="21671"/>
+      <subcategory value="2" description="MILAS" uuid="fca8cfc0-5269-11df-8264-080069138b88" uid="21672"/>
+      <subcategory value="3" description="324 mm B-515 Torpedo" uuid="fca9df64-5269-11df-aa6c-080069138b88" uid="21673"/>
+      <subcategory value="4" description="MARTE 2" uuid="fcaaef44-5269-11df-9796-080069138b88" uid="21674"/>
+      <subcategory value="5" description="Sistel Sea Killer" uuid="fcabff60-5269-11df-9dbb-080069138b88" uid="21675"/>
+    </category>
+    <category value="2" description="Ballistic" uuid="fcadade2-5269-11df-bd38-080069138b88" uid="21676">
+      <subcategory value="1" description="40 mm/70 BREDA" uuid="fcaebf7a-5269-11df-a7bf-080069138b88" uid="21677"/>
+      <subcategory value="2" description="3 in/62 MMK OTO Melara" uuid="fcafca00-5269-11df-8dcb-080069138b88" uid="21678"/>
+      <subcategory value="3" description="5 in/54 OTO Melara" uuid="fcb0dd14-5269-11df-8550-080069138b88" uid="21679"/>
+      <subcategory value="4" description="25 mm twin" uuid="fcb1efce-5269-11df-b0cc-080069138b88" uid="21680"/>
+      <subcategory value="5" description="30 mm twin" uuid="fcb2f9e6-5269-11df-9a25-080069138b88" uid="21681"/>
+      <subcategory value="6" description="Whitehead K113" uuid="fcb40994-5269-11df-b518-080069138b88" uid="21682"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="7" country="106" uuid="fcb65b72-5269-11df-a8de-080069138b88" uid="21683">
+    <category value="1" description="Guided" uuid="fcb767f6-5269-11df-9343-080069138b88" uid="21684">
+      <subcategory value="1" description="324 mm B-515" uuid="fcb87a10-5269-11df-b603-080069138b88" uid="21685"/>
+      <subcategory value="2" description="Whitehead A290" uuid="fcb98eb4-5269-11df-b5d2-080069138b88" uid="21686"/>
+      <subcategory value="3" description="Whitehead A184" uuid="fcba99d0-5269-11df-950a-080069138b88" uid="21687"/>
+      <subcategory value="4" description="Whitehead A-244/s Torpedo" uuid="fcbba8e8-5269-11df-9825-080069138b88" uid="21688"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="110" uuid="fcbdfca6-5269-11df-99e9-080069138b88" uid="21689">
+    <category value="1" description="Guided" uuid="fcbf0ace-5269-11df-94d4-080069138b88" uid="21690">
+      <subcategory value="1" description="Type 89 Torpedo" uuid="fcc019aa-5269-11df-8b8b-080069138b88" uid="21691"/>
+      <subcategory value="2" description="SSM-1A/1B (type 88/90)" uuid="fcc13164-5269-11df-8a12-080069138b88" uid="21692"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="240" uuid="fcc38432-5269-11df-b2ce-080069138b88" uid="21693">
+    <category value="3" description="Fixed" uuid="fcc4926e-5269-11df-a7bd-080069138b88" uid="21694">
+      <subcategory value="1" description="TMRP-6 Anti-tank mine" uuid="fcc59f38-5269-11df-b0f9-080069138b88" uid="21695"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="8" country="0" uuid="fcc7f184-5269-11df-8fbb-080069138b88" uid="21696">
+    <category value="3" description="Fixed" uuid="fcc8fc64-5269-11df-8eb2-080069138b88" uid="21697">
+      <subcategory value="1" description="AN/FO (94% ammonium nitrate, 6% fuel oil)" uuid="fcca0d8e-5269-11df-b834-080069138b88" uid="21698">
+        <specific value="1" description="1 000 lbs. Explosive" uuid="fccb211a-5269-11df-86b8-080069138b88" uid="21699"/>
+        <specific value="2" description="2 000 lbs. Explosive" uuid="fccc2b28-5269-11df-8b50-080069138b88" uid="21700"/>
+        <specific value="3" description="5 000 lbs. Explosive" uuid="fccd3c84-5269-11df-8391-080069138b88" uid="21701"/>
+        <specific value="4" description="10 000 lbs. Explosive" uuid="fcce5178-5269-11df-9391-080069138b88" uid="21702"/>
+        <specific value="5" description="15 000 lbs. Explosive" uuid="fccf5c8a-5269-11df-a184-080069138b88" uid="21703"/>
+        <specific value="6" description="20 000 lbs. Explosive" uuid="fcd06b52-5269-11df-ad36-080069138b88" uid="21704"/>
+        <specific value="7" description="25 000 lbs. Explosive" uuid="fcd17ce0-5269-11df-ac2f-080069138b88" uid="21705"/>
+        <specific value="8" description="30 000 lbs. Explosive" uuid="fcd28b80-5269-11df-89a4-080069138b88" uid="21706"/>
+        <specific value="9" description="35 000 lbs. Explosive" uuid="fcd39d18-5269-11df-ad52-080069138b88" uid="21707"/>
+        <specific value="10" description="40 000 lbs. Explosive" uuid="fcd4ac9e-5269-11df-bdee-080069138b88" uid="21708"/>
+        <specific value="11" description="45 000 lbs. Explosive" uuid="fcd5b724-5269-11df-a054-080069138b88" uid="21709"/>
+        <specific value="12" description="50 000 lbs. Explosive" uuid="fcd6cc2c-5269-11df-ad08-080069138b88" uid="21710"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="101" uuid="fcd9bf18-5269-11df-9c03-080069138b88" uid="21711">
+    <category value="3" description="Fixed" uuid="fcdacc8c-5269-11df-8d7e-080069138b88" uid="21712">
+      <subcategory value="1" description="SADAF-02 mine" uuid="fcdbda46-5269-11df-afe3-080069138b88" uid="21713"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="101" uuid="fcde2b20-5269-11df-ad86-080069138b88" uid="21714">
+    <category value="1" description="Guided" uuid="fcdf3d62-5269-11df-84e8-080069138b88" uid="21715">
+      <subcategory value="1" description="Shahab 4" uuid="fce04d6a-5269-11df-9698-080069138b88" uid="21716"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="101" uuid="fce29d86-5269-11df-93b5-080069138b88" uid="21717">
+    <category value="2" description="Ballistic" uuid="fce3acc6-5269-11df-be14-080069138b88" uid="21718">
+      <subcategory value="1" description="Shahab 3" uuid="fce4bbfc-5269-11df-a1f0-080069138b88" uid="21719">
+        <specific value="1" description="Boost phase vehicle" uuid="fce5cb8c-5269-11df-869d-080069138b88" uid="21720"/>
+        <specific value="2" description="Jettisoned booster" uuid="fce6da4a-5269-11df-9a94-080069138b88" uid="21721"/>
+        <specific value="3" description="Separated warhead" uuid="fce7ea34-5269-11df-b080-080069138b88" uid="21722"/>
+      </subcategory>
+      <subcategory value="2" description="Iran 170" uuid="fce99c44-5269-11df-9036-080069138b88" uid="21723"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="206" uuid="fcebeb98-5269-11df-9014-080069138b88" uid="21724">
+    <category value="2" description="Ballistic" uuid="fcecfa7e-5269-11df-9596-080069138b88" uid="21725">
+      <subcategory value="1" description="35 mm" uuid="fcee09d2-5269-11df-a371-080069138b88" uid="21726">
+        <specific value="1" description="HEI-T" uuid="fcef1aca-5269-11df-a5a0-080069138b88" uid="21727"/>
+        <specific value="2" description="SAPHEI-T" uuid="fcf0237a-5269-11df-84e0-080069138b88" uid="21728"/>
+        <specific value="3" description="FAPDS" uuid="fcf132f6-5269-11df-8d95-080069138b88" uid="21729"/>
+        <specific value="4" description="AHEAD" uuid="fcf24420-5269-11df-866d-080069138b88" uid="21730"/>
+        <specific value="5" description="HEI" uuid="fcf34c1c-5269-11df-b326-080069138b88" uid="21731"/>
+        <specific value="6" description="HEI-BF" uuid="fcf45ae4-5269-11df-b635-080069138b88" uid="21732"/>
+        <specific value="7" description="TP-T" uuid="fcf569fc-5269-11df-9a5b-080069138b88" uid="21733"/>
+        <specific value="8" description="APDS-T" uuid="fcf676e4-5269-11df-8a96-080069138b88" uid="21734"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="10" country="99" uuid="fcf9655c-5269-11df-89a2-080069138b88" uid="21735">
+    <category value="1" description="Guided" uuid="fcfa75d2-5269-11df-932d-080069138b88" uid="21736">
+      <subcategory value="1" description="Agni" uuid="fcfb7ebe-5269-11df-a901-080069138b88" uid="21737"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="99" uuid="fcfdd150-5269-11df-ac69-080069138b88" uid="21738">
+    <category value="2" description="Ballistic" uuid="fcfee4be-5269-11df-90ad-080069138b88" uid="21739">
+      <subcategory value="1" description="Prithvi" uuid="fcfff372-5269-11df-99aa-080069138b88" uid="21740"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="99" uuid="fd02447e-5269-11df-afcb-080069138b88" uid="21741">
+    <category value="1" description="Guided" uuid="fd03540e-5269-11df-8b5d-080069138b88" uid="21742">
+      <subcategory value="1" description="Trishul" uuid="fd046114-5269-11df-9a24-080069138b88" uid="21743"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="165" uuid="fd06b0e0-5269-11df-b7f1-080069138b88" uid="21744">
+    <category value="2" description="Ballistic" uuid="fd07bf9e-5269-11df-984d-080069138b88" uid="21745">
+      <subcategory value="1" description="Hatf-1" uuid="fd08d0e6-5269-11df-a589-080069138b88" uid="21746"/>
+      <subcategory value="2" description="Hatf-2" uuid="fd09e2d8-5269-11df-b9e6-080069138b88" uid="21747"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="11" country="165" uuid="fd0c397a-5269-11df-98de-080069138b88" uid="21748">
+    <category value="2" description="Ballistic" uuid="fd0d4acc-5269-11df-8d0c-080069138b88" uid="21749">
+      <subcategory value="1" description="Hatf-3" uuid="fd0e53a4-5269-11df-b86f-080069138b88" uid="21750"/>
+      <subcategory value="2" description="Ghauri" uuid="fd0f628a-5269-11df-a1c7-080069138b88" uid="21751"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="1" country="208" uuid="fd11b30a-5269-11df-b760-080069138b88" uid="21752">
+    <category value="1" description="Guided" uuid="fd12c57e-5269-11df-90c4-080069138b88" uid="21753">
+      <subcategory value="1" description="Sky Bow II / Tien Kung II" uuid="fd13d4be-5269-11df-86d0-080069138b88" uid="21754"/>
+      <subcategory value="2" description="Tien Chien II / Sky Sword II" uuid="fd14e62e-5269-11df-b287-080069138b88" uid="21755"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="208" uuid="fd1732e4-5269-11df-aa26-080069138b88" uid="21756">
+    <category value="1" description="Guided" uuid="fd184670-5269-11df-b660-080069138b88" uid="21757">
+      <subcategory value="1" description="Hsiung-Feng II" uuid="fd195038-5269-11df-889d-080069138b88" uid="21758"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="39" uuid="fd1ba50e-5269-11df-ae0f-080069138b88" uid="21759">
+    <category value="2" description="Ballistic" uuid="fd1cb49e-5269-11df-9841-080069138b88" uid="21760">
+      <subcategory value="1" description="70 mm(2.75in)" uuid="fd1dc564-5269-11df-afb5-080069138b88" uid="21761">
+        <specific value="1" description="CRV7 WTU-5001/B: Practice" uuid="fd1ed9ae-5269-11df-874b-080069138b88" uid="21762"/>
+        <specific value="2" description="CRV7 WTU-5001 A/B: Hardened Rod Practice" uuid="fd1fe628-5269-11df-ab10-080069138b88" uid="21763"/>
+        <specific value="3" description="CRV7 WAU-5001/B KEP: Kinetic Energy Penetrator" uuid="fd20f77a-5269-11df-863f-080069138b88" uid="21764"/>
+        <specific value="4" description="CRV7 WDU-500X/B GPF: General Purpose Flechette" uuid="fd221696-5269-11df-9ec9-080069138b88" uid="21765"/>
+        <specific value="5" description="CRV7 WDU-5002/B FAT: Flechette Anti-Tank" uuid="fd232950-5269-11df-acbd-080069138b88" uid="21766"/>
+        <specific value="6" description="CRV7 RA-70 HEISAP: High Explosive Incendiary Semi-Armor Piercing" uuid="fd243c46-5269-11df-b06c-080069138b88" uid="21767"/>
+        <specific value="7" description="CRV7 WDU-5001/B PHEI: Penetrator High Explosive Incendiary" uuid="fd25500e-5269-11df-8dc8-080069138b88" uid="21768"/>
+        <specific value="8" description="CRV7 M151 HEPD: High/Explosive Point Detonating" uuid="fd26611a-5269-11df-8fef-080069138b88" uid="21769"/>
+        <specific value="9" description="CRV7 M156: SMOKE (White Phosphorus)" uuid="fd277384-5269-11df-b7eb-080069138b88" uid="21770"/>
+        <specific value="10" description="CRV7 M257 (M442 Fuze): Illumination" uuid="fd288602-5269-11df-992e-080069138b88" uid="21771"/>
+        <specific value="11" description="CRV7 M261 HE MPSM: High Explosive Multipurpose Submunition" uuid="fd29925e-5269-11df-9a47-080069138b88" uid="21772"/>
+        <specific value="12" description="CRV7 M267 PRACTICE MPSM: Practice Multipurpose Submunition" uuid="fd2aa946-5269-11df-ba4c-080069138b88" uid="21773"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="6" country="163" uuid="fd2da04c-5269-11df-b29c-080069138b88" uid="21774">
+    <category value="1" description="Guided" uuid="fd2eaf28-5269-11df-a148-080069138b88" uid="21775">
+      <subcategory value="1" description="Penguin MK 2" uuid="fd2fb698-5269-11df-8e4e-080069138b88" uid="21776"/>
+    </category>
+  </entity>
+  <entity kind="2" domain="9" country="29" uuid="fd320c5e-5269-11df-ba53-080069138b88" uid="21777">
+    <category value="2" description="Ballistic" uuid="fd331540-5269-11df-9f39-080069138b88" uid="21778">
+      <subcategory value="1" description="Rocket ASTROS" uuid="fd34234a-5269-11df-a705-080069138b88" uid="21779">
+        <specific value="1" description="127 mm SS-30" uuid="fd3534ba-5269-11df-85d5-080069138b88" uid="21780">
+          <extra value="1" description="HE Frag" uuid="fd363e28-5269-11df-a382-080069138b88" uid="21781"/>
+        </specific>
+        <specific value="2" description="180 mm SS-40" uuid="fd37eee4-5269-11df-950e-080069138b88" uid="21782">
+          <extra value="1" description="HE Frag" uuid="fd38fcf8-5269-11df-ac1b-080069138b88" uid="21783"/>
+          <extra value="2" description="HE Incendiary" uuid="fd3a0bf2-5269-11df-9e72-080069138b88" uid="21784"/>
+          <extra value="3" description="DPICM" uuid="fd3b1600-5269-11df-ba27-080069138b88" uid="21785"/>
+          <extra value="4" description="Mine Anti-tank" uuid="fd3c315c-5269-11df-8b12-080069138b88" uid="21786"/>
+          <extra value="5" description="Mine Anti-personnel" uuid="fd3d4196-5269-11df-aae4-080069138b88" uid="21787"/>
+          <extra value="6" description="Runway Denial" uuid="fd3e4b18-5269-11df-b0c9-080069138b88" uid="21788"/>
+        </specific>
+        <specific value="3" description="3 mm SS-60" uuid="fd3ffe0e-5269-11df-93a6-080069138b88" uid="21789">
+          <extra value="1" description="HE Frag" uuid="fd410c54-5269-11df-a834-080069138b88" uid="21790"/>
+          <extra value="2" description="HE Incendiary" uuid="fd421af4-5269-11df-a3aa-080069138b88" uid="21791"/>
+          <extra value="3" description="DPICM" uuid="fd43269c-5269-11df-b2e0-080069138b88" uid="21792"/>
+          <extra value="4" description="Mine Anti-tank" uuid="fd4435c8-5269-11df-820f-080069138b88" uid="21793"/>
+          <extra value="5" description="Mine Anti-personnel" uuid="fd454508-5269-11df-ae1b-080069138b88" uid="21794"/>
+          <extra value="6" description="Runway Denial" uuid="fd464cbe-5269-11df-817e-080069138b88" uid="21795"/>
+        </specific>
+        <specific value="4" description="3 mm SS-80" uuid="fd47fdb6-5269-11df-9bb7-080069138b88" uid="21796">
+          <extra value="1" description="HE Frag" uuid="fd490ca6-5269-11df-9070-080069138b88" uid="21797"/>
+          <extra value="2" description="HE Incendiary" uuid="fd4a1c18-5269-11df-9f75-080069138b88" uid="21798"/>
+          <extra value="3" description="DPICM" uuid="fd4b23ec-5269-11df-acb6-080069138b88" uid="21799"/>
+          <extra value="4" description="Mine Anti-tank" uuid="fd4c3624-5269-11df-96fd-080069138b88" uid="21800"/>
+          <extra value="5" description="Mine Anti-personnel" uuid="fd4d4532-5269-11df-aed0-080069138b88" uid="21801"/>
+          <extra value="6" description="Runway Denial" uuid="fd4e506c-5269-11df-a588-080069138b88" uid="21802"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="2" domain="2" country="197" status="new" uuid="5c06f5c8-d631-47c8-9282-c08380ac299a" uid="22823">
+    <cr value="1830"/>
+    <category value="1" description="Guided" status="new" uuid="19097a23-86c8-46f5-a8a9-59758ce8f00c" uid="22824">
+      <cr value="1830"/>
+      <subcategory value="1" description="Mokopa ZT-6 ATGM" status="new" uuid="2afd7a0d-e413-4368-997d-19150cee0ea1" uid="22825">
+        <cr value="1830"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="0" country="0" uuid="fd51e114-5269-11df-b349-080069138b88" uid="21803">
+    <category value="0" description="Other" uuid="fd52ee2e-5269-11df-9ac6-080069138b88" uid="21804"/>
+  </entity>
+  <entity kind="3" domain="1" country="0" uuid="fd54a020-5269-11df-bf29-080069138b88" uid="21805">
+    <category value="0" description="Other" uuid="fd55ad58-5269-11df-abf0-080069138b88" uid="21806"/>
+    <category value="1" description="Dismounted Infantry (with)" uuid="fd56bc0c-5269-11df-85ab-080069138b88" uid="21807">
+      <subcategory value="0" description="Other" uuid="fd57c9da-5269-11df-8b01-080069138b88" uid="21808"/>
+      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd58db86-5269-11df-b759-080069138b88" uid="21809">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fd59f4f8-5269-11df-9a76-080069138b88" uid="21810"/>
+        <specific value="101" description="Fire Team" uuid="fd5b04a6-5269-11df-b78d-080069138b88" uid="21811"/>
+        <specific value="102" description="Squad" uuid="fd5c13e6-5269-11df-836b-080069138b88" uid="21812"/>
+        <specific value="103" description="Platoon" uuid="fd5d2466-5269-11df-8fef-080069138b88" uid="21813"/>
+        <specific value="104" description="Company" uuid="fd5e2f78-5269-11df-b355-080069138b88" uid="21814"/>
+        <specific value="105" description="Battalion" uuid="fd5f3c4c-5269-11df-94de-080069138b88" uid="21815"/>
+        <specific value="106" description="Regiment" uuid="fd604f06-5269-11df-80fa-080069138b88" uid="21816"/>
+        <specific value="107" description="Division" uuid="fd615914-5269-11df-8458-080069138b88" uid="21817"/>
+        <specific value="108" description="Corps" uuid="fd62675a-5269-11df-a0c3-080069138b88" uid="21818"/>
+        <specific value="109" description="Army" uuid="fd637622-5269-11df-bd95-080069138b88" uid="21819"/>
+      </subcategory_range>
+    </category>
+    <category value="2" description="Dismounted Infantry (non-visible)" uuid="fd65c7ba-5269-11df-88c6-080069138b88" uid="21820">
+      <subcategory value="0" description="Other-Observation Post" uuid="fd66d97a-5269-11df-9380-080069138b88" uid="21821"/>
+    </category>
+    <category value="3" description="Civilian, unarmed" uuid="fd688b76-5269-11df-9440-080069138b88" uid="21822">
+      <subcategory value="1" description="Civilian, non government" uuid="fd6993e0-5269-11df-bdcc-080069138b88" uid="21823">
+        <specific value="1" description="Contractor" uuid="fd6aa50a-5269-11df-9ce4-080069138b88" uid="21824"/>
+        <specific value="2" description="Media" uuid="fd6bb5e4-5269-11df-823f-080069138b88" uid="21825"/>
+      </subcategory>
+      <subcategory value="2" description="Local Officials" uuid="fd6d6862-5269-11df-b489-080069138b88" uid="21826">
+        <specific value="1" description="Mayor" uuid="fd6e7194-5269-11df-a7e4-080069138b88" uid="21827"/>
+        <specific value="2" description="Policeman." uuid="fd6f8214-5269-11df-b144-080069138b88" uid="21828"/>
+        <specific value="3" description="Police Chief" uuid="fd709488-5269-11df-9221-080069138b88" uid="21829"/>
+        <specific value="4" description="VIP" uuid="fd719d24-5269-11df-9c47-080069138b88" uid="21830"/>
+        <specific value="5" description="Religious Leader." uuid="fd72ad04-5269-11df-b40b-080069138b88" uid="21831"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Civilian, w/weapons" uuid="fd74fd7a-5269-11df-955c-080069138b88" uid="21832">
+      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd760f58-5269-11df-9740-080069138b88" uid="21833"/>
+    </category>
+    <category value="5" description="Animal" uuid="fd77c2b2-5269-11df-8495-080069138b88" uid="21834">
+      <subcategory value="1" description="Domesticated Animal" uuid="fd78d8d2-5269-11df-ad22-080069138b88" uid="21835">
+        <specific value="1" description="Dog" uuid="fd79e9a2-5269-11df-8613-080069138b88" uid="21836"/>
+        <specific value="2" description="Cat" uuid="fd7af5b8-5269-11df-aee6-080069138b88" uid="21837"/>
+        <specific value="3" description="Cow" uuid="fd7c03ea-5269-11df-a4e6-080069138b88" uid="21838"/>
+        <specific value="4" description="Horse" uuid="fd7d121c-5269-11df-938c-080069138b88" uid="21839"/>
+        <specific value="5" description="Camel" uuid="fd7e1edc-5269-11df-a019-080069138b88" uid="21840"/>
+      </subcategory>
+      <subcategory value="2" description="Wild Animal" uuid="fd7fccd2-5269-11df-9bc9-080069138b88" uid="21841">
+        <specific value="1" description="Canine" uuid="fd80dc94-5269-11df-9b73-080069138b88" uid="21842"/>
+        <specific value="2" description="Feline" uuid="fd81edbe-5269-11df-a303-080069138b88" uid="21843"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="2" country="0" uuid="fd84dd4e-5269-11df-9bbe-080069138b88" uid="21844">
+    <category value="0" description="Other" uuid="fd85eb8a-5269-11df-b6c7-080069138b88" uid="21845"/>
+    <category value="1" description="Parachutist (with)" uuid="fd86f94e-5269-11df-8006-080069138b88" uid="21846">
+      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd880a46-5269-11df-a901-080069138b88" uid="21847">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fd891bc0-5269-11df-b60c-080069138b88" uid="21848"/>
+        <specific value="101" description="Fire Team" uuid="fd8a2d44-5269-11df-b8de-080069138b88" uid="21849"/>
+        <specific value="102" description="Squad" uuid="fd8b3b80-5269-11df-9103-080069138b88" uid="21850"/>
+        <specific value="103" description="Platoon" uuid="fd8c4890-5269-11df-a8b5-080069138b88" uid="21851"/>
+        <specific value="104" description="Company" uuid="fd8d5898-5269-11df-8a63-080069138b88" uid="21852"/>
+        <specific value="105" description="Battalion" uuid="fd8e67d8-5269-11df-a5bc-080069138b88" uid="21853"/>
+        <specific value="106" description="Regiment" uuid="fd8f7060-5269-11df-9e11-080069138b88" uid="21854"/>
+        <specific value="107" description="Division" uuid="fd90811c-5269-11df-aa09-080069138b88" uid="21855"/>
+        <specific value="108" description="Corps" uuid="fd9193fe-5269-11df-b424-080069138b88" uid="21856"/>
+        <specific value="109" description="Army" uuid="fd929c90-5269-11df-b2ff-080069138b88" uid="21857"/>
+      </subcategory_range>
+    </category>
+    <category value="2" description="A bird" uuid="fd94f080-5269-11df-9ac9-080069138b88" uid="21858"/>
+    <category value="3" description="Flock of birds" uuid="fd95ff70-5269-11df-88bb-080069138b88" uid="21859">
+      <subcategory value="0" description="Unspecified size" uuid="fd970f14-5269-11df-92c2-080069138b88" uid="21860">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fd982872-5269-11df-af1e-080069138b88" uid="21861"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="3" country="0" uuid="fd9b1bc2-5269-11df-8a1e-080069138b88" uid="21862">
+    <category value="0" description="Other" uuid="fd9c2bfc-5269-11df-9ed7-080069138b88" uid="21863"/>
+    <category value="1" description="Swimmer (with)" uuid="fd9d3b14-5269-11df-9fa8-080069138b88" uid="21864">
+      <subcategory value="0" description="Other" uuid="fd9e4b8a-5269-11df-bef7-080069138b88" uid="21865"/>
+      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fd9f55f2-5269-11df-9970-080069138b88" uid="21866">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fda069d8-5269-11df-8598-080069138b88" uid="21867"/>
+        <specific value="101" description="Fire Team" uuid="fda17f8a-5269-11df-9b31-080069138b88" uid="21868"/>
+        <specific value="102" description="Squad" uuid="fda2898e-5269-11df-bef4-080069138b88" uid="21869"/>
+        <specific value="103" description="Platoon" uuid="fda397d4-5269-11df-9c17-080069138b88" uid="21870"/>
+        <specific value="104" description="Company" uuid="fda4a7dc-5269-11df-8c5f-080069138b88" uid="21871"/>
+        <specific value="105" description="Battalion" uuid="fda5b58c-5269-11df-81fb-080069138b88" uid="21872"/>
+        <specific value="106" description="Regiment" uuid="fda6c580-5269-11df-b81f-080069138b88" uid="21873"/>
+        <specific value="107" description="Division" uuid="fda7d3a8-5269-11df-8a0b-080069138b88" uid="21874"/>
+        <specific value="108" description="Corps" uuid="fda8ddfc-5269-11df-b51f-080069138b88" uid="21875"/>
+        <specific value="109" description="Army" uuid="fda9f0a2-5269-11df-ace8-080069138b88" uid="21876"/>
+      </subcategory_range>
+    </category>
+    <category value="2" description="Occupied life raft" uuid="fdac3fd8-5269-11df-be83-080069138b88" uid="21877">
+      <subcategory value="0" description="Unused" uuid="fdad524c-5269-11df-8031-080069138b88" uid="21878">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdae627c-5269-11df-8a27-080069138b88" uid="21879"/>
+        <specific value="101" description="Fire Team" uuid="fdaf743c-5269-11df-af86-080069138b88" uid="21880"/>
+        <specific value="102" description="Squad" uuid="fdb07dbe-5269-11df-a8ca-080069138b88" uid="21881"/>
+        <specific value="103" description="Platoon" uuid="fdb19014-5269-11df-82c3-080069138b88" uid="21882"/>
+        <specific value="104" description="Company" uuid="fdb29f40-5269-11df-b5fb-080069138b88" uid="21883"/>
+        <specific value="105" description="Battalion" uuid="fdb3a96c-5269-11df-988a-080069138b88" uid="21884"/>
+        <specific value="106" description="Regiment" uuid="fdb4bc80-5269-11df-b2af-080069138b88" uid="21885"/>
+        <specific value="107" description="Division" uuid="fdb5cc42-5269-11df-9697-080069138b88" uid="21886"/>
+        <specific value="108" description="Corps" uuid="fdb6de0c-5269-11df-8868-080069138b88" uid="21887"/>
+        <specific value="109" description="Army" uuid="fdb7f15c-5269-11df-9ed5-080069138b88" uid="21888"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="3" domain="4" country="0" uuid="fdbae54c-5269-11df-a71d-080069138b88" uid="21889">
+    <category value="0" description="Other" uuid="fdbbfa2c-5269-11df-9a8d-080069138b88" uid="21890"/>
+    <category value="1" description="Diver (with)" uuid="fdbd04bc-5269-11df-b81b-080069138b88" uid="21891">
+      <subcategory value="0" description="Other" uuid="fdbe135c-5269-11df-baae-080069138b88" uid="21892"/>
+      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fdbf2558-5269-11df-876c-080069138b88" uid="21893">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdc031c8-5269-11df-ac4e-080069138b88" uid="21894"/>
+      </subcategory_range>
+    </category>
+    <category value="2" description="School of Fish" uuid="fdc28f04-5269-11df-8a07-080069138b88" uid="21895">
+      <subcategory value="0" description="Unspecified size" uuid="fdc397dc-5269-11df-a166-080069138b88" uid="21896">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdc4a910-5269-11df-a1f0-080069138b88" uid="21897"/>
+      </subcategory>
+    </category>
+    <category value="3" description="School of Shrimp" uuid="fdc6ff76-5269-11df-97c6-080069138b88" uid="21898">
+      <subcategory value="0" description="Unspecified size" uuid="fdc80e16-5269-11df-8d8a-080069138b88" uid="21899">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdc91e0a-5269-11df-8461-080069138b88" uid="21900"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Whale" uuid="fdcb70b0-5269-11df-b5f2-080069138b88" uid="21901"/>
+  </entity>
+  <entity kind="3" domain="5" country="0" uuid="fdcd2446-5269-11df-aba7-080069138b88" uid="21902">
+    <category value="0" description="Other" uuid="fdce3110-5269-11df-8f57-080069138b88" uid="21903"/>
+    <category value="1" description="Astronaut (with)" uuid="fdcf4136-5269-11df-a325-080069138b88" uid="21904">
+      <subcategory value="0" description="Other" uuid="fdd0504e-5269-11df-bab2-080069138b88" uid="21905"/>
+      <subcategory_range value_min="1" value_max="255" description="Weapon" xref="14" uuid="fdd15a34-5269-11df-aad8-080069138b88" uid="21906">
+        <specific_range value_min="1" value_max="100" description="Number of individuals" uuid="fdd26e88-5269-11df-9745-080069138b88" uid="21907"/>
+      </subcategory_range>
+    </category>
+  </entity>
+  <entity kind="4" domain="1" country="0" uuid="fdd57024-5269-11df-a634-080069138b88" uid="21908">
+    <category value="0" description="Other" uuid="fdd6819e-5269-11df-bb17-080069138b88" uid="21909"/>
+    <category value="1" description="Radar collected noise" uuid="fdd78bac-5269-11df-a755-080069138b88" uid="21910"/>
+  </entity>
+  <entity kind="4" domain="2" country="0" uuid="fdd93c86-5269-11df-bd97-080069138b88" uid="21911">
+    <category value="0" description="Other" uuid="fdda4edc-5269-11df-b39d-080069138b88" uid="21912"/>
+    <category value="1" description="Smoke" uuid="fddb5d9a-5269-11df-b451-080069138b88" uid="21913"/>
+    <category value="2" description="Fog" uuid="fddc6618-5269-11df-9d6a-080069138b88" uid="21914"/>
+    <category value="3" description="Cloud" uuid="fddd747c-5269-11df-83dc-080069138b88" uid="21915"/>
+    <category value="4" description="Cloud With Rain Falling" uuid="fdde877c-5269-11df-b260-080069138b88" uid="21916"/>
+    <category value="5" description="Cloud With Snow Falling" uuid="fddf9248-5269-11df-bc88-080069138b88" uid="21917"/>
+    <category value="6" description="Haze" uuid="fde0a0e8-5269-11df-a94f-080069138b88" uid="21918"/>
+    <category value="7" description="Dust/Sandstorm" uuid="fde1b212-5269-11df-9089-080069138b88" uid="21919"/>
+    <category value="8" description="Cloud with sleet falling" uuid="fde2c044-5269-11df-a6d7-080069138b88" uid="21920"/>
+  </entity>
+  <entity kind="4" domain="3" country="0" uuid="fde4704c-5269-11df-b62d-080069138b88" uid="21921">
+    <category value="0" description="Other" uuid="fde57d8e-5269-11df-b927-080069138b88" uid="21922"/>
+    <category value="1" description="Sea State" uuid="fde68d0a-5269-11df-b38d-080069138b88" uid="21923"/>
+    <category value="2" description="Oil Slick" uuid="fde7995c-5269-11df-9675-080069138b88" uid="21924"/>
+    <category value="3" description="Ice" uuid="fde8a7ac-5269-11df-b1aa-080069138b88" uid="21925"/>
+    <category value="4" description="Debris" uuid="fde9b886-5269-11df-b14e-080069138b88" uid="21926"/>
+    <category value="5" description="Surf Noise" uuid="fdeac334-5269-11df-9241-080069138b88" uid="21927"/>
+    <category value="6" description="Island" uuid="fdebd5bc-5269-11df-982d-080069138b88" uid="21928"/>
+  </entity>
+  <entity kind="4" domain="4" country="0" uuid="fded81fa-5269-11df-ac95-080069138b88" uid="21929">
+    <category value="0" description="Other" uuid="fdee8f0a-5269-11df-921b-080069138b88" uid="21930"/>
+    <category value="1" description="Sound Velocity Profile" uuid="fdef9c4c-5269-11df-b038-080069138b88" uid="21931"/>
+    <category value="2" description="Ice Berg" uuid="fdf0abe6-5269-11df-afb2-080069138b88" uid="21932"/>
+    <category value="3" description="Current Profile" uuid="fdf1ba22-5269-11df-8bb1-080069138b88" uid="21933"/>
+    <category value="4" description="Biologics" uuid="fdf2c6f6-5269-11df-8fb7-080069138b88" uid="21934">
+      <subcategory value="0" description="Bioluminescence" uuid="fdf3df00-5269-11df-8b7d-080069138b88" uid="21935"/>
+    </category>
+    <category value="5" description="Transmissivity profile" uuid="fdf590c0-5269-11df-9a96-080069138b88" uid="21936"/>
+    <category value="6" description="Ice Merchant" uuid="fdf6a302-5269-11df-8c1f-080069138b88" uid="21937"/>
+    <category value="7" description="Kelp Bed" uuid="fdf7acf2-5269-11df-a2ae-080069138b88" uid="21938"/>
+    <category value="8" description="Knuckle" uuid="fdf8bc5a-5269-11df-bda4-080069138b88" uid="21939"/>
+    <category value="9" description="Debris/Clutter" uuid="fdf9cc44-5269-11df-963d-080069138b88" uid="21940"/>
+  </entity>
+  <entity kind="4" domain="5" country="0" uuid="fdfb7a62-5269-11df-82ab-080069138b88" uid="21941">
+    <category value="0" description="Unused" uuid="fdfc8600-5269-11df-b89a-080069138b88" uid="21942"/>
+  </entity>
+  <entity kind="5" domain="1" country="0" uuid="fdfe3360-5269-11df-b8bd-080069138b88" uid="21943">
+    <category value="0" description="Other" uuid="fdff4016-5269-11df-a8a3-080069138b88" uid="21944"/>
+    <category value="1" description="Bridge" uuid="fe004efc-5269-11df-8ae6-080069138b88" uid="21945">
+      <subcategory value="0" description="Other" uuid="fe015c48-5269-11df-91fa-080069138b88" uid="21946"/>
+      <subcategory value="1" description="Concrete, two-lane" uuid="fe026bb0-5269-11df-bab6-080069138b88" uid="21947"/>
+      <subcategory value="2" description="Concrete, four-lane" uuid="fe037b5e-5269-11df-b103-080069138b88" uid="21948"/>
+      <subcategory value="3" description="Truss, two-lane" uuid="fe048670-5269-11df-854d-080069138b88" uid="21949"/>
+      <subcategory value="4" description="Truss, four-lane" uuid="fe059b0a-5269-11df-a773-080069138b88" uid="21950"/>
+      <subcategory value="5" description="Suspension, two-lane" uuid="fe06ab62-5269-11df-bb39-080069138b88" uid="21951"/>
+      <subcategory value="6" description="Suspension, four-lane" uuid="fe07b5ac-5269-11df-897e-080069138b88" uid="21952"/>
+    </category>
+    <category value="2" description="Building" uuid="fe096866-5269-11df-b4dc-080069138b88" uid="21953">
+      <subcategory value="0" description="Other" uuid="fe0a76ca-5269-11df-b8f5-080069138b88" uid="21954"/>
+      <subcategory value="1" description="One-story" uuid="fe0b86c8-5269-11df-8702-080069138b88" uid="21955">
+        <specific value="1" description="Trapezoidal Aircraft Shelter (Trihangar)" uuid="fe0c92fc-5269-11df-af5c-080069138b88" uid="21956"/>
+        <specific value="2" description="Curvilinear Aircraft Shelter" uuid="fe0da584-5269-11df-82aa-080069138b88" uid="21957"/>
+        <specific value="3" description="Bermed Storage Bunker" uuid="fe0eb5f0-5269-11df-ae2e-080069138b88" uid="21958"/>
+        <specific value="4" description="Hardened Curvilinear Munitions Bunker" uuid="fe0fc30a-5269-11df-8d16-080069138b88" uid="21959"/>
+      </subcategory>
+      <subcategory value="2" description="Two-story" uuid="fe11763c-5269-11df-908a-080069138b88" uid="21960"/>
+      <subcategory value="3" description="Three-story" uuid="fe128e46-5269-11df-a80b-080069138b88" uid="21961"/>
+      <subcategory value="4" description="Four-story" uuid="fe13a07e-5269-11df-bd6e-080069138b88" uid="21962"/>
+      <subcategory value="5" description="Five story" uuid="fe14ac26-5269-11df-afc5-080069138b88" uid="21963"/>
+      <subcategory value="6" description="Six story" uuid="fe15bc10-5269-11df-8d56-080069138b88" uid="21964"/>
+      <subcategory value="7" description="Seven story" uuid="fe16d078-5269-11df-98c2-080069138b88" uid="21965"/>
+      <subcategory value="8" description="Eight story" uuid="fe17db08-5269-11df-85ad-080069138b88" uid="21966"/>
+      <subcategory value="9" description="Nine story" uuid="fe18eac0-5269-11df-aa1a-080069138b88" uid="21967"/>
+      <subcategory value="10" description="Ten story" uuid="fe19fb86-5269-11df-ac31-080069138b88" uid="21968"/>
+    </category>
+    <category value="3" description="Tracks" uuid="fe1bae9a-5269-11df-a4ce-080069138b88" uid="21969">
+      <subcategory value="0" description="Other" uuid="fe1cb6f0-5269-11df-9326-080069138b88" uid="21970"/>
+      <subcategory value="1" description="Tank" uuid="fe1dc4e6-5269-11df-a706-080069138b88" uid="21971"/>
+    </category>
+    <category value="4" description="Crater" uuid="fe1f7476-5269-11df-8b6e-080069138b88" uid="21972"/>
+    <category value="5" description="Obstacle" uuid="fe208730-5269-11df-aca3-080069138b88" uid="21973">
+      <subcategory value="0" description="Other" uuid="fe218f5e-5269-11df-aecd-080069138b88" uid="21974"/>
+      <subcategory value="1" description="Ditch" uuid="fe229ec6-5269-11df-9187-080069138b88" uid="21975"/>
+      <subcategory value="2" description="Tank ditch, 100x4 M" uuid="fe23b0f4-5269-11df-8dda-080069138b88" uid="21976"/>
+      <subcategory value="3" description="Tank ditch, 200x4 M" uuid="fe24befe-5269-11df-83a3-080069138b88" uid="21977"/>
+      <subcategory value="4" description="Tank ditch, 300x4 M" uuid="fe25cfe2-5269-11df-9746-080069138b88" uid="21978"/>
+      <subcategory value="5" description="Abatis, 8-tree" uuid="fe26df54-5269-11df-aaf8-080069138b88" uid="21979"/>
+      <subcategory value="6" description="Concertina fence, 3-roll" uuid="fe27ea16-5269-11df-999c-080069138b88" uid="21980"/>
+      <subcategory value="7" description="Log crib, rectangular" uuid="fe28ff00-5269-11df-a684-080069138b88" uid="21981"/>
+      <subcategory value="8" description="Ammo prestock" uuid="fe2a0f94-5269-11df-9381-080069138b88" uid="21982"/>
+      <subcategory value="9" description="Fuel prestock" uuid="fe2b1952-5269-11df-8083-080069138b88" uid="21983"/>
+      <subcategory value="10" description="Minefield, hasty, 0-300 M" uuid="fe2c2d2e-5269-11df-bd05-080069138b88" uid="21984"/>
+      <subcategory value="11" description="Minefield, prepared, 0-500 M" uuid="fe2d3eee-5269-11df-b54b-080069138b88" uid="21985"/>
+      <subcategory value="12" description="Minefield, scatterable oval" uuid="fe2e4ae6-5269-11df-892d-080069138b88" uid="21986"/>
+      <subcategory value="13" description="Barbed wire" uuid="fe2f59e0-5269-11df-a84c-080069138b88" uid="21987"/>
+      <subcategory value="14" description="Dragon's teeth" uuid="fe306ce0-5269-11df-ae27-080069138b88" uid="21988"/>
+      <subcategory value="15" description="Jersey Barrier" uuid="fe3180a8-5269-11df-841b-080069138b88" uid="21989"/>
+    </category>
+    <category value="6" description="Flags/markers" uuid="fe333100-5269-11df-9e46-080069138b88" uid="21990">
+      <subcategory value="0" description="Other" uuid="fe343f28-5269-11df-957b-080069138b88" uid="21991"/>
+      <subcategory value="1" description="Breached lane" uuid="fe355476-5269-11df-a43a-080069138b88" uid="21992"/>
+      <subcategory value="2" description="Minefield" uuid="fe365fd8-5269-11df-b408-080069138b88" uid="21993">
+        <specific value="1" description="Minefield markers, Oval" status="new" uuid="6722932f-c94b-4700-b002-58cf87da3b4a" uid="22886">
+          <cr value="2237"/>
+        </specific>
+        <specific value="2" description="Minefield markers, Rectangular" status="new" uuid="531e4bc6-2788-49ab-807b-493eaff83a5d" uid="22887">
+          <cr value="2237"/>
+        </specific>
+      </subcategory>
+      <subcategory value="3" description="NBC Hazard Markers" status="new" uuid="10efa2ab-f91d-4500-92fc-5443615dfe4b" uid="22888">
+        <cr value="2237"/>
+      </subcategory>
+      <subcategory value="4" description="Ground Markings" status="new" uuid="c8a92c10-f5a5-4315-8549-179a7bbf3215" uid="22889">
+        <cr value="2237"/>
+        <specific value="1" description="Panel" status="new" uuid="7968e655-44c3-4bae-a216-845218d597ff" uid="22890">
+          <cr value="2237"/>
+          <extra value="0" description="Panel (Other)" status="new" uuid="78d724d9-068d-46bd-90c4-3d88c144bcb5" uid="22891">
+            <cr value="2237"/>
+          </extra>
+          <extra value="1" description="Panel (Olive Drab)" status="new" uuid="80d47519-f98f-47c1-bbe8-7d73928bccb4" uid="22892">
+            <cr value="2237"/>
+          </extra>
+          <extra value="2" description="Panel (Orange)" status="new" uuid="3d7afae9-ca24-425b-aa45-e922967c9374" uid="22893">
+            <cr value="2237"/>
+          </extra>
+          <extra value="3" description="Panel (Tan)" status="new" uuid="4c974de1-9bf1-432e-924e-487042cbef3c" uid="22894">
+            <cr value="2237"/>
+          </extra>
+        </specific>
+        <specific value="2" description="Half Panel" status="new" uuid="b70f2149-8264-47c8-973a-b2c5f20605e1" uid="22895">
+          <cr value="2237"/>
+          <extra value="0" description="Half Panel (Other)" status="new" uuid="1a369246-2c47-44c4-b517-114c5c0c6a54" uid="22896">
+            <cr value="2237"/>
+          </extra>
+          <extra value="1" description="Half Panel (Olive Drab)" status="new" uuid="cd9e72a1-051e-4e61-adbe-d7d41a5e1d87" uid="22897">
+            <cr value="2237"/>
+          </extra>
+          <extra value="2" description="Half Panel (Orange)" status="new" uuid="81acc539-c68d-4928-a2a2-1d30728dd0c6" uid="22898">
+            <cr value="2237"/>
+          </extra>
+          <extra value="3" description="Half Panel (Tan)" status="new" uuid="9849a546-cca4-475e-8d80-c119945c6c45" uid="22899">
+            <cr value="2237"/>
+          </extra>
+        </specific>
+      </subcategory>
+      <subcategory value="5" description="Light Point" status="new" uuid="64361cef-5cb0-4b99-88b8-e3d83b81490e" uid="22900">
+        <cr value="2237"/>
+        <specific value="1" description="Light Point, Single" status="new" uuid="96bcad68-aa9f-49bf-8e23-21b47501bc5d" uid="22901">
+          <cr value="2237"/>
+          <extra value="1" description="Light Point, Single, White" status="new" uuid="8577e9cc-fc19-4c77-a984-2cb2efb6d23c" uid="22902">
+            <cr value="2237"/>
+          </extra>
+          <extra value="2" description="Light Point, Single, Red" status="new" uuid="5d2acd3a-a9a3-4508-8475-cee85faa04db" uid="22903">
+            <cr value="2237"/>
+          </extra>
+          <extra value="3" description="Light Point, Single, Blue" status="new" uuid="c194b979-d550-4804-9220-144b4f4f7a95" uid="22904">
+            <cr value="2237"/>
+          </extra>
+          <extra value="4" description="Light Point, Single, Green" status="new" uuid="141afe32-b678-4764-8463-56c1ea1e83b3" uid="22905">
+            <cr value="2237"/>
+          </extra>
+          <extra value="5" description="Light Point, Single, Yellow" status="new" uuid="d482cef3-d92b-41cd-9567-38ef2d317d9a" uid="22906">
+            <cr value="2237"/>
+          </extra>
+          <extra value="6" description="Light Point, Single, Infrared" status="new" uuid="f64fcd8c-3d0c-4455-b5b4-8c8bb07e5a66" uid="22907">
+            <cr value="2237"/>
+          </extra>
+        </specific>
+        <specific value="2" description="Y Light Point" status="new" uuid="7d1ac875-fd09-461f-adf5-1adfb13777a0" uid="22908">
+          <cr value="2237"/>
+          <extra value="1" description="Y Light Point, White" status="new" uuid="4dfc4d16-095e-427e-8910-1aba07b36ccf" uid="22909">
+            <cr value="2237"/>
+          </extra>
+          <extra value="2" description="Y Light Point, Red" status="new" uuid="0c98c3b8-f40a-4224-ab8a-55e3db73cf7d" uid="22910">
+            <cr value="2237"/>
+          </extra>
+          <extra value="3" description="Y Light Point, Blue" status="new" uuid="eaae9f04-6cb6-4964-86f3-8a48ac854549" uid="22911">
+            <cr value="2237"/>
+          </extra>
+          <extra value="4" description="Y Light Point, Green" status="new" uuid="93fab0d4-2bed-4e31-8c2a-9baf5469ac91" uid="22912">
+            <cr value="2237"/>
+          </extra>
+          <extra value="5" description="Y Light Point, Yellow" status="new" uuid="c41f5d65-5f83-42e3-99db-9c588d187ec9" uid="22913">
+            <cr value="2237"/>
+          </extra>
+          <extra value="6" description="Y Light Point, Infrared" status="new" uuid="4b13dbda-f99e-4350-8fe0-28c3a75aecec" uid="22914">
+            <cr value="2237"/>
+          </extra>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="7" description="Prepared positions" uuid="fe380e6e-5269-11df-b871-080069138b88" uid="21994">
+      <subcategory value="0" description="Other" uuid="fe391c14-5269-11df-9f5f-080069138b88" uid="21995"/>
+      <subcategory value="1" description="Armored, hull defilade" uuid="fe3a3036-5269-11df-9530-080069138b88" uid="21996"/>
+      <subcategory value="2" description="Fighting, hull defilade" uuid="fe3b3c6a-5269-11df-a433-080069138b88" uid="21997"/>
+      <subcategory value="3" description="Mortar carrier, hull defilade" uuid="fe3c4c9a-5269-11df-9720-080069138b88" uid="21998"/>
+      <subcategory value="4" description="Tank, hull defilade" uuid="fe3d5ebe-5269-11df-bd80-080069138b88" uid="21999"/>
+      <subcategory value="5" description="Infantry fighting" uuid="fe3e6d90-5269-11df-a100-080069138b88" uid="22000"/>
+      <subcategory value="6" description="Machine gun" uuid="fe3f7e7e-5269-11df-abfc-080069138b88" uid="22001"/>
+      <subcategory value="7" description="Covered machine gun bunker" uuid="fe408c06-5269-11df-a2c6-080069138b88" uid="22002"/>
+      <subcategory value="8" description="Overhead covered infantry" uuid="fe4198c6-5269-11df-bc5c-080069138b88" uid="22003"/>
+      <subcategory value="9" description="Forward Area Re-arming Point (FARD)" uuid="fe42ae6e-5269-11df-9edc-080069138b88" uid="22004"/>
+    </category>
+    <category value="8" description="Underground facility" uuid="fe445fe8-5269-11df-89d3-080069138b88" uid="22005">
+      <subcategory value="0" description="Other" uuid="fe456d84-5269-11df-863f-080069138b88" uid="22006"/>
+      <subcategory value="1" description="Single level" uuid="fe467bf2-5269-11df-9fa6-080069138b88" uid="22007"/>
+      <subcategory value="2" description="Two levels" uuid="fe478ac4-5269-11df-9f03-080069138b88" uid="22008"/>
+      <subcategory value="3" description="Three levels" uuid="fe489aa4-5269-11df-8b5c-080069138b88" uid="22009"/>
+    </category>
+    <category value="9" description="SSM Site" uuid="fe4a4a5c-5269-11df-84f2-080069138b88" uid="22010">
+      <subcategory value="0" description="Other" uuid="fe4b529e-5269-11df-9933-080069138b88" uid="22011"/>
+      <subcategory value="1" description="Fixed" uuid="fe4c6224-5269-11df-9836-080069138b88" uid="22012"/>
+      <subcategory value="2" description="Towed" uuid="fe4d73e4-5269-11df-aa6c-080069138b88" uid="22013"/>
+      <subcategory value="3" description="Self-propelled" uuid="fe4e7c58-5269-11df-8012-080069138b88" uid="22014"/>
+    </category>
+    <category value="10" description="Runway" uuid="fe50366a-5269-11df-b196-080069138b88" uid="22015">
+      <subcategory value="0" description="Other" uuid="fe51478a-5269-11df-8ad8-080069138b88" uid="22016"/>
+      <subcategory value="1" description="5m x 150m" uuid="fe5255f8-5269-11df-863c-080069138b88" uid="22017"/>
+    </category>
+    <category value="11" description="SAM Site" uuid="fe54108c-5269-11df-b315-080069138b88" uid="22018">
+      <subcategory value="0" description="Other" uuid="fe551dce-5269-11df-94fa-080069138b88" uid="22019"/>
+      <subcategory value="1" description="Fixed" uuid="fe562ca0-5269-11df-b367-080069138b88" uid="22020"/>
+      <subcategory value="2" description="Towed" uuid="fe573afa-5269-11df-aa0f-080069138b88" uid="22021"/>
+      <subcategory value="3" description="Self-propelled" uuid="fe58422e-5269-11df-9e4e-080069138b88" uid="22022"/>
+    </category>
+    <category value="12" description="Nuclear Power Plant" uuid="fe59f452-5269-11df-b800-080069138b88" uid="22023">
+      <subcategory value="0" description="Other" uuid="fe5b0324-5269-11df-bca8-080069138b88" uid="22024"/>
+      <subcategory value="1" description="Pressurized Water Reactor" uuid="fe5c119c-5269-11df-8b52-080069138b88" uid="22025">
+        <specific value="1" description="One Reactor Unit" uuid="fe5d1ad8-5269-11df-aced-080069138b88" uid="22026"/>
+        <specific value="2" description="Two Reactor Units" uuid="fe5e2a72-5269-11df-9a50-080069138b88" uid="22027"/>
+      </subcategory>
+      <subcategory value="2" description="Gas-Cooled Graphite Reactor" uuid="fe5fdca0-5269-11df-9fcf-080069138b88" uid="22028">
+        <specific value="1" description="One Reactor Unit" uuid="fe60ea50-5269-11df-95fe-080069138b88" uid="22029"/>
+        <specific value="2" description="Two Reactor Units" uuid="fe61f3be-5269-11df-ab98-080069138b88" uid="22030"/>
+      </subcategory>
+      <subcategory value="3" description="High Temperature Gas-cooled Reactor (HTGR)" uuid="fe63a72c-5269-11df-b401-080069138b88" uid="22031">
+        <specific value="0" description="Other" uuid="fe64b798-5269-11df-aaa5-080069138b88" uid="22032"/>
+        <specific value="1" description="One Reactor Unit" uuid="fe65c3d6-5269-11df-b2b2-080069138b88" uid="22033"/>
+        <specific value="2" description="Two Reactor Units" uuid="fe66cd1c-5269-11df-a790-080069138b88" uid="22034"/>
+      </subcategory>
+      <subcategory value="4" description="Boiling Water Reactor" uuid="fe687df6-5269-11df-b442-080069138b88" uid="22035">
+        <specific value="0" description="Other" uuid="fe698c6e-5269-11df-9e06-080069138b88" uid="22036"/>
+        <specific value="1" description="One Reactor Unit" uuid="fe6a985c-5269-11df-9fc5-080069138b88" uid="22037"/>
+        <specific value="2" description="Two Reactor Units" uuid="fe6ba62a-5269-11df-ab3c-080069138b88" uid="22038"/>
+      </subcategory>
+    </category>
+    <category value="13" description="Railyard" uuid="fe6df498-5269-11df-9d5b-080069138b88" uid="22039"/>
+    <category value="14" description="Camp Lejeune MOUT Collective Training Facility (CTF)" uuid="fe6f0a86-5269-11df-a381-080069138b88" uid="22040">
+      <subcategory value="1" description="Public Building" uuid="fe701c32-5269-11df-88c3-080069138b88" uid="22041">
+        <specific value="1" description="City Hall" uuid="fe712a82-5269-11df-9b3a-080069138b88" uid="22042"/>
+        <specific value="2" description="Church" uuid="fe7236ac-5269-11df-a429-080069138b88" uid="22043"/>
+        <specific value="3" description="School" uuid="fe734452-5269-11df-b2cd-080069138b88" uid="22044"/>
+        <specific value="4" description="School Gymnasium" uuid="fe745162-5269-11df-8d45-080069138b88" uid="22045"/>
+      </subcategory>
+      <subcategory value="2" description="Commercial Building" uuid="fe760322-5269-11df-8d80-080069138b88" uid="22046">
+        <specific value="1" description="Bank" uuid="fe770c36-5269-11df-8fc8-080069138b88" uid="22047"/>
+        <specific value="2" description="Hotel" uuid="fe781a5e-5269-11df-925f-080069138b88" uid="22048"/>
+        <specific value="3" description="Strip Mall" uuid="fe792980-5269-11df-9f52-080069138b88" uid="22049"/>
+        <specific value="4" description="Service Station" uuid="fe7a35d2-5269-11df-b89f-080069138b88" uid="22050"/>
+        <specific value="5" description="Warehouse" uuid="fe7b44f4-5269-11df-bb19-080069138b88" uid="22051"/>
+        <specific value="6" description="2-story Office Building" uuid="fe7c5196-5269-11df-ab0b-080069138b88" uid="22052"/>
+        <specific value="7" description="3-story Office Building" uuid="fe7d5bd6-5269-11df-a955-080069138b88" uid="22053"/>
+      </subcategory>
+      <subcategory value="3" description="Residential Building" uuid="fe7f0d1e-5269-11df-acb2-080069138b88" uid="22054">
+        <specific value="1" description="1-story House" uuid="fe801c36-5269-11df-9d34-080069138b88" uid="22055"/>
+        <specific value="2" description="1-story House with Fireplace" uuid="fe812ab8-5269-11df-8fcd-080069138b88" uid="22056"/>
+        <specific value="3" description="2-story House" uuid="fe8238fe-5269-11df-b335-080069138b88" uid="22057"/>
+        <specific value="4" description="Town House" uuid="fe8346d6-5269-11df-b7b5-080069138b88" uid="22058"/>
+        <specific value="5" description="2-story Apartment Building" uuid="fe845468-5269-11df-824c-080069138b88" uid="22059"/>
+        <specific value="6" description="3-story Apartment Building" uuid="fe8560ce-5269-11df-a4d1-080069138b88" uid="22060"/>
+      </subcategory>
+    </category>
+    <category value="15" description="POL Storage Tank" uuid="fe87b158-5269-11df-b3f4-080069138b88" uid="22061"/>
+    <category value="16" description="Cargo Container" uuid="fe88bbd4-5269-11df-88a6-080069138b88" uid="22062">
+      <subcategory value="1" description="MILVAN" status="new" uuid="52b82ca7-2180-4991-8052-b5d6db91853d" uid="22915">
+        <cr value="2239"/>
+        <specific value="1" description="MILVAN, Empty" status="new" uuid="cc1b20ce-a242-4263-82a7-8251dd6e8194" uid="22916">
+          <cr value="2239"/>
+        </specific>
+        <specific value="2" description="MILVAN, Full" status="new" uuid="e604e4de-b683-4f61-93b7-ef614490c4b8" uid="22917">
+          <cr value="2239"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="17" description="Tower" uuid="fe89c83a-5269-11df-b233-080069138b88" uid="22063">
+      <subcategory value="0" description="Other" uuid="fe8ad70c-5269-11df-a570-080069138b88" uid="22064"/>
+      <subcategory value="1" description="Antenna" uuid="fe8be02a-5269-11df-9252-080069138b88" uid="22065"/>
+      <subcategory value="2" description="Water" uuid="fe8cf032-5269-11df-95d2-080069138b88" uid="22066"/>
+      <subcategory value="3" description="Observation" uuid="fe8e06de-5269-11df-8c34-080069138b88" uid="22067"/>
+    </category>
+    <category value="18" description="AAA site" uuid="fe8fb57e-5269-11df-b697-080069138b88" uid="22068">
+      <subcategory value="0" description="Other" uuid="fe90c0d6-5269-11df-9670-080069138b88" uid="22069"/>
+      <subcategory value="1" description="Fixed" uuid="fe91ceea-5269-11df-9eed-080069138b88" uid="22070"/>
+      <subcategory value="2" description="Towed" uuid="fe92dbaa-5269-11df-92fb-080069138b88" uid="22071"/>
+      <subcategory value="3" description="Self-propelled" uuid="fe93e892-5269-11df-b009-080069138b88" uid="22072"/>
+    </category>
+    <category value="19" description="Bridge Span" uuid="fe959598-5269-11df-9bd1-080069138b88" uid="22073">
+      <subcategory value="0" description="Other" uuid="fe96a280-5269-11df-8614-080069138b88" uid="22074"/>
+      <subcategory value="1" description="Single Lane Each Way" uuid="fe97b116-5269-11df-a462-080069138b88" uid="22075">
+        <specific value="1" description="Single Lane Concrete Girder Bridge Span" uuid="fe98bebc-5269-11df-a687-080069138b88" uid="22076"/>
+        <specific value="2" description="Single Lane Concrete Pier Bridge Span" uuid="fe99cf00-5269-11df-9aab-080069138b88" uid="22077"/>
+        <specific value="3" description="Single Lane Masonary Arch Bridge Span" uuid="fe9adde6-5269-11df-b290-080069138b88" uid="22078"/>
+        <specific value="4" description="Single Lane Steel Floating Bridge Span" uuid="fe9be952-5269-11df-aed5-080069138b88" uid="22079"/>
+        <specific value="5" description="Single Lane Steel Girder Bridge Span" uuid="fe9cfe82-5269-11df-8339-080069138b88" uid="22080"/>
+        <specific value="6" description="Single Lane Steel Pier Bridge Span" uuid="fe9e0ebc-5269-11df-a4e2-080069138b88" uid="22081"/>
+        <specific value="7" description="Single Lane Steel Suspension Bridge Span" uuid="fe9f1942-5269-11df-a9ef-080069138b88" uid="22082"/>
+        <specific value="8" description="Single Lane Steel Trestle Bridge Span" uuid="fea02d8c-5269-11df-9fa6-080069138b88" uid="22083"/>
+        <specific value="9" description="Rope Suspension Bridge Span" uuid="fea13ed4-5269-11df-b4c9-080069138b88" uid="22084"/>
+        <specific value="10" description="Single Lane Wood Girder Bridge Span" uuid="fea2493c-5269-11df-bb31-080069138b88" uid="22085"/>
+        <specific value="11" description="Single Lane Wood Pier Bridge Span" uuid="fea357aa-5269-11df-9bd2-080069138b88" uid="22086"/>
+        <specific value="12" description="Single Lane Wood Trestle Bridge Span" uuid="fea46bb8-5269-11df-915f-080069138b88" uid="22087"/>
+      </subcategory>
+      <subcategory value="2" description="Double Lane Each Way" uuid="fea61a8a-5269-11df-8655-080069138b88" uid="22088">
+        <specific value="1" description="Double Lane Concrete Girder Bridge Span" uuid="fea724fc-5269-11df-ae06-080069138b88" uid="22089"/>
+        <specific value="2" description="Double Lane Concrete Pier Bridge Span" uuid="fea83586-5269-11df-abf2-080069138b88" uid="22090"/>
+        <specific value="3" description="Double Lane Masonary Arch Bridge Span" uuid="fea9498a-5269-11df-a211-080069138b88" uid="22091"/>
+        <specific value="4" description="Double Lane Steel Floating Bridge Span" uuid="feaa542e-5269-11df-8883-080069138b88" uid="22092"/>
+        <specific value="5" description="Double Lane Steel Girder Bridge Span" uuid="feab64ae-5269-11df-b79d-080069138b88" uid="22093"/>
+        <specific value="6" description="Double Lane Steel Pier Bridge Span" uuid="feac7e5c-5269-11df-ba77-080069138b88" uid="22094"/>
+        <specific value="7" description="Double Lane Steel Suspension Bridge Span" uuid="fead8d42-5269-11df-a6e8-080069138b88" uid="22095"/>
+        <specific value="8" description="Double Lane Steel Trestle Bridge Span" uuid="feae9ef8-5269-11df-bec4-080069138b88" uid="22096"/>
+        <specific value="9" description="Double Lane Wood Girder Bridge Span" uuid="feafaf8c-5269-11df-85f4-080069138b88" uid="22097"/>
+        <specific value="10" description="Double Lane Wood Pier Bridge Span" uuid="feb0ba08-5269-11df-b88d-080069138b88" uid="22098"/>
+        <specific value="11" description="Double Lane Wood Pier Trestle Span" uuid="feb1cb0a-5269-11df-959b-080069138b88" uid="22099"/>
+      </subcategory>
+    </category>
+    <category value="20" description="Road element" uuid="feb41b30-5269-11df-91c4-080069138b88" uid="22100">
+      <subcategory value="1" description="Road Section Straight" uuid="feb528f4-5269-11df-b026-080069138b88" uid="22101">
+        <specific value="1" description="One Lane" uuid="feb63b2c-5269-11df-a8c6-080069138b88" uid="22102"/>
+        <specific value="2" description="Two Lane" uuid="feb7490e-5269-11df-83d8-080069138b88" uid="22103"/>
+        <specific value="3" description="Three Lane" uuid="feb85132-5269-11df-9826-080069138b88" uid="22104"/>
+        <specific value="4" description="Four Lane" uuid="feb95de8-5269-11df-ae81-080069138b88" uid="22105"/>
+      </subcategory>
+      <subcategory value="2" description="Road Section Curved" uuid="febb0e86-5269-11df-ac3d-080069138b88" uid="22106">
+        <specific value="1" description="Road Section Curved, One Lane" uuid="febc1ce0-5269-11df-a5e3-080069138b88" uid="22107"/>
+        <specific value="2" description="Road Section Curved, Two Lane" uuid="febd2734-5269-11df-94f8-080069138b88" uid="22108"/>
+        <specific value="3" description="Road Section Curved, Three Lane" uuid="febe380e-5269-11df-910d-080069138b88" uid="22109"/>
+        <specific value="4" description="Road Section Curved, Four Lane" uuid="febf4c44-5269-11df-a366-080069138b88" uid="22110"/>
+      </subcategory>
+      <subcategory value="3" description="Intersection" uuid="fec0f972-5269-11df-a261-080069138b88" uid="22111">
+        <specific value="11" description="Intersection, One Lane to One Lane" uuid="fec20308-5269-11df-a430-080069138b88" uid="22112"/>
+        <specific value="12" description="Intersection, One Lane to Two Lane" uuid="fec312e8-5269-11df-a9e1-080069138b88" uid="22113"/>
+        <specific value="13" description="Intersection, One Lane to Three Lane" uuid="fec426a6-5269-11df-af07-080069138b88" uid="22114"/>
+        <specific value="14" description="Intersection, One Lane to Four Lane" uuid="fec5329e-5269-11df-93ec-080069138b88" uid="22115"/>
+        <specific value="22" description="Intersection, Two Lane to Two Lane" uuid="fec642d8-5269-11df-a33b-080069138b88" uid="22116"/>
+        <specific value="23" description="Intersection, Two Lane to Three Lane" uuid="fec7539e-5269-11df-b246-080069138b88" uid="22117"/>
+        <specific value="24" description="Intersection, Two Lane to Four Lane" uuid="fec8632e-5269-11df-aa4a-080069138b88" uid="22118"/>
+        <specific value="33" description="Intersection, Three Lane to Three Lane" uuid="fec973a4-5269-11df-b0dc-080069138b88" uid="22119"/>
+        <specific value="34" description="Intersection, Three Lane to Four Lane" uuid="feca84e2-5269-11df-ac2b-080069138b88" uid="22120"/>
+        <specific value="44" description="Intersection, Four Lane to Four Lane" uuid="fecb967a-5269-11df-8db3-080069138b88" uid="22121"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="5" domain="3" country="0" uuid="fece8df8-5269-11df-97c0-080069138b88" uid="22122">
+    <category value="0" description="Other" uuid="fecf9a22-5269-11df-9510-080069138b88" uid="22123"/>
+    <category value="1" description="Oil derrick" uuid="fed0a3ea-5269-11df-a16f-080069138b88" uid="22124"/>
+    <category value="2" description="Buoy" uuid="fed1b0e6-5269-11df-b544-080069138b88" uid="22125">
+      <subcategory value="1" description="Lighted buoy" uuid="fed2c184-5269-11df-9608-080069138b88" uid="22126">
+        <specific value="1" description="Fixed Light" uuid="fed3ca84-5269-11df-82a0-080069138b88" uid="22127"/>
+        <specific value="2" description="Flashing Light" uuid="fed4d776-5269-11df-9167-080069138b88" uid="22128"/>
+        <specific value="3" description="Red lighted (flashing)" uuid="fed5e83c-5269-11df-8148-080069138b88" uid="22129"/>
+        <specific value="4" description="Green lighted (flashing)" uuid="fed6f542-5269-11df-b5bd-080069138b88" uid="22130"/>
+        <specific value="5" description="Yellow lighted (flashing)" uuid="fed80446-5269-11df-8c2f-080069138b88" uid="22131"/>
+      </subcategory>
+      <subcategory value="2" description="Can" uuid="fed9b0ac-5269-11df-8e8b-080069138b88" uid="22132">
+        <specific value="1" description="Black buoy" uuid="fedac140-5269-11df-942c-080069138b88" uid="22133"/>
+        <specific value="2" description="Green buoy" uuid="fedbc914-5269-11df-9e8e-080069138b88" uid="22134"/>
+      </subcategory>
+      <subcategory value="3" description="Sound buoy" uuid="fedd77a0-5269-11df-a4b5-080069138b88" uid="22135"/>
+      <subcategory value="4" description="Nun" uuid="fede888e-5269-11df-ac89-080069138b88" uid="22136"/>
+      <subcategory value="5" description="Spherical" uuid="fedf9706-5269-11df-b61a-080069138b88" uid="22137"/>
+    </category>
+    <category value="3" description="Pier" uuid="fee142e0-5269-11df-b16b-080069138b88" uid="22138"/>
+    <category value="4" description="Marker" uuid="fee24d2a-5269-11df-aa89-080069138b88" uid="22139">
+      <subcategory value="1" description="Center channel marker" uuid="fee35a9e-5269-11df-ac55-080069138b88" uid="22140"/>
+      <subcategory value="2" description="Range marker" uuid="fee46a88-5269-11df-8266-080069138b88" uid="22141"/>
+      <subcategory value="3" description="Day marker" uuid="fee573ba-5269-11df-80d8-080069138b88" uid="22142"/>
+    </category>
+    <category value="5" description="Datum" uuid="fee725ca-5269-11df-aba0-080069138b88" uid="22143" status="new" deprecated="true">
+      <cr value="1615"/>
+    </category>
+    <category value="6" description="Special Point" uuid="fee83988-5269-11df-881d-080069138b88" uid="22144" deprecated="true">
+      <cr value="1615"/>
+      <subcategory value="1" description="Mine" uuid="fee94f62-5269-11df-8f34-080069138b88" uid="22145" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="2" description="DLRP" uuid="feea59fc-5269-11df-a793-080069138b88" uid="22146" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="3" description="Navigation Hazard" uuid="feeb6acc-5269-11df-b923-080069138b88" uid="22147" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="4" description="Downed A/C" uuid="feec8a4c-5269-11df-90bd-080069138b88" uid="22148" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="5" description="Man in Water" uuid="feed9fc2-5269-11df-b169-080069138b88" uid="22149" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="6" description="Distressed Vessel" uuid="feeeb0c4-5269-11df-b567-080069138b88" uid="22150" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="7" description="Reference Point" uuid="feefc414-5269-11df-8691-080069138b88" uid="22151" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="8" description="Waypoint" uuid="fef0cbca-5269-11df-8f19-080069138b88" uid="22152" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="9" description="Position of Intended Movement (PIM)" uuid="fef1daec-5269-11df-8b18-080069138b88" uid="22153" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="10" description="Combat Air Patrol (CAP)" uuid="fef2ee14-5269-11df-a7e2-080069138b88" uid="22154" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="11" description="Strike Initial Point (SIP)" uuid="fef3f70a-5269-11df-929a-080069138b88" uid="22155" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="12" description="Flight Rendezvous Point" uuid="fef507ee-5269-11df-b55e-080069138b88" uid="22156" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="13" description="Orbit Point" uuid="fef61774-5269-11df-a2cb-080069138b88" uid="22157" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+      <subcategory value="14" description="Radar Site" uuid="fef7247a-5269-11df-8133-080069138b88" uid="22158" deprecated="true">
+        <cr value="1615"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="5" domain="4" country="0" uuid="fef972d4-5269-11df-9523-080069138b88" uid="22159">
+    <category value="0" description="Other" uuid="fefa7de6-5269-11df-8bd8-080069138b88" uid="22160"/>
+    <category value="1" description="Oil derrick" uuid="fefb8b64-5269-11df-b2f8-080069138b88" uid="22161"/>
+    <category value="2" description="Buoy" uuid="fefc9a18-5269-11df-8db8-080069138b88" uid="22162"/>
+    <category value="3" description="Sunken ship" uuid="fefda174-5269-11df-815e-080069138b88" uid="22163"/>
+  </entity>
+  <entity kind="6" domain="0" country="0" uuid="feff51b8-5269-11df-8345-080069138b88" uid="22164">
+    <category value="0" description="Other" uuid="ff005df6-5269-11df-9120-080069138b88" uid="22165">
+      <subcategory value="1" description="Fuels" uuid="ff0169f8-5269-11df-a95d-080069138b88" uid="22166">
+        <specific value="0" description="Other" uuid="ff0271cc-5269-11df-8278-080069138b88" uid="22167"/>
+        <specific value="1" description="Gasoline" uuid="ff038418-5269-11df-be8f-080069138b88" uid="22168"/>
+        <specific value="2" description="Diesel Fuel" uuid="ff04938a-5269-11df-8a4e-080069138b88" uid="22169"/>
+        <specific value="3" description="JP4" uuid="ff059b22-5269-11df-8530-080069138b88" uid="22170"/>
+        <specific value="4" description="Fuel Oil" uuid="ff06acb0-5269-11df-9400-080069138b88" uid="22171"/>
+        <specific value="5" description="JP-8 Fuel" uuid="ff07bab0-5269-11df-b28d-080069138b88" uid="22172"/>
+        <specific value="6" description="Fog oil" uuid="ff08cbe4-5269-11df-a2e3-080069138b88" uid="22173"/>
+        <specific value="7" description="Multi-Spectral Fog Oil" uuid="ff09d8ea-5269-11df-a8ef-080069138b88" uid="22174"/>
+      </subcategory>
+      <subcategory value="2" description="Oils" uuid="ff0b8a96-5269-11df-a7cd-080069138b88" uid="22175"/>
+      <subcategory value="3" description="Lubricants" uuid="ff0c9968-5269-11df-80de-080069138b88" uid="22176"/>
+      <subcategory value="4" description="Food" uuid="ff0da222-5269-11df-962e-080069138b88" uid="22177">
+        <specific value="1" description="Water, Drinking, Sterile, Clear Colorless (bulk)" uuid="ff0eb36a-5269-11df-9bd1-080069138b88" uid="22178"/>
+        <specific value="2" description="Water, Drinking, Distilled or Sparkling" uuid="ff0fc458-5269-11df-81a4-080069138b88" uid="22179"/>
+        <specific value="3" description="Meal Ready To Eat Individuals Menus NO.1" uuid="ff10cf42-5269-11df-b2a0-080069138b88" uid="22180"/>
+        <specific value="4" description="Humanitarian Daily Ration" uuid="ff11e10c-5269-11df-b72c-080069138b88" uid="22181"/>
+        <specific value="5" description="Vegetarian MRE" uuid="ff12f02e-5269-11df-8b20-080069138b88" uid="22182"/>
+        <specific value="6" description="Bread, Shelf-Stable White" uuid="ff13f9ce-5269-11df-8671-080069138b88" uid="22183"/>
+        <specific value="7" description="Meal, Cold Weather" uuid="ff150bca-5269-11df-b1d5-080069138b88" uid="22184"/>
+        <specific value="8" description="Long Range Patrol Ration" uuid="ff1619f2-5269-11df-a54c-080069138b88" uid="22185"/>
+      </subcategory>
+      <subcategory value="5" description="Spare Parts" uuid="ff17c7ac-5269-11df-a0b9-080069138b88" uid="22186"/>
+      <subcategory value="6" description="Personnel" uuid="ff18d462-5269-11df-9e5c-080069138b88" uid="22187">
+        <specific value="0" description="Other" uuid="ff19e140-5269-11df-a45f-080069138b88" uid="22188"/>
+        <specific value="1" description="Dismounted Infantry" uuid="ff1aeebe-5269-11df-8386-080069138b88" uid="22189"/>
+      </subcategory>
+      <subcategory value="7" description="Equipment" uuid="ff1c9e80-5269-11df-9b10-080069138b88" uid="22190">
+        <specific value="0" description="Other" uuid="ff1da956-5269-11df-9582-080069138b88" uid="22191"/>
+        <specific value="1" description="Mine Plow" uuid="ff1eb594-5269-11df-956b-080069138b88" uid="22192"/>
+        <specific value="2" description="Mine Rollers" uuid="ff1fc33a-5269-11df-ad68-080069138b88" uid="22193"/>
+      </subcategory>
+      <subcategory value="8" description="Pallets with ammunition" uuid="ff2172a2-5269-11df-b007-080069138b88" uid="22194"/>
+      <subcategory value="9" description="Pallets with water" uuid="ff227cce-5269-11df-a98a-080069138b88" uid="22195"/>
+      <subcategory value="10" description="Pallets of fuel (JP8)" uuid="ff238b0a-5269-11df-8474-080069138b88" uid="22196"/>
+      <subcategory value="11" description="Decontamination supplies" uuid="ff2498a6-5269-11df-9d69-080069138b88" uid="22197">
+        <specific value="1" description="Decon Agent STB" uuid="ff25ae12-5269-11df-8cad-080069138b88" uid="22198"/>
+        <specific value="2" description="Ferric Chloride AN 100 1 LB" uuid="ff26c4a0-5269-11df-bf83-080069138b88" uid="22199"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="7" domain="1" country="225" uuid="ff29b688-5269-11df-9421-080069138b88" uid="22200">
+    <category value="1" description="Voice Transmission/Reception" uuid="ff2ac49c-5269-11df-8afa-080069138b88" uid="22201">
+      <subcategory value="0" description="Other" uuid="ff2bd274-5269-11df-965b-080069138b88" uid="22202">
+        <specific value="3" description="Typical DAFIF Derived Traffic Control Voice Radio" uuid="ff2ce1dc-5269-11df-bc02-080069138b88" uid="22203"/>
+      </subcategory>
+    </category>
+    <category value="4" description="Instrumented Landing System (ILS) Glideslope" uuid="ff2f3252-5269-11df-80e5-080069138b88" uid="22204">
+      <subcategory value="0" description="Other" uuid="ff30414c-5269-11df-88c8-080069138b88" uid="22205">
+        <specific value="3" description="Typical DAFIF Derived ILS Glideslope Transmitter" uuid="ff315136-5269-11df-9dd6-080069138b88" uid="22206"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Instrumented Landing System (ILS) Localizer Transmitter" uuid="ff33b386-5269-11df-b5f3-080069138b88" uid="22207">
+      <subcategory value="0" description="Other" uuid="ff34c604-5269-11df-8fe0-080069138b88" uid="22208">
+        <specific value="3" description="Typical DAFIF Derived ILS Localizer Transmitter" uuid="ff35d440-5269-11df-ab80-080069138b88" uid="22209"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment)" uuid="ff38275e-5269-11df-a154-080069138b88" uid="22210">
+      <subcategory value="0" description="Other" uuid="ff393824-5269-11df-829b-080069138b88" uid="22211">
+        <specific value="3" description="Typical DAFIF Derived TACAN" uuid="ff3a4a7a-5269-11df-aeb8-080069138b88" uid="22212"/>
+      </subcategory>
+    </category>
+    <category value="12" description="Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment)" uuid="ff3c979e-5269-11df-90d2-080069138b88" uid="22213">
+      <subcategory value="0" description="Other" uuid="ff3dabd4-5269-11df-828b-080069138b88" uid="22214"/>
+      <subcategory value="1" description="Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196)" uuid="ff3ebbdc-5269-11df-95ce-080069138b88" uid="22215">
+        <specific value="1" description="AN/ARN-118" uuid="ff3fce96-5269-11df-9dca-080069138b88" uid="22216"/>
+        <specific value="2" description="AN/ARN-139" uuid="ff40d89a-5269-11df-9679-080069138b88" uid="22217"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="8" domain="2" country="225" uuid="ff43c60e-5269-11df-bf6a-080069138b88" uid="22218">
+    <category value="0" description="Other" uuid="ff44d666-5269-11df-be5a-080069138b88" uid="22219"/>
+    <category value="1" description="Chaff" uuid="ff45e6dc-5269-11df-a673-080069138b88" uid="22220">
+      <subcategory value="1" description="Bundle" uuid="ff46f478-5269-11df-9ab3-080069138b88" uid="22221">
+        <specific value="0" description="Other" uuid="ff4803a4-5269-11df-abf5-080069138b88" uid="22222">
+          <extra value="1" description="TACCSF notional friendly chaff" uuid="ff490f88-5269-11df-aa69-080069138b88" uid="22223"/>
+        </specific>
+        <specific value="1" description="Very small" uuid="ff4abd24-5269-11df-aee3-080069138b88" uid="22224"/>
+        <specific value="2" description="Small" uuid="ff4bc94e-5269-11df-af95-080069138b88" uid="22225"/>
+        <specific value="3" description="Medium" uuid="ff4cd91a-5269-11df-aca2-080069138b88" uid="22226"/>
+        <specific value="4" description="Large" uuid="ff4de35a-5269-11df-88d3-080069138b88" uid="22227"/>
+        <specific value="5" description="Very Large" uuid="ff4ef092-5269-11df-aac8-080069138b88" uid="22228"/>
+        <specific value="6" description="RR-170 Chaff" uuid="ff500086-5269-11df-b6b4-080069138b88" uid="22229"/>
+        <specific value="7" description="RR-180 Chaff" uuid="ff510a30-5269-11df-beca-080069138b88" uid="22230"/>
+        <specific value="8" description="RR-188 Chaff" uuid="ff521af6-5269-11df-873e-080069138b88" uid="22231"/>
+        <specific value="9" description="RR-129 Chaff" uuid="ff532752-5269-11df-b164-080069138b88" uid="22232"/>
+        <specific value="10" description="RR-144 Chaff" uuid="ff54307a-5269-11df-86f0-080069138b88" uid="22233"/>
+        <specific value="11" description="M-1 Chaff" uuid="ff5542da-5269-11df-a4d2-080069138b88" uid="22234"/>
+      </subcategory>
+      <subcategory value="2" description="Corridor" uuid="ff56eedc-5269-11df-9e5a-080069138b88" uid="22235">
+        <specific value="0" description="Other" uuid="ff57fbec-5269-11df-a20c-080069138b88" uid="22236"/>
+        <specific value="1" description="Very small" uuid="ff590802-5269-11df-bb09-080069138b88" uid="22237"/>
+        <specific value="2" description="Small" uuid="ff5a1616-5269-11df-9d94-080069138b88" uid="22238"/>
+        <specific value="3" description="Medium" uuid="ff5b2362-5269-11df-8ba4-080069138b88" uid="22239"/>
+        <specific value="4" description="Large" uuid="ff5c2b5e-5269-11df-a6f5-080069138b88" uid="22240"/>
+        <specific value="5" description="Very Large" uuid="ff5d3d3c-5269-11df-8de7-080069138b88" uid="22241"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Flare" uuid="ff5f85ba-5269-11df-8a46-080069138b88" uid="22242">
+      <subcategory value="0" description="Other" uuid="ff6095c2-5269-11df-9e91-080069138b88" uid="22243">
+        <specific value="1" description="TACCSF notional friendly flare" uuid="ff61a32c-5269-11df-a3b0-080069138b88" uid="22244"/>
+      </subcategory>
+      <subcategory value="1" description="M-206 Flare" uuid="ff6353ac-5269-11df-9677-080069138b88" uid="22245"/>
+      <subcategory value="2" description="MJU-7 Flare" uuid="ff6468be-5269-11df-b3dd-080069138b88" uid="22246"/>
+      <subcategory value="3" description="MJU-10 Flare" uuid="ff657218-5269-11df-812d-080069138b88" uid="22247"/>
+      <subcategory value="4" description="MJU-8 / Mk46 Flare" uuid="ff6682fc-5269-11df-9117-080069138b88" uid="22248"/>
+      <subcategory value="5" description="Mk47 Flare" uuid="ff6798b8-5269-11df-90e6-080069138b88" uid="22249"/>
+    </category>
+    <category value="3" description="Combined chaff/flare" uuid="ff694564-5269-11df-824c-080069138b88" uid="22250"/>
+    <category value="4" description="Active emitter" uuid="ff6a4e00-5269-11df-96d8-080069138b88" uid="22251">
+      <subcategory value="1" description="Towed Decoy" uuid="ff6b5e80-5269-11df-a427-080069138b88" uid="22252">
+        <specific value="1" description="AN/ALE-50 Advanced Airborne Expendable Decoy (AAED)" uuid="ff6c7298-5269-11df-8a08-080069138b88" uid="22253"/>
+        <specific value="2" description="AN/ALE-55 Fiber Optic Towed Decoy (FOTD)" uuid="ff6d7e68-5269-11df-a58c-080069138b88" uid="22254"/>
+        <specific value="3" description="High Power Fiber Optic Towed Decoy (HPFOTD)" uuid="ff6e8e2a-5269-11df-bc3f-080069138b88" uid="22255"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Passive decoy" uuid="ff70e0bc-5269-11df-8b4c-080069138b88" uid="22256"/>
+    <category value="6" description="Winged Decoy" uuid="ff71ede0-5269-11df-a5ee-080069138b88" uid="22257">
+      <subcategory value="1" description="Tactical Air-Launched Decoy" uuid="ff72fd16-5269-11df-8f21-080069138b88" uid="22258">
+        <specific value="1" description="A/B37U-1(V)1 chaff-dispensing" uuid="ff740b7a-5269-11df-bb5c-080069138b88" uid="22259"/>
+        <specific value="2" description="A/B37U-1(V)2 passive RF augmentation" uuid="ff751ad8-5269-11df-a4b7-080069138b88" uid="22260"/>
+        <specific value="3" description="ADM-141A passive and active RF augmentation" uuid="ff762cc0-5269-11df-811a-080069138b88" uid="22261"/>
+        <specific value="4" description="ADM-141B chaff-dispensing" uuid="ff773c50-5269-11df-af1a-080069138b88" uid="22262"/>
+        <specific value="5" description="ADM-141C Improved TALD" uuid="ff7849e2-5269-11df-95f6-080069138b88" uid="22263"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="8" domain="3" country="225" uuid="ff7b38be-5269-11df-a678-080069138b88" uid="22264">
+    <category value="0" description="Other" uuid="ff7c489e-5269-11df-817b-080069138b88" uid="22265"/>
+    <category value="2" description="Flare" uuid="ff7d4ef6-5269-11df-a52a-080069138b88" uid="22266"/>
+    <category value="4" description="Active emitter" uuid="ff7e5d82-5269-11df-b986-080069138b88" uid="22267">
+      <subcategory value="0" description="Other" uuid="ff7f6c18-5269-11df-b41f-080069138b88" uid="22268">
+        <specific value="1" description="Nixie SLQ 25" uuid="ff80750e-5269-11df-b2d5-080069138b88" uid="22269"/>
+      </subcategory>
+    </category>
+    <category value="5" description="Passive decoy" uuid="ff82ca0c-5269-11df-b3d2-080069138b88" uid="22270"/>
+  </entity>
+  <entity kind="8" domain="4" country="225" uuid="ff8488e2-5269-11df-bc87-080069138b88" uid="22271">
+    <category value="4" description="Active Emitter" uuid="ff85962e-5269-11df-8dee-080069138b88" uid="22272">
+      <subcategory value="1" description="CM NAE" uuid="ff86a4ba-5269-11df-86c4-080069138b88" uid="22273"/>
+      <subcategory value="2" description="CM ADC Mk 3 T" uuid="ff87b1ac-5269-11df-8627-080069138b88" uid="22274"/>
+      <subcategory value="3" description="CM ADC Mk 3 S" uuid="ff88bbc4-5269-11df-a4b9-080069138b88" uid="22275"/>
+      <subcategory value="4" description="CM ADC Mk 3 N" uuid="ff89cd0c-5269-11df-8827-080069138b88" uid="22276"/>
+      <subcategory value="5" description="CM ADC Mk 4" uuid="ff8ae02a-5269-11df-9a2b-080069138b88" uid="22277">
+        <specific value="1" description="CM ADC MK-4 BBNR" uuid="ff8be812-5269-11df-9a3d-080069138b88" uid="22278"/>
+        <specific value="2" description="CM ADC MK-4 BBN" uuid="ff8cf680-5269-11df-b9ea-080069138b88" uid="22279"/>
+        <specific value="3" description="CM ADC MK-4 SFJR" uuid="ff8e089a-5269-11df-91f4-080069138b88" uid="22280"/>
+        <specific value="4" description="CM ADC MK-4 SFJ" uuid="ff8f1136-5269-11df-9af8-080069138b88" uid="22281"/>
+      </subcategory>
+      <subcategory value="6" description="CM ADC MK-3" uuid="ff90bcca-5269-11df-8822-080069138b88" uid="22282">
+        <specific value="1" description="CM ADC MK-3 R3" uuid="ff91ce76-5269-11df-a5f1-080069138b88" uid="22283"/>
+        <specific value="2" description="CM ADC MK-3 BN" uuid="ff92dcf8-5269-11df-98c3-080069138b88" uid="22284"/>
+        <specific value="3" description="CM ADC MK-3 NPN" uuid="ff93e5bc-5269-11df-96e6-080069138b88" uid="22285"/>
+        <specific value="4" description="CM ADC MK-3 IR 3" uuid="ff94f394-5269-11df-ad81-080069138b88" uid="22286"/>
+      </subcategory>
+      <subcategory value="7" description="CM ADC MK-1" uuid="ff96a4fa-5269-11df-849b-080069138b88" uid="22287"/>
+    </category>
+  </entity>
+  <entity kind="8" domain="2" country="222" uuid="ff98f30e-5269-11df-955e-080069138b88" uid="22288">
+    <category value="0" description="Other" uuid="ff9a0032-5269-11df-908d-080069138b88" uid="22289"/>
+    <category value="1" description="Chaff" uuid="ff9b0f4a-5269-11df-849b-080069138b88" uid="22290">
+      <subcategory value="1" description="Bundle" uuid="ff9c1cdc-5269-11df-b424-080069138b88" uid="22291">
+        <specific value="0" description="Other" uuid="ff9d2a00-5269-11df-9afa-080069138b88" uid="22292">
+          <extra value="1" description="TACCSF notional hostile chaff" uuid="ff9e365c-5269-11df-b771-080069138b88" uid="22293"/>
+        </specific>
+        <specific value="1" description="Very small" uuid="ff9fe56a-5269-11df-b98b-080069138b88" uid="22294"/>
+        <specific value="2" description="Small" uuid="ffa0f720-5269-11df-bf5c-080069138b88" uid="22295"/>
+        <specific value="3" description="Medium" uuid="ffa2082c-5269-11df-a46e-080069138b88" uid="22296"/>
+        <specific value="4" description="Large" uuid="ffa3150a-5269-11df-8d55-080069138b88" uid="22297"/>
+        <specific value="5" description="Very Large" uuid="ffa424d6-5269-11df-ad3a-080069138b88" uid="22298"/>
+        <specific value="6" description="26mm chaff cartridge" uuid="ffa53236-5269-11df-b4d1-080069138b88" uid="22299"/>
+        <specific value="7" description="50mm chaff cartridge" uuid="ffa641f8-5269-11df-b795-080069138b88" uid="22300"/>
+      </subcategory>
+    </category>
+    <category value="2" description="Flare" uuid="ffa88d32-5269-11df-b25c-080069138b88" uid="22301">
+      <subcategory value="0" description="Other" uuid="ffa99e84-5269-11df-8eb5-080069138b88" uid="22302">
+        <specific value="1" description="TACCSF notional hostile flare" uuid="ffaaacb6-5269-11df-94ab-080069138b88" uid="22303"/>
+      </subcategory>
+      <subcategory value="1" description="26mm Flare" uuid="ffac5b56-5269-11df-98b5-080069138b88" uid="22304"/>
+      <subcategory value="2" description="50mm Flare" uuid="ffad699c-5269-11df-9e2f-080069138b88" uid="22305"/>
+    </category>
+  </entity>
+  <entity kind="8" domain="4" country="222" uuid="ffafb828-5269-11df-9c87-080069138b88" uid="22306">
+    <category value="4" description="Active Emitter" uuid="ffb0c4ac-5269-11df-89c6-080069138b88" uid="22307">
+      <subcategory value="1" description="UC-2S" uuid="ffb1cf5a-5269-11df-b0a3-080069138b88" uid="22308"/>
+      <subcategory value="2" description="UC-5M" uuid="ffb2dd64-5269-11df-80a6-080069138b88" uid="22309"/>
+      <subcategory value="3" description="UC-2 Countermeasure" uuid="ffb3eb46-5269-11df-bd9c-080069138b88" uid="22310"/>
+    </category>
+  </entity>
+  <entity kind="8" domain="3" country="13" uuid="ffb638ec-5269-11df-bcfa-080069138b88" uid="22311">
+    <category value="0" description="Other" uuid="ffb74430-5269-11df-9d7b-080069138b88" uid="22312">
+      <subcategory value="0" description="Other" uuid="ffb84f7e-5269-11df-a767-080069138b88" uid="22313">
+        <specific value="1" description="Nulka" uuid="ffb95c84-5269-11df-b2be-080069138b88" uid="22314"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="225" uuid="ffbc4d68-5269-11df-8682-080069138b88" uid="22315">
+    <category value="0" description="Other" uuid="ffbd5370-5269-11df-ad47-080069138b88" uid="22316"/>
+    <category value="2" description="RF Active" uuid="ffbe6792-5269-11df-956d-080069138b88" uid="22317">
+      <subcategory value="1" description="Multi-function" uuid="ffbf75a6-5269-11df-96e0-080069138b88" uid="22318">
+        <specific value="1" description="Fixed" uuid="ffc08cca-5269-11df-91bb-080069138b88" uid="22319"/>
+        <specific value="2" description="Mobile" uuid="ffc1993a-5269-11df-8db4-080069138b88" uid="22320"/>
+      </subcategory>
+      <subcategory value="2" description="Early Warning / Surveillance Radar" uuid="ffc34686-5269-11df-aea2-080069138b88" uid="22321">
+        <specific value="1" description="AN/TPS-43" uuid="ffc45710-5269-11df-bdfc-080069138b88" uid="22322"/>
+        <specific value="2" description="AN/TPS-59" uuid="ffc5693e-5269-11df-a18c-080069138b88" uid="22323"/>
+        <specific value="3" description="AN/TPS-63" uuid="ffc67040-5269-11df-aaac-080069138b88" uid="22324"/>
+        <specific value="4" description="AN/TPS-75" uuid="ffc77f12-5269-11df-aecf-080069138b88" uid="22325"/>
+        <specific value="5" description="AN/FPS-117" uuid="ffc890be-5269-11df-893f-080069138b88" uid="22326"/>
+        <specific value="6" description="AN/FPS-89" uuid="ffc9989c-5269-11df-ba46-080069138b88" uid="22327"/>
+        <specific value="7" description="AN/TPS-70" uuid="ffcaa80e-5269-11df-bc0c-080069138b88" uid="22328"/>
+        <specific value="8" description="AN/TPS-24" uuid="ffcbb6fe-5269-11df-ac08-080069138b88" uid="22329"/>
+        <specific value="9" description="AN/TPS-65" uuid="ffccc148-5269-11df-b174-080069138b88" uid="22330"/>
+        <specific value="10" description="ASR-4" uuid="ffcdce8a-5269-11df-96f3-080069138b88" uid="22331">
+          <extra value="1" description="ASR-4D" uuid="ffcee072-5269-11df-80b8-080069138b88" uid="22332"/>
+          <extra value="2" description="ASR-4 LRSR" uuid="ffcfe922-5269-11df-a11b-080069138b88" uid="22333"/>
+        </specific>
+        <specific value="11" description="ASR-5" uuid="ffd195a6-5269-11df-80c8-080069138b88" uid="22334"/>
+        <specific value="12" description="ASR-7" uuid="ffd2a252-5269-11df-9aa1-080069138b88" uid="22335"/>
+        <specific value="13" description="ASR-8" uuid="ffd3b458-5269-11df-bb09-080069138b88" uid="22336"/>
+        <specific value="14" description="ASR-9" uuid="ffd4bd6c-5269-11df-8fe9-080069138b88" uid="22337"/>
+        <specific value="15" description="ASR-10" uuid="ffd5ca5e-5269-11df-a0b4-080069138b88" uid="22338">
+          <extra value="1" description="ASR-10 SS" uuid="ffd6d87c-5269-11df-994f-080069138b88" uid="22339"/>
+        </specific>
+        <specific value="16" description="ASR-11" uuid="ffd8885c-5269-11df-8c6a-080069138b88" uid="22340">
+          <extra value="1" description="ASR-11/DASR" uuid="ffd990bc-5269-11df-a57c-080069138b88" uid="22341"/>
+        </specific>
+        <specific value="17" description="ASR-12" uuid="ffdb3bf6-5269-11df-aeac-080069138b88" uid="22342"/>
+        <specific value="18" description="ASR-23" uuid="ffdc4ae6-5269-11df-9963-080069138b88" uid="22343">
+          <extra value="1" description="ASR-23 SS" uuid="ffdd5cb0-5269-11df-b6e0-080069138b88" uid="22344"/>
+        </specific>
+      </subcategory>
+      <subcategory value="5" description="Target Acquisition Radar" uuid="ffdfb03c-5269-11df-91d1-080069138b88" uid="22345">
+        <specific value="1" description="AN/MPQ-64 FAAD GBS" uuid="ffe0c256-5269-11df-b35d-080069138b88" uid="22346"/>
+      </subcategory>
+      <subcategory value="8" description="Firing Point/Launch Point Determination Sensor" uuid="ffe27128-5269-11df-be96-080069138b88" uid="22347">
+        <specific value="1" description="AN/TPQ-36" uuid="ffe37c3a-5269-11df-8b16-080069138b88" uid="22348"/>
+        <specific value="2" description="AN/TPQ-37 Firefinder" uuid="ffe48e86-5269-11df-9239-080069138b88" uid="22349"/>
+        <specific value="3" description="Trailer mounted AN/TPQ-38 (V8)" uuid="ffe59c22-5269-11df-9313-080069138b88" uid="22350"/>
+        <specific value="4" description="Trailer mounted AN/TPQ-47" uuid="ffe6a6a8-5269-11df-b94c-080069138b88" uid="22351"/>
+        <specific value="5" description="AN/TPQ-47" uuid="ffe7ba84-5269-11df-928d-080069138b88" uid="22352"/>
+      </subcategory>
+      <subcategory value="24" description="Battlefield Surveillance" uuid="ffe9678a-5269-11df-832c-080069138b88" uid="22353">
+        <specific value="1" description="AN/PPS-5" uuid="ffea77f6-5269-11df-997c-080069138b88" uid="22354"/>
+        <specific value="2" description="AN/PPS-15A (V1)" uuid="ffeb857e-5269-11df-981c-080069138b88" uid="22355"/>
+      </subcategory>
+    </category>
+    <category value="3" description="RF Passive" uuid="ffedd676-5269-11df-875a-080069138b88" uid="22356">
+      <subcategory value="8" description="Firing Point/Launch Point Determination Sensor" uuid="ffeee0ac-5269-11df-84f3-080069138b88" uid="22357">
+        <specific value="1" description="Expert Missile Tracker (adjunct to AN/TPS-75)" uuid="ffeff15e-5269-11df-b970-080069138b88" uid="22358"/>
+      </subcategory>
+    </category>
+    <category value="7" description="Chemical, point detector" uuid="fff24350-5269-11df-8e92-080069138b88" uid="22359">
+      <subcategory value="1" description="ACADA" uuid="fff351f0-5269-11df-99e7-080069138b88" uid="22360">
+        <specific value="1" description="w/Telemetry Link" uuid="fff46374-5269-11df-8df5-080069138b88" uid="22361"/>
+      </subcategory>
+      <subcategory value="2" description="M44A1" uuid="fff60f1c-5269-11df-906c-080069138b88" uid="22362">
+        <specific value="1" description="w/Telemetry Link" uuid="fff72136-5269-11df-b79e-080069138b88" uid="22363"/>
+      </subcategory>
+    </category>
+    <category value="8" description="Chemical, standoff" uuid="fff96cb6-5269-11df-9337-080069138b88" uid="22364">
+      <subcategory value="1" description="M21" uuid="fffa7da4-5269-11df-9974-080069138b88" uid="22365"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="2" country="225" uuid="fffcc758-5269-11df-b7eb-080069138b88" uid="22366">
+    <category value="0" description="Other" uuid="fffde0fc-5269-11df-bfef-080069138b88" uid="22367"/>
+    <category value="2" description="RF active" uuid="fffeeb00-5269-11df-8814-080069138b88" uid="22368">
+      <subcategory value="2" description="Early Warning/Surveillance" uuid="fffffc48-5269-11df-baca-080069138b88" uid="22369">
+        <specific value="1" description="JLENS PTIR Sensor" uuid="00010a3e-526a-11df-82f8-080069138b88" uid="22370"/>
+        <specific value="2" description="JLENS SuR Sensor" uuid="00021d5c-526a-11df-8a27-080069138b88" uid="22371"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="3" country="225" uuid="00050ac6-526a-11df-92c1-080069138b88" uid="22372">
+    <category value="0" description="Other" uuid="00062276-526a-11df-ad72-080069138b88" uid="22373"/>
+    <category value="10" description="Acoustic, active" uuid="00073076-526a-11df-91bf-080069138b88" uid="22374">
+      <subcategory value="77" description="Sonobuoy" uuid="00083ffc-526a-11df-b655-080069138b88" uid="22375">
+        <specific value="1" description="ICEPICK (GEOBUOY)" uuid="00094c94-526a-11df-901f-080069138b88" uid="22376"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="225" uuid="000c3ab2-526a-11df-819f-080069138b88" uid="22377">
+    <category value="0" description="Other" uuid="000d4790-526a-11df-b879-080069138b88" uid="22378"/>
+    <category value="9" description="Thermal (temperature sensing)" uuid="000e55c2-526a-11df-a61f-080069138b88" uid="22379">
+      <subcategory value="78" description="Bathythermal Sensor" uuid="000f64ee-526a-11df-9cf5-080069138b88" uid="22380">
+        <specific value="1" description="AN/SSQ-36B BTS (Bathythermograph Transmitting Set)" uuid="001075be-526a-11df-b8f4-080069138b88" uid="22381"/>
+      </subcategory>
+    </category>
+    <category value="10" description="Acoustic, active" uuid="0012c67a-526a-11df-a802-080069138b88" uid="22382">
+      <subcategory value="5" description="Acquisition / detection" uuid="0013d880-526a-11df-9c7f-080069138b88" uid="22383"/>
+      <subcategory value="77" description="Sonobuoy" uuid="0014e2fc-526a-11df-abb0-080069138b88" uid="22384">
+        <specific value="1" description="AN/SSQ-62 DICASS (Directional Command Active Sonobuoy System)" uuid="0015f4da-526a-11df-ba3a-080069138b88" uid="22385">
+          <extra value="1" description="AN/SSQ-62D DICASS" uuid="00170744-526a-11df-b144-080069138b88" uid="22386"/>
+          <extra value="2" description="AN/SSQ-62D1 DICASS" uuid="00181396-526a-11df-ba17-080069138b88" uid="22387"/>
+          <extra value="3" description="AN/SSQ-62D2 DICASS" uuid="00192344-526a-11df-a7fc-080069138b88" uid="22388"/>
+          <extra value="4" description="AN/SSQ-62E DICASS" uuid="001a2ff0-526a-11df-98ce-080069138b88" uid="22389"/>
+          <extra value="5" description="AN/SSQ-62E1 DICASS" uuid="001b38e6-526a-11df-9f67-080069138b88" uid="22390"/>
+          <extra value="6" description="AN/SSQ-62E2 DICASS" uuid="001c5370-526a-11df-9341-080069138b88" uid="22391"/>
+        </specific>
+        <specific value="2" description="AN/SSQ-110 EER (Extended Echo Ranging), a.k.a. SUS (Signal, Underwater Sound)" uuid="001e1228-526a-11df-8da1-080069138b88" uid="22392">
+          <extra value="1" description="AN/SSQ-110A EER" uuid="001f25be-526a-11df-924c-080069138b88" uid="22393"/>
+          <extra value="2" description="AN/SSQ-110B EER" uuid="00202db0-526a-11df-9e01-080069138b88" uid="22394"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="11" description="Acoustic, Passive" uuid="00232254-526a-11df-abf5-080069138b88" uid="22395">
+      <subcategory value="77" description="Sonobuoy" uuid="00243022-526a-11df-b223-080069138b88" uid="22396">
+        <specific value="1" description="AN/SSQ-53 DIFAR (Directional Frequency Analysis Recording)" uuid="00253b02-526a-11df-ae06-080069138b88" uid="22397">
+          <extra value="1" description="AN/SSQ-53D DIFAR" uuid="00264c36-526a-11df-a810-080069138b88" uid="22398"/>
+          <extra value="2" description="AN/SSQ-53E DIFAR" uuid="00275de2-526a-11df-bf41-080069138b88" uid="22399"/>
+          <extra value="3" description="AN/SSQ-53F DIFAR" uuid="0028669c-526a-11df-9fce-080069138b88" uid="22400"/>
+        </specific>
+        <specific value="2" description="AN/SSQ-57 ANM (Ambient Noise Measurement)" uuid="002a15a0-526a-11df-9094-080069138b88" uid="22401">
+          <extra value="1" description="AN/SSQ-57C1 ANM" uuid="002b242c-526a-11df-88f2-080069138b88" uid="22402"/>
+        </specific>
+        <specific value="3" description="AN/SSQ-77 VLAD (Vertical Line Array DIFAR)" uuid="002cd574-526a-11df-9d3a-080069138b88" uid="22403">
+          <extra value="1" description="AN/SSQ-77B VLAD" uuid="002de554-526a-11df-8c3b-080069138b88" uid="22404"/>
+          <extra value="2" description="AN/SSQ-77C VLAD" uuid="002eed46-526a-11df-9c3b-080069138b88" uid="22405"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="222" uuid="00327d3a-526a-11df-9930-080069138b88" uid="22406">
+    <category value="0" description="Other" uuid="00338ec8-526a-11df-9deb-080069138b88" uid="22407"/>
+    <category value="1" description="Multi-spectral" uuid="00349d72-526a-11df-a19e-080069138b88" uid="22408">
+      <subcategory value="1" description="Land Radar Hostile Fixed" uuid="0035ad20-526a-11df-a517-080069138b88" uid="22409"/>
+      <subcategory value="2" description="Land Radar Hostile Dynamic" uuid="0036bb0c-526a-11df-a40c-080069138b88" uid="22410"/>
+    </category>
+    <category value="2" description="RF Active" uuid="0038697a-526a-11df-a182-080069138b88" uid="22411">
+      <subcategory value="1" description="Multi-function" uuid="003976a8-526a-11df-88d3-080069138b88" uid="22412">
+        <specific value="1" description="Fixed" uuid="003a8700-526a-11df-8069-080069138b88" uid="22413"/>
+        <specific value="2" description="Mobile" uuid="003b9762-526a-11df-8a28-080069138b88" uid="22414"/>
+      </subcategory>
+      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="003d4724-526a-11df-ae56-080069138b88" uid="22415">
+        <specific value="1" description="Back Trap" uuid="003e5aa6-526a-11df-a084-080069138b88" uid="22416"/>
+        <specific value="2" description="Bar Lock (P-35/P-37/P-50)" uuid="003f689c-526a-11df-8fc0-080069138b88" uid="22417"/>
+        <specific value="3" description="Flat Face (P-15, CASTA-2E1)" uuid="0040730e-526a-11df-8d04-080069138b88" uid="22418"/>
+        <specific value="4" description="Long Track" uuid="00418618-526a-11df-9116-080069138b88" uid="22419"/>
+        <specific value="5" description="Spoon Rest (P-12)" uuid="00429472-526a-11df-a626-080069138b88" uid="22420"/>
+        <specific value="6" description="Squat Eye (P-15M)" uuid="00439c64-526a-11df-82fc-080069138b88" uid="22421"/>
+        <specific value="7" description="Tall King (P-14)" uuid="0044ace4-526a-11df-b796-080069138b88" uid="22422"/>
+        <specific value="8" description="Tin Shield" uuid="0045bf9e-526a-11df-ba83-080069138b88" uid="22423"/>
+        <specific value="9" description="Knife Rest (P-10)" uuid="0046c862-526a-11df-89ca-080069138b88" uid="22424"/>
+        <specific value="10" description="Tin Trap" uuid="0047d680-526a-11df-b520-080069138b88" uid="22425"/>
+        <specific value="11" description="Box Spring" uuid="0048e6c4-526a-11df-9e02-080069138b88" uid="22426"/>
+      </subcategory>
+      <subcategory value="3" description="Height Finding Radar" uuid="004a9726-526a-11df-9d15-080069138b88" uid="22427">
+        <specific value="1" description="Odd Group" uuid="004ba04e-526a-11df-a8a7-080069138b88" uid="22428"/>
+        <specific value="2" description="Odd Pair" uuid="004caffc-526a-11df-9238-080069138b88" uid="22429"/>
+        <specific value="3" description="Side Net (PRV-11)" uuid="004dbed8-526a-11df-b0d3-080069138b88" uid="22430"/>
+        <specific value="4" description="Thin Skin" uuid="004ecc7e-526a-11df-a7cd-080069138b88" uid="22431"/>
+      </subcategory>
+      <subcategory value="4" description="Fire Control Radar" uuid="005077f4-526a-11df-ab5c-080069138b88" uid="22432">
+        <specific value="1" description="Fire Can" uuid="0051878e-526a-11df-ba7b-080069138b88" uid="22433"/>
+        <specific value="2" description="Flap Wheel" uuid="00529944-526a-11df-b937-080069138b88" uid="22434"/>
+        <specific value="3" description="Whiff" uuid="0053a1d6-526a-11df-995d-080069138b88" uid="22435"/>
+        <specific value="4" description="Gun Dish (RPK-2)" deprecated="1" uuid="0054afae-526a-11df-9742-080069138b88" uid="22436"/>
+      </subcategory>
+      <subcategory value="5" description="Target Acquisition Radar" uuid="005661e6-526a-11df-8642-080069138b88" uid="22437">
+        <specific value="1" description="Dog Ear" uuid="005770f4-526a-11df-95c2-080069138b88" uid="22438"/>
+        <specific value="2" description="Snow Drift (9S18M1)" uuid="00587986-526a-11df-b5f3-080069138b88" uid="22439"/>
+        <specific value="3" description="MT-LB mounted ARK-1" uuid="00598baa-526a-11df-a6d1-080069138b88" uid="22440"/>
+        <specific value="4" description="MT-LB mounted ZOOPARK" uuid="005aa3dc-526a-11df-b0ae-080069138b88" uid="22441"/>
+        <specific value="5" description="Truck/trailer mounted SNAR-10" uuid="005bae4e-526a-11df-b581-080069138b88" uid="22442"/>
+        <specific value="6" description="MT-LB mounted BIG FRED" uuid="005cbece-526a-11df-a4ba-080069138b88" uid="22443"/>
+      </subcategory>
+      <subcategory value="8" description="Firing point/launch point location" status="new" uuid="d68d3c1a-d6cd-4e44-8121-07cb4420f730" uid="22850">
+        <cr value="2178"/>
+        <specific value="1" description="IL-220U CM/CB Radar" status="new" uuid="57c1c710-db36-4141-93b4-69bd36e195c8" uid="22851">
+          <cr value="2178"/>
+        </specific>
+      </subcategory>
+      <subcategory value="14" description="Meteorological Radar" uuid="005e708e-526a-11df-812e-080069138b88" uid="22444">
+        <specific value="1" description="End Tray" uuid="005f7fec-526a-11df-ad8f-080069138b88" uid="22445"/>
+      </subcategory>
+      <subcategory value="18" description="Surface Search Radar" uuid="00612cca-526a-11df-ade1-080069138b88" uid="22446">
+        <specific value="1" description="Sheet Bend" uuid="0062385e-526a-11df-a926-080069138b88" uid="22447"/>
+      </subcategory>
+      <subcategory value="24" description="Battlefield Surveillance" uuid="0063e672-526a-11df-a526-080069138b88" uid="22448">
+        <specific value="1" description="PSNR-5K (TALL MIKE)" uuid="0064f6c0-526a-11df-93d3-080069138b88" uid="22449"/>
+        <specific value="2" description="FARA-1 (SBR-3)" uuid="00660998-526a-11df-8abf-080069138b88" uid="22450"/>
+        <specific value="3" description="Pork Trough (SNAR-1/2/6)" status="new" uuid="05c099a2-54ef-4f81-a123-793f2289fcb7" uid="22847">
+          <cr value="2178"/>
+        </specific>
+      </subcategory>
+    </category>
+    <category value="3" description="RF Passive (intercept and DF)" status="new" uuid="451d68eb-0cf5-472b-be8f-02e8989a4d08" uid="22833">
+      <cr value="2170"/>
+      <subcategory value="16" description="Identification/Classification (including IFF)" status="new" uuid="db75a75f-52c4-4197-b9a4-17a71cfc31e9" uid="22834">
+        <cr value="2170"/>
+        <specific value="1" description="Turn Cut R-381-1" status="new" uuid="17c7f90d-4053-4086-9723-63913ba9801b" uid="22835">
+          <cr value="2170"/>
+        </specific>
+        <specific value="2" description="Turn Spike R-381-2" status="new" uuid="3bb04477-c60d-459d-949c-956121c82c3a" uid="22836">
+          <cr value="2170"/>
+        </specific>
+        <specific value="3" description="Turn Twist R-381-3" status="new" uuid="f886f429-bd4d-4a48-88e1-ed361f389a23" uid="22837">
+          <cr value="2170"/>
+        </specific>
+        <specific value="4" description="Turn Pole R-381-4" status="new" uuid="e6499144-394f-40bd-9f00-bea844f7e27c" uid="22838">
+          <cr value="2170"/>
+        </specific>
+        <specific value="5" description="Full House R-339" status="new" uuid="d5e643a3-0fde-405a-8058-f4d974c6f418" uid="22839">
+          <cr value="2170"/>
+        </specific>
+        <specific value="6" description="Spike Square R-363" status="new" uuid="eee014f1-7130-49d4-bf4e-8ab8edd95771" uid="22840">
+          <cr value="2170"/>
+        </specific>
+        <specific value="7" description="Lone Box SRTR-2" status="new" uuid="d1658843-be85-4ab8-92dc-c31e5d82484b" uid="22841">
+          <cr value="2170"/>
+        </specific>
+        <specific value="8" description="Twin Box RPS-5M" status="new" uuid="2039de69-3487-405e-86de-4098ea36f07e" uid="22842">
+          <cr value="2170"/>
+        </specific>
+        <specific value="9" description="Twin Box RPS-6" status="new" uuid="9d4190a9-74f1-4c2f-8222-ddb8168c616c" uid="22843">
+          <cr value="2170"/>
+        </specific>
+        <specific value="10" description="Tube Tree" status="new" uuid="9f894c07-5394-49b5-9a7d-b6b93274de43" uid="22844">
+          <cr value="2170"/>
+        </specific>
+        <specific value="11" description="Pole Dish (NRS-1)" status="new" uuid="bcfdac7c-3238-43fe-8984-1f0ec8de5c46" uid="22848">
+          <cr value="2178"/>
+        </specific>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="3" country="222" uuid="0068f626-526a-11df-ab1f-080069138b88" uid="22451">
+    <category value="0" description="Other" uuid="006a023c-526a-11df-8632-080069138b88" uid="22452"/>
+    <category value="10" description="Acoustic active" uuid="006b11e0-526a-11df-8a73-080069138b88" uid="22453">
+      <subcategory value="77" description="Sonobuoy" uuid="006c24ae-526a-11df-82af-080069138b88" uid="22454"/>
+      <subcategory value="79" description="Towed Counter Measure" uuid="006d2d90-526a-11df-8871-080069138b88" uid="22455">
+        <specific value="1" description="Towed CM BAT-1" uuid="006e3c80-526a-11df-8cd3-080069138b88" uid="22456"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="222" uuid="00712fee-526a-11df-a2b4-080069138b88" uid="22457">
+    <category value="10" description="Acoustic, active" uuid="00723c7c-526a-11df-9659-080069138b88" uid="22458">
+      <subcategory value="28" description="Decoy/Mimic" uuid="00734496-526a-11df-ba14-080069138b88" uid="22459"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="224" uuid="0075985e-526a-11df-b895-080069138b88" uid="22460">
+    <category value="0" description="Other" uuid="0076a03c-526a-11df-8ce1-080069138b88" uid="22461"/>
+    <category value="2" description="RF Active" uuid="0077b10c-526a-11df-a0d2-080069138b88" uid="22462">
+      <subcategory value="1" description="Multi-function" uuid="0078c70e-526a-11df-b7c6-080069138b88" uid="22463">
+        <specific value="1" description="Fixed" uuid="0079d0ae-526a-11df-93bf-080069138b88" uid="22464"/>
+        <specific value="2" description="Mobile" uuid="007ae1ba-526a-11df-bdbd-080069138b88" uid="22465"/>
+      </subcategory>
+      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="007c9078-526a-11df-8ba7-080069138b88" uid="22466">
+        <specific value="1" description="Plessey AR-5" uuid="007d9f36-526a-11df-bf6e-080069138b88" uid="22467"/>
+      </subcategory>
+      <subcategory value="3" description="Height Finding" uuid="007f506a-526a-11df-9923-080069138b88" uid="22468">
+        <specific value="1" description="Decca HF 200" uuid="008059c4-526a-11df-a635-080069138b88" uid="22469"/>
+      </subcategory>
+      <subcategory value="6" description="Target Tracking Radar" uuid="0082085a-526a-11df-97ee-080069138b88" uid="22470"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="224" uuid="00845c72-526a-11df-8bf3-080069138b88" uid="22471">
+    <category value="11" description="Acoustic, Passive" uuid="0085643c-526a-11df-a719-080069138b88" uid="22472">
+      <subcategory value="77" description="Sonobuoy" uuid="00867296-526a-11df-b0cb-080069138b88" uid="22473">
+        <specific value="1" description="AN/SSQ-955 HIDAR (High Instantaneous Dynamic Range)" uuid="008784ba-526a-11df-9727-080069138b88" uid="22474"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="71" uuid="008a6df6-526a-11df-b622-080069138b88" uid="22475">
+    <category value="0" description="Other" uuid="008b7e6c-526a-11df-ae87-080069138b88" uid="22476"/>
+    <category value="2" description="RF Active" uuid="008c8b9a-526a-11df-a35e-080069138b88" uid="22477">
+      <subcategory value="1" description="Multi-function" uuid="008d99ae-526a-11df-8c96-080069138b88" uid="22478">
+        <specific value="1" description="Fixed" uuid="008ea560-526a-11df-99f6-080069138b88" uid="22479"/>
+        <specific value="2" description="Mobile" uuid="008fb37e-526a-11df-a9a7-080069138b88" uid="22480"/>
+      </subcategory>
+      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="009160f2-526a-11df-9492-080069138b88" uid="22481">
+        <specific value="1" description="Thompson LP-23 (TRS-2050)" uuid="009273e8-526a-11df-a9f7-080069138b88" uid="22482"/>
+        <specific value="2" description="Tiger-S (TRS-2100)" uuid="00937dce-526a-11df-a68f-080069138b88" uid="22483"/>
+        <specific value="3" description="Tiger-G (TRS-2105)" uuid="00948d9a-526a-11df-855a-080069138b88" uid="22484"/>
+        <specific value="4" description="THD 1940 (Picador)" uuid="00959ce4-526a-11df-a68c-080069138b88" uid="22485"/>
+        <specific value="5" description="Volex III/IV" uuid="0096a54e-526a-11df-bc17-080069138b88" uid="22486"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="78" uuid="0099a1f4-526a-11df-a516-080069138b88" uid="22487">
+    <category value="0" description="Other" uuid="009ab2a6-526a-11df-a16c-080069138b88" uid="22488"/>
+    <category value="2" description="RF Active" uuid="009bbb42-526a-11df-9dfb-080069138b88" uid="22489">
+      <subcategory value="1" description="Multifunction Radar" uuid="009cc7ee-526a-11df-85b7-080069138b88" uid="22490">
+        <specific value="1" description="Roland II radar" deprecated="1" uuid="009dd9f4-526a-11df-9139-080069138b88" uid="22491"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="206" uuid="00a0c786-526a-11df-89f1-080069138b88" uid="22492">
+    <category value="0" description="Other" uuid="00a1d3e2-526a-11df-9d10-080069138b88" uid="22493"/>
+    <category value="2" description="RF Active" uuid="00a2e4c6-526a-11df-90d3-080069138b88" uid="22494">
+      <subcategory value="4" description="Fire Control Radar" uuid="00a3f1ea-526a-11df-afbd-080069138b88" uid="22495">
+        <specific value="1" description="Skyguard" uuid="00a4fc84-526a-11df-9d74-080069138b88" uid="22496"/>
+        <specific value="2" description="Super Fledermaus" uuid="00a60e3a-526a-11df-90ee-080069138b88" uid="22497"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="56" uuid="00a8ff50-526a-11df-a3bb-080069138b88" uid="22498">
+    <category value="0" description="Other" uuid="00aa0c56-526a-11df-a367-080069138b88" uid="22499"/>
+    <category value="3" description="RF Passive (intercept and DF)" uuid="00ab157e-526a-11df-8cae-080069138b88" uid="22500">
+      <subcategory value="16" description="Identification/Classification Radar" uuid="00ac26ee-526a-11df-9130-080069138b88" uid="22501">
+        <specific value="1" description="Ramona (Soft Ball)" uuid="00ad35f2-526a-11df-a2d6-080069138b88" uid="22502"/>
+        <specific value="2" description="Tamara (Trash Drum)" uuid="00ae43a2-526a-11df-90f9-080069138b88" uid="22503"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="45" uuid="00b13468-526a-11df-80bb-080069138b88" uid="22504">
+    <category value="0" description="Other" uuid="00b2429a-526a-11df-b42d-080069138b88" uid="22505"/>
+    <category value="2" description="RF Active" uuid="00b349d8-526a-11df-8c7e-080069138b88" uid="22506">
+      <subcategory value="1" description="Multi-function" uuid="00b45a9e-526a-11df-9693-080069138b88" uid="22507">
+        <specific value="1" description="Fixed" uuid="00b56aba-526a-11df-8984-080069138b88" uid="22508"/>
+        <specific value="2" description="Mobile" uuid="00b67bee-526a-11df-ad1c-080069138b88" uid="22509"/>
+      </subcategory>
+      <subcategory value="2" description="Early Warning / Surveillance Radar" uuid="00b82c28-526a-11df-a119-080069138b88" uid="22510">
+        <specific value="1" description="Cross Legs" uuid="00b93c6c-526a-11df-9fab-080069138b88" uid="22511"/>
+        <specific value="2" description="HN-503" uuid="00ba4dfa-526a-11df-9d07-080069138b88" uid="22512"/>
+        <specific value="3" description="JY-8" uuid="00bb5524-526a-11df-8464-080069138b88" uid="22513">
+          <extra value="1" description="JY-8A" uuid="00bc6216-526a-11df-94f6-080069138b88" uid="22514"/>
+        </specific>
+        <specific value="4" description="JY-9" uuid="00be11d8-526a-11df-9a9c-080069138b88" uid="22515"/>
+        <specific value="5" description="JY-14" uuid="00bf1f24-526a-11df-8b59-080069138b88" uid="22516"/>
+        <specific value="6" description="Nanjing B/C" uuid="00c0275c-526a-11df-a020-080069138b88" uid="22517">
+          <extra value="1" description="Nanjing B" uuid="00c13674-526a-11df-a4c7-080069138b88" uid="22518"/>
+          <extra value="2" description="Nanjing C" uuid="00c246fe-526a-11df-a302-080069138b88" uid="22519"/>
+        </specific>
+        <specific value="7" description="Pin Jib" uuid="00c3f6e8-526a-11df-b3ba-080069138b88" uid="22520"/>
+        <specific value="8" description="Slot Rest" uuid="00c4fdd6-526a-11df-b8c0-080069138b88" uid="22521"/>
+      </subcategory>
+      <subcategory value="4" description="Fire Control Radar" uuid="00c6adca-526a-11df-9408-080069138b88" uid="22522">
+        <specific value="1" description="Team Work" uuid="00c7bc74-526a-11df-ad9a-080069138b88" uid="22523"/>
+      </subcategory>
+      <subcategory value="5" description="Target Acquisition Radar" uuid="00c96b32-526a-11df-b682-080069138b88" uid="22524">
+        <specific value="1" description="Rice Pad" uuid="00ca78a6-526a-11df-98d0-080069138b88" uid="22525"/>
+      </subcategory>
+      <subcategory value="18" description="Surface-Search Radar" uuid="00cc2b10-526a-11df-a3ed-080069138b88" uid="22526">
+        <specific value="1" description="Cross Slot" uuid="00cd356e-526a-11df-8b01-080069138b88" uid="22527"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="119" uuid="00d024f4-526a-11df-8fd6-080069138b88" uid="22528">
+    <category value="0" description="Other" uuid="00d1324a-526a-11df-a148-080069138b88" uid="22529"/>
+    <category value="2" description="RF Active" uuid="00d23f5a-526a-11df-81fc-080069138b88" uid="22530">
+      <subcategory value="1" description="Multi-function" uuid="00d34d8c-526a-11df-ba89-080069138b88" uid="22531">
+        <specific value="1" description="Fixed" uuid="00d46456-526a-11df-8eca-080069138b88" uid="22532"/>
+        <specific value="2" description="Mobile" uuid="00d56df6-526a-11df-b947-080069138b88" uid="22533"/>
+      </subcategory>
+      <subcategory value="4" description="Fire Control Radar" uuid="00d720ec-526a-11df-bf68-080069138b88" uid="22534">
+        <specific value="1" description="Drum Tilt B" uuid="00d830fe-526a-11df-b1ed-080069138b88" uid="22535"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="106" uuid="00db2070-526a-11df-95d8-080069138b88" uid="22536">
+    <category value="0" description="Other" uuid="00dc2f88-526a-11df-8a5e-080069138b88" uid="22537"/>
+    <category value="2" description="RF Active" uuid="00dd3d24-526a-11df-97b0-080069138b88" uid="22538">
+      <subcategory value="1" description="Multi-function" uuid="00de4b1a-526a-11df-ab60-080069138b88" uid="22539">
+        <specific value="1" description="Fixed" uuid="00df59e2-526a-11df-bec4-080069138b88" uid="22540"/>
+      </subcategory>
+      <subcategory value="2" description="Early Warning/Surveillance Radar" uuid="00e10a76-526a-11df-b75e-080069138b88" uid="22541">
+        <specific value="1" description="Pluto" uuid="00e2183a-526a-11df-a01d-080069138b88" uid="22542"/>
+        <specific value="2" description="RAT-31S" uuid="00e32662-526a-11df-89e4-080069138b88" uid="22543"/>
+        <specific value="3" description="ATCR-33 (Selenia)" uuid="00e432d2-526a-11df-8210-080069138b88" uid="22544"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="205" uuid="00e720f0-526a-11df-bc7a-080069138b88" uid="22545">
+    <category value="0" description="Other" uuid="00e82e1e-526a-11df-a3ed-080069138b88" uid="22546"/>
+    <category value="2" description="RF Active" uuid="00e93e9e-526a-11df-adcb-080069138b88" uid="22547">
+      <subcategory value="5" description="Target Acquisition Radar" uuid="00ea4c8a-526a-11df-bf4c-080069138b88" uid="22548">
+        <specific value="1" description="Giraffe" uuid="00eb56b6-526a-11df-a9fa-080069138b88" uid="22549">
+          <extra value="1" description="Giraffe-40" uuid="00ec9fd0-526a-11df-9d15-080069138b88" uid="22550"/>
+          <extra value="2" description="Giraffe-50 AT" uuid="00edb622-526a-11df-9318-080069138b88" uid="22551"/>
+          <extra value="3" description="Giraffe-75" uuid="00eebfd6-526a-11df-88ee-080069138b88" uid="22552"/>
+        </specific>
+        <specific value="2" description="HARD (PS-91)" uuid="00f06c50-526a-11df-9cf4-080069138b88" uid="22553"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="13" uuid="00f3691e-526a-11df-b60e-080069138b88" uid="22554">
+    <category value="0" description="Other" uuid="00f47a8e-526a-11df-bf06-080069138b88" uid="22555"/>
+    <category value="11" description="Acoustic, passive" uuid="00f583de-526a-11df-8b90-080069138b88" uid="22556">
+      <subcategory value="77" description="Sonobuoy" uuid="00f6929c-526a-11df-bf51-080069138b88" uid="22557">
+        <specific value="1" description="AN/SSQ-801B Barra" uuid="00f7a02e-526a-11df-9e21-080069138b88" uid="22558"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="0" uuid="00fa8e38-526a-11df-a06f-080069138b88" uid="22559">
+    <category value="0" description="Other" uuid="00fb9ecc-526a-11df-b9af-080069138b88" uid="22560"/>
+    <category value="2" description="RF Active" uuid="00fcad08-526a-11df-ab6c-080069138b88" uid="22561">
+      <subcategory value="1" description="Multi-function" uuid="00fdb978-526a-11df-a047-080069138b88" uid="22562">
+        <specific value="1" description="Fixed" uuid="00fec638-526a-11df-8666-080069138b88" uid="22563"/>
+        <specific value="2" description="Mobile" uuid="00ffd49c-526a-11df-b402-080069138b88" uid="22564"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="0" uuid="0102c68e-526a-11df-936a-080069138b88" uid="22565">
+    <category value="10" description="Acoustic, active" uuid="0103d38a-526a-11df-82bc-080069138b88" uid="22566">
+      <subcategory value="64" description="Jamming noise" uuid="0104dd2a-526a-11df-9a3e-080069138b88" uid="22567"/>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="153" uuid="010730c0-526a-11df-95d1-080069138b88" uid="22568">
+    <category value="0" description="Other" uuid="0108375e-526a-11df-8bd3-080069138b88" uid="22569"/>
+    <category value="2" description="RF Active" uuid="010948b0-526a-11df-97b8-080069138b88" uid="22570">
+      <subcategory value="1" description="Multi-function" uuid="010a5638-526a-11df-8565-080069138b88" uid="22571">
+        <specific value="1" description="Fixed" uuid="010b5f7e-526a-11df-8acc-080069138b88" uid="22572"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="101" uuid="010e521a-526a-11df-a7ef-080069138b88" uid="22573">
+    <category value="0" description="Other" uuid="010f5eda-526a-11df-b644-080069138b88" uid="22574"/>
+    <category value="2" description="RF Active" uuid="01106c1c-526a-11df-9d1c-080069138b88" uid="22575">
+      <subcategory value="1" description="Multi-function" uuid="01118278-526a-11df-9bce-080069138b88" uid="22576">
+        <specific value="1" description="Fixed" uuid="011291d6-526a-11df-8a0a-080069138b88" uid="22577"/>
+        <specific value="2" description="Mobile" uuid="01139aae-526a-11df-a6d4-080069138b88" uid="22578"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="102" uuid="01168d18-526a-11df-8e9d-080069138b88" uid="22579">
+    <category value="0" description="Other" uuid="01179b72-526a-11df-af5f-080069138b88" uid="22580"/>
+    <category value="2" description="RF Active" uuid="0118a396-526a-11df-87e9-080069138b88" uid="22581">
+      <subcategory value="1" description="Multi-function" uuid="0119b66e-526a-11df-ba68-080069138b88" uid="22582">
+        <specific value="1" description="Fixed" uuid="011ac5d6-526a-11df-84cf-080069138b88" uid="22583"/>
+        <specific value="2" description="Mobile" uuid="011bce90-526a-11df-80fa-080069138b88" uid="22584"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="240" uuid="011ebf38-526a-11df-abf9-080069138b88" uid="22585">
+    <category value="0" description="Other" uuid="011fcd38-526a-11df-9c7c-080069138b88" uid="22586"/>
+    <category value="2" description="RF Active" uuid="0120d9b2-526a-11df-84b9-080069138b88" uid="22587">
+      <subcategory value="1" description="Multi-function" uuid="0121e762-526a-11df-8c70-080069138b88" uid="22588">
+        <specific value="1" description="Fixed" uuid="0122f562-526a-11df-bc37-080069138b88" uid="22589"/>
+        <specific value="2" description="Mobile" uuid="012400ec-526a-11df-b02f-080069138b88" uid="22590"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="1" country="110" uuid="0126ede8-526a-11df-b573-080069138b88" uid="22591">
+    <category value="2" description="RF Active" uuid="0127fdc8-526a-11df-9e55-080069138b88" uid="22592">
+      <subcategory value="2" description="Multi-function" uuid="012905c4-526a-11df-a270-080069138b88" uid="22593">
+        <specific value="1" description="FR-2855W" uuid="012a13c4-526a-11df-b750-080069138b88" uid="22594"/>
+      </subcategory>
+    </category>
+  </entity>
+  <entity kind="9" domain="4" country="39" uuid="012d0610-526a-11df-9384-080069138b88" uid="22595">
+    <category value="9" description="Thermal (temperature sensing)" uuid="012e1730-526a-11df-9250-080069138b88" uid="22596">
+      <subcategory value="78" description="Bathythermal Sensor" uuid="012f212a-526a-11df-b821-080069138b88" uid="22597">
+        <specific value="1" description="AN/SSQ-536B BTS (Bathythermograph Transmitting Set)" uuid="013039fc-526a-11df-8fff-080069138b88" uid="22598"/>
+      </subcategory>
+    </category>
+  </entity>
+</cet>
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Extra.cs b/Libs/CsharpDis6/Enumerations/Cet2010/Extra.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Extra.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/Extra.cs
index 900652f..140ba1d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Extra.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/Extra.cs
@@ -1,70 +1,70 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Extra : GenericEntrySingle, IExtraOrExtraRange
-    {
-		#region�Fields�(2)�
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(2)�
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Extra : GenericEntrySingle, IExtraOrExtraRange
+    {
+		#region�Fields�(2)�
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(2)�
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ExtraRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/ExtraRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ExtraRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/ExtraRange.cs
index 5052ff1..145ad10 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ExtraRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/ExtraRange.cs
@@ -1,70 +1,70 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class ExtraRange : GenericEntryRange, IExtraOrExtraRange
-    {
-		#region�Fields�(2)�
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(2)�
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class ExtraRange : GenericEntryRange, IExtraOrExtraRange
+    {
+		#region�Fields�(2)�
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(2)�
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntry.cs b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntry.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntry.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/GenericEntry.cs
index c56c190..11ea171 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntry.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntry.cs
@@ -1,388 +1,388 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Attributes and elements common to all enumeration entries.
-    /// </summary>
-    [XmlInclude(typeof(Entity))]
-    [XmlInclude(typeof(GenericEntryDescription))]
-    [XmlInclude(typeof(GenericEntryRange))]
-    [XmlInclude(typeof(ExtraRange))]
-    [XmlInclude(typeof(SpecificRange))]
-    [XmlInclude(typeof(SubcategoryRange))]
-    [XmlInclude(typeof(CategoryRange))]
-    [XmlInclude(typeof(GenericEntrySingle))]
-    [XmlInclude(typeof(Extra))]
-    [XmlInclude(typeof(Specific))]
-    [XmlInclude(typeof(Subcategory))]
-    [XmlInclude(typeof(Category))]
-    [XmlInclude(typeof(GenericEntryString))]
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public abstract class GenericEntry : CetBase, INotifyPropertyChanged, OpenDis.Enumerations.Cet2010.IGenericEntry
-    {
-		#region�Fields�(14)�
-
-        private static Regex uuidRegEx = new Regex("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
-
-        private List<object> itemsField;
-
-        private bool baseuuidField;
-        private bool baseuuidFieldSpecified;
-        private bool deprecatedField;
-        private bool deprecatedFieldSpecified;
-        private bool draft1278Field;
-        private bool draft1278FieldSpecified;
-        private string footnoteField;
-        private GenericEntryStatus statusField;
-        private bool statusFieldSpecified;
-        private string uuidField;
-        private ulong xref;
-        private string xrefField;
-
-		#endregion�Fields�
-
-		#region�Delegates�and�Events�(1)�
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-		#endregion�Delegates�and�Events�
-
-		#region�Properties�(13)�
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this entry was based on another enumeration entry UUID.
-        /// </summary>
-        /// <value><c>true</c> if base UUID; otherwise, <c>false</c>.</value>
-        [XmlAttribute(AttributeName = "baseuuid")]
-        public bool BaseUuid
-        {
-            get
-            {
-                return this.baseuuidField;
-            }
-
-            set
-            {
-                if (this.baseuuidField == value)
-                {
-                    return;
-                }
-
-                this.baseuuidField = value;
-                this.RaisePropertyChanged("BaseUuid");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether Base UUID is specified
-        /// </summary>
-        /// <value><c>true</c> if base is UUID specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool BaseUuidSpecified
-        {
-            get
-            {
-                return this.baseuuidFieldSpecified;
-            }
-
-            set
-            {
-                if (this.baseuuidFieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.baseuuidFieldSpecified = value;
-                this.RaisePropertyChanged("BaseUuidSpecified");
-            }
-        }
-
-        [XmlElement("cr", typeof(Cr), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("cr_range", typeof(CrRange), Form = XmlSchemaForm.Unqualified)]
-        public List<object> ChangeRequests
-        {
-            get
-            {
-                return this.itemsField;
-            }
-
-            set
-            {
-                if (this.itemsField == value)
-                {
-                    return;
-                }
-
-                this.itemsField = value;
-                this.RaisePropertyChanged("ChangeRequests");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the enumeration entry has been deprecated.
-        /// </summary>
-        /// <value><c>true</c> if deprecated; otherwise, <c>false</c>.</value>
-        [XmlAttribute(AttributeName = "deprecated")]
-        public bool Deprecated
-        {
-            get
-            {
-                return this.deprecatedField;
-            }
-
-            set
-            {
-                if (this.deprecatedField == value)
-                {
-                    return;
-                }
-
-                this.deprecatedField = value;
-                this.RaisePropertyChanged("Deprecated");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether deprecated field is specified.
-        /// </summary>
-        /// <value><c>true</c> if deprecated field is specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool DeprecatedSpecified
-        {
-            get
-            {
-                return this.deprecatedFieldSpecified;
-            }
-
-            set
-            {
-                if (this.deprecatedFieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.deprecatedFieldSpecified = value;
-                this.RaisePropertyChanged("DeprecatedSpecified");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the enumeration entry applies to a draft revision of IEEE 1278.
-        /// </summary>
-        /// <value><c>true</c> if the enumeration entry applies to a draft revision of IEEE 1278; otherwise, <c>false</c>.</value>
-        [XmlAttribute(AttributeName = "draft1278")]
-        public bool Draft1278
-        {
-            get
-            {
-                return this.draft1278Field;
-            }
-
-            set
-            {
-                if (this.draft1278Field == value)
-                {
-                    return;
-                }
-
-                this.draft1278Field = value;
-                this.RaisePropertyChanged("Draft1278");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified.
-        /// </summary>
-        /// <value><c>true</c> if the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool Draft1278Specified
-        {
-            get
-            {
-                return this.draft1278FieldSpecified;
-            }
-
-            set
-            {
-                if (this.draft1278FieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.draft1278FieldSpecified = value;
-                this.RaisePropertyChanged("Draft1278Specified");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets any additional information pertaining to the enumeration entry.
-        /// </summary>
-        /// <value>The additional information pertaining to the enumeration entry.</value>
-        [XmlAttribute(AttributeName = "footnote")]
-        public string Footnote
-        {
-            get
-            {
-                return this.footnoteField;
-            }
-
-            set
-            {
-                if (this.footnoteField == value)
-                {
-                    return;
-                }
-
-                this.footnoteField = value;
-                this.RaisePropertyChanged("Footnote");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the cross-reference to another enumeration table (uid) - RAW value.
-        /// </summary>
-        /// <value>The RAW value for csross-reference to another enumeration table (uid).</value>
-        [XmlAttribute(AttributeName = "xref", DataType = "positiveInteger")]
-        public string RawXRef
-        {
-            get
-            {
-                return this.xrefField;
-            }
-
-            set
-            {
-                if (this.xrefField == value)
-                {
-                    return;
-                }
-
-                this.xrefField = value;
-                this.xref = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawXRref");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value indicating the approval status of the entry.
-        /// </summary>
-        /// <value>The value indicating the approval status of the entry.</value>
-        [XmlAttribute(AttributeName = "status")]
-        public GenericEntryStatus Status
-        {
-            get
-            {
-                return this.statusField;
-            }
-
-            set
-            {
-                if (this.statusField == value)
-                {
-                    return;
-                }
-
-                this.statusField = value;
-                this.RaisePropertyChanged("Status");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the status is specified.
-        /// </summary>
-        /// <value><c>true</c> if the status is specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool StatusSpecified
-        {
-            get
-            {
-                return this.statusFieldSpecified;
-            }
-
-            set
-            {
-                if (this.statusFieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.statusFieldSpecified = value;
-                this.RaisePropertyChanged("StatusSpecified");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the RFC 4122 Universally Unique IDentifier (UUID)
-        /// </summary>
-        [XmlAttribute(AttributeName = "uuid")]
-        public string Uuid
-        {
-            get
-            {
-                return this.uuidField;
-            }
-
-            set
-            {
-                if (this.uuidField == value)
-                {
-                    return;
-                }
-
-                if (!uuidRegEx.IsMatch(value, 0))
-                {
-                    throw new ArgumentException("Invalid value! Value must be conformant with RFC-4122.");
-                }
-
-                this.uuidField = value;
-                this.RaisePropertyChanged("Uuid");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the cross-reference to another enumeration table (uid).
-        /// </summary>
-        /// <value>The csross-reference to another enumeration table (uid).</value>
-        [XmlIgnore]
-        public ulong XRef
-        {
-            get
-            {
-                return this.xref;
-            }
-
-            set
-            {
-                if (this.xref != value)
-                {
-                    this.RawXRef = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("XRef");
-                }
-            }
-        }
-
-		#endregion�Properties�
-
-		#region�Methods�(1)�
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-		#endregion�Methods�
-    }
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Attributes and elements common to all enumeration entries.
+    /// </summary>
+    [XmlInclude(typeof(Entity))]
+    [XmlInclude(typeof(GenericEntryDescription))]
+    [XmlInclude(typeof(GenericEntryRange))]
+    [XmlInclude(typeof(ExtraRange))]
+    [XmlInclude(typeof(SpecificRange))]
+    [XmlInclude(typeof(SubcategoryRange))]
+    [XmlInclude(typeof(CategoryRange))]
+    [XmlInclude(typeof(GenericEntrySingle))]
+    [XmlInclude(typeof(Extra))]
+    [XmlInclude(typeof(Specific))]
+    [XmlInclude(typeof(Subcategory))]
+    [XmlInclude(typeof(Category))]
+    [XmlInclude(typeof(GenericEntryString))]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public abstract class GenericEntry : CetBase, INotifyPropertyChanged, OpenDis.Enumerations.Cet2010.IGenericEntry
+    {
+		#region�Fields�(14)�
+
+        private static Regex uuidRegEx = new Regex("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
+
+        private List<object> itemsField;
+
+        private bool baseuuidField;
+        private bool baseuuidFieldSpecified;
+        private bool deprecatedField;
+        private bool deprecatedFieldSpecified;
+        private bool draft1278Field;
+        private bool draft1278FieldSpecified;
+        private string footnoteField;
+        private GenericEntryStatus statusField;
+        private bool statusFieldSpecified;
+        private string uuidField;
+        private ulong xref;
+        private string xrefField;
+
+		#endregion�Fields�
+
+		#region�Delegates�and�Events�(1)�
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+		#endregion�Delegates�and�Events�
+
+		#region�Properties�(13)�
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this entry was based on another enumeration entry UUID.
+        /// </summary>
+        /// <value><c>true</c> if base UUID; otherwise, <c>false</c>.</value>
+        [XmlAttribute(AttributeName = "baseuuid")]
+        public bool BaseUuid
+        {
+            get
+            {
+                return this.baseuuidField;
+            }
+
+            set
+            {
+                if (this.baseuuidField == value)
+                {
+                    return;
+                }
+
+                this.baseuuidField = value;
+                this.RaisePropertyChanged("BaseUuid");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether Base UUID is specified
+        /// </summary>
+        /// <value><c>true</c> if base is UUID specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool BaseUuidSpecified
+        {
+            get
+            {
+                return this.baseuuidFieldSpecified;
+            }
+
+            set
+            {
+                if (this.baseuuidFieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.baseuuidFieldSpecified = value;
+                this.RaisePropertyChanged("BaseUuidSpecified");
+            }
+        }
+
+        [XmlElement("cr", typeof(Cr), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("cr_range", typeof(CrRange), Form = XmlSchemaForm.Unqualified)]
+        public List<object> ChangeRequests
+        {
+            get
+            {
+                return this.itemsField;
+            }
+
+            set
+            {
+                if (this.itemsField == value)
+                {
+                    return;
+                }
+
+                this.itemsField = value;
+                this.RaisePropertyChanged("ChangeRequests");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the enumeration entry has been deprecated.
+        /// </summary>
+        /// <value><c>true</c> if deprecated; otherwise, <c>false</c>.</value>
+        [XmlAttribute(AttributeName = "deprecated")]
+        public bool Deprecated
+        {
+            get
+            {
+                return this.deprecatedField;
+            }
+
+            set
+            {
+                if (this.deprecatedField == value)
+                {
+                    return;
+                }
+
+                this.deprecatedField = value;
+                this.RaisePropertyChanged("Deprecated");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether deprecated field is specified.
+        /// </summary>
+        /// <value><c>true</c> if deprecated field is specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool DeprecatedSpecified
+        {
+            get
+            {
+                return this.deprecatedFieldSpecified;
+            }
+
+            set
+            {
+                if (this.deprecatedFieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.deprecatedFieldSpecified = value;
+                this.RaisePropertyChanged("DeprecatedSpecified");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the enumeration entry applies to a draft revision of IEEE 1278.
+        /// </summary>
+        /// <value><c>true</c> if the enumeration entry applies to a draft revision of IEEE 1278; otherwise, <c>false</c>.</value>
+        [XmlAttribute(AttributeName = "draft1278")]
+        public bool Draft1278
+        {
+            get
+            {
+                return this.draft1278Field;
+            }
+
+            set
+            {
+                if (this.draft1278Field == value)
+                {
+                    return;
+                }
+
+                this.draft1278Field = value;
+                this.RaisePropertyChanged("Draft1278");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified.
+        /// </summary>
+        /// <value><c>true</c> if the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool Draft1278Specified
+        {
+            get
+            {
+                return this.draft1278FieldSpecified;
+            }
+
+            set
+            {
+                if (this.draft1278FieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.draft1278FieldSpecified = value;
+                this.RaisePropertyChanged("Draft1278Specified");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets any additional information pertaining to the enumeration entry.
+        /// </summary>
+        /// <value>The additional information pertaining to the enumeration entry.</value>
+        [XmlAttribute(AttributeName = "footnote")]
+        public string Footnote
+        {
+            get
+            {
+                return this.footnoteField;
+            }
+
+            set
+            {
+                if (this.footnoteField == value)
+                {
+                    return;
+                }
+
+                this.footnoteField = value;
+                this.RaisePropertyChanged("Footnote");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the cross-reference to another enumeration table (uid) - RAW value.
+        /// </summary>
+        /// <value>The RAW value for csross-reference to another enumeration table (uid).</value>
+        [XmlAttribute(AttributeName = "xref", DataType = "positiveInteger")]
+        public string RawXRef
+        {
+            get
+            {
+                return this.xrefField;
+            }
+
+            set
+            {
+                if (this.xrefField == value)
+                {
+                    return;
+                }
+
+                this.xrefField = value;
+                this.xref = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawXRref");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value indicating the approval status of the entry.
+        /// </summary>
+        /// <value>The value indicating the approval status of the entry.</value>
+        [XmlAttribute(AttributeName = "status")]
+        public GenericEntryStatus Status
+        {
+            get
+            {
+                return this.statusField;
+            }
+
+            set
+            {
+                if (this.statusField == value)
+                {
+                    return;
+                }
+
+                this.statusField = value;
+                this.RaisePropertyChanged("Status");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the status is specified.
+        /// </summary>
+        /// <value><c>true</c> if the status is specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool StatusSpecified
+        {
+            get
+            {
+                return this.statusFieldSpecified;
+            }
+
+            set
+            {
+                if (this.statusFieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.statusFieldSpecified = value;
+                this.RaisePropertyChanged("StatusSpecified");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the RFC 4122 Universally Unique IDentifier (UUID)
+        /// </summary>
+        [XmlAttribute(AttributeName = "uuid")]
+        public string Uuid
+        {
+            get
+            {
+                return this.uuidField;
+            }
+
+            set
+            {
+                if (this.uuidField == value)
+                {
+                    return;
+                }
+
+                if (!uuidRegEx.IsMatch(value, 0))
+                {
+                    throw new ArgumentException("Invalid value! Value must be conformant with RFC-4122.");
+                }
+
+                this.uuidField = value;
+                this.RaisePropertyChanged("Uuid");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the cross-reference to another enumeration table (uid).
+        /// </summary>
+        /// <value>The csross-reference to another enumeration table (uid).</value>
+        [XmlIgnore]
+        public ulong XRef
+        {
+            get
+            {
+                return this.xref;
+            }
+
+            set
+            {
+                if (this.xref != value)
+                {
+                    this.RawXRef = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("XRef");
+                }
+            }
+        }
+
+		#endregion�Properties�
+
+		#region�Methods�(1)�
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+		#endregion�Methods�
+    }
 }
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryDescription.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryDescription.cs
index b882475..a125c74 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryDescription.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryDescription.cs
@@ -1,105 +1,105 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [XmlInclude(typeof(GenericEntryRange))]
-    [XmlInclude(typeof(ExtraRange))]
-    [XmlInclude(typeof(SpecificRange))]
-    [XmlInclude(typeof(SubcategoryRange))]
-    [XmlInclude(typeof(CategoryRange))]
-    [XmlInclude(typeof(GenericEntrySingle))]
-    [XmlInclude(typeof(Extra))]
-    [XmlInclude(typeof(Specific))]
-    [XmlInclude(typeof(Subcategory))]
-    [XmlInclude(typeof(Category))]
-    [XmlInclude(typeof(GenericEntryString))]
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public abstract class GenericEntryDescription : GenericEntry, OpenDis.Enumerations.Cet2010.IGenericEntryDescription
-    {
-		#region�Fields�(3)�
-
-        private string descriptionField;
-        private int groupField;
-        private bool groupFieldSpecified;
-
-		#endregion�Fields�
-
-		#region�Properties�(3)�
-
-        /// <summary>
-        /// Gets or sets the text description of the enumeration entry.
-        /// </summary>
-        [XmlAttribute(AttributeName = "description")]
-        public string Description
-        {
-            get
-            {
-                return this.descriptionField;
-            }
-
-            set
-            {
-                if (this.descriptionField == value)
-                {
-                    return;
-                }
-
-                this.descriptionField = value;
-                this.RaisePropertyChanged("Description");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value which indicates which group, if any, the enumeration entry belongs to.
-        /// </summary>
-        [XmlAttribute(AttributeName = "group")]
-        public int Group
-        {
-            get
-            {
-                return this.groupField;
-            }
-
-            set
-            {
-                if (this.groupField == value)
-                {
-                    return;
-                }
-
-                this.groupField = value;
-                this.RaisePropertyChanged("Group");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the group is specified.
-        /// </summary>
-        /// <value><c>true</c> if group is specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool GroupSpecified
-        {
-            get
-            {
-                return this.groupFieldSpecified;
-            }
-
-            set
-            {
-                if (this.groupFieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.groupFieldSpecified = value;
-                this.RaisePropertyChanged("GroupSpecified");
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [XmlInclude(typeof(GenericEntryRange))]
+    [XmlInclude(typeof(ExtraRange))]
+    [XmlInclude(typeof(SpecificRange))]
+    [XmlInclude(typeof(SubcategoryRange))]
+    [XmlInclude(typeof(CategoryRange))]
+    [XmlInclude(typeof(GenericEntrySingle))]
+    [XmlInclude(typeof(Extra))]
+    [XmlInclude(typeof(Specific))]
+    [XmlInclude(typeof(Subcategory))]
+    [XmlInclude(typeof(Category))]
+    [XmlInclude(typeof(GenericEntryString))]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public abstract class GenericEntryDescription : GenericEntry, OpenDis.Enumerations.Cet2010.IGenericEntryDescription
+    {
+		#region�Fields�(3)�
+
+        private string descriptionField;
+        private int groupField;
+        private bool groupFieldSpecified;
+
+		#endregion�Fields�
+
+		#region�Properties�(3)�
+
+        /// <summary>
+        /// Gets or sets the text description of the enumeration entry.
+        /// </summary>
+        [XmlAttribute(AttributeName = "description")]
+        public string Description
+        {
+            get
+            {
+                return this.descriptionField;
+            }
+
+            set
+            {
+                if (this.descriptionField == value)
+                {
+                    return;
+                }
+
+                this.descriptionField = value;
+                this.RaisePropertyChanged("Description");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value which indicates which group, if any, the enumeration entry belongs to.
+        /// </summary>
+        [XmlAttribute(AttributeName = "group")]
+        public int Group
+        {
+            get
+            {
+                return this.groupField;
+            }
+
+            set
+            {
+                if (this.groupField == value)
+                {
+                    return;
+                }
+
+                this.groupField = value;
+                this.RaisePropertyChanged("Group");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the group is specified.
+        /// </summary>
+        /// <value><c>true</c> if group is specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool GroupSpecified
+        {
+            get
+            {
+                return this.groupFieldSpecified;
+            }
+
+            set
+            {
+                if (this.groupFieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.groupFieldSpecified = value;
+                this.RaisePropertyChanged("GroupSpecified");
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryRange.cs
index 317caee..4d38c11 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryRange.cs
@@ -1,75 +1,75 @@
-using System;
-using System.Diagnostics;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Attributes and elements common to enumeration entries concerning a range of integer values.
-    /// </summary>
-    [XmlInclude(typeof(ExtraRange))]
-    [XmlInclude(typeof(SpecificRange))]
-    [XmlInclude(typeof(SubcategoryRange))]
-    [XmlInclude(typeof(CategoryRange))]
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public abstract class GenericEntryRange : GenericEntryDescription
-    {
-		#region�Fields�(2)�
-
-        private int value_maxField;
-        private int value_minField;
-
-		#endregion�Fields�
-
-		#region�Properties�(2)�
-
-        /// <summary>
-        /// Gets or sets the maximum value (inclusive) of the enumerated range.
-        /// </summary>
-        [XmlAttribute(AttributeName = "value_max")]
-        public int Max
-        {
-            get
-            {
-                return this.value_maxField;
-            }
-
-            set
-            {
-                if (this.value_maxField == value)
-                {
-                    return;
-                }
-
-                this.value_maxField = value;
-                this.RaisePropertyChanged("Max");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum value (inclusive) of the enumerated range.
-        /// </summary>
-        [XmlAttribute(AttributeName = "value_min")]
-        public int Min
-        {
-            get
-            {
-                return this.value_minField;
-            }
-
-            set
-            {
-                if (this.value_minField == value)
-                {
-                    return;
-                }
-
-                this.value_minField = value;
-                this.RaisePropertyChanged("Min");
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Attributes and elements common to enumeration entries concerning a range of integer values.
+    /// </summary>
+    [XmlInclude(typeof(ExtraRange))]
+    [XmlInclude(typeof(SpecificRange))]
+    [XmlInclude(typeof(SubcategoryRange))]
+    [XmlInclude(typeof(CategoryRange))]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public abstract class GenericEntryRange : GenericEntryDescription
+    {
+		#region�Fields�(2)�
+
+        private int value_maxField;
+        private int value_minField;
+
+		#endregion�Fields�
+
+		#region�Properties�(2)�
+
+        /// <summary>
+        /// Gets or sets the maximum value (inclusive) of the enumerated range.
+        /// </summary>
+        [XmlAttribute(AttributeName = "value_max")]
+        public int Max
+        {
+            get
+            {
+                return this.value_maxField;
+            }
+
+            set
+            {
+                if (this.value_maxField == value)
+                {
+                    return;
+                }
+
+                this.value_maxField = value;
+                this.RaisePropertyChanged("Max");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value (inclusive) of the enumerated range.
+        /// </summary>
+        [XmlAttribute(AttributeName = "value_min")]
+        public int Min
+        {
+            get
+            {
+                return this.value_minField;
+            }
+
+            set
+            {
+                if (this.value_minField == value)
+                {
+                    return;
+                }
+
+                this.value_minField = value;
+                this.RaisePropertyChanged("Min");
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntrySingle.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/GenericEntrySingle.cs
index 2b1a5d0..07f5825 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntrySingle.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntrySingle.cs
@@ -1,52 +1,52 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Attributes and elements common to enumeration entries concerning a single integer value.
-    /// </summary>
-    [XmlInclude(typeof(Extra))]
-    [XmlInclude(typeof(Specific))]
-    [XmlInclude(typeof(Subcategory))]
-    [XmlInclude(typeof(Category))]
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class GenericEntrySingle : GenericEntryDescription
-    {
-		#region�Fields�(1)�
-
-        private int valueField;
-
-		#endregion�Fields�
-
-		#region�Properties�(1)�
-
-        /// <summary>
-        /// Gets or sets the enumerated value.
-        /// </summary>
-        [XmlAttribute(AttributeName = "value")]
-        public int Value
-        {
-            get
-            {
-                return this.valueField;
-            }
-
-            set
-            {
-                if (this.valueField == value)
-                {
-                    return;
-                }
-
-                this.valueField = value;
-                this.RaisePropertyChanged("Value");
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Attributes and elements common to enumeration entries concerning a single integer value.
+    /// </summary>
+    [XmlInclude(typeof(Extra))]
+    [XmlInclude(typeof(Specific))]
+    [XmlInclude(typeof(Subcategory))]
+    [XmlInclude(typeof(Category))]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class GenericEntrySingle : GenericEntryDescription
+    {
+		#region�Fields�(1)�
+
+        private int valueField;
+
+		#endregion�Fields�
+
+		#region�Properties�(1)�
+
+        /// <summary>
+        /// Gets or sets the enumerated value.
+        /// </summary>
+        [XmlAttribute(AttributeName = "value")]
+        public int Value
+        {
+            get
+            {
+                return this.valueField;
+            }
+
+            set
+            {
+                if (this.valueField == value)
+                {
+                    return;
+                }
+
+                this.valueField = value;
+                this.RaisePropertyChanged("Value");
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryStatus.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryStatus.cs
index fbd0d83..7a8b63c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryStatus.cs
@@ -1,23 +1,23 @@
-using System;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Flag to indicate the approval status of the entry.
-    /// </summary>
-    [Serializable()]
-    [XmlType(AnonymousType = true)]
-    public enum GenericEntryStatus
-    {
-        /// <summary>
-        /// Pending denotes that the enty has been proposed, but not yet approved by the EWG.
-        /// </summary>
-        pending,
-
-        /// <summary>
-        /// New means that the entry has been approved by the EWG since that last formal issue of the database.
-        /// </summary>
-        @new
-    }
-}
+using System;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Flag to indicate the approval status of the entry.
+    /// </summary>
+    [Serializable()]
+    [XmlType(AnonymousType = true)]
+    public enum GenericEntryStatus
+    {
+        /// <summary>
+        /// Pending denotes that the enty has been proposed, but not yet approved by the EWG.
+        /// </summary>
+        pending,
+
+        /// <summary>
+        /// New means that the entry has been approved by the EWG since that last formal issue of the database.
+        /// </summary>
+        @new
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryString.cs b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryString.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryString.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryString.cs
index 2f450b7..17364b6 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericEntryString.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/GenericEntryString.cs
@@ -1,47 +1,47 @@
-using System;
-using System.Diagnostics;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    /// <summary>
-    /// Attributes and elements common to enumeration entries concerning a single string value.
-    /// </summary>
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class GenericEntryString : GenericEntryDescription
-    {
-		#region�Fields�(1)�
-
-        private string valueField;
-
-		#endregion�Fields�
-
-		#region�Properties�(1)�
-
-        /// <summary>
-        /// Gets or sets the enumerated value.
-        /// </summary>
-        [XmlAttribute(AttributeName = "value")]
-        public string Value
-        {
-            get
-            {
-                return this.valueField;
-            }
-
-            set
-            {
-                if (this.valueField == value)
-                {
-                    return;
-                }
-
-                this.valueField = value;
-                this.RaisePropertyChanged("Value");
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    /// <summary>
+    /// Attributes and elements common to enumeration entries concerning a single string value.
+    /// </summary>
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class GenericEntryString : GenericEntryDescription
+    {
+		#region�Fields�(1)�
+
+        private string valueField;
+
+		#endregion�Fields�
+
+		#region�Properties�(1)�
+
+        /// <summary>
+        /// Gets or sets the enumerated value.
+        /// </summary>
+        [XmlAttribute(AttributeName = "value")]
+        public string Value
+        {
+            get
+            {
+                return this.valueField;
+            }
+
+            set
+            {
+                if (this.valueField == value)
+                {
+                    return;
+                }
+
+                this.valueField = value;
+                this.RaisePropertyChanged("Value");
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericTable.cs b/Libs/CsharpDis6/Enumerations/Cet2010/GenericTable.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericTable.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/GenericTable.cs
index 9a6923e..c435e06 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/GenericTable.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/GenericTable.cs
@@ -1,291 +1,291 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [XmlInclude(typeof(Cet))]
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public abstract class GenericTable : CetBase, INotifyPropertyChanged
-    {
-		#region�Fields�(10)�
-
-        private List<object> itemsField;
-
-        private bool deprecatedField;
-        private bool deprecatedFieldSpecified;
-        private bool draft1278Field;
-        private bool draft1278FieldSpecified;
-        private int groupField;
-        private bool groupFieldSpecified;
-        private string nameField;
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Delegates�and�Events�(1)�
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-		#endregion�Delegates�and�Events�
-
-		#region�Properties�(10)�
-
-        [XmlElement("cr", typeof(Cr), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("cr_range", typeof(CrRange), Form = XmlSchemaForm.Unqualified)]
-        public List<object> ChangeRequests
-        {
-            get
-            {
-                return this.itemsField;
-            }
-
-            set
-            {
-                if (this.itemsField == value)
-                {
-                    return;
-                }
-
-                this.itemsField = value;
-                this.RaisePropertyChanged("ChangeRequests");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the enumeration entry has been deprecated.
-        /// </summary>
-        /// <value><c>true</c> if deprecated; otherwise, <c>false</c>.</value>
-        [XmlAttribute(AttributeName = "deprecated")]
-        public bool Deprecated
-        {
-            get
-            {
-                return this.deprecatedField;
-            }
-
-            set
-            {
-                if (this.deprecatedField == value)
-                {
-                    return;
-                }
-
-                this.deprecatedField = value;
-                this.RaisePropertyChanged("Deprecated");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether deprecated field is specified.
-        /// </summary>
-        /// <value><c>true</c> if deprecated field is specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool DeprecatedSpecified
-        {
-            get
-            {
-                return this.deprecatedFieldSpecified;
-            }
-
-            set
-            {
-                if (this.deprecatedFieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.deprecatedFieldSpecified = value;
-                this.RaisePropertyChanged("DeprecatedSpecified");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value denoting the table is to be used to define the allowed groups for elements of the enumeration table.
-        /// </summary>
-        /// <value>The group value defining the allowed groups for elements of the enumeration table.</value>
-        [XmlAttribute(AttributeName = "group")]
-        public int Group
-        {
-            get
-            {
-                return this.groupField;
-            }
-
-            set
-            {
-                if (this.groupField == value)
-                {
-                    return;
-                }
-
-                this.groupField = value;
-                this.RaisePropertyChanged("Group");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether value for group is specified.
-        /// </summary>
-        /// <value><c>true</c> if value for group is specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool GroupSpecified
-        {
-            get
-            {
-                return this.groupFieldSpecified;
-            }
-
-            set
-            {
-                if (this.groupFieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.groupFieldSpecified = value;
-                this.RaisePropertyChanged("GroupSpecified");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the enumeration entry applies to a draft revision of IEEE 1278.
-        /// </summary>
-        /// <value><c>true</c> if the enumeration entry applies to a draft revision of IEEE 1278; otherwise, <c>false</c>.</value>
-        [XmlAttribute(AttributeName = "draft1278")]
-        public bool IsDraft1278
-        {
-            get
-            {
-                return this.draft1278Field;
-            }
-
-            set
-            {
-                if (this.draft1278Field == value)
-                {
-                    return;
-                }
-
-                this.draft1278Field = value;
-                this.RaisePropertyChanged("IsDraft1278");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified.
-        /// </summary>
-        /// <value><c>true</c> if the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified; otherwise, <c>false</c>.</value>
-        [XmlIgnore()]
-        public bool IsDraft1278Specified
-        {
-            get
-            {
-                return this.draft1278FieldSpecified;
-            }
-
-            set
-            {
-                if (this.draft1278FieldSpecified == value)
-                {
-                    return;
-                }
-
-                this.draft1278FieldSpecified = value;
-                this.RaisePropertyChanged("IsDraft1278Specified");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the table.
-        /// </summary>
-        /// <value>The name of the table.</value>
-        [XmlAttribute(AttributeName = "name")]
-        public string Name
-        {
-            get
-            {
-                return this.nameField;
-            }
-
-            set
-            {
-                if (this.nameField == value)
-                {
-                    return;
-                }
-
-                this.nameField = value;
-                this.RaisePropertyChanged("Name");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value representing unique numeric identifier for the enumeration table - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifier for the enumeration table.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "positiveInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value representing unique numeric identifier for the enumeration table.
-        /// </summary>
-        /// <value>The unique numeric identifier for the enumeration table.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-
-		#region�Methods�(1)�
-
-        protected void RaisePropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-		#endregion�Methods�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [XmlInclude(typeof(Cet))]
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public abstract class GenericTable : CetBase, INotifyPropertyChanged
+    {
+		#region�Fields�(10)�
+
+        private List<object> itemsField;
+
+        private bool deprecatedField;
+        private bool deprecatedFieldSpecified;
+        private bool draft1278Field;
+        private bool draft1278FieldSpecified;
+        private int groupField;
+        private bool groupFieldSpecified;
+        private string nameField;
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Delegates�and�Events�(1)�
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+		#endregion�Delegates�and�Events�
+
+		#region�Properties�(10)�
+
+        [XmlElement("cr", typeof(Cr), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("cr_range", typeof(CrRange), Form = XmlSchemaForm.Unqualified)]
+        public List<object> ChangeRequests
+        {
+            get
+            {
+                return this.itemsField;
+            }
+
+            set
+            {
+                if (this.itemsField == value)
+                {
+                    return;
+                }
+
+                this.itemsField = value;
+                this.RaisePropertyChanged("ChangeRequests");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the enumeration entry has been deprecated.
+        /// </summary>
+        /// <value><c>true</c> if deprecated; otherwise, <c>false</c>.</value>
+        [XmlAttribute(AttributeName = "deprecated")]
+        public bool Deprecated
+        {
+            get
+            {
+                return this.deprecatedField;
+            }
+
+            set
+            {
+                if (this.deprecatedField == value)
+                {
+                    return;
+                }
+
+                this.deprecatedField = value;
+                this.RaisePropertyChanged("Deprecated");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether deprecated field is specified.
+        /// </summary>
+        /// <value><c>true</c> if deprecated field is specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool DeprecatedSpecified
+        {
+            get
+            {
+                return this.deprecatedFieldSpecified;
+            }
+
+            set
+            {
+                if (this.deprecatedFieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.deprecatedFieldSpecified = value;
+                this.RaisePropertyChanged("DeprecatedSpecified");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value denoting the table is to be used to define the allowed groups for elements of the enumeration table.
+        /// </summary>
+        /// <value>The group value defining the allowed groups for elements of the enumeration table.</value>
+        [XmlAttribute(AttributeName = "group")]
+        public int Group
+        {
+            get
+            {
+                return this.groupField;
+            }
+
+            set
+            {
+                if (this.groupField == value)
+                {
+                    return;
+                }
+
+                this.groupField = value;
+                this.RaisePropertyChanged("Group");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether value for group is specified.
+        /// </summary>
+        /// <value><c>true</c> if value for group is specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool GroupSpecified
+        {
+            get
+            {
+                return this.groupFieldSpecified;
+            }
+
+            set
+            {
+                if (this.groupFieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.groupFieldSpecified = value;
+                this.RaisePropertyChanged("GroupSpecified");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the enumeration entry applies to a draft revision of IEEE 1278.
+        /// </summary>
+        /// <value><c>true</c> if the enumeration entry applies to a draft revision of IEEE 1278; otherwise, <c>false</c>.</value>
+        [XmlAttribute(AttributeName = "draft1278")]
+        public bool IsDraft1278
+        {
+            get
+            {
+                return this.draft1278Field;
+            }
+
+            set
+            {
+                if (this.draft1278Field == value)
+                {
+                    return;
+                }
+
+                this.draft1278Field = value;
+                this.RaisePropertyChanged("IsDraft1278");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified.
+        /// </summary>
+        /// <value><c>true</c> if the value indicating whether the enumeration entry applies to a draft revision of IEEE 1278 is specified; otherwise, <c>false</c>.</value>
+        [XmlIgnore()]
+        public bool IsDraft1278Specified
+        {
+            get
+            {
+                return this.draft1278FieldSpecified;
+            }
+
+            set
+            {
+                if (this.draft1278FieldSpecified == value)
+                {
+                    return;
+                }
+
+                this.draft1278FieldSpecified = value;
+                this.RaisePropertyChanged("IsDraft1278Specified");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the table.
+        /// </summary>
+        /// <value>The name of the table.</value>
+        [XmlAttribute(AttributeName = "name")]
+        public string Name
+        {
+            get
+            {
+                return this.nameField;
+            }
+
+            set
+            {
+                if (this.nameField == value)
+                {
+                    return;
+                }
+
+                this.nameField = value;
+                this.RaisePropertyChanged("Name");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value representing unique numeric identifier for the enumeration table - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifier for the enumeration table.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "positiveInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value representing unique numeric identifier for the enumeration table.
+        /// </summary>
+        /// <value>The unique numeric identifier for the enumeration table.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+
+		#region�Methods�(1)�
+
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+		#endregion�Methods�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
index 7b0b0da..be76a7d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/ICategoryOrCategoryRange.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    public interface ICategoryOrCategoryRange : IGenericEntryDescription
-    {
-        ////List<ISubcategoryOrSubcategoryRange> Subcategories { get; set; }
-        List<GenericEntryDescription> Subcategories { get; set; }
-        ulong UId { get; set; }
-    }
-}
+using System;
+using System.Collections.Generic;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    public interface ICategoryOrCategoryRange : IGenericEntryDescription
+    {
+        ////List<ISubcategoryOrSubcategoryRange> Subcategories { get; set; }
+        List<GenericEntryDescription> Subcategories { get; set; }
+        ulong UId { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/IExtraOrExtraRange.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/IExtraOrExtraRange.cs
index af3d423..f62a911 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IExtraOrExtraRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/IExtraOrExtraRange.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    public interface IExtraOrExtraRange : IGenericEntryDescription
-    {
-        ulong UId { get; set; }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    public interface IExtraOrExtraRange : IGenericEntryDescription
+    {
+        ulong UId { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntry.cs b/Libs/CsharpDis6/Enumerations/Cet2010/IGenericEntry.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntry.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/IGenericEntry.cs
index 69a8b95..32245fc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntry.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/IGenericEntry.cs
@@ -1,22 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    public interface IGenericEntry : INotifyPropertyChanged
-    {
-        bool BaseUuid { get; set; }
-        bool BaseUuidSpecified { get; set; }
-        List<object> ChangeRequests { get; set; }
-        bool Deprecated { get; set; }
-        bool DeprecatedSpecified { get; set; }
-        bool Draft1278 { get; set; }
-        bool Draft1278Specified { get; set; }
-        string Footnote { get; set; }
-        GenericEntryStatus Status { get; set; }
-        bool StatusSpecified { get; set; }
-        string Uuid { get; set; }
-        ulong XRef { get; set; }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    public interface IGenericEntry : INotifyPropertyChanged
+    {
+        bool BaseUuid { get; set; }
+        bool BaseUuidSpecified { get; set; }
+        List<object> ChangeRequests { get; set; }
+        bool Deprecated { get; set; }
+        bool DeprecatedSpecified { get; set; }
+        bool Draft1278 { get; set; }
+        bool Draft1278Specified { get; set; }
+        string Footnote { get; set; }
+        GenericEntryStatus Status { get; set; }
+        bool StatusSpecified { get; set; }
+        string Uuid { get; set; }
+        ulong XRef { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs b/Libs/CsharpDis6/Enumerations/Cet2010/IGenericEntryDescription.cs
similarity index 95%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/IGenericEntryDescription.cs
index c40fe6a..9f5a720 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/IGenericEntryDescription.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/IGenericEntryDescription.cs
@@ -1,11 +1,11 @@
-using System;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    public interface IGenericEntryDescription : IGenericEntry
-    {
-        string Description { get; set; }
-        int Group { get; set; }
-        bool GroupSpecified { get; set; }
-    }
-}
+using System;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    public interface IGenericEntryDescription : IGenericEntry
+    {
+        string Description { get; set; }
+        int Group { get; set; }
+        bool GroupSpecified { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
index a18d2e0..3094ca9 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/ISpecificOrSpecificRange.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    public interface ISpecificOrSpecificRange : IGenericEntryDescription
-    {
-        ////List<IExtraOrExtraRange> Extras {get; set;}
-        List<GenericEntryDescription> Extras { get; set; }
-        ulong UId { get; set; }
-    }
-}
+using System;
+using System.Collections.Generic;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    public interface ISpecificOrSpecificRange : IGenericEntryDescription
+    {
+        ////List<IExtraOrExtraRange> Extras {get; set;}
+        List<GenericEntryDescription> Extras { get; set; }
+        ulong UId { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
index 2e62ecb..b402937 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/ISubcategoryOrSubcategoryRange.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    public interface ISubcategoryOrSubcategoryRange : IGenericEntryDescription
-    {
-        //// List<ISpecificOrSpecificRange> Specifices { get; set; }
-        List<GenericEntryDescription> Specifices { get; set; }
-        ulong UId { get; set; }
-    }
-}
+using System;
+using System.Collections.Generic;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    public interface ISubcategoryOrSubcategoryRange : IGenericEntryDescription
+    {
+        //// List<ISpecificOrSpecificRange> Specifices { get; set; }
+        List<GenericEntryDescription> Specifices { get; set; }
+        ulong UId { get; set; }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Specific.cs b/Libs/CsharpDis6/Enumerations/Cet2010/Specific.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Specific.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/Specific.cs
index b625864..46e010c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Specific.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/Specific.cs
@@ -1,95 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Specific : GenericEntrySingle, ISpecificOrSpecificRange
-    {
-		#region�Fields�(3)�
-
-        private List<GenericEntryDescription> items1Field;
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(3)�
-
-        [XmlElement("extra", typeof(Extra), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("extra_range", typeof(ExtraRange), Form = XmlSchemaForm.Unqualified)]
-        public List<GenericEntryDescription> Extras
-        {
-            get
-            {
-                return this.items1Field;
-            }
-
-            set
-            {
-                if (this.items1Field == value)
-                {
-                    return;
-                }
-
-                this.items1Field = value;
-                this.RaisePropertyChanged("Extras");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Specific : GenericEntrySingle, ISpecificOrSpecificRange
+    {
+		#region�Fields�(3)�
+
+        private List<GenericEntryDescription> items1Field;
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(3)�
+
+        [XmlElement("extra", typeof(Extra), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("extra_range", typeof(ExtraRange), Form = XmlSchemaForm.Unqualified)]
+        public List<GenericEntryDescription> Extras
+        {
+            get
+            {
+                return this.items1Field;
+            }
+
+            set
+            {
+                if (this.items1Field == value)
+                {
+                    return;
+                }
+
+                this.items1Field = value;
+                this.RaisePropertyChanged("Extras");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SpecificRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/SpecificRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SpecificRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/SpecificRange.cs
index 07218e1..57d0bbc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SpecificRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/SpecificRange.cs
@@ -1,95 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class SpecificRange : GenericEntryRange, ISpecificOrSpecificRange
-    {
-		#region�Fields�(3)�
-
-        private List<GenericEntryDescription> items1Field;
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(3)�
-
-        [XmlElement("extra", typeof(Extra), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("extra_range", typeof(ExtraRange), Form = XmlSchemaForm.Unqualified)]
-        public List<GenericEntryDescription> Extras
-        {
-            get
-            {
-                return this.items1Field;
-            }
-
-            set
-            {
-                if (this.items1Field == value)
-                {
-                    return;
-                }
-
-                this.items1Field = value;
-                this.RaisePropertyChanged("Extras");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((byte)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class SpecificRange : GenericEntryRange, ISpecificOrSpecificRange
+    {
+		#region�Fields�(3)�
+
+        private List<GenericEntryDescription> items1Field;
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(3)�
+
+        [XmlElement("extra", typeof(Extra), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("extra_range", typeof(ExtraRange), Form = XmlSchemaForm.Unqualified)]
+        public List<GenericEntryDescription> Extras
+        {
+            get
+            {
+                return this.items1Field;
+            }
+
+            set
+            {
+                if (this.items1Field == value)
+                {
+                    return;
+                }
+
+                this.items1Field = value;
+                this.RaisePropertyChanged("Extras");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((byte)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Subcategory.cs b/Libs/CsharpDis6/Enumerations/Cet2010/Subcategory.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Subcategory.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/Subcategory.cs
index fddfdc3..2474829 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/Subcategory.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/Subcategory.cs
@@ -1,95 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class Subcategory : GenericEntrySingle, ISubcategoryOrSubcategoryRange
-    {
-		#region�Fields�(3)�
-
-        private List<GenericEntryDescription> items1Field;
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(3)�
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        [XmlElement("specific", typeof(Specific), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("specific_range", typeof(SpecificRange), Form = XmlSchemaForm.Unqualified)]
-        public List<GenericEntryDescription> Specifices
-        {
-            get
-            {
-                return this.items1Field;
-            }
-
-            set
-            {
-                if (this.items1Field == value)
-                {
-                    return;
-                }
-
-                this.items1Field = value;
-                this.RaisePropertyChanged("Specifices");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class Subcategory : GenericEntrySingle, ISubcategoryOrSubcategoryRange
+    {
+		#region�Fields�(3)�
+
+        private List<GenericEntryDescription> items1Field;
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(3)�
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        [XmlElement("specific", typeof(Specific), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("specific_range", typeof(SpecificRange), Form = XmlSchemaForm.Unqualified)]
+        public List<GenericEntryDescription> Specifices
+        {
+            get
+            {
+                return this.items1Field;
+            }
+
+            set
+            {
+                if (this.items1Field == value)
+                {
+                    return;
+                }
+
+                this.items1Field = value;
+                this.RaisePropertyChanged("Specifices");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs b/Libs/CsharpDis6/Enumerations/Cet2010/SubcategoryRange.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs
rename to Libs/CsharpDis6/Enumerations/Cet2010/SubcategoryRange.cs
index 06459ab..bea9e5a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/SubcategoryRange.cs
+++ b/Libs/CsharpDis6/Enumerations/Cet2010/SubcategoryRange.cs
@@ -1,95 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace OpenDis.Enumerations.Cet2010
-{
-    [Serializable()]
-    [DebuggerStepThrough()]
-    public class SubcategoryRange : GenericEntryRange, ISubcategoryOrSubcategoryRange
-    {
-		#region�Fields�(3)�
-
-        private List<GenericEntryDescription> items1Field;
-
-        private ulong uid;
-        private string uidField;
-
-		#endregion�Fields�
-
-		#region�Properties�(3)�
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer - RAW value.
-        /// </summary>
-        /// <value>The RAW unique numeric identifer.</value>
-        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
-        public string RawUId
-        {
-            get
-            {
-                return this.uidField;
-            }
-
-            set
-            {
-                if (this.uidField == value)
-                {
-                    return;
-                }
-
-                this.uidField = value;
-                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
-                this.RaisePropertyChanged("RawUId");
-            }
-        }
-
-        [XmlElement("specific", typeof(Specific), Form = XmlSchemaForm.Unqualified)]
-        [XmlElement("specific_range", typeof(SpecificRange), Form = XmlSchemaForm.Unqualified)]
-        public List<GenericEntryDescription> Specifices
-        {
-            get
-            {
-                return this.items1Field;
-            }
-
-            set
-            {
-                if (this.items1Field == value)
-                {
-                    return;
-                }
-
-                this.items1Field = value;
-                this.RaisePropertyChanged("Specifices");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the unique numeric identifer.
-        /// </summary>
-        /// <value>The unique numeric identifer.</value>
-        [XmlIgnore]
-        public ulong UId
-        {
-            get
-            {
-                return this.uid;
-            }
-
-            set
-            {
-                if (this.uid != value)
-                {
-                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
-                    this.RaisePropertyChanged("UId");
-                }
-            }
-        }
-
-		#endregion�Properties�
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace OpenDis.Enumerations.Cet2010
+{
+    [Serializable()]
+    [DebuggerStepThrough()]
+    public class SubcategoryRange : GenericEntryRange, ISubcategoryOrSubcategoryRange
+    {
+		#region�Fields�(3)�
+
+        private List<GenericEntryDescription> items1Field;
+
+        private ulong uid;
+        private string uidField;
+
+		#endregion�Fields�
+
+		#region�Properties�(3)�
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer - RAW value.
+        /// </summary>
+        /// <value>The RAW unique numeric identifer.</value>
+        [XmlAttribute(AttributeName = "uid", DataType = "nonNegativeInteger")]
+        public string RawUId
+        {
+            get
+            {
+                return this.uidField;
+            }
+
+            set
+            {
+                if (this.uidField == value)
+                {
+                    return;
+                }
+
+                this.uidField = value;
+                this.uid = ulong.Parse(value, CultureInfo.InvariantCulture);
+                this.RaisePropertyChanged("RawUId");
+            }
+        }
+
+        [XmlElement("specific", typeof(Specific), Form = XmlSchemaForm.Unqualified)]
+        [XmlElement("specific_range", typeof(SpecificRange), Form = XmlSchemaForm.Unqualified)]
+        public List<GenericEntryDescription> Specifices
+        {
+            get
+            {
+                return this.items1Field;
+            }
+
+            set
+            {
+                if (this.items1Field == value)
+                {
+                    return;
+                }
+
+                this.items1Field = value;
+                this.RaisePropertyChanged("Specifices");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique numeric identifer.
+        /// </summary>
+        /// <value>The unique numeric identifer.</value>
+        [XmlIgnore]
+        public ulong UId
+        {
+            get
+            {
+                return this.uid;
+            }
+
+            set
+            {
+                if (this.uid != value)
+                {
+                    this.RawUId = ((ulong)value).ToString(CultureInfo.InvariantCulture);
+                    this.RaisePropertyChanged("UId");
+                }
+            }
+        }
+
+		#endregion�Properties�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/cet.xsd b/Libs/CsharpDis6/Enumerations/Cet2010/cet.xsd
similarity index 100%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Cet2010/cet.xsd
rename to Libs/CsharpDis6/Enumerations/Cet2010/cet.xsd
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Country.cs b/Libs/CsharpDis6/Enumerations/Country.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Country.cs
rename to Libs/CsharpDis6/Enumerations/Country.cs
index 78f02e1..d57841a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Country.cs
+++ b/Libs/CsharpDis6/Enumerations/Country.cs
@@ -1,3234 +1,3234 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using OpenDis.Core;
-
-namespace OpenDis.Enumerations
-{
-    /// <summary>
-    /// Enumeration values for Country (es.type.country, Country, 
-    /// section 4.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Country : ushort
-    {
-        /// <summary>
-        /// Other
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other")]
-        [InternetDomainCode("Unknown")]
-        Other = 0,
-
-
-        /// <summary>
-        /// Afghanistan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Afghanistan")]
-        [InternetDomainCode("AF")]
-        Afghanistan = 1,
-
-
-        /// <summary>
-        /// Albania
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Albania")]
-        [InternetDomainCode("AL")]
-        Albania = 2,
-
-
-        /// <summary>
-        /// Algeria
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Algeria")]
-        [InternetDomainCode("DZ")]
-        Algeria = 3,
-
-
-        /// <summary>
-        /// American Samoa (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("American Samoa (United States)")]
-        [InternetDomainCode("Unknown")]
-        AmericanSamoaUnitedStates = 4,
-
-
-        /// <summary>
-        /// Andorra
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Andorra")]
-        [InternetDomainCode("AD")]
-        Andorra = 5,
-
-
-        /// <summary>
-        /// Angola
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Angola")]
-        [InternetDomainCode("AO")]
-        Angola = 6,
-
-
-        /// <summary>
-        /// Anguilla
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Anguilla")]
-        [InternetDomainCode("AI")]
-        Anguilla = 7,
-
-
-        /// <summary>
-        /// Antarctica (International)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antarctica (International)")]
-        [InternetDomainCode("Unknown")]
-        AntarcticaInternational = 8,
-
-
-        /// <summary>
-        /// Antigua and Barbuda
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antigua and Barbuda")]
-        [InternetDomainCode("AG")]
-        AntiguaAndBarbuda = 9,
-
-
-        /// <summary>
-        /// Argentina
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Argentina")]
-        [InternetDomainCode("AR")]
-        Argentina = 10,
-
-
-        /// <summary>
-        /// Armenia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armenia")]
-        [InternetDomainCode("AM")]
-        Armenia = 244,
-
-
-        /// <summary>
-        /// Aruba
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aruba")]
-        [InternetDomainCode("AW")]
-        Aruba = 11,
-
-
-        /// <summary>
-        /// Ashmore and Cartier Islands (Australia)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ashmore and Cartier Islands (Australia)")]
-        [InternetDomainCode("Unknown")]
-        AshmoreAndCartierIslandsAustralia = 12,
-
-
-        /// <summary>
-        /// Australia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Australia")]
-        [InternetDomainCode("AU")]
-        Australia = 13,
-
-
-        /// <summary>
-        /// Austria
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Austria")]
-        [InternetDomainCode("AT")]
-        Austria = 14,
-
-
-        /// <summary>
-        /// Azerbaijan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Azerbaijan")]
-        [InternetDomainCode("AZ")]
-        Azerbaijan = 245,
-
-
-        /// <summary>
-        /// Bahamas
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bahamas")]
-        [InternetDomainCode("BS")]
-        Bahamas = 15,
-
-
-        /// <summary>
-        /// Bahrain
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bahrain")]
-        [InternetDomainCode("BH")]
-        Bahrain = 16,
-
-
-        /// <summary>
-        /// Baker Island (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Baker Island (United States)")]
-        [InternetDomainCode("Unknown")]
-        BakerIslandUnitedStates = 17,
-
-
-        /// <summary>
-        /// Bangladesh
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bangladesh")]
-        [InternetDomainCode("BD")]
-        Bangladesh = 18,
-
-
-        /// <summary>
-        /// Barbados
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Barbados")]
-        [InternetDomainCode("BB")]
-        Barbados = 19,
-
-
-        /// <summary>
-        /// Bassas da India (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bassas da India (France)")]
-        [InternetDomainCode("Unknown")]
-        BassasDaIndiaFrance = 20,
-
-
-        /// <summary>
-        /// Belarus
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Belarus")]
-        [InternetDomainCode("BY")]
-        Belarus = 246,
-
-
-        /// <summary>
-        /// Belgium
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Belgium")]
-        [InternetDomainCode("BE")]
-        Belgium = 21,
-
-
-        /// <summary>
-        /// Belize
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Belize")]
-        [InternetDomainCode("BZ")]
-        Belize = 22,
-
-
-        /// <summary>
-        /// Benin (aka Dahomey)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Benin (aka Dahomey)")]
-        [InternetDomainCode("Unknown")]
-        BeninAkaDahomey = 23,
-
-
-        /// <summary>
-        /// Bermuda (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bermuda (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        BermudaUnitedKingdom = 24,
-
-
-        /// <summary>
-        /// Bhutan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bhutan")]
-        [InternetDomainCode("BT")]
-        Bhutan = 25,
-
-
-        /// <summary>
-        /// Bolivia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bolivia")]
-        [InternetDomainCode("BO")]
-        Bolivia = 26,
-
-
-        /// <summary>
-        /// Bosnia and Hercegovina
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bosnia and Hercegovina")]
-        [InternetDomainCode("Unknown")]
-        BosniaAndHercegovina = 247,
-
-
-        /// <summary>
-        /// Botswana
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Botswana")]
-        [InternetDomainCode("BW")]
-        Botswana = 27,
-
-
-        /// <summary>
-        /// Bouvet Island (Norway)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bouvet Island (Norway)")]
-        [InternetDomainCode("Unknown")]
-        BouvetIslandNorway = 28,
-
-
-        /// <summary>
-        /// Brazil
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Brazil")]
-        [InternetDomainCode("BR")]
-        Brazil = 29,
-
-
-        /// <summary>
-        /// British Indian Ocean Territory (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("British Indian Ocean Territory (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        BritishIndianOceanTerritoryUnitedKingdom = 30,
-
-
-        /// <summary>
-        /// British Virgin Islands (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("British Virgin Islands (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        BritishVirginIslandsUnitedKingdom = 31,
-
-
-        /// <summary>
-        /// Brunei
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Brunei")]
-        [InternetDomainCode("Unknown")]
-        Brunei = 32,
-
-
-        /// <summary>
-        /// Bulgaria
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bulgaria")]
-        [InternetDomainCode("BG")]
-        Bulgaria = 33,
-
-
-        /// <summary>
-        /// Burkina (aka Burkina Faso or Upper Volta)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Burkina (aka Burkina Faso or Upper Volta)")]
-        [InternetDomainCode("Unknown")]
-        BurkinaAkaBurkinaFasoOrUpperVolta = 34,
-
-
-        /// <summary>
-        /// Burma (Myanmar)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Burma (Myanmar)")]
-        [InternetDomainCode("Unknown")]
-        BurmaMyanmar = 35,
-
-
-        /// <summary>
-        /// Burundi
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Burundi")]
-        [InternetDomainCode("BI")]
-        Burundi = 36,
-
-
-        /// <summary>
-        /// Cambodia (aka Kampuchea)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cambodia (aka Kampuchea)")]
-        [InternetDomainCode("Unknown")]
-        CambodiaAkaKampuchea = 37,
-
-
-        /// <summary>
-        /// Cameroon
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cameroon")]
-        [InternetDomainCode("CM")]
-        Cameroon = 38,
-
-
-        /// <summary>
-        /// Canada
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Canada")]
-        [InternetDomainCode("CA")]
-        Canada = 39,
-
-
-        /// <summary>
-        /// Cape Verde, Republic of
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cape Verde, Republic of")]
-        [InternetDomainCode("Unknown")]
-        CapeVerdeRepublicOf = 40,
-
-
-        /// <summary>
-        /// Cayman Islands (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cayman Islands (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        CaymanIslandsUnitedKingdom = 41,
-
-
-        /// <summary>
-        /// Central African Republic
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Central African Republic")]
-        [InternetDomainCode("CF")]
-        CentralAfricanRepublic = 42,
-
-
-        /// <summary>
-        /// Chad
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chad")]
-        [InternetDomainCode("TD")]
-        Chad = 43,
-
-
-        /// <summary>
-        /// Chile
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chile")]
-        [InternetDomainCode("CL")]
-        Chile = 44,
-
-
-        /// <summary>
-        /// China, People's Republic of
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("China, People's Republic of")]
-        [InternetDomainCode("Unknown")]
-        ChinaPeopleSRepublicOf = 45,
-
-
-        /// <summary>
-        /// Christmas Island (Australia)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Christmas Island (Australia)")]
-        [InternetDomainCode("Unknown")]
-        ChristmasIslandAustralia = 46,
-
-
-        /// <summary>
-        /// Clipperton Island (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Clipperton Island (France)")]
-        [InternetDomainCode("Unknown")]
-        ClippertonIslandFrance = 248,
-
-
-        /// <summary>
-        /// Cocos (Keeling) Islands (Australia)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cocos (Keeling) Islands (Australia)")]
-        [InternetDomainCode("Unknown")]
-        CocosKeelingIslandsAustralia = 47,
-
-
-        /// <summary>
-        /// Colombia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Colombia")]
-        [InternetDomainCode("CO")]
-        Colombia = 48,
-
-
-        /// <summary>
-        /// Commonwealth of Independent States
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Commonwealth of Independent States")]
-        [InternetDomainCode("Unknown")]
-        CommonwealthOfIndependentStates = 222,
-
-
-        /// <summary>
-        /// Comoros
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Comoros")]
-        [InternetDomainCode("KM")]
-        Comoros = 49,
-
-
-        /// <summary>
-        /// Congo, Republic of
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Congo, Republic of")]
-        [InternetDomainCode("Unknown")]
-        CongoRepublicOf = 50,
-
-
-        /// <summary>
-        /// Cook Islands (New Zealand)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cook Islands (New Zealand)")]
-        [InternetDomainCode("Unknown")]
-        CookIslandsNewZealand = 51,
-
-
-        /// <summary>
-        /// Coral Sea Islands (Australia)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Coral Sea Islands (Australia)")]
-        [InternetDomainCode("Unknown")]
-        CoralSeaIslandsAustralia = 52,
-
-
-        /// <summary>
-        /// Costa Rica
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Costa Rica")]
-        [InternetDomainCode("CR")]
-        CostaRica = 53,
-
-
-        /// <summary>
-        /// (Cote D'Ivoire (aka Ivory Coast)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("(Cote D'Ivoire (aka Ivory Coast)")]
-        [InternetDomainCode("Unknown")]
-        CoteDIvoireAkaIvoryCoast = 107,
-
-
-        /// <summary>
-        /// Croatia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Croatia")]
-        [InternetDomainCode("Unknown")]
-        Croatia = 249,
-
-
-        /// <summary>
-        /// Cuba
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cuba")]
-        [InternetDomainCode("CU")]
-        Cuba = 54,
-
-
-        /// <summary>
-        /// Cyprus
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cyprus")]
-        [InternetDomainCode("CY")]
-        Cyprus = 55,
-
-
-        /// <summary>
-        /// Czechoslovakia (separating into Czech Republic and Slovak Republic)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Czechoslovakia (separating into Czech Republic and Slovak Republic)")]
-        [InternetDomainCode("Unknown")]
-        CzechoslovakiaSeparatingIntoCzechRepublicAndSlovakRepublic = 56,
-
-
-        /// <summary>
-        /// Dahomey (aka Benin)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dahomey (aka Benin)")]
-        [InternetDomainCode("Unknown")]
-        DahomeyAkaBenin = 23,
-
-
-        /// <summary>
-        /// Denmark
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Denmark")]
-        [InternetDomainCode("DK")]
-        Denmark = 57,
-
-
-        /// <summary>
-        /// Djibouti
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Djibouti")]
-        [InternetDomainCode("DJ")]
-        Djibouti = 58,
-
-
-        /// <summary>
-        /// Dominica
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dominica")]
-        [InternetDomainCode("DM")]
-        Dominica = 59,
-
-
-        /// <summary>
-        /// Dominican Republic
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dominican Republic")]
-        [InternetDomainCode("DO")]
-        DominicanRepublic = 60,
-
-
-        /// <summary>
-        /// Ecuador
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ecuador")]
-        [InternetDomainCode("EC")]
-        Ecuador = 61,
-
-
-        /// <summary>
-        /// Egypt
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Egypt")]
-        [InternetDomainCode("EG")]
-        Egypt = 62,
-
-
-        /// <summary>
-        /// El Salvador
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("El Salvador")]
-        [InternetDomainCode("SV")]
-        ElSalvador = 63,
-
-
-        /// <summary>
-        /// Equatorial Guinea
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Equatorial Guinea")]
-        [InternetDomainCode("GQ")]
-        EquatorialGuinea = 64,
-
-
-        /// <summary>
-        /// Estonia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Estonia")]
-        [InternetDomainCode("EE")]
-        Estonia = 250,
-
-
-        /// <summary>
-        /// Ethiopia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ethiopia")]
-        [InternetDomainCode("ET")]
-        Ethiopia = 65,
-
-
-        /// <summary>
-        /// Europa Island (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Europa Island (France)")]
-        [InternetDomainCode("Unknown")]
-        EuropaIslandFrance = 66,
-
-
-        /// <summary>
-        /// Falkland Islands (aka Islas Malvinas) (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Falkland Islands (aka Islas Malvinas) (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        FalklandIslandsAkaIslasMalvinasUnitedKingdom = 67,
-
-
-        /// <summary>
-        /// Faroe Islands (Denmark)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Faroe Islands (Denmark)")]
-        [InternetDomainCode("Unknown")]
-        FaroeIslandsDenmark = 68,
-
-
-        /// <summary>
-        /// Fiji
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fiji")]
-        [InternetDomainCode("FJ")]
-        Fiji = 69,
-
-
-        /// <summary>
-        /// Finland
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Finland")]
-        [InternetDomainCode("FI")]
-        Finland = 70,
-
-
-        /// <summary>
-        /// France
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("France")]
-        [InternetDomainCode("FR")]
-        France = 71,
-
-
-        /// <summary>
-        /// French Guiana (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("French Guiana (France)")]
-        [InternetDomainCode("Unknown")]
-        FrenchGuianaFrance = 72,
-
-
-        /// <summary>
-        /// French Polynesia (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("French Polynesia (France)")]
-        [InternetDomainCode("Unknown")]
-        FrenchPolynesiaFrance = 73,
-
-
-        /// <summary>
-        /// French Southern and Antarctic Islands (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("French Southern and Antarctic Islands (France)")]
-        [InternetDomainCode("Unknown")]
-        FrenchSouthernAndAntarcticIslandsFrance = 74,
-
-
-        /// <summary>
-        /// Gabon
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gabon")]
-        [InternetDomainCode("GA")]
-        Gabon = 75,
-
-
-        /// <summary>
-        /// Gambia, The
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gambia, The")]
-        [InternetDomainCode("Unknown")]
-        GambiaThe = 76,
-
-
-        /// <summary>
-        /// Gaza Strip (Israel)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gaza Strip (Israel)")]
-        [InternetDomainCode("Unknown")]
-        GazaStripIsrael = 77,
-
-
-        /// <summary>
-        /// Georgia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Georgia")]
-        [InternetDomainCode("GE")]
-        Georgia = 251,
-
-
-        /// <summary>
-        /// Germany
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Germany")]
-        [InternetDomainCode("DE")]
-        Germany = 78,
-
-
-        /// <summary>
-        /// Ghana
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ghana")]
-        [InternetDomainCode("GH")]
-        Ghana = 79,
-
-
-        /// <summary>
-        /// Gibraltar (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gibraltar (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        GibraltarUnitedKingdom = 80,
-
-
-        /// <summary>
-        /// Glorioso Islands (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Glorioso Islands (France)")]
-        [InternetDomainCode("Unknown")]
-        GloriosoIslandsFrance = 81,
-
-
-        /// <summary>
-        /// Greece
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Greece")]
-        [InternetDomainCode("GR")]
-        Greece = 82,
-
-
-        /// <summary>
-        /// Greenland (Denmark)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Greenland (Denmark)")]
-        [InternetDomainCode("Unknown")]
-        GreenlandDenmark = 83,
-
-
-        /// <summary>
-        /// Grenada
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Grenada")]
-        [InternetDomainCode("GD")]
-        Grenada = 84,
-
-
-        /// <summary>
-        /// Guadaloupe (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guadaloupe (France)")]
-        [InternetDomainCode("Unknown")]
-        GuadaloupeFrance = 85,
-
-
-        /// <summary>
-        /// Guam (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guam (United States)")]
-        [InternetDomainCode("Unknown")]
-        GuamUnitedStates = 86,
-
-
-        /// <summary>
-        /// Guatemala
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guatemala")]
-        [InternetDomainCode("GT")]
-        Guatemala = 87,
-
-
-        /// <summary>
-        /// Guernsey (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guernsey (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        GuernseyUnitedKingdom = 88,
-
-
-        /// <summary>
-        /// Guinea
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guinea")]
-        [InternetDomainCode("GN")]
-        Guinea = 89,
-
-
-        /// <summary>
-        /// Guinea- Bissau
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guinea- Bissau")]
-        [InternetDomainCode("Unknown")]
-        GuineaBissau = 90,
-
-
-        /// <summary>
-        /// Guyana
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guyana")]
-        [InternetDomainCode("GY")]
-        Guyana = 91,
-
-
-        /// <summary>
-        /// Haiti
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Haiti")]
-        [InternetDomainCode("HT")]
-        Haiti = 92,
-
-
-        /// <summary>
-        /// Heard Island and McDonald Islands (Australia)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heard Island and McDonald Islands (Australia)")]
-        [InternetDomainCode("Unknown")]
-        HeardIslandAndMcDonaldIslandsAustralia = 93,
-
-
-        /// <summary>
-        /// Honduras
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Honduras")]
-        [InternetDomainCode("HN")]
-        Honduras = 94,
-
-
-        /// <summary>
-        /// Hong Kong (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hong Kong (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        HongKongUnitedKingdom = 95,
-
-
-        /// <summary>
-        /// Howland Island (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Howland Island (United States)")]
-        [InternetDomainCode("Unknown")]
-        HowlandIslandUnitedStates = 96,
-
-
-        /// <summary>
-        /// Hungary
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hungary")]
-        [InternetDomainCode("HU")]
-        Hungary = 97,
-
-
-        /// <summary>
-        /// Iceland
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Iceland")]
-        [InternetDomainCode("IS")]
-        Iceland = 98,
-
-
-        /// <summary>
-        /// India
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("India")]
-        [InternetDomainCode("IN")]
-        India = 99,
-
-
-        /// <summary>
-        /// Indonesia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Indonesia")]
-        [InternetDomainCode("ID")]
-        Indonesia = 100,
-
-
-        /// <summary>
-        /// Iran
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Iran")]
-        [InternetDomainCode("IR")]
-        Iran = 101,
-
-
-        /// <summary>
-        /// Iraq
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Iraq")]
-        [InternetDomainCode("IQ")]
-        Iraq = 102,
-
-
-        /// <summary>
-        /// Ireland
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ireland")]
-        [InternetDomainCode("IE")]
-        Ireland = 104,
-
-
-        /// <summary>
-        /// Israel
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Israel")]
-        [InternetDomainCode("IL")]
-        Israel = 105,
-
-
-        /// <summary>
-        /// Italy
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Italy")]
-        [InternetDomainCode("IT")]
-        Italy = 106,
-
-
-        /// <summary>
-        /// Ivory Coast (aka Cote D'Ivoire)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ivory Coast (aka Cote D'Ivoire)")]
-        [InternetDomainCode("Unknown")]
-        IvoryCoastAkaCoteDIvoire = 107,
-
-
-        /// <summary>
-        /// Jamaica
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jamaica")]
-        [InternetDomainCode("JM")]
-        Jamaica = 108,
-
-
-        /// <summary>
-        /// Jan Mayen (Norway)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jan Mayen (Norway)")]
-        [InternetDomainCode("Unknown")]
-        JanMayenNorway = 109,
-
-
-        /// <summary>
-        /// Japan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Japan")]
-        [InternetDomainCode("JP")]
-        Japan = 110,
-
-
-        /// <summary>
-        /// Jarvis Island (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jarvis Island (United States)")]
-        [InternetDomainCode("Unknown")]
-        JarvisIslandUnitedStates = 111,
-
-
-        /// <summary>
-        /// Jersey (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jersey (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        JerseyUnitedKingdom = 112,
-
-
-        /// <summary>
-        /// Johnston Atoll (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Johnston Atoll (United States)")]
-        [InternetDomainCode("Unknown")]
-        JohnstonAtollUnitedStates = 113,
-
-
-        /// <summary>
-        /// Jordan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jordan")]
-        [InternetDomainCode("JO")]
-        Jordan = 114,
-
-
-        /// <summary>
-        /// Juan de Nova Island
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Juan de Nova Island")]
-        [InternetDomainCode("Unknown")]
-        JuanDeNovaIsland = 115,
-
-
-        /// <summary>
-        /// Kazakhstan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kazakhstan")]
-        [InternetDomainCode("KZ")]
-        Kazakhstan = 252,
-
-
-        /// <summary>
-        /// Kenya
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kenya")]
-        [InternetDomainCode("KE")]
-        Kenya = 116,
-
-
-        /// <summary>
-        /// Kingman Reef (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kingman Reef (United States)")]
-        [InternetDomainCode("Unknown")]
-        KingmanReefUnitedStates = 117,
-
-
-        /// <summary>
-        /// Kiribati
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kiribati")]
-        [InternetDomainCode("KI")]
-        Kiribati = 118,
-
-
-        /// <summary>
-        /// Korea, Democratic People's Republic of (North)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Korea, Democratic People's Republic of (North)")]
-        [InternetDomainCode("Unknown")]
-        KoreaDemocraticPeopleSRepublicOfNorth = 119,
-
-
-        /// <summary>
-        /// Korea, Republic of (South)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Korea, Republic of (South)")]
-        [InternetDomainCode("Unknown")]
-        KoreaRepublicOfSouth = 120,
-
-
-        /// <summary>
-        /// Kuwait
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kuwait")]
-        [InternetDomainCode("KW")]
-        Kuwait = 121,
-
-
-        /// <summary>
-        /// Kyrgyzstan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kyrgyzstan")]
-        [InternetDomainCode("KG")]
-        Kyrgyzstan = 253,
-
-
-        /// <summary>
-        /// Laos
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Laos")]
-        [InternetDomainCode("LA")]
-        Laos = 122,
-
-
-        /// <summary>
-        /// Latvia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Latvia")]
-        [InternetDomainCode("LV")]
-        Latvia = 254,
-
-
-        /// <summary>
-        /// Lebanon
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lebanon")]
-        [InternetDomainCode("LB")]
-        Lebanon = 123,
-
-
-        /// <summary>
-        /// Lesotho
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lesotho")]
-        [InternetDomainCode("LS")]
-        Lesotho = 124,
-
-
-        /// <summary>
-        /// Liberia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Liberia")]
-        [InternetDomainCode("LR")]
-        Liberia = 125,
-
-
-        /// <summary>
-        /// Libya
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Libya")]
-        [InternetDomainCode("LY")]
-        Libya = 126,
-
-
-        /// <summary>
-        /// Liechtenstein
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Liechtenstein")]
-        [InternetDomainCode("LI")]
-        Liechtenstein = 127,
-
-
-        /// <summary>
-        /// Lithuania
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lithuania")]
-        [InternetDomainCode("LT")]
-        Lithuania = 255,
-
-
-        /// <summary>
-        /// Luxembourg
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Luxembourg")]
-        [InternetDomainCode("LU")]
-        Luxembourg = 128,
-
-
-        /// <summary>
-        /// Macau (Portugal)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Macau (Portugal)")]
-        [InternetDomainCode("Unknown")]
-        MacauPortugal = 130,
-
-
-        /// <summary>
-        /// Macedonia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Macedonia")]
-        [InternetDomainCode("MK")]
-        Macedonia = 256,
-
-
-        /// <summary>
-        /// Madagascar
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Madagascar")]
-        [InternetDomainCode("MG")]
-        Madagascar = 129,
-
-
-        /// <summary>
-        /// Malawi
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malawi")]
-        [InternetDomainCode("MW")]
-        Malawi = 131,
-
-
-        /// <summary>
-        /// Malaysia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malaysia")]
-        [InternetDomainCode("MY")]
-        Malaysia = 132,
-
-
-        /// <summary>
-        /// Maldives
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Maldives")]
-        [InternetDomainCode("MV")]
-        Maldives = 133,
-
-
-        /// <summary>
-        /// Mali
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mali")]
-        [InternetDomainCode("ML")]
-        Mali = 134,
-
-
-        /// <summary>
-        /// Malta
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malta")]
-        [InternetDomainCode("MT")]
-        Malta = 135,
-
-
-        /// <summary>
-        /// Man, Isle of (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Man, Isle of (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        ManIsleOfUnitedKingdom = 136,
-
-
-        /// <summary>
-        /// Marshall Islands
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marshall Islands")]
-        [InternetDomainCode("MH")]
-        MarshallIslands = 137,
-
-
-        /// <summary>
-        /// Martinique (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Martinique (France)")]
-        [InternetDomainCode("Unknown")]
-        MartiniqueFrance = 138,
-
-
-        /// <summary>
-        /// Mauritania
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mauritania")]
-        [InternetDomainCode("MR")]
-        Mauritania = 139,
-
-
-        /// <summary>
-        /// Mauritius
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mauritius")]
-        [InternetDomainCode("MU")]
-        Mauritius = 140,
-
-
-        /// <summary>
-        /// Mayotte (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mayotte (France)")]
-        [InternetDomainCode("Unknown")]
-        MayotteFrance = 141,
-
-
-        /// <summary>
-        /// Mexico
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mexico")]
-        [InternetDomainCode("MX")]
-        Mexico = 142,
-
-
-        /// <summary>
-        /// Micronesia, Federative States of
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Micronesia, Federative States of")]
-        [InternetDomainCode("Unknown")]
-        MicronesiaFederativeStatesOf = 143,
-
-
-        /// <summary>
-        /// Midway Islands (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Midway Islands (United States)")]
-        [InternetDomainCode("Unknown")]
-        MidwayIslandsUnitedStates = 257,
-
-
-        /// <summary>
-        /// Moldova
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moldova")]
-        [InternetDomainCode("MD")]
-        Moldova = 258,
-
-
-        /// <summary>
-        /// Monaco
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Monaco")]
-        [InternetDomainCode("MC")]
-        Monaco = 144,
-
-
-        /// <summary>
-        /// Mongolia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mongolia")]
-        [InternetDomainCode("MN")]
-        Mongolia = 145,
-
-
-        /// <summary>
-        /// Montenegro
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Montenegro")]
-        [InternetDomainCode("Unknown")]
-        Montenegro = 259,
-
-
-        /// <summary>
-        /// Montserrat (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Montserrat (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        MontserratUnitedKingdom = 146,
-
-
-        /// <summary>
-        /// Morocco
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Morocco")]
-        [InternetDomainCode("MA")]
-        Morocco = 147,
-
-
-        /// <summary>
-        /// Mozambique
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mozambique")]
-        [InternetDomainCode("MZ")]
-        Mozambique = 148,
-
-
-        /// <summary>
-        /// Myanmar (aka Burma)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Myanmar (aka Burma)")]
-        [InternetDomainCode("Unknown")]
-        MyanmarAkaBurma = 35,
-
-
-        /// <summary>
-        /// Namibia (South West Africa)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Namibia (South West Africa)")]
-        [InternetDomainCode("Unknown")]
-        NamibiaSouthWestAfrica = 149,
-
-
-        /// <summary>
-        /// Nauru
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nauru")]
-        [InternetDomainCode("NR")]
-        Nauru = 150,
-
-
-        /// <summary>
-        /// Navassa Island (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Navassa Island (United States)")]
-        [InternetDomainCode("Unknown")]
-        NavassaIslandUnitedStates = 151,
-
-
-        /// <summary>
-        /// Nepal
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nepal")]
-        [InternetDomainCode("NP")]
-        Nepal = 152,
-
-
-        /// <summary>
-        /// Netherlands
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Netherlands")]
-        [InternetDomainCode("NL")]
-        Netherlands = 153,
-
-
-        /// <summary>
-        /// Netherlands Antilles (Curacao, Bonaire, Saba, Sint Maarten Sint Eustatius)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Netherlands Antilles (Curacao, Bonaire, Saba, Sint Maarten Sint Eustatius)")]
-        [InternetDomainCode("Unknown")]
-        NetherlandsAntillesCuracaoBonaireSabaSintMaartenSintEustatius = 154,
-
-
-        /// <summary>
-        /// New Caledonia (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("New Caledonia (France)")]
-        [InternetDomainCode("Unknown")]
-        NewCaledoniaFrance = 155,
-
-
-        /// <summary>
-        /// New Zealand
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("New Zealand")]
-        [InternetDomainCode("Unknown")]
-        NewZealand = 156,
-
-
-        /// <summary>
-        /// Nicaragua
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nicaragua")]
-        [InternetDomainCode("NI")]
-        Nicaragua = 157,
-
-
-        /// <summary>
-        /// Niger
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Niger")]
-        [InternetDomainCode("NE")]
-        Niger = 158,
-
-
-        /// <summary>
-        /// Nigeria
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nigeria")]
-        [InternetDomainCode("NG")]
-        Nigeria = 159,
-
-
-        /// <summary>
-        /// Niue (New Zealand)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Niue (New Zealand)")]
-        [InternetDomainCode("Unknown")]
-        NiueNewZealand = 160,
-
-
-        /// <summary>
-        /// Norfolk Island (Australia)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Norfolk Island (Australia)")]
-        [InternetDomainCode("Unknown")]
-        NorfolkIslandAustralia = 161,
-
-
-        /// <summary>
-        /// Northern Mariana Islands (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Northern Mariana Islands (United States)")]
-        [InternetDomainCode("Unknown")]
-        NorthernMarianaIslandsUnitedStates = 162,
-
-
-        /// <summary>
-        /// Norway
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Norway")]
-        [InternetDomainCode("NO")]
-        Norway = 163,
-
-
-        /// <summary>
-        /// Oman
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Oman")]
-        [InternetDomainCode("OM")]
-        Oman = 164,
-
-
-        /// <summary>
-        /// Pacific Islands, Trust Territory of the (Palau)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pacific Islands, Trust Territory of the (Palau)")]
-        [InternetDomainCode("Unknown")]
-        PacificIslandsTrustTerritoryOfThePalau = 216,
-
-
-        /// <summary>
-        /// Pakistan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pakistan")]
-        [InternetDomainCode("PK")]
-        Pakistan = 165,
-
-
-        /// <summary>
-        /// Palmyra Atoll (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Palmyra Atoll (United States)")]
-        [InternetDomainCode("Unknown")]
-        PalmyraAtollUnitedStates = 166,
-
-
-        /// <summary>
-        /// Panama
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Panama")]
-        [InternetDomainCode("PA")]
-        Panama = 168,
-
-
-        /// <summary>
-        /// Papua New Guinea
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Papua New Guinea")]
-        [InternetDomainCode("PG")]
-        PapuaNewGuinea = 169,
-
-
-        /// <summary>
-        /// Paracel Islands (International - Occupied by China, also claimed by Taiwan and Vietnam)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Paracel Islands (International - Occupied by China, also claimed by Taiwan and Vietnam)")]
-        [InternetDomainCode("Unknown")]
-        ParacelIslandsInternationalOccupiedByChinaAlsoClaimedByTaiwanAndVietnam = 170,
-
-
-        /// <summary>
-        /// Paraguay
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Paraguay")]
-        [InternetDomainCode("PY")]
-        Paraguay = 171,
-
-
-        /// <summary>
-        /// Peru
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Peru")]
-        [InternetDomainCode("PE")]
-        Peru = 172,
-
-
-        /// <summary>
-        /// Philippines
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Philippines")]
-        [InternetDomainCode("PH")]
-        Philippines = 173,
-
-
-        /// <summary>
-        /// Pitcairn Islands (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pitcairn Islands (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        PitcairnIslandsUnitedKingdom = 174,
-
-
-        /// <summary>
-        /// Poland
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Poland")]
-        [InternetDomainCode("PL")]
-        Poland = 175,
-
-
-        /// <summary>
-        /// Portugal
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Portugal")]
-        [InternetDomainCode("PT")]
-        Portugal = 176,
-
-
-        /// <summary>
-        /// Puerto Rico (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Puerto Rico (United States)")]
-        [InternetDomainCode("Unknown")]
-        PuertoRicoUnitedStates = 177,
-
-
-        /// <summary>
-        /// Qatar
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Qatar")]
-        [InternetDomainCode("QA")]
-        Qatar = 178,
-
-
-        /// <summary>
-        /// Reunion (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Reunion (France)")]
-        [InternetDomainCode("Unknown")]
-        ReunionFrance = 179,
-
-
-        /// <summary>
-        /// Romania
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Romania")]
-        [InternetDomainCode("RO")]
-        Romania = 180,
-
-
-        /// <summary>
-        /// Russia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Russia")]
-        [InternetDomainCode("Unknown")]
-        Russia = 260,
-
-
-        /// <summary>
-        /// Rwanda
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rwanda")]
-        [InternetDomainCode("RW")]
-        Rwanda = 181,
-
-
-        /// <summary>
-        /// St. Helena (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("St. Helena (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        StHelenaUnitedKingdom = 183,
-
-
-        /// <summary>
-        /// St. Lucia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("St. Lucia")]
-        [InternetDomainCode("Unknown")]
-        StLucia = 184,
-
-
-        /// <summary>
-        /// St. Vincent and the Grenadines
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("St. Vincent and the Grenadines")]
-        [InternetDomainCode("Unknown")]
-        StVincentAndTheGrenadines = 186,
-
-
-        /// <summary>
-        /// St. Kitts and Nevis
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("St. Kitts and Nevis")]
-        [InternetDomainCode("Unknown")]
-        StKittsAndNevis = 182,
-
-
-        /// <summary>
-        /// St. Pierre and Miquelon (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("St. Pierre and Miquelon (France)")]
-        [InternetDomainCode("Unknown")]
-        StPierreAndMiquelonFrance = 185,
-
-
-        /// <summary>
-        /// San Marino
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("San Marino")]
-        [InternetDomainCode("SM")]
-        SanMarino = 187,
-
-
-        /// <summary>
-        /// Sao Tome and Principe
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sao Tome and Principe")]
-        [InternetDomainCode("ST")]
-        SaoTomeAndPrincipe = 188,
-
-
-        /// <summary>
-        /// Saudi Arabia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Saudi Arabia")]
-        [InternetDomainCode("SA")]
-        SaudiArabia = 189,
-
-
-        /// <summary>
-        /// Senegal
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Senegal")]
-        [InternetDomainCode("SN")]
-        Senegal = 190,
-
-
-        /// <summary>
-        /// Serbia and Montenegro (Montenegro to separate)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Serbia and Montenegro (Montenegro to separate)")]
-        [InternetDomainCode("Unknown")]
-        SerbiaAndMontenegroMontenegroToSeparate = 261,
-
-
-        /// <summary>
-        /// Seychelles
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Seychelles")]
-        [InternetDomainCode("SC")]
-        Seychelles = 191,
-
-
-        /// <summary>
-        /// Sierra Leone
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sierra Leone")]
-        [InternetDomainCode("SL")]
-        SierraLeone = 192,
-
-
-        /// <summary>
-        /// Singapore
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Singapore")]
-        [InternetDomainCode("SG")]
-        Singapore = 193,
-
-
-        /// <summary>
-        /// Slovenia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Slovenia")]
-        [InternetDomainCode("SI")]
-        Slovenia = 262,
-
-
-        /// <summary>
-        /// Solomon Islands
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Solomon Islands")]
-        [InternetDomainCode("SB")]
-        SolomonIslands = 194,
-
-
-        /// <summary>
-        /// Somalia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Somalia")]
-        [InternetDomainCode("SO")]
-        Somalia = 195,
-
-
-        /// <summary>
-        /// South Africa
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("South Africa")]
-        [InternetDomainCode("ZA")]
-        SouthAfrica = 197,
-
-
-        /// <summary>
-        /// South Georgia and the South Sandwich Islands (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("South Georgia and the South Sandwich Islands (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        SouthGeorgiaAndTheSouthSandwichIslandsUnitedKingdom = 196,
-
-
-        /// <summary>
-        /// Spain
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spain")]
-        [InternetDomainCode("ES")]
-        Spain = 198,
-
-
-        /// <summary>
-        /// Spratly Islands (International - parts occupied and claimed by China,Malaysia, Philippines, Taiwan, Vietnam)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spratly Islands (International - parts occupied and claimed by China,Malaysia, Philippines, Taiwan, Vietnam)")]
-        [InternetDomainCode("Unknown")]
-        SpratlyIslandsInternationalPartsOccupiedAndClaimedByChinaMalaysiaPhilippinesTaiwanVietnam = 199,
-
-
-        /// <summary>
-        /// Sri Lanka
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sri Lanka")]
-        [InternetDomainCode("LK")]
-        SriLanka = 200,
-
-
-        /// <summary>
-        /// Sudan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sudan")]
-        [InternetDomainCode("SD")]
-        Sudan = 201,
-
-
-        /// <summary>
-        /// Suriname
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Suriname")]
-        [InternetDomainCode("SR")]
-        Suriname = 202,
-
-
-        /// <summary>
-        /// Svalbard (Norway)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Svalbard (Norway)")]
-        [InternetDomainCode("Unknown")]
-        SvalbardNorway = 203,
-
-
-        /// <summary>
-        /// Swaziland
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Swaziland")]
-        [InternetDomainCode("SZ")]
-        Swaziland = 204,
-
-
-        /// <summary>
-        /// Sweden
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sweden")]
-        [InternetDomainCode("SE")]
-        Sweden = 205,
-
-
-        /// <summary>
-        /// Switzerland
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Switzerland")]
-        [InternetDomainCode("CH")]
-        Switzerland = 206,
-
-
-        /// <summary>
-        /// Syria
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Syria")]
-        [InternetDomainCode("SY")]
-        Syria = 207,
-
-
-        /// <summary>
-        /// Taiwan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Taiwan")]
-        [InternetDomainCode("TW")]
-        Taiwan = 208,
-
-
-        /// <summary>
-        /// Tajikistan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tajikistan")]
-        [InternetDomainCode("TJ")]
-        Tajikistan = 263,
-
-
-        /// <summary>
-        /// Tanzania
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tanzania")]
-        [InternetDomainCode("TZ")]
-        Tanzania = 209,
-
-
-        /// <summary>
-        /// Thailand
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thailand")]
-        [InternetDomainCode("TH")]
-        Thailand = 210,
-
-
-        /// <summary>
-        /// Togo
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Togo")]
-        [InternetDomainCode("TG")]
-        Togo = 211,
-
-
-        /// <summary>
-        /// Tokelau (New Zealand)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tokelau (New Zealand)")]
-        [InternetDomainCode("Unknown")]
-        TokelauNewZealand = 212,
-
-
-        /// <summary>
-        /// Tonga
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tonga")]
-        [InternetDomainCode("TO")]
-        Tonga = 213,
-
-
-        /// <summary>
-        /// Trinidad and Tobago
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trinidad and Tobago")]
-        [InternetDomainCode("TT")]
-        TrinidadAndTobago = 214,
-
-
-        /// <summary>
-        /// Tromelin Island (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tromelin Island (France)")]
-        [InternetDomainCode("Unknown")]
-        TromelinIslandFrance = 215,
-
-
-        /// <summary>
-        /// Tunisia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tunisia")]
-        [InternetDomainCode("TN")]
-        Tunisia = 217,
-
-
-        /// <summary>
-        /// Turkey
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Turkey")]
-        [InternetDomainCode("TR")]
-        Turkey = 218,
-
-
-        /// <summary>
-        /// Turkmenistan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Turkmenistan")]
-        [InternetDomainCode("TM")]
-        Turkmenistan = 264,
-
-
-        /// <summary>
-        /// Turks and Caicos Islands (United Kingdom)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Turks and Caicos Islands (United Kingdom)")]
-        [InternetDomainCode("Unknown")]
-        TurksAndCaicosIslandsUnitedKingdom = 219,
-
-
-        /// <summary>
-        /// Tuvalu
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tuvalu")]
-        [InternetDomainCode("TV")]
-        Tuvalu = 220,
-
-
-        /// <summary>
-        /// Uganda
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Uganda")]
-        [InternetDomainCode("UG")]
-        Uganda = 221,
-
-
-        /// <summary>
-        /// Ukraine
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ukraine")]
-        [InternetDomainCode("UA")]
-        Ukraine = 265,
-
-
-        /// <summary>
-        /// United Arab Emirates
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("United Arab Emirates")]
-        [InternetDomainCode("AE")]
-        UnitedArabEmirates = 223,
-
-
-        /// <summary>
-        /// United Kingdom
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("United Kingdom")]
-        [InternetDomainCode("UK")]
-        UnitedKingdom = 224,
-
-
-        /// <summary>
-        /// United States
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("United States")]
-        [InternetDomainCode("US")]
-        UnitedStates = 225,
-
-
-        /// <summary>
-        /// Upper Volta (aka Burkina or Burkina Faso)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Upper Volta (aka Burkina or Burkina Faso)")]
-        [InternetDomainCode("Unknown")]
-        UpperVoltaAkaBurkinaOrBurkinaFaso = 34,
-
-
-        /// <summary>
-        /// Uruguay
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Uruguay")]
-        [InternetDomainCode("UY")]
-        Uruguay = 226,
-
-
-        /// <summary>
-        /// Uzbekistan
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Uzbekistan")]
-        [InternetDomainCode("UZ")]
-        Uzbekistan = 266,
-
-
-        /// <summary>
-        /// Vanuatu
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vanuatu")]
-        [InternetDomainCode("VU")]
-        Vanuatu = 227,
-
-
-        /// <summary>
-        /// Vatican City (Holy See)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vatican City (Holy See)")]
-        [InternetDomainCode("Unknown")]
-        VaticanCityHolySee = 228,
-
-
-        /// <summary>
-        /// Venezuela
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Venezuela")]
-        [InternetDomainCode("VE")]
-        Venezuela = 229,
-
-
-        /// <summary>
-        /// Vietnam
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vietnam")]
-        [InternetDomainCode("Unknown")]
-        Vietnam = 230,
-
-
-        /// <summary>
-        /// Virgin Islands (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Virgin Islands (United States)")]
-        [InternetDomainCode("Unknown")]
-        VirginIslandsUnitedStates = 231,
-
-
-        /// <summary>
-        /// Wake Island (United States)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wake Island (United States)")]
-        [InternetDomainCode("Unknown")]
-        WakeIslandUnitedStates = 232,
-
-
-        /// <summary>
-        /// Wallis and Futuna (France)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wallis and Futuna (France)")]
-        [InternetDomainCode("Unknown")]
-        WallisAndFutunaFrance = 233,
-
-
-        /// <summary>
-        /// West Bank (Israel)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("West Bank (Israel)")]
-        [InternetDomainCode("Unknown")]
-        WestBankIsrael = 235,
-
-
-        /// <summary>
-        /// Western Sahara
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Western Sahara")]
-        [InternetDomainCode("EH")]
-        WesternSahara = 234,
-
-
-        /// <summary>
-        /// Western Samoa
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Western Samoa")]
-        [InternetDomainCode("Unknown")]
-        WesternSamoa = 236,
-
-
-        /// <summary>
-        /// Yemen
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Yemen")]
-        [InternetDomainCode("YE")]
-        Yemen = 237,
-
-
-        /// <summary>
-        /// Serbia and Montenegro
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Serbia and Montenegro")]
-        [InternetDomainCode("CS")]
-        SerbiaAndMontenegro = 240,
-
-
-        /// <summary>
-        /// Zaire
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Zaire")]
-        [InternetDomainCode("Unknown")]
-        Zaire = 241,
-
-
-        /// <summary>
-        /// Zambia
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Zambia")]
-        [InternetDomainCode("ZM")]
-        Zambia = 242,
-
-
-        /// <summary>
-        /// Zimbabwe
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Zimbabwe")]
-        [InternetDomainCode("ZW")]
-        Zimbabwe = 243
-
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using OpenDis.Core;
+
+namespace OpenDis.Enumerations
+{
+    /// <summary>
+    /// Enumeration values for Country (es.type.country, Country, 
+    /// section 4.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Country : ushort
+    {
+        /// <summary>
+        /// Other
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other")]
+        [InternetDomainCode("Unknown")]
+        Other = 0,
+
+
+        /// <summary>
+        /// Afghanistan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Afghanistan")]
+        [InternetDomainCode("AF")]
+        Afghanistan = 1,
+
+
+        /// <summary>
+        /// Albania
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Albania")]
+        [InternetDomainCode("AL")]
+        Albania = 2,
+
+
+        /// <summary>
+        /// Algeria
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Algeria")]
+        [InternetDomainCode("DZ")]
+        Algeria = 3,
+
+
+        /// <summary>
+        /// American Samoa (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("American Samoa (United States)")]
+        [InternetDomainCode("Unknown")]
+        AmericanSamoaUnitedStates = 4,
+
+
+        /// <summary>
+        /// Andorra
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Andorra")]
+        [InternetDomainCode("AD")]
+        Andorra = 5,
+
+
+        /// <summary>
+        /// Angola
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Angola")]
+        [InternetDomainCode("AO")]
+        Angola = 6,
+
+
+        /// <summary>
+        /// Anguilla
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Anguilla")]
+        [InternetDomainCode("AI")]
+        Anguilla = 7,
+
+
+        /// <summary>
+        /// Antarctica (International)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antarctica (International)")]
+        [InternetDomainCode("Unknown")]
+        AntarcticaInternational = 8,
+
+
+        /// <summary>
+        /// Antigua and Barbuda
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antigua and Barbuda")]
+        [InternetDomainCode("AG")]
+        AntiguaAndBarbuda = 9,
+
+
+        /// <summary>
+        /// Argentina
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Argentina")]
+        [InternetDomainCode("AR")]
+        Argentina = 10,
+
+
+        /// <summary>
+        /// Armenia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armenia")]
+        [InternetDomainCode("AM")]
+        Armenia = 244,
+
+
+        /// <summary>
+        /// Aruba
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aruba")]
+        [InternetDomainCode("AW")]
+        Aruba = 11,
+
+
+        /// <summary>
+        /// Ashmore and Cartier Islands (Australia)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ashmore and Cartier Islands (Australia)")]
+        [InternetDomainCode("Unknown")]
+        AshmoreAndCartierIslandsAustralia = 12,
+
+
+        /// <summary>
+        /// Australia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Australia")]
+        [InternetDomainCode("AU")]
+        Australia = 13,
+
+
+        /// <summary>
+        /// Austria
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Austria")]
+        [InternetDomainCode("AT")]
+        Austria = 14,
+
+
+        /// <summary>
+        /// Azerbaijan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Azerbaijan")]
+        [InternetDomainCode("AZ")]
+        Azerbaijan = 245,
+
+
+        /// <summary>
+        /// Bahamas
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bahamas")]
+        [InternetDomainCode("BS")]
+        Bahamas = 15,
+
+
+        /// <summary>
+        /// Bahrain
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bahrain")]
+        [InternetDomainCode("BH")]
+        Bahrain = 16,
+
+
+        /// <summary>
+        /// Baker Island (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Baker Island (United States)")]
+        [InternetDomainCode("Unknown")]
+        BakerIslandUnitedStates = 17,
+
+
+        /// <summary>
+        /// Bangladesh
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bangladesh")]
+        [InternetDomainCode("BD")]
+        Bangladesh = 18,
+
+
+        /// <summary>
+        /// Barbados
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Barbados")]
+        [InternetDomainCode("BB")]
+        Barbados = 19,
+
+
+        /// <summary>
+        /// Bassas da India (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bassas da India (France)")]
+        [InternetDomainCode("Unknown")]
+        BassasDaIndiaFrance = 20,
+
+
+        /// <summary>
+        /// Belarus
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Belarus")]
+        [InternetDomainCode("BY")]
+        Belarus = 246,
+
+
+        /// <summary>
+        /// Belgium
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Belgium")]
+        [InternetDomainCode("BE")]
+        Belgium = 21,
+
+
+        /// <summary>
+        /// Belize
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Belize")]
+        [InternetDomainCode("BZ")]
+        Belize = 22,
+
+
+        /// <summary>
+        /// Benin (aka Dahomey)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Benin (aka Dahomey)")]
+        [InternetDomainCode("Unknown")]
+        BeninAkaDahomey = 23,
+
+
+        /// <summary>
+        /// Bermuda (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bermuda (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        BermudaUnitedKingdom = 24,
+
+
+        /// <summary>
+        /// Bhutan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bhutan")]
+        [InternetDomainCode("BT")]
+        Bhutan = 25,
+
+
+        /// <summary>
+        /// Bolivia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bolivia")]
+        [InternetDomainCode("BO")]
+        Bolivia = 26,
+
+
+        /// <summary>
+        /// Bosnia and Hercegovina
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bosnia and Hercegovina")]
+        [InternetDomainCode("Unknown")]
+        BosniaAndHercegovina = 247,
+
+
+        /// <summary>
+        /// Botswana
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Botswana")]
+        [InternetDomainCode("BW")]
+        Botswana = 27,
+
+
+        /// <summary>
+        /// Bouvet Island (Norway)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bouvet Island (Norway)")]
+        [InternetDomainCode("Unknown")]
+        BouvetIslandNorway = 28,
+
+
+        /// <summary>
+        /// Brazil
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Brazil")]
+        [InternetDomainCode("BR")]
+        Brazil = 29,
+
+
+        /// <summary>
+        /// British Indian Ocean Territory (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("British Indian Ocean Territory (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        BritishIndianOceanTerritoryUnitedKingdom = 30,
+
+
+        /// <summary>
+        /// British Virgin Islands (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("British Virgin Islands (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        BritishVirginIslandsUnitedKingdom = 31,
+
+
+        /// <summary>
+        /// Brunei
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Brunei")]
+        [InternetDomainCode("Unknown")]
+        Brunei = 32,
+
+
+        /// <summary>
+        /// Bulgaria
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bulgaria")]
+        [InternetDomainCode("BG")]
+        Bulgaria = 33,
+
+
+        /// <summary>
+        /// Burkina (aka Burkina Faso or Upper Volta)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Burkina (aka Burkina Faso or Upper Volta)")]
+        [InternetDomainCode("Unknown")]
+        BurkinaAkaBurkinaFasoOrUpperVolta = 34,
+
+
+        /// <summary>
+        /// Burma (Myanmar)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Burma (Myanmar)")]
+        [InternetDomainCode("Unknown")]
+        BurmaMyanmar = 35,
+
+
+        /// <summary>
+        /// Burundi
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Burundi")]
+        [InternetDomainCode("BI")]
+        Burundi = 36,
+
+
+        /// <summary>
+        /// Cambodia (aka Kampuchea)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cambodia (aka Kampuchea)")]
+        [InternetDomainCode("Unknown")]
+        CambodiaAkaKampuchea = 37,
+
+
+        /// <summary>
+        /// Cameroon
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cameroon")]
+        [InternetDomainCode("CM")]
+        Cameroon = 38,
+
+
+        /// <summary>
+        /// Canada
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Canada")]
+        [InternetDomainCode("CA")]
+        Canada = 39,
+
+
+        /// <summary>
+        /// Cape Verde, Republic of
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cape Verde, Republic of")]
+        [InternetDomainCode("Unknown")]
+        CapeVerdeRepublicOf = 40,
+
+
+        /// <summary>
+        /// Cayman Islands (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cayman Islands (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        CaymanIslandsUnitedKingdom = 41,
+
+
+        /// <summary>
+        /// Central African Republic
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Central African Republic")]
+        [InternetDomainCode("CF")]
+        CentralAfricanRepublic = 42,
+
+
+        /// <summary>
+        /// Chad
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chad")]
+        [InternetDomainCode("TD")]
+        Chad = 43,
+
+
+        /// <summary>
+        /// Chile
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chile")]
+        [InternetDomainCode("CL")]
+        Chile = 44,
+
+
+        /// <summary>
+        /// China, People's Republic of
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("China, People's Republic of")]
+        [InternetDomainCode("Unknown")]
+        ChinaPeopleSRepublicOf = 45,
+
+
+        /// <summary>
+        /// Christmas Island (Australia)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Christmas Island (Australia)")]
+        [InternetDomainCode("Unknown")]
+        ChristmasIslandAustralia = 46,
+
+
+        /// <summary>
+        /// Clipperton Island (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Clipperton Island (France)")]
+        [InternetDomainCode("Unknown")]
+        ClippertonIslandFrance = 248,
+
+
+        /// <summary>
+        /// Cocos (Keeling) Islands (Australia)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cocos (Keeling) Islands (Australia)")]
+        [InternetDomainCode("Unknown")]
+        CocosKeelingIslandsAustralia = 47,
+
+
+        /// <summary>
+        /// Colombia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Colombia")]
+        [InternetDomainCode("CO")]
+        Colombia = 48,
+
+
+        /// <summary>
+        /// Commonwealth of Independent States
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Commonwealth of Independent States")]
+        [InternetDomainCode("Unknown")]
+        CommonwealthOfIndependentStates = 222,
+
+
+        /// <summary>
+        /// Comoros
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Comoros")]
+        [InternetDomainCode("KM")]
+        Comoros = 49,
+
+
+        /// <summary>
+        /// Congo, Republic of
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Congo, Republic of")]
+        [InternetDomainCode("Unknown")]
+        CongoRepublicOf = 50,
+
+
+        /// <summary>
+        /// Cook Islands (New Zealand)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cook Islands (New Zealand)")]
+        [InternetDomainCode("Unknown")]
+        CookIslandsNewZealand = 51,
+
+
+        /// <summary>
+        /// Coral Sea Islands (Australia)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Coral Sea Islands (Australia)")]
+        [InternetDomainCode("Unknown")]
+        CoralSeaIslandsAustralia = 52,
+
+
+        /// <summary>
+        /// Costa Rica
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Costa Rica")]
+        [InternetDomainCode("CR")]
+        CostaRica = 53,
+
+
+        /// <summary>
+        /// (Cote D'Ivoire (aka Ivory Coast)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("(Cote D'Ivoire (aka Ivory Coast)")]
+        [InternetDomainCode("Unknown")]
+        CoteDIvoireAkaIvoryCoast = 107,
+
+
+        /// <summary>
+        /// Croatia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Croatia")]
+        [InternetDomainCode("Unknown")]
+        Croatia = 249,
+
+
+        /// <summary>
+        /// Cuba
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cuba")]
+        [InternetDomainCode("CU")]
+        Cuba = 54,
+
+
+        /// <summary>
+        /// Cyprus
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cyprus")]
+        [InternetDomainCode("CY")]
+        Cyprus = 55,
+
+
+        /// <summary>
+        /// Czechoslovakia (separating into Czech Republic and Slovak Republic)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Czechoslovakia (separating into Czech Republic and Slovak Republic)")]
+        [InternetDomainCode("Unknown")]
+        CzechoslovakiaSeparatingIntoCzechRepublicAndSlovakRepublic = 56,
+
+
+        /// <summary>
+        /// Dahomey (aka Benin)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dahomey (aka Benin)")]
+        [InternetDomainCode("Unknown")]
+        DahomeyAkaBenin = 23,
+
+
+        /// <summary>
+        /// Denmark
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Denmark")]
+        [InternetDomainCode("DK")]
+        Denmark = 57,
+
+
+        /// <summary>
+        /// Djibouti
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Djibouti")]
+        [InternetDomainCode("DJ")]
+        Djibouti = 58,
+
+
+        /// <summary>
+        /// Dominica
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dominica")]
+        [InternetDomainCode("DM")]
+        Dominica = 59,
+
+
+        /// <summary>
+        /// Dominican Republic
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dominican Republic")]
+        [InternetDomainCode("DO")]
+        DominicanRepublic = 60,
+
+
+        /// <summary>
+        /// Ecuador
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ecuador")]
+        [InternetDomainCode("EC")]
+        Ecuador = 61,
+
+
+        /// <summary>
+        /// Egypt
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Egypt")]
+        [InternetDomainCode("EG")]
+        Egypt = 62,
+
+
+        /// <summary>
+        /// El Salvador
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("El Salvador")]
+        [InternetDomainCode("SV")]
+        ElSalvador = 63,
+
+
+        /// <summary>
+        /// Equatorial Guinea
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Equatorial Guinea")]
+        [InternetDomainCode("GQ")]
+        EquatorialGuinea = 64,
+
+
+        /// <summary>
+        /// Estonia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Estonia")]
+        [InternetDomainCode("EE")]
+        Estonia = 250,
+
+
+        /// <summary>
+        /// Ethiopia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ethiopia")]
+        [InternetDomainCode("ET")]
+        Ethiopia = 65,
+
+
+        /// <summary>
+        /// Europa Island (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Europa Island (France)")]
+        [InternetDomainCode("Unknown")]
+        EuropaIslandFrance = 66,
+
+
+        /// <summary>
+        /// Falkland Islands (aka Islas Malvinas) (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Falkland Islands (aka Islas Malvinas) (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        FalklandIslandsAkaIslasMalvinasUnitedKingdom = 67,
+
+
+        /// <summary>
+        /// Faroe Islands (Denmark)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Faroe Islands (Denmark)")]
+        [InternetDomainCode("Unknown")]
+        FaroeIslandsDenmark = 68,
+
+
+        /// <summary>
+        /// Fiji
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fiji")]
+        [InternetDomainCode("FJ")]
+        Fiji = 69,
+
+
+        /// <summary>
+        /// Finland
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Finland")]
+        [InternetDomainCode("FI")]
+        Finland = 70,
+
+
+        /// <summary>
+        /// France
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("France")]
+        [InternetDomainCode("FR")]
+        France = 71,
+
+
+        /// <summary>
+        /// French Guiana (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("French Guiana (France)")]
+        [InternetDomainCode("Unknown")]
+        FrenchGuianaFrance = 72,
+
+
+        /// <summary>
+        /// French Polynesia (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("French Polynesia (France)")]
+        [InternetDomainCode("Unknown")]
+        FrenchPolynesiaFrance = 73,
+
+
+        /// <summary>
+        /// French Southern and Antarctic Islands (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("French Southern and Antarctic Islands (France)")]
+        [InternetDomainCode("Unknown")]
+        FrenchSouthernAndAntarcticIslandsFrance = 74,
+
+
+        /// <summary>
+        /// Gabon
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gabon")]
+        [InternetDomainCode("GA")]
+        Gabon = 75,
+
+
+        /// <summary>
+        /// Gambia, The
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gambia, The")]
+        [InternetDomainCode("Unknown")]
+        GambiaThe = 76,
+
+
+        /// <summary>
+        /// Gaza Strip (Israel)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gaza Strip (Israel)")]
+        [InternetDomainCode("Unknown")]
+        GazaStripIsrael = 77,
+
+
+        /// <summary>
+        /// Georgia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Georgia")]
+        [InternetDomainCode("GE")]
+        Georgia = 251,
+
+
+        /// <summary>
+        /// Germany
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Germany")]
+        [InternetDomainCode("DE")]
+        Germany = 78,
+
+
+        /// <summary>
+        /// Ghana
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ghana")]
+        [InternetDomainCode("GH")]
+        Ghana = 79,
+
+
+        /// <summary>
+        /// Gibraltar (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gibraltar (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        GibraltarUnitedKingdom = 80,
+
+
+        /// <summary>
+        /// Glorioso Islands (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Glorioso Islands (France)")]
+        [InternetDomainCode("Unknown")]
+        GloriosoIslandsFrance = 81,
+
+
+        /// <summary>
+        /// Greece
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Greece")]
+        [InternetDomainCode("GR")]
+        Greece = 82,
+
+
+        /// <summary>
+        /// Greenland (Denmark)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Greenland (Denmark)")]
+        [InternetDomainCode("Unknown")]
+        GreenlandDenmark = 83,
+
+
+        /// <summary>
+        /// Grenada
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Grenada")]
+        [InternetDomainCode("GD")]
+        Grenada = 84,
+
+
+        /// <summary>
+        /// Guadaloupe (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guadaloupe (France)")]
+        [InternetDomainCode("Unknown")]
+        GuadaloupeFrance = 85,
+
+
+        /// <summary>
+        /// Guam (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guam (United States)")]
+        [InternetDomainCode("Unknown")]
+        GuamUnitedStates = 86,
+
+
+        /// <summary>
+        /// Guatemala
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guatemala")]
+        [InternetDomainCode("GT")]
+        Guatemala = 87,
+
+
+        /// <summary>
+        /// Guernsey (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guernsey (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        GuernseyUnitedKingdom = 88,
+
+
+        /// <summary>
+        /// Guinea
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guinea")]
+        [InternetDomainCode("GN")]
+        Guinea = 89,
+
+
+        /// <summary>
+        /// Guinea- Bissau
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guinea- Bissau")]
+        [InternetDomainCode("Unknown")]
+        GuineaBissau = 90,
+
+
+        /// <summary>
+        /// Guyana
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guyana")]
+        [InternetDomainCode("GY")]
+        Guyana = 91,
+
+
+        /// <summary>
+        /// Haiti
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Haiti")]
+        [InternetDomainCode("HT")]
+        Haiti = 92,
+
+
+        /// <summary>
+        /// Heard Island and McDonald Islands (Australia)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heard Island and McDonald Islands (Australia)")]
+        [InternetDomainCode("Unknown")]
+        HeardIslandAndMcDonaldIslandsAustralia = 93,
+
+
+        /// <summary>
+        /// Honduras
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Honduras")]
+        [InternetDomainCode("HN")]
+        Honduras = 94,
+
+
+        /// <summary>
+        /// Hong Kong (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hong Kong (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        HongKongUnitedKingdom = 95,
+
+
+        /// <summary>
+        /// Howland Island (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Howland Island (United States)")]
+        [InternetDomainCode("Unknown")]
+        HowlandIslandUnitedStates = 96,
+
+
+        /// <summary>
+        /// Hungary
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hungary")]
+        [InternetDomainCode("HU")]
+        Hungary = 97,
+
+
+        /// <summary>
+        /// Iceland
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Iceland")]
+        [InternetDomainCode("IS")]
+        Iceland = 98,
+
+
+        /// <summary>
+        /// India
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("India")]
+        [InternetDomainCode("IN")]
+        India = 99,
+
+
+        /// <summary>
+        /// Indonesia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Indonesia")]
+        [InternetDomainCode("ID")]
+        Indonesia = 100,
+
+
+        /// <summary>
+        /// Iran
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Iran")]
+        [InternetDomainCode("IR")]
+        Iran = 101,
+
+
+        /// <summary>
+        /// Iraq
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Iraq")]
+        [InternetDomainCode("IQ")]
+        Iraq = 102,
+
+
+        /// <summary>
+        /// Ireland
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ireland")]
+        [InternetDomainCode("IE")]
+        Ireland = 104,
+
+
+        /// <summary>
+        /// Israel
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Israel")]
+        [InternetDomainCode("IL")]
+        Israel = 105,
+
+
+        /// <summary>
+        /// Italy
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Italy")]
+        [InternetDomainCode("IT")]
+        Italy = 106,
+
+
+        /// <summary>
+        /// Ivory Coast (aka Cote D'Ivoire)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ivory Coast (aka Cote D'Ivoire)")]
+        [InternetDomainCode("Unknown")]
+        IvoryCoastAkaCoteDIvoire = 107,
+
+
+        /// <summary>
+        /// Jamaica
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jamaica")]
+        [InternetDomainCode("JM")]
+        Jamaica = 108,
+
+
+        /// <summary>
+        /// Jan Mayen (Norway)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jan Mayen (Norway)")]
+        [InternetDomainCode("Unknown")]
+        JanMayenNorway = 109,
+
+
+        /// <summary>
+        /// Japan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Japan")]
+        [InternetDomainCode("JP")]
+        Japan = 110,
+
+
+        /// <summary>
+        /// Jarvis Island (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jarvis Island (United States)")]
+        [InternetDomainCode("Unknown")]
+        JarvisIslandUnitedStates = 111,
+
+
+        /// <summary>
+        /// Jersey (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jersey (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        JerseyUnitedKingdom = 112,
+
+
+        /// <summary>
+        /// Johnston Atoll (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Johnston Atoll (United States)")]
+        [InternetDomainCode("Unknown")]
+        JohnstonAtollUnitedStates = 113,
+
+
+        /// <summary>
+        /// Jordan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jordan")]
+        [InternetDomainCode("JO")]
+        Jordan = 114,
+
+
+        /// <summary>
+        /// Juan de Nova Island
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Juan de Nova Island")]
+        [InternetDomainCode("Unknown")]
+        JuanDeNovaIsland = 115,
+
+
+        /// <summary>
+        /// Kazakhstan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kazakhstan")]
+        [InternetDomainCode("KZ")]
+        Kazakhstan = 252,
+
+
+        /// <summary>
+        /// Kenya
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kenya")]
+        [InternetDomainCode("KE")]
+        Kenya = 116,
+
+
+        /// <summary>
+        /// Kingman Reef (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kingman Reef (United States)")]
+        [InternetDomainCode("Unknown")]
+        KingmanReefUnitedStates = 117,
+
+
+        /// <summary>
+        /// Kiribati
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kiribati")]
+        [InternetDomainCode("KI")]
+        Kiribati = 118,
+
+
+        /// <summary>
+        /// Korea, Democratic People's Republic of (North)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Korea, Democratic People's Republic of (North)")]
+        [InternetDomainCode("Unknown")]
+        KoreaDemocraticPeopleSRepublicOfNorth = 119,
+
+
+        /// <summary>
+        /// Korea, Republic of (South)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Korea, Republic of (South)")]
+        [InternetDomainCode("Unknown")]
+        KoreaRepublicOfSouth = 120,
+
+
+        /// <summary>
+        /// Kuwait
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kuwait")]
+        [InternetDomainCode("KW")]
+        Kuwait = 121,
+
+
+        /// <summary>
+        /// Kyrgyzstan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kyrgyzstan")]
+        [InternetDomainCode("KG")]
+        Kyrgyzstan = 253,
+
+
+        /// <summary>
+        /// Laos
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Laos")]
+        [InternetDomainCode("LA")]
+        Laos = 122,
+
+
+        /// <summary>
+        /// Latvia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Latvia")]
+        [InternetDomainCode("LV")]
+        Latvia = 254,
+
+
+        /// <summary>
+        /// Lebanon
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lebanon")]
+        [InternetDomainCode("LB")]
+        Lebanon = 123,
+
+
+        /// <summary>
+        /// Lesotho
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lesotho")]
+        [InternetDomainCode("LS")]
+        Lesotho = 124,
+
+
+        /// <summary>
+        /// Liberia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Liberia")]
+        [InternetDomainCode("LR")]
+        Liberia = 125,
+
+
+        /// <summary>
+        /// Libya
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Libya")]
+        [InternetDomainCode("LY")]
+        Libya = 126,
+
+
+        /// <summary>
+        /// Liechtenstein
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Liechtenstein")]
+        [InternetDomainCode("LI")]
+        Liechtenstein = 127,
+
+
+        /// <summary>
+        /// Lithuania
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lithuania")]
+        [InternetDomainCode("LT")]
+        Lithuania = 255,
+
+
+        /// <summary>
+        /// Luxembourg
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Luxembourg")]
+        [InternetDomainCode("LU")]
+        Luxembourg = 128,
+
+
+        /// <summary>
+        /// Macau (Portugal)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Macau (Portugal)")]
+        [InternetDomainCode("Unknown")]
+        MacauPortugal = 130,
+
+
+        /// <summary>
+        /// Macedonia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Macedonia")]
+        [InternetDomainCode("MK")]
+        Macedonia = 256,
+
+
+        /// <summary>
+        /// Madagascar
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Madagascar")]
+        [InternetDomainCode("MG")]
+        Madagascar = 129,
+
+
+        /// <summary>
+        /// Malawi
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malawi")]
+        [InternetDomainCode("MW")]
+        Malawi = 131,
+
+
+        /// <summary>
+        /// Malaysia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malaysia")]
+        [InternetDomainCode("MY")]
+        Malaysia = 132,
+
+
+        /// <summary>
+        /// Maldives
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Maldives")]
+        [InternetDomainCode("MV")]
+        Maldives = 133,
+
+
+        /// <summary>
+        /// Mali
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mali")]
+        [InternetDomainCode("ML")]
+        Mali = 134,
+
+
+        /// <summary>
+        /// Malta
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malta")]
+        [InternetDomainCode("MT")]
+        Malta = 135,
+
+
+        /// <summary>
+        /// Man, Isle of (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Man, Isle of (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        ManIsleOfUnitedKingdom = 136,
+
+
+        /// <summary>
+        /// Marshall Islands
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marshall Islands")]
+        [InternetDomainCode("MH")]
+        MarshallIslands = 137,
+
+
+        /// <summary>
+        /// Martinique (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Martinique (France)")]
+        [InternetDomainCode("Unknown")]
+        MartiniqueFrance = 138,
+
+
+        /// <summary>
+        /// Mauritania
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mauritania")]
+        [InternetDomainCode("MR")]
+        Mauritania = 139,
+
+
+        /// <summary>
+        /// Mauritius
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mauritius")]
+        [InternetDomainCode("MU")]
+        Mauritius = 140,
+
+
+        /// <summary>
+        /// Mayotte (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mayotte (France)")]
+        [InternetDomainCode("Unknown")]
+        MayotteFrance = 141,
+
+
+        /// <summary>
+        /// Mexico
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mexico")]
+        [InternetDomainCode("MX")]
+        Mexico = 142,
+
+
+        /// <summary>
+        /// Micronesia, Federative States of
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Micronesia, Federative States of")]
+        [InternetDomainCode("Unknown")]
+        MicronesiaFederativeStatesOf = 143,
+
+
+        /// <summary>
+        /// Midway Islands (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Midway Islands (United States)")]
+        [InternetDomainCode("Unknown")]
+        MidwayIslandsUnitedStates = 257,
+
+
+        /// <summary>
+        /// Moldova
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moldova")]
+        [InternetDomainCode("MD")]
+        Moldova = 258,
+
+
+        /// <summary>
+        /// Monaco
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Monaco")]
+        [InternetDomainCode("MC")]
+        Monaco = 144,
+
+
+        /// <summary>
+        /// Mongolia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mongolia")]
+        [InternetDomainCode("MN")]
+        Mongolia = 145,
+
+
+        /// <summary>
+        /// Montenegro
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Montenegro")]
+        [InternetDomainCode("Unknown")]
+        Montenegro = 259,
+
+
+        /// <summary>
+        /// Montserrat (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Montserrat (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        MontserratUnitedKingdom = 146,
+
+
+        /// <summary>
+        /// Morocco
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Morocco")]
+        [InternetDomainCode("MA")]
+        Morocco = 147,
+
+
+        /// <summary>
+        /// Mozambique
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mozambique")]
+        [InternetDomainCode("MZ")]
+        Mozambique = 148,
+
+
+        /// <summary>
+        /// Myanmar (aka Burma)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Myanmar (aka Burma)")]
+        [InternetDomainCode("Unknown")]
+        MyanmarAkaBurma = 35,
+
+
+        /// <summary>
+        /// Namibia (South West Africa)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Namibia (South West Africa)")]
+        [InternetDomainCode("Unknown")]
+        NamibiaSouthWestAfrica = 149,
+
+
+        /// <summary>
+        /// Nauru
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nauru")]
+        [InternetDomainCode("NR")]
+        Nauru = 150,
+
+
+        /// <summary>
+        /// Navassa Island (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Navassa Island (United States)")]
+        [InternetDomainCode("Unknown")]
+        NavassaIslandUnitedStates = 151,
+
+
+        /// <summary>
+        /// Nepal
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nepal")]
+        [InternetDomainCode("NP")]
+        Nepal = 152,
+
+
+        /// <summary>
+        /// Netherlands
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Netherlands")]
+        [InternetDomainCode("NL")]
+        Netherlands = 153,
+
+
+        /// <summary>
+        /// Netherlands Antilles (Curacao, Bonaire, Saba, Sint Maarten Sint Eustatius)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Netherlands Antilles (Curacao, Bonaire, Saba, Sint Maarten Sint Eustatius)")]
+        [InternetDomainCode("Unknown")]
+        NetherlandsAntillesCuracaoBonaireSabaSintMaartenSintEustatius = 154,
+
+
+        /// <summary>
+        /// New Caledonia (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("New Caledonia (France)")]
+        [InternetDomainCode("Unknown")]
+        NewCaledoniaFrance = 155,
+
+
+        /// <summary>
+        /// New Zealand
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("New Zealand")]
+        [InternetDomainCode("Unknown")]
+        NewZealand = 156,
+
+
+        /// <summary>
+        /// Nicaragua
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nicaragua")]
+        [InternetDomainCode("NI")]
+        Nicaragua = 157,
+
+
+        /// <summary>
+        /// Niger
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Niger")]
+        [InternetDomainCode("NE")]
+        Niger = 158,
+
+
+        /// <summary>
+        /// Nigeria
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nigeria")]
+        [InternetDomainCode("NG")]
+        Nigeria = 159,
+
+
+        /// <summary>
+        /// Niue (New Zealand)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Niue (New Zealand)")]
+        [InternetDomainCode("Unknown")]
+        NiueNewZealand = 160,
+
+
+        /// <summary>
+        /// Norfolk Island (Australia)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Norfolk Island (Australia)")]
+        [InternetDomainCode("Unknown")]
+        NorfolkIslandAustralia = 161,
+
+
+        /// <summary>
+        /// Northern Mariana Islands (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Northern Mariana Islands (United States)")]
+        [InternetDomainCode("Unknown")]
+        NorthernMarianaIslandsUnitedStates = 162,
+
+
+        /// <summary>
+        /// Norway
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Norway")]
+        [InternetDomainCode("NO")]
+        Norway = 163,
+
+
+        /// <summary>
+        /// Oman
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Oman")]
+        [InternetDomainCode("OM")]
+        Oman = 164,
+
+
+        /// <summary>
+        /// Pacific Islands, Trust Territory of the (Palau)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pacific Islands, Trust Territory of the (Palau)")]
+        [InternetDomainCode("Unknown")]
+        PacificIslandsTrustTerritoryOfThePalau = 216,
+
+
+        /// <summary>
+        /// Pakistan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pakistan")]
+        [InternetDomainCode("PK")]
+        Pakistan = 165,
+
+
+        /// <summary>
+        /// Palmyra Atoll (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Palmyra Atoll (United States)")]
+        [InternetDomainCode("Unknown")]
+        PalmyraAtollUnitedStates = 166,
+
+
+        /// <summary>
+        /// Panama
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Panama")]
+        [InternetDomainCode("PA")]
+        Panama = 168,
+
+
+        /// <summary>
+        /// Papua New Guinea
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Papua New Guinea")]
+        [InternetDomainCode("PG")]
+        PapuaNewGuinea = 169,
+
+
+        /// <summary>
+        /// Paracel Islands (International - Occupied by China, also claimed by Taiwan and Vietnam)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Paracel Islands (International - Occupied by China, also claimed by Taiwan and Vietnam)")]
+        [InternetDomainCode("Unknown")]
+        ParacelIslandsInternationalOccupiedByChinaAlsoClaimedByTaiwanAndVietnam = 170,
+
+
+        /// <summary>
+        /// Paraguay
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Paraguay")]
+        [InternetDomainCode("PY")]
+        Paraguay = 171,
+
+
+        /// <summary>
+        /// Peru
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Peru")]
+        [InternetDomainCode("PE")]
+        Peru = 172,
+
+
+        /// <summary>
+        /// Philippines
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Philippines")]
+        [InternetDomainCode("PH")]
+        Philippines = 173,
+
+
+        /// <summary>
+        /// Pitcairn Islands (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pitcairn Islands (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        PitcairnIslandsUnitedKingdom = 174,
+
+
+        /// <summary>
+        /// Poland
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Poland")]
+        [InternetDomainCode("PL")]
+        Poland = 175,
+
+
+        /// <summary>
+        /// Portugal
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Portugal")]
+        [InternetDomainCode("PT")]
+        Portugal = 176,
+
+
+        /// <summary>
+        /// Puerto Rico (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Puerto Rico (United States)")]
+        [InternetDomainCode("Unknown")]
+        PuertoRicoUnitedStates = 177,
+
+
+        /// <summary>
+        /// Qatar
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Qatar")]
+        [InternetDomainCode("QA")]
+        Qatar = 178,
+
+
+        /// <summary>
+        /// Reunion (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Reunion (France)")]
+        [InternetDomainCode("Unknown")]
+        ReunionFrance = 179,
+
+
+        /// <summary>
+        /// Romania
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Romania")]
+        [InternetDomainCode("RO")]
+        Romania = 180,
+
+
+        /// <summary>
+        /// Russia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Russia")]
+        [InternetDomainCode("Unknown")]
+        Russia = 260,
+
+
+        /// <summary>
+        /// Rwanda
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rwanda")]
+        [InternetDomainCode("RW")]
+        Rwanda = 181,
+
+
+        /// <summary>
+        /// St. Helena (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("St. Helena (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        StHelenaUnitedKingdom = 183,
+
+
+        /// <summary>
+        /// St. Lucia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("St. Lucia")]
+        [InternetDomainCode("Unknown")]
+        StLucia = 184,
+
+
+        /// <summary>
+        /// St. Vincent and the Grenadines
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("St. Vincent and the Grenadines")]
+        [InternetDomainCode("Unknown")]
+        StVincentAndTheGrenadines = 186,
+
+
+        /// <summary>
+        /// St. Kitts and Nevis
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("St. Kitts and Nevis")]
+        [InternetDomainCode("Unknown")]
+        StKittsAndNevis = 182,
+
+
+        /// <summary>
+        /// St. Pierre and Miquelon (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("St. Pierre and Miquelon (France)")]
+        [InternetDomainCode("Unknown")]
+        StPierreAndMiquelonFrance = 185,
+
+
+        /// <summary>
+        /// San Marino
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("San Marino")]
+        [InternetDomainCode("SM")]
+        SanMarino = 187,
+
+
+        /// <summary>
+        /// Sao Tome and Principe
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sao Tome and Principe")]
+        [InternetDomainCode("ST")]
+        SaoTomeAndPrincipe = 188,
+
+
+        /// <summary>
+        /// Saudi Arabia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Saudi Arabia")]
+        [InternetDomainCode("SA")]
+        SaudiArabia = 189,
+
+
+        /// <summary>
+        /// Senegal
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Senegal")]
+        [InternetDomainCode("SN")]
+        Senegal = 190,
+
+
+        /// <summary>
+        /// Serbia and Montenegro (Montenegro to separate)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Serbia and Montenegro (Montenegro to separate)")]
+        [InternetDomainCode("Unknown")]
+        SerbiaAndMontenegroMontenegroToSeparate = 261,
+
+
+        /// <summary>
+        /// Seychelles
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Seychelles")]
+        [InternetDomainCode("SC")]
+        Seychelles = 191,
+
+
+        /// <summary>
+        /// Sierra Leone
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sierra Leone")]
+        [InternetDomainCode("SL")]
+        SierraLeone = 192,
+
+
+        /// <summary>
+        /// Singapore
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Singapore")]
+        [InternetDomainCode("SG")]
+        Singapore = 193,
+
+
+        /// <summary>
+        /// Slovenia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Slovenia")]
+        [InternetDomainCode("SI")]
+        Slovenia = 262,
+
+
+        /// <summary>
+        /// Solomon Islands
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Solomon Islands")]
+        [InternetDomainCode("SB")]
+        SolomonIslands = 194,
+
+
+        /// <summary>
+        /// Somalia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Somalia")]
+        [InternetDomainCode("SO")]
+        Somalia = 195,
+
+
+        /// <summary>
+        /// South Africa
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("South Africa")]
+        [InternetDomainCode("ZA")]
+        SouthAfrica = 197,
+
+
+        /// <summary>
+        /// South Georgia and the South Sandwich Islands (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("South Georgia and the South Sandwich Islands (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        SouthGeorgiaAndTheSouthSandwichIslandsUnitedKingdom = 196,
+
+
+        /// <summary>
+        /// Spain
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spain")]
+        [InternetDomainCode("ES")]
+        Spain = 198,
+
+
+        /// <summary>
+        /// Spratly Islands (International - parts occupied and claimed by China,Malaysia, Philippines, Taiwan, Vietnam)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spratly Islands (International - parts occupied and claimed by China,Malaysia, Philippines, Taiwan, Vietnam)")]
+        [InternetDomainCode("Unknown")]
+        SpratlyIslandsInternationalPartsOccupiedAndClaimedByChinaMalaysiaPhilippinesTaiwanVietnam = 199,
+
+
+        /// <summary>
+        /// Sri Lanka
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sri Lanka")]
+        [InternetDomainCode("LK")]
+        SriLanka = 200,
+
+
+        /// <summary>
+        /// Sudan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sudan")]
+        [InternetDomainCode("SD")]
+        Sudan = 201,
+
+
+        /// <summary>
+        /// Suriname
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Suriname")]
+        [InternetDomainCode("SR")]
+        Suriname = 202,
+
+
+        /// <summary>
+        /// Svalbard (Norway)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Svalbard (Norway)")]
+        [InternetDomainCode("Unknown")]
+        SvalbardNorway = 203,
+
+
+        /// <summary>
+        /// Swaziland
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Swaziland")]
+        [InternetDomainCode("SZ")]
+        Swaziland = 204,
+
+
+        /// <summary>
+        /// Sweden
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sweden")]
+        [InternetDomainCode("SE")]
+        Sweden = 205,
+
+
+        /// <summary>
+        /// Switzerland
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Switzerland")]
+        [InternetDomainCode("CH")]
+        Switzerland = 206,
+
+
+        /// <summary>
+        /// Syria
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Syria")]
+        [InternetDomainCode("SY")]
+        Syria = 207,
+
+
+        /// <summary>
+        /// Taiwan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Taiwan")]
+        [InternetDomainCode("TW")]
+        Taiwan = 208,
+
+
+        /// <summary>
+        /// Tajikistan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tajikistan")]
+        [InternetDomainCode("TJ")]
+        Tajikistan = 263,
+
+
+        /// <summary>
+        /// Tanzania
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tanzania")]
+        [InternetDomainCode("TZ")]
+        Tanzania = 209,
+
+
+        /// <summary>
+        /// Thailand
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thailand")]
+        [InternetDomainCode("TH")]
+        Thailand = 210,
+
+
+        /// <summary>
+        /// Togo
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Togo")]
+        [InternetDomainCode("TG")]
+        Togo = 211,
+
+
+        /// <summary>
+        /// Tokelau (New Zealand)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tokelau (New Zealand)")]
+        [InternetDomainCode("Unknown")]
+        TokelauNewZealand = 212,
+
+
+        /// <summary>
+        /// Tonga
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tonga")]
+        [InternetDomainCode("TO")]
+        Tonga = 213,
+
+
+        /// <summary>
+        /// Trinidad and Tobago
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trinidad and Tobago")]
+        [InternetDomainCode("TT")]
+        TrinidadAndTobago = 214,
+
+
+        /// <summary>
+        /// Tromelin Island (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tromelin Island (France)")]
+        [InternetDomainCode("Unknown")]
+        TromelinIslandFrance = 215,
+
+
+        /// <summary>
+        /// Tunisia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tunisia")]
+        [InternetDomainCode("TN")]
+        Tunisia = 217,
+
+
+        /// <summary>
+        /// Turkey
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Turkey")]
+        [InternetDomainCode("TR")]
+        Turkey = 218,
+
+
+        /// <summary>
+        /// Turkmenistan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Turkmenistan")]
+        [InternetDomainCode("TM")]
+        Turkmenistan = 264,
+
+
+        /// <summary>
+        /// Turks and Caicos Islands (United Kingdom)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Turks and Caicos Islands (United Kingdom)")]
+        [InternetDomainCode("Unknown")]
+        TurksAndCaicosIslandsUnitedKingdom = 219,
+
+
+        /// <summary>
+        /// Tuvalu
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tuvalu")]
+        [InternetDomainCode("TV")]
+        Tuvalu = 220,
+
+
+        /// <summary>
+        /// Uganda
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Uganda")]
+        [InternetDomainCode("UG")]
+        Uganda = 221,
+
+
+        /// <summary>
+        /// Ukraine
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ukraine")]
+        [InternetDomainCode("UA")]
+        Ukraine = 265,
+
+
+        /// <summary>
+        /// United Arab Emirates
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("United Arab Emirates")]
+        [InternetDomainCode("AE")]
+        UnitedArabEmirates = 223,
+
+
+        /// <summary>
+        /// United Kingdom
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("United Kingdom")]
+        [InternetDomainCode("UK")]
+        UnitedKingdom = 224,
+
+
+        /// <summary>
+        /// United States
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("United States")]
+        [InternetDomainCode("US")]
+        UnitedStates = 225,
+
+
+        /// <summary>
+        /// Upper Volta (aka Burkina or Burkina Faso)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Upper Volta (aka Burkina or Burkina Faso)")]
+        [InternetDomainCode("Unknown")]
+        UpperVoltaAkaBurkinaOrBurkinaFaso = 34,
+
+
+        /// <summary>
+        /// Uruguay
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Uruguay")]
+        [InternetDomainCode("UY")]
+        Uruguay = 226,
+
+
+        /// <summary>
+        /// Uzbekistan
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Uzbekistan")]
+        [InternetDomainCode("UZ")]
+        Uzbekistan = 266,
+
+
+        /// <summary>
+        /// Vanuatu
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vanuatu")]
+        [InternetDomainCode("VU")]
+        Vanuatu = 227,
+
+
+        /// <summary>
+        /// Vatican City (Holy See)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vatican City (Holy See)")]
+        [InternetDomainCode("Unknown")]
+        VaticanCityHolySee = 228,
+
+
+        /// <summary>
+        /// Venezuela
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Venezuela")]
+        [InternetDomainCode("VE")]
+        Venezuela = 229,
+
+
+        /// <summary>
+        /// Vietnam
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vietnam")]
+        [InternetDomainCode("Unknown")]
+        Vietnam = 230,
+
+
+        /// <summary>
+        /// Virgin Islands (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Virgin Islands (United States)")]
+        [InternetDomainCode("Unknown")]
+        VirginIslandsUnitedStates = 231,
+
+
+        /// <summary>
+        /// Wake Island (United States)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wake Island (United States)")]
+        [InternetDomainCode("Unknown")]
+        WakeIslandUnitedStates = 232,
+
+
+        /// <summary>
+        /// Wallis and Futuna (France)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wallis and Futuna (France)")]
+        [InternetDomainCode("Unknown")]
+        WallisAndFutunaFrance = 233,
+
+
+        /// <summary>
+        /// West Bank (Israel)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("West Bank (Israel)")]
+        [InternetDomainCode("Unknown")]
+        WestBankIsrael = 235,
+
+
+        /// <summary>
+        /// Western Sahara
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Western Sahara")]
+        [InternetDomainCode("EH")]
+        WesternSahara = 234,
+
+
+        /// <summary>
+        /// Western Samoa
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Western Samoa")]
+        [InternetDomainCode("Unknown")]
+        WesternSamoa = 236,
+
+
+        /// <summary>
+        /// Yemen
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Yemen")]
+        [InternetDomainCode("YE")]
+        Yemen = 237,
+
+
+        /// <summary>
+        /// Serbia and Montenegro
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Serbia and Montenegro")]
+        [InternetDomainCode("CS")]
+        SerbiaAndMontenegro = 240,
+
+
+        /// <summary>
+        /// Zaire
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Zaire")]
+        [InternetDomainCode("Unknown")]
+        Zaire = 241,
+
+
+        /// <summary>
+        /// Zambia
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Zambia")]
+        [InternetDomainCode("ZM")]
+        Zambia = 242,
+
+
+        /// <summary>
+        /// Zimbabwe
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Zimbabwe")]
+        [InternetDomainCode("ZW")]
+        Zimbabwe = 243
+
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/InformationLayers.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/InformationLayers.cs
index 6950d61..68372b9 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/InformationLayers.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/InformationLayers.cs
@@ -1,50 +1,50 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for InformationLayers (der.iff.infolayers, Information Layers, 
-    /// section 8.3.1.2.10)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum InformationLayers : byte
-    {
-        /// <summary>
-        /// Set bit means 'Present', reset bit means 'Not Present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Present', reset bit means 'Not Present'.")]
-        Layer1 = 2,
-
-        /// <summary>
-        /// Set bit means 'Present', reset bit means 'Not Present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Present', reset bit means 'Not Present'.")]
-        Layer2 = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for InformationLayers (der.iff.infolayers, Information Layers, 
+    /// section 8.3.1.2.10)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum InformationLayers : byte
+    {
+        /// <summary>
+        /// Set bit means 'Present', reset bit means 'Not Present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Present', reset bit means 'Not Present'.")]
+        Layer1 = 2,
+
+        /// <summary>
+        /// Set bit means 'Present', reset bit means 'Not Present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Present', reset bit means 'Not Present'.")]
+        Layer2 = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
index 99afb15..1dbc4e3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/LayerSpecificInformation.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for LayerSpecificInformation (der.iff.layerspecific, Layer Specific Information, 
-    /// section 8.3.1.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum LayerSpecificInformation : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for LayerSpecificInformation (der.iff.layerspecific, Layer Specific Information, 
+    /// section 8.3.1.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum LayerSpecificInformation : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemMode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemMode.cs
index 3a3efb3..4198277 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemMode.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemMode.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for SystemMode (der.iff.mode, System Mode, 
-    /// section 8.3.1.1.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SystemMode : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for SystemMode (der.iff.mode, System Mode, 
+    /// section 8.3.1.1.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SystemMode : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemName.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemName.cs
index f92a4e4..826e9f1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemName.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemName.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for SystemName (der.iff.name, System Name, 
-    /// section 8.3.1.1.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SystemName : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Mark X.  applies-to: 1,2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mark X.  applies-to: 1,2.")]
-        MarkXAppliesTo12 = 1,
-
-        /// <summary>
-        /// Mark XII.  applies-to: 1,2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mark XII.  applies-to: 1,2.")]
-        MarkXIIAppliesTo12 = 2,
-
-        /// <summary>
-        /// ATCRBS.  applies-to: 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ATCRBS.  applies-to: 2.")]
-        ATCRBSAppliesTo2 = 3,
-
-        /// <summary>
-        /// Soviet.  applies-to: 3,4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Soviet.  applies-to: 3,4.")]
-        SovietAppliesTo34 = 4,
-
-        /// <summary>
-        /// Mode S.  applies-to: 1,2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mode S.  applies-to: 1,2.")]
-        ModeSAppliesTo12 = 5,
-
-        /// <summary>
-        /// Mark X/XII/ATCRBS.  applies-to: 1,2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mark X/XII/ATCRBS.  applies-to: 1,2.")]
-        MarkXXIIATCRBSAppliesTo12 = 6,
-
-        /// <summary>
-        /// Mark X/XII/ATCRBS/Mode S.  applies-to: 1,2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mark X/XII/ATCRBS/Mode S.  applies-to: 1,2.")]
-        MarkXXIIATCRBSModeSAppliesTo12 = 7,
-
-        /// <summary>
-        /// ARI 5954.  applies-to: 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARI 5954.  applies-to: 5.")]
-        ARI5954AppliesTo5 = 8,
-
-        /// <summary>
-        /// ARI 5983.  applies-to: 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARI 5983.  applies-to: 5.")]
-        ARI5983AppliesTo5 = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for SystemName (der.iff.name, System Name, 
+    /// section 8.3.1.1.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SystemName : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Mark X.  applies-to: 1,2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mark X.  applies-to: 1,2.")]
+        MarkXAppliesTo12 = 1,
+
+        /// <summary>
+        /// Mark XII.  applies-to: 1,2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mark XII.  applies-to: 1,2.")]
+        MarkXIIAppliesTo12 = 2,
+
+        /// <summary>
+        /// ATCRBS.  applies-to: 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ATCRBS.  applies-to: 2.")]
+        ATCRBSAppliesTo2 = 3,
+
+        /// <summary>
+        /// Soviet.  applies-to: 3,4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Soviet.  applies-to: 3,4.")]
+        SovietAppliesTo34 = 4,
+
+        /// <summary>
+        /// Mode S.  applies-to: 1,2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mode S.  applies-to: 1,2.")]
+        ModeSAppliesTo12 = 5,
+
+        /// <summary>
+        /// Mark X/XII/ATCRBS.  applies-to: 1,2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mark X/XII/ATCRBS.  applies-to: 1,2.")]
+        MarkXXIIATCRBSAppliesTo12 = 6,
+
+        /// <summary>
+        /// Mark X/XII/ATCRBS/Mode S.  applies-to: 1,2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mark X/XII/ATCRBS/Mode S.  applies-to: 1,2.")]
+        MarkXXIIATCRBSModeSAppliesTo12 = 7,
+
+        /// <summary>
+        /// ARI 5954.  applies-to: 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARI 5954.  applies-to: 5.")]
+        ARI5954AppliesTo5 = 8,
+
+        /// <summary>
+        /// ARI 5983.  applies-to: 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARI 5983.  applies-to: 5.")]
+        ARI5983AppliesTo5 = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemStatus.cs
index 339df94..6887dc3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemStatus.cs
@@ -1,110 +1,110 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for SystemStatus (der.iff.fop.status, System Status, 
-    /// section 8.3.1.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum SystemStatus : byte
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        SystemOnOff = 1,
-
-        /// <summary>
-        /// Set bit means 'Not capable', reset bit means 'Capable'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
-        Parameter1 = 2,
-
-        /// <summary>
-        /// Set bit means 'Not capable', reset bit means 'Capable'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
-        Parameter2 = 4,
-
-        /// <summary>
-        /// Set bit means 'Not capable', reset bit means 'Capable'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
-        Parameter3 = 8,
-
-        /// <summary>
-        /// Set bit means 'Not capable', reset bit means 'Capable'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
-        Parameter4 = 16,
-
-        /// <summary>
-        /// Set bit means 'Not capable', reset bit means 'Capable'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
-        Parameter5 = 32,
-
-        /// <summary>
-        /// Set bit means 'Not capable', reset bit means 'Capable'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
-        Parameter6 = 64,
-
-        /// <summary>
-        /// Set bit means 'System failed', reset bit means 'Operational'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'System failed', reset bit means 'Operational'.")]
-        OperationalStatus = 128
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for SystemStatus (der.iff.fop.status, System Status, 
+    /// section 8.3.1.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum SystemStatus : byte
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        SystemOnOff = 1,
+
+        /// <summary>
+        /// Set bit means 'Not capable', reset bit means 'Capable'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
+        Parameter1 = 2,
+
+        /// <summary>
+        /// Set bit means 'Not capable', reset bit means 'Capable'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
+        Parameter2 = 4,
+
+        /// <summary>
+        /// Set bit means 'Not capable', reset bit means 'Capable'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
+        Parameter3 = 8,
+
+        /// <summary>
+        /// Set bit means 'Not capable', reset bit means 'Capable'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
+        Parameter4 = 16,
+
+        /// <summary>
+        /// Set bit means 'Not capable', reset bit means 'Capable'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
+        Parameter5 = 32,
+
+        /// <summary>
+        /// Set bit means 'Not capable', reset bit means 'Capable'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Not capable', reset bit means 'Capable'.")]
+        Parameter6 = 64,
+
+        /// <summary>
+        /// Set bit means 'System failed', reset bit means 'Operational'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'System failed', reset bit means 'Operational'.")]
+        OperationalStatus = 128
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemType.cs
index f3630d9..4dfedb2 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/SystemType.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/SystemType.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for SystemType (der.iff.type, System Type, 
-    /// section 8.3.1.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SystemType : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Mark X/XII/ATCRBS/Mode S Transponder.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mark X/XII/ATCRBS/Mode S Transponder.")]
-        MarkXXIIATCRBSModeSTransponder = 1,
-
-        /// <summary>
-        /// Mark X/XII/ATCRBS/Mode S Interrogator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mark X/XII/ATCRBS/Mode S Interrogator.")]
-        MarkXXIIATCRBSModeSInterrogator = 2,
-
-        /// <summary>
-        /// Soviet Transponder.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Soviet Transponder.")]
-        SovietTransponder = 3,
-
-        /// <summary>
-        /// Soviet Interrogator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Soviet Interrogator.")]
-        SovietInterrogator = 4,
-
-        /// <summary>
-        /// RRB Transponder.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RRB Transponder.")]
-        RRBTransponder = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for SystemType (der.iff.type, System Type, 
+    /// section 8.3.1.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SystemType : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Mark X/XII/ATCRBS/Mode S Transponder.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mark X/XII/ATCRBS/Mode S Transponder.")]
+        MarkXXIIATCRBSModeSTransponder = 1,
+
+        /// <summary>
+        /// Mark X/XII/ATCRBS/Mode S Interrogator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mark X/XII/ATCRBS/Mode S Interrogator.")]
+        MarkXXIIATCRBSModeSInterrogator = 2,
+
+        /// <summary>
+        /// Soviet Transponder.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Soviet Transponder.")]
+        SovietTransponder = 3,
+
+        /// <summary>
+        /// Soviet Interrogator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Soviet Interrogator.")]
+        SovietInterrogator = 4,
+
+        /// <summary>
+        /// RRB Transponder.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RRB Transponder.")]
+        RRBTransponder = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
index 5ecd1ee..fe38c1a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1AlternateParameter4.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1AlternateParameter4 (der.iff.type.1.fop.altp4, Alternate Parameter 4, 
-    /// section 8.3.1.2.9)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type1AlternateParameter4 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Valid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Valid.")]
-        Valid = 1,
-
-        /// <summary>
-        /// Invalid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Invalid.")]
-        Invalid = 2,
-
-        /// <summary>
-        /// No response.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("No response.")]
-        NoResponse = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1AlternateParameter4 (der.iff.type.1.fop.altp4, Alternate Parameter 4, 
+    /// section 8.3.1.2.9)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type1AlternateParameter4 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Valid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Valid.")]
+        Valid = 1,
+
+        /// <summary>
+        /// Invalid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Invalid.")]
+        Invalid = 2,
+
+        /// <summary>
+        /// No response.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("No response.")]
+        NoResponse = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
index d839988..58cab59 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1ChangeOptions.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1ChangeOptions (der.iff.type.1.changeoptions, Change/Options, 
-    /// section 8.3.1.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type1ChangeOptions : byte
-    {
-        /// <summary>
-        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
-        ChangeIndicator = 1,
-
-        /// <summary>
-        /// Set bit means 'Yes', reset bit means 'No'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Yes', reset bit means 'No'.")]
-        AlternateMode4 = 2,
-
-        /// <summary>
-        /// Set bit means 'Yes', reset bit means 'No'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Yes', reset bit means 'No'.")]
-        AlternateModeC = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1ChangeOptions (der.iff.type.1.changeoptions, Change/Options, 
+    /// section 8.3.1.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type1ChangeOptions : byte
+    {
+        /// <summary>
+        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
+        ChangeIndicator = 1,
+
+        /// <summary>
+        /// Set bit means 'Yes', reset bit means 'No'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Yes', reset bit means 'No'.")]
+        AlternateMode4 = 2,
+
+        /// <summary>
+        /// Set bit means 'Yes', reset bit means 'No'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Yes', reset bit means 'No'.")]
+        AlternateModeC = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
index 83e1f6f..a9576bc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Modifier.cs
@@ -1,70 +1,70 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1Modifier (der.iff.type.1.fop.modifier, Modifier, 
-    /// section 8.3.1.2.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type1Modifier : byte
-    {
-        /// <summary>
-        /// Value of 0
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value of 0")]
-        Other = 1,
-
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Emergency = 2,
-
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        IdentSquawkFlash = 4,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        STI = 8
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1Modifier (der.iff.type.1.fop.modifier, Modifier, 
+    /// section 8.3.1.2.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type1Modifier : byte
+    {
+        /// <summary>
+        /// Value of 0
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value of 0")]
+        Other = 1,
+
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Emergency = 2,
+
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        IdentSquawkFlash = 4,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        STI = 8
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
index ac75502..b7e92c2 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1OperationalParameter1.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1OperationalParameter1 (der.iff.type.1.sop.param1, Operational Parameter 1, 
-    /// section 8.3.1.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type1OperationalParameter1 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1OperationalParameter1 (der.iff.type.1.sop.param1, Operational Parameter 1, 
+    /// section 8.3.1.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type1OperationalParameter1 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
index e604cd9..e65e22f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1OperationalParameter2.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1OperationalParameter2 (der.iff.type.1.sop.param2, Operational Parameter 2, 
-    /// section 8.3.1.4.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type1OperationalParameter2 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1OperationalParameter2 (der.iff.type.1.sop.param2, Operational Parameter 2, 
+    /// section 8.3.1.4.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type1OperationalParameter2 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
index 72439f8..9100813 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter1Mode1CodeStatus.cs
@@ -1,361 +1,361 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1Parameter1Mode1CodeStatus (der.iff.type.1.fop.param1, Parameter 1 - Mode 1 Code/Status, 
-    /// section 8.3.1.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Type1Parameter1Mode1CodeStatus
-    {
-        /// <summary>
-        /// Status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status")]
-        public enum StatusValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Damage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damage
-            /// </summary>
-            Damage = 1
-        }
-
-        /// <summary>
-        /// Malfunction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malfunction")]
-        public enum MalfunctionValue : uint
-        {
-            /// <summary>
-            /// No malfunction
-            /// </summary>
-            NoMalfunction = 0,
-
-            /// <summary>
-            /// Malfunction
-            /// </summary>
-            Malfunction = 1
-        }
-
-        private byte codeElement1;
-        private byte codeElement2;
-        private Type1Parameter1Mode1CodeStatus.StatusValue status;
-        private Type1Parameter1Mode1CodeStatus.DamageValue damage;
-        private Type1Parameter1Mode1CodeStatus.MalfunctionValue malfunction;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Type1Parameter1Mode1CodeStatus left, Type1Parameter1Mode1CodeStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Type1Parameter1Mode1CodeStatus left, Type1Parameter1Mode1CodeStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Type1Parameter1Mode1CodeStatus obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Type1Parameter1Mode1CodeStatus(ushort value)
-        {
-            return Type1Parameter1Mode1CodeStatus.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Type1Parameter1Mode1CodeStatus FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance, represented by the ushort value.</returns>
-        public static Type1Parameter1Mode1CodeStatus FromUInt16(ushort value)
-        {
-            Type1Parameter1Mode1CodeStatus ps = new Type1Parameter1Mode1CodeStatus();
-
-            uint mask0 = 0x0007;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.CodeElement1 = (byte)newValue0;
-
-            uint mask1 = 0x0038;
-            byte shift1 = 3;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.CodeElement2 = (byte)newValue1;
-
-            uint mask4 = 0x2000;
-            byte shift4 = 13;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Status = (Type1Parameter1Mode1CodeStatus.StatusValue)newValue4;
-
-            uint mask5 = 0x4000;
-            byte shift5 = 14;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.Damage = (Type1Parameter1Mode1CodeStatus.DamageValue)newValue5;
-
-            uint mask6 = 0x8000;
-            byte shift6 = 15;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Malfunction = (Type1Parameter1Mode1CodeStatus.MalfunctionValue)newValue6;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement1.
-        /// </summary>
-        /// <value>The codeelement1.</value>
-        public byte CodeElement1
-        {
-            get { return this.codeElement1; }
-            set { this.codeElement1 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement2.
-        /// </summary>
-        /// <value>The codeelement2.</value>
-        public byte CodeElement2
-        {
-            get { return this.codeElement2; }
-            set { this.codeElement2 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public Type1Parameter1Mode1CodeStatus.StatusValue Status
-        {
-            get { return this.status; }
-            set { this.status = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public Type1Parameter1Mode1CodeStatus.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the malfunction.
-        /// </summary>
-        /// <value>The malfunction.</value>
-        public Type1Parameter1Mode1CodeStatus.MalfunctionValue Malfunction
-        {
-            get { return this.malfunction; }
-            set { this.malfunction = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Type1Parameter1Mode1CodeStatus))
-            {
-                return false;
-            }
-
-            return this.Equals((Type1Parameter1Mode1CodeStatus)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Type1Parameter1Mode1CodeStatus other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.CodeElement1 == other.CodeElement1 &&
-                this.CodeElement2 == other.CodeElement2 &&
-                this.Status == other.Status &&
-                this.Damage == other.Damage &&
-                this.Malfunction == other.Malfunction;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.CodeElement1 << 0);
-            val |= (ushort)((uint)this.CodeElement2 << 3);
-            val |= (ushort)((uint)this.Status << 13);
-            val |= (ushort)((uint)this.Damage << 14);
-            val |= (ushort)((uint)this.Malfunction << 15);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.CodeElement1.GetHashCode();
-                hash = (hash * 29) + this.CodeElement2.GetHashCode();
-                hash = (hash * 29) + this.Status.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Malfunction.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1Parameter1Mode1CodeStatus (der.iff.type.1.fop.param1, Parameter 1 - Mode 1 Code/Status, 
+    /// section 8.3.1.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Type1Parameter1Mode1CodeStatus
+    {
+        /// <summary>
+        /// Status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status")]
+        public enum StatusValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Damage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damage
+            /// </summary>
+            Damage = 1
+        }
+
+        /// <summary>
+        /// Malfunction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malfunction")]
+        public enum MalfunctionValue : uint
+        {
+            /// <summary>
+            /// No malfunction
+            /// </summary>
+            NoMalfunction = 0,
+
+            /// <summary>
+            /// Malfunction
+            /// </summary>
+            Malfunction = 1
+        }
+
+        private byte codeElement1;
+        private byte codeElement2;
+        private Type1Parameter1Mode1CodeStatus.StatusValue status;
+        private Type1Parameter1Mode1CodeStatus.DamageValue damage;
+        private Type1Parameter1Mode1CodeStatus.MalfunctionValue malfunction;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Type1Parameter1Mode1CodeStatus left, Type1Parameter1Mode1CodeStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Type1Parameter1Mode1CodeStatus left, Type1Parameter1Mode1CodeStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Type1Parameter1Mode1CodeStatus obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Type1Parameter1Mode1CodeStatus(ushort value)
+        {
+            return Type1Parameter1Mode1CodeStatus.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Type1Parameter1Mode1CodeStatus FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance, represented by the ushort value.</returns>
+        public static Type1Parameter1Mode1CodeStatus FromUInt16(ushort value)
+        {
+            Type1Parameter1Mode1CodeStatus ps = new Type1Parameter1Mode1CodeStatus();
+
+            uint mask0 = 0x0007;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.CodeElement1 = (byte)newValue0;
+
+            uint mask1 = 0x0038;
+            byte shift1 = 3;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.CodeElement2 = (byte)newValue1;
+
+            uint mask4 = 0x2000;
+            byte shift4 = 13;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Status = (Type1Parameter1Mode1CodeStatus.StatusValue)newValue4;
+
+            uint mask5 = 0x4000;
+            byte shift5 = 14;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.Damage = (Type1Parameter1Mode1CodeStatus.DamageValue)newValue5;
+
+            uint mask6 = 0x8000;
+            byte shift6 = 15;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Malfunction = (Type1Parameter1Mode1CodeStatus.MalfunctionValue)newValue6;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement1.
+        /// </summary>
+        /// <value>The codeelement1.</value>
+        public byte CodeElement1
+        {
+            get { return this.codeElement1; }
+            set { this.codeElement1 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement2.
+        /// </summary>
+        /// <value>The codeelement2.</value>
+        public byte CodeElement2
+        {
+            get { return this.codeElement2; }
+            set { this.codeElement2 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public Type1Parameter1Mode1CodeStatus.StatusValue Status
+        {
+            get { return this.status; }
+            set { this.status = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public Type1Parameter1Mode1CodeStatus.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the malfunction.
+        /// </summary>
+        /// <value>The malfunction.</value>
+        public Type1Parameter1Mode1CodeStatus.MalfunctionValue Malfunction
+        {
+            get { return this.malfunction; }
+            set { this.malfunction = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Type1Parameter1Mode1CodeStatus))
+            {
+                return false;
+            }
+
+            return this.Equals((Type1Parameter1Mode1CodeStatus)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Type1Parameter1Mode1CodeStatus other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.CodeElement1 == other.CodeElement1 &&
+                this.CodeElement2 == other.CodeElement2 &&
+                this.Status == other.Status &&
+                this.Damage == other.Damage &&
+                this.Malfunction == other.Malfunction;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter1Mode1CodeStatus"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.CodeElement1 << 0);
+            val |= (ushort)((uint)this.CodeElement2 << 3);
+            val |= (ushort)((uint)this.Status << 13);
+            val |= (ushort)((uint)this.Damage << 14);
+            val |= (ushort)((uint)this.Malfunction << 15);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.CodeElement1.GetHashCode();
+                hash = (hash * 29) + this.CodeElement2.GetHashCode();
+                hash = (hash * 29) + this.Status.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Malfunction.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
index 7927c88..9b58fbe 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter2Mode2CodeStatus.cs
@@ -1,399 +1,399 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1Parameter2Mode2CodeStatus (der.iff.type.1.fop.param2, Parameter 2 - Mode 2 Code/Status, 
-    /// section 8.3.1.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Type1Parameter2Mode2CodeStatus
-    {
-        /// <summary>
-        /// Status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status")]
-        public enum StatusValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Damage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damage
-            /// </summary>
-            Damage = 1
-        }
-
-        /// <summary>
-        /// Malfunction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malfunction")]
-        public enum MalfunctionValue : uint
-        {
-            /// <summary>
-            /// No malfunction
-            /// </summary>
-            NoMalfunction = 0,
-
-            /// <summary>
-            /// Malfunction
-            /// </summary>
-            Malfunction = 1
-        }
-
-        private byte codeElement1;
-        private byte codeElement2;
-        private byte codeElement3;
-        private byte codeElement4;
-        private Type1Parameter2Mode2CodeStatus.StatusValue status;
-        private Type1Parameter2Mode2CodeStatus.DamageValue damage;
-        private Type1Parameter2Mode2CodeStatus.MalfunctionValue malfunction;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Type1Parameter2Mode2CodeStatus left, Type1Parameter2Mode2CodeStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Type1Parameter2Mode2CodeStatus left, Type1Parameter2Mode2CodeStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Type1Parameter2Mode2CodeStatus obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Type1Parameter2Mode2CodeStatus(ushort value)
-        {
-            return Type1Parameter2Mode2CodeStatus.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Type1Parameter2Mode2CodeStatus FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance, represented by the ushort value.</returns>
-        public static Type1Parameter2Mode2CodeStatus FromUInt16(ushort value)
-        {
-            Type1Parameter2Mode2CodeStatus ps = new Type1Parameter2Mode2CodeStatus();
-
-            uint mask0 = 0x0007;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.CodeElement1 = (byte)newValue0;
-
-            uint mask1 = 0x0038;
-            byte shift1 = 3;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.CodeElement2 = (byte)newValue1;
-
-            uint mask2 = 0x01c0;
-            byte shift2 = 6;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.CodeElement3 = (byte)newValue2;
-
-            uint mask3 = 0x0e00;
-            byte shift3 = 9;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.CodeElement4 = (byte)newValue3;
-
-            uint mask5 = 0x2000;
-            byte shift5 = 13;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.Status = (Type1Parameter2Mode2CodeStatus.StatusValue)newValue5;
-
-            uint mask6 = 0x4000;
-            byte shift6 = 14;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Damage = (Type1Parameter2Mode2CodeStatus.DamageValue)newValue6;
-
-            uint mask7 = 0x8000;
-            byte shift7 = 15;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.Malfunction = (Type1Parameter2Mode2CodeStatus.MalfunctionValue)newValue7;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement1.
-        /// </summary>
-        /// <value>The codeelement1.</value>
-        public byte CodeElement1
-        {
-            get { return this.codeElement1; }
-            set { this.codeElement1 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement2.
-        /// </summary>
-        /// <value>The codeelement2.</value>
-        public byte CodeElement2
-        {
-            get { return this.codeElement2; }
-            set { this.codeElement2 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement3.
-        /// </summary>
-        /// <value>The codeelement3.</value>
-        public byte CodeElement3
-        {
-            get { return this.codeElement3; }
-            set { this.codeElement3 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement4.
-        /// </summary>
-        /// <value>The codeelement4.</value>
-        public byte CodeElement4
-        {
-            get { return this.codeElement4; }
-            set { this.codeElement4 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public Type1Parameter2Mode2CodeStatus.StatusValue Status
-        {
-            get { return this.status; }
-            set { this.status = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public Type1Parameter2Mode2CodeStatus.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the malfunction.
-        /// </summary>
-        /// <value>The malfunction.</value>
-        public Type1Parameter2Mode2CodeStatus.MalfunctionValue Malfunction
-        {
-            get { return this.malfunction; }
-            set { this.malfunction = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Type1Parameter2Mode2CodeStatus))
-            {
-                return false;
-            }
-
-            return this.Equals((Type1Parameter2Mode2CodeStatus)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Type1Parameter2Mode2CodeStatus other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.CodeElement1 == other.CodeElement1 &&
-                this.CodeElement2 == other.CodeElement2 &&
-                this.CodeElement3 == other.CodeElement3 &&
-                this.CodeElement4 == other.CodeElement4 &&
-                this.Status == other.Status &&
-                this.Damage == other.Damage &&
-                this.Malfunction == other.Malfunction;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.CodeElement1 << 0);
-            val |= (ushort)((uint)this.CodeElement2 << 3);
-            val |= (ushort)((uint)this.CodeElement3 << 6);
-            val |= (ushort)((uint)this.CodeElement4 << 9);
-            val |= (ushort)((uint)this.Status << 13);
-            val |= (ushort)((uint)this.Damage << 14);
-            val |= (ushort)((uint)this.Malfunction << 15);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.CodeElement1.GetHashCode();
-                hash = (hash * 29) + this.CodeElement2.GetHashCode();
-                hash = (hash * 29) + this.CodeElement3.GetHashCode();
-                hash = (hash * 29) + this.CodeElement4.GetHashCode();
-                hash = (hash * 29) + this.Status.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Malfunction.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1Parameter2Mode2CodeStatus (der.iff.type.1.fop.param2, Parameter 2 - Mode 2 Code/Status, 
+    /// section 8.3.1.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Type1Parameter2Mode2CodeStatus
+    {
+        /// <summary>
+        /// Status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status")]
+        public enum StatusValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Damage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damage
+            /// </summary>
+            Damage = 1
+        }
+
+        /// <summary>
+        /// Malfunction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malfunction")]
+        public enum MalfunctionValue : uint
+        {
+            /// <summary>
+            /// No malfunction
+            /// </summary>
+            NoMalfunction = 0,
+
+            /// <summary>
+            /// Malfunction
+            /// </summary>
+            Malfunction = 1
+        }
+
+        private byte codeElement1;
+        private byte codeElement2;
+        private byte codeElement3;
+        private byte codeElement4;
+        private Type1Parameter2Mode2CodeStatus.StatusValue status;
+        private Type1Parameter2Mode2CodeStatus.DamageValue damage;
+        private Type1Parameter2Mode2CodeStatus.MalfunctionValue malfunction;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Type1Parameter2Mode2CodeStatus left, Type1Parameter2Mode2CodeStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Type1Parameter2Mode2CodeStatus left, Type1Parameter2Mode2CodeStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Type1Parameter2Mode2CodeStatus obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Type1Parameter2Mode2CodeStatus(ushort value)
+        {
+            return Type1Parameter2Mode2CodeStatus.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Type1Parameter2Mode2CodeStatus FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance, represented by the ushort value.</returns>
+        public static Type1Parameter2Mode2CodeStatus FromUInt16(ushort value)
+        {
+            Type1Parameter2Mode2CodeStatus ps = new Type1Parameter2Mode2CodeStatus();
+
+            uint mask0 = 0x0007;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.CodeElement1 = (byte)newValue0;
+
+            uint mask1 = 0x0038;
+            byte shift1 = 3;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.CodeElement2 = (byte)newValue1;
+
+            uint mask2 = 0x01c0;
+            byte shift2 = 6;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.CodeElement3 = (byte)newValue2;
+
+            uint mask3 = 0x0e00;
+            byte shift3 = 9;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.CodeElement4 = (byte)newValue3;
+
+            uint mask5 = 0x2000;
+            byte shift5 = 13;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.Status = (Type1Parameter2Mode2CodeStatus.StatusValue)newValue5;
+
+            uint mask6 = 0x4000;
+            byte shift6 = 14;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Damage = (Type1Parameter2Mode2CodeStatus.DamageValue)newValue6;
+
+            uint mask7 = 0x8000;
+            byte shift7 = 15;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.Malfunction = (Type1Parameter2Mode2CodeStatus.MalfunctionValue)newValue7;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement1.
+        /// </summary>
+        /// <value>The codeelement1.</value>
+        public byte CodeElement1
+        {
+            get { return this.codeElement1; }
+            set { this.codeElement1 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement2.
+        /// </summary>
+        /// <value>The codeelement2.</value>
+        public byte CodeElement2
+        {
+            get { return this.codeElement2; }
+            set { this.codeElement2 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement3.
+        /// </summary>
+        /// <value>The codeelement3.</value>
+        public byte CodeElement3
+        {
+            get { return this.codeElement3; }
+            set { this.codeElement3 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement4.
+        /// </summary>
+        /// <value>The codeelement4.</value>
+        public byte CodeElement4
+        {
+            get { return this.codeElement4; }
+            set { this.codeElement4 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public Type1Parameter2Mode2CodeStatus.StatusValue Status
+        {
+            get { return this.status; }
+            set { this.status = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public Type1Parameter2Mode2CodeStatus.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the malfunction.
+        /// </summary>
+        /// <value>The malfunction.</value>
+        public Type1Parameter2Mode2CodeStatus.MalfunctionValue Malfunction
+        {
+            get { return this.malfunction; }
+            set { this.malfunction = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Type1Parameter2Mode2CodeStatus))
+            {
+                return false;
+            }
+
+            return this.Equals((Type1Parameter2Mode2CodeStatus)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Type1Parameter2Mode2CodeStatus other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.CodeElement1 == other.CodeElement1 &&
+                this.CodeElement2 == other.CodeElement2 &&
+                this.CodeElement3 == other.CodeElement3 &&
+                this.CodeElement4 == other.CodeElement4 &&
+                this.Status == other.Status &&
+                this.Damage == other.Damage &&
+                this.Malfunction == other.Malfunction;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter2Mode2CodeStatus"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.CodeElement1 << 0);
+            val |= (ushort)((uint)this.CodeElement2 << 3);
+            val |= (ushort)((uint)this.CodeElement3 << 6);
+            val |= (ushort)((uint)this.CodeElement4 << 9);
+            val |= (ushort)((uint)this.Status << 13);
+            val |= (ushort)((uint)this.Damage << 14);
+            val |= (ushort)((uint)this.Malfunction << 15);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.CodeElement1.GetHashCode();
+                hash = (hash * 29) + this.CodeElement2.GetHashCode();
+                hash = (hash * 29) + this.CodeElement3.GetHashCode();
+                hash = (hash * 29) + this.CodeElement4.GetHashCode();
+                hash = (hash * 29) + this.Status.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Malfunction.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
index f16f529..834b841 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter3Mode3CodeStatus.cs
@@ -1,399 +1,399 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1Parameter3Mode3CodeStatus (der.iff.type.1.fop.param3, Parameter 3 - Mode 3 Code/Status, 
-    /// section 8.3.1.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Type1Parameter3Mode3CodeStatus
-    {
-        /// <summary>
-        /// Status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status")]
-        public enum StatusValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Damage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damage
-            /// </summary>
-            Damage = 1
-        }
-
-        /// <summary>
-        /// Malfunction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malfunction")]
-        public enum MalfunctionValue : uint
-        {
-            /// <summary>
-            /// No malfunction
-            /// </summary>
-            NoMalfunction = 0,
-
-            /// <summary>
-            /// Malfunction
-            /// </summary>
-            Malfunction = 1
-        }
-
-        private byte codeElement1;
-        private byte codeElement2;
-        private byte codeElement3;
-        private byte codeElement4;
-        private Type1Parameter3Mode3CodeStatus.StatusValue status;
-        private Type1Parameter3Mode3CodeStatus.DamageValue damage;
-        private Type1Parameter3Mode3CodeStatus.MalfunctionValue malfunction;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Type1Parameter3Mode3CodeStatus left, Type1Parameter3Mode3CodeStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Type1Parameter3Mode3CodeStatus left, Type1Parameter3Mode3CodeStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Type1Parameter3Mode3CodeStatus obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Type1Parameter3Mode3CodeStatus(ushort value)
-        {
-            return Type1Parameter3Mode3CodeStatus.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Type1Parameter3Mode3CodeStatus FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance, represented by the ushort value.</returns>
-        public static Type1Parameter3Mode3CodeStatus FromUInt16(ushort value)
-        {
-            Type1Parameter3Mode3CodeStatus ps = new Type1Parameter3Mode3CodeStatus();
-
-            uint mask0 = 0x0007;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.CodeElement1 = (byte)newValue0;
-
-            uint mask1 = 0x0038;
-            byte shift1 = 3;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.CodeElement2 = (byte)newValue1;
-
-            uint mask2 = 0x01c0;
-            byte shift2 = 6;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.CodeElement3 = (byte)newValue2;
-
-            uint mask3 = 0x0e00;
-            byte shift3 = 9;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.CodeElement4 = (byte)newValue3;
-
-            uint mask5 = 0x2000;
-            byte shift5 = 13;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.Status = (Type1Parameter3Mode3CodeStatus.StatusValue)newValue5;
-
-            uint mask6 = 0x4000;
-            byte shift6 = 14;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Damage = (Type1Parameter3Mode3CodeStatus.DamageValue)newValue6;
-
-            uint mask7 = 0x8000;
-            byte shift7 = 15;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.Malfunction = (Type1Parameter3Mode3CodeStatus.MalfunctionValue)newValue7;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement1.
-        /// </summary>
-        /// <value>The codeelement1.</value>
-        public byte CodeElement1
-        {
-            get { return this.codeElement1; }
-            set { this.codeElement1 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement2.
-        /// </summary>
-        /// <value>The codeelement2.</value>
-        public byte CodeElement2
-        {
-            get { return this.codeElement2; }
-            set { this.codeElement2 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement3.
-        /// </summary>
-        /// <value>The codeelement3.</value>
-        public byte CodeElement3
-        {
-            get { return this.codeElement3; }
-            set { this.codeElement3 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement4.
-        /// </summary>
-        /// <value>The codeelement4.</value>
-        public byte CodeElement4
-        {
-            get { return this.codeElement4; }
-            set { this.codeElement4 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public Type1Parameter3Mode3CodeStatus.StatusValue Status
-        {
-            get { return this.status; }
-            set { this.status = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public Type1Parameter3Mode3CodeStatus.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the malfunction.
-        /// </summary>
-        /// <value>The malfunction.</value>
-        public Type1Parameter3Mode3CodeStatus.MalfunctionValue Malfunction
-        {
-            get { return this.malfunction; }
-            set { this.malfunction = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Type1Parameter3Mode3CodeStatus))
-            {
-                return false;
-            }
-
-            return this.Equals((Type1Parameter3Mode3CodeStatus)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Type1Parameter3Mode3CodeStatus other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.CodeElement1 == other.CodeElement1 &&
-                this.CodeElement2 == other.CodeElement2 &&
-                this.CodeElement3 == other.CodeElement3 &&
-                this.CodeElement4 == other.CodeElement4 &&
-                this.Status == other.Status &&
-                this.Damage == other.Damage &&
-                this.Malfunction == other.Malfunction;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.CodeElement1 << 0);
-            val |= (ushort)((uint)this.CodeElement2 << 3);
-            val |= (ushort)((uint)this.CodeElement3 << 6);
-            val |= (ushort)((uint)this.CodeElement4 << 9);
-            val |= (ushort)((uint)this.Status << 13);
-            val |= (ushort)((uint)this.Damage << 14);
-            val |= (ushort)((uint)this.Malfunction << 15);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.CodeElement1.GetHashCode();
-                hash = (hash * 29) + this.CodeElement2.GetHashCode();
-                hash = (hash * 29) + this.CodeElement3.GetHashCode();
-                hash = (hash * 29) + this.CodeElement4.GetHashCode();
-                hash = (hash * 29) + this.Status.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Malfunction.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1Parameter3Mode3CodeStatus (der.iff.type.1.fop.param3, Parameter 3 - Mode 3 Code/Status, 
+    /// section 8.3.1.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Type1Parameter3Mode3CodeStatus
+    {
+        /// <summary>
+        /// Status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status")]
+        public enum StatusValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Damage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damage
+            /// </summary>
+            Damage = 1
+        }
+
+        /// <summary>
+        /// Malfunction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malfunction")]
+        public enum MalfunctionValue : uint
+        {
+            /// <summary>
+            /// No malfunction
+            /// </summary>
+            NoMalfunction = 0,
+
+            /// <summary>
+            /// Malfunction
+            /// </summary>
+            Malfunction = 1
+        }
+
+        private byte codeElement1;
+        private byte codeElement2;
+        private byte codeElement3;
+        private byte codeElement4;
+        private Type1Parameter3Mode3CodeStatus.StatusValue status;
+        private Type1Parameter3Mode3CodeStatus.DamageValue damage;
+        private Type1Parameter3Mode3CodeStatus.MalfunctionValue malfunction;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Type1Parameter3Mode3CodeStatus left, Type1Parameter3Mode3CodeStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Type1Parameter3Mode3CodeStatus left, Type1Parameter3Mode3CodeStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Type1Parameter3Mode3CodeStatus obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Type1Parameter3Mode3CodeStatus(ushort value)
+        {
+            return Type1Parameter3Mode3CodeStatus.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Type1Parameter3Mode3CodeStatus FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance, represented by the ushort value.</returns>
+        public static Type1Parameter3Mode3CodeStatus FromUInt16(ushort value)
+        {
+            Type1Parameter3Mode3CodeStatus ps = new Type1Parameter3Mode3CodeStatus();
+
+            uint mask0 = 0x0007;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.CodeElement1 = (byte)newValue0;
+
+            uint mask1 = 0x0038;
+            byte shift1 = 3;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.CodeElement2 = (byte)newValue1;
+
+            uint mask2 = 0x01c0;
+            byte shift2 = 6;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.CodeElement3 = (byte)newValue2;
+
+            uint mask3 = 0x0e00;
+            byte shift3 = 9;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.CodeElement4 = (byte)newValue3;
+
+            uint mask5 = 0x2000;
+            byte shift5 = 13;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.Status = (Type1Parameter3Mode3CodeStatus.StatusValue)newValue5;
+
+            uint mask6 = 0x4000;
+            byte shift6 = 14;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Damage = (Type1Parameter3Mode3CodeStatus.DamageValue)newValue6;
+
+            uint mask7 = 0x8000;
+            byte shift7 = 15;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.Malfunction = (Type1Parameter3Mode3CodeStatus.MalfunctionValue)newValue7;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement1.
+        /// </summary>
+        /// <value>The codeelement1.</value>
+        public byte CodeElement1
+        {
+            get { return this.codeElement1; }
+            set { this.codeElement1 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement2.
+        /// </summary>
+        /// <value>The codeelement2.</value>
+        public byte CodeElement2
+        {
+            get { return this.codeElement2; }
+            set { this.codeElement2 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement3.
+        /// </summary>
+        /// <value>The codeelement3.</value>
+        public byte CodeElement3
+        {
+            get { return this.codeElement3; }
+            set { this.codeElement3 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement4.
+        /// </summary>
+        /// <value>The codeelement4.</value>
+        public byte CodeElement4
+        {
+            get { return this.codeElement4; }
+            set { this.codeElement4 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public Type1Parameter3Mode3CodeStatus.StatusValue Status
+        {
+            get { return this.status; }
+            set { this.status = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public Type1Parameter3Mode3CodeStatus.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the malfunction.
+        /// </summary>
+        /// <value>The malfunction.</value>
+        public Type1Parameter3Mode3CodeStatus.MalfunctionValue Malfunction
+        {
+            get { return this.malfunction; }
+            set { this.malfunction = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Type1Parameter3Mode3CodeStatus))
+            {
+                return false;
+            }
+
+            return this.Equals((Type1Parameter3Mode3CodeStatus)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Type1Parameter3Mode3CodeStatus other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.CodeElement1 == other.CodeElement1 &&
+                this.CodeElement2 == other.CodeElement2 &&
+                this.CodeElement3 == other.CodeElement3 &&
+                this.CodeElement4 == other.CodeElement4 &&
+                this.Status == other.Status &&
+                this.Damage == other.Damage &&
+                this.Malfunction == other.Malfunction;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter3Mode3CodeStatus"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.CodeElement1 << 0);
+            val |= (ushort)((uint)this.CodeElement2 << 3);
+            val |= (ushort)((uint)this.CodeElement3 << 6);
+            val |= (ushort)((uint)this.CodeElement4 << 9);
+            val |= (ushort)((uint)this.Status << 13);
+            val |= (ushort)((uint)this.Damage << 14);
+            val |= (ushort)((uint)this.Malfunction << 15);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.CodeElement1.GetHashCode();
+                hash = (hash * 29) + this.CodeElement2.GetHashCode();
+                hash = (hash * 29) + this.CodeElement3.GetHashCode();
+                hash = (hash * 29) + this.CodeElement4.GetHashCode();
+                hash = (hash * 29) + this.Status.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Malfunction.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
index b98f51d..f40344b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter4Mode4CodeStatus.cs
@@ -1,363 +1,363 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1Parameter4Mode4CodeStatus (der.iff.type.1.fop.param4, Parameter 4 - Mode 4 Code/Status, 
-    /// section 8.3.1.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Type1Parameter4Mode4CodeStatus
-    {
-        /// <summary>
-        /// Code element 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Code element 1")]
-        public enum CodeElement1Value : uint
-        {
-            /// <summary>
-            /// Pseudo-Crypto value
-            /// </summary>
-            PseudoCryptoValue = 0,
-
-            /// <summary>
-            /// No Pseudo-Crypto value. Use Alternate Mode 4 value
-            /// </summary>
-            NoPseudoCryptoValueUseAlternateMode4Value = 4095
-        }
-
-        /// <summary>
-        /// Status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status")]
-        public enum StatusValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Damage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damage
-            /// </summary>
-            Damage = 1
-        }
-
-        /// <summary>
-        /// Malfunction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malfunction")]
-        public enum MalfunctionValue : uint
-        {
-            /// <summary>
-            /// No malfunction
-            /// </summary>
-            NoMalfunction = 0,
-
-            /// <summary>
-            /// Malfunction
-            /// </summary>
-            Malfunction = 1
-        }
-
-        private Type1Parameter4Mode4CodeStatus.CodeElement1Value codeElement1;
-        private Type1Parameter4Mode4CodeStatus.StatusValue status;
-        private Type1Parameter4Mode4CodeStatus.DamageValue damage;
-        private Type1Parameter4Mode4CodeStatus.MalfunctionValue malfunction;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Type1Parameter4Mode4CodeStatus left, Type1Parameter4Mode4CodeStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Type1Parameter4Mode4CodeStatus left, Type1Parameter4Mode4CodeStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Type1Parameter4Mode4CodeStatus obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Type1Parameter4Mode4CodeStatus(ushort value)
-        {
-            return Type1Parameter4Mode4CodeStatus.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Type1Parameter4Mode4CodeStatus FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance, represented by the ushort value.</returns>
-        public static Type1Parameter4Mode4CodeStatus FromUInt16(ushort value)
-        {
-            Type1Parameter4Mode4CodeStatus ps = new Type1Parameter4Mode4CodeStatus();
-
-            uint mask0 = 0x0fff;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.CodeElement1 = (Type1Parameter4Mode4CodeStatus.CodeElement1Value)newValue0;
-
-            uint mask2 = 0x2000;
-            byte shift2 = 13;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Status = (Type1Parameter4Mode4CodeStatus.StatusValue)newValue2;
-
-            uint mask3 = 0x4000;
-            byte shift3 = 14;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (Type1Parameter4Mode4CodeStatus.DamageValue)newValue3;
-
-            uint mask4 = 0x8000;
-            byte shift4 = 15;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Malfunction = (Type1Parameter4Mode4CodeStatus.MalfunctionValue)newValue4;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement1.
-        /// </summary>
-        /// <value>The codeelement1.</value>
-        public Type1Parameter4Mode4CodeStatus.CodeElement1Value CodeElement1
-        {
-            get { return this.codeElement1; }
-            set { this.codeElement1 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public Type1Parameter4Mode4CodeStatus.StatusValue Status
-        {
-            get { return this.status; }
-            set { this.status = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public Type1Parameter4Mode4CodeStatus.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the malfunction.
-        /// </summary>
-        /// <value>The malfunction.</value>
-        public Type1Parameter4Mode4CodeStatus.MalfunctionValue Malfunction
-        {
-            get { return this.malfunction; }
-            set { this.malfunction = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Type1Parameter4Mode4CodeStatus))
-            {
-                return false;
-            }
-
-            return this.Equals((Type1Parameter4Mode4CodeStatus)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Type1Parameter4Mode4CodeStatus other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.CodeElement1 == other.CodeElement1 &&
-                this.Status == other.Status &&
-                this.Damage == other.Damage &&
-                this.Malfunction == other.Malfunction;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.CodeElement1 << 0);
-            val |= (ushort)((uint)this.Status << 13);
-            val |= (ushort)((uint)this.Damage << 14);
-            val |= (ushort)((uint)this.Malfunction << 15);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.CodeElement1.GetHashCode();
-                hash = (hash * 29) + this.Status.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Malfunction.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1Parameter4Mode4CodeStatus (der.iff.type.1.fop.param4, Parameter 4 - Mode 4 Code/Status, 
+    /// section 8.3.1.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Type1Parameter4Mode4CodeStatus
+    {
+        /// <summary>
+        /// Code element 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Code element 1")]
+        public enum CodeElement1Value : uint
+        {
+            /// <summary>
+            /// Pseudo-Crypto value
+            /// </summary>
+            PseudoCryptoValue = 0,
+
+            /// <summary>
+            /// No Pseudo-Crypto value. Use Alternate Mode 4 value
+            /// </summary>
+            NoPseudoCryptoValueUseAlternateMode4Value = 4095
+        }
+
+        /// <summary>
+        /// Status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status")]
+        public enum StatusValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Damage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damage
+            /// </summary>
+            Damage = 1
+        }
+
+        /// <summary>
+        /// Malfunction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malfunction")]
+        public enum MalfunctionValue : uint
+        {
+            /// <summary>
+            /// No malfunction
+            /// </summary>
+            NoMalfunction = 0,
+
+            /// <summary>
+            /// Malfunction
+            /// </summary>
+            Malfunction = 1
+        }
+
+        private Type1Parameter4Mode4CodeStatus.CodeElement1Value codeElement1;
+        private Type1Parameter4Mode4CodeStatus.StatusValue status;
+        private Type1Parameter4Mode4CodeStatus.DamageValue damage;
+        private Type1Parameter4Mode4CodeStatus.MalfunctionValue malfunction;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Type1Parameter4Mode4CodeStatus left, Type1Parameter4Mode4CodeStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Type1Parameter4Mode4CodeStatus left, Type1Parameter4Mode4CodeStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Type1Parameter4Mode4CodeStatus obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Type1Parameter4Mode4CodeStatus(ushort value)
+        {
+            return Type1Parameter4Mode4CodeStatus.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Type1Parameter4Mode4CodeStatus FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance, represented by the ushort value.</returns>
+        public static Type1Parameter4Mode4CodeStatus FromUInt16(ushort value)
+        {
+            Type1Parameter4Mode4CodeStatus ps = new Type1Parameter4Mode4CodeStatus();
+
+            uint mask0 = 0x0fff;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.CodeElement1 = (Type1Parameter4Mode4CodeStatus.CodeElement1Value)newValue0;
+
+            uint mask2 = 0x2000;
+            byte shift2 = 13;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Status = (Type1Parameter4Mode4CodeStatus.StatusValue)newValue2;
+
+            uint mask3 = 0x4000;
+            byte shift3 = 14;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (Type1Parameter4Mode4CodeStatus.DamageValue)newValue3;
+
+            uint mask4 = 0x8000;
+            byte shift4 = 15;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Malfunction = (Type1Parameter4Mode4CodeStatus.MalfunctionValue)newValue4;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement1.
+        /// </summary>
+        /// <value>The codeelement1.</value>
+        public Type1Parameter4Mode4CodeStatus.CodeElement1Value CodeElement1
+        {
+            get { return this.codeElement1; }
+            set { this.codeElement1 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public Type1Parameter4Mode4CodeStatus.StatusValue Status
+        {
+            get { return this.status; }
+            set { this.status = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public Type1Parameter4Mode4CodeStatus.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the malfunction.
+        /// </summary>
+        /// <value>The malfunction.</value>
+        public Type1Parameter4Mode4CodeStatus.MalfunctionValue Malfunction
+        {
+            get { return this.malfunction; }
+            set { this.malfunction = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Type1Parameter4Mode4CodeStatus))
+            {
+                return false;
+            }
+
+            return this.Equals((Type1Parameter4Mode4CodeStatus)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Type1Parameter4Mode4CodeStatus other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.CodeElement1 == other.CodeElement1 &&
+                this.Status == other.Status &&
+                this.Damage == other.Damage &&
+                this.Malfunction == other.Malfunction;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter4Mode4CodeStatus"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.CodeElement1 << 0);
+            val |= (ushort)((uint)this.Status << 13);
+            val |= (ushort)((uint)this.Damage << 14);
+            val |= (ushort)((uint)this.Malfunction << 15);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.CodeElement1.GetHashCode();
+                hash = (hash * 29) + this.Status.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Malfunction.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
index b5192a8..5f1b1c5 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter5ModeCCodeStatus.cs
@@ -1,403 +1,403 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1Parameter5ModeCCodeStatus (der.iff.type.1.fop.param5, Parameter 5 - Mode C Code/Status, 
-    /// section 8.3.1.2.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Type1Parameter5ModeCCodeStatus
-    {
-        /// <summary>
-        /// Negative Altitude
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Negative Altitude")]
-        public enum NegativeAltitudeValue : uint
-        {
-            /// <summary>
-            /// Positive altitude above mean sea level Indicator if Mode C altitude is contained in Bits 1-11
-            /// </summary>
-            PositiveAltitudeAboveMeanSeaLevelIndicatorIfModeCAltitudeIsContainedInBits111 = 0,
-
-            /// <summary>
-            /// Negative altitude below mean sea level Indicator if Mode C altitude is contained in Bits 1-11, or, Alternate Mode 5 if altitude Bits 1-11 = 2047.
-            /// </summary>
-            NegativeAltitudeBelowMeanSeaLevelIndicatorIfModeCAltitudeIsContainedInBits111OrAlternateMode5IfAltitudeBits1112047 = 1
-        }
-
-        /// <summary>
-        /// Mode C altitude
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mode C altitude")]
-        public enum ModeCAltitudeValue : uint
-        {
-            /// <summary>
-            /// Actual Mode C altitude in the range 0-126,000 feet in 100-foot increments (Bit 0 - Negative / Positive Indicator must be set appropriately)
-            /// </summary>
-            ActualModeCAltitudeInTheRange0126000FeetIn100FootIncrementsBit0NegativePositiveIndicatorMustBeSetAppropriately = 0,
-
-            /// <summary>
-            /// Not actual Mode C altitude value. Use alternate Mode 5 (Bits 0-11 = 4095 i.e. all 1-s)
-            /// </summary>
-            NotActualModeCAltitudeValueUseAlternateMode5Bits0114095IEAll1S = 2047
-        }
-
-        /// <summary>
-        /// Status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status")]
-        public enum StatusValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Damage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damage
-            /// </summary>
-            Damage = 1
-        }
-
-        /// <summary>
-        /// Malfunction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malfunction")]
-        public enum MalfunctionValue : uint
-        {
-            /// <summary>
-            /// No malfunction
-            /// </summary>
-            NoMalfunction = 0,
-
-            /// <summary>
-            /// Malfunction
-            /// </summary>
-            Malfunction = 1
-        }
-
-        private Type1Parameter5ModeCCodeStatus.NegativeAltitudeValue negativeAltitude;
-        private Type1Parameter5ModeCCodeStatus.ModeCAltitudeValue modeCAltitude;
-        private Type1Parameter5ModeCCodeStatus.StatusValue status;
-        private Type1Parameter5ModeCCodeStatus.DamageValue damage;
-        private Type1Parameter5ModeCCodeStatus.MalfunctionValue malfunction;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Type1Parameter5ModeCCodeStatus left, Type1Parameter5ModeCCodeStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Type1Parameter5ModeCCodeStatus left, Type1Parameter5ModeCCodeStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Type1Parameter5ModeCCodeStatus obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Type1Parameter5ModeCCodeStatus(ushort value)
-        {
-            return Type1Parameter5ModeCCodeStatus.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Type1Parameter5ModeCCodeStatus FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance, represented by the ushort value.</returns>
-        public static Type1Parameter5ModeCCodeStatus FromUInt16(ushort value)
-        {
-            Type1Parameter5ModeCCodeStatus ps = new Type1Parameter5ModeCCodeStatus();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.NegativeAltitude = (Type1Parameter5ModeCCodeStatus.NegativeAltitudeValue)newValue0;
-
-            uint mask1 = 0x0ffe;
-            byte shift1 = 1;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.ModeCAltitude = (Type1Parameter5ModeCCodeStatus.ModeCAltitudeValue)newValue1;
-
-            uint mask3 = 0x2000;
-            byte shift3 = 13;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Status = (Type1Parameter5ModeCCodeStatus.StatusValue)newValue3;
-
-            uint mask4 = 0x4000;
-            byte shift4 = 14;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Damage = (Type1Parameter5ModeCCodeStatus.DamageValue)newValue4;
-
-            uint mask5 = 0x8000;
-            byte shift5 = 15;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.Malfunction = (Type1Parameter5ModeCCodeStatus.MalfunctionValue)newValue5;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the negativealtitude.
-        /// </summary>
-        /// <value>The negativealtitude.</value>
-        public Type1Parameter5ModeCCodeStatus.NegativeAltitudeValue NegativeAltitude
-        {
-            get { return this.negativeAltitude; }
-            set { this.negativeAltitude = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the modecaltitude.
-        /// </summary>
-        /// <value>The modecaltitude.</value>
-        public Type1Parameter5ModeCCodeStatus.ModeCAltitudeValue ModeCAltitude
-        {
-            get { return this.modeCAltitude; }
-            set { this.modeCAltitude = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public Type1Parameter5ModeCCodeStatus.StatusValue Status
-        {
-            get { return this.status; }
-            set { this.status = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public Type1Parameter5ModeCCodeStatus.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the malfunction.
-        /// </summary>
-        /// <value>The malfunction.</value>
-        public Type1Parameter5ModeCCodeStatus.MalfunctionValue Malfunction
-        {
-            get { return this.malfunction; }
-            set { this.malfunction = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Type1Parameter5ModeCCodeStatus))
-            {
-                return false;
-            }
-
-            return this.Equals((Type1Parameter5ModeCCodeStatus)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Type1Parameter5ModeCCodeStatus other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.NegativeAltitude == other.NegativeAltitude &&
-                this.ModeCAltitude == other.ModeCAltitude &&
-                this.Status == other.Status &&
-                this.Damage == other.Damage &&
-                this.Malfunction == other.Malfunction;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.NegativeAltitude << 0);
-            val |= (ushort)((uint)this.ModeCAltitude << 1);
-            val |= (ushort)((uint)this.Status << 13);
-            val |= (ushort)((uint)this.Damage << 14);
-            val |= (ushort)((uint)this.Malfunction << 15);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.NegativeAltitude.GetHashCode();
-                hash = (hash * 29) + this.ModeCAltitude.GetHashCode();
-                hash = (hash * 29) + this.Status.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Malfunction.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1Parameter5ModeCCodeStatus (der.iff.type.1.fop.param5, Parameter 5 - Mode C Code/Status, 
+    /// section 8.3.1.2.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Type1Parameter5ModeCCodeStatus
+    {
+        /// <summary>
+        /// Negative Altitude
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Negative Altitude")]
+        public enum NegativeAltitudeValue : uint
+        {
+            /// <summary>
+            /// Positive altitude above mean sea level Indicator if Mode C altitude is contained in Bits 1-11
+            /// </summary>
+            PositiveAltitudeAboveMeanSeaLevelIndicatorIfModeCAltitudeIsContainedInBits111 = 0,
+
+            /// <summary>
+            /// Negative altitude below mean sea level Indicator if Mode C altitude is contained in Bits 1-11, or, Alternate Mode 5 if altitude Bits 1-11 = 2047.
+            /// </summary>
+            NegativeAltitudeBelowMeanSeaLevelIndicatorIfModeCAltitudeIsContainedInBits111OrAlternateMode5IfAltitudeBits1112047 = 1
+        }
+
+        /// <summary>
+        /// Mode C altitude
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mode C altitude")]
+        public enum ModeCAltitudeValue : uint
+        {
+            /// <summary>
+            /// Actual Mode C altitude in the range 0-126,000 feet in 100-foot increments (Bit 0 - Negative / Positive Indicator must be set appropriately)
+            /// </summary>
+            ActualModeCAltitudeInTheRange0126000FeetIn100FootIncrementsBit0NegativePositiveIndicatorMustBeSetAppropriately = 0,
+
+            /// <summary>
+            /// Not actual Mode C altitude value. Use alternate Mode 5 (Bits 0-11 = 4095 i.e. all 1-s)
+            /// </summary>
+            NotActualModeCAltitudeValueUseAlternateMode5Bits0114095IEAll1S = 2047
+        }
+
+        /// <summary>
+        /// Status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status")]
+        public enum StatusValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Damage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damage
+            /// </summary>
+            Damage = 1
+        }
+
+        /// <summary>
+        /// Malfunction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malfunction")]
+        public enum MalfunctionValue : uint
+        {
+            /// <summary>
+            /// No malfunction
+            /// </summary>
+            NoMalfunction = 0,
+
+            /// <summary>
+            /// Malfunction
+            /// </summary>
+            Malfunction = 1
+        }
+
+        private Type1Parameter5ModeCCodeStatus.NegativeAltitudeValue negativeAltitude;
+        private Type1Parameter5ModeCCodeStatus.ModeCAltitudeValue modeCAltitude;
+        private Type1Parameter5ModeCCodeStatus.StatusValue status;
+        private Type1Parameter5ModeCCodeStatus.DamageValue damage;
+        private Type1Parameter5ModeCCodeStatus.MalfunctionValue malfunction;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Type1Parameter5ModeCCodeStatus left, Type1Parameter5ModeCCodeStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Type1Parameter5ModeCCodeStatus left, Type1Parameter5ModeCCodeStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Type1Parameter5ModeCCodeStatus obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Type1Parameter5ModeCCodeStatus(ushort value)
+        {
+            return Type1Parameter5ModeCCodeStatus.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Type1Parameter5ModeCCodeStatus FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance, represented by the ushort value.</returns>
+        public static Type1Parameter5ModeCCodeStatus FromUInt16(ushort value)
+        {
+            Type1Parameter5ModeCCodeStatus ps = new Type1Parameter5ModeCCodeStatus();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.NegativeAltitude = (Type1Parameter5ModeCCodeStatus.NegativeAltitudeValue)newValue0;
+
+            uint mask1 = 0x0ffe;
+            byte shift1 = 1;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.ModeCAltitude = (Type1Parameter5ModeCCodeStatus.ModeCAltitudeValue)newValue1;
+
+            uint mask3 = 0x2000;
+            byte shift3 = 13;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Status = (Type1Parameter5ModeCCodeStatus.StatusValue)newValue3;
+
+            uint mask4 = 0x4000;
+            byte shift4 = 14;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Damage = (Type1Parameter5ModeCCodeStatus.DamageValue)newValue4;
+
+            uint mask5 = 0x8000;
+            byte shift5 = 15;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.Malfunction = (Type1Parameter5ModeCCodeStatus.MalfunctionValue)newValue5;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the negativealtitude.
+        /// </summary>
+        /// <value>The negativealtitude.</value>
+        public Type1Parameter5ModeCCodeStatus.NegativeAltitudeValue NegativeAltitude
+        {
+            get { return this.negativeAltitude; }
+            set { this.negativeAltitude = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the modecaltitude.
+        /// </summary>
+        /// <value>The modecaltitude.</value>
+        public Type1Parameter5ModeCCodeStatus.ModeCAltitudeValue ModeCAltitude
+        {
+            get { return this.modeCAltitude; }
+            set { this.modeCAltitude = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public Type1Parameter5ModeCCodeStatus.StatusValue Status
+        {
+            get { return this.status; }
+            set { this.status = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public Type1Parameter5ModeCCodeStatus.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the malfunction.
+        /// </summary>
+        /// <value>The malfunction.</value>
+        public Type1Parameter5ModeCCodeStatus.MalfunctionValue Malfunction
+        {
+            get { return this.malfunction; }
+            set { this.malfunction = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Type1Parameter5ModeCCodeStatus))
+            {
+                return false;
+            }
+
+            return this.Equals((Type1Parameter5ModeCCodeStatus)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Type1Parameter5ModeCCodeStatus other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.NegativeAltitude == other.NegativeAltitude &&
+                this.ModeCAltitude == other.ModeCAltitude &&
+                this.Status == other.Status &&
+                this.Damage == other.Damage &&
+                this.Malfunction == other.Malfunction;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type1Parameter5ModeCCodeStatus"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.NegativeAltitude << 0);
+            val |= (ushort)((uint)this.ModeCAltitude << 1);
+            val |= (ushort)((uint)this.Status << 13);
+            val |= (ushort)((uint)this.Damage << 14);
+            val |= (ushort)((uint)this.Malfunction << 15);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.NegativeAltitude.GetHashCode();
+                hash = (hash * 29) + this.ModeCAltitude.GetHashCode();
+                hash = (hash * 29) + this.Status.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Malfunction.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
index 6b7aeee..62881f7 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type1Parameter6ModeSCodeStatus.cs
@@ -1,70 +1,70 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type1Parameter6ModeSCodeStatus (der.iff.type.1.fop.param6, Parameter 6 - Mode S Code/Status, 
-    /// section 8.3.1.2.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type1Parameter6ModeSCodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'TCAS II', reset bit means 'TCAS I'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'TCAS II', reset bit means 'TCAS I'.")]
-        TCAS = 4096,
-
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type1Parameter6ModeSCodeStatus (der.iff.type.1.fop.param6, Parameter 6 - Mode S Code/Status, 
+    /// section 8.3.1.2.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type1Parameter6ModeSCodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'TCAS II', reset bit means 'TCAS I'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'TCAS II', reset bit means 'TCAS I'.")]
+        TCAS = 4096,
+
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
index aa0bfab..568bc60 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2AlternateParameter4.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2AlternateParameter4 (der.iff.type.2.fop.altp4, Alternate Parameter 4, 
-    /// section 8.3.1.2.9)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type2AlternateParameter4 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Valid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Valid.")]
-        Valid = 1,
-
-        /// <summary>
-        /// Invalid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Invalid.")]
-        Invalid = 2,
-
-        /// <summary>
-        /// No response.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("No response.")]
-        NoResponse = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2AlternateParameter4 (der.iff.type.2.fop.altp4, Alternate Parameter 4, 
+    /// section 8.3.1.2.9)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type2AlternateParameter4 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Valid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Valid.")]
+        Valid = 1,
+
+        /// <summary>
+        /// Invalid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Invalid.")]
+        Invalid = 2,
+
+        /// <summary>
+        /// No response.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("No response.")]
+        NoResponse = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
index 145e048..03abdd4 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2ChangeOptions.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2ChangeOptions (der.iff.type.2.changeoptions, Change/Options, 
-    /// section 8.3.2.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type2ChangeOptions : byte
-    {
-        /// <summary>
-        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
-        ChangeIndicator = 1,
-
-        /// <summary>
-        /// Set bit means 'Yes', reset bit means 'No'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Yes', reset bit means 'No'.")]
-        AlternateMode4 = 2,
-
-        /// <summary>
-        /// Set bit means 'Yes', reset bit means 'No'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Yes', reset bit means 'No'.")]
-        AlternateModeC = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2ChangeOptions (der.iff.type.2.changeoptions, Change/Options, 
+    /// section 8.3.2.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type2ChangeOptions : byte
+    {
+        /// <summary>
+        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
+        ChangeIndicator = 1,
+
+        /// <summary>
+        /// Set bit means 'Yes', reset bit means 'No'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Yes', reset bit means 'No'.")]
+        AlternateMode4 = 2,
+
+        /// <summary>
+        /// Set bit means 'Yes', reset bit means 'No'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Yes', reset bit means 'No'.")]
+        AlternateModeC = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
index e6f68a8..e0d1e05 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2OperationalParameter1.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2OperationalParameter1 (der.iff.type.2.sop.param1, Operational Parameter 1, 
-    /// section 8.3.2.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type2OperationalParameter1 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2OperationalParameter1 (der.iff.type.2.sop.param1, Operational Parameter 1, 
+    /// section 8.3.2.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type2OperationalParameter1 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
index 07d32a2..2ef3582 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2OperationalParameter2.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2OperationalParameter2 (der.iff.type.2.sop.param2, Operational Parameter 2, 
-    /// section 8.3.2.4.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type2OperationalParameter2 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2OperationalParameter2 (der.iff.type.2.sop.param2, Operational Parameter 2, 
+    /// section 8.3.2.4.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type2OperationalParameter2 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
index ee4593b..1f39a45 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter1Mode1InterrogatorStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2Parameter1Mode1InterrogatorStatus (der.iff.type.2.fop.param1, Parameter 1 - Mode 1 Interrogator Status, 
-    /// section 8.3.2.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type2Parameter1Mode1InterrogatorStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2Parameter1Mode1InterrogatorStatus (der.iff.type.2.fop.param1, Parameter 1 - Mode 1 Interrogator Status, 
+    /// section 8.3.2.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type2Parameter1Mode1InterrogatorStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
index 3626fa8..4e0ca54 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter2Mode2InterrogatorStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2Parameter2Mode2InterrogatorStatus (der.iff.type.2.fop.param2, Parameter 2 - Mode 2 Interrogator Status, 
-    /// section 8.3.2.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type2Parameter2Mode2InterrogatorStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2Parameter2Mode2InterrogatorStatus (der.iff.type.2.fop.param2, Parameter 2 - Mode 2 Interrogator Status, 
+    /// section 8.3.2.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type2Parameter2Mode2InterrogatorStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
index 1d931d0..cff97d5 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter3Mode3InterrogatorStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2Parameter3Mode3InterrogatorStatus (der.iff.type.2.fop.param3, Parameter 3 - Mode 3 Interrogator Status, 
-    /// section 8.3.2.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type2Parameter3Mode3InterrogatorStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2Parameter3Mode3InterrogatorStatus (der.iff.type.2.fop.param3, Parameter 3 - Mode 3 Interrogator Status, 
+    /// section 8.3.2.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type2Parameter3Mode3InterrogatorStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
index 6ecaab9..5f35de0 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter4Mode4InterrogatorStatus.cs
@@ -1,363 +1,363 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2Parameter4Mode4InterrogatorStatus (der.iff.type.2.fop.param4, Parameter 4 - Mode 4 Interrogator Status, 
-    /// section 8.3.2.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Type2Parameter4Mode4InterrogatorStatus
-    {
-        /// <summary>
-        /// Code element 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Code element 1")]
-        public enum CodeElement1Value : uint
-        {
-            /// <summary>
-            /// Pseudo-Crypto value
-            /// </summary>
-            PseudoCryptoValue = 0,
-
-            /// <summary>
-            /// No Pseudo-Crypto value. Use Alternate Mode 4 value
-            /// </summary>
-            NoPseudoCryptoValueUseAlternateMode4Value = 4095
-        }
-
-        /// <summary>
-        /// Status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status")]
-        public enum StatusValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Damage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damage
-            /// </summary>
-            Damage = 1
-        }
-
-        /// <summary>
-        /// Malfunction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malfunction")]
-        public enum MalfunctionValue : uint
-        {
-            /// <summary>
-            /// No malfunction
-            /// </summary>
-            NoMalfunction = 0,
-
-            /// <summary>
-            /// Malfunction
-            /// </summary>
-            Malfunction = 1
-        }
-
-        private Type2Parameter4Mode4InterrogatorStatus.CodeElement1Value codeElement1;
-        private Type2Parameter4Mode4InterrogatorStatus.StatusValue status;
-        private Type2Parameter4Mode4InterrogatorStatus.DamageValue damage;
-        private Type2Parameter4Mode4InterrogatorStatus.MalfunctionValue malfunction;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Type2Parameter4Mode4InterrogatorStatus left, Type2Parameter4Mode4InterrogatorStatus right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Type2Parameter4Mode4InterrogatorStatus left, Type2Parameter4Mode4InterrogatorStatus right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Type2Parameter4Mode4InterrogatorStatus obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Type2Parameter4Mode4InterrogatorStatus(ushort value)
-        {
-            return Type2Parameter4Mode4InterrogatorStatus.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Type2Parameter4Mode4InterrogatorStatus FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance, represented by the ushort value.</returns>
-        public static Type2Parameter4Mode4InterrogatorStatus FromUInt16(ushort value)
-        {
-            Type2Parameter4Mode4InterrogatorStatus ps = new Type2Parameter4Mode4InterrogatorStatus();
-
-            uint mask0 = 0x0fff;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.CodeElement1 = (Type2Parameter4Mode4InterrogatorStatus.CodeElement1Value)newValue0;
-
-            uint mask2 = 0x2000;
-            byte shift2 = 13;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Status = (Type2Parameter4Mode4InterrogatorStatus.StatusValue)newValue2;
-
-            uint mask3 = 0x4000;
-            byte shift3 = 14;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (Type2Parameter4Mode4InterrogatorStatus.DamageValue)newValue3;
-
-            uint mask4 = 0x8000;
-            byte shift4 = 15;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Malfunction = (Type2Parameter4Mode4InterrogatorStatus.MalfunctionValue)newValue4;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the codeelement1.
-        /// </summary>
-        /// <value>The codeelement1.</value>
-        public Type2Parameter4Mode4InterrogatorStatus.CodeElement1Value CodeElement1
-        {
-            get { return this.codeElement1; }
-            set { this.codeElement1 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public Type2Parameter4Mode4InterrogatorStatus.StatusValue Status
-        {
-            get { return this.status; }
-            set { this.status = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public Type2Parameter4Mode4InterrogatorStatus.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the malfunction.
-        /// </summary>
-        /// <value>The malfunction.</value>
-        public Type2Parameter4Mode4InterrogatorStatus.MalfunctionValue Malfunction
-        {
-            get { return this.malfunction; }
-            set { this.malfunction = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Type2Parameter4Mode4InterrogatorStatus))
-            {
-                return false;
-            }
-
-            return this.Equals((Type2Parameter4Mode4InterrogatorStatus)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Type2Parameter4Mode4InterrogatorStatus other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.CodeElement1 == other.CodeElement1 &&
-                this.Status == other.Status &&
-                this.Damage == other.Damage &&
-                this.Malfunction == other.Malfunction;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.CodeElement1 << 0);
-            val |= (ushort)((uint)this.Status << 13);
-            val |= (ushort)((uint)this.Damage << 14);
-            val |= (ushort)((uint)this.Malfunction << 15);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.CodeElement1.GetHashCode();
-                hash = (hash * 29) + this.Status.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Malfunction.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2Parameter4Mode4InterrogatorStatus (der.iff.type.2.fop.param4, Parameter 4 - Mode 4 Interrogator Status, 
+    /// section 8.3.2.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Type2Parameter4Mode4InterrogatorStatus
+    {
+        /// <summary>
+        /// Code element 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Code element 1")]
+        public enum CodeElement1Value : uint
+        {
+            /// <summary>
+            /// Pseudo-Crypto value
+            /// </summary>
+            PseudoCryptoValue = 0,
+
+            /// <summary>
+            /// No Pseudo-Crypto value. Use Alternate Mode 4 value
+            /// </summary>
+            NoPseudoCryptoValueUseAlternateMode4Value = 4095
+        }
+
+        /// <summary>
+        /// Status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status")]
+        public enum StatusValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Damage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damage
+            /// </summary>
+            Damage = 1
+        }
+
+        /// <summary>
+        /// Malfunction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malfunction")]
+        public enum MalfunctionValue : uint
+        {
+            /// <summary>
+            /// No malfunction
+            /// </summary>
+            NoMalfunction = 0,
+
+            /// <summary>
+            /// Malfunction
+            /// </summary>
+            Malfunction = 1
+        }
+
+        private Type2Parameter4Mode4InterrogatorStatus.CodeElement1Value codeElement1;
+        private Type2Parameter4Mode4InterrogatorStatus.StatusValue status;
+        private Type2Parameter4Mode4InterrogatorStatus.DamageValue damage;
+        private Type2Parameter4Mode4InterrogatorStatus.MalfunctionValue malfunction;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Type2Parameter4Mode4InterrogatorStatus left, Type2Parameter4Mode4InterrogatorStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Type2Parameter4Mode4InterrogatorStatus left, Type2Parameter4Mode4InterrogatorStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Type2Parameter4Mode4InterrogatorStatus obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Type2Parameter4Mode4InterrogatorStatus(ushort value)
+        {
+            return Type2Parameter4Mode4InterrogatorStatus.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Type2Parameter4Mode4InterrogatorStatus FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance, represented by the ushort value.</returns>
+        public static Type2Parameter4Mode4InterrogatorStatus FromUInt16(ushort value)
+        {
+            Type2Parameter4Mode4InterrogatorStatus ps = new Type2Parameter4Mode4InterrogatorStatus();
+
+            uint mask0 = 0x0fff;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.CodeElement1 = (Type2Parameter4Mode4InterrogatorStatus.CodeElement1Value)newValue0;
+
+            uint mask2 = 0x2000;
+            byte shift2 = 13;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Status = (Type2Parameter4Mode4InterrogatorStatus.StatusValue)newValue2;
+
+            uint mask3 = 0x4000;
+            byte shift3 = 14;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (Type2Parameter4Mode4InterrogatorStatus.DamageValue)newValue3;
+
+            uint mask4 = 0x8000;
+            byte shift4 = 15;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Malfunction = (Type2Parameter4Mode4InterrogatorStatus.MalfunctionValue)newValue4;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the codeelement1.
+        /// </summary>
+        /// <value>The codeelement1.</value>
+        public Type2Parameter4Mode4InterrogatorStatus.CodeElement1Value CodeElement1
+        {
+            get { return this.codeElement1; }
+            set { this.codeElement1 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public Type2Parameter4Mode4InterrogatorStatus.StatusValue Status
+        {
+            get { return this.status; }
+            set { this.status = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public Type2Parameter4Mode4InterrogatorStatus.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the malfunction.
+        /// </summary>
+        /// <value>The malfunction.</value>
+        public Type2Parameter4Mode4InterrogatorStatus.MalfunctionValue Malfunction
+        {
+            get { return this.malfunction; }
+            set { this.malfunction = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Type2Parameter4Mode4InterrogatorStatus))
+            {
+                return false;
+            }
+
+            return this.Equals((Type2Parameter4Mode4InterrogatorStatus)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Type2Parameter4Mode4InterrogatorStatus other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.CodeElement1 == other.CodeElement1 &&
+                this.Status == other.Status &&
+                this.Damage == other.Damage &&
+                this.Malfunction == other.Malfunction;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type2Parameter4Mode4InterrogatorStatus"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.CodeElement1 << 0);
+            val |= (ushort)((uint)this.Status << 13);
+            val |= (ushort)((uint)this.Damage << 14);
+            val |= (ushort)((uint)this.Malfunction << 15);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.CodeElement1.GetHashCode();
+                hash = (hash * 29) + this.Status.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Malfunction.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
index 7a7843b..aa74620 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter5ModeCInterrogatorStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2Parameter5ModeCInterrogatorStatus (der.iff.type.2.fop.param5, Parameter 5 - Mode C Interrogator Status, 
-    /// section 8.3.2.2.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type2Parameter5ModeCInterrogatorStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2Parameter5ModeCInterrogatorStatus (der.iff.type.2.fop.param5, Parameter 5 - Mode C Interrogator Status, 
+    /// section 8.3.2.2.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type2Parameter5ModeCInterrogatorStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
index 9be40af..99709a7 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type2Parameter6ModeSCodeStatus.cs
@@ -1,70 +1,70 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type2Parameter6ModeSCodeStatus (der.iff.type.2.fop.param6, Parameter 6 - Mode S Code/Status, 
-    /// section 8.3.2.2.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type2Parameter6ModeSCodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'TCAS II', reset bit means 'TCAS I'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'TCAS II', reset bit means 'TCAS I'.")]
-        TCAS = 4096,
-
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type2Parameter6ModeSCodeStatus (der.iff.type.2.fop.param6, Parameter 6 - Mode S Code/Status, 
+    /// section 8.3.2.2.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type2Parameter6ModeSCodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'TCAS II', reset bit means 'TCAS I'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'TCAS II', reset bit means 'TCAS I'.")]
+        TCAS = 4096,
+
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
index 92c8ba2..ed06886 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3ChangeOptions.cs
@@ -1,40 +1,40 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3ChangeOptions (der.iff.type.3.changeoptions, Change/Options, 
-    /// section 8.3.3.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type3ChangeOptions : byte
-    {
-        /// <summary>
-        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
-        ChangeIndicator = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3ChangeOptions (der.iff.type.3.changeoptions, Change/Options, 
+    /// section 8.3.3.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type3ChangeOptions : byte
+    {
+        /// <summary>
+        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
+        ChangeIndicator = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
index e6bd427..5d7ac87 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3OperationalParameter1.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3OperationalParameter1 (der.iff.type.3.sop.param1, Operational Parameter 1, 
-    /// section 8.3.3.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type3OperationalParameter1 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3OperationalParameter1 (der.iff.type.3.sop.param1, Operational Parameter 1, 
+    /// section 8.3.3.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type3OperationalParameter1 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
index cbdf2ae..9a6eacc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3OperationalParameter2.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3OperationalParameter2 (der.iff.type.3.sop.param2, Operational Parameter 2, 
-    /// section 8.3.3.4.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type3OperationalParameter2 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3OperationalParameter2 (der.iff.type.3.sop.param2, Operational Parameter 2, 
+    /// section 8.3.3.4.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type3OperationalParameter2 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
index 45c81cf..e1d0c9c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter1Mode1CodeStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3Parameter1Mode1CodeStatus (der.iff.type.3.fop.param1, Parameter 1, 
-    /// section 8.3.3.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type3Parameter1Mode1CodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3Parameter1Mode1CodeStatus (der.iff.type.3.fop.param1, Parameter 1, 
+    /// section 8.3.3.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type3Parameter1Mode1CodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
index 12102ce..974e5a5 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter2Mode2CodeStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3Parameter2Mode2CodeStatus (der.iff.type.3.fop.param2, Parameter 2, 
-    /// section 8.3.3.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type3Parameter2Mode2CodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3Parameter2Mode2CodeStatus (der.iff.type.3.fop.param2, Parameter 2, 
+    /// section 8.3.3.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type3Parameter2Mode2CodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
index 2d54641..8eb4fb9 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter3Mode3CodeStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3Parameter3Mode3CodeStatus (der.iff.type.3.fop.param3, Parameter 3, 
-    /// section 8.3.3.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type3Parameter3Mode3CodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3Parameter3Mode3CodeStatus (der.iff.type.3.fop.param3, Parameter 3, 
+    /// section 8.3.3.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type3Parameter3Mode3CodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
index f848133..e1567b7 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter4Mode4CodeStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3Parameter4Mode4CodeStatus (der.iff.type.3.fop.param4, Parameter 4, 
-    /// section 8.3.3.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type3Parameter4Mode4CodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3Parameter4Mode4CodeStatus (der.iff.type.3.fop.param4, Parameter 4, 
+    /// section 8.3.3.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type3Parameter4Mode4CodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
index b71744f..a03b634 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter5ModeCCodeStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3Parameter5ModeCCodeStatus (der.iff.type.3.fop.param5, Parameter 5, 
-    /// section 8.3.3.2.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type3Parameter5ModeCCodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3Parameter5ModeCCodeStatus (der.iff.type.3.fop.param5, Parameter 5, 
+    /// section 8.3.3.2.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type3Parameter5ModeCCodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
index 8b76c2d..2468d1e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type3Parameter6Mode1CodeStatus.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type3Parameter6Mode1CodeStatus (der.iff.type.3.fop.param6, Parameter 6, 
-    /// section 8.3.3.2.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type3Parameter6Mode1CodeStatus : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type3Parameter6Mode1CodeStatus (der.iff.type.3.fop.param6, Parameter 6, 
+    /// section 8.3.3.2.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type3Parameter6Mode1CodeStatus : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
index 2fee03d..df78480 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4ChangeOptions.cs
@@ -1,40 +1,40 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4ChangeOptions (der.iff.type.4.changeoptions, Change/Options, 
-    /// section 8.3.4.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type4ChangeOptions : byte
-    {
-        /// <summary>
-        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
-        ChangeIndicator = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4ChangeOptions (der.iff.type.4.changeoptions, Change/Options, 
+    /// section 8.3.4.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type4ChangeOptions : byte
+    {
+        /// <summary>
+        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
+        ChangeIndicator = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
index b67c58b..5d4ba10 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4OperationalParameter1.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4OperationalParameter1 (der.iff.type.4.sop.param1, Operational Parameter 1, 
-    /// section 8.3.4.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type4OperationalParameter1 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4OperationalParameter1 (der.iff.type.4.sop.param1, Operational Parameter 1, 
+    /// section 8.3.4.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type4OperationalParameter1 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
index 5b91deb..d449192 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4OperationalParameter2.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4OperationalParameter2 (der.iff.type.4.sop.param2, Operational Parameter 2, 
-    /// section 8.3.4.4.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type4OperationalParameter2 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4OperationalParameter2 (der.iff.type.4.sop.param2, Operational Parameter 2, 
+    /// section 8.3.4.4.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type4OperationalParameter2 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
index 6b9143d..7c58cfa 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter1.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4Parameter1 (der.iff.type.4.fop.param1, Parameter 1, 
-    /// section 8.3.4.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type4Parameter1 : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4Parameter1 (der.iff.type.4.fop.param1, Parameter 1, 
+    /// section 8.3.4.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type4Parameter1 : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
index ecea87e..29ae72c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter2.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4Parameter2 (der.iff.type.4.fop.param2, Parameter 2, 
-    /// section 8.3.4.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type4Parameter2 : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4Parameter2 (der.iff.type.4.fop.param2, Parameter 2, 
+    /// section 8.3.4.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type4Parameter2 : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
index 750d41f..7fe129a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter3.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4Parameter3 (der.iff.type.4.fop.param3, Parameter 3, 
-    /// section 8.3.4.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type4Parameter3 : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4Parameter3 (der.iff.type.4.fop.param3, Parameter 3, 
+    /// section 8.3.4.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type4Parameter3 : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
index abd0f6e..c4ec5ab 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter4.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4Parameter4 (der.iff.type.4.fop.param4, Parameter 4, 
-    /// section 8.3.4.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type4Parameter4 : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4Parameter4 (der.iff.type.4.fop.param4, Parameter 4, 
+    /// section 8.3.4.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type4Parameter4 : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
index de95d75..a87d036 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter5.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4Parameter5 (der.iff.type.4.fop.param5, Parameter 5, 
-    /// section 8.3.4.2.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type4Parameter5 : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4Parameter5 (der.iff.type.4.fop.param5, Parameter 5, 
+    /// section 8.3.4.2.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type4Parameter5 : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
index d97e9ed..331a9c6 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type4Parameter6.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type4Parameter6 (der.iff.type.4.fop.param6, Parameter 6, 
-    /// section 8.3.4.2.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type4Parameter6 : ushort
-    {
-        /// <summary>
-        /// Set bit means 'On', reset bit means 'Off'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'On', reset bit means 'Off'.")]
-        Status = 8192,
-
-        /// <summary>
-        /// Set bit means 'Damage', reset bit means 'No damage'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
-        Damage = 16384,
-
-        /// <summary>
-        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
-        Malfunction = 32768
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type4Parameter6 (der.iff.type.4.fop.param6, Parameter 6, 
+    /// section 8.3.4.2.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type4Parameter6 : ushort
+    {
+        /// <summary>
+        /// Set bit means 'On', reset bit means 'Off'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'On', reset bit means 'Off'.")]
+        Status = 8192,
+
+        /// <summary>
+        /// Set bit means 'Damage', reset bit means 'No damage'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Damage', reset bit means 'No damage'.")]
+        Damage = 16384,
+
+        /// <summary>
+        /// Set bit means 'Malfunction', reset bit means 'No malfunction'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Malfunction', reset bit means 'No malfunction'.")]
+        Malfunction = 32768
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
index 5333579..0901881 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5ChangeOptions.cs
@@ -1,40 +1,40 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type5ChangeOptions (der.iff.type.5.changeoptions, Change/Options, 
-    /// section 8.3.5.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum Type5ChangeOptions : byte
-    {
-        /// <summary>
-        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
-        ChangeIndicator = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type5ChangeOptions (der.iff.type.5.changeoptions, Change/Options, 
+    /// section 8.3.5.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum Type5ChangeOptions : byte
+    {
+        /// <summary>
+        /// Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Initial report or change since last report', reset bit means 'No change since last report'.")]
+        ChangeIndicator = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
index 6b86ce4..440f030 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5OperationalParameter1.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type5OperationalParameter1 (der.iff.type.5.sop.param1, Operational Parameter 1, 
-    /// section 8.3.5.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type5OperationalParameter1 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type5OperationalParameter1 (der.iff.type.5.sop.param1, Operational Parameter 1, 
+    /// section 8.3.5.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type5OperationalParameter1 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
index 32a5ada..5ca8dd9 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5OperationalParameter2.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type5OperationalParameter2 (der.iff.type.5.sop.param2, Operational Parameter 2, 
-    /// section 8.3.5.4.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Type5OperationalParameter2 : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type5OperationalParameter2 (der.iff.type.5.sop.param2, Operational Parameter 2, 
+    /// section 8.3.5.4.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Type5OperationalParameter2 : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
index af314ba..cd1b7fd 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.Iff/Type5Parameter1RRBResponse.cs
@@ -1,422 +1,422 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.Iff
-{
-    /// <summary>
-    /// Enumeration values for Type5Parameter1RRBResponse (der.iff.type.5.fop.param1, Parameter 1 - RRB Response, 
-    /// section 8.3.5.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Type5Parameter1RRBResponse
-    {
-        /// <summary>
-        /// Power Reduction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Power Reduction")]
-        public enum PowerReductionValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Radar Enhancement
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radar Enhancement")]
-        public enum RadarEnhancementValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status")]
-        public enum StatusValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Damage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damage
-            /// </summary>
-            Damage = 1
-        }
-
-        /// <summary>
-        /// Malfunction
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Malfunction")]
-        public enum MalfunctionValue : uint
-        {
-            /// <summary>
-            /// No malfunction
-            /// </summary>
-            NoMalfunction = 0,
-
-            /// <summary>
-            /// Malfunction
-            /// </summary>
-            Malfunction = 1
-        }
-
-        private byte code;
-        private Type5Parameter1RRBResponse.PowerReductionValue powerReduction;
-        private Type5Parameter1RRBResponse.RadarEnhancementValue radarEnhancement;
-        private Type5Parameter1RRBResponse.StatusValue status;
-        private Type5Parameter1RRBResponse.DamageValue damage;
-        private Type5Parameter1RRBResponse.MalfunctionValue malfunction;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Type5Parameter1RRBResponse left, Type5Parameter1RRBResponse right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Type5Parameter1RRBResponse left, Type5Parameter1RRBResponse right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Type5Parameter1RRBResponse obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Type5Parameter1RRBResponse(ushort value)
-        {
-            return Type5Parameter1RRBResponse.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Type5Parameter1RRBResponse FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance, represented by the ushort value.</returns>
-        public static Type5Parameter1RRBResponse FromUInt16(ushort value)
-        {
-            Type5Parameter1RRBResponse ps = new Type5Parameter1RRBResponse();
-
-            uint mask0 = 0x001f;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Code = (byte)newValue0;
-
-            uint mask2 = 0x0800;
-            byte shift2 = 11;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.PowerReduction = (Type5Parameter1RRBResponse.PowerReductionValue)newValue2;
-
-            uint mask3 = 0x1000;
-            byte shift3 = 12;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.RadarEnhancement = (Type5Parameter1RRBResponse.RadarEnhancementValue)newValue3;
-
-            uint mask4 = 0x2000;
-            byte shift4 = 13;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Status = (Type5Parameter1RRBResponse.StatusValue)newValue4;
-
-            uint mask5 = 0x4000;
-            byte shift5 = 14;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.Damage = (Type5Parameter1RRBResponse.DamageValue)newValue5;
-
-            uint mask6 = 0x8000;
-            byte shift6 = 15;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Malfunction = (Type5Parameter1RRBResponse.MalfunctionValue)newValue6;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the code.
-        /// </summary>
-        /// <value>The code.</value>
-        public byte Code
-        {
-            get { return this.code; }
-            set { this.code = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerreduction.
-        /// </summary>
-        /// <value>The powerreduction.</value>
-        public Type5Parameter1RRBResponse.PowerReductionValue PowerReduction
-        {
-            get { return this.powerReduction; }
-            set { this.powerReduction = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the radarenhancement.
-        /// </summary>
-        /// <value>The radarenhancement.</value>
-        public Type5Parameter1RRBResponse.RadarEnhancementValue RadarEnhancement
-        {
-            get { return this.radarEnhancement; }
-            set { this.radarEnhancement = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the status.
-        /// </summary>
-        /// <value>The status.</value>
-        public Type5Parameter1RRBResponse.StatusValue Status
-        {
-            get { return this.status; }
-            set { this.status = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public Type5Parameter1RRBResponse.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the malfunction.
-        /// </summary>
-        /// <value>The malfunction.</value>
-        public Type5Parameter1RRBResponse.MalfunctionValue Malfunction
-        {
-            get { return this.malfunction; }
-            set { this.malfunction = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Type5Parameter1RRBResponse))
-            {
-                return false;
-            }
-
-            return this.Equals((Type5Parameter1RRBResponse)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Type5Parameter1RRBResponse other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Code == other.Code &&
-                this.PowerReduction == other.PowerReduction &&
-                this.RadarEnhancement == other.RadarEnhancement &&
-                this.Status == other.Status &&
-                this.Damage == other.Damage &&
-                this.Malfunction == other.Malfunction;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.Code << 0);
-            val |= (ushort)((uint)this.PowerReduction << 11);
-            val |= (ushort)((uint)this.RadarEnhancement << 12);
-            val |= (ushort)((uint)this.Status << 13);
-            val |= (ushort)((uint)this.Damage << 14);
-            val |= (ushort)((uint)this.Malfunction << 15);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Code.GetHashCode();
-                hash = (hash * 29) + this.PowerReduction.GetHashCode();
-                hash = (hash * 29) + this.RadarEnhancement.GetHashCode();
-                hash = (hash * 29) + this.Status.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Malfunction.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.Iff
+{
+    /// <summary>
+    /// Enumeration values for Type5Parameter1RRBResponse (der.iff.type.5.fop.param1, Parameter 1 - RRB Response, 
+    /// section 8.3.5.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Type5Parameter1RRBResponse
+    {
+        /// <summary>
+        /// Power Reduction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Power Reduction")]
+        public enum PowerReductionValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Radar Enhancement
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radar Enhancement")]
+        public enum RadarEnhancementValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status")]
+        public enum StatusValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Damage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damage
+            /// </summary>
+            Damage = 1
+        }
+
+        /// <summary>
+        /// Malfunction
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Malfunction")]
+        public enum MalfunctionValue : uint
+        {
+            /// <summary>
+            /// No malfunction
+            /// </summary>
+            NoMalfunction = 0,
+
+            /// <summary>
+            /// Malfunction
+            /// </summary>
+            Malfunction = 1
+        }
+
+        private byte code;
+        private Type5Parameter1RRBResponse.PowerReductionValue powerReduction;
+        private Type5Parameter1RRBResponse.RadarEnhancementValue radarEnhancement;
+        private Type5Parameter1RRBResponse.StatusValue status;
+        private Type5Parameter1RRBResponse.DamageValue damage;
+        private Type5Parameter1RRBResponse.MalfunctionValue malfunction;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Type5Parameter1RRBResponse left, Type5Parameter1RRBResponse right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Type5Parameter1RRBResponse left, Type5Parameter1RRBResponse right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Type5Parameter1RRBResponse obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Type5Parameter1RRBResponse(ushort value)
+        {
+            return Type5Parameter1RRBResponse.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Type5Parameter1RRBResponse FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance, represented by the ushort value.</returns>
+        public static Type5Parameter1RRBResponse FromUInt16(ushort value)
+        {
+            Type5Parameter1RRBResponse ps = new Type5Parameter1RRBResponse();
+
+            uint mask0 = 0x001f;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Code = (byte)newValue0;
+
+            uint mask2 = 0x0800;
+            byte shift2 = 11;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.PowerReduction = (Type5Parameter1RRBResponse.PowerReductionValue)newValue2;
+
+            uint mask3 = 0x1000;
+            byte shift3 = 12;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.RadarEnhancement = (Type5Parameter1RRBResponse.RadarEnhancementValue)newValue3;
+
+            uint mask4 = 0x2000;
+            byte shift4 = 13;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Status = (Type5Parameter1RRBResponse.StatusValue)newValue4;
+
+            uint mask5 = 0x4000;
+            byte shift5 = 14;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.Damage = (Type5Parameter1RRBResponse.DamageValue)newValue5;
+
+            uint mask6 = 0x8000;
+            byte shift6 = 15;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Malfunction = (Type5Parameter1RRBResponse.MalfunctionValue)newValue6;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the code.
+        /// </summary>
+        /// <value>The code.</value>
+        public byte Code
+        {
+            get { return this.code; }
+            set { this.code = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerreduction.
+        /// </summary>
+        /// <value>The powerreduction.</value>
+        public Type5Parameter1RRBResponse.PowerReductionValue PowerReduction
+        {
+            get { return this.powerReduction; }
+            set { this.powerReduction = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the radarenhancement.
+        /// </summary>
+        /// <value>The radarenhancement.</value>
+        public Type5Parameter1RRBResponse.RadarEnhancementValue RadarEnhancement
+        {
+            get { return this.radarEnhancement; }
+            set { this.radarEnhancement = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public Type5Parameter1RRBResponse.StatusValue Status
+        {
+            get { return this.status; }
+            set { this.status = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public Type5Parameter1RRBResponse.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the malfunction.
+        /// </summary>
+        /// <value>The malfunction.</value>
+        public Type5Parameter1RRBResponse.MalfunctionValue Malfunction
+        {
+            get { return this.malfunction; }
+            set { this.malfunction = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Type5Parameter1RRBResponse))
+            {
+                return false;
+            }
+
+            return this.Equals((Type5Parameter1RRBResponse)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Type5Parameter1RRBResponse other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Code == other.Code &&
+                this.PowerReduction == other.PowerReduction &&
+                this.RadarEnhancement == other.RadarEnhancement &&
+                this.Status == other.Status &&
+                this.Damage == other.Damage &&
+                this.Malfunction == other.Malfunction;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.Iff.Type5Parameter1RRBResponse"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.Code << 0);
+            val |= (ushort)((uint)this.PowerReduction << 11);
+            val |= (ushort)((uint)this.RadarEnhancement << 12);
+            val |= (ushort)((uint)this.Status << 13);
+            val |= (ushort)((uint)this.Damage << 14);
+            val |= (ushort)((uint)this.Malfunction << 15);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Code.GetHashCode();
+                hash = (hash * 29) + this.PowerReduction.GetHashCode();
+                hash = (hash * 29) + this.RadarEnhancement.GetHashCode();
+                hash = (hash * 29) + this.Status.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Malfunction.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
index a567a4a..d132a0f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/ActiveEmissionParameterIndex.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for ActiveEmissionParameterIndex (der.ua.activeparameterindex, Active Emission Parameter Index, 
-    /// section 8.4.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ActiveEmissionParameterIndex : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for ActiveEmissionParameterIndex (der.ua.activeparameterindex, Active Emission Parameter Index, 
+    /// section 8.4.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ActiveEmissionParameterIndex : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
index 5f24c9d..940feaf 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/AdditionalPassiveActivityParameterIndex.cs
@@ -1,52 +1,52 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for AdditionalPassiveActivityParameterIndex (der.ua.apaparameterindex, Additional Passive Activity Parameter Index, 
-    /// section 8.4.8)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    /// <remarks>
-    /// Values from 32769 to 65535: Reserved for classified enumerations
-    /// </remarks>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AdditionalPassiveActivityParameterIndex : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Graham's MKV Coffee Maker.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Graham's MKV Coffee Maker.")]
-        GrahamSMKVCoffeeMaker = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for AdditionalPassiveActivityParameterIndex (der.ua.apaparameterindex, Additional Passive Activity Parameter Index, 
+    /// section 8.4.8)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    /// <remarks>
+    /// Values from 32769 to 65535: Reserved for classified enumerations
+    /// </remarks>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AdditionalPassiveActivityParameterIndex : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Graham's MKV Coffee Maker.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Graham's MKV Coffee Maker.")]
+        GrahamSMKVCoffeeMaker = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
index c41c70c..b218670 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/EmitterFunction.cs
@@ -1,79 +1,79 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for EmitterFunction (der.ua.function, Function, 
-    /// section 8.4.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EmitterFunction : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Platform search/detect/track.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Platform search/detect/track.")]
-        PlatformSearchDetectTrack = 1,
-
-        /// <summary>
-        /// Navigation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Navigation.")]
-        Navigation = 2,
-
-        /// <summary>
-        /// Mine hunting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine hunting.")]
-        MineHunting = 3,
-
-        /// <summary>
-        /// Weapon search/detect/track/detect.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon search/detect/track/detect.")]
-        WeaponSearchDetectTrackDetect = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for EmitterFunction (der.ua.function, Function, 
+    /// section 8.4.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EmitterFunction : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Platform search/detect/track.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Platform search/detect/track.")]
+        PlatformSearchDetectTrack = 1,
+
+        /// <summary>
+        /// Navigation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Navigation.")]
+        Navigation = 2,
+
+        /// <summary>
+        /// Mine hunting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine hunting.")]
+        MineHunting = 3,
+
+        /// <summary>
+        /// Weapon search/detect/track/detect.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon search/detect/track/detect.")]
+        WeaponSearchDetectTrackDetect = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
index ed19508..3feb6ef 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/PassiveParameterIndex.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for PassiveParameterIndex (der.ua.passiveparameterindex, Passive Parameter Index, 
-    /// section 8.4.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum PassiveParameterIndex : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for PassiveParameterIndex (der.ua.passiveparameterindex, Passive Parameter Index, 
+    /// section 8.4.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum PassiveParameterIndex : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
index 086fee0..b2fba4e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/PropulsionPlantConfiguration.cs
@@ -1,318 +1,318 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for PropulsionPlantConfiguration (der.ua.ppcfg, Propulsion Plant Configuration, 
-    /// section 8.4.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct PropulsionPlantConfiguration
-    {
-        /// <summary>
-        /// Run internal simulation clock.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Run internal simulation clock.")]
-        public enum ConfigurationValue : uint
-        {
-            /// <summary>
-            /// Other
-            /// </summary>
-            Other = 0,
-
-            /// <summary>
-            /// Diesel/electric
-            /// </summary>
-            DieselElectric = 1,
-
-            /// <summary>
-            /// Diesel
-            /// </summary>
-            Diesel = 2,
-
-            /// <summary>
-            /// Battery
-            /// </summary>
-            Battery = 3,
-
-            /// <summary>
-            /// Turbine reduction
-            /// </summary>
-            TurbineReduction = 4,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 5,
-
-            /// <summary>
-            /// Steam
-            /// </summary>
-            Steam = 6,
-
-            /// <summary>
-            /// Gas turbine
-            /// </summary>
-            GasTurbine = 7,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown2 = 8
-        }
-
-        /// <summary>
-        /// Hull Mounted Masker status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hull Mounted Masker status")]
-        public enum HullMountedMaskerValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        private PropulsionPlantConfiguration.ConfigurationValue configuration;
-        private PropulsionPlantConfiguration.HullMountedMaskerValue hullMountedMasker;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PropulsionPlantConfiguration left, PropulsionPlantConfiguration right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PropulsionPlantConfiguration left, PropulsionPlantConfiguration right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(PropulsionPlantConfiguration obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator PropulsionPlantConfiguration(uint value)
-        {
-            return PropulsionPlantConfiguration.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static PropulsionPlantConfiguration FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance, represented by the uint value.</returns>
-        public static PropulsionPlantConfiguration FromUInt32(uint value)
-        {
-            PropulsionPlantConfiguration ps = new PropulsionPlantConfiguration();
-
-            uint mask0 = 0x007f;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Configuration = (PropulsionPlantConfiguration.ConfigurationValue)newValue0;
-
-            uint mask1 = 0x0080;
-            byte shift1 = 7;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.HullMountedMasker = (PropulsionPlantConfiguration.HullMountedMaskerValue)newValue1;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration.
-        /// </summary>
-        /// <value>The configuration.</value>
-        public PropulsionPlantConfiguration.ConfigurationValue Configuration
-        {
-            get { return this.configuration; }
-            set { this.configuration = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the hullmountedmasker.
-        /// </summary>
-        /// <value>The hullmountedmasker.</value>
-        public PropulsionPlantConfiguration.HullMountedMaskerValue HullMountedMasker
-        {
-            get { return this.hullMountedMasker; }
-            set { this.hullMountedMasker = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is PropulsionPlantConfiguration))
-            {
-                return false;
-            }
-
-            return this.Equals((PropulsionPlantConfiguration)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PropulsionPlantConfiguration other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Configuration == other.Configuration &&
-                this.HullMountedMasker == other.HullMountedMasker;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Configuration << 0);
-            val |= (uint)((uint)this.HullMountedMasker << 7);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Configuration.GetHashCode();
-                hash = (hash * 29) + this.HullMountedMasker.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for PropulsionPlantConfiguration (der.ua.ppcfg, Propulsion Plant Configuration, 
+    /// section 8.4.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct PropulsionPlantConfiguration
+    {
+        /// <summary>
+        /// Run internal simulation clock.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Run internal simulation clock.")]
+        public enum ConfigurationValue : uint
+        {
+            /// <summary>
+            /// Other
+            /// </summary>
+            Other = 0,
+
+            /// <summary>
+            /// Diesel/electric
+            /// </summary>
+            DieselElectric = 1,
+
+            /// <summary>
+            /// Diesel
+            /// </summary>
+            Diesel = 2,
+
+            /// <summary>
+            /// Battery
+            /// </summary>
+            Battery = 3,
+
+            /// <summary>
+            /// Turbine reduction
+            /// </summary>
+            TurbineReduction = 4,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 5,
+
+            /// <summary>
+            /// Steam
+            /// </summary>
+            Steam = 6,
+
+            /// <summary>
+            /// Gas turbine
+            /// </summary>
+            GasTurbine = 7,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown2 = 8
+        }
+
+        /// <summary>
+        /// Hull Mounted Masker status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hull Mounted Masker status")]
+        public enum HullMountedMaskerValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        private PropulsionPlantConfiguration.ConfigurationValue configuration;
+        private PropulsionPlantConfiguration.HullMountedMaskerValue hullMountedMasker;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PropulsionPlantConfiguration left, PropulsionPlantConfiguration right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PropulsionPlantConfiguration left, PropulsionPlantConfiguration right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(PropulsionPlantConfiguration obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator PropulsionPlantConfiguration(uint value)
+        {
+            return PropulsionPlantConfiguration.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static PropulsionPlantConfiguration FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance, represented by the uint value.</returns>
+        public static PropulsionPlantConfiguration FromUInt32(uint value)
+        {
+            PropulsionPlantConfiguration ps = new PropulsionPlantConfiguration();
+
+            uint mask0 = 0x007f;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Configuration = (PropulsionPlantConfiguration.ConfigurationValue)newValue0;
+
+            uint mask1 = 0x0080;
+            byte shift1 = 7;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.HullMountedMasker = (PropulsionPlantConfiguration.HullMountedMaskerValue)newValue1;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the configuration.
+        /// </summary>
+        /// <value>The configuration.</value>
+        public PropulsionPlantConfiguration.ConfigurationValue Configuration
+        {
+            get { return this.configuration; }
+            set { this.configuration = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the hullmountedmasker.
+        /// </summary>
+        /// <value>The hullmountedmasker.</value>
+        public PropulsionPlantConfiguration.HullMountedMaskerValue HullMountedMasker
+        {
+            get { return this.hullMountedMasker; }
+            set { this.hullMountedMasker = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is PropulsionPlantConfiguration))
+            {
+                return false;
+            }
+
+            return this.Equals((PropulsionPlantConfiguration)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PropulsionPlantConfiguration other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Configuration == other.Configuration &&
+                this.HullMountedMasker == other.HullMountedMasker;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic.PropulsionPlantConfiguration"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Configuration << 0);
+            val |= (uint)((uint)this.HullMountedMasker << 7);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Configuration.GetHashCode();
+                hash = (hash * 29) + this.HullMountedMasker.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
index f3a31a7..610931d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/ScanPattern.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for ScanPattern (der.ua.scanpattern, Scan Pattern, 
-    /// section 8.4.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ScanPattern : ushort
-    {
-        /// <summary>
-        /// Scan pattern not used.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scan pattern not used.")]
-        ScanPatternNotUsed = 0,
-
-        /// <summary>
-        /// Conical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Conical.")]
-        Conical = 1,
-
-        /// <summary>
-        /// Helical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Helical.")]
-        Helical = 2,
-
-        /// <summary>
-        /// Raster.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raster.")]
-        Raster = 3,
-
-        /// <summary>
-        /// Sector search.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sector search.")]
-        SectorSearch = 4,
-
-        /// <summary>
-        /// Continuous search.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Continuous search.")]
-        ContinuousSearch = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for ScanPattern (der.ua.scanpattern, Scan Pattern, 
+    /// section 8.4.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ScanPattern : ushort
+    {
+        /// <summary>
+        /// Scan pattern not used.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scan pattern not used.")]
+        ScanPatternNotUsed = 0,
+
+        /// <summary>
+        /// Conical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Conical.")]
+        Conical = 1,
+
+        /// <summary>
+        /// Helical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Helical.")]
+        Helical = 2,
+
+        /// <summary>
+        /// Raster.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raster.")]
+        Raster = 3,
+
+        /// <summary>
+        /// Sector search.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sector search.")]
+        SectorSearch = 4,
+
+        /// <summary>
+        /// Continuous search.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Continuous search.")]
+        ContinuousSearch = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
index 53ec7f6..b55ea83 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/StateChangeUpdateIndicator.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for StateChangeUpdateIndicator (der.ua.statechangeupdate, State/Change Update indicator, 
-    /// section 8.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum StateChangeUpdateIndicator : byte
-    {
-        /// <summary>
-        /// State Update.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("State Update.")]
-        StateUpdate = 0,
-
-        /// <summary>
-        /// Changed Data Update.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Changed Data Update.")]
-        ChangedDataUpdate = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for StateChangeUpdateIndicator (der.ua.statechangeupdate, State/Change Update indicator, 
+    /// section 8.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum StateChangeUpdateIndicator : byte
+    {
+        /// <summary>
+        /// State Update.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("State Update.")]
+        StateUpdate = 0,
+
+        /// <summary>
+        /// Changed Data Update.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Changed Data Update.")]
+        ChangedDataUpdate = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
index 2ee80d5..e47eb90 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission.UnderwaterAcoustic/SystemName.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
-{
-    /// <summary>
-    /// Enumeration values for SystemName (der.ua.systemname, Acoustic System Name, 
-    /// section 8.4.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SystemName : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// AN/BQQ-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/BQQ-5.")]
-        ANBQQ5 = 1,
-
-        /// <summary>
-        /// AN/SSQ-62.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SSQ-62.")]
-        ANSSQ62 = 2,
-
-        /// <summary>
-        /// AN/SQS-23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SQS-23.")]
-        ANSQS23 = 3,
-
-        /// <summary>
-        /// AN/SQS-26.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SQS-26.")]
-        ANSQS26 = 4,
-
-        /// <summary>
-        /// AN/SQS-53.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SQS-53.")]
-        ANSQS53 = 5,
-
-        /// <summary>
-        /// ALFS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ALFS.")]
-        ALFS = 6,
-
-        /// <summary>
-        /// LFA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LFA.")]
-        LFA = 7,
-
-        /// <summary>
-        /// AN/AQS-901.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/AQS-901.")]
-        ANAQS901 = 8,
-
-        /// <summary>
-        /// AN/AQS-902.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/AQS-902.")]
-        ANAQS902 = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission.UnderwaterAcoustic
+{
+    /// <summary>
+    /// Enumeration values for SystemName (der.ua.systemname, Acoustic System Name, 
+    /// section 8.4.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SystemName : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// AN/BQQ-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/BQQ-5.")]
+        ANBQQ5 = 1,
+
+        /// <summary>
+        /// AN/SSQ-62.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SSQ-62.")]
+        ANSSQ62 = 2,
+
+        /// <summary>
+        /// AN/SQS-23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SQS-23.")]
+        ANSQS23 = 3,
+
+        /// <summary>
+        /// AN/SQS-26.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SQS-26.")]
+        ANSQS26 = 4,
+
+        /// <summary>
+        /// AN/SQS-53.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SQS-53.")]
+        ANSQS53 = 5,
+
+        /// <summary>
+        /// ALFS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ALFS.")]
+        ALFS = 6,
+
+        /// <summary>
+        /// LFA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LFA.")]
+        LFA = 7,
+
+        /// <summary>
+        /// AN/AQS-901.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/AQS-901.")]
+        ANAQS901 = 8,
+
+        /// <summary>
+        /// AN/AQS-902.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/AQS-902.")]
+        ANAQS902 = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/AircraftEnginePower.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/AircraftEnginePower.cs
index cf886ef..c35d050 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/AircraftEnginePower.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/AircraftEnginePower.cs
@@ -1,79 +1,79 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for AircraftEnginePower (der.sees.power.aircraft, Aircraft, 
-    /// section 8.5.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AircraftEnginePower : int
-    {
-        /// <summary>
-        /// Engine Off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Engine Off.")]
-        EngineOff = -100,
-
-        /// <summary>
-        /// Idle Power.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Idle Power.")]
-        IdlePower = 0,
-
-        /// <summary>
-        /// Mil. Power.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mil. Power.")]
-        MilPower = 50,
-
-        /// <summary>
-        /// Min. A/B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Min. A/B.")]
-        MinAB = 51,
-
-        /// <summary>
-        /// Max. A/B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Max. A/B.")]
-        MaxAB = 100
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for AircraftEnginePower (der.sees.power.aircraft, Aircraft, 
+    /// section 8.5.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AircraftEnginePower : int
+    {
+        /// <summary>
+        /// Engine Off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Engine Off.")]
+        EngineOff = -100,
+
+        /// <summary>
+        /// Idle Power.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Idle Power.")]
+        IdlePower = 0,
+
+        /// <summary>
+        /// Mil. Power.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mil. Power.")]
+        MilPower = 50,
+
+        /// <summary>
+        /// Min. A/B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Min. A/B.")]
+        MinAB = 51,
+
+        /// <summary>
+        /// Max. A/B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Max. A/B.")]
+        MaxAB = 100
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/DesignatorCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/DesignatorCode.cs
index 5e4ace6..37f0b8a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCode.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/DesignatorCode.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for DesignatorCode (der.designator.code, Designator Code, 
-    /// section 8.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DesignatorCode : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for DesignatorCode (der.designator.code, Designator Code, 
+    /// section 8.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DesignatorCode : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/DesignatorCodeName.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/DesignatorCodeName.cs
index 54e8788..ebbda6f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/DesignatorCodeName.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/DesignatorCodeName.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for DesignatorCodeName (der.designator.codename, Code Name, 
-    /// section 8.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DesignatorCodeName : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for DesignatorCodeName (der.designator.codename, Code Name, 
+    /// section 8.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DesignatorCodeName : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
index 3aab7d3..9a35a4c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/ElectromagneticEmitters.cs
@@ -1,11839 +1,11839 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for ElectromagneticEmitters (der.emission.name.electro, Electromagnetic emitters, 
-    /// section 8.1.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ElectromagneticEmitters : ushort
-    {
-        /// <summary>
-        /// 1RL138.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1RL138.")]
-        _1RL138 = 10,
-
-        /// <summary>
-        /// 1226 DECCA MIL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1226 DECCA MIL.")]
-        _1226DECCAMIL = 45,
-
-        /// <summary>
-        /// 9GR400.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("9GR400.")]
-        _9GR400 = 80,
-
-        /// <summary>
-        /// 9GR600.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("9GR600.")]
-        _9GR600 = 90,
-
-        /// <summary>
-        /// 9LV 200 TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("9LV 200 TA.")]
-        _9LV200TA = 135,
-
-        /// <summary>
-        /// 9LV 200 TV.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("9LV 200 TV.")]
-        _9LV200TV = 180,
-
-        /// <summary>
-        /// A310Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A310Z.")]
-        A310Z = 225,
-
-        /// <summary>
-        /// A325A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A325A.")]
-        A325A = 270,
-
-        /// <summary>
-        /// A346Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A346Z.")]
-        A346Z = 315,
-
-        /// <summary>
-        /// A353B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A353B.")]
-        A353B = 360,
-
-        /// <summary>
-        /// A372A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A372A.")]
-        A372A = 405,
-
-        /// <summary>
-        /// A372B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A372B.")]
-        A372B = 450,
-
-        /// <summary>
-        /// A372C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A372C.")]
-        A372C = 495,
-
-        /// <summary>
-        /// A377A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A377A.")]
-        A377A = 540,
-
-        /// <summary>
-        /// A377B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A377B.")]
-        A377B = 585,
-
-        /// <summary>
-        /// A380Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A380Z.")]
-        A380Z = 630,
-
-        /// <summary>
-        /// A381Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A381Z.")]
-        A381Z = 675,
-
-        /// <summary>
-        /// A398Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A398Z.")]
-        A398Z = 720,
-
-        /// <summary>
-        /// A403Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A403Z.")]
-        A403Z = 765,
-
-        /// <summary>
-        /// A409A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A409A.")]
-        A409A = 810,
-
-        /// <summary>
-        /// A418A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A418A.")]
-        A418A = 855,
-
-        /// <summary>
-        /// A419Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A419Z.")]
-        A419Z = 900,
-
-        /// <summary>
-        /// A429Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A429Z.")]
-        A429Z = 945,
-
-        /// <summary>
-        /// A432Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A432Z.")]
-        A432Z = 990,
-
-        /// <summary>
-        /// A434Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A434Z.")]
-        A434Z = 1035,
-
-        /// <summary>
-        /// A401A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A401A.")]
-        A401A = 1080,
-
-        /// <summary>
-        /// AA-12 Seeker.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AA-12 Seeker.")]
-        AA12Seeker = 1095,
-
-        /// <summary>
-        /// Agave.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Agave.")]
-        Agave = 1100,
-
-        /// <summary>
-        /// AGRION 15.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AGRION 15.")]
-        AGRION15 = 1125,
-
-        /// <summary>
-        /// AI MK 23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AI MK 23.")]
-        AIMK23 = 1170,
-
-        /// <summary>
-        /// AIDA II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AIDA II.")]
-        AIDAII = 1215,
-
-        /// <summary>
-        /// Albatros MK2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Albatros MK2.")]
-        AlbatrosMK2 = 1260,
-
-        /// <summary>
-        /// Box Spring.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Box Spring.")]
-        BoxSpring = 1280,
-
-        /// <summary>
-        /// Box Spring B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Box Spring B.")]
-        BoxSpringB = 1282,
-
-        /// <summary>
-        /// ANA SPS 502.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ANA SPS 502.")]
-        ANASPS502 = 1305,
-
-        /// <summary>
-        /// ANRITSU Electric AR-30A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ANRITSU Electric AR-30A.")]
-        ANRITSUElectricAR30A = 1350,
-
-        /// <summary>
-        /// Antilope V.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antilope V.")]
-        AntilopeV = 1395,
-
-        /// <summary>
-        /// AN/ALE-50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALE-50.")]
-        ANALE50 = 1400,
-
-        /// <summary>
-        /// AN/ALQ 99.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ 99.")]
-        ANALQ99 = 1440,
-
-        /// <summary>
-        /// AN/ALQ-100.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-100.")]
-        ANALQ100 = 1485,
-
-        /// <summary>
-        /// AN/ALQ-101.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-101.")]
-        ANALQ101 = 1530,
-
-        /// <summary>
-        /// AN/ALQ-119.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-119.")]
-        ANALQ119 = 1575,
-
-        /// <summary>
-        /// AN/ALQ-122.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-122.")]
-        ANALQ122 = 1585,
-
-        /// <summary>
-        /// AN/ALQ-126A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-126A.")]
-        ANALQ126A = 1620,
-
-        /// <summary>
-        /// AN/ALQ-131.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-131.")]
-        ANALQ131 = 1626,
-
-        /// <summary>
-        /// AN/ALQ-135C/D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-135C/D.")]
-        ANALQ135CD = 1628,
-
-        /// <summary>
-        /// AN/ALQ-144A(V)3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-144A(V)3.")]
-        ANALQ144AV3 = 1630,
-
-        /// <summary>
-        /// AN/ALQ-153.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-153.")]
-        ANALQ153 = 1632,
-
-        /// <summary>
-        /// AN/ALQ-155.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-155.")]
-        ANALQ155 = 1634,
-
-        /// <summary>
-        /// AN/ALQ-161/A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-161/A.")]
-        ANALQ161A = 1636,
-
-        /// <summary>
-        /// AN/ALQ-162.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-162.")]
-        ANALQ162 = 1638,
-
-        /// <summary>
-        /// AN/ALQ-165.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-165.")]
-        ANALQ165 = 1640,
-
-        /// <summary>
-        /// AN/ALQ-167.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-167.")]
-        ANALQ167 = 1642,
-
-        /// <summary>
-        /// AN/ALQ-172(V)2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-172(V)2.")]
-        ANALQ172V2 = 1644,
-
-        /// <summary>
-        /// AN/ALQ-176.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-176.")]
-        ANALQ176 = 1646,
-
-        /// <summary>
-        /// AN/ALQ-184.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-184.")]
-        ANALQ184 = 1648,
-
-        /// <summary>
-        /// AN/ALQ-188.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALQ-188.")]
-        ANALQ188 = 1650,
-
-        /// <summary>
-        /// AN/ALR-56.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALR-56.")]
-        ANALR56 = 1652,
-
-        /// <summary>
-        /// AN/ALR-69.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALR-69.")]
-        ANALR69 = 1654,
-
-        /// <summary>
-        /// AN/ALT-16A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALT-16A.")]
-        ANALT16A = 1656,
-
-        /// <summary>
-        /// AN/ALT-28.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALT-28.")]
-        ANALT28 = 1658,
-
-        /// <summary>
-        /// AN/ALT-32A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ALT-32A.")]
-        ANALT32A = 1660,
-
-        /// <summary>
-        /// AN/APD 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APD 10.")]
-        ANAPD10 = 1665,
-
-        /// <summary>
-        /// AN/APG 53.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG 53.")]
-        ANAPG53 = 1710,
-
-        /// <summary>
-        /// AN/APG 59.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG 59.")]
-        ANAPG59 = 1755,
-
-        /// <summary>
-        /// AN/APG-63.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-63.")]
-        ANAPG63 = 1800,
-
-        /// <summary>
-        /// AN/APG-63(V)1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-63(V)1.")]
-        ANAPG63V1 = 1805,
-
-        /// <summary>
-        /// AN/APG-63(V)2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-63(V)2.")]
-        ANAPG63V2 = 1807,
-
-        /// <summary>
-        /// AN/APG-63(V)3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-63(V)3.")]
-        ANAPG63V3 = 1809,
-
-        /// <summary>
-        /// AN/APG 65.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG 65.")]
-        ANAPG65 = 1845,
-
-        /// <summary>
-        /// AN/APG-66.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-66.")]
-        ANAPG66 = 1870,
-
-        /// <summary>
-        /// AN/APG 68.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG 68.")]
-        ANAPG68 = 1890,
-
-        /// <summary>
-        /// AN/APG 70.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG 70.")]
-        ANAPG70 = 1935,
-
-        /// <summary>
-        /// AN/APG-73.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-73.")]
-        ANAPG73 = 1945,
-
-        /// <summary>
-        /// AN/APG-77.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-77.")]
-        ANAPG77 = 1960,
-
-        /// <summary>
-        /// AN/APG-78.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-78.")]
-        ANAPG78 = 1970,
-
-        /// <summary>
-        /// AN/APG-502.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APG-502.")]
-        ANAPG502 = 1980,
-
-        /// <summary>
-        /// AN/APN-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-1.")]
-        ANAPN1 = 2025,
-
-        /// <summary>
-        /// AN/APN-22.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-22.")]
-        ANAPN22 = 2070,
-
-        /// <summary>
-        /// AN/APN 59.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN 59.")]
-        ANAPN59 = 2115,
-
-        /// <summary>
-        /// AN/APN-69.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-69.")]
-        ANAPN69 = 2160,
-
-        /// <summary>
-        /// AN/APN-81.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-81.")]
-        ANAPN81 = 2205,
-
-        /// <summary>
-        /// AN/APN-117.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-117.")]
-        ANAPN117 = 2250,
-
-        /// <summary>
-        /// AN/APN-118.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-118.")]
-        ANAPN118 = 2295,
-
-        /// <summary>
-        /// AN/APN-130.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-130.")]
-        ANAPN130 = 2340,
-
-        /// <summary>
-        /// AN/APN-131.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-131.")]
-        ANAPN131 = 2385,
-
-        /// <summary>
-        /// AN/APN-133.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-133.")]
-        ANAPN133 = 2430,
-
-        /// <summary>
-        /// AN/APN-134.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-134.")]
-        ANAPN134 = 2475,
-
-        /// <summary>
-        /// AN/APN-147.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-147.")]
-        ANAPN147 = 2520,
-
-        /// <summary>
-        /// AN/APN-150.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-150.")]
-        ANAPN150 = 2565,
-
-        /// <summary>
-        /// AN/APN-153.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-153.")]
-        ANAPN153 = 2610,
-
-        /// <summary>
-        /// AN/APN 154.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN 154.")]
-        ANAPN154 = 2655,
-
-        /// <summary>
-        /// AN/APN-155.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-155.")]
-        ANAPN155 = 2700,
-
-        /// <summary>
-        /// AN/APN-159.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-159.")]
-        ANAPN159 = 2745,
-
-        /// <summary>
-        /// AN/APN-182.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-182.")]
-        ANAPN182 = 2790,
-
-        /// <summary>
-        /// AN/APN-187.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-187.")]
-        ANAPN187 = 2835,
-
-        /// <summary>
-        /// AN/APN-190.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-190.")]
-        ANAPN190 = 2880,
-
-        /// <summary>
-        /// AN/APN 194.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN 194.")]
-        ANAPN194 = 2925,
-
-        /// <summary>
-        /// AN/APN-195.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-195.")]
-        ANAPN195 = 2970,
-
-        /// <summary>
-        /// AN/APN-198.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-198.")]
-        ANAPN198 = 3015,
-
-        /// <summary>
-        /// AN/APN-200.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-200.")]
-        ANAPN200 = 3060,
-
-        /// <summary>
-        /// AN/APN 202.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN 202.")]
-        ANAPN202 = 3105,
-
-        /// <summary>
-        /// AN/APN-217.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-217.")]
-        ANAPN217 = 3150,
-
-        /// <summary>
-        /// AN/APN-218.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-218.")]
-        ANAPN218 = 3152,
-
-        /// <summary>
-        /// AN/APN-238.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-238.")]
-        ANAPN238 = 3160,
-
-        /// <summary>
-        /// AN/APN-239.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-239.")]
-        ANAPN239 = 3162,
-
-        /// <summary>
-        /// AN/APN-241.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-241.")]
-        ANAPN241 = 3164,
-
-        /// <summary>
-        /// AN/APN-242.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-242.")]
-        ANAPN242 = 3166,
-
-        /// <summary>
-        /// AN/APN-506.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APN-506.")]
-        ANAPN506 = 3195,
-
-        /// <summary>
-        /// AN/APQ-72.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-72.")]
-        ANAPQ72 = 3240,
-
-        /// <summary>
-        /// AN/APQ-99.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-99.")]
-        ANAPQ99 = 3285,
-
-        /// <summary>
-        /// AN/APQ 100.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ 100.")]
-        ANAPQ100 = 3330,
-
-        /// <summary>
-        /// AN/APQ-102.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-102.")]
-        ANAPQ102 = 3375,
-
-        /// <summary>
-        /// AN/APQ-109.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-109.")]
-        ANAPQ109 = 3420,
-
-        /// <summary>
-        /// AN/APQ 113.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ 113.")]
-        ANAPQ113 = 3465,
-
-        /// <summary>
-        /// AN/APQ 120.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ 120.")]
-        ANAPQ120 = 3510,
-
-        /// <summary>
-        /// AN/APQ 126.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ 126.")]
-        ANAPQ126 = 3555,
-
-        /// <summary>
-        /// AN/APQ-128.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-128.")]
-        ANAPQ128 = 3600,
-
-        /// <summary>
-        /// AN/APQ-129.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-129.")]
-        ANAPQ129 = 3645,
-
-        /// <summary>
-        /// AN/APQ 148.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ 148.")]
-        ANAPQ148 = 3690,
-
-        /// <summary>
-        /// AN/APQ-153.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-153.")]
-        ANAPQ153 = 3735,
-
-        /// <summary>
-        /// AN/APQ 159.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ 159.")]
-        ANAPQ159 = 3780,
-
-        /// <summary>
-        /// AN/APQ-164.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-164.")]
-        ANAPQ164 = 3785,
-
-        /// <summary>
-        /// AN/APQ-166.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-166.")]
-        ANAPQ166 = 3788,
-
-        /// <summary>
-        /// AN/APQ-181.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APQ-181.")]
-        ANAPQ181 = 3795,
-
-        /// <summary>
-        /// AN/APS-31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-31.")]
-        ANAPS31 = 3820,
-
-        /// <summary>
-        /// AN/APS-42.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-42.")]
-        ANAPS42 = 3825,
-
-        /// <summary>
-        /// AN/APS 80.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 80.")]
-        ANAPS80 = 3870,
-
-        /// <summary>
-        /// AN/APS-88.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-88.")]
-        ANAPS88 = 3915,
-
-        /// <summary>
-        /// AN/APS 115.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 115.")]
-        ANAPS115 = 3960,
-
-        /// <summary>
-        /// AN/APS 116.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 116.")]
-        ANAPS116 = 4005,
-
-        /// <summary>
-        /// AN/APS-120.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-120.")]
-        ANAPS120 = 4050,
-
-        /// <summary>
-        /// AN/APS 121.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 121.")]
-        ANAPS121 = 4095,
-
-        /// <summary>
-        /// AN/APS 124.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 124.")]
-        ANAPS124 = 4140,
-
-        /// <summary>
-        /// AN/APS 125.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 125.")]
-        ANAPS125 = 4185,
-
-        /// <summary>
-        /// AN/APS-128.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-128.")]
-        ANAPS128 = 4230,
-
-        /// <summary>
-        /// AN/APS 130.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 130.")]
-        ANAPS130 = 4275,
-
-        /// <summary>
-        /// AN/APS 133.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 133.")]
-        ANAPS133 = 4320,
-
-        /// <summary>
-        /// AN/APS-134.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-134.")]
-        ANAPS134 = 4365,
-
-        /// <summary>
-        /// AN/APS 137.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS 137.")]
-        ANAPS137 = 4410,
-
-        /// <summary>
-        /// AN/APS-138.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-138.")]
-        ANAPS138 = 4455,
-
-        /// <summary>
-        /// AN/APS-143 (V) 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APS-143 (V) 1.")]
-        ANAPS143V1 = 4465,
-
-        /// <summary>
-        /// AN/APW 22.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APW 22.")]
-        ANAPW22 = 4500,
-
-        /// <summary>
-        /// AN/APW 23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APW 23.")]
-        ANAPW23 = 4545,
-
-        /// <summary>
-        /// AN/APX-6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX-6.")]
-        ANAPX6 = 4590,
-
-        /// <summary>
-        /// AN/APX 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX 7.")]
-        ANAPX7 = 4635,
-
-        /// <summary>
-        /// AN/APX 39.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX 39.")]
-        ANAPX39 = 4680,
-
-        /// <summary>
-        /// AN/APX-72.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX-72.")]
-        ANAPX72 = 4725,
-
-        /// <summary>
-        /// AN/APX 76.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX 76.")]
-        ANAPX76 = 4770,
-
-        /// <summary>
-        /// AN/APX 78.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX 78.")]
-        ANAPX78 = 4815,
-
-        /// <summary>
-        /// AN/APX 101.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX 101.")]
-        ANAPX101 = 4860,
-
-        /// <summary>
-        /// AN/APX-113 AIFF.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APX-113 AIFF.")]
-        ANAPX113AIFF = 4870,
-
-        /// <summary>
-        /// AN/APY-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APY-1.")]
-        ANAPY1 = 4900,
-
-        /// <summary>
-        /// AN/APY 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APY 2.")]
-        ANAPY2 = 4905,
-
-        /// <summary>
-        /// AN/APY 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/APY 3.")]
-        ANAPY3 = 4950,
-
-        /// <summary>
-        /// LYNX(tm).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LYNX(tm).")]
-        LYNXTm = 4953,
-
-        /// <summary>
-        /// AN/ARN 21.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ARN 21.")]
-        ANARN21 = 4995,
-
-        /// <summary>
-        /// AN/ARN 52.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ARN 52.")]
-        ANARN52 = 5040,
-
-        /// <summary>
-        /// AN/ARN 84.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ARN 84.")]
-        ANARN84 = 5085,
-
-        /// <summary>
-        /// AN/ARN 118.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ARN 118.")]
-        ANARN118 = 5130,
-
-        /// <summary>
-        /// AN/ARW 73.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ARW 73.")]
-        ANARW73 = 5175,
-
-        /// <summary>
-        /// AN/ASB 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ASB 1.")]
-        ANASB1 = 5220,
-
-        /// <summary>
-        /// AN/ASG 21.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ASG 21.")]
-        ANASG21 = 5265,
-
-        /// <summary>
-        /// AN/ASQ-108.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ASQ-108.")]
-        ANASQ108 = 5280,
-
-        /// <summary>
-        /// AN/AWG 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/AWG 9.")]
-        ANAWG9 = 5310,
-
-        /// <summary>
-        /// AN/BPS-9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/BPS-9.")]
-        ANBPS9 = 5355,
-
-        /// <summary>
-        /// AN/BPS 15.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/BPS 15.")]
-        ANBPS15 = 5400,
-
-        /// <summary>
-        /// AN/BPS-16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/BPS-16.")]
-        ANBPS16 = 5405,
-
-        /// <summary>
-        /// AN/CRM-30.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/CRM-30.")]
-        ANCRM30 = 5420,
-
-        /// <summary>
-        /// AN/DPW-23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/DPW-23.")]
-        ANDPW23 = 5430,
-
-        /// <summary>
-        /// AN/DSQ 26 Phoenix MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/DSQ 26 Phoenix MH.")]
-        ANDSQ26PhoenixMH = 5445,
-
-        /// <summary>
-        /// AN/DSQ 28 Harpoon MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/DSQ 28 Harpoon MH.")]
-        ANDSQ28HarpoonMH = 5490,
-
-        /// <summary>
-        /// AN/FPN-40.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPN-40.")]
-        ANFPN40 = 5495,
-
-        /// <summary>
-        /// AN/FPN-62.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPN-62.")]
-        ANFPN62 = 5500,
-
-        /// <summary>
-        /// AN/FPS-16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPS-16.")]
-        ANFPS16 = 5505,
-
-        /// <summary>
-        /// AN/FPS-18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPS-18.")]
-        ANFPS18 = 5507,
-
-        /// <summary>
-        /// AN/FPS-89.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPS-89.")]
-        ANFPS89 = 5508,
-
-        /// <summary>
-        /// AN/FPS-117.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPS-117.")]
-        ANFPS117 = 5510,
-
-        /// <summary>
-        /// AN/FPS-20R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPS-20R.")]
-        ANFPS20R = 5515,
-
-        /// <summary>
-        /// AN/FPS-77.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPS-77.")]
-        ANFPS77 = 5520,
-
-        /// <summary>
-        /// AN/FPS-103.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/FPS-103.")]
-        ANFPS103 = 5525,
-
-        /// <summary>
-        /// AN/GPN-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/GPN-12.")]
-        ANGPN12 = 5527,
-
-        /// <summary>
-        /// AN/GPX-6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/GPX-6.")]
-        ANGPX6 = 5530,
-
-        /// <summary>
-        /// AN/GPX 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/GPX 8.")]
-        ANGPX8 = 5535,
-
-        /// <summary>
-        /// AN/GRN-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/GRN-12.")]
-        ANGRN12 = 5537,
-
-        /// <summary>
-        /// AN/MPQ-10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-10.")]
-        ANMPQ10 = 5540,
-
-        /// <summary>
-        /// AN/MPQ-33/39/46/57/61 (HPIR) ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-33/39/46/57/61 (HPIR) ILL.")]
-        ANMPQ3339465761HPIRILL = 5545,
-
-        /// <summary>
-        /// AN/MPQ-34/48/55/62 (CWAR) TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-34/48/55/62 (CWAR) TA.")]
-        ANMPQ34485562CWARTA = 5550,
-
-        /// <summary>
-        /// AN/MPQ-49.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-49.")]
-        ANMPQ49 = 5551,
-
-        /// <summary>
-        /// AN/MPQ-35/50 (PAR) TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-35/50 (PAR) TA.")]
-        ANMPQ3550PARTA = 5555,
-
-        /// <summary>
-        /// AN/MPQ-37/51 (ROR) TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-37/51 (ROR) TT.")]
-        ANMPQ3751RORTT = 5560,
-
-        /// <summary>
-        /// AN/MPQ-53.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-53.")]
-        ANMPQ53 = 5570,
-
-        /// <summary>
-        /// AN/MPQ-63.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-63.")]
-        ANMPQ63 = 5571,
-
-        /// <summary>
-        /// AN/MPQ-64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/MPQ-64.")]
-        ANMPQ64 = 5575,
-
-        /// <summary>
-        /// AN/SPG-34.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG-34.")]
-        ANSPG34 = 5580,
-
-        /// <summary>
-        /// AN/SPG 50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG 50.")]
-        ANSPG50 = 5625,
-
-        /// <summary>
-        /// AN/SPG 51.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG 51.")]
-        ANSPG51 = 5670,
-
-        /// <summary>
-        /// AN/SPG-51 CWI TI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG-51 CWI TI.")]
-        ANSPG51CWITI = 5715,
-
-        /// <summary>
-        /// AN/SPG-51 FC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG-51 FC.")]
-        ANSPG51FC = 5760,
-
-        /// <summary>
-        /// AN/SPG 52.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG 52.")]
-        ANSPG52 = 5805,
-
-        /// <summary>
-        /// AN/SPG-53.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG-53.")]
-        ANSPG53 = 5850,
-
-        /// <summary>
-        /// AN/SPG 55B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG 55B.")]
-        ANSPG55B = 5895,
-
-        /// <summary>
-        /// AN/SPG 60.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG 60.")]
-        ANSPG60 = 5940,
-
-        /// <summary>
-        /// AN/SPG 62.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPG 62.")]
-        ANSPG62 = 5985,
-
-        /// <summary>
-        /// AN/SPN 35.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPN 35.")]
-        ANSPN35 = 6030,
-
-        /// <summary>
-        /// AN/SPN 43.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPN 43.")]
-        ANSPN43 = 6075,
-
-        /// <summary>
-        /// AN/SPQ-2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPQ-2.")]
-        ANSPQ2 = 6120,
-
-        /// <summary>
-        /// AN/SPQ 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPQ 9.")]
-        ANSPQ9 = 6165,
-
-        /// <summary>
-        /// AN/SPS-4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-4.")]
-        ANSPS4 = 6210,
-
-        /// <summary>
-        /// AN/SPS-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-5.")]
-        ANSPS5 = 6255,
-
-        /// <summary>
-        /// AN/SPS-5C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-5C.")]
-        ANSPS5C = 6300,
-
-        /// <summary>
-        /// AN/SPS-6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-6.")]
-        ANSPS6 = 6345,
-
-        /// <summary>
-        /// AN/SPS 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 10.")]
-        ANSPS10 = 6390,
-
-        /// <summary>
-        /// AN/SPS 21.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 21.")]
-        ANSPS21 = 6435,
-
-        /// <summary>
-        /// AN/SPS-28.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-28.")]
-        ANSPS28 = 6480,
-
-        /// <summary>
-        /// AN/SPS-37.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-37.")]
-        ANSPS37 = 6525,
-
-        /// <summary>
-        /// AN/SPS-39A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-39A.")]
-        ANSPS39A = 6570,
-
-        /// <summary>
-        /// AN/SPS 40.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 40.")]
-        ANSPS40 = 6615,
-
-        /// <summary>
-        /// AN/SPS-41.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-41.")]
-        ANSPS41 = 6660,
-
-        /// <summary>
-        /// AN/SPS-48.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-48.")]
-        ANSPS48 = 6705,
-
-        /// <summary>
-        /// AN/SPS-48C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-48C.")]
-        ANSPS48C = 6750,
-
-        /// <summary>
-        /// AN/SPS-48E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-48E.")]
-        ANSPS48E = 6752,
-
-        /// <summary>
-        /// AN/SPS-49.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49.")]
-        ANSPS49 = 6795,
-
-        /// <summary>
-        /// AN/SPS-49(V)1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)1.")]
-        ANSPS49V1 = 6796,
-
-        /// <summary>
-        /// AN/SPS-49(V)2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)2.")]
-        ANSPS49V2 = 6797,
-
-        /// <summary>
-        /// AN/SPS-49(V)3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)3.")]
-        ANSPS49V3 = 6798,
-
-        /// <summary>
-        /// AN/SPS-49(V)4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)4.")]
-        ANSPS49V4 = 6799,
-
-        /// <summary>
-        /// AN/SPS-49(V)5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)5.")]
-        ANSPS49V5 = 6800,
-
-        /// <summary>
-        /// AN/SPS-49(V)6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)6.")]
-        ANSPS49V6 = 6801,
-
-        /// <summary>
-        /// AN/SPS-49(V)7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)7.")]
-        ANSPS49V7 = 6802,
-
-        /// <summary>
-        /// AN/SPS-49(V)8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49(V)8.")]
-        ANSPS49V8 = 6803,
-
-        /// <summary>
-        /// AN/SPS-49A(V)1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-49A(V)1.")]
-        ANSPS49AV1 = 6804,
-
-        /// <summary>
-        /// AN/SPS 52.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 52.")]
-        ANSPS52 = 6840,
-
-        /// <summary>
-        /// AN/SPS 53.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 53.")]
-        ANSPS53 = 6885,
-
-        /// <summary>
-        /// AN/SPS 55.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 55.")]
-        ANSPS55 = 6930,
-
-        /// <summary>
-        /// AN/SPS-55 SS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-55 SS.")]
-        ANSPS55SS = 6975,
-
-        /// <summary>
-        /// AN/SPS-58.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS-58.")]
-        ANSPS58 = 7020,
-
-        /// <summary>
-        /// AN/SPS 59.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 59.")]
-        ANSPS59 = 7065,
-
-        /// <summary>
-        /// AN/SPS 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 64.")]
-        ANSPS64 = 7110,
-
-        /// <summary>
-        /// AN/SPS 65.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 65.")]
-        ANSPS65 = 7155,
-
-        /// <summary>
-        /// AN/SPS 67.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPS 67.")]
-        ANSPS67 = 7200,
-
-        /// <summary>
-        /// AN/SPY-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPY-1.")]
-        ANSPY1 = 7245,
-
-        /// <summary>
-        /// AN/SPY-1A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPY-1A.")]
-        ANSPY1A = 7250,
-
-        /// <summary>
-        /// AN/SPY-1B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPY-1B.")]
-        ANSPY1B = 7252,
-
-        /// <summary>
-        /// AN/SPY-1B(V).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPY-1B(V).")]
-        ANSPY1BV = 7253,
-
-        /// <summary>
-        /// AN/SPY-1D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPY-1D.")]
-        ANSPY1D = 7260,
-
-        /// <summary>
-        /// AN/SPY-1D(V).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPY-1D(V).")]
-        ANSPY1DV = 7261,
-
-        /// <summary>
-        /// AN/SPY-1F.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/SPY-1F.")]
-        ANSPY1F = 7265,
-
-        /// <summary>
-        /// AN/TPN-17.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPN-17.")]
-        ANTPN17 = 7270,
-
-        /// <summary>
-        /// AN/TPN-24.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPN-24.")]
-        ANTPN24 = 7275,
-
-        /// <summary>
-        /// AN/TPQ-18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPQ-18.")]
-        ANTPQ18 = 7280,
-
-        /// <summary>
-        /// AN/TPQ-36.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPQ-36.")]
-        ANTPQ36 = 7295,
-
-        /// <summary>
-        /// AN/TPQ-37.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPQ-37.")]
-        ANTPQ37 = 7300,
-
-        /// <summary>
-        /// AN/TPQ-38 (V8).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPQ-38 (V8).")]
-        ANTPQ38V8 = 7301,
-
-        /// <summary>
-        /// AN/TPQ-47.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPQ-47.")]
-        ANTPQ47 = 7303,
-
-        /// <summary>
-        /// AN/TPS-43.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPS-43.")]
-        ANTPS43 = 7305,
-
-        /// <summary>
-        /// AN/TPS-43E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPS-43E.")]
-        ANTPS43E = 7310,
-
-        /// <summary>
-        /// AN/TPS-59.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPS-59.")]
-        ANTPS59 = 7315,
-
-        /// <summary>
-        /// AN/TPS-63.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPS-63.")]
-        ANTPS63 = 7320,
-
-        /// <summary>
-        /// AN/TPS-70 (V) 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPS-70 (V) 1.")]
-        ANTPS70V1 = 7322,
-
-        /// <summary>
-        /// AN/TPS-75.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPS-75.")]
-        ANTPS75 = 7325,
-
-        /// <summary>
-        /// AN/TPX-46(V)7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/TPX-46(V)7.")]
-        ANTPX46V7 = 7330,
-
-        /// <summary>
-        /// AN/ULQ-6A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ULQ-6A.")]
-        ANULQ6A = 7335,
-
-        /// <summary>
-        /// AN/UPN 25.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPN 25.")]
-        ANUPN25 = 7380,
-
-        /// <summary>
-        /// AN/UPS 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPS 1.")]
-        ANUPS1 = 7425,
-
-        /// <summary>
-        /// AN/UPS-2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPS-2.")]
-        ANUPS2 = 7426,
-
-        /// <summary>
-        /// AN/UPX 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPX 1.")]
-        ANUPX1 = 7470,
-
-        /// <summary>
-        /// AN/UPX 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPX 5.")]
-        ANUPX5 = 7515,
-
-        /// <summary>
-        /// AN/UPX 11.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPX 11.")]
-        ANUPX11 = 7560,
-
-        /// <summary>
-        /// AN/UPX 12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPX 12.")]
-        ANUPX12 = 7605,
-
-        /// <summary>
-        /// AN/UPX 17.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPX 17.")]
-        ANUPX17 = 7650,
-
-        /// <summary>
-        /// AN/UPX 23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/UPX 23.")]
-        ANUPX23 = 7695,
-
-        /// <summary>
-        /// AN/VPS 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/VPS 2.")]
-        ANVPS2 = 7740,
-
-        /// <summary>
-        /// Apelco AD 7 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Apelco AD 7 7.")]
-        ApelcoAD77 = 7785,
-
-        /// <summary>
-        /// APG 71.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("APG 71.")]
-        APG71 = 7830,
-
-        /// <summary>
-        /// APN 148.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("APN 148.")]
-        APN148 = 7875,
-
-        /// <summary>
-        /// APN 227.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("APN 227.")]
-        APN227 = 7920,
-
-        /// <summary>
-        /// APS 504 V3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("APS 504 V3.")]
-        APS504V3 = 8100,
-
-        /// <summary>
-        /// AR 3D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AR 3D.")]
-        AR3D = 8105,
-
-        /// <summary>
-        /// Plessey AR-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plessey AR-5.")]
-        PlesseyAR5 = 8112,
-
-        /// <summary>
-        /// AR 320.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AR 320.")]
-        AR320 = 8115,
-
-        /// <summary>
-        /// AR 327.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AR 327.")]
-        AR327 = 8120,
-
-        /// <summary>
-        /// AR M31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AR M31.")]
-        ARM31 = 8145,
-
-        /// <summary>
-        /// ARI 5954.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARI 5954.")]
-        ARI5954 = 8190,
-
-        /// <summary>
-        /// ARI 5955.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARI 5955.")]
-        ARI5955 = 8235,
-
-        /// <summary>
-        /// ARI 5979.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARI 5979.")]
-        ARI5979 = 8280,
-
-        /// <summary>
-        /// ARINC 564 BNDX/KING RDR 1E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARINC 564 BNDX/KING RDR 1E.")]
-        ARINC564BNDXKINGRDR1E = 8325,
-
-        /// <summary>
-        /// ARINC 700 BNDX/KING RDR 1E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARINC 700 BNDX/KING RDR 1E.")]
-        ARINC700BNDXKINGRDR1E = 8370,
-
-        /// <summary>
-        /// ARK-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARK-1.")]
-        ARK1 = 8375,
-
-        /// <summary>
-        /// ARSR-3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARSR-3.")]
-        ARSR3 = 8380,
-
-        /// <summary>
-        /// ARSR-18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ARSR-18.")]
-        ARSR18 = 8390,
-
-        /// <summary>
-        /// AS 2 Kipper.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 2 Kipper.")]
-        AS2Kipper = 8415,
-
-        /// <summary>
-        /// AS 2 Kipper MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 2 Kipper MH.")]
-        AS2KipperMH = 8460,
-
-        /// <summary>
-        /// AS 4 Kitchen.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 4 Kitchen.")]
-        AS4Kitchen = 8505,
-
-        /// <summary>
-        /// AS 4 Kitchen MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 4 Kitchen MH.")]
-        AS4KitchenMH = 8550,
-
-        /// <summary>
-        /// AS 5 Kelt MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 5 Kelt MH.")]
-        AS5KeltMH = 8595,
-
-        /// <summary>
-        /// AS 6 Kingfish MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 6 Kingfish MH.")]
-        AS6KingfishMH = 8640,
-
-        /// <summary>
-        /// AS 7 Kerry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 7 Kerry.")]
-        AS7Kerry = 8685,
-
-        /// <summary>
-        /// AS 7 Kerry MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 7 Kerry MG.")]
-        AS7KerryMG = 8730,
-
-        /// <summary>
-        /// AS 15 KENT altimeter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AS 15 KENT altimeter.")]
-        AS15KENTAltimeter = 8735,
-
-        /// <summary>
-        /// Aspide AAM/SAM ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aspide AAM/SAM ILL.")]
-        AspideAAMSAMILL = 8760,
-
-        /// <summary>
-        /// ASR-4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASR-4.")]
-        ASR4 = 8772,
-
-        /// <summary>
-        /// ASR O.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASR O.")]
-        ASRO = 8775,
-
-        /// <summary>
-        /// ASR-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASR-5.")]
-        ASR5 = 8780,
-
-        /// <summary>
-        /// ASR-7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASR-7.")]
-        ASR7 = 8782,
-
-        /// <summary>
-        /// ASR-8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASR-8.")]
-        ASR8 = 8785,
-
-        /// <summary>
-        /// ASR-9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASR-9.")]
-        ASR9 = 8790,
-
-        /// <summary>
-        /// Raytheon ASR-10SS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon ASR-10SS.")]
-        RaytheonASR10SS = 8812,
-
-        /// <summary>
-        /// AT 2 Swatter MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AT 2 Swatter MG.")]
-        AT2SwatterMG = 8820,
-
-        /// <summary>
-        /// ATCR-33.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ATCR-33.")]
-        ATCR33 = 8840,
-
-        /// <summary>
-        /// ATCR 33 K/M.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ATCR 33 K/M.")]
-        ATCR33KM = 8845,
-
-        /// <summary>
-        /// Atlas Elektronk TRS N.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Atlas Elektronk TRS N.")]
-        AtlasElektronkTRSN = 8865,
-
-        /// <summary>
-        /// ATLAS-9740 VTS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ATLAS-9740 VTS.")]
-        ATLAS9740VTS = 8870,
-
-        /// <summary>
-        /// AVG 65.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVG 65.")]
-        AVG65 = 8910,
-
-        /// <summary>
-        /// AVH 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVH 7.")]
-        AVH7 = 8955,
-
-        /// <summary>
-        /// AVQ 20.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVQ 20.")]
-        AVQ20 = 9000,
-
-        /// <summary>
-        /// AVQ30X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVQ30X.")]
-        AVQ30X = 9045,
-
-        /// <summary>
-        /// AVQ-50 (RCA).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVQ-50 (RCA).")]
-        AVQ50RCA = 9075,
-
-        /// <summary>
-        /// AVQ 70.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVQ 70.")]
-        AVQ70 = 9090,
-
-        /// <summary>
-        /// AWS 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AWS 5.")]
-        AWS5 = 9135,
-
-        /// <summary>
-        /// AWS 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AWS 6.")]
-        AWS6 = 9180,
-
-        /// <summary>
-        /// B597Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("B597Z.")]
-        B597Z = 9200,
-
-        /// <summary>
-        /// B636Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("B636Z.")]
-        B636Z = 9205,
-
-        /// <summary>
-        /// Back Net A B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Back Net A B.")]
-        BackNetAB = 9225,
-
-        /// <summary>
-        /// Back Trap.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Back Trap.")]
-        BackTrap = 9270,
-
-        /// <summary>
-        /// BALTYK.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BALTYK.")]
-        BALTYK = 9310,
-
-        /// <summary>
-        /// Ball End.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ball End.")]
-        BallEnd = 9315,
-
-        /// <summary>
-        /// Ball Gun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ball Gun.")]
-        BallGun = 9360,
-
-        /// <summary>
-        /// Band Stand.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Band Stand.")]
-        BandStand = 9405,
-
-        /// <summary>
-        /// Bar Lock.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bar Lock.")]
-        BarLock = 9450,
-
-        /// <summary>
-        /// Bass Tilt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bass Tilt.")]
-        BassTilt = 9495,
-
-        /// <summary>
-        /// Beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Beacon.")]
-        Beacon = 9540,
-
-        /// <summary>
-        /// Bean Sticks.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bean Sticks.")]
-        BeanSticks = 9585,
-
-        /// <summary>
-        /// Bee Hind.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bee Hind.")]
-        BeeHind = 9630,
-
-        /// <summary>
-        /// Bell Crown A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bell Crown A.")]
-        BellCrownA = 9640,
-
-        /// <summary>
-        /// Bell Crown B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bell Crown B.")]
-        BellCrownB = 9642,
-
-        /// <summary>
-        /// BIG BACK.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BIG BACK.")]
-        BIGBACK = 9645,
-
-        /// <summary>
-        /// Big Bird.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Big Bird.")]
-        BigBird = 9660,
-
-        /// <summary>
-        /// Big Bulge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Big Bulge.")]
-        BigBulge = 9675,
-
-        /// <summary>
-        /// Big Bulge A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Big Bulge A.")]
-        BigBulgeA = 9720,
-
-        /// <summary>
-        /// Big Bulge B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Big Bulge B.")]
-        BigBulgeB = 9765,
-
-        /// <summary>
-        /// Big Fred.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Big Fred.")]
-        BigFred = 9780,
-
-        /// <summary>
-        /// Big Mesh.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Big Mesh.")]
-        BigMesh = 9810,
-
-        /// <summary>
-        /// Big Net.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Big Net.")]
-        BigNet = 9855,
-
-        /// <summary>
-        /// Bill Board.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bill Board.")]
-        BillBoard = 9885,
-
-        /// <summary>
-        /// Bill Fold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bill Fold.")]
-        BillFold = 9900,
-
-        /// <summary>
-        /// Blowpipe MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blowpipe MG.")]
-        BlowpipeMG = 9905,
-
-        /// <summary>
-        /// Sea Harrier FRS Mk 1/5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Harrier FRS Mk 1/5.")]
-        SeaHarrierFRSMk15 = 9930,
-
-        /// <summary>
-        /// Sea Harrier F/A Mk 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Harrier F/A Mk 2.")]
-        SeaHarrierFAMk2 = 9935,
-
-        /// <summary>
-        /// Blue Silk.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blue Silk.")]
-        BlueSilk = 9945,
-
-        /// <summary>
-        /// Blue Parrot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blue Parrot.")]
-        BlueParrot = 9990,
-
-        /// <summary>
-        /// Blue Orchid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blue Orchid.")]
-        BlueOrchid = 10035,
-
-        /// <summary>
-        /// Boat Sail.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Boat Sail.")]
-        BoatSail = 10080,
-
-        /// <summary>
-        /// Bofors Electronic 9LV 331.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bofors Electronic 9LV 331.")]
-        BoforsElectronic9LV331 = 10125,
-
-        /// <summary>
-        /// Bofors Ericsson Sea Giraffe 50 HC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bofors Ericsson Sea Giraffe 50 HC.")]
-        BoforsEricssonSeaGiraffe50HC = 10170,
-
-        /// <summary>
-        /// Bowl Mesh.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bowl Mesh.")]
-        BowlMesh = 10215,
-
-        /// <summary>
-        /// Box Brick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Box Brick.")]
-        BoxBrick = 10260,
-
-        /// <summary>
-        /// Box Tail.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Box Tail.")]
-        BoxTail = 10305,
-
-        /// <summary>
-        /// BPS 11A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BPS 11A.")]
-        BPS11A = 10350,
-
-        /// <summary>
-        /// BPS 14.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BPS 14.")]
-        BPS14 = 10395,
-
-        /// <summary>
-        /// BPS 15A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BPS 15A.")]
-        BPS15A = 10440,
-
-        /// <summary>
-        /// BR-15 Tokyo KEIKI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BR-15 Tokyo KEIKI.")]
-        BR15TokyoKEIKI = 10485,
-
-        /// <summary>
-        /// BRIDGEMASTE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BRIDGEMASTE.")]
-        BRIDGEMASTE = 10510,
-
-        /// <summary>
-        /// Bread Bin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bread Bin.")]
-        BreadBin = 10530,
-
-        /// <summary>
-        /// BT 271.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BT 271.")]
-        BT271 = 10575,
-
-        /// <summary>
-        /// BX 732.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BX 732.")]
-        BX732 = 10620,
-
-        /// <summary>
-        /// Buzz Stand.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Buzz Stand.")]
-        BuzzStand = 10665,
-
-        /// <summary>
-        /// C 5A Multi Mode Radar.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("C 5A Multi Mode Radar.")]
-        C5AMultiModeRadar = 10710,
-
-        /// <summary>
-        /// Caiman.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Caiman.")]
-        Caiman = 10755,
-
-        /// <summary>
-        /// Cake Stand.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cake Stand.")]
-        CakeStand = 10800,
-
-        /// <summary>
-        /// Calypso C61.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Calypso C61.")]
-        CalypsoC61 = 10845,
-
-        /// <summary>
-        /// Calypso Ii.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Calypso Ii.")]
-        CalypsoIi = 10890,
-
-        /// <summary>
-        /// Cardion Coastal.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cardion Coastal.")]
-        CardionCoastal = 10895,
-
-        /// <summary>
-        /// Castor Ii.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Castor Ii.")]
-        CastorIi = 10935,
-
-        /// <summary>
-        /// Castor 2J TT (Crotale NG).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Castor 2J TT (Crotale NG).")]
-        Castor2JTTCrotaleNG = 10940,
-
-        /// <summary>
-        /// Cat House.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cat House.")]
-        CatHouse = 10980,
-
-        /// <summary>
-        /// CDR-431.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CDR-431.")]
-        CDR431 = 10985,
-
-        /// <summary>
-        /// Chair Back TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chair Back TT.")]
-        ChairBackTT = 11000,
-
-        /// <summary>
-        /// Chair Back ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chair Back ILL.")]
-        ChairBackILL = 11010,
-
-        /// <summary>
-        /// Cheese Brick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cheese Brick.")]
-        CheeseBrick = 11025,
-
-        /// <summary>
-        /// Clam Pipe.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Clam Pipe.")]
-        ClamPipe = 11070,
-
-        /// <summary>
-        /// Clamshell.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Clamshell.")]
-        Clamshell = 11115,
-
-        /// <summary>
-        /// Collins WXR-700X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Collins WXR-700X.")]
-        CollinsWXR700X = 11160,
-
-        /// <summary>
-        /// Collins DN 101.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Collins DN 101.")]
-        CollinsDN101 = 11205,
-
-        /// <summary>
-        /// Contraves Sea Hunter MK 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contraves Sea Hunter MK 4.")]
-        ContravesSeaHunterMK4 = 11250,
-
-        /// <summary>
-        /// Corn Can.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Corn Can.")]
-        CornCan = 11260,
-
-        /// <summary>
-        /// CR-105 RMCA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CR-105 RMCA.")]
-        CR105RMCA = 11270,
-
-        /// <summary>
-        /// Cross Bird.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Bird.")]
-        CrossBird = 11295,
-
-        /// <summary>
-        /// Cross Dome.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Dome.")]
-        CrossDome = 11340,
-
-        /// <summary>
-        /// Cross Legs.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Legs.")]
-        CrossLegs = 11385,
-
-        /// <summary>
-        /// Cross Out.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Out.")]
-        CrossOut = 11430,
-
-        /// <summary>
-        /// Cross Slot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Slot.")]
-        CrossSlot = 11475,
-
-        /// <summary>
-        /// Cross Sword.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Sword.")]
-        CrossSword = 11520,
-
-        /// <summary>
-        /// Cross Up.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Up.")]
-        CrossUp = 11565,
-
-        /// <summary>
-        /// Cross Sword FC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cross Sword FC.")]
-        CrossSwordFC = 11610,
-
-        /// <summary>
-        /// THD-5000.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("THD-5000.")]
-        THD5000 = 11655,
-
-        /// <summary>
-        /// Griffon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Griffon.")]
-        Griffon = 11660,
-
-        /// <summary>
-        /// Crotale TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Crotale TT.")]
-        CrotaleTT = 11665,
-
-        /// <summary>
-        /// Crotale MGMissile System.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Crotale MGMissile System.")]
-        CrotaleMGMissileSystem = 11700,
-
-        /// <summary>
-        /// CSS C 3C CAS 1M1 M2 MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CSS C 3C CAS 1M1 M2 MH.")]
-        CSSC3CCAS1M1M2MH = 11745,
-
-        /// <summary>
-        /// CSS C 2B HY 1A MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CSS C 2B HY 1A MH.")]
-        CSSC2BHY1AMH = 11790,
-
-        /// <summary>
-        /// CWS 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CWS 2.")]
-        CWS2 = 11835,
-
-        /// <summary>
-        /// Cylinder Head.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cylinder Head.")]
-        CylinderHead = 11880,
-
-        /// <summary>
-        /// Cyrano II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cyrano II.")]
-        CyranoII = 11925,
-
-        /// <summary>
-        /// Cyrano IV.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cyrano IV.")]
-        CyranoIV = 11970,
-
-        /// <summary>
-        /// Cyrano IV-M.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cyrano IV-M.")]
-        CyranoIVM = 11975,
-
-        /// <summary>
-        /// DA-01/00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DA-01/00.")]
-        DA0100 = 12010,
-
-        /// <summary>
-        /// DA 05 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DA 05 00.")]
-        DA0500 = 12015,
-
-        /// <summary>
-        /// Dawn.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dawn.")]
-        Dawn = 12060,
-
-        /// <summary>
-        /// Dead Duck.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Duck.")]
-        DeadDuck = 12105,
-
-        /// <summary>
-        /// DECCA-20 V90/9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA-20 V90/9.")]
-        DECCA20V909 = 12110,
-
-        /// <summary>
-        /// DECCA-20 V90S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA-20 V90S.")]
-        DECCA20V90S = 12111,
-
-        /// <summary>
-        /// DECCA 45.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 45.")]
-        DECCA45 = 12150,
-
-        /// <summary>
-        /// DECCA 50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 50.")]
-        DECCA50 = 12195,
-
-        /// <summary>
-        /// DECCA 110.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 110.")]
-        DECCA110 = 12240,
-
-        /// <summary>
-        /// DECCA 170.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 170.")]
-        DECCA170 = 12285,
-
-        /// <summary>
-        /// DECCA HF 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA HF 2.")]
-        DECCAHF2 = 12292,
-
-        /// <summary>
-        /// DECCA 202.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 202.")]
-        DECCA202 = 12330,
-
-        /// <summary>
-        /// DECCA D202.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA D202.")]
-        DECCAD202 = 12375,
-
-        /// <summary>
-        /// DECCA 303.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 303.")]
-        DECCA303 = 12420,
-
-        /// <summary>
-        /// DECCA 535.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 535.")]
-        DECCA535 = 12430,
-
-        /// <summary>
-        /// DECCA 626.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 626.")]
-        DECCA626 = 12465,
-
-        /// <summary>
-        /// DECCA 629.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 629.")]
-        DECCA629 = 12510,
-
-        /// <summary>
-        /// DECCA 914.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 914.")]
-        DECCA914 = 12555,
-
-        /// <summary>
-        /// DECCA 916.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 916.")]
-        DECCA916 = 12600,
-
-        /// <summary>
-        /// DECCA 926.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 926.")]
-        DECCA926 = 12610,
-
-        /// <summary>
-        /// DECCA 1226 Commercial.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 1226 Commercial.")]
-        DECCA1226Commercial = 12645,
-
-        /// <summary>
-        /// DECCA 1626.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 1626.")]
-        DECCA1626 = 12690,
-
-        /// <summary>
-        /// DECCA 2459.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA 2459.")]
-        DECCA2459 = 12735,
-
-        /// <summary>
-        /// DECCA AWS 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA AWS 1.")]
-        DECCAAWS1 = 12780,
-
-        /// <summary>
-        /// DECCA AWS 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA AWS 2.")]
-        DECCAAWS2 = 12782,
-
-        /// <summary>
-        /// DECCA AWS 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA AWS 4.")]
-        DECCAAWS4 = 12785,
-
-        /// <summary>
-        /// DECCA AWS-4 (2).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA AWS-4 (2).")]
-        DECCAAWS42 = 12787,
-
-        /// <summary>
-        /// DECCA MAR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA MAR.")]
-        DECCAMAR = 12800,
-
-        /// <summary>
-        /// DECCA RM 326.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA RM 326.")]
-        DECCARM326 = 12805,
-
-        /// <summary>
-        /// DECCA RM 416.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA RM 416.")]
-        DECCARM416 = 12825,
-
-        /// <summary>
-        /// DECCA RM 914.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA RM 914.")]
-        DECCARM914 = 12870,
-
-        /// <summary>
-        /// DECCA RM 1690.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA RM 1690.")]
-        DECCARM1690 = 12915,
-
-        /// <summary>
-        /// DECCA Super 101 MK 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DECCA Super 101 MK 3.")]
-        DECCASuper101MK3 = 12960,
-
-        /// <summary>
-        /// DISS 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DISS 1.")]
-        DISS1 = 13005,
-
-        /// <summary>
-        /// DN 181.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DN 181.")]
-        DN181 = 13050,
-
-        /// <summary>
-        /// BLINDFIRE FSC TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("BLINDFIRE FSC TT.")]
-        BLINDFIREFSCTT = 13055,
-
-        /// <summary>
-        /// Dog Ear.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dog Ear.")]
-        DogEar = 13095,
-
-        /// <summary>
-        /// Dog House.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dog House.")]
-        DogHouse = 13140,
-
-        /// <summary>
-        /// Don 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Don 2.")]
-        Don2 = 13185,
-
-        /// <summary>
-        /// Don A/B/2/Kay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Don A/B/2/Kay.")]
-        DonAB2Kay = 13230,
-
-        /// <summary>
-        /// Donets.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Donets.")]
-        Donets = 13275,
-
-        /// <summary>
-        /// Down Beat.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Down Beat.")]
-        DownBeat = 13320,
-
-        /// <summary>
-        /// DRAA 2A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRAA 2A.")]
-        DRAA2A = 13365,
-
-        /// <summary>
-        /// DRAA 2B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRAA 2B.")]
-        DRAA2B = 13410,
-
-        /// <summary>
-        /// DRAC 39.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRAC 39.")]
-        DRAC39 = 13455,
-
-        /// <summary>
-        /// DRBC 30B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBC 30B.")]
-        DRBC30B = 13500,
-
-        /// <summary>
-        /// DRBC 31A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBC 31A.")]
-        DRBC31A = 13545,
-
-        /// <summary>
-        /// DRBC 32A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBC 32A.")]
-        DRBC32A = 13590,
-
-        /// <summary>
-        /// DRBC 32D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBC 32D.")]
-        DRBC32D = 13635,
-
-        /// <summary>
-        /// DRBC 33A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBC 33A.")]
-        DRBC33A = 13680,
-
-        /// <summary>
-        /// DRBI 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBI 10.")]
-        DRBI10 = 13725,
-
-        /// <summary>
-        /// DRBI 23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBI 23.")]
-        DRBI23 = 13770,
-
-        /// <summary>
-        /// DRBJ 11B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBJ 11B.")]
-        DRBJ11B = 13815,
-
-        /// <summary>
-        /// DRBN 30.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBN 30.")]
-        DRBN30 = 13860,
-
-        /// <summary>
-        /// DRBN 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBN 32.")]
-        DRBN32 = 13905,
-
-        /// <summary>
-        /// DRBR 51.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBR 51.")]
-        DRBR51 = 13950,
-
-        /// <summary>
-        /// DRBV 20B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 20B.")]
-        DRBV20B = 13995,
-
-        /// <summary>
-        /// DRBV 22.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 22.")]
-        DRBV22 = 14040,
-
-        /// <summary>
-        /// DRBV 26C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 26C.")]
-        DRBV26C = 14085,
-
-        /// <summary>
-        /// DRBV 30.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 30.")]
-        DRBV30 = 14130,
-
-        /// <summary>
-        /// DRBV 50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 50.")]
-        DRBV50 = 14175,
-
-        /// <summary>
-        /// DRBV 51.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 51.")]
-        DRBV51 = 14220,
-
-        /// <summary>
-        /// DRBV 51A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 51A.")]
-        DRBV51A = 14265,
-
-        /// <summary>
-        /// DRBV 51B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 51B.")]
-        DRBV51B = 14310,
-
-        /// <summary>
-        /// DRBV 51C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRBV 51C.")]
-        DRBV51C = 14355,
-
-        /// <summary>
-        /// Drop Kick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Drop Kick.")]
-        DropKick = 14400,
-
-        /// <summary>
-        /// DRUA 31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRUA 31.")]
-        DRUA31 = 14445,
-
-        /// <summary>
-        /// Drum Tilt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Drum Tilt.")]
-        DrumTilt = 14490,
-
-        /// <summary>
-        /// Drum Tilt A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Drum Tilt A.")]
-        DrumTiltA = 14535,
-
-        /// <summary>
-        /// Drum Tilt B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Drum Tilt B.")]
-        DrumTiltB = 14545,
-
-        /// <summary>
-        /// Dumbo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dumbo.")]
-        Dumbo = 14580,
-
-        /// <summary>
-        /// ECR-90.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ECR-90.")]
-        ECR90 = 14600,
-
-        /// <summary>
-        /// Egg Cup A/B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Egg Cup A/B.")]
-        EggCupAB = 14625,
-
-        /// <summary>
-        /// EKCO 190.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("EKCO 190.")]
-        EKCO190 = 14670,
-
-        /// <summary>
-        /// EL M 2001B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("EL M 2001B.")]
-        ELM2001B = 14715,
-
-        /// <summary>
-        /// EL M 2207.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("EL M 2207.")]
-        ELM2207 = 14760,
-
-        /// <summary>
-        /// EL/M 2216(V).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("EL/M 2216(V).")]
-        ELM2216V = 14770,
-
-        /// <summary>
-        /// ELTA EL/M 2221 GM STGR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ELTA EL/M 2221 GM STGR.")]
-        ELTAELM2221GMSTGR = 14805,
-
-        /// <summary>
-        /// ELTA SIS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ELTA SIS.")]
-        ELTASIS = 14810,
-
-        /// <summary>
-        /// EMD 2900.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("EMD 2900.")]
-        EMD2900 = 14850,
-
-        /// <summary>
-        /// End Tray.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("End Tray.")]
-        EndTray = 14895,
-
-        /// <summary>
-        /// Exocet 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exocet 1.")]
-        Exocet1 = 14940,
-
-        /// <summary>
-        /// Exocet 1 MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exocet 1 MH.")]
-        Exocet1MH = 14985,
-
-        /// <summary>
-        /// Exocet 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exocet 2.")]
-        Exocet2 = 15030,
-
-        /// <summary>
-        /// Eye Bowl.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Eye Bowl.")]
-        EyeBowl = 15075,
-
-        /// <summary>
-        /// Eye Shield.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Eye Shield.")]
-        EyeShield = 15120,
-
-        /// <summary>
-        /// F332Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("F332Z.")]
-        F332Z = 15140,
-
-        /// <summary>
-        /// FALCON.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FALCON.")]
-        FALCON = 15160,
-
-        /// <summary>
-        /// Fan Song A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Song A.")]
-        FanSongA = 15165,
-
-        /// <summary>
-        /// Fan Song B/F TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Song B/F TA.")]
-        FanSongBFTA = 15200,
-
-        /// <summary>
-        /// Fan Song B/F TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Song B/F TT.")]
-        FanSongBFTT = 15210,
-
-        /// <summary>
-        /// Fan Song C/E TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Song C/E TA.")]
-        FanSongCETA = 15220,
-
-        /// <summary>
-        /// Fan Song C/E TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Song C/E TT.")]
-        FanSongCETT = 15230,
-
-        /// <summary>
-        /// Fan Song C/E MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Song C/E MG.")]
-        FanSongCEMG = 15240,
-
-        /// <summary>
-        /// Fan Song B/FF MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Song B/FF MG.")]
-        FanSongBFFMG = 15255,
-
-        /// <summary>
-        /// Fan Tail.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fan Tail.")]
-        FanTail = 15300,
-
-        /// <summary>
-        /// FCR-1401.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FCR-1401.")]
-        FCR1401 = 15310,
-
-        /// <summary>
-        /// Fin Curve.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fin Curve.")]
-        FinCurve = 15345,
-
-        /// <summary>
-        /// Fire Can.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Can.")]
-        FireCan = 15390,
-
-        /// <summary>
-        /// Fire Dish.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Dish.")]
-        FireDish = 15435,
-
-        /// <summary>
-        /// Fire Dome TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Dome TA.")]
-        FireDomeTA = 15470,
-
-        /// <summary>
-        /// Fire Dome TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Dome TT.")]
-        FireDomeTT = 15475,
-
-        /// <summary>
-        /// Fire Dome TI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Dome TI.")]
-        FireDomeTI = 15480,
-
-        /// <summary>
-        /// Fire Iron.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Iron.")]
-        FireIron = 15525,
-
-        /// <summary>
-        /// Fire Wheel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Wheel.")]
-        FireWheel = 15570,
-
-        /// <summary>
-        /// Fish Bowl.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fish Bowl.")]
-        FishBowl = 15615,
-
-        /// <summary>
-        /// Flap Lid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flap Lid.")]
-        FlapLid = 15660,
-
-        /// <summary>
-        /// Flap Truck.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flap Truck.")]
-        FlapTruck = 15705,
-
-        /// <summary>
-        /// Flap Wheel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flap Wheel.")]
-        FlapWheel = 15750,
-
-        /// <summary>
-        /// Flash Dance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flash Dance.")]
-        FlashDance = 15795,
-
-        /// <summary>
-        /// Flat Face A B C D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flat Face A B C D.")]
-        FlatFaceABCD = 15840,
-
-        /// <summary>
-        /// Flat Screen.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flat Screen.")]
-        FlatScreen = 15885,
-
-        /// <summary>
-        /// Flat Spin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flat Spin.")]
-        FlatSpin = 15930,
-
-        /// <summary>
-        /// Flat Twin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flat Twin.")]
-        FlatTwin = 15975,
-
-        /// <summary>
-        /// Fledermaus.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fledermaus.")]
-        Fledermaus = 16020,
-
-        /// <summary>
-        /// FLYCATCHER.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FLYCATCHER.")]
-        FLYCATCHER = 16030,
-
-        /// <summary>
-        /// Fly Screen.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fly Screen.")]
-        FlyScreen = 16065,
-
-        /// <summary>
-        /// Fly Screen A&amp;B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fly Screen A&amp;B.")]
-        FlyScreenAB = 16110,
-
-        /// <summary>
-        /// Fly Trap B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fly Trap B.")]
-        FlyTrapB = 16155,
-
-        /// <summary>
-        /// Fog Lamp MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fog Lamp MG.")]
-        FogLampMG = 16200,
-
-        /// <summary>
-        /// Fog Lamp TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fog Lamp TT.")]
-        FogLampTT = 16245,
-
-        /// <summary>
-        /// Foil Two.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Foil Two.")]
-        FoilTwo = 16290,
-
-        /// <summary>
-        /// Fox Hunter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fox Hunter.")]
-        FoxHunter = 16335,
-
-        /// <summary>
-        /// FOX FIREFox Fire AL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FOX FIREFox Fire AL.")]
-        FOXFIREFoxFireAL = 16380,
-
-        /// <summary>
-        /// FOX FIRE ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FOX FIRE ILL.")]
-        FOXFIREILL = 16390,
-
-        /// <summary>
-        /// FR-151A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FR-151A.")]
-        FR151A = 16400,
-
-        /// <summary>
-        /// FR-1505 DA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FR-1505 DA.")]
-        FR1505DA = 16410,
-
-        /// <summary>
-        /// FR-2000.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FR-2000.")]
-        FR2000 = 16420,
-
-        /// <summary>
-        /// FR-2855W.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FR-2855W.")]
-        FR2855W = 16421,
-
-        /// <summary>
-        /// Front Dome.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Front Dome.")]
-        FrontDome = 16425,
-
-        /// <summary>
-        /// Front Door.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Front Door.")]
-        FrontDoor = 16470,
-
-        /// <summary>
-        /// Front Piece.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Front Piece.")]
-        FrontPiece = 16515,
-
-        /// <summary>
-        /// Furuno.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Furuno.")]
-        Furuno = 16560,
-
-        /// <summary>
-        /// Furuno 1721.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Furuno 1721.")]
-        Furuno1721 = 16561,
-
-        /// <summary>
-        /// Furuno 701.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Furuno 701.")]
-        Furuno701 = 16605,
-
-        /// <summary>
-        /// Furuno 711 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Furuno 711 2.")]
-        Furuno7112 = 16650,
-
-        /// <summary>
-        /// Furuno 2400.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Furuno 2400.")]
-        Furuno2400 = 16695,
-
-        /// <summary>
-        /// GA 01 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GA 01 00.")]
-        GA0100 = 16740,
-
-        /// <summary>
-        /// Gage.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gage.")]
-        Gage = 16785,
-
-        /// <summary>
-        /// Garpin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Garpin.")]
-        Garpin = 16830,
-
-        /// <summary>
-        /// GEM BX 132.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GEM BX 132.")]
-        GEMBX132 = 16875,
-
-        /// <summary>
-        /// Gepard TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gepard TA.")]
-        GepardTA = 16880,
-
-        /// <summary>
-        /// Gepard TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gepard TT.")]
-        GepardTT = 16884,
-
-        /// <summary>
-        /// GERAN-F.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GERAN-F.")]
-        GERANF = 16888,
-
-        /// <summary>
-        /// GIRAFFE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GIRAFFE.")]
-        GIRAFFE = 16900,
-
-        /// <summary>
-        /// Gin Sling TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gin Sling TA.")]
-        GinSlingTA = 16915,
-
-        /// <summary>
-        /// Gin Sling TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gin Sling TT.")]
-        GinSlingTT = 16920,
-
-        /// <summary>
-        /// Gin Sling MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gin Sling MG.")]
-        GinSlingMG = 16925,
-
-        /// <summary>
-        /// GPN-22.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GPN-22.")]
-        GPN22 = 16945,
-
-        /// <summary>
-        /// GRN-9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GRN-9.")]
-        GRN9 = 16950,
-
-        /// <summary>
-        /// Green Stain.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Green Stain.")]
-        GreenStain = 16965,
-
-        /// <summary>
-        /// Grid Bow.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Grid Bow.")]
-        GridBow = 17010,
-
-        /// <summary>
-        /// GRILL PAN TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GRILL PAN TT.")]
-        GRILLPANTT = 17025,
-
-        /// <summary>
-        /// Guardsman.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guardsman.")]
-        Guardsman = 17055,
-
-        /// <summary>
-        /// GUN DISH (ZSU-23/4).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GUN DISH (ZSU-23/4).")]
-        GUNDISHZSU234 = 17070,
-
-        /// <summary>
-        /// Hair Net.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hair Net.")]
-        HairNet = 17100,
-
-        /// <summary>
-        /// Half Plate A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Half Plate A.")]
-        HalfPlateA = 17145,
-
-        /// <summary>
-        /// Half Plate B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Half Plate B.")]
-        HalfPlateB = 17190,
-
-        /// <summary>
-        /// HARD.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HARD.")]
-        HARD = 17220,
-
-        /// <summary>
-        /// Hawk Screech.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hawk Screech.")]
-        HawkScreech = 17235,
-
-        /// <summary>
-        /// Head Light A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Head Light A.")]
-        HeadLightA = 17280,
-
-        /// <summary>
-        /// Head Lights.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Head Lights.")]
-        HeadLights = 17325,
-
-        /// <summary>
-        /// Head Lights C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Head Lights C.")]
-        HeadLightsC = 17370,
-
-        /// <summary>
-        /// Head Lights MG A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Head Lights MG A.")]
-        HeadLightsMGA = 17415,
-
-        /// <summary>
-        /// Head Lights MG B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Head Lights MG B.")]
-        HeadLightsMGB = 17460,
-
-        /// <summary>
-        /// Head Lights TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Head Lights TT.")]
-        HeadLightsTT = 17505,
-
-        /// <summary>
-        /// Head Net.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Head Net.")]
-        HeadNet = 17550,
-
-        /// <summary>
-        /// Hen Egg.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hen Egg.")]
-        HenEgg = 17595,
-
-        /// <summary>
-        /// Hen House.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hen House.")]
-        HenHouse = 17640,
-
-        /// <summary>
-        /// Hen Nest.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hen Nest.")]
-        HenNest = 17685,
-
-        /// <summary>
-        /// Hen Roost.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hen Roost.")]
-        HenRoost = 17730,
-
-        /// <summary>
-        /// High Brick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Brick.")]
-        HighBrick = 17775,
-
-        /// <summary>
-        /// High Fix.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Fix.")]
-        HighFix = 17820,
-
-        /// <summary>
-        /// High Lark TI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Lark TI.")]
-        HighLarkTI = 17865,
-
-        /// <summary>
-        /// High Lark 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Lark 1.")]
-        HighLark1 = 17910,
-
-        /// <summary>
-        /// High Lark 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Lark 2.")]
-        HighLark2 = 17955,
-
-        /// <summary>
-        /// High Lark 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Lark 4.")]
-        HighLark4 = 18000,
-
-        /// <summary>
-        /// High Lune.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Lune.")]
-        HighLune = 18045,
-
-        /// <summary>
-        /// High Pole A&amp;B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Pole A&amp;B.")]
-        HighPoleAB = 18090,
-
-        /// <summary>
-        /// High Scoop.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Scoop.")]
-        HighScoop = 18135,
-
-        /// <summary>
-        /// HIGH SCREEN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HIGH SCREEN.")]
-        HIGHSCREEN = 18150,
-
-        /// <summary>
-        /// High Sieve.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Sieve.")]
-        HighSieve = 18180,
-
-        /// <summary>
-        /// HN-503.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HN-503.")]
-        HN503 = 18200,
-
-        /// <summary>
-        /// Home Talk.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Home Talk.")]
-        HomeTalk = 18225,
-
-        /// <summary>
-        /// Horn Spoon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Horn Spoon.")]
-        HornSpoon = 18270,
-
-        /// <summary>
-        /// HOT BRICK.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HOT BRICK.")]
-        HOTBRICK = 18280,
-
-        /// <summary>
-        /// Hot Flash.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hot Flash.")]
-        HotFlash = 18315,
-
-        /// <summary>
-        /// Hot Shot TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hot Shot TA.")]
-        HotShotTA = 18320,
-
-        /// <summary>
-        /// Hot Shot TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hot Shot TT.")]
-        HotShotTT = 18325,
-
-        /// <summary>
-        /// Hot Shot MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hot Shot MG.")]
-        HotShotMG = 18330,
-
-        /// <summary>
-        /// IFF MK XII AIMS UPX 29.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IFF MK XII AIMS UPX 29.")]
-        IFFMKXIIAIMSUPX29 = 18360,
-
-        /// <summary>
-        /// IFF MK XV.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IFF MK XV.")]
-        IFFMKXV = 18405,
-
-        /// <summary>
-        /// Javelin MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Javelin MG.")]
-        JavelinMG = 18410,
-
-        /// <summary>
-        /// Jay Bird.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jay Bird.")]
-        JayBird = 18450,
-
-        /// <summary>
-        /// JRC-NMD-401.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JRC-NMD-401.")]
-        JRCNMD401 = 18460,
-
-        /// <summary>
-        /// Jupiter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jupiter.")]
-        Jupiter = 18495,
-
-        /// <summary>
-        /// Jupiter II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jupiter II.")]
-        JupiterII = 18540,
-
-        /// <summary>
-        /// JY-8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JY-8.")]
-        JY8 = 18550,
-
-        /// <summary>
-        /// JY-9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JY-9.")]
-        JY9 = 18555,
-
-        /// <summary>
-        /// JY-14.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JY-14.")]
-        JY14 = 18560,
-
-        /// <summary>
-        /// K376Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("K376Z.")]
-        K376Z = 18585,
-
-        /// <summary>
-        /// Kelvin Hughes 2A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kelvin Hughes 2A.")]
-        KelvinHughes2A = 18630,
-
-        /// <summary>
-        /// Kelvin Hughes 14/9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kelvin Hughes 14/9.")]
-        KelvinHughes149 = 18675,
-
-        /// <summary>
-        /// Kelvin Hughes type 1006.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kelvin Hughes type 1006.")]
-        KelvinHughesType1006 = 18720,
-
-        /// <summary>
-        /// Kelvin Hughes type 1007.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kelvin Hughes type 1007.")]
-        KelvinHughesType1007 = 18765,
-
-        /// <summary>
-        /// KH-902M.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("KH-902M.")]
-        KH902M = 18785,
-
-        /// <summary>
-        /// Kite Screech.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kite Screech.")]
-        KiteScreech = 18810,
-
-        /// <summary>
-        /// Kite Screech A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kite Screech A.")]
-        KiteScreechA = 18855,
-
-        /// <summary>
-        /// Kite Screech B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kite Screech B.")]
-        KiteScreechB = 18900,
-
-        /// <summary>
-        /// Kivach.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kivach.")]
-        Kivach = 18945,
-
-        /// <summary>
-        /// Knife Rest.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Knife Rest.")]
-        KnifeRest = 18990,
-
-        /// <summary>
-        /// Knife Rest B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Knife Rest B.")]
-        KnifeRestB = 19035,
-
-        /// <summary>
-        /// KNIFE REST C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("KNIFE REST C.")]
-        KNIFERESTC = 19037,
-
-        /// <summary>
-        /// KR-75.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("KR-75.")]
-        KR75 = 19050,
-
-        /// <summary>
-        /// KSA SRN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("KSA SRN.")]
-        KSASRN = 19080,
-
-        /// <summary>
-        /// KSA TSR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("KSA TSR.")]
-        KSATSR = 19125,
-
-        /// <summary>
-        /// Land Fall.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Land Fall.")]
-        LandFall = 19170,
-
-        /// <summary>
-        /// Land Roll MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Land Roll MG.")]
-        LandRollMG = 19215,
-
-        /// <summary>
-        /// Land Roll TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Land Roll TA.")]
-        LandRollTA = 19260,
-
-        /// <summary>
-        /// Land Roll TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Land Roll TT.")]
-        LandRollTT = 19305,
-
-        /// <summary>
-        /// LC-150.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LC-150.")]
-        LC150 = 19310,
-
-        /// <summary>
-        /// Leningraf.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Leningraf.")]
-        Leningraf = 19350,
-
-        /// <summary>
-        /// Light Bulb.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light Bulb.")]
-        LightBulb = 19395,
-
-        /// <summary>
-        /// LMT NRAI-6A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LMT NRAI-6A.")]
-        LMTNRAI6A = 19400,
-
-        /// <summary>
-        /// LN 55.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LN 55.")]
-        LN55 = 19440,
-
-        /// <summary>
-        /// Ln 66.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ln 66.")]
-        Ln66 = 19485,
-
-        /// <summary>
-        /// Long Bow.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Bow.")]
-        LongBow = 19530,
-
-        /// <summary>
-        /// Long Brick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Brick.")]
-        LongBrick = 19575,
-
-        /// <summary>
-        /// Long Bull.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Bull.")]
-        LongBull = 19620,
-
-        /// <summary>
-        /// Long Eye.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Eye.")]
-        LongEye = 19665,
-
-        /// <summary>
-        /// Long Head.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Head.")]
-        LongHead = 19710,
-
-        /// <summary>
-        /// Long Talk.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Talk.")]
-        LongTalk = 19755,
-
-        /// <summary>
-        /// Long Track.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Track.")]
-        LongTrack = 19800,
-
-        /// <summary>
-        /// Long Trough.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Long Trough.")]
-        LongTrough = 19845,
-
-        /// <summary>
-        /// Look Two.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Look Two.")]
-        LookTwo = 19890,
-
-        /// <summary>
-        /// LORAN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LORAN.")]
-        LORAN = 19935,
-
-        /// <summary>
-        /// Low Blow TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Low Blow TA.")]
-        LowBlowTA = 19950,
-
-        /// <summary>
-        /// Low Blow TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Low Blow TT.")]
-        LowBlowTT = 19955,
-
-        /// <summary>
-        /// Low Blow MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Low Blow MG.")]
-        LowBlowMG = 19960,
-
-        /// <summary>
-        /// Low Sieve.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Low Sieve.")]
-        LowSieve = 19980,
-
-        /// <summary>
-        /// Low Trough.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Low Trough.")]
-        LowTrough = 20025,
-
-        /// <summary>
-        /// LP-23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LP-23.")]
-        LP23 = 20040,
-
-        /// <summary>
-        /// LW 08.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LW 08.")]
-        LW08 = 20070,
-
-        /// <summary>
-        /// M-1983 FCR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M-1983 FCR.")]
-        M1983FCR = 20090,
-
-        /// <summary>
-        /// M22-40.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M22-40.")]
-        M2240 = 20115,
-
-        /// <summary>
-        /// M44.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M44.")]
-        M44 = 20160,
-
-        /// <summary>
-        /// M401Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M401Z.")]
-        M401Z = 20205,
-
-        /// <summary>
-        /// M585Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M585Z.")]
-        M585Z = 20250,
-
-        /// <summary>
-        /// M588Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M588Z.")]
-        M588Z = 20295,
-
-        /// <summary>
-        /// MA 1 IFF Portion.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MA 1 IFF Portion.")]
-        MA1IFFPortion = 20340,
-
-        /// <summary>
-        /// MARELD.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MARELD.")]
-        MARELD = 20360,
-
-        /// <summary>
-        /// MA Type 909#.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MA Type 909#.")]
-        MAType909 = 20385,
-
-        /// <summary>
-        /// Marconi 1810.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi 1810.")]
-        Marconi1810 = 20430,
-
-        /// <summary>
-        /// Marconi Canada HC 75.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi Canada HC 75.")]
-        MarconiCanadaHC75 = 20475,
-
-        /// <summary>
-        /// Marconi S 713.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi S 713.")]
-        MarconiS713 = 20495,
-
-        /// <summary>
-        /// Marconi S 1802.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi S 1802.")]
-        MarconiS1802 = 20520,
-
-        /// <summary>
-        /// Marconi S247.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi S247.")]
-        MarconiS247 = 20530,
-
-        /// <summary>
-        /// Marconi S 810.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi S 810.")]
-        MarconiS810 = 20565,
-
-        /// <summary>
-        /// Marconi SA 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi SA 10.")]
-        MarconiSA10 = 20585,
-
-        /// <summary>
-        /// Marconi type 967.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi type 967.")]
-        MarconiType967 = 20610,
-
-        /// <summary>
-        /// Marconi type 968.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi type 968.")]
-        MarconiType968 = 20655,
-
-        /// <summary>
-        /// Marconi type 992.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi type 992.")]
-        MarconiType992 = 20700,
-
-        /// <summary>
-        /// Marconi/signaal type 1022.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi/signaal type 1022.")]
-        MarconiSignaalType1022 = 20745,
-
-        /// <summary>
-        /// Marconi/signaal type 910.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi/signaal type 910.")]
-        MarconiSignaalType910 = 20790,
-
-        /// <summary>
-        /// Marconi/signaal type 911.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi/signaal type 911.")]
-        MarconiSignaalType911 = 20835,
-
-        /// <summary>
-        /// Marconi/signaal type 992R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marconi/signaal type 992R.")]
-        MarconiSignaalType992R = 20880,
-
-        /// <summary>
-        /// Mesh Brick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mesh Brick.")]
-        MeshBrick = 20925,
-
-        /// <summary>
-        /// Mirage ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mirage ILL.")]
-        MirageILL = 20950,
-
-        /// <summary>
-        /// MK 15 CIWS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK 15 CIWS.")]
-        MK15CIWS = 20970,
-
-        /// <summary>
-        /// MK-23.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK-23.")]
-        MK23 = 21015,
-
-        /// <summary>
-        /// MK 23 TAS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK 23 TAS.")]
-        MK23TAS = 21060,
-
-        /// <summary>
-        /// MK 25.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK 25.")]
-        MK25 = 21105,
-
-        /// <summary>
-        /// MK-35 M2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK-35 M2.")]
-        MK35M2 = 21150,
-
-        /// <summary>
-        /// MK 92.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK 92.")]
-        MK92 = 21195,
-
-        /// <summary>
-        /// MK-92 CAS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK-92 CAS.")]
-        MK92CAS = 21240,
-
-        /// <summary>
-        /// MK-92 STIR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK-92 STIR.")]
-        MK92STIR = 21285,
-
-        /// <summary>
-        /// MK 95.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK 95.")]
-        MK95 = 21330,
-
-        /// <summary>
-        /// MLA-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MLA-1.")]
-        MLA1 = 21340,
-
-        /// <summary>
-        /// MM APS 705.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MM APS 705.")]
-        MMAPS705 = 21375,
-
-        /// <summary>
-        /// MM SPG 74.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MM SPG 74.")]
-        MMSPG74 = 21420,
-
-        /// <summary>
-        /// MM SPG 75.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MM SPG 75.")]
-        MMSPG75 = 21465,
-
-        /// <summary>
-        /// MM SPN 703.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MM SPN 703.")]
-        MMSPN703 = 21490,
-
-        /// <summary>
-        /// MM SPS 702.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MM SPS 702.")]
-        MMSPS702 = 21510,
-
-        /// <summary>
-        /// MM SPS 768.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MM SPS 768.")]
-        MMSPS768 = 21555,
-
-        /// <summary>
-        /// MM SPS 774.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MM SPS 774.")]
-        MMSPS774 = 21600,
-
-        /// <summary>
-        /// Moon 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moon 4.")]
-        Moon4 = 21645,
-
-        /// <summary>
-        /// MMRS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MMRS.")]
-        MMRS = 21650,
-
-        /// <summary>
-        /// MPDR 18 X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MPDR 18 X.")]
-        MPDR18X = 21690,
-
-        /// <summary>
-        /// MT-305X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MT-305X.")]
-        MT305X = 21710,
-
-        /// <summary>
-        /// Muff Cob.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Muff Cob.")]
-        MuffCob = 21735,
-
-        /// <summary>
-        /// Mushroom.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mushroom.")]
-        Mushroom = 21780,
-
-        /// <summary>
-        /// Mushroom 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mushroom 1.")]
-        Mushroom1 = 21825,
-
-        /// <summary>
-        /// Mushroom 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mushroom 2.")]
-        Mushroom2 = 21870,
-
-        /// <summary>
-        /// N920Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("N920Z.")]
-        N920Z = 21880,
-
-        /// <summary>
-        /// Nanjing B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nanjing B.")]
-        NanjingB = 21890,
-
-        /// <summary>
-        /// Nanjing C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nanjing C.")]
-        NanjingC = 21895,
-
-        /// <summary>
-        /// Nayada.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nayada.")]
-        Nayada = 21915,
-
-        /// <summary>
-        /// Neptun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neptun.")]
-        Neptun = 21960,
-
-        /// <summary>
-        /// NIKE TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NIKE TT.")]
-        NIKETT = 21980,
-
-        /// <summary>
-        /// NRBA 50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NRBA 50.")]
-        NRBA50 = 22005,
-
-        /// <summary>
-        /// NRBA 51.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NRBA 51.")]
-        NRBA51 = 22050,
-
-        /// <summary>
-        /// NRBF 20A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NRBF 20A.")]
-        NRBF20A = 22095,
-
-        /// <summary>
-        /// Nysa B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nysa B.")]
-        NysaB = 22140,
-
-        /// <summary>
-        /// O524A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("O524A.")]
-        O524A = 22185,
-
-        /// <summary>
-        /// O580B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("O580B.")]
-        O580B = 22230,
-
-        /// <summary>
-        /// O625Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("O625Z.")]
-        O625Z = 22275,
-
-        /// <summary>
-        /// O626Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("O626Z.")]
-        O626Z = 22320,
-
-        /// <summary>
-        /// Odd Group.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Odd Group.")]
-        OddGroup = 22345,
-
-        /// <summary>
-        /// Odd Lot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Odd Lot.")]
-        OddLot = 22365,
-
-        /// <summary>
-        /// Odd Pair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Odd Pair.")]
-        OddPair = 22410,
-
-        /// <summary>
-        /// Oka.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Oka.")]
-        Oka = 22455,
-
-        /// <summary>
-        /// OKEAN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OKEAN.")]
-        OKEAN = 22500,
-
-        /// <summary>
-        /// OKINXE 12C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OKINXE 12C.")]
-        OKINXE12C = 22545,
-
-        /// <summary>
-        /// OMEGA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OMEGA.")]
-        OMEGA = 22590,
-
-        /// <summary>
-        /// Omera ORB32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Omera ORB32.")]
-        OmeraORB32 = 22635,
-
-        /// <summary>
-        /// One Eye.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("One Eye.")]
-        OneEye = 22680,
-
-        /// <summary>
-        /// OP-28.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OP-28.")]
-        OP28 = 22690,
-
-        /// <summary>
-        /// OPS-16B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OPS-16B.")]
-        OPS16B = 22725,
-
-        /// <summary>
-        /// OPS-18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OPS-18.")]
-        OPS18 = 22730,
-
-        /// <summary>
-        /// OPS-28.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OPS-28.")]
-        OPS28 = 22740,
-
-        /// <summary>
-        /// OR-2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OR-2.")]
-        OR2 = 22770,
-
-        /// <summary>
-        /// ORB-31S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ORB-31S.")]
-        ORB31S = 22810,
-
-        /// <summary>
-        /// ORB 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ORB 32.")]
-        ORB32 = 22815,
-
-        /// <summary>
-        /// Orion Rtn 10X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Orion Rtn 10X.")]
-        OrionRtn10X = 22860,
-
-        /// <summary>
-        /// Otomat MK II Teseo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Otomat MK II Teseo.")]
-        OtomatMKIITeseo = 22905,
-
-        /// <summary>
-        /// Owl Screech.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Owl Screech.")]
-        OwlScreech = 22950,
-
-        /// <summary>
-        /// P360Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("P360Z.")]
-        P360Z = 22955,
-
-        /// <summary>
-        /// PA-1660.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PA-1660.")]
-        PA1660 = 22960,
-
-        /// <summary>
-        /// Palm Frond.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Palm Frond.")]
-        PalmFrond = 22995,
-
-        /// <summary>
-        /// Palm Frond AB.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Palm Frond AB.")]
-        PalmFrondAB = 23040,
-
-        /// <summary>
-        /// Pat Hand TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pat Hand TT.")]
-        PatHandTT = 23085,
-
-        /// <summary>
-        /// Pat Hand MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pat Hand MG.")]
-        PatHandMG = 23095,
-
-        /// <summary>
-        /// Patty Cake.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Patty Cake.")]
-        PattyCake = 23130,
-
-        /// <summary>
-        /// Pawn Cake.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pawn Cake.")]
-        PawnCake = 23175,
-
-        /// <summary>
-        /// PBR 4 Rubin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PBR 4 Rubin.")]
-        PBR4Rubin = 23220,
-
-        /// <summary>
-        /// Pea Sticks.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pea Sticks.")]
-        PeaSticks = 23265,
-
-        /// <summary>
-        /// Peel Cone.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Peel Cone.")]
-        PeelCone = 23310,
-
-        /// <summary>
-        /// Peel Group.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Peel Group.")]
-        PeelGroup = 23355,
-
-        /// <summary>
-        /// Peel Group A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Peel Group A.")]
-        PeelGroupA = 23400,
-
-        /// <summary>
-        /// Peel Group B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Peel Group B.")]
-        PeelGroupB = 23445,
-
-        /// <summary>
-        /// Peel Pair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Peel Pair.")]
-        PeelPair = 23490,
-
-        /// <summary>
-        /// Philips 9LV 200.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Philips 9LV 200.")]
-        Philips9LV200 = 23535,
-
-        /// <summary>
-        /// Philips 9LV 331.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Philips 9LV 331.")]
-        Philips9LV331 = 23580,
-
-        /// <summary>
-        /// Philips LV 223.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Philips LV 223.")]
-        PhilipsLV223 = 23625,
-
-        /// <summary>
-        /// Philips Sea Giraffe 50 HC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Philips Sea Giraffe 50 HC.")]
-        PhilipsSeaGiraffe50HC = 23670,
-
-        /// <summary>
-        /// Pin Jib.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pin Jib.")]
-        PinJib = 23690,
-
-        /// <summary>
-        /// Plank Shad.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plank Shad.")]
-        PlankShad = 23710,
-
-        /// <summary>
-        /// Plank Shave.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plank Shave.")]
-        PlankShave = 23715,
-
-        /// <summary>
-        /// Plank Shave A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plank Shave A.")]
-        PlankShaveA = 23760,
-
-        /// <summary>
-        /// Plank Shave B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plank Shave B.")]
-        PlankShaveB = 23805,
-
-        /// <summary>
-        /// Plate Steer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plate Steer.")]
-        PlateSteer = 23850,
-
-        /// <summary>
-        /// Plessey AWS 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plessey AWS 1.")]
-        PlesseyAWS1 = 23895,
-
-        /// <summary>
-        /// Plessey AWS 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plessey AWS 4.")]
-        PlesseyAWS4 = 23940,
-
-        /// <summary>
-        /// Plessey AWS 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plessey AWS 6.")]
-        PlesseyAWS6 = 23985,
-
-        /// <summary>
-        /// Plessey RJ.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plessey RJ.")]
-        PlesseyRJ = 23990,
-
-        /// <summary>
-        /// Plessey type 996.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plessey type 996.")]
-        PlesseyType996 = 24030,
-
-        /// <summary>
-        /// Plinth Net.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plinth Net.")]
-        PlinthNet = 24075,
-
-        /// <summary>
-        /// Pluto.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pluto.")]
-        Pluto = 24095,
-
-        /// <summary>
-        /// POHJANPALO.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("POHJANPALO.")]
-        POHJANPALO = 24100,
-
-        /// <summary>
-        /// POLLUX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("POLLUX.")]
-        POLLUX = 24120,
-
-        /// <summary>
-        /// Pop Group.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pop Group.")]
-        PopGroup = 24165,
-
-        /// <summary>
-        /// Pop Group MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pop Group MG.")]
-        PopGroupMG = 24210,
-
-        /// <summary>
-        /// Pop Group TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pop Group TA.")]
-        PopGroupTA = 24255,
-
-        /// <summary>
-        /// Pop Group TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pop Group TT.")]
-        PopGroupTT = 24300,
-
-        /// <summary>
-        /// Pork Trough.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pork Trough.")]
-        PorkTrough = 24345,
-
-        /// <summary>
-        /// Post Bow.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Post Bow.")]
-        PostBow = 24390,
-
-        /// <summary>
-        /// Post Lamp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Post Lamp.")]
-        PostLamp = 24435,
-
-        /// <summary>
-        /// Pot Drum.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pot Drum.")]
-        PotDrum = 24480,
-
-        /// <summary>
-        /// Pot Head.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pot Head.")]
-        PotHead = 24525,
-
-        /// <summary>
-        /// PRIMUS 40 WXD.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PRIMUS 40 WXD.")]
-        PRIMUS40WXD = 24570,
-
-        /// <summary>
-        /// PRIMUS 300SL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PRIMUS 300SL.")]
-        PRIMUS300SL = 24615,
-
-        /// <summary>
-        /// Primus 3000.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primus 3000.")]
-        Primus3000 = 24620,
-
-        /// <summary>
-        /// PS-05A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PS-05A.")]
-        PS05A = 24650,
-
-        /// <summary>
-        /// PS 46 A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PS 46 A.")]
-        PS46A = 24660,
-
-        /// <summary>
-        /// PS 70 R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PS 70 R.")]
-        PS70R = 24705,
-
-        /// <summary>
-        /// PS-890.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PS-890.")]
-        PS890 = 24710,
-
-        /// <summary>
-        /// Puff Ball.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Puff Ball.")]
-        PuffBall = 24750,
-
-        /// <summary>
-        /// R-76.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("R-76.")]
-        R76 = 24770,
-
-        /// <summary>
-        /// RAC-30.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAC-30.")]
-        RAC30 = 24780,
-
-        /// <summary>
-        /// Racal 1229.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal 1229.")]
-        Racal1229 = 24795,
-
-        /// <summary>
-        /// Racal AC 2690 BT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal AC 2690 BT.")]
-        RacalAC2690BT = 24840,
-
-        /// <summary>
-        /// Racal Decca 1216.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal Decca 1216.")]
-        RacalDecca1216 = 24885,
-
-        /// <summary>
-        /// Racal Decca 360.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal Decca 360.")]
-        RacalDecca360 = 24930,
-
-        /// <summary>
-        /// Racal Decca AC 1290.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal Decca AC 1290.")]
-        RacalDeccaAC1290 = 24975,
-
-        /// <summary>
-        /// Racal Decca TM 1229.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal Decca TM 1229.")]
-        RacalDeccaTM1229 = 25020,
-
-        /// <summary>
-        /// Racal Decca TM 1626.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal Decca TM 1626.")]
-        RacalDeccaTM1626 = 25065,
-
-        /// <summary>
-        /// Racal DRBN 34A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Racal DRBN 34A.")]
-        RacalDRBN34A = 25110,
-
-        /// <summary>
-        /// Radar 24.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radar 24.")]
-        Radar24 = 25155,
-
-        /// <summary>
-        /// RAN 7S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAN 7S.")]
-        RAN7S = 25200,
-
-        /// <summary>
-        /// RAN 10S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAN 10S.")]
-        RAN10S = 25205,
-
-        /// <summary>
-        /// RAN 11 LX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAN 11 LX.")]
-        RAN11LX = 25245,
-
-        /// <summary>
-        /// Rapier TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rapier TA.")]
-        RapierTA = 25260,
-
-        /// <summary>
-        /// Dagger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dagger.")]
-        Dagger = 25265,
-
-        /// <summary>
-        /// Rapier MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rapier MG.")]
-        RapierMG = 25270,
-
-        /// <summary>
-        /// RAT-31S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAT-31S.")]
-        RAT31S = 25280,
-
-        /// <summary>
-        /// RATAC (LCT).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RATAC (LCT).")]
-        RATACLCT = 25285,
-
-        /// <summary>
-        /// Raytheon 1220.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon 1220.")]
-        Raytheon1220 = 25290,
-
-        /// <summary>
-        /// Raytheon 1302.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon 1302.")]
-        Raytheon1302 = 25300,
-
-        /// <summary>
-        /// Raytheon 1500.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon 1500.")]
-        Raytheon1500 = 25335,
-
-        /// <summary>
-        /// Raytheon 1645.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon 1645.")]
-        Raytheon1645 = 25380,
-
-        /// <summary>
-        /// Raytheon 1650.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon 1650.")]
-        Raytheon1650 = 25425,
-
-        /// <summary>
-        /// Raytheon 1900.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon 1900.")]
-        Raytheon1900 = 25470,
-
-        /// <summary>
-        /// Raytheon 2502.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon 2502.")]
-        Raytheon2502 = 25515,
-
-        /// <summary>
-        /// Raytheon TM 1650/6X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon TM 1650/6X.")]
-        RaytheonTM16506X = 25560,
-
-        /// <summary>
-        /// Raytheon TM 1660/12S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raytheon TM 1660/12S.")]
-        RaytheonTM166012S = 25605,
-
-        /// <summary>
-        /// RAY-1220XR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAY-1220XR.")]
-        RAY1220XR = 25630,
-
-        /// <summary>
-        /// RAY-1401.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAY-1401.")]
-        RAY1401 = 25635,
-
-        /// <summary>
-        /// Ray 2900.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ray 2900.")]
-        Ray2900 = 25650,
-
-        /// <summary>
-        /// Raypath.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Raypath.")]
-        Raypath = 25695,
-
-        /// <summary>
-        /// RBE2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RBE2.")]
-        RBE2 = 25735,
-
-        /// <summary>
-        /// RDM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDM.")]
-        RDM = 25740,
-
-        /// <summary>
-        /// RDY.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDY.")]
-        RDY = 25760,
-
-        /// <summary>
-        /// RDN 72.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDN 72.")]
-        RDN72 = 25785,
-
-        /// <summary>
-        /// RDR 1A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDR 1A.")]
-        RDR1A = 25830,
-
-        /// <summary>
-        /// RDR 1E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDR 1E.")]
-        RDR1E = 25835,
-
-        /// <summary>
-        /// RDR 4A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDR 4A.")]
-        RDR4A = 25840,
-
-        /// <summary>
-        /// RDR 1200.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDR 1200.")]
-        RDR1200 = 25875,
-
-        /// <summary>
-        /// RDR 1400.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDR 1400.")]
-        RDR1400 = 25885,
-
-        /// <summary>
-        /// RDR 1400 C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDR 1400 C.")]
-        RDR1400C = 25890,
-
-        /// <summary>
-        /// RDR 1500.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RDR 1500.")]
-        RDR1500 = 25895,
-
-        /// <summary>
-        /// Rice Lamp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rice Lamp.")]
-        RiceLamp = 25920,
-
-        /// <summary>
-        /// Rice Pad.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rice Pad.")]
-        RicePad = 25965,
-
-        /// <summary>
-        /// Rice Screen.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rice Screen.")]
-        RiceScreen = 26010,
-
-        /// <summary>
-        /// ROLAND BN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ROLAND BN.")]
-        ROLANDBN = 26055,
-
-        /// <summary>
-        /// ROLAND MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ROLAND MG.")]
-        ROLANDMG = 26100,
-
-        /// <summary>
-        /// ROLAND TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ROLAND TA.")]
-        ROLANDTA = 26145,
-
-        /// <summary>
-        /// ROLAND TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ROLAND TT.")]
-        ROLANDTT = 26190,
-
-        /// <summary>
-        /// Round Ball.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Round Ball.")]
-        RoundBall = 26235,
-
-        /// <summary>
-        /// Round House.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Round House.")]
-        RoundHouse = 26280,
-
-        /// <summary>
-        /// Round House B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Round House B.")]
-        RoundHouseB = 26325,
-
-        /// <summary>
-        /// RT-02/50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RT-02/50.")]
-        RT0250 = 26330,
-
-        /// <summary>
-        /// RTN-1A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RTN-1A.")]
-        RTN1A = 26350,
-
-        /// <summary>
-        /// RV2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV2.")]
-        RV2 = 26370,
-
-        /// <summary>
-        /// RV3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV3.")]
-        RV3 = 26415,
-
-        /// <summary>
-        /// RV5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV5.")]
-        RV5 = 26460,
-
-        /// <summary>
-        /// RV10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV10.")]
-        RV10 = 26505,
-
-        /// <summary>
-        /// RV17.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV17.")]
-        RV17 = 26550,
-
-        /// <summary>
-        /// RV18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV18.")]
-        RV18 = 26595,
-
-        /// <summary>
-        /// RV-377.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV-377.")]
-        RV377 = 26610,
-
-        /// <summary>
-        /// RV UM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RV UM.")]
-        RVUM = 26640,
-
-        /// <summary>
-        /// RXN 2-60.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RXN 2-60.")]
-        RXN260 = 26660,
-
-        /// <summary>
-        /// S-1810CD.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("S-1810CD.")]
-        S1810CD = 26670,
-
-        /// <summary>
-        /// SA 2 Guideline.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA 2 Guideline.")]
-        SA2Guideline = 26685,
-
-        /// <summary>
-        /// SA 3 Goa.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA 3 Goa.")]
-        SA3Goa = 26730,
-
-        /// <summary>
-        /// SA 8 Gecko DT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA 8 Gecko DT.")]
-        SA8GeckoDT = 26775,
-
-        /// <summary>
-        /// SA-12 TELAR ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA-12 TELAR ILL.")]
-        SA12TELARILL = 26795,
-
-        /// <summary>
-        /// SA N 7 Gadfly TI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA N 7 Gadfly TI.")]
-        SAN7GadflyTI = 26820,
-
-        /// <summary>
-        /// SA N 11 Cads 1 UN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA N 11 Cads 1 UN.")]
-        SAN11Cads1UN = 26865,
-
-        /// <summary>
-        /// Salt Pot A&amp;B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Salt Pot A&amp;B.")]
-        SaltPotAB = 26910,
-
-        /// <summary>
-        /// SATURNE II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SATURNE II.")]
-        SATURNEII = 26955,
-
-        /// <summary>
-        /// Scan Can.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scan Can.")]
-        ScanCan = 27000,
-
-        /// <summary>
-        /// Scan Fix.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scan Fix.")]
-        ScanFix = 27045,
-
-        /// <summary>
-        /// Scan Odd.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scan Odd.")]
-        ScanOdd = 27090,
-
-        /// <summary>
-        /// Scan Three.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scan Three.")]
-        ScanThree = 27135,
-
-        /// <summary>
-        /// SCANTER (CSR).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SCANTER (CSR).")]
-        SCANTERCSR = 27140,
-
-        /// <summary>
-        /// SCORADS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SCORADS.")]
-        SCORADS = 27141,
-
-        /// <summary>
-        /// SCOREBOARD.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SCOREBOARD.")]
-        SCOREBOARD = 27150,
-
-        /// <summary>
-        /// Scoup Plate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scoup Plate.")]
-        ScoupPlate = 27180,
-
-        /// <summary>
-        /// SCR-584.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SCR-584.")]
-        SCR584 = 27190,
-
-        /// <summary>
-        /// Sea Archer 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Archer 2.")]
-        SeaArcher2 = 27225,
-
-        /// <summary>
-        /// Sea Hunter 4 MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Hunter 4 MG.")]
-        SeaHunter4MG = 27270,
-
-        /// <summary>
-        /// Sea Hunter 4 TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Hunter 4 TA.")]
-        SeaHunter4TA = 27315,
-
-        /// <summary>
-        /// Sea Hunter 4 TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Hunter 4 TT.")]
-        SeaHunter4TT = 27360,
-
-        /// <summary>
-        /// Sea Gull.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Gull.")]
-        SeaGull = 27405,
-
-        /// <summary>
-        /// Sea Net.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Net.")]
-        SeaNet = 27450,
-
-        /// <summary>
-        /// Sea Spray.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Spray.")]
-        SeaSpray = 27495,
-
-        /// <summary>
-        /// Sea Tiger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea Tiger.")]
-        SeaTiger = 27540,
-
-        /// <summary>
-        /// Searchwater.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Searchwater.")]
-        Searchwater = 27570,
-
-        /// <summary>
-        /// Selenia Orion 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selenia Orion 7.")]
-        SeleniaOrion7 = 27585,
-
-        /// <summary>
-        /// Selenia type 912.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selenia type 912.")]
-        SeleniaType912 = 27630,
-
-        /// <summary>
-        /// Selennia RAN 12 L/X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selennia RAN 12 L/X.")]
-        SelenniaRAN12LX = 27675,
-
-        /// <summary>
-        /// Selennia RTN 10X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selennia RTN 10X.")]
-        SelenniaRTN10X = 27720,
-
-        /// <summary>
-        /// Selinia ARP 1645.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selinia ARP 1645.")]
-        SeliniaARP1645 = 27765,
-
-        /// <summary>
-        /// SGR 102 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SGR 102 00.")]
-        SGR10200 = 27810,
-
-        /// <summary>
-        /// SGR 103/02.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SGR 103/02.")]
-        SGR10302 = 27855,
-
-        /// <summary>
-        /// SGR-104.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SGR-104.")]
-        SGR104 = 27870,
-
-        /// <summary>
-        /// Sheet Bend.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sheet Bend.")]
-        SheetBend = 27900,
-
-        /// <summary>
-        /// Sheet Curve.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sheet Curve.")]
-        SheetCurve = 27945,
-
-        /// <summary>
-        /// Ship Globe.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship Globe.")]
-        ShipGlobe = 27990,
-
-        /// <summary>
-        /// Ship Wheel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship Wheel.")]
-        ShipWheel = 28035,
-
-        /// <summary>
-        /// SGR 114.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SGR 114.")]
-        SGR114 = 28080,
-
-        /// <summary>
-        /// Shore Walk A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Shore Walk A.")]
-        ShoreWalkA = 28125,
-
-        /// <summary>
-        /// Short Horn.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Short Horn.")]
-        ShortHorn = 28170,
-
-        /// <summary>
-        /// Shot Dome.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Shot Dome.")]
-        ShotDome = 28215,
-
-        /// <summary>
-        /// Side Globe JN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Side Globe JN.")]
-        SideGlobeJN = 28260,
-
-        /// <summary>
-        /// Side Net.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Side Net.")]
-        SideNet = 28280,
-
-        /// <summary>
-        /// Side Walk A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Side Walk A.")]
-        SideWalkA = 28305,
-
-        /// <summary>
-        /// Signaal DA 02.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal DA 02.")]
-        SignaalDA02 = 28350,
-
-        /// <summary>
-        /// Signaal DA 05.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal DA 05.")]
-        SignaalDA05 = 28395,
-
-        /// <summary>
-        /// Signaal DA 08.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal DA 08.")]
-        SignaalDA08 = 28440,
-
-        /// <summary>
-        /// Signaal LW 08.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal LW 08.")]
-        SignaalLW08 = 28485,
-
-        /// <summary>
-        /// Signaal LWOR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal LWOR.")]
-        SignaalLWOR = 28530,
-
-        /// <summary>
-        /// Signaal M45.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal M45.")]
-        SignaalM45 = 28575,
-
-        /// <summary>
-        /// Signaal MW 08.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal MW 08.")]
-        SignaalMW08 = 28620,
-
-        /// <summary>
-        /// Signaal SMART.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal SMART.")]
-        SignaalSMART = 28665,
-
-        /// <summary>
-        /// Signaal STING.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal STING.")]
-        SignaalSTING = 28710,
-
-        /// <summary>
-        /// Signaal STIR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal STIR.")]
-        SignaalSTIR = 28755,
-
-        /// <summary>
-        /// Signaal WM 20/2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal WM 20/2.")]
-        SignaalWM202 = 28800,
-
-        /// <summary>
-        /// Signaal WM 25.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal WM 25.")]
-        SignaalWM25 = 28845,
-
-        /// <summary>
-        /// Signaal WM 27.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal WM 27.")]
-        SignaalWM27 = 28890,
-
-        /// <summary>
-        /// Signaal WM 28.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal WM 28.")]
-        SignaalWM28 = 28935,
-
-        /// <summary>
-        /// Signaal ZW 01.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal ZW 01.")]
-        SignaalZW01 = 28980,
-
-        /// <summary>
-        /// Signaal ZW 06.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signaal ZW 06.")]
-        SignaalZW06 = 29025,
-
-        /// <summary>
-        /// Ski Pole.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ski Pole.")]
-        SkiPole = 29070,
-
-        /// <summary>
-        /// Skin Head.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Skin Head.")]
-        SkinHead = 29115,
-
-        /// <summary>
-        /// Skip Spin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Skip Spin.")]
-        SkipSpin = 29160,
-
-        /// <summary>
-        /// UAR-1021.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("UAR-1021.")]
-        UAR1021 = 29185,
-
-        /// <summary>
-        /// UAR-1021.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("UAR-1021.")]
-        UAR1021_29190 = 29190,
-
-        /// <summary>
-        /// Sky Watch.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sky Watch.")]
-        SkyWatch = 29205,
-
-        /// <summary>
-        /// SKYSHADOW.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SKYSHADOW.")]
-        SKYSHADOW = 29215,
-
-        /// <summary>
-        /// SKYSHIELD TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SKYSHIELD TA.")]
-        SKYSHIELDTA = 29220,
-
-        /// <summary>
-        /// SL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SL.")]
-        SL = 29250,
-
-        /// <summary>
-        /// SL/ALQ-234.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SL/ALQ-234.")]
-        SLALQ234 = 29270,
-
-        /// <summary>
-        /// Slap Shot E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Slap Shot E.")]
-        SlapShotE = 29295,
-
-        /// <summary>
-        /// Slim Net.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Slim Net.")]
-        SlimNet = 29340,
-
-        /// <summary>
-        /// Slot Back A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Slot Back A.")]
-        SlotBackA = 29385,
-
-        /// <summary>
-        /// Slot Back ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Slot Back ILL.")]
-        SlotBackILL = 29400,
-
-        /// <summary>
-        /// Slot Back B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Slot Back B.")]
-        SlotBackB = 29430,
-
-        /// <summary>
-        /// Slot Rest.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Slot Rest.")]
-        SlotRest = 29440,
-
-        /// <summary>
-        /// SMA 3 RM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA 3 RM.")]
-        SMA3RM = 29475,
-
-        /// <summary>
-        /// SMA 3 RM 20.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA 3 RM 20.")]
-        SMA3RM20 = 29520,
-
-        /// <summary>
-        /// SMA 3RM 20A/SMG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA 3RM 20A/SMG.")]
-        SMA3RM20ASMG = 29565,
-
-        /// <summary>
-        /// SMA BPS 704.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA BPS 704.")]
-        SMABPS704 = 29610,
-
-        /// <summary>
-        /// SMA SPIN 749 (V) 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPIN 749 (V) 2.")]
-        SMASPIN749V2 = 29655,
-
-        /// <summary>
-        /// SMA SPN 703.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPN 703.")]
-        SMASPN703 = 29700,
-
-        /// <summary>
-        /// SMA SPN 751.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPN 751.")]
-        SMASPN751 = 29745,
-
-        /// <summary>
-        /// SMA SPOS 748.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPOS 748.")]
-        SMASPOS748 = 29790,
-
-        /// <summary>
-        /// SMA SPQ 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPQ 2.")]
-        SMASPQ2 = 29835,
-
-        /// <summary>
-        /// SMA SPQ 2D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPQ 2D.")]
-        SMASPQ2D = 29880,
-
-        /// <summary>
-        /// SMA SPQ 701.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPQ 701.")]
-        SMASPQ701 = 29925,
-
-        /// <summary>
-        /// SMA SPS 702 UPX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA SPS 702 UPX.")]
-        SMASPS702UPX = 29970,
-
-        /// <summary>
-        /// SMA ST 2 OTOMAT II MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA ST 2 OTOMAT II MH.")]
-        SMAST2OTOMATIIMH = 30015,
-
-        /// <summary>
-        /// SMA 718 Beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMA 718 Beacon.")]
-        SMA718Beacon = 30060,
-
-        /// <summary>
-        /// SNAP SHOT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SNAP SHOT.")]
-        SNAPSHOT = 30080,
-
-        /// <summary>
-        /// Snoop Drift.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Drift.")]
-        SnoopDrift = 30105,
-
-        /// <summary>
-        /// Snoop Head.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Head.")]
-        SnoopHead = 30150,
-
-        /// <summary>
-        /// Snoop Pair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Pair.")]
-        SnoopPair = 30195,
-
-        /// <summary>
-        /// Snoop Plate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Plate.")]
-        SnoopPlate = 30240,
-
-        /// <summary>
-        /// Snoop Slab.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Slab.")]
-        SnoopSlab = 30285,
-
-        /// <summary>
-        /// Snoop Tray.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Tray.")]
-        SnoopTray = 30330,
-
-        /// <summary>
-        /// Snoop Tray 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Tray 1.")]
-        SnoopTray1 = 30375,
-
-        /// <summary>
-        /// Snoop Tray 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Tray 2.")]
-        SnoopTray2 = 30420,
-
-        /// <summary>
-        /// Snoop Watch.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snoop Watch.")]
-        SnoopWatch = 30465,
-
-        /// <summary>
-        /// Snow Drift.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Snow Drift.")]
-        SnowDrift = 30470,
-
-        /// <summary>
-        /// SO-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SO-1.")]
-        SO1 = 30510,
-
-        /// <summary>
-        /// SO-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SO-12.")]
-        SO12 = 30520,
-
-        /// <summary>
-        /// SO A Communist.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SO A Communist.")]
-        SOACommunist = 30555,
-
-        /// <summary>
-        /// SO-69.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SO-69.")]
-        SO69 = 30580,
-
-        /// <summary>
-        /// Sock Eye.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sock Eye.")]
-        SockEye = 30600,
-
-        /// <summary>
-        /// SOM 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SOM 64.")]
-        SOM64 = 30645,
-
-        /// <summary>
-        /// SPADA TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPADA TT.")]
-        SPADATT = 30670,
-
-        /// <summary>
-        /// Sparrow (AIM/RIM-7) ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sparrow (AIM/RIM-7) ILL.")]
-        SparrowAIMRIM7ILL = 30690,
-
-        /// <summary>
-        /// Sperry M-3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sperry M-3.")]
-        SperryM3 = 30700,
-
-        /// <summary>
-        /// SPG 53F.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPG 53F.")]
-        SPG53F = 30735,
-
-        /// <summary>
-        /// SPG 70 (RTN 10X).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPG 70 (RTN 10X).")]
-        SPG70RTN10X = 30780,
-
-        /// <summary>
-        /// SPG 74 (RTN 20X).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPG 74 (RTN 20X).")]
-        SPG74RTN20X = 30825,
-
-        /// <summary>
-        /// SPG 75 (RTN 30X).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPG 75 (RTN 30X).")]
-        SPG75RTN30X = 30870,
-
-        /// <summary>
-        /// SPG 76 (RTN 30X).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPG 76 (RTN 30X).")]
-        SPG76RTN30X = 30915,
-
-        /// <summary>
-        /// Spin Scan A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spin Scan A.")]
-        SpinScanA = 30960,
-
-        /// <summary>
-        /// Spin Scan B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spin Scan B.")]
-        SpinScanB = 31005,
-
-        /// <summary>
-        /// Spin Trough.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spin Trough.")]
-        SpinTrough = 31050,
-
-        /// <summary>
-        /// Splash Drop.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Splash Drop.")]
-        SplashDrop = 31095,
-
-        /// <summary>
-        /// SPN 35A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 35A.")]
-        SPN35A = 31140,
-
-        /// <summary>
-        /// SPN 41.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 41.")]
-        SPN41 = 31185,
-
-        /// <summary>
-        /// SPN 42.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 42.")]
-        SPN42 = 31230,
-
-        /// <summary>
-        /// SPN 43A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 43A.")]
-        SPN43A = 31275,
-
-        /// <summary>
-        /// SPN 43B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 43B.")]
-        SPN43B = 31320,
-
-        /// <summary>
-        /// SPN 44.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 44.")]
-        SPN44 = 31365,
-
-        /// <summary>
-        /// SPN 46.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 46.")]
-        SPN46 = 31410,
-
-        /// <summary>
-        /// SPN 703.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 703.")]
-        SPN703 = 31455,
-
-        /// <summary>
-        /// SPN 728 (V) 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 728 (V) 1.")]
-        SPN728V1 = 31500,
-
-        /// <summary>
-        /// SPN 748.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 748.")]
-        SPN748 = 31545,
-
-        /// <summary>
-        /// SPN 750.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPN 750.")]
-        SPN750 = 31590,
-
-        /// <summary>
-        /// Sponge Cake.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sponge Cake.")]
-        SpongeCake = 31635,
-
-        /// <summary>
-        /// Spoon Rest.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spoon Rest.")]
-        SpoonRest = 31680,
-
-        /// <summary>
-        /// Spoon Rest A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spoon Rest A.")]
-        SpoonRestA = 31681,
-
-        /// <summary>
-        /// Spoon Rest B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spoon Rest B.")]
-        SpoonRestB = 31682,
-
-        /// <summary>
-        /// Spoon Rest D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spoon Rest D.")]
-        SpoonRestD = 31684,
-
-        /// <summary>
-        /// SPQ 712 (RAN 12 L/X).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPQ 712 (RAN 12 L/X).")]
-        SPQ712RAN12LX = 31725,
-
-        /// <summary>
-        /// SPS 6C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS 6C.")]
-        SPS6C = 31770,
-
-        /// <summary>
-        /// SPS 10F.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS 10F.")]
-        SPS10F = 31815,
-
-        /// <summary>
-        /// SPS 12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS 12.")]
-        SPS12 = 31860,
-
-        /// <summary>
-        /// SPS 768 (RAN EL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS 768 (RAN EL).")]
-        SPS768RANEL = 31995,
-
-        /// <summary>
-        /// SPS 774 (RAN 10S).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS 774 (RAN 10S).")]
-        SPS774RAN10S = 32040,
-
-        /// <summary>
-        /// SPY 790.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPY 790.")]
-        SPY790 = 32085,
-
-        /// <summary>
-        /// Square Head.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Square Head.")]
-        SquareHead = 32130,
-
-        /// <summary>
-        /// Square Pair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Square Pair.")]
-        SquarePair = 32175,
-
-        /// <summary>
-        /// Square Slot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Square Slot.")]
-        SquareSlot = 32220,
-
-        /// <summary>
-        /// Square Tie.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Square Tie.")]
-        SquareTie = 32265,
-
-        /// <summary>
-        /// Squash Dome.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Squash Dome.")]
-        SquashDome = 32310,
-
-        /// <summary>
-        /// Squat Eye.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Squat Eye.")]
-        SquatEye = 32330,
-
-        /// <summary>
-        /// Squint Eye.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Squint Eye.")]
-        SquintEye = 32355,
-
-        /// <summary>
-        /// SRN 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SRN 6.")]
-        SRN6 = 32400,
-
-        /// <summary>
-        /// SRN 15.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SRN 15.")]
-        SRN15 = 32445,
-
-        /// <summary>
-        /// SRN 745.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SRN 745.")]
-        SRN745 = 32490,
-
-        /// <summary>
-        /// SRO 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SRO 1.")]
-        SRO1 = 32535,
-
-        /// <summary>
-        /// SRO 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SRO 2.")]
-        SRO2 = 32580,
-
-        /// <summary>
-        /// SS C 2B Samlet MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS C 2B Samlet MG.")]
-        SSC2BSamletMG = 32625,
-
-        /// <summary>
-        /// SS N 2A B CSSC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 2A B CSSC.")]
-        SSN2ABCSSC = 32670,
-
-        /// <summary>
-        /// SS N 2A B CSSC 2A 3A2 MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 2A B CSSC 2A 3A2 MH.")]
-        SSN2ABCSSC2A3A2MH = 32715,
-
-        /// <summary>
-        /// SS N 2C Seeker.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 2C Seeker.")]
-        SSN2CSeeker = 32760,
-
-        /// <summary>
-        /// SS N 2C D Styx.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 2C D Styx.")]
-        SSN2CDStyx = 32805,
-
-        /// <summary>
-        /// SS N 2C D Styx C D MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 2C D Styx C D MH.")]
-        SSN2CDStyxCDMH = 32850,
-
-        /// <summary>
-        /// SS N 3 SSC SS C 18 BN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 3 SSC SS C 18 BN.")]
-        SSN3SSCSSC18BN = 32895,
-
-        /// <summary>
-        /// SS N 3B Sepal AL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 3B Sepal AL.")]
-        SSN3BSepalAL = 32940,
-
-        /// <summary>
-        /// SS N 3B Sepal MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 3B Sepal MH.")]
-        SSN3BSepalMH = 32985,
-
-        /// <summary>
-        /// SS N 9 Siren.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 9 Siren.")]
-        SSN9Siren = 33030,
-
-        /// <summary>
-        /// SS N 9 Siren AL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 9 Siren AL.")]
-        SSN9SirenAL = 33075,
-
-        /// <summary>
-        /// SS N 9 Siren MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 9 Siren MH.")]
-        SSN9SirenMH = 33120,
-
-        /// <summary>
-        /// SS N 12 Sandbox AL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 12 Sandbox AL.")]
-        SSN12SandboxAL = 33165,
-
-        /// <summary>
-        /// SS N 12 Sandbox MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 12 Sandbox MH.")]
-        SSN12SandboxMH = 33210,
-
-        /// <summary>
-        /// SS N 19 Shipwreck.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 19 Shipwreck.")]
-        SSN19Shipwreck = 33255,
-
-        /// <summary>
-        /// SS N 19 Shipwreck AL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 19 Shipwreck AL.")]
-        SSN19ShipwreckAL = 33300,
-
-        /// <summary>
-        /// SS N 19 Shipwreck MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 19 Shipwreck MH.")]
-        SSN19ShipwreckMH = 33345,
-
-        /// <summary>
-        /// SS N 21 AL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 21 AL.")]
-        SSN21AL = 33390,
-
-        /// <summary>
-        /// SS N 22 Sunburn.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 22 Sunburn.")]
-        SSN22Sunburn = 33435,
-
-        /// <summary>
-        /// SS N 22 Sunburn MH.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS N 22 Sunburn MH.")]
-        SSN22SunburnMH = 33480,
-
-        /// <summary>
-        /// Stone Cake.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stone Cake.")]
-        StoneCake = 33525,
-
-        /// <summary>
-        /// STR 41.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("STR 41.")]
-        STR41 = 33570,
-
-        /// <summary>
-        /// Straight Flush TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Straight Flush TA.")]
-        StraightFlushTA = 33590,
-
-        /// <summary>
-        /// Straight Flush TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Straight Flush TT.")]
-        StraightFlushTT = 33595,
-
-        /// <summary>
-        /// Straight Flush ILL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Straight Flush ILL.")]
-        StraightFlushILL = 33600,
-
-        /// <summary>
-        /// Strike Out.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strike Out.")]
-        StrikeOut = 33615,
-
-        /// <summary>
-        /// Strut Curve.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strut Curve.")]
-        StrutCurve = 33660,
-
-        /// <summary>
-        /// Strut Pair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strut Pair.")]
-        StrutPair = 33705,
-
-        /// <summary>
-        /// Strut Pair 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strut Pair 1.")]
-        StrutPair1 = 33750,
-
-        /// <summary>
-        /// Strut Pair 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strut Pair 2.")]
-        StrutPair2 = 33795,
-
-        /// <summary>
-        /// Sun Visor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sun Visor.")]
-        SunVisor = 33840,
-
-        /// <summary>
-        /// Superfledermaus.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Superfledermaus.")]
-        Superfledermaus = 33860,
-
-        /// <summary>
-        /// Swift Rod 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Swift Rod 1.")]
-        SwiftRod1 = 33885,
-
-        /// <summary>
-        /// Swift Rod 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Swift Rod 2.")]
-        SwiftRod2 = 33930,
-
-        /// <summary>
-        /// T1166.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T1166.")]
-        T1166 = 33975,
-
-        /// <summary>
-        /// T1171.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T1171.")]
-        T1171 = 34020,
-
-        /// <summary>
-        /// T1202.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T1202.")]
-        T1202 = 34040,
-
-        /// <summary>
-        /// T6004.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T6004.")]
-        T6004 = 34065,
-
-        /// <summary>
-        /// T6031.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T6031.")]
-        T6031 = 34110,
-
-        /// <summary>
-        /// T8067.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8067.")]
-        T8067 = 34155,
-
-        /// <summary>
-        /// T8068.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8068.")]
-        T8068 = 34200,
-
-        /// <summary>
-        /// T8124.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8124.")]
-        T8124 = 34245,
-
-        /// <summary>
-        /// T8408.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8408.")]
-        T8408 = 34290,
-
-        /// <summary>
-        /// T8911.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8911.")]
-        T8911 = 34335,
-
-        /// <summary>
-        /// T8937.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8937.")]
-        T8937 = 34380,
-
-        /// <summary>
-        /// T8944.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8944.")]
-        T8944 = 34425,
-
-        /// <summary>
-        /// T8987.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("T8987.")]
-        T8987 = 34470,
-
-        /// <summary>
-        /// Tall King.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tall King.")]
-        TallKing = 34515,
-
-        /// <summary>
-        /// Tall Mike.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tall Mike.")]
-        TallMike = 34560,
-
-        /// <summary>
-        /// Tall Path.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tall Path.")]
-        TallPath = 34605,
-
-        /// <summary>
-        /// Team Work.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Team Work.")]
-        TeamWork = 34625,
-
-        /// <summary>
-        /// THAAD GBR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("THAAD GBR.")]
-        THAADGBR = 34640,
-
-        /// <summary>
-        /// THD 225.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("THD 225.")]
-        THD225 = 34650,
-
-        /// <summary>
-        /// Picador.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Picador.")]
-        Picador = 34670,
-
-        /// <summary>
-        /// THD 5500.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("THD 5500.")]
-        THD5500 = 34695,
-
-        /// <summary>
-        /// Thin Path.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thin Path.")]
-        ThinPath = 34740,
-
-        /// <summary>
-        /// Thin Skin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thin Skin.")]
-        ThinSkin = 34785,
-
-        /// <summary>
-        /// Thompson CSF TA-10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF TA-10.")]
-        ThompsonCSFTA10 = 34795,
-
-        /// <summary>
-        /// Thompson CSF TH D 1040 Neptune.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF TH D 1040 Neptune.")]
-        ThompsonCSFTHD1040Neptune = 34830,
-
-        /// <summary>
-        /// Thompson CSF Calypso.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF Calypso.")]
-        ThompsonCSFCalypso = 34875,
-
-        /// <summary>
-        /// Thompson CSF CASTOR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF CASTOR.")]
-        ThompsonCSFCASTOR = 34920,
-
-        /// <summary>
-        /// Thompson CSF Castor II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF Castor II.")]
-        ThompsonCSFCastorII = 34965,
-
-        /// <summary>
-        /// Thompson CSF DRBC 32A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF DRBC 32A.")]
-        ThompsonCSFDRBC32A = 35010,
-
-        /// <summary>
-        /// Thompson CSF DRBJ 11 D/E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF DRBJ 11 D/E.")]
-        ThompsonCSFDRBJ11DE = 35055,
-
-        /// <summary>
-        /// Thompson CSF DRBV 15A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF DRBV 15A.")]
-        ThompsonCSFDRBV15A = 35100,
-
-        /// <summary>
-        /// Thompson CSF DRBV 15C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF DRBV 15C.")]
-        ThompsonCSFDRBV15C = 35145,
-
-        /// <summary>
-        /// Thompson CSF DRBV 22D.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF DRBV 22D.")]
-        ThompsonCSFDRBV22D = 35190,
-
-        /// <summary>
-        /// Thompson CSF DRBV 23B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF DRBV 23B.")]
-        ThompsonCSFDRBV23B = 35235,
-
-        /// <summary>
-        /// Thompson CSF DRUA 33.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF DRUA 33.")]
-        ThompsonCSFDRUA33 = 35280,
-
-        /// <summary>
-        /// Thompson CSF Mars DRBV 21A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF Mars DRBV 21A.")]
-        ThompsonCSFMarsDRBV21A = 35325,
-
-        /// <summary>
-        /// Thompson CSF Sea Tiger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF Sea Tiger.")]
-        ThompsonCSFSeaTiger = 35370,
-
-        /// <summary>
-        /// Thompson CSF Triton.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF Triton.")]
-        ThompsonCSFTriton = 35415,
-
-        /// <summary>
-        /// Thompson CSF Vega with DRBC 32E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thompson CSF Vega with DRBC 32E.")]
-        ThompsonCSFVegaWithDRBC32E = 35460,
-
-        /// <summary>
-        /// TIGER-G.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TIGER-G.")]
-        TIGERG = 35480,
-
-        /// <summary>
-        /// TIGER-S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TIGER-S.")]
-        TIGERS = 35490,
-
-        /// <summary>
-        /// Tie Rods.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tie Rods.")]
-        TieRods = 35505,
-
-        /// <summary>
-        /// Tin Shield.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tin Shield.")]
-        TinShield = 35550,
-
-        /// <summary>
-        /// Tin Trap.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tin Trap.")]
-        TinTrap = 35570,
-
-        /// <summary>
-        /// TIRSPONDER.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TIRSPONDER.")]
-        TIRSPONDER = 35580,
-
-        /// <summary>
-        /// Toad Stool 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Toad Stool 1.")]
-        ToadStool1 = 35595,
-
-        /// <summary>
-        /// Toad Stool 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Toad Stool 2.")]
-        ToadStool2 = 35640,
-
-        /// <summary>
-        /// Toad Stool 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Toad Stool 3.")]
-        ToadStool3 = 35685,
-
-        /// <summary>
-        /// Toad Stool 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Toad Stool 4.")]
-        ToadStool4 = 35730,
-
-        /// <summary>
-        /// Toad Stool 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Toad Stool 5.")]
-        ToadStool5 = 35775,
-
-        /// <summary>
-        /// Tomb Stone.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tomb Stone.")]
-        TombStone = 35800,
-
-        /// <summary>
-        /// Top Bow.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Bow.")]
-        TopBow = 35820,
-
-        /// <summary>
-        /// Top Dome.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Dome.")]
-        TopDome = 35865,
-
-        /// <summary>
-        /// Top Knot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Knot.")]
-        TopKnot = 35910,
-
-        /// <summary>
-        /// Top Mesh.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Mesh.")]
-        TopMesh = 35955,
-
-        /// <summary>
-        /// Top Pair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Pair.")]
-        TopPair = 36000,
-
-        /// <summary>
-        /// Top Plate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Plate.")]
-        TopPlate = 36045,
-
-        /// <summary>
-        /// Top Sail.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Sail.")]
-        TopSail = 36090,
-
-        /// <summary>
-        /// Top Steer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Steer.")]
-        TopSteer = 36135,
-
-        /// <summary>
-        /// Top Trough.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Top Trough.")]
-        TopTrough = 36180,
-
-        /// <summary>
-        /// Scrum Half TA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scrum Half TA.")]
-        ScrumHalfTA = 36220,
-
-        /// <summary>
-        /// Tor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tor.")]
-        Tor = 36225,
-
-        /// <summary>
-        /// Scrum Half MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scrum Half MG.")]
-        ScrumHalfMG = 36230,
-
-        /// <summary>
-        /// Track Dish.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Track Dish.")]
-        TrackDish = 36270,
-
-        /// <summary>
-        /// TORSO M.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TORSO M.")]
-        TORSOM = 36315,
-
-        /// <summary>
-        /// Trap Door.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trap Door.")]
-        TrapDoor = 36360,
-
-        /// <summary>
-        /// TRISPONDE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TRISPONDE.")]
-        TRISPONDE = 36380,
-
-        /// <summary>
-        /// TRS 3033.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TRS 3033.")]
-        TRS3033 = 36405,
-
-        /// <summary>
-        /// TRS 3405.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TRS 3405.")]
-        TRS3405 = 36420,
-
-        /// <summary>
-        /// TRS 3410.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TRS 3410.")]
-        TRS3410 = 36425,
-
-        /// <summary>
-        /// TRS 3415.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TRS 3415.")]
-        TRS3415 = 36430,
-
-        /// <summary>
-        /// TRS-N.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TRS-N.")]
-        TRSN = 36450,
-
-        /// <summary>
-        /// TSE 5000.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TSE 5000.")]
-        TSE5000 = 36495,
-
-        /// <summary>
-        /// TSR 333.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TSR 333.")]
-        TSR333 = 36540,
-
-        /// <summary>
-        /// Tube Arm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tube Arm.")]
-        TubeArm = 36585,
-
-        /// <summary>
-        /// Twin Eyes.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Twin Eyes.")]
-        TwinEyes = 36630,
-
-        /// <summary>
-        /// Twin Pill.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Twin Pill.")]
-        TwinPill = 36675,
-
-        /// <summary>
-        /// Twin Scan.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Twin Scan.")]
-        TwinScan = 36720,
-
-        /// <summary>
-        /// Twin Scan Ro.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Twin Scan Ro.")]
-        TwinScanRo = 36765,
-
-        /// <summary>
-        /// Two Spot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Two Spot.")]
-        TwoSpot = 36810,
-
-        /// <summary>
-        /// TYPE 262.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 262.")]
-        TYPE262 = 36855,
-
-        /// <summary>
-        /// TYPE 275.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 275.")]
-        TYPE275 = 36900,
-
-        /// <summary>
-        /// TYPE 293.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 293.")]
-        TYPE293 = 36945,
-
-        /// <summary>
-        /// TYPE 343 SUN VISOR B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 343 SUN VISOR B.")]
-        TYPE343SUNVISORB = 36990,
-
-        /// <summary>
-        /// TYPE 347B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 347B.")]
-        TYPE347B = 37035,
-
-        /// <summary>
-        /// Type-404A(CH).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type-404A(CH).")]
-        Type404ACH = 37050,
-
-        /// <summary>
-        /// Type 756.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type 756.")]
-        Type756 = 37080,
-
-        /// <summary>
-        /// TYPE 903.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 903.")]
-        TYPE903 = 37125,
-
-        /// <summary>
-        /// TYPE 909 TI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 909 TI.")]
-        TYPE909TI = 37170,
-
-        /// <summary>
-        /// TYPE 909 TT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 909 TT.")]
-        TYPE909TT = 37215,
-
-        /// <summary>
-        /// TYPE 910.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 910.")]
-        TYPE910 = 37260,
-
-        /// <summary>
-        /// TYPE-931(CH).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE-931(CH).")]
-        TYPE931CH = 37265,
-
-        /// <summary>
-        /// TYPE 965.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 965.")]
-        TYPE965 = 37305,
-
-        /// <summary>
-        /// TYPE 967.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 967.")]
-        TYPE967 = 37350,
-
-        /// <summary>
-        /// TYPE 968.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 968.")]
-        TYPE968 = 37395,
-
-        /// <summary>
-        /// TYPE 974.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 974.")]
-        TYPE974 = 37440,
-
-        /// <summary>
-        /// TYPE 975.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 975.")]
-        TYPE975 = 37485,
-
-        /// <summary>
-        /// TYPE 978.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 978.")]
-        TYPE978 = 37530,
-
-        /// <summary>
-        /// TYPE 992.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 992.")]
-        TYPE992 = 37575,
-
-        /// <summary>
-        /// TYPE 993.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 993.")]
-        TYPE993 = 37620,
-
-        /// <summary>
-        /// TYPE 994.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 994.")]
-        TYPE994 = 37665,
-
-        /// <summary>
-        /// TYPE 1006(1).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 1006(1).")]
-        TYPE10061 = 37710,
-
-        /// <summary>
-        /// TYPE 1006(2).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 1006(2).")]
-        TYPE10062 = 37755,
-
-        /// <summary>
-        /// TYPE 1022.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TYPE 1022.")]
-        TYPE1022 = 37800,
-
-        /// <summary>
-        /// UK MK 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("UK MK 10.")]
-        UKMK10 = 37845,
-
-        /// <summary>
-        /// UPS-220C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("UPS-220C.")]
-        UPS220C = 37850,
-
-        /// <summary>
-        /// UPX 1 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("UPX 1 10.")]
-        UPX110 = 37890,
-
-        /// <summary>
-        /// UPX 27.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("UPX 27.")]
-        UPX27 = 37935,
-
-        /// <summary>
-        /// URN 20.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("URN 20.")]
-        URN20 = 37980,
-
-        /// <summary>
-        /// URN 25.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("URN 25.")]
-        URN25 = 38025,
-
-        /// <summary>
-        /// VOLEX III/IV.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("VOLEX III/IV.")]
-        VOLEXIIIIV = 38045,
-
-        /// <summary>
-        /// W8818.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("W8818.")]
-        W8818 = 38070,
-
-        /// <summary>
-        /// W8838.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("W8838.")]
-        W8838 = 38115,
-
-        /// <summary>
-        /// W8852.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("W8852.")]
-        W8852 = 38120,
-
-        /// <summary>
-        /// WAS-74S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WAS-74S.")]
-        WAS74S = 38160,
-
-        /// <summary>
-        /// Wasp Head.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wasp Head.")]
-        WaspHead = 38205,
-
-        /// <summary>
-        /// WATCHDOG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WATCHDOG.")]
-        WATCHDOG = 38210,
-
-        /// <summary>
-        /// Watch Guard.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Watch Guard.")]
-        WatchGuard = 38250,
-
-        /// <summary>
-        /// Watchman.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Watchman.")]
-        Watchman = 38260,
-
-        /// <summary>
-        /// Western Electric MK 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Western Electric MK 10.")]
-        WesternElectricMK10 = 38295,
-
-        /// <summary>
-        /// Westinghouse ADR-4 LRSR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Westinghouse ADR-4 LRSR.")]
-        WestinghouseADR4LRSR = 38320,
-
-        /// <summary>
-        /// Westinghouse Electric SPG 50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Westinghouse Electric SPG 50.")]
-        WestinghouseElectricSPG50 = 38340,
-
-        /// <summary>
-        /// Westinghouse Electric W 120.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Westinghouse Electric W 120.")]
-        WestinghouseElectricW120 = 38385,
-
-        /// <summary>
-        /// Westinghouse SPS 29C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Westinghouse SPS 29C.")]
-        WestinghouseSPS29C = 38430,
-
-        /// <summary>
-        /// Westinghouse SPS 37.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Westinghouse SPS 37.")]
-        WestinghouseSPS37 = 38475,
-
-        /// <summary>
-        /// Wet Eye.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wet Eye.")]
-        WetEye = 38520,
-
-        /// <summary>
-        /// Wet Eye Mod.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wet Eye Mod.")]
-        WetEyeMod = 38565,
-
-        /// <summary>
-        /// WGU-41/B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WGU-41/B.")]
-        WGU41B = 38570,
-
-        /// <summary>
-        /// WGU-44/B.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WGU-44/B.")]
-        WGU44B = 38572,
-
-        /// <summary>
-        /// Whiff.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Whiff.")]
-        Whiff = 38610,
-
-        /// <summary>
-        /// Whiff Brick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Whiff Brick.")]
-        WhiffBrick = 38655,
-
-        /// <summary>
-        /// Whiff Fire.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Whiff Fire.")]
-        WhiffFire = 38700,
-
-        /// <summary>
-        /// WHITE HOUSE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WHITE HOUSE.")]
-        WHITEHOUSE = 38715,
-
-        /// <summary>
-        /// Wild Card.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wild Card.")]
-        WildCard = 38745,
-
-        /// <summary>
-        /// Witch Eight.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Witch Eight.")]
-        WitchEight = 38790,
-
-        /// <summary>
-        /// Witch Five.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Witch Five.")]
-        WitchFive = 38835,
-
-        /// <summary>
-        /// WM2X Series.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WM2X Series.")]
-        WM2XSeries = 38880,
-
-        /// <summary>
-        /// WM2X Series CAS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WM2X Series CAS.")]
-        WM2XSeriesCAS = 38925,
-
-        /// <summary>
-        /// WSR-74C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WSR-74C.")]
-        WSR74C = 38950,
-
-        /// <summary>
-        /// WSR-74S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WSR-74S.")]
-        WSR74S = 38955,
-
-        /// <summary>
-        /// Wood Gage.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wood Gage.")]
-        WoodGage = 38970,
-
-        /// <summary>
-        /// Yard Rake.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Yard Rake.")]
-        YardRake = 39015,
-
-        /// <summary>
-        /// Yew Loop.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Yew Loop.")]
-        YewLoop = 39060,
-
-        /// <summary>
-        /// Yo-Yo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Yo-Yo.")]
-        YoYo = 39105
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for ElectromagneticEmitters (der.emission.name.electro, Electromagnetic emitters, 
+    /// section 8.1.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ElectromagneticEmitters : ushort
+    {
+        /// <summary>
+        /// 1RL138.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1RL138.")]
+        _1RL138 = 10,
+
+        /// <summary>
+        /// 1226 DECCA MIL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1226 DECCA MIL.")]
+        _1226DECCAMIL = 45,
+
+        /// <summary>
+        /// 9GR400.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("9GR400.")]
+        _9GR400 = 80,
+
+        /// <summary>
+        /// 9GR600.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("9GR600.")]
+        _9GR600 = 90,
+
+        /// <summary>
+        /// 9LV 200 TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("9LV 200 TA.")]
+        _9LV200TA = 135,
+
+        /// <summary>
+        /// 9LV 200 TV.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("9LV 200 TV.")]
+        _9LV200TV = 180,
+
+        /// <summary>
+        /// A310Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A310Z.")]
+        A310Z = 225,
+
+        /// <summary>
+        /// A325A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A325A.")]
+        A325A = 270,
+
+        /// <summary>
+        /// A346Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A346Z.")]
+        A346Z = 315,
+
+        /// <summary>
+        /// A353B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A353B.")]
+        A353B = 360,
+
+        /// <summary>
+        /// A372A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A372A.")]
+        A372A = 405,
+
+        /// <summary>
+        /// A372B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A372B.")]
+        A372B = 450,
+
+        /// <summary>
+        /// A372C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A372C.")]
+        A372C = 495,
+
+        /// <summary>
+        /// A377A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A377A.")]
+        A377A = 540,
+
+        /// <summary>
+        /// A377B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A377B.")]
+        A377B = 585,
+
+        /// <summary>
+        /// A380Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A380Z.")]
+        A380Z = 630,
+
+        /// <summary>
+        /// A381Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A381Z.")]
+        A381Z = 675,
+
+        /// <summary>
+        /// A398Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A398Z.")]
+        A398Z = 720,
+
+        /// <summary>
+        /// A403Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A403Z.")]
+        A403Z = 765,
+
+        /// <summary>
+        /// A409A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A409A.")]
+        A409A = 810,
+
+        /// <summary>
+        /// A418A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A418A.")]
+        A418A = 855,
+
+        /// <summary>
+        /// A419Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A419Z.")]
+        A419Z = 900,
+
+        /// <summary>
+        /// A429Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A429Z.")]
+        A429Z = 945,
+
+        /// <summary>
+        /// A432Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A432Z.")]
+        A432Z = 990,
+
+        /// <summary>
+        /// A434Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A434Z.")]
+        A434Z = 1035,
+
+        /// <summary>
+        /// A401A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A401A.")]
+        A401A = 1080,
+
+        /// <summary>
+        /// AA-12 Seeker.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AA-12 Seeker.")]
+        AA12Seeker = 1095,
+
+        /// <summary>
+        /// Agave.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Agave.")]
+        Agave = 1100,
+
+        /// <summary>
+        /// AGRION 15.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AGRION 15.")]
+        AGRION15 = 1125,
+
+        /// <summary>
+        /// AI MK 23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AI MK 23.")]
+        AIMK23 = 1170,
+
+        /// <summary>
+        /// AIDA II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AIDA II.")]
+        AIDAII = 1215,
+
+        /// <summary>
+        /// Albatros MK2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Albatros MK2.")]
+        AlbatrosMK2 = 1260,
+
+        /// <summary>
+        /// Box Spring.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Box Spring.")]
+        BoxSpring = 1280,
+
+        /// <summary>
+        /// Box Spring B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Box Spring B.")]
+        BoxSpringB = 1282,
+
+        /// <summary>
+        /// ANA SPS 502.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ANA SPS 502.")]
+        ANASPS502 = 1305,
+
+        /// <summary>
+        /// ANRITSU Electric AR-30A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ANRITSU Electric AR-30A.")]
+        ANRITSUElectricAR30A = 1350,
+
+        /// <summary>
+        /// Antilope V.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antilope V.")]
+        AntilopeV = 1395,
+
+        /// <summary>
+        /// AN/ALE-50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALE-50.")]
+        ANALE50 = 1400,
+
+        /// <summary>
+        /// AN/ALQ 99.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ 99.")]
+        ANALQ99 = 1440,
+
+        /// <summary>
+        /// AN/ALQ-100.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-100.")]
+        ANALQ100 = 1485,
+
+        /// <summary>
+        /// AN/ALQ-101.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-101.")]
+        ANALQ101 = 1530,
+
+        /// <summary>
+        /// AN/ALQ-119.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-119.")]
+        ANALQ119 = 1575,
+
+        /// <summary>
+        /// AN/ALQ-122.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-122.")]
+        ANALQ122 = 1585,
+
+        /// <summary>
+        /// AN/ALQ-126A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-126A.")]
+        ANALQ126A = 1620,
+
+        /// <summary>
+        /// AN/ALQ-131.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-131.")]
+        ANALQ131 = 1626,
+
+        /// <summary>
+        /// AN/ALQ-135C/D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-135C/D.")]
+        ANALQ135CD = 1628,
+
+        /// <summary>
+        /// AN/ALQ-144A(V)3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-144A(V)3.")]
+        ANALQ144AV3 = 1630,
+
+        /// <summary>
+        /// AN/ALQ-153.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-153.")]
+        ANALQ153 = 1632,
+
+        /// <summary>
+        /// AN/ALQ-155.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-155.")]
+        ANALQ155 = 1634,
+
+        /// <summary>
+        /// AN/ALQ-161/A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-161/A.")]
+        ANALQ161A = 1636,
+
+        /// <summary>
+        /// AN/ALQ-162.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-162.")]
+        ANALQ162 = 1638,
+
+        /// <summary>
+        /// AN/ALQ-165.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-165.")]
+        ANALQ165 = 1640,
+
+        /// <summary>
+        /// AN/ALQ-167.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-167.")]
+        ANALQ167 = 1642,
+
+        /// <summary>
+        /// AN/ALQ-172(V)2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-172(V)2.")]
+        ANALQ172V2 = 1644,
+
+        /// <summary>
+        /// AN/ALQ-176.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-176.")]
+        ANALQ176 = 1646,
+
+        /// <summary>
+        /// AN/ALQ-184.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-184.")]
+        ANALQ184 = 1648,
+
+        /// <summary>
+        /// AN/ALQ-188.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALQ-188.")]
+        ANALQ188 = 1650,
+
+        /// <summary>
+        /// AN/ALR-56.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALR-56.")]
+        ANALR56 = 1652,
+
+        /// <summary>
+        /// AN/ALR-69.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALR-69.")]
+        ANALR69 = 1654,
+
+        /// <summary>
+        /// AN/ALT-16A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALT-16A.")]
+        ANALT16A = 1656,
+
+        /// <summary>
+        /// AN/ALT-28.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALT-28.")]
+        ANALT28 = 1658,
+
+        /// <summary>
+        /// AN/ALT-32A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ALT-32A.")]
+        ANALT32A = 1660,
+
+        /// <summary>
+        /// AN/APD 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APD 10.")]
+        ANAPD10 = 1665,
+
+        /// <summary>
+        /// AN/APG 53.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG 53.")]
+        ANAPG53 = 1710,
+
+        /// <summary>
+        /// AN/APG 59.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG 59.")]
+        ANAPG59 = 1755,
+
+        /// <summary>
+        /// AN/APG-63.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-63.")]
+        ANAPG63 = 1800,
+
+        /// <summary>
+        /// AN/APG-63(V)1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-63(V)1.")]
+        ANAPG63V1 = 1805,
+
+        /// <summary>
+        /// AN/APG-63(V)2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-63(V)2.")]
+        ANAPG63V2 = 1807,
+
+        /// <summary>
+        /// AN/APG-63(V)3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-63(V)3.")]
+        ANAPG63V3 = 1809,
+
+        /// <summary>
+        /// AN/APG 65.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG 65.")]
+        ANAPG65 = 1845,
+
+        /// <summary>
+        /// AN/APG-66.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-66.")]
+        ANAPG66 = 1870,
+
+        /// <summary>
+        /// AN/APG 68.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG 68.")]
+        ANAPG68 = 1890,
+
+        /// <summary>
+        /// AN/APG 70.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG 70.")]
+        ANAPG70 = 1935,
+
+        /// <summary>
+        /// AN/APG-73.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-73.")]
+        ANAPG73 = 1945,
+
+        /// <summary>
+        /// AN/APG-77.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-77.")]
+        ANAPG77 = 1960,
+
+        /// <summary>
+        /// AN/APG-78.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-78.")]
+        ANAPG78 = 1970,
+
+        /// <summary>
+        /// AN/APG-502.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APG-502.")]
+        ANAPG502 = 1980,
+
+        /// <summary>
+        /// AN/APN-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-1.")]
+        ANAPN1 = 2025,
+
+        /// <summary>
+        /// AN/APN-22.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-22.")]
+        ANAPN22 = 2070,
+
+        /// <summary>
+        /// AN/APN 59.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN 59.")]
+        ANAPN59 = 2115,
+
+        /// <summary>
+        /// AN/APN-69.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-69.")]
+        ANAPN69 = 2160,
+
+        /// <summary>
+        /// AN/APN-81.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-81.")]
+        ANAPN81 = 2205,
+
+        /// <summary>
+        /// AN/APN-117.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-117.")]
+        ANAPN117 = 2250,
+
+        /// <summary>
+        /// AN/APN-118.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-118.")]
+        ANAPN118 = 2295,
+
+        /// <summary>
+        /// AN/APN-130.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-130.")]
+        ANAPN130 = 2340,
+
+        /// <summary>
+        /// AN/APN-131.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-131.")]
+        ANAPN131 = 2385,
+
+        /// <summary>
+        /// AN/APN-133.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-133.")]
+        ANAPN133 = 2430,
+
+        /// <summary>
+        /// AN/APN-134.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-134.")]
+        ANAPN134 = 2475,
+
+        /// <summary>
+        /// AN/APN-147.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-147.")]
+        ANAPN147 = 2520,
+
+        /// <summary>
+        /// AN/APN-150.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-150.")]
+        ANAPN150 = 2565,
+
+        /// <summary>
+        /// AN/APN-153.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-153.")]
+        ANAPN153 = 2610,
+
+        /// <summary>
+        /// AN/APN 154.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN 154.")]
+        ANAPN154 = 2655,
+
+        /// <summary>
+        /// AN/APN-155.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-155.")]
+        ANAPN155 = 2700,
+
+        /// <summary>
+        /// AN/APN-159.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-159.")]
+        ANAPN159 = 2745,
+
+        /// <summary>
+        /// AN/APN-182.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-182.")]
+        ANAPN182 = 2790,
+
+        /// <summary>
+        /// AN/APN-187.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-187.")]
+        ANAPN187 = 2835,
+
+        /// <summary>
+        /// AN/APN-190.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-190.")]
+        ANAPN190 = 2880,
+
+        /// <summary>
+        /// AN/APN 194.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN 194.")]
+        ANAPN194 = 2925,
+
+        /// <summary>
+        /// AN/APN-195.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-195.")]
+        ANAPN195 = 2970,
+
+        /// <summary>
+        /// AN/APN-198.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-198.")]
+        ANAPN198 = 3015,
+
+        /// <summary>
+        /// AN/APN-200.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-200.")]
+        ANAPN200 = 3060,
+
+        /// <summary>
+        /// AN/APN 202.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN 202.")]
+        ANAPN202 = 3105,
+
+        /// <summary>
+        /// AN/APN-217.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-217.")]
+        ANAPN217 = 3150,
+
+        /// <summary>
+        /// AN/APN-218.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-218.")]
+        ANAPN218 = 3152,
+
+        /// <summary>
+        /// AN/APN-238.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-238.")]
+        ANAPN238 = 3160,
+
+        /// <summary>
+        /// AN/APN-239.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-239.")]
+        ANAPN239 = 3162,
+
+        /// <summary>
+        /// AN/APN-241.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-241.")]
+        ANAPN241 = 3164,
+
+        /// <summary>
+        /// AN/APN-242.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-242.")]
+        ANAPN242 = 3166,
+
+        /// <summary>
+        /// AN/APN-506.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APN-506.")]
+        ANAPN506 = 3195,
+
+        /// <summary>
+        /// AN/APQ-72.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-72.")]
+        ANAPQ72 = 3240,
+
+        /// <summary>
+        /// AN/APQ-99.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-99.")]
+        ANAPQ99 = 3285,
+
+        /// <summary>
+        /// AN/APQ 100.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ 100.")]
+        ANAPQ100 = 3330,
+
+        /// <summary>
+        /// AN/APQ-102.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-102.")]
+        ANAPQ102 = 3375,
+
+        /// <summary>
+        /// AN/APQ-109.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-109.")]
+        ANAPQ109 = 3420,
+
+        /// <summary>
+        /// AN/APQ 113.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ 113.")]
+        ANAPQ113 = 3465,
+
+        /// <summary>
+        /// AN/APQ 120.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ 120.")]
+        ANAPQ120 = 3510,
+
+        /// <summary>
+        /// AN/APQ 126.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ 126.")]
+        ANAPQ126 = 3555,
+
+        /// <summary>
+        /// AN/APQ-128.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-128.")]
+        ANAPQ128 = 3600,
+
+        /// <summary>
+        /// AN/APQ-129.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-129.")]
+        ANAPQ129 = 3645,
+
+        /// <summary>
+        /// AN/APQ 148.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ 148.")]
+        ANAPQ148 = 3690,
+
+        /// <summary>
+        /// AN/APQ-153.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-153.")]
+        ANAPQ153 = 3735,
+
+        /// <summary>
+        /// AN/APQ 159.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ 159.")]
+        ANAPQ159 = 3780,
+
+        /// <summary>
+        /// AN/APQ-164.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-164.")]
+        ANAPQ164 = 3785,
+
+        /// <summary>
+        /// AN/APQ-166.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-166.")]
+        ANAPQ166 = 3788,
+
+        /// <summary>
+        /// AN/APQ-181.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APQ-181.")]
+        ANAPQ181 = 3795,
+
+        /// <summary>
+        /// AN/APS-31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-31.")]
+        ANAPS31 = 3820,
+
+        /// <summary>
+        /// AN/APS-42.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-42.")]
+        ANAPS42 = 3825,
+
+        /// <summary>
+        /// AN/APS 80.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 80.")]
+        ANAPS80 = 3870,
+
+        /// <summary>
+        /// AN/APS-88.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-88.")]
+        ANAPS88 = 3915,
+
+        /// <summary>
+        /// AN/APS 115.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 115.")]
+        ANAPS115 = 3960,
+
+        /// <summary>
+        /// AN/APS 116.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 116.")]
+        ANAPS116 = 4005,
+
+        /// <summary>
+        /// AN/APS-120.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-120.")]
+        ANAPS120 = 4050,
+
+        /// <summary>
+        /// AN/APS 121.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 121.")]
+        ANAPS121 = 4095,
+
+        /// <summary>
+        /// AN/APS 124.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 124.")]
+        ANAPS124 = 4140,
+
+        /// <summary>
+        /// AN/APS 125.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 125.")]
+        ANAPS125 = 4185,
+
+        /// <summary>
+        /// AN/APS-128.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-128.")]
+        ANAPS128 = 4230,
+
+        /// <summary>
+        /// AN/APS 130.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 130.")]
+        ANAPS130 = 4275,
+
+        /// <summary>
+        /// AN/APS 133.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 133.")]
+        ANAPS133 = 4320,
+
+        /// <summary>
+        /// AN/APS-134.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-134.")]
+        ANAPS134 = 4365,
+
+        /// <summary>
+        /// AN/APS 137.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS 137.")]
+        ANAPS137 = 4410,
+
+        /// <summary>
+        /// AN/APS-138.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-138.")]
+        ANAPS138 = 4455,
+
+        /// <summary>
+        /// AN/APS-143 (V) 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APS-143 (V) 1.")]
+        ANAPS143V1 = 4465,
+
+        /// <summary>
+        /// AN/APW 22.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APW 22.")]
+        ANAPW22 = 4500,
+
+        /// <summary>
+        /// AN/APW 23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APW 23.")]
+        ANAPW23 = 4545,
+
+        /// <summary>
+        /// AN/APX-6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX-6.")]
+        ANAPX6 = 4590,
+
+        /// <summary>
+        /// AN/APX 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX 7.")]
+        ANAPX7 = 4635,
+
+        /// <summary>
+        /// AN/APX 39.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX 39.")]
+        ANAPX39 = 4680,
+
+        /// <summary>
+        /// AN/APX-72.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX-72.")]
+        ANAPX72 = 4725,
+
+        /// <summary>
+        /// AN/APX 76.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX 76.")]
+        ANAPX76 = 4770,
+
+        /// <summary>
+        /// AN/APX 78.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX 78.")]
+        ANAPX78 = 4815,
+
+        /// <summary>
+        /// AN/APX 101.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX 101.")]
+        ANAPX101 = 4860,
+
+        /// <summary>
+        /// AN/APX-113 AIFF.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APX-113 AIFF.")]
+        ANAPX113AIFF = 4870,
+
+        /// <summary>
+        /// AN/APY-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APY-1.")]
+        ANAPY1 = 4900,
+
+        /// <summary>
+        /// AN/APY 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APY 2.")]
+        ANAPY2 = 4905,
+
+        /// <summary>
+        /// AN/APY 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/APY 3.")]
+        ANAPY3 = 4950,
+
+        /// <summary>
+        /// LYNX(tm).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LYNX(tm).")]
+        LYNXTm = 4953,
+
+        /// <summary>
+        /// AN/ARN 21.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ARN 21.")]
+        ANARN21 = 4995,
+
+        /// <summary>
+        /// AN/ARN 52.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ARN 52.")]
+        ANARN52 = 5040,
+
+        /// <summary>
+        /// AN/ARN 84.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ARN 84.")]
+        ANARN84 = 5085,
+
+        /// <summary>
+        /// AN/ARN 118.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ARN 118.")]
+        ANARN118 = 5130,
+
+        /// <summary>
+        /// AN/ARW 73.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ARW 73.")]
+        ANARW73 = 5175,
+
+        /// <summary>
+        /// AN/ASB 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ASB 1.")]
+        ANASB1 = 5220,
+
+        /// <summary>
+        /// AN/ASG 21.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ASG 21.")]
+        ANASG21 = 5265,
+
+        /// <summary>
+        /// AN/ASQ-108.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ASQ-108.")]
+        ANASQ108 = 5280,
+
+        /// <summary>
+        /// AN/AWG 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/AWG 9.")]
+        ANAWG9 = 5310,
+
+        /// <summary>
+        /// AN/BPS-9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/BPS-9.")]
+        ANBPS9 = 5355,
+
+        /// <summary>
+        /// AN/BPS 15.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/BPS 15.")]
+        ANBPS15 = 5400,
+
+        /// <summary>
+        /// AN/BPS-16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/BPS-16.")]
+        ANBPS16 = 5405,
+
+        /// <summary>
+        /// AN/CRM-30.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/CRM-30.")]
+        ANCRM30 = 5420,
+
+        /// <summary>
+        /// AN/DPW-23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/DPW-23.")]
+        ANDPW23 = 5430,
+
+        /// <summary>
+        /// AN/DSQ 26 Phoenix MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/DSQ 26 Phoenix MH.")]
+        ANDSQ26PhoenixMH = 5445,
+
+        /// <summary>
+        /// AN/DSQ 28 Harpoon MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/DSQ 28 Harpoon MH.")]
+        ANDSQ28HarpoonMH = 5490,
+
+        /// <summary>
+        /// AN/FPN-40.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPN-40.")]
+        ANFPN40 = 5495,
+
+        /// <summary>
+        /// AN/FPN-62.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPN-62.")]
+        ANFPN62 = 5500,
+
+        /// <summary>
+        /// AN/FPS-16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPS-16.")]
+        ANFPS16 = 5505,
+
+        /// <summary>
+        /// AN/FPS-18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPS-18.")]
+        ANFPS18 = 5507,
+
+        /// <summary>
+        /// AN/FPS-89.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPS-89.")]
+        ANFPS89 = 5508,
+
+        /// <summary>
+        /// AN/FPS-117.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPS-117.")]
+        ANFPS117 = 5510,
+
+        /// <summary>
+        /// AN/FPS-20R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPS-20R.")]
+        ANFPS20R = 5515,
+
+        /// <summary>
+        /// AN/FPS-77.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPS-77.")]
+        ANFPS77 = 5520,
+
+        /// <summary>
+        /// AN/FPS-103.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/FPS-103.")]
+        ANFPS103 = 5525,
+
+        /// <summary>
+        /// AN/GPN-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/GPN-12.")]
+        ANGPN12 = 5527,
+
+        /// <summary>
+        /// AN/GPX-6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/GPX-6.")]
+        ANGPX6 = 5530,
+
+        /// <summary>
+        /// AN/GPX 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/GPX 8.")]
+        ANGPX8 = 5535,
+
+        /// <summary>
+        /// AN/GRN-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/GRN-12.")]
+        ANGRN12 = 5537,
+
+        /// <summary>
+        /// AN/MPQ-10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-10.")]
+        ANMPQ10 = 5540,
+
+        /// <summary>
+        /// AN/MPQ-33/39/46/57/61 (HPIR) ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-33/39/46/57/61 (HPIR) ILL.")]
+        ANMPQ3339465761HPIRILL = 5545,
+
+        /// <summary>
+        /// AN/MPQ-34/48/55/62 (CWAR) TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-34/48/55/62 (CWAR) TA.")]
+        ANMPQ34485562CWARTA = 5550,
+
+        /// <summary>
+        /// AN/MPQ-49.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-49.")]
+        ANMPQ49 = 5551,
+
+        /// <summary>
+        /// AN/MPQ-35/50 (PAR) TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-35/50 (PAR) TA.")]
+        ANMPQ3550PARTA = 5555,
+
+        /// <summary>
+        /// AN/MPQ-37/51 (ROR) TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-37/51 (ROR) TT.")]
+        ANMPQ3751RORTT = 5560,
+
+        /// <summary>
+        /// AN/MPQ-53.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-53.")]
+        ANMPQ53 = 5570,
+
+        /// <summary>
+        /// AN/MPQ-63.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-63.")]
+        ANMPQ63 = 5571,
+
+        /// <summary>
+        /// AN/MPQ-64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/MPQ-64.")]
+        ANMPQ64 = 5575,
+
+        /// <summary>
+        /// AN/SPG-34.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG-34.")]
+        ANSPG34 = 5580,
+
+        /// <summary>
+        /// AN/SPG 50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG 50.")]
+        ANSPG50 = 5625,
+
+        /// <summary>
+        /// AN/SPG 51.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG 51.")]
+        ANSPG51 = 5670,
+
+        /// <summary>
+        /// AN/SPG-51 CWI TI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG-51 CWI TI.")]
+        ANSPG51CWITI = 5715,
+
+        /// <summary>
+        /// AN/SPG-51 FC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG-51 FC.")]
+        ANSPG51FC = 5760,
+
+        /// <summary>
+        /// AN/SPG 52.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG 52.")]
+        ANSPG52 = 5805,
+
+        /// <summary>
+        /// AN/SPG-53.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG-53.")]
+        ANSPG53 = 5850,
+
+        /// <summary>
+        /// AN/SPG 55B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG 55B.")]
+        ANSPG55B = 5895,
+
+        /// <summary>
+        /// AN/SPG 60.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG 60.")]
+        ANSPG60 = 5940,
+
+        /// <summary>
+        /// AN/SPG 62.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPG 62.")]
+        ANSPG62 = 5985,
+
+        /// <summary>
+        /// AN/SPN 35.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPN 35.")]
+        ANSPN35 = 6030,
+
+        /// <summary>
+        /// AN/SPN 43.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPN 43.")]
+        ANSPN43 = 6075,
+
+        /// <summary>
+        /// AN/SPQ-2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPQ-2.")]
+        ANSPQ2 = 6120,
+
+        /// <summary>
+        /// AN/SPQ 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPQ 9.")]
+        ANSPQ9 = 6165,
+
+        /// <summary>
+        /// AN/SPS-4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-4.")]
+        ANSPS4 = 6210,
+
+        /// <summary>
+        /// AN/SPS-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-5.")]
+        ANSPS5 = 6255,
+
+        /// <summary>
+        /// AN/SPS-5C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-5C.")]
+        ANSPS5C = 6300,
+
+        /// <summary>
+        /// AN/SPS-6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-6.")]
+        ANSPS6 = 6345,
+
+        /// <summary>
+        /// AN/SPS 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 10.")]
+        ANSPS10 = 6390,
+
+        /// <summary>
+        /// AN/SPS 21.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 21.")]
+        ANSPS21 = 6435,
+
+        /// <summary>
+        /// AN/SPS-28.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-28.")]
+        ANSPS28 = 6480,
+
+        /// <summary>
+        /// AN/SPS-37.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-37.")]
+        ANSPS37 = 6525,
+
+        /// <summary>
+        /// AN/SPS-39A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-39A.")]
+        ANSPS39A = 6570,
+
+        /// <summary>
+        /// AN/SPS 40.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 40.")]
+        ANSPS40 = 6615,
+
+        /// <summary>
+        /// AN/SPS-41.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-41.")]
+        ANSPS41 = 6660,
+
+        /// <summary>
+        /// AN/SPS-48.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-48.")]
+        ANSPS48 = 6705,
+
+        /// <summary>
+        /// AN/SPS-48C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-48C.")]
+        ANSPS48C = 6750,
+
+        /// <summary>
+        /// AN/SPS-48E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-48E.")]
+        ANSPS48E = 6752,
+
+        /// <summary>
+        /// AN/SPS-49.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49.")]
+        ANSPS49 = 6795,
+
+        /// <summary>
+        /// AN/SPS-49(V)1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)1.")]
+        ANSPS49V1 = 6796,
+
+        /// <summary>
+        /// AN/SPS-49(V)2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)2.")]
+        ANSPS49V2 = 6797,
+
+        /// <summary>
+        /// AN/SPS-49(V)3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)3.")]
+        ANSPS49V3 = 6798,
+
+        /// <summary>
+        /// AN/SPS-49(V)4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)4.")]
+        ANSPS49V4 = 6799,
+
+        /// <summary>
+        /// AN/SPS-49(V)5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)5.")]
+        ANSPS49V5 = 6800,
+
+        /// <summary>
+        /// AN/SPS-49(V)6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)6.")]
+        ANSPS49V6 = 6801,
+
+        /// <summary>
+        /// AN/SPS-49(V)7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)7.")]
+        ANSPS49V7 = 6802,
+
+        /// <summary>
+        /// AN/SPS-49(V)8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49(V)8.")]
+        ANSPS49V8 = 6803,
+
+        /// <summary>
+        /// AN/SPS-49A(V)1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-49A(V)1.")]
+        ANSPS49AV1 = 6804,
+
+        /// <summary>
+        /// AN/SPS 52.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 52.")]
+        ANSPS52 = 6840,
+
+        /// <summary>
+        /// AN/SPS 53.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 53.")]
+        ANSPS53 = 6885,
+
+        /// <summary>
+        /// AN/SPS 55.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 55.")]
+        ANSPS55 = 6930,
+
+        /// <summary>
+        /// AN/SPS-55 SS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-55 SS.")]
+        ANSPS55SS = 6975,
+
+        /// <summary>
+        /// AN/SPS-58.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS-58.")]
+        ANSPS58 = 7020,
+
+        /// <summary>
+        /// AN/SPS 59.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 59.")]
+        ANSPS59 = 7065,
+
+        /// <summary>
+        /// AN/SPS 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 64.")]
+        ANSPS64 = 7110,
+
+        /// <summary>
+        /// AN/SPS 65.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 65.")]
+        ANSPS65 = 7155,
+
+        /// <summary>
+        /// AN/SPS 67.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPS 67.")]
+        ANSPS67 = 7200,
+
+        /// <summary>
+        /// AN/SPY-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPY-1.")]
+        ANSPY1 = 7245,
+
+        /// <summary>
+        /// AN/SPY-1A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPY-1A.")]
+        ANSPY1A = 7250,
+
+        /// <summary>
+        /// AN/SPY-1B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPY-1B.")]
+        ANSPY1B = 7252,
+
+        /// <summary>
+        /// AN/SPY-1B(V).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPY-1B(V).")]
+        ANSPY1BV = 7253,
+
+        /// <summary>
+        /// AN/SPY-1D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPY-1D.")]
+        ANSPY1D = 7260,
+
+        /// <summary>
+        /// AN/SPY-1D(V).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPY-1D(V).")]
+        ANSPY1DV = 7261,
+
+        /// <summary>
+        /// AN/SPY-1F.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/SPY-1F.")]
+        ANSPY1F = 7265,
+
+        /// <summary>
+        /// AN/TPN-17.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPN-17.")]
+        ANTPN17 = 7270,
+
+        /// <summary>
+        /// AN/TPN-24.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPN-24.")]
+        ANTPN24 = 7275,
+
+        /// <summary>
+        /// AN/TPQ-18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPQ-18.")]
+        ANTPQ18 = 7280,
+
+        /// <summary>
+        /// AN/TPQ-36.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPQ-36.")]
+        ANTPQ36 = 7295,
+
+        /// <summary>
+        /// AN/TPQ-37.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPQ-37.")]
+        ANTPQ37 = 7300,
+
+        /// <summary>
+        /// AN/TPQ-38 (V8).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPQ-38 (V8).")]
+        ANTPQ38V8 = 7301,
+
+        /// <summary>
+        /// AN/TPQ-47.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPQ-47.")]
+        ANTPQ47 = 7303,
+
+        /// <summary>
+        /// AN/TPS-43.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPS-43.")]
+        ANTPS43 = 7305,
+
+        /// <summary>
+        /// AN/TPS-43E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPS-43E.")]
+        ANTPS43E = 7310,
+
+        /// <summary>
+        /// AN/TPS-59.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPS-59.")]
+        ANTPS59 = 7315,
+
+        /// <summary>
+        /// AN/TPS-63.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPS-63.")]
+        ANTPS63 = 7320,
+
+        /// <summary>
+        /// AN/TPS-70 (V) 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPS-70 (V) 1.")]
+        ANTPS70V1 = 7322,
+
+        /// <summary>
+        /// AN/TPS-75.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPS-75.")]
+        ANTPS75 = 7325,
+
+        /// <summary>
+        /// AN/TPX-46(V)7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/TPX-46(V)7.")]
+        ANTPX46V7 = 7330,
+
+        /// <summary>
+        /// AN/ULQ-6A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ULQ-6A.")]
+        ANULQ6A = 7335,
+
+        /// <summary>
+        /// AN/UPN 25.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPN 25.")]
+        ANUPN25 = 7380,
+
+        /// <summary>
+        /// AN/UPS 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPS 1.")]
+        ANUPS1 = 7425,
+
+        /// <summary>
+        /// AN/UPS-2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPS-2.")]
+        ANUPS2 = 7426,
+
+        /// <summary>
+        /// AN/UPX 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPX 1.")]
+        ANUPX1 = 7470,
+
+        /// <summary>
+        /// AN/UPX 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPX 5.")]
+        ANUPX5 = 7515,
+
+        /// <summary>
+        /// AN/UPX 11.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPX 11.")]
+        ANUPX11 = 7560,
+
+        /// <summary>
+        /// AN/UPX 12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPX 12.")]
+        ANUPX12 = 7605,
+
+        /// <summary>
+        /// AN/UPX 17.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPX 17.")]
+        ANUPX17 = 7650,
+
+        /// <summary>
+        /// AN/UPX 23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/UPX 23.")]
+        ANUPX23 = 7695,
+
+        /// <summary>
+        /// AN/VPS 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/VPS 2.")]
+        ANVPS2 = 7740,
+
+        /// <summary>
+        /// Apelco AD 7 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Apelco AD 7 7.")]
+        ApelcoAD77 = 7785,
+
+        /// <summary>
+        /// APG 71.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("APG 71.")]
+        APG71 = 7830,
+
+        /// <summary>
+        /// APN 148.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("APN 148.")]
+        APN148 = 7875,
+
+        /// <summary>
+        /// APN 227.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("APN 227.")]
+        APN227 = 7920,
+
+        /// <summary>
+        /// APS 504 V3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("APS 504 V3.")]
+        APS504V3 = 8100,
+
+        /// <summary>
+        /// AR 3D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AR 3D.")]
+        AR3D = 8105,
+
+        /// <summary>
+        /// Plessey AR-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plessey AR-5.")]
+        PlesseyAR5 = 8112,
+
+        /// <summary>
+        /// AR 320.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AR 320.")]
+        AR320 = 8115,
+
+        /// <summary>
+        /// AR 327.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AR 327.")]
+        AR327 = 8120,
+
+        /// <summary>
+        /// AR M31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AR M31.")]
+        ARM31 = 8145,
+
+        /// <summary>
+        /// ARI 5954.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARI 5954.")]
+        ARI5954 = 8190,
+
+        /// <summary>
+        /// ARI 5955.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARI 5955.")]
+        ARI5955 = 8235,
+
+        /// <summary>
+        /// ARI 5979.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARI 5979.")]
+        ARI5979 = 8280,
+
+        /// <summary>
+        /// ARINC 564 BNDX/KING RDR 1E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARINC 564 BNDX/KING RDR 1E.")]
+        ARINC564BNDXKINGRDR1E = 8325,
+
+        /// <summary>
+        /// ARINC 700 BNDX/KING RDR 1E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARINC 700 BNDX/KING RDR 1E.")]
+        ARINC700BNDXKINGRDR1E = 8370,
+
+        /// <summary>
+        /// ARK-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARK-1.")]
+        ARK1 = 8375,
+
+        /// <summary>
+        /// ARSR-3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARSR-3.")]
+        ARSR3 = 8380,
+
+        /// <summary>
+        /// ARSR-18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ARSR-18.")]
+        ARSR18 = 8390,
+
+        /// <summary>
+        /// AS 2 Kipper.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 2 Kipper.")]
+        AS2Kipper = 8415,
+
+        /// <summary>
+        /// AS 2 Kipper MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 2 Kipper MH.")]
+        AS2KipperMH = 8460,
+
+        /// <summary>
+        /// AS 4 Kitchen.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 4 Kitchen.")]
+        AS4Kitchen = 8505,
+
+        /// <summary>
+        /// AS 4 Kitchen MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 4 Kitchen MH.")]
+        AS4KitchenMH = 8550,
+
+        /// <summary>
+        /// AS 5 Kelt MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 5 Kelt MH.")]
+        AS5KeltMH = 8595,
+
+        /// <summary>
+        /// AS 6 Kingfish MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 6 Kingfish MH.")]
+        AS6KingfishMH = 8640,
+
+        /// <summary>
+        /// AS 7 Kerry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 7 Kerry.")]
+        AS7Kerry = 8685,
+
+        /// <summary>
+        /// AS 7 Kerry MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 7 Kerry MG.")]
+        AS7KerryMG = 8730,
+
+        /// <summary>
+        /// AS 15 KENT altimeter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AS 15 KENT altimeter.")]
+        AS15KENTAltimeter = 8735,
+
+        /// <summary>
+        /// Aspide AAM/SAM ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aspide AAM/SAM ILL.")]
+        AspideAAMSAMILL = 8760,
+
+        /// <summary>
+        /// ASR-4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASR-4.")]
+        ASR4 = 8772,
+
+        /// <summary>
+        /// ASR O.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASR O.")]
+        ASRO = 8775,
+
+        /// <summary>
+        /// ASR-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASR-5.")]
+        ASR5 = 8780,
+
+        /// <summary>
+        /// ASR-7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASR-7.")]
+        ASR7 = 8782,
+
+        /// <summary>
+        /// ASR-8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASR-8.")]
+        ASR8 = 8785,
+
+        /// <summary>
+        /// ASR-9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASR-9.")]
+        ASR9 = 8790,
+
+        /// <summary>
+        /// Raytheon ASR-10SS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon ASR-10SS.")]
+        RaytheonASR10SS = 8812,
+
+        /// <summary>
+        /// AT 2 Swatter MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AT 2 Swatter MG.")]
+        AT2SwatterMG = 8820,
+
+        /// <summary>
+        /// ATCR-33.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ATCR-33.")]
+        ATCR33 = 8840,
+
+        /// <summary>
+        /// ATCR 33 K/M.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ATCR 33 K/M.")]
+        ATCR33KM = 8845,
+
+        /// <summary>
+        /// Atlas Elektronk TRS N.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Atlas Elektronk TRS N.")]
+        AtlasElektronkTRSN = 8865,
+
+        /// <summary>
+        /// ATLAS-9740 VTS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ATLAS-9740 VTS.")]
+        ATLAS9740VTS = 8870,
+
+        /// <summary>
+        /// AVG 65.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVG 65.")]
+        AVG65 = 8910,
+
+        /// <summary>
+        /// AVH 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVH 7.")]
+        AVH7 = 8955,
+
+        /// <summary>
+        /// AVQ 20.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVQ 20.")]
+        AVQ20 = 9000,
+
+        /// <summary>
+        /// AVQ30X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVQ30X.")]
+        AVQ30X = 9045,
+
+        /// <summary>
+        /// AVQ-50 (RCA).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVQ-50 (RCA).")]
+        AVQ50RCA = 9075,
+
+        /// <summary>
+        /// AVQ 70.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVQ 70.")]
+        AVQ70 = 9090,
+
+        /// <summary>
+        /// AWS 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AWS 5.")]
+        AWS5 = 9135,
+
+        /// <summary>
+        /// AWS 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AWS 6.")]
+        AWS6 = 9180,
+
+        /// <summary>
+        /// B597Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("B597Z.")]
+        B597Z = 9200,
+
+        /// <summary>
+        /// B636Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("B636Z.")]
+        B636Z = 9205,
+
+        /// <summary>
+        /// Back Net A B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Back Net A B.")]
+        BackNetAB = 9225,
+
+        /// <summary>
+        /// Back Trap.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Back Trap.")]
+        BackTrap = 9270,
+
+        /// <summary>
+        /// BALTYK.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BALTYK.")]
+        BALTYK = 9310,
+
+        /// <summary>
+        /// Ball End.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ball End.")]
+        BallEnd = 9315,
+
+        /// <summary>
+        /// Ball Gun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ball Gun.")]
+        BallGun = 9360,
+
+        /// <summary>
+        /// Band Stand.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Band Stand.")]
+        BandStand = 9405,
+
+        /// <summary>
+        /// Bar Lock.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bar Lock.")]
+        BarLock = 9450,
+
+        /// <summary>
+        /// Bass Tilt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bass Tilt.")]
+        BassTilt = 9495,
+
+        /// <summary>
+        /// Beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Beacon.")]
+        Beacon = 9540,
+
+        /// <summary>
+        /// Bean Sticks.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bean Sticks.")]
+        BeanSticks = 9585,
+
+        /// <summary>
+        /// Bee Hind.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bee Hind.")]
+        BeeHind = 9630,
+
+        /// <summary>
+        /// Bell Crown A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bell Crown A.")]
+        BellCrownA = 9640,
+
+        /// <summary>
+        /// Bell Crown B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bell Crown B.")]
+        BellCrownB = 9642,
+
+        /// <summary>
+        /// BIG BACK.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BIG BACK.")]
+        BIGBACK = 9645,
+
+        /// <summary>
+        /// Big Bird.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Big Bird.")]
+        BigBird = 9660,
+
+        /// <summary>
+        /// Big Bulge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Big Bulge.")]
+        BigBulge = 9675,
+
+        /// <summary>
+        /// Big Bulge A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Big Bulge A.")]
+        BigBulgeA = 9720,
+
+        /// <summary>
+        /// Big Bulge B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Big Bulge B.")]
+        BigBulgeB = 9765,
+
+        /// <summary>
+        /// Big Fred.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Big Fred.")]
+        BigFred = 9780,
+
+        /// <summary>
+        /// Big Mesh.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Big Mesh.")]
+        BigMesh = 9810,
+
+        /// <summary>
+        /// Big Net.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Big Net.")]
+        BigNet = 9855,
+
+        /// <summary>
+        /// Bill Board.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bill Board.")]
+        BillBoard = 9885,
+
+        /// <summary>
+        /// Bill Fold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bill Fold.")]
+        BillFold = 9900,
+
+        /// <summary>
+        /// Blowpipe MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blowpipe MG.")]
+        BlowpipeMG = 9905,
+
+        /// <summary>
+        /// Sea Harrier FRS Mk 1/5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Harrier FRS Mk 1/5.")]
+        SeaHarrierFRSMk15 = 9930,
+
+        /// <summary>
+        /// Sea Harrier F/A Mk 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Harrier F/A Mk 2.")]
+        SeaHarrierFAMk2 = 9935,
+
+        /// <summary>
+        /// Blue Silk.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blue Silk.")]
+        BlueSilk = 9945,
+
+        /// <summary>
+        /// Blue Parrot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blue Parrot.")]
+        BlueParrot = 9990,
+
+        /// <summary>
+        /// Blue Orchid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blue Orchid.")]
+        BlueOrchid = 10035,
+
+        /// <summary>
+        /// Boat Sail.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Boat Sail.")]
+        BoatSail = 10080,
+
+        /// <summary>
+        /// Bofors Electronic 9LV 331.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bofors Electronic 9LV 331.")]
+        BoforsElectronic9LV331 = 10125,
+
+        /// <summary>
+        /// Bofors Ericsson Sea Giraffe 50 HC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bofors Ericsson Sea Giraffe 50 HC.")]
+        BoforsEricssonSeaGiraffe50HC = 10170,
+
+        /// <summary>
+        /// Bowl Mesh.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bowl Mesh.")]
+        BowlMesh = 10215,
+
+        /// <summary>
+        /// Box Brick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Box Brick.")]
+        BoxBrick = 10260,
+
+        /// <summary>
+        /// Box Tail.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Box Tail.")]
+        BoxTail = 10305,
+
+        /// <summary>
+        /// BPS 11A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BPS 11A.")]
+        BPS11A = 10350,
+
+        /// <summary>
+        /// BPS 14.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BPS 14.")]
+        BPS14 = 10395,
+
+        /// <summary>
+        /// BPS 15A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BPS 15A.")]
+        BPS15A = 10440,
+
+        /// <summary>
+        /// BR-15 Tokyo KEIKI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BR-15 Tokyo KEIKI.")]
+        BR15TokyoKEIKI = 10485,
+
+        /// <summary>
+        /// BRIDGEMASTE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BRIDGEMASTE.")]
+        BRIDGEMASTE = 10510,
+
+        /// <summary>
+        /// Bread Bin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bread Bin.")]
+        BreadBin = 10530,
+
+        /// <summary>
+        /// BT 271.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BT 271.")]
+        BT271 = 10575,
+
+        /// <summary>
+        /// BX 732.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BX 732.")]
+        BX732 = 10620,
+
+        /// <summary>
+        /// Buzz Stand.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Buzz Stand.")]
+        BuzzStand = 10665,
+
+        /// <summary>
+        /// C 5A Multi Mode Radar.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("C 5A Multi Mode Radar.")]
+        C5AMultiModeRadar = 10710,
+
+        /// <summary>
+        /// Caiman.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Caiman.")]
+        Caiman = 10755,
+
+        /// <summary>
+        /// Cake Stand.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cake Stand.")]
+        CakeStand = 10800,
+
+        /// <summary>
+        /// Calypso C61.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Calypso C61.")]
+        CalypsoC61 = 10845,
+
+        /// <summary>
+        /// Calypso Ii.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Calypso Ii.")]
+        CalypsoIi = 10890,
+
+        /// <summary>
+        /// Cardion Coastal.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cardion Coastal.")]
+        CardionCoastal = 10895,
+
+        /// <summary>
+        /// Castor Ii.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Castor Ii.")]
+        CastorIi = 10935,
+
+        /// <summary>
+        /// Castor 2J TT (Crotale NG).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Castor 2J TT (Crotale NG).")]
+        Castor2JTTCrotaleNG = 10940,
+
+        /// <summary>
+        /// Cat House.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cat House.")]
+        CatHouse = 10980,
+
+        /// <summary>
+        /// CDR-431.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CDR-431.")]
+        CDR431 = 10985,
+
+        /// <summary>
+        /// Chair Back TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chair Back TT.")]
+        ChairBackTT = 11000,
+
+        /// <summary>
+        /// Chair Back ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chair Back ILL.")]
+        ChairBackILL = 11010,
+
+        /// <summary>
+        /// Cheese Brick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cheese Brick.")]
+        CheeseBrick = 11025,
+
+        /// <summary>
+        /// Clam Pipe.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Clam Pipe.")]
+        ClamPipe = 11070,
+
+        /// <summary>
+        /// Clamshell.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Clamshell.")]
+        Clamshell = 11115,
+
+        /// <summary>
+        /// Collins WXR-700X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Collins WXR-700X.")]
+        CollinsWXR700X = 11160,
+
+        /// <summary>
+        /// Collins DN 101.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Collins DN 101.")]
+        CollinsDN101 = 11205,
+
+        /// <summary>
+        /// Contraves Sea Hunter MK 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contraves Sea Hunter MK 4.")]
+        ContravesSeaHunterMK4 = 11250,
+
+        /// <summary>
+        /// Corn Can.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Corn Can.")]
+        CornCan = 11260,
+
+        /// <summary>
+        /// CR-105 RMCA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CR-105 RMCA.")]
+        CR105RMCA = 11270,
+
+        /// <summary>
+        /// Cross Bird.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Bird.")]
+        CrossBird = 11295,
+
+        /// <summary>
+        /// Cross Dome.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Dome.")]
+        CrossDome = 11340,
+
+        /// <summary>
+        /// Cross Legs.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Legs.")]
+        CrossLegs = 11385,
+
+        /// <summary>
+        /// Cross Out.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Out.")]
+        CrossOut = 11430,
+
+        /// <summary>
+        /// Cross Slot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Slot.")]
+        CrossSlot = 11475,
+
+        /// <summary>
+        /// Cross Sword.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Sword.")]
+        CrossSword = 11520,
+
+        /// <summary>
+        /// Cross Up.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Up.")]
+        CrossUp = 11565,
+
+        /// <summary>
+        /// Cross Sword FC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cross Sword FC.")]
+        CrossSwordFC = 11610,
+
+        /// <summary>
+        /// THD-5000.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("THD-5000.")]
+        THD5000 = 11655,
+
+        /// <summary>
+        /// Griffon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Griffon.")]
+        Griffon = 11660,
+
+        /// <summary>
+        /// Crotale TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Crotale TT.")]
+        CrotaleTT = 11665,
+
+        /// <summary>
+        /// Crotale MGMissile System.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Crotale MGMissile System.")]
+        CrotaleMGMissileSystem = 11700,
+
+        /// <summary>
+        /// CSS C 3C CAS 1M1 M2 MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CSS C 3C CAS 1M1 M2 MH.")]
+        CSSC3CCAS1M1M2MH = 11745,
+
+        /// <summary>
+        /// CSS C 2B HY 1A MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CSS C 2B HY 1A MH.")]
+        CSSC2BHY1AMH = 11790,
+
+        /// <summary>
+        /// CWS 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CWS 2.")]
+        CWS2 = 11835,
+
+        /// <summary>
+        /// Cylinder Head.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cylinder Head.")]
+        CylinderHead = 11880,
+
+        /// <summary>
+        /// Cyrano II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cyrano II.")]
+        CyranoII = 11925,
+
+        /// <summary>
+        /// Cyrano IV.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cyrano IV.")]
+        CyranoIV = 11970,
+
+        /// <summary>
+        /// Cyrano IV-M.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cyrano IV-M.")]
+        CyranoIVM = 11975,
+
+        /// <summary>
+        /// DA-01/00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DA-01/00.")]
+        DA0100 = 12010,
+
+        /// <summary>
+        /// DA 05 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DA 05 00.")]
+        DA0500 = 12015,
+
+        /// <summary>
+        /// Dawn.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dawn.")]
+        Dawn = 12060,
+
+        /// <summary>
+        /// Dead Duck.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Duck.")]
+        DeadDuck = 12105,
+
+        /// <summary>
+        /// DECCA-20 V90/9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA-20 V90/9.")]
+        DECCA20V909 = 12110,
+
+        /// <summary>
+        /// DECCA-20 V90S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA-20 V90S.")]
+        DECCA20V90S = 12111,
+
+        /// <summary>
+        /// DECCA 45.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 45.")]
+        DECCA45 = 12150,
+
+        /// <summary>
+        /// DECCA 50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 50.")]
+        DECCA50 = 12195,
+
+        /// <summary>
+        /// DECCA 110.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 110.")]
+        DECCA110 = 12240,
+
+        /// <summary>
+        /// DECCA 170.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 170.")]
+        DECCA170 = 12285,
+
+        /// <summary>
+        /// DECCA HF 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA HF 2.")]
+        DECCAHF2 = 12292,
+
+        /// <summary>
+        /// DECCA 202.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 202.")]
+        DECCA202 = 12330,
+
+        /// <summary>
+        /// DECCA D202.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA D202.")]
+        DECCAD202 = 12375,
+
+        /// <summary>
+        /// DECCA 303.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 303.")]
+        DECCA303 = 12420,
+
+        /// <summary>
+        /// DECCA 535.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 535.")]
+        DECCA535 = 12430,
+
+        /// <summary>
+        /// DECCA 626.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 626.")]
+        DECCA626 = 12465,
+
+        /// <summary>
+        /// DECCA 629.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 629.")]
+        DECCA629 = 12510,
+
+        /// <summary>
+        /// DECCA 914.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 914.")]
+        DECCA914 = 12555,
+
+        /// <summary>
+        /// DECCA 916.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 916.")]
+        DECCA916 = 12600,
+
+        /// <summary>
+        /// DECCA 926.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 926.")]
+        DECCA926 = 12610,
+
+        /// <summary>
+        /// DECCA 1226 Commercial.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 1226 Commercial.")]
+        DECCA1226Commercial = 12645,
+
+        /// <summary>
+        /// DECCA 1626.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 1626.")]
+        DECCA1626 = 12690,
+
+        /// <summary>
+        /// DECCA 2459.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA 2459.")]
+        DECCA2459 = 12735,
+
+        /// <summary>
+        /// DECCA AWS 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA AWS 1.")]
+        DECCAAWS1 = 12780,
+
+        /// <summary>
+        /// DECCA AWS 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA AWS 2.")]
+        DECCAAWS2 = 12782,
+
+        /// <summary>
+        /// DECCA AWS 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA AWS 4.")]
+        DECCAAWS4 = 12785,
+
+        /// <summary>
+        /// DECCA AWS-4 (2).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA AWS-4 (2).")]
+        DECCAAWS42 = 12787,
+
+        /// <summary>
+        /// DECCA MAR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA MAR.")]
+        DECCAMAR = 12800,
+
+        /// <summary>
+        /// DECCA RM 326.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA RM 326.")]
+        DECCARM326 = 12805,
+
+        /// <summary>
+        /// DECCA RM 416.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA RM 416.")]
+        DECCARM416 = 12825,
+
+        /// <summary>
+        /// DECCA RM 914.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA RM 914.")]
+        DECCARM914 = 12870,
+
+        /// <summary>
+        /// DECCA RM 1690.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA RM 1690.")]
+        DECCARM1690 = 12915,
+
+        /// <summary>
+        /// DECCA Super 101 MK 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DECCA Super 101 MK 3.")]
+        DECCASuper101MK3 = 12960,
+
+        /// <summary>
+        /// DISS 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DISS 1.")]
+        DISS1 = 13005,
+
+        /// <summary>
+        /// DN 181.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DN 181.")]
+        DN181 = 13050,
+
+        /// <summary>
+        /// BLINDFIRE FSC TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("BLINDFIRE FSC TT.")]
+        BLINDFIREFSCTT = 13055,
+
+        /// <summary>
+        /// Dog Ear.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dog Ear.")]
+        DogEar = 13095,
+
+        /// <summary>
+        /// Dog House.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dog House.")]
+        DogHouse = 13140,
+
+        /// <summary>
+        /// Don 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Don 2.")]
+        Don2 = 13185,
+
+        /// <summary>
+        /// Don A/B/2/Kay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Don A/B/2/Kay.")]
+        DonAB2Kay = 13230,
+
+        /// <summary>
+        /// Donets.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Donets.")]
+        Donets = 13275,
+
+        /// <summary>
+        /// Down Beat.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Down Beat.")]
+        DownBeat = 13320,
+
+        /// <summary>
+        /// DRAA 2A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRAA 2A.")]
+        DRAA2A = 13365,
+
+        /// <summary>
+        /// DRAA 2B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRAA 2B.")]
+        DRAA2B = 13410,
+
+        /// <summary>
+        /// DRAC 39.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRAC 39.")]
+        DRAC39 = 13455,
+
+        /// <summary>
+        /// DRBC 30B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBC 30B.")]
+        DRBC30B = 13500,
+
+        /// <summary>
+        /// DRBC 31A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBC 31A.")]
+        DRBC31A = 13545,
+
+        /// <summary>
+        /// DRBC 32A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBC 32A.")]
+        DRBC32A = 13590,
+
+        /// <summary>
+        /// DRBC 32D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBC 32D.")]
+        DRBC32D = 13635,
+
+        /// <summary>
+        /// DRBC 33A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBC 33A.")]
+        DRBC33A = 13680,
+
+        /// <summary>
+        /// DRBI 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBI 10.")]
+        DRBI10 = 13725,
+
+        /// <summary>
+        /// DRBI 23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBI 23.")]
+        DRBI23 = 13770,
+
+        /// <summary>
+        /// DRBJ 11B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBJ 11B.")]
+        DRBJ11B = 13815,
+
+        /// <summary>
+        /// DRBN 30.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBN 30.")]
+        DRBN30 = 13860,
+
+        /// <summary>
+        /// DRBN 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBN 32.")]
+        DRBN32 = 13905,
+
+        /// <summary>
+        /// DRBR 51.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBR 51.")]
+        DRBR51 = 13950,
+
+        /// <summary>
+        /// DRBV 20B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 20B.")]
+        DRBV20B = 13995,
+
+        /// <summary>
+        /// DRBV 22.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 22.")]
+        DRBV22 = 14040,
+
+        /// <summary>
+        /// DRBV 26C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 26C.")]
+        DRBV26C = 14085,
+
+        /// <summary>
+        /// DRBV 30.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 30.")]
+        DRBV30 = 14130,
+
+        /// <summary>
+        /// DRBV 50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 50.")]
+        DRBV50 = 14175,
+
+        /// <summary>
+        /// DRBV 51.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 51.")]
+        DRBV51 = 14220,
+
+        /// <summary>
+        /// DRBV 51A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 51A.")]
+        DRBV51A = 14265,
+
+        /// <summary>
+        /// DRBV 51B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 51B.")]
+        DRBV51B = 14310,
+
+        /// <summary>
+        /// DRBV 51C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRBV 51C.")]
+        DRBV51C = 14355,
+
+        /// <summary>
+        /// Drop Kick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Drop Kick.")]
+        DropKick = 14400,
+
+        /// <summary>
+        /// DRUA 31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRUA 31.")]
+        DRUA31 = 14445,
+
+        /// <summary>
+        /// Drum Tilt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Drum Tilt.")]
+        DrumTilt = 14490,
+
+        /// <summary>
+        /// Drum Tilt A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Drum Tilt A.")]
+        DrumTiltA = 14535,
+
+        /// <summary>
+        /// Drum Tilt B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Drum Tilt B.")]
+        DrumTiltB = 14545,
+
+        /// <summary>
+        /// Dumbo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dumbo.")]
+        Dumbo = 14580,
+
+        /// <summary>
+        /// ECR-90.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ECR-90.")]
+        ECR90 = 14600,
+
+        /// <summary>
+        /// Egg Cup A/B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Egg Cup A/B.")]
+        EggCupAB = 14625,
+
+        /// <summary>
+        /// EKCO 190.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("EKCO 190.")]
+        EKCO190 = 14670,
+
+        /// <summary>
+        /// EL M 2001B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("EL M 2001B.")]
+        ELM2001B = 14715,
+
+        /// <summary>
+        /// EL M 2207.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("EL M 2207.")]
+        ELM2207 = 14760,
+
+        /// <summary>
+        /// EL/M 2216(V).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("EL/M 2216(V).")]
+        ELM2216V = 14770,
+
+        /// <summary>
+        /// ELTA EL/M 2221 GM STGR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ELTA EL/M 2221 GM STGR.")]
+        ELTAELM2221GMSTGR = 14805,
+
+        /// <summary>
+        /// ELTA SIS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ELTA SIS.")]
+        ELTASIS = 14810,
+
+        /// <summary>
+        /// EMD 2900.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("EMD 2900.")]
+        EMD2900 = 14850,
+
+        /// <summary>
+        /// End Tray.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("End Tray.")]
+        EndTray = 14895,
+
+        /// <summary>
+        /// Exocet 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exocet 1.")]
+        Exocet1 = 14940,
+
+        /// <summary>
+        /// Exocet 1 MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exocet 1 MH.")]
+        Exocet1MH = 14985,
+
+        /// <summary>
+        /// Exocet 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exocet 2.")]
+        Exocet2 = 15030,
+
+        /// <summary>
+        /// Eye Bowl.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Eye Bowl.")]
+        EyeBowl = 15075,
+
+        /// <summary>
+        /// Eye Shield.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Eye Shield.")]
+        EyeShield = 15120,
+
+        /// <summary>
+        /// F332Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("F332Z.")]
+        F332Z = 15140,
+
+        /// <summary>
+        /// FALCON.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FALCON.")]
+        FALCON = 15160,
+
+        /// <summary>
+        /// Fan Song A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Song A.")]
+        FanSongA = 15165,
+
+        /// <summary>
+        /// Fan Song B/F TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Song B/F TA.")]
+        FanSongBFTA = 15200,
+
+        /// <summary>
+        /// Fan Song B/F TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Song B/F TT.")]
+        FanSongBFTT = 15210,
+
+        /// <summary>
+        /// Fan Song C/E TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Song C/E TA.")]
+        FanSongCETA = 15220,
+
+        /// <summary>
+        /// Fan Song C/E TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Song C/E TT.")]
+        FanSongCETT = 15230,
+
+        /// <summary>
+        /// Fan Song C/E MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Song C/E MG.")]
+        FanSongCEMG = 15240,
+
+        /// <summary>
+        /// Fan Song B/FF MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Song B/FF MG.")]
+        FanSongBFFMG = 15255,
+
+        /// <summary>
+        /// Fan Tail.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fan Tail.")]
+        FanTail = 15300,
+
+        /// <summary>
+        /// FCR-1401.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FCR-1401.")]
+        FCR1401 = 15310,
+
+        /// <summary>
+        /// Fin Curve.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fin Curve.")]
+        FinCurve = 15345,
+
+        /// <summary>
+        /// Fire Can.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Can.")]
+        FireCan = 15390,
+
+        /// <summary>
+        /// Fire Dish.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Dish.")]
+        FireDish = 15435,
+
+        /// <summary>
+        /// Fire Dome TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Dome TA.")]
+        FireDomeTA = 15470,
+
+        /// <summary>
+        /// Fire Dome TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Dome TT.")]
+        FireDomeTT = 15475,
+
+        /// <summary>
+        /// Fire Dome TI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Dome TI.")]
+        FireDomeTI = 15480,
+
+        /// <summary>
+        /// Fire Iron.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Iron.")]
+        FireIron = 15525,
+
+        /// <summary>
+        /// Fire Wheel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Wheel.")]
+        FireWheel = 15570,
+
+        /// <summary>
+        /// Fish Bowl.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fish Bowl.")]
+        FishBowl = 15615,
+
+        /// <summary>
+        /// Flap Lid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flap Lid.")]
+        FlapLid = 15660,
+
+        /// <summary>
+        /// Flap Truck.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flap Truck.")]
+        FlapTruck = 15705,
+
+        /// <summary>
+        /// Flap Wheel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flap Wheel.")]
+        FlapWheel = 15750,
+
+        /// <summary>
+        /// Flash Dance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flash Dance.")]
+        FlashDance = 15795,
+
+        /// <summary>
+        /// Flat Face A B C D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flat Face A B C D.")]
+        FlatFaceABCD = 15840,
+
+        /// <summary>
+        /// Flat Screen.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flat Screen.")]
+        FlatScreen = 15885,
+
+        /// <summary>
+        /// Flat Spin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flat Spin.")]
+        FlatSpin = 15930,
+
+        /// <summary>
+        /// Flat Twin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flat Twin.")]
+        FlatTwin = 15975,
+
+        /// <summary>
+        /// Fledermaus.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fledermaus.")]
+        Fledermaus = 16020,
+
+        /// <summary>
+        /// FLYCATCHER.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FLYCATCHER.")]
+        FLYCATCHER = 16030,
+
+        /// <summary>
+        /// Fly Screen.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fly Screen.")]
+        FlyScreen = 16065,
+
+        /// <summary>
+        /// Fly Screen A&amp;B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fly Screen A&amp;B.")]
+        FlyScreenAB = 16110,
+
+        /// <summary>
+        /// Fly Trap B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fly Trap B.")]
+        FlyTrapB = 16155,
+
+        /// <summary>
+        /// Fog Lamp MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fog Lamp MG.")]
+        FogLampMG = 16200,
+
+        /// <summary>
+        /// Fog Lamp TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fog Lamp TT.")]
+        FogLampTT = 16245,
+
+        /// <summary>
+        /// Foil Two.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Foil Two.")]
+        FoilTwo = 16290,
+
+        /// <summary>
+        /// Fox Hunter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fox Hunter.")]
+        FoxHunter = 16335,
+
+        /// <summary>
+        /// FOX FIREFox Fire AL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FOX FIREFox Fire AL.")]
+        FOXFIREFoxFireAL = 16380,
+
+        /// <summary>
+        /// FOX FIRE ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FOX FIRE ILL.")]
+        FOXFIREILL = 16390,
+
+        /// <summary>
+        /// FR-151A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FR-151A.")]
+        FR151A = 16400,
+
+        /// <summary>
+        /// FR-1505 DA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FR-1505 DA.")]
+        FR1505DA = 16410,
+
+        /// <summary>
+        /// FR-2000.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FR-2000.")]
+        FR2000 = 16420,
+
+        /// <summary>
+        /// FR-2855W.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FR-2855W.")]
+        FR2855W = 16421,
+
+        /// <summary>
+        /// Front Dome.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Front Dome.")]
+        FrontDome = 16425,
+
+        /// <summary>
+        /// Front Door.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Front Door.")]
+        FrontDoor = 16470,
+
+        /// <summary>
+        /// Front Piece.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Front Piece.")]
+        FrontPiece = 16515,
+
+        /// <summary>
+        /// Furuno.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Furuno.")]
+        Furuno = 16560,
+
+        /// <summary>
+        /// Furuno 1721.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Furuno 1721.")]
+        Furuno1721 = 16561,
+
+        /// <summary>
+        /// Furuno 701.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Furuno 701.")]
+        Furuno701 = 16605,
+
+        /// <summary>
+        /// Furuno 711 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Furuno 711 2.")]
+        Furuno7112 = 16650,
+
+        /// <summary>
+        /// Furuno 2400.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Furuno 2400.")]
+        Furuno2400 = 16695,
+
+        /// <summary>
+        /// GA 01 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GA 01 00.")]
+        GA0100 = 16740,
+
+        /// <summary>
+        /// Gage.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gage.")]
+        Gage = 16785,
+
+        /// <summary>
+        /// Garpin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Garpin.")]
+        Garpin = 16830,
+
+        /// <summary>
+        /// GEM BX 132.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GEM BX 132.")]
+        GEMBX132 = 16875,
+
+        /// <summary>
+        /// Gepard TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gepard TA.")]
+        GepardTA = 16880,
+
+        /// <summary>
+        /// Gepard TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gepard TT.")]
+        GepardTT = 16884,
+
+        /// <summary>
+        /// GERAN-F.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GERAN-F.")]
+        GERANF = 16888,
+
+        /// <summary>
+        /// GIRAFFE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GIRAFFE.")]
+        GIRAFFE = 16900,
+
+        /// <summary>
+        /// Gin Sling TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gin Sling TA.")]
+        GinSlingTA = 16915,
+
+        /// <summary>
+        /// Gin Sling TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gin Sling TT.")]
+        GinSlingTT = 16920,
+
+        /// <summary>
+        /// Gin Sling MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gin Sling MG.")]
+        GinSlingMG = 16925,
+
+        /// <summary>
+        /// GPN-22.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GPN-22.")]
+        GPN22 = 16945,
+
+        /// <summary>
+        /// GRN-9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GRN-9.")]
+        GRN9 = 16950,
+
+        /// <summary>
+        /// Green Stain.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Green Stain.")]
+        GreenStain = 16965,
+
+        /// <summary>
+        /// Grid Bow.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Grid Bow.")]
+        GridBow = 17010,
+
+        /// <summary>
+        /// GRILL PAN TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GRILL PAN TT.")]
+        GRILLPANTT = 17025,
+
+        /// <summary>
+        /// Guardsman.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guardsman.")]
+        Guardsman = 17055,
+
+        /// <summary>
+        /// GUN DISH (ZSU-23/4).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GUN DISH (ZSU-23/4).")]
+        GUNDISHZSU234 = 17070,
+
+        /// <summary>
+        /// Hair Net.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hair Net.")]
+        HairNet = 17100,
+
+        /// <summary>
+        /// Half Plate A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Half Plate A.")]
+        HalfPlateA = 17145,
+
+        /// <summary>
+        /// Half Plate B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Half Plate B.")]
+        HalfPlateB = 17190,
+
+        /// <summary>
+        /// HARD.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HARD.")]
+        HARD = 17220,
+
+        /// <summary>
+        /// Hawk Screech.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hawk Screech.")]
+        HawkScreech = 17235,
+
+        /// <summary>
+        /// Head Light A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Head Light A.")]
+        HeadLightA = 17280,
+
+        /// <summary>
+        /// Head Lights.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Head Lights.")]
+        HeadLights = 17325,
+
+        /// <summary>
+        /// Head Lights C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Head Lights C.")]
+        HeadLightsC = 17370,
+
+        /// <summary>
+        /// Head Lights MG A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Head Lights MG A.")]
+        HeadLightsMGA = 17415,
+
+        /// <summary>
+        /// Head Lights MG B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Head Lights MG B.")]
+        HeadLightsMGB = 17460,
+
+        /// <summary>
+        /// Head Lights TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Head Lights TT.")]
+        HeadLightsTT = 17505,
+
+        /// <summary>
+        /// Head Net.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Head Net.")]
+        HeadNet = 17550,
+
+        /// <summary>
+        /// Hen Egg.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hen Egg.")]
+        HenEgg = 17595,
+
+        /// <summary>
+        /// Hen House.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hen House.")]
+        HenHouse = 17640,
+
+        /// <summary>
+        /// Hen Nest.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hen Nest.")]
+        HenNest = 17685,
+
+        /// <summary>
+        /// Hen Roost.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hen Roost.")]
+        HenRoost = 17730,
+
+        /// <summary>
+        /// High Brick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Brick.")]
+        HighBrick = 17775,
+
+        /// <summary>
+        /// High Fix.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Fix.")]
+        HighFix = 17820,
+
+        /// <summary>
+        /// High Lark TI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Lark TI.")]
+        HighLarkTI = 17865,
+
+        /// <summary>
+        /// High Lark 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Lark 1.")]
+        HighLark1 = 17910,
+
+        /// <summary>
+        /// High Lark 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Lark 2.")]
+        HighLark2 = 17955,
+
+        /// <summary>
+        /// High Lark 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Lark 4.")]
+        HighLark4 = 18000,
+
+        /// <summary>
+        /// High Lune.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Lune.")]
+        HighLune = 18045,
+
+        /// <summary>
+        /// High Pole A&amp;B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Pole A&amp;B.")]
+        HighPoleAB = 18090,
+
+        /// <summary>
+        /// High Scoop.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Scoop.")]
+        HighScoop = 18135,
+
+        /// <summary>
+        /// HIGH SCREEN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HIGH SCREEN.")]
+        HIGHSCREEN = 18150,
+
+        /// <summary>
+        /// High Sieve.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Sieve.")]
+        HighSieve = 18180,
+
+        /// <summary>
+        /// HN-503.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HN-503.")]
+        HN503 = 18200,
+
+        /// <summary>
+        /// Home Talk.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Home Talk.")]
+        HomeTalk = 18225,
+
+        /// <summary>
+        /// Horn Spoon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Horn Spoon.")]
+        HornSpoon = 18270,
+
+        /// <summary>
+        /// HOT BRICK.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HOT BRICK.")]
+        HOTBRICK = 18280,
+
+        /// <summary>
+        /// Hot Flash.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hot Flash.")]
+        HotFlash = 18315,
+
+        /// <summary>
+        /// Hot Shot TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hot Shot TA.")]
+        HotShotTA = 18320,
+
+        /// <summary>
+        /// Hot Shot TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hot Shot TT.")]
+        HotShotTT = 18325,
+
+        /// <summary>
+        /// Hot Shot MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hot Shot MG.")]
+        HotShotMG = 18330,
+
+        /// <summary>
+        /// IFF MK XII AIMS UPX 29.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IFF MK XII AIMS UPX 29.")]
+        IFFMKXIIAIMSUPX29 = 18360,
+
+        /// <summary>
+        /// IFF MK XV.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IFF MK XV.")]
+        IFFMKXV = 18405,
+
+        /// <summary>
+        /// Javelin MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Javelin MG.")]
+        JavelinMG = 18410,
+
+        /// <summary>
+        /// Jay Bird.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jay Bird.")]
+        JayBird = 18450,
+
+        /// <summary>
+        /// JRC-NMD-401.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JRC-NMD-401.")]
+        JRCNMD401 = 18460,
+
+        /// <summary>
+        /// Jupiter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jupiter.")]
+        Jupiter = 18495,
+
+        /// <summary>
+        /// Jupiter II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jupiter II.")]
+        JupiterII = 18540,
+
+        /// <summary>
+        /// JY-8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JY-8.")]
+        JY8 = 18550,
+
+        /// <summary>
+        /// JY-9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JY-9.")]
+        JY9 = 18555,
+
+        /// <summary>
+        /// JY-14.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JY-14.")]
+        JY14 = 18560,
+
+        /// <summary>
+        /// K376Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("K376Z.")]
+        K376Z = 18585,
+
+        /// <summary>
+        /// Kelvin Hughes 2A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kelvin Hughes 2A.")]
+        KelvinHughes2A = 18630,
+
+        /// <summary>
+        /// Kelvin Hughes 14/9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kelvin Hughes 14/9.")]
+        KelvinHughes149 = 18675,
+
+        /// <summary>
+        /// Kelvin Hughes type 1006.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kelvin Hughes type 1006.")]
+        KelvinHughesType1006 = 18720,
+
+        /// <summary>
+        /// Kelvin Hughes type 1007.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kelvin Hughes type 1007.")]
+        KelvinHughesType1007 = 18765,
+
+        /// <summary>
+        /// KH-902M.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("KH-902M.")]
+        KH902M = 18785,
+
+        /// <summary>
+        /// Kite Screech.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kite Screech.")]
+        KiteScreech = 18810,
+
+        /// <summary>
+        /// Kite Screech A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kite Screech A.")]
+        KiteScreechA = 18855,
+
+        /// <summary>
+        /// Kite Screech B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kite Screech B.")]
+        KiteScreechB = 18900,
+
+        /// <summary>
+        /// Kivach.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kivach.")]
+        Kivach = 18945,
+
+        /// <summary>
+        /// Knife Rest.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Knife Rest.")]
+        KnifeRest = 18990,
+
+        /// <summary>
+        /// Knife Rest B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Knife Rest B.")]
+        KnifeRestB = 19035,
+
+        /// <summary>
+        /// KNIFE REST C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("KNIFE REST C.")]
+        KNIFERESTC = 19037,
+
+        /// <summary>
+        /// KR-75.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("KR-75.")]
+        KR75 = 19050,
+
+        /// <summary>
+        /// KSA SRN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("KSA SRN.")]
+        KSASRN = 19080,
+
+        /// <summary>
+        /// KSA TSR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("KSA TSR.")]
+        KSATSR = 19125,
+
+        /// <summary>
+        /// Land Fall.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Land Fall.")]
+        LandFall = 19170,
+
+        /// <summary>
+        /// Land Roll MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Land Roll MG.")]
+        LandRollMG = 19215,
+
+        /// <summary>
+        /// Land Roll TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Land Roll TA.")]
+        LandRollTA = 19260,
+
+        /// <summary>
+        /// Land Roll TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Land Roll TT.")]
+        LandRollTT = 19305,
+
+        /// <summary>
+        /// LC-150.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LC-150.")]
+        LC150 = 19310,
+
+        /// <summary>
+        /// Leningraf.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Leningraf.")]
+        Leningraf = 19350,
+
+        /// <summary>
+        /// Light Bulb.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light Bulb.")]
+        LightBulb = 19395,
+
+        /// <summary>
+        /// LMT NRAI-6A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LMT NRAI-6A.")]
+        LMTNRAI6A = 19400,
+
+        /// <summary>
+        /// LN 55.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LN 55.")]
+        LN55 = 19440,
+
+        /// <summary>
+        /// Ln 66.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ln 66.")]
+        Ln66 = 19485,
+
+        /// <summary>
+        /// Long Bow.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Bow.")]
+        LongBow = 19530,
+
+        /// <summary>
+        /// Long Brick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Brick.")]
+        LongBrick = 19575,
+
+        /// <summary>
+        /// Long Bull.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Bull.")]
+        LongBull = 19620,
+
+        /// <summary>
+        /// Long Eye.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Eye.")]
+        LongEye = 19665,
+
+        /// <summary>
+        /// Long Head.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Head.")]
+        LongHead = 19710,
+
+        /// <summary>
+        /// Long Talk.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Talk.")]
+        LongTalk = 19755,
+
+        /// <summary>
+        /// Long Track.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Track.")]
+        LongTrack = 19800,
+
+        /// <summary>
+        /// Long Trough.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Long Trough.")]
+        LongTrough = 19845,
+
+        /// <summary>
+        /// Look Two.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Look Two.")]
+        LookTwo = 19890,
+
+        /// <summary>
+        /// LORAN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LORAN.")]
+        LORAN = 19935,
+
+        /// <summary>
+        /// Low Blow TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Low Blow TA.")]
+        LowBlowTA = 19950,
+
+        /// <summary>
+        /// Low Blow TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Low Blow TT.")]
+        LowBlowTT = 19955,
+
+        /// <summary>
+        /// Low Blow MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Low Blow MG.")]
+        LowBlowMG = 19960,
+
+        /// <summary>
+        /// Low Sieve.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Low Sieve.")]
+        LowSieve = 19980,
+
+        /// <summary>
+        /// Low Trough.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Low Trough.")]
+        LowTrough = 20025,
+
+        /// <summary>
+        /// LP-23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LP-23.")]
+        LP23 = 20040,
+
+        /// <summary>
+        /// LW 08.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LW 08.")]
+        LW08 = 20070,
+
+        /// <summary>
+        /// M-1983 FCR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M-1983 FCR.")]
+        M1983FCR = 20090,
+
+        /// <summary>
+        /// M22-40.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M22-40.")]
+        M2240 = 20115,
+
+        /// <summary>
+        /// M44.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M44.")]
+        M44 = 20160,
+
+        /// <summary>
+        /// M401Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M401Z.")]
+        M401Z = 20205,
+
+        /// <summary>
+        /// M585Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M585Z.")]
+        M585Z = 20250,
+
+        /// <summary>
+        /// M588Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M588Z.")]
+        M588Z = 20295,
+
+        /// <summary>
+        /// MA 1 IFF Portion.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MA 1 IFF Portion.")]
+        MA1IFFPortion = 20340,
+
+        /// <summary>
+        /// MARELD.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MARELD.")]
+        MARELD = 20360,
+
+        /// <summary>
+        /// MA Type 909#.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MA Type 909#.")]
+        MAType909 = 20385,
+
+        /// <summary>
+        /// Marconi 1810.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi 1810.")]
+        Marconi1810 = 20430,
+
+        /// <summary>
+        /// Marconi Canada HC 75.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi Canada HC 75.")]
+        MarconiCanadaHC75 = 20475,
+
+        /// <summary>
+        /// Marconi S 713.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi S 713.")]
+        MarconiS713 = 20495,
+
+        /// <summary>
+        /// Marconi S 1802.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi S 1802.")]
+        MarconiS1802 = 20520,
+
+        /// <summary>
+        /// Marconi S247.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi S247.")]
+        MarconiS247 = 20530,
+
+        /// <summary>
+        /// Marconi S 810.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi S 810.")]
+        MarconiS810 = 20565,
+
+        /// <summary>
+        /// Marconi SA 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi SA 10.")]
+        MarconiSA10 = 20585,
+
+        /// <summary>
+        /// Marconi type 967.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi type 967.")]
+        MarconiType967 = 20610,
+
+        /// <summary>
+        /// Marconi type 968.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi type 968.")]
+        MarconiType968 = 20655,
+
+        /// <summary>
+        /// Marconi type 992.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi type 992.")]
+        MarconiType992 = 20700,
+
+        /// <summary>
+        /// Marconi/signaal type 1022.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi/signaal type 1022.")]
+        MarconiSignaalType1022 = 20745,
+
+        /// <summary>
+        /// Marconi/signaal type 910.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi/signaal type 910.")]
+        MarconiSignaalType910 = 20790,
+
+        /// <summary>
+        /// Marconi/signaal type 911.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi/signaal type 911.")]
+        MarconiSignaalType911 = 20835,
+
+        /// <summary>
+        /// Marconi/signaal type 992R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marconi/signaal type 992R.")]
+        MarconiSignaalType992R = 20880,
+
+        /// <summary>
+        /// Mesh Brick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mesh Brick.")]
+        MeshBrick = 20925,
+
+        /// <summary>
+        /// Mirage ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mirage ILL.")]
+        MirageILL = 20950,
+
+        /// <summary>
+        /// MK 15 CIWS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK 15 CIWS.")]
+        MK15CIWS = 20970,
+
+        /// <summary>
+        /// MK-23.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK-23.")]
+        MK23 = 21015,
+
+        /// <summary>
+        /// MK 23 TAS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK 23 TAS.")]
+        MK23TAS = 21060,
+
+        /// <summary>
+        /// MK 25.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK 25.")]
+        MK25 = 21105,
+
+        /// <summary>
+        /// MK-35 M2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK-35 M2.")]
+        MK35M2 = 21150,
+
+        /// <summary>
+        /// MK 92.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK 92.")]
+        MK92 = 21195,
+
+        /// <summary>
+        /// MK-92 CAS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK-92 CAS.")]
+        MK92CAS = 21240,
+
+        /// <summary>
+        /// MK-92 STIR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK-92 STIR.")]
+        MK92STIR = 21285,
+
+        /// <summary>
+        /// MK 95.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK 95.")]
+        MK95 = 21330,
+
+        /// <summary>
+        /// MLA-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MLA-1.")]
+        MLA1 = 21340,
+
+        /// <summary>
+        /// MM APS 705.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MM APS 705.")]
+        MMAPS705 = 21375,
+
+        /// <summary>
+        /// MM SPG 74.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MM SPG 74.")]
+        MMSPG74 = 21420,
+
+        /// <summary>
+        /// MM SPG 75.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MM SPG 75.")]
+        MMSPG75 = 21465,
+
+        /// <summary>
+        /// MM SPN 703.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MM SPN 703.")]
+        MMSPN703 = 21490,
+
+        /// <summary>
+        /// MM SPS 702.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MM SPS 702.")]
+        MMSPS702 = 21510,
+
+        /// <summary>
+        /// MM SPS 768.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MM SPS 768.")]
+        MMSPS768 = 21555,
+
+        /// <summary>
+        /// MM SPS 774.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MM SPS 774.")]
+        MMSPS774 = 21600,
+
+        /// <summary>
+        /// Moon 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moon 4.")]
+        Moon4 = 21645,
+
+        /// <summary>
+        /// MMRS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MMRS.")]
+        MMRS = 21650,
+
+        /// <summary>
+        /// MPDR 18 X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MPDR 18 X.")]
+        MPDR18X = 21690,
+
+        /// <summary>
+        /// MT-305X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MT-305X.")]
+        MT305X = 21710,
+
+        /// <summary>
+        /// Muff Cob.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Muff Cob.")]
+        MuffCob = 21735,
+
+        /// <summary>
+        /// Mushroom.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mushroom.")]
+        Mushroom = 21780,
+
+        /// <summary>
+        /// Mushroom 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mushroom 1.")]
+        Mushroom1 = 21825,
+
+        /// <summary>
+        /// Mushroom 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mushroom 2.")]
+        Mushroom2 = 21870,
+
+        /// <summary>
+        /// N920Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("N920Z.")]
+        N920Z = 21880,
+
+        /// <summary>
+        /// Nanjing B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nanjing B.")]
+        NanjingB = 21890,
+
+        /// <summary>
+        /// Nanjing C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nanjing C.")]
+        NanjingC = 21895,
+
+        /// <summary>
+        /// Nayada.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nayada.")]
+        Nayada = 21915,
+
+        /// <summary>
+        /// Neptun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neptun.")]
+        Neptun = 21960,
+
+        /// <summary>
+        /// NIKE TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NIKE TT.")]
+        NIKETT = 21980,
+
+        /// <summary>
+        /// NRBA 50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NRBA 50.")]
+        NRBA50 = 22005,
+
+        /// <summary>
+        /// NRBA 51.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NRBA 51.")]
+        NRBA51 = 22050,
+
+        /// <summary>
+        /// NRBF 20A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NRBF 20A.")]
+        NRBF20A = 22095,
+
+        /// <summary>
+        /// Nysa B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nysa B.")]
+        NysaB = 22140,
+
+        /// <summary>
+        /// O524A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("O524A.")]
+        O524A = 22185,
+
+        /// <summary>
+        /// O580B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("O580B.")]
+        O580B = 22230,
+
+        /// <summary>
+        /// O625Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("O625Z.")]
+        O625Z = 22275,
+
+        /// <summary>
+        /// O626Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("O626Z.")]
+        O626Z = 22320,
+
+        /// <summary>
+        /// Odd Group.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Odd Group.")]
+        OddGroup = 22345,
+
+        /// <summary>
+        /// Odd Lot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Odd Lot.")]
+        OddLot = 22365,
+
+        /// <summary>
+        /// Odd Pair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Odd Pair.")]
+        OddPair = 22410,
+
+        /// <summary>
+        /// Oka.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Oka.")]
+        Oka = 22455,
+
+        /// <summary>
+        /// OKEAN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OKEAN.")]
+        OKEAN = 22500,
+
+        /// <summary>
+        /// OKINXE 12C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OKINXE 12C.")]
+        OKINXE12C = 22545,
+
+        /// <summary>
+        /// OMEGA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OMEGA.")]
+        OMEGA = 22590,
+
+        /// <summary>
+        /// Omera ORB32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Omera ORB32.")]
+        OmeraORB32 = 22635,
+
+        /// <summary>
+        /// One Eye.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("One Eye.")]
+        OneEye = 22680,
+
+        /// <summary>
+        /// OP-28.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OP-28.")]
+        OP28 = 22690,
+
+        /// <summary>
+        /// OPS-16B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OPS-16B.")]
+        OPS16B = 22725,
+
+        /// <summary>
+        /// OPS-18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OPS-18.")]
+        OPS18 = 22730,
+
+        /// <summary>
+        /// OPS-28.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OPS-28.")]
+        OPS28 = 22740,
+
+        /// <summary>
+        /// OR-2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OR-2.")]
+        OR2 = 22770,
+
+        /// <summary>
+        /// ORB-31S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ORB-31S.")]
+        ORB31S = 22810,
+
+        /// <summary>
+        /// ORB 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ORB 32.")]
+        ORB32 = 22815,
+
+        /// <summary>
+        /// Orion Rtn 10X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Orion Rtn 10X.")]
+        OrionRtn10X = 22860,
+
+        /// <summary>
+        /// Otomat MK II Teseo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Otomat MK II Teseo.")]
+        OtomatMKIITeseo = 22905,
+
+        /// <summary>
+        /// Owl Screech.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Owl Screech.")]
+        OwlScreech = 22950,
+
+        /// <summary>
+        /// P360Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("P360Z.")]
+        P360Z = 22955,
+
+        /// <summary>
+        /// PA-1660.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PA-1660.")]
+        PA1660 = 22960,
+
+        /// <summary>
+        /// Palm Frond.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Palm Frond.")]
+        PalmFrond = 22995,
+
+        /// <summary>
+        /// Palm Frond AB.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Palm Frond AB.")]
+        PalmFrondAB = 23040,
+
+        /// <summary>
+        /// Pat Hand TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pat Hand TT.")]
+        PatHandTT = 23085,
+
+        /// <summary>
+        /// Pat Hand MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pat Hand MG.")]
+        PatHandMG = 23095,
+
+        /// <summary>
+        /// Patty Cake.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Patty Cake.")]
+        PattyCake = 23130,
+
+        /// <summary>
+        /// Pawn Cake.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pawn Cake.")]
+        PawnCake = 23175,
+
+        /// <summary>
+        /// PBR 4 Rubin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PBR 4 Rubin.")]
+        PBR4Rubin = 23220,
+
+        /// <summary>
+        /// Pea Sticks.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pea Sticks.")]
+        PeaSticks = 23265,
+
+        /// <summary>
+        /// Peel Cone.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Peel Cone.")]
+        PeelCone = 23310,
+
+        /// <summary>
+        /// Peel Group.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Peel Group.")]
+        PeelGroup = 23355,
+
+        /// <summary>
+        /// Peel Group A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Peel Group A.")]
+        PeelGroupA = 23400,
+
+        /// <summary>
+        /// Peel Group B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Peel Group B.")]
+        PeelGroupB = 23445,
+
+        /// <summary>
+        /// Peel Pair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Peel Pair.")]
+        PeelPair = 23490,
+
+        /// <summary>
+        /// Philips 9LV 200.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Philips 9LV 200.")]
+        Philips9LV200 = 23535,
+
+        /// <summary>
+        /// Philips 9LV 331.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Philips 9LV 331.")]
+        Philips9LV331 = 23580,
+
+        /// <summary>
+        /// Philips LV 223.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Philips LV 223.")]
+        PhilipsLV223 = 23625,
+
+        /// <summary>
+        /// Philips Sea Giraffe 50 HC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Philips Sea Giraffe 50 HC.")]
+        PhilipsSeaGiraffe50HC = 23670,
+
+        /// <summary>
+        /// Pin Jib.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pin Jib.")]
+        PinJib = 23690,
+
+        /// <summary>
+        /// Plank Shad.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plank Shad.")]
+        PlankShad = 23710,
+
+        /// <summary>
+        /// Plank Shave.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plank Shave.")]
+        PlankShave = 23715,
+
+        /// <summary>
+        /// Plank Shave A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plank Shave A.")]
+        PlankShaveA = 23760,
+
+        /// <summary>
+        /// Plank Shave B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plank Shave B.")]
+        PlankShaveB = 23805,
+
+        /// <summary>
+        /// Plate Steer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plate Steer.")]
+        PlateSteer = 23850,
+
+        /// <summary>
+        /// Plessey AWS 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plessey AWS 1.")]
+        PlesseyAWS1 = 23895,
+
+        /// <summary>
+        /// Plessey AWS 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plessey AWS 4.")]
+        PlesseyAWS4 = 23940,
+
+        /// <summary>
+        /// Plessey AWS 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plessey AWS 6.")]
+        PlesseyAWS6 = 23985,
+
+        /// <summary>
+        /// Plessey RJ.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plessey RJ.")]
+        PlesseyRJ = 23990,
+
+        /// <summary>
+        /// Plessey type 996.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plessey type 996.")]
+        PlesseyType996 = 24030,
+
+        /// <summary>
+        /// Plinth Net.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plinth Net.")]
+        PlinthNet = 24075,
+
+        /// <summary>
+        /// Pluto.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pluto.")]
+        Pluto = 24095,
+
+        /// <summary>
+        /// POHJANPALO.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("POHJANPALO.")]
+        POHJANPALO = 24100,
+
+        /// <summary>
+        /// POLLUX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("POLLUX.")]
+        POLLUX = 24120,
+
+        /// <summary>
+        /// Pop Group.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pop Group.")]
+        PopGroup = 24165,
+
+        /// <summary>
+        /// Pop Group MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pop Group MG.")]
+        PopGroupMG = 24210,
+
+        /// <summary>
+        /// Pop Group TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pop Group TA.")]
+        PopGroupTA = 24255,
+
+        /// <summary>
+        /// Pop Group TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pop Group TT.")]
+        PopGroupTT = 24300,
+
+        /// <summary>
+        /// Pork Trough.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pork Trough.")]
+        PorkTrough = 24345,
+
+        /// <summary>
+        /// Post Bow.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Post Bow.")]
+        PostBow = 24390,
+
+        /// <summary>
+        /// Post Lamp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Post Lamp.")]
+        PostLamp = 24435,
+
+        /// <summary>
+        /// Pot Drum.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pot Drum.")]
+        PotDrum = 24480,
+
+        /// <summary>
+        /// Pot Head.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pot Head.")]
+        PotHead = 24525,
+
+        /// <summary>
+        /// PRIMUS 40 WXD.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PRIMUS 40 WXD.")]
+        PRIMUS40WXD = 24570,
+
+        /// <summary>
+        /// PRIMUS 300SL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PRIMUS 300SL.")]
+        PRIMUS300SL = 24615,
+
+        /// <summary>
+        /// Primus 3000.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primus 3000.")]
+        Primus3000 = 24620,
+
+        /// <summary>
+        /// PS-05A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PS-05A.")]
+        PS05A = 24650,
+
+        /// <summary>
+        /// PS 46 A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PS 46 A.")]
+        PS46A = 24660,
+
+        /// <summary>
+        /// PS 70 R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PS 70 R.")]
+        PS70R = 24705,
+
+        /// <summary>
+        /// PS-890.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PS-890.")]
+        PS890 = 24710,
+
+        /// <summary>
+        /// Puff Ball.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Puff Ball.")]
+        PuffBall = 24750,
+
+        /// <summary>
+        /// R-76.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("R-76.")]
+        R76 = 24770,
+
+        /// <summary>
+        /// RAC-30.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAC-30.")]
+        RAC30 = 24780,
+
+        /// <summary>
+        /// Racal 1229.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal 1229.")]
+        Racal1229 = 24795,
+
+        /// <summary>
+        /// Racal AC 2690 BT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal AC 2690 BT.")]
+        RacalAC2690BT = 24840,
+
+        /// <summary>
+        /// Racal Decca 1216.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal Decca 1216.")]
+        RacalDecca1216 = 24885,
+
+        /// <summary>
+        /// Racal Decca 360.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal Decca 360.")]
+        RacalDecca360 = 24930,
+
+        /// <summary>
+        /// Racal Decca AC 1290.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal Decca AC 1290.")]
+        RacalDeccaAC1290 = 24975,
+
+        /// <summary>
+        /// Racal Decca TM 1229.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal Decca TM 1229.")]
+        RacalDeccaTM1229 = 25020,
+
+        /// <summary>
+        /// Racal Decca TM 1626.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal Decca TM 1626.")]
+        RacalDeccaTM1626 = 25065,
+
+        /// <summary>
+        /// Racal DRBN 34A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Racal DRBN 34A.")]
+        RacalDRBN34A = 25110,
+
+        /// <summary>
+        /// Radar 24.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radar 24.")]
+        Radar24 = 25155,
+
+        /// <summary>
+        /// RAN 7S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAN 7S.")]
+        RAN7S = 25200,
+
+        /// <summary>
+        /// RAN 10S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAN 10S.")]
+        RAN10S = 25205,
+
+        /// <summary>
+        /// RAN 11 LX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAN 11 LX.")]
+        RAN11LX = 25245,
+
+        /// <summary>
+        /// Rapier TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rapier TA.")]
+        RapierTA = 25260,
+
+        /// <summary>
+        /// Dagger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dagger.")]
+        Dagger = 25265,
+
+        /// <summary>
+        /// Rapier MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rapier MG.")]
+        RapierMG = 25270,
+
+        /// <summary>
+        /// RAT-31S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAT-31S.")]
+        RAT31S = 25280,
+
+        /// <summary>
+        /// RATAC (LCT).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RATAC (LCT).")]
+        RATACLCT = 25285,
+
+        /// <summary>
+        /// Raytheon 1220.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon 1220.")]
+        Raytheon1220 = 25290,
+
+        /// <summary>
+        /// Raytheon 1302.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon 1302.")]
+        Raytheon1302 = 25300,
+
+        /// <summary>
+        /// Raytheon 1500.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon 1500.")]
+        Raytheon1500 = 25335,
+
+        /// <summary>
+        /// Raytheon 1645.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon 1645.")]
+        Raytheon1645 = 25380,
+
+        /// <summary>
+        /// Raytheon 1650.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon 1650.")]
+        Raytheon1650 = 25425,
+
+        /// <summary>
+        /// Raytheon 1900.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon 1900.")]
+        Raytheon1900 = 25470,
+
+        /// <summary>
+        /// Raytheon 2502.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon 2502.")]
+        Raytheon2502 = 25515,
+
+        /// <summary>
+        /// Raytheon TM 1650/6X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon TM 1650/6X.")]
+        RaytheonTM16506X = 25560,
+
+        /// <summary>
+        /// Raytheon TM 1660/12S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raytheon TM 1660/12S.")]
+        RaytheonTM166012S = 25605,
+
+        /// <summary>
+        /// RAY-1220XR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAY-1220XR.")]
+        RAY1220XR = 25630,
+
+        /// <summary>
+        /// RAY-1401.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAY-1401.")]
+        RAY1401 = 25635,
+
+        /// <summary>
+        /// Ray 2900.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ray 2900.")]
+        Ray2900 = 25650,
+
+        /// <summary>
+        /// Raypath.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Raypath.")]
+        Raypath = 25695,
+
+        /// <summary>
+        /// RBE2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RBE2.")]
+        RBE2 = 25735,
+
+        /// <summary>
+        /// RDM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDM.")]
+        RDM = 25740,
+
+        /// <summary>
+        /// RDY.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDY.")]
+        RDY = 25760,
+
+        /// <summary>
+        /// RDN 72.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDN 72.")]
+        RDN72 = 25785,
+
+        /// <summary>
+        /// RDR 1A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDR 1A.")]
+        RDR1A = 25830,
+
+        /// <summary>
+        /// RDR 1E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDR 1E.")]
+        RDR1E = 25835,
+
+        /// <summary>
+        /// RDR 4A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDR 4A.")]
+        RDR4A = 25840,
+
+        /// <summary>
+        /// RDR 1200.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDR 1200.")]
+        RDR1200 = 25875,
+
+        /// <summary>
+        /// RDR 1400.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDR 1400.")]
+        RDR1400 = 25885,
+
+        /// <summary>
+        /// RDR 1400 C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDR 1400 C.")]
+        RDR1400C = 25890,
+
+        /// <summary>
+        /// RDR 1500.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RDR 1500.")]
+        RDR1500 = 25895,
+
+        /// <summary>
+        /// Rice Lamp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rice Lamp.")]
+        RiceLamp = 25920,
+
+        /// <summary>
+        /// Rice Pad.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rice Pad.")]
+        RicePad = 25965,
+
+        /// <summary>
+        /// Rice Screen.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rice Screen.")]
+        RiceScreen = 26010,
+
+        /// <summary>
+        /// ROLAND BN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ROLAND BN.")]
+        ROLANDBN = 26055,
+
+        /// <summary>
+        /// ROLAND MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ROLAND MG.")]
+        ROLANDMG = 26100,
+
+        /// <summary>
+        /// ROLAND TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ROLAND TA.")]
+        ROLANDTA = 26145,
+
+        /// <summary>
+        /// ROLAND TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ROLAND TT.")]
+        ROLANDTT = 26190,
+
+        /// <summary>
+        /// Round Ball.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Round Ball.")]
+        RoundBall = 26235,
+
+        /// <summary>
+        /// Round House.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Round House.")]
+        RoundHouse = 26280,
+
+        /// <summary>
+        /// Round House B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Round House B.")]
+        RoundHouseB = 26325,
+
+        /// <summary>
+        /// RT-02/50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RT-02/50.")]
+        RT0250 = 26330,
+
+        /// <summary>
+        /// RTN-1A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RTN-1A.")]
+        RTN1A = 26350,
+
+        /// <summary>
+        /// RV2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV2.")]
+        RV2 = 26370,
+
+        /// <summary>
+        /// RV3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV3.")]
+        RV3 = 26415,
+
+        /// <summary>
+        /// RV5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV5.")]
+        RV5 = 26460,
+
+        /// <summary>
+        /// RV10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV10.")]
+        RV10 = 26505,
+
+        /// <summary>
+        /// RV17.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV17.")]
+        RV17 = 26550,
+
+        /// <summary>
+        /// RV18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV18.")]
+        RV18 = 26595,
+
+        /// <summary>
+        /// RV-377.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV-377.")]
+        RV377 = 26610,
+
+        /// <summary>
+        /// RV UM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RV UM.")]
+        RVUM = 26640,
+
+        /// <summary>
+        /// RXN 2-60.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RXN 2-60.")]
+        RXN260 = 26660,
+
+        /// <summary>
+        /// S-1810CD.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("S-1810CD.")]
+        S1810CD = 26670,
+
+        /// <summary>
+        /// SA 2 Guideline.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA 2 Guideline.")]
+        SA2Guideline = 26685,
+
+        /// <summary>
+        /// SA 3 Goa.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA 3 Goa.")]
+        SA3Goa = 26730,
+
+        /// <summary>
+        /// SA 8 Gecko DT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA 8 Gecko DT.")]
+        SA8GeckoDT = 26775,
+
+        /// <summary>
+        /// SA-12 TELAR ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA-12 TELAR ILL.")]
+        SA12TELARILL = 26795,
+
+        /// <summary>
+        /// SA N 7 Gadfly TI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA N 7 Gadfly TI.")]
+        SAN7GadflyTI = 26820,
+
+        /// <summary>
+        /// SA N 11 Cads 1 UN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA N 11 Cads 1 UN.")]
+        SAN11Cads1UN = 26865,
+
+        /// <summary>
+        /// Salt Pot A&amp;B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Salt Pot A&amp;B.")]
+        SaltPotAB = 26910,
+
+        /// <summary>
+        /// SATURNE II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SATURNE II.")]
+        SATURNEII = 26955,
+
+        /// <summary>
+        /// Scan Can.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scan Can.")]
+        ScanCan = 27000,
+
+        /// <summary>
+        /// Scan Fix.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scan Fix.")]
+        ScanFix = 27045,
+
+        /// <summary>
+        /// Scan Odd.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scan Odd.")]
+        ScanOdd = 27090,
+
+        /// <summary>
+        /// Scan Three.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scan Three.")]
+        ScanThree = 27135,
+
+        /// <summary>
+        /// SCANTER (CSR).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SCANTER (CSR).")]
+        SCANTERCSR = 27140,
+
+        /// <summary>
+        /// SCORADS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SCORADS.")]
+        SCORADS = 27141,
+
+        /// <summary>
+        /// SCOREBOARD.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SCOREBOARD.")]
+        SCOREBOARD = 27150,
+
+        /// <summary>
+        /// Scoup Plate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scoup Plate.")]
+        ScoupPlate = 27180,
+
+        /// <summary>
+        /// SCR-584.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SCR-584.")]
+        SCR584 = 27190,
+
+        /// <summary>
+        /// Sea Archer 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Archer 2.")]
+        SeaArcher2 = 27225,
+
+        /// <summary>
+        /// Sea Hunter 4 MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Hunter 4 MG.")]
+        SeaHunter4MG = 27270,
+
+        /// <summary>
+        /// Sea Hunter 4 TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Hunter 4 TA.")]
+        SeaHunter4TA = 27315,
+
+        /// <summary>
+        /// Sea Hunter 4 TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Hunter 4 TT.")]
+        SeaHunter4TT = 27360,
+
+        /// <summary>
+        /// Sea Gull.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Gull.")]
+        SeaGull = 27405,
+
+        /// <summary>
+        /// Sea Net.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Net.")]
+        SeaNet = 27450,
+
+        /// <summary>
+        /// Sea Spray.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Spray.")]
+        SeaSpray = 27495,
+
+        /// <summary>
+        /// Sea Tiger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea Tiger.")]
+        SeaTiger = 27540,
+
+        /// <summary>
+        /// Searchwater.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Searchwater.")]
+        Searchwater = 27570,
+
+        /// <summary>
+        /// Selenia Orion 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selenia Orion 7.")]
+        SeleniaOrion7 = 27585,
+
+        /// <summary>
+        /// Selenia type 912.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selenia type 912.")]
+        SeleniaType912 = 27630,
+
+        /// <summary>
+        /// Selennia RAN 12 L/X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selennia RAN 12 L/X.")]
+        SelenniaRAN12LX = 27675,
+
+        /// <summary>
+        /// Selennia RTN 10X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selennia RTN 10X.")]
+        SelenniaRTN10X = 27720,
+
+        /// <summary>
+        /// Selinia ARP 1645.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selinia ARP 1645.")]
+        SeliniaARP1645 = 27765,
+
+        /// <summary>
+        /// SGR 102 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SGR 102 00.")]
+        SGR10200 = 27810,
+
+        /// <summary>
+        /// SGR 103/02.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SGR 103/02.")]
+        SGR10302 = 27855,
+
+        /// <summary>
+        /// SGR-104.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SGR-104.")]
+        SGR104 = 27870,
+
+        /// <summary>
+        /// Sheet Bend.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sheet Bend.")]
+        SheetBend = 27900,
+
+        /// <summary>
+        /// Sheet Curve.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sheet Curve.")]
+        SheetCurve = 27945,
+
+        /// <summary>
+        /// Ship Globe.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship Globe.")]
+        ShipGlobe = 27990,
+
+        /// <summary>
+        /// Ship Wheel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship Wheel.")]
+        ShipWheel = 28035,
+
+        /// <summary>
+        /// SGR 114.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SGR 114.")]
+        SGR114 = 28080,
+
+        /// <summary>
+        /// Shore Walk A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Shore Walk A.")]
+        ShoreWalkA = 28125,
+
+        /// <summary>
+        /// Short Horn.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Short Horn.")]
+        ShortHorn = 28170,
+
+        /// <summary>
+        /// Shot Dome.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Shot Dome.")]
+        ShotDome = 28215,
+
+        /// <summary>
+        /// Side Globe JN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Side Globe JN.")]
+        SideGlobeJN = 28260,
+
+        /// <summary>
+        /// Side Net.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Side Net.")]
+        SideNet = 28280,
+
+        /// <summary>
+        /// Side Walk A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Side Walk A.")]
+        SideWalkA = 28305,
+
+        /// <summary>
+        /// Signaal DA 02.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal DA 02.")]
+        SignaalDA02 = 28350,
+
+        /// <summary>
+        /// Signaal DA 05.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal DA 05.")]
+        SignaalDA05 = 28395,
+
+        /// <summary>
+        /// Signaal DA 08.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal DA 08.")]
+        SignaalDA08 = 28440,
+
+        /// <summary>
+        /// Signaal LW 08.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal LW 08.")]
+        SignaalLW08 = 28485,
+
+        /// <summary>
+        /// Signaal LWOR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal LWOR.")]
+        SignaalLWOR = 28530,
+
+        /// <summary>
+        /// Signaal M45.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal M45.")]
+        SignaalM45 = 28575,
+
+        /// <summary>
+        /// Signaal MW 08.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal MW 08.")]
+        SignaalMW08 = 28620,
+
+        /// <summary>
+        /// Signaal SMART.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal SMART.")]
+        SignaalSMART = 28665,
+
+        /// <summary>
+        /// Signaal STING.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal STING.")]
+        SignaalSTING = 28710,
+
+        /// <summary>
+        /// Signaal STIR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal STIR.")]
+        SignaalSTIR = 28755,
+
+        /// <summary>
+        /// Signaal WM 20/2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal WM 20/2.")]
+        SignaalWM202 = 28800,
+
+        /// <summary>
+        /// Signaal WM 25.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal WM 25.")]
+        SignaalWM25 = 28845,
+
+        /// <summary>
+        /// Signaal WM 27.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal WM 27.")]
+        SignaalWM27 = 28890,
+
+        /// <summary>
+        /// Signaal WM 28.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal WM 28.")]
+        SignaalWM28 = 28935,
+
+        /// <summary>
+        /// Signaal ZW 01.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal ZW 01.")]
+        SignaalZW01 = 28980,
+
+        /// <summary>
+        /// Signaal ZW 06.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signaal ZW 06.")]
+        SignaalZW06 = 29025,
+
+        /// <summary>
+        /// Ski Pole.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ski Pole.")]
+        SkiPole = 29070,
+
+        /// <summary>
+        /// Skin Head.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Skin Head.")]
+        SkinHead = 29115,
+
+        /// <summary>
+        /// Skip Spin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Skip Spin.")]
+        SkipSpin = 29160,
+
+        /// <summary>
+        /// UAR-1021.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("UAR-1021.")]
+        UAR1021 = 29185,
+
+        /// <summary>
+        /// UAR-1021.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("UAR-1021.")]
+        UAR1021_29190 = 29190,
+
+        /// <summary>
+        /// Sky Watch.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sky Watch.")]
+        SkyWatch = 29205,
+
+        /// <summary>
+        /// SKYSHADOW.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SKYSHADOW.")]
+        SKYSHADOW = 29215,
+
+        /// <summary>
+        /// SKYSHIELD TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SKYSHIELD TA.")]
+        SKYSHIELDTA = 29220,
+
+        /// <summary>
+        /// SL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SL.")]
+        SL = 29250,
+
+        /// <summary>
+        /// SL/ALQ-234.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SL/ALQ-234.")]
+        SLALQ234 = 29270,
+
+        /// <summary>
+        /// Slap Shot E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Slap Shot E.")]
+        SlapShotE = 29295,
+
+        /// <summary>
+        /// Slim Net.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Slim Net.")]
+        SlimNet = 29340,
+
+        /// <summary>
+        /// Slot Back A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Slot Back A.")]
+        SlotBackA = 29385,
+
+        /// <summary>
+        /// Slot Back ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Slot Back ILL.")]
+        SlotBackILL = 29400,
+
+        /// <summary>
+        /// Slot Back B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Slot Back B.")]
+        SlotBackB = 29430,
+
+        /// <summary>
+        /// Slot Rest.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Slot Rest.")]
+        SlotRest = 29440,
+
+        /// <summary>
+        /// SMA 3 RM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA 3 RM.")]
+        SMA3RM = 29475,
+
+        /// <summary>
+        /// SMA 3 RM 20.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA 3 RM 20.")]
+        SMA3RM20 = 29520,
+
+        /// <summary>
+        /// SMA 3RM 20A/SMG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA 3RM 20A/SMG.")]
+        SMA3RM20ASMG = 29565,
+
+        /// <summary>
+        /// SMA BPS 704.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA BPS 704.")]
+        SMABPS704 = 29610,
+
+        /// <summary>
+        /// SMA SPIN 749 (V) 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPIN 749 (V) 2.")]
+        SMASPIN749V2 = 29655,
+
+        /// <summary>
+        /// SMA SPN 703.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPN 703.")]
+        SMASPN703 = 29700,
+
+        /// <summary>
+        /// SMA SPN 751.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPN 751.")]
+        SMASPN751 = 29745,
+
+        /// <summary>
+        /// SMA SPOS 748.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPOS 748.")]
+        SMASPOS748 = 29790,
+
+        /// <summary>
+        /// SMA SPQ 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPQ 2.")]
+        SMASPQ2 = 29835,
+
+        /// <summary>
+        /// SMA SPQ 2D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPQ 2D.")]
+        SMASPQ2D = 29880,
+
+        /// <summary>
+        /// SMA SPQ 701.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPQ 701.")]
+        SMASPQ701 = 29925,
+
+        /// <summary>
+        /// SMA SPS 702 UPX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA SPS 702 UPX.")]
+        SMASPS702UPX = 29970,
+
+        /// <summary>
+        /// SMA ST 2 OTOMAT II MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA ST 2 OTOMAT II MH.")]
+        SMAST2OTOMATIIMH = 30015,
+
+        /// <summary>
+        /// SMA 718 Beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMA 718 Beacon.")]
+        SMA718Beacon = 30060,
+
+        /// <summary>
+        /// SNAP SHOT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SNAP SHOT.")]
+        SNAPSHOT = 30080,
+
+        /// <summary>
+        /// Snoop Drift.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Drift.")]
+        SnoopDrift = 30105,
+
+        /// <summary>
+        /// Snoop Head.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Head.")]
+        SnoopHead = 30150,
+
+        /// <summary>
+        /// Snoop Pair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Pair.")]
+        SnoopPair = 30195,
+
+        /// <summary>
+        /// Snoop Plate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Plate.")]
+        SnoopPlate = 30240,
+
+        /// <summary>
+        /// Snoop Slab.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Slab.")]
+        SnoopSlab = 30285,
+
+        /// <summary>
+        /// Snoop Tray.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Tray.")]
+        SnoopTray = 30330,
+
+        /// <summary>
+        /// Snoop Tray 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Tray 1.")]
+        SnoopTray1 = 30375,
+
+        /// <summary>
+        /// Snoop Tray 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Tray 2.")]
+        SnoopTray2 = 30420,
+
+        /// <summary>
+        /// Snoop Watch.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snoop Watch.")]
+        SnoopWatch = 30465,
+
+        /// <summary>
+        /// Snow Drift.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Snow Drift.")]
+        SnowDrift = 30470,
+
+        /// <summary>
+        /// SO-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SO-1.")]
+        SO1 = 30510,
+
+        /// <summary>
+        /// SO-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SO-12.")]
+        SO12 = 30520,
+
+        /// <summary>
+        /// SO A Communist.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SO A Communist.")]
+        SOACommunist = 30555,
+
+        /// <summary>
+        /// SO-69.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SO-69.")]
+        SO69 = 30580,
+
+        /// <summary>
+        /// Sock Eye.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sock Eye.")]
+        SockEye = 30600,
+
+        /// <summary>
+        /// SOM 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SOM 64.")]
+        SOM64 = 30645,
+
+        /// <summary>
+        /// SPADA TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPADA TT.")]
+        SPADATT = 30670,
+
+        /// <summary>
+        /// Sparrow (AIM/RIM-7) ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sparrow (AIM/RIM-7) ILL.")]
+        SparrowAIMRIM7ILL = 30690,
+
+        /// <summary>
+        /// Sperry M-3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sperry M-3.")]
+        SperryM3 = 30700,
+
+        /// <summary>
+        /// SPG 53F.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPG 53F.")]
+        SPG53F = 30735,
+
+        /// <summary>
+        /// SPG 70 (RTN 10X).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPG 70 (RTN 10X).")]
+        SPG70RTN10X = 30780,
+
+        /// <summary>
+        /// SPG 74 (RTN 20X).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPG 74 (RTN 20X).")]
+        SPG74RTN20X = 30825,
+
+        /// <summary>
+        /// SPG 75 (RTN 30X).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPG 75 (RTN 30X).")]
+        SPG75RTN30X = 30870,
+
+        /// <summary>
+        /// SPG 76 (RTN 30X).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPG 76 (RTN 30X).")]
+        SPG76RTN30X = 30915,
+
+        /// <summary>
+        /// Spin Scan A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spin Scan A.")]
+        SpinScanA = 30960,
+
+        /// <summary>
+        /// Spin Scan B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spin Scan B.")]
+        SpinScanB = 31005,
+
+        /// <summary>
+        /// Spin Trough.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spin Trough.")]
+        SpinTrough = 31050,
+
+        /// <summary>
+        /// Splash Drop.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Splash Drop.")]
+        SplashDrop = 31095,
+
+        /// <summary>
+        /// SPN 35A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 35A.")]
+        SPN35A = 31140,
+
+        /// <summary>
+        /// SPN 41.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 41.")]
+        SPN41 = 31185,
+
+        /// <summary>
+        /// SPN 42.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 42.")]
+        SPN42 = 31230,
+
+        /// <summary>
+        /// SPN 43A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 43A.")]
+        SPN43A = 31275,
+
+        /// <summary>
+        /// SPN 43B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 43B.")]
+        SPN43B = 31320,
+
+        /// <summary>
+        /// SPN 44.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 44.")]
+        SPN44 = 31365,
+
+        /// <summary>
+        /// SPN 46.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 46.")]
+        SPN46 = 31410,
+
+        /// <summary>
+        /// SPN 703.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 703.")]
+        SPN703 = 31455,
+
+        /// <summary>
+        /// SPN 728 (V) 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 728 (V) 1.")]
+        SPN728V1 = 31500,
+
+        /// <summary>
+        /// SPN 748.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 748.")]
+        SPN748 = 31545,
+
+        /// <summary>
+        /// SPN 750.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPN 750.")]
+        SPN750 = 31590,
+
+        /// <summary>
+        /// Sponge Cake.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sponge Cake.")]
+        SpongeCake = 31635,
+
+        /// <summary>
+        /// Spoon Rest.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spoon Rest.")]
+        SpoonRest = 31680,
+
+        /// <summary>
+        /// Spoon Rest A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spoon Rest A.")]
+        SpoonRestA = 31681,
+
+        /// <summary>
+        /// Spoon Rest B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spoon Rest B.")]
+        SpoonRestB = 31682,
+
+        /// <summary>
+        /// Spoon Rest D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spoon Rest D.")]
+        SpoonRestD = 31684,
+
+        /// <summary>
+        /// SPQ 712 (RAN 12 L/X).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPQ 712 (RAN 12 L/X).")]
+        SPQ712RAN12LX = 31725,
+
+        /// <summary>
+        /// SPS 6C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS 6C.")]
+        SPS6C = 31770,
+
+        /// <summary>
+        /// SPS 10F.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS 10F.")]
+        SPS10F = 31815,
+
+        /// <summary>
+        /// SPS 12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS 12.")]
+        SPS12 = 31860,
+
+        /// <summary>
+        /// SPS 768 (RAN EL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS 768 (RAN EL).")]
+        SPS768RANEL = 31995,
+
+        /// <summary>
+        /// SPS 774 (RAN 10S).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS 774 (RAN 10S).")]
+        SPS774RAN10S = 32040,
+
+        /// <summary>
+        /// SPY 790.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPY 790.")]
+        SPY790 = 32085,
+
+        /// <summary>
+        /// Square Head.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Square Head.")]
+        SquareHead = 32130,
+
+        /// <summary>
+        /// Square Pair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Square Pair.")]
+        SquarePair = 32175,
+
+        /// <summary>
+        /// Square Slot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Square Slot.")]
+        SquareSlot = 32220,
+
+        /// <summary>
+        /// Square Tie.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Square Tie.")]
+        SquareTie = 32265,
+
+        /// <summary>
+        /// Squash Dome.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Squash Dome.")]
+        SquashDome = 32310,
+
+        /// <summary>
+        /// Squat Eye.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Squat Eye.")]
+        SquatEye = 32330,
+
+        /// <summary>
+        /// Squint Eye.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Squint Eye.")]
+        SquintEye = 32355,
+
+        /// <summary>
+        /// SRN 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SRN 6.")]
+        SRN6 = 32400,
+
+        /// <summary>
+        /// SRN 15.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SRN 15.")]
+        SRN15 = 32445,
+
+        /// <summary>
+        /// SRN 745.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SRN 745.")]
+        SRN745 = 32490,
+
+        /// <summary>
+        /// SRO 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SRO 1.")]
+        SRO1 = 32535,
+
+        /// <summary>
+        /// SRO 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SRO 2.")]
+        SRO2 = 32580,
+
+        /// <summary>
+        /// SS C 2B Samlet MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS C 2B Samlet MG.")]
+        SSC2BSamletMG = 32625,
+
+        /// <summary>
+        /// SS N 2A B CSSC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 2A B CSSC.")]
+        SSN2ABCSSC = 32670,
+
+        /// <summary>
+        /// SS N 2A B CSSC 2A 3A2 MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 2A B CSSC 2A 3A2 MH.")]
+        SSN2ABCSSC2A3A2MH = 32715,
+
+        /// <summary>
+        /// SS N 2C Seeker.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 2C Seeker.")]
+        SSN2CSeeker = 32760,
+
+        /// <summary>
+        /// SS N 2C D Styx.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 2C D Styx.")]
+        SSN2CDStyx = 32805,
+
+        /// <summary>
+        /// SS N 2C D Styx C D MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 2C D Styx C D MH.")]
+        SSN2CDStyxCDMH = 32850,
+
+        /// <summary>
+        /// SS N 3 SSC SS C 18 BN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 3 SSC SS C 18 BN.")]
+        SSN3SSCSSC18BN = 32895,
+
+        /// <summary>
+        /// SS N 3B Sepal AL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 3B Sepal AL.")]
+        SSN3BSepalAL = 32940,
+
+        /// <summary>
+        /// SS N 3B Sepal MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 3B Sepal MH.")]
+        SSN3BSepalMH = 32985,
+
+        /// <summary>
+        /// SS N 9 Siren.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 9 Siren.")]
+        SSN9Siren = 33030,
+
+        /// <summary>
+        /// SS N 9 Siren AL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 9 Siren AL.")]
+        SSN9SirenAL = 33075,
+
+        /// <summary>
+        /// SS N 9 Siren MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 9 Siren MH.")]
+        SSN9SirenMH = 33120,
+
+        /// <summary>
+        /// SS N 12 Sandbox AL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 12 Sandbox AL.")]
+        SSN12SandboxAL = 33165,
+
+        /// <summary>
+        /// SS N 12 Sandbox MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 12 Sandbox MH.")]
+        SSN12SandboxMH = 33210,
+
+        /// <summary>
+        /// SS N 19 Shipwreck.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 19 Shipwreck.")]
+        SSN19Shipwreck = 33255,
+
+        /// <summary>
+        /// SS N 19 Shipwreck AL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 19 Shipwreck AL.")]
+        SSN19ShipwreckAL = 33300,
+
+        /// <summary>
+        /// SS N 19 Shipwreck MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 19 Shipwreck MH.")]
+        SSN19ShipwreckMH = 33345,
+
+        /// <summary>
+        /// SS N 21 AL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 21 AL.")]
+        SSN21AL = 33390,
+
+        /// <summary>
+        /// SS N 22 Sunburn.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 22 Sunburn.")]
+        SSN22Sunburn = 33435,
+
+        /// <summary>
+        /// SS N 22 Sunburn MH.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS N 22 Sunburn MH.")]
+        SSN22SunburnMH = 33480,
+
+        /// <summary>
+        /// Stone Cake.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stone Cake.")]
+        StoneCake = 33525,
+
+        /// <summary>
+        /// STR 41.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("STR 41.")]
+        STR41 = 33570,
+
+        /// <summary>
+        /// Straight Flush TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Straight Flush TA.")]
+        StraightFlushTA = 33590,
+
+        /// <summary>
+        /// Straight Flush TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Straight Flush TT.")]
+        StraightFlushTT = 33595,
+
+        /// <summary>
+        /// Straight Flush ILL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Straight Flush ILL.")]
+        StraightFlushILL = 33600,
+
+        /// <summary>
+        /// Strike Out.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strike Out.")]
+        StrikeOut = 33615,
+
+        /// <summary>
+        /// Strut Curve.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strut Curve.")]
+        StrutCurve = 33660,
+
+        /// <summary>
+        /// Strut Pair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strut Pair.")]
+        StrutPair = 33705,
+
+        /// <summary>
+        /// Strut Pair 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strut Pair 1.")]
+        StrutPair1 = 33750,
+
+        /// <summary>
+        /// Strut Pair 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strut Pair 2.")]
+        StrutPair2 = 33795,
+
+        /// <summary>
+        /// Sun Visor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sun Visor.")]
+        SunVisor = 33840,
+
+        /// <summary>
+        /// Superfledermaus.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Superfledermaus.")]
+        Superfledermaus = 33860,
+
+        /// <summary>
+        /// Swift Rod 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Swift Rod 1.")]
+        SwiftRod1 = 33885,
+
+        /// <summary>
+        /// Swift Rod 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Swift Rod 2.")]
+        SwiftRod2 = 33930,
+
+        /// <summary>
+        /// T1166.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T1166.")]
+        T1166 = 33975,
+
+        /// <summary>
+        /// T1171.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T1171.")]
+        T1171 = 34020,
+
+        /// <summary>
+        /// T1202.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T1202.")]
+        T1202 = 34040,
+
+        /// <summary>
+        /// T6004.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T6004.")]
+        T6004 = 34065,
+
+        /// <summary>
+        /// T6031.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T6031.")]
+        T6031 = 34110,
+
+        /// <summary>
+        /// T8067.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8067.")]
+        T8067 = 34155,
+
+        /// <summary>
+        /// T8068.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8068.")]
+        T8068 = 34200,
+
+        /// <summary>
+        /// T8124.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8124.")]
+        T8124 = 34245,
+
+        /// <summary>
+        /// T8408.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8408.")]
+        T8408 = 34290,
+
+        /// <summary>
+        /// T8911.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8911.")]
+        T8911 = 34335,
+
+        /// <summary>
+        /// T8937.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8937.")]
+        T8937 = 34380,
+
+        /// <summary>
+        /// T8944.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8944.")]
+        T8944 = 34425,
+
+        /// <summary>
+        /// T8987.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("T8987.")]
+        T8987 = 34470,
+
+        /// <summary>
+        /// Tall King.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tall King.")]
+        TallKing = 34515,
+
+        /// <summary>
+        /// Tall Mike.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tall Mike.")]
+        TallMike = 34560,
+
+        /// <summary>
+        /// Tall Path.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tall Path.")]
+        TallPath = 34605,
+
+        /// <summary>
+        /// Team Work.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Team Work.")]
+        TeamWork = 34625,
+
+        /// <summary>
+        /// THAAD GBR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("THAAD GBR.")]
+        THAADGBR = 34640,
+
+        /// <summary>
+        /// THD 225.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("THD 225.")]
+        THD225 = 34650,
+
+        /// <summary>
+        /// Picador.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Picador.")]
+        Picador = 34670,
+
+        /// <summary>
+        /// THD 5500.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("THD 5500.")]
+        THD5500 = 34695,
+
+        /// <summary>
+        /// Thin Path.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thin Path.")]
+        ThinPath = 34740,
+
+        /// <summary>
+        /// Thin Skin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thin Skin.")]
+        ThinSkin = 34785,
+
+        /// <summary>
+        /// Thompson CSF TA-10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF TA-10.")]
+        ThompsonCSFTA10 = 34795,
+
+        /// <summary>
+        /// Thompson CSF TH D 1040 Neptune.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF TH D 1040 Neptune.")]
+        ThompsonCSFTHD1040Neptune = 34830,
+
+        /// <summary>
+        /// Thompson CSF Calypso.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF Calypso.")]
+        ThompsonCSFCalypso = 34875,
+
+        /// <summary>
+        /// Thompson CSF CASTOR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF CASTOR.")]
+        ThompsonCSFCASTOR = 34920,
+
+        /// <summary>
+        /// Thompson CSF Castor II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF Castor II.")]
+        ThompsonCSFCastorII = 34965,
+
+        /// <summary>
+        /// Thompson CSF DRBC 32A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF DRBC 32A.")]
+        ThompsonCSFDRBC32A = 35010,
+
+        /// <summary>
+        /// Thompson CSF DRBJ 11 D/E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF DRBJ 11 D/E.")]
+        ThompsonCSFDRBJ11DE = 35055,
+
+        /// <summary>
+        /// Thompson CSF DRBV 15A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF DRBV 15A.")]
+        ThompsonCSFDRBV15A = 35100,
+
+        /// <summary>
+        /// Thompson CSF DRBV 15C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF DRBV 15C.")]
+        ThompsonCSFDRBV15C = 35145,
+
+        /// <summary>
+        /// Thompson CSF DRBV 22D.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF DRBV 22D.")]
+        ThompsonCSFDRBV22D = 35190,
+
+        /// <summary>
+        /// Thompson CSF DRBV 23B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF DRBV 23B.")]
+        ThompsonCSFDRBV23B = 35235,
+
+        /// <summary>
+        /// Thompson CSF DRUA 33.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF DRUA 33.")]
+        ThompsonCSFDRUA33 = 35280,
+
+        /// <summary>
+        /// Thompson CSF Mars DRBV 21A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF Mars DRBV 21A.")]
+        ThompsonCSFMarsDRBV21A = 35325,
+
+        /// <summary>
+        /// Thompson CSF Sea Tiger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF Sea Tiger.")]
+        ThompsonCSFSeaTiger = 35370,
+
+        /// <summary>
+        /// Thompson CSF Triton.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF Triton.")]
+        ThompsonCSFTriton = 35415,
+
+        /// <summary>
+        /// Thompson CSF Vega with DRBC 32E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thompson CSF Vega with DRBC 32E.")]
+        ThompsonCSFVegaWithDRBC32E = 35460,
+
+        /// <summary>
+        /// TIGER-G.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TIGER-G.")]
+        TIGERG = 35480,
+
+        /// <summary>
+        /// TIGER-S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TIGER-S.")]
+        TIGERS = 35490,
+
+        /// <summary>
+        /// Tie Rods.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tie Rods.")]
+        TieRods = 35505,
+
+        /// <summary>
+        /// Tin Shield.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tin Shield.")]
+        TinShield = 35550,
+
+        /// <summary>
+        /// Tin Trap.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tin Trap.")]
+        TinTrap = 35570,
+
+        /// <summary>
+        /// TIRSPONDER.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TIRSPONDER.")]
+        TIRSPONDER = 35580,
+
+        /// <summary>
+        /// Toad Stool 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Toad Stool 1.")]
+        ToadStool1 = 35595,
+
+        /// <summary>
+        /// Toad Stool 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Toad Stool 2.")]
+        ToadStool2 = 35640,
+
+        /// <summary>
+        /// Toad Stool 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Toad Stool 3.")]
+        ToadStool3 = 35685,
+
+        /// <summary>
+        /// Toad Stool 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Toad Stool 4.")]
+        ToadStool4 = 35730,
+
+        /// <summary>
+        /// Toad Stool 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Toad Stool 5.")]
+        ToadStool5 = 35775,
+
+        /// <summary>
+        /// Tomb Stone.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tomb Stone.")]
+        TombStone = 35800,
+
+        /// <summary>
+        /// Top Bow.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Bow.")]
+        TopBow = 35820,
+
+        /// <summary>
+        /// Top Dome.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Dome.")]
+        TopDome = 35865,
+
+        /// <summary>
+        /// Top Knot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Knot.")]
+        TopKnot = 35910,
+
+        /// <summary>
+        /// Top Mesh.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Mesh.")]
+        TopMesh = 35955,
+
+        /// <summary>
+        /// Top Pair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Pair.")]
+        TopPair = 36000,
+
+        /// <summary>
+        /// Top Plate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Plate.")]
+        TopPlate = 36045,
+
+        /// <summary>
+        /// Top Sail.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Sail.")]
+        TopSail = 36090,
+
+        /// <summary>
+        /// Top Steer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Steer.")]
+        TopSteer = 36135,
+
+        /// <summary>
+        /// Top Trough.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Top Trough.")]
+        TopTrough = 36180,
+
+        /// <summary>
+        /// Scrum Half TA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scrum Half TA.")]
+        ScrumHalfTA = 36220,
+
+        /// <summary>
+        /// Tor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tor.")]
+        Tor = 36225,
+
+        /// <summary>
+        /// Scrum Half MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scrum Half MG.")]
+        ScrumHalfMG = 36230,
+
+        /// <summary>
+        /// Track Dish.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Track Dish.")]
+        TrackDish = 36270,
+
+        /// <summary>
+        /// TORSO M.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TORSO M.")]
+        TORSOM = 36315,
+
+        /// <summary>
+        /// Trap Door.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trap Door.")]
+        TrapDoor = 36360,
+
+        /// <summary>
+        /// TRISPONDE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TRISPONDE.")]
+        TRISPONDE = 36380,
+
+        /// <summary>
+        /// TRS 3033.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TRS 3033.")]
+        TRS3033 = 36405,
+
+        /// <summary>
+        /// TRS 3405.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TRS 3405.")]
+        TRS3405 = 36420,
+
+        /// <summary>
+        /// TRS 3410.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TRS 3410.")]
+        TRS3410 = 36425,
+
+        /// <summary>
+        /// TRS 3415.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TRS 3415.")]
+        TRS3415 = 36430,
+
+        /// <summary>
+        /// TRS-N.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TRS-N.")]
+        TRSN = 36450,
+
+        /// <summary>
+        /// TSE 5000.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TSE 5000.")]
+        TSE5000 = 36495,
+
+        /// <summary>
+        /// TSR 333.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TSR 333.")]
+        TSR333 = 36540,
+
+        /// <summary>
+        /// Tube Arm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tube Arm.")]
+        TubeArm = 36585,
+
+        /// <summary>
+        /// Twin Eyes.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Twin Eyes.")]
+        TwinEyes = 36630,
+
+        /// <summary>
+        /// Twin Pill.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Twin Pill.")]
+        TwinPill = 36675,
+
+        /// <summary>
+        /// Twin Scan.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Twin Scan.")]
+        TwinScan = 36720,
+
+        /// <summary>
+        /// Twin Scan Ro.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Twin Scan Ro.")]
+        TwinScanRo = 36765,
+
+        /// <summary>
+        /// Two Spot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Two Spot.")]
+        TwoSpot = 36810,
+
+        /// <summary>
+        /// TYPE 262.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 262.")]
+        TYPE262 = 36855,
+
+        /// <summary>
+        /// TYPE 275.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 275.")]
+        TYPE275 = 36900,
+
+        /// <summary>
+        /// TYPE 293.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 293.")]
+        TYPE293 = 36945,
+
+        /// <summary>
+        /// TYPE 343 SUN VISOR B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 343 SUN VISOR B.")]
+        TYPE343SUNVISORB = 36990,
+
+        /// <summary>
+        /// TYPE 347B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 347B.")]
+        TYPE347B = 37035,
+
+        /// <summary>
+        /// Type-404A(CH).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type-404A(CH).")]
+        Type404ACH = 37050,
+
+        /// <summary>
+        /// Type 756.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type 756.")]
+        Type756 = 37080,
+
+        /// <summary>
+        /// TYPE 903.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 903.")]
+        TYPE903 = 37125,
+
+        /// <summary>
+        /// TYPE 909 TI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 909 TI.")]
+        TYPE909TI = 37170,
+
+        /// <summary>
+        /// TYPE 909 TT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 909 TT.")]
+        TYPE909TT = 37215,
+
+        /// <summary>
+        /// TYPE 910.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 910.")]
+        TYPE910 = 37260,
+
+        /// <summary>
+        /// TYPE-931(CH).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE-931(CH).")]
+        TYPE931CH = 37265,
+
+        /// <summary>
+        /// TYPE 965.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 965.")]
+        TYPE965 = 37305,
+
+        /// <summary>
+        /// TYPE 967.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 967.")]
+        TYPE967 = 37350,
+
+        /// <summary>
+        /// TYPE 968.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 968.")]
+        TYPE968 = 37395,
+
+        /// <summary>
+        /// TYPE 974.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 974.")]
+        TYPE974 = 37440,
+
+        /// <summary>
+        /// TYPE 975.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 975.")]
+        TYPE975 = 37485,
+
+        /// <summary>
+        /// TYPE 978.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 978.")]
+        TYPE978 = 37530,
+
+        /// <summary>
+        /// TYPE 992.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 992.")]
+        TYPE992 = 37575,
+
+        /// <summary>
+        /// TYPE 993.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 993.")]
+        TYPE993 = 37620,
+
+        /// <summary>
+        /// TYPE 994.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 994.")]
+        TYPE994 = 37665,
+
+        /// <summary>
+        /// TYPE 1006(1).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 1006(1).")]
+        TYPE10061 = 37710,
+
+        /// <summary>
+        /// TYPE 1006(2).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 1006(2).")]
+        TYPE10062 = 37755,
+
+        /// <summary>
+        /// TYPE 1022.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TYPE 1022.")]
+        TYPE1022 = 37800,
+
+        /// <summary>
+        /// UK MK 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("UK MK 10.")]
+        UKMK10 = 37845,
+
+        /// <summary>
+        /// UPS-220C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("UPS-220C.")]
+        UPS220C = 37850,
+
+        /// <summary>
+        /// UPX 1 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("UPX 1 10.")]
+        UPX110 = 37890,
+
+        /// <summary>
+        /// UPX 27.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("UPX 27.")]
+        UPX27 = 37935,
+
+        /// <summary>
+        /// URN 20.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("URN 20.")]
+        URN20 = 37980,
+
+        /// <summary>
+        /// URN 25.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("URN 25.")]
+        URN25 = 38025,
+
+        /// <summary>
+        /// VOLEX III/IV.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("VOLEX III/IV.")]
+        VOLEXIIIIV = 38045,
+
+        /// <summary>
+        /// W8818.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("W8818.")]
+        W8818 = 38070,
+
+        /// <summary>
+        /// W8838.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("W8838.")]
+        W8838 = 38115,
+
+        /// <summary>
+        /// W8852.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("W8852.")]
+        W8852 = 38120,
+
+        /// <summary>
+        /// WAS-74S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WAS-74S.")]
+        WAS74S = 38160,
+
+        /// <summary>
+        /// Wasp Head.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wasp Head.")]
+        WaspHead = 38205,
+
+        /// <summary>
+        /// WATCHDOG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WATCHDOG.")]
+        WATCHDOG = 38210,
+
+        /// <summary>
+        /// Watch Guard.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Watch Guard.")]
+        WatchGuard = 38250,
+
+        /// <summary>
+        /// Watchman.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Watchman.")]
+        Watchman = 38260,
+
+        /// <summary>
+        /// Western Electric MK 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Western Electric MK 10.")]
+        WesternElectricMK10 = 38295,
+
+        /// <summary>
+        /// Westinghouse ADR-4 LRSR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Westinghouse ADR-4 LRSR.")]
+        WestinghouseADR4LRSR = 38320,
+
+        /// <summary>
+        /// Westinghouse Electric SPG 50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Westinghouse Electric SPG 50.")]
+        WestinghouseElectricSPG50 = 38340,
+
+        /// <summary>
+        /// Westinghouse Electric W 120.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Westinghouse Electric W 120.")]
+        WestinghouseElectricW120 = 38385,
+
+        /// <summary>
+        /// Westinghouse SPS 29C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Westinghouse SPS 29C.")]
+        WestinghouseSPS29C = 38430,
+
+        /// <summary>
+        /// Westinghouse SPS 37.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Westinghouse SPS 37.")]
+        WestinghouseSPS37 = 38475,
+
+        /// <summary>
+        /// Wet Eye.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wet Eye.")]
+        WetEye = 38520,
+
+        /// <summary>
+        /// Wet Eye Mod.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wet Eye Mod.")]
+        WetEyeMod = 38565,
+
+        /// <summary>
+        /// WGU-41/B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WGU-41/B.")]
+        WGU41B = 38570,
+
+        /// <summary>
+        /// WGU-44/B.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WGU-44/B.")]
+        WGU44B = 38572,
+
+        /// <summary>
+        /// Whiff.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Whiff.")]
+        Whiff = 38610,
+
+        /// <summary>
+        /// Whiff Brick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Whiff Brick.")]
+        WhiffBrick = 38655,
+
+        /// <summary>
+        /// Whiff Fire.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Whiff Fire.")]
+        WhiffFire = 38700,
+
+        /// <summary>
+        /// WHITE HOUSE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WHITE HOUSE.")]
+        WHITEHOUSE = 38715,
+
+        /// <summary>
+        /// Wild Card.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wild Card.")]
+        WildCard = 38745,
+
+        /// <summary>
+        /// Witch Eight.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Witch Eight.")]
+        WitchEight = 38790,
+
+        /// <summary>
+        /// Witch Five.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Witch Five.")]
+        WitchFive = 38835,
+
+        /// <summary>
+        /// WM2X Series.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WM2X Series.")]
+        WM2XSeries = 38880,
+
+        /// <summary>
+        /// WM2X Series CAS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WM2X Series CAS.")]
+        WM2XSeriesCAS = 38925,
+
+        /// <summary>
+        /// WSR-74C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WSR-74C.")]
+        WSR74C = 38950,
+
+        /// <summary>
+        /// WSR-74S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WSR-74S.")]
+        WSR74S = 38955,
+
+        /// <summary>
+        /// Wood Gage.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wood Gage.")]
+        WoodGage = 38970,
+
+        /// <summary>
+        /// Yard Rake.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Yard Rake.")]
+        YardRake = 39015,
+
+        /// <summary>
+        /// Yew Loop.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Yew Loop.")]
+        YewLoop = 39060,
+
+        /// <summary>
+        /// Yo-Yo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Yo-Yo.")]
+        YoYo = 39105
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/EmissionBeamFunction.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/EmissionBeamFunction.cs
index e01015a..eb775a6 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionBeamFunction.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/EmissionBeamFunction.cs
@@ -1,209 +1,209 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for EmissionBeamFunction (der.emission.beamfunction, Beam Function, 
-    /// section 8.1.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EmissionBeamFunction : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Search.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Search.")]
-        Search = 1,
-
-        /// <summary>
-        /// Height finder.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Height finder.")]
-        HeightFinder = 2,
-
-        /// <summary>
-        /// Acquisition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acquisition.")]
-        Acquisition = 3,
-
-        /// <summary>
-        /// Tracking.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tracking.")]
-        Tracking = 4,
-
-        /// <summary>
-        /// Acquisition and tracking.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acquisition and tracking.")]
-        AcquisitionAndTracking = 5,
-
-        /// <summary>
-        /// Command guidance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command guidance.")]
-        CommandGuidance = 6,
-
-        /// <summary>
-        /// Illumination.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Illumination.")]
-        Illumination = 7,
-
-        /// <summary>
-        /// Range only radar.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Range only radar.")]
-        RangeOnlyRadar = 8,
-
-        /// <summary>
-        /// Missile beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile beacon.")]
-        MissileBeacon = 9,
-
-        /// <summary>
-        /// Missile fuze.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile fuze.")]
-        MissileFuze = 10,
-
-        /// <summary>
-        /// Active radar missile seeker.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Active radar missile seeker.")]
-        ActiveRadarMissileSeeker = 11,
-
-        /// <summary>
-        /// Jammer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jammer.")]
-        Jammer = 12,
-
-        /// <summary>
-        /// IFF.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IFF.")]
-        IFF = 13,
-
-        /// <summary>
-        /// Navigational / Weather.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Navigational / Weather.")]
-        NavigationalWeather = 14,
-
-        /// <summary>
-        /// Meteorological.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Meteorological.")]
-        Meteorological = 15,
-
-        /// <summary>
-        /// Data transmission.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data transmission.")]
-        DataTransmission = 16,
-
-        /// <summary>
-        /// Navigational directional beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Navigational directional beacon.")]
-        NavigationalDirectionalBeacon = 17
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for EmissionBeamFunction (der.emission.beamfunction, Beam Function, 
+    /// section 8.1.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EmissionBeamFunction : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Search.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Search.")]
+        Search = 1,
+
+        /// <summary>
+        /// Height finder.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Height finder.")]
+        HeightFinder = 2,
+
+        /// <summary>
+        /// Acquisition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acquisition.")]
+        Acquisition = 3,
+
+        /// <summary>
+        /// Tracking.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tracking.")]
+        Tracking = 4,
+
+        /// <summary>
+        /// Acquisition and tracking.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acquisition and tracking.")]
+        AcquisitionAndTracking = 5,
+
+        /// <summary>
+        /// Command guidance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command guidance.")]
+        CommandGuidance = 6,
+
+        /// <summary>
+        /// Illumination.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Illumination.")]
+        Illumination = 7,
+
+        /// <summary>
+        /// Range only radar.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Range only radar.")]
+        RangeOnlyRadar = 8,
+
+        /// <summary>
+        /// Missile beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile beacon.")]
+        MissileBeacon = 9,
+
+        /// <summary>
+        /// Missile fuze.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile fuze.")]
+        MissileFuze = 10,
+
+        /// <summary>
+        /// Active radar missile seeker.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Active radar missile seeker.")]
+        ActiveRadarMissileSeeker = 11,
+
+        /// <summary>
+        /// Jammer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jammer.")]
+        Jammer = 12,
+
+        /// <summary>
+        /// IFF.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IFF.")]
+        IFF = 13,
+
+        /// <summary>
+        /// Navigational / Weather.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Navigational / Weather.")]
+        NavigationalWeather = 14,
+
+        /// <summary>
+        /// Meteorological.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Meteorological.")]
+        Meteorological = 15,
+
+        /// <summary>
+        /// Data transmission.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data transmission.")]
+        DataTransmission = 16,
+
+        /// <summary>
+        /// Navigational directional beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Navigational directional beacon.")]
+        NavigationalDirectionalBeacon = 17
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/EmissionFunction.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/EmissionFunction.cs
index e4587cf..23eff3c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/EmissionFunction.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/EmissionFunction.cs
@@ -1,709 +1,709 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for EmissionFunction (der.emission.function, Function, 
-    /// section 8.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EmissionFunction : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Multi-function.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multi-function.")]
-        MultiFunction = 1,
-
-        /// <summary>
-        /// Early Warning/Surveillance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Early Warning/Surveillance.")]
-        EarlyWarningSurveillance = 2,
-
-        /// <summary>
-        /// Height Finding.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Height Finding.")]
-        HeightFinding = 3,
-
-        /// <summary>
-        /// Fire Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Control.")]
-        FireControl = 4,
-
-        /// <summary>
-        /// Acquisition/Detection.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acquisition/Detection.")]
-        AcquisitionDetection = 5,
-
-        /// <summary>
-        /// Tracking.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tracking.")]
-        Tracking = 6,
-
-        /// <summary>
-        /// Guidance/Illumination.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guidance/Illumination.")]
-        GuidanceIllumination = 7,
-
-        /// <summary>
-        /// Firing point/launch point location.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Firing point/launch point location.")]
-        FiringPointLaunchPointLocation = 8,
-
-        /// <summary>
-        /// Ranging.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ranging.")]
-        Ranging = 9,
-
-        /// <summary>
-        /// Radar Altimeter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radar Altimeter.")]
-        RadarAltimeter = 10,
-
-        /// <summary>
-        /// Imaging.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Imaging.")]
-        Imaging = 11,
-
-        /// <summary>
-        /// Motion Detection.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Motion Detection.")]
-        MotionDetection = 12,
-
-        /// <summary>
-        /// Navigation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Navigation.")]
-        Navigation = 13,
-
-        /// <summary>
-        /// Weather / Meterological.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weather / Meterological.")]
-        WeatherMeterological = 14,
-
-        /// <summary>
-        /// Instrumentation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Instrumentation.")]
-        Instrumentation = 15,
-
-        /// <summary>
-        /// Identification/Classification (including IFF).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identification/Classification (including IFF).")]
-        IdentificationClassificationIncludingIFF = 16,
-
-        /// <summary>
-        /// AAA (Anti-Aircraft Artillery) Fire Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AAA (Anti-Aircraft Artillery) Fire Control.")]
-        AAAAntiAircraftArtilleryFireControl = 17,
-
-        /// <summary>
-        /// Air Search/Bomb.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Search/Bomb.")]
-        AirSearchBomb = 18,
-
-        /// <summary>
-        /// Air Intercept.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Intercept.")]
-        AirIntercept = 19,
-
-        /// <summary>
-        /// Altimeter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altimeter.")]
-        Altimeter = 20,
-
-        /// <summary>
-        /// Air Mapping.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Mapping.")]
-        AirMapping = 21,
-
-        /// <summary>
-        /// Air Traffic Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Traffic Control.")]
-        AirTrafficControl = 22,
-
-        /// <summary>
-        /// Beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Beacon.")]
-        Beacon = 23,
-
-        /// <summary>
-        /// Battlefield Surveillance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Battlefield Surveillance.")]
-        BattlefieldSurveillance = 24,
-
-        /// <summary>
-        /// Ground Control Approach.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ground Control Approach.")]
-        GroundControlApproach = 25,
-
-        /// <summary>
-        /// Ground Control Intercept.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ground Control Intercept.")]
-        GroundControlIntercept = 26,
-
-        /// <summary>
-        /// Coastal Surveillance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Coastal Surveillance.")]
-        CoastalSurveillance = 27,
-
-        /// <summary>
-        /// Decoy/Mimic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Decoy/Mimic.")]
-        DecoyMimic = 28,
-
-        /// <summary>
-        /// Data Transmission.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data Transmission.")]
-        DataTransmission = 29,
-
-        /// <summary>
-        /// Earth Surveillance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Earth Surveillance.")]
-        EarthSurveillance = 30,
-
-        /// <summary>
-        /// Gun Lay Beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gun Lay Beacon.")]
-        GunLayBeacon = 31,
-
-        /// <summary>
-        /// Ground Mapping.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ground Mapping.")]
-        GroundMapping = 32,
-
-        /// <summary>
-        /// Harbor Surveillance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Harbor Surveillance.")]
-        HarborSurveillance = 33,
-
-        /// <summary>
-        /// ILS (Instrument Landing System).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ILS (Instrument Landing System).")]
-        ILSInstrumentLandingSystem = 35,
-
-        /// <summary>
-        /// Ionospheric Sound.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ionospheric Sound.")]
-        IonosphericSound = 36,
-
-        /// <summary>
-        /// Interrogator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Interrogator.")]
-        Interrogator = 37,
-
-        /// <summary>
-        /// Barrage Jamming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Barrage Jamming.")]
-        BarrageJamming = 38,
-
-        /// <summary>
-        /// Click Jamming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Click Jamming.")]
-        ClickJamming = 39,
-
-        /// <summary>
-        /// Frequency Swept Jamming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Frequency Swept Jamming.")]
-        FrequencySweptJamming = 41,
-
-        /// <summary>
-        /// Jamming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jamming.")]
-        Jamming = 42,
-
-        /// <summary>
-        /// Pulsed Jamming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pulsed Jamming.")]
-        PulsedJamming = 44,
-
-        /// <summary>
-        /// Repeater Jamming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Repeater Jamming.")]
-        RepeaterJamming = 45,
-
-        /// <summary>
-        /// Spot Noise Jamming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spot Noise Jamming.")]
-        SpotNoiseJamming = 46,
-
-        /// <summary>
-        /// Missile Acquisition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile Acquisition.")]
-        MissileAcquisition = 47,
-
-        /// <summary>
-        /// Missile Downlink.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile Downlink.")]
-        MissileDownlink = 48,
-
-        /// <summary>
-        /// Space.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Space.")]
-        Space = 50,
-
-        /// <summary>
-        /// Surface Search.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Surface Search.")]
-        SurfaceSearch = 51,
-
-        /// <summary>
-        /// Shell Tracking.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Shell Tracking.")]
-        ShellTracking = 52,
-
-        /// <summary>
-        /// Television.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Television.")]
-        Television = 56,
-
-        /// <summary>
-        /// Unknown.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unknown.")]
-        Unknown = 57,
-
-        /// <summary>
-        /// Video Remoting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Video Remoting.")]
-        VideoRemoting = 58,
-
-        /// <summary>
-        /// Experimental or Training.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Experimental or Training.")]
-        ExperimentalOrTraining = 59,
-
-        /// <summary>
-        /// Missile Guidance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile Guidance.")]
-        MissileGuidance = 60,
-
-        /// <summary>
-        /// Missile Homing.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile Homing.")]
-        MissileHoming = 61,
-
-        /// <summary>
-        /// Missile Tracking.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile Tracking.")]
-        MissileTracking = 62,
-
-        /// <summary>
-        /// Jamming, noise.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jamming, noise.")]
-        JammingNoise = 64,
-
-        /// <summary>
-        /// Jamming, deception.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jamming, deception.")]
-        JammingDeception = 65,
-
-        /// <summary>
-        /// Navigation/Distance Measuring Equipment.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Navigation/Distance Measuring Equipment.")]
-        NavigationDistanceMeasuringEquipment = 71,
-
-        /// <summary>
-        /// Terrain Following.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Terrain Following.")]
-        TerrainFollowing = 72,
-
-        /// <summary>
-        /// Weather Avoidance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weather Avoidance.")]
-        WeatherAvoidance = 73,
-
-        /// <summary>
-        /// Proximity Fuse.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity Fuse.")]
-        ProximityFuse = 74,
-
-        /// <summary>
-        /// Radiosonde.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radiosonde.")]
-        Radiosonde = 76,
-
-        /// <summary>
-        /// Sonobuoy.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sonobuoy.")]
-        Sonobuoy = 77,
-
-        /// <summary>
-        /// Bathythermal Sensor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bathythermal Sensor.")]
-        BathythermalSensor = 78,
-
-        /// <summary>
-        /// Towed Counter Measure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Towed Counter Measure.")]
-        TowedCounterMeasure = 79,
-
-        /// <summary>
-        /// Weapon, non-lethal.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon, non-lethal.")]
-        WeaponNonLethal = 96,
-
-        /// <summary>
-        /// Weapon, lethal.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon, lethal.")]
-        WeaponLethal = 97
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for EmissionFunction (der.emission.function, Function, 
+    /// section 8.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EmissionFunction : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Multi-function.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multi-function.")]
+        MultiFunction = 1,
+
+        /// <summary>
+        /// Early Warning/Surveillance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Early Warning/Surveillance.")]
+        EarlyWarningSurveillance = 2,
+
+        /// <summary>
+        /// Height Finding.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Height Finding.")]
+        HeightFinding = 3,
+
+        /// <summary>
+        /// Fire Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Control.")]
+        FireControl = 4,
+
+        /// <summary>
+        /// Acquisition/Detection.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acquisition/Detection.")]
+        AcquisitionDetection = 5,
+
+        /// <summary>
+        /// Tracking.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tracking.")]
+        Tracking = 6,
+
+        /// <summary>
+        /// Guidance/Illumination.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guidance/Illumination.")]
+        GuidanceIllumination = 7,
+
+        /// <summary>
+        /// Firing point/launch point location.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Firing point/launch point location.")]
+        FiringPointLaunchPointLocation = 8,
+
+        /// <summary>
+        /// Ranging.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ranging.")]
+        Ranging = 9,
+
+        /// <summary>
+        /// Radar Altimeter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radar Altimeter.")]
+        RadarAltimeter = 10,
+
+        /// <summary>
+        /// Imaging.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Imaging.")]
+        Imaging = 11,
+
+        /// <summary>
+        /// Motion Detection.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Motion Detection.")]
+        MotionDetection = 12,
+
+        /// <summary>
+        /// Navigation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Navigation.")]
+        Navigation = 13,
+
+        /// <summary>
+        /// Weather / Meterological.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weather / Meterological.")]
+        WeatherMeterological = 14,
+
+        /// <summary>
+        /// Instrumentation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Instrumentation.")]
+        Instrumentation = 15,
+
+        /// <summary>
+        /// Identification/Classification (including IFF).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identification/Classification (including IFF).")]
+        IdentificationClassificationIncludingIFF = 16,
+
+        /// <summary>
+        /// AAA (Anti-Aircraft Artillery) Fire Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AAA (Anti-Aircraft Artillery) Fire Control.")]
+        AAAAntiAircraftArtilleryFireControl = 17,
+
+        /// <summary>
+        /// Air Search/Bomb.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Search/Bomb.")]
+        AirSearchBomb = 18,
+
+        /// <summary>
+        /// Air Intercept.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Intercept.")]
+        AirIntercept = 19,
+
+        /// <summary>
+        /// Altimeter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altimeter.")]
+        Altimeter = 20,
+
+        /// <summary>
+        /// Air Mapping.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Mapping.")]
+        AirMapping = 21,
+
+        /// <summary>
+        /// Air Traffic Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Traffic Control.")]
+        AirTrafficControl = 22,
+
+        /// <summary>
+        /// Beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Beacon.")]
+        Beacon = 23,
+
+        /// <summary>
+        /// Battlefield Surveillance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Battlefield Surveillance.")]
+        BattlefieldSurveillance = 24,
+
+        /// <summary>
+        /// Ground Control Approach.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ground Control Approach.")]
+        GroundControlApproach = 25,
+
+        /// <summary>
+        /// Ground Control Intercept.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ground Control Intercept.")]
+        GroundControlIntercept = 26,
+
+        /// <summary>
+        /// Coastal Surveillance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Coastal Surveillance.")]
+        CoastalSurveillance = 27,
+
+        /// <summary>
+        /// Decoy/Mimic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Decoy/Mimic.")]
+        DecoyMimic = 28,
+
+        /// <summary>
+        /// Data Transmission.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data Transmission.")]
+        DataTransmission = 29,
+
+        /// <summary>
+        /// Earth Surveillance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Earth Surveillance.")]
+        EarthSurveillance = 30,
+
+        /// <summary>
+        /// Gun Lay Beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gun Lay Beacon.")]
+        GunLayBeacon = 31,
+
+        /// <summary>
+        /// Ground Mapping.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ground Mapping.")]
+        GroundMapping = 32,
+
+        /// <summary>
+        /// Harbor Surveillance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Harbor Surveillance.")]
+        HarborSurveillance = 33,
+
+        /// <summary>
+        /// ILS (Instrument Landing System).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ILS (Instrument Landing System).")]
+        ILSInstrumentLandingSystem = 35,
+
+        /// <summary>
+        /// Ionospheric Sound.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ionospheric Sound.")]
+        IonosphericSound = 36,
+
+        /// <summary>
+        /// Interrogator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Interrogator.")]
+        Interrogator = 37,
+
+        /// <summary>
+        /// Barrage Jamming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Barrage Jamming.")]
+        BarrageJamming = 38,
+
+        /// <summary>
+        /// Click Jamming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Click Jamming.")]
+        ClickJamming = 39,
+
+        /// <summary>
+        /// Frequency Swept Jamming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Frequency Swept Jamming.")]
+        FrequencySweptJamming = 41,
+
+        /// <summary>
+        /// Jamming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jamming.")]
+        Jamming = 42,
+
+        /// <summary>
+        /// Pulsed Jamming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pulsed Jamming.")]
+        PulsedJamming = 44,
+
+        /// <summary>
+        /// Repeater Jamming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Repeater Jamming.")]
+        RepeaterJamming = 45,
+
+        /// <summary>
+        /// Spot Noise Jamming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spot Noise Jamming.")]
+        SpotNoiseJamming = 46,
+
+        /// <summary>
+        /// Missile Acquisition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile Acquisition.")]
+        MissileAcquisition = 47,
+
+        /// <summary>
+        /// Missile Downlink.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile Downlink.")]
+        MissileDownlink = 48,
+
+        /// <summary>
+        /// Space.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Space.")]
+        Space = 50,
+
+        /// <summary>
+        /// Surface Search.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Surface Search.")]
+        SurfaceSearch = 51,
+
+        /// <summary>
+        /// Shell Tracking.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Shell Tracking.")]
+        ShellTracking = 52,
+
+        /// <summary>
+        /// Television.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Television.")]
+        Television = 56,
+
+        /// <summary>
+        /// Unknown.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unknown.")]
+        Unknown = 57,
+
+        /// <summary>
+        /// Video Remoting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Video Remoting.")]
+        VideoRemoting = 58,
+
+        /// <summary>
+        /// Experimental or Training.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Experimental or Training.")]
+        ExperimentalOrTraining = 59,
+
+        /// <summary>
+        /// Missile Guidance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile Guidance.")]
+        MissileGuidance = 60,
+
+        /// <summary>
+        /// Missile Homing.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile Homing.")]
+        MissileHoming = 61,
+
+        /// <summary>
+        /// Missile Tracking.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile Tracking.")]
+        MissileTracking = 62,
+
+        /// <summary>
+        /// Jamming, noise.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jamming, noise.")]
+        JammingNoise = 64,
+
+        /// <summary>
+        /// Jamming, deception.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jamming, deception.")]
+        JammingDeception = 65,
+
+        /// <summary>
+        /// Navigation/Distance Measuring Equipment.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Navigation/Distance Measuring Equipment.")]
+        NavigationDistanceMeasuringEquipment = 71,
+
+        /// <summary>
+        /// Terrain Following.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Terrain Following.")]
+        TerrainFollowing = 72,
+
+        /// <summary>
+        /// Weather Avoidance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weather Avoidance.")]
+        WeatherAvoidance = 73,
+
+        /// <summary>
+        /// Proximity Fuse.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity Fuse.")]
+        ProximityFuse = 74,
+
+        /// <summary>
+        /// Radiosonde.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radiosonde.")]
+        Radiosonde = 76,
+
+        /// <summary>
+        /// Sonobuoy.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sonobuoy.")]
+        Sonobuoy = 77,
+
+        /// <summary>
+        /// Bathythermal Sensor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bathythermal Sensor.")]
+        BathythermalSensor = 78,
+
+        /// <summary>
+        /// Towed Counter Measure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Towed Counter Measure.")]
+        TowedCounterMeasure = 79,
+
+        /// <summary>
+        /// Weapon, non-lethal.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon, non-lethal.")]
+        WeaponNonLethal = 96,
+
+        /// <summary>
+        /// Weapon, lethal.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon, lethal.")]
+        WeaponLethal = 97
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/HelicopterEnginePower.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/HelicopterEnginePower.cs
index 27dec51..d484997 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HelicopterEnginePower.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/HelicopterEnginePower.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for HelicopterEnginePower (der.sees.power.helicopters, Helicopters, 
-    /// section 8.5.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum HelicopterEnginePower : int
-    {
-        /// <summary>
-        /// Engine Off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Engine Off.")]
-        EngineOff = -100,
-
-        /// <summary>
-        /// Idle Power.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Idle Power.")]
-        IdlePower = 0,
-
-        /// <summary>
-        /// Max. Power.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Max. Power.")]
-        MaxPower = 100
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for HelicopterEnginePower (der.sees.power.helicopters, Helicopters, 
+    /// section 8.5.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum HelicopterEnginePower : int
+    {
+        /// <summary>
+        /// Engine Off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Engine Off.")]
+        EngineOff = -100,
+
+        /// <summary>
+        /// Idle Power.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Idle Power.")]
+        IdlePower = 0,
+
+        /// <summary>
+        /// Max. Power.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Max. Power.")]
+        MaxPower = 100
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
index 9c9ad29..b4caa22 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/HighDensityTrackOrJam.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for HighDensityTrackOrJam (der.emission.hdtj, High Density Track/Jam, 
-    /// section 8.1.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum HighDensityTrackOrJam : byte
-    {
-        /// <summary>
-        /// Not Selected.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Not Selected.")]
-        NotSelected = 0,
-
-        /// <summary>
-        /// Selected.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selected.")]
-        Selected = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for HighDensityTrackOrJam (der.emission.hdtj, High Density Track/Jam, 
+    /// section 8.1.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum HighDensityTrackOrJam : byte
+    {
+        /// <summary>
+        /// Not Selected.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Not Selected.")]
+        NotSelected = 0,
+
+        /// <summary>
+        /// Selected.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selected.")]
+        Selected = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/StateUpdateIndicator.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/StateUpdateIndicator.cs
index 3585856..474dabf 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/StateUpdateIndicator.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/StateUpdateIndicator.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for StateUpdateIndicator (der.emission.stateupdate, State Update Indicator, 
-    /// section 8.1.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum StateUpdateIndicator : byte
-    {
-        /// <summary>
-        /// State Update.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("State Update.")]
-        StateUpdate = 0,
-
-        /// <summary>
-        /// Changed Data Update.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Changed Data Update.")]
-        ChangedDataUpdate = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for StateUpdateIndicator (der.emission.stateupdate, State Update Indicator, 
+    /// section 8.1.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum StateUpdateIndicator : byte
+    {
+        /// <summary>
+        /// State Update.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("State Update.")]
+        StateUpdate = 0,
+
+        /// <summary>
+        /// Changed Data Update.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Changed Data Update.")]
+        ChangedDataUpdate = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs b/Libs/CsharpDis6/Enumerations/DistributedEmission/TankEnginePower.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs
rename to Libs/CsharpDis6/Enumerations/DistributedEmission/TankEnginePower.cs
index 850a954..70f8645 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/DistributedEmission/TankEnginePower.cs
+++ b/Libs/CsharpDis6/Enumerations/DistributedEmission/TankEnginePower.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.DistributedEmission
-{
-    /// <summary>
-    /// Enumeration values for TankEnginePower (der.sees.power.tanks, Tanks, 
-    /// section 8.5.1.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum TankEnginePower : int
-    {
-        /// <summary>
-        /// Engine Off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Engine Off.")]
-        EngineOff = -100,
-
-        /// <summary>
-        /// Idle Power.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Idle Power.")]
-        IdlePower = 0,
-
-        /// <summary>
-        /// Max. Power.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Max. Power.")]
-        MaxPower = 100
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.DistributedEmission
+{
+    /// <summary>
+    /// Enumeration values for TankEnginePower (der.sees.power.tanks, Tanks, 
+    /// section 8.5.1.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum TankEnginePower : int
+    {
+        /// <summary>
+        /// Engine Off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Engine Off.")]
+        EngineOff = -100,
+
+        /// <summary>
+        /// Idle Power.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Idle Power.")]
+        IdlePower = 0,
+
+        /// <summary>
+        /// Max. Power.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Max. Power.")]
+        MaxPower = 100
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/Appearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/Appearance.cs
index 1f01a66..a753b7f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Appearance.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/Appearance.cs
@@ -1,373 +1,373 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for Appearance (entity.mine.appear, Appearance Bit Map, 
-    /// section 10.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Appearance
-    {
-        /// <summary>
-        /// Identifies the type of minefield
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identifies the type of minefield")]
-        public enum MinefieldTypeValue : uint
-        {
-            /// <summary>
-            /// Mixed anti-personnel and anti-tank minefield
-            /// </summary>
-            MixedAntiPersonnelAndAntiTankMinefield = 0,
-
-            /// <summary>
-            /// Pure anti-personnel minefield
-            /// </summary>
-            PureAntiPersonnelMinefield = 1,
-
-            /// <summary>
-            /// Pure anti-tank minefield
-            /// </summary>
-            PureAntiTankMinefield = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        /// <summary>
-        /// Identifies the active status of the minefield
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identifies the active status of the minefield")]
-        public enum ActiveStatusValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Inactive
-            /// </summary>
-            Inactive = 1
-        }
-
-        /// <summary>
-        /// Identifies whether the minefield has an active lane
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identifies whether the minefield has an active lane")]
-        public enum LaneValue : uint
-        {
-            /// <summary>
-            /// Minefield has active lane
-            /// </summary>
-            MinefieldHasActiveLane = 0,
-
-            /// <summary>
-            /// Minefield has an inactive lane
-            /// </summary>
-            MinefieldHasAnInactiveLane = 1
-        }
-
-        /// <summary>
-        /// Describes the state of the minefield
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of the minefield")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        private Appearance.MinefieldTypeValue minefieldType;
-        private Appearance.ActiveStatusValue activeStatus;
-        private Appearance.LaneValue lane;
-        private Appearance.StateValue state;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Appearance left, Appearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Appearance left, Appearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Appearance obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Appearance(ushort value)
-        {
-            return Appearance.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Appearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance, represented by the ushort value.</returns>
-        public static Appearance FromUInt16(ushort value)
-        {
-            Appearance ps = new Appearance();
-
-            uint mask0 = 0x0003;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.MinefieldType = (Appearance.MinefieldTypeValue)newValue0;
-
-            uint mask1 = 0x0004;
-            byte shift1 = 2;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.ActiveStatus = (Appearance.ActiveStatusValue)newValue1;
-
-            uint mask2 = 0x0008;
-            byte shift2 = 3;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Lane = (Appearance.LaneValue)newValue2;
-
-            uint mask4 = 0x2000;
-            byte shift4 = 13;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.State = (Appearance.StateValue)newValue4;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the minefieldtype.
-        /// </summary>
-        /// <value>The minefieldtype.</value>
-        public Appearance.MinefieldTypeValue MinefieldType
-        {
-            get { return this.minefieldType; }
-            set { this.minefieldType = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the activestatus.
-        /// </summary>
-        /// <value>The activestatus.</value>
-        public Appearance.ActiveStatusValue ActiveStatus
-        {
-            get { return this.activeStatus; }
-            set { this.activeStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the lane.
-        /// </summary>
-        /// <value>The lane.</value>
-        public Appearance.LaneValue Lane
-        {
-            get { return this.lane; }
-            set { this.lane = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public Appearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Appearance))
-            {
-                return false;
-            }
-
-            return this.Equals((Appearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Appearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.MinefieldType == other.MinefieldType &&
-                this.ActiveStatus == other.ActiveStatus &&
-                this.Lane == other.Lane &&
-                this.State == other.State;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.MinefieldType << 0);
-            val |= (ushort)((uint)this.ActiveStatus << 2);
-            val |= (ushort)((uint)this.Lane << 3);
-            val |= (ushort)((uint)this.State << 13);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.MinefieldType.GetHashCode();
-                hash = (hash * 29) + this.ActiveStatus.GetHashCode();
-                hash = (hash * 29) + this.Lane.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for Appearance (entity.mine.appear, Appearance Bit Map, 
+    /// section 10.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Appearance
+    {
+        /// <summary>
+        /// Identifies the type of minefield
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identifies the type of minefield")]
+        public enum MinefieldTypeValue : uint
+        {
+            /// <summary>
+            /// Mixed anti-personnel and anti-tank minefield
+            /// </summary>
+            MixedAntiPersonnelAndAntiTankMinefield = 0,
+
+            /// <summary>
+            /// Pure anti-personnel minefield
+            /// </summary>
+            PureAntiPersonnelMinefield = 1,
+
+            /// <summary>
+            /// Pure anti-tank minefield
+            /// </summary>
+            PureAntiTankMinefield = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        /// <summary>
+        /// Identifies the active status of the minefield
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identifies the active status of the minefield")]
+        public enum ActiveStatusValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Inactive
+            /// </summary>
+            Inactive = 1
+        }
+
+        /// <summary>
+        /// Identifies whether the minefield has an active lane
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identifies whether the minefield has an active lane")]
+        public enum LaneValue : uint
+        {
+            /// <summary>
+            /// Minefield has active lane
+            /// </summary>
+            MinefieldHasActiveLane = 0,
+
+            /// <summary>
+            /// Minefield has an inactive lane
+            /// </summary>
+            MinefieldHasAnInactiveLane = 1
+        }
+
+        /// <summary>
+        /// Describes the state of the minefield
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of the minefield")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        private Appearance.MinefieldTypeValue minefieldType;
+        private Appearance.ActiveStatusValue activeStatus;
+        private Appearance.LaneValue lane;
+        private Appearance.StateValue state;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Appearance left, Appearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Appearance left, Appearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Appearance obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Appearance(ushort value)
+        {
+            return Appearance.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Appearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance, represented by the ushort value.</returns>
+        public static Appearance FromUInt16(ushort value)
+        {
+            Appearance ps = new Appearance();
+
+            uint mask0 = 0x0003;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.MinefieldType = (Appearance.MinefieldTypeValue)newValue0;
+
+            uint mask1 = 0x0004;
+            byte shift1 = 2;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.ActiveStatus = (Appearance.ActiveStatusValue)newValue1;
+
+            uint mask2 = 0x0008;
+            byte shift2 = 3;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Lane = (Appearance.LaneValue)newValue2;
+
+            uint mask4 = 0x2000;
+            byte shift4 = 13;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.State = (Appearance.StateValue)newValue4;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the minefieldtype.
+        /// </summary>
+        /// <value>The minefieldtype.</value>
+        public Appearance.MinefieldTypeValue MinefieldType
+        {
+            get { return this.minefieldType; }
+            set { this.minefieldType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the activestatus.
+        /// </summary>
+        /// <value>The activestatus.</value>
+        public Appearance.ActiveStatusValue ActiveStatus
+        {
+            get { return this.activeStatus; }
+            set { this.activeStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the lane.
+        /// </summary>
+        /// <value>The lane.</value>
+        public Appearance.LaneValue Lane
+        {
+            get { return this.lane; }
+            set { this.lane = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public Appearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Appearance))
+            {
+                return false;
+            }
+
+            return this.Equals((Appearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Appearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.MinefieldType == other.MinefieldType &&
+                this.ActiveStatus == other.ActiveStatus &&
+                this.Lane == other.Lane &&
+                this.State == other.State;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Appearance"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.MinefieldType << 0);
+            val |= (ushort)((uint)this.ActiveStatus << 2);
+            val |= (ushort)((uint)this.Lane << 3);
+            val |= (ushort)((uint)this.State << 13);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.MinefieldType.GetHashCode();
+                hash = (hash * 29) + this.ActiveStatus.GetHashCode();
+                hash = (hash * 29) + this.Lane.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/DataFilter.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/DataFilter.cs
index befef51..5454726 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/DataFilter.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/DataFilter.cs
@@ -1,140 +1,140 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for DataFilter (entity.mine.datafilter, Data Filter, 
-    /// section 10.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum DataFilter : uint
-    {
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        GroundBurialDepthOffset = 1,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        WaterBurialDepthOffset = 2,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        SnowBurialDepthOffset = 4,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        MineOrientation = 8,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        ThermalContrast = 16,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        Reflectance = 32,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        MineEmplacementAge = 64,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        TripDetonationWire = 128,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        Fusing = 256,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        ScalarDetectionCoefficient = 512,
-
-        /// <summary>
-        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
-        PaintScheme = 1024
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for DataFilter (entity.mine.datafilter, Data Filter, 
+    /// section 10.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum DataFilter : uint
+    {
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        GroundBurialDepthOffset = 1,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        WaterBurialDepthOffset = 2,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        SnowBurialDepthOffset = 4,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        MineOrientation = 8,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        ThermalContrast = 16,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        Reflectance = 32,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        MineEmplacementAge = 64,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        TripDetonationWire = 128,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        Fusing = 256,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        ScalarDetectionCoefficient = 512,
+
+        /// <summary>
+        /// Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Data is requested / present', reset bit means 'Data not requested / present'.")]
+        PaintScheme = 1024
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/FlirSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/FlirSensor.cs
index 81ffe93..ab66640 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/FlirSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/FlirSensor.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for FlirSensor (entity.mine.sensortype.2.subcat, FLIR, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum FlirSensor : uint
-    {
-        /// <summary>
-        /// Generic 3-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic 3-5.")]
-        Generic35 = 0,
-
-        /// <summary>
-        /// Generic 8-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic 8-12.")]
-        Generic812 = 1,
-
-        /// <summary>
-        /// ASTAMIDS I.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASTAMIDS I.")]
-        ASTAMIDSI = 2,
-
-        /// <summary>
-        /// ASTAMIDS II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASTAMIDS II.")]
-        ASTAMIDSII = 3,
-
-        /// <summary>
-        /// GSTAMIDS 3-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GSTAMIDS 3-5.")]
-        GSTAMIDS35 = 4,
-
-        /// <summary>
-        /// GSTAMIDS 8-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GSTAMIDS 8-12.")]
-        GSTAMIDS812 = 5,
-
-        /// <summary>
-        /// HSTAMIDS 3-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HSTAMIDS 3-5.")]
-        HSTAMIDS35 = 6,
-
-        /// <summary>
-        /// HSTAMIDS 8-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HSTAMIDS 8-12.")]
-        HSTAMIDS812 = 7,
-
-        /// <summary>
-        /// COBRA 3-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("COBRA 3-5.")]
-        COBRA35 = 8,
-
-        /// <summary>
-        /// COBRA 8-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("COBRA 8-12.")]
-        COBRA812 = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for FlirSensor (entity.mine.sensortype.2.subcat, FLIR, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum FlirSensor : uint
+    {
+        /// <summary>
+        /// Generic 3-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic 3-5.")]
+        Generic35 = 0,
+
+        /// <summary>
+        /// Generic 8-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic 8-12.")]
+        Generic812 = 1,
+
+        /// <summary>
+        /// ASTAMIDS I.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASTAMIDS I.")]
+        ASTAMIDSI = 2,
+
+        /// <summary>
+        /// ASTAMIDS II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASTAMIDS II.")]
+        ASTAMIDSII = 3,
+
+        /// <summary>
+        /// GSTAMIDS 3-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GSTAMIDS 3-5.")]
+        GSTAMIDS35 = 4,
+
+        /// <summary>
+        /// GSTAMIDS 8-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GSTAMIDS 8-12.")]
+        GSTAMIDS812 = 5,
+
+        /// <summary>
+        /// HSTAMIDS 3-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HSTAMIDS 3-5.")]
+        HSTAMIDS35 = 6,
+
+        /// <summary>
+        /// HSTAMIDS 8-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HSTAMIDS 8-12.")]
+        HSTAMIDS812 = 7,
+
+        /// <summary>
+        /// COBRA 3-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("COBRA 3-5.")]
+        COBRA35 = 8,
+
+        /// <summary>
+        /// COBRA 8-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("COBRA 8-12.")]
+        COBRA812 = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/Fusing.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/Fusing.cs
index 07d4873..89db952 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/Fusing.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/Fusing.cs
@@ -1,373 +1,373 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for Fusing (entity.mine.fusing, Fusing, 
-    /// section 10.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Fusing
-    {
-        /// <summary>
-        /// Identifies the type of the primary fuse
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identifies the type of the primary fuse")]
-        public enum PrimaryValue : uint
-        {
-            /// <summary>
-            /// No Fuse
-            /// </summary>
-            NoFuse = 0,
-
-            /// <summary>
-            /// Other
-            /// </summary>
-            Other = 1,
-
-            /// <summary>
-            /// Pressure
-            /// </summary>
-            Pressure = 2,
-
-            /// <summary>
-            /// Magnetic
-            /// </summary>
-            Magnetic = 3,
-
-            /// <summary>
-            /// Tilt Rod
-            /// </summary>
-            TiltRod = 4,
-
-            /// <summary>
-            /// Command
-            /// </summary>
-            Command = 5,
-
-            /// <summary>
-            /// Trip Wire
-            /// </summary>
-            TripWire = 6
-        }
-
-        /// <summary>
-        /// Identifies the type of the secondary fuse
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identifies the type of the secondary fuse")]
-        public enum SecondaryValue : uint
-        {
-            /// <summary>
-            /// No Fuse
-            /// </summary>
-            NoFuse = 0,
-
-            /// <summary>
-            /// Other
-            /// </summary>
-            Other = 1,
-
-            /// <summary>
-            /// Pressure
-            /// </summary>
-            Pressure = 2,
-
-            /// <summary>
-            /// Magnetic
-            /// </summary>
-            Magnetic = 3,
-
-            /// <summary>
-            /// Tilt Rod
-            /// </summary>
-            TiltRod = 4,
-
-            /// <summary>
-            /// Command
-            /// </summary>
-            Command = 5,
-
-            /// <summary>
-            /// Trip Wire
-            /// </summary>
-            TripWire = 6
-        }
-
-        /// <summary>
-        /// Describes the anti-handling device status of the mine
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the anti-handling device status of the mine")]
-        public enum AHDValue : uint
-        {
-            /// <summary>
-            /// No anti-handling device
-            /// </summary>
-            NoAntiHandlingDevice = 0,
-
-            /// <summary>
-            /// Anti-handling device
-            /// </summary>
-            AntiHandlingDevice = 1
-        }
-
-        private Fusing.PrimaryValue primary;
-        private Fusing.SecondaryValue secondary;
-        private Fusing.AHDValue aHD;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Fusing left, Fusing right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Fusing left, Fusing right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(Fusing obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Fusing(ushort value)
-        {
-            return Fusing.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Fusing FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance, represented by the ushort value.</returns>
-        public static Fusing FromUInt16(ushort value)
-        {
-            Fusing ps = new Fusing();
-
-            uint mask0 = 0x007f;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Primary = (Fusing.PrimaryValue)newValue0;
-
-            uint mask1 = 0x3f80;
-            byte shift1 = 7;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Secondary = (Fusing.SecondaryValue)newValue1;
-
-            uint mask2 = 0x0010;
-            byte shift2 = 4;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.AHD = (Fusing.AHDValue)newValue2;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the primary.
-        /// </summary>
-        /// <value>The primary.</value>
-        public Fusing.PrimaryValue Primary
-        {
-            get { return this.primary; }
-            set { this.primary = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the secondary.
-        /// </summary>
-        /// <value>The secondary.</value>
-        public Fusing.SecondaryValue Secondary
-        {
-            get { return this.secondary; }
-            set { this.secondary = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the ahd.
-        /// </summary>
-        /// <value>The ahd.</value>
-        public Fusing.AHDValue AHD
-        {
-            get { return this.aHD; }
-            set { this.aHD = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Fusing))
-            {
-                return false;
-            }
-
-            return this.Equals((Fusing)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Fusing other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Primary == other.Primary &&
-                this.Secondary == other.Secondary &&
-                this.AHD == other.AHD;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.Primary << 0);
-            val |= (ushort)((uint)this.Secondary << 7);
-            val |= (ushort)((uint)this.AHD << 4);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Primary.GetHashCode();
-                hash = (hash * 29) + this.Secondary.GetHashCode();
-                hash = (hash * 29) + this.AHD.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for Fusing (entity.mine.fusing, Fusing, 
+    /// section 10.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Fusing
+    {
+        /// <summary>
+        /// Identifies the type of the primary fuse
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identifies the type of the primary fuse")]
+        public enum PrimaryValue : uint
+        {
+            /// <summary>
+            /// No Fuse
+            /// </summary>
+            NoFuse = 0,
+
+            /// <summary>
+            /// Other
+            /// </summary>
+            Other = 1,
+
+            /// <summary>
+            /// Pressure
+            /// </summary>
+            Pressure = 2,
+
+            /// <summary>
+            /// Magnetic
+            /// </summary>
+            Magnetic = 3,
+
+            /// <summary>
+            /// Tilt Rod
+            /// </summary>
+            TiltRod = 4,
+
+            /// <summary>
+            /// Command
+            /// </summary>
+            Command = 5,
+
+            /// <summary>
+            /// Trip Wire
+            /// </summary>
+            TripWire = 6
+        }
+
+        /// <summary>
+        /// Identifies the type of the secondary fuse
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identifies the type of the secondary fuse")]
+        public enum SecondaryValue : uint
+        {
+            /// <summary>
+            /// No Fuse
+            /// </summary>
+            NoFuse = 0,
+
+            /// <summary>
+            /// Other
+            /// </summary>
+            Other = 1,
+
+            /// <summary>
+            /// Pressure
+            /// </summary>
+            Pressure = 2,
+
+            /// <summary>
+            /// Magnetic
+            /// </summary>
+            Magnetic = 3,
+
+            /// <summary>
+            /// Tilt Rod
+            /// </summary>
+            TiltRod = 4,
+
+            /// <summary>
+            /// Command
+            /// </summary>
+            Command = 5,
+
+            /// <summary>
+            /// Trip Wire
+            /// </summary>
+            TripWire = 6
+        }
+
+        /// <summary>
+        /// Describes the anti-handling device status of the mine
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the anti-handling device status of the mine")]
+        public enum AHDValue : uint
+        {
+            /// <summary>
+            /// No anti-handling device
+            /// </summary>
+            NoAntiHandlingDevice = 0,
+
+            /// <summary>
+            /// Anti-handling device
+            /// </summary>
+            AntiHandlingDevice = 1
+        }
+
+        private Fusing.PrimaryValue primary;
+        private Fusing.SecondaryValue secondary;
+        private Fusing.AHDValue aHD;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Fusing left, Fusing right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Fusing left, Fusing right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(Fusing obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Fusing(ushort value)
+        {
+            return Fusing.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Fusing FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance, represented by the ushort value.</returns>
+        public static Fusing FromUInt16(ushort value)
+        {
+            Fusing ps = new Fusing();
+
+            uint mask0 = 0x007f;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Primary = (Fusing.PrimaryValue)newValue0;
+
+            uint mask1 = 0x3f80;
+            byte shift1 = 7;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Secondary = (Fusing.SecondaryValue)newValue1;
+
+            uint mask2 = 0x0010;
+            byte shift2 = 4;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.AHD = (Fusing.AHDValue)newValue2;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the primary.
+        /// </summary>
+        /// <value>The primary.</value>
+        public Fusing.PrimaryValue Primary
+        {
+            get { return this.primary; }
+            set { this.primary = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the secondary.
+        /// </summary>
+        /// <value>The secondary.</value>
+        public Fusing.SecondaryValue Secondary
+        {
+            get { return this.secondary; }
+            set { this.secondary = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the ahd.
+        /// </summary>
+        /// <value>The ahd.</value>
+        public Fusing.AHDValue AHD
+        {
+            get { return this.aHD; }
+            set { this.aHD = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Fusing))
+            {
+                return false;
+            }
+
+            return this.Equals((Fusing)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Fusing other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Primary == other.Primary &&
+                this.Secondary == other.Secondary &&
+                this.AHD == other.AHD;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.Fusing"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.Primary << 0);
+            val |= (ushort)((uint)this.Secondary << 7);
+            val |= (ushort)((uint)this.AHD << 4);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Primary.GetHashCode();
+                hash = (hash * 29) + this.Secondary.GetHashCode();
+                hash = (hash * 29) + this.AHD.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/LaserSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/LaserSensor.cs
index f4a9ee7..d6feff6 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/LaserSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/LaserSensor.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for LaserSensor (entity.mine.sensortype.5.subcat, Laser, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum LaserSensor : uint
-    {
-        /// <summary>
-        /// Generic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic.")]
-        Generic = 0,
-
-        /// <summary>
-        /// ASTAMIDS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASTAMIDS.")]
-        ASTAMIDS = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for LaserSensor (entity.mine.sensortype.5.subcat, Laser, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum LaserSensor : uint
+    {
+        /// <summary>
+        /// Generic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic.")]
+        Generic = 0,
+
+        /// <summary>
+        /// ASTAMIDS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASTAMIDS.")]
+        ASTAMIDS = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
index 96efc5e..dc3a224 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/MagneticSensor.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for MagneticSensor (entity.mine.sensortype.4.subcat, Magnetic, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum MagneticSensor : uint
-    {
-        /// <summary>
-        /// Generic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic.")]
-        Generic = 0,
-
-        /// <summary>
-        /// AN-PSS-11.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN-PSS-11.")]
-        ANPSS11 = 1,
-
-        /// <summary>
-        /// AN-PSS-12.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN-PSS-12.")]
-        ANPSS12 = 2,
-
-        /// <summary>
-        /// GSTAMIDS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GSTAMIDS.")]
-        GSTAMIDS = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for MagneticSensor (entity.mine.sensortype.4.subcat, Magnetic, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum MagneticSensor : uint
+    {
+        /// <summary>
+        /// Generic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic.")]
+        Generic = 0,
+
+        /// <summary>
+        /// AN-PSS-11.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN-PSS-11.")]
+        ANPSS11 = 1,
+
+        /// <summary>
+        /// AN-PSS-12.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN-PSS-12.")]
+        ANPSS12 = 2,
+
+        /// <summary>
+        /// GSTAMIDS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GSTAMIDS.")]
+        GSTAMIDS = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
index 6c5ede4..3c720a4 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/MultispectralSensor.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for MultispectralSensor (entity.mine.sensortype.8.subcat, Multispectral, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum MultispectralSensor : uint
-    {
-        /// <summary>
-        /// Generic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic.")]
-        Generic = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for MultispectralSensor (entity.mine.sensortype.8.subcat, Multispectral, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum MultispectralSensor : uint
+    {
+        /// <summary>
+        /// Generic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic.")]
+        Generic = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
index 3b153c5..be7f0db 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/OpticalSensor.cs
@@ -1,149 +1,149 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for OpticalSensor (entity.mine.sensortype.1.subcat, Optical, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum OpticalSensor : uint
-    {
-        /// <summary>
-        /// Unaided Eye, Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unaided Eye, Actively Searching.")]
-        UnaidedEyeActivelySearching = 0,
-
-        /// <summary>
-        /// Unaided Eye, Not Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unaided Eye, Not Actively Searching.")]
-        UnaidedEyeNotActivelySearching = 1,
-
-        /// <summary>
-        /// Binoculars.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Binoculars.")]
-        Binoculars = 2,
-
-        /// <summary>
-        /// Image Intensifier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Image Intensifier.")]
-        ImageIntensifier = 3,
-
-        /// <summary>
-        /// HMMWV occupant, Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HMMWV occupant, Actively Searching.")]
-        HMMWVOccupantActivelySearching = 4,
-
-        /// <summary>
-        /// HMMWV occupant, Not Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HMMWV occupant, Not Actively Searching.")]
-        HMMWVOccupantNotActivelySearching = 5,
-
-        /// <summary>
-        /// Truck occupant, Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Truck occupant, Actively Searching.")]
-        TruckOccupantActivelySearching = 6,
-
-        /// <summary>
-        /// Truck occupant, Not Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Truck occupant, Not Actively Searching.")]
-        TruckOccupantNotActivelySearching = 7,
-
-        /// <summary>
-        /// Tracked vehicle occupant, closed hatch, Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tracked vehicle occupant, closed hatch, Actively Searching.")]
-        TrackedVehicleOccupantClosedHatchActivelySearching = 8,
-
-        /// <summary>
-        /// Tracked vehicle occupant, closed hatch, Not Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tracked vehicle occupant, closed hatch, Not Actively Searching.")]
-        TrackedVehicleOccupantClosedHatchNotActivelySearching = 9,
-
-        /// <summary>
-        /// Tracked vehicle occupant, open hatch, Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tracked vehicle occupant, open hatch, Actively Searching.")]
-        TrackedVehicleOccupantOpenHatchActivelySearching = 10,
-
-        /// <summary>
-        /// Tracked vehicle occupant, open hatch, Not Actively Searching.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tracked vehicle occupant, open hatch, Not Actively Searching.")]
-        TrackedVehicleOccupantOpenHatchNotActivelySearching = 11
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for OpticalSensor (entity.mine.sensortype.1.subcat, Optical, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum OpticalSensor : uint
+    {
+        /// <summary>
+        /// Unaided Eye, Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unaided Eye, Actively Searching.")]
+        UnaidedEyeActivelySearching = 0,
+
+        /// <summary>
+        /// Unaided Eye, Not Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unaided Eye, Not Actively Searching.")]
+        UnaidedEyeNotActivelySearching = 1,
+
+        /// <summary>
+        /// Binoculars.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Binoculars.")]
+        Binoculars = 2,
+
+        /// <summary>
+        /// Image Intensifier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Image Intensifier.")]
+        ImageIntensifier = 3,
+
+        /// <summary>
+        /// HMMWV occupant, Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HMMWV occupant, Actively Searching.")]
+        HMMWVOccupantActivelySearching = 4,
+
+        /// <summary>
+        /// HMMWV occupant, Not Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HMMWV occupant, Not Actively Searching.")]
+        HMMWVOccupantNotActivelySearching = 5,
+
+        /// <summary>
+        /// Truck occupant, Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Truck occupant, Actively Searching.")]
+        TruckOccupantActivelySearching = 6,
+
+        /// <summary>
+        /// Truck occupant, Not Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Truck occupant, Not Actively Searching.")]
+        TruckOccupantNotActivelySearching = 7,
+
+        /// <summary>
+        /// Tracked vehicle occupant, closed hatch, Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tracked vehicle occupant, closed hatch, Actively Searching.")]
+        TrackedVehicleOccupantClosedHatchActivelySearching = 8,
+
+        /// <summary>
+        /// Tracked vehicle occupant, closed hatch, Not Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tracked vehicle occupant, closed hatch, Not Actively Searching.")]
+        TrackedVehicleOccupantClosedHatchNotActivelySearching = 9,
+
+        /// <summary>
+        /// Tracked vehicle occupant, open hatch, Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tracked vehicle occupant, open hatch, Actively Searching.")]
+        TrackedVehicleOccupantOpenHatchActivelySearching = 10,
+
+        /// <summary>
+        /// Tracked vehicle occupant, open hatch, Not Actively Searching.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tracked vehicle occupant, open hatch, Not Actively Searching.")]
+        TrackedVehicleOccupantOpenHatchNotActivelySearching = 11
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/PaintScheme.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/PaintScheme.cs
index 26354ac..c05e038 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PaintScheme.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/PaintScheme.cs
@@ -1,378 +1,378 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for PaintScheme (entity.mine.paintscheme, Paint Scheme, 
-    /// section 10.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct PaintScheme
-    {
-        /// <summary>
-        /// Identifies the algae build-up on the mine
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identifies the algae build-up on the mine")]
-        public enum AlgaeValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Light
-            /// </summary>
-            Light = 1,
-
-            /// <summary>
-            /// Moderate
-            /// </summary>
-            Moderate = 2,
-
-            /// <summary>
-            /// Heavy
-            /// </summary>
-            Heavy = 3
-        }
-
-        /// <summary>
-        /// Identifies the paint scheme of the mine
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identifies the paint scheme of the mine")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Other
-            /// </summary>
-            Other = 0,
-
-            /// <summary>
-            /// Standard
-            /// </summary>
-            Standard = 1,
-
-            /// <summary>
-            /// Camouflage Desert
-            /// </summary>
-            CamouflageDesert = 2,
-
-            /// <summary>
-            /// Camouflage Jungle
-            /// </summary>
-            CamouflageJungle = 3,
-
-            /// <summary>
-            /// Camouflage Snow
-            /// </summary>
-            CamouflageSnow = 4,
-
-            /// <summary>
-            /// Camouflage Gravel
-            /// </summary>
-            CamouflageGravel = 5,
-
-            /// <summary>
-            /// Camouflage Pavement
-            /// </summary>
-            CamouflagePavement = 6,
-
-            /// <summary>
-            /// Camouflage Sand
-            /// </summary>
-            CamouflageSand = 7,
-
-            /// <summary>
-            /// Natural Wood
-            /// </summary>
-            NaturalWood = 8,
-
-            /// <summary>
-            /// Clear
-            /// </summary>
-            Clear = 9,
-
-            /// <summary>
-            /// Red
-            /// </summary>
-            Red = 10,
-
-            /// <summary>
-            /// Blue
-            /// </summary>
-            Blue = 11,
-
-            /// <summary>
-            /// Green
-            /// </summary>
-            Green = 12,
-
-            /// <summary>
-            /// Olive
-            /// </summary>
-            Olive = 13,
-
-            /// <summary>
-            /// White
-            /// </summary>
-            White = 14,
-
-            /// <summary>
-            /// Tan
-            /// </summary>
-            Tan = 15,
-
-            /// <summary>
-            /// Black
-            /// </summary>
-            Black = 16,
-
-            /// <summary>
-            /// Yellow
-            /// </summary>
-            Yellow = 17,
-
-            /// <summary>
-            /// Brown
-            /// </summary>
-            Brown = 18
-        }
-
-        private PaintScheme.AlgaeValue algae;
-        private PaintScheme.PaintSchemeValue paintScheme;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(PaintScheme left, PaintScheme right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(PaintScheme left, PaintScheme right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> to <see cref="System.Byte"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator byte(PaintScheme obj)
-        {
-            return obj.ToByte();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.Byte"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/>.
-        /// </summary>
-        /// <param name="value">The byte value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator PaintScheme(byte value)
-        {
-            return PaintScheme.FromByte(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static PaintScheme FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 1 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromByte(array[index]);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance from the byte value.
-        /// </summary>
-        /// <param name="value">The byte value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance, represented by the byte value.</returns>
-        public static PaintScheme FromByte(byte value)
-        {
-            PaintScheme ps = new PaintScheme();
-
-            uint mask0 = 0x0003;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Algae = (PaintScheme.AlgaeValue)newValue0;
-
-            uint mask1 = 0x00fc;
-            byte shift1 = 2;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Value = (PaintScheme.PaintSchemeValue)newValue1;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the algae.
-        /// </summary>
-        /// <value>The algae.</value>
-        public PaintScheme.AlgaeValue Algae
-        {
-            get { return this.algae; }
-            set { this.algae = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the value.
-        /// </summary>
-        /// <value>The value.</value>
-        public PaintScheme.PaintSchemeValue Value
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is PaintScheme))
-            {
-                return false;
-            }
-
-            return this.Equals((PaintScheme)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(PaintScheme other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Algae == other.Algae &&
-                this.Value == other.Value;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToByte());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> to the byte value.
-        /// </summary>
-        /// <returns>The byte value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance.</returns>
-        public byte ToByte()
-        {
-            byte val = 0;
-
-            val |= (byte)((uint)this.Algae << 0);
-            val |= (byte)((uint)this.Value << 2);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Algae.GetHashCode();
-                hash = (hash * 29) + this.Value.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for PaintScheme (entity.mine.paintscheme, Paint Scheme, 
+    /// section 10.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct PaintScheme
+    {
+        /// <summary>
+        /// Identifies the algae build-up on the mine
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identifies the algae build-up on the mine")]
+        public enum AlgaeValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Light
+            /// </summary>
+            Light = 1,
+
+            /// <summary>
+            /// Moderate
+            /// </summary>
+            Moderate = 2,
+
+            /// <summary>
+            /// Heavy
+            /// </summary>
+            Heavy = 3
+        }
+
+        /// <summary>
+        /// Identifies the paint scheme of the mine
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identifies the paint scheme of the mine")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Other
+            /// </summary>
+            Other = 0,
+
+            /// <summary>
+            /// Standard
+            /// </summary>
+            Standard = 1,
+
+            /// <summary>
+            /// Camouflage Desert
+            /// </summary>
+            CamouflageDesert = 2,
+
+            /// <summary>
+            /// Camouflage Jungle
+            /// </summary>
+            CamouflageJungle = 3,
+
+            /// <summary>
+            /// Camouflage Snow
+            /// </summary>
+            CamouflageSnow = 4,
+
+            /// <summary>
+            /// Camouflage Gravel
+            /// </summary>
+            CamouflageGravel = 5,
+
+            /// <summary>
+            /// Camouflage Pavement
+            /// </summary>
+            CamouflagePavement = 6,
+
+            /// <summary>
+            /// Camouflage Sand
+            /// </summary>
+            CamouflageSand = 7,
+
+            /// <summary>
+            /// Natural Wood
+            /// </summary>
+            NaturalWood = 8,
+
+            /// <summary>
+            /// Clear
+            /// </summary>
+            Clear = 9,
+
+            /// <summary>
+            /// Red
+            /// </summary>
+            Red = 10,
+
+            /// <summary>
+            /// Blue
+            /// </summary>
+            Blue = 11,
+
+            /// <summary>
+            /// Green
+            /// </summary>
+            Green = 12,
+
+            /// <summary>
+            /// Olive
+            /// </summary>
+            Olive = 13,
+
+            /// <summary>
+            /// White
+            /// </summary>
+            White = 14,
+
+            /// <summary>
+            /// Tan
+            /// </summary>
+            Tan = 15,
+
+            /// <summary>
+            /// Black
+            /// </summary>
+            Black = 16,
+
+            /// <summary>
+            /// Yellow
+            /// </summary>
+            Yellow = 17,
+
+            /// <summary>
+            /// Brown
+            /// </summary>
+            Brown = 18
+        }
+
+        private PaintScheme.AlgaeValue algae;
+        private PaintScheme.PaintSchemeValue paintScheme;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PaintScheme left, PaintScheme right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PaintScheme left, PaintScheme right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> to <see cref="System.Byte"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator byte(PaintScheme obj)
+        {
+            return obj.ToByte();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.Byte"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/>.
+        /// </summary>
+        /// <param name="value">The byte value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator PaintScheme(byte value)
+        {
+            return PaintScheme.FromByte(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static PaintScheme FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 1 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromByte(array[index]);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance from the byte value.
+        /// </summary>
+        /// <param name="value">The byte value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance, represented by the byte value.</returns>
+        public static PaintScheme FromByte(byte value)
+        {
+            PaintScheme ps = new PaintScheme();
+
+            uint mask0 = 0x0003;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Algae = (PaintScheme.AlgaeValue)newValue0;
+
+            uint mask1 = 0x00fc;
+            byte shift1 = 2;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Value = (PaintScheme.PaintSchemeValue)newValue1;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the algae.
+        /// </summary>
+        /// <value>The algae.</value>
+        public PaintScheme.AlgaeValue Algae
+        {
+            get { return this.algae; }
+            set { this.algae = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the value.
+        /// </summary>
+        /// <value>The value.</value>
+        public PaintScheme.PaintSchemeValue Value
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is PaintScheme))
+            {
+                return false;
+            }
+
+            return this.Equals((PaintScheme)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PaintScheme other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Algae == other.Algae &&
+                this.Value == other.Value;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToByte());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> to the byte value.
+        /// </summary>
+        /// <returns>The byte value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.PaintScheme"/> instance.</returns>
+        public byte ToByte()
+        {
+            byte val = 0;
+
+            val |= (byte)((uint)this.Algae << 0);
+            val |= (byte)((uint)this.Value << 2);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Algae.GetHashCode();
+                hash = (hash * 29) + this.Value.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
index 9b1c028..dc5a9e7 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/PhysicalSensor.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for PhysicalSensor (entity.mine.sensortype.7.subcat, Physical, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum PhysicalSensor : uint
-    {
-        /// <summary>
-        /// Generic Probe.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic Probe.")]
-        GenericProbe = 0,
-
-        /// <summary>
-        /// Probe, metal content.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Probe, metal content.")]
-        ProbeMetalContent = 1,
-
-        /// <summary>
-        /// Probe, no metal content.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Probe, no metal content.")]
-        ProbeNoMetalContent = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for PhysicalSensor (entity.mine.sensortype.7.subcat, Physical, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum PhysicalSensor : uint
+    {
+        /// <summary>
+        /// Generic Probe.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic Probe.")]
+        GenericProbe = 0,
+
+        /// <summary>
+        /// Probe, metal content.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Probe, metal content.")]
+        ProbeMetalContent = 1,
+
+        /// <summary>
+        /// Probe, no metal content.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Probe, no metal content.")]
+        ProbeNoMetalContent = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
index 04e7802..294cfcc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/ProtocolMode.cs
@@ -1,248 +1,248 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for ProtocolMode (entity.mine.protocolmode, Protocol Mode, 
-    /// section 10.2.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct ProtocolMode
-    {
-        /// <summary>
-        /// Protocol Mode
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Protocol Mode")]
-        public enum ProtocolModeValue : uint
-        {
-            /// <summary>
-            /// Heartbeat mode
-            /// </summary>
-            HeartbeatMode = 0,
-
-            /// <summary>
-            /// QRP mode
-            /// </summary>
-            QRPMode = 1,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 2
-        }
-
-        private ProtocolMode.ProtocolModeValue protocolMode;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ProtocolMode left, ProtocolMode right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ProtocolMode left, ProtocolMode right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(ProtocolMode obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ProtocolMode(uint value)
-        {
-            return ProtocolMode.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static ProtocolMode FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance, represented by the uint value.</returns>
-        public static ProtocolMode FromUInt32(uint value)
-        {
-            ProtocolMode ps = new ProtocolMode();
-
-            uint mask0 = 0x0003;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Value = (ProtocolMode.ProtocolModeValue)newValue0;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the value.
-        /// </summary>
-        /// <value>The value.</value>
-        public ProtocolMode.ProtocolModeValue Value
-        {
-            get { return this.protocolMode; }
-            set { this.protocolMode = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is ProtocolMode))
-            {
-                return false;
-            }
-
-            return this.Equals((ProtocolMode)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ProtocolMode other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Value == other.Value;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Value << 0);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Value.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for ProtocolMode (entity.mine.protocolmode, Protocol Mode, 
+    /// section 10.2.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct ProtocolMode
+    {
+        /// <summary>
+        /// Protocol Mode
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Protocol Mode")]
+        public enum ProtocolModeValue : uint
+        {
+            /// <summary>
+            /// Heartbeat mode
+            /// </summary>
+            HeartbeatMode = 0,
+
+            /// <summary>
+            /// QRP mode
+            /// </summary>
+            QRPMode = 1,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 2
+        }
+
+        private ProtocolMode.ProtocolModeValue protocolMode;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ProtocolMode left, ProtocolMode right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ProtocolMode left, ProtocolMode right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(ProtocolMode obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ProtocolMode(uint value)
+        {
+            return ProtocolMode.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static ProtocolMode FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance, represented by the uint value.</returns>
+        public static ProtocolMode FromUInt32(uint value)
+        {
+            ProtocolMode ps = new ProtocolMode();
+
+            uint mask0 = 0x0003;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Value = (ProtocolMode.ProtocolModeValue)newValue0;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the value.
+        /// </summary>
+        /// <value>The value.</value>
+        public ProtocolMode.ProtocolModeValue Value
+        {
+            get { return this.protocolMode; }
+            set { this.protocolMode = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is ProtocolMode))
+            {
+                return false;
+            }
+
+            return this.Equals((ProtocolMode)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ProtocolMode other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Value == other.Value;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Entity.Information.Minefield.ProtocolMode"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Value << 0);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Value.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/RadarSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/RadarSensor.cs
index e3cbc3b..9be80dd 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/RadarSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/RadarSensor.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for RadarSensor (entity.mine.sensortype.3.subcat, RADAR, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum RadarSensor : uint
-    {
-        /// <summary>
-        /// Generic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic.")]
-        Generic = 0,
-
-        /// <summary>
-        /// Generic GPR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic GPR.")]
-        GenericGPR = 1,
-
-        /// <summary>
-        /// GSTAMIDS I.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GSTAMIDS I.")]
-        GSTAMIDSI = 2,
-
-        /// <summary>
-        /// GSTAMIDS II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GSTAMIDS II.")]
-        GSTAMIDSII = 3,
-
-        /// <summary>
-        /// HSTAMIDS I.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HSTAMIDS I.")]
-        HSTAMIDSI = 4,
-
-        /// <summary>
-        /// HSTAMIDS II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HSTAMIDS II.")]
-        HSTAMIDSII = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for RadarSensor (entity.mine.sensortype.3.subcat, RADAR, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum RadarSensor : uint
+    {
+        /// <summary>
+        /// Generic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic.")]
+        Generic = 0,
+
+        /// <summary>
+        /// Generic GPR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic GPR.")]
+        GenericGPR = 1,
+
+        /// <summary>
+        /// GSTAMIDS I.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GSTAMIDS I.")]
+        GSTAMIDSI = 2,
+
+        /// <summary>
+        /// GSTAMIDS II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GSTAMIDS II.")]
+        GSTAMIDSII = 3,
+
+        /// <summary>
+        /// HSTAMIDS I.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HSTAMIDS I.")]
+        HSTAMIDSI = 4,
+
+        /// <summary>
+        /// HSTAMIDS II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HSTAMIDS II.")]
+        HSTAMIDSII = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/SensorTypes.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/SensorTypes.cs
index f3518ed..7481949 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SensorTypes.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/SensorTypes.cs
@@ -1,119 +1,119 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for SensorTypes (entity.mine.sensortype, Sensor Types, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SensorTypes : uint
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Optical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Optical.")]
-        Optical = 1,
-
-        /// <summary>
-        /// FLIR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FLIR.")]
-        FLIR = 2,
-
-        /// <summary>
-        /// RADAR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RADAR.")]
-        RADAR = 3,
-
-        /// <summary>
-        /// Magnetic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Magnetic.")]
-        Magnetic = 4,
-
-        /// <summary>
-        /// Laser.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Laser.")]
-        Laser = 5,
-
-        /// <summary>
-        /// SONAR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SONAR.")]
-        SONAR = 6,
-
-        /// <summary>
-        /// Physical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Physical.")]
-        Physical = 7,
-
-        /// <summary>
-        /// Multispectral.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multispectral.")]
-        Multispectral = 8
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for SensorTypes (entity.mine.sensortype, Sensor Types, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SensorTypes : uint
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Optical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Optical.")]
+        Optical = 1,
+
+        /// <summary>
+        /// FLIR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FLIR.")]
+        FLIR = 2,
+
+        /// <summary>
+        /// RADAR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RADAR.")]
+        RADAR = 3,
+
+        /// <summary>
+        /// Magnetic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Magnetic.")]
+        Magnetic = 4,
+
+        /// <summary>
+        /// Laser.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Laser.")]
+        Laser = 5,
+
+        /// <summary>
+        /// SONAR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SONAR.")]
+        SONAR = 6,
+
+        /// <summary>
+        /// Physical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Physical.")]
+        Physical = 7,
+
+        /// <summary>
+        /// Multispectral.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multispectral.")]
+        Multispectral = 8
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/SonarSensor.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/SonarSensor.cs
index ea85592..8fa3d67 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information.Minefield/SonarSensor.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information.Minefield/SonarSensor.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information.Minefield
-{
-    /// <summary>
-    /// Enumeration values for SonarSensor (entity.mine.sensortype.6.subcat, SONAR, 
-    /// section 10.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SonarSensor : uint
-    {
-        /// <summary>
-        /// Generic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic.")]
-        Generic = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information.Minefield
+{
+    /// <summary>
+    /// Enumeration values for SonarSensor (entity.mine.sensortype.6.subcat, SONAR, 
+    /// section 10.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SonarSensor : uint
+    {
+        /// <summary>
+        /// Generic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic.")]
+        Generic = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs b/Libs/CsharpDis6/Enumerations/Entity.Information/EntityCollisionType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Information/EntityCollisionType.cs
index 576d7c6..6190b89 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Information/EntityCollisionType.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Information/EntityCollisionType.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Information
-{
-    /// <summary>
-    /// Enumeration values for EntityCollisionType (entity.collision.type, Collision Type, 
-    /// section 10.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EntityCollisionType : byte
-    {
-        /// <summary>
-        /// Inelastic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inelastic.")]
-        Inelastic = 0,
-
-        /// <summary>
-        /// Elastic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Elastic.")]
-        Elastic = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Information
+{
+    /// <summary>
+    /// Enumeration values for EntityCollisionType (entity.collision.type, Collision Type, 
+    /// section 10.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EntityCollisionType : byte
+    {
+        /// <summary>
+        /// Inelastic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inelastic.")]
+        Inelastic = 0,
+
+        /// <summary>
+        /// Elastic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Elastic.")]
+        Elastic = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateFormation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/AggregateFormation.cs
index 13bcfd2..f7cd2f1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateFormation.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateFormation.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for AggregateFormation (eman.aggregate.formation, Formation, 
-    /// section 11.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AggregateFormation : uint
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Assembly.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Assembly.")]
-        Assembly = 1,
-
-        /// <summary>
-        /// Vee.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vee.")]
-        Vee = 2,
-
-        /// <summary>
-        /// Wedge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wedge.")]
-        Wedge = 3,
-
-        /// <summary>
-        /// Line.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Line.")]
-        Line = 4,
-
-        /// <summary>
-        /// Column.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Column.")]
-        Column = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for AggregateFormation (eman.aggregate.formation, Formation, 
+    /// section 11.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AggregateFormation : uint
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Assembly.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Assembly.")]
+        Assembly = 1,
+
+        /// <summary>
+        /// Vee.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vee.")]
+        Vee = 2,
+
+        /// <summary>
+        /// Wedge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wedge.")]
+        Wedge = 3,
+
+        /// <summary>
+        /// Line.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Line.")]
+        Line = 4,
+
+        /// <summary>
+        /// Column.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Column.")]
+        Column = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateKind.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateKind.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateKind.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/AggregateKind.cs
index b84c1e4..04a6a96 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateKind.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateKind.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for AggregateKind (eman.aggregate.type.kind, Aggregate Kind, 
-    /// section 11.1.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AggregateKind : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Military Hierarchy.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Military Hierarchy.")]
-        MilitaryHierarchy = 1,
-
-        /// <summary>
-        /// Common Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Common Type.")]
-        CommonType = 2,
-
-        /// <summary>
-        /// Common Mission.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Common Mission.")]
-        CommonMission = 3,
-
-        /// <summary>
-        /// Similar Capabilities.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Similar Capabilities.")]
-        SimilarCapabilities = 4,
-
-        /// <summary>
-        /// Common Location.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Common Location.")]
-        CommonLocation = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for AggregateKind (eman.aggregate.type.kind, Aggregate Kind, 
+    /// section 11.1.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AggregateKind : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Military Hierarchy.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Military Hierarchy.")]
+        MilitaryHierarchy = 1,
+
+        /// <summary>
+        /// Common Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Common Type.")]
+        CommonType = 2,
+
+        /// <summary>
+        /// Common Mission.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Common Mission.")]
+        CommonMission = 3,
+
+        /// <summary>
+        /// Similar Capabilities.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Similar Capabilities.")]
+        SimilarCapabilities = 4,
+
+        /// <summary>
+        /// Common Location.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Common Location.")]
+        CommonLocation = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateSpecific.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/AggregateSpecific.cs
index 330d104..9023c19 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSpecific.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateSpecific.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for AggregateSpecific (eman.aggregate.type.specific, Specific, 
-    /// section 11.1.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AggregateSpecific : byte
-    {
-        /// <summary>
-        /// No headquarters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("No headquarters.")]
-        NoHeadquarters = 0,
-
-        /// <summary>
-        /// Yes aggregate unit contains a headquarters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Yes aggregate unit contains a headquarters.")]
-        YesAggregateUnitContainsAHeadquarters = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for AggregateSpecific (eman.aggregate.type.specific, Specific, 
+    /// section 11.1.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AggregateSpecific : byte
+    {
+        /// <summary>
+        /// No headquarters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("No headquarters.")]
+        NoHeadquarters = 0,
+
+        /// <summary>
+        /// Yes aggregate unit contains a headquarters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Yes aggregate unit contains a headquarters.")]
+        YesAggregateUnitContainsAHeadquarters = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateState.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateState.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateState.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/AggregateState.cs
index 22db522..eb3838b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateState.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateState.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for AggregateState (eman.aggregate.state, Aggregate State, 
-    /// section 11.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AggregateState : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Aggregated.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aggregated.")]
-        Aggregated = 1,
-
-        /// <summary>
-        /// Disaggregated.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Disaggregated.")]
-        Disaggregated = 2,
-
-        /// <summary>
-        /// Fully disaggregated.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fully disaggregated.")]
-        FullyDisaggregated = 3,
-
-        /// <summary>
-        /// Pseudo-disaggregated.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pseudo-disaggregated.")]
-        PseudoDisaggregated = 4,
-
-        /// <summary>
-        /// Partially-disaggregated.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Partially-disaggregated.")]
-        PartiallyDisaggregated = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for AggregateState (eman.aggregate.state, Aggregate State, 
+    /// section 11.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AggregateState : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Aggregated.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aggregated.")]
+        Aggregated = 1,
+
+        /// <summary>
+        /// Disaggregated.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Disaggregated.")]
+        Disaggregated = 2,
+
+        /// <summary>
+        /// Fully disaggregated.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fully disaggregated.")]
+        FullyDisaggregated = 3,
+
+        /// <summary>
+        /// Pseudo-disaggregated.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pseudo-disaggregated.")]
+        PseudoDisaggregated = 4,
+
+        /// <summary>
+        /// Partially-disaggregated.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Partially-disaggregated.")]
+        PartiallyDisaggregated = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateSubcategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/AggregateSubcategory.cs
index eac9bdc..f6d1380 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/AggregateSubcategory.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/AggregateSubcategory.cs
@@ -1,259 +1,259 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for AggregateSubcategory (eman.aggregate.type.subcategory, Subcategory, 
-    /// section 11.1.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AggregateSubcategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Cavalry Troop.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cavalry Troop.")]
-        CavalryTroop = 1,
-
-        /// <summary>
-        /// Armor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armor.")]
-        Armor = 2,
-
-        /// <summary>
-        /// Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Infantry.")]
-        Infantry = 3,
-
-        /// <summary>
-        /// Mechanized Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mechanized Infantry.")]
-        MechanizedInfantry = 4,
-
-        /// <summary>
-        /// Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cavalry.")]
-        Cavalry = 5,
-
-        /// <summary>
-        /// Armored Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armored Cavalry.")]
-        ArmoredCavalry = 6,
-
-        /// <summary>
-        /// Artillery.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Artillery.")]
-        Artillery = 7,
-
-        /// <summary>
-        /// Self-propelled Artillery.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Self-propelled Artillery.")]
-        SelfPropelledArtillery = 8,
-
-        /// <summary>
-        /// Close Air Support.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Close Air Support.")]
-        CloseAirSupport = 9,
-
-        /// <summary>
-        /// Engineer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Engineer.")]
-        Engineer = 10,
-
-        /// <summary>
-        /// Air Defense Artillery.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Defense Artillery.")]
-        AirDefenseArtillery = 11,
-
-        /// <summary>
-        /// Anti-tank.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Anti-tank.")]
-        AntiTank = 12,
-
-        /// <summary>
-        /// Army Aviation Fixed-wing.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Army Aviation Fixed-wing.")]
-        ArmyAviationFixedWing = 13,
-
-        /// <summary>
-        /// Army Aviation Rotary-wing.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Army Aviation Rotary-wing.")]
-        ArmyAviationRotaryWing = 14,
-
-        /// <summary>
-        /// Army Attack Helicopter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Army Attack Helicopter.")]
-        ArmyAttackHelicopter = 15,
-
-        /// <summary>
-        /// Air Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Cavalry.")]
-        AirCavalry = 16,
-
-        /// <summary>
-        /// Armor Heavy Task Force.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armor Heavy Task Force.")]
-        ArmorHeavyTaskForce = 17,
-
-        /// <summary>
-        /// Motorized Rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Motorized Rifle.")]
-        MotorizedRifle = 18,
-
-        /// <summary>
-        /// Mechanized Heavy Task Force.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mechanized Heavy Task Force.")]
-        MechanizedHeavyTaskForce = 19,
-
-        /// <summary>
-        /// Command Post.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command Post.")]
-        CommandPost = 20,
-
-        /// <summary>
-        /// CEWI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CEWI.")]
-        CEWI = 21,
-
-        /// <summary>
-        /// Tank only.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tank only.")]
-        TankOnly = 22
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for AggregateSubcategory (eman.aggregate.type.subcategory, Subcategory, 
+    /// section 11.1.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AggregateSubcategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Cavalry Troop.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cavalry Troop.")]
+        CavalryTroop = 1,
+
+        /// <summary>
+        /// Armor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armor.")]
+        Armor = 2,
+
+        /// <summary>
+        /// Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Infantry.")]
+        Infantry = 3,
+
+        /// <summary>
+        /// Mechanized Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mechanized Infantry.")]
+        MechanizedInfantry = 4,
+
+        /// <summary>
+        /// Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cavalry.")]
+        Cavalry = 5,
+
+        /// <summary>
+        /// Armored Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armored Cavalry.")]
+        ArmoredCavalry = 6,
+
+        /// <summary>
+        /// Artillery.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Artillery.")]
+        Artillery = 7,
+
+        /// <summary>
+        /// Self-propelled Artillery.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Self-propelled Artillery.")]
+        SelfPropelledArtillery = 8,
+
+        /// <summary>
+        /// Close Air Support.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Close Air Support.")]
+        CloseAirSupport = 9,
+
+        /// <summary>
+        /// Engineer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Engineer.")]
+        Engineer = 10,
+
+        /// <summary>
+        /// Air Defense Artillery.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Defense Artillery.")]
+        AirDefenseArtillery = 11,
+
+        /// <summary>
+        /// Anti-tank.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Anti-tank.")]
+        AntiTank = 12,
+
+        /// <summary>
+        /// Army Aviation Fixed-wing.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Army Aviation Fixed-wing.")]
+        ArmyAviationFixedWing = 13,
+
+        /// <summary>
+        /// Army Aviation Rotary-wing.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Army Aviation Rotary-wing.")]
+        ArmyAviationRotaryWing = 14,
+
+        /// <summary>
+        /// Army Attack Helicopter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Army Attack Helicopter.")]
+        ArmyAttackHelicopter = 15,
+
+        /// <summary>
+        /// Air Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Cavalry.")]
+        AirCavalry = 16,
+
+        /// <summary>
+        /// Armor Heavy Task Force.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armor Heavy Task Force.")]
+        ArmorHeavyTaskForce = 17,
+
+        /// <summary>
+        /// Motorized Rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Motorized Rifle.")]
+        MotorizedRifle = 18,
+
+        /// <summary>
+        /// Mechanized Heavy Task Force.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mechanized Heavy Task Force.")]
+        MechanizedHeavyTaskForce = 19,
+
+        /// <summary>
+        /// Command Post.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command Post.")]
+        CommandPost = 20,
+
+        /// <summary>
+        /// CEWI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CEWI.")]
+        CEWI = 21,
+
+        /// <summary>
+        /// Tank only.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tank only.")]
+        TankOnly = 22
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
index 4e5cfac..df858ad 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/GroupOfGroupedEntityCategory.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for GroupOfGroupedEntityCategory (eman.isgroupof.category, Grouped Entity Category, 
-    /// section 11.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum GroupOfGroupedEntityCategory : byte
-    {
-        /// <summary>
-        /// Undefined.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Undefined.")]
-        Undefined = 0,
-
-        /// <summary>
-        /// Basic Ground Combat Vehicle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Basic Ground Combat Vehicle.")]
-        BasicGroundCombatVehicle = 1,
-
-        /// <summary>
-        /// Enhanced Ground Combat Vehicle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Enhanced Ground Combat Vehicle.")]
-        EnhancedGroundCombatVehicle = 2,
-
-        /// <summary>
-        /// Basic Ground Combat Soldier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Basic Ground Combat Soldier.")]
-        BasicGroundCombatSoldier = 3,
-
-        /// <summary>
-        /// Enhanced Ground Combat Soldier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Enhanced Ground Combat Soldier.")]
-        EnhancedGroundCombatSoldier = 4,
-
-        /// <summary>
-        /// Basic Rotor Wing Aircraft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Basic Rotor Wing Aircraft.")]
-        BasicRotorWingAircraft = 5,
-
-        /// <summary>
-        /// Enhanced Rotor Wing Aircraft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Enhanced Rotor Wing Aircraft.")]
-        EnhancedRotorWingAircraft = 6,
-
-        /// <summary>
-        /// Basic Fixed Wing Aircraft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Basic Fixed Wing Aircraft.")]
-        BasicFixedWingAircraft = 7,
-
-        /// <summary>
-        /// Enhanced Fixed Wing Aircraft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Enhanced Fixed Wing Aircraft.")]
-        EnhancedFixedWingAircraft = 8,
-
-        /// <summary>
-        /// Ground Logistics Vehicle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ground Logistics Vehicle.")]
-        GroundLogisticsVehicle = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for GroupOfGroupedEntityCategory (eman.isgroupof.category, Grouped Entity Category, 
+    /// section 11.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum GroupOfGroupedEntityCategory : byte
+    {
+        /// <summary>
+        /// Undefined.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Undefined.")]
+        Undefined = 0,
+
+        /// <summary>
+        /// Basic Ground Combat Vehicle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Basic Ground Combat Vehicle.")]
+        BasicGroundCombatVehicle = 1,
+
+        /// <summary>
+        /// Enhanced Ground Combat Vehicle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Enhanced Ground Combat Vehicle.")]
+        EnhancedGroundCombatVehicle = 2,
+
+        /// <summary>
+        /// Basic Ground Combat Soldier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Basic Ground Combat Soldier.")]
+        BasicGroundCombatSoldier = 3,
+
+        /// <summary>
+        /// Enhanced Ground Combat Soldier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Enhanced Ground Combat Soldier.")]
+        EnhancedGroundCombatSoldier = 4,
+
+        /// <summary>
+        /// Basic Rotor Wing Aircraft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Basic Rotor Wing Aircraft.")]
+        BasicRotorWingAircraft = 5,
+
+        /// <summary>
+        /// Enhanced Rotor Wing Aircraft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Enhanced Rotor Wing Aircraft.")]
+        EnhancedRotorWingAircraft = 6,
+
+        /// <summary>
+        /// Basic Fixed Wing Aircraft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Basic Fixed Wing Aircraft.")]
+        BasicFixedWingAircraft = 7,
+
+        /// <summary>
+        /// Enhanced Fixed Wing Aircraft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Enhanced Fixed Wing Aircraft.")]
+        EnhancedFixedWingAircraft = 8,
+
+        /// <summary>
+        /// Ground Logistics Vehicle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ground Logistics Vehicle.")]
+        GroundLogisticsVehicle = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/GroupOfRestStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/GroupOfRestStatus.cs
index 969a738..426212f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/GroupOfRestStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/GroupOfRestStatus.cs
@@ -1,119 +1,119 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for GroupOfRestStatus (eman.isgroupof.reststatus, Rest Status, 
-    /// section 11.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum GroupOfRestStatus : byte
-    {
-        /// <summary>
-        /// Not rested (Has not slept in the last three days).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Not rested (Has not slept in the last three days).")]
-        NotRestedHasNotSleptInTheLastThreeDays = 0,
-
-        /// <summary>
-        /// Has slept an average of 1 hour per day in the last three days.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Has slept an average of 1 hour per day in the last three days.")]
-        HasSleptAnAverageOf1HourPerDayInTheLastThreeDays = 1,
-
-        /// <summary>
-        /// Has slept an average of 2 hours per day in the last three days.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Has slept an average of 2 hours per day in the last three days.")]
-        HasSleptAnAverageOf2HoursPerDayInTheLastThreeDays = 2,
-
-        /// <summary>
-        /// Has slept an average of 3 hours per day in the last three days.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Has slept an average of 3 hours per day in the last three days.")]
-        HasSleptAnAverageOf3HoursPerDayInTheLastThreeDays = 3,
-
-        /// <summary>
-        /// Has slept an average of 4 hours per day in the last three days.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Has slept an average of 4 hours per day in the last three days.")]
-        HasSleptAnAverageOf4HoursPerDayInTheLastThreeDays = 4,
-
-        /// <summary>
-        /// Has slept an average of 5 hours per day in the last three days.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Has slept an average of 5 hours per day in the last three days.")]
-        HasSleptAnAverageOf5HoursPerDayInTheLastThreeDays = 5,
-
-        /// <summary>
-        /// Has slept an average of 6 hours per day in the last three days.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Has slept an average of 6 hours per day in the last three days.")]
-        HasSleptAnAverageOf6HoursPerDayInTheLastThreeDays = 6,
-
-        /// <summary>
-        /// Has slept an average of 7 hours per day in the last three days.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Has slept an average of 7 hours per day in the last three days.")]
-        HasSleptAnAverageOf7HoursPerDayInTheLastThreeDays = 7,
-
-        /// <summary>
-        /// Fully rested (Has slept an average of 8 hours per day in the last three days).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fully rested (Has slept an average of 8 hours per day in the last three days).")]
-        FullyRestedHasSleptAnAverageOf8HoursPerDayInTheLastThreeDays = 8
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for GroupOfRestStatus (eman.isgroupof.reststatus, Rest Status, 
+    /// section 11.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum GroupOfRestStatus : byte
+    {
+        /// <summary>
+        /// Not rested (Has not slept in the last three days).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Not rested (Has not slept in the last three days).")]
+        NotRestedHasNotSleptInTheLastThreeDays = 0,
+
+        /// <summary>
+        /// Has slept an average of 1 hour per day in the last three days.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Has slept an average of 1 hour per day in the last three days.")]
+        HasSleptAnAverageOf1HourPerDayInTheLastThreeDays = 1,
+
+        /// <summary>
+        /// Has slept an average of 2 hours per day in the last three days.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Has slept an average of 2 hours per day in the last three days.")]
+        HasSleptAnAverageOf2HoursPerDayInTheLastThreeDays = 2,
+
+        /// <summary>
+        /// Has slept an average of 3 hours per day in the last three days.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Has slept an average of 3 hours per day in the last three days.")]
+        HasSleptAnAverageOf3HoursPerDayInTheLastThreeDays = 3,
+
+        /// <summary>
+        /// Has slept an average of 4 hours per day in the last three days.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Has slept an average of 4 hours per day in the last three days.")]
+        HasSleptAnAverageOf4HoursPerDayInTheLastThreeDays = 4,
+
+        /// <summary>
+        /// Has slept an average of 5 hours per day in the last three days.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Has slept an average of 5 hours per day in the last three days.")]
+        HasSleptAnAverageOf5HoursPerDayInTheLastThreeDays = 5,
+
+        /// <summary>
+        /// Has slept an average of 6 hours per day in the last three days.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Has slept an average of 6 hours per day in the last three days.")]
+        HasSleptAnAverageOf6HoursPerDayInTheLastThreeDays = 6,
+
+        /// <summary>
+        /// Has slept an average of 7 hours per day in the last three days.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Has slept an average of 7 hours per day in the last three days.")]
+        HasSleptAnAverageOf7HoursPerDayInTheLastThreeDays = 7,
+
+        /// <summary>
+        /// Fully rested (Has slept an average of 8 hours per day in the last three days).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fully rested (Has slept an average of 8 hours per day in the last three days).")]
+        FullyRestedHasSleptAnAverageOf8HoursPerDayInTheLastThreeDays = 8
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfNature.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/PartOfNature.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfNature.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/PartOfNature.cs
index d5d709c..afd2fc3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfNature.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/PartOfNature.cs
@@ -1,139 +1,139 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for PartOfNature (eman.ispartof.nature, Nature, 
-    /// section 11.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum PartOfNature : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Host-fireable munition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Host-fireable munition.")]
-        HostFireableMunition = 1,
-
-        /// <summary>
-        /// Munition carried as cargo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Munition carried as cargo.")]
-        MunitionCarriedAsCargo = 2,
-
-        /// <summary>
-        /// Fuel carried as cargo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuel carried as cargo.")]
-        FuelCarriedAsCargo = 3,
-
-        /// <summary>
-        /// Gunmount attached to host.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gunmount attached to host.")]
-        GunmountAttachedToHost = 4,
-
-        /// <summary>
-        /// Computer generated forces carried as cargo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Computer generated forces carried as cargo.")]
-        ComputerGeneratedForcesCarriedAsCargo = 5,
-
-        /// <summary>
-        /// Vehicle carried as cargo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vehicle carried as cargo.")]
-        VehicleCarriedAsCargo = 6,
-
-        /// <summary>
-        /// Emitter mounted on host.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Emitter mounted on host.")]
-        EmitterMountedOnHost = 7,
-
-        /// <summary>
-        /// Mobile command and control entity carried aboard host.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mobile command and control entity carried aboard host.")]
-        MobileCommandAndControlEntityCarriedAboardHost = 8,
-
-        /// <summary>
-        /// Entity stationed at position with respect to host.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity stationed at position with respect to host.")]
-        EntityStationedAtPositionWithRespectToHost = 9,
-
-        /// <summary>
-        /// Team member in formation with.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Team member in formation with.")]
-        TeamMemberInFormationWith = 10
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for PartOfNature (eman.ispartof.nature, Nature, 
+    /// section 11.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum PartOfNature : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Host-fireable munition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Host-fireable munition.")]
+        HostFireableMunition = 1,
+
+        /// <summary>
+        /// Munition carried as cargo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Munition carried as cargo.")]
+        MunitionCarriedAsCargo = 2,
+
+        /// <summary>
+        /// Fuel carried as cargo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuel carried as cargo.")]
+        FuelCarriedAsCargo = 3,
+
+        /// <summary>
+        /// Gunmount attached to host.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gunmount attached to host.")]
+        GunmountAttachedToHost = 4,
+
+        /// <summary>
+        /// Computer generated forces carried as cargo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Computer generated forces carried as cargo.")]
+        ComputerGeneratedForcesCarriedAsCargo = 5,
+
+        /// <summary>
+        /// Vehicle carried as cargo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vehicle carried as cargo.")]
+        VehicleCarriedAsCargo = 6,
+
+        /// <summary>
+        /// Emitter mounted on host.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Emitter mounted on host.")]
+        EmitterMountedOnHost = 7,
+
+        /// <summary>
+        /// Mobile command and control entity carried aboard host.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mobile command and control entity carried aboard host.")]
+        MobileCommandAndControlEntityCarriedAboardHost = 8,
+
+        /// <summary>
+        /// Entity stationed at position with respect to host.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity stationed at position with respect to host.")]
+        EntityStationedAtPositionWithRespectToHost = 9,
+
+        /// <summary>
+        /// Team member in formation with.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Team member in formation with.")]
+        TeamMemberInFormationWith = 10
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/PartOfPosition.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/PartOfPosition.cs
index f76e8d5..2efa4e5 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfPosition.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/PartOfPosition.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for PartOfPosition (eman.ispartof.position, Position, 
-    /// section 11.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum PartOfPosition : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// On top of.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On top of.")]
-        OnTopOf = 1,
-
-        /// <summary>
-        /// Inside of.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inside of.")]
-        InsideOf = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for PartOfPosition (eman.ispartof.position, Position, 
+    /// section 11.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum PartOfPosition : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// On top of.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On top of.")]
+        OnTopOf = 1,
+
+        /// <summary>
+        /// Inside of.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inside of.")]
+        InsideOf = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/PartOfStationName.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/PartOfStationName.cs
index 43e15a4..ab16703 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/PartOfStationName.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/PartOfStationName.cs
@@ -1,199 +1,199 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for PartOfStationName (eman.ispartof.stationname, Station Name, 
-    /// section 11.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum PartOfStationName : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Aircraft wingstation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aircraft wingstation.")]
-        AircraftWingstation = 1,
-
-        /// <summary>
-        /// Ship's forward gunmount (starboard).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship's forward gunmount (starboard).")]
-        ShipSForwardGunmountStarboard = 2,
-
-        /// <summary>
-        /// Ship's forward gunmount (port).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship's forward gunmount (port).")]
-        ShipSForwardGunmountPort = 3,
-
-        /// <summary>
-        /// Ship's forward gunmount (centerline).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship's forward gunmount (centerline).")]
-        ShipSForwardGunmountCenterline = 4,
-
-        /// <summary>
-        /// Ship's aft gunmount (starboard).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship's aft gunmount (starboard).")]
-        ShipSAftGunmountStarboard = 5,
-
-        /// <summary>
-        /// Ship's aft gunmount (port).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship's aft gunmount (port).")]
-        ShipSAftGunmountPort = 6,
-
-        /// <summary>
-        /// Ship's aft gunmount (centerline).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ship's aft gunmount (centerline).")]
-        ShipSAftGunmountCenterline = 7,
-
-        /// <summary>
-        /// Forward torpedo tube.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Forward torpedo tube.")]
-        ForwardTorpedoTube = 8,
-
-        /// <summary>
-        /// Aft torpedo tube.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aft torpedo tube.")]
-        AftTorpedoTube = 9,
-
-        /// <summary>
-        /// Bomb bay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bomb bay.")]
-        BombBay = 10,
-
-        /// <summary>
-        /// Cargo bay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cargo bay.")]
-        CargoBay = 11,
-
-        /// <summary>
-        /// Truck bed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Truck bed.")]
-        TruckBed = 12,
-
-        /// <summary>
-        /// Trailer bed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trailer bed.")]
-        TrailerBed = 13,
-
-        /// <summary>
-        /// Well deck.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Well deck.")]
-        WellDeck = 14,
-
-        /// <summary>
-        /// On station - (RNG/BRG).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On station - (RNG/BRG).")]
-        OnStationRNGBRG = 15,
-
-        /// <summary>
-        /// On station - (x,y,z).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On station - (x,y,z).")]
-        OnStationXYZ = 16
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for PartOfStationName (eman.ispartof.stationname, Station Name, 
+    /// section 11.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum PartOfStationName : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Aircraft wingstation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aircraft wingstation.")]
+        AircraftWingstation = 1,
+
+        /// <summary>
+        /// Ship's forward gunmount (starboard).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship's forward gunmount (starboard).")]
+        ShipSForwardGunmountStarboard = 2,
+
+        /// <summary>
+        /// Ship's forward gunmount (port).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship's forward gunmount (port).")]
+        ShipSForwardGunmountPort = 3,
+
+        /// <summary>
+        /// Ship's forward gunmount (centerline).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship's forward gunmount (centerline).")]
+        ShipSForwardGunmountCenterline = 4,
+
+        /// <summary>
+        /// Ship's aft gunmount (starboard).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship's aft gunmount (starboard).")]
+        ShipSAftGunmountStarboard = 5,
+
+        /// <summary>
+        /// Ship's aft gunmount (port).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship's aft gunmount (port).")]
+        ShipSAftGunmountPort = 6,
+
+        /// <summary>
+        /// Ship's aft gunmount (centerline).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ship's aft gunmount (centerline).")]
+        ShipSAftGunmountCenterline = 7,
+
+        /// <summary>
+        /// Forward torpedo tube.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Forward torpedo tube.")]
+        ForwardTorpedoTube = 8,
+
+        /// <summary>
+        /// Aft torpedo tube.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aft torpedo tube.")]
+        AftTorpedoTube = 9,
+
+        /// <summary>
+        /// Bomb bay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bomb bay.")]
+        BombBay = 10,
+
+        /// <summary>
+        /// Cargo bay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cargo bay.")]
+        CargoBay = 11,
+
+        /// <summary>
+        /// Truck bed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Truck bed.")]
+        TruckBed = 12,
+
+        /// <summary>
+        /// Trailer bed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trailer bed.")]
+        TrailerBed = 13,
+
+        /// <summary>
+        /// Well deck.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Well deck.")]
+        WellDeck = 14,
+
+        /// <summary>
+        /// On station - (RNG/BRG).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On station - (RNG/BRG).")]
+        OnStationRNGBRG = 15,
+
+        /// <summary>
+        /// On station - (x,y,z).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On station - (x,y,z).")]
+        OnStationXYZ = 16
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/TransferType.cs b/Libs/CsharpDis6/Enumerations/Entity.Management/TransferType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/TransferType.cs
rename to Libs/CsharpDis6/Enumerations/Entity.Management/TransferType.cs
index b5d3214..06c82a3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Entity.Management/TransferType.cs
+++ b/Libs/CsharpDis6/Enumerations/Entity.Management/TransferType.cs
@@ -1,109 +1,109 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Entity.Management
-{
-    /// <summary>
-    /// Enumeration values for TransferType (eman.tc.transfertype, Transfer Type, 
-    /// section 11.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum TransferType : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Controlling application requests transfer of an entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Controlling application requests transfer of an entity.")]
-        ControllingApplicationRequestsTransferOfAnEntity = 1,
-
-        /// <summary>
-        /// Application desiring control requests transfer of an entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Application desiring control requests transfer of an entity.")]
-        ApplicationDesiringControlRequestsTransferOfAnEntity = 2,
-
-        /// <summary>
-        /// Mutual exchange / swap of an entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mutual exchange / swap of an entity.")]
-        MutualExchangeSwapOfAnEntity = 3,
-
-        /// <summary>
-        /// Controlling application requests transfer of an environmental process.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Controlling application requests transfer of an environmental process.")]
-        ControllingApplicationRequestsTransferOfAnEnvironmentalProcess = 4,
-
-        /// <summary>
-        /// Application desiring controls requests transfer of an environmental process.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Application desiring controls requests transfer of an environmental process.")]
-        ApplicationDesiringControlsRequestsTransferOfAnEnvironmentalProcess = 5,
-
-        /// <summary>
-        /// Mutual exchange / swap of an environmental.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mutual exchange / swap of an environmental.")]
-        MutualExchangeSwapOfAnEnvironmental = 6,
-
-        /// <summary>
-        /// Cancel transfer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cancel transfer.")]
-        CancelTransfer = 7
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Entity.Management
+{
+    /// <summary>
+    /// Enumeration values for TransferType (eman.tc.transfertype, Transfer Type, 
+    /// section 11.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum TransferType : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Controlling application requests transfer of an entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Controlling application requests transfer of an entity.")]
+        ControllingApplicationRequestsTransferOfAnEntity = 1,
+
+        /// <summary>
+        /// Application desiring control requests transfer of an entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Application desiring control requests transfer of an entity.")]
+        ApplicationDesiringControlRequestsTransferOfAnEntity = 2,
+
+        /// <summary>
+        /// Mutual exchange / swap of an entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mutual exchange / swap of an entity.")]
+        MutualExchangeSwapOfAnEntity = 3,
+
+        /// <summary>
+        /// Controlling application requests transfer of an environmental process.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Controlling application requests transfer of an environmental process.")]
+        ControllingApplicationRequestsTransferOfAnEnvironmentalProcess = 4,
+
+        /// <summary>
+        /// Application desiring controls requests transfer of an environmental process.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Application desiring controls requests transfer of an environmental process.")]
+        ApplicationDesiringControlsRequestsTransferOfAnEnvironmentalProcess = 5,
+
+        /// <summary>
+        /// Mutual exchange / swap of an environmental.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mutual exchange / swap of an environmental.")]
+        MutualExchangeSwapOfAnEnvironmental = 6,
+
+        /// <summary>
+        /// Cancel transfer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cancel transfer.")]
+        CancelTransfer = 7
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
index c72b42d..476be9e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/AirPlatformAppearance.cs
@@ -1,928 +1,928 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for AirPlatformAppearance (es.appear.platform.air, Platforms of the Air Domain, 
-    /// section 4.3.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct AirPlatformAppearance
-    {
-        /// <summary>
-        /// Describes the paint scheme of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the paint scheme of an entity")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Uniform color
-            /// </summary>
-            UniformColor = 0,
-
-            /// <summary>
-            /// Camouflage
-            /// </summary>
-            Camouflage = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of Propulsion kill
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of Propulsion kill")]
-        public enum PropulsionValue : uint
-        {
-            /// <summary>
-            /// No Propulsion kill
-            /// </summary>
-            NoPropulsionKill = 0,
-
-            /// <summary>
-            /// Propulsion kill
-            /// </summary>
-            PropulsionKill = 1
-        }
-
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status or location of smoke emanating from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status or location of smoke emanating from an entity")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke plume rising from the entity
-            /// </summary>
-            SmokePlumeRisingFromTheEntity = 1,
-
-            /// <summary>
-            /// Entity is emitting engine smoke
-            /// </summary>
-            EntityIsEmittingEngineSmoke = 2,
-
-            /// <summary>
-            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
-            /// </summary>
-            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
-        }
-
-        /// <summary>
-        /// Describes the size of the contrails or ionization trailing effects from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the size of the contrails or ionization trailing effects from an entity")]
-        public enum TrailingEffectsValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Small
-            /// </summary>
-            Small = 1,
-
-            /// <summary>
-            /// Medium
-            /// </summary>
-            Medium = 2,
-
-            /// <summary>
-            /// Large
-            /// </summary>
-            Large = 3
-        }
-
-        /// <summary>
-        /// Describes the state of the canopy
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of the canopy")]
-        public enum CanopyValue : uint
-        {
-            /// <summary>
-            /// Not applicable
-            /// </summary>
-            NotApplicable = 0,
-
-            /// <summary>
-            /// Canopy is closed
-            /// </summary>
-            CanopyIsClosed = 1,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 2,
-
-            /// <summary>
-            /// Canopy is open
-            /// </summary>
-            CanopyIsOpen = 4,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown2 = 5
-        }
-
-        /// <summary>
-        /// Describes whether Landing Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Landing Lights are on or off.")]
-        public enum LandingLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Navigation Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Navigation Lights are on or off.")]
-        public enum NavigationLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Anti-Collision Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Anti-Collision Lights are on or off.")]
-        public enum AntiCollisionLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether flames are trailing from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are trailing from an entity")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the status of an air platform's afterburner
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the status of an air platform's afterburner")]
-        public enum AfterburnerValue : uint
-        {
-            /// <summary>
-            /// Afterburner not on
-            /// </summary>
-            AfterburnerNotOn = 0,
-
-            /// <summary>
-            /// Afterburner on
-            /// </summary>
-            AfterburnerOn = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a air platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a air platform")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the power-plant status of platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the power-plant status of platform")]
-        public enum PowerPlantStatusValue : uint
-        {
-            /// <summary>
-            /// Power plant off
-            /// </summary>
-            PowerPlantOff = 0,
-
-            /// <summary>
-            /// Power plant on
-            /// </summary>
-            PowerPlantOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a air platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a air platform")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes whether Formation Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Formation Lights are on or off.")]
-        public enum FormationLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Spot Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Spot Lights are on or off.")]
-        public enum SpotLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Interior Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Interior Lights are on or off.")]
-        public enum InteriorLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        private AirPlatformAppearance.PaintSchemeValue paintScheme;
-        private AirPlatformAppearance.PropulsionValue propulsion;
-        private AirPlatformAppearance.DamageValue damage;
-        private AirPlatformAppearance.SmokeValue smoke;
-        private AirPlatformAppearance.TrailingEffectsValue trailingEffects;
-        private AirPlatformAppearance.CanopyValue canopy;
-        private AirPlatformAppearance.LandingLightsValue landingLights;
-        private AirPlatformAppearance.NavigationLightsValue navigationLights;
-        private AirPlatformAppearance.AntiCollisionLightsValue antiCollisionLights;
-        private AirPlatformAppearance.FlamingValue flaming;
-        private AirPlatformAppearance.AfterburnerValue afterburner;
-        private AirPlatformAppearance.FrozenStatusValue frozenStatus;
-        private AirPlatformAppearance.PowerPlantStatusValue powerPlantStatus;
-        private AirPlatformAppearance.StateValue state;
-        private AirPlatformAppearance.FormationLightsValue formationLights;
-        private AirPlatformAppearance.SpotLightsValue spotLights;
-        private AirPlatformAppearance.InteriorLightsValue interiorLights;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AirPlatformAppearance left, AirPlatformAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AirPlatformAppearance left, AirPlatformAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(AirPlatformAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator AirPlatformAppearance(uint value)
-        {
-            return AirPlatformAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static AirPlatformAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance, represented by the uint value.</returns>
-        public static AirPlatformAppearance FromUInt32(uint value)
-        {
-            AirPlatformAppearance ps = new AirPlatformAppearance();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PaintScheme = (AirPlatformAppearance.PaintSchemeValue)newValue0;
-
-            uint mask1 = 0x0002;
-            byte shift1 = 1;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Propulsion = (AirPlatformAppearance.PropulsionValue)newValue1;
-
-            uint mask3 = 0x0018;
-            byte shift3 = 3;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (AirPlatformAppearance.DamageValue)newValue3;
-
-            uint mask4 = 0x0060;
-            byte shift4 = 5;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Smoke = (AirPlatformAppearance.SmokeValue)newValue4;
-
-            uint mask5 = 0x0180;
-            byte shift5 = 7;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.TrailingEffects = (AirPlatformAppearance.TrailingEffectsValue)newValue5;
-
-            uint mask6 = 0x0e00;
-            byte shift6 = 9;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Canopy = (AirPlatformAppearance.CanopyValue)newValue6;
-
-            uint mask7 = 0x1000;
-            byte shift7 = 12;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.LandingLights = (AirPlatformAppearance.LandingLightsValue)newValue7;
-
-            uint mask8 = 0x2000;
-            byte shift8 = 13;
-            uint newValue8 = (value & mask8) >> shift8;
-            ps.NavigationLights = (AirPlatformAppearance.NavigationLightsValue)newValue8;
-
-            uint mask9 = 0x4000;
-            byte shift9 = 14;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.AntiCollisionLights = (AirPlatformAppearance.AntiCollisionLightsValue)newValue9;
-
-            uint mask10 = 0x8000;
-            byte shift10 = 15;
-            uint newValue10 = (value & mask10) >> shift10;
-            ps.Flaming = (AirPlatformAppearance.FlamingValue)newValue10;
-
-            uint mask11 = 0x10000;
-            byte shift11 = 16;
-            uint newValue11 = (value & mask11) >> shift11;
-            ps.Afterburner = (AirPlatformAppearance.AfterburnerValue)newValue11;
-
-            uint mask13 = 0x200000;
-            byte shift13 = 21;
-            uint newValue13 = (value & mask13) >> shift13;
-            ps.FrozenStatus = (AirPlatformAppearance.FrozenStatusValue)newValue13;
-
-            uint mask14 = 0x400000;
-            byte shift14 = 22;
-            uint newValue14 = (value & mask14) >> shift14;
-            ps.PowerPlantStatus = (AirPlatformAppearance.PowerPlantStatusValue)newValue14;
-
-            uint mask15 = 0x800000;
-            byte shift15 = 23;
-            uint newValue15 = (value & mask15) >> shift15;
-            ps.State = (AirPlatformAppearance.StateValue)newValue15;
-
-            uint mask16 = 0x1000000;
-            byte shift16 = 24;
-            uint newValue16 = (value & mask16) >> shift16;
-            ps.FormationLights = (AirPlatformAppearance.FormationLightsValue)newValue16;
-
-            uint mask18 = 0x10000000;
-            byte shift18 = 28;
-            uint newValue18 = (value & mask18) >> shift18;
-            ps.SpotLights = (AirPlatformAppearance.SpotLightsValue)newValue18;
-
-            uint mask19 = 0x20000000;
-            byte shift19 = 29;
-            uint newValue19 = (value & mask19) >> shift19;
-            ps.InteriorLights = (AirPlatformAppearance.InteriorLightsValue)newValue19;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the paintscheme.
-        /// </summary>
-        /// <value>The paintscheme.</value>
-        public AirPlatformAppearance.PaintSchemeValue PaintScheme
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the propulsion.
-        /// </summary>
-        /// <value>The propulsion.</value>
-        public AirPlatformAppearance.PropulsionValue Propulsion
-        {
-            get { return this.propulsion; }
-            set { this.propulsion = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public AirPlatformAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public AirPlatformAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the trailingeffects.
-        /// </summary>
-        /// <value>The trailingeffects.</value>
-        public AirPlatformAppearance.TrailingEffectsValue TrailingEffects
-        {
-            get { return this.trailingEffects; }
-            set { this.trailingEffects = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the canopy.
-        /// </summary>
-        /// <value>The canopy.</value>
-        public AirPlatformAppearance.CanopyValue Canopy
-        {
-            get { return this.canopy; }
-            set { this.canopy = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the landinglights.
-        /// </summary>
-        /// <value>The landinglights.</value>
-        public AirPlatformAppearance.LandingLightsValue LandingLights
-        {
-            get { return this.landingLights; }
-            set { this.landingLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the navigationlights.
-        /// </summary>
-        /// <value>The navigationlights.</value>
-        public AirPlatformAppearance.NavigationLightsValue NavigationLights
-        {
-            get { return this.navigationLights; }
-            set { this.navigationLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the anticollisionlights.
-        /// </summary>
-        /// <value>The anticollisionlights.</value>
-        public AirPlatformAppearance.AntiCollisionLightsValue AntiCollisionLights
-        {
-            get { return this.antiCollisionLights; }
-            set { this.antiCollisionLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public AirPlatformAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the afterburner.
-        /// </summary>
-        /// <value>The afterburner.</value>
-        public AirPlatformAppearance.AfterburnerValue Afterburner
-        {
-            get { return this.afterburner; }
-            set { this.afterburner = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public AirPlatformAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerplantstatus.
-        /// </summary>
-        /// <value>The powerplantstatus.</value>
-        public AirPlatformAppearance.PowerPlantStatusValue PowerPlantStatus
-        {
-            get { return this.powerPlantStatus; }
-            set { this.powerPlantStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public AirPlatformAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the formationlights.
-        /// </summary>
-        /// <value>The formationlights.</value>
-        public AirPlatformAppearance.FormationLightsValue FormationLights
-        {
-            get { return this.formationLights; }
-            set { this.formationLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the spotlights.
-        /// </summary>
-        /// <value>The spotlights.</value>
-        public AirPlatformAppearance.SpotLightsValue SpotLights
-        {
-            get { return this.spotLights; }
-            set { this.spotLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the interiorlights.
-        /// </summary>
-        /// <value>The interiorlights.</value>
-        public AirPlatformAppearance.InteriorLightsValue InteriorLights
-        {
-            get { return this.interiorLights; }
-            set { this.interiorLights = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is AirPlatformAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((AirPlatformAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AirPlatformAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PaintScheme == other.PaintScheme &&
-                this.Propulsion == other.Propulsion &&
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.TrailingEffects == other.TrailingEffects &&
-                this.Canopy == other.Canopy &&
-                this.LandingLights == other.LandingLights &&
-                this.NavigationLights == other.NavigationLights &&
-                this.AntiCollisionLights == other.AntiCollisionLights &&
-                this.Flaming == other.Flaming &&
-                this.Afterburner == other.Afterburner &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.PowerPlantStatus == other.PowerPlantStatus &&
-                this.State == other.State &&
-                this.FormationLights == other.FormationLights &&
-                this.SpotLights == other.SpotLights &&
-                this.InteriorLights == other.InteriorLights;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.PaintScheme << 0);
-            val |= (uint)((uint)this.Propulsion << 1);
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.TrailingEffects << 7);
-            val |= (uint)((uint)this.Canopy << 9);
-            val |= (uint)((uint)this.LandingLights << 12);
-            val |= (uint)((uint)this.NavigationLights << 13);
-            val |= (uint)((uint)this.AntiCollisionLights << 14);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.Afterburner << 16);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.PowerPlantStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.FormationLights << 24);
-            val |= (uint)((uint)this.SpotLights << 28);
-            val |= (uint)((uint)this.InteriorLights << 29);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PaintScheme.GetHashCode();
-                hash = (hash * 29) + this.Propulsion.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
-                hash = (hash * 29) + this.Canopy.GetHashCode();
-                hash = (hash * 29) + this.LandingLights.GetHashCode();
-                hash = (hash * 29) + this.NavigationLights.GetHashCode();
-                hash = (hash * 29) + this.AntiCollisionLights.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.Afterburner.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.FormationLights.GetHashCode();
-                hash = (hash * 29) + this.SpotLights.GetHashCode();
-                hash = (hash * 29) + this.InteriorLights.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for AirPlatformAppearance (es.appear.platform.air, Platforms of the Air Domain, 
+    /// section 4.3.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct AirPlatformAppearance
+    {
+        /// <summary>
+        /// Describes the paint scheme of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the paint scheme of an entity")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Uniform color
+            /// </summary>
+            UniformColor = 0,
+
+            /// <summary>
+            /// Camouflage
+            /// </summary>
+            Camouflage = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of Propulsion kill
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of Propulsion kill")]
+        public enum PropulsionValue : uint
+        {
+            /// <summary>
+            /// No Propulsion kill
+            /// </summary>
+            NoPropulsionKill = 0,
+
+            /// <summary>
+            /// Propulsion kill
+            /// </summary>
+            PropulsionKill = 1
+        }
+
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status or location of smoke emanating from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status or location of smoke emanating from an entity")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke plume rising from the entity
+            /// </summary>
+            SmokePlumeRisingFromTheEntity = 1,
+
+            /// <summary>
+            /// Entity is emitting engine smoke
+            /// </summary>
+            EntityIsEmittingEngineSmoke = 2,
+
+            /// <summary>
+            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
+            /// </summary>
+            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
+        }
+
+        /// <summary>
+        /// Describes the size of the contrails or ionization trailing effects from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the size of the contrails or ionization trailing effects from an entity")]
+        public enum TrailingEffectsValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Small
+            /// </summary>
+            Small = 1,
+
+            /// <summary>
+            /// Medium
+            /// </summary>
+            Medium = 2,
+
+            /// <summary>
+            /// Large
+            /// </summary>
+            Large = 3
+        }
+
+        /// <summary>
+        /// Describes the state of the canopy
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of the canopy")]
+        public enum CanopyValue : uint
+        {
+            /// <summary>
+            /// Not applicable
+            /// </summary>
+            NotApplicable = 0,
+
+            /// <summary>
+            /// Canopy is closed
+            /// </summary>
+            CanopyIsClosed = 1,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 2,
+
+            /// <summary>
+            /// Canopy is open
+            /// </summary>
+            CanopyIsOpen = 4,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown2 = 5
+        }
+
+        /// <summary>
+        /// Describes whether Landing Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Landing Lights are on or off.")]
+        public enum LandingLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Navigation Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Navigation Lights are on or off.")]
+        public enum NavigationLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Anti-Collision Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Anti-Collision Lights are on or off.")]
+        public enum AntiCollisionLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether flames are trailing from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are trailing from an entity")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the status of an air platform's afterburner
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the status of an air platform's afterburner")]
+        public enum AfterburnerValue : uint
+        {
+            /// <summary>
+            /// Afterburner not on
+            /// </summary>
+            AfterburnerNotOn = 0,
+
+            /// <summary>
+            /// Afterburner on
+            /// </summary>
+            AfterburnerOn = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a air platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a air platform")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the power-plant status of platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the power-plant status of platform")]
+        public enum PowerPlantStatusValue : uint
+        {
+            /// <summary>
+            /// Power plant off
+            /// </summary>
+            PowerPlantOff = 0,
+
+            /// <summary>
+            /// Power plant on
+            /// </summary>
+            PowerPlantOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a air platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a air platform")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes whether Formation Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Formation Lights are on or off.")]
+        public enum FormationLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Spot Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Spot Lights are on or off.")]
+        public enum SpotLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Interior Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Interior Lights are on or off.")]
+        public enum InteriorLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        private AirPlatformAppearance.PaintSchemeValue paintScheme;
+        private AirPlatformAppearance.PropulsionValue propulsion;
+        private AirPlatformAppearance.DamageValue damage;
+        private AirPlatformAppearance.SmokeValue smoke;
+        private AirPlatformAppearance.TrailingEffectsValue trailingEffects;
+        private AirPlatformAppearance.CanopyValue canopy;
+        private AirPlatformAppearance.LandingLightsValue landingLights;
+        private AirPlatformAppearance.NavigationLightsValue navigationLights;
+        private AirPlatformAppearance.AntiCollisionLightsValue antiCollisionLights;
+        private AirPlatformAppearance.FlamingValue flaming;
+        private AirPlatformAppearance.AfterburnerValue afterburner;
+        private AirPlatformAppearance.FrozenStatusValue frozenStatus;
+        private AirPlatformAppearance.PowerPlantStatusValue powerPlantStatus;
+        private AirPlatformAppearance.StateValue state;
+        private AirPlatformAppearance.FormationLightsValue formationLights;
+        private AirPlatformAppearance.SpotLightsValue spotLights;
+        private AirPlatformAppearance.InteriorLightsValue interiorLights;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AirPlatformAppearance left, AirPlatformAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AirPlatformAppearance left, AirPlatformAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(AirPlatformAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator AirPlatformAppearance(uint value)
+        {
+            return AirPlatformAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static AirPlatformAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance, represented by the uint value.</returns>
+        public static AirPlatformAppearance FromUInt32(uint value)
+        {
+            AirPlatformAppearance ps = new AirPlatformAppearance();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PaintScheme = (AirPlatformAppearance.PaintSchemeValue)newValue0;
+
+            uint mask1 = 0x0002;
+            byte shift1 = 1;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Propulsion = (AirPlatformAppearance.PropulsionValue)newValue1;
+
+            uint mask3 = 0x0018;
+            byte shift3 = 3;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (AirPlatformAppearance.DamageValue)newValue3;
+
+            uint mask4 = 0x0060;
+            byte shift4 = 5;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Smoke = (AirPlatformAppearance.SmokeValue)newValue4;
+
+            uint mask5 = 0x0180;
+            byte shift5 = 7;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.TrailingEffects = (AirPlatformAppearance.TrailingEffectsValue)newValue5;
+
+            uint mask6 = 0x0e00;
+            byte shift6 = 9;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Canopy = (AirPlatformAppearance.CanopyValue)newValue6;
+
+            uint mask7 = 0x1000;
+            byte shift7 = 12;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.LandingLights = (AirPlatformAppearance.LandingLightsValue)newValue7;
+
+            uint mask8 = 0x2000;
+            byte shift8 = 13;
+            uint newValue8 = (value & mask8) >> shift8;
+            ps.NavigationLights = (AirPlatformAppearance.NavigationLightsValue)newValue8;
+
+            uint mask9 = 0x4000;
+            byte shift9 = 14;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.AntiCollisionLights = (AirPlatformAppearance.AntiCollisionLightsValue)newValue9;
+
+            uint mask10 = 0x8000;
+            byte shift10 = 15;
+            uint newValue10 = (value & mask10) >> shift10;
+            ps.Flaming = (AirPlatformAppearance.FlamingValue)newValue10;
+
+            uint mask11 = 0x10000;
+            byte shift11 = 16;
+            uint newValue11 = (value & mask11) >> shift11;
+            ps.Afterburner = (AirPlatformAppearance.AfterburnerValue)newValue11;
+
+            uint mask13 = 0x200000;
+            byte shift13 = 21;
+            uint newValue13 = (value & mask13) >> shift13;
+            ps.FrozenStatus = (AirPlatformAppearance.FrozenStatusValue)newValue13;
+
+            uint mask14 = 0x400000;
+            byte shift14 = 22;
+            uint newValue14 = (value & mask14) >> shift14;
+            ps.PowerPlantStatus = (AirPlatformAppearance.PowerPlantStatusValue)newValue14;
+
+            uint mask15 = 0x800000;
+            byte shift15 = 23;
+            uint newValue15 = (value & mask15) >> shift15;
+            ps.State = (AirPlatformAppearance.StateValue)newValue15;
+
+            uint mask16 = 0x1000000;
+            byte shift16 = 24;
+            uint newValue16 = (value & mask16) >> shift16;
+            ps.FormationLights = (AirPlatformAppearance.FormationLightsValue)newValue16;
+
+            uint mask18 = 0x10000000;
+            byte shift18 = 28;
+            uint newValue18 = (value & mask18) >> shift18;
+            ps.SpotLights = (AirPlatformAppearance.SpotLightsValue)newValue18;
+
+            uint mask19 = 0x20000000;
+            byte shift19 = 29;
+            uint newValue19 = (value & mask19) >> shift19;
+            ps.InteriorLights = (AirPlatformAppearance.InteriorLightsValue)newValue19;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the paintscheme.
+        /// </summary>
+        /// <value>The paintscheme.</value>
+        public AirPlatformAppearance.PaintSchemeValue PaintScheme
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the propulsion.
+        /// </summary>
+        /// <value>The propulsion.</value>
+        public AirPlatformAppearance.PropulsionValue Propulsion
+        {
+            get { return this.propulsion; }
+            set { this.propulsion = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public AirPlatformAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public AirPlatformAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the trailingeffects.
+        /// </summary>
+        /// <value>The trailingeffects.</value>
+        public AirPlatformAppearance.TrailingEffectsValue TrailingEffects
+        {
+            get { return this.trailingEffects; }
+            set { this.trailingEffects = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the canopy.
+        /// </summary>
+        /// <value>The canopy.</value>
+        public AirPlatformAppearance.CanopyValue Canopy
+        {
+            get { return this.canopy; }
+            set { this.canopy = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the landinglights.
+        /// </summary>
+        /// <value>The landinglights.</value>
+        public AirPlatformAppearance.LandingLightsValue LandingLights
+        {
+            get { return this.landingLights; }
+            set { this.landingLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the navigationlights.
+        /// </summary>
+        /// <value>The navigationlights.</value>
+        public AirPlatformAppearance.NavigationLightsValue NavigationLights
+        {
+            get { return this.navigationLights; }
+            set { this.navigationLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the anticollisionlights.
+        /// </summary>
+        /// <value>The anticollisionlights.</value>
+        public AirPlatformAppearance.AntiCollisionLightsValue AntiCollisionLights
+        {
+            get { return this.antiCollisionLights; }
+            set { this.antiCollisionLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public AirPlatformAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the afterburner.
+        /// </summary>
+        /// <value>The afterburner.</value>
+        public AirPlatformAppearance.AfterburnerValue Afterburner
+        {
+            get { return this.afterburner; }
+            set { this.afterburner = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public AirPlatformAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerplantstatus.
+        /// </summary>
+        /// <value>The powerplantstatus.</value>
+        public AirPlatformAppearance.PowerPlantStatusValue PowerPlantStatus
+        {
+            get { return this.powerPlantStatus; }
+            set { this.powerPlantStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public AirPlatformAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the formationlights.
+        /// </summary>
+        /// <value>The formationlights.</value>
+        public AirPlatformAppearance.FormationLightsValue FormationLights
+        {
+            get { return this.formationLights; }
+            set { this.formationLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the spotlights.
+        /// </summary>
+        /// <value>The spotlights.</value>
+        public AirPlatformAppearance.SpotLightsValue SpotLights
+        {
+            get { return this.spotLights; }
+            set { this.spotLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the interiorlights.
+        /// </summary>
+        /// <value>The interiorlights.</value>
+        public AirPlatformAppearance.InteriorLightsValue InteriorLights
+        {
+            get { return this.interiorLights; }
+            set { this.interiorLights = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is AirPlatformAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((AirPlatformAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AirPlatformAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PaintScheme == other.PaintScheme &&
+                this.Propulsion == other.Propulsion &&
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.TrailingEffects == other.TrailingEffects &&
+                this.Canopy == other.Canopy &&
+                this.LandingLights == other.LandingLights &&
+                this.NavigationLights == other.NavigationLights &&
+                this.AntiCollisionLights == other.AntiCollisionLights &&
+                this.Flaming == other.Flaming &&
+                this.Afterburner == other.Afterburner &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.PowerPlantStatus == other.PowerPlantStatus &&
+                this.State == other.State &&
+                this.FormationLights == other.FormationLights &&
+                this.SpotLights == other.SpotLights &&
+                this.InteriorLights == other.InteriorLights;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.AirPlatformAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.PaintScheme << 0);
+            val |= (uint)((uint)this.Propulsion << 1);
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.TrailingEffects << 7);
+            val |= (uint)((uint)this.Canopy << 9);
+            val |= (uint)((uint)this.LandingLights << 12);
+            val |= (uint)((uint)this.NavigationLights << 13);
+            val |= (uint)((uint)this.AntiCollisionLights << 14);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.Afterburner << 16);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.PowerPlantStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.FormationLights << 24);
+            val |= (uint)((uint)this.SpotLights << 28);
+            val |= (uint)((uint)this.InteriorLights << 29);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PaintScheme.GetHashCode();
+                hash = (hash * 29) + this.Propulsion.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
+                hash = (hash * 29) + this.Canopy.GetHashCode();
+                hash = (hash * 29) + this.LandingLights.GetHashCode();
+                hash = (hash * 29) + this.NavigationLights.GetHashCode();
+                hash = (hash * 29) + this.AntiCollisionLights.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.Afterburner.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.FormationLights.GetHashCode();
+                hash = (hash * 29) + this.SpotLights.GetHashCode();
+                hash = (hash * 29) + this.InteriorLights.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/CulturalAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/CulturalAppearance.cs
index e766517..a4e6ab2 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/CulturalAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/CulturalAppearance.cs
@@ -1,578 +1,578 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for CulturalAppearance (es.appear.cultural, Cultural Features Kind, 
-    /// section 4.3.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct CulturalAppearance
-    {
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status of smoke emanating from a Cultural Features object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status of smoke emanating from a Cultural Features object")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke plume rising from the entity
-            /// </summary>
-            SmokePlumeRisingFromTheEntity = 1,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 2
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from a Cultural Features object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from a Cultural Features object")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a Cultural Features object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a Cultural Features object")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. should be displayed as fixed at the current location even if non-zero velocity, acceleration or rotation data received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIEShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonZeroVelocityAccelerationOrRotationDataReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the Internal-Heat status
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the Internal-Heat status")]
-        public enum InternalHeatStatusValue : uint
-        {
-            /// <summary>
-            /// Internal-Heat off
-            /// </summary>
-            InternalHeatOff = 0,
-
-            /// <summary>
-            /// Internal-Heat on
-            /// </summary>
-            InternalHeatOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a Cultural object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a Cultural object")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes whether Exterior Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Exterior Lights are on or off.")]
-        public enum ExteriorLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Interior Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Interior Lights are on or off.")]
-        public enum InteriorLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes if the entity is Masked / Cloaked or Not
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes if the entity is Masked / Cloaked or Not")]
-        public enum MaskedCloakedValue : uint
-        {
-            /// <summary>
-            /// Not Masked / Not Cloaked
-            /// </summary>
-            NotMaskedNotCloaked = 0,
-
-            /// <summary>
-            /// Masked / Cloaked
-            /// </summary>
-            MaskedCloaked = 1
-        }
-
-        private CulturalAppearance.DamageValue damage;
-        private CulturalAppearance.SmokeValue smoke;
-        private CulturalAppearance.FlamingValue flaming;
-        private CulturalAppearance.FrozenStatusValue frozenStatus;
-        private CulturalAppearance.InternalHeatStatusValue internalHeatStatus;
-        private CulturalAppearance.StateValue state;
-        private CulturalAppearance.ExteriorLightsValue exteriorLights;
-        private CulturalAppearance.InteriorLightsValue interiorLights;
-        private CulturalAppearance.MaskedCloakedValue maskedCloaked;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(CulturalAppearance left, CulturalAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(CulturalAppearance left, CulturalAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(CulturalAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator CulturalAppearance(uint value)
-        {
-            return CulturalAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static CulturalAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance, represented by the uint value.</returns>
-        public static CulturalAppearance FromUInt32(uint value)
-        {
-            CulturalAppearance ps = new CulturalAppearance();
-
-            uint mask1 = 0x0018;
-            byte shift1 = 3;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Damage = (CulturalAppearance.DamageValue)newValue1;
-
-            uint mask2 = 0x0060;
-            byte shift2 = 5;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Smoke = (CulturalAppearance.SmokeValue)newValue2;
-
-            uint mask4 = 0x8000;
-            byte shift4 = 15;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Flaming = (CulturalAppearance.FlamingValue)newValue4;
-
-            uint mask6 = 0x200000;
-            byte shift6 = 21;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.FrozenStatus = (CulturalAppearance.FrozenStatusValue)newValue6;
-
-            uint mask7 = 0x400000;
-            byte shift7 = 22;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.InternalHeatStatus = (CulturalAppearance.InternalHeatStatusValue)newValue7;
-
-            uint mask8 = 0x800000;
-            byte shift8 = 23;
-            uint newValue8 = (value & mask8) >> shift8;
-            ps.State = (CulturalAppearance.StateValue)newValue8;
-
-            uint mask10 = 0x10000000;
-            byte shift10 = 28;
-            uint newValue10 = (value & mask10) >> shift10;
-            ps.ExteriorLights = (CulturalAppearance.ExteriorLightsValue)newValue10;
-
-            uint mask11 = 0x20000000;
-            byte shift11 = 29;
-            uint newValue11 = (value & mask11) >> shift11;
-            ps.InteriorLights = (CulturalAppearance.InteriorLightsValue)newValue11;
-
-            uint mask13 = 0x80000000;
-            byte shift13 = 31;
-            uint newValue13 = (value & mask13) >> shift13;
-            ps.MaskedCloaked = (CulturalAppearance.MaskedCloakedValue)newValue13;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public CulturalAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public CulturalAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public CulturalAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public CulturalAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the internalheatstatus.
-        /// </summary>
-        /// <value>The internalheatstatus.</value>
-        public CulturalAppearance.InternalHeatStatusValue InternalHeatStatus
-        {
-            get { return this.internalHeatStatus; }
-            set { this.internalHeatStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public CulturalAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the exteriorlights.
-        /// </summary>
-        /// <value>The exteriorlights.</value>
-        public CulturalAppearance.ExteriorLightsValue ExteriorLights
-        {
-            get { return this.exteriorLights; }
-            set { this.exteriorLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the interiorlights.
-        /// </summary>
-        /// <value>The interiorlights.</value>
-        public CulturalAppearance.InteriorLightsValue InteriorLights
-        {
-            get { return this.interiorLights; }
-            set { this.interiorLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the maskedcloaked.
-        /// </summary>
-        /// <value>The maskedcloaked.</value>
-        public CulturalAppearance.MaskedCloakedValue MaskedCloaked
-        {
-            get { return this.maskedCloaked; }
-            set { this.maskedCloaked = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is CulturalAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((CulturalAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(CulturalAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.Flaming == other.Flaming &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.InternalHeatStatus == other.InternalHeatStatus &&
-                this.State == other.State &&
-                this.ExteriorLights == other.ExteriorLights &&
-                this.InteriorLights == other.InteriorLights &&
-                this.MaskedCloaked == other.MaskedCloaked;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.InternalHeatStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.ExteriorLights << 28);
-            val |= (uint)((uint)this.InteriorLights << 29);
-            val |= (uint)((uint)this.MaskedCloaked << 31);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.InternalHeatStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.ExteriorLights.GetHashCode();
-                hash = (hash * 29) + this.InteriorLights.GetHashCode();
-                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for CulturalAppearance (es.appear.cultural, Cultural Features Kind, 
+    /// section 4.3.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct CulturalAppearance
+    {
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status of smoke emanating from a Cultural Features object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status of smoke emanating from a Cultural Features object")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke plume rising from the entity
+            /// </summary>
+            SmokePlumeRisingFromTheEntity = 1,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 2
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from a Cultural Features object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from a Cultural Features object")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a Cultural Features object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a Cultural Features object")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. should be displayed as fixed at the current location even if non-zero velocity, acceleration or rotation data received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIEShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonZeroVelocityAccelerationOrRotationDataReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the Internal-Heat status
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the Internal-Heat status")]
+        public enum InternalHeatStatusValue : uint
+        {
+            /// <summary>
+            /// Internal-Heat off
+            /// </summary>
+            InternalHeatOff = 0,
+
+            /// <summary>
+            /// Internal-Heat on
+            /// </summary>
+            InternalHeatOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a Cultural object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a Cultural object")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes whether Exterior Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Exterior Lights are on or off.")]
+        public enum ExteriorLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Interior Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Interior Lights are on or off.")]
+        public enum InteriorLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes if the entity is Masked / Cloaked or Not
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes if the entity is Masked / Cloaked or Not")]
+        public enum MaskedCloakedValue : uint
+        {
+            /// <summary>
+            /// Not Masked / Not Cloaked
+            /// </summary>
+            NotMaskedNotCloaked = 0,
+
+            /// <summary>
+            /// Masked / Cloaked
+            /// </summary>
+            MaskedCloaked = 1
+        }
+
+        private CulturalAppearance.DamageValue damage;
+        private CulturalAppearance.SmokeValue smoke;
+        private CulturalAppearance.FlamingValue flaming;
+        private CulturalAppearance.FrozenStatusValue frozenStatus;
+        private CulturalAppearance.InternalHeatStatusValue internalHeatStatus;
+        private CulturalAppearance.StateValue state;
+        private CulturalAppearance.ExteriorLightsValue exteriorLights;
+        private CulturalAppearance.InteriorLightsValue interiorLights;
+        private CulturalAppearance.MaskedCloakedValue maskedCloaked;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CulturalAppearance left, CulturalAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CulturalAppearance left, CulturalAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(CulturalAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator CulturalAppearance(uint value)
+        {
+            return CulturalAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static CulturalAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance, represented by the uint value.</returns>
+        public static CulturalAppearance FromUInt32(uint value)
+        {
+            CulturalAppearance ps = new CulturalAppearance();
+
+            uint mask1 = 0x0018;
+            byte shift1 = 3;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Damage = (CulturalAppearance.DamageValue)newValue1;
+
+            uint mask2 = 0x0060;
+            byte shift2 = 5;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Smoke = (CulturalAppearance.SmokeValue)newValue2;
+
+            uint mask4 = 0x8000;
+            byte shift4 = 15;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Flaming = (CulturalAppearance.FlamingValue)newValue4;
+
+            uint mask6 = 0x200000;
+            byte shift6 = 21;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.FrozenStatus = (CulturalAppearance.FrozenStatusValue)newValue6;
+
+            uint mask7 = 0x400000;
+            byte shift7 = 22;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.InternalHeatStatus = (CulturalAppearance.InternalHeatStatusValue)newValue7;
+
+            uint mask8 = 0x800000;
+            byte shift8 = 23;
+            uint newValue8 = (value & mask8) >> shift8;
+            ps.State = (CulturalAppearance.StateValue)newValue8;
+
+            uint mask10 = 0x10000000;
+            byte shift10 = 28;
+            uint newValue10 = (value & mask10) >> shift10;
+            ps.ExteriorLights = (CulturalAppearance.ExteriorLightsValue)newValue10;
+
+            uint mask11 = 0x20000000;
+            byte shift11 = 29;
+            uint newValue11 = (value & mask11) >> shift11;
+            ps.InteriorLights = (CulturalAppearance.InteriorLightsValue)newValue11;
+
+            uint mask13 = 0x80000000;
+            byte shift13 = 31;
+            uint newValue13 = (value & mask13) >> shift13;
+            ps.MaskedCloaked = (CulturalAppearance.MaskedCloakedValue)newValue13;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public CulturalAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public CulturalAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public CulturalAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public CulturalAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the internalheatstatus.
+        /// </summary>
+        /// <value>The internalheatstatus.</value>
+        public CulturalAppearance.InternalHeatStatusValue InternalHeatStatus
+        {
+            get { return this.internalHeatStatus; }
+            set { this.internalHeatStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public CulturalAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the exteriorlights.
+        /// </summary>
+        /// <value>The exteriorlights.</value>
+        public CulturalAppearance.ExteriorLightsValue ExteriorLights
+        {
+            get { return this.exteriorLights; }
+            set { this.exteriorLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the interiorlights.
+        /// </summary>
+        /// <value>The interiorlights.</value>
+        public CulturalAppearance.InteriorLightsValue InteriorLights
+        {
+            get { return this.interiorLights; }
+            set { this.interiorLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maskedcloaked.
+        /// </summary>
+        /// <value>The maskedcloaked.</value>
+        public CulturalAppearance.MaskedCloakedValue MaskedCloaked
+        {
+            get { return this.maskedCloaked; }
+            set { this.maskedCloaked = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is CulturalAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((CulturalAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CulturalAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.Flaming == other.Flaming &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.InternalHeatStatus == other.InternalHeatStatus &&
+                this.State == other.State &&
+                this.ExteriorLights == other.ExteriorLights &&
+                this.InteriorLights == other.InteriorLights &&
+                this.MaskedCloaked == other.MaskedCloaked;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.CulturalAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.InternalHeatStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.ExteriorLights << 28);
+            val |= (uint)((uint)this.InteriorLights << 29);
+            val |= (uint)((uint)this.MaskedCloaked << 31);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.InternalHeatStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.ExteriorLights.GetHashCode();
+                hash = (hash * 29) + this.InteriorLights.GetHashCode();
+                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
index 6a1317e..6b7502f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/EnvironmentalAppearance.cs
@@ -1,383 +1,383 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for EnvironmentalAppearance (es.appear.environmental, Environmentals Kind, 
-    /// section 4.3.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct EnvironmentalAppearance
-    {
-        /// <summary>
-        /// Describes the density of the environmentals
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the density of the environmentals")]
-        public enum DensityValue : uint
-        {
-            /// <summary>
-            /// Clear
-            /// </summary>
-            Clear = 0,
-
-            /// <summary>
-            /// Hazy
-            /// </summary>
-            Hazy = 1,
-
-            /// <summary>
-            /// Dense
-            /// </summary>
-            Dense = 2,
-
-            /// <summary>
-            /// Very dense
-            /// </summary>
-            VeryDense = 3,
-
-            /// <summary>
-            /// Opaque
-            /// </summary>
-            Opaque = 4,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 5
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a environmental object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a environmental object")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a environmental object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a environmental object")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes if the entity is Masked / Cloaked or Not
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes if the entity is Masked / Cloaked or Not")]
-        public enum MaskedCloakedValue : uint
-        {
-            /// <summary>
-            /// Not Masked / Not Cloaked
-            /// </summary>
-            NotMaskedNotCloaked = 0,
-
-            /// <summary>
-            /// Masked / Cloaked
-            /// </summary>
-            MaskedCloaked = 1
-        }
-
-        private EnvironmentalAppearance.DensityValue density;
-        private EnvironmentalAppearance.FrozenStatusValue frozenStatus;
-        private EnvironmentalAppearance.StateValue state;
-        private EnvironmentalAppearance.MaskedCloakedValue maskedCloaked;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(EnvironmentalAppearance left, EnvironmentalAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(EnvironmentalAppearance left, EnvironmentalAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(EnvironmentalAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator EnvironmentalAppearance(uint value)
-        {
-            return EnvironmentalAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static EnvironmentalAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance, represented by the uint value.</returns>
-        public static EnvironmentalAppearance FromUInt32(uint value)
-        {
-            EnvironmentalAppearance ps = new EnvironmentalAppearance();
-
-            uint mask1 = 0xf0000;
-            byte shift1 = 16;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Density = (EnvironmentalAppearance.DensityValue)newValue1;
-
-            uint mask3 = 0x200000;
-            byte shift3 = 21;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.FrozenStatus = (EnvironmentalAppearance.FrozenStatusValue)newValue3;
-
-            uint mask5 = 0x800000;
-            byte shift5 = 23;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.State = (EnvironmentalAppearance.StateValue)newValue5;
-
-            uint mask7 = 0x80000000;
-            byte shift7 = 31;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.MaskedCloaked = (EnvironmentalAppearance.MaskedCloakedValue)newValue7;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the density.
-        /// </summary>
-        /// <value>The density.</value>
-        public EnvironmentalAppearance.DensityValue Density
-        {
-            get { return this.density; }
-            set { this.density = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public EnvironmentalAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public EnvironmentalAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the maskedcloaked.
-        /// </summary>
-        /// <value>The maskedcloaked.</value>
-        public EnvironmentalAppearance.MaskedCloakedValue MaskedCloaked
-        {
-            get { return this.maskedCloaked; }
-            set { this.maskedCloaked = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is EnvironmentalAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((EnvironmentalAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(EnvironmentalAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Density == other.Density &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.State == other.State &&
-                this.MaskedCloaked == other.MaskedCloaked;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Density << 16);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.MaskedCloaked << 31);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Density.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for EnvironmentalAppearance (es.appear.environmental, Environmentals Kind, 
+    /// section 4.3.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct EnvironmentalAppearance
+    {
+        /// <summary>
+        /// Describes the density of the environmentals
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the density of the environmentals")]
+        public enum DensityValue : uint
+        {
+            /// <summary>
+            /// Clear
+            /// </summary>
+            Clear = 0,
+
+            /// <summary>
+            /// Hazy
+            /// </summary>
+            Hazy = 1,
+
+            /// <summary>
+            /// Dense
+            /// </summary>
+            Dense = 2,
+
+            /// <summary>
+            /// Very dense
+            /// </summary>
+            VeryDense = 3,
+
+            /// <summary>
+            /// Opaque
+            /// </summary>
+            Opaque = 4,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 5
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a environmental object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a environmental object")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a environmental object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a environmental object")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes if the entity is Masked / Cloaked or Not
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes if the entity is Masked / Cloaked or Not")]
+        public enum MaskedCloakedValue : uint
+        {
+            /// <summary>
+            /// Not Masked / Not Cloaked
+            /// </summary>
+            NotMaskedNotCloaked = 0,
+
+            /// <summary>
+            /// Masked / Cloaked
+            /// </summary>
+            MaskedCloaked = 1
+        }
+
+        private EnvironmentalAppearance.DensityValue density;
+        private EnvironmentalAppearance.FrozenStatusValue frozenStatus;
+        private EnvironmentalAppearance.StateValue state;
+        private EnvironmentalAppearance.MaskedCloakedValue maskedCloaked;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EnvironmentalAppearance left, EnvironmentalAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EnvironmentalAppearance left, EnvironmentalAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(EnvironmentalAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator EnvironmentalAppearance(uint value)
+        {
+            return EnvironmentalAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static EnvironmentalAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance, represented by the uint value.</returns>
+        public static EnvironmentalAppearance FromUInt32(uint value)
+        {
+            EnvironmentalAppearance ps = new EnvironmentalAppearance();
+
+            uint mask1 = 0xf0000;
+            byte shift1 = 16;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Density = (EnvironmentalAppearance.DensityValue)newValue1;
+
+            uint mask3 = 0x200000;
+            byte shift3 = 21;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.FrozenStatus = (EnvironmentalAppearance.FrozenStatusValue)newValue3;
+
+            uint mask5 = 0x800000;
+            byte shift5 = 23;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.State = (EnvironmentalAppearance.StateValue)newValue5;
+
+            uint mask7 = 0x80000000;
+            byte shift7 = 31;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.MaskedCloaked = (EnvironmentalAppearance.MaskedCloakedValue)newValue7;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the density.
+        /// </summary>
+        /// <value>The density.</value>
+        public EnvironmentalAppearance.DensityValue Density
+        {
+            get { return this.density; }
+            set { this.density = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public EnvironmentalAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public EnvironmentalAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maskedcloaked.
+        /// </summary>
+        /// <value>The maskedcloaked.</value>
+        public EnvironmentalAppearance.MaskedCloakedValue MaskedCloaked
+        {
+            get { return this.maskedCloaked; }
+            set { this.maskedCloaked = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is EnvironmentalAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((EnvironmentalAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EnvironmentalAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Density == other.Density &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.State == other.State &&
+                this.MaskedCloaked == other.MaskedCloaked;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.EnvironmentalAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Density << 16);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.MaskedCloaked << 31);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Density.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
index d937c14..38e0eef 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/LandPlatformAppearance.cs
@@ -1,1268 +1,1268 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for LandPlatformAppearance (es.appear.platform.land, Platforms of the Land Domain, 
-    /// section 4.3.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct LandPlatformAppearance
-    {
-        /// <summary>
-        /// Describes the paint scheme of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the paint scheme of an entity")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Uniform color
-            /// </summary>
-            UniformColor = 0,
-
-            /// <summary>
-            /// Camouflage
-            /// </summary>
-            Camouflage = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of mobility kills
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of mobility kills")]
-        public enum MobilityValue : uint
-        {
-            /// <summary>
-            /// No mobility kill
-            /// </summary>
-            NoMobilityKill = 0,
-
-            /// <summary>
-            /// Mobility kill
-            /// </summary>
-            MobilityKill = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of fire-power kill
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of fire-power kill")]
-        public enum FirePowerValue : uint
-        {
-            /// <summary>
-            /// No fire-power kill
-            /// </summary>
-            NoFirePowerKill = 0,
-
-            /// <summary>
-            /// Fire-power kill
-            /// </summary>
-            FirePowerKill = 1
-        }
-
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status or location of smoke emanating from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status or location of smoke emanating from an entity")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke plume rising from the entity
-            /// </summary>
-            SmokePlumeRisingFromTheEntity = 1,
-
-            /// <summary>
-            /// Entity is emitting engine smoke
-            /// </summary>
-            EntityIsEmittingEngineSmoke = 2,
-
-            /// <summary>
-            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
-            /// </summary>
-            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
-        }
-
-        /// <summary>
-        /// Describes the size of the dust cloud trailing effect for the Effects entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the size of the dust cloud trailing effect for the Effects entity")]
-        public enum TrailingEffectsValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Small
-            /// </summary>
-            Small = 1,
-
-            /// <summary>
-            /// Medium
-            /// </summary>
-            Medium = 2,
-
-            /// <summary>
-            /// Large
-            /// </summary>
-            Large = 3
-        }
-
-        /// <summary>
-        /// Describes the state of the primary hatch
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of the primary hatch")]
-        public enum HatchValue : uint
-        {
-            /// <summary>
-            /// Not applicable
-            /// </summary>
-            NotApplicable = 0,
-
-            /// <summary>
-            /// Primary hatch is closed
-            /// </summary>
-            PrimaryHatchIsClosed = 1,
-
-            /// <summary>
-            /// Primary hatch is popped
-            /// </summary>
-            PrimaryHatchIsPopped = 2,
-
-            /// <summary>
-            /// Primary hatch is popped and a person is visible under hatch
-            /// </summary>
-            PrimaryHatchIsPoppedAndAPersonIsVisibleUnderHatch = 3,
-
-            /// <summary>
-            /// Primary hatch is open
-            /// </summary>
-            PrimaryHatchIsOpen = 4,
-
-            /// <summary>
-            /// Primary hatch is open and person is visible
-            /// </summary>
-            PrimaryHatchIsOpenAndPersonIsVisible = 5,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 6
-        }
-
-        /// <summary>
-        /// Describes whether Head Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Head Lights are on or off.")]
-        public enum HeadLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Tail Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Tail Lights are on or off.")]
-        public enum TailLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Brake Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Brake Lights are on or off.")]
-        public enum BrakeLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from an entity")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes the elevated status of the platform's primary launcher
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the elevated status of the platform's primary launcher")]
-        public enum LauncherValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes the type of camouflage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the type of camouflage")]
-        public enum CamouflageTypeValue : uint
-        {
-            /// <summary>
-            /// Desert camouflage
-            /// </summary>
-            DesertCamouflage = 0,
-
-            /// <summary>
-            /// Winter camouflage
-            /// </summary>
-            WinterCamouflage = 1,
-
-            /// <summary>
-            /// Forest camouflage
-            /// </summary>
-            ForestCamouflage = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        /// <summary>
-        /// Describes the type of concealment
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the type of concealment")]
-        public enum ConcealedValue : uint
-        {
-            /// <summary>
-            /// Not concealed
-            /// </summary>
-            NotConcealed = 0,
-
-            /// <summary>
-            /// Entity in a prepared concealed position (with netting, etc.)
-            /// </summary>
-            EntityInAPreparedConcealedPositionWithNettingEtc = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a Land Entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a Land Entity")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. should be displayed as fixed at the current location even if non-zero velocity, acceleration or rotation data received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIEShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonZeroVelocityAccelerationOrRotationDataReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the power-plant status of platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the power-plant status of platform")]
-        public enum PowerPlantStatusValue : uint
-        {
-            /// <summary>
-            /// Power plant off
-            /// </summary>
-            PowerPlantOff = 0,
-
-            /// <summary>
-            /// Power plant on
-            /// </summary>
-            PowerPlantOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a Land Entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a Land Entity")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes the status of a tent extension
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the status of a tent extension")]
-        public enum TentValue : uint
-        {
-            /// <summary>
-            /// Not extended
-            /// </summary>
-            NotExtended = 0,
-
-            /// <summary>
-            /// Extended
-            /// </summary>
-            Extended = 1
-        }
-
-        /// <summary>
-        /// Describes the status of a ramp
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the status of a ramp")]
-        public enum RampValue : uint
-        {
-            /// <summary>
-            /// Up
-            /// </summary>
-            Up = 0,
-
-            /// <summary>
-            /// Down
-            /// </summary>
-            Down = 1
-        }
-
-        /// <summary>
-        /// Describes whether Blackout Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Blackout Lights are on or off.")]
-        public enum BlackoutLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Blackout Brake Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Blackout Brake Lights are on or off.")]
-        public enum BlackoutBrakeLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Spot Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Spot Lights are on or off.")]
-        public enum SpotLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Interior Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Interior Lights are on or off.")]
-        public enum InteriorLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes the surrender state of the vehicle occupants
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the surrender state of the vehicle occupants")]
-        public enum SurrenderStateValue : uint
-        {
-            /// <summary>
-            /// Not surrendered
-            /// </summary>
-            NotSurrendered = 0,
-
-            /// <summary>
-            /// Surrender
-            /// </summary>
-            Surrender = 1
-        }
-
-        /// <summary>
-        /// Describes if the entity is Masked / Cloaked or Not
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes if the entity is Masked / Cloaked or Not")]
-        public enum MaskedCloakedValue : uint
-        {
-            /// <summary>
-            /// Not Masked / Not Cloaked
-            /// </summary>
-            NotMaskedNotCloaked = 0,
-
-            /// <summary>
-            /// Masked / Cloaked
-            /// </summary>
-            MaskedCloaked = 1
-        }
-
-        private LandPlatformAppearance.PaintSchemeValue paintScheme;
-        private LandPlatformAppearance.MobilityValue mobility;
-        private LandPlatformAppearance.FirePowerValue firePower;
-        private LandPlatformAppearance.DamageValue damage;
-        private LandPlatformAppearance.SmokeValue smoke;
-        private LandPlatformAppearance.TrailingEffectsValue trailingEffects;
-        private LandPlatformAppearance.HatchValue hatch;
-        private LandPlatformAppearance.HeadLightsValue headLights;
-        private LandPlatformAppearance.TailLightsValue tailLights;
-        private LandPlatformAppearance.BrakeLightsValue brakeLights;
-        private LandPlatformAppearance.FlamingValue flaming;
-        private LandPlatformAppearance.LauncherValue launcher;
-        private LandPlatformAppearance.CamouflageTypeValue camouflageType;
-        private LandPlatformAppearance.ConcealedValue concealed;
-        private LandPlatformAppearance.FrozenStatusValue frozenStatus;
-        private LandPlatformAppearance.PowerPlantStatusValue powerPlantStatus;
-        private LandPlatformAppearance.StateValue state;
-        private LandPlatformAppearance.TentValue tent;
-        private LandPlatformAppearance.RampValue ramp;
-        private LandPlatformAppearance.BlackoutLightsValue blackoutLights;
-        private LandPlatformAppearance.BlackoutBrakeLightsValue blackoutBrakeLights;
-        private LandPlatformAppearance.SpotLightsValue spotLights;
-        private LandPlatformAppearance.InteriorLightsValue interiorLights;
-        private LandPlatformAppearance.SurrenderStateValue surrenderState;
-        private LandPlatformAppearance.MaskedCloakedValue maskedCloaked;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LandPlatformAppearance left, LandPlatformAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LandPlatformAppearance left, LandPlatformAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(LandPlatformAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator LandPlatformAppearance(uint value)
-        {
-            return LandPlatformAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static LandPlatformAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance, represented by the uint value.</returns>
-        public static LandPlatformAppearance FromUInt32(uint value)
-        {
-            LandPlatformAppearance ps = new LandPlatformAppearance();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PaintScheme = (LandPlatformAppearance.PaintSchemeValue)newValue0;
-
-            uint mask1 = 0x0002;
-            byte shift1 = 1;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Mobility = (LandPlatformAppearance.MobilityValue)newValue1;
-
-            uint mask2 = 0x0004;
-            byte shift2 = 2;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.FirePower = (LandPlatformAppearance.FirePowerValue)newValue2;
-
-            uint mask3 = 0x0018;
-            byte shift3 = 3;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (LandPlatformAppearance.DamageValue)newValue3;
-
-            uint mask4 = 0x0060;
-            byte shift4 = 5;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Smoke = (LandPlatformAppearance.SmokeValue)newValue4;
-
-            uint mask5 = 0x0180;
-            byte shift5 = 7;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.TrailingEffects = (LandPlatformAppearance.TrailingEffectsValue)newValue5;
-
-            uint mask6 = 0x0e00;
-            byte shift6 = 9;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Hatch = (LandPlatformAppearance.HatchValue)newValue6;
-
-            uint mask7 = 0x1000;
-            byte shift7 = 12;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.HeadLights = (LandPlatformAppearance.HeadLightsValue)newValue7;
-
-            uint mask8 = 0x2000;
-            byte shift8 = 13;
-            uint newValue8 = (value & mask8) >> shift8;
-            ps.TailLights = (LandPlatformAppearance.TailLightsValue)newValue8;
-
-            uint mask9 = 0x4000;
-            byte shift9 = 14;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.BrakeLights = (LandPlatformAppearance.BrakeLightsValue)newValue9;
-
-            uint mask10 = 0x8000;
-            byte shift10 = 15;
-            uint newValue10 = (value & mask10) >> shift10;
-            ps.Flaming = (LandPlatformAppearance.FlamingValue)newValue10;
-
-            uint mask11 = 0x10000;
-            byte shift11 = 16;
-            uint newValue11 = (value & mask11) >> shift11;
-            ps.Launcher = (LandPlatformAppearance.LauncherValue)newValue11;
-
-            uint mask12 = 0x60000;
-            byte shift12 = 17;
-            uint newValue12 = (value & mask12) >> shift12;
-            ps.CamouflageType = (LandPlatformAppearance.CamouflageTypeValue)newValue12;
-
-            uint mask13 = 0x80000;
-            byte shift13 = 19;
-            uint newValue13 = (value & mask13) >> shift13;
-            ps.Concealed = (LandPlatformAppearance.ConcealedValue)newValue13;
-
-            uint mask15 = 0x200000;
-            byte shift15 = 21;
-            uint newValue15 = (value & mask15) >> shift15;
-            ps.FrozenStatus = (LandPlatformAppearance.FrozenStatusValue)newValue15;
-
-            uint mask16 = 0x400000;
-            byte shift16 = 22;
-            uint newValue16 = (value & mask16) >> shift16;
-            ps.PowerPlantStatus = (LandPlatformAppearance.PowerPlantStatusValue)newValue16;
-
-            uint mask17 = 0x800000;
-            byte shift17 = 23;
-            uint newValue17 = (value & mask17) >> shift17;
-            ps.State = (LandPlatformAppearance.StateValue)newValue17;
-
-            uint mask18 = 0x1000000;
-            byte shift18 = 24;
-            uint newValue18 = (value & mask18) >> shift18;
-            ps.Tent = (LandPlatformAppearance.TentValue)newValue18;
-
-            uint mask19 = 0x2000000;
-            byte shift19 = 25;
-            uint newValue19 = (value & mask19) >> shift19;
-            ps.Ramp = (LandPlatformAppearance.RampValue)newValue19;
-
-            uint mask20 = 0x4000000;
-            byte shift20 = 26;
-            uint newValue20 = (value & mask20) >> shift20;
-            ps.BlackoutLights = (LandPlatformAppearance.BlackoutLightsValue)newValue20;
-
-            uint mask21 = 0x8000000;
-            byte shift21 = 27;
-            uint newValue21 = (value & mask21) >> shift21;
-            ps.BlackoutBrakeLights = (LandPlatformAppearance.BlackoutBrakeLightsValue)newValue21;
-
-            uint mask22 = 0x10000000;
-            byte shift22 = 28;
-            uint newValue22 = (value & mask22) >> shift22;
-            ps.SpotLights = (LandPlatformAppearance.SpotLightsValue)newValue22;
-
-            uint mask23 = 0x20000000;
-            byte shift23 = 29;
-            uint newValue23 = (value & mask23) >> shift23;
-            ps.InteriorLights = (LandPlatformAppearance.InteriorLightsValue)newValue23;
-
-            uint mask24 = 0x40000000;
-            byte shift24 = 30;
-            uint newValue24 = (value & mask24) >> shift24;
-            ps.SurrenderState = (LandPlatformAppearance.SurrenderStateValue)newValue24;
-
-            uint mask25 = 0x80000000;
-            byte shift25 = 31;
-            uint newValue25 = (value & mask25) >> shift25;
-            ps.MaskedCloaked = (LandPlatformAppearance.MaskedCloakedValue)newValue25;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the paintscheme.
-        /// </summary>
-        /// <value>The paintscheme.</value>
-        public LandPlatformAppearance.PaintSchemeValue PaintScheme
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the mobility.
-        /// </summary>
-        /// <value>The mobility.</value>
-        public LandPlatformAppearance.MobilityValue Mobility
-        {
-            get { return this.mobility; }
-            set { this.mobility = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the firepower.
-        /// </summary>
-        /// <value>The firepower.</value>
-        public LandPlatformAppearance.FirePowerValue FirePower
-        {
-            get { return this.firePower; }
-            set { this.firePower = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public LandPlatformAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public LandPlatformAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the trailingeffects.
-        /// </summary>
-        /// <value>The trailingeffects.</value>
-        public LandPlatformAppearance.TrailingEffectsValue TrailingEffects
-        {
-            get { return this.trailingEffects; }
-            set { this.trailingEffects = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the hatch.
-        /// </summary>
-        /// <value>The hatch.</value>
-        public LandPlatformAppearance.HatchValue Hatch
-        {
-            get { return this.hatch; }
-            set { this.hatch = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the headlights.
-        /// </summary>
-        /// <value>The headlights.</value>
-        public LandPlatformAppearance.HeadLightsValue HeadLights
-        {
-            get { return this.headLights; }
-            set { this.headLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the taillights.
-        /// </summary>
-        /// <value>The taillights.</value>
-        public LandPlatformAppearance.TailLightsValue TailLights
-        {
-            get { return this.tailLights; }
-            set { this.tailLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the brakelights.
-        /// </summary>
-        /// <value>The brakelights.</value>
-        public LandPlatformAppearance.BrakeLightsValue BrakeLights
-        {
-            get { return this.brakeLights; }
-            set { this.brakeLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public LandPlatformAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the launcher.
-        /// </summary>
-        /// <value>The launcher.</value>
-        public LandPlatformAppearance.LauncherValue Launcher
-        {
-            get { return this.launcher; }
-            set { this.launcher = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the camouflagetype.
-        /// </summary>
-        /// <value>The camouflagetype.</value>
-        public LandPlatformAppearance.CamouflageTypeValue CamouflageType
-        {
-            get { return this.camouflageType; }
-            set { this.camouflageType = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the concealed.
-        /// </summary>
-        /// <value>The concealed.</value>
-        public LandPlatformAppearance.ConcealedValue Concealed
-        {
-            get { return this.concealed; }
-            set { this.concealed = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public LandPlatformAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerplantstatus.
-        /// </summary>
-        /// <value>The powerplantstatus.</value>
-        public LandPlatformAppearance.PowerPlantStatusValue PowerPlantStatus
-        {
-            get { return this.powerPlantStatus; }
-            set { this.powerPlantStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public LandPlatformAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the tent.
-        /// </summary>
-        /// <value>The tent.</value>
-        public LandPlatformAppearance.TentValue Tent
-        {
-            get { return this.tent; }
-            set { this.tent = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the ramp.
-        /// </summary>
-        /// <value>The ramp.</value>
-        public LandPlatformAppearance.RampValue Ramp
-        {
-            get { return this.ramp; }
-            set { this.ramp = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the blackoutlights.
-        /// </summary>
-        /// <value>The blackoutlights.</value>
-        public LandPlatformAppearance.BlackoutLightsValue BlackoutLights
-        {
-            get { return this.blackoutLights; }
-            set { this.blackoutLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the blackoutbrakelights.
-        /// </summary>
-        /// <value>The blackoutbrakelights.</value>
-        public LandPlatformAppearance.BlackoutBrakeLightsValue BlackoutBrakeLights
-        {
-            get { return this.blackoutBrakeLights; }
-            set { this.blackoutBrakeLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the spotlights.
-        /// </summary>
-        /// <value>The spotlights.</value>
-        public LandPlatformAppearance.SpotLightsValue SpotLights
-        {
-            get { return this.spotLights; }
-            set { this.spotLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the interiorlights.
-        /// </summary>
-        /// <value>The interiorlights.</value>
-        public LandPlatformAppearance.InteriorLightsValue InteriorLights
-        {
-            get { return this.interiorLights; }
-            set { this.interiorLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the surrenderstate.
-        /// </summary>
-        /// <value>The surrenderstate.</value>
-        public LandPlatformAppearance.SurrenderStateValue SurrenderState
-        {
-            get { return this.surrenderState; }
-            set { this.surrenderState = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the maskedcloaked.
-        /// </summary>
-        /// <value>The maskedcloaked.</value>
-        public LandPlatformAppearance.MaskedCloakedValue MaskedCloaked
-        {
-            get { return this.maskedCloaked; }
-            set { this.maskedCloaked = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is LandPlatformAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((LandPlatformAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LandPlatformAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PaintScheme == other.PaintScheme &&
-                this.Mobility == other.Mobility &&
-                this.FirePower == other.FirePower &&
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.TrailingEffects == other.TrailingEffects &&
-                this.Hatch == other.Hatch &&
-                this.HeadLights == other.HeadLights &&
-                this.TailLights == other.TailLights &&
-                this.BrakeLights == other.BrakeLights &&
-                this.Flaming == other.Flaming &&
-                this.Launcher == other.Launcher &&
-                this.CamouflageType == other.CamouflageType &&
-                this.Concealed == other.Concealed &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.PowerPlantStatus == other.PowerPlantStatus &&
-                this.State == other.State &&
-                this.Tent == other.Tent &&
-                this.Ramp == other.Ramp &&
-                this.BlackoutLights == other.BlackoutLights &&
-                this.BlackoutBrakeLights == other.BlackoutBrakeLights &&
-                this.SpotLights == other.SpotLights &&
-                this.InteriorLights == other.InteriorLights &&
-                this.SurrenderState == other.SurrenderState &&
-                this.MaskedCloaked == other.MaskedCloaked;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.PaintScheme << 0);
-            val |= (uint)((uint)this.Mobility << 1);
-            val |= (uint)((uint)this.FirePower << 2);
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.TrailingEffects << 7);
-            val |= (uint)((uint)this.Hatch << 9);
-            val |= (uint)((uint)this.HeadLights << 12);
-            val |= (uint)((uint)this.TailLights << 13);
-            val |= (uint)((uint)this.BrakeLights << 14);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.Launcher << 16);
-            val |= (uint)((uint)this.CamouflageType << 17);
-            val |= (uint)((uint)this.Concealed << 19);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.PowerPlantStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.Tent << 24);
-            val |= (uint)((uint)this.Ramp << 25);
-            val |= (uint)((uint)this.BlackoutLights << 26);
-            val |= (uint)((uint)this.BlackoutBrakeLights << 27);
-            val |= (uint)((uint)this.SpotLights << 28);
-            val |= (uint)((uint)this.InteriorLights << 29);
-            val |= (uint)((uint)this.SurrenderState << 30);
-            val |= (uint)((uint)this.MaskedCloaked << 31);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PaintScheme.GetHashCode();
-                hash = (hash * 29) + this.Mobility.GetHashCode();
-                hash = (hash * 29) + this.FirePower.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
-                hash = (hash * 29) + this.Hatch.GetHashCode();
-                hash = (hash * 29) + this.HeadLights.GetHashCode();
-                hash = (hash * 29) + this.TailLights.GetHashCode();
-                hash = (hash * 29) + this.BrakeLights.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.Launcher.GetHashCode();
-                hash = (hash * 29) + this.CamouflageType.GetHashCode();
-                hash = (hash * 29) + this.Concealed.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.Tent.GetHashCode();
-                hash = (hash * 29) + this.Ramp.GetHashCode();
-                hash = (hash * 29) + this.BlackoutLights.GetHashCode();
-                hash = (hash * 29) + this.BlackoutBrakeLights.GetHashCode();
-                hash = (hash * 29) + this.SpotLights.GetHashCode();
-                hash = (hash * 29) + this.InteriorLights.GetHashCode();
-                hash = (hash * 29) + this.SurrenderState.GetHashCode();
-                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for LandPlatformAppearance (es.appear.platform.land, Platforms of the Land Domain, 
+    /// section 4.3.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct LandPlatformAppearance
+    {
+        /// <summary>
+        /// Describes the paint scheme of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the paint scheme of an entity")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Uniform color
+            /// </summary>
+            UniformColor = 0,
+
+            /// <summary>
+            /// Camouflage
+            /// </summary>
+            Camouflage = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of mobility kills
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of mobility kills")]
+        public enum MobilityValue : uint
+        {
+            /// <summary>
+            /// No mobility kill
+            /// </summary>
+            NoMobilityKill = 0,
+
+            /// <summary>
+            /// Mobility kill
+            /// </summary>
+            MobilityKill = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of fire-power kill
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of fire-power kill")]
+        public enum FirePowerValue : uint
+        {
+            /// <summary>
+            /// No fire-power kill
+            /// </summary>
+            NoFirePowerKill = 0,
+
+            /// <summary>
+            /// Fire-power kill
+            /// </summary>
+            FirePowerKill = 1
+        }
+
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status or location of smoke emanating from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status or location of smoke emanating from an entity")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke plume rising from the entity
+            /// </summary>
+            SmokePlumeRisingFromTheEntity = 1,
+
+            /// <summary>
+            /// Entity is emitting engine smoke
+            /// </summary>
+            EntityIsEmittingEngineSmoke = 2,
+
+            /// <summary>
+            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
+            /// </summary>
+            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
+        }
+
+        /// <summary>
+        /// Describes the size of the dust cloud trailing effect for the Effects entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the size of the dust cloud trailing effect for the Effects entity")]
+        public enum TrailingEffectsValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Small
+            /// </summary>
+            Small = 1,
+
+            /// <summary>
+            /// Medium
+            /// </summary>
+            Medium = 2,
+
+            /// <summary>
+            /// Large
+            /// </summary>
+            Large = 3
+        }
+
+        /// <summary>
+        /// Describes the state of the primary hatch
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of the primary hatch")]
+        public enum HatchValue : uint
+        {
+            /// <summary>
+            /// Not applicable
+            /// </summary>
+            NotApplicable = 0,
+
+            /// <summary>
+            /// Primary hatch is closed
+            /// </summary>
+            PrimaryHatchIsClosed = 1,
+
+            /// <summary>
+            /// Primary hatch is popped
+            /// </summary>
+            PrimaryHatchIsPopped = 2,
+
+            /// <summary>
+            /// Primary hatch is popped and a person is visible under hatch
+            /// </summary>
+            PrimaryHatchIsPoppedAndAPersonIsVisibleUnderHatch = 3,
+
+            /// <summary>
+            /// Primary hatch is open
+            /// </summary>
+            PrimaryHatchIsOpen = 4,
+
+            /// <summary>
+            /// Primary hatch is open and person is visible
+            /// </summary>
+            PrimaryHatchIsOpenAndPersonIsVisible = 5,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 6
+        }
+
+        /// <summary>
+        /// Describes whether Head Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Head Lights are on or off.")]
+        public enum HeadLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Tail Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Tail Lights are on or off.")]
+        public enum TailLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Brake Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Brake Lights are on or off.")]
+        public enum BrakeLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from an entity")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes the elevated status of the platform's primary launcher
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the elevated status of the platform's primary launcher")]
+        public enum LauncherValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes the type of camouflage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the type of camouflage")]
+        public enum CamouflageTypeValue : uint
+        {
+            /// <summary>
+            /// Desert camouflage
+            /// </summary>
+            DesertCamouflage = 0,
+
+            /// <summary>
+            /// Winter camouflage
+            /// </summary>
+            WinterCamouflage = 1,
+
+            /// <summary>
+            /// Forest camouflage
+            /// </summary>
+            ForestCamouflage = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        /// <summary>
+        /// Describes the type of concealment
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the type of concealment")]
+        public enum ConcealedValue : uint
+        {
+            /// <summary>
+            /// Not concealed
+            /// </summary>
+            NotConcealed = 0,
+
+            /// <summary>
+            /// Entity in a prepared concealed position (with netting, etc.)
+            /// </summary>
+            EntityInAPreparedConcealedPositionWithNettingEtc = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a Land Entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a Land Entity")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. should be displayed as fixed at the current location even if non-zero velocity, acceleration or rotation data received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIEShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonZeroVelocityAccelerationOrRotationDataReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the power-plant status of platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the power-plant status of platform")]
+        public enum PowerPlantStatusValue : uint
+        {
+            /// <summary>
+            /// Power plant off
+            /// </summary>
+            PowerPlantOff = 0,
+
+            /// <summary>
+            /// Power plant on
+            /// </summary>
+            PowerPlantOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a Land Entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a Land Entity")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes the status of a tent extension
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the status of a tent extension")]
+        public enum TentValue : uint
+        {
+            /// <summary>
+            /// Not extended
+            /// </summary>
+            NotExtended = 0,
+
+            /// <summary>
+            /// Extended
+            /// </summary>
+            Extended = 1
+        }
+
+        /// <summary>
+        /// Describes the status of a ramp
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the status of a ramp")]
+        public enum RampValue : uint
+        {
+            /// <summary>
+            /// Up
+            /// </summary>
+            Up = 0,
+
+            /// <summary>
+            /// Down
+            /// </summary>
+            Down = 1
+        }
+
+        /// <summary>
+        /// Describes whether Blackout Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Blackout Lights are on or off.")]
+        public enum BlackoutLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Blackout Brake Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Blackout Brake Lights are on or off.")]
+        public enum BlackoutBrakeLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Spot Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Spot Lights are on or off.")]
+        public enum SpotLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Interior Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Interior Lights are on or off.")]
+        public enum InteriorLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes the surrender state of the vehicle occupants
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the surrender state of the vehicle occupants")]
+        public enum SurrenderStateValue : uint
+        {
+            /// <summary>
+            /// Not surrendered
+            /// </summary>
+            NotSurrendered = 0,
+
+            /// <summary>
+            /// Surrender
+            /// </summary>
+            Surrender = 1
+        }
+
+        /// <summary>
+        /// Describes if the entity is Masked / Cloaked or Not
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes if the entity is Masked / Cloaked or Not")]
+        public enum MaskedCloakedValue : uint
+        {
+            /// <summary>
+            /// Not Masked / Not Cloaked
+            /// </summary>
+            NotMaskedNotCloaked = 0,
+
+            /// <summary>
+            /// Masked / Cloaked
+            /// </summary>
+            MaskedCloaked = 1
+        }
+
+        private LandPlatformAppearance.PaintSchemeValue paintScheme;
+        private LandPlatformAppearance.MobilityValue mobility;
+        private LandPlatformAppearance.FirePowerValue firePower;
+        private LandPlatformAppearance.DamageValue damage;
+        private LandPlatformAppearance.SmokeValue smoke;
+        private LandPlatformAppearance.TrailingEffectsValue trailingEffects;
+        private LandPlatformAppearance.HatchValue hatch;
+        private LandPlatformAppearance.HeadLightsValue headLights;
+        private LandPlatformAppearance.TailLightsValue tailLights;
+        private LandPlatformAppearance.BrakeLightsValue brakeLights;
+        private LandPlatformAppearance.FlamingValue flaming;
+        private LandPlatformAppearance.LauncherValue launcher;
+        private LandPlatformAppearance.CamouflageTypeValue camouflageType;
+        private LandPlatformAppearance.ConcealedValue concealed;
+        private LandPlatformAppearance.FrozenStatusValue frozenStatus;
+        private LandPlatformAppearance.PowerPlantStatusValue powerPlantStatus;
+        private LandPlatformAppearance.StateValue state;
+        private LandPlatformAppearance.TentValue tent;
+        private LandPlatformAppearance.RampValue ramp;
+        private LandPlatformAppearance.BlackoutLightsValue blackoutLights;
+        private LandPlatformAppearance.BlackoutBrakeLightsValue blackoutBrakeLights;
+        private LandPlatformAppearance.SpotLightsValue spotLights;
+        private LandPlatformAppearance.InteriorLightsValue interiorLights;
+        private LandPlatformAppearance.SurrenderStateValue surrenderState;
+        private LandPlatformAppearance.MaskedCloakedValue maskedCloaked;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LandPlatformAppearance left, LandPlatformAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LandPlatformAppearance left, LandPlatformAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(LandPlatformAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator LandPlatformAppearance(uint value)
+        {
+            return LandPlatformAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static LandPlatformAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance, represented by the uint value.</returns>
+        public static LandPlatformAppearance FromUInt32(uint value)
+        {
+            LandPlatformAppearance ps = new LandPlatformAppearance();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PaintScheme = (LandPlatformAppearance.PaintSchemeValue)newValue0;
+
+            uint mask1 = 0x0002;
+            byte shift1 = 1;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Mobility = (LandPlatformAppearance.MobilityValue)newValue1;
+
+            uint mask2 = 0x0004;
+            byte shift2 = 2;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.FirePower = (LandPlatformAppearance.FirePowerValue)newValue2;
+
+            uint mask3 = 0x0018;
+            byte shift3 = 3;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (LandPlatformAppearance.DamageValue)newValue3;
+
+            uint mask4 = 0x0060;
+            byte shift4 = 5;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Smoke = (LandPlatformAppearance.SmokeValue)newValue4;
+
+            uint mask5 = 0x0180;
+            byte shift5 = 7;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.TrailingEffects = (LandPlatformAppearance.TrailingEffectsValue)newValue5;
+
+            uint mask6 = 0x0e00;
+            byte shift6 = 9;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Hatch = (LandPlatformAppearance.HatchValue)newValue6;
+
+            uint mask7 = 0x1000;
+            byte shift7 = 12;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.HeadLights = (LandPlatformAppearance.HeadLightsValue)newValue7;
+
+            uint mask8 = 0x2000;
+            byte shift8 = 13;
+            uint newValue8 = (value & mask8) >> shift8;
+            ps.TailLights = (LandPlatformAppearance.TailLightsValue)newValue8;
+
+            uint mask9 = 0x4000;
+            byte shift9 = 14;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.BrakeLights = (LandPlatformAppearance.BrakeLightsValue)newValue9;
+
+            uint mask10 = 0x8000;
+            byte shift10 = 15;
+            uint newValue10 = (value & mask10) >> shift10;
+            ps.Flaming = (LandPlatformAppearance.FlamingValue)newValue10;
+
+            uint mask11 = 0x10000;
+            byte shift11 = 16;
+            uint newValue11 = (value & mask11) >> shift11;
+            ps.Launcher = (LandPlatformAppearance.LauncherValue)newValue11;
+
+            uint mask12 = 0x60000;
+            byte shift12 = 17;
+            uint newValue12 = (value & mask12) >> shift12;
+            ps.CamouflageType = (LandPlatformAppearance.CamouflageTypeValue)newValue12;
+
+            uint mask13 = 0x80000;
+            byte shift13 = 19;
+            uint newValue13 = (value & mask13) >> shift13;
+            ps.Concealed = (LandPlatformAppearance.ConcealedValue)newValue13;
+
+            uint mask15 = 0x200000;
+            byte shift15 = 21;
+            uint newValue15 = (value & mask15) >> shift15;
+            ps.FrozenStatus = (LandPlatformAppearance.FrozenStatusValue)newValue15;
+
+            uint mask16 = 0x400000;
+            byte shift16 = 22;
+            uint newValue16 = (value & mask16) >> shift16;
+            ps.PowerPlantStatus = (LandPlatformAppearance.PowerPlantStatusValue)newValue16;
+
+            uint mask17 = 0x800000;
+            byte shift17 = 23;
+            uint newValue17 = (value & mask17) >> shift17;
+            ps.State = (LandPlatformAppearance.StateValue)newValue17;
+
+            uint mask18 = 0x1000000;
+            byte shift18 = 24;
+            uint newValue18 = (value & mask18) >> shift18;
+            ps.Tent = (LandPlatformAppearance.TentValue)newValue18;
+
+            uint mask19 = 0x2000000;
+            byte shift19 = 25;
+            uint newValue19 = (value & mask19) >> shift19;
+            ps.Ramp = (LandPlatformAppearance.RampValue)newValue19;
+
+            uint mask20 = 0x4000000;
+            byte shift20 = 26;
+            uint newValue20 = (value & mask20) >> shift20;
+            ps.BlackoutLights = (LandPlatformAppearance.BlackoutLightsValue)newValue20;
+
+            uint mask21 = 0x8000000;
+            byte shift21 = 27;
+            uint newValue21 = (value & mask21) >> shift21;
+            ps.BlackoutBrakeLights = (LandPlatformAppearance.BlackoutBrakeLightsValue)newValue21;
+
+            uint mask22 = 0x10000000;
+            byte shift22 = 28;
+            uint newValue22 = (value & mask22) >> shift22;
+            ps.SpotLights = (LandPlatformAppearance.SpotLightsValue)newValue22;
+
+            uint mask23 = 0x20000000;
+            byte shift23 = 29;
+            uint newValue23 = (value & mask23) >> shift23;
+            ps.InteriorLights = (LandPlatformAppearance.InteriorLightsValue)newValue23;
+
+            uint mask24 = 0x40000000;
+            byte shift24 = 30;
+            uint newValue24 = (value & mask24) >> shift24;
+            ps.SurrenderState = (LandPlatformAppearance.SurrenderStateValue)newValue24;
+
+            uint mask25 = 0x80000000;
+            byte shift25 = 31;
+            uint newValue25 = (value & mask25) >> shift25;
+            ps.MaskedCloaked = (LandPlatformAppearance.MaskedCloakedValue)newValue25;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the paintscheme.
+        /// </summary>
+        /// <value>The paintscheme.</value>
+        public LandPlatformAppearance.PaintSchemeValue PaintScheme
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the mobility.
+        /// </summary>
+        /// <value>The mobility.</value>
+        public LandPlatformAppearance.MobilityValue Mobility
+        {
+            get { return this.mobility; }
+            set { this.mobility = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the firepower.
+        /// </summary>
+        /// <value>The firepower.</value>
+        public LandPlatformAppearance.FirePowerValue FirePower
+        {
+            get { return this.firePower; }
+            set { this.firePower = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public LandPlatformAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public LandPlatformAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the trailingeffects.
+        /// </summary>
+        /// <value>The trailingeffects.</value>
+        public LandPlatformAppearance.TrailingEffectsValue TrailingEffects
+        {
+            get { return this.trailingEffects; }
+            set { this.trailingEffects = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the hatch.
+        /// </summary>
+        /// <value>The hatch.</value>
+        public LandPlatformAppearance.HatchValue Hatch
+        {
+            get { return this.hatch; }
+            set { this.hatch = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the headlights.
+        /// </summary>
+        /// <value>The headlights.</value>
+        public LandPlatformAppearance.HeadLightsValue HeadLights
+        {
+            get { return this.headLights; }
+            set { this.headLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the taillights.
+        /// </summary>
+        /// <value>The taillights.</value>
+        public LandPlatformAppearance.TailLightsValue TailLights
+        {
+            get { return this.tailLights; }
+            set { this.tailLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the brakelights.
+        /// </summary>
+        /// <value>The brakelights.</value>
+        public LandPlatformAppearance.BrakeLightsValue BrakeLights
+        {
+            get { return this.brakeLights; }
+            set { this.brakeLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public LandPlatformAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the launcher.
+        /// </summary>
+        /// <value>The launcher.</value>
+        public LandPlatformAppearance.LauncherValue Launcher
+        {
+            get { return this.launcher; }
+            set { this.launcher = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the camouflagetype.
+        /// </summary>
+        /// <value>The camouflagetype.</value>
+        public LandPlatformAppearance.CamouflageTypeValue CamouflageType
+        {
+            get { return this.camouflageType; }
+            set { this.camouflageType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the concealed.
+        /// </summary>
+        /// <value>The concealed.</value>
+        public LandPlatformAppearance.ConcealedValue Concealed
+        {
+            get { return this.concealed; }
+            set { this.concealed = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public LandPlatformAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerplantstatus.
+        /// </summary>
+        /// <value>The powerplantstatus.</value>
+        public LandPlatformAppearance.PowerPlantStatusValue PowerPlantStatus
+        {
+            get { return this.powerPlantStatus; }
+            set { this.powerPlantStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public LandPlatformAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the tent.
+        /// </summary>
+        /// <value>The tent.</value>
+        public LandPlatformAppearance.TentValue Tent
+        {
+            get { return this.tent; }
+            set { this.tent = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the ramp.
+        /// </summary>
+        /// <value>The ramp.</value>
+        public LandPlatformAppearance.RampValue Ramp
+        {
+            get { return this.ramp; }
+            set { this.ramp = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the blackoutlights.
+        /// </summary>
+        /// <value>The blackoutlights.</value>
+        public LandPlatformAppearance.BlackoutLightsValue BlackoutLights
+        {
+            get { return this.blackoutLights; }
+            set { this.blackoutLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the blackoutbrakelights.
+        /// </summary>
+        /// <value>The blackoutbrakelights.</value>
+        public LandPlatformAppearance.BlackoutBrakeLightsValue BlackoutBrakeLights
+        {
+            get { return this.blackoutBrakeLights; }
+            set { this.blackoutBrakeLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the spotlights.
+        /// </summary>
+        /// <value>The spotlights.</value>
+        public LandPlatformAppearance.SpotLightsValue SpotLights
+        {
+            get { return this.spotLights; }
+            set { this.spotLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the interiorlights.
+        /// </summary>
+        /// <value>The interiorlights.</value>
+        public LandPlatformAppearance.InteriorLightsValue InteriorLights
+        {
+            get { return this.interiorLights; }
+            set { this.interiorLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the surrenderstate.
+        /// </summary>
+        /// <value>The surrenderstate.</value>
+        public LandPlatformAppearance.SurrenderStateValue SurrenderState
+        {
+            get { return this.surrenderState; }
+            set { this.surrenderState = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maskedcloaked.
+        /// </summary>
+        /// <value>The maskedcloaked.</value>
+        public LandPlatformAppearance.MaskedCloakedValue MaskedCloaked
+        {
+            get { return this.maskedCloaked; }
+            set { this.maskedCloaked = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is LandPlatformAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((LandPlatformAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LandPlatformAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PaintScheme == other.PaintScheme &&
+                this.Mobility == other.Mobility &&
+                this.FirePower == other.FirePower &&
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.TrailingEffects == other.TrailingEffects &&
+                this.Hatch == other.Hatch &&
+                this.HeadLights == other.HeadLights &&
+                this.TailLights == other.TailLights &&
+                this.BrakeLights == other.BrakeLights &&
+                this.Flaming == other.Flaming &&
+                this.Launcher == other.Launcher &&
+                this.CamouflageType == other.CamouflageType &&
+                this.Concealed == other.Concealed &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.PowerPlantStatus == other.PowerPlantStatus &&
+                this.State == other.State &&
+                this.Tent == other.Tent &&
+                this.Ramp == other.Ramp &&
+                this.BlackoutLights == other.BlackoutLights &&
+                this.BlackoutBrakeLights == other.BlackoutBrakeLights &&
+                this.SpotLights == other.SpotLights &&
+                this.InteriorLights == other.InteriorLights &&
+                this.SurrenderState == other.SurrenderState &&
+                this.MaskedCloaked == other.MaskedCloaked;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LandPlatformAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.PaintScheme << 0);
+            val |= (uint)((uint)this.Mobility << 1);
+            val |= (uint)((uint)this.FirePower << 2);
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.TrailingEffects << 7);
+            val |= (uint)((uint)this.Hatch << 9);
+            val |= (uint)((uint)this.HeadLights << 12);
+            val |= (uint)((uint)this.TailLights << 13);
+            val |= (uint)((uint)this.BrakeLights << 14);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.Launcher << 16);
+            val |= (uint)((uint)this.CamouflageType << 17);
+            val |= (uint)((uint)this.Concealed << 19);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.PowerPlantStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.Tent << 24);
+            val |= (uint)((uint)this.Ramp << 25);
+            val |= (uint)((uint)this.BlackoutLights << 26);
+            val |= (uint)((uint)this.BlackoutBrakeLights << 27);
+            val |= (uint)((uint)this.SpotLights << 28);
+            val |= (uint)((uint)this.InteriorLights << 29);
+            val |= (uint)((uint)this.SurrenderState << 30);
+            val |= (uint)((uint)this.MaskedCloaked << 31);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PaintScheme.GetHashCode();
+                hash = (hash * 29) + this.Mobility.GetHashCode();
+                hash = (hash * 29) + this.FirePower.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
+                hash = (hash * 29) + this.Hatch.GetHashCode();
+                hash = (hash * 29) + this.HeadLights.GetHashCode();
+                hash = (hash * 29) + this.TailLights.GetHashCode();
+                hash = (hash * 29) + this.BrakeLights.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.Launcher.GetHashCode();
+                hash = (hash * 29) + this.CamouflageType.GetHashCode();
+                hash = (hash * 29) + this.Concealed.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.Tent.GetHashCode();
+                hash = (hash * 29) + this.Ramp.GetHashCode();
+                hash = (hash * 29) + this.BlackoutLights.GetHashCode();
+                hash = (hash * 29) + this.BlackoutBrakeLights.GetHashCode();
+                hash = (hash * 29) + this.SpotLights.GetHashCode();
+                hash = (hash * 29) + this.InteriorLights.GetHashCode();
+                hash = (hash * 29) + this.SurrenderState.GetHashCode();
+                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
index 9f9fb13..e664027 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/LifeFormAppearance.cs
@@ -1,863 +1,863 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for LifeFormAppearance (es.appear.lifeform, Life Forms Kind, 
-    /// section 4.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct LifeFormAppearance
-    {
-        /// <summary>
-        /// Describes the paint scheme of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the paint scheme of an entity")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Uniform color
-            /// </summary>
-            UniformColor = 0,
-
-            /// <summary>
-            /// Camouflage
-            /// </summary>
-            Camouflage = 1
-        }
-
-        /// <summary>
-        /// Describes the damaged visual appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged visual appearance of an entity")]
-        public enum HealthValue : uint
-        {
-            /// <summary>
-            /// No injury
-            /// </summary>
-            NoInjury = 0,
-
-            /// <summary>
-            /// Slight injury
-            /// </summary>
-            SlightInjury = 1,
-
-            /// <summary>
-            /// Moderate injury
-            /// </summary>
-            ModerateInjury = 2,
-
-            /// <summary>
-            /// Fatal injury
-            /// </summary>
-            FatalInjury = 3
-        }
-
-        /// <summary>
-        /// Describes compliance of life form
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes compliance of life form")]
-        public enum ComplianceValue : uint
-        {
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 0,
-
-            /// <summary>
-            /// Detained
-            /// </summary>
-            Detained = 1,
-
-            /// <summary>
-            /// Surrender
-            /// </summary>
-            Surrender = 2,
-
-            /// <summary>
-            /// Using fists
-            /// </summary>
-            UsingFists = 3,
-
-            /// <summary>
-            /// Verbal abuse level 1
-            /// </summary>
-            VerbalAbuseLevel1 = 4,
-
-            /// <summary>
-            /// Verbal abuse level 2
-            /// </summary>
-            VerbalAbuseLevel2 = 5,
-
-            /// <summary>
-            /// Verbal abuse level 3
-            /// </summary>
-            VerbalAbuseLevel3 = 6,
-
-            /// <summary>
-            /// Passive resistance level 1
-            /// </summary>
-            PassiveResistanceLevel1 = 7,
-
-            /// <summary>
-            /// Passive resistance level 2
-            /// </summary>
-            PassiveResistanceLevel2 = 8,
-
-            /// <summary>
-            /// Passive resistance level 3
-            /// </summary>
-            PassiveResistanceLevel3 = 9,
-
-            /// <summary>
-            /// Using non-lethal weapon 1
-            /// </summary>
-            UsingNonLethalWeapon1 = 10,
-
-            /// <summary>
-            /// Using non-lethal weapon 2
-            /// </summary>
-            UsingNonLethalWeapon2 = 11,
-
-            /// <summary>
-            /// Using non-lethal weapon 3
-            /// </summary>
-            UsingNonLethalWeapon3 = 12,
-
-            /// <summary>
-            /// Using non-lethal weapon 4
-            /// </summary>
-            UsingNonLethalWeapon4 = 13,
-
-            /// <summary>
-            /// Using non-lethal weapon 5
-            /// </summary>
-            UsingNonLethalWeapon5 = 14,
-
-            /// <summary>
-            /// Using non-lethal weapon 6
-            /// </summary>
-            UsingNonLethalWeapon6 = 15
-        }
-
-        /// <summary>
-        /// Describes whether Flash Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Flash Lights are on or off.")]
-        public enum FlashLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes the state of the life form
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of the life form")]
-        public enum LifeFormStateValue : uint
-        {
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 0,
-
-            /// <summary>
-            /// Upright, standing still
-            /// </summary>
-            UprightStandingStill = 1,
-
-            /// <summary>
-            /// Upright, walking
-            /// </summary>
-            UprightWalking = 2,
-
-            /// <summary>
-            /// Upright, running
-            /// </summary>
-            UprightRunning = 3,
-
-            /// <summary>
-            /// Kneeling
-            /// </summary>
-            Kneeling = 4,
-
-            /// <summary>
-            /// Prone
-            /// </summary>
-            Prone = 5,
-
-            /// <summary>
-            /// Crawling
-            /// </summary>
-            Crawling = 6,
-
-            /// <summary>
-            /// Swimming
-            /// </summary>
-            Swimming = 7,
-
-            /// <summary>
-            /// Parachuting
-            /// </summary>
-            Parachuting = 8,
-
-            /// <summary>
-            /// Jumping
-            /// </summary>
-            Jumping = 9,
-
-            /// <summary>
-            /// Sitting
-            /// </summary>
-            Sitting = 10,
-
-            /// <summary>
-            /// Squatting
-            /// </summary>
-            Squatting = 11,
-
-            /// <summary>
-            /// Crouching
-            /// </summary>
-            Crouching = 12,
-
-            /// <summary>
-            /// Wading
-            /// </summary>
-            Wading = 13,
-
-            /// <summary>
-            /// Surrender
-            /// </summary>
-            Surrender = 14,
-
-            /// <summary>
-            /// Detained
-            /// </summary>
-            Detained = 15
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a life form
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a life form")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a life form
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a life form")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes the position of the life form's primary weapon
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the position of the life form's primary weapon")]
-        public enum Weapon1Value : uint
-        {
-            /// <summary>
-            /// No primary weapon present
-            /// </summary>
-            NoPrimaryWeaponPresent = 0,
-
-            /// <summary>
-            /// Primary weapon is stowed
-            /// </summary>
-            PrimaryWeaponIsStowed = 1,
-
-            /// <summary>
-            /// Primary weapon is deployed
-            /// </summary>
-            PrimaryWeaponIsDeployed = 2,
-
-            /// <summary>
-            /// Primary weapon is in firing position
-            /// </summary>
-            PrimaryWeaponIsInFiringPosition = 3
-        }
-
-        /// <summary>
-        /// Describes the position of the life form's secondary weapon
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the position of the life form's secondary weapon")]
-        public enum Weapon2Value : uint
-        {
-            /// <summary>
-            /// No secondary weapon present
-            /// </summary>
-            NoSecondaryWeaponPresent = 0,
-
-            /// <summary>
-            /// Secondary weapon is stowed
-            /// </summary>
-            SecondaryWeaponIsStowed = 1,
-
-            /// <summary>
-            /// Secondary weapon is deployed
-            /// </summary>
-            SecondaryWeaponIsDeployed = 2,
-
-            /// <summary>
-            /// Secondary weapon is in firing position
-            /// </summary>
-            SecondaryWeaponIsInFiringPosition = 3
-        }
-
-        /// <summary>
-        /// Describes the type of camouflage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the type of camouflage")]
-        public enum CamouflageTypeValue : uint
-        {
-            /// <summary>
-            /// Desert camouflage
-            /// </summary>
-            DesertCamouflage = 0,
-
-            /// <summary>
-            /// Winter camouflage
-            /// </summary>
-            WinterCamouflage = 1,
-
-            /// <summary>
-            /// Forest camouflage
-            /// </summary>
-            ForestCamouflage = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        /// <summary>
-        /// Describes the type of stationary concealment
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the type of stationary concealment")]
-        public enum ConcealedStationaryValue : uint
-        {
-            /// <summary>
-            /// Not concealed
-            /// </summary>
-            NotConcealed = 0,
-
-            /// <summary>
-            /// Entity in a prepared concealed position
-            /// </summary>
-            EntityInAPreparedConcealedPosition = 1
-        }
-
-        /// <summary>
-        /// Describes the type of concealed movement
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the type of concealed movement")]
-        public enum ConcealedMovementValue : uint
-        {
-            /// <summary>
-            /// Open movement
-            /// </summary>
-            OpenMovement = 0,
-
-            /// <summary>
-            /// Rushes between covered positions
-            /// </summary>
-            RushesBetweenCoveredPositions = 1
-        }
-
-        private LifeFormAppearance.PaintSchemeValue paintScheme;
-        private LifeFormAppearance.HealthValue health;
-        private LifeFormAppearance.ComplianceValue compliance;
-        private LifeFormAppearance.FlashLightsValue flashLights;
-        private LifeFormAppearance.LifeFormStateValue lifeFormState;
-        private LifeFormAppearance.FrozenStatusValue frozenStatus;
-        private LifeFormAppearance.StateValue state;
-        private LifeFormAppearance.Weapon1Value weapon1;
-        private LifeFormAppearance.Weapon2Value weapon2;
-        private LifeFormAppearance.CamouflageTypeValue camouflageType;
-        private LifeFormAppearance.ConcealedStationaryValue concealedStationary;
-        private LifeFormAppearance.ConcealedMovementValue concealedMovement;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LifeFormAppearance left, LifeFormAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LifeFormAppearance left, LifeFormAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(LifeFormAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator LifeFormAppearance(uint value)
-        {
-            return LifeFormAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static LifeFormAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance, represented by the uint value.</returns>
-        public static LifeFormAppearance FromUInt32(uint value)
-        {
-            LifeFormAppearance ps = new LifeFormAppearance();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PaintScheme = (LifeFormAppearance.PaintSchemeValue)newValue0;
-
-            uint mask2 = 0x0018;
-            byte shift2 = 3;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Health = (LifeFormAppearance.HealthValue)newValue2;
-
-            uint mask3 = 0x01e0;
-            byte shift3 = 5;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Compliance = (LifeFormAppearance.ComplianceValue)newValue3;
-
-            uint mask5 = 0x1000;
-            byte shift5 = 12;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.FlashLights = (LifeFormAppearance.FlashLightsValue)newValue5;
-
-            uint mask7 = 0xf0000;
-            byte shift7 = 16;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.LifeFormState = (LifeFormAppearance.LifeFormStateValue)newValue7;
-
-            uint mask9 = 0x200000;
-            byte shift9 = 21;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.FrozenStatus = (LifeFormAppearance.FrozenStatusValue)newValue9;
-
-            uint mask11 = 0x800000;
-            byte shift11 = 23;
-            uint newValue11 = (value & mask11) >> shift11;
-            ps.State = (LifeFormAppearance.StateValue)newValue11;
-
-            uint mask12 = 0x3000000;
-            byte shift12 = 24;
-            uint newValue12 = (value & mask12) >> shift12;
-            ps.Weapon1 = (LifeFormAppearance.Weapon1Value)newValue12;
-
-            uint mask13 = 0xc000000;
-            byte shift13 = 26;
-            uint newValue13 = (value & mask13) >> shift13;
-            ps.Weapon2 = (LifeFormAppearance.Weapon2Value)newValue13;
-
-            uint mask14 = 0x30000000;
-            byte shift14 = 28;
-            uint newValue14 = (value & mask14) >> shift14;
-            ps.CamouflageType = (LifeFormAppearance.CamouflageTypeValue)newValue14;
-
-            uint mask15 = 0x40000000;
-            byte shift15 = 30;
-            uint newValue15 = (value & mask15) >> shift15;
-            ps.ConcealedStationary = (LifeFormAppearance.ConcealedStationaryValue)newValue15;
-
-            uint mask16 = 0x80000000;
-            byte shift16 = 31;
-            uint newValue16 = (value & mask16) >> shift16;
-            ps.ConcealedMovement = (LifeFormAppearance.ConcealedMovementValue)newValue16;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the paintscheme.
-        /// </summary>
-        /// <value>The paintscheme.</value>
-        public LifeFormAppearance.PaintSchemeValue PaintScheme
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the health.
-        /// </summary>
-        /// <value>The health.</value>
-        public LifeFormAppearance.HealthValue Health
-        {
-            get { return this.health; }
-            set { this.health = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the compliance.
-        /// </summary>
-        /// <value>The compliance.</value>
-        public LifeFormAppearance.ComplianceValue Compliance
-        {
-            get { return this.compliance; }
-            set { this.compliance = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flashlights.
-        /// </summary>
-        /// <value>The flashlights.</value>
-        public LifeFormAppearance.FlashLightsValue FlashLights
-        {
-            get { return this.flashLights; }
-            set { this.flashLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the lifeformstate.
-        /// </summary>
-        /// <value>The lifeformstate.</value>
-        public LifeFormAppearance.LifeFormStateValue LifeFormState
-        {
-            get { return this.lifeFormState; }
-            set { this.lifeFormState = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public LifeFormAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public LifeFormAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the weapon1.
-        /// </summary>
-        /// <value>The weapon1.</value>
-        public LifeFormAppearance.Weapon1Value Weapon1
-        {
-            get { return this.weapon1; }
-            set { this.weapon1 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the weapon2.
-        /// </summary>
-        /// <value>The weapon2.</value>
-        public LifeFormAppearance.Weapon2Value Weapon2
-        {
-            get { return this.weapon2; }
-            set { this.weapon2 = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the camouflagetype.
-        /// </summary>
-        /// <value>The camouflagetype.</value>
-        public LifeFormAppearance.CamouflageTypeValue CamouflageType
-        {
-            get { return this.camouflageType; }
-            set { this.camouflageType = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the concealedstationary.
-        /// </summary>
-        /// <value>The concealedstationary.</value>
-        public LifeFormAppearance.ConcealedStationaryValue ConcealedStationary
-        {
-            get { return this.concealedStationary; }
-            set { this.concealedStationary = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the concealedmovement.
-        /// </summary>
-        /// <value>The concealedmovement.</value>
-        public LifeFormAppearance.ConcealedMovementValue ConcealedMovement
-        {
-            get { return this.concealedMovement; }
-            set { this.concealedMovement = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is LifeFormAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((LifeFormAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LifeFormAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PaintScheme == other.PaintScheme &&
-                this.Health == other.Health &&
-                this.Compliance == other.Compliance &&
-                this.FlashLights == other.FlashLights &&
-                this.LifeFormState == other.LifeFormState &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.State == other.State &&
-                this.Weapon1 == other.Weapon1 &&
-                this.Weapon2 == other.Weapon2 &&
-                this.CamouflageType == other.CamouflageType &&
-                this.ConcealedStationary == other.ConcealedStationary &&
-                this.ConcealedMovement == other.ConcealedMovement;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.PaintScheme << 0);
-            val |= (uint)((uint)this.Health << 3);
-            val |= (uint)((uint)this.Compliance << 5);
-            val |= (uint)((uint)this.FlashLights << 12);
-            val |= (uint)((uint)this.LifeFormState << 16);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.Weapon1 << 24);
-            val |= (uint)((uint)this.Weapon2 << 26);
-            val |= (uint)((uint)this.CamouflageType << 28);
-            val |= (uint)((uint)this.ConcealedStationary << 30);
-            val |= (uint)((uint)this.ConcealedMovement << 31);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PaintScheme.GetHashCode();
-                hash = (hash * 29) + this.Health.GetHashCode();
-                hash = (hash * 29) + this.Compliance.GetHashCode();
-                hash = (hash * 29) + this.FlashLights.GetHashCode();
-                hash = (hash * 29) + this.LifeFormState.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.Weapon1.GetHashCode();
-                hash = (hash * 29) + this.Weapon2.GetHashCode();
-                hash = (hash * 29) + this.CamouflageType.GetHashCode();
-                hash = (hash * 29) + this.ConcealedStationary.GetHashCode();
-                hash = (hash * 29) + this.ConcealedMovement.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for LifeFormAppearance (es.appear.lifeform, Life Forms Kind, 
+    /// section 4.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct LifeFormAppearance
+    {
+        /// <summary>
+        /// Describes the paint scheme of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the paint scheme of an entity")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Uniform color
+            /// </summary>
+            UniformColor = 0,
+
+            /// <summary>
+            /// Camouflage
+            /// </summary>
+            Camouflage = 1
+        }
+
+        /// <summary>
+        /// Describes the damaged visual appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged visual appearance of an entity")]
+        public enum HealthValue : uint
+        {
+            /// <summary>
+            /// No injury
+            /// </summary>
+            NoInjury = 0,
+
+            /// <summary>
+            /// Slight injury
+            /// </summary>
+            SlightInjury = 1,
+
+            /// <summary>
+            /// Moderate injury
+            /// </summary>
+            ModerateInjury = 2,
+
+            /// <summary>
+            /// Fatal injury
+            /// </summary>
+            FatalInjury = 3
+        }
+
+        /// <summary>
+        /// Describes compliance of life form
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes compliance of life form")]
+        public enum ComplianceValue : uint
+        {
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 0,
+
+            /// <summary>
+            /// Detained
+            /// </summary>
+            Detained = 1,
+
+            /// <summary>
+            /// Surrender
+            /// </summary>
+            Surrender = 2,
+
+            /// <summary>
+            /// Using fists
+            /// </summary>
+            UsingFists = 3,
+
+            /// <summary>
+            /// Verbal abuse level 1
+            /// </summary>
+            VerbalAbuseLevel1 = 4,
+
+            /// <summary>
+            /// Verbal abuse level 2
+            /// </summary>
+            VerbalAbuseLevel2 = 5,
+
+            /// <summary>
+            /// Verbal abuse level 3
+            /// </summary>
+            VerbalAbuseLevel3 = 6,
+
+            /// <summary>
+            /// Passive resistance level 1
+            /// </summary>
+            PassiveResistanceLevel1 = 7,
+
+            /// <summary>
+            /// Passive resistance level 2
+            /// </summary>
+            PassiveResistanceLevel2 = 8,
+
+            /// <summary>
+            /// Passive resistance level 3
+            /// </summary>
+            PassiveResistanceLevel3 = 9,
+
+            /// <summary>
+            /// Using non-lethal weapon 1
+            /// </summary>
+            UsingNonLethalWeapon1 = 10,
+
+            /// <summary>
+            /// Using non-lethal weapon 2
+            /// </summary>
+            UsingNonLethalWeapon2 = 11,
+
+            /// <summary>
+            /// Using non-lethal weapon 3
+            /// </summary>
+            UsingNonLethalWeapon3 = 12,
+
+            /// <summary>
+            /// Using non-lethal weapon 4
+            /// </summary>
+            UsingNonLethalWeapon4 = 13,
+
+            /// <summary>
+            /// Using non-lethal weapon 5
+            /// </summary>
+            UsingNonLethalWeapon5 = 14,
+
+            /// <summary>
+            /// Using non-lethal weapon 6
+            /// </summary>
+            UsingNonLethalWeapon6 = 15
+        }
+
+        /// <summary>
+        /// Describes whether Flash Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Flash Lights are on or off.")]
+        public enum FlashLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes the state of the life form
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of the life form")]
+        public enum LifeFormStateValue : uint
+        {
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 0,
+
+            /// <summary>
+            /// Upright, standing still
+            /// </summary>
+            UprightStandingStill = 1,
+
+            /// <summary>
+            /// Upright, walking
+            /// </summary>
+            UprightWalking = 2,
+
+            /// <summary>
+            /// Upright, running
+            /// </summary>
+            UprightRunning = 3,
+
+            /// <summary>
+            /// Kneeling
+            /// </summary>
+            Kneeling = 4,
+
+            /// <summary>
+            /// Prone
+            /// </summary>
+            Prone = 5,
+
+            /// <summary>
+            /// Crawling
+            /// </summary>
+            Crawling = 6,
+
+            /// <summary>
+            /// Swimming
+            /// </summary>
+            Swimming = 7,
+
+            /// <summary>
+            /// Parachuting
+            /// </summary>
+            Parachuting = 8,
+
+            /// <summary>
+            /// Jumping
+            /// </summary>
+            Jumping = 9,
+
+            /// <summary>
+            /// Sitting
+            /// </summary>
+            Sitting = 10,
+
+            /// <summary>
+            /// Squatting
+            /// </summary>
+            Squatting = 11,
+
+            /// <summary>
+            /// Crouching
+            /// </summary>
+            Crouching = 12,
+
+            /// <summary>
+            /// Wading
+            /// </summary>
+            Wading = 13,
+
+            /// <summary>
+            /// Surrender
+            /// </summary>
+            Surrender = 14,
+
+            /// <summary>
+            /// Detained
+            /// </summary>
+            Detained = 15
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a life form
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a life form")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a life form
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a life form")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes the position of the life form's primary weapon
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the position of the life form's primary weapon")]
+        public enum Weapon1Value : uint
+        {
+            /// <summary>
+            /// No primary weapon present
+            /// </summary>
+            NoPrimaryWeaponPresent = 0,
+
+            /// <summary>
+            /// Primary weapon is stowed
+            /// </summary>
+            PrimaryWeaponIsStowed = 1,
+
+            /// <summary>
+            /// Primary weapon is deployed
+            /// </summary>
+            PrimaryWeaponIsDeployed = 2,
+
+            /// <summary>
+            /// Primary weapon is in firing position
+            /// </summary>
+            PrimaryWeaponIsInFiringPosition = 3
+        }
+
+        /// <summary>
+        /// Describes the position of the life form's secondary weapon
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the position of the life form's secondary weapon")]
+        public enum Weapon2Value : uint
+        {
+            /// <summary>
+            /// No secondary weapon present
+            /// </summary>
+            NoSecondaryWeaponPresent = 0,
+
+            /// <summary>
+            /// Secondary weapon is stowed
+            /// </summary>
+            SecondaryWeaponIsStowed = 1,
+
+            /// <summary>
+            /// Secondary weapon is deployed
+            /// </summary>
+            SecondaryWeaponIsDeployed = 2,
+
+            /// <summary>
+            /// Secondary weapon is in firing position
+            /// </summary>
+            SecondaryWeaponIsInFiringPosition = 3
+        }
+
+        /// <summary>
+        /// Describes the type of camouflage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the type of camouflage")]
+        public enum CamouflageTypeValue : uint
+        {
+            /// <summary>
+            /// Desert camouflage
+            /// </summary>
+            DesertCamouflage = 0,
+
+            /// <summary>
+            /// Winter camouflage
+            /// </summary>
+            WinterCamouflage = 1,
+
+            /// <summary>
+            /// Forest camouflage
+            /// </summary>
+            ForestCamouflage = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        /// <summary>
+        /// Describes the type of stationary concealment
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the type of stationary concealment")]
+        public enum ConcealedStationaryValue : uint
+        {
+            /// <summary>
+            /// Not concealed
+            /// </summary>
+            NotConcealed = 0,
+
+            /// <summary>
+            /// Entity in a prepared concealed position
+            /// </summary>
+            EntityInAPreparedConcealedPosition = 1
+        }
+
+        /// <summary>
+        /// Describes the type of concealed movement
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the type of concealed movement")]
+        public enum ConcealedMovementValue : uint
+        {
+            /// <summary>
+            /// Open movement
+            /// </summary>
+            OpenMovement = 0,
+
+            /// <summary>
+            /// Rushes between covered positions
+            /// </summary>
+            RushesBetweenCoveredPositions = 1
+        }
+
+        private LifeFormAppearance.PaintSchemeValue paintScheme;
+        private LifeFormAppearance.HealthValue health;
+        private LifeFormAppearance.ComplianceValue compliance;
+        private LifeFormAppearance.FlashLightsValue flashLights;
+        private LifeFormAppearance.LifeFormStateValue lifeFormState;
+        private LifeFormAppearance.FrozenStatusValue frozenStatus;
+        private LifeFormAppearance.StateValue state;
+        private LifeFormAppearance.Weapon1Value weapon1;
+        private LifeFormAppearance.Weapon2Value weapon2;
+        private LifeFormAppearance.CamouflageTypeValue camouflageType;
+        private LifeFormAppearance.ConcealedStationaryValue concealedStationary;
+        private LifeFormAppearance.ConcealedMovementValue concealedMovement;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LifeFormAppearance left, LifeFormAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LifeFormAppearance left, LifeFormAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(LifeFormAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator LifeFormAppearance(uint value)
+        {
+            return LifeFormAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static LifeFormAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance, represented by the uint value.</returns>
+        public static LifeFormAppearance FromUInt32(uint value)
+        {
+            LifeFormAppearance ps = new LifeFormAppearance();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PaintScheme = (LifeFormAppearance.PaintSchemeValue)newValue0;
+
+            uint mask2 = 0x0018;
+            byte shift2 = 3;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Health = (LifeFormAppearance.HealthValue)newValue2;
+
+            uint mask3 = 0x01e0;
+            byte shift3 = 5;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Compliance = (LifeFormAppearance.ComplianceValue)newValue3;
+
+            uint mask5 = 0x1000;
+            byte shift5 = 12;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.FlashLights = (LifeFormAppearance.FlashLightsValue)newValue5;
+
+            uint mask7 = 0xf0000;
+            byte shift7 = 16;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.LifeFormState = (LifeFormAppearance.LifeFormStateValue)newValue7;
+
+            uint mask9 = 0x200000;
+            byte shift9 = 21;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.FrozenStatus = (LifeFormAppearance.FrozenStatusValue)newValue9;
+
+            uint mask11 = 0x800000;
+            byte shift11 = 23;
+            uint newValue11 = (value & mask11) >> shift11;
+            ps.State = (LifeFormAppearance.StateValue)newValue11;
+
+            uint mask12 = 0x3000000;
+            byte shift12 = 24;
+            uint newValue12 = (value & mask12) >> shift12;
+            ps.Weapon1 = (LifeFormAppearance.Weapon1Value)newValue12;
+
+            uint mask13 = 0xc000000;
+            byte shift13 = 26;
+            uint newValue13 = (value & mask13) >> shift13;
+            ps.Weapon2 = (LifeFormAppearance.Weapon2Value)newValue13;
+
+            uint mask14 = 0x30000000;
+            byte shift14 = 28;
+            uint newValue14 = (value & mask14) >> shift14;
+            ps.CamouflageType = (LifeFormAppearance.CamouflageTypeValue)newValue14;
+
+            uint mask15 = 0x40000000;
+            byte shift15 = 30;
+            uint newValue15 = (value & mask15) >> shift15;
+            ps.ConcealedStationary = (LifeFormAppearance.ConcealedStationaryValue)newValue15;
+
+            uint mask16 = 0x80000000;
+            byte shift16 = 31;
+            uint newValue16 = (value & mask16) >> shift16;
+            ps.ConcealedMovement = (LifeFormAppearance.ConcealedMovementValue)newValue16;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the paintscheme.
+        /// </summary>
+        /// <value>The paintscheme.</value>
+        public LifeFormAppearance.PaintSchemeValue PaintScheme
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the health.
+        /// </summary>
+        /// <value>The health.</value>
+        public LifeFormAppearance.HealthValue Health
+        {
+            get { return this.health; }
+            set { this.health = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the compliance.
+        /// </summary>
+        /// <value>The compliance.</value>
+        public LifeFormAppearance.ComplianceValue Compliance
+        {
+            get { return this.compliance; }
+            set { this.compliance = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flashlights.
+        /// </summary>
+        /// <value>The flashlights.</value>
+        public LifeFormAppearance.FlashLightsValue FlashLights
+        {
+            get { return this.flashLights; }
+            set { this.flashLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the lifeformstate.
+        /// </summary>
+        /// <value>The lifeformstate.</value>
+        public LifeFormAppearance.LifeFormStateValue LifeFormState
+        {
+            get { return this.lifeFormState; }
+            set { this.lifeFormState = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public LifeFormAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public LifeFormAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the weapon1.
+        /// </summary>
+        /// <value>The weapon1.</value>
+        public LifeFormAppearance.Weapon1Value Weapon1
+        {
+            get { return this.weapon1; }
+            set { this.weapon1 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the weapon2.
+        /// </summary>
+        /// <value>The weapon2.</value>
+        public LifeFormAppearance.Weapon2Value Weapon2
+        {
+            get { return this.weapon2; }
+            set { this.weapon2 = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the camouflagetype.
+        /// </summary>
+        /// <value>The camouflagetype.</value>
+        public LifeFormAppearance.CamouflageTypeValue CamouflageType
+        {
+            get { return this.camouflageType; }
+            set { this.camouflageType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the concealedstationary.
+        /// </summary>
+        /// <value>The concealedstationary.</value>
+        public LifeFormAppearance.ConcealedStationaryValue ConcealedStationary
+        {
+            get { return this.concealedStationary; }
+            set { this.concealedStationary = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the concealedmovement.
+        /// </summary>
+        /// <value>The concealedmovement.</value>
+        public LifeFormAppearance.ConcealedMovementValue ConcealedMovement
+        {
+            get { return this.concealedMovement; }
+            set { this.concealedMovement = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is LifeFormAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((LifeFormAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LifeFormAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PaintScheme == other.PaintScheme &&
+                this.Health == other.Health &&
+                this.Compliance == other.Compliance &&
+                this.FlashLights == other.FlashLights &&
+                this.LifeFormState == other.LifeFormState &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.State == other.State &&
+                this.Weapon1 == other.Weapon1 &&
+                this.Weapon2 == other.Weapon2 &&
+                this.CamouflageType == other.CamouflageType &&
+                this.ConcealedStationary == other.ConcealedStationary &&
+                this.ConcealedMovement == other.ConcealedMovement;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.LifeFormAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.PaintScheme << 0);
+            val |= (uint)((uint)this.Health << 3);
+            val |= (uint)((uint)this.Compliance << 5);
+            val |= (uint)((uint)this.FlashLights << 12);
+            val |= (uint)((uint)this.LifeFormState << 16);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.Weapon1 << 24);
+            val |= (uint)((uint)this.Weapon2 << 26);
+            val |= (uint)((uint)this.CamouflageType << 28);
+            val |= (uint)((uint)this.ConcealedStationary << 30);
+            val |= (uint)((uint)this.ConcealedMovement << 31);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PaintScheme.GetHashCode();
+                hash = (hash * 29) + this.Health.GetHashCode();
+                hash = (hash * 29) + this.Compliance.GetHashCode();
+                hash = (hash * 29) + this.FlashLights.GetHashCode();
+                hash = (hash * 29) + this.LifeFormState.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.Weapon1.GetHashCode();
+                hash = (hash * 29) + this.Weapon2.GetHashCode();
+                hash = (hash * 29) + this.CamouflageType.GetHashCode();
+                hash = (hash * 29) + this.ConcealedStationary.GetHashCode();
+                hash = (hash * 29) + this.ConcealedMovement.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/MunitionAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/MunitionAppearance.cs
index e49974e..cb8989d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/MunitionAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/MunitionAppearance.cs
@@ -1,593 +1,593 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for MunitionAppearance (es.appear.munition, Munition Kind, 
-    /// section 4.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct MunitionAppearance
-    {
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status or location of smoke and vapor emanating from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status or location of smoke and vapor emanating from an entity")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke or vapor is emanating from the entity
-            /// </summary>
-            SmokeOrVaporIsEmanatingFromTheEntity = 1,
-
-            /// <summary>
-            /// Entity is emitting motor smoke
-            /// </summary>
-            EntityIsEmittingMotorSmoke = 2,
-
-            /// <summary>
-            /// Entity is emitting motor smoke, and smoke or vapor is emanating from the entity
-            /// </summary>
-            EntityIsEmittingMotorSmokeAndSmokeOrVaporIsEmanatingFromTheEntity = 3
-        }
-
-        /// <summary>
-        /// Describes the size of the vapor trail trailing effect for the effectsentity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the size of the vapor trail trailing effect for the effectsentity")]
-        public enum TrailingEffectsValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Small
-            /// </summary>
-            Small = 1,
-
-            /// <summary>
-            /// Medium
-            /// </summary>
-            Medium = 2,
-
-            /// <summary>
-            /// Large
-            /// </summary>
-            Large = 3
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from an entity")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the presence of a guided munition's launch flash
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the presence of a guided munition's launch flash")]
-        public enum LaunchFlashValue : uint
-        {
-            /// <summary>
-            /// No launch flash present
-            /// </summary>
-            NoLaunchFlashPresent = 0,
-
-            /// <summary>
-            /// Launch flash present
-            /// </summary>
-            LaunchFlashPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a guided munition
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a guided munition")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the power-plant status of a guided munition
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the power-plant status of a guided munition")]
-        public enum PowerPlantStatusValue : uint
-        {
-            /// <summary>
-            /// Power plant off
-            /// </summary>
-            PowerPlantOff = 0,
-
-            /// <summary>
-            /// Power plant on
-            /// </summary>
-            PowerPlantOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a guided munition
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a guided munition")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes if the entity is Masked / Cloaked or Not
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes if the entity is Masked / Cloaked or Not")]
-        public enum MaskedCloakedValue : uint
-        {
-            /// <summary>
-            /// Not Masked / Not Cloaked
-            /// </summary>
-            NotMaskedNotCloaked = 0,
-
-            /// <summary>
-            /// Masked / Cloaked
-            /// </summary>
-            MaskedCloaked = 1
-        }
-
-        private MunitionAppearance.DamageValue damage;
-        private MunitionAppearance.SmokeValue smoke;
-        private MunitionAppearance.TrailingEffectsValue trailingEffects;
-        private MunitionAppearance.FlamingValue flaming;
-        private MunitionAppearance.LaunchFlashValue launchFlash;
-        private MunitionAppearance.FrozenStatusValue frozenStatus;
-        private MunitionAppearance.PowerPlantStatusValue powerPlantStatus;
-        private MunitionAppearance.StateValue state;
-        private MunitionAppearance.MaskedCloakedValue maskedCloaked;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MunitionAppearance left, MunitionAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MunitionAppearance left, MunitionAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(MunitionAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator MunitionAppearance(uint value)
-        {
-            return MunitionAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static MunitionAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance, represented by the uint value.</returns>
-        public static MunitionAppearance FromUInt32(uint value)
-        {
-            MunitionAppearance ps = new MunitionAppearance();
-
-            uint mask1 = 0x0018;
-            byte shift1 = 3;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Damage = (MunitionAppearance.DamageValue)newValue1;
-
-            uint mask2 = 0x0060;
-            byte shift2 = 5;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Smoke = (MunitionAppearance.SmokeValue)newValue2;
-
-            uint mask3 = 0x0180;
-            byte shift3 = 7;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.TrailingEffects = (MunitionAppearance.TrailingEffectsValue)newValue3;
-
-            uint mask5 = 0x8000;
-            byte shift5 = 15;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.Flaming = (MunitionAppearance.FlamingValue)newValue5;
-
-            uint mask6 = 0x10000;
-            byte shift6 = 16;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.LaunchFlash = (MunitionAppearance.LaunchFlashValue)newValue6;
-
-            uint mask8 = 0x200000;
-            byte shift8 = 21;
-            uint newValue8 = (value & mask8) >> shift8;
-            ps.FrozenStatus = (MunitionAppearance.FrozenStatusValue)newValue8;
-
-            uint mask9 = 0x400000;
-            byte shift9 = 22;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.PowerPlantStatus = (MunitionAppearance.PowerPlantStatusValue)newValue9;
-
-            uint mask10 = 0x800000;
-            byte shift10 = 23;
-            uint newValue10 = (value & mask10) >> shift10;
-            ps.State = (MunitionAppearance.StateValue)newValue10;
-
-            uint mask12 = 0x80000000;
-            byte shift12 = 31;
-            uint newValue12 = (value & mask12) >> shift12;
-            ps.MaskedCloaked = (MunitionAppearance.MaskedCloakedValue)newValue12;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public MunitionAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public MunitionAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the trailingeffects.
-        /// </summary>
-        /// <value>The trailingeffects.</value>
-        public MunitionAppearance.TrailingEffectsValue TrailingEffects
-        {
-            get { return this.trailingEffects; }
-            set { this.trailingEffects = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public MunitionAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the launchflash.
-        /// </summary>
-        /// <value>The launchflash.</value>
-        public MunitionAppearance.LaunchFlashValue LaunchFlash
-        {
-            get { return this.launchFlash; }
-            set { this.launchFlash = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public MunitionAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerplantstatus.
-        /// </summary>
-        /// <value>The powerplantstatus.</value>
-        public MunitionAppearance.PowerPlantStatusValue PowerPlantStatus
-        {
-            get { return this.powerPlantStatus; }
-            set { this.powerPlantStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public MunitionAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the maskedcloaked.
-        /// </summary>
-        /// <value>The maskedcloaked.</value>
-        public MunitionAppearance.MaskedCloakedValue MaskedCloaked
-        {
-            get { return this.maskedCloaked; }
-            set { this.maskedCloaked = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is MunitionAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((MunitionAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MunitionAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.TrailingEffects == other.TrailingEffects &&
-                this.Flaming == other.Flaming &&
-                this.LaunchFlash == other.LaunchFlash &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.PowerPlantStatus == other.PowerPlantStatus &&
-                this.State == other.State &&
-                this.MaskedCloaked == other.MaskedCloaked;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.TrailingEffects << 7);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.LaunchFlash << 16);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.PowerPlantStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.MaskedCloaked << 31);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.LaunchFlash.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for MunitionAppearance (es.appear.munition, Munition Kind, 
+    /// section 4.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct MunitionAppearance
+    {
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status or location of smoke and vapor emanating from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status or location of smoke and vapor emanating from an entity")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke or vapor is emanating from the entity
+            /// </summary>
+            SmokeOrVaporIsEmanatingFromTheEntity = 1,
+
+            /// <summary>
+            /// Entity is emitting motor smoke
+            /// </summary>
+            EntityIsEmittingMotorSmoke = 2,
+
+            /// <summary>
+            /// Entity is emitting motor smoke, and smoke or vapor is emanating from the entity
+            /// </summary>
+            EntityIsEmittingMotorSmokeAndSmokeOrVaporIsEmanatingFromTheEntity = 3
+        }
+
+        /// <summary>
+        /// Describes the size of the vapor trail trailing effect for the effectsentity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the size of the vapor trail trailing effect for the effectsentity")]
+        public enum TrailingEffectsValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Small
+            /// </summary>
+            Small = 1,
+
+            /// <summary>
+            /// Medium
+            /// </summary>
+            Medium = 2,
+
+            /// <summary>
+            /// Large
+            /// </summary>
+            Large = 3
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from an entity")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the presence of a guided munition's launch flash
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the presence of a guided munition's launch flash")]
+        public enum LaunchFlashValue : uint
+        {
+            /// <summary>
+            /// No launch flash present
+            /// </summary>
+            NoLaunchFlashPresent = 0,
+
+            /// <summary>
+            /// Launch flash present
+            /// </summary>
+            LaunchFlashPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a guided munition
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a guided munition")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the power-plant status of a guided munition
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the power-plant status of a guided munition")]
+        public enum PowerPlantStatusValue : uint
+        {
+            /// <summary>
+            /// Power plant off
+            /// </summary>
+            PowerPlantOff = 0,
+
+            /// <summary>
+            /// Power plant on
+            /// </summary>
+            PowerPlantOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a guided munition
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a guided munition")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes if the entity is Masked / Cloaked or Not
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes if the entity is Masked / Cloaked or Not")]
+        public enum MaskedCloakedValue : uint
+        {
+            /// <summary>
+            /// Not Masked / Not Cloaked
+            /// </summary>
+            NotMaskedNotCloaked = 0,
+
+            /// <summary>
+            /// Masked / Cloaked
+            /// </summary>
+            MaskedCloaked = 1
+        }
+
+        private MunitionAppearance.DamageValue damage;
+        private MunitionAppearance.SmokeValue smoke;
+        private MunitionAppearance.TrailingEffectsValue trailingEffects;
+        private MunitionAppearance.FlamingValue flaming;
+        private MunitionAppearance.LaunchFlashValue launchFlash;
+        private MunitionAppearance.FrozenStatusValue frozenStatus;
+        private MunitionAppearance.PowerPlantStatusValue powerPlantStatus;
+        private MunitionAppearance.StateValue state;
+        private MunitionAppearance.MaskedCloakedValue maskedCloaked;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MunitionAppearance left, MunitionAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MunitionAppearance left, MunitionAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(MunitionAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator MunitionAppearance(uint value)
+        {
+            return MunitionAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static MunitionAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance, represented by the uint value.</returns>
+        public static MunitionAppearance FromUInt32(uint value)
+        {
+            MunitionAppearance ps = new MunitionAppearance();
+
+            uint mask1 = 0x0018;
+            byte shift1 = 3;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Damage = (MunitionAppearance.DamageValue)newValue1;
+
+            uint mask2 = 0x0060;
+            byte shift2 = 5;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Smoke = (MunitionAppearance.SmokeValue)newValue2;
+
+            uint mask3 = 0x0180;
+            byte shift3 = 7;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.TrailingEffects = (MunitionAppearance.TrailingEffectsValue)newValue3;
+
+            uint mask5 = 0x8000;
+            byte shift5 = 15;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.Flaming = (MunitionAppearance.FlamingValue)newValue5;
+
+            uint mask6 = 0x10000;
+            byte shift6 = 16;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.LaunchFlash = (MunitionAppearance.LaunchFlashValue)newValue6;
+
+            uint mask8 = 0x200000;
+            byte shift8 = 21;
+            uint newValue8 = (value & mask8) >> shift8;
+            ps.FrozenStatus = (MunitionAppearance.FrozenStatusValue)newValue8;
+
+            uint mask9 = 0x400000;
+            byte shift9 = 22;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.PowerPlantStatus = (MunitionAppearance.PowerPlantStatusValue)newValue9;
+
+            uint mask10 = 0x800000;
+            byte shift10 = 23;
+            uint newValue10 = (value & mask10) >> shift10;
+            ps.State = (MunitionAppearance.StateValue)newValue10;
+
+            uint mask12 = 0x80000000;
+            byte shift12 = 31;
+            uint newValue12 = (value & mask12) >> shift12;
+            ps.MaskedCloaked = (MunitionAppearance.MaskedCloakedValue)newValue12;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public MunitionAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public MunitionAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the trailingeffects.
+        /// </summary>
+        /// <value>The trailingeffects.</value>
+        public MunitionAppearance.TrailingEffectsValue TrailingEffects
+        {
+            get { return this.trailingEffects; }
+            set { this.trailingEffects = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public MunitionAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the launchflash.
+        /// </summary>
+        /// <value>The launchflash.</value>
+        public MunitionAppearance.LaunchFlashValue LaunchFlash
+        {
+            get { return this.launchFlash; }
+            set { this.launchFlash = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public MunitionAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerplantstatus.
+        /// </summary>
+        /// <value>The powerplantstatus.</value>
+        public MunitionAppearance.PowerPlantStatusValue PowerPlantStatus
+        {
+            get { return this.powerPlantStatus; }
+            set { this.powerPlantStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public MunitionAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maskedcloaked.
+        /// </summary>
+        /// <value>The maskedcloaked.</value>
+        public MunitionAppearance.MaskedCloakedValue MaskedCloaked
+        {
+            get { return this.maskedCloaked; }
+            set { this.maskedCloaked = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is MunitionAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((MunitionAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MunitionAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.TrailingEffects == other.TrailingEffects &&
+                this.Flaming == other.Flaming &&
+                this.LaunchFlash == other.LaunchFlash &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.PowerPlantStatus == other.PowerPlantStatus &&
+                this.State == other.State &&
+                this.MaskedCloaked == other.MaskedCloaked;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.MunitionAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.TrailingEffects << 7);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.LaunchFlash << 16);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.PowerPlantStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.MaskedCloaked << 31);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.LaunchFlash.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.MaskedCloaked.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
index 8080e3b..2a86c5e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SensorEmitterAppearance.cs
@@ -1,923 +1,923 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for SensorEmitterAppearance (es.appear.sensoremitter, Sensor/Emitter Kind, 
-    /// section 4.3.9)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct SensorEmitterAppearance
-    {
-        /// <summary>
-        /// Describes the paint scheme of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the paint scheme of an entity")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Uniform color
-            /// </summary>
-            UniformColor = 0,
-
-            /// <summary>
-            /// Camouflage
-            /// </summary>
-            Camouflage = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of mobility kill
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of mobility kill")]
-        public enum MobilityValue : uint
-        {
-            /// <summary>
-            /// No mobility kill
-            /// </summary>
-            NoMobilityKill = 0,
-
-            /// <summary>
-            /// Mobility kill
-            /// </summary>
-            MobilityKill = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of mission kill (e.g. damaged antenna)
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of mission kill (e.g. damaged antenna)")]
-        public enum MissionValue : uint
-        {
-            /// <summary>
-            /// No mission kill
-            /// </summary>
-            NoMissionKill = 0,
-
-            /// <summary>
-            /// Mission kill
-            /// </summary>
-            MissionKill = 1
-        }
-
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status or location of smoke emanating from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status or location of smoke emanating from an entity")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke plume rising from the entity
-            /// </summary>
-            SmokePlumeRisingFromTheEntity = 1,
-
-            /// <summary>
-            /// Entity is emitting engine smoke
-            /// </summary>
-            EntityIsEmittingEngineSmoke = 2,
-
-            /// <summary>
-            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
-            /// </summary>
-            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
-        }
-
-        /// <summary>
-        /// Describes the size of the dust cloud trailing effect for the Sensor/Emitter entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the size of the dust cloud trailing effect for the Sensor/Emitter entity")]
-        public enum TrailingEffectsValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Small
-            /// </summary>
-            Small = 1,
-
-            /// <summary>
-            /// Medium
-            /// </summary>
-            Medium = 2,
-
-            /// <summary>
-            /// Large
-            /// </summary>
-            Large = 3
-        }
-
-        /// <summary>
-        /// Describes the status of lights on the sensor
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the status of lights on the sensor")]
-        public enum LightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from the entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from the entity")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the elevated status of the sensor's antenna
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the elevated status of the sensor's antenna")]
-        public enum AntennaValue : uint
-        {
-            /// <summary>
-            /// Not raised
-            /// </summary>
-            NotRaised = 0,
-
-            /// <summary>
-            /// Raised
-            /// </summary>
-            Raised = 1
-        }
-
-        /// <summary>
-        /// Describes the type of camouflage
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the type of camouflage")]
-        public enum CamouflageTypeValue : uint
-        {
-            /// <summary>
-            /// Desert camouflage
-            /// </summary>
-            DesertCamouflage = 0,
-
-            /// <summary>
-            /// Winter camouflage
-            /// </summary>
-            WinterCamouflage = 1,
-
-            /// <summary>
-            /// Forest camouflage
-            /// </summary>
-            ForestCamouflage = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        /// <summary>
-        /// Describes the type of concealment
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the type of concealment")]
-        public enum ConcealedValue : uint
-        {
-            /// <summary>
-            /// Not concealed
-            /// </summary>
-            NotConcealed = 0,
-
-            /// <summary>
-            /// Entity in a prepared concealed position (with netting, etc.)
-            /// </summary>
-            EntityInAPreparedConcealedPositionWithNettingEtc = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of an entity")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the power-plant status of the sensor
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the power-plant status of the sensor")]
-        public enum PowerPlantStatusValue : uint
-        {
-            /// <summary>
-            /// Power plant off
-            /// </summary>
-            PowerPlantOff = 0,
-
-            /// <summary>
-            /// Power plant on
-            /// </summary>
-            PowerPlantOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of an entity")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes the status of a tent extension
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the status of a tent extension")]
-        public enum TentValue : uint
-        {
-            /// <summary>
-            /// Not extended
-            /// </summary>
-            NotExtended = 0,
-
-            /// <summary>
-            /// Extended
-            /// </summary>
-            Extended = 1
-        }
-
-        /// <summary>
-        /// Describes whether Blackout Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Blackout Lights are on or off.")]
-        public enum BlackoutLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Interior Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Interior Lights are on or off.")]
-        public enum InteriorLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        private SensorEmitterAppearance.PaintSchemeValue paintScheme;
-        private SensorEmitterAppearance.MobilityValue mobility;
-        private SensorEmitterAppearance.MissionValue mission;
-        private SensorEmitterAppearance.DamageValue damage;
-        private SensorEmitterAppearance.SmokeValue smoke;
-        private SensorEmitterAppearance.TrailingEffectsValue trailingEffects;
-        private SensorEmitterAppearance.LightsValue lights;
-        private SensorEmitterAppearance.FlamingValue flaming;
-        private SensorEmitterAppearance.AntennaValue antenna;
-        private SensorEmitterAppearance.CamouflageTypeValue camouflageType;
-        private SensorEmitterAppearance.ConcealedValue concealed;
-        private SensorEmitterAppearance.FrozenStatusValue frozenStatus;
-        private SensorEmitterAppearance.PowerPlantStatusValue powerPlantStatus;
-        private SensorEmitterAppearance.StateValue state;
-        private SensorEmitterAppearance.TentValue tent;
-        private SensorEmitterAppearance.BlackoutLightsValue blackoutLights;
-        private SensorEmitterAppearance.InteriorLightsValue interiorLights;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SensorEmitterAppearance left, SensorEmitterAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SensorEmitterAppearance left, SensorEmitterAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(SensorEmitterAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator SensorEmitterAppearance(uint value)
-        {
-            return SensorEmitterAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static SensorEmitterAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance, represented by the uint value.</returns>
-        public static SensorEmitterAppearance FromUInt32(uint value)
-        {
-            SensorEmitterAppearance ps = new SensorEmitterAppearance();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PaintScheme = (SensorEmitterAppearance.PaintSchemeValue)newValue0;
-
-            uint mask1 = 0x0002;
-            byte shift1 = 1;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Mobility = (SensorEmitterAppearance.MobilityValue)newValue1;
-
-            uint mask2 = 0x0004;
-            byte shift2 = 2;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Mission = (SensorEmitterAppearance.MissionValue)newValue2;
-
-            uint mask3 = 0x0018;
-            byte shift3 = 3;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (SensorEmitterAppearance.DamageValue)newValue3;
-
-            uint mask4 = 0x0060;
-            byte shift4 = 5;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Smoke = (SensorEmitterAppearance.SmokeValue)newValue4;
-
-            uint mask5 = 0x0180;
-            byte shift5 = 7;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.TrailingEffects = (SensorEmitterAppearance.TrailingEffectsValue)newValue5;
-
-            uint mask7 = 0x1000;
-            byte shift7 = 12;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.Lights = (SensorEmitterAppearance.LightsValue)newValue7;
-
-            uint mask9 = 0x8000;
-            byte shift9 = 15;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.Flaming = (SensorEmitterAppearance.FlamingValue)newValue9;
-
-            uint mask10 = 0x10000;
-            byte shift10 = 16;
-            uint newValue10 = (value & mask10) >> shift10;
-            ps.Antenna = (SensorEmitterAppearance.AntennaValue)newValue10;
-
-            uint mask11 = 0x60000;
-            byte shift11 = 17;
-            uint newValue11 = (value & mask11) >> shift11;
-            ps.CamouflageType = (SensorEmitterAppearance.CamouflageTypeValue)newValue11;
-
-            uint mask12 = 0x80000;
-            byte shift12 = 19;
-            uint newValue12 = (value & mask12) >> shift12;
-            ps.Concealed = (SensorEmitterAppearance.ConcealedValue)newValue12;
-
-            uint mask14 = 0x200000;
-            byte shift14 = 21;
-            uint newValue14 = (value & mask14) >> shift14;
-            ps.FrozenStatus = (SensorEmitterAppearance.FrozenStatusValue)newValue14;
-
-            uint mask15 = 0x400000;
-            byte shift15 = 22;
-            uint newValue15 = (value & mask15) >> shift15;
-            ps.PowerPlantStatus = (SensorEmitterAppearance.PowerPlantStatusValue)newValue15;
-
-            uint mask16 = 0x800000;
-            byte shift16 = 23;
-            uint newValue16 = (value & mask16) >> shift16;
-            ps.State = (SensorEmitterAppearance.StateValue)newValue16;
-
-            uint mask17 = 0x1000000;
-            byte shift17 = 24;
-            uint newValue17 = (value & mask17) >> shift17;
-            ps.Tent = (SensorEmitterAppearance.TentValue)newValue17;
-
-            uint mask19 = 0x4000000;
-            byte shift19 = 26;
-            uint newValue19 = (value & mask19) >> shift19;
-            ps.BlackoutLights = (SensorEmitterAppearance.BlackoutLightsValue)newValue19;
-
-            uint mask21 = 0x20000000;
-            byte shift21 = 29;
-            uint newValue21 = (value & mask21) >> shift21;
-            ps.InteriorLights = (SensorEmitterAppearance.InteriorLightsValue)newValue21;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the paintscheme.
-        /// </summary>
-        /// <value>The paintscheme.</value>
-        public SensorEmitterAppearance.PaintSchemeValue PaintScheme
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the mobility.
-        /// </summary>
-        /// <value>The mobility.</value>
-        public SensorEmitterAppearance.MobilityValue Mobility
-        {
-            get { return this.mobility; }
-            set { this.mobility = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the mission.
-        /// </summary>
-        /// <value>The mission.</value>
-        public SensorEmitterAppearance.MissionValue Mission
-        {
-            get { return this.mission; }
-            set { this.mission = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public SensorEmitterAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public SensorEmitterAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the trailingeffects.
-        /// </summary>
-        /// <value>The trailingeffects.</value>
-        public SensorEmitterAppearance.TrailingEffectsValue TrailingEffects
-        {
-            get { return this.trailingEffects; }
-            set { this.trailingEffects = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the lights.
-        /// </summary>
-        /// <value>The lights.</value>
-        public SensorEmitterAppearance.LightsValue Lights
-        {
-            get { return this.lights; }
-            set { this.lights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public SensorEmitterAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the antenna.
-        /// </summary>
-        /// <value>The antenna.</value>
-        public SensorEmitterAppearance.AntennaValue Antenna
-        {
-            get { return this.antenna; }
-            set { this.antenna = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the camouflagetype.
-        /// </summary>
-        /// <value>The camouflagetype.</value>
-        public SensorEmitterAppearance.CamouflageTypeValue CamouflageType
-        {
-            get { return this.camouflageType; }
-            set { this.camouflageType = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the concealed.
-        /// </summary>
-        /// <value>The concealed.</value>
-        public SensorEmitterAppearance.ConcealedValue Concealed
-        {
-            get { return this.concealed; }
-            set { this.concealed = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public SensorEmitterAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerplantstatus.
-        /// </summary>
-        /// <value>The powerplantstatus.</value>
-        public SensorEmitterAppearance.PowerPlantStatusValue PowerPlantStatus
-        {
-            get { return this.powerPlantStatus; }
-            set { this.powerPlantStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public SensorEmitterAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the tent.
-        /// </summary>
-        /// <value>The tent.</value>
-        public SensorEmitterAppearance.TentValue Tent
-        {
-            get { return this.tent; }
-            set { this.tent = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the blackoutlights.
-        /// </summary>
-        /// <value>The blackoutlights.</value>
-        public SensorEmitterAppearance.BlackoutLightsValue BlackoutLights
-        {
-            get { return this.blackoutLights; }
-            set { this.blackoutLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the interiorlights.
-        /// </summary>
-        /// <value>The interiorlights.</value>
-        public SensorEmitterAppearance.InteriorLightsValue InteriorLights
-        {
-            get { return this.interiorLights; }
-            set { this.interiorLights = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is SensorEmitterAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((SensorEmitterAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SensorEmitterAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PaintScheme == other.PaintScheme &&
-                this.Mobility == other.Mobility &&
-                this.Mission == other.Mission &&
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.TrailingEffects == other.TrailingEffects &&
-                this.Lights == other.Lights &&
-                this.Flaming == other.Flaming &&
-                this.Antenna == other.Antenna &&
-                this.CamouflageType == other.CamouflageType &&
-                this.Concealed == other.Concealed &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.PowerPlantStatus == other.PowerPlantStatus &&
-                this.State == other.State &&
-                this.Tent == other.Tent &&
-                this.BlackoutLights == other.BlackoutLights &&
-                this.InteriorLights == other.InteriorLights;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.PaintScheme << 0);
-            val |= (uint)((uint)this.Mobility << 1);
-            val |= (uint)((uint)this.Mission << 2);
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.TrailingEffects << 7);
-            val |= (uint)((uint)this.Lights << 12);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.Antenna << 16);
-            val |= (uint)((uint)this.CamouflageType << 17);
-            val |= (uint)((uint)this.Concealed << 19);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.PowerPlantStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.Tent << 24);
-            val |= (uint)((uint)this.BlackoutLights << 26);
-            val |= (uint)((uint)this.InteriorLights << 29);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PaintScheme.GetHashCode();
-                hash = (hash * 29) + this.Mobility.GetHashCode();
-                hash = (hash * 29) + this.Mission.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
-                hash = (hash * 29) + this.Lights.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.Antenna.GetHashCode();
-                hash = (hash * 29) + this.CamouflageType.GetHashCode();
-                hash = (hash * 29) + this.Concealed.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.Tent.GetHashCode();
-                hash = (hash * 29) + this.BlackoutLights.GetHashCode();
-                hash = (hash * 29) + this.InteriorLights.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for SensorEmitterAppearance (es.appear.sensoremitter, Sensor/Emitter Kind, 
+    /// section 4.3.9)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct SensorEmitterAppearance
+    {
+        /// <summary>
+        /// Describes the paint scheme of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the paint scheme of an entity")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Uniform color
+            /// </summary>
+            UniformColor = 0,
+
+            /// <summary>
+            /// Camouflage
+            /// </summary>
+            Camouflage = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of mobility kill
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of mobility kill")]
+        public enum MobilityValue : uint
+        {
+            /// <summary>
+            /// No mobility kill
+            /// </summary>
+            NoMobilityKill = 0,
+
+            /// <summary>
+            /// Mobility kill
+            /// </summary>
+            MobilityKill = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of mission kill (e.g. damaged antenna)
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of mission kill (e.g. damaged antenna)")]
+        public enum MissionValue : uint
+        {
+            /// <summary>
+            /// No mission kill
+            /// </summary>
+            NoMissionKill = 0,
+
+            /// <summary>
+            /// Mission kill
+            /// </summary>
+            MissionKill = 1
+        }
+
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status or location of smoke emanating from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status or location of smoke emanating from an entity")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke plume rising from the entity
+            /// </summary>
+            SmokePlumeRisingFromTheEntity = 1,
+
+            /// <summary>
+            /// Entity is emitting engine smoke
+            /// </summary>
+            EntityIsEmittingEngineSmoke = 2,
+
+            /// <summary>
+            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
+            /// </summary>
+            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
+        }
+
+        /// <summary>
+        /// Describes the size of the dust cloud trailing effect for the Sensor/Emitter entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the size of the dust cloud trailing effect for the Sensor/Emitter entity")]
+        public enum TrailingEffectsValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Small
+            /// </summary>
+            Small = 1,
+
+            /// <summary>
+            /// Medium
+            /// </summary>
+            Medium = 2,
+
+            /// <summary>
+            /// Large
+            /// </summary>
+            Large = 3
+        }
+
+        /// <summary>
+        /// Describes the status of lights on the sensor
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the status of lights on the sensor")]
+        public enum LightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from the entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from the entity")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the elevated status of the sensor's antenna
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the elevated status of the sensor's antenna")]
+        public enum AntennaValue : uint
+        {
+            /// <summary>
+            /// Not raised
+            /// </summary>
+            NotRaised = 0,
+
+            /// <summary>
+            /// Raised
+            /// </summary>
+            Raised = 1
+        }
+
+        /// <summary>
+        /// Describes the type of camouflage
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the type of camouflage")]
+        public enum CamouflageTypeValue : uint
+        {
+            /// <summary>
+            /// Desert camouflage
+            /// </summary>
+            DesertCamouflage = 0,
+
+            /// <summary>
+            /// Winter camouflage
+            /// </summary>
+            WinterCamouflage = 1,
+
+            /// <summary>
+            /// Forest camouflage
+            /// </summary>
+            ForestCamouflage = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        /// <summary>
+        /// Describes the type of concealment
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the type of concealment")]
+        public enum ConcealedValue : uint
+        {
+            /// <summary>
+            /// Not concealed
+            /// </summary>
+            NotConcealed = 0,
+
+            /// <summary>
+            /// Entity in a prepared concealed position (with netting, etc.)
+            /// </summary>
+            EntityInAPreparedConcealedPositionWithNettingEtc = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of an entity")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the power-plant status of the sensor
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the power-plant status of the sensor")]
+        public enum PowerPlantStatusValue : uint
+        {
+            /// <summary>
+            /// Power plant off
+            /// </summary>
+            PowerPlantOff = 0,
+
+            /// <summary>
+            /// Power plant on
+            /// </summary>
+            PowerPlantOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of an entity")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes the status of a tent extension
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the status of a tent extension")]
+        public enum TentValue : uint
+        {
+            /// <summary>
+            /// Not extended
+            /// </summary>
+            NotExtended = 0,
+
+            /// <summary>
+            /// Extended
+            /// </summary>
+            Extended = 1
+        }
+
+        /// <summary>
+        /// Describes whether Blackout Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Blackout Lights are on or off.")]
+        public enum BlackoutLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Interior Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Interior Lights are on or off.")]
+        public enum InteriorLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        private SensorEmitterAppearance.PaintSchemeValue paintScheme;
+        private SensorEmitterAppearance.MobilityValue mobility;
+        private SensorEmitterAppearance.MissionValue mission;
+        private SensorEmitterAppearance.DamageValue damage;
+        private SensorEmitterAppearance.SmokeValue smoke;
+        private SensorEmitterAppearance.TrailingEffectsValue trailingEffects;
+        private SensorEmitterAppearance.LightsValue lights;
+        private SensorEmitterAppearance.FlamingValue flaming;
+        private SensorEmitterAppearance.AntennaValue antenna;
+        private SensorEmitterAppearance.CamouflageTypeValue camouflageType;
+        private SensorEmitterAppearance.ConcealedValue concealed;
+        private SensorEmitterAppearance.FrozenStatusValue frozenStatus;
+        private SensorEmitterAppearance.PowerPlantStatusValue powerPlantStatus;
+        private SensorEmitterAppearance.StateValue state;
+        private SensorEmitterAppearance.TentValue tent;
+        private SensorEmitterAppearance.BlackoutLightsValue blackoutLights;
+        private SensorEmitterAppearance.InteriorLightsValue interiorLights;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SensorEmitterAppearance left, SensorEmitterAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SensorEmitterAppearance left, SensorEmitterAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(SensorEmitterAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator SensorEmitterAppearance(uint value)
+        {
+            return SensorEmitterAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static SensorEmitterAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance, represented by the uint value.</returns>
+        public static SensorEmitterAppearance FromUInt32(uint value)
+        {
+            SensorEmitterAppearance ps = new SensorEmitterAppearance();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PaintScheme = (SensorEmitterAppearance.PaintSchemeValue)newValue0;
+
+            uint mask1 = 0x0002;
+            byte shift1 = 1;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Mobility = (SensorEmitterAppearance.MobilityValue)newValue1;
+
+            uint mask2 = 0x0004;
+            byte shift2 = 2;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Mission = (SensorEmitterAppearance.MissionValue)newValue2;
+
+            uint mask3 = 0x0018;
+            byte shift3 = 3;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (SensorEmitterAppearance.DamageValue)newValue3;
+
+            uint mask4 = 0x0060;
+            byte shift4 = 5;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Smoke = (SensorEmitterAppearance.SmokeValue)newValue4;
+
+            uint mask5 = 0x0180;
+            byte shift5 = 7;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.TrailingEffects = (SensorEmitterAppearance.TrailingEffectsValue)newValue5;
+
+            uint mask7 = 0x1000;
+            byte shift7 = 12;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.Lights = (SensorEmitterAppearance.LightsValue)newValue7;
+
+            uint mask9 = 0x8000;
+            byte shift9 = 15;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.Flaming = (SensorEmitterAppearance.FlamingValue)newValue9;
+
+            uint mask10 = 0x10000;
+            byte shift10 = 16;
+            uint newValue10 = (value & mask10) >> shift10;
+            ps.Antenna = (SensorEmitterAppearance.AntennaValue)newValue10;
+
+            uint mask11 = 0x60000;
+            byte shift11 = 17;
+            uint newValue11 = (value & mask11) >> shift11;
+            ps.CamouflageType = (SensorEmitterAppearance.CamouflageTypeValue)newValue11;
+
+            uint mask12 = 0x80000;
+            byte shift12 = 19;
+            uint newValue12 = (value & mask12) >> shift12;
+            ps.Concealed = (SensorEmitterAppearance.ConcealedValue)newValue12;
+
+            uint mask14 = 0x200000;
+            byte shift14 = 21;
+            uint newValue14 = (value & mask14) >> shift14;
+            ps.FrozenStatus = (SensorEmitterAppearance.FrozenStatusValue)newValue14;
+
+            uint mask15 = 0x400000;
+            byte shift15 = 22;
+            uint newValue15 = (value & mask15) >> shift15;
+            ps.PowerPlantStatus = (SensorEmitterAppearance.PowerPlantStatusValue)newValue15;
+
+            uint mask16 = 0x800000;
+            byte shift16 = 23;
+            uint newValue16 = (value & mask16) >> shift16;
+            ps.State = (SensorEmitterAppearance.StateValue)newValue16;
+
+            uint mask17 = 0x1000000;
+            byte shift17 = 24;
+            uint newValue17 = (value & mask17) >> shift17;
+            ps.Tent = (SensorEmitterAppearance.TentValue)newValue17;
+
+            uint mask19 = 0x4000000;
+            byte shift19 = 26;
+            uint newValue19 = (value & mask19) >> shift19;
+            ps.BlackoutLights = (SensorEmitterAppearance.BlackoutLightsValue)newValue19;
+
+            uint mask21 = 0x20000000;
+            byte shift21 = 29;
+            uint newValue21 = (value & mask21) >> shift21;
+            ps.InteriorLights = (SensorEmitterAppearance.InteriorLightsValue)newValue21;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the paintscheme.
+        /// </summary>
+        /// <value>The paintscheme.</value>
+        public SensorEmitterAppearance.PaintSchemeValue PaintScheme
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the mobility.
+        /// </summary>
+        /// <value>The mobility.</value>
+        public SensorEmitterAppearance.MobilityValue Mobility
+        {
+            get { return this.mobility; }
+            set { this.mobility = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the mission.
+        /// </summary>
+        /// <value>The mission.</value>
+        public SensorEmitterAppearance.MissionValue Mission
+        {
+            get { return this.mission; }
+            set { this.mission = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public SensorEmitterAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public SensorEmitterAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the trailingeffects.
+        /// </summary>
+        /// <value>The trailingeffects.</value>
+        public SensorEmitterAppearance.TrailingEffectsValue TrailingEffects
+        {
+            get { return this.trailingEffects; }
+            set { this.trailingEffects = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the lights.
+        /// </summary>
+        /// <value>The lights.</value>
+        public SensorEmitterAppearance.LightsValue Lights
+        {
+            get { return this.lights; }
+            set { this.lights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public SensorEmitterAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the antenna.
+        /// </summary>
+        /// <value>The antenna.</value>
+        public SensorEmitterAppearance.AntennaValue Antenna
+        {
+            get { return this.antenna; }
+            set { this.antenna = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the camouflagetype.
+        /// </summary>
+        /// <value>The camouflagetype.</value>
+        public SensorEmitterAppearance.CamouflageTypeValue CamouflageType
+        {
+            get { return this.camouflageType; }
+            set { this.camouflageType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the concealed.
+        /// </summary>
+        /// <value>The concealed.</value>
+        public SensorEmitterAppearance.ConcealedValue Concealed
+        {
+            get { return this.concealed; }
+            set { this.concealed = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public SensorEmitterAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerplantstatus.
+        /// </summary>
+        /// <value>The powerplantstatus.</value>
+        public SensorEmitterAppearance.PowerPlantStatusValue PowerPlantStatus
+        {
+            get { return this.powerPlantStatus; }
+            set { this.powerPlantStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public SensorEmitterAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the tent.
+        /// </summary>
+        /// <value>The tent.</value>
+        public SensorEmitterAppearance.TentValue Tent
+        {
+            get { return this.tent; }
+            set { this.tent = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the blackoutlights.
+        /// </summary>
+        /// <value>The blackoutlights.</value>
+        public SensorEmitterAppearance.BlackoutLightsValue BlackoutLights
+        {
+            get { return this.blackoutLights; }
+            set { this.blackoutLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the interiorlights.
+        /// </summary>
+        /// <value>The interiorlights.</value>
+        public SensorEmitterAppearance.InteriorLightsValue InteriorLights
+        {
+            get { return this.interiorLights; }
+            set { this.interiorLights = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is SensorEmitterAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((SensorEmitterAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SensorEmitterAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PaintScheme == other.PaintScheme &&
+                this.Mobility == other.Mobility &&
+                this.Mission == other.Mission &&
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.TrailingEffects == other.TrailingEffects &&
+                this.Lights == other.Lights &&
+                this.Flaming == other.Flaming &&
+                this.Antenna == other.Antenna &&
+                this.CamouflageType == other.CamouflageType &&
+                this.Concealed == other.Concealed &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.PowerPlantStatus == other.PowerPlantStatus &&
+                this.State == other.State &&
+                this.Tent == other.Tent &&
+                this.BlackoutLights == other.BlackoutLights &&
+                this.InteriorLights == other.InteriorLights;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SensorEmitterAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.PaintScheme << 0);
+            val |= (uint)((uint)this.Mobility << 1);
+            val |= (uint)((uint)this.Mission << 2);
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.TrailingEffects << 7);
+            val |= (uint)((uint)this.Lights << 12);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.Antenna << 16);
+            val |= (uint)((uint)this.CamouflageType << 17);
+            val |= (uint)((uint)this.Concealed << 19);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.PowerPlantStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.Tent << 24);
+            val |= (uint)((uint)this.BlackoutLights << 26);
+            val |= (uint)((uint)this.InteriorLights << 29);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PaintScheme.GetHashCode();
+                hash = (hash * 29) + this.Mobility.GetHashCode();
+                hash = (hash * 29) + this.Mission.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
+                hash = (hash * 29) + this.Lights.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.Antenna.GetHashCode();
+                hash = (hash * 29) + this.CamouflageType.GetHashCode();
+                hash = (hash * 29) + this.Concealed.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.Tent.GetHashCode();
+                hash = (hash * 29) + this.BlackoutLights.GetHashCode();
+                hash = (hash * 29) + this.InteriorLights.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
index 1684f72..78fd4b0 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SpacePlatformAppearance.cs
@@ -1,538 +1,538 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for SpacePlatformAppearance (es.appear.platform.space, Platforms of the Space Domain, 
-    /// section 4.3.1.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct SpacePlatformAppearance
-    {
-        /// <summary>
-        /// Describes the paint scheme of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the paint scheme of an entity")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Uniform color
-            /// </summary>
-            UniformColor = 0,
-
-            /// <summary>
-            /// Camouflage
-            /// </summary>
-            Camouflage = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of mobility kills
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of mobility kills")]
-        public enum MobilityValue : uint
-        {
-            /// <summary>
-            /// No mobility kill
-            /// </summary>
-            NoMobilityKill = 0,
-
-            /// <summary>
-            /// Mobility kill
-            /// </summary>
-            MobilityKill = 1
-        }
-
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status or location of smoke emanating from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status or location of smoke emanating from an entity")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke plume rising from the entity
-            /// </summary>
-            SmokePlumeRisingFromTheEntity = 1,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 2
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from an entity")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a space platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a space platform")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the power-plant status of a space platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the power-plant status of a space platform")]
-        public enum PowerPlantStatusValue : uint
-        {
-            /// <summary>
-            /// Power plant off
-            /// </summary>
-            PowerPlantOff = 0,
-
-            /// <summary>
-            /// Power plant on
-            /// </summary>
-            PowerPlantOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a space platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a space platform")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        private SpacePlatformAppearance.PaintSchemeValue paintScheme;
-        private SpacePlatformAppearance.MobilityValue mobility;
-        private SpacePlatformAppearance.DamageValue damage;
-        private SpacePlatformAppearance.SmokeValue smoke;
-        private SpacePlatformAppearance.FlamingValue flaming;
-        private SpacePlatformAppearance.FrozenStatusValue frozenStatus;
-        private SpacePlatformAppearance.PowerPlantStatusValue powerPlantStatus;
-        private SpacePlatformAppearance.StateValue state;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SpacePlatformAppearance left, SpacePlatformAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SpacePlatformAppearance left, SpacePlatformAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(SpacePlatformAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator SpacePlatformAppearance(uint value)
-        {
-            return SpacePlatformAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static SpacePlatformAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance, represented by the uint value.</returns>
-        public static SpacePlatformAppearance FromUInt32(uint value)
-        {
-            SpacePlatformAppearance ps = new SpacePlatformAppearance();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PaintScheme = (SpacePlatformAppearance.PaintSchemeValue)newValue0;
-
-            uint mask1 = 0x0002;
-            byte shift1 = 1;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Mobility = (SpacePlatformAppearance.MobilityValue)newValue1;
-
-            uint mask3 = 0x0018;
-            byte shift3 = 3;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (SpacePlatformAppearance.DamageValue)newValue3;
-
-            uint mask4 = 0x0060;
-            byte shift4 = 5;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Smoke = (SpacePlatformAppearance.SmokeValue)newValue4;
-
-            uint mask6 = 0x8000;
-            byte shift6 = 15;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Flaming = (SpacePlatformAppearance.FlamingValue)newValue6;
-
-            uint mask8 = 0x200000;
-            byte shift8 = 21;
-            uint newValue8 = (value & mask8) >> shift8;
-            ps.FrozenStatus = (SpacePlatformAppearance.FrozenStatusValue)newValue8;
-
-            uint mask9 = 0x400000;
-            byte shift9 = 22;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.PowerPlantStatus = (SpacePlatformAppearance.PowerPlantStatusValue)newValue9;
-
-            uint mask10 = 0x800000;
-            byte shift10 = 23;
-            uint newValue10 = (value & mask10) >> shift10;
-            ps.State = (SpacePlatformAppearance.StateValue)newValue10;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the paintscheme.
-        /// </summary>
-        /// <value>The paintscheme.</value>
-        public SpacePlatformAppearance.PaintSchemeValue PaintScheme
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the mobility.
-        /// </summary>
-        /// <value>The mobility.</value>
-        public SpacePlatformAppearance.MobilityValue Mobility
-        {
-            get { return this.mobility; }
-            set { this.mobility = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public SpacePlatformAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public SpacePlatformAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public SpacePlatformAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public SpacePlatformAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerplantstatus.
-        /// </summary>
-        /// <value>The powerplantstatus.</value>
-        public SpacePlatformAppearance.PowerPlantStatusValue PowerPlantStatus
-        {
-            get { return this.powerPlantStatus; }
-            set { this.powerPlantStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public SpacePlatformAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is SpacePlatformAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((SpacePlatformAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SpacePlatformAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PaintScheme == other.PaintScheme &&
-                this.Mobility == other.Mobility &&
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.Flaming == other.Flaming &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.PowerPlantStatus == other.PowerPlantStatus &&
-                this.State == other.State;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.PaintScheme << 0);
-            val |= (uint)((uint)this.Mobility << 1);
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.PowerPlantStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PaintScheme.GetHashCode();
-                hash = (hash * 29) + this.Mobility.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for SpacePlatformAppearance (es.appear.platform.space, Platforms of the Space Domain, 
+    /// section 4.3.1.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct SpacePlatformAppearance
+    {
+        /// <summary>
+        /// Describes the paint scheme of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the paint scheme of an entity")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Uniform color
+            /// </summary>
+            UniformColor = 0,
+
+            /// <summary>
+            /// Camouflage
+            /// </summary>
+            Camouflage = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of mobility kills
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of mobility kills")]
+        public enum MobilityValue : uint
+        {
+            /// <summary>
+            /// No mobility kill
+            /// </summary>
+            NoMobilityKill = 0,
+
+            /// <summary>
+            /// Mobility kill
+            /// </summary>
+            MobilityKill = 1
+        }
+
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status or location of smoke emanating from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status or location of smoke emanating from an entity")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke plume rising from the entity
+            /// </summary>
+            SmokePlumeRisingFromTheEntity = 1,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 2
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from an entity")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a space platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a space platform")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the power-plant status of a space platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the power-plant status of a space platform")]
+        public enum PowerPlantStatusValue : uint
+        {
+            /// <summary>
+            /// Power plant off
+            /// </summary>
+            PowerPlantOff = 0,
+
+            /// <summary>
+            /// Power plant on
+            /// </summary>
+            PowerPlantOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a space platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a space platform")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        private SpacePlatformAppearance.PaintSchemeValue paintScheme;
+        private SpacePlatformAppearance.MobilityValue mobility;
+        private SpacePlatformAppearance.DamageValue damage;
+        private SpacePlatformAppearance.SmokeValue smoke;
+        private SpacePlatformAppearance.FlamingValue flaming;
+        private SpacePlatformAppearance.FrozenStatusValue frozenStatus;
+        private SpacePlatformAppearance.PowerPlantStatusValue powerPlantStatus;
+        private SpacePlatformAppearance.StateValue state;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SpacePlatformAppearance left, SpacePlatformAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SpacePlatformAppearance left, SpacePlatformAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(SpacePlatformAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator SpacePlatformAppearance(uint value)
+        {
+            return SpacePlatformAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static SpacePlatformAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance, represented by the uint value.</returns>
+        public static SpacePlatformAppearance FromUInt32(uint value)
+        {
+            SpacePlatformAppearance ps = new SpacePlatformAppearance();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PaintScheme = (SpacePlatformAppearance.PaintSchemeValue)newValue0;
+
+            uint mask1 = 0x0002;
+            byte shift1 = 1;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Mobility = (SpacePlatformAppearance.MobilityValue)newValue1;
+
+            uint mask3 = 0x0018;
+            byte shift3 = 3;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (SpacePlatformAppearance.DamageValue)newValue3;
+
+            uint mask4 = 0x0060;
+            byte shift4 = 5;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Smoke = (SpacePlatformAppearance.SmokeValue)newValue4;
+
+            uint mask6 = 0x8000;
+            byte shift6 = 15;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Flaming = (SpacePlatformAppearance.FlamingValue)newValue6;
+
+            uint mask8 = 0x200000;
+            byte shift8 = 21;
+            uint newValue8 = (value & mask8) >> shift8;
+            ps.FrozenStatus = (SpacePlatformAppearance.FrozenStatusValue)newValue8;
+
+            uint mask9 = 0x400000;
+            byte shift9 = 22;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.PowerPlantStatus = (SpacePlatformAppearance.PowerPlantStatusValue)newValue9;
+
+            uint mask10 = 0x800000;
+            byte shift10 = 23;
+            uint newValue10 = (value & mask10) >> shift10;
+            ps.State = (SpacePlatformAppearance.StateValue)newValue10;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the paintscheme.
+        /// </summary>
+        /// <value>The paintscheme.</value>
+        public SpacePlatformAppearance.PaintSchemeValue PaintScheme
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the mobility.
+        /// </summary>
+        /// <value>The mobility.</value>
+        public SpacePlatformAppearance.MobilityValue Mobility
+        {
+            get { return this.mobility; }
+            set { this.mobility = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public SpacePlatformAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public SpacePlatformAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public SpacePlatformAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public SpacePlatformAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerplantstatus.
+        /// </summary>
+        /// <value>The powerplantstatus.</value>
+        public SpacePlatformAppearance.PowerPlantStatusValue PowerPlantStatus
+        {
+            get { return this.powerPlantStatus; }
+            set { this.powerPlantStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public SpacePlatformAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is SpacePlatformAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((SpacePlatformAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SpacePlatformAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PaintScheme == other.PaintScheme &&
+                this.Mobility == other.Mobility &&
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.Flaming == other.Flaming &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.PowerPlantStatus == other.PowerPlantStatus &&
+                this.State == other.State;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SpacePlatformAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.PaintScheme << 0);
+            val |= (uint)((uint)this.Mobility << 1);
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.PowerPlantStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PaintScheme.GetHashCode();
+                hash = (hash * 29) + this.Mobility.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
index c7e76f7..1f1474a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SubsurfacePlatformAppearance.cs
@@ -1,633 +1,633 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for SubsurfacePlatformAppearance (es.appear.platform.subsurface, Platforms of the Subsurface Domain, 
-    /// section 4.3.1.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct SubsurfacePlatformAppearance
-    {
-        /// <summary>
-        /// Describes the paint scheme of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the paint scheme of an entity")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Uniform color
-            /// </summary>
-            UniformColor = 0,
-
-            /// <summary>
-            /// Camouflage
-            /// </summary>
-            Camouflage = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of mobility kills
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of mobility kills")]
-        public enum MobilityValue : uint
-        {
-            /// <summary>
-            /// No mobility kill
-            /// </summary>
-            NoMobilityKill = 0,
-
-            /// <summary>
-            /// Mobility kill
-            /// </summary>
-            MobilityKill = 1
-        }
-
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status or location of smoke emanating from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status or location of smoke emanating from an entity")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke plume rising from the entity
-            /// </summary>
-            SmokePlumeRisingFromTheEntity = 1,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 2
-        }
-
-        /// <summary>
-        /// Describes the state of the hatch
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of the hatch")]
-        public enum HatchValue : uint
-        {
-            /// <summary>
-            /// Not applicable
-            /// </summary>
-            NotApplicable = 0,
-
-            /// <summary>
-            /// Hatch is closed
-            /// </summary>
-            HatchIsClosed = 1,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 2,
-
-            /// <summary>
-            /// Hatch is open
-            /// </summary>
-            HatchIsOpen = 4,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown2 = 5
-        }
-
-        /// <summary>
-        /// Describes whether Running Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Running Lights are on or off.")]
-        public enum RunningLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from an entity")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a subsurface platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a subsurface platform")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the power-plant status of a subsurface platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the power-plant status of a subsurface platform")]
-        public enum PowerPlantStatusValue : uint
-        {
-            /// <summary>
-            /// Power plant off
-            /// </summary>
-            PowerPlantOff = 0,
-
-            /// <summary>
-            /// Power plant on
-            /// </summary>
-            PowerPlantOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a subsurface platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a subsurface platform")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        private SubsurfacePlatformAppearance.PaintSchemeValue paintScheme;
-        private SubsurfacePlatformAppearance.MobilityValue mobility;
-        private SubsurfacePlatformAppearance.DamageValue damage;
-        private SubsurfacePlatformAppearance.SmokeValue smoke;
-        private SubsurfacePlatformAppearance.HatchValue hatch;
-        private SubsurfacePlatformAppearance.RunningLightsValue runningLights;
-        private SubsurfacePlatformAppearance.FlamingValue flaming;
-        private SubsurfacePlatformAppearance.FrozenStatusValue frozenStatus;
-        private SubsurfacePlatformAppearance.PowerPlantStatusValue powerPlantStatus;
-        private SubsurfacePlatformAppearance.StateValue state;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SubsurfacePlatformAppearance left, SubsurfacePlatformAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SubsurfacePlatformAppearance left, SubsurfacePlatformAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(SubsurfacePlatformAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator SubsurfacePlatformAppearance(uint value)
-        {
-            return SubsurfacePlatformAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static SubsurfacePlatformAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance, represented by the uint value.</returns>
-        public static SubsurfacePlatformAppearance FromUInt32(uint value)
-        {
-            SubsurfacePlatformAppearance ps = new SubsurfacePlatformAppearance();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PaintScheme = (SubsurfacePlatformAppearance.PaintSchemeValue)newValue0;
-
-            uint mask1 = 0x0002;
-            byte shift1 = 1;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Mobility = (SubsurfacePlatformAppearance.MobilityValue)newValue1;
-
-            uint mask3 = 0x0018;
-            byte shift3 = 3;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (SubsurfacePlatformAppearance.DamageValue)newValue3;
-
-            uint mask4 = 0x0060;
-            byte shift4 = 5;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Smoke = (SubsurfacePlatformAppearance.SmokeValue)newValue4;
-
-            uint mask6 = 0x0e00;
-            byte shift6 = 9;
-            uint newValue6 = (value & mask6) >> shift6;
-            ps.Hatch = (SubsurfacePlatformAppearance.HatchValue)newValue6;
-
-            uint mask7 = 0x1000;
-            byte shift7 = 12;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.RunningLights = (SubsurfacePlatformAppearance.RunningLightsValue)newValue7;
-
-            uint mask9 = 0x8000;
-            byte shift9 = 15;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.Flaming = (SubsurfacePlatformAppearance.FlamingValue)newValue9;
-
-            uint mask11 = 0x200000;
-            byte shift11 = 21;
-            uint newValue11 = (value & mask11) >> shift11;
-            ps.FrozenStatus = (SubsurfacePlatformAppearance.FrozenStatusValue)newValue11;
-
-            uint mask12 = 0x400000;
-            byte shift12 = 22;
-            uint newValue12 = (value & mask12) >> shift12;
-            ps.PowerPlantStatus = (SubsurfacePlatformAppearance.PowerPlantStatusValue)newValue12;
-
-            uint mask13 = 0x800000;
-            byte shift13 = 23;
-            uint newValue13 = (value & mask13) >> shift13;
-            ps.State = (SubsurfacePlatformAppearance.StateValue)newValue13;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the paintscheme.
-        /// </summary>
-        /// <value>The paintscheme.</value>
-        public SubsurfacePlatformAppearance.PaintSchemeValue PaintScheme
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the mobility.
-        /// </summary>
-        /// <value>The mobility.</value>
-        public SubsurfacePlatformAppearance.MobilityValue Mobility
-        {
-            get { return this.mobility; }
-            set { this.mobility = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public SubsurfacePlatformAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public SubsurfacePlatformAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the hatch.
-        /// </summary>
-        /// <value>The hatch.</value>
-        public SubsurfacePlatformAppearance.HatchValue Hatch
-        {
-            get { return this.hatch; }
-            set { this.hatch = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the runninglights.
-        /// </summary>
-        /// <value>The runninglights.</value>
-        public SubsurfacePlatformAppearance.RunningLightsValue RunningLights
-        {
-            get { return this.runningLights; }
-            set { this.runningLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public SubsurfacePlatformAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public SubsurfacePlatformAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerplantstatus.
-        /// </summary>
-        /// <value>The powerplantstatus.</value>
-        public SubsurfacePlatformAppearance.PowerPlantStatusValue PowerPlantStatus
-        {
-            get { return this.powerPlantStatus; }
-            set { this.powerPlantStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public SubsurfacePlatformAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is SubsurfacePlatformAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((SubsurfacePlatformAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SubsurfacePlatformAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PaintScheme == other.PaintScheme &&
-                this.Mobility == other.Mobility &&
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.Hatch == other.Hatch &&
-                this.RunningLights == other.RunningLights &&
-                this.Flaming == other.Flaming &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.PowerPlantStatus == other.PowerPlantStatus &&
-                this.State == other.State;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.PaintScheme << 0);
-            val |= (uint)((uint)this.Mobility << 1);
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.Hatch << 9);
-            val |= (uint)((uint)this.RunningLights << 12);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.PowerPlantStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PaintScheme.GetHashCode();
-                hash = (hash * 29) + this.Mobility.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.Hatch.GetHashCode();
-                hash = (hash * 29) + this.RunningLights.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for SubsurfacePlatformAppearance (es.appear.platform.subsurface, Platforms of the Subsurface Domain, 
+    /// section 4.3.1.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct SubsurfacePlatformAppearance
+    {
+        /// <summary>
+        /// Describes the paint scheme of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the paint scheme of an entity")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Uniform color
+            /// </summary>
+            UniformColor = 0,
+
+            /// <summary>
+            /// Camouflage
+            /// </summary>
+            Camouflage = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of mobility kills
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of mobility kills")]
+        public enum MobilityValue : uint
+        {
+            /// <summary>
+            /// No mobility kill
+            /// </summary>
+            NoMobilityKill = 0,
+
+            /// <summary>
+            /// Mobility kill
+            /// </summary>
+            MobilityKill = 1
+        }
+
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status or location of smoke emanating from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status or location of smoke emanating from an entity")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke plume rising from the entity
+            /// </summary>
+            SmokePlumeRisingFromTheEntity = 1,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 2
+        }
+
+        /// <summary>
+        /// Describes the state of the hatch
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of the hatch")]
+        public enum HatchValue : uint
+        {
+            /// <summary>
+            /// Not applicable
+            /// </summary>
+            NotApplicable = 0,
+
+            /// <summary>
+            /// Hatch is closed
+            /// </summary>
+            HatchIsClosed = 1,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 2,
+
+            /// <summary>
+            /// Hatch is open
+            /// </summary>
+            HatchIsOpen = 4,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown2 = 5
+        }
+
+        /// <summary>
+        /// Describes whether Running Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Running Lights are on or off.")]
+        public enum RunningLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from an entity")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a subsurface platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a subsurface platform")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the power-plant status of a subsurface platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the power-plant status of a subsurface platform")]
+        public enum PowerPlantStatusValue : uint
+        {
+            /// <summary>
+            /// Power plant off
+            /// </summary>
+            PowerPlantOff = 0,
+
+            /// <summary>
+            /// Power plant on
+            /// </summary>
+            PowerPlantOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a subsurface platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a subsurface platform")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        private SubsurfacePlatformAppearance.PaintSchemeValue paintScheme;
+        private SubsurfacePlatformAppearance.MobilityValue mobility;
+        private SubsurfacePlatformAppearance.DamageValue damage;
+        private SubsurfacePlatformAppearance.SmokeValue smoke;
+        private SubsurfacePlatformAppearance.HatchValue hatch;
+        private SubsurfacePlatformAppearance.RunningLightsValue runningLights;
+        private SubsurfacePlatformAppearance.FlamingValue flaming;
+        private SubsurfacePlatformAppearance.FrozenStatusValue frozenStatus;
+        private SubsurfacePlatformAppearance.PowerPlantStatusValue powerPlantStatus;
+        private SubsurfacePlatformAppearance.StateValue state;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SubsurfacePlatformAppearance left, SubsurfacePlatformAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SubsurfacePlatformAppearance left, SubsurfacePlatformAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(SubsurfacePlatformAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator SubsurfacePlatformAppearance(uint value)
+        {
+            return SubsurfacePlatformAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static SubsurfacePlatformAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance, represented by the uint value.</returns>
+        public static SubsurfacePlatformAppearance FromUInt32(uint value)
+        {
+            SubsurfacePlatformAppearance ps = new SubsurfacePlatformAppearance();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PaintScheme = (SubsurfacePlatformAppearance.PaintSchemeValue)newValue0;
+
+            uint mask1 = 0x0002;
+            byte shift1 = 1;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Mobility = (SubsurfacePlatformAppearance.MobilityValue)newValue1;
+
+            uint mask3 = 0x0018;
+            byte shift3 = 3;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (SubsurfacePlatformAppearance.DamageValue)newValue3;
+
+            uint mask4 = 0x0060;
+            byte shift4 = 5;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Smoke = (SubsurfacePlatformAppearance.SmokeValue)newValue4;
+
+            uint mask6 = 0x0e00;
+            byte shift6 = 9;
+            uint newValue6 = (value & mask6) >> shift6;
+            ps.Hatch = (SubsurfacePlatformAppearance.HatchValue)newValue6;
+
+            uint mask7 = 0x1000;
+            byte shift7 = 12;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.RunningLights = (SubsurfacePlatformAppearance.RunningLightsValue)newValue7;
+
+            uint mask9 = 0x8000;
+            byte shift9 = 15;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.Flaming = (SubsurfacePlatformAppearance.FlamingValue)newValue9;
+
+            uint mask11 = 0x200000;
+            byte shift11 = 21;
+            uint newValue11 = (value & mask11) >> shift11;
+            ps.FrozenStatus = (SubsurfacePlatformAppearance.FrozenStatusValue)newValue11;
+
+            uint mask12 = 0x400000;
+            byte shift12 = 22;
+            uint newValue12 = (value & mask12) >> shift12;
+            ps.PowerPlantStatus = (SubsurfacePlatformAppearance.PowerPlantStatusValue)newValue12;
+
+            uint mask13 = 0x800000;
+            byte shift13 = 23;
+            uint newValue13 = (value & mask13) >> shift13;
+            ps.State = (SubsurfacePlatformAppearance.StateValue)newValue13;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the paintscheme.
+        /// </summary>
+        /// <value>The paintscheme.</value>
+        public SubsurfacePlatformAppearance.PaintSchemeValue PaintScheme
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the mobility.
+        /// </summary>
+        /// <value>The mobility.</value>
+        public SubsurfacePlatformAppearance.MobilityValue Mobility
+        {
+            get { return this.mobility; }
+            set { this.mobility = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public SubsurfacePlatformAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public SubsurfacePlatformAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the hatch.
+        /// </summary>
+        /// <value>The hatch.</value>
+        public SubsurfacePlatformAppearance.HatchValue Hatch
+        {
+            get { return this.hatch; }
+            set { this.hatch = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the runninglights.
+        /// </summary>
+        /// <value>The runninglights.</value>
+        public SubsurfacePlatformAppearance.RunningLightsValue RunningLights
+        {
+            get { return this.runningLights; }
+            set { this.runningLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public SubsurfacePlatformAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public SubsurfacePlatformAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerplantstatus.
+        /// </summary>
+        /// <value>The powerplantstatus.</value>
+        public SubsurfacePlatformAppearance.PowerPlantStatusValue PowerPlantStatus
+        {
+            get { return this.powerPlantStatus; }
+            set { this.powerPlantStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public SubsurfacePlatformAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is SubsurfacePlatformAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((SubsurfacePlatformAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SubsurfacePlatformAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PaintScheme == other.PaintScheme &&
+                this.Mobility == other.Mobility &&
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.Hatch == other.Hatch &&
+                this.RunningLights == other.RunningLights &&
+                this.Flaming == other.Flaming &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.PowerPlantStatus == other.PowerPlantStatus &&
+                this.State == other.State;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SubsurfacePlatformAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.PaintScheme << 0);
+            val |= (uint)((uint)this.Mobility << 1);
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.Hatch << 9);
+            val |= (uint)((uint)this.RunningLights << 12);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.PowerPlantStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PaintScheme.GetHashCode();
+                hash = (hash * 29) + this.Mobility.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.Hatch.GetHashCode();
+                hash = (hash * 29) + this.RunningLights.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
index 7895988..64561d1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Appearance/SurfacePlatformAppearance.cs
@@ -1,713 +1,713 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Appearance
-{
-    /// <summary>
-    /// Enumeration values for SurfacePlatformAppearance (es.appear.platform.surface, Platforms of the Surface Domain, 
-    /// section 4.3.1.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct SurfacePlatformAppearance
-    {
-        /// <summary>
-        /// Describes the paint scheme of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the paint scheme of an entity")]
-        public enum PaintSchemeValue : uint
-        {
-            /// <summary>
-            /// Uniform color
-            /// </summary>
-            UniformColor = 0,
-
-            /// <summary>
-            /// Camouflage
-            /// </summary>
-            Camouflage = 1
-        }
-
-        /// <summary>
-        /// Describes characteristics of mobility kills
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes characteristics of mobility kills")]
-        public enum MobilityValue : uint
-        {
-            /// <summary>
-            /// No mobility kill
-            /// </summary>
-            NoMobilityKill = 0,
-
-            /// <summary>
-            /// Mobility kill
-            /// </summary>
-            MobilityKill = 1
-        }
-
-        /// <summary>
-        /// Describes the damaged appearance of an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of an entity")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Slight damage
-            /// </summary>
-            SlightDamage = 1,
-
-            /// <summary>
-            /// Moderate damage
-            /// </summary>
-            ModerateDamage = 2,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 3
-        }
-
-        /// <summary>
-        /// Describes status or location of smoke emanating from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes status or location of smoke emanating from an entity")]
-        public enum SmokeValue : uint
-        {
-            /// <summary>
-            /// Not smoking
-            /// </summary>
-            NotSmoking = 0,
-
-            /// <summary>
-            /// Smoke plume rising from the entity
-            /// </summary>
-            SmokePlumeRisingFromTheEntity = 1,
-
-            /// <summary>
-            /// Entity is emitting engine smoke
-            /// </summary>
-            EntityIsEmittingEngineSmoke = 2,
-
-            /// <summary>
-            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
-            /// </summary>
-            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
-        }
-
-        /// <summary>
-        /// Describes the size of the wake trailing effect for the entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the size of the wake trailing effect for the entity.")]
-        public enum TrailingEffectsValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Small
-            /// </summary>
-            Small = 1,
-
-            /// <summary>
-            /// Medium
-            /// </summary>
-            Medium = 2,
-
-            /// <summary>
-            /// Large
-            /// </summary>
-            Large = 3
-        }
-
-        /// <summary>
-        /// Describes whether Running Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Running Lights are on or off.")]
-        public enum RunningLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from an entity
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from an entity")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        /// <summary>
-        /// Describes the frozen status of a Surface platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the frozen status of a Surface platform")]
-        public enum FrozenStatusValue : uint
-        {
-            /// <summary>
-            /// Not frozen
-            /// </summary>
-            NotFrozen = 0,
-
-            /// <summary>
-            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
-            /// </summary>
-            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
-        }
-
-        /// <summary>
-        /// Describes the power-plant status of platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the power-plant status of platform")]
-        public enum PowerPlantStatusValue : uint
-        {
-            /// <summary>
-            /// Power plant off
-            /// </summary>
-            PowerPlantOff = 0,
-
-            /// <summary>
-            /// Power plant on
-            /// </summary>
-            PowerPlantOn = 1
-        }
-
-        /// <summary>
-        /// Describes the state of a Surface platform
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of a Surface platform")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes whether Spot Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Spot Lights are on or off.")]
-        public enum SpotLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        /// <summary>
-        /// Describes whether Interior Lights are on or off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether Interior Lights are on or off.")]
-        public enum InteriorLightsValue : uint
-        {
-            /// <summary>
-            /// Off
-            /// </summary>
-            Off = 0,
-
-            /// <summary>
-            /// On
-            /// </summary>
-            On = 1
-        }
-
-        private SurfacePlatformAppearance.PaintSchemeValue paintScheme;
-        private SurfacePlatformAppearance.MobilityValue mobility;
-        private SurfacePlatformAppearance.DamageValue damage;
-        private SurfacePlatformAppearance.SmokeValue smoke;
-        private SurfacePlatformAppearance.TrailingEffectsValue trailingEffects;
-        private SurfacePlatformAppearance.RunningLightsValue runningLights;
-        private SurfacePlatformAppearance.FlamingValue flaming;
-        private SurfacePlatformAppearance.FrozenStatusValue frozenStatus;
-        private SurfacePlatformAppearance.PowerPlantStatusValue powerPlantStatus;
-        private SurfacePlatformAppearance.StateValue state;
-        private SurfacePlatformAppearance.SpotLightsValue spotLights;
-        private SurfacePlatformAppearance.InteriorLightsValue interiorLights;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(SurfacePlatformAppearance left, SurfacePlatformAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(SurfacePlatformAppearance left, SurfacePlatformAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(SurfacePlatformAppearance obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator SurfacePlatformAppearance(uint value)
-        {
-            return SurfacePlatformAppearance.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static SurfacePlatformAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance, represented by the uint value.</returns>
-        public static SurfacePlatformAppearance FromUInt32(uint value)
-        {
-            SurfacePlatformAppearance ps = new SurfacePlatformAppearance();
-
-            uint mask0 = 0x0001;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PaintScheme = (SurfacePlatformAppearance.PaintSchemeValue)newValue0;
-
-            uint mask1 = 0x0002;
-            byte shift1 = 1;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Mobility = (SurfacePlatformAppearance.MobilityValue)newValue1;
-
-            uint mask3 = 0x0018;
-            byte shift3 = 3;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.Damage = (SurfacePlatformAppearance.DamageValue)newValue3;
-
-            uint mask4 = 0x0060;
-            byte shift4 = 5;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Smoke = (SurfacePlatformAppearance.SmokeValue)newValue4;
-
-            uint mask5 = 0x0180;
-            byte shift5 = 7;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.TrailingEffects = (SurfacePlatformAppearance.TrailingEffectsValue)newValue5;
-
-            uint mask7 = 0x1000;
-            byte shift7 = 12;
-            uint newValue7 = (value & mask7) >> shift7;
-            ps.RunningLights = (SurfacePlatformAppearance.RunningLightsValue)newValue7;
-
-            uint mask9 = 0x8000;
-            byte shift9 = 15;
-            uint newValue9 = (value & mask9) >> shift9;
-            ps.Flaming = (SurfacePlatformAppearance.FlamingValue)newValue9;
-
-            uint mask11 = 0x200000;
-            byte shift11 = 21;
-            uint newValue11 = (value & mask11) >> shift11;
-            ps.FrozenStatus = (SurfacePlatformAppearance.FrozenStatusValue)newValue11;
-
-            uint mask12 = 0x400000;
-            byte shift12 = 22;
-            uint newValue12 = (value & mask12) >> shift12;
-            ps.PowerPlantStatus = (SurfacePlatformAppearance.PowerPlantStatusValue)newValue12;
-
-            uint mask13 = 0x800000;
-            byte shift13 = 23;
-            uint newValue13 = (value & mask13) >> shift13;
-            ps.State = (SurfacePlatformAppearance.StateValue)newValue13;
-
-            uint mask15 = 0x10000000;
-            byte shift15 = 28;
-            uint newValue15 = (value & mask15) >> shift15;
-            ps.SpotLights = (SurfacePlatformAppearance.SpotLightsValue)newValue15;
-
-            uint mask16 = 0x20000000;
-            byte shift16 = 29;
-            uint newValue16 = (value & mask16) >> shift16;
-            ps.InteriorLights = (SurfacePlatformAppearance.InteriorLightsValue)newValue16;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the paintscheme.
-        /// </summary>
-        /// <value>The paintscheme.</value>
-        public SurfacePlatformAppearance.PaintSchemeValue PaintScheme
-        {
-            get { return this.paintScheme; }
-            set { this.paintScheme = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the mobility.
-        /// </summary>
-        /// <value>The mobility.</value>
-        public SurfacePlatformAppearance.MobilityValue Mobility
-        {
-            get { return this.mobility; }
-            set { this.mobility = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public SurfacePlatformAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoke.
-        /// </summary>
-        /// <value>The smoke.</value>
-        public SurfacePlatformAppearance.SmokeValue Smoke
-        {
-            get { return this.smoke; }
-            set { this.smoke = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the trailingeffects.
-        /// </summary>
-        /// <value>The trailingeffects.</value>
-        public SurfacePlatformAppearance.TrailingEffectsValue TrailingEffects
-        {
-            get { return this.trailingEffects; }
-            set { this.trailingEffects = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the runninglights.
-        /// </summary>
-        /// <value>The runninglights.</value>
-        public SurfacePlatformAppearance.RunningLightsValue RunningLights
-        {
-            get { return this.runningLights; }
-            set { this.runningLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public SurfacePlatformAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the frozenstatus.
-        /// </summary>
-        /// <value>The frozenstatus.</value>
-        public SurfacePlatformAppearance.FrozenStatusValue FrozenStatus
-        {
-            get { return this.frozenStatus; }
-            set { this.frozenStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the powerplantstatus.
-        /// </summary>
-        /// <value>The powerplantstatus.</value>
-        public SurfacePlatformAppearance.PowerPlantStatusValue PowerPlantStatus
-        {
-            get { return this.powerPlantStatus; }
-            set { this.powerPlantStatus = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public SurfacePlatformAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the spotlights.
-        /// </summary>
-        /// <value>The spotlights.</value>
-        public SurfacePlatformAppearance.SpotLightsValue SpotLights
-        {
-            get { return this.spotLights; }
-            set { this.spotLights = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the interiorlights.
-        /// </summary>
-        /// <value>The interiorlights.</value>
-        public SurfacePlatformAppearance.InteriorLightsValue InteriorLights
-        {
-            get { return this.interiorLights; }
-            set { this.interiorLights = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is SurfacePlatformAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((SurfacePlatformAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(SurfacePlatformAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PaintScheme == other.PaintScheme &&
-                this.Mobility == other.Mobility &&
-                this.Damage == other.Damage &&
-                this.Smoke == other.Smoke &&
-                this.TrailingEffects == other.TrailingEffects &&
-                this.RunningLights == other.RunningLights &&
-                this.Flaming == other.Flaming &&
-                this.FrozenStatus == other.FrozenStatus &&
-                this.PowerPlantStatus == other.PowerPlantStatus &&
-                this.State == other.State &&
-                this.SpotLights == other.SpotLights &&
-                this.InteriorLights == other.InteriorLights;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.PaintScheme << 0);
-            val |= (uint)((uint)this.Mobility << 1);
-            val |= (uint)((uint)this.Damage << 3);
-            val |= (uint)((uint)this.Smoke << 5);
-            val |= (uint)((uint)this.TrailingEffects << 7);
-            val |= (uint)((uint)this.RunningLights << 12);
-            val |= (uint)((uint)this.Flaming << 15);
-            val |= (uint)((uint)this.FrozenStatus << 21);
-            val |= (uint)((uint)this.PowerPlantStatus << 22);
-            val |= (uint)((uint)this.State << 23);
-            val |= (uint)((uint)this.SpotLights << 28);
-            val |= (uint)((uint)this.InteriorLights << 29);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PaintScheme.GetHashCode();
-                hash = (hash * 29) + this.Mobility.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Smoke.GetHashCode();
-                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
-                hash = (hash * 29) + this.RunningLights.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
-                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.SpotLights.GetHashCode();
-                hash = (hash * 29) + this.InteriorLights.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Appearance
+{
+    /// <summary>
+    /// Enumeration values for SurfacePlatformAppearance (es.appear.platform.surface, Platforms of the Surface Domain, 
+    /// section 4.3.1.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct SurfacePlatformAppearance
+    {
+        /// <summary>
+        /// Describes the paint scheme of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the paint scheme of an entity")]
+        public enum PaintSchemeValue : uint
+        {
+            /// <summary>
+            /// Uniform color
+            /// </summary>
+            UniformColor = 0,
+
+            /// <summary>
+            /// Camouflage
+            /// </summary>
+            Camouflage = 1
+        }
+
+        /// <summary>
+        /// Describes characteristics of mobility kills
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes characteristics of mobility kills")]
+        public enum MobilityValue : uint
+        {
+            /// <summary>
+            /// No mobility kill
+            /// </summary>
+            NoMobilityKill = 0,
+
+            /// <summary>
+            /// Mobility kill
+            /// </summary>
+            MobilityKill = 1
+        }
+
+        /// <summary>
+        /// Describes the damaged appearance of an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of an entity")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Slight damage
+            /// </summary>
+            SlightDamage = 1,
+
+            /// <summary>
+            /// Moderate damage
+            /// </summary>
+            ModerateDamage = 2,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 3
+        }
+
+        /// <summary>
+        /// Describes status or location of smoke emanating from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes status or location of smoke emanating from an entity")]
+        public enum SmokeValue : uint
+        {
+            /// <summary>
+            /// Not smoking
+            /// </summary>
+            NotSmoking = 0,
+
+            /// <summary>
+            /// Smoke plume rising from the entity
+            /// </summary>
+            SmokePlumeRisingFromTheEntity = 1,
+
+            /// <summary>
+            /// Entity is emitting engine smoke
+            /// </summary>
+            EntityIsEmittingEngineSmoke = 2,
+
+            /// <summary>
+            /// Entity is emitting engine smoke, and smoke plume is rising from the entity
+            /// </summary>
+            EntityIsEmittingEngineSmokeAndSmokePlumeIsRisingFromTheEntity = 3
+        }
+
+        /// <summary>
+        /// Describes the size of the wake trailing effect for the entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the size of the wake trailing effect for the entity.")]
+        public enum TrailingEffectsValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Small
+            /// </summary>
+            Small = 1,
+
+            /// <summary>
+            /// Medium
+            /// </summary>
+            Medium = 2,
+
+            /// <summary>
+            /// Large
+            /// </summary>
+            Large = 3
+        }
+
+        /// <summary>
+        /// Describes whether Running Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Running Lights are on or off.")]
+        public enum RunningLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from an entity
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from an entity")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        /// <summary>
+        /// Describes the frozen status of a Surface platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the frozen status of a Surface platform")]
+        public enum FrozenStatusValue : uint
+        {
+            /// <summary>
+            /// Not frozen
+            /// </summary>
+            NotFrozen = 0,
+
+            /// <summary>
+            /// Frozen (Frozen entities should not be dead-reckoned, i.e. they should be displayed as fixed at the current location even if nonzero velocity, acceleration or rotation data is received from the frozen entity)
+            /// </summary>
+            FrozenFrozenEntitiesShouldNotBeDeadReckonedIETheyShouldBeDisplayedAsFixedAtTheCurrentLocationEvenIfNonzeroVelocityAccelerationOrRotationDataIsReceivedFromTheFrozenEntity = 1
+        }
+
+        /// <summary>
+        /// Describes the power-plant status of platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the power-plant status of platform")]
+        public enum PowerPlantStatusValue : uint
+        {
+            /// <summary>
+            /// Power plant off
+            /// </summary>
+            PowerPlantOff = 0,
+
+            /// <summary>
+            /// Power plant on
+            /// </summary>
+            PowerPlantOn = 1
+        }
+
+        /// <summary>
+        /// Describes the state of a Surface platform
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of a Surface platform")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes whether Spot Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Spot Lights are on or off.")]
+        public enum SpotLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        /// <summary>
+        /// Describes whether Interior Lights are on or off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether Interior Lights are on or off.")]
+        public enum InteriorLightsValue : uint
+        {
+            /// <summary>
+            /// Off
+            /// </summary>
+            Off = 0,
+
+            /// <summary>
+            /// On
+            /// </summary>
+            On = 1
+        }
+
+        private SurfacePlatformAppearance.PaintSchemeValue paintScheme;
+        private SurfacePlatformAppearance.MobilityValue mobility;
+        private SurfacePlatformAppearance.DamageValue damage;
+        private SurfacePlatformAppearance.SmokeValue smoke;
+        private SurfacePlatformAppearance.TrailingEffectsValue trailingEffects;
+        private SurfacePlatformAppearance.RunningLightsValue runningLights;
+        private SurfacePlatformAppearance.FlamingValue flaming;
+        private SurfacePlatformAppearance.FrozenStatusValue frozenStatus;
+        private SurfacePlatformAppearance.PowerPlantStatusValue powerPlantStatus;
+        private SurfacePlatformAppearance.StateValue state;
+        private SurfacePlatformAppearance.SpotLightsValue spotLights;
+        private SurfacePlatformAppearance.InteriorLightsValue interiorLights;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SurfacePlatformAppearance left, SurfacePlatformAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SurfacePlatformAppearance left, SurfacePlatformAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(SurfacePlatformAppearance obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator SurfacePlatformAppearance(uint value)
+        {
+            return SurfacePlatformAppearance.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static SurfacePlatformAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance, represented by the uint value.</returns>
+        public static SurfacePlatformAppearance FromUInt32(uint value)
+        {
+            SurfacePlatformAppearance ps = new SurfacePlatformAppearance();
+
+            uint mask0 = 0x0001;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PaintScheme = (SurfacePlatformAppearance.PaintSchemeValue)newValue0;
+
+            uint mask1 = 0x0002;
+            byte shift1 = 1;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Mobility = (SurfacePlatformAppearance.MobilityValue)newValue1;
+
+            uint mask3 = 0x0018;
+            byte shift3 = 3;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.Damage = (SurfacePlatformAppearance.DamageValue)newValue3;
+
+            uint mask4 = 0x0060;
+            byte shift4 = 5;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Smoke = (SurfacePlatformAppearance.SmokeValue)newValue4;
+
+            uint mask5 = 0x0180;
+            byte shift5 = 7;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.TrailingEffects = (SurfacePlatformAppearance.TrailingEffectsValue)newValue5;
+
+            uint mask7 = 0x1000;
+            byte shift7 = 12;
+            uint newValue7 = (value & mask7) >> shift7;
+            ps.RunningLights = (SurfacePlatformAppearance.RunningLightsValue)newValue7;
+
+            uint mask9 = 0x8000;
+            byte shift9 = 15;
+            uint newValue9 = (value & mask9) >> shift9;
+            ps.Flaming = (SurfacePlatformAppearance.FlamingValue)newValue9;
+
+            uint mask11 = 0x200000;
+            byte shift11 = 21;
+            uint newValue11 = (value & mask11) >> shift11;
+            ps.FrozenStatus = (SurfacePlatformAppearance.FrozenStatusValue)newValue11;
+
+            uint mask12 = 0x400000;
+            byte shift12 = 22;
+            uint newValue12 = (value & mask12) >> shift12;
+            ps.PowerPlantStatus = (SurfacePlatformAppearance.PowerPlantStatusValue)newValue12;
+
+            uint mask13 = 0x800000;
+            byte shift13 = 23;
+            uint newValue13 = (value & mask13) >> shift13;
+            ps.State = (SurfacePlatformAppearance.StateValue)newValue13;
+
+            uint mask15 = 0x10000000;
+            byte shift15 = 28;
+            uint newValue15 = (value & mask15) >> shift15;
+            ps.SpotLights = (SurfacePlatformAppearance.SpotLightsValue)newValue15;
+
+            uint mask16 = 0x20000000;
+            byte shift16 = 29;
+            uint newValue16 = (value & mask16) >> shift16;
+            ps.InteriorLights = (SurfacePlatformAppearance.InteriorLightsValue)newValue16;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the paintscheme.
+        /// </summary>
+        /// <value>The paintscheme.</value>
+        public SurfacePlatformAppearance.PaintSchemeValue PaintScheme
+        {
+            get { return this.paintScheme; }
+            set { this.paintScheme = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the mobility.
+        /// </summary>
+        /// <value>The mobility.</value>
+        public SurfacePlatformAppearance.MobilityValue Mobility
+        {
+            get { return this.mobility; }
+            set { this.mobility = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public SurfacePlatformAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoke.
+        /// </summary>
+        /// <value>The smoke.</value>
+        public SurfacePlatformAppearance.SmokeValue Smoke
+        {
+            get { return this.smoke; }
+            set { this.smoke = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the trailingeffects.
+        /// </summary>
+        /// <value>The trailingeffects.</value>
+        public SurfacePlatformAppearance.TrailingEffectsValue TrailingEffects
+        {
+            get { return this.trailingEffects; }
+            set { this.trailingEffects = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the runninglights.
+        /// </summary>
+        /// <value>The runninglights.</value>
+        public SurfacePlatformAppearance.RunningLightsValue RunningLights
+        {
+            get { return this.runningLights; }
+            set { this.runningLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public SurfacePlatformAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the frozenstatus.
+        /// </summary>
+        /// <value>The frozenstatus.</value>
+        public SurfacePlatformAppearance.FrozenStatusValue FrozenStatus
+        {
+            get { return this.frozenStatus; }
+            set { this.frozenStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the powerplantstatus.
+        /// </summary>
+        /// <value>The powerplantstatus.</value>
+        public SurfacePlatformAppearance.PowerPlantStatusValue PowerPlantStatus
+        {
+            get { return this.powerPlantStatus; }
+            set { this.powerPlantStatus = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public SurfacePlatformAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the spotlights.
+        /// </summary>
+        /// <value>The spotlights.</value>
+        public SurfacePlatformAppearance.SpotLightsValue SpotLights
+        {
+            get { return this.spotLights; }
+            set { this.spotLights = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the interiorlights.
+        /// </summary>
+        /// <value>The interiorlights.</value>
+        public SurfacePlatformAppearance.InteriorLightsValue InteriorLights
+        {
+            get { return this.interiorLights; }
+            set { this.interiorLights = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is SurfacePlatformAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((SurfacePlatformAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SurfacePlatformAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PaintScheme == other.PaintScheme &&
+                this.Mobility == other.Mobility &&
+                this.Damage == other.Damage &&
+                this.Smoke == other.Smoke &&
+                this.TrailingEffects == other.TrailingEffects &&
+                this.RunningLights == other.RunningLights &&
+                this.Flaming == other.Flaming &&
+                this.FrozenStatus == other.FrozenStatus &&
+                this.PowerPlantStatus == other.PowerPlantStatus &&
+                this.State == other.State &&
+                this.SpotLights == other.SpotLights &&
+                this.InteriorLights == other.InteriorLights;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.EntityState.Appearance.SurfacePlatformAppearance"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.PaintScheme << 0);
+            val |= (uint)((uint)this.Mobility << 1);
+            val |= (uint)((uint)this.Damage << 3);
+            val |= (uint)((uint)this.Smoke << 5);
+            val |= (uint)((uint)this.TrailingEffects << 7);
+            val |= (uint)((uint)this.RunningLights << 12);
+            val |= (uint)((uint)this.Flaming << 15);
+            val |= (uint)((uint)this.FrozenStatus << 21);
+            val |= (uint)((uint)this.PowerPlantStatus << 22);
+            val |= (uint)((uint)this.State << 23);
+            val |= (uint)((uint)this.SpotLights << 28);
+            val |= (uint)((uint)this.InteriorLights << 29);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PaintScheme.GetHashCode();
+                hash = (hash * 29) + this.Mobility.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Smoke.GetHashCode();
+                hash = (hash * 29) + this.TrailingEffects.GetHashCode();
+                hash = (hash * 29) + this.RunningLights.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+                hash = (hash * 29) + this.FrozenStatus.GetHashCode();
+                hash = (hash * 29) + this.PowerPlantStatus.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.SpotLights.GetHashCode();
+                hash = (hash * 29) + this.InteriorLights.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
index c3d21a5..46b6059 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingCompany.cs
@@ -1,199 +1,199 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingCompany (es.markingtext.cctt.company, Byte 4 - Company, Battery, Troop, 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingCompany : byte
-    {
-        /// <summary>
-        /// Value A
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value A")]
-        A = 66,
-
-        /// <summary>
-        /// Value B
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value B")]
-        B = 67,
-
-        /// <summary>
-        /// Value C
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value C")]
-        C = 68,
-
-        /// <summary>
-        /// Value D
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value D")]
-        D = 69,
-
-        /// <summary>
-        /// Value E
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value E")]
-        E = 70,
-
-        /// <summary>
-        /// Value F
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value F")]
-        F = 71,
-
-        /// <summary>
-        /// Value G
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value G")]
-        G = 72,
-
-        /// <summary>
-        /// Value H
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value H")]
-        H = 73,
-
-        /// <summary>
-        /// Value I
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value I")]
-        I = 74,
-
-        /// <summary>
-        /// Value J
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value J")]
-        J = 75,
-
-        /// <summary>
-        /// Value K
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value K")]
-        K = 76,
-
-        /// <summary>
-        /// Value L
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value L")]
-        L = 77,
-
-        /// <summary>
-        /// HQ.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HQ.")]
-        HQ = 113,
-
-        /// <summary>
-        /// HHB.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHB.")]
-        HHB = 98,
-
-        /// <summary>
-        /// HHC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC.")]
-        HHC = 99,
-
-        /// <summary>
-        /// HHD.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHD.")]
-        HHD = 100,
-
-        /// <summary>
-        /// HHT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHT.")]
-        HHT = 116
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingCompany (es.markingtext.cctt.company, Byte 4 - Company, Battery, Troop, 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingCompany : byte
+    {
+        /// <summary>
+        /// Value A
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value A")]
+        A = 66,
+
+        /// <summary>
+        /// Value B
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value B")]
+        B = 67,
+
+        /// <summary>
+        /// Value C
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value C")]
+        C = 68,
+
+        /// <summary>
+        /// Value D
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value D")]
+        D = 69,
+
+        /// <summary>
+        /// Value E
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value E")]
+        E = 70,
+
+        /// <summary>
+        /// Value F
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value F")]
+        F = 71,
+
+        /// <summary>
+        /// Value G
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value G")]
+        G = 72,
+
+        /// <summary>
+        /// Value H
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value H")]
+        H = 73,
+
+        /// <summary>
+        /// Value I
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value I")]
+        I = 74,
+
+        /// <summary>
+        /// Value J
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value J")]
+        J = 75,
+
+        /// <summary>
+        /// Value K
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value K")]
+        K = 76,
+
+        /// <summary>
+        /// Value L
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value L")]
+        L = 77,
+
+        /// <summary>
+        /// HQ.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HQ.")]
+        HQ = 113,
+
+        /// <summary>
+        /// HHB.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHB.")]
+        HHB = 98,
+
+        /// <summary>
+        /// HHC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC.")]
+        HHC = 99,
+
+        /// <summary>
+        /// HHD.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHD.")]
+        HHD = 100,
+
+        /// <summary>
+        /// HHT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHT.")]
+        HHT = 116
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
index 003faf8..95cc3f0 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingDivisionCorpsDesignation.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingDivisionCorpsDesignation (es.markingtext.cctt.div, Byte 2 - Division /Corps designation, 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingDivisionCorpsDesignation : byte
-    {
-        /// <summary>
-        /// NA case.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NA case.")]
-        NACase = 0,
-
-        /// <summary>
-        /// 1st Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1st Cavalry.")]
-        _1stCavalry = 1,
-
-        /// <summary>
-        /// 1st Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1st Infantry.")]
-        _1stInfantry = 2,
-
-        /// <summary>
-        /// Corps Assets.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Corps Assets.")]
-        CorpsAssets = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingDivisionCorpsDesignation (es.markingtext.cctt.div, Byte 2 - Division /Corps designation, 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingDivisionCorpsDesignation : byte
+    {
+        /// <summary>
+        /// NA case.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NA case.")]
+        NACase = 0,
+
+        /// <summary>
+        /// 1st Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1st Cavalry.")]
+        _1stCavalry = 1,
+
+        /// <summary>
+        /// 1st Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1st Infantry.")]
+        _1stInfantry = 2,
+
+        /// <summary>
+        /// Corps Assets.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Corps Assets.")]
+        CorpsAssets = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
index 719db5c..f3f8952 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stCavalry.cs
@@ -1,419 +1,419 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingHighLevelUnitFor1stCavalry (es.markingtext.cctt.1cavunit, Byte 3 - High Level Unit (Byte 2 = 1 - 1st Cavalry), 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingHighLevelUnitFor1stCavalry : byte
-    {
-        /// <summary>
-        /// 1-7CAV.  unit: 1-7 Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-7CAV.  unit: 1-7 Cavalry.")]
-        _17CAVUnit17Cavalry = 1,
-
-        /// <summary>
-        /// 2-5CAV.  unit: 2-5 Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("2-5CAV.  unit: 2-5 Cavalry.")]
-        _25CAVUnit25Cavalry = 2,
-
-        /// <summary>
-        /// 2-8CAV.  unit: 2-8 Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("2-8CAV.  unit: 2-8 Cavalry.")]
-        _28CAVUnit28Cavalry = 3,
-
-        /// <summary>
-        /// 3-32AR.  unit: 3-32 Armor Reg.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("3-32AR.  unit: 3-32 Armor Reg.")]
-        _332ARUnit332ArmorReg = 4,
-
-        /// <summary>
-        /// 1-5CAV.  unit: 1-5 Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-5CAV.  unit: 1-5 Cavalry.")]
-        _15CAVUnit15Cavalry = 5,
-
-        /// <summary>
-        /// 1-8CAV.  unit: 1-8 Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-8CAV.  unit: 1-8 Cavalry.")]
-        _18CAVUnit18Cavalry = 6,
-
-        /// <summary>
-        /// 1-32AR.  unit: 1-32 Armor Reg.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-32AR.  unit: 1-32 Armor Reg.")]
-        _132ARUnit132ArmorReg = 7,
-
-        /// <summary>
-        /// 1-67AR.  unit: 1-67 Armor Reg.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-67AR.  unit: 1-67 Armor Reg.")]
-        _167ARUnit167ArmorReg = 8,
-
-        /// <summary>
-        /// 3-67AR.  unit: 3-67 Armor Reg.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("3-67AR.  unit: 3-67 Armor Reg.")]
-        _367ARUnit367ArmorReg = 9,
-
-        /// <summary>
-        /// 3-41INF.  unit: 3-41 Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("3-41INF.  unit: 3-41 Infantry.")]
-        _341INFUnit341Infantry = 10,
-
-        /// <summary>
-        /// 1-82F.  unit: 1-82 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-82F.  unit: 1-82 Field Art.")]
-        _182FUnit182FieldArt = 20,
-
-        /// <summary>
-        /// 3-82F.  unit: 3-82 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("3-82F.  unit: 3-82 Field Art.")]
-        _382FUnit382FieldArt = 21,
-
-        /// <summary>
-        /// 1-3F.  unit: 1-3 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-3F.  unit: 1-3 Field Art.")]
-        _13FUnit13FieldArt = 22,
-
-        /// <summary>
-        /// 21F.  unit: 21 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("21F.  unit: 21 Field Art.")]
-        _21FUnit21FieldArt = 23,
-
-        /// <summary>
-        /// 92F.  unit: 92 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("92F.  unit: 92 Field Art.")]
-        _92FUnit92FieldArt = 24,
-
-        /// <summary>
-        /// 8E.  unit: 8 Engineer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("8E.  unit: 8 Engineer.")]
-        _8EUnit8Engineer = 30,
-
-        /// <summary>
-        /// 20E.  unit: 20 Engineer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("20E.  unit: 20 Engineer.")]
-        _20EUnit20Engineer = 31,
-
-        /// <summary>
-        /// 91E.  unit: 91 Engineer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("91E.  unit: 91 Engineer.")]
-        _91EUnit91Engineer = 32,
-
-        /// <summary>
-        /// 1-227AVN.  unit: 1-227 Aviation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-227AVN.  unit: 1-227 Aviation.")]
-        _1227AVNUnit1227Aviation = 34,
-
-        /// <summary>
-        /// 4-227AVN.  unit: 4-227 Aviation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("4-227AVN.  unit: 4-227 Aviation.")]
-        _4227AVNUnit4227Aviation = 35,
-
-        /// <summary>
-        /// F-227AVN.  unit: F-227 Aviation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("F-227AVN.  unit: F-227 Aviation.")]
-        F227AVNUnitF227Aviation = 36,
-
-        /// <summary>
-        /// 4-5ADA.  unit: 4-5 Air Def Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("4-5ADA.  unit: 4-5 Air Def Art.")]
-        _45ADAUnit45AirDefArt = 37,
-
-        /// <summary>
-        /// 15MSB.  unit: 15 Main Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("15MSB.  unit: 15 Main Supp.")]
-        _15MSBUnit15MainSupp = 40,
-
-        /// <summary>
-        /// 27FSB.  unit: 27 Forward Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("27FSB.  unit: 27 Forward Supp.")]
-        _27FSBUnit27ForwardSupp = 41,
-
-        /// <summary>
-        /// 115FSB.  unit: 115 Forward Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("115FSB.  unit: 115 Forward Supp.")]
-        _115FSBUnit115ForwardSupp = 42,
-
-        /// <summary>
-        /// 215FSB.  unit: 215 Forward Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("215FSB.  unit: 215 Forward Supp.")]
-        _215FSBUnit215ForwardSupp = 43,
-
-        /// <summary>
-        /// 312MI.  unit: 312 Mil Intell..
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("312MI.  unit: 312 Mil Intell..")]
-        _312MIUnit312MilIntell = 45,
-
-        /// <summary>
-        /// 13S.  unit: 13 Signal.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("13S.  unit: 13 Signal.")]
-        _13SUnit13Signal = 46,
-
-        /// <summary>
-        /// 545MP.  unit: 545 Mil Police.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("545MP.  unit: 545 Mil Police.")]
-        _545MPUnit545MilPolice = 47,
-
-        /// <summary>
-        /// 68CML.  unit: 68 Chemical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("68CML.  unit: 68 Chemical.")]
-        _68CMLUnit68Chemical = 48,
-
-        /// <summary>
-        /// 1CAV.  unit: HHC 1st Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1CAV.  unit: HHC 1st Cavalry.")]
-        _1CAVUnitHHC1stCavalry = 50,
-
-        /// <summary>
-        /// HHC 1 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 1 BDE")]
-        HHC_1_BDE = 51,
-
-        /// <summary>
-        /// HHC 2 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 2 BDE")]
-        HHC_2_BDE = 52,
-
-        /// <summary>
-        /// HHC 3 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 3 BDE")]
-        HHC_3_BDE = 53,
-
-        /// <summary>
-        /// HHC 4 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 4 BDE")]
-        HHC_4_BDE = 54,
-
-        /// <summary>
-        /// AVNBDE.  unit: HHC AVN BDE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVNBDE.  unit: HHC AVN BDE.")]
-        AVNBDEUnitHHCAVNBDE = 55,
-
-        /// <summary>
-        /// E.  unit: HHD EN BDE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("E.  unit: HHD EN BDE.")]
-        EUnitHHDENBDE = 56,
-
-        /// <summary>
-        /// F.  unit: HHB DIVARTY.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("F.  unit: HHB DIVARTY.")]
-        FUnitHHBDIVARTY = 57,
-
-        /// <summary>
-        /// DSC.  unit: DISCOM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DSC.  unit: DISCOM.")]
-        DSCUnitDISCOM = 58
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingHighLevelUnitFor1stCavalry (es.markingtext.cctt.1cavunit, Byte 3 - High Level Unit (Byte 2 = 1 - 1st Cavalry), 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingHighLevelUnitFor1stCavalry : byte
+    {
+        /// <summary>
+        /// 1-7CAV.  unit: 1-7 Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-7CAV.  unit: 1-7 Cavalry.")]
+        _17CAVUnit17Cavalry = 1,
+
+        /// <summary>
+        /// 2-5CAV.  unit: 2-5 Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("2-5CAV.  unit: 2-5 Cavalry.")]
+        _25CAVUnit25Cavalry = 2,
+
+        /// <summary>
+        /// 2-8CAV.  unit: 2-8 Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("2-8CAV.  unit: 2-8 Cavalry.")]
+        _28CAVUnit28Cavalry = 3,
+
+        /// <summary>
+        /// 3-32AR.  unit: 3-32 Armor Reg.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("3-32AR.  unit: 3-32 Armor Reg.")]
+        _332ARUnit332ArmorReg = 4,
+
+        /// <summary>
+        /// 1-5CAV.  unit: 1-5 Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-5CAV.  unit: 1-5 Cavalry.")]
+        _15CAVUnit15Cavalry = 5,
+
+        /// <summary>
+        /// 1-8CAV.  unit: 1-8 Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-8CAV.  unit: 1-8 Cavalry.")]
+        _18CAVUnit18Cavalry = 6,
+
+        /// <summary>
+        /// 1-32AR.  unit: 1-32 Armor Reg.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-32AR.  unit: 1-32 Armor Reg.")]
+        _132ARUnit132ArmorReg = 7,
+
+        /// <summary>
+        /// 1-67AR.  unit: 1-67 Armor Reg.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-67AR.  unit: 1-67 Armor Reg.")]
+        _167ARUnit167ArmorReg = 8,
+
+        /// <summary>
+        /// 3-67AR.  unit: 3-67 Armor Reg.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("3-67AR.  unit: 3-67 Armor Reg.")]
+        _367ARUnit367ArmorReg = 9,
+
+        /// <summary>
+        /// 3-41INF.  unit: 3-41 Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("3-41INF.  unit: 3-41 Infantry.")]
+        _341INFUnit341Infantry = 10,
+
+        /// <summary>
+        /// 1-82F.  unit: 1-82 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-82F.  unit: 1-82 Field Art.")]
+        _182FUnit182FieldArt = 20,
+
+        /// <summary>
+        /// 3-82F.  unit: 3-82 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("3-82F.  unit: 3-82 Field Art.")]
+        _382FUnit382FieldArt = 21,
+
+        /// <summary>
+        /// 1-3F.  unit: 1-3 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-3F.  unit: 1-3 Field Art.")]
+        _13FUnit13FieldArt = 22,
+
+        /// <summary>
+        /// 21F.  unit: 21 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("21F.  unit: 21 Field Art.")]
+        _21FUnit21FieldArt = 23,
+
+        /// <summary>
+        /// 92F.  unit: 92 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("92F.  unit: 92 Field Art.")]
+        _92FUnit92FieldArt = 24,
+
+        /// <summary>
+        /// 8E.  unit: 8 Engineer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("8E.  unit: 8 Engineer.")]
+        _8EUnit8Engineer = 30,
+
+        /// <summary>
+        /// 20E.  unit: 20 Engineer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("20E.  unit: 20 Engineer.")]
+        _20EUnit20Engineer = 31,
+
+        /// <summary>
+        /// 91E.  unit: 91 Engineer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("91E.  unit: 91 Engineer.")]
+        _91EUnit91Engineer = 32,
+
+        /// <summary>
+        /// 1-227AVN.  unit: 1-227 Aviation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-227AVN.  unit: 1-227 Aviation.")]
+        _1227AVNUnit1227Aviation = 34,
+
+        /// <summary>
+        /// 4-227AVN.  unit: 4-227 Aviation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("4-227AVN.  unit: 4-227 Aviation.")]
+        _4227AVNUnit4227Aviation = 35,
+
+        /// <summary>
+        /// F-227AVN.  unit: F-227 Aviation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("F-227AVN.  unit: F-227 Aviation.")]
+        F227AVNUnitF227Aviation = 36,
+
+        /// <summary>
+        /// 4-5ADA.  unit: 4-5 Air Def Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("4-5ADA.  unit: 4-5 Air Def Art.")]
+        _45ADAUnit45AirDefArt = 37,
+
+        /// <summary>
+        /// 15MSB.  unit: 15 Main Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("15MSB.  unit: 15 Main Supp.")]
+        _15MSBUnit15MainSupp = 40,
+
+        /// <summary>
+        /// 27FSB.  unit: 27 Forward Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("27FSB.  unit: 27 Forward Supp.")]
+        _27FSBUnit27ForwardSupp = 41,
+
+        /// <summary>
+        /// 115FSB.  unit: 115 Forward Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("115FSB.  unit: 115 Forward Supp.")]
+        _115FSBUnit115ForwardSupp = 42,
+
+        /// <summary>
+        /// 215FSB.  unit: 215 Forward Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("215FSB.  unit: 215 Forward Supp.")]
+        _215FSBUnit215ForwardSupp = 43,
+
+        /// <summary>
+        /// 312MI.  unit: 312 Mil Intell..
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("312MI.  unit: 312 Mil Intell..")]
+        _312MIUnit312MilIntell = 45,
+
+        /// <summary>
+        /// 13S.  unit: 13 Signal.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("13S.  unit: 13 Signal.")]
+        _13SUnit13Signal = 46,
+
+        /// <summary>
+        /// 545MP.  unit: 545 Mil Police.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("545MP.  unit: 545 Mil Police.")]
+        _545MPUnit545MilPolice = 47,
+
+        /// <summary>
+        /// 68CML.  unit: 68 Chemical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("68CML.  unit: 68 Chemical.")]
+        _68CMLUnit68Chemical = 48,
+
+        /// <summary>
+        /// 1CAV.  unit: HHC 1st Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1CAV.  unit: HHC 1st Cavalry.")]
+        _1CAVUnitHHC1stCavalry = 50,
+
+        /// <summary>
+        /// HHC 1 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 1 BDE")]
+        HHC_1_BDE = 51,
+
+        /// <summary>
+        /// HHC 2 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 2 BDE")]
+        HHC_2_BDE = 52,
+
+        /// <summary>
+        /// HHC 3 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 3 BDE")]
+        HHC_3_BDE = 53,
+
+        /// <summary>
+        /// HHC 4 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 4 BDE")]
+        HHC_4_BDE = 54,
+
+        /// <summary>
+        /// AVNBDE.  unit: HHC AVN BDE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVNBDE.  unit: HHC AVN BDE.")]
+        AVNBDEUnitHHCAVNBDE = 55,
+
+        /// <summary>
+        /// E.  unit: HHD EN BDE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("E.  unit: HHD EN BDE.")]
+        EUnitHHDENBDE = 56,
+
+        /// <summary>
+        /// F.  unit: HHB DIVARTY.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("F.  unit: HHB DIVARTY.")]
+        FUnitHHBDIVARTY = 57,
+
+        /// <summary>
+        /// DSC.  unit: DISCOM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DSC.  unit: DISCOM.")]
+        DSCUnitDISCOM = 58
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
index f92b69d..712fee5 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingHighLevelUnitFor1stInfantry.cs
@@ -1,409 +1,409 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingHighLevelUnitFor1stInfantry (es.markingtext.cctt.1infunit, Byte 3 - High Level Unit (Byte 2 = 2 - 1st Infantry), 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingHighLevelUnitFor1stInfantry : byte
-    {
-        /// <summary>
-        /// 1-16INF.  unit: 1-16 Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-16INF.  unit: 1-16 Infantry.")]
-        _116INFUnit116Infantry = 1,
-
-        /// <summary>
-        /// 2-16INF.  unit: 2-16 Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("2-16INF.  unit: 2-16 Infantry.")]
-        _216INFUnit216Infantry = 2,
-
-        /// <summary>
-        /// 1-34AR.  unit: 1-34 Armor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-34AR.  unit: 1-34 Armor.")]
-        _134ARUnit134Armor = 3,
-
-        /// <summary>
-        /// 2-34AR.  unit: 2-34 Armor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("2-34AR.  unit: 2-34 Armor.")]
-        _234ARUnit234Armor = 4,
-
-        /// <summary>
-        /// 3-37AR.  unit: 3-37 Armor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("3-37AR.  unit: 3-37 Armor.")]
-        _337ARUnit337Armor = 5,
-
-        /// <summary>
-        /// 4-37AR.  unit: 4-37 Armor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("4-37AR.  unit: 4-37 Armor.")]
-        _437ARUnit437Armor = 6,
-
-        /// <summary>
-        /// 1-118INF.  unit: 1-118 Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-118INF.  unit: 1-118 Infantry.")]
-        _1118INFUnit1118Infantry = 7,
-
-        /// <summary>
-        /// 4-118INF.  unit: 4-118 Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("4-118INF.  unit: 4-118 Infantry.")]
-        _4118INFUnit4118Infantry = 8,
-
-        /// <summary>
-        /// 2-265AR.  unit: 2-263 Armor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("2-265AR.  unit: 2-263 Armor.")]
-        _2265ARUnit2263Armor = 9,
-
-        /// <summary>
-        /// 2-136IF.  unit: 2-136 Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("2-136IF.  unit: 2-136 Infantry.")]
-        _2136IFUnit2136Infantry = 10,
-
-        /// <summary>
-        /// 1-5F.  unit: 1-5 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-5F.  unit: 1-5 Field Art.")]
-        _15FUnit15FieldArt = 20,
-
-        /// <summary>
-        /// 4-5F.  unit: 4-5 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("4-5F.  unit: 4-5 Field Art.")]
-        _45FUnit45FieldArt = 21,
-
-        /// <summary>
-        /// 1-178F.  unit: 1-178 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-178F.  unit: 1-178 Field Art.")]
-        _1178FUnit1178FieldArt = 22,
-
-        /// <summary>
-        /// 6F.  unit: B/6 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("6F.  unit: B/6 Field Art.")]
-        _6FUnitB6FieldArt = 23,
-
-        /// <summary>
-        /// 25F.  unit: D/25 Field Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("25F.  unit: D/25 Field Art.")]
-        _25FUnitD25FieldArt = 24,
-
-        /// <summary>
-        /// 1E.  unit: 1 Engineer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1E.  unit: 1 Engineer.")]
-        _1EUnit1Engineer = 30,
-
-        /// <summary>
-        /// 70E.  unit: 70 Engineer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("70E.  unit: 70 Engineer.")]
-        _70EUnit70Engineer = 31,
-
-        /// <summary>
-        /// 4-1AVN.  unit: 4-1 Aviation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("4-1AVN.  unit: 4-1 Aviation.")]
-        _41AVNUnit41Aviation = 32,
-
-        /// <summary>
-        /// 1-1AVN.  unit: 1-1 Aviation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-1AVN.  unit: 1-1 Aviation.")]
-        _11AVNUnit11Aviation = 33,
-
-        /// <summary>
-        /// 2-3ADA.  unit: 2-3 Air Def Art.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("2-3ADA.  unit: 2-3 Air Def Art.")]
-        _23ADAUnit23AirDefArt = 34,
-
-        /// <summary>
-        /// 1-4CAV.  unit: 1-4 Cavalry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1-4CAV.  unit: 1-4 Cavalry.")]
-        _14CAVUnit14Cavalry = 35,
-
-        /// <summary>
-        /// 701MSB.  unit: 701 Main Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("701MSB.  unit: 701 Main Supp.")]
-        _701MSBUnit701MainSupp = 40,
-
-        /// <summary>
-        /// 101FSB.  unit: 101 Forward Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("101FSB.  unit: 101 Forward Supp.")]
-        _101FSBUnit101ForwardSupp = 41,
-
-        /// <summary>
-        /// 201FSB.  unit: 201 Forward Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("201FSB.  unit: 201 Forward Supp.")]
-        _201FSBUnit201ForwardSupp = 42,
-
-        /// <summary>
-        /// 163FSB.  unit: 163 Forward Supp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("163FSB.  unit: 163 Forward Supp.")]
-        _163FSBUnit163ForwardSupp = 43,
-
-        /// <summary>
-        /// 101MI.  unit: 101 Mil Intell.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("101MI.  unit: 101 Mil Intell.")]
-        _101MIUnit101MilIntell = 45,
-
-        /// <summary>
-        /// 121S.  unit: 121 Signal.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("121S.  unit: 121 Signal.")]
-        _121SUnit121Signal = 46,
-
-        /// <summary>
-        /// 1MP.  unit: 1st Mil Police.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1MP.  unit: 1st Mil Police.")]
-        _1MPUnit1stMilPolice = 47,
-
-        /// <summary>
-        /// 12CML.  unit: 12 Chemical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("12CML.  unit: 12 Chemical.")]
-        _12CMLUnit12Chemical = 48,
-
-        /// <summary>
-        /// 1INF.  unit: HHC 1st Infantry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1INF.  unit: HHC 1st Infantry.")]
-        _1INFUnitHHC1stInfantry = 50,
-
-        /// <summary>
-        /// HHC 1 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 1 BDE")]
-        HHC_1_BDE = 51,
-
-        /// <summary>
-        /// HHC 2 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 2 BDE")]
-        HHC_2_BDE = 52,
-
-        /// <summary>
-        /// HHC 3 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 3 BDE")]
-        HHC_3_BDE = 53,
-
-        /// <summary>
-        /// HHC 4 BDE
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HHC 4 BDE")]
-        HHC_4_BDE = 54,
-
-        /// <summary>
-        /// AVNBDE.  unit: HHC AVN BDE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AVNBDE.  unit: HHC AVN BDE.")]
-        AVNBDEUnitHHCAVNBDE = 55,
-
-        /// <summary>
-        /// E.  unit: HHD EN BDE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("E.  unit: HHD EN BDE.")]
-        EUnitHHDENBDE = 56,
-
-        /// <summary>
-        /// F.  unit: HHB DIVARTY.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("F.  unit: HHB DIVARTY.")]
-        FUnitHHBDIVARTY = 57,
-
-        /// <summary>
-        /// DSC.  unit: DISCOM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DSC.  unit: DISCOM.")]
-        DSCUnitDISCOM = 58
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingHighLevelUnitFor1stInfantry (es.markingtext.cctt.1infunit, Byte 3 - High Level Unit (Byte 2 = 2 - 1st Infantry), 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingHighLevelUnitFor1stInfantry : byte
+    {
+        /// <summary>
+        /// 1-16INF.  unit: 1-16 Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-16INF.  unit: 1-16 Infantry.")]
+        _116INFUnit116Infantry = 1,
+
+        /// <summary>
+        /// 2-16INF.  unit: 2-16 Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("2-16INF.  unit: 2-16 Infantry.")]
+        _216INFUnit216Infantry = 2,
+
+        /// <summary>
+        /// 1-34AR.  unit: 1-34 Armor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-34AR.  unit: 1-34 Armor.")]
+        _134ARUnit134Armor = 3,
+
+        /// <summary>
+        /// 2-34AR.  unit: 2-34 Armor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("2-34AR.  unit: 2-34 Armor.")]
+        _234ARUnit234Armor = 4,
+
+        /// <summary>
+        /// 3-37AR.  unit: 3-37 Armor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("3-37AR.  unit: 3-37 Armor.")]
+        _337ARUnit337Armor = 5,
+
+        /// <summary>
+        /// 4-37AR.  unit: 4-37 Armor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("4-37AR.  unit: 4-37 Armor.")]
+        _437ARUnit437Armor = 6,
+
+        /// <summary>
+        /// 1-118INF.  unit: 1-118 Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-118INF.  unit: 1-118 Infantry.")]
+        _1118INFUnit1118Infantry = 7,
+
+        /// <summary>
+        /// 4-118INF.  unit: 4-118 Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("4-118INF.  unit: 4-118 Infantry.")]
+        _4118INFUnit4118Infantry = 8,
+
+        /// <summary>
+        /// 2-265AR.  unit: 2-263 Armor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("2-265AR.  unit: 2-263 Armor.")]
+        _2265ARUnit2263Armor = 9,
+
+        /// <summary>
+        /// 2-136IF.  unit: 2-136 Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("2-136IF.  unit: 2-136 Infantry.")]
+        _2136IFUnit2136Infantry = 10,
+
+        /// <summary>
+        /// 1-5F.  unit: 1-5 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-5F.  unit: 1-5 Field Art.")]
+        _15FUnit15FieldArt = 20,
+
+        /// <summary>
+        /// 4-5F.  unit: 4-5 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("4-5F.  unit: 4-5 Field Art.")]
+        _45FUnit45FieldArt = 21,
+
+        /// <summary>
+        /// 1-178F.  unit: 1-178 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-178F.  unit: 1-178 Field Art.")]
+        _1178FUnit1178FieldArt = 22,
+
+        /// <summary>
+        /// 6F.  unit: B/6 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("6F.  unit: B/6 Field Art.")]
+        _6FUnitB6FieldArt = 23,
+
+        /// <summary>
+        /// 25F.  unit: D/25 Field Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("25F.  unit: D/25 Field Art.")]
+        _25FUnitD25FieldArt = 24,
+
+        /// <summary>
+        /// 1E.  unit: 1 Engineer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1E.  unit: 1 Engineer.")]
+        _1EUnit1Engineer = 30,
+
+        /// <summary>
+        /// 70E.  unit: 70 Engineer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("70E.  unit: 70 Engineer.")]
+        _70EUnit70Engineer = 31,
+
+        /// <summary>
+        /// 4-1AVN.  unit: 4-1 Aviation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("4-1AVN.  unit: 4-1 Aviation.")]
+        _41AVNUnit41Aviation = 32,
+
+        /// <summary>
+        /// 1-1AVN.  unit: 1-1 Aviation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-1AVN.  unit: 1-1 Aviation.")]
+        _11AVNUnit11Aviation = 33,
+
+        /// <summary>
+        /// 2-3ADA.  unit: 2-3 Air Def Art.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("2-3ADA.  unit: 2-3 Air Def Art.")]
+        _23ADAUnit23AirDefArt = 34,
+
+        /// <summary>
+        /// 1-4CAV.  unit: 1-4 Cavalry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1-4CAV.  unit: 1-4 Cavalry.")]
+        _14CAVUnit14Cavalry = 35,
+
+        /// <summary>
+        /// 701MSB.  unit: 701 Main Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("701MSB.  unit: 701 Main Supp.")]
+        _701MSBUnit701MainSupp = 40,
+
+        /// <summary>
+        /// 101FSB.  unit: 101 Forward Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("101FSB.  unit: 101 Forward Supp.")]
+        _101FSBUnit101ForwardSupp = 41,
+
+        /// <summary>
+        /// 201FSB.  unit: 201 Forward Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("201FSB.  unit: 201 Forward Supp.")]
+        _201FSBUnit201ForwardSupp = 42,
+
+        /// <summary>
+        /// 163FSB.  unit: 163 Forward Supp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("163FSB.  unit: 163 Forward Supp.")]
+        _163FSBUnit163ForwardSupp = 43,
+
+        /// <summary>
+        /// 101MI.  unit: 101 Mil Intell.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("101MI.  unit: 101 Mil Intell.")]
+        _101MIUnit101MilIntell = 45,
+
+        /// <summary>
+        /// 121S.  unit: 121 Signal.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("121S.  unit: 121 Signal.")]
+        _121SUnit121Signal = 46,
+
+        /// <summary>
+        /// 1MP.  unit: 1st Mil Police.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1MP.  unit: 1st Mil Police.")]
+        _1MPUnit1stMilPolice = 47,
+
+        /// <summary>
+        /// 12CML.  unit: 12 Chemical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("12CML.  unit: 12 Chemical.")]
+        _12CMLUnit12Chemical = 48,
+
+        /// <summary>
+        /// 1INF.  unit: HHC 1st Infantry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1INF.  unit: HHC 1st Infantry.")]
+        _1INFUnitHHC1stInfantry = 50,
+
+        /// <summary>
+        /// HHC 1 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 1 BDE")]
+        HHC_1_BDE = 51,
+
+        /// <summary>
+        /// HHC 2 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 2 BDE")]
+        HHC_2_BDE = 52,
+
+        /// <summary>
+        /// HHC 3 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 3 BDE")]
+        HHC_3_BDE = 53,
+
+        /// <summary>
+        /// HHC 4 BDE
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HHC 4 BDE")]
+        HHC_4_BDE = 54,
+
+        /// <summary>
+        /// AVNBDE.  unit: HHC AVN BDE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AVNBDE.  unit: HHC AVN BDE.")]
+        AVNBDEUnitHHCAVNBDE = 55,
+
+        /// <summary>
+        /// E.  unit: HHD EN BDE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("E.  unit: HHD EN BDE.")]
+        EUnitHHDENBDE = 56,
+
+        /// <summary>
+        /// F.  unit: HHB DIVARTY.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("F.  unit: HHB DIVARTY.")]
+        FUnitHHBDIVARTY = 57,
+
+        /// <summary>
+        /// DSC.  unit: DISCOM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DSC.  unit: DISCOM.")]
+        DSCUnitDISCOM = 58
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
index a4099f2..7ba0e58 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingMarkingCodes.cs
@@ -1,299 +1,299 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingMarkingCodes (es.markingtext.cctt.symbol1, Bytes 8, 9, 10 and 12, 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingMarkingCodes : byte
-    {
-        /// <summary>
-        /// Value 0
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 0")]
-        Value_0 = 0,
-
-        /// <summary>
-        /// Value 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 1")]
-        Value_1 = 1,
-
-        /// <summary>
-        /// Value 2
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 2")]
-        Value_2 = 2,
-
-        /// <summary>
-        /// Value 3
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 3")]
-        Value_3 = 3,
-
-        /// <summary>
-        /// Value 4
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 4")]
-        Value_4 = 4,
-
-        /// <summary>
-        /// Value 5
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 5")]
-        Value_5 = 5,
-
-        /// <summary>
-        /// Value 6
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 6")]
-        Value_6 = 6,
-
-        /// <summary>
-        /// Value 7
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 7")]
-        Value_7 = 7,
-
-        /// <summary>
-        /// Value 8
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 8")]
-        Value_8 = 8,
-
-        /// <summary>
-        /// Value 9
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 9")]
-        Value_9 = 9,
-
-        /// <summary>
-        /// Value 0
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 0")]
-        Value_0_ = 10,
-
-        /// <summary>
-        /// Value 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 1")]
-        Value_1_ = 11,
-
-        /// <summary>
-        /// Value 2
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 2")]
-        Value_2_ = 12,
-
-        /// <summary>
-        /// Value 3
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 3")]
-        Value_3_ = 13,
-
-        /// <summary>
-        /// Value 4
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 4")]
-        Value_4_ = 14,
-
-        /// <summary>
-        /// Value 5
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 5")]
-        Value_5_ = 15,
-
-        /// <summary>
-        /// Value 6
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 6")]
-        Value_6_ = 16,
-
-        /// <summary>
-        /// Value 7
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 7")]
-        Value_7_ = 17,
-
-        /// <summary>
-        /// Value 8
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 8")]
-        Value_8_ = 18,
-
-        /// <summary>
-        /// Value 9
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 9")]
-        Value_9_ = 19,
-
-        /// <summary>
-        /// E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("E.")]
-        E = 69,
-
-        /// <summary>
-        /// Underscore E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore E.")]
-        UnderscoreE = 101,
-
-        /// <summary>
-        /// S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("S.")]
-        S = 83,
-
-        /// <summary>
-        /// Underscore S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore S.")]
-        UnderscoreS = 115,
-
-        /// <summary>
-        /// X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X.")]
-        X = 88,
-
-        /// <summary>
-        /// Underscore X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore X.")]
-        UnderscoreX = 120,
-
-        /// <summary>
-        /// Blank.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blank.")]
-        Blank = 32
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingMarkingCodes (es.markingtext.cctt.symbol1, Bytes 8, 9, 10 and 12, 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingMarkingCodes : byte
+    {
+        /// <summary>
+        /// Value 0
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 0")]
+        Value_0 = 0,
+
+        /// <summary>
+        /// Value 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 1")]
+        Value_1 = 1,
+
+        /// <summary>
+        /// Value 2
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 2")]
+        Value_2 = 2,
+
+        /// <summary>
+        /// Value 3
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 3")]
+        Value_3 = 3,
+
+        /// <summary>
+        /// Value 4
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 4")]
+        Value_4 = 4,
+
+        /// <summary>
+        /// Value 5
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 5")]
+        Value_5 = 5,
+
+        /// <summary>
+        /// Value 6
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 6")]
+        Value_6 = 6,
+
+        /// <summary>
+        /// Value 7
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 7")]
+        Value_7 = 7,
+
+        /// <summary>
+        /// Value 8
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 8")]
+        Value_8 = 8,
+
+        /// <summary>
+        /// Value 9
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 9")]
+        Value_9 = 9,
+
+        /// <summary>
+        /// Value 0
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 0")]
+        Value_0_ = 10,
+
+        /// <summary>
+        /// Value 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 1")]
+        Value_1_ = 11,
+
+        /// <summary>
+        /// Value 2
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 2")]
+        Value_2_ = 12,
+
+        /// <summary>
+        /// Value 3
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 3")]
+        Value_3_ = 13,
+
+        /// <summary>
+        /// Value 4
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 4")]
+        Value_4_ = 14,
+
+        /// <summary>
+        /// Value 5
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 5")]
+        Value_5_ = 15,
+
+        /// <summary>
+        /// Value 6
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 6")]
+        Value_6_ = 16,
+
+        /// <summary>
+        /// Value 7
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 7")]
+        Value_7_ = 17,
+
+        /// <summary>
+        /// Value 8
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 8")]
+        Value_8_ = 18,
+
+        /// <summary>
+        /// Value 9
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 9")]
+        Value_9_ = 19,
+
+        /// <summary>
+        /// E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("E.")]
+        E = 69,
+
+        /// <summary>
+        /// Underscore E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore E.")]
+        UnderscoreE = 101,
+
+        /// <summary>
+        /// S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("S.")]
+        S = 83,
+
+        /// <summary>
+        /// Underscore S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore S.")]
+        UnderscoreS = 115,
+
+        /// <summary>
+        /// X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X.")]
+        X = 88,
+
+        /// <summary>
+        /// Underscore X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore X.")]
+        UnderscoreX = 120,
+
+        /// <summary>
+        /// Blank.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blank.")]
+        Blank = 32
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
index d6d2252..2bf3ccc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingPlatoon.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingPlatoon (es.markingtext.cctt.platoon, Byte 5 - Platoon, Section, 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingPlatoon : byte
-    {
-        /// <summary>
-        /// Value 0
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 0")]
-        Value_0 = 0,
-
-        /// <summary>
-        /// Value 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 1")]
-        Value_1 = 1,
-
-        /// <summary>
-        /// Value 2
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 2")]
-        Value_2 = 2,
-
-        /// <summary>
-        /// Value 3
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 3")]
-        Value_3 = 3,
-
-        /// <summary>
-        /// Value 4
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 4")]
-        Value_4 = 4,
-
-        /// <summary>
-        /// Value 5
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 5")]
-        Value_5 = 5,
-
-        /// <summary>
-        /// Value 6
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 6")]
-        Value_6 = 6,
-
-        /// <summary>
-        /// Value 7
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 7")]
-        Value_7 = 7,
-
-        /// <summary>
-        /// Value 8
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 8")]
-        Value_8 = 8,
-
-        /// <summary>
-        /// Value 9
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 9")]
-        Value_9 = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingPlatoon (es.markingtext.cctt.platoon, Byte 5 - Platoon, Section, 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingPlatoon : byte
+    {
+        /// <summary>
+        /// Value 0
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 0")]
+        Value_0 = 0,
+
+        /// <summary>
+        /// Value 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 1")]
+        Value_1 = 1,
+
+        /// <summary>
+        /// Value 2
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 2")]
+        Value_2 = 2,
+
+        /// <summary>
+        /// Value 3
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 3")]
+        Value_3 = 3,
+
+        /// <summary>
+        /// Value 4
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 4")]
+        Value_4 = 4,
+
+        /// <summary>
+        /// Value 5
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 5")]
+        Value_5 = 5,
+
+        /// <summary>
+        /// Value 6
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 6")]
+        Value_6 = 6,
+
+        /// <summary>
+        /// Value 7
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 7")]
+        Value_7 = 7,
+
+        /// <summary>
+        /// Value 8
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 8")]
+        Value_8 = 8,
+
+        /// <summary>
+        /// Value 9
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 9")]
+        Value_9 = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
index d98bb20..79e626f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingPlatoonCodes.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingPlatoonCodes (es.markingtext.cctt.symbol2, Byte 11, 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingPlatoonCodes : byte
-    {
-        /// <summary>
-        /// Caret.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Caret.")]
-        Caret = 94,
-
-        /// <summary>
-        /// Greater than.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Greater than.")]
-        GreaterThan = 62,
-
-        /// <summary>
-        /// inverted carrot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("inverted carrot.")]
-        InvertedCarrot = 86,
-
-        /// <summary>
-        /// Lower than.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lower than.")]
-        LowerThan = 60,
-
-        /// <summary>
-        /// Caret and inverted carrot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Caret and inverted carrot.")]
-        CaretAndInvertedCarrot = 126,
-
-        /// <summary>
-        /// Lower or greater than.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lower or greater than.")]
-        LowerThanGreaterThan = 61
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingPlatoonCodes (es.markingtext.cctt.symbol2, Byte 11, 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingPlatoonCodes : byte
+    {
+        /// <summary>
+        /// Caret.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Caret.")]
+        Caret = 94,
+
+        /// <summary>
+        /// Greater than.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Greater than.")]
+        GreaterThan = 62,
+
+        /// <summary>
+        /// inverted carrot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("inverted carrot.")]
+        InvertedCarrot = 86,
+
+        /// <summary>
+        /// Lower than.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lower than.")]
+        LowerThan = 60,
+
+        /// <summary>
+        /// Caret and inverted carrot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Caret and inverted carrot.")]
+        CaretAndInvertedCarrot = 126,
+
+        /// <summary>
+        /// Lower or greater than.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lower or greater than.")]
+        LowerThanGreaterThan = 61
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
index 2c236b5..25e0de1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/ArmyMarkingVehicle.cs
@@ -1,139 +1,139 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for ArmyMarkingVehicle (es.markingtext.cctt.vehicle, Byte 6 and 7 - Vehicle, 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArmyMarkingVehicle : byte
-    {
-        /// <summary>
-        /// Value 0
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 0")]
-        Value_0 = 0,
-
-        /// <summary>
-        /// Value 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 1")]
-        Value_1 = 1,
-
-        /// <summary>
-        /// Value 2
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 2")]
-        Value_2 = 2,
-
-        /// <summary>
-        /// Value 3
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 3")]
-        Value_3 = 3,
-
-        /// <summary>
-        /// Value 4
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 4")]
-        Value_4 = 4,
-
-        /// <summary>
-        /// Value 5
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 5")]
-        Value_5 = 5,
-
-        /// <summary>
-        /// Value 6
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 6")]
-        Value_6 = 6,
-
-        /// <summary>
-        /// Value 7
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 7")]
-        Value_7 = 7,
-
-        /// <summary>
-        /// Value 8
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 8")]
-        Value_8 = 8,
-
-        /// <summary>
-        /// Value 9
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 9")]
-        Value_9 = 9,
-
-        /// <summary>
-        /// Blank.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blank.")]
-        Blank = 32
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for ArmyMarkingVehicle (es.markingtext.cctt.vehicle, Byte 6 and 7 - Vehicle, 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArmyMarkingVehicle : byte
+    {
+        /// <summary>
+        /// Value 0
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 0")]
+        Value_0 = 0,
+
+        /// <summary>
+        /// Value 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 1")]
+        Value_1 = 1,
+
+        /// <summary>
+        /// Value 2
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 2")]
+        Value_2 = 2,
+
+        /// <summary>
+        /// Value 3
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 3")]
+        Value_3 = 3,
+
+        /// <summary>
+        /// Value 4
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 4")]
+        Value_4 = 4,
+
+        /// <summary>
+        /// Value 5
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 5")]
+        Value_5 = 5,
+
+        /// <summary>
+        /// Value 6
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 6")]
+        Value_6 = 6,
+
+        /// <summary>
+        /// Value 7
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 7")]
+        Value_7 = 7,
+
+        /// <summary>
+        /// Value 8
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 8")]
+        Value_8 = 8,
+
+        /// <summary>
+        /// Value 9
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 9")]
+        Value_9 = 9,
+
+        /// <summary>
+        /// Blank.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blank.")]
+        Blank = 32
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
index c095674..e1ec4f8 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/DigitChevronMarkingCodes.cs
@@ -1,359 +1,359 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for DigitChevronMarkingCodes (es.markingtext.chevron.symbol, Digit / Chevron Codes, 
-    /// section 4.5.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DigitChevronMarkingCodes : byte
-    {
-        /// <summary>
-        /// Value 0
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 0")]
-        Value_0 = 0,
-
-        /// <summary>
-        /// Value 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 1")]
-        Value_1 = 1,
-
-        /// <summary>
-        /// Value 2
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 2")]
-        Value_2 = 2,
-
-        /// <summary>
-        /// Value 3
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 3")]
-        Value_3 = 3,
-
-        /// <summary>
-        /// Value 4
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 4")]
-        Value_4 = 4,
-
-        /// <summary>
-        /// Value 5
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 5")]
-        Value_5 = 5,
-
-        /// <summary>
-        /// Value 6
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 6")]
-        Value_6 = 6,
-
-        /// <summary>
-        /// Value 7
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 7")]
-        Value_7 = 7,
-
-        /// <summary>
-        /// Value 8
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 8")]
-        Value_8 = 8,
-
-        /// <summary>
-        /// Value 9
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Value 9")]
-        Value_9 = 9,
-
-        /// <summary>
-        /// Underscore 0
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 0")]
-        Underscore_0 = 10,
-
-        /// <summary>
-        /// Underscore 1
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 1")]
-        Underscore_1 = 11,
-
-        /// <summary>
-        /// Underscore 2
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 2")]
-        Underscore_2 = 12,
-
-        /// <summary>
-        /// Underscore 3
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 3")]
-        Underscore_3 = 13,
-
-        /// <summary>
-        /// Underscore 4
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 4")]
-        Underscore_4 = 14,
-
-        /// <summary>
-        /// Underscore 5
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 5")]
-        Underscore_5 = 15,
-
-        /// <summary>
-        /// Underscore 6
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 6")]
-        Underscore_6 = 16,
-
-        /// <summary>
-        /// Underscore 7
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 7")]
-        Underscore_7 = 17,
-
-        /// <summary>
-        /// Underscore 8
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 8")]
-        Underscore_8 = 18,
-
-        /// <summary>
-        /// Underscore 9
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore 9")]
-        Underscore_9 = 19,
-
-        /// <summary>
-        /// E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("E.")]
-        E = 69,
-
-        /// <summary>
-        /// Underscore E.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore E.")]
-        UnderscoreE = 101,
-
-        /// <summary>
-        /// S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("S.")]
-        S = 83,
-
-        /// <summary>
-        /// Underscore S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore S.")]
-        UnderscoreS = 115,
-
-        /// <summary>
-        /// X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X.")]
-        X = 88,
-
-        /// <summary>
-        /// Underscore X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underscore X.")]
-        UnderscoreX = 120,
-
-        /// <summary>
-        /// Blank.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blank.")]
-        Blank = 32,
-
-        /// <summary>
-        /// Caret.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Caret.")]
-        Caret = 94,
-
-        /// <summary>
-        /// Greater than.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Greater than.")]
-        GreaterThan = 62,
-
-        /// <summary>
-        /// inverted carrot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("inverted carrot.")]
-        InvertedCarrot = 86,
-
-        /// <summary>
-        /// Lower than.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lower than.")]
-        LowerThan = 60,
-
-        /// <summary>
-        /// Caret and inverted carrot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Caret and inverted carrot.")]
-        CaretAndInvertedCarrot = 126,
-
-        /// <summary>
-        /// Lower or greater than.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lower or greater than.")]
-        LowerThanGreaterThan = 61
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for DigitChevronMarkingCodes (es.markingtext.chevron.symbol, Digit / Chevron Codes, 
+    /// section 4.5.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DigitChevronMarkingCodes : byte
+    {
+        /// <summary>
+        /// Value 0
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 0")]
+        Value_0 = 0,
+
+        /// <summary>
+        /// Value 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 1")]
+        Value_1 = 1,
+
+        /// <summary>
+        /// Value 2
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 2")]
+        Value_2 = 2,
+
+        /// <summary>
+        /// Value 3
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 3")]
+        Value_3 = 3,
+
+        /// <summary>
+        /// Value 4
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 4")]
+        Value_4 = 4,
+
+        /// <summary>
+        /// Value 5
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 5")]
+        Value_5 = 5,
+
+        /// <summary>
+        /// Value 6
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 6")]
+        Value_6 = 6,
+
+        /// <summary>
+        /// Value 7
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 7")]
+        Value_7 = 7,
+
+        /// <summary>
+        /// Value 8
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 8")]
+        Value_8 = 8,
+
+        /// <summary>
+        /// Value 9
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Value 9")]
+        Value_9 = 9,
+
+        /// <summary>
+        /// Underscore 0
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 0")]
+        Underscore_0 = 10,
+
+        /// <summary>
+        /// Underscore 1
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 1")]
+        Underscore_1 = 11,
+
+        /// <summary>
+        /// Underscore 2
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 2")]
+        Underscore_2 = 12,
+
+        /// <summary>
+        /// Underscore 3
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 3")]
+        Underscore_3 = 13,
+
+        /// <summary>
+        /// Underscore 4
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 4")]
+        Underscore_4 = 14,
+
+        /// <summary>
+        /// Underscore 5
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 5")]
+        Underscore_5 = 15,
+
+        /// <summary>
+        /// Underscore 6
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 6")]
+        Underscore_6 = 16,
+
+        /// <summary>
+        /// Underscore 7
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 7")]
+        Underscore_7 = 17,
+
+        /// <summary>
+        /// Underscore 8
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 8")]
+        Underscore_8 = 18,
+
+        /// <summary>
+        /// Underscore 9
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore 9")]
+        Underscore_9 = 19,
+
+        /// <summary>
+        /// E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("E.")]
+        E = 69,
+
+        /// <summary>
+        /// Underscore E.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore E.")]
+        UnderscoreE = 101,
+
+        /// <summary>
+        /// S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("S.")]
+        S = 83,
+
+        /// <summary>
+        /// Underscore S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore S.")]
+        UnderscoreS = 115,
+
+        /// <summary>
+        /// X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X.")]
+        X = 88,
+
+        /// <summary>
+        /// Underscore X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underscore X.")]
+        UnderscoreX = 120,
+
+        /// <summary>
+        /// Blank.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blank.")]
+        Blank = 32,
+
+        /// <summary>
+        /// Caret.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Caret.")]
+        Caret = 94,
+
+        /// <summary>
+        /// Greater than.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Greater than.")]
+        GreaterThan = 62,
+
+        /// <summary>
+        /// inverted carrot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("inverted carrot.")]
+        InvertedCarrot = 86,
+
+        /// <summary>
+        /// Lower than.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lower than.")]
+        LowerThan = 60,
+
+        /// <summary>
+        /// Caret and inverted carrot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Caret and inverted carrot.")]
+        CaretAndInvertedCarrot = 126,
+
+        /// <summary>
+        /// Lower or greater than.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lower or greater than.")]
+        LowerThanGreaterThan = 61
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs b/Libs/CsharpDis6/Enumerations/EntityState.Marking/EntityMarkingText.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Marking/EntityMarkingText.cs
index 5e89afc..2f3cd9b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Marking/EntityMarkingText.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Marking/EntityMarkingText.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Marking
-{
-    /// <summary>
-    /// Enumeration values for EntityMarkingText (es.markingtext, Entity Marking, 
-    /// section 4.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EntityMarkingText : byte
-    {
-        /// <summary>
-        /// ASCII.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASCII.")]
-        ASCII = 1,
-
-        /// <summary>
-        /// Army Marking (CCTT).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Army Marking (CCTT).")]
-        ArmyMarkingCCTT = 2,
-
-        /// <summary>
-        /// Digit Chevron.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Digit Chevron.")]
-        DigitChevron = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Marking
+{
+    /// <summary>
+    /// Enumeration values for EntityMarkingText (es.markingtext, Entity Marking, 
+    /// section 4.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EntityMarkingText : byte
+    {
+        /// <summary>
+        /// ASCII.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASCII.")]
+        ASCII = 1,
+
+        /// <summary>
+        /// Army Marking (CCTT).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Army Marking (CCTT).")]
+        ArmyMarkingCCTT = 2,
+
+        /// <summary>
+        /// Digit Chevron.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Digit Chevron.")]
+        DigitChevron = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/AirPlatform.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/AirPlatform.cs
index 657c091..61b9414 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/AirPlatform.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/AirPlatform.cs
@@ -1,209 +1,209 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for AirPlatform (es.type.kind.1.domain.2.cat, Platform-Air Category, 
-    /// section 4.2.1.1.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AirPlatform : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Fighter/Air Defense.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fighter/Air Defense.")]
-        FighterAirDefense = 1,
-
-        /// <summary>
-        /// Attack/Strike.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Attack/Strike.")]
-        AttackStrike = 2,
-
-        /// <summary>
-        /// Bomber.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bomber.")]
-        Bomber = 3,
-
-        /// <summary>
-        /// Cargo/Tanker.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cargo/Tanker.")]
-        CargoTanker = 4,
-
-        /// <summary>
-        /// ASW/Patrol/Observation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ASW/Patrol/Observation.")]
-        ASWPatrolObservation = 5,
-
-        /// <summary>
-        /// Electronic Warfare (EW).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electronic Warfare (EW).")]
-        ElectronicWarfare = 6,
-
-        /// <summary>
-        /// Reconnaissance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Reconnaissance.")]
-        Reconnaissance = 7,
-
-        /// <summary>
-        /// Surveillance/C2 (Airborne Early Warning).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Surveillance/C2 (Airborne Early Warning).")]
-        SurveillanceC2AirborneEarlyWarning = 8,
-
-        /// <summary>
-        /// Attack Helicopter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Attack Helicopter.")]
-        AttackHelicopter = 20,
-
-        /// <summary>
-        /// Utility Helicopter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Utility Helicopter.")]
-        UtilityHelicopter = 21,
-
-        /// <summary>
-        /// Antisubmarine Warfare/Patrol Helicopter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antisubmarine Warfare/Patrol Helicopter.")]
-        AntisubmarineWarfarePatrolHelicopter = 22,
-
-        /// <summary>
-        /// Cargo Helicopter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cargo Helicopter.")]
-        CargoHelicopter = 23,
-
-        /// <summary>
-        /// Observation Helicopter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Observation Helicopter.")]
-        ObservationHelicopter = 24,
-
-        /// <summary>
-        /// Special Operations Helicopter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Special Operations Helicopter.")]
-        SpecialOperationsHelicopter = 25,
-
-        /// <summary>
-        /// Trainer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trainer.")]
-        Trainer = 40,
-
-        /// <summary>
-        /// Unmanned.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unmanned.")]
-        Unmanned = 50,
-
-        /// <summary>
-        /// Non-Combatant Commercial Aircraft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Non-Combatant Commercial Aircraft.")]
-        NonCombatantCommercialAircraft = 57
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for AirPlatform (es.type.kind.1.domain.2.cat, Platform-Air Category, 
+    /// section 4.2.1.1.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AirPlatform : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Fighter/Air Defense.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fighter/Air Defense.")]
+        FighterAirDefense = 1,
+
+        /// <summary>
+        /// Attack/Strike.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Attack/Strike.")]
+        AttackStrike = 2,
+
+        /// <summary>
+        /// Bomber.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bomber.")]
+        Bomber = 3,
+
+        /// <summary>
+        /// Cargo/Tanker.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cargo/Tanker.")]
+        CargoTanker = 4,
+
+        /// <summary>
+        /// ASW/Patrol/Observation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ASW/Patrol/Observation.")]
+        ASWPatrolObservation = 5,
+
+        /// <summary>
+        /// Electronic Warfare (EW).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electronic Warfare (EW).")]
+        ElectronicWarfare = 6,
+
+        /// <summary>
+        /// Reconnaissance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Reconnaissance.")]
+        Reconnaissance = 7,
+
+        /// <summary>
+        /// Surveillance/C2 (Airborne Early Warning).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Surveillance/C2 (Airborne Early Warning).")]
+        SurveillanceC2AirborneEarlyWarning = 8,
+
+        /// <summary>
+        /// Attack Helicopter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Attack Helicopter.")]
+        AttackHelicopter = 20,
+
+        /// <summary>
+        /// Utility Helicopter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Utility Helicopter.")]
+        UtilityHelicopter = 21,
+
+        /// <summary>
+        /// Antisubmarine Warfare/Patrol Helicopter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antisubmarine Warfare/Patrol Helicopter.")]
+        AntisubmarineWarfarePatrolHelicopter = 22,
+
+        /// <summary>
+        /// Cargo Helicopter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cargo Helicopter.")]
+        CargoHelicopter = 23,
+
+        /// <summary>
+        /// Observation Helicopter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Observation Helicopter.")]
+        ObservationHelicopter = 24,
+
+        /// <summary>
+        /// Special Operations Helicopter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Special Operations Helicopter.")]
+        SpecialOperationsHelicopter = 25,
+
+        /// <summary>
+        /// Trainer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trainer.")]
+        Trainer = 40,
+
+        /// <summary>
+        /// Unmanned.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unmanned.")]
+        Unmanned = 50,
+
+        /// <summary>
+        /// Non-Combatant Commercial Aircraft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Non-Combatant Commercial Aircraft.")]
+        NonCombatantCommercialAircraft = 57
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
index e4e1584..5aef6c3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/CISWeaponsForLifeFormsSubcategory.cs
@@ -1,499 +1,499 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for CISWeaponsForLifeFormsSubcategory (es.type.222.kind.3.subcat, C.I.S. Weapons for Life Forms Subcategory, 
-    /// section 4.2.3.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum CISWeaponsForLifeFormsSubcategory : byte
-    {
-        /// <summary>
-        /// Automatic (APS) 9-mm, Stechkin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Automatic (APS) 9-mm, Stechkin.")]
-        AutomaticAPS9MmStechkin = 201,
-
-        /// <summary>
-        /// PSM 5.45-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PSM 5.45-mm.")]
-        PSM545Mm = 202,
-
-        /// <summary>
-        /// Self-loading (PM) 9-mm, Makarov.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Self-loading (PM) 9-mm, Makarov.")]
-        SelfLoadingPM9MmMakarov = 203,
-
-        /// <summary>
-        /// TT-33 7.62-mm, Tokarev.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TT-33 7.62-mm, Tokarev.")]
-        TT33762MmTokarev = 204,
-
-        /// <summary>
-        /// Assault rifle AK and AKM, 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Assault rifle AK and AKM, 7.62-mm.")]
-        AssaultRifleAKAndAKM762Mm = 205,
-
-        /// <summary>
-        /// Assault rifle AK-74 and AKS-74, 5.45-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Assault rifle AK-74 and AKS-74, 5.45-mm.")]
-        AssaultRifleAK74AndAKS74545Mm = 206,
-
-        /// <summary>
-        /// Self-loading rifle (SKS), 7.62-mm, Simonov.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Self-loading rifle (SKS), 7.62-mm, Simonov.")]
-        SelfLoadingRifleSKS762MmSimonov = 207,
-
-        /// <summary>
-        /// Sniper rifle SVD 7.62-mm, Dragunov.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sniper rifle SVD 7.62-mm, Dragunov.")]
-        SniperRifleSVD762MmDragunov = 208,
-
-        /// <summary>
-        /// AKSU-74 5.45-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AKSU-74 5.45-mm.")]
-        AKSU74545Mm = 209,
-
-        /// <summary>
-        /// PPS-43 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PPS-43 7.62-mm.")]
-        PPS43762Mm = 210,
-
-        /// <summary>
-        /// PPSh-41 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PPSh-41 7.62-mm.")]
-        PPSh41762Mm = 211,
-
-        /// <summary>
-        /// General purpose PK 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("General purpose PK 7.62-mm.")]
-        GeneralPurposePK762Mm = 212,
-
-        /// <summary>
-        /// Heavy DShK-38 and Model 38/46 12.7-mm, Degtyarev.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heavy DShK-38 and Model 38/46 12.7-mm, Degtyarev.")]
-        HeavyDShK38AndModel3846127MmDegtyarev = 213,
-
-        /// <summary>
-        /// Heavy NSV 12.7-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heavy NSV 12.7-mm.")]
-        HeavyNSV127Mm = 214,
-
-        /// <summary>
-        /// Light RPD 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light RPD 7.62-mm.")]
-        LightRPD762Mm = 215,
-
-        /// <summary>
-        /// Light RPK 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light RPK 7.62-mm.")]
-        LightRPK762Mm = 216,
-
-        /// <summary>
-        /// Light RPK-74 5.45-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light RPK-74 5.45-mm.")]
-        LightRPK74545Mm = 217,
-
-        /// <summary>
-        /// Hand grenade M75.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hand grenade M75.")]
-        HandGrenadeM75 = 218,
-
-        /// <summary>
-        /// Hand grenade RGD-5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hand grenade RGD-5.")]
-        HandGrenadeRGD5 = 219,
-
-        /// <summary>
-        /// AP hand grenade F1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AP hand grenade F1.")]
-        APHandGrenadeF1 = 220,
-
-        /// <summary>
-        /// AT hand grenade RKG-3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AT hand grenade RKG-3.")]
-        ATHandGrenadeRKG3 = 221,
-
-        /// <summary>
-        /// AT hand grenade RKG-3M.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AT hand grenade RKG-3M.")]
-        ATHandGrenadeRKG3M = 222,
-
-        /// <summary>
-        /// AT hand grenade RKG-3T.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AT hand grenade RKG-3T.")]
-        ATHandGrenadeRKG3T = 223,
-
-        /// <summary>
-        /// Fragmentation hand grenade RGN.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fragmentation hand grenade RGN.")]
-        FragmentationHandGrenadeRGN = 224,
-
-        /// <summary>
-        /// Fragmentation hand grenade RGO.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fragmentation hand grenade RGO.")]
-        FragmentationHandGrenadeRGO = 225,
-
-        /// <summary>
-        /// Smoke hand grenade RDG-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Smoke hand grenade RDG-1.")]
-        SmokeHandGrenadeRDG1 = 226,
-
-        /// <summary>
-        /// Plamya launcher, 30-mm AGS-17.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plamya launcher, 30-mm AGS-17.")]
-        PlamyaLauncher30MmAGS17 = 227,
-
-        /// <summary>
-        /// Rifle-mounted launcher, BG-15 40-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rifle-mounted launcher, BG-15 40-mm.")]
-        RifleMountedLauncherBG1540Mm = 228,
-
-        /// <summary>
-        /// LPO-50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LPO-50.")]
-        LPO50 = 229,
-
-        /// <summary>
-        /// ROKS-3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ROKS-3.")]
-        ROKS3 = 230,
-
-        /// <summary>
-        /// Cart-mounted TPO-50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cart-mounted TPO-50.")]
-        CartMountedTPO50 = 231,
-
-        /// <summary>
-        /// Gimlet SA-16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gimlet SA-16.")]
-        GimletSA16 = 232,
-
-        /// <summary>
-        /// Grail SA-7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Grail SA-7.")]
-        GrailSA7 = 233,
-
-        /// <summary>
-        /// Gremlin SA-14.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gremlin SA-14.")]
-        GremlinSA14 = 234,
-
-        /// <summary>
-        /// Sagger AT-3 (MCLOS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sagger AT-3 (MCLOS).")]
-        SaggerAT3MCLOS = 235,
-
-        /// <summary>
-        /// Saxhorn AT-7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Saxhorn AT-7.")]
-        SaxhornAT7 = 236,
-
-        /// <summary>
-        /// Spigot A/B AT-14.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spigot A/B AT-14.")]
-        SpigotABAT14 = 237,
-
-        /// <summary>
-        /// SA-18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA-18.")]
-        SA18 = 238,
-
-        /// <summary>
-        /// SA-19.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA-19.")]
-        SA19 = 239,
-
-        /// <summary>
-        /// Grad-1P manportable tripod rocket launcher, 122-mm (for Spesnatz and other specialists; aka 9P132).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Grad-1P manportable tripod rocket launcher, 122-mm (for Spesnatz and other specialists; aka 9P132).")]
-        Grad1PManportableTripodRocketLauncher122MmForSpesnatzAndOtherSpecialistsAka9P132 = 240,
-
-        /// <summary>
-        /// Light anti-armor weapon RPG-18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light anti-armor weapon RPG-18.")]
-        LightAntiArmorWeaponRPG18 = 241,
-
-        /// <summary>
-        /// Light antitank weapon RPG-22.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light antitank weapon RPG-22.")]
-        LightAntitankWeaponRPG22 = 242,
-
-        /// <summary>
-        /// MG &amp; RPG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MG &amp; RPG.")]
-        MGRPG = 243,
-
-        /// <summary>
-        /// Portable rocket launcher RPG-16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Portable rocket launcher RPG-16.")]
-        PortableRocketLauncherRPG16 = 244,
-
-        /// <summary>
-        /// Recoilless gun 73-mm SPG-9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Recoilless gun 73-mm SPG-9.")]
-        RecoillessGun73MmSPG9 = 245,
-
-        /// <summary>
-        /// VAT rocket launcher RPG-7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("VAT rocket launcher RPG-7.")]
-        VATRocketLauncherRPG7 = 246,
-
-        /// <summary>
-        /// Mon-50 antipersonnel mine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mon-50 antipersonnel mine.")]
-        Mon50AntipersonnelMine = 248
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for CISWeaponsForLifeFormsSubcategory (es.type.222.kind.3.subcat, C.I.S. Weapons for Life Forms Subcategory, 
+    /// section 4.2.3.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum CISWeaponsForLifeFormsSubcategory : byte
+    {
+        /// <summary>
+        /// Automatic (APS) 9-mm, Stechkin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Automatic (APS) 9-mm, Stechkin.")]
+        AutomaticAPS9MmStechkin = 201,
+
+        /// <summary>
+        /// PSM 5.45-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PSM 5.45-mm.")]
+        PSM545Mm = 202,
+
+        /// <summary>
+        /// Self-loading (PM) 9-mm, Makarov.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Self-loading (PM) 9-mm, Makarov.")]
+        SelfLoadingPM9MmMakarov = 203,
+
+        /// <summary>
+        /// TT-33 7.62-mm, Tokarev.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TT-33 7.62-mm, Tokarev.")]
+        TT33762MmTokarev = 204,
+
+        /// <summary>
+        /// Assault rifle AK and AKM, 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Assault rifle AK and AKM, 7.62-mm.")]
+        AssaultRifleAKAndAKM762Mm = 205,
+
+        /// <summary>
+        /// Assault rifle AK-74 and AKS-74, 5.45-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Assault rifle AK-74 and AKS-74, 5.45-mm.")]
+        AssaultRifleAK74AndAKS74545Mm = 206,
+
+        /// <summary>
+        /// Self-loading rifle (SKS), 7.62-mm, Simonov.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Self-loading rifle (SKS), 7.62-mm, Simonov.")]
+        SelfLoadingRifleSKS762MmSimonov = 207,
+
+        /// <summary>
+        /// Sniper rifle SVD 7.62-mm, Dragunov.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sniper rifle SVD 7.62-mm, Dragunov.")]
+        SniperRifleSVD762MmDragunov = 208,
+
+        /// <summary>
+        /// AKSU-74 5.45-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AKSU-74 5.45-mm.")]
+        AKSU74545Mm = 209,
+
+        /// <summary>
+        /// PPS-43 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PPS-43 7.62-mm.")]
+        PPS43762Mm = 210,
+
+        /// <summary>
+        /// PPSh-41 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PPSh-41 7.62-mm.")]
+        PPSh41762Mm = 211,
+
+        /// <summary>
+        /// General purpose PK 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("General purpose PK 7.62-mm.")]
+        GeneralPurposePK762Mm = 212,
+
+        /// <summary>
+        /// Heavy DShK-38 and Model 38/46 12.7-mm, Degtyarev.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heavy DShK-38 and Model 38/46 12.7-mm, Degtyarev.")]
+        HeavyDShK38AndModel3846127MmDegtyarev = 213,
+
+        /// <summary>
+        /// Heavy NSV 12.7-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heavy NSV 12.7-mm.")]
+        HeavyNSV127Mm = 214,
+
+        /// <summary>
+        /// Light RPD 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light RPD 7.62-mm.")]
+        LightRPD762Mm = 215,
+
+        /// <summary>
+        /// Light RPK 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light RPK 7.62-mm.")]
+        LightRPK762Mm = 216,
+
+        /// <summary>
+        /// Light RPK-74 5.45-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light RPK-74 5.45-mm.")]
+        LightRPK74545Mm = 217,
+
+        /// <summary>
+        /// Hand grenade M75.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hand grenade M75.")]
+        HandGrenadeM75 = 218,
+
+        /// <summary>
+        /// Hand grenade RGD-5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hand grenade RGD-5.")]
+        HandGrenadeRGD5 = 219,
+
+        /// <summary>
+        /// AP hand grenade F1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AP hand grenade F1.")]
+        APHandGrenadeF1 = 220,
+
+        /// <summary>
+        /// AT hand grenade RKG-3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AT hand grenade RKG-3.")]
+        ATHandGrenadeRKG3 = 221,
+
+        /// <summary>
+        /// AT hand grenade RKG-3M.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AT hand grenade RKG-3M.")]
+        ATHandGrenadeRKG3M = 222,
+
+        /// <summary>
+        /// AT hand grenade RKG-3T.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AT hand grenade RKG-3T.")]
+        ATHandGrenadeRKG3T = 223,
+
+        /// <summary>
+        /// Fragmentation hand grenade RGN.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fragmentation hand grenade RGN.")]
+        FragmentationHandGrenadeRGN = 224,
+
+        /// <summary>
+        /// Fragmentation hand grenade RGO.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fragmentation hand grenade RGO.")]
+        FragmentationHandGrenadeRGO = 225,
+
+        /// <summary>
+        /// Smoke hand grenade RDG-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Smoke hand grenade RDG-1.")]
+        SmokeHandGrenadeRDG1 = 226,
+
+        /// <summary>
+        /// Plamya launcher, 30-mm AGS-17.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plamya launcher, 30-mm AGS-17.")]
+        PlamyaLauncher30MmAGS17 = 227,
+
+        /// <summary>
+        /// Rifle-mounted launcher, BG-15 40-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rifle-mounted launcher, BG-15 40-mm.")]
+        RifleMountedLauncherBG1540Mm = 228,
+
+        /// <summary>
+        /// LPO-50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LPO-50.")]
+        LPO50 = 229,
+
+        /// <summary>
+        /// ROKS-3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ROKS-3.")]
+        ROKS3 = 230,
+
+        /// <summary>
+        /// Cart-mounted TPO-50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cart-mounted TPO-50.")]
+        CartMountedTPO50 = 231,
+
+        /// <summary>
+        /// Gimlet SA-16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gimlet SA-16.")]
+        GimletSA16 = 232,
+
+        /// <summary>
+        /// Grail SA-7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Grail SA-7.")]
+        GrailSA7 = 233,
+
+        /// <summary>
+        /// Gremlin SA-14.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gremlin SA-14.")]
+        GremlinSA14 = 234,
+
+        /// <summary>
+        /// Sagger AT-3 (MCLOS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sagger AT-3 (MCLOS).")]
+        SaggerAT3MCLOS = 235,
+
+        /// <summary>
+        /// Saxhorn AT-7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Saxhorn AT-7.")]
+        SaxhornAT7 = 236,
+
+        /// <summary>
+        /// Spigot A/B AT-14.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spigot A/B AT-14.")]
+        SpigotABAT14 = 237,
+
+        /// <summary>
+        /// SA-18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA-18.")]
+        SA18 = 238,
+
+        /// <summary>
+        /// SA-19.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA-19.")]
+        SA19 = 239,
+
+        /// <summary>
+        /// Grad-1P manportable tripod rocket launcher, 122-mm (for Spesnatz and other specialists; aka 9P132).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Grad-1P manportable tripod rocket launcher, 122-mm (for Spesnatz and other specialists; aka 9P132).")]
+        Grad1PManportableTripodRocketLauncher122MmForSpesnatzAndOtherSpecialistsAka9P132 = 240,
+
+        /// <summary>
+        /// Light anti-armor weapon RPG-18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light anti-armor weapon RPG-18.")]
+        LightAntiArmorWeaponRPG18 = 241,
+
+        /// <summary>
+        /// Light antitank weapon RPG-22.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light antitank weapon RPG-22.")]
+        LightAntitankWeaponRPG22 = 242,
+
+        /// <summary>
+        /// MG &amp; RPG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MG &amp; RPG.")]
+        MGRPG = 243,
+
+        /// <summary>
+        /// Portable rocket launcher RPG-16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Portable rocket launcher RPG-16.")]
+        PortableRocketLauncherRPG16 = 244,
+
+        /// <summary>
+        /// Recoilless gun 73-mm SPG-9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Recoilless gun 73-mm SPG-9.")]
+        RecoillessGun73MmSPG9 = 245,
+
+        /// <summary>
+        /// VAT rocket launcher RPG-7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("VAT rocket launcher RPG-7.")]
+        VATRocketLauncherRPG7 = 246,
+
+        /// <summary>
+        /// Mon-50 antipersonnel mine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mon-50 antipersonnel mine.")]
+        Mon50AntipersonnelMine = 248
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EntityKind.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/EntityKind.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EntityKind.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/EntityKind.cs
index f5bebbd..a022b74 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EntityKind.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/EntityKind.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for EntityKind (es.type.kind, Entity Kind, 
-    /// section 4.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EntityKind : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Platform.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Platform.")]
-        Platform = 1,
-
-        /// <summary>
-        /// Munition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Munition.")]
-        Munition = 2,
-
-        /// <summary>
-        /// Life form.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Life form.")]
-        LifeForm = 3,
-
-        /// <summary>
-        /// Environmental.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environmental.")]
-        Environmental = 4,
-
-        /// <summary>
-        /// Cultural feature.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cultural feature.")]
-        CulturalFeature = 5,
-
-        /// <summary>
-        /// Supply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Supply.")]
-        Supply = 6,
-
-        /// <summary>
-        /// Radio.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio.")]
-        Radio = 7,
-
-        /// <summary>
-        /// Expendable.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Expendable.")]
-        Expendable = 8,
-
-        /// <summary>
-        /// Sensor/Emitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sensor/Emitter.")]
-        SensorEmitter = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for EntityKind (es.type.kind, Entity Kind, 
+    /// section 4.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EntityKind : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Platform.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Platform.")]
+        Platform = 1,
+
+        /// <summary>
+        /// Munition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Munition.")]
+        Munition = 2,
+
+        /// <summary>
+        /// Life form.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Life form.")]
+        LifeForm = 3,
+
+        /// <summary>
+        /// Environmental.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environmental.")]
+        Environmental = 4,
+
+        /// <summary>
+        /// Cultural feature.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cultural feature.")]
+        CulturalFeature = 5,
+
+        /// <summary>
+        /// Supply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Supply.")]
+        Supply = 6,
+
+        /// <summary>
+        /// Radio.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio.")]
+        Radio = 7,
+
+        /// <summary>
+        /// Expendable.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Expendable.")]
+        Expendable = 8,
+
+        /// <summary>
+        /// Sensor/Emitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sensor/Emitter.")]
+        SensorEmitter = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
index b4b353a..2f309aa 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/EnvironmentalSubcategory.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for EnvironmentalSubcategory (es.type.kind.4.subcat, Environmental Kind, 
-    /// section 4.2.3.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EnvironmentalSubcategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Very Small.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Very Small.")]
-        VerySmall = 20,
-
-        /// <summary>
-        /// Small.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Small.")]
-        Small = 40,
-
-        /// <summary>
-        /// Medium.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Medium.")]
-        Medium = 60,
-
-        /// <summary>
-        /// Large.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Large.")]
-        Large = 80,
-
-        /// <summary>
-        /// Very Large.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Very Large.")]
-        VeryLarge = 100
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for EnvironmentalSubcategory (es.type.kind.4.subcat, Environmental Kind, 
+    /// section 4.2.3.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EnvironmentalSubcategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Very Small.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Very Small.")]
+        VerySmall = 20,
+
+        /// <summary>
+        /// Small.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Small.")]
+        Small = 40,
+
+        /// <summary>
+        /// Medium.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Medium.")]
+        Medium = 60,
+
+        /// <summary>
+        /// Large.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Large.")]
+        Large = 80,
+
+        /// <summary>
+        /// Very Large.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Very Large.")]
+        VeryLarge = 100
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableAirCategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableAirCategory.cs
index 3016a7d..f5cba3a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableAirCategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableAirCategory.cs
@@ -1,99 +1,99 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for ExpendableAirCategory (es.type.kind.8.domain.2.cat, Expendable-Air Category, 
-    /// section 4.2.1.8.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ExpendableAirCategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Chaff.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chaff.")]
-        Chaff = 1,
-
-        /// <summary>
-        /// Flare.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flare.")]
-        Flare = 2,
-
-        /// <summary>
-        /// Combined chaff and flare.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Combined chaff and flare.")]
-        CombinedChaffAndFlare = 3,
-
-        /// <summary>
-        /// Active emitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Active emitter.")]
-        ActiveEmitter = 4,
-
-        /// <summary>
-        /// Passive decoy.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Passive decoy.")]
-        PassiveDecoy = 5,
-
-        /// <summary>
-        /// Winged decoy.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Winged decoy.")]
-        WingedDecoy = 6
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for ExpendableAirCategory (es.type.kind.8.domain.2.cat, Expendable-Air Category, 
+    /// section 4.2.1.8.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ExpendableAirCategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Chaff.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chaff.")]
+        Chaff = 1,
+
+        /// <summary>
+        /// Flare.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flare.")]
+        Flare = 2,
+
+        /// <summary>
+        /// Combined chaff and flare.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Combined chaff and flare.")]
+        CombinedChaffAndFlare = 3,
+
+        /// <summary>
+        /// Active emitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Active emitter.")]
+        ActiveEmitter = 4,
+
+        /// <summary>
+        /// Passive decoy.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Passive decoy.")]
+        PassiveDecoy = 5,
+
+        /// <summary>
+        /// Winged decoy.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Winged decoy.")]
+        WingedDecoy = 6
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
index 5a41df0..4cefadc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableSubsurfaceCategory.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for ExpendableSubsurfaceCategory (es.type.kind.8.domain.4.cat, Expendable-Subsurface Category, 
-    /// section 4.2.1.8.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ExpendableSubsurfaceCategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Active emitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Active emitter.")]
-        ActiveEmitter = 4,
-
-        /// <summary>
-        /// Passive decoy.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Passive decoy.")]
-        PassiveDecoy = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for ExpendableSubsurfaceCategory (es.type.kind.8.domain.4.cat, Expendable-Subsurface Category, 
+    /// section 4.2.1.8.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ExpendableSubsurfaceCategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Active emitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Active emitter.")]
+        ActiveEmitter = 4,
+
+        /// <summary>
+        /// Passive decoy.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Passive decoy.")]
+        PassiveDecoy = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
index fefe6a8..6ae61bc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/ExpendableSurfaceCategory.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for ExpendableSurfaceCategory (es.type.kind.8.domain.3.cat, Expendable-Surface Category, 
-    /// section 4.2.1.8.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ExpendableSurfaceCategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Flare.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flare.")]
-        Flare = 2,
-
-        /// <summary>
-        /// Active emitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Active emitter.")]
-        ActiveEmitter = 4,
-
-        /// <summary>
-        /// Passive decoy.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Passive decoy.")]
-        PassiveDecoy = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for ExpendableSurfaceCategory (es.type.kind.8.domain.3.cat, Expendable-Surface Category, 
+    /// section 4.2.1.8.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ExpendableSurfaceCategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Flare.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flare.")]
+        Flare = 2,
+
+        /// <summary>
+        /// Active emitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Active emitter.")]
+        ActiveEmitter = 4,
+
+        /// <summary>
+        /// Passive decoy.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Passive decoy.")]
+        PassiveDecoy = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
index 3cc080a..bf9bb8c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/FrenchWeaponsForLifeForms.cs
@@ -1,109 +1,109 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for FrenchWeaponsForLifeForms (es.type.71.kind.3.subcat, French Weapons for Life Forms Subcategory, 
-    /// section 4.2.3.3.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum FrenchWeaponsForLifeForms : byte
-    {
-        /// <summary>
-        /// ACL-STRIM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ACL-STRIM.")]
-        ACLSTRIM = 1,
-
-        /// <summary>
-        /// Mistral missile.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mistral missile.")]
-        MistralMissile = 2,
-
-        /// <summary>
-        /// Milan AT missile.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Milan AT missile.")]
-        MilanATMissile = 3,
-
-        /// <summary>
-        /// LRAC F1 89-mm AT rocket launcher.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LRAC F1 89-mm AT rocket launcher.")]
-        LRACF189MmATRocketLauncher = 4,
-
-        /// <summary>
-        /// FA-MAS rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FA-MAS rifle.")]
-        FAMASRifle = 5,
-
-        /// <summary>
-        /// AA-52 machine gun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AA-52 machine gun.")]
-        AA52MachineGun = 6,
-
-        /// <summary>
-        /// 58-mm rifle grenade.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("58-mm rifle grenade.")]
-        _58MmRifleGrenade = 7,
-
-        /// <summary>
-        /// FR-F1 sniper rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FR-F1 sniper rifle.")]
-        FRF1SniperRifle = 8
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for FrenchWeaponsForLifeForms (es.type.71.kind.3.subcat, French Weapons for Life Forms Subcategory, 
+    /// section 4.2.3.3.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum FrenchWeaponsForLifeForms : byte
+    {
+        /// <summary>
+        /// ACL-STRIM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ACL-STRIM.")]
+        ACLSTRIM = 1,
+
+        /// <summary>
+        /// Mistral missile.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mistral missile.")]
+        MistralMissile = 2,
+
+        /// <summary>
+        /// Milan AT missile.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Milan AT missile.")]
+        MilanATMissile = 3,
+
+        /// <summary>
+        /// LRAC F1 89-mm AT rocket launcher.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LRAC F1 89-mm AT rocket launcher.")]
+        LRACF189MmATRocketLauncher = 4,
+
+        /// <summary>
+        /// FA-MAS rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FA-MAS rifle.")]
+        FAMASRifle = 5,
+
+        /// <summary>
+        /// AA-52 machine gun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AA-52 machine gun.")]
+        AA52MachineGun = 6,
+
+        /// <summary>
+        /// 58-mm rifle grenade.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("58-mm rifle grenade.")]
+        _58MmRifleGrenade = 7,
+
+        /// <summary>
+        /// FR-F1 sniper rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FR-F1 sniper rifle.")]
+        FRF1SniperRifle = 8
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
index 9114fe8..858a5ee 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/GermanWeaponsForLifeForms.cs
@@ -1,119 +1,119 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for GermanWeaponsForLifeForms (es.type.78.kind.3.subcat, German Weapons for Life Forms Subcategory, 
-    /// section 4.2.3.3.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum GermanWeaponsForLifeForms : byte
-    {
-        /// <summary>
-        /// G3 rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("G3 rifle.")]
-        G3Rifle = 1,
-
-        /// <summary>
-        /// G11 rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("G11 rifle.")]
-        G11Rifle = 2,
-
-        /// <summary>
-        /// P1 pistol.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("P1 pistol.")]
-        P1Pistol = 3,
-
-        /// <summary>
-        /// MG3 machine gun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MG3 machine gun.")]
-        MG3MachineGun = 4,
-
-        /// <summary>
-        /// Milan missile.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Milan missile.")]
-        MilanMissile = 5,
-
-        /// <summary>
-        /// MP1 Uzi submachine gun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MP1 Uzi submachine gun.")]
-        MP1UziSubmachineGun = 6,
-
-        /// <summary>
-        /// Panzerfaust 3 Light Anti-Tank Weapon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Panzerfaust 3 Light Anti-Tank Weapon.")]
-        Panzerfaust3LightAntiTankWeapon = 7,
-
-        /// <summary>
-        /// DM19 hand grenade.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DM19 hand grenade.")]
-        DM19HandGrenade = 8,
-
-        /// <summary>
-        /// DM29 hand grenade.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DM29 hand grenade.")]
-        DM29HandGrenade = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for GermanWeaponsForLifeForms (es.type.78.kind.3.subcat, German Weapons for Life Forms Subcategory, 
+    /// section 4.2.3.3.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum GermanWeaponsForLifeForms : byte
+    {
+        /// <summary>
+        /// G3 rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("G3 rifle.")]
+        G3Rifle = 1,
+
+        /// <summary>
+        /// G11 rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("G11 rifle.")]
+        G11Rifle = 2,
+
+        /// <summary>
+        /// P1 pistol.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("P1 pistol.")]
+        P1Pistol = 3,
+
+        /// <summary>
+        /// MG3 machine gun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MG3 machine gun.")]
+        MG3MachineGun = 4,
+
+        /// <summary>
+        /// Milan missile.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Milan missile.")]
+        MilanMissile = 5,
+
+        /// <summary>
+        /// MP1 Uzi submachine gun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MP1 Uzi submachine gun.")]
+        MP1UziSubmachineGun = 6,
+
+        /// <summary>
+        /// Panzerfaust 3 Light Anti-Tank Weapon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Panzerfaust 3 Light Anti-Tank Weapon.")]
+        Panzerfaust3LightAntiTankWeapon = 7,
+
+        /// <summary>
+        /// DM19 hand grenade.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DM19 hand grenade.")]
+        DM19HandGrenade = 8,
+
+        /// <summary>
+        /// DM29 hand grenade.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DM29 hand grenade.")]
+        DM29HandGrenade = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/LandPlatform.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/LandPlatform.cs
index 1d3d72c..02c785a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/LandPlatform.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/LandPlatform.cs
@@ -1,439 +1,439 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for LandPlatform (es.type.kind.1.domain.1.cat, Platform-Land Category, 
-    /// section 4.2.1.1.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum LandPlatform : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Tank.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tank.")]
-        Tank = 1,
-
-        /// <summary>
-        /// Armored Fighting Vehicle - (IFV, APC, SP mortars, armored cars, chemical reconnaissance, anti-tank guided missile launchers, etc.).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armored Fighting Vehicle - (IFV, APC, SP mortars, armored cars, chemical reconnaissance, anti-tank guided missile launchers, etc.).")]
-        ArmoredFightingVehicle = 2,
-
-        /// <summary>
-        /// Armored Utility Vehicle - (Engineering vehicle, tracked load carriers, towing vehicles, recovery vehicles, AVLB, etc.).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armored Utility Vehicle - (Engineering vehicle, tracked load carriers, towing vehicles, recovery vehicles, AVLB, etc.).")]
-        ArmoredUtilityVehicle = 3,
-
-        /// <summary>
-        /// Self-propelled Artillery - (guns and howitzers).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Self-propelled Artillery - (guns and howitzers).")]
-        SelfPropelledArtillery = 4,
-
-        /// <summary>
-        /// Towed Artillery - (anti-tank guns, guns and howitzers).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Towed Artillery - (anti-tank guns, guns and howitzers).")]
-        TowedArtillery = 5,
-
-        /// <summary>
-        /// Small Wheeled Utility Vehicle - (0-1.25 tons).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Small Wheeled Utility Vehicle - (0-1.25 tons).")]
-        SmallWheeledUtilityVehicle = 6,
-
-        /// <summary>
-        /// Large Wheeled Utility Vehicle - (greater than 1.25 tons).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Large Wheeled Utility Vehicle - (greater than 1.25 tons).")]
-        LargeWheeledUtilityVehicle = 7,
-
-        /// <summary>
-        /// Small Tracked Utility Vehicle - (0-4999 kg weight load).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Small Tracked Utility Vehicle - (0-4999 kg weight load).")]
-        SmallTrackedUtilityVehicle = 8,
-
-        /// <summary>
-        /// Large Tracked Utility Vehicle - (greater than 4999 kg weight load).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Large Tracked Utility Vehicle - (greater than 4999 kg weight load).")]
-        LargeTrackedUtilityVehicle = 9,
-
-        /// <summary>
-        /// Mortar.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mortar.")]
-        Mortar = 10,
-
-        /// <summary>
-        /// Mine plow.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine plow.")]
-        MinePlow = 11,
-
-        /// <summary>
-        /// Mine rake.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine rake.")]
-        MineRake = 12,
-
-        /// <summary>
-        /// Mine roller.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine roller.")]
-        MineRoller = 13,
-
-        /// <summary>
-        /// Cargo trailer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cargo trailer.")]
-        CargoTrailer = 14,
-
-        /// <summary>
-        /// Fuel trailer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuel trailer.")]
-        FuelTrailer = 15,
-
-        /// <summary>
-        /// Generator trailer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generator trailer.")]
-        GeneratorTrailer = 16,
-
-        /// <summary>
-        /// Water trailer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Water trailer.")]
-        WaterTrailer = 17,
-
-        /// <summary>
-        /// Engineer equipment.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Engineer equipment.")]
-        EngineerEquipment = 18,
-
-        /// <summary>
-        /// Heavy equipment transport trailer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heavy equipment transport trailer.")]
-        HeavyEquipmentTransportTrailer = 19,
-
-        /// <summary>
-        /// Maintenance equipment trailer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Maintenance equipment trailer.")]
-        MaintenanceEquipmentTrailer = 20,
-
-        /// <summary>
-        /// Limber.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Limber.")]
-        Limber = 21,
-
-        /// <summary>
-        /// Chemical decontamination trailer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical decontamination trailer.")]
-        ChemicalDecontaminationTrailer = 22,
-
-        /// <summary>
-        /// Warning System.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Warning System.")]
-        WarningSystem = 23,
-
-        /// <summary>
-        /// Train - Engine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Train - Engine.")]
-        TrainEngine = 24,
-
-        /// <summary>
-        /// Train - Car.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Train - Car.")]
-        TrainCar = 25,
-
-        /// <summary>
-        /// Train - Caboose.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Train - Caboose.")]
-        TrainCaboose = 26,
-
-        /// <summary>
-        /// Civilian Vehicle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Civilian Vehicle.")]
-        CivilianVehicle = 27,
-
-        /// <summary>
-        /// Air Defense / Missile Defense Unit Equipment.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Defense / Missile Defense Unit Equipment.")]
-        AirDefenseMissileDefenseUnitEquipment = 28,
-
-        /// <summary>
-        /// Command, Control, Communications, and Intelligence (C3I) System.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command, Control, Communications, and Intelligence (C3I) System.")]
-        CommandControlCommunicationsAndIntelligenceC3ISystem = 29,
-
-        /// <summary>
-        /// Operations Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Operations Facility.")]
-        OperationsFacility = 30,
-
-        /// <summary>
-        /// Intelligence Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intelligence Facility.")]
-        IntelligenceFacility = 31,
-
-        /// <summary>
-        /// Surveillance Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Surveillance Facility.")]
-        SurveillanceFacility = 32,
-
-        /// <summary>
-        /// Communications Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Communications Facility.")]
-        CommunicationsFacility = 33,
-
-        /// <summary>
-        /// Command Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command Facility.")]
-        CommandFacility = 34,
-
-        /// <summary>
-        /// C4I Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("C4I Facility.")]
-        C4IFacility = 35,
-
-        /// <summary>
-        /// Control Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Control Facility.")]
-        ControlFacility = 36,
-
-        /// <summary>
-        /// Fire Control Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire Control Facility.")]
-        FireControlFacility = 37,
-
-        /// <summary>
-        /// Missile Defense Facility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missile Defense Facility.")]
-        MissileDefenseFacility = 38,
-
-        /// <summary>
-        /// Field Command Post.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Field Command Post.")]
-        FieldCommandPost = 39,
-
-        /// <summary>
-        /// Observation Post.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Observation Post.")]
-        ObservationPost = 40
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for LandPlatform (es.type.kind.1.domain.1.cat, Platform-Land Category, 
+    /// section 4.2.1.1.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum LandPlatform : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Tank.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tank.")]
+        Tank = 1,
+
+        /// <summary>
+        /// Armored Fighting Vehicle - (IFV, APC, SP mortars, armored cars, chemical reconnaissance, anti-tank guided missile launchers, etc.).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armored Fighting Vehicle - (IFV, APC, SP mortars, armored cars, chemical reconnaissance, anti-tank guided missile launchers, etc.).")]
+        ArmoredFightingVehicle = 2,
+
+        /// <summary>
+        /// Armored Utility Vehicle - (Engineering vehicle, tracked load carriers, towing vehicles, recovery vehicles, AVLB, etc.).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armored Utility Vehicle - (Engineering vehicle, tracked load carriers, towing vehicles, recovery vehicles, AVLB, etc.).")]
+        ArmoredUtilityVehicle = 3,
+
+        /// <summary>
+        /// Self-propelled Artillery - (guns and howitzers).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Self-propelled Artillery - (guns and howitzers).")]
+        SelfPropelledArtillery = 4,
+
+        /// <summary>
+        /// Towed Artillery - (anti-tank guns, guns and howitzers).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Towed Artillery - (anti-tank guns, guns and howitzers).")]
+        TowedArtillery = 5,
+
+        /// <summary>
+        /// Small Wheeled Utility Vehicle - (0-1.25 tons).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Small Wheeled Utility Vehicle - (0-1.25 tons).")]
+        SmallWheeledUtilityVehicle = 6,
+
+        /// <summary>
+        /// Large Wheeled Utility Vehicle - (greater than 1.25 tons).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Large Wheeled Utility Vehicle - (greater than 1.25 tons).")]
+        LargeWheeledUtilityVehicle = 7,
+
+        /// <summary>
+        /// Small Tracked Utility Vehicle - (0-4999 kg weight load).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Small Tracked Utility Vehicle - (0-4999 kg weight load).")]
+        SmallTrackedUtilityVehicle = 8,
+
+        /// <summary>
+        /// Large Tracked Utility Vehicle - (greater than 4999 kg weight load).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Large Tracked Utility Vehicle - (greater than 4999 kg weight load).")]
+        LargeTrackedUtilityVehicle = 9,
+
+        /// <summary>
+        /// Mortar.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mortar.")]
+        Mortar = 10,
+
+        /// <summary>
+        /// Mine plow.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine plow.")]
+        MinePlow = 11,
+
+        /// <summary>
+        /// Mine rake.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine rake.")]
+        MineRake = 12,
+
+        /// <summary>
+        /// Mine roller.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine roller.")]
+        MineRoller = 13,
+
+        /// <summary>
+        /// Cargo trailer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cargo trailer.")]
+        CargoTrailer = 14,
+
+        /// <summary>
+        /// Fuel trailer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuel trailer.")]
+        FuelTrailer = 15,
+
+        /// <summary>
+        /// Generator trailer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generator trailer.")]
+        GeneratorTrailer = 16,
+
+        /// <summary>
+        /// Water trailer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Water trailer.")]
+        WaterTrailer = 17,
+
+        /// <summary>
+        /// Engineer equipment.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Engineer equipment.")]
+        EngineerEquipment = 18,
+
+        /// <summary>
+        /// Heavy equipment transport trailer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heavy equipment transport trailer.")]
+        HeavyEquipmentTransportTrailer = 19,
+
+        /// <summary>
+        /// Maintenance equipment trailer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Maintenance equipment trailer.")]
+        MaintenanceEquipmentTrailer = 20,
+
+        /// <summary>
+        /// Limber.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Limber.")]
+        Limber = 21,
+
+        /// <summary>
+        /// Chemical decontamination trailer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical decontamination trailer.")]
+        ChemicalDecontaminationTrailer = 22,
+
+        /// <summary>
+        /// Warning System.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Warning System.")]
+        WarningSystem = 23,
+
+        /// <summary>
+        /// Train - Engine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Train - Engine.")]
+        TrainEngine = 24,
+
+        /// <summary>
+        /// Train - Car.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Train - Car.")]
+        TrainCar = 25,
+
+        /// <summary>
+        /// Train - Caboose.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Train - Caboose.")]
+        TrainCaboose = 26,
+
+        /// <summary>
+        /// Civilian Vehicle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Civilian Vehicle.")]
+        CivilianVehicle = 27,
+
+        /// <summary>
+        /// Air Defense / Missile Defense Unit Equipment.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Defense / Missile Defense Unit Equipment.")]
+        AirDefenseMissileDefenseUnitEquipment = 28,
+
+        /// <summary>
+        /// Command, Control, Communications, and Intelligence (C3I) System.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command, Control, Communications, and Intelligence (C3I) System.")]
+        CommandControlCommunicationsAndIntelligenceC3ISystem = 29,
+
+        /// <summary>
+        /// Operations Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Operations Facility.")]
+        OperationsFacility = 30,
+
+        /// <summary>
+        /// Intelligence Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intelligence Facility.")]
+        IntelligenceFacility = 31,
+
+        /// <summary>
+        /// Surveillance Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Surveillance Facility.")]
+        SurveillanceFacility = 32,
+
+        /// <summary>
+        /// Communications Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Communications Facility.")]
+        CommunicationsFacility = 33,
+
+        /// <summary>
+        /// Command Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command Facility.")]
+        CommandFacility = 34,
+
+        /// <summary>
+        /// C4I Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("C4I Facility.")]
+        C4IFacility = 35,
+
+        /// <summary>
+        /// Control Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Control Facility.")]
+        ControlFacility = 36,
+
+        /// <summary>
+        /// Fire Control Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire Control Facility.")]
+        FireControlFacility = 37,
+
+        /// <summary>
+        /// Missile Defense Facility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missile Defense Facility.")]
+        MissileDefenseFacility = 38,
+
+        /// <summary>
+        /// Field Command Post.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Field Command Post.")]
+        FieldCommandPost = 39,
+
+        /// <summary>
+        /// Observation Post.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Observation Post.")]
+        ObservationPost = 40
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Munition.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/Munition.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Munition.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/Munition.cs
index 7673506..f2b834e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Munition.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/Munition.cs
@@ -1,159 +1,159 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for Munition (es.type.kind.2.domain, Munition Domain, 
-    /// section 4.2.1.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Munition : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Anti-Air.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Anti-Air.")]
-        AntiAir = 1,
-
-        /// <summary>
-        /// Anti-Armor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Anti-Armor.")]
-        AntiArmor = 2,
-
-        /// <summary>
-        /// Anti-Guided Weapon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Anti-Guided Weapon.")]
-        AntiGuidedWeapon = 3,
-
-        /// <summary>
-        /// Antiradar.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antiradar.")]
-        Antiradar = 4,
-
-        /// <summary>
-        /// Antisatellite.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antisatellite.")]
-        Antisatellite = 5,
-
-        /// <summary>
-        /// Antiship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antiship.")]
-        Antiship = 6,
-
-        /// <summary>
-        /// Antisubmarine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antisubmarine.")]
-        Antisubmarine = 7,
-
-        /// <summary>
-        /// Antipersonnel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Antipersonnel.")]
-        Antipersonnel = 8,
-
-        /// <summary>
-        /// Battlefield Support.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Battlefield Support.")]
-        BattlefieldSupport = 9,
-
-        /// <summary>
-        /// Strategic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strategic.")]
-        Strategic = 10,
-
-        /// <summary>
-        /// Tactical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical.")]
-        Tactical = 11,
-
-        /// <summary>
-        /// Directed Energy (DE) Weapon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Directed Energy (DE) Weapon.")]
-        DirectedEnergyDEWeapon = 12
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for Munition (es.type.kind.2.domain, Munition Domain, 
+    /// section 4.2.1.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Munition : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Anti-Air.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Anti-Air.")]
+        AntiAir = 1,
+
+        /// <summary>
+        /// Anti-Armor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Anti-Armor.")]
+        AntiArmor = 2,
+
+        /// <summary>
+        /// Anti-Guided Weapon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Anti-Guided Weapon.")]
+        AntiGuidedWeapon = 3,
+
+        /// <summary>
+        /// Antiradar.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antiradar.")]
+        Antiradar = 4,
+
+        /// <summary>
+        /// Antisatellite.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antisatellite.")]
+        Antisatellite = 5,
+
+        /// <summary>
+        /// Antiship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antiship.")]
+        Antiship = 6,
+
+        /// <summary>
+        /// Antisubmarine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antisubmarine.")]
+        Antisubmarine = 7,
+
+        /// <summary>
+        /// Antipersonnel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Antipersonnel.")]
+        Antipersonnel = 8,
+
+        /// <summary>
+        /// Battlefield Support.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Battlefield Support.")]
+        BattlefieldSupport = 9,
+
+        /// <summary>
+        /// Strategic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strategic.")]
+        Strategic = 10,
+
+        /// <summary>
+        /// Tactical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical.")]
+        Tactical = 11,
+
+        /// <summary>
+        /// Directed Energy (DE) Weapon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Directed Energy (DE) Weapon.")]
+        DirectedEnergyDEWeapon = 12
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/MunitionCategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/MunitionCategory.cs
index 72d523f..a17fa53 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/MunitionCategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/MunitionCategory.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for MunitionCategory (es.type.kind.2.cat, Munition Category, 
-    /// section 4.2.1.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum MunitionCategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Guided.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guided.")]
-        Guided = 1,
-
-        /// <summary>
-        /// Ballistic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ballistic.")]
-        Ballistic = 2,
-
-        /// <summary>
-        /// Fixed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fixed.")]
-        Fixed = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for MunitionCategory (es.type.kind.2.cat, Munition Category, 
+    /// section 4.2.1.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum MunitionCategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Guided.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guided.")]
+        Guided = 1,
+
+        /// <summary>
+        /// Ballistic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ballistic.")]
+        Ballistic = 2,
+
+        /// <summary>
+        /// Fixed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fixed.")]
+        Fixed = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Platform.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/Platform.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Platform.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/Platform.cs
index dfb1d9e..e4035aa 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/Platform.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/Platform.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for Platform (es.type.kind.1.domain, Platform Domain, 
-    /// section 4.2.1.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Platform : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Land.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Land.")]
-        Land = 1,
-
-        /// <summary>
-        /// Air.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air.")]
-        Air = 2,
-
-        /// <summary>
-        /// Surface.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Surface.")]
-        Surface = 3,
-
-        /// <summary>
-        /// Subsurface.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Subsurface.")]
-        Subsurface = 4,
-
-        /// <summary>
-        /// Space.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Space.")]
-        Space = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for Platform (es.type.kind.1.domain, Platform Domain, 
+    /// section 4.2.1.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Platform : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Land.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Land.")]
+        Land = 1,
+
+        /// <summary>
+        /// Air.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air.")]
+        Air = 2,
+
+        /// <summary>
+        /// Surface.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Surface.")]
+        Surface = 3,
+
+        /// <summary>
+        /// Subsurface.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Subsurface.")]
+        Subsurface = 4,
+
+        /// <summary>
+        /// Space.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Space.")]
+        Space = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/RadioCategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/RadioCategory.cs
index 33db707..60e3a87 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioCategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/RadioCategory.cs
@@ -1,239 +1,239 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for RadioCategory (es.type.kind.7.cat, Radio Category, 
-    /// section 4.2.1.7.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum RadioCategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Voice Transmission/Reception.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Voice Transmission/Reception.")]
-        VoiceTransmissionReception = 1,
-
-        /// <summary>
-        /// Data Link Transmission/Reception.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data Link Transmission/Reception.")]
-        DataLinkTransmissionReception = 2,
-
-        /// <summary>
-        /// Voice and Data Link Transmission/Reception.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Voice and Data Link Transmission/Reception.")]
-        VoiceAndDataLinkTransmissionReception = 3,
-
-        /// <summary>
-        /// Instrumented Landing System (ILS) Glideslope Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Instrumented Landing System (ILS) Glideslope Transmitter.")]
-        InstrumentedLandingSystemILSGlideslopeTransmitter = 4,
-
-        /// <summary>
-        /// Instrumented Landing System (ILS) Localizer Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Instrumented Landing System (ILS) Localizer Transmitter.")]
-        InstrumentedLandingSystemILSLocalizerTransmitter = 5,
-
-        /// <summary>
-        /// Instrumented Landing System (ILS) Outer Marker Beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Instrumented Landing System (ILS) Outer Marker Beacon.")]
-        InstrumentedLandingSystemILSOuterMarkerBeacon = 6,
-
-        /// <summary>
-        /// Instrumented Landing System (ILS) Middle Marker Beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Instrumented Landing System (ILS) Middle Marker Beacon.")]
-        InstrumentedLandingSystemILSMiddleMarkerBeacon = 7,
-
-        /// <summary>
-        /// Instrumented Landing System (ILS) Inner Marker Beacon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Instrumented Landing System (ILS) Inner Marker Beacon.")]
-        InstrumentedLandingSystemILSInnerMarkerBeacon = 8,
-
-        /// <summary>
-        /// Instrumented Landing System (ILS) Receiver (Platform Radio).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Instrumented Landing System (ILS) Receiver (Platform Radio).")]
-        InstrumentedLandingSystemILSReceiverPlatformRadio = 9,
-
-        /// <summary>
-        /// Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment).")]
-        TacticalAirNavigationTACANTransmitterGroundFixedEquipment = 10,
-
-        /// <summary>
-        /// Tactical Air Navigation (TACAN) Receiver (Moving Platform Equipment).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical Air Navigation (TACAN) Receiver (Moving Platform Equipment).")]
-        TacticalAirNavigationTACANReceiverMovingPlatformEquipment = 11,
-
-        /// <summary>
-        /// Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment).")]
-        TacticalAirNavigationTACANTransmitterReceiverMovingPlatformEquipment = 12,
-
-        /// <summary>
-        /// Variable Omni-Ranging (VOR) Transmitter (Ground Fixed Equipment).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Variable Omni-Ranging (VOR) Transmitter (Ground Fixed Equipment).")]
-        VariableOmniRangingVORTransmitterGroundFixedEquipment = 13,
-
-        /// <summary>
-        /// Variable Omni-Ranging (VOR) with Distance Measuring Equipment (DME) Transmitter (Ground Fixed Equipment).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Variable Omni-Ranging (VOR) with Distance Measuring Equipment (DME) Transmitter (Ground Fixed Equipment).")]
-        VariableOmniRangingVORWithDistanceMeasuringEquipmentDMETransmitterGroundFixedEquipment = 14,
-
-        /// <summary>
-        /// Combined VOR/ILS Receiver (Moving Platform Equipment).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Combined VOR/ILS Receiver (Moving Platform Equipment).")]
-        CombinedVORILSReceiverMovingPlatformEquipment = 15,
-
-        /// <summary>
-        /// Combined VOR &amp; TACAN (VORTAC) Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Combined VOR &amp; TACAN (VORTAC) Transmitter.")]
-        CombinedVORTACANVORTACTransmitter = 16,
-
-        /// <summary>
-        /// Non-Directional Beacon (NDB) Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Non-Directional Beacon (NDB) Transmitter.")]
-        NonDirectionalBeaconNDBTransmitter = 17,
-
-        /// <summary>
-        /// Non-Directional Beacon (NDB) Receiver.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Non-Directional Beacon (NDB) Receiver.")]
-        NonDirectionalBeaconNDBReceiver = 18,
-
-        /// <summary>
-        /// Non-Directional Beacon (NDB) with Distance Measuring Equipment (DME) Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Non-Directional Beacon (NDB) with Distance Measuring Equipment (DME) Transmitter.")]
-        NonDirectionalBeaconNDBWithDistanceMeasuringEquipmentDMETransmitter = 19,
-
-        /// <summary>
-        /// Distance Measuring Equipment (DME).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Distance Measuring Equipment (DME).")]
-        DistanceMeasuringEquipmentDME = 20
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for RadioCategory (es.type.kind.7.cat, Radio Category, 
+    /// section 4.2.1.7.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum RadioCategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Voice Transmission/Reception.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Voice Transmission/Reception.")]
+        VoiceTransmissionReception = 1,
+
+        /// <summary>
+        /// Data Link Transmission/Reception.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data Link Transmission/Reception.")]
+        DataLinkTransmissionReception = 2,
+
+        /// <summary>
+        /// Voice and Data Link Transmission/Reception.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Voice and Data Link Transmission/Reception.")]
+        VoiceAndDataLinkTransmissionReception = 3,
+
+        /// <summary>
+        /// Instrumented Landing System (ILS) Glideslope Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Instrumented Landing System (ILS) Glideslope Transmitter.")]
+        InstrumentedLandingSystemILSGlideslopeTransmitter = 4,
+
+        /// <summary>
+        /// Instrumented Landing System (ILS) Localizer Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Instrumented Landing System (ILS) Localizer Transmitter.")]
+        InstrumentedLandingSystemILSLocalizerTransmitter = 5,
+
+        /// <summary>
+        /// Instrumented Landing System (ILS) Outer Marker Beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Instrumented Landing System (ILS) Outer Marker Beacon.")]
+        InstrumentedLandingSystemILSOuterMarkerBeacon = 6,
+
+        /// <summary>
+        /// Instrumented Landing System (ILS) Middle Marker Beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Instrumented Landing System (ILS) Middle Marker Beacon.")]
+        InstrumentedLandingSystemILSMiddleMarkerBeacon = 7,
+
+        /// <summary>
+        /// Instrumented Landing System (ILS) Inner Marker Beacon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Instrumented Landing System (ILS) Inner Marker Beacon.")]
+        InstrumentedLandingSystemILSInnerMarkerBeacon = 8,
+
+        /// <summary>
+        /// Instrumented Landing System (ILS) Receiver (Platform Radio).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Instrumented Landing System (ILS) Receiver (Platform Radio).")]
+        InstrumentedLandingSystemILSReceiverPlatformRadio = 9,
+
+        /// <summary>
+        /// Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical Air Navigation (TACAN) Transmitter (Ground Fixed Equipment).")]
+        TacticalAirNavigationTACANTransmitterGroundFixedEquipment = 10,
+
+        /// <summary>
+        /// Tactical Air Navigation (TACAN) Receiver (Moving Platform Equipment).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical Air Navigation (TACAN) Receiver (Moving Platform Equipment).")]
+        TacticalAirNavigationTACANReceiverMovingPlatformEquipment = 11,
+
+        /// <summary>
+        /// Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical Air Navigation (TACAN) Transmitter/Receiver (Moving Platform Equipment).")]
+        TacticalAirNavigationTACANTransmitterReceiverMovingPlatformEquipment = 12,
+
+        /// <summary>
+        /// Variable Omni-Ranging (VOR) Transmitter (Ground Fixed Equipment).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Variable Omni-Ranging (VOR) Transmitter (Ground Fixed Equipment).")]
+        VariableOmniRangingVORTransmitterGroundFixedEquipment = 13,
+
+        /// <summary>
+        /// Variable Omni-Ranging (VOR) with Distance Measuring Equipment (DME) Transmitter (Ground Fixed Equipment).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Variable Omni-Ranging (VOR) with Distance Measuring Equipment (DME) Transmitter (Ground Fixed Equipment).")]
+        VariableOmniRangingVORWithDistanceMeasuringEquipmentDMETransmitterGroundFixedEquipment = 14,
+
+        /// <summary>
+        /// Combined VOR/ILS Receiver (Moving Platform Equipment).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Combined VOR/ILS Receiver (Moving Platform Equipment).")]
+        CombinedVORILSReceiverMovingPlatformEquipment = 15,
+
+        /// <summary>
+        /// Combined VOR &amp; TACAN (VORTAC) Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Combined VOR &amp; TACAN (VORTAC) Transmitter.")]
+        CombinedVORTACANVORTACTransmitter = 16,
+
+        /// <summary>
+        /// Non-Directional Beacon (NDB) Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Non-Directional Beacon (NDB) Transmitter.")]
+        NonDirectionalBeaconNDBTransmitter = 17,
+
+        /// <summary>
+        /// Non-Directional Beacon (NDB) Receiver.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Non-Directional Beacon (NDB) Receiver.")]
+        NonDirectionalBeaconNDBReceiver = 18,
+
+        /// <summary>
+        /// Non-Directional Beacon (NDB) with Distance Measuring Equipment (DME) Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Non-Directional Beacon (NDB) with Distance Measuring Equipment (DME) Transmitter.")]
+        NonDirectionalBeaconNDBWithDistanceMeasuringEquipmentDMETransmitter = 19,
+
+        /// <summary>
+        /// Distance Measuring Equipment (DME).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Distance Measuring Equipment (DME).")]
+        DistanceMeasuringEquipmentDME = 20
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/RadioNomenclature.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/RadioNomenclature.cs
index 3ad2869..3dacde2 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclature.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/RadioNomenclature.cs
@@ -1,79 +1,79 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for RadioNomenclature (es.type.kind.7.nomenclature, Radio Nomenclature, 
-    /// section 4.2.1.7.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum RadioNomenclature : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// AN/ARN-118.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ARN-118.")]
-        ANARN118 = 1,
-
-        /// <summary>
-        /// AN/ARN-139.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AN/ARN-139.")]
-        ANARN139 = 2,
-
-        /// <summary>
-        /// Generic Ground Fixed Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic Ground Fixed Transmitter.")]
-        GenericGroundFixedTransmitter = 3,
-
-        /// <summary>
-        /// Generic Ground Mobile Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic Ground Mobile Transmitter.")]
-        GenericGroundMobileTransmitter = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for RadioNomenclature (es.type.kind.7.nomenclature, Radio Nomenclature, 
+    /// section 4.2.1.7.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum RadioNomenclature : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// AN/ARN-118.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ARN-118.")]
+        ANARN118 = 1,
+
+        /// <summary>
+        /// AN/ARN-139.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AN/ARN-139.")]
+        ANARN139 = 2,
+
+        /// <summary>
+        /// Generic Ground Fixed Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic Ground Fixed Transmitter.")]
+        GenericGroundFixedTransmitter = 3,
+
+        /// <summary>
+        /// Generic Ground Mobile Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic Ground Mobile Transmitter.")]
+        GenericGroundMobileTransmitter = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
index 9955b48..d6e92e7 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/RadioNomenclatureVersion.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for RadioNomenclatureVersion (es.type.kind.7.version, Radio-Nomenclature Version, 
-    /// section 4.2.1.7.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum RadioNomenclatureVersion : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196).")]
-        JointElectronicsTypeDesignationSystemJETDSNomenclatureANPerMilSTD196 = 1,
-
-        /// <summary>
-        /// Manufacturer Designation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Manufacturer Designation.")]
-        ManufacturerDesignation = 2,
-
-        /// <summary>
-        /// National Designation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("National Designation.")]
-        NationalDesignation = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for RadioNomenclatureVersion (es.type.kind.7.version, Radio-Nomenclature Version, 
+    /// section 4.2.1.7.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum RadioNomenclatureVersion : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Joint Electronics Type Designation System (JETDS) Nomenclature (AN/ per Mil-STD-196).")]
+        JointElectronicsTypeDesignationSystemJETDSNomenclatureANPerMilSTD196 = 1,
+
+        /// <summary>
+        /// Manufacturer Designation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Manufacturer Designation.")]
+        ManufacturerDesignation = 2,
+
+        /// <summary>
+        /// National Designation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("National Designation.")]
+        NationalDesignation = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/SensorEmitterCategory.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/SensorEmitterCategory.cs
index be8967c..46e486b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SensorEmitterCategory.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/SensorEmitterCategory.cs
@@ -1,199 +1,199 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for SensorEmitterCategory (es.type.kind.9.cat, Sensor/Emitter Category, 
-    /// section 4.2.1.9.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SensorEmitterCategory : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Multi-spectral.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multi-spectral.")]
-        MultiSpectral = 1,
-
-        /// <summary>
-        /// RF Active.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RF Active.")]
-        RFActive = 2,
-
-        /// <summary>
-        /// RF Passive (intercept and DF).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RF Passive (intercept and DF).")]
-        RFPassiveInterceptAndDF = 3,
-
-        /// <summary>
-        /// Optical (direct viewing with or without optics).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Optical (direct viewing with or without optics).")]
-        OpticalDirectViewingWithOrWithoutOptics = 4,
-
-        /// <summary>
-        /// Electro-Optical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electro-Optical.")]
-        ElectroOptical = 5,
-
-        /// <summary>
-        /// Seismic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Seismic.")]
-        Seismic = 6,
-
-        /// <summary>
-        /// Chemical, point detector.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical, point detector.")]
-        ChemicalPointDetector = 7,
-
-        /// <summary>
-        /// Chemical, standoff.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical, standoff.")]
-        ChemicalStandoff = 8,
-
-        /// <summary>
-        /// Thermal (temperature sensing).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thermal (temperature sensing).")]
-        ThermalTemperatureSensing = 9,
-
-        /// <summary>
-        /// Acoustic, Active.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acoustic, Active.")]
-        AcousticActive = 10,
-
-        /// <summary>
-        /// Acoustic, Passive.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acoustic, Passive.")]
-        AcousticPassive = 11,
-
-        /// <summary>
-        /// Contact/Pressure (physical, hydrostatic, barometric).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact/Pressure (physical, hydrostatic, barometric).")]
-        ContactPressurePhysicalHydrostaticBarometric = 12,
-
-        /// <summary>
-        /// Electro-Magnetic Radiation (gamma radiation).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electro-Magnetic Radiation (gamma radiation).")]
-        ElectroMagneticRadiationGammaRadiation = 13,
-
-        /// <summary>
-        /// Particle Radiation (Neutrons, alpha, beta particles).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Particle Radiation (Neutrons, alpha, beta particles).")]
-        ParticleRadiationNeutronsAlphaBetaParticles = 14,
-
-        /// <summary>
-        /// Magnetic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Magnetic.")]
-        Magnetic = 15,
-
-        /// <summary>
-        /// Gravitational.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gravitational.")]
-        Gravitational = 16
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for SensorEmitterCategory (es.type.kind.9.cat, Sensor/Emitter Category, 
+    /// section 4.2.1.9.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SensorEmitterCategory : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Multi-spectral.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multi-spectral.")]
+        MultiSpectral = 1,
+
+        /// <summary>
+        /// RF Active.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RF Active.")]
+        RFActive = 2,
+
+        /// <summary>
+        /// RF Passive (intercept and DF).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RF Passive (intercept and DF).")]
+        RFPassiveInterceptAndDF = 3,
+
+        /// <summary>
+        /// Optical (direct viewing with or without optics).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Optical (direct viewing with or without optics).")]
+        OpticalDirectViewingWithOrWithoutOptics = 4,
+
+        /// <summary>
+        /// Electro-Optical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electro-Optical.")]
+        ElectroOptical = 5,
+
+        /// <summary>
+        /// Seismic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Seismic.")]
+        Seismic = 6,
+
+        /// <summary>
+        /// Chemical, point detector.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical, point detector.")]
+        ChemicalPointDetector = 7,
+
+        /// <summary>
+        /// Chemical, standoff.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical, standoff.")]
+        ChemicalStandoff = 8,
+
+        /// <summary>
+        /// Thermal (temperature sensing).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thermal (temperature sensing).")]
+        ThermalTemperatureSensing = 9,
+
+        /// <summary>
+        /// Acoustic, Active.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acoustic, Active.")]
+        AcousticActive = 10,
+
+        /// <summary>
+        /// Acoustic, Passive.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acoustic, Passive.")]
+        AcousticPassive = 11,
+
+        /// <summary>
+        /// Contact/Pressure (physical, hydrostatic, barometric).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact/Pressure (physical, hydrostatic, barometric).")]
+        ContactPressurePhysicalHydrostaticBarometric = 12,
+
+        /// <summary>
+        /// Electro-Magnetic Radiation (gamma radiation).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electro-Magnetic Radiation (gamma radiation).")]
+        ElectroMagneticRadiationGammaRadiation = 13,
+
+        /// <summary>
+        /// Particle Radiation (Neutrons, alpha, beta particles).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Particle Radiation (Neutrons, alpha, beta particles).")]
+        ParticleRadiationNeutronsAlphaBetaParticles = 14,
+
+        /// <summary>
+        /// Magnetic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Magnetic.")]
+        Magnetic = 15,
+
+        /// <summary>
+        /// Gravitational.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gravitational.")]
+        Gravitational = 16
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/SpacePlatform.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/SpacePlatform.cs
index 6541138..156be3b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SpacePlatform.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/SpacePlatform.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for SpacePlatform (es.type.kind.1.domain.5.cat, Platform-Space Category, 
-    /// section 4.2.1.1.3.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SpacePlatform : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Manned.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Manned.")]
-        Manned = 1,
-
-        /// <summary>
-        /// Unmanned.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unmanned.")]
-        Unmanned = 2,
-
-        /// <summary>
-        /// Booster.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Booster.")]
-        Booster = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for SpacePlatform (es.type.kind.1.domain.5.cat, Platform-Space Category, 
+    /// section 4.2.1.1.3.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SpacePlatform : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Manned.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Manned.")]
+        Manned = 1,
+
+        /// <summary>
+        /// Unmanned.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unmanned.")]
+        Unmanned = 2,
+
+        /// <summary>
+        /// Booster.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Booster.")]
+        Booster = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/SubsufracePlatform.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/SubsufracePlatform.cs
index cee487a..e106e6c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SubsufracePlatform.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/SubsufracePlatform.cs
@@ -1,109 +1,109 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for SubsufracePlatform (es.type.kind.1.domain.4.cat, Platform-Subsurface Category, 
-    /// section 4.2.1.1.3.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SubsufracePlatform : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// SSBN (Nuclear Ballistic Missile).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSBN (Nuclear Ballistic Missile).")]
-        NuclearBallisticMissile = 1,
-
-        /// <summary>
-        /// SSGN (Nuclear Guided Missile).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSGN (Nuclear Guided Missile).")]
-        NuclearGuidedMissile = 2,
-
-        /// <summary>
-        /// SSN (Nuclear Attack - Torpedo).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSN (Nuclear Attack - Torpedo).")]
-        NuclearAttackTorpedo = 3,
-
-        /// <summary>
-        /// SSG (Conventional Guided Missile).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSG (Conventional Guided Missile).")]
-        ConventionalGuidedMissile = 4,
-
-        /// <summary>
-        /// SS (Conventional Attack - Torpedo, Patrol).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SS (Conventional Attack - Torpedo, Patrol).")]
-        ConventionalAttackTorpedoPatrol = 5,
-
-        /// <summary>
-        /// SSAN (Nuclear Auxiliary).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSAN (Nuclear Auxiliary).")]
-        NuclearAuxiliary = 6,
-
-        /// <summary>
-        /// SSA (Conventional Auxiliary).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSA (Conventional Auxiliary).")]
-        ConventionalAuxiliary = 7
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for SubsufracePlatform (es.type.kind.1.domain.4.cat, Platform-Subsurface Category, 
+    /// section 4.2.1.1.3.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SubsufracePlatform : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// SSBN (Nuclear Ballistic Missile).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSBN (Nuclear Ballistic Missile).")]
+        NuclearBallisticMissile = 1,
+
+        /// <summary>
+        /// SSGN (Nuclear Guided Missile).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSGN (Nuclear Guided Missile).")]
+        NuclearGuidedMissile = 2,
+
+        /// <summary>
+        /// SSN (Nuclear Attack - Torpedo).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSN (Nuclear Attack - Torpedo).")]
+        NuclearAttackTorpedo = 3,
+
+        /// <summary>
+        /// SSG (Conventional Guided Missile).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSG (Conventional Guided Missile).")]
+        ConventionalGuidedMissile = 4,
+
+        /// <summary>
+        /// SS (Conventional Attack - Torpedo, Patrol).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SS (Conventional Attack - Torpedo, Patrol).")]
+        ConventionalAttackTorpedoPatrol = 5,
+
+        /// <summary>
+        /// SSAN (Nuclear Auxiliary).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSAN (Nuclear Auxiliary).")]
+        NuclearAuxiliary = 6,
+
+        /// <summary>
+        /// SSA (Conventional Auxiliary).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSA (Conventional Auxiliary).")]
+        ConventionalAuxiliary = 7
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/SurfacePlatform.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/SurfacePlatform.cs
index 7498a95..dc3a766 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/SurfacePlatform.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/SurfacePlatform.cs
@@ -1,359 +1,359 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for SurfacePlatform (es.type.kind.1.domain.3.cat, Platform-Surface Category, 
-    /// section 4.2.1.1.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum SurfacePlatform : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Carrier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Carrier.")]
-        Carrier = 1,
-
-        /// <summary>
-        /// Command Ship/Cruiser.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command Ship/Cruiser.")]
-        CommandShipCruiser = 2,
-
-        /// <summary>
-        /// Guided Missile Cruiser.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guided Missile Cruiser.")]
-        GuidedMissileCruiser = 3,
-
-        /// <summary>
-        /// Guided Missile Destroyer (DDG).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guided Missile Destroyer (DDG).")]
-        GuidedMissileDestroyerDDG = 4,
-
-        /// <summary>
-        /// Destroyer (DD).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Destroyer (DD).")]
-        DestroyerDD = 5,
-
-        /// <summary>
-        /// Guided Missile Frigate (FFG).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guided Missile Frigate (FFG).")]
-        GuidedMissileFrigateFFG = 6,
-
-        /// <summary>
-        /// Light/Patrol Craft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light/Patrol Craft.")]
-        LightPatrolCraft = 7,
-
-        /// <summary>
-        /// Mine Countermeasure Ship/Craft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine Countermeasure Ship/Craft.")]
-        MineCountermeasureShipCraft = 8,
-
-        /// <summary>
-        /// Dock Landing Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dock Landing Ship.")]
-        DockLandingShip = 9,
-
-        /// <summary>
-        /// Tank Landing Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tank Landing Ship.")]
-        TankLandingShip = 10,
-
-        /// <summary>
-        /// Landing Craft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Landing Craft.")]
-        LandingCraft = 11,
-
-        /// <summary>
-        /// Light Carrier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light Carrier.")]
-        LightCarrier = 12,
-
-        /// <summary>
-        /// Cruiser/Helicopter Carrier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cruiser/Helicopter Carrier.")]
-        CruiserHelicopterCarrier = 13,
-
-        /// <summary>
-        /// Hydrofoil.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hydrofoil.")]
-        Hydrofoil = 14,
-
-        /// <summary>
-        /// Air Cushion/Surface Effect.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Cushion/Surface Effect.")]
-        AirCushionSurfaceEffect = 15,
-
-        /// <summary>
-        /// Auxiliary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Auxiliary.")]
-        Auxiliary = 16,
-
-        /// <summary>
-        /// Auxiliary, Merchant Marine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Auxiliary, Merchant Marine.")]
-        AuxiliaryMerchantMarine = 17,
-
-        /// <summary>
-        /// Utility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Utility.")]
-        Utility = 18,
-
-        /// <summary>
-        /// Frigate (including Corvette).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Frigate (including Corvette).")]
-        FrigateIncludingCorvette = 50,
-
-        /// <summary>
-        /// Battleship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Battleship.")]
-        Battleship = 51,
-
-        /// <summary>
-        /// Heavy Cruiser.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heavy Cruiser.")]
-        HeavyCruiser = 52,
-
-        /// <summary>
-        /// Destroyer Tender.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Destroyer Tender.")]
-        DestroyerTender = 53,
-
-        /// <summary>
-        /// Amphibious Assault Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Amphibious Assault Ship.")]
-        AmphibiousAssaultShip = 54,
-
-        /// <summary>
-        /// Amphibious Cargo Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Amphibious Cargo Ship.")]
-        AmphibiousCargoShip = 55,
-
-        /// <summary>
-        /// Amphibious Transport Dock.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Amphibious Transport Dock.")]
-        AmphibiousTransportDock = 56,
-
-        /// <summary>
-        /// Ammunition Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ammunition Ship.")]
-        AmmunitionShip = 57,
-
-        /// <summary>
-        /// Combat Stores Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Combat Stores Ship.")]
-        CombatStoresShip = 58,
-
-        /// <summary>
-        /// Surveillance Towed Array Sonar System (SURTASS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Surveillance Towed Array Sonar System (SURTASS).")]
-        SurveillanceTowedArraySonarSystemSURTASS = 59,
-
-        /// <summary>
-        /// Fast Combat Support Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fast Combat Support Ship.")]
-        FastCombatSupportShip = 60,
-
-        /// <summary>
-        /// Non-Combatant Ship.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Non-Combatant Ship.")]
-        NonCombatantShip = 61,
-
-        /// <summary>
-        /// Coast Guard Cutters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Coast Guard Cutters.")]
-        CoastGuardCutters = 62,
-
-        /// <summary>
-        /// Coast Guard Boats.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Coast Guard Boats.")]
-        CoastGuardBoats = 63
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for SurfacePlatform (es.type.kind.1.domain.3.cat, Platform-Surface Category, 
+    /// section 4.2.1.1.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum SurfacePlatform : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Carrier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Carrier.")]
+        Carrier = 1,
+
+        /// <summary>
+        /// Command Ship/Cruiser.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command Ship/Cruiser.")]
+        CommandShipCruiser = 2,
+
+        /// <summary>
+        /// Guided Missile Cruiser.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guided Missile Cruiser.")]
+        GuidedMissileCruiser = 3,
+
+        /// <summary>
+        /// Guided Missile Destroyer (DDG).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guided Missile Destroyer (DDG).")]
+        GuidedMissileDestroyerDDG = 4,
+
+        /// <summary>
+        /// Destroyer (DD).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Destroyer (DD).")]
+        DestroyerDD = 5,
+
+        /// <summary>
+        /// Guided Missile Frigate (FFG).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guided Missile Frigate (FFG).")]
+        GuidedMissileFrigateFFG = 6,
+
+        /// <summary>
+        /// Light/Patrol Craft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light/Patrol Craft.")]
+        LightPatrolCraft = 7,
+
+        /// <summary>
+        /// Mine Countermeasure Ship/Craft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine Countermeasure Ship/Craft.")]
+        MineCountermeasureShipCraft = 8,
+
+        /// <summary>
+        /// Dock Landing Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dock Landing Ship.")]
+        DockLandingShip = 9,
+
+        /// <summary>
+        /// Tank Landing Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tank Landing Ship.")]
+        TankLandingShip = 10,
+
+        /// <summary>
+        /// Landing Craft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Landing Craft.")]
+        LandingCraft = 11,
+
+        /// <summary>
+        /// Light Carrier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light Carrier.")]
+        LightCarrier = 12,
+
+        /// <summary>
+        /// Cruiser/Helicopter Carrier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cruiser/Helicopter Carrier.")]
+        CruiserHelicopterCarrier = 13,
+
+        /// <summary>
+        /// Hydrofoil.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hydrofoil.")]
+        Hydrofoil = 14,
+
+        /// <summary>
+        /// Air Cushion/Surface Effect.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Cushion/Surface Effect.")]
+        AirCushionSurfaceEffect = 15,
+
+        /// <summary>
+        /// Auxiliary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Auxiliary.")]
+        Auxiliary = 16,
+
+        /// <summary>
+        /// Auxiliary, Merchant Marine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Auxiliary, Merchant Marine.")]
+        AuxiliaryMerchantMarine = 17,
+
+        /// <summary>
+        /// Utility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Utility.")]
+        Utility = 18,
+
+        /// <summary>
+        /// Frigate (including Corvette).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Frigate (including Corvette).")]
+        FrigateIncludingCorvette = 50,
+
+        /// <summary>
+        /// Battleship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Battleship.")]
+        Battleship = 51,
+
+        /// <summary>
+        /// Heavy Cruiser.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heavy Cruiser.")]
+        HeavyCruiser = 52,
+
+        /// <summary>
+        /// Destroyer Tender.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Destroyer Tender.")]
+        DestroyerTender = 53,
+
+        /// <summary>
+        /// Amphibious Assault Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Amphibious Assault Ship.")]
+        AmphibiousAssaultShip = 54,
+
+        /// <summary>
+        /// Amphibious Cargo Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Amphibious Cargo Ship.")]
+        AmphibiousCargoShip = 55,
+
+        /// <summary>
+        /// Amphibious Transport Dock.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Amphibious Transport Dock.")]
+        AmphibiousTransportDock = 56,
+
+        /// <summary>
+        /// Ammunition Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ammunition Ship.")]
+        AmmunitionShip = 57,
+
+        /// <summary>
+        /// Combat Stores Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Combat Stores Ship.")]
+        CombatStoresShip = 58,
+
+        /// <summary>
+        /// Surveillance Towed Array Sonar System (SURTASS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Surveillance Towed Array Sonar System (SURTASS).")]
+        SurveillanceTowedArraySonarSystemSURTASS = 59,
+
+        /// <summary>
+        /// Fast Combat Support Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fast Combat Support Ship.")]
+        FastCombatSupportShip = 60,
+
+        /// <summary>
+        /// Non-Combatant Ship.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Non-Combatant Ship.")]
+        NonCombatantShip = 61,
+
+        /// <summary>
+        /// Coast Guard Cutters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Coast Guard Cutters.")]
+        CoastGuardCutters = 62,
+
+        /// <summary>
+        /// Coast Guard Boats.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Coast Guard Boats.")]
+        CoastGuardBoats = 63
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
index 1f01266..19c70d3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/UKWeaponsForLifeForms.cs
@@ -1,149 +1,149 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for UKWeaponsForLifeForms (es.type.224.kind.3.subcat, U.K. Weapons for Life Forms Subcategory, 
-    /// section 4.2.3.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum UKWeaponsForLifeForms : byte
-    {
-        /// <summary>
-        /// LAW 80.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LAW 80.")]
-        LAW80 = 1,
-
-        /// <summary>
-        /// Blowpipe.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Blowpipe.")]
-        Blowpipe = 2,
-
-        /// <summary>
-        /// Javelin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Javelin.")]
-        Javelin = 3,
-
-        /// <summary>
-        /// 51-mm mortar.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("51-mm mortar.")]
-        _51MmMortar = 4,
-
-        /// <summary>
-        /// SLR 7.62-mm rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SLR 7.62-mm rifle.")]
-        SLR762MmRifle = 5,
-
-        /// <summary>
-        /// Sterling 9-mm submachine gun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sterling 9-mm submachine gun.")]
-        Sterling9MmSubmachineGun = 6,
-
-        /// <summary>
-        /// L7A2 general purpose MG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("L7A2 general purpose MG.")]
-        L7A2GeneralPurposeMG = 7,
-
-        /// <summary>
-        /// L6 Wombat Recoilless rifle,.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("L6 Wombat Recoilless rifle,.")]
-        L6WombatRecoillessRifle = 8,
-
-        /// <summary>
-        /// Carl Gustav 89-mm recoilless rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Carl Gustav 89-mm recoilless rifle.")]
-        CarlGustav89MmRecoillessRifle = 9,
-
-        /// <summary>
-        /// SA80 Individual/light support weapon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SA80 Individual/light support weapon.")]
-        SA80IndividualLightSupportWeapon = 10,
-
-        /// <summary>
-        /// Trigat.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trigat.")]
-        Trigat = 11,
-
-        /// <summary>
-        /// Milan AT missile.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Milan AT missile.")]
-        MilanATMissile = 12
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for UKWeaponsForLifeForms (es.type.224.kind.3.subcat, U.K. Weapons for Life Forms Subcategory, 
+    /// section 4.2.3.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum UKWeaponsForLifeForms : byte
+    {
+        /// <summary>
+        /// LAW 80.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LAW 80.")]
+        LAW80 = 1,
+
+        /// <summary>
+        /// Blowpipe.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Blowpipe.")]
+        Blowpipe = 2,
+
+        /// <summary>
+        /// Javelin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Javelin.")]
+        Javelin = 3,
+
+        /// <summary>
+        /// 51-mm mortar.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("51-mm mortar.")]
+        _51MmMortar = 4,
+
+        /// <summary>
+        /// SLR 7.62-mm rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SLR 7.62-mm rifle.")]
+        SLR762MmRifle = 5,
+
+        /// <summary>
+        /// Sterling 9-mm submachine gun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sterling 9-mm submachine gun.")]
+        Sterling9MmSubmachineGun = 6,
+
+        /// <summary>
+        /// L7A2 general purpose MG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("L7A2 general purpose MG.")]
+        L7A2GeneralPurposeMG = 7,
+
+        /// <summary>
+        /// L6 Wombat Recoilless rifle,.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("L6 Wombat Recoilless rifle,.")]
+        L6WombatRecoillessRifle = 8,
+
+        /// <summary>
+        /// Carl Gustav 89-mm recoilless rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Carl Gustav 89-mm recoilless rifle.")]
+        CarlGustav89MmRecoillessRifle = 9,
+
+        /// <summary>
+        /// SA80 Individual/light support weapon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SA80 Individual/light support weapon.")]
+        SA80IndividualLightSupportWeapon = 10,
+
+        /// <summary>
+        /// Trigat.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trigat.")]
+        Trigat = 11,
+
+        /// <summary>
+        /// Milan AT missile.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Milan AT missile.")]
+        MilanATMissile = 12
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs b/Libs/CsharpDis6/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
rename to Libs/CsharpDis6/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
index 1ae7d3e..e720bc8 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState.Type/USWeaponsForLifeForms.cs
@@ -1,1249 +1,1249 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState.Type
-{
-    /// <summary>
-    /// Enumeration values for USWeaponsForLifeForms (es.type.225.kind.3.subcat, U.S. Weapons for Life Forms Subcategory, 
-    /// section 4.2.3.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum USWeaponsForLifeForms : byte
-    {
-        /// <summary>
-        /// Assault machine pistol, KF-AMP.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Assault machine pistol, KF-AMP.")]
-        AssaultMachinePistolKFAMP = 1,
-
-        /// <summary>
-        /// Automatic model 1911A1 .45.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Automatic model 1911A1 .45.")]
-        AutomaticModel1911A145 = 2,
-
-        /// <summary>
-        /// Combat Master Mark VI .45, Detronics.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Combat Master Mark VI .45, Detronics.")]
-        CombatMasterMarkVI45Detronics = 3,
-
-        /// <summary>
-        /// De-cocker KP90DC .45.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("De-cocker KP90DC .45.")]
-        DeCockerKP90DC45 = 4,
-
-        /// <summary>
-        /// De-cocker KP91DC .40.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("De-cocker KP91DC .40.")]
-        DeCockerKP91DC40 = 5,
-
-        /// <summary>
-        /// General officer's Model 15 .45.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("General officer's Model 15 .45.")]
-        GeneralOfficerSModel1545 = 6,
-
-        /// <summary>
-        /// Nova 9-mm, LaFrance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nova 9-mm, LaFrance.")]
-        Nova9MmLaFrance = 7,
-
-        /// <summary>
-        /// Personal Defense Weapon MP5K-PDW 9-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Personal Defense Weapon MP5K-PDW 9-mm.")]
-        PersonalDefenseWeaponMP5KPDW9Mm = 8,
-
-        /// <summary>
-        /// Silenced Colt .45, LaFrance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Silenced Colt .45, LaFrance.")]
-        SilencedColt45LaFrance = 9,
-
-        /// <summary>
-        /// 5900-series 9-mm, Smith &amp; Wesson (S&amp;W).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("5900-series 9-mm, Smith &amp; Wesson (S&amp;W).")]
-        _5900Series9MmSmithWessonSW = 10,
-
-        /// <summary>
-        /// M9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M9.")]
-        M9 = 11,
-
-        /// <summary>
-        /// Model 1911A1, Springfield Armory.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Model 1911A1, Springfield Armory.")]
-        Model1911A1SpringfieldArmory = 12,
-
-        /// <summary>
-        /// Model 2000 9-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Model 2000 9-mm.")]
-        Model20009Mm = 13,
-
-        /// <summary>
-        /// P-9 9-mm, Springfield Armory.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("P-9 9-mm, Springfield Armory.")]
-        P99MmSpringfieldArmory = 14,
-
-        /// <summary>
-        /// P-12 9-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("P-12 9-mm.")]
-        P129Mm = 15,
-
-        /// <summary>
-        /// P-85 Mark II 9-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("P-85 Mark II 9-mm, Ruger.")]
-        P85MarkII9MmRuger = 16,
-
-        /// <summary>
-        /// Advanced Combat Rifle 5.56-mm, AAI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Advanced Combat Rifle 5.56-mm, AAI.")]
-        AdvancedCombatRifle556MmAAI = 17,
-
-        /// <summary>
-        /// Commando assault rifle, Model 733 5.56-mm, Colt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Commando assault rifle, Model 733 5.56-mm, Colt.")]
-        CommandoAssaultRifleModel733556MmColt = 18,
-
-        /// <summary>
-        /// Infantry rifle, Mini-14/20 GB 5.56-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Infantry rifle, Mini-14/20 GB 5.56-mm, Ruger.")]
-        InfantryRifleMini1420GB556MmRuger = 19,
-
-        /// <summary>
-        /// Mini-14 5.56-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mini-14 5.56-mm, Ruger.")]
-        Mini14556MmRuger = 20,
-
-        /// <summary>
-        /// Mini Thirty 7.62-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mini Thirty 7.62-mm, Ruger.")]
-        MiniThirty762MmRuger = 21,
-
-        /// <summary>
-        /// Semi-automatic model 82A2 .50, Barrett.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Semi-automatic model 82A2 .50, Barrett.")]
-        SemiAutomaticModel82A250Barrett = 22,
-
-        /// <summary>
-        /// Sniper Weapon System M24 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sniper Weapon System M24 7.62-mm.")]
-        SniperWeaponSystemM24762Mm = 23,
-
-        /// <summary>
-        /// Sniping rifle M21, Springfield Armory.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sniping rifle M21, Springfield Armory.")]
-        SnipingRifleM21SpringfieldArmory = 24,
-
-        /// <summary>
-        /// Sniping rifle M40A1 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sniping rifle M40A1 7.62-mm.")]
-        SnipingRifleM40A1762Mm = 25,
-
-        /// <summary>
-        /// Sniping rifle M600 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sniping rifle M600 7.62-mm.")]
-        SnipingRifleM600762Mm = 26,
-
-        /// <summary>
-        /// AR-15 (M16) 5.56-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AR-15 (M16) 5.56-mm.")]
-        AR15M16556Mm = 27,
-
-        /// <summary>
-        /// M1 .30.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M1 .30.")]
-        M130 = 28,
-
-        /// <summary>
-        /// M14 7.62-mm, NATO.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M14 7.62-mm, NATO.")]
-        M14762MmNATO = 29,
-
-        /// <summary>
-        /// M14 (M1A, M1A1-A1), Springfield Armory.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M14 (M1A, M1A1-A1), Springfield Armory.")]
-        M14M1AM1A1A1SpringfieldArmory = 30,
-
-        /// <summary>
-        /// M14K assault rifle, LaFrance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M14K assault rifle, LaFrance.")]
-        M14KAssaultRifleLaFrance = 31,
-
-        /// <summary>
-        /// M16A2 assault rifle 5.56-mm, Colt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M16A2 assault rifle 5.56-mm, Colt.")]
-        M16A2AssaultRifle556MmColt = 32,
-
-        /// <summary>
-        /// M21 7.62-mm, U.S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M21 7.62-mm, U.S.")]
-        M21762MmUS = 33,
-
-        /// <summary>
-        /// M77 Mark II 5.56-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M77 Mark II 5.56-mm, Ruger.")]
-        M77MarkII556MmRuger = 34,
-
-        /// <summary>
-        /// M77V 7.62-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M77V 7.62-mm, Ruger.")]
-        M77V762MmRuger = 35,
-
-        /// <summary>
-        /// S-16 7.62 x 36-mm, Grendel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("S-16 7.62 x 36-mm, Grendel.")]
-        S16762X36MmGrendel = 36,
-
-        /// <summary>
-        /// SAR-8 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SAR-8 7.62-mm.")]
-        SAR8762Mm = 37,
-
-        /// <summary>
-        /// SAR-4800 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SAR-4800 7.62-mm.")]
-        SAR4800762Mm = 38,
-
-        /// <summary>
-        /// Assault carbine M16K, LaFrance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Assault carbine M16K, LaFrance.")]
-        AssaultCarbineM16KLaFrance = 39,
-
-        /// <summary>
-        /// M1 .30.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M1 .30.")]
-        M130_40 = 40,
-
-        /// <summary>
-        /// M4 (Model 720) 5.56-mm, Colt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M4 (Model 720) 5.56-mm, Colt.")]
-        M4Model720556MmColt = 41,
-
-        /// <summary>
-        /// M-900 9-mm, Calico.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M-900 9-mm, Calico.")]
-        M9009MmCalico = 42,
-
-        /// <summary>
-        /// AC-556F 5.56-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AC-556F 5.56-mm, Ruger.")]
-        AC556F556MmRuger = 43,
-
-        /// <summary>
-        /// M3 .45.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M3 .45.")]
-        M345 = 44,
-
-        /// <summary>
-        /// M11, Cobray.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M11, Cobray.")]
-        M11Cobray = 45,
-
-        /// <summary>
-        /// M951 9-mm, Calico.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M951 9-mm, Calico.")]
-        M9519MmCalico = 46,
-
-        /// <summary>
-        /// MP5/10 10-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MP5/10 10-mm.")]
-        MP51010Mm = 47,
-
-        /// <summary>
-        /// 9-mm, Colt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("9-mm, Colt.")]
-        _9MmColt = 48,
-
-        /// <summary>
-        /// Ingram.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ingram.")]
-        Ingram = 49,
-
-        /// <summary>
-        /// Externally powered (EPG) 7.62-mm, Ares.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Externally powered (EPG) 7.62-mm, Ares.")]
-        ExternallyPoweredEPG762MmAres = 50,
-
-        /// <summary>
-        /// GECAL 50.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GECAL 50.")]
-        GECAL50 = 51,
-
-        /// <summary>
-        /// General purpose M60 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("General purpose M60 7.62-mm.")]
-        GeneralPurposeM60762Mm = 52,
-
-        /// <summary>
-        /// Heavy M2HB-QCB .50, RAMO.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heavy M2HB-QCB .50, RAMO.")]
-        HeavyM2HBQCB50RAMO = 53,
-
-        /// <summary>
-        /// Light assault M60E3 (Enhanced) 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light assault M60E3 (Enhanced) 7.62-mm.")]
-        LightAssaultM60E3Enhanced762Mm = 54,
-
-        /// <summary>
-        /// Light M16A2 5.56-mm, Colt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light M16A2 5.56-mm, Colt.")]
-        LightM16A2556MmColt = 55,
-
-        /// <summary>
-        /// Light 5.56-mm, Ares.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light 5.56-mm, Ares.")]
-        Light556MmAres = 56,
-
-        /// <summary>
-        /// Lightweight M2 .50, RAMO.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lightweight M2 .50, RAMO.")]
-        LightweightM250RAMO = 57,
-
-        /// <summary>
-        /// Lightweight assault M60E3 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lightweight assault M60E3 7.62-mm.")]
-        LightweightAssaultM60E3762Mm = 58,
-
-        /// <summary>
-        /// Minigun M134 7.62-mm, General Electric.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minigun M134 7.62-mm, General Electric.")]
-        MinigunM134762MmGeneralElectric = 59,
-
-        /// <summary>
-        /// MG system MK19 Mod 3, 40-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MG system MK19 Mod 3, 40-mm.")]
-        MGSystemMK19Mod340Mm = 60,
-
-        /// <summary>
-        /// MG system (or kit) M2HB QCB .50, Saco Defense.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MG system (or kit) M2HB QCB .50, Saco Defense.")]
-        MGSystemOrKitM2HBQCB50SacoDefense = 61,
-
-        /// <summary>
-        /// M1919A4 .30-cal, Browning.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M1919A4 .30-cal, Browning.")]
-        M1919A430CalBrowning = 62,
-
-        /// <summary>
-        /// .50-cal, Browning.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description(".50-cal, Browning.")]
-        _50CalBrowning = 63,
-
-        /// <summary>
-        /// Colored-smoke hand grenade M18.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Colored-smoke hand grenade M18.")]
-        ColoredSmokeHandGrenadeM18 = 64,
-
-        /// <summary>
-        /// Colored-smoke grenades, Federal Laboratories.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Colored-smoke grenades, Federal Laboratories.")]
-        ColoredSmokeGrenadesFederalLaboratories = 65,
-
-        /// <summary>
-        /// Infrared smoke grenade M76.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Infrared smoke grenade M76.")]
-        InfraredSmokeGrenadeM76 = 66,
-
-        /// <summary>
-        /// Smoke hand grenade AN-M8 HC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Smoke hand grenade AN-M8 HC.")]
-        SmokeHandGrenadeANM8HC = 67,
-
-        /// <summary>
-        /// Delay fragmentation hand grenade M61.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Delay fragmentation hand grenade M61.")]
-        DelayFragmentationHandGrenadeM61 = 68,
-
-        /// <summary>
-        /// Delay fragmentation hand grenade M67.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Delay fragmentation hand grenade M67.")]
-        DelayFragmentationHandGrenadeM67 = 69,
-
-        /// <summary>
-        /// Impact fragmentation hand grenade M57.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Impact fragmentation hand grenade M57.")]
-        ImpactFragmentationHandGrenadeM57 = 70,
-
-        /// <summary>
-        /// Impact fragmentation hand grenade M68.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Impact fragmentation hand grenade M68.")]
-        ImpactFragmentationHandGrenadeM68 = 71,
-
-        /// <summary>
-        /// Incendiary hand grenade AN-M14 TH3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Incendiary hand grenade AN-M14 TH3.")]
-        IncendiaryHandGrenadeANM14TH3 = 72,
-
-        /// <summary>
-        /// Launcher I-M203 40-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Launcher I-M203 40-mm.")]
-        LauncherIM20340Mm = 73,
-
-        /// <summary>
-        /// Launcher M79 40-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Launcher M79 40-mm.")]
-        LauncherM7940Mm = 74,
-
-        /// <summary>
-        /// Multiple grenade launcher MM-1 40-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multiple grenade launcher MM-1 40-mm.")]
-        MultipleGrenadeLauncherMM140Mm = 75,
-
-        /// <summary>
-        /// Multi-shot portable flame weapon M202A2 66-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multi-shot portable flame weapon M202A2 66-mm.")]
-        MultiShotPortableFlameWeaponM202A266Mm = 76,
-
-        /// <summary>
-        /// Portable ABC-M9-7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Portable ABC-M9-7.")]
-        PortableABCM97 = 77,
-
-        /// <summary>
-        /// Portable M2A1-7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Portable M2A1-7.")]
-        PortableM2A17 = 78,
-
-        /// <summary>
-        /// Portable M9E1-7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Portable M9E1-7.")]
-        PortableM9E17 = 79,
-
-        /// <summary>
-        /// Dragon medium anti-armor missile, M47, FGM-77A.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dragon medium anti-armor missile, M47, FGM-77A.")]
-        DragonMediumAntiArmorMissileM47FGM77A = 80,
-
-        /// <summary>
-        /// Javelin AAWS-M.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Javelin AAWS-M.")]
-        JavelinAAWSM = 81,
-
-        /// <summary>
-        /// Light Antitank Weapon M72 (LAW II).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light Antitank Weapon M72 (LAW II).")]
-        LightAntitankWeaponM72LAWII = 82,
-
-        /// <summary>
-        /// Redeye, FIM-43, General Dynamics.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Redeye, FIM-43, General Dynamics.")]
-        RedeyeFIM43GeneralDynamics = 83,
-
-        /// <summary>
-        /// Saber dual-purpose missile system.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Saber dual-purpose missile system.")]
-        SaberDualPurposeMissileSystem = 84,
-
-        /// <summary>
-        /// Stinger, FIM-92, General Dynamics.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stinger, FIM-92, General Dynamics.")]
-        StingerFIM92GeneralDynamics = 85,
-
-        /// <summary>
-        /// TOW heavy antitank weapon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TOW heavy antitank weapon.")]
-        TOWHeavyAntitankWeapon = 86,
-
-        /// <summary>
-        /// Bear Trap AP device, Pancor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bear Trap AP device, Pancor.")]
-        BearTrapAPDevicePancor = 87,
-
-        /// <summary>
-        /// Chain Gun automatic weapon EX-34 7.62-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chain Gun automatic weapon EX-34 7.62-mm.")]
-        ChainGunAutomaticWeaponEX34762Mm = 88,
-
-        /// <summary>
-        /// Close Assault Weapon System (CAWS), AAI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Close Assault Weapon System (CAWS), AAI.")]
-        CloseAssaultWeaponSystemCAWSAAI = 89,
-
-        /// <summary>
-        /// CAWS, Olin/Heckler and Koch.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CAWS, Olin/Heckler and Koch.")]
-        CAWSOlinHecklerAndKoch = 90,
-
-        /// <summary>
-        /// Crossfire SAM Model 88.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Crossfire SAM Model 88.")]
-        CrossfireSAMModel88 = 91,
-
-        /// <summary>
-        /// Dragon and M16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dragon and M16.")]
-        DragonAndM16 = 92,
-
-        /// <summary>
-        /// Firing port weapon M231, 5.56-mm, Colt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Firing port weapon M231, 5.56-mm, Colt.")]
-        FiringPortWeaponM231556MmColt = 93,
-
-        /// <summary>
-        /// Foxhole Digger Explosive Kit (EXFODA).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Foxhole Digger Explosive Kit (EXFODA).")]
-        FoxholeDiggerExplosiveKitEXFODA = 94,
-
-        /// <summary>
-        /// Infantry Support Weapon ASP-30 {RM} 30-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Infantry Support Weapon ASP-30 {RM} 30-mm.")]
-        InfantrySupportWeaponASP30RM30Mm = 95,
-
-        /// <summary>
-        /// Jackhammer Mk 3-A2, Pancor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jackhammer Mk 3-A2, Pancor.")]
-        JackhammerMk3A2Pancor = 96,
-
-        /// <summary>
-        /// Light anti-armor weapon M136 (AT4).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Light anti-armor weapon M136 (AT4).")]
-        LightAntiArmorWeaponM136AT4 = 97,
-
-        /// <summary>
-        /// M26A2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M26A2.")]
-        M26A2 = 98,
-
-        /// <summary>
-        /// Master Key S.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Master Key S.")]
-        MasterKeyS = 99,
-
-        /// <summary>
-        /// Minigun 5.56-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minigun 5.56-mm.")]
-        Minigun556Mm = 100,
-
-        /// <summary>
-        /// Multipurpose Individual Munition (MPIM), Marquardt.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multipurpose Individual Munition (MPIM), Marquardt.")]
-        MultipurposeIndividualMunitionMPIMMarquardt = 101,
-
-        /// <summary>
-        /// Multipurpose weapon AT8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multipurpose weapon AT8.")]
-        MultipurposeWeaponAT8 = 102,
-
-        /// <summary>
-        /// Recoilless rifle M40, M40A2, and M40A4; 106-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Recoilless rifle M40, M40A2, and M40A4; 106-mm.")]
-        RecoillessRifleM40M40A2AndM40A4106Mm = 103,
-
-        /// <summary>
-        /// Recoilless rifle M67, 90-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Recoilless rifle M67, 90-mm.")]
-        RecoillessRifleM6790Mm = 104,
-
-        /// <summary>
-        /// Revolver, SP 101.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Revolver, SP 101.")]
-        RevolverSP101 = 105,
-
-        /// <summary>
-        /// Revolver, Super Redhawk .44 magnum, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Revolver, Super Redhawk .44 magnum, Ruger.")]
-        RevolverSuperRedhawk44MagnumRuger = 106,
-
-        /// <summary>
-        /// RAW rocket, 140-mm, Brunswick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RAW rocket, 140-mm, Brunswick.")]
-        RAWRocket140MmBrunswick = 107,
-
-        /// <summary>
-        /// Rifle-launcher Anti-Armor Munition (RAAM), Olin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rifle-launcher Anti-Armor Munition (RAAM), Olin.")]
-        RifleLauncherAntiArmorMunitionRAAMOlin = 108,
-
-        /// <summary>
-        /// Rocket launcher M-20 3.5-in.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rocket launcher M-20 3.5-in.")]
-        RocketLauncherM2035In = 109,
-
-        /// <summary>
-        /// Rocket launcher, Enhanced M72 E series HEAT, 66-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rocket launcher, Enhanced M72 E series HEAT, 66-mm.")]
-        RocketLauncherEnhancedM72ESeriesHEAT66Mm = 110,
-
-        /// <summary>
-        /// Selective fire weapon AC-556 5.56-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selective fire weapon AC-556 5.56-mm, Ruger.")]
-        SelectiveFireWeaponAC556556MmRuger = 111,
-
-        /// <summary>
-        /// Selective fire weapon AC-556F 5.56-mm, Ruger.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Selective fire weapon AC-556F 5.56-mm, Ruger.")]
-        SelectiveFireWeaponAC556F556MmRuger = 112,
-
-        /// <summary>
-        /// Shotgun M870 Mk 1 (U.S. Marine Corps), Remington.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Shotgun M870 Mk 1 (U.S. Marine Corps), Remington.")]
-        ShotgunM870Mk1USMarineCorpsRemington = 113,
-
-        /// <summary>
-        /// SMAW Mk 193, 83-mm, McDonnell-Douglas.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMAW Mk 193, 83-mm, McDonnell-Douglas.")]
-        SMAWMk19383MmMcDonnellDouglas = 114,
-
-        /// <summary>
-        /// SMAW-D: Disposable SMAW.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SMAW-D: Disposable SMAW.")]
-        SMAWDDisposableSMAW = 115,
-
-        /// <summary>
-        /// Squad Automatic Weapon (SAW) M249 5.56-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Squad Automatic Weapon (SAW) M249 5.56-mm.")]
-        SquadAutomaticWeaponSAWM249556Mm = 116,
-
-        /// <summary>
-        /// Tactical Support Weapon 50/12, .50-cal, Peregrine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical Support Weapon 50/12, .50-cal, Peregrine.")]
-        TacticalSupportWeapon501250CalPeregrine = 117,
-
-        /// <summary>
-        /// Telescoped Ammunition Revolver Gun (TARG) .50-cal, Ares.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Telescoped Ammunition Revolver Gun (TARG) .50-cal, Ares.")]
-        TelescopedAmmunitionRevolverGunTARG50CalAres = 118,
-
-        /// <summary>
-        /// Ultimate over-under combination, Ciener.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ultimate over-under combination, Ciener.")]
-        UltimateOverUnderCombinationCiener = 119,
-
-        /// <summary>
-        /// M18A1 Claymore mine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M18A1 Claymore mine.")]
-        M18A1ClaymoreMine = 120,
-
-        /// <summary>
-        /// Mortar 81-mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mortar 81-mm.")]
-        Mortar81Mm = 121,
-
-        /// <summary>
-        /// Machinegun M240 7.62mm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Machinegun M240 7.62mm.")]
-        MachinegunM240762mm = 134
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState.Type
+{
+    /// <summary>
+    /// Enumeration values for USWeaponsForLifeForms (es.type.225.kind.3.subcat, U.S. Weapons for Life Forms Subcategory, 
+    /// section 4.2.3.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum USWeaponsForLifeForms : byte
+    {
+        /// <summary>
+        /// Assault machine pistol, KF-AMP.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Assault machine pistol, KF-AMP.")]
+        AssaultMachinePistolKFAMP = 1,
+
+        /// <summary>
+        /// Automatic model 1911A1 .45.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Automatic model 1911A1 .45.")]
+        AutomaticModel1911A145 = 2,
+
+        /// <summary>
+        /// Combat Master Mark VI .45, Detronics.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Combat Master Mark VI .45, Detronics.")]
+        CombatMasterMarkVI45Detronics = 3,
+
+        /// <summary>
+        /// De-cocker KP90DC .45.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("De-cocker KP90DC .45.")]
+        DeCockerKP90DC45 = 4,
+
+        /// <summary>
+        /// De-cocker KP91DC .40.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("De-cocker KP91DC .40.")]
+        DeCockerKP91DC40 = 5,
+
+        /// <summary>
+        /// General officer's Model 15 .45.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("General officer's Model 15 .45.")]
+        GeneralOfficerSModel1545 = 6,
+
+        /// <summary>
+        /// Nova 9-mm, LaFrance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nova 9-mm, LaFrance.")]
+        Nova9MmLaFrance = 7,
+
+        /// <summary>
+        /// Personal Defense Weapon MP5K-PDW 9-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Personal Defense Weapon MP5K-PDW 9-mm.")]
+        PersonalDefenseWeaponMP5KPDW9Mm = 8,
+
+        /// <summary>
+        /// Silenced Colt .45, LaFrance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Silenced Colt .45, LaFrance.")]
+        SilencedColt45LaFrance = 9,
+
+        /// <summary>
+        /// 5900-series 9-mm, Smith &amp; Wesson (S&amp;W).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("5900-series 9-mm, Smith &amp; Wesson (S&amp;W).")]
+        _5900Series9MmSmithWessonSW = 10,
+
+        /// <summary>
+        /// M9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M9.")]
+        M9 = 11,
+
+        /// <summary>
+        /// Model 1911A1, Springfield Armory.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Model 1911A1, Springfield Armory.")]
+        Model1911A1SpringfieldArmory = 12,
+
+        /// <summary>
+        /// Model 2000 9-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Model 2000 9-mm.")]
+        Model20009Mm = 13,
+
+        /// <summary>
+        /// P-9 9-mm, Springfield Armory.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("P-9 9-mm, Springfield Armory.")]
+        P99MmSpringfieldArmory = 14,
+
+        /// <summary>
+        /// P-12 9-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("P-12 9-mm.")]
+        P129Mm = 15,
+
+        /// <summary>
+        /// P-85 Mark II 9-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("P-85 Mark II 9-mm, Ruger.")]
+        P85MarkII9MmRuger = 16,
+
+        /// <summary>
+        /// Advanced Combat Rifle 5.56-mm, AAI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Advanced Combat Rifle 5.56-mm, AAI.")]
+        AdvancedCombatRifle556MmAAI = 17,
+
+        /// <summary>
+        /// Commando assault rifle, Model 733 5.56-mm, Colt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Commando assault rifle, Model 733 5.56-mm, Colt.")]
+        CommandoAssaultRifleModel733556MmColt = 18,
+
+        /// <summary>
+        /// Infantry rifle, Mini-14/20 GB 5.56-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Infantry rifle, Mini-14/20 GB 5.56-mm, Ruger.")]
+        InfantryRifleMini1420GB556MmRuger = 19,
+
+        /// <summary>
+        /// Mini-14 5.56-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mini-14 5.56-mm, Ruger.")]
+        Mini14556MmRuger = 20,
+
+        /// <summary>
+        /// Mini Thirty 7.62-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mini Thirty 7.62-mm, Ruger.")]
+        MiniThirty762MmRuger = 21,
+
+        /// <summary>
+        /// Semi-automatic model 82A2 .50, Barrett.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Semi-automatic model 82A2 .50, Barrett.")]
+        SemiAutomaticModel82A250Barrett = 22,
+
+        /// <summary>
+        /// Sniper Weapon System M24 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sniper Weapon System M24 7.62-mm.")]
+        SniperWeaponSystemM24762Mm = 23,
+
+        /// <summary>
+        /// Sniping rifle M21, Springfield Armory.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sniping rifle M21, Springfield Armory.")]
+        SnipingRifleM21SpringfieldArmory = 24,
+
+        /// <summary>
+        /// Sniping rifle M40A1 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sniping rifle M40A1 7.62-mm.")]
+        SnipingRifleM40A1762Mm = 25,
+
+        /// <summary>
+        /// Sniping rifle M600 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sniping rifle M600 7.62-mm.")]
+        SnipingRifleM600762Mm = 26,
+
+        /// <summary>
+        /// AR-15 (M16) 5.56-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AR-15 (M16) 5.56-mm.")]
+        AR15M16556Mm = 27,
+
+        /// <summary>
+        /// M1 .30.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M1 .30.")]
+        M130 = 28,
+
+        /// <summary>
+        /// M14 7.62-mm, NATO.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M14 7.62-mm, NATO.")]
+        M14762MmNATO = 29,
+
+        /// <summary>
+        /// M14 (M1A, M1A1-A1), Springfield Armory.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M14 (M1A, M1A1-A1), Springfield Armory.")]
+        M14M1AM1A1A1SpringfieldArmory = 30,
+
+        /// <summary>
+        /// M14K assault rifle, LaFrance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M14K assault rifle, LaFrance.")]
+        M14KAssaultRifleLaFrance = 31,
+
+        /// <summary>
+        /// M16A2 assault rifle 5.56-mm, Colt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M16A2 assault rifle 5.56-mm, Colt.")]
+        M16A2AssaultRifle556MmColt = 32,
+
+        /// <summary>
+        /// M21 7.62-mm, U.S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M21 7.62-mm, U.S.")]
+        M21762MmUS = 33,
+
+        /// <summary>
+        /// M77 Mark II 5.56-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M77 Mark II 5.56-mm, Ruger.")]
+        M77MarkII556MmRuger = 34,
+
+        /// <summary>
+        /// M77V 7.62-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M77V 7.62-mm, Ruger.")]
+        M77V762MmRuger = 35,
+
+        /// <summary>
+        /// S-16 7.62 x 36-mm, Grendel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("S-16 7.62 x 36-mm, Grendel.")]
+        S16762X36MmGrendel = 36,
+
+        /// <summary>
+        /// SAR-8 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SAR-8 7.62-mm.")]
+        SAR8762Mm = 37,
+
+        /// <summary>
+        /// SAR-4800 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SAR-4800 7.62-mm.")]
+        SAR4800762Mm = 38,
+
+        /// <summary>
+        /// Assault carbine M16K, LaFrance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Assault carbine M16K, LaFrance.")]
+        AssaultCarbineM16KLaFrance = 39,
+
+        /// <summary>
+        /// M1 .30.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M1 .30.")]
+        M130_40 = 40,
+
+        /// <summary>
+        /// M4 (Model 720) 5.56-mm, Colt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M4 (Model 720) 5.56-mm, Colt.")]
+        M4Model720556MmColt = 41,
+
+        /// <summary>
+        /// M-900 9-mm, Calico.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M-900 9-mm, Calico.")]
+        M9009MmCalico = 42,
+
+        /// <summary>
+        /// AC-556F 5.56-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AC-556F 5.56-mm, Ruger.")]
+        AC556F556MmRuger = 43,
+
+        /// <summary>
+        /// M3 .45.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M3 .45.")]
+        M345 = 44,
+
+        /// <summary>
+        /// M11, Cobray.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M11, Cobray.")]
+        M11Cobray = 45,
+
+        /// <summary>
+        /// M951 9-mm, Calico.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M951 9-mm, Calico.")]
+        M9519MmCalico = 46,
+
+        /// <summary>
+        /// MP5/10 10-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MP5/10 10-mm.")]
+        MP51010Mm = 47,
+
+        /// <summary>
+        /// 9-mm, Colt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("9-mm, Colt.")]
+        _9MmColt = 48,
+
+        /// <summary>
+        /// Ingram.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ingram.")]
+        Ingram = 49,
+
+        /// <summary>
+        /// Externally powered (EPG) 7.62-mm, Ares.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Externally powered (EPG) 7.62-mm, Ares.")]
+        ExternallyPoweredEPG762MmAres = 50,
+
+        /// <summary>
+        /// GECAL 50.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GECAL 50.")]
+        GECAL50 = 51,
+
+        /// <summary>
+        /// General purpose M60 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("General purpose M60 7.62-mm.")]
+        GeneralPurposeM60762Mm = 52,
+
+        /// <summary>
+        /// Heavy M2HB-QCB .50, RAMO.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heavy M2HB-QCB .50, RAMO.")]
+        HeavyM2HBQCB50RAMO = 53,
+
+        /// <summary>
+        /// Light assault M60E3 (Enhanced) 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light assault M60E3 (Enhanced) 7.62-mm.")]
+        LightAssaultM60E3Enhanced762Mm = 54,
+
+        /// <summary>
+        /// Light M16A2 5.56-mm, Colt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light M16A2 5.56-mm, Colt.")]
+        LightM16A2556MmColt = 55,
+
+        /// <summary>
+        /// Light 5.56-mm, Ares.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light 5.56-mm, Ares.")]
+        Light556MmAres = 56,
+
+        /// <summary>
+        /// Lightweight M2 .50, RAMO.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lightweight M2 .50, RAMO.")]
+        LightweightM250RAMO = 57,
+
+        /// <summary>
+        /// Lightweight assault M60E3 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lightweight assault M60E3 7.62-mm.")]
+        LightweightAssaultM60E3762Mm = 58,
+
+        /// <summary>
+        /// Minigun M134 7.62-mm, General Electric.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minigun M134 7.62-mm, General Electric.")]
+        MinigunM134762MmGeneralElectric = 59,
+
+        /// <summary>
+        /// MG system MK19 Mod 3, 40-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MG system MK19 Mod 3, 40-mm.")]
+        MGSystemMK19Mod340Mm = 60,
+
+        /// <summary>
+        /// MG system (or kit) M2HB QCB .50, Saco Defense.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MG system (or kit) M2HB QCB .50, Saco Defense.")]
+        MGSystemOrKitM2HBQCB50SacoDefense = 61,
+
+        /// <summary>
+        /// M1919A4 .30-cal, Browning.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M1919A4 .30-cal, Browning.")]
+        M1919A430CalBrowning = 62,
+
+        /// <summary>
+        /// .50-cal, Browning.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description(".50-cal, Browning.")]
+        _50CalBrowning = 63,
+
+        /// <summary>
+        /// Colored-smoke hand grenade M18.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Colored-smoke hand grenade M18.")]
+        ColoredSmokeHandGrenadeM18 = 64,
+
+        /// <summary>
+        /// Colored-smoke grenades, Federal Laboratories.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Colored-smoke grenades, Federal Laboratories.")]
+        ColoredSmokeGrenadesFederalLaboratories = 65,
+
+        /// <summary>
+        /// Infrared smoke grenade M76.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Infrared smoke grenade M76.")]
+        InfraredSmokeGrenadeM76 = 66,
+
+        /// <summary>
+        /// Smoke hand grenade AN-M8 HC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Smoke hand grenade AN-M8 HC.")]
+        SmokeHandGrenadeANM8HC = 67,
+
+        /// <summary>
+        /// Delay fragmentation hand grenade M61.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Delay fragmentation hand grenade M61.")]
+        DelayFragmentationHandGrenadeM61 = 68,
+
+        /// <summary>
+        /// Delay fragmentation hand grenade M67.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Delay fragmentation hand grenade M67.")]
+        DelayFragmentationHandGrenadeM67 = 69,
+
+        /// <summary>
+        /// Impact fragmentation hand grenade M57.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Impact fragmentation hand grenade M57.")]
+        ImpactFragmentationHandGrenadeM57 = 70,
+
+        /// <summary>
+        /// Impact fragmentation hand grenade M68.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Impact fragmentation hand grenade M68.")]
+        ImpactFragmentationHandGrenadeM68 = 71,
+
+        /// <summary>
+        /// Incendiary hand grenade AN-M14 TH3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Incendiary hand grenade AN-M14 TH3.")]
+        IncendiaryHandGrenadeANM14TH3 = 72,
+
+        /// <summary>
+        /// Launcher I-M203 40-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Launcher I-M203 40-mm.")]
+        LauncherIM20340Mm = 73,
+
+        /// <summary>
+        /// Launcher M79 40-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Launcher M79 40-mm.")]
+        LauncherM7940Mm = 74,
+
+        /// <summary>
+        /// Multiple grenade launcher MM-1 40-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multiple grenade launcher MM-1 40-mm.")]
+        MultipleGrenadeLauncherMM140Mm = 75,
+
+        /// <summary>
+        /// Multi-shot portable flame weapon M202A2 66-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multi-shot portable flame weapon M202A2 66-mm.")]
+        MultiShotPortableFlameWeaponM202A266Mm = 76,
+
+        /// <summary>
+        /// Portable ABC-M9-7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Portable ABC-M9-7.")]
+        PortableABCM97 = 77,
+
+        /// <summary>
+        /// Portable M2A1-7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Portable M2A1-7.")]
+        PortableM2A17 = 78,
+
+        /// <summary>
+        /// Portable M9E1-7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Portable M9E1-7.")]
+        PortableM9E17 = 79,
+
+        /// <summary>
+        /// Dragon medium anti-armor missile, M47, FGM-77A.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dragon medium anti-armor missile, M47, FGM-77A.")]
+        DragonMediumAntiArmorMissileM47FGM77A = 80,
+
+        /// <summary>
+        /// Javelin AAWS-M.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Javelin AAWS-M.")]
+        JavelinAAWSM = 81,
+
+        /// <summary>
+        /// Light Antitank Weapon M72 (LAW II).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light Antitank Weapon M72 (LAW II).")]
+        LightAntitankWeaponM72LAWII = 82,
+
+        /// <summary>
+        /// Redeye, FIM-43, General Dynamics.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Redeye, FIM-43, General Dynamics.")]
+        RedeyeFIM43GeneralDynamics = 83,
+
+        /// <summary>
+        /// Saber dual-purpose missile system.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Saber dual-purpose missile system.")]
+        SaberDualPurposeMissileSystem = 84,
+
+        /// <summary>
+        /// Stinger, FIM-92, General Dynamics.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stinger, FIM-92, General Dynamics.")]
+        StingerFIM92GeneralDynamics = 85,
+
+        /// <summary>
+        /// TOW heavy antitank weapon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TOW heavy antitank weapon.")]
+        TOWHeavyAntitankWeapon = 86,
+
+        /// <summary>
+        /// Bear Trap AP device, Pancor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bear Trap AP device, Pancor.")]
+        BearTrapAPDevicePancor = 87,
+
+        /// <summary>
+        /// Chain Gun automatic weapon EX-34 7.62-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chain Gun automatic weapon EX-34 7.62-mm.")]
+        ChainGunAutomaticWeaponEX34762Mm = 88,
+
+        /// <summary>
+        /// Close Assault Weapon System (CAWS), AAI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Close Assault Weapon System (CAWS), AAI.")]
+        CloseAssaultWeaponSystemCAWSAAI = 89,
+
+        /// <summary>
+        /// CAWS, Olin/Heckler and Koch.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CAWS, Olin/Heckler and Koch.")]
+        CAWSOlinHecklerAndKoch = 90,
+
+        /// <summary>
+        /// Crossfire SAM Model 88.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Crossfire SAM Model 88.")]
+        CrossfireSAMModel88 = 91,
+
+        /// <summary>
+        /// Dragon and M16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dragon and M16.")]
+        DragonAndM16 = 92,
+
+        /// <summary>
+        /// Firing port weapon M231, 5.56-mm, Colt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Firing port weapon M231, 5.56-mm, Colt.")]
+        FiringPortWeaponM231556MmColt = 93,
+
+        /// <summary>
+        /// Foxhole Digger Explosive Kit (EXFODA).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Foxhole Digger Explosive Kit (EXFODA).")]
+        FoxholeDiggerExplosiveKitEXFODA = 94,
+
+        /// <summary>
+        /// Infantry Support Weapon ASP-30 {RM} 30-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Infantry Support Weapon ASP-30 {RM} 30-mm.")]
+        InfantrySupportWeaponASP30RM30Mm = 95,
+
+        /// <summary>
+        /// Jackhammer Mk 3-A2, Pancor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jackhammer Mk 3-A2, Pancor.")]
+        JackhammerMk3A2Pancor = 96,
+
+        /// <summary>
+        /// Light anti-armor weapon M136 (AT4).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Light anti-armor weapon M136 (AT4).")]
+        LightAntiArmorWeaponM136AT4 = 97,
+
+        /// <summary>
+        /// M26A2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M26A2.")]
+        M26A2 = 98,
+
+        /// <summary>
+        /// Master Key S.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Master Key S.")]
+        MasterKeyS = 99,
+
+        /// <summary>
+        /// Minigun 5.56-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minigun 5.56-mm.")]
+        Minigun556Mm = 100,
+
+        /// <summary>
+        /// Multipurpose Individual Munition (MPIM), Marquardt.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multipurpose Individual Munition (MPIM), Marquardt.")]
+        MultipurposeIndividualMunitionMPIMMarquardt = 101,
+
+        /// <summary>
+        /// Multipurpose weapon AT8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multipurpose weapon AT8.")]
+        MultipurposeWeaponAT8 = 102,
+
+        /// <summary>
+        /// Recoilless rifle M40, M40A2, and M40A4; 106-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Recoilless rifle M40, M40A2, and M40A4; 106-mm.")]
+        RecoillessRifleM40M40A2AndM40A4106Mm = 103,
+
+        /// <summary>
+        /// Recoilless rifle M67, 90-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Recoilless rifle M67, 90-mm.")]
+        RecoillessRifleM6790Mm = 104,
+
+        /// <summary>
+        /// Revolver, SP 101.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Revolver, SP 101.")]
+        RevolverSP101 = 105,
+
+        /// <summary>
+        /// Revolver, Super Redhawk .44 magnum, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Revolver, Super Redhawk .44 magnum, Ruger.")]
+        RevolverSuperRedhawk44MagnumRuger = 106,
+
+        /// <summary>
+        /// RAW rocket, 140-mm, Brunswick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RAW rocket, 140-mm, Brunswick.")]
+        RAWRocket140MmBrunswick = 107,
+
+        /// <summary>
+        /// Rifle-launcher Anti-Armor Munition (RAAM), Olin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rifle-launcher Anti-Armor Munition (RAAM), Olin.")]
+        RifleLauncherAntiArmorMunitionRAAMOlin = 108,
+
+        /// <summary>
+        /// Rocket launcher M-20 3.5-in.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rocket launcher M-20 3.5-in.")]
+        RocketLauncherM2035In = 109,
+
+        /// <summary>
+        /// Rocket launcher, Enhanced M72 E series HEAT, 66-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rocket launcher, Enhanced M72 E series HEAT, 66-mm.")]
+        RocketLauncherEnhancedM72ESeriesHEAT66Mm = 110,
+
+        /// <summary>
+        /// Selective fire weapon AC-556 5.56-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selective fire weapon AC-556 5.56-mm, Ruger.")]
+        SelectiveFireWeaponAC556556MmRuger = 111,
+
+        /// <summary>
+        /// Selective fire weapon AC-556F 5.56-mm, Ruger.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Selective fire weapon AC-556F 5.56-mm, Ruger.")]
+        SelectiveFireWeaponAC556F556MmRuger = 112,
+
+        /// <summary>
+        /// Shotgun M870 Mk 1 (U.S. Marine Corps), Remington.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Shotgun M870 Mk 1 (U.S. Marine Corps), Remington.")]
+        ShotgunM870Mk1USMarineCorpsRemington = 113,
+
+        /// <summary>
+        /// SMAW Mk 193, 83-mm, McDonnell-Douglas.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMAW Mk 193, 83-mm, McDonnell-Douglas.")]
+        SMAWMk19383MmMcDonnellDouglas = 114,
+
+        /// <summary>
+        /// SMAW-D: Disposable SMAW.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SMAW-D: Disposable SMAW.")]
+        SMAWDDisposableSMAW = 115,
+
+        /// <summary>
+        /// Squad Automatic Weapon (SAW) M249 5.56-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Squad Automatic Weapon (SAW) M249 5.56-mm.")]
+        SquadAutomaticWeaponSAWM249556Mm = 116,
+
+        /// <summary>
+        /// Tactical Support Weapon 50/12, .50-cal, Peregrine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical Support Weapon 50/12, .50-cal, Peregrine.")]
+        TacticalSupportWeapon501250CalPeregrine = 117,
+
+        /// <summary>
+        /// Telescoped Ammunition Revolver Gun (TARG) .50-cal, Ares.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Telescoped Ammunition Revolver Gun (TARG) .50-cal, Ares.")]
+        TelescopedAmmunitionRevolverGunTARG50CalAres = 118,
+
+        /// <summary>
+        /// Ultimate over-under combination, Ciener.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ultimate over-under combination, Ciener.")]
+        UltimateOverUnderCombinationCiener = 119,
+
+        /// <summary>
+        /// M18A1 Claymore mine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M18A1 Claymore mine.")]
+        M18A1ClaymoreMine = 120,
+
+        /// <summary>
+        /// Mortar 81-mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mortar 81-mm.")]
+        Mortar81Mm = 121,
+
+        /// <summary>
+        /// Machinegun M240 7.62mm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Machinegun M240 7.62mm.")]
+        MachinegunM240762mm = 134
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs b/Libs/CsharpDis6/Enumerations/EntityState/ArticulatedPartIndex.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs
rename to Libs/CsharpDis6/Enumerations/EntityState/ArticulatedPartIndex.cs
index a372f9f..2dbd909 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartIndex.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState/ArticulatedPartIndex.cs
@@ -1,1419 +1,1419 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState
-{
-    /// <summary>
-    /// Enumeration values for ArticulatedPartIndex (es.vp.type.0.articulated.index, Articulated parts index number, 
-    /// section 4.7.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArticulatedPartIndex : uint
-    {
-        /// <summary>
-        /// rudder.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("rudder.")]
-        Rudder = 1024,
-
-        /// <summary>
-        /// left flap.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("left flap.")]
-        LeftFlap = 1056,
-
-        /// <summary>
-        /// right flap.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("right flap.")]
-        RightFlap = 1088,
-
-        /// <summary>
-        /// left aileron.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("left aileron.")]
-        LeftAileron = 1120,
-
-        /// <summary>
-        /// right aileron.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("right aileron.")]
-        RightAileron = 1152,
-
-        /// <summary>
-        /// helicopter - main rotor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("helicopter - main rotor.")]
-        HelicopterMainRotor = 1184,
-
-        /// <summary>
-        /// helicopter - tail rotor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("helicopter - tail rotor.")]
-        HelicopterTailRotor = 1216,
-
-        /// <summary>
-        /// other Aircraft Control Surfaces defined as needed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("other Aircraft Control Surfaces defined as needed.")]
-        OtherAircraftControlSurfacesDefinedAsNeeded = 1248,
-
-        /// <summary>
-        /// periscope.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("periscope.")]
-        Periscope = 2048,
-
-        /// <summary>
-        /// generic antenna.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("generic antenna.")]
-        GenericAntenna = 2080,
-
-        /// <summary>
-        /// snorkel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("snorkel.")]
-        Snorkel = 2112,
-
-        /// <summary>
-        /// other extendible parts defined as needed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("other extendible parts defined as needed.")]
-        OtherExtendiblePartsDefinedAsNeeded = 2144,
-
-        /// <summary>
-        /// landing gear.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("landing gear.")]
-        LandingGear = 3072,
-
-        /// <summary>
-        /// tail hook.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("tail hook.")]
-        TailHook = 3104,
-
-        /// <summary>
-        /// speed brake.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("speed brake.")]
-        SpeedBrake = 3136,
-
-        /// <summary>
-        /// left weapon bay door.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("left weapon bay door.")]
-        LeftWeaponBayDoor = 3168,
-
-        /// <summary>
-        /// right weapon bay doors.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("right weapon bay doors.")]
-        RightWeaponBayDoors = 3200,
-
-        /// <summary>
-        /// tank or APC hatch.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("tank or APC hatch.")]
-        TankOrAPCHatch = 3232,
-
-        /// <summary>
-        /// wingsweep.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("wingsweep.")]
-        Wingsweep = 3264,
-
-        /// <summary>
-        /// Bridge launcher.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bridge launcher.")]
-        BridgeLauncher = 3296,
-
-        /// <summary>
-        /// Bridge section 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bridge section 1.")]
-        BridgeSection1 = 3328,
-
-        /// <summary>
-        /// Bridge section 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bridge section 2.")]
-        BridgeSection2 = 3360,
-
-        /// <summary>
-        /// Bridge section 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bridge section 3.")]
-        BridgeSection3 = 3392,
-
-        /// <summary>
-        /// Primary blade 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary blade 1.")]
-        PrimaryBlade1 = 3424,
-
-        /// <summary>
-        /// Primary blade 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary blade 2.")]
-        PrimaryBlade2 = 3456,
-
-        /// <summary>
-        /// Primary boom.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary boom.")]
-        PrimaryBoom = 3488,
-
-        /// <summary>
-        /// Primary launcher arm.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher arm.")]
-        PrimaryLauncherArm = 3520,
-
-        /// <summary>
-        /// other fixed position parts defined as needed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("other fixed position parts defined as needed.")]
-        OtherFixedPositionPartsDefinedAsNeeded = 3552,
-
-        /// <summary>
-        /// Primary turret number 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 1.")]
-        PrimaryTurretNumber1 = 4096,
-
-        /// <summary>
-        /// Primary turret number 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 2.")]
-        PrimaryTurretNumber2 = 4128,
-
-        /// <summary>
-        /// Primary turret number 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 3.")]
-        PrimaryTurretNumber3 = 4160,
-
-        /// <summary>
-        /// Primary turret number 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 4.")]
-        PrimaryTurretNumber4 = 4192,
-
-        /// <summary>
-        /// Primary turret number 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 5.")]
-        PrimaryTurretNumber5 = 4224,
-
-        /// <summary>
-        /// Primary turret number 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 6.")]
-        PrimaryTurretNumber6 = 4256,
-
-        /// <summary>
-        /// Primary turret number 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 7.")]
-        PrimaryTurretNumber7 = 4288,
-
-        /// <summary>
-        /// Primary turret number 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 8.")]
-        PrimaryTurretNumber8 = 4320,
-
-        /// <summary>
-        /// Primary turret number 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 9.")]
-        PrimaryTurretNumber9 = 4352,
-
-        /// <summary>
-        /// Primary turret number 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary turret number 10.")]
-        PrimaryTurretNumber10 = 4384,
-
-        /// <summary>
-        /// Primary gun number 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 1.")]
-        PrimaryGunNumber1 = 4416,
-
-        /// <summary>
-        /// Primary gun number 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 2.")]
-        PrimaryGunNumber2 = 4448,
-
-        /// <summary>
-        /// Primary gun number 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 3.")]
-        PrimaryGunNumber3 = 4480,
-
-        /// <summary>
-        /// Primary gun number 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 4.")]
-        PrimaryGunNumber4 = 4512,
-
-        /// <summary>
-        /// Primary gun number 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 5.")]
-        PrimaryGunNumber5 = 4544,
-
-        /// <summary>
-        /// Primary gun number 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 6.")]
-        PrimaryGunNumber6 = 4576,
-
-        /// <summary>
-        /// Primary gun number 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 7.")]
-        PrimaryGunNumber7 = 4608,
-
-        /// <summary>
-        /// Primary gun number 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 8.")]
-        PrimaryGunNumber8 = 4640,
-
-        /// <summary>
-        /// Primary gun number 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 9.")]
-        PrimaryGunNumber9 = 4672,
-
-        /// <summary>
-        /// Primary gun number 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary gun number 10.")]
-        PrimaryGunNumber10 = 4704,
-
-        /// <summary>
-        /// Primary launcher 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 1.")]
-        PrimaryLauncher1 = 4736,
-
-        /// <summary>
-        /// Primary launcher 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 2.")]
-        PrimaryLauncher2 = 4768,
-
-        /// <summary>
-        /// Primary launcher 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 3.")]
-        PrimaryLauncher3 = 4800,
-
-        /// <summary>
-        /// Primary launcher 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 4.")]
-        PrimaryLauncher4 = 4832,
-
-        /// <summary>
-        /// Primary launcher 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 5.")]
-        PrimaryLauncher5 = 4864,
-
-        /// <summary>
-        /// Primary launcher 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 6.")]
-        PrimaryLauncher6 = 4896,
-
-        /// <summary>
-        /// Primary launcher 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 7.")]
-        PrimaryLauncher7 = 4928,
-
-        /// <summary>
-        /// Primary launcher 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 8.")]
-        PrimaryLauncher8 = 4960,
-
-        /// <summary>
-        /// Primary launcher 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 9.")]
-        PrimaryLauncher9 = 4992,
-
-        /// <summary>
-        /// Primary launcher 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary launcher 10.")]
-        PrimaryLauncher10 = 5024,
-
-        /// <summary>
-        /// Primary defense systems 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 1.")]
-        PrimaryDefenseSystems1 = 5056,
-
-        /// <summary>
-        /// Primary defense systems 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 2.")]
-        PrimaryDefenseSystems2 = 5088,
-
-        /// <summary>
-        /// Primary defense systems 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 3.")]
-        PrimaryDefenseSystems3 = 5120,
-
-        /// <summary>
-        /// Primary defense systems 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 4.")]
-        PrimaryDefenseSystems4 = 5152,
-
-        /// <summary>
-        /// Primary defense systems 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 5.")]
-        PrimaryDefenseSystems5 = 5184,
-
-        /// <summary>
-        /// Primary defense systems 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 6.")]
-        PrimaryDefenseSystems6 = 5216,
-
-        /// <summary>
-        /// Primary defense systems 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 7.")]
-        PrimaryDefenseSystems7 = 5248,
-
-        /// <summary>
-        /// Primary defense systems 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 8.")]
-        PrimaryDefenseSystems8 = 5280,
-
-        /// <summary>
-        /// Primary defense systems 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 9.")]
-        PrimaryDefenseSystems9 = 5312,
-
-        /// <summary>
-        /// Primary defense systems 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary defense systems 10.")]
-        PrimaryDefenseSystems10 = 5344,
-
-        /// <summary>
-        /// Primary radar 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 1.")]
-        PrimaryRadar1 = 5376,
-
-        /// <summary>
-        /// Primary radar 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 2.")]
-        PrimaryRadar2 = 5408,
-
-        /// <summary>
-        /// Primary radar 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 3.")]
-        PrimaryRadar3 = 5440,
-
-        /// <summary>
-        /// Primary radar 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 4.")]
-        PrimaryRadar4 = 5472,
-
-        /// <summary>
-        /// Primary radar 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 5.")]
-        PrimaryRadar5 = 5504,
-
-        /// <summary>
-        /// Primary radar 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 6.")]
-        PrimaryRadar6 = 5536,
-
-        /// <summary>
-        /// Primary radar 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 7.")]
-        PrimaryRadar7 = 5568,
-
-        /// <summary>
-        /// Primary radar 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 8.")]
-        PrimaryRadar8 = 5600,
-
-        /// <summary>
-        /// Primary radar 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 9.")]
-        PrimaryRadar9 = 5632,
-
-        /// <summary>
-        /// Primary radar 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary radar 10.")]
-        PrimaryRadar10 = 5664,
-
-        /// <summary>
-        /// Secondary turret number 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 1.")]
-        SecondaryTurretNumber1 = 5696,
-
-        /// <summary>
-        /// Secondary turret number 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 2.")]
-        SecondaryTurretNumber2 = 5728,
-
-        /// <summary>
-        /// Secondary turret number 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 3.")]
-        SecondaryTurretNumber3 = 5760,
-
-        /// <summary>
-        /// Secondary turret number 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 4.")]
-        SecondaryTurretNumber4 = 5792,
-
-        /// <summary>
-        /// Secondary turret number 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 5.")]
-        SecondaryTurretNumber5 = 5824,
-
-        /// <summary>
-        /// Secondary turret number 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 6.")]
-        SecondaryTurretNumber6 = 5856,
-
-        /// <summary>
-        /// Secondary turret number 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 7.")]
-        SecondaryTurretNumber7 = 5888,
-
-        /// <summary>
-        /// Secondary turret number 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 8.")]
-        SecondaryTurretNumber8 = 5920,
-
-        /// <summary>
-        /// Secondary turret number 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 9.")]
-        SecondaryTurretNumber9 = 5952,
-
-        /// <summary>
-        /// Secondary turret number 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary turret number 10.")]
-        SecondaryTurretNumber10 = 5984,
-
-        /// <summary>
-        /// Secondary gun number 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 1.")]
-        SecondaryGunNumber1 = 6016,
-
-        /// <summary>
-        /// Secondary gun number 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 2.")]
-        SecondaryGunNumber2 = 6048,
-
-        /// <summary>
-        /// Secondary gun number 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 3.")]
-        SecondaryGunNumber3 = 6080,
-
-        /// <summary>
-        /// Secondary gun number 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 4.")]
-        SecondaryGunNumber4 = 6112,
-
-        /// <summary>
-        /// Secondary gun number 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 5.")]
-        SecondaryGunNumber5 = 6144,
-
-        /// <summary>
-        /// Secondary gun number 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 6.")]
-        SecondaryGunNumber6 = 6176,
-
-        /// <summary>
-        /// Secondary gun number 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 7.")]
-        SecondaryGunNumber7 = 6208,
-
-        /// <summary>
-        /// Secondary gun number 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 8.")]
-        SecondaryGunNumber8 = 6240,
-
-        /// <summary>
-        /// Secondary gun number 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 9.")]
-        SecondaryGunNumber9 = 6272,
-
-        /// <summary>
-        /// Secondary gun number 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary gun number 10.")]
-        SecondaryGunNumber10 = 6304,
-
-        /// <summary>
-        /// Secondary launcher 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 1.")]
-        SecondaryLauncher1 = 6336,
-
-        /// <summary>
-        /// Secondary launcher 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 2.")]
-        SecondaryLauncher2 = 6368,
-
-        /// <summary>
-        /// Secondary launcher 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 3.")]
-        SecondaryLauncher3 = 6400,
-
-        /// <summary>
-        /// Secondary launcher 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 4.")]
-        SecondaryLauncher4 = 6432,
-
-        /// <summary>
-        /// Secondary launcher 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 5.")]
-        SecondaryLauncher5 = 6464,
-
-        /// <summary>
-        /// Secondary launcher 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 6.")]
-        SecondaryLauncher6 = 6496,
-
-        /// <summary>
-        /// Secondary launcher 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 7.")]
-        SecondaryLauncher7 = 6528,
-
-        /// <summary>
-        /// Secondary launcher 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 8.")]
-        SecondaryLauncher8 = 6560,
-
-        /// <summary>
-        /// Secondary launcher 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 9.")]
-        SecondaryLauncher9 = 6592,
-
-        /// <summary>
-        /// Secondary launcher 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary launcher 10.")]
-        SecondaryLauncher10 = 6624,
-
-        /// <summary>
-        /// Secondary defense systems 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 1.")]
-        SecondaryDefenseSystems1 = 6656,
-
-        /// <summary>
-        /// Secondary defense systems 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 2.")]
-        SecondaryDefenseSystems2 = 6688,
-
-        /// <summary>
-        /// Secondary defense systems 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 3.")]
-        SecondaryDefenseSystems3 = 6720,
-
-        /// <summary>
-        /// Secondary defense systems 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 4.")]
-        SecondaryDefenseSystems4 = 6752,
-
-        /// <summary>
-        /// Secondary defense systems 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 5.")]
-        SecondaryDefenseSystems5 = 6784,
-
-        /// <summary>
-        /// Secondary defense systems 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 6.")]
-        SecondaryDefenseSystems6 = 6816,
-
-        /// <summary>
-        /// Secondary defense systems 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 7.")]
-        SecondaryDefenseSystems7 = 6848,
-
-        /// <summary>
-        /// Secondary defense systems 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 8.")]
-        SecondaryDefenseSystems8 = 6880,
-
-        /// <summary>
-        /// Secondary defense systems 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 9.")]
-        SecondaryDefenseSystems9 = 6912,
-
-        /// <summary>
-        /// Secondary defense systems 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary defense systems 10.")]
-        SecondaryDefenseSystems10 = 6944,
-
-        /// <summary>
-        /// Secondary radar 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 1.")]
-        SecondaryRadar1 = 6976,
-
-        /// <summary>
-        /// Secondary radar 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 2.")]
-        SecondaryRadar2 = 7008,
-
-        /// <summary>
-        /// Secondary radar 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 3.")]
-        SecondaryRadar3 = 7040,
-
-        /// <summary>
-        /// Secondary radar 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 4.")]
-        SecondaryRadar4 = 7072,
-
-        /// <summary>
-        /// Secondary radar 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 5.")]
-        SecondaryRadar5 = 7104,
-
-        /// <summary>
-        /// Secondary radar 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 6.")]
-        SecondaryRadar6 = 7136,
-
-        /// <summary>
-        /// Secondary radar 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 7.")]
-        SecondaryRadar7 = 7168,
-
-        /// <summary>
-        /// Secondary radar 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 8.")]
-        SecondaryRadar8 = 7200,
-
-        /// <summary>
-        /// Secondary radar 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 9.")]
-        SecondaryRadar9 = 7232,
-
-        /// <summary>
-        /// Secondary radar 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary radar 10.")]
-        SecondaryRadar10 = 7264,
-
-        /// <summary>
-        /// Deck Elevator #1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Deck Elevator #1.")]
-        DeckElevator1 = 7296,
-
-        /// <summary>
-        /// Deck Elevator #2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Deck Elevator #2.")]
-        DeckElevator2 = 7328,
-
-        /// <summary>
-        /// Catapult #1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Catapult #1.")]
-        Catapult1 = 7360,
-
-        /// <summary>
-        /// Catapult #2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Catapult #2.")]
-        Catapult2 = 7392,
-
-        /// <summary>
-        /// Jet Blast Deflector #1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jet Blast Deflector #1.")]
-        JetBlastDeflector1 = 7424,
-
-        /// <summary>
-        /// Jet Blast Deflector #2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Jet Blast Deflector #2.")]
-        JetBlastDeflector2 = 7456,
-
-        /// <summary>
-        /// Arrestor Wires #1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Arrestor Wires #1.")]
-        ArrestorWires1 = 7488,
-
-        /// <summary>
-        /// Arrestor Wires #2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Arrestor Wires #2.")]
-        ArrestorWires2 = 7520,
-
-        /// <summary>
-        /// Arrestor Wires #3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Arrestor Wires #3.")]
-        ArrestorWires3 = 7552,
-
-        /// <summary>
-        /// Wing (or rotor) fold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wing (or rotor) fold.")]
-        WingOrRotorFold = 7584,
-
-        /// <summary>
-        /// Fuselage fold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage fold.")]
-        FuselageFold = 7616
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState
+{
+    /// <summary>
+    /// Enumeration values for ArticulatedPartIndex (es.vp.type.0.articulated.index, Articulated parts index number, 
+    /// section 4.7.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArticulatedPartIndex : uint
+    {
+        /// <summary>
+        /// rudder.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("rudder.")]
+        Rudder = 1024,
+
+        /// <summary>
+        /// left flap.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("left flap.")]
+        LeftFlap = 1056,
+
+        /// <summary>
+        /// right flap.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("right flap.")]
+        RightFlap = 1088,
+
+        /// <summary>
+        /// left aileron.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("left aileron.")]
+        LeftAileron = 1120,
+
+        /// <summary>
+        /// right aileron.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("right aileron.")]
+        RightAileron = 1152,
+
+        /// <summary>
+        /// helicopter - main rotor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("helicopter - main rotor.")]
+        HelicopterMainRotor = 1184,
+
+        /// <summary>
+        /// helicopter - tail rotor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("helicopter - tail rotor.")]
+        HelicopterTailRotor = 1216,
+
+        /// <summary>
+        /// other Aircraft Control Surfaces defined as needed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("other Aircraft Control Surfaces defined as needed.")]
+        OtherAircraftControlSurfacesDefinedAsNeeded = 1248,
+
+        /// <summary>
+        /// periscope.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("periscope.")]
+        Periscope = 2048,
+
+        /// <summary>
+        /// generic antenna.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("generic antenna.")]
+        GenericAntenna = 2080,
+
+        /// <summary>
+        /// snorkel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("snorkel.")]
+        Snorkel = 2112,
+
+        /// <summary>
+        /// other extendible parts defined as needed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("other extendible parts defined as needed.")]
+        OtherExtendiblePartsDefinedAsNeeded = 2144,
+
+        /// <summary>
+        /// landing gear.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("landing gear.")]
+        LandingGear = 3072,
+
+        /// <summary>
+        /// tail hook.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("tail hook.")]
+        TailHook = 3104,
+
+        /// <summary>
+        /// speed brake.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("speed brake.")]
+        SpeedBrake = 3136,
+
+        /// <summary>
+        /// left weapon bay door.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("left weapon bay door.")]
+        LeftWeaponBayDoor = 3168,
+
+        /// <summary>
+        /// right weapon bay doors.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("right weapon bay doors.")]
+        RightWeaponBayDoors = 3200,
+
+        /// <summary>
+        /// tank or APC hatch.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("tank or APC hatch.")]
+        TankOrAPCHatch = 3232,
+
+        /// <summary>
+        /// wingsweep.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("wingsweep.")]
+        Wingsweep = 3264,
+
+        /// <summary>
+        /// Bridge launcher.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bridge launcher.")]
+        BridgeLauncher = 3296,
+
+        /// <summary>
+        /// Bridge section 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bridge section 1.")]
+        BridgeSection1 = 3328,
+
+        /// <summary>
+        /// Bridge section 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bridge section 2.")]
+        BridgeSection2 = 3360,
+
+        /// <summary>
+        /// Bridge section 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bridge section 3.")]
+        BridgeSection3 = 3392,
+
+        /// <summary>
+        /// Primary blade 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary blade 1.")]
+        PrimaryBlade1 = 3424,
+
+        /// <summary>
+        /// Primary blade 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary blade 2.")]
+        PrimaryBlade2 = 3456,
+
+        /// <summary>
+        /// Primary boom.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary boom.")]
+        PrimaryBoom = 3488,
+
+        /// <summary>
+        /// Primary launcher arm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher arm.")]
+        PrimaryLauncherArm = 3520,
+
+        /// <summary>
+        /// other fixed position parts defined as needed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("other fixed position parts defined as needed.")]
+        OtherFixedPositionPartsDefinedAsNeeded = 3552,
+
+        /// <summary>
+        /// Primary turret number 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 1.")]
+        PrimaryTurretNumber1 = 4096,
+
+        /// <summary>
+        /// Primary turret number 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 2.")]
+        PrimaryTurretNumber2 = 4128,
+
+        /// <summary>
+        /// Primary turret number 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 3.")]
+        PrimaryTurretNumber3 = 4160,
+
+        /// <summary>
+        /// Primary turret number 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 4.")]
+        PrimaryTurretNumber4 = 4192,
+
+        /// <summary>
+        /// Primary turret number 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 5.")]
+        PrimaryTurretNumber5 = 4224,
+
+        /// <summary>
+        /// Primary turret number 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 6.")]
+        PrimaryTurretNumber6 = 4256,
+
+        /// <summary>
+        /// Primary turret number 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 7.")]
+        PrimaryTurretNumber7 = 4288,
+
+        /// <summary>
+        /// Primary turret number 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 8.")]
+        PrimaryTurretNumber8 = 4320,
+
+        /// <summary>
+        /// Primary turret number 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 9.")]
+        PrimaryTurretNumber9 = 4352,
+
+        /// <summary>
+        /// Primary turret number 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary turret number 10.")]
+        PrimaryTurretNumber10 = 4384,
+
+        /// <summary>
+        /// Primary gun number 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 1.")]
+        PrimaryGunNumber1 = 4416,
+
+        /// <summary>
+        /// Primary gun number 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 2.")]
+        PrimaryGunNumber2 = 4448,
+
+        /// <summary>
+        /// Primary gun number 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 3.")]
+        PrimaryGunNumber3 = 4480,
+
+        /// <summary>
+        /// Primary gun number 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 4.")]
+        PrimaryGunNumber4 = 4512,
+
+        /// <summary>
+        /// Primary gun number 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 5.")]
+        PrimaryGunNumber5 = 4544,
+
+        /// <summary>
+        /// Primary gun number 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 6.")]
+        PrimaryGunNumber6 = 4576,
+
+        /// <summary>
+        /// Primary gun number 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 7.")]
+        PrimaryGunNumber7 = 4608,
+
+        /// <summary>
+        /// Primary gun number 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 8.")]
+        PrimaryGunNumber8 = 4640,
+
+        /// <summary>
+        /// Primary gun number 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 9.")]
+        PrimaryGunNumber9 = 4672,
+
+        /// <summary>
+        /// Primary gun number 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary gun number 10.")]
+        PrimaryGunNumber10 = 4704,
+
+        /// <summary>
+        /// Primary launcher 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 1.")]
+        PrimaryLauncher1 = 4736,
+
+        /// <summary>
+        /// Primary launcher 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 2.")]
+        PrimaryLauncher2 = 4768,
+
+        /// <summary>
+        /// Primary launcher 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 3.")]
+        PrimaryLauncher3 = 4800,
+
+        /// <summary>
+        /// Primary launcher 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 4.")]
+        PrimaryLauncher4 = 4832,
+
+        /// <summary>
+        /// Primary launcher 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 5.")]
+        PrimaryLauncher5 = 4864,
+
+        /// <summary>
+        /// Primary launcher 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 6.")]
+        PrimaryLauncher6 = 4896,
+
+        /// <summary>
+        /// Primary launcher 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 7.")]
+        PrimaryLauncher7 = 4928,
+
+        /// <summary>
+        /// Primary launcher 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 8.")]
+        PrimaryLauncher8 = 4960,
+
+        /// <summary>
+        /// Primary launcher 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 9.")]
+        PrimaryLauncher9 = 4992,
+
+        /// <summary>
+        /// Primary launcher 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary launcher 10.")]
+        PrimaryLauncher10 = 5024,
+
+        /// <summary>
+        /// Primary defense systems 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 1.")]
+        PrimaryDefenseSystems1 = 5056,
+
+        /// <summary>
+        /// Primary defense systems 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 2.")]
+        PrimaryDefenseSystems2 = 5088,
+
+        /// <summary>
+        /// Primary defense systems 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 3.")]
+        PrimaryDefenseSystems3 = 5120,
+
+        /// <summary>
+        /// Primary defense systems 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 4.")]
+        PrimaryDefenseSystems4 = 5152,
+
+        /// <summary>
+        /// Primary defense systems 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 5.")]
+        PrimaryDefenseSystems5 = 5184,
+
+        /// <summary>
+        /// Primary defense systems 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 6.")]
+        PrimaryDefenseSystems6 = 5216,
+
+        /// <summary>
+        /// Primary defense systems 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 7.")]
+        PrimaryDefenseSystems7 = 5248,
+
+        /// <summary>
+        /// Primary defense systems 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 8.")]
+        PrimaryDefenseSystems8 = 5280,
+
+        /// <summary>
+        /// Primary defense systems 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 9.")]
+        PrimaryDefenseSystems9 = 5312,
+
+        /// <summary>
+        /// Primary defense systems 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary defense systems 10.")]
+        PrimaryDefenseSystems10 = 5344,
+
+        /// <summary>
+        /// Primary radar 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 1.")]
+        PrimaryRadar1 = 5376,
+
+        /// <summary>
+        /// Primary radar 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 2.")]
+        PrimaryRadar2 = 5408,
+
+        /// <summary>
+        /// Primary radar 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 3.")]
+        PrimaryRadar3 = 5440,
+
+        /// <summary>
+        /// Primary radar 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 4.")]
+        PrimaryRadar4 = 5472,
+
+        /// <summary>
+        /// Primary radar 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 5.")]
+        PrimaryRadar5 = 5504,
+
+        /// <summary>
+        /// Primary radar 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 6.")]
+        PrimaryRadar6 = 5536,
+
+        /// <summary>
+        /// Primary radar 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 7.")]
+        PrimaryRadar7 = 5568,
+
+        /// <summary>
+        /// Primary radar 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 8.")]
+        PrimaryRadar8 = 5600,
+
+        /// <summary>
+        /// Primary radar 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 9.")]
+        PrimaryRadar9 = 5632,
+
+        /// <summary>
+        /// Primary radar 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary radar 10.")]
+        PrimaryRadar10 = 5664,
+
+        /// <summary>
+        /// Secondary turret number 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 1.")]
+        SecondaryTurretNumber1 = 5696,
+
+        /// <summary>
+        /// Secondary turret number 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 2.")]
+        SecondaryTurretNumber2 = 5728,
+
+        /// <summary>
+        /// Secondary turret number 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 3.")]
+        SecondaryTurretNumber3 = 5760,
+
+        /// <summary>
+        /// Secondary turret number 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 4.")]
+        SecondaryTurretNumber4 = 5792,
+
+        /// <summary>
+        /// Secondary turret number 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 5.")]
+        SecondaryTurretNumber5 = 5824,
+
+        /// <summary>
+        /// Secondary turret number 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 6.")]
+        SecondaryTurretNumber6 = 5856,
+
+        /// <summary>
+        /// Secondary turret number 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 7.")]
+        SecondaryTurretNumber7 = 5888,
+
+        /// <summary>
+        /// Secondary turret number 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 8.")]
+        SecondaryTurretNumber8 = 5920,
+
+        /// <summary>
+        /// Secondary turret number 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 9.")]
+        SecondaryTurretNumber9 = 5952,
+
+        /// <summary>
+        /// Secondary turret number 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary turret number 10.")]
+        SecondaryTurretNumber10 = 5984,
+
+        /// <summary>
+        /// Secondary gun number 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 1.")]
+        SecondaryGunNumber1 = 6016,
+
+        /// <summary>
+        /// Secondary gun number 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 2.")]
+        SecondaryGunNumber2 = 6048,
+
+        /// <summary>
+        /// Secondary gun number 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 3.")]
+        SecondaryGunNumber3 = 6080,
+
+        /// <summary>
+        /// Secondary gun number 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 4.")]
+        SecondaryGunNumber4 = 6112,
+
+        /// <summary>
+        /// Secondary gun number 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 5.")]
+        SecondaryGunNumber5 = 6144,
+
+        /// <summary>
+        /// Secondary gun number 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 6.")]
+        SecondaryGunNumber6 = 6176,
+
+        /// <summary>
+        /// Secondary gun number 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 7.")]
+        SecondaryGunNumber7 = 6208,
+
+        /// <summary>
+        /// Secondary gun number 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 8.")]
+        SecondaryGunNumber8 = 6240,
+
+        /// <summary>
+        /// Secondary gun number 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 9.")]
+        SecondaryGunNumber9 = 6272,
+
+        /// <summary>
+        /// Secondary gun number 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary gun number 10.")]
+        SecondaryGunNumber10 = 6304,
+
+        /// <summary>
+        /// Secondary launcher 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 1.")]
+        SecondaryLauncher1 = 6336,
+
+        /// <summary>
+        /// Secondary launcher 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 2.")]
+        SecondaryLauncher2 = 6368,
+
+        /// <summary>
+        /// Secondary launcher 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 3.")]
+        SecondaryLauncher3 = 6400,
+
+        /// <summary>
+        /// Secondary launcher 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 4.")]
+        SecondaryLauncher4 = 6432,
+
+        /// <summary>
+        /// Secondary launcher 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 5.")]
+        SecondaryLauncher5 = 6464,
+
+        /// <summary>
+        /// Secondary launcher 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 6.")]
+        SecondaryLauncher6 = 6496,
+
+        /// <summary>
+        /// Secondary launcher 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 7.")]
+        SecondaryLauncher7 = 6528,
+
+        /// <summary>
+        /// Secondary launcher 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 8.")]
+        SecondaryLauncher8 = 6560,
+
+        /// <summary>
+        /// Secondary launcher 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 9.")]
+        SecondaryLauncher9 = 6592,
+
+        /// <summary>
+        /// Secondary launcher 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary launcher 10.")]
+        SecondaryLauncher10 = 6624,
+
+        /// <summary>
+        /// Secondary defense systems 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 1.")]
+        SecondaryDefenseSystems1 = 6656,
+
+        /// <summary>
+        /// Secondary defense systems 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 2.")]
+        SecondaryDefenseSystems2 = 6688,
+
+        /// <summary>
+        /// Secondary defense systems 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 3.")]
+        SecondaryDefenseSystems3 = 6720,
+
+        /// <summary>
+        /// Secondary defense systems 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 4.")]
+        SecondaryDefenseSystems4 = 6752,
+
+        /// <summary>
+        /// Secondary defense systems 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 5.")]
+        SecondaryDefenseSystems5 = 6784,
+
+        /// <summary>
+        /// Secondary defense systems 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 6.")]
+        SecondaryDefenseSystems6 = 6816,
+
+        /// <summary>
+        /// Secondary defense systems 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 7.")]
+        SecondaryDefenseSystems7 = 6848,
+
+        /// <summary>
+        /// Secondary defense systems 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 8.")]
+        SecondaryDefenseSystems8 = 6880,
+
+        /// <summary>
+        /// Secondary defense systems 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 9.")]
+        SecondaryDefenseSystems9 = 6912,
+
+        /// <summary>
+        /// Secondary defense systems 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary defense systems 10.")]
+        SecondaryDefenseSystems10 = 6944,
+
+        /// <summary>
+        /// Secondary radar 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 1.")]
+        SecondaryRadar1 = 6976,
+
+        /// <summary>
+        /// Secondary radar 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 2.")]
+        SecondaryRadar2 = 7008,
+
+        /// <summary>
+        /// Secondary radar 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 3.")]
+        SecondaryRadar3 = 7040,
+
+        /// <summary>
+        /// Secondary radar 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 4.")]
+        SecondaryRadar4 = 7072,
+
+        /// <summary>
+        /// Secondary radar 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 5.")]
+        SecondaryRadar5 = 7104,
+
+        /// <summary>
+        /// Secondary radar 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 6.")]
+        SecondaryRadar6 = 7136,
+
+        /// <summary>
+        /// Secondary radar 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 7.")]
+        SecondaryRadar7 = 7168,
+
+        /// <summary>
+        /// Secondary radar 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 8.")]
+        SecondaryRadar8 = 7200,
+
+        /// <summary>
+        /// Secondary radar 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 9.")]
+        SecondaryRadar9 = 7232,
+
+        /// <summary>
+        /// Secondary radar 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary radar 10.")]
+        SecondaryRadar10 = 7264,
+
+        /// <summary>
+        /// Deck Elevator #1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Deck Elevator #1.")]
+        DeckElevator1 = 7296,
+
+        /// <summary>
+        /// Deck Elevator #2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Deck Elevator #2.")]
+        DeckElevator2 = 7328,
+
+        /// <summary>
+        /// Catapult #1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Catapult #1.")]
+        Catapult1 = 7360,
+
+        /// <summary>
+        /// Catapult #2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Catapult #2.")]
+        Catapult2 = 7392,
+
+        /// <summary>
+        /// Jet Blast Deflector #1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jet Blast Deflector #1.")]
+        JetBlastDeflector1 = 7424,
+
+        /// <summary>
+        /// Jet Blast Deflector #2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Jet Blast Deflector #2.")]
+        JetBlastDeflector2 = 7456,
+
+        /// <summary>
+        /// Arrestor Wires #1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Arrestor Wires #1.")]
+        ArrestorWires1 = 7488,
+
+        /// <summary>
+        /// Arrestor Wires #2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Arrestor Wires #2.")]
+        ArrestorWires2 = 7520,
+
+        /// <summary>
+        /// Arrestor Wires #3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Arrestor Wires #3.")]
+        ArrestorWires3 = 7552,
+
+        /// <summary>
+        /// Wing (or rotor) fold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wing (or rotor) fold.")]
+        WingOrRotorFold = 7584,
+
+        /// <summary>
+        /// Fuselage fold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage fold.")]
+        FuselageFold = 7616
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs b/Libs/CsharpDis6/Enumerations/EntityState/ArticulatedPartOffset.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs
rename to Libs/CsharpDis6/Enumerations/EntityState/ArticulatedPartOffset.cs
index c2fe734..549238f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ArticulatedPartOffset.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState/ArticulatedPartOffset.cs
@@ -1,189 +1,189 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState
-{
-    /// <summary>
-    /// Enumeration values for ArticulatedPartOffset (es.vp.type.0.articulated.offset, Articulated parts offset number, 
-    /// section 4.7.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ArticulatedPartOffset : uint
-    {
-        /// <summary>
-        /// Position.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position.")]
-        Position = 1,
-
-        /// <summary>
-        /// Position Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Rate.")]
-        PositionRate = 2,
-
-        /// <summary>
-        /// Extension.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Extension.")]
-        Extension = 3,
-
-        /// <summary>
-        /// Extension Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Extension Rate.")]
-        ExtensionRate = 4,
-
-        /// <summary>
-        /// X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X.")]
-        X = 5,
-
-        /// <summary>
-        /// X Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X Rate.")]
-        XRate = 6,
-
-        /// <summary>
-        /// Y.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y.")]
-        Y = 7,
-
-        /// <summary>
-        /// Y Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y Rate.")]
-        YRate = 8,
-
-        /// <summary>
-        /// Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z.")]
-        Z = 9,
-
-        /// <summary>
-        /// Z Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z Rate.")]
-        ZRate = 10,
-
-        /// <summary>
-        /// Azimuth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Azimuth.")]
-        Azimuth = 11,
-
-        /// <summary>
-        /// Azimuth Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Azimuth Rate.")]
-        AzimuthRate = 12,
-
-        /// <summary>
-        /// Elevation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Elevation.")]
-        Elevation = 13,
-
-        /// <summary>
-        /// Elevation Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Elevation Rate.")]
-        ElevationRate = 14,
-
-        /// <summary>
-        /// Rotation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rotation.")]
-        Rotation = 15,
-
-        /// <summary>
-        /// Rotation Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rotation Rate.")]
-        RotationRate = 16
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState
+{
+    /// <summary>
+    /// Enumeration values for ArticulatedPartOffset (es.vp.type.0.articulated.offset, Articulated parts offset number, 
+    /// section 4.7.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ArticulatedPartOffset : uint
+    {
+        /// <summary>
+        /// Position.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position.")]
+        Position = 1,
+
+        /// <summary>
+        /// Position Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Rate.")]
+        PositionRate = 2,
+
+        /// <summary>
+        /// Extension.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Extension.")]
+        Extension = 3,
+
+        /// <summary>
+        /// Extension Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Extension Rate.")]
+        ExtensionRate = 4,
+
+        /// <summary>
+        /// X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X.")]
+        X = 5,
+
+        /// <summary>
+        /// X Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X Rate.")]
+        XRate = 6,
+
+        /// <summary>
+        /// Y.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y.")]
+        Y = 7,
+
+        /// <summary>
+        /// Y Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y Rate.")]
+        YRate = 8,
+
+        /// <summary>
+        /// Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z.")]
+        Z = 9,
+
+        /// <summary>
+        /// Z Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z Rate.")]
+        ZRate = 10,
+
+        /// <summary>
+        /// Azimuth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Azimuth.")]
+        Azimuth = 11,
+
+        /// <summary>
+        /// Azimuth Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Azimuth Rate.")]
+        AzimuthRate = 12,
+
+        /// <summary>
+        /// Elevation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Elevation.")]
+        Elevation = 13,
+
+        /// <summary>
+        /// Elevation Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Elevation Rate.")]
+        ElevationRate = 14,
+
+        /// <summary>
+        /// Rotation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rotation.")]
+        Rotation = 15,
+
+        /// <summary>
+        /// Rotation Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rotation Rate.")]
+        RotationRate = 16
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/AttachedParts.cs b/Libs/CsharpDis6/Enumerations/EntityState/AttachedParts.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState/AttachedParts.cs
rename to Libs/CsharpDis6/Enumerations/EntityState/AttachedParts.cs
index e944864..b700062 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/AttachedParts.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState/AttachedParts.cs
@@ -1,10269 +1,10269 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState
-{
-    /// <summary>
-    /// Enumeration values for AttachedParts (es.vp.type.1.attached, Attached parts, 
-    /// section 4.7.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AttachedParts : uint
-    {
-        /// <summary>
-        /// Nothing, Empty.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nothing, Empty.")]
-        NothingEmpty = 0,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 1).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 1).")]
-        SequentialIDsForModelSpecificStations_1 = 1,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 2).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 2).")]
-        SequentialIDsForModelSpecificStations_2 = 2,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 3).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 3).")]
-        SequentialIDsForModelSpecificStations_3 = 3,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 4).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 4).")]
-        SequentialIDsForModelSpecificStations_4 = 4,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 5).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 5).")]
-        SequentialIDsForModelSpecificStations_5 = 5,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 6).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 6).")]
-        SequentialIDsForModelSpecificStations_6 = 6,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 7).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 7).")]
-        SequentialIDsForModelSpecificStations_7 = 7,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 8).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 8).")]
-        SequentialIDsForModelSpecificStations_8 = 8,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 9).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 9).")]
-        SequentialIDsForModelSpecificStations_9 = 9,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 10).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 10).")]
-        SequentialIDsForModelSpecificStations_10 = 10,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 11).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 11).")]
-        SequentialIDsForModelSpecificStations_11 = 11,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 12).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 12).")]
-        SequentialIDsForModelSpecificStations_12 = 12,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 13).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 13).")]
-        SequentialIDsForModelSpecificStations_13 = 13,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 14).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 14).")]
-        SequentialIDsForModelSpecificStations_14 = 14,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 15).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 15).")]
-        SequentialIDsForModelSpecificStations_15 = 15,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 16).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 16).")]
-        SequentialIDsForModelSpecificStations_16 = 16,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 17).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 17).")]
-        SequentialIDsForModelSpecificStations_17 = 17,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 18).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 18).")]
-        SequentialIDsForModelSpecificStations_18 = 18,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 19).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 19).")]
-        SequentialIDsForModelSpecificStations_19 = 19,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 20).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 20).")]
-        SequentialIDsForModelSpecificStations_20 = 20,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 21).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 21).")]
-        SequentialIDsForModelSpecificStations_21 = 21,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 22).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 22).")]
-        SequentialIDsForModelSpecificStations_22 = 22,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 23).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 23).")]
-        SequentialIDsForModelSpecificStations_23 = 23,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 24).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 24).")]
-        SequentialIDsForModelSpecificStations_24 = 24,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 25).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 25).")]
-        SequentialIDsForModelSpecificStations_25 = 25,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 26).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 26).")]
-        SequentialIDsForModelSpecificStations_26 = 26,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 27).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 27).")]
-        SequentialIDsForModelSpecificStations_27 = 27,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 28).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 28).")]
-        SequentialIDsForModelSpecificStations_28 = 28,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 29).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 29).")]
-        SequentialIDsForModelSpecificStations_29 = 29,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 30).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 30).")]
-        SequentialIDsForModelSpecificStations_30 = 30,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 31).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 31).")]
-        SequentialIDsForModelSpecificStations_31 = 31,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 32).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 32).")]
-        SequentialIDsForModelSpecificStations_32 = 32,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 33).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 33).")]
-        SequentialIDsForModelSpecificStations_33 = 33,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 34).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 34).")]
-        SequentialIDsForModelSpecificStations_34 = 34,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 35).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 35).")]
-        SequentialIDsForModelSpecificStations_35 = 35,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 36).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 36).")]
-        SequentialIDsForModelSpecificStations_36 = 36,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 37).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 37).")]
-        SequentialIDsForModelSpecificStations_37 = 37,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 38).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 38).")]
-        SequentialIDsForModelSpecificStations_38 = 38,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 39).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 39).")]
-        SequentialIDsForModelSpecificStations_39 = 39,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 40).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 40).")]
-        SequentialIDsForModelSpecificStations_40 = 40,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 41).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 41).")]
-        SequentialIDsForModelSpecificStations_41 = 41,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 42).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 42).")]
-        SequentialIDsForModelSpecificStations_42 = 42,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 43).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 43).")]
-        SequentialIDsForModelSpecificStations_43 = 43,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 44).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 44).")]
-        SequentialIDsForModelSpecificStations_44 = 44,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 45).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 45).")]
-        SequentialIDsForModelSpecificStations_45 = 45,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 46).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 46).")]
-        SequentialIDsForModelSpecificStations_46 = 46,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 47).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 47).")]
-        SequentialIDsForModelSpecificStations_47 = 47,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 48).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 48).")]
-        SequentialIDsForModelSpecificStations_48 = 48,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 49).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 49).")]
-        SequentialIDsForModelSpecificStations_49 = 49,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 50).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 50).")]
-        SequentialIDsForModelSpecificStations_50 = 50,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 51).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 51).")]
-        SequentialIDsForModelSpecificStations_51 = 51,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 52).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 52).")]
-        SequentialIDsForModelSpecificStations_52 = 52,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 53).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 53).")]
-        SequentialIDsForModelSpecificStations_53 = 53,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 54).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 54).")]
-        SequentialIDsForModelSpecificStations_54 = 54,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 55).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 55).")]
-        SequentialIDsForModelSpecificStations_55 = 55,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 56).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 56).")]
-        SequentialIDsForModelSpecificStations_56 = 56,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 57).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 57).")]
-        SequentialIDsForModelSpecificStations_57 = 57,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 58).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 58).")]
-        SequentialIDsForModelSpecificStations_58 = 58,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 59).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 59).")]
-        SequentialIDsForModelSpecificStations_59 = 59,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 60).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 60).")]
-        SequentialIDsForModelSpecificStations_60 = 60,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 61).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 61).")]
-        SequentialIDsForModelSpecificStations_61 = 61,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 62).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 62).")]
-        SequentialIDsForModelSpecificStations_62 = 62,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 63).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 63).")]
-        SequentialIDsForModelSpecificStations_63 = 63,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 64).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 64).")]
-        SequentialIDsForModelSpecificStations_64 = 64,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 65).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 65).")]
-        SequentialIDsForModelSpecificStations_65 = 65,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 66).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 66).")]
-        SequentialIDsForModelSpecificStations_66 = 66,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 67).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 67).")]
-        SequentialIDsForModelSpecificStations_67 = 67,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 68).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 68).")]
-        SequentialIDsForModelSpecificStations_68 = 68,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 69).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 69).")]
-        SequentialIDsForModelSpecificStations_69 = 69,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 70).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 70).")]
-        SequentialIDsForModelSpecificStations_70 = 70,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 71).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 71).")]
-        SequentialIDsForModelSpecificStations_71 = 71,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 72).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 72).")]
-        SequentialIDsForModelSpecificStations_72 = 72,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 73).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 73).")]
-        SequentialIDsForModelSpecificStations_73 = 73,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 74).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 74).")]
-        SequentialIDsForModelSpecificStations_74 = 74,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 75).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 75).")]
-        SequentialIDsForModelSpecificStations_75 = 75,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 76).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 76).")]
-        SequentialIDsForModelSpecificStations_76 = 76,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 77).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 77).")]
-        SequentialIDsForModelSpecificStations_77 = 77,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 78).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 78).")]
-        SequentialIDsForModelSpecificStations_78 = 78,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 79).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 79).")]
-        SequentialIDsForModelSpecificStations_79 = 79,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 80).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 80).")]
-        SequentialIDsForModelSpecificStations_80 = 80,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 81).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 81).")]
-        SequentialIDsForModelSpecificStations_81 = 81,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 82).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 82).")]
-        SequentialIDsForModelSpecificStations_82 = 82,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 83).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 83).")]
-        SequentialIDsForModelSpecificStations_83 = 83,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 84).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 84).")]
-        SequentialIDsForModelSpecificStations_84 = 84,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 85).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 85).")]
-        SequentialIDsForModelSpecificStations_85 = 85,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 86).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 86).")]
-        SequentialIDsForModelSpecificStations_86 = 86,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 87).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 87).")]
-        SequentialIDsForModelSpecificStations_87 = 87,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 88).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 88).")]
-        SequentialIDsForModelSpecificStations_88 = 88,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 89).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 89).")]
-        SequentialIDsForModelSpecificStations_89 = 89,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 90).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 90).")]
-        SequentialIDsForModelSpecificStations_90 = 90,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 91).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 91).")]
-        SequentialIDsForModelSpecificStations_91 = 91,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 92).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 92).")]
-        SequentialIDsForModelSpecificStations_92 = 92,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 93).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 93).")]
-        SequentialIDsForModelSpecificStations_93 = 93,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 94).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 94).")]
-        SequentialIDsForModelSpecificStations_94 = 94,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 95).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 95).")]
-        SequentialIDsForModelSpecificStations_95 = 95,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 96).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 96).")]
-        SequentialIDsForModelSpecificStations_96 = 96,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 97).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 97).")]
-        SequentialIDsForModelSpecificStations_97 = 97,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 98).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 98).")]
-        SequentialIDsForModelSpecificStations_98 = 98,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 99).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 99).")]
-        SequentialIDsForModelSpecificStations_99 = 99,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 100).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 100).")]
-        SequentialIDsForModelSpecificStations_100 = 100,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 101).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 101).")]
-        SequentialIDsForModelSpecificStations_101 = 101,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 102).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 102).")]
-        SequentialIDsForModelSpecificStations_102 = 102,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 103).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 103).")]
-        SequentialIDsForModelSpecificStations_103 = 103,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 104).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 104).")]
-        SequentialIDsForModelSpecificStations_104 = 104,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 105).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 105).")]
-        SequentialIDsForModelSpecificStations_105 = 105,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 106).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 106).")]
-        SequentialIDsForModelSpecificStations_106 = 106,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 107).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 107).")]
-        SequentialIDsForModelSpecificStations_107 = 107,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 108).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 108).")]
-        SequentialIDsForModelSpecificStations_108 = 108,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 109).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 109).")]
-        SequentialIDsForModelSpecificStations_109 = 109,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 110).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 110).")]
-        SequentialIDsForModelSpecificStations_110 = 110,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 111).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 111).")]
-        SequentialIDsForModelSpecificStations_111 = 111,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 112).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 112).")]
-        SequentialIDsForModelSpecificStations_112 = 112,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 113).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 113).")]
-        SequentialIDsForModelSpecificStations_113 = 113,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 114).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 114).")]
-        SequentialIDsForModelSpecificStations_114 = 114,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 115).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 115).")]
-        SequentialIDsForModelSpecificStations_115 = 115,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 116).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 116).")]
-        SequentialIDsForModelSpecificStations_116 = 116,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 117).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 117).")]
-        SequentialIDsForModelSpecificStations_117 = 117,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 118).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 118).")]
-        SequentialIDsForModelSpecificStations_118 = 118,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 119).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 119).")]
-        SequentialIDsForModelSpecificStations_119 = 119,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 120).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 120).")]
-        SequentialIDsForModelSpecificStations_120 = 120,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 121).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 121).")]
-        SequentialIDsForModelSpecificStations_121 = 121,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 122).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 122).")]
-        SequentialIDsForModelSpecificStations_122 = 122,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 123).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 123).")]
-        SequentialIDsForModelSpecificStations_123 = 123,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 124).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 124).")]
-        SequentialIDsForModelSpecificStations_124 = 124,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 125).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 125).")]
-        SequentialIDsForModelSpecificStations_125 = 125,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 126).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 126).")]
-        SequentialIDsForModelSpecificStations_126 = 126,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 127).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 127).")]
-        SequentialIDsForModelSpecificStations_127 = 127,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 128).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 128).")]
-        SequentialIDsForModelSpecificStations_128 = 128,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 129).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 129).")]
-        SequentialIDsForModelSpecificStations_129 = 129,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 130).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 130).")]
-        SequentialIDsForModelSpecificStations_130 = 130,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 131).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 131).")]
-        SequentialIDsForModelSpecificStations_131 = 131,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 132).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 132).")]
-        SequentialIDsForModelSpecificStations_132 = 132,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 133).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 133).")]
-        SequentialIDsForModelSpecificStations_133 = 133,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 134).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 134).")]
-        SequentialIDsForModelSpecificStations_134 = 134,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 135).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 135).")]
-        SequentialIDsForModelSpecificStations_135 = 135,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 136).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 136).")]
-        SequentialIDsForModelSpecificStations_136 = 136,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 137).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 137).")]
-        SequentialIDsForModelSpecificStations_137 = 137,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 138).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 138).")]
-        SequentialIDsForModelSpecificStations_138 = 138,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 139).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 139).")]
-        SequentialIDsForModelSpecificStations_139 = 139,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 140).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 140).")]
-        SequentialIDsForModelSpecificStations_140 = 140,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 141).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 141).")]
-        SequentialIDsForModelSpecificStations_141 = 141,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 142).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 142).")]
-        SequentialIDsForModelSpecificStations_142 = 142,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 143).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 143).")]
-        SequentialIDsForModelSpecificStations_143 = 143,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 144).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 144).")]
-        SequentialIDsForModelSpecificStations_144 = 144,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 145).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 145).")]
-        SequentialIDsForModelSpecificStations_145 = 145,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 146).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 146).")]
-        SequentialIDsForModelSpecificStations_146 = 146,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 147).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 147).")]
-        SequentialIDsForModelSpecificStations_147 = 147,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 148).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 148).")]
-        SequentialIDsForModelSpecificStations_148 = 148,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 149).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 149).")]
-        SequentialIDsForModelSpecificStations_149 = 149,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 150).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 150).")]
-        SequentialIDsForModelSpecificStations_150 = 150,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 151).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 151).")]
-        SequentialIDsForModelSpecificStations_151 = 151,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 152).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 152).")]
-        SequentialIDsForModelSpecificStations_152 = 152,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 153).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 153).")]
-        SequentialIDsForModelSpecificStations_153 = 153,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 154).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 154).")]
-        SequentialIDsForModelSpecificStations_154 = 154,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 155).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 155).")]
-        SequentialIDsForModelSpecificStations_155 = 155,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 156).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 156).")]
-        SequentialIDsForModelSpecificStations_156 = 156,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 157).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 157).")]
-        SequentialIDsForModelSpecificStations_157 = 157,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 158).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 158).")]
-        SequentialIDsForModelSpecificStations_158 = 158,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 159).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 159).")]
-        SequentialIDsForModelSpecificStations_159 = 159,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 160).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 160).")]
-        SequentialIDsForModelSpecificStations_160 = 160,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 161).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 161).")]
-        SequentialIDsForModelSpecificStations_161 = 161,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 162).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 162).")]
-        SequentialIDsForModelSpecificStations_162 = 162,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 163).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 163).")]
-        SequentialIDsForModelSpecificStations_163 = 163,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 164).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 164).")]
-        SequentialIDsForModelSpecificStations_164 = 164,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 165).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 165).")]
-        SequentialIDsForModelSpecificStations_165 = 165,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 166).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 166).")]
-        SequentialIDsForModelSpecificStations_166 = 166,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 167).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 167).")]
-        SequentialIDsForModelSpecificStations_167 = 167,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 168).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 168).")]
-        SequentialIDsForModelSpecificStations_168 = 168,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 169).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 169).")]
-        SequentialIDsForModelSpecificStations_169 = 169,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 170).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 170).")]
-        SequentialIDsForModelSpecificStations_170 = 170,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 171).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 171).")]
-        SequentialIDsForModelSpecificStations_171 = 171,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 172).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 172).")]
-        SequentialIDsForModelSpecificStations_172 = 172,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 173).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 173).")]
-        SequentialIDsForModelSpecificStations_173 = 173,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 174).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 174).")]
-        SequentialIDsForModelSpecificStations_174 = 174,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 175).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 175).")]
-        SequentialIDsForModelSpecificStations_175 = 175,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 176).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 176).")]
-        SequentialIDsForModelSpecificStations_176 = 176,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 177).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 177).")]
-        SequentialIDsForModelSpecificStations_177 = 177,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 178).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 178).")]
-        SequentialIDsForModelSpecificStations_178 = 178,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 179).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 179).")]
-        SequentialIDsForModelSpecificStations_179 = 179,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 180).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 180).")]
-        SequentialIDsForModelSpecificStations_180 = 180,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 181).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 181).")]
-        SequentialIDsForModelSpecificStations_181 = 181,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 182).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 182).")]
-        SequentialIDsForModelSpecificStations_182 = 182,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 183).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 183).")]
-        SequentialIDsForModelSpecificStations_183 = 183,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 184).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 184).")]
-        SequentialIDsForModelSpecificStations_184 = 184,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 185).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 185).")]
-        SequentialIDsForModelSpecificStations_185 = 185,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 186).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 186).")]
-        SequentialIDsForModelSpecificStations_186 = 186,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 187).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 187).")]
-        SequentialIDsForModelSpecificStations_187 = 187,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 188).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 188).")]
-        SequentialIDsForModelSpecificStations_188 = 188,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 189).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 189).")]
-        SequentialIDsForModelSpecificStations_189 = 189,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 190).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 190).")]
-        SequentialIDsForModelSpecificStations_190 = 190,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 191).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 191).")]
-        SequentialIDsForModelSpecificStations_191 = 191,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 192).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 192).")]
-        SequentialIDsForModelSpecificStations_192 = 192,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 193).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 193).")]
-        SequentialIDsForModelSpecificStations_193 = 193,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 194).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 194).")]
-        SequentialIDsForModelSpecificStations_194 = 194,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 195).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 195).")]
-        SequentialIDsForModelSpecificStations_195 = 195,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 196).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 196).")]
-        SequentialIDsForModelSpecificStations_196 = 196,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 197).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 197).")]
-        SequentialIDsForModelSpecificStations_197 = 197,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 198).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 198).")]
-        SequentialIDsForModelSpecificStations_198 = 198,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 199).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 199).")]
-        SequentialIDsForModelSpecificStations_199 = 199,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 200).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 200).")]
-        SequentialIDsForModelSpecificStations_200 = 200,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 201).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 201).")]
-        SequentialIDsForModelSpecificStations_201 = 201,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 202).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 202).")]
-        SequentialIDsForModelSpecificStations_202 = 202,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 203).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 203).")]
-        SequentialIDsForModelSpecificStations_203 = 203,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 204).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 204).")]
-        SequentialIDsForModelSpecificStations_204 = 204,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 205).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 205).")]
-        SequentialIDsForModelSpecificStations_205 = 205,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 206).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 206).")]
-        SequentialIDsForModelSpecificStations_206 = 206,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 207).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 207).")]
-        SequentialIDsForModelSpecificStations_207 = 207,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 208).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 208).")]
-        SequentialIDsForModelSpecificStations_208 = 208,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 209).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 209).")]
-        SequentialIDsForModelSpecificStations_209 = 209,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 210).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 210).")]
-        SequentialIDsForModelSpecificStations_210 = 210,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 211).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 211).")]
-        SequentialIDsForModelSpecificStations_211 = 211,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 212).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 212).")]
-        SequentialIDsForModelSpecificStations_212 = 212,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 213).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 213).")]
-        SequentialIDsForModelSpecificStations_213 = 213,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 214).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 214).")]
-        SequentialIDsForModelSpecificStations_214 = 214,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 215).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 215).")]
-        SequentialIDsForModelSpecificStations_215 = 215,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 216).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 216).")]
-        SequentialIDsForModelSpecificStations_216 = 216,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 217).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 217).")]
-        SequentialIDsForModelSpecificStations_217 = 217,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 218).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 218).")]
-        SequentialIDsForModelSpecificStations_218 = 218,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 219).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 219).")]
-        SequentialIDsForModelSpecificStations_219 = 219,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 220).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 220).")]
-        SequentialIDsForModelSpecificStations_220 = 220,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 221).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 221).")]
-        SequentialIDsForModelSpecificStations_221 = 221,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 222).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 222).")]
-        SequentialIDsForModelSpecificStations_222 = 222,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 223).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 223).")]
-        SequentialIDsForModelSpecificStations_223 = 223,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 224).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 224).")]
-        SequentialIDsForModelSpecificStations_224 = 224,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 225).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 225).")]
-        SequentialIDsForModelSpecificStations_225 = 225,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 226).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 226).")]
-        SequentialIDsForModelSpecificStations_226 = 226,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 227).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 227).")]
-        SequentialIDsForModelSpecificStations_227 = 227,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 228).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 228).")]
-        SequentialIDsForModelSpecificStations_228 = 228,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 229).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 229).")]
-        SequentialIDsForModelSpecificStations_229 = 229,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 230).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 230).")]
-        SequentialIDsForModelSpecificStations_230 = 230,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 231).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 231).")]
-        SequentialIDsForModelSpecificStations_231 = 231,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 232).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 232).")]
-        SequentialIDsForModelSpecificStations_232 = 232,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 233).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 233).")]
-        SequentialIDsForModelSpecificStations_233 = 233,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 234).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 234).")]
-        SequentialIDsForModelSpecificStations_234 = 234,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 235).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 235).")]
-        SequentialIDsForModelSpecificStations_235 = 235,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 236).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 236).")]
-        SequentialIDsForModelSpecificStations_236 = 236,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 237).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 237).")]
-        SequentialIDsForModelSpecificStations_237 = 237,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 238).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 238).")]
-        SequentialIDsForModelSpecificStations_238 = 238,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 239).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 239).")]
-        SequentialIDsForModelSpecificStations_239 = 239,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 240).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 240).")]
-        SequentialIDsForModelSpecificStations_240 = 240,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 241).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 241).")]
-        SequentialIDsForModelSpecificStations_241 = 241,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 242).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 242).")]
-        SequentialIDsForModelSpecificStations_242 = 242,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 243).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 243).")]
-        SequentialIDsForModelSpecificStations_243 = 243,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 244).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 244).")]
-        SequentialIDsForModelSpecificStations_244 = 244,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 245).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 245).")]
-        SequentialIDsForModelSpecificStations_245 = 245,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 246).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 246).")]
-        SequentialIDsForModelSpecificStations_246 = 246,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 247).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 247).")]
-        SequentialIDsForModelSpecificStations_247 = 247,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 248).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 248).")]
-        SequentialIDsForModelSpecificStations_248 = 248,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 249).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 249).")]
-        SequentialIDsForModelSpecificStations_249 = 249,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 250).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 250).")]
-        SequentialIDsForModelSpecificStations_250 = 250,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 251).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 251).")]
-        SequentialIDsForModelSpecificStations_251 = 251,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 252).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 252).")]
-        SequentialIDsForModelSpecificStations_252 = 252,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 253).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 253).")]
-        SequentialIDsForModelSpecificStations_253 = 253,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 254).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 254).")]
-        SequentialIDsForModelSpecificStations_254 = 254,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 255).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 255).")]
-        SequentialIDsForModelSpecificStations_255 = 255,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 256).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 256).")]
-        SequentialIDsForModelSpecificStations_256 = 256,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 257).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 257).")]
-        SequentialIDsForModelSpecificStations_257 = 257,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 258).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 258).")]
-        SequentialIDsForModelSpecificStations_258 = 258,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 259).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 259).")]
-        SequentialIDsForModelSpecificStations_259 = 259,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 260).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 260).")]
-        SequentialIDsForModelSpecificStations_260 = 260,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 261).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 261).")]
-        SequentialIDsForModelSpecificStations_261 = 261,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 262).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 262).")]
-        SequentialIDsForModelSpecificStations_262 = 262,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 263).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 263).")]
-        SequentialIDsForModelSpecificStations_263 = 263,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 264).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 264).")]
-        SequentialIDsForModelSpecificStations_264 = 264,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 265).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 265).")]
-        SequentialIDsForModelSpecificStations_265 = 265,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 266).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 266).")]
-        SequentialIDsForModelSpecificStations_266 = 266,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 267).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 267).")]
-        SequentialIDsForModelSpecificStations_267 = 267,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 268).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 268).")]
-        SequentialIDsForModelSpecificStations_268 = 268,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 269).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 269).")]
-        SequentialIDsForModelSpecificStations_269 = 269,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 270).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 270).")]
-        SequentialIDsForModelSpecificStations_270 = 270,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 271).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 271).")]
-        SequentialIDsForModelSpecificStations_271 = 271,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 272).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 272).")]
-        SequentialIDsForModelSpecificStations_272 = 272,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 273).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 273).")]
-        SequentialIDsForModelSpecificStations_273 = 273,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 274).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 274).")]
-        SequentialIDsForModelSpecificStations_274 = 274,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 275).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 275).")]
-        SequentialIDsForModelSpecificStations_275 = 275,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 276).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 276).")]
-        SequentialIDsForModelSpecificStations_276 = 276,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 277).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 277).")]
-        SequentialIDsForModelSpecificStations_277 = 277,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 278).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 278).")]
-        SequentialIDsForModelSpecificStations_278 = 278,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 279).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 279).")]
-        SequentialIDsForModelSpecificStations_279 = 279,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 280).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 280).")]
-        SequentialIDsForModelSpecificStations_280 = 280,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 281).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 281).")]
-        SequentialIDsForModelSpecificStations_281 = 281,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 282).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 282).")]
-        SequentialIDsForModelSpecificStations_282 = 282,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 283).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 283).")]
-        SequentialIDsForModelSpecificStations_283 = 283,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 284).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 284).")]
-        SequentialIDsForModelSpecificStations_284 = 284,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 285).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 285).")]
-        SequentialIDsForModelSpecificStations_285 = 285,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 286).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 286).")]
-        SequentialIDsForModelSpecificStations_286 = 286,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 287).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 287).")]
-        SequentialIDsForModelSpecificStations_287 = 287,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 288).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 288).")]
-        SequentialIDsForModelSpecificStations_288 = 288,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 289).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 289).")]
-        SequentialIDsForModelSpecificStations_289 = 289,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 290).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 290).")]
-        SequentialIDsForModelSpecificStations_290 = 290,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 291).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 291).")]
-        SequentialIDsForModelSpecificStations_291 = 291,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 292).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 292).")]
-        SequentialIDsForModelSpecificStations_292 = 292,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 293).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 293).")]
-        SequentialIDsForModelSpecificStations_293 = 293,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 294).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 294).")]
-        SequentialIDsForModelSpecificStations_294 = 294,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 295).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 295).")]
-        SequentialIDsForModelSpecificStations_295 = 295,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 296).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 296).")]
-        SequentialIDsForModelSpecificStations_296 = 296,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 297).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 297).")]
-        SequentialIDsForModelSpecificStations_297 = 297,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 298).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 298).")]
-        SequentialIDsForModelSpecificStations_298 = 298,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 299).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 299).")]
-        SequentialIDsForModelSpecificStations_299 = 299,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 300).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 300).")]
-        SequentialIDsForModelSpecificStations_300 = 300,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 301).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 301).")]
-        SequentialIDsForModelSpecificStations_301 = 301,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 302).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 302).")]
-        SequentialIDsForModelSpecificStations_302 = 302,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 303).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 303).")]
-        SequentialIDsForModelSpecificStations_303 = 303,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 304).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 304).")]
-        SequentialIDsForModelSpecificStations_304 = 304,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 305).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 305).")]
-        SequentialIDsForModelSpecificStations_305 = 305,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 306).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 306).")]
-        SequentialIDsForModelSpecificStations_306 = 306,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 307).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 307).")]
-        SequentialIDsForModelSpecificStations_307 = 307,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 308).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 308).")]
-        SequentialIDsForModelSpecificStations_308 = 308,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 309).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 309).")]
-        SequentialIDsForModelSpecificStations_309 = 309,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 310).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 310).")]
-        SequentialIDsForModelSpecificStations_310 = 310,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 311).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 311).")]
-        SequentialIDsForModelSpecificStations_311 = 311,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 312).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 312).")]
-        SequentialIDsForModelSpecificStations_312 = 312,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 313).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 313).")]
-        SequentialIDsForModelSpecificStations_313 = 313,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 314).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 314).")]
-        SequentialIDsForModelSpecificStations_314 = 314,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 315).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 315).")]
-        SequentialIDsForModelSpecificStations_315 = 315,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 316).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 316).")]
-        SequentialIDsForModelSpecificStations_316 = 316,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 317).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 317).")]
-        SequentialIDsForModelSpecificStations_317 = 317,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 318).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 318).")]
-        SequentialIDsForModelSpecificStations_318 = 318,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 319).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 319).")]
-        SequentialIDsForModelSpecificStations_319 = 319,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 320).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 320).")]
-        SequentialIDsForModelSpecificStations_320 = 320,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 321).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 321).")]
-        SequentialIDsForModelSpecificStations_321 = 321,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 322).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 322).")]
-        SequentialIDsForModelSpecificStations_322 = 322,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 323).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 323).")]
-        SequentialIDsForModelSpecificStations_323 = 323,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 324).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 324).")]
-        SequentialIDsForModelSpecificStations_324 = 324,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 325).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 325).")]
-        SequentialIDsForModelSpecificStations_325 = 325,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 326).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 326).")]
-        SequentialIDsForModelSpecificStations_326 = 326,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 327).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 327).")]
-        SequentialIDsForModelSpecificStations_327 = 327,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 328).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 328).")]
-        SequentialIDsForModelSpecificStations_328 = 328,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 329).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 329).")]
-        SequentialIDsForModelSpecificStations_329 = 329,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 330).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 330).")]
-        SequentialIDsForModelSpecificStations_330 = 330,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 331).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 331).")]
-        SequentialIDsForModelSpecificStations_331 = 331,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 332).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 332).")]
-        SequentialIDsForModelSpecificStations_332 = 332,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 333).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 333).")]
-        SequentialIDsForModelSpecificStations_333 = 333,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 334).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 334).")]
-        SequentialIDsForModelSpecificStations_334 = 334,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 335).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 335).")]
-        SequentialIDsForModelSpecificStations_335 = 335,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 336).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 336).")]
-        SequentialIDsForModelSpecificStations_336 = 336,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 337).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 337).")]
-        SequentialIDsForModelSpecificStations_337 = 337,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 338).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 338).")]
-        SequentialIDsForModelSpecificStations_338 = 338,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 339).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 339).")]
-        SequentialIDsForModelSpecificStations_339 = 339,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 340).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 340).")]
-        SequentialIDsForModelSpecificStations_340 = 340,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 341).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 341).")]
-        SequentialIDsForModelSpecificStations_341 = 341,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 342).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 342).")]
-        SequentialIDsForModelSpecificStations_342 = 342,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 343).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 343).")]
-        SequentialIDsForModelSpecificStations_343 = 343,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 344).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 344).")]
-        SequentialIDsForModelSpecificStations_344 = 344,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 345).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 345).")]
-        SequentialIDsForModelSpecificStations_345 = 345,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 346).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 346).")]
-        SequentialIDsForModelSpecificStations_346 = 346,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 347).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 347).")]
-        SequentialIDsForModelSpecificStations_347 = 347,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 348).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 348).")]
-        SequentialIDsForModelSpecificStations_348 = 348,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 349).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 349).")]
-        SequentialIDsForModelSpecificStations_349 = 349,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 350).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 350).")]
-        SequentialIDsForModelSpecificStations_350 = 350,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 351).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 351).")]
-        SequentialIDsForModelSpecificStations_351 = 351,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 352).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 352).")]
-        SequentialIDsForModelSpecificStations_352 = 352,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 353).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 353).")]
-        SequentialIDsForModelSpecificStations_353 = 353,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 354).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 354).")]
-        SequentialIDsForModelSpecificStations_354 = 354,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 355).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 355).")]
-        SequentialIDsForModelSpecificStations_355 = 355,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 356).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 356).")]
-        SequentialIDsForModelSpecificStations_356 = 356,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 357).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 357).")]
-        SequentialIDsForModelSpecificStations_357 = 357,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 358).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 358).")]
-        SequentialIDsForModelSpecificStations_358 = 358,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 359).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 359).")]
-        SequentialIDsForModelSpecificStations_359 = 359,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 360).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 360).")]
-        SequentialIDsForModelSpecificStations_360 = 360,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 361).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 361).")]
-        SequentialIDsForModelSpecificStations_361 = 361,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 362).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 362).")]
-        SequentialIDsForModelSpecificStations_362 = 362,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 363).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 363).")]
-        SequentialIDsForModelSpecificStations_363 = 363,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 364).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 364).")]
-        SequentialIDsForModelSpecificStations_364 = 364,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 365).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 365).")]
-        SequentialIDsForModelSpecificStations_365 = 365,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 366).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 366).")]
-        SequentialIDsForModelSpecificStations_366 = 366,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 367).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 367).")]
-        SequentialIDsForModelSpecificStations_367 = 367,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 368).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 368).")]
-        SequentialIDsForModelSpecificStations_368 = 368,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 369).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 369).")]
-        SequentialIDsForModelSpecificStations_369 = 369,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 370).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 370).")]
-        SequentialIDsForModelSpecificStations_370 = 370,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 371).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 371).")]
-        SequentialIDsForModelSpecificStations_371 = 371,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 372).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 372).")]
-        SequentialIDsForModelSpecificStations_372 = 372,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 373).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 373).")]
-        SequentialIDsForModelSpecificStations_373 = 373,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 374).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 374).")]
-        SequentialIDsForModelSpecificStations_374 = 374,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 375).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 375).")]
-        SequentialIDsForModelSpecificStations_375 = 375,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 376).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 376).")]
-        SequentialIDsForModelSpecificStations_376 = 376,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 377).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 377).")]
-        SequentialIDsForModelSpecificStations_377 = 377,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 378).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 378).")]
-        SequentialIDsForModelSpecificStations_378 = 378,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 379).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 379).")]
-        SequentialIDsForModelSpecificStations_379 = 379,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 380).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 380).")]
-        SequentialIDsForModelSpecificStations_380 = 380,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 381).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 381).")]
-        SequentialIDsForModelSpecificStations_381 = 381,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 382).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 382).")]
-        SequentialIDsForModelSpecificStations_382 = 382,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 383).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 383).")]
-        SequentialIDsForModelSpecificStations_383 = 383,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 384).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 384).")]
-        SequentialIDsForModelSpecificStations_384 = 384,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 385).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 385).")]
-        SequentialIDsForModelSpecificStations_385 = 385,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 386).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 386).")]
-        SequentialIDsForModelSpecificStations_386 = 386,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 387).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 387).")]
-        SequentialIDsForModelSpecificStations_387 = 387,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 388).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 388).")]
-        SequentialIDsForModelSpecificStations_388 = 388,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 389).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 389).")]
-        SequentialIDsForModelSpecificStations_389 = 389,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 390).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 390).")]
-        SequentialIDsForModelSpecificStations_390 = 390,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 391).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 391).")]
-        SequentialIDsForModelSpecificStations_391 = 391,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 392).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 392).")]
-        SequentialIDsForModelSpecificStations_392 = 392,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 393).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 393).")]
-        SequentialIDsForModelSpecificStations_393 = 393,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 394).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 394).")]
-        SequentialIDsForModelSpecificStations_394 = 394,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 395).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 395).")]
-        SequentialIDsForModelSpecificStations_395 = 395,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 396).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 396).")]
-        SequentialIDsForModelSpecificStations_396 = 396,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 397).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 397).")]
-        SequentialIDsForModelSpecificStations_397 = 397,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 398).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 398).")]
-        SequentialIDsForModelSpecificStations_398 = 398,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 399).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 399).")]
-        SequentialIDsForModelSpecificStations_399 = 399,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 400).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 400).")]
-        SequentialIDsForModelSpecificStations_400 = 400,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 401).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 401).")]
-        SequentialIDsForModelSpecificStations_401 = 401,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 402).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 402).")]
-        SequentialIDsForModelSpecificStations_402 = 402,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 403).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 403).")]
-        SequentialIDsForModelSpecificStations_403 = 403,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 404).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 404).")]
-        SequentialIDsForModelSpecificStations_404 = 404,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 405).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 405).")]
-        SequentialIDsForModelSpecificStations_405 = 405,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 406).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 406).")]
-        SequentialIDsForModelSpecificStations_406 = 406,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 407).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 407).")]
-        SequentialIDsForModelSpecificStations_407 = 407,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 408).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 408).")]
-        SequentialIDsForModelSpecificStations_408 = 408,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 409).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 409).")]
-        SequentialIDsForModelSpecificStations_409 = 409,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 410).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 410).")]
-        SequentialIDsForModelSpecificStations_410 = 410,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 411).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 411).")]
-        SequentialIDsForModelSpecificStations_411 = 411,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 412).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 412).")]
-        SequentialIDsForModelSpecificStations_412 = 412,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 413).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 413).")]
-        SequentialIDsForModelSpecificStations_413 = 413,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 414).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 414).")]
-        SequentialIDsForModelSpecificStations_414 = 414,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 415).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 415).")]
-        SequentialIDsForModelSpecificStations_415 = 415,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 416).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 416).")]
-        SequentialIDsForModelSpecificStations_416 = 416,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 417).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 417).")]
-        SequentialIDsForModelSpecificStations_417 = 417,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 418).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 418).")]
-        SequentialIDsForModelSpecificStations_418 = 418,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 419).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 419).")]
-        SequentialIDsForModelSpecificStations_419 = 419,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 420).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 420).")]
-        SequentialIDsForModelSpecificStations_420 = 420,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 421).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 421).")]
-        SequentialIDsForModelSpecificStations_421 = 421,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 422).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 422).")]
-        SequentialIDsForModelSpecificStations_422 = 422,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 423).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 423).")]
-        SequentialIDsForModelSpecificStations_423 = 423,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 424).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 424).")]
-        SequentialIDsForModelSpecificStations_424 = 424,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 425).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 425).")]
-        SequentialIDsForModelSpecificStations_425 = 425,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 426).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 426).")]
-        SequentialIDsForModelSpecificStations_426 = 426,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 427).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 427).")]
-        SequentialIDsForModelSpecificStations_427 = 427,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 428).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 428).")]
-        SequentialIDsForModelSpecificStations_428 = 428,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 429).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 429).")]
-        SequentialIDsForModelSpecificStations_429 = 429,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 430).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 430).")]
-        SequentialIDsForModelSpecificStations_430 = 430,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 431).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 431).")]
-        SequentialIDsForModelSpecificStations_431 = 431,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 432).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 432).")]
-        SequentialIDsForModelSpecificStations_432 = 432,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 433).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 433).")]
-        SequentialIDsForModelSpecificStations_433 = 433,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 434).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 434).")]
-        SequentialIDsForModelSpecificStations_434 = 434,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 435).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 435).")]
-        SequentialIDsForModelSpecificStations_435 = 435,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 436).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 436).")]
-        SequentialIDsForModelSpecificStations_436 = 436,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 437).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 437).")]
-        SequentialIDsForModelSpecificStations_437 = 437,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 438).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 438).")]
-        SequentialIDsForModelSpecificStations_438 = 438,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 439).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 439).")]
-        SequentialIDsForModelSpecificStations_439 = 439,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 440).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 440).")]
-        SequentialIDsForModelSpecificStations_440 = 440,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 441).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 441).")]
-        SequentialIDsForModelSpecificStations_441 = 441,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 442).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 442).")]
-        SequentialIDsForModelSpecificStations_442 = 442,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 443).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 443).")]
-        SequentialIDsForModelSpecificStations_443 = 443,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 444).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 444).")]
-        SequentialIDsForModelSpecificStations_444 = 444,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 445).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 445).")]
-        SequentialIDsForModelSpecificStations_445 = 445,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 446).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 446).")]
-        SequentialIDsForModelSpecificStations_446 = 446,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 447).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 447).")]
-        SequentialIDsForModelSpecificStations_447 = 447,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 448).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 448).")]
-        SequentialIDsForModelSpecificStations_448 = 448,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 449).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 449).")]
-        SequentialIDsForModelSpecificStations_449 = 449,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 450).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 450).")]
-        SequentialIDsForModelSpecificStations_450 = 450,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 451).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 451).")]
-        SequentialIDsForModelSpecificStations_451 = 451,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 452).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 452).")]
-        SequentialIDsForModelSpecificStations_452 = 452,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 453).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 453).")]
-        SequentialIDsForModelSpecificStations_453 = 453,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 454).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 454).")]
-        SequentialIDsForModelSpecificStations_454 = 454,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 455).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 455).")]
-        SequentialIDsForModelSpecificStations_455 = 455,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 456).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 456).")]
-        SequentialIDsForModelSpecificStations_456 = 456,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 457).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 457).")]
-        SequentialIDsForModelSpecificStations_457 = 457,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 458).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 458).")]
-        SequentialIDsForModelSpecificStations_458 = 458,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 459).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 459).")]
-        SequentialIDsForModelSpecificStations_459 = 459,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 460).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 460).")]
-        SequentialIDsForModelSpecificStations_460 = 460,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 461).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 461).")]
-        SequentialIDsForModelSpecificStations_461 = 461,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 462).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 462).")]
-        SequentialIDsForModelSpecificStations_462 = 462,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 463).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 463).")]
-        SequentialIDsForModelSpecificStations_463 = 463,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 464).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 464).")]
-        SequentialIDsForModelSpecificStations_464 = 464,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 465).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 465).")]
-        SequentialIDsForModelSpecificStations_465 = 465,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 466).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 466).")]
-        SequentialIDsForModelSpecificStations_466 = 466,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 467).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 467).")]
-        SequentialIDsForModelSpecificStations_467 = 467,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 468).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 468).")]
-        SequentialIDsForModelSpecificStations_468 = 468,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 469).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 469).")]
-        SequentialIDsForModelSpecificStations_469 = 469,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 470).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 470).")]
-        SequentialIDsForModelSpecificStations_470 = 470,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 471).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 471).")]
-        SequentialIDsForModelSpecificStations_471 = 471,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 472).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 472).")]
-        SequentialIDsForModelSpecificStations_472 = 472,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 473).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 473).")]
-        SequentialIDsForModelSpecificStations_473 = 473,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 474).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 474).")]
-        SequentialIDsForModelSpecificStations_474 = 474,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 475).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 475).")]
-        SequentialIDsForModelSpecificStations_475 = 475,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 476).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 476).")]
-        SequentialIDsForModelSpecificStations_476 = 476,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 477).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 477).")]
-        SequentialIDsForModelSpecificStations_477 = 477,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 478).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 478).")]
-        SequentialIDsForModelSpecificStations_478 = 478,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 479).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 479).")]
-        SequentialIDsForModelSpecificStations_479 = 479,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 480).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 480).")]
-        SequentialIDsForModelSpecificStations_480 = 480,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 481).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 481).")]
-        SequentialIDsForModelSpecificStations_481 = 481,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 482).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 482).")]
-        SequentialIDsForModelSpecificStations_482 = 482,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 483).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 483).")]
-        SequentialIDsForModelSpecificStations_483 = 483,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 484).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 484).")]
-        SequentialIDsForModelSpecificStations_484 = 484,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 485).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 485).")]
-        SequentialIDsForModelSpecificStations_485 = 485,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 486).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 486).")]
-        SequentialIDsForModelSpecificStations_486 = 486,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 487).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 487).")]
-        SequentialIDsForModelSpecificStations_487 = 487,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 488).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 488).")]
-        SequentialIDsForModelSpecificStations_488 = 488,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 489).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 489).")]
-        SequentialIDsForModelSpecificStations_489 = 489,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 490).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 490).")]
-        SequentialIDsForModelSpecificStations_490 = 490,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 491).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 491).")]
-        SequentialIDsForModelSpecificStations_491 = 491,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 492).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 492).")]
-        SequentialIDsForModelSpecificStations_492 = 492,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 493).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 493).")]
-        SequentialIDsForModelSpecificStations_493 = 493,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 494).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 494).")]
-        SequentialIDsForModelSpecificStations_494 = 494,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 495).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 495).")]
-        SequentialIDsForModelSpecificStations_495 = 495,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 496).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 496).")]
-        SequentialIDsForModelSpecificStations_496 = 496,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 497).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 497).")]
-        SequentialIDsForModelSpecificStations_497 = 497,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 498).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 498).")]
-        SequentialIDsForModelSpecificStations_498 = 498,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 499).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 499).")]
-        SequentialIDsForModelSpecificStations_499 = 499,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 500).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 500).")]
-        SequentialIDsForModelSpecificStations_500 = 500,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 501).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 501).")]
-        SequentialIDsForModelSpecificStations_501 = 501,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 502).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 502).")]
-        SequentialIDsForModelSpecificStations_502 = 502,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 503).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 503).")]
-        SequentialIDsForModelSpecificStations_503 = 503,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 504).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 504).")]
-        SequentialIDsForModelSpecificStations_504 = 504,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 505).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 505).")]
-        SequentialIDsForModelSpecificStations_505 = 505,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 506).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 506).")]
-        SequentialIDsForModelSpecificStations_506 = 506,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 507).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 507).")]
-        SequentialIDsForModelSpecificStations_507 = 507,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 508).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 508).")]
-        SequentialIDsForModelSpecificStations_508 = 508,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 509).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 509).")]
-        SequentialIDsForModelSpecificStations_509 = 509,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 510).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 510).")]
-        SequentialIDsForModelSpecificStations_510 = 510,
-
-        /// <summary>
-        /// Sequential IDs for model-specific stations (with id 511).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sequential IDs for model-specific stations (with id 511).")]
-        SequentialIDsForModelSpecificStations_511 = 511,
-
-        /// <summary>
-        /// Fuselage Stations (with id 512).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 512).")]
-        FuselageStations_512 = 512,
-
-        /// <summary>
-        /// Fuselage Stations (with id 513).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 513).")]
-        FuselageStations_513 = 513,
-
-        /// <summary>
-        /// Fuselage Stations (with id 514).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 514).")]
-        FuselageStations_514 = 514,
-
-        /// <summary>
-        /// Fuselage Stations (with id 515).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 515).")]
-        FuselageStations_515 = 515,
-
-        /// <summary>
-        /// Fuselage Stations (with id 516).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 516).")]
-        FuselageStations_516 = 516,
-
-        /// <summary>
-        /// Fuselage Stations (with id 517).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 517).")]
-        FuselageStations_517 = 517,
-
-        /// <summary>
-        /// Fuselage Stations (with id 518).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 518).")]
-        FuselageStations_518 = 518,
-
-        /// <summary>
-        /// Fuselage Stations (with id 519).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 519).")]
-        FuselageStations_519 = 519,
-
-        /// <summary>
-        /// Fuselage Stations (with id 520).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 520).")]
-        FuselageStations_520 = 520,
-
-        /// <summary>
-        /// Fuselage Stations (with id 521).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 521).")]
-        FuselageStations_521 = 521,
-
-        /// <summary>
-        /// Fuselage Stations (with id 522).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 522).")]
-        FuselageStations_522 = 522,
-
-        /// <summary>
-        /// Fuselage Stations (with id 523).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 523).")]
-        FuselageStations_523 = 523,
-
-        /// <summary>
-        /// Fuselage Stations (with id 524).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 524).")]
-        FuselageStations_524 = 524,
-
-        /// <summary>
-        /// Fuselage Stations (with id 525).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 525).")]
-        FuselageStations_525 = 525,
-
-        /// <summary>
-        /// Fuselage Stations (with id 526).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 526).")]
-        FuselageStations_526 = 526,
-
-        /// <summary>
-        /// Fuselage Stations (with id 527).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 527).")]
-        FuselageStations_527 = 527,
-
-        /// <summary>
-        /// Fuselage Stations (with id 528).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 528).")]
-        FuselageStations_528 = 528,
-
-        /// <summary>
-        /// Fuselage Stations (with id 529).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 529).")]
-        FuselageStations_529 = 529,
-
-        /// <summary>
-        /// Fuselage Stations (with id 530).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 530).")]
-        FuselageStations_530 = 530,
-
-        /// <summary>
-        /// Fuselage Stations (with id 531).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 531).")]
-        FuselageStations_531 = 531,
-
-        /// <summary>
-        /// Fuselage Stations (with id 532).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 532).")]
-        FuselageStations_532 = 532,
-
-        /// <summary>
-        /// Fuselage Stations (with id 533).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 533).")]
-        FuselageStations_533 = 533,
-
-        /// <summary>
-        /// Fuselage Stations (with id 534).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 534).")]
-        FuselageStations_534 = 534,
-
-        /// <summary>
-        /// Fuselage Stations (with id 535).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 535).")]
-        FuselageStations_535 = 535,
-
-        /// <summary>
-        /// Fuselage Stations (with id 536).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 536).")]
-        FuselageStations_536 = 536,
-
-        /// <summary>
-        /// Fuselage Stations (with id 537).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 537).")]
-        FuselageStations_537 = 537,
-
-        /// <summary>
-        /// Fuselage Stations (with id 538).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 538).")]
-        FuselageStations_538 = 538,
-
-        /// <summary>
-        /// Fuselage Stations (with id 539).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 539).")]
-        FuselageStations_539 = 539,
-
-        /// <summary>
-        /// Fuselage Stations (with id 540).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 540).")]
-        FuselageStations_540 = 540,
-
-        /// <summary>
-        /// Fuselage Stations (with id 541).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 541).")]
-        FuselageStations_541 = 541,
-
-        /// <summary>
-        /// Fuselage Stations (with id 542).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 542).")]
-        FuselageStations_542 = 542,
-
-        /// <summary>
-        /// Fuselage Stations (with id 543).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 543).")]
-        FuselageStations_543 = 543,
-
-        /// <summary>
-        /// Fuselage Stations (with id 544).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 544).")]
-        FuselageStations_544 = 544,
-
-        /// <summary>
-        /// Fuselage Stations (with id 545).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 545).")]
-        FuselageStations_545 = 545,
-
-        /// <summary>
-        /// Fuselage Stations (with id 546).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 546).")]
-        FuselageStations_546 = 546,
-
-        /// <summary>
-        /// Fuselage Stations (with id 547).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 547).")]
-        FuselageStations_547 = 547,
-
-        /// <summary>
-        /// Fuselage Stations (with id 548).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 548).")]
-        FuselageStations_548 = 548,
-
-        /// <summary>
-        /// Fuselage Stations (with id 549).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 549).")]
-        FuselageStations_549 = 549,
-
-        /// <summary>
-        /// Fuselage Stations (with id 550).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 550).")]
-        FuselageStations_550 = 550,
-
-        /// <summary>
-        /// Fuselage Stations (with id 551).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 551).")]
-        FuselageStations_551 = 551,
-
-        /// <summary>
-        /// Fuselage Stations (with id 552).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 552).")]
-        FuselageStations_552 = 552,
-
-        /// <summary>
-        /// Fuselage Stations (with id 553).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 553).")]
-        FuselageStations_553 = 553,
-
-        /// <summary>
-        /// Fuselage Stations (with id 554).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 554).")]
-        FuselageStations_554 = 554,
-
-        /// <summary>
-        /// Fuselage Stations (with id 555).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 555).")]
-        FuselageStations_555 = 555,
-
-        /// <summary>
-        /// Fuselage Stations (with id 556).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 556).")]
-        FuselageStations_556 = 556,
-
-        /// <summary>
-        /// Fuselage Stations (with id 557).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 557).")]
-        FuselageStations_557 = 557,
-
-        /// <summary>
-        /// Fuselage Stations (with id 558).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 558).")]
-        FuselageStations_558 = 558,
-
-        /// <summary>
-        /// Fuselage Stations (with id 559).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 559).")]
-        FuselageStations_559 = 559,
-
-        /// <summary>
-        /// Fuselage Stations (with id 560).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 560).")]
-        FuselageStations_560 = 560,
-
-        /// <summary>
-        /// Fuselage Stations (with id 561).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 561).")]
-        FuselageStations_561 = 561,
-
-        /// <summary>
-        /// Fuselage Stations (with id 562).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 562).")]
-        FuselageStations_562 = 562,
-
-        /// <summary>
-        /// Fuselage Stations (with id 563).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 563).")]
-        FuselageStations_563 = 563,
-
-        /// <summary>
-        /// Fuselage Stations (with id 564).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 564).")]
-        FuselageStations_564 = 564,
-
-        /// <summary>
-        /// Fuselage Stations (with id 565).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 565).")]
-        FuselageStations_565 = 565,
-
-        /// <summary>
-        /// Fuselage Stations (with id 566).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 566).")]
-        FuselageStations_566 = 566,
-
-        /// <summary>
-        /// Fuselage Stations (with id 567).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 567).")]
-        FuselageStations_567 = 567,
-
-        /// <summary>
-        /// Fuselage Stations (with id 568).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 568).")]
-        FuselageStations_568 = 568,
-
-        /// <summary>
-        /// Fuselage Stations (with id 569).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 569).")]
-        FuselageStations_569 = 569,
-
-        /// <summary>
-        /// Fuselage Stations (with id 570).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 570).")]
-        FuselageStations_570 = 570,
-
-        /// <summary>
-        /// Fuselage Stations (with id 571).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 571).")]
-        FuselageStations_571 = 571,
-
-        /// <summary>
-        /// Fuselage Stations (with id 572).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 572).")]
-        FuselageStations_572 = 572,
-
-        /// <summary>
-        /// Fuselage Stations (with id 573).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 573).")]
-        FuselageStations_573 = 573,
-
-        /// <summary>
-        /// Fuselage Stations (with id 574).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 574).")]
-        FuselageStations_574 = 574,
-
-        /// <summary>
-        /// Fuselage Stations (with id 575).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 575).")]
-        FuselageStations_575 = 575,
-
-        /// <summary>
-        /// Fuselage Stations (with id 576).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 576).")]
-        FuselageStations_576 = 576,
-
-        /// <summary>
-        /// Fuselage Stations (with id 577).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 577).")]
-        FuselageStations_577 = 577,
-
-        /// <summary>
-        /// Fuselage Stations (with id 578).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 578).")]
-        FuselageStations_578 = 578,
-
-        /// <summary>
-        /// Fuselage Stations (with id 579).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 579).")]
-        FuselageStations_579 = 579,
-
-        /// <summary>
-        /// Fuselage Stations (with id 580).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 580).")]
-        FuselageStations_580 = 580,
-
-        /// <summary>
-        /// Fuselage Stations (with id 581).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 581).")]
-        FuselageStations_581 = 581,
-
-        /// <summary>
-        /// Fuselage Stations (with id 582).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 582).")]
-        FuselageStations_582 = 582,
-
-        /// <summary>
-        /// Fuselage Stations (with id 583).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 583).")]
-        FuselageStations_583 = 583,
-
-        /// <summary>
-        /// Fuselage Stations (with id 584).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 584).")]
-        FuselageStations_584 = 584,
-
-        /// <summary>
-        /// Fuselage Stations (with id 585).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 585).")]
-        FuselageStations_585 = 585,
-
-        /// <summary>
-        /// Fuselage Stations (with id 586).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 586).")]
-        FuselageStations_586 = 586,
-
-        /// <summary>
-        /// Fuselage Stations (with id 587).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 587).")]
-        FuselageStations_587 = 587,
-
-        /// <summary>
-        /// Fuselage Stations (with id 588).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 588).")]
-        FuselageStations_588 = 588,
-
-        /// <summary>
-        /// Fuselage Stations (with id 589).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 589).")]
-        FuselageStations_589 = 589,
-
-        /// <summary>
-        /// Fuselage Stations (with id 590).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 590).")]
-        FuselageStations_590 = 590,
-
-        /// <summary>
-        /// Fuselage Stations (with id 591).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 591).")]
-        FuselageStations_591 = 591,
-
-        /// <summary>
-        /// Fuselage Stations (with id 592).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 592).")]
-        FuselageStations_592 = 592,
-
-        /// <summary>
-        /// Fuselage Stations (with id 593).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 593).")]
-        FuselageStations_593 = 593,
-
-        /// <summary>
-        /// Fuselage Stations (with id 594).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 594).")]
-        FuselageStations_594 = 594,
-
-        /// <summary>
-        /// Fuselage Stations (with id 595).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 595).")]
-        FuselageStations_595 = 595,
-
-        /// <summary>
-        /// Fuselage Stations (with id 596).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 596).")]
-        FuselageStations_596 = 596,
-
-        /// <summary>
-        /// Fuselage Stations (with id 597).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 597).")]
-        FuselageStations_597 = 597,
-
-        /// <summary>
-        /// Fuselage Stations (with id 598).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 598).")]
-        FuselageStations_598 = 598,
-
-        /// <summary>
-        /// Fuselage Stations (with id 599).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 599).")]
-        FuselageStations_599 = 599,
-
-        /// <summary>
-        /// Fuselage Stations (with id 600).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 600).")]
-        FuselageStations_600 = 600,
-
-        /// <summary>
-        /// Fuselage Stations (with id 601).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 601).")]
-        FuselageStations_601 = 601,
-
-        /// <summary>
-        /// Fuselage Stations (with id 602).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 602).")]
-        FuselageStations_602 = 602,
-
-        /// <summary>
-        /// Fuselage Stations (with id 603).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 603).")]
-        FuselageStations_603 = 603,
-
-        /// <summary>
-        /// Fuselage Stations (with id 604).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 604).")]
-        FuselageStations_604 = 604,
-
-        /// <summary>
-        /// Fuselage Stations (with id 605).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 605).")]
-        FuselageStations_605 = 605,
-
-        /// <summary>
-        /// Fuselage Stations (with id 606).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 606).")]
-        FuselageStations_606 = 606,
-
-        /// <summary>
-        /// Fuselage Stations (with id 607).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 607).")]
-        FuselageStations_607 = 607,
-
-        /// <summary>
-        /// Fuselage Stations (with id 608).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 608).")]
-        FuselageStations_608 = 608,
-
-        /// <summary>
-        /// Fuselage Stations (with id 609).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 609).")]
-        FuselageStations_609 = 609,
-
-        /// <summary>
-        /// Fuselage Stations (with id 610).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 610).")]
-        FuselageStations_610 = 610,
-
-        /// <summary>
-        /// Fuselage Stations (with id 611).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 611).")]
-        FuselageStations_611 = 611,
-
-        /// <summary>
-        /// Fuselage Stations (with id 612).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 612).")]
-        FuselageStations_612 = 612,
-
-        /// <summary>
-        /// Fuselage Stations (with id 613).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 613).")]
-        FuselageStations_613 = 613,
-
-        /// <summary>
-        /// Fuselage Stations (with id 614).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 614).")]
-        FuselageStations_614 = 614,
-
-        /// <summary>
-        /// Fuselage Stations (with id 615).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 615).")]
-        FuselageStations_615 = 615,
-
-        /// <summary>
-        /// Fuselage Stations (with id 616).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 616).")]
-        FuselageStations_616 = 616,
-
-        /// <summary>
-        /// Fuselage Stations (with id 617).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 617).")]
-        FuselageStations_617 = 617,
-
-        /// <summary>
-        /// Fuselage Stations (with id 618).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 618).")]
-        FuselageStations_618 = 618,
-
-        /// <summary>
-        /// Fuselage Stations (with id 619).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 619).")]
-        FuselageStations_619 = 619,
-
-        /// <summary>
-        /// Fuselage Stations (with id 620).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 620).")]
-        FuselageStations_620 = 620,
-
-        /// <summary>
-        /// Fuselage Stations (with id 621).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 621).")]
-        FuselageStations_621 = 621,
-
-        /// <summary>
-        /// Fuselage Stations (with id 622).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 622).")]
-        FuselageStations_622 = 622,
-
-        /// <summary>
-        /// Fuselage Stations (with id 623).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 623).")]
-        FuselageStations_623 = 623,
-
-        /// <summary>
-        /// Fuselage Stations (with id 624).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 624).")]
-        FuselageStations_624 = 624,
-
-        /// <summary>
-        /// Fuselage Stations (with id 625).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 625).")]
-        FuselageStations_625 = 625,
-
-        /// <summary>
-        /// Fuselage Stations (with id 626).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 626).")]
-        FuselageStations_626 = 626,
-
-        /// <summary>
-        /// Fuselage Stations (with id 627).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 627).")]
-        FuselageStations_627 = 627,
-
-        /// <summary>
-        /// Fuselage Stations (with id 628).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 628).")]
-        FuselageStations_628 = 628,
-
-        /// <summary>
-        /// Fuselage Stations (with id 629).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 629).")]
-        FuselageStations_629 = 629,
-
-        /// <summary>
-        /// Fuselage Stations (with id 630).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 630).")]
-        FuselageStations_630 = 630,
-
-        /// <summary>
-        /// Fuselage Stations (with id 631).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 631).")]
-        FuselageStations_631 = 631,
-
-        /// <summary>
-        /// Fuselage Stations (with id 632).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 632).")]
-        FuselageStations_632 = 632,
-
-        /// <summary>
-        /// Fuselage Stations (with id 633).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 633).")]
-        FuselageStations_633 = 633,
-
-        /// <summary>
-        /// Fuselage Stations (with id 634).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 634).")]
-        FuselageStations_634 = 634,
-
-        /// <summary>
-        /// Fuselage Stations (with id 635).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 635).")]
-        FuselageStations_635 = 635,
-
-        /// <summary>
-        /// Fuselage Stations (with id 636).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 636).")]
-        FuselageStations_636 = 636,
-
-        /// <summary>
-        /// Fuselage Stations (with id 637).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 637).")]
-        FuselageStations_637 = 637,
-
-        /// <summary>
-        /// Fuselage Stations (with id 638).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 638).")]
-        FuselageStations_638 = 638,
-
-        /// <summary>
-        /// Fuselage Stations (with id 639).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuselage Stations (with id 639).")]
-        FuselageStations_639 = 639,
-
-        /// <summary>
-        /// Left-wing Stations (with id 640).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 640).")]
-        LeftWingStations_640 = 640,
-
-        /// <summary>
-        /// Left-wing Stations (with id 641).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 641).")]
-        LeftWingStations_641 = 641,
-
-        /// <summary>
-        /// Left-wing Stations (with id 642).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 642).")]
-        LeftWingStations_642 = 642,
-
-        /// <summary>
-        /// Left-wing Stations (with id 643).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 643).")]
-        LeftWingStations_643 = 643,
-
-        /// <summary>
-        /// Left-wing Stations (with id 644).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 644).")]
-        LeftWingStations_644 = 644,
-
-        /// <summary>
-        /// Left-wing Stations (with id 645).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 645).")]
-        LeftWingStations_645 = 645,
-
-        /// <summary>
-        /// Left-wing Stations (with id 646).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 646).")]
-        LeftWingStations_646 = 646,
-
-        /// <summary>
-        /// Left-wing Stations (with id 647).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 647).")]
-        LeftWingStations_647 = 647,
-
-        /// <summary>
-        /// Left-wing Stations (with id 648).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 648).")]
-        LeftWingStations_648 = 648,
-
-        /// <summary>
-        /// Left-wing Stations (with id 649).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 649).")]
-        LeftWingStations_649 = 649,
-
-        /// <summary>
-        /// Left-wing Stations (with id 650).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 650).")]
-        LeftWingStations_650 = 650,
-
-        /// <summary>
-        /// Left-wing Stations (with id 651).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 651).")]
-        LeftWingStations_651 = 651,
-
-        /// <summary>
-        /// Left-wing Stations (with id 652).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 652).")]
-        LeftWingStations_652 = 652,
-
-        /// <summary>
-        /// Left-wing Stations (with id 653).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 653).")]
-        LeftWingStations_653 = 653,
-
-        /// <summary>
-        /// Left-wing Stations (with id 654).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 654).")]
-        LeftWingStations_654 = 654,
-
-        /// <summary>
-        /// Left-wing Stations (with id 655).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 655).")]
-        LeftWingStations_655 = 655,
-
-        /// <summary>
-        /// Left-wing Stations (with id 656).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 656).")]
-        LeftWingStations_656 = 656,
-
-        /// <summary>
-        /// Left-wing Stations (with id 657).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 657).")]
-        LeftWingStations_657 = 657,
-
-        /// <summary>
-        /// Left-wing Stations (with id 658).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 658).")]
-        LeftWingStations_658 = 658,
-
-        /// <summary>
-        /// Left-wing Stations (with id 659).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 659).")]
-        LeftWingStations_659 = 659,
-
-        /// <summary>
-        /// Left-wing Stations (with id 660).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 660).")]
-        LeftWingStations_660 = 660,
-
-        /// <summary>
-        /// Left-wing Stations (with id 661).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 661).")]
-        LeftWingStations_661 = 661,
-
-        /// <summary>
-        /// Left-wing Stations (with id 662).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 662).")]
-        LeftWingStations_662 = 662,
-
-        /// <summary>
-        /// Left-wing Stations (with id 663).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 663).")]
-        LeftWingStations_663 = 663,
-
-        /// <summary>
-        /// Left-wing Stations (with id 664).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 664).")]
-        LeftWingStations_664 = 664,
-
-        /// <summary>
-        /// Left-wing Stations (with id 665).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 665).")]
-        LeftWingStations_665 = 665,
-
-        /// <summary>
-        /// Left-wing Stations (with id 666).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 666).")]
-        LeftWingStations_666 = 666,
-
-        /// <summary>
-        /// Left-wing Stations (with id 667).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 667).")]
-        LeftWingStations_667 = 667,
-
-        /// <summary>
-        /// Left-wing Stations (with id 668).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 668).")]
-        LeftWingStations_668 = 668,
-
-        /// <summary>
-        /// Left-wing Stations (with id 669).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 669).")]
-        LeftWingStations_669 = 669,
-
-        /// <summary>
-        /// Left-wing Stations (with id 670).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 670).")]
-        LeftWingStations_670 = 670,
-
-        /// <summary>
-        /// Left-wing Stations (with id 671).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 671).")]
-        LeftWingStations_671 = 671,
-
-        /// <summary>
-        /// Left-wing Stations (with id 672).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 672).")]
-        LeftWingStations_672 = 672,
-
-        /// <summary>
-        /// Left-wing Stations (with id 673).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 673).")]
-        LeftWingStations_673 = 673,
-
-        /// <summary>
-        /// Left-wing Stations (with id 674).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 674).")]
-        LeftWingStations_674 = 674,
-
-        /// <summary>
-        /// Left-wing Stations (with id 675).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 675).")]
-        LeftWingStations_675 = 675,
-
-        /// <summary>
-        /// Left-wing Stations (with id 676).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 676).")]
-        LeftWingStations_676 = 676,
-
-        /// <summary>
-        /// Left-wing Stations (with id 677).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 677).")]
-        LeftWingStations_677 = 677,
-
-        /// <summary>
-        /// Left-wing Stations (with id 678).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 678).")]
-        LeftWingStations_678 = 678,
-
-        /// <summary>
-        /// Left-wing Stations (with id 679).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 679).")]
-        LeftWingStations_679 = 679,
-
-        /// <summary>
-        /// Left-wing Stations (with id 680).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 680).")]
-        LeftWingStations_680 = 680,
-
-        /// <summary>
-        /// Left-wing Stations (with id 681).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 681).")]
-        LeftWingStations_681 = 681,
-
-        /// <summary>
-        /// Left-wing Stations (with id 682).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 682).")]
-        LeftWingStations_682 = 682,
-
-        /// <summary>
-        /// Left-wing Stations (with id 683).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 683).")]
-        LeftWingStations_683 = 683,
-
-        /// <summary>
-        /// Left-wing Stations (with id 684).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 684).")]
-        LeftWingStations_684 = 684,
-
-        /// <summary>
-        /// Left-wing Stations (with id 685).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 685).")]
-        LeftWingStations_685 = 685,
-
-        /// <summary>
-        /// Left-wing Stations (with id 686).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 686).")]
-        LeftWingStations_686 = 686,
-
-        /// <summary>
-        /// Left-wing Stations (with id 687).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 687).")]
-        LeftWingStations_687 = 687,
-
-        /// <summary>
-        /// Left-wing Stations (with id 688).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 688).")]
-        LeftWingStations_688 = 688,
-
-        /// <summary>
-        /// Left-wing Stations (with id 689).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 689).")]
-        LeftWingStations_689 = 689,
-
-        /// <summary>
-        /// Left-wing Stations (with id 690).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 690).")]
-        LeftWingStations_690 = 690,
-
-        /// <summary>
-        /// Left-wing Stations (with id 691).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 691).")]
-        LeftWingStations_691 = 691,
-
-        /// <summary>
-        /// Left-wing Stations (with id 692).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 692).")]
-        LeftWingStations_692 = 692,
-
-        /// <summary>
-        /// Left-wing Stations (with id 693).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 693).")]
-        LeftWingStations_693 = 693,
-
-        /// <summary>
-        /// Left-wing Stations (with id 694).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 694).")]
-        LeftWingStations_694 = 694,
-
-        /// <summary>
-        /// Left-wing Stations (with id 695).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 695).")]
-        LeftWingStations_695 = 695,
-
-        /// <summary>
-        /// Left-wing Stations (with id 696).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 696).")]
-        LeftWingStations_696 = 696,
-
-        /// <summary>
-        /// Left-wing Stations (with id 697).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 697).")]
-        LeftWingStations_697 = 697,
-
-        /// <summary>
-        /// Left-wing Stations (with id 698).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 698).")]
-        LeftWingStations_698 = 698,
-
-        /// <summary>
-        /// Left-wing Stations (with id 699).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 699).")]
-        LeftWingStations_699 = 699,
-
-        /// <summary>
-        /// Left-wing Stations (with id 700).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 700).")]
-        LeftWingStations_700 = 700,
-
-        /// <summary>
-        /// Left-wing Stations (with id 701).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 701).")]
-        LeftWingStations_701 = 701,
-
-        /// <summary>
-        /// Left-wing Stations (with id 702).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 702).")]
-        LeftWingStations_702 = 702,
-
-        /// <summary>
-        /// Left-wing Stations (with id 703).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 703).")]
-        LeftWingStations_703 = 703,
-
-        /// <summary>
-        /// Left-wing Stations (with id 704).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 704).")]
-        LeftWingStations_704 = 704,
-
-        /// <summary>
-        /// Left-wing Stations (with id 705).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 705).")]
-        LeftWingStations_705 = 705,
-
-        /// <summary>
-        /// Left-wing Stations (with id 706).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 706).")]
-        LeftWingStations_706 = 706,
-
-        /// <summary>
-        /// Left-wing Stations (with id 707).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 707).")]
-        LeftWingStations_707 = 707,
-
-        /// <summary>
-        /// Left-wing Stations (with id 708).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 708).")]
-        LeftWingStations_708 = 708,
-
-        /// <summary>
-        /// Left-wing Stations (with id 709).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 709).")]
-        LeftWingStations_709 = 709,
-
-        /// <summary>
-        /// Left-wing Stations (with id 710).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 710).")]
-        LeftWingStations_710 = 710,
-
-        /// <summary>
-        /// Left-wing Stations (with id 711).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 711).")]
-        LeftWingStations_711 = 711,
-
-        /// <summary>
-        /// Left-wing Stations (with id 712).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 712).")]
-        LeftWingStations_712 = 712,
-
-        /// <summary>
-        /// Left-wing Stations (with id 713).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 713).")]
-        LeftWingStations_713 = 713,
-
-        /// <summary>
-        /// Left-wing Stations (with id 714).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 714).")]
-        LeftWingStations_714 = 714,
-
-        /// <summary>
-        /// Left-wing Stations (with id 715).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 715).")]
-        LeftWingStations_715 = 715,
-
-        /// <summary>
-        /// Left-wing Stations (with id 716).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 716).")]
-        LeftWingStations_716 = 716,
-
-        /// <summary>
-        /// Left-wing Stations (with id 717).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 717).")]
-        LeftWingStations_717 = 717,
-
-        /// <summary>
-        /// Left-wing Stations (with id 718).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 718).")]
-        LeftWingStations_718 = 718,
-
-        /// <summary>
-        /// Left-wing Stations (with id 719).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 719).")]
-        LeftWingStations_719 = 719,
-
-        /// <summary>
-        /// Left-wing Stations (with id 720).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 720).")]
-        LeftWingStations_720 = 720,
-
-        /// <summary>
-        /// Left-wing Stations (with id 721).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 721).")]
-        LeftWingStations_721 = 721,
-
-        /// <summary>
-        /// Left-wing Stations (with id 722).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 722).")]
-        LeftWingStations_722 = 722,
-
-        /// <summary>
-        /// Left-wing Stations (with id 723).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 723).")]
-        LeftWingStations_723 = 723,
-
-        /// <summary>
-        /// Left-wing Stations (with id 724).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 724).")]
-        LeftWingStations_724 = 724,
-
-        /// <summary>
-        /// Left-wing Stations (with id 725).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 725).")]
-        LeftWingStations_725 = 725,
-
-        /// <summary>
-        /// Left-wing Stations (with id 726).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 726).")]
-        LeftWingStations_726 = 726,
-
-        /// <summary>
-        /// Left-wing Stations (with id 727).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 727).")]
-        LeftWingStations_727 = 727,
-
-        /// <summary>
-        /// Left-wing Stations (with id 728).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 728).")]
-        LeftWingStations_728 = 728,
-
-        /// <summary>
-        /// Left-wing Stations (with id 729).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 729).")]
-        LeftWingStations_729 = 729,
-
-        /// <summary>
-        /// Left-wing Stations (with id 730).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 730).")]
-        LeftWingStations_730 = 730,
-
-        /// <summary>
-        /// Left-wing Stations (with id 731).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 731).")]
-        LeftWingStations_731 = 731,
-
-        /// <summary>
-        /// Left-wing Stations (with id 732).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 732).")]
-        LeftWingStations_732 = 732,
-
-        /// <summary>
-        /// Left-wing Stations (with id 733).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 733).")]
-        LeftWingStations_733 = 733,
-
-        /// <summary>
-        /// Left-wing Stations (with id 734).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 734).")]
-        LeftWingStations_734 = 734,
-
-        /// <summary>
-        /// Left-wing Stations (with id 735).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 735).")]
-        LeftWingStations_735 = 735,
-
-        /// <summary>
-        /// Left-wing Stations (with id 736).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 736).")]
-        LeftWingStations_736 = 736,
-
-        /// <summary>
-        /// Left-wing Stations (with id 737).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 737).")]
-        LeftWingStations_737 = 737,
-
-        /// <summary>
-        /// Left-wing Stations (with id 738).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 738).")]
-        LeftWingStations_738 = 738,
-
-        /// <summary>
-        /// Left-wing Stations (with id 739).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 739).")]
-        LeftWingStations_739 = 739,
-
-        /// <summary>
-        /// Left-wing Stations (with id 740).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 740).")]
-        LeftWingStations_740 = 740,
-
-        /// <summary>
-        /// Left-wing Stations (with id 741).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 741).")]
-        LeftWingStations_741 = 741,
-
-        /// <summary>
-        /// Left-wing Stations (with id 742).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 742).")]
-        LeftWingStations_742 = 742,
-
-        /// <summary>
-        /// Left-wing Stations (with id 743).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 743).")]
-        LeftWingStations_743 = 743,
-
-        /// <summary>
-        /// Left-wing Stations (with id 744).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 744).")]
-        LeftWingStations_744 = 744,
-
-        /// <summary>
-        /// Left-wing Stations (with id 745).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 745).")]
-        LeftWingStations_745 = 745,
-
-        /// <summary>
-        /// Left-wing Stations (with id 746).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 746).")]
-        LeftWingStations_746 = 746,
-
-        /// <summary>
-        /// Left-wing Stations (with id 747).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 747).")]
-        LeftWingStations_747 = 747,
-
-        /// <summary>
-        /// Left-wing Stations (with id 748).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 748).")]
-        LeftWingStations_748 = 748,
-
-        /// <summary>
-        /// Left-wing Stations (with id 749).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 749).")]
-        LeftWingStations_749 = 749,
-
-        /// <summary>
-        /// Left-wing Stations (with id 750).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 750).")]
-        LeftWingStations_750 = 750,
-
-        /// <summary>
-        /// Left-wing Stations (with id 751).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 751).")]
-        LeftWingStations_751 = 751,
-
-        /// <summary>
-        /// Left-wing Stations (with id 752).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 752).")]
-        LeftWingStations_752 = 752,
-
-        /// <summary>
-        /// Left-wing Stations (with id 753).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 753).")]
-        LeftWingStations_753 = 753,
-
-        /// <summary>
-        /// Left-wing Stations (with id 754).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 754).")]
-        LeftWingStations_754 = 754,
-
-        /// <summary>
-        /// Left-wing Stations (with id 755).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 755).")]
-        LeftWingStations_755 = 755,
-
-        /// <summary>
-        /// Left-wing Stations (with id 756).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 756).")]
-        LeftWingStations_756 = 756,
-
-        /// <summary>
-        /// Left-wing Stations (with id 757).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 757).")]
-        LeftWingStations_757 = 757,
-
-        /// <summary>
-        /// Left-wing Stations (with id 758).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 758).")]
-        LeftWingStations_758 = 758,
-
-        /// <summary>
-        /// Left-wing Stations (with id 759).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 759).")]
-        LeftWingStations_759 = 759,
-
-        /// <summary>
-        /// Left-wing Stations (with id 760).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 760).")]
-        LeftWingStations_760 = 760,
-
-        /// <summary>
-        /// Left-wing Stations (with id 761).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 761).")]
-        LeftWingStations_761 = 761,
-
-        /// <summary>
-        /// Left-wing Stations (with id 762).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 762).")]
-        LeftWingStations_762 = 762,
-
-        /// <summary>
-        /// Left-wing Stations (with id 763).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 763).")]
-        LeftWingStations_763 = 763,
-
-        /// <summary>
-        /// Left-wing Stations (with id 764).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 764).")]
-        LeftWingStations_764 = 764,
-
-        /// <summary>
-        /// Left-wing Stations (with id 765).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 765).")]
-        LeftWingStations_765 = 765,
-
-        /// <summary>
-        /// Left-wing Stations (with id 766).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 766).")]
-        LeftWingStations_766 = 766,
-
-        /// <summary>
-        /// Left-wing Stations (with id 767).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left-wing Stations (with id 767).")]
-        LeftWingStations_767 = 767,
-
-        /// <summary>
-        /// Right-wing Stations (with id 768).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 768).")]
-        RightWingStations_768 = 768,
-
-        /// <summary>
-        /// Right-wing Stations (with id 769).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 769).")]
-        RightWingStations_769 = 769,
-
-        /// <summary>
-        /// Right-wing Stations (with id 770).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 770).")]
-        RightWingStations_770 = 770,
-
-        /// <summary>
-        /// Right-wing Stations (with id 771).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 771).")]
-        RightWingStations_771 = 771,
-
-        /// <summary>
-        /// Right-wing Stations (with id 772).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 772).")]
-        RightWingStations_772 = 772,
-
-        /// <summary>
-        /// Right-wing Stations (with id 773).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 773).")]
-        RightWingStations_773 = 773,
-
-        /// <summary>
-        /// Right-wing Stations (with id 774).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 774).")]
-        RightWingStations_774 = 774,
-
-        /// <summary>
-        /// Right-wing Stations (with id 775).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 775).")]
-        RightWingStations_775 = 775,
-
-        /// <summary>
-        /// Right-wing Stations (with id 776).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 776).")]
-        RightWingStations_776 = 776,
-
-        /// <summary>
-        /// Right-wing Stations (with id 777).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 777).")]
-        RightWingStations_777 = 777,
-
-        /// <summary>
-        /// Right-wing Stations (with id 778).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 778).")]
-        RightWingStations_778 = 778,
-
-        /// <summary>
-        /// Right-wing Stations (with id 779).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 779).")]
-        RightWingStations_779 = 779,
-
-        /// <summary>
-        /// Right-wing Stations (with id 780).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 780).")]
-        RightWingStations_780 = 780,
-
-        /// <summary>
-        /// Right-wing Stations (with id 781).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 781).")]
-        RightWingStations_781 = 781,
-
-        /// <summary>
-        /// Right-wing Stations (with id 782).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 782).")]
-        RightWingStations_782 = 782,
-
-        /// <summary>
-        /// Right-wing Stations (with id 783).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 783).")]
-        RightWingStations_783 = 783,
-
-        /// <summary>
-        /// Right-wing Stations (with id 784).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 784).")]
-        RightWingStations_784 = 784,
-
-        /// <summary>
-        /// Right-wing Stations (with id 785).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 785).")]
-        RightWingStations_785 = 785,
-
-        /// <summary>
-        /// Right-wing Stations (with id 786).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 786).")]
-        RightWingStations_786 = 786,
-
-        /// <summary>
-        /// Right-wing Stations (with id 787).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 787).")]
-        RightWingStations_787 = 787,
-
-        /// <summary>
-        /// Right-wing Stations (with id 788).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 788).")]
-        RightWingStations_788 = 788,
-
-        /// <summary>
-        /// Right-wing Stations (with id 789).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 789).")]
-        RightWingStations_789 = 789,
-
-        /// <summary>
-        /// Right-wing Stations (with id 790).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 790).")]
-        RightWingStations_790 = 790,
-
-        /// <summary>
-        /// Right-wing Stations (with id 791).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 791).")]
-        RightWingStations_791 = 791,
-
-        /// <summary>
-        /// Right-wing Stations (with id 792).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 792).")]
-        RightWingStations_792 = 792,
-
-        /// <summary>
-        /// Right-wing Stations (with id 793).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 793).")]
-        RightWingStations_793 = 793,
-
-        /// <summary>
-        /// Right-wing Stations (with id 794).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 794).")]
-        RightWingStations_794 = 794,
-
-        /// <summary>
-        /// Right-wing Stations (with id 795).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 795).")]
-        RightWingStations_795 = 795,
-
-        /// <summary>
-        /// Right-wing Stations (with id 796).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 796).")]
-        RightWingStations_796 = 796,
-
-        /// <summary>
-        /// Right-wing Stations (with id 797).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 797).")]
-        RightWingStations_797 = 797,
-
-        /// <summary>
-        /// Right-wing Stations (with id 798).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 798).")]
-        RightWingStations_798 = 798,
-
-        /// <summary>
-        /// Right-wing Stations (with id 799).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 799).")]
-        RightWingStations_799 = 799,
-
-        /// <summary>
-        /// Right-wing Stations (with id 800).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 800).")]
-        RightWingStations_800 = 800,
-
-        /// <summary>
-        /// Right-wing Stations (with id 801).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 801).")]
-        RightWingStations_801 = 801,
-
-        /// <summary>
-        /// Right-wing Stations (with id 802).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 802).")]
-        RightWingStations_802 = 802,
-
-        /// <summary>
-        /// Right-wing Stations (with id 803).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 803).")]
-        RightWingStations_803 = 803,
-
-        /// <summary>
-        /// Right-wing Stations (with id 804).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 804).")]
-        RightWingStations_804 = 804,
-
-        /// <summary>
-        /// Right-wing Stations (with id 805).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 805).")]
-        RightWingStations_805 = 805,
-
-        /// <summary>
-        /// Right-wing Stations (with id 806).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 806).")]
-        RightWingStations_806 = 806,
-
-        /// <summary>
-        /// Right-wing Stations (with id 807).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 807).")]
-        RightWingStations_807 = 807,
-
-        /// <summary>
-        /// Right-wing Stations (with id 808).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 808).")]
-        RightWingStations_808 = 808,
-
-        /// <summary>
-        /// Right-wing Stations (with id 809).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 809).")]
-        RightWingStations_809 = 809,
-
-        /// <summary>
-        /// Right-wing Stations (with id 810).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 810).")]
-        RightWingStations_810 = 810,
-
-        /// <summary>
-        /// Right-wing Stations (with id 811).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 811).")]
-        RightWingStations_811 = 811,
-
-        /// <summary>
-        /// Right-wing Stations (with id 812).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 812).")]
-        RightWingStations_812 = 812,
-
-        /// <summary>
-        /// Right-wing Stations (with id 813).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 813).")]
-        RightWingStations_813 = 813,
-
-        /// <summary>
-        /// Right-wing Stations (with id 814).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 814).")]
-        RightWingStations_814 = 814,
-
-        /// <summary>
-        /// Right-wing Stations (with id 815).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 815).")]
-        RightWingStations_815 = 815,
-
-        /// <summary>
-        /// Right-wing Stations (with id 816).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 816).")]
-        RightWingStations_816 = 816,
-
-        /// <summary>
-        /// Right-wing Stations (with id 817).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 817).")]
-        RightWingStations_817 = 817,
-
-        /// <summary>
-        /// Right-wing Stations (with id 818).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 818).")]
-        RightWingStations_818 = 818,
-
-        /// <summary>
-        /// Right-wing Stations (with id 819).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 819).")]
-        RightWingStations_819 = 819,
-
-        /// <summary>
-        /// Right-wing Stations (with id 820).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 820).")]
-        RightWingStations_820 = 820,
-
-        /// <summary>
-        /// Right-wing Stations (with id 821).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 821).")]
-        RightWingStations_821 = 821,
-
-        /// <summary>
-        /// Right-wing Stations (with id 822).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 822).")]
-        RightWingStations_822 = 822,
-
-        /// <summary>
-        /// Right-wing Stations (with id 823).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 823).")]
-        RightWingStations_823 = 823,
-
-        /// <summary>
-        /// Right-wing Stations (with id 824).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 824).")]
-        RightWingStations_824 = 824,
-
-        /// <summary>
-        /// Right-wing Stations (with id 825).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 825).")]
-        RightWingStations_825 = 825,
-
-        /// <summary>
-        /// Right-wing Stations (with id 826).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 826).")]
-        RightWingStations_826 = 826,
-
-        /// <summary>
-        /// Right-wing Stations (with id 827).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 827).")]
-        RightWingStations_827 = 827,
-
-        /// <summary>
-        /// Right-wing Stations (with id 828).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 828).")]
-        RightWingStations_828 = 828,
-
-        /// <summary>
-        /// Right-wing Stations (with id 829).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 829).")]
-        RightWingStations_829 = 829,
-
-        /// <summary>
-        /// Right-wing Stations (with id 830).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 830).")]
-        RightWingStations_830 = 830,
-
-        /// <summary>
-        /// Right-wing Stations (with id 831).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 831).")]
-        RightWingStations_831 = 831,
-
-        /// <summary>
-        /// Right-wing Stations (with id 832).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 832).")]
-        RightWingStations_832 = 832,
-
-        /// <summary>
-        /// Right-wing Stations (with id 833).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 833).")]
-        RightWingStations_833 = 833,
-
-        /// <summary>
-        /// Right-wing Stations (with id 834).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 834).")]
-        RightWingStations_834 = 834,
-
-        /// <summary>
-        /// Right-wing Stations (with id 835).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 835).")]
-        RightWingStations_835 = 835,
-
-        /// <summary>
-        /// Right-wing Stations (with id 836).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 836).")]
-        RightWingStations_836 = 836,
-
-        /// <summary>
-        /// Right-wing Stations (with id 837).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 837).")]
-        RightWingStations_837 = 837,
-
-        /// <summary>
-        /// Right-wing Stations (with id 838).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 838).")]
-        RightWingStations_838 = 838,
-
-        /// <summary>
-        /// Right-wing Stations (with id 839).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 839).")]
-        RightWingStations_839 = 839,
-
-        /// <summary>
-        /// Right-wing Stations (with id 840).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 840).")]
-        RightWingStations_840 = 840,
-
-        /// <summary>
-        /// Right-wing Stations (with id 841).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 841).")]
-        RightWingStations_841 = 841,
-
-        /// <summary>
-        /// Right-wing Stations (with id 842).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 842).")]
-        RightWingStations_842 = 842,
-
-        /// <summary>
-        /// Right-wing Stations (with id 843).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 843).")]
-        RightWingStations_843 = 843,
-
-        /// <summary>
-        /// Right-wing Stations (with id 844).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 844).")]
-        RightWingStations_844 = 844,
-
-        /// <summary>
-        /// Right-wing Stations (with id 845).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 845).")]
-        RightWingStations_845 = 845,
-
-        /// <summary>
-        /// Right-wing Stations (with id 846).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 846).")]
-        RightWingStations_846 = 846,
-
-        /// <summary>
-        /// Right-wing Stations (with id 847).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 847).")]
-        RightWingStations_847 = 847,
-
-        /// <summary>
-        /// Right-wing Stations (with id 848).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 848).")]
-        RightWingStations_848 = 848,
-
-        /// <summary>
-        /// Right-wing Stations (with id 849).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 849).")]
-        RightWingStations_849 = 849,
-
-        /// <summary>
-        /// Right-wing Stations (with id 850).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 850).")]
-        RightWingStations_850 = 850,
-
-        /// <summary>
-        /// Right-wing Stations (with id 851).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 851).")]
-        RightWingStations_851 = 851,
-
-        /// <summary>
-        /// Right-wing Stations (with id 852).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 852).")]
-        RightWingStations_852 = 852,
-
-        /// <summary>
-        /// Right-wing Stations (with id 853).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 853).")]
-        RightWingStations_853 = 853,
-
-        /// <summary>
-        /// Right-wing Stations (with id 854).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 854).")]
-        RightWingStations_854 = 854,
-
-        /// <summary>
-        /// Right-wing Stations (with id 855).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 855).")]
-        RightWingStations_855 = 855,
-
-        /// <summary>
-        /// Right-wing Stations (with id 856).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 856).")]
-        RightWingStations_856 = 856,
-
-        /// <summary>
-        /// Right-wing Stations (with id 857).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 857).")]
-        RightWingStations_857 = 857,
-
-        /// <summary>
-        /// Right-wing Stations (with id 858).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 858).")]
-        RightWingStations_858 = 858,
-
-        /// <summary>
-        /// Right-wing Stations (with id 859).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 859).")]
-        RightWingStations_859 = 859,
-
-        /// <summary>
-        /// Right-wing Stations (with id 860).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 860).")]
-        RightWingStations_860 = 860,
-
-        /// <summary>
-        /// Right-wing Stations (with id 861).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 861).")]
-        RightWingStations_861 = 861,
-
-        /// <summary>
-        /// Right-wing Stations (with id 862).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 862).")]
-        RightWingStations_862 = 862,
-
-        /// <summary>
-        /// Right-wing Stations (with id 863).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 863).")]
-        RightWingStations_863 = 863,
-
-        /// <summary>
-        /// Right-wing Stations (with id 864).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 864).")]
-        RightWingStations_864 = 864,
-
-        /// <summary>
-        /// Right-wing Stations (with id 865).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 865).")]
-        RightWingStations_865 = 865,
-
-        /// <summary>
-        /// Right-wing Stations (with id 866).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 866).")]
-        RightWingStations_866 = 866,
-
-        /// <summary>
-        /// Right-wing Stations (with id 867).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 867).")]
-        RightWingStations_867 = 867,
-
-        /// <summary>
-        /// Right-wing Stations (with id 868).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 868).")]
-        RightWingStations_868 = 868,
-
-        /// <summary>
-        /// Right-wing Stations (with id 869).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 869).")]
-        RightWingStations_869 = 869,
-
-        /// <summary>
-        /// Right-wing Stations (with id 870).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 870).")]
-        RightWingStations_870 = 870,
-
-        /// <summary>
-        /// Right-wing Stations (with id 871).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 871).")]
-        RightWingStations_871 = 871,
-
-        /// <summary>
-        /// Right-wing Stations (with id 872).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 872).")]
-        RightWingStations_872 = 872,
-
-        /// <summary>
-        /// Right-wing Stations (with id 873).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 873).")]
-        RightWingStations_873 = 873,
-
-        /// <summary>
-        /// Right-wing Stations (with id 874).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 874).")]
-        RightWingStations_874 = 874,
-
-        /// <summary>
-        /// Right-wing Stations (with id 875).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 875).")]
-        RightWingStations_875 = 875,
-
-        /// <summary>
-        /// Right-wing Stations (with id 876).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 876).")]
-        RightWingStations_876 = 876,
-
-        /// <summary>
-        /// Right-wing Stations (with id 877).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 877).")]
-        RightWingStations_877 = 877,
-
-        /// <summary>
-        /// Right-wing Stations (with id 878).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 878).")]
-        RightWingStations_878 = 878,
-
-        /// <summary>
-        /// Right-wing Stations (with id 879).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 879).")]
-        RightWingStations_879 = 879,
-
-        /// <summary>
-        /// Right-wing Stations (with id 880).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 880).")]
-        RightWingStations_880 = 880,
-
-        /// <summary>
-        /// Right-wing Stations (with id 881).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 881).")]
-        RightWingStations_881 = 881,
-
-        /// <summary>
-        /// Right-wing Stations (with id 882).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 882).")]
-        RightWingStations_882 = 882,
-
-        /// <summary>
-        /// Right-wing Stations (with id 883).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 883).")]
-        RightWingStations_883 = 883,
-
-        /// <summary>
-        /// Right-wing Stations (with id 884).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 884).")]
-        RightWingStations_884 = 884,
-
-        /// <summary>
-        /// Right-wing Stations (with id 885).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 885).")]
-        RightWingStations_885 = 885,
-
-        /// <summary>
-        /// Right-wing Stations (with id 886).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 886).")]
-        RightWingStations_886 = 886,
-
-        /// <summary>
-        /// Right-wing Stations (with id 887).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 887).")]
-        RightWingStations_887 = 887,
-
-        /// <summary>
-        /// Right-wing Stations (with id 888).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 888).")]
-        RightWingStations_888 = 888,
-
-        /// <summary>
-        /// Right-wing Stations (with id 889).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 889).")]
-        RightWingStations_889 = 889,
-
-        /// <summary>
-        /// Right-wing Stations (with id 890).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 890).")]
-        RightWingStations_890 = 890,
-
-        /// <summary>
-        /// Right-wing Stations (with id 891).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 891).")]
-        RightWingStations_891 = 891,
-
-        /// <summary>
-        /// Right-wing Stations (with id 892).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 892).")]
-        RightWingStations_892 = 892,
-
-        /// <summary>
-        /// Right-wing Stations (with id 893).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 893).")]
-        RightWingStations_893 = 893,
-
-        /// <summary>
-        /// Right-wing Stations (with id 894).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 894).")]
-        RightWingStations_894 = 894,
-
-        /// <summary>
-        /// Right-wing Stations (with id 895).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right-wing Stations (with id 895).")]
-        RightWingStations_895 = 895,
-
-        /// <summary>
-        /// M16A42 rifle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M16A42 rifle.")]
-        M16A42Rifle = 896,
-
-        /// <summary>
-        /// M249 SAW.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M249 SAW.")]
-        M249SAW = 897,
-
-        /// <summary>
-        /// M60 Machine gun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M60 Machine gun.")]
-        M60MachineGun = 898,
-
-        /// <summary>
-        /// M203 Grenade Launcher.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M203 Grenade Launcher.")]
-        M203GrenadeLauncher = 899,
-
-        /// <summary>
-        /// M136 AT4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M136 AT4.")]
-        M136AT4 = 900,
-
-        /// <summary>
-        /// M47 Dragon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M47 Dragon.")]
-        M47Dragon = 901,
-
-        /// <summary>
-        /// AAWS-M Javelin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AAWS-M Javelin.")]
-        AAWSMJavelin = 902,
-
-        /// <summary>
-        /// M18A1 Claymore Mine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M18A1 Claymore Mine.")]
-        M18A1ClaymoreMine = 903,
-
-        /// <summary>
-        /// MK19 Grenade Launcher.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK19 Grenade Launcher.")]
-        MK19GrenadeLauncher = 904,
-
-        /// <summary>
-        /// M2 Machine Gun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M2 Machine Gun.")]
-        M2MachineGun = 905,
-
-        /// <summary>
-        /// Other attached parts (with id 906).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 906).")]
-        OtherAttachedParts_906 = 906,
-
-        /// <summary>
-        /// Other attached parts (with id 907).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 907).")]
-        OtherAttachedParts_907 = 907,
-
-        /// <summary>
-        /// Other attached parts (with id 908).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 908).")]
-        OtherAttachedParts_908 = 908,
-
-        /// <summary>
-        /// Other attached parts (with id 909).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 909).")]
-        OtherAttachedParts_909 = 909,
-
-        /// <summary>
-        /// Other attached parts (with id 910).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 910).")]
-        OtherAttachedParts_910 = 910,
-
-        /// <summary>
-        /// Other attached parts (with id 911).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 911).")]
-        OtherAttachedParts_911 = 911,
-
-        /// <summary>
-        /// Other attached parts (with id 912).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 912).")]
-        OtherAttachedParts_912 = 912,
-
-        /// <summary>
-        /// Other attached parts (with id 913).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 913).")]
-        OtherAttachedParts_913 = 913,
-
-        /// <summary>
-        /// Other attached parts (with id 914).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 914).")]
-        OtherAttachedParts_914 = 914,
-
-        /// <summary>
-        /// Other attached parts (with id 915).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 915).")]
-        OtherAttachedParts_915 = 915,
-
-        /// <summary>
-        /// Other attached parts (with id 916).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 916).")]
-        OtherAttachedParts_916 = 916,
-
-        /// <summary>
-        /// Other attached parts (with id 917).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 917).")]
-        OtherAttachedParts_917 = 917,
-
-        /// <summary>
-        /// Other attached parts (with id 918).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 918).")]
-        OtherAttachedParts_918 = 918,
-
-        /// <summary>
-        /// Other attached parts (with id 919).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 919).")]
-        OtherAttachedParts_919 = 919,
-
-        /// <summary>
-        /// Other attached parts (with id 920).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 920).")]
-        OtherAttachedParts_920 = 920,
-
-        /// <summary>
-        /// Other attached parts (with id 921).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 921).")]
-        OtherAttachedParts_921 = 921,
-
-        /// <summary>
-        /// Other attached parts (with id 922).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 922).")]
-        OtherAttachedParts_922 = 922,
-
-        /// <summary>
-        /// Other attached parts (with id 923).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 923).")]
-        OtherAttachedParts_923 = 923,
-
-        /// <summary>
-        /// Other attached parts (with id 924).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 924).")]
-        OtherAttachedParts_924 = 924,
-
-        /// <summary>
-        /// Other attached parts (with id 925).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 925).")]
-        OtherAttachedParts_925 = 925,
-
-        /// <summary>
-        /// Other attached parts (with id 926).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 926).")]
-        OtherAttachedParts_926 = 926,
-
-        /// <summary>
-        /// Other attached parts (with id 927).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 927).")]
-        OtherAttachedParts_927 = 927,
-
-        /// <summary>
-        /// Other attached parts (with id 928).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 928).")]
-        OtherAttachedParts_928 = 928,
-
-        /// <summary>
-        /// Other attached parts (with id 929).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 929).")]
-        OtherAttachedParts_929 = 929,
-
-        /// <summary>
-        /// Other attached parts (with id 930).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 930).")]
-        OtherAttachedParts_930 = 930,
-
-        /// <summary>
-        /// Other attached parts (with id 931).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 931).")]
-        OtherAttachedParts_931 = 931,
-
-        /// <summary>
-        /// Other attached parts (with id 932).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 932).")]
-        OtherAttachedParts_932 = 932,
-
-        /// <summary>
-        /// Other attached parts (with id 933).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 933).")]
-        OtherAttachedParts_933 = 933,
-
-        /// <summary>
-        /// Other attached parts (with id 934).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 934).")]
-        OtherAttachedParts_934 = 934,
-
-        /// <summary>
-        /// Other attached parts (with id 935).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 935).")]
-        OtherAttachedParts_935 = 935,
-
-        /// <summary>
-        /// Other attached parts (with id 936).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 936).")]
-        OtherAttachedParts_936 = 936,
-
-        /// <summary>
-        /// Other attached parts (with id 937).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 937).")]
-        OtherAttachedParts_937 = 937,
-
-        /// <summary>
-        /// Other attached parts (with id 938).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 938).")]
-        OtherAttachedParts_938 = 938,
-
-        /// <summary>
-        /// Other attached parts (with id 939).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 939).")]
-        OtherAttachedParts_939 = 939,
-
-        /// <summary>
-        /// Other attached parts (with id 940).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 940).")]
-        OtherAttachedParts_940 = 940,
-
-        /// <summary>
-        /// Other attached parts (with id 941).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 941).")]
-        OtherAttachedParts_941 = 941,
-
-        /// <summary>
-        /// Other attached parts (with id 942).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 942).")]
-        OtherAttachedParts_942 = 942,
-
-        /// <summary>
-        /// Other attached parts (with id 943).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 943).")]
-        OtherAttachedParts_943 = 943,
-
-        /// <summary>
-        /// Other attached parts (with id 944).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 944).")]
-        OtherAttachedParts_944 = 944,
-
-        /// <summary>
-        /// Other attached parts (with id 945).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 945).")]
-        OtherAttachedParts_945 = 945,
-
-        /// <summary>
-        /// Other attached parts (with id 946).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 946).")]
-        OtherAttachedParts_946 = 946,
-
-        /// <summary>
-        /// Other attached parts (with id 947).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 947).")]
-        OtherAttachedParts_947 = 947,
-
-        /// <summary>
-        /// Other attached parts (with id 948).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 948).")]
-        OtherAttachedParts_948 = 948,
-
-        /// <summary>
-        /// Other attached parts (with id 949).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 949).")]
-        OtherAttachedParts_949 = 949,
-
-        /// <summary>
-        /// Other attached parts (with id 950).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 950).")]
-        OtherAttachedParts_950 = 950,
-
-        /// <summary>
-        /// Other attached parts (with id 951).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 951).")]
-        OtherAttachedParts_951 = 951,
-
-        /// <summary>
-        /// Other attached parts (with id 952).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 952).")]
-        OtherAttachedParts_952 = 952,
-
-        /// <summary>
-        /// Other attached parts (with id 953).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 953).")]
-        OtherAttachedParts_953 = 953,
-
-        /// <summary>
-        /// Other attached parts (with id 954).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 954).")]
-        OtherAttachedParts_954 = 954,
-
-        /// <summary>
-        /// Other attached parts (with id 955).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 955).")]
-        OtherAttachedParts_955 = 955,
-
-        /// <summary>
-        /// Other attached parts (with id 956).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 956).")]
-        OtherAttachedParts_956 = 956,
-
-        /// <summary>
-        /// Other attached parts (with id 957).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 957).")]
-        OtherAttachedParts_957 = 957,
-
-        /// <summary>
-        /// Other attached parts (with id 958).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 958).")]
-        OtherAttachedParts_958 = 958,
-
-        /// <summary>
-        /// Other attached parts (with id 959).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 959).")]
-        OtherAttachedParts_959 = 959,
-
-        /// <summary>
-        /// Other attached parts (with id 960).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 960).")]
-        OtherAttachedParts_960 = 960,
-
-        /// <summary>
-        /// Other attached parts (with id 961).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 961).")]
-        OtherAttachedParts_961 = 961,
-
-        /// <summary>
-        /// Other attached parts (with id 962).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 962).")]
-        OtherAttachedParts_962 = 962,
-
-        /// <summary>
-        /// Other attached parts (with id 963).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 963).")]
-        OtherAttachedParts_963 = 963,
-
-        /// <summary>
-        /// Other attached parts (with id 964).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 964).")]
-        OtherAttachedParts_964 = 964,
-
-        /// <summary>
-        /// Other attached parts (with id 965).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 965).")]
-        OtherAttachedParts_965 = 965,
-
-        /// <summary>
-        /// Other attached parts (with id 966).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 966).")]
-        OtherAttachedParts_966 = 966,
-
-        /// <summary>
-        /// Other attached parts (with id 967).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 967).")]
-        OtherAttachedParts_967 = 967,
-
-        /// <summary>
-        /// Other attached parts (with id 968).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 968).")]
-        OtherAttachedParts_968 = 968,
-
-        /// <summary>
-        /// Other attached parts (with id 969).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 969).")]
-        OtherAttachedParts_969 = 969,
-
-        /// <summary>
-        /// Other attached parts (with id 970).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 970).")]
-        OtherAttachedParts_970 = 970,
-
-        /// <summary>
-        /// Other attached parts (with id 971).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 971).")]
-        OtherAttachedParts_971 = 971,
-
-        /// <summary>
-        /// Other attached parts (with id 972).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 972).")]
-        OtherAttachedParts_972 = 972,
-
-        /// <summary>
-        /// Other attached parts (with id 973).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 973).")]
-        OtherAttachedParts_973 = 973,
-
-        /// <summary>
-        /// Other attached parts (with id 974).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 974).")]
-        OtherAttachedParts_974 = 974,
-
-        /// <summary>
-        /// Other attached parts (with id 975).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 975).")]
-        OtherAttachedParts_975 = 975,
-
-        /// <summary>
-        /// Other attached parts (with id 976).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 976).")]
-        OtherAttachedParts_976 = 976,
-
-        /// <summary>
-        /// Other attached parts (with id 977).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 977).")]
-        OtherAttachedParts_977 = 977,
-
-        /// <summary>
-        /// Other attached parts (with id 978).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 978).")]
-        OtherAttachedParts_978 = 978,
-
-        /// <summary>
-        /// Other attached parts (with id 979).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 979).")]
-        OtherAttachedParts_979 = 979,
-
-        /// <summary>
-        /// Other attached parts (with id 980).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 980).")]
-        OtherAttachedParts_980 = 980,
-
-        /// <summary>
-        /// Other attached parts (with id 981).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 981).")]
-        OtherAttachedParts_981 = 981,
-
-        /// <summary>
-        /// Other attached parts (with id 982).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 982).")]
-        OtherAttachedParts_982 = 982,
-
-        /// <summary>
-        /// Other attached parts (with id 983).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 983).")]
-        OtherAttachedParts_983 = 983,
-
-        /// <summary>
-        /// Other attached parts (with id 984).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 984).")]
-        OtherAttachedParts_984 = 984,
-
-        /// <summary>
-        /// Other attached parts (with id 985).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 985).")]
-        OtherAttachedParts_985 = 985,
-
-        /// <summary>
-        /// Other attached parts (with id 986).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 986).")]
-        OtherAttachedParts_986 = 986,
-
-        /// <summary>
-        /// Other attached parts (with id 987).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 987).")]
-        OtherAttachedParts_987 = 987,
-
-        /// <summary>
-        /// Other attached parts (with id 988).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 988).")]
-        OtherAttachedParts_988 = 988,
-
-        /// <summary>
-        /// Other attached parts (with id 989).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 989).")]
-        OtherAttachedParts_989 = 989,
-
-        /// <summary>
-        /// Other attached parts (with id 990).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 990).")]
-        OtherAttachedParts_990 = 990,
-
-        /// <summary>
-        /// Other attached parts (with id 991).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 991).")]
-        OtherAttachedParts_991 = 991,
-
-        /// <summary>
-        /// Other attached parts (with id 992).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 992).")]
-        OtherAttachedParts_992 = 992,
-
-        /// <summary>
-        /// Other attached parts (with id 993).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 993).")]
-        OtherAttachedParts_993 = 993,
-
-        /// <summary>
-        /// Other attached parts (with id 994).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 994).")]
-        OtherAttachedParts_994 = 994,
-
-        /// <summary>
-        /// Other attached parts (with id 995).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 995).")]
-        OtherAttachedParts_995 = 995,
-
-        /// <summary>
-        /// Other attached parts (with id 996).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 996).")]
-        OtherAttachedParts_996 = 996,
-
-        /// <summary>
-        /// Other attached parts (with id 997).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 997).")]
-        OtherAttachedParts_997 = 997,
-
-        /// <summary>
-        /// Other attached parts (with id 998).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 998).")]
-        OtherAttachedParts_998 = 998,
-
-        /// <summary>
-        /// Other attached parts (with id 999).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 999).")]
-        OtherAttachedParts_999 = 999,
-
-        /// <summary>
-        /// Other attached parts (with id 1000).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1000).")]
-        OtherAttachedParts_1000 = 1000,
-
-        /// <summary>
-        /// Other attached parts (with id 1001).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1001).")]
-        OtherAttachedParts_1001 = 1001,
-
-        /// <summary>
-        /// Other attached parts (with id 1002).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1002).")]
-        OtherAttachedParts_1002 = 1002,
-
-        /// <summary>
-        /// Other attached parts (with id 1003).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1003).")]
-        OtherAttachedParts_1003 = 1003,
-
-        /// <summary>
-        /// Other attached parts (with id 1004).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1004).")]
-        OtherAttachedParts_1004 = 1004,
-
-        /// <summary>
-        /// Other attached parts (with id 1005).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1005).")]
-        OtherAttachedParts_1005 = 1005,
-
-        /// <summary>
-        /// Other attached parts (with id 1006).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1006).")]
-        OtherAttachedParts_1006 = 1006,
-
-        /// <summary>
-        /// Other attached parts (with id 1007).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1007).")]
-        OtherAttachedParts_1007 = 1007,
-
-        /// <summary>
-        /// Other attached parts (with id 1008).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1008).")]
-        OtherAttachedParts_1008 = 1008,
-
-        /// <summary>
-        /// Other attached parts (with id 1009).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1009).")]
-        OtherAttachedParts_1009 = 1009,
-
-        /// <summary>
-        /// Other attached parts (with id 1010).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1010).")]
-        OtherAttachedParts_1010 = 1010,
-
-        /// <summary>
-        /// Other attached parts (with id 1011).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1011).")]
-        OtherAttachedParts_1011 = 1011,
-
-        /// <summary>
-        /// Other attached parts (with id 1012).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1012).")]
-        OtherAttachedParts_1012 = 1012,
-
-        /// <summary>
-        /// Other attached parts (with id 1013).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1013).")]
-        OtherAttachedParts_1013 = 1013,
-
-        /// <summary>
-        /// Other attached parts (with id 1014).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1014).")]
-        OtherAttachedParts_1014 = 1014,
-
-        /// <summary>
-        /// Other attached parts (with id 1015).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1015).")]
-        OtherAttachedParts_1015 = 1015,
-
-        /// <summary>
-        /// Other attached parts (with id 1016).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1016).")]
-        OtherAttachedParts_1016 = 1016,
-
-        /// <summary>
-        /// Other attached parts (with id 1017).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1017).")]
-        OtherAttachedParts_1017 = 1017,
-
-        /// <summary>
-        /// Other attached parts (with id 1018).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1018).")]
-        OtherAttachedParts_1018 = 1018,
-
-        /// <summary>
-        /// Other attached parts (with id 1019).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1019).")]
-        OtherAttachedParts_1019 = 1019,
-
-        /// <summary>
-        /// Other attached parts (with id 1020).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1020).")]
-        OtherAttachedParts_1020 = 1020,
-
-        /// <summary>
-        /// Other attached parts (with id 1021).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1021).")]
-        OtherAttachedParts_1021 = 1021,
-
-        /// <summary>
-        /// Other attached parts (with id 1022).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1022).")]
-        OtherAttachedParts_1022 = 1022,
-
-        /// <summary>
-        /// Other attached parts (with id 1023).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other attached parts (with id 1023).")]
-        OtherAttachedParts_1023 = 1023
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState
+{
+    /// <summary>
+    /// Enumeration values for AttachedParts (es.vp.type.1.attached, Attached parts, 
+    /// section 4.7.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AttachedParts : uint
+    {
+        /// <summary>
+        /// Nothing, Empty.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nothing, Empty.")]
+        NothingEmpty = 0,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 1).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 1).")]
+        SequentialIDsForModelSpecificStations_1 = 1,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 2).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 2).")]
+        SequentialIDsForModelSpecificStations_2 = 2,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 3).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 3).")]
+        SequentialIDsForModelSpecificStations_3 = 3,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 4).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 4).")]
+        SequentialIDsForModelSpecificStations_4 = 4,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 5).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 5).")]
+        SequentialIDsForModelSpecificStations_5 = 5,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 6).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 6).")]
+        SequentialIDsForModelSpecificStations_6 = 6,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 7).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 7).")]
+        SequentialIDsForModelSpecificStations_7 = 7,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 8).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 8).")]
+        SequentialIDsForModelSpecificStations_8 = 8,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 9).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 9).")]
+        SequentialIDsForModelSpecificStations_9 = 9,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 10).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 10).")]
+        SequentialIDsForModelSpecificStations_10 = 10,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 11).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 11).")]
+        SequentialIDsForModelSpecificStations_11 = 11,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 12).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 12).")]
+        SequentialIDsForModelSpecificStations_12 = 12,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 13).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 13).")]
+        SequentialIDsForModelSpecificStations_13 = 13,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 14).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 14).")]
+        SequentialIDsForModelSpecificStations_14 = 14,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 15).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 15).")]
+        SequentialIDsForModelSpecificStations_15 = 15,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 16).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 16).")]
+        SequentialIDsForModelSpecificStations_16 = 16,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 17).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 17).")]
+        SequentialIDsForModelSpecificStations_17 = 17,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 18).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 18).")]
+        SequentialIDsForModelSpecificStations_18 = 18,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 19).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 19).")]
+        SequentialIDsForModelSpecificStations_19 = 19,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 20).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 20).")]
+        SequentialIDsForModelSpecificStations_20 = 20,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 21).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 21).")]
+        SequentialIDsForModelSpecificStations_21 = 21,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 22).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 22).")]
+        SequentialIDsForModelSpecificStations_22 = 22,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 23).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 23).")]
+        SequentialIDsForModelSpecificStations_23 = 23,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 24).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 24).")]
+        SequentialIDsForModelSpecificStations_24 = 24,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 25).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 25).")]
+        SequentialIDsForModelSpecificStations_25 = 25,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 26).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 26).")]
+        SequentialIDsForModelSpecificStations_26 = 26,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 27).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 27).")]
+        SequentialIDsForModelSpecificStations_27 = 27,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 28).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 28).")]
+        SequentialIDsForModelSpecificStations_28 = 28,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 29).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 29).")]
+        SequentialIDsForModelSpecificStations_29 = 29,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 30).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 30).")]
+        SequentialIDsForModelSpecificStations_30 = 30,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 31).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 31).")]
+        SequentialIDsForModelSpecificStations_31 = 31,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 32).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 32).")]
+        SequentialIDsForModelSpecificStations_32 = 32,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 33).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 33).")]
+        SequentialIDsForModelSpecificStations_33 = 33,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 34).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 34).")]
+        SequentialIDsForModelSpecificStations_34 = 34,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 35).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 35).")]
+        SequentialIDsForModelSpecificStations_35 = 35,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 36).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 36).")]
+        SequentialIDsForModelSpecificStations_36 = 36,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 37).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 37).")]
+        SequentialIDsForModelSpecificStations_37 = 37,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 38).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 38).")]
+        SequentialIDsForModelSpecificStations_38 = 38,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 39).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 39).")]
+        SequentialIDsForModelSpecificStations_39 = 39,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 40).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 40).")]
+        SequentialIDsForModelSpecificStations_40 = 40,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 41).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 41).")]
+        SequentialIDsForModelSpecificStations_41 = 41,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 42).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 42).")]
+        SequentialIDsForModelSpecificStations_42 = 42,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 43).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 43).")]
+        SequentialIDsForModelSpecificStations_43 = 43,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 44).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 44).")]
+        SequentialIDsForModelSpecificStations_44 = 44,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 45).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 45).")]
+        SequentialIDsForModelSpecificStations_45 = 45,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 46).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 46).")]
+        SequentialIDsForModelSpecificStations_46 = 46,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 47).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 47).")]
+        SequentialIDsForModelSpecificStations_47 = 47,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 48).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 48).")]
+        SequentialIDsForModelSpecificStations_48 = 48,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 49).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 49).")]
+        SequentialIDsForModelSpecificStations_49 = 49,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 50).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 50).")]
+        SequentialIDsForModelSpecificStations_50 = 50,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 51).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 51).")]
+        SequentialIDsForModelSpecificStations_51 = 51,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 52).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 52).")]
+        SequentialIDsForModelSpecificStations_52 = 52,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 53).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 53).")]
+        SequentialIDsForModelSpecificStations_53 = 53,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 54).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 54).")]
+        SequentialIDsForModelSpecificStations_54 = 54,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 55).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 55).")]
+        SequentialIDsForModelSpecificStations_55 = 55,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 56).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 56).")]
+        SequentialIDsForModelSpecificStations_56 = 56,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 57).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 57).")]
+        SequentialIDsForModelSpecificStations_57 = 57,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 58).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 58).")]
+        SequentialIDsForModelSpecificStations_58 = 58,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 59).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 59).")]
+        SequentialIDsForModelSpecificStations_59 = 59,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 60).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 60).")]
+        SequentialIDsForModelSpecificStations_60 = 60,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 61).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 61).")]
+        SequentialIDsForModelSpecificStations_61 = 61,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 62).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 62).")]
+        SequentialIDsForModelSpecificStations_62 = 62,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 63).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 63).")]
+        SequentialIDsForModelSpecificStations_63 = 63,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 64).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 64).")]
+        SequentialIDsForModelSpecificStations_64 = 64,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 65).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 65).")]
+        SequentialIDsForModelSpecificStations_65 = 65,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 66).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 66).")]
+        SequentialIDsForModelSpecificStations_66 = 66,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 67).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 67).")]
+        SequentialIDsForModelSpecificStations_67 = 67,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 68).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 68).")]
+        SequentialIDsForModelSpecificStations_68 = 68,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 69).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 69).")]
+        SequentialIDsForModelSpecificStations_69 = 69,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 70).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 70).")]
+        SequentialIDsForModelSpecificStations_70 = 70,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 71).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 71).")]
+        SequentialIDsForModelSpecificStations_71 = 71,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 72).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 72).")]
+        SequentialIDsForModelSpecificStations_72 = 72,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 73).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 73).")]
+        SequentialIDsForModelSpecificStations_73 = 73,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 74).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 74).")]
+        SequentialIDsForModelSpecificStations_74 = 74,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 75).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 75).")]
+        SequentialIDsForModelSpecificStations_75 = 75,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 76).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 76).")]
+        SequentialIDsForModelSpecificStations_76 = 76,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 77).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 77).")]
+        SequentialIDsForModelSpecificStations_77 = 77,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 78).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 78).")]
+        SequentialIDsForModelSpecificStations_78 = 78,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 79).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 79).")]
+        SequentialIDsForModelSpecificStations_79 = 79,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 80).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 80).")]
+        SequentialIDsForModelSpecificStations_80 = 80,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 81).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 81).")]
+        SequentialIDsForModelSpecificStations_81 = 81,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 82).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 82).")]
+        SequentialIDsForModelSpecificStations_82 = 82,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 83).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 83).")]
+        SequentialIDsForModelSpecificStations_83 = 83,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 84).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 84).")]
+        SequentialIDsForModelSpecificStations_84 = 84,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 85).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 85).")]
+        SequentialIDsForModelSpecificStations_85 = 85,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 86).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 86).")]
+        SequentialIDsForModelSpecificStations_86 = 86,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 87).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 87).")]
+        SequentialIDsForModelSpecificStations_87 = 87,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 88).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 88).")]
+        SequentialIDsForModelSpecificStations_88 = 88,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 89).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 89).")]
+        SequentialIDsForModelSpecificStations_89 = 89,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 90).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 90).")]
+        SequentialIDsForModelSpecificStations_90 = 90,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 91).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 91).")]
+        SequentialIDsForModelSpecificStations_91 = 91,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 92).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 92).")]
+        SequentialIDsForModelSpecificStations_92 = 92,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 93).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 93).")]
+        SequentialIDsForModelSpecificStations_93 = 93,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 94).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 94).")]
+        SequentialIDsForModelSpecificStations_94 = 94,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 95).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 95).")]
+        SequentialIDsForModelSpecificStations_95 = 95,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 96).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 96).")]
+        SequentialIDsForModelSpecificStations_96 = 96,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 97).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 97).")]
+        SequentialIDsForModelSpecificStations_97 = 97,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 98).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 98).")]
+        SequentialIDsForModelSpecificStations_98 = 98,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 99).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 99).")]
+        SequentialIDsForModelSpecificStations_99 = 99,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 100).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 100).")]
+        SequentialIDsForModelSpecificStations_100 = 100,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 101).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 101).")]
+        SequentialIDsForModelSpecificStations_101 = 101,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 102).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 102).")]
+        SequentialIDsForModelSpecificStations_102 = 102,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 103).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 103).")]
+        SequentialIDsForModelSpecificStations_103 = 103,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 104).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 104).")]
+        SequentialIDsForModelSpecificStations_104 = 104,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 105).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 105).")]
+        SequentialIDsForModelSpecificStations_105 = 105,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 106).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 106).")]
+        SequentialIDsForModelSpecificStations_106 = 106,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 107).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 107).")]
+        SequentialIDsForModelSpecificStations_107 = 107,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 108).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 108).")]
+        SequentialIDsForModelSpecificStations_108 = 108,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 109).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 109).")]
+        SequentialIDsForModelSpecificStations_109 = 109,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 110).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 110).")]
+        SequentialIDsForModelSpecificStations_110 = 110,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 111).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 111).")]
+        SequentialIDsForModelSpecificStations_111 = 111,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 112).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 112).")]
+        SequentialIDsForModelSpecificStations_112 = 112,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 113).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 113).")]
+        SequentialIDsForModelSpecificStations_113 = 113,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 114).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 114).")]
+        SequentialIDsForModelSpecificStations_114 = 114,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 115).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 115).")]
+        SequentialIDsForModelSpecificStations_115 = 115,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 116).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 116).")]
+        SequentialIDsForModelSpecificStations_116 = 116,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 117).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 117).")]
+        SequentialIDsForModelSpecificStations_117 = 117,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 118).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 118).")]
+        SequentialIDsForModelSpecificStations_118 = 118,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 119).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 119).")]
+        SequentialIDsForModelSpecificStations_119 = 119,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 120).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 120).")]
+        SequentialIDsForModelSpecificStations_120 = 120,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 121).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 121).")]
+        SequentialIDsForModelSpecificStations_121 = 121,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 122).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 122).")]
+        SequentialIDsForModelSpecificStations_122 = 122,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 123).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 123).")]
+        SequentialIDsForModelSpecificStations_123 = 123,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 124).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 124).")]
+        SequentialIDsForModelSpecificStations_124 = 124,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 125).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 125).")]
+        SequentialIDsForModelSpecificStations_125 = 125,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 126).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 126).")]
+        SequentialIDsForModelSpecificStations_126 = 126,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 127).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 127).")]
+        SequentialIDsForModelSpecificStations_127 = 127,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 128).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 128).")]
+        SequentialIDsForModelSpecificStations_128 = 128,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 129).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 129).")]
+        SequentialIDsForModelSpecificStations_129 = 129,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 130).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 130).")]
+        SequentialIDsForModelSpecificStations_130 = 130,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 131).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 131).")]
+        SequentialIDsForModelSpecificStations_131 = 131,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 132).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 132).")]
+        SequentialIDsForModelSpecificStations_132 = 132,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 133).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 133).")]
+        SequentialIDsForModelSpecificStations_133 = 133,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 134).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 134).")]
+        SequentialIDsForModelSpecificStations_134 = 134,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 135).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 135).")]
+        SequentialIDsForModelSpecificStations_135 = 135,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 136).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 136).")]
+        SequentialIDsForModelSpecificStations_136 = 136,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 137).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 137).")]
+        SequentialIDsForModelSpecificStations_137 = 137,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 138).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 138).")]
+        SequentialIDsForModelSpecificStations_138 = 138,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 139).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 139).")]
+        SequentialIDsForModelSpecificStations_139 = 139,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 140).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 140).")]
+        SequentialIDsForModelSpecificStations_140 = 140,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 141).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 141).")]
+        SequentialIDsForModelSpecificStations_141 = 141,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 142).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 142).")]
+        SequentialIDsForModelSpecificStations_142 = 142,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 143).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 143).")]
+        SequentialIDsForModelSpecificStations_143 = 143,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 144).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 144).")]
+        SequentialIDsForModelSpecificStations_144 = 144,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 145).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 145).")]
+        SequentialIDsForModelSpecificStations_145 = 145,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 146).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 146).")]
+        SequentialIDsForModelSpecificStations_146 = 146,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 147).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 147).")]
+        SequentialIDsForModelSpecificStations_147 = 147,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 148).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 148).")]
+        SequentialIDsForModelSpecificStations_148 = 148,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 149).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 149).")]
+        SequentialIDsForModelSpecificStations_149 = 149,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 150).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 150).")]
+        SequentialIDsForModelSpecificStations_150 = 150,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 151).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 151).")]
+        SequentialIDsForModelSpecificStations_151 = 151,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 152).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 152).")]
+        SequentialIDsForModelSpecificStations_152 = 152,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 153).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 153).")]
+        SequentialIDsForModelSpecificStations_153 = 153,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 154).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 154).")]
+        SequentialIDsForModelSpecificStations_154 = 154,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 155).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 155).")]
+        SequentialIDsForModelSpecificStations_155 = 155,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 156).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 156).")]
+        SequentialIDsForModelSpecificStations_156 = 156,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 157).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 157).")]
+        SequentialIDsForModelSpecificStations_157 = 157,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 158).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 158).")]
+        SequentialIDsForModelSpecificStations_158 = 158,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 159).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 159).")]
+        SequentialIDsForModelSpecificStations_159 = 159,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 160).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 160).")]
+        SequentialIDsForModelSpecificStations_160 = 160,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 161).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 161).")]
+        SequentialIDsForModelSpecificStations_161 = 161,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 162).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 162).")]
+        SequentialIDsForModelSpecificStations_162 = 162,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 163).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 163).")]
+        SequentialIDsForModelSpecificStations_163 = 163,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 164).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 164).")]
+        SequentialIDsForModelSpecificStations_164 = 164,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 165).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 165).")]
+        SequentialIDsForModelSpecificStations_165 = 165,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 166).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 166).")]
+        SequentialIDsForModelSpecificStations_166 = 166,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 167).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 167).")]
+        SequentialIDsForModelSpecificStations_167 = 167,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 168).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 168).")]
+        SequentialIDsForModelSpecificStations_168 = 168,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 169).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 169).")]
+        SequentialIDsForModelSpecificStations_169 = 169,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 170).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 170).")]
+        SequentialIDsForModelSpecificStations_170 = 170,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 171).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 171).")]
+        SequentialIDsForModelSpecificStations_171 = 171,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 172).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 172).")]
+        SequentialIDsForModelSpecificStations_172 = 172,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 173).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 173).")]
+        SequentialIDsForModelSpecificStations_173 = 173,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 174).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 174).")]
+        SequentialIDsForModelSpecificStations_174 = 174,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 175).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 175).")]
+        SequentialIDsForModelSpecificStations_175 = 175,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 176).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 176).")]
+        SequentialIDsForModelSpecificStations_176 = 176,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 177).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 177).")]
+        SequentialIDsForModelSpecificStations_177 = 177,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 178).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 178).")]
+        SequentialIDsForModelSpecificStations_178 = 178,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 179).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 179).")]
+        SequentialIDsForModelSpecificStations_179 = 179,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 180).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 180).")]
+        SequentialIDsForModelSpecificStations_180 = 180,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 181).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 181).")]
+        SequentialIDsForModelSpecificStations_181 = 181,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 182).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 182).")]
+        SequentialIDsForModelSpecificStations_182 = 182,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 183).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 183).")]
+        SequentialIDsForModelSpecificStations_183 = 183,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 184).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 184).")]
+        SequentialIDsForModelSpecificStations_184 = 184,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 185).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 185).")]
+        SequentialIDsForModelSpecificStations_185 = 185,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 186).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 186).")]
+        SequentialIDsForModelSpecificStations_186 = 186,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 187).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 187).")]
+        SequentialIDsForModelSpecificStations_187 = 187,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 188).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 188).")]
+        SequentialIDsForModelSpecificStations_188 = 188,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 189).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 189).")]
+        SequentialIDsForModelSpecificStations_189 = 189,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 190).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 190).")]
+        SequentialIDsForModelSpecificStations_190 = 190,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 191).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 191).")]
+        SequentialIDsForModelSpecificStations_191 = 191,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 192).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 192).")]
+        SequentialIDsForModelSpecificStations_192 = 192,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 193).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 193).")]
+        SequentialIDsForModelSpecificStations_193 = 193,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 194).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 194).")]
+        SequentialIDsForModelSpecificStations_194 = 194,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 195).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 195).")]
+        SequentialIDsForModelSpecificStations_195 = 195,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 196).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 196).")]
+        SequentialIDsForModelSpecificStations_196 = 196,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 197).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 197).")]
+        SequentialIDsForModelSpecificStations_197 = 197,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 198).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 198).")]
+        SequentialIDsForModelSpecificStations_198 = 198,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 199).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 199).")]
+        SequentialIDsForModelSpecificStations_199 = 199,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 200).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 200).")]
+        SequentialIDsForModelSpecificStations_200 = 200,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 201).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 201).")]
+        SequentialIDsForModelSpecificStations_201 = 201,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 202).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 202).")]
+        SequentialIDsForModelSpecificStations_202 = 202,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 203).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 203).")]
+        SequentialIDsForModelSpecificStations_203 = 203,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 204).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 204).")]
+        SequentialIDsForModelSpecificStations_204 = 204,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 205).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 205).")]
+        SequentialIDsForModelSpecificStations_205 = 205,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 206).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 206).")]
+        SequentialIDsForModelSpecificStations_206 = 206,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 207).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 207).")]
+        SequentialIDsForModelSpecificStations_207 = 207,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 208).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 208).")]
+        SequentialIDsForModelSpecificStations_208 = 208,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 209).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 209).")]
+        SequentialIDsForModelSpecificStations_209 = 209,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 210).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 210).")]
+        SequentialIDsForModelSpecificStations_210 = 210,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 211).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 211).")]
+        SequentialIDsForModelSpecificStations_211 = 211,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 212).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 212).")]
+        SequentialIDsForModelSpecificStations_212 = 212,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 213).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 213).")]
+        SequentialIDsForModelSpecificStations_213 = 213,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 214).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 214).")]
+        SequentialIDsForModelSpecificStations_214 = 214,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 215).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 215).")]
+        SequentialIDsForModelSpecificStations_215 = 215,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 216).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 216).")]
+        SequentialIDsForModelSpecificStations_216 = 216,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 217).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 217).")]
+        SequentialIDsForModelSpecificStations_217 = 217,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 218).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 218).")]
+        SequentialIDsForModelSpecificStations_218 = 218,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 219).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 219).")]
+        SequentialIDsForModelSpecificStations_219 = 219,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 220).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 220).")]
+        SequentialIDsForModelSpecificStations_220 = 220,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 221).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 221).")]
+        SequentialIDsForModelSpecificStations_221 = 221,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 222).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 222).")]
+        SequentialIDsForModelSpecificStations_222 = 222,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 223).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 223).")]
+        SequentialIDsForModelSpecificStations_223 = 223,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 224).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 224).")]
+        SequentialIDsForModelSpecificStations_224 = 224,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 225).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 225).")]
+        SequentialIDsForModelSpecificStations_225 = 225,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 226).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 226).")]
+        SequentialIDsForModelSpecificStations_226 = 226,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 227).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 227).")]
+        SequentialIDsForModelSpecificStations_227 = 227,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 228).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 228).")]
+        SequentialIDsForModelSpecificStations_228 = 228,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 229).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 229).")]
+        SequentialIDsForModelSpecificStations_229 = 229,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 230).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 230).")]
+        SequentialIDsForModelSpecificStations_230 = 230,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 231).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 231).")]
+        SequentialIDsForModelSpecificStations_231 = 231,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 232).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 232).")]
+        SequentialIDsForModelSpecificStations_232 = 232,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 233).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 233).")]
+        SequentialIDsForModelSpecificStations_233 = 233,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 234).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 234).")]
+        SequentialIDsForModelSpecificStations_234 = 234,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 235).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 235).")]
+        SequentialIDsForModelSpecificStations_235 = 235,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 236).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 236).")]
+        SequentialIDsForModelSpecificStations_236 = 236,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 237).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 237).")]
+        SequentialIDsForModelSpecificStations_237 = 237,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 238).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 238).")]
+        SequentialIDsForModelSpecificStations_238 = 238,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 239).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 239).")]
+        SequentialIDsForModelSpecificStations_239 = 239,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 240).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 240).")]
+        SequentialIDsForModelSpecificStations_240 = 240,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 241).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 241).")]
+        SequentialIDsForModelSpecificStations_241 = 241,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 242).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 242).")]
+        SequentialIDsForModelSpecificStations_242 = 242,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 243).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 243).")]
+        SequentialIDsForModelSpecificStations_243 = 243,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 244).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 244).")]
+        SequentialIDsForModelSpecificStations_244 = 244,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 245).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 245).")]
+        SequentialIDsForModelSpecificStations_245 = 245,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 246).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 246).")]
+        SequentialIDsForModelSpecificStations_246 = 246,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 247).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 247).")]
+        SequentialIDsForModelSpecificStations_247 = 247,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 248).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 248).")]
+        SequentialIDsForModelSpecificStations_248 = 248,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 249).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 249).")]
+        SequentialIDsForModelSpecificStations_249 = 249,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 250).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 250).")]
+        SequentialIDsForModelSpecificStations_250 = 250,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 251).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 251).")]
+        SequentialIDsForModelSpecificStations_251 = 251,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 252).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 252).")]
+        SequentialIDsForModelSpecificStations_252 = 252,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 253).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 253).")]
+        SequentialIDsForModelSpecificStations_253 = 253,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 254).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 254).")]
+        SequentialIDsForModelSpecificStations_254 = 254,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 255).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 255).")]
+        SequentialIDsForModelSpecificStations_255 = 255,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 256).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 256).")]
+        SequentialIDsForModelSpecificStations_256 = 256,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 257).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 257).")]
+        SequentialIDsForModelSpecificStations_257 = 257,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 258).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 258).")]
+        SequentialIDsForModelSpecificStations_258 = 258,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 259).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 259).")]
+        SequentialIDsForModelSpecificStations_259 = 259,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 260).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 260).")]
+        SequentialIDsForModelSpecificStations_260 = 260,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 261).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 261).")]
+        SequentialIDsForModelSpecificStations_261 = 261,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 262).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 262).")]
+        SequentialIDsForModelSpecificStations_262 = 262,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 263).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 263).")]
+        SequentialIDsForModelSpecificStations_263 = 263,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 264).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 264).")]
+        SequentialIDsForModelSpecificStations_264 = 264,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 265).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 265).")]
+        SequentialIDsForModelSpecificStations_265 = 265,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 266).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 266).")]
+        SequentialIDsForModelSpecificStations_266 = 266,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 267).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 267).")]
+        SequentialIDsForModelSpecificStations_267 = 267,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 268).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 268).")]
+        SequentialIDsForModelSpecificStations_268 = 268,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 269).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 269).")]
+        SequentialIDsForModelSpecificStations_269 = 269,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 270).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 270).")]
+        SequentialIDsForModelSpecificStations_270 = 270,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 271).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 271).")]
+        SequentialIDsForModelSpecificStations_271 = 271,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 272).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 272).")]
+        SequentialIDsForModelSpecificStations_272 = 272,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 273).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 273).")]
+        SequentialIDsForModelSpecificStations_273 = 273,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 274).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 274).")]
+        SequentialIDsForModelSpecificStations_274 = 274,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 275).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 275).")]
+        SequentialIDsForModelSpecificStations_275 = 275,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 276).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 276).")]
+        SequentialIDsForModelSpecificStations_276 = 276,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 277).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 277).")]
+        SequentialIDsForModelSpecificStations_277 = 277,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 278).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 278).")]
+        SequentialIDsForModelSpecificStations_278 = 278,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 279).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 279).")]
+        SequentialIDsForModelSpecificStations_279 = 279,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 280).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 280).")]
+        SequentialIDsForModelSpecificStations_280 = 280,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 281).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 281).")]
+        SequentialIDsForModelSpecificStations_281 = 281,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 282).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 282).")]
+        SequentialIDsForModelSpecificStations_282 = 282,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 283).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 283).")]
+        SequentialIDsForModelSpecificStations_283 = 283,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 284).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 284).")]
+        SequentialIDsForModelSpecificStations_284 = 284,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 285).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 285).")]
+        SequentialIDsForModelSpecificStations_285 = 285,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 286).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 286).")]
+        SequentialIDsForModelSpecificStations_286 = 286,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 287).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 287).")]
+        SequentialIDsForModelSpecificStations_287 = 287,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 288).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 288).")]
+        SequentialIDsForModelSpecificStations_288 = 288,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 289).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 289).")]
+        SequentialIDsForModelSpecificStations_289 = 289,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 290).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 290).")]
+        SequentialIDsForModelSpecificStations_290 = 290,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 291).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 291).")]
+        SequentialIDsForModelSpecificStations_291 = 291,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 292).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 292).")]
+        SequentialIDsForModelSpecificStations_292 = 292,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 293).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 293).")]
+        SequentialIDsForModelSpecificStations_293 = 293,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 294).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 294).")]
+        SequentialIDsForModelSpecificStations_294 = 294,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 295).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 295).")]
+        SequentialIDsForModelSpecificStations_295 = 295,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 296).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 296).")]
+        SequentialIDsForModelSpecificStations_296 = 296,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 297).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 297).")]
+        SequentialIDsForModelSpecificStations_297 = 297,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 298).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 298).")]
+        SequentialIDsForModelSpecificStations_298 = 298,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 299).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 299).")]
+        SequentialIDsForModelSpecificStations_299 = 299,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 300).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 300).")]
+        SequentialIDsForModelSpecificStations_300 = 300,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 301).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 301).")]
+        SequentialIDsForModelSpecificStations_301 = 301,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 302).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 302).")]
+        SequentialIDsForModelSpecificStations_302 = 302,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 303).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 303).")]
+        SequentialIDsForModelSpecificStations_303 = 303,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 304).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 304).")]
+        SequentialIDsForModelSpecificStations_304 = 304,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 305).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 305).")]
+        SequentialIDsForModelSpecificStations_305 = 305,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 306).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 306).")]
+        SequentialIDsForModelSpecificStations_306 = 306,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 307).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 307).")]
+        SequentialIDsForModelSpecificStations_307 = 307,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 308).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 308).")]
+        SequentialIDsForModelSpecificStations_308 = 308,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 309).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 309).")]
+        SequentialIDsForModelSpecificStations_309 = 309,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 310).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 310).")]
+        SequentialIDsForModelSpecificStations_310 = 310,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 311).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 311).")]
+        SequentialIDsForModelSpecificStations_311 = 311,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 312).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 312).")]
+        SequentialIDsForModelSpecificStations_312 = 312,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 313).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 313).")]
+        SequentialIDsForModelSpecificStations_313 = 313,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 314).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 314).")]
+        SequentialIDsForModelSpecificStations_314 = 314,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 315).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 315).")]
+        SequentialIDsForModelSpecificStations_315 = 315,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 316).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 316).")]
+        SequentialIDsForModelSpecificStations_316 = 316,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 317).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 317).")]
+        SequentialIDsForModelSpecificStations_317 = 317,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 318).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 318).")]
+        SequentialIDsForModelSpecificStations_318 = 318,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 319).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 319).")]
+        SequentialIDsForModelSpecificStations_319 = 319,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 320).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 320).")]
+        SequentialIDsForModelSpecificStations_320 = 320,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 321).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 321).")]
+        SequentialIDsForModelSpecificStations_321 = 321,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 322).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 322).")]
+        SequentialIDsForModelSpecificStations_322 = 322,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 323).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 323).")]
+        SequentialIDsForModelSpecificStations_323 = 323,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 324).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 324).")]
+        SequentialIDsForModelSpecificStations_324 = 324,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 325).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 325).")]
+        SequentialIDsForModelSpecificStations_325 = 325,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 326).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 326).")]
+        SequentialIDsForModelSpecificStations_326 = 326,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 327).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 327).")]
+        SequentialIDsForModelSpecificStations_327 = 327,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 328).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 328).")]
+        SequentialIDsForModelSpecificStations_328 = 328,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 329).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 329).")]
+        SequentialIDsForModelSpecificStations_329 = 329,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 330).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 330).")]
+        SequentialIDsForModelSpecificStations_330 = 330,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 331).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 331).")]
+        SequentialIDsForModelSpecificStations_331 = 331,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 332).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 332).")]
+        SequentialIDsForModelSpecificStations_332 = 332,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 333).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 333).")]
+        SequentialIDsForModelSpecificStations_333 = 333,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 334).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 334).")]
+        SequentialIDsForModelSpecificStations_334 = 334,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 335).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 335).")]
+        SequentialIDsForModelSpecificStations_335 = 335,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 336).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 336).")]
+        SequentialIDsForModelSpecificStations_336 = 336,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 337).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 337).")]
+        SequentialIDsForModelSpecificStations_337 = 337,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 338).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 338).")]
+        SequentialIDsForModelSpecificStations_338 = 338,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 339).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 339).")]
+        SequentialIDsForModelSpecificStations_339 = 339,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 340).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 340).")]
+        SequentialIDsForModelSpecificStations_340 = 340,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 341).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 341).")]
+        SequentialIDsForModelSpecificStations_341 = 341,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 342).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 342).")]
+        SequentialIDsForModelSpecificStations_342 = 342,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 343).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 343).")]
+        SequentialIDsForModelSpecificStations_343 = 343,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 344).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 344).")]
+        SequentialIDsForModelSpecificStations_344 = 344,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 345).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 345).")]
+        SequentialIDsForModelSpecificStations_345 = 345,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 346).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 346).")]
+        SequentialIDsForModelSpecificStations_346 = 346,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 347).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 347).")]
+        SequentialIDsForModelSpecificStations_347 = 347,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 348).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 348).")]
+        SequentialIDsForModelSpecificStations_348 = 348,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 349).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 349).")]
+        SequentialIDsForModelSpecificStations_349 = 349,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 350).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 350).")]
+        SequentialIDsForModelSpecificStations_350 = 350,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 351).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 351).")]
+        SequentialIDsForModelSpecificStations_351 = 351,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 352).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 352).")]
+        SequentialIDsForModelSpecificStations_352 = 352,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 353).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 353).")]
+        SequentialIDsForModelSpecificStations_353 = 353,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 354).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 354).")]
+        SequentialIDsForModelSpecificStations_354 = 354,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 355).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 355).")]
+        SequentialIDsForModelSpecificStations_355 = 355,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 356).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 356).")]
+        SequentialIDsForModelSpecificStations_356 = 356,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 357).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 357).")]
+        SequentialIDsForModelSpecificStations_357 = 357,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 358).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 358).")]
+        SequentialIDsForModelSpecificStations_358 = 358,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 359).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 359).")]
+        SequentialIDsForModelSpecificStations_359 = 359,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 360).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 360).")]
+        SequentialIDsForModelSpecificStations_360 = 360,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 361).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 361).")]
+        SequentialIDsForModelSpecificStations_361 = 361,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 362).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 362).")]
+        SequentialIDsForModelSpecificStations_362 = 362,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 363).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 363).")]
+        SequentialIDsForModelSpecificStations_363 = 363,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 364).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 364).")]
+        SequentialIDsForModelSpecificStations_364 = 364,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 365).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 365).")]
+        SequentialIDsForModelSpecificStations_365 = 365,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 366).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 366).")]
+        SequentialIDsForModelSpecificStations_366 = 366,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 367).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 367).")]
+        SequentialIDsForModelSpecificStations_367 = 367,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 368).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 368).")]
+        SequentialIDsForModelSpecificStations_368 = 368,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 369).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 369).")]
+        SequentialIDsForModelSpecificStations_369 = 369,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 370).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 370).")]
+        SequentialIDsForModelSpecificStations_370 = 370,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 371).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 371).")]
+        SequentialIDsForModelSpecificStations_371 = 371,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 372).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 372).")]
+        SequentialIDsForModelSpecificStations_372 = 372,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 373).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 373).")]
+        SequentialIDsForModelSpecificStations_373 = 373,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 374).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 374).")]
+        SequentialIDsForModelSpecificStations_374 = 374,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 375).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 375).")]
+        SequentialIDsForModelSpecificStations_375 = 375,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 376).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 376).")]
+        SequentialIDsForModelSpecificStations_376 = 376,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 377).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 377).")]
+        SequentialIDsForModelSpecificStations_377 = 377,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 378).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 378).")]
+        SequentialIDsForModelSpecificStations_378 = 378,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 379).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 379).")]
+        SequentialIDsForModelSpecificStations_379 = 379,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 380).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 380).")]
+        SequentialIDsForModelSpecificStations_380 = 380,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 381).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 381).")]
+        SequentialIDsForModelSpecificStations_381 = 381,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 382).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 382).")]
+        SequentialIDsForModelSpecificStations_382 = 382,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 383).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 383).")]
+        SequentialIDsForModelSpecificStations_383 = 383,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 384).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 384).")]
+        SequentialIDsForModelSpecificStations_384 = 384,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 385).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 385).")]
+        SequentialIDsForModelSpecificStations_385 = 385,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 386).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 386).")]
+        SequentialIDsForModelSpecificStations_386 = 386,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 387).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 387).")]
+        SequentialIDsForModelSpecificStations_387 = 387,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 388).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 388).")]
+        SequentialIDsForModelSpecificStations_388 = 388,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 389).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 389).")]
+        SequentialIDsForModelSpecificStations_389 = 389,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 390).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 390).")]
+        SequentialIDsForModelSpecificStations_390 = 390,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 391).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 391).")]
+        SequentialIDsForModelSpecificStations_391 = 391,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 392).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 392).")]
+        SequentialIDsForModelSpecificStations_392 = 392,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 393).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 393).")]
+        SequentialIDsForModelSpecificStations_393 = 393,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 394).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 394).")]
+        SequentialIDsForModelSpecificStations_394 = 394,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 395).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 395).")]
+        SequentialIDsForModelSpecificStations_395 = 395,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 396).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 396).")]
+        SequentialIDsForModelSpecificStations_396 = 396,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 397).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 397).")]
+        SequentialIDsForModelSpecificStations_397 = 397,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 398).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 398).")]
+        SequentialIDsForModelSpecificStations_398 = 398,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 399).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 399).")]
+        SequentialIDsForModelSpecificStations_399 = 399,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 400).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 400).")]
+        SequentialIDsForModelSpecificStations_400 = 400,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 401).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 401).")]
+        SequentialIDsForModelSpecificStations_401 = 401,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 402).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 402).")]
+        SequentialIDsForModelSpecificStations_402 = 402,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 403).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 403).")]
+        SequentialIDsForModelSpecificStations_403 = 403,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 404).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 404).")]
+        SequentialIDsForModelSpecificStations_404 = 404,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 405).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 405).")]
+        SequentialIDsForModelSpecificStations_405 = 405,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 406).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 406).")]
+        SequentialIDsForModelSpecificStations_406 = 406,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 407).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 407).")]
+        SequentialIDsForModelSpecificStations_407 = 407,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 408).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 408).")]
+        SequentialIDsForModelSpecificStations_408 = 408,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 409).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 409).")]
+        SequentialIDsForModelSpecificStations_409 = 409,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 410).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 410).")]
+        SequentialIDsForModelSpecificStations_410 = 410,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 411).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 411).")]
+        SequentialIDsForModelSpecificStations_411 = 411,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 412).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 412).")]
+        SequentialIDsForModelSpecificStations_412 = 412,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 413).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 413).")]
+        SequentialIDsForModelSpecificStations_413 = 413,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 414).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 414).")]
+        SequentialIDsForModelSpecificStations_414 = 414,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 415).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 415).")]
+        SequentialIDsForModelSpecificStations_415 = 415,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 416).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 416).")]
+        SequentialIDsForModelSpecificStations_416 = 416,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 417).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 417).")]
+        SequentialIDsForModelSpecificStations_417 = 417,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 418).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 418).")]
+        SequentialIDsForModelSpecificStations_418 = 418,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 419).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 419).")]
+        SequentialIDsForModelSpecificStations_419 = 419,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 420).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 420).")]
+        SequentialIDsForModelSpecificStations_420 = 420,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 421).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 421).")]
+        SequentialIDsForModelSpecificStations_421 = 421,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 422).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 422).")]
+        SequentialIDsForModelSpecificStations_422 = 422,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 423).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 423).")]
+        SequentialIDsForModelSpecificStations_423 = 423,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 424).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 424).")]
+        SequentialIDsForModelSpecificStations_424 = 424,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 425).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 425).")]
+        SequentialIDsForModelSpecificStations_425 = 425,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 426).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 426).")]
+        SequentialIDsForModelSpecificStations_426 = 426,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 427).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 427).")]
+        SequentialIDsForModelSpecificStations_427 = 427,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 428).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 428).")]
+        SequentialIDsForModelSpecificStations_428 = 428,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 429).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 429).")]
+        SequentialIDsForModelSpecificStations_429 = 429,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 430).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 430).")]
+        SequentialIDsForModelSpecificStations_430 = 430,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 431).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 431).")]
+        SequentialIDsForModelSpecificStations_431 = 431,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 432).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 432).")]
+        SequentialIDsForModelSpecificStations_432 = 432,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 433).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 433).")]
+        SequentialIDsForModelSpecificStations_433 = 433,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 434).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 434).")]
+        SequentialIDsForModelSpecificStations_434 = 434,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 435).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 435).")]
+        SequentialIDsForModelSpecificStations_435 = 435,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 436).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 436).")]
+        SequentialIDsForModelSpecificStations_436 = 436,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 437).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 437).")]
+        SequentialIDsForModelSpecificStations_437 = 437,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 438).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 438).")]
+        SequentialIDsForModelSpecificStations_438 = 438,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 439).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 439).")]
+        SequentialIDsForModelSpecificStations_439 = 439,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 440).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 440).")]
+        SequentialIDsForModelSpecificStations_440 = 440,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 441).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 441).")]
+        SequentialIDsForModelSpecificStations_441 = 441,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 442).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 442).")]
+        SequentialIDsForModelSpecificStations_442 = 442,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 443).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 443).")]
+        SequentialIDsForModelSpecificStations_443 = 443,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 444).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 444).")]
+        SequentialIDsForModelSpecificStations_444 = 444,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 445).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 445).")]
+        SequentialIDsForModelSpecificStations_445 = 445,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 446).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 446).")]
+        SequentialIDsForModelSpecificStations_446 = 446,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 447).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 447).")]
+        SequentialIDsForModelSpecificStations_447 = 447,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 448).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 448).")]
+        SequentialIDsForModelSpecificStations_448 = 448,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 449).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 449).")]
+        SequentialIDsForModelSpecificStations_449 = 449,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 450).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 450).")]
+        SequentialIDsForModelSpecificStations_450 = 450,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 451).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 451).")]
+        SequentialIDsForModelSpecificStations_451 = 451,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 452).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 452).")]
+        SequentialIDsForModelSpecificStations_452 = 452,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 453).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 453).")]
+        SequentialIDsForModelSpecificStations_453 = 453,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 454).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 454).")]
+        SequentialIDsForModelSpecificStations_454 = 454,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 455).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 455).")]
+        SequentialIDsForModelSpecificStations_455 = 455,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 456).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 456).")]
+        SequentialIDsForModelSpecificStations_456 = 456,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 457).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 457).")]
+        SequentialIDsForModelSpecificStations_457 = 457,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 458).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 458).")]
+        SequentialIDsForModelSpecificStations_458 = 458,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 459).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 459).")]
+        SequentialIDsForModelSpecificStations_459 = 459,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 460).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 460).")]
+        SequentialIDsForModelSpecificStations_460 = 460,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 461).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 461).")]
+        SequentialIDsForModelSpecificStations_461 = 461,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 462).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 462).")]
+        SequentialIDsForModelSpecificStations_462 = 462,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 463).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 463).")]
+        SequentialIDsForModelSpecificStations_463 = 463,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 464).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 464).")]
+        SequentialIDsForModelSpecificStations_464 = 464,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 465).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 465).")]
+        SequentialIDsForModelSpecificStations_465 = 465,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 466).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 466).")]
+        SequentialIDsForModelSpecificStations_466 = 466,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 467).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 467).")]
+        SequentialIDsForModelSpecificStations_467 = 467,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 468).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 468).")]
+        SequentialIDsForModelSpecificStations_468 = 468,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 469).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 469).")]
+        SequentialIDsForModelSpecificStations_469 = 469,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 470).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 470).")]
+        SequentialIDsForModelSpecificStations_470 = 470,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 471).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 471).")]
+        SequentialIDsForModelSpecificStations_471 = 471,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 472).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 472).")]
+        SequentialIDsForModelSpecificStations_472 = 472,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 473).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 473).")]
+        SequentialIDsForModelSpecificStations_473 = 473,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 474).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 474).")]
+        SequentialIDsForModelSpecificStations_474 = 474,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 475).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 475).")]
+        SequentialIDsForModelSpecificStations_475 = 475,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 476).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 476).")]
+        SequentialIDsForModelSpecificStations_476 = 476,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 477).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 477).")]
+        SequentialIDsForModelSpecificStations_477 = 477,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 478).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 478).")]
+        SequentialIDsForModelSpecificStations_478 = 478,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 479).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 479).")]
+        SequentialIDsForModelSpecificStations_479 = 479,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 480).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 480).")]
+        SequentialIDsForModelSpecificStations_480 = 480,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 481).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 481).")]
+        SequentialIDsForModelSpecificStations_481 = 481,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 482).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 482).")]
+        SequentialIDsForModelSpecificStations_482 = 482,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 483).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 483).")]
+        SequentialIDsForModelSpecificStations_483 = 483,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 484).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 484).")]
+        SequentialIDsForModelSpecificStations_484 = 484,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 485).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 485).")]
+        SequentialIDsForModelSpecificStations_485 = 485,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 486).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 486).")]
+        SequentialIDsForModelSpecificStations_486 = 486,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 487).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 487).")]
+        SequentialIDsForModelSpecificStations_487 = 487,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 488).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 488).")]
+        SequentialIDsForModelSpecificStations_488 = 488,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 489).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 489).")]
+        SequentialIDsForModelSpecificStations_489 = 489,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 490).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 490).")]
+        SequentialIDsForModelSpecificStations_490 = 490,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 491).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 491).")]
+        SequentialIDsForModelSpecificStations_491 = 491,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 492).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 492).")]
+        SequentialIDsForModelSpecificStations_492 = 492,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 493).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 493).")]
+        SequentialIDsForModelSpecificStations_493 = 493,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 494).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 494).")]
+        SequentialIDsForModelSpecificStations_494 = 494,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 495).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 495).")]
+        SequentialIDsForModelSpecificStations_495 = 495,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 496).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 496).")]
+        SequentialIDsForModelSpecificStations_496 = 496,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 497).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 497).")]
+        SequentialIDsForModelSpecificStations_497 = 497,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 498).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 498).")]
+        SequentialIDsForModelSpecificStations_498 = 498,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 499).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 499).")]
+        SequentialIDsForModelSpecificStations_499 = 499,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 500).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 500).")]
+        SequentialIDsForModelSpecificStations_500 = 500,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 501).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 501).")]
+        SequentialIDsForModelSpecificStations_501 = 501,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 502).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 502).")]
+        SequentialIDsForModelSpecificStations_502 = 502,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 503).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 503).")]
+        SequentialIDsForModelSpecificStations_503 = 503,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 504).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 504).")]
+        SequentialIDsForModelSpecificStations_504 = 504,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 505).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 505).")]
+        SequentialIDsForModelSpecificStations_505 = 505,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 506).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 506).")]
+        SequentialIDsForModelSpecificStations_506 = 506,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 507).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 507).")]
+        SequentialIDsForModelSpecificStations_507 = 507,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 508).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 508).")]
+        SequentialIDsForModelSpecificStations_508 = 508,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 509).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 509).")]
+        SequentialIDsForModelSpecificStations_509 = 509,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 510).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 510).")]
+        SequentialIDsForModelSpecificStations_510 = 510,
+
+        /// <summary>
+        /// Sequential IDs for model-specific stations (with id 511).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sequential IDs for model-specific stations (with id 511).")]
+        SequentialIDsForModelSpecificStations_511 = 511,
+
+        /// <summary>
+        /// Fuselage Stations (with id 512).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 512).")]
+        FuselageStations_512 = 512,
+
+        /// <summary>
+        /// Fuselage Stations (with id 513).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 513).")]
+        FuselageStations_513 = 513,
+
+        /// <summary>
+        /// Fuselage Stations (with id 514).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 514).")]
+        FuselageStations_514 = 514,
+
+        /// <summary>
+        /// Fuselage Stations (with id 515).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 515).")]
+        FuselageStations_515 = 515,
+
+        /// <summary>
+        /// Fuselage Stations (with id 516).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 516).")]
+        FuselageStations_516 = 516,
+
+        /// <summary>
+        /// Fuselage Stations (with id 517).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 517).")]
+        FuselageStations_517 = 517,
+
+        /// <summary>
+        /// Fuselage Stations (with id 518).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 518).")]
+        FuselageStations_518 = 518,
+
+        /// <summary>
+        /// Fuselage Stations (with id 519).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 519).")]
+        FuselageStations_519 = 519,
+
+        /// <summary>
+        /// Fuselage Stations (with id 520).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 520).")]
+        FuselageStations_520 = 520,
+
+        /// <summary>
+        /// Fuselage Stations (with id 521).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 521).")]
+        FuselageStations_521 = 521,
+
+        /// <summary>
+        /// Fuselage Stations (with id 522).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 522).")]
+        FuselageStations_522 = 522,
+
+        /// <summary>
+        /// Fuselage Stations (with id 523).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 523).")]
+        FuselageStations_523 = 523,
+
+        /// <summary>
+        /// Fuselage Stations (with id 524).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 524).")]
+        FuselageStations_524 = 524,
+
+        /// <summary>
+        /// Fuselage Stations (with id 525).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 525).")]
+        FuselageStations_525 = 525,
+
+        /// <summary>
+        /// Fuselage Stations (with id 526).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 526).")]
+        FuselageStations_526 = 526,
+
+        /// <summary>
+        /// Fuselage Stations (with id 527).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 527).")]
+        FuselageStations_527 = 527,
+
+        /// <summary>
+        /// Fuselage Stations (with id 528).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 528).")]
+        FuselageStations_528 = 528,
+
+        /// <summary>
+        /// Fuselage Stations (with id 529).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 529).")]
+        FuselageStations_529 = 529,
+
+        /// <summary>
+        /// Fuselage Stations (with id 530).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 530).")]
+        FuselageStations_530 = 530,
+
+        /// <summary>
+        /// Fuselage Stations (with id 531).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 531).")]
+        FuselageStations_531 = 531,
+
+        /// <summary>
+        /// Fuselage Stations (with id 532).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 532).")]
+        FuselageStations_532 = 532,
+
+        /// <summary>
+        /// Fuselage Stations (with id 533).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 533).")]
+        FuselageStations_533 = 533,
+
+        /// <summary>
+        /// Fuselage Stations (with id 534).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 534).")]
+        FuselageStations_534 = 534,
+
+        /// <summary>
+        /// Fuselage Stations (with id 535).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 535).")]
+        FuselageStations_535 = 535,
+
+        /// <summary>
+        /// Fuselage Stations (with id 536).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 536).")]
+        FuselageStations_536 = 536,
+
+        /// <summary>
+        /// Fuselage Stations (with id 537).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 537).")]
+        FuselageStations_537 = 537,
+
+        /// <summary>
+        /// Fuselage Stations (with id 538).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 538).")]
+        FuselageStations_538 = 538,
+
+        /// <summary>
+        /// Fuselage Stations (with id 539).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 539).")]
+        FuselageStations_539 = 539,
+
+        /// <summary>
+        /// Fuselage Stations (with id 540).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 540).")]
+        FuselageStations_540 = 540,
+
+        /// <summary>
+        /// Fuselage Stations (with id 541).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 541).")]
+        FuselageStations_541 = 541,
+
+        /// <summary>
+        /// Fuselage Stations (with id 542).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 542).")]
+        FuselageStations_542 = 542,
+
+        /// <summary>
+        /// Fuselage Stations (with id 543).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 543).")]
+        FuselageStations_543 = 543,
+
+        /// <summary>
+        /// Fuselage Stations (with id 544).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 544).")]
+        FuselageStations_544 = 544,
+
+        /// <summary>
+        /// Fuselage Stations (with id 545).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 545).")]
+        FuselageStations_545 = 545,
+
+        /// <summary>
+        /// Fuselage Stations (with id 546).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 546).")]
+        FuselageStations_546 = 546,
+
+        /// <summary>
+        /// Fuselage Stations (with id 547).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 547).")]
+        FuselageStations_547 = 547,
+
+        /// <summary>
+        /// Fuselage Stations (with id 548).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 548).")]
+        FuselageStations_548 = 548,
+
+        /// <summary>
+        /// Fuselage Stations (with id 549).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 549).")]
+        FuselageStations_549 = 549,
+
+        /// <summary>
+        /// Fuselage Stations (with id 550).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 550).")]
+        FuselageStations_550 = 550,
+
+        /// <summary>
+        /// Fuselage Stations (with id 551).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 551).")]
+        FuselageStations_551 = 551,
+
+        /// <summary>
+        /// Fuselage Stations (with id 552).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 552).")]
+        FuselageStations_552 = 552,
+
+        /// <summary>
+        /// Fuselage Stations (with id 553).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 553).")]
+        FuselageStations_553 = 553,
+
+        /// <summary>
+        /// Fuselage Stations (with id 554).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 554).")]
+        FuselageStations_554 = 554,
+
+        /// <summary>
+        /// Fuselage Stations (with id 555).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 555).")]
+        FuselageStations_555 = 555,
+
+        /// <summary>
+        /// Fuselage Stations (with id 556).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 556).")]
+        FuselageStations_556 = 556,
+
+        /// <summary>
+        /// Fuselage Stations (with id 557).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 557).")]
+        FuselageStations_557 = 557,
+
+        /// <summary>
+        /// Fuselage Stations (with id 558).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 558).")]
+        FuselageStations_558 = 558,
+
+        /// <summary>
+        /// Fuselage Stations (with id 559).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 559).")]
+        FuselageStations_559 = 559,
+
+        /// <summary>
+        /// Fuselage Stations (with id 560).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 560).")]
+        FuselageStations_560 = 560,
+
+        /// <summary>
+        /// Fuselage Stations (with id 561).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 561).")]
+        FuselageStations_561 = 561,
+
+        /// <summary>
+        /// Fuselage Stations (with id 562).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 562).")]
+        FuselageStations_562 = 562,
+
+        /// <summary>
+        /// Fuselage Stations (with id 563).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 563).")]
+        FuselageStations_563 = 563,
+
+        /// <summary>
+        /// Fuselage Stations (with id 564).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 564).")]
+        FuselageStations_564 = 564,
+
+        /// <summary>
+        /// Fuselage Stations (with id 565).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 565).")]
+        FuselageStations_565 = 565,
+
+        /// <summary>
+        /// Fuselage Stations (with id 566).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 566).")]
+        FuselageStations_566 = 566,
+
+        /// <summary>
+        /// Fuselage Stations (with id 567).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 567).")]
+        FuselageStations_567 = 567,
+
+        /// <summary>
+        /// Fuselage Stations (with id 568).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 568).")]
+        FuselageStations_568 = 568,
+
+        /// <summary>
+        /// Fuselage Stations (with id 569).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 569).")]
+        FuselageStations_569 = 569,
+
+        /// <summary>
+        /// Fuselage Stations (with id 570).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 570).")]
+        FuselageStations_570 = 570,
+
+        /// <summary>
+        /// Fuselage Stations (with id 571).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 571).")]
+        FuselageStations_571 = 571,
+
+        /// <summary>
+        /// Fuselage Stations (with id 572).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 572).")]
+        FuselageStations_572 = 572,
+
+        /// <summary>
+        /// Fuselage Stations (with id 573).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 573).")]
+        FuselageStations_573 = 573,
+
+        /// <summary>
+        /// Fuselage Stations (with id 574).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 574).")]
+        FuselageStations_574 = 574,
+
+        /// <summary>
+        /// Fuselage Stations (with id 575).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 575).")]
+        FuselageStations_575 = 575,
+
+        /// <summary>
+        /// Fuselage Stations (with id 576).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 576).")]
+        FuselageStations_576 = 576,
+
+        /// <summary>
+        /// Fuselage Stations (with id 577).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 577).")]
+        FuselageStations_577 = 577,
+
+        /// <summary>
+        /// Fuselage Stations (with id 578).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 578).")]
+        FuselageStations_578 = 578,
+
+        /// <summary>
+        /// Fuselage Stations (with id 579).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 579).")]
+        FuselageStations_579 = 579,
+
+        /// <summary>
+        /// Fuselage Stations (with id 580).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 580).")]
+        FuselageStations_580 = 580,
+
+        /// <summary>
+        /// Fuselage Stations (with id 581).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 581).")]
+        FuselageStations_581 = 581,
+
+        /// <summary>
+        /// Fuselage Stations (with id 582).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 582).")]
+        FuselageStations_582 = 582,
+
+        /// <summary>
+        /// Fuselage Stations (with id 583).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 583).")]
+        FuselageStations_583 = 583,
+
+        /// <summary>
+        /// Fuselage Stations (with id 584).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 584).")]
+        FuselageStations_584 = 584,
+
+        /// <summary>
+        /// Fuselage Stations (with id 585).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 585).")]
+        FuselageStations_585 = 585,
+
+        /// <summary>
+        /// Fuselage Stations (with id 586).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 586).")]
+        FuselageStations_586 = 586,
+
+        /// <summary>
+        /// Fuselage Stations (with id 587).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 587).")]
+        FuselageStations_587 = 587,
+
+        /// <summary>
+        /// Fuselage Stations (with id 588).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 588).")]
+        FuselageStations_588 = 588,
+
+        /// <summary>
+        /// Fuselage Stations (with id 589).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 589).")]
+        FuselageStations_589 = 589,
+
+        /// <summary>
+        /// Fuselage Stations (with id 590).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 590).")]
+        FuselageStations_590 = 590,
+
+        /// <summary>
+        /// Fuselage Stations (with id 591).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 591).")]
+        FuselageStations_591 = 591,
+
+        /// <summary>
+        /// Fuselage Stations (with id 592).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 592).")]
+        FuselageStations_592 = 592,
+
+        /// <summary>
+        /// Fuselage Stations (with id 593).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 593).")]
+        FuselageStations_593 = 593,
+
+        /// <summary>
+        /// Fuselage Stations (with id 594).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 594).")]
+        FuselageStations_594 = 594,
+
+        /// <summary>
+        /// Fuselage Stations (with id 595).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 595).")]
+        FuselageStations_595 = 595,
+
+        /// <summary>
+        /// Fuselage Stations (with id 596).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 596).")]
+        FuselageStations_596 = 596,
+
+        /// <summary>
+        /// Fuselage Stations (with id 597).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 597).")]
+        FuselageStations_597 = 597,
+
+        /// <summary>
+        /// Fuselage Stations (with id 598).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 598).")]
+        FuselageStations_598 = 598,
+
+        /// <summary>
+        /// Fuselage Stations (with id 599).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 599).")]
+        FuselageStations_599 = 599,
+
+        /// <summary>
+        /// Fuselage Stations (with id 600).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 600).")]
+        FuselageStations_600 = 600,
+
+        /// <summary>
+        /// Fuselage Stations (with id 601).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 601).")]
+        FuselageStations_601 = 601,
+
+        /// <summary>
+        /// Fuselage Stations (with id 602).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 602).")]
+        FuselageStations_602 = 602,
+
+        /// <summary>
+        /// Fuselage Stations (with id 603).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 603).")]
+        FuselageStations_603 = 603,
+
+        /// <summary>
+        /// Fuselage Stations (with id 604).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 604).")]
+        FuselageStations_604 = 604,
+
+        /// <summary>
+        /// Fuselage Stations (with id 605).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 605).")]
+        FuselageStations_605 = 605,
+
+        /// <summary>
+        /// Fuselage Stations (with id 606).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 606).")]
+        FuselageStations_606 = 606,
+
+        /// <summary>
+        /// Fuselage Stations (with id 607).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 607).")]
+        FuselageStations_607 = 607,
+
+        /// <summary>
+        /// Fuselage Stations (with id 608).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 608).")]
+        FuselageStations_608 = 608,
+
+        /// <summary>
+        /// Fuselage Stations (with id 609).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 609).")]
+        FuselageStations_609 = 609,
+
+        /// <summary>
+        /// Fuselage Stations (with id 610).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 610).")]
+        FuselageStations_610 = 610,
+
+        /// <summary>
+        /// Fuselage Stations (with id 611).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 611).")]
+        FuselageStations_611 = 611,
+
+        /// <summary>
+        /// Fuselage Stations (with id 612).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 612).")]
+        FuselageStations_612 = 612,
+
+        /// <summary>
+        /// Fuselage Stations (with id 613).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 613).")]
+        FuselageStations_613 = 613,
+
+        /// <summary>
+        /// Fuselage Stations (with id 614).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 614).")]
+        FuselageStations_614 = 614,
+
+        /// <summary>
+        /// Fuselage Stations (with id 615).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 615).")]
+        FuselageStations_615 = 615,
+
+        /// <summary>
+        /// Fuselage Stations (with id 616).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 616).")]
+        FuselageStations_616 = 616,
+
+        /// <summary>
+        /// Fuselage Stations (with id 617).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 617).")]
+        FuselageStations_617 = 617,
+
+        /// <summary>
+        /// Fuselage Stations (with id 618).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 618).")]
+        FuselageStations_618 = 618,
+
+        /// <summary>
+        /// Fuselage Stations (with id 619).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 619).")]
+        FuselageStations_619 = 619,
+
+        /// <summary>
+        /// Fuselage Stations (with id 620).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 620).")]
+        FuselageStations_620 = 620,
+
+        /// <summary>
+        /// Fuselage Stations (with id 621).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 621).")]
+        FuselageStations_621 = 621,
+
+        /// <summary>
+        /// Fuselage Stations (with id 622).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 622).")]
+        FuselageStations_622 = 622,
+
+        /// <summary>
+        /// Fuselage Stations (with id 623).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 623).")]
+        FuselageStations_623 = 623,
+
+        /// <summary>
+        /// Fuselage Stations (with id 624).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 624).")]
+        FuselageStations_624 = 624,
+
+        /// <summary>
+        /// Fuselage Stations (with id 625).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 625).")]
+        FuselageStations_625 = 625,
+
+        /// <summary>
+        /// Fuselage Stations (with id 626).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 626).")]
+        FuselageStations_626 = 626,
+
+        /// <summary>
+        /// Fuselage Stations (with id 627).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 627).")]
+        FuselageStations_627 = 627,
+
+        /// <summary>
+        /// Fuselage Stations (with id 628).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 628).")]
+        FuselageStations_628 = 628,
+
+        /// <summary>
+        /// Fuselage Stations (with id 629).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 629).")]
+        FuselageStations_629 = 629,
+
+        /// <summary>
+        /// Fuselage Stations (with id 630).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 630).")]
+        FuselageStations_630 = 630,
+
+        /// <summary>
+        /// Fuselage Stations (with id 631).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 631).")]
+        FuselageStations_631 = 631,
+
+        /// <summary>
+        /// Fuselage Stations (with id 632).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 632).")]
+        FuselageStations_632 = 632,
+
+        /// <summary>
+        /// Fuselage Stations (with id 633).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 633).")]
+        FuselageStations_633 = 633,
+
+        /// <summary>
+        /// Fuselage Stations (with id 634).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 634).")]
+        FuselageStations_634 = 634,
+
+        /// <summary>
+        /// Fuselage Stations (with id 635).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 635).")]
+        FuselageStations_635 = 635,
+
+        /// <summary>
+        /// Fuselage Stations (with id 636).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 636).")]
+        FuselageStations_636 = 636,
+
+        /// <summary>
+        /// Fuselage Stations (with id 637).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 637).")]
+        FuselageStations_637 = 637,
+
+        /// <summary>
+        /// Fuselage Stations (with id 638).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 638).")]
+        FuselageStations_638 = 638,
+
+        /// <summary>
+        /// Fuselage Stations (with id 639).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuselage Stations (with id 639).")]
+        FuselageStations_639 = 639,
+
+        /// <summary>
+        /// Left-wing Stations (with id 640).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 640).")]
+        LeftWingStations_640 = 640,
+
+        /// <summary>
+        /// Left-wing Stations (with id 641).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 641).")]
+        LeftWingStations_641 = 641,
+
+        /// <summary>
+        /// Left-wing Stations (with id 642).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 642).")]
+        LeftWingStations_642 = 642,
+
+        /// <summary>
+        /// Left-wing Stations (with id 643).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 643).")]
+        LeftWingStations_643 = 643,
+
+        /// <summary>
+        /// Left-wing Stations (with id 644).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 644).")]
+        LeftWingStations_644 = 644,
+
+        /// <summary>
+        /// Left-wing Stations (with id 645).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 645).")]
+        LeftWingStations_645 = 645,
+
+        /// <summary>
+        /// Left-wing Stations (with id 646).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 646).")]
+        LeftWingStations_646 = 646,
+
+        /// <summary>
+        /// Left-wing Stations (with id 647).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 647).")]
+        LeftWingStations_647 = 647,
+
+        /// <summary>
+        /// Left-wing Stations (with id 648).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 648).")]
+        LeftWingStations_648 = 648,
+
+        /// <summary>
+        /// Left-wing Stations (with id 649).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 649).")]
+        LeftWingStations_649 = 649,
+
+        /// <summary>
+        /// Left-wing Stations (with id 650).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 650).")]
+        LeftWingStations_650 = 650,
+
+        /// <summary>
+        /// Left-wing Stations (with id 651).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 651).")]
+        LeftWingStations_651 = 651,
+
+        /// <summary>
+        /// Left-wing Stations (with id 652).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 652).")]
+        LeftWingStations_652 = 652,
+
+        /// <summary>
+        /// Left-wing Stations (with id 653).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 653).")]
+        LeftWingStations_653 = 653,
+
+        /// <summary>
+        /// Left-wing Stations (with id 654).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 654).")]
+        LeftWingStations_654 = 654,
+
+        /// <summary>
+        /// Left-wing Stations (with id 655).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 655).")]
+        LeftWingStations_655 = 655,
+
+        /// <summary>
+        /// Left-wing Stations (with id 656).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 656).")]
+        LeftWingStations_656 = 656,
+
+        /// <summary>
+        /// Left-wing Stations (with id 657).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 657).")]
+        LeftWingStations_657 = 657,
+
+        /// <summary>
+        /// Left-wing Stations (with id 658).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 658).")]
+        LeftWingStations_658 = 658,
+
+        /// <summary>
+        /// Left-wing Stations (with id 659).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 659).")]
+        LeftWingStations_659 = 659,
+
+        /// <summary>
+        /// Left-wing Stations (with id 660).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 660).")]
+        LeftWingStations_660 = 660,
+
+        /// <summary>
+        /// Left-wing Stations (with id 661).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 661).")]
+        LeftWingStations_661 = 661,
+
+        /// <summary>
+        /// Left-wing Stations (with id 662).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 662).")]
+        LeftWingStations_662 = 662,
+
+        /// <summary>
+        /// Left-wing Stations (with id 663).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 663).")]
+        LeftWingStations_663 = 663,
+
+        /// <summary>
+        /// Left-wing Stations (with id 664).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 664).")]
+        LeftWingStations_664 = 664,
+
+        /// <summary>
+        /// Left-wing Stations (with id 665).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 665).")]
+        LeftWingStations_665 = 665,
+
+        /// <summary>
+        /// Left-wing Stations (with id 666).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 666).")]
+        LeftWingStations_666 = 666,
+
+        /// <summary>
+        /// Left-wing Stations (with id 667).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 667).")]
+        LeftWingStations_667 = 667,
+
+        /// <summary>
+        /// Left-wing Stations (with id 668).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 668).")]
+        LeftWingStations_668 = 668,
+
+        /// <summary>
+        /// Left-wing Stations (with id 669).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 669).")]
+        LeftWingStations_669 = 669,
+
+        /// <summary>
+        /// Left-wing Stations (with id 670).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 670).")]
+        LeftWingStations_670 = 670,
+
+        /// <summary>
+        /// Left-wing Stations (with id 671).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 671).")]
+        LeftWingStations_671 = 671,
+
+        /// <summary>
+        /// Left-wing Stations (with id 672).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 672).")]
+        LeftWingStations_672 = 672,
+
+        /// <summary>
+        /// Left-wing Stations (with id 673).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 673).")]
+        LeftWingStations_673 = 673,
+
+        /// <summary>
+        /// Left-wing Stations (with id 674).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 674).")]
+        LeftWingStations_674 = 674,
+
+        /// <summary>
+        /// Left-wing Stations (with id 675).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 675).")]
+        LeftWingStations_675 = 675,
+
+        /// <summary>
+        /// Left-wing Stations (with id 676).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 676).")]
+        LeftWingStations_676 = 676,
+
+        /// <summary>
+        /// Left-wing Stations (with id 677).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 677).")]
+        LeftWingStations_677 = 677,
+
+        /// <summary>
+        /// Left-wing Stations (with id 678).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 678).")]
+        LeftWingStations_678 = 678,
+
+        /// <summary>
+        /// Left-wing Stations (with id 679).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 679).")]
+        LeftWingStations_679 = 679,
+
+        /// <summary>
+        /// Left-wing Stations (with id 680).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 680).")]
+        LeftWingStations_680 = 680,
+
+        /// <summary>
+        /// Left-wing Stations (with id 681).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 681).")]
+        LeftWingStations_681 = 681,
+
+        /// <summary>
+        /// Left-wing Stations (with id 682).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 682).")]
+        LeftWingStations_682 = 682,
+
+        /// <summary>
+        /// Left-wing Stations (with id 683).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 683).")]
+        LeftWingStations_683 = 683,
+
+        /// <summary>
+        /// Left-wing Stations (with id 684).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 684).")]
+        LeftWingStations_684 = 684,
+
+        /// <summary>
+        /// Left-wing Stations (with id 685).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 685).")]
+        LeftWingStations_685 = 685,
+
+        /// <summary>
+        /// Left-wing Stations (with id 686).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 686).")]
+        LeftWingStations_686 = 686,
+
+        /// <summary>
+        /// Left-wing Stations (with id 687).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 687).")]
+        LeftWingStations_687 = 687,
+
+        /// <summary>
+        /// Left-wing Stations (with id 688).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 688).")]
+        LeftWingStations_688 = 688,
+
+        /// <summary>
+        /// Left-wing Stations (with id 689).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 689).")]
+        LeftWingStations_689 = 689,
+
+        /// <summary>
+        /// Left-wing Stations (with id 690).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 690).")]
+        LeftWingStations_690 = 690,
+
+        /// <summary>
+        /// Left-wing Stations (with id 691).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 691).")]
+        LeftWingStations_691 = 691,
+
+        /// <summary>
+        /// Left-wing Stations (with id 692).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 692).")]
+        LeftWingStations_692 = 692,
+
+        /// <summary>
+        /// Left-wing Stations (with id 693).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 693).")]
+        LeftWingStations_693 = 693,
+
+        /// <summary>
+        /// Left-wing Stations (with id 694).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 694).")]
+        LeftWingStations_694 = 694,
+
+        /// <summary>
+        /// Left-wing Stations (with id 695).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 695).")]
+        LeftWingStations_695 = 695,
+
+        /// <summary>
+        /// Left-wing Stations (with id 696).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 696).")]
+        LeftWingStations_696 = 696,
+
+        /// <summary>
+        /// Left-wing Stations (with id 697).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 697).")]
+        LeftWingStations_697 = 697,
+
+        /// <summary>
+        /// Left-wing Stations (with id 698).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 698).")]
+        LeftWingStations_698 = 698,
+
+        /// <summary>
+        /// Left-wing Stations (with id 699).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 699).")]
+        LeftWingStations_699 = 699,
+
+        /// <summary>
+        /// Left-wing Stations (with id 700).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 700).")]
+        LeftWingStations_700 = 700,
+
+        /// <summary>
+        /// Left-wing Stations (with id 701).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 701).")]
+        LeftWingStations_701 = 701,
+
+        /// <summary>
+        /// Left-wing Stations (with id 702).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 702).")]
+        LeftWingStations_702 = 702,
+
+        /// <summary>
+        /// Left-wing Stations (with id 703).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 703).")]
+        LeftWingStations_703 = 703,
+
+        /// <summary>
+        /// Left-wing Stations (with id 704).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 704).")]
+        LeftWingStations_704 = 704,
+
+        /// <summary>
+        /// Left-wing Stations (with id 705).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 705).")]
+        LeftWingStations_705 = 705,
+
+        /// <summary>
+        /// Left-wing Stations (with id 706).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 706).")]
+        LeftWingStations_706 = 706,
+
+        /// <summary>
+        /// Left-wing Stations (with id 707).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 707).")]
+        LeftWingStations_707 = 707,
+
+        /// <summary>
+        /// Left-wing Stations (with id 708).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 708).")]
+        LeftWingStations_708 = 708,
+
+        /// <summary>
+        /// Left-wing Stations (with id 709).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 709).")]
+        LeftWingStations_709 = 709,
+
+        /// <summary>
+        /// Left-wing Stations (with id 710).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 710).")]
+        LeftWingStations_710 = 710,
+
+        /// <summary>
+        /// Left-wing Stations (with id 711).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 711).")]
+        LeftWingStations_711 = 711,
+
+        /// <summary>
+        /// Left-wing Stations (with id 712).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 712).")]
+        LeftWingStations_712 = 712,
+
+        /// <summary>
+        /// Left-wing Stations (with id 713).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 713).")]
+        LeftWingStations_713 = 713,
+
+        /// <summary>
+        /// Left-wing Stations (with id 714).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 714).")]
+        LeftWingStations_714 = 714,
+
+        /// <summary>
+        /// Left-wing Stations (with id 715).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 715).")]
+        LeftWingStations_715 = 715,
+
+        /// <summary>
+        /// Left-wing Stations (with id 716).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 716).")]
+        LeftWingStations_716 = 716,
+
+        /// <summary>
+        /// Left-wing Stations (with id 717).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 717).")]
+        LeftWingStations_717 = 717,
+
+        /// <summary>
+        /// Left-wing Stations (with id 718).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 718).")]
+        LeftWingStations_718 = 718,
+
+        /// <summary>
+        /// Left-wing Stations (with id 719).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 719).")]
+        LeftWingStations_719 = 719,
+
+        /// <summary>
+        /// Left-wing Stations (with id 720).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 720).")]
+        LeftWingStations_720 = 720,
+
+        /// <summary>
+        /// Left-wing Stations (with id 721).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 721).")]
+        LeftWingStations_721 = 721,
+
+        /// <summary>
+        /// Left-wing Stations (with id 722).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 722).")]
+        LeftWingStations_722 = 722,
+
+        /// <summary>
+        /// Left-wing Stations (with id 723).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 723).")]
+        LeftWingStations_723 = 723,
+
+        /// <summary>
+        /// Left-wing Stations (with id 724).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 724).")]
+        LeftWingStations_724 = 724,
+
+        /// <summary>
+        /// Left-wing Stations (with id 725).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 725).")]
+        LeftWingStations_725 = 725,
+
+        /// <summary>
+        /// Left-wing Stations (with id 726).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 726).")]
+        LeftWingStations_726 = 726,
+
+        /// <summary>
+        /// Left-wing Stations (with id 727).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 727).")]
+        LeftWingStations_727 = 727,
+
+        /// <summary>
+        /// Left-wing Stations (with id 728).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 728).")]
+        LeftWingStations_728 = 728,
+
+        /// <summary>
+        /// Left-wing Stations (with id 729).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 729).")]
+        LeftWingStations_729 = 729,
+
+        /// <summary>
+        /// Left-wing Stations (with id 730).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 730).")]
+        LeftWingStations_730 = 730,
+
+        /// <summary>
+        /// Left-wing Stations (with id 731).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 731).")]
+        LeftWingStations_731 = 731,
+
+        /// <summary>
+        /// Left-wing Stations (with id 732).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 732).")]
+        LeftWingStations_732 = 732,
+
+        /// <summary>
+        /// Left-wing Stations (with id 733).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 733).")]
+        LeftWingStations_733 = 733,
+
+        /// <summary>
+        /// Left-wing Stations (with id 734).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 734).")]
+        LeftWingStations_734 = 734,
+
+        /// <summary>
+        /// Left-wing Stations (with id 735).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 735).")]
+        LeftWingStations_735 = 735,
+
+        /// <summary>
+        /// Left-wing Stations (with id 736).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 736).")]
+        LeftWingStations_736 = 736,
+
+        /// <summary>
+        /// Left-wing Stations (with id 737).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 737).")]
+        LeftWingStations_737 = 737,
+
+        /// <summary>
+        /// Left-wing Stations (with id 738).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 738).")]
+        LeftWingStations_738 = 738,
+
+        /// <summary>
+        /// Left-wing Stations (with id 739).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 739).")]
+        LeftWingStations_739 = 739,
+
+        /// <summary>
+        /// Left-wing Stations (with id 740).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 740).")]
+        LeftWingStations_740 = 740,
+
+        /// <summary>
+        /// Left-wing Stations (with id 741).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 741).")]
+        LeftWingStations_741 = 741,
+
+        /// <summary>
+        /// Left-wing Stations (with id 742).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 742).")]
+        LeftWingStations_742 = 742,
+
+        /// <summary>
+        /// Left-wing Stations (with id 743).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 743).")]
+        LeftWingStations_743 = 743,
+
+        /// <summary>
+        /// Left-wing Stations (with id 744).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 744).")]
+        LeftWingStations_744 = 744,
+
+        /// <summary>
+        /// Left-wing Stations (with id 745).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 745).")]
+        LeftWingStations_745 = 745,
+
+        /// <summary>
+        /// Left-wing Stations (with id 746).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 746).")]
+        LeftWingStations_746 = 746,
+
+        /// <summary>
+        /// Left-wing Stations (with id 747).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 747).")]
+        LeftWingStations_747 = 747,
+
+        /// <summary>
+        /// Left-wing Stations (with id 748).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 748).")]
+        LeftWingStations_748 = 748,
+
+        /// <summary>
+        /// Left-wing Stations (with id 749).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 749).")]
+        LeftWingStations_749 = 749,
+
+        /// <summary>
+        /// Left-wing Stations (with id 750).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 750).")]
+        LeftWingStations_750 = 750,
+
+        /// <summary>
+        /// Left-wing Stations (with id 751).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 751).")]
+        LeftWingStations_751 = 751,
+
+        /// <summary>
+        /// Left-wing Stations (with id 752).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 752).")]
+        LeftWingStations_752 = 752,
+
+        /// <summary>
+        /// Left-wing Stations (with id 753).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 753).")]
+        LeftWingStations_753 = 753,
+
+        /// <summary>
+        /// Left-wing Stations (with id 754).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 754).")]
+        LeftWingStations_754 = 754,
+
+        /// <summary>
+        /// Left-wing Stations (with id 755).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 755).")]
+        LeftWingStations_755 = 755,
+
+        /// <summary>
+        /// Left-wing Stations (with id 756).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 756).")]
+        LeftWingStations_756 = 756,
+
+        /// <summary>
+        /// Left-wing Stations (with id 757).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 757).")]
+        LeftWingStations_757 = 757,
+
+        /// <summary>
+        /// Left-wing Stations (with id 758).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 758).")]
+        LeftWingStations_758 = 758,
+
+        /// <summary>
+        /// Left-wing Stations (with id 759).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 759).")]
+        LeftWingStations_759 = 759,
+
+        /// <summary>
+        /// Left-wing Stations (with id 760).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 760).")]
+        LeftWingStations_760 = 760,
+
+        /// <summary>
+        /// Left-wing Stations (with id 761).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 761).")]
+        LeftWingStations_761 = 761,
+
+        /// <summary>
+        /// Left-wing Stations (with id 762).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 762).")]
+        LeftWingStations_762 = 762,
+
+        /// <summary>
+        /// Left-wing Stations (with id 763).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 763).")]
+        LeftWingStations_763 = 763,
+
+        /// <summary>
+        /// Left-wing Stations (with id 764).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 764).")]
+        LeftWingStations_764 = 764,
+
+        /// <summary>
+        /// Left-wing Stations (with id 765).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 765).")]
+        LeftWingStations_765 = 765,
+
+        /// <summary>
+        /// Left-wing Stations (with id 766).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 766).")]
+        LeftWingStations_766 = 766,
+
+        /// <summary>
+        /// Left-wing Stations (with id 767).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left-wing Stations (with id 767).")]
+        LeftWingStations_767 = 767,
+
+        /// <summary>
+        /// Right-wing Stations (with id 768).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 768).")]
+        RightWingStations_768 = 768,
+
+        /// <summary>
+        /// Right-wing Stations (with id 769).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 769).")]
+        RightWingStations_769 = 769,
+
+        /// <summary>
+        /// Right-wing Stations (with id 770).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 770).")]
+        RightWingStations_770 = 770,
+
+        /// <summary>
+        /// Right-wing Stations (with id 771).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 771).")]
+        RightWingStations_771 = 771,
+
+        /// <summary>
+        /// Right-wing Stations (with id 772).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 772).")]
+        RightWingStations_772 = 772,
+
+        /// <summary>
+        /// Right-wing Stations (with id 773).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 773).")]
+        RightWingStations_773 = 773,
+
+        /// <summary>
+        /// Right-wing Stations (with id 774).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 774).")]
+        RightWingStations_774 = 774,
+
+        /// <summary>
+        /// Right-wing Stations (with id 775).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 775).")]
+        RightWingStations_775 = 775,
+
+        /// <summary>
+        /// Right-wing Stations (with id 776).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 776).")]
+        RightWingStations_776 = 776,
+
+        /// <summary>
+        /// Right-wing Stations (with id 777).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 777).")]
+        RightWingStations_777 = 777,
+
+        /// <summary>
+        /// Right-wing Stations (with id 778).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 778).")]
+        RightWingStations_778 = 778,
+
+        /// <summary>
+        /// Right-wing Stations (with id 779).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 779).")]
+        RightWingStations_779 = 779,
+
+        /// <summary>
+        /// Right-wing Stations (with id 780).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 780).")]
+        RightWingStations_780 = 780,
+
+        /// <summary>
+        /// Right-wing Stations (with id 781).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 781).")]
+        RightWingStations_781 = 781,
+
+        /// <summary>
+        /// Right-wing Stations (with id 782).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 782).")]
+        RightWingStations_782 = 782,
+
+        /// <summary>
+        /// Right-wing Stations (with id 783).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 783).")]
+        RightWingStations_783 = 783,
+
+        /// <summary>
+        /// Right-wing Stations (with id 784).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 784).")]
+        RightWingStations_784 = 784,
+
+        /// <summary>
+        /// Right-wing Stations (with id 785).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 785).")]
+        RightWingStations_785 = 785,
+
+        /// <summary>
+        /// Right-wing Stations (with id 786).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 786).")]
+        RightWingStations_786 = 786,
+
+        /// <summary>
+        /// Right-wing Stations (with id 787).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 787).")]
+        RightWingStations_787 = 787,
+
+        /// <summary>
+        /// Right-wing Stations (with id 788).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 788).")]
+        RightWingStations_788 = 788,
+
+        /// <summary>
+        /// Right-wing Stations (with id 789).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 789).")]
+        RightWingStations_789 = 789,
+
+        /// <summary>
+        /// Right-wing Stations (with id 790).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 790).")]
+        RightWingStations_790 = 790,
+
+        /// <summary>
+        /// Right-wing Stations (with id 791).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 791).")]
+        RightWingStations_791 = 791,
+
+        /// <summary>
+        /// Right-wing Stations (with id 792).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 792).")]
+        RightWingStations_792 = 792,
+
+        /// <summary>
+        /// Right-wing Stations (with id 793).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 793).")]
+        RightWingStations_793 = 793,
+
+        /// <summary>
+        /// Right-wing Stations (with id 794).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 794).")]
+        RightWingStations_794 = 794,
+
+        /// <summary>
+        /// Right-wing Stations (with id 795).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 795).")]
+        RightWingStations_795 = 795,
+
+        /// <summary>
+        /// Right-wing Stations (with id 796).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 796).")]
+        RightWingStations_796 = 796,
+
+        /// <summary>
+        /// Right-wing Stations (with id 797).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 797).")]
+        RightWingStations_797 = 797,
+
+        /// <summary>
+        /// Right-wing Stations (with id 798).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 798).")]
+        RightWingStations_798 = 798,
+
+        /// <summary>
+        /// Right-wing Stations (with id 799).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 799).")]
+        RightWingStations_799 = 799,
+
+        /// <summary>
+        /// Right-wing Stations (with id 800).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 800).")]
+        RightWingStations_800 = 800,
+
+        /// <summary>
+        /// Right-wing Stations (with id 801).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 801).")]
+        RightWingStations_801 = 801,
+
+        /// <summary>
+        /// Right-wing Stations (with id 802).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 802).")]
+        RightWingStations_802 = 802,
+
+        /// <summary>
+        /// Right-wing Stations (with id 803).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 803).")]
+        RightWingStations_803 = 803,
+
+        /// <summary>
+        /// Right-wing Stations (with id 804).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 804).")]
+        RightWingStations_804 = 804,
+
+        /// <summary>
+        /// Right-wing Stations (with id 805).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 805).")]
+        RightWingStations_805 = 805,
+
+        /// <summary>
+        /// Right-wing Stations (with id 806).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 806).")]
+        RightWingStations_806 = 806,
+
+        /// <summary>
+        /// Right-wing Stations (with id 807).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 807).")]
+        RightWingStations_807 = 807,
+
+        /// <summary>
+        /// Right-wing Stations (with id 808).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 808).")]
+        RightWingStations_808 = 808,
+
+        /// <summary>
+        /// Right-wing Stations (with id 809).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 809).")]
+        RightWingStations_809 = 809,
+
+        /// <summary>
+        /// Right-wing Stations (with id 810).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 810).")]
+        RightWingStations_810 = 810,
+
+        /// <summary>
+        /// Right-wing Stations (with id 811).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 811).")]
+        RightWingStations_811 = 811,
+
+        /// <summary>
+        /// Right-wing Stations (with id 812).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 812).")]
+        RightWingStations_812 = 812,
+
+        /// <summary>
+        /// Right-wing Stations (with id 813).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 813).")]
+        RightWingStations_813 = 813,
+
+        /// <summary>
+        /// Right-wing Stations (with id 814).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 814).")]
+        RightWingStations_814 = 814,
+
+        /// <summary>
+        /// Right-wing Stations (with id 815).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 815).")]
+        RightWingStations_815 = 815,
+
+        /// <summary>
+        /// Right-wing Stations (with id 816).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 816).")]
+        RightWingStations_816 = 816,
+
+        /// <summary>
+        /// Right-wing Stations (with id 817).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 817).")]
+        RightWingStations_817 = 817,
+
+        /// <summary>
+        /// Right-wing Stations (with id 818).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 818).")]
+        RightWingStations_818 = 818,
+
+        /// <summary>
+        /// Right-wing Stations (with id 819).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 819).")]
+        RightWingStations_819 = 819,
+
+        /// <summary>
+        /// Right-wing Stations (with id 820).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 820).")]
+        RightWingStations_820 = 820,
+
+        /// <summary>
+        /// Right-wing Stations (with id 821).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 821).")]
+        RightWingStations_821 = 821,
+
+        /// <summary>
+        /// Right-wing Stations (with id 822).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 822).")]
+        RightWingStations_822 = 822,
+
+        /// <summary>
+        /// Right-wing Stations (with id 823).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 823).")]
+        RightWingStations_823 = 823,
+
+        /// <summary>
+        /// Right-wing Stations (with id 824).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 824).")]
+        RightWingStations_824 = 824,
+
+        /// <summary>
+        /// Right-wing Stations (with id 825).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 825).")]
+        RightWingStations_825 = 825,
+
+        /// <summary>
+        /// Right-wing Stations (with id 826).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 826).")]
+        RightWingStations_826 = 826,
+
+        /// <summary>
+        /// Right-wing Stations (with id 827).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 827).")]
+        RightWingStations_827 = 827,
+
+        /// <summary>
+        /// Right-wing Stations (with id 828).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 828).")]
+        RightWingStations_828 = 828,
+
+        /// <summary>
+        /// Right-wing Stations (with id 829).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 829).")]
+        RightWingStations_829 = 829,
+
+        /// <summary>
+        /// Right-wing Stations (with id 830).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 830).")]
+        RightWingStations_830 = 830,
+
+        /// <summary>
+        /// Right-wing Stations (with id 831).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 831).")]
+        RightWingStations_831 = 831,
+
+        /// <summary>
+        /// Right-wing Stations (with id 832).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 832).")]
+        RightWingStations_832 = 832,
+
+        /// <summary>
+        /// Right-wing Stations (with id 833).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 833).")]
+        RightWingStations_833 = 833,
+
+        /// <summary>
+        /// Right-wing Stations (with id 834).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 834).")]
+        RightWingStations_834 = 834,
+
+        /// <summary>
+        /// Right-wing Stations (with id 835).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 835).")]
+        RightWingStations_835 = 835,
+
+        /// <summary>
+        /// Right-wing Stations (with id 836).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 836).")]
+        RightWingStations_836 = 836,
+
+        /// <summary>
+        /// Right-wing Stations (with id 837).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 837).")]
+        RightWingStations_837 = 837,
+
+        /// <summary>
+        /// Right-wing Stations (with id 838).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 838).")]
+        RightWingStations_838 = 838,
+
+        /// <summary>
+        /// Right-wing Stations (with id 839).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 839).")]
+        RightWingStations_839 = 839,
+
+        /// <summary>
+        /// Right-wing Stations (with id 840).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 840).")]
+        RightWingStations_840 = 840,
+
+        /// <summary>
+        /// Right-wing Stations (with id 841).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 841).")]
+        RightWingStations_841 = 841,
+
+        /// <summary>
+        /// Right-wing Stations (with id 842).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 842).")]
+        RightWingStations_842 = 842,
+
+        /// <summary>
+        /// Right-wing Stations (with id 843).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 843).")]
+        RightWingStations_843 = 843,
+
+        /// <summary>
+        /// Right-wing Stations (with id 844).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 844).")]
+        RightWingStations_844 = 844,
+
+        /// <summary>
+        /// Right-wing Stations (with id 845).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 845).")]
+        RightWingStations_845 = 845,
+
+        /// <summary>
+        /// Right-wing Stations (with id 846).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 846).")]
+        RightWingStations_846 = 846,
+
+        /// <summary>
+        /// Right-wing Stations (with id 847).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 847).")]
+        RightWingStations_847 = 847,
+
+        /// <summary>
+        /// Right-wing Stations (with id 848).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 848).")]
+        RightWingStations_848 = 848,
+
+        /// <summary>
+        /// Right-wing Stations (with id 849).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 849).")]
+        RightWingStations_849 = 849,
+
+        /// <summary>
+        /// Right-wing Stations (with id 850).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 850).")]
+        RightWingStations_850 = 850,
+
+        /// <summary>
+        /// Right-wing Stations (with id 851).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 851).")]
+        RightWingStations_851 = 851,
+
+        /// <summary>
+        /// Right-wing Stations (with id 852).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 852).")]
+        RightWingStations_852 = 852,
+
+        /// <summary>
+        /// Right-wing Stations (with id 853).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 853).")]
+        RightWingStations_853 = 853,
+
+        /// <summary>
+        /// Right-wing Stations (with id 854).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 854).")]
+        RightWingStations_854 = 854,
+
+        /// <summary>
+        /// Right-wing Stations (with id 855).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 855).")]
+        RightWingStations_855 = 855,
+
+        /// <summary>
+        /// Right-wing Stations (with id 856).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 856).")]
+        RightWingStations_856 = 856,
+
+        /// <summary>
+        /// Right-wing Stations (with id 857).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 857).")]
+        RightWingStations_857 = 857,
+
+        /// <summary>
+        /// Right-wing Stations (with id 858).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 858).")]
+        RightWingStations_858 = 858,
+
+        /// <summary>
+        /// Right-wing Stations (with id 859).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 859).")]
+        RightWingStations_859 = 859,
+
+        /// <summary>
+        /// Right-wing Stations (with id 860).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 860).")]
+        RightWingStations_860 = 860,
+
+        /// <summary>
+        /// Right-wing Stations (with id 861).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 861).")]
+        RightWingStations_861 = 861,
+
+        /// <summary>
+        /// Right-wing Stations (with id 862).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 862).")]
+        RightWingStations_862 = 862,
+
+        /// <summary>
+        /// Right-wing Stations (with id 863).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 863).")]
+        RightWingStations_863 = 863,
+
+        /// <summary>
+        /// Right-wing Stations (with id 864).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 864).")]
+        RightWingStations_864 = 864,
+
+        /// <summary>
+        /// Right-wing Stations (with id 865).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 865).")]
+        RightWingStations_865 = 865,
+
+        /// <summary>
+        /// Right-wing Stations (with id 866).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 866).")]
+        RightWingStations_866 = 866,
+
+        /// <summary>
+        /// Right-wing Stations (with id 867).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 867).")]
+        RightWingStations_867 = 867,
+
+        /// <summary>
+        /// Right-wing Stations (with id 868).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 868).")]
+        RightWingStations_868 = 868,
+
+        /// <summary>
+        /// Right-wing Stations (with id 869).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 869).")]
+        RightWingStations_869 = 869,
+
+        /// <summary>
+        /// Right-wing Stations (with id 870).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 870).")]
+        RightWingStations_870 = 870,
+
+        /// <summary>
+        /// Right-wing Stations (with id 871).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 871).")]
+        RightWingStations_871 = 871,
+
+        /// <summary>
+        /// Right-wing Stations (with id 872).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 872).")]
+        RightWingStations_872 = 872,
+
+        /// <summary>
+        /// Right-wing Stations (with id 873).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 873).")]
+        RightWingStations_873 = 873,
+
+        /// <summary>
+        /// Right-wing Stations (with id 874).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 874).")]
+        RightWingStations_874 = 874,
+
+        /// <summary>
+        /// Right-wing Stations (with id 875).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 875).")]
+        RightWingStations_875 = 875,
+
+        /// <summary>
+        /// Right-wing Stations (with id 876).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 876).")]
+        RightWingStations_876 = 876,
+
+        /// <summary>
+        /// Right-wing Stations (with id 877).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 877).")]
+        RightWingStations_877 = 877,
+
+        /// <summary>
+        /// Right-wing Stations (with id 878).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 878).")]
+        RightWingStations_878 = 878,
+
+        /// <summary>
+        /// Right-wing Stations (with id 879).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 879).")]
+        RightWingStations_879 = 879,
+
+        /// <summary>
+        /// Right-wing Stations (with id 880).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 880).")]
+        RightWingStations_880 = 880,
+
+        /// <summary>
+        /// Right-wing Stations (with id 881).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 881).")]
+        RightWingStations_881 = 881,
+
+        /// <summary>
+        /// Right-wing Stations (with id 882).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 882).")]
+        RightWingStations_882 = 882,
+
+        /// <summary>
+        /// Right-wing Stations (with id 883).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 883).")]
+        RightWingStations_883 = 883,
+
+        /// <summary>
+        /// Right-wing Stations (with id 884).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 884).")]
+        RightWingStations_884 = 884,
+
+        /// <summary>
+        /// Right-wing Stations (with id 885).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 885).")]
+        RightWingStations_885 = 885,
+
+        /// <summary>
+        /// Right-wing Stations (with id 886).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 886).")]
+        RightWingStations_886 = 886,
+
+        /// <summary>
+        /// Right-wing Stations (with id 887).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 887).")]
+        RightWingStations_887 = 887,
+
+        /// <summary>
+        /// Right-wing Stations (with id 888).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 888).")]
+        RightWingStations_888 = 888,
+
+        /// <summary>
+        /// Right-wing Stations (with id 889).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 889).")]
+        RightWingStations_889 = 889,
+
+        /// <summary>
+        /// Right-wing Stations (with id 890).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 890).")]
+        RightWingStations_890 = 890,
+
+        /// <summary>
+        /// Right-wing Stations (with id 891).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 891).")]
+        RightWingStations_891 = 891,
+
+        /// <summary>
+        /// Right-wing Stations (with id 892).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 892).")]
+        RightWingStations_892 = 892,
+
+        /// <summary>
+        /// Right-wing Stations (with id 893).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 893).")]
+        RightWingStations_893 = 893,
+
+        /// <summary>
+        /// Right-wing Stations (with id 894).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 894).")]
+        RightWingStations_894 = 894,
+
+        /// <summary>
+        /// Right-wing Stations (with id 895).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right-wing Stations (with id 895).")]
+        RightWingStations_895 = 895,
+
+        /// <summary>
+        /// M16A42 rifle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M16A42 rifle.")]
+        M16A42Rifle = 896,
+
+        /// <summary>
+        /// M249 SAW.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M249 SAW.")]
+        M249SAW = 897,
+
+        /// <summary>
+        /// M60 Machine gun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M60 Machine gun.")]
+        M60MachineGun = 898,
+
+        /// <summary>
+        /// M203 Grenade Launcher.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M203 Grenade Launcher.")]
+        M203GrenadeLauncher = 899,
+
+        /// <summary>
+        /// M136 AT4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M136 AT4.")]
+        M136AT4 = 900,
+
+        /// <summary>
+        /// M47 Dragon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M47 Dragon.")]
+        M47Dragon = 901,
+
+        /// <summary>
+        /// AAWS-M Javelin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AAWS-M Javelin.")]
+        AAWSMJavelin = 902,
+
+        /// <summary>
+        /// M18A1 Claymore Mine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M18A1 Claymore Mine.")]
+        M18A1ClaymoreMine = 903,
+
+        /// <summary>
+        /// MK19 Grenade Launcher.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK19 Grenade Launcher.")]
+        MK19GrenadeLauncher = 904,
+
+        /// <summary>
+        /// M2 Machine Gun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M2 Machine Gun.")]
+        M2MachineGun = 905,
+
+        /// <summary>
+        /// Other attached parts (with id 906).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 906).")]
+        OtherAttachedParts_906 = 906,
+
+        /// <summary>
+        /// Other attached parts (with id 907).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 907).")]
+        OtherAttachedParts_907 = 907,
+
+        /// <summary>
+        /// Other attached parts (with id 908).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 908).")]
+        OtherAttachedParts_908 = 908,
+
+        /// <summary>
+        /// Other attached parts (with id 909).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 909).")]
+        OtherAttachedParts_909 = 909,
+
+        /// <summary>
+        /// Other attached parts (with id 910).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 910).")]
+        OtherAttachedParts_910 = 910,
+
+        /// <summary>
+        /// Other attached parts (with id 911).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 911).")]
+        OtherAttachedParts_911 = 911,
+
+        /// <summary>
+        /// Other attached parts (with id 912).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 912).")]
+        OtherAttachedParts_912 = 912,
+
+        /// <summary>
+        /// Other attached parts (with id 913).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 913).")]
+        OtherAttachedParts_913 = 913,
+
+        /// <summary>
+        /// Other attached parts (with id 914).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 914).")]
+        OtherAttachedParts_914 = 914,
+
+        /// <summary>
+        /// Other attached parts (with id 915).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 915).")]
+        OtherAttachedParts_915 = 915,
+
+        /// <summary>
+        /// Other attached parts (with id 916).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 916).")]
+        OtherAttachedParts_916 = 916,
+
+        /// <summary>
+        /// Other attached parts (with id 917).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 917).")]
+        OtherAttachedParts_917 = 917,
+
+        /// <summary>
+        /// Other attached parts (with id 918).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 918).")]
+        OtherAttachedParts_918 = 918,
+
+        /// <summary>
+        /// Other attached parts (with id 919).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 919).")]
+        OtherAttachedParts_919 = 919,
+
+        /// <summary>
+        /// Other attached parts (with id 920).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 920).")]
+        OtherAttachedParts_920 = 920,
+
+        /// <summary>
+        /// Other attached parts (with id 921).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 921).")]
+        OtherAttachedParts_921 = 921,
+
+        /// <summary>
+        /// Other attached parts (with id 922).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 922).")]
+        OtherAttachedParts_922 = 922,
+
+        /// <summary>
+        /// Other attached parts (with id 923).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 923).")]
+        OtherAttachedParts_923 = 923,
+
+        /// <summary>
+        /// Other attached parts (with id 924).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 924).")]
+        OtherAttachedParts_924 = 924,
+
+        /// <summary>
+        /// Other attached parts (with id 925).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 925).")]
+        OtherAttachedParts_925 = 925,
+
+        /// <summary>
+        /// Other attached parts (with id 926).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 926).")]
+        OtherAttachedParts_926 = 926,
+
+        /// <summary>
+        /// Other attached parts (with id 927).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 927).")]
+        OtherAttachedParts_927 = 927,
+
+        /// <summary>
+        /// Other attached parts (with id 928).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 928).")]
+        OtherAttachedParts_928 = 928,
+
+        /// <summary>
+        /// Other attached parts (with id 929).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 929).")]
+        OtherAttachedParts_929 = 929,
+
+        /// <summary>
+        /// Other attached parts (with id 930).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 930).")]
+        OtherAttachedParts_930 = 930,
+
+        /// <summary>
+        /// Other attached parts (with id 931).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 931).")]
+        OtherAttachedParts_931 = 931,
+
+        /// <summary>
+        /// Other attached parts (with id 932).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 932).")]
+        OtherAttachedParts_932 = 932,
+
+        /// <summary>
+        /// Other attached parts (with id 933).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 933).")]
+        OtherAttachedParts_933 = 933,
+
+        /// <summary>
+        /// Other attached parts (with id 934).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 934).")]
+        OtherAttachedParts_934 = 934,
+
+        /// <summary>
+        /// Other attached parts (with id 935).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 935).")]
+        OtherAttachedParts_935 = 935,
+
+        /// <summary>
+        /// Other attached parts (with id 936).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 936).")]
+        OtherAttachedParts_936 = 936,
+
+        /// <summary>
+        /// Other attached parts (with id 937).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 937).")]
+        OtherAttachedParts_937 = 937,
+
+        /// <summary>
+        /// Other attached parts (with id 938).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 938).")]
+        OtherAttachedParts_938 = 938,
+
+        /// <summary>
+        /// Other attached parts (with id 939).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 939).")]
+        OtherAttachedParts_939 = 939,
+
+        /// <summary>
+        /// Other attached parts (with id 940).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 940).")]
+        OtherAttachedParts_940 = 940,
+
+        /// <summary>
+        /// Other attached parts (with id 941).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 941).")]
+        OtherAttachedParts_941 = 941,
+
+        /// <summary>
+        /// Other attached parts (with id 942).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 942).")]
+        OtherAttachedParts_942 = 942,
+
+        /// <summary>
+        /// Other attached parts (with id 943).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 943).")]
+        OtherAttachedParts_943 = 943,
+
+        /// <summary>
+        /// Other attached parts (with id 944).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 944).")]
+        OtherAttachedParts_944 = 944,
+
+        /// <summary>
+        /// Other attached parts (with id 945).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 945).")]
+        OtherAttachedParts_945 = 945,
+
+        /// <summary>
+        /// Other attached parts (with id 946).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 946).")]
+        OtherAttachedParts_946 = 946,
+
+        /// <summary>
+        /// Other attached parts (with id 947).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 947).")]
+        OtherAttachedParts_947 = 947,
+
+        /// <summary>
+        /// Other attached parts (with id 948).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 948).")]
+        OtherAttachedParts_948 = 948,
+
+        /// <summary>
+        /// Other attached parts (with id 949).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 949).")]
+        OtherAttachedParts_949 = 949,
+
+        /// <summary>
+        /// Other attached parts (with id 950).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 950).")]
+        OtherAttachedParts_950 = 950,
+
+        /// <summary>
+        /// Other attached parts (with id 951).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 951).")]
+        OtherAttachedParts_951 = 951,
+
+        /// <summary>
+        /// Other attached parts (with id 952).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 952).")]
+        OtherAttachedParts_952 = 952,
+
+        /// <summary>
+        /// Other attached parts (with id 953).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 953).")]
+        OtherAttachedParts_953 = 953,
+
+        /// <summary>
+        /// Other attached parts (with id 954).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 954).")]
+        OtherAttachedParts_954 = 954,
+
+        /// <summary>
+        /// Other attached parts (with id 955).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 955).")]
+        OtherAttachedParts_955 = 955,
+
+        /// <summary>
+        /// Other attached parts (with id 956).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 956).")]
+        OtherAttachedParts_956 = 956,
+
+        /// <summary>
+        /// Other attached parts (with id 957).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 957).")]
+        OtherAttachedParts_957 = 957,
+
+        /// <summary>
+        /// Other attached parts (with id 958).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 958).")]
+        OtherAttachedParts_958 = 958,
+
+        /// <summary>
+        /// Other attached parts (with id 959).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 959).")]
+        OtherAttachedParts_959 = 959,
+
+        /// <summary>
+        /// Other attached parts (with id 960).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 960).")]
+        OtherAttachedParts_960 = 960,
+
+        /// <summary>
+        /// Other attached parts (with id 961).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 961).")]
+        OtherAttachedParts_961 = 961,
+
+        /// <summary>
+        /// Other attached parts (with id 962).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 962).")]
+        OtherAttachedParts_962 = 962,
+
+        /// <summary>
+        /// Other attached parts (with id 963).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 963).")]
+        OtherAttachedParts_963 = 963,
+
+        /// <summary>
+        /// Other attached parts (with id 964).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 964).")]
+        OtherAttachedParts_964 = 964,
+
+        /// <summary>
+        /// Other attached parts (with id 965).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 965).")]
+        OtherAttachedParts_965 = 965,
+
+        /// <summary>
+        /// Other attached parts (with id 966).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 966).")]
+        OtherAttachedParts_966 = 966,
+
+        /// <summary>
+        /// Other attached parts (with id 967).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 967).")]
+        OtherAttachedParts_967 = 967,
+
+        /// <summary>
+        /// Other attached parts (with id 968).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 968).")]
+        OtherAttachedParts_968 = 968,
+
+        /// <summary>
+        /// Other attached parts (with id 969).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 969).")]
+        OtherAttachedParts_969 = 969,
+
+        /// <summary>
+        /// Other attached parts (with id 970).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 970).")]
+        OtherAttachedParts_970 = 970,
+
+        /// <summary>
+        /// Other attached parts (with id 971).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 971).")]
+        OtherAttachedParts_971 = 971,
+
+        /// <summary>
+        /// Other attached parts (with id 972).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 972).")]
+        OtherAttachedParts_972 = 972,
+
+        /// <summary>
+        /// Other attached parts (with id 973).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 973).")]
+        OtherAttachedParts_973 = 973,
+
+        /// <summary>
+        /// Other attached parts (with id 974).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 974).")]
+        OtherAttachedParts_974 = 974,
+
+        /// <summary>
+        /// Other attached parts (with id 975).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 975).")]
+        OtherAttachedParts_975 = 975,
+
+        /// <summary>
+        /// Other attached parts (with id 976).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 976).")]
+        OtherAttachedParts_976 = 976,
+
+        /// <summary>
+        /// Other attached parts (with id 977).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 977).")]
+        OtherAttachedParts_977 = 977,
+
+        /// <summary>
+        /// Other attached parts (with id 978).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 978).")]
+        OtherAttachedParts_978 = 978,
+
+        /// <summary>
+        /// Other attached parts (with id 979).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 979).")]
+        OtherAttachedParts_979 = 979,
+
+        /// <summary>
+        /// Other attached parts (with id 980).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 980).")]
+        OtherAttachedParts_980 = 980,
+
+        /// <summary>
+        /// Other attached parts (with id 981).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 981).")]
+        OtherAttachedParts_981 = 981,
+
+        /// <summary>
+        /// Other attached parts (with id 982).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 982).")]
+        OtherAttachedParts_982 = 982,
+
+        /// <summary>
+        /// Other attached parts (with id 983).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 983).")]
+        OtherAttachedParts_983 = 983,
+
+        /// <summary>
+        /// Other attached parts (with id 984).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 984).")]
+        OtherAttachedParts_984 = 984,
+
+        /// <summary>
+        /// Other attached parts (with id 985).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 985).")]
+        OtherAttachedParts_985 = 985,
+
+        /// <summary>
+        /// Other attached parts (with id 986).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 986).")]
+        OtherAttachedParts_986 = 986,
+
+        /// <summary>
+        /// Other attached parts (with id 987).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 987).")]
+        OtherAttachedParts_987 = 987,
+
+        /// <summary>
+        /// Other attached parts (with id 988).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 988).")]
+        OtherAttachedParts_988 = 988,
+
+        /// <summary>
+        /// Other attached parts (with id 989).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 989).")]
+        OtherAttachedParts_989 = 989,
+
+        /// <summary>
+        /// Other attached parts (with id 990).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 990).")]
+        OtherAttachedParts_990 = 990,
+
+        /// <summary>
+        /// Other attached parts (with id 991).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 991).")]
+        OtherAttachedParts_991 = 991,
+
+        /// <summary>
+        /// Other attached parts (with id 992).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 992).")]
+        OtherAttachedParts_992 = 992,
+
+        /// <summary>
+        /// Other attached parts (with id 993).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 993).")]
+        OtherAttachedParts_993 = 993,
+
+        /// <summary>
+        /// Other attached parts (with id 994).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 994).")]
+        OtherAttachedParts_994 = 994,
+
+        /// <summary>
+        /// Other attached parts (with id 995).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 995).")]
+        OtherAttachedParts_995 = 995,
+
+        /// <summary>
+        /// Other attached parts (with id 996).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 996).")]
+        OtherAttachedParts_996 = 996,
+
+        /// <summary>
+        /// Other attached parts (with id 997).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 997).")]
+        OtherAttachedParts_997 = 997,
+
+        /// <summary>
+        /// Other attached parts (with id 998).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 998).")]
+        OtherAttachedParts_998 = 998,
+
+        /// <summary>
+        /// Other attached parts (with id 999).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 999).")]
+        OtherAttachedParts_999 = 999,
+
+        /// <summary>
+        /// Other attached parts (with id 1000).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1000).")]
+        OtherAttachedParts_1000 = 1000,
+
+        /// <summary>
+        /// Other attached parts (with id 1001).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1001).")]
+        OtherAttachedParts_1001 = 1001,
+
+        /// <summary>
+        /// Other attached parts (with id 1002).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1002).")]
+        OtherAttachedParts_1002 = 1002,
+
+        /// <summary>
+        /// Other attached parts (with id 1003).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1003).")]
+        OtherAttachedParts_1003 = 1003,
+
+        /// <summary>
+        /// Other attached parts (with id 1004).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1004).")]
+        OtherAttachedParts_1004 = 1004,
+
+        /// <summary>
+        /// Other attached parts (with id 1005).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1005).")]
+        OtherAttachedParts_1005 = 1005,
+
+        /// <summary>
+        /// Other attached parts (with id 1006).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1006).")]
+        OtherAttachedParts_1006 = 1006,
+
+        /// <summary>
+        /// Other attached parts (with id 1007).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1007).")]
+        OtherAttachedParts_1007 = 1007,
+
+        /// <summary>
+        /// Other attached parts (with id 1008).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1008).")]
+        OtherAttachedParts_1008 = 1008,
+
+        /// <summary>
+        /// Other attached parts (with id 1009).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1009).")]
+        OtherAttachedParts_1009 = 1009,
+
+        /// <summary>
+        /// Other attached parts (with id 1010).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1010).")]
+        OtherAttachedParts_1010 = 1010,
+
+        /// <summary>
+        /// Other attached parts (with id 1011).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1011).")]
+        OtherAttachedParts_1011 = 1011,
+
+        /// <summary>
+        /// Other attached parts (with id 1012).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1012).")]
+        OtherAttachedParts_1012 = 1012,
+
+        /// <summary>
+        /// Other attached parts (with id 1013).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1013).")]
+        OtherAttachedParts_1013 = 1013,
+
+        /// <summary>
+        /// Other attached parts (with id 1014).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1014).")]
+        OtherAttachedParts_1014 = 1014,
+
+        /// <summary>
+        /// Other attached parts (with id 1015).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1015).")]
+        OtherAttachedParts_1015 = 1015,
+
+        /// <summary>
+        /// Other attached parts (with id 1016).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1016).")]
+        OtherAttachedParts_1016 = 1016,
+
+        /// <summary>
+        /// Other attached parts (with id 1017).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1017).")]
+        OtherAttachedParts_1017 = 1017,
+
+        /// <summary>
+        /// Other attached parts (with id 1018).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1018).")]
+        OtherAttachedParts_1018 = 1018,
+
+        /// <summary>
+        /// Other attached parts (with id 1019).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1019).")]
+        OtherAttachedParts_1019 = 1019,
+
+        /// <summary>
+        /// Other attached parts (with id 1020).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1020).")]
+        OtherAttachedParts_1020 = 1020,
+
+        /// <summary>
+        /// Other attached parts (with id 1021).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1021).")]
+        OtherAttachedParts_1021 = 1021,
+
+        /// <summary>
+        /// Other attached parts (with id 1022).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1022).")]
+        OtherAttachedParts_1022 = 1022,
+
+        /// <summary>
+        /// Other attached parts (with id 1023).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other attached parts (with id 1023).")]
+        OtherAttachedParts_1023 = 1023
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs b/Libs/CsharpDis6/Enumerations/EntityState/DeadReckoningAlgorithm.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs
rename to Libs/CsharpDis6/Enumerations/EntityState/DeadReckoningAlgorithm.cs
index 13fd074..d3f7cd2 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/DeadReckoningAlgorithm.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState/DeadReckoningAlgorithm.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState
-{
-    /// <summary>
-    /// Enumeration values for DeadReckoningAlgorithm (es.dra, Dead-Reckoning Algorithm, 
-    /// section 4.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DeadReckoningAlgorithm : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Static (Entity does not move.).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Static (Entity does not move.).")]
-        Static = 1,
-
-        /// <summary>
-        /// DRM(F, P, W).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(F, P, W).")]
-        DRA_F_P_W = 2,
-
-        /// <summary>
-        /// DRM(R, P, W).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(R, P, W).")]
-        DRA_R_P_W = 3,
-
-        /// <summary>
-        /// DRM(R, V, W).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(R, V, W).")]
-        DRA_R_V_W = 4,
-
-        /// <summary>
-        /// DRM(F, V, W).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(F, V, W).")]
-        DRA_F_W_V = 5,
-
-        /// <summary>
-        /// DRM(F, P, B).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(F, P, B).")]
-        DRA_F_P_B = 6,
-
-        /// <summary>
-        /// DRM(R, P, B).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(R, P, B).")]
-        DRA_R_P_B = 7,
-
-        /// <summary>
-        /// DRM(R, V, B).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(R, V, B).")]
-        DRA_R_V_B = 8,
-
-        /// <summary>
-        /// DRM(F, V, B).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRM(F, V, B).")]
-        DRA_F_V_B = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState
+{
+    /// <summary>
+    /// Enumeration values for DeadReckoningAlgorithm (es.dra, Dead-Reckoning Algorithm, 
+    /// section 4.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DeadReckoningAlgorithm : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Static (Entity does not move.).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Static (Entity does not move.).")]
+        Static = 1,
+
+        /// <summary>
+        /// DRM(F, P, W).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(F, P, W).")]
+        DRA_F_P_W = 2,
+
+        /// <summary>
+        /// DRM(R, P, W).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(R, P, W).")]
+        DRA_R_P_W = 3,
+
+        /// <summary>
+        /// DRM(R, V, W).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(R, V, W).")]
+        DRA_R_V_W = 4,
+
+        /// <summary>
+        /// DRM(F, V, W).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(F, V, W).")]
+        DRA_F_W_V = 5,
+
+        /// <summary>
+        /// DRM(F, P, B).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(F, P, B).")]
+        DRA_F_P_B = 6,
+
+        /// <summary>
+        /// DRM(R, P, B).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(R, P, B).")]
+        DRA_R_P_B = 7,
+
+        /// <summary>
+        /// DRM(R, V, B).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(R, V, B).")]
+        DRA_R_V_B = 8,
+
+        /// <summary>
+        /// DRM(F, V, B).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRM(F, V, B).")]
+        DRA_F_V_B = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityCapabilities.cs b/Libs/CsharpDis6/Enumerations/EntityState/EntityCapabilities.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityCapabilities.cs
rename to Libs/CsharpDis6/Enumerations/EntityState/EntityCapabilities.cs
index 0765dee..4323219 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityCapabilities.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState/EntityCapabilities.cs
@@ -1,80 +1,80 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState
-{
-    /// <summary>
-    /// Enumeration values for EntityCapabilities (es.capabilities, Entity Capabilities record, 
-    /// section 4.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum EntityCapabilities : uint
-    {
-        /// <summary>
-        /// The Entity is able to supply some type of ammunition in response to an appropriate Service Request PDU.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("The Entity is able to supply some type of ammunition in response to an appropriate Service Request PDU.")]
-        AmmunitionSupply = 1,
-
-        /// <summary>
-        /// The Entity is able to supply some type of fuel in response to an appropriate Service Request PDU.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("The Entity is able to supply some type of fuel in response to an appropriate Service Request PDU.")]
-        FuelSupply = 2,
-
-        /// <summary>
-        /// The Entity is able to provide recovery (e.g. towing) services in response to an appropriate Service Request PDU.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("The Entity is able to provide recovery (e.g. towing) services in response to an appropriate Service Request PDU.")]
-        Recovery = 4,
-
-        /// <summary>
-        /// The Entity is able to supply certain repair services in response to an appropriate Service Request PDU.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("The Entity is able to supply certain repair services in response to an appropriate Service Request PDU.")]
-        Repair = 8,
-
-        /// <summary>
-        /// The Entity is Automatic Dependent Surveillance - Broadcast (ADS-B) Capable
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("The Entity is Automatic Dependent Surveillance - Broadcast (ADS-B) Capable")]
-        ADSB = 16
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState
+{
+    /// <summary>
+    /// Enumeration values for EntityCapabilities (es.capabilities, Entity Capabilities record, 
+    /// section 4.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum EntityCapabilities : uint
+    {
+        /// <summary>
+        /// The Entity is able to supply some type of ammunition in response to an appropriate Service Request PDU.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("The Entity is able to supply some type of ammunition in response to an appropriate Service Request PDU.")]
+        AmmunitionSupply = 1,
+
+        /// <summary>
+        /// The Entity is able to supply some type of fuel in response to an appropriate Service Request PDU.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("The Entity is able to supply some type of fuel in response to an appropriate Service Request PDU.")]
+        FuelSupply = 2,
+
+        /// <summary>
+        /// The Entity is able to provide recovery (e.g. towing) services in response to an appropriate Service Request PDU.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("The Entity is able to provide recovery (e.g. towing) services in response to an appropriate Service Request PDU.")]
+        Recovery = 4,
+
+        /// <summary>
+        /// The Entity is able to supply certain repair services in response to an appropriate Service Request PDU.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("The Entity is able to supply certain repair services in response to an appropriate Service Request PDU.")]
+        Repair = 8,
+
+        /// <summary>
+        /// The Entity is Automatic Dependent Surveillance - Broadcast (ADS-B) Capable
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("The Entity is Automatic Dependent Surveillance - Broadcast (ADS-B) Capable")]
+        ADSB = 16
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityForceId.cs b/Libs/CsharpDis6/Enumerations/EntityState/EntityForceId.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityForceId.cs
rename to Libs/CsharpDis6/Enumerations/EntityState/EntityForceId.cs
index 63af72a..42e657c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/EntityForceId.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState/EntityForceId.cs
@@ -1,339 +1,339 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState
-{
-    /// <summary>
-    /// Enumeration values for EntityForceId (es.forceid, Force ID, 
-    /// section 4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EntityForceId : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Friendly.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly.")]
-        Friendly = 1,
-
-        /// <summary>
-        /// Opposing.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing.")]
-        Opposing = 2,
-
-        /// <summary>
-        /// Neutral.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral.")]
-        Neutral = 3,
-
-        /// <summary>
-        /// Friendly 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 2.")]
-        Friendly2 = 4,
-
-        /// <summary>
-        /// Opposing 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 2.")]
-        Opposing2 = 5,
-
-        /// <summary>
-        /// Neutral 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 2.")]
-        Neutral2 = 6,
-
-        /// <summary>
-        /// Friendly 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 3.")]
-        Friendly3 = 7,
-
-        /// <summary>
-        /// Opposing 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 3.")]
-        Opposing3 = 8,
-
-        /// <summary>
-        /// Neutral 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 3.")]
-        Neutral3 = 9,
-
-        /// <summary>
-        /// Friendly 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 4.")]
-        Friendly4 = 10,
-
-        /// <summary>
-        /// Opposing 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 4.")]
-        Opposing4 = 11,
-
-        /// <summary>
-        /// Neutral 4.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 4.")]
-        Neutral4 = 12,
-
-        /// <summary>
-        /// Friendly 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 5.")]
-        Friendly5 = 13,
-
-        /// <summary>
-        /// Opposing 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 5.")]
-        Opposing5 = 14,
-
-        /// <summary>
-        /// Neutral 5.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 5.")]
-        Neutral5 = 15,
-
-        /// <summary>
-        /// Friendly 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 6.")]
-        Friendly6 = 16,
-
-        /// <summary>
-        /// Opposing 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 6.")]
-        Opposing6 = 17,
-
-        /// <summary>
-        /// Neutral 6.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 6.")]
-        Neutral6 = 18,
-
-        /// <summary>
-        /// Friendly 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 7.")]
-        Friendly7 = 19,
-
-        /// <summary>
-        /// Opposing 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 7.")]
-        Opposing7 = 20,
-
-        /// <summary>
-        /// Neutral 7.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 7.")]
-        Neutral7 = 21,
-
-        /// <summary>
-        /// Friendly 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 8.")]
-        Friendly8 = 22,
-
-        /// <summary>
-        /// Opposing 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 8.")]
-        Opposing8 = 23,
-
-        /// <summary>
-        /// Neutral 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 8.")]
-        Neutral8 = 24,
-
-        /// <summary>
-        /// Friendly 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 9.")]
-        Friendly9 = 25,
-
-        /// <summary>
-        /// Opposing 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 9.")]
-        Opposing9 = 26,
-
-        /// <summary>
-        /// Neutral 9.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 9.")]
-        Neutral9 = 27,
-
-        /// <summary>
-        /// Friendly 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Friendly 10.")]
-        Friendly10 = 28,
-
-        /// <summary>
-        /// Opposing 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Opposing 10.")]
-        Opposing10 = 29,
-
-        /// <summary>
-        /// Neutral 10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Neutral 10.")]
-        Neutral10 = 30
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState
+{
+    /// <summary>
+    /// Enumeration values for EntityForceId (es.forceid, Force ID, 
+    /// section 4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EntityForceId : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Friendly.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly.")]
+        Friendly = 1,
+
+        /// <summary>
+        /// Opposing.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing.")]
+        Opposing = 2,
+
+        /// <summary>
+        /// Neutral.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral.")]
+        Neutral = 3,
+
+        /// <summary>
+        /// Friendly 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 2.")]
+        Friendly2 = 4,
+
+        /// <summary>
+        /// Opposing 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 2.")]
+        Opposing2 = 5,
+
+        /// <summary>
+        /// Neutral 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 2.")]
+        Neutral2 = 6,
+
+        /// <summary>
+        /// Friendly 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 3.")]
+        Friendly3 = 7,
+
+        /// <summary>
+        /// Opposing 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 3.")]
+        Opposing3 = 8,
+
+        /// <summary>
+        /// Neutral 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 3.")]
+        Neutral3 = 9,
+
+        /// <summary>
+        /// Friendly 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 4.")]
+        Friendly4 = 10,
+
+        /// <summary>
+        /// Opposing 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 4.")]
+        Opposing4 = 11,
+
+        /// <summary>
+        /// Neutral 4.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 4.")]
+        Neutral4 = 12,
+
+        /// <summary>
+        /// Friendly 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 5.")]
+        Friendly5 = 13,
+
+        /// <summary>
+        /// Opposing 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 5.")]
+        Opposing5 = 14,
+
+        /// <summary>
+        /// Neutral 5.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 5.")]
+        Neutral5 = 15,
+
+        /// <summary>
+        /// Friendly 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 6.")]
+        Friendly6 = 16,
+
+        /// <summary>
+        /// Opposing 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 6.")]
+        Opposing6 = 17,
+
+        /// <summary>
+        /// Neutral 6.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 6.")]
+        Neutral6 = 18,
+
+        /// <summary>
+        /// Friendly 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 7.")]
+        Friendly7 = 19,
+
+        /// <summary>
+        /// Opposing 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 7.")]
+        Opposing7 = 20,
+
+        /// <summary>
+        /// Neutral 7.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 7.")]
+        Neutral7 = 21,
+
+        /// <summary>
+        /// Friendly 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 8.")]
+        Friendly8 = 22,
+
+        /// <summary>
+        /// Opposing 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 8.")]
+        Opposing8 = 23,
+
+        /// <summary>
+        /// Neutral 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 8.")]
+        Neutral8 = 24,
+
+        /// <summary>
+        /// Friendly 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 9.")]
+        Friendly9 = 25,
+
+        /// <summary>
+        /// Opposing 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 9.")]
+        Opposing9 = 26,
+
+        /// <summary>
+        /// Neutral 9.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 9.")]
+        Neutral9 = 27,
+
+        /// <summary>
+        /// Friendly 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Friendly 10.")]
+        Friendly10 = 28,
+
+        /// <summary>
+        /// Opposing 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Opposing 10.")]
+        Opposing10 = 29,
+
+        /// <summary>
+        /// Neutral 10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Neutral 10.")]
+        Neutral10 = 30
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs b/Libs/CsharpDis6/Enumerations/EntityState/ParameterTypeDesignator.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs
rename to Libs/CsharpDis6/Enumerations/EntityState/ParameterTypeDesignator.cs
index 9ee6d81..1704c6c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/EntityState/ParameterTypeDesignator.cs
+++ b/Libs/CsharpDis6/Enumerations/EntityState/ParameterTypeDesignator.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.EntityState
-{
-    /// <summary>
-    /// Enumeration values for ParameterTypeDesignator (es.vp.type, Parameter Type Designator, 
-    /// section 4.7.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ParameterTypeDesignator : byte
-    {
-        /// <summary>
-        /// Articulated Part.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulated Part.")]
-        ArticulatedPart = 0,
-
-        /// <summary>
-        /// Attached Part.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Attached Part.")]
-        AttachedPart = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.EntityState
+{
+    /// <summary>
+    /// Enumeration values for ParameterTypeDesignator (es.vp.type, Parameter Type Designator, 
+    /// section 4.7.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ParameterTypeDesignator : byte
+    {
+        /// <summary>
+        /// Articulated Part.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulated Part.")]
+        ArticulatedPart = 0,
+
+        /// <summary>
+        /// Attached Part.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Attached Part.")]
+        AttachedPart = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs b/Libs/CsharpDis6/Enumerations/Environment.Gridded/ConstantGrid.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs
rename to Libs/CsharpDis6/Enumerations/Environment.Gridded/ConstantGrid.cs
index 0ff4e9f..0434c58 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/ConstantGrid.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.Gridded/ConstantGrid.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.Gridded
-{
-    /// <summary>
-    /// Enumeration values for ConstantGrid (env.gridded.constantgrid, Constant Grid, 
-    /// section 12.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ConstantGrid : byte
-    {
-        /// <summary>
-        /// Constant grid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Constant grid.")]
-        ConstantGrid = 0,
-
-        /// <summary>
-        /// Updated grid.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Updated grid.")]
-        UpdatedGrid = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.Gridded
+{
+    /// <summary>
+    /// Enumeration values for ConstantGrid (env.gridded.constantgrid, Constant Grid, 
+    /// section 12.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ConstantGrid : byte
+    {
+        /// <summary>
+        /// Constant grid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Constant grid.")]
+        ConstantGrid = 0,
+
+        /// <summary>
+        /// Updated grid.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Updated grid.")]
+        UpdatedGrid = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs b/Libs/CsharpDis6/Enumerations/Environment.Gridded/CoordinateSystem.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs
rename to Libs/CsharpDis6/Enumerations/Environment.Gridded/CoordinateSystem.cs
index f87cfff..6f17daa 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/CoordinateSystem.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.Gridded/CoordinateSystem.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.Gridded
-{
-    /// <summary>
-    /// Enumeration values for CoordinateSystem (env.gridded.coordinatesystem, Coordinate System, 
-    /// section 12.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum CoordinateSystem : ushort
-    {
-        /// <summary>
-        /// Right handed Cartesian (local topographic projection: east, north, up).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Right handed Cartesian (local topographic projection: east, north, up).")]
-        RightHandedCartesianLocalTopographicProjectionEastNorthUp = 0,
-
-        /// <summary>
-        /// Left handed Cartesian (local topographic projection: east, north, down).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Left handed Cartesian (local topographic projection: east, north, down).")]
-        LeftHandedCartesianLocalTopographicProjectionEastNorthDown = 1,
-
-        /// <summary>
-        /// Latitude, Longitude, Height.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Latitude, Longitude, Height.")]
-        LatitudeLongitudeHeight = 2,
-
-        /// <summary>
-        /// Latitude, Longitude, Depth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Latitude, Longitude, Depth.")]
-        LatitudeLongitudeDepth = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.Gridded
+{
+    /// <summary>
+    /// Enumeration values for CoordinateSystem (env.gridded.coordinatesystem, Coordinate System, 
+    /// section 12.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum CoordinateSystem : ushort
+    {
+        /// <summary>
+        /// Right handed Cartesian (local topographic projection: east, north, up).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Right handed Cartesian (local topographic projection: east, north, up).")]
+        RightHandedCartesianLocalTopographicProjectionEastNorthUp = 0,
+
+        /// <summary>
+        /// Left handed Cartesian (local topographic projection: east, north, down).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Left handed Cartesian (local topographic projection: east, north, down).")]
+        LeftHandedCartesianLocalTopographicProjectionEastNorthDown = 1,
+
+        /// <summary>
+        /// Latitude, Longitude, Height.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Latitude, Longitude, Height.")]
+        LatitudeLongitudeHeight = 2,
+
+        /// <summary>
+        /// Latitude, Longitude, Depth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Latitude, Longitude, Depth.")]
+        LatitudeLongitudeDepth = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs b/Libs/CsharpDis6/Enumerations/Environment.Gridded/DataRepresentationType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs
rename to Libs/CsharpDis6/Enumerations/Environment.Gridded/DataRepresentationType.cs
index 1398fee..3abf61e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Gridded/DataRepresentationType.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.Gridded/DataRepresentationType.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.Gridded
-{
-    /// <summary>
-    /// Enumeration values for DataRepresentationType (env.gridded.datarepresentation, Data Representation, 
-    /// section 12.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DataRepresentationType : ushort
-    {
-        /// <summary>
-        /// Type 0.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type 0.")]
-        Type0 = 0,
-
-        /// <summary>
-        /// Type 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type 1.")]
-        Type1 = 1,
-
-        /// <summary>
-        /// Type 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type 2.")]
-        Type2 = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.Gridded
+{
+    /// <summary>
+    /// Enumeration values for DataRepresentationType (env.gridded.datarepresentation, Data Representation, 
+    /// section 12.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DataRepresentationType : ushort
+    {
+        /// <summary>
+        /// Type 0.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type 0.")]
+        Type0 = 0,
+
+        /// <summary>
+        /// Type 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type 1.")]
+        Type1 = 1,
+
+        /// <summary>
+        /// Type 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type 2.")]
+        Type2 = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
index ee9908f..8ba2e4a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/AirBurstAndGroundBurst.cs
@@ -1,329 +1,329 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for AirBurstAndGroundBurst (env.obj.appear.point.burst, Air burst, Ground burst, 
-    /// section 12.1.2.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct AirBurstAndGroundBurst
-    {
-        /// <summary>
-        /// Describes the chemical content of the smoke
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the chemical content of the smoke")]
-        public enum ChemicalValue : uint
-        {
-            /// <summary>
-            /// Other
-            /// </summary>
-            Other = 0,
-
-            /// <summary>
-            /// Hydrochloric
-            /// </summary>
-            Hydrochloric = 1,
-
-            /// <summary>
-            /// White phosphorous
-            /// </summary>
-            WhitePhosphorous = 2,
-
-            /// <summary>
-            /// Red phosphorous
-            /// </summary>
-            RedPhosphorous = 3
-        }
-
-        private byte opacity;
-        private byte size;
-        private byte height;
-        private byte numOfBursts;
-        private AirBurstAndGroundBurst.ChemicalValue chemical;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(AirBurstAndGroundBurst left, AirBurstAndGroundBurst right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(AirBurstAndGroundBurst left, AirBurstAndGroundBurst right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(AirBurstAndGroundBurst obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator AirBurstAndGroundBurst(uint value)
-        {
-            return AirBurstAndGroundBurst.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static AirBurstAndGroundBurst FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance, represented by the uint value.</returns>
-        public static AirBurstAndGroundBurst FromUInt32(uint value)
-        {
-            AirBurstAndGroundBurst ps = new AirBurstAndGroundBurst();
-
-            uint mask0 = 0xff0000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Opacity = (byte)newValue0;
-
-            uint mask1 = 0xff000000;
-            byte shift1 = 24;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Size = (byte)newValue1;
-
-            uint mask2 = 0x00ff;
-            byte shift2 = 32;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Height = (byte)newValue2;
-
-            uint mask3 = 0x3f00;
-            byte shift3 = 40;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.NumOfBursts = (byte)newValue3;
-
-            uint mask4 = 0xc000;
-            byte shift4 = 46;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Chemical = (AirBurstAndGroundBurst.ChemicalValue)newValue4;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity.
-        /// </summary>
-        /// <value>The opacity.</value>
-        public byte Opacity
-        {
-            get { return this.opacity; }
-            set { this.opacity = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the size.
-        /// </summary>
-        /// <value>The size.</value>
-        public byte Size
-        {
-            get { return this.size; }
-            set { this.size = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        /// <value>The height.</value>
-        public byte Height
-        {
-            get { return this.height; }
-            set { this.height = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the numofbursts.
-        /// </summary>
-        /// <value>The numofbursts.</value>
-        public byte NumOfBursts
-        {
-            get { return this.numOfBursts; }
-            set { this.numOfBursts = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the chemical.
-        /// </summary>
-        /// <value>The chemical.</value>
-        public AirBurstAndGroundBurst.ChemicalValue Chemical
-        {
-            get { return this.chemical; }
-            set { this.chemical = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is AirBurstAndGroundBurst))
-            {
-                return false;
-            }
-
-            return this.Equals((AirBurstAndGroundBurst)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(AirBurstAndGroundBurst other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Opacity == other.Opacity &&
-                this.Size == other.Size &&
-                this.Height == other.Height &&
-                this.NumOfBursts == other.NumOfBursts &&
-                this.Chemical == other.Chemical;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Opacity << 16);
-            val |= (uint)((uint)this.Size << 24);
-            val |= (uint)((uint)this.Height << 32);
-            val |= (uint)((uint)this.NumOfBursts << 40);
-            val |= (uint)((uint)this.Chemical << 46);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Opacity.GetHashCode();
-                hash = (hash * 29) + this.Size.GetHashCode();
-                hash = (hash * 29) + this.Height.GetHashCode();
-                hash = (hash * 29) + this.NumOfBursts.GetHashCode();
-                hash = (hash * 29) + this.Chemical.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for AirBurstAndGroundBurst (env.obj.appear.point.burst, Air burst, Ground burst, 
+    /// section 12.1.2.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct AirBurstAndGroundBurst
+    {
+        /// <summary>
+        /// Describes the chemical content of the smoke
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the chemical content of the smoke")]
+        public enum ChemicalValue : uint
+        {
+            /// <summary>
+            /// Other
+            /// </summary>
+            Other = 0,
+
+            /// <summary>
+            /// Hydrochloric
+            /// </summary>
+            Hydrochloric = 1,
+
+            /// <summary>
+            /// White phosphorous
+            /// </summary>
+            WhitePhosphorous = 2,
+
+            /// <summary>
+            /// Red phosphorous
+            /// </summary>
+            RedPhosphorous = 3
+        }
+
+        private byte opacity;
+        private byte size;
+        private byte height;
+        private byte numOfBursts;
+        private AirBurstAndGroundBurst.ChemicalValue chemical;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AirBurstAndGroundBurst left, AirBurstAndGroundBurst right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AirBurstAndGroundBurst left, AirBurstAndGroundBurst right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(AirBurstAndGroundBurst obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator AirBurstAndGroundBurst(uint value)
+        {
+            return AirBurstAndGroundBurst.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static AirBurstAndGroundBurst FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance, represented by the uint value.</returns>
+        public static AirBurstAndGroundBurst FromUInt32(uint value)
+        {
+            AirBurstAndGroundBurst ps = new AirBurstAndGroundBurst();
+
+            uint mask0 = 0xff0000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Opacity = (byte)newValue0;
+
+            uint mask1 = 0xff000000;
+            byte shift1 = 24;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Size = (byte)newValue1;
+
+            uint mask2 = 0x00ff;
+            byte shift2 = 32;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Height = (byte)newValue2;
+
+            uint mask3 = 0x3f00;
+            byte shift3 = 40;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.NumOfBursts = (byte)newValue3;
+
+            uint mask4 = 0xc000;
+            byte shift4 = 46;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Chemical = (AirBurstAndGroundBurst.ChemicalValue)newValue4;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity.
+        /// </summary>
+        /// <value>The opacity.</value>
+        public byte Opacity
+        {
+            get { return this.opacity; }
+            set { this.opacity = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the size.
+        /// </summary>
+        /// <value>The size.</value>
+        public byte Size
+        {
+            get { return this.size; }
+            set { this.size = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the height.
+        /// </summary>
+        /// <value>The height.</value>
+        public byte Height
+        {
+            get { return this.height; }
+            set { this.height = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the numofbursts.
+        /// </summary>
+        /// <value>The numofbursts.</value>
+        public byte NumOfBursts
+        {
+            get { return this.numOfBursts; }
+            set { this.numOfBursts = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the chemical.
+        /// </summary>
+        /// <value>The chemical.</value>
+        public AirBurstAndGroundBurst.ChemicalValue Chemical
+        {
+            get { return this.chemical; }
+            set { this.chemical = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is AirBurstAndGroundBurst))
+            {
+                return false;
+            }
+
+            return this.Equals((AirBurstAndGroundBurst)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AirBurstAndGroundBurst other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Opacity == other.Opacity &&
+                this.Size == other.Size &&
+                this.Height == other.Height &&
+                this.NumOfBursts == other.NumOfBursts &&
+                this.Chemical == other.Chemical;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.AirBurstAndGroundBurst"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Opacity << 16);
+            val |= (uint)((uint)this.Size << 24);
+            val |= (uint)((uint)this.Height << 32);
+            val |= (uint)((uint)this.NumOfBursts << 40);
+            val |= (uint)((uint)this.Chemical << 46);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Opacity.GetHashCode();
+                hash = (hash * 29) + this.Size.GetHashCode();
+                hash = (hash * 29) + this.Height.GetHashCode();
+                hash = (hash * 29) + this.NumOfBursts.GetHashCode();
+                hash = (hash * 29) + this.Chemical.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
index 2e9451f..46b4877 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/ArealObjectStatePDUModificationField.cs
@@ -1,40 +1,40 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for ArealObjectStatePDUModificationField (env.obj.mod.areal, Areal Object State PDU Modification Field, 
-    /// section 12.1.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum ArealObjectStatePDUModificationField : byte
-    {
-        /// <summary>
-        /// Set bit means 'Locations have been modified', reset bit means 'No locations have been modified'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Locations have been modified', reset bit means 'No locations have been modified'.")]
-        Location = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for ArealObjectStatePDUModificationField (env.obj.mod.areal, Areal Object State PDU Modification Field, 
+    /// section 12.1.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum ArealObjectStatePDUModificationField : byte
+    {
+        /// <summary>
+        /// Set bit means 'Locations have been modified', reset bit means 'No locations have been modified'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Locations have been modified', reset bit means 'No locations have been modified'.")]
+        Location = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Crater.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/Crater.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Crater.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/Crater.cs
index b807923..6b303f9 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Crater.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/Crater.cs
@@ -1,222 +1,222 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for Crater (env.obj.appear.point.crater, Crater, 
-    /// section 12.1.2.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Crater
-    {
-        private byte size;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Crater left, Crater right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Crater left, Crater right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(Crater obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Crater(uint value)
-        {
-            return Crater.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Crater FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance, represented by the uint value.</returns>
-        public static Crater FromUInt32(uint value)
-        {
-            Crater ps = new Crater();
-
-            uint mask0 = 0xff0000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Size = (byte)newValue0;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the size.
-        /// </summary>
-        /// <value>The size.</value>
-        public byte Size
-        {
-            get { return this.size; }
-            set { this.size = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Crater))
-            {
-                return false;
-            }
-
-            return this.Equals((Crater)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Crater other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Size == other.Size;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Size << 16);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Size.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for Crater (env.obj.appear.point.crater, Crater, 
+    /// section 12.1.2.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Crater
+    {
+        private byte size;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Crater left, Crater right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Crater left, Crater right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(Crater obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Crater(uint value)
+        {
+            return Crater.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Crater FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance, represented by the uint value.</returns>
+        public static Crater FromUInt32(uint value)
+        {
+            Crater ps = new Crater();
+
+            uint mask0 = 0xff0000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Size = (byte)newValue0;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the size.
+        /// </summary>
+        /// <value>The size.</value>
+        public byte Size
+        {
+            get { return this.size; }
+            set { this.size = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Crater))
+            {
+                return false;
+            }
+
+            return this.Equals((Crater)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Crater other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Size == other.Size;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Crater"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Size << 16);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Size.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
index 7b4a193..d45c32a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/ExhaustSmoke.cs
@@ -1,312 +1,312 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for ExhaustSmoke (env.obj.appear.linear.exhaust, Exhaust smoke, 
-    /// section 12.1.2.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct ExhaustSmoke
-    {
-        /// <summary>
-        /// Describes whether the smoke is attached to the vehicle
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether the smoke is attached to the vehicle")]
-        public enum AttachedValue : uint
-        {
-            /// <summary>
-            /// Not attached
-            /// </summary>
-            NotAttached = 0,
-
-            /// <summary>
-            /// Attached
-            /// </summary>
-            Attached = 1
-        }
-
-        /// <summary>
-        /// Describes the chemical content of the smoke
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the chemical content of the smoke")]
-        public enum ChemicalValue : uint
-        {
-            /// <summary>
-            /// Other
-            /// </summary>
-            Other = 0,
-
-            /// <summary>
-            /// Hydrochloric
-            /// </summary>
-            Hydrochloric = 1,
-
-            /// <summary>
-            /// White phosphorous
-            /// </summary>
-            WhitePhosphorous = 2,
-
-            /// <summary>
-            /// Red phosphorous
-            /// </summary>
-            RedPhosphorous = 3
-        }
-
-        private byte opacity;
-        private ExhaustSmoke.AttachedValue attached;
-        private ExhaustSmoke.ChemicalValue chemical;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(ExhaustSmoke left, ExhaustSmoke right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(ExhaustSmoke left, ExhaustSmoke right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(ExhaustSmoke obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ExhaustSmoke(uint value)
-        {
-            return ExhaustSmoke.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static ExhaustSmoke FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance, represented by the uint value.</returns>
-        public static ExhaustSmoke FromUInt32(uint value)
-        {
-            ExhaustSmoke ps = new ExhaustSmoke();
-
-            uint mask0 = 0xff0000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Opacity = (byte)newValue0;
-
-            uint mask1 = 0x1000000;
-            byte shift1 = 24;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Attached = (ExhaustSmoke.AttachedValue)newValue1;
-
-            uint mask2 = 0x6000000;
-            byte shift2 = 25;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Chemical = (ExhaustSmoke.ChemicalValue)newValue2;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the opacity.
-        /// </summary>
-        /// <value>The opacity.</value>
-        public byte Opacity
-        {
-            get { return this.opacity; }
-            set { this.opacity = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the attached.
-        /// </summary>
-        /// <value>The attached.</value>
-        public ExhaustSmoke.AttachedValue Attached
-        {
-            get { return this.attached; }
-            set { this.attached = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the chemical.
-        /// </summary>
-        /// <value>The chemical.</value>
-        public ExhaustSmoke.ChemicalValue Chemical
-        {
-            get { return this.chemical; }
-            set { this.chemical = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is ExhaustSmoke))
-            {
-                return false;
-            }
-
-            return this.Equals((ExhaustSmoke)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(ExhaustSmoke other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Opacity == other.Opacity &&
-                this.Attached == other.Attached &&
-                this.Chemical == other.Chemical;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Opacity << 16);
-            val |= (uint)((uint)this.Attached << 24);
-            val |= (uint)((uint)this.Chemical << 25);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Opacity.GetHashCode();
-                hash = (hash * 29) + this.Attached.GetHashCode();
-                hash = (hash * 29) + this.Chemical.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for ExhaustSmoke (env.obj.appear.linear.exhaust, Exhaust smoke, 
+    /// section 12.1.2.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct ExhaustSmoke
+    {
+        /// <summary>
+        /// Describes whether the smoke is attached to the vehicle
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether the smoke is attached to the vehicle")]
+        public enum AttachedValue : uint
+        {
+            /// <summary>
+            /// Not attached
+            /// </summary>
+            NotAttached = 0,
+
+            /// <summary>
+            /// Attached
+            /// </summary>
+            Attached = 1
+        }
+
+        /// <summary>
+        /// Describes the chemical content of the smoke
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the chemical content of the smoke")]
+        public enum ChemicalValue : uint
+        {
+            /// <summary>
+            /// Other
+            /// </summary>
+            Other = 0,
+
+            /// <summary>
+            /// Hydrochloric
+            /// </summary>
+            Hydrochloric = 1,
+
+            /// <summary>
+            /// White phosphorous
+            /// </summary>
+            WhitePhosphorous = 2,
+
+            /// <summary>
+            /// Red phosphorous
+            /// </summary>
+            RedPhosphorous = 3
+        }
+
+        private byte opacity;
+        private ExhaustSmoke.AttachedValue attached;
+        private ExhaustSmoke.ChemicalValue chemical;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ExhaustSmoke left, ExhaustSmoke right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ExhaustSmoke left, ExhaustSmoke right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(ExhaustSmoke obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ExhaustSmoke(uint value)
+        {
+            return ExhaustSmoke.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static ExhaustSmoke FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance, represented by the uint value.</returns>
+        public static ExhaustSmoke FromUInt32(uint value)
+        {
+            ExhaustSmoke ps = new ExhaustSmoke();
+
+            uint mask0 = 0xff0000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Opacity = (byte)newValue0;
+
+            uint mask1 = 0x1000000;
+            byte shift1 = 24;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Attached = (ExhaustSmoke.AttachedValue)newValue1;
+
+            uint mask2 = 0x6000000;
+            byte shift2 = 25;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Chemical = (ExhaustSmoke.ChemicalValue)newValue2;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the opacity.
+        /// </summary>
+        /// <value>The opacity.</value>
+        public byte Opacity
+        {
+            get { return this.opacity; }
+            set { this.opacity = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the attached.
+        /// </summary>
+        /// <value>The attached.</value>
+        public ExhaustSmoke.AttachedValue Attached
+        {
+            get { return this.attached; }
+            set { this.attached = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the chemical.
+        /// </summary>
+        /// <value>The chemical.</value>
+        public ExhaustSmoke.ChemicalValue Chemical
+        {
+            get { return this.chemical; }
+            set { this.chemical = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is ExhaustSmoke))
+            {
+                return false;
+            }
+
+            return this.Equals((ExhaustSmoke)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ExhaustSmoke other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Opacity == other.Opacity &&
+                this.Attached == other.Attached &&
+                this.Chemical == other.Chemical;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.ExhaustSmoke"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Opacity << 16);
+            val |= (uint)((uint)this.Attached << 24);
+            val |= (uint)((uint)this.Chemical << 25);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Opacity.GetHashCode();
+                hash = (hash * 29) + this.Attached.GetHashCode();
+                hash = (hash * 29) + this.Chemical.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/GeneralAppearance.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/GeneralAppearance.cs
index 51d1569..a4395a3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/GeneralAppearance.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/GeneralAppearance.cs
@@ -1,432 +1,432 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for GeneralAppearance (env.obj.appear.general, General, 
-    /// section 12.1.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct GeneralAppearance
-    {
-        /// <summary>
-        /// Describes the damaged appearance of the object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the damaged appearance of the object")]
-        public enum DamageValue : uint
-        {
-            /// <summary>
-            /// No damage
-            /// </summary>
-            NoDamage = 0,
-
-            /// <summary>
-            /// Damaged
-            /// </summary>
-            Damaged = 1,
-
-            /// <summary>
-            /// Destroyed
-            /// </summary>
-            Destroyed = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        /// <summary>
-        /// Describes whether the object was predistributed
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether the object was predistributed")]
-        public enum PredistributedValue : uint
-        {
-            /// <summary>
-            /// Object created during the exercise
-            /// </summary>
-            ObjectCreatedDuringTheExercise = 0,
-
-            /// <summary>
-            /// Object predistributed prior to exercise start
-            /// </summary>
-            ObjectPredistributedPriorToExerciseStart = 1
-        }
-
-        /// <summary>
-        /// Describes the state of the object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the state of the object")]
-        public enum StateValue : uint
-        {
-            /// <summary>
-            /// Active
-            /// </summary>
-            Active = 0,
-
-            /// <summary>
-            /// Deactivated
-            /// </summary>
-            Deactivated = 1
-        }
-
-        /// <summary>
-        /// Describes whether smoke is rising from an object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether smoke is rising from an object")]
-        public enum SmokingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Smoke present
-            /// </summary>
-            SmokePresent = 1
-        }
-
-        /// <summary>
-        /// Describes whether flames are rising from an object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes whether flames are rising from an object")]
-        public enum FlamingValue : uint
-        {
-            /// <summary>
-            /// None
-            /// </summary>
-            None = 0,
-
-            /// <summary>
-            /// Flames present
-            /// </summary>
-            FlamesPresent = 1
-        }
-
-        private byte percentComplete;
-        private GeneralAppearance.DamageValue damage;
-        private GeneralAppearance.PredistributedValue predistributed;
-        private GeneralAppearance.StateValue state;
-        private GeneralAppearance.SmokingValue smoking;
-        private GeneralAppearance.FlamingValue flaming;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(GeneralAppearance left, GeneralAppearance right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(GeneralAppearance left, GeneralAppearance right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(GeneralAppearance obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator GeneralAppearance(ushort value)
-        {
-            return GeneralAppearance.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static GeneralAppearance FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance, represented by the ushort value.</returns>
-        public static GeneralAppearance FromUInt16(ushort value)
-        {
-            GeneralAppearance ps = new GeneralAppearance();
-
-            uint mask0 = 0x00ff;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.PercentComplete = (byte)newValue0;
-
-            uint mask1 = 0x0300;
-            byte shift1 = 8;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.Damage = (GeneralAppearance.DamageValue)newValue1;
-
-            uint mask2 = 0x0400;
-            byte shift2 = 10;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.Predistributed = (GeneralAppearance.PredistributedValue)newValue2;
-
-            uint mask3 = 0x0800;
-            byte shift3 = 11;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.State = (GeneralAppearance.StateValue)newValue3;
-
-            uint mask4 = 0x1000;
-            byte shift4 = 12;
-            uint newValue4 = (value & mask4) >> shift4;
-            ps.Smoking = (GeneralAppearance.SmokingValue)newValue4;
-
-            uint mask5 = 0x2000;
-            byte shift5 = 13;
-            uint newValue5 = (value & mask5) >> shift5;
-            ps.Flaming = (GeneralAppearance.FlamingValue)newValue5;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the percentcomplete.
-        /// </summary>
-        /// <value>The percentcomplete.</value>
-        public byte PercentComplete
-        {
-            get { return this.percentComplete; }
-            set { this.percentComplete = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the damage.
-        /// </summary>
-        /// <value>The damage.</value>
-        public GeneralAppearance.DamageValue Damage
-        {
-            get { return this.damage; }
-            set { this.damage = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the predistributed.
-        /// </summary>
-        /// <value>The predistributed.</value>
-        public GeneralAppearance.PredistributedValue Predistributed
-        {
-            get { return this.predistributed; }
-            set { this.predistributed = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public GeneralAppearance.StateValue State
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the smoking.
-        /// </summary>
-        /// <value>The smoking.</value>
-        public GeneralAppearance.SmokingValue Smoking
-        {
-            get { return this.smoking; }
-            set { this.smoking = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the flaming.
-        /// </summary>
-        /// <value>The flaming.</value>
-        public GeneralAppearance.FlamingValue Flaming
-        {
-            get { return this.flaming; }
-            set { this.flaming = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is GeneralAppearance))
-            {
-                return false;
-            }
-
-            return this.Equals((GeneralAppearance)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(GeneralAppearance other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.PercentComplete == other.PercentComplete &&
-                this.Damage == other.Damage &&
-                this.Predistributed == other.Predistributed &&
-                this.State == other.State &&
-                this.Smoking == other.Smoking &&
-                this.Flaming == other.Flaming;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.PercentComplete << 0);
-            val |= (ushort)((uint)this.Damage << 8);
-            val |= (ushort)((uint)this.Predistributed << 10);
-            val |= (ushort)((uint)this.State << 11);
-            val |= (ushort)((uint)this.Smoking << 12);
-            val |= (ushort)((uint)this.Flaming << 13);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.PercentComplete.GetHashCode();
-                hash = (hash * 29) + this.Damage.GetHashCode();
-                hash = (hash * 29) + this.Predistributed.GetHashCode();
-                hash = (hash * 29) + this.State.GetHashCode();
-                hash = (hash * 29) + this.Smoking.GetHashCode();
-                hash = (hash * 29) + this.Flaming.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for GeneralAppearance (env.obj.appear.general, General, 
+    /// section 12.1.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct GeneralAppearance
+    {
+        /// <summary>
+        /// Describes the damaged appearance of the object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the damaged appearance of the object")]
+        public enum DamageValue : uint
+        {
+            /// <summary>
+            /// No damage
+            /// </summary>
+            NoDamage = 0,
+
+            /// <summary>
+            /// Damaged
+            /// </summary>
+            Damaged = 1,
+
+            /// <summary>
+            /// Destroyed
+            /// </summary>
+            Destroyed = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        /// <summary>
+        /// Describes whether the object was predistributed
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether the object was predistributed")]
+        public enum PredistributedValue : uint
+        {
+            /// <summary>
+            /// Object created during the exercise
+            /// </summary>
+            ObjectCreatedDuringTheExercise = 0,
+
+            /// <summary>
+            /// Object predistributed prior to exercise start
+            /// </summary>
+            ObjectPredistributedPriorToExerciseStart = 1
+        }
+
+        /// <summary>
+        /// Describes the state of the object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the state of the object")]
+        public enum StateValue : uint
+        {
+            /// <summary>
+            /// Active
+            /// </summary>
+            Active = 0,
+
+            /// <summary>
+            /// Deactivated
+            /// </summary>
+            Deactivated = 1
+        }
+
+        /// <summary>
+        /// Describes whether smoke is rising from an object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether smoke is rising from an object")]
+        public enum SmokingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Smoke present
+            /// </summary>
+            SmokePresent = 1
+        }
+
+        /// <summary>
+        /// Describes whether flames are rising from an object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes whether flames are rising from an object")]
+        public enum FlamingValue : uint
+        {
+            /// <summary>
+            /// None
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            /// Flames present
+            /// </summary>
+            FlamesPresent = 1
+        }
+
+        private byte percentComplete;
+        private GeneralAppearance.DamageValue damage;
+        private GeneralAppearance.PredistributedValue predistributed;
+        private GeneralAppearance.StateValue state;
+        private GeneralAppearance.SmokingValue smoking;
+        private GeneralAppearance.FlamingValue flaming;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GeneralAppearance left, GeneralAppearance right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GeneralAppearance left, GeneralAppearance right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(GeneralAppearance obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator GeneralAppearance(ushort value)
+        {
+            return GeneralAppearance.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static GeneralAppearance FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance, represented by the ushort value.</returns>
+        public static GeneralAppearance FromUInt16(ushort value)
+        {
+            GeneralAppearance ps = new GeneralAppearance();
+
+            uint mask0 = 0x00ff;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.PercentComplete = (byte)newValue0;
+
+            uint mask1 = 0x0300;
+            byte shift1 = 8;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.Damage = (GeneralAppearance.DamageValue)newValue1;
+
+            uint mask2 = 0x0400;
+            byte shift2 = 10;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.Predistributed = (GeneralAppearance.PredistributedValue)newValue2;
+
+            uint mask3 = 0x0800;
+            byte shift3 = 11;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.State = (GeneralAppearance.StateValue)newValue3;
+
+            uint mask4 = 0x1000;
+            byte shift4 = 12;
+            uint newValue4 = (value & mask4) >> shift4;
+            ps.Smoking = (GeneralAppearance.SmokingValue)newValue4;
+
+            uint mask5 = 0x2000;
+            byte shift5 = 13;
+            uint newValue5 = (value & mask5) >> shift5;
+            ps.Flaming = (GeneralAppearance.FlamingValue)newValue5;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the percentcomplete.
+        /// </summary>
+        /// <value>The percentcomplete.</value>
+        public byte PercentComplete
+        {
+            get { return this.percentComplete; }
+            set { this.percentComplete = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the damage.
+        /// </summary>
+        /// <value>The damage.</value>
+        public GeneralAppearance.DamageValue Damage
+        {
+            get { return this.damage; }
+            set { this.damage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the predistributed.
+        /// </summary>
+        /// <value>The predistributed.</value>
+        public GeneralAppearance.PredistributedValue Predistributed
+        {
+            get { return this.predistributed; }
+            set { this.predistributed = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public GeneralAppearance.StateValue State
+        {
+            get { return this.state; }
+            set { this.state = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the smoking.
+        /// </summary>
+        /// <value>The smoking.</value>
+        public GeneralAppearance.SmokingValue Smoking
+        {
+            get { return this.smoking; }
+            set { this.smoking = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the flaming.
+        /// </summary>
+        /// <value>The flaming.</value>
+        public GeneralAppearance.FlamingValue Flaming
+        {
+            get { return this.flaming; }
+            set { this.flaming = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is GeneralAppearance))
+            {
+                return false;
+            }
+
+            return this.Equals((GeneralAppearance)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GeneralAppearance other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.PercentComplete == other.PercentComplete &&
+                this.Damage == other.Damage &&
+                this.Predistributed == other.Predistributed &&
+                this.State == other.State &&
+                this.Smoking == other.Smoking &&
+                this.Flaming == other.Flaming;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.GeneralAppearance"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.PercentComplete << 0);
+            val |= (ushort)((uint)this.Damage << 8);
+            val |= (ushort)((uint)this.Predistributed << 10);
+            val |= (ushort)((uint)this.State << 11);
+            val |= (ushort)((uint)this.Smoking << 12);
+            val |= (ushort)((uint)this.Flaming << 13);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.PercentComplete.GetHashCode();
+                hash = (hash * 29) + this.Damage.GetHashCode();
+                hash = (hash * 29) + this.Predistributed.GetHashCode();
+                hash = (hash * 29) + this.State.GetHashCode();
+                hash = (hash * 29) + this.Smoking.GetHashCode();
+                hash = (hash * 29) + this.Flaming.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
index 3e060e1..5387d51 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/LinearObjectStatePDUModificationField.cs
@@ -1,50 +1,50 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for LinearObjectStatePDUModificationField (env.obj.mod.linear, Linear Object State PDU Modification Field, 
-    /// section 12.1.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum LinearObjectStatePDUModificationField : byte
-    {
-        /// <summary>
-        /// Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.")]
-        Location = 1,
-
-        /// <summary>
-        /// Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.")]
-        Orientation = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for LinearObjectStatePDUModificationField (env.obj.mod.linear, Linear Object State PDU Modification Field, 
+    /// section 12.1.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum LinearObjectStatePDUModificationField : byte
+    {
+        /// <summary>
+        /// Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.")]
+        Location = 1,
+
+        /// <summary>
+        /// Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.")]
+        Orientation = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
index 4dc671d..01a0775 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs
@@ -1,253 +1,253 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for LogCribAbatisVehicleDefiladeAndInfantryFightingPosition (env.obj.appear.point.breach, Log crib, Abatis, Vehicle defilade, and Infantry fighting position, 
-    /// section 12.1.2.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct LogCribAbatisVehicleDefiladeAndInfantryFightingPosition
-    {
-        /// <summary>
-        /// Describes the breached appearance of the object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the breached appearance of the object")]
-        public enum BreachValue : uint
-        {
-            /// <summary>
-            /// No breaching
-            /// </summary>
-            NoBreaching = 0,
-
-            /// <summary>
-            /// Breached
-            /// </summary>
-            Breached = 1,
-
-            /// <summary>
-            /// Cleared
-            /// </summary>
-            Cleared = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        private LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.BreachValue breach;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition left, LogCribAbatisVehicleDefiladeAndInfantryFightingPosition right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition left, LogCribAbatisVehicleDefiladeAndInfantryFightingPosition right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator LogCribAbatisVehicleDefiladeAndInfantryFightingPosition(uint value)
-        {
-            return LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static LogCribAbatisVehicleDefiladeAndInfantryFightingPosition FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance, represented by the uint value.</returns>
-        public static LogCribAbatisVehicleDefiladeAndInfantryFightingPosition FromUInt32(uint value)
-        {
-            LogCribAbatisVehicleDefiladeAndInfantryFightingPosition ps = new LogCribAbatisVehicleDefiladeAndInfantryFightingPosition();
-
-            uint mask0 = 0x30000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Breach = (LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.BreachValue)newValue0;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the breach.
-        /// </summary>
-        /// <value>The breach.</value>
-        public LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.BreachValue Breach
-        {
-            get { return this.breach; }
-            set { this.breach = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is LogCribAbatisVehicleDefiladeAndInfantryFightingPosition))
-            {
-                return false;
-            }
-
-            return this.Equals((LogCribAbatisVehicleDefiladeAndInfantryFightingPosition)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Breach == other.Breach;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Breach << 16);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Breach.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for LogCribAbatisVehicleDefiladeAndInfantryFightingPosition (env.obj.appear.point.breach, Log crib, Abatis, Vehicle defilade, and Infantry fighting position, 
+    /// section 12.1.2.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct LogCribAbatisVehicleDefiladeAndInfantryFightingPosition
+    {
+        /// <summary>
+        /// Describes the breached appearance of the object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the breached appearance of the object")]
+        public enum BreachValue : uint
+        {
+            /// <summary>
+            /// No breaching
+            /// </summary>
+            NoBreaching = 0,
+
+            /// <summary>
+            /// Breached
+            /// </summary>
+            Breached = 1,
+
+            /// <summary>
+            /// Cleared
+            /// </summary>
+            Cleared = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        private LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.BreachValue breach;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition left, LogCribAbatisVehicleDefiladeAndInfantryFightingPosition right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition left, LogCribAbatisVehicleDefiladeAndInfantryFightingPosition right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator LogCribAbatisVehicleDefiladeAndInfantryFightingPosition(uint value)
+        {
+            return LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static LogCribAbatisVehicleDefiladeAndInfantryFightingPosition FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance, represented by the uint value.</returns>
+        public static LogCribAbatisVehicleDefiladeAndInfantryFightingPosition FromUInt32(uint value)
+        {
+            LogCribAbatisVehicleDefiladeAndInfantryFightingPosition ps = new LogCribAbatisVehicleDefiladeAndInfantryFightingPosition();
+
+            uint mask0 = 0x30000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Breach = (LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.BreachValue)newValue0;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the breach.
+        /// </summary>
+        /// <value>The breach.</value>
+        public LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.BreachValue Breach
+        {
+            get { return this.breach; }
+            set { this.breach = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is LogCribAbatisVehicleDefiladeAndInfantryFightingPosition))
+            {
+                return false;
+            }
+
+            return this.Equals((LogCribAbatisVehicleDefiladeAndInfantryFightingPosition)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LogCribAbatisVehicleDefiladeAndInfantryFightingPosition other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Breach == other.Breach;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.LogCribAbatisVehicleDefiladeAndInfantryFightingPosition"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Breach << 16);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Breach.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/Minefield.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/Minefield.cs
index da5a83e..778cc7a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/Minefield.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/Minefield.cs
@@ -1,272 +1,272 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for Minefield (env.obj.appear.areal.minefield, Minefield, 
-    /// section 12.1.2.4.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct Minefield
-    {
-        /// <summary>
-        /// Describes the breached appearance of the object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the breached appearance of the object")]
-        public enum BreachValue : uint
-        {
-            /// <summary>
-            /// No breaching
-            /// </summary>
-            NoBreaching = 0,
-
-            /// <summary>
-            /// Breached
-            /// </summary>
-            Breached = 1,
-
-            /// <summary>
-            /// Cleared
-            /// </summary>
-            Cleared = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        private Minefield.BreachValue breach;
-        private int mineCount;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(Minefield left, Minefield right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(Minefield left, Minefield right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(Minefield obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Minefield(uint value)
-        {
-            return Minefield.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static Minefield FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance, represented by the uint value.</returns>
-        public static Minefield FromUInt32(uint value)
-        {
-            Minefield ps = new Minefield();
-
-            uint mask0 = 0x30000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Breach = (Minefield.BreachValue)newValue0;
-
-            uint mask2 = 0x80000000;
-            byte shift2 = 31;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.MineCount = (int)newValue2;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the breach.
-        /// </summary>
-        /// <value>The breach.</value>
-        public Minefield.BreachValue Breach
-        {
-            get { return this.breach; }
-            set { this.breach = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the minecount.
-        /// </summary>
-        /// <value>The minecount.</value>
-        public int MineCount
-        {
-            get { return this.mineCount; }
-            set { this.mineCount = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is Minefield))
-            {
-                return false;
-            }
-
-            return this.Equals((Minefield)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(Minefield other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Breach == other.Breach &&
-                this.MineCount == other.MineCount;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Breach << 16);
-            val |= (uint)((uint)this.MineCount << 31);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Breach.GetHashCode();
-                hash = (hash * 29) + this.MineCount.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for Minefield (env.obj.appear.areal.minefield, Minefield, 
+    /// section 12.1.2.4.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct Minefield
+    {
+        /// <summary>
+        /// Describes the breached appearance of the object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the breached appearance of the object")]
+        public enum BreachValue : uint
+        {
+            /// <summary>
+            /// No breaching
+            /// </summary>
+            NoBreaching = 0,
+
+            /// <summary>
+            /// Breached
+            /// </summary>
+            Breached = 1,
+
+            /// <summary>
+            /// Cleared
+            /// </summary>
+            Cleared = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        private Minefield.BreachValue breach;
+        private int mineCount;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Minefield left, Minefield right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Minefield left, Minefield right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(Minefield obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Minefield(uint value)
+        {
+            return Minefield.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static Minefield FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance, represented by the uint value.</returns>
+        public static Minefield FromUInt32(uint value)
+        {
+            Minefield ps = new Minefield();
+
+            uint mask0 = 0x30000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Breach = (Minefield.BreachValue)newValue0;
+
+            uint mask2 = 0x80000000;
+            byte shift2 = 31;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.MineCount = (int)newValue2;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the breach.
+        /// </summary>
+        /// <value>The breach.</value>
+        public Minefield.BreachValue Breach
+        {
+            get { return this.breach; }
+            set { this.breach = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the minecount.
+        /// </summary>
+        /// <value>The minecount.</value>
+        public int MineCount
+        {
+            get { return this.mineCount; }
+            set { this.mineCount = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is Minefield))
+            {
+                return false;
+            }
+
+            return this.Equals((Minefield)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Minefield other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Breach == other.Breach &&
+                this.MineCount == other.MineCount;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.Minefield"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Breach << 16);
+            val |= (uint)((uint)this.MineCount << 31);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Breach.GetHashCode();
+                hash = (hash * 29) + this.MineCount.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
index b743e0e..569b4f1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/MinefieldLaneMarker.cs
@@ -1,253 +1,253 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for MinefieldLaneMarker (env.obj.appear.linear.marker, Minefield Lane Marker, 
-    /// section 12.1.2.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct MinefieldLaneMarker
-    {
-        /// <summary>
-        /// Describes the side of the lane marker which is visible.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the side of the lane marker which is visible.")]
-        public enum VisibleSideValue : uint
-        {
-            /// <summary>
-            /// Left side is visible
-            /// </summary>
-            LeftSideIsVisible = 0,
-
-            /// <summary>
-            /// Right side is visible
-            /// </summary>
-            RightSideIsVisible = 1,
-
-            /// <summary>
-            /// Both sides are visible
-            /// </summary>
-            BothSidesAreVisible = 2,
-
-            /// <summary>
-            /// null
-            /// </summary>
-            Unknown = 3
-        }
-
-        private MinefieldLaneMarker.VisibleSideValue visibleSide;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(MinefieldLaneMarker left, MinefieldLaneMarker right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(MinefieldLaneMarker left, MinefieldLaneMarker right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(MinefieldLaneMarker obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator MinefieldLaneMarker(uint value)
-        {
-            return MinefieldLaneMarker.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static MinefieldLaneMarker FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance, represented by the uint value.</returns>
-        public static MinefieldLaneMarker FromUInt32(uint value)
-        {
-            MinefieldLaneMarker ps = new MinefieldLaneMarker();
-
-            uint mask0 = 0x30000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.VisibleSide = (MinefieldLaneMarker.VisibleSideValue)newValue0;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the visibleside.
-        /// </summary>
-        /// <value>The visibleside.</value>
-        public MinefieldLaneMarker.VisibleSideValue VisibleSide
-        {
-            get { return this.visibleSide; }
-            set { this.visibleSide = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is MinefieldLaneMarker))
-            {
-                return false;
-            }
-
-            return this.Equals((MinefieldLaneMarker)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(MinefieldLaneMarker other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.VisibleSide == other.VisibleSide;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.VisibleSide << 16);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.VisibleSide.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for MinefieldLaneMarker (env.obj.appear.linear.marker, Minefield Lane Marker, 
+    /// section 12.1.2.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct MinefieldLaneMarker
+    {
+        /// <summary>
+        /// Describes the side of the lane marker which is visible.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the side of the lane marker which is visible.")]
+        public enum VisibleSideValue : uint
+        {
+            /// <summary>
+            /// Left side is visible
+            /// </summary>
+            LeftSideIsVisible = 0,
+
+            /// <summary>
+            /// Right side is visible
+            /// </summary>
+            RightSideIsVisible = 1,
+
+            /// <summary>
+            /// Both sides are visible
+            /// </summary>
+            BothSidesAreVisible = 2,
+
+            /// <summary>
+            /// null
+            /// </summary>
+            Unknown = 3
+        }
+
+        private MinefieldLaneMarker.VisibleSideValue visibleSide;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldLaneMarker left, MinefieldLaneMarker right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldLaneMarker left, MinefieldLaneMarker right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(MinefieldLaneMarker obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator MinefieldLaneMarker(uint value)
+        {
+            return MinefieldLaneMarker.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static MinefieldLaneMarker FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance, represented by the uint value.</returns>
+        public static MinefieldLaneMarker FromUInt32(uint value)
+        {
+            MinefieldLaneMarker ps = new MinefieldLaneMarker();
+
+            uint mask0 = 0x30000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.VisibleSide = (MinefieldLaneMarker.VisibleSideValue)newValue0;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the visibleside.
+        /// </summary>
+        /// <value>The visibleside.</value>
+        public MinefieldLaneMarker.VisibleSideValue VisibleSide
+        {
+            get { return this.visibleSide; }
+            set { this.visibleSide = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is MinefieldLaneMarker))
+            {
+                return false;
+            }
+
+            return this.Equals((MinefieldLaneMarker)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldLaneMarker other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.VisibleSide == other.VisibleSide;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.MinefieldLaneMarker"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.VisibleSide << 16);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.VisibleSide.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/ObjectKind.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/ObjectKind.cs
index aeed184..96c4142 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/ObjectKind.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/ObjectKind.cs
@@ -1,109 +1,109 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for ObjectKind (env.obj.objecttype.kind, Object Kind, 
-    /// section 12.1.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ObjectKind : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Obstacle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Obstacle.")]
-        Obstacle = 1,
-
-        /// <summary>
-        /// Prepared position.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Prepared position.")]
-        PreparedPosition = 2,
-
-        /// <summary>
-        /// Cultural feature.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cultural feature.")]
-        CulturalFeature = 3,
-
-        /// <summary>
-        /// Passageway.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Passageway.")]
-        Passageway = 4,
-
-        /// <summary>
-        /// Tactical smoke.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical smoke.")]
-        TacticalSmoke = 5,
-
-        /// <summary>
-        /// Obstacle marker.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Obstacle marker.")]
-        ObstacleMarker = 6,
-
-        /// <summary>
-        /// Obstacle breach.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Obstacle breach.")]
-        ObstacleBreach = 7
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for ObjectKind (env.obj.objecttype.kind, Object Kind, 
+    /// section 12.1.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ObjectKind : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Obstacle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Obstacle.")]
+        Obstacle = 1,
+
+        /// <summary>
+        /// Prepared position.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Prepared position.")]
+        PreparedPosition = 2,
+
+        /// <summary>
+        /// Cultural feature.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cultural feature.")]
+        CulturalFeature = 3,
+
+        /// <summary>
+        /// Passageway.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Passageway.")]
+        Passageway = 4,
+
+        /// <summary>
+        /// Tactical smoke.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical smoke.")]
+        TacticalSmoke = 5,
+
+        /// <summary>
+        /// Obstacle marker.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Obstacle marker.")]
+        ObstacleMarker = 6,
+
+        /// <summary>
+        /// Obstacle breach.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Obstacle breach.")]
+        ObstacleBreach = 7
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
index 71d261a..1a52fff 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/PointObjectStatePDUModificationField.cs
@@ -1,50 +1,50 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for PointObjectStatePDUModificationField (env.obj.mod.point, Point Object State PDU Modification Field, 
-    /// section 12.1.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum PointObjectStatePDUModificationField : byte
-    {
-        /// <summary>
-        /// Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.")]
-        Location = 1,
-
-        /// <summary>
-        /// Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.")]
-        Orientation = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for PointObjectStatePDUModificationField (env.obj.mod.point, Point Object State PDU Modification Field, 
+    /// section 12.1.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum PointObjectStatePDUModificationField : byte
+    {
+        /// <summary>
+        /// Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Location has been modified', reset bit means 'Location has not been modified'.")]
+        Location = 1,
+
+        /// <summary>
+        /// Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set bit means 'Orientation has been modified', reset bit means 'Orientation has not been modified'.")]
+        Orientation = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/RibbonBridge.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/RibbonBridge.cs
index 5e0ef36..3aaa88b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/RibbonBridge.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/RibbonBridge.cs
@@ -1,222 +1,222 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for RibbonBridge (env.obj.appear.point.bridge, Ribbon Bridge, 
-    /// section 12.1.2.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct RibbonBridge
-    {
-        private byte numOfSegments;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RibbonBridge left, RibbonBridge right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RibbonBridge left, RibbonBridge right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(RibbonBridge obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator RibbonBridge(uint value)
-        {
-            return RibbonBridge.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static RibbonBridge FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance, represented by the uint value.</returns>
-        public static RibbonBridge FromUInt32(uint value)
-        {
-            RibbonBridge ps = new RibbonBridge();
-
-            uint mask0 = 0xff0000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.NumOfSegments = (byte)newValue0;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the numofsegments.
-        /// </summary>
-        /// <value>The numofsegments.</value>
-        public byte NumOfSegments
-        {
-            get { return this.numOfSegments; }
-            set { this.numOfSegments = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is RibbonBridge))
-            {
-                return false;
-            }
-
-            return this.Equals((RibbonBridge)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RibbonBridge other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.NumOfSegments == other.NumOfSegments;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.NumOfSegments << 16);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.NumOfSegments.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for RibbonBridge (env.obj.appear.point.bridge, Ribbon Bridge, 
+    /// section 12.1.2.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct RibbonBridge
+    {
+        private byte numOfSegments;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RibbonBridge left, RibbonBridge right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RibbonBridge left, RibbonBridge right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(RibbonBridge obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator RibbonBridge(uint value)
+        {
+            return RibbonBridge.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static RibbonBridge FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance, represented by the uint value.</returns>
+        public static RibbonBridge FromUInt32(uint value)
+        {
+            RibbonBridge ps = new RibbonBridge();
+
+            uint mask0 = 0xff0000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.NumOfSegments = (byte)newValue0;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the numofsegments.
+        /// </summary>
+        /// <value>The numofsegments.</value>
+        public byte NumOfSegments
+        {
+            get { return this.numOfSegments; }
+            set { this.numOfSegments = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is RibbonBridge))
+            {
+                return false;
+            }
+
+            return this.Equals((RibbonBridge)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RibbonBridge other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.NumOfSegments == other.NumOfSegments;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.RibbonBridge"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.NumOfSegments << 16);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.NumOfSegments.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
rename to Libs/CsharpDis6/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
index 4ce7cb7..382353a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.ObjectState/TankDitchAndConcertinaWire.cs
@@ -1,312 +1,312 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.ObjectState
-{
-    /// <summary>
-    /// Enumeration values for TankDitchAndConcertinaWire (env.obj.appear.linear.tankditch, Tank ditch, and Concertina Wire, 
-    /// section 12.1.2.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct TankDitchAndConcertinaWire
-    {
-        /// <summary>
-        /// Describes the breached appearance of the object
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Describes the breached appearance of the object")]
-        public enum BreachValue : uint
-        {
-            /// <summary>
-            /// No breaching
-            /// </summary>
-            NoBreaching = 0,
-
-            /// <summary>
-            /// Slight breaching
-            /// </summary>
-            SlightBreaching = 1,
-
-            /// <summary>
-            /// Moderate breached
-            /// </summary>
-            ModerateBreached = 2,
-
-            /// <summary>
-            /// Cleared
-            /// </summary>
-            Cleared = 3
-        }
-
-        /// <summary>
-        /// Each bit indicates whether its associated segment is breached or not. Bit 40+i indicates whether the portion of the segment beginning at the segment origin + (i*Breach Length) and extending i* Breach Length meters is breached or not. For each bit:
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Each bit indicates whether its associated segment is breached or not. Bit 40+i indicates whether the portion of the segment beginning at the segment origin + (i*Breach Length) and extending i* Breach Length meters is breached or not. For each bit:")]
-        public enum BreachLocationValue : uint
-        {
-            /// <summary>
-            /// Associated portion of segment is not breached
-            /// </summary>
-            AssociatedPortionOfSegmentIsNotBreached = 0,
-
-            /// <summary>
-            /// Associated portion of segment is breached
-            /// </summary>
-            AssociatedPortionOfSegmentIsBreached = 1
-        }
-
-        private TankDitchAndConcertinaWire.BreachValue breach;
-        private byte breachLength;
-        private TankDitchAndConcertinaWire.BreachLocationValue breachLocation;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(TankDitchAndConcertinaWire left, TankDitchAndConcertinaWire right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(TankDitchAndConcertinaWire left, TankDitchAndConcertinaWire right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> to <see cref="System.UInt32"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator uint(TankDitchAndConcertinaWire obj)
-        {
-            return obj.ToUInt32();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/>.
-        /// </summary>
-        /// <param name="value">The uint value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator TankDitchAndConcertinaWire(uint value)
-        {
-            return TankDitchAndConcertinaWire.FromUInt32(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static TankDitchAndConcertinaWire FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 4 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt32(BitConverter.ToUInt32(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance from the uint value.
-        /// </summary>
-        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance, represented by the uint value.</returns>
-        public static TankDitchAndConcertinaWire FromUInt32(uint value)
-        {
-            TankDitchAndConcertinaWire ps = new TankDitchAndConcertinaWire();
-
-            uint mask0 = 0x30000;
-            byte shift0 = 16;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.Breach = (TankDitchAndConcertinaWire.BreachValue)newValue0;
-
-            uint mask2 = 0x00ff;
-            byte shift2 = 32;
-            uint newValue2 = (value & mask2) >> shift2;
-            ps.BreachLength = (byte)newValue2;
-
-            uint mask3 = 0xff00;
-            byte shift3 = 40;
-            uint newValue3 = (value & mask3) >> shift3;
-            ps.BreachLocation = (TankDitchAndConcertinaWire.BreachLocationValue)newValue3;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the breach.
-        /// </summary>
-        /// <value>The breach.</value>
-        public TankDitchAndConcertinaWire.BreachValue Breach
-        {
-            get { return this.breach; }
-            set { this.breach = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the breachlength.
-        /// </summary>
-        /// <value>The breachlength.</value>
-        public byte BreachLength
-        {
-            get { return this.breachLength; }
-            set { this.breachLength = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the breachlocation.
-        /// </summary>
-        /// <value>The breachlocation.</value>
-        public TankDitchAndConcertinaWire.BreachLocationValue BreachLocation
-        {
-            get { return this.breachLocation; }
-            set { this.breachLocation = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is TankDitchAndConcertinaWire))
-            {
-                return false;
-            }
-
-            return this.Equals((TankDitchAndConcertinaWire)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(TankDitchAndConcertinaWire other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.Breach == other.Breach &&
-                this.BreachLength == other.BreachLength &&
-                this.BreachLocation == other.BreachLocation;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt32());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> to the uint value.
-        /// </summary>
-        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance.</returns>
-        public uint ToUInt32()
-        {
-            uint val = 0;
-
-            val |= (uint)((uint)this.Breach << 16);
-            val |= (uint)((uint)this.BreachLength << 32);
-            val |= (uint)((uint)this.BreachLocation << 40);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.Breach.GetHashCode();
-                hash = (hash * 29) + this.BreachLength.GetHashCode();
-                hash = (hash * 29) + this.BreachLocation.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.ObjectState
+{
+    /// <summary>
+    /// Enumeration values for TankDitchAndConcertinaWire (env.obj.appear.linear.tankditch, Tank ditch, and Concertina Wire, 
+    /// section 12.1.2.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct TankDitchAndConcertinaWire
+    {
+        /// <summary>
+        /// Describes the breached appearance of the object
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Describes the breached appearance of the object")]
+        public enum BreachValue : uint
+        {
+            /// <summary>
+            /// No breaching
+            /// </summary>
+            NoBreaching = 0,
+
+            /// <summary>
+            /// Slight breaching
+            /// </summary>
+            SlightBreaching = 1,
+
+            /// <summary>
+            /// Moderate breached
+            /// </summary>
+            ModerateBreached = 2,
+
+            /// <summary>
+            /// Cleared
+            /// </summary>
+            Cleared = 3
+        }
+
+        /// <summary>
+        /// Each bit indicates whether its associated segment is breached or not. Bit 40+i indicates whether the portion of the segment beginning at the segment origin + (i*Breach Length) and extending i* Breach Length meters is breached or not. For each bit:
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Each bit indicates whether its associated segment is breached or not. Bit 40+i indicates whether the portion of the segment beginning at the segment origin + (i*Breach Length) and extending i* Breach Length meters is breached or not. For each bit:")]
+        public enum BreachLocationValue : uint
+        {
+            /// <summary>
+            /// Associated portion of segment is not breached
+            /// </summary>
+            AssociatedPortionOfSegmentIsNotBreached = 0,
+
+            /// <summary>
+            /// Associated portion of segment is breached
+            /// </summary>
+            AssociatedPortionOfSegmentIsBreached = 1
+        }
+
+        private TankDitchAndConcertinaWire.BreachValue breach;
+        private byte breachLength;
+        private TankDitchAndConcertinaWire.BreachLocationValue breachLocation;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TankDitchAndConcertinaWire left, TankDitchAndConcertinaWire right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TankDitchAndConcertinaWire left, TankDitchAndConcertinaWire right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> to <see cref="System.UInt32"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator uint(TankDitchAndConcertinaWire obj)
+        {
+            return obj.ToUInt32();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt32"/> to <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/>.
+        /// </summary>
+        /// <param name="value">The uint value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator TankDitchAndConcertinaWire(uint value)
+        {
+            return TankDitchAndConcertinaWire.FromUInt32(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static TankDitchAndConcertinaWire FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 4 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt32(BitConverter.ToUInt32(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance from the uint value.
+        /// </summary>
+        /// <param name="value">The uint value which represents the <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance, represented by the uint value.</returns>
+        public static TankDitchAndConcertinaWire FromUInt32(uint value)
+        {
+            TankDitchAndConcertinaWire ps = new TankDitchAndConcertinaWire();
+
+            uint mask0 = 0x30000;
+            byte shift0 = 16;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.Breach = (TankDitchAndConcertinaWire.BreachValue)newValue0;
+
+            uint mask2 = 0x00ff;
+            byte shift2 = 32;
+            uint newValue2 = (value & mask2) >> shift2;
+            ps.BreachLength = (byte)newValue2;
+
+            uint mask3 = 0xff00;
+            byte shift3 = 40;
+            uint newValue3 = (value & mask3) >> shift3;
+            ps.BreachLocation = (TankDitchAndConcertinaWire.BreachLocationValue)newValue3;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the breach.
+        /// </summary>
+        /// <value>The breach.</value>
+        public TankDitchAndConcertinaWire.BreachValue Breach
+        {
+            get { return this.breach; }
+            set { this.breach = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the breachlength.
+        /// </summary>
+        /// <value>The breachlength.</value>
+        public byte BreachLength
+        {
+            get { return this.breachLength; }
+            set { this.breachLength = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the breachlocation.
+        /// </summary>
+        /// <value>The breachlocation.</value>
+        public TankDitchAndConcertinaWire.BreachLocationValue BreachLocation
+        {
+            get { return this.breachLocation; }
+            set { this.breachLocation = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is TankDitchAndConcertinaWire))
+            {
+                return false;
+            }
+
+            return this.Equals((TankDitchAndConcertinaWire)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TankDitchAndConcertinaWire other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.Breach == other.Breach &&
+                this.BreachLength == other.BreachLength &&
+                this.BreachLocation == other.BreachLocation;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt32());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> to the uint value.
+        /// </summary>
+        /// <returns>The uint value representing the current <see cref="OpenDis.Enumerations.Environment.ObjectState.TankDitchAndConcertinaWire"/> instance.</returns>
+        public uint ToUInt32()
+        {
+            uint val = 0;
+
+            val |= (uint)((uint)this.Breach << 16);
+            val |= (uint)((uint)this.BreachLength << 32);
+            val |= (uint)((uint)this.BreachLocation << 40);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.Breach.GetHashCode();
+                hash = (hash * 29) + this.BreachLength.GetHashCode();
+                hash = (hash * 29) + this.BreachLocation.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs b/Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs
rename to Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentStatus.cs
index 5328832..427b7b9 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentStatus.cs
@@ -1,50 +1,50 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.Process
-{
-    /// <summary>
-    /// Enumeration values for EnvironmentStatus (env.process.environmentstatus, Environment Status, 
-    /// section 12.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum EnvironmentStatus : byte
-    {
-        /// <summary>
-        /// Indicates that the current PDU shall be the last PDU for the specified process
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Indicates that the current PDU shall be the last PDU for the specified process")]
-        Last = 1,
-
-        /// <summary>
-        /// Indicates that the specified environmental process is active
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Indicates that the specified environmental process is active")]
-        On = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.Process
+{
+    /// <summary>
+    /// Enumeration values for EnvironmentStatus (env.process.environmentstatus, Environment Status, 
+    /// section 12.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum EnvironmentStatus : byte
+    {
+        /// <summary>
+        /// Indicates that the current PDU shall be the last PDU for the specified process
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Indicates that the current PDU shall be the last PDU for the specified process")]
+        Last = 1,
+
+        /// <summary>
+        /// Indicates that the specified environmental process is active
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Indicates that the specified environmental process is active")]
+        On = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs b/Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
rename to Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
index 13ac167..fae01ca 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentalProcessTypesForGeometryRecord.cs
@@ -1,199 +1,199 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.Process
-{
-    /// <summary>
-    /// Enumeration values for EnvironmentalProcessTypesForGeometryRecord (env.process.type.geometryrecord, Type field values for Geometry record, 
-    /// section 12.3.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EnvironmentalProcessTypesForGeometryRecord : uint
-    {
-        /// <summary>
-        /// Point Record 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Point Record 1.")]
-        PointRecord1 = 655360,
-
-        /// <summary>
-        /// Point Record 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Point Record 2.")]
-        PointRecord2 = 167772160,
-
-        /// <summary>
-        /// Line Record 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Line Record 1.")]
-        LineRecord1 = 786432,
-
-        /// <summary>
-        /// Line Record 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Line Record 2.")]
-        LineRecord2 = 201326592,
-
-        /// <summary>
-        /// Bounding Sphere Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bounding Sphere Record.")]
-        BoundingSphereRecord = 65536,
-
-        /// <summary>
-        /// Sphere Record 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sphere Record 1.")]
-        SphereRecord1 = 851968,
-
-        /// <summary>
-        /// Sphere Record 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sphere Record 2.")]
-        SphereRecord2 = 218103808,
-
-        /// <summary>
-        /// Ellipsoid Record 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ellipsoid Record 1.")]
-        EllipsoidRecord1 = 1048576,
-
-        /// <summary>
-        /// Ellipsoid Record 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ellipsoid Record 2.")]
-        EllipsoidRecord2 = 268435456,
-
-        /// <summary>
-        /// Cone Record 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cone Record 1.")]
-        ConeRecord1 = 3145728,
-
-        /// <summary>
-        /// Cone Record 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cone Record 2.")]
-        ConeRecord2 = 805306368,
-
-        /// <summary>
-        /// Uniform Geometry Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Uniform Geometry Record.")]
-        UniformGeometryRecord = 327680,
-
-        /// <summary>
-        /// Rectangular Volume Record 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rectangular Volume Record 1.")]
-        RectangularVolumeRecord1 = 5242880,
-
-        /// <summary>
-        /// Rectangular Volume Record 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rectangular Volume Record 2.")]
-        RectangularVolumeRecord2 = 1342177280,
-
-        /// <summary>
-        /// Gaussian Plume Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gaussian Plume Record.")]
-        GaussianPlumeRecord = 1610612736,
-
-        /// <summary>
-        /// Gaussian Puff Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gaussian Puff Record.")]
-        GaussianPuffRecord = 1879048192,
-
-        /// <summary>
-        /// Rectangular Volume Record 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rectangular Volume Record 3.")]
-        RectangularVolumeRecord3 = 83886080
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.Process
+{
+    /// <summary>
+    /// Enumeration values for EnvironmentalProcessTypesForGeometryRecord (env.process.type.geometryrecord, Type field values for Geometry record, 
+    /// section 12.3.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EnvironmentalProcessTypesForGeometryRecord : uint
+    {
+        /// <summary>
+        /// Point Record 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Point Record 1.")]
+        PointRecord1 = 655360,
+
+        /// <summary>
+        /// Point Record 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Point Record 2.")]
+        PointRecord2 = 167772160,
+
+        /// <summary>
+        /// Line Record 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Line Record 1.")]
+        LineRecord1 = 786432,
+
+        /// <summary>
+        /// Line Record 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Line Record 2.")]
+        LineRecord2 = 201326592,
+
+        /// <summary>
+        /// Bounding Sphere Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bounding Sphere Record.")]
+        BoundingSphereRecord = 65536,
+
+        /// <summary>
+        /// Sphere Record 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sphere Record 1.")]
+        SphereRecord1 = 851968,
+
+        /// <summary>
+        /// Sphere Record 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sphere Record 2.")]
+        SphereRecord2 = 218103808,
+
+        /// <summary>
+        /// Ellipsoid Record 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ellipsoid Record 1.")]
+        EllipsoidRecord1 = 1048576,
+
+        /// <summary>
+        /// Ellipsoid Record 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ellipsoid Record 2.")]
+        EllipsoidRecord2 = 268435456,
+
+        /// <summary>
+        /// Cone Record 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cone Record 1.")]
+        ConeRecord1 = 3145728,
+
+        /// <summary>
+        /// Cone Record 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cone Record 2.")]
+        ConeRecord2 = 805306368,
+
+        /// <summary>
+        /// Uniform Geometry Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Uniform Geometry Record.")]
+        UniformGeometryRecord = 327680,
+
+        /// <summary>
+        /// Rectangular Volume Record 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rectangular Volume Record 1.")]
+        RectangularVolumeRecord1 = 5242880,
+
+        /// <summary>
+        /// Rectangular Volume Record 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rectangular Volume Record 2.")]
+        RectangularVolumeRecord2 = 1342177280,
+
+        /// <summary>
+        /// Gaussian Plume Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gaussian Plume Record.")]
+        GaussianPlumeRecord = 1610612736,
+
+        /// <summary>
+        /// Gaussian Puff Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gaussian Puff Record.")]
+        GaussianPuffRecord = 1879048192,
+
+        /// <summary>
+        /// Rectangular Volume Record 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rectangular Volume Record 3.")]
+        RectangularVolumeRecord3 = 83886080
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs b/Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
rename to Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
index ff57a51..a107538 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
+++ b/Libs/CsharpDis6/Enumerations/Environment.Process/EnvironmentalProcessTypesForStateRecord.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Environment.Process
-{
-    /// <summary>
-    /// Enumeration values for EnvironmentalProcessTypesForStateRecord (env.process.type.staterecord, Type field values for State record, 
-    /// section 12.3.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EnvironmentalProcessTypesForStateRecord : uint
-    {
-        /// <summary>
-        /// COMBIC State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("COMBIC State.")]
-        COMBICState = 256,
-
-        /// <summary>
-        /// Flare State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flare State.")]
-        FlareState = 259
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Environment.Process
+{
+    /// <summary>
+    /// Enumeration values for EnvironmentalProcessTypesForStateRecord (env.process.type.staterecord, Type field values for State record, 
+    /// section 12.3.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EnvironmentalProcessTypesForStateRecord : uint
+    {
+        /// <summary>
+        /// COMBIC State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("COMBIC State.")]
+        COMBICState = 256,
+
+        /// <summary>
+        /// Flare State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flare State.")]
+        FlareState = 259
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
index 520d528..e942071 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/AuxilaryCraftRepairCode.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for AuxilaryCraftRepairCode (log.repaircomplete.auxilary, Auxiliary craft, 
-    /// section 6.2.10)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AuxilaryCraftRepairCode : ushort
-    {
-        /// <summary>
-        /// life boats.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("life boats.")]
-        LifeBoats = 10000,
-
-        /// <summary>
-        /// landing craft.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("landing craft.")]
-        LandingCraft = 10010,
-
-        /// <summary>
-        /// ejection seats.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ejection seats.")]
-        EjectionSeats = 10020
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for AuxilaryCraftRepairCode (log.repaircomplete.auxilary, Auxiliary craft, 
+    /// section 6.2.10)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AuxilaryCraftRepairCode : ushort
+    {
+        /// <summary>
+        /// life boats.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("life boats.")]
+        LifeBoats = 10000,
+
+        /// <summary>
+        /// landing craft.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("landing craft.")]
+        LandingCraft = 10010,
+
+        /// <summary>
+        /// ejection seats.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ejection seats.")]
+        EjectionSeats = 10020
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/DriveTrainRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/DriveTrainRepairCode.cs
index 5d01bd0..8ca401b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/DriveTrainRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/DriveTrainRepairCode.cs
@@ -1,179 +1,179 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for DriveTrainRepairCode (log.repaircomplete.drivetrain, Drive train, 
-    /// section 6.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DriveTrainRepairCode : ushort
-    {
-        /// <summary>
-        /// motor / engine.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("motor / engine.")]
-        MotorEngine = 10,
-
-        /// <summary>
-        /// starter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("starter.")]
-        Starter = 20,
-
-        /// <summary>
-        /// alternator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("alternator.")]
-        Alternator = 30,
-
-        /// <summary>
-        /// generator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("generator.")]
-        Generator = 40,
-
-        /// <summary>
-        /// battery.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("battery.")]
-        Battery = 50,
-
-        /// <summary>
-        /// engine-coolant leak.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("engine-coolant leak.")]
-        EngineCoolantLeak = 60,
-
-        /// <summary>
-        /// fuel filter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("fuel filter.")]
-        FuelFilter = 70,
-
-        /// <summary>
-        /// transmission-oil leak.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("transmission-oil leak.")]
-        TransmissionOilLeak = 80,
-
-        /// <summary>
-        /// engine-oil leak.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("engine-oil leak.")]
-        EngineOilLeak = 90,
-
-        /// <summary>
-        /// pumps.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("pumps.")]
-        Pumps = 100,
-
-        /// <summary>
-        /// filters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("filters.")]
-        Filters = 110,
-
-        /// <summary>
-        /// transmission.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("transmission.")]
-        Transmission = 120,
-
-        /// <summary>
-        /// brakes.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("brakes.")]
-        Brakes = 130,
-
-        /// <summary>
-        /// suspension system.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("suspension system.")]
-        SuspensionSystem = 140,
-
-        /// <summary>
-        /// oil filter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("oil filter.")]
-        OilFilter = 150
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for DriveTrainRepairCode (log.repaircomplete.drivetrain, Drive train, 
+    /// section 6.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DriveTrainRepairCode : ushort
+    {
+        /// <summary>
+        /// motor / engine.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("motor / engine.")]
+        MotorEngine = 10,
+
+        /// <summary>
+        /// starter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("starter.")]
+        Starter = 20,
+
+        /// <summary>
+        /// alternator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("alternator.")]
+        Alternator = 30,
+
+        /// <summary>
+        /// generator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("generator.")]
+        Generator = 40,
+
+        /// <summary>
+        /// battery.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("battery.")]
+        Battery = 50,
+
+        /// <summary>
+        /// engine-coolant leak.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("engine-coolant leak.")]
+        EngineCoolantLeak = 60,
+
+        /// <summary>
+        /// fuel filter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("fuel filter.")]
+        FuelFilter = 70,
+
+        /// <summary>
+        /// transmission-oil leak.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("transmission-oil leak.")]
+        TransmissionOilLeak = 80,
+
+        /// <summary>
+        /// engine-oil leak.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("engine-oil leak.")]
+        EngineOilLeak = 90,
+
+        /// <summary>
+        /// pumps.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("pumps.")]
+        Pumps = 100,
+
+        /// <summary>
+        /// filters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("filters.")]
+        Filters = 110,
+
+        /// <summary>
+        /// transmission.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("transmission.")]
+        Transmission = 120,
+
+        /// <summary>
+        /// brakes.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("brakes.")]
+        Brakes = 130,
+
+        /// <summary>
+        /// suspension system.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("suspension system.")]
+        SuspensionSystem = 140,
+
+        /// <summary>
+        /// oil filter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("oil filter.")]
+        OilFilter = 150
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/ElectronicsRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/ElectronicsRepairCode.cs
index 472c756..226e4f5 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ElectronicsRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/ElectronicsRepairCode.cs
@@ -1,269 +1,269 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for ElectronicsRepairCode (log.repaircomplete.electronics, Electronics, 
-    /// section 6.2.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ElectronicsRepairCode : ushort
-    {
-        /// <summary>
-        /// electronic warfare systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("electronic warfare systems.")]
-        ElectronicWarfareSystems = 4500,
-
-        /// <summary>
-        /// detection systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("detection systems.")]
-        DetectionSystems = 4600,
-
-        /// <summary>
-        /// radio frequency.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("radio frequency.")]
-        RadioFrequency = 4610,
-
-        /// <summary>
-        /// microwave.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("microwave.")]
-        Microwave = 4620,
-
-        /// <summary>
-        /// infrared.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("infrared.")]
-        Infrared = 4630,
-
-        /// <summary>
-        /// laser.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("laser.")]
-        Laser = 4640,
-
-        /// <summary>
-        /// range finders.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("range finders.")]
-        RangeFinders = 4700,
-
-        /// <summary>
-        /// range-only radar.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("range-only radar.")]
-        RangeOnlyRadar = 4710,
-
-        /// <summary>
-        /// laser range finder.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("laser range finder.")]
-        LaserRangeFinder = 4720,
-
-        /// <summary>
-        /// electronic systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("electronic systems.")]
-        ElectronicSystems = 4800,
-
-        /// <summary>
-        /// radio frequency.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("radio frequency.")]
-        RadioFrequency_4810 = 4810,
-
-        /// <summary>
-        /// microwave.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("microwave.")]
-        Microwave_4820 = 4820,
-
-        /// <summary>
-        /// infrared.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("infrared.")]
-        Infrared_4830 = 4830,
-
-        /// <summary>
-        /// laser.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("laser.")]
-        Laser_4840 = 4840,
-
-        /// <summary>
-        /// radios.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("radios.")]
-        Radios = 5000,
-
-        /// <summary>
-        /// communication systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("communication systems.")]
-        CommunicationSystems = 5010,
-
-        /// <summary>
-        /// intercoms.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("intercoms.")]
-        Intercoms = 5100,
-
-        /// <summary>
-        /// encoders.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("encoders.")]
-        Encoders = 5200,
-
-        /// <summary>
-        /// encryption devices.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("encryption devices.")]
-        EncryptionDevices = 5250,
-
-        /// <summary>
-        /// decoders.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("decoders.")]
-        Decoders = 5300,
-
-        /// <summary>
-        /// decryption devices.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("decryption devices.")]
-        DecryptionDevices = 5350,
-
-        /// <summary>
-        /// computers.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("computers.")]
-        Computers = 5500,
-
-        /// <summary>
-        /// navigation and control systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("navigation and control systems.")]
-        NavigationAndControlSystems = 6000,
-
-        /// <summary>
-        /// fire control systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("fire control systems.")]
-        FireControlSystems = 6500
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for ElectronicsRepairCode (log.repaircomplete.electronics, Electronics, 
+    /// section 6.2.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ElectronicsRepairCode : ushort
+    {
+        /// <summary>
+        /// electronic warfare systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("electronic warfare systems.")]
+        ElectronicWarfareSystems = 4500,
+
+        /// <summary>
+        /// detection systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("detection systems.")]
+        DetectionSystems = 4600,
+
+        /// <summary>
+        /// radio frequency.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("radio frequency.")]
+        RadioFrequency = 4610,
+
+        /// <summary>
+        /// microwave.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("microwave.")]
+        Microwave = 4620,
+
+        /// <summary>
+        /// infrared.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("infrared.")]
+        Infrared = 4630,
+
+        /// <summary>
+        /// laser.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("laser.")]
+        Laser = 4640,
+
+        /// <summary>
+        /// range finders.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("range finders.")]
+        RangeFinders = 4700,
+
+        /// <summary>
+        /// range-only radar.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("range-only radar.")]
+        RangeOnlyRadar = 4710,
+
+        /// <summary>
+        /// laser range finder.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("laser range finder.")]
+        LaserRangeFinder = 4720,
+
+        /// <summary>
+        /// electronic systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("electronic systems.")]
+        ElectronicSystems = 4800,
+
+        /// <summary>
+        /// radio frequency.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("radio frequency.")]
+        RadioFrequency_4810 = 4810,
+
+        /// <summary>
+        /// microwave.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("microwave.")]
+        Microwave_4820 = 4820,
+
+        /// <summary>
+        /// infrared.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("infrared.")]
+        Infrared_4830 = 4830,
+
+        /// <summary>
+        /// laser.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("laser.")]
+        Laser_4840 = 4840,
+
+        /// <summary>
+        /// radios.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("radios.")]
+        Radios = 5000,
+
+        /// <summary>
+        /// communication systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("communication systems.")]
+        CommunicationSystems = 5010,
+
+        /// <summary>
+        /// intercoms.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("intercoms.")]
+        Intercoms = 5100,
+
+        /// <summary>
+        /// encoders.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("encoders.")]
+        Encoders = 5200,
+
+        /// <summary>
+        /// encryption devices.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("encryption devices.")]
+        EncryptionDevices = 5250,
+
+        /// <summary>
+        /// decoders.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("decoders.")]
+        Decoders = 5300,
+
+        /// <summary>
+        /// decryption devices.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("decryption devices.")]
+        DecryptionDevices = 5350,
+
+        /// <summary>
+        /// computers.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("computers.")]
+        Computers = 5500,
+
+        /// <summary>
+        /// navigation and control systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("navigation and control systems.")]
+        NavigationAndControlSystems = 6000,
+
+        /// <summary>
+        /// fire control systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("fire control systems.")]
+        FireControlSystems = 6500
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/FuelSystemRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/FuelSystemRepairCode.cs
index b197cba..710a767 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/FuelSystemRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/FuelSystemRepairCode.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for FuelSystemRepairCode (log.repaircomplete.fuelsystem, Fuel systems, 
-    /// section 6.2.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum FuelSystemRepairCode : ushort
-    {
-        /// <summary>
-        /// fuel transfer pump.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("fuel transfer pump.")]
-        FuelTransferPump = 4000,
-
-        /// <summary>
-        /// fuel lines.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("fuel lines.")]
-        FuelLines = 4010,
-
-        /// <summary>
-        /// gauges.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("gauges.")]
-        Gauges = 4020,
-
-        /// <summary>
-        /// general fuel system.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("general fuel system.")]
-        GeneralFuelSystem = 4030
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for FuelSystemRepairCode (log.repaircomplete.fuelsystem, Fuel systems, 
+    /// section 6.2.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum FuelSystemRepairCode : ushort
+    {
+        /// <summary>
+        /// fuel transfer pump.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("fuel transfer pump.")]
+        FuelTransferPump = 4000,
+
+        /// <summary>
+        /// fuel lines.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("fuel lines.")]
+        FuelLines = 4010,
+
+        /// <summary>
+        /// gauges.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("gauges.")]
+        Gauges = 4020,
+
+        /// <summary>
+        /// general fuel system.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("general fuel system.")]
+        GeneralFuelSystem = 4030
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/GeneralRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/GeneralRepairCode.cs
index 043db06..3620bd3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/GeneralRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/GeneralRepairCode.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for GeneralRepairCode (log.repaircomplete.general, General repair codes, 
-    /// section 6.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum GeneralRepairCode : ushort
-    {
-        /// <summary>
-        /// no repairs performed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("no repairs performed.")]
-        NoRepairsPerformed = 0,
-
-        /// <summary>
-        /// all requested repairs performed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("all requested repairs performed.")]
-        AllRequestedRepairsPerformed = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for GeneralRepairCode (log.repaircomplete.general, General repair codes, 
+    /// section 6.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum GeneralRepairCode : ushort
+    {
+        /// <summary>
+        /// no repairs performed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("no repairs performed.")]
+        NoRepairsPerformed = 0,
+
+        /// <summary>
+        /// all requested repairs performed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("all requested repairs performed.")]
+        AllRequestedRepairsPerformed = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
index c07e2b6..09f133a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/HullAirframeBodyRepairCode.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for HullAirframeBodyRepairCode (log.repaircomplete.hull, Hull/Airframe/B, 
-    /// section 6.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum HullAirframeBodyRepairCode : ushort
-    {
-        /// <summary>
-        /// hull.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("hull.")]
-        Hull = 1000,
-
-        /// <summary>
-        /// airframe.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("airframe.")]
-        Airframe = 1010,
-
-        /// <summary>
-        /// truck body.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("truck body.")]
-        TruckBody = 1020,
-
-        /// <summary>
-        /// tank body.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("tank body.")]
-        TankBody = 1030,
-
-        /// <summary>
-        /// trailer body.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("trailer body.")]
-        TrailerBody = 1040,
-
-        /// <summary>
-        /// turret.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("turret.")]
-        Turret = 1050
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for HullAirframeBodyRepairCode (log.repaircomplete.hull, Hull/Airframe/B, 
+    /// section 6.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum HullAirframeBodyRepairCode : ushort
+    {
+        /// <summary>
+        /// hull.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("hull.")]
+        Hull = 1000,
+
+        /// <summary>
+        /// airframe.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("airframe.")]
+        Airframe = 1010,
+
+        /// <summary>
+        /// truck body.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("truck body.")]
+        TruckBody = 1020,
+
+        /// <summary>
+        /// tank body.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("tank body.")]
+        TankBody = 1030,
+
+        /// <summary>
+        /// trailer body.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("trailer body.")]
+        TrailerBody = 1040,
+
+        /// <summary>
+        /// turret.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("turret.")]
+        Turret = 1050
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs b/Libs/CsharpDis6/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
index 16e3d6d..4ca15e8 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/HydraulicSystemsAndActuators.cs
@@ -1,89 +1,89 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for HydraulicSystemsAndActuators (log.repaircomplete.hydraulic, Hydraulic systems and actuators, 
-    /// section 6.2.9)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum HydraulicSystemsAndActuators : ushort
-    {
-        /// <summary>
-        /// water supply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("water supply.")]
-        WaterSupply = 9000,
-
-        /// <summary>
-        /// cooling system.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("cooling system.")]
-        CoolingSystem = 9010,
-
-        /// <summary>
-        /// winches.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("winches.")]
-        Winches = 9020,
-
-        /// <summary>
-        /// catapults.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("catapults.")]
-        Catapults = 9030,
-
-        /// <summary>
-        /// cranes.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("cranes.")]
-        Cranes = 9040,
-
-        /// <summary>
-        /// launchers.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("launchers.")]
-        Launchers = 9050
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for HydraulicSystemsAndActuators (log.repaircomplete.hydraulic, Hydraulic systems and actuators, 
+    /// section 6.2.9)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum HydraulicSystemsAndActuators : ushort
+    {
+        /// <summary>
+        /// water supply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("water supply.")]
+        WaterSupply = 9000,
+
+        /// <summary>
+        /// cooling system.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("cooling system.")]
+        CoolingSystem = 9010,
+
+        /// <summary>
+        /// winches.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("winches.")]
+        Winches = 9020,
+
+        /// <summary>
+        /// catapults.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("catapults.")]
+        Catapults = 9030,
+
+        /// <summary>
+        /// cranes.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("cranes.")]
+        Cranes = 9040,
+
+        /// <summary>
+        /// launchers.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("launchers.")]
+        Launchers = 9050
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
index 55d6411..fb4d56a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/InterfacesWithEnvironmentRepairCode.cs
@@ -1,79 +1,79 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for InterfacesWithEnvironmentRepairCode (log.repaircomplete.environment, Interfaces with environment, 
-    /// section 6.2.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum InterfacesWithEnvironmentRepairCode : ushort
-    {
-        /// <summary>
-        /// propeller.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("propeller.")]
-        Propeller = 1500,
-
-        /// <summary>
-        /// filters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("filters.")]
-        Filters = 1520,
-
-        /// <summary>
-        /// wheels.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("wheels.")]
-        Wheels = 1540,
-
-        /// <summary>
-        /// tire.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("tire.")]
-        Tire = 1550,
-
-        /// <summary>
-        /// track.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("track.")]
-        Track = 1560
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for InterfacesWithEnvironmentRepairCode (log.repaircomplete.environment, Interfaces with environment, 
+    /// section 6.2.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum InterfacesWithEnvironmentRepairCode : ushort
+    {
+        /// <summary>
+        /// propeller.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("propeller.")]
+        Propeller = 1500,
+
+        /// <summary>
+        /// filters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("filters.")]
+        Filters = 1520,
+
+        /// <summary>
+        /// wheels.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("wheels.")]
+        Wheels = 1540,
+
+        /// <summary>
+        /// tire.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("tire.")]
+        Tire = 1550,
+
+        /// <summary>
+        /// track.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("track.")]
+        Track = 1560
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/LifeSupportRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/LifeSupportRepairCode.cs
index 1b4f866..9e5f2b0 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/LifeSupportRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/LifeSupportRepairCode.cs
@@ -1,99 +1,99 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for LifeSupportRepairCode (log.repaircomplete.lifesupport, Life support systems, 
-    /// section 6.2.8)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum LifeSupportRepairCode : ushort
-    {
-        /// <summary>
-        /// air supply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("air supply.")]
-        AirSupply = 8000,
-
-        /// <summary>
-        /// filters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("filters.")]
-        Filters = 8010,
-
-        /// <summary>
-        /// water supply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("water supply.")]
-        WaterSupply = 8020,
-
-        /// <summary>
-        /// refrigeration system.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("refrigeration system.")]
-        RefrigerationSystem = 8030,
-
-        /// <summary>
-        /// chemical, biological, and radiological protection.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("chemical, biological, and radiological protection.")]
-        ChemicalBiologicalAndRadiologicalProtection = 8040,
-
-        /// <summary>
-        /// water wash down systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("water wash down systems.")]
-        WaterWashDownSystems = 8050,
-
-        /// <summary>
-        /// decontamination systems.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("decontamination systems.")]
-        DecontaminationSystems = 8060
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for LifeSupportRepairCode (log.repaircomplete.lifesupport, Life support systems, 
+    /// section 6.2.8)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum LifeSupportRepairCode : ushort
+    {
+        /// <summary>
+        /// air supply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("air supply.")]
+        AirSupply = 8000,
+
+        /// <summary>
+        /// filters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("filters.")]
+        Filters = 8010,
+
+        /// <summary>
+        /// water supply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("water supply.")]
+        WaterSupply = 8020,
+
+        /// <summary>
+        /// refrigeration system.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("refrigeration system.")]
+        RefrigerationSystem = 8030,
+
+        /// <summary>
+        /// chemical, biological, and radiological protection.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("chemical, biological, and radiological protection.")]
+        ChemicalBiologicalAndRadiologicalProtection = 8040,
+
+        /// <summary>
+        /// water wash down systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("water wash down systems.")]
+        WaterWashDownSystems = 8050,
+
+        /// <summary>
+        /// decontamination systems.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("decontamination systems.")]
+        DecontaminationSystems = 8060
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ResponseResultCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/ResponseResultCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ResponseResultCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/ResponseResultCode.cs
index f3cff51..3b87272 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ResponseResultCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/ResponseResultCode.cs
@@ -1,79 +1,79 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for ResponseResultCode (log.repairresponse, Repair Response PDU, 
-    /// section 6.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ResponseResultCode : byte
-    {
-        /// <summary>
-        /// other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("other.")]
-        Other = 0,
-
-        /// <summary>
-        /// repair ended.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("repair ended.")]
-        RepairEnded = 1,
-
-        /// <summary>
-        /// invalid repair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("invalid repair.")]
-        InvalidRepair = 2,
-
-        /// <summary>
-        /// repair interrupted.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("repair interrupted.")]
-        RepairInterrupted = 3,
-
-        /// <summary>
-        /// service canceled by the supplier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("service canceled by the supplier.")]
-        ServiceCanceledByTheSupplier = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for ResponseResultCode (log.repairresponse, Repair Response PDU, 
+    /// section 6.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ResponseResultCode : byte
+    {
+        /// <summary>
+        /// other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("other.")]
+        Other = 0,
+
+        /// <summary>
+        /// repair ended.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("repair ended.")]
+        RepairEnded = 1,
+
+        /// <summary>
+        /// invalid repair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("invalid repair.")]
+        InvalidRepair = 2,
+
+        /// <summary>
+        /// repair interrupted.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("repair interrupted.")]
+        RepairInterrupted = 3,
+
+        /// <summary>
+        /// service canceled by the supplier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("service canceled by the supplier.")]
+        ServiceCanceledByTheSupplier = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ServiceRequestType.cs b/Libs/CsharpDis6/Enumerations/Logistics/ServiceRequestType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ServiceRequestType.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/ServiceRequestType.cs
index a1e7778..caacae0 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/ServiceRequestType.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/ServiceRequestType.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for ServiceRequestType (log.servicerequest, Service Request PDU, 
-    /// section 6.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ServiceRequestType : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Resupply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Resupply.")]
-        Resupply = 1,
-
-        /// <summary>
-        /// Repair.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Repair.")]
-        Repair = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for ServiceRequestType (log.servicerequest, Service Request PDU, 
+    /// section 6.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ServiceRequestType : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Resupply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Resupply.")]
+        Resupply = 1,
+
+        /// <summary>
+        /// Repair.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Repair.")]
+        Repair = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs b/Libs/CsharpDis6/Enumerations/Logistics/WeaponRepairCode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs
rename to Libs/CsharpDis6/Enumerations/Logistics/WeaponRepairCode.cs
index d00ee27..bde1c72 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Logistics/WeaponRepairCode.cs
+++ b/Libs/CsharpDis6/Enumerations/Logistics/WeaponRepairCode.cs
@@ -1,149 +1,149 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Logistics
-{
-    /// <summary>
-    /// Enumeration values for WeaponRepairCode (log.repaircomplete.weapons, Weapons, 
-    /// section 6.2.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum WeaponRepairCode : ushort
-    {
-        /// <summary>
-        /// gun elevation drive.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("gun elevation drive.")]
-        GunElevationDrive = 2000,
-
-        /// <summary>
-        /// gun stabilization system.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("gun stabilization system.")]
-        GunStabilizationSystem = 2010,
-
-        /// <summary>
-        /// gunner's primary sight (GPS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("gunner's primary sight (GPS).")]
-        GunnerSPrimarySightGPS = 2020,
-
-        /// <summary>
-        /// commander's extension to the GPS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("commander's extension to the GPS.")]
-        CommanderSExtensionToTheGPS = 2030,
-
-        /// <summary>
-        /// loading mechanism.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("loading mechanism.")]
-        LoadingMechanism = 2040,
-
-        /// <summary>
-        /// gunner's auxiliary sight.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("gunner's auxiliary sight.")]
-        GunnerSAuxiliarySight = 2050,
-
-        /// <summary>
-        /// gunner's control panel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("gunner's control panel.")]
-        GunnerSControlPanel = 2060,
-
-        /// <summary>
-        /// gunner's control assembly handle(s).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("gunner's control assembly handle(s).")]
-        GunnerSControlAssemblyHandleS = 2070,
-
-        /// <summary>
-        /// commander's control handles/assembly.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("commander's control handles/assembly.")]
-        CommanderSControlHandlesAssembly = 2090,
-
-        /// <summary>
-        /// commander's weapon station.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("commander's weapon station.")]
-        CommanderSWeaponStation = 2100,
-
-        /// <summary>
-        /// commander's independent thermal viewer (CITV).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("commander's independent thermal viewer (CITV).")]
-        CommanderSIndependentThermalViewerCITV = 2110,
-
-        /// <summary>
-        /// general weapons.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("general weapons.")]
-        GeneralWeapons = 2120
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Logistics
+{
+    /// <summary>
+    /// Enumeration values for WeaponRepairCode (log.repaircomplete.weapons, Weapons, 
+    /// section 6.2.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum WeaponRepairCode : ushort
+    {
+        /// <summary>
+        /// gun elevation drive.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("gun elevation drive.")]
+        GunElevationDrive = 2000,
+
+        /// <summary>
+        /// gun stabilization system.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("gun stabilization system.")]
+        GunStabilizationSystem = 2010,
+
+        /// <summary>
+        /// gunner's primary sight (GPS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("gunner's primary sight (GPS).")]
+        GunnerSPrimarySightGPS = 2020,
+
+        /// <summary>
+        /// commander's extension to the GPS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("commander's extension to the GPS.")]
+        CommanderSExtensionToTheGPS = 2030,
+
+        /// <summary>
+        /// loading mechanism.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("loading mechanism.")]
+        LoadingMechanism = 2040,
+
+        /// <summary>
+        /// gunner's auxiliary sight.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("gunner's auxiliary sight.")]
+        GunnerSAuxiliarySight = 2050,
+
+        /// <summary>
+        /// gunner's control panel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("gunner's control panel.")]
+        GunnerSControlPanel = 2060,
+
+        /// <summary>
+        /// gunner's control assembly handle(s).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("gunner's control assembly handle(s).")]
+        GunnerSControlAssemblyHandleS = 2070,
+
+        /// <summary>
+        /// commander's control handles/assembly.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("commander's control handles/assembly.")]
+        CommanderSControlHandlesAssembly = 2090,
+
+        /// <summary>
+        /// commander's weapon station.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("commander's weapon station.")]
+        CommanderSWeaponStation = 2100,
+
+        /// <summary>
+        /// commander's independent thermal viewer (CITV).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("commander's independent thermal viewer (CITV).")]
+        CommanderSIndependentThermalViewerCITV = 2110,
+
+        /// <summary>
+        /// general weapons.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("general weapons.")]
+        GeneralWeapons = 2120
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/PduType.cs b/Libs/CsharpDis6/Enumerations/PduType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/PduType.cs
rename to Libs/CsharpDis6/Enumerations/PduType.cs
index 12385be..96d4954 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/PduType.cs
+++ b/Libs/CsharpDis6/Enumerations/PduType.cs
@@ -1,709 +1,709 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations
-{
-    /// <summary>
-    /// Enumeration values for PduType (pduheader.pdutype, PDU Type, 
-    /// section 3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum PduType : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Entity State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity State.")]
-        EntityState = 1,
-
-        /// <summary>
-        /// Fire.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire.")]
-        Fire = 2,
-
-        /// <summary>
-        /// Detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Detonation.")]
-        Detonation = 3,
-
-        /// <summary>
-        /// Collision.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Collision.")]
-        Collision = 4,
-
-        /// <summary>
-        /// Service Request.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Service Request.")]
-        ServiceRequest = 5,
-
-        /// <summary>
-        /// Resupply Offer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Resupply Offer.")]
-        ResupplyOffer = 6,
-
-        /// <summary>
-        /// Resupply Received.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Resupply Received.")]
-        ResupplyReceived = 7,
-
-        /// <summary>
-        /// Resupply Cancel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Resupply Cancel.")]
-        ResupplyCancel = 8,
-
-        /// <summary>
-        /// Repair Complete.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Repair Complete.")]
-        RepairComplete = 9,
-
-        /// <summary>
-        /// Repair Response.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Repair Response.")]
-        RepairResponse = 10,
-
-        /// <summary>
-        /// Create Entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Create Entity.")]
-        CreateEntity = 11,
-
-        /// <summary>
-        /// Remove Entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Remove Entity.")]
-        RemoveEntity = 12,
-
-        /// <summary>
-        /// Start/Resume.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Start/Resume.")]
-        StartResume = 13,
-
-        /// <summary>
-        /// Stop/Freeze.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stop/Freeze.")]
-        StopFreeze = 14,
-
-        /// <summary>
-        /// Acknowledge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acknowledge.")]
-        Acknowledge = 15,
-
-        /// <summary>
-        /// Action Request.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Action Request.")]
-        ActionRequest = 16,
-
-        /// <summary>
-        /// Action Response.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Action Response.")]
-        ActionResponse = 17,
-
-        /// <summary>
-        /// Data Query.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data Query.")]
-        DataQuery = 18,
-
-        /// <summary>
-        /// Set Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set Data.")]
-        SetData = 19,
-
-        /// <summary>
-        /// Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data.")]
-        Data = 20,
-
-        /// <summary>
-        /// Event Report.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Event Report.")]
-        EventReport = 21,
-
-        /// <summary>
-        /// Comment.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Comment.")]
-        Comment = 22,
-
-        /// <summary>
-        /// Electromagnetic Emission.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electromagnetic Emission.")]
-        ElectromagneticEmission = 23,
-
-        /// <summary>
-        /// Designator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Designator.")]
-        Designator = 24,
-
-        /// <summary>
-        /// Transmitter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transmitter.")]
-        Transmitter = 25,
-
-        /// <summary>
-        /// Signal.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Signal.")]
-        Signal = 26,
-
-        /// <summary>
-        /// Receiver.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Receiver.")]
-        Receiver = 27,
-
-        /// <summary>
-        /// IFF/ATC/NAVAIDS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IFF/ATC/NAVAIDS.")]
-        IFF_ATC_NAVAIDS = 28,
-
-        /// <summary>
-        /// Underwater Acoustic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Underwater Acoustic.")]
-        UnderwaterAcoustic = 29,
-
-        /// <summary>
-        /// Supplemental Emission / Entity State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Supplemental Emission / Entity State.")]
-        SupplementalEmissionEntityState = 30,
-
-        /// <summary>
-        /// Intercom Signal.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intercom Signal.")]
-        IntercomSignal = 31,
-
-        /// <summary>
-        /// Intercom Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intercom Control.")]
-        IntercomControl = 32,
-
-        /// <summary>
-        /// Aggregate State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aggregate State.")]
-        AggregateState = 33,
-
-        /// <summary>
-        /// IsGroupOf.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IsGroupOf.")]
-        IsGroupOf = 34,
-
-        /// <summary>
-        /// Transfer Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transfer Control.")]
-        TransferControl = 35,
-
-        /// <summary>
-        /// IsPartOf.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IsPartOf.")]
-        IsPartOf = 36,
-
-        /// <summary>
-        /// Minefield State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minefield State.")]
-        MinefieldState = 37,
-
-        /// <summary>
-        /// Minefield Query.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minefield Query.")]
-        MinefieldQuery = 38,
-
-        /// <summary>
-        /// Minefield Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minefield Data.")]
-        MinefieldData = 39,
-
-        /// <summary>
-        /// Minefield Response NAK.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minefield Response NAK.")]
-        MinefieldResponseNAK = 40,
-
-        /// <summary>
-        /// Environmental Process.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environmental Process.")]
-        EnvironmentalProcess = 41,
-
-        /// <summary>
-        /// Gridded Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gridded Data.")]
-        GriddedData = 42,
-
-        /// <summary>
-        /// Point Object State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Point Object State.")]
-        PointObjectState = 43,
-
-        /// <summary>
-        /// Linear Object State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Linear Object State.")]
-        LinearObjectState = 44,
-
-        /// <summary>
-        /// Areal Object State.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Areal Object State.")]
-        ArealObjectState = 45,
-
-        /// <summary>
-        /// TSPI.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TSPI.")]
-        TSPI = 46,
-
-        /// <summary>
-        /// Appearance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Appearance.")]
-        Appearance = 47,
-
-        /// <summary>
-        /// Articulated Parts.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulated Parts.")]
-        ArticulatedParts = 48,
-
-        /// <summary>
-        /// LE Fire.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LE Fire.")]
-        LEFire = 49,
-
-        /// <summary>
-        /// LE Detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LE Detonation.")]
-        LEDetonation = 50,
-
-        /// <summary>
-        /// Create Entity-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Create Entity-R.")]
-        CreateEntityR = 51,
-
-        /// <summary>
-        /// Remove Entity-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Remove Entity-R.")]
-        RemoveEntityR = 52,
-
-        /// <summary>
-        /// Start/Resume-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Start/Resume-R.")]
-        StartResumeR = 53,
-
-        /// <summary>
-        /// Stop/Freeze-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stop/Freeze-R.")]
-        StopFreezeR = 54,
-
-        /// <summary>
-        /// Acknowledge-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acknowledge-R.")]
-        AcknowledgeR = 55,
-
-        /// <summary>
-        /// Action Request-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Action Request-R.")]
-        ActionRequestR = 56,
-
-        /// <summary>
-        /// Action Response-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Action Response-R.")]
-        ActionResponseR = 57,
-
-        /// <summary>
-        /// Data Query-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data Query-R.")]
-        DataQueryR = 58,
-
-        /// <summary>
-        /// Set Data-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set Data-R.")]
-        SetDataR = 59,
-
-        /// <summary>
-        /// Data-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data-R.")]
-        DataR = 60,
-
-        /// <summary>
-        /// Event Report-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Event Report-R.")]
-        EventReportR = 61,
-
-        /// <summary>
-        /// Comment-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Comment-R.")]
-        CommentR = 62,
-
-        /// <summary>
-        /// Record-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Record-R.")]
-        RecordR = 63,
-
-        /// <summary>
-        /// Set Record-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set Record-R.")]
-        SetRecordR = 64,
-
-        /// <summary>
-        /// Record Query-R.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Record Query-R.")]
-        RecordQueryR = 65,
-
-        /// <summary>
-        /// Collision-Elastic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Collision-Elastic.")]
-        CollisionElastic = 66,
-
-        /// <summary>
-        /// Entity State Update.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity State Update.")]
-        EntityStateUpdate = 67
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations
+{
+    /// <summary>
+    /// Enumeration values for PduType (pduheader.pdutype, PDU Type, 
+    /// section 3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum PduType : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Entity State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity State.")]
+        EntityState = 1,
+
+        /// <summary>
+        /// Fire.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire.")]
+        Fire = 2,
+
+        /// <summary>
+        /// Detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Detonation.")]
+        Detonation = 3,
+
+        /// <summary>
+        /// Collision.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Collision.")]
+        Collision = 4,
+
+        /// <summary>
+        /// Service Request.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Service Request.")]
+        ServiceRequest = 5,
+
+        /// <summary>
+        /// Resupply Offer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Resupply Offer.")]
+        ResupplyOffer = 6,
+
+        /// <summary>
+        /// Resupply Received.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Resupply Received.")]
+        ResupplyReceived = 7,
+
+        /// <summary>
+        /// Resupply Cancel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Resupply Cancel.")]
+        ResupplyCancel = 8,
+
+        /// <summary>
+        /// Repair Complete.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Repair Complete.")]
+        RepairComplete = 9,
+
+        /// <summary>
+        /// Repair Response.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Repair Response.")]
+        RepairResponse = 10,
+
+        /// <summary>
+        /// Create Entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Create Entity.")]
+        CreateEntity = 11,
+
+        /// <summary>
+        /// Remove Entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Remove Entity.")]
+        RemoveEntity = 12,
+
+        /// <summary>
+        /// Start/Resume.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Start/Resume.")]
+        StartResume = 13,
+
+        /// <summary>
+        /// Stop/Freeze.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stop/Freeze.")]
+        StopFreeze = 14,
+
+        /// <summary>
+        /// Acknowledge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acknowledge.")]
+        Acknowledge = 15,
+
+        /// <summary>
+        /// Action Request.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Action Request.")]
+        ActionRequest = 16,
+
+        /// <summary>
+        /// Action Response.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Action Response.")]
+        ActionResponse = 17,
+
+        /// <summary>
+        /// Data Query.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data Query.")]
+        DataQuery = 18,
+
+        /// <summary>
+        /// Set Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set Data.")]
+        SetData = 19,
+
+        /// <summary>
+        /// Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data.")]
+        Data = 20,
+
+        /// <summary>
+        /// Event Report.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Event Report.")]
+        EventReport = 21,
+
+        /// <summary>
+        /// Comment.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Comment.")]
+        Comment = 22,
+
+        /// <summary>
+        /// Electromagnetic Emission.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electromagnetic Emission.")]
+        ElectromagneticEmission = 23,
+
+        /// <summary>
+        /// Designator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Designator.")]
+        Designator = 24,
+
+        /// <summary>
+        /// Transmitter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transmitter.")]
+        Transmitter = 25,
+
+        /// <summary>
+        /// Signal.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Signal.")]
+        Signal = 26,
+
+        /// <summary>
+        /// Receiver.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Receiver.")]
+        Receiver = 27,
+
+        /// <summary>
+        /// IFF/ATC/NAVAIDS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IFF/ATC/NAVAIDS.")]
+        IFF_ATC_NAVAIDS = 28,
+
+        /// <summary>
+        /// Underwater Acoustic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Underwater Acoustic.")]
+        UnderwaterAcoustic = 29,
+
+        /// <summary>
+        /// Supplemental Emission / Entity State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Supplemental Emission / Entity State.")]
+        SupplementalEmissionEntityState = 30,
+
+        /// <summary>
+        /// Intercom Signal.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intercom Signal.")]
+        IntercomSignal = 31,
+
+        /// <summary>
+        /// Intercom Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intercom Control.")]
+        IntercomControl = 32,
+
+        /// <summary>
+        /// Aggregate State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aggregate State.")]
+        AggregateState = 33,
+
+        /// <summary>
+        /// IsGroupOf.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IsGroupOf.")]
+        IsGroupOf = 34,
+
+        /// <summary>
+        /// Transfer Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transfer Control.")]
+        TransferControl = 35,
+
+        /// <summary>
+        /// IsPartOf.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IsPartOf.")]
+        IsPartOf = 36,
+
+        /// <summary>
+        /// Minefield State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minefield State.")]
+        MinefieldState = 37,
+
+        /// <summary>
+        /// Minefield Query.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minefield Query.")]
+        MinefieldQuery = 38,
+
+        /// <summary>
+        /// Minefield Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minefield Data.")]
+        MinefieldData = 39,
+
+        /// <summary>
+        /// Minefield Response NAK.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minefield Response NAK.")]
+        MinefieldResponseNAK = 40,
+
+        /// <summary>
+        /// Environmental Process.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environmental Process.")]
+        EnvironmentalProcess = 41,
+
+        /// <summary>
+        /// Gridded Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gridded Data.")]
+        GriddedData = 42,
+
+        /// <summary>
+        /// Point Object State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Point Object State.")]
+        PointObjectState = 43,
+
+        /// <summary>
+        /// Linear Object State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Linear Object State.")]
+        LinearObjectState = 44,
+
+        /// <summary>
+        /// Areal Object State.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Areal Object State.")]
+        ArealObjectState = 45,
+
+        /// <summary>
+        /// TSPI.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TSPI.")]
+        TSPI = 46,
+
+        /// <summary>
+        /// Appearance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Appearance.")]
+        Appearance = 47,
+
+        /// <summary>
+        /// Articulated Parts.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulated Parts.")]
+        ArticulatedParts = 48,
+
+        /// <summary>
+        /// LE Fire.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LE Fire.")]
+        LEFire = 49,
+
+        /// <summary>
+        /// LE Detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LE Detonation.")]
+        LEDetonation = 50,
+
+        /// <summary>
+        /// Create Entity-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Create Entity-R.")]
+        CreateEntityR = 51,
+
+        /// <summary>
+        /// Remove Entity-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Remove Entity-R.")]
+        RemoveEntityR = 52,
+
+        /// <summary>
+        /// Start/Resume-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Start/Resume-R.")]
+        StartResumeR = 53,
+
+        /// <summary>
+        /// Stop/Freeze-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stop/Freeze-R.")]
+        StopFreezeR = 54,
+
+        /// <summary>
+        /// Acknowledge-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acknowledge-R.")]
+        AcknowledgeR = 55,
+
+        /// <summary>
+        /// Action Request-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Action Request-R.")]
+        ActionRequestR = 56,
+
+        /// <summary>
+        /// Action Response-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Action Response-R.")]
+        ActionResponseR = 57,
+
+        /// <summary>
+        /// Data Query-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data Query-R.")]
+        DataQueryR = 58,
+
+        /// <summary>
+        /// Set Data-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set Data-R.")]
+        SetDataR = 59,
+
+        /// <summary>
+        /// Data-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data-R.")]
+        DataR = 60,
+
+        /// <summary>
+        /// Event Report-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Event Report-R.")]
+        EventReportR = 61,
+
+        /// <summary>
+        /// Comment-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Comment-R.")]
+        CommentR = 62,
+
+        /// <summary>
+        /// Record-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Record-R.")]
+        RecordR = 63,
+
+        /// <summary>
+        /// Set Record-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set Record-R.")]
+        SetRecordR = 64,
+
+        /// <summary>
+        /// Record Query-R.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Record Query-R.")]
+        RecordQueryR = 65,
+
+        /// <summary>
+        /// Collision-Elastic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Collision-Elastic.")]
+        CollisionElastic = 66,
+
+        /// <summary>
+        /// Entity State Update.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity State Update.")]
+        EntityStateUpdate = 67
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/ProtocolFamily.cs b/Libs/CsharpDis6/Enumerations/ProtocolFamily.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/ProtocolFamily.cs
rename to Libs/CsharpDis6/Enumerations/ProtocolFamily.cs
index febab18..42c0482 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/ProtocolFamily.cs
+++ b/Libs/CsharpDis6/Enumerations/ProtocolFamily.cs
@@ -1,169 +1,169 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations
-{
-    /// <summary>
-    /// Enumeration values for ProtocolFamily (pduheader.protocolfamily, Protocol Family, 
-    /// section 3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ProtocolFamily : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Entity Information/Interaction.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Information/Interaction.")]
-        EntityInformationInteraction = 1,
-
-        /// <summary>
-        /// Warfare.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Warfare.")]
-        Warfare = 2,
-
-        /// <summary>
-        /// Logistics.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Logistics.")]
-        Logistics = 3,
-
-        /// <summary>
-        /// Radio Communication.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Communication.")]
-        RadioCommunication = 4,
-
-        /// <summary>
-        /// Simulation Management.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Management.")]
-        SimulationManagement = 5,
-
-        /// <summary>
-        /// Distributed Emission Regeneration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Distributed Emission Regeneration.")]
-        DistributedEmissionRegeneration = 6,
-
-        /// <summary>
-        /// Entity Management.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Management.")]
-        EntityManagement = 7,
-
-        /// <summary>
-        /// Minefield.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minefield.")]
-        Minefield = 8,
-
-        /// <summary>
-        /// Synthetic Environment.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Synthetic Environment.")]
-        SyntheticEnvironment = 9,
-
-        /// <summary>
-        /// Simulation Management with Reliability.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Management with Reliability.")]
-        SimulationManagementWithReliability = 10,
-
-        /// <summary>
-        /// Live Entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Live Entity.")]
-        LiveEntity = 11,
-
-        /// <summary>
-        /// Non-Real Time.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Non-Real Time.")]
-        NonRealTime = 12,
-
-        /// <summary>
-        /// Experimental - Computer Generated Forces.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Experimental - Computer Generated Forces.")]
-        ExperimentalComputerGeneratedForces = 129
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations
+{
+    /// <summary>
+    /// Enumeration values for ProtocolFamily (pduheader.protocolfamily, Protocol Family, 
+    /// section 3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ProtocolFamily : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Entity Information/Interaction.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Information/Interaction.")]
+        EntityInformationInteraction = 1,
+
+        /// <summary>
+        /// Warfare.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Warfare.")]
+        Warfare = 2,
+
+        /// <summary>
+        /// Logistics.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Logistics.")]
+        Logistics = 3,
+
+        /// <summary>
+        /// Radio Communication.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Communication.")]
+        RadioCommunication = 4,
+
+        /// <summary>
+        /// Simulation Management.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Management.")]
+        SimulationManagement = 5,
+
+        /// <summary>
+        /// Distributed Emission Regeneration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Distributed Emission Regeneration.")]
+        DistributedEmissionRegeneration = 6,
+
+        /// <summary>
+        /// Entity Management.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Management.")]
+        EntityManagement = 7,
+
+        /// <summary>
+        /// Minefield.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minefield.")]
+        Minefield = 8,
+
+        /// <summary>
+        /// Synthetic Environment.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Synthetic Environment.")]
+        SyntheticEnvironment = 9,
+
+        /// <summary>
+        /// Simulation Management with Reliability.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Management with Reliability.")]
+        SimulationManagementWithReliability = 10,
+
+        /// <summary>
+        /// Live Entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Live Entity.")]
+        LiveEntity = 11,
+
+        /// <summary>
+        /// Non-Real Time.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Non-Real Time.")]
+        NonRealTime = 12,
+
+        /// <summary>
+        /// Experimental - Computer Generated Forces.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Experimental - Computer Generated Forces.")]
+        ExperimentalComputerGeneratedForces = 129
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/ProtocolVersion.cs b/Libs/CsharpDis6/Enumerations/ProtocolVersion.cs
similarity index 89%
rename from Libs/CsharpDis6/OpenDis/Enumerations/ProtocolVersion.cs
rename to Libs/CsharpDis6/Enumerations/ProtocolVersion.cs
index 3fac1b7..c5da5bd 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/ProtocolVersion.cs
+++ b/Libs/CsharpDis6/Enumerations/ProtocolVersion.cs
@@ -1,99 +1,109 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations
-{
-    /// <summary>
-    /// Enumeration values for ProtocolVersion (pduheader.protocolversion, Protocol version, 
-    /// section 3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ProtocolVersion : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// DIS PDU version 1.0 (May 92).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS PDU version 1.0 (May 92).")]
-        Version1 = 1,
-
-        /// <summary>
-        /// IEEE 1278-1993.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IEEE 1278-1993.")]
-        Ieee1278_1993 = 2,
-
-        /// <summary>
-        /// DIS PDU version 2.0 - third draft (May 93).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS PDU version 2.0 - third draft (May 93).")]
-        Version2ThirdDraft = 3,
-
-        /// <summary>
-        /// DIS PDU version 2.0 - fourth draft (revised) March 16, 1994.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS PDU version 2.0 - fourth draft (revised) March 16, 1994.")]
-        Version2FourthDraftRevised = 4,
-
-        /// <summary>
-        /// IEEE 1278.1-1995.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IEEE 1278.1-1995.")]
-        Ieee1278_1_1995 = 5,
-
-        /// <summary>
-        /// IEEE 1278.1A-1998.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IEEE 1278.1A-1998.")]
-        Ieee1278_1A_1998 = 6
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations
+{
+    /// <summary>
+    /// Enumeration values for ProtocolVersion (pduheader.protocolversion, Protocol version, 
+    /// section 3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ProtocolVersion : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// DIS PDU version 1.0 (May 92).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS PDU version 1.0 (May 92).")]
+        Version1 = 1,
+
+        /// <summary>
+        /// IEEE 1278-1993.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IEEE 1278-1993.")]
+        Ieee1278_1993 = 2,
+
+        /// <summary>
+        /// DIS PDU version 2.0 - third draft (May 93).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS PDU version 2.0 - third draft (May 93).")]
+        Version2ThirdDraft = 3,
+
+        /// <summary>
+        /// DIS PDU version 2.0 - fourth draft (revised) March 16, 1994.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS PDU version 2.0 - fourth draft (revised) March 16, 1994.")]
+        Version2FourthDraftRevised = 4,
+
+        /// <summary>
+        /// IEEE 1278.1-1995.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IEEE 1278.1-1995.")]
+        Ieee1278_1_1995 = 5,
+
+        /// <summary>
+        /// IEEE 1278.1A-1998.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IEEE 1278.1A-1998.")]
+        Ieee1278_1A_1998 = 6,
+
+        /// <summary>
+        /// IEEE 1278.1A-1998.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IEEE 1278.1-2012.")]
+        Ieee1278_1_2012 = 6
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/Command.cs b/Libs/CsharpDis6/Enumerations/Radio.Intercom/Command.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/Command.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Intercom/Command.cs
index 9cbfba6..f06ddef 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/Command.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Intercom/Command.cs
@@ -1,99 +1,99 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Intercom
-{
-    /// <summary>
-    /// Enumeration values for Command (radio.ic.command, Command, 
-    /// section 9.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Command : byte
-    {
-        /// <summary>
-        /// No Command.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("No Command.")]
-        NoCommand = 0,
-
-        /// <summary>
-        /// Status.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status.")]
-        Status = 1,
-
-        /// <summary>
-        /// Connect.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Connect.")]
-        Connect = 2,
-
-        /// <summary>
-        /// Disconnect.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Disconnect.")]
-        Disconnect = 3,
-
-        /// <summary>
-        /// Reset.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Reset.")]
-        Reset = 4,
-
-        /// <summary>
-        /// On.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On.")]
-        On = 5,
-
-        /// <summary>
-        /// Off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Off.")]
-        Off = 6
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Intercom
+{
+    /// <summary>
+    /// Enumeration values for Command (radio.ic.command, Command, 
+    /// section 9.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Command : byte
+    {
+        /// <summary>
+        /// No Command.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("No Command.")]
+        NoCommand = 0,
+
+        /// <summary>
+        /// Status.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status.")]
+        Status = 1,
+
+        /// <summary>
+        /// Connect.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Connect.")]
+        Connect = 2,
+
+        /// <summary>
+        /// Disconnect.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Disconnect.")]
+        Disconnect = 3,
+
+        /// <summary>
+        /// Reset.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Reset.")]
+        Reset = 4,
+
+        /// <summary>
+        /// On.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On.")]
+        On = 5,
+
+        /// <summary>
+        /// Off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Off.")]
+        Off = 6
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs b/Libs/CsharpDis6/Enumerations/Radio.Intercom/CommunicationsType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Intercom/CommunicationsType.cs
index b64ccb5..ee0ac6c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/CommunicationsType.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Intercom/CommunicationsType.cs
@@ -1,72 +1,72 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Intercom
-{
-    /// <summary>
-    /// Enumeration values for CommunicationsType (radio.ic.commtype, Communications Type, 
-    /// section 9.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    /// <remarks>
-    /// Values from 0 to null: Reserved
-    /// </remarks>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum CommunicationsType : uint
-    {
-        /// <summary>
-        /// Connection FDX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Connection FDX.")]
-        ConnectionFDX = 1,
-
-        /// <summary>
-        /// Connection HDX - Destination is Receive Only.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Connection HDX - Destination is Receive Only.")]
-        ConnectionHDXDestinationIsReceiveOnly = 2,
-
-        /// <summary>
-        /// Connection HDX - Destination is Transmit Only.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Connection HDX - Destination is Transmit Only.")]
-        ConnectionHDXDestinationIsTransmitOnly = 3,
-
-        /// <summary>
-        /// Connection HDX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Connection HDX.")]
-        ConnectionHDX = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Intercom
+{
+    /// <summary>
+    /// Enumeration values for CommunicationsType (radio.ic.commtype, Communications Type, 
+    /// section 9.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    /// <remarks>
+    /// Values from 0 to null: Reserved
+    /// </remarks>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum CommunicationsType : uint
+    {
+        /// <summary>
+        /// Connection FDX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Connection FDX.")]
+        ConnectionFDX = 1,
+
+        /// <summary>
+        /// Connection HDX - Destination is Receive Only.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Connection HDX - Destination is Receive Only.")]
+        ConnectionHDXDestinationIsReceiveOnly = 2,
+
+        /// <summary>
+        /// Connection HDX - Destination is Transmit Only.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Connection HDX - Destination is Transmit Only.")]
+        ConnectionHDXDestinationIsTransmitOnly = 3,
+
+        /// <summary>
+        /// Connection HDX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Connection HDX.")]
+        ConnectionHDX = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/ControlType.cs b/Libs/CsharpDis6/Enumerations/Radio.Intercom/ControlType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/ControlType.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Intercom/ControlType.cs
index e630f2f..e68538a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/ControlType.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Intercom/ControlType.cs
@@ -1,82 +1,82 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Intercom
-{
-    /// <summary>
-    /// Enumeration values for ControlType (radio.ic.controltype, Control Type, 
-    /// section 9.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    /// <remarks>
-    /// Values from 0 to null: Reserved
-    /// </remarks>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ControlType : byte
-    {
-        /// <summary>
-        /// Status.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status.")]
-        Status = 1,
-
-        /// <summary>
-        /// Request - Acknowledge Required.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Request - Acknowledge Required.")]
-        RequestAcknowledgeRequired = 2,
-
-        /// <summary>
-        /// Request - No Acknowledge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Request - No Acknowledge.")]
-        RequestNoAcknowledge = 3,
-
-        /// <summary>
-        /// Ack - Request Granted.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ack - Request Granted.")]
-        AckRequestGranted = 4,
-
-        /// <summary>
-        /// Nack - Request Denied.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nack - Request Denied.")]
-        NackRequestDenied = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Intercom
+{
+    /// <summary>
+    /// Enumeration values for ControlType (radio.ic.controltype, Control Type, 
+    /// section 9.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    /// <remarks>
+    /// Values from 0 to null: Reserved
+    /// </remarks>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ControlType : byte
+    {
+        /// <summary>
+        /// Status.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status.")]
+        Status = 1,
+
+        /// <summary>
+        /// Request - Acknowledge Required.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Request - Acknowledge Required.")]
+        RequestAcknowledgeRequired = 2,
+
+        /// <summary>
+        /// Request - No Acknowledge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Request - No Acknowledge.")]
+        RequestNoAcknowledge = 3,
+
+        /// <summary>
+        /// Ack - Request Granted.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ack - Request Granted.")]
+        AckRequestGranted = 4,
+
+        /// <summary>
+        /// Nack - Request Denied.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nack - Request Denied.")]
+        NackRequestDenied = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs b/Libs/CsharpDis6/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
index 4fafe1b..e248603 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Intercom/DestinationLineStateCommand.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Intercom
-{
-    /// <summary>
-    /// Enumeration values for DestinationLineStateCommand (radio.ic.deststate, Destination Line State Command, 
-    /// section 9.3.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DestinationLineStateCommand : byte
-    {
-        /// <summary>
-        /// None.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("None.")]
-        None = 0,
-
-        /// <summary>
-        /// Set Line State - Transmitting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set Line State - Transmitting.")]
-        SetLineStateTransmitting = 1,
-
-        /// <summary>
-        /// Set Line State - Not Transmitting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set Line State - Not Transmitting.")]
-        SetLineStateNotTransmitting = 2,
-
-        /// <summary>
-        /// Return to Local Line State Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Return to Local Line State Control.")]
-        ReturnToLocalLineStateControl = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Intercom
+{
+    /// <summary>
+    /// Enumeration values for DestinationLineStateCommand (radio.ic.deststate, Destination Line State Command, 
+    /// section 9.3.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DestinationLineStateCommand : byte
+    {
+        /// <summary>
+        /// None.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("None.")]
+        None = 0,
+
+        /// <summary>
+        /// Set Line State - Transmitting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set Line State - Transmitting.")]
+        SetLineStateTransmitting = 1,
+
+        /// <summary>
+        /// Set Line State - Not Transmitting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set Line State - Not Transmitting.")]
+        SetLineStateNotTransmitting = 2,
+
+        /// <summary>
+        /// Return to Local Line State Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Return to Local Line State Control.")]
+        ReturnToLocalLineStateControl = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/RecordType.cs b/Libs/CsharpDis6/Enumerations/Radio.Intercom/RecordType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/RecordType.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Intercom/RecordType.cs
index 4906f08..a15793c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/RecordType.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Intercom/RecordType.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Intercom
-{
-    /// <summary>
-    /// Enumeration values for RecordType (radio.ic.param.type, Record type, 
-    /// section 9.3.6.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum RecordType : ushort
-    {
-        /// <summary>
-        /// Entity Destination record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Destination record.")]
-        EntityDestinationRecord = 1,
-
-        /// <summary>
-        /// Group Destination record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Group Destination record.")]
-        GroupDestinationRecord = 2,
-
-        /// <summary>
-        /// Group Assignment record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Group Assignment record.")]
-        GroupAssignmentRecord = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Intercom
+{
+    /// <summary>
+    /// Enumeration values for RecordType (radio.ic.param.type, Record type, 
+    /// section 9.3.6.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum RecordType : ushort
+    {
+        /// <summary>
+        /// Entity Destination record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Destination record.")]
+        EntityDestinationRecord = 1,
+
+        /// <summary>
+        /// Group Destination record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Group Destination record.")]
+        GroupDestinationRecord = 2,
+
+        /// <summary>
+        /// Group Assignment record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Group Assignment record.")]
+        GroupAssignmentRecord = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs b/Libs/CsharpDis6/Enumerations/Radio.Intercom/TransmitLineState.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Intercom/TransmitLineState.cs
index 7e0afc4..6aff311 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Intercom/TransmitLineState.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Intercom/TransmitLineState.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Intercom
-{
-    /// <summary>
-    /// Enumeration values for TransmitLineState (radio.ic.transmitstate, Transmit Line State, 
-    /// section 9.3.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum TransmitLineState : byte
-    {
-        /// <summary>
-        /// Transmit Line State not applicable.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transmit Line State not applicable.")]
-        TransmitLineStateNotApplicable = 0,
-
-        /// <summary>
-        /// Not Transmitting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Not Transmitting.")]
-        NotTransmitting = 1,
-
-        /// <summary>
-        /// Transmitting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transmitting.")]
-        Transmitting = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Intercom
+{
+    /// <summary>
+    /// Enumeration values for TransmitLineState (radio.ic.transmitstate, Transmit Line State, 
+    /// section 9.3.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum TransmitLineState : byte
+    {
+        /// <summary>
+        /// Transmit Line State not applicable.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transmit Line State not applicable.")]
+        TransmitLineStateNotApplicable = 0,
+
+        /// <summary>
+        /// Not Transmitting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Not Transmitting.")]
+        NotTransmitting = 1,
+
+        /// <summary>
+        /// Transmitting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transmitting.")]
+        Transmitting = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/AntennaPatternType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/AntennaPatternType.cs
index c9a700c..9430138 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/AntennaPatternType.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/AntennaPatternType.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for AntennaPatternType (radio.tx.antennapatterntype, Antenna Pattern Type, 
-    /// section 9.1.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AntennaPatternType : ushort
-    {
-        /// <summary>
-        /// Omni-directional.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Omni-directional.")]
-        OmniDirectional = 0,
-
-        /// <summary>
-        /// Beam.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Beam.")]
-        Beam = 1,
-
-        /// <summary>
-        /// Spherical harmonic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spherical harmonic.")]
-        SphericalHarmonic = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for AntennaPatternType (radio.tx.antennapatterntype, Antenna Pattern Type, 
+    /// section 9.1.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AntennaPatternType : ushort
+    {
+        /// <summary>
+        /// Omni-directional.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Omni-directional.")]
+        OmniDirectional = 0,
+
+        /// <summary>
+        /// Beam.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Beam.")]
+        Beam = 1,
+
+        /// <summary>
+        /// Spherical harmonic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spherical harmonic.")]
+        SphericalHarmonic = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/ClearChannel.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/ClearChannel.cs
index d1b0b44..2164887 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ClearChannel.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/ClearChannel.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for ClearChannel (radio.tx.param.cctt.clear, Clear Channel, 
-    /// section 9.1.7.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ClearChannel : byte
-    {
-        /// <summary>
-        /// Not clear channel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Not clear channel.")]
-        NotClearChannel = 0,
-
-        /// <summary>
-        /// Clear channel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Clear channel.")]
-        ClearChannel = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for ClearChannel (radio.tx.param.cctt.clear, Clear Channel, 
+    /// section 9.1.7.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ClearChannel : byte
+    {
+        /// <summary>
+        /// Not clear channel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Not clear channel.")]
+        NotClearChannel = 0,
+
+        /// <summary>
+        /// Clear channel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Clear channel.")]
+        ClearChannel = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/CryptoSystem.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/CryptoSystem.cs
index 2b27473..3a799a1 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/CryptoSystem.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/CryptoSystem.cs
@@ -1,79 +1,79 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for CryptoSystem (radio.tx.cryptosystem, Crypto System, 
-    /// section 9.1.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum CryptoSystem : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// KY-28.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("KY-28.")]
-        KY28 = 1,
-
-        /// <summary>
-        /// VINSON (KY-57, KY-58, SINCGARS ICOM).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("VINSON (KY-57, KY-58, SINCGARS ICOM).")]
-        VINSON = 2,
-
-        /// <summary>
-        /// Narrow Spectrum Secure Voice (NSVE).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Narrow Spectrum Secure Voice (NSVE).")]
-        NarrowSpectrumSecureVoice = 3,
-
-        /// <summary>
-        /// Wide Spectrum Secure Voice (WSVE).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wide Spectrum Secure Voice (WSVE).")]
-        WideSpectrumSecureVoice = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for CryptoSystem (radio.tx.cryptosystem, Crypto System, 
+    /// section 9.1.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum CryptoSystem : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// KY-28.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("KY-28.")]
+        KY28 = 1,
+
+        /// <summary>
+        /// VINSON (KY-57, KY-58, SINCGARS ICOM).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("VINSON (KY-57, KY-58, SINCGARS ICOM).")]
+        VINSON = 2,
+
+        /// <summary>
+        /// Narrow Spectrum Secure Voice (NSVE).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Narrow Spectrum Secure Voice (NSVE).")]
+        NarrowSpectrumSecureVoice = 3,
+
+        /// <summary>
+        /// Wide Spectrum Secure Voice (WSVE).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wide Spectrum Secure Voice (WSVE).")]
+        WideSpectrumSecureVoice = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
index dbee181..4f6d14b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeAndAngleModulation.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for DetailedModulationForAmplitudeAndAngleModulation (radio.tx.mod.major.2.detail, Detailed modulation for amplitude and angle modulation, 
-    /// section 9.1.1.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetailedModulationForAmplitudeAndAngleModulation : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Amplitude and Angle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Amplitude and Angle.")]
-        AmplitudeAndAngle = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for DetailedModulationForAmplitudeAndAngleModulation (radio.tx.mod.major.2.detail, Detailed modulation for amplitude and angle modulation, 
+    /// section 9.1.1.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetailedModulationForAmplitudeAndAngleModulation : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Amplitude and Angle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Amplitude and Angle.")]
+        AmplitudeAndAngle = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
index 9cad648..430de57 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAmplitudeModulation.cs
@@ -1,139 +1,139 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for DetailedModulationForAmplitudeModulation (radio.tx.mod.major.1.detail, Detailed modulation for amplitude modulation, 
-    /// section 9.1.1.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetailedModulationForAmplitudeModulation : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// AFSK (Audio Frequency Shift Keying).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AFSK (Audio Frequency Shift Keying).")]
-        AFSK = 1,
-
-        /// <summary>
-        /// AM (Amplitude Modulation).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AM (Amplitude Modulation).")]
-        AM = 2,
-
-        /// <summary>
-        /// CW (Continuous Wave Modulation).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CW (Continuous Wave Modulation).")]
-        CW = 3,
-
-        /// <summary>
-        /// DSB (Double Sideband).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DSB (Double Sideband).")]
-        DSB = 4,
-
-        /// <summary>
-        /// ISB (Independent Sideband).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ISB (Independent Sideband).")]
-        ISB = 5,
-
-        /// <summary>
-        /// LSB (Single Band Suppressed Carrier, Lower Sideband Mode).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LSB (Single Band Suppressed Carrier, Lower Sideband Mode).")]
-        LSB = 6,
-
-        /// <summary>
-        /// SSB-Full (Single Sideband Full Carrier).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSB-Full (Single Sideband Full Carrier).")]
-        SSBFull = 7,
-
-        /// <summary>
-        /// SSB-Reduc (Single Band Reduced Carrier).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SSB-Reduc (Single Band Reduced Carrier).")]
-        SSBReduced = 8,
-
-        /// <summary>
-        /// USB (Single Band Suppressed Carrier, Upper Sideband Mode).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("USB (Single Band Suppressed Carrier, Upper Sideband Mode).")]
-        USB = 9,
-
-        /// <summary>
-        /// VSB (Vestigial Sideband).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("VSB (Vestigial Sideband).")]
-        VSB = 10
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for DetailedModulationForAmplitudeModulation (radio.tx.mod.major.1.detail, Detailed modulation for amplitude modulation, 
+    /// section 9.1.1.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetailedModulationForAmplitudeModulation : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// AFSK (Audio Frequency Shift Keying).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AFSK (Audio Frequency Shift Keying).")]
+        AFSK = 1,
+
+        /// <summary>
+        /// AM (Amplitude Modulation).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AM (Amplitude Modulation).")]
+        AM = 2,
+
+        /// <summary>
+        /// CW (Continuous Wave Modulation).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CW (Continuous Wave Modulation).")]
+        CW = 3,
+
+        /// <summary>
+        /// DSB (Double Sideband).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DSB (Double Sideband).")]
+        DSB = 4,
+
+        /// <summary>
+        /// ISB (Independent Sideband).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ISB (Independent Sideband).")]
+        ISB = 5,
+
+        /// <summary>
+        /// LSB (Single Band Suppressed Carrier, Lower Sideband Mode).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LSB (Single Band Suppressed Carrier, Lower Sideband Mode).")]
+        LSB = 6,
+
+        /// <summary>
+        /// SSB-Full (Single Sideband Full Carrier).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSB-Full (Single Sideband Full Carrier).")]
+        SSBFull = 7,
+
+        /// <summary>
+        /// SSB-Reduc (Single Band Reduced Carrier).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SSB-Reduc (Single Band Reduced Carrier).")]
+        SSBReduced = 8,
+
+        /// <summary>
+        /// USB (Single Band Suppressed Carrier, Upper Sideband Mode).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("USB (Single Band Suppressed Carrier, Upper Sideband Mode).")]
+        USB = 9,
+
+        /// <summary>
+        /// VSB (Vestigial Sideband).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("VSB (Vestigial Sideband).")]
+        VSB = 10
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
index 6ee4e9e..914bdc6 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForAngleModulation.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for DetailedModulationForAngleModulation (radio.tx.mod.major.3.detail, Detailed modulation for angle modulation, 
-    /// section 9.1.1.3.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetailedModulationForAngleModulation : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// FM (Frequency Modulation).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FM (Frequency Modulation).")]
-        AFSK = 1,
-
-        /// <summary>
-        /// FSK (Frequency Shift Keying).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("FSK (Frequency Shift Keying).")]
-        AM = 2,
-
-        /// <summary>
-        /// PM (Phase Modulation).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PM (Phase Modulation).")]
-        CW = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for DetailedModulationForAngleModulation (radio.tx.mod.major.3.detail, Detailed modulation for angle modulation, 
+    /// section 9.1.1.3.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetailedModulationForAngleModulation : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// FM (Frequency Modulation).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FM (Frequency Modulation).")]
+        AFSK = 1,
+
+        /// <summary>
+        /// FSK (Frequency Shift Keying).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("FSK (Frequency Shift Keying).")]
+        AM = 2,
+
+        /// <summary>
+        /// PM (Phase Modulation).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PM (Phase Modulation).")]
+        CW = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
index e6eeda5..bc38b7f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForCarrierPhaseShift.cs
@@ -1,39 +1,39 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for DetailedModulationForCarrierPhaseShift (radio.tx.mod.major.7.detail, Detailed Modulation for Carrier Phase Shift, 
-    /// section 9.1.1.3.7)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetailedModulationForCarrierPhaseShift : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for DetailedModulationForCarrierPhaseShift (radio.tx.mod.major.7.detail, Detailed Modulation for Carrier Phase Shift, 
+    /// section 9.1.1.3.7)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetailedModulationForCarrierPhaseShift : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
index 5801b69..b299762 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForCombinationModulation.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for DetailedModulationForCombinationModulation (radio.tx.mod.major.4.detail, Detailed modulation for combination modulation, 
-    /// section 9.1.1.3.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetailedModulationForCombinationModulation : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Amplitude-Angle-Pulse.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Amplitude-Angle-Pulse.")]
-        AmplitudeAnglePulse = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for DetailedModulationForCombinationModulation (radio.tx.mod.major.4.detail, Detailed modulation for combination modulation, 
+    /// section 9.1.1.3.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetailedModulationForCombinationModulation : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Amplitude-Angle-Pulse.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Amplitude-Angle-Pulse.")]
+        AmplitudeAnglePulse = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
index 9916ffe..778037e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForPulseModulation.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for DetailedModulationForPulseModulation (radio.tx.mod.major.5.detail, Detailed modulation for pulse modulation, 
-    /// section 9.1.1.3.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetailedModulationForPulseModulation : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Pulse.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pulse.")]
-        Pulse = 1,
-
-        /// <summary>
-        /// X Band TACAN Pulse.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X Band TACAN Pulse.")]
-        XBandTACANPulse = 2,
-
-        /// <summary>
-        /// Y Band TACAN Pulse.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y Band TACAN Pulse.")]
-        YBandTACANPulse = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for DetailedModulationForPulseModulation (radio.tx.mod.major.5.detail, Detailed modulation for pulse modulation, 
+    /// section 9.1.1.3.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetailedModulationForPulseModulation : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Pulse.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pulse.")]
+        Pulse = 1,
+
+        /// <summary>
+        /// X Band TACAN Pulse.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X Band TACAN Pulse.")]
+        XBandTACANPulse = 2,
+
+        /// <summary>
+        /// Y Band TACAN Pulse.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y Band TACAN Pulse.")]
+        YBandTACANPulse = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
index d94e87c..dc0fe7d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/DetailedModulationForUnmodulatedModulation.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for DetailedModulationForUnmodulatedModulation (radio.tx.mod.major.6.detail, Detailed modulation for unmodulated modulation, 
-    /// section 9.1.1.3.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetailedModulationForUnmodulatedModulation : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Continuous Wave emission of an unmodulated carrier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Continuous Wave emission of an unmodulated carrier.")]
-        ContinuousWaveEmissionOfAnUnmodulatedCarrier = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for DetailedModulationForUnmodulatedModulation (radio.tx.mod.major.6.detail, Detailed modulation for unmodulated modulation, 
+    /// section 9.1.1.3.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetailedModulationForUnmodulatedModulation : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Continuous Wave emission of an unmodulated carrier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Continuous Wave emission of an unmodulated carrier.")]
+        ContinuousWaveEmissionOfAnUnmodulatedCarrier = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/InputSource.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/InputSource.cs
index 13334ab..ed0e147 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/InputSource.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/InputSource.cs
@@ -1,129 +1,129 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for InputSource (radio.tx.inputsource, Input Source, 
-    /// section 9.1.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum InputSource : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Pilot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pilot.")]
-        Pilot = 1,
-
-        /// <summary>
-        /// Copilot.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Copilot.")]
-        Copilot = 2,
-
-        /// <summary>
-        /// First Officer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("First Officer.")]
-        FirstOfficer = 3,
-
-        /// <summary>
-        /// Driver.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Driver.")]
-        Driver = 4,
-
-        /// <summary>
-        /// Loader.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Loader.")]
-        Loader = 5,
-
-        /// <summary>
-        /// Gunner.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gunner.")]
-        Gunner = 6,
-
-        /// <summary>
-        /// Commander.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Commander.")]
-        Commander = 7,
-
-        /// <summary>
-        /// Digital Data Device.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Digital Data Device.")]
-        DigitalDataDevice = 8,
-
-        /// <summary>
-        /// Intercom.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intercom.")]
-        Intercom = 9
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for InputSource (radio.tx.inputsource, Input Source, 
+    /// section 9.1.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum InputSource : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Pilot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pilot.")]
+        Pilot = 1,
+
+        /// <summary>
+        /// Copilot.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Copilot.")]
+        Copilot = 2,
+
+        /// <summary>
+        /// First Officer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("First Officer.")]
+        FirstOfficer = 3,
+
+        /// <summary>
+        /// Driver.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Driver.")]
+        Driver = 4,
+
+        /// <summary>
+        /// Loader.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Loader.")]
+        Loader = 5,
+
+        /// <summary>
+        /// Gunner.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gunner.")]
+        Gunner = 6,
+
+        /// <summary>
+        /// Commander.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Commander.")]
+        Commander = 7,
+
+        /// <summary>
+        /// Digital Data Device.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Digital Data Device.")]
+        DigitalDataDevice = 8,
+
+        /// <summary>
+        /// Intercom.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intercom.")]
+        Intercom = 9
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
index 05ab5af..6c02300 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsSynchronizationState.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for JtidsSynchronizationState (radio.tx.param.jtids.sync, Synchronization State, 
-    /// section 9.1.7.2.3)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum JtidsSynchronizationState : byte
-    {
-        /// <summary>
-        /// Coarse Synchronization.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Coarse Synchronization.")]
-        CoarseSynchronization = 1,
-
-        /// <summary>
-        /// Fine Synchronization.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fine Synchronization.")]
-        FineSynchronization = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for JtidsSynchronizationState (radio.tx.param.jtids.sync, Synchronization State, 
+    /// section 9.1.7.2.3)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum JtidsSynchronizationState : byte
+    {
+        /// <summary>
+        /// Coarse Synchronization.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Coarse Synchronization.")]
+        CoarseSynchronization = 1,
+
+        /// <summary>
+        /// Fine Synchronization.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fine Synchronization.")]
+        FineSynchronization = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
index bd0b147..756ac53 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalPrimaryMode.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for JtidsTransmittingTerminalPrimaryMode (radio.tx.param.jtids.mode1, Transmitting Terminal Primary Mode, 
-    /// section 9.1.7.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum JtidsTransmittingTerminalPrimaryMode : byte
-    {
-        /// <summary>
-        /// NTR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NTR.")]
-        NTR = 1,
-
-        /// <summary>
-        /// JTIDS Unit Participant.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JTIDS Unit Participant.")]
-        JTIDSUnitParticipant = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for JtidsTransmittingTerminalPrimaryMode (radio.tx.param.jtids.mode1, Transmitting Terminal Primary Mode, 
+    /// section 9.1.7.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum JtidsTransmittingTerminalPrimaryMode : byte
+    {
+        /// <summary>
+        /// NTR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NTR.")]
+        NTR = 1,
+
+        /// <summary>
+        /// JTIDS Unit Participant.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JTIDS Unit Participant.")]
+        JTIDSUnitParticipant = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
index 8081378..7f20ad3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/JtidsTransmittingTerminalSecondaryMode.cs
@@ -1,69 +1,69 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for JtidsTransmittingTerminalSecondaryMode (radio.tx.param.jtids.mode2, Transmitting Terminal Secondary Mode, 
-    /// section 9.1.7.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum JtidsTransmittingTerminalSecondaryMode : byte
-    {
-        /// <summary>
-        /// None.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("None.")]
-        None = 0,
-
-        /// <summary>
-        /// Net Position Reference.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Net Position Reference.")]
-        NetPositionReference = 1,
-
-        /// <summary>
-        /// Primary Navigation Controller.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary Navigation Controller.")]
-        PrimaryNavigationController = 2,
-
-        /// <summary>
-        /// Secondary Navigation Controller.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Secondary Navigation Controller.")]
-        SecondaryNavigationController = 3
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for JtidsTransmittingTerminalSecondaryMode (radio.tx.param.jtids.mode2, Transmitting Terminal Secondary Mode, 
+    /// section 9.1.7.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum JtidsTransmittingTerminalSecondaryMode : byte
+    {
+        /// <summary>
+        /// None.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("None.")]
+        None = 0,
+
+        /// <summary>
+        /// Net Position Reference.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Net Position Reference.")]
+        NetPositionReference = 1,
+
+        /// <summary>
+        /// Primary Navigation Controller.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary Navigation Controller.")]
+        PrimaryNavigationController = 2,
+
+        /// <summary>
+        /// Secondary Navigation Controller.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Secondary Navigation Controller.")]
+        SecondaryNavigationController = 3
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/MajorModulation.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/MajorModulation.cs
index 120e000..1bc82e0 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/MajorModulation.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/MajorModulation.cs
@@ -1,109 +1,109 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for MajorModulation (radio.tx.mod.major, Major Modulation, 
-    /// section 9.1.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum MajorModulation : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Amplitude.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Amplitude.")]
-        Amplitude = 1,
-
-        /// <summary>
-        /// Amplitude and Angle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Amplitude and Angle.")]
-        AmplitudeAndAngle = 2,
-
-        /// <summary>
-        /// Angle.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Angle.")]
-        Angle = 3,
-
-        /// <summary>
-        /// Combination.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Combination.")]
-        Combination = 4,
-
-        /// <summary>
-        /// Pulse.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pulse.")]
-        Pulse = 5,
-
-        /// <summary>
-        /// Unmodulated.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unmodulated.")]
-        Unmodulated = 6,
-
-        /// <summary>
-        /// Carrier Phase Shift Modulation (CPSM).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Carrier Phase Shift Modulation (CPSM).")]
-        CarrierPhaseShiftModulationCPSM = 7
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for MajorModulation (radio.tx.mod.major, Major Modulation, 
+    /// section 9.1.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum MajorModulation : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Amplitude.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Amplitude.")]
+        Amplitude = 1,
+
+        /// <summary>
+        /// Amplitude and Angle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Amplitude and Angle.")]
+        AmplitudeAndAngle = 2,
+
+        /// <summary>
+        /// Angle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Angle.")]
+        Angle = 3,
+
+        /// <summary>
+        /// Combination.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Combination.")]
+        Combination = 4,
+
+        /// <summary>
+        /// Pulse.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pulse.")]
+        Pulse = 5,
+
+        /// <summary>
+        /// Unmodulated.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unmodulated.")]
+        Unmodulated = 6,
+
+        /// <summary>
+        /// Carrier Phase Shift Modulation (CPSM).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Carrier Phase Shift Modulation (CPSM).")]
+        CarrierPhaseShiftModulationCPSM = 7
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
index 301e097..e8edb3f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/RadioSignalEncoding.cs
@@ -1,313 +1,313 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for RadioSignalEncoding (radio.tx.encoding, Radio signal encoding, 
-    /// section 9.1.8 - 9.1.9)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public struct RadioSignalEncoding
-    {
-        /// <summary>
-        /// Encoding type
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Encoding type")]
-        public enum EncodingTypeValue : uint
-        {
-            /// <summary>
-            /// 8-bit mu-law
-            /// </summary>
-            _8BitMuLaw = 1,
-
-            /// <summary>
-            /// CVSD per MIL-STD-188-113
-            /// </summary>
-            CVSDPerMILSTD188113 = 2,
-
-            /// <summary>
-            /// ADPCM per CCITT G.721
-            /// </summary>
-            ADPCMPerCCITTG721 = 3,
-
-            /// <summary>
-            /// 16-bit linear PCM
-            /// </summary>
-            _16BitLinearPCM = 4,
-
-            /// <summary>
-            /// 8-bit linear PCM
-            /// </summary>
-            _8BitLinearPCM = 5,
-
-            /// <summary>
-            /// VQ (Vector Quantization)
-            /// </summary>
-            VQVectorQuantization = 6
-        }
-
-        /// <summary>
-        /// Encoding class
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Encoding class")]
-        public enum EncodingClassValue : uint
-        {
-            /// <summary>
-            /// Encoded audio
-            /// </summary>
-            EncodedAudio = 0,
-
-            /// <summary>
-            /// Raw Binary Data
-            /// </summary>
-            RawBinaryData = 1,
-
-            /// <summary>
-            /// Application-Specific Data
-            /// </summary>
-            ApplicationSpecificData = 2,
-
-            /// <summary>
-            /// Database index
-            /// </summary>
-            DatabaseIndex = 3
-        }
-
-        private RadioSignalEncoding.EncodingTypeValue encodingType;
-        private RadioSignalEncoding.EncodingClassValue encodingClass;
-
-        /// <summary>
-        /// Implements the operator !=.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator !=(RadioSignalEncoding left, RadioSignalEncoding right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implements the operator ==.
-        /// </summary>
-        /// <param name="left">The left operand.</param>
-        /// <param name="right">The right operand.</param>
-        /// <returns>
-        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool operator ==(RadioSignalEncoding left, RadioSignalEncoding right)
-        {
-            if (object.ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            // If parameters are null return false (cast to object to prevent recursive loop!)
-            if (((object)left == null) || ((object)right == null))
-            {
-                return false;
-            }
-
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> to <see cref="System.UInt16"/>.
-        /// </summary>
-        /// <param name="obj">The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> scheme instance.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator ushort(RadioSignalEncoding obj)
-        {
-            return obj.ToUInt16();
-        }
-
-        /// <summary>
-        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/>.
-        /// </summary>
-        /// <param name="value">The ushort value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator RadioSignalEncoding(ushort value)
-        {
-            return RadioSignalEncoding.FromUInt16(value);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance from the byte array.
-        /// </summary>
-        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/>.</param>
-        /// <param name="index">The starting position within value.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance, represented by a byte array.</returns>
-        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
-        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
-        public static RadioSignalEncoding FromByteArray(byte[] array, int index)
-        {
-            if (array == null)
-            {
-                throw new ArgumentNullException("array");
-            }
-
-            if (index < 0 ||
-                index > array.Length - 1 ||
-                index + 2 > array.Length - 1)
-            {
-                throw new IndexOutOfRangeException();
-            }
-
-            return FromUInt16(BitConverter.ToUInt16(array, index));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance from the ushort value.
-        /// </summary>
-        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance.</param>
-        /// <returns>The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance, represented by the ushort value.</returns>
-        public static RadioSignalEncoding FromUInt16(ushort value)
-        {
-            RadioSignalEncoding ps = new RadioSignalEncoding();
-
-            uint mask0 = 0x3fff;
-            byte shift0 = 0;
-            uint newValue0 = (value & mask0) >> shift0;
-            ps.EncodingType = (RadioSignalEncoding.EncodingTypeValue)newValue0;
-
-            uint mask1 = 0xc000;
-            byte shift1 = 14;
-            uint newValue1 = (value & mask1) >> shift1;
-            ps.EncodingClass = (RadioSignalEncoding.EncodingClassValue)newValue1;
-
-            return ps;
-        }
-
-        /// <summary>
-        /// Gets or sets the encodingtype.
-        /// </summary>
-        /// <value>The encodingtype.</value>
-        public RadioSignalEncoding.EncodingTypeValue EncodingType
-        {
-            get { return this.encodingType; }
-            set { this.encodingType = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the encodingclass.
-        /// </summary>
-        /// <value>The encodingclass.</value>
-        public RadioSignalEncoding.EncodingClassValue EncodingClass
-        {
-            get { return this.encodingClass; }
-            set { this.encodingClass = value; }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (!(obj is RadioSignalEncoding))
-            {
-                return false;
-            }
-
-            return this.Equals((RadioSignalEncoding)obj);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance to compare with this instance.</param>
-        /// <returns>
-        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public bool Equals(RadioSignalEncoding other)
-        {
-            // If parameter is null return false (cast to object to prevent recursive loop!)
-            if ((object)other == null)
-            {
-                return false;
-            }
-
-            return
-                this.EncodingType == other.EncodingType &&
-                this.EncodingClass == other.EncodingClass;
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> to the byte array.
-        /// </summary>
-        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance.</returns>
-        public byte[] ToByteArray()
-        {
-            return BitConverter.GetBytes(this.ToUInt16());
-        }
-
-        /// <summary>
-        /// Converts the instance of <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> to the ushort value.
-        /// </summary>
-        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance.</returns>
-        public ushort ToUInt16()
-        {
-            ushort val = 0;
-
-            val |= (ushort)((uint)this.EncodingType << 0);
-            val |= (ushort)((uint)this.EncodingClass << 14);
-
-            return val;
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 17;
-
-            // Overflow is fine, just wrap
-            unchecked
-            {
-                hash = (hash * 29) + this.EncodingType.GetHashCode();
-                hash = (hash * 29) + this.EncodingClass.GetHashCode();
-            }
-
-            return hash;
-        }
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for RadioSignalEncoding (radio.tx.encoding, Radio signal encoding, 
+    /// section 9.1.8 - 9.1.9)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public struct RadioSignalEncoding
+    {
+        /// <summary>
+        /// Encoding type
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Encoding type")]
+        public enum EncodingTypeValue : uint
+        {
+            /// <summary>
+            /// 8-bit mu-law
+            /// </summary>
+            _8BitMuLaw = 1,
+
+            /// <summary>
+            /// CVSD per MIL-STD-188-113
+            /// </summary>
+            CVSDPerMILSTD188113 = 2,
+
+            /// <summary>
+            /// ADPCM per CCITT G.721
+            /// </summary>
+            ADPCMPerCCITTG721 = 3,
+
+            /// <summary>
+            /// 16-bit linear PCM
+            /// </summary>
+            _16BitLinearPCM = 4,
+
+            /// <summary>
+            /// 8-bit linear PCM
+            /// </summary>
+            _8BitLinearPCM = 5,
+
+            /// <summary>
+            /// VQ (Vector Quantization)
+            /// </summary>
+            VQVectorQuantization = 6
+        }
+
+        /// <summary>
+        /// Encoding class
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Encoding class")]
+        public enum EncodingClassValue : uint
+        {
+            /// <summary>
+            /// Encoded audio
+            /// </summary>
+            EncodedAudio = 0,
+
+            /// <summary>
+            /// Raw Binary Data
+            /// </summary>
+            RawBinaryData = 1,
+
+            /// <summary>
+            /// Application-Specific Data
+            /// </summary>
+            ApplicationSpecificData = 2,
+
+            /// <summary>
+            /// Database index
+            /// </summary>
+            DatabaseIndex = 3
+        }
+
+        private RadioSignalEncoding.EncodingTypeValue encodingType;
+        private RadioSignalEncoding.EncodingClassValue encodingClass;
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioSignalEncoding left, RadioSignalEncoding right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioSignalEncoding left, RadioSignalEncoding right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            // If parameters are null return false (cast to object to prevent recursive loop!)
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> to <see cref="System.UInt16"/>.
+        /// </summary>
+        /// <param name="obj">The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> scheme instance.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator ushort(RadioSignalEncoding obj)
+        {
+            return obj.ToUInt16();
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="System.UInt16"/> to <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/>.
+        /// </summary>
+        /// <param name="value">The ushort value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator RadioSignalEncoding(ushort value)
+        {
+            return RadioSignalEncoding.FromUInt16(value);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance from the byte array.
+        /// </summary>
+        /// <param name="array">The array which holds the values for the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/>.</param>
+        /// <param name="index">The starting position within value.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance, represented by a byte array.</returns>
+        /// <exception cref="ArgumentNullException">if the <c>array</c> is null.</exception>
+        /// <exception cref="IndexOutOfRangeException">if the <c>index</c> is lower than 0 or greater or equal than number of elements in array.</exception>
+        public static RadioSignalEncoding FromByteArray(byte[] array, int index)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            if (index < 0 ||
+                index > array.Length - 1 ||
+                index + 2 > array.Length - 1)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            return FromUInt16(BitConverter.ToUInt16(array, index));
+        }
+
+        /// <summary>
+        /// Creates the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance from the ushort value.
+        /// </summary>
+        /// <param name="value">The ushort value which represents the <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance.</param>
+        /// <returns>The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance, represented by the ushort value.</returns>
+        public static RadioSignalEncoding FromUInt16(ushort value)
+        {
+            RadioSignalEncoding ps = new RadioSignalEncoding();
+
+            uint mask0 = 0x3fff;
+            byte shift0 = 0;
+            uint newValue0 = (value & mask0) >> shift0;
+            ps.EncodingType = (RadioSignalEncoding.EncodingTypeValue)newValue0;
+
+            uint mask1 = 0xc000;
+            byte shift1 = 14;
+            uint newValue1 = (value & mask1) >> shift1;
+            ps.EncodingClass = (RadioSignalEncoding.EncodingClassValue)newValue1;
+
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets the encodingtype.
+        /// </summary>
+        /// <value>The encodingtype.</value>
+        public RadioSignalEncoding.EncodingTypeValue EncodingType
+        {
+            get { return this.encodingType; }
+            set { this.encodingType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the encodingclass.
+        /// </summary>
+        /// <value>The encodingclass.</value>
+        public RadioSignalEncoding.EncodingClassValue EncodingClass
+        {
+            get { return this.encodingClass; }
+            set { this.encodingClass = value; }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            if (!(obj is RadioSignalEncoding))
+            {
+                return false;
+            }
+
+            return this.Equals((RadioSignalEncoding)obj);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance is equal to this instance.
+        /// </summary>
+        /// <param name="other">The <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioSignalEncoding other)
+        {
+            // If parameter is null return false (cast to object to prevent recursive loop!)
+            if ((object)other == null)
+            {
+                return false;
+            }
+
+            return
+                this.EncodingType == other.EncodingType &&
+                this.EncodingClass == other.EncodingClass;
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> to the byte array.
+        /// </summary>
+        /// <returns>The byte array representing the current <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance.</returns>
+        public byte[] ToByteArray()
+        {
+            return BitConverter.GetBytes(this.ToUInt16());
+        }
+
+        /// <summary>
+        /// Converts the instance of <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> to the ushort value.
+        /// </summary>
+        /// <returns>The ushort value representing the current <see cref="OpenDis.Enumerations.Radio.Transmitter.RadioSignalEncoding"/> instance.</returns>
+        public ushort ToUInt16()
+        {
+            ushort val = 0;
+
+            val |= (ushort)((uint)this.EncodingType << 0);
+            val |= (ushort)((uint)this.EncodingClass << 14);
+
+            return val;
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// 	A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            int hash = 17;
+
+            // Overflow is fine, just wrap
+            unchecked
+            {
+                hash = (hash * 29) + this.EncodingType.GetHashCode();
+                hash = (hash * 29) + this.EncodingClass.GetHashCode();
+            }
+
+            return hash;
+        }
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/ReferenceSystem.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/ReferenceSystem.cs
index 4c66e67..f6147c8 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/ReferenceSystem.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/ReferenceSystem.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for ReferenceSystem (radio.tx.referencesystem, Reference System, 
-    /// section 9.1.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ReferenceSystem : byte
-    {
-        /// <summary>
-        /// World Coordinates.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("World Coordinates.")]
-        WorldCoordinates = 1,
-
-        /// <summary>
-        /// Entity Coordinates.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Coordinates.")]
-        EntityCoordinates = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for ReferenceSystem (radio.tx.referencesystem, Reference System, 
+    /// section 9.1.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ReferenceSystem : byte
+    {
+        /// <summary>
+        /// World Coordinates.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("World Coordinates.")]
+        WorldCoordinates = 1,
+
+        /// <summary>
+        /// Entity Coordinates.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Coordinates.")]
+        EntityCoordinates = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
index 5ff2c1b..3f2d00c 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/SpreadSpectrum.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for SpreadSpectrum (radio.tx.mod.spreadspectrum, Spread Spectrum, 
-    /// section 9.1.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum SpreadSpectrum : ushort
-    {
-        /// <summary>
-        /// Frequency Hopping
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Frequency Hopping")]
-        FrequencyHopping = 1,
-
-        /// <summary>
-        /// Pseudo-noise
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pseudo-noise")]
-        PseudoNoise = 2,
-
-        /// <summary>
-        /// Time Hopping
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Hopping")]
-        TimeHopping = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for SpreadSpectrum (radio.tx.mod.spreadspectrum, Spread Spectrum, 
+    /// section 9.1.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum SpreadSpectrum : ushort
+    {
+        /// <summary>
+        /// Frequency Hopping
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Frequency Hopping")]
+        FrequencyHopping = 1,
+
+        /// <summary>
+        /// Pseudo-noise
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pseudo-noise")]
+        PseudoNoise = 2,
+
+        /// <summary>
+        /// Time Hopping
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Hopping")]
+        TimeHopping = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/StartOfMessage.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/StartOfMessage.cs
index 6bbb94f..e0a299d 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/StartOfMessage.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/StartOfMessage.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for StartOfMessage (radio.tx.param.cctt.start, Start of Message, 
-    /// section 9.1.7.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum StartOfMessage : byte
-    {
-        /// <summary>
-        /// Not start of message.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Not start of message.")]
-        NotStartOfMessage = 0,
-
-        /// <summary>
-        /// Start of Message.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Start of Message.")]
-        StartOfMessage = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for StartOfMessage (radio.tx.param.cctt.start, Start of Message, 
+    /// section 9.1.7.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum StartOfMessage : byte
+    {
+        /// <summary>
+        /// Not start of message.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Not start of message.")]
+        NotStartOfMessage = 0,
+
+        /// <summary>
+        /// Start of Message.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Start of Message.")]
+        StartOfMessage = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/TDLType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/TDLType.cs
index e262ff6..216ab2a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TDLType.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/TDLType.cs
@@ -1,759 +1,759 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for TDLType (radio.tx.tdltype, TDL Type, 
-    /// section 9.1.11)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum TDLType : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// PADIL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PADIL.")]
-        PADIL = 1,
-
-        /// <summary>
-        /// NATO Link-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NATO Link-1.")]
-        NATOLink1 = 2,
-
-        /// <summary>
-        /// ATDL-1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ATDL-1.")]
-        ATDL1 = 3,
-
-        /// <summary>
-        /// Link 11B (TADIL B).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 11B (TADIL B).")]
-        Link11BTADILB = 4,
-
-        /// <summary>
-        /// Situational Awareness Data Link (SADL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Situational Awareness Data Link (SADL).")]
-        SituationalAwarenessDataLinkSADL = 5,
-
-        /// <summary>
-        /// Link 16 Legacy Format (JTIDS/TADIL-J).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 16 Legacy Format (JTIDS/TADIL-J).")]
-        Link16LegacyFormatJTIDSTADILJ = 6,
-
-        /// <summary>
-        /// Link 16 Legacy Format (JTIDS/FDL/TADIL-J).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 16 Legacy Format (JTIDS/FDL/TADIL-J).")]
-        Link16LegacyFormatJTIDSFDLTADILJ = 7,
-
-        /// <summary>
-        /// Link 11A (TADIL A).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 11A (TADIL A).")]
-        Link11ATADILA = 8,
-
-        /// <summary>
-        /// IJMS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IJMS.")]
-        IJMS = 9,
-
-        /// <summary>
-        /// Link 4A (TADIL C).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 4A (TADIL C).")]
-        Link4ATADILC = 10,
-
-        /// <summary>
-        /// Link 4C.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 4C.")]
-        Link4C = 11,
-
-        /// <summary>
-        /// TIBS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TIBS.")]
-        TIBS = 12,
-
-        /// <summary>
-        /// ATL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ATL.")]
-        ATL = 13,
-
-        /// <summary>
-        /// Constant Source.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Constant Source.")]
-        ConstantSource = 14,
-
-        /// <summary>
-        /// Abbreviated Command and Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Abbreviated Command and Control.")]
-        AbbreviatedCommandAndControl = 15,
-
-        /// <summary>
-        /// MILSTAR.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MILSTAR.")]
-        MILSTAR = 16,
-
-        /// <summary>
-        /// ATHS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ATHS.")]
-        ATHS = 17,
-
-        /// <summary>
-        /// OTHGOLD.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OTHGOLD.")]
-        OTHGOLD = 18,
-
-        /// <summary>
-        /// TACELINT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACELINT.")]
-        TACELINT = 19,
-
-        /// <summary>
-        /// Weapons Data Link (AWW-13).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapons Data Link (AWW-13).")]
-        WeaponsDataLinkAWW13 = 20,
-
-        /// <summary>
-        /// Abbreviated Command and Control.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Abbreviated Command and Control.")]
-        AbbreviatedCommandAndControl_21 = 21,
-
-        /// <summary>
-        /// Enhanced Position Location Reporting System (EPLRS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Enhanced Position Location Reporting System (EPLRS).")]
-        EnhancedPositionLocationReportingSystemEPLRS = 22,
-
-        /// <summary>
-        /// Position Location Reporting System (PLRS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Location Reporting System (PLRS).")]
-        PositionLocationReportingSystemPLRS = 23,
-
-        /// <summary>
-        /// SINCGARS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SINCGARS.")]
-        SINCGARS = 24,
-
-        /// <summary>
-        /// Have Quick I.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Have Quick I.")]
-        HaveQuickI = 25,
-
-        /// <summary>
-        /// Have Quick II.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Have Quick II.")]
-        HaveQuickII = 26,
-
-        /// <summary>
-        /// Have Quick IIA (Saturn).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Have Quick IIA (Saturn).")]
-        HaveQuickIIASaturn = 27,
-
-        /// <summary>
-        /// Intra-Flight Data Link 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intra-Flight Data Link 1.")]
-        IntraFlightDataLink1 = 28,
-
-        /// <summary>
-        /// Intra-Flight Data Link 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intra-Flight Data Link 2.")]
-        IntraFlightDataLink2 = 29,
-
-        /// <summary>
-        /// Improved Data Modem (IDM).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Improved Data Modem (IDM).")]
-        ImprovedDataModemIDM = 30,
-
-        /// <summary>
-        /// Air Force Application Program Development (AFAPD).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Force Application Program Development (AFAPD).")]
-        AirForceApplicationProgramDevelopmentAFAPD = 31,
-
-        /// <summary>
-        /// Cooperative Engagement Capability (CEC).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cooperative Engagement Capability (CEC).")]
-        CooperativeEngagementCapabilityCEC = 32,
-
-        /// <summary>
-        /// Forward Area Air Defense (FAAD) Data Link (FDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Forward Area Air Defense (FAAD) Data Link (FDL).")]
-        ForwardAreaAirDefenseFAADDataLinkFDL = 33,
-
-        /// <summary>
-        /// Ground Based Data Link (GBDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ground Based Data Link (GBDL).")]
-        GroundBasedDataLinkGBDL = 34,
-
-        /// <summary>
-        /// Intra Vehicular Info System (IVIS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intra Vehicular Info System (IVIS).")]
-        IntraVehicularInfoSystemIVIS = 35,
-
-        /// <summary>
-        /// Marine Tactical System (MTS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marine Tactical System (MTS).")]
-        MarineTacticalSystemMTS = 36,
-
-        /// <summary>
-        /// Tactical Fire Direction System (TACFIRE).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical Fire Direction System (TACFIRE).")]
-        TacticalFireDirectionSystemTACFIRE = 37,
-
-        /// <summary>
-        /// Integrated Broadcast Service (IBS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Integrated Broadcast Service (IBS).")]
-        IntegratedBroadcastServiceIBS = 38,
-
-        /// <summary>
-        /// Airborne Information Transfer (ABIT).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Airborne Information Transfer (ABIT).")]
-        AirborneInformationTransferABIT = 39,
-
-        /// <summary>
-        /// Advanced Tactical Airborne Reconnaissance System (ATARS) Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Advanced Tactical Airborne Reconnaissance System (ATARS) Data Link.")]
-        AdvancedTacticalAirborneReconnaissanceSystemATARSDataLink = 40,
-
-        /// <summary>
-        /// Battle Group Passive Horizon Extension System (BGPHES) Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Battle Group Passive Horizon Extension System (BGPHES) Data Link.")]
-        BattleGroupPassiveHorizonExtensionSystemBGPHESDataLink = 41,
-
-        /// <summary>
-        /// Common High Bandwidth Data Link (CHBDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Common High Bandwidth Data Link (CHBDL).")]
-        CommonHighBandwidthDataLinkCHBDL = 42,
-
-        /// <summary>
-        /// Guardrail Interoperable Data Link (IDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guardrail Interoperable Data Link (IDL).")]
-        GuardrailInteroperableDataLinkIDL = 43,
-
-        /// <summary>
-        /// Guardrail Common Sensor System One (CSS1) Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guardrail Common Sensor System One (CSS1) Data Link.")]
-        GuardrailCommonSensorSystemOneCSS1DataLink = 44,
-
-        /// <summary>
-        /// Guardrail Common Sensor System Two (CSS2) Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guardrail Common Sensor System Two (CSS2) Data Link.")]
-        GuardrailCommonSensorSystemTwoCSS2DataLink = 45,
-
-        /// <summary>
-        /// Guardrail CSS2 Multi-Role Data Link (MRDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guardrail CSS2 Multi-Role Data Link (MRDL).")]
-        GuardrailCSS2MultiRoleDataLinkMRDL = 46,
-
-        /// <summary>
-        /// Guardrail CSS2 Direct Air to Satellite Relay (DASR) Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guardrail CSS2 Direct Air to Satellite Relay (DASR) Data Link.")]
-        GuardrailCSS2DirectAirToSatelliteRelayDASRDataLink = 47,
-
-        /// <summary>
-        /// Line of Sight (LOS) Data Link Implementation (LOS tether).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Line of Sight (LOS) Data Link Implementation (LOS tether).")]
-        LineOfSightLOSDataLinkImplementationLOSTether = 48,
-
-        /// <summary>
-        /// Lightweight CDL (LWCDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lightweight CDL (LWCDL).")]
-        LightweightCDLLWCDL = 49,
-
-        /// <summary>
-        /// L-52M (SR-71).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("L-52M (SR-71).")]
-        L52MSR71 = 50,
-
-        /// <summary>
-        /// Rivet Reach/Rivet Owl Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rivet Reach/Rivet Owl Data Link.")]
-        RivetReachRivetOwlDataLink = 51,
-
-        /// <summary>
-        /// Senior Span.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Senior Span.")]
-        SeniorSpan = 52,
-
-        /// <summary>
-        /// Senior Spur.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Senior Spur.")]
-        SeniorSpur = 53,
-
-        /// <summary>
-        /// Senior Stretch.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Senior Stretch.")]
-        SeniorStretch = 54,
-
-        /// <summary>
-        /// Senior Year Interoperable Data Link (IDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Senior Year Interoperable Data Link (IDL).")]
-        SeniorYearInteroperableDataLinkIDL = 55,
-
-        /// <summary>
-        /// Space CDL.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Space CDL.")]
-        SpaceCDL = 56,
-
-        /// <summary>
-        /// TR-1 mode MIST Airborne Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TR-1 mode MIST Airborne Data Link.")]
-        TR1ModeMISTAirborneDataLink = 57,
-
-        /// <summary>
-        /// Ku-band SATCOM Data Link Implementation (UAV).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ku-band SATCOM Data Link Implementation (UAV).")]
-        KuBandSATCOMDataLinkImplementationUAV = 58,
-
-        /// <summary>
-        /// Mission Equipment Control Data link (MECDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mission Equipment Control Data link (MECDL).")]
-        MissionEquipmentControlDataLinkMECDL = 59,
-
-        /// <summary>
-        /// Radar Data Transmitting Set Data Link.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radar Data Transmitting Set Data Link.")]
-        RadarDataTransmittingSetDataLink = 60,
-
-        /// <summary>
-        /// Surveillance and Control Data Link (SCDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Surveillance and Control Data Link (SCDL).")]
-        SurveillanceAndControlDataLinkSCDL = 61,
-
-        /// <summary>
-        /// Tactical UAV Video.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical UAV Video.")]
-        TacticalUAVVideo = 62,
-
-        /// <summary>
-        /// UHF SATCOM Data Link Implementation (UAV).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("UHF SATCOM Data Link Implementation (UAV).")]
-        UHFSATCOMDataLinkImplementationUAV = 63,
-
-        /// <summary>
-        /// Tactical Common Data Link (TCDL).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical Common Data Link (TCDL).")]
-        TacticalCommonDataLinkTCDL = 64,
-
-        /// <summary>
-        /// Low Level Air Picture Interface (LLAPI).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Low Level Air Picture Interface (LLAPI).")]
-        LowLevelAirPictureInterfaceLLAPI = 65,
-
-        /// <summary>
-        /// Weapons Data Link (AGM-130).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapons Data Link (AGM-130).")]
-        WeaponsDataLinkAGM130 = 66,
-
-        /// <summary>
-        /// GC3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GC3.")]
-        GC3 = 99,
-
-        /// <summary>
-        /// Link 16 Standardized Format (JTIDS/MIDS/TADIL J).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 16 Standardized Format (JTIDS/MIDS/TADIL J).")]
-        Link16StandardizedFormatJTIDSMIDSTADILJ = 100,
-
-        /// <summary>
-        /// Link 16 Enhanced Data Rate (EDR JTIDS/MIDS/TADIL-J).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 16 Enhanced Data Rate (EDR JTIDS/MIDS/TADIL-J).")]
-        Link16EnhancedDataRateEDRJTIDSMIDSTADILJ = 101,
-
-        /// <summary>
-        /// JTIDS/MIDS Net Data Load (TIMS/TOMS).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JTIDS/MIDS Net Data Load (TIMS/TOMS).")]
-        JTIDSMIDSNetDataLoadTIMSTOMS = 102,
-
-        /// <summary>
-        /// Link 22.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 22.")]
-        Link22 = 103,
-
-        /// <summary>
-        /// AFIWC IADS Communications Links.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AFIWC IADS Communications Links.")]
-        AFIWCIADSCommunicationsLinks = 104
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for TDLType (radio.tx.tdltype, TDL Type, 
+    /// section 9.1.11)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum TDLType : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// PADIL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PADIL.")]
+        PADIL = 1,
+
+        /// <summary>
+        /// NATO Link-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NATO Link-1.")]
+        NATOLink1 = 2,
+
+        /// <summary>
+        /// ATDL-1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ATDL-1.")]
+        ATDL1 = 3,
+
+        /// <summary>
+        /// Link 11B (TADIL B).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 11B (TADIL B).")]
+        Link11BTADILB = 4,
+
+        /// <summary>
+        /// Situational Awareness Data Link (SADL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Situational Awareness Data Link (SADL).")]
+        SituationalAwarenessDataLinkSADL = 5,
+
+        /// <summary>
+        /// Link 16 Legacy Format (JTIDS/TADIL-J).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 16 Legacy Format (JTIDS/TADIL-J).")]
+        Link16LegacyFormatJTIDSTADILJ = 6,
+
+        /// <summary>
+        /// Link 16 Legacy Format (JTIDS/FDL/TADIL-J).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 16 Legacy Format (JTIDS/FDL/TADIL-J).")]
+        Link16LegacyFormatJTIDSFDLTADILJ = 7,
+
+        /// <summary>
+        /// Link 11A (TADIL A).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 11A (TADIL A).")]
+        Link11ATADILA = 8,
+
+        /// <summary>
+        /// IJMS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IJMS.")]
+        IJMS = 9,
+
+        /// <summary>
+        /// Link 4A (TADIL C).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 4A (TADIL C).")]
+        Link4ATADILC = 10,
+
+        /// <summary>
+        /// Link 4C.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 4C.")]
+        Link4C = 11,
+
+        /// <summary>
+        /// TIBS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TIBS.")]
+        TIBS = 12,
+
+        /// <summary>
+        /// ATL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ATL.")]
+        ATL = 13,
+
+        /// <summary>
+        /// Constant Source.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Constant Source.")]
+        ConstantSource = 14,
+
+        /// <summary>
+        /// Abbreviated Command and Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Abbreviated Command and Control.")]
+        AbbreviatedCommandAndControl = 15,
+
+        /// <summary>
+        /// MILSTAR.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MILSTAR.")]
+        MILSTAR = 16,
+
+        /// <summary>
+        /// ATHS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ATHS.")]
+        ATHS = 17,
+
+        /// <summary>
+        /// OTHGOLD.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OTHGOLD.")]
+        OTHGOLD = 18,
+
+        /// <summary>
+        /// TACELINT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACELINT.")]
+        TACELINT = 19,
+
+        /// <summary>
+        /// Weapons Data Link (AWW-13).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapons Data Link (AWW-13).")]
+        WeaponsDataLinkAWW13 = 20,
+
+        /// <summary>
+        /// Abbreviated Command and Control.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Abbreviated Command and Control.")]
+        AbbreviatedCommandAndControl_21 = 21,
+
+        /// <summary>
+        /// Enhanced Position Location Reporting System (EPLRS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Enhanced Position Location Reporting System (EPLRS).")]
+        EnhancedPositionLocationReportingSystemEPLRS = 22,
+
+        /// <summary>
+        /// Position Location Reporting System (PLRS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Location Reporting System (PLRS).")]
+        PositionLocationReportingSystemPLRS = 23,
+
+        /// <summary>
+        /// SINCGARS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SINCGARS.")]
+        SINCGARS = 24,
+
+        /// <summary>
+        /// Have Quick I.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Have Quick I.")]
+        HaveQuickI = 25,
+
+        /// <summary>
+        /// Have Quick II.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Have Quick II.")]
+        HaveQuickII = 26,
+
+        /// <summary>
+        /// Have Quick IIA (Saturn).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Have Quick IIA (Saturn).")]
+        HaveQuickIIASaturn = 27,
+
+        /// <summary>
+        /// Intra-Flight Data Link 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intra-Flight Data Link 1.")]
+        IntraFlightDataLink1 = 28,
+
+        /// <summary>
+        /// Intra-Flight Data Link 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intra-Flight Data Link 2.")]
+        IntraFlightDataLink2 = 29,
+
+        /// <summary>
+        /// Improved Data Modem (IDM).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Improved Data Modem (IDM).")]
+        ImprovedDataModemIDM = 30,
+
+        /// <summary>
+        /// Air Force Application Program Development (AFAPD).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Force Application Program Development (AFAPD).")]
+        AirForceApplicationProgramDevelopmentAFAPD = 31,
+
+        /// <summary>
+        /// Cooperative Engagement Capability (CEC).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cooperative Engagement Capability (CEC).")]
+        CooperativeEngagementCapabilityCEC = 32,
+
+        /// <summary>
+        /// Forward Area Air Defense (FAAD) Data Link (FDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Forward Area Air Defense (FAAD) Data Link (FDL).")]
+        ForwardAreaAirDefenseFAADDataLinkFDL = 33,
+
+        /// <summary>
+        /// Ground Based Data Link (GBDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ground Based Data Link (GBDL).")]
+        GroundBasedDataLinkGBDL = 34,
+
+        /// <summary>
+        /// Intra Vehicular Info System (IVIS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intra Vehicular Info System (IVIS).")]
+        IntraVehicularInfoSystemIVIS = 35,
+
+        /// <summary>
+        /// Marine Tactical System (MTS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marine Tactical System (MTS).")]
+        MarineTacticalSystemMTS = 36,
+
+        /// <summary>
+        /// Tactical Fire Direction System (TACFIRE).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical Fire Direction System (TACFIRE).")]
+        TacticalFireDirectionSystemTACFIRE = 37,
+
+        /// <summary>
+        /// Integrated Broadcast Service (IBS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Integrated Broadcast Service (IBS).")]
+        IntegratedBroadcastServiceIBS = 38,
+
+        /// <summary>
+        /// Airborne Information Transfer (ABIT).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Airborne Information Transfer (ABIT).")]
+        AirborneInformationTransferABIT = 39,
+
+        /// <summary>
+        /// Advanced Tactical Airborne Reconnaissance System (ATARS) Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Advanced Tactical Airborne Reconnaissance System (ATARS) Data Link.")]
+        AdvancedTacticalAirborneReconnaissanceSystemATARSDataLink = 40,
+
+        /// <summary>
+        /// Battle Group Passive Horizon Extension System (BGPHES) Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Battle Group Passive Horizon Extension System (BGPHES) Data Link.")]
+        BattleGroupPassiveHorizonExtensionSystemBGPHESDataLink = 41,
+
+        /// <summary>
+        /// Common High Bandwidth Data Link (CHBDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Common High Bandwidth Data Link (CHBDL).")]
+        CommonHighBandwidthDataLinkCHBDL = 42,
+
+        /// <summary>
+        /// Guardrail Interoperable Data Link (IDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guardrail Interoperable Data Link (IDL).")]
+        GuardrailInteroperableDataLinkIDL = 43,
+
+        /// <summary>
+        /// Guardrail Common Sensor System One (CSS1) Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guardrail Common Sensor System One (CSS1) Data Link.")]
+        GuardrailCommonSensorSystemOneCSS1DataLink = 44,
+
+        /// <summary>
+        /// Guardrail Common Sensor System Two (CSS2) Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guardrail Common Sensor System Two (CSS2) Data Link.")]
+        GuardrailCommonSensorSystemTwoCSS2DataLink = 45,
+
+        /// <summary>
+        /// Guardrail CSS2 Multi-Role Data Link (MRDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guardrail CSS2 Multi-Role Data Link (MRDL).")]
+        GuardrailCSS2MultiRoleDataLinkMRDL = 46,
+
+        /// <summary>
+        /// Guardrail CSS2 Direct Air to Satellite Relay (DASR) Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guardrail CSS2 Direct Air to Satellite Relay (DASR) Data Link.")]
+        GuardrailCSS2DirectAirToSatelliteRelayDASRDataLink = 47,
+
+        /// <summary>
+        /// Line of Sight (LOS) Data Link Implementation (LOS tether).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Line of Sight (LOS) Data Link Implementation (LOS tether).")]
+        LineOfSightLOSDataLinkImplementationLOSTether = 48,
+
+        /// <summary>
+        /// Lightweight CDL (LWCDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lightweight CDL (LWCDL).")]
+        LightweightCDLLWCDL = 49,
+
+        /// <summary>
+        /// L-52M (SR-71).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("L-52M (SR-71).")]
+        L52MSR71 = 50,
+
+        /// <summary>
+        /// Rivet Reach/Rivet Owl Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rivet Reach/Rivet Owl Data Link.")]
+        RivetReachRivetOwlDataLink = 51,
+
+        /// <summary>
+        /// Senior Span.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Senior Span.")]
+        SeniorSpan = 52,
+
+        /// <summary>
+        /// Senior Spur.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Senior Spur.")]
+        SeniorSpur = 53,
+
+        /// <summary>
+        /// Senior Stretch.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Senior Stretch.")]
+        SeniorStretch = 54,
+
+        /// <summary>
+        /// Senior Year Interoperable Data Link (IDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Senior Year Interoperable Data Link (IDL).")]
+        SeniorYearInteroperableDataLinkIDL = 55,
+
+        /// <summary>
+        /// Space CDL.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Space CDL.")]
+        SpaceCDL = 56,
+
+        /// <summary>
+        /// TR-1 mode MIST Airborne Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TR-1 mode MIST Airborne Data Link.")]
+        TR1ModeMISTAirborneDataLink = 57,
+
+        /// <summary>
+        /// Ku-band SATCOM Data Link Implementation (UAV).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ku-band SATCOM Data Link Implementation (UAV).")]
+        KuBandSATCOMDataLinkImplementationUAV = 58,
+
+        /// <summary>
+        /// Mission Equipment Control Data link (MECDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mission Equipment Control Data link (MECDL).")]
+        MissionEquipmentControlDataLinkMECDL = 59,
+
+        /// <summary>
+        /// Radar Data Transmitting Set Data Link.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radar Data Transmitting Set Data Link.")]
+        RadarDataTransmittingSetDataLink = 60,
+
+        /// <summary>
+        /// Surveillance and Control Data Link (SCDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Surveillance and Control Data Link (SCDL).")]
+        SurveillanceAndControlDataLinkSCDL = 61,
+
+        /// <summary>
+        /// Tactical UAV Video.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical UAV Video.")]
+        TacticalUAVVideo = 62,
+
+        /// <summary>
+        /// UHF SATCOM Data Link Implementation (UAV).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("UHF SATCOM Data Link Implementation (UAV).")]
+        UHFSATCOMDataLinkImplementationUAV = 63,
+
+        /// <summary>
+        /// Tactical Common Data Link (TCDL).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical Common Data Link (TCDL).")]
+        TacticalCommonDataLinkTCDL = 64,
+
+        /// <summary>
+        /// Low Level Air Picture Interface (LLAPI).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Low Level Air Picture Interface (LLAPI).")]
+        LowLevelAirPictureInterfaceLLAPI = 65,
+
+        /// <summary>
+        /// Weapons Data Link (AGM-130).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapons Data Link (AGM-130).")]
+        WeaponsDataLinkAGM130 = 66,
+
+        /// <summary>
+        /// GC3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GC3.")]
+        GC3 = 99,
+
+        /// <summary>
+        /// Link 16 Standardized Format (JTIDS/MIDS/TADIL J).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 16 Standardized Format (JTIDS/MIDS/TADIL J).")]
+        Link16StandardizedFormatJTIDSMIDSTADILJ = 100,
+
+        /// <summary>
+        /// Link 16 Enhanced Data Rate (EDR JTIDS/MIDS/TADIL-J).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 16 Enhanced Data Rate (EDR JTIDS/MIDS/TADIL-J).")]
+        Link16EnhancedDataRateEDRJTIDSMIDSTADILJ = 101,
+
+        /// <summary>
+        /// JTIDS/MIDS Net Data Load (TIMS/TOMS).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JTIDS/MIDS Net Data Load (TIMS/TOMS).")]
+        JTIDSMIDSNetDataLoadTIMSTOMS = 102,
+
+        /// <summary>
+        /// Link 22.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 22.")]
+        Link22 = 103,
+
+        /// <summary>
+        /// AFIWC IADS Communications Links.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AFIWC IADS Communications Links.")]
+        AFIWCIADSCommunicationsLinks = 104
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/TransmitState.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/TransmitState.cs
index b52b446..1aa1750 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitState.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/TransmitState.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for TransmitState (radio.tx.state, Transmit State, 
-    /// section 9.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum TransmitState : byte
-    {
-        /// <summary>
-        /// Off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Off.")]
-        Off = 0,
-
-        /// <summary>
-        /// On but not transmitting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On but not transmitting.")]
-        OnButNotTransmitting = 1,
-
-        /// <summary>
-        /// On and transmitting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On and transmitting.")]
-        OnAndTransmitting = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for TransmitState (radio.tx.state, Transmit State, 
+    /// section 9.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum TransmitState : byte
+    {
+        /// <summary>
+        /// Off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Off.")]
+        Off = 0,
+
+        /// <summary>
+        /// On but not transmitting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On but not transmitting.")]
+        OnButNotTransmitting = 1,
+
+        /// <summary>
+        /// On and transmitting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On and transmitting.")]
+        OnAndTransmitting = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
index b5e267b..c4e63fc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/TransmitterModulationSystemType.cs
@@ -1,119 +1,119 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for TransmitterModulationSystemType (radio.tx.mod.system, System, 
-    /// section 9.1.1.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum TransmitterModulationSystemType : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Generic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Generic.")]
-        Generic = 1,
-
-        /// <summary>
-        /// HQ.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HQ.")]
-        HQ = 2,
-
-        /// <summary>
-        /// HQII.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HQII.")]
-        HQII = 3,
-
-        /// <summary>
-        /// HQIIA.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HQIIA.")]
-        HQIIA = 4,
-
-        /// <summary>
-        /// SINCGARS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SINCGARS.")]
-        SINCGARS = 5,
-
-        /// <summary>
-        /// CCTT SINCGARS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CCTT SINCGARS.")]
-        CCTTSINCGARS = 6,
-
-        /// <summary>
-        /// EPLRS (Enhanced Position Location Reporting System).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("EPLRS (Enhanced Position Location Reporting System).")]
-        EPLRS = 7,
-
-        /// <summary>
-        /// JTIDS/MIDS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JTIDS/MIDS.")]
-        JTIDS_MIDS = 8
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for TransmitterModulationSystemType (radio.tx.mod.system, System, 
+    /// section 9.1.1.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum TransmitterModulationSystemType : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Generic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Generic.")]
+        Generic = 1,
+
+        /// <summary>
+        /// HQ.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HQ.")]
+        HQ = 2,
+
+        /// <summary>
+        /// HQII.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HQII.")]
+        HQII = 3,
+
+        /// <summary>
+        /// HQIIA.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HQIIA.")]
+        HQIIA = 4,
+
+        /// <summary>
+        /// SINCGARS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SINCGARS.")]
+        SINCGARS = 5,
+
+        /// <summary>
+        /// CCTT SINCGARS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CCTT SINCGARS.")]
+        CCTTSINCGARS = 6,
+
+        /// <summary>
+        /// EPLRS (Enhanced Position Location Reporting System).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("EPLRS (Enhanced Position Location Reporting System).")]
+        EPLRS = 7,
+
+        /// <summary>
+        /// JTIDS/MIDS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JTIDS/MIDS.")]
+        JTIDS_MIDS = 8
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
rename to Libs/CsharpDis6/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
index bdaf3a8..828461b 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio.Transmitter/UserProtocolIdentificationNumber.cs
@@ -1,309 +1,309 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio.Transmitter
-{
-    /// <summary>
-    /// Enumeration values for UserProtocolIdentificationNumber (radio.tx.protocolid, User Protocol Identification Number, 
-    /// section 9.1.10)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum UserProtocolIdentificationNumber : uint
-    {
-        /// <summary>
-        /// CCSIL.  poc: Marnie Salisbury.  email: MARNIE@MITRE.ORG.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CCSIL.  poc: Marnie Salisbury.  email: MARNIE@MITRE.ORG.")]
-        CCSIL = 1,
-
-        /// <summary>
-        /// A2ATD SINCGARS ERF.  type: Binary data.  poc: Chuck Woodman.  email: WOODMAN@ORLANDO.LORAL.COM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A2ATD SINCGARS ERF.  type: Binary data.  poc: Chuck Woodman.  email: WOODMAN@ORLANDO.LORAL.COM.")]
-        A2ATDSINCGARSERF = 5,
-
-        /// <summary>
-        /// A2ATD CAC2.  type: Binary Report/Overlay data.  poc: Wayne Beard.  email: WBEARD@ORLANDO.LORAL.COM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("A2ATD CAC2.  type: Binary Report/Overlay data.  poc: Wayne Beard.  email: WBEARD@ORLANDO.LORAL.COM.")]
-        A2ATDCAC2 = 6,
-
-        /// <summary>
-        /// Battle Command.  type: Abbreviated Command and Control.  poc: Gary Gagnon.  email: ggagnon@cas-inc.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Battle Command.  type: Abbreviated Command and Control.  poc: Gary Gagnon.  email: ggagnon@cas-inc.com.")]
-        BattleCommand = 20,
-
-        /// <summary>
-        /// AFIWC IADS Track Report.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AFIWC IADS Track Report.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
-        AFIWCIADSTrackReport = 30,
-
-        /// <summary>
-        /// AFIWC IADS Comm C2 Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AFIWC IADS Comm C2 Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
-        AFIWCIADSCommC2Message = 31,
-
-        /// <summary>
-        /// AFIWC IADS Ground Control Interceptor (GCI) Command.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AFIWC IADS Ground Control Interceptor (GCI) Command.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
-        AFIWCIADSGroundControlInterceptorGCICommand = 32,
-
-        /// <summary>
-        /// AFIWC Voice Text Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AFIWC Voice Text Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
-        AFIWCVoiceTextMessage = 35,
-
-        /// <summary>
-        /// ModSAF Text Radio.  type: Free Format ASCII Text.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ModSAF Text Radio.  type: Free Format ASCII Text.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.")]
-        ModSAFTextRadio = 177,
-
-        /// <summary>
-        /// CCTT SINCGARS ERF-LOCKOUT.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CCTT SINCGARS ERF-LOCKOUT.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
-        CCTTSINCGARSERFLOCKOUT = 200,
-
-        /// <summary>
-        /// CCTT SINCGARS ERF-HOPSET.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CCTT SINCGARS ERF-HOPSET.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
-        CCTTSINCGARSERFHOPSET = 201,
-
-        /// <summary>
-        /// CCTT SINCGARS OTAR.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CCTT SINCGARS OTAR.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
-        CCTTSINCGARSOTAR = 202,
-
-        /// <summary>
-        /// CCTT SINCGARS DATA.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CCTT SINCGARS DATA.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
-        CCTTSINCGARSDATA = 203,
-
-        /// <summary>
-        /// ModSAF FWA Forward Air Controller.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ModSAF FWA Forward Air Controller.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.")]
-        ModSAFFWAForwardAirController = 546,
-
-        /// <summary>
-        /// ModSAF Threat ADA C3.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ModSAF Threat ADA C3.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.")]
-        ModSAFThreatADAC3 = 832,
-
-        /// <summary>
-        /// F-16 MTC AFAPD Protocol.  type: Packed Binary AFAPD Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("F-16 MTC AFAPD Protocol.  type: Packed Binary AFAPD Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.")]
-        F16MTCAFAPDProtocol = 1000,
-
-        /// <summary>
-        /// F-16 MTC IDL Protocol.  type: Packed Binary IDL Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("F-16 MTC IDL Protocol.  type: Packed Binary IDL Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.")]
-        F16MTCIDLProtocol = 1100,
-
-        /// <summary>
-        /// ModSAF Artillery Fire Control.  type: Structured text followed by binary data.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ModSAF Artillery Fire Control.  type: Structured text followed by binary data.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.")]
-        ModSAFArtilleryFireControl = 4570,
-
-        /// <summary>
-        /// AGTS.  type: Binary Report/ Overlay data.  poc: Steve Gendreau.  email: GENDREAU@ESCMAIL.ORL.MMC.COM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AGTS.  type: Binary Report/ Overlay data.  poc: Steve Gendreau.  email: GENDREAU@ESCMAIL.ORL.MMC.COM.")]
-        AGTS = 5361,
-
-        /// <summary>
-        /// GC3.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GC3.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.")]
-        GC3 = 6000,
-
-        /// <summary>
-        /// WNCP data.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("WNCP data.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.")]
-        WNCPData = 6010,
-
-        /// <summary>
-        /// Spoken text message.  type: Data about speaker followed by free ASCII text.  poc: Brett Kaylor.  org: GTE Government Systems.  email: brett.kaylor@gsc.gte.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spoken text message.  type: Data about speaker followed by free ASCII text.  poc: Brett Kaylor.  org: GTE Government Systems.  email: brett.kaylor@gsc.gte.com.")]
-        SpokenTextMessage = 6020,
-
-        /// <summary>
-        /// Longbow IDM message.  type: Simulated IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longbow IDM message.  type: Simulated IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
-        LongbowIDMMessage = 6661,
-
-        /// <summary>
-        /// Comanche IDM message.  type: Simulated IDM message for Comanche Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Comanche IDM message.  type: Simulated IDM message for Comanche Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
-        ComancheIDMMessage = 6662,
-
-        /// <summary>
-        /// Longbow Airborne TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longbow Airborne TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
-        LongbowAirborneTACFIREMessage = 6663,
-
-        /// <summary>
-        /// Longbow Ground TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longbow Ground TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
-        LongbowGroundTACFIREMessage = 6664,
-
-        /// <summary>
-        /// Longbow AFAPD Message.  type: Simulated AFAPD IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longbow AFAPD Message.  type: Simulated AFAPD IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
-        LongbowAFAPDMessage = 6665,
-
-        /// <summary>
-        /// Longbow ERF message.  type: Simulated ERF message for Longbow Apache Aircraft.  poc: Jeffery Day.  org: Boeing - St. Louis.  email: Jeffrey.Day@MW.Boeing.com.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longbow ERF message.  type: Simulated ERF message for Longbow Apache Aircraft.  poc: Jeffery Day.  org: Boeing - St. Louis.  email: Jeffrey.Day@MW.Boeing.com.")]
-        LongbowERFMessage = 6666
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio.Transmitter
+{
+    /// <summary>
+    /// Enumeration values for UserProtocolIdentificationNumber (radio.tx.protocolid, User Protocol Identification Number, 
+    /// section 9.1.10)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum UserProtocolIdentificationNumber : uint
+    {
+        /// <summary>
+        /// CCSIL.  poc: Marnie Salisbury.  email: MARNIE@MITRE.ORG.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CCSIL.  poc: Marnie Salisbury.  email: MARNIE@MITRE.ORG.")]
+        CCSIL = 1,
+
+        /// <summary>
+        /// A2ATD SINCGARS ERF.  type: Binary data.  poc: Chuck Woodman.  email: WOODMAN@ORLANDO.LORAL.COM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A2ATD SINCGARS ERF.  type: Binary data.  poc: Chuck Woodman.  email: WOODMAN@ORLANDO.LORAL.COM.")]
+        A2ATDSINCGARSERF = 5,
+
+        /// <summary>
+        /// A2ATD CAC2.  type: Binary Report/Overlay data.  poc: Wayne Beard.  email: WBEARD@ORLANDO.LORAL.COM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("A2ATD CAC2.  type: Binary Report/Overlay data.  poc: Wayne Beard.  email: WBEARD@ORLANDO.LORAL.COM.")]
+        A2ATDCAC2 = 6,
+
+        /// <summary>
+        /// Battle Command.  type: Abbreviated Command and Control.  poc: Gary Gagnon.  email: ggagnon@cas-inc.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Battle Command.  type: Abbreviated Command and Control.  poc: Gary Gagnon.  email: ggagnon@cas-inc.com.")]
+        BattleCommand = 20,
+
+        /// <summary>
+        /// AFIWC IADS Track Report.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AFIWC IADS Track Report.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
+        AFIWCIADSTrackReport = 30,
+
+        /// <summary>
+        /// AFIWC IADS Comm C2 Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AFIWC IADS Comm C2 Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
+        AFIWCIADSCommC2Message = 31,
+
+        /// <summary>
+        /// AFIWC IADS Ground Control Interceptor (GCI) Command.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AFIWC IADS Ground Control Interceptor (GCI) Command.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
+        AFIWCIADSGroundControlInterceptorGCICommand = 32,
+
+        /// <summary>
+        /// AFIWC Voice Text Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AFIWC Voice Text Message.  type: Binary Data.  poc: Randy Schuetz.  email: randy.schuetz@lackland.af.mil.")]
+        AFIWCVoiceTextMessage = 35,
+
+        /// <summary>
+        /// ModSAF Text Radio.  type: Free Format ASCII Text.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ModSAF Text Radio.  type: Free Format ASCII Text.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.")]
+        ModSAFTextRadio = 177,
+
+        /// <summary>
+        /// CCTT SINCGARS ERF-LOCKOUT.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CCTT SINCGARS ERF-LOCKOUT.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
+        CCTTSINCGARSERFLOCKOUT = 200,
+
+        /// <summary>
+        /// CCTT SINCGARS ERF-HOPSET.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CCTT SINCGARS ERF-HOPSET.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
+        CCTTSINCGARSERFHOPSET = 201,
+
+        /// <summary>
+        /// CCTT SINCGARS OTAR.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CCTT SINCGARS OTAR.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
+        CCTTSINCGARSOTAR = 202,
+
+        /// <summary>
+        /// CCTT SINCGARS DATA.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CCTT SINCGARS DATA.  type: Binary Data.  poc: Jim Keenan.  email: jimk@greatwall.cctt.com.")]
+        CCTTSINCGARSDATA = 203,
+
+        /// <summary>
+        /// ModSAF FWA Forward Air Controller.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ModSAF FWA Forward Air Controller.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.")]
+        ModSAFFWAForwardAirController = 546,
+
+        /// <summary>
+        /// ModSAF Threat ADA C3.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ModSAF Threat ADA C3.  type: Binary data.  poc: Dan Coffin.  email: dcoffin@camb-lads.loral.com.")]
+        ModSAFThreatADAC3 = 832,
+
+        /// <summary>
+        /// F-16 MTC AFAPD Protocol.  type: Packed Binary AFAPD Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("F-16 MTC AFAPD Protocol.  type: Packed Binary AFAPD Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.")]
+        F16MTCAFAPDProtocol = 1000,
+
+        /// <summary>
+        /// F-16 MTC IDL Protocol.  type: Packed Binary IDL Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("F-16 MTC IDL Protocol.  type: Packed Binary IDL Message Format for F-16 Block 50/52.  poc: Albert Ludwig.  org: The Boeing Company.  email: albert.j.ludwig@boeing.com.")]
+        F16MTCIDLProtocol = 1100,
+
+        /// <summary>
+        /// ModSAF Artillery Fire Control.  type: Structured text followed by binary data.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ModSAF Artillery Fire Control.  type: Structured text followed by binary data.  poc: Richard Schaffer.  email: RSCHAFFER@CAMB-LADS.LORAL.COM.")]
+        ModSAFArtilleryFireControl = 4570,
+
+        /// <summary>
+        /// AGTS.  type: Binary Report/ Overlay data.  poc: Steve Gendreau.  email: GENDREAU@ESCMAIL.ORL.MMC.COM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AGTS.  type: Binary Report/ Overlay data.  poc: Steve Gendreau.  email: GENDREAU@ESCMAIL.ORL.MMC.COM.")]
+        AGTS = 5361,
+
+        /// <summary>
+        /// GC3.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GC3.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.")]
+        GC3 = 6000,
+
+        /// <summary>
+        /// WNCP data.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("WNCP data.  type: Binary data.  poc: Karl Shepherd.  email: karl.shepherd@gsc.gte.com.")]
+        WNCPData = 6010,
+
+        /// <summary>
+        /// Spoken text message.  type: Data about speaker followed by free ASCII text.  poc: Brett Kaylor.  org: GTE Government Systems.  email: brett.kaylor@gsc.gte.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spoken text message.  type: Data about speaker followed by free ASCII text.  poc: Brett Kaylor.  org: GTE Government Systems.  email: brett.kaylor@gsc.gte.com.")]
+        SpokenTextMessage = 6020,
+
+        /// <summary>
+        /// Longbow IDM message.  type: Simulated IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longbow IDM message.  type: Simulated IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
+        LongbowIDMMessage = 6661,
+
+        /// <summary>
+        /// Comanche IDM message.  type: Simulated IDM message for Comanche Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Comanche IDM message.  type: Simulated IDM message for Comanche Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
+        ComancheIDMMessage = 6662,
+
+        /// <summary>
+        /// Longbow Airborne TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longbow Airborne TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
+        LongbowAirborneTACFIREMessage = 6663,
+
+        /// <summary>
+        /// Longbow Ground TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longbow Ground TACFIRE Message.  type: Simulated TACFIRE IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
+        LongbowGroundTACFIREMessage = 6664,
+
+        /// <summary>
+        /// Longbow AFAPD Message.  type: Simulated AFAPD IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longbow AFAPD Message.  type: Simulated AFAPD IDM message for Longbow Apache Aircraft.  poc: Peter Obear.  org: Carmel Applied Technologies, Inc.  email: obear@catinet.com.")]
+        LongbowAFAPDMessage = 6665,
+
+        /// <summary>
+        /// Longbow ERF message.  type: Simulated ERF message for Longbow Apache Aircraft.  poc: Jeffery Day.  org: Boeing - St. Louis.  email: Jeffrey.Day@MW.Boeing.com.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longbow ERF message.  type: Simulated ERF message for Longbow Apache Aircraft.  poc: Jeffery Day.  org: Boeing - St. Louis.  email: Jeffrey.Day@MW.Boeing.com.")]
+        LongbowERFMessage = 6666
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Radio/ReceiverState.cs b/Libs/CsharpDis6/Enumerations/Radio/ReceiverState.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Radio/ReceiverState.cs
rename to Libs/CsharpDis6/Enumerations/Radio/ReceiverState.cs
index e590ce8..29cf3bc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Radio/ReceiverState.cs
+++ b/Libs/CsharpDis6/Enumerations/Radio/ReceiverState.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Radio
-{
-    /// <summary>
-    /// Enumeration values for ReceiverState (radio.rx.state, Receiver State, 
-    /// section 9.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ReceiverState : ushort
-    {
-        /// <summary>
-        /// Off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Off.")]
-        Off = 0,
-
-        /// <summary>
-        /// On but not receiving.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On but not receiving.")]
-        OnButNotReceiving = 1,
-
-        /// <summary>
-        /// On and receiving.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("On and receiving.")]
-        OnAndReceiving = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Radio
+{
+    /// <summary>
+    /// Enumeration values for ReceiverState (radio.rx.state, Receiver State, 
+    /// section 9.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ReceiverState : ushort
+    {
+        /// <summary>
+        /// Off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Off.")]
+        Off = 0,
+
+        /// <summary>
+        /// On but not receiving.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On but not receiving.")]
+        OnButNotReceiving = 1,
+
+        /// <summary>
+        /// On and receiving.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("On and receiving.")]
+        OnAndReceiving = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/AcknowledgeFlag.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/AcknowledgeFlag.cs
index feaa50a..78c743e 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/AcknowledgeFlag.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/AcknowledgeFlag.cs
@@ -1,79 +1,79 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for AcknowledgeFlag (simman.ack.ackflag, Acknowledge Flag, 
-    /// section 7.3.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum AcknowledgeFlag : ushort
-    {
-        /// <summary>
-        /// Create Entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Create Entity.")]
-        CreateEntity = 1,
-
-        /// <summary>
-        /// Remove Entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Remove Entity.")]
-        RemoveEntity = 2,
-
-        /// <summary>
-        /// Start/Resume.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Start/Resume.")]
-        StartResume = 3,
-
-        /// <summary>
-        /// Stop/Freeze.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stop/Freeze.")]
-        StopFreeze = 4,
-
-        /// <summary>
-        /// Transfer Control Request.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transfer Control Request.")]
-        TransferControlRequest = 5
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for AcknowledgeFlag (simman.ack.ackflag, Acknowledge Flag, 
+    /// section 7.3.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum AcknowledgeFlag : ushort
+    {
+        /// <summary>
+        /// Create Entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Create Entity.")]
+        CreateEntity = 1,
+
+        /// <summary>
+        /// Remove Entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Remove Entity.")]
+        RemoveEntity = 2,
+
+        /// <summary>
+        /// Start/Resume.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Start/Resume.")]
+        StartResume = 3,
+
+        /// <summary>
+        /// Stop/Freeze.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stop/Freeze.")]
+        StopFreeze = 4,
+
+        /// <summary>
+        /// Transfer Control Request.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transfer Control Request.")]
+        TransferControlRequest = 5
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionId.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/ActionId.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionId.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/ActionId.cs
index 399fd16..cc5df33 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionId.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/ActionId.cs
@@ -1,519 +1,519 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for ActionId (simman.actionrequest.actionid, Action ID, 
-    /// section 7.4)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ActionId : uint
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Local storage of the requested information.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Local storage of the requested information.")]
-        LocalStorageOfTheRequestedInformation = 1,
-
-        /// <summary>
-        /// Inform SM of event ran out of ammunition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inform SM of event ran out of ammunition.")]
-        InformSMOfEventRanOutOfAmmunition = 2,
-
-        /// <summary>
-        /// Inform SM of event killed in action.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inform SM of event killed in action.")]
-        InformSMOfEventKilledInAction = 3,
-
-        /// <summary>
-        /// Inform SM of event damage.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inform SM of event damage.")]
-        InformSMOfEventDamage = 4,
-
-        /// <summary>
-        /// Inform SM of event mobility disabled.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inform SM of event mobility disabled.")]
-        InformSMOfEventMobilityDisabled = 5,
-
-        /// <summary>
-        /// Inform SM of event fire disabled.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inform SM of event fire disabled.")]
-        InformSMOfEventFireDisabled = 6,
-
-        /// <summary>
-        /// Inform SM of event ran out of fuel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inform SM of event ran out of fuel.")]
-        InformSMOfEventRanOutOfFuel = 7,
-
-        /// <summary>
-        /// Recall checkpoint data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Recall checkpoint data.")]
-        RecallCheckpointData = 8,
-
-        /// <summary>
-        /// Recall initial parameters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Recall initial parameters.")]
-        RecallInitialParameters = 9,
-
-        /// <summary>
-        /// Initiate tether-lead.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initiate tether-lead.")]
-        InitiateTetherLead = 10,
-
-        /// <summary>
-        /// Initiate tether-follow.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initiate tether-follow.")]
-        InitiateTetherFollow = 11,
-
-        /// <summary>
-        /// Unthether.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unthether.")]
-        Unthether = 12,
-
-        /// <summary>
-        /// Initiate service station resupply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initiate service station resupply.")]
-        InitiateServiceStationResupply = 13,
-
-        /// <summary>
-        /// Initiate tailgate resupply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initiate tailgate resupply.")]
-        InitiateTailgateResupply = 14,
-
-        /// <summary>
-        /// Initiate hitch lead.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initiate hitch lead.")]
-        InitiateHitchLead = 15,
-
-        /// <summary>
-        /// Initiate hitch follow.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initiate hitch follow.")]
-        InitiateHitchFollow = 16,
-
-        /// <summary>
-        /// Unhitch.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unhitch.")]
-        Unhitch = 17,
-
-        /// <summary>
-        /// Mount.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mount.")]
-        Mount = 18,
-
-        /// <summary>
-        /// Dismount.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dismount.")]
-        Dismount = 19,
-
-        /// <summary>
-        /// Start DRC (Daily Readiness Check).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Start DRC (Daily Readiness Check).")]
-        StartDRCDailyReadinessCheck = 20,
-
-        /// <summary>
-        /// Stop DRC.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stop DRC.")]
-        StopDRC = 21,
-
-        /// <summary>
-        /// Data Query.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Data Query.")]
-        DataQuery = 22,
-
-        /// <summary>
-        /// Status Request.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status Request.")]
-        StatusRequest = 23,
-
-        /// <summary>
-        /// Send Object State Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Send Object State Data.")]
-        SendObjectStateData = 24,
-
-        /// <summary>
-        /// Reconstitute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Reconstitute.")]
-        Reconstitute = 25,
-
-        /// <summary>
-        /// Lock Site Configuration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lock Site Configuration.")]
-        LockSiteConfiguration = 26,
-
-        /// <summary>
-        /// Unlock Site Configuration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unlock Site Configuration.")]
-        UnlockSiteConfiguration = 27,
-
-        /// <summary>
-        /// Update Site Configuration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Update Site Configuration.")]
-        UpdateSiteConfiguration = 28,
-
-        /// <summary>
-        /// Query Site Configuration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Query Site Configuration.")]
-        QuerySiteConfiguration = 29,
-
-        /// <summary>
-        /// Tethering Information.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tethering Information.")]
-        TetheringInformation = 30,
-
-        /// <summary>
-        /// Mount Intent.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mount Intent.")]
-        MountIntent = 31,
-
-        /// <summary>
-        /// Accept Subscription.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Accept Subscription.")]
-        AcceptSubscription = 33,
-
-        /// <summary>
-        /// Unsubscribe.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unsubscribe.")]
-        Unsubscribe = 34,
-
-        /// <summary>
-        /// Teleport entity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Teleport entity.")]
-        TeleportEntity = 35,
-
-        /// <summary>
-        /// Change aggregate state.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Change aggregate state.")]
-        ChangeAggregateState = 36,
-
-        /// <summary>
-        /// Request Start PDU.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Request Start PDU.")]
-        RequestStartPDU = 37,
-
-        /// <summary>
-        /// Wakeup get ready for initialization.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wakeup get ready for initialization.")]
-        WakeupGetReadyForInitialization = 38,
-
-        /// <summary>
-        /// Initialize internal parameters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initialize internal parameters.")]
-        InitializeInternalParameters = 39,
-
-        /// <summary>
-        /// Send plan data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Send plan data.")]
-        SendPlanData = 40,
-
-        /// <summary>
-        /// Synchronize internal clocks.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Synchronize internal clocks.")]
-        SynchronizeInternalClocks = 41,
-
-        /// <summary>
-        /// Run.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Run.")]
-        Run = 42,
-
-        /// <summary>
-        /// Save internal parameters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Save internal parameters.")]
-        SaveInternalParameters = 43,
-
-        /// <summary>
-        /// Simulate malfunction.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulate malfunction.")]
-        SimulateMalfunction = 44,
-
-        /// <summary>
-        /// Join exercise.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Join exercise.")]
-        JoinExercise = 45,
-
-        /// <summary>
-        /// Resign exercise.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Resign exercise.")]
-        ResignExercise = 46,
-
-        /// <summary>
-        /// Time advance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time advance.")]
-        TimeAdvance = 47,
-
-        /// <summary>
-        /// TACCSF LOS Request-Type 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACCSF LOS Request-Type 1.")]
-        TACCSFLOSRequestType1 = 100,
-
-        /// <summary>
-        /// TACCSF LOS Request-Type 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACCSF LOS Request-Type 2.")]
-        TACCSFLOSRequestType2 = 101
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for ActionId (simman.actionrequest.actionid, Action ID, 
+    /// section 7.4)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ActionId : uint
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Local storage of the requested information.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Local storage of the requested information.")]
+        LocalStorageOfTheRequestedInformation = 1,
+
+        /// <summary>
+        /// Inform SM of event ran out of ammunition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inform SM of event ran out of ammunition.")]
+        InformSMOfEventRanOutOfAmmunition = 2,
+
+        /// <summary>
+        /// Inform SM of event killed in action.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inform SM of event killed in action.")]
+        InformSMOfEventKilledInAction = 3,
+
+        /// <summary>
+        /// Inform SM of event damage.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inform SM of event damage.")]
+        InformSMOfEventDamage = 4,
+
+        /// <summary>
+        /// Inform SM of event mobility disabled.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inform SM of event mobility disabled.")]
+        InformSMOfEventMobilityDisabled = 5,
+
+        /// <summary>
+        /// Inform SM of event fire disabled.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inform SM of event fire disabled.")]
+        InformSMOfEventFireDisabled = 6,
+
+        /// <summary>
+        /// Inform SM of event ran out of fuel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inform SM of event ran out of fuel.")]
+        InformSMOfEventRanOutOfFuel = 7,
+
+        /// <summary>
+        /// Recall checkpoint data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Recall checkpoint data.")]
+        RecallCheckpointData = 8,
+
+        /// <summary>
+        /// Recall initial parameters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Recall initial parameters.")]
+        RecallInitialParameters = 9,
+
+        /// <summary>
+        /// Initiate tether-lead.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initiate tether-lead.")]
+        InitiateTetherLead = 10,
+
+        /// <summary>
+        /// Initiate tether-follow.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initiate tether-follow.")]
+        InitiateTetherFollow = 11,
+
+        /// <summary>
+        /// Unthether.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unthether.")]
+        Unthether = 12,
+
+        /// <summary>
+        /// Initiate service station resupply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initiate service station resupply.")]
+        InitiateServiceStationResupply = 13,
+
+        /// <summary>
+        /// Initiate tailgate resupply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initiate tailgate resupply.")]
+        InitiateTailgateResupply = 14,
+
+        /// <summary>
+        /// Initiate hitch lead.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initiate hitch lead.")]
+        InitiateHitchLead = 15,
+
+        /// <summary>
+        /// Initiate hitch follow.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initiate hitch follow.")]
+        InitiateHitchFollow = 16,
+
+        /// <summary>
+        /// Unhitch.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unhitch.")]
+        Unhitch = 17,
+
+        /// <summary>
+        /// Mount.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mount.")]
+        Mount = 18,
+
+        /// <summary>
+        /// Dismount.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dismount.")]
+        Dismount = 19,
+
+        /// <summary>
+        /// Start DRC (Daily Readiness Check).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Start DRC (Daily Readiness Check).")]
+        StartDRCDailyReadinessCheck = 20,
+
+        /// <summary>
+        /// Stop DRC.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stop DRC.")]
+        StopDRC = 21,
+
+        /// <summary>
+        /// Data Query.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Data Query.")]
+        DataQuery = 22,
+
+        /// <summary>
+        /// Status Request.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status Request.")]
+        StatusRequest = 23,
+
+        /// <summary>
+        /// Send Object State Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Send Object State Data.")]
+        SendObjectStateData = 24,
+
+        /// <summary>
+        /// Reconstitute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Reconstitute.")]
+        Reconstitute = 25,
+
+        /// <summary>
+        /// Lock Site Configuration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lock Site Configuration.")]
+        LockSiteConfiguration = 26,
+
+        /// <summary>
+        /// Unlock Site Configuration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unlock Site Configuration.")]
+        UnlockSiteConfiguration = 27,
+
+        /// <summary>
+        /// Update Site Configuration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Update Site Configuration.")]
+        UpdateSiteConfiguration = 28,
+
+        /// <summary>
+        /// Query Site Configuration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Query Site Configuration.")]
+        QuerySiteConfiguration = 29,
+
+        /// <summary>
+        /// Tethering Information.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tethering Information.")]
+        TetheringInformation = 30,
+
+        /// <summary>
+        /// Mount Intent.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mount Intent.")]
+        MountIntent = 31,
+
+        /// <summary>
+        /// Accept Subscription.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Accept Subscription.")]
+        AcceptSubscription = 33,
+
+        /// <summary>
+        /// Unsubscribe.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unsubscribe.")]
+        Unsubscribe = 34,
+
+        /// <summary>
+        /// Teleport entity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Teleport entity.")]
+        TeleportEntity = 35,
+
+        /// <summary>
+        /// Change aggregate state.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Change aggregate state.")]
+        ChangeAggregateState = 36,
+
+        /// <summary>
+        /// Request Start PDU.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Request Start PDU.")]
+        RequestStartPDU = 37,
+
+        /// <summary>
+        /// Wakeup get ready for initialization.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wakeup get ready for initialization.")]
+        WakeupGetReadyForInitialization = 38,
+
+        /// <summary>
+        /// Initialize internal parameters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initialize internal parameters.")]
+        InitializeInternalParameters = 39,
+
+        /// <summary>
+        /// Send plan data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Send plan data.")]
+        SendPlanData = 40,
+
+        /// <summary>
+        /// Synchronize internal clocks.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Synchronize internal clocks.")]
+        SynchronizeInternalClocks = 41,
+
+        /// <summary>
+        /// Run.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Run.")]
+        Run = 42,
+
+        /// <summary>
+        /// Save internal parameters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Save internal parameters.")]
+        SaveInternalParameters = 43,
+
+        /// <summary>
+        /// Simulate malfunction.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulate malfunction.")]
+        SimulateMalfunction = 44,
+
+        /// <summary>
+        /// Join exercise.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Join exercise.")]
+        JoinExercise = 45,
+
+        /// <summary>
+        /// Resign exercise.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Resign exercise.")]
+        ResignExercise = 46,
+
+        /// <summary>
+        /// Time advance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time advance.")]
+        TimeAdvance = 47,
+
+        /// <summary>
+        /// TACCSF LOS Request-Type 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACCSF LOS Request-Type 1.")]
+        TACCSFLOSRequestType1 = 100,
+
+        /// <summary>
+        /// TACCSF LOS Request-Type 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACCSF LOS Request-Type 2.")]
+        TACCSFLOSRequestType2 = 101
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
index a87688c..cf7f14a 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/ActionResponseRequestStatus.cs
@@ -1,169 +1,169 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for ActionResponseRequestStatus (simman.actionresponse.status, Request Status, 
-    /// section 7.5)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ActionResponseRequestStatus : uint
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Pending.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pending.")]
-        Pending = 1,
-
-        /// <summary>
-        /// Executing.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Executing.")]
-        Executing = 2,
-
-        /// <summary>
-        /// Partially Complete.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Partially Complete.")]
-        PartiallyComplete = 3,
-
-        /// <summary>
-        /// Complete.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Complete.")]
-        Complete = 4,
-
-        /// <summary>
-        /// Request rejected.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Request rejected.")]
-        RequestRejected = 5,
-
-        /// <summary>
-        /// Retransmit request now.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Retransmit request now.")]
-        RetransmitRequestNow = 6,
-
-        /// <summary>
-        /// Retransmit request later.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Retransmit request later.")]
-        RetransmitRequestLater = 7,
-
-        /// <summary>
-        /// Invalid time parameters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Invalid time parameters.")]
-        InvalidTimeParameters = 8,
-
-        /// <summary>
-        /// Simulation time exceeded.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation time exceeded.")]
-        SimulationTimeExceeded = 9,
-
-        /// <summary>
-        /// Request done.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Request done.")]
-        RequestDone = 10,
-
-        /// <summary>
-        /// TACCSF LOS Reply-Type 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACCSF LOS Reply-Type 1.")]
-        TACCSFLOSReplyType1 = 100,
-
-        /// <summary>
-        /// TACCSF LOS Reply-Type 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACCSF LOS Reply-Type 2.")]
-        TACCSFLOSReplyType2 = 101,
-
-        /// <summary>
-        /// Join Exercise Request Rejected.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Join Exercise Request Rejected.")]
-        JoinExerciseRequestRejected = 201
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for ActionResponseRequestStatus (simman.actionresponse.status, Request Status, 
+    /// section 7.5)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ActionResponseRequestStatus : uint
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Pending.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pending.")]
+        Pending = 1,
+
+        /// <summary>
+        /// Executing.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Executing.")]
+        Executing = 2,
+
+        /// <summary>
+        /// Partially Complete.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Partially Complete.")]
+        PartiallyComplete = 3,
+
+        /// <summary>
+        /// Complete.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Complete.")]
+        Complete = 4,
+
+        /// <summary>
+        /// Request rejected.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Request rejected.")]
+        RequestRejected = 5,
+
+        /// <summary>
+        /// Retransmit request now.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Retransmit request now.")]
+        RetransmitRequestNow = 6,
+
+        /// <summary>
+        /// Retransmit request later.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Retransmit request later.")]
+        RetransmitRequestLater = 7,
+
+        /// <summary>
+        /// Invalid time parameters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Invalid time parameters.")]
+        InvalidTimeParameters = 8,
+
+        /// <summary>
+        /// Simulation time exceeded.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation time exceeded.")]
+        SimulationTimeExceeded = 9,
+
+        /// <summary>
+        /// Request done.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Request done.")]
+        RequestDone = 10,
+
+        /// <summary>
+        /// TACCSF LOS Reply-Type 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACCSF LOS Reply-Type 1.")]
+        TACCSFLOSReplyType1 = 100,
+
+        /// <summary>
+        /// TACCSF LOS Reply-Type 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACCSF LOS Reply-Type 2.")]
+        TACCSFLOSReplyType2 = 101,
+
+        /// <summary>
+        /// Join Exercise Request Rejected.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Join Exercise Request Rejected.")]
+        JoinExerciseRequestRejected = 201
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
index 0946241..256d7da 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/DatumSpecificationRecord.cs
@@ -1,7329 +1,7329 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for DatumSpecificationRecord (simman.datumid, Datum Specification record, 
-    /// section 7.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DatumSpecificationRecord : uint
-    {
-        /// <summary>
-        /// Identification.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identification.")]
-        Identification = 10000,
-
-        /// <summary>
-        /// Entity Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type.")]
-        EntityType = 11000,
-
-        /// <summary>
-        /// Concatenated.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Concatenated.")]
-        Concatenated = 11100,
-
-        /// <summary>
-        /// Kind.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kind.  type: Unsigned Integer.  length: 8.")]
-        Kind = 11110,
-
-        /// <summary>
-        /// Domain.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Domain.  type: Unsigned Integer.  length: 8.")]
-        Domain = 11120,
-
-        /// <summary>
-        /// Country.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Country.  type: Unsigned Integer.  length: 16.")]
-        Country = 11130,
-
-        /// <summary>
-        /// Category.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Category.  type: Unsigned Integer.  length: 8.")]
-        Category = 11140,
-
-        /// <summary>
-        /// Subcategory.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Subcategory.  type: Unsigned Integer.  length: 8.")]
-        Subcategory = 11150,
-
-        /// <summary>
-        /// Specific.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Specific.  type: Unsigned Integer.  length: 8.")]
-        Specific = 11160,
-
-        /// <summary>
-        /// Extra.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Extra.  type: Unsigned Integer.  length: 8.")]
-        Extra = 11170,
-
-        /// <summary>
-        /// Force ID.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Force ID.  type: Unsigned Integer.  length: 8.")]
-        ForceID = 11200,
-
-        /// <summary>
-        /// Description.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Description.")]
-        Description = 11300,
-
-        /// <summary>
-        /// Alternative Entity Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type.")]
-        AlternativeEntityType = 12000,
-
-        /// <summary>
-        /// Kind.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kind.  type: Unsigned Integer.  length: 8.")]
-        Kind_12110 = 12110,
-
-        /// <summary>
-        /// Domain.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Domain.  type: Unsigned Integer.  length: 8.")]
-        Domain_12120 = 12120,
-
-        /// <summary>
-        /// Country.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Country.  type: Unsigned Integer.  length: 16.")]
-        Country_12130 = 12130,
-
-        /// <summary>
-        /// Category.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Category.  type: Unsigned Integer.  length: 8.")]
-        Category_12140 = 12140,
-
-        /// <summary>
-        /// Subcategory.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Subcategory.  type: Unsigned Integer.  length: 8.")]
-        Subcategory_12150 = 12150,
-
-        /// <summary>
-        /// Specific.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Specific.  type: Unsigned Integer.  length: 8.")]
-        Specific_12160 = 12160,
-
-        /// <summary>
-        /// Extra.  type: Unsigned Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Extra.  type: Unsigned Integer.  length: 8.")]
-        Extra_12170 = 12170,
-
-        /// <summary>
-        /// Description.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Description.")]
-        Description_12300 = 12300,
-
-        /// <summary>
-        /// Entity Marking.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Marking.")]
-        EntityMarking = 13000,
-
-        /// <summary>
-        /// Entity Marking Characters.  type: String.  length: 80.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Marking Characters.  type: String.  length: 80.")]
-        EntityMarkingCharacters = 13100,
-
-        /// <summary>
-        /// Crew ID.  type: String.  length: 80.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Crew ID.  type: String.  length: 80.")]
-        CrewID = 13200,
-
-        /// <summary>
-        /// Task Organization.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Task Organization.")]
-        TaskOrganization = 14000,
-
-        /// <summary>
-        /// Regiment Name.  type: String.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Regiment Name.  type: String.")]
-        RegimentName = 14200,
-
-        /// <summary>
-        /// Battalion Name.  type: String.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Battalion Name.  type: String.")]
-        BattalionName = 14300,
-
-        /// <summary>
-        /// Company Name.  type: String.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Company Name.  type: String.")]
-        CompanyName = 14400,
-
-        /// <summary>
-        /// Platoon Name.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Platoon Name.")]
-        PlatoonName = 14500,
-
-        /// <summary>
-        /// Squad Name.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Squad Name.")]
-        SquadName = 14520,
-
-        /// <summary>
-        /// Team Name.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Team Name.")]
-        TeamName = 14540,
-
-        /// <summary>
-        /// Bumper Number.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bumper Number.")]
-        BumperNumber = 14600,
-
-        /// <summary>
-        /// Vehicle Number.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vehicle Number.")]
-        VehicleNumber = 14700,
-
-        /// <summary>
-        /// Unit Number.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unit Number.")]
-        UnitNumber = 14800,
-
-        /// <summary>
-        /// DIS Identity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS Identity.")]
-        DISIdentity = 15000,
-
-        /// <summary>
-        /// DIS Site ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS Site ID.")]
-        DISSiteID = 15100,
-
-        /// <summary>
-        /// DIS Host ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS Host ID.")]
-        DISHostID = 15200,
-
-        /// <summary>
-        /// DIS Entity ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS Entity ID.")]
-        DISEntityID = 15300,
-
-        /// <summary>
-        /// Mount Intent.  type: Datum Specification Sub-record.  length: 544.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mount Intent.  type: Datum Specification Sub-record.  length: 544.")]
-        MountIntent = 15400,
-
-        /// <summary>
-        /// Tether-Unthether Command ID.  type: Unsigned Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tether-Unthether Command ID.  type: Unsigned Integer.  length: 32.")]
-        TetherUnthetherCommandID = 15500,
-
-        /// <summary>
-        /// Teleport Entity Data Record.  type: Variable record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Teleport Entity Data Record.  type: Variable record.")]
-        TeleportEntityDataRecord = 15510,
-
-        /// <summary>
-        /// DIS Aggregate ID (Set if communication to aggregate).  type: Unsigned Integer.  length: 32.  range: Integer Aggregate ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS Aggregate ID (Set if communication to aggregate).  type: Unsigned Integer.  length: 32.  range: Integer Aggregate ID.")]
-        DISAggregateIDSetIfCommunicationToAggregate = 15600,
-
-        /// <summary>
-        /// Loads.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Loads.")]
-        Loads = 20000,
-
-        /// <summary>
-        /// Crew Members.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Crew Members.")]
-        CrewMembers = 21000,
-
-        /// <summary>
-        /// Crew Member ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Crew Member ID.")]
-        CrewMemberID = 21100,
-
-        /// <summary>
-        /// Health.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Health.")]
-        Health = 21200,
-
-        /// <summary>
-        /// Job Assignment.  type: String.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Job Assignment.  type: String.")]
-        JobAssignment = 21300,
-
-        /// <summary>
-        /// Fuel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuel.")]
-        Fuel = 23000,
-
-        /// <summary>
-        /// Quantity.  units: Liters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Quantity.  units: Liters.")]
-        Quantity = 23100,
-
-        /// <summary>
-        /// Quantity.  units: Gallons.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Quantity.  units: Gallons.")]
-        Quantity_23105 = 23105,
-
-        /// <summary>
-        /// Ammunition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ammunition.")]
-        Ammunition = 24000,
-
-        /// <summary>
-        /// 120-mm HEAT, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("120-mm HEAT, quantity.  units: Rounds.")]
-        _120MmHEATQuantity = 24001,
-
-        /// <summary>
-        /// 120-mm SABOT, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("120-mm SABOT, quantity.  units: Rounds.")]
-        _120MmSABOTQuantity = 24002,
-
-        /// <summary>
-        /// 12.7-mm M8, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("12.7-mm M8, quantity.  units: Rounds.")]
-        _127MmM8Quantity = 24003,
-
-        /// <summary>
-        /// 12.7-mm M20, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("12.7-mm M20, quantity.  units: Rounds.")]
-        _127MmM20Quantity = 24004,
-
-        /// <summary>
-        /// 7.62-mm M62, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("7.62-mm M62, quantity.  units: Rounds.")]
-        _762MmM62Quantity = 24005,
-
-        /// <summary>
-        /// M250 UKL8A1, quantity.  units: Grenades.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M250 UKL8A1, quantity.  units: Grenades.")]
-        M250UKL8A1Quantity = 24006,
-
-        /// <summary>
-        /// M250 UKL8A3, quantity.  units: Grenades.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("M250 UKL8A3, quantity.  units: Grenades.")]
-        M250UKL8A3Quantity = 24007,
-
-        /// <summary>
-        /// 7.62-mm M80, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("7.62-mm M80, quantity.  units: Rounds.")]
-        _762MmM80Quantity = 24008,
-
-        /// <summary>
-        /// 12.7-mm, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("12.7-mm, quantity.  units: Rounds.")]
-        _127MmQuantity = 24009,
-
-        /// <summary>
-        /// 7.62-mm, quantity.  units: Rounds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("7.62-mm, quantity.  units: Rounds.")]
-        _762MmQuantity = 24010,
-
-        /// <summary>
-        /// Mines, quantity.  units: Mines.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mines, quantity.  units: Mines.")]
-        MinesQuantity = 24060,
-
-        /// <summary>
-        /// Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type.")]
-        Type = 24100,
-
-        /// <summary>
-        /// Kind.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kind.")]
-        Kind_24110 = 24110,
-
-        /// <summary>
-        /// Domain.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Domain.")]
-        Domain_24120 = 24120,
-
-        /// <summary>
-        /// Country.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Country.")]
-        Country_24130 = 24130,
-
-        /// <summary>
-        /// Category.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Category.")]
-        Category_24140 = 24140,
-
-        /// <summary>
-        /// Subcategory.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Subcategory.")]
-        Subcategory_24150 = 24150,
-
-        /// <summary>
-        /// Extra.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Extra.")]
-        Extra_24160 = 24160,
-
-        /// <summary>
-        /// Description.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Description.")]
-        Description_24300 = 24300,
-
-        /// <summary>
-        /// Cargo.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cargo.")]
-        Cargo = 25000,
-
-        /// <summary>
-        /// Vehicle Mass.  type: Unsigned Integer.  length: 32.  units: Kilograms.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vehicle Mass.  type: Unsigned Integer.  length: 32.  units: Kilograms.")]
-        VehicleMass = 26000,
-
-        /// <summary>
-        /// Supply Quantity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Supply Quantity.")]
-        SupplyQuantity = 27000,
-
-        /// <summary>
-        /// Armament.  type: Boolean.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armament.  type: Boolean.")]
-        Armament = 28000,
-
-        /// <summary>
-        /// Status.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status.")]
-        Status = 30000,
-
-        /// <summary>
-        /// Activate entity.  type: Integer.  length: 32.  range: 0 Unspecified, 1 Activate platform.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Activate entity.  type: Integer.  length: 32.  range: 0 Unspecified, 1 Activate platform.")]
-        ActivateEntity = 30010,
-
-        /// <summary>
-        /// Subscription State.  type: Enumeration.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Subscription State.  type: Enumeration.  length: 8.")]
-        SubscriptionState = 30100,
-
-        /// <summary>
-        /// Round trip time delay.  type: Unsigned Integer.  length: 32 bits.  units: milliseconds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Round trip time delay.  type: Unsigned Integer.  length: 32 bits.  units: milliseconds.")]
-        RoundTripTimeDelay = 30300,
-
-        /// <summary>
-        /// TADIL J message count (label 0).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 0).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel0 = 30400,
-
-        /// <summary>
-        /// TADIL J message count (label 1).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 1).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel1 = 30401,
-
-        /// <summary>
-        /// TADIL J message count (label 2).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 2).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel2 = 30402,
-
-        /// <summary>
-        /// TADIL J message count (label 3).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 3).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel3 = 30403,
-
-        /// <summary>
-        /// TADIL J message count (label 4).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 4).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel4 = 30404,
-
-        /// <summary>
-        /// TADIL J message count (label 5).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 5).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel5 = 30405,
-
-        /// <summary>
-        /// TADIL J message count (label 6).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 6).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel6 = 30406,
-
-        /// <summary>
-        /// TADIL J message count (label 7).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 7).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel7 = 30407,
-
-        /// <summary>
-        /// TADIL J message count (label 8).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 8).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel8 = 30408,
-
-        /// <summary>
-        /// TADIL J message count (label 9).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 9).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel9 = 30409,
-
-        /// <summary>
-        /// TADIL J message count (label 10).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 10).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel10 = 30410,
-
-        /// <summary>
-        /// TADIL J message count (label 11).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 11).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel11 = 30411,
-
-        /// <summary>
-        /// TADIL J message count (label 12).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 12).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel12 = 30412,
-
-        /// <summary>
-        /// TADIL J message count (label 13).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 13).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel13 = 30413,
-
-        /// <summary>
-        /// TADIL J message count (label 14).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 14).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel14 = 30414,
-
-        /// <summary>
-        /// TADIL J message count (label 15).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 15).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel15 = 30415,
-
-        /// <summary>
-        /// TADIL J message count (label 16).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 16).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel16 = 30416,
-
-        /// <summary>
-        /// TADIL J message count (label 17).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 17).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel17 = 30417,
-
-        /// <summary>
-        /// TADIL J message count (label 18).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 18).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel18 = 30418,
-
-        /// <summary>
-        /// TADIL J message count (label 19).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 19).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel19 = 30419,
-
-        /// <summary>
-        /// TADIL J message count (label 20).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 20).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel20 = 30420,
-
-        /// <summary>
-        /// TADIL J message count (label 21).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 21).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel21 = 30421,
-
-        /// <summary>
-        /// TADIL J message count (label 22).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 22).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel22 = 30422,
-
-        /// <summary>
-        /// TADIL J message count (label 23).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 23).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel23 = 30423,
-
-        /// <summary>
-        /// TADIL J message count (label 24).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 24).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel24 = 30424,
-
-        /// <summary>
-        /// TADIL J message count (label 25).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 25).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel25 = 30425,
-
-        /// <summary>
-        /// TADIL J message count (label 26).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 26).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel26 = 30426,
-
-        /// <summary>
-        /// TADIL J message count (label 27).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 27).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel27 = 30427,
-
-        /// <summary>
-        /// TADIL J message count (label 28).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 28).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel28 = 30428,
-
-        /// <summary>
-        /// TADIL J message count (label 29).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 29).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel29 = 30429,
-
-        /// <summary>
-        /// TADIL J message count (label 30).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 30).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel30 = 30430,
-
-        /// <summary>
-        /// TADIL J message count (label 31).  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL J message count (label 31).  type: Unsigned Integer.  length: 32 bits.")]
-        TADILJMessageCountLabel31 = 30431,
-
-        /// <summary>
-        /// Position.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position.")]
-        Position = 31000,
-
-        /// <summary>
-        /// Route (Waypoint) type.  type: Integer.  length: 32.  range: 0 Default, 1 Orbit.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Route (Waypoint) type.  type: Integer.  length: 32.  range: 0 Default, 1 Orbit.")]
-        RouteWaypointType = 31010,
-
-        /// <summary>
-        /// MilGrid10.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MilGrid10.")]
-        MilGrid10 = 31100,
-
-        /// <summary>
-        /// Geocentric Coordinates.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Geocentric Coordinates.")]
-        GeocentricCoordinates = 31200,
-
-        /// <summary>
-        /// X.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        X = 31210,
-
-        /// <summary>
-        /// Y.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        Y = 31220,
-
-        /// <summary>
-        /// Z.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        Z = 31230,
-
-        /// <summary>
-        /// Latitude.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Latitude.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        Latitude = 31300,
-
-        /// <summary>
-        /// Longitude.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longitude.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        Longitude = 31400,
-
-        /// <summary>
-        /// Line of Sight.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Line of Sight.")]
-        LineOfSight = 31500,
-
-        /// <summary>
-        /// X.  type: Unsigned Integer.  length: 32.  units: meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X.  type: Unsigned Integer.  length: 32.  units: meters.")]
-        X_31510 = 31510,
-
-        /// <summary>
-        /// Y.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        Y_31520 = 31520,
-
-        /// <summary>
-        /// Z.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        Z_31530 = 31530,
-
-        /// <summary>
-        /// Altitude.  type: Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude.  type: Integer.  length: 32.  units: Meters.")]
-        Altitude = 31600,
-
-        /// <summary>
-        /// Destination Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Destination Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
-        DestinationLatitude = 31700,
-
-        /// <summary>
-        /// Destination Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Destination Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
-        DestinationLongitude = 31800,
-
-        /// <summary>
-        /// Destination Altitude.  type: Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Destination Altitude.  type: Integer.  length: 32.  units: Meters.")]
-        DestinationAltitude = 31900,
-
-        /// <summary>
-        /// Orientation.  type: Variable Datum.  length: 96.  units: Radians.  range: 3-32bit Floating Point.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Orientation.  type: Variable Datum.  length: 96.  units: Radians.  range: 3-32bit Floating Point.")]
-        Orientation = 32000,
-
-        /// <summary>
-        /// Hull Heading Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hull Heading Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        HullHeadingAngle = 32100,
-
-        /// <summary>
-        /// Hull Pitch Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Hull Pitch Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        HullPitchAngle = 32200,
-
-        /// <summary>
-        /// Roll Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Roll Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        RollAngle = 32300,
-
-        /// <summary>
-        /// X.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        X_32500 = 32500,
-
-        /// <summary>
-        /// Y.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        Y_32600 = 32600,
-
-        /// <summary>
-        /// Z.  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        Z_32700 = 32700,
-
-        /// <summary>
-        /// Appearance.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Appearance.")]
-        Appearance = 33000,
-
-        /// <summary>
-        /// Ambient Lighting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ambient Lighting.")]
-        AmbientLighting = 33100,
-
-        /// <summary>
-        /// Lights.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lights.")]
-        Lights = 33101,
-
-        /// <summary>
-        /// Paint Scheme.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Paint Scheme.")]
-        PaintScheme = 33200,
-
-        /// <summary>
-        /// Smoke.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Smoke.")]
-        Smoke = 33300,
-
-        /// <summary>
-        /// Trailing Effects.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trailing Effects.")]
-        TrailingEffects = 33400,
-
-        /// <summary>
-        /// Flaming.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Flaming.")]
-        Flaming = 33500,
-
-        /// <summary>
-        /// Marking.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Marking.")]
-        Marking = 33600,
-
-        /// <summary>
-        /// Mine Plows Attached.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine Plows Attached.")]
-        MinePlowsAttached = 33710,
-
-        /// <summary>
-        /// Mine Rollers Attached.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine Rollers Attached.")]
-        MineRollersAttached = 33720,
-
-        /// <summary>
-        /// Tank Turret Azimuth.  units: Degrees Rel 2 lon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tank Turret Azimuth.  units: Degrees Rel 2 lon.")]
-        TankTurretAzimuth = 33730,
-
-        /// <summary>
-        /// Failures and Malfunctions.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Failures and Malfunctions.")]
-        FailuresAndMalfunctions = 34000,
-
-        /// <summary>
-        /// Age.  units: Miles.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Age.  units: Miles.")]
-        Age = 34100,
-
-        /// <summary>
-        /// Kilometers.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kilometers.")]
-        Kilometers = 34110,
-
-        /// <summary>
-        /// Damage.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage.")]
-        Damage = 35000,
-
-        /// <summary>
-        /// Cause.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cause.")]
-        Cause = 35050,
-
-        /// <summary>
-        /// Mobility Kill.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mobility Kill.")]
-        MobilityKill = 35100,
-
-        /// <summary>
-        /// Fire-Power Kill.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire-Power Kill.")]
-        FirePowerKill = 35200,
-
-        /// <summary>
-        /// Personnel Casualties.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Personnel Casualties.")]
-        PersonnelCasualties = 35300,
-
-        /// <summary>
-        /// Velocity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Velocity.")]
-        Velocity = 36000,
-
-        /// <summary>
-        /// X-velocity.  units: Meters/second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X-velocity.  units: Meters/second.")]
-        XVelocity = 36100,
-
-        /// <summary>
-        /// Y-velocity.  units: Meters/second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y-velocity.  units: Meters/second.")]
-        YVelocity = 36200,
-
-        /// <summary>
-        /// Z-velocity.  units: Meters/second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z-velocity.  units: Meters/second.")]
-        ZVelocity = 36300,
-
-        /// <summary>
-        /// Speed.  type: Floating Point.  length: 32.  units: Meters/second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Speed.  type: Floating Point.  length: 32.  units: Meters/second.")]
-        Speed = 36400,
-
-        /// <summary>
-        /// Acceleration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acceleration.")]
-        Acceleration = 37000,
-
-        /// <summary>
-        /// X-acceleration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X-acceleration.")]
-        XAcceleration = 37100,
-
-        /// <summary>
-        /// Y-acceleration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y-acceleration.")]
-        YAcceleration = 37200,
-
-        /// <summary>
-        /// Z-acceleration.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z-acceleration.")]
-        ZAcceleration = 37300,
-
-        /// <summary>
-        /// Engine Status.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Engine Status.")]
-        EngineStatus = 38100,
-
-        /// <summary>
-        /// Primary Target Line (PTL).  type: Unsigned Integer.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Primary Target Line (PTL).  type: Unsigned Integer.  length: 32.  units: Degrees.")]
-        PrimaryTargetLinePTL = 39000,
-
-        /// <summary>
-        /// Exercise.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise.")]
-        Exercise = 40000,
-
-        /// <summary>
-        /// Exercise State.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise State.  type: Variable Record.  length: 64.")]
-        ExerciseState = 40010,
-
-        /// <summary>
-        /// Restart/Refresh.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, 1 Restart.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Restart/Refresh.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, 1 Restart.")]
-        RestartRefresh = 40015,
-
-        /// <summary>
-        /// AFATDS File Name.  type: Variable Record.  range: 1..40 ASCII Characters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AFATDS File Name.  type: Variable Record.  range: 1..40 ASCII Characters.")]
-        AFATDSFileName = 40020,
-
-        /// <summary>
-        /// Terrain Database.  type: Unsigned Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Terrain Database.  type: Unsigned Integer.  length: 32.")]
-        TerrainDatabase = 41000,
-
-        /// <summary>
-        /// 41001.  type: 41001.  length: 41001.  units: 41001.  range: 41001.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("41001.  type: 41001.  length: 41001.  units: 41001.  range: 41001.")]
-        _41001 = 41001,
-
-        /// <summary>
-        /// Missions.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Missions.")]
-        Missions = 42000,
-
-        /// <summary>
-        /// Mission ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mission ID.")]
-        MissionID = 42100,
-
-        /// <summary>
-        /// Mission Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mission Type.")]
-        MissionType = 42200,
-
-        /// <summary>
-        /// Mission Request Time Stamp.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mission Request Time Stamp.")]
-        MissionRequestTimeStamp = 42300,
-
-        /// <summary>
-        /// Exercise Description.  type: String.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise Description.  type: String.")]
-        ExerciseDescription = 43000,
-
-        /// <summary>
-        /// Name.  type: String.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Name.  type: String.")]
-        Name = 43100,
-
-        /// <summary>
-        /// Entities.  type: Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entities.  type: Integer.")]
-        Entities = 43200,
-
-        /// <summary>
-        /// Version.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Version.")]
-        Version = 43300,
-
-        /// <summary>
-        /// Guise Mode.  type: Unsigned Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Guise Mode.  type: Unsigned Integer.  length: 32.")]
-        GuiseMode = 43410,
-
-        /// <summary>
-        /// Simulation Application Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Application Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
-        SimulationApplicationActiveStatus = 43420,
-
-        /// <summary>
-        /// Simulation Application Role Record.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Application Role Record.  type: Variable Record.  length: 64.")]
-        SimulationApplicationRoleRecord = 43430,
-
-        /// <summary>
-        /// Simulation Application State.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Application State.  type: Variable Record.  length: 64.")]
-        SimulationApplicationState = 43440,
-
-        /// <summary>
-        /// Visual Output Mode.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visual Output Mode.")]
-        VisualOutputMode = 44000,
-
-        /// <summary>
-        /// Simulation Manager Role.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Manager Role.  type: Variable Record.")]
-        SimulationManagerRole = 44100,
-
-        /// <summary>
-        /// Simulation Manager Site ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Manager Site ID.  type: Unsigned Integer.  length: 16.")]
-        SimulationManagerSiteID = 44110,
-
-        /// <summary>
-        /// Simulation Manager Applic. ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Manager Applic. ID.  type: Unsigned Integer.  length: 16.")]
-        SimulationManagerApplicID = 44120,
-
-        /// <summary>
-        /// Simulation Manager Entity ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Manager Entity ID.  type: Unsigned Integer.  length: 16.")]
-        SimulationManagerEntityID = 44130,
-
-        /// <summary>
-        /// Simulation Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
-        SimulationManagerActiveStatus = 44140,
-
-        /// <summary>
-        /// After Active Review Role.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("After Active Review Role.  type: Variable Record.")]
-        AfterActiveReviewRole = 44200,
-
-        /// <summary>
-        /// After Active Review Site ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("After Active Review Site ID.  type: Unsigned Integer.  length: 16.")]
-        AfterActiveReviewSiteID = 44210,
-
-        /// <summary>
-        /// After Active Applic. ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("After Active Applic. ID.  type: Unsigned Integer.  length: 16.")]
-        AfterActiveApplicID = 44220,
-
-        /// <summary>
-        /// After Active Review Entity ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("After Active Review Entity ID.  type: Unsigned Integer.  length: 16.")]
-        AfterActiveReviewEntityID = 44230,
-
-        /// <summary>
-        /// After Active Review Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("After Active Review Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
-        AfterActiveReviewActiveStatus = 44240,
-
-        /// <summary>
-        /// Exercise Logger Role.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise Logger Role.  type: Variable Record.")]
-        ExerciseLoggerRole = 44300,
-
-        /// <summary>
-        /// Exercise Logger Site ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise Logger Site ID.  type: Unsigned Integer.  length: 16.")]
-        ExerciseLoggerSiteID = 44310,
-
-        /// <summary>
-        /// Exercise Logger Applic. ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise Logger Applic. ID.  type: Unsigned Integer.  length: 16.")]
-        ExerciseLoggerApplicID = 44320,
-
-        /// <summary>
-        /// Exercise Entity ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise Entity ID.  type: Unsigned Integer.  length: 16.")]
-        ExerciseEntityID = 44330,
-
-        /// <summary>
-        /// Exercise Logger Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise Logger Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
-        ExerciseLoggerActiveStatus = 44340,
-
-        /// <summary>
-        /// Synthetic Environment Manager Role.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Synthetic Environment Manager Role.  type: Variable Record.")]
-        SyntheticEnvironmentManagerRole = 44400,
-
-        /// <summary>
-        /// Synthetic Environment Manager Site ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Synthetic Environment Manager Site ID.  type: Unsigned Integer.  length: 16.")]
-        SyntheticEnvironmentManagerSiteID = 44410,
-
-        /// <summary>
-        /// Synthetic Environment Manager Applic. ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Synthetic Environment Manager Applic. ID.  type: Unsigned Integer.  length: 16.")]
-        SyntheticEnvironmentManagerApplicID = 44420,
-
-        /// <summary>
-        /// Synthetic Environment Manager Entity ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Synthetic Environment Manager Entity ID.  type: Unsigned Integer.  length: 16.")]
-        SyntheticEnvironmentManagerEntityID = 44430,
-
-        /// <summary>
-        /// Synthetic Environment Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Synthetic Environment Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
-        SyntheticEnvironmentManagerActiveStatus = 44440,
-
-        /// <summary>
-        /// SIMNET-DIS Translator Role.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SIMNET-DIS Translator Role.  type: Variable Record.")]
-        SIMNETDISTranslatorRole = 44500,
-
-        /// <summary>
-        /// SIMNET-DIS Translator Site ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SIMNET-DIS Translator Site ID.  type: Unsigned Integer.  length: 16.")]
-        SIMNETDISTranslatorSiteID = 44510,
-
-        /// <summary>
-        /// SIMNET-DIS Translator Applic. ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SIMNET-DIS Translator Applic. ID.  type: Unsigned Integer.  length: 16.")]
-        SIMNETDISTranslatorApplicID = 44520,
-
-        /// <summary>
-        /// SIMNET-DIS Translator Entity ID.  type: Unsigned Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SIMNET-DIS Translator Entity ID.  type: Unsigned Integer.  length: 16.")]
-        SIMNETDISTranslatorEntityID = 44530,
-
-        /// <summary>
-        /// SIMNET-DIS Translator Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SIMNET-DIS Translator Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
-        SIMNETDISTranslatorActiveStatus = 44540,
-
-        /// <summary>
-        /// Application Rate.  type: Floating point.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Application Rate.  type: Floating point.  length: 32.")]
-        ApplicationRate = 45000,
-
-        /// <summary>
-        /// Application Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std1278.1-1995 section 5.2.8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Application Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std1278.1-1995 section 5.2.8.")]
-        ApplicationTime = 45005,
-
-        /// <summary>
-        /// Application Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Application Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
-        ApplicationTimestep = 45010,
-
-        /// <summary>
-        /// Feedback Time.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Feedback Time.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
-        FeedbackTime = 45020,
-
-        /// <summary>
-        /// Simulation Rate.  type: Floating Point.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Rate.  type: Floating Point.  length: 32.")]
-        SimulationRate = 45030,
-
-        /// <summary>
-        /// Simulation Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std 1278.1-1995 section 5.2.8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std 1278.1-1995 section 5.2.8.")]
-        SimulationTime = 45040,
-
-        /// <summary>
-        /// Simulation Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
-        SimulationTimestep = 45050,
-
-        /// <summary>
-        /// Time Interval.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Interval.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
-        TimeInterval = 45060,
-
-        /// <summary>
-        /// Time Latency.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Latency.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
-        TimeLatency = 45070,
-
-        /// <summary>
-        /// Time Scheme.  type: Unsigned Integer.  length: 32.  range: 1 Real time, 2 Scaled time, 3 Scaled and stepped time.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Scheme.  type: Unsigned Integer.  length: 32.  range: 1 Real time, 2 Scaled time, 3 Scaled and stepped time.")]
-        TimeScheme = 45080,
-
-        /// <summary>
-        /// Exercise Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (takes into account exercise pauses and scaled exercise time).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Exercise Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (takes into account exercise pauses and scaled exercise time).")]
-        ExerciseElapsedTime = 46000,
-
-        /// <summary>
-        /// Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (real time, does not take into account exercise pauses and scaled exercise time).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (real time, does not take into account exercise pauses and scaled exercise time).")]
-        ElapsedTime = 46010,
-
-        /// <summary>
-        /// Environment.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environment.")]
-        Environment = 50000,
-
-        /// <summary>
-        /// Weather.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weather.")]
-        Weather = 51000,
-
-        /// <summary>
-        /// Weather Condition.  type: Unsigned Integer.  length: 32.  units: N/A.  range: 0 = Clear, 1 = Cloudy, 2 = Overcast, 3 = Foggy, 4 = Raining.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weather Condition.  type: Unsigned Integer.  length: 32.  units: N/A.  range: 0 = Clear, 1 = Cloudy, 2 = Overcast, 3 = Foggy, 4 = Raining.")]
-        WeatherCondition = 51010,
-
-        /// <summary>
-        /// Thermal Condition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thermal Condition.")]
-        ThermalCondition = 51100,
-
-        /// <summary>
-        /// Thermal Visibility.  type: Floating Point.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thermal Visibility.  type: Floating Point.  length: 32.  units: Meters.")]
-        ThermalVisibility = 51110,
-
-        /// <summary>
-        /// Thermal Visibility.  type: Unsigned integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thermal Visibility.  type: Unsigned integer.  length: 32.  units: Meters.")]
-        ThermalVisibility_51111 = 51111,
-
-        /// <summary>
-        /// Time.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time.")]
-        Time = 52000,
-
-        /// <summary>
-        /// Time.  type: String.  length: 56.  range: Format HHMMSS.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time.  type: String.  length: 56.  range: Format HHMMSS.")]
-        Time_52001 = 52001,
-
-        /// <summary>
-        /// Time of Day, Discrete.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time of Day, Discrete.")]
-        TimeOfDayDiscrete = 52100,
-
-        /// <summary>
-        /// Time of Day, Continuous.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time of Day, Continuous.")]
-        TimeOfDayContinuous = 52200,
-
-        /// <summary>
-        /// Time Mode.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Mode.")]
-        TimeMode = 52300,
-
-        /// <summary>
-        /// Time Scene.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Scene.")]
-        TimeScene = 52305,
-
-        /// <summary>
-        /// Current Hour.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Current Hour.")]
-        CurrentHour = 52310,
-
-        /// <summary>
-        /// Current Minute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Current Minute.")]
-        CurrentMinute = 52320,
-
-        /// <summary>
-        /// Current Second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Current Second.")]
-        CurrentSecond = 52330,
-
-        /// <summary>
-        /// Azimuth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Azimuth.")]
-        Azimuth = 52340,
-
-        /// <summary>
-        /// Maximum Elevation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Maximum Elevation.")]
-        MaximumElevation = 52350,
-
-        /// <summary>
-        /// Time Zone.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Zone.")]
-        TimeZone = 52360,
-
-        /// <summary>
-        /// Time Rate.  type: Integer.  length: 32.  range: 1000 * Ratio (Simulation Time / Wall Clock Time).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Rate.  type: Integer.  length: 32.  range: 1000 * Ratio (Simulation Time / Wall Clock Time).")]
-        TimeRate = 52370,
-
-        /// <summary>
-        /// The number of simulation seconds since the start of the exercise (simulation time).  type: Integer.  length: 32.  units: Seconds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("The number of simulation seconds since the start of the exercise (simulation time).  type: Integer.  length: 32.  units: Seconds.")]
-        TheNumberOfSimulationSecondsSinceTheStartOfTheExerciseSimulationTime = 52380,
-
-        /// <summary>
-        /// Time Sunrise Enabled.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Sunrise Enabled.")]
-        TimeSunriseEnabled = 52400,
-
-        /// <summary>
-        /// Sunrise Hour.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunrise Hour.")]
-        SunriseHour = 52410,
-
-        /// <summary>
-        /// Sunrise Minute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunrise Minute.")]
-        SunriseMinute = 52420,
-
-        /// <summary>
-        /// Sunrise Second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunrise Second.")]
-        SunriseSecond = 52430,
-
-        /// <summary>
-        /// Sunrise Azimuth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunrise Azimuth.")]
-        SunriseAzimuth = 52440,
-
-        /// <summary>
-        /// Time Sunset Enabled.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Sunset Enabled.")]
-        TimeSunsetEnabled = 52500,
-
-        /// <summary>
-        /// Sunset Hour.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunset Hour.")]
-        SunsetHour = 52510,
-
-        /// <summary>
-        /// Sunset Hour.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunset Hour.")]
-        SunsetHour_52511 = 52511,
-
-        /// <summary>
-        /// Sunset Minute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunset Minute.")]
-        SunsetMinute = 52520,
-
-        /// <summary>
-        /// Sunset Second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sunset Second.")]
-        SunsetSecond = 52530,
-
-        /// <summary>
-        /// 52531.  type: 52531.  length: 52531.  units: 52531.  range: 52531.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("52531.  type: 52531.  length: 52531.  units: 52531.  range: 52531.")]
-        _52531 = 52531,
-
-        /// <summary>
-        /// Date.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Date.")]
-        Date = 52600,
-
-        /// <summary>
-        /// Date (European).  type: String.  length: 72.  range: Format DDMMYYYY.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Date (European).  type: String.  length: 72.  range: Format DDMMYYYY.")]
-        DateEuropean = 52601,
-
-        /// <summary>
-        /// Date (US).  type: String.  length: 72.  range: Format MMDDYYYY.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Date (US).  type: String.  length: 72.  range: Format MMDDYYYY.")]
-        DateUS = 52602,
-
-        /// <summary>
-        /// Month.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Month.")]
-        Month = 52610,
-
-        /// <summary>
-        /// Day.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Day.")]
-        Day = 52620,
-
-        /// <summary>
-        /// Year.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Year.")]
-        Year = 52630,
-
-        /// <summary>
-        /// Clouds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Clouds.")]
-        Clouds = 53000,
-
-        /// <summary>
-        /// Cloud Layer Enable.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cloud Layer Enable.")]
-        CloudLayerEnable = 53050,
-
-        /// <summary>
-        /// Cloud Layer Selection.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cloud Layer Selection.")]
-        CloudLayerSelection = 53060,
-
-        /// <summary>
-        /// Visibility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility.")]
-        Visibility = 53100,
-
-        /// <summary>
-        /// Base Altitude.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Base Altitude.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        BaseAltitude = 53200,
-
-        /// <summary>
-        /// Base Altitude.  units: Feet.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Base Altitude.  units: Feet.")]
-        BaseAltitude_53250 = 53250,
-
-        /// <summary>
-        /// Ceiling.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ceiling.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        Ceiling = 53300,
-
-        /// <summary>
-        /// Ceiling.  units: Feet.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ceiling.  units: Feet.")]
-        Ceiling_53350 = 53350,
-
-        /// <summary>
-        /// Characteristics.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Characteristics.")]
-        Characteristics = 53400,
-
-        /// <summary>
-        /// Concentration Length.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Concentration Length.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.")]
-        ConcentrationLength = 53410,
-
-        /// <summary>
-        /// Transmittance.  type: Floating Point.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transmittance.  type: Floating Point.  length: 32.")]
-        Transmittance = 53420,
-
-        /// <summary>
-        /// Radiance.  type: Floating Point.  length: 32.  units: microwatts/ centimeterCaret2/ steradian.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radiance.  type: Floating Point.  length: 32.  units: microwatts/ centimeterCaret2/ steradian.")]
-        Radiance = 53430,
-
-        /// <summary>
-        /// Precipitation.  type: Boolean.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Precipitation.  type: Boolean.  length: 32.")]
-        Precipitation = 54000,
-
-        /// <summary>
-        /// Rain.  type: Boolean.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rain.  type: Boolean.")]
-        Rain = 54100,
-
-        /// <summary>
-        /// Fog.  type: Boolean.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fog.  type: Boolean.")]
-        Fog = 55000,
-
-        /// <summary>
-        /// Visibility.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility.  units: Meters.")]
-        Visibility_55100 = 55100,
-
-        /// <summary>
-        /// Visibility.  type: Unsigned integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility.  type: Unsigned integer.  length: 32.  units: Meters.")]
-        Visibility_55101 = 55101,
-
-        /// <summary>
-        /// Visibility.  units: Miles.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility.  units: Miles.")]
-        Visibility_55105 = 55105,
-
-        /// <summary>
-        /// Density.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Density.")]
-        Density = 55200,
-
-        /// <summary>
-        /// Base.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Base.")]
-        Base = 55300,
-
-        /// <summary>
-        /// View Layer from above.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("View Layer from above.")]
-        ViewLayerFromAbove = 55401,
-
-        /// <summary>
-        /// Transition Range.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transition Range.")]
-        TransitionRange = 55410,
-
-        /// <summary>
-        /// Bottom.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bottom.  units: Meters.")]
-        Bottom = 55420,
-
-        /// <summary>
-        /// Bottom.  units: Feet.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bottom.  units: Feet.")]
-        Bottom_55425 = 55425,
-
-        /// <summary>
-        /// Ceiling.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ceiling.  units: Meters.")]
-        Ceiling_55430 = 55430,
-
-        /// <summary>
-        /// Ceiling.  units: Feet.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ceiling.  units: Feet.")]
-        Ceiling_55435 = 55435,
-
-        /// <summary>
-        /// Heavenly Bodies.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heavenly Bodies.")]
-        HeavenlyBodies = 56000,
-
-        /// <summary>
-        /// Sun.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sun.")]
-        Sun = 56100,
-
-        /// <summary>
-        /// Sun Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sun Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.")]
-        SunVisible = 56105,
-
-        /// <summary>
-        /// Position.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position.")]
-        Position_56110 = 56110,
-
-        /// <summary>
-        /// Sun Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sun Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.")]
-        SunPositionElevationDegrees = 56111,
-
-        /// <summary>
-        /// Position Azimuth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Azimuth.")]
-        PositionAzimuth = 56120,
-
-        /// <summary>
-        /// Sun Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sun Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
-        SunPositionAzimuthDegrees = 56121,
-
-        /// <summary>
-        /// Position Elevation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Elevation.")]
-        PositionElevation = 56130,
-
-        /// <summary>
-        /// Position Intensity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Intensity.")]
-        PositionIntensity = 56140,
-
-        /// <summary>
-        /// Moon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moon.")]
-        Moon = 56200,
-
-        /// <summary>
-        /// Moon Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moon Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.")]
-        MoonVisible = 56205,
-
-        /// <summary>
-        /// Position.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position.")]
-        Position_56210 = 56210,
-
-        /// <summary>
-        /// Position Azimuth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Azimuth.")]
-        PositionAzimuth_56220 = 56220,
-
-        /// <summary>
-        /// Moon Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moon Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
-        MoonPositionAzimuthDegrees = 56221,
-
-        /// <summary>
-        /// Position Elevation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Elevation.")]
-        PositionElevation_56230 = 56230,
-
-        /// <summary>
-        /// Moon Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moon Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.")]
-        MoonPositionElevationDegrees = 56231,
-
-        /// <summary>
-        /// Position Intensity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Intensity.")]
-        PositionIntensity_56240 = 56240,
-
-        /// <summary>
-        /// Horizon.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Horizon.")]
-        Horizon = 56310,
-
-        /// <summary>
-        /// Horizon Azimuth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Horizon Azimuth.")]
-        HorizonAzimuth = 56320,
-
-        /// <summary>
-        /// Horizon Elevation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Horizon Elevation.")]
-        HorizonElevation = 56330,
-
-        /// <summary>
-        /// Horizon Heading.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Horizon Heading.")]
-        HorizonHeading = 56340,
-
-        /// <summary>
-        /// Horizon Intensity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Horizon Intensity.")]
-        HorizonIntensity = 56350,
-
-        /// <summary>
-        /// Humidity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Humidity.")]
-        Humidity = 57200,
-
-        /// <summary>
-        /// Visibility.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility.")]
-        Visibility_57300 = 57300,
-
-        /// <summary>
-        /// Winds.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Winds.")]
-        Winds = 57400,
-
-        /// <summary>
-        /// Speed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Speed.")]
-        Speed_57410 = 57410,
-
-        /// <summary>
-        /// Wind Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wind Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.")]
-        WindSpeedKnots = 57411,
-
-        /// <summary>
-        /// Wind Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wind Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.")]
-        WindDirection = 57420,
-
-        /// <summary>
-        /// Wind Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wind Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
-        WindDirectionDegrees = 57421,
-
-        /// <summary>
-        /// Rainsoak.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rainsoak.")]
-        Rainsoak = 57500,
-
-        /// <summary>
-        /// Tide Speed.  type: Floating Point.  length: 32.  units: Meters/second.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tide Speed.  type: Floating Point.  length: 32.  units: Meters/second.")]
-        TideSpeed = 57610,
-
-        /// <summary>
-        /// Tide Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tide Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.")]
-        TideSpeedKnots = 57611,
-
-        /// <summary>
-        /// Tide Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tide Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.")]
-        TideDirection = 57620,
-
-        /// <summary>
-        /// Tide Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tide Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
-        TideDirectionDegrees = 57621,
-
-        /// <summary>
-        /// Haze.  type: Boolean.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Haze.  type: Boolean.")]
-        Haze = 58000,
-
-        /// <summary>
-        /// Visibility.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility.  units: Meters.")]
-        Visibility_58100 = 58100,
-
-        /// <summary>
-        /// Visibility.  units: Miles.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility.  units: Miles.")]
-        Visibility_58105 = 58105,
-
-        /// <summary>
-        /// Density.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Density.")]
-        Density_58200 = 58200,
-
-        /// <summary>
-        /// Ceiling.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ceiling.  units: Meters.")]
-        Ceiling_58430 = 58430,
-
-        /// <summary>
-        /// Ceiling.  units: Feet.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ceiling.  units: Feet.")]
-        Ceiling_58435 = 58435,
-
-        /// <summary>
-        /// Contaminants and Obscurants.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contaminants and Obscurants.")]
-        ContaminantsAndObscurants = 59000,
-
-        /// <summary>
-        /// Contaminant/Obscurant Type.  type: Unsigned Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contaminant/Obscurant Type.  type: Unsigned Integer.  length: 32.")]
-        ContaminantObscurantType = 59100,
-
-        /// <summary>
-        /// Persistence.  type: Enumeration.  length: 8.  range: 0 Neat, 1 Dry, 2 Thickened.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Persistence.  type: Enumeration.  length: 8.  range: 0 Neat, 1 Dry, 2 Thickened.")]
-        Persistence = 59110,
-
-        /// <summary>
-        /// Chemical Dosage.  type: Floating Point.  length: 32.  units: milligrams/meter?/minute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical Dosage.  type: Floating Point.  length: 32.  units: milligrams/meter?/minute.")]
-        ChemicalDosage = 59115,
-
-        /// <summary>
-        /// Chemical Air Concentration.  type: Floating Point.  length: 32.  units: milligrams/meter?.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical Air Concentration.  type: Floating Point.  length: 32.  units: milligrams/meter?.")]
-        ChemicalAirConcentration = 59120,
-
-        /// <summary>
-        /// Chemical Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.")]
-        ChemicalGroundDeposition = 59125,
-
-        /// <summary>
-        /// Chemical Maximum Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical Maximum Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.")]
-        ChemicalMaximumGroundDeposition = 59130,
-
-        /// <summary>
-        /// Chemical Dosage Threshold.  type: Floating Point.  length: 32.  units: milligram/meter?/minute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical Dosage Threshold.  type: Floating Point.  length: 32.  units: milligram/meter?/minute.")]
-        ChemicalDosageThreshold = 59135,
-
-        /// <summary>
-        /// Biological Dosage.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological Dosage.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.")]
-        BiologicalDosage = 59140,
-
-        /// <summary>
-        /// Biological Air Concentration.  type: Floating Point.  length: 32.  units: particles/liter of air.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological Air Concentration.  type: Floating Point.  length: 32.  units: particles/liter of air.")]
-        BiologicalAirConcentration = 59145,
-
-        /// <summary>
-        /// Biological Dosage Threshold.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological Dosage Threshold.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.")]
-        BiologicalDosageThreshold = 59150,
-
-        /// <summary>
-        /// Biological Binned Particle Count.  type: Enumeration.  length: 8.  range: 1 Low (.5-2), 2 Detection (2-.10), 3 High (10-15).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological Binned Particle Count.  type: Enumeration.  length: 8.  range: 1 Low (.5-2), 2 Detection (2-.10), 3 High (10-15).")]
-        BiologicalBinnedParticleCount = 59155,
-
-        /// <summary>
-        /// Radiological Dosage.  type: Floating Point.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radiological Dosage.  type: Floating Point.  length: 32.")]
-        RadiologicalDosage = 59160,
-
-        /// <summary>
-        /// Communications.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Communications.")]
-        Communications = 60000,
-
-        /// <summary>
-        /// Channel Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Channel Type.")]
-        ChannelType = 61100,
-
-        /// <summary>
-        /// Channel Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Channel Type.")]
-        ChannelType_61101 = 61101,
-
-        /// <summary>
-        /// Channel Identification.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Channel Identification.")]
-        ChannelIdentification = 61200,
-
-        /// <summary>
-        /// Alpha Identification.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alpha Identification.")]
-        AlphaIdentification = 61300,
-
-        /// <summary>
-        /// 61301.  type: 61301.  length: 61301.  units: 61301.  range: 61301.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("61301.  type: 61301.  length: 61301.  units: 61301.  range: 61301.")]
-        _61301 = 61301,
-
-        /// <summary>
-        /// Radio Identification.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Identification.")]
-        RadioIdentification = 61400,
-
-        /// <summary>
-        /// 61401.  type: 61401.  length: 61401.  units: 61401.  range: 61401.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("61401.  type: 61401.  length: 61401.  units: 61401.  range: 61401.")]
-        _61401 = 61401,
-
-        /// <summary>
-        /// Land Line Identification.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Land Line Identification.")]
-        LandLineIdentification = 61500,
-
-        /// <summary>
-        /// Intercom Identification.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intercom Identification.")]
-        IntercomIdentification = 61600,
-
-        /// <summary>
-        /// Group Network Channel Number.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Group Network Channel Number.")]
-        GroupNetworkChannelNumber = 61700,
-
-        /// <summary>
-        /// Radio Communications Status.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Communications Status.")]
-        RadioCommunicationsStatus = 62100,
-
-        /// <summary>
-        /// Stationary Radio Transmitters Default Time.  type: Unsigned Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stationary Radio Transmitters Default Time.  type: Unsigned Integer.")]
-        StationaryRadioTransmittersDefaultTime = 62200,
-
-        /// <summary>
-        /// Moving Radio Transmitters Default Time.  type: Unsigned Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moving Radio Transmitters Default Time.  type: Unsigned Integer.")]
-        MovingRadioTransmittersDefaultTime = 62300,
-
-        /// <summary>
-        /// Stationary Radio Signals Default Time.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stationary Radio Signals Default Time.")]
-        StationaryRadioSignalsDefaultTime = 62400,
-
-        /// <summary>
-        /// Moving Radio Signal Default Time.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Moving Radio Signal Default Time.")]
-        MovingRadioSignalDefaultTime = 62500,
-
-        /// <summary>
-        /// Radio Initialization Transec Security Key.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Transec Security Key.  type: Variable Record.")]
-        RadioInitializationTransecSecurityKey = 63101,
-
-        /// <summary>
-        /// Radio Initialization Internal Noise Level.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Internal Noise Level.  type: Variable Record.")]
-        RadioInitializationInternalNoiseLevel = 63102,
-
-        /// <summary>
-        /// Radio Initialization Squelch Threshold.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Squelch Threshold.  type: Variable Record.")]
-        RadioInitializationSquelchThreshold = 63103,
-
-        /// <summary>
-        /// Radio Initialization Antenna Location.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Antenna Location.  type: Variable Record.")]
-        RadioInitializationAntennaLocation = 63104,
-
-        /// <summary>
-        /// Radio Initialization Antenna Pattern Type.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Antenna Pattern Type.  type: Variable Record.")]
-        RadioInitializationAntennaPatternType = 63105,
-
-        /// <summary>
-        /// Radio Initialization Antenna Pattern Length.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Antenna Pattern Length.  type: Variable Record.")]
-        RadioInitializationAntennaPatternLength = 63106,
-
-        /// <summary>
-        /// Radio Initialization Beam Definition.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Beam Definition.  type: Variable Record.")]
-        RadioInitializationBeamDefinition = 63107,
-
-        /// <summary>
-        /// Radio Initialization Transmit Heartbeat Time.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Transmit Heartbeat Time.  type: Variable Record.")]
-        RadioInitializationTransmitHeartbeatTime = 63108,
-
-        /// <summary>
-        /// Radio Initialization Transmit Distance Threshold Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Initialization Transmit Distance Threshold Variable Record.")]
-        RadioInitializationTransmitDistanceThresholdVariableRecord = 63109,
-
-        /// <summary>
-        /// Radio Channel Initialization Lockout ID.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Channel Initialization Lockout ID.  type: Variable Record.")]
-        RadioChannelInitializationLockoutID = 63110,
-
-        /// <summary>
-        /// Radio Channel Initialization Hopset ID.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Channel Initialization Hopset ID.  type: Variable Record.")]
-        RadioChannelInitializationHopsetID = 63111,
-
-        /// <summary>
-        /// Radio Channel Initialization Preset Frequency.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Channel Initialization Preset Frequency.  type: Variable Record.")]
-        RadioChannelInitializationPresetFrequency = 63112,
-
-        /// <summary>
-        /// Radio Channel Initialization Frequency Sync Time.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Channel Initialization Frequency Sync Time.  type: Variable Record.")]
-        RadioChannelInitializationFrequencySyncTime = 63113,
-
-        /// <summary>
-        /// Radio Channel Initialization Comsec Key.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Channel Initialization Comsec Key.  type: Variable Record.")]
-        RadioChannelInitializationComsecKey = 63114,
-
-        /// <summary>
-        /// Radio Channel Initialization Alpha.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Channel Initialization Alpha.  type: Variable Record.")]
-        RadioChannelInitializationAlpha = 63115,
-
-        /// <summary>
-        /// Algorithm Parameters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Algorithm Parameters.")]
-        AlgorithmParameters = 70000,
-
-        /// <summary>
-        /// Dead Reckoning Algorithm (DRA).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Algorithm (DRA).")]
-        DeadReckoningAlgorithmDRA = 71000,
-
-        /// <summary>
-        /// DRA Location Threshold.  type: Unsigned Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRA Location Threshold.  type: Unsigned Integer.  length: 32.")]
-        DRALocationThreshold = 71100,
-
-        /// <summary>
-        /// DRA Orientation Threshold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRA Orientation Threshold.")]
-        DRAOrientationThreshold = 71200,
-
-        /// <summary>
-        /// DRA Time Threshold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRA Time Threshold.")]
-        DRATimeThreshold = 71300,
-
-        /// <summary>
-        /// Simulation Management Parameters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Simulation Management Parameters.")]
-        SimulationManagementParameters = 72000,
-
-        /// <summary>
-        /// Checkpoint Interval.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Checkpoint Interval.")]
-        CheckpointInterval = 72100,
-
-        /// <summary>
-        /// Transmitter Time Threshold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transmitter Time Threshold.")]
-        TransmitterTimeThreshold = 72600,
-
-        /// <summary>
-        /// Receiver Time Threshold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Receiver Time Threshold.")]
-        ReceiverTimeThreshold = 72700,
-
-        /// <summary>
-        /// Interoperability Mode.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Interoperability Mode.")]
-        InteroperabilityMode = 73000,
-
-        /// <summary>
-        /// SIMNET Data Collection.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SIMNET Data Collection.  type: Variable Record.")]
-        SIMNETDataCollection = 74000,
-
-        /// <summary>
-        /// Event ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Event ID.")]
-        EventID = 75000,
-
-        /// <summary>
-        /// Source Site ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Source Site ID.")]
-        SourceSiteID = 75100,
-
-        /// <summary>
-        /// Source Host ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Source Host ID.")]
-        SourceHostID = 75200,
-
-        /// <summary>
-        /// Articulated Parts.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulated Parts.")]
-        ArticulatedParts = 90000,
-
-        /// <summary>
-        /// 90001.  type: 90001.  length: 90001.  units: 90001.  range: 90001.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("90001.  type: 90001.  length: 90001.  units: 90001.  range: 90001.")]
-        _90001 = 90001,
-
-        /// <summary>
-        /// Part ID.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Part ID.")]
-        PartID = 90050,
-
-        /// <summary>
-        /// Index.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Index.")]
-        Index = 90070,
-
-        /// <summary>
-        /// Position.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position.")]
-        Position_90100 = 90100,
-
-        /// <summary>
-        /// Position Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Position Rate.")]
-        PositionRate = 90200,
-
-        /// <summary>
-        /// Extension.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Extension.")]
-        Extension = 90300,
-
-        /// <summary>
-        /// Extension Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Extension Rate.")]
-        ExtensionRate = 90400,
-
-        /// <summary>
-        /// X.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X.")]
-        X_90500 = 90500,
-
-        /// <summary>
-        /// X-rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("X-rate.")]
-        XRate = 90600,
-
-        /// <summary>
-        /// Y.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y.")]
-        Y_90700 = 90700,
-
-        /// <summary>
-        /// Y-rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Y-rate.")]
-        YRate = 90800,
-
-        /// <summary>
-        /// Z.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z.")]
-        Z_90900 = 90900,
-
-        /// <summary>
-        /// Z-rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Z-rate.")]
-        ZRate = 91000,
-
-        /// <summary>
-        /// Azimuth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Azimuth.")]
-        Azimuth_91100 = 91100,
-
-        /// <summary>
-        /// Azimuth Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Azimuth Rate.")]
-        AzimuthRate = 91200,
-
-        /// <summary>
-        /// Elevation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Elevation.")]
-        Elevation = 91300,
-
-        /// <summary>
-        /// Elevation Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Elevation Rate.")]
-        ElevationRate = 91400,
-
-        /// <summary>
-        /// Rotation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rotation.")]
-        Rotation = 91500,
-
-        /// <summary>
-        /// Rotation Rate.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rotation Rate.")]
-        RotationRate = 91600,
-
-        /// <summary>
-        /// DRA Angular X-Velocity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRA Angular X-Velocity.")]
-        DRAAngularXVelocity = 100001,
-
-        /// <summary>
-        /// DRA Angular Y-Velocity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRA Angular Y-Velocity.")]
-        DRAAngularYVelocity = 100002,
-
-        /// <summary>
-        /// DRA Angular Z-Velocity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DRA Angular Z-Velocity.")]
-        DRAAngularZVelocity = 100003,
-
-        /// <summary>
-        /// Appearance, Trailing Effects.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Appearance, Trailing Effects.")]
-        AppearanceTrailingEffects = 100004,
-
-        /// <summary>
-        /// Appearance, Hatch.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Appearance, Hatch.")]
-        AppearanceHatch = 100005,
-
-        /// <summary>
-        /// Appearance, Character Set.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Appearance, Character Set.")]
-        AppearanceCharacterSet = 100008,
-
-        /// <summary>
-        /// Capability, Ammunition Supplier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Capability, Ammunition Supplier.")]
-        CapabilityAmmunitionSupplier = 100010,
-
-        /// <summary>
-        /// Capability, Miscellaneous Supplier.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Capability, Miscellaneous Supplier.")]
-        CapabilityMiscellaneousSupplier = 100011,
-
-        /// <summary>
-        /// Capability, Repair Provider.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Capability, Repair Provider.")]
-        CapabilityRepairProvider = 100012,
-
-        /// <summary>
-        /// Articulation Parameter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulation Parameter.")]
-        ArticulationParameter = 100014,
-
-        /// <summary>
-        /// Articulation Parameter Type.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulation Parameter Type.")]
-        ArticulationParameterType = 100047,
-
-        /// <summary>
-        /// Articulation Parameter Value.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulation Parameter Value.")]
-        ArticulationParameterValue = 100048,
-
-        /// <summary>
-        /// Time of Day-Scene.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time of Day-Scene.")]
-        TimeOfDayScene = 100058,
-
-        /// <summary>
-        /// Latitude-North (Location of weather cell).  type: Unsigned Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Latitude-North (Location of weather cell).  type: Unsigned Integer.")]
-        LatitudeNorthLocationOfWeatherCell = 100061,
-
-        /// <summary>
-        /// Longitude-East (Location of weather cell).  type: Unsigned integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longitude-East (Location of weather cell).  type: Unsigned integer.")]
-        LongitudeEastLocationOfWeatherCell = 100063,
-
-        /// <summary>
-        /// Tactical Driver Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical Driver Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
-        TacticalDriverStatus = 100068,
-
-        /// <summary>
-        /// Sonar System Status.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sonar System Status.")]
-        SonarSystemStatus = 100100,
-
-        /// <summary>
-        /// Upper latitude.  type: float.  length: 32 bits.  units: radians.  range: -pi/2, +p1/2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Upper latitude.  type: float.  length: 32 bits.  units: radians.  range: -pi/2, +p1/2.")]
-        UpperLatitude = 100161,
-
-        /// <summary>
-        /// Latitude-South (Location of weather cell).  type: Unsigned Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Latitude-South (Location of weather cell).  type: Unsigned Integer.")]
-        LatitudeSouthLocationOfWeatherCell = 100162,
-
-        /// <summary>
-        /// Western longitude.  type: float.  length: 32 bits.  units: radians.  range: -pi, +pi.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Western longitude.  type: float.  length: 32 bits.  units: radians.  range: -pi, +pi.")]
-        WesternLongitude = 100163,
-
-        /// <summary>
-        /// Longitude-West (location of weather cell).  type: Unsigned Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longitude-West (location of weather cell).  type: Unsigned Integer.")]
-        LongitudeWestLocationOfWeatherCell = 100164,
-
-        /// <summary>
-        /// Accomplished accept.  type: Boolean.  range: 0 Accept, 1 Non-accept.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Accomplished accept.  type: Boolean.  range: 0 Accept, 1 Non-accept.")]
-        AccomplishedAccept = 100165,
-
-        /// <summary>
-        /// CD ROM Number (Disk ID for terrain).  type: Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CD ROM Number (Disk ID for terrain).  type: Integer.")]
-        CDROMNumberDiskIDForTerrain = 100165,
-
-        /// <summary>
-        /// DTED disk ID.  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DTED disk ID.  type: Unsigned Integer.  length: 32 bits.")]
-        DTEDDiskID = 100166,
-
-        /// <summary>
-        /// Altitude.  type: Floating point.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude.  type: Floating point.")]
-        Altitude_100167 = 100167,
-
-        /// <summary>
-        /// Tactical System Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tactical System Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
-        TacticalSystemStatus = 100169,
-
-        /// <summary>
-        /// JTIDS Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("JTIDS Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
-        JTIDSStatus = 100170,
-
-        /// <summary>
-        /// TADIL-J Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TADIL-J Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
-        TADILJStatus = 100171,
-
-        /// <summary>
-        /// DSDD Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DSDD Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
-        DSDDStatus = 100172,
-
-        /// <summary>
-        /// Weapon System Status.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon System Status.")]
-        WeaponSystemStatus = 100200,
-
-        /// <summary>
-        /// Subsystem status.  type: Boolean.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Subsystem status.  type: Boolean.  length: 32 bits.")]
-        SubsystemStatus = 100205,
-
-        /// <summary>
-        /// Number of interceptors fired.  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Number of interceptors fired.  type: Unsigned Integer.  length: 32 bits.")]
-        NumberOfInterceptorsFired = 100206,
-
-        /// <summary>
-        /// Number of interceptor detonations.  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Number of interceptor detonations.  type: Unsigned Integer.  length: 32 bits.")]
-        NumberOfInterceptorDetonations = 100207,
-
-        /// <summary>
-        /// Number of message buffers dropped.  type: Unsigned Integer.  length: 32 bits.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Number of message buffers dropped.  type: Unsigned Integer.  length: 32 bits.")]
-        NumberOfMessageBuffersDropped = 100208,
-
-        /// <summary>
-        /// Satellite sensor background (year, day).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: years, Julian days.  range: 1-366.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Satellite sensor background (year, day).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: years, Julian days.  range: 1-366.")]
-        SatelliteSensorBackgroundYearDay = 100213,
-
-        /// <summary>
-        /// Satellite sensor background (hour, minute).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: hours, minutes.  range: 0-23,0-59.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Satellite sensor background (hour, minute).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: hours, minutes.  range: 0-23,0-59.")]
-        SatelliteSensorBackgroundHourMinute = 100214,
-
-        /// <summary>
-        /// Script Number.  type: Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Script Number.  type: Integer.  length: 32.")]
-        ScriptNumber = 100218,
-
-        /// <summary>
-        /// Entity/Track/Update Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity/Track/Update Data.")]
-        EntityTrackUpdateData = 100300,
-
-        /// <summary>
-        /// Local/Force Training.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Local/Force Training.")]
-        LocalForceTraining = 100400,
-
-        /// <summary>
-        /// Entity/Track Identity Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity/Track Identity Data.")]
-        EntityTrackIdentityData = 100500,
-
-        /// <summary>
-        /// Entity for Track Event.  type: Variable.  length: 48.  range: Entity being tracked.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity for Track Event.  type: Variable.  length: 48.  range: Entity being tracked.")]
-        EntityForTrackEvent = 100510,
-
-        /// <summary>
-        /// IFF (Friend-Foe) status.  type: Unsigned Integer.  length: 32.  range: 0 Unidentified / Unknown, 1 Perceived Friendly, 2 Perceived Hostile.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("IFF (Friend-Foe) status.  type: Unsigned Integer.  length: 32.  range: 0 Unidentified / Unknown, 1 Perceived Friendly, 2 Perceived Hostile.")]
-        IFFFriendFoeStatus = 100520,
-
-        /// <summary>
-        /// Engagement Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Engagement Data.")]
-        EngagementData = 100600,
-
-        /// <summary>
-        /// Target Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Target Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
-        TargetLatitude = 100610,
-
-        /// <summary>
-        /// Target Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Target Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
-        TargetLongitude = 100620,
-
-        /// <summary>
-        /// Area of Interest (Ground Impact Circle) Center Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Area of Interest (Ground Impact Circle) Center Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
-        AreaOfInterestGroundImpactCircleCenterLatitude = 100631,
-
-        /// <summary>
-        /// Area of Interest (Ground Impact Circle) Center Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Area of Interest (Ground Impact Circle) Center Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
-        AreaOfInterestGroundImpactCircleCenterLongitude = 100632,
-
-        /// <summary>
-        /// Area of Interest (Ground Impact Circle) Radius.  type: Unsigned Integer.  length: 32.  units: Meters.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Area of Interest (Ground Impact Circle) Radius.  type: Unsigned Integer.  length: 32.  units: Meters.")]
-        AreaOfInterestGroundImpactCircleRadius = 100633,
-
-        /// <summary>
-        /// Area of Interest Type.  type: Unsigned Integer.  length: 32.  range: 0 Unspecified, 1 TBM Defense.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Area of Interest Type.  type: Unsigned Integer.  length: 32.  range: 0 Unspecified, 1 TBM Defense.")]
-        AreaOfInterestType = 100634,
-
-        /// <summary>
-        /// Target Aggregate ID.  type: Variable.  length: 48.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Target Aggregate ID.  type: Variable.  length: 48.")]
-        TargetAggregateID = 100640,
-
-        /// <summary>
-        /// GIC Identification Number.  type: Unsigned Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GIC Identification Number.  type: Unsigned Integer.  length: 32.")]
-        GICIdentificationNumber = 100650,
-
-        /// <summary>
-        /// Estimated Time of Flight to TBM Impact.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Estimated Time of Flight to TBM Impact.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.")]
-        EstimatedTimeOfFlightToTBMImpact = 100660,
-
-        /// <summary>
-        /// Estimated Intercept Time.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Estimated Intercept Time.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.")]
-        EstimatedInterceptTime = 100661,
-
-        /// <summary>
-        /// Estimated Time of Flight to Next Waypoint.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Estimated Time of Flight to Next Waypoint.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.")]
-        EstimatedTimeOfFlightToNextWaypoint = 100662,
-
-        /// <summary>
-        /// Entity/Track Equipment Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity/Track Equipment Data.")]
-        EntityTrackEquipmentData = 100700,
-
-        /// <summary>
-        /// Emission/EW Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Emission/EW Data.")]
-        EmissionEWData = 100800,
-
-        /// <summary>
-        /// Appearance Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Appearance Data.")]
-        AppearanceData = 100900,
-
-        /// <summary>
-        /// Command/Order Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command/Order Data.")]
-        CommandOrderData = 101000,
-
-        /// <summary>
-        /// Environmental Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environmental Data.")]
-        EnvironmentalData = 101100,
-
-        /// <summary>
-        /// Significant Event Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Significant Event Data.")]
-        SignificantEventData = 101200,
-
-        /// <summary>
-        /// Operator Action Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Operator Action Data.")]
-        OperatorActionData = 101300,
-
-        /// <summary>
-        /// ADA Engagement Mode.  type: Unsigned Integer.  length: 32.  range: 0 Air, 1 ATBM.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ADA Engagement Mode.  type: Unsigned Integer.  length: 32.  range: 0 Air, 1 ATBM.")]
-        ADAEngagementMode = 101310,
-
-        /// <summary>
-        /// ADA Shooting Status.  type: Unsigned Integer.  length: 32.  range: 0 Can not engage, 1 Can engage,.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ADA Shooting Status.  type: Unsigned Integer.  length: 32.  range: 0 Can not engage, 1 Can engage,.")]
-        ADAShootingStatus = 101320,
-
-        /// <summary>
-        /// ADA Mode.  type: Unsigned Integer.  length: 32.  range: 0 Shut down, 1 Active.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ADA Mode.  type: Unsigned Integer.  length: 32.  range: 0 Shut down, 1 Active.")]
-        ADAMode = 101321,
-
-        /// <summary>
-        /// ADA Radar Status.  type: Unsigned Integer.  length: 32.  range: 0 Off, 1 On, 2 Momentary On.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ADA Radar Status.  type: Unsigned Integer.  length: 32.  range: 0 Off, 1 On, 2 Momentary On.")]
-        ADARadarStatus = 101330,
-
-        /// <summary>
-        /// Shoot Command.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, Greater than 0 Number of Shots to take.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Shoot Command.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, Greater than 0 Number of Shots to take.")]
-        ShootCommand = 101340,
-
-        /// <summary>
-        /// ADA Weapon Status.  type: Unsigned Integer.  length: 32.  range: 0 None, 1 Free, 2 Tight, 3 Hold.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ADA Weapon Status.  type: Unsigned Integer.  length: 32.  range: 0 None, 1 Free, 2 Tight, 3 Hold.")]
-        ADAWeaponStatus = 101350,
-
-        /// <summary>
-        /// ADA Firing Disciple.  type: Unsigned Integer.  length: 32.  range: 0 SLS_ABT, 1 Shoot 2_ABT, 2 Lash Mode, 3 SLS_TM, 4 Shoot2_TM, 5 Default.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ADA Firing Disciple.  type: Unsigned Integer.  length: 32.  range: 0 SLS_ABT, 1 Shoot 2_ABT, 2 Lash Mode, 3 SLS_TM, 4 Shoot2_TM, 5 Default.")]
-        ADAFiringDisciple = 101360,
-
-        /// <summary>
-        /// Order Status.  type: Unsigned Integer.  length: 32.  range: 0 Cancel Engagement, 1 Engage Assignment.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Order Status.  type: Unsigned Integer.  length: 32.  range: 0 Cancel Engagement, 1 Engage Assignment.")]
-        OrderStatus = 101370,
-
-        /// <summary>
-        /// Time Synchronization.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Synchronization.")]
-        TimeSynchronization = 101400,
-
-        /// <summary>
-        /// Tomahawk Data.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tomahawk Data.")]
-        TomahawkData = 101500,
-
-        /// <summary>
-        /// Number of Detonations.  type: Unsigned Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Number of Detonations.  type: Unsigned Integer.")]
-        NumberOfDetonations = 102100,
-
-        /// <summary>
-        /// Number of Intercepts.  type: Unsigned Integer.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Number of Intercepts.  type: Unsigned Integer.")]
-        NumberOfIntercepts = 102200,
-
-        /// <summary>
-        /// OBT Control MT-201.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OBT Control MT-201.  type: Variable Record.  length: 64.")]
-        OBTControlMT201 = 200201,
-
-        /// <summary>
-        /// Sensor Data MT-202.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sensor Data MT-202.  type: Variable Record.  length: 64.")]
-        SensorDataMT202 = 200202,
-
-        /// <summary>
-        /// Environmental Data MT-203.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environmental Data MT-203.  type: Variable Record.  length: 64.")]
-        EnvironmentalDataMT203 = 200203,
-
-        /// <summary>
-        /// Ownship Data MT-204.  type: Variable Record.  length: 128.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ownship Data MT-204.  type: Variable Record.  length: 128.")]
-        OwnshipDataMT204 = 200204,
-
-        /// <summary>
-        /// Acoustic Contact Data MT-205.  type: Variable Record.  length: 288.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acoustic Contact Data MT-205.  type: Variable Record.  length: 288.")]
-        AcousticContactDataMT205 = 200205,
-
-        /// <summary>
-        /// Sonobuoy Data MT-207.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sonobuoy Data MT-207.  type: Variable Record.  length: 64.")]
-        SonobuoyDataMT207 = 200207,
-
-        /// <summary>
-        /// Sonobuoy Contact Data MT-210.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sonobuoy Contact Data MT-210.  type: Variable Record.  length: 64.")]
-        SonobuoyContactDataMT210 = 200210,
-
-        /// <summary>
-        /// Helo Control MT-211.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Helo Control MT-211.  type: Variable Record.  length: 64.")]
-        HeloControlMT211 = 200211,
-
-        /// <summary>
-        /// ESM Control Data.  type: Variable Record.  length: 96.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ESM Control Data.  type: Variable Record.  length: 96.")]
-        ESMControlData = 200213,
-
-        /// <summary>
-        /// ESM Contact Data MT-214.  type: Variable Record.  length: 192.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ESM Contact Data MT-214.  type: Variable Record.  length: 192.")]
-        ESMContactDataMT214 = 200214,
-
-        /// <summary>
-        /// ESM Emitter Data MT-215.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ESM Emitter Data MT-215.  type: Variable Record.  length: 64.")]
-        ESMEmitterDataMT215 = 200215,
-
-        /// <summary>
-        /// Weapon Definition Data MT-217.  type: Variable Record.  length: 224.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon Definition Data MT-217.  type: Variable Record.  length: 224.")]
-        WeaponDefinitionDataMT217 = 200216,
-
-        /// <summary>
-        /// Weapon Preset Data MT-217.  type: Variable Record.  length: 256.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon Preset Data MT-217.  type: Variable Record.  length: 256.")]
-        WeaponPresetDataMT217 = 200217,
-
-        /// <summary>
-        /// OBT Control MT-301.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("OBT Control MT-301.  type: Variable Record.  length: 64.")]
-        OBTControlMT301 = 200301,
-
-        /// <summary>
-        /// Sensor Data MT-302.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sensor Data MT-302.  type: Variable Record.  length: 64.")]
-        SensorDataMT302 = 200302,
-
-        /// <summary>
-        /// Environmental Data MT-303m.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environmental Data MT-303m.  type: Variable Record.  length: 64.")]
-        EnvironmentalDataMT303m = 200303,
-
-        /// <summary>
-        /// Ownship Data MT-304.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ownship Data MT-304.  type: Variable Record.  length: 64.")]
-        OwnshipDataMT304 = 200304,
-
-        /// <summary>
-        /// Acoustic Contact Data MT-305.  type: Variable Record.  length: 288.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acoustic Contact Data MT-305.  type: Variable Record.  length: 288.")]
-        AcousticContactDataMT305 = 200305,
-
-        /// <summary>
-        /// Sonobuoy Data MT-307.  type: Variable Record.  length: 128.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sonobuoy Data MT-307.  type: Variable Record.  length: 128.")]
-        SonobuoyDataMT307 = 200307,
-
-        /// <summary>
-        /// Sonobuoy Contact Data MT-310.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sonobuoy Contact Data MT-310.  type: Variable Record.  length: 64.")]
-        SonobuoyContactDataMT310 = 200310,
-
-        /// <summary>
-        /// Helo Scenario / Equipment Status.  type: Variable Record.  length: 224.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Helo Scenario / Equipment Status.  type: Variable Record.  length: 224.")]
-        HeloScenarioEquipmentStatus = 200311,
-
-        /// <summary>
-        /// ESM Control Data MT-313.  type: Variable Record.  length: 96.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ESM Control Data MT-313.  type: Variable Record.  length: 96.")]
-        ESMControlDataMT313 = 200313,
-
-        /// <summary>
-        /// ESM Contact Data MT-314.  type: Variable Record.  length: 192.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ESM Contact Data MT-314.  type: Variable Record.  length: 192.")]
-        ESMContactDataMT314 = 200314,
-
-        /// <summary>
-        /// ESM Emitter Data MT-315.  type: Variable Record.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ESM Emitter Data MT-315.  type: Variable Record.  length: 64.")]
-        ESMEmitterDataMT315 = 200315,
-
-        /// <summary>
-        /// Weapon Definition Data MT-316.  type: Variable Record.  length: 256.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon Definition Data MT-316.  type: Variable Record.  length: 256.")]
-        WeaponDefinitionDataMT316 = 200316,
-
-        /// <summary>
-        /// Weapon Preset Data MT-317.  type: Variable Record.  length: 256.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon Preset Data MT-317.  type: Variable Record.  length: 256.")]
-        WeaponPresetDataMT317 = 200317,
-
-        /// <summary>
-        /// Pairing/Association (eMT-56).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pairing/Association (eMT-56).  type: Variable Record.")]
-        PairingAssociationEMT56 = 200400,
-
-        /// <summary>
-        /// Pointer (eMT-57).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pointer (eMT-57).  type: Variable Record.")]
-        PointerEMT57 = 200401,
-
-        /// <summary>
-        /// Reporting Responsibility (eMT-58).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Reporting Responsibility (eMT-58).  type: Variable Record.")]
-        ReportingResponsibilityEMT58 = 200402,
-
-        /// <summary>
-        /// Track Number (eMT-59).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Track Number (eMT-59).  type: Variable Record.")]
-        TrackNumberEMT59 = 200403,
-
-        /// <summary>
-        /// ID for Link-11 Reporting (eMT-60).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ID for Link-11 Reporting (eMT-60).  type: Variable Record.")]
-        IDForLink11ReportingEMT60 = 200404,
-
-        /// <summary>
-        /// Remote Track (eMT-62).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Remote Track (eMT-62).  type: Variable Record.")]
-        RemoteTrackEMT62 = 200405,
-
-        /// <summary>
-        /// Link-11 Error Rate (eMT-63).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link-11 Error Rate (eMT-63).  type: Variable Record.")]
-        Link11ErrorRateEMT63 = 200406,
-
-        /// <summary>
-        /// Track Quality (eMT-64).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Track Quality (eMT-64).  type: Variable Record.")]
-        TrackQualityEMT64 = 200407,
-
-        /// <summary>
-        /// Gridlock (eMT-65).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Gridlock (eMT-65).  type: Variable Record.")]
-        GridlockEMT65 = 200408,
-
-        /// <summary>
-        /// Kill (eMT-66).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kill (eMT-66).  type: Variable Record.")]
-        KillEMT66 = 200409,
-
-        /// <summary>
-        /// Track ID Change / Resolution (eMT-68).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Track ID Change / Resolution (eMT-68).  type: Variable Record.")]
-        TrackIDChangeResolutionEMT68 = 200410,
-
-        /// <summary>
-        /// Weapons Status (eMT-69).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapons Status (eMT-69).  type: Variable Record.")]
-        WeaponsStatusEMT69 = 200411,
-
-        /// <summary>
-        /// Link-11 Operator (eMT-70).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link-11 Operator (eMT-70).  type: Variable Record.")]
-        Link11OperatorEMT70 = 200412,
-
-        /// <summary>
-        /// Force Training Transmit (eMT-71).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Force Training Transmit (eMT-71).  type: Variable Record.")]
-        ForceTrainingTransmitEMT71 = 200413,
-
-        /// <summary>
-        /// Force Training Receive (eMT-72).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Force Training Receive (eMT-72).  type: Variable Record.")]
-        ForceTrainingReceiveEMT72 = 200414,
-
-        /// <summary>
-        /// Interceptor Amplification (eMT-75).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Interceptor Amplification (eMT-75).  type: Variable Record.")]
-        InterceptorAmplificationEMT75 = 200415,
-
-        /// <summary>
-        /// Consumables (eMT-78).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Consumables (eMT-78).  type: Variable Record.")]
-        ConsumablesEMT78 = 200416,
-
-        /// <summary>
-        /// Link-11 Local Track Quality (eMT-95).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link-11 Local Track Quality (eMT-95).  type: Variable Record.")]
-        Link11LocalTrackQualityEMT95 = 200417,
-
-        /// <summary>
-        /// DLRP (eMT-19).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DLRP (eMT-19).  type: Variable Record.")]
-        DLRPEMT19 = 200418,
-
-        /// <summary>
-        /// Force Order (eMT-52).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Force Order (eMT-52).  type: Variable Record.")]
-        ForceOrderEMT52 = 200419,
-
-        /// <summary>
-        /// Wilco / Cantco (eMT-53).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wilco / Cantco (eMT-53).  type: Variable Record.")]
-        WilcoCantcoEMT53 = 200420,
-
-        /// <summary>
-        /// EMC Bearing (eMT-54).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("EMC Bearing (eMT-54).  type: Variable Record.")]
-        EMCBearingEMT54 = 200421,
-
-        /// <summary>
-        /// Change Track Eligibility (eMT-55).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Change Track Eligibility (eMT-55).  type: Variable Record.")]
-        ChangeTrackEligibilityEMT55 = 200422,
-
-        /// <summary>
-        /// Land Mass Reference Point.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Land Mass Reference Point.  type: Variable Record.")]
-        LandMassReferencePoint = 200423,
-
-        /// <summary>
-        /// System Reference Point.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("System Reference Point.  type: Variable Record.")]
-        SystemReferencePoint = 200424,
-
-        /// <summary>
-        /// PU Amplification.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PU Amplification.  type: Variable Record.")]
-        PUAmplification = 200425,
-
-        /// <summary>
-        /// Set/Drift.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Set/Drift.  type: Variable Record.")]
-        SetDrift = 200426,
-
-        /// <summary>
-        /// Begin Initialization (MT-1).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Begin Initialization (MT-1).  type: Variable Record.")]
-        BeginInitializationMT1 = 200427,
-
-        /// <summary>
-        /// Status and Control (MT-3).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Status and Control (MT-3).  type: Variable Record.")]
-        StatusAndControlMT3 = 200428,
-
-        /// <summary>
-        /// Scintillation Change (MT-39).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scintillation Change (MT-39).  type: Variable Record.")]
-        ScintillationChangeMT39 = 200429,
-
-        /// <summary>
-        /// Link 11 ID Control (MT-61).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link 11 ID Control (MT-61).  type: Variable Record.")]
-        Link11IDControlMT61 = 200430,
-
-        /// <summary>
-        /// PU Guard List.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PU Guard List.  type: Variable Record.")]
-        PUGuardList = 200431,
-
-        /// <summary>
-        /// Winds Aloft (MT-14).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Winds Aloft (MT-14).  type: Variable Record.")]
-        WindsAloftMT14 = 200432,
-
-        /// <summary>
-        /// Surface Winds (MT-15).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Surface Winds (MT-15).  type: Variable Record.")]
-        SurfaceWindsMT15 = 200433,
-
-        /// <summary>
-        /// Sea State (MT-17).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sea State (MT-17).  type: Variable Record.")]
-        SeaStateMT17 = 200434,
-
-        /// <summary>
-        /// Magnetic Variation (MT-37).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Magnetic Variation (MT-37).  type: Variable Record.")]
-        MagneticVariationMT37 = 200435,
-
-        /// <summary>
-        /// Track Eligibility (MT-29).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Track Eligibility (MT-29).  type: Variable Record.")]
-        TrackEligibilityMT29 = 200436,
-
-        /// <summary>
-        /// Training Track Notification.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Training Track Notification.  type: Variable Record.")]
-        TrainingTrackNotification = 200437,
-
-        /// <summary>
-        /// Tacan Data (MT-32).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tacan Data (MT-32).  type: Variable Record.")]
-        TacanDataMT32 = 200501,
-
-        /// <summary>
-        /// Interceptor Amplification (MT-75).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Interceptor Amplification (MT-75).  type: Variable Record.")]
-        InterceptorAmplificationMT75 = 200502,
-
-        /// <summary>
-        /// Tacan Assignment (MT-76).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Tacan Assignment (MT-76).  type: Variable Record.")]
-        TacanAssignmentMT76 = 200503,
-
-        /// <summary>
-        /// Autopilot Status (MT-77).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Autopilot Status (MT-77).  type: Variable Record.")]
-        AutopilotStatusMT77 = 200504,
-
-        /// <summary>
-        /// Consumables (MT-78).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Consumables (MT-78).  type: Variable Record.")]
-        ConsumablesMT78 = 200505,
-
-        /// <summary>
-        /// Downlink (MT-79).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Downlink (MT-79).  type: Variable Record.")]
-        DownlinkMT79 = 200506,
-
-        /// <summary>
-        /// TIN Report (MT-80).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TIN Report (MT-80).  type: Variable Record.")]
-        TINReportMT80 = 200507,
-
-        /// <summary>
-        /// Special Point Control (MT-81).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Special Point Control (MT-81).  type: Variable Record.")]
-        SpecialPointControlMT81 = 200508,
-
-        /// <summary>
-        /// Control Discretes (MT-82).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Control Discretes (MT-82).  type: Variable Record.")]
-        ControlDiscretesMT82 = 200509,
-
-        /// <summary>
-        /// Request Target Discretes(MT-83).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Request Target Discretes(MT-83).  type: Variable Record.")]
-        RequestTargetDiscretesMT83 = 200510,
-
-        /// <summary>
-        /// Target Discretes (MT-84).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Target Discretes (MT-84).  type: Variable Record.")]
-        TargetDiscretesMT84 = 200511,
-
-        /// <summary>
-        /// Reply Discretes (MT-85).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Reply Discretes (MT-85).  type: Variable Record.")]
-        ReplyDiscretesMT85 = 200512,
-
-        /// <summary>
-        /// Command Maneuvers (MT-86).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command Maneuvers (MT-86).  type: Variable Record.")]
-        CommandManeuversMT86 = 200513,
-
-        /// <summary>
-        /// Target Data (MT-87).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Target Data (MT-87).  type: Variable Record.")]
-        TargetDataMT87 = 200514,
-
-        /// <summary>
-        /// Target Pointer (MT-88).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Target Pointer (MT-88).  type: Variable Record.")]
-        TargetPointerMT88 = 200515,
-
-        /// <summary>
-        /// Intercept Data (MT-89).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intercept Data (MT-89).  type: Variable Record.")]
-        InterceptDataMT89 = 200516,
-
-        /// <summary>
-        /// Decrement Missile Inventory (MT-90).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Decrement Missile Inventory (MT-90).  type: Variable Record.")]
-        DecrementMissileInventoryMT90 = 200517,
-
-        /// <summary>
-        /// Link-4A Alert (MT-91).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Link-4A Alert (MT-91).  type: Variable Record.")]
-        Link4AAlertMT91 = 200518,
-
-        /// <summary>
-        /// Strike Control (MT-92).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strike Control (MT-92).  type: Variable Record.")]
-        StrikeControlMT92 = 200519,
-
-        /// <summary>
-        /// Speed Change (MT-25).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Speed Change (MT-25).  type: Variable Record.")]
-        SpeedChangeMT25 = 200521,
-
-        /// <summary>
-        /// Course Change (MT-26).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Course Change (MT-26).  type: Variable Record.")]
-        CourseChangeMT26 = 200522,
-
-        /// <summary>
-        /// Altitude Change (MT-27).  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude Change (MT-27).  type: Variable Record.")]
-        AltitudeChangeMT27 = 200523,
-
-        /// <summary>
-        /// ACLS AN/SPN-46 Status.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ACLS AN/SPN-46 Status.  type: Variable Record.")]
-        ACLSANSPN46Status = 200524,
-
-        /// <summary>
-        /// ACLS Aircraft Report.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("ACLS Aircraft Report.  type: Variable Record.")]
-        ACLSAircraftReport = 200525,
-
-        /// <summary>
-        /// SPS-67 Radar Operator Functions.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS-67 Radar Operator Functions.  type: Variable Record.")]
-        SPS67RadarOperatorFunctions = 200600,
-
-        /// <summary>
-        /// SPS-55 Radar Operator Functions.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS-55 Radar Operator Functions.  type: Variable Record.")]
-        SPS55RadarOperatorFunctions = 200601,
-
-        /// <summary>
-        /// SPQ-9A Radar Operator Functions.  length: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPQ-9A Radar Operator Functions.  length: Variable Record.")]
-        SPQ9ARadarOperatorFunctions = 200602,
-
-        /// <summary>
-        /// SPS-49 Radar Operator Functions.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS-49 Radar Operator Functions.  type: Variable Record.")]
-        SPS49RadarOperatorFunctions = 200603,
-
-        /// <summary>
-        /// MK-23 Radar Operator Functions.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK-23 Radar Operator Functions.  type: Variable Record.")]
-        MK23RadarOperatorFunctions = 200604,
-
-        /// <summary>
-        /// SPS-48 Radar Operator Functions.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS-48 Radar Operator Functions.  type: Variable Record.")]
-        SPS48RadarOperatorFunctions = 200605,
-
-        /// <summary>
-        /// SPS-40 Radar Operator Functions.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("SPS-40 Radar Operator Functions.  type: Variable Record.")]
-        SPS40RadarOperatorFunctions = 200606,
-
-        /// <summary>
-        /// MK-95 Radar Operator Functions.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("MK-95 Radar Operator Functions.  type: Variable Record.")]
-        MK95RadarOperatorFunctions = 200607,
-
-        /// <summary>
-        /// Kill/No Kill.  type: Unsigned Integer.  length: 32.  range: 0 No kill, 1 Kill.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kill/No Kill.  type: Unsigned Integer.  length: 32.  range: 0 No kill, 1 Kill.")]
-        KillNoKill = 200608,
-
-        /// <summary>
-        /// CMT pc.  type: Unsigned Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CMT pc.  type: Unsigned Integer.  length: 32.")]
-        CMTPc = 200609,
-
-        /// <summary>
-        /// CMC4AirGlobalData.  type: Variable Recoed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CMC4AirGlobalData.  type: Variable Recoed.")]
-        CMC4AirGlobalData = 200610,
-
-        /// <summary>
-        /// CMC4GlobalData.  type: Variable Record.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CMC4GlobalData.  type: Variable Record.")]
-        CMC4GlobalData = 200611,
-
-        /// <summary>
-        /// LINKSIM_COMMENT_PDU.  type: Integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("LINKSIM_COMMENT_PDU.  type: Integer.  length: 32.")]
-        LINKSIMCOMMENTPDU = 200612,
-
-        /// <summary>
-        /// NSST Ownship Control.  type: Integer.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("NSST Ownship Control.  type: Integer.  length: 64.")]
-        NSSTOwnshipControl = 200613,
-
-        /// <summary>
-        /// Other.  type: Integer.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.  type: Integer.  length: 00.")]
-        Other = 240000,
-
-        /// <summary>
-        /// Mass Of The Vehicle.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mass Of The Vehicle.  type: real.  length: 32.")]
-        MassOfTheVehicle = 240001,
-
-        /// <summary>
-        /// Force ID.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Force ID.  type: Integer.  length: 8.")]
-        ForceID_240002 = 240002,
-
-        /// <summary>
-        /// Entity Type Kind.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type Kind.  type: Integer.  length: 8.")]
-        EntityTypeKind = 240003,
-
-        /// <summary>
-        /// Entity Type Domain.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type Domain.  type: Integer.  length: 8.")]
-        EntityTypeDomain = 240004,
-
-        /// <summary>
-        /// Entity Type Country.  type: Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type Country.  type: Integer.  length: 16.")]
-        EntityTypeCountry = 240005,
-
-        /// <summary>
-        /// Entity Type Category.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type Category.  type: Integer.  length: 8.")]
-        EntityTypeCategory = 240006,
-
-        /// <summary>
-        /// Entity Type Sub Category.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type Sub Category.  type: Integer.  length: 8.")]
-        EntityTypeSubCategory = 240007,
-
-        /// <summary>
-        /// Entity Type Specific.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type Specific.  type: Integer.  length: 8.")]
-        EntityTypeSpecific = 240008,
-
-        /// <summary>
-        /// Entity Type Extra.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type Extra.  type: Integer.  length: 8.")]
-        EntityTypeExtra = 240009,
-
-        /// <summary>
-        /// Alternative Entity Type Kind.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type Kind.  type: Integer.  length: 8.")]
-        AlternativeEntityTypeKind = 240010,
-
-        /// <summary>
-        /// Alternative Entity Type Domain.  type: Integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type Domain.  type: Integer.  length: 8.")]
-        AlternativeEntityTypeDomain = 240011,
-
-        /// <summary>
-        /// Alternative Entity Type Country.  type: Integer.  length: 16.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type Country.  type: Integer.  length: 16.")]
-        AlternativeEntityTypeCountry = 240012,
-
-        /// <summary>
-        /// Alternative Entity Type Category.  type: integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type Category.  type: integer.  length: 8.")]
-        AlternativeEntityTypeCategory = 240013,
-
-        /// <summary>
-        /// Alternative Entity Type Sub Category.  type: integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type Sub Category.  type: integer.  length: 8.")]
-        AlternativeEntityTypeSubCategory = 240014,
-
-        /// <summary>
-        /// Alternative Entity Type Specific.  type: integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type Specific.  type: integer.  length: 8.")]
-        AlternativeEntityTypeSpecific = 240015,
-
-        /// <summary>
-        /// Alternative Entity Type Extra.  type: integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type Extra.  type: integer.  length: 8.")]
-        AlternativeEntityTypeExtra = 240016,
-
-        /// <summary>
-        /// Entity Location X.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Location X.  type: real.  length: 64.")]
-        EntityLocationX = 240017,
-
-        /// <summary>
-        /// Entity Location Y.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Location Y.  type: real.  length: 64.")]
-        EntityLocationY = 240018,
-
-        /// <summary>
-        /// Entity Location Z.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Location Z.  type: real.  length: 64.")]
-        EntityLocationZ = 240019,
-
-        /// <summary>
-        /// Entity Linear Velocity X.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Linear Velocity X.  type: real.  length: 32.")]
-        EntityLinearVelocityX = 240020,
-
-        /// <summary>
-        /// Entity Linear Velocity Y.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Linear Velocity Y.  type: real.  length: 32.")]
-        EntityLinearVelocityY = 240021,
-
-        /// <summary>
-        /// Entity Linear Velocity Z.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Linear Velocity Z.  type: real.  length: 32.")]
-        EntityLinearVelocityZ = 240022,
-
-        /// <summary>
-        /// Entity Orientation Psi.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Orientation Psi.  type: real.  length: 32.")]
-        EntityOrientationPsi = 240023,
-
-        /// <summary>
-        /// Entity Orientation Theta.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Orientation Theta.  type: real.  length: 32.")]
-        EntityOrientationTheta = 240024,
-
-        /// <summary>
-        /// Entity Orientation Phi.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Orientation Phi.  type: real.  length: 32.")]
-        EntityOrientationPhi = 240025,
-
-        /// <summary>
-        /// Dead Reckoning Algorithm.  type: integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Algorithm.  type: integer.  length: 8.")]
-        DeadReckoningAlgorithm = 240026,
-
-        /// <summary>
-        /// Dead Reckoning Linear Acceleration X.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Linear Acceleration X.  type: real.  length: 32.")]
-        DeadReckoningLinearAccelerationX = 240027,
-
-        /// <summary>
-        /// Dead Reckoning Linear Acceleration Y.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Linear Acceleration Y.  type: real.  length: 32.")]
-        DeadReckoningLinearAccelerationY = 240028,
-
-        /// <summary>
-        /// Dead Reckoning Linear Acceleration Z.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Linear Acceleration Z.  type: real.  length: 32.")]
-        DeadReckoningLinearAccelerationZ = 240029,
-
-        /// <summary>
-        /// Dead Reckoning Angular Velocity X.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Angular Velocity X.  type: real.  length: 32.")]
-        DeadReckoningAngularVelocityX = 240030,
-
-        /// <summary>
-        /// Dead Reckoning Angular Velocity Y.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Angular Velocity Y.  type: real.  length: 32.")]
-        DeadReckoningAngularVelocityY = 240031,
-
-        /// <summary>
-        /// Dead Reckoning Angular Velocity Z.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning Angular Velocity Z.  type: real.  length: 32.")]
-        DeadReckoningAngularVelocityZ = 240032,
-
-        /// <summary>
-        /// Entity Appearance.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Appearance.  type: integer.  length: 32.")]
-        EntityAppearance = 240033,
-
-        /// <summary>
-        /// Entity Marking Character Set.  type: integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Marking Character Set.  type: integer.  length: 8.")]
-        EntityMarkingCharacterSet = 240034,
-
-        /// <summary>
-        /// Entity Marking 11 Bytes.  type: character.  length: 88.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Marking 11 Bytes.  type: character.  length: 88.")]
-        EntityMarking11Bytes = 240035,
-
-        /// <summary>
-        /// Capability.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Capability.  type: integer.  length: 32.")]
-        Capability = 240036,
-
-        /// <summary>
-        /// Number Articulation Parameters.  type: integer.  length: 8.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Number Articulation Parameters.  type: integer.  length: 8.")]
-        NumberArticulationParameters = 240037,
-
-        /// <summary>
-        /// Articulation Parameter ID.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulation Parameter ID.  type: integer.  length: 32.")]
-        ArticulationParameterID = 240038,
-
-        /// <summary>
-        /// Articulation Parameter Type.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulation Parameter Type.  type: integer.  length: 32.")]
-        ArticulationParameterType_240039 = 240039,
-
-        /// <summary>
-        /// Articulation Parameter Value.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Articulation Parameter Value.  type: real.  length: 64.")]
-        ArticulationParameterValue_240040 = 240040,
-
-        /// <summary>
-        /// Type Of Stores.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type Of Stores.  type: integer.  length: 32.")]
-        TypeOfStores = 240041,
-
-        /// <summary>
-        /// Quantity Of Stores.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Quantity Of Stores.  type: integer.  length: 32.")]
-        QuantityOfStores = 240042,
-
-        /// <summary>
-        /// Fuel Quantity.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuel Quantity.  type: real.  length: 32.")]
-        FuelQuantity = 240043,
-
-        /// <summary>
-        /// Radar System Status.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radar System Status.  type: integer.  length: 32.")]
-        RadarSystemStatus = 240044,
-
-        /// <summary>
-        /// Radio Communication System Status.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radio Communication System Status.  type: integer.  length: 32.")]
-        RadioCommunicationSystemStatus = 240045,
-
-        /// <summary>
-        /// Default Time For Radio Transmission For Stationary Transmitters.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Default Time For Radio Transmission For Stationary Transmitters.  type: integer.  length: 32.")]
-        DefaultTimeForRadioTransmissionForStationaryTransmitters = 240046,
-
-        /// <summary>
-        /// Default Time For Radio Transmission For Moving Transmitters.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Default Time For Radio Transmission For Moving Transmitters.  type: integer.  length: 32.")]
-        DefaultTimeForRadioTransmissionForMovingTransmitters = 240047,
-
-        /// <summary>
-        /// Body Part Damaged Ratio.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Body Part Damaged Ratio.  type: real.  length: 32.")]
-        BodyPartDamagedRatio = 240048,
-
-        /// <summary>
-        /// Name Of The Terrain Database File.  type: character.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Name Of The Terrain Database File.  type: character.  length: 00.")]
-        NameOfTheTerrainDatabaseFile = 240049,
-
-        /// <summary>
-        /// Name Of Local File.  type: character.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Name Of Local File.  type: character.  length: 00.")]
-        NameOfLocalFile = 240050,
-
-        /// <summary>
-        /// Aimpoint Bearing.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aimpoint Bearing.  type: real.  length: 32.")]
-        AimpointBearing = 240051,
-
-        /// <summary>
-        /// Aimpoint Elevation.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aimpoint Elevation.  type: real.  length: 32.")]
-        AimpointElevation = 240052,
-
-        /// <summary>
-        /// Aimpoint Range.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aimpoint Range.  type: real.  length: 32.")]
-        AimpointRange = 240053,
-
-        /// <summary>
-        /// Air Speed.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Speed.  type: real.  length: 32.")]
-        AirSpeed = 240054,
-
-        /// <summary>
-        /// Altitude.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude.  type: real.  length: 32.")]
-        Altitude_240055 = 240055,
-
-        /// <summary>
-        /// Application Status.  type: structure.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Application Status.  type: structure.  length: 32.")]
-        ApplicationStatus = 240056,
-
-        /// <summary>
-        /// Auto Iff.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Auto Iff.  type: integer.  length: 32.")]
-        AutoIff = 240057,
-
-        /// <summary>
-        /// Beacon Delay.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Beacon Delay.  type: real.  length: 32.")]
-        BeaconDelay = 240058,
-
-        /// <summary>
-        /// Bingo Fuel Setting.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Bingo Fuel Setting.  type: real.  length: 32.")]
-        BingoFuelSetting = 240059,
-
-        /// <summary>
-        /// Cloud Bottom.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cloud Bottom.  type: real.  length: 32.")]
-        CloudBottom = 240060,
-
-        /// <summary>
-        /// Cloud Top.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cloud Top.  type: real.  length: 32.")]
-        CloudTop = 240061,
-
-        /// <summary>
-        /// Direction.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Direction.  type: real.  length: 32.")]
-        Direction = 240062,
-
-        /// <summary>
-        /// End Action.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("End Action.  type: integer.  length: 32.")]
-        EndAction = 240063,
-
-        /// <summary>
-        /// Frequency.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Frequency.  type: real.  length: 32.")]
-        Frequency = 240064,
-
-        /// <summary>
-        /// Freeze.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Freeze.  type: integer.  length: 32.")]
-        Freeze = 240065,
-
-        /// <summary>
-        /// Heading.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Heading.  type: real.  length: 32.")]
-        Heading = 240066,
-
-        /// <summary>
-        /// Identification.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Identification.  type: integer.  length: 32.")]
-        Identification_240067 = 240067,
-
-        /// <summary>
-        /// Initial Point Data.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Initial Point Data.  type: integer.  length: 32.")]
-        InitialPointData = 240068,
-
-        /// <summary>
-        /// Latitude.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Latitude.  type: real.  length: 64.")]
-        Latitude_240069 = 240069,
-
-        /// <summary>
-        /// Lights.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Lights.  type: integer.  length: 32.")]
-        Lights_240070 = 240070,
-
-        /// <summary>
-        /// Linear.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Linear.  type: integer.  length: 32.")]
-        Linear = 240071,
-
-        /// <summary>
-        /// Longitude.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Longitude.  type: real.  length: 64.")]
-        Longitude_240072 = 240072,
-
-        /// <summary>
-        /// Low Altitude.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Low Altitude.  type: real.  length: 32.")]
-        LowAltitude = 240073,
-
-        /// <summary>
-        /// Mfd Formats.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mfd Formats.  type: integer.  length: 32.")]
-        MfdFormats = 240074,
-
-        /// <summary>
-        /// Nctr.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nctr.  type: integer.  length: 32.")]
-        Nctr = 240075,
-
-        /// <summary>
-        /// Number Projectiles.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Number Projectiles.  type: integer.  length: 32.")]
-        NumberProjectiles = 240076,
-
-        /// <summary>
-        /// Operation Code.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Operation Code.  type: integer.  length: 32.")]
-        OperationCode = 240077,
-
-        /// <summary>
-        /// Pitch.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pitch.  type: real.  length: 32.")]
-        Pitch = 240078,
-
-        /// <summary>
-        /// Profiles.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Profiles.  type: integer.  length: 32.")]
-        Profiles = 240079,
-
-        /// <summary>
-        /// Quantity.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Quantity.  type: integer.  length: 32.")]
-        Quantity_240080 = 240080,
-
-        /// <summary>
-        /// Radar Modes.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radar Modes.  type: integer.  length: 32.")]
-        RadarModes = 240081,
-
-        /// <summary>
-        /// Radar Search Volume.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Radar Search Volume.  type: real.  length: 32.")]
-        RadarSearchVolume = 240082,
-
-        /// <summary>
-        /// Roll.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Roll.  type: real.  length: 32.")]
-        Roll = 240083,
-
-        /// <summary>
-        /// Rotation.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rotation.  type: real.  length: 32.")]
-        Rotation_240084 = 240084,
-
-        /// <summary>
-        /// Scale Factor X.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scale Factor X.  type: real.  length: 32.")]
-        ScaleFactorX = 240085,
-
-        /// <summary>
-        /// Scale Factor Y.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Scale Factor Y.  type: real.  length: 32.")]
-        ScaleFactorY = 240086,
-
-        /// <summary>
-        /// Shields.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Shields.  type: integer.  length: 32.")]
-        Shields = 240087,
-
-        /// <summary>
-        /// Steerpoint.  type: structure.  length: 192.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Steerpoint.  type: structure.  length: 192.")]
-        Steerpoint = 240088,
-
-        /// <summary>
-        /// Spare1.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spare1.  type: real.  length: 64.")]
-        Spare1 = 240089,
-
-        /// <summary>
-        /// Spare2.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Spare2.  type: real.  length: 64.")]
-        Spare2 = 240090,
-
-        /// <summary>
-        /// Team.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Team.  type: integer.  length: 32.")]
-        Team = 240091,
-
-        /// <summary>
-        /// Text.  type: character.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Text.  type: character.  length: 00.")]
-        Text = 240092,
-
-        /// <summary>
-        /// Time Of Day.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Time Of Day.  type: integer.  length: 32.")]
-        TimeOfDay = 240093,
-
-        /// <summary>
-        /// Trail Flag.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trail Flag.  type: integer.  length: 32.")]
-        TrailFlag = 240094,
-
-        /// <summary>
-        /// Trail Size.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Trail Size.  type: real.  length: 32.")]
-        TrailSize = 240095,
-
-        /// <summary>
-        /// Type Of Projectile.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type Of Projectile.  type: integer.  length: 32.")]
-        TypeOfProjectile = 240096,
-
-        /// <summary>
-        /// Type Of Target.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type Of Target.  type: integer.  length: 32.")]
-        TypeOfTarget = 240097,
-
-        /// <summary>
-        /// Type Of Threat.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Type Of Threat.  type: integer.  length: 32.")]
-        TypeOfThreat = 240098,
-
-        /// <summary>
-        /// Uhf Frequency.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Uhf Frequency.  type: real.  length: 32.")]
-        UhfFrequency = 240099,
-
-        /// <summary>
-        /// Utm Altitude.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Utm Altitude.  type: real.  length: 32.")]
-        UtmAltitude = 240100,
-
-        /// <summary>
-        /// Utm Latitude.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Utm Latitude.  type: real.  length: 64.")]
-        UtmLatitude = 240101,
-
-        /// <summary>
-        /// Utm Longitude.  type: real.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Utm Longitude.  type: real.  length: 64.")]
-        UtmLongitude = 240102,
-
-        /// <summary>
-        /// Vhf Frequency.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vhf Frequency.  type: real.  length: 32.")]
-        VhfFrequency = 240103,
-
-        /// <summary>
-        /// Visibility Range.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Visibility Range.  type: real.  length: 32.")]
-        VisibilityRange = 240104,
-
-        /// <summary>
-        /// Void Aaa Hit.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Void Aaa Hit.  type: integer.  length: 32.")]
-        VoidAaaHit = 240105,
-
-        /// <summary>
-        /// Void Collision.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Void Collision.  type: integer.  length: 32.")]
-        VoidCollision = 240106,
-
-        /// <summary>
-        /// Void Earth Hit.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Void Earth Hit.  type: integer.  length: 32.")]
-        VoidEarthHit = 240107,
-
-        /// <summary>
-        /// Void Friendly.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Void Friendly.  type: integer.  length: 32.")]
-        VoidFriendly = 240108,
-
-        /// <summary>
-        /// Void Gun Hit.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Void Gun Hit.  type: integer.  length: 32.")]
-        VoidGunHit = 240109,
-
-        /// <summary>
-        /// Void Rocket Hit.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Void Rocket Hit.  type: integer.  length: 32.")]
-        VoidRocketHit = 240110,
-
-        /// <summary>
-        /// Void Sam Hit.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Void Sam Hit.  type: integer.  length: 32.")]
-        VoidSamHit = 240111,
-
-        /// <summary>
-        /// Weapon Data.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon Data.  type: integer.  length: 32.")]
-        WeaponData = 240112,
-
-        /// <summary>
-        /// Weapon Type.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weapon Type.  type: integer.  length: 32.")]
-        WeaponType = 240113,
-
-        /// <summary>
-        /// Weather.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Weather.  type: integer.  length: 32.")]
-        Weather_240114 = 240114,
-
-        /// <summary>
-        /// Wind Direction.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wind Direction.  type: real.  length: 32.")]
-        WindDirection_240115 = 240115,
-
-        /// <summary>
-        /// Wind Speed.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wind Speed.  type: real.  length: 32.")]
-        WindSpeed = 240116,
-
-        /// <summary>
-        /// Wing Station.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Wing Station.  type: integer.  length: 32.")]
-        WingStation = 240117,
-
-        /// <summary>
-        /// Yaw.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Yaw.  type: real.  length: 32.")]
-        Yaw = 240118,
-
-        /// <summary>
-        /// Memory Offset.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Memory Offset.  type: integer.  length: 32.")]
-        MemoryOffset = 240119,
-
-        /// <summary>
-        /// Memory Data.  type: integer.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Memory Data.  type: integer.  length: 00.")]
-        MemoryData = 240120,
-
-        /// <summary>
-        /// VASI.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("VASI.  type: integer.  length: 32.")]
-        VASI = 240121,
-
-        /// <summary>
-        /// Beacon.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Beacon.  type: integer.  length: 32.")]
-        Beacon = 240122,
-
-        /// <summary>
-        /// Strobe.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strobe.  type: integer.  length: 32.")]
-        Strobe = 240123,
-
-        /// <summary>
-        /// Culture.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Culture.  type: integer.  length: 32.")]
-        Culture = 240124,
-
-        /// <summary>
-        /// Approach.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Approach.  type: integer.  length: 32.")]
-        Approach = 240125,
-
-        /// <summary>
-        /// Runway End.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Runway End.  type: integer.  length: 32.")]
-        RunwayEnd = 240126,
-
-        /// <summary>
-        /// Obstruction.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Obstruction.  type: integer.  length: 32.")]
-        Obstruction = 240127,
-
-        /// <summary>
-        /// Runway Edge.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Runway Edge.  type: integer.  length: 32.")]
-        RunwayEdge = 240128,
-
-        /// <summary>
-        /// Ramp Taxiway.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ramp Taxiway.  type: integer.  length: 32.")]
-        RampTaxiway = 240129,
-
-        /// <summary>
-        /// Laser Bomb Code.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Laser Bomb Code.  type: integer.  length: 32.")]
-        LaserBombCode = 240130,
-
-        /// <summary>
-        /// Rack Type.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Rack Type.  type: integer.  length: 32.")]
-        RackType = 240131,
-
-        /// <summary>
-        /// HUD.  type: structure.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HUD.  type: structure.  length: 00.")]
-        HUD = 240132,
-
-        /// <summary>
-        /// RoleFileName.  type: character.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("RoleFileName.  type: character.  length: 00.")]
-        RoleFileName = 240133,
-
-        /// <summary>
-        /// PilotName.  type: character.  length: 00.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PilotName.  type: character.  length: 00.")]
-        PilotName = 240134,
-
-        /// <summary>
-        /// PilotDesignation.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("PilotDesignation.  type: integer.  length: 32.")]
-        PilotDesignation = 240135,
-
-        /// <summary>
-        /// Model Type.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Model Type.  type: integer.  length: 32.")]
-        ModelType = 240136,
-
-        /// <summary>
-        /// DIS Type.  type: integer.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("DIS Type.  type: integer.  length: 64.")]
-        DISType = 240137,
-
-        /// <summary>
-        /// Class.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Class.  type: integer.  length: 32.")]
-        Class = 240138,
-
-        /// <summary>
-        /// Channel.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Channel.  type: integer.  length: 32.")]
-        Channel = 240139,
-
-        /// <summary>
-        /// Entity Type.  type: structure.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Type.  type: structure.  length: 64.")]
-        EntityType_240140 = 240140,
-
-        /// <summary>
-        /// Alternative Entity Type.  type: structure.  length: 64.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Alternative Entity Type.  type: structure.  length: 64.")]
-        AlternativeEntityType_240141 = 240141,
-
-        /// <summary>
-        /// Entity Location.  type: structure.  length: 192.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Location.  type: structure.  length: 192.")]
-        EntityLocation = 240142,
-
-        /// <summary>
-        /// Entity Linear Velocity.  type: structure.  length: 96.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Linear Velocity.  type: structure.  length: 96.")]
-        EntityLinearVelocity = 240143,
-
-        /// <summary>
-        /// Entity Orientation.  type: structure.  length: 96.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Orientation.  type: structure.  length: 96.")]
-        EntityOrientation = 240144,
-
-        /// <summary>
-        /// Dead Reckoning.  type: structure.  length: 320.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dead Reckoning.  type: structure.  length: 320.")]
-        DeadReckoning = 240145,
-
-        /// <summary>
-        /// Failure Symptom.  type: integer.  length: 32.  range: 1=LimitSpeed, 2 =LimitGLoad, 3=Both.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Failure Symptom.  type: integer.  length: 32.  range: 1=LimitSpeed, 2 =LimitGLoad, 3=Both.")]
-        FailureSymptom = 240146,
-
-        /// <summary>
-        /// Max Fuel.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Max Fuel.  type: real.  length: 32.")]
-        MaxFuel = 240147,
-
-        /// <summary>
-        /// Refueling Boom Connect.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Refueling Boom Connect.  type: integer.  length: 32.")]
-        RefuelingBoomConnect = 240148,
-
-        /// <summary>
-        /// Altitude AGL.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude AGL.  type: real.  length: 32.")]
-        AltitudeAGL = 240149,
-
-        /// <summary>
-        /// Calibrated Airspeed.  type: real.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Calibrated Airspeed.  type: real.  length: 32.")]
-        CalibratedAirspeed = 240150,
-
-        /// <summary>
-        /// TACAN Channel.  type: integer.  length: 32.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACAN Channel.  type: integer.  length: 32.")]
-        TACANChannel = 240151,
-
-        /// <summary>
-        /// TACAN Band.  type: integer.  length: 32.  range: 0 = x, 1 = y.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACAN Band.  type: integer.  length: 32.  range: 0 = x, 1 = y.")]
-        TACANBand = 240152,
-
-        /// <summary>
-        /// TACAN Mode.  type: integer.  length: 32.  range: 0 = off, 1 = rec, 2 = t/r, 3 = aa rec, 4 = aa t/r.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("TACAN Mode.  type: integer.  length: 32.  range: 0 = off, 1 = rec, 2 = t/r, 3 = aa rec, 4 = aa t/r.")]
-        TACANMode = 240153
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for DatumSpecificationRecord (simman.datumid, Datum Specification record, 
+    /// section 7.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DatumSpecificationRecord : uint
+    {
+        /// <summary>
+        /// Identification.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identification.")]
+        Identification = 10000,
+
+        /// <summary>
+        /// Entity Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type.")]
+        EntityType = 11000,
+
+        /// <summary>
+        /// Concatenated.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Concatenated.")]
+        Concatenated = 11100,
+
+        /// <summary>
+        /// Kind.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kind.  type: Unsigned Integer.  length: 8.")]
+        Kind = 11110,
+
+        /// <summary>
+        /// Domain.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Domain.  type: Unsigned Integer.  length: 8.")]
+        Domain = 11120,
+
+        /// <summary>
+        /// Country.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Country.  type: Unsigned Integer.  length: 16.")]
+        Country = 11130,
+
+        /// <summary>
+        /// Category.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Category.  type: Unsigned Integer.  length: 8.")]
+        Category = 11140,
+
+        /// <summary>
+        /// Subcategory.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Subcategory.  type: Unsigned Integer.  length: 8.")]
+        Subcategory = 11150,
+
+        /// <summary>
+        /// Specific.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Specific.  type: Unsigned Integer.  length: 8.")]
+        Specific = 11160,
+
+        /// <summary>
+        /// Extra.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Extra.  type: Unsigned Integer.  length: 8.")]
+        Extra = 11170,
+
+        /// <summary>
+        /// Force ID.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Force ID.  type: Unsigned Integer.  length: 8.")]
+        ForceID = 11200,
+
+        /// <summary>
+        /// Description.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Description.")]
+        Description = 11300,
+
+        /// <summary>
+        /// Alternative Entity Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type.")]
+        AlternativeEntityType = 12000,
+
+        /// <summary>
+        /// Kind.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kind.  type: Unsigned Integer.  length: 8.")]
+        Kind_12110 = 12110,
+
+        /// <summary>
+        /// Domain.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Domain.  type: Unsigned Integer.  length: 8.")]
+        Domain_12120 = 12120,
+
+        /// <summary>
+        /// Country.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Country.  type: Unsigned Integer.  length: 16.")]
+        Country_12130 = 12130,
+
+        /// <summary>
+        /// Category.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Category.  type: Unsigned Integer.  length: 8.")]
+        Category_12140 = 12140,
+
+        /// <summary>
+        /// Subcategory.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Subcategory.  type: Unsigned Integer.  length: 8.")]
+        Subcategory_12150 = 12150,
+
+        /// <summary>
+        /// Specific.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Specific.  type: Unsigned Integer.  length: 8.")]
+        Specific_12160 = 12160,
+
+        /// <summary>
+        /// Extra.  type: Unsigned Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Extra.  type: Unsigned Integer.  length: 8.")]
+        Extra_12170 = 12170,
+
+        /// <summary>
+        /// Description.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Description.")]
+        Description_12300 = 12300,
+
+        /// <summary>
+        /// Entity Marking.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Marking.")]
+        EntityMarking = 13000,
+
+        /// <summary>
+        /// Entity Marking Characters.  type: String.  length: 80.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Marking Characters.  type: String.  length: 80.")]
+        EntityMarkingCharacters = 13100,
+
+        /// <summary>
+        /// Crew ID.  type: String.  length: 80.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Crew ID.  type: String.  length: 80.")]
+        CrewID = 13200,
+
+        /// <summary>
+        /// Task Organization.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Task Organization.")]
+        TaskOrganization = 14000,
+
+        /// <summary>
+        /// Regiment Name.  type: String.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Regiment Name.  type: String.")]
+        RegimentName = 14200,
+
+        /// <summary>
+        /// Battalion Name.  type: String.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Battalion Name.  type: String.")]
+        BattalionName = 14300,
+
+        /// <summary>
+        /// Company Name.  type: String.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Company Name.  type: String.")]
+        CompanyName = 14400,
+
+        /// <summary>
+        /// Platoon Name.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Platoon Name.")]
+        PlatoonName = 14500,
+
+        /// <summary>
+        /// Squad Name.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Squad Name.")]
+        SquadName = 14520,
+
+        /// <summary>
+        /// Team Name.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Team Name.")]
+        TeamName = 14540,
+
+        /// <summary>
+        /// Bumper Number.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bumper Number.")]
+        BumperNumber = 14600,
+
+        /// <summary>
+        /// Vehicle Number.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vehicle Number.")]
+        VehicleNumber = 14700,
+
+        /// <summary>
+        /// Unit Number.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unit Number.")]
+        UnitNumber = 14800,
+
+        /// <summary>
+        /// DIS Identity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS Identity.")]
+        DISIdentity = 15000,
+
+        /// <summary>
+        /// DIS Site ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS Site ID.")]
+        DISSiteID = 15100,
+
+        /// <summary>
+        /// DIS Host ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS Host ID.")]
+        DISHostID = 15200,
+
+        /// <summary>
+        /// DIS Entity ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS Entity ID.")]
+        DISEntityID = 15300,
+
+        /// <summary>
+        /// Mount Intent.  type: Datum Specification Sub-record.  length: 544.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mount Intent.  type: Datum Specification Sub-record.  length: 544.")]
+        MountIntent = 15400,
+
+        /// <summary>
+        /// Tether-Unthether Command ID.  type: Unsigned Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tether-Unthether Command ID.  type: Unsigned Integer.  length: 32.")]
+        TetherUnthetherCommandID = 15500,
+
+        /// <summary>
+        /// Teleport Entity Data Record.  type: Variable record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Teleport Entity Data Record.  type: Variable record.")]
+        TeleportEntityDataRecord = 15510,
+
+        /// <summary>
+        /// DIS Aggregate ID (Set if communication to aggregate).  type: Unsigned Integer.  length: 32.  range: Integer Aggregate ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS Aggregate ID (Set if communication to aggregate).  type: Unsigned Integer.  length: 32.  range: Integer Aggregate ID.")]
+        DISAggregateIDSetIfCommunicationToAggregate = 15600,
+
+        /// <summary>
+        /// Loads.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Loads.")]
+        Loads = 20000,
+
+        /// <summary>
+        /// Crew Members.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Crew Members.")]
+        CrewMembers = 21000,
+
+        /// <summary>
+        /// Crew Member ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Crew Member ID.")]
+        CrewMemberID = 21100,
+
+        /// <summary>
+        /// Health.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Health.")]
+        Health = 21200,
+
+        /// <summary>
+        /// Job Assignment.  type: String.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Job Assignment.  type: String.")]
+        JobAssignment = 21300,
+
+        /// <summary>
+        /// Fuel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuel.")]
+        Fuel = 23000,
+
+        /// <summary>
+        /// Quantity.  units: Liters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Quantity.  units: Liters.")]
+        Quantity = 23100,
+
+        /// <summary>
+        /// Quantity.  units: Gallons.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Quantity.  units: Gallons.")]
+        Quantity_23105 = 23105,
+
+        /// <summary>
+        /// Ammunition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ammunition.")]
+        Ammunition = 24000,
+
+        /// <summary>
+        /// 120-mm HEAT, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("120-mm HEAT, quantity.  units: Rounds.")]
+        _120MmHEATQuantity = 24001,
+
+        /// <summary>
+        /// 120-mm SABOT, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("120-mm SABOT, quantity.  units: Rounds.")]
+        _120MmSABOTQuantity = 24002,
+
+        /// <summary>
+        /// 12.7-mm M8, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("12.7-mm M8, quantity.  units: Rounds.")]
+        _127MmM8Quantity = 24003,
+
+        /// <summary>
+        /// 12.7-mm M20, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("12.7-mm M20, quantity.  units: Rounds.")]
+        _127MmM20Quantity = 24004,
+
+        /// <summary>
+        /// 7.62-mm M62, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("7.62-mm M62, quantity.  units: Rounds.")]
+        _762MmM62Quantity = 24005,
+
+        /// <summary>
+        /// M250 UKL8A1, quantity.  units: Grenades.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M250 UKL8A1, quantity.  units: Grenades.")]
+        M250UKL8A1Quantity = 24006,
+
+        /// <summary>
+        /// M250 UKL8A3, quantity.  units: Grenades.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("M250 UKL8A3, quantity.  units: Grenades.")]
+        M250UKL8A3Quantity = 24007,
+
+        /// <summary>
+        /// 7.62-mm M80, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("7.62-mm M80, quantity.  units: Rounds.")]
+        _762MmM80Quantity = 24008,
+
+        /// <summary>
+        /// 12.7-mm, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("12.7-mm, quantity.  units: Rounds.")]
+        _127MmQuantity = 24009,
+
+        /// <summary>
+        /// 7.62-mm, quantity.  units: Rounds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("7.62-mm, quantity.  units: Rounds.")]
+        _762MmQuantity = 24010,
+
+        /// <summary>
+        /// Mines, quantity.  units: Mines.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mines, quantity.  units: Mines.")]
+        MinesQuantity = 24060,
+
+        /// <summary>
+        /// Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type.")]
+        Type = 24100,
+
+        /// <summary>
+        /// Kind.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kind.")]
+        Kind_24110 = 24110,
+
+        /// <summary>
+        /// Domain.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Domain.")]
+        Domain_24120 = 24120,
+
+        /// <summary>
+        /// Country.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Country.")]
+        Country_24130 = 24130,
+
+        /// <summary>
+        /// Category.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Category.")]
+        Category_24140 = 24140,
+
+        /// <summary>
+        /// Subcategory.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Subcategory.")]
+        Subcategory_24150 = 24150,
+
+        /// <summary>
+        /// Extra.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Extra.")]
+        Extra_24160 = 24160,
+
+        /// <summary>
+        /// Description.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Description.")]
+        Description_24300 = 24300,
+
+        /// <summary>
+        /// Cargo.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cargo.")]
+        Cargo = 25000,
+
+        /// <summary>
+        /// Vehicle Mass.  type: Unsigned Integer.  length: 32.  units: Kilograms.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vehicle Mass.  type: Unsigned Integer.  length: 32.  units: Kilograms.")]
+        VehicleMass = 26000,
+
+        /// <summary>
+        /// Supply Quantity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Supply Quantity.")]
+        SupplyQuantity = 27000,
+
+        /// <summary>
+        /// Armament.  type: Boolean.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armament.  type: Boolean.")]
+        Armament = 28000,
+
+        /// <summary>
+        /// Status.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status.")]
+        Status = 30000,
+
+        /// <summary>
+        /// Activate entity.  type: Integer.  length: 32.  range: 0 Unspecified, 1 Activate platform.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Activate entity.  type: Integer.  length: 32.  range: 0 Unspecified, 1 Activate platform.")]
+        ActivateEntity = 30010,
+
+        /// <summary>
+        /// Subscription State.  type: Enumeration.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Subscription State.  type: Enumeration.  length: 8.")]
+        SubscriptionState = 30100,
+
+        /// <summary>
+        /// Round trip time delay.  type: Unsigned Integer.  length: 32 bits.  units: milliseconds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Round trip time delay.  type: Unsigned Integer.  length: 32 bits.  units: milliseconds.")]
+        RoundTripTimeDelay = 30300,
+
+        /// <summary>
+        /// TADIL J message count (label 0).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 0).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel0 = 30400,
+
+        /// <summary>
+        /// TADIL J message count (label 1).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 1).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel1 = 30401,
+
+        /// <summary>
+        /// TADIL J message count (label 2).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 2).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel2 = 30402,
+
+        /// <summary>
+        /// TADIL J message count (label 3).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 3).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel3 = 30403,
+
+        /// <summary>
+        /// TADIL J message count (label 4).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 4).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel4 = 30404,
+
+        /// <summary>
+        /// TADIL J message count (label 5).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 5).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel5 = 30405,
+
+        /// <summary>
+        /// TADIL J message count (label 6).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 6).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel6 = 30406,
+
+        /// <summary>
+        /// TADIL J message count (label 7).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 7).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel7 = 30407,
+
+        /// <summary>
+        /// TADIL J message count (label 8).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 8).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel8 = 30408,
+
+        /// <summary>
+        /// TADIL J message count (label 9).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 9).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel9 = 30409,
+
+        /// <summary>
+        /// TADIL J message count (label 10).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 10).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel10 = 30410,
+
+        /// <summary>
+        /// TADIL J message count (label 11).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 11).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel11 = 30411,
+
+        /// <summary>
+        /// TADIL J message count (label 12).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 12).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel12 = 30412,
+
+        /// <summary>
+        /// TADIL J message count (label 13).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 13).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel13 = 30413,
+
+        /// <summary>
+        /// TADIL J message count (label 14).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 14).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel14 = 30414,
+
+        /// <summary>
+        /// TADIL J message count (label 15).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 15).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel15 = 30415,
+
+        /// <summary>
+        /// TADIL J message count (label 16).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 16).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel16 = 30416,
+
+        /// <summary>
+        /// TADIL J message count (label 17).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 17).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel17 = 30417,
+
+        /// <summary>
+        /// TADIL J message count (label 18).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 18).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel18 = 30418,
+
+        /// <summary>
+        /// TADIL J message count (label 19).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 19).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel19 = 30419,
+
+        /// <summary>
+        /// TADIL J message count (label 20).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 20).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel20 = 30420,
+
+        /// <summary>
+        /// TADIL J message count (label 21).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 21).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel21 = 30421,
+
+        /// <summary>
+        /// TADIL J message count (label 22).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 22).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel22 = 30422,
+
+        /// <summary>
+        /// TADIL J message count (label 23).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 23).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel23 = 30423,
+
+        /// <summary>
+        /// TADIL J message count (label 24).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 24).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel24 = 30424,
+
+        /// <summary>
+        /// TADIL J message count (label 25).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 25).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel25 = 30425,
+
+        /// <summary>
+        /// TADIL J message count (label 26).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 26).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel26 = 30426,
+
+        /// <summary>
+        /// TADIL J message count (label 27).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 27).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel27 = 30427,
+
+        /// <summary>
+        /// TADIL J message count (label 28).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 28).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel28 = 30428,
+
+        /// <summary>
+        /// TADIL J message count (label 29).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 29).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel29 = 30429,
+
+        /// <summary>
+        /// TADIL J message count (label 30).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 30).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel30 = 30430,
+
+        /// <summary>
+        /// TADIL J message count (label 31).  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL J message count (label 31).  type: Unsigned Integer.  length: 32 bits.")]
+        TADILJMessageCountLabel31 = 30431,
+
+        /// <summary>
+        /// Position.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position.")]
+        Position = 31000,
+
+        /// <summary>
+        /// Route (Waypoint) type.  type: Integer.  length: 32.  range: 0 Default, 1 Orbit.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Route (Waypoint) type.  type: Integer.  length: 32.  range: 0 Default, 1 Orbit.")]
+        RouteWaypointType = 31010,
+
+        /// <summary>
+        /// MilGrid10.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MilGrid10.")]
+        MilGrid10 = 31100,
+
+        /// <summary>
+        /// Geocentric Coordinates.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Geocentric Coordinates.")]
+        GeocentricCoordinates = 31200,
+
+        /// <summary>
+        /// X.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        X = 31210,
+
+        /// <summary>
+        /// Y.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        Y = 31220,
+
+        /// <summary>
+        /// Z.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        Z = 31230,
+
+        /// <summary>
+        /// Latitude.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Latitude.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        Latitude = 31300,
+
+        /// <summary>
+        /// Longitude.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longitude.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        Longitude = 31400,
+
+        /// <summary>
+        /// Line of Sight.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Line of Sight.")]
+        LineOfSight = 31500,
+
+        /// <summary>
+        /// X.  type: Unsigned Integer.  length: 32.  units: meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X.  type: Unsigned Integer.  length: 32.  units: meters.")]
+        X_31510 = 31510,
+
+        /// <summary>
+        /// Y.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        Y_31520 = 31520,
+
+        /// <summary>
+        /// Z.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        Z_31530 = 31530,
+
+        /// <summary>
+        /// Altitude.  type: Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude.  type: Integer.  length: 32.  units: Meters.")]
+        Altitude = 31600,
+
+        /// <summary>
+        /// Destination Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Destination Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
+        DestinationLatitude = 31700,
+
+        /// <summary>
+        /// Destination Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Destination Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
+        DestinationLongitude = 31800,
+
+        /// <summary>
+        /// Destination Altitude.  type: Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Destination Altitude.  type: Integer.  length: 32.  units: Meters.")]
+        DestinationAltitude = 31900,
+
+        /// <summary>
+        /// Orientation.  type: Variable Datum.  length: 96.  units: Radians.  range: 3-32bit Floating Point.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Orientation.  type: Variable Datum.  length: 96.  units: Radians.  range: 3-32bit Floating Point.")]
+        Orientation = 32000,
+
+        /// <summary>
+        /// Hull Heading Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hull Heading Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        HullHeadingAngle = 32100,
+
+        /// <summary>
+        /// Hull Pitch Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Hull Pitch Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        HullPitchAngle = 32200,
+
+        /// <summary>
+        /// Roll Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Roll Angle.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        RollAngle = 32300,
+
+        /// <summary>
+        /// X.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        X_32500 = 32500,
+
+        /// <summary>
+        /// Y.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        Y_32600 = 32600,
+
+        /// <summary>
+        /// Z.  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z.  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        Z_32700 = 32700,
+
+        /// <summary>
+        /// Appearance.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Appearance.")]
+        Appearance = 33000,
+
+        /// <summary>
+        /// Ambient Lighting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ambient Lighting.")]
+        AmbientLighting = 33100,
+
+        /// <summary>
+        /// Lights.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lights.")]
+        Lights = 33101,
+
+        /// <summary>
+        /// Paint Scheme.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Paint Scheme.")]
+        PaintScheme = 33200,
+
+        /// <summary>
+        /// Smoke.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Smoke.")]
+        Smoke = 33300,
+
+        /// <summary>
+        /// Trailing Effects.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trailing Effects.")]
+        TrailingEffects = 33400,
+
+        /// <summary>
+        /// Flaming.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Flaming.")]
+        Flaming = 33500,
+
+        /// <summary>
+        /// Marking.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Marking.")]
+        Marking = 33600,
+
+        /// <summary>
+        /// Mine Plows Attached.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine Plows Attached.")]
+        MinePlowsAttached = 33710,
+
+        /// <summary>
+        /// Mine Rollers Attached.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine Rollers Attached.")]
+        MineRollersAttached = 33720,
+
+        /// <summary>
+        /// Tank Turret Azimuth.  units: Degrees Rel 2 lon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tank Turret Azimuth.  units: Degrees Rel 2 lon.")]
+        TankTurretAzimuth = 33730,
+
+        /// <summary>
+        /// Failures and Malfunctions.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Failures and Malfunctions.")]
+        FailuresAndMalfunctions = 34000,
+
+        /// <summary>
+        /// Age.  units: Miles.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Age.  units: Miles.")]
+        Age = 34100,
+
+        /// <summary>
+        /// Kilometers.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kilometers.")]
+        Kilometers = 34110,
+
+        /// <summary>
+        /// Damage.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage.")]
+        Damage = 35000,
+
+        /// <summary>
+        /// Cause.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cause.")]
+        Cause = 35050,
+
+        /// <summary>
+        /// Mobility Kill.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mobility Kill.")]
+        MobilityKill = 35100,
+
+        /// <summary>
+        /// Fire-Power Kill.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire-Power Kill.")]
+        FirePowerKill = 35200,
+
+        /// <summary>
+        /// Personnel Casualties.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Personnel Casualties.")]
+        PersonnelCasualties = 35300,
+
+        /// <summary>
+        /// Velocity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Velocity.")]
+        Velocity = 36000,
+
+        /// <summary>
+        /// X-velocity.  units: Meters/second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X-velocity.  units: Meters/second.")]
+        XVelocity = 36100,
+
+        /// <summary>
+        /// Y-velocity.  units: Meters/second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y-velocity.  units: Meters/second.")]
+        YVelocity = 36200,
+
+        /// <summary>
+        /// Z-velocity.  units: Meters/second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z-velocity.  units: Meters/second.")]
+        ZVelocity = 36300,
+
+        /// <summary>
+        /// Speed.  type: Floating Point.  length: 32.  units: Meters/second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Speed.  type: Floating Point.  length: 32.  units: Meters/second.")]
+        Speed = 36400,
+
+        /// <summary>
+        /// Acceleration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acceleration.")]
+        Acceleration = 37000,
+
+        /// <summary>
+        /// X-acceleration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X-acceleration.")]
+        XAcceleration = 37100,
+
+        /// <summary>
+        /// Y-acceleration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y-acceleration.")]
+        YAcceleration = 37200,
+
+        /// <summary>
+        /// Z-acceleration.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z-acceleration.")]
+        ZAcceleration = 37300,
+
+        /// <summary>
+        /// Engine Status.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Engine Status.")]
+        EngineStatus = 38100,
+
+        /// <summary>
+        /// Primary Target Line (PTL).  type: Unsigned Integer.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Primary Target Line (PTL).  type: Unsigned Integer.  length: 32.  units: Degrees.")]
+        PrimaryTargetLinePTL = 39000,
+
+        /// <summary>
+        /// Exercise.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise.")]
+        Exercise = 40000,
+
+        /// <summary>
+        /// Exercise State.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise State.  type: Variable Record.  length: 64.")]
+        ExerciseState = 40010,
+
+        /// <summary>
+        /// Restart/Refresh.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, 1 Restart.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Restart/Refresh.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, 1 Restart.")]
+        RestartRefresh = 40015,
+
+        /// <summary>
+        /// AFATDS File Name.  type: Variable Record.  range: 1..40 ASCII Characters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AFATDS File Name.  type: Variable Record.  range: 1..40 ASCII Characters.")]
+        AFATDSFileName = 40020,
+
+        /// <summary>
+        /// Terrain Database.  type: Unsigned Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Terrain Database.  type: Unsigned Integer.  length: 32.")]
+        TerrainDatabase = 41000,
+
+        /// <summary>
+        /// 41001.  type: 41001.  length: 41001.  units: 41001.  range: 41001.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("41001.  type: 41001.  length: 41001.  units: 41001.  range: 41001.")]
+        _41001 = 41001,
+
+        /// <summary>
+        /// Missions.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Missions.")]
+        Missions = 42000,
+
+        /// <summary>
+        /// Mission ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mission ID.")]
+        MissionID = 42100,
+
+        /// <summary>
+        /// Mission Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mission Type.")]
+        MissionType = 42200,
+
+        /// <summary>
+        /// Mission Request Time Stamp.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mission Request Time Stamp.")]
+        MissionRequestTimeStamp = 42300,
+
+        /// <summary>
+        /// Exercise Description.  type: String.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise Description.  type: String.")]
+        ExerciseDescription = 43000,
+
+        /// <summary>
+        /// Name.  type: String.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Name.  type: String.")]
+        Name = 43100,
+
+        /// <summary>
+        /// Entities.  type: Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entities.  type: Integer.")]
+        Entities = 43200,
+
+        /// <summary>
+        /// Version.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Version.")]
+        Version = 43300,
+
+        /// <summary>
+        /// Guise Mode.  type: Unsigned Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Guise Mode.  type: Unsigned Integer.  length: 32.")]
+        GuiseMode = 43410,
+
+        /// <summary>
+        /// Simulation Application Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Application Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
+        SimulationApplicationActiveStatus = 43420,
+
+        /// <summary>
+        /// Simulation Application Role Record.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Application Role Record.  type: Variable Record.  length: 64.")]
+        SimulationApplicationRoleRecord = 43430,
+
+        /// <summary>
+        /// Simulation Application State.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Application State.  type: Variable Record.  length: 64.")]
+        SimulationApplicationState = 43440,
+
+        /// <summary>
+        /// Visual Output Mode.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visual Output Mode.")]
+        VisualOutputMode = 44000,
+
+        /// <summary>
+        /// Simulation Manager Role.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Manager Role.  type: Variable Record.")]
+        SimulationManagerRole = 44100,
+
+        /// <summary>
+        /// Simulation Manager Site ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Manager Site ID.  type: Unsigned Integer.  length: 16.")]
+        SimulationManagerSiteID = 44110,
+
+        /// <summary>
+        /// Simulation Manager Applic. ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Manager Applic. ID.  type: Unsigned Integer.  length: 16.")]
+        SimulationManagerApplicID = 44120,
+
+        /// <summary>
+        /// Simulation Manager Entity ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Manager Entity ID.  type: Unsigned Integer.  length: 16.")]
+        SimulationManagerEntityID = 44130,
+
+        /// <summary>
+        /// Simulation Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
+        SimulationManagerActiveStatus = 44140,
+
+        /// <summary>
+        /// After Active Review Role.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("After Active Review Role.  type: Variable Record.")]
+        AfterActiveReviewRole = 44200,
+
+        /// <summary>
+        /// After Active Review Site ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("After Active Review Site ID.  type: Unsigned Integer.  length: 16.")]
+        AfterActiveReviewSiteID = 44210,
+
+        /// <summary>
+        /// After Active Applic. ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("After Active Applic. ID.  type: Unsigned Integer.  length: 16.")]
+        AfterActiveApplicID = 44220,
+
+        /// <summary>
+        /// After Active Review Entity ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("After Active Review Entity ID.  type: Unsigned Integer.  length: 16.")]
+        AfterActiveReviewEntityID = 44230,
+
+        /// <summary>
+        /// After Active Review Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("After Active Review Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
+        AfterActiveReviewActiveStatus = 44240,
+
+        /// <summary>
+        /// Exercise Logger Role.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise Logger Role.  type: Variable Record.")]
+        ExerciseLoggerRole = 44300,
+
+        /// <summary>
+        /// Exercise Logger Site ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise Logger Site ID.  type: Unsigned Integer.  length: 16.")]
+        ExerciseLoggerSiteID = 44310,
+
+        /// <summary>
+        /// Exercise Logger Applic. ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise Logger Applic. ID.  type: Unsigned Integer.  length: 16.")]
+        ExerciseLoggerApplicID = 44320,
+
+        /// <summary>
+        /// Exercise Entity ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise Entity ID.  type: Unsigned Integer.  length: 16.")]
+        ExerciseEntityID = 44330,
+
+        /// <summary>
+        /// Exercise Logger Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise Logger Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
+        ExerciseLoggerActiveStatus = 44340,
+
+        /// <summary>
+        /// Synthetic Environment Manager Role.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Synthetic Environment Manager Role.  type: Variable Record.")]
+        SyntheticEnvironmentManagerRole = 44400,
+
+        /// <summary>
+        /// Synthetic Environment Manager Site ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Synthetic Environment Manager Site ID.  type: Unsigned Integer.  length: 16.")]
+        SyntheticEnvironmentManagerSiteID = 44410,
+
+        /// <summary>
+        /// Synthetic Environment Manager Applic. ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Synthetic Environment Manager Applic. ID.  type: Unsigned Integer.  length: 16.")]
+        SyntheticEnvironmentManagerApplicID = 44420,
+
+        /// <summary>
+        /// Synthetic Environment Manager Entity ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Synthetic Environment Manager Entity ID.  type: Unsigned Integer.  length: 16.")]
+        SyntheticEnvironmentManagerEntityID = 44430,
+
+        /// <summary>
+        /// Synthetic Environment Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Synthetic Environment Manager Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
+        SyntheticEnvironmentManagerActiveStatus = 44440,
+
+        /// <summary>
+        /// SIMNET-DIS Translator Role.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SIMNET-DIS Translator Role.  type: Variable Record.")]
+        SIMNETDISTranslatorRole = 44500,
+
+        /// <summary>
+        /// SIMNET-DIS Translator Site ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SIMNET-DIS Translator Site ID.  type: Unsigned Integer.  length: 16.")]
+        SIMNETDISTranslatorSiteID = 44510,
+
+        /// <summary>
+        /// SIMNET-DIS Translator Applic. ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SIMNET-DIS Translator Applic. ID.  type: Unsigned Integer.  length: 16.")]
+        SIMNETDISTranslatorApplicID = 44520,
+
+        /// <summary>
+        /// SIMNET-DIS Translator Entity ID.  type: Unsigned Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SIMNET-DIS Translator Entity ID.  type: Unsigned Integer.  length: 16.")]
+        SIMNETDISTranslatorEntityID = 44530,
+
+        /// <summary>
+        /// SIMNET-DIS Translator Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SIMNET-DIS Translator Active Status.  type: Unsigned Integer.  length: 16.  range: 0 Backup, 1 Primary.")]
+        SIMNETDISTranslatorActiveStatus = 44540,
+
+        /// <summary>
+        /// Application Rate.  type: Floating point.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Application Rate.  type: Floating point.  length: 32.")]
+        ApplicationRate = 45000,
+
+        /// <summary>
+        /// Application Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std1278.1-1995 section 5.2.8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Application Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std1278.1-1995 section 5.2.8.")]
+        ApplicationTime = 45005,
+
+        /// <summary>
+        /// Application Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Application Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
+        ApplicationTimestep = 45010,
+
+        /// <summary>
+        /// Feedback Time.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Feedback Time.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
+        FeedbackTime = 45020,
+
+        /// <summary>
+        /// Simulation Rate.  type: Floating Point.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Rate.  type: Floating Point.  length: 32.")]
+        SimulationRate = 45030,
+
+        /// <summary>
+        /// Simulation Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std 1278.1-1995 section 5.2.8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Time.  type: Clock Time Record.  length: 64.  range: See IEEE Std 1278.1-1995 section 5.2.8.")]
+        SimulationTime = 45040,
+
+        /// <summary>
+        /// Simulation Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Timestep.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
+        SimulationTimestep = 45050,
+
+        /// <summary>
+        /// Time Interval.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Interval.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
+        TimeInterval = 45060,
+
+        /// <summary>
+        /// Time Latency.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Latency.  type: Timestamp.  length: 32.  range: See IEEE Std 1278.1-1995 section 5.2.31.")]
+        TimeLatency = 45070,
+
+        /// <summary>
+        /// Time Scheme.  type: Unsigned Integer.  length: 32.  range: 1 Real time, 2 Scaled time, 3 Scaled and stepped time.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Scheme.  type: Unsigned Integer.  length: 32.  range: 1 Real time, 2 Scaled time, 3 Scaled and stepped time.")]
+        TimeScheme = 45080,
+
+        /// <summary>
+        /// Exercise Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (takes into account exercise pauses and scaled exercise time).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Exercise Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (takes into account exercise pauses and scaled exercise time).")]
+        ExerciseElapsedTime = 46000,
+
+        /// <summary>
+        /// Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (real time, does not take into account exercise pauses and scaled exercise time).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Elapsed Time.  type: Unsigned integer.  length: 32.  units: Seconds.  range: Time since exercise started (real time, does not take into account exercise pauses and scaled exercise time).")]
+        ElapsedTime = 46010,
+
+        /// <summary>
+        /// Environment.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environment.")]
+        Environment = 50000,
+
+        /// <summary>
+        /// Weather.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weather.")]
+        Weather = 51000,
+
+        /// <summary>
+        /// Weather Condition.  type: Unsigned Integer.  length: 32.  units: N/A.  range: 0 = Clear, 1 = Cloudy, 2 = Overcast, 3 = Foggy, 4 = Raining.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weather Condition.  type: Unsigned Integer.  length: 32.  units: N/A.  range: 0 = Clear, 1 = Cloudy, 2 = Overcast, 3 = Foggy, 4 = Raining.")]
+        WeatherCondition = 51010,
+
+        /// <summary>
+        /// Thermal Condition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thermal Condition.")]
+        ThermalCondition = 51100,
+
+        /// <summary>
+        /// Thermal Visibility.  type: Floating Point.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thermal Visibility.  type: Floating Point.  length: 32.  units: Meters.")]
+        ThermalVisibility = 51110,
+
+        /// <summary>
+        /// Thermal Visibility.  type: Unsigned integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thermal Visibility.  type: Unsigned integer.  length: 32.  units: Meters.")]
+        ThermalVisibility_51111 = 51111,
+
+        /// <summary>
+        /// Time.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time.")]
+        Time = 52000,
+
+        /// <summary>
+        /// Time.  type: String.  length: 56.  range: Format HHMMSS.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time.  type: String.  length: 56.  range: Format HHMMSS.")]
+        Time_52001 = 52001,
+
+        /// <summary>
+        /// Time of Day, Discrete.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time of Day, Discrete.")]
+        TimeOfDayDiscrete = 52100,
+
+        /// <summary>
+        /// Time of Day, Continuous.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time of Day, Continuous.")]
+        TimeOfDayContinuous = 52200,
+
+        /// <summary>
+        /// Time Mode.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Mode.")]
+        TimeMode = 52300,
+
+        /// <summary>
+        /// Time Scene.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Scene.")]
+        TimeScene = 52305,
+
+        /// <summary>
+        /// Current Hour.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Current Hour.")]
+        CurrentHour = 52310,
+
+        /// <summary>
+        /// Current Minute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Current Minute.")]
+        CurrentMinute = 52320,
+
+        /// <summary>
+        /// Current Second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Current Second.")]
+        CurrentSecond = 52330,
+
+        /// <summary>
+        /// Azimuth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Azimuth.")]
+        Azimuth = 52340,
+
+        /// <summary>
+        /// Maximum Elevation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Maximum Elevation.")]
+        MaximumElevation = 52350,
+
+        /// <summary>
+        /// Time Zone.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Zone.")]
+        TimeZone = 52360,
+
+        /// <summary>
+        /// Time Rate.  type: Integer.  length: 32.  range: 1000 * Ratio (Simulation Time / Wall Clock Time).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Rate.  type: Integer.  length: 32.  range: 1000 * Ratio (Simulation Time / Wall Clock Time).")]
+        TimeRate = 52370,
+
+        /// <summary>
+        /// The number of simulation seconds since the start of the exercise (simulation time).  type: Integer.  length: 32.  units: Seconds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("The number of simulation seconds since the start of the exercise (simulation time).  type: Integer.  length: 32.  units: Seconds.")]
+        TheNumberOfSimulationSecondsSinceTheStartOfTheExerciseSimulationTime = 52380,
+
+        /// <summary>
+        /// Time Sunrise Enabled.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Sunrise Enabled.")]
+        TimeSunriseEnabled = 52400,
+
+        /// <summary>
+        /// Sunrise Hour.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunrise Hour.")]
+        SunriseHour = 52410,
+
+        /// <summary>
+        /// Sunrise Minute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunrise Minute.")]
+        SunriseMinute = 52420,
+
+        /// <summary>
+        /// Sunrise Second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunrise Second.")]
+        SunriseSecond = 52430,
+
+        /// <summary>
+        /// Sunrise Azimuth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunrise Azimuth.")]
+        SunriseAzimuth = 52440,
+
+        /// <summary>
+        /// Time Sunset Enabled.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Sunset Enabled.")]
+        TimeSunsetEnabled = 52500,
+
+        /// <summary>
+        /// Sunset Hour.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunset Hour.")]
+        SunsetHour = 52510,
+
+        /// <summary>
+        /// Sunset Hour.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunset Hour.")]
+        SunsetHour_52511 = 52511,
+
+        /// <summary>
+        /// Sunset Minute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunset Minute.")]
+        SunsetMinute = 52520,
+
+        /// <summary>
+        /// Sunset Second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sunset Second.")]
+        SunsetSecond = 52530,
+
+        /// <summary>
+        /// 52531.  type: 52531.  length: 52531.  units: 52531.  range: 52531.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("52531.  type: 52531.  length: 52531.  units: 52531.  range: 52531.")]
+        _52531 = 52531,
+
+        /// <summary>
+        /// Date.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Date.")]
+        Date = 52600,
+
+        /// <summary>
+        /// Date (European).  type: String.  length: 72.  range: Format DDMMYYYY.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Date (European).  type: String.  length: 72.  range: Format DDMMYYYY.")]
+        DateEuropean = 52601,
+
+        /// <summary>
+        /// Date (US).  type: String.  length: 72.  range: Format MMDDYYYY.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Date (US).  type: String.  length: 72.  range: Format MMDDYYYY.")]
+        DateUS = 52602,
+
+        /// <summary>
+        /// Month.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Month.")]
+        Month = 52610,
+
+        /// <summary>
+        /// Day.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Day.")]
+        Day = 52620,
+
+        /// <summary>
+        /// Year.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Year.")]
+        Year = 52630,
+
+        /// <summary>
+        /// Clouds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Clouds.")]
+        Clouds = 53000,
+
+        /// <summary>
+        /// Cloud Layer Enable.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cloud Layer Enable.")]
+        CloudLayerEnable = 53050,
+
+        /// <summary>
+        /// Cloud Layer Selection.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cloud Layer Selection.")]
+        CloudLayerSelection = 53060,
+
+        /// <summary>
+        /// Visibility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility.")]
+        Visibility = 53100,
+
+        /// <summary>
+        /// Base Altitude.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Base Altitude.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        BaseAltitude = 53200,
+
+        /// <summary>
+        /// Base Altitude.  units: Feet.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Base Altitude.  units: Feet.")]
+        BaseAltitude_53250 = 53250,
+
+        /// <summary>
+        /// Ceiling.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ceiling.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        Ceiling = 53300,
+
+        /// <summary>
+        /// Ceiling.  units: Feet.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ceiling.  units: Feet.")]
+        Ceiling_53350 = 53350,
+
+        /// <summary>
+        /// Characteristics.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Characteristics.")]
+        Characteristics = 53400,
+
+        /// <summary>
+        /// Concentration Length.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Concentration Length.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.")]
+        ConcentrationLength = 53410,
+
+        /// <summary>
+        /// Transmittance.  type: Floating Point.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transmittance.  type: Floating Point.  length: 32.")]
+        Transmittance = 53420,
+
+        /// <summary>
+        /// Radiance.  type: Floating Point.  length: 32.  units: microwatts/ centimeterCaret2/ steradian.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radiance.  type: Floating Point.  length: 32.  units: microwatts/ centimeterCaret2/ steradian.")]
+        Radiance = 53430,
+
+        /// <summary>
+        /// Precipitation.  type: Boolean.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Precipitation.  type: Boolean.  length: 32.")]
+        Precipitation = 54000,
+
+        /// <summary>
+        /// Rain.  type: Boolean.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rain.  type: Boolean.")]
+        Rain = 54100,
+
+        /// <summary>
+        /// Fog.  type: Boolean.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fog.  type: Boolean.")]
+        Fog = 55000,
+
+        /// <summary>
+        /// Visibility.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility.  units: Meters.")]
+        Visibility_55100 = 55100,
+
+        /// <summary>
+        /// Visibility.  type: Unsigned integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility.  type: Unsigned integer.  length: 32.  units: Meters.")]
+        Visibility_55101 = 55101,
+
+        /// <summary>
+        /// Visibility.  units: Miles.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility.  units: Miles.")]
+        Visibility_55105 = 55105,
+
+        /// <summary>
+        /// Density.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Density.")]
+        Density = 55200,
+
+        /// <summary>
+        /// Base.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Base.")]
+        Base = 55300,
+
+        /// <summary>
+        /// View Layer from above.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("View Layer from above.")]
+        ViewLayerFromAbove = 55401,
+
+        /// <summary>
+        /// Transition Range.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transition Range.")]
+        TransitionRange = 55410,
+
+        /// <summary>
+        /// Bottom.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bottom.  units: Meters.")]
+        Bottom = 55420,
+
+        /// <summary>
+        /// Bottom.  units: Feet.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bottom.  units: Feet.")]
+        Bottom_55425 = 55425,
+
+        /// <summary>
+        /// Ceiling.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ceiling.  units: Meters.")]
+        Ceiling_55430 = 55430,
+
+        /// <summary>
+        /// Ceiling.  units: Feet.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ceiling.  units: Feet.")]
+        Ceiling_55435 = 55435,
+
+        /// <summary>
+        /// Heavenly Bodies.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heavenly Bodies.")]
+        HeavenlyBodies = 56000,
+
+        /// <summary>
+        /// Sun.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sun.")]
+        Sun = 56100,
+
+        /// <summary>
+        /// Sun Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sun Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.")]
+        SunVisible = 56105,
+
+        /// <summary>
+        /// Position.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position.")]
+        Position_56110 = 56110,
+
+        /// <summary>
+        /// Sun Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sun Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.")]
+        SunPositionElevationDegrees = 56111,
+
+        /// <summary>
+        /// Position Azimuth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Azimuth.")]
+        PositionAzimuth = 56120,
+
+        /// <summary>
+        /// Sun Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sun Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
+        SunPositionAzimuthDegrees = 56121,
+
+        /// <summary>
+        /// Position Elevation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Elevation.")]
+        PositionElevation = 56130,
+
+        /// <summary>
+        /// Position Intensity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Intensity.")]
+        PositionIntensity = 56140,
+
+        /// <summary>
+        /// Moon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moon.")]
+        Moon = 56200,
+
+        /// <summary>
+        /// Moon Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moon Visible.  type: Unsigned integer.  length: 32.  units: N/A.  range: 0 Not visible, 1 Visible.")]
+        MoonVisible = 56205,
+
+        /// <summary>
+        /// Position.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position.")]
+        Position_56210 = 56210,
+
+        /// <summary>
+        /// Position Azimuth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Azimuth.")]
+        PositionAzimuth_56220 = 56220,
+
+        /// <summary>
+        /// Moon Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moon Position Azimuth, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
+        MoonPositionAzimuthDegrees = 56221,
+
+        /// <summary>
+        /// Position Elevation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Elevation.")]
+        PositionElevation_56230 = 56230,
+
+        /// <summary>
+        /// Moon Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moon Position Elevation, Degrees.  type: Floating Point.  length: 32.  units: Degrees.")]
+        MoonPositionElevationDegrees = 56231,
+
+        /// <summary>
+        /// Position Intensity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Intensity.")]
+        PositionIntensity_56240 = 56240,
+
+        /// <summary>
+        /// Horizon.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Horizon.")]
+        Horizon = 56310,
+
+        /// <summary>
+        /// Horizon Azimuth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Horizon Azimuth.")]
+        HorizonAzimuth = 56320,
+
+        /// <summary>
+        /// Horizon Elevation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Horizon Elevation.")]
+        HorizonElevation = 56330,
+
+        /// <summary>
+        /// Horizon Heading.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Horizon Heading.")]
+        HorizonHeading = 56340,
+
+        /// <summary>
+        /// Horizon Intensity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Horizon Intensity.")]
+        HorizonIntensity = 56350,
+
+        /// <summary>
+        /// Humidity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Humidity.")]
+        Humidity = 57200,
+
+        /// <summary>
+        /// Visibility.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility.")]
+        Visibility_57300 = 57300,
+
+        /// <summary>
+        /// Winds.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Winds.")]
+        Winds = 57400,
+
+        /// <summary>
+        /// Speed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Speed.")]
+        Speed_57410 = 57410,
+
+        /// <summary>
+        /// Wind Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wind Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.")]
+        WindSpeedKnots = 57411,
+
+        /// <summary>
+        /// Wind Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wind Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.")]
+        WindDirection = 57420,
+
+        /// <summary>
+        /// Wind Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wind Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
+        WindDirectionDegrees = 57421,
+
+        /// <summary>
+        /// Rainsoak.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rainsoak.")]
+        Rainsoak = 57500,
+
+        /// <summary>
+        /// Tide Speed.  type: Floating Point.  length: 32.  units: Meters/second.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tide Speed.  type: Floating Point.  length: 32.  units: Meters/second.")]
+        TideSpeed = 57610,
+
+        /// <summary>
+        /// Tide Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tide Speed, Knots.  type: Floating Point.  length: 32.  units: Knots.")]
+        TideSpeedKnots = 57611,
+
+        /// <summary>
+        /// Tide Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tide Direction.  type: Floating Point.  length: 32.  units: Radians.  range: Relative to True North.")]
+        TideDirection = 57620,
+
+        /// <summary>
+        /// Tide Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tide Direction, Degrees.  type: Floating Point.  length: 32.  units: Degrees.  range: Relative to True North.")]
+        TideDirectionDegrees = 57621,
+
+        /// <summary>
+        /// Haze.  type: Boolean.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Haze.  type: Boolean.")]
+        Haze = 58000,
+
+        /// <summary>
+        /// Visibility.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility.  units: Meters.")]
+        Visibility_58100 = 58100,
+
+        /// <summary>
+        /// Visibility.  units: Miles.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility.  units: Miles.")]
+        Visibility_58105 = 58105,
+
+        /// <summary>
+        /// Density.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Density.")]
+        Density_58200 = 58200,
+
+        /// <summary>
+        /// Ceiling.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ceiling.  units: Meters.")]
+        Ceiling_58430 = 58430,
+
+        /// <summary>
+        /// Ceiling.  units: Feet.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ceiling.  units: Feet.")]
+        Ceiling_58435 = 58435,
+
+        /// <summary>
+        /// Contaminants and Obscurants.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contaminants and Obscurants.")]
+        ContaminantsAndObscurants = 59000,
+
+        /// <summary>
+        /// Contaminant/Obscurant Type.  type: Unsigned Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contaminant/Obscurant Type.  type: Unsigned Integer.  length: 32.")]
+        ContaminantObscurantType = 59100,
+
+        /// <summary>
+        /// Persistence.  type: Enumeration.  length: 8.  range: 0 Neat, 1 Dry, 2 Thickened.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Persistence.  type: Enumeration.  length: 8.  range: 0 Neat, 1 Dry, 2 Thickened.")]
+        Persistence = 59110,
+
+        /// <summary>
+        /// Chemical Dosage.  type: Floating Point.  length: 32.  units: milligrams/meter?/minute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical Dosage.  type: Floating Point.  length: 32.  units: milligrams/meter?/minute.")]
+        ChemicalDosage = 59115,
+
+        /// <summary>
+        /// Chemical Air Concentration.  type: Floating Point.  length: 32.  units: milligrams/meter?.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical Air Concentration.  type: Floating Point.  length: 32.  units: milligrams/meter?.")]
+        ChemicalAirConcentration = 59120,
+
+        /// <summary>
+        /// Chemical Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.")]
+        ChemicalGroundDeposition = 59125,
+
+        /// <summary>
+        /// Chemical Maximum Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical Maximum Ground Deposition.  type: Floating Point.  length: 32.  units: milligrams/meterCaret2.")]
+        ChemicalMaximumGroundDeposition = 59130,
+
+        /// <summary>
+        /// Chemical Dosage Threshold.  type: Floating Point.  length: 32.  units: milligram/meter?/minute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical Dosage Threshold.  type: Floating Point.  length: 32.  units: milligram/meter?/minute.")]
+        ChemicalDosageThreshold = 59135,
+
+        /// <summary>
+        /// Biological Dosage.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological Dosage.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.")]
+        BiologicalDosage = 59140,
+
+        /// <summary>
+        /// Biological Air Concentration.  type: Floating Point.  length: 32.  units: particles/liter of air.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological Air Concentration.  type: Floating Point.  length: 32.  units: particles/liter of air.")]
+        BiologicalAirConcentration = 59145,
+
+        /// <summary>
+        /// Biological Dosage Threshold.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological Dosage Threshold.  type: Floating Point.  length: 32.  units: particles/liter of air/minute.")]
+        BiologicalDosageThreshold = 59150,
+
+        /// <summary>
+        /// Biological Binned Particle Count.  type: Enumeration.  length: 8.  range: 1 Low (.5-2), 2 Detection (2-.10), 3 High (10-15).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological Binned Particle Count.  type: Enumeration.  length: 8.  range: 1 Low (.5-2), 2 Detection (2-.10), 3 High (10-15).")]
+        BiologicalBinnedParticleCount = 59155,
+
+        /// <summary>
+        /// Radiological Dosage.  type: Floating Point.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radiological Dosage.  type: Floating Point.  length: 32.")]
+        RadiologicalDosage = 59160,
+
+        /// <summary>
+        /// Communications.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Communications.")]
+        Communications = 60000,
+
+        /// <summary>
+        /// Channel Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Channel Type.")]
+        ChannelType = 61100,
+
+        /// <summary>
+        /// Channel Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Channel Type.")]
+        ChannelType_61101 = 61101,
+
+        /// <summary>
+        /// Channel Identification.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Channel Identification.")]
+        ChannelIdentification = 61200,
+
+        /// <summary>
+        /// Alpha Identification.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alpha Identification.")]
+        AlphaIdentification = 61300,
+
+        /// <summary>
+        /// 61301.  type: 61301.  length: 61301.  units: 61301.  range: 61301.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("61301.  type: 61301.  length: 61301.  units: 61301.  range: 61301.")]
+        _61301 = 61301,
+
+        /// <summary>
+        /// Radio Identification.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Identification.")]
+        RadioIdentification = 61400,
+
+        /// <summary>
+        /// 61401.  type: 61401.  length: 61401.  units: 61401.  range: 61401.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("61401.  type: 61401.  length: 61401.  units: 61401.  range: 61401.")]
+        _61401 = 61401,
+
+        /// <summary>
+        /// Land Line Identification.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Land Line Identification.")]
+        LandLineIdentification = 61500,
+
+        /// <summary>
+        /// Intercom Identification.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intercom Identification.")]
+        IntercomIdentification = 61600,
+
+        /// <summary>
+        /// Group Network Channel Number.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Group Network Channel Number.")]
+        GroupNetworkChannelNumber = 61700,
+
+        /// <summary>
+        /// Radio Communications Status.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Communications Status.")]
+        RadioCommunicationsStatus = 62100,
+
+        /// <summary>
+        /// Stationary Radio Transmitters Default Time.  type: Unsigned Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stationary Radio Transmitters Default Time.  type: Unsigned Integer.")]
+        StationaryRadioTransmittersDefaultTime = 62200,
+
+        /// <summary>
+        /// Moving Radio Transmitters Default Time.  type: Unsigned Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moving Radio Transmitters Default Time.  type: Unsigned Integer.")]
+        MovingRadioTransmittersDefaultTime = 62300,
+
+        /// <summary>
+        /// Stationary Radio Signals Default Time.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stationary Radio Signals Default Time.")]
+        StationaryRadioSignalsDefaultTime = 62400,
+
+        /// <summary>
+        /// Moving Radio Signal Default Time.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Moving Radio Signal Default Time.")]
+        MovingRadioSignalDefaultTime = 62500,
+
+        /// <summary>
+        /// Radio Initialization Transec Security Key.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Transec Security Key.  type: Variable Record.")]
+        RadioInitializationTransecSecurityKey = 63101,
+
+        /// <summary>
+        /// Radio Initialization Internal Noise Level.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Internal Noise Level.  type: Variable Record.")]
+        RadioInitializationInternalNoiseLevel = 63102,
+
+        /// <summary>
+        /// Radio Initialization Squelch Threshold.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Squelch Threshold.  type: Variable Record.")]
+        RadioInitializationSquelchThreshold = 63103,
+
+        /// <summary>
+        /// Radio Initialization Antenna Location.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Antenna Location.  type: Variable Record.")]
+        RadioInitializationAntennaLocation = 63104,
+
+        /// <summary>
+        /// Radio Initialization Antenna Pattern Type.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Antenna Pattern Type.  type: Variable Record.")]
+        RadioInitializationAntennaPatternType = 63105,
+
+        /// <summary>
+        /// Radio Initialization Antenna Pattern Length.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Antenna Pattern Length.  type: Variable Record.")]
+        RadioInitializationAntennaPatternLength = 63106,
+
+        /// <summary>
+        /// Radio Initialization Beam Definition.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Beam Definition.  type: Variable Record.")]
+        RadioInitializationBeamDefinition = 63107,
+
+        /// <summary>
+        /// Radio Initialization Transmit Heartbeat Time.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Transmit Heartbeat Time.  type: Variable Record.")]
+        RadioInitializationTransmitHeartbeatTime = 63108,
+
+        /// <summary>
+        /// Radio Initialization Transmit Distance Threshold Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Initialization Transmit Distance Threshold Variable Record.")]
+        RadioInitializationTransmitDistanceThresholdVariableRecord = 63109,
+
+        /// <summary>
+        /// Radio Channel Initialization Lockout ID.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Channel Initialization Lockout ID.  type: Variable Record.")]
+        RadioChannelInitializationLockoutID = 63110,
+
+        /// <summary>
+        /// Radio Channel Initialization Hopset ID.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Channel Initialization Hopset ID.  type: Variable Record.")]
+        RadioChannelInitializationHopsetID = 63111,
+
+        /// <summary>
+        /// Radio Channel Initialization Preset Frequency.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Channel Initialization Preset Frequency.  type: Variable Record.")]
+        RadioChannelInitializationPresetFrequency = 63112,
+
+        /// <summary>
+        /// Radio Channel Initialization Frequency Sync Time.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Channel Initialization Frequency Sync Time.  type: Variable Record.")]
+        RadioChannelInitializationFrequencySyncTime = 63113,
+
+        /// <summary>
+        /// Radio Channel Initialization Comsec Key.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Channel Initialization Comsec Key.  type: Variable Record.")]
+        RadioChannelInitializationComsecKey = 63114,
+
+        /// <summary>
+        /// Radio Channel Initialization Alpha.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Channel Initialization Alpha.  type: Variable Record.")]
+        RadioChannelInitializationAlpha = 63115,
+
+        /// <summary>
+        /// Algorithm Parameters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Algorithm Parameters.")]
+        AlgorithmParameters = 70000,
+
+        /// <summary>
+        /// Dead Reckoning Algorithm (DRA).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Algorithm (DRA).")]
+        DeadReckoningAlgorithmDRA = 71000,
+
+        /// <summary>
+        /// DRA Location Threshold.  type: Unsigned Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRA Location Threshold.  type: Unsigned Integer.  length: 32.")]
+        DRALocationThreshold = 71100,
+
+        /// <summary>
+        /// DRA Orientation Threshold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRA Orientation Threshold.")]
+        DRAOrientationThreshold = 71200,
+
+        /// <summary>
+        /// DRA Time Threshold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRA Time Threshold.")]
+        DRATimeThreshold = 71300,
+
+        /// <summary>
+        /// Simulation Management Parameters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Simulation Management Parameters.")]
+        SimulationManagementParameters = 72000,
+
+        /// <summary>
+        /// Checkpoint Interval.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Checkpoint Interval.")]
+        CheckpointInterval = 72100,
+
+        /// <summary>
+        /// Transmitter Time Threshold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transmitter Time Threshold.")]
+        TransmitterTimeThreshold = 72600,
+
+        /// <summary>
+        /// Receiver Time Threshold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Receiver Time Threshold.")]
+        ReceiverTimeThreshold = 72700,
+
+        /// <summary>
+        /// Interoperability Mode.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Interoperability Mode.")]
+        InteroperabilityMode = 73000,
+
+        /// <summary>
+        /// SIMNET Data Collection.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SIMNET Data Collection.  type: Variable Record.")]
+        SIMNETDataCollection = 74000,
+
+        /// <summary>
+        /// Event ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Event ID.")]
+        EventID = 75000,
+
+        /// <summary>
+        /// Source Site ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Source Site ID.")]
+        SourceSiteID = 75100,
+
+        /// <summary>
+        /// Source Host ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Source Host ID.")]
+        SourceHostID = 75200,
+
+        /// <summary>
+        /// Articulated Parts.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulated Parts.")]
+        ArticulatedParts = 90000,
+
+        /// <summary>
+        /// 90001.  type: 90001.  length: 90001.  units: 90001.  range: 90001.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("90001.  type: 90001.  length: 90001.  units: 90001.  range: 90001.")]
+        _90001 = 90001,
+
+        /// <summary>
+        /// Part ID.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Part ID.")]
+        PartID = 90050,
+
+        /// <summary>
+        /// Index.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Index.")]
+        Index = 90070,
+
+        /// <summary>
+        /// Position.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position.")]
+        Position_90100 = 90100,
+
+        /// <summary>
+        /// Position Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Position Rate.")]
+        PositionRate = 90200,
+
+        /// <summary>
+        /// Extension.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Extension.")]
+        Extension = 90300,
+
+        /// <summary>
+        /// Extension Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Extension Rate.")]
+        ExtensionRate = 90400,
+
+        /// <summary>
+        /// X.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X.")]
+        X_90500 = 90500,
+
+        /// <summary>
+        /// X-rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("X-rate.")]
+        XRate = 90600,
+
+        /// <summary>
+        /// Y.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y.")]
+        Y_90700 = 90700,
+
+        /// <summary>
+        /// Y-rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Y-rate.")]
+        YRate = 90800,
+
+        /// <summary>
+        /// Z.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z.")]
+        Z_90900 = 90900,
+
+        /// <summary>
+        /// Z-rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Z-rate.")]
+        ZRate = 91000,
+
+        /// <summary>
+        /// Azimuth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Azimuth.")]
+        Azimuth_91100 = 91100,
+
+        /// <summary>
+        /// Azimuth Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Azimuth Rate.")]
+        AzimuthRate = 91200,
+
+        /// <summary>
+        /// Elevation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Elevation.")]
+        Elevation = 91300,
+
+        /// <summary>
+        /// Elevation Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Elevation Rate.")]
+        ElevationRate = 91400,
+
+        /// <summary>
+        /// Rotation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rotation.")]
+        Rotation = 91500,
+
+        /// <summary>
+        /// Rotation Rate.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rotation Rate.")]
+        RotationRate = 91600,
+
+        /// <summary>
+        /// DRA Angular X-Velocity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRA Angular X-Velocity.")]
+        DRAAngularXVelocity = 100001,
+
+        /// <summary>
+        /// DRA Angular Y-Velocity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRA Angular Y-Velocity.")]
+        DRAAngularYVelocity = 100002,
+
+        /// <summary>
+        /// DRA Angular Z-Velocity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DRA Angular Z-Velocity.")]
+        DRAAngularZVelocity = 100003,
+
+        /// <summary>
+        /// Appearance, Trailing Effects.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Appearance, Trailing Effects.")]
+        AppearanceTrailingEffects = 100004,
+
+        /// <summary>
+        /// Appearance, Hatch.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Appearance, Hatch.")]
+        AppearanceHatch = 100005,
+
+        /// <summary>
+        /// Appearance, Character Set.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Appearance, Character Set.")]
+        AppearanceCharacterSet = 100008,
+
+        /// <summary>
+        /// Capability, Ammunition Supplier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Capability, Ammunition Supplier.")]
+        CapabilityAmmunitionSupplier = 100010,
+
+        /// <summary>
+        /// Capability, Miscellaneous Supplier.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Capability, Miscellaneous Supplier.")]
+        CapabilityMiscellaneousSupplier = 100011,
+
+        /// <summary>
+        /// Capability, Repair Provider.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Capability, Repair Provider.")]
+        CapabilityRepairProvider = 100012,
+
+        /// <summary>
+        /// Articulation Parameter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulation Parameter.")]
+        ArticulationParameter = 100014,
+
+        /// <summary>
+        /// Articulation Parameter Type.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulation Parameter Type.")]
+        ArticulationParameterType = 100047,
+
+        /// <summary>
+        /// Articulation Parameter Value.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulation Parameter Value.")]
+        ArticulationParameterValue = 100048,
+
+        /// <summary>
+        /// Time of Day-Scene.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time of Day-Scene.")]
+        TimeOfDayScene = 100058,
+
+        /// <summary>
+        /// Latitude-North (Location of weather cell).  type: Unsigned Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Latitude-North (Location of weather cell).  type: Unsigned Integer.")]
+        LatitudeNorthLocationOfWeatherCell = 100061,
+
+        /// <summary>
+        /// Longitude-East (Location of weather cell).  type: Unsigned integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longitude-East (Location of weather cell).  type: Unsigned integer.")]
+        LongitudeEastLocationOfWeatherCell = 100063,
+
+        /// <summary>
+        /// Tactical Driver Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical Driver Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
+        TacticalDriverStatus = 100068,
+
+        /// <summary>
+        /// Sonar System Status.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sonar System Status.")]
+        SonarSystemStatus = 100100,
+
+        /// <summary>
+        /// Upper latitude.  type: float.  length: 32 bits.  units: radians.  range: -pi/2, +p1/2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Upper latitude.  type: float.  length: 32 bits.  units: radians.  range: -pi/2, +p1/2.")]
+        UpperLatitude = 100161,
+
+        /// <summary>
+        /// Latitude-South (Location of weather cell).  type: Unsigned Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Latitude-South (Location of weather cell).  type: Unsigned Integer.")]
+        LatitudeSouthLocationOfWeatherCell = 100162,
+
+        /// <summary>
+        /// Western longitude.  type: float.  length: 32 bits.  units: radians.  range: -pi, +pi.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Western longitude.  type: float.  length: 32 bits.  units: radians.  range: -pi, +pi.")]
+        WesternLongitude = 100163,
+
+        /// <summary>
+        /// Longitude-West (location of weather cell).  type: Unsigned Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longitude-West (location of weather cell).  type: Unsigned Integer.")]
+        LongitudeWestLocationOfWeatherCell = 100164,
+
+        /// <summary>
+        /// Accomplished accept.  type: Boolean.  range: 0 Accept, 1 Non-accept.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Accomplished accept.  type: Boolean.  range: 0 Accept, 1 Non-accept.")]
+        AccomplishedAccept = 100165,
+
+        /// <summary>
+        /// CD ROM Number (Disk ID for terrain).  type: Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CD ROM Number (Disk ID for terrain).  type: Integer.")]
+        CDROMNumberDiskIDForTerrain = 100165,
+
+        /// <summary>
+        /// DTED disk ID.  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DTED disk ID.  type: Unsigned Integer.  length: 32 bits.")]
+        DTEDDiskID = 100166,
+
+        /// <summary>
+        /// Altitude.  type: Floating point.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude.  type: Floating point.")]
+        Altitude_100167 = 100167,
+
+        /// <summary>
+        /// Tactical System Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tactical System Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
+        TacticalSystemStatus = 100169,
+
+        /// <summary>
+        /// JTIDS Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("JTIDS Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
+        JTIDSStatus = 100170,
+
+        /// <summary>
+        /// TADIL-J Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TADIL-J Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
+        TADILJStatus = 100171,
+
+        /// <summary>
+        /// DSDD Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DSDD Status.  type: Unsigned Integer.  range: 0 Operational, 1 Non-operational, 2 Unknown, 3 Not available.")]
+        DSDDStatus = 100172,
+
+        /// <summary>
+        /// Weapon System Status.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon System Status.")]
+        WeaponSystemStatus = 100200,
+
+        /// <summary>
+        /// Subsystem status.  type: Boolean.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Subsystem status.  type: Boolean.  length: 32 bits.")]
+        SubsystemStatus = 100205,
+
+        /// <summary>
+        /// Number of interceptors fired.  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Number of interceptors fired.  type: Unsigned Integer.  length: 32 bits.")]
+        NumberOfInterceptorsFired = 100206,
+
+        /// <summary>
+        /// Number of interceptor detonations.  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Number of interceptor detonations.  type: Unsigned Integer.  length: 32 bits.")]
+        NumberOfInterceptorDetonations = 100207,
+
+        /// <summary>
+        /// Number of message buffers dropped.  type: Unsigned Integer.  length: 32 bits.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Number of message buffers dropped.  type: Unsigned Integer.  length: 32 bits.")]
+        NumberOfMessageBuffersDropped = 100208,
+
+        /// <summary>
+        /// Satellite sensor background (year, day).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: years, Julian days.  range: 1-366.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Satellite sensor background (year, day).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: years, Julian days.  range: 1-366.")]
+        SatelliteSensorBackgroundYearDay = 100213,
+
+        /// <summary>
+        /// Satellite sensor background (hour, minute).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: hours, minutes.  range: 0-23,0-59.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Satellite sensor background (hour, minute).  type: Unsigned Integer, Unsigned Integer.  length: 16 bits, 16 bits.  units: hours, minutes.  range: 0-23,0-59.")]
+        SatelliteSensorBackgroundHourMinute = 100214,
+
+        /// <summary>
+        /// Script Number.  type: Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Script Number.  type: Integer.  length: 32.")]
+        ScriptNumber = 100218,
+
+        /// <summary>
+        /// Entity/Track/Update Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity/Track/Update Data.")]
+        EntityTrackUpdateData = 100300,
+
+        /// <summary>
+        /// Local/Force Training.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Local/Force Training.")]
+        LocalForceTraining = 100400,
+
+        /// <summary>
+        /// Entity/Track Identity Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity/Track Identity Data.")]
+        EntityTrackIdentityData = 100500,
+
+        /// <summary>
+        /// Entity for Track Event.  type: Variable.  length: 48.  range: Entity being tracked.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity for Track Event.  type: Variable.  length: 48.  range: Entity being tracked.")]
+        EntityForTrackEvent = 100510,
+
+        /// <summary>
+        /// IFF (Friend-Foe) status.  type: Unsigned Integer.  length: 32.  range: 0 Unidentified / Unknown, 1 Perceived Friendly, 2 Perceived Hostile.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("IFF (Friend-Foe) status.  type: Unsigned Integer.  length: 32.  range: 0 Unidentified / Unknown, 1 Perceived Friendly, 2 Perceived Hostile.")]
+        IFFFriendFoeStatus = 100520,
+
+        /// <summary>
+        /// Engagement Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Engagement Data.")]
+        EngagementData = 100600,
+
+        /// <summary>
+        /// Target Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Target Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
+        TargetLatitude = 100610,
+
+        /// <summary>
+        /// Target Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Target Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
+        TargetLongitude = 100620,
+
+        /// <summary>
+        /// Area of Interest (Ground Impact Circle) Center Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Area of Interest (Ground Impact Circle) Center Latitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
+        AreaOfInterestGroundImpactCircleCenterLatitude = 100631,
+
+        /// <summary>
+        /// Area of Interest (Ground Impact Circle) Center Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Area of Interest (Ground Impact Circle) Center Longitude.  type: Integer.  length: 32.  units: (10000th) Degrees.")]
+        AreaOfInterestGroundImpactCircleCenterLongitude = 100632,
+
+        /// <summary>
+        /// Area of Interest (Ground Impact Circle) Radius.  type: Unsigned Integer.  length: 32.  units: Meters.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Area of Interest (Ground Impact Circle) Radius.  type: Unsigned Integer.  length: 32.  units: Meters.")]
+        AreaOfInterestGroundImpactCircleRadius = 100633,
+
+        /// <summary>
+        /// Area of Interest Type.  type: Unsigned Integer.  length: 32.  range: 0 Unspecified, 1 TBM Defense.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Area of Interest Type.  type: Unsigned Integer.  length: 32.  range: 0 Unspecified, 1 TBM Defense.")]
+        AreaOfInterestType = 100634,
+
+        /// <summary>
+        /// Target Aggregate ID.  type: Variable.  length: 48.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Target Aggregate ID.  type: Variable.  length: 48.")]
+        TargetAggregateID = 100640,
+
+        /// <summary>
+        /// GIC Identification Number.  type: Unsigned Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GIC Identification Number.  type: Unsigned Integer.  length: 32.")]
+        GICIdentificationNumber = 100650,
+
+        /// <summary>
+        /// Estimated Time of Flight to TBM Impact.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Estimated Time of Flight to TBM Impact.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.")]
+        EstimatedTimeOfFlightToTBMImpact = 100660,
+
+        /// <summary>
+        /// Estimated Intercept Time.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Estimated Intercept Time.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.")]
+        EstimatedInterceptTime = 100661,
+
+        /// <summary>
+        /// Estimated Time of Flight to Next Waypoint.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Estimated Time of Flight to Next Waypoint.  type: Floating Point.  length: 32.  range: Seconds from time in PDU header.")]
+        EstimatedTimeOfFlightToNextWaypoint = 100662,
+
+        /// <summary>
+        /// Entity/Track Equipment Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity/Track Equipment Data.")]
+        EntityTrackEquipmentData = 100700,
+
+        /// <summary>
+        /// Emission/EW Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Emission/EW Data.")]
+        EmissionEWData = 100800,
+
+        /// <summary>
+        /// Appearance Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Appearance Data.")]
+        AppearanceData = 100900,
+
+        /// <summary>
+        /// Command/Order Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command/Order Data.")]
+        CommandOrderData = 101000,
+
+        /// <summary>
+        /// Environmental Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environmental Data.")]
+        EnvironmentalData = 101100,
+
+        /// <summary>
+        /// Significant Event Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Significant Event Data.")]
+        SignificantEventData = 101200,
+
+        /// <summary>
+        /// Operator Action Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Operator Action Data.")]
+        OperatorActionData = 101300,
+
+        /// <summary>
+        /// ADA Engagement Mode.  type: Unsigned Integer.  length: 32.  range: 0 Air, 1 ATBM.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ADA Engagement Mode.  type: Unsigned Integer.  length: 32.  range: 0 Air, 1 ATBM.")]
+        ADAEngagementMode = 101310,
+
+        /// <summary>
+        /// ADA Shooting Status.  type: Unsigned Integer.  length: 32.  range: 0 Can not engage, 1 Can engage,.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ADA Shooting Status.  type: Unsigned Integer.  length: 32.  range: 0 Can not engage, 1 Can engage,.")]
+        ADAShootingStatus = 101320,
+
+        /// <summary>
+        /// ADA Mode.  type: Unsigned Integer.  length: 32.  range: 0 Shut down, 1 Active.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ADA Mode.  type: Unsigned Integer.  length: 32.  range: 0 Shut down, 1 Active.")]
+        ADAMode = 101321,
+
+        /// <summary>
+        /// ADA Radar Status.  type: Unsigned Integer.  length: 32.  range: 0 Off, 1 On, 2 Momentary On.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ADA Radar Status.  type: Unsigned Integer.  length: 32.  range: 0 Off, 1 On, 2 Momentary On.")]
+        ADARadarStatus = 101330,
+
+        /// <summary>
+        /// Shoot Command.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, Greater than 0 Number of Shots to take.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Shoot Command.  type: Unsigned Integer.  length: 32.  range: 0 Undefined, Greater than 0 Number of Shots to take.")]
+        ShootCommand = 101340,
+
+        /// <summary>
+        /// ADA Weapon Status.  type: Unsigned Integer.  length: 32.  range: 0 None, 1 Free, 2 Tight, 3 Hold.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ADA Weapon Status.  type: Unsigned Integer.  length: 32.  range: 0 None, 1 Free, 2 Tight, 3 Hold.")]
+        ADAWeaponStatus = 101350,
+
+        /// <summary>
+        /// ADA Firing Disciple.  type: Unsigned Integer.  length: 32.  range: 0 SLS_ABT, 1 Shoot 2_ABT, 2 Lash Mode, 3 SLS_TM, 4 Shoot2_TM, 5 Default.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ADA Firing Disciple.  type: Unsigned Integer.  length: 32.  range: 0 SLS_ABT, 1 Shoot 2_ABT, 2 Lash Mode, 3 SLS_TM, 4 Shoot2_TM, 5 Default.")]
+        ADAFiringDisciple = 101360,
+
+        /// <summary>
+        /// Order Status.  type: Unsigned Integer.  length: 32.  range: 0 Cancel Engagement, 1 Engage Assignment.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Order Status.  type: Unsigned Integer.  length: 32.  range: 0 Cancel Engagement, 1 Engage Assignment.")]
+        OrderStatus = 101370,
+
+        /// <summary>
+        /// Time Synchronization.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Synchronization.")]
+        TimeSynchronization = 101400,
+
+        /// <summary>
+        /// Tomahawk Data.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tomahawk Data.")]
+        TomahawkData = 101500,
+
+        /// <summary>
+        /// Number of Detonations.  type: Unsigned Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Number of Detonations.  type: Unsigned Integer.")]
+        NumberOfDetonations = 102100,
+
+        /// <summary>
+        /// Number of Intercepts.  type: Unsigned Integer.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Number of Intercepts.  type: Unsigned Integer.")]
+        NumberOfIntercepts = 102200,
+
+        /// <summary>
+        /// OBT Control MT-201.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OBT Control MT-201.  type: Variable Record.  length: 64.")]
+        OBTControlMT201 = 200201,
+
+        /// <summary>
+        /// Sensor Data MT-202.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sensor Data MT-202.  type: Variable Record.  length: 64.")]
+        SensorDataMT202 = 200202,
+
+        /// <summary>
+        /// Environmental Data MT-203.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environmental Data MT-203.  type: Variable Record.  length: 64.")]
+        EnvironmentalDataMT203 = 200203,
+
+        /// <summary>
+        /// Ownship Data MT-204.  type: Variable Record.  length: 128.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ownship Data MT-204.  type: Variable Record.  length: 128.")]
+        OwnshipDataMT204 = 200204,
+
+        /// <summary>
+        /// Acoustic Contact Data MT-205.  type: Variable Record.  length: 288.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acoustic Contact Data MT-205.  type: Variable Record.  length: 288.")]
+        AcousticContactDataMT205 = 200205,
+
+        /// <summary>
+        /// Sonobuoy Data MT-207.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sonobuoy Data MT-207.  type: Variable Record.  length: 64.")]
+        SonobuoyDataMT207 = 200207,
+
+        /// <summary>
+        /// Sonobuoy Contact Data MT-210.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sonobuoy Contact Data MT-210.  type: Variable Record.  length: 64.")]
+        SonobuoyContactDataMT210 = 200210,
+
+        /// <summary>
+        /// Helo Control MT-211.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Helo Control MT-211.  type: Variable Record.  length: 64.")]
+        HeloControlMT211 = 200211,
+
+        /// <summary>
+        /// ESM Control Data.  type: Variable Record.  length: 96.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ESM Control Data.  type: Variable Record.  length: 96.")]
+        ESMControlData = 200213,
+
+        /// <summary>
+        /// ESM Contact Data MT-214.  type: Variable Record.  length: 192.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ESM Contact Data MT-214.  type: Variable Record.  length: 192.")]
+        ESMContactDataMT214 = 200214,
+
+        /// <summary>
+        /// ESM Emitter Data MT-215.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ESM Emitter Data MT-215.  type: Variable Record.  length: 64.")]
+        ESMEmitterDataMT215 = 200215,
+
+        /// <summary>
+        /// Weapon Definition Data MT-217.  type: Variable Record.  length: 224.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon Definition Data MT-217.  type: Variable Record.  length: 224.")]
+        WeaponDefinitionDataMT217 = 200216,
+
+        /// <summary>
+        /// Weapon Preset Data MT-217.  type: Variable Record.  length: 256.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon Preset Data MT-217.  type: Variable Record.  length: 256.")]
+        WeaponPresetDataMT217 = 200217,
+
+        /// <summary>
+        /// OBT Control MT-301.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("OBT Control MT-301.  type: Variable Record.  length: 64.")]
+        OBTControlMT301 = 200301,
+
+        /// <summary>
+        /// Sensor Data MT-302.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sensor Data MT-302.  type: Variable Record.  length: 64.")]
+        SensorDataMT302 = 200302,
+
+        /// <summary>
+        /// Environmental Data MT-303m.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environmental Data MT-303m.  type: Variable Record.  length: 64.")]
+        EnvironmentalDataMT303m = 200303,
+
+        /// <summary>
+        /// Ownship Data MT-304.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ownship Data MT-304.  type: Variable Record.  length: 64.")]
+        OwnshipDataMT304 = 200304,
+
+        /// <summary>
+        /// Acoustic Contact Data MT-305.  type: Variable Record.  length: 288.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acoustic Contact Data MT-305.  type: Variable Record.  length: 288.")]
+        AcousticContactDataMT305 = 200305,
+
+        /// <summary>
+        /// Sonobuoy Data MT-307.  type: Variable Record.  length: 128.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sonobuoy Data MT-307.  type: Variable Record.  length: 128.")]
+        SonobuoyDataMT307 = 200307,
+
+        /// <summary>
+        /// Sonobuoy Contact Data MT-310.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sonobuoy Contact Data MT-310.  type: Variable Record.  length: 64.")]
+        SonobuoyContactDataMT310 = 200310,
+
+        /// <summary>
+        /// Helo Scenario / Equipment Status.  type: Variable Record.  length: 224.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Helo Scenario / Equipment Status.  type: Variable Record.  length: 224.")]
+        HeloScenarioEquipmentStatus = 200311,
+
+        /// <summary>
+        /// ESM Control Data MT-313.  type: Variable Record.  length: 96.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ESM Control Data MT-313.  type: Variable Record.  length: 96.")]
+        ESMControlDataMT313 = 200313,
+
+        /// <summary>
+        /// ESM Contact Data MT-314.  type: Variable Record.  length: 192.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ESM Contact Data MT-314.  type: Variable Record.  length: 192.")]
+        ESMContactDataMT314 = 200314,
+
+        /// <summary>
+        /// ESM Emitter Data MT-315.  type: Variable Record.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ESM Emitter Data MT-315.  type: Variable Record.  length: 64.")]
+        ESMEmitterDataMT315 = 200315,
+
+        /// <summary>
+        /// Weapon Definition Data MT-316.  type: Variable Record.  length: 256.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon Definition Data MT-316.  type: Variable Record.  length: 256.")]
+        WeaponDefinitionDataMT316 = 200316,
+
+        /// <summary>
+        /// Weapon Preset Data MT-317.  type: Variable Record.  length: 256.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon Preset Data MT-317.  type: Variable Record.  length: 256.")]
+        WeaponPresetDataMT317 = 200317,
+
+        /// <summary>
+        /// Pairing/Association (eMT-56).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pairing/Association (eMT-56).  type: Variable Record.")]
+        PairingAssociationEMT56 = 200400,
+
+        /// <summary>
+        /// Pointer (eMT-57).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pointer (eMT-57).  type: Variable Record.")]
+        PointerEMT57 = 200401,
+
+        /// <summary>
+        /// Reporting Responsibility (eMT-58).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Reporting Responsibility (eMT-58).  type: Variable Record.")]
+        ReportingResponsibilityEMT58 = 200402,
+
+        /// <summary>
+        /// Track Number (eMT-59).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Track Number (eMT-59).  type: Variable Record.")]
+        TrackNumberEMT59 = 200403,
+
+        /// <summary>
+        /// ID for Link-11 Reporting (eMT-60).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ID for Link-11 Reporting (eMT-60).  type: Variable Record.")]
+        IDForLink11ReportingEMT60 = 200404,
+
+        /// <summary>
+        /// Remote Track (eMT-62).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Remote Track (eMT-62).  type: Variable Record.")]
+        RemoteTrackEMT62 = 200405,
+
+        /// <summary>
+        /// Link-11 Error Rate (eMT-63).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link-11 Error Rate (eMT-63).  type: Variable Record.")]
+        Link11ErrorRateEMT63 = 200406,
+
+        /// <summary>
+        /// Track Quality (eMT-64).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Track Quality (eMT-64).  type: Variable Record.")]
+        TrackQualityEMT64 = 200407,
+
+        /// <summary>
+        /// Gridlock (eMT-65).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Gridlock (eMT-65).  type: Variable Record.")]
+        GridlockEMT65 = 200408,
+
+        /// <summary>
+        /// Kill (eMT-66).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kill (eMT-66).  type: Variable Record.")]
+        KillEMT66 = 200409,
+
+        /// <summary>
+        /// Track ID Change / Resolution (eMT-68).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Track ID Change / Resolution (eMT-68).  type: Variable Record.")]
+        TrackIDChangeResolutionEMT68 = 200410,
+
+        /// <summary>
+        /// Weapons Status (eMT-69).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapons Status (eMT-69).  type: Variable Record.")]
+        WeaponsStatusEMT69 = 200411,
+
+        /// <summary>
+        /// Link-11 Operator (eMT-70).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link-11 Operator (eMT-70).  type: Variable Record.")]
+        Link11OperatorEMT70 = 200412,
+
+        /// <summary>
+        /// Force Training Transmit (eMT-71).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Force Training Transmit (eMT-71).  type: Variable Record.")]
+        ForceTrainingTransmitEMT71 = 200413,
+
+        /// <summary>
+        /// Force Training Receive (eMT-72).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Force Training Receive (eMT-72).  type: Variable Record.")]
+        ForceTrainingReceiveEMT72 = 200414,
+
+        /// <summary>
+        /// Interceptor Amplification (eMT-75).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Interceptor Amplification (eMT-75).  type: Variable Record.")]
+        InterceptorAmplificationEMT75 = 200415,
+
+        /// <summary>
+        /// Consumables (eMT-78).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Consumables (eMT-78).  type: Variable Record.")]
+        ConsumablesEMT78 = 200416,
+
+        /// <summary>
+        /// Link-11 Local Track Quality (eMT-95).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link-11 Local Track Quality (eMT-95).  type: Variable Record.")]
+        Link11LocalTrackQualityEMT95 = 200417,
+
+        /// <summary>
+        /// DLRP (eMT-19).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DLRP (eMT-19).  type: Variable Record.")]
+        DLRPEMT19 = 200418,
+
+        /// <summary>
+        /// Force Order (eMT-52).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Force Order (eMT-52).  type: Variable Record.")]
+        ForceOrderEMT52 = 200419,
+
+        /// <summary>
+        /// Wilco / Cantco (eMT-53).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wilco / Cantco (eMT-53).  type: Variable Record.")]
+        WilcoCantcoEMT53 = 200420,
+
+        /// <summary>
+        /// EMC Bearing (eMT-54).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("EMC Bearing (eMT-54).  type: Variable Record.")]
+        EMCBearingEMT54 = 200421,
+
+        /// <summary>
+        /// Change Track Eligibility (eMT-55).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Change Track Eligibility (eMT-55).  type: Variable Record.")]
+        ChangeTrackEligibilityEMT55 = 200422,
+
+        /// <summary>
+        /// Land Mass Reference Point.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Land Mass Reference Point.  type: Variable Record.")]
+        LandMassReferencePoint = 200423,
+
+        /// <summary>
+        /// System Reference Point.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("System Reference Point.  type: Variable Record.")]
+        SystemReferencePoint = 200424,
+
+        /// <summary>
+        /// PU Amplification.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PU Amplification.  type: Variable Record.")]
+        PUAmplification = 200425,
+
+        /// <summary>
+        /// Set/Drift.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Set/Drift.  type: Variable Record.")]
+        SetDrift = 200426,
+
+        /// <summary>
+        /// Begin Initialization (MT-1).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Begin Initialization (MT-1).  type: Variable Record.")]
+        BeginInitializationMT1 = 200427,
+
+        /// <summary>
+        /// Status and Control (MT-3).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Status and Control (MT-3).  type: Variable Record.")]
+        StatusAndControlMT3 = 200428,
+
+        /// <summary>
+        /// Scintillation Change (MT-39).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scintillation Change (MT-39).  type: Variable Record.")]
+        ScintillationChangeMT39 = 200429,
+
+        /// <summary>
+        /// Link 11 ID Control (MT-61).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link 11 ID Control (MT-61).  type: Variable Record.")]
+        Link11IDControlMT61 = 200430,
+
+        /// <summary>
+        /// PU Guard List.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PU Guard List.  type: Variable Record.")]
+        PUGuardList = 200431,
+
+        /// <summary>
+        /// Winds Aloft (MT-14).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Winds Aloft (MT-14).  type: Variable Record.")]
+        WindsAloftMT14 = 200432,
+
+        /// <summary>
+        /// Surface Winds (MT-15).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Surface Winds (MT-15).  type: Variable Record.")]
+        SurfaceWindsMT15 = 200433,
+
+        /// <summary>
+        /// Sea State (MT-17).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sea State (MT-17).  type: Variable Record.")]
+        SeaStateMT17 = 200434,
+
+        /// <summary>
+        /// Magnetic Variation (MT-37).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Magnetic Variation (MT-37).  type: Variable Record.")]
+        MagneticVariationMT37 = 200435,
+
+        /// <summary>
+        /// Track Eligibility (MT-29).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Track Eligibility (MT-29).  type: Variable Record.")]
+        TrackEligibilityMT29 = 200436,
+
+        /// <summary>
+        /// Training Track Notification.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Training Track Notification.  type: Variable Record.")]
+        TrainingTrackNotification = 200437,
+
+        /// <summary>
+        /// Tacan Data (MT-32).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tacan Data (MT-32).  type: Variable Record.")]
+        TacanDataMT32 = 200501,
+
+        /// <summary>
+        /// Interceptor Amplification (MT-75).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Interceptor Amplification (MT-75).  type: Variable Record.")]
+        InterceptorAmplificationMT75 = 200502,
+
+        /// <summary>
+        /// Tacan Assignment (MT-76).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Tacan Assignment (MT-76).  type: Variable Record.")]
+        TacanAssignmentMT76 = 200503,
+
+        /// <summary>
+        /// Autopilot Status (MT-77).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Autopilot Status (MT-77).  type: Variable Record.")]
+        AutopilotStatusMT77 = 200504,
+
+        /// <summary>
+        /// Consumables (MT-78).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Consumables (MT-78).  type: Variable Record.")]
+        ConsumablesMT78 = 200505,
+
+        /// <summary>
+        /// Downlink (MT-79).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Downlink (MT-79).  type: Variable Record.")]
+        DownlinkMT79 = 200506,
+
+        /// <summary>
+        /// TIN Report (MT-80).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TIN Report (MT-80).  type: Variable Record.")]
+        TINReportMT80 = 200507,
+
+        /// <summary>
+        /// Special Point Control (MT-81).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Special Point Control (MT-81).  type: Variable Record.")]
+        SpecialPointControlMT81 = 200508,
+
+        /// <summary>
+        /// Control Discretes (MT-82).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Control Discretes (MT-82).  type: Variable Record.")]
+        ControlDiscretesMT82 = 200509,
+
+        /// <summary>
+        /// Request Target Discretes(MT-83).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Request Target Discretes(MT-83).  type: Variable Record.")]
+        RequestTargetDiscretesMT83 = 200510,
+
+        /// <summary>
+        /// Target Discretes (MT-84).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Target Discretes (MT-84).  type: Variable Record.")]
+        TargetDiscretesMT84 = 200511,
+
+        /// <summary>
+        /// Reply Discretes (MT-85).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Reply Discretes (MT-85).  type: Variable Record.")]
+        ReplyDiscretesMT85 = 200512,
+
+        /// <summary>
+        /// Command Maneuvers (MT-86).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command Maneuvers (MT-86).  type: Variable Record.")]
+        CommandManeuversMT86 = 200513,
+
+        /// <summary>
+        /// Target Data (MT-87).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Target Data (MT-87).  type: Variable Record.")]
+        TargetDataMT87 = 200514,
+
+        /// <summary>
+        /// Target Pointer (MT-88).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Target Pointer (MT-88).  type: Variable Record.")]
+        TargetPointerMT88 = 200515,
+
+        /// <summary>
+        /// Intercept Data (MT-89).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intercept Data (MT-89).  type: Variable Record.")]
+        InterceptDataMT89 = 200516,
+
+        /// <summary>
+        /// Decrement Missile Inventory (MT-90).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Decrement Missile Inventory (MT-90).  type: Variable Record.")]
+        DecrementMissileInventoryMT90 = 200517,
+
+        /// <summary>
+        /// Link-4A Alert (MT-91).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Link-4A Alert (MT-91).  type: Variable Record.")]
+        Link4AAlertMT91 = 200518,
+
+        /// <summary>
+        /// Strike Control (MT-92).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strike Control (MT-92).  type: Variable Record.")]
+        StrikeControlMT92 = 200519,
+
+        /// <summary>
+        /// Speed Change (MT-25).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Speed Change (MT-25).  type: Variable Record.")]
+        SpeedChangeMT25 = 200521,
+
+        /// <summary>
+        /// Course Change (MT-26).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Course Change (MT-26).  type: Variable Record.")]
+        CourseChangeMT26 = 200522,
+
+        /// <summary>
+        /// Altitude Change (MT-27).  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude Change (MT-27).  type: Variable Record.")]
+        AltitudeChangeMT27 = 200523,
+
+        /// <summary>
+        /// ACLS AN/SPN-46 Status.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ACLS AN/SPN-46 Status.  type: Variable Record.")]
+        ACLSANSPN46Status = 200524,
+
+        /// <summary>
+        /// ACLS Aircraft Report.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("ACLS Aircraft Report.  type: Variable Record.")]
+        ACLSAircraftReport = 200525,
+
+        /// <summary>
+        /// SPS-67 Radar Operator Functions.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS-67 Radar Operator Functions.  type: Variable Record.")]
+        SPS67RadarOperatorFunctions = 200600,
+
+        /// <summary>
+        /// SPS-55 Radar Operator Functions.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS-55 Radar Operator Functions.  type: Variable Record.")]
+        SPS55RadarOperatorFunctions = 200601,
+
+        /// <summary>
+        /// SPQ-9A Radar Operator Functions.  length: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPQ-9A Radar Operator Functions.  length: Variable Record.")]
+        SPQ9ARadarOperatorFunctions = 200602,
+
+        /// <summary>
+        /// SPS-49 Radar Operator Functions.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS-49 Radar Operator Functions.  type: Variable Record.")]
+        SPS49RadarOperatorFunctions = 200603,
+
+        /// <summary>
+        /// MK-23 Radar Operator Functions.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK-23 Radar Operator Functions.  type: Variable Record.")]
+        MK23RadarOperatorFunctions = 200604,
+
+        /// <summary>
+        /// SPS-48 Radar Operator Functions.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS-48 Radar Operator Functions.  type: Variable Record.")]
+        SPS48RadarOperatorFunctions = 200605,
+
+        /// <summary>
+        /// SPS-40 Radar Operator Functions.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("SPS-40 Radar Operator Functions.  type: Variable Record.")]
+        SPS40RadarOperatorFunctions = 200606,
+
+        /// <summary>
+        /// MK-95 Radar Operator Functions.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("MK-95 Radar Operator Functions.  type: Variable Record.")]
+        MK95RadarOperatorFunctions = 200607,
+
+        /// <summary>
+        /// Kill/No Kill.  type: Unsigned Integer.  length: 32.  range: 0 No kill, 1 Kill.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kill/No Kill.  type: Unsigned Integer.  length: 32.  range: 0 No kill, 1 Kill.")]
+        KillNoKill = 200608,
+
+        /// <summary>
+        /// CMT pc.  type: Unsigned Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CMT pc.  type: Unsigned Integer.  length: 32.")]
+        CMTPc = 200609,
+
+        /// <summary>
+        /// CMC4AirGlobalData.  type: Variable Recoed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CMC4AirGlobalData.  type: Variable Recoed.")]
+        CMC4AirGlobalData = 200610,
+
+        /// <summary>
+        /// CMC4GlobalData.  type: Variable Record.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CMC4GlobalData.  type: Variable Record.")]
+        CMC4GlobalData = 200611,
+
+        /// <summary>
+        /// LINKSIM_COMMENT_PDU.  type: Integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("LINKSIM_COMMENT_PDU.  type: Integer.  length: 32.")]
+        LINKSIMCOMMENTPDU = 200612,
+
+        /// <summary>
+        /// NSST Ownship Control.  type: Integer.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("NSST Ownship Control.  type: Integer.  length: 64.")]
+        NSSTOwnshipControl = 200613,
+
+        /// <summary>
+        /// Other.  type: Integer.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.  type: Integer.  length: 00.")]
+        Other = 240000,
+
+        /// <summary>
+        /// Mass Of The Vehicle.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mass Of The Vehicle.  type: real.  length: 32.")]
+        MassOfTheVehicle = 240001,
+
+        /// <summary>
+        /// Force ID.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Force ID.  type: Integer.  length: 8.")]
+        ForceID_240002 = 240002,
+
+        /// <summary>
+        /// Entity Type Kind.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type Kind.  type: Integer.  length: 8.")]
+        EntityTypeKind = 240003,
+
+        /// <summary>
+        /// Entity Type Domain.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type Domain.  type: Integer.  length: 8.")]
+        EntityTypeDomain = 240004,
+
+        /// <summary>
+        /// Entity Type Country.  type: Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type Country.  type: Integer.  length: 16.")]
+        EntityTypeCountry = 240005,
+
+        /// <summary>
+        /// Entity Type Category.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type Category.  type: Integer.  length: 8.")]
+        EntityTypeCategory = 240006,
+
+        /// <summary>
+        /// Entity Type Sub Category.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type Sub Category.  type: Integer.  length: 8.")]
+        EntityTypeSubCategory = 240007,
+
+        /// <summary>
+        /// Entity Type Specific.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type Specific.  type: Integer.  length: 8.")]
+        EntityTypeSpecific = 240008,
+
+        /// <summary>
+        /// Entity Type Extra.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type Extra.  type: Integer.  length: 8.")]
+        EntityTypeExtra = 240009,
+
+        /// <summary>
+        /// Alternative Entity Type Kind.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type Kind.  type: Integer.  length: 8.")]
+        AlternativeEntityTypeKind = 240010,
+
+        /// <summary>
+        /// Alternative Entity Type Domain.  type: Integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type Domain.  type: Integer.  length: 8.")]
+        AlternativeEntityTypeDomain = 240011,
+
+        /// <summary>
+        /// Alternative Entity Type Country.  type: Integer.  length: 16.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type Country.  type: Integer.  length: 16.")]
+        AlternativeEntityTypeCountry = 240012,
+
+        /// <summary>
+        /// Alternative Entity Type Category.  type: integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type Category.  type: integer.  length: 8.")]
+        AlternativeEntityTypeCategory = 240013,
+
+        /// <summary>
+        /// Alternative Entity Type Sub Category.  type: integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type Sub Category.  type: integer.  length: 8.")]
+        AlternativeEntityTypeSubCategory = 240014,
+
+        /// <summary>
+        /// Alternative Entity Type Specific.  type: integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type Specific.  type: integer.  length: 8.")]
+        AlternativeEntityTypeSpecific = 240015,
+
+        /// <summary>
+        /// Alternative Entity Type Extra.  type: integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type Extra.  type: integer.  length: 8.")]
+        AlternativeEntityTypeExtra = 240016,
+
+        /// <summary>
+        /// Entity Location X.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Location X.  type: real.  length: 64.")]
+        EntityLocationX = 240017,
+
+        /// <summary>
+        /// Entity Location Y.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Location Y.  type: real.  length: 64.")]
+        EntityLocationY = 240018,
+
+        /// <summary>
+        /// Entity Location Z.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Location Z.  type: real.  length: 64.")]
+        EntityLocationZ = 240019,
+
+        /// <summary>
+        /// Entity Linear Velocity X.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Linear Velocity X.  type: real.  length: 32.")]
+        EntityLinearVelocityX = 240020,
+
+        /// <summary>
+        /// Entity Linear Velocity Y.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Linear Velocity Y.  type: real.  length: 32.")]
+        EntityLinearVelocityY = 240021,
+
+        /// <summary>
+        /// Entity Linear Velocity Z.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Linear Velocity Z.  type: real.  length: 32.")]
+        EntityLinearVelocityZ = 240022,
+
+        /// <summary>
+        /// Entity Orientation Psi.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Orientation Psi.  type: real.  length: 32.")]
+        EntityOrientationPsi = 240023,
+
+        /// <summary>
+        /// Entity Orientation Theta.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Orientation Theta.  type: real.  length: 32.")]
+        EntityOrientationTheta = 240024,
+
+        /// <summary>
+        /// Entity Orientation Phi.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Orientation Phi.  type: real.  length: 32.")]
+        EntityOrientationPhi = 240025,
+
+        /// <summary>
+        /// Dead Reckoning Algorithm.  type: integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Algorithm.  type: integer.  length: 8.")]
+        DeadReckoningAlgorithm = 240026,
+
+        /// <summary>
+        /// Dead Reckoning Linear Acceleration X.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Linear Acceleration X.  type: real.  length: 32.")]
+        DeadReckoningLinearAccelerationX = 240027,
+
+        /// <summary>
+        /// Dead Reckoning Linear Acceleration Y.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Linear Acceleration Y.  type: real.  length: 32.")]
+        DeadReckoningLinearAccelerationY = 240028,
+
+        /// <summary>
+        /// Dead Reckoning Linear Acceleration Z.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Linear Acceleration Z.  type: real.  length: 32.")]
+        DeadReckoningLinearAccelerationZ = 240029,
+
+        /// <summary>
+        /// Dead Reckoning Angular Velocity X.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Angular Velocity X.  type: real.  length: 32.")]
+        DeadReckoningAngularVelocityX = 240030,
+
+        /// <summary>
+        /// Dead Reckoning Angular Velocity Y.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Angular Velocity Y.  type: real.  length: 32.")]
+        DeadReckoningAngularVelocityY = 240031,
+
+        /// <summary>
+        /// Dead Reckoning Angular Velocity Z.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning Angular Velocity Z.  type: real.  length: 32.")]
+        DeadReckoningAngularVelocityZ = 240032,
+
+        /// <summary>
+        /// Entity Appearance.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Appearance.  type: integer.  length: 32.")]
+        EntityAppearance = 240033,
+
+        /// <summary>
+        /// Entity Marking Character Set.  type: integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Marking Character Set.  type: integer.  length: 8.")]
+        EntityMarkingCharacterSet = 240034,
+
+        /// <summary>
+        /// Entity Marking 11 Bytes.  type: character.  length: 88.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Marking 11 Bytes.  type: character.  length: 88.")]
+        EntityMarking11Bytes = 240035,
+
+        /// <summary>
+        /// Capability.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Capability.  type: integer.  length: 32.")]
+        Capability = 240036,
+
+        /// <summary>
+        /// Number Articulation Parameters.  type: integer.  length: 8.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Number Articulation Parameters.  type: integer.  length: 8.")]
+        NumberArticulationParameters = 240037,
+
+        /// <summary>
+        /// Articulation Parameter ID.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulation Parameter ID.  type: integer.  length: 32.")]
+        ArticulationParameterID = 240038,
+
+        /// <summary>
+        /// Articulation Parameter Type.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulation Parameter Type.  type: integer.  length: 32.")]
+        ArticulationParameterType_240039 = 240039,
+
+        /// <summary>
+        /// Articulation Parameter Value.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Articulation Parameter Value.  type: real.  length: 64.")]
+        ArticulationParameterValue_240040 = 240040,
+
+        /// <summary>
+        /// Type Of Stores.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type Of Stores.  type: integer.  length: 32.")]
+        TypeOfStores = 240041,
+
+        /// <summary>
+        /// Quantity Of Stores.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Quantity Of Stores.  type: integer.  length: 32.")]
+        QuantityOfStores = 240042,
+
+        /// <summary>
+        /// Fuel Quantity.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuel Quantity.  type: real.  length: 32.")]
+        FuelQuantity = 240043,
+
+        /// <summary>
+        /// Radar System Status.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radar System Status.  type: integer.  length: 32.")]
+        RadarSystemStatus = 240044,
+
+        /// <summary>
+        /// Radio Communication System Status.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radio Communication System Status.  type: integer.  length: 32.")]
+        RadioCommunicationSystemStatus = 240045,
+
+        /// <summary>
+        /// Default Time For Radio Transmission For Stationary Transmitters.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Default Time For Radio Transmission For Stationary Transmitters.  type: integer.  length: 32.")]
+        DefaultTimeForRadioTransmissionForStationaryTransmitters = 240046,
+
+        /// <summary>
+        /// Default Time For Radio Transmission For Moving Transmitters.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Default Time For Radio Transmission For Moving Transmitters.  type: integer.  length: 32.")]
+        DefaultTimeForRadioTransmissionForMovingTransmitters = 240047,
+
+        /// <summary>
+        /// Body Part Damaged Ratio.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Body Part Damaged Ratio.  type: real.  length: 32.")]
+        BodyPartDamagedRatio = 240048,
+
+        /// <summary>
+        /// Name Of The Terrain Database File.  type: character.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Name Of The Terrain Database File.  type: character.  length: 00.")]
+        NameOfTheTerrainDatabaseFile = 240049,
+
+        /// <summary>
+        /// Name Of Local File.  type: character.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Name Of Local File.  type: character.  length: 00.")]
+        NameOfLocalFile = 240050,
+
+        /// <summary>
+        /// Aimpoint Bearing.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aimpoint Bearing.  type: real.  length: 32.")]
+        AimpointBearing = 240051,
+
+        /// <summary>
+        /// Aimpoint Elevation.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aimpoint Elevation.  type: real.  length: 32.")]
+        AimpointElevation = 240052,
+
+        /// <summary>
+        /// Aimpoint Range.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aimpoint Range.  type: real.  length: 32.")]
+        AimpointRange = 240053,
+
+        /// <summary>
+        /// Air Speed.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Speed.  type: real.  length: 32.")]
+        AirSpeed = 240054,
+
+        /// <summary>
+        /// Altitude.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude.  type: real.  length: 32.")]
+        Altitude_240055 = 240055,
+
+        /// <summary>
+        /// Application Status.  type: structure.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Application Status.  type: structure.  length: 32.")]
+        ApplicationStatus = 240056,
+
+        /// <summary>
+        /// Auto Iff.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Auto Iff.  type: integer.  length: 32.")]
+        AutoIff = 240057,
+
+        /// <summary>
+        /// Beacon Delay.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Beacon Delay.  type: real.  length: 32.")]
+        BeaconDelay = 240058,
+
+        /// <summary>
+        /// Bingo Fuel Setting.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Bingo Fuel Setting.  type: real.  length: 32.")]
+        BingoFuelSetting = 240059,
+
+        /// <summary>
+        /// Cloud Bottom.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cloud Bottom.  type: real.  length: 32.")]
+        CloudBottom = 240060,
+
+        /// <summary>
+        /// Cloud Top.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cloud Top.  type: real.  length: 32.")]
+        CloudTop = 240061,
+
+        /// <summary>
+        /// Direction.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Direction.  type: real.  length: 32.")]
+        Direction = 240062,
+
+        /// <summary>
+        /// End Action.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("End Action.  type: integer.  length: 32.")]
+        EndAction = 240063,
+
+        /// <summary>
+        /// Frequency.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Frequency.  type: real.  length: 32.")]
+        Frequency = 240064,
+
+        /// <summary>
+        /// Freeze.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Freeze.  type: integer.  length: 32.")]
+        Freeze = 240065,
+
+        /// <summary>
+        /// Heading.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Heading.  type: real.  length: 32.")]
+        Heading = 240066,
+
+        /// <summary>
+        /// Identification.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Identification.  type: integer.  length: 32.")]
+        Identification_240067 = 240067,
+
+        /// <summary>
+        /// Initial Point Data.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Initial Point Data.  type: integer.  length: 32.")]
+        InitialPointData = 240068,
+
+        /// <summary>
+        /// Latitude.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Latitude.  type: real.  length: 64.")]
+        Latitude_240069 = 240069,
+
+        /// <summary>
+        /// Lights.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Lights.  type: integer.  length: 32.")]
+        Lights_240070 = 240070,
+
+        /// <summary>
+        /// Linear.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Linear.  type: integer.  length: 32.")]
+        Linear = 240071,
+
+        /// <summary>
+        /// Longitude.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Longitude.  type: real.  length: 64.")]
+        Longitude_240072 = 240072,
+
+        /// <summary>
+        /// Low Altitude.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Low Altitude.  type: real.  length: 32.")]
+        LowAltitude = 240073,
+
+        /// <summary>
+        /// Mfd Formats.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mfd Formats.  type: integer.  length: 32.")]
+        MfdFormats = 240074,
+
+        /// <summary>
+        /// Nctr.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nctr.  type: integer.  length: 32.")]
+        Nctr = 240075,
+
+        /// <summary>
+        /// Number Projectiles.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Number Projectiles.  type: integer.  length: 32.")]
+        NumberProjectiles = 240076,
+
+        /// <summary>
+        /// Operation Code.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Operation Code.  type: integer.  length: 32.")]
+        OperationCode = 240077,
+
+        /// <summary>
+        /// Pitch.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pitch.  type: real.  length: 32.")]
+        Pitch = 240078,
+
+        /// <summary>
+        /// Profiles.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Profiles.  type: integer.  length: 32.")]
+        Profiles = 240079,
+
+        /// <summary>
+        /// Quantity.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Quantity.  type: integer.  length: 32.")]
+        Quantity_240080 = 240080,
+
+        /// <summary>
+        /// Radar Modes.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radar Modes.  type: integer.  length: 32.")]
+        RadarModes = 240081,
+
+        /// <summary>
+        /// Radar Search Volume.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Radar Search Volume.  type: real.  length: 32.")]
+        RadarSearchVolume = 240082,
+
+        /// <summary>
+        /// Roll.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Roll.  type: real.  length: 32.")]
+        Roll = 240083,
+
+        /// <summary>
+        /// Rotation.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rotation.  type: real.  length: 32.")]
+        Rotation_240084 = 240084,
+
+        /// <summary>
+        /// Scale Factor X.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scale Factor X.  type: real.  length: 32.")]
+        ScaleFactorX = 240085,
+
+        /// <summary>
+        /// Scale Factor Y.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Scale Factor Y.  type: real.  length: 32.")]
+        ScaleFactorY = 240086,
+
+        /// <summary>
+        /// Shields.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Shields.  type: integer.  length: 32.")]
+        Shields = 240087,
+
+        /// <summary>
+        /// Steerpoint.  type: structure.  length: 192.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Steerpoint.  type: structure.  length: 192.")]
+        Steerpoint = 240088,
+
+        /// <summary>
+        /// Spare1.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spare1.  type: real.  length: 64.")]
+        Spare1 = 240089,
+
+        /// <summary>
+        /// Spare2.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Spare2.  type: real.  length: 64.")]
+        Spare2 = 240090,
+
+        /// <summary>
+        /// Team.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Team.  type: integer.  length: 32.")]
+        Team = 240091,
+
+        /// <summary>
+        /// Text.  type: character.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Text.  type: character.  length: 00.")]
+        Text = 240092,
+
+        /// <summary>
+        /// Time Of Day.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Time Of Day.  type: integer.  length: 32.")]
+        TimeOfDay = 240093,
+
+        /// <summary>
+        /// Trail Flag.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trail Flag.  type: integer.  length: 32.")]
+        TrailFlag = 240094,
+
+        /// <summary>
+        /// Trail Size.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Trail Size.  type: real.  length: 32.")]
+        TrailSize = 240095,
+
+        /// <summary>
+        /// Type Of Projectile.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type Of Projectile.  type: integer.  length: 32.")]
+        TypeOfProjectile = 240096,
+
+        /// <summary>
+        /// Type Of Target.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type Of Target.  type: integer.  length: 32.")]
+        TypeOfTarget = 240097,
+
+        /// <summary>
+        /// Type Of Threat.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Type Of Threat.  type: integer.  length: 32.")]
+        TypeOfThreat = 240098,
+
+        /// <summary>
+        /// Uhf Frequency.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Uhf Frequency.  type: real.  length: 32.")]
+        UhfFrequency = 240099,
+
+        /// <summary>
+        /// Utm Altitude.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Utm Altitude.  type: real.  length: 32.")]
+        UtmAltitude = 240100,
+
+        /// <summary>
+        /// Utm Latitude.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Utm Latitude.  type: real.  length: 64.")]
+        UtmLatitude = 240101,
+
+        /// <summary>
+        /// Utm Longitude.  type: real.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Utm Longitude.  type: real.  length: 64.")]
+        UtmLongitude = 240102,
+
+        /// <summary>
+        /// Vhf Frequency.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vhf Frequency.  type: real.  length: 32.")]
+        VhfFrequency = 240103,
+
+        /// <summary>
+        /// Visibility Range.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Visibility Range.  type: real.  length: 32.")]
+        VisibilityRange = 240104,
+
+        /// <summary>
+        /// Void Aaa Hit.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Void Aaa Hit.  type: integer.  length: 32.")]
+        VoidAaaHit = 240105,
+
+        /// <summary>
+        /// Void Collision.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Void Collision.  type: integer.  length: 32.")]
+        VoidCollision = 240106,
+
+        /// <summary>
+        /// Void Earth Hit.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Void Earth Hit.  type: integer.  length: 32.")]
+        VoidEarthHit = 240107,
+
+        /// <summary>
+        /// Void Friendly.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Void Friendly.  type: integer.  length: 32.")]
+        VoidFriendly = 240108,
+
+        /// <summary>
+        /// Void Gun Hit.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Void Gun Hit.  type: integer.  length: 32.")]
+        VoidGunHit = 240109,
+
+        /// <summary>
+        /// Void Rocket Hit.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Void Rocket Hit.  type: integer.  length: 32.")]
+        VoidRocketHit = 240110,
+
+        /// <summary>
+        /// Void Sam Hit.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Void Sam Hit.  type: integer.  length: 32.")]
+        VoidSamHit = 240111,
+
+        /// <summary>
+        /// Weapon Data.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon Data.  type: integer.  length: 32.")]
+        WeaponData = 240112,
+
+        /// <summary>
+        /// Weapon Type.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weapon Type.  type: integer.  length: 32.")]
+        WeaponType = 240113,
+
+        /// <summary>
+        /// Weather.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Weather.  type: integer.  length: 32.")]
+        Weather_240114 = 240114,
+
+        /// <summary>
+        /// Wind Direction.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wind Direction.  type: real.  length: 32.")]
+        WindDirection_240115 = 240115,
+
+        /// <summary>
+        /// Wind Speed.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wind Speed.  type: real.  length: 32.")]
+        WindSpeed = 240116,
+
+        /// <summary>
+        /// Wing Station.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Wing Station.  type: integer.  length: 32.")]
+        WingStation = 240117,
+
+        /// <summary>
+        /// Yaw.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Yaw.  type: real.  length: 32.")]
+        Yaw = 240118,
+
+        /// <summary>
+        /// Memory Offset.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Memory Offset.  type: integer.  length: 32.")]
+        MemoryOffset = 240119,
+
+        /// <summary>
+        /// Memory Data.  type: integer.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Memory Data.  type: integer.  length: 00.")]
+        MemoryData = 240120,
+
+        /// <summary>
+        /// VASI.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("VASI.  type: integer.  length: 32.")]
+        VASI = 240121,
+
+        /// <summary>
+        /// Beacon.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Beacon.  type: integer.  length: 32.")]
+        Beacon = 240122,
+
+        /// <summary>
+        /// Strobe.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strobe.  type: integer.  length: 32.")]
+        Strobe = 240123,
+
+        /// <summary>
+        /// Culture.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Culture.  type: integer.  length: 32.")]
+        Culture = 240124,
+
+        /// <summary>
+        /// Approach.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Approach.  type: integer.  length: 32.")]
+        Approach = 240125,
+
+        /// <summary>
+        /// Runway End.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Runway End.  type: integer.  length: 32.")]
+        RunwayEnd = 240126,
+
+        /// <summary>
+        /// Obstruction.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Obstruction.  type: integer.  length: 32.")]
+        Obstruction = 240127,
+
+        /// <summary>
+        /// Runway Edge.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Runway Edge.  type: integer.  length: 32.")]
+        RunwayEdge = 240128,
+
+        /// <summary>
+        /// Ramp Taxiway.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ramp Taxiway.  type: integer.  length: 32.")]
+        RampTaxiway = 240129,
+
+        /// <summary>
+        /// Laser Bomb Code.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Laser Bomb Code.  type: integer.  length: 32.")]
+        LaserBombCode = 240130,
+
+        /// <summary>
+        /// Rack Type.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Rack Type.  type: integer.  length: 32.")]
+        RackType = 240131,
+
+        /// <summary>
+        /// HUD.  type: structure.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HUD.  type: structure.  length: 00.")]
+        HUD = 240132,
+
+        /// <summary>
+        /// RoleFileName.  type: character.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("RoleFileName.  type: character.  length: 00.")]
+        RoleFileName = 240133,
+
+        /// <summary>
+        /// PilotName.  type: character.  length: 00.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PilotName.  type: character.  length: 00.")]
+        PilotName = 240134,
+
+        /// <summary>
+        /// PilotDesignation.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("PilotDesignation.  type: integer.  length: 32.")]
+        PilotDesignation = 240135,
+
+        /// <summary>
+        /// Model Type.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Model Type.  type: integer.  length: 32.")]
+        ModelType = 240136,
+
+        /// <summary>
+        /// DIS Type.  type: integer.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("DIS Type.  type: integer.  length: 64.")]
+        DISType = 240137,
+
+        /// <summary>
+        /// Class.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Class.  type: integer.  length: 32.")]
+        Class = 240138,
+
+        /// <summary>
+        /// Channel.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Channel.  type: integer.  length: 32.")]
+        Channel = 240139,
+
+        /// <summary>
+        /// Entity Type.  type: structure.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Type.  type: structure.  length: 64.")]
+        EntityType_240140 = 240140,
+
+        /// <summary>
+        /// Alternative Entity Type.  type: structure.  length: 64.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Alternative Entity Type.  type: structure.  length: 64.")]
+        AlternativeEntityType_240141 = 240141,
+
+        /// <summary>
+        /// Entity Location.  type: structure.  length: 192.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Location.  type: structure.  length: 192.")]
+        EntityLocation = 240142,
+
+        /// <summary>
+        /// Entity Linear Velocity.  type: structure.  length: 96.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Linear Velocity.  type: structure.  length: 96.")]
+        EntityLinearVelocity = 240143,
+
+        /// <summary>
+        /// Entity Orientation.  type: structure.  length: 96.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Orientation.  type: structure.  length: 96.")]
+        EntityOrientation = 240144,
+
+        /// <summary>
+        /// Dead Reckoning.  type: structure.  length: 320.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dead Reckoning.  type: structure.  length: 320.")]
+        DeadReckoning = 240145,
+
+        /// <summary>
+        /// Failure Symptom.  type: integer.  length: 32.  range: 1=LimitSpeed, 2 =LimitGLoad, 3=Both.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Failure Symptom.  type: integer.  length: 32.  range: 1=LimitSpeed, 2 =LimitGLoad, 3=Both.")]
+        FailureSymptom = 240146,
+
+        /// <summary>
+        /// Max Fuel.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Max Fuel.  type: real.  length: 32.")]
+        MaxFuel = 240147,
+
+        /// <summary>
+        /// Refueling Boom Connect.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Refueling Boom Connect.  type: integer.  length: 32.")]
+        RefuelingBoomConnect = 240148,
+
+        /// <summary>
+        /// Altitude AGL.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude AGL.  type: real.  length: 32.")]
+        AltitudeAGL = 240149,
+
+        /// <summary>
+        /// Calibrated Airspeed.  type: real.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Calibrated Airspeed.  type: real.  length: 32.")]
+        CalibratedAirspeed = 240150,
+
+        /// <summary>
+        /// TACAN Channel.  type: integer.  length: 32.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACAN Channel.  type: integer.  length: 32.")]
+        TACANChannel = 240151,
+
+        /// <summary>
+        /// TACAN Band.  type: integer.  length: 32.  range: 0 = x, 1 = y.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACAN Band.  type: integer.  length: 32.  range: 0 = x, 1 = y.")]
+        TACANBand = 240152,
+
+        /// <summary>
+        /// TACAN Mode.  type: integer.  length: 32.  range: 0 = off, 1 = rec, 2 = t/r, 3 = aa rec, 4 = aa t/r.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("TACAN Mode.  type: integer.  length: 32.  range: 0 = off, 1 = rec, 2 = t/r, 3 = aa rec, 4 = aa t/r.")]
+        TACANMode = 240153
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/EventType.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/EventType.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/EventType.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/EventType.cs
index c2764eb..10ed7e6 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/EventType.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/EventType.cs
@@ -1,189 +1,189 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for EventType (simman.eventreport.eventtype, Event Type, 
-    /// section 7.6)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum EventType : uint
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Ran out of ammunition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ran out of ammunition.")]
-        RanOutOfAmmunition = 2,
-
-        /// <summary>
-        /// Killed in action.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Killed in action.")]
-        KilledInAction = 3,
-
-        /// <summary>
-        /// Damage.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Damage.")]
-        Damage = 4,
-
-        /// <summary>
-        /// Mobility disabled.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mobility disabled.")]
-        MobilityDisabled = 5,
-
-        /// <summary>
-        /// Fire disabled.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fire disabled.")]
-        FireDisabled = 6,
-
-        /// <summary>
-        /// Ran out of fuel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ran out of fuel.")]
-        RanOutOfFuel = 7,
-
-        /// <summary>
-        /// Entity initialization.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity initialization.")]
-        EntityInitialization = 8,
-
-        /// <summary>
-        /// Request for indirect fire or CAS mission.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Request for indirect fire or CAS mission.")]
-        RequestForIndirectFireOrCASMission = 9,
-
-        /// <summary>
-        /// Indirect fire or CAS fire.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Indirect fire or CAS fire.")]
-        IndirectFireOrCASFire = 10,
-
-        /// <summary>
-        /// Minefield entry.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minefield entry.")]
-        MinefieldEntry = 11,
-
-        /// <summary>
-        /// Minefield detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Minefield detonation.")]
-        MinefieldDetonation = 12,
-
-        /// <summary>
-        /// Vehicle master power on.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vehicle master power on.")]
-        VehicleMasterPowerOn = 13,
-
-        /// <summary>
-        /// Vehicle master power off.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Vehicle master power off.")]
-        VehicleMasterPowerOff = 14,
-
-        /// <summary>
-        /// Aggregate state change requested.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Aggregate state change requested.")]
-        AggregateStateChangeRequested = 15,
-
-        /// <summary>
-        /// Prevent Collision / Detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Prevent Collision / Detonation.")]
-        PreventCollisionDetonation = 16
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for EventType (simman.eventreport.eventtype, Event Type, 
+    /// section 7.6)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum EventType : uint
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Ran out of ammunition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ran out of ammunition.")]
+        RanOutOfAmmunition = 2,
+
+        /// <summary>
+        /// Killed in action.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Killed in action.")]
+        KilledInAction = 3,
+
+        /// <summary>
+        /// Damage.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Damage.")]
+        Damage = 4,
+
+        /// <summary>
+        /// Mobility disabled.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mobility disabled.")]
+        MobilityDisabled = 5,
+
+        /// <summary>
+        /// Fire disabled.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fire disabled.")]
+        FireDisabled = 6,
+
+        /// <summary>
+        /// Ran out of fuel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ran out of fuel.")]
+        RanOutOfFuel = 7,
+
+        /// <summary>
+        /// Entity initialization.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity initialization.")]
+        EntityInitialization = 8,
+
+        /// <summary>
+        /// Request for indirect fire or CAS mission.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Request for indirect fire or CAS mission.")]
+        RequestForIndirectFireOrCASMission = 9,
+
+        /// <summary>
+        /// Indirect fire or CAS fire.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Indirect fire or CAS fire.")]
+        IndirectFireOrCASFire = 10,
+
+        /// <summary>
+        /// Minefield entry.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minefield entry.")]
+        MinefieldEntry = 11,
+
+        /// <summary>
+        /// Minefield detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Minefield detonation.")]
+        MinefieldDetonation = 12,
+
+        /// <summary>
+        /// Vehicle master power on.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vehicle master power on.")]
+        VehicleMasterPowerOn = 13,
+
+        /// <summary>
+        /// Vehicle master power off.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Vehicle master power off.")]
+        VehicleMasterPowerOff = 14,
+
+        /// <summary>
+        /// Aggregate state change requested.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Aggregate state change requested.")]
+        AggregateStateChangeRequested = 15,
+
+        /// <summary>
+        /// Prevent Collision / Detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Prevent Collision / Detonation.")]
+        PreventCollisionDetonation = 16
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/FrozenBehavior.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/FrozenBehavior.cs
index 205c0c8..ef29dcc 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/FrozenBehavior.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/FrozenBehavior.cs
@@ -1,60 +1,60 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for FrozenBehavior (simman.stop.frozenbehavior, Frozen Behavior, 
-    /// section 7.2.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    [Flags]
-    public enum FrozenBehavior : byte
-    {
-        /// <summary>
-        /// Run internal simulation clock.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Run internal simulation clock.")]
-        SimulationClock = 1,
-
-        /// <summary>
-        /// Transmit PDUs.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Transmit PDUs.")]
-        TransmitPDUs = 2,
-
-        /// <summary>
-        /// Update simulation models of other entities via received PDUs.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Update simulation models of other entities via received PDUs.")]
-        ReceivePDUs = 4
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for FrozenBehavior (simman.stop.frozenbehavior, Frozen Behavior, 
+    /// section 7.2.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    [Flags]
+    public enum FrozenBehavior : byte
+    {
+        /// <summary>
+        /// Run internal simulation clock.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Run internal simulation clock.")]
+        SimulationClock = 1,
+
+        /// <summary>
+        /// Transmit PDUs.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Transmit PDUs.")]
+        TransmitPDUs = 2,
+
+        /// <summary>
+        /// Update simulation models of other entities via received PDUs.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Update simulation models of other entities via received PDUs.")]
+        ReceivePDUs = 4
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/RequiredReliabilityService.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/RequiredReliabilityService.cs
index 433dd40..bc7eb0f 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/RequiredReliabilityService.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/RequiredReliabilityService.cs
@@ -1,49 +1,49 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for RequiredReliabilityService (simman.reliability.service, Required Reliability Service, 
-    /// section 7.7.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum RequiredReliabilityService : byte
-    {
-        /// <summary>
-        /// Acknowledged.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acknowledged.")]
-        Acknowledged = 0,
-
-        /// <summary>
-        /// Unacknowledged.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unacknowledged.")]
-        Unacknowledged = 1
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for RequiredReliabilityService (simman.reliability.service, Required Reliability Service, 
+    /// section 7.7.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum RequiredReliabilityService : byte
+    {
+        /// <summary>
+        /// Acknowledged.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acknowledged.")]
+        Acknowledged = 0,
+
+        /// <summary>
+        /// Unacknowledged.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unacknowledged.")]
+        Unacknowledged = 1
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/ResponseFlag.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/ResponseFlag.cs
index 5297523..5d4fdf3 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/ResponseFlag.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/ResponseFlag.cs
@@ -1,59 +1,59 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for ResponseFlag (simman.ack.responseflag, Response Flag, 
-    /// section 7.3.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum ResponseFlag : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Able to comply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Able to comply.")]
-        AbleToComply = 1,
-
-        /// <summary>
-        /// Unable to comply.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Unable to comply.")]
-        UnableToComply = 2
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for ResponseFlag (simman.ack.responseflag, Response Flag, 
+    /// section 7.3.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum ResponseFlag : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Able to comply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Able to comply.")]
+        AbleToComply = 1,
+
+        /// <summary>
+        /// Unable to comply.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Unable to comply.")]
+        UnableToComply = 2
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs b/Libs/CsharpDis6/Enumerations/SimulationManagement/StopFreezeReason.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs
rename to Libs/CsharpDis6/Enumerations/SimulationManagement/StopFreezeReason.cs
index db86108..c165b25 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/SimulationManagement/StopFreezeReason.cs
+++ b/Libs/CsharpDis6/Enumerations/SimulationManagement/StopFreezeReason.cs
@@ -1,119 +1,119 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.SimulationManagement
-{
-    /// <summary>
-    /// Enumeration values for StopFreezeReason (simman.stop.reason, Reason, 
-    /// section 7.2.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum StopFreezeReason : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Recess.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Recess.")]
-        Recess = 1,
-
-        /// <summary>
-        /// Termination.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Termination.")]
-        Termination = 2,
-
-        /// <summary>
-        /// System Failure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("System Failure.")]
-        SystemFailure = 3,
-
-        /// <summary>
-        /// Security Violation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Security Violation.")]
-        SecurityViolation = 4,
-
-        /// <summary>
-        /// Entity Reconstitution.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Reconstitution.")]
-        EntityReconstitution = 5,
-
-        /// <summary>
-        /// Stop for reset.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stop for reset.")]
-        StopForReset = 6,
-
-        /// <summary>
-        /// Stop for restart.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Stop for restart.")]
-        StopForRestart = 7,
-
-        /// <summary>
-        /// Abort Training Return to Tactical Operations.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Abort Training Return to Tactical Operations.")]
-        AbortTrainingReturnToTacticalOperations = 8
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.SimulationManagement
+{
+    /// <summary>
+    /// Enumeration values for StopFreezeReason (simman.stop.reason, Reason, 
+    /// section 7.2.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum StopFreezeReason : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Recess.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Recess.")]
+        Recess = 1,
+
+        /// <summary>
+        /// Termination.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Termination.")]
+        Termination = 2,
+
+        /// <summary>
+        /// System Failure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("System Failure.")]
+        SystemFailure = 3,
+
+        /// <summary>
+        /// Security Violation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Security Violation.")]
+        SecurityViolation = 4,
+
+        /// <summary>
+        /// Entity Reconstitution.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Reconstitution.")]
+        EntityReconstitution = 5,
+
+        /// <summary>
+        /// Stop for reset.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stop for reset.")]
+        StopForReset = 6,
+
+        /// <summary>
+        /// Stop for restart.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Stop for restart.")]
+        StopForRestart = 7,
+
+        /// <summary>
+        /// Abort Training Return to Tactical Operations.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Abort Training Return to Tactical Operations.")]
+        AbortTrainingReturnToTacticalOperations = 8
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/DetonationResult.cs b/Libs/CsharpDis6/Enumerations/Warfare/DetonationResult.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Warfare/DetonationResult.cs
rename to Libs/CsharpDis6/Enumerations/Warfare/DetonationResult.cs
index 281058c..ed96b33 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/DetonationResult.cs
+++ b/Libs/CsharpDis6/Enumerations/Warfare/DetonationResult.cs
@@ -1,369 +1,369 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Warfare
-{
-    /// <summary>
-    /// Enumeration values for DetonationResult (warfare.detonationresult, Detonation Result, 
-    /// section 5.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum DetonationResult : byte
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Entity Impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Impact.")]
-        EntityImpact = 1,
-
-        /// <summary>
-        /// Entity Proximate Detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Entity Proximate Detonation.")]
-        EntityProximateDetonation = 2,
-
-        /// <summary>
-        /// Ground Impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ground Impact.")]
-        GroundImpact = 3,
-
-        /// <summary>
-        /// Ground Proximate Detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ground Proximate Detonation.")]
-        GroundProximateDetonation = 4,
-
-        /// <summary>
-        /// Detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Detonation.")]
-        Detonation = 5,
-
-        /// <summary>
-        /// None or No Detonation (Dud).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("None or No Detonation (Dud).")]
-        NoneOrNoDetonationDud = 6,
-
-        /// <summary>
-        /// HE hit, small.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE hit, small.")]
-        HEHitSmall = 7,
-
-        /// <summary>
-        /// HE hit, medium.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE hit, medium.")]
-        HEHitMedium = 8,
-
-        /// <summary>
-        /// HE hit, large.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE hit, large.")]
-        HEHitLarge = 9,
-
-        /// <summary>
-        /// Armor-piercing hit.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Armor-piercing hit.")]
-        ArmorPiercingHit = 10,
-
-        /// <summary>
-        /// Dirt blast, small.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dirt blast, small.")]
-        DirtBlastSmall = 11,
-
-        /// <summary>
-        /// Dirt blast, medium.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dirt blast, medium.")]
-        DirtBlastMedium = 12,
-
-        /// <summary>
-        /// Dirt blast, large.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dirt blast, large.")]
-        DirtBlastLarge = 13,
-
-        /// <summary>
-        /// Water blast, small.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Water blast, small.")]
-        WaterBlastSmall = 14,
-
-        /// <summary>
-        /// Water blast, medium.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Water blast, medium.")]
-        WaterBlastMedium = 15,
-
-        /// <summary>
-        /// Water blast, large.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Water blast, large.")]
-        WaterBlastLarge = 16,
-
-        /// <summary>
-        /// Air hit.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air hit.")]
-        AirHit = 17,
-
-        /// <summary>
-        /// Building hit, small.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Building hit, small.")]
-        BuildingHitSmall = 18,
-
-        /// <summary>
-        /// Building hit, medium.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Building hit, medium.")]
-        BuildingHitMedium = 19,
-
-        /// <summary>
-        /// Building hit, large.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Building hit, large.")]
-        BuildingHitLarge = 20,
-
-        /// <summary>
-        /// Mine-clearing line charge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mine-clearing line charge.")]
-        MineClearingLineCharge = 21,
-
-        /// <summary>
-        /// Environment object impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environment object impact.")]
-        EnvironmentObjectImpact = 22,
-
-        /// <summary>
-        /// Environment object proximate detonation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Environment object proximate detonation.")]
-        EnvironmentObjectProximateDetonation = 23,
-
-        /// <summary>
-        /// Water Impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Water Impact.")]
-        WaterImpact = 24,
-
-        /// <summary>
-        /// Air Burst.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Air Burst.")]
-        AirBurst = 25,
-
-        /// <summary>
-        /// Kill with fragment type 1.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kill with fragment type 1.")]
-        KillWithFragmentType1 = 26,
-
-        /// <summary>
-        /// Kill with fragment type 2.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kill with fragment type 2.")]
-        KillWithFragmentType2 = 27,
-
-        /// <summary>
-        /// Kill with fragment type 3.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kill with fragment type 3.")]
-        KillWithFragmentType3 = 28,
-
-        /// <summary>
-        /// Kill with fragment type 1 after fly-out failure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kill with fragment type 1 after fly-out failure.")]
-        KillWithFragmentType1AfterFlyOutFailure = 29,
-
-        /// <summary>
-        /// Kill with fragment type 2 after fly-out failure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kill with fragment type 2 after fly-out failure.")]
-        KillWithFragmentType2AfterFlyOutFailure = 30,
-
-        /// <summary>
-        /// Miss due to fly-out failure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Miss due to fly-out failure.")]
-        MissDueToFlyOutFailure = 31,
-
-        /// <summary>
-        /// Miss due to end-game failure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Miss due to end-game failure.")]
-        MissDueToEndGameFailure = 32,
-
-        /// <summary>
-        /// Miss due to fly-out and end-game failure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Miss due to fly-out and end-game failure.")]
-        MissDueToFlyOutAndEndGameFailure = 33
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Warfare
+{
+    /// <summary>
+    /// Enumeration values for DetonationResult (warfare.detonationresult, Detonation Result, 
+    /// section 5.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum DetonationResult : byte
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Entity Impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Impact.")]
+        EntityImpact = 1,
+
+        /// <summary>
+        /// Entity Proximate Detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Entity Proximate Detonation.")]
+        EntityProximateDetonation = 2,
+
+        /// <summary>
+        /// Ground Impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ground Impact.")]
+        GroundImpact = 3,
+
+        /// <summary>
+        /// Ground Proximate Detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ground Proximate Detonation.")]
+        GroundProximateDetonation = 4,
+
+        /// <summary>
+        /// Detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Detonation.")]
+        Detonation = 5,
+
+        /// <summary>
+        /// None or No Detonation (Dud).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("None or No Detonation (Dud).")]
+        NoneOrNoDetonationDud = 6,
+
+        /// <summary>
+        /// HE hit, small.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE hit, small.")]
+        HEHitSmall = 7,
+
+        /// <summary>
+        /// HE hit, medium.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE hit, medium.")]
+        HEHitMedium = 8,
+
+        /// <summary>
+        /// HE hit, large.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE hit, large.")]
+        HEHitLarge = 9,
+
+        /// <summary>
+        /// Armor-piercing hit.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Armor-piercing hit.")]
+        ArmorPiercingHit = 10,
+
+        /// <summary>
+        /// Dirt blast, small.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dirt blast, small.")]
+        DirtBlastSmall = 11,
+
+        /// <summary>
+        /// Dirt blast, medium.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dirt blast, medium.")]
+        DirtBlastMedium = 12,
+
+        /// <summary>
+        /// Dirt blast, large.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dirt blast, large.")]
+        DirtBlastLarge = 13,
+
+        /// <summary>
+        /// Water blast, small.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Water blast, small.")]
+        WaterBlastSmall = 14,
+
+        /// <summary>
+        /// Water blast, medium.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Water blast, medium.")]
+        WaterBlastMedium = 15,
+
+        /// <summary>
+        /// Water blast, large.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Water blast, large.")]
+        WaterBlastLarge = 16,
+
+        /// <summary>
+        /// Air hit.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air hit.")]
+        AirHit = 17,
+
+        /// <summary>
+        /// Building hit, small.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Building hit, small.")]
+        BuildingHitSmall = 18,
+
+        /// <summary>
+        /// Building hit, medium.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Building hit, medium.")]
+        BuildingHitMedium = 19,
+
+        /// <summary>
+        /// Building hit, large.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Building hit, large.")]
+        BuildingHitLarge = 20,
+
+        /// <summary>
+        /// Mine-clearing line charge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mine-clearing line charge.")]
+        MineClearingLineCharge = 21,
+
+        /// <summary>
+        /// Environment object impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environment object impact.")]
+        EnvironmentObjectImpact = 22,
+
+        /// <summary>
+        /// Environment object proximate detonation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Environment object proximate detonation.")]
+        EnvironmentObjectProximateDetonation = 23,
+
+        /// <summary>
+        /// Water Impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Water Impact.")]
+        WaterImpact = 24,
+
+        /// <summary>
+        /// Air Burst.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Air Burst.")]
+        AirBurst = 25,
+
+        /// <summary>
+        /// Kill with fragment type 1.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kill with fragment type 1.")]
+        KillWithFragmentType1 = 26,
+
+        /// <summary>
+        /// Kill with fragment type 2.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kill with fragment type 2.")]
+        KillWithFragmentType2 = 27,
+
+        /// <summary>
+        /// Kill with fragment type 3.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kill with fragment type 3.")]
+        KillWithFragmentType3 = 28,
+
+        /// <summary>
+        /// Kill with fragment type 1 after fly-out failure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kill with fragment type 1 after fly-out failure.")]
+        KillWithFragmentType1AfterFlyOutFailure = 29,
+
+        /// <summary>
+        /// Kill with fragment type 2 after fly-out failure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kill with fragment type 2 after fly-out failure.")]
+        KillWithFragmentType2AfterFlyOutFailure = 30,
+
+        /// <summary>
+        /// Miss due to fly-out failure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Miss due to fly-out failure.")]
+        MissDueToFlyOutFailure = 31,
+
+        /// <summary>
+        /// Miss due to end-game failure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Miss due to end-game failure.")]
+        MissDueToEndGameFailure = 32,
+
+        /// <summary>
+        /// Miss due to fly-out and end-game failure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Miss due to fly-out and end-game failure.")]
+        MissDueToFlyOutAndEndGameFailure = 33
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Fuse.cs b/Libs/CsharpDis6/Enumerations/Warfare/Fuse.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Fuse.cs
rename to Libs/CsharpDis6/Enumerations/Warfare/Fuse.cs
index 75a3f5f..c04c128 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Fuse.cs
+++ b/Libs/CsharpDis6/Enumerations/Warfare/Fuse.cs
@@ -1,989 +1,989 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Warfare
-{
-    /// <summary>
-    /// Enumeration values for Fuse (warfare.burstdescriptor.fuse, Fuse (detonator), 
-    /// section 5.1.2)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Fuse : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Intelligent Influence.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Intelligent Influence.")]
-        IntelligentInfluence = 10,
-
-        /// <summary>
-        /// Sensor.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Sensor.")]
-        Sensor = 20,
-
-        /// <summary>
-        /// Self-destruct.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Self-destruct.")]
-        SelfDestruct = 30,
-
-        /// <summary>
-        /// Ultra Quick.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Ultra Quick.")]
-        UltraQuick = 40,
-
-        /// <summary>
-        /// Body.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Body.")]
-        Body = 50,
-
-        /// <summary>
-        /// Deep Intrusion.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Deep Intrusion.")]
-        DeepIntrusion = 60,
-
-        /// <summary>
-        /// Multifunction.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Multifunction.")]
-        Multifunction = 100,
-
-        /// <summary>
-        /// Point Detonation (PD).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Point Detonation (PD).")]
-        PointDetonationPD = 200,
-
-        /// <summary>
-        /// Base Detonation (BD).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Base Detonation (BD).")]
-        BaseDetonationBD = 300,
-
-        /// <summary>
-        /// Contact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact.")]
-        Contact = 1000,
-
-        /// <summary>
-        /// Contact, Instant (Impact).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Instant (Impact).")]
-        ContactInstantImpact = 1100,
-
-        /// <summary>
-        /// Contact, Delayed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Delayed.")]
-        ContactDelayed = 1200,
-
-        /// <summary>
-        /// 10 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("10 ms delay.")]
-        _10MsDelay = 1201,
-
-        /// <summary>
-        /// 20 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("20 ms delay.")]
-        _20MsDelay = 1202,
-
-        /// <summary>
-        /// 50 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("50 ms delay.")]
-        _50MsDelay = 1205,
-
-        /// <summary>
-        /// 60 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("60 ms delay.")]
-        _60MsDelay = 1206,
-
-        /// <summary>
-        /// 100 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("100 ms delay.")]
-        _100MsDelay = 1210,
-
-        /// <summary>
-        /// 125 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("125 ms delay.")]
-        _125MsDelay = 1212,
-
-        /// <summary>
-        /// 250 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("250 ms delay.")]
-        _250MsDelay = 1225,
-
-        /// <summary>
-        /// Contact, Electronic (Oblique Contact).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Electronic (Oblique Contact).")]
-        ContactElectronicObliqueContact = 1300,
-
-        /// <summary>
-        /// Contact, Graze.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Graze.")]
-        ContactGraze = 1400,
-
-        /// <summary>
-        /// Contact, Crush.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Crush.")]
-        ContactCrush = 1500,
-
-        /// <summary>
-        /// Contact, Hydrostatic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Hydrostatic.")]
-        ContactHydrostatic = 1600,
-
-        /// <summary>
-        /// Contact, Mechanical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Mechanical.")]
-        ContactMechanical = 1700,
-
-        /// <summary>
-        /// Contact, Chemical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Chemical.")]
-        ContactChemical = 1800,
-
-        /// <summary>
-        /// Contact, Piezoelectric.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Piezoelectric.")]
-        ContactPiezoelectric = 1900,
-
-        /// <summary>
-        /// Contact, Point Initiating.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Point Initiating.")]
-        ContactPointInitiating = 1910,
-
-        /// <summary>
-        /// Contact, Point Initiating, Base Detonating.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Point Initiating, Base Detonating.")]
-        ContactPointInitiatingBaseDetonating = 1920,
-
-        /// <summary>
-        /// Contact, Base Detonating.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Base Detonating.")]
-        ContactBaseDetonating = 1930,
-
-        /// <summary>
-        /// Contact, Ballistic Cap and Base.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Ballistic Cap and Base.")]
-        ContactBallisticCapAndBase = 1940,
-
-        /// <summary>
-        /// Contact, Base.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Base.")]
-        ContactBase = 1950,
-
-        /// <summary>
-        /// Contact, Nose.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Nose.")]
-        ContactNose = 1960,
-
-        /// <summary>
-        /// Contact, Fitted in Standoff Probe.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Fitted in Standoff Probe.")]
-        ContactFittedInStandoffProbe = 1970,
-
-        /// <summary>
-        /// Contact, Non-aligned.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Contact, Non-aligned.")]
-        ContactNonAligned = 1980,
-
-        /// <summary>
-        /// Timed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed.")]
-        Timed = 2000,
-
-        /// <summary>
-        /// Timed, Programmable.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Programmable.")]
-        TimedProgrammable = 2100,
-
-        /// <summary>
-        /// Timed, Burnout.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Burnout.")]
-        TimedBurnout = 2200,
-
-        /// <summary>
-        /// Timed, Pyrotechnic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Pyrotechnic.")]
-        TimedPyrotechnic = 2300,
-
-        /// <summary>
-        /// Timed, Electronic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Electronic.")]
-        TimedElectronic = 2400,
-
-        /// <summary>
-        /// Timed, Base Delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Base Delay.")]
-        TimedBaseDelay = 2500,
-
-        /// <summary>
-        /// Timed, Reinforced Nose Impact Delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Reinforced Nose Impact Delay.")]
-        TimedReinforcedNoseImpactDelay = 2600,
-
-        /// <summary>
-        /// Timed, Short Delay Impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Short Delay Impact.")]
-        TimedShortDelayImpact = 2700,
-
-        /// <summary>
-        /// 10 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("10 ms delay.")]
-        _10MsDelay_2701 = 2701,
-
-        /// <summary>
-        /// 20 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("20 ms delay.")]
-        _20MsDelay_2702 = 2702,
-
-        /// <summary>
-        /// 50 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("50 ms delay.")]
-        _50MsDelay_2705 = 2705,
-
-        /// <summary>
-        /// 60 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("60 ms delay.")]
-        _60MsDelay_2706 = 2706,
-
-        /// <summary>
-        /// 100 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("100 ms delay.")]
-        _100MsDelay_2710 = 2710,
-
-        /// <summary>
-        /// 125 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("125 ms delay.")]
-        _125MsDelay_2712 = 2712,
-
-        /// <summary>
-        /// 250 ms delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("250 ms delay.")]
-        _250MsDelay_2725 = 2725,
-
-        /// <summary>
-        /// Timed, Nose Mounted Variable Delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Nose Mounted Variable Delay.")]
-        TimedNoseMountedVariableDelay = 2800,
-
-        /// <summary>
-        /// Timed, Long Delay Side.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Long Delay Side.")]
-        TimedLongDelaySide = 2900,
-
-        /// <summary>
-        /// Timed, Selectable Delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Selectable Delay.")]
-        TimedSelectableDelay = 2910,
-
-        /// <summary>
-        /// Timed, Impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Impact.")]
-        TimedImpact = 2920,
-
-        /// <summary>
-        /// Timed, Sequence.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Timed, Sequence.")]
-        TimedSequence = 2930,
-
-        /// <summary>
-        /// Proximity.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity.")]
-        Proximity = 3000,
-
-        /// <summary>
-        /// Proximity, Active Laser.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity, Active Laser.")]
-        ProximityActiveLaser = 3100,
-
-        /// <summary>
-        /// Proximity, Magnetic (Magpolarity).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity, Magnetic (Magpolarity).")]
-        ProximityMagneticMagpolarity = 3200,
-
-        /// <summary>
-        /// Proximity, Active Radar (Doppler Radar).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity, Active Radar (Doppler Radar).")]
-        ProximityActiveRadarDopplerRadar = 3300,
-
-        /// <summary>
-        /// Proximity, Radio Frequency (RF).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity, Radio Frequency (RF).")]
-        ProximityRadioFrequencyRF = 3400,
-
-        /// <summary>
-        /// Proximity, Programmable.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity, Programmable.")]
-        ProximityProgrammable = 3500,
-
-        /// <summary>
-        /// Proximity, Programmable, Prefragmented.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity, Programmable, Prefragmented.")]
-        ProximityProgrammablePrefragmented = 3600,
-
-        /// <summary>
-        /// Proximity, Infrared.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Proximity, Infrared.")]
-        ProximityInfrared = 3700,
-
-        /// <summary>
-        /// Command.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command.")]
-        Command = 4000,
-
-        /// <summary>
-        /// Command, Electronic, Remotely Set.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Command, Electronic, Remotely Set.")]
-        CommandElectronicRemotelySet = 4100,
-
-        /// <summary>
-        /// Altitude.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude.")]
-        Altitude = 5000,
-
-        /// <summary>
-        /// Altitude, Radio Altimeter.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude, Radio Altimeter.")]
-        AltitudeRadioAltimeter = 5100,
-
-        /// <summary>
-        /// Altitude, Air Burst.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Altitude, Air Burst.")]
-        AltitudeAirBurst = 5200,
-
-        /// <summary>
-        /// Depth.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Depth.")]
-        Depth = 6000,
-
-        /// <summary>
-        /// Acoustic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Acoustic.")]
-        Acoustic = 7000,
-
-        /// <summary>
-        /// Pressure.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pressure.")]
-        Pressure = 8000,
-
-        /// <summary>
-        /// Pressure, Delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pressure, Delay.")]
-        PressureDelay = 8010,
-
-        /// <summary>
-        /// Inert.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Inert.")]
-        Inert = 8100,
-
-        /// <summary>
-        /// Dummy.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dummy.")]
-        Dummy = 8110,
-
-        /// <summary>
-        /// Practice.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Practice.")]
-        Practice = 8120,
-
-        /// <summary>
-        /// Plug Representing.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Plug Representing.")]
-        PlugRepresenting = 8130,
-
-        /// <summary>
-        /// Training.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Training.")]
-        Training = 8150,
-
-        /// <summary>
-        /// Pyrotechnic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pyrotechnic.")]
-        Pyrotechnic = 9000,
-
-        /// <summary>
-        /// Pyrotechnic, Delay.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Pyrotechnic, Delay.")]
-        PyrotechnicDelay = 9010,
-
-        /// <summary>
-        /// Electro-optical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electro-optical.")]
-        ElectroOptical = 9100,
-
-        /// <summary>
-        /// Electromechanical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electromechanical.")]
-        Electromechanical = 9110,
-
-        /// <summary>
-        /// Electromechanical, Nose.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electromechanical, Nose.")]
-        ElectromechanicalNose = 9120,
-
-        /// <summary>
-        /// Strikerless.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strikerless.")]
-        Strikerless = 9200,
-
-        /// <summary>
-        /// Strikerless, Nose Impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strikerless, Nose Impact.")]
-        StrikerlessNoseImpact = 9210,
-
-        /// <summary>
-        /// Strikerless, Compression-Ignition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Strikerless, Compression-Ignition.")]
-        StrikerlessCompressionIgnition = 9220,
-
-        /// <summary>
-        /// Compression-Ignition.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Compression-Ignition.")]
-        CompressionIgnition = 9300,
-
-        /// <summary>
-        /// Compression-Ignition, Strikerless, Nose Impact.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Compression-Ignition, Strikerless, Nose Impact.")]
-        CompressionIgnitionStrikerlessNoseImpact = 9310,
-
-        /// <summary>
-        /// Percussion.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Percussion.")]
-        Percussion = 9400,
-
-        /// <summary>
-        /// Percussion, Instantaneous.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Percussion, Instantaneous.")]
-        PercussionInstantaneous = 9410,
-
-        /// <summary>
-        /// Electronic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electronic.")]
-        Electronic = 9500,
-
-        /// <summary>
-        /// Electronic, Internally Mounted.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electronic, Internally Mounted.")]
-        ElectronicInternallyMounted = 9510,
-
-        /// <summary>
-        /// Electronic, Range Setting.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electronic, Range Setting.")]
-        ElectronicRangeSetting = 9520,
-
-        /// <summary>
-        /// Electronic, Programmed.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Electronic, Programmed.")]
-        ElectronicProgrammed = 9530,
-
-        /// <summary>
-        /// Mechanical.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mechanical.")]
-        Mechanical = 9600,
-
-        /// <summary>
-        /// Mechanical, Nose.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mechanical, Nose.")]
-        MechanicalNose = 9610,
-
-        /// <summary>
-        /// Mechanical, Tail.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mechanical, Tail.")]
-        MechanicalTail = 9620
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Warfare
+{
+    /// <summary>
+    /// Enumeration values for Fuse (warfare.burstdescriptor.fuse, Fuse (detonator), 
+    /// section 5.1.2)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Fuse : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Intelligent Influence.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Intelligent Influence.")]
+        IntelligentInfluence = 10,
+
+        /// <summary>
+        /// Sensor.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Sensor.")]
+        Sensor = 20,
+
+        /// <summary>
+        /// Self-destruct.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Self-destruct.")]
+        SelfDestruct = 30,
+
+        /// <summary>
+        /// Ultra Quick.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Ultra Quick.")]
+        UltraQuick = 40,
+
+        /// <summary>
+        /// Body.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Body.")]
+        Body = 50,
+
+        /// <summary>
+        /// Deep Intrusion.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Deep Intrusion.")]
+        DeepIntrusion = 60,
+
+        /// <summary>
+        /// Multifunction.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Multifunction.")]
+        Multifunction = 100,
+
+        /// <summary>
+        /// Point Detonation (PD).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Point Detonation (PD).")]
+        PointDetonationPD = 200,
+
+        /// <summary>
+        /// Base Detonation (BD).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Base Detonation (BD).")]
+        BaseDetonationBD = 300,
+
+        /// <summary>
+        /// Contact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact.")]
+        Contact = 1000,
+
+        /// <summary>
+        /// Contact, Instant (Impact).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Instant (Impact).")]
+        ContactInstantImpact = 1100,
+
+        /// <summary>
+        /// Contact, Delayed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Delayed.")]
+        ContactDelayed = 1200,
+
+        /// <summary>
+        /// 10 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("10 ms delay.")]
+        _10MsDelay = 1201,
+
+        /// <summary>
+        /// 20 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("20 ms delay.")]
+        _20MsDelay = 1202,
+
+        /// <summary>
+        /// 50 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("50 ms delay.")]
+        _50MsDelay = 1205,
+
+        /// <summary>
+        /// 60 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("60 ms delay.")]
+        _60MsDelay = 1206,
+
+        /// <summary>
+        /// 100 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("100 ms delay.")]
+        _100MsDelay = 1210,
+
+        /// <summary>
+        /// 125 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("125 ms delay.")]
+        _125MsDelay = 1212,
+
+        /// <summary>
+        /// 250 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("250 ms delay.")]
+        _250MsDelay = 1225,
+
+        /// <summary>
+        /// Contact, Electronic (Oblique Contact).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Electronic (Oblique Contact).")]
+        ContactElectronicObliqueContact = 1300,
+
+        /// <summary>
+        /// Contact, Graze.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Graze.")]
+        ContactGraze = 1400,
+
+        /// <summary>
+        /// Contact, Crush.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Crush.")]
+        ContactCrush = 1500,
+
+        /// <summary>
+        /// Contact, Hydrostatic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Hydrostatic.")]
+        ContactHydrostatic = 1600,
+
+        /// <summary>
+        /// Contact, Mechanical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Mechanical.")]
+        ContactMechanical = 1700,
+
+        /// <summary>
+        /// Contact, Chemical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Chemical.")]
+        ContactChemical = 1800,
+
+        /// <summary>
+        /// Contact, Piezoelectric.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Piezoelectric.")]
+        ContactPiezoelectric = 1900,
+
+        /// <summary>
+        /// Contact, Point Initiating.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Point Initiating.")]
+        ContactPointInitiating = 1910,
+
+        /// <summary>
+        /// Contact, Point Initiating, Base Detonating.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Point Initiating, Base Detonating.")]
+        ContactPointInitiatingBaseDetonating = 1920,
+
+        /// <summary>
+        /// Contact, Base Detonating.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Base Detonating.")]
+        ContactBaseDetonating = 1930,
+
+        /// <summary>
+        /// Contact, Ballistic Cap and Base.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Ballistic Cap and Base.")]
+        ContactBallisticCapAndBase = 1940,
+
+        /// <summary>
+        /// Contact, Base.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Base.")]
+        ContactBase = 1950,
+
+        /// <summary>
+        /// Contact, Nose.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Nose.")]
+        ContactNose = 1960,
+
+        /// <summary>
+        /// Contact, Fitted in Standoff Probe.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Fitted in Standoff Probe.")]
+        ContactFittedInStandoffProbe = 1970,
+
+        /// <summary>
+        /// Contact, Non-aligned.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Contact, Non-aligned.")]
+        ContactNonAligned = 1980,
+
+        /// <summary>
+        /// Timed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed.")]
+        Timed = 2000,
+
+        /// <summary>
+        /// Timed, Programmable.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Programmable.")]
+        TimedProgrammable = 2100,
+
+        /// <summary>
+        /// Timed, Burnout.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Burnout.")]
+        TimedBurnout = 2200,
+
+        /// <summary>
+        /// Timed, Pyrotechnic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Pyrotechnic.")]
+        TimedPyrotechnic = 2300,
+
+        /// <summary>
+        /// Timed, Electronic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Electronic.")]
+        TimedElectronic = 2400,
+
+        /// <summary>
+        /// Timed, Base Delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Base Delay.")]
+        TimedBaseDelay = 2500,
+
+        /// <summary>
+        /// Timed, Reinforced Nose Impact Delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Reinforced Nose Impact Delay.")]
+        TimedReinforcedNoseImpactDelay = 2600,
+
+        /// <summary>
+        /// Timed, Short Delay Impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Short Delay Impact.")]
+        TimedShortDelayImpact = 2700,
+
+        /// <summary>
+        /// 10 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("10 ms delay.")]
+        _10MsDelay_2701 = 2701,
+
+        /// <summary>
+        /// 20 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("20 ms delay.")]
+        _20MsDelay_2702 = 2702,
+
+        /// <summary>
+        /// 50 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("50 ms delay.")]
+        _50MsDelay_2705 = 2705,
+
+        /// <summary>
+        /// 60 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("60 ms delay.")]
+        _60MsDelay_2706 = 2706,
+
+        /// <summary>
+        /// 100 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("100 ms delay.")]
+        _100MsDelay_2710 = 2710,
+
+        /// <summary>
+        /// 125 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("125 ms delay.")]
+        _125MsDelay_2712 = 2712,
+
+        /// <summary>
+        /// 250 ms delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("250 ms delay.")]
+        _250MsDelay_2725 = 2725,
+
+        /// <summary>
+        /// Timed, Nose Mounted Variable Delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Nose Mounted Variable Delay.")]
+        TimedNoseMountedVariableDelay = 2800,
+
+        /// <summary>
+        /// Timed, Long Delay Side.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Long Delay Side.")]
+        TimedLongDelaySide = 2900,
+
+        /// <summary>
+        /// Timed, Selectable Delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Selectable Delay.")]
+        TimedSelectableDelay = 2910,
+
+        /// <summary>
+        /// Timed, Impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Impact.")]
+        TimedImpact = 2920,
+
+        /// <summary>
+        /// Timed, Sequence.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Timed, Sequence.")]
+        TimedSequence = 2930,
+
+        /// <summary>
+        /// Proximity.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity.")]
+        Proximity = 3000,
+
+        /// <summary>
+        /// Proximity, Active Laser.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity, Active Laser.")]
+        ProximityActiveLaser = 3100,
+
+        /// <summary>
+        /// Proximity, Magnetic (Magpolarity).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity, Magnetic (Magpolarity).")]
+        ProximityMagneticMagpolarity = 3200,
+
+        /// <summary>
+        /// Proximity, Active Radar (Doppler Radar).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity, Active Radar (Doppler Radar).")]
+        ProximityActiveRadarDopplerRadar = 3300,
+
+        /// <summary>
+        /// Proximity, Radio Frequency (RF).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity, Radio Frequency (RF).")]
+        ProximityRadioFrequencyRF = 3400,
+
+        /// <summary>
+        /// Proximity, Programmable.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity, Programmable.")]
+        ProximityProgrammable = 3500,
+
+        /// <summary>
+        /// Proximity, Programmable, Prefragmented.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity, Programmable, Prefragmented.")]
+        ProximityProgrammablePrefragmented = 3600,
+
+        /// <summary>
+        /// Proximity, Infrared.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Proximity, Infrared.")]
+        ProximityInfrared = 3700,
+
+        /// <summary>
+        /// Command.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command.")]
+        Command = 4000,
+
+        /// <summary>
+        /// Command, Electronic, Remotely Set.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Command, Electronic, Remotely Set.")]
+        CommandElectronicRemotelySet = 4100,
+
+        /// <summary>
+        /// Altitude.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude.")]
+        Altitude = 5000,
+
+        /// <summary>
+        /// Altitude, Radio Altimeter.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude, Radio Altimeter.")]
+        AltitudeRadioAltimeter = 5100,
+
+        /// <summary>
+        /// Altitude, Air Burst.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Altitude, Air Burst.")]
+        AltitudeAirBurst = 5200,
+
+        /// <summary>
+        /// Depth.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Depth.")]
+        Depth = 6000,
+
+        /// <summary>
+        /// Acoustic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Acoustic.")]
+        Acoustic = 7000,
+
+        /// <summary>
+        /// Pressure.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pressure.")]
+        Pressure = 8000,
+
+        /// <summary>
+        /// Pressure, Delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pressure, Delay.")]
+        PressureDelay = 8010,
+
+        /// <summary>
+        /// Inert.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Inert.")]
+        Inert = 8100,
+
+        /// <summary>
+        /// Dummy.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dummy.")]
+        Dummy = 8110,
+
+        /// <summary>
+        /// Practice.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Practice.")]
+        Practice = 8120,
+
+        /// <summary>
+        /// Plug Representing.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Plug Representing.")]
+        PlugRepresenting = 8130,
+
+        /// <summary>
+        /// Training.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Training.")]
+        Training = 8150,
+
+        /// <summary>
+        /// Pyrotechnic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pyrotechnic.")]
+        Pyrotechnic = 9000,
+
+        /// <summary>
+        /// Pyrotechnic, Delay.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Pyrotechnic, Delay.")]
+        PyrotechnicDelay = 9010,
+
+        /// <summary>
+        /// Electro-optical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electro-optical.")]
+        ElectroOptical = 9100,
+
+        /// <summary>
+        /// Electromechanical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electromechanical.")]
+        Electromechanical = 9110,
+
+        /// <summary>
+        /// Electromechanical, Nose.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electromechanical, Nose.")]
+        ElectromechanicalNose = 9120,
+
+        /// <summary>
+        /// Strikerless.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strikerless.")]
+        Strikerless = 9200,
+
+        /// <summary>
+        /// Strikerless, Nose Impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strikerless, Nose Impact.")]
+        StrikerlessNoseImpact = 9210,
+
+        /// <summary>
+        /// Strikerless, Compression-Ignition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Strikerless, Compression-Ignition.")]
+        StrikerlessCompressionIgnition = 9220,
+
+        /// <summary>
+        /// Compression-Ignition.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Compression-Ignition.")]
+        CompressionIgnition = 9300,
+
+        /// <summary>
+        /// Compression-Ignition, Strikerless, Nose Impact.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Compression-Ignition, Strikerless, Nose Impact.")]
+        CompressionIgnitionStrikerlessNoseImpact = 9310,
+
+        /// <summary>
+        /// Percussion.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Percussion.")]
+        Percussion = 9400,
+
+        /// <summary>
+        /// Percussion, Instantaneous.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Percussion, Instantaneous.")]
+        PercussionInstantaneous = 9410,
+
+        /// <summary>
+        /// Electronic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electronic.")]
+        Electronic = 9500,
+
+        /// <summary>
+        /// Electronic, Internally Mounted.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electronic, Internally Mounted.")]
+        ElectronicInternallyMounted = 9510,
+
+        /// <summary>
+        /// Electronic, Range Setting.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electronic, Range Setting.")]
+        ElectronicRangeSetting = 9520,
+
+        /// <summary>
+        /// Electronic, Programmed.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Electronic, Programmed.")]
+        ElectronicProgrammed = 9530,
+
+        /// <summary>
+        /// Mechanical.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mechanical.")]
+        Mechanical = 9600,
+
+        /// <summary>
+        /// Mechanical, Nose.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mechanical, Nose.")]
+        MechanicalNose = 9610,
+
+        /// <summary>
+        /// Mechanical, Tail.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mechanical, Tail.")]
+        MechanicalTail = 9620
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Warhead.cs b/Libs/CsharpDis6/Enumerations/Warfare/Warhead.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Warhead.cs
rename to Libs/CsharpDis6/Enumerations/Warfare/Warhead.cs
index 19fc8e2..f4e8142 100644
--- a/Libs/CsharpDis6/OpenDis/Enumerations/Warfare/Warhead.cs
+++ b/Libs/CsharpDis6/Enumerations/Warfare/Warhead.cs
@@ -1,709 +1,709 @@
-// Copyright 2008-2011. This work is licensed under the BSD license, available at
-// http://www.movesinstitute.org/licenses
-//
-// Orignal authors: DMcG, Jason Nelson
-// Modified for use with C#:
-// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
-// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace OpenDis.Enumerations.Warfare
-{
-    /// <summary>
-    /// Enumeration values for Warhead (warfare.burstdescriptor.warhead, Warhead, 
-    /// section 5.1.1)
-    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
-    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
-    /// </summary>
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-    [Serializable]
-    public enum Warhead : ushort
-    {
-        /// <summary>
-        /// Other.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Other.")]
-        Other = 0,
-
-        /// <summary>
-        /// Cargo (Variable Submunitions).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Cargo (Variable Submunitions).")]
-        CargoVariableSubmunitions = 10,
-
-        /// <summary>
-        /// Fuel/Air Explosive.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Fuel/Air Explosive.")]
-        FuelAirExplosive = 20,
-
-        /// <summary>
-        /// Glass Beads.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Glass Beads.")]
-        GlassBeads = 30,
-
-        /// <summary>
-        /// 1 um.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("1 um.")]
-        _1Um = 31,
-
-        /// <summary>
-        /// 5 um.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("5 um.")]
-        _5Um = 32,
-
-        /// <summary>
-        /// 10 um.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("10 um.")]
-        _10Um = 33,
-
-        /// <summary>
-        /// High Explosive (HE).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("High Explosive (HE).")]
-        HighExplosiveHE = 1000,
-
-        /// <summary>
-        /// HE, Plastic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Plastic.")]
-        HEPlastic = 1100,
-
-        /// <summary>
-        /// HE, Incendiary.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Incendiary.")]
-        HEIncendiary = 1200,
-
-        /// <summary>
-        /// HE, Fragmentation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Fragmentation.")]
-        HEFragmentation = 1300,
-
-        /// <summary>
-        /// HE, Antitank.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Antitank.")]
-        HEAntitank = 1400,
-
-        /// <summary>
-        /// HE, Bomblets.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Bomblets.")]
-        HEBomblets = 1500,
-
-        /// <summary>
-        /// HE, Shaped Charge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Shaped Charge.")]
-        HEShapedCharge = 1600,
-
-        /// <summary>
-        /// HE, Continuous Rod.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Continuous Rod.")]
-        HEContinuousRod = 1610,
-
-        /// <summary>
-        /// HE, Tungsten Ball.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Tungsten Ball.")]
-        HETungstenBall = 1615,
-
-        /// <summary>
-        /// HE, Blast Fragmentation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Blast Fragmentation.")]
-        HEBlastFragmentation = 1620,
-
-        /// <summary>
-        /// HE, Steerable Darts with HE.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Steerable Darts with HE.")]
-        HESteerableDartsWithHE = 1625,
-
-        /// <summary>
-        /// HE, Darts.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Darts.")]
-        HEDarts = 1630,
-
-        /// <summary>
-        /// HE, Flechettes.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Flechettes.")]
-        HEFlechettes = 1635,
-
-        /// <summary>
-        /// HE, Directed Fragmentation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Directed Fragmentation.")]
-        HEDirectedFragmentation = 1640,
-
-        /// <summary>
-        /// HE, Semi-Armor Piercing (SAP).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Semi-Armor Piercing (SAP).")]
-        HESemiArmorPiercingSAP = 1645,
-
-        /// <summary>
-        /// HE, Shaped Charge Fragmentation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Shaped Charge Fragmentation.")]
-        HEShapedChargeFragmentation = 1650,
-
-        /// <summary>
-        /// HE, Semi-Armor Piercing, Fragmentation.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Semi-Armor Piercing, Fragmentation.")]
-        HESemiArmorPiercingFragmentation = 1655,
-
-        /// <summary>
-        /// HE, Hollow Charge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Hollow Charge.")]
-        HEHollowCharge = 1660,
-
-        /// <summary>
-        /// HE, Double Hollow Charge.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Double Hollow Charge.")]
-        HEDoubleHollowCharge = 1665,
-
-        /// <summary>
-        /// HE, General Purpose.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, General Purpose.")]
-        HEGeneralPurpose = 1670,
-
-        /// <summary>
-        /// HE, Blast Penetrator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Blast Penetrator.")]
-        HEBlastPenetrator = 1675,
-
-        /// <summary>
-        /// HE, Rod Penetrator.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Rod Penetrator.")]
-        HERodPenetrator = 1680,
-
-        /// <summary>
-        /// HE, Antipersonnel.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HE, Antipersonnel.")]
-        HEAntipersonnel = 1685,
-
-        /// <summary>
-        /// Smoke.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Smoke.")]
-        Smoke = 2000,
-
-        /// <summary>
-        /// Illumination.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Illumination.")]
-        Illumination = 3000,
-
-        /// <summary>
-        /// Practice.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Practice.")]
-        Practice = 4000,
-
-        /// <summary>
-        /// Kinetic.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Kinetic.")]
-        Kinetic = 5000,
-
-        /// <summary>
-        /// Mines.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Mines.")]
-        Mines = 6000,
-
-        /// <summary>
-        /// Nuclear.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nuclear.")]
-        Nuclear = 7000,
-
-        /// <summary>
-        /// Nuclear, IMT.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Nuclear, IMT.")]
-        NuclearIMT = 7010,
-
-        /// <summary>
-        /// Chemical, General.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical, General.")]
-        ChemicalGeneral = 8000,
-
-        /// <summary>
-        /// Chemical, Blister Agent.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical, Blister Agent.")]
-        ChemicalBlisterAgent = 8100,
-
-        /// <summary>
-        /// HD (Mustard).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("HD (Mustard).")]
-        HDMustard = 8110,
-
-        /// <summary>
-        /// Thickened HD (Mustard).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thickened HD (Mustard).")]
-        ThickenedHDMustard = 8115,
-
-        /// <summary>
-        /// Dusty HD (Mustard).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dusty HD (Mustard).")]
-        DustyHDMustard = 8120,
-
-        /// <summary>
-        /// Chemical, Blood Agent.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical, Blood Agent.")]
-        ChemicalBloodAgent = 8200,
-
-        /// <summary>
-        /// AC (HCN).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("AC (HCN).")]
-        ACHCN = 8210,
-
-        /// <summary>
-        /// CK (CNCI).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CK (CNCI).")]
-        CKCNCI = 8215,
-
-        /// <summary>
-        /// CG (Phosgene).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("CG (Phosgene).")]
-        CGPhosgene = 8220,
-
-        /// <summary>
-        /// Chemical, Nerve Agent.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Chemical, Nerve Agent.")]
-        ChemicalNerveAgent = 8300,
-
-        /// <summary>
-        /// VX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("VX.")]
-        VX = 8310,
-
-        /// <summary>
-        /// Thickened VX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thickened VX.")]
-        ThickenedVX = 8315,
-
-        /// <summary>
-        /// Dusty VX.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dusty VX.")]
-        DustyVX = 8320,
-
-        /// <summary>
-        /// GA (Tabun).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GA (Tabun).")]
-        GATabun = 8325,
-
-        /// <summary>
-        /// Thickened GA (Tabun).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thickened GA (Tabun).")]
-        ThickenedGATabun = 8330,
-
-        /// <summary>
-        /// Dusty GA (Tabun).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dusty GA (Tabun).")]
-        DustyGATabun = 8335,
-
-        /// <summary>
-        /// GB (Sarin).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GB (Sarin).")]
-        GBSarin = 8340,
-
-        /// <summary>
-        /// Thickened GB (Sarin).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thickened GB (Sarin).")]
-        ThickenedGBSarin = 8345,
-
-        /// <summary>
-        /// Dusty GB (Sarin).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dusty GB (Sarin).")]
-        DustyGBSarin = 8350,
-
-        /// <summary>
-        /// GD (Soman).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GD (Soman).")]
-        GDSoman = 8355,
-
-        /// <summary>
-        /// Thickened GD (Soman).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thickened GD (Soman).")]
-        ThickenedGDSoman = 8360,
-
-        /// <summary>
-        /// Dusty GD (Soman).
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dusty GD (Soman).")]
-        DustyGDSoman = 8365,
-
-        /// <summary>
-        /// GF.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("GF.")]
-        GF = 8370,
-
-        /// <summary>
-        /// Thickened GF.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Thickened GF.")]
-        ThickenedGF = 8375,
-
-        /// <summary>
-        /// Dusty GF.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Dusty GF.")]
-        DustyGF = 8380,
-
-        /// <summary>
-        /// Biological.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological.")]
-        Biological = 9000,
-
-        /// <summary>
-        /// Biological, Virus.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological, Virus.")]
-        BiologicalVirus = 9100,
-
-        /// <summary>
-        /// Biological, Bacteria.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological, Bacteria.")]
-        BiologicalBacteria = 9200,
-
-        /// <summary>
-        /// Biological, Rickettsia.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological, Rickettsia.")]
-        BiologicalRickettsia = 9300,
-
-        /// <summary>
-        /// Biological, Genetically Modified Micro-organisms.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological, Genetically Modified Micro-organisms.")]
-        BiologicalGeneticallyModifiedMicroOrganisms = 9400,
-
-        /// <summary>
-        /// Biological, Toxin.
-        /// </summary>
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
-        [Description("Biological, Toxin.")]
-        BiologicalToxin = 9500
-    }
-}
+// Copyright 2008-2011. This work is licensed under the BSD license, available at
+// http://www.movesinstitute.org/licenses
+//
+// Orignal authors: DMcG, Jason Nelson
+// Modified for use with C#:
+// - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+// - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace OpenDis.Enumerations.Warfare
+{
+    /// <summary>
+    /// Enumeration values for Warhead (warfare.burstdescriptor.warhead, Warhead, 
+    /// section 5.1.1)
+    /// The enumeration values are generated from the SISO DIS XML EBV document (R35), which was
+    /// obtained from http://discussions.sisostds.org/default.asp?action=10&amp;fd=31
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+    [Serializable]
+    public enum Warhead : ushort
+    {
+        /// <summary>
+        /// Other.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Other.")]
+        Other = 0,
+
+        /// <summary>
+        /// Cargo (Variable Submunitions).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Cargo (Variable Submunitions).")]
+        CargoVariableSubmunitions = 10,
+
+        /// <summary>
+        /// Fuel/Air Explosive.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Fuel/Air Explosive.")]
+        FuelAirExplosive = 20,
+
+        /// <summary>
+        /// Glass Beads.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Glass Beads.")]
+        GlassBeads = 30,
+
+        /// <summary>
+        /// 1 um.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("1 um.")]
+        _1Um = 31,
+
+        /// <summary>
+        /// 5 um.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("5 um.")]
+        _5Um = 32,
+
+        /// <summary>
+        /// 10 um.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("10 um.")]
+        _10Um = 33,
+
+        /// <summary>
+        /// High Explosive (HE).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("High Explosive (HE).")]
+        HighExplosiveHE = 1000,
+
+        /// <summary>
+        /// HE, Plastic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Plastic.")]
+        HEPlastic = 1100,
+
+        /// <summary>
+        /// HE, Incendiary.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Incendiary.")]
+        HEIncendiary = 1200,
+
+        /// <summary>
+        /// HE, Fragmentation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Fragmentation.")]
+        HEFragmentation = 1300,
+
+        /// <summary>
+        /// HE, Antitank.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Antitank.")]
+        HEAntitank = 1400,
+
+        /// <summary>
+        /// HE, Bomblets.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Bomblets.")]
+        HEBomblets = 1500,
+
+        /// <summary>
+        /// HE, Shaped Charge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Shaped Charge.")]
+        HEShapedCharge = 1600,
+
+        /// <summary>
+        /// HE, Continuous Rod.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Continuous Rod.")]
+        HEContinuousRod = 1610,
+
+        /// <summary>
+        /// HE, Tungsten Ball.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Tungsten Ball.")]
+        HETungstenBall = 1615,
+
+        /// <summary>
+        /// HE, Blast Fragmentation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Blast Fragmentation.")]
+        HEBlastFragmentation = 1620,
+
+        /// <summary>
+        /// HE, Steerable Darts with HE.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Steerable Darts with HE.")]
+        HESteerableDartsWithHE = 1625,
+
+        /// <summary>
+        /// HE, Darts.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Darts.")]
+        HEDarts = 1630,
+
+        /// <summary>
+        /// HE, Flechettes.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Flechettes.")]
+        HEFlechettes = 1635,
+
+        /// <summary>
+        /// HE, Directed Fragmentation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Directed Fragmentation.")]
+        HEDirectedFragmentation = 1640,
+
+        /// <summary>
+        /// HE, Semi-Armor Piercing (SAP).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Semi-Armor Piercing (SAP).")]
+        HESemiArmorPiercingSAP = 1645,
+
+        /// <summary>
+        /// HE, Shaped Charge Fragmentation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Shaped Charge Fragmentation.")]
+        HEShapedChargeFragmentation = 1650,
+
+        /// <summary>
+        /// HE, Semi-Armor Piercing, Fragmentation.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Semi-Armor Piercing, Fragmentation.")]
+        HESemiArmorPiercingFragmentation = 1655,
+
+        /// <summary>
+        /// HE, Hollow Charge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Hollow Charge.")]
+        HEHollowCharge = 1660,
+
+        /// <summary>
+        /// HE, Double Hollow Charge.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Double Hollow Charge.")]
+        HEDoubleHollowCharge = 1665,
+
+        /// <summary>
+        /// HE, General Purpose.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, General Purpose.")]
+        HEGeneralPurpose = 1670,
+
+        /// <summary>
+        /// HE, Blast Penetrator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Blast Penetrator.")]
+        HEBlastPenetrator = 1675,
+
+        /// <summary>
+        /// HE, Rod Penetrator.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Rod Penetrator.")]
+        HERodPenetrator = 1680,
+
+        /// <summary>
+        /// HE, Antipersonnel.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HE, Antipersonnel.")]
+        HEAntipersonnel = 1685,
+
+        /// <summary>
+        /// Smoke.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Smoke.")]
+        Smoke = 2000,
+
+        /// <summary>
+        /// Illumination.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Illumination.")]
+        Illumination = 3000,
+
+        /// <summary>
+        /// Practice.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Practice.")]
+        Practice = 4000,
+
+        /// <summary>
+        /// Kinetic.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Kinetic.")]
+        Kinetic = 5000,
+
+        /// <summary>
+        /// Mines.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Mines.")]
+        Mines = 6000,
+
+        /// <summary>
+        /// Nuclear.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nuclear.")]
+        Nuclear = 7000,
+
+        /// <summary>
+        /// Nuclear, IMT.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Nuclear, IMT.")]
+        NuclearIMT = 7010,
+
+        /// <summary>
+        /// Chemical, General.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical, General.")]
+        ChemicalGeneral = 8000,
+
+        /// <summary>
+        /// Chemical, Blister Agent.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical, Blister Agent.")]
+        ChemicalBlisterAgent = 8100,
+
+        /// <summary>
+        /// HD (Mustard).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("HD (Mustard).")]
+        HDMustard = 8110,
+
+        /// <summary>
+        /// Thickened HD (Mustard).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thickened HD (Mustard).")]
+        ThickenedHDMustard = 8115,
+
+        /// <summary>
+        /// Dusty HD (Mustard).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dusty HD (Mustard).")]
+        DustyHDMustard = 8120,
+
+        /// <summary>
+        /// Chemical, Blood Agent.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical, Blood Agent.")]
+        ChemicalBloodAgent = 8200,
+
+        /// <summary>
+        /// AC (HCN).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("AC (HCN).")]
+        ACHCN = 8210,
+
+        /// <summary>
+        /// CK (CNCI).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CK (CNCI).")]
+        CKCNCI = 8215,
+
+        /// <summary>
+        /// CG (Phosgene).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("CG (Phosgene).")]
+        CGPhosgene = 8220,
+
+        /// <summary>
+        /// Chemical, Nerve Agent.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Chemical, Nerve Agent.")]
+        ChemicalNerveAgent = 8300,
+
+        /// <summary>
+        /// VX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("VX.")]
+        VX = 8310,
+
+        /// <summary>
+        /// Thickened VX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thickened VX.")]
+        ThickenedVX = 8315,
+
+        /// <summary>
+        /// Dusty VX.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dusty VX.")]
+        DustyVX = 8320,
+
+        /// <summary>
+        /// GA (Tabun).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GA (Tabun).")]
+        GATabun = 8325,
+
+        /// <summary>
+        /// Thickened GA (Tabun).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thickened GA (Tabun).")]
+        ThickenedGATabun = 8330,
+
+        /// <summary>
+        /// Dusty GA (Tabun).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dusty GA (Tabun).")]
+        DustyGATabun = 8335,
+
+        /// <summary>
+        /// GB (Sarin).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GB (Sarin).")]
+        GBSarin = 8340,
+
+        /// <summary>
+        /// Thickened GB (Sarin).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thickened GB (Sarin).")]
+        ThickenedGBSarin = 8345,
+
+        /// <summary>
+        /// Dusty GB (Sarin).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dusty GB (Sarin).")]
+        DustyGBSarin = 8350,
+
+        /// <summary>
+        /// GD (Soman).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GD (Soman).")]
+        GDSoman = 8355,
+
+        /// <summary>
+        /// Thickened GD (Soman).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thickened GD (Soman).")]
+        ThickenedGDSoman = 8360,
+
+        /// <summary>
+        /// Dusty GD (Soman).
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dusty GD (Soman).")]
+        DustyGDSoman = 8365,
+
+        /// <summary>
+        /// GF.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("GF.")]
+        GF = 8370,
+
+        /// <summary>
+        /// Thickened GF.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Thickened GF.")]
+        ThickenedGF = 8375,
+
+        /// <summary>
+        /// Dusty GF.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Dusty GF.")]
+        DustyGF = 8380,
+
+        /// <summary>
+        /// Biological.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological.")]
+        Biological = 9000,
+
+        /// <summary>
+        /// Biological, Virus.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological, Virus.")]
+        BiologicalVirus = 9100,
+
+        /// <summary>
+        /// Biological, Bacteria.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological, Bacteria.")]
+        BiologicalBacteria = 9200,
+
+        /// <summary>
+        /// Biological, Rickettsia.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological, Rickettsia.")]
+        BiologicalRickettsia = 9300,
+
+        /// <summary>
+        /// Biological, Genetically Modified Micro-organisms.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological, Genetically Modified Micro-organisms.")]
+        BiologicalGeneticallyModifiedMicroOrganisms = 9400,
+
+        /// <summary>
+        /// Biological, Toxin.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1707:IdentifiersShouldNotContainUnderscores", Justification = "Due to SISO standardized naming.")]
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", Justification = "Due to SISO standardized naming.")]
+        [Description("Biological, Toxin.")]
+        BiologicalToxin = 9500
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/FxCop OpenDis Analysis.FxCop b/Libs/CsharpDis6/FxCop OpenDis Analysis.FxCop
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/FxCop OpenDis Analysis.FxCop
rename to Libs/CsharpDis6/FxCop OpenDis Analysis.FxCop
index a3dfa2e..99ec28a 100644
--- a/Libs/CsharpDis6/OpenDis/FxCop OpenDis Analysis.FxCop	
+++ b/Libs/CsharpDis6/FxCop OpenDis Analysis.FxCop	
@@ -1,7323 +1,7323 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FxCopProject Version="1.36" Name="FxCop OpenDis Analysis">
- <ProjectOptions>
-  <SharedProject>True</SharedProject>
-  <Stylesheet Apply="True">c:\program files (x86)\microsoft fxcop 1.36\Xml\FxCopReport.xsl</Stylesheet>
-  <SaveMessages>
-   <Project Status="Active, Excluded" NewOnly="False" />
-   <Report Status="Active" NewOnly="False" />
-  </SaveMessages>
-  <ProjectFile Compress="True" DefaultTargetCheck="True" DefaultRuleCheck="True" SaveByRuleGroup="" Deterministic="True" />
-  <EnableMultithreadedLoad>True</EnableMultithreadedLoad>
-  <EnableMultithreadedAnalysis>True</EnableMultithreadedAnalysis>
-  <SourceLookup>True</SourceLookup>
-  <AnalysisExceptionsThreshold>10</AnalysisExceptionsThreshold>
-  <RuleExceptionsThreshold>1</RuleExceptionsThreshold>
-  <Spelling Locale="en-US" />
-  <OverrideRuleVisibilities>False</OverrideRuleVisibilities>
-  <CustomDictionaries SearchFxCopDir="True" SearchUserProfile="True" SearchProjectDir="True" />
-  <SearchGlobalAssemblyCache>True</SearchGlobalAssemblyCache>
-  <DeadlockDetectionTimeout>120</DeadlockDetectionTimeout>
-  <IgnoreGeneratedCode>False</IgnoreGeneratedCode>
-  <TargetFrameworkVersion>3.5</TargetFrameworkVersion>
- </ProjectOptions>
- <Targets>
-  <Target Name="$(ProjectDir)/bin/Debug/Asiistech.OpenDis.dll" Analyze="True" AnalyzeAllChildren="True" />
- </Targets>
- <Rules>
-  <RuleFiles>
-   <RuleFile Name="$(FxCopDir)\Rules\DesignRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\GlobalizationRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\InteroperabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\MobilityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\NamingRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\PerformanceRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\PortabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\SecurityRules.dll" Enabled="True" AllRulesEnabled="True" />
-   <RuleFile Name="$(FxCopDir)\Rules\UsageRules.dll" Enabled="True" AllRulesEnabled="True" />
-  </RuleFiles>
-  <Groups />
-  <Settings />
- </Rules>
- <FxCopReport Version="1.36">
-  <Namespaces>
-   <Namespace Name="Asiistech.OpenDis">
-    <Messages>
-     <Message Id="Asiistech" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-      <Issue Name="Namespace">
-       <Item>Asiistech</Item>
-       <Item>Asiistech.OpenDis</Item>
-      </Issue>
-     </Message>
-     <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-      <Issue Name="Namespace">
-       <Item>Dis</Item>
-       <Item>Asiistech.OpenDis</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="DISnet">
-    <Messages>
-     <Message Id="Snet" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-      <Issue Name="Namespace">
-       <Item>Snet</Item>
-       <Item>DISnet</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-   <Namespace Name="DISnet.Utilities">
-    <Messages>
-     <Message Id="Snet" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-      <Issue Name="Namespace">
-       <Item>Snet</Item>
-       <Item>DISnet.Utilities</Item>
-      </Issue>
-     </Message>
-    </Messages>
-   </Namespace>
-  </Namespaces>
-  <Targets>
-   <Target Name="$(ProjectDir)/bin/Debug/Asiistech.OpenDis.dll">
-    <Modules>
-     <Module Name="asiistech.opendis.dll">
-      <Messages>
-       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2010-04-14 11:41:22Z">
-        <Issue Name="NoStrongName">
-         <Item>'Asiistech.OpenDis.dll'</Item>
-        </Issue>
-       </Message>
-       <Message Id="Asiistech" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-        <Issue Name="Assembly">
-         <Item>Asiistech</Item>
-         <Item>'Asiistech.OpenDis.dll'</Item>
-        </Issue>
-       </Message>
-       <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-        <Issue Name="Assembly">
-         <Item>Dis</Item>
-         <Item>'Asiistech.OpenDis.dll'</Item>
-        </Issue>
-       </Message>
-      </Messages>
-      <Namespaces>
-       <Namespace Name="Asiistech.OpenDis">
-        <Types>
-         <Type Name="AcknowledgePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'AcknowledgePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#AcknowledgeFlag">
-            <Messages>
-             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberNoAlternate">
-               <Item>Flag</Item>
-               <Item>'AcknowledgePdu.AcknowledgeFlag'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AcknowledgePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ResponseFlag">
-            <Messages>
-             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberNoAlternate">
-               <Item>Flag</Item>
-               <Item>'AcknowledgePdu.ResponseFlag'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AcknowledgeReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'AcknowledgeReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#AcknowledgeFlag">
-            <Messages>
-             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberNoAlternate">
-               <Item>Flag</Item>
-               <Item>'AcknowledgeReliablePdu.AcknowledgeFlag'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AcknowledgeReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ResponseFlag">
-            <Messages>
-             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberNoAlternate">
-               <Item>Flag</Item>
-               <Item>'AcknowledgeReliablePdu.ResponseFlag'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AcousticBeamData">
-          <Members>
-           <Member Name="#BeamIDNumber">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AcousticBeamData.BeamIDNumber'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AcousticBeamData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AcousticBeamData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AcousticBeamData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AcousticBeamFundamentalParameter">
-          <Members>
-           <Member Name="#AzimuthalBeamwidth">
-            <Messages>
-             <Message Id="Azimuthal" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Azimuthal</Item>
-               <Item>'AcousticBeamFundamentalParameter.AzimuthalBeamwidth'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Beamwidth" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Beamwidth</Item>
-               <Item>'AcousticBeamFundamentalParameter.AzimuthalBeamwidth'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#DeBeamwidth">
-            <Messages>
-             <Message Id="De" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>De</Item>
-               <Item>'AcousticBeamFundamentalParameter.DeBeamwidth'</Item>
-               <Item>DE</Item>
-              </Issue>
-             </Message>
-             <Message Id="Beamwidth" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Beamwidth</Item>
-               <Item>'AcousticBeamFundamentalParameter.DeBeamwidth'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AcousticBeamFundamentalParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AcousticBeamFundamentalParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AcousticBeamFundamentalParameter.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AcousticEmitter">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AcousticEmitter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AcousticEmitter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AcousticEmitter.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AcousticEmitterSystem">
-          <Members>
-           <Member Name="#AcousticID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AcousticEmitterSystem.AcousticID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AcousticEmitterSystem.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AcousticEmitterSystem.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AcousticEmitterSystem.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AcousticEmitterSystemData">
-          <Members>
-           <Member Name="#BeamRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;AcousticBeamData&gt;'</Item>
-               <Item>'AcousticEmitterSystemData.BeamRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AcousticEmitterSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AcousticEmitterSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AcousticEmitterSystemData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ActionRequestPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ActionRequestPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ActionID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ActionRequestPdu.ActionID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#FixedDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'ActionRequestPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'ActionRequestPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ActionRequestPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'ActionRequestPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'ActionRequestPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ActionRequestReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ActionRequestReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ActionID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ActionRequestReliablePdu.ActionID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#FixedDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'ActionRequestReliablePdu.FixedDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ActionRequestReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'ActionRequestReliablePdu.VariableDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ActionResponsePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ActionResponsePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'ActionResponsePdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'ActionResponsePdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ActionResponsePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'ActionResponsePdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'ActionResponsePdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ActionResponseReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ActionResponseReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'ActionResponseReliablePdu.FixedDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ActionResponseReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'ActionResponseReliablePdu.VariableDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AggregateID">
-          <Messages>
-           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-            <Issue Name="TypeAbbreviation">
-             <Item>ID</Item>
-             <Item>'AggregateID'</Item>
-             <Item>Id</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#AggregateID_">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AggregateID.AggregateID_'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>'AggregateID.AggregateID_'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AggregateID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AggregateID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AggregateID.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AggregateMarking">
-          <Members>
-           <Member Name="#Characters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'AggregateMarking.Characters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AggregateMarking.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AggregateMarking.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AggregateMarking.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AggregateStatePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'AggregateStatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#AggregateID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AggregateStatePdu.AggregateID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#AggregateIDList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;AggregateID&gt;'</Item>
-               <Item>'AggregateStatePdu.AggregateIDList'</Item>
-              </Issue>
-             </Message>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AggregateStatePdu.AggregateIDList'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EntityIDList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EntityID&gt;'</Item>
-               <Item>'AggregateStatePdu.EntityIDList'</Item>
-              </Issue>
-             </Message>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AggregateStatePdu.EntityIDList'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ForceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'AggregateStatePdu.ForceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#NumberOfDisAggregates">
-            <Messages>
-             <Message Id="DisAggregates" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberShouldBeDiscreteTerm">
-               <Item>DisAggregates</Item>
-               <Item>'AggregateStatePdu.NumberOfDisAggregates'</Item>
-               <Item>Disaggregates</Item>
-              </Issue>
-             </Message>
-             <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Dis</Item>
-               <Item>'AggregateStatePdu.NumberOfDisAggregates'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#NumberOfDisEntities">
-            <Messages>
-             <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Dis</Item>
-               <Item>'AggregateStatePdu.NumberOfDisEntities'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SilentAggregateSystemList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EntityType&gt;'</Item>
-               <Item>'AggregateStatePdu.SilentAggregateSystemList'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SilentEntitySystemList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EntityType&gt;'</Item>
-               <Item>'AggregateStatePdu.SilentEntitySystemList'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'AggregateStatePdu.VariableDatumList'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AggregateType">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AggregateType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AggregateType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AggregateType.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AngularVelocityVector">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AngularVelocityVector.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AngularVelocityVector.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AngularVelocityVector.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#X">
-            <Messages>
-             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'AngularVelocityVector.X'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Y">
-            <Messages>
-             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'AngularVelocityVector.Y'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Z">
-            <Messages>
-             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'AngularVelocityVector.Z'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="AntennaLocation">
-          <Members>
-           <Member Name="#AntennaLocation_">
-            <Messages>
-             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>'AntennaLocation.AntennaLocation_'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'AntennaLocation.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'AntennaLocation.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'AntennaLocation.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ApaData">
-          <Messages>
-           <Message Id="Apa" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Apa</Item>
-             <Item>'ApaData'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ApaData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ApaData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ApaData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ArealObjectStatePdu">
-          <Messages>
-           <Message Id="Areal" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Areal</Item>
-             <Item>'ArealObjectStatePdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ArealObjectStatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ForceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ArealObjectStatePdu.ForceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ObjectID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ArealObjectStatePdu.ObjectID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ObjectLocation">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Vector3Double&gt;'</Item>
-               <Item>'ArealObjectStatePdu.ObjectLocation'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReceivingID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ArealObjectStatePdu.ReceivingID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReferencedObjectID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ArealObjectStatePdu.ReferencedObjectID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequesterID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ArealObjectStatePdu.RequesterID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ArticulationParameter">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ArticulationParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ArticulationParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ArticulationParameter.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="BeamAntennaPattern">
-          <Members>
-           <Member Name="#AzimuthBeamwidth">
-            <Messages>
-             <Message Id="Beamwidth" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Beamwidth</Item>
-               <Item>'BeamAntennaPattern.AzimuthBeamwidth'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Ex">
-            <Messages>
-             <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberNewerVersion">
-               <Item>Ex</Item>
-               <Item>'BeamAntennaPattern.Ex'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Ez">
-            <Messages>
-             <Message Id="Ez" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Ez</Item>
-               <Item>'BeamAntennaPattern.Ez'</Item>
-               <Item>EZ</Item>
-              </Issue>
-             </Message>
-             <Message Id="Ez" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Ez</Item>
-               <Item>'BeamAntennaPattern.Ez'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'BeamAntennaPattern.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'BeamAntennaPattern.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'BeamAntennaPattern.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="BeamData">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'BeamData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'BeamData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'BeamData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="BurstDescriptor">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'BurstDescriptor.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'BurstDescriptor.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Munition">
-            <Messages>
-             <Message Id="Munition" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Munition</Item>
-               <Item>'BurstDescriptor.Munition'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'BurstDescriptor.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ClockTime">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ClockTime.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ClockTime.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ClockTime.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CollisionElasticPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'CollisionElasticPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#CollidingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CollisionElasticPdu.CollidingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#CollisionEventID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CollisionElasticPdu.CollisionEventID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#IssuingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CollisionElasticPdu.IssuingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CollisionPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'CollisionPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#CollidingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CollisionPdu.CollidingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EventID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CollisionPdu.EventID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#IssuingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CollisionPdu.IssuingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CommentPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'CommentPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'CommentPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'CommentPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'CommentPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'CommentPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CommentReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'CommentReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'CommentReliablePdu.FixedDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'CommentReliablePdu.VariableDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CreateEntityPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'CreateEntityPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CreateEntityPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CreateEntityReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'CreateEntityReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'CreateEntityReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DataPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'DataPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'DataPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'DataPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DataPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'DataPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'DataPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DataQueryPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'DataQueryPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'DataQueryPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'DataQueryPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DataQueryPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'DataQueryPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'DataQueryPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DataQueryReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'DataQueryReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'DataQueryReliablePdu.FixedDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DataQueryReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'DataQueryReliablePdu.VariableDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DataReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'DataReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'DataReliablePdu.FixedDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DataReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'DataReliablePdu.VariableDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DeadReckoningParameter">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'DeadReckoningParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'DeadReckoningParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OtherParameters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'DeadReckoningParameter.OtherParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'DeadReckoningParameter.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DesignatorPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'DesignatorPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#CodeName">
-            <Messages>
-             <Message Id="CodeName" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberShouldBeDiscreteTerm">
-               <Item>CodeName</Item>
-               <Item>'DesignatorPdu.CodeName'</Item>
-               <Item>Codename</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#DesignatedEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DesignatorPdu.DesignatedEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#DesignatingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DesignatorPdu.DesignatingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#DesignatorSpotWrtDesignated">
-            <Messages>
-             <Message Id="Wrt" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Wrt</Item>
-               <Item>'DesignatorPdu.DesignatorSpotWrtDesignated'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DetonationPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'DetonationPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ArticulationParameters">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ArticulationParameter&gt;'</Item>
-               <Item>'DetonationPdu.ArticulationParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EventID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DetonationPdu.EventID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MunitionID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'DetonationPdu.MunitionID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Munition" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Munition</Item>
-               <Item>'DetonationPdu.MunitionID'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DistributedEmissionsFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'DistributedEmissionsFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Equals(Asiistech.OpenDis.DistributedEmissionsFamilyPdu)">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'obj'</Item>
-               <Item>'DistributedEmissionsFamilyPdu.Equals(DistributedEmissionsFamilyPdu)'</Item>
-               <Item>'DistributedEmissionsFamilyPdu'</Item>
-               <Item>'Pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EightByteChunk">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'EightByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'EightByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OtherParameters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'EightByteChunk.OtherParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'EightByteChunk.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ElectronicEmissionBeamData">
-          <Members>
-           <Member Name="#BeamIDNumber">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ElectronicEmissionBeamData.BeamIDNumber'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ElectronicEmissionBeamData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ElectronicEmissionBeamData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#TrackJamTargets">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;TrackJamTarget&gt;'</Item>
-               <Item>'ElectronicEmissionBeamData.TrackJamTargets'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ElectronicEmissionBeamData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ElectronicEmissionsPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ElectronicEmissionsPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#EmittingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ElectronicEmissionsPdu.EmittingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EventID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ElectronicEmissionsPdu.EventID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#PaddingForEmissionsPdu">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'ElectronicEmissionsPdu.PaddingForEmissionsPdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Systems">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ElectronicEmissionSystemData&gt;'</Item>
-               <Item>'ElectronicEmissionsPdu.Systems'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ElectronicEmissionSystemData">
-          <Members>
-           <Member Name="#BeamDataRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ElectronicEmissionBeamData&gt;'</Item>
-               <Item>'ElectronicEmissionSystemData.BeamDataRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ElectronicEmissionSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ElectronicEmissionSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ElectronicEmissionSystemData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EmitterSystem">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'EmitterSystem.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'EmitterSystem.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'EmitterSystem.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EntityID">
-          <Messages>
-           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-            <Issue Name="TypeAbbreviation">
-             <Item>ID</Item>
-             <Item>'EntityID'</Item>
-             <Item>Id</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'EntityID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'EntityID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'EntityID.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EntityInformationFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'EntityInformationFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Equals(Asiistech.OpenDis.EntityInformationFamilyPdu)">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'obj'</Item>
-               <Item>'EntityInformationFamilyPdu.Equals(EntityInformationFamilyPdu)'</Item>
-               <Item>'EntityInformationFamilyPdu'</Item>
-               <Item>'Pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EntityManagementFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'EntityManagementFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Equals(Asiistech.OpenDis.EntityManagementFamilyPdu)">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'obj'</Item>
-               <Item>'EntityManagementFamilyPdu.Equals(EntityManagementFamilyPdu)'</Item>
-               <Item>'EntityManagementFamilyPdu'</Item>
-               <Item>'Pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EntityStatePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'EntityStatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ArticulationParameters">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ArticulationParameter&gt;'</Item>
-               <Item>'EntityStatePdu.ArticulationParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'EntityStatePdu.EntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EntityStateUpdatePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'EntityStateUpdatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ArticulationParameters">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ArticulationParameter&gt;'</Item>
-               <Item>'EntityStateUpdatePdu.ArticulationParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'EntityStateUpdatePdu.EntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EntityType">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'EntityType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'EntityType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'EntityType.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Environment">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Environment.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Environment.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Environment.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EnvironmentalProcessPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'EnvironmentalProcessPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#EnvironementalProcessID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'EnvironmentalProcessPdu.EnvironementalProcessID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Environemental" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Environemental</Item>
-               <Item>'EnvironmentalProcessPdu.EnvironementalProcessID'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EnvironmentRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Environment&gt;'</Item>
-               <Item>'EnvironmentalProcessPdu.EnvironmentRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EventID">
-          <Messages>
-           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-            <Issue Name="TypeAbbreviation">
-             <Item>ID</Item>
-             <Item>'EventID'</Item>
-             <Item>Id</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'EventID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'EventID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'EventID.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EventReportPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'EventReportPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'EventReportPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'EventReportPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'EventReportPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'EventReportPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EventReportReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'EventReportReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'EventReportReliablePdu.FixedDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'EventReportReliablePdu.VariableDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="FastEntityStatePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'FastEntityStatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ArticulationParameters">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ArticulationParameter&gt;'</Item>
-               <Item>'FastEntityStatePdu.ArticulationParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Marking">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'FastEntityStatePdu.Marking'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OtherParameters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'FastEntityStatePdu.OtherParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Psi">
-            <Messages>
-             <Message Id="Psi" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Psi</Item>
-               <Item>'FastEntityStatePdu.Psi'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="FirePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'FirePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#EventID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'FirePdu.EventID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MunitionID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'FirePdu.MunitionID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Munition" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Munition</Item>
-               <Item>'FirePdu.MunitionID'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="FixedDatum">
-          <Members>
-           <Member Name="#FixedDatumID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'FixedDatum.FixedDatumID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'FixedDatum.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'FixedDatum.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'FixedDatum.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="FourByteChunk">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'FourByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'FourByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OtherParameters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'FourByteChunk.OtherParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'FourByteChunk.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="FundamentalParameterData">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'FundamentalParameterData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'FundamentalParameterData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'FundamentalParameterData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="FundamentalParameterDataIff">
-          <Messages>
-           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Iff</Item>
-             <Item>'FundamentalParameterDataIff'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Erp">
-            <Messages>
-             <Message Id="Erp" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Erp</Item>
-               <Item>'FundamentalParameterDataIff.Erp'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'FundamentalParameterDataIff.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'FundamentalParameterDataIff.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Pgrf">
-            <Messages>
-             <Message Id="Pgrf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pgrf</Item>
-               <Item>'FundamentalParameterDataIff.Pgrf'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'FundamentalParameterDataIff.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="GridAxisRecord">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'GridAxisRecord.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'GridAxisRecord.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'GridAxisRecord.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="GridAxisRecordRepresentation0">
-          <Members>
-           <Member Name="#DataValues">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'GridAxisRecordRepresentation0.DataValues'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="GridAxisRecordRepresentation1">
-          <Members>
-           <Member Name="#DataValues">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;TwoByteChunk&gt;'</Item>
-               <Item>'GridAxisRecordRepresentation1.DataValues'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="GridAxisRecordRepresentation2">
-          <Members>
-           <Member Name="#DataValues">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FourByteChunk&gt;'</Item>
-               <Item>'GridAxisRecordRepresentation2.DataValues'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="GriddedDataPdu">
-          <Messages>
-           <Message Id="Gridded" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Gridded</Item>
-             <Item>'GriddedDataPdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'GriddedDataPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#EnvironmentalSimulationApplicationID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'GriddedDataPdu.EnvironmentalSimulationApplicationID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GridDataList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;GridAxisRecord&gt;'</Item>
-               <Item>'GriddedDataPdu.GridDataList'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#PduNumber">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'GriddedDataPdu.PduNumber'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#PduTotal">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'GriddedDataPdu.PduTotal'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IffAtcNavAidsLayer1Pdu">
-          <Messages>
-           <Message Id="Atc" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Atc</Item>
-             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Iff</Item>
-             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Nav" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Nav</Item>
-             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#EventID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IffAtcNavAidsLayer1Pdu.EventID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SystemID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IffAtcNavAidsLayer1Pdu.SystemID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IffAtcNavAidsLayer2Pdu">
-          <Messages>
-           <Message Id="Atc" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Atc</Item>
-             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Iff</Item>
-             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Nav" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Nav</Item>
-             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FundamentalIffParameters">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FundamentalParameterDataIff&gt;'</Item>
-               <Item>'IffAtcNavAidsLayer2Pdu.FundamentalIffParameters'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Iff</Item>
-               <Item>'IffAtcNavAidsLayer2Pdu.FundamentalIffParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IffFundamentalData">
-          <Messages>
-           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Iff</Item>
-             <Item>'IffFundamentalData'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'IffFundamentalData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'IffFundamentalData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'IffFundamentalData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IntercomCommunicationsParameters">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'IntercomCommunicationsParameters.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'IntercomCommunicationsParameters.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'IntercomCommunicationsParameters.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IntercomControlPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'IntercomControlPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#IntercomParameters">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;IntercomCommunicationsParameters&gt;'</Item>
-               <Item>'IntercomControlPdu.IntercomParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MasterCommunicationsDeviceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IntercomControlPdu.MasterCommunicationsDeviceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MasterEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IntercomControlPdu.MasterEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SourceCommunicationsDeviceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IntercomControlPdu.SourceCommunicationsDeviceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SourceEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IntercomControlPdu.SourceEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SourceLineID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IntercomControlPdu.SourceLineID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IntercomSignalPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'IntercomSignalPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#CommunicationsDeviceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IntercomSignalPdu.CommunicationsDeviceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Data">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'IntercomSignalPdu.Data'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IntercomSignalPdu.EntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#TdlType">
-            <Messages>
-             <Message Id="Tdl" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Tdl</Item>
-               <Item>'IntercomSignalPdu.TdlType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IsGroupOfPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'IsGroupOfPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GroupedEntityDescriptions">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'IsGroupOfPdu.GroupedEntityDescriptions'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GroupEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IsGroupOfPdu.GroupEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="IsPartOfPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'IsPartOfPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#NamedLocationID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IsPartOfPdu.NamedLocationID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OrginatingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IsPartOfPdu.OrginatingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Orginating" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Orginating</Item>
-               <Item>'IsPartOfPdu.OrginatingEntityID'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'IsPartOfPdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LayerHeader">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'LayerHeader.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'LayerHeader.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#LayerSpecificInformaiton">
-            <Messages>
-             <Message Id="Informaiton" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Informaiton</Item>
-               <Item>'LayerHeader.LayerSpecificInformaiton'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'LayerHeader.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LinearObjectStatePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'LinearObjectStatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ForceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'LinearObjectStatePdu.ForceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#LinearSegmentParameters">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;LinearSegmentParameter&gt;'</Item>
-               <Item>'LinearObjectStatePdu.LinearSegmentParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ObjectID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'LinearObjectStatePdu.ObjectID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReceivingID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'LinearObjectStatePdu.ReceivingID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReferencedObjectID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'LinearObjectStatePdu.ReferencedObjectID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequesterID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'LinearObjectStatePdu.RequesterID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LinearSegmentParameter">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'LinearSegmentParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'LinearSegmentParameter.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'LinearSegmentParameter.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="LogisticsFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'LogisticsFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Equals(Asiistech.OpenDis.LogisticsFamilyPdu)">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'obj'</Item>
-               <Item>'LogisticsFamilyPdu.Equals(LogisticsFamilyPdu)'</Item>
-               <Item>'LogisticsFamilyPdu'</Item>
-               <Item>'Pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Marking">
-          <Members>
-           <Member Name="#Characters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'Marking.Characters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Marking.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Marking.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Marking.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MinefieldDataPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'MinefieldDataPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#MinefieldID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldDataPdu.MinefieldID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MinefieldSequenceNumbeer">
-            <Messages>
-             <Message Id="Numbeer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Numbeer</Item>
-               <Item>'MinefieldDataPdu.MinefieldSequenceNumbeer'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MineLocation">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Vector3Float&gt;'</Item>
-               <Item>'MinefieldDataPdu.MineLocation'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#NumberOfMinesInThisPdu">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'MinefieldDataPdu.NumberOfMinesInThisPdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#NumberOfPdus">
-            <Messages>
-             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdus</Item>
-               <Item>'MinefieldDataPdu.NumberOfPdus'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#PduSequenceNumber">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'MinefieldDataPdu.PduSequenceNumber'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldDataPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldDataPdu.RequestingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SensorTypes">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;TwoByteChunk&gt;'</Item>
-               <Item>'MinefieldDataPdu.SensorTypes'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MinefieldFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'MinefieldFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Equals(Asiistech.OpenDis.MinefieldFamilyPdu)">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'obj'</Item>
-               <Item>'MinefieldFamilyPdu.Equals(MinefieldFamilyPdu)'</Item>
-               <Item>'MinefieldFamilyPdu'</Item>
-               <Item>'Pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MinefieldQueryPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'MinefieldQueryPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#MinefieldID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldQueryPdu.MinefieldID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestedPerimeterPoints">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Point&gt;'</Item>
-               <Item>'MinefieldQueryPdu.RequestedPerimeterPoints'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldQueryPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldQueryPdu.RequestingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SensorTypes">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;TwoByteChunk&gt;'</Item>
-               <Item>'MinefieldQueryPdu.SensorTypes'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MinefieldResponseNackPdu">
-          <Messages>
-           <Message Id="Nack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Nack</Item>
-             <Item>'MinefieldResponseNackPdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'MinefieldResponseNackPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#MinefieldID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldResponseNackPdu.MinefieldID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MissingPduSequenceNumbers">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EightByteChunk&gt;'</Item>
-               <Item>'MinefieldResponseNackPdu.MissingPduSequenceNumbers'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'MinefieldResponseNackPdu.MissingPduSequenceNumbers'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#NumberOfMissingPdus">
-            <Messages>
-             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdus</Item>
-               <Item>'MinefieldResponseNackPdu.NumberOfMissingPdus'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldResponseNackPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldResponseNackPdu.RequestingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="MinefieldStatePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'MinefieldStatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ForceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldStatePdu.ForceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MinefieldID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'MinefieldStatePdu.MinefieldID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MineType">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EntityType&gt;'</Item>
-               <Item>'MinefieldStatePdu.MineType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#PerimeterPoints">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Point&gt;'</Item>
-               <Item>'MinefieldStatePdu.PerimeterPoints'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ModulationType">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ModulationType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ModulationType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#System_">
-            <Messages>
-             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>'ModulationType.System_'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ModulationType.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="NamedLocation">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'NamedLocation.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'NamedLocation.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'NamedLocation.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ObjectType">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ObjectType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ObjectType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ObjectType.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="OneByteChunk">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'OneByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'OneByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OtherParameters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'OneByteChunk.OtherParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'OneByteChunk.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Orientation">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Orientation.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Orientation.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Psi">
-            <Messages>
-             <Message Id="Psi" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Psi</Item>
-               <Item>'Orientation.Psi'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Orientation.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Pdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'Pdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ExerciseID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'Pdu.ExerciseID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Pdu.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Pdu.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#PduType">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'Pdu.PduType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Pdu.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PduContainer">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'PduContainer'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'PduContainer.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'PduContainer.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#NumberOfPdus">
-            <Messages>
-             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdus</Item>
-               <Item>'PduContainer.NumberOfPdus'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Pdus">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Pdu&gt;'</Item>
-               <Item>'PduContainer.Pdus'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdus</Item>
-               <Item>'PduContainer.Pdus'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduContainer.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Point">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Point.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Point.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Point.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#X">
-            <Messages>
-             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Point.X'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Y">
-            <Messages>
-             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Point.Y'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PointObjectStatePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'PointObjectStatePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ForceID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'PointObjectStatePdu.ForceID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ObjectID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'PointObjectStatePdu.ObjectID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReceivingID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'PointObjectStatePdu.ReceivingID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReferencedObjectID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'PointObjectStatePdu.ReferencedObjectID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequesterID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'PointObjectStatePdu.RequesterID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PropulsionSystemData">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'PropulsionSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'PropulsionSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PropulsionSystemData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="RadioCommunicationsFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'RadioCommunicationsFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="RadioEntityType">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'RadioEntityType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'RadioEntityType.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'RadioEntityType.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ReceiverPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ReceiverPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="RecordQueryReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'RecordQueryReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RecordIDs">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FourByteChunk&gt;'</Item>
-               <Item>'RecordQueryReliablePdu.RecordIDs'</Item>
-              </Issue>
-             </Message>
-             <Message Id="IDs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>IDs</Item>
-               <Item>'RecordQueryReliablePdu.RecordIDs'</Item>
-               <Item>Ids</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RecordQueryReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="RecordSet">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'RecordSet.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'RecordSet.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RecordID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RecordSet.RecordID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'RecordSet.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Relationship">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Relationship.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Relationship.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Relationship.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="RemoveEntityPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'RemoveEntityPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RemoveEntityPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="RemoveEntityReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'RemoveEntityReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RemoveEntityReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="RepairCompletePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'RepairCompletePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RepairCompletePdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RepairingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RepairCompletePdu.RepairingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="RepairResponsePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'RepairResponsePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RepairResponsePdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RepairingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'RepairResponsePdu.RepairingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ResupplyCancelPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ResupplyCancelPdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Resupply</Item>
-             <Item>'ResupplyCancelPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ResupplyCancelPdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SupplyingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ResupplyCancelPdu.SupplyingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ResupplyOfferPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ResupplyOfferPdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Resupply</Item>
-             <Item>'ResupplyOfferPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ResupplyOfferPdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Supplies">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;SupplyQuantity&gt;'</Item>
-               <Item>'ResupplyOfferPdu.Supplies'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SupplyingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ResupplyOfferPdu.SupplyingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ResupplyReceivedPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ResupplyReceivedPdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Resupply</Item>
-             <Item>'ResupplyReceivedPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ResupplyReceivedPdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Supplies">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;SupplyQuantity&gt;'</Item>
-               <Item>'ResupplyReceivedPdu.Supplies'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SupplyingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ResupplyReceivedPdu.SupplyingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SeesPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SeesPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#OrginatingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SeesPdu.OrginatingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Orginating" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Orginating</Item>
-               <Item>'SeesPdu.OrginatingEntityID'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#PropulsionSystemData">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;PropulsionSystemData&gt;'</Item>
-               <Item>'SeesPdu.PropulsionSystemData'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VectoringSystemData">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VectoringNozzleSystemData&gt;'</Item>
-               <Item>'SeesPdu.VectoringSystemData'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ServiceRequestPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'ServiceRequestPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ServiceRequestPdu.RequestingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ServicingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'ServiceRequestPdu.ServicingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Supplies">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;SupplyQuantity&gt;'</Item>
-               <Item>'ServiceRequestPdu.Supplies'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SetDataPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SetDataPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'SetDataPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'SetDataPdu.FixedDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SetDataPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'SetDataPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'SetDataPdu.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SetDataReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SetDataReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FixedDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FixedDatum&gt;'</Item>
-               <Item>'SetDataReliablePdu.FixedDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SetDataReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumRecords">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;VariableDatum&gt;'</Item>
-               <Item>'SetDataReliablePdu.VariableDatumRecords'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SetRecordReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SetRecordReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RecordSets">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;RecordSet&gt;'</Item>
-               <Item>'SetRecordReliablePdu.RecordSets'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SetRecordReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ShaftRPMs">
-          <Messages>
-           <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>RPMs</Item>
-             <Item>'ShaftRPMs'</Item>
-             <Item>Rpms</Item>
-            </Issue>
-           </Message>
-           <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>RPMs</Item>
-             <Item>'ShaftRPMs'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#CurrentShaftRPMs">
-            <Messages>
-             <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>RPMs</Item>
-               <Item>'ShaftRPMs.CurrentShaftRPMs'</Item>
-               <Item>Rpms</Item>
-              </Issue>
-             </Message>
-             <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>RPMs</Item>
-               <Item>'ShaftRPMs.CurrentShaftRPMs'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'ShaftRPMs.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'ShaftRPMs.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OrderedShaftRPMs">
-            <Messages>
-             <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>RPMs</Item>
-               <Item>'ShaftRPMs.OrderedShaftRPMs'</Item>
-               <Item>Rpms</Item>
-              </Issue>
-             </Message>
-             <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>RPMs</Item>
-               <Item>'ShaftRPMs.OrderedShaftRPMs'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ShaftRPMRateOfChange">
-            <Messages>
-             <Message Id="RPM" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>RPM</Item>
-               <Item>'ShaftRPMs.ShaftRPMRateOfChange'</Item>
-               <Item>Rpm</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'ShaftRPMs.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SignalPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SignalPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Data">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'SignalPdu.Data'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#TdlType">
-            <Messages>
-             <Message Id="Tdl" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Tdl</Item>
-               <Item>'SignalPdu.TdlType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SimulationAddress">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'SimulationAddress.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'SimulationAddress.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'SimulationAddress.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SimulationManagementFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SimulationManagementFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#OriginatingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SimulationManagementFamilyPdu.OriginatingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SimulationManagementFamilyPdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SimulationManagementWithReliabilityFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SimulationManagementWithReliabilityFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#OriginatingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SimulationManagementWithReliabilityFamilyPdu.OriginatingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReceivingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'SimulationManagementWithReliabilityFamilyPdu.ReceivingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SixByteChunk">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'SixByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'SixByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OtherParameters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'SixByteChunk.OtherParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'SixByteChunk.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SphericalHarmonicAntennaPattern">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'SphericalHarmonicAntennaPattern.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'SphericalHarmonicAntennaPattern.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'SphericalHarmonicAntennaPattern.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="StartResumePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'StartResumePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'StartResumePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="StartResumeReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'StartResumeReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'StartResumeReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="StopFreezePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'StopFreezePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'StopFreezePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="StopFreezeReliablePdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'StopFreezeReliablePdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'StopFreezeReliablePdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequiredReliablityService">
-            <Messages>
-             <Message Id="Reliablity" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Reliablity</Item>
-               <Item>'StopFreezeReliablePdu.RequiredReliablityService'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SupplyQuantity">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'SupplyQuantity.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'SupplyQuantity.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'SupplyQuantity.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SyntheticEnvironmentFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'SyntheticEnvironmentFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#Equals(Asiistech.OpenDis.SyntheticEnvironmentFamilyPdu)">
-            <Messages>
-             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'obj'</Item>
-               <Item>'SyntheticEnvironmentFamilyPdu.Equals(SyntheticEnvironmentFamilyPdu)'</Item>
-               <Item>'SyntheticEnvironmentFamilyPdu'</Item>
-               <Item>'Pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="SystemID">
-          <Messages>
-           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-            <Issue Name="TypeAbbreviation">
-             <Item>ID</Item>
-             <Item>'SystemID'</Item>
-             <Item>Id</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'SystemID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'SystemID.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'SystemID.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="TrackJamTarget">
-          <Members>
-           <Member Name="#BeamID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'TrackJamTarget.BeamID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EmitterID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'TrackJamTarget.EmitterID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'TrackJamTarget.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'TrackJamTarget.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'TrackJamTarget.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="TransferControlRequestPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'TransferControlRequestPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#OrginatingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'TransferControlRequestPdu.OrginatingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Orginating" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Orginating</Item>
-               <Item>'TransferControlRequestPdu.OrginatingEntityID'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RecevingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'TransferControlRequestPdu.RecevingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-             <Message Id="Receving" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Receving</Item>
-               <Item>'TransferControlRequestPdu.RecevingEntityID'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RecordSets">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;RecordSet&gt;'</Item>
-               <Item>'TransferControlRequestPdu.RecordSets'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#RequestID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'TransferControlRequestPdu.RequestID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#TranferType">
-            <Messages>
-             <Message Id="Tranfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Tranfer</Item>
-               <Item>'TransferControlRequestPdu.TranferType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#TransferEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'TransferControlRequestPdu.TransferEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="TransmitterPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'TransmitterPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#AntennaPatternList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Vector3Float&gt;'</Item>
-               <Item>'TransmitterPdu.AntennaPatternList'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#CryptoSystem">
-            <Messages>
-             <Message Id="CryptoSystem" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberShouldBeDiscreteTerm">
-               <Item>CryptoSystem</Item>
-               <Item>'TransmitterPdu.CryptoSystem'</Item>
-               <Item>Cryptosystem</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ModulationParametersList">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;Vector3Float&gt;'</Item>
-               <Item>'TransmitterPdu.ModulationParametersList'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="TwoByteChunk">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'TwoByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'TwoByteChunk.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#OtherParameters">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'TwoByteChunk.OtherParameters'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'TwoByteChunk.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="UaPdu">
-          <Messages>
-           <Message Id="Ua" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Ua</Item>
-             <Item>'UaPdu'</Item>
-             <Item>UA</Item>
-            </Issue>
-           </Message>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'UaPdu'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Ua" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Ua</Item>
-             <Item>'UaPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ApaData">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ApaData&gt;'</Item>
-               <Item>'UaPdu.ApaData'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Apa" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Apa</Item>
-               <Item>'UaPdu.ApaData'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EmitterSystems">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;AcousticEmitterSystemData&gt;'</Item>
-               <Item>'UaPdu.EmitterSystems'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EmittingEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'UaPdu.EmittingEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EventID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'UaPdu.EventID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#NumberOfAPAs">
-            <Messages>
-             <Message Id="APAs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>APAs</Item>
-               <Item>'UaPdu.NumberOfAPAs'</Item>
-               <Item>Apas</Item>
-              </Issue>
-             </Message>
-             <Message Id="APAs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>APAs</Item>
-               <Item>'UaPdu.NumberOfAPAs'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ShaftRPMs">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;ShaftRPMs&gt;'</Item>
-               <Item>'UaPdu.ShaftRPMs'</Item>
-              </Issue>
-             </Message>
-             <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>RPMs</Item>
-               <Item>'UaPdu.ShaftRPMs'</Item>
-               <Item>Rpms</Item>
-              </Issue>
-             </Message>
-             <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>RPMs</Item>
-               <Item>'UaPdu.ShaftRPMs'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="VariableDatum">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'VariableDatum.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'VariableDatum.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'VariableDatum.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatumID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'VariableDatum.VariableDatumID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#VariableDatums">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EightByteChunk&gt;'</Item>
-               <Item>'VariableDatum.VariableDatums'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Datums</Item>
-               <Item>'VariableDatum.VariableDatums'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Vector3Double">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Vector3Double.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Vector3Double.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Vector3Double.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#X">
-            <Messages>
-             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Vector3Double.X'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Y">
-            <Messages>
-             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Vector3Double.Y'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Z">
-            <Messages>
-             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Vector3Double.Z'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="Vector3Float">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'Vector3Float.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'Vector3Float.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Vector3Float.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#X">
-            <Messages>
-             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Vector3Float.X'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Y">
-            <Messages>
-             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Vector3Float.Y'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Z">
-            <Messages>
-             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberMoreMeaningfulName">
-               <Item>'Vector3Float.Z'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="VectoringNozzleSystemData">
-          <Members>
-           <Member Name="#GetMarshalledSize()">
-            <Messages>
-             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Marshalled</Item>
-               <Item>'VectoringNozzleSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
-              <Issue Certainty="50">
-               <Item>'VectoringNozzleSystemData.GetMarshalledSize()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'VectoringNozzleSystemData.Unmarshal(DataInputStream)'</Item>
-               <Item>dis</Item>
-               <Item>'dis'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="WarfareFamilyPdu">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'WarfareFamilyPdu'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#FiringEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'WarfareFamilyPdu.FiringEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#TargetEntityID">
-            <Messages>
-             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberAbbreviation">
-               <Item>ID</Item>
-               <Item>'WarfareFamilyPdu.TargetEntityID'</Item>
-               <Item>Id</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="DISnet">
-        <Types>
-         <Type Name="AcknowledgeFlag">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'AcknowledgeFlag'</Item>
-            </Issue>
-           </Message>
-           <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-15 07:21:46Z">
-            <Issue Name="TypeNoAlternate">
-             <Item>Flag</Item>
-             <Item>'AcknowledgeFlag'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="AcousticEmitters">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'AcousticEmitters'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'AcousticEmitters'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="AdditionalPassiveActivity">
-          <Members>
-           <Member Name="#ReservedForClassifiedEnumerations">
-            <Messages>
-             <Message TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700" Created="2010-04-15 07:21:46Z">
-              <Issue>
-               <Item>'AdditionalPassiveActivity.ReservedForClassifiedEnumerations'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="ArticulatedPartsIndexNumber">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'ArticulatedPartsIndexNumber'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="ArticulatedPartsOffsetNumber">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'ArticulatedPartsOffsetNumber'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="AttachedParts">
-          <Messages>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'AttachedParts'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="AuxiliaryCraft">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'AuxiliaryCraft'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Byte11">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'Byte11'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="CISWeaponsForLifeForms">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'CISWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'CISWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="CommunicationType">
-          <Members>
-           <Member Name="#Reserved">
-            <Messages>
-             <Message TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700" Created="2010-04-15 07:21:46Z">
-              <Issue>
-               <Item>'CommunicationType.Reserved'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CompanyBatteryTroop">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'CompanyBatteryTroop'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="ControlType">
-          <Members>
-           <Member Name="#Reserved">
-            <Messages>
-             <Message TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700" Created="2010-04-15 07:21:46Z">
-              <Issue>
-               <Item>'ControlType.Reserved'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="CountryType">
-          <Messages>
-           <Message TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027" Created="2010-04-14 11:41:22Z">
-            <Issue>
-             <Item>'CountryType'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="DatumSpecificationRecord">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'DatumSpecificationRecord'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#TrailFlag">
-            <Messages>
-             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-15 07:21:46Z">
-              <Issue Name="MemberNoAlternate">
-               <Item>Flag</Item>
-               <Item>'DatumSpecificationRecord.TrailFlag'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DriveTrain">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'DriveTrain'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="ElectromagneticEmitters">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'ElectromagneticEmitters'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'ElectromagneticEmitters'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Electronics">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'Electronics'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'Electronics'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="FirstCavHighLevelUnit">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'FirstCavHighLevelUnit'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="FirstInfHighLevelUnit">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'FirstInfHighLevelUnit'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="FrenchWeaponsForLifeForms">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'FrenchWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'FrenchWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="FuelSystems">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'FuelSystems'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'FuelSystems'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Function">
-          <Messages>
-           <Message Id="Function" TypeName="IdentifiersShouldNotMatchKeywords" Category="Microsoft.Naming" CheckId="CA1716" Created="2010-04-15 07:21:46Z">
-            <Issue Name="Type">
-             <Item>'Function'</Item>
-             <Item>Function</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="GeometryRecordTypeField">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'GeometryRecordTypeField'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="GermanWeaponsForLifeForms">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'GermanWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'GermanWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Helicopters">
-          <Messages>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'Helicopters'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="HullAirframeBody">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'HullAirframeBody'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="HydraulicSystemsAndActuators">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'HydraulicSystemsAndActuators'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'HydraulicSystemsAndActuators'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="InterfacesWithEnvironment">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'InterfacesWithEnvironment'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="LifeSupportSystems">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'LifeSupportSystems'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'LifeSupportSystems'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="OtherAcousticEmitters">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'OtherAcousticEmitters'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'OtherAcousticEmitters'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="RecordType">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'RecordType'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="ReferenceSystem">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'ReferenceSystem'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="ResponseFlag">
-          <Messages>
-           <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-15 07:21:46Z">
-            <Issue Name="TypeNoAlternate">
-             <Item>Flag</Item>
-             <Item>'ResponseFlag'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="SensorTypes">
-          <Messages>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'SensorTypes'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="StateRecordTypeField">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'StateRecordTypeField'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="SynchronizationState">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'SynchronizationState'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Tanks">
-          <Messages>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'Tanks'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="TDLType">
-          <Messages>
-           <Message TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'TDLType'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="UKWeaponsForLifeForms">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'UKWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'UKWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="UserProtocolIDNum">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'UserProtocolIDNum'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="USWeaponsForLifeForms">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'USWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'USWeaponsForLifeForms'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Vehicle">
-          <Messages>
-           <Message TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'Vehicle'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="Weapons">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'Weapons'</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
-            <Issue>
-             <Item>'Weapons'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="XmitTermPriMode">
-          <Messages>
-           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
-            <Issue Name="NotFlagsNoZeroValue">
-             <Item>'XmitTermPriMode'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-        </Types>
-       </Namespace>
-       <Namespace Name="DISnet.Utilities">
-        <Types>
-         <Type Name="Conversion">
-          <Members>
-           <Member Name="#GetArticulationTypeClass(System.Int32)">
-            <Messages>
-             <Message Id="parametertype" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Conversion.GetArticulationTypeClass(int)'</Item>
-               <Item>parametertype</Item>
-               <Item>'parametertype'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetArticulationTypeMetric(System.Int32)">
-            <Messages>
-             <Message Id="parametertype" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Conversion.GetArticulationTypeMetric(int)'</Item>
-               <Item>parametertype</Item>
-               <Item>'parametertype'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#MakeArticulationParameterType(System.UInt32,System.UInt32)">
-            <Messages>
-             <Message Id="typeclass" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Conversion.MakeArticulationParameterType(uint, uint)'</Item>
-               <Item>typeclass</Item>
-               <Item>'typeclass'</Item>
-              </Issue>
-             </Message>
-             <Message Id="typemetric" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'Conversion.MakeArticulationParameterType(uint, uint)'</Item>
-               <Item>typemetric</Item>
-               <Item>'typemetric'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DataInputStream">
-          <Messages>
-           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
-            <Issue Name="TypeNoAlternate">
-             <Item>'DataInputStream'</Item>
-             <Item>Stream</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ReadFloat()">
-            <Messages>
-             <Message Id="float" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Float</Item>
-               <Item>'DataInputStream.ReadFloat()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReadInt()">
-            <Messages>
-             <Message Id="int" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Int</Item>
-               <Item>'DataInputStream.ReadInt()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReadLong()">
-            <Messages>
-             <Message Id="long" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Long</Item>
-               <Item>'DataInputStream.ReadLong()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReadShort()">
-            <Messages>
-             <Message Id="short" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Short</Item>
-               <Item>'DataInputStream.ReadShort()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReadUnsignedByte()">
-            <Messages>
-             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Unsigned</Item>
-               <Item>'DataInputStream.ReadUnsignedByte()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReadUnsignedInt()">
-            <Messages>
-             <Message Id="int" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Int</Item>
-               <Item>'DataInputStream.ReadUnsignedInt()'</Item>
-              </Issue>
-             </Message>
-             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Unsigned</Item>
-               <Item>'DataInputStream.ReadUnsignedInt()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReadUnsignedLong()">
-            <Messages>
-             <Message Id="long" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Long</Item>
-               <Item>'DataInputStream.ReadUnsignedLong()'</Item>
-              </Issue>
-             </Message>
-             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Unsigned</Item>
-               <Item>'DataInputStream.ReadUnsignedLong()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReadUnsignedShort()">
-            <Messages>
-             <Message Id="short" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Short</Item>
-               <Item>'DataInputStream.ReadUnsignedShort()'</Item>
-              </Issue>
-             </Message>
-             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
-              <Issue Name="LanguageSpecificMember">
-               <Item>Unsigned</Item>
-               <Item>'DataInputStream.ReadUnsignedShort()'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DataOutputStream">
-          <Messages>
-           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
-            <Issue Name="TypeNoAlternate">
-             <Item>'DataOutputStream'</Item>
-             <Item>Stream</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="DataStream">
-          <Messages>
-           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
-            <Issue Name="TypeNoAlternate">
-             <Item>'DataStream'</Item>
-             <Item>Stream</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ReturnByteArray(System.Byte[],System.Int32,System.Int32)">
-            <Messages>
-             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2010-04-14 11:41:22Z" FixCategory="DependsOnFix">
-              <Issue>
-               <Item>'DataStream.ReturnByteArray(byte[], int, int)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#StreamByteArray">
-            <Messages>
-             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'DataStream.StreamByteArray'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DIS1998ChunkConverter">
-          <Messages>
-           <Message Id="DIS" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>DIS</Item>
-             <Item>'DIS1998ChunkConverter'</Item>
-             <Item>Dis</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ArrayToEightByteChunks(System.Array)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EightByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.ArrayToEightByteChunks(Array)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ArrayToFourByteChunks(System.Array)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FourByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.ArrayToFourByteChunks(Array)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ArrayToTwoByteChunks(System.Array)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;TwoByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.ArrayToTwoByteChunks(Array)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#EightByteChunksToArray(System.Collections.Generic.List`1&lt;Asiistech.OpenDis.EightByteChunk&gt;)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EightByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.EightByteChunksToArray(List&lt;EightByteChunk&gt;)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#FourByteChunksToArray(System.Collections.Generic.List`1&lt;Asiistech.OpenDis.FourByteChunk&gt;)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FourByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.FourByteChunksToArray(List&lt;FourByteChunk&gt;)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#StringToEightByteChunks(System.String)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;EightByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.StringToEightByteChunks(string)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#StringToFourByteChunks(System.String)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;FourByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.StringToFourByteChunks(string)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#StringToTwoByteChunks(System.String)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;TwoByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.StringToTwoByteChunks(string)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#TwoByteChunksToArray(System.Collections.Generic.List`1&lt;Asiistech.OpenDis.TwoByteChunk&gt;)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;TwoByteChunk&gt;'</Item>
-               <Item>'DIS1998ChunkConverter.TwoByteChunksToArray(List&lt;TwoByteChunk&gt;)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="DISEnumerations">
-          <Messages>
-           <Message Id="DIS" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-15 08:17:15Z">
-            <Issue Name="Type">
-             <Item>DIS</Item>
-             <Item>'DISEnumerations'</Item>
-             <Item>Dis</Item>
-            </Issue>
-           </Message>
-           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2010-04-15 08:17:15Z">
-            <Issue>
-             <Item>'DISEnumerations'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#EnumerationForValueExists`1(System.Int32)">
-            <Messages>
-             <Message TypeName="GenericMethodsShouldProvideTypeParameter" Category="Microsoft.Design" CheckId="CA1004" Created="2010-04-15 08:17:15Z">
-              <Issue>
-               <Item>'DISEnumerations.EnumerationForValueExists&lt;T&gt;(int)'</Item>
-               <Item>'T'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetEnumerationForValue`1(System.Int32)">
-            <Messages>
-             <Message TypeName="GenericMethodsShouldProvideTypeParameter" Category="Microsoft.Design" CheckId="CA1004" Created="2010-04-15 08:17:15Z">
-              <Issue>
-               <Item>'DISEnumerations.GetEnumerationForValue&lt;T&gt;(int)'</Item>
-               <Item>'T'</Item>
-              </Issue>
-             </Message>
-             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2010-04-15 08:17:15Z">
-              <Issue>
-               <Item>'int.ToString()'</Item>
-               <Item>'DISEnumerations.GetEnumerationForValue&lt;T&gt;(int)'</Item>
-               <Item>'int.ToString(IFormatProvider)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="EnumNotFoundException">
-          <Messages>
-           <Message TypeName="ImplementISerializableCorrectly" Category="Microsoft.Usage" CheckId="CA2240" Created="2010-04-15 08:58:23Z">
-            <Issue>
-             <Item>'EnumNotFoundException'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <Messages>
-             <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2010-04-15 08:58:23Z">
-              <Issue Name="Accessibility">
-               <Item>'EnumNotFoundException.EnumNotFoundException(SerializationInfo, StreamingContext)'</Item>
-               <Item>protected</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="InternetDomainCodeAttribute">
-          <Messages>
-           <Message TypeName="AvoidUnsealedAttributes" Category="Microsoft.Performance" CheckId="CA1813" Created="2010-04-15 08:17:15Z">
-            <Issue>
-             <Item>'InternetDomainCodeAttribute'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-         </Type>
-         <Type Name="PduBank">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'PduBank'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#GetPdu(DISnet.Utilities.PduType1998)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduBank.GetPdu(PduType1998)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduBank.GetPdu(PduType1998)'</Item>
-               <Item>pdu</Item>
-               <Item>'pduType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#GetPdu(System.UInt32)">
-            <Messages>
-             <Message Id="type" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduBank.GetPdu(uint)'</Item>
-               <Item>type</Item>
-               <Item>'pdu_type'</Item>
-               <Item>Type</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduBank.GetPdu(uint)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduBank.GetPdu(uint)'</Item>
-               <Item>pdu</Item>
-               <Item>'pdu_type'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduBank.GetPdu(uint)'</Item>
-               <Item>'pdu_type'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PduProcessor">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'PduProcessor'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ConvertByteArrayToPdu1998(System.Byte,System.Byte[],DISnet.Utilities.Endian)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
-              </Issue>
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
-               <Item>Pdu</Item>
-               <Item>'rawPdu'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
-               <Item>pdu</Item>
-               <Item>'pduType'</Item>
-              </Issue>
-             </Message>
-             <Message Id="ds" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
-               <Item>'ds'</Item>
-               <Item>'DataInputStream'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#DecodePdu(System.Object)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.DecodePdu(object)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.DecodePdu(object)'</Item>
-               <Item>pdu</Item>
-               <Item>'pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessPdu(System.Byte[])">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ProcessPdu(byte[])'</Item>
-               <Item>'object'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;object&gt;'</Item>
-               <Item>'PduProcessor.ProcessPdu(byte[])'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessPdu(byte[])'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessPdu(System.Byte[],DISnet.Utilities.Endian)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;object&gt;'</Item>
-               <Item>'PduProcessor.ProcessPdu(byte[], Endian)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessPdu(byte[], Endian)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessPdu(System.IO.Stream)">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ProcessPdu(Stream)'</Item>
-               <Item>'object'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessPdu(Stream)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessPdu(System.IO.Stream,DISnet.Utilities.Endian)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessPdu(Stream, Endian)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessPdu(System.IO.Stream,DISnet.Utilities.Endian,System.Byte[]&amp;)">
-            <Messages>
-             <Message Id="2#" TypeName="AvoidOutParameters" Category="Microsoft.Design" CheckId="CA1021" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'rawPdu'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessPdu(Stream, Endian, out byte[])'</Item>
-              </Issue>
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.ProcessPdu(Stream, Endian, out byte[])'</Item>
-               <Item>Pdu</Item>
-               <Item>'rawPdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessPdu(System.IO.Stream,System.Byte[]&amp;)">
-            <Messages>
-             <Message Id="1#" TypeName="AvoidOutParameters" Category="Microsoft.Design" CheckId="CA1021" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'rawData'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ProcessPdu(Stream, out byte[])'</Item>
-               <Item>'object'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessPdu(Stream, out byte[])'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessRawPdu(System.Byte[])">
-            <Messages>
-             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
-               <Item>'object'</Item>
-              </Issue>
-             </Message>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;byte[]&gt;'</Item>
-               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pduType" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
-               <Item>'pduType'</Item>
-               <Item>'byte'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pduVersion" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
-               <Item>'pduVersion'</Item>
-               <Item>'byte'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessRawPdu(System.Byte[],DISnet.Utilities.Endian)">
-            <Messages>
-             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'List&lt;byte[]&gt;'</Item>
-               <Item>'PduProcessor.ProcessRawPdu(byte[], Endian)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessRawPdu(byte[], Endian)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ProcessRawPdu(System.Byte[],DISnet.Utilities.Endian,System.Collections.Generic.Queue`1&lt;System.Byte[]&gt;&amp;)">
-            <Messages>
-             <Message Id="2#" TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045" Created="2010-04-14 11:41:22Z">
-              <Issue Level="CriticalWarning">
-               <Item>'dataQueue'</Item>
-              </Issue>
-             </Message>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.ProcessRawPdu(byte[], Endian, ref Queue&lt;byte[]&gt;)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ReturnUnmarshalledPdu(System.Object,DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2010-04-14 11:41:22Z">
-              <Issue>
-               <Item>'PduProcessor.ReturnUnmarshalledPdu(object, DataInputStream)'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#SwitchOnType(System.Byte,System.UInt32,System.Byte[])">
-            <Messages>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.SwitchOnType(byte, uint, byte[])'</Item>
-               <Item>pdu</Item>
-               <Item>'pduType'</Item>
-              </Issue>
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.SwitchOnType(byte, uint, byte[])'</Item>
-               <Item>pdu</Item>
-               <Item>'pduVersion'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#UnmarshalRawPdu(DISnet.Utilities.PduType1998,DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, DataInputStream)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, DataInputStream)'</Item>
-               <Item>pdu</Item>
-               <Item>'pduType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#UnmarshalRawPdu(DISnet.Utilities.PduType1998,System.Byte[],DISnet.Utilities.Endian)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, byte[], Endian)'</Item>
-              </Issue>
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, byte[], Endian)'</Item>
-               <Item>Pdu</Item>
-               <Item>'rawPdu'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, byte[], Endian)'</Item>
-               <Item>pdu</Item>
-               <Item>'pduType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#UnmarshalRawPdu(System.Byte,DISnet.Utilities.DataInputStream)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.UnmarshalRawPdu(byte, DataInputStream)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.UnmarshalRawPdu(byte, DataInputStream)'</Item>
-               <Item>pdu</Item>
-               <Item>'pduType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#UnmarshalRawPdu(System.Byte,System.Byte[],DISnet.Utilities.Endian)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.UnmarshalRawPdu(byte, byte[], Endian)'</Item>
-              </Issue>
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.UnmarshalRawPdu(byte, byte[], Endian)'</Item>
-               <Item>Pdu</Item>
-               <Item>'rawPdu'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.UnmarshalRawPdu(byte, byte[], Endian)'</Item>
-               <Item>pdu</Item>
-               <Item>'pduType'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#XmlDecodePdu(System.Object)">
-            <Messages>
-             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Pdu</Item>
-               <Item>'PduProcessor.XmlDecodePdu(object)'</Item>
-              </Issue>
-             </Message>
-             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="MemberParameter">
-               <Item>'PduProcessor.XmlDecodePdu(object)'</Item>
-               <Item>pdu</Item>
-               <Item>'pdu'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-         <Type Name="PduType1998">
-          <Messages>
-           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-            <Issue Name="Type">
-             <Item>Pdu</Item>
-             <Item>'PduType1998'</Item>
-            </Issue>
-           </Message>
-          </Messages>
-          <Members>
-           <Member Name="#ResupplyCancel">
-            <Messages>
-             <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Resupply</Item>
-               <Item>'PduType1998.ResupplyCancel'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ResupplyOffer">
-            <Messages>
-             <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Resupply</Item>
-               <Item>'PduType1998.ResupplyOffer'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-           <Member Name="#ResupplyReceived">
-            <Messages>
-             <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
-              <Issue Name="Member">
-               <Item>Resupply</Item>
-               <Item>'PduType1998.ResupplyReceived'</Item>
-              </Issue>
-             </Message>
-            </Messages>
-           </Member>
-          </Members>
-         </Type>
-        </Types>
-       </Namespace>
-      </Namespaces>
-     </Module>
-    </Modules>
-   </Target>
-  </Targets>
-  <Rules>
-   <Rule TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210">
-    <Resolution Name="NoStrongName">Sign {0} with a strong name key.</Resolution>
-   </Rule>
-   <Rule TypeName="AvoidOutParameters" Category="Microsoft.Design" CheckId="CA1021">
-    <Resolution Name="Default">Consider a design that does not require that {0} be an out parameter.</Resolution>
-   </Rule>
-   <Rule TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811">
-    <Resolution Name="Default">{0} appears to have no upstream public or protected callers.</Resolution>
-   </Rule>
-   <Rule TypeName="AvoidUnsealedAttributes" Category="Microsoft.Performance" CheckId="CA1813">
-    <Resolution Name="Default">Seal {0}, if possible.</Resolution>
-   </Rule>
-   <Rule TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702">
-    <Resolution Name="MemberShouldBeDiscreteTerm">The compound word '{0}' in member name {1} exists as a discrete term. If your usage is intended to be single word, case it as '{2}' or strip the first token entirely if it represents any sort of Hungarian notation.</Resolution>
-    <Resolution Name="TypeShouldBeDiscreteTerm">The compound word '{0}' in type name {1} exists as a discrete term. If your usage is intended to be single word, case it as '{2}'.</Resolution>
-   </Rule>
-   <Rule TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011">
-    <Resolution Name="Default">Consider changing the type of parameter {0} in {1} from {2} to its base type {3}. This method appears to only require base class members in its implementation. Suppress this violation if there is a compelling reason to require the more derived type in the method signature.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031">
-    <Resolution Name="Default">Modify {0} to catch a more specific exception than {1} or rethrow the exception.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002">
-    <Resolution Name="Default">Change {0} in {1} to use Collection&lt;T&gt;, ReadOnlyCollection&lt;T&gt; or KeyedCollection&lt;K,V&gt;</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700">
-    <Resolution Name="Default">If {0} is not used in the current implementation, remove it. Otherwise give it a meaningful name.</Resolution>
-   </Rule>
-   <Rule TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045">
-    <Resolution Name="Default">Consider a design that does not require that {0} be a reference parameter.</Resolution>
-   </Rule>
-   <Rule TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008">
-    <Resolution Name="NotFlagsNoZeroValue">Add a member to {0} that has a value of zero with a suggested name of 'None'.</Resolution>
-   </Rule>
-   <Rule TypeName="GenericMethodsShouldProvideTypeParameter" Category="Microsoft.Design" CheckId="CA1004">
-    <Resolution Name="Default">Consider a design where {0} doesn't require explicit type parameter {1} in any call to it.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709">
-    <Resolution Name="Member">Correct the casing of '{0}' in member name {1} by changing it to '{2}'.</Resolution>
-    <Resolution Name="MemberAbbreviation">Correct the casing of '{0}' in member name {1} by changing it to '{2}'. '{2}' is an abbreviation and therefore is not subject to acronym casing guidelines.</Resolution>
-    <Resolution Name="MemberParameter">In member {0}, correct the casing of '{1}' in parameter name {2} by changing it to '{3}'.</Resolution>
-    <Resolution Name="Type">Correct the casing of '{0}' in type name {1} by changing it to '{2}'.</Resolution>
-    <Resolution Name="TypeAbbreviation">Correct the casing of '{0}' in type name {1} by changing it to '{2}'. '{2}' is an abbreviation and therefore is not subject to acronym casing guidelines.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704">
-    <Resolution Name="Assembly">Correct the spelling of '{0}' in assembly name {1}.</Resolution>
-    <Resolution Name="Member">Correct the spelling of '{0}' in member name {1} or remove it entirely if it represents any sort of Hungarian notation.</Resolution>
-    <Resolution Name="MemberMoreMeaningfulName">Consider providing a more meaningful name than member name {0}.</Resolution>
-    <Resolution Name="MemberParameter">In method {0}, correct the spelling of '{1}' in parameter name {2} or remove it entirely if it represents any sort of Hungarian notation.</Resolution>
-    <Resolution Name="Namespace">Correct the spelling of '{0}' in namespace name '{1}'.</Resolution>
-    <Resolution Name="Type">Correct the spelling of '{0}' in type name {1}.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720">
-    <Resolution Name="LanguageSpecificMember">Consider replacing the language-specific data type identifier '{0}' in member name {1} with either a language-independent equivalent or a more generic term, such as 'value'.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707">
-    <Resolution Name="Member">Remove the underscores from member name {0}.</Resolution>
-    <Resolution Name="MemberParameter">In member {0}, remove the underscores from parameter name {1}.</Resolution>
-    <Resolution Name="Type">Remove the underscores from type name {0}.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711">
-    <Resolution Name="MemberNewerVersion">Either replace the suffix '{0}' in member name {1} with the suggested numeric alternate '2' or provide a more meaningful suffix that distinguishes it from the member it replaces.</Resolution>
-    <Resolution Name="TypeNoAlternate">Rename type name {0} so that it does not end in '{1}'.</Resolution>
-   </Rule>
-   <Rule TypeName="IdentifiersShouldNotMatchKeywords" Category="Microsoft.Naming" CheckId="CA1716">
-    <Resolution Name="Type">Rename type {0} so that it no longer conflicts with the reserved language keyword '{1}'. Using a reserved keyword as the name of a type makes it harder for consumers in other languages to use the type.</Resolution>
-   </Rule>
-   <Rule TypeName="ImplementISerializableCorrectly" Category="Microsoft.Usage" CheckId="CA2240">
-    <Resolution Name="Default">Add an implementation of GetObjectData to type {0}.</Resolution>
-   </Rule>
-   <Rule TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032">
-    <Resolution Name="Accessibility">Change the accessibility of {0} to {1}.</Resolution>
-   </Rule>
-   <Rule TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027">
-    <Resolution Name="Default">The constituent members of {0} appear to represent flags that can be combined rather than discrete values. If this is correct, mark the enumeration with FlagsAttribute.</Resolution>
-   </Rule>
-   <Rule TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822">
-    <Resolution Name="Default">The 'this' parameter (or 'Me' in Visual Basic) of {0} is never used. Mark the member as static (or Shared in Visual Basic) or use 'this'/'Me' in the method body or at least one property accessor, if appropriate.</Resolution>
-   </Rule>
-   <Rule TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717">
-    <Resolution Name="Default">If the name {0} is plural, change it to its singular form.</Resolution>
-   </Rule>
-   <Rule TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819">
-    <Resolution Name="Default">Change {0} to return a collection or make it a method.</Resolution>
-   </Rule>
-   <Rule TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804">
-    <Resolution Name="Default">{0} declares a variable, {1}, of type {2}, which is never used or is only assigned to. Use this variable or remove it.</Resolution>
-   </Rule>
-   <Rule TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305">
-    <Resolution Name="Default">Because the behavior of {0} could vary based on the current user's locale settings, replace this call in {1} with a call to {2}. If the result of {2} will be displayed to the user, specify 'CultureInfo.CurrentCulture' as the 'IFormatProvider' parameter. Otherwise, if the result will be stored and accessed by software, such as when it is persisted to disk or to a database, specify 'CultureInfo.InvariantCulture'.</Resolution>
-   </Rule>
-   <Rule TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053">
-    <Resolution Name="Default">Remove the public constructors from {0}.</Resolution>
-   </Rule>
-   <Rule TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726">
-    <Resolution Name="MemberNoAlternate">Replace the term '{0}' in member name {1} with an appropriate alternate or remove it entirely.</Resolution>
-    <Resolution Name="TypeNoAlternate">Replace the term '{0}' in type name {1} with an appropriate alternate or remove it entirely.</Resolution>
-   </Rule>
-   <Rule TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024">
-    <Resolution Name="Default">Change {0} to a property if appropriate.</Resolution>
-   </Rule>
-  </Rules>
- </FxCopReport>
-</FxCopProject>
+<?xml version="1.0" encoding="utf-8"?>
+<FxCopProject Version="1.36" Name="FxCop OpenDis Analysis">
+ <ProjectOptions>
+  <SharedProject>True</SharedProject>
+  <Stylesheet Apply="True">c:\program files (x86)\microsoft fxcop 1.36\Xml\FxCopReport.xsl</Stylesheet>
+  <SaveMessages>
+   <Project Status="Active, Excluded" NewOnly="False" />
+   <Report Status="Active" NewOnly="False" />
+  </SaveMessages>
+  <ProjectFile Compress="True" DefaultTargetCheck="True" DefaultRuleCheck="True" SaveByRuleGroup="" Deterministic="True" />
+  <EnableMultithreadedLoad>True</EnableMultithreadedLoad>
+  <EnableMultithreadedAnalysis>True</EnableMultithreadedAnalysis>
+  <SourceLookup>True</SourceLookup>
+  <AnalysisExceptionsThreshold>10</AnalysisExceptionsThreshold>
+  <RuleExceptionsThreshold>1</RuleExceptionsThreshold>
+  <Spelling Locale="en-US" />
+  <OverrideRuleVisibilities>False</OverrideRuleVisibilities>
+  <CustomDictionaries SearchFxCopDir="True" SearchUserProfile="True" SearchProjectDir="True" />
+  <SearchGlobalAssemblyCache>True</SearchGlobalAssemblyCache>
+  <DeadlockDetectionTimeout>120</DeadlockDetectionTimeout>
+  <IgnoreGeneratedCode>False</IgnoreGeneratedCode>
+  <TargetFrameworkVersion>3.5</TargetFrameworkVersion>
+ </ProjectOptions>
+ <Targets>
+  <Target Name="$(ProjectDir)/bin/Debug/Asiistech.OpenDis.dll" Analyze="True" AnalyzeAllChildren="True" />
+ </Targets>
+ <Rules>
+  <RuleFiles>
+   <RuleFile Name="$(FxCopDir)\Rules\DesignRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\GlobalizationRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\InteroperabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\MobilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\NamingRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\PerformanceRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\PortabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\SecurityRules.dll" Enabled="True" AllRulesEnabled="True" />
+   <RuleFile Name="$(FxCopDir)\Rules\UsageRules.dll" Enabled="True" AllRulesEnabled="True" />
+  </RuleFiles>
+  <Groups />
+  <Settings />
+ </Rules>
+ <FxCopReport Version="1.36">
+  <Namespaces>
+   <Namespace Name="Asiistech.OpenDis">
+    <Messages>
+     <Message Id="Asiistech" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+      <Issue Name="Namespace">
+       <Item>Asiistech</Item>
+       <Item>Asiistech.OpenDis</Item>
+      </Issue>
+     </Message>
+     <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+      <Issue Name="Namespace">
+       <Item>Dis</Item>
+       <Item>Asiistech.OpenDis</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="DISnet">
+    <Messages>
+     <Message Id="Snet" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+      <Issue Name="Namespace">
+       <Item>Snet</Item>
+       <Item>DISnet</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+   <Namespace Name="DISnet.Utilities">
+    <Messages>
+     <Message Id="Snet" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+      <Issue Name="Namespace">
+       <Item>Snet</Item>
+       <Item>DISnet.Utilities</Item>
+      </Issue>
+     </Message>
+    </Messages>
+   </Namespace>
+  </Namespaces>
+  <Targets>
+   <Target Name="$(ProjectDir)/bin/Debug/Asiistech.OpenDis.dll">
+    <Modules>
+     <Module Name="asiistech.opendis.dll">
+      <Messages>
+       <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2010-04-14 11:41:22Z">
+        <Issue Name="NoStrongName">
+         <Item>'Asiistech.OpenDis.dll'</Item>
+        </Issue>
+       </Message>
+       <Message Id="Asiistech" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+        <Issue Name="Assembly">
+         <Item>Asiistech</Item>
+         <Item>'Asiistech.OpenDis.dll'</Item>
+        </Issue>
+       </Message>
+       <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+        <Issue Name="Assembly">
+         <Item>Dis</Item>
+         <Item>'Asiistech.OpenDis.dll'</Item>
+        </Issue>
+       </Message>
+      </Messages>
+      <Namespaces>
+       <Namespace Name="Asiistech.OpenDis">
+        <Types>
+         <Type Name="AcknowledgePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'AcknowledgePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#AcknowledgeFlag">
+            <Messages>
+             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberNoAlternate">
+               <Item>Flag</Item>
+               <Item>'AcknowledgePdu.AcknowledgeFlag'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AcknowledgePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ResponseFlag">
+            <Messages>
+             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberNoAlternate">
+               <Item>Flag</Item>
+               <Item>'AcknowledgePdu.ResponseFlag'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AcknowledgeReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'AcknowledgeReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#AcknowledgeFlag">
+            <Messages>
+             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberNoAlternate">
+               <Item>Flag</Item>
+               <Item>'AcknowledgeReliablePdu.AcknowledgeFlag'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AcknowledgeReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ResponseFlag">
+            <Messages>
+             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberNoAlternate">
+               <Item>Flag</Item>
+               <Item>'AcknowledgeReliablePdu.ResponseFlag'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AcousticBeamData">
+          <Members>
+           <Member Name="#BeamIDNumber">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AcousticBeamData.BeamIDNumber'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AcousticBeamData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AcousticBeamData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AcousticBeamData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AcousticBeamFundamentalParameter">
+          <Members>
+           <Member Name="#AzimuthalBeamwidth">
+            <Messages>
+             <Message Id="Azimuthal" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Azimuthal</Item>
+               <Item>'AcousticBeamFundamentalParameter.AzimuthalBeamwidth'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Beamwidth" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Beamwidth</Item>
+               <Item>'AcousticBeamFundamentalParameter.AzimuthalBeamwidth'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#DeBeamwidth">
+            <Messages>
+             <Message Id="De" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>De</Item>
+               <Item>'AcousticBeamFundamentalParameter.DeBeamwidth'</Item>
+               <Item>DE</Item>
+              </Issue>
+             </Message>
+             <Message Id="Beamwidth" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Beamwidth</Item>
+               <Item>'AcousticBeamFundamentalParameter.DeBeamwidth'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AcousticBeamFundamentalParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AcousticBeamFundamentalParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AcousticBeamFundamentalParameter.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AcousticEmitter">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AcousticEmitter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AcousticEmitter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AcousticEmitter.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AcousticEmitterSystem">
+          <Members>
+           <Member Name="#AcousticID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AcousticEmitterSystem.AcousticID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AcousticEmitterSystem.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AcousticEmitterSystem.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AcousticEmitterSystem.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AcousticEmitterSystemData">
+          <Members>
+           <Member Name="#BeamRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;AcousticBeamData&gt;'</Item>
+               <Item>'AcousticEmitterSystemData.BeamRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AcousticEmitterSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AcousticEmitterSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AcousticEmitterSystemData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ActionRequestPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ActionRequestPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ActionID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ActionRequestPdu.ActionID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#FixedDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'ActionRequestPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'ActionRequestPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ActionRequestPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'ActionRequestPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'ActionRequestPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ActionRequestReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ActionRequestReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ActionID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ActionRequestReliablePdu.ActionID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#FixedDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'ActionRequestReliablePdu.FixedDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ActionRequestReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'ActionRequestReliablePdu.VariableDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ActionResponsePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ActionResponsePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'ActionResponsePdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'ActionResponsePdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ActionResponsePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'ActionResponsePdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'ActionResponsePdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ActionResponseReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ActionResponseReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'ActionResponseReliablePdu.FixedDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ActionResponseReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'ActionResponseReliablePdu.VariableDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AggregateID">
+          <Messages>
+           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+            <Issue Name="TypeAbbreviation">
+             <Item>ID</Item>
+             <Item>'AggregateID'</Item>
+             <Item>Id</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#AggregateID_">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AggregateID.AggregateID_'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>'AggregateID.AggregateID_'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AggregateID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AggregateID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AggregateID.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AggregateMarking">
+          <Members>
+           <Member Name="#Characters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'AggregateMarking.Characters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AggregateMarking.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AggregateMarking.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AggregateMarking.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AggregateStatePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'AggregateStatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#AggregateID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AggregateStatePdu.AggregateID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#AggregateIDList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;AggregateID&gt;'</Item>
+               <Item>'AggregateStatePdu.AggregateIDList'</Item>
+              </Issue>
+             </Message>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AggregateStatePdu.AggregateIDList'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EntityIDList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EntityID&gt;'</Item>
+               <Item>'AggregateStatePdu.EntityIDList'</Item>
+              </Issue>
+             </Message>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AggregateStatePdu.EntityIDList'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ForceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'AggregateStatePdu.ForceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#NumberOfDisAggregates">
+            <Messages>
+             <Message Id="DisAggregates" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberShouldBeDiscreteTerm">
+               <Item>DisAggregates</Item>
+               <Item>'AggregateStatePdu.NumberOfDisAggregates'</Item>
+               <Item>Disaggregates</Item>
+              </Issue>
+             </Message>
+             <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Dis</Item>
+               <Item>'AggregateStatePdu.NumberOfDisAggregates'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#NumberOfDisEntities">
+            <Messages>
+             <Message Id="Dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Dis</Item>
+               <Item>'AggregateStatePdu.NumberOfDisEntities'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SilentAggregateSystemList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EntityType&gt;'</Item>
+               <Item>'AggregateStatePdu.SilentAggregateSystemList'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SilentEntitySystemList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EntityType&gt;'</Item>
+               <Item>'AggregateStatePdu.SilentEntitySystemList'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'AggregateStatePdu.VariableDatumList'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AggregateType">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AggregateType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AggregateType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AggregateType.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AngularVelocityVector">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AngularVelocityVector.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AngularVelocityVector.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AngularVelocityVector.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#X">
+            <Messages>
+             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'AngularVelocityVector.X'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Y">
+            <Messages>
+             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'AngularVelocityVector.Y'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Z">
+            <Messages>
+             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'AngularVelocityVector.Z'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="AntennaLocation">
+          <Members>
+           <Member Name="#AntennaLocation_">
+            <Messages>
+             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>'AntennaLocation.AntennaLocation_'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'AntennaLocation.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'AntennaLocation.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'AntennaLocation.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ApaData">
+          <Messages>
+           <Message Id="Apa" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Apa</Item>
+             <Item>'ApaData'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ApaData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ApaData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ApaData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ArealObjectStatePdu">
+          <Messages>
+           <Message Id="Areal" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Areal</Item>
+             <Item>'ArealObjectStatePdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ArealObjectStatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ForceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ArealObjectStatePdu.ForceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ObjectID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ArealObjectStatePdu.ObjectID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ObjectLocation">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Vector3Double&gt;'</Item>
+               <Item>'ArealObjectStatePdu.ObjectLocation'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReceivingID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ArealObjectStatePdu.ReceivingID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReferencedObjectID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ArealObjectStatePdu.ReferencedObjectID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequesterID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ArealObjectStatePdu.RequesterID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ArticulationParameter">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ArticulationParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ArticulationParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ArticulationParameter.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="BeamAntennaPattern">
+          <Members>
+           <Member Name="#AzimuthBeamwidth">
+            <Messages>
+             <Message Id="Beamwidth" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Beamwidth</Item>
+               <Item>'BeamAntennaPattern.AzimuthBeamwidth'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Ex">
+            <Messages>
+             <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberNewerVersion">
+               <Item>Ex</Item>
+               <Item>'BeamAntennaPattern.Ex'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Ez">
+            <Messages>
+             <Message Id="Ez" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Ez</Item>
+               <Item>'BeamAntennaPattern.Ez'</Item>
+               <Item>EZ</Item>
+              </Issue>
+             </Message>
+             <Message Id="Ez" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Ez</Item>
+               <Item>'BeamAntennaPattern.Ez'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'BeamAntennaPattern.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'BeamAntennaPattern.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'BeamAntennaPattern.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="BeamData">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'BeamData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'BeamData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'BeamData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="BurstDescriptor">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'BurstDescriptor.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'BurstDescriptor.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Munition">
+            <Messages>
+             <Message Id="Munition" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Munition</Item>
+               <Item>'BurstDescriptor.Munition'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'BurstDescriptor.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ClockTime">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ClockTime.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ClockTime.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ClockTime.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CollisionElasticPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'CollisionElasticPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#CollidingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CollisionElasticPdu.CollidingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#CollisionEventID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CollisionElasticPdu.CollisionEventID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#IssuingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CollisionElasticPdu.IssuingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CollisionPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'CollisionPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#CollidingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CollisionPdu.CollidingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EventID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CollisionPdu.EventID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#IssuingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CollisionPdu.IssuingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CommentPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'CommentPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'CommentPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'CommentPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'CommentPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'CommentPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CommentReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'CommentReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'CommentReliablePdu.FixedDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'CommentReliablePdu.VariableDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CreateEntityPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'CreateEntityPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CreateEntityPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CreateEntityReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'CreateEntityReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'CreateEntityReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DataPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'DataPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'DataPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'DataPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DataPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'DataPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'DataPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DataQueryPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'DataQueryPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'DataQueryPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'DataQueryPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DataQueryPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'DataQueryPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'DataQueryPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DataQueryReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'DataQueryReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'DataQueryReliablePdu.FixedDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DataQueryReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'DataQueryReliablePdu.VariableDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DataReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'DataReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'DataReliablePdu.FixedDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DataReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'DataReliablePdu.VariableDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DeadReckoningParameter">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'DeadReckoningParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'DeadReckoningParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OtherParameters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'DeadReckoningParameter.OtherParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'DeadReckoningParameter.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DesignatorPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'DesignatorPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#CodeName">
+            <Messages>
+             <Message Id="CodeName" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberShouldBeDiscreteTerm">
+               <Item>CodeName</Item>
+               <Item>'DesignatorPdu.CodeName'</Item>
+               <Item>Codename</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#DesignatedEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DesignatorPdu.DesignatedEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#DesignatingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DesignatorPdu.DesignatingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#DesignatorSpotWrtDesignated">
+            <Messages>
+             <Message Id="Wrt" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Wrt</Item>
+               <Item>'DesignatorPdu.DesignatorSpotWrtDesignated'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DetonationPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'DetonationPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ArticulationParameters">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ArticulationParameter&gt;'</Item>
+               <Item>'DetonationPdu.ArticulationParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EventID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DetonationPdu.EventID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MunitionID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'DetonationPdu.MunitionID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Munition" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Munition</Item>
+               <Item>'DetonationPdu.MunitionID'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DistributedEmissionsFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'DistributedEmissionsFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Equals(Asiistech.OpenDis.DistributedEmissionsFamilyPdu)">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'obj'</Item>
+               <Item>'DistributedEmissionsFamilyPdu.Equals(DistributedEmissionsFamilyPdu)'</Item>
+               <Item>'DistributedEmissionsFamilyPdu'</Item>
+               <Item>'Pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EightByteChunk">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'EightByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'EightByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OtherParameters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'EightByteChunk.OtherParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'EightByteChunk.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ElectronicEmissionBeamData">
+          <Members>
+           <Member Name="#BeamIDNumber">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ElectronicEmissionBeamData.BeamIDNumber'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ElectronicEmissionBeamData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ElectronicEmissionBeamData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#TrackJamTargets">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;TrackJamTarget&gt;'</Item>
+               <Item>'ElectronicEmissionBeamData.TrackJamTargets'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ElectronicEmissionBeamData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ElectronicEmissionsPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ElectronicEmissionsPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#EmittingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ElectronicEmissionsPdu.EmittingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EventID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ElectronicEmissionsPdu.EventID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#PaddingForEmissionsPdu">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'ElectronicEmissionsPdu.PaddingForEmissionsPdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Systems">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ElectronicEmissionSystemData&gt;'</Item>
+               <Item>'ElectronicEmissionsPdu.Systems'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ElectronicEmissionSystemData">
+          <Members>
+           <Member Name="#BeamDataRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ElectronicEmissionBeamData&gt;'</Item>
+               <Item>'ElectronicEmissionSystemData.BeamDataRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ElectronicEmissionSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ElectronicEmissionSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ElectronicEmissionSystemData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EmitterSystem">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'EmitterSystem.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'EmitterSystem.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'EmitterSystem.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EntityID">
+          <Messages>
+           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+            <Issue Name="TypeAbbreviation">
+             <Item>ID</Item>
+             <Item>'EntityID'</Item>
+             <Item>Id</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'EntityID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'EntityID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'EntityID.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EntityInformationFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'EntityInformationFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Equals(Asiistech.OpenDis.EntityInformationFamilyPdu)">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'obj'</Item>
+               <Item>'EntityInformationFamilyPdu.Equals(EntityInformationFamilyPdu)'</Item>
+               <Item>'EntityInformationFamilyPdu'</Item>
+               <Item>'Pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EntityManagementFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'EntityManagementFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Equals(Asiistech.OpenDis.EntityManagementFamilyPdu)">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'obj'</Item>
+               <Item>'EntityManagementFamilyPdu.Equals(EntityManagementFamilyPdu)'</Item>
+               <Item>'EntityManagementFamilyPdu'</Item>
+               <Item>'Pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EntityStatePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'EntityStatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ArticulationParameters">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ArticulationParameter&gt;'</Item>
+               <Item>'EntityStatePdu.ArticulationParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'EntityStatePdu.EntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EntityStateUpdatePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'EntityStateUpdatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ArticulationParameters">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ArticulationParameter&gt;'</Item>
+               <Item>'EntityStateUpdatePdu.ArticulationParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'EntityStateUpdatePdu.EntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EntityType">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'EntityType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'EntityType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'EntityType.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Environment">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Environment.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Environment.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Environment.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EnvironmentalProcessPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'EnvironmentalProcessPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#EnvironementalProcessID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'EnvironmentalProcessPdu.EnvironementalProcessID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Environemental" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Environemental</Item>
+               <Item>'EnvironmentalProcessPdu.EnvironementalProcessID'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EnvironmentRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Environment&gt;'</Item>
+               <Item>'EnvironmentalProcessPdu.EnvironmentRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EventID">
+          <Messages>
+           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+            <Issue Name="TypeAbbreviation">
+             <Item>ID</Item>
+             <Item>'EventID'</Item>
+             <Item>Id</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'EventID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'EventID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'EventID.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EventReportPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'EventReportPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'EventReportPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'EventReportPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'EventReportPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'EventReportPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EventReportReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'EventReportReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'EventReportReliablePdu.FixedDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'EventReportReliablePdu.VariableDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="FastEntityStatePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'FastEntityStatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ArticulationParameters">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ArticulationParameter&gt;'</Item>
+               <Item>'FastEntityStatePdu.ArticulationParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Marking">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'FastEntityStatePdu.Marking'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OtherParameters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'FastEntityStatePdu.OtherParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Psi">
+            <Messages>
+             <Message Id="Psi" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Psi</Item>
+               <Item>'FastEntityStatePdu.Psi'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="FirePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'FirePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#EventID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'FirePdu.EventID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MunitionID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'FirePdu.MunitionID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Munition" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Munition</Item>
+               <Item>'FirePdu.MunitionID'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="FixedDatum">
+          <Members>
+           <Member Name="#FixedDatumID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'FixedDatum.FixedDatumID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'FixedDatum.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'FixedDatum.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'FixedDatum.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="FourByteChunk">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'FourByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'FourByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OtherParameters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'FourByteChunk.OtherParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'FourByteChunk.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="FundamentalParameterData">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'FundamentalParameterData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'FundamentalParameterData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'FundamentalParameterData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="FundamentalParameterDataIff">
+          <Messages>
+           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Iff</Item>
+             <Item>'FundamentalParameterDataIff'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Erp">
+            <Messages>
+             <Message Id="Erp" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Erp</Item>
+               <Item>'FundamentalParameterDataIff.Erp'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'FundamentalParameterDataIff.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'FundamentalParameterDataIff.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Pgrf">
+            <Messages>
+             <Message Id="Pgrf" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pgrf</Item>
+               <Item>'FundamentalParameterDataIff.Pgrf'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'FundamentalParameterDataIff.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="GridAxisRecord">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'GridAxisRecord.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'GridAxisRecord.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'GridAxisRecord.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="GridAxisRecordRepresentation0">
+          <Members>
+           <Member Name="#DataValues">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'GridAxisRecordRepresentation0.DataValues'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="GridAxisRecordRepresentation1">
+          <Members>
+           <Member Name="#DataValues">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;TwoByteChunk&gt;'</Item>
+               <Item>'GridAxisRecordRepresentation1.DataValues'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="GridAxisRecordRepresentation2">
+          <Members>
+           <Member Name="#DataValues">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FourByteChunk&gt;'</Item>
+               <Item>'GridAxisRecordRepresentation2.DataValues'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="GriddedDataPdu">
+          <Messages>
+           <Message Id="Gridded" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Gridded</Item>
+             <Item>'GriddedDataPdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'GriddedDataPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#EnvironmentalSimulationApplicationID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'GriddedDataPdu.EnvironmentalSimulationApplicationID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GridDataList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;GridAxisRecord&gt;'</Item>
+               <Item>'GriddedDataPdu.GridDataList'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#PduNumber">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'GriddedDataPdu.PduNumber'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#PduTotal">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'GriddedDataPdu.PduTotal'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IffAtcNavAidsLayer1Pdu">
+          <Messages>
+           <Message Id="Atc" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Atc</Item>
+             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Iff</Item>
+             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Nav" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Nav</Item>
+             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'IffAtcNavAidsLayer1Pdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#EventID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IffAtcNavAidsLayer1Pdu.EventID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SystemID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IffAtcNavAidsLayer1Pdu.SystemID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IffAtcNavAidsLayer2Pdu">
+          <Messages>
+           <Message Id="Atc" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Atc</Item>
+             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Iff</Item>
+             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Nav" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Nav</Item>
+             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'IffAtcNavAidsLayer2Pdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FundamentalIffParameters">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FundamentalParameterDataIff&gt;'</Item>
+               <Item>'IffAtcNavAidsLayer2Pdu.FundamentalIffParameters'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Iff</Item>
+               <Item>'IffAtcNavAidsLayer2Pdu.FundamentalIffParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IffFundamentalData">
+          <Messages>
+           <Message Id="Iff" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Iff</Item>
+             <Item>'IffFundamentalData'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'IffFundamentalData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'IffFundamentalData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'IffFundamentalData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IntercomCommunicationsParameters">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'IntercomCommunicationsParameters.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'IntercomCommunicationsParameters.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'IntercomCommunicationsParameters.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IntercomControlPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'IntercomControlPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#IntercomParameters">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;IntercomCommunicationsParameters&gt;'</Item>
+               <Item>'IntercomControlPdu.IntercomParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MasterCommunicationsDeviceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IntercomControlPdu.MasterCommunicationsDeviceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MasterEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IntercomControlPdu.MasterEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SourceCommunicationsDeviceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IntercomControlPdu.SourceCommunicationsDeviceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SourceEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IntercomControlPdu.SourceEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SourceLineID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IntercomControlPdu.SourceLineID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IntercomSignalPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'IntercomSignalPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#CommunicationsDeviceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IntercomSignalPdu.CommunicationsDeviceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Data">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'IntercomSignalPdu.Data'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IntercomSignalPdu.EntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#TdlType">
+            <Messages>
+             <Message Id="Tdl" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Tdl</Item>
+               <Item>'IntercomSignalPdu.TdlType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IsGroupOfPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'IsGroupOfPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GroupedEntityDescriptions">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'IsGroupOfPdu.GroupedEntityDescriptions'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GroupEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IsGroupOfPdu.GroupEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="IsPartOfPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'IsPartOfPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#NamedLocationID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IsPartOfPdu.NamedLocationID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OrginatingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IsPartOfPdu.OrginatingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Orginating" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Orginating</Item>
+               <Item>'IsPartOfPdu.OrginatingEntityID'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'IsPartOfPdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LayerHeader">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'LayerHeader.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'LayerHeader.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#LayerSpecificInformaiton">
+            <Messages>
+             <Message Id="Informaiton" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Informaiton</Item>
+               <Item>'LayerHeader.LayerSpecificInformaiton'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'LayerHeader.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LinearObjectStatePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'LinearObjectStatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ForceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'LinearObjectStatePdu.ForceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#LinearSegmentParameters">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;LinearSegmentParameter&gt;'</Item>
+               <Item>'LinearObjectStatePdu.LinearSegmentParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ObjectID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'LinearObjectStatePdu.ObjectID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReceivingID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'LinearObjectStatePdu.ReceivingID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReferencedObjectID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'LinearObjectStatePdu.ReferencedObjectID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequesterID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'LinearObjectStatePdu.RequesterID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LinearSegmentParameter">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'LinearSegmentParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'LinearSegmentParameter.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'LinearSegmentParameter.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="LogisticsFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'LogisticsFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Equals(Asiistech.OpenDis.LogisticsFamilyPdu)">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'obj'</Item>
+               <Item>'LogisticsFamilyPdu.Equals(LogisticsFamilyPdu)'</Item>
+               <Item>'LogisticsFamilyPdu'</Item>
+               <Item>'Pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Marking">
+          <Members>
+           <Member Name="#Characters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'Marking.Characters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Marking.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Marking.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Marking.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MinefieldDataPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'MinefieldDataPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#MinefieldID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldDataPdu.MinefieldID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MinefieldSequenceNumbeer">
+            <Messages>
+             <Message Id="Numbeer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Numbeer</Item>
+               <Item>'MinefieldDataPdu.MinefieldSequenceNumbeer'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MineLocation">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Vector3Float&gt;'</Item>
+               <Item>'MinefieldDataPdu.MineLocation'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#NumberOfMinesInThisPdu">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'MinefieldDataPdu.NumberOfMinesInThisPdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#NumberOfPdus">
+            <Messages>
+             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdus</Item>
+               <Item>'MinefieldDataPdu.NumberOfPdus'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#PduSequenceNumber">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'MinefieldDataPdu.PduSequenceNumber'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldDataPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldDataPdu.RequestingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SensorTypes">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;TwoByteChunk&gt;'</Item>
+               <Item>'MinefieldDataPdu.SensorTypes'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MinefieldFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'MinefieldFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Equals(Asiistech.OpenDis.MinefieldFamilyPdu)">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'obj'</Item>
+               <Item>'MinefieldFamilyPdu.Equals(MinefieldFamilyPdu)'</Item>
+               <Item>'MinefieldFamilyPdu'</Item>
+               <Item>'Pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MinefieldQueryPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'MinefieldQueryPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#MinefieldID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldQueryPdu.MinefieldID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestedPerimeterPoints">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Point&gt;'</Item>
+               <Item>'MinefieldQueryPdu.RequestedPerimeterPoints'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldQueryPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldQueryPdu.RequestingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SensorTypes">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;TwoByteChunk&gt;'</Item>
+               <Item>'MinefieldQueryPdu.SensorTypes'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MinefieldResponseNackPdu">
+          <Messages>
+           <Message Id="Nack" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Nack</Item>
+             <Item>'MinefieldResponseNackPdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'MinefieldResponseNackPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#MinefieldID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldResponseNackPdu.MinefieldID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MissingPduSequenceNumbers">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EightByteChunk&gt;'</Item>
+               <Item>'MinefieldResponseNackPdu.MissingPduSequenceNumbers'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'MinefieldResponseNackPdu.MissingPduSequenceNumbers'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#NumberOfMissingPdus">
+            <Messages>
+             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdus</Item>
+               <Item>'MinefieldResponseNackPdu.NumberOfMissingPdus'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldResponseNackPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldResponseNackPdu.RequestingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="MinefieldStatePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'MinefieldStatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ForceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldStatePdu.ForceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MinefieldID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'MinefieldStatePdu.MinefieldID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MineType">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EntityType&gt;'</Item>
+               <Item>'MinefieldStatePdu.MineType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#PerimeterPoints">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Point&gt;'</Item>
+               <Item>'MinefieldStatePdu.PerimeterPoints'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ModulationType">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ModulationType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ModulationType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#System_">
+            <Messages>
+             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>'ModulationType.System_'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ModulationType.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="NamedLocation">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'NamedLocation.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'NamedLocation.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'NamedLocation.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ObjectType">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ObjectType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ObjectType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ObjectType.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="OneByteChunk">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'OneByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'OneByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OtherParameters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'OneByteChunk.OtherParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'OneByteChunk.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Orientation">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Orientation.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Orientation.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Psi">
+            <Messages>
+             <Message Id="Psi" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Psi</Item>
+               <Item>'Orientation.Psi'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Orientation.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Pdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'Pdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ExerciseID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'Pdu.ExerciseID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Pdu.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Pdu.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#PduType">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'Pdu.PduType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Pdu.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PduContainer">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'PduContainer'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'PduContainer.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'PduContainer.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#NumberOfPdus">
+            <Messages>
+             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdus</Item>
+               <Item>'PduContainer.NumberOfPdus'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Pdus">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Pdu&gt;'</Item>
+               <Item>'PduContainer.Pdus'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdus" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdus</Item>
+               <Item>'PduContainer.Pdus'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduContainer.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Point">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Point.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Point.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Point.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#X">
+            <Messages>
+             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Point.X'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Y">
+            <Messages>
+             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Point.Y'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PointObjectStatePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'PointObjectStatePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ForceID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'PointObjectStatePdu.ForceID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ObjectID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'PointObjectStatePdu.ObjectID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReceivingID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'PointObjectStatePdu.ReceivingID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReferencedObjectID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'PointObjectStatePdu.ReferencedObjectID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequesterID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'PointObjectStatePdu.RequesterID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PropulsionSystemData">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'PropulsionSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'PropulsionSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PropulsionSystemData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="RadioCommunicationsFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'RadioCommunicationsFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="RadioEntityType">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'RadioEntityType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'RadioEntityType.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'RadioEntityType.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ReceiverPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ReceiverPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="RecordQueryReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'RecordQueryReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RecordIDs">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FourByteChunk&gt;'</Item>
+               <Item>'RecordQueryReliablePdu.RecordIDs'</Item>
+              </Issue>
+             </Message>
+             <Message Id="IDs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>IDs</Item>
+               <Item>'RecordQueryReliablePdu.RecordIDs'</Item>
+               <Item>Ids</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RecordQueryReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="RecordSet">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'RecordSet.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'RecordSet.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RecordID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RecordSet.RecordID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'RecordSet.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Relationship">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Relationship.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Relationship.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Relationship.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="RemoveEntityPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'RemoveEntityPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RemoveEntityPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="RemoveEntityReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'RemoveEntityReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RemoveEntityReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="RepairCompletePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'RepairCompletePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RepairCompletePdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RepairingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RepairCompletePdu.RepairingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="RepairResponsePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'RepairResponsePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RepairResponsePdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RepairingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'RepairResponsePdu.RepairingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ResupplyCancelPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ResupplyCancelPdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Resupply</Item>
+             <Item>'ResupplyCancelPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ResupplyCancelPdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SupplyingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ResupplyCancelPdu.SupplyingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ResupplyOfferPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ResupplyOfferPdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Resupply</Item>
+             <Item>'ResupplyOfferPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ResupplyOfferPdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Supplies">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;SupplyQuantity&gt;'</Item>
+               <Item>'ResupplyOfferPdu.Supplies'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SupplyingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ResupplyOfferPdu.SupplyingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ResupplyReceivedPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ResupplyReceivedPdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Resupply</Item>
+             <Item>'ResupplyReceivedPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ResupplyReceivedPdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Supplies">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;SupplyQuantity&gt;'</Item>
+               <Item>'ResupplyReceivedPdu.Supplies'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SupplyingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ResupplyReceivedPdu.SupplyingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SeesPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SeesPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#OrginatingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SeesPdu.OrginatingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Orginating" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Orginating</Item>
+               <Item>'SeesPdu.OrginatingEntityID'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#PropulsionSystemData">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;PropulsionSystemData&gt;'</Item>
+               <Item>'SeesPdu.PropulsionSystemData'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VectoringSystemData">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VectoringNozzleSystemData&gt;'</Item>
+               <Item>'SeesPdu.VectoringSystemData'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ServiceRequestPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'ServiceRequestPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ServiceRequestPdu.RequestingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ServicingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'ServiceRequestPdu.ServicingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Supplies">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;SupplyQuantity&gt;'</Item>
+               <Item>'ServiceRequestPdu.Supplies'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SetDataPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SetDataPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'SetDataPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'SetDataPdu.FixedDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SetDataPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'SetDataPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'SetDataPdu.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SetDataReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SetDataReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FixedDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FixedDatum&gt;'</Item>
+               <Item>'SetDataReliablePdu.FixedDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SetDataReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumRecords">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;VariableDatum&gt;'</Item>
+               <Item>'SetDataReliablePdu.VariableDatumRecords'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SetRecordReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SetRecordReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RecordSets">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;RecordSet&gt;'</Item>
+               <Item>'SetRecordReliablePdu.RecordSets'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SetRecordReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ShaftRPMs">
+          <Messages>
+           <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>RPMs</Item>
+             <Item>'ShaftRPMs'</Item>
+             <Item>Rpms</Item>
+            </Issue>
+           </Message>
+           <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>RPMs</Item>
+             <Item>'ShaftRPMs'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#CurrentShaftRPMs">
+            <Messages>
+             <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>RPMs</Item>
+               <Item>'ShaftRPMs.CurrentShaftRPMs'</Item>
+               <Item>Rpms</Item>
+              </Issue>
+             </Message>
+             <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>RPMs</Item>
+               <Item>'ShaftRPMs.CurrentShaftRPMs'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'ShaftRPMs.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'ShaftRPMs.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OrderedShaftRPMs">
+            <Messages>
+             <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>RPMs</Item>
+               <Item>'ShaftRPMs.OrderedShaftRPMs'</Item>
+               <Item>Rpms</Item>
+              </Issue>
+             </Message>
+             <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>RPMs</Item>
+               <Item>'ShaftRPMs.OrderedShaftRPMs'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ShaftRPMRateOfChange">
+            <Messages>
+             <Message Id="RPM" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>RPM</Item>
+               <Item>'ShaftRPMs.ShaftRPMRateOfChange'</Item>
+               <Item>Rpm</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'ShaftRPMs.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SignalPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SignalPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Data">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'SignalPdu.Data'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#TdlType">
+            <Messages>
+             <Message Id="Tdl" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Tdl</Item>
+               <Item>'SignalPdu.TdlType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SimulationAddress">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'SimulationAddress.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'SimulationAddress.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'SimulationAddress.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SimulationManagementFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SimulationManagementFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#OriginatingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SimulationManagementFamilyPdu.OriginatingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SimulationManagementFamilyPdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SimulationManagementWithReliabilityFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SimulationManagementWithReliabilityFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#OriginatingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SimulationManagementWithReliabilityFamilyPdu.OriginatingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReceivingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'SimulationManagementWithReliabilityFamilyPdu.ReceivingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SixByteChunk">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'SixByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'SixByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OtherParameters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'SixByteChunk.OtherParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'SixByteChunk.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SphericalHarmonicAntennaPattern">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'SphericalHarmonicAntennaPattern.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'SphericalHarmonicAntennaPattern.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'SphericalHarmonicAntennaPattern.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="StartResumePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'StartResumePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'StartResumePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="StartResumeReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'StartResumeReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'StartResumeReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="StopFreezePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'StopFreezePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'StopFreezePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="StopFreezeReliablePdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'StopFreezeReliablePdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'StopFreezeReliablePdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequiredReliablityService">
+            <Messages>
+             <Message Id="Reliablity" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Reliablity</Item>
+               <Item>'StopFreezeReliablePdu.RequiredReliablityService'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SupplyQuantity">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'SupplyQuantity.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'SupplyQuantity.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'SupplyQuantity.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SyntheticEnvironmentFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'SyntheticEnvironmentFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#Equals(Asiistech.OpenDis.SyntheticEnvironmentFamilyPdu)">
+            <Messages>
+             <Message TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'obj'</Item>
+               <Item>'SyntheticEnvironmentFamilyPdu.Equals(SyntheticEnvironmentFamilyPdu)'</Item>
+               <Item>'SyntheticEnvironmentFamilyPdu'</Item>
+               <Item>'Pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="SystemID">
+          <Messages>
+           <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+            <Issue Name="TypeAbbreviation">
+             <Item>ID</Item>
+             <Item>'SystemID'</Item>
+             <Item>Id</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'SystemID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'SystemID.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'SystemID.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="TrackJamTarget">
+          <Members>
+           <Member Name="#BeamID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'TrackJamTarget.BeamID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EmitterID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'TrackJamTarget.EmitterID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'TrackJamTarget.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'TrackJamTarget.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'TrackJamTarget.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="TransferControlRequestPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'TransferControlRequestPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#OrginatingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'TransferControlRequestPdu.OrginatingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Orginating" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Orginating</Item>
+               <Item>'TransferControlRequestPdu.OrginatingEntityID'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RecevingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'TransferControlRequestPdu.RecevingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+             <Message Id="Receving" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Receving</Item>
+               <Item>'TransferControlRequestPdu.RecevingEntityID'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RecordSets">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;RecordSet&gt;'</Item>
+               <Item>'TransferControlRequestPdu.RecordSets'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#RequestID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'TransferControlRequestPdu.RequestID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#TranferType">
+            <Messages>
+             <Message Id="Tranfer" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Tranfer</Item>
+               <Item>'TransferControlRequestPdu.TranferType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#TransferEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'TransferControlRequestPdu.TransferEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="TransmitterPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'TransmitterPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#AntennaPatternList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Vector3Float&gt;'</Item>
+               <Item>'TransmitterPdu.AntennaPatternList'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#CryptoSystem">
+            <Messages>
+             <Message Id="CryptoSystem" TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberShouldBeDiscreteTerm">
+               <Item>CryptoSystem</Item>
+               <Item>'TransmitterPdu.CryptoSystem'</Item>
+               <Item>Cryptosystem</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ModulationParametersList">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;Vector3Float&gt;'</Item>
+               <Item>'TransmitterPdu.ModulationParametersList'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="TwoByteChunk">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'TwoByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'TwoByteChunk.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#OtherParameters">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'TwoByteChunk.OtherParameters'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'TwoByteChunk.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="UaPdu">
+          <Messages>
+           <Message Id="Ua" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Ua</Item>
+             <Item>'UaPdu'</Item>
+             <Item>UA</Item>
+            </Issue>
+           </Message>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'UaPdu'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Ua" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Ua</Item>
+             <Item>'UaPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ApaData">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ApaData&gt;'</Item>
+               <Item>'UaPdu.ApaData'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Apa" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Apa</Item>
+               <Item>'UaPdu.ApaData'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EmitterSystems">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;AcousticEmitterSystemData&gt;'</Item>
+               <Item>'UaPdu.EmitterSystems'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EmittingEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'UaPdu.EmittingEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EventID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'UaPdu.EventID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#NumberOfAPAs">
+            <Messages>
+             <Message Id="APAs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>APAs</Item>
+               <Item>'UaPdu.NumberOfAPAs'</Item>
+               <Item>Apas</Item>
+              </Issue>
+             </Message>
+             <Message Id="APAs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>APAs</Item>
+               <Item>'UaPdu.NumberOfAPAs'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ShaftRPMs">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;ShaftRPMs&gt;'</Item>
+               <Item>'UaPdu.ShaftRPMs'</Item>
+              </Issue>
+             </Message>
+             <Message Id="RPMs" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>RPMs</Item>
+               <Item>'UaPdu.ShaftRPMs'</Item>
+               <Item>Rpms</Item>
+              </Issue>
+             </Message>
+             <Message Id="RPMs" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>RPMs</Item>
+               <Item>'UaPdu.ShaftRPMs'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="VariableDatum">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'VariableDatum.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'VariableDatum.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'VariableDatum.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatumID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'VariableDatum.VariableDatumID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#VariableDatums">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EightByteChunk&gt;'</Item>
+               <Item>'VariableDatum.VariableDatums'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Datums" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Datums</Item>
+               <Item>'VariableDatum.VariableDatums'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Vector3Double">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Vector3Double.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Vector3Double.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Vector3Double.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#X">
+            <Messages>
+             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Vector3Double.X'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Y">
+            <Messages>
+             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Vector3Double.Y'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Z">
+            <Messages>
+             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Vector3Double.Z'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="Vector3Float">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'Vector3Float.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'Vector3Float.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Vector3Float.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#X">
+            <Messages>
+             <Message Id="X" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Vector3Float.X'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Y">
+            <Messages>
+             <Message Id="Y" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Vector3Float.Y'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Z">
+            <Messages>
+             <Message Id="Z" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberMoreMeaningfulName">
+               <Item>'Vector3Float.Z'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="VectoringNozzleSystemData">
+          <Members>
+           <Member Name="#GetMarshalledSize()">
+            <Messages>
+             <Message Id="Marshalled" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Marshalled</Item>
+               <Item>'VectoringNozzleSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024" Created="2010-04-14 11:41:22Z">
+              <Issue Certainty="50">
+               <Item>'VectoringNozzleSystemData.GetMarshalledSize()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#Unmarshal(DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="dis" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'VectoringNozzleSystemData.Unmarshal(DataInputStream)'</Item>
+               <Item>dis</Item>
+               <Item>'dis'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="WarfareFamilyPdu">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'WarfareFamilyPdu'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#FiringEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'WarfareFamilyPdu.FiringEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#TargetEntityID">
+            <Messages>
+             <Message Id="ID" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberAbbreviation">
+               <Item>ID</Item>
+               <Item>'WarfareFamilyPdu.TargetEntityID'</Item>
+               <Item>Id</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="DISnet">
+        <Types>
+         <Type Name="AcknowledgeFlag">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'AcknowledgeFlag'</Item>
+            </Issue>
+           </Message>
+           <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-15 07:21:46Z">
+            <Issue Name="TypeNoAlternate">
+             <Item>Flag</Item>
+             <Item>'AcknowledgeFlag'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="AcousticEmitters">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'AcousticEmitters'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'AcousticEmitters'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="AdditionalPassiveActivity">
+          <Members>
+           <Member Name="#ReservedForClassifiedEnumerations">
+            <Messages>
+             <Message TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700" Created="2010-04-15 07:21:46Z">
+              <Issue>
+               <Item>'AdditionalPassiveActivity.ReservedForClassifiedEnumerations'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="ArticulatedPartsIndexNumber">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'ArticulatedPartsIndexNumber'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="ArticulatedPartsOffsetNumber">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'ArticulatedPartsOffsetNumber'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="AttachedParts">
+          <Messages>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'AttachedParts'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="AuxiliaryCraft">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'AuxiliaryCraft'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Byte11">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'Byte11'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="CISWeaponsForLifeForms">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'CISWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'CISWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="CommunicationType">
+          <Members>
+           <Member Name="#Reserved">
+            <Messages>
+             <Message TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700" Created="2010-04-15 07:21:46Z">
+              <Issue>
+               <Item>'CommunicationType.Reserved'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CompanyBatteryTroop">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'CompanyBatteryTroop'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="ControlType">
+          <Members>
+           <Member Name="#Reserved">
+            <Messages>
+             <Message TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700" Created="2010-04-15 07:21:46Z">
+              <Issue>
+               <Item>'ControlType.Reserved'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="CountryType">
+          <Messages>
+           <Message TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027" Created="2010-04-14 11:41:22Z">
+            <Issue>
+             <Item>'CountryType'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="DatumSpecificationRecord">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'DatumSpecificationRecord'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#TrailFlag">
+            <Messages>
+             <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-15 07:21:46Z">
+              <Issue Name="MemberNoAlternate">
+               <Item>Flag</Item>
+               <Item>'DatumSpecificationRecord.TrailFlag'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DriveTrain">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'DriveTrain'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="ElectromagneticEmitters">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'ElectromagneticEmitters'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'ElectromagneticEmitters'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Electronics">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'Electronics'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'Electronics'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="FirstCavHighLevelUnit">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'FirstCavHighLevelUnit'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="FirstInfHighLevelUnit">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'FirstInfHighLevelUnit'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="FrenchWeaponsForLifeForms">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'FrenchWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'FrenchWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="FuelSystems">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'FuelSystems'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'FuelSystems'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Function">
+          <Messages>
+           <Message Id="Function" TypeName="IdentifiersShouldNotMatchKeywords" Category="Microsoft.Naming" CheckId="CA1716" Created="2010-04-15 07:21:46Z">
+            <Issue Name="Type">
+             <Item>'Function'</Item>
+             <Item>Function</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="GeometryRecordTypeField">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'GeometryRecordTypeField'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="GermanWeaponsForLifeForms">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'GermanWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'GermanWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Helicopters">
+          <Messages>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'Helicopters'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="HullAirframeBody">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'HullAirframeBody'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="HydraulicSystemsAndActuators">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'HydraulicSystemsAndActuators'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'HydraulicSystemsAndActuators'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="InterfacesWithEnvironment">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'InterfacesWithEnvironment'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="LifeSupportSystems">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'LifeSupportSystems'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'LifeSupportSystems'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="OtherAcousticEmitters">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'OtherAcousticEmitters'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'OtherAcousticEmitters'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="RecordType">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'RecordType'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="ReferenceSystem">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'ReferenceSystem'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="ResponseFlag">
+          <Messages>
+           <Message Id="Flag" TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726" Created="2010-04-15 07:21:46Z">
+            <Issue Name="TypeNoAlternate">
+             <Item>Flag</Item>
+             <Item>'ResponseFlag'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="SensorTypes">
+          <Messages>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'SensorTypes'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="StateRecordTypeField">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'StateRecordTypeField'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="SynchronizationState">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'SynchronizationState'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Tanks">
+          <Messages>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'Tanks'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="TDLType">
+          <Messages>
+           <Message TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'TDLType'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="UKWeaponsForLifeForms">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'UKWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'UKWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="UserProtocolIDNum">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'UserProtocolIDNum'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="USWeaponsForLifeForms">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'USWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'USWeaponsForLifeForms'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Vehicle">
+          <Messages>
+           <Message TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'Vehicle'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="Weapons">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'Weapons'</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717" Created="2010-04-15 07:21:46Z">
+            <Issue>
+             <Item>'Weapons'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="XmitTermPriMode">
+          <Messages>
+           <Message TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008" Created="2010-04-15 07:21:46Z" FixCategory="NonBreaking">
+            <Issue Name="NotFlagsNoZeroValue">
+             <Item>'XmitTermPriMode'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+        </Types>
+       </Namespace>
+       <Namespace Name="DISnet.Utilities">
+        <Types>
+         <Type Name="Conversion">
+          <Members>
+           <Member Name="#GetArticulationTypeClass(System.Int32)">
+            <Messages>
+             <Message Id="parametertype" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Conversion.GetArticulationTypeClass(int)'</Item>
+               <Item>parametertype</Item>
+               <Item>'parametertype'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetArticulationTypeMetric(System.Int32)">
+            <Messages>
+             <Message Id="parametertype" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Conversion.GetArticulationTypeMetric(int)'</Item>
+               <Item>parametertype</Item>
+               <Item>'parametertype'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#MakeArticulationParameterType(System.UInt32,System.UInt32)">
+            <Messages>
+             <Message Id="typeclass" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Conversion.MakeArticulationParameterType(uint, uint)'</Item>
+               <Item>typeclass</Item>
+               <Item>'typeclass'</Item>
+              </Issue>
+             </Message>
+             <Message Id="typemetric" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'Conversion.MakeArticulationParameterType(uint, uint)'</Item>
+               <Item>typemetric</Item>
+               <Item>'typemetric'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DataInputStream">
+          <Messages>
+           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
+            <Issue Name="TypeNoAlternate">
+             <Item>'DataInputStream'</Item>
+             <Item>Stream</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ReadFloat()">
+            <Messages>
+             <Message Id="float" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Float</Item>
+               <Item>'DataInputStream.ReadFloat()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReadInt()">
+            <Messages>
+             <Message Id="int" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Int</Item>
+               <Item>'DataInputStream.ReadInt()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReadLong()">
+            <Messages>
+             <Message Id="long" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Long</Item>
+               <Item>'DataInputStream.ReadLong()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReadShort()">
+            <Messages>
+             <Message Id="short" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Short</Item>
+               <Item>'DataInputStream.ReadShort()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReadUnsignedByte()">
+            <Messages>
+             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Unsigned</Item>
+               <Item>'DataInputStream.ReadUnsignedByte()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReadUnsignedInt()">
+            <Messages>
+             <Message Id="int" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Int</Item>
+               <Item>'DataInputStream.ReadUnsignedInt()'</Item>
+              </Issue>
+             </Message>
+             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Unsigned</Item>
+               <Item>'DataInputStream.ReadUnsignedInt()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReadUnsignedLong()">
+            <Messages>
+             <Message Id="long" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Long</Item>
+               <Item>'DataInputStream.ReadUnsignedLong()'</Item>
+              </Issue>
+             </Message>
+             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Unsigned</Item>
+               <Item>'DataInputStream.ReadUnsignedLong()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReadUnsignedShort()">
+            <Messages>
+             <Message Id="short" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Short</Item>
+               <Item>'DataInputStream.ReadUnsignedShort()'</Item>
+              </Issue>
+             </Message>
+             <Message Id="unsigned" TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720" Created="2010-04-14 11:41:22Z">
+              <Issue Name="LanguageSpecificMember">
+               <Item>Unsigned</Item>
+               <Item>'DataInputStream.ReadUnsignedShort()'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DataOutputStream">
+          <Messages>
+           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
+            <Issue Name="TypeNoAlternate">
+             <Item>'DataOutputStream'</Item>
+             <Item>Stream</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="DataStream">
+          <Messages>
+           <Message TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711" Created="2010-04-14 11:41:22Z">
+            <Issue Name="TypeNoAlternate">
+             <Item>'DataStream'</Item>
+             <Item>Stream</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ReturnByteArray(System.Byte[],System.Int32,System.Int32)">
+            <Messages>
+             <Message TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822" Created="2010-04-14 11:41:22Z" FixCategory="DependsOnFix">
+              <Issue>
+               <Item>'DataStream.ReturnByteArray(byte[], int, int)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#StreamByteArray">
+            <Messages>
+             <Message TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'DataStream.StreamByteArray'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DIS1998ChunkConverter">
+          <Messages>
+           <Message Id="DIS" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>DIS</Item>
+             <Item>'DIS1998ChunkConverter'</Item>
+             <Item>Dis</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ArrayToEightByteChunks(System.Array)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EightByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.ArrayToEightByteChunks(Array)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ArrayToFourByteChunks(System.Array)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FourByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.ArrayToFourByteChunks(Array)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ArrayToTwoByteChunks(System.Array)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;TwoByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.ArrayToTwoByteChunks(Array)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#EightByteChunksToArray(System.Collections.Generic.List`1&lt;Asiistech.OpenDis.EightByteChunk&gt;)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EightByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.EightByteChunksToArray(List&lt;EightByteChunk&gt;)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#FourByteChunksToArray(System.Collections.Generic.List`1&lt;Asiistech.OpenDis.FourByteChunk&gt;)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FourByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.FourByteChunksToArray(List&lt;FourByteChunk&gt;)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#StringToEightByteChunks(System.String)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;EightByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.StringToEightByteChunks(string)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#StringToFourByteChunks(System.String)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;FourByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.StringToFourByteChunks(string)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#StringToTwoByteChunks(System.String)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;TwoByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.StringToTwoByteChunks(string)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#TwoByteChunksToArray(System.Collections.Generic.List`1&lt;Asiistech.OpenDis.TwoByteChunk&gt;)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;TwoByteChunk&gt;'</Item>
+               <Item>'DIS1998ChunkConverter.TwoByteChunksToArray(List&lt;TwoByteChunk&gt;)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="DISEnumerations">
+          <Messages>
+           <Message Id="DIS" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-15 08:17:15Z">
+            <Issue Name="Type">
+             <Item>DIS</Item>
+             <Item>'DISEnumerations'</Item>
+             <Item>Dis</Item>
+            </Issue>
+           </Message>
+           <Message TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053" Created="2010-04-15 08:17:15Z">
+            <Issue>
+             <Item>'DISEnumerations'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#EnumerationForValueExists`1(System.Int32)">
+            <Messages>
+             <Message TypeName="GenericMethodsShouldProvideTypeParameter" Category="Microsoft.Design" CheckId="CA1004" Created="2010-04-15 08:17:15Z">
+              <Issue>
+               <Item>'DISEnumerations.EnumerationForValueExists&lt;T&gt;(int)'</Item>
+               <Item>'T'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetEnumerationForValue`1(System.Int32)">
+            <Messages>
+             <Message TypeName="GenericMethodsShouldProvideTypeParameter" Category="Microsoft.Design" CheckId="CA1004" Created="2010-04-15 08:17:15Z">
+              <Issue>
+               <Item>'DISEnumerations.GetEnumerationForValue&lt;T&gt;(int)'</Item>
+               <Item>'T'</Item>
+              </Issue>
+             </Message>
+             <Message Id="System.Int32.ToString" TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305" Created="2010-04-15 08:17:15Z">
+              <Issue>
+               <Item>'int.ToString()'</Item>
+               <Item>'DISEnumerations.GetEnumerationForValue&lt;T&gt;(int)'</Item>
+               <Item>'int.ToString(IFormatProvider)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="EnumNotFoundException">
+          <Messages>
+           <Message TypeName="ImplementISerializableCorrectly" Category="Microsoft.Usage" CheckId="CA2240" Created="2010-04-15 08:58:23Z">
+            <Issue>
+             <Item>'EnumNotFoundException'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#.ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <Messages>
+             <Message TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032" Created="2010-04-15 08:58:23Z">
+              <Issue Name="Accessibility">
+               <Item>'EnumNotFoundException.EnumNotFoundException(SerializationInfo, StreamingContext)'</Item>
+               <Item>protected</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="InternetDomainCodeAttribute">
+          <Messages>
+           <Message TypeName="AvoidUnsealedAttributes" Category="Microsoft.Performance" CheckId="CA1813" Created="2010-04-15 08:17:15Z">
+            <Issue>
+             <Item>'InternetDomainCodeAttribute'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+         </Type>
+         <Type Name="PduBank">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'PduBank'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#GetPdu(DISnet.Utilities.PduType1998)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduBank.GetPdu(PduType1998)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduBank.GetPdu(PduType1998)'</Item>
+               <Item>pdu</Item>
+               <Item>'pduType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#GetPdu(System.UInt32)">
+            <Messages>
+             <Message Id="type" TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduBank.GetPdu(uint)'</Item>
+               <Item>type</Item>
+               <Item>'pdu_type'</Item>
+               <Item>Type</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduBank.GetPdu(uint)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduBank.GetPdu(uint)'</Item>
+               <Item>pdu</Item>
+               <Item>'pdu_type'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduBank.GetPdu(uint)'</Item>
+               <Item>'pdu_type'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PduProcessor">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'PduProcessor'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ConvertByteArrayToPdu1998(System.Byte,System.Byte[],DISnet.Utilities.Endian)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
+              </Issue>
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
+               <Item>Pdu</Item>
+               <Item>'rawPdu'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
+               <Item>pdu</Item>
+               <Item>'pduType'</Item>
+              </Issue>
+             </Message>
+             <Message Id="ds" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ConvertByteArrayToPdu1998(byte, byte[], Endian)'</Item>
+               <Item>'ds'</Item>
+               <Item>'DataInputStream'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#DecodePdu(System.Object)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.DecodePdu(object)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.DecodePdu(object)'</Item>
+               <Item>pdu</Item>
+               <Item>'pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessPdu(System.Byte[])">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ProcessPdu(byte[])'</Item>
+               <Item>'object'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;object&gt;'</Item>
+               <Item>'PduProcessor.ProcessPdu(byte[])'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessPdu(byte[])'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessPdu(System.Byte[],DISnet.Utilities.Endian)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;object&gt;'</Item>
+               <Item>'PduProcessor.ProcessPdu(byte[], Endian)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessPdu(byte[], Endian)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessPdu(System.IO.Stream)">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ProcessPdu(Stream)'</Item>
+               <Item>'object'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessPdu(Stream)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessPdu(System.IO.Stream,DISnet.Utilities.Endian)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessPdu(Stream, Endian)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessPdu(System.IO.Stream,DISnet.Utilities.Endian,System.Byte[]&amp;)">
+            <Messages>
+             <Message Id="2#" TypeName="AvoidOutParameters" Category="Microsoft.Design" CheckId="CA1021" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'rawPdu'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessPdu(Stream, Endian, out byte[])'</Item>
+              </Issue>
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.ProcessPdu(Stream, Endian, out byte[])'</Item>
+               <Item>Pdu</Item>
+               <Item>'rawPdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessPdu(System.IO.Stream,System.Byte[]&amp;)">
+            <Messages>
+             <Message Id="1#" TypeName="AvoidOutParameters" Category="Microsoft.Design" CheckId="CA1021" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'rawData'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ProcessPdu(Stream, out byte[])'</Item>
+               <Item>'object'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessPdu(Stream, out byte[])'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessRawPdu(System.Byte[])">
+            <Messages>
+             <Message TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
+               <Item>'object'</Item>
+              </Issue>
+             </Message>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;byte[]&gt;'</Item>
+               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pduType" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
+               <Item>'pduType'</Item>
+               <Item>'byte'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pduVersion" TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ProcessRawPdu(byte[])'</Item>
+               <Item>'pduVersion'</Item>
+               <Item>'byte'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessRawPdu(System.Byte[],DISnet.Utilities.Endian)">
+            <Messages>
+             <Message TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'List&lt;byte[]&gt;'</Item>
+               <Item>'PduProcessor.ProcessRawPdu(byte[], Endian)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessRawPdu(byte[], Endian)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ProcessRawPdu(System.Byte[],DISnet.Utilities.Endian,System.Collections.Generic.Queue`1&lt;System.Byte[]&gt;&amp;)">
+            <Messages>
+             <Message Id="2#" TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045" Created="2010-04-14 11:41:22Z">
+              <Issue Level="CriticalWarning">
+               <Item>'dataQueue'</Item>
+              </Issue>
+             </Message>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.ProcessRawPdu(byte[], Endian, ref Queue&lt;byte[]&gt;)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ReturnUnmarshalledPdu(System.Object,DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811" Created="2010-04-14 11:41:22Z">
+              <Issue>
+               <Item>'PduProcessor.ReturnUnmarshalledPdu(object, DataInputStream)'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#SwitchOnType(System.Byte,System.UInt32,System.Byte[])">
+            <Messages>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.SwitchOnType(byte, uint, byte[])'</Item>
+               <Item>pdu</Item>
+               <Item>'pduType'</Item>
+              </Issue>
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.SwitchOnType(byte, uint, byte[])'</Item>
+               <Item>pdu</Item>
+               <Item>'pduVersion'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#UnmarshalRawPdu(DISnet.Utilities.PduType1998,DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, DataInputStream)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, DataInputStream)'</Item>
+               <Item>pdu</Item>
+               <Item>'pduType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#UnmarshalRawPdu(DISnet.Utilities.PduType1998,System.Byte[],DISnet.Utilities.Endian)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, byte[], Endian)'</Item>
+              </Issue>
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, byte[], Endian)'</Item>
+               <Item>Pdu</Item>
+               <Item>'rawPdu'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.UnmarshalRawPdu(PduType1998, byte[], Endian)'</Item>
+               <Item>pdu</Item>
+               <Item>'pduType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#UnmarshalRawPdu(System.Byte,DISnet.Utilities.DataInputStream)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.UnmarshalRawPdu(byte, DataInputStream)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.UnmarshalRawPdu(byte, DataInputStream)'</Item>
+               <Item>pdu</Item>
+               <Item>'pduType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#UnmarshalRawPdu(System.Byte,System.Byte[],DISnet.Utilities.Endian)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.UnmarshalRawPdu(byte, byte[], Endian)'</Item>
+              </Issue>
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.UnmarshalRawPdu(byte, byte[], Endian)'</Item>
+               <Item>Pdu</Item>
+               <Item>'rawPdu'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.UnmarshalRawPdu(byte, byte[], Endian)'</Item>
+               <Item>pdu</Item>
+               <Item>'pduType'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#XmlDecodePdu(System.Object)">
+            <Messages>
+             <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Pdu</Item>
+               <Item>'PduProcessor.XmlDecodePdu(object)'</Item>
+              </Issue>
+             </Message>
+             <Message Id="pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="MemberParameter">
+               <Item>'PduProcessor.XmlDecodePdu(object)'</Item>
+               <Item>pdu</Item>
+               <Item>'pdu'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+         <Type Name="PduType1998">
+          <Messages>
+           <Message Id="Pdu" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+            <Issue Name="Type">
+             <Item>Pdu</Item>
+             <Item>'PduType1998'</Item>
+            </Issue>
+           </Message>
+          </Messages>
+          <Members>
+           <Member Name="#ResupplyCancel">
+            <Messages>
+             <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Resupply</Item>
+               <Item>'PduType1998.ResupplyCancel'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ResupplyOffer">
+            <Messages>
+             <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Resupply</Item>
+               <Item>'PduType1998.ResupplyOffer'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+           <Member Name="#ResupplyReceived">
+            <Messages>
+             <Message Id="Resupply" TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704" Created="2010-04-14 11:41:22Z">
+              <Issue Name="Member">
+               <Item>Resupply</Item>
+               <Item>'PduType1998.ResupplyReceived'</Item>
+              </Issue>
+             </Message>
+            </Messages>
+           </Member>
+          </Members>
+         </Type>
+        </Types>
+       </Namespace>
+      </Namespaces>
+     </Module>
+    </Modules>
+   </Target>
+  </Targets>
+  <Rules>
+   <Rule TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210">
+    <Resolution Name="NoStrongName">Sign {0} with a strong name key.</Resolution>
+   </Rule>
+   <Rule TypeName="AvoidOutParameters" Category="Microsoft.Design" CheckId="CA1021">
+    <Resolution Name="Default">Consider a design that does not require that {0} be an out parameter.</Resolution>
+   </Rule>
+   <Rule TypeName="AvoidUncalledPrivateCode" Category="Microsoft.Performance" CheckId="CA1811">
+    <Resolution Name="Default">{0} appears to have no upstream public or protected callers.</Resolution>
+   </Rule>
+   <Rule TypeName="AvoidUnsealedAttributes" Category="Microsoft.Performance" CheckId="CA1813">
+    <Resolution Name="Default">Seal {0}, if possible.</Resolution>
+   </Rule>
+   <Rule TypeName="CompoundWordsShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1702">
+    <Resolution Name="MemberShouldBeDiscreteTerm">The compound word '{0}' in member name {1} exists as a discrete term. If your usage is intended to be single word, case it as '{2}' or strip the first token entirely if it represents any sort of Hungarian notation.</Resolution>
+    <Resolution Name="TypeShouldBeDiscreteTerm">The compound word '{0}' in type name {1} exists as a discrete term. If your usage is intended to be single word, case it as '{2}'.</Resolution>
+   </Rule>
+   <Rule TypeName="ConsiderPassingBaseTypesAsParameters" Category="Microsoft.Design" CheckId="CA1011">
+    <Resolution Name="Default">Consider changing the type of parameter {0} in {1} from {2} to its base type {3}. This method appears to only require base class members in its implementation. Suppress this violation if there is a compelling reason to require the more derived type in the method signature.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotCatchGeneralExceptionTypes" Category="Microsoft.Design" CheckId="CA1031">
+    <Resolution Name="Default">Modify {0} to catch a more specific exception than {1} or rethrow the exception.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotExposeGenericLists" Category="Microsoft.Design" CheckId="CA1002">
+    <Resolution Name="Default">Change {0} in {1} to use Collection&lt;T&gt;, ReadOnlyCollection&lt;T&gt; or KeyedCollection&lt;K,V&gt;</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotNameEnumValuesReserved" Category="Microsoft.Naming" CheckId="CA1700">
+    <Resolution Name="Default">If {0} is not used in the current implementation, remove it. Otherwise give it a meaningful name.</Resolution>
+   </Rule>
+   <Rule TypeName="DoNotPassTypesByReference" Category="Microsoft.Design" CheckId="CA1045">
+    <Resolution Name="Default">Consider a design that does not require that {0} be a reference parameter.</Resolution>
+   </Rule>
+   <Rule TypeName="EnumsShouldHaveZeroValue" Category="Microsoft.Design" CheckId="CA1008">
+    <Resolution Name="NotFlagsNoZeroValue">Add a member to {0} that has a value of zero with a suggested name of 'None'.</Resolution>
+   </Rule>
+   <Rule TypeName="GenericMethodsShouldProvideTypeParameter" Category="Microsoft.Design" CheckId="CA1004">
+    <Resolution Name="Default">Consider a design where {0} doesn't require explicit type parameter {1} in any call to it.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldBeCasedCorrectly" Category="Microsoft.Naming" CheckId="CA1709">
+    <Resolution Name="Member">Correct the casing of '{0}' in member name {1} by changing it to '{2}'.</Resolution>
+    <Resolution Name="MemberAbbreviation">Correct the casing of '{0}' in member name {1} by changing it to '{2}'. '{2}' is an abbreviation and therefore is not subject to acronym casing guidelines.</Resolution>
+    <Resolution Name="MemberParameter">In member {0}, correct the casing of '{1}' in parameter name {2} by changing it to '{3}'.</Resolution>
+    <Resolution Name="Type">Correct the casing of '{0}' in type name {1} by changing it to '{2}'.</Resolution>
+    <Resolution Name="TypeAbbreviation">Correct the casing of '{0}' in type name {1} by changing it to '{2}'. '{2}' is an abbreviation and therefore is not subject to acronym casing guidelines.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldBeSpelledCorrectly" Category="Microsoft.Naming" CheckId="CA1704">
+    <Resolution Name="Assembly">Correct the spelling of '{0}' in assembly name {1}.</Resolution>
+    <Resolution Name="Member">Correct the spelling of '{0}' in member name {1} or remove it entirely if it represents any sort of Hungarian notation.</Resolution>
+    <Resolution Name="MemberMoreMeaningfulName">Consider providing a more meaningful name than member name {0}.</Resolution>
+    <Resolution Name="MemberParameter">In method {0}, correct the spelling of '{1}' in parameter name {2} or remove it entirely if it represents any sort of Hungarian notation.</Resolution>
+    <Resolution Name="Namespace">Correct the spelling of '{0}' in namespace name '{1}'.</Resolution>
+    <Resolution Name="Type">Correct the spelling of '{0}' in type name {1}.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldNotContainTypeNames" Category="Microsoft.Naming" CheckId="CA1720">
+    <Resolution Name="LanguageSpecificMember">Consider replacing the language-specific data type identifier '{0}' in member name {1} with either a language-independent equivalent or a more generic term, such as 'value'.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldNotContainUnderscores" Category="Microsoft.Naming" CheckId="CA1707">
+    <Resolution Name="Member">Remove the underscores from member name {0}.</Resolution>
+    <Resolution Name="MemberParameter">In member {0}, remove the underscores from parameter name {1}.</Resolution>
+    <Resolution Name="Type">Remove the underscores from type name {0}.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldNotHaveIncorrectSuffix" Category="Microsoft.Naming" CheckId="CA1711">
+    <Resolution Name="MemberNewerVersion">Either replace the suffix '{0}' in member name {1} with the suggested numeric alternate '2' or provide a more meaningful suffix that distinguishes it from the member it replaces.</Resolution>
+    <Resolution Name="TypeNoAlternate">Rename type name {0} so that it does not end in '{1}'.</Resolution>
+   </Rule>
+   <Rule TypeName="IdentifiersShouldNotMatchKeywords" Category="Microsoft.Naming" CheckId="CA1716">
+    <Resolution Name="Type">Rename type {0} so that it no longer conflicts with the reserved language keyword '{1}'. Using a reserved keyword as the name of a type makes it harder for consumers in other languages to use the type.</Resolution>
+   </Rule>
+   <Rule TypeName="ImplementISerializableCorrectly" Category="Microsoft.Usage" CheckId="CA2240">
+    <Resolution Name="Default">Add an implementation of GetObjectData to type {0}.</Resolution>
+   </Rule>
+   <Rule TypeName="ImplementStandardExceptionConstructors" Category="Microsoft.Design" CheckId="CA1032">
+    <Resolution Name="Accessibility">Change the accessibility of {0} to {1}.</Resolution>
+   </Rule>
+   <Rule TypeName="MarkEnumsWithFlags" Category="Microsoft.Design" CheckId="CA1027">
+    <Resolution Name="Default">The constituent members of {0} appear to represent flags that can be combined rather than discrete values. If this is correct, mark the enumeration with FlagsAttribute.</Resolution>
+   </Rule>
+   <Rule TypeName="MarkMembersAsStatic" Category="Microsoft.Performance" CheckId="CA1822">
+    <Resolution Name="Default">The 'this' parameter (or 'Me' in Visual Basic) of {0} is never used. Mark the member as static (or Shared in Visual Basic) or use 'this'/'Me' in the method body or at least one property accessor, if appropriate.</Resolution>
+   </Rule>
+   <Rule TypeName="OnlyFlagsEnumsShouldHavePluralNames" Category="Microsoft.Naming" CheckId="CA1717">
+    <Resolution Name="Default">If the name {0} is plural, change it to its singular form.</Resolution>
+   </Rule>
+   <Rule TypeName="PropertiesShouldNotReturnArrays" Category="Microsoft.Performance" CheckId="CA1819">
+    <Resolution Name="Default">Change {0} to return a collection or make it a method.</Resolution>
+   </Rule>
+   <Rule TypeName="RemoveUnusedLocals" Category="Microsoft.Performance" CheckId="CA1804">
+    <Resolution Name="Default">{0} declares a variable, {1}, of type {2}, which is never used or is only assigned to. Use this variable or remove it.</Resolution>
+   </Rule>
+   <Rule TypeName="SpecifyIFormatProvider" Category="Microsoft.Globalization" CheckId="CA1305">
+    <Resolution Name="Default">Because the behavior of {0} could vary based on the current user's locale settings, replace this call in {1} with a call to {2}. If the result of {2} will be displayed to the user, specify 'CultureInfo.CurrentCulture' as the 'IFormatProvider' parameter. Otherwise, if the result will be stored and accessed by software, such as when it is persisted to disk or to a database, specify 'CultureInfo.InvariantCulture'.</Resolution>
+   </Rule>
+   <Rule TypeName="StaticHolderTypesShouldNotHaveConstructors" Category="Microsoft.Design" CheckId="CA1053">
+    <Resolution Name="Default">Remove the public constructors from {0}.</Resolution>
+   </Rule>
+   <Rule TypeName="UsePreferredTerms" Category="Microsoft.Naming" CheckId="CA1726">
+    <Resolution Name="MemberNoAlternate">Replace the term '{0}' in member name {1} with an appropriate alternate or remove it entirely.</Resolution>
+    <Resolution Name="TypeNoAlternate">Replace the term '{0}' in type name {1} with an appropriate alternate or remove it entirely.</Resolution>
+   </Rule>
+   <Rule TypeName="UsePropertiesWhereAppropriate" Category="Microsoft.Design" CheckId="CA1024">
+    <Resolution Name="Default">Change {0} to a property if appropriate.</Resolution>
+   </Rule>
+  </Rules>
+ </FxCopReport>
+</FxCopProject>
diff --git a/Libs/CsharpDis6/OpenDis/FxCopCustomDictionary.xml b/Libs/CsharpDis6/FxCopCustomDictionary.xml
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/FxCopCustomDictionary.xml
rename to Libs/CsharpDis6/FxCopCustomDictionary.xml
index f990686..ac065f0 100644
--- a/Libs/CsharpDis6/OpenDis/FxCopCustomDictionary.xml
+++ b/Libs/CsharpDis6/FxCopCustomDictionary.xml
@@ -1,26 +1,26 @@
-<Dictionary>
-    <Words>
-        <Recognized>
-               <Word>Asiistech</Word>
-               <Word>Y</Word>
-               <Word>X</Word>
-               <Word>Z</Word>
-               <Word>x</Word>
-               <Word>y</Word>
-               <Word>z</Word>
-               <Word>uow</Word>
-               <Word>Blubit</Word>
-               <Word>Xpo</Word>
-               <Word>g</Word>
-               <Word>Resupply</Word>
-               <Word>dis</Word>
-               <Word>Dis</Word>
-               <Word>Pdu</Word>
-               <Word>pdu</Word>
-               <Word>Marshall</Word>
-               <Word>marshall</Word>
-               <Word>Marshalled</Word>
-               <Word>marshalled</Word>
-        </Recognized>
-    </Words>
+<Dictionary>
+    <Words>
+        <Recognized>
+               <Word>Asiistech</Word>
+               <Word>Y</Word>
+               <Word>X</Word>
+               <Word>Z</Word>
+               <Word>x</Word>
+               <Word>y</Word>
+               <Word>z</Word>
+               <Word>uow</Word>
+               <Word>Blubit</Word>
+               <Word>Xpo</Word>
+               <Word>g</Word>
+               <Word>Resupply</Word>
+               <Word>dis</Word>
+               <Word>Dis</Word>
+               <Word>Pdu</Word>
+               <Word>pdu</Word>
+               <Word>Marshall</Word>
+               <Word>marshall</Word>
+               <Word>Marshalled</Word>
+               <Word>marshalled</Word>
+        </Recognized>
+    </Words>
 </Dictionary>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis.csproj b/Libs/CsharpDis6/OpenDis.csproj
new file mode 100644
index 0000000..dd7ce0c
--- /dev/null
+++ b/Libs/CsharpDis6/OpenDis.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>OpenDis_std</RootNamespace>
+    <Version>6.0.0</Version>
+  </PropertyGroup>
+
+</Project>
diff --git a/Libs/CsharpDis6/OpenDis/OpenDis.csproj.user b/Libs/CsharpDis6/OpenDis.csproj.user
similarity index 50%
rename from Libs/CsharpDis6/OpenDis/OpenDis.csproj.user
rename to Libs/CsharpDis6/OpenDis.csproj.user
index 566c009..d1cd772 100644
--- a/Libs/CsharpDis6/OpenDis/OpenDis.csproj.user
+++ b/Libs/CsharpDis6/OpenDis.csproj.user
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+    <ShowAllFiles>false</ShowAllFiles>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis.sln b/Libs/CsharpDis6/OpenDis.sln
deleted file mode 100644
index 38e9cbf..0000000
--- a/Libs/CsharpDis6/OpenDis.sln
+++ /dev/null
@@ -1,47 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis", "OpenDis\OpenDis.csproj", "{628EE35F-450A-49B2-BA46-04FABB66D0BF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.Demo", "OpenDis.Demo\OpenDis.Demo.csproj", "{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.EspduReceiver", "EspduReceiver\OpenDis.EspduReceiver.csproj", "{70F94942-1466-4E6C-A2A3-89DB19C20159}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.EspduSender", "EspduSender\OpenDis.EspduSender.csproj", "{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Analysis|x86 = Analysis|x86
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|x86.ActiveCfg = Analysis|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|x86.Build.0 = Analysis|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|x86.ActiveCfg = Debug|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|x86.Build.0 = Debug|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|x86.ActiveCfg = Release|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|x86.Build.0 = Release|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|x86.ActiveCfg = Release|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|x86.Build.0 = Release|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|x86.ActiveCfg = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|x86.Build.0 = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|x86.ActiveCfg = Release|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|x86.Build.0 = Release|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|x86.ActiveCfg = Release|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|x86.Build.0 = Release|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|x86.ActiveCfg = Debug|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|x86.Build.0 = Debug|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|x86.ActiveCfg = Release|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|x86.Build.0 = Release|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|x86.ActiveCfg = Release|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|x86.Build.0 = Release|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|x86.ActiveCfg = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|x86.Build.0 = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|x86.ActiveCfg = Release|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Libs/CsharpDis6/OpenDis.suo b/Libs/CsharpDis6/OpenDis.suo
deleted file mode 100644
index c5d5284fdc53bce7fdbf30a00acd5f78b98be16a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 286208
zcmeEv2YeL8`~HOvqJkhQqK2XZl8_Fe2&oY1gr**bkX%9}$%VU1AR;O#sMt}lAzwuS
zMJy;{?}!}`5j&z{N2FL$;Qu^3JK4Rvz1vL!WaIC@`8=6zw=?gQciwsDop&~FXua*;
zRqelW1RQ5O8afUfZ0=~HyWbe+5%Ri~!_ffeEr0_D4<3}aFXIVbdKAH903QAS!^SzV
zA8BK`wg(ykEbnGOQ=mC;6u>fW2^<R?4IBfY_#MXqt${Yc@jzRk9dIIW0&o)00XP|m
z0Zs)@0V09ZfQ~>X;B=r15Cxn8oC$OXx&qyRvw$QZ5$Fl@1`>c<fF3{`Fc264^g!L~
zg)kn71(Jb2KtF)>)QRwHU;vN>qyVWv8jucT0GYrbU@$NoI0qO43<ZV(=K~{w(ZDDm
z8yE|W0mcCnfbqb&Kpt=&-~u`W6M+kW9AFZV3rq%P0Qo>6PykE;rUFI4g+MV-3X}kD
zU>Z;ccmN;Z1<HYWKm{-zxB{pIE&^r(7X!0^OMpv(*}!Og&5bWag7Q*?9_1H!VDV_@
zXk69C7nuB}Y})O~Z$y0%(U9+Tk5Jwoi5T6WFblC4;4DMQ36l@$9=CHeh|o7L-J`Il
ztiL=)AlH1z-6F(K6rwbJC>0+{jA>yV3U_ot{LFKf8`BZ)UHOcZHxlHV#?N{j?m+xi
z`END;CiviSYW!>y4RFmeX#|iL@Lp4d<OAdZZ2!DR9w6I4ubGFff#ZNS0Pm3xkO#2+
z^O`(>yoEe~*KGgf1E&Fz0Pl4|$hOf1ATQv(GZD)6PhP-#Z0qC^(E#}X@3DO10Ok{U
z0`HMmkOz=Yu>JF1UxefV{Q<Ur-W!N81(5BZ_X68L@9En=ugMe0Ysdpe0lb%uknNv*
zfINWr$Op&+*#5~gcyA&?ef#G<A`kc3{^d366L|pJ|GNNr0eJx1KluQ80NejGfIL9{
z?rxmR_P-eC;oARYc;0Zg`_+a;ONL!GHnzhx&-dSeTh%(YMx=qiIzhJ=EyjcYPVk!w
zq^}fdcH=4?_q{mx;i?SR{O`ikD9~G^ykCs=#+Fx(uuys13BKtC{kixee?z`hu6)r6
zPTg7gY8F~*XOw+3`WC0cy~>e0OaohQk&*(YCS8ezUnl~nWovgK<_x^c*uCnTPSk`V
zypyN=z5s7UD`~i_<I3kAczpT85!YNZ==M&hea^Ok;_^GHm0<xd@A%K;-x#G7rz#~;
zh`cOCK958xOjpW8<mU3^rip1Ep8U@--}Lmo_x8sF$zlAm5*Gm(WODiOe=h&LYRzl^
zX4I(98vWC2@pUVPKl8}YqmA?Gw_4I~*8h>WhCA5*u>{$FFbwyue0CI04yYGq@sp>A
zI~YIvEym3w+`IDGu{ddOvHwk!KMD~te)gH{3$4cA7VmCVzh_2&tRgw9FB=4BApTQv
zpZ&1a_)o;U|Ek|2hqNdEr92vnkGye|v+00yS59g;`1@xn`j#cvoGU+F%l31q@-Gvz
zW}4DBrlF7WqW^KDhhpEASJj)bH>?DAn1Lt7j#n?gx!X-o{qlJEtB+sSZo}o%WD8_1
zkcV2xVS+6-p`WE~+<%L4NfC0PQYV{7L)xlTBne6cZbdo}qZiTBoY(oNQ5DO7OMdyT
z^+^qHe1CB(w0D^+GGw;czyH<KAC2)RWhEgeQQF~{&53@Nb;Ad#w4f@FgakAkPxzk5
zm80${E1NjujD>All$9Md^{<}oOvfK_7Wj|MPljQtTGgWtIFsWKbN)vOKJ-EU$JS4I
z-)j6F@or0t{6AJ1MTC#Py7Zrc&vmsNKPd}+kbaKII8L)l|5<qVL^XcnRuMYBz$f3;
zEB;}n{ZMA*s6dV(M9Uc)ecqOS|MouVo$D8jbbov80b^+_Fn7$a=QObU_{j?Y83gV_
z9$cnyAni(ww8*0b|4sup;`pl&Z;QT+<GeFJ`XcX=h!0jAlV5nwQ+xgxMfptMroz?h
zJ^zXNmx3HAM2;|LL=I&mHz%X-H_ESql@Gktt!?G4DM>#RC%4)D9Qmo${0gj*=KPo1
zl+XwHk3R0uZ)#6saB7|ZhnK(^|1tO;byMN$i59!iBe%88f5VSJ5WipE>*EP^-UkmF
zSdKru29WeqpU1bX(mw$2O8)=fkbjKY54B8r;5!A13@y0$JztLB^u;YdF4((0wf8@p
zwymO;Q(t?n<{*Bi9y|Y|{3lc4&?O505t5|H!R%w(P5mut_52T`?)#|!wNLKkSiUwn
z_<6m`KW%P6KmO47kV8=0N}*pAxpnqB--elc_kOvutmm!)%Q`HsPR}N5SopAh^?#xA
zZ-%N9&PRQljIpgt)y5jj3x7XXGUn&oK40|sgU_~UckT4MB=6VP!|=JLJ)K{#<S*m=
zOT+A0Hf9`M$h|VO+fv9>qWun4_@7I?D#86gxx&2v53d1a|D)%kTF!<(OUI)a%l#i`
zctRhHzq;j~h0lGee$tHo@S{)8Sv81ggKu>Mto9zm@UB(*!;k(%{M09M-py+Kqw#Jt
zHUIT;_*QRJ@fDZ%ZIZdO{o2KS+qI_Tqt9ET@2|E!|2EPNZEoq<(f*WkI-a$C#k@C4
zhYt^>9YO|}9QNlQ*5<#W!9xo0=d9AJC8}B_p+DlN&4bzS(fCURIHxChjnpoEpM2Me
z-#)wen5*aRS$*e(y*;THH>*Ei+rIvc23O@wr5k<v7~}!<Z(e2g(5H-LJ;<{(Wi(rc
zYd1J-C7v_CN>nM}pVPO#=;;1^<?6PlzIbNbfRk&ktq!h?yK0$#X8bSw=uhE4eq|h-
z!r(jOajTt0{?9r5a0mErwc~f<gOdMp){?W+>?v7lavodW_lAoc&&dBdpCaqI$?MAF
zT>Pj0h{qVE*Dg_dXwGm`0+O1iaY~z$Gt}f`!a~QbSOSRO_d)!$ZKzKCv^RP{{2VkN
z?)e`p?MHhj8|6?4I&(oI<?1|8&DO`cAR$vHoZoDculYOPt$)Y9(EYc<Tq|5gCDtJL
z@AB_B=;AmACdZOBin%K03jDdc$l09f2VWR>=1oz~Pi}huqnxAWP_H2Cl?(&3a90{N
z&ow`ms*0e4%7idyGKVTHl5-itPJ}I_MCoft39UGa!C^VmQGhdHXOOPYn5$SYF)fsc
z#-rwV(6Yy>wMc6_9AD&PZjJe({e~l1*0_A-+my7ak7GU^&Vy`_{3AE5k8`Zo<?%W%
zs&JQ1bvx5t-l;x!nbTe7Dvio7@;ZxiOAE_$3te7ko_9*Fr_AZ|l$TC*rge6vXJvPe
zi;i(-l$MvcJh{Ficc~W_z9L`cn94GjH!(4KhL^@gjwby|%ZrQ8c0^9``O5nA>^XgU
zHd<I7>IC(-70AterN*#-FNDpb3ppMBApbiKuTZDQIuibE@szeo^1X53Kw}U$dD>+B
zpMn09b(U$#!<pI93H+b7Vxj7%(eL?H+6?fRfbtb>A`f*%%&W2H$rfXU|F^?;dH`1G
zFTlGUIB3N&26UDo|4B1By^tKp_snVM?@vYk_e5A7`Y*)$jcN3UV|w)T_-MDMuxDIM
zOl;2y!-i((O>vdvIwB$*g#|^$E>x19hoEX^&Pa2YMUFsSPA~FCrj+IuS9*)Q(U~(8
zgK{Qbl?NOxnXn7SdDC5!%L_+(TwYhHPpQ%)bMvO6`uB(&hgO0r-aj@bTKVe{nO0ux
zEBCnim%7S*p4{Rdkt53|7Z>FXaaE3SPj!{{pBxikkXX>GAT~BXF(x-Yx2Y1DjImMq
zu%bMV+v_gyMUN};mgg2{`^xi++|f!B3SFM6lQC|0@%W<BeD`#3bb78YcT7>4H+p1I
zX=(1{VwZA}F~jF7^%hMoDn{dr9?6t?aVO7p)==fd<>BwLeQuA7bRJbF<ToberH77a
z9hs73HAB+e#l@~XG9*UXh*_jmyyi4kXvKd#$a!me$U>~m@5kZCViu0vuL2U0v{9tw
zK?zA-OPj?gv`=B5NIt^$PmpW6(1Wn&;3y%lihH)X%;9*j>H5;G$E?kmvvBrxH>{1=
zOe@ym_;RUYzfc0JQN~3ZMfOjr_yR2|({RNz$%l--#JGpzOB|<=kMNw_OdLkP;0*LR
z;Iw&)btbJMIse4pj>lJgxIYC~GEVhFhCyTv<ZphLJv0wmhw9@`MH<-aPE~q*_U^v0
z>F8R6_<e|%GBA(8_-XS^-fOi7p#F*W&8GoY`F}ay-9+IEM_~M!r~#BgvQdWR$P2T6
zK<d9D@hz+I&%nFGRsN4t<zPL&3=r)=$OD{_r2G?!(Fvt4)`&=0WzT?3L=rS!PFSO`
zm!|CC1!y%Jsn%oK@)qNYa#T6!;rKZc`hyrq@wC?+hnQ&PORE(peoaa_F1!ASr-Ajo
z7*rN0DUd0V*Y-(~Navx>quI!B%43(SA<yUG{7T>|;A&t#a1C%Ra2>!hx&gQmxC!_T
z$U}X)1>vngE-KS)2#XL(yY#zoy$F!k|HJt`z&pSa;6C7fU@5?NmLudC^+EOeA%rV|
zhk-}bdygSp1w0Nsq27BE;Tqs6;A!9)fZux#;q$-?z>Dg=ml3`Kyb8Pq@V(a&t^?ix
z-c;|&G<O7z@8jNjU<0sGeZC3d2f$|FLx7$7M+iO!J^`p}-VS^Yd;x3)z6AK)uMmC>
ze4}3T-gh|v9{2(HQN8~&!X3abz)tnvE`+;*J-}Y|-tP$i0R9C20wy8N`w;#E{0r;{
zIMkv5el*f)t)2R}5pt+Jv>CQ*m(ptSv05BRV$e~WdqE!ya|2mWtD`l3Jq$Tf3@%cn
za64g%M_U-Vwu!4w8Y;2$Ro1A?1ow;s56!?|JXW=3Vl6}h!WhhY@hlm=e;m$Iah-s7
zqwpjFZ>8W)Dz1~zYsBCz6RWwRQ3lfk;uYf;eXM6AcH>w>_dk{3i5!s?hs_`KKUHH7
zR9#jp(}Q(fz7!b$Fx03L#7gU+@yJp3g<L~GnZfAjQG@vB;6r27j|IkWEPv=z;-89y
z8pMAEKG9754CM`>TNgSnt*4c>hgJ+eMMk77B;-piH>m$(zQ^Kw4E<AQeC412lof^L
zEx)g)G|&=Gi&gt>4B|fnmr;P#_;b*>ITOw!9i<y8eyNL<ni}y7|Nqf7$bUWkl(Wdm
z<al3bS!pxE^+<Z%nSZ?U3iU6dBQ8z{tkORh@0K<dUl@Tlb|E+jWi6@Um1R86#P*b5
zfc_)mEQH+wtMM<uyW;>JHRU=fXqlAoIM=~(%f+fx7!5g!V;3=oNW~lZh(+Un{c&Z?
ziE5e>j=CtDit&=wbWmr0Xw#u_602!QP|^?sKAr~2H~~C889hQ2_<S<%u?I*{??#~}
zB;tNN?xo{tZ-7@x_+>nhiaS>O0=7I#<-z@w;500)X39G3nMl#0N?TuL<z?^}vmITI
z+MjaPb*~Iw_34TYZI+HdcBo_Hv%4o;)#;gxm3=<UyZz4@ry#*fntK<tef7Yrrw+aU
z?)*n?JN4IOzBwwA>!tIQHHi7B1=Sn9i`9jB%8EiU*4I`P$}zvx0SMm*hdM6EA1!je
zxqfnsjK{N{&1|&qxq^)^Ddghc;(@OmyXV2?>2vS<<m&s1`%#=#^hJU1r)K?KR?xP1
z_>%js{_LbzBhC%=UXy?JJhEX?`>fl}JWx7x=pSsDs5?@>K>dRYJ#8Qt;#;8)>VHqd
z<7mJt|Izbb*~_sXEJIq@^HUEYYAE}=@JCJN|8B-7R|tVjnH^xPLU)p1C9{dPVASLJ
zr-%Ay(k&1Fr^Z)$`UfM|^YKTXpAGs;(c;)6@eVb@W=Cz~?*iUI?fX<nUE~N;5hus+
zG5CvB#_E(T=)b^t4ex{voXzIiWNN&szlJw;Smqe^UD42mWk4#+L>k20)O4hZ>FI&g
zh`bPXi2c#V6O@$oP)m!wHG6>mN^NE>rX)kjo?r|o*Dwb8jSPIln0~=QjMpS1QXI_H
z&}*1EpG930{V#;lJaH`a?%Kuan_}VyE*Q7-#Gg~voYfWg((zj_cpr6$Ty0A^kuzIb
z3#M!-jy9JCYaj>W5&LTD3Mqe3<3xE|>Jr1rUE-_s*HQiYzYsrOt$skZf026HSBTYb
zSx5=}L3osUDWx+Rs}@rJWZUb6TMV@)q0jW~FP!}Y^VbvlGs=^i@E^)Rlc<Ei5!m{y
z@;&iu`d6ub{@;!tv;Od?-YR=h<6<FwPzG_rOA6Z>TPGzx);*yU<UO`ZN@m(j>qwlJ
zqvcX}E;J!eqpsS)djMMu`yHp!@32jhm&vgi?R^CAk!!Ps?rXDY>Qm6R%g|1lJGuC}
z(9BbArk$0T*LH%>I>FK66<MzfQlPgVlE39RzZidAs<>Y?eh~w(G`c7=3F-JHrE+>U
zpf)wsm$Ir-G#aV!w|~io=AU^%`JJO8vmU4>_5Ti(z8wEjtC0aZ67Zi=aFjw-Ec$^c
zT*V@#@$i)+xkPa5!1%Y?{qHKofBky$cKZ6U5<mN;VMrhCYyER1sRr@iiFj8iv77s!
ziGz$E?x6nvD7=sfSml5B;@#eYd{AGCzK8X_0@Tr-A|KcEyuqG;y=o+6Le`N;K)<Gf
zt=-{RV0-&%!Lv9g7ta4ju>E5!Y90G-A&ro`c~BRJp><F;<ETrV$vVk?OYpYy@A&<!
zhwm<G-|Om)@AMn|LNw)LmW}?9c300w)GY@L*Z-0KQBN7}VEs$P3)C=@zHsl#XUlN%
zwR&M5e=qqn!>}gu2iqPketDS3A17W6@xLbVKZ<X4upB>gH}t{$?}Nv(ZiRkRdqUZ3
zv>LzkpA*=#r-1)Usf!wxY3L0&2JoR(XubIM6(3H2;m?!L|8mx>u2W}q@1;+POi}nz
z!B2Hu|0Vqy;CIIU2dc|I^u6wIm3s)ju&}g$-ZfucbneXc({Jw3x={=@F*28ADCG>{
z(TF8LzXze#Ee~@1Vf*}J&T4cR%k`v>eUM&i6kZK@*9S>PSR`nk4E~IK_JWIVOBs^z
z?e>S>UUdG)>?LI$%22bw7XA!(8pvxa|1<p;?Hq;Hfc>@Tuh@#+sMl<_LM9ZFR2l9S
z<F2S}BXQ3DUd}QYX}?7c{<CNDYjaP3tKEYi987q9+Xu(AH^_D4v2dvN^?yr#NUV|{
z(!$6OZ7=-wr42()IWTPF!y|t<d-bu&2D!}HVM-2v)w2DY_kYw<hdyf3|2>P(N%_+}
z{`k<5;|cpewtY$|Z1-VbRv%KqdaC9ASLnY&eV6fbEF;S()O-5-YjM#<jXxIheFC%q
zw2Vo`S2*iSpDQs{<DVF_@lQlQe6KTLmHxNzZX<w)ltaV!(v+U58=8tyW%b&(=*MWy
zOZ`$Q#-`L5(7T?P`4V~`DMNDvuGc9PV|>C9G-r1xiI;+($<;<}dR}*8%bw>PzxMHu
zCtUFP!|zj0lAK?L)ZqtP@99@O9H?dcIWqYt`%f*Oq78FKdNC9n-B+bS3!RIzQ4i+;
z)QMeza4s+pxKh1$HNyG8HNds%z3UO)0Ne=Nq~5z3;Vr<ez(V!j?FjDx?gZ{q@7;}X
zG4Ma&9`)W5g!cjWtJljAE(ab^uU8;^2w16JKZ5X4;4xs8dhZE@tAQug>!%Pt4LqY>
zKZo#n;05*iC4?^nuK=&A_tqkO9ayJczlrcI;BEE#U4-ueR2?wCwjq2U*aUo_-un>Y
z7T_cG`V)ko0-veZUm)BHe5qc4h45?O8(=%|E$|)iJ@5nYBk&XOGq3~r1=tBRf>L-F
z!rj0gfa&=S;qSm7>h)g;{|5E}|ETx&GX!XF&EK$P38_K!@WQL<%LbBCU3m4>yrM;d
zUx@V}LLQHFP;;T5fsTd_MEXz@KBVnJMJU;aywn9=DENI6I2E}YdE*T5WolP01P(71
ztOHJT22C*^)(B_}Gy!<O8A4iW^ZY1;G}t~GI0iTt;QiKW*aqPM;CP@Na00;RCn0PP
zoUC4-g78$}H1)b8!cIVE_4;&#X8>mcUDbQt5uOF~P_LsA_5@<o>o|n*Kmw4c-s^?1
zH;@eUQSbFb*dI7sy`F_I1xN+b)O#5SGl4<s_4x?T0VV-MfnmUKU<5$=Mj;#xWCLT=
zd*cv}2POdL0_OpI*NJc<aDjTwd%5a)9>RRU1r(_FrXVZ=E(E5k_ev0!0&ex1ZvQ-h
z7x1a~DiBTwW~kQ}A)E<ZtX?zTOL5)=<sJb((g0`(@IKA+n*dFLW<YbGD{vIRr5Q&9
zeD7F<t$^0*bsL0jf#cQd6A+#VoTOf#jIaZ63UDfL8W0J@1D$}*Ko{V2;0)kQU?k8D
z=nl+5S{ZK?&ZB{z0Iy>ax`0BU07wLqfL;KfCnM|w^i{9>BRm@zpkAjSOa;=^>kNdM
zz##QH3*kAy5cPT(LfTG`P_IWJ91UaxV}P;1IAA<50XP>p4>%ui0uuqIOClH7lYxBo
z{+|dPD4U%KrvOFj{bDsNL0GDumm!=6c+~655S9ZKz;yLqCBln<nd<c{gqHx9s@GWO
z0|^#U0*!#iKofvVWauNHInV+)3TO$m$M23ocq~92T5Ety_}Tz%f#U(L?L7fF5jY8`
z08R#|^Ew3}?WZA(1UjnMoe_2cPFJtbMA#MRre2?gum=#OUe7=n1H=Mx>b(Sni9iz2
zOTCwjun*8zz3z|jY+wK|P`#ImFbzmouQL%20tTzs=O7#c3{|g(BOC#YRIf)P%m&7&
z*W(b52POdLs`t)E=maLJ*Et9$0lC0r^<F+g7f=8cs`rWzUI<JDiq(6i2;D##FipMZ
zMd$;{)$8d9HvpBuMe4na5zYcGQLisUc<A(B*7OfjuULVeE<>5A(tL0S>)WX<qI5Dt
z)vOnky|Zk<n8MZ_RyMr4W9DnuH2DwBKUm8@k!RBLK&CP((=@e0hU+ov^gq&XS$u4_
zbsI{Wb+~0{3xko7l=j|@sN4AmS^uo-pM||&5oABHQcACno;qUpkk1m9IQH(`_}8Yp
z-i*mIpq%q})Vyw0WL%>$V|6^&|7(-{3oT=Y*I%3IUpOlr?x>0W=UaTR6L=2~^Z3p6
zKj=;l4#c+@@|$MIPk5oX<@n9#e+J-tDS*}Zf5p3JSdQOx{tbLo>{nwo{+^6mjejm=
zjXA*Oz!d=d=6MLORL`$QI3Ku1y}l0N^}r44^-TyD05_}Gw<25!+@@aNf$&b?F7=w<
zUySq5fqQ^^fh7R%-;Z!9uuQ#v0O5nc3iWy=!iUxKM-e`zo<EN83HAI*glp9Erx88_
zJgZ(mkMITHMfLh+gs%Xvs@H1~z7DKYuir%Y7Vx%u{Vu}yfc5J2MuhJJo7C&g2tNe2
z03WIMK0){?@R@q;fgHOP=U)Op0AB%L1K$A5gKrUj2Yjzy^WIN5|C!goFThUVS6<`U
zZiIV)z3TPv2>$^71pZR*?L+tv@Gr1my~p2D3E1d_Thn`A`Dn@A7d2b4aK`0H6>2@k
z<EjI<LLM1u*&{<fwD5qIbrxO=`3iKeFSo(d#F9aMBkteSdc|hP%OmcHm`0tju$^(i
z#-&KnJ5rj^tQ>?b4wj|!+tM)t&mF0O3*J-8%D8OXIn<q(TkIU;Dk*cuI!EVvx};}q
zGUfmFwgIxHe-3N^5-}5bMlQ(;!~8Ql-o^{4ddgwO|Kk+Ry85y~K>d4FMYS0J7JP>?
zI}fw?X=4@cVEnY_O9iab{~6x3-v5}-KUA0gZHRvlz#~^#weGJ2T=(=zyMAqZaQ$WT
zZfyK!*X)C|FVe@sbGg$`VtjP3UNO$>tn3j{qcbw2V&IiwMv1a!Ol?zxs?nO%ufb`8
zJIdoK;Mbz2_)3c5zohtN)n|#fqBPnyxgy`4r}(W<yr7U0&mnYI;pa&u&E<<jLYygu
zg&tR7uFs`7RSBSyDZr?#+G(ik`RDM~$@(3Z^b&evz&wq#{mfM6dARS7W+Q_B5IG}e
zEA6~b)M&JYd}T&Fw4b+Z=%8sQ$~So~X0JFmCVjm@`T?~cJM1~C8idr-!Y>6QYTAx-
zEJX_e5AN|?P)ENLoTH-^fv^zZs(oR#+ZoiYwFz~h$2>x>F7@k~poC*&(n(tyK}kL+
zX%JzLatciepID#$8wyIPF|j`X=Ws+KAEIra58+3#(vl@wS<ho`1yegMl-R{o=nv|i
zqv`o_D4TrY+cO0<DG!$7xsZan+g(05z-$O&%Yn;*D}cGcJm5;;D&T5hK5z|iEx>WZ
z^$2eO76CT_3xJyeKD!m+Lf|&_`VNG50(Ys`d}lGv{|DRy+zTuL?gQ=zmIBKFzDNB3
z<M8GHIYuS;J$<|S_u915dDbSJUSG#4d$9dZ1*fBD0NSYMW3@)0)Ip2*7j2UM(EMHY
zRMc?`zfm~|Wgm4OXgIv{zds;`&+ADpah{xZQhFO9S~ZG3l6^bvW8~@`nTPX0p<U#$
zu}B}+DvI5OXix1_c0Lx?nzVoQL2JRC-*WMe@C?S@jGWtl1%sq+9jLR*Dyq=6JO?$*
zt;|)B3QY#1CSbemYhNfCOxuBuV*$#T<UzEh)hw@MIlTi)*V&#@!Hu+bCa$wUkKUI0
zo_a(JSHXqeNeOeXHljt}%Tbb(YyU=p0`}0A${3B@!)WeH_~)u_Zy_aT+G(;U<v59!
zn&d$A!%U7Ocq~^H%6Uh*(&^9T5jzJqI;Y#Jn~yuX{hOzDq9hk6uONfN9RIiMzvHUx
zzvC2+NZu}OI<@s<+rRIc(6n>sn>WXOxb~+JANTKu{0o(<mo@mmK7zeqRQlkQ^Z%Z6
z|DU)2nV);w^N)wgt>B7S8*eLOCYstHYD}zpeG#5#4xML}Xz&T?L(^&+IHx-kduB2f
z$(Z3K=x>HzXy{*zo@X);rr|6FPlV?gdYws!rkg8{({Pv4m@<#Z%Bkwp6(b^8rDj*c
z?`=u6<^a|kJ;+t+@)YGorxz(6VRJo|lj6=lUwtv#=P4>J>=9Yw&2xK-izaJseiJNv
z`R&y!H!&|UDK<Gi!4=axd14RwaeXQV=X$63=$`h_#x)U~&(TzMP24QaT~e0oae10C
zw(O#dTt~wf@wnXLa@WY*B9GV6(9y8jf^d1H=2gZtcq4`<VfnpDv4=XtEP4}{I&hs=
zaYF@oTA;GusvC3oFpo`6?rr$d(KY?3pKtUkcj%#=p&ub<*uk?4F-gumm#+p1gX7I=
zPdQjG@){@VP`VBe&MnNv)HJt-p(>5^xC=eGC6SqMZ|;rkI-_?|H)oYI>`37OJW{v-
zkED-r=Y*1Cr*Mnzb;6OpSMiXp7M35wnb_?2aE)5e1O7{_?|d4yDwe`vY{Fz*S)bsr
z2aEGBA|y~Tb{9Pt6W(y||HVRU^e;N?x~F_yggxX}Bh3uuJE3)<Upd;ViZ$YTEt4Dx
zopQy3S5oh8{rm;<#_rix>S)pu6)R9?m%4yfcqYeb_uGVi>SsKlk*lsbcPstRi!`_2
zcv|Ks+uPn>abV+j{kJw6-`IdUj!>!3s@^)G#kQkA%TEv9ac%1%_uP5wixDIHt;~Jo
zrI(r*P%g`ItTGO$UM{?B6Z(znztlen8yT({=SqCG2#$H=jQ8&oUwX1K@2S%ce&zUQ
z?}EqLaBLxKen%MEP6CgW*D};rlD=3E=%?LSDC+ZP-O+4i(N|B!c4#-`xOXNs=&qx_
z6{zPLBT2Ok^?oK+*OLBEYx(=|t7FA}IBeB&zl(6b?DW<ml2?)|Xm$krQlO5JT2uX+
zw`s`1HF(Poe!&7Ya^#Zq!X<X<;Cg2NIkS~W`)@W$yY&*_?y*KX(h(>-<0rJ0;fis&
z7F+o4-%^h#kAZfB^N8H{g#4^fsim|PtyJuK*ssq3kE10U{gu@hn-@)Yub;J$l1Dix
z*=GAv(x+T%M_JQk*@Rl<E~y*}Dvf--R8KO|dkHukd{9qiDE~ge^;24%`R{9wwRoWU
zK)o&5VQ78y^~yQVLZw~O?`I{n<@)<_ZjJtGwYgC#fs1`g>VgO9eQ2gDdvR+XGHI#6
znNKhJIL@P_s<M+<xs?z4q(=;{We;8fC+jp<GQDY&@->nbt20)@icC;b8>u;8>46VT
z3)T1W(zb+U#X3f+yyy>jP9490Z{HJCIBF?>Q6duFm#XhO*_yni=QDb4D%K?&{`k4h
zqEIO>(E=Ewey@7wF=x-|A%^l5=fp&<Z}G$I7klRqy}xA1`P)8CA70oR*)3&g8UEjz
zKTN2aKTN2~D_N%6{NaF>@3ns6`r=DYe=FkcW>1~wJJTTFSao@ruYWl7{ukphS7d$t
z16T5dKIHn3biBek5&BK-3FF?UUYgTy?thUZUdkL+<L`&~xmKQsdHnP&75b3$kHRZf
z<4-}{+tp9jwg1sj>wkm&0ZMIzo(GQ^y5!pYvlc!5QqDE|NB?xs*OS#;U`{kj!K!^+
z-!)i-Gbf0U&v=Lo*kTj@t?z||6>se<^~cR`*#FX*S57QnI{b%sI{h7YhAwAbZZC4;
zZtSeV9D1OOQO=0`G5c>9{f*}PClYPSx~HHw)}4O**0kTBX*T+syus7n-O>?@okac6
z{)fv0yU-t4e*$||?x0Qk9$IqgTaX$5p>068gZu|-F2_VbYgOTXfnB!2f4CPN5A*m<
z*FRT#{a+U1|3gG?A%4^TFM@4IdKyqa8#WkLE&8qXf3miQjaYp+3h~SSZ}b-%`ak-?
zNAtga*7@MD55GG`uH)qQ-i%cF0v7#{#+%Oy<`YlbkbhE&9|LKUIw~*5SDM|LzUJTl
z*e}O4{PN_nSsV8C{O6-f*K!rB%*FRd2ujzgeMSb<K+FO89H;7G$M#>HQOqqVKV5##
zdpmBgm^8=n(JLdSb7Ur|oUWF4N0|ALdJh~;2Ihht<p(4Bjr~_A_5F3`t=HxZZT#Nn
zeWTC5;VeD%vsCIksnkz4pdS0O*s%Unez2-vFz3If@-KKOcayfx|Hp#=(5Dm+^Y|%U
zhd!kIE9-3NH?=3{A?}~lOY`_m{g0qO<sP8c>A#>_^rQNPIY@sRo(~6@2Vq{VdX$Iw
z>0673l&Zyud%)61KYz*h&BXm@4;Z$y!ZB2iD){B`s0eKRdm#`o%z)dGKyJV<R_|D8
z)Al3vbpH9XufMb9`xDZRO55=M{*JjvKS$YwdBdae=^{T0yNd7{I1Vt+A3O37@=vS$
z!#{soJ<{v)2B)OY{CNM#{Wfmv`QqWPKXd+L_RrMT1$#@TZaB0L-?RUU`#j>0jSrrm
z{C=|+C$E}Ey`-p<+W%0k(wzTMA`E@hg#S(f@1f5?9_I0*8HG6zzaOn(Uafjmg1DPm
zjGw!bhC6CPzXx$|RzGS+f1>&RE7hjIJ>uV?#=pZR{Fn7!Zx<129}L=J1n&!Hynh6F
z7}vLOPD%7{@qhjL)<WOZX5WshJlN=}D|S?;r5M+Ouj@tr1#^_p{@2r#k&{@FC~|G`
zXT#fm_UOp%QCZ)7Gv~=JO^!!aXq-iy8Rw4q-A8Pae}VdwY}6aBe-g8Dnm3cb`ZUas
zTl&WjpPX>kjB~F(?lfvg0`p=OjDXnlFNEl5CIQsJN(IH{b*ihfaRnD7fI=}+rX5bG
znf1_p4?Mnt(krSxGg+X-%DGRu&nIOLro{i=V7yVR=<|eKo#Yex`=XY@-zieEvDzt-
z`}{^>=81MahkHIwvwspcDEj$1Y2l!^KDhx@Z8~gJS@-{AH0vv+zi<|E@Wl%X>|)Vn
zL<MIZDRl`8R?+jwI<*#QUw_zgUvD`;yULpGv7yx|u|D3|YD>~I9W*Vo2~Es<kHUF`
zZqDECSnR7(-)wnmC!@gMxsB>vV819m=Sb@aO|QlohtO-2PXkTw+N90}(xl&UhH?*g
zvE?q@<*1pdutMU!H0+5fTBmG9n?Mn*kZNnEDy$5hh(&Av!itEtd@-1R(JT>HAx`_-
zm+E^oX`SG2zsH>=#T;EedVJx>nI4H~0YYnG+GF~A>pB{g*QdT+@Zl`b<G~o0ba`M+
z6lgWO3{=^<XO#UrOOae!v--zw8%X;+)B11S`zdqBgPn|7_gU|wVWHa_vI9Lh&_a0x
z)*_F_8XWEnEd0P|`=k^hEf3(AY>T4pIPt!m1?I00l~hMBJub9+={JG$Vjw@^e)ZDd
zTs+cSjJnKPEjh<`NbU2cImcDq#(T~mX*pHYW!7Lx!7Nblm`x}M%>7U!H{qk!F1~UC
zQ|(`8=mUrr`JAzrdHy-_{BfJ+xsctA{VYC-blZh<2j+U9b*}&J3i_Q~B`1`nL7%^?
zZBiPV3@t~;>|X=<luY@0q`YO7*2P@^Xm0;77GKN;s0Tq{dYlUV<J;<6=JA`_Kltfi
zOe4n&oe)3Abv(@DH=lnz7vGUOAmyVb|LFUFr}~b0{E1<|M*TC46kzXQJ^#Dw^uOlu
zo9h43D`U^2YQ!In_^r;rCSs@ca7Rt_|1%N4Rr{Yr3-(Xrk-+n-LI0(QpQ8sJX8E5)
zA1h%Fmj5I?uTK5D9Px86Cmx4N-({p%kvub4dfanO@5>kOs~CJ|QPi?AQGX2Sh?GbQ
z(p$hf7&^*_TVV&L=GuKFxk3NzVt-^r|42xNV__XYe_GV8a;GDXY6K^q+2DKcSr4D|
z!mv+!uj;ukev^JK;#$znovhwKUc3&P7aRpothknWq-BF$=Fk26AWEnl>*)2FTtT{I
z=<DlWxw+!jJ@emcy=du$w=@MIk|r5yv{^Y@U)7UweMa@xUNe=4s{S7;$>NXWZrYu7
z{V#9d)Bm$8@4e^iJ7IKGl|#F`i}{30QB^pvuv)dms9Da5+%@Mvru?_s_Lo<oCR??C
zPf~W42wfA%|IWkXT!8ry`c3W0b%>vP-SIG|-?aa&Dj%!yFF@SfyUtqt=JJOVAIb-;
z#(x{)mirIwv`PDsl56mKanZ7<e<;F;s9ce2^PvZzU8lBp9Q_yi-w_rpfqSEUv~FzT
z1B<ThUhvZ+jdss_`-3bs-<WsuV7XX5?Bc(q=KM$WM!(-Z_4MbSIr;RjM_u^gtsB3a
z6O9az`SEt7;5Sc6J7AR$$>&z{%ILlMwzuD*UWz@18~yee)WTq^V$BD<=<B)DKps#G
zy%krp2@n1S_(mRnE!P$fM_n#Kjb@D(WzcQ%_4Dp|^NACW|Kg0#&MYoFp`)%0Lglsn
z{XbG4QvzCrUtBS}#&x}%Tc-yBx&Br9J7ul}u5#9Ljk65QTkcpPa_!;aS50WxZ*{>_
zx1BTZ$`7u*@k_{#GPh)CRP)5WziiL{$QfB@e3*&QYtxP9<mp|5Iqk!L*3@uTV|P9{
z`<(3i%=<r6`zOEL4xQ85lSSx%r~}|(9>4kej~slb0AOkJn`Xzoh<l6rl6m~J@CbcS
z{$RW=yka%}rHKDy^^@lDo9bVxo&OIa{%vafOI9piQ-1Kzk6-<Eq)Gv)kcawGnBXy+
zv>(BFsqyzHtws1&r&g6?0{xu+m3=yFIC1W<Z7((W?7?BTt;NWyI{YFqD;}>$^mDBx
zM`7)cE^L?e(M!9&T{!nH=g42EI`XSSEd4+_LtQ^>Yx+|Z36Xsab?KGpkA?N1$cKGV
zolZUXv?tsAxo`ENb7v1LAWM=pUxuORmiOy>|6$I5O!co37a%k8)V!1V5-xlg8EuvS
z(?@Z*qbB;l#}WTl^`mC=_p+dWn~ZN+tuKsr4dUNpIet_9YXlZJJ5B(Y2KBRHgJ%&x
z=OB3m+W!rM<WQ<e8-iyVNg1N`Y`&rIDbEi4-$wWDP3!(H`sE>NL1iw;P>CY!KfCDf
z^y4SFek}YBGnIq>>3j9{SKN}Yx#IYa_jHTLpr{7)+j0E|*N+*^AUUDs*UxMR&r)vB
zoz!UNfvXQ(a`UVgPy4d@D~(O_q%PzKz15wOzn<{rzB|9eCtI)Rf6J4P<{UltoSz=o
zm-`<b#7OxOxZI$I&b%FLu7mzlPro_;Gu8i9QAujUHg@&li{L+2*Z=iW>`X#`mGbu#
zJe~$vjsG>oZ&m*9rC6_qk6)Iu)%f2){GY0yG|zu);}4mJ&?(iPyo30EQ!kC`zZ-pk
zSCOJ?>aS|yb8mcb^Qf=qG+ojA(x*HR#_QMB4pzNQ{0|db*4l`c^5C<&;2)i<tc*HC
zI~@%PCD;Z?KWdk=Afn%_@ZJ!e^3*Ty$92eBn?5AFBP|JJ>B%sd&QN!1>p%2R&3_ot
zODlF^#U$2JXqv7+|2MsN`?ja}avHYy^U<uo%TBCu9;~ke{%KVHq~Cn~lB@}#b0+7w
z3+}jMNuR%6lV>(N@29txx=nJ%716MR!Co6xyIeG37rZ25W=v*UY(h+OMpR02W?WPP
zPNRA!ro=~yar1?0zaCgxp=zCWKN9>Got^`WUM=%q?&~POV8;J?o6G+ZW%$^|)rkK+
zy!)4$0Q30G<!{+)8LFQR8~h6XyV+v=y)3N%yAa=+3RsPQude@l)AsF0tZi_jM>6tJ
ztL>Ip^zwq_jDuHS@aT1;Q<Hu?@qw0Vj_6A#*jC#v{yReR4@tjErw7)k{`JHkUWi#f
z<@l|ab;xoa_i)8&22^YF6Xf>(UQl1HH{~zpPBhDKEf4Zu9J21a!3|=Q9{u`^QKy{w
z3ydd%dekydZnV;?{?Jc9lpK9Y&#xN&16#iO$qQFK+3KFXU5@V5J>_bnnjg|{cXIFK
zl=!5y__WmCvo4N~c8(aCF&vxmM5kvA8{u~mot8av^oVmV=4L$E8KbkE=ZzaNe8>oA
zdPeq;F(XDQ??&O5&Y>y82aQb`l#%UB%O0FEdZcsA=&{3xII$Uz-?xXQWDOsmH9UR9
z_~;2K!-h6*f>Mk48?BWaQ#5IYtL34)t#rR+`+Zk`aR|~3iaN((6Bzwxoq=g*jcY^#
z!uG|qc4;xxotvMTo9A<Tf_95)#a=tjo$ta9H5Enqy6vMHVe1%g6J-M_FE%V`=xE&d
zsAfiSWyzhQx)=xrSwY|5F{*B@W<qm4YqS2*(C8N6kN%#7-|j@%TZt8|oL8g`EO#~@
zjlWdD-<zwD$FX4z%B4Q-=1nP$bJAiibSn57HFjL(9!$HWaT{o~%bEkdu1)wlWZ%Y;
z5^I0B{%S1F_1?O;m$Q9*28XV<vbPSL!ItHa11jo^FM00zAWB58#?ty62YmS2r$!mi
z{)M0YabT{TcEGh?!FPE5H(TR`a^-%W(uxYe`B+EkcbP3~BzVMhrG?3Q*a)=Oua$(=
z@sV#dQjnCl2IZS=QtDPXq0t@yKDAx?bI312nO%0g*Hb3vQ>5h+`z>wVus;p7JA1^Y
zrDN<9%;D&PG&i#SIEwthx*ZYU4)z)o-lE9i=!TrI;|e?0K(o0k?ypcE_Gl002U7Oc
zdkx73EuY$?9fg*btoChV!0)(c7%8L$ivwQ2?6V(6X!?XSDAw_FzoAg8+dZJhj$DuJ
zM$b30pwE{j@D|d%-X=9n-`j*5QDi_CDufpYUl^YbUxB8{rZib!(|!qfs2A(l6QIRS
zLe9w@rAiP_TU+!P`=M-^gVbCOTn)?xt^}?Dt^%$F<^$IOHv%^S*8}uQv<SEtSODA%
z+zqh*UI^R<+z#9U+zH$TYy|!XEC!YU_W%z8_XGC<OMw-@GGICI0PrAiE3g5073iqy
zuIWRYX(t}X{U?Ccz>~ll;3?o~;2Gdq;5p!V;01sq$(Mka0s10O175@VTHtkH9q<Og
z{(!aoZQvc?U4U~3>w!(c*TDM#=TbiasMG%t_za+ry^j%o0&uRk0j@ts_ys`QBg$&q
zfUkh>fNy|3z_-8w;CtW);78ym;Adb5@C&dL_!Za%>;@X*+j|lI4*UUdZsSkjZ{Qzb
zAMh`*A2<j^;{BBfBM^%AZ9H>jjXMYHU}6pQ5Q$Ygm!zS6iCtc#HM6#JiNkRs()GD%
z3l#HIQ_+^G(>2!Yvd1`Fd+KO>UHbVD_A=C9(A$T0HCpMp^gHFTW`AsZ3iVuHmXp5^
z7nUMz#kex3vZ_~T0qPE)w=%uu3gZp$FUv}=FdpUOfd-NPUGUXG4<|*6t*HOFgzfqV
z+m~8!y$sYtv33UD3$CN&#C9n~E7FzpP~xwx3Z`o==%T;u;Ca9b)MiSUZg7*j<}QbO
z#f-x-5c%+|Qk#1ZU{Bnl1+^m0*?5~Dg?|yv@vjN6V^r?}K7{HEEpgiXX#8u%SDOJ%
zj={eZ(p}!7!cv!KWNxV|`aHM0WLU1xQ#7N=v3PiVc3E+eZ(NaUdh`fSk*m~~>nn1X
zHfe=NZM8=uJw+wCp2{(~lbbLp?X)M^Q{2;)E1%2L<T(FlBVC?6ezDLMJ)ub(JPS_A
zh=KyI%h#lB(8Dpgh2oi4acHWGQTNqzTQNIGX!CabcLM*hk7^bX(d?+#e(yS<`ANLh
zp11hwfL6>SC1*~?iSDa@bacS8;Iyi_b_yPb$hA}P$S>C(v3+gM17Fql_kCqY_Uvx=
zycgZKV(SfGY+nBX^AaMQ-+^0}54+fZ>HAA<JZ|I>XZ*GAuivw);^d_rKY8d$PluM&
z#QKqs3(Mp?w$`%z&Fo)#VcZh#p#5bLUT_1XBHX+3*`JU*t**cB<w%r2GYo5D|Nk%I
zr;N?RjQ-x{{zoE8@f|WrtMpTOL7AS1dHlV_iy{6q|2=qi5nwg`ji8@n2p)&h{?B+6
zp>G++lBDqbCwF(1-o1sMVN6oj2A}PI@2<CIpR?nH^ACPa2248jheAjV|9xD`_G5?q
zGtRlWw{-vZzUALEK4tl&n<ou(&1CPS&o!Q7%xio4t>`;<r0&0DRNqDKT{!WZKHtro
za}OGr0j)+=q)O^I4NrBwwN3_@&?FMif_rOKvgjD}P$yY*3i;J@TTzappa4;#d1r*p
zyYS!XydxxwGkATba*cljT6V?%;p2-+^WD?EskvTPkH~Q@j~BvJ|Agom{`H7VD=+qy
zdtCiXUFAMcZgG#uk>!(%i}GMTGR8gCRoXv3c5*>{@5H3s{P?5<SA1gQaJFGbMh>pN
z=N$OPK~9+OylY)g$6Xd;VaweGW1~v&MB0s%U`#s!|BDgk<9{)pRzQ<Sd+%uU3NZlp
zdG3O}cib2=RAT%fMvr+ILl}Q28{efL3(lhyfoE&$+GSiRh}+-SMerS|fxRA?U>EP9
zW}`IP5(qg^=<mlO?RK22r1m(pk7IwG0EPGmY@!pOHijAuCoH0b79gvt7K<Fe3#kpB
zr8Jj6%;mpX_;NWQdK8?P9GfA3Y**hgkH1&guhm5U`xx>6U^)KeLmvO<)rddYg8W&5
z6wUyw=6?%xk23!`sy$h?6;!*H=wYt>qTFaP7-a|5D5oSgmjB}LFOFw%am{kv%D{Sp
zJUO><j<2%J)hwqhH$T6qv=G1JPaRE^<Ah<^(OIP!!I$P1t6v_2x4m8KkNvgr+}-`T
zKOA>n!MMu~wr=?PqNoM4sW@Rd=nt_w^iD%gQP=C|1MR_&OrIaRx6qFkLRtI_0;h9>
z<CJ0aRN&CA=(%10d*c$r-cu+eJI=O>b+?+8hJLp7R;0Q9*bRoZRd+bf1tmiFSogB0
zeujW^-Nyc%{CoWvq~9)5S77@6ZCrvqkH3Mmzih~dj=cU`pY~95_LP@tv+Z93FM*0T
zZ9+w8P8K*96FBQ4rFiz-b!RhWCVwTHufO)|??8;{aSY^-ZR%U*@hfA!kl&>KYdW6F
z{x;-`x(CPU<RA0+P32#V{DiFp)1Zqc<Y_y^FZF-p(Tf!Xt&)vGKgKa>8pfn4N*L;6
z-9i7&cu3uW)%gF$yBVCf!6DZ#o7H1~J0MYaAG*@fu3gzLzct*lbjyj}q<5%7k>wym
zC6X}z>W}<q+<x~rO6~jOjX$`WoLt=Dg^0>GIr}4Nmth$4>w*4F@G)vMLR(c|eeIvG
zt#m)s=Z+Tc$g9^bYFCY1Xwt8=ytw#mN8}WrudGkcp3|pKkDeYM?e-M*jEjkh?KxrC
z(CoY^u992_Mor_n_{<BXm-C_ucj;8O6BCb9eeN=+yUbM@m0#p_7Uz~0mSaB9>&){`
z$@P>ueV+2tsmkIrypmqzjZSx!xShjti%P|CCwfM1Nij=ECL~!+h*yc#8(mVA=W%=8
z1-|G!cS+CbMWqEZn6jjv{9(^BkIO6PH2IaO1x3X!kkPXiDV0mkGD^!!Tpne*)ay)h
z`J5T0z9L_xGH{BX;h$>8?MO0>6u(k)1d)J>WW(<iR)Yv=vba~02bwZ!v&7NnGFWak
zU0=HOn6(*m7S6uzhP4r!sV$+FLRgH@J7yFt@u;)NRaP%Ib3_c}6mDY4puQ3JZ)&|_
zv*YCvcSKC%lqdamRj69Cd|2|*T0?l44i{rw&@YD}HtBPdBb_{?LaY{(w(0l@4x{v^
z;=X@60zJ%fl?B&Zh*f8NmvL|pk3z)4yW%kVdJjC3x#LoHZ^*`q4SIddgUuqp!xdlL
zNhVLpEq=-9JEL*mU-vj(NmD+4IUSOe7*l!h4UV6p9kbCF%>lS3|8|6PfqB4{>b<KG
z&IhhhudhRRJ#d41eG|e3z|HFQtq2zax2e~6AiPsOUxe^(V6l2lHT}K767~9igiC>C
z>h%K%9|TsY*DDb|3_PM<KZbA>@Hp^<dhbbuYk;SKoQAOfL-;K496%ahK=>l?67aHm
z?^T4a0dE4Y1M7e{0KQMWjq`Vach!6A5pDoBs@IzkegJG%ueTul2>4jN{uJS7z~}1q
zR)q9Yx=p?Q8sRs<cJ=x@gx>={sMkLs{2AB*{G#6b72z&mH?RlT3;YKB4*UW91snwa
z2KE8}0Cyul_9Hw1EW&vNaQNr10_9+Bw>A3172|bUka2F1ty<fycmB)+6Mj#BZsUqE
zBla&X>-q_8PEZ_v$Hs`-S@W!~<?oMt{^>Ownx%oXEuMW$-s>}VmjAK$p_hKY;&<QH
zjhOcH%P?GUL?vw}>x=xQ+0f^K7go=nB%DQ8eWG7jx%t!o>Bl$xx;w7q-A5~WZ0>pT
ztbJD*w2^Q-+aCG)8>p2Fw9=a$yYHiY|NeQ?wA&iBbe{0-3L1(9)?n>=OD)^4UHrG3
zjlZ<|ADDk)EVgi1^6USe6hHBd$7c15S##%?9NuZUB+l3lxEG%0wQ8*6ky_?oP3w=g
zJ0HFH3qMgMkWrkl6VFw80lnNp?#8**V#lthUf4b8>lG=BS|3}nrr)qNlnw*w4BXXA
zuG<sx8h4zOKF4z%^@;zB{i6N*Pp*v8?-RH8gP(p~e9QLE55_I}Yhrd<I&BF9^GCl+
z%JX$p{(&{II`v<hN6y~+=9ecunf!43H-7wU!;L3T;A~YOwRy;)Vnw%0*`KQgVu1wA
zt0iC#zrOf?(b~Vh{}*k4bB9&GymS9Ui_aU;VCvt)p1q4>37HE^Amd$&>n~u98if(G
zyq^XxKz>lu_FI$k6aAO59wD$7xG3Se&(8g$^2hg1b9D2$$Np{93vhKuZRNkZpx@t*
zPax%+mtOzz7a7N0`pA2$Q=Tr(j54BJlp_5OzFm*nuPFb}Yh!NpJ^jpe%gdg=A?Ci@
z&vR$*pn;UEul^y&(%g-s(qVu5J*(rNz<RLCyKl<1?+p5=&Bxz7@y*WGPaE~<F2|>}
zEPsD_z>EuPRy;GnIr33HdBApPF6_Ocf_a+{sUqASF5KUiK7_cY%wK~d>}Q&SQoHP9
zYF18KZxLQv07<Ym?5YI(w`)MvsozQP{l*`mMTWBKKtJPXT9I2^?#jv0e;(TocE_Xf
z0rn=DZcmA~2F8q&d-cj?R6Lq-Apws@)FB?F#xSV7D4%w(4RUfD<V<dmlh+_8zd??x
zK~6z~oWce<QyS#dmHZpne}=Y#lw*9+*RQ?p!)3!BZTjBqy~kgjas6IzB&hS}jRz0v
zbtv4UJDgX8x~9Lj@@GhOzo8P{Pl4_w|5{T^{&}S2hd|D2WgSg9xE@!YGL7V6Q*a&V
z2XG4VV3|$$w`RjA`pi_Mm;UKQ%@=FR>)+a7e-139ccJeT?Nq<VH&=1&vq@=$?qdWE
zR(GVbzN3W0k;)cn6Z!+~Q_O5@K115q*(B}OwJYZK52p675nfP!8NhxBf$5Qe`G?Qd
zx6I=2eHhk%ad+WQEym9=3oX7v9bI96!Bxew4-WO7{(e8i|ATtNjQ(Wv{RgVzwwnI~
zb@bcGf4uSfG0_*$caEm_c{}HVF53z&ThMOI4YAEz{xgD0m1POYP@m(W&+Ci+N78S!
zqV&LV=?911kmEYNx$D{82R^AVnkNgD19esY);SdCtu_6xkOjJ~Z@4Vy{kemm{;|WH
zFSAGVGhW*kie~-&`lA2$x4)8O0?p%Bx7Q~wKPmc^<{!3R+4=a7R&RI|l|Z%x8S3el
z=Vtte{4Z9%Y!H(FU4r{_0LEkRO3<xz@Sh#(T`Td^jw95;_$7T-;~$Lpx2hks5`TQC
z$Z?<X&qjD7U^V`sI{K-<=WMJO{!}RsQU)%DUb6(}SpZkVhC6Dq{)ILT@|$+qe=D@K
zDfz#qHxxXe<>);F)6QRfP5gOh-g5pon;)%NA5eeVf2eVU$c^=LuQ_GS#Hge(5A9Cb
z{#xs4C#m((tZhs{{o}lv@Epz27V|j|AvIxQ4>(a*It_#c%-Y52n_}VyE*Q7-#Gg~v
zoHZ1W{B>nxFv=7*UDUS;TMqrb6wFr9T8#c_jpIS%2#SYRUjFg0op3gX_GB)=SLI)d
z>owCs6@8?p;7KXo;kl%SJd+k=T!G2CKzTo8dJO1J4@!?*YsyrK`OC40nf6-LJc^Ym
z*6HO8&PdhT%nk0~0`;VUwqIF@VKUBz*I|~FIE<{p=sSS(#azA0-|+V%kS@VxIP&EF
z=uDk;OSMk;CiSU|nco_XuZ;)zHTvA5U0LW9CEyWd7*bQL)B&b}ySj_IMm`|D7H6QI
zaHWqY%=a?!Y#4q^zsGKHQ8zdytwYX1j`3cRQjY_#LzXqZ7FfsI;vVx$Z?~9+dyPZb
zD^`z!#<5tqt#q(8%g+{y_j=fJAw@X)%<L7DnVgWE5Em7jkdzdakdc%Yl@f=IetIXT
zr^Y6y#l^%XCeOM!!&{bLKH8P%O2i80S;((^NLiwev2BXARpbB;M}G&V5OMUynZq#?
z<B=GYAlC&Daj@cyMVN%YD1;dZ({PreSgyz8tT*0E$H<;*rD@Mjc|yiI8g)k08*-kD
z!4ZU?!~(p}IzrpWRJ=h=otBQix^(QGa8;*gGFJBaFz@z1XK=DxImmgewZGcZA?@cw
z>u*U3Jxd8b{o9k}dk?IBc-y!|sbil%Cato{?AU_+bA%(<F!xC5A4R!w#xV^g#TG`5
zV$-*Wym`{PKfc+panftMmuy#d?a=o)JZB2UZ?tb{eOYbSKgtp>MI8~AB;>Zjl0<T1
z+R^g4|42govM%z^qvqcCnF|K>IAwWG%uVy7kDc(`TspoA%)Q{e)93%GEo(dfHwLv+
zFMn#QDfN=5%;n&a@-Kb)Gz6IT;5UNr=;hDA__I+;<UrP9cR0BI=W;|L?OcLm3%;X|
zKNay&;ud`u*PGG*f{<LO*D^aI5kE{T@CEDiUjPw@V{{%?#vkl6LmkL}zd94@J^lS_
z5&v)M4gWSFTD9;(`ZCJE4zs#7)f9*|?)A}UW1xlK2(*a6dx6#h!V~Y7YL}VpzXG-0
zlw#Npe3%p0)*;6?xvS04UpH<Y^7DaPPAGZ0abwh?K#moDzKQ%yzkgy~?>}dk{g;{F
z;q;%{jJ~n`lxVs8Q`c;L`qH1jZQf(Ts#S9ndr)=_EFb?K&;I_OG}%GeKZ<LA?<RXr
zJkaiuw?DY@_2C09dFhgy2h&zV(#@4B*SFNJIntSoye?Ga&1Dhx;BxHm!uoHSdHa%$
zt9xfY@PhZ%;dkG0fst+03{chxlnW^uCl2O=kbYda%aJ0V>yH(-qhGd!!ANg0MsM_(
zBx?7LZ&u}RIi~-T<mbxD`klY2tx@gfDDXnZ<dLoSeDLBsbZ}jDq^4!3vDfu4f7Yoe
zWn_|uQ4L2h$rzucDEE3{w9*S_naZdp1JBYFWGbVb1ZCV*n-NS3zMF|SGBL)fZ94p^
zvNDQdUZgl?Ba7w$mjhP-bAfrlmB3ZN)xdn<8sJ*sI^cTX2H-~ECSU<@GjI!VE3go_
z4Y(b+1Gp2o3s?l)4J-!!2iybP3oHTd1MUZw0?UBqzyrX8zzX0YU?uP{@CfiI@EEWP
zcpP{FSPeW0tO1?^o(7%)o&}x*o(En4xc~S|z{|iZz^lM(z*^vSU>(3cy59ue0^SC=
zXZE|md%${N13*8D?*p5F4*>c#`ViOxd<4+X&?msBz-Ivc{(J#!1-=Bf0bc=M1K$AK
zfp3BDfbW4HfFFUMfS-XKz%Rf~fP2X90(Jv?0PgAf8}K{u2S6X2e*u33`+$Fde}VnL
z0pK72(a{kBGyoa`jey2L6QC*33}_Ct0FDA$0!IT}zke*y3TO=+2ebj&0>=aGfD?cd
zfs=stz{x-d;1u9g;4~l-=m>NIIs;vR(}6R9Gl8x^H=sLk7SIEr>`wgu<Iv;)xZ=p1
zZ?2!*BIEI_XEPh^d#+&POYOiE2Bl`FrJ#z4-jQSK3XJ333O|-(ZS7jFFp5&N0-BwX
zzpN)^O@E2ri7^nlJXgz#5j-^uW#Ibc<m<M~`svlE4<e}NtLwBxLu#O&%Hx>7cI|!l
zB2~tH3c0U5C?OZ%chtZ_2!YM=Xh#Yt$$&mB9sg6Iry8WZ%sI@y=zFMNi>*2nb6*D!
zvL_dLLanz?X}kOxS3FQZOb`5C<l$7_RPIv0JsD}G%@;jXh=U_^I;(c$*@Y-kAuEU#
zazZK!E)U`T&|k7(yn!(U$`)#rs7ph$&c(%%C_nu;h8}%1O%wHr)N}{?_hW6NewSsd
z_cUX-bQ}4FPXR^wC}EDeIJ3dF!*q|cQGT0yRbq<A*FlOy`5j6{i{&aQpCT=Kk*jhh
zfl|7b%NN)v&6EH+*F=ew^E|B4LXQ<{SJ=9$C!uoPe1|5c_&gisIcKt1OZ3_jF^fW8
z6Ua+O*eK;(Wl1j(qK0TSdWenE7?^(}ZIm|sY_z5yWBtsvQ7SdgTY&mVEuwxNlbphM
zA5PLS>Il&x$NNm5HXH9hYa}#3`c|gZ*dx_%SWl-Wb8udoGaULAy3E^b8|AH7l^3XA
z*7BF0nvaC!W+i`RS~*K&WC_W<J;w&=bwhp-_5yNeET(LBou^Dl$HLDFrF|h0XJEdR
zBQG!hlRpIS=oY8i2Z@#Q{FMiD_`~ovM}}#NrHZ)AQJe5~L`g~Zh1w2p%!hgPCLd@+
zKngw3qKff@2cx$<&`63nKSE#ca`$nL@?;*0JsDUB1kWwNyIilV=W$va<EX7}+n7IZ
z%>vzW9}bNt({~i*1s9$b;Xmy%=ogN4hSCIQPdSS6myx+UjD2X6HIl1}{AD1H3+ctI
zGT^@4U4!$)Y#VZfRbpGZq;)WDhG$@G%Tl4Go9Kl&e<XIi%fpk<e4i_O?OARbeg3q_
zl9Dx7E327xP7CL2^U-R;tw26U;VAiNL7Ln~&a7D^j6sR9j<OZfevU1U+(?u!^*oX%
zYqZlEuWrlHNN>TmM;Z!2f%L{gEfl#8=RpI#ZE9RdjBm+f@^!7TuEs6?tHRPz7W9%y
zdlIb#1{|RhU{6C$5chxx96KE;DcOqtO=}DKUPrcSE#K^<Gh|EiKnKnq-=*kSLXVtA
zAEENLlGjW(wODLFxk0re$5tsVLc6C7rL}b<E)iI>&#wa-LTRwr0;%bzG%f9!Nsp8j
z1JiCN{b7c}wP+7c8J@aBdS~<>8Tfl*rz~$Los6EF`0Hfsq<PB#7okMv)7e!qC+k9E
zAF3W}X=HE9*%8`g2G-uX;B%o;oQe8M3m2|rkTQhUlh{dT%(0aiD^qeSfo#UsCR!cW
z;pBq{YALr9hZu@H=IBq3^$L-CQIo^XFbuO1f7U!SYdKsOQbwp+ELt1a4+&i@=Xxni
zvc3e?j6+kWYimF5Z%t_KZzRzEGn7pLdAXTAq?tDGsx!VxnBOa=?Dy_5|4!Q3=X}n;
z2U<<o#r`qS27<GBR{UX#dOYIqt8YK|fip8!Bt18G{0}EBFtQFb_NOT=I-~`M6ZMTF
zGwP~pUYdHzG*n&pmrPmnDK|+ig}%1Kk_sjFn>vae3u%h7IBVWT=u62x?XhpWUjC@Q
zo{9Yc+dFe#YK>tl2g=(<i1E99DHr8keZ6ulxEgyCy<Rz?N{2yvOQB(wxvA-qVJU{3
zvC9sUR=AbkdRequdS8cCqfP2H^IB*RBsIYnxb%Pr`$n6j*b0}iK0_~j0=#My+O*OT
zoG^IBswSgTZ(WGGBx}_JD5LcM49~DO2P5pDs4ErYZfZx#Tg0puM_in@;Zy2xxT+<X
z^H4J9Y|o6UoLq#Qw9Br0`r1y*Hujia^wMRDj997K{kRkgIS%sgL9YfSpWCEvOa8)M
zT+{WiKOYJn#MR$YU&4FiL1!*#WIrD$AG5S%tv>@4)~8+JM1K%!x86HJja|Hng)T2`
zZH|=1Jt!j~KWZg&31~TB`?_aMhT)tVM`Th@Rsw1ZQ8PJ4(==wBu@N$=teu^Z2gW<V
z+DU@7ng_ILq14TqA-y$lY&~6}TGC9v0qbp2?plAU>0d;tan6RNNZp2%H&al4{?e?Z
z={?Y77e1=*5kif!C>w~H>91K2?)@Z%&w#>BHYqjhoF_|X=`Gr!(5Y!7srx`zUHO)*
z-RRzd+KJUpHYt<Po-X`n@USKess7j|skUB|jMvu&_i9(v%XShtuO3Vny(xTJ?@G<z
z=8~mN{!OVkP#U2X-plobJ}3H9QX)nyIXIJCnzKc9#mxeJmy6sMX_P#GqfzQGIS(r2
zBe`yZ{+c+}w!2PCPnFa^QKpp?`g>#?qR0=@A_Z$CLF2A^MWe8X3%1EgLHQM;Eor-0
z>i7GU7NfL^!>Ul=U7JvC)K9TYIjb-nG9N97g`IA`Vkbwt4$bGCY-g{6qPJ~AkrjDw
z1SoW2RbeIQqjldD(5rc$!a8Lem5>#B$V0dz2kRyIAkX|Y8=GxJk*r_AnvKAbGWB`v
zp>hp+s5zkMNcB)7P(OUi%!^ztrtvzaF&Q4&!X5O#bSYkt^J?MVmCvriI&PL453~4V
zu@=_M|E!Fgq4;X}{|_Pled;Ub@yCSC0s6nX7T>xCup0lPh`&XINPv0#vG5QP`k?<O
z>h`V!tj6y{{J*K6JXG_y)@yz!Nln%}ZH}kcZ+$=d=li{TI!}8q=h1s+FK?pKNIK=Q
z+4g$wz?L7}pGt{>GSdw7PQ{Kbtv9Y&ckGwfW`5MGZ@crhaRc9~7A7ed1$c!i{n9fj
z`Dd=GW6i@^@Sb>-l|7CwklV7bx+5N`>7}ejr;R`Ni5dZ4D5KF=(oYK4sK->L_le>)
zMU8*X@6@gA=1~XNw^{T~8!f%9P;8yy+Aiq?c)yqi?+~c2-Ju#vL$ld+67Da9KT#}`
zzvdx_qx2|vsaON=8+g9%S-b<nTfX3MBpiqH4OnrGW$=%0ffq_laK~(SIL^hAbN~EM
ztF`4|y=ndlDOT>68|?Go(9D?EwEYCGE{je6_x%Y?XSbZ)E8&f)J0>0IsjE3Fz;oy)
zB@ekvo^^Dj1LZB`gHU!EfqitK20oO9ibLVrcG3O?Qem_csPuuXpNp1uvr-z2Lax;(
zt-OBDIScKdHYJjl+d+$6Mqz>FqxBKwTEc4sYhE7YKid6|Lan8YC1$-s+l@R08vkqi
z>7;@7V&sZgOID0|P0j!ct32vDIF6BJ+z<5IWk%a*JSN+hkb=rUlMnq2<zmvK)zu`>
zVHaLvg;R@mXRJw-WpfK?dfX->OSyuPZHl8T;lq(@TWDwHKgLf-y62gu`$$L~!t1JC
z>bEw-Bx{IuEyKIW)4JJP^1E8fKXq+Cxu=%tKm6k#)&{A;m17)oXs&J1JaANJ_34!h
zZ<}BK-UYV}-@f?y-=B^sq}EMJ!7{XJ*D399Wt}zGT!`_EzckT#d4p+dUZ3By_3ux%
zdi%a+ed(=ArX<k+CVhx&{k#3kFL3<Ekr3DTaSTP-q)?GbDlt0Z3TUGzfpZY!UMrZK
ze&L{hmfjwF!f{QXITqr0Rc^^#^C6dvzb5;SN%++|_zJYU9z8h!0@oZf=K}8q=GoBr
zUruYkefiuscg>vq`l1o>MtN3~ky!oPKiq7lyI|98U$=W<?Q4%sntWH}?_Cm%a>}Rf
z!w^$1>yO4g{Ac>bNL};QrI%YCdwAaTuf9xlEn3n2tAf3~zBSUQxT@xMG))XVn4+D9
zwgFsUFWa9-;Z|vAcY*Efl7E^eFMr_dp>eye-Sy-JKU5m!lYWJOUDl6S@4vE?*&d;L
zC+7*RiEs0Lm(L#lx!10LCVl7nuGN5LMlDI3TbXeB(QnQky7k+Y3$lKB@cc_Bbu{4W
z!5pft{f~3aef9Q$*F2GjYKO9ix(PX8S6gv^D?a1Zu6iF|a-=G0y9%_~e{TW3>=|l)
zS6G7iz!3^Cv&KD?IFqmEo$&4pYIm59`RZCzDzr#!+4Ou$T>>>nfoqsG??(Fa9j@pb
zG|dV3^w@3_imhnJ#(-*Sf4nF~%J3YG3L6-%NT=@1*k1uWRfAHy=ph0r)z@D+OCnn!
z{e0EUn7L*=Q&>p*^UOf)y~Dw|RJ&MEnDwbnjD1|FWvp+M#5lhse4pqom7Ji+F1CxI
zDWcYt)>Sjmg7T4Ku5GuA#xb~6&~|`1FLiU&VwicNaVUPKSKEZAS<yIBHzDkbGEf@z
zX|11V>#|M>8m5AVBW2ZLHmeu99f;97X9NAU8?q!Of(pB=vI%S#fu8w9&o9?v=zDuf
z&Do&lsw3Vagv8DL5NTZ_=lrp!1yWOAc)vCZ5H-fg8z*)V0Y!FME#Ys2FRV9f>tO)<
zc7Vb?N4y3Z@2e2HRdbY|ugLVYUzL&~efyZ(A8{@#^g;V4mh$xgb(f*v)Sk?MQUS&r
z%3&UVEG$t%AB>;z-hfxE#(#0O;*Wt1Oz4C5SBzI4q2JV=#3BB#)k`b%CulznI;%<i
zS0Mf!)rdbaC|2zT^M5`r>8F5spgjqFc4IZ^H>-b)cWE`^zXkFCr6zA2+HNGqy<)c!
zv92$4%7dS@1N|_m;Z{19>E~WH+&_cIIB5AtVvIT(R#hW0m!IYsg8zeXCtCq6uSURL
zIn>b|@t5Es^MFUF_w@It>f+D!6}e0K&|Oee?CR6AXV0`g&aqyX$LqYP!d*Jm?M!!h
zr~2GwPIsBBG%CNy>nzSKEiBJ1ba|b5-YL1BGN;c|UOLs8*4de!mEAcmI>wn%T3+Jv
zD4+H^(_Fr|n3yEo^cDFk$5fWNywNjCiWz5<ex>Eb#q5M}3_`>sJ?=tJZb@V&(&CNm
zI-_?|H|MaTJdfM!F7QQ;EAp1-7Ds0L%JYldk+Cs|X+lY{GdpjJt0dR!#7CoNcqzPB
zeb{_c-PJbH-|A%<uI~1i<})#d=T72s{YP%Q@7{g$;n{n?EvW4dV)~gnQG*U1td1Us
z`#y`E(5&wut>5?T<yz+d`da?}@X!AW`ACzO*h|a#V5!s4<{P@bK5_X;(XTZBu=UE$
z$A7eX!=u=yO_qxc^}cUvn|>)B)1QEp5wal{aLta`p}iDiFnVF(`q;v%5gBc9>sE43
z)Je{dAvJaxm4ueU<k%{F4RBy&kG<+_FH;&(Bga)2fP(rmk_psexs>)v+d{n-i(W?S
zpSIDgrqMU_cQ&bM`W`UUYIZBLHmPVov>gnbvH29V-fvS{{Z}+Sh?LsJs?Cg>v0oF~
zE^QuFa)C<FVVC(o>vULIpTYg}>JNw0$|#(!hAW6#+FqK{q?ABSh9=2KKY3zQ$JK+B
zV2Ux4%2%}Jl)kuwg|OffGo8aRUs!_K3(jT8`kR6riMD-?2)=1P>uJr8mekAFY%de+
z_li8Te?J+jUlb#s;1%m5K-D8Q={x-Gj479M-d8`85c3Uvk>;mul4c{@f0jY$)KlkY
zC;tY<nqtv!%e<F-V~vf{u9vE)SCCSXwt~iA_P`=M+i2{q_u2ll>Y{a1f|vHz+L}^_
z<1$ca7Y?N_olr8bEHT<}gkI_NG^ko>lh&?rC{eeJ=Z0QKitRri8mgxd>vXxFbA6DS
z^i;?;;qS|Yd$?u$`C9ZU{xLl8$w+C*rCyc5<{-RXdQ0SpT`Z?Ua}YkECs481h4f<|
z4P86;#TN4bT2663oU>-My3pjquAp?MP1;;|N~ONhiVdKoTFS*@J*@28+Jff4>KV=S
z_$T)SV;M@@#$h<4^^$%!J6c2XF4rOE!Fvi<%xYGF?Ld9~SWjA=x~=t|)cA&5Pl_e{
z^}y;?)3^)GMCcV0Lf$uCG2n140k!rY5epf@eEgS%dR_ntP)e(D;B{pd=Ktd{zZ3f4
z{O_%J3?~kj=Re(?Eajvr4)gi%cuVvDa&AO?HT-`s;{QW^#Y+4p{#O+HgIn-DrXhUH
z;_2mx|KDoFZ{q((iFaW&;=ik!^v8rDisjE0GPhMD{{JEVUFtW@^FIz&QlXEU*gxEd
z_zzSg{%{_UNI$)V)91R?@?Vblt=Ip!LvDYv8u7PO+h1L;->u2|)8JK0F(;S2)jn?U
zF&8**`RBFYwk?Fa8KpENSMU$<u<F=ud;MNuZ>IIu)>pqR-@9tp6MJ(Wd~<$uvmg2u
zJgnu9mG+lZm0Q6ltpCj2yYPr%@EgH*o<{xqNxf|)elz<c#!G+cR^z`A@o%d}{3iXM
z<A3<p-PMSHE#m*J8u6Rizum9KZI%A#5x?|5#@~peX1nUtzx99q?PvXeru~Z%TFIzg
zliygGb4sgW>93Zx==%dbz{nDop<4BnKxhVpu1r{XXnWW0ICIJy?lYe_dR@e<XTH1k
zjX5wy3HnxT?RRQxzf%4FBXFMbxPjlkwR7%`w|eJP`0~y@#&GW}eUAB`ud8?U$KM0A
z75-}?|N7Ml|J*UYdIkKaI`WT+{2Q?ZpSuTO{YGGVyoLC`Q{S>ezlr=?ZTjCs{ME6)
zwIcuC3wo^5|32d1qtc(J&UW_fIl9%|N&CL?HeG+-xBK=Nw^F|+c?Lt;eCe-wUf1iF
ztKa^^X)kxC9a~X4<@gILzMlNq*}vbh%qSPsj8lX9*Zz%H_B{04joyY&e)-`Uj-tz!
zci&TLPPxc{SL+@B6Fr{rRxbL?E63k-FlW@Q51n~h%&Pwle!$zwpq^{>-oO0cu1ECi
zy#dNO8FT&@YwG{@CS=KdYM%M$j`7up)#QJNdi}*Gi2nyQY3B6D!xw7kqbB-?FA)E(
zYQ%3szcT)M4&P%P4V_Z$$yYl1=}%Gak#gyy&ENQ9SGy&*OkS4o)o*>`Ig_K+dvT_H
zMV#5C{p)8^tGheenB%8>ykJ&gr+!QSPVcwV)0X31GrDCy*v0>_o_@|GTd|bnibyN<
z-)#I(PogiWc_#BETuA3T*8OiMnEAhscmk1e?Ig=AT)gtxkBGmEW&Lx)A=f`Qgd-X2
z<Nt(1uK#R-_&2GUA?2sQ`lF4K#jIz(Qm3?)3t6xv5xwWVUk)#9nwGuuwOiWu-u=?u
zbIwvrLf?YCxc3eaY>%|Ej{DF0)PIZFtk5=`P0q`0eE$_m4bFJB$L^Lx(jPP8-+@{l
zuQI0{Xf2(#aNRc-tQkD(oo-Kz`{d+aFLMN<FHfzd9WX6F>z+UpA!*RteHYBVR>IDJ
zv+eW&I|2WT5$5B6F`ianMk-qIJ|2(%@%T+L?$X<4I)2A>D_q%{hZ<}A9qv3$j}@Hl
zEW#er`Z-|{R|?|xpHU0GBWnMr^UFTJaN682{u-9E_L}B*ALPC-#yN!t21m^o*^R(@
zy!0Y(bh@j=?Hra{R64$>G~YcvdPc7Q;=1H1K3^FY_IbrJx#$wPo-R7iUD9(u63ex?
zQQ(J-fW`oIgQoyZfabt4z)=9_42}k3fMbEyz;Qqu;CP@d&<;2eH~}~bI1T6koD6(~
zc)B7y6=(&V1#|*B17`r_$)^Kn0!@L3@qRai-GOKz3!qhFGlV^XK0quG2gCyjKq8O?
z^a6SV$v_b>6o>-f?~m|oU;r=>NC8rTNATTrga?oxnFt2~gMpF2IlvHL63`DA4vYXM
z0Hc7>KsGQ27z>O8#slXA=K|*eui*PmgcE@afP7#wkPGAhc|c#l1rz{<z!cy@fN7eF
zuox%-N&z=e222AyfEVxq<v;~69hd=B0v7=@fs27zz$L(?z-7SnqSAsHJ-I-$Co4|R
zGLOsaD)m(@3(Y@-%R)0}q`Aw|%Dp~!NqSKp7oO&NDh=0yb{f>jImT5|=2R<rPDO$|
zbxw6vMte)?O`~d=C(j*eHC?!hRjZ&s*)SnFhk*P;(@;YcRI+0hcp>c==<%x1aWOpD
z^v0UZXw3DeDx8g0EUDmhTo~Kmfvz7%Uu8~zCTu;{nDTF7BN1x<gZiic%|l*s9j#o;
zxU1dfOGZ3!<Np@VZhzx(=gdog9QhN-!9)A}Km7XZ99UbqQMSUHmmI4-S~e@`#oMFW
z{}|o6VDy?ElgUp5Q%(P{X4bsy3AO%@J!0_Aps~m;VN=dk>yu5bzpVH8m!L2AVtmaW
zoOM=ORdPjoXrG((x#&jk9=>KC{*uvVW`$-YShED43`*+D%2fS2A=U}ax3Mh$3Q$v@
zR;I~vk$Y`PIu?Kq`|ok7uTRn{)8A@$B-$%WN?JEc`i6i$JNopaW+t3X_{&JQU3|qE
ztyvifo-<bIS2e${4##Sw+Ab>!SZ9pas%YFwj3dPe-(3HbXr_ONcn0*d<k<fpFg<2N
z2(do@mV_~0=%Xh3*DS;@=fBM9Pcqa0D*D&gkVLEW4@Ugb{>n=H38Be%kpAU({$(}d
zpN#l9M&n@~f1(-vesYKSYWV-@i2q&n6)W*u(SKvJFw6Nrq?+`b+5hR~uJDwLrz5Kw
zznT7Z6+ZiXHRvCU_&K)ZQP=u6BmE<L34PzE=^8(JF#d$@Lz||xygYKs<_RC~XaoxM
zxzF?Jd1rmBmgAp8C1vXMui<;iTZXhB@%HY&eoZ>QTdL=zH^&=!@DW~E{a5x~i@XY6
zty0_Z-{GR)-~Um%G6E7*2^r_Q`P0^KS>ssz*29lG+eTD=)!3jWK+A-?+ro}lo_?*v
zy{B|B`n9!D2AWZA6c4e<$%%%F2aiR?Lv6?3LKB*&wl{4q5ZWT-on3r`R9C7ArYihO
zkC~vgzKqiJyXW{@088n=5Y*I_ZzkdADp@y{r)IUj<gG}3k}`9^J@xW1KOj6s$h^H7
z)P(0KcF;_S-o$?fBiIu@_nhJiNUnd%1)b8noG{L_i~dF5Glp6tt@l{w-|M}P^0K4X
zAFYp<HERV@8azMh#QanRdOvHu(c$QgL*==DK2!euEo@I~hjyWtD)kzbn(xIXEdT35
z*W!g<pF7BvDVk8O-j*Jv*{<`TBP~U}nGOvRcflycfBzC2j1pT9?Q8I!G`vTBul9X%
zlJNTk2d??2l{Gc(W#B4ey=?~Su}jfnr{HUa_`az559U4m$|vu2io3&|`gr{QlkPCG
zGL7jI(`RN<T<?sG_{7Ypgv6MXsD$LyxTw^WB@y=6|16M8>GS%5yP_tZ)5N>swcZ1N
z+_-;W_5kF3;HV`kCLuE=H8m+IJtj4C*2QwpD9>BwabI|GULR+<-Y08*l}}bX(jUm%
zx;=E>rM+(-*ec<;dHa^;EM8?qe@M5od7YhbI;*&qb?M#8=FzQeY|OkPUjBOT?V1nD
z;&x>ne}3}xLErV7w&<k0KHkE4+`uw6BBO58-`j%zr<bY!@3&B&Y28D55ttqiLI1E)
zeal?`)5}c%r0CydUYkaa7apl*{3iOhi1qm9n}AjNS5-59EBdeM(7zh-(`J{4oOAo`
z(&vY-8sGo6&+ch)&e;<m{^moxBflxbq?D+bq=dNM@iB=BNxc$gZH!3oQ&;sjaGY_|
zzI*@pr+kR-&Rg%?HvO-MDkfk^FVii<UI_^)y`y3>63}~OrX@x7?wyoUT>I`rOj<h8
z(P^EeU=o3e9C7<~ZO2`|^zZ8)`gKn~_p(>V8zfTaIa_6M&ODC?F1KCLdESdJo|%%A
zrl+H}_P18rpPBxXv&<U-<}>S*+3^(WmUa8<UWeTN@;Su6RZXN7`s2b7#PzRl;Q4!i
zRr+5-{Paf3!%F<I;#I@{HJSf-O&9;6lK=GbkI>&5?NOwczcsCH_Q?qaclR1N`jVJS
z&wKLp?aPd`x_Y12`mxZ{N4)<x-g`q&KSxaF5_tSWuesN*UpL-&_Qh}ajqLnyca*Q>
zR5GN;?Q%%@l-`Y{ay$C3C;c1`&|0$y=@#<8ULu}0uzk1vbEi#uaomro7u@{UnluC2
zIX<A)t^{9lD!XNKed>68jeY|;vSHt4NBUX+rPnrNKYJ4s@4F$tZ){?tg{N<Ns>Oy5
z?BQjZ%aA*GJ3%M)P^FG2(9FCH9IdUdW&JnjKfO);ztFDp6O{r4rpFuLKfkGOS&83_
z|1!ru$M+bTMvfQW(eXbk@tdswQRL6hsuBMN#BY85Yi~3E9}%1Ixy{vx{{zI|K%M^!
zu2G>lP5AMDApbL3KOoygI8TNpQ+C|DWq!-qQJ*gRpSx4%HYqAyEL(YKdyeFFwoChG
z&t`0QA^4v3x+HWSd#{c9{JRBrj=J~5eNQEg^=`>Bpi<jGMUexsg9^fe+&rHfMzd9-
zpk4egSSf$%eW(q}Lrw|1CD}7jk0t!f={@W{aZ|hZnru0K^q1au9=$AX|MO=V<kIK0
z<bOx9{tFLWTuG3J)e5=Lhf)8Y53W8GSC!!N9;|-Q_mgSMD=xV8>$xo!K6_cabwzt;
zMH}RRHkR=po#9o#<3vXU?BDfA7hG83e`fN(Y?lo6-w$>EG58PpH4pRnlg-wD`SqOQ
ztKt9Og7~+nuULuSME;JTEdL>3mHusrf4k-Qxh5v`!STlzc>F$KHU8~7`t3OXZ)L{8
zicZx(*J!(ZG?4y2)D~3=<&b(uv+b->3JX21!ra=<zaJ|8qv_vePsH_5KE-P*dv4DD
z1#0Bk7wxeL|CFirw?}90@QL(aTKzd2=1U1=X!=N(w)69rzP@|^eeO-Wn!Hff@u{Qd
z{lE6U1-`DL+;=AwTEGLM$Po@okvF!nNz;~sh)tT(l)fM>RSBeNlBOwnv6Hk7h>9XV
zLGg0cd*yh+gZ5q!<#0Wy$WeTN%28C{phrbL_y9zaD;#_xVDJCGzCD>)Yt8I6yQFKa
zopklLvY*{E-^@4PeBb|j%weUq!}X)Cre=Udjf<DeJ*8pE!nw<u7cE${bm8I!3zs!r
z%D{+;>+aeY4<K<bOt$pO>tF8ilbt!q7hH$9R&oi)e>?gk`*8F`Rob=P_@_^ZR~Z8%
zft^PW5C0G6ixo&mG3N1ng4R+?J4zm)RRbSA;m9M-Th#vcW3Rbq<>fnOVszC!s7LFO
zbMOsJ*7|XeUo>u(p0;poz#5EM^u2RRbE;~`uDtTuYoEIHWk0*_vsXPnw7qu*L~xA8
z5%}zQT7{3@r?hnD?Wr+(_s)l|+}Z#7JN~c~IbWV$<1goA{rl*T%-ba0riOIW`Tug=
z-yQyqlUCmU$)7B|X2Vl9dtqX+22Yq3%WLTmxew$q{*U{g(5R|(m{l6CzjH@p&DHyU
z>~~+k;v=8`pPR3=trnqB{f%pW`<FgidVjM1voKNr_!55YZrtQU)n>WJUNC<p@y`kM
z?<V-)xBY&!|EE$1edzbWAMUDv{^1JgPm2Fl>))6DF|_ZGzbs6|AHEFQzfl4G<7nR>
z|5%t<f2LCU{|W6^l7Em;f2-!}Am`o+=--L<=`ZA!%zulL@*e{H>3;l{@BH6XQTwMP
zwO{f2n+H3TconZ?`cFyBKlvVhhyEO2`kw^-{`GejPdfciqy3+wzr1|tPgwsIkN+Rg
zzQX^K+iy&g{}s3Yl8VN^F>(F#yu450_MQJj(f%_Wd|W>CC-~nhrvH^_|4C`ytNjH0
zxxmQ5PviEb|46j2<bO5Quaj)fsHQE5>hZgZue{{9^+!DNhuc1VZ2wDNIJ7h#920ew
zhCK9eUrzL2ANxb-*T}jp`g`rF^Zw88SN*T1)2_Vi#3K)R`;1p5jDrvVC&-^*|6!Cj
z$2l~(ju*4RfByULf+YD{!#W|iRnY#iXy0G|WOlmyBK}6YZ?B;Jlh8i(1ztYmKTp1D
z{mb@0i%%F&<vad!(f$*qU&{-A<<I}o`n^AWPyN3fHhS-@Q+J+m-2-1d{HOy<Bf-&7
zSBY55!>@9`{)r?IaTx+yvM%tG48jIxg(H39C1qj}wlTk{<fDWmv3?R`d0)Eo|L*tP
z-LHGa(dVwY=eh@8{UxHIYIM}2Wq1<b`rkPjKaGD1Uc=fataT;S-*n4wpC0_moRi-7
z!WExAYWyvS&6p(WQKcd$^hfa%<!jaP2j#r3%TN08_ILm4+h4xyk_~sidFHW?Eb|_p
z=W{~8TYm79-N%nrg@qxkzri4?g&3)dU0-|erXMalY1TiTeB57_JaqCCpQ=puaB=-I
z<MB)0f95CZ-;^JpD{%~IO1kQ?|GWmcB`=@$6YTGh9Ft!y|92tUXALo4$?Y#lj6eK5
ze&-I{90&ep(sdfz_pg7sVAB1cZ$$gb{!#hYm9C$#UxqcM>0{Z1U5PPYTyJ`nJY0Oq
zkFP!clEF7$_QExvJod_;9Do7hSeaMSn7Kaxe#Yx3dHl5hK=gN?^TnTRdf{znpLX4M
zx1RsVslU47oj1^NZ;lq9%ZRA<qw-%{3F6CP{mwOzU_Gc_GLHG_fh^mCIE<0PLnl1)
zjeAc1=GukN9(Cj6r~l3>!`!)Bd8z-d_kVhq#Ct_*M-hof51^dt$8S-7GX_IEVtJ|m
z=`(*xIq_Q`*|zV;Z@KjHp_?17d+!GyIMEg_qcf)(7c%GQ3prUoKJ>50ESkQbElc*D
zal@uf>yNp9^n+hpeM4KDWtFHrF`+h|VKvp_hw4Kkbi}VedE5bCzy78p|NOU~U2*0U
z>$#Ig<w$X)y;Ou$XO;B~&PCEydq2_+#yWd@M%ueZwwO_OIwh-`#*Z3s7bHLtGQdwS
zE`07ko~S=%#-DG!;g)>|&Zt}5WEnpsp|$t*_6+tE`?^p$(+tkD<eNlev{<!~(n{=<
z`uo3r+QoO>eCrzzIQ#13PkrYZww+QkKE=8lEWB9%ZL<DzN|OE);wagb%Kv>9`iDRM
zyeJX>CrAING&AK}mQUwY<bPP4M1Rc>@Uy?Hp#55yp9+6X9{<IO`uBIx_8%)~|7B?Z
zd3>K&4W1u}dmr30aPNzo^=4<59{0!N0k{t@z5Y8q9)$Z~+%GM?M|1k+xDUnsiqd<3
zkH=S*o*$3Lf53et?pKxGI|`4paUWfJeGDFt#eH1qHT!TPo}Yw!0q)o0o`ZWXZhrPU
zJkG;iUwS<skBz10{Cp9fpMraF>AlnN_<G!@mtLQN$2a0$QhMEt$ECPiO0Unv<8s`s
zxL1_kTZzY2xL226uf^lpxX&rQUWdo^xX;DCq4eIH@%R?p=apWckH-seci`SwdT$dR
zyKr~o?!mnocQ5WOxVPdaJs0A!ANN4%HQowc{Lb!NpUlbruk|-~<ijt1*>Zp5N4E7J
z{KcPq;lkU$x7HT<!1yJ`1o_6l<RyOGR&9`D!c)qHCW)1ned3#&2L7S(#2+`@^LX96
z|F!o0|KlL6<ml`tWe!O^*<{5}+51lmgV|apC8C=v1m(V*@SmxFGJnTrKP@R)7K3=~
zM9lUOv<X^Q=FE)$pr^Rs%BP;c;@sh%{^HpOdyluw4CSu6DzV>M&{8j~w$X?U#}O93
zxbNTtUtY85FGn8UF#D);zx&@VIU3DG`9deDGLx;E^fzXM5#bg+jx~S>3*UeEk#jn}
z@Xsf;E#LN!uldV+FFo8sak+|cS>tbN{wu{_=nEJR;t+Yt0kM}ZjE+Jp!}Va-{quuQ
zUb4^Uf8DY47pETf_N_l;^q1m_d_=FBtIrkvZTEec_Ml{;eF4(uRIK3j0sddvZqSVt
zHdzueN>g%1sGN9kXig-en<IrX!B3R^60a^*SBRcCPunz_>C=GBPQhdvCeU>i<xO--
z<Qnuu@N8ZxPe*6gwpW;52c79GcESfr97-f=8#q<vcq;BwuT{?HT&!)g8jn2#xdq=D
zhIAY&$;Te>vgi)PYF(eH@qHZQ`<<Mw9NYLNVPS;=qf)b|%XAE8RLVab1LU6P)P%8e
zCAUYAn?b3~h;Os*;%fAJ>c{}Utb&%1KYLlAHA)r%_jtvlug1uHIj20j3agEHGphym
zzz5O|9-wX*Ml50Df`+`vF}H-*J`1T8PTj&hGouikd46wB<|2uXc1XW5_@+c#*QXkE
z1T;~$;w&HBd8y%U?k_LK7Likj9?r=unN+!Syvj3V3k9Bh`DjjPbaSGq4=DYnC$ck?
z_o5aG?**k#=bloT=Opcrdm>|)ByWsT-X-<V0M+;9gldzAxiY2C-H`GFkdX8{s(iR`
zKD*ir)J{gvTpsJIk|v3-BQ>gW3oRm(e@%UsahEsbWOg)$*c$SJ0SQJgZ_i0DIg<8D
z5$r$lGOit!s|s`;eb0+cTdwca5ES>2`xUQmM*p)q(`8M7kPJc>qonbvC&ZQ9j~;Kr
zecdE*4842dm>5}0b`GE<p$wtM!X6Ky?#~F`>Bi$c#39cE4Lk5oH+pwA?!55DGW3ev
zJB+`y+G*49Oi@OtD}0oeKe<|+@rBxVQ^?No!8+zoU>);=(W3pYbO96VI07T{)k)wz
zpS*H~1CrZRH5OtBYV|U%yinst)NU*Dna?S0KX{S<f3nazoByJ+NFs%V$;dta^^a}(
z*d5FNw&1C6wtiy#qN2@{&$`}|)qlPBDH(0s$E9!EH*PxW=Ffb3+h?A?dUcZjxd9kP
zLi}Y7L(vo;kzJCm55b42@(+C4=kD#gcBlT~wP^p*(hnxL&ohSI7xOQe%X&G!!ZC1v
zQ-5+b+NaN+R~!6Ds|x4hk=Q7!c1yLtxro-&wX<oV+OLyw{*xMe-}bLZ`xhbxf|o+5
zOwHD1oozthia<E{w<kcasKNI`s+%bMKDRyo)f?M){_Z#P-u26u|6B7N$DtLohkUMm
zlhqV|NB<LdHhTZmu4YpH<qIx+aQLgc#`fR#qfb25xayZHER<8X6Q3w+Bp!p2am!X8
z`I(paS0DZ%-bvlSv?Z!({+D6y$1s242wLrZ-Dl*aZ~o(lxA)(6$e9n_@~y|7vw2@z
zLBE`8F1XW+t=~IY`-ji`wPCgQ2Hek6Vzrj=mz`U86rcIn@~;g%*Z92$Z(V4MGIT`{
zzq8`~e=}x4?CtHCk0K-{?eO?}%Q4RVf&MQ(K(#NL@5_Gpmf7$6)PMZ(4@aH(pLad-
zxf2fBNsB8gv0M=)N`DKVu5iJMKYZx-ul?DP+kZQ2%~f~J`wS~|MSoG&{eu<LAN3AJ
zD}plaz8yP>=`o5*ow$d>Xa3`n>vrnz{O;{%9Q2W!A3J!c?ddBoxV`7?7V1@1(+8@E
zem{)AYyM5wTy^y`?|NVD^(Wu(+(+;0uuxB#A@V=3_1BX8Yb!R)d;Z3!9=&Dc%w<=7
z<5TbXIjy-UhnKT-)gF+S_^T-Yhv{DiNir1d`XVt78eewtmwx<j7k~2Ovj@g@-o4O9
zy<a7>N2`ecTQCZYpr$mT79{!SVHCFs-=K63Bc2cc@l%H%d-E}O{QjVqefM)e_|A>1
zEZjn=<r}rvjkaay%S--Alz(hK>vh2{70uo?chdXDA3FKr$6B60;#;?_|7rbMPwudc
zQ}|S#YSRB$zl-@ef^n70M?L6OceXEj;pnRdI$pJOzlXnj@)FB9h!&lf_^rz3e=|m+
z7+^qx_Oezw$KxXCm)yTcL;BUB+h%^?p&!0>-N3&e{@k6veQaivWi)nID|oT_1CynH
z(%S8TOp$T)M{0ku>q|%9_xKAtuNwH!r%%89oo_hFGB%R?6|EdENUynPjR$C45weBV
z7)8<-3RmD4f8<2tf;v|G5nuqpHG@z7tEO#yWVC0Xu6d}xzo%=oZ)k9&?o7!Msax6?
zywO=4-`H^8d8IG5jTZX`d*{p^80i`+_V;a?GyB}0;t2lV>5X;s_;1ea=CS_Kv0~5Z
zgFR!T#m@dYv)7Jo>hJ41t7m-O(1ksNr*B%csB=Nrf`#>q=QsAuJ7w|tbJUNUy;$Bk
zvSqY$Q-9Cowsk&oItnvOeV)}kG%(y*>?zJ-Yi)fO_Z0Ri%=$pNK`9MR%SB_I{e7e3
z>IXK~@6i!DpJfmV`<Jkg!VEsiV>j8$14}zzxK=15GgO?HaO^SjUU%-3AHL;fPh2qf
z>KQ+|Z;`FigWjFumOywV@^kLB`fNG<e<{a#wj3i+eI@&uO)Fb_L5)~HlN$lIdp#dU
zL^Y)`wHbPEm*Z~{8jR9#!cpHu=~Uef6`4eu7`2rKP0EUmYnM7^NAis2weSRccutOb
zC{abt80T{^o|LvK1CBi%%e<$;^VD<u;0dG;k9;1DScpfsHUy|`cy8<w0mNNtqmy2G
zNVDY~WsR|3FR2;?%1dm8dD9B%tOHIRjd7C*2zrk6j!B9-b4C%*_atgdK2wnztg*_K
zK8iWp9Mt0<4bVN46EDgY9U5(^Lk9bBpfQmG(#Cy2<S^|E&Yf_pl2x|vYYyC2b#yYG
zk5PT%k0ABY+=ucMcjuO36(7tqk7(maH4W}Yj1QwE>J8>sMTl^{weL1H$^Nf-N%co+
z9!2ZF!c8?84~f@1pet5#{=;O~UwjYRf1uRMB>JiMB-OwBHGb<CxP9q=AKLdl|BXio
zCe)t`;ckh8k1t$<_8%;LF^PUT!qEMz^nX5vj~~J9OaHZKzmoY+@IO~f|MO7uD;fVr
zH~9t9|C<u+zV!bm=;wOj<um>X^*?KVj^Ft$Zr}EQgZ5SZpQQH5{|W6^JpQ}TK4k{4
zr1r^w^X047zq{lAe+m5GzV)Bje$x8qxN|&x$Nvzt|DzH$KJ+KVKh!Xm;^_+7e-qkQ
z^6$o<zV3jRl>RUKudY(}5+6kKi|2KTZqfdo2aldNeB|F&tp4b|3(g;_V<d%YK_2sh
zKbcmpE9QO~_F_gpn27C~$7XE)&}XmRQTvg>Z@=%(m)`yQ7=^obiKqA5_~ed~p09Hg
zv-W>Ud>-?}nxO^LGC#dAtH2CVMmx~<=`Fk!F?*+A6`Y25MxhNzB%<U<OMa6=AG<L^
zL<H3}484@On7eD|cOgQ8|C_(6v#G+Z)djyUr$kCw`Se>AdW(C6TH?XOppm*Ry)PQ?
z;W!g*%%WYPcra+c<B|7oI-upY)-NoZ@z*bIe&8$enftGq^|&YaLys6MfT~k%)M(LG
zntYygx2eX#zW$q<+tx<M@36~icEb}UI7<1`V$H~-IP&L%EeUd?F~D#QYFen3;pd}0
z>&AzBM(TD9FzULn-|Gj*`upD?V-_kpwY0UZe(~Z3(J#`I?usqp+^Zbg$%&Gf>?qMf
z;U170-xYSp6S{lzPyB%A4cT*wqll`TL-+}iA|gm8PNA*YsC}-{hdzu!e(*1Q@7IH>
z4Ui_Rb4gpA*}FtpR)S`F^W@b4-q&;u<bp1q!zKQDg?!bax(Qb)Px2D{-t@^zC25hI
z%tcW6pPETcUr%o7TLaByD`=y3qvw+qF!lRqVFb80XnGj0nJpiRW*Hyp!OVL`oSu4E
zxhmu<0$$;HrfrY{gBblSCC=-^ex^A|&xjuTH7QYOli-T`ThZrX=vl%u)VAm&&PN}m
zS}S)uM*6F&P(%Y6-KhI`K}zH3V=vKyh}P>VZ!f0lJ1{A5MZB|Si;{ng&!8qQ(!VE&
z*I=z<Ry}51lxY=`j_wR*!bOKq<QCWL2&kopM6C$TSJa-<kc~dGvNn(^T&ex&v1Bck
z@BN09dhgbc#2Xv7omnqJ{LbqpxJZw9SMK`U3JwT+Al9J&(f6jSN4MUP!rAZFvW}8G
z*o@FMV>;>YWrRO*9v$7Oe2C^gb7AJ(X<8hW`K)=`I`vzg+S&tZ#b2sdUbT6BITCR#
zpK%A}eW0|s(~#+Isc6ojsTJD#-5#^GY~Rwem{ycgdFtZx61Tpn(b1Od#+sAdGUf&A
z-B{D~fk~gSHUn36Q_=xG8Nz-Wtxa$*`ctj7S1PHXSSS#^yQj2TG<u&NPUAOEQ7uDW
zM{~|@Flf1^W=}|f7RXe=tf@7JG3)SWX29yce~*sME(OGH=o{=F+CEaZY^XReQn#kq
zhuZ3$45TIEJ#$-U|5#5)M`6~<c*SeREAi*R(*Hektgrh(ysqu&tnJuT+tF3q(Ouio
zQ`@n*wxhSUV@qvEUv0<M+751F>Y6okW^L)(=cco_J+|M!AM*Y$6>j*}!N)(bFN=yE
z8tK>Cp}xUU#*5Z=?5OP+2XwjLiR!oTc>7&%J?|Z>yWTj1$^36C{a-T<S49J_>>C+1
zqFh@CM;A8kfzaIjI{FZgJhE@c2%>Rkb!?O1;+Y73oi%I!*P@Rc*5Ez{PY%N^*VAXH
zXW_^A`!(N(NAHKY)fa1y#WPMRubSiVhjSDi+?wO@CI?tuYUFB8z&jkh{paG3>fXWZ
zEBu#*{lCGt%3KHYzXji%2{OxFWR>{k_y2FKSsHi~q~aeDCKbodbK)llb+%>l$K!I#
zXDnU%&i()N*XFN`yk~f9<EKCP)dy9^lKAg*uf>1o-U;}LZBH|iHNBH_&mMwC$w*H|
zQZB(QIM4`k-g|%#QOl$TO00mj^H{TjsN@o~(_M;0B(hCSb{r_Hs(`F;1XfVc5mI`m
z+=L0;6Ozq;q=a&gr|8o3iz>9Z4SOl$_qgki21vp%=q66feU|iVN+4P?ro;#P<NOgV
z<_r>3ma49_&^7KS7&&LQH~5zAJ5!hLwI#fw$2vBe?sX~6w~4g4A|4bDq)$tUqFn29
z)m!o)@j1<N(f)Sis=p!~L^isj%tvC#;+r#|!G$cALr9}ze_pQoE%<(a$S0(Cu4v!i
zl%u}K<M7owjrKa3Q<CG)8j|Awg7c46R2POR@p@YY@rSHGloWsYJG58}ZIFFPY#d*h
z1+9?Z=jB6xgM8Kcm+_x}!6$#l?c4qdX#cOJU-M}{A^x%A@n4Ac*=JtK?bj!c|Nq19
zJcrwt{v*)-qih_PPy3Ti|EtmdpQL%O_LJuSas1Y^xP9q=4cceCCNCfQCp-T8Wmtb)
zGrWA-XVj+aBLDvvK70zdFa0N1ME|^``eQ-6Y@3&>pXU2@XrD3ryprjkS6C!pwf^0m
z_~Qn&|B2GCCAZ&@6n`9?B_`DS(O--C_m4ksNXkE`SpJ*}`u*1*eP-^9{P!e2=I{B=
z{~OT$PfI_UJpPP;cVBE@jlFOCO=#ag|DZnU{I|jj=pOeI-}aZG{R6!Bzxqk%|Fh6O
z<K=nzjQ>LUs`W3&|8Mx@dECDAuR;6%`)_@c{!_91X+!(|`3DV2<6rZ8&|Xu4{&Nl5
z4*)eh43+RI6({L;)<_fuF>Ohgr9fX>F~E+92NM^zSG!>BM6%wRX21Io5fMf*mH^@C
z1~rTbF}<SaVnowGo&3gIFecV#r2Q@^nnY-3i#E78q&$L2zBnhP@pa>$+QVXI*@rzW
z?CGi;^;Bou>v=yrcm3m-6Def`vF_)1=KYklmJ~@5uLWQ`?P_5O`=ftXA-xK7&=sJ`
zKO<F3cLT8de#|1Jz4B(q^TQgAIUcB5T3N@N^|+*h1$RXiEoklvZ?78q)`JpyABu(T
z0fx$FMEHiVe<(kO)J>3cJD4{XpIgS!@>g~kbDXaje^<PaR4i0dh%2-o|A^8`lwmwF
zyV_!CSf8J(li6g95DHf#j^_l~;-!6Jkqd>df$R5Pc^`rDF;s6w_tVg4-TIcP6{ww(
z-ceR`VeMb>1Ghs;v0BY|<o)INoG0e4gfyb8>c^>|Qc**Ek@bO8V+8BA(rPeuk9^52
zlX@kGD6e*uEVyn^Ad%=xKy^GWSL;-rxt&!_R~x8eJ^XlG7fna@QMTmHN}?g+o*TxZ
zGTv74Gk07~VRz;;<>ULOEiV-<dq4~4%pSeiRTb38I#YF_R)HGoI#N4I&rDjmV)p%4
zX8<Y9ME5KU48j#ZK;7{|@Wc@GNr?+#1+J)<^8A$e!bDBnJ?6|aDk+Tk#I;;K;(3dK
zAWul0emPq<I^JoaC_dwD?(a(a>yb?>E6}f})F6ma==1Mrsc*;;_fitG5(ax}j%<_z
zvcOkeD~^3;B{#;y5v!y&HW=(8;Zr6!)>&jXy3k6yY$G-0vI6rIM-sK{?X}xE?pdru
z_qbCtR1q&)R%Ee@xcgZ7E|L}^YsxxT|C_<XL&4s?4tojf2Iz5qO9t}J-A|q~sOlOd
zt-U-+kCs42b2nkH%}C&K(j!mn&{hqLvSMS7_#<v_$!?>wxK~4#P)CjKkXh(-E-q&u
z$>ZHYG<_FdDU?~S$}Ds`SAWf1fVfVVCpp&^p!b`DRk#*5xQW`Q<-zlj$LlfYQ4URO
zzoQ;$Kdn~#LMyEbML98)lALh&-_(#zbj^l|5@95&7Oi4r`>tM<Y3(?b)2P;E*y9ne
ziIcr=&NWM#0#+lFTIGWk*J!E+jCXzEtcvLx%f;%d1RG@y4A!@yJRHTIyag+cenfiV
z1_OIgbZYvPd6r8tq?NucxAaQ25~8BS5oNu_$3;#FV4W`YO~v1;(wLS|)M4n8WyZLc
zHTleV3)h#BGs8v_GTyS^*-X@%-fW3x;Fu2twerZ3j0mBBSk053iQde4(d_>^^ph)V
z1byeq5?Z*Q30;GDq;^5AQbldVX-cd9k9#Ncp=lkY$4bkLWWP52dLN!Cz2Y@*WiQu#
zC{Yy>MD`Jd=Gy58a>}?6@*S%t5@px6%<4eP+=S0f4_Fp<jSH#dPNdO>s6L)2zl&XG
ziuQP8N^;7ya9m@%471POUMyX5i0p`Rz6q^gkxg;jFHiZh@tp7InCFR0Z28x5$)8rV
zfXO8;WFd-JhtIe%z0Pqy$rEm=koIzWu$K92Ggzmt8Bjfsk8c*4)vjK$-UMq;Qf8R4
zkeYKjd^Jxru-`s*LR7+}6*J<qUbU{E_D)Lq@V-y`hEkuEBgQjBxqPUhKE}Kgo;Kfu
ze;4CU;;1}H&vVgV)-$E$C~<SE@%&=^V{Arw>6w<7n_QoSHcIA&s|LN6o7vlu{s^he
z2j@Ze|FV?izI)7NRaBn)&=A;@v}UyCRu6n#YTMKYb$vviqYd2~NNRGWvUtL|5Y?Ll
zGT$-|ItQdaz_w@++3DU|CG)Sa@h;3@C+xb>V9)IhWDKLd82uHt>awpK@5kAUhbL|q
zj;G>Y##z%VbvW~xGPNAVP3)n~KfyXwM1;CAH&UNzGbkd0Zu_>TGQU{4ik>YW4bJ^f
zR~*xHWzUWF*%R)wS5Rk;m7D`fOm7S3PSdkFr`)JcTs3zEWpCQnnWiZF$YIV<TpPF7
zawXPE{DLTkI%z}Gl2&AaD{@%;23#p(A5of-HcDs}O>FwX)6)D*4cvtih3#dcEhd7f
z$2f}^16QBR#Zu)74QdH?xh>$?CfH%r&UBua9@(_G*M}S2=#TDi77<e}PH;s`<!MZ*
zJ49{VD8i7IH^t-u7t&+yoUM>!N|Vukg>vXZTS_~nFD14eMx7F$Ma;Hq)QNid#%yQd
z!EyDQHAqG$Vuz!AotBT&ha04)9Ote;H}6hFnzGpQ+~ce)rg#kh@{HD;%r>Qg!obX2
z&$Mb&QeGwDTM|vj8o`@N`i(yGortPb8_;`P_BrUn(f&A*T~gC39S6sUPqdm^C|JV;
z3f52|3O2RIVgAH8%&%}9vX6kMl-re!y8zYBSRI}ynTp`Hd$}77Yd-sEB0qW=*+wsp
zR0g3<DL#FDf|{0C`N-Vn9E?KZxT=A$$^h+TsZ3ALVK<_`h&7pKB-zgp$_HYhDP*r{
z@iYHc<;xJa?ZrQOvjl_JNVJJ=rsWlN?~SIGZ=#!OWhn$Yif3w$OG`U)(-4h?GVK!G
z&$JK$cR#6Nbc64Cs<P;x`owW_?3G=TmcQBE<2Lj*TA|O*?_#&;?4M-;{@rUx+qCck
zH#HkD{zcfa{M&;$pcEa!GtDDSDQVC|2Bi<;$818M!ad0oHt34^h+27R<z&dN$?CC-
zQ9-mFNN`WEm&oof=Pv8D#<6B>p)EclN<kJ8Z!Swu#R0ibh{zMhvIhLz7t90kd8LEt
zm6ZiQyGB;?24#iX$<>ah`<#~d%H(HPpM52<x%Wl6JFOkihaQQYXMX4k@XG)q%PEzq
zLya2pID5ZnG|q%)Pub7|^1uBPa$6KvNNY8?_rfS$T81))Ox6X@h0?2`dSgXw^+L^<
z8SW77Sdpnkw~3NWC%R2kWIEB^IDrN=Cd5QdEfmb8o0zD7Ox$!p!ORo2c~ob9Dp6L3
z7>OoF&B2ZpU6eE0?6xx_Sy%^n7%1lEAg)DT(ULJWRMu}IA4_zSxi?>$D>_XqgA`9z
zHBs?xP@AGZ#H2r8sAuK$D|C&gRS!<cX){)6OXf4IttOuDTnx0@Xy&W_4(%1Gl-D2d
za95yX5%V=Mq3q-7eC;ZtMO>xKOc+EQ591wK+m>janN^vV4^}Ww@p;gKWz;}>aPq5;
zHPgC#`nZ<Zfa}mRV&b|dSs*MfjEH(*xC(h5EM`}4?RBl9Jw7WXIbquPt{zAGmX@c$
zr*EcwiuN;4QDbIi(R{?$P&1HP)Ot;2(O(x%#b{&3xk(JH)b@{#Z)XNP>gunlU)i*?
za(G&v@Ie&~y#!Uu=_wZf689#FZyLrk?h)L*OoZ0-hvx|&6dj6nX-Ekp;<%4QIVr6k
zlS`6fizIi>jsfbmn!Wcriu@7Lq#n@)zLClif@Ox^qh=RHF|)5=C6eAhI!a;u4M7C9
zqR4f+O!XoG^LHyArh1W1TQ=ZyKzMC*PX~n8Mz=r0TfK5?ftTFMKD*V_swzYD%I8T|
zGgfILlxiO`5uWU0jX7(!JPEVvtj4y&aTomw8LrvKGQ}$hF}7_i(3hF3OGJ^8E|O<W
zt&`Qz<-DK#WhL9F(S8obICTYjGwV4ri`722<*Cg6bUlqHx-mzwI5|^t4vMYzlAK9J
zyk`K`Gf_w#qhkBM*4NXrRoxbbKSHSyA|+om9a-T*KKMmTN_YV0pH{F`3Z*@_9IyII
zk>h%-R;JV+TORRRU_9$#=Mrm{6+9C3TK6ukd>S7VP1)w^gb}`Guls_mXI4SzhJ@99
zPs?8S={qfT)o=GH&RJk<E<E*ING(R$snh5rLXdo{M>tP8fu<H1mq;5^T4g3LxKO~|
zuaP(vFhDaJAWyll@f;DYeMTiq7JelcH%Z^P+X&W5eIs0@Cr^>PVVTW3{9&0rnxl2<
zs|zWum$a#>gwziuE2$i&-<%S)S{G@B)j^+0D{f{GX<43@Y;o(JmEx;rr8`xVOw&`n
z_@XU>biqVqT{C8|Tm<QKz>&>8q<ZJshAWzpgyrYCdg$g^&5U?1e;R$b3XD7FbR;F2
z>6TNbrdb)@xC&MPPi?2qR6JhvCNX!|#Ot&S%RXW$OsmajZO=Xp`}3-eqHv6)*qx)8
zBk^U2t6FC7WA&LMIrnxni1}nC$B{rgk%$RBJK66YCM{~b8PTOIx_0b-^dWD6Jn6(5
zqSmWUR#^#}cz(6uZv%Kg$v>XodXJi3+sW`k*9fGEWS9~KamVXsk1E<{HGF0j`%es<
zh^gq#5@)En^BuX6{FV4D$dR<hh@{y48iK%y_NpQxG+N9`V^Xg`k3#mdY4Zkfzh+NO
zot$#h?bXP>8i9=tk@ZThNL_HQGw#|-AJcP@R;4MfAA3ZQ>9f!tnJ&mho^V8J_?&TB
zN}}lAXCKFJ_TClc?eB3}0-A?QvSTdJILmumF3DV;OfLPDphf(n%pkJDm~qD7@pMee
z7Bkm1t+Oa>UI&$Hz6Lx!iW%cy?)63VmD#zPL$kmKU3j=D&7x8wielvn7pK&6pLUdm
z$H9eUa-~x*l}rvf-yk}&X-Qlk9N(_htOrMTgO7=?MSGtX#^%%e-HqX$XROaGJZvuR
zQS=aL=yukI%%W<DtH-U7$(s=s!c#I=gJZVgc^~>d64Z5<3VOr>!w7j=xmi9u6xBGC
ztg%-=;qGMC3^(JE^5juj6X@*aswbyaQNd>pxEBpT#<TLbDUqUl^QM%v9iKjjYa^BO
zkW|yzFE(^2dqhR%qw=Wr`n^%zsQ0A&N>j({;)lk!VNYVl0&zoqo~+i)^My>?kwT4<
zZ4P!GqGT%fS=ATU6y+0-pkJUE#L2Svl=T<EUZS2nYO(0E$A)|?TArjJm>5qcAeRv%
z>o@eujVbL_ez=MYnV|NgtXF1A7K3Os%~8uzqJmmi5hEygYBzL9j;X?XOf4%5y~Slu
zHw7a`J{G%=r%v@@JjL$QqnL%p?&@<(z`3l1%ZN!i0g--7sh2C>l#!Umo)*?(YF=&%
z7$qc;DXkcJJ<e%W%=GDHSU=Q#%oAD>ueqyMobGR)tQty*^7RMuG`itv0Mo0WM>h+}
z@M3Ivo~9VK<@0owaXkL9oL!bD&Zbr*=iey_OuT#8kZoz{cBX7|af-`c7b<kTb(B}K
zh{P{P1HED@qMd!Ge(H+E&y!@Kt&nswQl4;4yY?C7j<j%bx5nIz`5!Gb6y_D=+!I%g
zPg)4k-2Ul+l9(}z+2_oPq^cYhY77v8Fpj&>khImDGfS+4@f!3-cEK_wu4-13O6$Bd
z_Zl<tU7l*em6UuI#90AV-Nr2C3%zks!ueoL7S<_L2#@UW^p=F@CVS+=XKu7CXPjDb
z!baCRZN6$qs!``Eu;t3PV_q2HV?)+#-`8}e<;C(_OD3Js8j|L`hCf?}IotvM)Kq0(
z>%r`;NtLoqrLtfT<OU_2UlgULFJG(7PM<~~-4T)5YfJWd3P(gr94psWE9^!+3)!C}
z#okvE2gw*#BE5{9=I%;=<%OZWwfbl}2fOMf{38z76kwO#h+HxCg|zSq&W1fY&=%pS
z^>XGN&~l>$w^yFXUY_aIESVOJsv*uU@r{BU6VEhjEU2hkEgw`|0`(<xB~7)O6ZGwI
zZ4qS>M1-+0;=@$$L}UK5UwOWHmdrHa86Jb6a69NDZCr8j)1T5p+{2z1uEEvl+h~x1
zz!(@-)ZP(jNAzn%M_!{0>me7(*Q}~bF9`Q$>b~9hMN&<iMMX`vBRWXVOYg^L)Ik{a
z+K&BUHCkI2R1OyHcsstwYS?okm3mKy>~6&O8OgN-ZL)1vD(Oc}8b%|9twPg(lz#0D
z!8wRT+D>~-D>}r)^<18nC7AEt(z+`KBi<j(llWT9$|QOxPs`6~_TPo+acwCc<*uOp
z%t^>(7E!uxD%>X_MlrK2xX0b^%DE>CZ*IB%b8n_EzjH!DDSpx%pQk=6iJHXUdGd9%
zLRyEj6Qf+6C!bPW|19TIN=sk%k%r_6YMI=F^_h4{oRUS&ao378DPR<liBsf>qpAJv
zfCV*<9x{t@3--`KXf0Z1<SA;No@gS(M29Ke<n*$*EnJSz)AEM7?LzIVkvh`y+NEWs
z6*=tFU-2zPksX^)X?04`SC#ZSybANg2Qsd-R;c}V0vCvT>9Y5KXud7)V~j?WMJ=!V
zadfM3uB?(OoC)*Xq3kX7O1*|=+>SzH!qpS9ujWxHO$te`hpo)4VA}11J~6sDn&Uz{
zTb;07Jr!FdGl}TJIIx8tc=h9yEu4srZ=1-Bw$Jg@@^&vUW;A>5<?cg0WE3-{M!%f5
z&a4;_jfF4ov8(n|&%(YtB6rLbG|{c0%ryqrY=-;Z4lIyavYd75%RRvJBpx~ZJsXYr
zsQYc>SS4%32Nu_;rAm_RG-NGdv#<MYpFv`{jAY=>u5fsw*CJIV!eMiO!<tswyEErU
z)BB=h7Z~lXa)QW<)M|YyVlN4hYN_oa^%;nnc4KUaeG$(u@2SvuIalsBVBU=5>j{2?
z6}9y1x%gGSGdI|K1xqJJ-ds2af0qUogpR?kMhv{Yl;<`WtSbJBM)h@mD>GD>sX)Jz
zL<y<Y6-Uf9Kc;^Yo}fWZ=p#{m-IKID-l9#_7Z&563n@3(2uE1uVlmT9H1#N^l|?-T
zSMOPqX9vbs<(P*nB4<%+)z#BAkU6XcLJdKWt>%e*;on_YTM{22_KzuLOglpNKZ~(;
zp>6SOkZ^WQ7VFQ|SA~1~<C=NGl*Kl&*U(m!X&%XwZz`T)p=Tf}@$%GfBFQR7gwI*K
zQtIx-E1YDJMdspjqTcLnbZpbwO}Nk5<8q=nmb`9-oTevUb8lJ_+P|l*K}3UKgxp`s
zBZm3I*`lWp+HlUa^i2OzmrQnM<dZ|<C$dj1gvG?nvbR_L@WFPR?n0Y<OJEPNCaGXD
zVl^>piK}G=X3$*U*~j7gQnwC0r&o?VOXPv}5bMZp$D?^7d0*x>D|@K$1y^Q4Tw6<8
zVcGMcNmnw`$4b-8PgfRId2H|ET+NzET^P|49AyAlXZU?`F%cuKI%+0j!4KoLc!G3I
zxu_>7E#I<R*1P6a<6#<wVRRw$UIu|{NPH*pT+`0aM}&SHy{m)#+f>+!zB0;8&oI%J
zVrgG9<w!n|yh`YZYxi1@yDS&$%SKK3?5}dzYxtXrJ5}v%MwJV1ir3PNKGEZlkF1~F
z9|y&^VIO8%wwhapXbEA9lBYCejS}wQX7qdZvcl}Q3ty&upcj%^+jbnNnEC4Rk6`Dz
zU}P=xEr=oVH4$;M?m0bq)T+p*U3jL~&x({NEmyUdYk++ZYqIG_+>2EokFVF~Qqt$r
z3mrg@Ulur)3!QB$jUl}swCW^smL4JHTNyNZo(0zF>N$Cqd@0o);%9iJWj~v~1{Vfo
z&lrg!LV1cxW{=%SxaQ@wuob^ijz-;w^>f|pJdHGW7RoWMK2r;iaz~ypO@(kr`<SOS
zrz$ZofuD>vnaB%?rPiE~g+y~niIw02skh8CdONW%hf$3@)!rfMLi~kM12&5)${Bfz
z^<D?OXsB$gcUm#AK2pu+1l)Y}SFCHUwE01-0;6RZSD{y3T6&t>R*CvPv<E@=awH`^
z*WF9u4{Ey1^5zK@)Ye;IMNy(DoQc*JYq&EfQ%R7hhru4<plQuM$GTElmF-^->_+Oh
zG7EQ2V514XX6oG4OJAcGeN)T#GT)FDqgAsCnfESx_V$uKS431<SdV6{nsKaLu4LwE
zOOCW&huK%I@>_?*=)zJ+S(5HEGxHU@TiKbJJjaOhMl8gAQf9vVP6{XF&KtIbTpkR;
z=on=&2x>J~rWH5j-U&_1$fQf{0_~tM>}%4!&#%`^_g-U=F7FC+_gR}E>O0Eo+>pnJ
zA$4NKFgjev8JqiZ_O(yQSvD-*Zr8}lp>@{pw0xEp)|X<4`=FJH#84hk+gXa$HwMYp
zU!`M^y%!*!CC(UaYTi84M*IS_c!?vZI5f&j?)X~PWS<>pqhmQ_BdcyN0X00UmA+1T
zaGQeuk0;QSeWaRr{pfq4Hq{@gB%?<^dw;E#<2)^x<IE@=YDx-E=T6lLA2jXb@|gx{
zo!nre5JcO}y*3;_oJEg_mbrVBmM<zgMrI|Q`9bZcA<U|oH<JZ2?(&t;3Q;={<rjT_
za(YV?r%TI=934-y9-N>Ya&D|CY2{p1X28TFe)BZi9AUFAIV;CXrPb(Yr?p%7j5ZM?
z>S<E>i~7xSaC8x}OPw*|=OfI*2jJp+u@so|rsjmZUUU|gr-U#>XF>Yms&|oAOqkg#
zmuEu0lY~Pu3Ws_HPfj0?jdGqaYSuJm%v!m6FIh-J*Z32?rPNb3CmHD>=hODb#yL+O
ztyaiE#uBLd+0m7kmhI}p<EmaKduzA-qP@?P7egxO*t{5N@dI_Vq&ySpWz;vJ_4lrn
zB(YClrM8Q^B8tTH>hr>)xJ;hLU1)KSd-f5LemjizbSdPlK7_P{{pDksbJOlp)fo7(
zNDXZY;Vf!oB1^?~m;Hd*<EpaD)batDlwDCZGwJ68QuY{;rKlezKF8esi8Adl=K8-+
zxe@6GjXG0Aal3fAIZk@aB&W%5oT|s4ro9^LVTpAIE1xy@Irj=fCT679d-gtU6PKyX
zpQilu<-BS6^4nBKUlg$vq%U7cad`HKO0t3&qbMZ1XB5a=JV#B=gBUP&Ce4u>GnYyx
zO?pKUi<KH;5+lPk6|Fm^smNXnwNoL!C+Y+C`aQONA|EIDROVl!k3yfzOVp`*qS`Q@
z>(BI@W$$^n`(4J-Uutpmzi{5n=#LSsF47}A+gPxoDB(^2X!g1HHoD9cd&>L6^5v0<
z;wVyOiCIY!J0Q93Dtb)G49#WPO9s=w6sIQYaZ;FuDG8OekS|)IJs0anPWCEdM`ARz
zvR{cqhU*<=A0uYYi;EWf`!*k-DJ9}un0;I-@kg#1$^Mn~;?f_&o~IG$wyJ6iC5QGz
zDIN`HHD>R74xa+vj?>DB5YkgZp474-3r{5R;$%-`7MUY1kBlpGB#Zn2S09r{G%dVL
z@FS^X=kg6udoVM#!f}|iBb7F<Y-;Kwd{1Po=HM)RsO6|q$X8fSL{a#(>Vf;rMGGXN
zWIsqHRBC)td`HcXS_yjmv+$g{#@}v%M8`fY9l~eq?X}qAD3Ka>$(hLK=-YIHxE_$F
z^~yEs7xR#(^HoIWh{gwy7L^Up^&I8;Jb8B1$r+MA8n4NfRulo{h28rnYnM8^Uk;P0
z`^NJls+*qp8lDb5s;PVCyh&O0&g24%U$Gt$Q|AC_6S=N!Hoae7o;lX*D_Q(}a?1Xc
z)1Qci6AAbA#bl2^`i+KEN@o^{#1Ap1x)@X{qlYmrZ?pHo_|nCkdBIp&k6mmV?n>qA
z1ZM9sH}&kwJWNWDWk!iQ0Y<ORYNm`Q>Cy+l`a_JK4|_ecUuou?X{llQn9QDw{imY;
zn_+vCH{+Vxc;@od2g6(u#G`a$R^n)8U$ENNfjUMF^OYbD)coi#WCg9bA2fTP;qIZC
zts(R;EkuaCXV<g+sUXi%MlQpQur~F@xVg{sv<70cT8gAqal}nk6n$mX9eYpSGVvkW
zo|J;R@2gT;PvYt42_SN|3hiKeYQra5(^tb2CZvB$TUNH7*|f4%V^{Jkz4#4cbF(ow
zl<NGg*@Y7k`EyEPVc{hFF6T*d2`C#`|7v!mEuOW&9<0JIFgkGvuZHk{=*{Ph3-+f@
z<t}$(cRMoQSOuA<lbBXnUExjWV?RFW#^3%z4Mv(bFH*G;kIjWs@xSs;)d0qZ=xGsD
z&^mQdr1LcLPLX|{R)V@g_*z`_X&kS*=wtpRW!O}sOX+qly0ooXUGt^sQqQO<jRGU*
ziJz2cv`oZ5=%QWYht)-UTvn=GV5+RXmq6}^<&RpQYIndFf*oQy@$ai+qoR1f4*BKO
zVmbp$$G!@pBUi1wq9|3XI?gNV8&Qg@d%e$$%zl)*si6TL7@<;Wh*4^%njZC12i<k3
z#3mY-IRcdT`fh7(YHnNm(Kp_8@H02>zx3TZAG&g9|LgC#{AfzZw&t_&%c4UQm)ldP
z3{nCy+II-LIwP{V0}I}!KM{*%IItwP7OuGVt2caX?)Pd;x<E(s0q8G(i&g4+3vVr1
zEO;}x_Ql`LfrZvz;L2Z$9lr_K>Y0VpfFqm(3#J+G@FFLjR;Vv5g4Iz!@vI^EY}YQX
zCg}-t!4dUU8+<VFho5f`MxNOc^cBgqYgeIg6rK*De_KJT*i(XqN{`FYFTXVd|6l$e
ze>2_^KR2(Xcp)>mA?Q&zTHo%l%<6!=wqPXe7Milc>QGN{9&W~iw8QqIB`A@lw0ni_
z`8ZFKSPM_xpq)6vQNl&LES;*insb!>7qyK==cDybbe7Ss<Q#=bhjX}AOpGGwO=BG}
zj*UGtXRQu1PrI2muZo{c$NQc<nnVO>;WM9^ctH8_OedZ$x!2|K5prvD>N78=)7a)(
zd!5%~e956iSfo;doa@>R?jY(jjDJd#VXgry)({2dDdv>4JpWa#_Ba|dCsNtw^a%uJ
zP6<n4Jt^Wsr$e?7v!KN0>W_}+61*Gsxtmett5YA_a*|h#d#|y&*5|5+cA231tL!-K
z5zV`0D*aQu#3*>pOHr&(aWmI+lC`3=duj(tL*QC2PR!=i9GSRnPpWn9%~YbgJoc+k
zudi;JeUag*$=Pq3(01&cJyobSb-WQ+B=mr}(d3mAQfyD^qV2FzsDJudDSCcRK<_Sr
zm#6{0q89v{kCV@r;q3WFJkEoDz-Nm=V*{Qw;dLXvI~Sic;#*7bP7_`)gp8kuXUhtg
z;@8A#&{@XSy`sa&q#ieOpV|(ZtHX08bK%;-`6(>{(GInzRN=AHYoAV{daBHN+~ZpZ
zZf--a5@Rohp<Ua#{;gA->*IEoYb3T!k&y_?I;F8GOwvZZvSFs%S~vtVp0sY%4uP)*
zI9h)7fLZ8a7{_IwRsU&|OqKcd-QhUDN#9lD!?EHRO<#F<Seem^OVQ}KO%<ykEIp&z
zL)>$zz7ZXdy?Bt?X(rbPJ~jDFp=)Z);(VsQ5#_U~Y@yN5X0FF5?NgH%qWDXk7t}YR
z<1rmDN8f0J>7~tA7K<>IQ2FvG9@mcj8|K>4aT$!!kl2i-)@O$|AKJhA<2$eX$>Dd`
zy!rdDpnllayr+CqEkJBo`EM+U@;1*ljz=fBzZ;I%==t3xPu!i`cn!u(#3MCk<K1%p
z!g93RVl~WG_}sjf;zhoqG^U!bxpiWMCl@t$a{<o_ajhgBzp<yX_}y*0;$fn``&OX;
z@m!J1C&p2*-~8r^NdH{ew5iQ$pR#@?(LpVUxbck$pPD+L()N`-z}-siSbM$8)x8FM
zy~`^n*8Jqk&M-!}*W<XmS#gy}I=k;>YRWE!h`D6fR6(JWJO?iNr<Y}F?p%BQOlC%I
z*gvawcL@Ee_cKioxfaLel;n%f<zDSw$-=$90LE|o#@ve55a%;x9YpzTI{O0lV&B|3
zWbc?>8b)Q<w+-vv@407gz5lu+T0eZk-v(E%{8RUxC9L;sjOU)n!_z1c@s7bDo2v+^
z5Vp+f3?$3^UKrzj=AeK5{ykNO@p2dN!+67VS3kbXJjXOS%FbyT2Thy9#b%D?1eV7@
ziFZvUTwGZ}d$mHP6`D5URPs%_&~7^#G#xaU=uA(yjG?`lE)kHa;k~l2;^~2XMAz|N
zOjqf3)$N-K?^t_t2Us~VjMFNe<q&A{NgjYGK9gVRpPV}|J>*&(Yuk(ICe`TMi|Ovg
zbXg^~a({SIeD`#)i1x-av#wG!JMqO~x-F=!#yDO+s$Vwu;wT2p?_oRNd%dU;ScBN*
z(V&(L>yNRzm#&Y`h`xrPdYQY46H(A@mvOnjsXuwgj6&gd{qjXWGnz-$xb&}TZvX!S
Dyup_D

diff --git a/Libs/CsharpDis6/OpenDis/OpenDis.build.bat b/Libs/CsharpDis6/OpenDis/OpenDis.build.bat
deleted file mode 100644
index 9858854..0000000
--- a/Libs/CsharpDis6/OpenDis/OpenDis.build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-msbuild /p:Platform="x86" /p:Configuration="Debug" OpenDis.build.csproj
-msbuild /p:Platform="x86" /p:Configuration="Release" OpenDis.build.csproj
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/OpenDis.build.csproj b/Libs/CsharpDis6/OpenDis/OpenDis.build.csproj
deleted file mode 100644
index a60fe07..0000000
--- a/Libs/CsharpDis6/OpenDis/OpenDis.build.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project=".\OpenDis.csproj" />
-  <PropertyGroup>
-    <PreBuildEvent>copy "$(ProjectDir)Properties\Version.cs" "$(ProjectDir)Properties\Version.cs_temp" /y
-cd "$(ProjectDir)"
-"C:\Program Files\TortoiseSVN\bin\SubWCRev.exe" . "Properties\Version2.cs" "Properties\Version.cs"</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>copy "$(ProjectDir)Properties\Version.cs_temp" "$(ProjectDir)Properties\Version.cs" /y</PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/OpenDis.csproj b/Libs/CsharpDis6/OpenDis/OpenDis.csproj
deleted file mode 100644
index ae7b6bf..0000000
--- a/Libs/CsharpDis6/OpenDis/OpenDis.csproj
+++ /dev/null
@@ -1,826 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenDis</RootNamespace>
-    <AssemblyName>OpenDis</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\x86\Release\OpenDis.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Analysis|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Analyze\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\x86\Debug\OpenDis.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Core\DisTime.cs" />
-    <Compile Include="Core\IPdu.cs" />
-    <Compile Include="Core\PduBase.cs" />
-    <Compile Include="Core\CetBase.cs" />
-    <Compile Include="Core\PduExceptionEventArgs.cs" />
-    <Compile Include="Core\PduFactory.cs" />
-    <Compile Include="Dis1995\Generated\AcknowledgePdu.cs" />
-    <Compile Include="Dis1995\Generated\ActionRequestPdu.cs" />
-    <Compile Include="Dis1995\Generated\ActionResponsePdu.cs" />
-    <Compile Include="Dis1995\Generated\AngularVelocityVector.cs" />
-    <Compile Include="Dis1995\Generated\AntennaLocation.cs" />
-    <Compile Include="Dis1995\Generated\ArticulationParameter.cs" />
-    <Compile Include="Dis1995\Generated\BeamAntennaPattern.cs" />
-    <Compile Include="Dis1995\Generated\BurstDescriptor.cs" />
-    <Compile Include="Dis1995\Generated\ClockTime.cs" />
-    <Compile Include="Dis1995\Generated\CollisionPdu.cs" />
-    <Compile Include="Dis1995\Generated\CommentPdu.cs" />
-    <Compile Include="Dis1995\Generated\CreateEntityPdu.cs" />
-    <Compile Include="Dis1995\Generated\DataPdu.cs" />
-    <Compile Include="Dis1995\Generated\DataQueryPdu.cs" />
-    <Compile Include="Dis1995\Generated\DeadReckoningParameter.cs" />
-    <Compile Include="Dis1995\Generated\DesignatorPdu.cs" />
-    <Compile Include="Dis1995\Generated\DetonationPdu.cs" />
-    <Compile Include="Dis1995\Generated\DistributedEmissionsPdu.cs" />
-    <Compile Include="Dis1995\Generated\EightByteChunk.cs" />
-    <Compile Include="Dis1995\Generated\ElectronicEmmisionsPdu.cs" />
-    <Compile Include="Dis1995\Generated\EmitterSystem.cs" />
-    <Compile Include="Dis1995\Generated\EntityID.cs" />
-    <Compile Include="Dis1995\Generated\EntityInformationPdu.cs" />
-    <Compile Include="Dis1995\Generated\EntityStatePdu.cs" />
-    <Compile Include="Dis1995\Generated\EntityType.cs" />
-    <Compile Include="Dis1995\Generated\EventID.cs" />
-    <Compile Include="Dis1995\Generated\EventReportPdu.cs" />
-    <Compile Include="Dis1995\Generated\FirePdu.cs" />
-    <Compile Include="Dis1995\Generated\FixedDatum.cs" />
-    <Compile Include="Dis1995\Generated\FundamentalParameterData.cs" />
-    <Compile Include="Dis1995\Generated\LogisticsPdu.cs" />
-    <Compile Include="Dis1995\Generated\ModulationType.cs" />
-    <Compile Include="Dis1995\Generated\Orientation.cs" />
-    <Compile Include="Dis1995\Generated\Pdu.cs" />
-    <Compile Include="Dis1995\Generated\RadioCommunicationsPdu.cs" />
-    <Compile Include="Dis1995\Generated\RadioEntityType.cs" />
-    <Compile Include="Dis1995\Generated\ReceiverPdu.cs" />
-    <Compile Include="Dis1995\Generated\RemoveEntityPdu.cs" />
-    <Compile Include="Dis1995\Generated\RepairCompletePdu.cs" />
-    <Compile Include="Dis1995\Generated\RepairResponsePdu.cs" />
-    <Compile Include="Dis1995\Generated\ResupplyCancelPdu.cs" />
-    <Compile Include="Dis1995\Generated\ResupplyOfferPdu.cs" />
-    <Compile Include="Dis1995\Generated\ResupplyReceivedPdu.cs" />
-    <Compile Include="Dis1995\Generated\ServiceRequestPdu.cs" />
-    <Compile Include="Dis1995\Generated\SetDataPdu.cs" />
-    <Compile Include="Dis1995\Generated\SignalPdu.cs" />
-    <Compile Include="Dis1995\Generated\SimulationAddress.cs" />
-    <Compile Include="Dis1995\Generated\SimulationManagementPdu.cs" />
-    <Compile Include="Dis1995\Generated\SphericalHarmonicAntennaPattern.cs" />
-    <Compile Include="Dis1995\Generated\StartResumePdu.cs" />
-    <Compile Include="Dis1995\Generated\StopFreezePdu.cs" />
-    <Compile Include="Dis1995\Generated\SupplyQuantity.cs" />
-    <Compile Include="Dis1995\Generated\TransmitterPdu.cs" />
-    <Compile Include="Dis1995\Generated\VariableDatum.cs" />
-    <Compile Include="Dis1995\Generated\Vector3Double.cs" />
-    <Compile Include="Dis1995\Generated\Vector3Float.cs" />
-    <Compile Include="Dis1995\Generated\Warfare.cs" />
-    <Compile Include="Dis1995\PduFactory.cs" />
-    <Compile Include="Dis1998\Generated\AcknowledgePdu.cs" />
-    <Compile Include="Dis1998\Generated\AcknowledgeReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\AcousticBeamData.cs" />
-    <Compile Include="Dis1998\Generated\AcousticBeamFundamentalParameter.cs" />
-    <Compile Include="Dis1998\Generated\AcousticEmitter.cs" />
-    <Compile Include="Dis1998\Generated\AcousticEmitterSystem.cs" />
-    <Compile Include="Dis1998\Generated\AcousticEmitterSystemData.cs" />
-    <Compile Include="Dis1998\Generated\ActionRequestPdu.cs" />
-    <Compile Include="Dis1998\Generated\ActionRequestReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\ActionResponsePdu.cs" />
-    <Compile Include="Dis1998\Generated\ActionResponseReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\AggregateID.cs" />
-    <Compile Include="Dis1998\Generated\AggregateMarking.cs" />
-    <Compile Include="Dis1998\Generated\AggregateStatePdu.cs" />
-    <Compile Include="Dis1998\Generated\AggregateType.cs" />
-    <Compile Include="Dis1998\Generated\AngularVelocityVector.cs" />
-    <Compile Include="Dis1998\Generated\AntennaLocation.cs" />
-    <Compile Include="Dis1998\Generated\ApaData.cs" />
-    <Compile Include="Dis1998\Generated\ArealObjectStatePdu.cs" />
-    <Compile Include="Dis1998\Generated\ArticulationParameter.cs" />
-    <Compile Include="Dis1998\Generated\BeamAntennaPattern.cs" />
-    <Compile Include="Dis1998\Generated\BeamData.cs" />
-    <Compile Include="Dis1998\Generated\BurstDescriptor.cs" />
-    <Compile Include="Dis1998\Generated\ClockTime.cs" />
-    <Compile Include="Dis1998\Generated\CollisionElasticPdu.cs" />
-    <Compile Include="Dis1998\Generated\CollisionPdu.cs" />
-    <Compile Include="Dis1998\Generated\CommentPdu.cs" />
-    <Compile Include="Dis1998\Generated\CommentReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\CreateEntityPdu.cs" />
-    <Compile Include="Dis1998\Generated\CreateEntityReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\DataPdu.cs" />
-    <Compile Include="Dis1998\Generated\DataQueryPdu.cs" />
-    <Compile Include="Dis1998\Generated\DataQueryReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\DataReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\DeadReckoningParameter.cs" />
-    <Compile Include="Dis1998\Generated\DesignatorPdu.cs" />
-    <Compile Include="Dis1998\Generated\DetonationPdu.cs" />
-    <Compile Include="Dis1998\Generated\DistributedEmissionsFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\EightByteChunk.cs" />
-    <Compile Include="Dis1998\Generated\ElectronicEmissionBeamData.cs" />
-    <Compile Include="Dis1998\Generated\ElectronicEmissionsPdu.cs" />
-    <Compile Include="Dis1998\Generated\ElectronicEmissionSystemData.cs" />
-    <Compile Include="Dis1998\Generated\EmitterSystem.cs" />
-    <Compile Include="Dis1998\Generated\EntityID.cs" />
-    <Compile Include="Dis1998\Generated\EntityInformationFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\EntityManagementFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\EntityStatePdu.cs" />
-    <Compile Include="Dis1998\Generated\EntityStateUpdatePdu.cs" />
-    <Compile Include="Dis1998\Generated\EntityType.cs" />
-    <Compile Include="Dis1998\Generated\Environment.cs" />
-    <Compile Include="Dis1998\Generated\EnvironmentalProcessPdu.cs" />
-    <Compile Include="Dis1998\Generated\EventID.cs" />
-    <Compile Include="Dis1998\Generated\EventReportPdu.cs" />
-    <Compile Include="Dis1998\Generated\EventReportReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\FastEntityStatePdu.cs" />
-    <Compile Include="Dis1998\Generated\FirePdu.cs" />
-    <Compile Include="Dis1998\Generated\FixedDatum.cs" />
-    <Compile Include="Dis1998\Generated\FourByteChunk.cs" />
-    <Compile Include="Dis1998\Generated\FundamentalParameterData.cs" />
-    <Compile Include="Dis1998\Generated\FundamentalParameterDataIff.cs" />
-    <Compile Include="Dis1998\Generated\GridAxisRecord.cs" />
-    <Compile Include="Dis1998\Generated\GridAxisRecordRepresentation0.cs" />
-    <Compile Include="Dis1998\Generated\GridAxisRecordRepresentation1.cs" />
-    <Compile Include="Dis1998\Generated\GridAxisRecordRepresentation2.cs" />
-    <Compile Include="Dis1998\Generated\GriddedDataPdu.cs" />
-    <Compile Include="Dis1998\Generated\IffAtcNavAidsLayer1Pdu.cs" />
-    <Compile Include="Dis1998\Generated\IffAtcNavAidsLayer2Pdu.cs" />
-    <Compile Include="Dis1998\Generated\IffFundamentalData.cs" />
-    <Compile Include="Dis1998\Generated\IntercomCommunicationsParameters.cs" />
-    <Compile Include="Dis1998\Generated\IntercomControlPdu.cs" />
-    <Compile Include="Dis1998\Generated\IntercomSignalPdu.cs" />
-    <Compile Include="Dis1998\Generated\IsGroupOfPdu.cs" />
-    <Compile Include="Dis1998\Generated\IsPartOfPdu.cs" />
-    <Compile Include="Dis1998\Generated\LayerHeader.cs" />
-    <Compile Include="Dis1998\Generated\LinearObjectStatePdu.cs" />
-    <Compile Include="Dis1998\Generated\LinearSegmentParameter.cs" />
-    <Compile Include="Dis1998\Generated\LogisticsFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\Marking.cs" />
-    <Compile Include="Dis1998\Generated\MinefieldDataPdu.cs" />
-    <Compile Include="Dis1998\Generated\MinefieldFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\MinefieldQueryPdu.cs" />
-    <Compile Include="Dis1998\Generated\MinefieldResponseNackPdu.cs" />
-    <Compile Include="Dis1998\Generated\MinefieldStatePdu.cs" />
-    <Compile Include="Dis1998\Generated\ModulationType.cs" />
-    <Compile Include="Dis1998\Generated\NamedLocation.cs" />
-    <Compile Include="Dis1998\Generated\ObjectType.cs" />
-    <Compile Include="Dis1998\Generated\OneByteChunk.cs" />
-    <Compile Include="Dis1998\Generated\Orientation.cs" />
-    <Compile Include="Dis1998\Generated\Pdu.cs" />
-    <Compile Include="Dis1998\Generated\PduContainer.cs" />
-    <Compile Include="Dis1998\Generated\Point.cs" />
-    <Compile Include="Dis1998\Generated\PointObjectStatePdu.cs" />
-    <Compile Include="Dis1998\Generated\PropulsionSystemData.cs" />
-    <Compile Include="Dis1998\Generated\RadioCommunicationsFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\RadioEntityType.cs" />
-    <Compile Include="Dis1998\Generated\ReceiverPdu.cs" />
-    <Compile Include="Dis1998\Generated\RecordQueryReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\RecordSet.cs" />
-    <Compile Include="Dis1998\Generated\Relationship.cs" />
-    <Compile Include="Dis1998\Generated\RemoveEntityPdu.cs" />
-    <Compile Include="Dis1998\Generated\RemoveEntityReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\RepairCompletePdu.cs" />
-    <Compile Include="Dis1998\Generated\RepairResponsePdu.cs" />
-    <Compile Include="Dis1998\Generated\ResupplyCancelPdu.cs" />
-    <Compile Include="Dis1998\Generated\ResupplyOfferPdu.cs" />
-    <Compile Include="Dis1998\Generated\ResupplyReceivedPdu.cs" />
-    <Compile Include="Dis1998\Generated\SeesPdu.cs" />
-    <Compile Include="Dis1998\Generated\ServiceRequestPdu.cs" />
-    <Compile Include="Dis1998\Generated\SetDataPdu.cs" />
-    <Compile Include="Dis1998\Generated\SetDataReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\SetRecordReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\ShaftRPMs.cs" />
-    <Compile Include="Dis1998\Generated\SignalPdu.cs" />
-    <Compile Include="Dis1998\Generated\SimulationAddress.cs" />
-    <Compile Include="Dis1998\Generated\SimulationManagementFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\SimulationManagementWithReliabilityFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\SixByteChunk.cs" />
-    <Compile Include="Dis1998\Generated\SphericalHarmonicAntennaPattern.cs" />
-    <Compile Include="Dis1998\Generated\StartResumePdu.cs" />
-    <Compile Include="Dis1998\Generated\StartResumeReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\StopFreezePdu.cs" />
-    <Compile Include="Dis1998\Generated\StopFreezeReliablePdu.cs" />
-    <Compile Include="Dis1998\Generated\SupplyQuantity.cs" />
-    <Compile Include="Dis1998\Generated\SyntheticEnvironmentFamilyPdu.cs" />
-    <Compile Include="Dis1998\Generated\SystemID.cs" />
-    <Compile Include="Dis1998\Generated\TrackJamTarget.cs" />
-    <Compile Include="Dis1998\Generated\TransferControlRequestPdu.cs" />
-    <Compile Include="Dis1998\Generated\TransmitterPdu.cs" />
-    <Compile Include="Dis1998\Generated\TwoByteChunk.cs" />
-    <Compile Include="Dis1998\Generated\UaPdu.cs" />
-    <Compile Include="Dis1998\Generated\VariableDatum.cs" />
-    <Compile Include="Dis1998\Generated\Vector3Double.cs" />
-    <Compile Include="Dis1998\Generated\Vector3Float.cs" />
-    <Compile Include="Dis1998\Generated\VectoringNozzleSystemData.cs" />
-    <Compile Include="Dis1998\Generated\WarfareFamilyPdu.cs" />
-    <Compile Include="Dis1998\PduFactory.cs" />
-    <Compile Include="Enumerations\Cet2006\Category.cs" />
-    <Compile Include="Enumerations\Cet2006\CetFactory.cs" />
-    <Compile Include="Enumerations\Cet2006\Cet.cs" />
-    <Compile Include="Enumerations\Cet2006\CetItem.cs" />
-    <Compile Include="Enumerations\Cet2006\Entity.cs" />
-    <Compile Include="Enumerations\Cet2006\Extra.cs" />
-    <Compile Include="Enumerations\Cet2006\GenericEntry.cs" />
-    <Compile Include="Enumerations\Cet2006\GenericTable.cs" />
-    <Compile Include="Core\ICetItem.cs" />
-    <Compile Include="Enumerations\Cet2006\Specific.cs" />
-    <Compile Include="Enumerations\Cet2006\Subcategory.cs" />
-    <Compile Include="Enumerations\Cet2010\Category.cs" />
-    <Compile Include="Enumerations\Cet2010\CategoryRange.cs" />
-    <Compile Include="Enumerations\Cet2010\Cet.cs" />
-    <Compile Include="Enumerations\Cet2010\CetFactory.cs" />
-    <Compile Include="Enumerations\Cet2010\CetItem.cs" />
-    <Compile Include="Enumerations\Cet2010\IExtraOrExtraRange.cs" />
-    <Compile Include="Enumerations\Cet2010\ISpecificOrSpecificRange.cs" />
-    <Compile Include="Enumerations\Cet2010\ISubcategoryOrSubcategoryRange.cs" />
-    <Compile Include="Enumerations\Cet2010\Cr.cs" />
-    <Compile Include="Enumerations\Cet2010\CrRange.cs" />
-    <Compile Include="Enumerations\Cet2010\Entity.cs" />
-    <Compile Include="Enumerations\Cet2010\Extra.cs" />
-    <Compile Include="Enumerations\Cet2010\ExtraRange.cs" />
-    <Compile Include="Enumerations\Cet2010\GenericEntry.cs" />
-    <Compile Include="Enumerations\Cet2010\GenericEntryDescription.cs" />
-    <Compile Include="Enumerations\Cet2010\GenericEntryRange.cs" />
-    <Compile Include="Enumerations\Cet2010\GenericEntrySingle.cs" />
-    <Compile Include="Enumerations\Cet2010\GenericEntryStatus.cs" />
-    <Compile Include="Enumerations\Cet2010\GenericEntryString.cs" />
-    <Compile Include="Enumerations\Cet2010\GenericTable.cs" />
-    <Compile Include="Enumerations\Cet2010\ICategoryOrCategoryRange.cs" />
-    <Compile Include="Enumerations\Cet2010\IGenericEntry.cs" />
-    <Compile Include="Enumerations\Cet2010\IGenericEntryDescription.cs" />
-    <Compile Include="Enumerations\Cet2010\Specific.cs" />
-    <Compile Include="Enumerations\Cet2010\SpecificRange.cs" />
-    <Compile Include="Enumerations\Cet2010\Subcategory.cs" />
-    <Compile Include="Enumerations\Cet2010\SubcategoryRange.cs" />
-    <Compile Include="Enumerations\Country.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\InformationLayers.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\LayerSpecificInformation.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\SystemMode.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\SystemName.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\SystemStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\SystemType.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1AlternateParameter4.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1ChangeOptions.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1Modifier.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1OperationalParameter1.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1OperationalParameter2.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1Parameter1Mode1CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1Parameter2Mode2CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1Parameter3Mode3CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1Parameter4Mode4CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1Parameter5ModeCCodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type1Parameter6ModeSCodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2AlternateParameter4.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2ChangeOptions.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2OperationalParameter1.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2OperationalParameter2.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2Parameter1Mode1InterrogatorStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2Parameter2Mode2InterrogatorStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2Parameter3Mode3InterrogatorStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2Parameter4Mode4InterrogatorStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2Parameter5ModeCInterrogatorStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type2Parameter6ModeSCodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3ChangeOptions.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3OperationalParameter1.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3OperationalParameter2.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3Parameter1Mode1CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3Parameter2Mode2CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3Parameter3Mode3CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3Parameter4Mode4CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3Parameter5ModeCCodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type3Parameter6Mode1CodeStatus.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4ChangeOptions.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4OperationalParameter1.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4OperationalParameter2.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4Parameter1.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4Parameter2.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4Parameter3.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4Parameter4.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4Parameter5.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type4Parameter6.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type5ChangeOptions.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type5OperationalParameter1.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type5OperationalParameter2.cs" />
-    <Compile Include="Enumerations\DistributedEmission.Iff\Type5Parameter1RRBResponse.cs" />
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\ActiveEmissionParameterIndex.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\AdditionalPassiveActivityParameterIndex.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\EmitterFunction.cs" />
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\PassiveParameterIndex.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\PropulsionPlantConfiguration.cs" />
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\ScanPattern.cs" />
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\StateChangeUpdateIndicator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission.UnderwaterAcoustic\SystemName.cs" />
-    <Compile Include="Enumerations\DistributedEmission\AircraftEnginePower.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission\DesignatorCode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission\DesignatorCodeName.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission\ElectromagneticEmitters.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission\EmissionBeamFunction.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission\EmissionFunction.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission\HelicopterEnginePower.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\DistributedEmission\HighDensityTrackOrJam.cs" />
-    <Compile Include="Enumerations\DistributedEmission\StateUpdateIndicator.cs" />
-    <Compile Include="Enumerations\DistributedEmission\TankEnginePower.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\Appearance.cs" />
-    <Compile Include="Enumerations\Entity.Information.Minefield\DataFilter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\FlirSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\Fusing.cs" />
-    <Compile Include="Enumerations\Entity.Information.Minefield\LaserSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\MagneticSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\MultispectralSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\OpticalSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\PaintScheme.cs" />
-    <Compile Include="Enumerations\Entity.Information.Minefield\PhysicalSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\ProtocolMode.cs" />
-    <Compile Include="Enumerations\Entity.Information.Minefield\RadarSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\SensorTypes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information.Minefield\SonarSensor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Information\EntityCollisionType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\AggregateFormation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\AggregateKind.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\AggregateSpecific.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\AggregateState.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\AggregateSubcategory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\GroupOfGroupedEntityCategory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\GroupOfRestStatus.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\PartOfNature.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\PartOfPosition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\PartOfStationName.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Entity.Management\TransferType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Appearance\AirPlatformAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\CulturalAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\EnvironmentalAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\LandPlatformAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\LifeFormAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\MunitionAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\SensorEmitterAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\SpacePlatformAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\SubsurfacePlatformAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Appearance\SurfacePlatformAppearance.cs" />
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingCompany.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingDivisionCorpsDesignation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingHighLevelUnitFor1stCavalry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingHighLevelUnitFor1stInfantry.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingMarkingCodes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingPlatoon.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingPlatoonCodes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\ArmyMarkingVehicle.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\DigitChevronMarkingCodes.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Marking\EntityMarkingText.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Type\AirPlatform.cs" />
-    <Compile Include="Enumerations\EntityState.Type\CISWeaponsForLifeFormsSubcategory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Type\EntityKind.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Type\EnvironmentalSubcategory.cs" />
-    <Compile Include="Enumerations\EntityState.Type\ExpendableAirCategory.cs" />
-    <Compile Include="Enumerations\EntityState.Type\ExpendableSubsurfaceCategory.cs" />
-    <Compile Include="Enumerations\EntityState.Type\ExpendableSurfaceCategory.cs" />
-    <Compile Include="Enumerations\EntityState.Type\FrenchWeaponsForLifeForms.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Type\GermanWeaponsForLifeForms.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Type\LandPlatform.cs" />
-    <Compile Include="Enumerations\EntityState.Type\Munition.cs" />
-    <Compile Include="Enumerations\EntityState.Type\MunitionCategory.cs" />
-    <Compile Include="Enumerations\EntityState.Type\Platform.cs" />
-    <Compile Include="Enumerations\EntityState.Type\RadioCategory.cs" />
-    <Compile Include="Enumerations\EntityState.Type\RadioNomenclature.cs" />
-    <Compile Include="Enumerations\EntityState.Type\RadioNomenclatureVersion.cs" />
-    <Compile Include="Enumerations\EntityState.Type\SensorEmitterCategory.cs" />
-    <Compile Include="Enumerations\EntityState.Type\SpacePlatform.cs" />
-    <Compile Include="Enumerations\EntityState.Type\SubsufracePlatform.cs" />
-    <Compile Include="Enumerations\EntityState.Type\SurfacePlatform.cs" />
-    <Compile Include="Enumerations\EntityState.Type\UKWeaponsForLifeForms.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState.Type\USWeaponsForLifeForms.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState\ArticulatedPartIndex.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState\ArticulatedPartOffset.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState\AttachedParts.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState\DeadReckoningAlgorithm.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState\EntityCapabilities.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState\EntityForceId.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\EntityState\ParameterTypeDesignator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Environment.Gridded\ConstantGrid.cs" />
-    <Compile Include="Enumerations\Environment.Gridded\CoordinateSystem.cs" />
-    <Compile Include="Enumerations\Environment.Gridded\DataRepresentationType.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\AirBurstAndGroundBurst.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\ArealObjectStatePDUModificationField.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Environment.ObjectState\Crater.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\ExhaustSmoke.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\GeneralAppearance.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\LinearObjectStatePDUModificationField.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Environment.ObjectState\LogCribAbatisVehicleDefiladeAndInfantryFightingPosition.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\Minefield.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\MinefieldLaneMarker.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\ObjectKind.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Environment.ObjectState\PointObjectStatePDUModificationField.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Environment.ObjectState\RibbonBridge.cs" />
-    <Compile Include="Enumerations\Environment.ObjectState\TankDitchAndConcertinaWire.cs" />
-    <Compile Include="Enumerations\Environment.Process\EnvironmentalProcessTypesForGeometryRecord.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Environment.Process\EnvironmentalProcessTypesForStateRecord.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Environment.Process\EnvironmentStatus.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Logistics\AuxilaryCraftRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\DriveTrainRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\ElectronicsRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\FuelSystemRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\GeneralRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\HullAirframeBodyRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\HydraulicSystemsAndActuators.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Logistics\InterfacesWithEnvironmentRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\LifeSupportRepairCode.cs" />
-    <Compile Include="Enumerations\Logistics\ResponseResultCode.cs" />
-    <Compile Include="Enumerations\Logistics\ServiceRequestType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Logistics\WeaponRepairCode.cs" />
-    <Compile Include="Enumerations\PduType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\ProtocolFamily.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\ProtocolVersion.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Intercom\Command.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Intercom\CommunicationsType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Intercom\ControlType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Intercom\DestinationLineStateCommand.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Intercom\RecordType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Intercom\TransmitLineState.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\AntennaPatternType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\ClearChannel.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\CryptoSystem.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\DetailedModulationForAmplitudeAndAngleModulation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\DetailedModulationForAmplitudeModulation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\DetailedModulationForAngleModulation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\DetailedModulationForCarrierPhaseShift.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\DetailedModulationForCombinationModulation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\DetailedModulationForPulseModulation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\DetailedModulationForUnmodulatedModulation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\InputSource.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\JtidsSynchronizationState.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\JtidsTransmittingTerminalPrimaryMode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\JtidsTransmittingTerminalSecondaryMode.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\MajorModulation.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\RadioSignalEncoding.cs" />
-    <Compile Include="Enumerations\Radio.Transmitter\ReferenceSystem.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\SpreadSpectrum.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\StartOfMessage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\TDLType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\TransmitState.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\TransmitterModulationSystemType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio.Transmitter\UserProtocolIdentificationNumber.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Radio\ReceiverState.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\SimulationManagement\AcknowledgeFlag.cs" />
-    <Compile Include="Enumerations\SimulationManagement\ActionId.cs" />
-    <Compile Include="Enumerations\SimulationManagement\ActionResponseRequestStatus.cs" />
-    <Compile Include="Enumerations\SimulationManagement\DatumSpecificationRecord.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\SimulationManagement\EventType.cs" />
-    <Compile Include="Enumerations\SimulationManagement\FrozenBehavior.cs" />
-    <Compile Include="Enumerations\SimulationManagement\RequiredReliabilityService.cs" />
-    <Compile Include="Enumerations\SimulationManagement\ResponseFlag.cs" />
-    <Compile Include="Enumerations\SimulationManagement\StopFreezeReason.cs" />
-    <Compile Include="Enumerations\Warfare\DetonationResult.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Warfare\Fuse.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Enumerations\Warfare\Warhead.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Dis1995\EntityID.cs" />
-    <Compile Include="Dis1995\Vector3Double.cs" />
-    <Compile Include="Dis1998\EntityID.cs" />
-    <Compile Include="Dis1998\Vector3Double.cs" />
-    <Compile Include="Dis1998\Vector3Float.cs" />
-    <Compile Include="Dis1995\Vector3Float.cs" />
-    <Compile Include="Properties\Version.cs" />
-    <Compile Include="Core\EnumNotFoundException.cs" />
-    <Compile Include="Core\InternetDomainCodeAttribute.cs" />
-    <Compile Include="Core\EnumHelper.cs" />
-    <Compile Include="Utilities\CoordinateConversions.cs" />
-    <Compile Include="Utilities\DataInputStream.cs" />
-    <Compile Include="Utilities\DataOutputStream.cs" />
-    <Compile Include="Utilities\DataStream.cs" />
-    <Compile Include="Core\EndianTypes.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities\ChunkConverters.cs" />
-    <Compile Include="Utilities\Conversion.cs" />
-    <Compile Include="Utilities\PDUProcessor.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <CodeAnalysisDictionary Include="FxCopCustomDictionary.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Enumerations\Cet2006\cet.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Enumerations\Cet2010\cet.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="FxCop OpenDis Analysis.FxCop" />
-    <None Include="key.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Dis2009\" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Enumerations\Cet2006\AggregateTypes.xml" />
-    <EmbeddedResource Include="Enumerations\Cet2006\EntityTypes.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Enumerations\Cet2010\AggregateTypes.xml" />
-    <EmbeddedResource Include="Enumerations\Cet2010\EntityTypes.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" Condition=" '$(Configuration)|$(Platform)' == 'Analysis|x86' " />
-</Project>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Properties/AssemblyInfo.cs b/Libs/CsharpDis6/OpenDis/Properties/AssemblyInfo.cs
deleted file mode 100644
index e82a9c0..0000000
--- a/Libs/CsharpDis6/OpenDis/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Open DIS Library")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Blubit d.o.o.")]
-[assembly: AssemblyProduct("Open DIS, http://open-dis.sourceforge.org")]
-[assembly: AssemblyCopyright("Copyright © Blubit d.o.o. 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-[assembly: CLSCompliant(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("719719e6-e1a9-4428-aa7a-e8d2defd1b75")]
diff --git a/Libs/CsharpDis6/OpenDis/Properties/Version.cs b/Libs/CsharpDis6/OpenDis/Properties/Version.cs
deleted file mode 100644
index 87478fc..0000000
--- a/Libs/CsharpDis6/OpenDis/Properties/Version.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
diff --git a/Libs/CsharpDis6/OpenDis/Settings.StyleCop b/Libs/CsharpDis6/Settings.StyleCop
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Settings.StyleCop
rename to Libs/CsharpDis6/Settings.StyleCop
index bf4ade9..a0b5e0b 100644
--- a/Libs/CsharpDis6/OpenDis/Settings.StyleCop
+++ b/Libs/CsharpDis6/Settings.StyleCop
@@ -1,145 +1,145 @@
-<StyleCopSettings Version="4.3">
-  <GlobalSettings>
-    <BooleanProperty Name="WriteCache">False</BooleanProperty>
-  </GlobalSettings>
-  <Parsers>
-    <Parser ParserId="Microsoft.StyleCop.CSharp.CsParser">
-      <ParserSettings>
-        <BooleanProperty Name="AnalyzeDesignerFiles">False</BooleanProperty>
-        <BooleanProperty Name="AnalyzeGeneratedFiles">True</BooleanProperty>
-      </ParserSettings>
-    </Parser>
-  </Parsers>
-  <Analyzers>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.NamingRules">
-      <Rules>
-        <Rule Name="FieldNamesMustNotBeginWithUnderscore">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FieldNamesMustNotContainUnderscore">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings>
-        <CollectionProperty Name="Hungarian">
-          <Value>h</Value>
-          <Value>o</Value>
-        </CollectionProperty>
-      </AnalyzerSettings>
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.OrderingRules">
-      <Rules>
-        <Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustBeOrderedByAccess">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustAppearInTheCorrectOrder">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.LayoutRules">
-      <Rules>
-        <Rule Name="SingleLineCommentsMustNotBeFollowedByBlankLine">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.SpacingRules">
-      <Rules>
-        <Rule Name="TabsMustNotBeUsed">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="SingleLineCommentsMustBeginWithSingleSpace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.DocumentationRules">
-      <Rules>
-        <Rule Name="ElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileMustHaveHeader">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustShowCopyright">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustHaveCopyrightText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustContainFileName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileHeaderMustHaveValidCompanyText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustMeetMinimumCharacterLength">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustContainWhitespace">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationMustMeetCharacterPercentage">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.ReadabilityRules">
-      <Rules>
-        <Rule Name="ParameterMustNotSpanMultipleLines">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-  </Analyzers>
+<StyleCopSettings Version="4.3">
+  <GlobalSettings>
+    <BooleanProperty Name="WriteCache">False</BooleanProperty>
+  </GlobalSettings>
+  <Parsers>
+    <Parser ParserId="Microsoft.StyleCop.CSharp.CsParser">
+      <ParserSettings>
+        <BooleanProperty Name="AnalyzeDesignerFiles">False</BooleanProperty>
+        <BooleanProperty Name="AnalyzeGeneratedFiles">True</BooleanProperty>
+      </ParserSettings>
+    </Parser>
+  </Parsers>
+  <Analyzers>
+    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.NamingRules">
+      <Rules>
+        <Rule Name="FieldNamesMustNotBeginWithUnderscore">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FieldNamesMustNotContainUnderscore">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings>
+        <CollectionProperty Name="Hungarian">
+          <Value>h</Value>
+          <Value>o</Value>
+        </CollectionProperty>
+      </AnalyzerSettings>
+    </Analyzer>
+    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.OrderingRules">
+      <Rules>
+        <Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustBeOrderedByAccess">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustAppearInTheCorrectOrder">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.LayoutRules">
+      <Rules>
+        <Rule Name="SingleLineCommentsMustNotBeFollowedByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.SpacingRules">
+      <Rules>
+        <Rule Name="TabsMustNotBeUsed">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="SingleLineCommentsMustBeginWithSingleSpace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.DocumentationRules">
+      <Rules>
+        <Rule Name="ElementsMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileMustHaveHeader">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustShowCopyright">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveCopyrightText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustContainFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderFileNameDocumentationMustMatchFileName">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FileHeaderMustHaveValidCompanyText">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationTextMustMeetMinimumCharacterLength">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationTextMustContainWhitespace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="DocumentationMustMeetCharacterPercentage">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.ReadabilityRules">
+      <Rules>
+        <Rule Name="ParameterMustNotSpanMultipleLines">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+  </Analyzers>
 </StyleCopSettings>
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Utilities/ChunkConverters.cs b/Libs/CsharpDis6/Utilities/ChunkConverters.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Utilities/ChunkConverters.cs
rename to Libs/CsharpDis6/Utilities/ChunkConverters.cs
index 26c5240..a0c314e 100644
--- a/Libs/CsharpDis6/OpenDis/Utilities/ChunkConverters.cs
+++ b/Libs/CsharpDis6/Utilities/ChunkConverters.cs
@@ -1,327 +1,327 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenDis.Dis1998;
-
-namespace OpenDis.Core
-{
-    /// <summary>
-    /// Chunk Convertor for DIS 1998 (note: same methods could be reused with 1995).
-    /// </summary>
-    public static class DIS1998ChunkConverter
-    {
-		#region�Methods�(9)��
-
-        /// <summary>
-        /// Method to convert a byte Array into Eigh tByte Chunks
-        /// </summary>
-        /// <param name="data">Byte array that contains data to convert</param>
-        /// <returns>List containing EightByteChunks</returns>
-        public static List<EightByteChunk> ArrayToEightByteChunks(Array data)
-        {
-            //If no data exists return null
-            if (data.Length == 0)
-            {
-                return null;
-            }
-
-            // Used to get the length of the data
-            EightByteChunk byteChunkData = new EightByteChunk();
-            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
-
-            // Calculate the size if not on the byte boundary then all 1 to make it so
-            int maxSize = System.Convert.ToInt32(Math.Ceiling((double)data.Length / (double)lengthByteChunkData)); //PES09182009 Modified so it would also work on Mobile
-
-            // Create buffer to hold the data passed in from the array
-            byte[] chunkBuffer = new byte[maxSize * lengthByteChunkData];
-
-            // Copy data to the buffer created above
-            Buffer.BlockCopy(data, 0, chunkBuffer, 0, data.Length);
-
-            List<EightByteChunk> byteChunkList = new List<EightByteChunk>();
-
-            // Iterate over the buffer and grab the appropriate number of bytes, store into the List
-            for (int i = 0; i < maxSize; i++)
-            {
-                byteChunkData = new EightByteChunk();
-                Buffer.BlockCopy(chunkBuffer, i * lengthByteChunkData, byteChunkData.OtherParameters, 0, lengthByteChunkData);
-
-                byteChunkList.Add(byteChunkData);
-            }
-
-            return byteChunkList;
-        }
-
-        /// <summary>
-        /// Method to convert a byte Array into Four tByte Chunks
-        /// </summary>
-        /// <param name="data">Byte array that contains data to convert</param>
-        /// <returns>List containing FourByteChunks</returns>
-        public static List<FourByteChunk> ArrayToFourByteChunks(Array data)
-        {
-            if (data.Length == 0)
-            {
-                return null;
-            }
-
-            FourByteChunk byteChunkData = new FourByteChunk();
-            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
-
-            // PES09182009 Modified so it would also work on Mobile
-            int maxSize = System.Convert.ToInt32(Math.Ceiling((double)data.Length / (double)lengthByteChunkData));
-
-            byte[] chunkBuffer = new byte[maxSize * lengthByteChunkData];
-            Buffer.BlockCopy(data, 0, chunkBuffer, 0, data.Length);
-
-            List<FourByteChunk> byteChunkList = new List<FourByteChunk>();
-
-            for (int i = 0; i < maxSize; i++)
-            {
-                byteChunkData = new FourByteChunk();
-                Buffer.BlockCopy(chunkBuffer, i * lengthByteChunkData, byteChunkData.OtherParameters, 0, lengthByteChunkData);
-
-                byteChunkList.Add(byteChunkData);
-            }
-
-            return byteChunkList;
-        }
-
-        /// <summary>
-        /// Method to convert a byte Array into Two tByte Chunks
-        /// </summary>
-        /// <param name="data">Byte array that contains data to convert</param>
-        /// <returns>List containing TwoByteChunks</returns>
-        public static List<TwoByteChunk> ArrayToTwoByteChunks(Array data)
-        {
-            if (data.Length == 0)
-            {
-                return null;
-            }
-
-            TwoByteChunk byteChunkData = new TwoByteChunk();
-            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
-
-            // PES09182009 Modified so it would also work on Mobile
-            int maxSize = System.Convert.ToInt32(Math.Ceiling((double)data.Length / (double)lengthByteChunkData));
-
-            byte[] chunkBuffer = new byte[maxSize * lengthByteChunkData];
-            Buffer.BlockCopy(data, 0, chunkBuffer, 0, data.Length);
-
-            List<TwoByteChunk> byteChunkList = new List<TwoByteChunk>();
-
-            for (int i = 0; i < maxSize; i++)
-            {
-                byteChunkData = new TwoByteChunk();
-                Buffer.BlockCopy(chunkBuffer, i * lengthByteChunkData, byteChunkData.OtherParameters, 0, lengthByteChunkData);
-
-                byteChunkList.Add(byteChunkData);
-            }
-
-            return byteChunkList;
-        }
-
-        /// <summary>
-        /// Method to convert Eight Byte Chunks into an Array
-        /// </summary>
-        /// <param name="chunkList">List that holds the EightByteChunks</param>
-        /// <returns>Byte array</returns>
-        public static Array EightByteChunksToArray(List<EightByteChunk> chunkList)
-        {
-            EightByteChunk byteChunkData = new EightByteChunk();
-            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
-
-            //Data passed in does not exist.
-            if (chunkList.Count == 0)
-            {
-                return null;
-            }
-
-            // Create the appropriate sized buffer for this type
-            byte[] chunkBuffer = new byte[chunkList.Count * lengthByteChunkData];
-
-            // Go through each item and append to the buffer
-            for (int i = 0; i < chunkList.Count; i++)
-            {
-                Buffer.BlockCopy(chunkList[i].OtherParameters, 0, chunkBuffer, i * lengthByteChunkData, lengthByteChunkData);
-            }
-
-            return (Array)chunkBuffer;
-        }
-
-        /// <summary>
-        /// Method to convert Four Byte Chunks into an Array
-        /// </summary>
-        /// <param name="chunkList">List that holds the FourByteChunks</param>
-        /// <returns>Byte array</returns>
-        public static Array FourByteChunksToArray(List<FourByteChunk> chunkList)
-        {
-            FourByteChunk byteChunkData = new FourByteChunk();
-            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
-
-            // Data passed in does not exist.
-            if (chunkList.Count == 0)
-            {
-                return null;
-            }
-
-            byte[] chunkBuffer = new byte[chunkList.Count * lengthByteChunkData];
-
-            for (int i = 0; i < chunkList.Count; i++)
-            {
-                Buffer.BlockCopy(chunkList[i].OtherParameters, 0, chunkBuffer, i * lengthByteChunkData, lengthByteChunkData);
-            }
-
-            return (Array)chunkBuffer;
-        }
-
-        /// <summary>
-        /// Method to convert a string into Eight Byte Chunks into an Array.  This method was provided as a means to transport 'other'
-        /// types of data via a PDU that uses variable or fixed Datum.
-        /// </summary>
-        /// <param name="data">String data to convert</param>
-        /// <returns>List of EightByteChunk data</returns>
-        public static List<EightByteChunk> StringToEightByteChunks(string data)
-        {
-            // If data does not exist return null
-            if (data.Length == 0)
-            {
-                return null;
-            }
-
-            // Using standard ascii encoding
-            System.Text.ASCIIEncoding encoding = new ASCIIEncoding();
-
-            // Convert string into bytes
-            Array dataArray = encoding.GetBytes(data);
-
-            return ArrayToEightByteChunks(dataArray);
-        }
-
-        /// <summary>
-        /// Method to convert a string into Four Byte Chunks into an Array.  This method was provided as a means to transport 'other'
-        /// types of data via a PDU that uses variable or fixed Datum.
-        /// </summary>
-        /// <param name="data">String data to convert</param>
-        /// <returns>List of FourByteChunk data</returns>
-        public static List<FourByteChunk> StringToFourByteChunks(string data)
-        {
-            if (data.Length == 0)
-            {
-                return null;
-            }
-
-            System.Text.ASCIIEncoding encoding = new ASCIIEncoding();
-            Array dataArray = encoding.GetBytes(data);
-
-            return ArrayToFourByteChunks(dataArray);
-        }
-
-        /// <summary>
-        /// Method to convert a string into Two Byte Chunks into an Array.  This method was provided as a means to transport 'other'
-        /// types of data via a PDU that uses variable or fixed Datum.
-        /// </summary>
-        /// <param name="data">String data to convert</param>
-        /// <returns>List of TwoByteChunk data</returns>
-        public static List<TwoByteChunk> StringToTwoByteChunks(string data)
-        {
-            if (data.Length == 0)
-            {
-                return null;
-            }
-
-            System.Text.ASCIIEncoding encoding = new ASCIIEncoding();
-            Array dataArray = encoding.GetBytes(data);
-
-            return ArrayToTwoByteChunks(dataArray);
-        }
-
-        /// <summary>
-        /// Method to convert Two Byte Chunks into an Array
-        /// </summary>
-        /// <param name="chunkList">List that holds the TwoByteChunks</param>
-        /// <returns>Byte array</returns>
-        public static Array TwoByteChunksToArray(List<TwoByteChunk> chunkList)
-        {
-            TwoByteChunk byteChunkData = new TwoByteChunk();
-            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
-
-            // Data passed in does not exist.
-            if (chunkList.Count == 0)
-            {
-                return null;
-            }
-
-            byte[] chunkBuffer = new byte[chunkList.Count * lengthByteChunkData];
-
-            for (int i = 0; i < chunkList.Count; i++)
-            {
-                Buffer.BlockCopy(chunkList[i].OtherParameters, 0, chunkBuffer, i * lengthByteChunkData, lengthByteChunkData);
-            }
-
-            return (Array)chunkBuffer;
-        }
-
-		#endregion�Methods�
-    }
-
-    ///// <summary>
-    ///// Class originally created to provide chunk data using reflection.  The method below does work, however I could not find a way to
-    ///// use reflection going from an Array to the appropriate chunk type data (eg. EightByteChunk).
-    ///// </summary>
-    ///// <typeparam name="T">Type of Chunk data (eg. EightByteChunk)</typeparam>
-    //public class ChunkConvertersUsingReflection<T> where T : class
-    //{
-    //    public Array ByteChunksToArrayUsingReflection(List<T> chunkList)
-    //    {
-    //        T[] bufferArray = new T[chunkList.Count];
-    //        //Requires knowledge of the Property of the class.  In the Chunk classes each one contains the 'OtherParameters' property.  Note that
-    //        //data has to exist within this otherwise an error will occur.  Try catch could be implemented.
-    //        byte[] otherParameter = (byte[])chunkList[0].GetType().GetProperty("OtherParameters", System.Reflection.BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public | BindingFlags.Default).GetValue(chunkList[0], null);
-    //        byte[] chunkBuffer = new byte[chunkList.Count * otherParameter.Length];
-    //        for (int i = 0; i < bufferArray.Length; i++)
-    //        {
-    //            //Get the underlining data
-    //            byte[] data = (byte[])chunkList[i].GetType().GetProperty("OtherParameters", System.Reflection.BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public | BindingFlags.Default).GetValue(chunkList[i], null);
-    //            Buffer.BlockCopy(data, 0, chunkBuffer, i * otherParameter.Length, otherParameter.Length);
-    //        }
-    //        return chunkBuffer;
-    //    }
-    //}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenDis.Dis1998;
+
+namespace OpenDis.Core
+{
+    /// <summary>
+    /// Chunk Convertor for DIS 1998 (note: same methods could be reused with 1995).
+    /// </summary>
+    public static class DIS1998ChunkConverter
+    {
+		#region�Methods�(9)��
+
+        /// <summary>
+        /// Method to convert a byte Array into Eigh tByte Chunks
+        /// </summary>
+        /// <param name="data">Byte array that contains data to convert</param>
+        /// <returns>List containing EightByteChunks</returns>
+        public static List<EightByteChunk> ArrayToEightByteChunks(Array data)
+        {
+            //If no data exists return null
+            if (data.Length == 0)
+            {
+                return null;
+            }
+
+            // Used to get the length of the data
+            EightByteChunk byteChunkData = new EightByteChunk();
+            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
+
+            // Calculate the size if not on the byte boundary then all 1 to make it so
+            int maxSize = System.Convert.ToInt32(Math.Ceiling((double)data.Length / (double)lengthByteChunkData)); //PES09182009 Modified so it would also work on Mobile
+
+            // Create buffer to hold the data passed in from the array
+            byte[] chunkBuffer = new byte[maxSize * lengthByteChunkData];
+
+            // Copy data to the buffer created above
+            Buffer.BlockCopy(data, 0, chunkBuffer, 0, data.Length);
+
+            List<EightByteChunk> byteChunkList = new List<EightByteChunk>();
+
+            // Iterate over the buffer and grab the appropriate number of bytes, store into the List
+            for (int i = 0; i < maxSize; i++)
+            {
+                byteChunkData = new EightByteChunk();
+                Buffer.BlockCopy(chunkBuffer, i * lengthByteChunkData, byteChunkData.OtherParameters, 0, lengthByteChunkData);
+
+                byteChunkList.Add(byteChunkData);
+            }
+
+            return byteChunkList;
+        }
+
+        /// <summary>
+        /// Method to convert a byte Array into Four tByte Chunks
+        /// </summary>
+        /// <param name="data">Byte array that contains data to convert</param>
+        /// <returns>List containing FourByteChunks</returns>
+        public static List<FourByteChunk> ArrayToFourByteChunks(Array data)
+        {
+            if (data.Length == 0)
+            {
+                return null;
+            }
+
+            FourByteChunk byteChunkData = new FourByteChunk();
+            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
+
+            // PES09182009 Modified so it would also work on Mobile
+            int maxSize = System.Convert.ToInt32(Math.Ceiling((double)data.Length / (double)lengthByteChunkData));
+
+            byte[] chunkBuffer = new byte[maxSize * lengthByteChunkData];
+            Buffer.BlockCopy(data, 0, chunkBuffer, 0, data.Length);
+
+            List<FourByteChunk> byteChunkList = new List<FourByteChunk>();
+
+            for (int i = 0; i < maxSize; i++)
+            {
+                byteChunkData = new FourByteChunk();
+                Buffer.BlockCopy(chunkBuffer, i * lengthByteChunkData, byteChunkData.OtherParameters, 0, lengthByteChunkData);
+
+                byteChunkList.Add(byteChunkData);
+            }
+
+            return byteChunkList;
+        }
+
+        /// <summary>
+        /// Method to convert a byte Array into Two tByte Chunks
+        /// </summary>
+        /// <param name="data">Byte array that contains data to convert</param>
+        /// <returns>List containing TwoByteChunks</returns>
+        public static List<TwoByteChunk> ArrayToTwoByteChunks(Array data)
+        {
+            if (data.Length == 0)
+            {
+                return null;
+            }
+
+            TwoByteChunk byteChunkData = new TwoByteChunk();
+            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
+
+            // PES09182009 Modified so it would also work on Mobile
+            int maxSize = System.Convert.ToInt32(Math.Ceiling((double)data.Length / (double)lengthByteChunkData));
+
+            byte[] chunkBuffer = new byte[maxSize * lengthByteChunkData];
+            Buffer.BlockCopy(data, 0, chunkBuffer, 0, data.Length);
+
+            List<TwoByteChunk> byteChunkList = new List<TwoByteChunk>();
+
+            for (int i = 0; i < maxSize; i++)
+            {
+                byteChunkData = new TwoByteChunk();
+                Buffer.BlockCopy(chunkBuffer, i * lengthByteChunkData, byteChunkData.OtherParameters, 0, lengthByteChunkData);
+
+                byteChunkList.Add(byteChunkData);
+            }
+
+            return byteChunkList;
+        }
+
+        /// <summary>
+        /// Method to convert Eight Byte Chunks into an Array
+        /// </summary>
+        /// <param name="chunkList">List that holds the EightByteChunks</param>
+        /// <returns>Byte array</returns>
+        public static Array EightByteChunksToArray(List<EightByteChunk> chunkList)
+        {
+            EightByteChunk byteChunkData = new EightByteChunk();
+            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
+
+            //Data passed in does not exist.
+            if (chunkList.Count == 0)
+            {
+                return null;
+            }
+
+            // Create the appropriate sized buffer for this type
+            byte[] chunkBuffer = new byte[chunkList.Count * lengthByteChunkData];
+
+            // Go through each item and append to the buffer
+            for (int i = 0; i < chunkList.Count; i++)
+            {
+                Buffer.BlockCopy(chunkList[i].OtherParameters, 0, chunkBuffer, i * lengthByteChunkData, lengthByteChunkData);
+            }
+
+            return (Array)chunkBuffer;
+        }
+
+        /// <summary>
+        /// Method to convert Four Byte Chunks into an Array
+        /// </summary>
+        /// <param name="chunkList">List that holds the FourByteChunks</param>
+        /// <returns>Byte array</returns>
+        public static Array FourByteChunksToArray(List<FourByteChunk> chunkList)
+        {
+            FourByteChunk byteChunkData = new FourByteChunk();
+            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
+
+            // Data passed in does not exist.
+            if (chunkList.Count == 0)
+            {
+                return null;
+            }
+
+            byte[] chunkBuffer = new byte[chunkList.Count * lengthByteChunkData];
+
+            for (int i = 0; i < chunkList.Count; i++)
+            {
+                Buffer.BlockCopy(chunkList[i].OtherParameters, 0, chunkBuffer, i * lengthByteChunkData, lengthByteChunkData);
+            }
+
+            return (Array)chunkBuffer;
+        }
+
+        /// <summary>
+        /// Method to convert a string into Eight Byte Chunks into an Array.  This method was provided as a means to transport 'other'
+        /// types of data via a PDU that uses variable or fixed Datum.
+        /// </summary>
+        /// <param name="data">String data to convert</param>
+        /// <returns>List of EightByteChunk data</returns>
+        public static List<EightByteChunk> StringToEightByteChunks(string data)
+        {
+            // If data does not exist return null
+            if (data.Length == 0)
+            {
+                return null;
+            }
+
+            // Using standard ascii encoding
+            System.Text.ASCIIEncoding encoding = new ASCIIEncoding();
+
+            // Convert string into bytes
+            Array dataArray = encoding.GetBytes(data);
+
+            return ArrayToEightByteChunks(dataArray);
+        }
+
+        /// <summary>
+        /// Method to convert a string into Four Byte Chunks into an Array.  This method was provided as a means to transport 'other'
+        /// types of data via a PDU that uses variable or fixed Datum.
+        /// </summary>
+        /// <param name="data">String data to convert</param>
+        /// <returns>List of FourByteChunk data</returns>
+        public static List<FourByteChunk> StringToFourByteChunks(string data)
+        {
+            if (data.Length == 0)
+            {
+                return null;
+            }
+
+            System.Text.ASCIIEncoding encoding = new ASCIIEncoding();
+            Array dataArray = encoding.GetBytes(data);
+
+            return ArrayToFourByteChunks(dataArray);
+        }
+
+        /// <summary>
+        /// Method to convert a string into Two Byte Chunks into an Array.  This method was provided as a means to transport 'other'
+        /// types of data via a PDU that uses variable or fixed Datum.
+        /// </summary>
+        /// <param name="data">String data to convert</param>
+        /// <returns>List of TwoByteChunk data</returns>
+        public static List<TwoByteChunk> StringToTwoByteChunks(string data)
+        {
+            if (data.Length == 0)
+            {
+                return null;
+            }
+
+            System.Text.ASCIIEncoding encoding = new ASCIIEncoding();
+            Array dataArray = encoding.GetBytes(data);
+
+            return ArrayToTwoByteChunks(dataArray);
+        }
+
+        /// <summary>
+        /// Method to convert Two Byte Chunks into an Array
+        /// </summary>
+        /// <param name="chunkList">List that holds the TwoByteChunks</param>
+        /// <returns>Byte array</returns>
+        public static Array TwoByteChunksToArray(List<TwoByteChunk> chunkList)
+        {
+            TwoByteChunk byteChunkData = new TwoByteChunk();
+            int lengthByteChunkData = byteChunkData.OtherParameters.Length;
+
+            // Data passed in does not exist.
+            if (chunkList.Count == 0)
+            {
+                return null;
+            }
+
+            byte[] chunkBuffer = new byte[chunkList.Count * lengthByteChunkData];
+
+            for (int i = 0; i < chunkList.Count; i++)
+            {
+                Buffer.BlockCopy(chunkList[i].OtherParameters, 0, chunkBuffer, i * lengthByteChunkData, lengthByteChunkData);
+            }
+
+            return (Array)chunkBuffer;
+        }
+
+		#endregion�Methods�
+    }
+
+    ///// <summary>
+    ///// Class originally created to provide chunk data using reflection.  The method below does work, however I could not find a way to
+    ///// use reflection going from an Array to the appropriate chunk type data (eg. EightByteChunk).
+    ///// </summary>
+    ///// <typeparam name="T">Type of Chunk data (eg. EightByteChunk)</typeparam>
+    //public class ChunkConvertersUsingReflection<T> where T : class
+    //{
+    //    public Array ByteChunksToArrayUsingReflection(List<T> chunkList)
+    //    {
+    //        T[] bufferArray = new T[chunkList.Count];
+    //        //Requires knowledge of the Property of the class.  In the Chunk classes each one contains the 'OtherParameters' property.  Note that
+    //        //data has to exist within this otherwise an error will occur.  Try catch could be implemented.
+    //        byte[] otherParameter = (byte[])chunkList[0].GetType().GetProperty("OtherParameters", System.Reflection.BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public | BindingFlags.Default).GetValue(chunkList[0], null);
+    //        byte[] chunkBuffer = new byte[chunkList.Count * otherParameter.Length];
+    //        for (int i = 0; i < bufferArray.Length; i++)
+    //        {
+    //            //Get the underlining data
+    //            byte[] data = (byte[])chunkList[i].GetType().GetProperty("OtherParameters", System.Reflection.BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public | BindingFlags.Default).GetValue(chunkList[i], null);
+    //            Buffer.BlockCopy(data, 0, chunkBuffer, i * otherParameter.Length, otherParameter.Length);
+    //        }
+    //        return chunkBuffer;
+    //    }
+    //}
 }
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/Utilities/Conversion.cs b/Libs/CsharpDis6/Utilities/Conversion.cs
similarity index 98%
rename from Libs/CsharpDis6/OpenDis/Utilities/Conversion.cs
rename to Libs/CsharpDis6/Utilities/Conversion.cs
index cd44e04..b851a5a 100644
--- a/Libs/CsharpDis6/OpenDis/Utilities/Conversion.cs
+++ b/Libs/CsharpDis6/Utilities/Conversion.cs
@@ -1,110 +1,110 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenDis.Core
-{
-    public static class Conversion
-    {
-		#region�Fields�(2)�
-
-         /// <summary>
-         /// The mask that will leave only the type metric from an 
-         /// integer representing the Articulation Parameter's parameter type.
-         /// This mask is based on the IEEE Std 1278.1-1995
-        /// </summary>
-        public const int ARTICULATION_PARAMETER_TYPE_METRIC_MASK = 0x001F;
-
-        /// <summary>
-        /// The number of bits used to store the type metric value
-        /// within the Articulation Parameter's parameter type value.
-        /// This mask is based on the IEEE Std 1278.1-1995
-        /// </summary>
-        public const byte ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5;
-
-		#endregion�Fields�
-
-		#region�Methods�(3)�
-
-        /// <summary>
-        /// Extracts the data for the type class value stored within the parameter type value.
-        /// This an inverse to the function <see cref="MakeArticulationParameterType"/>.
-        /// </summary>
-        /// <param name="parametertype">The value storing the type metric and type class values.</param>
-        /// <returns>The type class value, with ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision.</returns> 
-        public static int GetArticulationTypeClass(int parametertype)
-        {
-            // wipe off the typemetric bits and return the typeclass bits
-            return parametertype >> ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS;
-        }
-
-        /// <summary>
-        /// Extracts the data for the type metric value stored within the parameter type value.
-        /// This an inverse to the function <see cref="MakeArticulationParameterType"/>.
-        /// </summary>
-        /// <param name="parametertype">The value storing the type metric and type class values.</param> 
-        /// <returns>The type metric value, with ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision.</returns>
-        public static int GetArticulationTypeMetric(int parametertype)
-        {
-            // wipe off the typeclass bits and return the typemetric bits
-            return parametertype & ARTICULATION_PARAMETER_TYPE_METRIC_MASK;
-        }
-
-        /// <summary>
-        /// Make the value needed for the ArticulationParameter's Parameter Type.
-        /// <param name="typeclass">The enumeration for the articulated part.
-        /// This must have less precision than ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS.</param>
-        /// <param name="typemetric">The enumeration for the motion description.
-        /// This must have less precision than 32 - ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS.</param>
-        /// <returns>The value to be used as the Parameter Type, with 32 bits precision.</returns>
-        public static uint MakeArticulationParameterType(uint typeclass, uint typemetric)
-        {
-            // enforce a ceiling on typemetric
-            typemetric = typemetric & ARTICULATION_PARAMETER_TYPE_METRIC_MASK;
-
-            // shift the typeclass bits to the left by the precision amount of typemetric
-            // and then add the typemetric bits
-            return ((typeclass << ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS)
-                   + typemetric);
-        }
-
-		#endregion�Methods�
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenDis.Core
+{
+    public static class Conversion
+    {
+		#region�Fields�(2)�
+
+         /// <summary>
+         /// The mask that will leave only the type metric from an 
+         /// integer representing the Articulation Parameter's parameter type.
+         /// This mask is based on the IEEE Std 1278.1-1995
+        /// </summary>
+        public const int ARTICULATION_PARAMETER_TYPE_METRIC_MASK = 0x001F;
+
+        /// <summary>
+        /// The number of bits used to store the type metric value
+        /// within the Articulation Parameter's parameter type value.
+        /// This mask is based on the IEEE Std 1278.1-1995
+        /// </summary>
+        public const byte ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS = 5;
+
+		#endregion�Fields�
+
+		#region�Methods�(3)�
+
+        /// <summary>
+        /// Extracts the data for the type class value stored within the parameter type value.
+        /// This an inverse to the function <see cref="MakeArticulationParameterType"/>.
+        /// </summary>
+        /// <param name="parametertype">The value storing the type metric and type class values.</param>
+        /// <returns>The type class value, with ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision.</returns> 
+        public static int GetArticulationTypeClass(int parametertype)
+        {
+            // wipe off the typemetric bits and return the typeclass bits
+            return parametertype >> ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS;
+        }
+
+        /// <summary>
+        /// Extracts the data for the type metric value stored within the parameter type value.
+        /// This an inverse to the function <see cref="MakeArticulationParameterType"/>.
+        /// </summary>
+        /// <param name="parametertype">The value storing the type metric and type class values.</param> 
+        /// <returns>The type metric value, with ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS bits precision.</returns>
+        public static int GetArticulationTypeMetric(int parametertype)
+        {
+            // wipe off the typeclass bits and return the typemetric bits
+            return parametertype & ARTICULATION_PARAMETER_TYPE_METRIC_MASK;
+        }
+
+        /// <summary>
+        /// Make the value needed for the ArticulationParameter's Parameter Type.
+        /// <param name="typeclass">The enumeration for the articulated part.
+        /// This must have less precision than ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS.</param>
+        /// <param name="typemetric">The enumeration for the motion description.
+        /// This must have less precision than 32 - ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS.</param>
+        /// <returns>The value to be used as the Parameter Type, with 32 bits precision.</returns>
+        public static uint MakeArticulationParameterType(uint typeclass, uint typemetric)
+        {
+            // enforce a ceiling on typemetric
+            typemetric = typemetric & ARTICULATION_PARAMETER_TYPE_METRIC_MASK;
+
+            // shift the typeclass bits to the left by the precision amount of typemetric
+            // and then add the typemetric bits
+            return ((typeclass << ARTICULATION_PARAMETER_TYPE_METRIC_NUMBER_OF_BITS)
+                   + typemetric);
+        }
+
+		#endregion�Methods�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Utilities/CoordinateConversions.cs b/Libs/CsharpDis6/Utilities/CoordinateConversions.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Utilities/CoordinateConversions.cs
rename to Libs/CsharpDis6/Utilities/CoordinateConversions.cs
index 6f7a548..a206282 100644
--- a/Libs/CsharpDis6/OpenDis/Utilities/CoordinateConversions.cs
+++ b/Libs/CsharpDis6/Utilities/CoordinateConversions.cs
@@ -1,142 +1,142 @@
-using System;
-
-namespace OpenDis.Core
-{
-    /// <summary>
-    /// Converts DIS (x,y,z) rectilinear coordinates (earth-centered RH coordinate system)
-    /// to latitude and longitude, in radians. 
-    /// @author loyaj
-    /// </summary>
-    public class CoordinateConversions
-    {
-        public static readonly double RADIANS_TO_DEGREES = 180.0 / Math.PI;
-        public static readonly double DEGREES_TO_RADIANS = Math.PI / 180.0;
-
-        private CoordinateConversions()
-        {
-        }
-        /// <summary>
-        /// Converts DIS xyz world coordinates to latitude and longitude (IN RADIANS). This algorithm may not be 100% accurate
-        /// near the poles. Uses WGS84 , though you can change the ellipsoid constants a and b if you want to use something
-        /// else. These formulas were obtained from Military Handbook 600008 </summary>
-        /// <param name="xyz"> A double array with the x, y, and z coordinates, in that order. </param>
-        /// <returns> An array with the lat, long, and elevation corresponding to those coordinates.
-        /// Elevation is in meters, lat and long are in radians </returns>
-        public static double[] xyzToLatLonRadians(double[] xyz)
-        {
-            double x = xyz[0];
-            double y = xyz[1];
-            double z = xyz[2];
-            double[] answer = new double[3];
-            double a = 6378137.0; //semi major axis
-            double b = 6356752.3142; //semi minor axis
-
-            double eSquared; //first eccentricity squared
-            double rSubN; //radius of the curvature of the prime vertical
-            double ePrimeSquared; //second eccentricity squared
-            double W = Math.Sqrt((x * x + y * y));
-
-            eSquared = (a * a - b * b) / (a * a);
-            ePrimeSquared = (a * a - b * b) / (b * b);
-
-            /// <summary>
-            /// Get the longitude.
-            /// </summary>
-            if (x >= 0)
-            {
-                answer[1] = Math.Atan(y / x);
-            }
-            else if (x < 0 && y >= 0)
-            {
-                answer[1] = Math.Atan(y / x) + Math.PI;
-            }
-            else
-            {
-                answer[1] = Math.Atan(y / x) - Math.PI;
-            }
-
-            /// <summary>
-            /// Longitude calculation done. Now calculate latitude.
-            /// NOTE: The handbook mentions using the calculated phi (latitude) value to recalculate B
-            /// using tan B = (1-f) tan phi and then performing the entire calculation again to get more accurate values.
-            /// However, for terrestrial applications, one iteration is accurate to .1 millimeter on the surface  of the
-            /// earth (Rapp, 1984, p.124), so one iteration is enough for our purposes
-            /// </summary>
-
-            double tanBZero = (a * z) / (b * W);
-            double BZero = Math.Atan((tanBZero));
-            double tanPhi = (z + (ePrimeSquared * b * (Math.Pow(Math.Sin(BZero), 3)))) / (W - (a * eSquared * (Math.Pow(Math.Cos(BZero), 3))));
-            double phi = Math.Atan(tanPhi);
-            answer[0] = phi;
-            /// <summary>
-            /// Latitude done, now get the elevation. Note: The handbook states that near the poles, it is preferable to use
-            /// h = (Z / sin phi ) - rSubN + (eSquared * rSubN). Our applications are never near the poles, so this formula
-            /// was left unimplemented.
-            /// </summary>
-            rSubN = (a * a) / Math.Sqrt(((a * a) * (Math.Cos(phi) * Math.Cos(phi)) + ((b * b) * (Math.Sin(phi) * Math.Sin(phi)))));
-
-            answer[2] = (W / Math.Cos(phi)) - rSubN;
-
-            return answer;
-        }
-
-        /// <summary>
-        /// Converts DIS xyz world coordinates to latitude and longitude (IN DEGREES). This algorithm may not be 100% accurate
-        /// near the poles. Uses WGS84 , though you can change the ellipsoid constants a and b if you want to use something
-        /// else. These formulas were obtained from Military Handbook 600008 </summary>
-        /// <param name="xyz"> A double array with the x, y, and z coordinates, in that order. </param>
-        /// <returns> An array with the lat, lon, and elevation corresponding to those coordinates.
-        /// Elevation is in meters, lat and long are in degrees </returns>
-        public static double[] xyzToLatLonDegrees(double[] xyz)
-        {
-            double[] degrees = CoordinateConversions.xyzToLatLonRadians(xyz);
-
-            degrees[0] = degrees[0] * 180.0 / Math.PI;
-            degrees[1] = degrees[1] * 180.0 / Math.PI;
-
-            return degrees;
-
-        }
-
-        /// <summary>
-        /// Converts lat long and geodetic height (elevation) into DIS XYZ
-        /// This algorithm also uses the WGS84 ellipsoid, though you can change the values
-        /// of a and b for a different ellipsoid. Adapted from Military Handbook 600008 </summary>
-        /// <param name="latitude"> The latitude, IN RADIANS </param>
-        /// <param name="longitude"> The longitude, in RADIANS </param>
-        /// <param name="height"> The elevation, in meters </param>
-        /// <returns> a double array with the calculated X, Y, and Z values, in that order </returns>
-        public static double[] getXYZfromLatLonRadians(double latitude, double longitude, double height)
-        {
-            double a = 6378137.0; //semi major axis
-            double b = 6356752.3142; //semi minor axis
-            double cosLat = Math.Cos(latitude);
-            double sinLat = Math.Sin(latitude);
-
-
-            double rSubN = (a * a) / Math.Sqrt(((a * a) * (cosLat * cosLat) + ((b * b) * (sinLat * sinLat))));
-
-            double X = (rSubN + height) * cosLat * Math.Cos(longitude);
-            double Y = (rSubN + height) * cosLat * Math.Sin(longitude);
-            double Z = ((((b * b) / (a * a)) * rSubN) + height) * sinLat;
-
-            return new double[] { X, Y, Z };
-        }
-
-        /// <summary>
-        /// Converts lat long IN DEGREES and geodetic height (elevation) into DIS XYZ
-        /// This algorithm also uses the WGS84 ellipsoid, though you can change the values
-        /// of a and b for a different ellipsoid. Adapted from Military Handbook 600008 </summary>
-        /// <param name="latitude"> The latitude, IN DEGREES </param>
-        /// <param name="longitude"> The longitude, in DEGREES </param>
-        /// <param name="height"> The elevation, in meters </param>
-        /// <returns> a double array with the calculated X, Y, and Z values, in that order </returns>
-        public static double[] getXYZfromLatLonDegrees(double latitude, double longitude, double height)
-        {
-            double[] degrees = CoordinateConversions.getXYZfromLatLonRadians(latitude * CoordinateConversions.DEGREES_TO_RADIANS, longitude * CoordinateConversions.DEGREES_TO_RADIANS, height);
-
-            return degrees;
-        }
-    }
-
-}
+using System;
+
+namespace OpenDis.Core
+{
+    /// <summary>
+    /// Converts DIS (x,y,z) rectilinear coordinates (earth-centered RH coordinate system)
+    /// to latitude and longitude, in radians. 
+    /// @author loyaj
+    /// </summary>
+    public class CoordinateConversions
+    {
+        public static readonly double RADIANS_TO_DEGREES = 180.0 / Math.PI;
+        public static readonly double DEGREES_TO_RADIANS = Math.PI / 180.0;
+
+        private CoordinateConversions()
+        {
+        }
+        /// <summary>
+        /// Converts DIS xyz world coordinates to latitude and longitude (IN RADIANS). This algorithm may not be 100% accurate
+        /// near the poles. Uses WGS84 , though you can change the ellipsoid constants a and b if you want to use something
+        /// else. These formulas were obtained from Military Handbook 600008 </summary>
+        /// <param name="xyz"> A double array with the x, y, and z coordinates, in that order. </param>
+        /// <returns> An array with the lat, long, and elevation corresponding to those coordinates.
+        /// Elevation is in meters, lat and long are in radians </returns>
+        public static double[] xyzToLatLonRadians(double[] xyz)
+        {
+            double x = xyz[0];
+            double y = xyz[1];
+            double z = xyz[2];
+            double[] answer = new double[3];
+            double a = 6378137.0; //semi major axis
+            double b = 6356752.3142; //semi minor axis
+
+            double eSquared; //first eccentricity squared
+            double rSubN; //radius of the curvature of the prime vertical
+            double ePrimeSquared; //second eccentricity squared
+            double W = Math.Sqrt((x * x + y * y));
+
+            eSquared = (a * a - b * b) / (a * a);
+            ePrimeSquared = (a * a - b * b) / (b * b);
+
+            /// <summary>
+            /// Get the longitude.
+            /// </summary>
+            if (x >= 0)
+            {
+                answer[1] = Math.Atan(y / x);
+            }
+            else if (x < 0 && y >= 0)
+            {
+                answer[1] = Math.Atan(y / x) + Math.PI;
+            }
+            else
+            {
+                answer[1] = Math.Atan(y / x) - Math.PI;
+            }
+
+            /// <summary>
+            /// Longitude calculation done. Now calculate latitude.
+            /// NOTE: The handbook mentions using the calculated phi (latitude) value to recalculate B
+            /// using tan B = (1-f) tan phi and then performing the entire calculation again to get more accurate values.
+            /// However, for terrestrial applications, one iteration is accurate to .1 millimeter on the surface  of the
+            /// earth (Rapp, 1984, p.124), so one iteration is enough for our purposes
+            /// </summary>
+
+            double tanBZero = (a * z) / (b * W);
+            double BZero = Math.Atan((tanBZero));
+            double tanPhi = (z + (ePrimeSquared * b * (Math.Pow(Math.Sin(BZero), 3)))) / (W - (a * eSquared * (Math.Pow(Math.Cos(BZero), 3))));
+            double phi = Math.Atan(tanPhi);
+            answer[0] = phi;
+            /// <summary>
+            /// Latitude done, now get the elevation. Note: The handbook states that near the poles, it is preferable to use
+            /// h = (Z / sin phi ) - rSubN + (eSquared * rSubN). Our applications are never near the poles, so this formula
+            /// was left unimplemented.
+            /// </summary>
+            rSubN = (a * a) / Math.Sqrt(((a * a) * (Math.Cos(phi) * Math.Cos(phi)) + ((b * b) * (Math.Sin(phi) * Math.Sin(phi)))));
+
+            answer[2] = (W / Math.Cos(phi)) - rSubN;
+
+            return answer;
+        }
+
+        /// <summary>
+        /// Converts DIS xyz world coordinates to latitude and longitude (IN DEGREES). This algorithm may not be 100% accurate
+        /// near the poles. Uses WGS84 , though you can change the ellipsoid constants a and b if you want to use something
+        /// else. These formulas were obtained from Military Handbook 600008 </summary>
+        /// <param name="xyz"> A double array with the x, y, and z coordinates, in that order. </param>
+        /// <returns> An array with the lat, lon, and elevation corresponding to those coordinates.
+        /// Elevation is in meters, lat and long are in degrees </returns>
+        public static double[] xyzToLatLonDegrees(double[] xyz)
+        {
+            double[] degrees = CoordinateConversions.xyzToLatLonRadians(xyz);
+
+            degrees[0] = degrees[0] * 180.0 / Math.PI;
+            degrees[1] = degrees[1] * 180.0 / Math.PI;
+
+            return degrees;
+
+        }
+
+        /// <summary>
+        /// Converts lat long and geodetic height (elevation) into DIS XYZ
+        /// This algorithm also uses the WGS84 ellipsoid, though you can change the values
+        /// of a and b for a different ellipsoid. Adapted from Military Handbook 600008 </summary>
+        /// <param name="latitude"> The latitude, IN RADIANS </param>
+        /// <param name="longitude"> The longitude, in RADIANS </param>
+        /// <param name="height"> The elevation, in meters </param>
+        /// <returns> a double array with the calculated X, Y, and Z values, in that order </returns>
+        public static double[] getXYZfromLatLonRadians(double latitude, double longitude, double height)
+        {
+            double a = 6378137.0; //semi major axis
+            double b = 6356752.3142; //semi minor axis
+            double cosLat = Math.Cos(latitude);
+            double sinLat = Math.Sin(latitude);
+
+
+            double rSubN = (a * a) / Math.Sqrt(((a * a) * (cosLat * cosLat) + ((b * b) * (sinLat * sinLat))));
+
+            double X = (rSubN + height) * cosLat * Math.Cos(longitude);
+            double Y = (rSubN + height) * cosLat * Math.Sin(longitude);
+            double Z = ((((b * b) / (a * a)) * rSubN) + height) * sinLat;
+
+            return new double[] { X, Y, Z };
+        }
+
+        /// <summary>
+        /// Converts lat long IN DEGREES and geodetic height (elevation) into DIS XYZ
+        /// This algorithm also uses the WGS84 ellipsoid, though you can change the values
+        /// of a and b for a different ellipsoid. Adapted from Military Handbook 600008 </summary>
+        /// <param name="latitude"> The latitude, IN DEGREES </param>
+        /// <param name="longitude"> The longitude, in DEGREES </param>
+        /// <param name="height"> The elevation, in meters </param>
+        /// <returns> a double array with the calculated X, Y, and Z values, in that order </returns>
+        public static double[] getXYZfromLatLonDegrees(double latitude, double longitude, double height)
+        {
+            double[] degrees = CoordinateConversions.getXYZfromLatLonRadians(latitude * CoordinateConversions.DEGREES_TO_RADIANS, longitude * CoordinateConversions.DEGREES_TO_RADIANS, height);
+
+            return degrees;
+        }
+    }
+
+}
diff --git a/Libs/CsharpDis6/OpenDis/Utilities/DataInputStream.cs b/Libs/CsharpDis6/Utilities/DataInputStream.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Utilities/DataInputStream.cs
rename to Libs/CsharpDis6/Utilities/DataInputStream.cs
index c84406a..fc70667 100644
--- a/Libs/CsharpDis6/OpenDis/Utilities/DataInputStream.cs
+++ b/Libs/CsharpDis6/Utilities/DataInputStream.cs
@@ -1,320 +1,320 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace OpenDis.Core
-{
-    /// <summary>
-    /// Class used to read in PDU Bytes via the DataStream class
-    /// </summary>
-    public class DataInputStream
-    {
-		#region�Fields�(1)�
-
-        private DataStream pduDataStream;
-
-		#endregion�Fields�
-
-		#region�Constructors�(2)�
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataInputStream"/> class with
-        /// Endian set to Little.
-        /// </summary>
-        public DataInputStream()
-            : this(Endian.Little)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataInputStream"/> class.
-        /// </summary>
-        /// <param name="endian">The endian.</param>
-        public DataInputStream(Endian endian)
-        {
-            this.pduDataStream = new DataStream();
-            this.pduDataStream.StreamCounter = 0;
-            this.Endian = endian;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataInputStream"/> class.
-        /// </summary>
-        /// <param name="ds">byte array</param>
-        /// <param name="endian">type of endian</param>
-        public DataInputStream(byte[] ds, Endian endian)
-            : this(endian)
-        {
-            this.pduDataStream.StreamByteArray = ds;
-            this.pduDataStream.Endian = endian;
-        }
-        
-		#endregion�Constructors�
-
-		#region�Properties�(1)�
-
-        ///// <summary>
-        ///// Used to convert an array of bytes to a MemoryStream
-        ///// </summary>
-        ///// <param name="data">byte array</param>
-        ///// <returns>MemoryStream</returns>
-        ////private MemoryStream ConvertBytesMemoryStream(byte[] data)
-        ////{
-        ////    MemoryStream ms = new MemoryStream();
-
-        ////    ms.Write(data, 0, data.Length);
-
-        ////    return ms;
-        ////}
-
-        /// <summary>
-        /// Gets or sets the endian value currently being used to process PDU data
-        /// </summary>
-        public Endian Endian
-        {
-            get
-            {
-                return this.pduDataStream.Endian;
-            }
-
-            set
-            {
-                this.pduDataStream.Endian = value;
-            }
-        }
-
-		#endregion�Properties�
-
-		#region�Methods�(11)�
-
-        /// <summary>
-        /// Reads from DataStream's byte array a byte
-        /// </summary>
-        /// <returns>byte value</returns>
-        public byte ReadByte()
-        {
-            byte returnedData = this.pduDataStream.StreamByteArray[this.pduDataStream.StreamCounter];
-            this.pduDataStream.StreamCounter++;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a byte
-        /// </summary>
-        /// <returns>byte value</returns>
-        public byte[] ReadByteArray(int length)
-        {
-            byte[] returnedData = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, length);
-
-            this.pduDataStream.StreamCounter += length;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a double value
-        /// </summary>
-        /// <returns>double value</returns>
-        public double ReadDouble()
-        {
-            int size = sizeof(double);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            double returnedData = System.BitConverter.ToDouble(temp, 0);
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a float value
-        /// </summary>
-        /// <returns>float value</returns>
-        public float ReadFloat()
-        {
-            int size = sizeof(float);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            float returnedData = System.BitConverter.ToSingle(temp, 0);
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array an int value
-        /// </summary>
-        /// <returns>int value</returns>
-        public int ReadInt()
-        {
-            int size = sizeof(int);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            int returnedData = System.BitConverter.ToInt32(temp, 0);
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a long
-        /// </summary>
-        /// <returns>long value</returns>
-        public long ReadLong()
-        {
-            int size = sizeof(long);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            long returnedData = System.BitConverter.ToInt64(temp, 0);
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a short value
-        /// </summary>
-        /// <returns>short value</returns>
-        public short ReadShort()
-        {
-            int size = sizeof(short);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            short returnedData = System.BitConverter.ToInt16(temp, 0);
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a byte
-        /// </summary>
-        /// <returns>byte value</returns>
-        public byte ReadUnsignedByte()
-        {
-            return this.ReadByte();
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a unsigned int
-        /// </summary>
-        /// <returns>unsigned int value</returns>
-        public uint ReadUnsignedInt()
-        {
-            int size = sizeof(uint);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            uint returnedData = System.BitConverter.ToUInt32(temp, 0);
-
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a unsigned long
-        /// </summary>
-        /// <returns>ulong value</returns>
-        public ulong ReadUnsignedLong()
-        {
-            int size = sizeof(ulong);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            ulong returnedData = System.BitConverter.ToUInt64(temp, 0);
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-        }
-
-        /// <summary>
-        /// Reads from DataStream's byte array a unsigned short
-        /// </summary>
-        /// <returns>unsigned short value</returns>
-        public ushort ReadUnsignedShort()
-        {
-            int size = sizeof(ushort);
-            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(temp);
-            }
-
-            ushort returnedData = System.BitConverter.ToUInt16(temp, 0);
-            this.pduDataStream.StreamCounter += size;
-            return returnedData;
-        }
-
-		#endregion�Methods�
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace OpenDis.Core
+{
+    /// <summary>
+    /// Class used to read in PDU Bytes via the DataStream class
+    /// </summary>
+    public class DataInputStream
+    {
+		#region�Fields�(1)�
+
+        private DataStream pduDataStream;
+
+		#endregion�Fields�
+
+		#region�Constructors�(2)�
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataInputStream"/> class with
+        /// Endian set to Little.
+        /// </summary>
+        public DataInputStream()
+            : this(Endian.Little)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataInputStream"/> class.
+        /// </summary>
+        /// <param name="endian">The endian.</param>
+        public DataInputStream(Endian endian)
+        {
+            this.pduDataStream = new DataStream();
+            this.pduDataStream.StreamCounter = 0;
+            this.Endian = endian;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataInputStream"/> class.
+        /// </summary>
+        /// <param name="ds">byte array</param>
+        /// <param name="endian">type of endian</param>
+        public DataInputStream(byte[] ds, Endian endian)
+            : this(endian)
+        {
+            this.pduDataStream.StreamByteArray = ds;
+            this.pduDataStream.Endian = endian;
+        }
+        
+		#endregion�Constructors�
+
+		#region�Properties�(1)�
+
+        ///// <summary>
+        ///// Used to convert an array of bytes to a MemoryStream
+        ///// </summary>
+        ///// <param name="data">byte array</param>
+        ///// <returns>MemoryStream</returns>
+        ////private MemoryStream ConvertBytesMemoryStream(byte[] data)
+        ////{
+        ////    MemoryStream ms = new MemoryStream();
+
+        ////    ms.Write(data, 0, data.Length);
+
+        ////    return ms;
+        ////}
+
+        /// <summary>
+        /// Gets or sets the endian value currently being used to process PDU data
+        /// </summary>
+        public Endian Endian
+        {
+            get
+            {
+                return this.pduDataStream.Endian;
+            }
+
+            set
+            {
+                this.pduDataStream.Endian = value;
+            }
+        }
+
+		#endregion�Properties�
+
+		#region�Methods�(11)�
+
+        /// <summary>
+        /// Reads from DataStream's byte array a byte
+        /// </summary>
+        /// <returns>byte value</returns>
+        public byte ReadByte()
+        {
+            byte returnedData = this.pduDataStream.StreamByteArray[this.pduDataStream.StreamCounter];
+            this.pduDataStream.StreamCounter++;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a byte
+        /// </summary>
+        /// <returns>byte value</returns>
+        public byte[] ReadByteArray(int length)
+        {
+            byte[] returnedData = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, length);
+
+            this.pduDataStream.StreamCounter += length;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a double value
+        /// </summary>
+        /// <returns>double value</returns>
+        public double ReadDouble()
+        {
+            int size = sizeof(double);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            double returnedData = System.BitConverter.ToDouble(temp, 0);
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a float value
+        /// </summary>
+        /// <returns>float value</returns>
+        public float ReadFloat()
+        {
+            int size = sizeof(float);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            float returnedData = System.BitConverter.ToSingle(temp, 0);
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array an int value
+        /// </summary>
+        /// <returns>int value</returns>
+        public int ReadInt()
+        {
+            int size = sizeof(int);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            int returnedData = System.BitConverter.ToInt32(temp, 0);
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a long
+        /// </summary>
+        /// <returns>long value</returns>
+        public long ReadLong()
+        {
+            int size = sizeof(long);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            long returnedData = System.BitConverter.ToInt64(temp, 0);
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a short value
+        /// </summary>
+        /// <returns>short value</returns>
+        public short ReadShort()
+        {
+            int size = sizeof(short);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            short returnedData = System.BitConverter.ToInt16(temp, 0);
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a byte
+        /// </summary>
+        /// <returns>byte value</returns>
+        public byte ReadUnsignedByte()
+        {
+            return this.ReadByte();
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a unsigned int
+        /// </summary>
+        /// <returns>unsigned int value</returns>
+        public uint ReadUnsignedInt()
+        {
+            int size = sizeof(uint);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            uint returnedData = System.BitConverter.ToUInt32(temp, 0);
+
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a unsigned long
+        /// </summary>
+        /// <returns>ulong value</returns>
+        public ulong ReadUnsignedLong()
+        {
+            int size = sizeof(ulong);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            ulong returnedData = System.BitConverter.ToUInt64(temp, 0);
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+        }
+
+        /// <summary>
+        /// Reads from DataStream's byte array a unsigned short
+        /// </summary>
+        /// <returns>unsigned short value</returns>
+        public ushort ReadUnsignedShort()
+        {
+            int size = sizeof(ushort);
+            byte[] temp = DataStream.ReturnByteArray(this.pduDataStream.StreamByteArray, this.pduDataStream.StreamCounter, size);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(temp);
+            }
+
+            ushort returnedData = System.BitConverter.ToUInt16(temp, 0);
+            this.pduDataStream.StreamCounter += size;
+            return returnedData;
+        }
+
+		#endregion�Methods�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Utilities/DataOutputStream.cs b/Libs/CsharpDis6/Utilities/DataOutputStream.cs
similarity index 96%
rename from Libs/CsharpDis6/OpenDis/Utilities/DataOutputStream.cs
rename to Libs/CsharpDis6/Utilities/DataOutputStream.cs
index 4b48e50..ab7e74e 100644
--- a/Libs/CsharpDis6/OpenDis/Utilities/DataOutputStream.cs
+++ b/Libs/CsharpDis6/Utilities/DataOutputStream.cs
@@ -1,324 +1,324 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Text;
-
-namespace OpenDis.Core
-{
-    /// <summary>
-    /// Class used to export PDU information from a DataStream
-    /// </summary>
-    public class DataOutputStream
-    {
-		#region�Fields�(1)�
-
-        DataStream pduDataStream;
-
-		#endregion�Fields�
-
-		#region�Constructors�(2)�
-
-        /// <summary>
-        /// Initializes a new instance of the DataOutputStream class from an 
-        /// existing DataStream and sets Endian type to use.
-        /// </summary>
-        /// <param name="ds">The data stream.</param>
-        /// <param name="endian">The endian to be used.</param>
-        public DataOutputStream(DataStream ds, Endian endian)
-        {
-            this.pduDataStream = ds;
-            this.Endian = endian;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the DataOutputStream class and
-        /// with Endian set to Little.
-        /// </summary>
-        /// <param name="endian">The endian to be used.</param>
-        public DataOutputStream()
-            : this(Endian.Little)
-        {
-        }
-        
-        /// <summary>
-        /// Initializes a new instance of the DataOutputStream class and
-        /// sets the Endian to use.
-        /// </summary>
-        /// <param name="endian">The endian to be used.</param>
-        public DataOutputStream(Endian endian)
-        {
-            this.pduDataStream = new DataStream();
-            this.Endian = endian;
-        }
-
-		#endregion�Constructors�
-
-		#region�Properties�(2)�
-
-        /// <summary>
-        /// Gets the underlining DataStream
-        /// </summary>
-        public DataStream DS
-        {
-            get
-            {
-                return this.pduDataStream;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Endian type
-        /// </summary>
-        public Endian Endian
-        {
-            get
-            {
-                return this.DS.Endian;
-            }
-
-            set
-            {
-                this.DS.Endian = value;
-            }
-        }
-
-		#endregion�Properties�
-
-		#region�Methods�(15)�
-
-        /// <summary>
-        /// Converts the DataStream to a byte array
-        /// </summary>
-        /// <returns>byte array</returns>
-        public byte[] ConvertToBytes()
-        {
-            return this.DS.ConvertToBytes();
-        }
-
-        /// <summary>
-        /// Write a byte value to the DataStream
-        /// </summary>
-        /// <param name="data">byte</param>
-        public void WriteByte(byte data)
-        {
-            this.WriteData(data);
-        }
-
-        /// <summary>
-        /// Write a byte array value to the DataStream
-        /// </summary>
-        /// <param name="data">byte</param>
-        public void WriteByte(byte[] data)
-        {
-            this.WriteData(data);
-        }
-
-        /// <summary>
-        /// Write a double value to the DataStream
-        /// </summary>
-        /// <param name="data">double</param>
-        public void WriteDouble(double data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Write a float value to the DataStream
-        /// </summary>
-        /// <param name="data">float</param>
-        public void WriteFloat(float data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Write a int value to the DataStream
-        /// </summary>
-        /// <param name="data">int32</param>
-        public void WriteInt(int data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Write a long value to the DataStream
-        /// </summary>
-        /// <param name="data">long</param>
-        public void WriteLong(long data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Write a short value to the DataStream
-        /// </summary>
-        /// <param name="data">short value</param>
-        public void WriteShort(short data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Write a byte value to the DataStream
-        /// </summary>
-        /// <param name="data">byte</param>
-        public void WriteUnsignedByte(byte data)
-        {
-            this.WriteData(data);
-        }
-
-        /// <summary>
-        /// Write a byte array value to the DataStream
-        /// </summary>
-        /// <param name="data">byte</param>
-        public void WriteUnsignedByte(byte[] data)
-        {
-            this.WriteData(data);
-        }
-
-        /// <summary>
-        /// Write a unsigned int value to the DataStream
-        /// </summary>
-        /// <param name="data">unsigned int</param>
-        public void WriteUnsignedInt(uint data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Write a unsigned long value to the DataStream
-        /// </summary>
-        /// <param name="data">long</param>
-        public void WriteUnsignedLong(ulong data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Write a unsigned short value to the DataStream
-        /// </summary>
-        /// <param name="data">unsigned short</param>
-        public void WriteUnsignedShort(ushort data)
-        {
-            byte[] serializedData = System.BitConverter.GetBytes(data);
-
-            if (this.Endian == Endian.Big)
-            {
-                Array.Reverse(serializedData);
-            }
-
-            this.WriteData(serializedData);
-        }
-
-        /// <summary>
-        /// Base method to write a byte value to the DataStream
-        /// </summary>
-        /// <param name="data">byte</param>
-        private void WriteData(byte data)
-        {
-            this.pduDataStream.Append(data);
-            this.pduDataStream.StreamCounter += 1;
-        }
-
-        /// <summary>
-        /// Base method to write an array of bytes to the DataStream
-        /// </summary>
-        /// <param name="data">byte array</param>
-        private void WriteData(byte[] data)
-        {
-            this.pduDataStream.Append(data);
-            this.pduDataStream.StreamCounter += data.Length;
-        }
-
-		#endregion�Methods�
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
+
+namespace OpenDis.Core
+{
+    /// <summary>
+    /// Class used to export PDU information from a DataStream
+    /// </summary>
+    public class DataOutputStream
+    {
+		#region�Fields�(1)�
+
+        DataStream pduDataStream;
+
+		#endregion�Fields�
+
+		#region�Constructors�(2)�
+
+        /// <summary>
+        /// Initializes a new instance of the DataOutputStream class from an 
+        /// existing DataStream and sets Endian type to use.
+        /// </summary>
+        /// <param name="ds">The data stream.</param>
+        /// <param name="endian">The endian to be used.</param>
+        public DataOutputStream(DataStream ds, Endian endian)
+        {
+            this.pduDataStream = ds;
+            this.Endian = endian;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DataOutputStream class and
+        /// with Endian set to Little.
+        /// </summary>
+        /// <param name="endian">The endian to be used.</param>
+        public DataOutputStream()
+            : this(Endian.Little)
+        {
+        }
+        
+        /// <summary>
+        /// Initializes a new instance of the DataOutputStream class and
+        /// sets the Endian to use.
+        /// </summary>
+        /// <param name="endian">The endian to be used.</param>
+        public DataOutputStream(Endian endian)
+        {
+            this.pduDataStream = new DataStream();
+            this.Endian = endian;
+        }
+
+		#endregion�Constructors�
+
+		#region�Properties�(2)�
+
+        /// <summary>
+        /// Gets the underlining DataStream
+        /// </summary>
+        public DataStream DS
+        {
+            get
+            {
+                return this.pduDataStream;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Endian type
+        /// </summary>
+        public Endian Endian
+        {
+            get
+            {
+                return this.DS.Endian;
+            }
+
+            set
+            {
+                this.DS.Endian = value;
+            }
+        }
+
+		#endregion�Properties�
+
+		#region�Methods�(15)�
+
+        /// <summary>
+        /// Converts the DataStream to a byte array
+        /// </summary>
+        /// <returns>byte array</returns>
+        public byte[] ConvertToBytes()
+        {
+            return this.DS.ConvertToBytes();
+        }
+
+        /// <summary>
+        /// Write a byte value to the DataStream
+        /// </summary>
+        /// <param name="data">byte</param>
+        public void WriteByte(byte data)
+        {
+            this.WriteData(data);
+        }
+
+        /// <summary>
+        /// Write a byte array value to the DataStream
+        /// </summary>
+        /// <param name="data">byte</param>
+        public void WriteByte(byte[] data)
+        {
+            this.WriteData(data);
+        }
+
+        /// <summary>
+        /// Write a double value to the DataStream
+        /// </summary>
+        /// <param name="data">double</param>
+        public void WriteDouble(double data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Write a float value to the DataStream
+        /// </summary>
+        /// <param name="data">float</param>
+        public void WriteFloat(float data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Write a int value to the DataStream
+        /// </summary>
+        /// <param name="data">int32</param>
+        public void WriteInt(int data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Write a long value to the DataStream
+        /// </summary>
+        /// <param name="data">long</param>
+        public void WriteLong(long data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Write a short value to the DataStream
+        /// </summary>
+        /// <param name="data">short value</param>
+        public void WriteShort(short data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Write a byte value to the DataStream
+        /// </summary>
+        /// <param name="data">byte</param>
+        public void WriteUnsignedByte(byte data)
+        {
+            this.WriteData(data);
+        }
+
+        /// <summary>
+        /// Write a byte array value to the DataStream
+        /// </summary>
+        /// <param name="data">byte</param>
+        public void WriteUnsignedByte(byte[] data)
+        {
+            this.WriteData(data);
+        }
+
+        /// <summary>
+        /// Write a unsigned int value to the DataStream
+        /// </summary>
+        /// <param name="data">unsigned int</param>
+        public void WriteUnsignedInt(uint data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Write a unsigned long value to the DataStream
+        /// </summary>
+        /// <param name="data">long</param>
+        public void WriteUnsignedLong(ulong data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Write a unsigned short value to the DataStream
+        /// </summary>
+        /// <param name="data">unsigned short</param>
+        public void WriteUnsignedShort(ushort data)
+        {
+            byte[] serializedData = System.BitConverter.GetBytes(data);
+
+            if (this.Endian == Endian.Big)
+            {
+                Array.Reverse(serializedData);
+            }
+
+            this.WriteData(serializedData);
+        }
+
+        /// <summary>
+        /// Base method to write a byte value to the DataStream
+        /// </summary>
+        /// <param name="data">byte</param>
+        private void WriteData(byte data)
+        {
+            this.pduDataStream.Append(data);
+            this.pduDataStream.StreamCounter += 1;
+        }
+
+        /// <summary>
+        /// Base method to write an array of bytes to the DataStream
+        /// </summary>
+        /// <param name="data">byte array</param>
+        private void WriteData(byte[] data)
+        {
+            this.pduDataStream.Append(data);
+            this.pduDataStream.StreamCounter += data.Length;
+        }
+
+		#endregion�Methods�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Utilities/DataStream.cs b/Libs/CsharpDis6/Utilities/DataStream.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Utilities/DataStream.cs
rename to Libs/CsharpDis6/Utilities/DataStream.cs
index 72c2b59..3838686 100644
--- a/Libs/CsharpDis6/OpenDis/Utilities/DataStream.cs
+++ b/Libs/CsharpDis6/Utilities/DataStream.cs
@@ -1,196 +1,196 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Text;
-
-namespace OpenDis.Core
-{
-    /// <summary>
-    /// Base class for storing PDU information
-    /// </summary>
-    public class DataStream : IDisposable
-    {
-		#region�Fields�(1)�
-
-        /// <summary>
-        /// The endian type.
-        /// </summary>
-        private Endian endianType;
-
-		#endregion�Fields�
-
-		#region�Constructors�(1)�
-
-        /// <summary>
-        /// Initializes a new instance of the DataStream class.  
-        /// This will store all PDU information for either an InputStream or OutputStream.
-        /// </summary>
-        public DataStream()
-        {
-            // Test the machine to determine to see what it supports. 
-            this.endianType = (BitConverter.IsLittleEndian ? Endian.Little : Endian.Big);
-
-            // create a new MemoryStream
-            this.Stream = new MemoryStream();
-        }
-
-		#endregion�Constructors�
-
-		#region�Properties�(4)�
-
-        /// <summary>
-        /// Gets or sets the endian type
-        /// </summary>
-        public Endian Endian
-        {
-            get
-            {
-                return this.endianType;
-            }
-
-            set
-            {
-                this.endianType = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the MemoryStream that will be used to hold the PDU data.
-        /// </summary>
-        public MemoryStream Stream
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the location to store a byte representation of the PDU.
-        /// </summary>
-        public byte[] StreamByteArray
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the counter used to keep track of where pointer is for the stream.
-        /// </summary>
-        public int StreamCounter
-        {
-            get;
-            set;
-        }
-
-		#endregion�Properties�
-
-		#region�Methods�(6)�
-
-        /// <summary>
-        /// Appends the byte array data to the MemoryStream
-        /// </summary>
-        /// <param name="data">byte array</param>
-        public void Append(byte[] data)
-        {
-            this.Stream.Seek(this.Stream.Length, SeekOrigin.Begin);
-            this.Stream.Write(data, 0, data.Length);
-        }
-
-        /// <summary>
-        /// Appends a single byte to the MemoryStream
-        /// </summary>
-        /// <param name="data"></param>
-        public void Append(byte data)
-        {
-            this.Stream.Seek(this.Stream.Length, SeekOrigin.Begin);
-            this.Stream.WriteByte(data);
-        }
-
-        /// <summary>
-        /// Re-Initializes the MemoryStream and streamCounter back to zero
-        /// </summary>
-        public void Clear()
-        {
-            this.StreamCounter = 0;
-            this.Stream = new MemoryStream();
-        }
-
-        /// <summary>
-        /// Convert a MemoryStream to a byte array
-        /// </summary>
-        /// <returns>byte array</returns>
-        public byte[] ConvertToBytes()
-        {
-            return ReturnByteArray(this.Stream.GetBuffer(), 0, (int)this.Stream.Length);
-        }
-
-        public void Dispose()
-        {
-            if (this.Stream != null)
-            {
-                try
-                {
-                    this.Stream.Close();
-                    this.Stream.Dispose();
-                }
-                catch
-                {
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns a portion of a byte array for Endian conversion
-        /// </summary>
-        /// <param name="byteStream">source bytearray</param>
-        /// <param name="startIndex">A 32-bit integer that represents the start index at which the conversion should begin</param>
-        /// <param name="sizeOfData">A 32-bit integer that represents the size of the value type</param>
-        /// <returns>A byte array that will hold the byte representation of the value</returns>
-        public static byte[] ReturnByteArray(byte[] byteStream, int startIndex, int sizeOfData)
-        {
-            byte[] temp = new byte[sizeOfData];
-            Array.Copy(byteStream, startIndex, temp, 0, sizeOfData);
-
-            return temp;
-        }
-
-		#endregion�Methods�
-    }
-}
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
+
+namespace OpenDis.Core
+{
+    /// <summary>
+    /// Base class for storing PDU information
+    /// </summary>
+    public class DataStream : IDisposable
+    {
+		#region�Fields�(1)�
+
+        /// <summary>
+        /// The endian type.
+        /// </summary>
+        private Endian endianType;
+
+		#endregion�Fields�
+
+		#region�Constructors�(1)�
+
+        /// <summary>
+        /// Initializes a new instance of the DataStream class.  
+        /// This will store all PDU information for either an InputStream or OutputStream.
+        /// </summary>
+        public DataStream()
+        {
+            // Test the machine to determine to see what it supports. 
+            this.endianType = (BitConverter.IsLittleEndian ? Endian.Little : Endian.Big);
+
+            // create a new MemoryStream
+            this.Stream = new MemoryStream();
+        }
+
+		#endregion�Constructors�
+
+		#region�Properties�(4)�
+
+        /// <summary>
+        /// Gets or sets the endian type
+        /// </summary>
+        public Endian Endian
+        {
+            get
+            {
+                return this.endianType;
+            }
+
+            set
+            {
+                this.endianType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the MemoryStream that will be used to hold the PDU data.
+        /// </summary>
+        public MemoryStream Stream
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the location to store a byte representation of the PDU.
+        /// </summary>
+        public byte[] StreamByteArray
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the counter used to keep track of where pointer is for the stream.
+        /// </summary>
+        public int StreamCounter
+        {
+            get;
+            set;
+        }
+
+		#endregion�Properties�
+
+		#region�Methods�(6)�
+
+        /// <summary>
+        /// Appends the byte array data to the MemoryStream
+        /// </summary>
+        /// <param name="data">byte array</param>
+        public void Append(byte[] data)
+        {
+            this.Stream.Seek(this.Stream.Length, SeekOrigin.Begin);
+            this.Stream.Write(data, 0, data.Length);
+        }
+
+        /// <summary>
+        /// Appends a single byte to the MemoryStream
+        /// </summary>
+        /// <param name="data"></param>
+        public void Append(byte data)
+        {
+            this.Stream.Seek(this.Stream.Length, SeekOrigin.Begin);
+            this.Stream.WriteByte(data);
+        }
+
+        /// <summary>
+        /// Re-Initializes the MemoryStream and streamCounter back to zero
+        /// </summary>
+        public void Clear()
+        {
+            this.StreamCounter = 0;
+            this.Stream = new MemoryStream();
+        }
+
+        /// <summary>
+        /// Convert a MemoryStream to a byte array
+        /// </summary>
+        /// <returns>byte array</returns>
+        public byte[] ConvertToBytes()
+        {
+            return ReturnByteArray(this.Stream.GetBuffer(), 0, (int)this.Stream.Length);
+        }
+
+        public void Dispose()
+        {
+            if (this.Stream != null)
+            {
+                try
+                {
+                    this.Stream.Close();
+                    this.Stream.Dispose();
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a portion of a byte array for Endian conversion
+        /// </summary>
+        /// <param name="byteStream">source bytearray</param>
+        /// <param name="startIndex">A 32-bit integer that represents the start index at which the conversion should begin</param>
+        /// <param name="sizeOfData">A 32-bit integer that represents the size of the value type</param>
+        /// <returns>A byte array that will hold the byte representation of the value</returns>
+        public static byte[] ReturnByteArray(byte[] byteStream, int startIndex, int sizeOfData)
+        {
+            byte[] temp = new byte[sizeOfData];
+            Array.Copy(byteStream, startIndex, temp, 0, sizeOfData);
+
+            return temp;
+        }
+
+		#endregion�Methods�
+    }
+}
diff --git a/Libs/CsharpDis6/OpenDis/Utilities/PDUProcessor.cs b/Libs/CsharpDis6/Utilities/PDUProcessor.cs
similarity index 97%
rename from Libs/CsharpDis6/OpenDis/Utilities/PDUProcessor.cs
rename to Libs/CsharpDis6/Utilities/PDUProcessor.cs
index 7c5e24e..14ef093 100644
--- a/Libs/CsharpDis6/OpenDis/Utilities/PDUProcessor.cs
+++ b/Libs/CsharpDis6/Utilities/PDUProcessor.cs
@@ -1,666 +1,666 @@
-// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer
-//   in the documentation and/or other materials provided with the
-//   distribution.
-// * Neither the names of the Naval Postgraduate School (NPS)
-//   Modeling Virtual Environments and Simulation (MOVES) Institute
-//   (http://www.nps.edu and http://www.MovesInstitute.org)
-//   nor the names of its contributors may be used to endorse or
-//   promote products derived from this software without specific
-//   prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
-// rights reserved. This work is licensed under the BSD open source license,
-// available at https://www.movesinstitute.org/licenses/bsd.html
-//
-// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
-// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
-// 
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
-using OpenDis.Dis1998;
-using OpenDis.Enumerations;
-
-namespace OpenDis.Core
-{
-    public class PduProcessor
-    {
-		#region Fields (5) 
-
-        public const uint PDU_LENGTH_POSITION = 8;
-        public const uint PDU_TYPE_POSITION = 2;
-        public const uint PDU_VERSION_POSITION = 0;
-
-        private Endian endian;
-        private System.Xml.Serialization.XmlSerializer xmlSerializedData;
-
-		#endregion Fields 
-
-		#region Constructors (1) 
-
-        public PduProcessor()
-        {
-            this.endian = (BitConverter.IsLittleEndian ? Endian.Little : Endian.Big);
-        }
-
-		#endregion Constructors 
-
-		#region Properties (1) 
-
-        /// <summary>
-        /// Gets or sets the type of endian used to process the data
-        /// </summary>
-        public Endian Endian
-        {
-            get
-            {
-                return this.endian;
-            }
-
-            set
-            {
-                this.endian = value;
-            }
-        }
-
-		#endregion Properties 
-
-		#region Methods (18) 
-
-        /// <summary>
-        /// Converts a byte array into a DIS1998 PDU
-        /// </summary>
-        /// <param name="pduType">Type of the PDU.</param>
-        /// <param name="rawPdu">Byte array that hold raw 1998 PDU.</param>
-        /// <param name="endian">The Endian type used for conversion.</param>
-        /// <returns>PDU object</returns>
-        public static Pdu ConvertByteArrayToPdu1998(byte pduType, byte[] rawPdu, Endian endian)
-        {
-            return UnmarshalRawPdu(pduType, rawPdu, endian);
-        }
-
-        /// <summary>
-        /// Provided as a means to return a string representation of the underlining PDU data.  Note format is not yet optimized.
-        /// </summary>
-        /// <param name="pdu">The PDU to parse</param>
-        /// <returns>StringBuilder that represents the state of the PDU</returns>
-        public static StringBuilder DecodePdu(object pdu)
-        {
-            StringBuilder sb = new StringBuilder();
-            pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb }, CultureInfo.InvariantCulture);
-
-            return sb;
-        }
-
-        /// <summary>
-        /// Provides a means of processing PDU data 
-        /// </summary>
-        /// <param name="buffer">byte array containing the pdu data to process</param>
-        /// <param name="endian">format of value types</param>
-        /// <returns>Collection of PDUs which are represented in base object class</returns>
-        public List<object> ProcessPdu(byte[] buffer, Endian endian)
-        {
-            this.Endian = endian;
-            return this.ProcessPdu(buffer);
-        }
-
-        /// <summary>
-        /// Processes the pdu.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="endian">format of value types</param>
-        /// <returns>The PDU instance.</returns>
-        public object ProcessPdu(Stream stream, Endian endian)
-        {
-            this.Endian = endian;
-            return this.ProcessPdu(stream);
-        }
-
-        /// <summary>
-        /// Processes the pdu.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="endian">format of value types</param>
-        /// <param name="rawPdu">The raw pdu.</param>
-        public void ProcessPdu(Stream stream, Endian endian, out byte[] rawPdu)
-        {
-            this.Endian = endian;
-            this.ProcessPdu(stream, out rawPdu);
-        }
-
-        /// <summary>
-        /// Provides a means of processing PDU data 
-        /// </summary>
-        /// <param name="buf">byte array containing the pdu data to process</param>
-        /// <param name="endian">format of value types</param>
-        /// <remarks>Added to support passing back just the byte array.</remarks>
-        /// <returns>Collection of Raw byte[] PDUs</returns>
-        public List<byte[]> ProcessRawPdu(byte[] buffer, Endian endian)
-        {
-            this.Endian = endian;
-            return this.ProcessRawPdu(buffer);
-        }
-
-        /// <summary>
-        /// Provides a means of processing PDU data 
-        /// </summary>
-        /// <param name="buf">byte array containing the pdu data to process</param>
-        /// <param name="endian">format of value types</param>
-        /// <param name="dataQueue">Returns raw packets to a referenced Queue</param>
-        /// <remarks>Added to support passing back just the byte array into a Queue.</remarks>
-        public void ProcessRawPdu(byte[] buffer, Endian endian, ref Queue<byte[]> dataQueue)
-        {
-            this.Endian = endian;
-
-            // Calling the method to get PDUs, increment through each in case more than one pdu in packet
-            foreach (byte[] pduRawByteArray in this.ProcessRawPdu(buffer))
-            {
-                dataQueue.Enqueue(pduRawByteArray);
-            }
-        }
-
-        /// <summary>
-        /// Used to unmarshal data back into the correct PDU type.
-        /// </summary>
-        /// <param name="pduType">PDU type</param>
-        /// <param name="ds">Datastream which contains the raw packet and Endian Type</param>
-        /// <remarks>Added by PES to work with Mobile.</remarks>
-        /// <returns>The PDU instance.</returns>
-        public static Pdu UnmarshalRawPdu(byte pduType, DataInputStream ds)
-        {
-            return UnmarshalRawPdu((PduType)pduType, ds);
-        }
-
-        /// <summary>
-        /// Used to unmarshal data back into the correct PDU type.
-        /// </summary>
-        /// <param name="pduType">PDU type</param>
-        /// <param name="ds">Datastream which contains the raw packet and Endian Type</param>
-        /// <remarks>Added by PES to work with Mobile.</remarks>
-        /// <returns>The PDU instance.</returns>
-        public static Pdu UnmarshalRawPdu(PduType pduType, DataInputStream ds)
-        {
-            Pdu pdu = new Pdu();
-
-            switch (pduType)
-            {
-                case PduType.EntityState:
-                    EntityStatePdu entityStatePdu = new EntityStatePdu();
-                    entityStatePdu.Unmarshal(ds);
-                    pdu = (Pdu)entityStatePdu;
-                    break;
-                case PduType.Fire:
-                    FirePdu firePdu = new FirePdu();
-                    firePdu.Unmarshal(ds);
-                    pdu = (Pdu)firePdu;
-                    break;
-                case PduType.Detonation:
-                    DetonationPdu detonationPdu = new DetonationPdu();
-                    detonationPdu.Unmarshal(ds);
-                    pdu = (Pdu)detonationPdu;
-                    break;
-                case PduType.Collision:
-                    CollisionPdu collisionPdu = new CollisionPdu();
-                    collisionPdu.Unmarshal(ds);
-                    pdu = (Pdu)collisionPdu;
-                    break;
-                case PduType.ServiceRequest:
-                    ServiceRequestPdu serviceRequestPdu = new ServiceRequestPdu();
-                    serviceRequestPdu.Unmarshal(ds);
-                    pdu = (Pdu)serviceRequestPdu;
-                    break;
-                case PduType.ResupplyOffer:
-                    ResupplyOfferPdu resupplyOfferPdu = new ResupplyOfferPdu();
-                    resupplyOfferPdu.Unmarshal(ds);
-                    pdu = (Pdu)resupplyOfferPdu;
-                    break;
-                case PduType.ResupplyReceived:
-                    ResupplyReceivedPdu resupplyReceivedPdu = new ResupplyReceivedPdu();
-                    resupplyReceivedPdu.Unmarshal(ds);
-                    pdu = (Pdu)resupplyReceivedPdu;
-                    break;
-                case PduType.ResupplyCancel:
-                    ResupplyCancelPdu resupplyCancelPdu = new ResupplyCancelPdu();
-                    resupplyCancelPdu.Unmarshal(ds);
-                    pdu = (Pdu)resupplyCancelPdu;
-                    break;
-                case PduType.RepairComplete:
-                    RepairCompletePdu repairCompletePdu = new RepairCompletePdu();
-                    repairCompletePdu.Unmarshal(ds);
-                    pdu = (Pdu)repairCompletePdu;
-                    break;
-                case PduType.RepairResponse:
-                    RepairResponsePdu repairResponsePdu = new RepairResponsePdu();
-                    repairResponsePdu.Unmarshal(ds);
-                    pdu = (Pdu)repairResponsePdu;
-                    break;
-                case PduType.CreateEntity:
-                    CreateEntityPdu createEntityPdu = new CreateEntityPdu();
-                    createEntityPdu.Unmarshal(ds);
-                    pdu = (Pdu)createEntityPdu;
-                    break;
-                case PduType.RemoveEntity:
-                    RemoveEntityPdu removeEntityPdu = new RemoveEntityPdu();
-                    removeEntityPdu.Unmarshal(ds);
-                    pdu = (Pdu)removeEntityPdu;
-                    break;
-                case PduType.StartResume:
-                    StartResumePdu startResumePdu = new StartResumePdu();
-                    startResumePdu.Unmarshal(ds);
-                    pdu = (Pdu)startResumePdu;
-                    break;
-                case PduType.Acknowledge:
-                    AcknowledgePdu acknowledgePdu = new AcknowledgePdu();
-                    acknowledgePdu.Unmarshal(ds);
-                    pdu = (Pdu)acknowledgePdu;
-                    break;
-                case PduType.ActionRequest:
-                    ActionRequestPdu actionRequestPdu = new ActionRequestPdu();
-                    actionRequestPdu.Unmarshal(ds);
-                    pdu = (Pdu)actionRequestPdu;
-                    break;
-                case PduType.ActionResponse:
-                    ActionResponsePdu actionResponsePdu = new ActionResponsePdu();
-                    actionResponsePdu.Unmarshal(ds);
-                    pdu = (Pdu)actionResponsePdu;
-                    break;
-                case PduType.DataQuery:
-                    DataQueryPdu dataQueryPdu = new DataQueryPdu();
-                    dataQueryPdu.Unmarshal(ds);
-                    pdu = (Pdu)dataQueryPdu;
-                    break;
-                case PduType.SetData:
-                    SetDataPdu setDataPdu = new SetDataPdu();
-                    setDataPdu.Unmarshal(ds);
-                    pdu = (Pdu)setDataPdu;
-                    break;
-                case PduType.EventReport:
-                    EventReportPdu eventReportPdu = new EventReportPdu();
-                    eventReportPdu.Unmarshal(ds);
-                    pdu = (Pdu)eventReportPdu;
-                    break;
-                case PduType.Comment:
-                    CommentPdu commentPdu = new CommentPdu();
-                    commentPdu.Unmarshal(ds);
-                    pdu = (Pdu)commentPdu;
-                    break;
-                case PduType.StopFreeze:
-                    StopFreezePdu stopFreezePdu = new StopFreezePdu();
-                    stopFreezePdu.Unmarshal(ds);
-                    pdu = (Pdu)stopFreezePdu;
-                    break;
-                case PduType.Signal:
-                    SignalPdu signalPdu = new SignalPdu();
-                    signalPdu.Unmarshal(ds);
-                    pdu = (Pdu)signalPdu;
-                    break;
-                case PduType.Transmitter:
-                    TransmitterPdu transmitterPdu = new TransmitterPdu();
-                    transmitterPdu.Unmarshal(ds);
-                    pdu = (Pdu)transmitterPdu;
-                    break;
-            }
-
-            return pdu;
-        }
-
-        /// <summary>
-        /// Used to unmarshal data back into the correct PDU type.
-        /// </summary>
-        /// <param name="pduType">PDU type</param>
-        /// <param name="rawPDU">byte array containing the raw packets</param>
-        /// <param name="endian">Endian type</param>
-        /// <remarks>Added by PES to work with Mobile.</remarks>
-        /// <returns>The PDU instance</returns>
-        public static Pdu UnmarshalRawPdu(byte pduType, byte[] rawPdu, Endian endian)
-        {
-            DataInputStream ds = new DataInputStream(rawPdu, endian);
-            return UnmarshalRawPdu((PduType)pduType, ds);
-        }
-
-        /// <summary>
-        /// Used to unmarshal data back into the correct PDU type.
-        /// </summary>
-        /// <param name="pduType">PDU type</param>
-        /// <param name="rawPDU">byte array containing the raw packets</param>
-        /// <param name="endian">Endian type</param>
-        /// <remarks>Added by PES to work with Mobile.</remarks>
-        /// <returns>The PDU instance.</returns>
-        public static Pdu UnmarshalRawPdu(PduType pduType, byte[] rawPdu, Endian endian)
-        {
-            DataInputStream ds = new DataInputStream(rawPdu, endian);
-            return UnmarshalRawPdu(pduType, ds);
-        }
-
-        /// <summary>
-        /// Returns an XML version of the reflected PDU
-        /// </summary>
-        /// <param name="pdu">PDU to reflect into XML</param>
-        /// <returns>StringBuilder</returns>
-        public StringBuilder XmlDecodePdu(object pdu)
-        {
-            StringBuilder sb = new StringBuilder();
-
-            using (System.IO.StringWriter stringWriter = new System.IO.StringWriter(CultureInfo.InvariantCulture))
-            {
-                try
-                {
-                    this.xmlSerializedData = new XmlSerializer(pdu.GetType());
-                    this.xmlSerializedData.Serialize(stringWriter, pdu);
-
-                }
-                catch
-                {
-                    throw;
-                }
-                finally
-                {
-                    sb.Append(stringWriter.ToString());
-                    stringWriter.Close();
-                }
-            }
-
-            return sb;
-        }
-		// Protected Methods (5) 
-
-        protected virtual object ProcessPdu(Stream stream)
-        {
-            int upToPduLength = (int)PDU_LENGTH_POSITION + sizeof(ushort);
-            int pduLength = 0;
-            byte pduType;
-            byte pdu_version;
-            object pdu = null;
-
-            long startingPosition = stream.Position;
-
-            byte[] buffer = new byte[upToPduLength];
-
-            // Read in part of the stream up to the pdu length
-            stream.Read(buffer, 0, upToPduLength);
-
-            try
-            {
-                pduLength = PduProcessor.pduLength(buffer, this.endian);
-                
-                // Allocate space for the whole PDU
-                byte[] pduBufferStorage = new byte[pduLength];
-
-                // Reset back to beginning
-                stream.Position = startingPosition;
-
-                // Read in the whole PDU
-                stream.Read(pduBufferStorage, 0, pduLength);
-
-                pduType = pduBufferStorage[PDU_TYPE_POSITION];
-
-                pdu_version = pduBufferStorage[PDU_VERSION_POSITION];
-
-                pdu = this.SwitchOnType(pdu_version, pduType, pduBufferStorage);
-
-            }
-            catch
-            {
-                // Wow something bad just happened, could be bad/misalgined PDU
-                pdu = null;
-            }
-
-            return pdu;
-        }
-
-        /// <summary>
-        /// Process a received PDU.  Note that a datastream can contain multiple PDUs.  Therefore a
-        /// List is used to hold one or more after decoding.
-        /// </summary>
-        /// <param name="buf">byte array of PDU(s)</param>
-        /// <returns>Collection of all PDU(s) decoded</returns>
-        protected virtual List<object> ProcessPdu(byte[] buffer)
-        {
-            List<object> pduCollection = new List<object>();
-
-            if (buffer.Length < 1)
-            {
-                return pduCollection;
-            }
-
-            int length = buffer.Length;
-            byte pduType;
-            byte pdu_version;
-            int countBytes = 0;
-            uint pduLength = 0;
-
-            //used to interate over all PDU(s) within the byte array
-            while (countBytes < length)
-            {
-                try
-                {
-                    pduLength = PduProcessor.pduLength(buffer, this.endian, (uint)(PDU_LENGTH_POSITION + countBytes));                    
-
-                    // Must be at end of datastream
-                    if (pduLength == 0)
-                    {
-                        break;
-                    }
-
-                    pduType = buffer[PDU_TYPE_POSITION + countBytes];
-
-                    pdu_version = buffer[PDU_VERSION_POSITION + countBytes];
-
-                    byte[] pduBufferStorage = new byte[pduLength];
-
-                    // Could potentially be a problem since pduLength is an unsigned int,
-                    // changed due to windows mobile does not accept a long for 4th parameter
-                    Array.Copy(buffer, countBytes, pduBufferStorage, 0, (int)pduLength);
-
-                    pduCollection.Add(SwitchOnType(pdu_version, pduType, pduBufferStorage));
-
-                    countBytes += (int)pduLength;
-
-                }
-                catch
-                {
-                    // Wow something bad just happened, could be bad/misalgined PDU
-                    break;
-                }
-            }
-
-            return pduCollection;
-        }
-
-        protected virtual void ProcessPdu(Stream stream, out byte[] rawData)
-        {
-            int upToPduLength = (int)PDU_LENGTH_POSITION + sizeof(ushort);
-            int pduLength = 0;
-
-            long startingPosition = stream.Position;
-
-            byte[] buffer = new byte[upToPduLength];
-
-            // Read in part of the stream up to the pdu length
-            stream.Read(buffer, 0, upToPduLength);
-
-            try
-            {
-                pduLength = PduProcessor.pduLength(buffer, this.endian);
-                
-                // Allocate space for the whole PDU
-                rawData = new byte[pduLength];
-
-                // Reset back to beginning
-                stream.Position = startingPosition;
-
-                // Read in the whole PDU
-                stream.Read(rawData, 0, pduLength);
-            }
-            catch
-            {
-                // Wow something bad just happened, could be bad/misalgined PDU
-                rawData = null;
-            }
-        }
-
-        /// <summary>
-        /// Process a received PDU.  Note that a datastream can contain multiple PDUs.  Therefore a
-        /// List is used to hold one or more after decoding.
-        /// </summary>
-        /// <remarks>Added by PES to support passing back just the byte array.</remarks>
-        /// <param name="buf">byte array of PDU(s)</param>
-        /// <returns>Collection of all PDU(s) in raw byte format</returns>
-        protected virtual List<byte[]> ProcessRawPdu(byte[] buffer)
-        {
-            List<byte[]> pduCollection = new List<byte[]>();
-
-            if (buffer.Length < 1)
-            {
-                return pduCollection;
-            }
-
-            int length = buffer.Length;
-            byte pduType;
-            byte pduVersion;
-            int countBytes = 0;
-            uint pduLength = 0;
-
-            //used to interate over all PDU(s) within the byte array
-            while (countBytes < length)
-            {
-                try
-                {
-                    pduLength = PduProcessor.pduLength(buffer, this.endian);
-                    
-                    // Must be at end of datastream
-                    if (pduLength == 0)
-                    {
-                        break;
-                    }
-
-                    pduType = buffer[PDU_TYPE_POSITION + countBytes];
-
-                    pduVersion = buffer[PDU_VERSION_POSITION + countBytes];
-
-                    byte[] pduBufferStorage = new byte[pduLength];
-
-                    // Could potentially be a problem since pduLength is an unsigned int,
-                    // changed due to windows mobile does not accept a long for 4th parameter
-                    Array.Copy(buffer, countBytes, pduBufferStorage, 0, (int)pduLength);
-
-                    pduCollection.Add(pduBufferStorage);
-
-                    countBytes += (int)pduLength;
-                }
-                catch
-                {
-                    // Wow something bad just happened, could be bad/misalgined PDU
-                    break;
-                }
-            }
-
-            return pduCollection;
-        }
-
-        /// <summary>
-        /// Returns an instance of the PDU based upon the pdu type passed in.  Note PDU will be represented as an Object for simplicity.
-        /// </summary>
-        /// <param name="pdu_version">Version of IEEE standard</param>
-        /// <param name="pduType">Type of PDU</param>
-        /// <param name="ds">PDU byte array containing the data</param>
-        /// <returns>PDU instance.</returns>         
-        protected virtual object SwitchOnType(byte pduVersion, uint pduType, byte[] ds)
-        {
-            object pdu = null;
-
-            DataInputStream dStream = new DataInputStream(ds, this.Endian);
-
-            switch (pduVersion)
-            {
-                case 5:
-                    // DIS 1995
-                    break;
-                case 6:
-                    // DIS 1998
-                    // pdu = OpenDis.Utilities.PDUBank.GetPDU(pduType);
-                    pdu = UnmarshalRawPdu((PduType)pduType, dStream);
-                    break;
-                default:
-                    break;
-            }
-
-            //if (pdu != null)
-            //{
-            //    //Call the method of the underlining Type vice the Upper class method.
-            //    ReturnUnmarshalledPDU(pdu, dStream);
-            //}
-
-            return pdu;
-        }
-
-
-        /// <summary>
-        /// Extracts length of PDU without altering byte array/stream so that future access to this field is still valid
-        /// </summary>
-        /// <param name="buf">Byte array holding PDU data.</param>
-        /// <param name="position">Position of 'length' field.  generally at pos 8, but if this byte array holds more than one PDU</param>
-        /// <param name="endian">The Endian type used for conversion.</param>
-        /// <returns>length</returns>
-        private static UInt16 pduLength(byte[] buf, Endian endian, uint pos = PDU_LENGTH_POSITION)
-        {
-            byte[] temp = new byte[2];
-
-            if (endian == Endian.Big)  //Reverse
-            {
-                temp[0] = buf[pos + 1];
-                temp[1] = buf[pos]; 
-            }
-            else  //Leave as is
-            {
-                temp[0] = buf[pos];
-                temp[1] = buf[pos + 1];
-            }
-            
-            return System.BitConverter.ToUInt16(temp, 0);
-        }
-
-                
-        /// <summary>
-        /// Unmarshal all data into the pdu object.  This method calls the all the base unmarshals.
-        /// Deprecated:  This method used Reflection, use <see cref="UnmarshallRawPdu"/> method instead.
-        /// </summary>
-        /// <param name="pdu">object where the unmarshalled data will be stored</param>
-        /// <param name="dStream">location of where the unmarshalled data is located</param>
-        [Obsolete("This method used Reflection which is slow, new method 'UnmarshallRawPdu' should be used instead.")]
-        private static void ReturnUnmarshalledPdu(object pdu, DataInputStream dStream)
-        {
-            // Unmarshal is the method name found in each of the PDU classes
-            pdu.GetType().InvokeMember("Unmarshal", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { dStream }, CultureInfo.InvariantCulture);
-        }
-
-
-
-		#endregion Methods 
-    }
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author Peter Smith (Naval Air Warfare Center - Training Systems Division) 01/23/2009
+// Modified by Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+// 
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+using OpenDis.Dis1998;
+using OpenDis.Enumerations;
+
+namespace OpenDis.Core
+{
+    public class PduProcessor
+    {
+		#region Fields (5) 
+
+        public const uint PDU_LENGTH_POSITION = 8;
+        public const uint PDU_TYPE_POSITION = 2;
+        public const uint PDU_VERSION_POSITION = 0;
+
+        private Endian endian;
+        private System.Xml.Serialization.XmlSerializer xmlSerializedData;
+
+		#endregion Fields 
+
+		#region Constructors (1) 
+
+        public PduProcessor()
+        {
+            this.endian = (BitConverter.IsLittleEndian ? Endian.Little : Endian.Big);
+        }
+
+		#endregion Constructors 
+
+		#region Properties (1) 
+
+        /// <summary>
+        /// Gets or sets the type of endian used to process the data
+        /// </summary>
+        public Endian Endian
+        {
+            get
+            {
+                return this.endian;
+            }
+
+            set
+            {
+                this.endian = value;
+            }
+        }
+
+		#endregion Properties 
+
+		#region Methods (18) 
+
+        /// <summary>
+        /// Converts a byte array into a DIS1998 PDU
+        /// </summary>
+        /// <param name="pduType">Type of the PDU.</param>
+        /// <param name="rawPdu">Byte array that hold raw 1998 PDU.</param>
+        /// <param name="endian">The Endian type used for conversion.</param>
+        /// <returns>PDU object</returns>
+        public static Pdu ConvertByteArrayToPdu1998(byte pduType, byte[] rawPdu, Endian endian)
+        {
+            return UnmarshalRawPdu(pduType, rawPdu, endian);
+        }
+
+        /// <summary>
+        /// Provided as a means to return a string representation of the underlining PDU data.  Note format is not yet optimized.
+        /// </summary>
+        /// <param name="pdu">The PDU to parse</param>
+        /// <returns>StringBuilder that represents the state of the PDU</returns>
+        public static StringBuilder DecodePdu(object pdu)
+        {
+            StringBuilder sb = new StringBuilder();
+            pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb }, CultureInfo.InvariantCulture);
+
+            return sb;
+        }
+
+        /// <summary>
+        /// Provides a means of processing PDU data 
+        /// </summary>
+        /// <param name="buffer">byte array containing the pdu data to process</param>
+        /// <param name="endian">format of value types</param>
+        /// <returns>Collection of PDUs which are represented in base object class</returns>
+        public List<object> ProcessPdu(byte[] buffer, Endian endian)
+        {
+            this.Endian = endian;
+            return this.ProcessPdu(buffer);
+        }
+
+        /// <summary>
+        /// Processes the pdu.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <param name="endian">format of value types</param>
+        /// <returns>The PDU instance.</returns>
+        public object ProcessPdu(Stream stream, Endian endian)
+        {
+            this.Endian = endian;
+            return this.ProcessPdu(stream);
+        }
+
+        /// <summary>
+        /// Processes the pdu.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <param name="endian">format of value types</param>
+        /// <param name="rawPdu">The raw pdu.</param>
+        public void ProcessPdu(Stream stream, Endian endian, out byte[] rawPdu)
+        {
+            this.Endian = endian;
+            this.ProcessPdu(stream, out rawPdu);
+        }
+
+        /// <summary>
+        /// Provides a means of processing PDU data 
+        /// </summary>
+        /// <param name="buf">byte array containing the pdu data to process</param>
+        /// <param name="endian">format of value types</param>
+        /// <remarks>Added to support passing back just the byte array.</remarks>
+        /// <returns>Collection of Raw byte[] PDUs</returns>
+        public List<byte[]> ProcessRawPdu(byte[] buffer, Endian endian)
+        {
+            this.Endian = endian;
+            return this.ProcessRawPdu(buffer);
+        }
+
+        /// <summary>
+        /// Provides a means of processing PDU data 
+        /// </summary>
+        /// <param name="buf">byte array containing the pdu data to process</param>
+        /// <param name="endian">format of value types</param>
+        /// <param name="dataQueue">Returns raw packets to a referenced Queue</param>
+        /// <remarks>Added to support passing back just the byte array into a Queue.</remarks>
+        public void ProcessRawPdu(byte[] buffer, Endian endian, ref Queue<byte[]> dataQueue)
+        {
+            this.Endian = endian;
+
+            // Calling the method to get PDUs, increment through each in case more than one pdu in packet
+            foreach (byte[] pduRawByteArray in this.ProcessRawPdu(buffer))
+            {
+                dataQueue.Enqueue(pduRawByteArray);
+            }
+        }
+
+        /// <summary>
+        /// Used to unmarshal data back into the correct PDU type.
+        /// </summary>
+        /// <param name="pduType">PDU type</param>
+        /// <param name="ds">Datastream which contains the raw packet and Endian Type</param>
+        /// <remarks>Added by PES to work with Mobile.</remarks>
+        /// <returns>The PDU instance.</returns>
+        public static Pdu UnmarshalRawPdu(byte pduType, DataInputStream ds)
+        {
+            return UnmarshalRawPdu((PduType)pduType, ds);
+        }
+
+        /// <summary>
+        /// Used to unmarshal data back into the correct PDU type.
+        /// </summary>
+        /// <param name="pduType">PDU type</param>
+        /// <param name="ds">Datastream which contains the raw packet and Endian Type</param>
+        /// <remarks>Added by PES to work with Mobile.</remarks>
+        /// <returns>The PDU instance.</returns>
+        public static Pdu UnmarshalRawPdu(PduType pduType, DataInputStream ds)
+        {
+            Pdu pdu = new Pdu();
+
+            switch (pduType)
+            {
+                case PduType.EntityState:
+                    EntityStatePdu entityStatePdu = new EntityStatePdu();
+                    entityStatePdu.Unmarshal(ds);
+                    pdu = (Pdu)entityStatePdu;
+                    break;
+                case PduType.Fire:
+                    FirePdu firePdu = new FirePdu();
+                    firePdu.Unmarshal(ds);
+                    pdu = (Pdu)firePdu;
+                    break;
+                case PduType.Detonation:
+                    DetonationPdu detonationPdu = new DetonationPdu();
+                    detonationPdu.Unmarshal(ds);
+                    pdu = (Pdu)detonationPdu;
+                    break;
+                case PduType.Collision:
+                    CollisionPdu collisionPdu = new CollisionPdu();
+                    collisionPdu.Unmarshal(ds);
+                    pdu = (Pdu)collisionPdu;
+                    break;
+                case PduType.ServiceRequest:
+                    ServiceRequestPdu serviceRequestPdu = new ServiceRequestPdu();
+                    serviceRequestPdu.Unmarshal(ds);
+                    pdu = (Pdu)serviceRequestPdu;
+                    break;
+                case PduType.ResupplyOffer:
+                    ResupplyOfferPdu resupplyOfferPdu = new ResupplyOfferPdu();
+                    resupplyOfferPdu.Unmarshal(ds);
+                    pdu = (Pdu)resupplyOfferPdu;
+                    break;
+                case PduType.ResupplyReceived:
+                    ResupplyReceivedPdu resupplyReceivedPdu = new ResupplyReceivedPdu();
+                    resupplyReceivedPdu.Unmarshal(ds);
+                    pdu = (Pdu)resupplyReceivedPdu;
+                    break;
+                case PduType.ResupplyCancel:
+                    ResupplyCancelPdu resupplyCancelPdu = new ResupplyCancelPdu();
+                    resupplyCancelPdu.Unmarshal(ds);
+                    pdu = (Pdu)resupplyCancelPdu;
+                    break;
+                case PduType.RepairComplete:
+                    RepairCompletePdu repairCompletePdu = new RepairCompletePdu();
+                    repairCompletePdu.Unmarshal(ds);
+                    pdu = (Pdu)repairCompletePdu;
+                    break;
+                case PduType.RepairResponse:
+                    RepairResponsePdu repairResponsePdu = new RepairResponsePdu();
+                    repairResponsePdu.Unmarshal(ds);
+                    pdu = (Pdu)repairResponsePdu;
+                    break;
+                case PduType.CreateEntity:
+                    CreateEntityPdu createEntityPdu = new CreateEntityPdu();
+                    createEntityPdu.Unmarshal(ds);
+                    pdu = (Pdu)createEntityPdu;
+                    break;
+                case PduType.RemoveEntity:
+                    RemoveEntityPdu removeEntityPdu = new RemoveEntityPdu();
+                    removeEntityPdu.Unmarshal(ds);
+                    pdu = (Pdu)removeEntityPdu;
+                    break;
+                case PduType.StartResume:
+                    StartResumePdu startResumePdu = new StartResumePdu();
+                    startResumePdu.Unmarshal(ds);
+                    pdu = (Pdu)startResumePdu;
+                    break;
+                case PduType.Acknowledge:
+                    AcknowledgePdu acknowledgePdu = new AcknowledgePdu();
+                    acknowledgePdu.Unmarshal(ds);
+                    pdu = (Pdu)acknowledgePdu;
+                    break;
+                case PduType.ActionRequest:
+                    ActionRequestPdu actionRequestPdu = new ActionRequestPdu();
+                    actionRequestPdu.Unmarshal(ds);
+                    pdu = (Pdu)actionRequestPdu;
+                    break;
+                case PduType.ActionResponse:
+                    ActionResponsePdu actionResponsePdu = new ActionResponsePdu();
+                    actionResponsePdu.Unmarshal(ds);
+                    pdu = (Pdu)actionResponsePdu;
+                    break;
+                case PduType.DataQuery:
+                    DataQueryPdu dataQueryPdu = new DataQueryPdu();
+                    dataQueryPdu.Unmarshal(ds);
+                    pdu = (Pdu)dataQueryPdu;
+                    break;
+                case PduType.SetData:
+                    SetDataPdu setDataPdu = new SetDataPdu();
+                    setDataPdu.Unmarshal(ds);
+                    pdu = (Pdu)setDataPdu;
+                    break;
+                case PduType.EventReport:
+                    EventReportPdu eventReportPdu = new EventReportPdu();
+                    eventReportPdu.Unmarshal(ds);
+                    pdu = (Pdu)eventReportPdu;
+                    break;
+                case PduType.Comment:
+                    CommentPdu commentPdu = new CommentPdu();
+                    commentPdu.Unmarshal(ds);
+                    pdu = (Pdu)commentPdu;
+                    break;
+                case PduType.StopFreeze:
+                    StopFreezePdu stopFreezePdu = new StopFreezePdu();
+                    stopFreezePdu.Unmarshal(ds);
+                    pdu = (Pdu)stopFreezePdu;
+                    break;
+                case PduType.Signal:
+                    SignalPdu signalPdu = new SignalPdu();
+                    signalPdu.Unmarshal(ds);
+                    pdu = (Pdu)signalPdu;
+                    break;
+                case PduType.Transmitter:
+                    TransmitterPdu transmitterPdu = new TransmitterPdu();
+                    transmitterPdu.Unmarshal(ds);
+                    pdu = (Pdu)transmitterPdu;
+                    break;
+            }
+
+            return pdu;
+        }
+
+        /// <summary>
+        /// Used to unmarshal data back into the correct PDU type.
+        /// </summary>
+        /// <param name="pduType">PDU type</param>
+        /// <param name="rawPDU">byte array containing the raw packets</param>
+        /// <param name="endian">Endian type</param>
+        /// <remarks>Added by PES to work with Mobile.</remarks>
+        /// <returns>The PDU instance</returns>
+        public static Pdu UnmarshalRawPdu(byte pduType, byte[] rawPdu, Endian endian)
+        {
+            DataInputStream ds = new DataInputStream(rawPdu, endian);
+            return UnmarshalRawPdu((PduType)pduType, ds);
+        }
+
+        /// <summary>
+        /// Used to unmarshal data back into the correct PDU type.
+        /// </summary>
+        /// <param name="pduType">PDU type</param>
+        /// <param name="rawPDU">byte array containing the raw packets</param>
+        /// <param name="endian">Endian type</param>
+        /// <remarks>Added by PES to work with Mobile.</remarks>
+        /// <returns>The PDU instance.</returns>
+        public static Pdu UnmarshalRawPdu(PduType pduType, byte[] rawPdu, Endian endian)
+        {
+            DataInputStream ds = new DataInputStream(rawPdu, endian);
+            return UnmarshalRawPdu(pduType, ds);
+        }
+
+        /// <summary>
+        /// Returns an XML version of the reflected PDU
+        /// </summary>
+        /// <param name="pdu">PDU to reflect into XML</param>
+        /// <returns>StringBuilder</returns>
+        public StringBuilder XmlDecodePdu(object pdu)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            using (System.IO.StringWriter stringWriter = new System.IO.StringWriter(CultureInfo.InvariantCulture))
+            {
+                try
+                {
+                    this.xmlSerializedData = new XmlSerializer(pdu.GetType());
+                    this.xmlSerializedData.Serialize(stringWriter, pdu);
+
+                }
+                catch
+                {
+                    throw;
+                }
+                finally
+                {
+                    sb.Append(stringWriter.ToString());
+                    stringWriter.Close();
+                }
+            }
+
+            return sb;
+        }
+		// Protected Methods (5) 
+
+        protected virtual object ProcessPdu(Stream stream)
+        {
+            int upToPduLength = (int)PDU_LENGTH_POSITION + sizeof(ushort);
+            int pduLength = 0;
+            byte pduType;
+            byte pdu_version;
+            object pdu = null;
+
+            long startingPosition = stream.Position;
+
+            byte[] buffer = new byte[upToPduLength];
+
+            // Read in part of the stream up to the pdu length
+            stream.Read(buffer, 0, upToPduLength);
+
+            try
+            {
+                pduLength = PduProcessor.pduLength(buffer, this.endian);
+                
+                // Allocate space for the whole PDU
+                byte[] pduBufferStorage = new byte[pduLength];
+
+                // Reset back to beginning
+                stream.Position = startingPosition;
+
+                // Read in the whole PDU
+                stream.Read(pduBufferStorage, 0, pduLength);
+
+                pduType = pduBufferStorage[PDU_TYPE_POSITION];
+
+                pdu_version = pduBufferStorage[PDU_VERSION_POSITION];
+
+                pdu = this.SwitchOnType(pdu_version, pduType, pduBufferStorage);
+
+            }
+            catch
+            {
+                // Wow something bad just happened, could be bad/misalgined PDU
+                pdu = null;
+            }
+
+            return pdu;
+        }
+
+        /// <summary>
+        /// Process a received PDU.  Note that a datastream can contain multiple PDUs.  Therefore a
+        /// List is used to hold one or more after decoding.
+        /// </summary>
+        /// <param name="buf">byte array of PDU(s)</param>
+        /// <returns>Collection of all PDU(s) decoded</returns>
+        protected virtual List<object> ProcessPdu(byte[] buffer)
+        {
+            List<object> pduCollection = new List<object>();
+
+            if (buffer.Length < 1)
+            {
+                return pduCollection;
+            }
+
+            int length = buffer.Length;
+            byte pduType;
+            byte pdu_version;
+            int countBytes = 0;
+            uint pduLength = 0;
+
+            //used to interate over all PDU(s) within the byte array
+            while (countBytes < length)
+            {
+                try
+                {
+                    pduLength = PduProcessor.pduLength(buffer, this.endian, (uint)(PDU_LENGTH_POSITION + countBytes));                    
+
+                    // Must be at end of datastream
+                    if (pduLength == 0)
+                    {
+                        break;
+                    }
+
+                    pduType = buffer[PDU_TYPE_POSITION + countBytes];
+
+                    pdu_version = buffer[PDU_VERSION_POSITION + countBytes];
+
+                    byte[] pduBufferStorage = new byte[pduLength];
+
+                    // Could potentially be a problem since pduLength is an unsigned int,
+                    // changed due to windows mobile does not accept a long for 4th parameter
+                    Array.Copy(buffer, countBytes, pduBufferStorage, 0, (int)pduLength);
+
+                    pduCollection.Add(SwitchOnType(pdu_version, pduType, pduBufferStorage));
+
+                    countBytes += (int)pduLength;
+
+                }
+                catch
+                {
+                    // Wow something bad just happened, could be bad/misalgined PDU
+                    break;
+                }
+            }
+
+            return pduCollection;
+        }
+
+        protected virtual void ProcessPdu(Stream stream, out byte[] rawData)
+        {
+            int upToPduLength = (int)PDU_LENGTH_POSITION + sizeof(ushort);
+            int pduLength = 0;
+
+            long startingPosition = stream.Position;
+
+            byte[] buffer = new byte[upToPduLength];
+
+            // Read in part of the stream up to the pdu length
+            stream.Read(buffer, 0, upToPduLength);
+
+            try
+            {
+                pduLength = PduProcessor.pduLength(buffer, this.endian);
+                
+                // Allocate space for the whole PDU
+                rawData = new byte[pduLength];
+
+                // Reset back to beginning
+                stream.Position = startingPosition;
+
+                // Read in the whole PDU
+                stream.Read(rawData, 0, pduLength);
+            }
+            catch
+            {
+                // Wow something bad just happened, could be bad/misalgined PDU
+                rawData = null;
+            }
+        }
+
+        /// <summary>
+        /// Process a received PDU.  Note that a datastream can contain multiple PDUs.  Therefore a
+        /// List is used to hold one or more after decoding.
+        /// </summary>
+        /// <remarks>Added by PES to support passing back just the byte array.</remarks>
+        /// <param name="buf">byte array of PDU(s)</param>
+        /// <returns>Collection of all PDU(s) in raw byte format</returns>
+        protected virtual List<byte[]> ProcessRawPdu(byte[] buffer)
+        {
+            List<byte[]> pduCollection = new List<byte[]>();
+
+            if (buffer.Length < 1)
+            {
+                return pduCollection;
+            }
+
+            int length = buffer.Length;
+            byte pduType;
+            byte pduVersion;
+            int countBytes = 0;
+            uint pduLength = 0;
+
+            //used to interate over all PDU(s) within the byte array
+            while (countBytes < length)
+            {
+                try
+                {
+                    pduLength = PduProcessor.pduLength(buffer, this.endian);
+                    
+                    // Must be at end of datastream
+                    if (pduLength == 0)
+                    {
+                        break;
+                    }
+
+                    pduType = buffer[PDU_TYPE_POSITION + countBytes];
+
+                    pduVersion = buffer[PDU_VERSION_POSITION + countBytes];
+
+                    byte[] pduBufferStorage = new byte[pduLength];
+
+                    // Could potentially be a problem since pduLength is an unsigned int,
+                    // changed due to windows mobile does not accept a long for 4th parameter
+                    Array.Copy(buffer, countBytes, pduBufferStorage, 0, (int)pduLength);
+
+                    pduCollection.Add(pduBufferStorage);
+
+                    countBytes += (int)pduLength;
+                }
+                catch
+                {
+                    // Wow something bad just happened, could be bad/misalgined PDU
+                    break;
+                }
+            }
+
+            return pduCollection;
+        }
+
+        /// <summary>
+        /// Returns an instance of the PDU based upon the pdu type passed in.  Note PDU will be represented as an Object for simplicity.
+        /// </summary>
+        /// <param name="pdu_version">Version of IEEE standard</param>
+        /// <param name="pduType">Type of PDU</param>
+        /// <param name="ds">PDU byte array containing the data</param>
+        /// <returns>PDU instance.</returns>         
+        protected virtual object SwitchOnType(byte pduVersion, uint pduType, byte[] ds)
+        {
+            object pdu = null;
+
+            DataInputStream dStream = new DataInputStream(ds, this.Endian);
+
+            switch (pduVersion)
+            {
+                case 5:
+                    // DIS 1995
+                    break;
+                case 6:
+                    // DIS 1998
+                    // pdu = OpenDis.Utilities.PDUBank.GetPDU(pduType);
+                    pdu = UnmarshalRawPdu((PduType)pduType, dStream);
+                    break;
+                default:
+                    break;
+            }
+
+            //if (pdu != null)
+            //{
+            //    //Call the method of the underlining Type vice the Upper class method.
+            //    ReturnUnmarshalledPDU(pdu, dStream);
+            //}
+
+            return pdu;
+        }
+
+
+        /// <summary>
+        /// Extracts length of PDU without altering byte array/stream so that future access to this field is still valid
+        /// </summary>
+        /// <param name="buf">Byte array holding PDU data.</param>
+        /// <param name="position">Position of 'length' field.  generally at pos 8, but if this byte array holds more than one PDU</param>
+        /// <param name="endian">The Endian type used for conversion.</param>
+        /// <returns>length</returns>
+        private static UInt16 pduLength(byte[] buf, Endian endian, uint pos = PDU_LENGTH_POSITION)
+        {
+            byte[] temp = new byte[2];
+
+            if (endian == Endian.Big)  //Reverse
+            {
+                temp[0] = buf[pos + 1];
+                temp[1] = buf[pos]; 
+            }
+            else  //Leave as is
+            {
+                temp[0] = buf[pos];
+                temp[1] = buf[pos + 1];
+            }
+            
+            return System.BitConverter.ToUInt16(temp, 0);
+        }
+
+                
+        /// <summary>
+        /// Unmarshal all data into the pdu object.  This method calls the all the base unmarshals.
+        /// Deprecated:  This method used Reflection, use <see cref="UnmarshallRawPdu"/> method instead.
+        /// </summary>
+        /// <param name="pdu">object where the unmarshalled data will be stored</param>
+        /// <param name="dStream">location of where the unmarshalled data is located</param>
+        [Obsolete("This method used Reflection which is slow, new method 'UnmarshallRawPdu' should be used instead.")]
+        private static void ReturnUnmarshalledPdu(object pdu, DataInputStream dStream)
+        {
+            // Unmarshal is the method name found in each of the PDU classes
+            pdu.GetType().InvokeMember("Unmarshal", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { dStream }, CultureInfo.InvariantCulture);
+        }
+
+
+
+		#endregion Methods 
+    }
 }
\ No newline at end of file
diff --git a/Libs/CsharpDis6/OpenDis/key.snk b/Libs/CsharpDis6/key.snk
similarity index 100%
rename from Libs/CsharpDis6/OpenDis/key.snk
rename to Libs/CsharpDis6/key.snk
diff --git a/OpenDis.sln b/OpenDis.sln
index 22c11f0..b1c8259 100644
--- a/OpenDis.sln
+++ b/OpenDis.sln
@@ -3,10 +3,79 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31727.386
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenDis", "Libs\CSharpDis6\OpenDis.csproj", "{628EE35F-450A-49B2-BA46-04FABB66D0BF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{4435AFF6-7D8B-496B-856C-A17536362474}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.Demo", "Samples\OpenDis.Demo\OpenDis.Demo.csproj", "{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{0B45384E-D921-4F45-9E78-4D353B86C59F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.EspduSender", "Samples\EspduSender\OpenDis.EspduSender.csproj", "{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.EspduReceiver", "Samples\EspduReceiver\OpenDis.EspduReceiver.csproj", "{70F94942-1466-4E6C-A2A3-89DB19C20159}"
+EndProject
 Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Analysis|Any CPU = Analysis|Any CPU
+		Analysis|x86 = Analysis|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|Any CPU.ActiveCfg = Analysis|x86
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|x86.ActiveCfg = Analysis|x86
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|x86.Build.0 = Analysis|x86
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|Any CPU.ActiveCfg = Release|x86
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|x86.ActiveCfg = Release|x86
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|x86.Build.0 = Release|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|Any CPU.ActiveCfg = Debug|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|Any CPU.Build.0 = Debug|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|x86.ActiveCfg = Debug|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|x86.Build.0 = Debug|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|x86.ActiveCfg = Debug|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|x86.Build.0 = Debug|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|Any CPU.ActiveCfg = Release|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|x86.ActiveCfg = Release|x86
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|x86.Build.0 = Release|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|Any CPU.ActiveCfg = Debug|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|Any CPU.Build.0 = Debug|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|x86.ActiveCfg = Debug|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|x86.Build.0 = Debug|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|x86.ActiveCfg = Debug|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|x86.Build.0 = Debug|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|Any CPU.ActiveCfg = Release|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|x86.ActiveCfg = Release|x86
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|x86.Build.0 = Release|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|Any CPU.ActiveCfg = Debug|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|Any CPU.Build.0 = Debug|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|x86.ActiveCfg = Debug|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|x86.Build.0 = Debug|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|x86.ActiveCfg = Debug|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|x86.Build.0 = Debug|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|Any CPU.ActiveCfg = Release|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|x86.ActiveCfg = Release|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF} = {4435AFF6-7D8B-496B-856C-A17536362474}
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8} = {0B45384E-D921-4F45-9E78-4D353B86C59F}
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664} = {0B45384E-D921-4F45-9E78-4D353B86C59F}
+		{70F94942-1466-4E6C-A2A3-89DB19C20159} = {0B45384E-D921-4F45-9E78-4D353B86C59F}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4E0885B8-C82C-47CC-B3D4-9E09D28C4C26}
 	EndGlobalSection
diff --git a/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
index 63684e3..ec77ef6 100644
--- a/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
+++ b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
@@ -1,63 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{70F94942-1466-4E6C-A2A3-89DB19C20159}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>EspduReceiver</RootNamespace>
-    <AssemblyName>EspduReceiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
+    <Version>6.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EspduReceiver.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
-      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
-      <Name>OpenDis</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\Libs\CSharpDis6\OpenDis.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
\ No newline at end of file
diff --git a/Samples/EspduReceiver/Properties/AssemblyInfo.cs b/Samples/EspduReceiver/Properties/AssemblyInfo.cs
deleted file mode 100644
index d9985b5..0000000
--- a/Samples/EspduReceiver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("EspduReceiver")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EspduReceiver")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b895fb76-1cfa-4ca3-a2ca-6eb63c18250f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Samples/EspduSender/OpenDis.EspduSender.csproj b/Samples/EspduSender/OpenDis.EspduSender.csproj
index e521ff6..b999cef 100644
--- a/Samples/EspduSender/OpenDis.EspduSender.csproj
+++ b/Samples/EspduSender/OpenDis.EspduSender.csproj
@@ -1,63 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>EspduSender</RootNamespace>
-    <AssemblyName>EspduSender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
+    <Version>6.0.0</Version>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EspduSender.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
-      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
-      <Name>OpenDis</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\Libs\CSharpDis6\OpenDis.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
\ No newline at end of file
diff --git a/Samples/OpenDis.Demo/OpenDis.Demo.csproj b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
index e69fe66..2dfa671 100644
--- a/Samples/OpenDis.Demo/OpenDis.Demo.csproj
+++ b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
@@ -93,12 +93,17 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenDis\OpenDis.csproj">
+    <ProjectReference Include="..\..\Libs\CSharpDis6\OpenDis.csproj">
       <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
       <Name>OpenDis</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.246501">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From f9496e6880273f384933394228e54b5ec7de230b Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sat, 9 Oct 2021 13:50:07 +0200
Subject: [PATCH 07/25] [BLD] Fix build with .NET 5

---
 Libs/CsharpDis6/OpenDis.csproj.user           |   7 --
 OpenDis.sln                                   |  53 ++------
 .../OpenDis.EspduReceiver.csproj              |   4 +
 .../EspduSender/OpenDis.EspduSender.csproj    |   3 +
 .../EspduSender/Properties/AssemblyInfo.cs    |  36 ------
 Samples/OpenDis.Demo/OpenDis.Demo.csproj      | 113 ++----------------
 6 files changed, 26 insertions(+), 190 deletions(-)
 delete mode 100644 Libs/CsharpDis6/OpenDis.csproj.user
 delete mode 100644 Samples/EspduSender/Properties/AssemblyInfo.cs

diff --git a/Libs/CsharpDis6/OpenDis.csproj.user b/Libs/CsharpDis6/OpenDis.csproj.user
deleted file mode 100644
index d1cd772..0000000
--- a/Libs/CsharpDis6/OpenDis.csproj.user
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-    <ShowAllFiles>false</ShowAllFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/OpenDis.sln b/OpenDis.sln
index b1c8259..5e56001 100644
--- a/OpenDis.sln
+++ b/OpenDis.sln
@@ -17,55 +17,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.EspduReceiver", "Sa
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Analysis|Any CPU = Analysis|Any CPU
-		Analysis|x86 = Analysis|x86
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|Any CPU.ActiveCfg = Analysis|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|x86.ActiveCfg = Analysis|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Analysis|x86.Build.0 = Analysis|x86
 		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|x86.Build.0 = Debug|Any CPU
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|Any CPU.ActiveCfg = Release|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|x86.ActiveCfg = Release|x86
-		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|x86.Build.0 = Release|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|Any CPU.ActiveCfg = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|Any CPU.Build.0 = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|x86.ActiveCfg = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Analysis|x86.Build.0 = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|x86.ActiveCfg = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|x86.Build.0 = Debug|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|Any CPU.ActiveCfg = Release|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|x86.ActiveCfg = Release|x86
-		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|x86.Build.0 = Release|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|Any CPU.ActiveCfg = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|Any CPU.Build.0 = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|x86.ActiveCfg = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Analysis|x86.Build.0 = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|x86.ActiveCfg = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|x86.Build.0 = Debug|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|Any CPU.ActiveCfg = Release|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|x86.ActiveCfg = Release|x86
-		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|x86.Build.0 = Release|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|Any CPU.ActiveCfg = Debug|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|Any CPU.Build.0 = Debug|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|x86.ActiveCfg = Debug|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Analysis|x86.Build.0 = Debug|x86
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEF2FB06-9CCF-491A-9727-FE6E4C4CF664}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|x86.ActiveCfg = Debug|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Debug|x86.Build.0 = Debug|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|Any CPU.ActiveCfg = Release|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|x86.ActiveCfg = Release|x86
-		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|x86.Build.0 = Release|x86
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70F94942-1466-4E6C-A2A3-89DB19C20159}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
index ec77ef6..30d9bff 100644
--- a/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
+++ b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
@@ -3,7 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>EspduReceiver</RootNamespace>
+    <OutputType>Exe</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Version>6.0.0</Version>
+    <ApplicationIcon />
+    <StartupObject>EspduReceiver.EspduReceiver</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Samples/EspduSender/OpenDis.EspduSender.csproj b/Samples/EspduSender/OpenDis.EspduSender.csproj
index b999cef..4611ad0 100644
--- a/Samples/EspduSender/OpenDis.EspduSender.csproj
+++ b/Samples/EspduSender/OpenDis.EspduSender.csproj
@@ -3,7 +3,10 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>EspduSender</RootNamespace>
+    <OutputType>Exe</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Version>6.0.0</Version>
+    <StartupObject>EspduSender.EspduSender</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Samples/EspduSender/Properties/AssemblyInfo.cs b/Samples/EspduSender/Properties/AssemblyInfo.cs
deleted file mode 100644
index 52e76c6..0000000
--- a/Samples/EspduSender/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("EspduSender")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EspduSender")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fa71ba03-ced4-4464-bcd3-b05ddf61f29f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Samples/OpenDis.Demo/OpenDis.Demo.csproj b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
index 2dfa671..aab1f04 100644
--- a/Samples/OpenDis.Demo/OpenDis.Demo.csproj
+++ b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
@@ -1,114 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0FC1409E-A9F2-4409-85A3-D989A36C3CB8}</ProjectGuid>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenDis.Demo</RootNamespace>
-    <AssemblyName>OpenDis.Demo</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Libs\CSharpDis6\OpenDis.csproj">
-      <Project>{628EE35F-450A-49B2-BA46-04FABB66D0BF}</Project>
-      <Name>OpenDis</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.246501">
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.2.211942">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.2" />
   </ItemGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file

From 20d6d3aa8ab16c04bd4bec1fcc298c6569fe3950 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sat, 9 Oct 2021 18:53:07 +0200
Subject: [PATCH 08/25] [BLD] Fix wpf build with .NET 5

---
 Libs/CsharpDis6/OpenDis.csproj                |  9 ++-
 .../OpenDis.EspduReceiver.csproj              |  5 +-
 .../EspduSender/OpenDis.EspduSender.csproj    |  4 +-
 Samples/OpenDis.Demo/OpenDis.Demo.csproj      |  5 +-
 Samples/OpenDis.Demo/OpenDis.Demo.csproj.user |  6 ++
 .../OpenDis.Demo/Properties/AssemblyInfo.cs   | 55 -------------------
 6 files changed, 20 insertions(+), 64 deletions(-)
 create mode 100644 Samples/OpenDis.Demo/OpenDis.Demo.csproj.user
 delete mode 100644 Samples/OpenDis.Demo/Properties/AssemblyInfo.cs

diff --git a/Libs/CsharpDis6/OpenDis.csproj b/Libs/CsharpDis6/OpenDis.csproj
index dd7ce0c..df93166 100644
--- a/Libs/CsharpDis6/OpenDis.csproj
+++ b/Libs/CsharpDis6/OpenDis.csproj
@@ -2,8 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>OpenDis_std</RootNamespace>
+    <RootNamespace>OpenDis</RootNamespace>
     <Version>6.0.0</Version>
   </PropertyGroup>
 
+ <ItemGroup>
+    <EmbeddedResource Include="Enumerations\Cet2006\AggregateTypes.xml" />
+    <EmbeddedResource Include="Enumerations\Cet2006\EntityTypes.xml" />
+    <EmbeddedResource Include="Enumerations\Cet2010\AggregateTypes.xml" />
+    <EmbeddedResource Include="Enumerations\Cet2010\EntityTypes.xml" />
+  </ItemGroup>
+
 </Project>
diff --git a/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
index 30d9bff..d41a444 100644
--- a/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
+++ b/Samples/EspduReceiver/OpenDis.EspduReceiver.csproj
@@ -1,13 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>EspduReceiver</RootNamespace>
     <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Version>6.0.0</Version>
-    <ApplicationIcon />
-    <StartupObject>EspduReceiver.EspduReceiver</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Samples/EspduSender/OpenDis.EspduSender.csproj b/Samples/EspduSender/OpenDis.EspduSender.csproj
index 4611ad0..d41a444 100644
--- a/Samples/EspduSender/OpenDis.EspduSender.csproj
+++ b/Samples/EspduSender/OpenDis.EspduSender.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>EspduSender</RootNamespace>
     <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Version>6.0.0</Version>
-    <StartupObject>EspduSender.EspduSender</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Samples/OpenDis.Demo/OpenDis.Demo.csproj b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
index aab1f04..e94fb3b 100644
--- a/Samples/OpenDis.Demo/OpenDis.Demo.csproj
+++ b/Samples/OpenDis.Demo/OpenDis.Demo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
@@ -12,4 +12,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.2" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Libs\CSharpDis6\OpenDis.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/OpenDis.Demo/OpenDis.Demo.csproj.user b/Samples/OpenDis.Demo/OpenDis.Demo.csproj.user
new file mode 100644
index 0000000..966b4ff
--- /dev/null
+++ b/Samples/OpenDis.Demo/OpenDis.Demo.csproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Samples/OpenDis.Demo/Properties/AssemblyInfo.cs b/Samples/OpenDis.Demo/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6b2a115..0000000
--- a/Samples/OpenDis.Demo/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenDis.Demo")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("OpenDis.Demo")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

From c2930d181c988ef856f6d79fbab0b32a897b3e41 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sun, 10 Oct 2021 19:40:47 +0200
Subject: [PATCH 09/25] [BLD] Set a simple process with nuke

---
 .nuke/build.schema.json         | 109 ++++++++++++++++++++++++++++++++
 .nuke/parameters.json           |   4 ++
 .nuke/temp/build-attempt.log    |   3 +
 OpenDis.sln                     |   4 ++
 build.cmd                       |   7 ++
 build.ps1                       |  69 ++++++++++++++++++++
 build.sh                        |  62 ++++++++++++++++++
 build/.editorconfig             |  11 ++++
 build/Build.cs                  |  70 ++++++++++++++++++++
 build/Configuration.cs          |  16 +++++
 build/Directory.Build.props     |   8 +++
 build/Directory.Build.targets   |   8 +++
 build/_build.csproj             |  18 ++++++
 build/_build.csproj.DotSettings |  26 ++++++++
 global.json                     |   5 ++
 15 files changed, 420 insertions(+)
 create mode 100644 .nuke/build.schema.json
 create mode 100644 .nuke/parameters.json
 create mode 100644 .nuke/temp/build-attempt.log
 create mode 100755 build.cmd
 create mode 100644 build.ps1
 create mode 100755 build.sh
 create mode 100644 build/.editorconfig
 create mode 100644 build/Build.cs
 create mode 100644 build/Configuration.cs
 create mode 100644 build/Directory.Build.props
 create mode 100644 build/Directory.Build.targets
 create mode 100644 build/_build.csproj
 create mode 100644 build/_build.csproj.DotSettings
 create mode 100644 global.json

diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
new file mode 100644
index 0000000..0a1f83f
--- /dev/null
+++ b/.nuke/build.schema.json
@@ -0,0 +1,109 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Build Schema",
+  "$ref": "#/definitions/build",
+  "definitions": {
+    "build": {
+      "type": "object",
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
+          "enum": [
+            "Debug",
+            "Release"
+          ]
+        },
+        "Continue": {
+          "type": "boolean",
+          "description": "Indicates to continue a previously failed build attempt"
+        },
+        "Help": {
+          "type": "boolean",
+          "description": "Shows the help text for this build assembly"
+        },
+        "Host": {
+          "type": "string",
+          "description": "Host for execution. Default is 'automatic'",
+          "enum": [
+            "AppVeyor",
+            "AzurePipelines",
+            "Bamboo",
+            "Bitrise",
+            "GitHubActions",
+            "GitLab",
+            "Jenkins",
+            "Rider",
+            "SpaceAutomation",
+            "TeamCity",
+            "Terminal",
+            "TravisCI",
+            "VisualStudio",
+            "VSCode"
+          ]
+        },
+        "NoLogo": {
+          "type": "boolean",
+          "description": "Disables displaying the NUKE logo"
+        },
+        "Partition": {
+          "type": "string",
+          "description": "Partition to use on CI"
+        },
+        "Plan": {
+          "type": "boolean",
+          "description": "Shows the execution plan (HTML)"
+        },
+        "Profile": {
+          "type": "array",
+          "description": "Defines the profiles to load",
+          "items": {
+            "type": "string"
+          }
+        },
+        "Root": {
+          "type": "string",
+          "description": "Root directory during build execution"
+        },
+        "Skip": {
+          "type": "array",
+          "description": "List of targets to be skipped. Empty list skips all dependencies",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Clean",
+              "Compile",
+              "Restore"
+            ]
+          }
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded"
+        },
+        "Target": {
+          "type": "array",
+          "description": "List of targets to be invoked. Default is '{default_target}'",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Clean",
+              "Compile",
+              "Restore"
+            ]
+          }
+        },
+        "Verbosity": {
+          "type": "string",
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "enum": [
+            "Minimal",
+            "Normal",
+            "Quiet",
+            "Verbose"
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/.nuke/parameters.json b/.nuke/parameters.json
new file mode 100644
index 0000000..add4f5a
--- /dev/null
+++ b/.nuke/parameters.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "./build.schema.json",
+  "Solution": "OpenDis.sln"
+}
\ No newline at end of file
diff --git a/.nuke/temp/build-attempt.log b/.nuke/temp/build-attempt.log
new file mode 100644
index 0000000..5960200
--- /dev/null
+++ b/.nuke/temp/build-attempt.log
@@ -0,0 +1,3 @@
+de70cc5a0b3d2927dc355e752102af8c
+Restore
+Compile
diff --git a/OpenDis.sln b/OpenDis.sln
index 5e56001..7889b91 100644
--- a/OpenDis.sln
+++ b/OpenDis.sln
@@ -15,12 +15,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.EspduSender", "Samp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenDis.EspduReceiver", "Samples\EspduReceiver\OpenDis.EspduReceiver.csproj", "{70F94942-1466-4E6C-A2A3-89DB19C20159}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{E6CD71C8-8157-43AC-94EA-7FE0D664B1A4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E6CD71C8-8157-43AC-94EA-7FE0D664B1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6CD71C8-8157-43AC-94EA-7FE0D664B1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{628EE35F-450A-49B2-BA46-04FABB66D0BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/build.cmd b/build.cmd
new file mode 100755
index 0000000..b08cc59
--- /dev/null
+++ b/build.cmd
@@ -0,0 +1,7 @@
+:; set -eo pipefail
+:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+:; ${SCRIPT_DIR}/build.sh "$@"
+:; exit $?
+
+@ECHO OFF
+powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*
diff --git a/build.ps1 b/build.ps1
new file mode 100644
index 0000000..1c774e5
--- /dev/null
+++ b/build.ps1
@@ -0,0 +1,69 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
+    [string[]]$BuildArguments
+)
+
+Write-Output "PowerShell $($PSVersionTable.PSEdition) version $($PSVersionTable.PSVersion)"
+
+Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { Write-Error $_ -ErrorAction Continue; exit 1 }
+$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
+
+###########################################################################
+# CONFIGURATION
+###########################################################################
+
+$BuildProjectFile = "$PSScriptRoot\build\_build.csproj"
+$TempDirectory = "$PSScriptRoot\\.nuke\temp"
+
+$DotNetGlobalFile = "$PSScriptRoot\\global.json"
+$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
+$DotNetChannel = "Current"
+
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
+$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
+$env:DOTNET_MULTILEVEL_LOOKUP = 0
+
+###########################################################################
+# EXECUTION
+###########################################################################
+
+function ExecSafe([scriptblock] $cmd) {
+    & $cmd
+    if ($LASTEXITCODE) { exit $LASTEXITCODE }
+}
+
+# If dotnet CLI is installed globally and it matches requested version, use for execution
+if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
+     $(dotnet --version) -and $LASTEXITCODE -eq 0) {
+    $env:DOTNET_EXE = (Get-Command "dotnet").Path
+}
+else {
+    # Download install script
+    $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
+    New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+    (New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
+
+    # If global.json exists, load expected version
+    if (Test-Path $DotNetGlobalFile) {
+        $DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
+        if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
+            $DotNetVersion = $DotNetGlobal.sdk.version
+        }
+    }
+
+    # Install by channel or version
+    $DotNetDirectory = "$TempDirectory\dotnet-win"
+    if (!(Test-Path variable:DotNetVersion)) {
+        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
+    } else {
+        ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
+    }
+    $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
+}
+
+Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
+
+ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
+ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..e8961f9
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+bash --version 2>&1 | head -n 1
+
+set -eo pipefail
+SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+
+###########################################################################
+# CONFIGURATION
+###########################################################################
+
+BUILD_PROJECT_FILE="$SCRIPT_DIR/build/_build.csproj"
+TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
+
+DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
+DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
+DOTNET_CHANNEL="Current"
+
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export DOTNET_MULTILEVEL_LOOKUP=0
+
+###########################################################################
+# EXECUTION
+###########################################################################
+
+function FirstJsonValue {
+    perl -nle 'print $1 if m{"'"$1"'": "([^"]+)",?}' <<< "${@:2}"
+}
+
+# If dotnet CLI is installed globally and it matches requested version, use for execution
+if [ -x "$(command -v dotnet)" ] && dotnet --version &>/dev/null; then
+    export DOTNET_EXE="$(command -v dotnet)"
+else
+    # Download install script
+    DOTNET_INSTALL_FILE="$TEMP_DIRECTORY/dotnet-install.sh"
+    mkdir -p "$TEMP_DIRECTORY"
+    curl -Lsfo "$DOTNET_INSTALL_FILE" "$DOTNET_INSTALL_URL"
+    chmod +x "$DOTNET_INSTALL_FILE"
+
+    # If global.json exists, load expected version
+    if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then
+        DOTNET_VERSION=$(FirstJsonValue "version" "$(cat "$DOTNET_GLOBAL_FILE")")
+        if [[ "$DOTNET_VERSION" == ""  ]]; then
+            unset DOTNET_VERSION
+        fi
+    fi
+
+    # Install by channel or version
+    DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
+    if [[ -z ${DOTNET_VERSION+x} ]]; then
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --channel "$DOTNET_CHANNEL" --no-path
+    else
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
+    fi
+    export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
+fi
+
+echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
+
+"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
+"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"
diff --git a/build/.editorconfig b/build/.editorconfig
new file mode 100644
index 0000000..31e43dc
--- /dev/null
+++ b/build/.editorconfig
@@ -0,0 +1,11 @@
+[*.cs]
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+dotnet_style_require_accessibility_modifiers = never:warning
+
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_accessors = true:warning
diff --git a/build/Build.cs b/build/Build.cs
new file mode 100644
index 0000000..c6155f3
--- /dev/null
+++ b/build/Build.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Linq;
+using Nuke.Common;
+using Nuke.Common.CI;
+using Nuke.Common.Execution;
+using Nuke.Common.Git;
+using Nuke.Common.IO;
+using Nuke.Common.ProjectModel;
+using Nuke.Common.Tooling;
+using Nuke.Common.Tools.DotNet;
+using Nuke.Common.Tools.GitVersion;
+using Nuke.Common.Utilities.Collections;
+using static Nuke.Common.EnvironmentInfo;
+using static Nuke.Common.IO.FileSystemTasks;
+using static Nuke.Common.IO.PathConstruction;
+using static Nuke.Common.Tools.DotNet.DotNetTasks;
+
+[CheckBuildProjectConfigurations]
+[ShutdownDotNetAfterServerBuild]
+class Build : NukeBuild
+{
+    /// Support plugins are available for:
+    ///   - JetBrains ReSharper        https://nuke.build/resharper
+    ///   - JetBrains Rider            https://nuke.build/rider
+    ///   - Microsoft VisualStudio     https://nuke.build/visualstudio
+    ///   - Microsoft VSCode           https://nuke.build/vscode
+
+    public static int Main () => Execute<Build>(x => x.Compile);
+
+    [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
+    readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
+
+    [Solution] readonly Solution Solution;
+    [GitRepository] readonly GitRepository GitRepository;
+    [GitVersion] readonly GitVersion GitVersion;
+
+    AbsolutePath SourceDirectory => RootDirectory / "source";
+    AbsolutePath TestsDirectory => RootDirectory / "tests";
+    AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
+
+    Target Clean => _ => _
+        .Before(Restore)
+        .Executes(() =>
+        {
+            SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
+            TestsDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
+            EnsureCleanDirectory(ArtifactsDirectory);
+        });
+
+    Target Restore => _ => _
+        .Executes(() =>
+        {
+            DotNetRestore(s => s
+                .SetProjectFile(Solution));
+        });
+
+    Target Compile => _ => _
+        .DependsOn(Restore)
+        .Executes(() =>
+        {
+            DotNetBuild(s => s
+                .SetProjectFile(Solution)
+                .SetConfiguration(Configuration)
+                .SetAssemblyVersion(GitVersion.AssemblySemVer)
+                .SetFileVersion(GitVersion.AssemblySemFileVer)
+                .SetInformationalVersion(GitVersion.InformationalVersion)
+                .EnableNoRestore());
+        });
+
+}
diff --git a/build/Configuration.cs b/build/Configuration.cs
new file mode 100644
index 0000000..9c08b1a
--- /dev/null
+++ b/build/Configuration.cs
@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using Nuke.Common.Tooling;
+
+[TypeConverter(typeof(TypeConverter<Configuration>))]
+public class Configuration : Enumeration
+{
+    public static Configuration Debug = new Configuration { Value = nameof(Debug) };
+    public static Configuration Release = new Configuration { Value = nameof(Release) };
+
+    public static implicit operator string(Configuration configuration)
+    {
+        return configuration.Value;
+    }
+}
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
new file mode 100644
index 0000000..e147d63
--- /dev/null
+++ b/build/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- This file prevents unintended imports of unrelated MSBuild files -->
+  <!-- Uncomment to include parent Directory.Build.props file -->
+  <!--<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />-->
+
+</Project>
diff --git a/build/Directory.Build.targets b/build/Directory.Build.targets
new file mode 100644
index 0000000..2532609
--- /dev/null
+++ b/build/Directory.Build.targets
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- This file prevents unintended imports of unrelated MSBuild files -->
+  <!-- Uncomment to include parent Directory.Build.targets file -->
+  <!--<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />-->
+
+</Project>
diff --git a/build/_build.csproj b/build/_build.csproj
new file mode 100644
index 0000000..f5f3fee
--- /dev/null
+++ b/build/_build.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace></RootNamespace>
+    <NoWarn>CS0649;CS0169</NoWarn>
+    <NukeRootDirectory>..</NukeRootDirectory>
+    <NukeScriptDirectory>..</NukeScriptDirectory>
+    <NukeTelemetryVersion>1</NukeTelemetryVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nuke.Common" Version="5.3.0" />
+    <PackageDownload Include="GitVersion.Tool" Version="[5.6.7]" />
+  </ItemGroup>
+
+</Project>
diff --git a/build/_build.csproj.DotSettings b/build/_build.csproj.DotSettings
new file mode 100644
index 0000000..c8947fc
--- /dev/null
+++ b/build/_build.csproj.DotSettings
@@ -0,0 +1,26 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=HeapView_002EDelegateAllocation/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableHidesOuterVariable/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Implicit</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">0</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">False</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_ATTRIBUTE_LENGTH_FOR_SAME_LINE/@EntryValue">120</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">IF_OWNER_IS_SINGLE_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..6e34824
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "5.0.401"
+  }
+}
\ No newline at end of file

From f15c8fda0bb86f4c953c7fa1a811d7fa390e2d32 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <mastertnt@users.noreply.github.com>
Date: Sun, 10 Oct 2021 19:50:42 +0200
Subject: [PATCH 10/25] Update README.md

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index d32755a..7ea956f 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,13 @@
 C-Sharp implementation of the Distributed Interactive Simulation (DIS) standard.
 
 Many of the classes were initially generated with [XMLPG](http://github.com/open-dis/xmlpg).
+
+# Build Process
+
+- Install .NET SDK 5.0 from : https://dotnet.microsoft.com/download/dotnet/5.0
+- Depending on your OS, call build.cmd or build.sh
+
+The available commands are :
+- Restore : Restore all dependencies from Nuget
+- Clean : Clean all projects
+- Compile : Compile all projects

From 6b23ef42f6f76e1c7b28bce768259abb89298036 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sun, 10 Oct 2021 21:04:51 +0200
Subject: [PATCH 11/25] [BLD]  Add pack process for nuget

---
 .nuke/build.schema.json |  2 ++
 build/Build.cs          | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index 0a1f83f..38767b2 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -73,6 +73,7 @@
             "enum": [
               "Clean",
               "Compile",
+              "Pack",
               "Restore"
             ]
           }
@@ -89,6 +90,7 @@
             "enum": [
               "Clean",
               "Compile",
+              "Pack",
               "Restore"
             ]
           }
diff --git a/build/Build.cs b/build/Build.cs
index c6155f3..45b531c 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -67,4 +67,18 @@ class Build : NukeBuild
                 .EnableNoRestore());
         });
 
+      Target Pack => _ => _
+      .DependsOn(Compile)
+      .Executes(() =>
+      {
+          DotNetPack(s => s
+              .SetProject(Solution.GetProject("OpenDis"))
+              .SetConfiguration(Configuration)
+              .EnableNoBuild()
+              .EnableNoRestore()
+              .SetNoDependencies(true)
+              .SetOutputDirectory(ArtifactsDirectory / "nuget"));
+
+      });
+
 }

From f448f5685e4543dfd1b0b0c724ca76fbd84e44f6 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sun, 10 Oct 2021 21:09:35 +0200
Subject: [PATCH 12/25] [QLTY]  Remove temp directory

---
 .nuke/temp/build-attempt.log | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .nuke/temp/build-attempt.log

diff --git a/.nuke/temp/build-attempt.log b/.nuke/temp/build-attempt.log
deleted file mode 100644
index 5960200..0000000
--- a/.nuke/temp/build-attempt.log
+++ /dev/null
@@ -1,3 +0,0 @@
-de70cc5a0b3d2927dc355e752102af8c
-Restore
-Compile

From c73bd63c714efdcb1268ac27a060f7e902674ecb Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sun, 10 Oct 2021 21:12:27 +0200
Subject: [PATCH 13/25] [QLTY] Change readme with pack

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7ea956f..7f14175 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,10 @@ Many of the classes were initially generated with [XMLPG](http://github.com/open
 # Build Process
 
 - Install .NET SDK 5.0 from : https://dotnet.microsoft.com/download/dotnet/5.0
-- Depending on your OS, call build.cmd or build.sh
+- Depending on your OS, call build.ps1 or build.sh
 
 The available commands are :
 - Restore : Restore all dependencies from Nuget
 - Clean : Clean all projects
 - Compile : Compile all projects
+- Pack : Create a nuget package in sub-directory (artifacts)

From 37a3e350f0367924c3e5b81ae750b7022b8f4ad2 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sun, 10 Oct 2021 21:13:52 +0200
Subject: [PATCH 14/25] [QLTY]  Add more informations

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7f14175..325515f 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ Many of the classes were initially generated with [XMLPG](http://github.com/open
 
 - Install .NET SDK 5.0 from : https://dotnet.microsoft.com/download/dotnet/5.0
 - Depending on your OS, call build.ps1 or build.sh
+-- To compile in release : build --configuration release
+-- To compile in debug : build
 
 The available commands are :
 - Restore : Restore all dependencies from Nuget

From c6476b08aab6964f198499672d3120225170eafa Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sun, 10 Oct 2021 21:16:23 +0200
Subject: [PATCH 15/25] [QLTY] Add DIS7 lib (to integrate)

---
 Libs/CSharpDis7/AcknowledgePdu.cs             |  414 +++++
 Libs/CSharpDis7/AcknowledgeReliablePdu.cs     |  345 ++++
 Libs/CSharpDis7/AcousticEmitter.cs            |  341 ++++
 Libs/CSharpDis7/ActionRequestPdu.cs           |  588 ++++++
 Libs/CSharpDis7/ActionRequestReliablePdu.cs   |  615 +++++++
 Libs/CSharpDis7/ActionResponsePdu.cs          |  588 ++++++
 Libs/CSharpDis7/ActionResponseReliablePdu.cs  |  519 ++++++
 Libs/CSharpDis7/AggregateIdentifier.cs        |  312 ++++
 Libs/CSharpDis7/AggregateMarking.cs           |  335 ++++
 Libs/CSharpDis7/AggregateType.cs              |  463 +++++
 Libs/CSharpDis7/AngleDeception.cs             |  661 +++++++
 Libs/CSharpDis7/AngularVelocityVector.cs      |  341 ++++
 Libs/CSharpDis7/AntennaLocation.cs            |  315 ++++
 Libs/CSharpDis7/ArealObjectStatePdu.cs        |  685 +++++++
 Libs/CSharpDis7/ArticulatedParts.cs           |  405 +++++
 Libs/CSharpDis7/Association.cs                |  367 ++++
 Libs/CSharpDis7/AttachedParts.cs              |  405 +++++
 Libs/CSharpDis7/Attribute.cs                  |  323 ++++
 Libs/CSharpDis7/AttributePdu.cs               |  539 ++++++
 Libs/CSharpDis7/BeamAntennaPattern.cs         |  538 ++++++
 Libs/CSharpDis7/BeamData.cs                   |  405 +++++
 Libs/CSharpDis7/BeamStatus.cs                 |  277 +++
 Libs/CSharpDis7/BlankingSector.cs             |  505 ++++++
 Libs/CSharpDis7/ChangeOptions.cs              |  245 +++
 Libs/CSharpDis7/ClockTime.cs                  |  309 ++++
 Libs/CSharpDis7/CollisionElasticPdu.cs        |  745 ++++++++
 Libs/CSharpDis7/CollisionPdu.cs               |  519 ++++++
 Libs/CSharpDis7/CommentPdu.cs                 |  455 +++++
 Libs/CSharpDis7/CommentReliablePdu.cs         |  455 +++++
 Libs/CSharpDis7/CommunicationsNodeID.cs       |  300 ++++
 Libs/CSharpDis7/CreateEntityPdu.cs            |  350 ++++
 Libs/CSharpDis7/CreateEntityReliablePdu.cs    |  377 ++++
 Libs/CSharpDis7/DataPdu.cs                    |  519 ++++++
 .../CSharpDis7/DataQueryDatumSpecification.cs |  451 +++++
 Libs/CSharpDis7/DataQueryPdu.cs               |  519 ++++++
 Libs/CSharpDis7/DataQueryReliablePdu.cs       |  615 +++++++
 Libs/CSharpDis7/DataReliablePdu.cs            |  583 ++++++
 Libs/CSharpDis7/DatumSpecification.cs         |  451 +++++
 Libs/CSharpDis7/DeadReckoningParameters.cs    |  404 +++++
 Libs/CSharpDis7/DesignatorPdu.cs              |  646 +++++++
 Libs/CSharpDis7/DetonationPdu.cs              |  625 +++++++
 Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs |  547 ++++++
 Libs/CSharpDis7/DirectedEnergyDamage.cs       |  635 +++++++
 Libs/CSharpDis7/DirectedEnergyFirePdu.cs      |  809 +++++++++
 .../DirectedEnergyPrecisionAimpoint.cs        |  674 +++++++
 .../DirectedEnergyTargetEnergyDeposition.cs   |  344 ++++
 .../DistributedEmissionsFamilyPdu.cs          |  248 +++
 Libs/CSharpDis7/EEFundamentalParameterData.cs |  405 +++++
 Libs/CSharpDis7/EightByteChunk.cs             |  303 ++++
 Libs/CSharpDis7/ElectronicEmissionsPdu.cs     |  620 +++++++
 Libs/CSharpDis7/EmitterSystem.cs              |  341 ++++
 Libs/CSharpDis7/EngineFuel.cs                 |  405 +++++
 Libs/CSharpDis7/EngineFuelReload.cs           |  469 +++++
 Libs/CSharpDis7/EntityAssociation.cs          |  536 ++++++
 Libs/CSharpDis7/EntityDamageStatusPdu.cs      |  451 +++++
 Libs/CSharpDis7/EntityID.cs                   |  312 ++++
 Libs/CSharpDis7/EntityInformationFamilyPdu.cs |  248 +++
 Libs/CSharpDis7/EntityManagementFamilyPdu.cs  |  248 +++
 Libs/CSharpDis7/EntityMarking.cs              |  335 ++++
 Libs/CSharpDis7/EntityStatePdu.cs             |  721 ++++++++
 Libs/CSharpDis7/EntityStateUpdatePdu.cs       |  557 ++++++
 Libs/CSharpDis7/EntityType.cs                 |  463 +++++
 Libs/CSharpDis7/EntityTypeVP.cs               |  408 +++++
 Libs/CSharpDis7/Environment.cs                |  373 ++++
 Libs/CSharpDis7/EnvironmentGeneral.cs         |  437 +++++
 Libs/CSharpDis7/EnvironmentType.cs            |  463 +++++
 Libs/CSharpDis7/EulerAngles.cs                |  323 ++++
 Libs/CSharpDis7/EventIdentifier.cs            |  306 ++++
 Libs/CSharpDis7/EventIdentifierLiveEntity.cs  |  323 ++++
 Libs/CSharpDis7/EventReportPdu.cs             |  519 ++++++
 Libs/CSharpDis7/EventReportReliablePdu.cs     |  519 ++++++
 Libs/CSharpDis7/Expendable.cs                 |  384 ++++
 Libs/CSharpDis7/ExpendableDescriptor.cs       |  312 ++++
 Libs/CSharpDis7/ExpendableReload.cs           |  410 +++++
 Libs/CSharpDis7/ExplosionDescriptor.cs        |  376 ++++
 Libs/CSharpDis7/FalseTargetsAttribute.cs      |  609 +++++++
 Libs/CSharpDis7/FastEntityStatePdu.cs         | 1590 +++++++++++++++++
 Libs/CSharpDis7/FirePdu.cs                    |  488 +++++
 Libs/CSharpDis7/FixedDatum.cs                 |  309 ++++
 Libs/CSharpDis7/FourByteChunk.cs              |  303 ++++
 Libs/CSharpDis7/FundamentalOperationalData.cs |  565 ++++++
 Libs/CSharpDis7/GridAxis.cs                   |  469 +++++
 Libs/CSharpDis7/GroupIdentifier.cs            |  312 ++++
 .../CSharpDis7/IFFFundamentalParameterData.cs |  495 +++++
 Libs/CSharpDis7/IOCommunicationsNode.cs       |  404 +++++
 Libs/CSharpDis7/IOEffect.cs                   |  482 +++++
 Libs/CSharpDis7/IffDataSpecification.cs       |  280 +++
 .../IntercomCommunicationsParameters.cs       |  341 ++++
 Libs/CSharpDis7/IntercomIdentifier.cs         |  349 ++++
 Libs/CSharpDis7/IntercomSignalPdu.cs          |  525 ++++++
 Libs/CSharpDis7/IsPartOfPdu.cs                |  458 +++++
 Libs/CSharpDis7/JammingTechnique.cs           |  349 ++++
 Libs/CSharpDis7/LaunchedMunitionRecord.cs     |  437 +++++
 Libs/CSharpDis7/LayerHeader.cs                |  335 ++++
 Libs/CSharpDis7/LinearObjectStatePdu.cs       |  589 ++++++
 Libs/CSharpDis7/LinearSegmentParameter.cs     |  571 ++++++
 Libs/CSharpDis7/LiveEntityIdentifier.cs       |  312 ++++
 Libs/CSharpDis7/LiveEntityPdu.cs              |  301 ++++
 Libs/CSharpDis7/LiveSimulationAddress.cs      |  309 ++++
 Libs/CSharpDis7/LogisticsFamilyPdu.cs         |  248 +++
 Libs/CSharpDis7/MineEntityIdentifier.cs       |  312 ++++
 Libs/CSharpDis7/MinefieldFamilyPdu.cs         |  248 +++
 Libs/CSharpDis7/MinefieldIdentifier.cs        |  312 ++++
 Libs/CSharpDis7/MinefieldResponseNackPdu.cs   |  453 +++++
 Libs/CSharpDis7/MinefieldStatePdu.cs          |  723 ++++++++
 Libs/CSharpDis7/ModulationParameters.cs       |  245 +++
 Libs/CSharpDis7/ModulationType.cs             |  373 ++++
 Libs/CSharpDis7/Munition.cs                   |  408 +++++
 Libs/CSharpDis7/MunitionDescriptor.cs         |  408 +++++
 Libs/CSharpDis7/MunitionReload.cs             |  440 +++++
 .../CSharpDis7/NamedLocationIdentification.cs |  309 ++++
 Libs/CSharpDis7/ObjectIdentifier.cs           |  312 ++++
 Libs/CSharpDis7/ObjectType.cs                 |  373 ++++
 Libs/CSharpDis7/OneByteChunk.cs               |  303 ++++
 Libs/CSharpDis7/OwnershipStatus.cs            |  344 ++++
 Libs/CSharpDis7/Pdu.cs                        |  301 ++++
 Libs/CSharpDis7/PduContainer.cs               |  348 ++++
 Libs/CSharpDis7/PduHeader.cs                  |  501 ++++++
 Libs/CSharpDis7/PduStatus.cs                  |  277 +++
 Libs/CSharpDis7/PduSuperclass.cs              |  437 +++++
 Libs/CSharpDis7/PointObjectStatePdu.cs        |  652 +++++++
 Libs/CSharpDis7/PropulsionSystemData.cs       |  309 ++++
 .../RadioCommunicationsFamilyPdu.cs           |  316 ++++
 Libs/CSharpDis7/RadioIdentifier.cs            |  373 ++++
 Libs/CSharpDis7/RadioType.cs                  |  457 +++++
 Libs/CSharpDis7/ReceiverPdu.cs                |  412 +++++
 Libs/CSharpDis7/RecordQueryReliablePdu.cs     |  544 ++++++
 Libs/CSharpDis7/RecordQuerySpecification.cs   |  345 ++++
 Libs/CSharpDis7/RecordSpecification.cs        |  348 ++++
 Libs/CSharpDis7/RecordSpecificationElement.cs |  437 +++++
 Libs/CSharpDis7/Relationship.cs               |  309 ++++
 Libs/CSharpDis7/RemoveEntityPdu.cs            |  350 ++++
 Libs/CSharpDis7/RemoveEntityReliablePdu.cs    |  377 ++++
 Libs/CSharpDis7/RepairCompletePdu.cs          |  382 ++++
 Libs/CSharpDis7/RepairResponsePdu.cs          |  414 +++++
 Libs/CSharpDis7/ResupplyOfferPdu.cs           |  485 +++++
 Libs/CSharpDis7/ResupplyReceivedPdu.cs        |  485 +++++
 Libs/CSharpDis7/SecondaryOperationalData.cs   |  341 ++++
 Libs/CSharpDis7/SeesPdu.cs                    |  586 ++++++
 Libs/CSharpDis7/Sensor.cs                     |  437 +++++
 Libs/CSharpDis7/SeparationVP.cs               |  472 +++++
 Libs/CSharpDis7/ServiceRequestPdu.cs          |  479 +++++
 Libs/CSharpDis7/SetDataPdu.cs                 |  519 ++++++
 Libs/CSharpDis7/SetDataReliablePdu.cs         |  583 ++++++
 Libs/CSharpDis7/SimulationAddress.cs          |  309 ++++
 Libs/CSharpDis7/SimulationIdentifier.cs       |  312 ++++
 .../SimulationManagementFamilyPdu.cs          |  318 ++++
 .../SimulationManagementPduHeader.cs          |  349 ++++
 ...ationManagementWithReliabilityFamilyPdu.cs |  318 ++++
 .../StandardVariableSpecification.cs          |  348 ++++
 Libs/CSharpDis7/StartResumePdu.cs             |  419 +++++
 Libs/CSharpDis7/StartResumeReliablePdu.cs     |  446 +++++
 Libs/CSharpDis7/StopFreezePdu.cs              |  481 +++++
 Libs/CSharpDis7/StopFreezeReliablePdu.cs      |  444 +++++
 Libs/CSharpDis7/StorageFuel.cs                |  405 +++++
 Libs/CSharpDis7/StorageFuelReload.cs          |  501 ++++++
 Libs/CSharpDis7/SupplyQuantity.cs             |  312 ++++
 .../SyntheticEnvironmentFamilyPdu.cs          |  248 +++
 Libs/CSharpDis7/SystemIdentifier.cs           |  376 ++++
 Libs/CSharpDis7/TotalRecordSets.cs            |  309 ++++
 Libs/CSharpDis7/TrackJamData.cs               |  344 ++++
 Libs/CSharpDis7/TwoByteChunk.cs               |  303 ++++
 Libs/CSharpDis7/UAFundamentalParameter.cs     |  437 +++++
 Libs/CSharpDis7/UaPdu.cs                      |  756 ++++++++
 Libs/CSharpDis7/UnattachedIdentifier.cs       |  312 ++++
 Libs/CSharpDis7/UnsignedDISInteger.cs         |  277 +++
 Libs/CSharpDis7/VariableDatum.cs              |  373 ++++
 Libs/CSharpDis7/VariableParameter.cs          |  405 +++++
 .../VariableTransmitterParameters.cs          |  309 ++++
 Libs/CSharpDis7/Vector2Float.cs               |  309 ++++
 Libs/CSharpDis7/Vector3Double.cs              |  341 ++++
 Libs/CSharpDis7/Vector3Float.cs               |  341 ++++
 Libs/CSharpDis7/VectoringNozzleSystem.cs      |  309 ++++
 Libs/CSharpDis7/WarfareFamilyPdu.cs           |  318 ++++
 174 files changed, 73976 insertions(+)
 create mode 100644 Libs/CSharpDis7/AcknowledgePdu.cs
 create mode 100644 Libs/CSharpDis7/AcknowledgeReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/AcousticEmitter.cs
 create mode 100644 Libs/CSharpDis7/ActionRequestPdu.cs
 create mode 100644 Libs/CSharpDis7/ActionRequestReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/ActionResponsePdu.cs
 create mode 100644 Libs/CSharpDis7/ActionResponseReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/AggregateIdentifier.cs
 create mode 100644 Libs/CSharpDis7/AggregateMarking.cs
 create mode 100644 Libs/CSharpDis7/AggregateType.cs
 create mode 100644 Libs/CSharpDis7/AngleDeception.cs
 create mode 100644 Libs/CSharpDis7/AngularVelocityVector.cs
 create mode 100644 Libs/CSharpDis7/AntennaLocation.cs
 create mode 100644 Libs/CSharpDis7/ArealObjectStatePdu.cs
 create mode 100644 Libs/CSharpDis7/ArticulatedParts.cs
 create mode 100644 Libs/CSharpDis7/Association.cs
 create mode 100644 Libs/CSharpDis7/AttachedParts.cs
 create mode 100644 Libs/CSharpDis7/Attribute.cs
 create mode 100644 Libs/CSharpDis7/AttributePdu.cs
 create mode 100644 Libs/CSharpDis7/BeamAntennaPattern.cs
 create mode 100644 Libs/CSharpDis7/BeamData.cs
 create mode 100644 Libs/CSharpDis7/BeamStatus.cs
 create mode 100644 Libs/CSharpDis7/BlankingSector.cs
 create mode 100644 Libs/CSharpDis7/ChangeOptions.cs
 create mode 100644 Libs/CSharpDis7/ClockTime.cs
 create mode 100644 Libs/CSharpDis7/CollisionElasticPdu.cs
 create mode 100644 Libs/CSharpDis7/CollisionPdu.cs
 create mode 100644 Libs/CSharpDis7/CommentPdu.cs
 create mode 100644 Libs/CSharpDis7/CommentReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/CommunicationsNodeID.cs
 create mode 100644 Libs/CSharpDis7/CreateEntityPdu.cs
 create mode 100644 Libs/CSharpDis7/CreateEntityReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/DataPdu.cs
 create mode 100644 Libs/CSharpDis7/DataQueryDatumSpecification.cs
 create mode 100644 Libs/CSharpDis7/DataQueryPdu.cs
 create mode 100644 Libs/CSharpDis7/DataQueryReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/DataReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/DatumSpecification.cs
 create mode 100644 Libs/CSharpDis7/DeadReckoningParameters.cs
 create mode 100644 Libs/CSharpDis7/DesignatorPdu.cs
 create mode 100644 Libs/CSharpDis7/DetonationPdu.cs
 create mode 100644 Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
 create mode 100644 Libs/CSharpDis7/DirectedEnergyDamage.cs
 create mode 100644 Libs/CSharpDis7/DirectedEnergyFirePdu.cs
 create mode 100644 Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
 create mode 100644 Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
 create mode 100644 Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/EEFundamentalParameterData.cs
 create mode 100644 Libs/CSharpDis7/EightByteChunk.cs
 create mode 100644 Libs/CSharpDis7/ElectronicEmissionsPdu.cs
 create mode 100644 Libs/CSharpDis7/EmitterSystem.cs
 create mode 100644 Libs/CSharpDis7/EngineFuel.cs
 create mode 100644 Libs/CSharpDis7/EngineFuelReload.cs
 create mode 100644 Libs/CSharpDis7/EntityAssociation.cs
 create mode 100644 Libs/CSharpDis7/EntityDamageStatusPdu.cs
 create mode 100644 Libs/CSharpDis7/EntityID.cs
 create mode 100644 Libs/CSharpDis7/EntityInformationFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/EntityManagementFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/EntityMarking.cs
 create mode 100644 Libs/CSharpDis7/EntityStatePdu.cs
 create mode 100644 Libs/CSharpDis7/EntityStateUpdatePdu.cs
 create mode 100644 Libs/CSharpDis7/EntityType.cs
 create mode 100644 Libs/CSharpDis7/EntityTypeVP.cs
 create mode 100644 Libs/CSharpDis7/Environment.cs
 create mode 100644 Libs/CSharpDis7/EnvironmentGeneral.cs
 create mode 100644 Libs/CSharpDis7/EnvironmentType.cs
 create mode 100644 Libs/CSharpDis7/EulerAngles.cs
 create mode 100644 Libs/CSharpDis7/EventIdentifier.cs
 create mode 100644 Libs/CSharpDis7/EventIdentifierLiveEntity.cs
 create mode 100644 Libs/CSharpDis7/EventReportPdu.cs
 create mode 100644 Libs/CSharpDis7/EventReportReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/Expendable.cs
 create mode 100644 Libs/CSharpDis7/ExpendableDescriptor.cs
 create mode 100644 Libs/CSharpDis7/ExpendableReload.cs
 create mode 100644 Libs/CSharpDis7/ExplosionDescriptor.cs
 create mode 100644 Libs/CSharpDis7/FalseTargetsAttribute.cs
 create mode 100644 Libs/CSharpDis7/FastEntityStatePdu.cs
 create mode 100644 Libs/CSharpDis7/FirePdu.cs
 create mode 100644 Libs/CSharpDis7/FixedDatum.cs
 create mode 100644 Libs/CSharpDis7/FourByteChunk.cs
 create mode 100644 Libs/CSharpDis7/FundamentalOperationalData.cs
 create mode 100644 Libs/CSharpDis7/GridAxis.cs
 create mode 100644 Libs/CSharpDis7/GroupIdentifier.cs
 create mode 100644 Libs/CSharpDis7/IFFFundamentalParameterData.cs
 create mode 100644 Libs/CSharpDis7/IOCommunicationsNode.cs
 create mode 100644 Libs/CSharpDis7/IOEffect.cs
 create mode 100644 Libs/CSharpDis7/IffDataSpecification.cs
 create mode 100644 Libs/CSharpDis7/IntercomCommunicationsParameters.cs
 create mode 100644 Libs/CSharpDis7/IntercomIdentifier.cs
 create mode 100644 Libs/CSharpDis7/IntercomSignalPdu.cs
 create mode 100644 Libs/CSharpDis7/IsPartOfPdu.cs
 create mode 100644 Libs/CSharpDis7/JammingTechnique.cs
 create mode 100644 Libs/CSharpDis7/LaunchedMunitionRecord.cs
 create mode 100644 Libs/CSharpDis7/LayerHeader.cs
 create mode 100644 Libs/CSharpDis7/LinearObjectStatePdu.cs
 create mode 100644 Libs/CSharpDis7/LinearSegmentParameter.cs
 create mode 100644 Libs/CSharpDis7/LiveEntityIdentifier.cs
 create mode 100644 Libs/CSharpDis7/LiveEntityPdu.cs
 create mode 100644 Libs/CSharpDis7/LiveSimulationAddress.cs
 create mode 100644 Libs/CSharpDis7/LogisticsFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/MineEntityIdentifier.cs
 create mode 100644 Libs/CSharpDis7/MinefieldFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/MinefieldIdentifier.cs
 create mode 100644 Libs/CSharpDis7/MinefieldResponseNackPdu.cs
 create mode 100644 Libs/CSharpDis7/MinefieldStatePdu.cs
 create mode 100644 Libs/CSharpDis7/ModulationParameters.cs
 create mode 100644 Libs/CSharpDis7/ModulationType.cs
 create mode 100644 Libs/CSharpDis7/Munition.cs
 create mode 100644 Libs/CSharpDis7/MunitionDescriptor.cs
 create mode 100644 Libs/CSharpDis7/MunitionReload.cs
 create mode 100644 Libs/CSharpDis7/NamedLocationIdentification.cs
 create mode 100644 Libs/CSharpDis7/ObjectIdentifier.cs
 create mode 100644 Libs/CSharpDis7/ObjectType.cs
 create mode 100644 Libs/CSharpDis7/OneByteChunk.cs
 create mode 100644 Libs/CSharpDis7/OwnershipStatus.cs
 create mode 100644 Libs/CSharpDis7/Pdu.cs
 create mode 100644 Libs/CSharpDis7/PduContainer.cs
 create mode 100644 Libs/CSharpDis7/PduHeader.cs
 create mode 100644 Libs/CSharpDis7/PduStatus.cs
 create mode 100644 Libs/CSharpDis7/PduSuperclass.cs
 create mode 100644 Libs/CSharpDis7/PointObjectStatePdu.cs
 create mode 100644 Libs/CSharpDis7/PropulsionSystemData.cs
 create mode 100644 Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/RadioIdentifier.cs
 create mode 100644 Libs/CSharpDis7/RadioType.cs
 create mode 100644 Libs/CSharpDis7/ReceiverPdu.cs
 create mode 100644 Libs/CSharpDis7/RecordQueryReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/RecordQuerySpecification.cs
 create mode 100644 Libs/CSharpDis7/RecordSpecification.cs
 create mode 100644 Libs/CSharpDis7/RecordSpecificationElement.cs
 create mode 100644 Libs/CSharpDis7/Relationship.cs
 create mode 100644 Libs/CSharpDis7/RemoveEntityPdu.cs
 create mode 100644 Libs/CSharpDis7/RemoveEntityReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/RepairCompletePdu.cs
 create mode 100644 Libs/CSharpDis7/RepairResponsePdu.cs
 create mode 100644 Libs/CSharpDis7/ResupplyOfferPdu.cs
 create mode 100644 Libs/CSharpDis7/ResupplyReceivedPdu.cs
 create mode 100644 Libs/CSharpDis7/SecondaryOperationalData.cs
 create mode 100644 Libs/CSharpDis7/SeesPdu.cs
 create mode 100644 Libs/CSharpDis7/Sensor.cs
 create mode 100644 Libs/CSharpDis7/SeparationVP.cs
 create mode 100644 Libs/CSharpDis7/ServiceRequestPdu.cs
 create mode 100644 Libs/CSharpDis7/SetDataPdu.cs
 create mode 100644 Libs/CSharpDis7/SetDataReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/SimulationAddress.cs
 create mode 100644 Libs/CSharpDis7/SimulationIdentifier.cs
 create mode 100644 Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/SimulationManagementPduHeader.cs
 create mode 100644 Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/StandardVariableSpecification.cs
 create mode 100644 Libs/CSharpDis7/StartResumePdu.cs
 create mode 100644 Libs/CSharpDis7/StartResumeReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/StopFreezePdu.cs
 create mode 100644 Libs/CSharpDis7/StopFreezeReliablePdu.cs
 create mode 100644 Libs/CSharpDis7/StorageFuel.cs
 create mode 100644 Libs/CSharpDis7/StorageFuelReload.cs
 create mode 100644 Libs/CSharpDis7/SupplyQuantity.cs
 create mode 100644 Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
 create mode 100644 Libs/CSharpDis7/SystemIdentifier.cs
 create mode 100644 Libs/CSharpDis7/TotalRecordSets.cs
 create mode 100644 Libs/CSharpDis7/TrackJamData.cs
 create mode 100644 Libs/CSharpDis7/TwoByteChunk.cs
 create mode 100644 Libs/CSharpDis7/UAFundamentalParameter.cs
 create mode 100644 Libs/CSharpDis7/UaPdu.cs
 create mode 100644 Libs/CSharpDis7/UnattachedIdentifier.cs
 create mode 100644 Libs/CSharpDis7/UnsignedDISInteger.cs
 create mode 100644 Libs/CSharpDis7/VariableDatum.cs
 create mode 100644 Libs/CSharpDis7/VariableParameter.cs
 create mode 100644 Libs/CSharpDis7/VariableTransmitterParameters.cs
 create mode 100644 Libs/CSharpDis7/Vector2Float.cs
 create mode 100644 Libs/CSharpDis7/Vector3Double.cs
 create mode 100644 Libs/CSharpDis7/Vector3Float.cs
 create mode 100644 Libs/CSharpDis7/VectoringNozzleSystem.cs
 create mode 100644 Libs/CSharpDis7/WarfareFamilyPdu.cs

diff --git a/Libs/CSharpDis7/AcknowledgePdu.cs b/Libs/CSharpDis7/AcknowledgePdu.cs
new file mode 100644
index 0000000..7897ac4
--- /dev/null
+++ b/Libs/CSharpDis7/AcknowledgePdu.cs
@@ -0,0 +1,414 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.6. Acknowledge the receipt of a start/resume, stop/freeze, or RemoveEntityPDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class AcknowledgePdu : SimulationManagementFamilyPdu, IEquatable<AcknowledgePdu>
+    {
+        /// <summary>
+        /// Identifier for originating entity(or simulation)
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the receiving entity(or simulation)
+        /// </summary>
+        private EntityID _receivingID = new EntityID();
+
+        /// <summary>
+        /// type of message being acknowledged
+        /// </summary>
+        private ushort _acknowledgeFlag;
+
+        /// <summary>
+        /// Whether or not the receiving entity was able to comply with the request
+        /// </summary>
+        private ushort _responseFlag;
+
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcknowledgePdu"/> class.
+        /// </summary>
+        public AcknowledgePdu()
+        {
+            PduType = (byte)15;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcknowledgePdu left, AcknowledgePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcknowledgePdu left, AcknowledgePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += 2;  // this._acknowledgeFlag
+            marshalSize += 2;  // this._responseFlag
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for originating entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the receiving entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
+        public EntityID ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of message being acknowledged
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
+        public ushort AcknowledgeFlag
+        {
+            get
+            {
+                return this._acknowledgeFlag;
+            }
+
+            set
+            {
+                this._acknowledgeFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Whether or not the receiving entity was able to comply with the request
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
+        public ushort ResponseFlag
+        {
+            get
+            {
+                return this._responseFlag;
+            }
+
+            set
+            {
+                this._responseFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
+                    dos.WriteUnsignedShort((ushort)this._responseFlag);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._acknowledgeFlag = dis.ReadUnsignedShort();
+                    this._responseFlag = dis.ReadUnsignedShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcknowledgePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
+                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</AcknowledgePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcknowledgePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcknowledgePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._acknowledgeFlag != obj._acknowledgeFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._responseFlag != obj._responseFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AcknowledgeReliablePdu.cs b/Libs/CSharpDis7/AcknowledgeReliablePdu.cs
new file mode 100644
index 0000000..515cd4d
--- /dev/null
+++ b/Libs/CSharpDis7/AcknowledgeReliablePdu.cs
@@ -0,0 +1,345 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.5: Ack receipt of a start-resume, stop-freeze, create-entity or remove enitty (reliable) pdus. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcknowledgeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<AcknowledgeReliablePdu>
+    {
+        /// <summary>
+        /// ack flags
+        /// </summary>
+        private ushort _acknowledgeFlag;
+
+        /// <summary>
+        /// response flags
+        /// </summary>
+        private ushort _responseFlag;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcknowledgeReliablePdu"/> class.
+        /// </summary>
+        public AcknowledgeReliablePdu()
+        {
+            PduType = (byte)55;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcknowledgeReliablePdu left, AcknowledgeReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._acknowledgeFlag
+            marshalSize += 2;  // this._responseFlag
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ack flags
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acknowledgeFlag")]
+        public ushort AcknowledgeFlag
+        {
+            get
+            {
+                return this._acknowledgeFlag;
+            }
+
+            set
+            {
+                this._acknowledgeFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the response flags
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "responseFlag")]
+        public ushort ResponseFlag
+        {
+            get
+            {
+                return this._responseFlag;
+            }
+
+            set
+            {
+                this._responseFlag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._acknowledgeFlag);
+                    dos.WriteUnsignedShort((ushort)this._responseFlag);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._acknowledgeFlag = dis.ReadUnsignedShort();
+                    this._responseFlag = dis.ReadUnsignedShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcknowledgeReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<acknowledgeFlag type=\"ushort\">" + this._acknowledgeFlag.ToString(CultureInfo.InvariantCulture) + "</acknowledgeFlag>");
+                sb.AppendLine("<responseFlag type=\"ushort\">" + this._responseFlag.ToString(CultureInfo.InvariantCulture) + "</responseFlag>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</AcknowledgeReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcknowledgeReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcknowledgeReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._acknowledgeFlag != obj._acknowledgeFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._responseFlag != obj._responseFlag)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._acknowledgeFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._responseFlag.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AcousticEmitter.cs b/Libs/CSharpDis7/AcousticEmitter.cs
new file mode 100644
index 0000000..ea7d371
--- /dev/null
+++ b/Libs/CSharpDis7/AcousticEmitter.cs
@@ -0,0 +1,341 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  information about a specific UA emmtter. Section 6.2.2.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AcousticEmitter
+    {
+        /// <summary>
+        /// the system for a particular UA emitter, and an enumeration
+        /// </summary>
+        private ushort _acousticName;
+
+        /// <summary>
+        /// The function of the acoustic system
+        /// </summary>
+        private byte _function;
+
+        /// <summary>
+        /// The UA emitter identification number relative to a specific system
+        /// </summary>
+        private byte _acousticIdNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AcousticEmitter"/> class.
+        /// </summary>
+        public AcousticEmitter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AcousticEmitter left, AcousticEmitter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AcousticEmitter left, AcousticEmitter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._acousticName
+            marshalSize += 1;  // this._function
+            marshalSize += 1;  // this._acousticIdNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the system for a particular UA emitter, and an enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acousticName")]
+        public ushort AcousticName
+        {
+            get
+            {
+                return this._acousticName;
+            }
+
+            set
+            {
+                this._acousticName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The function of the acoustic system
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "function")]
+        public byte Function
+        {
+            get
+            {
+                return this._function;
+            }
+
+            set
+            {
+                this._function = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The UA emitter identification number relative to a specific system
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "acousticIdNumber")]
+        public byte AcousticIdNumber
+        {
+            get
+            {
+                return this._acousticIdNumber;
+            }
+
+            set
+            {
+                this._acousticIdNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._acousticName);
+                    dos.WriteUnsignedByte((byte)this._function);
+                    dos.WriteUnsignedByte((byte)this._acousticIdNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._acousticName = dis.ReadUnsignedShort();
+                    this._function = dis.ReadUnsignedByte();
+                    this._acousticIdNumber = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AcousticEmitter>");
+            try
+            {
+                sb.AppendLine("<acousticName type=\"ushort\">" + this._acousticName.ToString(CultureInfo.InvariantCulture) + "</acousticName>");
+                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
+                sb.AppendLine("<acousticIdNumber type=\"byte\">" + this._acousticIdNumber.ToString(CultureInfo.InvariantCulture) + "</acousticIdNumber>");
+                sb.AppendLine("</AcousticEmitter>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AcousticEmitter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AcousticEmitter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._acousticName != obj._acousticName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._function != obj._function)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._acousticIdNumber != obj._acousticIdNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._acousticName.GetHashCode();
+            result = GenerateHash(result) ^ this._function.GetHashCode();
+            result = GenerateHash(result) ^ this._acousticIdNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ActionRequestPdu.cs b/Libs/CSharpDis7/ActionRequestPdu.cs
new file mode 100644
index 0000000..4622583
--- /dev/null
+++ b/Libs/CSharpDis7/ActionRequestPdu.cs
@@ -0,0 +1,588 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.7. Request from simulation manager to a managed entity to perform a specified action. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionRequestPdu : SimulationManagementFamilyPdu, IEquatable<ActionRequestPdu>
+    {
+        /// <summary>
+        /// Identifier for originating entity(or simulation)
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the receiving entity(or simulation)
+        /// </summary>
+        private EntityID _receivingID = new EntityID();
+
+        /// <summary>
+        /// identifies the request being made by the simulaton manager
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// identifies the particular action being requested(see Section 7 of SISO-REF-010).
+        /// </summary>
+        private uint _actionID;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionRequestPdu"/> class.
+        /// </summary>
+        public ActionRequestPdu()
+        {
+            PduType = (byte)16;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionRequestPdu left, ActionRequestPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionRequestPdu left, ActionRequestPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._actionID
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for originating entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the receiving entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
+        public EntityID ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifies the request being made by the simulaton manager
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifies the particular action being requested(see Section 7 of SISO-REF-010).
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
+        public uint ActionID
+        {
+            get
+            {
+                return this._actionID;
+            }
+
+            set
+            {
+                this._actionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._actionID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._actionID = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionRequestPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionRequestPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionRequestPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionRequestPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._actionID != obj._actionID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._actionID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ActionRequestReliablePdu.cs b/Libs/CSharpDis7/ActionRequestReliablePdu.cs
new file mode 100644
index 0000000..0538f7a
--- /dev/null
+++ b/Libs/CSharpDis7/ActionRequestReliablePdu.cs
@@ -0,0 +1,615 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.6: request from a simulation manager to a managed entity to perform a specified action. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionRequestReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionRequestReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _actionID;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionRequestReliablePdu"/> class.
+        /// </summary>
+        public ActionRequestReliablePdu()
+        {
+            PduType = (byte)56;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionRequestReliablePdu left, ActionRequestReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._actionID
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "actionID")]
+        public uint ActionID
+        {
+            get
+            {
+                return this._actionID;
+            }
+
+            set
+            {
+                this._actionID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._actionID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._actionID = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionRequestReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<actionID type=\"uint\">" + this._actionID.ToString(CultureInfo.InvariantCulture) + "</actionID>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionRequestReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionRequestReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionRequestReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._actionID != obj._actionID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._actionID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ActionResponsePdu.cs b/Libs/CSharpDis7/ActionResponsePdu.cs
new file mode 100644
index 0000000..2a7fcd5
--- /dev/null
+++ b/Libs/CSharpDis7/ActionResponsePdu.cs
@@ -0,0 +1,588 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.8. response to an action request PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionResponsePdu : SimulationManagementFamilyPdu, IEquatable<ActionResponsePdu>
+    {
+        /// <summary>
+        /// Identifier for originating entity(or simulation)
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the receiving entity(or simulation)
+        /// </summary>
+        private EntityID _receivingID = new EntityID();
+
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Status of response
+        /// </summary>
+        private uint _requestStatus;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionResponsePdu"/> class.
+        /// </summary>
+        public ActionResponsePdu()
+        {
+            PduType = (byte)17;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionResponsePdu left, ActionResponsePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionResponsePdu left, ActionResponsePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._requestStatus
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for originating entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the receiving entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
+        public EntityID ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Status of response
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestStatus")]
+        public uint RequestStatus
+        {
+            get
+            {
+                return this._requestStatus;
+            }
+
+            set
+            {
+                this._requestStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._requestStatus);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requestStatus = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionResponsePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requestStatus type=\"uint\">" + this._requestStatus.ToString(CultureInfo.InvariantCulture) + "</requestStatus>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionResponsePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionResponsePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionResponsePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestStatus != obj._requestStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ActionResponseReliablePdu.cs b/Libs/CSharpDis7/ActionResponseReliablePdu.cs
new file mode 100644
index 0000000..e6d6197
--- /dev/null
+++ b/Libs/CSharpDis7/ActionResponseReliablePdu.cs
@@ -0,0 +1,519 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.7: Response from an entity to an action request PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class ActionResponseReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<ActionResponseReliablePdu>
+    {
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// status of response
+        /// </summary>
+        private uint _responseStatus;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActionResponseReliablePdu"/> class.
+        /// </summary>
+        public ActionResponseReliablePdu()
+        {
+            PduType = (byte)57;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ActionResponseReliablePdu left, ActionResponseReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._responseStatus
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the status of response
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "responseStatus")]
+        public uint ResponseStatus
+        {
+            get
+            {
+                return this._responseStatus;
+            }
+
+            set
+            {
+                this._responseStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._responseStatus);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._responseStatus = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ActionResponseReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<responseStatus type=\"uint\">" + this._responseStatus.ToString(CultureInfo.InvariantCulture) + "</responseStatus>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ActionResponseReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ActionResponseReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ActionResponseReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._responseStatus != obj._responseStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._responseStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AggregateIdentifier.cs b/Libs/CSharpDis7/AggregateIdentifier.cs
new file mode 100644
index 0000000..4d02b8a
--- /dev/null
+++ b/Libs/CSharpDis7/AggregateIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of each aggrgate in an exercise is specified by an aggregate identifier record. The aggregate ID is not an entity and shall not be treated as such. Section 6.2.3.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class AggregateIdentifier
+    {
+        /// <summary>
+        /// Simulation address, ie site and application, the first two fields of the entity ID
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// the aggregate ID
+        /// </summary>
+        private ushort _aggregateID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AggregateIdentifier"/> class.
+        /// </summary>
+        public AggregateIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AggregateIdentifier left, AggregateIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AggregateIdentifier left, AggregateIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._aggregateID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Simulation address, ie site and application, the first two fields of the entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the aggregate ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "aggregateID")]
+        public ushort AggregateID
+        {
+            get
+            {
+                return this._aggregateID;
+            }
+
+            set
+            {
+                this._aggregateID = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._aggregateID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._aggregateID = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AggregateIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<aggregateID type=\"ushort\">" + this._aggregateID.ToString(CultureInfo.InvariantCulture) + "</aggregateID>");
+                sb.AppendLine("</AggregateIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AggregateIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AggregateIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._aggregateID != obj._aggregateID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._aggregateID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AggregateMarking.cs b/Libs/CSharpDis7/AggregateMarking.cs
new file mode 100644
index 0000000..0bebe1a
--- /dev/null
+++ b/Libs/CSharpDis7/AggregateMarking.cs
@@ -0,0 +1,335 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Specifies the character set used in the first byte, followed by up to 31 characters of text data. Section 6.2.4. 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AggregateMarking
+    {
+        /// <summary>
+        /// The character set
+        /// </summary>
+        private byte _characterSet;
+
+        /// <summary>
+        /// The characters
+        /// </summary>
+        private byte[] _characters = new byte[31];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AggregateMarking"/> class.
+        /// </summary>
+        public AggregateMarking()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AggregateMarking left, AggregateMarking right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AggregateMarking left, AggregateMarking right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._characterSet
+            marshalSize += 31 * 1;  // _characters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The character set
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
+        public byte CharacterSet
+        {
+            get
+            {
+                return this._characterSet;
+            }
+
+            set
+            {
+                this._characterSet = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The characters
+        /// </summary>
+        [XmlArray(ElementName = "characters")]
+        public byte[] Characters
+        {
+            get
+            {
+                return this._characters;
+            }
+
+            set
+            {
+                this._characters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._characterSet);
+
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        dos.WriteUnsignedByte(this._characters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._characterSet = dis.ReadUnsignedByte();
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        this._characters[idx] = dis.ReadUnsignedByte();
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AggregateMarking>");
+            try
+            {
+                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
+                for (int idx = 0; idx < this._characters.Length; idx++)
+                {
+                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</AggregateMarking>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AggregateMarking;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AggregateMarking obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._characterSet != obj._characterSet)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._characters.Length != 31) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 31; idx++)
+                {
+                    if (this._characters[idx] != obj._characters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
+
+            for (int idx = 0; idx < 31; idx++)
+            {
+                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AggregateType.cs b/Libs/CSharpDis7/AggregateType.cs
new file mode 100644
index 0000000..9caa34b
--- /dev/null
+++ b/Libs/CSharpDis7/AggregateType.cs
@@ -0,0 +1,463 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Identifies the type and organization of an aggregate. Section 6.2.5
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AggregateType
+    {
+        /// <summary>
+        /// Grouping criterion used to group the aggregate. Enumeration from EBV document
+        /// </summary>
+        private byte _aggregateKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply.
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AggregateType"/> class.
+        /// </summary>
+        public AggregateType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AggregateType left, AggregateType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AggregateType left, AggregateType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._aggregateKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Grouping criterion used to group the aggregate. Enumeration from EBV document
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "aggregateKind")]
+        public byte AggregateKind
+        {
+            get
+            {
+                return this._aggregateKind;
+            }
+
+            set
+            {
+                this._aggregateKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._aggregateKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._aggregateKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AggregateType>");
+            try
+            {
+                sb.AppendLine("<aggregateKind type=\"byte\">" + this._aggregateKind.ToString(CultureInfo.InvariantCulture) + "</aggregateKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("</AggregateType>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AggregateType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AggregateType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._aggregateKind != obj._aggregateKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._aggregateKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AngleDeception.cs b/Libs/CSharpDis7/AngleDeception.cs
new file mode 100644
index 0000000..9cd9d41
--- /dev/null
+++ b/Libs/CSharpDis7/AngleDeception.cs
@@ -0,0 +1,661 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The Angle Deception attribute record may be used to communicate discrete values that are associated with angle deception jamming that cannot be referenced to an emitter mode. The values provided in the record records (provided in the associated Electromagnetic Emission PDU). (The victim radar beams are those that are targeted by the jammer.) Section 6.2.12.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AngleDeception
+    {
+        private uint _recordType = 3501;
+
+        private ushort _recordLength = 48;
+
+        private ushort _padding;
+
+        private byte _emitterNumber;
+
+        private byte _beamNumber;
+
+        private byte _stateIndicator;
+
+        private uint _padding2;
+
+        private float _azimuthOffset;
+
+        private float _azimuthWidth;
+
+        private float _azimuthPullRate;
+
+        private float _azimuthPullAcceleration;
+
+        private float _elevationOffset;
+
+        private float _elevationWidth;
+
+        private float _elevationPullRate;
+
+        private float _elevationPullAcceleration;
+
+        private uint _padding3;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AngleDeception"/> class.
+        /// </summary>
+        public AngleDeception()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AngleDeception left, AngleDeception right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AngleDeception left, AngleDeception right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 2;  // this._padding
+            marshalSize += 1;  // this._emitterNumber
+            marshalSize += 1;  // this._beamNumber
+            marshalSize += 1;  // this._stateIndicator
+            marshalSize += 4;  // this._padding2
+            marshalSize += 4;  // this._azimuthOffset
+            marshalSize += 4;  // this._azimuthWidth
+            marshalSize += 4;  // this._azimuthPullRate
+            marshalSize += 4;  // this._azimuthPullAcceleration
+            marshalSize += 4;  // this._elevationOffset
+            marshalSize += 4;  // this._elevationWidth
+            marshalSize += 4;  // this._elevationPullRate
+            marshalSize += 4;  // this._elevationPullAcceleration
+            marshalSize += 4;  // this._padding3
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
+        public byte EmitterNumber
+        {
+            get
+            {
+                return this._emitterNumber;
+            }
+
+            set
+            {
+                this._emitterNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
+        public byte BeamNumber
+        {
+            get
+            {
+                return this._beamNumber;
+            }
+
+            set
+            {
+                this._beamNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "stateIndicator")]
+        public byte StateIndicator
+        {
+            get
+            {
+                return this._stateIndicator;
+            }
+
+            set
+            {
+                this._stateIndicator = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "padding2")]
+        public uint Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "azimuthOffset")]
+        public float AzimuthOffset
+        {
+            get
+            {
+                return this._azimuthOffset;
+            }
+
+            set
+            {
+                this._azimuthOffset = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "azimuthWidth")]
+        public float AzimuthWidth
+        {
+            get
+            {
+                return this._azimuthWidth;
+            }
+
+            set
+            {
+                this._azimuthWidth = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "azimuthPullRate")]
+        public float AzimuthPullRate
+        {
+            get
+            {
+                return this._azimuthPullRate;
+            }
+
+            set
+            {
+                this._azimuthPullRate = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "azimuthPullAcceleration")]
+        public float AzimuthPullAcceleration
+        {
+            get
+            {
+                return this._azimuthPullAcceleration;
+            }
+
+            set
+            {
+                this._azimuthPullAcceleration = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "elevationOffset")]
+        public float ElevationOffset
+        {
+            get
+            {
+                return this._elevationOffset;
+            }
+
+            set
+            {
+                this._elevationOffset = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "elevationWidth")]
+        public float ElevationWidth
+        {
+            get
+            {
+                return this._elevationWidth;
+            }
+
+            set
+            {
+                this._elevationWidth = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "elevationPullRate")]
+        public float ElevationPullRate
+        {
+            get
+            {
+                return this._elevationPullRate;
+            }
+
+            set
+            {
+                this._elevationPullRate = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "elevationPullAcceleration")]
+        public float ElevationPullAcceleration
+        {
+            get
+            {
+                return this._elevationPullAcceleration;
+            }
+
+            set
+            {
+                this._elevationPullAcceleration = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "padding3")]
+        public uint Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    dos.WriteUnsignedByte((byte)this._emitterNumber);
+                    dos.WriteUnsignedByte((byte)this._beamNumber);
+                    dos.WriteUnsignedByte((byte)this._stateIndicator);
+                    dos.WriteUnsignedInt((uint)this._padding2);
+                    dos.WriteFloat((float)this._azimuthOffset);
+                    dos.WriteFloat((float)this._azimuthWidth);
+                    dos.WriteFloat((float)this._azimuthPullRate);
+                    dos.WriteFloat((float)this._azimuthPullAcceleration);
+                    dos.WriteFloat((float)this._elevationOffset);
+                    dos.WriteFloat((float)this._elevationWidth);
+                    dos.WriteFloat((float)this._elevationPullRate);
+                    dos.WriteFloat((float)this._elevationPullAcceleration);
+                    dos.WriteUnsignedInt((uint)this._padding3);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                    this._emitterNumber = dis.ReadUnsignedByte();
+                    this._beamNumber = dis.ReadUnsignedByte();
+                    this._stateIndicator = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedInt();
+                    this._azimuthOffset = dis.ReadFloat();
+                    this._azimuthWidth = dis.ReadFloat();
+                    this._azimuthPullRate = dis.ReadFloat();
+                    this._azimuthPullAcceleration = dis.ReadFloat();
+                    this._elevationOffset = dis.ReadFloat();
+                    this._elevationWidth = dis.ReadFloat();
+                    this._elevationPullRate = dis.ReadFloat();
+                    this._elevationPullAcceleration = dis.ReadFloat();
+                    this._padding3 = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AngleDeception>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
+                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
+                sb.AppendLine("<stateIndicator type=\"byte\">" + this._stateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateIndicator>");
+                sb.AppendLine("<padding2 type=\"uint\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<azimuthOffset type=\"float\">" + this._azimuthOffset.ToString(CultureInfo.InvariantCulture) + "</azimuthOffset>");
+                sb.AppendLine("<azimuthWidth type=\"float\">" + this._azimuthWidth.ToString(CultureInfo.InvariantCulture) + "</azimuthWidth>");
+                sb.AppendLine("<azimuthPullRate type=\"float\">" + this._azimuthPullRate.ToString(CultureInfo.InvariantCulture) + "</azimuthPullRate>");
+                sb.AppendLine("<azimuthPullAcceleration type=\"float\">" + this._azimuthPullAcceleration.ToString(CultureInfo.InvariantCulture) + "</azimuthPullAcceleration>");
+                sb.AppendLine("<elevationOffset type=\"float\">" + this._elevationOffset.ToString(CultureInfo.InvariantCulture) + "</elevationOffset>");
+                sb.AppendLine("<elevationWidth type=\"float\">" + this._elevationWidth.ToString(CultureInfo.InvariantCulture) + "</elevationWidth>");
+                sb.AppendLine("<elevationPullRate type=\"float\">" + this._elevationPullRate.ToString(CultureInfo.InvariantCulture) + "</elevationPullRate>");
+                sb.AppendLine("<elevationPullAcceleration type=\"float\">" + this._elevationPullAcceleration.ToString(CultureInfo.InvariantCulture) + "</elevationPullAcceleration>");
+                sb.AppendLine("<padding3 type=\"uint\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                sb.AppendLine("</AngleDeception>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AngleDeception;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AngleDeception obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterNumber != obj._emitterNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamNumber != obj._beamNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateIndicator != obj._stateIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthOffset != obj._azimuthOffset)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthWidth != obj._azimuthWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthPullRate != obj._azimuthPullRate)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthPullAcceleration != obj._azimuthPullAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._elevationOffset != obj._elevationOffset)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._elevationWidth != obj._elevationWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._elevationPullRate != obj._elevationPullRate)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._elevationPullAcceleration != obj._elevationPullAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._stateIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthOffset.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthPullRate.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthPullAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._elevationOffset.GetHashCode();
+            result = GenerateHash(result) ^ this._elevationWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._elevationPullRate.GetHashCode();
+            result = GenerateHash(result) ^ this._elevationPullAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AngularVelocityVector.cs b/Libs/CSharpDis7/AngularVelocityVector.cs
new file mode 100644
index 0000000..94e683c
--- /dev/null
+++ b/Libs/CSharpDis7/AngularVelocityVector.cs
@@ -0,0 +1,341 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Angular velocity measured in radians per second out each of the entity's own coordinate axes. Order of measurement is angular velocity around the x, y, and z axis of the entity. The positive direction is determined by the right hand rule. Section 6.2.7
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AngularVelocityVector
+    {
+        /// <summary>
+        /// velocity about the x axis
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// velocity about the y axis
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// velocity about the zaxis
+        /// </summary>
+        private float _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AngularVelocityVector"/> class.
+        /// </summary>
+        public AngularVelocityVector()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AngularVelocityVector left, AngularVelocityVector right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AngularVelocityVector left, AngularVelocityVector right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            marshalSize += 4;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the x axis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the y axis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity about the zaxis
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "z")]
+        public float Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                    dos.WriteFloat((float)this._z);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                    this._z = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AngularVelocityVector>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</AngularVelocityVector>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AngularVelocityVector;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AngularVelocityVector obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AntennaLocation.cs b/Libs/CSharpDis7/AntennaLocation.cs
new file mode 100644
index 0000000..295c55f
--- /dev/null
+++ b/Libs/CSharpDis7/AntennaLocation.cs
@@ -0,0 +1,315 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. Section 6.2.8
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class AntennaLocation
+    {
+        /// <summary>
+        /// Location of the radiating portion of the antenna in world    coordinates
+        /// </summary>
+        private Vector3Double _antennaLocation = new Vector3Double();
+
+        /// <summary>
+        /// Location of the radiating portion of the antenna     in entity coordinates
+        /// </summary>
+        private Vector3Float _relativeAntennaLocation = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AntennaLocation"/> class.
+        /// </summary>
+        public AntennaLocation()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AntennaLocation left, AntennaLocation right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AntennaLocation left, AntennaLocation right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._antennaLocation.GetMarshalledSize();  // this._antennaLocation
+            marshalSize += this._relativeAntennaLocation.GetMarshalledSize();  // this._relativeAntennaLocation
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of the radiating portion of the antenna in world    coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "antennaLocation")]
+        public Vector3Double AntennaLocation_
+        {
+            get
+            {
+                return this._antennaLocation;
+            }
+
+            set
+            {
+                this._antennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of the radiating portion of the antenna     in entity coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "relativeAntennaLocation")]
+        public Vector3Float RelativeAntennaLocation
+        {
+            get
+            {
+                return this._relativeAntennaLocation;
+            }
+
+            set
+            {
+                this._relativeAntennaLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._antennaLocation.Marshal(dos);
+                    this._relativeAntennaLocation.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._antennaLocation.Unmarshal(dis);
+                    this._relativeAntennaLocation.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AntennaLocation>");
+            try
+            {
+                sb.AppendLine("<antennaLocation>");
+                this._antennaLocation.Reflection(sb);
+                sb.AppendLine("</antennaLocation>");
+                sb.AppendLine("<relativeAntennaLocation>");
+                this._relativeAntennaLocation.Reflection(sb);
+                sb.AppendLine("</relativeAntennaLocation>");
+                sb.AppendLine("</AntennaLocation>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AntennaLocation;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AntennaLocation obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._antennaLocation.Equals(obj._antennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._relativeAntennaLocation.Equals(obj._relativeAntennaLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._antennaLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._relativeAntennaLocation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ArealObjectStatePdu.cs b/Libs/CSharpDis7/ArealObjectStatePdu.cs
new file mode 100644
index 0000000..5745e61
--- /dev/null
+++ b/Libs/CSharpDis7/ArealObjectStatePdu.cs
@@ -0,0 +1,685 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information about the addition/modification of an oobject that is geometrically anchored to the terrain with a set of three or more points that come to a closure. Section 7.10.6 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(SimulationAddress))]
+    [XmlInclude(typeof(Vector3Double))]
+    public partial class ArealObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<ArealObjectStatePdu>
+    {
+        /// <summary>
+        /// Object in synthetic environment
+        /// </summary>
+        private EntityID _objectID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _referencedObjectID = new EntityID();
+
+        /// <summary>
+        /// unique update number of each state transition of an object
+        /// </summary>
+        private ushort _updateNumber;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// modifications enumeration
+        /// </summary>
+        private byte _modifications;
+
+        /// <summary>
+        /// Object type
+        /// </summary>
+        private EntityType _objectType = new EntityType();
+
+        /// <summary>
+        /// Object appearance
+        /// </summary>
+        private uint _specificObjectAppearance;
+
+        /// <summary>
+        /// Object appearance
+        /// </summary>
+        private ushort _generalObjectAppearance;
+
+        /// <summary>
+        /// Number of points
+        /// </summary>
+        private ushort _numberOfPoints;
+
+        /// <summary>
+        /// requesterID
+        /// </summary>
+        private SimulationAddress _requesterID = new SimulationAddress();
+
+        /// <summary>
+        /// receiver ID
+        /// </summary>
+        private SimulationAddress _receivingID = new SimulationAddress();
+
+        /// <summary>
+        /// location of object
+        /// </summary>
+        private List<Vector3Double> _objectLocation = new List<Vector3Double>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArealObjectStatePdu"/> class.
+        /// </summary>
+        public ArealObjectStatePdu()
+        {
+            PduType = (byte)45;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ArealObjectStatePdu left, ArealObjectStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ArealObjectStatePdu left, ArealObjectStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
+            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
+            marshalSize += 2;  // this._updateNumber
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._modifications
+            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
+            marshalSize += 4;  // this._specificObjectAppearance
+            marshalSize += 2;  // this._generalObjectAppearance
+            marshalSize += 2;  // this._numberOfPoints
+            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            for (int idx = 0; idx < this._objectLocation.Count; idx++)
+            {
+                Vector3Double listElement = (Vector3Double)this._objectLocation[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object in synthetic environment
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
+        public EntityID ObjectID
+        {
+            get
+            {
+                return this._objectID;
+            }
+
+            set
+            {
+                this._objectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
+        public EntityID ReferencedObjectID
+        {
+            get
+            {
+                return this._referencedObjectID;
+            }
+
+            set
+            {
+                this._referencedObjectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique update number of each state transition of an object
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
+        public ushort UpdateNumber
+        {
+            get
+            {
+                return this._updateNumber;
+            }
+
+            set
+            {
+                this._updateNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modifications enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
+        public byte Modifications
+        {
+            get
+            {
+                return this._modifications;
+            }
+
+            set
+            {
+                this._modifications = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object type
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "objectType")]
+        public EntityType ObjectType
+        {
+            get
+            {
+                return this._objectType;
+            }
+
+            set
+            {
+                this._objectType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object appearance
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "specificObjectAppearance")]
+        public uint SpecificObjectAppearance
+        {
+            get
+            {
+                return this._specificObjectAppearance;
+            }
+
+            set
+            {
+                this._specificObjectAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object appearance
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "generalObjectAppearance")]
+        public ushort GeneralObjectAppearance
+        {
+            get
+            {
+                return this._generalObjectAppearance;
+            }
+
+            set
+            {
+                this._generalObjectAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPoints method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPoints")]
+        public ushort NumberOfPoints
+        {
+            get
+            {
+                return this._numberOfPoints;
+            }
+
+            set
+            {
+                this._numberOfPoints = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the requesterID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
+        public SimulationAddress RequesterID
+        {
+            get
+            {
+                return this._requesterID;
+            }
+
+            set
+            {
+                this._requesterID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receiver ID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
+        public SimulationAddress ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of object
+        /// </summary>
+        [XmlElement(ElementName = "objectLocationList", Type = typeof(List<Vector3Double>))]
+        public List<Vector3Double> ObjectLocation
+        {
+            get
+            {
+                return this._objectLocation;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._objectID.Marshal(dos);
+                    this._referencedObjectID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._updateNumber);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._modifications);
+                    this._objectType.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._specificObjectAppearance);
+                    dos.WriteUnsignedShort((ushort)this._generalObjectAppearance);
+                    dos.WriteUnsignedShort((ushort)this._objectLocation.Count);
+                    this._requesterID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+
+                    for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                    {
+                        Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
+                        aVector3Double.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._objectID.Unmarshal(dis);
+                    this._referencedObjectID.Unmarshal(dis);
+                    this._updateNumber = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._modifications = dis.ReadUnsignedByte();
+                    this._objectType.Unmarshal(dis);
+                    this._specificObjectAppearance = dis.ReadUnsignedInt();
+                    this._generalObjectAppearance = dis.ReadUnsignedShort();
+                    this._numberOfPoints = dis.ReadUnsignedShort();
+                    this._requesterID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    for (int idx = 0; idx < this.NumberOfPoints; idx++)
+                    {
+                        Vector3Double anX = new Vector3Double();
+                        anX.Unmarshal(dis);
+                        this._objectLocation.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ArealObjectStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<objectID>");
+                this._objectID.Reflection(sb);
+                sb.AppendLine("</objectID>");
+                sb.AppendLine("<referencedObjectID>");
+                this._referencedObjectID.Reflection(sb);
+                sb.AppendLine("</referencedObjectID>");
+                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
+                sb.AppendLine("<objectType>");
+                this._objectType.Reflection(sb);
+                sb.AppendLine("</objectType>");
+                sb.AppendLine("<specificObjectAppearance type=\"uint\">" + this._specificObjectAppearance.ToString(CultureInfo.InvariantCulture) + "</specificObjectAppearance>");
+                sb.AppendLine("<generalObjectAppearance type=\"ushort\">" + this._generalObjectAppearance.ToString(CultureInfo.InvariantCulture) + "</generalObjectAppearance>");
+                sb.AppendLine("<objectLocation type=\"ushort\">" + this._objectLocation.Count.ToString(CultureInfo.InvariantCulture) + "</objectLocation>");
+                sb.AppendLine("<requesterID>");
+                this._requesterID.Reflection(sb);
+                sb.AppendLine("</requesterID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                {
+                    sb.AppendLine("<objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Double\">");
+                    Vector3Double aVector3Double = (Vector3Double)this._objectLocation[idx];
+                    aVector3Double.Reflection(sb);
+                    sb.AppendLine("</objectLocation" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ArealObjectStatePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ArealObjectStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ArealObjectStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._objectID.Equals(obj._objectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._updateNumber != obj._updateNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modifications != obj._modifications)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectType.Equals(obj._objectType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specificObjectAppearance != obj._specificObjectAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._generalObjectAppearance != obj._generalObjectAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPoints != obj._numberOfPoints)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requesterID.Equals(obj._requesterID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._objectLocation.Count != obj._objectLocation.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                {
+                    if (!this._objectLocation[idx].Equals(obj._objectLocation[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._objectID.GetHashCode();
+            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
+            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._modifications.GetHashCode();
+            result = GenerateHash(result) ^ this._objectType.GetHashCode();
+            result = GenerateHash(result) ^ this._specificObjectAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._generalObjectAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPoints.GetHashCode();
+            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+
+            if (this._objectLocation.Count > 0)
+            {
+                for (int idx = 0; idx < this._objectLocation.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._objectLocation[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ArticulatedParts.cs b/Libs/CSharpDis7/ArticulatedParts.cs
new file mode 100644
index 0000000..2276f66
--- /dev/null
+++ b/Libs/CSharpDis7/ArticulatedParts.cs
@@ -0,0 +1,405 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  articulated parts for movable parts and a combination of moveable/attached parts of an entity. Section 6.2.93.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ArticulatedParts
+    {
+        /// <summary>
+        /// the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        private byte _recordType;
+
+        /// <summary>
+        /// indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change 
+        /// </summary>
+        private byte _changeIndicator;
+
+        /// <summary>
+        /// the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
+        /// </summary>
+        private ushort _partAttachedTo;
+
+        /// <summary>
+        /// the type of parameter represented, 32 bit enumeration
+        /// </summary>
+        private uint _parameterType;
+
+        /// <summary>
+        /// The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
+        /// </summary>
+        private ulong _parameterValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ArticulatedParts"/> class.
+        /// </summary>
+        public ArticulatedParts()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ArticulatedParts left, ArticulatedParts right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ArticulatedParts left, ArticulatedParts right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._recordType
+            marshalSize += 1;  // this._changeIndicator
+            marshalSize += 2;  // this._partAttachedTo
+            marshalSize += 4;  // this._parameterType
+            marshalSize += 8;  // this._parameterValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
+        public byte RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
+        public byte ChangeIndicator
+        {
+            get
+            {
+                return this._changeIndicator;
+            }
+
+            set
+            {
+                this._changeIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
+        public ushort PartAttachedTo
+        {
+            get
+            {
+                return this._partAttachedTo;
+            }
+
+            set
+            {
+                this._partAttachedTo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the type of parameter represented, 32 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "parameterType")]
+        public uint ParameterType
+        {
+            get
+            {
+                return this._parameterType;
+            }
+
+            set
+            {
+                this._parameterType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
+        /// </summary>
+        [XmlElement(Type = typeof(ulong), ElementName = "parameterValue")]
+        public ulong ParameterValue
+        {
+            get
+            {
+                return this._parameterValue;
+            }
+
+            set
+            {
+                this._parameterValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._recordType);
+                    dos.WriteUnsignedByte((byte)this._changeIndicator);
+                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
+                    dos.WriteUnsignedInt((uint)this._parameterType);
+                    dos.WriteUnsignedLong((ulong)this._parameterValue);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedByte();
+                    this._changeIndicator = dis.ReadUnsignedByte();
+                    this._partAttachedTo = dis.ReadUnsignedShort();
+                    this._parameterType = dis.ReadUnsignedInt();
+                    this._parameterValue = dis.ReadUnsignedLong();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ArticulatedParts>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
+                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
+                sb.AppendLine("<parameterType type=\"uint\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
+                sb.AppendLine("<parameterValue type=\"ulong\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
+                sb.AppendLine("</ArticulatedParts>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ArticulatedParts;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ArticulatedParts obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._changeIndicator != obj._changeIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._partAttachedTo != obj._partAttachedTo)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterType != obj._parameterType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterValue != obj._parameterValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Association.cs b/Libs/CSharpDis7/Association.cs
new file mode 100644
index 0000000..9e03f80
--- /dev/null
+++ b/Libs/CSharpDis7/Association.cs
@@ -0,0 +1,367 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// An entity's associations with other entities and/or locations. For each association, this record shall specify the type of the association, the associated entity's EntityID and/or the associated location's world coordinates. This record may be used (optionally) in a transfer transaction to send internal state data from the divesting simulation to the acquiring simulation (see 5.9.4). This record may also be used for other purposes. Section 6.2.10
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Vector3Double))]
+    public partial class Association
+    {
+        private byte _associationType;
+
+        private byte _padding4;
+
+        /// <summary>
+        /// identity of associated entity. If none, NO_SPECIFIC_ENTITY
+        /// </summary>
+        private EntityID _associatedEntityID = new EntityID();
+
+        /// <summary>
+        /// location, in world coordinates
+        /// </summary>
+        private Vector3Double _associatedLocation = new Vector3Double();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Association"/> class.
+        /// </summary>
+        public Association()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Association left, Association right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Association left, Association right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._associationType
+            marshalSize += 1;  // this._padding4
+            marshalSize += this._associatedEntityID.GetMarshalledSize();  // this._associatedEntityID
+            marshalSize += this._associatedLocation.GetMarshalledSize();  // this._associatedLocation
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "associationType")]
+        public byte AssociationType
+        {
+            get
+            {
+                return this._associationType;
+            }
+
+            set
+            {
+                this._associationType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "padding4")]
+        public byte Padding4
+        {
+            get
+            {
+                return this._padding4;
+            }
+
+            set
+            {
+                this._padding4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the identity of associated entity. If none, NO_SPECIFIC_ENTITY
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "associatedEntityID")]
+        public EntityID AssociatedEntityID
+        {
+            get
+            {
+                return this._associatedEntityID;
+            }
+
+            set
+            {
+                this._associatedEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location, in world coordinates
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "associatedLocation")]
+        public Vector3Double AssociatedLocation
+        {
+            get
+            {
+                return this._associatedLocation;
+            }
+
+            set
+            {
+                this._associatedLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._associationType);
+                    dos.WriteUnsignedByte((byte)this._padding4);
+                    this._associatedEntityID.Marshal(dos);
+                    this._associatedLocation.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._associationType = dis.ReadUnsignedByte();
+                    this._padding4 = dis.ReadUnsignedByte();
+                    this._associatedEntityID.Unmarshal(dis);
+                    this._associatedLocation.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Association>");
+            try
+            {
+                sb.AppendLine("<associationType type=\"byte\">" + this._associationType.ToString(CultureInfo.InvariantCulture) + "</associationType>");
+                sb.AppendLine("<padding4 type=\"byte\">" + this._padding4.ToString(CultureInfo.InvariantCulture) + "</padding4>");
+                sb.AppendLine("<associatedEntityID>");
+                this._associatedEntityID.Reflection(sb);
+                sb.AppendLine("</associatedEntityID>");
+                sb.AppendLine("<associatedLocation>");
+                this._associatedLocation.Reflection(sb);
+                sb.AppendLine("</associatedLocation>");
+                sb.AppendLine("</Association>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Association;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Association obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._associationType != obj._associationType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding4 != obj._padding4)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._associatedEntityID.Equals(obj._associatedEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._associatedLocation.Equals(obj._associatedLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._associationType.GetHashCode();
+            result = GenerateHash(result) ^ this._padding4.GetHashCode();
+            result = GenerateHash(result) ^ this._associatedEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._associatedLocation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AttachedParts.cs b/Libs/CSharpDis7/AttachedParts.cs
new file mode 100644
index 0000000..3e41b87
--- /dev/null
+++ b/Libs/CSharpDis7/AttachedParts.cs
@@ -0,0 +1,405 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Removable parts that may be attached to an entity.  Section 6.2.93.3
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class AttachedParts
+    {
+        /// <summary>
+        /// the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        private byte _recordType = 1;
+
+        /// <summary>
+        /// 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram
+        /// </summary>
+        private byte _detachedIndicator;
+
+        /// <summary>
+        /// the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
+        /// </summary>
+        private ushort _partAttachedTo;
+
+        /// <summary>
+        /// The location or station to which the part is attached
+        /// </summary>
+        private uint _parameterType;
+
+        /// <summary>
+        /// The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
+        /// </summary>
+        private ulong _parameterValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AttachedParts"/> class.
+        /// </summary>
+        public AttachedParts()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AttachedParts left, AttachedParts right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AttachedParts left, AttachedParts right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._recordType
+            marshalSize += 1;  // this._detachedIndicator
+            marshalSize += 2;  // this._partAttachedTo
+            marshalSize += 4;  // this._parameterType
+            marshalSize += 8;  // this._parameterValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
+        public byte RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "detachedIndicator")]
+        public byte DetachedIndicator
+        {
+            get
+            {
+                return this._detachedIndicator;
+            }
+
+            set
+            {
+                this._detachedIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "partAttachedTo")]
+        public ushort PartAttachedTo
+        {
+            get
+            {
+                return this._partAttachedTo;
+            }
+
+            set
+            {
+                this._partAttachedTo = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The location or station to which the part is attached
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "parameterType")]
+        public uint ParameterType
+        {
+            get
+            {
+                return this._parameterType;
+            }
+
+            set
+            {
+                this._parameterType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field 
+        /// </summary>
+        [XmlElement(Type = typeof(ulong), ElementName = "parameterValue")]
+        public ulong ParameterValue
+        {
+            get
+            {
+                return this._parameterValue;
+            }
+
+            set
+            {
+                this._parameterValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._recordType);
+                    dos.WriteUnsignedByte((byte)this._detachedIndicator);
+                    dos.WriteUnsignedShort((ushort)this._partAttachedTo);
+                    dos.WriteUnsignedInt((uint)this._parameterType);
+                    dos.WriteUnsignedLong((ulong)this._parameterValue);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedByte();
+                    this._detachedIndicator = dis.ReadUnsignedByte();
+                    this._partAttachedTo = dis.ReadUnsignedShort();
+                    this._parameterType = dis.ReadUnsignedInt();
+                    this._parameterValue = dis.ReadUnsignedLong();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AttachedParts>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<detachedIndicator type=\"byte\">" + this._detachedIndicator.ToString(CultureInfo.InvariantCulture) + "</detachedIndicator>");
+                sb.AppendLine("<partAttachedTo type=\"ushort\">" + this._partAttachedTo.ToString(CultureInfo.InvariantCulture) + "</partAttachedTo>");
+                sb.AppendLine("<parameterType type=\"uint\">" + this._parameterType.ToString(CultureInfo.InvariantCulture) + "</parameterType>");
+                sb.AppendLine("<parameterValue type=\"ulong\">" + this._parameterValue.ToString(CultureInfo.InvariantCulture) + "</parameterValue>");
+                sb.AppendLine("</AttachedParts>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AttachedParts;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AttachedParts obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._detachedIndicator != obj._detachedIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._partAttachedTo != obj._partAttachedTo)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterType != obj._parameterType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameterValue != obj._parameterValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._detachedIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._partAttachedTo.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterType.GetHashCode();
+            result = GenerateHash(result) ^ this._parameterValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Attribute.cs b/Libs/CSharpDis7/Attribute.cs
new file mode 100644
index 0000000..af8503c
--- /dev/null
+++ b/Libs/CSharpDis7/Attribute.cs
@@ -0,0 +1,323 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Used to convey information for one or more attributes. Attributes conform to the standard variable record format of 6.2.82. Section 6.2.11
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Attribute
+    {
+        private uint _recordType;
+
+        private byte _recordLength;
+
+        private ulong _recordSpecificFields;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Attribute"/> class.
+        /// </summary>
+        public Attribute()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Attribute left, Attribute right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Attribute left, Attribute right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 1;  // this._recordLength
+            marshalSize += 8;  // this._recordSpecificFields
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "recordLength")]
+        public byte RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ulong), ElementName = "recordSpecificFields")]
+        public ulong RecordSpecificFields
+        {
+            get
+            {
+                return this._recordSpecificFields;
+            }
+
+            set
+            {
+                this._recordSpecificFields = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedByte((byte)this._recordLength);
+                    dos.WriteUnsignedLong((ulong)this._recordSpecificFields);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedByte();
+                    this._recordSpecificFields = dis.ReadUnsignedLong();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Attribute>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"byte\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<recordSpecificFields type=\"ulong\">" + this._recordSpecificFields.ToString(CultureInfo.InvariantCulture) + "</recordSpecificFields>");
+                sb.AppendLine("</Attribute>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Attribute;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Attribute obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSpecificFields != obj._recordSpecificFields)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._recordSpecificFields.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/AttributePdu.cs b/Libs/CSharpDis7/AttributePdu.cs
new file mode 100644
index 0000000..466a155
--- /dev/null
+++ b/Libs/CSharpDis7/AttributePdu.cs
@@ -0,0 +1,539 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information about individual attributes for a particular entity, other object, or event may be communicated using an Attribute PDU. The Attribute PDU shall not be used to exchange data available in any other PDU except where explicitly mentioned in the PDU issuance instructions within this standard. See 5.3.6 for the information requirements and issuance and receipt rules for this PDU. Section 7.2.6. INCOMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class AttributePdu : EntityInformationFamilyPdu, IEquatable<AttributePdu>
+    {
+        /// <summary>
+        /// This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79).
+        /// </summary>
+        private SimulationAddress _originatingSimulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private int _padding1;
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private short _padding2;
+
+        /// <summary>
+        /// This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration.
+        /// </summary>
+        private byte _attributeRecordPduType;
+
+        /// <summary>
+        /// This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration.
+        /// </summary>
+        private byte _attributeRecordProtocolVersion;
+
+        /// <summary>
+        /// This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration.
+        /// </summary>
+        private uint _masterAttributeRecordType;
+
+        /// <summary>
+        /// This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration.
+        /// </summary>
+        private byte _actionCode;
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private byte _padding3;
+
+        /// <summary>
+        /// This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer.
+        /// </summary>
+        private ushort _numberAttributeRecordSet;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AttributePdu"/> class.
+        /// </summary>
+        public AttributePdu()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(AttributePdu left, AttributePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(AttributePdu left, AttributePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingSimulationAddress.GetMarshalledSize();  // this._originatingSimulationAddress
+            marshalSize += 4;  // this._padding1
+            marshalSize += 2;  // this._padding2
+            marshalSize += 1;  // this._attributeRecordPduType
+            marshalSize += 1;  // this._attributeRecordProtocolVersion
+            marshalSize += 4;  // this._masterAttributeRecordType
+            marshalSize += 1;  // this._actionCode
+            marshalSize += 1;  // this._padding3
+            marshalSize += 2;  // this._numberAttributeRecordSet
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79).
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "originatingSimulationAddress")]
+        public SimulationAddress OriginatingSimulationAddress
+        {
+            get
+            {
+                return this._originatingSimulationAddress;
+            }
+
+            set
+            {
+                this._originatingSimulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "padding1")]
+        public int Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding2")]
+        public short Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "attributeRecordPduType")]
+        public byte AttributeRecordPduType
+        {
+            get
+            {
+                return this._attributeRecordPduType;
+            }
+
+            set
+            {
+                this._attributeRecordPduType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "attributeRecordProtocolVersion")]
+        public byte AttributeRecordProtocolVersion
+        {
+            get
+            {
+                return this._attributeRecordProtocolVersion;
+            }
+
+            set
+            {
+                this._attributeRecordProtocolVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "masterAttributeRecordType")]
+        public uint MasterAttributeRecordType
+        {
+            get
+            {
+                return this._masterAttributeRecordType;
+            }
+
+            set
+            {
+                this._masterAttributeRecordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "actionCode")]
+        public byte ActionCode
+        {
+            get
+            {
+                return this._actionCode;
+            }
+
+            set
+            {
+                this._actionCode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding3")]
+        public byte Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberAttributeRecordSet")]
+        public ushort NumberAttributeRecordSet
+        {
+            get
+            {
+                return this._numberAttributeRecordSet;
+            }
+
+            set
+            {
+                this._numberAttributeRecordSet = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingSimulationAddress.Marshal(dos);
+                    dos.WriteInt((int)this._padding1);
+                    dos.WriteShort((short)this._padding2);
+                    dos.WriteUnsignedByte((byte)this._attributeRecordPduType);
+                    dos.WriteUnsignedByte((byte)this._attributeRecordProtocolVersion);
+                    dos.WriteUnsignedInt((uint)this._masterAttributeRecordType);
+                    dos.WriteUnsignedByte((byte)this._actionCode);
+                    dos.WriteByte((byte)this._padding3);
+                    dos.WriteUnsignedShort((ushort)this._numberAttributeRecordSet);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingSimulationAddress.Unmarshal(dis);
+                    this._padding1 = dis.ReadInt();
+                    this._padding2 = dis.ReadShort();
+                    this._attributeRecordPduType = dis.ReadUnsignedByte();
+                    this._attributeRecordProtocolVersion = dis.ReadUnsignedByte();
+                    this._masterAttributeRecordType = dis.ReadUnsignedInt();
+                    this._actionCode = dis.ReadUnsignedByte();
+                    this._padding3 = dis.ReadByte();
+                    this._numberAttributeRecordSet = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<AttributePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingSimulationAddress>");
+                this._originatingSimulationAddress.Reflection(sb);
+                sb.AppendLine("</originatingSimulationAddress>");
+                sb.AppendLine("<padding1 type=\"int\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"short\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<attributeRecordPduType type=\"byte\">" + this._attributeRecordPduType.ToString(CultureInfo.InvariantCulture) + "</attributeRecordPduType>");
+                sb.AppendLine("<attributeRecordProtocolVersion type=\"byte\">" + this._attributeRecordProtocolVersion.ToString(CultureInfo.InvariantCulture) + "</attributeRecordProtocolVersion>");
+                sb.AppendLine("<masterAttributeRecordType type=\"uint\">" + this._masterAttributeRecordType.ToString(CultureInfo.InvariantCulture) + "</masterAttributeRecordType>");
+                sb.AppendLine("<actionCode type=\"byte\">" + this._actionCode.ToString(CultureInfo.InvariantCulture) + "</actionCode>");
+                sb.AppendLine("<padding3 type=\"byte\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                sb.AppendLine("<numberAttributeRecordSet type=\"ushort\">" + this._numberAttributeRecordSet.ToString(CultureInfo.InvariantCulture) + "</numberAttributeRecordSet>");
+                sb.AppendLine("</AttributePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as AttributePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(AttributePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingSimulationAddress.Equals(obj._originatingSimulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._attributeRecordPduType != obj._attributeRecordPduType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._attributeRecordProtocolVersion != obj._attributeRecordProtocolVersion)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._masterAttributeRecordType != obj._masterAttributeRecordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._actionCode != obj._actionCode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberAttributeRecordSet != obj._numberAttributeRecordSet)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingSimulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._attributeRecordPduType.GetHashCode();
+            result = GenerateHash(result) ^ this._attributeRecordProtocolVersion.GetHashCode();
+            result = GenerateHash(result) ^ this._masterAttributeRecordType.GetHashCode();
+            result = GenerateHash(result) ^ this._actionCode.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+            result = GenerateHash(result) ^ this._numberAttributeRecordSet.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/BeamAntennaPattern.cs b/Libs/CSharpDis7/BeamAntennaPattern.cs
new file mode 100644
index 0000000..8787d61
--- /dev/null
+++ b/Libs/CSharpDis7/BeamAntennaPattern.cs
@@ -0,0 +1,538 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Used when the antenna pattern type field has a value of 1. Specifies the direction, pattern, and polarization of radiation from an antenna. Section 6.2.9.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EulerAngles))]
+    public partial class BeamAntennaPattern
+    {
+        /// <summary>
+        /// The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record.
+        /// </summary>
+        private EulerAngles _beamDirection = new EulerAngles();
+
+        private float _azimuthBeamwidth;
+
+        private float _elevationBeamwidth;
+
+        private float _referenceSystem;
+
+        private byte _padding1;
+
+        private ushort _padding2;
+
+        /// <summary>
+        /// This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna. 
+        /// </summary>
+        private float _ez = 0.0;
+
+        /// <summary>
+        /// This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna.
+        /// </summary>
+        private float _ex = 0.0;
+
+        /// <summary>
+        /// This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI
+        /// </summary>
+        private float _phase = 0.0;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding3;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BeamAntennaPattern"/> class.
+        /// </summary>
+        public BeamAntennaPattern()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BeamAntennaPattern left, BeamAntennaPattern right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BeamAntennaPattern left, BeamAntennaPattern right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._beamDirection.GetMarshalledSize();  // this._beamDirection
+            marshalSize += 4;  // this._azimuthBeamwidth
+            marshalSize += 4;  // this._elevationBeamwidth
+            marshalSize += 4;  // this._referenceSystem
+            marshalSize += 1;  // this._padding1
+            marshalSize += 2;  // this._padding2
+            marshalSize += 4;  // this._ez
+            marshalSize += 4;  // this._ex
+            marshalSize += 4;  // this._phase
+            marshalSize += 4;  // this._padding3
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record.
+        /// </summary>
+        [XmlElement(Type = typeof(EulerAngles), ElementName = "beamDirection")]
+        public EulerAngles BeamDirection
+        {
+            get
+            {
+                return this._beamDirection;
+            }
+
+            set
+            {
+                this._beamDirection = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "azimuthBeamwidth")]
+        public float AzimuthBeamwidth
+        {
+            get
+            {
+                return this._azimuthBeamwidth;
+            }
+
+            set
+            {
+                this._azimuthBeamwidth = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "elevationBeamwidth")]
+        public float ElevationBeamwidth
+        {
+            get
+            {
+                return this._elevationBeamwidth;
+            }
+
+            set
+            {
+                this._elevationBeamwidth = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "referenceSystem")]
+        public float ReferenceSystem
+        {
+            get
+            {
+                return this._referenceSystem;
+            }
+
+            set
+            {
+                this._referenceSystem = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
+        public ushort Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna. 
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "ez")]
+        public float Ez
+        {
+            get
+            {
+                return this._ez;
+            }
+
+            set
+            {
+                this._ez = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "ex")]
+        public float Ex
+        {
+            get
+            {
+                return this._ex;
+            }
+
+            set
+            {
+                this._ex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "phase")]
+        public float Phase
+        {
+            get
+            {
+                return this._phase;
+            }
+
+            set
+            {
+                this._phase = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding3")]
+        public uint Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._beamDirection.Marshal(dos);
+                    dos.WriteFloat((float)this._azimuthBeamwidth);
+                    dos.WriteFloat((float)this._elevationBeamwidth);
+                    dos.WriteFloat((float)this._referenceSystem);
+                    dos.WriteUnsignedByte((byte)this._padding1);
+                    dos.WriteUnsignedShort((ushort)this._padding2);
+                    dos.WriteFloat((float)this._ez);
+                    dos.WriteFloat((float)this._ex);
+                    dos.WriteFloat((float)this._phase);
+                    dos.WriteUnsignedInt((uint)this._padding3);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamDirection.Unmarshal(dis);
+                    this._azimuthBeamwidth = dis.ReadFloat();
+                    this._elevationBeamwidth = dis.ReadFloat();
+                    this._referenceSystem = dis.ReadFloat();
+                    this._padding1 = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedShort();
+                    this._ez = dis.ReadFloat();
+                    this._ex = dis.ReadFloat();
+                    this._phase = dis.ReadFloat();
+                    this._padding3 = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BeamAntennaPattern>");
+            try
+            {
+                sb.AppendLine("<beamDirection>");
+                this._beamDirection.Reflection(sb);
+                sb.AppendLine("</beamDirection>");
+                sb.AppendLine("<azimuthBeamwidth type=\"float\">" + this._azimuthBeamwidth.ToString(CultureInfo.InvariantCulture) + "</azimuthBeamwidth>");
+                sb.AppendLine("<elevationBeamwidth type=\"float\">" + this._elevationBeamwidth.ToString(CultureInfo.InvariantCulture) + "</elevationBeamwidth>");
+                sb.AppendLine("<referenceSystem type=\"float\">" + this._referenceSystem.ToString(CultureInfo.InvariantCulture) + "</referenceSystem>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<ez type=\"float\">" + this._ez.ToString(CultureInfo.InvariantCulture) + "</ez>");
+                sb.AppendLine("<ex type=\"float\">" + this._ex.ToString(CultureInfo.InvariantCulture) + "</ex>");
+                sb.AppendLine("<phase type=\"float\">" + this._phase.ToString(CultureInfo.InvariantCulture) + "</phase>");
+                sb.AppendLine("<padding3 type=\"uint\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                sb.AppendLine("</BeamAntennaPattern>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BeamAntennaPattern;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BeamAntennaPattern obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._beamDirection.Equals(obj._beamDirection))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthBeamwidth != obj._azimuthBeamwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._elevationBeamwidth != obj._elevationBeamwidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._referenceSystem != obj._referenceSystem)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ez != obj._ez)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ex != obj._ex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phase != obj._phase)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamDirection.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthBeamwidth.GetHashCode();
+            result = GenerateHash(result) ^ this._elevationBeamwidth.GetHashCode();
+            result = GenerateHash(result) ^ this._referenceSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._ez.GetHashCode();
+            result = GenerateHash(result) ^ this._ex.GetHashCode();
+            result = GenerateHash(result) ^ this._phase.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/BeamData.cs b/Libs/CSharpDis7/BeamData.cs
new file mode 100644
index 0000000..ccbe7a7
--- /dev/null
+++ b/Libs/CSharpDis7/BeamData.cs
@@ -0,0 +1,405 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Describes the scan volue of an emitter beam. Section 6.2.13.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class BeamData
+    {
+        /// <summary>
+        /// Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume
+        /// </summary>
+        private float _beamAzimuthCenter;
+
+        /// <summary>
+        /// Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        private float _beamAzimuthSweep;
+
+        /// <summary>
+        /// Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        private float _beamElevationCenter;
+
+        /// <summary>
+        /// Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        private float _beamElevationSweep;
+
+        /// <summary>
+        /// allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        private float _beamSweepSync;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BeamData"/> class.
+        /// </summary>
+        public BeamData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BeamData left, BeamData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BeamData left, BeamData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._beamAzimuthCenter
+            marshalSize += 4;  // this._beamAzimuthSweep
+            marshalSize += 4;  // this._beamElevationCenter
+            marshalSize += 4;  // this._beamElevationSweep
+            marshalSize += 4;  // this._beamSweepSync
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthCenter")]
+        public float BeamAzimuthCenter
+        {
+            get
+            {
+                return this._beamAzimuthCenter;
+            }
+
+            set
+            {
+                this._beamAzimuthCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam azimuth sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamAzimuthSweep")]
+        public float BeamAzimuthSweep
+        {
+            get
+            {
+                return this._beamAzimuthSweep;
+            }
+
+            set
+            {
+                this._beamAzimuthSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation center to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationCenter")]
+        public float BeamElevationCenter
+        {
+            get
+            {
+                return this._beamElevationCenter;
+            }
+
+            set
+            {
+                this._beamElevationCenter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Specifies the beam elevation sweep to determine scan volume
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamElevationSweep")]
+        public float BeamElevationSweep
+        {
+            get
+            {
+                return this._beamElevationSweep;
+            }
+
+            set
+            {
+                this._beamElevationSweep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamSweepSync")]
+        public float BeamSweepSync
+        {
+            get
+            {
+                return this._beamSweepSync;
+            }
+
+            set
+            {
+                this._beamSweepSync = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._beamAzimuthCenter);
+                    dos.WriteFloat((float)this._beamAzimuthSweep);
+                    dos.WriteFloat((float)this._beamElevationCenter);
+                    dos.WriteFloat((float)this._beamElevationSweep);
+                    dos.WriteFloat((float)this._beamSweepSync);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamAzimuthCenter = dis.ReadFloat();
+                    this._beamAzimuthSweep = dis.ReadFloat();
+                    this._beamElevationCenter = dis.ReadFloat();
+                    this._beamElevationSweep = dis.ReadFloat();
+                    this._beamSweepSync = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BeamData>");
+            try
+            {
+                sb.AppendLine("<beamAzimuthCenter type=\"float\">" + this._beamAzimuthCenter.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthCenter>");
+                sb.AppendLine("<beamAzimuthSweep type=\"float\">" + this._beamAzimuthSweep.ToString(CultureInfo.InvariantCulture) + "</beamAzimuthSweep>");
+                sb.AppendLine("<beamElevationCenter type=\"float\">" + this._beamElevationCenter.ToString(CultureInfo.InvariantCulture) + "</beamElevationCenter>");
+                sb.AppendLine("<beamElevationSweep type=\"float\">" + this._beamElevationSweep.ToString(CultureInfo.InvariantCulture) + "</beamElevationSweep>");
+                sb.AppendLine("<beamSweepSync type=\"float\">" + this._beamSweepSync.ToString(CultureInfo.InvariantCulture) + "</beamSweepSync>");
+                sb.AppendLine("</BeamData>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BeamData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BeamData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._beamAzimuthCenter != obj._beamAzimuthCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAzimuthSweep != obj._beamAzimuthSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationCenter != obj._beamElevationCenter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamElevationSweep != obj._beamElevationSweep)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamSweepSync != obj._beamSweepSync)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamAzimuthCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamAzimuthSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationCenter.GetHashCode();
+            result = GenerateHash(result) ^ this._beamElevationSweep.GetHashCode();
+            result = GenerateHash(result) ^ this._beamSweepSync.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/BeamStatus.cs b/Libs/CSharpDis7/BeamStatus.cs
new file mode 100644
index 0000000..44d9960
--- /dev/null
+++ b/Libs/CSharpDis7/BeamStatus.cs
@@ -0,0 +1,277 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information related to the status of a beam. This is contained in the beam status field of the electromagnitec emission PDU. The first bit determines whether the beam is active (0) or deactivated (1).
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class BeamStatus
+    {
+        /// <summary>
+        /// First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding.
+        /// </summary>
+        private byte _beamState;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BeamStatus"/> class.
+        /// </summary>
+        public BeamStatus()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BeamStatus left, BeamStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BeamStatus left, BeamStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._beamState
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamState")]
+        public byte BeamState
+        {
+            get
+            {
+                return this._beamState;
+            }
+
+            set
+            {
+                this._beamState = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._beamState);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._beamState = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BeamStatus>");
+            try
+            {
+                sb.AppendLine("<beamState type=\"byte\">" + this._beamState.ToString(CultureInfo.InvariantCulture) + "</beamState>");
+                sb.AppendLine("</BeamStatus>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BeamStatus;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BeamStatus obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._beamState != obj._beamState)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._beamState.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/BlankingSector.cs b/Libs/CSharpDis7/BlankingSector.cs
new file mode 100644
index 0000000..f257d78
--- /dev/null
+++ b/Libs/CSharpDis7/BlankingSector.cs
@@ -0,0 +1,505 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The Blanking Sector attribute record may be used to convey persistent areas within a scan volume where emitter power for a specific active emitter beam is reduced to an insignificant value. Section 6.2.12
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class BlankingSector
+    {
+        private uint _recordType = 3500;
+
+        private ushort _recordLength;
+
+        private byte _emitterNumber;
+
+        private byte _beamNumber;
+
+        private byte _stateIndicator;
+
+        private float _leftAzimuth;
+
+        private float _rightAzimuth;
+
+        private float _lowerElevation;
+
+        private float _upperElevation;
+
+        private float _residualPower;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BlankingSector"/> class.
+        /// </summary>
+        public BlankingSector()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(BlankingSector left, BlankingSector right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(BlankingSector left, BlankingSector right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 1;  // this._emitterNumber
+            marshalSize += 1;  // this._beamNumber
+            marshalSize += 1;  // this._stateIndicator
+            marshalSize += 4;  // this._leftAzimuth
+            marshalSize += 4;  // this._rightAzimuth
+            marshalSize += 4;  // this._lowerElevation
+            marshalSize += 4;  // this._upperElevation
+            marshalSize += 4;  // this._residualPower
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
+        public byte EmitterNumber
+        {
+            get
+            {
+                return this._emitterNumber;
+            }
+
+            set
+            {
+                this._emitterNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
+        public byte BeamNumber
+        {
+            get
+            {
+                return this._beamNumber;
+            }
+
+            set
+            {
+                this._beamNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "stateIndicator")]
+        public byte StateIndicator
+        {
+            get
+            {
+                return this._stateIndicator;
+            }
+
+            set
+            {
+                this._stateIndicator = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "leftAzimuth")]
+        public float LeftAzimuth
+        {
+            get
+            {
+                return this._leftAzimuth;
+            }
+
+            set
+            {
+                this._leftAzimuth = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "rightAzimuth")]
+        public float RightAzimuth
+        {
+            get
+            {
+                return this._rightAzimuth;
+            }
+
+            set
+            {
+                this._rightAzimuth = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "lowerElevation")]
+        public float LowerElevation
+        {
+            get
+            {
+                return this._lowerElevation;
+            }
+
+            set
+            {
+                this._lowerElevation = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "upperElevation")]
+        public float UpperElevation
+        {
+            get
+            {
+                return this._upperElevation;
+            }
+
+            set
+            {
+                this._upperElevation = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "residualPower")]
+        public float ResidualPower
+        {
+            get
+            {
+                return this._residualPower;
+            }
+
+            set
+            {
+                this._residualPower = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedByte((byte)this._emitterNumber);
+                    dos.WriteUnsignedByte((byte)this._beamNumber);
+                    dos.WriteUnsignedByte((byte)this._stateIndicator);
+                    dos.WriteFloat((float)this._leftAzimuth);
+                    dos.WriteFloat((float)this._rightAzimuth);
+                    dos.WriteFloat((float)this._lowerElevation);
+                    dos.WriteFloat((float)this._upperElevation);
+                    dos.WriteFloat((float)this._residualPower);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._emitterNumber = dis.ReadUnsignedByte();
+                    this._beamNumber = dis.ReadUnsignedByte();
+                    this._stateIndicator = dis.ReadUnsignedByte();
+                    this._leftAzimuth = dis.ReadFloat();
+                    this._rightAzimuth = dis.ReadFloat();
+                    this._lowerElevation = dis.ReadFloat();
+                    this._upperElevation = dis.ReadFloat();
+                    this._residualPower = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<BlankingSector>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
+                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
+                sb.AppendLine("<stateIndicator type=\"byte\">" + this._stateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateIndicator>");
+                sb.AppendLine("<leftAzimuth type=\"float\">" + this._leftAzimuth.ToString(CultureInfo.InvariantCulture) + "</leftAzimuth>");
+                sb.AppendLine("<rightAzimuth type=\"float\">" + this._rightAzimuth.ToString(CultureInfo.InvariantCulture) + "</rightAzimuth>");
+                sb.AppendLine("<lowerElevation type=\"float\">" + this._lowerElevation.ToString(CultureInfo.InvariantCulture) + "</lowerElevation>");
+                sb.AppendLine("<upperElevation type=\"float\">" + this._upperElevation.ToString(CultureInfo.InvariantCulture) + "</upperElevation>");
+                sb.AppendLine("<residualPower type=\"float\">" + this._residualPower.ToString(CultureInfo.InvariantCulture) + "</residualPower>");
+                sb.AppendLine("</BlankingSector>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as BlankingSector;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(BlankingSector obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterNumber != obj._emitterNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamNumber != obj._beamNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateIndicator != obj._stateIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._leftAzimuth != obj._leftAzimuth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._rightAzimuth != obj._rightAzimuth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._lowerElevation != obj._lowerElevation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._upperElevation != obj._upperElevation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._residualPower != obj._residualPower)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._stateIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._leftAzimuth.GetHashCode();
+            result = GenerateHash(result) ^ this._rightAzimuth.GetHashCode();
+            result = GenerateHash(result) ^ this._lowerElevation.GetHashCode();
+            result = GenerateHash(result) ^ this._upperElevation.GetHashCode();
+            result = GenerateHash(result) ^ this._residualPower.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ChangeOptions.cs b/Libs/CSharpDis7/ChangeOptions.cs
new file mode 100644
index 0000000..92faa76
--- /dev/null
+++ b/Libs/CSharpDis7/ChangeOptions.cs
@@ -0,0 +1,245 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// This is wrong and breaks serialization. See section 6.2.15 aka B.2.41
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ChangeOptions
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ChangeOptions"/> class.
+        /// </summary>
+        public ChangeOptions()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ChangeOptions left, ChangeOptions right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ChangeOptions left, ChangeOptions right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ChangeOptions>");
+            try
+            {
+                sb.AppendLine("</ChangeOptions>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ChangeOptions;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ChangeOptions obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ClockTime.cs b/Libs/CSharpDis7/ClockTime.cs
new file mode 100644
index 0000000..a7348fd
--- /dev/null
+++ b/Libs/CSharpDis7/ClockTime.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Time measurements that exceed one hour are represented by this record. The first field is the hours since the unix epoch (Jan 1 1970, used by most Unix systems and java) and the second field the timestamp units since the top of the hour. Section 6.2.16
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ClockTime
+    {
+        /// <summary>
+        /// Hours in UTC
+        /// </summary>
+        private uint _hour;
+
+        /// <summary>
+        /// Time past the hour
+        /// </summary>
+        private uint _timePastHour;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClockTime"/> class.
+        /// </summary>
+        public ClockTime()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ClockTime left, ClockTime right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ClockTime left, ClockTime right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._hour
+            marshalSize += 4;  // this._timePastHour
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Hours in UTC
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "hour")]
+        public uint Hour
+        {
+            get
+            {
+                return this._hour;
+            }
+
+            set
+            {
+                this._hour = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Time past the hour
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timePastHour")]
+        public uint TimePastHour
+        {
+            get
+            {
+                return this._timePastHour;
+            }
+
+            set
+            {
+                this._timePastHour = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._hour);
+                    dos.WriteUnsignedInt((uint)this._timePastHour);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._hour = dis.ReadUnsignedInt();
+                    this._timePastHour = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ClockTime>");
+            try
+            {
+                sb.AppendLine("<hour type=\"uint\">" + this._hour.ToString(CultureInfo.InvariantCulture) + "</hour>");
+                sb.AppendLine("<timePastHour type=\"uint\">" + this._timePastHour.ToString(CultureInfo.InvariantCulture) + "</timePastHour>");
+                sb.AppendLine("</ClockTime>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ClockTime;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ClockTime obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._hour != obj._hour)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timePastHour != obj._timePastHour)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._hour.GetHashCode();
+            result = GenerateHash(result) ^ this._timePastHour.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/CollisionElasticPdu.cs b/Libs/CSharpDis7/CollisionElasticPdu.cs
new file mode 100644
index 0000000..892252d
--- /dev/null
+++ b/Libs/CSharpDis7/CollisionElasticPdu.cs
@@ -0,0 +1,745 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. Section 7.2.4. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventIdentifier))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class CollisionElasticPdu : EntityInformationFamilyPdu, IEquatable<CollisionElasticPdu>
+    {
+        /// <summary>
+        /// This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28)
+        /// </summary>
+        private EntityID _issuingEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        private EntityID _collidingEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
+        /// </summary>
+        private EventIdentifier _collisionEventID = new EventIdentifier();
+
+        /// <summary>
+        /// some padding
+        /// </summary>
+        private short _pad;
+
+        /// <summary>
+        /// This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]
+        /// </summary>
+        private Vector3Float _contactVelocity = new Vector3Float();
+
+        /// <summary>
+        /// This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms
+        /// </summary>
+        private float _mass;
+
+        /// <summary>
+        /// This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
+        /// </summary>
+        private Vector3Float _locationOfImpact = new Vector3Float();
+
+        /// <summary>
+        /// These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4)
+        /// </summary>
+        private float _collisionIntermediateResultXX;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionIntermediateResultXY;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionIntermediateResultXZ;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionIntermediateResultYY;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionIntermediateResultYZ;
+
+        /// <summary>
+        /// tensor values
+        /// </summary>
+        private float _collisionIntermediateResultZZ;
+
+        /// <summary>
+        /// This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
+        /// </summary>
+        private Vector3Float _unitSurfaceNormal = new Vector3Float();
+
+        /// <summary>
+        /// This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may “tune” their collision interactions.
+        /// </summary>
+        private float _coefficientOfRestitution;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollisionElasticPdu"/> class.
+        /// </summary>
+        public CollisionElasticPdu()
+        {
+            PduType = (byte)66;
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CollisionElasticPdu left, CollisionElasticPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CollisionElasticPdu left, CollisionElasticPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
+            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
+            marshalSize += this._collisionEventID.GetMarshalledSize();  // this._collisionEventID
+            marshalSize += 2;  // this._pad
+            marshalSize += this._contactVelocity.GetMarshalledSize();  // this._contactVelocity
+            marshalSize += 4;  // this._mass
+            marshalSize += this._locationOfImpact.GetMarshalledSize();  // this._locationOfImpact
+            marshalSize += 4;  // this._collisionIntermediateResultXX
+            marshalSize += 4;  // this._collisionIntermediateResultXY
+            marshalSize += 4;  // this._collisionIntermediateResultXZ
+            marshalSize += 4;  // this._collisionIntermediateResultYY
+            marshalSize += 4;  // this._collisionIntermediateResultYZ
+            marshalSize += 4;  // this._collisionIntermediateResultZZ
+            marshalSize += this._unitSurfaceNormal.GetMarshalledSize();  // this._unitSurfaceNormal
+            marshalSize += 4;  // this._coefficientOfRestitution
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
+        public EntityID IssuingEntityID
+        {
+            get
+            {
+                return this._issuingEntityID;
+            }
+
+            set
+            {
+                this._issuingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
+        public EntityID CollidingEntityID
+        {
+            get
+            {
+                return this._collidingEntityID;
+            }
+
+            set
+            {
+                this._collidingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
+        /// </summary>
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "collisionEventID")]
+        public EventIdentifier CollisionEventID
+        {
+            get
+            {
+                return this._collisionEventID;
+            }
+
+            set
+            {
+                this._collisionEventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the some padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "pad")]
+        public short Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "contactVelocity")]
+        public Vector3Float ContactVelocity
+        {
+            get
+            {
+                return this._contactVelocity;
+            }
+
+            set
+            {
+                this._contactVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "mass")]
+        public float Mass
+        {
+            get
+            {
+                return this._mass;
+            }
+
+            set
+            {
+                this._mass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "locationOfImpact")]
+        public Vector3Float LocationOfImpact
+        {
+            get
+            {
+                return this._locationOfImpact;
+            }
+
+            set
+            {
+                this._locationOfImpact = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4)
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultXX")]
+        public float CollisionIntermediateResultXX
+        {
+            get
+            {
+                return this._collisionIntermediateResultXX;
+            }
+
+            set
+            {
+                this._collisionIntermediateResultXX = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultXY")]
+        public float CollisionIntermediateResultXY
+        {
+            get
+            {
+                return this._collisionIntermediateResultXY;
+            }
+
+            set
+            {
+                this._collisionIntermediateResultXY = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultXZ")]
+        public float CollisionIntermediateResultXZ
+        {
+            get
+            {
+                return this._collisionIntermediateResultXZ;
+            }
+
+            set
+            {
+                this._collisionIntermediateResultXZ = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultYY")]
+        public float CollisionIntermediateResultYY
+        {
+            get
+            {
+                return this._collisionIntermediateResultYY;
+            }
+
+            set
+            {
+                this._collisionIntermediateResultYY = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultYZ")]
+        public float CollisionIntermediateResultYZ
+        {
+            get
+            {
+                return this._collisionIntermediateResultYZ;
+            }
+
+            set
+            {
+                this._collisionIntermediateResultYZ = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tensor values
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "collisionIntermediateResultZZ")]
+        public float CollisionIntermediateResultZZ
+        {
+            get
+            {
+                return this._collisionIntermediateResultZZ;
+            }
+
+            set
+            {
+                this._collisionIntermediateResultZZ = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "unitSurfaceNormal")]
+        public Vector3Float UnitSurfaceNormal
+        {
+            get
+            {
+                return this._unitSurfaceNormal;
+            }
+
+            set
+            {
+                this._unitSurfaceNormal = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may “tune” their collision interactions.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "coefficientOfRestitution")]
+        public float CoefficientOfRestitution
+        {
+            get
+            {
+                return this._coefficientOfRestitution;
+            }
+
+            set
+            {
+                this._coefficientOfRestitution = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Marshal(dos);
+                    this._collidingEntityID.Marshal(dos);
+                    this._collisionEventID.Marshal(dos);
+                    dos.WriteShort((short)this._pad);
+                    this._contactVelocity.Marshal(dos);
+                    dos.WriteFloat((float)this._mass);
+                    this._locationOfImpact.Marshal(dos);
+                    dos.WriteFloat((float)this._collisionIntermediateResultXX);
+                    dos.WriteFloat((float)this._collisionIntermediateResultXY);
+                    dos.WriteFloat((float)this._collisionIntermediateResultXZ);
+                    dos.WriteFloat((float)this._collisionIntermediateResultYY);
+                    dos.WriteFloat((float)this._collisionIntermediateResultYZ);
+                    dos.WriteFloat((float)this._collisionIntermediateResultZZ);
+                    this._unitSurfaceNormal.Marshal(dos);
+                    dos.WriteFloat((float)this._coefficientOfRestitution);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Unmarshal(dis);
+                    this._collidingEntityID.Unmarshal(dis);
+                    this._collisionEventID.Unmarshal(dis);
+                    this._pad = dis.ReadShort();
+                    this._contactVelocity.Unmarshal(dis);
+                    this._mass = dis.ReadFloat();
+                    this._locationOfImpact.Unmarshal(dis);
+                    this._collisionIntermediateResultXX = dis.ReadFloat();
+                    this._collisionIntermediateResultXY = dis.ReadFloat();
+                    this._collisionIntermediateResultXZ = dis.ReadFloat();
+                    this._collisionIntermediateResultYY = dis.ReadFloat();
+                    this._collisionIntermediateResultYZ = dis.ReadFloat();
+                    this._collisionIntermediateResultZZ = dis.ReadFloat();
+                    this._unitSurfaceNormal.Unmarshal(dis);
+                    this._coefficientOfRestitution = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CollisionElasticPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<issuingEntityID>");
+                this._issuingEntityID.Reflection(sb);
+                sb.AppendLine("</issuingEntityID>");
+                sb.AppendLine("<collidingEntityID>");
+                this._collidingEntityID.Reflection(sb);
+                sb.AppendLine("</collidingEntityID>");
+                sb.AppendLine("<collisionEventID>");
+                this._collisionEventID.Reflection(sb);
+                sb.AppendLine("</collisionEventID>");
+                sb.AppendLine("<pad type=\"short\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                sb.AppendLine("<contactVelocity>");
+                this._contactVelocity.Reflection(sb);
+                sb.AppendLine("</contactVelocity>");
+                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
+                sb.AppendLine("<locationOfImpact>");
+                this._locationOfImpact.Reflection(sb);
+                sb.AppendLine("</locationOfImpact>");
+                sb.AppendLine("<collisionIntermediateResultXX type=\"float\">" + this._collisionIntermediateResultXX.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultXX>");
+                sb.AppendLine("<collisionIntermediateResultXY type=\"float\">" + this._collisionIntermediateResultXY.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultXY>");
+                sb.AppendLine("<collisionIntermediateResultXZ type=\"float\">" + this._collisionIntermediateResultXZ.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultXZ>");
+                sb.AppendLine("<collisionIntermediateResultYY type=\"float\">" + this._collisionIntermediateResultYY.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultYY>");
+                sb.AppendLine("<collisionIntermediateResultYZ type=\"float\">" + this._collisionIntermediateResultYZ.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultYZ>");
+                sb.AppendLine("<collisionIntermediateResultZZ type=\"float\">" + this._collisionIntermediateResultZZ.ToString(CultureInfo.InvariantCulture) + "</collisionIntermediateResultZZ>");
+                sb.AppendLine("<unitSurfaceNormal>");
+                this._unitSurfaceNormal.Reflection(sb);
+                sb.AppendLine("</unitSurfaceNormal>");
+                sb.AppendLine("<coefficientOfRestitution type=\"float\">" + this._coefficientOfRestitution.ToString(CultureInfo.InvariantCulture) + "</coefficientOfRestitution>");
+                sb.AppendLine("</CollisionElasticPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CollisionElasticPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CollisionElasticPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._collisionEventID.Equals(obj._collisionEventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._contactVelocity.Equals(obj._contactVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._mass != obj._mass)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationOfImpact.Equals(obj._locationOfImpact))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionIntermediateResultXX != obj._collisionIntermediateResultXX)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionIntermediateResultXY != obj._collisionIntermediateResultXY)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionIntermediateResultXZ != obj._collisionIntermediateResultXZ)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionIntermediateResultYY != obj._collisionIntermediateResultYY)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionIntermediateResultYZ != obj._collisionIntermediateResultYZ)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionIntermediateResultZZ != obj._collisionIntermediateResultZZ)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._unitSurfaceNormal.Equals(obj._unitSurfaceNormal))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._coefficientOfRestitution != obj._coefficientOfRestitution)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionEventID.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+            result = GenerateHash(result) ^ this._contactVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._mass.GetHashCode();
+            result = GenerateHash(result) ^ this._locationOfImpact.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionIntermediateResultXX.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionIntermediateResultXY.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionIntermediateResultXZ.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionIntermediateResultYY.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionIntermediateResultYZ.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionIntermediateResultZZ.GetHashCode();
+            result = GenerateHash(result) ^ this._unitSurfaceNormal.GetHashCode();
+            result = GenerateHash(result) ^ this._coefficientOfRestitution.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/CollisionPdu.cs b/Libs/CSharpDis7/CollisionPdu.cs
new file mode 100644
index 0000000..c4d4e5a
--- /dev/null
+++ b/Libs/CSharpDis7/CollisionPdu.cs
@@ -0,0 +1,519 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.2.3 Collisions between entities shall be communicated by issuing a Collision PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventIdentifier))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class CollisionPdu : EntityInformationFamilyPdu, IEquatable<CollisionPdu>
+    {
+        /// <summary>
+        /// This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        private EntityID _issuingEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        private EntityID _collidingEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
+        /// </summary>
+        private EventIdentifier _eventID = new EventIdentifier();
+
+        /// <summary>
+        /// This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations
+        /// </summary>
+        private byte _collisionType;
+
+        /// <summary>
+        /// some padding
+        /// </summary>
+        private byte _pad;
+
+        /// <summary>
+        /// This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)].
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms.
+        /// </summary>
+        private float _mass;
+
+        /// <summary>
+        /// This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollisionPdu"/> class.
+        /// </summary>
+        public CollisionPdu()
+        {
+            PduType = (byte)4;
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CollisionPdu left, CollisionPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CollisionPdu left, CollisionPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._issuingEntityID.GetMarshalledSize();  // this._issuingEntityID
+            marshalSize += this._collidingEntityID.GetMarshalledSize();  // this._collidingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._collisionType
+            marshalSize += 1;  // this._pad
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += 4;  // this._mass
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "issuingEntityID")]
+        public EntityID IssuingEntityID
+        {
+            get
+            {
+                return this._issuingEntityID;
+            }
+
+            set
+            {
+                this._issuingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "collidingEntityID")]
+        public EntityID CollidingEntityID
+        {
+            get
+            {
+                return this._collidingEntityID;
+            }
+
+            set
+            {
+                this._collidingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34).
+        /// </summary>
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
+        public EventIdentifier EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "collisionType")]
+        public byte CollisionType
+        {
+            get
+            {
+                return this._collisionType;
+            }
+
+            set
+            {
+                this._collisionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the some padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad")]
+        public byte Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)].
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "mass")]
+        public float Mass
+        {
+            get
+            {
+                return this._mass;
+            }
+
+            set
+            {
+                this._mass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)].
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Marshal(dos);
+                    this._collidingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._collisionType);
+                    dos.WriteByte((byte)this._pad);
+                    this._velocity.Marshal(dos);
+                    dos.WriteFloat((float)this._mass);
+                    this._location.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._issuingEntityID.Unmarshal(dis);
+                    this._collidingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._collisionType = dis.ReadUnsignedByte();
+                    this._pad = dis.ReadByte();
+                    this._velocity.Unmarshal(dis);
+                    this._mass = dis.ReadFloat();
+                    this._location.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CollisionPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<issuingEntityID>");
+                this._issuingEntityID.Reflection(sb);
+                sb.AppendLine("</issuingEntityID>");
+                sb.AppendLine("<collidingEntityID>");
+                this._collidingEntityID.Reflection(sb);
+                sb.AppendLine("</collidingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<collisionType type=\"byte\">" + this._collisionType.ToString(CultureInfo.InvariantCulture) + "</collisionType>");
+                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<mass type=\"float\">" + this._mass.ToString(CultureInfo.InvariantCulture) + "</mass>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                sb.AppendLine("</CollisionPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CollisionPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CollisionPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._issuingEntityID.Equals(obj._issuingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._collidingEntityID.Equals(obj._collidingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._collisionType != obj._collisionType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._mass != obj._mass)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._issuingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._collidingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._collisionType.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._mass.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/CommentPdu.cs b/Libs/CSharpDis7/CommentPdu.cs
new file mode 100644
index 0000000..1e6645a
--- /dev/null
+++ b/Libs/CSharpDis7/CommentPdu.cs
@@ -0,0 +1,455 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Arbitrary messages can be entered into the data stream via use of this PDU. Section 7.5.13 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class CommentPdu : SimulationManagementFamilyPdu, IEquatable<CommentPdu>
+    {
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommentPdu"/> class.
+        /// </summary>
+        public CommentPdu()
+        {
+            PduType = (byte)22;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CommentPdu left, CommentPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CommentPdu left, CommentPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CommentPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</CommentPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CommentPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CommentPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/CommentReliablePdu.cs b/Libs/CSharpDis7/CommentReliablePdu.cs
new file mode 100644
index 0000000..51b5b58
--- /dev/null
+++ b/Libs/CSharpDis7/CommentReliablePdu.cs
@@ -0,0 +1,455 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.12: Arbitrary messages. Only reliable this time. Neds manual intervention     to fix padding in variable datums. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class CommentReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CommentReliablePdu>
+    {
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommentReliablePdu"/> class.
+        /// </summary>
+        public CommentReliablePdu()
+        {
+            PduType = (byte)62;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CommentReliablePdu left, CommentReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CommentReliablePdu left, CommentReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CommentReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</CommentReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CommentReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CommentReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/CommunicationsNodeID.cs b/Libs/CSharpDis7/CommunicationsNodeID.cs
new file mode 100644
index 0000000..4d76215
--- /dev/null
+++ b/Libs/CSharpDis7/CommunicationsNodeID.cs
@@ -0,0 +1,300 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Identity of a communications node. Section 6.2.49.4
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class CommunicationsNodeID
+    {
+        private EntityID _entityID = new EntityID();
+
+        private ushort _elementID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommunicationsNodeID"/> class.
+        /// </summary>
+        public CommunicationsNodeID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CommunicationsNodeID left, CommunicationsNodeID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CommunicationsNodeID left, CommunicationsNodeID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 2;  // this._elementID
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "elementID")]
+        public ushort ElementID
+        {
+            get
+            {
+                return this._elementID;
+            }
+
+            set
+            {
+                this._elementID = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._elementID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._elementID = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CommunicationsNodeID>");
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<elementID type=\"ushort\">" + this._elementID.ToString(CultureInfo.InvariantCulture) + "</elementID>");
+                sb.AppendLine("</CommunicationsNodeID>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CommunicationsNodeID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CommunicationsNodeID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._elementID != obj._elementID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._elementID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/CreateEntityPdu.cs b/Libs/CSharpDis7/CreateEntityPdu.cs
new file mode 100644
index 0000000..f8a1a5d
--- /dev/null
+++ b/Libs/CSharpDis7/CreateEntityPdu.cs
@@ -0,0 +1,350 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.2. Create a new entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class CreateEntityPdu : SimulationManagementFamilyPdu, IEquatable<CreateEntityPdu>
+    {
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the request
+        /// </summary>
+        private EntityID _receivingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the request.  See 6.2.75
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateEntityPdu"/> class.
+        /// </summary>
+        public CreateEntityPdu()
+        {
+            PduType = (byte)11;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CreateEntityPdu left, CreateEntityPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CreateEntityPdu left, CreateEntityPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
+        public EntityID ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the request.  See 6.2.75
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CreateEntityPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</CreateEntityPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CreateEntityPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CreateEntityPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/CreateEntityReliablePdu.cs b/Libs/CSharpDis7/CreateEntityReliablePdu.cs
new file mode 100644
index 0000000..b5ab76f
--- /dev/null
+++ b/Libs/CSharpDis7/CreateEntityReliablePdu.cs
@@ -0,0 +1,377 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.1: creation of an entity , reliable. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class CreateEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<CreateEntityReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CreateEntityReliablePdu"/> class.
+        /// </summary>
+        public CreateEntityReliablePdu()
+        {
+            PduType = (byte)51;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(CreateEntityReliablePdu left, CreateEntityReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<CreateEntityReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</CreateEntityReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as CreateEntityReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(CreateEntityReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DataPdu.cs b/Libs/CSharpDis7/DataPdu.cs
new file mode 100644
index 0000000..5586918
--- /dev/null
+++ b/Libs/CSharpDis7/DataPdu.cs
@@ -0,0 +1,519 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Information issued in response to a data query pdu or a set data pdu is communicated using a data pdu. Section 7.5.11 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataPdu : SimulationManagementFamilyPdu, IEquatable<DataPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataPdu"/> class.
+        /// </summary>
+        public DataPdu()
+        {
+            PduType = (byte)20;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataPdu left, DataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataPdu left, DataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DataQueryDatumSpecification.cs b/Libs/CSharpDis7/DataQueryDatumSpecification.cs
new file mode 100644
index 0000000..d2d4ef0
--- /dev/null
+++ b/Libs/CSharpDis7/DataQueryDatumSpecification.cs
@@ -0,0 +1,451 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// List of fixed and variable datum records. Section 6.2.18 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(UnsignedDISInteger))]
+    [XmlInclude(typeof(UnsignedDISInteger))]
+    public partial class DataQueryDatumSpecification
+    {
+        /// <summary>
+        /// Number of fixed datums
+        /// </summary>
+        private uint _numberOfFixedDatums;
+
+        /// <summary>
+        /// Number of variable datums
+        /// </summary>
+        private uint _numberOfVariableDatums;
+
+        /// <summary>
+        /// variable length list fixed datum IDs
+        /// </summary>
+        private List<UnsignedDISInteger> _fixedDatumIDList = new List<UnsignedDISInteger>();
+
+        /// <summary>
+        /// variable length list variable datum IDs
+        /// </summary>
+        private List<UnsignedDISInteger> _variableDatumIDList = new List<UnsignedDISInteger>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataQueryDatumSpecification"/> class.
+        /// </summary>
+        public DataQueryDatumSpecification()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataQueryDatumSpecification left, DataQueryDatumSpecification right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataQueryDatumSpecification left, DataQueryDatumSpecification right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._numberOfFixedDatums
+            marshalSize += 4;  // this._numberOfVariableDatums
+            for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+            {
+                UnsignedDISInteger listElement = (UnsignedDISInteger)this._fixedDatumIDList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+            {
+                UnsignedDISInteger listElement = (UnsignedDISInteger)this._variableDatumIDList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatums method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatums")]
+        public uint NumberOfFixedDatums
+        {
+            get
+            {
+                return this._numberOfFixedDatums;
+            }
+
+            set
+            {
+                this._numberOfFixedDatums = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatums method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatums")]
+        public uint NumberOfVariableDatums
+        {
+            get
+            {
+                return this._numberOfVariableDatums;
+            }
+
+            set
+            {
+                this._numberOfVariableDatums = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list fixed datum IDs
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumIDListList", Type = typeof(List<UnsignedDISInteger>))]
+        public List<UnsignedDISInteger> FixedDatumIDList
+        {
+            get
+            {
+                return this._fixedDatumIDList;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list variable datum IDs
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumIDListList", Type = typeof(List<UnsignedDISInteger>))]
+        public List<UnsignedDISInteger> VariableDatumIDList
+        {
+            get
+            {
+                return this._variableDatumIDList;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatumIDList.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumIDList.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                    {
+                        UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._fixedDatumIDList[idx];
+                        aUnsignedDISInteger.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                    {
+                        UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._variableDatumIDList[idx];
+                        aUnsignedDISInteger.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfFixedDatums = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatums = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatums; idx++)
+                    {
+                        UnsignedDISInteger anX = new UnsignedDISInteger();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumIDList.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatums; idx++)
+                    {
+                        UnsignedDISInteger anX = new UnsignedDISInteger();
+                        anX.Unmarshal(dis);
+                        this._variableDatumIDList.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataQueryDatumSpecification>");
+            try
+            {
+                sb.AppendLine("<fixedDatumIDList type=\"uint\">" + this._fixedDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumIDList>");
+                sb.AppendLine("<variableDatumIDList type=\"uint\">" + this._variableDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumIDList>");
+                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"UnsignedDISInteger\">");
+                    UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._fixedDatumIDList[idx];
+                    aUnsignedDISInteger.Reflection(sb);
+                    sb.AppendLine("</fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"UnsignedDISInteger\">");
+                    UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)this._variableDatumIDList[idx];
+                    aUnsignedDISInteger.Reflection(sb);
+                    sb.AppendLine("</variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataQueryDatumSpecification>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataQueryDatumSpecification;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataQueryDatumSpecification obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._numberOfFixedDatums != obj._numberOfFixedDatums)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatums != obj._numberOfVariableDatums)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumIDList.Count != obj._fixedDatumIDList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                {
+                    if (!this._fixedDatumIDList[idx].Equals(obj._fixedDatumIDList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumIDList.Count != obj._variableDatumIDList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                {
+                    if (!this._variableDatumIDList[idx].Equals(obj._variableDatumIDList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfFixedDatums.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatums.GetHashCode();
+
+            if (this._fixedDatumIDList.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumIDList[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumIDList.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumIDList[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DataQueryPdu.cs b/Libs/CSharpDis7/DataQueryPdu.cs
new file mode 100644
index 0000000..619fb99
--- /dev/null
+++ b/Libs/CSharpDis7/DataQueryPdu.cs
@@ -0,0 +1,519 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.9. Request for data from an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataQueryPdu : SimulationManagementFamilyPdu, IEquatable<DataQueryPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// time issues between issues of Data PDUs. Zero means send once only.
+        /// </summary>
+        private uint _timeInterval;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataQueryPdu"/> class.
+        /// </summary>
+        public DataQueryPdu()
+        {
+            PduType = (byte)18;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataQueryPdu left, DataQueryPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataQueryPdu left, DataQueryPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._timeInterval
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time issues between issues of Data PDUs. Zero means send once only.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
+        public uint TimeInterval
+        {
+            get
+            {
+                return this._timeInterval;
+            }
+
+            set
+            {
+                this._timeInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._timeInterval);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._timeInterval = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataQueryPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataQueryPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataQueryPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataQueryPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timeInterval != obj._timeInterval)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DataQueryReliablePdu.cs b/Libs/CSharpDis7/DataQueryReliablePdu.cs
new file mode 100644
index 0000000..715efb2
--- /dev/null
+++ b/Libs/CSharpDis7/DataQueryReliablePdu.cs
@@ -0,0 +1,615 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.8: request for data from an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataQueryReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// time interval between issuing data query PDUs
+        /// </summary>
+        private uint _timeInterval;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataQueryReliablePdu"/> class.
+        /// </summary>
+        public DataQueryReliablePdu()
+        {
+            PduType = (byte)58;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataQueryReliablePdu left, DataQueryReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataQueryReliablePdu left, DataQueryReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._timeInterval
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time interval between issuing data query PDUs
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timeInterval")]
+        public uint TimeInterval
+        {
+            get
+            {
+                return this._timeInterval;
+            }
+
+            set
+            {
+                this._timeInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._timeInterval);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._timeInterval = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataQueryReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<timeInterval type=\"uint\">" + this._timeInterval.ToString(CultureInfo.InvariantCulture) + "</timeInterval>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataQueryReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataQueryReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataQueryReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timeInterval != obj._timeInterval)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._timeInterval.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DataReliablePdu.cs b/Libs/CSharpDis7/DataReliablePdu.cs
new file mode 100644
index 0000000..02100a4
--- /dev/null
+++ b/Libs/CSharpDis7/DataReliablePdu.cs
@@ -0,0 +1,583 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.10: issued in response to a data query R or set dataR pdu. Needs manual intervention      to fix padding on variable datums. UNFINSIHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<DataReliablePdu>
+    {
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataReliablePdu"/> class.
+        /// </summary>
+        public DataReliablePdu()
+        {
+            PduType = (byte)60;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DataReliablePdu left, DataReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DataReliablePdu left, DataReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DataReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DataReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DataReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DataReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DatumSpecification.cs b/Libs/CSharpDis7/DatumSpecification.cs
new file mode 100644
index 0000000..815c1e4
--- /dev/null
+++ b/Libs/CSharpDis7/DatumSpecification.cs
@@ -0,0 +1,451 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// List of fixed and variable datum records. Section 6.2.19 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class DatumSpecification
+    {
+        /// <summary>
+        /// Number of fixed datums
+        /// </summary>
+        private uint _numberOfFixedDatums;
+
+        /// <summary>
+        /// Number of variable datums
+        /// </summary>
+        private uint _numberOfVariableDatums;
+
+        /// <summary>
+        /// variable length list fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatumIDList = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list variable datums
+        /// </summary>
+        private List<VariableDatum> _variableDatumIDList = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DatumSpecification"/> class.
+        /// </summary>
+        public DatumSpecification()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DatumSpecification left, DatumSpecification right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DatumSpecification left, DatumSpecification right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._numberOfFixedDatums
+            marshalSize += 4;  // this._numberOfVariableDatums
+            for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumIDList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumIDList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatums method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatums")]
+        public uint NumberOfFixedDatums
+        {
+            get
+            {
+                return this._numberOfFixedDatums;
+            }
+
+            set
+            {
+                this._numberOfFixedDatums = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatums method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatums")]
+        public uint NumberOfVariableDatums
+        {
+            get
+            {
+                return this._numberOfVariableDatums;
+            }
+
+            set
+            {
+                this._numberOfVariableDatums = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumIDListList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumIDList
+        {
+            get
+            {
+                return this._fixedDatumIDList;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list variable datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumIDListList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumIDList
+        {
+            get
+            {
+                return this._variableDatumIDList;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatumIDList.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumIDList.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumIDList[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumIDList[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfFixedDatums = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatums = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatums; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumIDList.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatums; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumIDList.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DatumSpecification>");
+            try
+            {
+                sb.AppendLine("<fixedDatumIDList type=\"uint\">" + this._fixedDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumIDList>");
+                sb.AppendLine("<variableDatumIDList type=\"uint\">" + this._variableDatumIDList.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumIDList>");
+                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumIDList[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumIDList[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumIDList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DatumSpecification>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DatumSpecification;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DatumSpecification obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._numberOfFixedDatums != obj._numberOfFixedDatums)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatums != obj._numberOfVariableDatums)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumIDList.Count != obj._fixedDatumIDList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                {
+                    if (!this._fixedDatumIDList[idx].Equals(obj._fixedDatumIDList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumIDList.Count != obj._variableDatumIDList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                {
+                    if (!this._variableDatumIDList[idx].Equals(obj._variableDatumIDList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfFixedDatums.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatums.GetHashCode();
+
+            if (this._fixedDatumIDList.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumIDList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumIDList[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumIDList.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumIDList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumIDList[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DeadReckoningParameters.cs b/Libs/CSharpDis7/DeadReckoningParameters.cs
new file mode 100644
index 0000000..2e66b03
--- /dev/null
+++ b/Libs/CSharpDis7/DeadReckoningParameters.cs
@@ -0,0 +1,404 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Not specified in the standard. This is used by the ESPDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class DeadReckoningParameters
+    {
+        /// <summary>
+        /// Algorithm to use in computing dead reckoning. See EBV doc.
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// Dead reckoning parameters. Contents depends on algorithm.
+        /// </summary>
+        private byte[] _parameters = new byte[15];
+
+        /// <summary>
+        /// Linear acceleration of the entity
+        /// </summary>
+        private Vector3Float _entityLinearAcceleration = new Vector3Float();
+
+        /// <summary>
+        /// Angular velocity of the entity
+        /// </summary>
+        private Vector3Float _entityAngularVelocity = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeadReckoningParameters"/> class.
+        /// </summary>
+        public DeadReckoningParameters()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DeadReckoningParameters left, DeadReckoningParameters right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DeadReckoningParameters left, DeadReckoningParameters right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 15 * 1;  // _parameters
+            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
+            marshalSize += this._entityAngularVelocity.GetMarshalledSize();  // this._entityAngularVelocity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Algorithm to use in computing dead reckoning. See EBV doc.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Dead reckoning parameters. Contents depends on algorithm.
+        /// </summary>
+        [XmlArray(ElementName = "parameters")]
+        public byte[] Parameters
+        {
+            get
+            {
+                return this._parameters;
+            }
+
+            set
+            {
+                this._parameters = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the Linear acceleration of the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
+        public Vector3Float EntityLinearAcceleration
+        {
+            get
+            {
+                return this._entityLinearAcceleration;
+            }
+
+            set
+            {
+                this._entityLinearAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Angular velocity of the entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityAngularVelocity")]
+        public Vector3Float EntityAngularVelocity
+        {
+            get
+            {
+                return this._entityAngularVelocity;
+            }
+
+            set
+            {
+                this._entityAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
+
+                    for (int idx = 0; idx < this._parameters.Length; idx++)
+                    {
+                        dos.WriteUnsignedByte(this._parameters[idx]);
+                    }
+                    this._entityLinearAcceleration.Marshal(dos);
+                    this._entityAngularVelocity.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
+                    for (int idx = 0; idx < this._parameters.Length; idx++)
+                    {
+                        this._parameters[idx] = dis.ReadUnsignedByte();
+                    }
+                    this._entityLinearAcceleration.Unmarshal(dis);
+                    this._entityAngularVelocity.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DeadReckoningParameters>");
+            try
+            {
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                for (int idx = 0; idx < this._parameters.Length; idx++)
+                {
+                    sb.AppendLine("<parameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._parameters[idx] + "</parameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<entityLinearAcceleration>");
+                this._entityLinearAcceleration.Reflection(sb);
+                sb.AppendLine("</entityLinearAcceleration>");
+                sb.AppendLine("<entityAngularVelocity>");
+                this._entityAngularVelocity.Reflection(sb);
+                sb.AppendLine("</entityAngularVelocity>");
+                sb.AppendLine("</DeadReckoningParameters>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DeadReckoningParameters;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DeadReckoningParameters obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._parameters.Length != 15) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 15; idx++)
+                {
+                    if (this._parameters[idx] != obj._parameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityAngularVelocity.Equals(obj._entityAngularVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+
+            for (int idx = 0; idx < 15; idx++)
+            {
+                result = GenerateHash(result) ^ this._parameters[idx].GetHashCode();
+            }
+            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAngularVelocity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DesignatorPdu.cs b/Libs/CSharpDis7/DesignatorPdu.cs
new file mode 100644
index 0000000..d7ecdd2
--- /dev/null
+++ b/Libs/CSharpDis7/DesignatorPdu.cs
@@ -0,0 +1,646 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.7.2. Handles designating operations. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    public partial class DesignatorPdu : DistributedEmissionsFamilyPdu, IEquatable<DesignatorPdu>
+    {
+        /// <summary>
+        /// ID of the entity designating
+        /// </summary>
+        private EntityID _designatingEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
+        /// </summary>
+        private ushort _codeName;
+
+        /// <summary>
+        /// ID of the entity being designated
+        /// </summary>
+        private EntityID _designatedEntityID = new EntityID();
+
+        /// <summary>
+        /// This field shall identify the designator code being used by the designating entity 
+        /// </summary>
+        private ushort _designatorCode;
+
+        /// <summary>
+        /// This field shall identify the designator output power in watts
+        /// </summary>
+        private float _designatorPower;
+
+        /// <summary>
+        /// This field shall identify the designator wavelength in units of microns
+        /// </summary>
+        private float _designatorWavelength;
+
+        /// <summary>
+        /// designtor spot wrt the designated entity
+        /// </summary>
+        private Vector3Float _designatorSpotWrtDesignated = new Vector3Float();
+
+        /// <summary>
+        /// designtor spot wrt the designated entity
+        /// </summary>
+        private Vector3Double _designatorSpotLocation = new Vector3Double();
+
+        /// <summary>
+        /// Dead reckoning algorithm
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// linear accelleration of entity
+        /// </summary>
+        private Vector3Float _entityLinearAcceleration = new Vector3Float();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DesignatorPdu"/> class.
+        /// </summary>
+        public DesignatorPdu()
+        {
+            PduType = (byte)24;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DesignatorPdu left, DesignatorPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DesignatorPdu left, DesignatorPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._designatingEntityID.GetMarshalledSize();  // this._designatingEntityID
+            marshalSize += 2;  // this._codeName
+            marshalSize += this._designatedEntityID.GetMarshalledSize();  // this._designatedEntityID
+            marshalSize += 2;  // this._designatorCode
+            marshalSize += 4;  // this._designatorPower
+            marshalSize += 4;  // this._designatorWavelength
+            marshalSize += this._designatorSpotWrtDesignated.GetMarshalledSize();  // this._designatorSpotWrtDesignated
+            marshalSize += this._designatorSpotLocation.GetMarshalledSize();  // this._designatorSpotLocation
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            marshalSize += this._entityLinearAcceleration.GetMarshalledSize();  // this._entityLinearAcceleration
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity designating
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "designatingEntityID")]
+        public EntityID DesignatingEntityID
+        {
+            get
+            {
+                return this._designatingEntityID;
+            }
+
+            set
+            {
+                this._designatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify a unique emitter database number assigned to  differentiate between otherwise similar or identical emitter beams within an emitter system.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "codeName")]
+        public ushort CodeName
+        {
+            get
+            {
+                return this._codeName;
+            }
+
+            set
+            {
+                this._codeName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity being designated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "designatedEntityID")]
+        public EntityID DesignatedEntityID
+        {
+            get
+            {
+                return this._designatedEntityID;
+            }
+
+            set
+            {
+                this._designatedEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator code being used by the designating entity 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "designatorCode")]
+        public ushort DesignatorCode
+        {
+            get
+            {
+                return this._designatorCode;
+            }
+
+            set
+            {
+                this._designatorCode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator output power in watts
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "designatorPower")]
+        public float DesignatorPower
+        {
+            get
+            {
+                return this._designatorPower;
+            }
+
+            set
+            {
+                this._designatorPower = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the designator wavelength in units of microns
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "designatorWavelength")]
+        public float DesignatorWavelength
+        {
+            get
+            {
+                return this._designatorWavelength;
+            }
+
+            set
+            {
+                this._designatorWavelength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the designtor spot wrt the designated entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "designatorSpotWrtDesignated")]
+        public Vector3Float DesignatorSpotWrtDesignated
+        {
+            get
+            {
+                return this._designatorSpotWrtDesignated;
+            }
+
+            set
+            {
+                this._designatorSpotWrtDesignated = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the designtor spot wrt the designated entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "designatorSpotLocation")]
+        public Vector3Double DesignatorSpotLocation
+        {
+            get
+            {
+                return this._designatorSpotLocation;
+            }
+
+            set
+            {
+                this._designatorSpotLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Dead reckoning algorithm
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the linear accelleration of entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearAcceleration")]
+        public Vector3Float EntityLinearAcceleration
+        {
+            get
+            {
+                return this._entityLinearAcceleration;
+            }
+
+            set
+            {
+                this._entityLinearAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._designatingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._codeName);
+                    this._designatedEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._designatorCode);
+                    dos.WriteFloat((float)this._designatorPower);
+                    dos.WriteFloat((float)this._designatorWavelength);
+                    this._designatorSpotWrtDesignated.Marshal(dos);
+                    this._designatorSpotLocation.Marshal(dos);
+                    dos.WriteByte((byte)this._deadReckoningAlgorithm);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                    this._entityLinearAcceleration.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._designatingEntityID.Unmarshal(dis);
+                    this._codeName = dis.ReadUnsignedShort();
+                    this._designatedEntityID.Unmarshal(dis);
+                    this._designatorCode = dis.ReadUnsignedShort();
+                    this._designatorPower = dis.ReadFloat();
+                    this._designatorWavelength = dis.ReadFloat();
+                    this._designatorSpotWrtDesignated.Unmarshal(dis);
+                    this._designatorSpotLocation.Unmarshal(dis);
+                    this._deadReckoningAlgorithm = dis.ReadByte();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._padding2 = dis.ReadByte();
+                    this._entityLinearAcceleration.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DesignatorPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<designatingEntityID>");
+                this._designatingEntityID.Reflection(sb);
+                sb.AppendLine("</designatingEntityID>");
+                sb.AppendLine("<codeName type=\"ushort\">" + this._codeName.ToString(CultureInfo.InvariantCulture) + "</codeName>");
+                sb.AppendLine("<designatedEntityID>");
+                this._designatedEntityID.Reflection(sb);
+                sb.AppendLine("</designatedEntityID>");
+                sb.AppendLine("<designatorCode type=\"ushort\">" + this._designatorCode.ToString(CultureInfo.InvariantCulture) + "</designatorCode>");
+                sb.AppendLine("<designatorPower type=\"float\">" + this._designatorPower.ToString(CultureInfo.InvariantCulture) + "</designatorPower>");
+                sb.AppendLine("<designatorWavelength type=\"float\">" + this._designatorWavelength.ToString(CultureInfo.InvariantCulture) + "</designatorWavelength>");
+                sb.AppendLine("<designatorSpotWrtDesignated>");
+                this._designatorSpotWrtDesignated.Reflection(sb);
+                sb.AppendLine("</designatorSpotWrtDesignated>");
+                sb.AppendLine("<designatorSpotLocation>");
+                this._designatorSpotLocation.Reflection(sb);
+                sb.AppendLine("</designatorSpotLocation>");
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<entityLinearAcceleration>");
+                this._entityLinearAcceleration.Reflection(sb);
+                sb.AppendLine("</entityLinearAcceleration>");
+                sb.AppendLine("</DesignatorPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DesignatorPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DesignatorPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._designatingEntityID.Equals(obj._designatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._codeName != obj._codeName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatedEntityID.Equals(obj._designatedEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorCode != obj._designatorCode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorPower != obj._designatorPower)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._designatorWavelength != obj._designatorWavelength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatorSpotWrtDesignated.Equals(obj._designatorSpotWrtDesignated))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._designatorSpotLocation.Equals(obj._designatorSpotLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearAcceleration.Equals(obj._entityLinearAcceleration))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._designatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._codeName.GetHashCode();
+            result = GenerateHash(result) ^ this._designatedEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorCode.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorPower.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorWavelength.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorSpotWrtDesignated.GetHashCode();
+            result = GenerateHash(result) ^ this._designatorSpotLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearAcceleration.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DetonationPdu.cs b/Libs/CSharpDis7/DetonationPdu.cs
new file mode 100644
index 0000000..7fa0ebe
--- /dev/null
+++ b/Libs/CSharpDis7/DetonationPdu.cs
@@ -0,0 +1,625 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Detonation or impact of munitions, as well as, non-munition explosions, the burst or initial bloom of chaff, and the ignition of a flare shall be indicated. Section 7.3.3  COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventIdentifier))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(MunitionDescriptor))]
+    [XmlInclude(typeof(VariableParameter))]
+    public partial class DetonationPdu : WarfareFamilyPdu, IEquatable<DetonationPdu>
+    {
+        /// <summary>
+        /// ID of the expendable entity, Section 7.3.3 
+        /// </summary>
+        private EntityID _explodingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event, Section 7.3.3
+        /// </summary>
+        private EventIdentifier _eventID = new EventIdentifier();
+
+        /// <summary>
+        /// velocity of the munition immediately before detonation/impact, Section 7.3.3 
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// location of the munition detonation, the expendable detonation, Section 7.3.3 
+        /// </summary>
+        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
+
+        /// <summary>
+        /// Describes the detonation represented, Section 7.3.3 
+        /// </summary>
+        private MunitionDescriptor _descriptor = new MunitionDescriptor();
+
+        /// <summary>
+        /// Velocity of the ammunition, Section 7.3.3 
+        /// </summary>
+        private Vector3Float _locationOfEntityCoordinates = new Vector3Float();
+
+        /// <summary>
+        /// result of the detonation, Section 7.3.3 
+        /// </summary>
+        private byte _detonationResult;
+
+        /// <summary>
+        /// How many articulation parameters we have, Section 7.3.3 
+        /// </summary>
+        private byte _numberOfVariableParameters;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad;
+
+        /// <summary>
+        /// specify the parameter values for each Variable Parameter record, Section 7.3.3 
+        /// </summary>
+        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DetonationPdu"/> class.
+        /// </summary>
+        public DetonationPdu()
+        {
+            PduType = (byte)3;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DetonationPdu left, DetonationPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DetonationPdu left, DetonationPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._explodingEntityID.GetMarshalledSize();  // this._explodingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
+            marshalSize += this._descriptor.GetMarshalledSize();  // this._descriptor
+            marshalSize += this._locationOfEntityCoordinates.GetMarshalledSize();  // this._locationOfEntityCoordinates
+            marshalSize += 1;  // this._detonationResult
+            marshalSize += 1;  // this._numberOfVariableParameters
+            marshalSize += 2;  // this._pad
+            for (int idx = 0; idx < this._variableParameters.Count; idx++)
+            {
+                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the expendable entity, Section 7.3.3 
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "explodingEntityID")]
+        public EntityID ExplodingEntityID
+        {
+            get
+            {
+                return this._explodingEntityID;
+            }
+
+            set
+            {
+                this._explodingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event, Section 7.3.3
+        /// </summary>
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
+        public EventIdentifier EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the velocity of the munition immediately before detonation/impact, Section 7.3.3 
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of the munition detonation, the expendable detonation, Section 7.3.3 
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
+        public Vector3Double LocationInWorldCoordinates
+        {
+            get
+            {
+                return this._locationInWorldCoordinates;
+            }
+
+            set
+            {
+                this._locationInWorldCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the detonation represented, Section 7.3.3 
+        /// </summary>
+        [XmlElement(Type = typeof(MunitionDescriptor), ElementName = "descriptor")]
+        public MunitionDescriptor Descriptor
+        {
+            get
+            {
+                return this._descriptor;
+            }
+
+            set
+            {
+                this._descriptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Velocity of the ammunition, Section 7.3.3 
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "locationOfEntityCoordinates")]
+        public Vector3Float LocationOfEntityCoordinates
+        {
+            get
+            {
+                return this._locationOfEntityCoordinates;
+            }
+
+            set
+            {
+                this._locationOfEntityCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the result of the detonation, Section 7.3.3 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "detonationResult")]
+        public byte DetonationResult
+        {
+            get
+            {
+                return this._detonationResult;
+            }
+
+            set
+            {
+                this._detonationResult = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
+        public byte NumberOfVariableParameters
+        {
+            get
+            {
+                return this._numberOfVariableParameters;
+            }
+
+            set
+            {
+                this._numberOfVariableParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad")]
+        public ushort Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specify the parameter values for each Variable Parameter record, Section 7.3.3 
+        /// </summary>
+        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
+        public List<VariableParameter> VariableParameters
+        {
+            get
+            {
+                return this._variableParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._explodingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    this._velocity.Marshal(dos);
+                    this._locationInWorldCoordinates.Marshal(dos);
+                    this._descriptor.Marshal(dos);
+                    this._locationOfEntityCoordinates.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._detonationResult);
+                    dos.WriteUnsignedByte((byte)this._variableParameters.Count);
+                    dos.WriteUnsignedShort((ushort)this._pad);
+
+                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                    {
+                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                        aVariableParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._explodingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._velocity.Unmarshal(dis);
+                    this._locationInWorldCoordinates.Unmarshal(dis);
+                    this._descriptor.Unmarshal(dis);
+                    this._locationOfEntityCoordinates.Unmarshal(dis);
+                    this._detonationResult = dis.ReadUnsignedByte();
+                    this._numberOfVariableParameters = dis.ReadUnsignedByte();
+                    this._pad = dis.ReadUnsignedShort();
+                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
+                    {
+                        VariableParameter anX = new VariableParameter();
+                        anX.Unmarshal(dis);
+                        this._variableParameters.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DetonationPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<explodingEntityID>");
+                this._explodingEntityID.Reflection(sb);
+                sb.AppendLine("</explodingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<locationInWorldCoordinates>");
+                this._locationInWorldCoordinates.Reflection(sb);
+                sb.AppendLine("</locationInWorldCoordinates>");
+                sb.AppendLine("<descriptor>");
+                this._descriptor.Reflection(sb);
+                sb.AppendLine("</descriptor>");
+                sb.AppendLine("<locationOfEntityCoordinates>");
+                this._locationOfEntityCoordinates.Reflection(sb);
+                sb.AppendLine("</locationOfEntityCoordinates>");
+                sb.AppendLine("<detonationResult type=\"byte\">" + this._detonationResult.ToString(CultureInfo.InvariantCulture) + "</detonationResult>");
+                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
+                sb.AppendLine("<pad type=\"ushort\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
+                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                    aVariableParameter.Reflection(sb);
+                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DetonationPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DetonationPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DetonationPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._explodingEntityID.Equals(obj._explodingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._descriptor.Equals(obj._descriptor))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationOfEntityCoordinates.Equals(obj._locationOfEntityCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._detonationResult != obj._detonationResult)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameters.Count != obj._variableParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._explodingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._descriptor.GetHashCode();
+            result = GenerateHash(result) ^ this._locationOfEntityCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._detonationResult.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+
+            if (this._variableParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs b/Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
new file mode 100644
index 0000000..aed713a
--- /dev/null
+++ b/Libs/CSharpDis7/DirectedEnergyAreaAimpoint.cs
@@ -0,0 +1,547 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// DE Precision Aimpoint Record. NOT COMPLETE. Section 6.2.21.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(BeamAntennaPattern))]
+    [XmlInclude(typeof(DirectedEnergyTargetEnergyDeposition))]
+    public partial class DirectedEnergyAreaAimpoint
+    {
+        /// <summary>
+        /// Type of Record
+        /// </summary>
+        private uint _recordType = 4001;
+
+        /// <summary>
+        /// Length of Record
+        /// </summary>
+        private ushort _recordLength;
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// Number of beam antenna pattern records
+        /// </summary>
+        private ushort _beamAntennaPatternRecordCount;
+
+        /// <summary>
+        /// Number of DE target energy depositon records
+        /// </summary>
+        private ushort _directedEnergyTargetEnergyDepositionRecordCount;
+
+        /// <summary>
+        /// list of beam antenna records. See 6.2.9.2
+        /// </summary>
+        private List<BeamAntennaPattern> _beamAntennaParameterList = new List<BeamAntennaPattern>();
+
+        /// <summary>
+        /// list of DE target deposition records. See 6.2.21.4
+        /// </summary>
+        private List<DirectedEnergyTargetEnergyDeposition> _directedEnergyTargetEnergyDepositionRecordList = new List<DirectedEnergyTargetEnergyDeposition>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectedEnergyAreaAimpoint"/> class.
+        /// </summary>
+        public DirectedEnergyAreaAimpoint()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DirectedEnergyAreaAimpoint left, DirectedEnergyAreaAimpoint right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DirectedEnergyAreaAimpoint left, DirectedEnergyAreaAimpoint right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 2;  // this._padding
+            marshalSize += 2;  // this._beamAntennaPatternRecordCount
+            marshalSize += 2;  // this._directedEnergyTargetEnergyDepositionRecordCount
+            for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
+            {
+                BeamAntennaPattern listElement = (BeamAntennaPattern)this._beamAntennaParameterList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
+            {
+                DirectedEnergyTargetEnergyDeposition listElement = (DirectedEnergyTargetEnergyDeposition)this._directedEnergyTargetEnergyDepositionRecordList[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of Record
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length of Record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getbeamAntennaPatternRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "beamAntennaPatternRecordCount")]
+        public ushort BeamAntennaPatternRecordCount
+        {
+            get
+            {
+                return this._beamAntennaPatternRecordCount;
+            }
+
+            set
+            {
+                this._beamAntennaPatternRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getdirectedEnergyTargetEnergyDepositionRecordCount method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "directedEnergyTargetEnergyDepositionRecordCount")]
+        public ushort DirectedEnergyTargetEnergyDepositionRecordCount
+        {
+            get
+            {
+                return this._directedEnergyTargetEnergyDepositionRecordCount;
+            }
+
+            set
+            {
+                this._directedEnergyTargetEnergyDepositionRecordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of beam antenna records. See 6.2.9.2
+        /// </summary>
+        [XmlElement(ElementName = "beamAntennaParameterListList", Type = typeof(List<BeamAntennaPattern>))]
+        public List<BeamAntennaPattern> BeamAntennaParameterList
+        {
+            get
+            {
+                return this._beamAntennaParameterList;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of DE target deposition records. See 6.2.21.4
+        /// </summary>
+        [XmlElement(ElementName = "directedEnergyTargetEnergyDepositionRecordListList", Type = typeof(List<DirectedEnergyTargetEnergyDeposition>))]
+        public List<DirectedEnergyTargetEnergyDeposition> DirectedEnergyTargetEnergyDepositionRecordList
+        {
+            get
+            {
+                return this._directedEnergyTargetEnergyDepositionRecordList;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    dos.WriteUnsignedShort((ushort)this._beamAntennaParameterList.Count);
+                    dos.WriteUnsignedShort((ushort)this._directedEnergyTargetEnergyDepositionRecordList.Count);
+
+                    for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
+                    {
+                        BeamAntennaPattern aBeamAntennaPattern = (BeamAntennaPattern)this._beamAntennaParameterList[idx];
+                        aBeamAntennaPattern.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
+                    {
+                        DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = (DirectedEnergyTargetEnergyDeposition)this._directedEnergyTargetEnergyDepositionRecordList[idx];
+                        aDirectedEnergyTargetEnergyDeposition.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                    this._beamAntennaPatternRecordCount = dis.ReadUnsignedShort();
+                    this._directedEnergyTargetEnergyDepositionRecordCount = dis.ReadUnsignedShort();
+                    for (int idx = 0; idx < this.BeamAntennaPatternRecordCount; idx++)
+                    {
+                        BeamAntennaPattern anX = new BeamAntennaPattern();
+                        anX.Unmarshal(dis);
+                        this._beamAntennaParameterList.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.DirectedEnergyTargetEnergyDepositionRecordCount; idx++)
+                    {
+                        DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
+                        anX.Unmarshal(dis);
+                        this._directedEnergyTargetEnergyDepositionRecordList.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DirectedEnergyAreaAimpoint>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<beamAntennaParameterList type=\"ushort\">" + this._beamAntennaParameterList.Count.ToString(CultureInfo.InvariantCulture) + "</beamAntennaParameterList>");
+                sb.AppendLine("<directedEnergyTargetEnergyDepositionRecordList type=\"ushort\">" + this._directedEnergyTargetEnergyDepositionRecordList.Count.ToString(CultureInfo.InvariantCulture) + "</directedEnergyTargetEnergyDepositionRecordList>");
+                for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
+                {
+                    sb.AppendLine("<beamAntennaParameterList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"BeamAntennaPattern\">");
+                    BeamAntennaPattern aBeamAntennaPattern = (BeamAntennaPattern)this._beamAntennaParameterList[idx];
+                    aBeamAntennaPattern.Reflection(sb);
+                    sb.AppendLine("</beamAntennaParameterList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
+                {
+                    sb.AppendLine("<directedEnergyTargetEnergyDepositionRecordList" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"DirectedEnergyTargetEnergyDeposition\">");
+                    DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = (DirectedEnergyTargetEnergyDeposition)this._directedEnergyTargetEnergyDepositionRecordList[idx];
+                    aDirectedEnergyTargetEnergyDeposition.Reflection(sb);
+                    sb.AppendLine("</directedEnergyTargetEnergyDepositionRecordList" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DirectedEnergyAreaAimpoint>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DirectedEnergyAreaAimpoint;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DirectedEnergyAreaAimpoint obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAntennaPatternRecordCount != obj._beamAntennaPatternRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._directedEnergyTargetEnergyDepositionRecordCount != obj._directedEnergyTargetEnergyDepositionRecordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamAntennaParameterList.Count != obj._beamAntennaParameterList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
+                {
+                    if (!this._beamAntennaParameterList[idx].Equals(obj._beamAntennaParameterList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._directedEnergyTargetEnergyDepositionRecordList.Count != obj._directedEnergyTargetEnergyDepositionRecordList.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
+                {
+                    if (!this._directedEnergyTargetEnergyDepositionRecordList[idx].Equals(obj._directedEnergyTargetEnergyDepositionRecordList[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._beamAntennaPatternRecordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._directedEnergyTargetEnergyDepositionRecordCount.GetHashCode();
+
+            if (this._beamAntennaParameterList.Count > 0)
+            {
+                for (int idx = 0; idx < this._beamAntennaParameterList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._beamAntennaParameterList[idx].GetHashCode();
+                }
+            }
+
+            if (this._directedEnergyTargetEnergyDepositionRecordList.Count > 0)
+            {
+                for (int idx = 0; idx < this._directedEnergyTargetEnergyDepositionRecordList.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._directedEnergyTargetEnergyDepositionRecordList[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DirectedEnergyDamage.cs b/Libs/CSharpDis7/DirectedEnergyDamage.cs
new file mode 100644
index 0000000..8d88db1
--- /dev/null
+++ b/Libs/CSharpDis7/DirectedEnergyDamage.cs
@@ -0,0 +1,635 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Damage sustained by an entity due to directed energy. Location of the damage based on a relative x,y,z location from the center of the entity. Section 6.2.17.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(EventIdentifier))]
+    public partial class DirectedEnergyDamage
+    {
+        /// <summary>
+        /// DE Record Type.
+        /// </summary>
+        private uint _recordType = 4500;
+
+        /// <summary>
+        /// DE Record Length (bytes).
+        /// </summary>
+        private ushort _recordLength = 40;
+
+        /// <summary>
+        /// padding.
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// location of damage, relative to center of entity
+        /// </summary>
+        private Vector3Float _damageLocation = new Vector3Float();
+
+        /// <summary>
+        /// Size of damaged area, in meters.
+        /// </summary>
+        private float _damageDiameter;
+
+        /// <summary>
+        /// average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15
+        /// </summary>
+        private float _temperature = -273.15;
+
+        /// <summary>
+        /// enumeration
+        /// </summary>
+        private byte _componentIdentification;
+
+        /// <summary>
+        /// enumeration
+        /// </summary>
+        private byte _componentDamageStatus;
+
+        /// <summary>
+        /// enumeration
+        /// </summary>
+        private byte _componentVisualDamageStatus;
+
+        /// <summary>
+        /// enumeration
+        /// </summary>
+        private byte _componentVisualSmokeColor;
+
+        /// <summary>
+        /// For any component damage resulting this field shall be set to the fire event ID from that PDU.
+        /// </summary>
+        private EventIdentifier _fireEventID = new EventIdentifier();
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectedEnergyDamage"/> class.
+        /// </summary>
+        public DirectedEnergyDamage()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DirectedEnergyDamage left, DirectedEnergyDamage right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DirectedEnergyDamage left, DirectedEnergyDamage right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 2;  // this._padding
+            marshalSize += this._damageLocation.GetMarshalledSize();  // this._damageLocation
+            marshalSize += 4;  // this._damageDiameter
+            marshalSize += 4;  // this._temperature
+            marshalSize += 1;  // this._componentIdentification
+            marshalSize += 1;  // this._componentDamageStatus
+            marshalSize += 1;  // this._componentVisualDamageStatus
+            marshalSize += 1;  // this._componentVisualSmokeColor
+            marshalSize += this._fireEventID.GetMarshalledSize();  // this._fireEventID
+            marshalSize += 2;  // this._padding2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the DE Record Type.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the DE Record Length (bytes).
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of damage, relative to center of entity
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "damageLocation")]
+        public Vector3Float DamageLocation
+        {
+            get
+            {
+                return this._damageLocation;
+            }
+
+            set
+            {
+                this._damageLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Size of damaged area, in meters.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "damageDiameter")]
+        public float DamageDiameter
+        {
+            get
+            {
+                return this._damageDiameter;
+            }
+
+            set
+            {
+                this._damageDiameter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "temperature")]
+        public float Temperature
+        {
+            get
+            {
+                return this._temperature;
+            }
+
+            set
+            {
+                this._temperature = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "componentIdentification")]
+        public byte ComponentIdentification
+        {
+            get
+            {
+                return this._componentIdentification;
+            }
+
+            set
+            {
+                this._componentIdentification = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "componentDamageStatus")]
+        public byte ComponentDamageStatus
+        {
+            get
+            {
+                return this._componentDamageStatus;
+            }
+
+            set
+            {
+                this._componentDamageStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "componentVisualDamageStatus")]
+        public byte ComponentVisualDamageStatus
+        {
+            get
+            {
+                return this._componentVisualDamageStatus;
+            }
+
+            set
+            {
+                this._componentVisualDamageStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "componentVisualSmokeColor")]
+        public byte ComponentVisualSmokeColor
+        {
+            get
+            {
+                return this._componentVisualSmokeColor;
+            }
+
+            set
+            {
+                this._componentVisualSmokeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the For any component damage resulting this field shall be set to the fire event ID from that PDU.
+        /// </summary>
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "fireEventID")]
+        public EventIdentifier FireEventID
+        {
+            get
+            {
+                return this._fireEventID;
+            }
+
+            set
+            {
+                this._fireEventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
+        public ushort Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    this._damageLocation.Marshal(dos);
+                    dos.WriteFloat((float)this._damageDiameter);
+                    dos.WriteFloat((float)this._temperature);
+                    dos.WriteUnsignedByte((byte)this._componentIdentification);
+                    dos.WriteUnsignedByte((byte)this._componentDamageStatus);
+                    dos.WriteUnsignedByte((byte)this._componentVisualDamageStatus);
+                    dos.WriteUnsignedByte((byte)this._componentVisualSmokeColor);
+                    this._fireEventID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding2);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                    this._damageLocation.Unmarshal(dis);
+                    this._damageDiameter = dis.ReadFloat();
+                    this._temperature = dis.ReadFloat();
+                    this._componentIdentification = dis.ReadUnsignedByte();
+                    this._componentDamageStatus = dis.ReadUnsignedByte();
+                    this._componentVisualDamageStatus = dis.ReadUnsignedByte();
+                    this._componentVisualSmokeColor = dis.ReadUnsignedByte();
+                    this._fireEventID.Unmarshal(dis);
+                    this._padding2 = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DirectedEnergyDamage>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<damageLocation>");
+                this._damageLocation.Reflection(sb);
+                sb.AppendLine("</damageLocation>");
+                sb.AppendLine("<damageDiameter type=\"float\">" + this._damageDiameter.ToString(CultureInfo.InvariantCulture) + "</damageDiameter>");
+                sb.AppendLine("<temperature type=\"float\">" + this._temperature.ToString(CultureInfo.InvariantCulture) + "</temperature>");
+                sb.AppendLine("<componentIdentification type=\"byte\">" + this._componentIdentification.ToString(CultureInfo.InvariantCulture) + "</componentIdentification>");
+                sb.AppendLine("<componentDamageStatus type=\"byte\">" + this._componentDamageStatus.ToString(CultureInfo.InvariantCulture) + "</componentDamageStatus>");
+                sb.AppendLine("<componentVisualDamageStatus type=\"byte\">" + this._componentVisualDamageStatus.ToString(CultureInfo.InvariantCulture) + "</componentVisualDamageStatus>");
+                sb.AppendLine("<componentVisualSmokeColor type=\"byte\">" + this._componentVisualSmokeColor.ToString(CultureInfo.InvariantCulture) + "</componentVisualSmokeColor>");
+                sb.AppendLine("<fireEventID>");
+                this._fireEventID.Reflection(sb);
+                sb.AppendLine("</fireEventID>");
+                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("</DirectedEnergyDamage>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DirectedEnergyDamage;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DirectedEnergyDamage obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._damageLocation.Equals(obj._damageLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._damageDiameter != obj._damageDiameter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._temperature != obj._temperature)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._componentIdentification != obj._componentIdentification)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._componentDamageStatus != obj._componentDamageStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._componentVisualDamageStatus != obj._componentVisualDamageStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._componentVisualSmokeColor != obj._componentVisualSmokeColor)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._fireEventID.Equals(obj._fireEventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._damageLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._damageDiameter.GetHashCode();
+            result = GenerateHash(result) ^ this._temperature.GetHashCode();
+            result = GenerateHash(result) ^ this._componentIdentification.GetHashCode();
+            result = GenerateHash(result) ^ this._componentDamageStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._componentVisualDamageStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._componentVisualSmokeColor.GetHashCode();
+            result = GenerateHash(result) ^ this._fireEventID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DirectedEnergyFirePdu.cs b/Libs/CSharpDis7/DirectedEnergyFirePdu.cs
new file mode 100644
index 0000000..4ce5f99
--- /dev/null
+++ b/Libs/CSharpDis7/DirectedEnergyFirePdu.cs
@@ -0,0 +1,809 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Firing of a directed energy weapon shall be communicated by issuing a Directed Energy Fire PDU Section 7.3.4  COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(ClockTime))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(StandardVariableSpecification))]
+    public partial class DirectedEnergyFirePdu : WarfareFamilyPdu, IEquatable<DirectedEnergyFirePdu>
+    {
+        /// <summary>
+        /// Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4 
+        /// </summary>
+        private EntityType _munitionType = new EntityType();
+
+        /// <summary>
+        /// Field shall indicate the simulation time at start of the shot, Section 7.3.4 
+        /// </summary>
+        private ClockTime _shotStartTime = new ClockTime();
+
+        /// <summary>
+        /// Field shall indicate the current cumulative duration of the shot, Section 7.3.4 
+        /// </summary>
+        private float _commulativeShotTime;
+
+        /// <summary>
+        /// Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4 
+        /// </summary>
+        private Vector3Float _ApertureEmitterLocation = new Vector3Float();
+
+        /// <summary>
+        /// Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4 
+        /// </summary>
+        private float _apertureDiameter;
+
+        /// <summary>
+        /// Field shall identify the emissions wavelength in units of meters, Section 7.3.4 
+        /// </summary>
+        private float _wavelength;
+
+        /// <summary>
+        /// Field shall identify the current peak irradiance of emissions in units of Watts per square meter, Section 7.3.4 
+        /// </summary>
+        private float _peakIrradiance;
+
+        /// <summary>
+        /// field shall identify the current pulse repetition frequency in units of cycles per second (Hertz), Section 7.3.4 
+        /// </summary>
+        private float _pulseRepetitionFrequency;
+
+        /// <summary>
+        /// field shall identify the pulse width emissions in units of seconds, Section 7.3.4
+        /// </summary>
+        private int _pulseWidth;
+
+        /// <summary>
+        /// 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4 
+        /// </summary>
+        private int _flags;
+
+        /// <summary>
+        /// Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4 
+        /// </summary>
+        private byte _pulseShape;
+
+        /// <summary>
+        /// padding, Section 7.3.4 
+        /// </summary>
+        private byte _padding1;
+
+        /// <summary>
+        /// padding, Section 7.3.4 
+        /// </summary>
+        private uint _padding2;
+
+        /// <summary>
+        /// padding, Section 7.3.4 
+        /// </summary>
+        private ushort _padding3;
+
+        /// <summary>
+        /// Field shall specify the number of DE records, Section 7.3.4 
+        /// </summary>
+        private ushort _numberOfDERecords;
+
+        /// <summary>
+        /// Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4
+        /// </summary>
+        private List<StandardVariableSpecification> _dERecords = new List<StandardVariableSpecification>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectedEnergyFirePdu"/> class.
+        /// </summary>
+        public DirectedEnergyFirePdu()
+        {
+            PduType = (byte)68;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DirectedEnergyFirePdu left, DirectedEnergyFirePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DirectedEnergyFirePdu left, DirectedEnergyFirePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
+            marshalSize += this._shotStartTime.GetMarshalledSize();  // this._shotStartTime
+            marshalSize += 4;  // this._commulativeShotTime
+            marshalSize += this._ApertureEmitterLocation.GetMarshalledSize();  // this._ApertureEmitterLocation
+            marshalSize += 4;  // this._apertureDiameter
+            marshalSize += 4;  // this._wavelength
+            marshalSize += 4;  // this._peakIrradiance
+            marshalSize += 4;  // this._pulseRepetitionFrequency
+            marshalSize += 4;  // this._pulseWidth
+            marshalSize += 4;  // this._flags
+            marshalSize += 1;  // this._pulseShape
+            marshalSize += 1;  // this._padding1
+            marshalSize += 4;  // this._padding2
+            marshalSize += 2;  // this._padding3
+            marshalSize += 2;  // this._numberOfDERecords
+            for (int idx = 0; idx < this._dERecords.Count; idx++)
+            {
+                StandardVariableSpecification listElement = (StandardVariableSpecification)this._dERecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
+        public EntityType MunitionType
+        {
+            get
+            {
+                return this._munitionType;
+            }
+
+            set
+            {
+                this._munitionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall indicate the simulation time at start of the shot, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "shotStartTime")]
+        public ClockTime ShotStartTime
+        {
+            get
+            {
+                return this._shotStartTime;
+            }
+
+            set
+            {
+                this._shotStartTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall indicate the current cumulative duration of the shot, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "commulativeShotTime")]
+        public float CommulativeShotTime
+        {
+            get
+            {
+                return this._commulativeShotTime;
+            }
+
+            set
+            {
+                this._commulativeShotTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "ApertureEmitterLocation")]
+        public Vector3Float ApertureEmitterLocation
+        {
+            get
+            {
+                return this._ApertureEmitterLocation;
+            }
+
+            set
+            {
+                this._ApertureEmitterLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "apertureDiameter")]
+        public float ApertureDiameter
+        {
+            get
+            {
+                return this._apertureDiameter;
+            }
+
+            set
+            {
+                this._apertureDiameter = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall identify the emissions wavelength in units of meters, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "wavelength")]
+        public float Wavelength
+        {
+            get
+            {
+                return this._wavelength;
+            }
+
+            set
+            {
+                this._wavelength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall identify the current peak irradiance of emissions in units of Watts per square meter, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "peakIrradiance")]
+        public float PeakIrradiance
+        {
+            get
+            {
+                return this._peakIrradiance;
+            }
+
+            set
+            {
+                this._peakIrradiance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the field shall identify the current pulse repetition frequency in units of cycles per second (Hertz), Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
+        public float PulseRepetitionFrequency
+        {
+            get
+            {
+                return this._pulseRepetitionFrequency;
+            }
+
+            set
+            {
+                this._pulseRepetitionFrequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the field shall identify the pulse width emissions in units of seconds, Section 7.3.4
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "pulseWidth")]
+        public int PulseWidth
+        {
+            get
+            {
+                return this._pulseWidth;
+            }
+
+            set
+            {
+                this._pulseWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "flags")]
+        public int Flags
+        {
+            get
+            {
+                return this._flags;
+            }
+
+            set
+            {
+                this._flags = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pulseShape")]
+        public byte PulseShape
+        {
+            get
+            {
+                return this._pulseShape;
+            }
+
+            set
+            {
+                this._pulseShape = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding2")]
+        public uint Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding, Section 7.3.4 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding3")]
+        public ushort Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfDERecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDERecords")]
+        public ushort NumberOfDERecords
+        {
+            get
+            {
+                return this._numberOfDERecords;
+            }
+
+            set
+            {
+                this._numberOfDERecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4
+        /// </summary>
+        [XmlElement(ElementName = "dERecordsList", Type = typeof(List<StandardVariableSpecification>))]
+        public List<StandardVariableSpecification> DERecords
+        {
+            get
+            {
+                return this._dERecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionType.Marshal(dos);
+                    this._shotStartTime.Marshal(dos);
+                    dos.WriteFloat((float)this._commulativeShotTime);
+                    this._ApertureEmitterLocation.Marshal(dos);
+                    dos.WriteFloat((float)this._apertureDiameter);
+                    dos.WriteFloat((float)this._wavelength);
+                    dos.WriteFloat((float)this._peakIrradiance);
+                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
+                    dos.WriteInt((int)this._pulseWidth);
+                    dos.WriteInt((int)this._flags);
+                    dos.WriteByte((byte)this._pulseShape);
+                    dos.WriteUnsignedByte((byte)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._padding2);
+                    dos.WriteUnsignedShort((ushort)this._padding3);
+                    dos.WriteUnsignedShort((ushort)this._dERecords.Count);
+
+                    for (int idx = 0; idx < this._dERecords.Count; idx++)
+                    {
+                        StandardVariableSpecification aStandardVariableSpecification = (StandardVariableSpecification)this._dERecords[idx];
+                        aStandardVariableSpecification.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionType.Unmarshal(dis);
+                    this._shotStartTime.Unmarshal(dis);
+                    this._commulativeShotTime = dis.ReadFloat();
+                    this._ApertureEmitterLocation.Unmarshal(dis);
+                    this._apertureDiameter = dis.ReadFloat();
+                    this._wavelength = dis.ReadFloat();
+                    this._peakIrradiance = dis.ReadFloat();
+                    this._pulseRepetitionFrequency = dis.ReadFloat();
+                    this._pulseWidth = dis.ReadInt();
+                    this._flags = dis.ReadInt();
+                    this._pulseShape = dis.ReadByte();
+                    this._padding1 = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedInt();
+                    this._padding3 = dis.ReadUnsignedShort();
+                    this._numberOfDERecords = dis.ReadUnsignedShort();
+                    for (int idx = 0; idx < this.NumberOfDERecords; idx++)
+                    {
+                        StandardVariableSpecification anX = new StandardVariableSpecification();
+                        anX.Unmarshal(dis);
+                        this._dERecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DirectedEnergyFirePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<munitionType>");
+                this._munitionType.Reflection(sb);
+                sb.AppendLine("</munitionType>");
+                sb.AppendLine("<shotStartTime>");
+                this._shotStartTime.Reflection(sb);
+                sb.AppendLine("</shotStartTime>");
+                sb.AppendLine("<commulativeShotTime type=\"float\">" + this._commulativeShotTime.ToString(CultureInfo.InvariantCulture) + "</commulativeShotTime>");
+                sb.AppendLine("<ApertureEmitterLocation>");
+                this._ApertureEmitterLocation.Reflection(sb);
+                sb.AppendLine("</ApertureEmitterLocation>");
+                sb.AppendLine("<apertureDiameter type=\"float\">" + this._apertureDiameter.ToString(CultureInfo.InvariantCulture) + "</apertureDiameter>");
+                sb.AppendLine("<wavelength type=\"float\">" + this._wavelength.ToString(CultureInfo.InvariantCulture) + "</wavelength>");
+                sb.AppendLine("<peakIrradiance type=\"float\">" + this._peakIrradiance.ToString(CultureInfo.InvariantCulture) + "</peakIrradiance>");
+                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
+                sb.AppendLine("<pulseWidth type=\"int\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
+                sb.AppendLine("<flags type=\"int\">" + this._flags.ToString(CultureInfo.InvariantCulture) + "</flags>");
+                sb.AppendLine("<pulseShape type=\"byte\">" + this._pulseShape.ToString(CultureInfo.InvariantCulture) + "</pulseShape>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"uint\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<padding3 type=\"ushort\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                sb.AppendLine("<dERecords type=\"ushort\">" + this._dERecords.Count.ToString(CultureInfo.InvariantCulture) + "</dERecords>");
+                for (int idx = 0; idx < this._dERecords.Count; idx++)
+                {
+                    sb.AppendLine("<dERecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"StandardVariableSpecification\">");
+                    StandardVariableSpecification aStandardVariableSpecification = (StandardVariableSpecification)this._dERecords[idx];
+                    aStandardVariableSpecification.Reflection(sb);
+                    sb.AppendLine("</dERecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</DirectedEnergyFirePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DirectedEnergyFirePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DirectedEnergyFirePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._munitionType.Equals(obj._munitionType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._shotStartTime.Equals(obj._shotStartTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._commulativeShotTime != obj._commulativeShotTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._ApertureEmitterLocation.Equals(obj._ApertureEmitterLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._apertureDiameter != obj._apertureDiameter)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._wavelength != obj._wavelength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._peakIrradiance != obj._peakIrradiance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseWidth != obj._pulseWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._flags != obj._flags)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseShape != obj._pulseShape)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfDERecords != obj._numberOfDERecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dERecords.Count != obj._dERecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._dERecords.Count; idx++)
+                {
+                    if (!this._dERecords[idx].Equals(obj._dERecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
+            result = GenerateHash(result) ^ this._shotStartTime.GetHashCode();
+            result = GenerateHash(result) ^ this._commulativeShotTime.GetHashCode();
+            result = GenerateHash(result) ^ this._ApertureEmitterLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._apertureDiameter.GetHashCode();
+            result = GenerateHash(result) ^ this._wavelength.GetHashCode();
+            result = GenerateHash(result) ^ this._peakIrradiance.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._flags.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseShape.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfDERecords.GetHashCode();
+
+            if (this._dERecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._dERecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._dERecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs b/Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
new file mode 100644
index 0000000..1eeda49
--- /dev/null
+++ b/Libs/CSharpDis7/DirectedEnergyPrecisionAimpoint.cs
@@ -0,0 +1,674 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// DE Precision Aimpoint Record. Section 6.2.21.3
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(EntityID))]
+    public partial class DirectedEnergyPrecisionAimpoint
+    {
+        /// <summary>
+        /// Type of Record
+        /// </summary>
+        private uint _recordType = 4000;
+
+        /// <summary>
+        /// Length of Record
+        /// </summary>
+        private ushort _recordLength = 88;
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// Position of Target Spot in World Coordinates.
+        /// </summary>
+        private Vector3Double _targetSpotLocation = new Vector3Double();
+
+        /// <summary>
+        /// Position (meters) of Target Spot relative to Entity Position.
+        /// </summary>
+        private Vector3Float _targetSpotEntityLocation = new Vector3Float();
+
+        /// <summary>
+        /// Velocity (meters/sec) of Target Spot.
+        /// </summary>
+        private Vector3Float _targetSpotVelocity = new Vector3Float();
+
+        /// <summary>
+        /// Acceleration (meters/sec/sec) of Target Spot.
+        /// </summary>
+        private Vector3Float _targetSpotAcceleration = new Vector3Float();
+
+        /// <summary>
+        /// Unique ID of the target entity.
+        /// </summary>
+        private EntityID _targetEntityID = new EntityID();
+
+        /// <summary>
+        /// Target Component ID ENUM, same as in DamageDescriptionRecord.
+        /// </summary>
+        private byte _targetComponentID;
+
+        /// <summary>
+        /// Spot Shape ENUM.
+        /// </summary>
+        private byte _SpotShape;
+
+        /// <summary>
+        /// Beam Spot Cross Section Semi-Major Axis.
+        /// </summary>
+        private float _BeamSpotXSecSemiMajorAxis;
+
+        /// <summary>
+        /// Beam Spot Cross Section Semi-Major Axis.
+        /// </summary>
+        private float _BeamSpotCrossSectionSemiMinorAxis;
+
+        /// <summary>
+        /// Beam Spot Cross Section Orientation Angle.
+        /// </summary>
+        private float _BeamSpotCrossSectionOrientAngle;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectedEnergyPrecisionAimpoint"/> class.
+        /// </summary>
+        public DirectedEnergyPrecisionAimpoint()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DirectedEnergyPrecisionAimpoint left, DirectedEnergyPrecisionAimpoint right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DirectedEnergyPrecisionAimpoint left, DirectedEnergyPrecisionAimpoint right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 2;  // this._padding
+            marshalSize += this._targetSpotLocation.GetMarshalledSize();  // this._targetSpotLocation
+            marshalSize += this._targetSpotEntityLocation.GetMarshalledSize();  // this._targetSpotEntityLocation
+            marshalSize += this._targetSpotVelocity.GetMarshalledSize();  // this._targetSpotVelocity
+            marshalSize += this._targetSpotAcceleration.GetMarshalledSize();  // this._targetSpotAcceleration
+            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
+            marshalSize += 1;  // this._targetComponentID
+            marshalSize += 1;  // this._SpotShape
+            marshalSize += 4;  // this._BeamSpotXSecSemiMajorAxis
+            marshalSize += 4;  // this._BeamSpotCrossSectionSemiMinorAxis
+            marshalSize += 4;  // this._BeamSpotCrossSectionOrientAngle
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of Record
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length of Record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Position of Target Spot in World Coordinates.
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "targetSpotLocation")]
+        public Vector3Double TargetSpotLocation
+        {
+            get
+            {
+                return this._targetSpotLocation;
+            }
+
+            set
+            {
+                this._targetSpotLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Position (meters) of Target Spot relative to Entity Position.
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "targetSpotEntityLocation")]
+        public Vector3Float TargetSpotEntityLocation
+        {
+            get
+            {
+                return this._targetSpotEntityLocation;
+            }
+
+            set
+            {
+                this._targetSpotEntityLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Velocity (meters/sec) of Target Spot.
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "targetSpotVelocity")]
+        public Vector3Float TargetSpotVelocity
+        {
+            get
+            {
+                return this._targetSpotVelocity;
+            }
+
+            set
+            {
+                this._targetSpotVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Acceleration (meters/sec/sec) of Target Spot.
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "targetSpotAcceleration")]
+        public Vector3Float TargetSpotAcceleration
+        {
+            get
+            {
+                return this._targetSpotAcceleration;
+            }
+
+            set
+            {
+                this._targetSpotAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Unique ID of the target entity.
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
+        public EntityID TargetEntityID
+        {
+            get
+            {
+                return this._targetEntityID;
+            }
+
+            set
+            {
+                this._targetEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Target Component ID ENUM, same as in DamageDescriptionRecord.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "targetComponentID")]
+        public byte TargetComponentID
+        {
+            get
+            {
+                return this._targetComponentID;
+            }
+
+            set
+            {
+                this._targetComponentID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Spot Shape ENUM.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "SpotShape")]
+        public byte SpotShape
+        {
+            get
+            {
+                return this._SpotShape;
+            }
+
+            set
+            {
+                this._SpotShape = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Beam Spot Cross Section Semi-Major Axis.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "BeamSpotXSecSemiMajorAxis")]
+        public float BeamSpotXSecSemiMajorAxis
+        {
+            get
+            {
+                return this._BeamSpotXSecSemiMajorAxis;
+            }
+
+            set
+            {
+                this._BeamSpotXSecSemiMajorAxis = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Beam Spot Cross Section Semi-Major Axis.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "BeamSpotCrossSectionSemiMinorAxis")]
+        public float BeamSpotCrossSectionSemiMinorAxis
+        {
+            get
+            {
+                return this._BeamSpotCrossSectionSemiMinorAxis;
+            }
+
+            set
+            {
+                this._BeamSpotCrossSectionSemiMinorAxis = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Beam Spot Cross Section Orientation Angle.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "BeamSpotCrossSectionOrientAngle")]
+        public float BeamSpotCrossSectionOrientAngle
+        {
+            get
+            {
+                return this._BeamSpotCrossSectionOrientAngle;
+            }
+
+            set
+            {
+                this._BeamSpotCrossSectionOrientAngle = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    this._targetSpotLocation.Marshal(dos);
+                    this._targetSpotEntityLocation.Marshal(dos);
+                    this._targetSpotVelocity.Marshal(dos);
+                    this._targetSpotAcceleration.Marshal(dos);
+                    this._targetEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._targetComponentID);
+                    dos.WriteUnsignedByte((byte)this._SpotShape);
+                    dos.WriteFloat((float)this._BeamSpotXSecSemiMajorAxis);
+                    dos.WriteFloat((float)this._BeamSpotCrossSectionSemiMinorAxis);
+                    dos.WriteFloat((float)this._BeamSpotCrossSectionOrientAngle);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                    this._targetSpotLocation.Unmarshal(dis);
+                    this._targetSpotEntityLocation.Unmarshal(dis);
+                    this._targetSpotVelocity.Unmarshal(dis);
+                    this._targetSpotAcceleration.Unmarshal(dis);
+                    this._targetEntityID.Unmarshal(dis);
+                    this._targetComponentID = dis.ReadUnsignedByte();
+                    this._SpotShape = dis.ReadUnsignedByte();
+                    this._BeamSpotXSecSemiMajorAxis = dis.ReadFloat();
+                    this._BeamSpotCrossSectionSemiMinorAxis = dis.ReadFloat();
+                    this._BeamSpotCrossSectionOrientAngle = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DirectedEnergyPrecisionAimpoint>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<targetSpotLocation>");
+                this._targetSpotLocation.Reflection(sb);
+                sb.AppendLine("</targetSpotLocation>");
+                sb.AppendLine("<targetSpotEntityLocation>");
+                this._targetSpotEntityLocation.Reflection(sb);
+                sb.AppendLine("</targetSpotEntityLocation>");
+                sb.AppendLine("<targetSpotVelocity>");
+                this._targetSpotVelocity.Reflection(sb);
+                sb.AppendLine("</targetSpotVelocity>");
+                sb.AppendLine("<targetSpotAcceleration>");
+                this._targetSpotAcceleration.Reflection(sb);
+                sb.AppendLine("</targetSpotAcceleration>");
+                sb.AppendLine("<targetEntityID>");
+                this._targetEntityID.Reflection(sb);
+                sb.AppendLine("</targetEntityID>");
+                sb.AppendLine("<targetComponentID type=\"byte\">" + this._targetComponentID.ToString(CultureInfo.InvariantCulture) + "</targetComponentID>");
+                sb.AppendLine("<SpotShape type=\"byte\">" + this._SpotShape.ToString(CultureInfo.InvariantCulture) + "</SpotShape>");
+                sb.AppendLine("<BeamSpotXSecSemiMajorAxis type=\"float\">" + this._BeamSpotXSecSemiMajorAxis.ToString(CultureInfo.InvariantCulture) + "</BeamSpotXSecSemiMajorAxis>");
+                sb.AppendLine("<BeamSpotCrossSectionSemiMinorAxis type=\"float\">" + this._BeamSpotCrossSectionSemiMinorAxis.ToString(CultureInfo.InvariantCulture) + "</BeamSpotCrossSectionSemiMinorAxis>");
+                sb.AppendLine("<BeamSpotCrossSectionOrientAngle type=\"float\">" + this._BeamSpotCrossSectionOrientAngle.ToString(CultureInfo.InvariantCulture) + "</BeamSpotCrossSectionOrientAngle>");
+                sb.AppendLine("</DirectedEnergyPrecisionAimpoint>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DirectedEnergyPrecisionAimpoint;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DirectedEnergyPrecisionAimpoint obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetSpotLocation.Equals(obj._targetSpotLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetSpotEntityLocation.Equals(obj._targetSpotEntityLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetSpotVelocity.Equals(obj._targetSpotVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetSpotAcceleration.Equals(obj._targetSpotAcceleration))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetEntityID.Equals(obj._targetEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._targetComponentID != obj._targetComponentID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._SpotShape != obj._SpotShape)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._BeamSpotXSecSemiMajorAxis != obj._BeamSpotXSecSemiMajorAxis)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._BeamSpotCrossSectionSemiMinorAxis != obj._BeamSpotCrossSectionSemiMinorAxis)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._BeamSpotCrossSectionOrientAngle != obj._BeamSpotCrossSectionOrientAngle)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._targetSpotLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._targetSpotEntityLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._targetSpotVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._targetSpotAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._targetComponentID.GetHashCode();
+            result = GenerateHash(result) ^ this._SpotShape.GetHashCode();
+            result = GenerateHash(result) ^ this._BeamSpotXSecSemiMajorAxis.GetHashCode();
+            result = GenerateHash(result) ^ this._BeamSpotCrossSectionSemiMinorAxis.GetHashCode();
+            result = GenerateHash(result) ^ this._BeamSpotCrossSectionOrientAngle.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs b/Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
new file mode 100644
index 0000000..1b0a133
--- /dev/null
+++ b/Libs/CSharpDis7/DirectedEnergyTargetEnergyDeposition.cs
@@ -0,0 +1,344 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// DE energy depostion properties for a target entity. Section 6.2.21.4
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class DirectedEnergyTargetEnergyDeposition
+    {
+        /// <summary>
+        /// Unique ID of the target entity.
+        /// </summary>
+        private EntityID _targetEntityID = new EntityID();
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// Peak irrandiance
+        /// </summary>
+        private float _peakIrradiance;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DirectedEnergyTargetEnergyDeposition"/> class.
+        /// </summary>
+        public DirectedEnergyTargetEnergyDeposition()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DirectedEnergyTargetEnergyDeposition left, DirectedEnergyTargetEnergyDeposition right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DirectedEnergyTargetEnergyDeposition left, DirectedEnergyTargetEnergyDeposition right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
+            marshalSize += 2;  // this._padding
+            marshalSize += 4;  // this._peakIrradiance
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Unique ID of the target entity.
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
+        public EntityID TargetEntityID
+        {
+            get
+            {
+                return this._targetEntityID;
+            }
+
+            set
+            {
+                this._targetEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Peak irrandiance
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "peakIrradiance")]
+        public float PeakIrradiance
+        {
+            get
+            {
+                return this._peakIrradiance;
+            }
+
+            set
+            {
+                this._peakIrradiance = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._targetEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    dos.WriteFloat((float)this._peakIrradiance);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._targetEntityID.Unmarshal(dis);
+                    this._padding = dis.ReadUnsignedShort();
+                    this._peakIrradiance = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DirectedEnergyTargetEnergyDeposition>");
+            try
+            {
+                sb.AppendLine("<targetEntityID>");
+                this._targetEntityID.Reflection(sb);
+                sb.AppendLine("</targetEntityID>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<peakIrradiance type=\"float\">" + this._peakIrradiance.ToString(CultureInfo.InvariantCulture) + "</peakIrradiance>");
+                sb.AppendLine("</DirectedEnergyTargetEnergyDeposition>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DirectedEnergyTargetEnergyDeposition;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DirectedEnergyTargetEnergyDeposition obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._targetEntityID.Equals(obj._targetEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._peakIrradiance != obj._peakIrradiance)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._peakIrradiance.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs b/Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
new file mode 100644
index 0000000..1afa67b
--- /dev/null
+++ b/Libs/CSharpDis7/DistributedEmissionsFamilyPdu.cs
@@ -0,0 +1,248 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.7. Electronic Emissions. Abstract superclass for distirubted emissions PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class DistributedEmissionsFamilyPdu : Pdu, IEquatable<DistributedEmissionsFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DistributedEmissionsFamilyPdu"/> class.
+        /// </summary>
+        public DistributedEmissionsFamilyPdu()
+        {
+            ProtocolFamily = (byte)6;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(DistributedEmissionsFamilyPdu left, DistributedEmissionsFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<DistributedEmissionsFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</DistributedEmissionsFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as DistributedEmissionsFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(DistributedEmissionsFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EEFundamentalParameterData.cs b/Libs/CSharpDis7/EEFundamentalParameterData.cs
new file mode 100644
index 0000000..d6d6483
--- /dev/null
+++ b/Libs/CSharpDis7/EEFundamentalParameterData.cs
@@ -0,0 +1,405 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Contains electromagnetic emmission regeneration parameters that are variable throught a scenario. Section 6.2.22.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EEFundamentalParameterData
+    {
+        /// <summary>
+        /// center frequency of the emission in hertz.
+        /// </summary>
+        private float _frequency;
+
+        /// <summary>
+        /// Bandwidth of the frequencies corresponding to the fequency field.
+        /// </summary>
+        private float _frequencyRange;
+
+        /// <summary>
+        /// Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power.
+        /// </summary>
+        private float _effectiveRadiatedPower;
+
+        /// <summary>
+        /// Average repetition frequency of the emission in hertz.
+        /// </summary>
+        private float _pulseRepetitionFrequency;
+
+        /// <summary>
+        /// Average pulse width  of the emission in microseconds.
+        /// </summary>
+        private float _pulseWidth;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EEFundamentalParameterData"/> class.
+        /// </summary>
+        public EEFundamentalParameterData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EEFundamentalParameterData left, EEFundamentalParameterData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EEFundamentalParameterData left, EEFundamentalParameterData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._frequency
+            marshalSize += 4;  // this._frequencyRange
+            marshalSize += 4;  // this._effectiveRadiatedPower
+            marshalSize += 4;  // this._pulseRepetitionFrequency
+            marshalSize += 4;  // this._pulseWidth
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the center frequency of the emission in hertz.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequency")]
+        public float Frequency
+        {
+            get
+            {
+                return this._frequency;
+            }
+
+            set
+            {
+                this._frequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Bandwidth of the frequencies corresponding to the fequency field.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequencyRange")]
+        public float FrequencyRange
+        {
+            get
+            {
+                return this._frequencyRange;
+            }
+
+            set
+            {
+                this._frequencyRange = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "effectiveRadiatedPower")]
+        public float EffectiveRadiatedPower
+        {
+            get
+            {
+                return this._effectiveRadiatedPower;
+            }
+
+            set
+            {
+                this._effectiveRadiatedPower = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Average repetition frequency of the emission in hertz.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseRepetitionFrequency")]
+        public float PulseRepetitionFrequency
+        {
+            get
+            {
+                return this._pulseRepetitionFrequency;
+            }
+
+            set
+            {
+                this._pulseRepetitionFrequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Average pulse width  of the emission in microseconds.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
+        public float PulseWidth
+        {
+            get
+            {
+                return this._pulseWidth;
+            }
+
+            set
+            {
+                this._pulseWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._frequency);
+                    dos.WriteFloat((float)this._frequencyRange);
+                    dos.WriteFloat((float)this._effectiveRadiatedPower);
+                    dos.WriteFloat((float)this._pulseRepetitionFrequency);
+                    dos.WriteFloat((float)this._pulseWidth);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._frequency = dis.ReadFloat();
+                    this._frequencyRange = dis.ReadFloat();
+                    this._effectiveRadiatedPower = dis.ReadFloat();
+                    this._pulseRepetitionFrequency = dis.ReadFloat();
+                    this._pulseWidth = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EEFundamentalParameterData>");
+            try
+            {
+                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
+                sb.AppendLine("<frequencyRange type=\"float\">" + this._frequencyRange.ToString(CultureInfo.InvariantCulture) + "</frequencyRange>");
+                sb.AppendLine("<effectiveRadiatedPower type=\"float\">" + this._effectiveRadiatedPower.ToString(CultureInfo.InvariantCulture) + "</effectiveRadiatedPower>");
+                sb.AppendLine("<pulseRepetitionFrequency type=\"float\">" + this._pulseRepetitionFrequency.ToString(CultureInfo.InvariantCulture) + "</pulseRepetitionFrequency>");
+                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
+                sb.AppendLine("</EEFundamentalParameterData>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EEFundamentalParameterData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EEFundamentalParameterData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._frequency != obj._frequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frequencyRange != obj._frequencyRange)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._effectiveRadiatedPower != obj._effectiveRadiatedPower)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseRepetitionFrequency != obj._pulseRepetitionFrequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseWidth != obj._pulseWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._frequency.GetHashCode();
+            result = GenerateHash(result) ^ this._frequencyRange.GetHashCode();
+            result = GenerateHash(result) ^ this._effectiveRadiatedPower.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseRepetitionFrequency.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EightByteChunk.cs b/Libs/CSharpDis7/EightByteChunk.cs
new file mode 100644
index 0000000..188fa8d
--- /dev/null
+++ b/Libs/CSharpDis7/EightByteChunk.cs
@@ -0,0 +1,303 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// 64 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EightByteChunk
+    {
+        /// <summary>
+        /// Eight bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[8];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EightByteChunk"/> class.
+        /// </summary>
+        public EightByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EightByteChunk left, EightByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EightByteChunk left, EightByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 8 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Eight bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EightByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</EightByteChunk>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EightByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EightByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 8) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 8; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+
+            for (int idx = 0; idx < 8; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ElectronicEmissionsPdu.cs b/Libs/CSharpDis7/ElectronicEmissionsPdu.cs
new file mode 100644
index 0000000..35133a0
--- /dev/null
+++ b/Libs/CSharpDis7/ElectronicEmissionsPdu.cs
@@ -0,0 +1,620 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.7.1. Information about active electronic warfare (EW) emissions and active EW countermeasures shall be communicated using an Electromagnetic Emission PDU. NOT COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventIdentifier))]
+    [XmlInclude(typeof(EmitterSystem))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class ElectronicEmissionsPdu : DistributedEmissionsFamilyPdu, IEquatable<ElectronicEmissionsPdu>
+    {
+        /// <summary>
+        /// ID of the entity emitting
+        /// </summary>
+        private EntityID _emittingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventIdentifier _eventID = new EventIdentifier();
+
+        /// <summary>
+        /// This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
+        /// </summary>
+        private byte _stateUpdateIndicator;
+
+        /// <summary>
+        /// This field shall specify the number of emission systems being described in the current PDU.
+        /// </summary>
+        private byte _numberOfSystems;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _paddingForEmissionsPdu;
+
+        /// <summary>
+        ///  this field shall specify the length of this emitter system's data in 32-bit words.
+        /// </summary>
+        private byte _systemDataLength;
+
+        /// <summary>
+        /// the number of beams being described in the current PDU for the emitter system being described. 
+        /// </summary>
+        private byte _numberOfBeams;
+
+        /// <summary>
+        ///  information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23).
+        /// </summary>
+        private EmitterSystem _emitterSystem = new EmitterSystem();
+
+        /// <summary>
+        /// the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 
+        /// </summary>
+        private Vector3Float _location = new Vector3Float();
+
+        /// <summary>
+        /// Electronic emmissions systems THIS IS WRONG. It has the WRONG class type and will cause problems in any marshalling.
+        /// </summary>
+        private List<Vector3Float> _systems = new List<Vector3Float>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ElectronicEmissionsPdu"/> class.
+        /// </summary>
+        public ElectronicEmissionsPdu()
+        {
+            PduType = (byte)23;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ElectronicEmissionsPdu left, ElectronicEmissionsPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._stateUpdateIndicator
+            marshalSize += 1;  // this._numberOfSystems
+            marshalSize += 2;  // this._paddingForEmissionsPdu
+            marshalSize += 1;  // this._systemDataLength
+            marshalSize += 1;  // this._numberOfBeams
+            marshalSize += this._emitterSystem.GetMarshalledSize();  // this._emitterSystem
+            marshalSize += this._location.GetMarshalledSize();  // this._location
+            for (int idx = 0; idx < this._systems.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._systems[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity emitting
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
+        public EntityID EmittingEntityID
+        {
+            get
+            {
+                return this._emittingEntityID;
+            }
+
+            set
+            {
+                this._emittingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
+        public EventIdentifier EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)].
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "stateUpdateIndicator")]
+        public byte StateUpdateIndicator
+        {
+            get
+            {
+                return this._stateUpdateIndicator;
+            }
+
+            set
+            {
+                this._stateUpdateIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSystems")]
+        public byte NumberOfSystems
+        {
+            get
+            {
+                return this._numberOfSystems;
+            }
+
+            set
+            {
+                this._numberOfSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "paddingForEmissionsPdu")]
+        public ushort PaddingForEmissionsPdu
+        {
+            get
+            {
+                return this._paddingForEmissionsPdu;
+            }
+
+            set
+            {
+                this._paddingForEmissionsPdu = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  this field shall specify the length of this emitter system's data in 32-bit words.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "systemDataLength")]
+        public byte SystemDataLength
+        {
+            get
+            {
+                return this._systemDataLength;
+            }
+
+            set
+            {
+                this._systemDataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the number of beams being described in the current PDU for the emitter system being described. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfBeams")]
+        public byte NumberOfBeams
+        {
+            get
+            {
+                return this._numberOfBeams;
+            }
+
+            set
+            {
+                this._numberOfBeams = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23).
+        /// </summary>
+        [XmlElement(Type = typeof(EmitterSystem), ElementName = "emitterSystem")]
+        public EmitterSystem EmitterSystem
+        {
+            get
+            {
+                return this._emitterSystem;
+            }
+
+            set
+            {
+                this._emitterSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "location")]
+        public Vector3Float Location
+        {
+            get
+            {
+                return this._location;
+            }
+
+            set
+            {
+                this._location = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Electronic emmissions systems THIS IS WRONG. It has the WRONG class type and will cause problems in any marshalling.
+        /// </summary>
+        [XmlElement(ElementName = "systemsList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> Systems
+        {
+            get
+            {
+                return this._systems;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._stateUpdateIndicator);
+                    dos.WriteUnsignedByte((byte)this._systems.Count);
+                    dos.WriteUnsignedShort((ushort)this._paddingForEmissionsPdu);
+                    dos.WriteUnsignedByte((byte)this._systemDataLength);
+                    dos.WriteUnsignedByte((byte)this._numberOfBeams);
+                    this._emitterSystem.Marshal(dos);
+                    this._location.Marshal(dos);
+
+                    for (int idx = 0; idx < this._systems.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._systems[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._stateUpdateIndicator = dis.ReadUnsignedByte();
+                    this._numberOfSystems = dis.ReadUnsignedByte();
+                    this._paddingForEmissionsPdu = dis.ReadUnsignedShort();
+                    this._systemDataLength = dis.ReadUnsignedByte();
+                    this._numberOfBeams = dis.ReadUnsignedByte();
+                    this._emitterSystem.Unmarshal(dis);
+                    this._location.Unmarshal(dis);
+                    for (int idx = 0; idx < this.NumberOfSystems; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._systems.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ElectronicEmissionsPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<emittingEntityID>");
+                this._emittingEntityID.Reflection(sb);
+                sb.AppendLine("</emittingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<stateUpdateIndicator type=\"byte\">" + this._stateUpdateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateUpdateIndicator>");
+                sb.AppendLine("<systems type=\"byte\">" + this._systems.Count.ToString(CultureInfo.InvariantCulture) + "</systems>");
+                sb.AppendLine("<paddingForEmissionsPdu type=\"ushort\">" + this._paddingForEmissionsPdu.ToString(CultureInfo.InvariantCulture) + "</paddingForEmissionsPdu>");
+                sb.AppendLine("<systemDataLength type=\"byte\">" + this._systemDataLength.ToString(CultureInfo.InvariantCulture) + "</systemDataLength>");
+                sb.AppendLine("<numberOfBeams type=\"byte\">" + this._numberOfBeams.ToString(CultureInfo.InvariantCulture) + "</numberOfBeams>");
+                sb.AppendLine("<emitterSystem>");
+                this._emitterSystem.Reflection(sb);
+                sb.AppendLine("</emitterSystem>");
+                sb.AppendLine("<location>");
+                this._location.Reflection(sb);
+                sb.AppendLine("</location>");
+                for (int idx = 0; idx < this._systems.Count; idx++)
+                {
+                    sb.AppendLine("<systems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._systems[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</systems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ElectronicEmissionsPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ElectronicEmissionsPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ElectronicEmissionsPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateUpdateIndicator != obj._stateUpdateIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSystems != obj._numberOfSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._paddingForEmissionsPdu != obj._paddingForEmissionsPdu)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systemDataLength != obj._systemDataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfBeams != obj._numberOfBeams)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._emitterSystem.Equals(obj._emitterSystem))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._location.Equals(obj._location))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systems.Count != obj._systems.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._systems.Count; idx++)
+                {
+                    if (!this._systems[idx].Equals(obj._systems[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._stateUpdateIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSystems.GetHashCode();
+            result = GenerateHash(result) ^ this._paddingForEmissionsPdu.GetHashCode();
+            result = GenerateHash(result) ^ this._systemDataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfBeams.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterSystem.GetHashCode();
+            result = GenerateHash(result) ^ this._location.GetHashCode();
+
+            if (this._systems.Count > 0)
+            {
+                for (int idx = 0; idx < this._systems.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._systems[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EmitterSystem.cs b/Libs/CSharpDis7/EmitterSystem.cs
new file mode 100644
index 0000000..102f3f9
--- /dev/null
+++ b/Libs/CSharpDis7/EmitterSystem.cs
@@ -0,0 +1,341 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// This field shall specify information about a particular emitter system. Section 6.2.23.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EmitterSystem
+    {
+        /// <summary>
+        /// Name of the emitter, 16 bit enumeration
+        /// </summary>
+        private ushort _emitterName;
+
+        /// <summary>
+        /// function of the emitter, 8 bit enumeration
+        /// </summary>
+        private byte _function;
+
+        /// <summary>
+        /// emitter ID, 8 bit enumeration
+        /// </summary>
+        private byte _emitterIdNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmitterSystem"/> class.
+        /// </summary>
+        public EmitterSystem()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EmitterSystem left, EmitterSystem right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EmitterSystem left, EmitterSystem right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._emitterName
+            marshalSize += 1;  // this._function
+            marshalSize += 1;  // this._emitterIdNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Name of the emitter, 16 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "emitterName")]
+        public ushort EmitterName
+        {
+            get
+            {
+                return this._emitterName;
+            }
+
+            set
+            {
+                this._emitterName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the function of the emitter, 8 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "function")]
+        public byte Function
+        {
+            get
+            {
+                return this._function;
+            }
+
+            set
+            {
+                this._function = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the emitter ID, 8 bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "emitterIdNumber")]
+        public byte EmitterIdNumber
+        {
+            get
+            {
+                return this._emitterIdNumber;
+            }
+
+            set
+            {
+                this._emitterIdNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._emitterName);
+                    dos.WriteUnsignedByte((byte)this._function);
+                    dos.WriteUnsignedByte((byte)this._emitterIdNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._emitterName = dis.ReadUnsignedShort();
+                    this._function = dis.ReadUnsignedByte();
+                    this._emitterIdNumber = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EmitterSystem>");
+            try
+            {
+                sb.AppendLine("<emitterName type=\"ushort\">" + this._emitterName.ToString(CultureInfo.InvariantCulture) + "</emitterName>");
+                sb.AppendLine("<function type=\"byte\">" + this._function.ToString(CultureInfo.InvariantCulture) + "</function>");
+                sb.AppendLine("<emitterIdNumber type=\"byte\">" + this._emitterIdNumber.ToString(CultureInfo.InvariantCulture) + "</emitterIdNumber>");
+                sb.AppendLine("</EmitterSystem>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EmitterSystem;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EmitterSystem obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._emitterName != obj._emitterName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._function != obj._function)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterIdNumber != obj._emitterIdNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._emitterName.GetHashCode();
+            result = GenerateHash(result) ^ this._function.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterIdNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EngineFuel.cs b/Libs/CSharpDis7/EngineFuel.cs
new file mode 100644
index 0000000..ee06643
--- /dev/null
+++ b/Libs/CSharpDis7/EngineFuel.cs
@@ -0,0 +1,405 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information about an entity's engine fuel. Section 6.2.24.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EngineFuel
+    {
+        /// <summary>
+        /// Fuel quantity, units specified by next field
+        /// </summary>
+        private uint _fuelQuantity;
+
+        /// <summary>
+        /// Units in which the fuel is measured
+        /// </summary>
+        private byte _fuelMeasurementUnits;
+
+        /// <summary>
+        /// Type of fuel
+        /// </summary>
+        private byte _fuelType;
+
+        /// <summary>
+        /// Location of fuel as related to entity. See section 14 of EBV document
+        /// </summary>
+        private byte _fuelLocation;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EngineFuel"/> class.
+        /// </summary>
+        public EngineFuel()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EngineFuel left, EngineFuel right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EngineFuel left, EngineFuel right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._fuelQuantity
+            marshalSize += 1;  // this._fuelMeasurementUnits
+            marshalSize += 1;  // this._fuelType
+            marshalSize += 1;  // this._fuelLocation
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Fuel quantity, units specified by next field
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fuelQuantity")]
+        public uint FuelQuantity
+        {
+            get
+            {
+                return this._fuelQuantity;
+            }
+
+            set
+            {
+                this._fuelQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Units in which the fuel is measured
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurementUnits")]
+        public byte FuelMeasurementUnits
+        {
+            get
+            {
+                return this._fuelMeasurementUnits;
+            }
+
+            set
+            {
+                this._fuelMeasurementUnits = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of fuel
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelType")]
+        public byte FuelType
+        {
+            get
+            {
+                return this._fuelType;
+            }
+
+            set
+            {
+                this._fuelType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of fuel as related to entity. See section 14 of EBV document
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
+        public byte FuelLocation
+        {
+            get
+            {
+                return this._fuelLocation;
+            }
+
+            set
+            {
+                this._fuelLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fuelQuantity);
+                    dos.WriteUnsignedByte((byte)this._fuelMeasurementUnits);
+                    dos.WriteUnsignedByte((byte)this._fuelType);
+                    dos.WriteUnsignedByte((byte)this._fuelLocation);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._fuelQuantity = dis.ReadUnsignedInt();
+                    this._fuelMeasurementUnits = dis.ReadUnsignedByte();
+                    this._fuelType = dis.ReadUnsignedByte();
+                    this._fuelLocation = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EngineFuel>");
+            try
+            {
+                sb.AppendLine("<fuelQuantity type=\"uint\">" + this._fuelQuantity.ToString(CultureInfo.InvariantCulture) + "</fuelQuantity>");
+                sb.AppendLine("<fuelMeasurementUnits type=\"byte\">" + this._fuelMeasurementUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurementUnits>");
+                sb.AppendLine("<fuelType type=\"byte\">" + this._fuelType.ToString(CultureInfo.InvariantCulture) + "</fuelType>");
+                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</EngineFuel>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EngineFuel;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EngineFuel obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._fuelQuantity != obj._fuelQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelMeasurementUnits != obj._fuelMeasurementUnits)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelType != obj._fuelType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelLocation != obj._fuelLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._fuelQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelMeasurementUnits.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelType.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EngineFuelReload.cs b/Libs/CSharpDis7/EngineFuelReload.cs
new file mode 100644
index 0000000..9685423
--- /dev/null
+++ b/Libs/CSharpDis7/EngineFuelReload.cs
@@ -0,0 +1,469 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// For each type or location of engine fuell, this record specifies the type, location, fuel measurement units, and reload quantity and maximum quantity. Section 6.2.25.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EngineFuelReload
+    {
+        /// <summary>
+        /// standard quantity of fuel loaded
+        /// </summary>
+        private uint _standardQuantity;
+
+        /// <summary>
+        /// maximum quantity of fuel loaded
+        /// </summary>
+        private uint _maximumQuantity;
+
+        /// <summary>
+        /// seconds normally required to to reload standard qty
+        /// </summary>
+        private uint _standardQuantityReloadTime;
+
+        /// <summary>
+        /// seconds normally required to to reload maximum qty
+        /// </summary>
+        private uint _maximumQuantityReloadTime;
+
+        /// <summary>
+        /// Units of measure
+        /// </summary>
+        private byte _fuelMeasurmentUnits;
+
+        /// <summary>
+        /// fuel  location as related to the entity
+        /// </summary>
+        private byte _fuelLocation;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EngineFuelReload"/> class.
+        /// </summary>
+        public EngineFuelReload()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EngineFuelReload left, EngineFuelReload right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EngineFuelReload left, EngineFuelReload right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._standardQuantity
+            marshalSize += 4;  // this._maximumQuantity
+            marshalSize += 4;  // this._standardQuantityReloadTime
+            marshalSize += 4;  // this._maximumQuantityReloadTime
+            marshalSize += 1;  // this._fuelMeasurmentUnits
+            marshalSize += 1;  // this._fuelLocation
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the standard quantity of fuel loaded
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "standardQuantity")]
+        public uint StandardQuantity
+        {
+            get
+            {
+                return this._standardQuantity;
+            }
+
+            set
+            {
+                this._standardQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum quantity of fuel loaded
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantity")]
+        public uint MaximumQuantity
+        {
+            get
+            {
+                return this._maximumQuantity;
+            }
+
+            set
+            {
+                this._maximumQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the seconds normally required to to reload standard qty
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "standardQuantityReloadTime")]
+        public uint StandardQuantityReloadTime
+        {
+            get
+            {
+                return this._standardQuantityReloadTime;
+            }
+
+            set
+            {
+                this._standardQuantityReloadTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the seconds normally required to to reload maximum qty
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantityReloadTime")]
+        public uint MaximumQuantityReloadTime
+        {
+            get
+            {
+                return this._maximumQuantityReloadTime;
+            }
+
+            set
+            {
+                this._maximumQuantityReloadTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Units of measure
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurmentUnits")]
+        public byte FuelMeasurmentUnits
+        {
+            get
+            {
+                return this._fuelMeasurmentUnits;
+            }
+
+            set
+            {
+                this._fuelMeasurmentUnits = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the fuel  location as related to the entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
+        public byte FuelLocation
+        {
+            get
+            {
+                return this._fuelLocation;
+            }
+
+            set
+            {
+                this._fuelLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._standardQuantity);
+                    dos.WriteUnsignedInt((uint)this._maximumQuantity);
+                    dos.WriteUnsignedInt((uint)this._standardQuantityReloadTime);
+                    dos.WriteUnsignedInt((uint)this._maximumQuantityReloadTime);
+                    dos.WriteUnsignedByte((byte)this._fuelMeasurmentUnits);
+                    dos.WriteUnsignedByte((byte)this._fuelLocation);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._standardQuantity = dis.ReadUnsignedInt();
+                    this._maximumQuantity = dis.ReadUnsignedInt();
+                    this._standardQuantityReloadTime = dis.ReadUnsignedInt();
+                    this._maximumQuantityReloadTime = dis.ReadUnsignedInt();
+                    this._fuelMeasurmentUnits = dis.ReadUnsignedByte();
+                    this._fuelLocation = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EngineFuelReload>");
+            try
+            {
+                sb.AppendLine("<standardQuantity type=\"uint\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
+                sb.AppendLine("<maximumQuantity type=\"uint\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
+                sb.AppendLine("<standardQuantityReloadTime type=\"uint\">" + this._standardQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</standardQuantityReloadTime>");
+                sb.AppendLine("<maximumQuantityReloadTime type=\"uint\">" + this._maximumQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</maximumQuantityReloadTime>");
+                sb.AppendLine("<fuelMeasurmentUnits type=\"byte\">" + this._fuelMeasurmentUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurmentUnits>");
+                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</EngineFuelReload>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EngineFuelReload;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EngineFuelReload obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._standardQuantity != obj._standardQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumQuantity != obj._maximumQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._standardQuantityReloadTime != obj._standardQuantityReloadTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumQuantityReloadTime != obj._maximumQuantityReloadTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelMeasurmentUnits != obj._fuelMeasurmentUnits)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelLocation != obj._fuelLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._standardQuantityReloadTime.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumQuantityReloadTime.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelMeasurmentUnits.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityAssociation.cs b/Libs/CSharpDis7/EntityAssociation.cs
new file mode 100644
index 0000000..4e89f43
--- /dev/null
+++ b/Libs/CSharpDis7/EntityAssociation.cs
@@ -0,0 +1,536 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Association or disassociation of two entities.  Section 6.2.93.4
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class EntityAssociation
+    {
+        /// <summary>
+        /// the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        private byte _recordType = 2;
+
+        /// <summary>
+        /// Indicates if this VP has changed since last issuance
+        /// </summary>
+        private byte _changeIndicator;
+
+        /// <summary>
+        /// Indicates association status between two entities; 8 bit enum
+        /// </summary>
+        private byte _associationStatus;
+
+        /// <summary>
+        /// Type of association; 8 bit enum
+        /// </summary>
+        private byte _associationType;
+
+        /// <summary>
+        /// Object ID of entity associated with this entity
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// Station location on one's own entity. EBV doc.
+        /// </summary>
+        private ushort _owsSttionLocation;
+
+        /// <summary>
+        /// Type of physical connection. EBV doc
+        /// </summary>
+        private ushort _physicalConnectionType;
+
+        /// <summary>
+        /// Type of member the entity is within th egroup
+        /// </summary>
+        private byte _groupMemberType;
+
+        /// <summary>
+        /// Group if any to which the entity belongs
+        /// </summary>
+        private ushort _groupNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityAssociation"/> class.
+        /// </summary>
+        public EntityAssociation()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityAssociation left, EntityAssociation right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityAssociation left, EntityAssociation right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._recordType
+            marshalSize += 1;  // this._changeIndicator
+            marshalSize += 1;  // this._associationStatus
+            marshalSize += 1;  // this._associationType
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 2;  // this._owsSttionLocation
+            marshalSize += 2;  // this._physicalConnectionType
+            marshalSize += 1;  // this._groupMemberType
+            marshalSize += 2;  // this._groupNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
+        public byte RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Indicates if this VP has changed since last issuance
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
+        public byte ChangeIndicator
+        {
+            get
+            {
+                return this._changeIndicator;
+            }
+
+            set
+            {
+                this._changeIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Indicates association status between two entities; 8 bit enum
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "associationStatus")]
+        public byte AssociationStatus
+        {
+            get
+            {
+                return this._associationStatus;
+            }
+
+            set
+            {
+                this._associationStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of association; 8 bit enum
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "associationType")]
+        public byte AssociationType
+        {
+            get
+            {
+                return this._associationType;
+            }
+
+            set
+            {
+                this._associationType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object ID of entity associated with this entity
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Station location on one's own entity. EBV doc.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "owsSttionLocation")]
+        public ushort OwsSttionLocation
+        {
+            get
+            {
+                return this._owsSttionLocation;
+            }
+
+            set
+            {
+                this._owsSttionLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of physical connection. EBV doc
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "physicalConnectionType")]
+        public ushort PhysicalConnectionType
+        {
+            get
+            {
+                return this._physicalConnectionType;
+            }
+
+            set
+            {
+                this._physicalConnectionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of member the entity is within th egroup
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "groupMemberType")]
+        public byte GroupMemberType
+        {
+            get
+            {
+                return this._groupMemberType;
+            }
+
+            set
+            {
+                this._groupMemberType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Group if any to which the entity belongs
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "groupNumber")]
+        public ushort GroupNumber
+        {
+            get
+            {
+                return this._groupNumber;
+            }
+
+            set
+            {
+                this._groupNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._recordType);
+                    dos.WriteUnsignedByte((byte)this._changeIndicator);
+                    dos.WriteUnsignedByte((byte)this._associationStatus);
+                    dos.WriteUnsignedByte((byte)this._associationType);
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._owsSttionLocation);
+                    dos.WriteUnsignedShort((ushort)this._physicalConnectionType);
+                    dos.WriteUnsignedByte((byte)this._groupMemberType);
+                    dos.WriteUnsignedShort((ushort)this._groupNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedByte();
+                    this._changeIndicator = dis.ReadUnsignedByte();
+                    this._associationStatus = dis.ReadUnsignedByte();
+                    this._associationType = dis.ReadUnsignedByte();
+                    this._entityID.Unmarshal(dis);
+                    this._owsSttionLocation = dis.ReadUnsignedShort();
+                    this._physicalConnectionType = dis.ReadUnsignedShort();
+                    this._groupMemberType = dis.ReadUnsignedByte();
+                    this._groupNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityAssociation>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
+                sb.AppendLine("<associationStatus type=\"byte\">" + this._associationStatus.ToString(CultureInfo.InvariantCulture) + "</associationStatus>");
+                sb.AppendLine("<associationType type=\"byte\">" + this._associationType.ToString(CultureInfo.InvariantCulture) + "</associationType>");
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<owsSttionLocation type=\"ushort\">" + this._owsSttionLocation.ToString(CultureInfo.InvariantCulture) + "</owsSttionLocation>");
+                sb.AppendLine("<physicalConnectionType type=\"ushort\">" + this._physicalConnectionType.ToString(CultureInfo.InvariantCulture) + "</physicalConnectionType>");
+                sb.AppendLine("<groupMemberType type=\"byte\">" + this._groupMemberType.ToString(CultureInfo.InvariantCulture) + "</groupMemberType>");
+                sb.AppendLine("<groupNumber type=\"ushort\">" + this._groupNumber.ToString(CultureInfo.InvariantCulture) + "</groupNumber>");
+                sb.AppendLine("</EntityAssociation>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityAssociation;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityAssociation obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._changeIndicator != obj._changeIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._associationStatus != obj._associationStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._associationType != obj._associationType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._owsSttionLocation != obj._owsSttionLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._physicalConnectionType != obj._physicalConnectionType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._groupMemberType != obj._groupMemberType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._groupNumber != obj._groupNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._associationStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._associationType.GetHashCode();
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._owsSttionLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._physicalConnectionType.GetHashCode();
+            result = GenerateHash(result) ^ this._groupMemberType.GetHashCode();
+            result = GenerateHash(result) ^ this._groupNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityDamageStatusPdu.cs b/Libs/CSharpDis7/EntityDamageStatusPdu.cs
new file mode 100644
index 0000000..061469b
--- /dev/null
+++ b/Libs/CSharpDis7/EntityDamageStatusPdu.cs
@@ -0,0 +1,451 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// shall be used to communicate detailed damage information sustained by an entity regardless of the source of the damage Section 7.3.5  COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(DirectedEnergyDamage))]
+    public partial class EntityDamageStatusPdu : WarfareFamilyPdu, IEquatable<EntityDamageStatusPdu>
+    {
+        /// <summary>
+        /// Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 COMPLETE
+        /// </summary>
+        private EntityID _damagedEntityID = new EntityID();
+
+        /// <summary>
+        /// Padding.
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// Padding.
+        /// </summary>
+        private ushort _padding2;
+
+        /// <summary>
+        /// field shall specify the number of Damage Description records, Section 7.3.5
+        /// </summary>
+        private ushort _numberOfDamageDescription;
+
+        /// <summary>
+        /// Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5
+        /// </summary>
+        private List<DirectedEnergyDamage> _damageDescriptionRecords = new List<DirectedEnergyDamage>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityDamageStatusPdu"/> class.
+        /// </summary>
+        public EntityDamageStatusPdu()
+        {
+            PduType = (byte)69;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityDamageStatusPdu left, EntityDamageStatusPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityDamageStatusPdu left, EntityDamageStatusPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._damagedEntityID.GetMarshalledSize();  // this._damagedEntityID
+            marshalSize += 2;  // this._padding1
+            marshalSize += 2;  // this._padding2
+            marshalSize += 2;  // this._numberOfDamageDescription
+            for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
+            {
+                DirectedEnergyDamage listElement = (DirectedEnergyDamage)this._damageDescriptionRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 COMPLETE
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "damagedEntityID")]
+        public EntityID DamagedEntityID
+        {
+            get
+            {
+                return this._damagedEntityID;
+            }
+
+            set
+            {
+                this._damagedEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
+        public ushort Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfDamageDescription method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfDamageDescription")]
+        public ushort NumberOfDamageDescription
+        {
+            get
+            {
+                return this._numberOfDamageDescription;
+            }
+
+            set
+            {
+                this._numberOfDamageDescription = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5
+        /// </summary>
+        [XmlElement(ElementName = "damageDescriptionRecordsList", Type = typeof(List<DirectedEnergyDamage>))]
+        public List<DirectedEnergyDamage> DamageDescriptionRecords
+        {
+            get
+            {
+                return this._damageDescriptionRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._damagedEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteUnsignedShort((ushort)this._padding2);
+                    dos.WriteUnsignedShort((ushort)this._damageDescriptionRecords.Count);
+
+                    for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
+                    {
+                        DirectedEnergyDamage aDirectedEnergyDamage = (DirectedEnergyDamage)this._damageDescriptionRecords[idx];
+                        aDirectedEnergyDamage.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._damagedEntityID.Unmarshal(dis);
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._padding2 = dis.ReadUnsignedShort();
+                    this._numberOfDamageDescription = dis.ReadUnsignedShort();
+                    for (int idx = 0; idx < this.NumberOfDamageDescription; idx++)
+                    {
+                        DirectedEnergyDamage anX = new DirectedEnergyDamage();
+                        anX.Unmarshal(dis);
+                        this._damageDescriptionRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityDamageStatusPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<damagedEntityID>");
+                this._damagedEntityID.Reflection(sb);
+                sb.AppendLine("</damagedEntityID>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<damageDescriptionRecords type=\"ushort\">" + this._damageDescriptionRecords.Count.ToString(CultureInfo.InvariantCulture) + "</damageDescriptionRecords>");
+                for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
+                {
+                    sb.AppendLine("<damageDescriptionRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"DirectedEnergyDamage\">");
+                    DirectedEnergyDamage aDirectedEnergyDamage = (DirectedEnergyDamage)this._damageDescriptionRecords[idx];
+                    aDirectedEnergyDamage.Reflection(sb);
+                    sb.AppendLine("</damageDescriptionRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EntityDamageStatusPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityDamageStatusPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityDamageStatusPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._damagedEntityID.Equals(obj._damagedEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfDamageDescription != obj._numberOfDamageDescription)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._damageDescriptionRecords.Count != obj._damageDescriptionRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
+                {
+                    if (!this._damageDescriptionRecords[idx].Equals(obj._damageDescriptionRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._damagedEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfDamageDescription.GetHashCode();
+
+            if (this._damageDescriptionRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._damageDescriptionRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._damageDescriptionRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityID.cs b/Libs/CSharpDis7/EntityID.cs
new file mode 100644
index 0000000..dcada8d
--- /dev/null
+++ b/Libs/CSharpDis7/EntityID.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Entity Identifier. Unique ID for entities in the world. Consists of an simulation address and a entity number. Section 6.2.28.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class EntityID
+    {
+        /// <summary>
+        /// Site and application IDs
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// Entity number
+        /// </summary>
+        private ushort _entityNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityID"/> class.
+        /// </summary>
+        public EntityID()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityID left, EntityID right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityID left, EntityID right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._entityNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Site and application IDs
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "entityNumber")]
+        public ushort EntityNumber
+        {
+            get
+            {
+                return this._entityNumber;
+            }
+
+            set
+            {
+                this._entityNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._entityNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._entityNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityID>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<entityNumber type=\"ushort\">" + this._entityNumber.ToString(CultureInfo.InvariantCulture) + "</entityNumber>");
+                sb.AppendLine("</EntityID>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityID;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityID obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityNumber != obj._entityNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._entityNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityInformationFamilyPdu.cs b/Libs/CSharpDis7/EntityInformationFamilyPdu.cs
new file mode 100644
index 0000000..1670732
--- /dev/null
+++ b/Libs/CSharpDis7/EntityInformationFamilyPdu.cs
@@ -0,0 +1,248 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs. This should be abstract. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityInformationFamilyPdu : Pdu, IEquatable<EntityInformationFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityInformationFamilyPdu"/> class.
+        /// </summary>
+        public EntityInformationFamilyPdu()
+        {
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityInformationFamilyPdu left, EntityInformationFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityInformationFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</EntityInformationFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityInformationFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityInformationFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityManagementFamilyPdu.cs b/Libs/CSharpDis7/EntityManagementFamilyPdu.cs
new file mode 100644
index 0000000..b7473c8
--- /dev/null
+++ b/Libs/CSharpDis7/EntityManagementFamilyPdu.cs
@@ -0,0 +1,248 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Managment of grouping of PDUs, and more. Section 7.8
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityManagementFamilyPdu : Pdu, IEquatable<EntityManagementFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityManagementFamilyPdu"/> class.
+        /// </summary>
+        public EntityManagementFamilyPdu()
+        {
+            ProtocolFamily = (byte)7;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityManagementFamilyPdu left, EntityManagementFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityManagementFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</EntityManagementFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityManagementFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityManagementFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityMarking.cs b/Libs/CSharpDis7/EntityMarking.cs
new file mode 100644
index 0000000..daa8304
--- /dev/null
+++ b/Libs/CSharpDis7/EntityMarking.cs
@@ -0,0 +1,335 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Specifies the character set used inthe first byte, followed by 11 characters of text data. Section 6.29
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityMarking
+    {
+        /// <summary>
+        /// The character set
+        /// </summary>
+        private byte _characterSet;
+
+        /// <summary>
+        /// The characters
+        /// </summary>
+        private byte[] _characters = new byte[11];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityMarking"/> class.
+        /// </summary>
+        public EntityMarking()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityMarking left, EntityMarking right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityMarking left, EntityMarking right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._characterSet
+            marshalSize += 11 * 1;  // _characters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The character set
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "characterSet")]
+        public byte CharacterSet
+        {
+            get
+            {
+                return this._characterSet;
+            }
+
+            set
+            {
+                this._characterSet = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The characters
+        /// </summary>
+        [XmlArray(ElementName = "characters")]
+        public byte[] Characters
+        {
+            get
+            {
+                return this._characters;
+            }
+
+            set
+            {
+                this._characters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._characterSet);
+
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        dos.WriteByte(this._characters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._characterSet = dis.ReadUnsignedByte();
+                    for (int idx = 0; idx < this._characters.Length; idx++)
+                    {
+                        this._characters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityMarking>");
+            try
+            {
+                sb.AppendLine("<characterSet type=\"byte\">" + this._characterSet.ToString(CultureInfo.InvariantCulture) + "</characterSet>");
+                for (int idx = 0; idx < this._characters.Length; idx++)
+                {
+                    sb.AppendLine("<characters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._characters[idx] + "</characters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</EntityMarking>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityMarking;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityMarking obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._characterSet != obj._characterSet)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._characters.Length != 11) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 11; idx++)
+                {
+                    if (this._characters[idx] != obj._characters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._characterSet.GetHashCode();
+
+            for (int idx = 0; idx < 11; idx++)
+            {
+                result = GenerateHash(result) ^ this._characters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityStatePdu.cs b/Libs/CSharpDis7/EntityStatePdu.cs
new file mode 100644
index 0000000..e98b77d
--- /dev/null
+++ b/Libs/CSharpDis7/EntityStatePdu.cs
@@ -0,0 +1,721 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Represents the postion and state of one entity in the world. Section 7.2.2. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(EulerAngles))]
+    [XmlInclude(typeof(DeadReckoningParameters))]
+    [XmlInclude(typeof(EntityMarking))]
+    [XmlInclude(typeof(VariableParameter))]
+    public partial class EntityStatePdu : EntityInformationFamilyPdu, IEquatable<EntityStatePdu>
+    {
+        /// <summary>
+        /// Unique ID for an entity that is tied to this state information
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// What force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        private byte _forceId;
+
+        /// <summary>
+        /// How many variable parameters are in the variable length list. In earlier versions of DIS these were known as articulation parameters
+        /// </summary>
+        private byte _numberOfVariableParameters;
+
+        /// <summary>
+        /// Describes the type of entity in the world
+        /// </summary>
+        private EntityType _entityType = new EntityType();
+
+        private EntityType _alternativeEntityType = new EntityType();
+
+        /// <summary>
+        /// Describes the speed of the entity in the world
+        /// </summary>
+        private Vector3Float _entityLinearVelocity = new Vector3Float();
+
+        /// <summary>
+        /// describes the location of the entity in the world
+        /// </summary>
+        private Vector3Double _entityLocation = new Vector3Double();
+
+        /// <summary>
+        /// describes the orientation of the entity, in euler angles
+        /// </summary>
+        private EulerAngles _entityOrientation = new EulerAngles();
+
+        /// <summary>
+        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        private uint _entityAppearance;
+
+        /// <summary>
+        /// parameters used for dead reckoning
+        /// </summary>
+        private DeadReckoningParameters _deadReckoningParameters = new DeadReckoningParameters();
+
+        /// <summary>
+        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        private EntityMarking _marking = new EntityMarking();
+
+        /// <summary>
+        /// a series of bit flags
+        /// </summary>
+        private uint _capabilities;
+
+        /// <summary>
+        /// variable length list of variable parameters. In earlier DIS versions this was articulation parameters.
+        /// </summary>
+        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityStatePdu"/> class.
+        /// </summary>
+        public EntityStatePdu()
+        {
+            PduType = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityStatePdu left, EntityStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityStatePdu left, EntityStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 1;  // this._forceId
+            marshalSize += 1;  // this._numberOfVariableParameters
+            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
+            marshalSize += this._alternativeEntityType.GetMarshalledSize();  // this._alternativeEntityType
+            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
+            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
+            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
+            marshalSize += 4;  // this._entityAppearance
+            marshalSize += this._deadReckoningParameters.GetMarshalledSize();  // this._deadReckoningParameters
+            marshalSize += this._marking.GetMarshalledSize();  // this._marking
+            marshalSize += 4;  // this._capabilities
+            for (int idx = 0; idx < this._variableParameters.Count; idx++)
+            {
+                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Unique ID for an entity that is tied to this state information
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the What force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
+        public byte ForceId
+        {
+            get
+            {
+                return this._forceId;
+            }
+
+            set
+            {
+                this._forceId = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
+        public byte NumberOfVariableParameters
+        {
+            get
+            {
+                return this._numberOfVariableParameters;
+            }
+
+            set
+            {
+                this._numberOfVariableParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the type of entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
+        public EntityType EntityType
+        {
+            get
+            {
+                return this._entityType;
+            }
+
+            set
+            {
+                this._entityType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(EntityType), ElementName = "alternativeEntityType")]
+        public EntityType AlternativeEntityType
+        {
+            get
+            {
+                return this._alternativeEntityType;
+            }
+
+            set
+            {
+                this._alternativeEntityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Describes the speed of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
+        public Vector3Float EntityLinearVelocity
+        {
+            get
+            {
+                return this._entityLinearVelocity;
+            }
+
+            set
+            {
+                this._entityLinearVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the location of the entity in the world
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
+        public Vector3Double EntityLocation
+        {
+            get
+            {
+                return this._entityLocation;
+            }
+
+            set
+            {
+                this._entityLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the describes the orientation of the entity, in euler angles
+        /// </summary>
+        [XmlElement(Type = typeof(EulerAngles), ElementName = "entityOrientation")]
+        public EulerAngles EntityOrientation
+        {
+            get
+            {
+                return this._entityOrientation;
+            }
+
+            set
+            {
+                this._entityOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "entityAppearance")]
+        public uint EntityAppearance
+        {
+            get
+            {
+                return this._entityAppearance;
+            }
+
+            set
+            {
+                this._entityAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameters used for dead reckoning
+        /// </summary>
+        [XmlElement(Type = typeof(DeadReckoningParameters), ElementName = "deadReckoningParameters")]
+        public DeadReckoningParameters DeadReckoningParameters
+        {
+            get
+            {
+                return this._deadReckoningParameters;
+            }
+
+            set
+            {
+                this._deadReckoningParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        [XmlElement(Type = typeof(EntityMarking), ElementName = "marking")]
+        public EntityMarking Marking
+        {
+            get
+            {
+                return this._marking;
+            }
+
+            set
+            {
+                this._marking = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "capabilities")]
+        public uint Capabilities
+        {
+            get
+            {
+                return this._capabilities;
+            }
+
+            set
+            {
+                this._capabilities = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable parameters. In earlier DIS versions this was articulation parameters.
+        /// </summary>
+        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
+        public List<VariableParameter> VariableParameters
+        {
+            get
+            {
+                return this._variableParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._forceId);
+                    dos.WriteUnsignedByte((byte)this._variableParameters.Count);
+                    this._entityType.Marshal(dos);
+                    this._alternativeEntityType.Marshal(dos);
+                    this._entityLinearVelocity.Marshal(dos);
+                    this._entityLocation.Marshal(dos);
+                    this._entityOrientation.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._entityAppearance);
+                    this._deadReckoningParameters.Marshal(dos);
+                    this._marking.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._capabilities);
+
+                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                    {
+                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                        aVariableParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._forceId = dis.ReadUnsignedByte();
+                    this._numberOfVariableParameters = dis.ReadUnsignedByte();
+                    this._entityType.Unmarshal(dis);
+                    this._alternativeEntityType.Unmarshal(dis);
+                    this._entityLinearVelocity.Unmarshal(dis);
+                    this._entityLocation.Unmarshal(dis);
+                    this._entityOrientation.Unmarshal(dis);
+                    this._entityAppearance = dis.ReadUnsignedInt();
+                    this._deadReckoningParameters.Unmarshal(dis);
+                    this._marking.Unmarshal(dis);
+                    this._capabilities = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
+                    {
+                        VariableParameter anX = new VariableParameter();
+                        anX.Unmarshal(dis);
+                        this._variableParameters.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
+                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
+                sb.AppendLine("<entityType>");
+                this._entityType.Reflection(sb);
+                sb.AppendLine("</entityType>");
+                sb.AppendLine("<alternativeEntityType>");
+                this._alternativeEntityType.Reflection(sb);
+                sb.AppendLine("</alternativeEntityType>");
+                sb.AppendLine("<entityLinearVelocity>");
+                this._entityLinearVelocity.Reflection(sb);
+                sb.AppendLine("</entityLinearVelocity>");
+                sb.AppendLine("<entityLocation>");
+                this._entityLocation.Reflection(sb);
+                sb.AppendLine("</entityLocation>");
+                sb.AppendLine("<entityOrientation>");
+                this._entityOrientation.Reflection(sb);
+                sb.AppendLine("</entityOrientation>");
+                sb.AppendLine("<entityAppearance type=\"uint\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
+                sb.AppendLine("<deadReckoningParameters>");
+                this._deadReckoningParameters.Reflection(sb);
+                sb.AppendLine("</deadReckoningParameters>");
+                sb.AppendLine("<marking>");
+                this._marking.Reflection(sb);
+                sb.AppendLine("</marking>");
+                sb.AppendLine("<capabilities type=\"uint\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
+                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                    aVariableParameter.Reflection(sb);
+                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EntityStatePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceId != obj._forceId)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityType.Equals(obj._entityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._alternativeEntityType.Equals(obj._alternativeEntityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLocation.Equals(obj._entityLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityOrientation.Equals(obj._entityOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityAppearance != obj._entityAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._deadReckoningParameters.Equals(obj._deadReckoningParameters))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._marking.Equals(obj._marking))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._capabilities != obj._capabilities)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameters.Count != obj._variableParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._forceId.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._entityType.GetHashCode();
+            result = GenerateHash(result) ^ this._alternativeEntityType.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._marking.GetHashCode();
+            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
+
+            if (this._variableParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityStateUpdatePdu.cs b/Libs/CSharpDis7/EntityStateUpdatePdu.cs
new file mode 100644
index 0000000..5d4e53d
--- /dev/null
+++ b/Libs/CSharpDis7/EntityStateUpdatePdu.cs
@@ -0,0 +1,557 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. Section 7.2.5. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(EulerAngles))]
+    [XmlInclude(typeof(VariableParameter))]
+    public partial class EntityStateUpdatePdu : EntityInformationFamilyPdu, IEquatable<EntityStateUpdatePdu>
+    {
+        /// <summary>
+        /// This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private byte _padding1;
+
+        /// <summary>
+        /// This field shall specify the number of variable parameters present. This field shall be represented by an 8-bit unsigned integer (see Annex I).
+        /// </summary>
+        private byte _numberOfVariableParameters;
+
+        /// <summary>
+        /// This field shall specify an entity’s linear velocity. The coordinate system for an entity’s linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]).
+        /// </summary>
+        private Vector3Float _entityLinearVelocity = new Vector3Float();
+
+        /// <summary>
+        /// This field shall specify an entity’s physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97).
+        /// </summary>
+        private Vector3Double _entityLocation = new Vector3Double();
+
+        /// <summary>
+        /// This field shall specify an entity’s orientation and shall be represented by an Euler Angles record (see 6.2.33).
+        /// </summary>
+        private EulerAngles _entityOrientation = new EulerAngles();
+
+        /// <summary>
+        /// This field shall specify the dynamic changes to the entity’s appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26).
+        /// </summary>
+        private uint _entityAppearance;
+
+        /// <summary>
+        /// This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I).
+        /// </summary>
+        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityStateUpdatePdu"/> class.
+        /// </summary>
+        public EntityStateUpdatePdu()
+        {
+            PduType = (byte)67;
+            ProtocolFamily = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityStateUpdatePdu left, EntityStateUpdatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 1;  // this._padding1
+            marshalSize += 1;  // this._numberOfVariableParameters
+            marshalSize += this._entityLinearVelocity.GetMarshalledSize();  // this._entityLinearVelocity
+            marshalSize += this._entityLocation.GetMarshalledSize();  // this._entityLocation
+            marshalSize += this._entityOrientation.GetMarshalledSize();  // this._entityOrientation
+            marshalSize += 4;  // this._entityAppearance
+            for (int idx = 0; idx < this._variableParameters.Count; idx++)
+            {
+                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
+        public byte NumberOfVariableParameters
+        {
+            get
+            {
+                return this._numberOfVariableParameters;
+            }
+
+            set
+            {
+                this._numberOfVariableParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify an entity’s linear velocity. The coordinate system for an entity’s linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]).
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "entityLinearVelocity")]
+        public Vector3Float EntityLinearVelocity
+        {
+            get
+            {
+                return this._entityLinearVelocity;
+            }
+
+            set
+            {
+                this._entityLinearVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify an entity’s physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97).
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "entityLocation")]
+        public Vector3Double EntityLocation
+        {
+            get
+            {
+                return this._entityLocation;
+            }
+
+            set
+            {
+                this._entityLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify an entity’s orientation and shall be represented by an Euler Angles record (see 6.2.33).
+        /// </summary>
+        [XmlElement(Type = typeof(EulerAngles), ElementName = "entityOrientation")]
+        public EulerAngles EntityOrientation
+        {
+            get
+            {
+                return this._entityOrientation;
+            }
+
+            set
+            {
+                this._entityOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the dynamic changes to the entity’s appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26).
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "entityAppearance")]
+        public uint EntityAppearance
+        {
+            get
+            {
+                return this._entityAppearance;
+            }
+
+            set
+            {
+                this._entityAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I).
+        /// </summary>
+        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
+        public List<VariableParameter> VariableParameters
+        {
+            get
+            {
+                return this._variableParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteByte((byte)this._padding1);
+                    dos.WriteUnsignedByte((byte)this._variableParameters.Count);
+                    this._entityLinearVelocity.Marshal(dos);
+                    this._entityLocation.Marshal(dos);
+                    this._entityOrientation.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._entityAppearance);
+
+                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                    {
+                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                        aVariableParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._padding1 = dis.ReadByte();
+                    this._numberOfVariableParameters = dis.ReadUnsignedByte();
+                    this._entityLinearVelocity.Unmarshal(dis);
+                    this._entityLocation.Unmarshal(dis);
+                    this._entityOrientation.Unmarshal(dis);
+                    this._entityAppearance = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
+                    {
+                        VariableParameter anX = new VariableParameter();
+                        anX.Unmarshal(dis);
+                        this._variableParameters.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityStateUpdatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
+                sb.AppendLine("<entityLinearVelocity>");
+                this._entityLinearVelocity.Reflection(sb);
+                sb.AppendLine("</entityLinearVelocity>");
+                sb.AppendLine("<entityLocation>");
+                this._entityLocation.Reflection(sb);
+                sb.AppendLine("</entityLocation>");
+                sb.AppendLine("<entityOrientation>");
+                this._entityOrientation.Reflection(sb);
+                sb.AppendLine("</entityOrientation>");
+                sb.AppendLine("<entityAppearance type=\"uint\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
+                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                    aVariableParameter.Reflection(sb);
+                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EntityStateUpdatePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityStateUpdatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityStateUpdatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLinearVelocity.Equals(obj._entityLinearVelocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityLocation.Equals(obj._entityLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityOrientation.Equals(obj._entityOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityAppearance != obj._entityAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameters.Count != obj._variableParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLinearVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._entityLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
+
+            if (this._variableParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityType.cs b/Libs/CSharpDis7/EntityType.cs
new file mode 100644
index 0000000..b47ca07
--- /dev/null
+++ b/Libs/CSharpDis7/EntityType.cs
@@ -0,0 +1,463 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Identifies the type of entity, including kind of entity, domain (surface, subsurface, air, etc) country, category, etc. Section 6.2.30
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EntityType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL.
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityType"/> class.
+        /// </summary>
+        public EntityType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityType left, EntityType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityType left, EntityType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("</EntityType>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EntityTypeVP.cs b/Libs/CSharpDis7/EntityTypeVP.cs
new file mode 100644
index 0000000..7d6b6c8
--- /dev/null
+++ b/Libs/CSharpDis7/EntityTypeVP.cs
@@ -0,0 +1,408 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Association or disassociation of two entities.  Section 6.2.93.5
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class EntityTypeVP
+    {
+        /// <summary>
+        /// the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        private byte _recordType = 3;
+
+        /// <summary>
+        /// Indicates if this VP has changed since last issuance
+        /// </summary>
+        private byte _changeIndicator;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private EntityType _entityType = new EntityType();
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityTypeVP"/> class.
+        /// </summary>
+        public EntityTypeVP()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EntityTypeVP left, EntityTypeVP right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EntityTypeVP left, EntityTypeVP right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._recordType
+            marshalSize += 1;  // this._changeIndicator
+            marshalSize += this._entityType.GetMarshalledSize();  // this._entityType
+            marshalSize += 2;  // this._padding
+            marshalSize += 4;  // this._padding1
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
+        public byte RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Indicates if this VP has changed since last issuance
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "changeIndicator")]
+        public byte ChangeIndicator
+        {
+            get
+            {
+                return this._changeIndicator;
+            }
+
+            set
+            {
+                this._changeIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "entityType")]
+        public EntityType EntityType
+        {
+            get
+            {
+                return this._entityType;
+            }
+
+            set
+            {
+                this._entityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._recordType);
+                    dos.WriteUnsignedByte((byte)this._changeIndicator);
+                    this._entityType.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedByte();
+                    this._changeIndicator = dis.ReadUnsignedByte();
+                    this._entityType.Unmarshal(dis);
+                    this._padding = dis.ReadUnsignedShort();
+                    this._padding1 = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EntityTypeVP>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<changeIndicator type=\"byte\">" + this._changeIndicator.ToString(CultureInfo.InvariantCulture) + "</changeIndicator>");
+                sb.AppendLine("<entityType>");
+                this._entityType.Reflection(sb);
+                sb.AppendLine("</entityType>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("</EntityTypeVP>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EntityTypeVP;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EntityTypeVP obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._changeIndicator != obj._changeIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._entityType.Equals(obj._entityType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._changeIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._entityType.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Environment.cs b/Libs/CSharpDis7/Environment.cs
new file mode 100644
index 0000000..1e12306
--- /dev/null
+++ b/Libs/CSharpDis7/Environment.cs
@@ -0,0 +1,373 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Incomplete environment record; requires hand coding to fix. Section 6.2.31.1
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Environment
+    {
+        /// <summary>
+        /// type
+        /// </summary>
+        private uint _environmentType;
+
+        /// <summary>
+        /// length, in bits, of the record
+        /// </summary>
+        private ushort _length;
+
+        /// <summary>
+        /// identifies the sequntially numbered record index
+        /// </summary>
+        private byte _index;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Environment"/> class.
+        /// </summary>
+        public Environment()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Environment left, Environment right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Environment left, Environment right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._environmentType
+            marshalSize += 2;  // this._length
+            marshalSize += 1;  // this._index
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the type
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "environmentType")]
+        public uint EnvironmentType
+        {
+            get
+            {
+                return this._environmentType;
+            }
+
+            set
+            {
+                this._environmentType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length, in bits, of the record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "length")]
+        public ushort Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the identifies the sequntially numbered record index
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "index")]
+        public byte Index
+        {
+            get
+            {
+                return this._index;
+            }
+
+            set
+            {
+                this._index = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._environmentType);
+                    dos.WriteUnsignedShort((ushort)this._length);
+                    dos.WriteUnsignedByte((byte)this._index);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._environmentType = dis.ReadUnsignedInt();
+                    this._length = dis.ReadUnsignedShort();
+                    this._index = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Environment>");
+            try
+            {
+                sb.AppendLine("<environmentType type=\"uint\">" + this._environmentType.ToString(CultureInfo.InvariantCulture) + "</environmentType>");
+                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("<index type=\"byte\">" + this._index.ToString(CultureInfo.InvariantCulture) + "</index>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</Environment>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Environment;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Environment obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._environmentType != obj._environmentType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._index != obj._index)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+            result = GenerateHash(result) ^ this._index.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EnvironmentGeneral.cs b/Libs/CSharpDis7/EnvironmentGeneral.cs
new file mode 100644
index 0000000..1724b06
--- /dev/null
+++ b/Libs/CSharpDis7/EnvironmentGeneral.cs
@@ -0,0 +1,437 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. NOTE: this class requires hand coding. 6.2.31
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EnvironmentGeneral
+    {
+        /// <summary>
+        /// Record type
+        /// </summary>
+        private uint _environmentType;
+
+        /// <summary>
+        /// length, in bits
+        /// </summary>
+        private byte _length;
+
+        /// <summary>
+        /// Identify the sequentially numbered record index
+        /// </summary>
+        private byte _index;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding1;
+
+        /// <summary>
+        /// Geometry or state record
+        /// </summary>
+        private byte _geometry;
+
+        /// <summary>
+        /// padding to bring the total size up to a 64 bit boundry
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnvironmentGeneral"/> class.
+        /// </summary>
+        public EnvironmentGeneral()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EnvironmentGeneral left, EnvironmentGeneral right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EnvironmentGeneral left, EnvironmentGeneral right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._environmentType
+            marshalSize += 1;  // this._length
+            marshalSize += 1;  // this._index
+            marshalSize += 1;  // this._padding1
+            marshalSize += 1;  // this._geometry
+            marshalSize += 1;  // this._padding2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Record type
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "environmentType")]
+        public uint EnvironmentType
+        {
+            get
+            {
+                return this._environmentType;
+            }
+
+            set
+            {
+                this._environmentType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length, in bits
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "length")]
+        public byte Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identify the sequentially numbered record index
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "index")]
+        public byte Index
+        {
+            get
+            {
+                return this._index;
+            }
+
+            set
+            {
+                this._index = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Geometry or state record
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "geometry")]
+        public byte Geometry
+        {
+            get
+            {
+                return this._geometry;
+            }
+
+            set
+            {
+                this._geometry = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding to bring the total size up to a 64 bit boundry
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._environmentType);
+                    dos.WriteUnsignedByte((byte)this._length);
+                    dos.WriteUnsignedByte((byte)this._index);
+                    dos.WriteUnsignedByte((byte)this._padding1);
+                    dos.WriteUnsignedByte((byte)this._geometry);
+                    dos.WriteUnsignedByte((byte)this._padding2);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._environmentType = dis.ReadUnsignedInt();
+                    this._length = dis.ReadUnsignedByte();
+                    this._index = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadUnsignedByte();
+                    this._geometry = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EnvironmentGeneral>");
+            try
+            {
+                sb.AppendLine("<environmentType type=\"uint\">" + this._environmentType.ToString(CultureInfo.InvariantCulture) + "</environmentType>");
+                sb.AppendLine("<length type=\"byte\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("<index type=\"byte\">" + this._index.ToString(CultureInfo.InvariantCulture) + "</index>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<geometry type=\"byte\">" + this._geometry.ToString(CultureInfo.InvariantCulture) + "</geometry>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("</EnvironmentGeneral>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EnvironmentGeneral;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EnvironmentGeneral obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._environmentType != obj._environmentType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._index != obj._index)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._geometry != obj._geometry)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._environmentType.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+            result = GenerateHash(result) ^ this._index.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._geometry.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EnvironmentType.cs b/Libs/CSharpDis7/EnvironmentType.cs
new file mode 100644
index 0000000..94072fb
--- /dev/null
+++ b/Libs/CSharpDis7/EnvironmentType.cs
@@ -0,0 +1,463 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Description of environmental data in environmental process and gridded data PDUs. Section 6.2.32
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EnvironmentType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// class of environmental entity
+        /// </summary>
+        private ushort _entityClass;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnvironmentType"/> class.
+        /// </summary>
+        public EnvironmentType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EnvironmentType left, EnvironmentType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EnvironmentType left, EnvironmentType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._entityClass
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the class of environmental entity
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "entityClass")]
+        public ushort EntityClass
+        {
+            get
+            {
+                return this._entityClass;
+            }
+
+            set
+            {
+                this._entityClass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._entityClass);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._entityClass = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EnvironmentType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<entityClass type=\"ushort\">" + this._entityClass.ToString(CultureInfo.InvariantCulture) + "</entityClass>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("</EnvironmentType>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EnvironmentType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EnvironmentType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityClass != obj._entityClass)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._entityClass.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EulerAngles.cs b/Libs/CSharpDis7/EulerAngles.cs
new file mode 100644
index 0000000..16d7243
--- /dev/null
+++ b/Libs/CSharpDis7/EulerAngles.cs
@@ -0,0 +1,323 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians. Section 6.2.33
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EulerAngles
+    {
+        private float _psi;
+
+        private float _theta;
+
+        private float _phi;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EulerAngles"/> class.
+        /// </summary>
+        public EulerAngles()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EulerAngles left, EulerAngles right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EulerAngles left, EulerAngles right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._psi
+            marshalSize += 4;  // this._theta
+            marshalSize += 4;  // this._phi
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "psi")]
+        public float Psi
+        {
+            get
+            {
+                return this._psi;
+            }
+
+            set
+            {
+                this._psi = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "theta")]
+        public float Theta
+        {
+            get
+            {
+                return this._theta;
+            }
+
+            set
+            {
+                this._theta = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "phi")]
+        public float Phi
+        {
+            get
+            {
+                return this._phi;
+            }
+
+            set
+            {
+                this._phi = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._psi);
+                    dos.WriteFloat((float)this._theta);
+                    dos.WriteFloat((float)this._phi);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._psi = dis.ReadFloat();
+                    this._theta = dis.ReadFloat();
+                    this._phi = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EulerAngles>");
+            try
+            {
+                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
+                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
+                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
+                sb.AppendLine("</EulerAngles>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EulerAngles;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EulerAngles obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._psi != obj._psi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._theta != obj._theta)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phi != obj._phi)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._psi.GetHashCode();
+            result = GenerateHash(result) ^ this._theta.GetHashCode();
+            result = GenerateHash(result) ^ this._phi.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EventIdentifier.cs b/Libs/CSharpDis7/EventIdentifier.cs
new file mode 100644
index 0000000..7be27fa
--- /dev/null
+++ b/Libs/CSharpDis7/EventIdentifier.cs
@@ -0,0 +1,306 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Identifies an event in the world. Use this format for every PDU EXCEPT the LiveEntityPdu. Section 6.2.34.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class EventIdentifier
+    {
+        /// <summary>
+        /// Site and application IDs
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        private ushort _eventNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventIdentifier"/> class.
+        /// </summary>
+        public EventIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventIdentifier left, EventIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventIdentifier left, EventIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._eventNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Site and application IDs
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
+        public ushort EventNumber
+        {
+            get
+            {
+                return this._eventNumber;
+            }
+
+            set
+            {
+                this._eventNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._eventNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._eventNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
+                sb.AppendLine("</EventIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._eventNumber != obj._eventNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EventIdentifierLiveEntity.cs b/Libs/CSharpDis7/EventIdentifierLiveEntity.cs
new file mode 100644
index 0000000..7d9bf3e
--- /dev/null
+++ b/Libs/CSharpDis7/EventIdentifierLiveEntity.cs
@@ -0,0 +1,323 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. Section 6.2.34.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class EventIdentifierLiveEntity
+    {
+        private byte _siteNumber;
+
+        private byte _applicationNumber;
+
+        private ushort _eventNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventIdentifierLiveEntity"/> class.
+        /// </summary>
+        public EventIdentifierLiveEntity()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventIdentifierLiveEntity left, EventIdentifierLiveEntity right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventIdentifierLiveEntity left, EventIdentifierLiveEntity right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._siteNumber
+            marshalSize += 1;  // this._applicationNumber
+            marshalSize += 2;  // this._eventNumber
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "siteNumber")]
+        public byte SiteNumber
+        {
+            get
+            {
+                return this._siteNumber;
+            }
+
+            set
+            {
+                this._siteNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "applicationNumber")]
+        public byte ApplicationNumber
+        {
+            get
+            {
+                return this._applicationNumber;
+            }
+
+            set
+            {
+                this._applicationNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "eventNumber")]
+        public ushort EventNumber
+        {
+            get
+            {
+                return this._eventNumber;
+            }
+
+            set
+            {
+                this._eventNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._siteNumber);
+                    dos.WriteUnsignedByte((byte)this._applicationNumber);
+                    dos.WriteUnsignedShort((ushort)this._eventNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._siteNumber = dis.ReadUnsignedByte();
+                    this._applicationNumber = dis.ReadUnsignedByte();
+                    this._eventNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventIdentifierLiveEntity>");
+            try
+            {
+                sb.AppendLine("<siteNumber type=\"byte\">" + this._siteNumber.ToString(CultureInfo.InvariantCulture) + "</siteNumber>");
+                sb.AppendLine("<applicationNumber type=\"byte\">" + this._applicationNumber.ToString(CultureInfo.InvariantCulture) + "</applicationNumber>");
+                sb.AppendLine("<eventNumber type=\"ushort\">" + this._eventNumber.ToString(CultureInfo.InvariantCulture) + "</eventNumber>");
+                sb.AppendLine("</EventIdentifierLiveEntity>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventIdentifierLiveEntity;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventIdentifierLiveEntity obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._siteNumber != obj._siteNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._applicationNumber != obj._applicationNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._eventNumber != obj._eventNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._siteNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._applicationNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._eventNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EventReportPdu.cs b/Libs/CSharpDis7/EventReportPdu.cs
new file mode 100644
index 0000000..84d3bfa
--- /dev/null
+++ b/Libs/CSharpDis7/EventReportPdu.cs
@@ -0,0 +1,519 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Reports occurance of a significant event to the simulation manager. Section 7.5.12. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class EventReportPdu : SimulationManagementFamilyPdu, IEquatable<EventReportPdu>
+    {
+        /// <summary>
+        /// Type of event
+        /// </summary>
+        private uint _eventType;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventReportPdu"/> class.
+        /// </summary>
+        public EventReportPdu()
+        {
+            PduType = (byte)21;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventReportPdu left, EventReportPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventReportPdu left, EventReportPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._eventType
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of event
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "eventType")]
+        public uint EventType
+        {
+            get
+            {
+                return this._eventType;
+            }
+
+            set
+            {
+                this._eventType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._eventType);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._eventType = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventReportPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<eventType type=\"uint\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EventReportPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventReportPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventReportPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._eventType != obj._eventType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._eventType.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/EventReportReliablePdu.cs b/Libs/CSharpDis7/EventReportReliablePdu.cs
new file mode 100644
index 0000000..a2c1d50
--- /dev/null
+++ b/Libs/CSharpDis7/EventReportReliablePdu.cs
@@ -0,0 +1,519 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.11: reports the occurance of a significatnt event to the simulation manager. Needs manual     intervention to fix padding in variable datums. UNFINISHED.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class EventReportReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<EventReportReliablePdu>
+    {
+        /// <summary>
+        /// Event type
+        /// </summary>
+        private ushort _eventType;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _pad1;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventReportReliablePdu"/> class.
+        /// </summary>
+        public EventReportReliablePdu()
+        {
+            PduType = (byte)61;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(EventReportReliablePdu left, EventReportReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(EventReportReliablePdu left, EventReportReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._eventType
+            marshalSize += 4;  // this._pad1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Event type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
+        public ushort EventType
+        {
+            get
+            {
+                return this._eventType;
+            }
+
+            set
+            {
+                this._eventType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "pad1")]
+        public uint Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._eventType);
+                    dos.WriteUnsignedInt((uint)this._pad1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._eventType = dis.ReadUnsignedShort();
+                    this._pad1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<EventReportReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
+                sb.AppendLine("<pad1 type=\"uint\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</EventReportReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as EventReportReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(EventReportReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._eventType != obj._eventType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._eventType.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Expendable.cs b/Libs/CSharpDis7/Expendable.cs
new file mode 100644
index 0000000..7b8aeaa
--- /dev/null
+++ b/Libs/CSharpDis7/Expendable.cs
@@ -0,0 +1,384 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// An entity's expendable (chaff, flares, etc) information. Section 6.2.36
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class Expendable
+    {
+        /// <summary>
+        /// Type of expendable
+        /// </summary>
+        private EntityType _expendable = new EntityType();
+
+        private uint _station;
+
+        private ushort _quantity;
+
+        private byte _expendableStatus;
+
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Expendable"/> class.
+        /// </summary>
+        public Expendable()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Expendable left, Expendable right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Expendable left, Expendable right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._expendable.GetMarshalledSize();  // this._expendable
+            marshalSize += 4;  // this._station
+            marshalSize += 2;  // this._quantity
+            marshalSize += 1;  // this._expendableStatus
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of expendable
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "expendable")]
+        public EntityType Expendable_
+        {
+            get
+            {
+                return this._expendable;
+            }
+
+            set
+            {
+                this._expendable = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "station")]
+        public uint Station
+        {
+            get
+            {
+                return this._station;
+            }
+
+            set
+            {
+                this._station = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
+        public ushort Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "expendableStatus")]
+        public byte ExpendableStatus
+        {
+            get
+            {
+                return this._expendableStatus;
+            }
+
+            set
+            {
+                this._expendableStatus = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._expendable.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._station);
+                    dos.WriteUnsignedShort((ushort)this._quantity);
+                    dos.WriteUnsignedByte((byte)this._expendableStatus);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._expendable.Unmarshal(dis);
+                    this._station = dis.ReadUnsignedInt();
+                    this._quantity = dis.ReadUnsignedShort();
+                    this._expendableStatus = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Expendable>");
+            try
+            {
+                sb.AppendLine("<expendable>");
+                this._expendable.Reflection(sb);
+                sb.AppendLine("</expendable>");
+                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
+                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("<expendableStatus type=\"byte\">" + this._expendableStatus.ToString(CultureInfo.InvariantCulture) + "</expendableStatus>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</Expendable>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Expendable;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Expendable obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._expendable.Equals(obj._expendable))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._station != obj._station)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._expendableStatus != obj._expendableStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._expendable.GetHashCode();
+            result = GenerateHash(result) ^ this._station.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+            result = GenerateHash(result) ^ this._expendableStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ExpendableDescriptor.cs b/Libs/CSharpDis7/ExpendableDescriptor.cs
new file mode 100644
index 0000000..0949309
--- /dev/null
+++ b/Libs/CSharpDis7/ExpendableDescriptor.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Burst of chaff or expendible device. Section 6.2.20.4
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class ExpendableDescriptor
+    {
+        /// <summary>
+        /// Type of the object that exploded
+        /// </summary>
+        private EntityType _expendableType = new EntityType();
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        private long _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExpendableDescriptor"/> class.
+        /// </summary>
+        public ExpendableDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ExpendableDescriptor left, ExpendableDescriptor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ExpendableDescriptor left, ExpendableDescriptor right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._expendableType.GetMarshalledSize();  // this._expendableType
+            marshalSize += 8;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of the object that exploded
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "expendableType")]
+        public EntityType ExpendableType
+        {
+            get
+            {
+                return this._expendableType;
+            }
+
+            set
+            {
+                this._expendableType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding
+        /// </summary>
+        [XmlElement(Type = typeof(long), ElementName = "padding")]
+        public long Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._expendableType.Marshal(dos);
+                    dos.WriteLong((long)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._expendableType.Unmarshal(dis);
+                    this._padding = dis.ReadLong();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ExpendableDescriptor>");
+            try
+            {
+                sb.AppendLine("<expendableType>");
+                this._expendableType.Reflection(sb);
+                sb.AppendLine("</expendableType>");
+                sb.AppendLine("<padding type=\"long\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</ExpendableDescriptor>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ExpendableDescriptor;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ExpendableDescriptor obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._expendableType.Equals(obj._expendableType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._expendableType.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ExpendableReload.cs b/Libs/CSharpDis7/ExpendableReload.cs
new file mode 100644
index 0000000..4e12354
--- /dev/null
+++ b/Libs/CSharpDis7/ExpendableReload.cs
@@ -0,0 +1,410 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// An entity's expendable (chaff, flares, etc) information. Section 6.2.37
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class ExpendableReload
+    {
+        /// <summary>
+        /// Type of expendable
+        /// </summary>
+        private EntityType _expendable = new EntityType();
+
+        private uint _station;
+
+        private ushort _standardQuantity;
+
+        private ushort _maximumQuantity;
+
+        private uint _standardQuantityReloadTime;
+
+        private uint _maximumQuantityReloadTime;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExpendableReload"/> class.
+        /// </summary>
+        public ExpendableReload()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ExpendableReload left, ExpendableReload right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ExpendableReload left, ExpendableReload right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._expendable.GetMarshalledSize();  // this._expendable
+            marshalSize += 4;  // this._station
+            marshalSize += 2;  // this._standardQuantity
+            marshalSize += 2;  // this._maximumQuantity
+            marshalSize += 4;  // this._standardQuantityReloadTime
+            marshalSize += 4;  // this._maximumQuantityReloadTime
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of expendable
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "expendable")]
+        public EntityType Expendable
+        {
+            get
+            {
+                return this._expendable;
+            }
+
+            set
+            {
+                this._expendable = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "station")]
+        public uint Station
+        {
+            get
+            {
+                return this._station;
+            }
+
+            set
+            {
+                this._station = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "standardQuantity")]
+        public ushort StandardQuantity
+        {
+            get
+            {
+                return this._standardQuantity;
+            }
+
+            set
+            {
+                this._standardQuantity = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "maximumQuantity")]
+        public ushort MaximumQuantity
+        {
+            get
+            {
+                return this._maximumQuantity;
+            }
+
+            set
+            {
+                this._maximumQuantity = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "standardQuantityReloadTime")]
+        public uint StandardQuantityReloadTime
+        {
+            get
+            {
+                return this._standardQuantityReloadTime;
+            }
+
+            set
+            {
+                this._standardQuantityReloadTime = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantityReloadTime")]
+        public uint MaximumQuantityReloadTime
+        {
+            get
+            {
+                return this._maximumQuantityReloadTime;
+            }
+
+            set
+            {
+                this._maximumQuantityReloadTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._expendable.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._station);
+                    dos.WriteUnsignedShort((ushort)this._standardQuantity);
+                    dos.WriteUnsignedShort((ushort)this._maximumQuantity);
+                    dos.WriteUnsignedInt((uint)this._standardQuantityReloadTime);
+                    dos.WriteUnsignedInt((uint)this._maximumQuantityReloadTime);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._expendable.Unmarshal(dis);
+                    this._station = dis.ReadUnsignedInt();
+                    this._standardQuantity = dis.ReadUnsignedShort();
+                    this._maximumQuantity = dis.ReadUnsignedShort();
+                    this._standardQuantityReloadTime = dis.ReadUnsignedInt();
+                    this._maximumQuantityReloadTime = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ExpendableReload>");
+            try
+            {
+                sb.AppendLine("<expendable>");
+                this._expendable.Reflection(sb);
+                sb.AppendLine("</expendable>");
+                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
+                sb.AppendLine("<standardQuantity type=\"ushort\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
+                sb.AppendLine("<maximumQuantity type=\"ushort\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
+                sb.AppendLine("<standardQuantityReloadTime type=\"uint\">" + this._standardQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</standardQuantityReloadTime>");
+                sb.AppendLine("<maximumQuantityReloadTime type=\"uint\">" + this._maximumQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</maximumQuantityReloadTime>");
+                sb.AppendLine("</ExpendableReload>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ExpendableReload;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ExpendableReload obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._expendable.Equals(obj._expendable))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._station != obj._station)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._standardQuantity != obj._standardQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumQuantity != obj._maximumQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._standardQuantityReloadTime != obj._standardQuantityReloadTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumQuantityReloadTime != obj._maximumQuantityReloadTime)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._expendable.GetHashCode();
+            result = GenerateHash(result) ^ this._station.GetHashCode();
+            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._standardQuantityReloadTime.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumQuantityReloadTime.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ExplosionDescriptor.cs b/Libs/CSharpDis7/ExplosionDescriptor.cs
new file mode 100644
index 0000000..41e58e6
--- /dev/null
+++ b/Libs/CSharpDis7/ExplosionDescriptor.cs
@@ -0,0 +1,376 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Explosion of a non-munition. Section 6.2.20.3
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class ExplosionDescriptor
+    {
+        /// <summary>
+        /// Type of the object that exploded. See 6.2.30
+        /// </summary>
+        private EntityType _explodingObject = new EntityType();
+
+        /// <summary>
+        /// Material that exploded. Can be grain dust, tnt, gasoline, etc.
+        /// </summary>
+        private ushort _explosiveMaterial;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// Force of explosion, in equivalent KG of TNT
+        /// </summary>
+        private float _explosiveForce;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExplosionDescriptor"/> class.
+        /// </summary>
+        public ExplosionDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ExplosionDescriptor left, ExplosionDescriptor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ExplosionDescriptor left, ExplosionDescriptor right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._explodingObject.GetMarshalledSize();  // this._explodingObject
+            marshalSize += 2;  // this._explosiveMaterial
+            marshalSize += 2;  // this._padding
+            marshalSize += 4;  // this._explosiveForce
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of the object that exploded. See 6.2.30
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "explodingObject")]
+        public EntityType ExplodingObject
+        {
+            get
+            {
+                return this._explodingObject;
+            }
+
+            set
+            {
+                this._explodingObject = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Material that exploded. Can be grain dust, tnt, gasoline, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "explosiveMaterial")]
+        public ushort ExplosiveMaterial
+        {
+            get
+            {
+                return this._explosiveMaterial;
+            }
+
+            set
+            {
+                this._explosiveMaterial = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Force of explosion, in equivalent KG of TNT
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "explosiveForce")]
+        public float ExplosiveForce
+        {
+            get
+            {
+                return this._explosiveForce;
+            }
+
+            set
+            {
+                this._explosiveForce = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._explodingObject.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._explosiveMaterial);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    dos.WriteFloat((float)this._explosiveForce);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._explodingObject.Unmarshal(dis);
+                    this._explosiveMaterial = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                    this._explosiveForce = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ExplosionDescriptor>");
+            try
+            {
+                sb.AppendLine("<explodingObject>");
+                this._explodingObject.Reflection(sb);
+                sb.AppendLine("</explodingObject>");
+                sb.AppendLine("<explosiveMaterial type=\"ushort\">" + this._explosiveMaterial.ToString(CultureInfo.InvariantCulture) + "</explosiveMaterial>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<explosiveForce type=\"float\">" + this._explosiveForce.ToString(CultureInfo.InvariantCulture) + "</explosiveForce>");
+                sb.AppendLine("</ExplosionDescriptor>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ExplosionDescriptor;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ExplosionDescriptor obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._explodingObject.Equals(obj._explodingObject))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._explosiveMaterial != obj._explosiveMaterial)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._explosiveForce != obj._explosiveForce)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._explodingObject.GetHashCode();
+            result = GenerateHash(result) ^ this._explosiveMaterial.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._explosiveForce.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/FalseTargetsAttribute.cs b/Libs/CSharpDis7/FalseTargetsAttribute.cs
new file mode 100644
index 0000000..35534c4
--- /dev/null
+++ b/Libs/CSharpDis7/FalseTargetsAttribute.cs
@@ -0,0 +1,609 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The False Targets attribute record shall be used to communicate discrete values that are associated with false targets jamming that cannot be referenced to an emitter mode. The values provided in the False Targets attri- bute record shall be considered valid only for the victim radar beams listed in the jamming beam's Track/Jam Data records (provided in the associated Electromagnetic Emission PDU). Section 6.2.12.3
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FalseTargetsAttribute
+    {
+        private uint _recordType = 3502;
+
+        private ushort _recordLength = 40;
+
+        private ushort _padding;
+
+        private byte _emitterNumber;
+
+        private byte _beamNumber;
+
+        private byte _stateIndicator;
+
+        private byte _padding2;
+
+        private float _falseTargetCount;
+
+        private float _walkSpeed;
+
+        private float _walkAcceleration;
+
+        private float _maximumWalkDistance;
+
+        private float _keepTime;
+
+        private float _echoSpacing;
+
+        private uint _padding3;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FalseTargetsAttribute"/> class.
+        /// </summary>
+        public FalseTargetsAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FalseTargetsAttribute left, FalseTargetsAttribute right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FalseTargetsAttribute left, FalseTargetsAttribute right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 2;  // this._padding
+            marshalSize += 1;  // this._emitterNumber
+            marshalSize += 1;  // this._beamNumber
+            marshalSize += 1;  // this._stateIndicator
+            marshalSize += 1;  // this._padding2
+            marshalSize += 4;  // this._falseTargetCount
+            marshalSize += 4;  // this._walkSpeed
+            marshalSize += 4;  // this._walkAcceleration
+            marshalSize += 4;  // this._maximumWalkDistance
+            marshalSize += 4;  // this._keepTime
+            marshalSize += 4;  // this._echoSpacing
+            marshalSize += 4;  // this._padding3
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
+        public byte EmitterNumber
+        {
+            get
+            {
+                return this._emitterNumber;
+            }
+
+            set
+            {
+                this._emitterNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
+        public byte BeamNumber
+        {
+            get
+            {
+                return this._beamNumber;
+            }
+
+            set
+            {
+                this._beamNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "stateIndicator")]
+        public byte StateIndicator
+        {
+            get
+            {
+                return this._stateIndicator;
+            }
+
+            set
+            {
+                this._stateIndicator = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "falseTargetCount")]
+        public float FalseTargetCount
+        {
+            get
+            {
+                return this._falseTargetCount;
+            }
+
+            set
+            {
+                this._falseTargetCount = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "walkSpeed")]
+        public float WalkSpeed
+        {
+            get
+            {
+                return this._walkSpeed;
+            }
+
+            set
+            {
+                this._walkSpeed = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "walkAcceleration")]
+        public float WalkAcceleration
+        {
+            get
+            {
+                return this._walkAcceleration;
+            }
+
+            set
+            {
+                this._walkAcceleration = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "maximumWalkDistance")]
+        public float MaximumWalkDistance
+        {
+            get
+            {
+                return this._maximumWalkDistance;
+            }
+
+            set
+            {
+                this._maximumWalkDistance = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "keepTime")]
+        public float KeepTime
+        {
+            get
+            {
+                return this._keepTime;
+            }
+
+            set
+            {
+                this._keepTime = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "echoSpacing")]
+        public float EchoSpacing
+        {
+            get
+            {
+                return this._echoSpacing;
+            }
+
+            set
+            {
+                this._echoSpacing = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "padding3")]
+        public uint Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    dos.WriteUnsignedByte((byte)this._emitterNumber);
+                    dos.WriteUnsignedByte((byte)this._beamNumber);
+                    dos.WriteUnsignedByte((byte)this._stateIndicator);
+                    dos.WriteUnsignedByte((byte)this._padding2);
+                    dos.WriteFloat((float)this._falseTargetCount);
+                    dos.WriteFloat((float)this._walkSpeed);
+                    dos.WriteFloat((float)this._walkAcceleration);
+                    dos.WriteFloat((float)this._maximumWalkDistance);
+                    dos.WriteFloat((float)this._keepTime);
+                    dos.WriteFloat((float)this._echoSpacing);
+                    dos.WriteUnsignedInt((uint)this._padding3);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                    this._emitterNumber = dis.ReadUnsignedByte();
+                    this._beamNumber = dis.ReadUnsignedByte();
+                    this._stateIndicator = dis.ReadUnsignedByte();
+                    this._padding2 = dis.ReadUnsignedByte();
+                    this._falseTargetCount = dis.ReadFloat();
+                    this._walkSpeed = dis.ReadFloat();
+                    this._walkAcceleration = dis.ReadFloat();
+                    this._maximumWalkDistance = dis.ReadFloat();
+                    this._keepTime = dis.ReadFloat();
+                    this._echoSpacing = dis.ReadFloat();
+                    this._padding3 = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FalseTargetsAttribute>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
+                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
+                sb.AppendLine("<stateIndicator type=\"byte\">" + this._stateIndicator.ToString(CultureInfo.InvariantCulture) + "</stateIndicator>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<falseTargetCount type=\"float\">" + this._falseTargetCount.ToString(CultureInfo.InvariantCulture) + "</falseTargetCount>");
+                sb.AppendLine("<walkSpeed type=\"float\">" + this._walkSpeed.ToString(CultureInfo.InvariantCulture) + "</walkSpeed>");
+                sb.AppendLine("<walkAcceleration type=\"float\">" + this._walkAcceleration.ToString(CultureInfo.InvariantCulture) + "</walkAcceleration>");
+                sb.AppendLine("<maximumWalkDistance type=\"float\">" + this._maximumWalkDistance.ToString(CultureInfo.InvariantCulture) + "</maximumWalkDistance>");
+                sb.AppendLine("<keepTime type=\"float\">" + this._keepTime.ToString(CultureInfo.InvariantCulture) + "</keepTime>");
+                sb.AppendLine("<echoSpacing type=\"float\">" + this._echoSpacing.ToString(CultureInfo.InvariantCulture) + "</echoSpacing>");
+                sb.AppendLine("<padding3 type=\"uint\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                sb.AppendLine("</FalseTargetsAttribute>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FalseTargetsAttribute;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FalseTargetsAttribute obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterNumber != obj._emitterNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamNumber != obj._beamNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateIndicator != obj._stateIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._falseTargetCount != obj._falseTargetCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._walkSpeed != obj._walkSpeed)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._walkAcceleration != obj._walkAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumWalkDistance != obj._maximumWalkDistance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._keepTime != obj._keepTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._echoSpacing != obj._echoSpacing)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._stateIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._falseTargetCount.GetHashCode();
+            result = GenerateHash(result) ^ this._walkSpeed.GetHashCode();
+            result = GenerateHash(result) ^ this._walkAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumWalkDistance.GetHashCode();
+            result = GenerateHash(result) ^ this._keepTime.GetHashCode();
+            result = GenerateHash(result) ^ this._echoSpacing.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/FastEntityStatePdu.cs b/Libs/CSharpDis7/FastEntityStatePdu.cs
new file mode 100644
index 0000000..4c45e08
--- /dev/null
+++ b/Libs/CSharpDis7/FastEntityStatePdu.cs
@@ -0,0 +1,1590 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(VariableParameter))]
+    public partial class FastEntityStatePdu : EntityInformationFamilyPdu, IEquatable<FastEntityStatePdu>
+    {
+        /// <summary>
+        /// The site ID
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// The application ID
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// the entity ID
+        /// </summary>
+        private ushort _entity;
+
+        /// <summary>
+        /// what force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        private byte _forceId;
+
+        /// <summary>
+        /// How many variable (nee articulation) parameters are in the variable length list
+        /// </summary>
+        private byte _numberOfVariableParameters;
+
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _altEntityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _altDomain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _altCountry;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _altCategory;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _altSubcategory;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _altSpecific;
+
+        private byte _altExtra;
+
+        /// <summary>
+        /// X velo
+        /// </summary>
+        private float _xVelocity;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _yVelocity;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _zVelocity;
+
+        /// <summary>
+        /// X value
+        /// </summary>
+        private double _xLocation;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private double _yLocation;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private double _zLocation;
+
+        private float _psi;
+
+        private float _theta;
+
+        private float _phi;
+
+        /// <summary>
+        /// a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        private int _entityAppearance;
+
+        /// <summary>
+        /// enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        private byte _deadReckoningAlgorithm;
+
+        /// <summary>
+        /// other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        private byte[] _otherParameters = new byte[15];
+
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _xAcceleration;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _yAcceleration;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _zAcceleration;
+
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _xAngularVelocity;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _yAngularVelocity;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _zAngularVelocity;
+
+        /// <summary>
+        /// characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        private byte[] _marking = new byte[12];
+
+        /// <summary>
+        /// a series of bit flags
+        /// </summary>
+        private int _capabilities;
+
+        /// <summary>
+        /// variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters
+        /// </summary>
+        private List<VariableParameter> _variableParameters = new List<VariableParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FastEntityStatePdu"/> class.
+        /// </summary>
+        public FastEntityStatePdu()
+        {
+            PduType = (byte)1;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FastEntityStatePdu left, FastEntityStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FastEntityStatePdu left, FastEntityStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            marshalSize += 2;  // this._entity
+            marshalSize += 1;  // this._forceId
+            marshalSize += 1;  // this._numberOfVariableParameters
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            marshalSize += 1;  // this._altEntityKind
+            marshalSize += 1;  // this._altDomain
+            marshalSize += 2;  // this._altCountry
+            marshalSize += 1;  // this._altCategory
+            marshalSize += 1;  // this._altSubcategory
+            marshalSize += 1;  // this._altSpecific
+            marshalSize += 1;  // this._altExtra
+            marshalSize += 4;  // this._xVelocity
+            marshalSize += 4;  // this._yVelocity
+            marshalSize += 4;  // this._zVelocity
+            marshalSize += 8;  // this._xLocation
+            marshalSize += 8;  // this._yLocation
+            marshalSize += 8;  // this._zLocation
+            marshalSize += 4;  // this._psi
+            marshalSize += 4;  // this._theta
+            marshalSize += 4;  // this._phi
+            marshalSize += 4;  // this._entityAppearance
+            marshalSize += 1;  // this._deadReckoningAlgorithm
+            marshalSize += 15 * 1;  // _otherParameters
+            marshalSize += 4;  // this._xAcceleration
+            marshalSize += 4;  // this._yAcceleration
+            marshalSize += 4;  // this._zAcceleration
+            marshalSize += 4;  // this._xAngularVelocity
+            marshalSize += 4;  // this._yAngularVelocity
+            marshalSize += 4;  // this._zAngularVelocity
+            marshalSize += 12 * 1;  // _marking
+            marshalSize += 4;  // this._capabilities
+            for (int idx = 0; idx < this._variableParameters.Count; idx++)
+            {
+                VariableParameter listElement = (VariableParameter)this._variableParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The site ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The application ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "entity")]
+        public ushort Entity
+        {
+            get
+            {
+                return this._entity;
+            }
+
+            set
+            {
+                this._entity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the what force this entity is affiliated with, eg red, blue, neutral, etc
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceId")]
+        public byte ForceId
+        {
+            get
+            {
+                return this._forceId;
+            }
+
+            set
+            {
+                this._forceId = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableParameters method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfVariableParameters")]
+        public byte NumberOfVariableParameters
+        {
+            get
+            {
+                return this._numberOfVariableParameters;
+            }
+
+            set
+            {
+                this._numberOfVariableParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altEntityKind")]
+        public byte AltEntityKind
+        {
+            get
+            {
+                return this._altEntityKind;
+            }
+
+            set
+            {
+                this._altEntityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altDomain")]
+        public byte AltDomain
+        {
+            get
+            {
+                return this._altDomain;
+            }
+
+            set
+            {
+                this._altDomain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "altCountry")]
+        public ushort AltCountry
+        {
+            get
+            {
+                return this._altCountry;
+            }
+
+            set
+            {
+                this._altCountry = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altCategory")]
+        public byte AltCategory
+        {
+            get
+            {
+                return this._altCategory;
+            }
+
+            set
+            {
+                this._altCategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altSubcategory")]
+        public byte AltSubcategory
+        {
+            get
+            {
+                return this._altSubcategory;
+            }
+
+            set
+            {
+                this._altSubcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "altSpecific")]
+        public byte AltSpecific
+        {
+            get
+            {
+                return this._altSpecific;
+            }
+
+            set
+            {
+                this._altSpecific = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "altExtra")]
+        public byte AltExtra
+        {
+            get
+            {
+                return this._altExtra;
+            }
+
+            set
+            {
+                this._altExtra = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the X velo
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "xVelocity")]
+        public float XVelocity
+        {
+            get
+            {
+                return this._xVelocity;
+            }
+
+            set
+            {
+                this._xVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "yVelocity")]
+        public float YVelocity
+        {
+            get
+            {
+                return this._yVelocity;
+            }
+
+            set
+            {
+                this._yVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "zVelocity")]
+        public float ZVelocity
+        {
+            get
+            {
+                return this._zVelocity;
+            }
+
+            set
+            {
+                this._zVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "xLocation")]
+        public double XLocation
+        {
+            get
+            {
+                return this._xLocation;
+            }
+
+            set
+            {
+                this._xLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "yLocation")]
+        public double YLocation
+        {
+            get
+            {
+                return this._yLocation;
+            }
+
+            set
+            {
+                this._yLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "zLocation")]
+        public double ZLocation
+        {
+            get
+            {
+                return this._zLocation;
+            }
+
+            set
+            {
+                this._zLocation = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "psi")]
+        public float Psi
+        {
+            get
+            {
+                return this._psi;
+            }
+
+            set
+            {
+                this._psi = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "theta")]
+        public float Theta
+        {
+            get
+            {
+                return this._theta;
+            }
+
+            set
+            {
+                this._theta = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(float), ElementName = "phi")]
+        public float Phi
+        {
+            get
+            {
+                return this._phi;
+            }
+
+            set
+            {
+                this._phi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc.
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "entityAppearance")]
+        public int EntityAppearance
+        {
+            get
+            {
+                return this._entityAppearance;
+            }
+
+            set
+            {
+                this._entityAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration of what dead reckoning algorighm to use
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "deadReckoningAlgorithm")]
+        public byte DeadReckoningAlgorithm
+        {
+            get
+            {
+                return this._deadReckoningAlgorithm;
+            }
+
+            set
+            {
+                this._deadReckoningAlgorithm = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the other parameters to use in the dead reckoning algorithm
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "xAcceleration")]
+        public float XAcceleration
+        {
+            get
+            {
+                return this._xAcceleration;
+            }
+
+            set
+            {
+                this._xAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "yAcceleration")]
+        public float YAcceleration
+        {
+            get
+            {
+                return this._yAcceleration;
+            }
+
+            set
+            {
+                this._yAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "zAcceleration")]
+        public float ZAcceleration
+        {
+            get
+            {
+                return this._zAcceleration;
+            }
+
+            set
+            {
+                this._zAcceleration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "xAngularVelocity")]
+        public float XAngularVelocity
+        {
+            get
+            {
+                return this._xAngularVelocity;
+            }
+
+            set
+            {
+                this._xAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "yAngularVelocity")]
+        public float YAngularVelocity
+        {
+            get
+            {
+                return this._yAngularVelocity;
+            }
+
+            set
+            {
+                this._yAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "zAngularVelocity")]
+        public float ZAngularVelocity
+        {
+            get
+            {
+                return this._zAngularVelocity;
+            }
+
+            set
+            {
+                this._zAngularVelocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the characters that can be used for debugging, or to draw unique strings on the side of entities in the world
+        /// </summary>
+        [XmlArray(ElementName = "marking")]
+        public byte[] Marking
+        {
+            get
+            {
+                return this._marking;
+            }
+
+            set
+            {
+                this._marking = value;
+            }
+}
+
+        /// <summary>
+        /// Gets or sets the a series of bit flags
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "capabilities")]
+        public int Capabilities
+        {
+            get
+            {
+                return this._capabilities;
+            }
+
+            set
+            {
+                this._capabilities = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters
+        /// </summary>
+        [XmlElement(ElementName = "variableParametersList", Type = typeof(List<VariableParameter>))]
+        public List<VariableParameter> VariableParameters
+        {
+            get
+            {
+                return this._variableParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                    dos.WriteUnsignedShort((ushort)this._entity);
+                    dos.WriteUnsignedByte((byte)this._forceId);
+                    dos.WriteByte((byte)this._variableParameters.Count);
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                    dos.WriteUnsignedByte((byte)this._altEntityKind);
+                    dos.WriteUnsignedByte((byte)this._altDomain);
+                    dos.WriteUnsignedShort((ushort)this._altCountry);
+                    dos.WriteUnsignedByte((byte)this._altCategory);
+                    dos.WriteUnsignedByte((byte)this._altSubcategory);
+                    dos.WriteUnsignedByte((byte)this._altSpecific);
+                    dos.WriteUnsignedByte((byte)this._altExtra);
+                    dos.WriteFloat((float)this._xVelocity);
+                    dos.WriteFloat((float)this._yVelocity);
+                    dos.WriteFloat((float)this._zVelocity);
+                    dos.WriteDouble((double)this._xLocation);
+                    dos.WriteDouble((double)this._yLocation);
+                    dos.WriteDouble((double)this._zLocation);
+                    dos.WriteFloat((float)this._psi);
+                    dos.WriteFloat((float)this._theta);
+                    dos.WriteFloat((float)this._phi);
+                    dos.WriteInt((int)this._entityAppearance);
+                    dos.WriteUnsignedByte((byte)this._deadReckoningAlgorithm);
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                    dos.WriteFloat((float)this._xAcceleration);
+                    dos.WriteFloat((float)this._yAcceleration);
+                    dos.WriteFloat((float)this._zAcceleration);
+                    dos.WriteFloat((float)this._xAngularVelocity);
+                    dos.WriteFloat((float)this._yAngularVelocity);
+                    dos.WriteFloat((float)this._zAngularVelocity);
+
+                    for (int idx = 0; idx < this._marking.Length; idx++)
+                    {
+                        dos.WriteByte(this._marking[idx]);
+                    }
+                    dos.WriteInt((int)this._capabilities);
+
+                    for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                    {
+                        VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                        aVariableParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                    this._entity = dis.ReadUnsignedShort();
+                    this._forceId = dis.ReadUnsignedByte();
+                    this._numberOfVariableParameters = dis.ReadByte();
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                    this._altEntityKind = dis.ReadUnsignedByte();
+                    this._altDomain = dis.ReadUnsignedByte();
+                    this._altCountry = dis.ReadUnsignedShort();
+                    this._altCategory = dis.ReadUnsignedByte();
+                    this._altSubcategory = dis.ReadUnsignedByte();
+                    this._altSpecific = dis.ReadUnsignedByte();
+                    this._altExtra = dis.ReadUnsignedByte();
+                    this._xVelocity = dis.ReadFloat();
+                    this._yVelocity = dis.ReadFloat();
+                    this._zVelocity = dis.ReadFloat();
+                    this._xLocation = dis.ReadDouble();
+                    this._yLocation = dis.ReadDouble();
+                    this._zLocation = dis.ReadDouble();
+                    this._psi = dis.ReadFloat();
+                    this._theta = dis.ReadFloat();
+                    this._phi = dis.ReadFloat();
+                    this._entityAppearance = dis.ReadInt();
+                    this._deadReckoningAlgorithm = dis.ReadUnsignedByte();
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                    this._xAcceleration = dis.ReadFloat();
+                    this._yAcceleration = dis.ReadFloat();
+                    this._zAcceleration = dis.ReadFloat();
+                    this._xAngularVelocity = dis.ReadFloat();
+                    this._yAngularVelocity = dis.ReadFloat();
+                    this._zAngularVelocity = dis.ReadFloat();
+                    for (int idx = 0; idx < this._marking.Length; idx++)
+                    {
+                        this._marking[idx] = dis.ReadByte();
+                    }
+                    this._capabilities = dis.ReadInt();
+                    for (int idx = 0; idx < this.NumberOfVariableParameters; idx++)
+                    {
+                        VariableParameter anX = new VariableParameter();
+                        anX.Unmarshal(dis);
+                        this._variableParameters.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FastEntityStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("<entity type=\"ushort\">" + this._entity.ToString(CultureInfo.InvariantCulture) + "</entity>");
+                sb.AppendLine("<forceId type=\"byte\">" + this._forceId.ToString(CultureInfo.InvariantCulture) + "</forceId>");
+                sb.AppendLine("<variableParameters type=\"byte\">" + this._variableParameters.Count.ToString(CultureInfo.InvariantCulture) + "</variableParameters>");
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("<altEntityKind type=\"byte\">" + this._altEntityKind.ToString(CultureInfo.InvariantCulture) + "</altEntityKind>");
+                sb.AppendLine("<altDomain type=\"byte\">" + this._altDomain.ToString(CultureInfo.InvariantCulture) + "</altDomain>");
+                sb.AppendLine("<altCountry type=\"ushort\">" + this._altCountry.ToString(CultureInfo.InvariantCulture) + "</altCountry>");
+                sb.AppendLine("<altCategory type=\"byte\">" + this._altCategory.ToString(CultureInfo.InvariantCulture) + "</altCategory>");
+                sb.AppendLine("<altSubcategory type=\"byte\">" + this._altSubcategory.ToString(CultureInfo.InvariantCulture) + "</altSubcategory>");
+                sb.AppendLine("<altSpecific type=\"byte\">" + this._altSpecific.ToString(CultureInfo.InvariantCulture) + "</altSpecific>");
+                sb.AppendLine("<altExtra type=\"byte\">" + this._altExtra.ToString(CultureInfo.InvariantCulture) + "</altExtra>");
+                sb.AppendLine("<xVelocity type=\"float\">" + this._xVelocity.ToString(CultureInfo.InvariantCulture) + "</xVelocity>");
+                sb.AppendLine("<yVelocity type=\"float\">" + this._yVelocity.ToString(CultureInfo.InvariantCulture) + "</yVelocity>");
+                sb.AppendLine("<zVelocity type=\"float\">" + this._zVelocity.ToString(CultureInfo.InvariantCulture) + "</zVelocity>");
+                sb.AppendLine("<xLocation type=\"double\">" + this._xLocation.ToString(CultureInfo.InvariantCulture) + "</xLocation>");
+                sb.AppendLine("<yLocation type=\"double\">" + this._yLocation.ToString(CultureInfo.InvariantCulture) + "</yLocation>");
+                sb.AppendLine("<zLocation type=\"double\">" + this._zLocation.ToString(CultureInfo.InvariantCulture) + "</zLocation>");
+                sb.AppendLine("<psi type=\"float\">" + this._psi.ToString(CultureInfo.InvariantCulture) + "</psi>");
+                sb.AppendLine("<theta type=\"float\">" + this._theta.ToString(CultureInfo.InvariantCulture) + "</theta>");
+                sb.AppendLine("<phi type=\"float\">" + this._phi.ToString(CultureInfo.InvariantCulture) + "</phi>");
+                sb.AppendLine("<entityAppearance type=\"int\">" + this._entityAppearance.ToString(CultureInfo.InvariantCulture) + "</entityAppearance>");
+                sb.AppendLine("<deadReckoningAlgorithm type=\"byte\">" + this._deadReckoningAlgorithm.ToString(CultureInfo.InvariantCulture) + "</deadReckoningAlgorithm>");
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<xAcceleration type=\"float\">" + this._xAcceleration.ToString(CultureInfo.InvariantCulture) + "</xAcceleration>");
+                sb.AppendLine("<yAcceleration type=\"float\">" + this._yAcceleration.ToString(CultureInfo.InvariantCulture) + "</yAcceleration>");
+                sb.AppendLine("<zAcceleration type=\"float\">" + this._zAcceleration.ToString(CultureInfo.InvariantCulture) + "</zAcceleration>");
+                sb.AppendLine("<xAngularVelocity type=\"float\">" + this._xAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</xAngularVelocity>");
+                sb.AppendLine("<yAngularVelocity type=\"float\">" + this._yAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</yAngularVelocity>");
+                sb.AppendLine("<zAngularVelocity type=\"float\">" + this._zAngularVelocity.ToString(CultureInfo.InvariantCulture) + "</zAngularVelocity>");
+                for (int idx = 0; idx < this._marking.Length; idx++)
+                {
+                    sb.AppendLine("<marking" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._marking[idx] + "</marking" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("<capabilities type=\"int\">" + this._capabilities.ToString(CultureInfo.InvariantCulture) + "</capabilities>");
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    sb.AppendLine("<variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableParameter\">");
+                    VariableParameter aVariableParameter = (VariableParameter)this._variableParameters[idx];
+                    aVariableParameter.Reflection(sb);
+                    sb.AppendLine("</variableParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</FastEntityStatePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FastEntityStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FastEntityStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entity != obj._entity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceId != obj._forceId)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableParameters != obj._numberOfVariableParameters)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altEntityKind != obj._altEntityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altDomain != obj._altDomain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altCountry != obj._altCountry)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altCategory != obj._altCategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altSubcategory != obj._altSubcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altSpecific != obj._altSpecific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._altExtra != obj._altExtra)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._xVelocity != obj._xVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yVelocity != obj._yVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zVelocity != obj._zVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._xLocation != obj._xLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yLocation != obj._yLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zLocation != obj._zLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._psi != obj._psi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._theta != obj._theta)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._phi != obj._phi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityAppearance != obj._entityAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._deadReckoningAlgorithm != obj._deadReckoningAlgorithm)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._otherParameters.Length != 15) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 15; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._xAcceleration != obj._xAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yAcceleration != obj._yAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zAcceleration != obj._zAcceleration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._xAngularVelocity != obj._xAngularVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._yAngularVelocity != obj._yAngularVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._zAngularVelocity != obj._zAngularVelocity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._marking.Length != 12) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 12; idx++)
+                {
+                    if (this._marking[idx] != obj._marking[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._capabilities != obj._capabilities)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameters.Count != obj._variableParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    if (!this._variableParameters[idx].Equals(obj._variableParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+            result = GenerateHash(result) ^ this._entity.GetHashCode();
+            result = GenerateHash(result) ^ this._forceId.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableParameters.GetHashCode();
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+            result = GenerateHash(result) ^ this._altEntityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._altDomain.GetHashCode();
+            result = GenerateHash(result) ^ this._altCountry.GetHashCode();
+            result = GenerateHash(result) ^ this._altCategory.GetHashCode();
+            result = GenerateHash(result) ^ this._altSubcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._altSpecific.GetHashCode();
+            result = GenerateHash(result) ^ this._altExtra.GetHashCode();
+            result = GenerateHash(result) ^ this._xVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._yVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._zVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._xLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._yLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._zLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._psi.GetHashCode();
+            result = GenerateHash(result) ^ this._theta.GetHashCode();
+            result = GenerateHash(result) ^ this._phi.GetHashCode();
+            result = GenerateHash(result) ^ this._entityAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._deadReckoningAlgorithm.GetHashCode();
+
+            for (int idx = 0; idx < 15; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+            result = GenerateHash(result) ^ this._xAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._yAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._zAcceleration.GetHashCode();
+            result = GenerateHash(result) ^ this._xAngularVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._yAngularVelocity.GetHashCode();
+            result = GenerateHash(result) ^ this._zAngularVelocity.GetHashCode();
+
+            for (int idx = 0; idx < 12; idx++)
+            {
+                result = GenerateHash(result) ^ this._marking[idx].GetHashCode();
+            }
+            result = GenerateHash(result) ^ this._capabilities.GetHashCode();
+
+            if (this._variableParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/FirePdu.cs b/Libs/CSharpDis7/FirePdu.cs
new file mode 100644
index 0000000..9f8490e
--- /dev/null
+++ b/Libs/CSharpDis7/FirePdu.cs
@@ -0,0 +1,488 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  The firing of a weapon or expendable shall be communicated by issuing a Fire PDU. Sectioin 7.3.2. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventIdentifier))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(MunitionDescriptor))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class FirePdu : WarfareFamilyPdu, IEquatable<FirePdu>
+    {
+        /// <summary>
+        /// This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        private EntityID _munitionExpendibleID = new EntityID();
+
+        /// <summary>
+        /// This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34).
+        /// </summary>
+        private EventIdentifier _eventID = new EventIdentifier();
+
+        /// <summary>
+        /// This field shall identify the fire mission (see 5.4.3.3). This field shall be representedby a 32-bit unsigned integer.
+        /// </summary>
+        private uint _fireMissionIndex;
+
+        /// <summary>
+        /// This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97).
+        /// </summary>
+        private Vector3Double _locationInWorldCoordinates = new Vector3Double();
+
+        /// <summary>
+        /// This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4).
+        /// </summary>
+        private MunitionDescriptor _descriptor = new MunitionDescriptor();
+
+        /// <summary>
+        /// This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)].
+        /// </summary>
+        private Vector3Float _velocity = new Vector3Float();
+
+        /// <summary>
+        /// This field shall specify the range that an entity’s fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero.
+        /// </summary>
+        private float _range;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FirePdu"/> class.
+        /// </summary>
+        public FirePdu()
+        {
+            PduType = (byte)2;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FirePdu left, FirePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FirePdu left, FirePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._munitionExpendibleID.GetMarshalledSize();  // this._munitionExpendibleID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 4;  // this._fireMissionIndex
+            marshalSize += this._locationInWorldCoordinates.GetMarshalledSize();  // this._locationInWorldCoordinates
+            marshalSize += this._descriptor.GetMarshalledSize();  // this._descriptor
+            marshalSize += this._velocity.GetMarshalledSize();  // this._velocity
+            marshalSize += 4;  // this._range
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28).
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "munitionExpendibleID")]
+        public EntityID MunitionExpendibleID
+        {
+            get
+            {
+                return this._munitionExpendibleID;
+            }
+
+            set
+            {
+                this._munitionExpendibleID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34).
+        /// </summary>
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
+        public EventIdentifier EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the fire mission (see 5.4.3.3). This field shall be representedby a 32-bit unsigned integer.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fireMissionIndex")]
+        public uint FireMissionIndex
+        {
+            get
+            {
+                return this._fireMissionIndex;
+            }
+
+            set
+            {
+                this._fireMissionIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97).
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "locationInWorldCoordinates")]
+        public Vector3Double LocationInWorldCoordinates
+        {
+            get
+            {
+                return this._locationInWorldCoordinates;
+            }
+
+            set
+            {
+                this._locationInWorldCoordinates = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4).
+        /// </summary>
+        [XmlElement(Type = typeof(MunitionDescriptor), ElementName = "descriptor")]
+        public MunitionDescriptor Descriptor
+        {
+            get
+            {
+                return this._descriptor;
+            }
+
+            set
+            {
+                this._descriptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)].
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "velocity")]
+        public Vector3Float Velocity
+        {
+            get
+            {
+                return this._velocity;
+            }
+
+            set
+            {
+                this._velocity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the range that an entity’s fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "range")]
+        public float Range
+        {
+            get
+            {
+                return this._range;
+            }
+
+            set
+            {
+                this._range = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionExpendibleID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._fireMissionIndex);
+                    this._locationInWorldCoordinates.Marshal(dos);
+                    this._descriptor.Marshal(dos);
+                    this._velocity.Marshal(dos);
+                    dos.WriteFloat((float)this._range);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionExpendibleID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._fireMissionIndex = dis.ReadUnsignedInt();
+                    this._locationInWorldCoordinates.Unmarshal(dis);
+                    this._descriptor.Unmarshal(dis);
+                    this._velocity.Unmarshal(dis);
+                    this._range = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FirePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<munitionExpendibleID>");
+                this._munitionExpendibleID.Reflection(sb);
+                sb.AppendLine("</munitionExpendibleID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<fireMissionIndex type=\"uint\">" + this._fireMissionIndex.ToString(CultureInfo.InvariantCulture) + "</fireMissionIndex>");
+                sb.AppendLine("<locationInWorldCoordinates>");
+                this._locationInWorldCoordinates.Reflection(sb);
+                sb.AppendLine("</locationInWorldCoordinates>");
+                sb.AppendLine("<descriptor>");
+                this._descriptor.Reflection(sb);
+                sb.AppendLine("</descriptor>");
+                sb.AppendLine("<velocity>");
+                this._velocity.Reflection(sb);
+                sb.AppendLine("</velocity>");
+                sb.AppendLine("<range type=\"float\">" + this._range.ToString(CultureInfo.InvariantCulture) + "</range>");
+                sb.AppendLine("</FirePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FirePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FirePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._munitionExpendibleID.Equals(obj._munitionExpendibleID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fireMissionIndex != obj._fireMissionIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._locationInWorldCoordinates.Equals(obj._locationInWorldCoordinates))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._descriptor.Equals(obj._descriptor))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._velocity.Equals(obj._velocity))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._range != obj._range)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._munitionExpendibleID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._fireMissionIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._locationInWorldCoordinates.GetHashCode();
+            result = GenerateHash(result) ^ this._descriptor.GetHashCode();
+            result = GenerateHash(result) ^ this._velocity.GetHashCode();
+            result = GenerateHash(result) ^ this._range.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/FixedDatum.cs b/Libs/CSharpDis7/FixedDatum.cs
new file mode 100644
index 0000000..8c840dc
--- /dev/null
+++ b/Libs/CSharpDis7/FixedDatum.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Fixed Datum Record. Section 6.2.38
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FixedDatum
+    {
+        /// <summary>
+        /// ID of the fixed datum, an enumeration
+        /// </summary>
+        private uint _fixedDatumID;
+
+        /// <summary>
+        /// Value for the fixed datum
+        /// </summary>
+        private uint _fixedDatumValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FixedDatum"/> class.
+        /// </summary>
+        public FixedDatum()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FixedDatum left, FixedDatum right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FixedDatum left, FixedDatum right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._fixedDatumID
+            marshalSize += 4;  // this._fixedDatumValue
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the fixed datum, an enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumID")]
+        public uint FixedDatumID
+        {
+            get
+            {
+                return this._fixedDatumID;
+            }
+
+            set
+            {
+                this._fixedDatumID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Value for the fixed datum
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fixedDatumValue")]
+        public uint FixedDatumValue
+        {
+            get
+            {
+                return this._fixedDatumValue;
+            }
+
+            set
+            {
+                this._fixedDatumValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fixedDatumID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumValue);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._fixedDatumID = dis.ReadUnsignedInt();
+                    this._fixedDatumValue = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FixedDatum>");
+            try
+            {
+                sb.AppendLine("<fixedDatumID type=\"uint\">" + this._fixedDatumID.ToString(CultureInfo.InvariantCulture) + "</fixedDatumID>");
+                sb.AppendLine("<fixedDatumValue type=\"uint\">" + this._fixedDatumValue.ToString(CultureInfo.InvariantCulture) + "</fixedDatumValue>");
+                sb.AppendLine("</FixedDatum>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FixedDatum;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FixedDatum obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._fixedDatumID != obj._fixedDatumID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumValue != obj._fixedDatumValue)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._fixedDatumID.GetHashCode();
+            result = GenerateHash(result) ^ this._fixedDatumValue.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/FourByteChunk.cs b/Libs/CSharpDis7/FourByteChunk.cs
new file mode 100644
index 0000000..b459c13
--- /dev/null
+++ b/Libs/CSharpDis7/FourByteChunk.cs
@@ -0,0 +1,303 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// 32 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FourByteChunk
+    {
+        /// <summary>
+        /// four bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[4];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FourByteChunk"/> class.
+        /// </summary>
+        public FourByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FourByteChunk left, FourByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FourByteChunk left, FourByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the four bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FourByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</FourByteChunk>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FourByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FourByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 4) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 4; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+
+            for (int idx = 0; idx < 4; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/FundamentalOperationalData.cs b/Libs/CSharpDis7/FundamentalOperationalData.cs
new file mode 100644
index 0000000..64f43b3
--- /dev/null
+++ b/Libs/CSharpDis7/FundamentalOperationalData.cs
@@ -0,0 +1,565 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Basic operational data for IFF. Section 6.2.40.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class FundamentalOperationalData
+    {
+        /// <summary>
+        /// system status
+        /// </summary>
+        private byte _systemStatus;
+
+        /// <summary>
+        /// data field 1
+        /// </summary>
+        private byte _dataField1;
+
+        /// <summary>
+        /// eight boolean fields
+        /// </summary>
+        private byte _informationLayers;
+
+        /// <summary>
+        /// enumeration
+        /// </summary>
+        private byte _dataField2;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter1;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter2;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter3;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter4;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter5;
+
+        /// <summary>
+        /// parameter, enumeration
+        /// </summary>
+        private ushort _parameter6;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FundamentalOperationalData"/> class.
+        /// </summary>
+        public FundamentalOperationalData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(FundamentalOperationalData left, FundamentalOperationalData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(FundamentalOperationalData left, FundamentalOperationalData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._systemStatus
+            marshalSize += 1;  // this._dataField1
+            marshalSize += 1;  // this._informationLayers
+            marshalSize += 1;  // this._dataField2
+            marshalSize += 2;  // this._parameter1
+            marshalSize += 2;  // this._parameter2
+            marshalSize += 2;  // this._parameter3
+            marshalSize += 2;  // this._parameter4
+            marshalSize += 2;  // this._parameter5
+            marshalSize += 2;  // this._parameter6
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the system status
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "systemStatus")]
+        public byte SystemStatus
+        {
+            get
+            {
+                return this._systemStatus;
+            }
+
+            set
+            {
+                this._systemStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the data field 1
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "dataField1")]
+        public byte DataField1
+        {
+            get
+            {
+                return this._dataField1;
+            }
+
+            set
+            {
+                this._dataField1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the eight boolean fields
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "informationLayers")]
+        public byte InformationLayers
+        {
+            get
+            {
+                return this._informationLayers;
+            }
+
+            set
+            {
+                this._informationLayers = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "dataField2")]
+        public byte DataField2
+        {
+            get
+            {
+                return this._dataField2;
+            }
+
+            set
+            {
+                this._dataField2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter1")]
+        public ushort Parameter1
+        {
+            get
+            {
+                return this._parameter1;
+            }
+
+            set
+            {
+                this._parameter1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter2")]
+        public ushort Parameter2
+        {
+            get
+            {
+                return this._parameter2;
+            }
+
+            set
+            {
+                this._parameter2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter3")]
+        public ushort Parameter3
+        {
+            get
+            {
+                return this._parameter3;
+            }
+
+            set
+            {
+                this._parameter3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter4")]
+        public ushort Parameter4
+        {
+            get
+            {
+                return this._parameter4;
+            }
+
+            set
+            {
+                this._parameter4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter5")]
+        public ushort Parameter5
+        {
+            get
+            {
+                return this._parameter5;
+            }
+
+            set
+            {
+                this._parameter5 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the parameter, enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "parameter6")]
+        public ushort Parameter6
+        {
+            get
+            {
+                return this._parameter6;
+            }
+
+            set
+            {
+                this._parameter6 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._systemStatus);
+                    dos.WriteUnsignedByte((byte)this._dataField1);
+                    dos.WriteUnsignedByte((byte)this._informationLayers);
+                    dos.WriteUnsignedByte((byte)this._dataField2);
+                    dos.WriteUnsignedShort((ushort)this._parameter1);
+                    dos.WriteUnsignedShort((ushort)this._parameter2);
+                    dos.WriteUnsignedShort((ushort)this._parameter3);
+                    dos.WriteUnsignedShort((ushort)this._parameter4);
+                    dos.WriteUnsignedShort((ushort)this._parameter5);
+                    dos.WriteUnsignedShort((ushort)this._parameter6);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._systemStatus = dis.ReadUnsignedByte();
+                    this._dataField1 = dis.ReadUnsignedByte();
+                    this._informationLayers = dis.ReadUnsignedByte();
+                    this._dataField2 = dis.ReadUnsignedByte();
+                    this._parameter1 = dis.ReadUnsignedShort();
+                    this._parameter2 = dis.ReadUnsignedShort();
+                    this._parameter3 = dis.ReadUnsignedShort();
+                    this._parameter4 = dis.ReadUnsignedShort();
+                    this._parameter5 = dis.ReadUnsignedShort();
+                    this._parameter6 = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<FundamentalOperationalData>");
+            try
+            {
+                sb.AppendLine("<systemStatus type=\"byte\">" + this._systemStatus.ToString(CultureInfo.InvariantCulture) + "</systemStatus>");
+                sb.AppendLine("<dataField1 type=\"byte\">" + this._dataField1.ToString(CultureInfo.InvariantCulture) + "</dataField1>");
+                sb.AppendLine("<informationLayers type=\"byte\">" + this._informationLayers.ToString(CultureInfo.InvariantCulture) + "</informationLayers>");
+                sb.AppendLine("<dataField2 type=\"byte\">" + this._dataField2.ToString(CultureInfo.InvariantCulture) + "</dataField2>");
+                sb.AppendLine("<parameter1 type=\"ushort\">" + this._parameter1.ToString(CultureInfo.InvariantCulture) + "</parameter1>");
+                sb.AppendLine("<parameter2 type=\"ushort\">" + this._parameter2.ToString(CultureInfo.InvariantCulture) + "</parameter2>");
+                sb.AppendLine("<parameter3 type=\"ushort\">" + this._parameter3.ToString(CultureInfo.InvariantCulture) + "</parameter3>");
+                sb.AppendLine("<parameter4 type=\"ushort\">" + this._parameter4.ToString(CultureInfo.InvariantCulture) + "</parameter4>");
+                sb.AppendLine("<parameter5 type=\"ushort\">" + this._parameter5.ToString(CultureInfo.InvariantCulture) + "</parameter5>");
+                sb.AppendLine("<parameter6 type=\"ushort\">" + this._parameter6.ToString(CultureInfo.InvariantCulture) + "</parameter6>");
+                sb.AppendLine("</FundamentalOperationalData>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as FundamentalOperationalData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(FundamentalOperationalData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._systemStatus != obj._systemStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataField1 != obj._dataField1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._informationLayers != obj._informationLayers)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataField2 != obj._dataField2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter1 != obj._parameter1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter2 != obj._parameter2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter3 != obj._parameter3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter4 != obj._parameter4)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter5 != obj._parameter5)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._parameter6 != obj._parameter6)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._systemStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._dataField1.GetHashCode();
+            result = GenerateHash(result) ^ this._informationLayers.GetHashCode();
+            result = GenerateHash(result) ^ this._dataField2.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter1.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter2.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter3.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter4.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter5.GetHashCode();
+            result = GenerateHash(result) ^ this._parameter6.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/GridAxis.cs b/Libs/CSharpDis7/GridAxis.cs
new file mode 100644
index 0000000..661f51d
--- /dev/null
+++ b/Libs/CSharpDis7/GridAxis.cs
@@ -0,0 +1,469 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Grid axis record for fixed data. Section 6.2.41
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class GridAxis
+    {
+        /// <summary>
+        /// coordinate of the grid origin or initial value
+        /// </summary>
+        private double _domainInitialXi;
+
+        /// <summary>
+        /// coordinate of the endpoint or final value
+        /// </summary>
+        private double _domainFinalXi;
+
+        /// <summary>
+        /// The number of grid points along the Xi domain axis for the enviornmental state data
+        /// </summary>
+        private ushort _domainPointsXi;
+
+        /// <summary>
+        /// interleaf factor along the domain axis.
+        /// </summary>
+        private byte _interleafFactor;
+
+        /// <summary>
+        /// type of grid axis
+        /// </summary>
+        private byte _axisType;
+
+        /// <summary>
+        /// Number of grid locations along Xi axis
+        /// </summary>
+        private ushort _numberOfPointsOnXiAxis;
+
+        /// <summary>
+        /// initial grid point for the current pdu
+        /// </summary>
+        private ushort _initialIndex;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GridAxis"/> class.
+        /// </summary>
+        public GridAxis()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GridAxis left, GridAxis right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GridAxis left, GridAxis right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 8;  // this._domainInitialXi
+            marshalSize += 8;  // this._domainFinalXi
+            marshalSize += 2;  // this._domainPointsXi
+            marshalSize += 1;  // this._interleafFactor
+            marshalSize += 1;  // this._axisType
+            marshalSize += 2;  // this._numberOfPointsOnXiAxis
+            marshalSize += 2;  // this._initialIndex
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the coordinate of the grid origin or initial value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "domainInitialXi")]
+        public double DomainInitialXi
+        {
+            get
+            {
+                return this._domainInitialXi;
+            }
+
+            set
+            {
+                this._domainInitialXi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the coordinate of the endpoint or final value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "domainFinalXi")]
+        public double DomainFinalXi
+        {
+            get
+            {
+                return this._domainFinalXi;
+            }
+
+            set
+            {
+                this._domainFinalXi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The number of grid points along the Xi domain axis for the enviornmental state data
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "domainPointsXi")]
+        public ushort DomainPointsXi
+        {
+            get
+            {
+                return this._domainPointsXi;
+            }
+
+            set
+            {
+                this._domainPointsXi = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the interleaf factor along the domain axis.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "interleafFactor")]
+        public byte InterleafFactor
+        {
+            get
+            {
+                return this._interleafFactor;
+            }
+
+            set
+            {
+                this._interleafFactor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of grid axis
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "axisType")]
+        public byte AxisType
+        {
+            get
+            {
+                return this._axisType;
+            }
+
+            set
+            {
+                this._axisType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of grid locations along Xi axis
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPointsOnXiAxis")]
+        public ushort NumberOfPointsOnXiAxis
+        {
+            get
+            {
+                return this._numberOfPointsOnXiAxis;
+            }
+
+            set
+            {
+                this._numberOfPointsOnXiAxis = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the initial grid point for the current pdu
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "initialIndex")]
+        public ushort InitialIndex
+        {
+            get
+            {
+                return this._initialIndex;
+            }
+
+            set
+            {
+                this._initialIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteDouble((double)this._domainInitialXi);
+                    dos.WriteDouble((double)this._domainFinalXi);
+                    dos.WriteUnsignedShort((ushort)this._domainPointsXi);
+                    dos.WriteUnsignedByte((byte)this._interleafFactor);
+                    dos.WriteUnsignedByte((byte)this._axisType);
+                    dos.WriteUnsignedShort((ushort)this._numberOfPointsOnXiAxis);
+                    dos.WriteUnsignedShort((ushort)this._initialIndex);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._domainInitialXi = dis.ReadDouble();
+                    this._domainFinalXi = dis.ReadDouble();
+                    this._domainPointsXi = dis.ReadUnsignedShort();
+                    this._interleafFactor = dis.ReadUnsignedByte();
+                    this._axisType = dis.ReadUnsignedByte();
+                    this._numberOfPointsOnXiAxis = dis.ReadUnsignedShort();
+                    this._initialIndex = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<GridAxis>");
+            try
+            {
+                sb.AppendLine("<domainInitialXi type=\"double\">" + this._domainInitialXi.ToString(CultureInfo.InvariantCulture) + "</domainInitialXi>");
+                sb.AppendLine("<domainFinalXi type=\"double\">" + this._domainFinalXi.ToString(CultureInfo.InvariantCulture) + "</domainFinalXi>");
+                sb.AppendLine("<domainPointsXi type=\"ushort\">" + this._domainPointsXi.ToString(CultureInfo.InvariantCulture) + "</domainPointsXi>");
+                sb.AppendLine("<interleafFactor type=\"byte\">" + this._interleafFactor.ToString(CultureInfo.InvariantCulture) + "</interleafFactor>");
+                sb.AppendLine("<axisType type=\"byte\">" + this._axisType.ToString(CultureInfo.InvariantCulture) + "</axisType>");
+                sb.AppendLine("<numberOfPointsOnXiAxis type=\"ushort\">" + this._numberOfPointsOnXiAxis.ToString(CultureInfo.InvariantCulture) + "</numberOfPointsOnXiAxis>");
+                sb.AppendLine("<initialIndex type=\"ushort\">" + this._initialIndex.ToString(CultureInfo.InvariantCulture) + "</initialIndex>");
+                sb.AppendLine("</GridAxis>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as GridAxis;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GridAxis obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._domainInitialXi != obj._domainInitialXi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domainFinalXi != obj._domainFinalXi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domainPointsXi != obj._domainPointsXi)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._interleafFactor != obj._interleafFactor)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._axisType != obj._axisType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPointsOnXiAxis != obj._numberOfPointsOnXiAxis)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._initialIndex != obj._initialIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._domainInitialXi.GetHashCode();
+            result = GenerateHash(result) ^ this._domainFinalXi.GetHashCode();
+            result = GenerateHash(result) ^ this._domainPointsXi.GetHashCode();
+            result = GenerateHash(result) ^ this._interleafFactor.GetHashCode();
+            result = GenerateHash(result) ^ this._axisType.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPointsOnXiAxis.GetHashCode();
+            result = GenerateHash(result) ^ this._initialIndex.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/GroupIdentifier.cs b/Libs/CSharpDis7/GroupIdentifier.cs
new file mode 100644
index 0000000..02bc7a2
--- /dev/null
+++ b/Libs/CSharpDis7/GroupIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Unique designation of a group of entities contained in the isGroupOfPdu. Represents a group of entities rather than a single entity. Section 6.2.43
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class GroupIdentifier
+    {
+        /// <summary>
+        /// Simulation address (site and application number)
+        /// </summary>
+        private EntityType _simulationAddress = new EntityType();
+
+        /// <summary>
+        /// group number
+        /// </summary>
+        private ushort _groupNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GroupIdentifier"/> class.
+        /// </summary>
+        public GroupIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(GroupIdentifier left, GroupIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(GroupIdentifier left, GroupIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._groupNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Simulation address (site and application number)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "simulationAddress")]
+        public EntityType SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the group number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "groupNumber")]
+        public ushort GroupNumber
+        {
+            get
+            {
+                return this._groupNumber;
+            }
+
+            set
+            {
+                this._groupNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._groupNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._groupNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<GroupIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<groupNumber type=\"ushort\">" + this._groupNumber.ToString(CultureInfo.InvariantCulture) + "</groupNumber>");
+                sb.AppendLine("</GroupIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as GroupIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(GroupIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._groupNumber != obj._groupNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._groupNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IFFFundamentalParameterData.cs b/Libs/CSharpDis7/IFFFundamentalParameterData.cs
new file mode 100644
index 0000000..05c8e57
--- /dev/null
+++ b/Libs/CSharpDis7/IFFFundamentalParameterData.cs
@@ -0,0 +1,495 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Fundamental IFF atc data. Section 6.2.45
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class IFFFundamentalParameterData
+    {
+        /// <summary>
+        /// ERP
+        /// </summary>
+        private float _erp;
+
+        /// <summary>
+        /// frequency
+        /// </summary>
+        private float _frequency;
+
+        /// <summary>
+        /// pgrf
+        /// </summary>
+        private float _pgrf;
+
+        /// <summary>
+        /// Pulse width
+        /// </summary>
+        private float _pulseWidth;
+
+        /// <summary>
+        /// Burst length
+        /// </summary>
+        private uint _burstLength;
+
+        /// <summary>
+        /// Applicable modes enumeration
+        /// </summary>
+        private byte _applicableModes;
+
+        /// <summary>
+        /// System-specific data
+        /// </summary>
+        private byte[] _systemSpecificData = new byte[3];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IFFFundamentalParameterData"/> class.
+        /// </summary>
+        public IFFFundamentalParameterData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IFFFundamentalParameterData left, IFFFundamentalParameterData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IFFFundamentalParameterData left, IFFFundamentalParameterData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._erp
+            marshalSize += 4;  // this._frequency
+            marshalSize += 4;  // this._pgrf
+            marshalSize += 4;  // this._pulseWidth
+            marshalSize += 4;  // this._burstLength
+            marshalSize += 1;  // this._applicableModes
+            marshalSize += 3 * 1;  // _systemSpecificData
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ERP
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "erp")]
+        public float Erp
+        {
+            get
+            {
+                return this._erp;
+            }
+
+            set
+            {
+                this._erp = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the frequency
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "frequency")]
+        public float Frequency
+        {
+            get
+            {
+                return this._frequency;
+            }
+
+            set
+            {
+                this._frequency = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pgrf
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pgrf")]
+        public float Pgrf
+        {
+            get
+            {
+                return this._pgrf;
+            }
+
+            set
+            {
+                this._pgrf = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Pulse width
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "pulseWidth")]
+        public float PulseWidth
+        {
+            get
+            {
+                return this._pulseWidth;
+            }
+
+            set
+            {
+                this._pulseWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Burst length
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "burstLength")]
+        public uint BurstLength
+        {
+            get
+            {
+                return this._burstLength;
+            }
+
+            set
+            {
+                this._burstLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Applicable modes enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "applicableModes")]
+        public byte ApplicableModes
+        {
+            get
+            {
+                return this._applicableModes;
+            }
+
+            set
+            {
+                this._applicableModes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the System-specific data
+        /// </summary>
+        [XmlArray(ElementName = "systemSpecificData")]
+        public byte[] SystemSpecificData
+        {
+            get
+            {
+                return this._systemSpecificData;
+            }
+
+            set
+            {
+                this._systemSpecificData = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._erp);
+                    dos.WriteFloat((float)this._frequency);
+                    dos.WriteFloat((float)this._pgrf);
+                    dos.WriteFloat((float)this._pulseWidth);
+                    dos.WriteUnsignedInt((uint)this._burstLength);
+                    dos.WriteUnsignedByte((byte)this._applicableModes);
+
+                    for (int idx = 0; idx < this._systemSpecificData.Length; idx++)
+                    {
+                        dos.WriteUnsignedByte(this._systemSpecificData[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._erp = dis.ReadFloat();
+                    this._frequency = dis.ReadFloat();
+                    this._pgrf = dis.ReadFloat();
+                    this._pulseWidth = dis.ReadFloat();
+                    this._burstLength = dis.ReadUnsignedInt();
+                    this._applicableModes = dis.ReadUnsignedByte();
+                    for (int idx = 0; idx < this._systemSpecificData.Length; idx++)
+                    {
+                        this._systemSpecificData[idx] = dis.ReadUnsignedByte();
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IFFFundamentalParameterData>");
+            try
+            {
+                sb.AppendLine("<erp type=\"float\">" + this._erp.ToString(CultureInfo.InvariantCulture) + "</erp>");
+                sb.AppendLine("<frequency type=\"float\">" + this._frequency.ToString(CultureInfo.InvariantCulture) + "</frequency>");
+                sb.AppendLine("<pgrf type=\"float\">" + this._pgrf.ToString(CultureInfo.InvariantCulture) + "</pgrf>");
+                sb.AppendLine("<pulseWidth type=\"float\">" + this._pulseWidth.ToString(CultureInfo.InvariantCulture) + "</pulseWidth>");
+                sb.AppendLine("<burstLength type=\"uint\">" + this._burstLength.ToString(CultureInfo.InvariantCulture) + "</burstLength>");
+                sb.AppendLine("<applicableModes type=\"byte\">" + this._applicableModes.ToString(CultureInfo.InvariantCulture) + "</applicableModes>");
+                for (int idx = 0; idx < this._systemSpecificData.Length; idx++)
+                {
+                    sb.AppendLine("<systemSpecificData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._systemSpecificData[idx] + "</systemSpecificData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</IFFFundamentalParameterData>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IFFFundamentalParameterData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IFFFundamentalParameterData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._erp != obj._erp)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frequency != obj._frequency)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pgrf != obj._pgrf)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pulseWidth != obj._pulseWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._burstLength != obj._burstLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._applicableModes != obj._applicableModes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (obj._systemSpecificData.Length != 3) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 3; idx++)
+                {
+                    if (this._systemSpecificData[idx] != obj._systemSpecificData[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._erp.GetHashCode();
+            result = GenerateHash(result) ^ this._frequency.GetHashCode();
+            result = GenerateHash(result) ^ this._pgrf.GetHashCode();
+            result = GenerateHash(result) ^ this._pulseWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._burstLength.GetHashCode();
+            result = GenerateHash(result) ^ this._applicableModes.GetHashCode();
+
+            for (int idx = 0; idx < 3; idx++)
+            {
+                result = GenerateHash(result) ^ this._systemSpecificData[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IOCommunicationsNode.cs b/Libs/CSharpDis7/IOCommunicationsNode.cs
new file mode 100644
index 0000000..9fcd7c4
--- /dev/null
+++ b/Libs/CSharpDis7/IOCommunicationsNode.cs
@@ -0,0 +1,404 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// A communications node that is part of a simulted communcations network. Section 6.2.49.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class IOCommunicationsNode
+    {
+        private uint _recordType = 5501;
+
+        private ushort _recordLength = 16;
+
+        private byte _communcationsNodeType;
+
+        private byte _padding;
+
+        private EntityID _communicationsNode = new EntityID();
+
+        private ushort _elementID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IOCommunicationsNode"/> class.
+        /// </summary>
+        public IOCommunicationsNode()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IOCommunicationsNode left, IOCommunicationsNode right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IOCommunicationsNode left, IOCommunicationsNode right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 1;  // this._communcationsNodeType
+            marshalSize += 1;  // this._padding
+            marshalSize += this._communicationsNode.GetMarshalledSize();  // this._communicationsNode
+            marshalSize += 2;  // this._elementID
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "communcationsNodeType")]
+        public byte CommuncationsNodeType
+        {
+            get
+            {
+                return this._communcationsNodeType;
+            }
+
+            set
+            {
+                this._communcationsNodeType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(EntityID), ElementName = "communicationsNode")]
+        public EntityID CommunicationsNode
+        {
+            get
+            {
+                return this._communicationsNode;
+            }
+
+            set
+            {
+                this._communicationsNode = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "elementID")]
+        public ushort ElementID
+        {
+            get
+            {
+                return this._elementID;
+            }
+
+            set
+            {
+                this._elementID = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedByte((byte)this._communcationsNodeType);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                    this._communicationsNode.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._elementID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._communcationsNodeType = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                    this._communicationsNode.Unmarshal(dis);
+                    this._elementID = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IOCommunicationsNode>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<communcationsNodeType type=\"byte\">" + this._communcationsNodeType.ToString(CultureInfo.InvariantCulture) + "</communcationsNodeType>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<communicationsNode>");
+                this._communicationsNode.Reflection(sb);
+                sb.AppendLine("</communicationsNode>");
+                sb.AppendLine("<elementID type=\"ushort\">" + this._elementID.ToString(CultureInfo.InvariantCulture) + "</elementID>");
+                sb.AppendLine("</IOCommunicationsNode>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IOCommunicationsNode;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IOCommunicationsNode obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._communcationsNodeType != obj._communcationsNodeType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._communicationsNode.Equals(obj._communicationsNode))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._elementID != obj._elementID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._communcationsNodeType.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._communicationsNode.GetHashCode();
+            result = GenerateHash(result) ^ this._elementID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IOEffect.cs b/Libs/CSharpDis7/IOEffect.cs
new file mode 100644
index 0000000..326dd68
--- /dev/null
+++ b/Libs/CSharpDis7/IOEffect.cs
@@ -0,0 +1,482 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Effect of IO on an entity. Section 6.2.49.3
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class IOEffect
+    {
+        private uint _recordType = 5500;
+
+        private ushort _recordLength = 16;
+
+        private byte _ioStatus;
+
+        private byte _ioLinkType;
+
+        private EntityID _ioEffect = new EntityID();
+
+        private byte _ioEffectDutyCycle;
+
+        private ushort _ioEffectDuration;
+
+        private ushort _ioProcess;
+
+        private ushort _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IOEffect"/> class.
+        /// </summary>
+        public IOEffect()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IOEffect left, IOEffect right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IOEffect left, IOEffect right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 1;  // this._ioStatus
+            marshalSize += 1;  // this._ioLinkType
+            marshalSize += this._ioEffect.GetMarshalledSize();  // this._ioEffect
+            marshalSize += 1;  // this._ioEffectDutyCycle
+            marshalSize += 2;  // this._ioEffectDuration
+            marshalSize += 2;  // this._ioProcess
+            marshalSize += 2;  // this._padding
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "ioStatus")]
+        public byte IoStatus
+        {
+            get
+            {
+                return this._ioStatus;
+            }
+
+            set
+            {
+                this._ioStatus = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "ioLinkType")]
+        public byte IoLinkType
+        {
+            get
+            {
+                return this._ioLinkType;
+            }
+
+            set
+            {
+                this._ioLinkType = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(EntityID), ElementName = "ioEffect")]
+        public EntityID IoEffect
+        {
+            get
+            {
+                return this._ioEffect;
+            }
+
+            set
+            {
+                this._ioEffect = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "ioEffectDutyCycle")]
+        public byte IoEffectDutyCycle
+        {
+            get
+            {
+                return this._ioEffectDutyCycle;
+            }
+
+            set
+            {
+                this._ioEffectDutyCycle = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "ioEffectDuration")]
+        public ushort IoEffectDuration
+        {
+            get
+            {
+                return this._ioEffectDuration;
+            }
+
+            set
+            {
+                this._ioEffectDuration = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "ioProcess")]
+        public ushort IoProcess
+        {
+            get
+            {
+                return this._ioProcess;
+            }
+
+            set
+            {
+                this._ioProcess = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedByte((byte)this._ioStatus);
+                    dos.WriteUnsignedByte((byte)this._ioLinkType);
+                    this._ioEffect.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._ioEffectDutyCycle);
+                    dos.WriteUnsignedShort((ushort)this._ioEffectDuration);
+                    dos.WriteUnsignedShort((ushort)this._ioProcess);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._ioStatus = dis.ReadUnsignedByte();
+                    this._ioLinkType = dis.ReadUnsignedByte();
+                    this._ioEffect.Unmarshal(dis);
+                    this._ioEffectDutyCycle = dis.ReadUnsignedByte();
+                    this._ioEffectDuration = dis.ReadUnsignedShort();
+                    this._ioProcess = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IOEffect>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<ioStatus type=\"byte\">" + this._ioStatus.ToString(CultureInfo.InvariantCulture) + "</ioStatus>");
+                sb.AppendLine("<ioLinkType type=\"byte\">" + this._ioLinkType.ToString(CultureInfo.InvariantCulture) + "</ioLinkType>");
+                sb.AppendLine("<ioEffect>");
+                this._ioEffect.Reflection(sb);
+                sb.AppendLine("</ioEffect>");
+                sb.AppendLine("<ioEffectDutyCycle type=\"byte\">" + this._ioEffectDutyCycle.ToString(CultureInfo.InvariantCulture) + "</ioEffectDutyCycle>");
+                sb.AppendLine("<ioEffectDuration type=\"ushort\">" + this._ioEffectDuration.ToString(CultureInfo.InvariantCulture) + "</ioEffectDuration>");
+                sb.AppendLine("<ioProcess type=\"ushort\">" + this._ioProcess.ToString(CultureInfo.InvariantCulture) + "</ioProcess>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</IOEffect>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IOEffect;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IOEffect obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ioStatus != obj._ioStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ioLinkType != obj._ioLinkType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._ioEffect.Equals(obj._ioEffect))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ioEffectDutyCycle != obj._ioEffectDutyCycle)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ioEffectDuration != obj._ioEffectDuration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ioProcess != obj._ioProcess)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._ioStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._ioLinkType.GetHashCode();
+            result = GenerateHash(result) ^ this._ioEffect.GetHashCode();
+            result = GenerateHash(result) ^ this._ioEffectDutyCycle.GetHashCode();
+            result = GenerateHash(result) ^ this._ioEffectDuration.GetHashCode();
+            result = GenerateHash(result) ^ this._ioProcess.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IffDataSpecification.cs b/Libs/CSharpDis7/IffDataSpecification.cs
new file mode 100644
index 0000000..74e753d
--- /dev/null
+++ b/Libs/CSharpDis7/IffDataSpecification.cs
@@ -0,0 +1,280 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Requires hand coding to be useful. Section 6.2.44
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class IffDataSpecification
+    {
+        /// <summary>
+        /// Number of iff records
+        /// </summary>
+        private EntityType _numberOfIffDataRecords = new EntityType();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IffDataSpecification"/> class.
+        /// </summary>
+        public IffDataSpecification()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IffDataSpecification left, IffDataSpecification right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IffDataSpecification left, IffDataSpecification right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._numberOfIffDataRecords.GetMarshalledSize();  // this._numberOfIffDataRecords
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Number of iff records
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "numberOfIffDataRecords")]
+        public EntityType NumberOfIffDataRecords
+        {
+            get
+            {
+                return this._numberOfIffDataRecords;
+            }
+
+            set
+            {
+                this._numberOfIffDataRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._numberOfIffDataRecords.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfIffDataRecords.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IffDataSpecification>");
+            try
+            {
+                sb.AppendLine("<numberOfIffDataRecords>");
+                this._numberOfIffDataRecords.Reflection(sb);
+                sb.AppendLine("</numberOfIffDataRecords>");
+                sb.AppendLine("</IffDataSpecification>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IffDataSpecification;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IffDataSpecification obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._numberOfIffDataRecords.Equals(obj._numberOfIffDataRecords))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfIffDataRecords.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IntercomCommunicationsParameters.cs b/Libs/CSharpDis7/IntercomCommunicationsParameters.cs
new file mode 100644
index 0000000..bfb68d8
--- /dev/null
+++ b/Libs/CSharpDis7/IntercomCommunicationsParameters.cs
@@ -0,0 +1,341 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Intercom communcations parameters. Section 6.2.47.  This requires hand coding
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class IntercomCommunicationsParameters
+    {
+        /// <summary>
+        /// Type of intercom parameters record
+        /// </summary>
+        private ushort _recordType;
+
+        /// <summary>
+        /// length of record
+        /// </summary>
+        private ushort _recordLength;
+
+        /// <summary>
+        /// This is a placeholder.
+        /// </summary>
+        private uint _recordSpecificField;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomCommunicationsParameters"/> class.
+        /// </summary>
+        public IntercomCommunicationsParameters()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IntercomCommunicationsParameters left, IntercomCommunicationsParameters right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._recordType
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 4;  // this._recordSpecificField
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of intercom parameters record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordType")]
+        public ushort RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length of record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This is a placeholder.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordSpecificField")]
+        public uint RecordSpecificField
+        {
+            get
+            {
+                return this._recordSpecificField;
+            }
+
+            set
+            {
+                this._recordSpecificField = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._recordType);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedInt((uint)this._recordSpecificField);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedShort();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._recordSpecificField = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IntercomCommunicationsParameters>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"ushort\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<recordSpecificField type=\"uint\">" + this._recordSpecificField.ToString(CultureInfo.InvariantCulture) + "</recordSpecificField>");
+                sb.AppendLine("</IntercomCommunicationsParameters>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IntercomCommunicationsParameters;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IntercomCommunicationsParameters obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSpecificField != obj._recordSpecificField)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._recordSpecificField.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IntercomIdentifier.cs b/Libs/CSharpDis7/IntercomIdentifier.cs
new file mode 100644
index 0000000..68a1a3b
--- /dev/null
+++ b/Libs/CSharpDis7/IntercomIdentifier.cs
@@ -0,0 +1,349 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Unique designation of an attached or unattached intercom in an event or exercirse. Section 6.2.48
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class IntercomIdentifier
+    {
+        private ushort _siteNumber;
+
+        private ushort _applicationNumber;
+
+        private ushort _referenceNumber;
+
+        private ushort _intercomNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomIdentifier"/> class.
+        /// </summary>
+        public IntercomIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IntercomIdentifier left, IntercomIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IntercomIdentifier left, IntercomIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._siteNumber
+            marshalSize += 2;  // this._applicationNumber
+            marshalSize += 2;  // this._referenceNumber
+            marshalSize += 2;  // this._intercomNumber
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "siteNumber")]
+        public ushort SiteNumber
+        {
+            get
+            {
+                return this._siteNumber;
+            }
+
+            set
+            {
+                this._siteNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "applicationNumber")]
+        public ushort ApplicationNumber
+        {
+            get
+            {
+                return this._applicationNumber;
+            }
+
+            set
+            {
+                this._applicationNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
+        public ushort ReferenceNumber
+        {
+            get
+            {
+                return this._referenceNumber;
+            }
+
+            set
+            {
+                this._referenceNumber = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "intercomNumber")]
+        public ushort IntercomNumber
+        {
+            get
+            {
+                return this._intercomNumber;
+            }
+
+            set
+            {
+                this._intercomNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._siteNumber);
+                    dos.WriteUnsignedShort((ushort)this._applicationNumber);
+                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
+                    dos.WriteUnsignedShort((ushort)this._intercomNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._siteNumber = dis.ReadUnsignedShort();
+                    this._applicationNumber = dis.ReadUnsignedShort();
+                    this._referenceNumber = dis.ReadUnsignedShort();
+                    this._intercomNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IntercomIdentifier>");
+            try
+            {
+                sb.AppendLine("<siteNumber type=\"ushort\">" + this._siteNumber.ToString(CultureInfo.InvariantCulture) + "</siteNumber>");
+                sb.AppendLine("<applicationNumber type=\"ushort\">" + this._applicationNumber.ToString(CultureInfo.InvariantCulture) + "</applicationNumber>");
+                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
+                sb.AppendLine("<intercomNumber type=\"ushort\">" + this._intercomNumber.ToString(CultureInfo.InvariantCulture) + "</intercomNumber>");
+                sb.AppendLine("</IntercomIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IntercomIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IntercomIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._siteNumber != obj._siteNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._applicationNumber != obj._applicationNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._referenceNumber != obj._referenceNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._intercomNumber != obj._intercomNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._siteNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._applicationNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._intercomNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IntercomSignalPdu.cs b/Libs/CSharpDis7/IntercomSignalPdu.cs
new file mode 100644
index 0000000..e4e952e
--- /dev/null
+++ b/Libs/CSharpDis7/IntercomSignalPdu.cs
@@ -0,0 +1,525 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Actual transmission of intercome voice data. Section 7.7.5. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(OneByteChunk))]
+    public partial class IntercomSignalPdu : RadioCommunicationsFamilyPdu, IEquatable<IntercomSignalPdu>
+    {
+        /// <summary>
+        /// entity ID
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// ID of communications device
+        /// </summary>
+        private ushort _communicationsDeviceID;
+
+        /// <summary>
+        /// encoding scheme
+        /// </summary>
+        private ushort _encodingScheme;
+
+        /// <summary>
+        /// tactical data link type
+        /// </summary>
+        private ushort _tdlType;
+
+        /// <summary>
+        /// sample rate
+        /// </summary>
+        private uint _sampleRate;
+
+        /// <summary>
+        /// data length
+        /// </summary>
+        private ushort _dataLength;
+
+        /// <summary>
+        /// samples
+        /// </summary>
+        private ushort _samples;
+
+        /// <summary>
+        /// data bytes
+        /// </summary>
+        private byte[] _data; 
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntercomSignalPdu"/> class.
+        /// </summary>
+        public IntercomSignalPdu()
+        {
+            PduType = (byte)31;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IntercomSignalPdu left, IntercomSignalPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IntercomSignalPdu left, IntercomSignalPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 2;  // this._communicationsDeviceID
+            marshalSize += 2;  // this._encodingScheme
+            marshalSize += 2;  // this._tdlType
+            marshalSize += 4;  // this._sampleRate
+            marshalSize += 2;  // this._dataLength
+            marshalSize += 2;  // this._samples
+            marshalSize += this._data.Length;
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of communications device
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "communicationsDeviceID")]
+        public ushort CommunicationsDeviceID
+        {
+            get
+            {
+                return this._communicationsDeviceID;
+            }
+
+            set
+            {
+                this._communicationsDeviceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding scheme
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "encodingScheme")]
+        public ushort EncodingScheme
+        {
+            get
+            {
+                return this._encodingScheme;
+            }
+
+            set
+            {
+                this._encodingScheme = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tactical data link type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "tdlType")]
+        public ushort TdlType
+        {
+            get
+            {
+                return this._tdlType;
+            }
+
+            set
+            {
+                this._tdlType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the sample rate
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "sampleRate")]
+        public uint SampleRate
+        {
+            get
+            {
+                return this._sampleRate;
+            }
+
+            set
+            {
+                this._sampleRate = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getdataLength method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "dataLength")]
+        public ushort DataLength
+        {
+            get
+            {
+                return this._dataLength;
+            }
+
+            set
+            {
+                this._dataLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the samples
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "samples")]
+        public ushort Samples
+        {
+            get
+            {
+                return this._samples;
+            }
+
+            set
+            {
+                this._samples = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the data bytes
+        /// </summary>
+        [XmlElement(ElementName = "dataList", DataType = "hexBinary")]
+        public byte[] Data
+        {
+            get
+            {
+                return this._data;
+            }
+
+            set
+            {
+                this._data = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._communicationsDeviceID);
+                    dos.WriteUnsignedShort((ushort)this._encodingScheme);
+                    dos.WriteUnsignedShort((ushort)this._tdlType);
+                    dos.WriteUnsignedInt((uint)this._sampleRate);
+                    dos.WriteUnsignedShort((ushort)this._data.Length);
+                    dos.WriteUnsignedShort((ushort)this._samples);
+                    dos.WriteByte (this._data);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._communicationsDeviceID = dis.ReadUnsignedShort();
+                    this._encodingScheme = dis.ReadUnsignedShort();
+                    this._tdlType = dis.ReadUnsignedShort();
+                    this._sampleRate = dis.ReadUnsignedInt();
+                    this._dataLength = dis.ReadUnsignedShort();
+                    this._samples = dis.ReadUnsignedShort();
+                    this._data = dis.ReadByteArray(this._dataLength);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IntercomSignalPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<communicationsDeviceID type=\"ushort\">" + this._communicationsDeviceID.ToString(CultureInfo.InvariantCulture) + "</communicationsDeviceID>");
+                sb.AppendLine("<encodingScheme type=\"ushort\">" + this._encodingScheme.ToString(CultureInfo.InvariantCulture) + "</encodingScheme>");
+                sb.AppendLine("<tdlType type=\"ushort\">" + this._tdlType.ToString(CultureInfo.InvariantCulture) + "</tdlType>");
+                sb.AppendLine("<sampleRate type=\"uint\">" + this._sampleRate.ToString(CultureInfo.InvariantCulture) + "</sampleRate>");
+                sb.AppendLine("<data type=\"ushort\">" + this._data.Length.ToString(CultureInfo.InvariantCulture) + "</data>");
+                sb.AppendLine("<samples type=\"ushort\">" + this._samples.ToString(CultureInfo.InvariantCulture) + "</samples>");
+                sb.AppendLine("<data type=\"byte[]\">");
+                foreach (byte b in this._data)
+                {
+                    sb.Append(b.ToString("X2", CultureInfo.InvariantCulture));
+                }
+
+                sb.AppendLine("</data>");
+
+                sb.AppendLine("</IntercomSignalPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IntercomSignalPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IntercomSignalPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._communicationsDeviceID != obj._communicationsDeviceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._encodingScheme != obj._encodingScheme)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._tdlType != obj._tdlType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sampleRate != obj._sampleRate)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._dataLength != obj._dataLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._samples != obj._samples)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._data.Equals(obj._data))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._communicationsDeviceID.GetHashCode();
+            result = GenerateHash(result) ^ this._encodingScheme.GetHashCode();
+            result = GenerateHash(result) ^ this._tdlType.GetHashCode();
+            result = GenerateHash(result) ^ this._sampleRate.GetHashCode();
+            result = GenerateHash(result) ^ this._dataLength.GetHashCode();
+            result = GenerateHash(result) ^ this._samples.GetHashCode();
+
+            if (this._data.Length > 0)
+            {
+                for (int idx = 0; idx < this._data.Length; idx++)
+                {
+                    result = GenerateHash(result) ^ this._data[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/IsPartOfPdu.cs b/Libs/CSharpDis7/IsPartOfPdu.cs
new file mode 100644
index 0000000..de30790
--- /dev/null
+++ b/Libs/CSharpDis7/IsPartOfPdu.cs
@@ -0,0 +1,458 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  The joining of two or more simulation entities is communicated by this PDU. Section 7.8.5 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(Relationship))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(NamedLocationIdentification))]
+    [XmlInclude(typeof(EntityType))]
+    public partial class IsPartOfPdu : EntityManagementFamilyPdu, IEquatable<IsPartOfPdu>
+    {
+        /// <summary>
+        /// ID of entity originating PDU
+        /// </summary>
+        private EntityID _orginatingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of entity receiving PDU
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// relationship of joined parts
+        /// </summary>
+        private Relationship _relationship = new Relationship();
+
+        /// <summary>
+        /// location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
+        /// </summary>
+        private Vector3Float _partLocation = new Vector3Float();
+
+        /// <summary>
+        /// named location
+        /// </summary>
+        private NamedLocationIdentification _namedLocationID = new NamedLocationIdentification();
+
+        /// <summary>
+        /// entity type
+        /// </summary>
+        private EntityType _partEntityType = new EntityType();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IsPartOfPdu"/> class.
+        /// </summary>
+        public IsPartOfPdu()
+        {
+            PduType = (byte)36;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(IsPartOfPdu left, IsPartOfPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(IsPartOfPdu left, IsPartOfPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._relationship.GetMarshalledSize();  // this._relationship
+            marshalSize += this._partLocation.GetMarshalledSize();  // this._partLocation
+            marshalSize += this._namedLocationID.GetMarshalledSize();  // this._namedLocationID
+            marshalSize += this._partEntityType.GetMarshalledSize();  // this._partEntityType
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity originating PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
+        public EntityID OrginatingEntityID
+        {
+            get
+            {
+                return this._orginatingEntityID;
+            }
+
+            set
+            {
+                this._orginatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of entity receiving PDU
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the relationship of joined parts
+        /// </summary>
+        [XmlElement(Type = typeof(Relationship), ElementName = "relationship")]
+        public Relationship Relationship
+        {
+            get
+            {
+                return this._relationship;
+            }
+
+            set
+            {
+                this._relationship = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Float), ElementName = "partLocation")]
+        public Vector3Float PartLocation
+        {
+            get
+            {
+                return this._partLocation;
+            }
+
+            set
+            {
+                this._partLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the named location
+        /// </summary>
+        [XmlElement(Type = typeof(NamedLocationIdentification), ElementName = "namedLocationID")]
+        public NamedLocationIdentification NamedLocationID
+        {
+            get
+            {
+                return this._namedLocationID;
+            }
+
+            set
+            {
+                this._namedLocationID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the entity type
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "partEntityType")]
+        public EntityType PartEntityType
+        {
+            get
+            {
+                return this._partEntityType;
+            }
+
+            set
+            {
+                this._partEntityType = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Marshal(dos);
+                    this._receivingEntityID.Marshal(dos);
+                    this._relationship.Marshal(dos);
+                    this._partLocation.Marshal(dos);
+                    this._namedLocationID.Marshal(dos);
+                    this._partEntityType.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Unmarshal(dis);
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._relationship.Unmarshal(dis);
+                    this._partLocation.Unmarshal(dis);
+                    this._namedLocationID.Unmarshal(dis);
+                    this._partEntityType.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<IsPartOfPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<orginatingEntityID>");
+                this._orginatingEntityID.Reflection(sb);
+                sb.AppendLine("</orginatingEntityID>");
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<relationship>");
+                this._relationship.Reflection(sb);
+                sb.AppendLine("</relationship>");
+                sb.AppendLine("<partLocation>");
+                this._partLocation.Reflection(sb);
+                sb.AppendLine("</partLocation>");
+                sb.AppendLine("<namedLocationID>");
+                this._namedLocationID.Reflection(sb);
+                sb.AppendLine("</namedLocationID>");
+                sb.AppendLine("<partEntityType>");
+                this._partEntityType.Reflection(sb);
+                sb.AppendLine("</partEntityType>");
+                sb.AppendLine("</IsPartOfPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as IsPartOfPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(IsPartOfPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._relationship.Equals(obj._relationship))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._partLocation.Equals(obj._partLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._namedLocationID.Equals(obj._namedLocationID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._partEntityType.Equals(obj._partEntityType))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._relationship.GetHashCode();
+            result = GenerateHash(result) ^ this._partLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._namedLocationID.GetHashCode();
+            result = GenerateHash(result) ^ this._partEntityType.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/JammingTechnique.cs b/Libs/CSharpDis7/JammingTechnique.cs
new file mode 100644
index 0000000..bed5994
--- /dev/null
+++ b/Libs/CSharpDis7/JammingTechnique.cs
@@ -0,0 +1,349 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Jamming technique. Section 6.2.50
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class JammingTechnique
+    {
+        private byte _kind;
+
+        private byte _category;
+
+        private byte _subcategory;
+
+        private byte _specific;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JammingTechnique"/> class.
+        /// </summary>
+        public JammingTechnique()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(JammingTechnique left, JammingTechnique right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(JammingTechnique left, JammingTechnique right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._kind
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "kind")]
+        public byte Kind
+        {
+            get
+            {
+                return this._kind;
+            }
+
+            set
+            {
+                this._kind = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._kind);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._kind = dis.ReadUnsignedByte();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<JammingTechnique>");
+            try
+            {
+                sb.AppendLine("<kind type=\"byte\">" + this._kind.ToString(CultureInfo.InvariantCulture) + "</kind>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("</JammingTechnique>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as JammingTechnique;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(JammingTechnique obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._kind != obj._kind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._kind.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LaunchedMunitionRecord.cs b/Libs/CSharpDis7/LaunchedMunitionRecord.cs
new file mode 100644
index 0000000..8bbb052
--- /dev/null
+++ b/Libs/CSharpDis7/LaunchedMunitionRecord.cs
@@ -0,0 +1,437 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Identity of a communications node. Section 6.2.51
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EventIdentifier))]
+    [XmlInclude(typeof(Vector3Double))]
+    public partial class LaunchedMunitionRecord
+    {
+        private EventIdentifier _fireEventID = new EventIdentifier();
+
+        private ushort _padding;
+
+        private EventIdentifier _firingEntityID = new EventIdentifier();
+
+        private ushort _padding2;
+
+        private EventIdentifier _targetEntityID = new EventIdentifier();
+
+        private ushort _padding3;
+
+        private Vector3Double _targetLocation = new Vector3Double();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LaunchedMunitionRecord"/> class.
+        /// </summary>
+        public LaunchedMunitionRecord()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LaunchedMunitionRecord left, LaunchedMunitionRecord right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LaunchedMunitionRecord left, LaunchedMunitionRecord right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._fireEventID.GetMarshalledSize();  // this._fireEventID
+            marshalSize += 2;  // this._padding
+            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
+            marshalSize += 2;  // this._padding2
+            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
+            marshalSize += 2;  // this._padding3
+            marshalSize += this._targetLocation.GetMarshalledSize();  // this._targetLocation
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "fireEventID")]
+        public EventIdentifier FireEventID
+        {
+            get
+            {
+                return this._fireEventID;
+            }
+
+            set
+            {
+                this._fireEventID = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "firingEntityID")]
+        public EventIdentifier FiringEntityID
+        {
+            get
+            {
+                return this._firingEntityID;
+            }
+
+            set
+            {
+                this._firingEntityID = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
+        public ushort Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "targetEntityID")]
+        public EventIdentifier TargetEntityID
+        {
+            get
+            {
+                return this._targetEntityID;
+            }
+
+            set
+            {
+                this._targetEntityID = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(ushort), ElementName = "padding3")]
+        public ushort Padding3
+        {
+            get
+            {
+                return this._padding3;
+            }
+
+            set
+            {
+                this._padding3 = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "targetLocation")]
+        public Vector3Double TargetLocation
+        {
+            get
+            {
+                return this._targetLocation;
+            }
+
+            set
+            {
+                this._targetLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._fireEventID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                    this._firingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding2);
+                    this._targetEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding3);
+                    this._targetLocation.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._fireEventID.Unmarshal(dis);
+                    this._padding = dis.ReadUnsignedShort();
+                    this._firingEntityID.Unmarshal(dis);
+                    this._padding2 = dis.ReadUnsignedShort();
+                    this._targetEntityID.Unmarshal(dis);
+                    this._padding3 = dis.ReadUnsignedShort();
+                    this._targetLocation.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LaunchedMunitionRecord>");
+            try
+            {
+                sb.AppendLine("<fireEventID>");
+                this._fireEventID.Reflection(sb);
+                sb.AppendLine("</fireEventID>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("<firingEntityID>");
+                this._firingEntityID.Reflection(sb);
+                sb.AppendLine("</firingEntityID>");
+                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<targetEntityID>");
+                this._targetEntityID.Reflection(sb);
+                sb.AppendLine("</targetEntityID>");
+                sb.AppendLine("<padding3 type=\"ushort\">" + this._padding3.ToString(CultureInfo.InvariantCulture) + "</padding3>");
+                sb.AppendLine("<targetLocation>");
+                this._targetLocation.Reflection(sb);
+                sb.AppendLine("</targetLocation>");
+                sb.AppendLine("</LaunchedMunitionRecord>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LaunchedMunitionRecord;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LaunchedMunitionRecord obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._fireEventID.Equals(obj._fireEventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._firingEntityID.Equals(obj._firingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetEntityID.Equals(obj._targetEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding3 != obj._padding3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetLocation.Equals(obj._targetLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._fireEventID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding3.GetHashCode();
+            result = GenerateHash(result) ^ this._targetLocation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LayerHeader.cs b/Libs/CSharpDis7/LayerHeader.cs
new file mode 100644
index 0000000..aedfeaf
--- /dev/null
+++ b/Libs/CSharpDis7/LayerHeader.cs
@@ -0,0 +1,335 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The identification of the additional information layer number, layer-specific information, and the length of the layer. Section 6.2.52
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class LayerHeader
+    {
+        private byte _layerNumber;
+
+        /// <summary>
+        /// field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number.
+        /// </summary>
+        private byte _layerSpecificInformation;
+
+        /// <summary>
+        /// This field shall specify the length in octets of the layer, including the Layer Header record
+        /// </summary>
+        private ushort _length;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LayerHeader"/> class.
+        /// </summary>
+        public LayerHeader()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LayerHeader left, LayerHeader right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LayerHeader left, LayerHeader right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._layerNumber
+            marshalSize += 1;  // this._layerSpecificInformation
+            marshalSize += 2;  // this._length
+            return marshalSize;
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "layerNumber")]
+        public byte LayerNumber
+        {
+            get
+            {
+                return this._layerNumber;
+            }
+
+            set
+            {
+                this._layerNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "layerSpecificInformation")]
+        public byte LayerSpecificInformation
+        {
+            get
+            {
+                return this._layerSpecificInformation;
+            }
+
+            set
+            {
+                this._layerSpecificInformation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the length in octets of the layer, including the Layer Header record
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "length")]
+        public ushort Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._layerNumber);
+                    dos.WriteUnsignedByte((byte)this._layerSpecificInformation);
+                    dos.WriteUnsignedShort((ushort)this._length);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._layerNumber = dis.ReadUnsignedByte();
+                    this._layerSpecificInformation = dis.ReadUnsignedByte();
+                    this._length = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LayerHeader>");
+            try
+            {
+                sb.AppendLine("<layerNumber type=\"byte\">" + this._layerNumber.ToString(CultureInfo.InvariantCulture) + "</layerNumber>");
+                sb.AppendLine("<layerSpecificInformation type=\"byte\">" + this._layerSpecificInformation.ToString(CultureInfo.InvariantCulture) + "</layerSpecificInformation>");
+                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("</LayerHeader>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LayerHeader;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LayerHeader obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._layerNumber != obj._layerNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._layerSpecificInformation != obj._layerSpecificInformation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._layerNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._layerSpecificInformation.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LinearObjectStatePdu.cs b/Libs/CSharpDis7/LinearObjectStatePdu.cs
new file mode 100644
index 0000000..d73ebc9
--- /dev/null
+++ b/Libs/CSharpDis7/LinearObjectStatePdu.cs
@@ -0,0 +1,589 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// : Information abut the addition or modification of a synthecic enviroment object that      is anchored to the terrain with a single point and has size or orientation. Section 7.10.5 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SimulationAddress))]
+    [XmlInclude(typeof(ObjectType))]
+    [XmlInclude(typeof(LinearSegmentParameter))]
+    public partial class LinearObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<LinearObjectStatePdu>
+    {
+        /// <summary>
+        /// Object in synthetic environment
+        /// </summary>
+        private EntityID _objectID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _referencedObjectID = new EntityID();
+
+        /// <summary>
+        /// unique update number of each state transition of an object
+        /// </summary>
+        private ushort _updateNumber;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// number of linear segment parameters
+        /// </summary>
+        private byte _numberOfSegments;
+
+        /// <summary>
+        /// requesterID
+        /// </summary>
+        private SimulationAddress _requesterID = new SimulationAddress();
+
+        /// <summary>
+        /// receiver ID
+        /// </summary>
+        private SimulationAddress _receivingID = new SimulationAddress();
+
+        /// <summary>
+        /// Object type
+        /// </summary>
+        private ObjectType _objectType = new ObjectType();
+
+        /// <summary>
+        /// Linear segment parameters
+        /// </summary>
+        private List<LinearSegmentParameter> _linearSegmentParameters = new List<LinearSegmentParameter>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinearObjectStatePdu"/> class.
+        /// </summary>
+        public LinearObjectStatePdu()
+        {
+            PduType = (byte)44;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LinearObjectStatePdu left, LinearObjectStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LinearObjectStatePdu left, LinearObjectStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
+            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
+            marshalSize += 2;  // this._updateNumber
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._numberOfSegments
+            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
+            for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+            {
+                LinearSegmentParameter listElement = (LinearSegmentParameter)this._linearSegmentParameters[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object in synthetic environment
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
+        public EntityID ObjectID
+        {
+            get
+            {
+                return this._objectID;
+            }
+
+            set
+            {
+                this._objectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
+        public EntityID ReferencedObjectID
+        {
+            get
+            {
+                return this._referencedObjectID;
+            }
+
+            set
+            {
+                this._referencedObjectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique update number of each state transition of an object
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
+        public ushort UpdateNumber
+        {
+            get
+            {
+                return this._updateNumber;
+            }
+
+            set
+            {
+                this._updateNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSegments method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSegments")]
+        public byte NumberOfSegments
+        {
+            get
+            {
+                return this._numberOfSegments;
+            }
+
+            set
+            {
+                this._numberOfSegments = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the requesterID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
+        public SimulationAddress RequesterID
+        {
+            get
+            {
+                return this._requesterID;
+            }
+
+            set
+            {
+                this._requesterID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receiver ID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
+        public SimulationAddress ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object type
+        /// </summary>
+        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
+        public ObjectType ObjectType
+        {
+            get
+            {
+                return this._objectType;
+            }
+
+            set
+            {
+                this._objectType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Linear segment parameters
+        /// </summary>
+        [XmlElement(ElementName = "linearSegmentParametersList", Type = typeof(List<LinearSegmentParameter>))]
+        public List<LinearSegmentParameter> LinearSegmentParameters
+        {
+            get
+            {
+                return this._linearSegmentParameters;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._objectID.Marshal(dos);
+                    this._referencedObjectID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._updateNumber);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._linearSegmentParameters.Count);
+                    this._requesterID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    this._objectType.Marshal(dos);
+
+                    for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                    {
+                        LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
+                        aLinearSegmentParameter.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._objectID.Unmarshal(dis);
+                    this._referencedObjectID.Unmarshal(dis);
+                    this._updateNumber = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._numberOfSegments = dis.ReadUnsignedByte();
+                    this._requesterID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._objectType.Unmarshal(dis);
+                    for (int idx = 0; idx < this.NumberOfSegments; idx++)
+                    {
+                        LinearSegmentParameter anX = new LinearSegmentParameter();
+                        anX.Unmarshal(dis);
+                        this._linearSegmentParameters.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LinearObjectStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<objectID>");
+                this._objectID.Reflection(sb);
+                sb.AppendLine("</objectID>");
+                sb.AppendLine("<referencedObjectID>");
+                this._referencedObjectID.Reflection(sb);
+                sb.AppendLine("</referencedObjectID>");
+                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<linearSegmentParameters type=\"byte\">" + this._linearSegmentParameters.Count.ToString(CultureInfo.InvariantCulture) + "</linearSegmentParameters>");
+                sb.AppendLine("<requesterID>");
+                this._requesterID.Reflection(sb);
+                sb.AppendLine("</requesterID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<objectType>");
+                this._objectType.Reflection(sb);
+                sb.AppendLine("</objectType>");
+                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                {
+                    sb.AppendLine("<linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"LinearSegmentParameter\">");
+                    LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)this._linearSegmentParameters[idx];
+                    aLinearSegmentParameter.Reflection(sb);
+                    sb.AppendLine("</linearSegmentParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</LinearObjectStatePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LinearObjectStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LinearObjectStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._objectID.Equals(obj._objectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._updateNumber != obj._updateNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSegments != obj._numberOfSegments)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requesterID.Equals(obj._requesterID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectType.Equals(obj._objectType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._linearSegmentParameters.Count != obj._linearSegmentParameters.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                {
+                    if (!this._linearSegmentParameters[idx].Equals(obj._linearSegmentParameters[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._objectID.GetHashCode();
+            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
+            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSegments.GetHashCode();
+            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._objectType.GetHashCode();
+
+            if (this._linearSegmentParameters.Count > 0)
+            {
+                for (int idx = 0; idx < this._linearSegmentParameters.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._linearSegmentParameters[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LinearSegmentParameter.cs b/Libs/CSharpDis7/LinearSegmentParameter.cs
new file mode 100644
index 0000000..7e037b5
--- /dev/null
+++ b/Libs/CSharpDis7/LinearSegmentParameter.cs
@@ -0,0 +1,571 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The specification of an individual segment of a linear segment synthetic environment object in a Linear Object State PDU Section 6.2.53
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(EulerAngles))]
+    public partial class LinearSegmentParameter
+    {
+        /// <summary>
+        /// the individual segment of the linear segment 
+        /// </summary>
+        private byte _segmentNumber;
+
+        /// <summary>
+        ///  whether a modification has been made to the point object’s location or orientation
+        /// </summary>
+        private byte _segmentModification;
+
+        /// <summary>
+        /// general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010.
+        /// </summary>
+        private ushort _generalSegmentAppearance;
+
+        /// <summary>
+        /// This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations.
+        /// </summary>
+        private ushort _specificSegmentAppearance;
+
+        /// <summary>
+        /// This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record 
+        /// </summary>
+        private Vector3Double _segmentLocation = new Vector3Double();
+
+        /// <summary>
+        /// orientation of the linear segment about the segment location and shall be represented by a Euler Angles record 
+        /// </summary>
+        private EulerAngles _segmentOrientation = new EulerAngles();
+
+        /// <summary>
+        /// length of the linear segment, in meters, extending in the positive X direction
+        /// </summary>
+        private ushort _segmentLength;
+
+        /// <summary>
+        /// The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction.
+        /// </summary>
+        private ushort _segmentWidth;
+
+        /// <summary>
+        /// The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer.
+        /// </summary>
+        private ushort _segmentHeight;
+
+        /// <summary>
+        /// The depth of the linear segment, in meters, below ground level 
+        /// </summary>
+        private ushort _segmentDepth;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinearSegmentParameter"/> class.
+        /// </summary>
+        public LinearSegmentParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LinearSegmentParameter left, LinearSegmentParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LinearSegmentParameter left, LinearSegmentParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._segmentNumber
+            marshalSize += 1;  // this._segmentModification
+            marshalSize += 2;  // this._generalSegmentAppearance
+            marshalSize += 2;  // this._specificSegmentAppearance
+            marshalSize += this._segmentLocation.GetMarshalledSize();  // this._segmentLocation
+            marshalSize += this._segmentOrientation.GetMarshalledSize();  // this._segmentOrientation
+            marshalSize += 2;  // this._segmentLength
+            marshalSize += 2;  // this._segmentWidth
+            marshalSize += 2;  // this._segmentHeight
+            marshalSize += 2;  // this._segmentDepth
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the individual segment of the linear segment 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "segmentNumber")]
+        public byte SegmentNumber
+        {
+            get
+            {
+                return this._segmentNumber;
+            }
+
+            set
+            {
+                this._segmentNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  whether a modification has been made to the point object’s location or orientation
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "segmentModification")]
+        public byte SegmentModification
+        {
+            get
+            {
+                return this._segmentModification;
+            }
+
+            set
+            {
+                this._segmentModification = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "generalSegmentAppearance")]
+        public ushort GeneralSegmentAppearance
+        {
+            get
+            {
+                return this._generalSegmentAppearance;
+            }
+
+            set
+            {
+                this._generalSegmentAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "specificSegmentAppearance")]
+        public ushort SpecificSegmentAppearance
+        {
+            get
+            {
+                return this._specificSegmentAppearance;
+            }
+
+            set
+            {
+                this._specificSegmentAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record 
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "segmentLocation")]
+        public Vector3Double SegmentLocation
+        {
+            get
+            {
+                return this._segmentLocation;
+            }
+
+            set
+            {
+                this._segmentLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the orientation of the linear segment about the segment location and shall be represented by a Euler Angles record 
+        /// </summary>
+        [XmlElement(Type = typeof(EulerAngles), ElementName = "segmentOrientation")]
+        public EulerAngles SegmentOrientation
+        {
+            get
+            {
+                return this._segmentOrientation;
+            }
+
+            set
+            {
+                this._segmentOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length of the linear segment, in meters, extending in the positive X direction
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentLength")]
+        public ushort SegmentLength
+        {
+            get
+            {
+                return this._segmentLength;
+            }
+
+            set
+            {
+                this._segmentLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentWidth")]
+        public ushort SegmentWidth
+        {
+            get
+            {
+                return this._segmentWidth;
+            }
+
+            set
+            {
+                this._segmentWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentHeight")]
+        public ushort SegmentHeight
+        {
+            get
+            {
+                return this._segmentHeight;
+            }
+
+            set
+            {
+                this._segmentHeight = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The depth of the linear segment, in meters, below ground level 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "segmentDepth")]
+        public ushort SegmentDepth
+        {
+            get
+            {
+                return this._segmentDepth;
+            }
+
+            set
+            {
+                this._segmentDepth = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._segmentNumber);
+                    dos.WriteUnsignedByte((byte)this._segmentModification);
+                    dos.WriteUnsignedShort((ushort)this._generalSegmentAppearance);
+                    dos.WriteUnsignedShort((ushort)this._specificSegmentAppearance);
+                    this._segmentLocation.Marshal(dos);
+                    this._segmentOrientation.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._segmentLength);
+                    dos.WriteUnsignedShort((ushort)this._segmentWidth);
+                    dos.WriteUnsignedShort((ushort)this._segmentHeight);
+                    dos.WriteUnsignedShort((ushort)this._segmentDepth);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._segmentNumber = dis.ReadUnsignedByte();
+                    this._segmentModification = dis.ReadUnsignedByte();
+                    this._generalSegmentAppearance = dis.ReadUnsignedShort();
+                    this._specificSegmentAppearance = dis.ReadUnsignedShort();
+                    this._segmentLocation.Unmarshal(dis);
+                    this._segmentOrientation.Unmarshal(dis);
+                    this._segmentLength = dis.ReadUnsignedShort();
+                    this._segmentWidth = dis.ReadUnsignedShort();
+                    this._segmentHeight = dis.ReadUnsignedShort();
+                    this._segmentDepth = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LinearSegmentParameter>");
+            try
+            {
+                sb.AppendLine("<segmentNumber type=\"byte\">" + this._segmentNumber.ToString(CultureInfo.InvariantCulture) + "</segmentNumber>");
+                sb.AppendLine("<segmentModification type=\"byte\">" + this._segmentModification.ToString(CultureInfo.InvariantCulture) + "</segmentModification>");
+                sb.AppendLine("<generalSegmentAppearance type=\"ushort\">" + this._generalSegmentAppearance.ToString(CultureInfo.InvariantCulture) + "</generalSegmentAppearance>");
+                sb.AppendLine("<specificSegmentAppearance type=\"ushort\">" + this._specificSegmentAppearance.ToString(CultureInfo.InvariantCulture) + "</specificSegmentAppearance>");
+                sb.AppendLine("<segmentLocation>");
+                this._segmentLocation.Reflection(sb);
+                sb.AppendLine("</segmentLocation>");
+                sb.AppendLine("<segmentOrientation>");
+                this._segmentOrientation.Reflection(sb);
+                sb.AppendLine("</segmentOrientation>");
+                sb.AppendLine("<segmentLength type=\"ushort\">" + this._segmentLength.ToString(CultureInfo.InvariantCulture) + "</segmentLength>");
+                sb.AppendLine("<segmentWidth type=\"ushort\">" + this._segmentWidth.ToString(CultureInfo.InvariantCulture) + "</segmentWidth>");
+                sb.AppendLine("<segmentHeight type=\"ushort\">" + this._segmentHeight.ToString(CultureInfo.InvariantCulture) + "</segmentHeight>");
+                sb.AppendLine("<segmentDepth type=\"ushort\">" + this._segmentDepth.ToString(CultureInfo.InvariantCulture) + "</segmentDepth>");
+                sb.AppendLine("</LinearSegmentParameter>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LinearSegmentParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LinearSegmentParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._segmentNumber != obj._segmentNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentModification != obj._segmentModification)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._generalSegmentAppearance != obj._generalSegmentAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specificSegmentAppearance != obj._specificSegmentAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._segmentLocation.Equals(obj._segmentLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._segmentOrientation.Equals(obj._segmentOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentLength != obj._segmentLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentWidth != obj._segmentWidth)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentHeight != obj._segmentHeight)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._segmentDepth != obj._segmentDepth)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._segmentNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentModification.GetHashCode();
+            result = GenerateHash(result) ^ this._generalSegmentAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._specificSegmentAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentLength.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentWidth.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentHeight.GetHashCode();
+            result = GenerateHash(result) ^ this._segmentDepth.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LiveEntityIdentifier.cs b/Libs/CSharpDis7/LiveEntityIdentifier.cs
new file mode 100644
index 0000000..0e93889
--- /dev/null
+++ b/Libs/CSharpDis7/LiveEntityIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of each entity in an event or exercise that is contained in a Live Entity PDU. Section 6.2.54 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(LiveSimulationAddress))]
+    public partial class LiveEntityIdentifier
+    {
+        /// <summary>
+        /// Live Simulation Address record (see 6.2.55) 
+        /// </summary>
+        private LiveSimulationAddress _liveSimulationAddress = new LiveSimulationAddress();
+
+        /// <summary>
+        /// Live entity number 
+        /// </summary>
+        private ushort _entityNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LiveEntityIdentifier"/> class.
+        /// </summary>
+        public LiveEntityIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LiveEntityIdentifier left, LiveEntityIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LiveEntityIdentifier left, LiveEntityIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._liveSimulationAddress.GetMarshalledSize();  // this._liveSimulationAddress
+            marshalSize += 2;  // this._entityNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Live Simulation Address record (see 6.2.55) 
+        /// </summary>
+        [XmlElement(Type = typeof(LiveSimulationAddress), ElementName = "liveSimulationAddress")]
+        public LiveSimulationAddress LiveSimulationAddress
+        {
+            get
+            {
+                return this._liveSimulationAddress;
+            }
+
+            set
+            {
+                this._liveSimulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Live entity number 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "entityNumber")]
+        public ushort EntityNumber
+        {
+            get
+            {
+                return this._entityNumber;
+            }
+
+            set
+            {
+                this._entityNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._liveSimulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._entityNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._liveSimulationAddress.Unmarshal(dis);
+                    this._entityNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LiveEntityIdentifier>");
+            try
+            {
+                sb.AppendLine("<liveSimulationAddress>");
+                this._liveSimulationAddress.Reflection(sb);
+                sb.AppendLine("</liveSimulationAddress>");
+                sb.AppendLine("<entityNumber type=\"ushort\">" + this._entityNumber.ToString(CultureInfo.InvariantCulture) + "</entityNumber>");
+                sb.AppendLine("</LiveEntityIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LiveEntityIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LiveEntityIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._liveSimulationAddress.Equals(obj._liveSimulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._entityNumber != obj._entityNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._liveSimulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._entityNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LiveEntityPdu.cs b/Libs/CSharpDis7/LiveEntityPdu.cs
new file mode 100644
index 0000000..3affe6b
--- /dev/null
+++ b/Libs/CSharpDis7/LiveEntityPdu.cs
@@ -0,0 +1,301 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The live entity PDUs have a header with some different field names, but the same length. Section 9.3.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class LiveEntityPdu : PduSuperclass, IEquatable<LiveEntityPdu>
+    {
+        /// <summary>
+        /// Subprotocol used to decode the PDU. Section 13 of EBV.
+        /// </summary>
+        private ushort _subprotocolNumber;
+
+        /// <summary>
+        /// zero-filled array of padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LiveEntityPdu"/> class.
+        /// </summary>
+        public LiveEntityPdu()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LiveEntityPdu left, LiveEntityPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LiveEntityPdu left, LiveEntityPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._subprotocolNumber
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Subprotocol used to decode the PDU. Section 13 of EBV.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "subprotocolNumber")]
+        public ushort SubprotocolNumber
+        {
+            get
+            {
+                return this._subprotocolNumber;
+            }
+
+            set
+            {
+                this._subprotocolNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the zero-filled array of padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._subprotocolNumber);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._subprotocolNumber = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LiveEntityPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<subprotocolNumber type=\"ushort\">" + this._subprotocolNumber.ToString(CultureInfo.InvariantCulture) + "</subprotocolNumber>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</LiveEntityPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LiveEntityPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LiveEntityPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._subprotocolNumber != obj._subprotocolNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._subprotocolNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LiveSimulationAddress.cs b/Libs/CSharpDis7/LiveSimulationAddress.cs
new file mode 100644
index 0000000..bde7892
--- /dev/null
+++ b/Libs/CSharpDis7/LiveSimulationAddress.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// A simulation's designation associated with all Live Entity IDs contained in Live Entity PDUs. Section 6.2.55 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class LiveSimulationAddress
+    {
+        /// <summary>
+        /// facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation.
+        /// </summary>
+        private byte _liveSiteNumber;
+
+        /// <summary>
+        /// An application associated with a live site is termed a live application. Each live application participating in an event 
+        /// </summary>
+        private ushort _liveApplicationNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LiveSimulationAddress"/> class.
+        /// </summary>
+        public LiveSimulationAddress()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LiveSimulationAddress left, LiveSimulationAddress right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LiveSimulationAddress left, LiveSimulationAddress right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._liveSiteNumber
+            marshalSize += 2;  // this._liveApplicationNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "liveSiteNumber")]
+        public byte LiveSiteNumber
+        {
+            get
+            {
+                return this._liveSiteNumber;
+            }
+
+            set
+            {
+                this._liveSiteNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the An application associated with a live site is termed a live application. Each live application participating in an event 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "liveApplicationNumber")]
+        public ushort LiveApplicationNumber
+        {
+            get
+            {
+                return this._liveApplicationNumber;
+            }
+
+            set
+            {
+                this._liveApplicationNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._liveSiteNumber);
+                    dos.WriteUnsignedShort((ushort)this._liveApplicationNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._liveSiteNumber = dis.ReadUnsignedByte();
+                    this._liveApplicationNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LiveSimulationAddress>");
+            try
+            {
+                sb.AppendLine("<liveSiteNumber type=\"byte\">" + this._liveSiteNumber.ToString(CultureInfo.InvariantCulture) + "</liveSiteNumber>");
+                sb.AppendLine("<liveApplicationNumber type=\"ushort\">" + this._liveApplicationNumber.ToString(CultureInfo.InvariantCulture) + "</liveApplicationNumber>");
+                sb.AppendLine("</LiveSimulationAddress>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LiveSimulationAddress;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LiveSimulationAddress obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._liveSiteNumber != obj._liveSiteNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._liveApplicationNumber != obj._liveApplicationNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._liveSiteNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._liveApplicationNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/LogisticsFamilyPdu.cs b/Libs/CSharpDis7/LogisticsFamilyPdu.cs
new file mode 100644
index 0000000..08d35a9
--- /dev/null
+++ b/Libs/CSharpDis7/LogisticsFamilyPdu.cs
@@ -0,0 +1,248 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Abstract superclass for logistics PDUs. Section 7.4 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class LogisticsFamilyPdu : Pdu, IEquatable<LogisticsFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogisticsFamilyPdu"/> class.
+        /// </summary>
+        public LogisticsFamilyPdu()
+        {
+            ProtocolFamily = (byte)3;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(LogisticsFamilyPdu left, LogisticsFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<LogisticsFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</LogisticsFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as LogisticsFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(LogisticsFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/MineEntityIdentifier.cs b/Libs/CSharpDis7/MineEntityIdentifier.cs
new file mode 100644
index 0000000..ed07d91
--- /dev/null
+++ b/Libs/CSharpDis7/MineEntityIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of a mine contained in the Minefield Data PDU. No espdus are issued for mine entities.  Section 6.2.56 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class MineEntityIdentifier
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private ushort _mineEntityNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MineEntityIdentifier"/> class.
+        /// </summary>
+        public MineEntityIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MineEntityIdentifier left, MineEntityIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MineEntityIdentifier left, MineEntityIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._mineEntityNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the 
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "mineEntityNumber")]
+        public ushort MineEntityNumber
+        {
+            get
+            {
+                return this._mineEntityNumber;
+            }
+
+            set
+            {
+                this._mineEntityNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._mineEntityNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._mineEntityNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MineEntityIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<mineEntityNumber type=\"ushort\">" + this._mineEntityNumber.ToString(CultureInfo.InvariantCulture) + "</mineEntityNumber>");
+                sb.AppendLine("</MineEntityIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MineEntityIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MineEntityIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._mineEntityNumber != obj._mineEntityNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._mineEntityNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/MinefieldFamilyPdu.cs b/Libs/CSharpDis7/MinefieldFamilyPdu.cs
new file mode 100644
index 0000000..222ae64
--- /dev/null
+++ b/Libs/CSharpDis7/MinefieldFamilyPdu.cs
@@ -0,0 +1,248 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Abstract superclass for PDUs relating to minefields. Section 7.9
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class MinefieldFamilyPdu : Pdu, IEquatable<MinefieldFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldFamilyPdu"/> class.
+        /// </summary>
+        public MinefieldFamilyPdu()
+        {
+            ProtocolFamily = (byte)8;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldFamilyPdu left, MinefieldFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</MinefieldFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/MinefieldIdentifier.cs b/Libs/CSharpDis7/MinefieldIdentifier.cs
new file mode 100644
index 0000000..31a9856
--- /dev/null
+++ b/Libs/CSharpDis7/MinefieldIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of a minefield Section 6.2.57 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class MinefieldIdentifier
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private ushort _minefieldNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldIdentifier"/> class.
+        /// </summary>
+        public MinefieldIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldIdentifier left, MinefieldIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldIdentifier left, MinefieldIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._minefieldNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the 
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "minefieldNumber")]
+        public ushort MinefieldNumber
+        {
+            get
+            {
+                return this._minefieldNumber;
+            }
+
+            set
+            {
+                this._minefieldNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._minefieldNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._minefieldNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<minefieldNumber type=\"ushort\">" + this._minefieldNumber.ToString(CultureInfo.InvariantCulture) + "</minefieldNumber>");
+                sb.AppendLine("</MinefieldIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._minefieldNumber != obj._minefieldNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/MinefieldResponseNackPdu.cs b/Libs/CSharpDis7/MinefieldResponseNackPdu.cs
new file mode 100644
index 0000000..0a3d64e
--- /dev/null
+++ b/Libs/CSharpDis7/MinefieldResponseNackPdu.cs
@@ -0,0 +1,453 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// proivde the means to request a retransmit of a minefield data pdu. Section 7.9.5 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EightByteChunk))]
+    public partial class MinefieldResponseNackPdu : MinefieldFamilyPdu, IEquatable<MinefieldResponseNackPdu>
+    {
+        /// <summary>
+        /// Minefield ID
+        /// </summary>
+        private EntityID _minefieldID = new EntityID();
+
+        /// <summary>
+        /// entity ID making the request
+        /// </summary>
+        private EntityID _requestingEntityID = new EntityID();
+
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private byte _requestID;
+
+        /// <summary>
+        /// how many pdus were missing
+        /// </summary>
+        private byte _numberOfMissingPdus;
+
+        /// <summary>
+        /// PDU sequence numbers that were missing
+        /// </summary>
+        private List<EightByteChunk> _missingPduSequenceNumbers = new List<EightByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldResponseNackPdu"/> class.
+        /// </summary>
+        public MinefieldResponseNackPdu()
+        {
+            PduType = (byte)40;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldResponseNackPdu left, MinefieldResponseNackPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
+            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
+            marshalSize += 1;  // this._requestID
+            marshalSize += 1;  // this._numberOfMissingPdus
+            for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+            {
+                EightByteChunk listElement = (EightByteChunk)this._missingPduSequenceNumbers[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "minefieldID")]
+        public EntityID MinefieldID
+        {
+            get
+            {
+                return this._minefieldID;
+            }
+
+            set
+            {
+                this._minefieldID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the entity ID making the request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
+        public EntityID RequestingEntityID
+        {
+            get
+            {
+                return this._requestingEntityID;
+            }
+
+            set
+            {
+                this._requestingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requestID")]
+        public byte RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfMissingPdus method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfMissingPdus")]
+        public byte NumberOfMissingPdus
+        {
+            get
+            {
+                return this._numberOfMissingPdus;
+            }
+
+            set
+            {
+                this._numberOfMissingPdus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the PDU sequence numbers that were missing
+        /// </summary>
+        [XmlElement(ElementName = "missingPduSequenceNumbersList", Type = typeof(List<EightByteChunk>))]
+        public List<EightByteChunk> MissingPduSequenceNumbers
+        {
+            get
+            {
+                return this._missingPduSequenceNumbers;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._minefieldID.Marshal(dos);
+                    this._requestingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._missingPduSequenceNumbers.Count);
+
+                    for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                    {
+                        EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
+                        aEightByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._minefieldID.Unmarshal(dis);
+                    this._requestingEntityID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedByte();
+                    this._numberOfMissingPdus = dis.ReadUnsignedByte();
+                    for (int idx = 0; idx < this.NumberOfMissingPdus; idx++)
+                    {
+                        EightByteChunk anX = new EightByteChunk();
+                        anX.Unmarshal(dis);
+                        this._missingPduSequenceNumbers.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldResponseNackPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<minefieldID>");
+                this._minefieldID.Reflection(sb);
+                sb.AppendLine("</minefieldID>");
+                sb.AppendLine("<requestingEntityID>");
+                this._requestingEntityID.Reflection(sb);
+                sb.AppendLine("</requestingEntityID>");
+                sb.AppendLine("<requestID type=\"byte\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<missingPduSequenceNumbers type=\"byte\">" + this._missingPduSequenceNumbers.Count.ToString(CultureInfo.InvariantCulture) + "</missingPduSequenceNumbers>");
+                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                {
+                    sb.AppendLine("<missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EightByteChunk\">");
+                    EightByteChunk aEightByteChunk = (EightByteChunk)this._missingPduSequenceNumbers[idx];
+                    aEightByteChunk.Reflection(sb);
+                    sb.AppendLine("</missingPduSequenceNumbers" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</MinefieldResponseNackPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldResponseNackPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldResponseNackPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._minefieldID.Equals(obj._minefieldID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfMissingPdus != obj._numberOfMissingPdus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._missingPduSequenceNumbers.Count != obj._missingPduSequenceNumbers.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                {
+                    if (!this._missingPduSequenceNumbers[idx].Equals(obj._missingPduSequenceNumbers[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfMissingPdus.GetHashCode();
+
+            if (this._missingPduSequenceNumbers.Count > 0)
+            {
+                for (int idx = 0; idx < this._missingPduSequenceNumbers.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._missingPduSequenceNumbers[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/MinefieldStatePdu.cs b/Libs/CSharpDis7/MinefieldStatePdu.cs
new file mode 100644
index 0000000..7ba480f
--- /dev/null
+++ b/Libs/CSharpDis7/MinefieldStatePdu.cs
@@ -0,0 +1,723 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// information about the complete minefield. The minefield presence, perimiter, etc. Section 7.9.2 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(MinefieldIdentifier))]
+    [XmlInclude(typeof(EntityType))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(EulerAngles))]
+    [XmlInclude(typeof(Vector2Float))]
+    [XmlInclude(typeof(EntityType))]
+    public partial class MinefieldStatePdu : MinefieldFamilyPdu, IEquatable<MinefieldStatePdu>
+    {
+        /// <summary>
+        /// Minefield ID
+        /// </summary>
+        private MinefieldIdentifier _minefieldID = new MinefieldIdentifier();
+
+        /// <summary>
+        /// Minefield sequence
+        /// </summary>
+        private ushort _minefieldSequence;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// Number of permieter points
+        /// </summary>
+        private byte _numberOfPerimeterPoints;
+
+        /// <summary>
+        /// type of minefield
+        /// </summary>
+        private EntityType _minefieldType = new EntityType();
+
+        /// <summary>
+        /// how many mine types
+        /// </summary>
+        private ushort _numberOfMineTypes;
+
+        /// <summary>
+        /// location of center of minefield in world coords
+        /// </summary>
+        private Vector3Double _minefieldLocation = new Vector3Double();
+
+        /// <summary>
+        /// orientation of minefield
+        /// </summary>
+        private EulerAngles _minefieldOrientation = new EulerAngles();
+
+        /// <summary>
+        /// appearance bitflags
+        /// </summary>
+        private ushort _appearance;
+
+        /// <summary>
+        /// protocolMode. First two bits are the protocol mode, 14 bits reserved.
+        /// </summary>
+        private ushort _protocolMode;
+
+        /// <summary>
+        /// perimeter points for the minefield
+        /// </summary>
+        private List<Vector2Float> _perimeterPoints = new List<Vector2Float>();
+
+        /// <summary>
+        /// Type of mines
+        /// </summary>
+        private List<EntityType> _mineType = new List<EntityType>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MinefieldStatePdu"/> class.
+        /// </summary>
+        public MinefieldStatePdu()
+        {
+            PduType = (byte)37;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MinefieldStatePdu left, MinefieldStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MinefieldStatePdu left, MinefieldStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._minefieldID.GetMarshalledSize();  // this._minefieldID
+            marshalSize += 2;  // this._minefieldSequence
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._numberOfPerimeterPoints
+            marshalSize += this._minefieldType.GetMarshalledSize();  // this._minefieldType
+            marshalSize += 2;  // this._numberOfMineTypes
+            marshalSize += this._minefieldLocation.GetMarshalledSize();  // this._minefieldLocation
+            marshalSize += this._minefieldOrientation.GetMarshalledSize();  // this._minefieldOrientation
+            marshalSize += 2;  // this._appearance
+            marshalSize += 2;  // this._protocolMode
+            for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+            {
+                Vector2Float listElement = (Vector2Float)this._perimeterPoints[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._mineType.Count; idx++)
+            {
+                EntityType listElement = (EntityType)this._mineType[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield ID
+        /// </summary>
+        [XmlElement(Type = typeof(MinefieldIdentifier), ElementName = "minefieldID")]
+        public MinefieldIdentifier MinefieldID
+        {
+            get
+            {
+                return this._minefieldID;
+            }
+
+            set
+            {
+                this._minefieldID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Minefield sequence
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "minefieldSequence")]
+        public ushort MinefieldSequence
+        {
+            get
+            {
+                return this._minefieldSequence;
+            }
+
+            set
+            {
+                this._minefieldSequence = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPerimeterPoints method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfPerimeterPoints")]
+        public byte NumberOfPerimeterPoints
+        {
+            get
+            {
+                return this._numberOfPerimeterPoints;
+            }
+
+            set
+            {
+                this._numberOfPerimeterPoints = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of minefield
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "minefieldType")]
+        public EntityType MinefieldType
+        {
+            get
+            {
+                return this._minefieldType;
+            }
+
+            set
+            {
+                this._minefieldType = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfMineTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfMineTypes")]
+        public ushort NumberOfMineTypes
+        {
+            get
+            {
+                return this._numberOfMineTypes;
+            }
+
+            set
+            {
+                this._numberOfMineTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of center of minefield in world coords
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "minefieldLocation")]
+        public Vector3Double MinefieldLocation
+        {
+            get
+            {
+                return this._minefieldLocation;
+            }
+
+            set
+            {
+                this._minefieldLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the orientation of minefield
+        /// </summary>
+        [XmlElement(Type = typeof(EulerAngles), ElementName = "minefieldOrientation")]
+        public EulerAngles MinefieldOrientation
+        {
+            get
+            {
+                return this._minefieldOrientation;
+            }
+
+            set
+            {
+                this._minefieldOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the appearance bitflags
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "appearance")]
+        public ushort Appearance
+        {
+            get
+            {
+                return this._appearance;
+            }
+
+            set
+            {
+                this._appearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the protocolMode. First two bits are the protocol mode, 14 bits reserved.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "protocolMode")]
+        public ushort ProtocolMode
+        {
+            get
+            {
+                return this._protocolMode;
+            }
+
+            set
+            {
+                this._protocolMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the perimeter points for the minefield
+        /// </summary>
+        [XmlElement(ElementName = "perimeterPointsList", Type = typeof(List<Vector2Float>))]
+        public List<Vector2Float> PerimeterPoints
+        {
+            get
+            {
+                return this._perimeterPoints;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of mines
+        /// </summary>
+        [XmlElement(ElementName = "mineTypeList", Type = typeof(List<EntityType>))]
+        public List<EntityType> MineType
+        {
+            get
+            {
+                return this._mineType;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._minefieldID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._minefieldSequence);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._perimeterPoints.Count);
+                    this._minefieldType.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._mineType.Count);
+                    this._minefieldLocation.Marshal(dos);
+                    this._minefieldOrientation.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._appearance);
+                    dos.WriteUnsignedShort((ushort)this._protocolMode);
+
+                    for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                    {
+                        Vector2Float aVector2Float = (Vector2Float)this._perimeterPoints[idx];
+                        aVector2Float.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._mineType.Count; idx++)
+                    {
+                        EntityType aEntityType = (EntityType)this._mineType[idx];
+                        aEntityType.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._minefieldID.Unmarshal(dis);
+                    this._minefieldSequence = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._numberOfPerimeterPoints = dis.ReadUnsignedByte();
+                    this._minefieldType.Unmarshal(dis);
+                    this._numberOfMineTypes = dis.ReadUnsignedShort();
+                    this._minefieldLocation.Unmarshal(dis);
+                    this._minefieldOrientation.Unmarshal(dis);
+                    this._appearance = dis.ReadUnsignedShort();
+                    this._protocolMode = dis.ReadUnsignedShort();
+                    for (int idx = 0; idx < this.NumberOfPerimeterPoints; idx++)
+                    {
+                        Vector2Float anX = new Vector2Float();
+                        anX.Unmarshal(dis);
+                        this._perimeterPoints.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfMineTypes; idx++)
+                    {
+                        EntityType anX = new EntityType();
+                        anX.Unmarshal(dis);
+                        this._mineType.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MinefieldStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<minefieldID>");
+                this._minefieldID.Reflection(sb);
+                sb.AppendLine("</minefieldID>");
+                sb.AppendLine("<minefieldSequence type=\"ushort\">" + this._minefieldSequence.ToString(CultureInfo.InvariantCulture) + "</minefieldSequence>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<perimeterPoints type=\"byte\">" + this._perimeterPoints.Count.ToString(CultureInfo.InvariantCulture) + "</perimeterPoints>");
+                sb.AppendLine("<minefieldType>");
+                this._minefieldType.Reflection(sb);
+                sb.AppendLine("</minefieldType>");
+                sb.AppendLine("<mineType type=\"ushort\">" + this._mineType.Count.ToString(CultureInfo.InvariantCulture) + "</mineType>");
+                sb.AppendLine("<minefieldLocation>");
+                this._minefieldLocation.Reflection(sb);
+                sb.AppendLine("</minefieldLocation>");
+                sb.AppendLine("<minefieldOrientation>");
+                this._minefieldOrientation.Reflection(sb);
+                sb.AppendLine("</minefieldOrientation>");
+                sb.AppendLine("<appearance type=\"ushort\">" + this._appearance.ToString(CultureInfo.InvariantCulture) + "</appearance>");
+                sb.AppendLine("<protocolMode type=\"ushort\">" + this._protocolMode.ToString(CultureInfo.InvariantCulture) + "</protocolMode>");
+                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                {
+                    sb.AppendLine("<perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector2Float\">");
+                    Vector2Float aVector2Float = (Vector2Float)this._perimeterPoints[idx];
+                    aVector2Float.Reflection(sb);
+                    sb.AppendLine("</perimeterPoints" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._mineType.Count; idx++)
+                {
+                    sb.AppendLine("<mineType" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"EntityType\">");
+                    EntityType aEntityType = (EntityType)this._mineType[idx];
+                    aEntityType.Reflection(sb);
+                    sb.AppendLine("</mineType" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</MinefieldStatePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MinefieldStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MinefieldStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._minefieldID.Equals(obj._minefieldID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._minefieldSequence != obj._minefieldSequence)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPerimeterPoints != obj._numberOfPerimeterPoints)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._minefieldType.Equals(obj._minefieldType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfMineTypes != obj._numberOfMineTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._minefieldLocation.Equals(obj._minefieldLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._minefieldOrientation.Equals(obj._minefieldOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._appearance != obj._appearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._protocolMode != obj._protocolMode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._perimeterPoints.Count != obj._perimeterPoints.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                {
+                    if (!this._perimeterPoints[idx].Equals(obj._perimeterPoints[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._mineType.Count != obj._mineType.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._mineType.Count; idx++)
+                {
+                    if (!this._mineType[idx].Equals(obj._mineType[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._minefieldID.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldSequence.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPerimeterPoints.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldType.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfMineTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._minefieldOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._appearance.GetHashCode();
+            result = GenerateHash(result) ^ this._protocolMode.GetHashCode();
+
+            if (this._perimeterPoints.Count > 0)
+            {
+                for (int idx = 0; idx < this._perimeterPoints.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._perimeterPoints[idx].GetHashCode();
+                }
+            }
+
+            if (this._mineType.Count > 0)
+            {
+                for (int idx = 0; idx < this._mineType.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._mineType[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ModulationParameters.cs b/Libs/CSharpDis7/ModulationParameters.cs
new file mode 100644
index 0000000..1604180
--- /dev/null
+++ b/Libs/CSharpDis7/ModulationParameters.cs
@@ -0,0 +1,245 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Modulation parameters associated with a specific radio system. INCOMPLETE. 6.2.58 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ModulationParameters
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModulationParameters"/> class.
+        /// </summary>
+        public ModulationParameters()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ModulationParameters left, ModulationParameters right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ModulationParameters left, ModulationParameters right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ModulationParameters>");
+            try
+            {
+                sb.AppendLine("</ModulationParameters>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ModulationParameters;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ModulationParameters obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ModulationType.cs b/Libs/CSharpDis7/ModulationType.cs
new file mode 100644
index 0000000..c0357e3
--- /dev/null
+++ b/Libs/CSharpDis7/ModulationType.cs
@@ -0,0 +1,373 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information about the type of modulation used for radio transmission. 6.2.59 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ModulationType
+    {
+        /// <summary>
+        /// This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bt field.
+        /// </summary>
+        private ushort _spreadSpectrum;
+
+        /// <summary>
+        /// the major classification of the modulation type. 
+        /// </summary>
+        private ushort _majorModulation;
+
+        /// <summary>
+        /// provide certain detailed information depending upon the major modulation type
+        /// </summary>
+        private ushort _detail;
+
+        /// <summary>
+        /// the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system.
+        /// </summary>
+        private ushort _radioSystem;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModulationType"/> class.
+        /// </summary>
+        public ModulationType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ModulationType left, ModulationType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ModulationType left, ModulationType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._spreadSpectrum
+            marshalSize += 2;  // this._majorModulation
+            marshalSize += 2;  // this._detail
+            marshalSize += 2;  // this._radioSystem
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bt field.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "spreadSpectrum")]
+        public ushort SpreadSpectrum
+        {
+            get
+            {
+                return this._spreadSpectrum;
+            }
+
+            set
+            {
+                this._spreadSpectrum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the major classification of the modulation type. 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "majorModulation")]
+        public ushort MajorModulation
+        {
+            get
+            {
+                return this._majorModulation;
+            }
+
+            set
+            {
+                this._majorModulation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the provide certain detailed information depending upon the major modulation type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "detail")]
+        public ushort Detail
+        {
+            get
+            {
+                return this._detail;
+            }
+
+            set
+            {
+                this._detail = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "radioSystem")]
+        public ushort RadioSystem
+        {
+            get
+            {
+                return this._radioSystem;
+            }
+
+            set
+            {
+                this._radioSystem = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._spreadSpectrum);
+                    dos.WriteUnsignedShort((ushort)this._majorModulation);
+                    dos.WriteUnsignedShort((ushort)this._detail);
+                    dos.WriteUnsignedShort((ushort)this._radioSystem);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._spreadSpectrum = dis.ReadUnsignedShort();
+                    this._majorModulation = dis.ReadUnsignedShort();
+                    this._detail = dis.ReadUnsignedShort();
+                    this._radioSystem = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ModulationType>");
+            try
+            {
+                sb.AppendLine("<spreadSpectrum type=\"ushort\">" + this._spreadSpectrum.ToString(CultureInfo.InvariantCulture) + "</spreadSpectrum>");
+                sb.AppendLine("<majorModulation type=\"ushort\">" + this._majorModulation.ToString(CultureInfo.InvariantCulture) + "</majorModulation>");
+                sb.AppendLine("<detail type=\"ushort\">" + this._detail.ToString(CultureInfo.InvariantCulture) + "</detail>");
+                sb.AppendLine("<radioSystem type=\"ushort\">" + this._radioSystem.ToString(CultureInfo.InvariantCulture) + "</radioSystem>");
+                sb.AppendLine("</ModulationType>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ModulationType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ModulationType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._spreadSpectrum != obj._spreadSpectrum)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._majorModulation != obj._majorModulation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._detail != obj._detail)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._radioSystem != obj._radioSystem)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._spreadSpectrum.GetHashCode();
+            result = GenerateHash(result) ^ this._majorModulation.GetHashCode();
+            result = GenerateHash(result) ^ this._detail.GetHashCode();
+            result = GenerateHash(result) ^ this._radioSystem.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Munition.cs b/Libs/CSharpDis7/Munition.cs
new file mode 100644
index 0000000..329ed6c
--- /dev/null
+++ b/Libs/CSharpDis7/Munition.cs
@@ -0,0 +1,408 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// An entity's munition (e.g., bomb, missile) information shall be represented by one or more Munition records. For each type or location of munition, this record shall specify the type, location, quantity and status of munitions that an entity contains. Section 6.2.60 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class Munition
+    {
+        /// <summary>
+        ///  This field shall identify the entity type of the munition. See section 6.2.30.
+        /// </summary>
+        private EntityType _munitionType = new EntityType();
+
+        /// <summary>
+        /// the station or launcher to which the munition is assigned. See Annex I
+        /// </summary>
+        private uint _station;
+
+        /// <summary>
+        /// the quantity remaining of this munition.
+        /// </summary>
+        private ushort _quantity;
+
+        /// <summary>
+        ///  the status of the munition. It shall be represented by an 8-bit enumeration. 
+        /// </summary>
+        private byte _munitionStatus;
+
+        /// <summary>
+        /// padding 
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Munition"/> class.
+        /// </summary>
+        public Munition()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Munition left, Munition right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Munition left, Munition right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
+            marshalSize += 4;  // this._station
+            marshalSize += 2;  // this._quantity
+            marshalSize += 1;  // this._munitionStatus
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the  This field shall identify the entity type of the munition. See section 6.2.30.
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
+        public EntityType MunitionType
+        {
+            get
+            {
+                return this._munitionType;
+            }
+
+            set
+            {
+                this._munitionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the station or launcher to which the munition is assigned. See Annex I
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "station")]
+        public uint Station
+        {
+            get
+            {
+                return this._station;
+            }
+
+            set
+            {
+                this._station = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the quantity remaining of this munition.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
+        public ushort Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  the status of the munition. It shall be represented by an 8-bit enumeration. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "munitionStatus")]
+        public byte MunitionStatus
+        {
+            get
+            {
+                return this._munitionStatus;
+            }
+
+            set
+            {
+                this._munitionStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionType.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._station);
+                    dos.WriteUnsignedShort((ushort)this._quantity);
+                    dos.WriteUnsignedByte((byte)this._munitionStatus);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionType.Unmarshal(dis);
+                    this._station = dis.ReadUnsignedInt();
+                    this._quantity = dis.ReadUnsignedShort();
+                    this._munitionStatus = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Munition>");
+            try
+            {
+                sb.AppendLine("<munitionType>");
+                this._munitionType.Reflection(sb);
+                sb.AppendLine("</munitionType>");
+                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
+                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("<munitionStatus type=\"byte\">" + this._munitionStatus.ToString(CultureInfo.InvariantCulture) + "</munitionStatus>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</Munition>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Munition;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Munition obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._munitionType.Equals(obj._munitionType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._station != obj._station)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._munitionStatus != obj._munitionStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
+            result = GenerateHash(result) ^ this._station.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+            result = GenerateHash(result) ^ this._munitionStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/MunitionDescriptor.cs b/Libs/CSharpDis7/MunitionDescriptor.cs
new file mode 100644
index 0000000..6d4ba12
--- /dev/null
+++ b/Libs/CSharpDis7/MunitionDescriptor.cs
@@ -0,0 +1,408 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Represents the firing or detonation of a munition. Section 6.2.20.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class MunitionDescriptor
+    {
+        /// <summary>
+        /// What munition was used in the burst
+        /// </summary>
+        private EntityType _munitionType = new EntityType();
+
+        /// <summary>
+        /// type of warhead
+        /// </summary>
+        private ushort _warhead;
+
+        /// <summary>
+        /// type of fuse used
+        /// </summary>
+        private ushort _fuse;
+
+        /// <summary>
+        /// how many of the munition were fired
+        /// </summary>
+        private ushort _quantity;
+
+        /// <summary>
+        /// rate at which the munition was fired
+        /// </summary>
+        private ushort _rate;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MunitionDescriptor"/> class.
+        /// </summary>
+        public MunitionDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MunitionDescriptor left, MunitionDescriptor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MunitionDescriptor left, MunitionDescriptor right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
+            marshalSize += 2;  // this._warhead
+            marshalSize += 2;  // this._fuse
+            marshalSize += 2;  // this._quantity
+            marshalSize += 2;  // this._rate
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the What munition was used in the burst
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
+        public EntityType MunitionType
+        {
+            get
+            {
+                return this._munitionType;
+            }
+
+            set
+            {
+                this._munitionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of warhead
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "warhead")]
+        public ushort Warhead
+        {
+            get
+            {
+                return this._warhead;
+            }
+
+            set
+            {
+                this._warhead = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of fuse used
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "fuse")]
+        public ushort Fuse
+        {
+            get
+            {
+                return this._fuse;
+            }
+
+            set
+            {
+                this._fuse = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the how many of the munition were fired
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
+        public ushort Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rate at which the munition was fired
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "rate")]
+        public ushort Rate
+        {
+            get
+            {
+                return this._rate;
+            }
+
+            set
+            {
+                this._rate = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionType.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._warhead);
+                    dos.WriteUnsignedShort((ushort)this._fuse);
+                    dos.WriteUnsignedShort((ushort)this._quantity);
+                    dos.WriteUnsignedShort((ushort)this._rate);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionType.Unmarshal(dis);
+                    this._warhead = dis.ReadUnsignedShort();
+                    this._fuse = dis.ReadUnsignedShort();
+                    this._quantity = dis.ReadUnsignedShort();
+                    this._rate = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MunitionDescriptor>");
+            try
+            {
+                sb.AppendLine("<munitionType>");
+                this._munitionType.Reflection(sb);
+                sb.AppendLine("</munitionType>");
+                sb.AppendLine("<warhead type=\"ushort\">" + this._warhead.ToString(CultureInfo.InvariantCulture) + "</warhead>");
+                sb.AppendLine("<fuse type=\"ushort\">" + this._fuse.ToString(CultureInfo.InvariantCulture) + "</fuse>");
+                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("<rate type=\"ushort\">" + this._rate.ToString(CultureInfo.InvariantCulture) + "</rate>");
+                sb.AppendLine("</MunitionDescriptor>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MunitionDescriptor;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MunitionDescriptor obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._munitionType.Equals(obj._munitionType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._warhead != obj._warhead)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuse != obj._fuse)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._rate != obj._rate)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
+            result = GenerateHash(result) ^ this._warhead.GetHashCode();
+            result = GenerateHash(result) ^ this._fuse.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+            result = GenerateHash(result) ^ this._rate.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/MunitionReload.cs b/Libs/CSharpDis7/MunitionReload.cs
new file mode 100644
index 0000000..e946bd3
--- /dev/null
+++ b/Libs/CSharpDis7/MunitionReload.cs
@@ -0,0 +1,440 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// indicate weapons (munitions) previously communicated via the Munition record. Section 6.2.61 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class MunitionReload
+    {
+        /// <summary>
+        ///  This field shall identify the entity type of the munition. See section 6.2.30.
+        /// </summary>
+        private EntityType _munitionType = new EntityType();
+
+        /// <summary>
+        /// the station or launcher to which the munition is assigned. See Annex I
+        /// </summary>
+        private uint _station;
+
+        /// <summary>
+        /// the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified.
+        /// </summary>
+        private ushort _standardQuantity;
+
+        /// <summary>
+        /// the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified 
+        /// </summary>
+        private ushort _maximumQuantity;
+
+        /// <summary>
+        /// the station name within the host at which the part entity is located.
+        /// </summary>
+        private ushort _stationName;
+
+        /// <summary>
+        /// the number of the particular wing station, cargo hold etc., at which the part is attached.
+        /// </summary>
+        private ushort _stationNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MunitionReload"/> class.
+        /// </summary>
+        public MunitionReload()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(MunitionReload left, MunitionReload right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(MunitionReload left, MunitionReload right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._munitionType.GetMarshalledSize();  // this._munitionType
+            marshalSize += 4;  // this._station
+            marshalSize += 2;  // this._standardQuantity
+            marshalSize += 2;  // this._maximumQuantity
+            marshalSize += 2;  // this._stationName
+            marshalSize += 2;  // this._stationNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the  This field shall identify the entity type of the munition. See section 6.2.30.
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "munitionType")]
+        public EntityType MunitionType
+        {
+            get
+            {
+                return this._munitionType;
+            }
+
+            set
+            {
+                this._munitionType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the station or launcher to which the munition is assigned. See Annex I
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "station")]
+        public uint Station
+        {
+            get
+            {
+                return this._station;
+            }
+
+            set
+            {
+                this._station = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "standardQuantity")]
+        public ushort StandardQuantity
+        {
+            get
+            {
+                return this._standardQuantity;
+            }
+
+            set
+            {
+                this._standardQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "maximumQuantity")]
+        public ushort MaximumQuantity
+        {
+            get
+            {
+                return this._maximumQuantity;
+            }
+
+            set
+            {
+                this._maximumQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the station name within the host at which the part entity is located.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "stationName")]
+        public ushort StationName
+        {
+            get
+            {
+                return this._stationName;
+            }
+
+            set
+            {
+                this._stationName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the number of the particular wing station, cargo hold etc., at which the part is attached.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "stationNumber")]
+        public ushort StationNumber
+        {
+            get
+            {
+                return this._stationNumber;
+            }
+
+            set
+            {
+                this._stationNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._munitionType.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._station);
+                    dos.WriteUnsignedShort((ushort)this._standardQuantity);
+                    dos.WriteUnsignedShort((ushort)this._maximumQuantity);
+                    dos.WriteUnsignedShort((ushort)this._stationName);
+                    dos.WriteUnsignedShort((ushort)this._stationNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._munitionType.Unmarshal(dis);
+                    this._station = dis.ReadUnsignedInt();
+                    this._standardQuantity = dis.ReadUnsignedShort();
+                    this._maximumQuantity = dis.ReadUnsignedShort();
+                    this._stationName = dis.ReadUnsignedShort();
+                    this._stationNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<MunitionReload>");
+            try
+            {
+                sb.AppendLine("<munitionType>");
+                this._munitionType.Reflection(sb);
+                sb.AppendLine("</munitionType>");
+                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
+                sb.AppendLine("<standardQuantity type=\"ushort\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
+                sb.AppendLine("<maximumQuantity type=\"ushort\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
+                sb.AppendLine("<stationName type=\"ushort\">" + this._stationName.ToString(CultureInfo.InvariantCulture) + "</stationName>");
+                sb.AppendLine("<stationNumber type=\"ushort\">" + this._stationNumber.ToString(CultureInfo.InvariantCulture) + "</stationNumber>");
+                sb.AppendLine("</MunitionReload>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as MunitionReload;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(MunitionReload obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._munitionType.Equals(obj._munitionType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._station != obj._station)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._standardQuantity != obj._standardQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumQuantity != obj._maximumQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stationName != obj._stationName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stationNumber != obj._stationNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._munitionType.GetHashCode();
+            result = GenerateHash(result) ^ this._station.GetHashCode();
+            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._stationName.GetHashCode();
+            result = GenerateHash(result) ^ this._stationNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/NamedLocationIdentification.cs b/Libs/CSharpDis7/NamedLocationIdentification.cs
new file mode 100644
index 0000000..78f943b
--- /dev/null
+++ b/Libs/CSharpDis7/NamedLocationIdentification.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information about the discrete positional relationship of the part entity with respect to the its host entity Section 6.2.62 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class NamedLocationIdentification
+    {
+        /// <summary>
+        /// the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part’s location data fields. This field shall be specified by a 16-bit enumeration 
+        /// </summary>
+        private ushort _stationName;
+
+        /// <summary>
+        /// the number of the particular wing station, cargo hold etc., at which the part is attached. 
+        /// </summary>
+        private ushort _stationNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NamedLocationIdentification"/> class.
+        /// </summary>
+        public NamedLocationIdentification()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(NamedLocationIdentification left, NamedLocationIdentification right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(NamedLocationIdentification left, NamedLocationIdentification right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._stationName
+            marshalSize += 2;  // this._stationNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part’s location data fields. This field shall be specified by a 16-bit enumeration 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "stationName")]
+        public ushort StationName
+        {
+            get
+            {
+                return this._stationName;
+            }
+
+            set
+            {
+                this._stationName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the number of the particular wing station, cargo hold etc., at which the part is attached. 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "stationNumber")]
+        public ushort StationNumber
+        {
+            get
+            {
+                return this._stationNumber;
+            }
+
+            set
+            {
+                this._stationNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._stationName);
+                    dos.WriteUnsignedShort((ushort)this._stationNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._stationName = dis.ReadUnsignedShort();
+                    this._stationNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<NamedLocationIdentification>");
+            try
+            {
+                sb.AppendLine("<stationName type=\"ushort\">" + this._stationName.ToString(CultureInfo.InvariantCulture) + "</stationName>");
+                sb.AppendLine("<stationNumber type=\"ushort\">" + this._stationNumber.ToString(CultureInfo.InvariantCulture) + "</stationNumber>");
+                sb.AppendLine("</NamedLocationIdentification>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as NamedLocationIdentification;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(NamedLocationIdentification obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._stationName != obj._stationName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stationNumber != obj._stationNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._stationName.GetHashCode();
+            result = GenerateHash(result) ^ this._stationNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ObjectIdentifier.cs b/Libs/CSharpDis7/ObjectIdentifier.cs
new file mode 100644
index 0000000..0bc1a50
--- /dev/null
+++ b/Libs/CSharpDis7/ObjectIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of an environmental object. Section 6.2.63
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class ObjectIdentifier
+    {
+        /// <summary>
+        ///  Simulation Address
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private ushort _objectNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectIdentifier"/> class.
+        /// </summary>
+        public ObjectIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ObjectIdentifier left, ObjectIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ObjectIdentifier left, ObjectIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._objectNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the  Simulation Address
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "objectNumber")]
+        public ushort ObjectNumber
+        {
+            get
+            {
+                return this._objectNumber;
+            }
+
+            set
+            {
+                this._objectNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._objectNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._objectNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ObjectIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<objectNumber type=\"ushort\">" + this._objectNumber.ToString(CultureInfo.InvariantCulture) + "</objectNumber>");
+                sb.AppendLine("</ObjectIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ObjectIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ObjectIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._objectNumber != obj._objectNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._objectNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ObjectType.cs b/Libs/CSharpDis7/ObjectType.cs
new file mode 100644
index 0000000..037f713
--- /dev/null
+++ b/Libs/CSharpDis7/ObjectType.cs
@@ -0,0 +1,373 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of an environmental object. Section 6.2.64
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class ObjectType
+    {
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private byte _objectKind;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// subcategory of entity
+        /// </summary>
+        private byte _subcategory;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectType"/> class.
+        /// </summary>
+        public ObjectType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ObjectType left, ObjectType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ObjectType left, ObjectType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._domain
+            marshalSize += 1;  // this._objectKind
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "objectKind")]
+        public byte ObjectKind
+        {
+            get
+            {
+                return this._objectKind;
+            }
+
+            set
+            {
+                this._objectKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the subcategory of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedByte((byte)this._objectKind);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._domain = dis.ReadUnsignedByte();
+                    this._objectKind = dis.ReadUnsignedByte();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ObjectType>");
+            try
+            {
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<objectKind type=\"byte\">" + this._objectKind.ToString(CultureInfo.InvariantCulture) + "</objectKind>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("</ObjectType>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ObjectType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ObjectType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._objectKind != obj._objectKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._objectKind.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/OneByteChunk.cs b/Libs/CSharpDis7/OneByteChunk.cs
new file mode 100644
index 0000000..6b45bd8
--- /dev/null
+++ b/Libs/CSharpDis7/OneByteChunk.cs
@@ -0,0 +1,303 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// 8 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class OneByteChunk
+    {
+        /// <summary>
+        /// one byte of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[1];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OneByteChunk"/> class.
+        /// </summary>
+        public OneByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(OneByteChunk left, OneByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(OneByteChunk left, OneByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the one byte of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<OneByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</OneByteChunk>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as OneByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(OneByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 1) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 1; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+
+            for (int idx = 0; idx < 1; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/OwnershipStatus.cs b/Libs/CSharpDis7/OwnershipStatus.cs
new file mode 100644
index 0000000..d14ac6c
--- /dev/null
+++ b/Libs/CSharpDis7/OwnershipStatus.cs
@@ -0,0 +1,344 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// used to convey entity and conflict status information associated with transferring ownership of an entity. Section 6.2.65
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class OwnershipStatus
+    {
+        /// <summary>
+        /// EntityID
+        /// </summary>
+        private EntityID _entityId = new EntityID();
+
+        /// <summary>
+        /// The ownership and/or ownership conflict status of the entity represented by the Entity ID field.
+        /// </summary>
+        private byte _ownershipStatus;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OwnershipStatus"/> class.
+        /// </summary>
+        public OwnershipStatus()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(OwnershipStatus left, OwnershipStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(OwnershipStatus left, OwnershipStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
+            marshalSize += 1;  // this._ownershipStatus
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the EntityID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
+        public EntityID EntityId
+        {
+            get
+            {
+                return this._entityId;
+            }
+
+            set
+            {
+                this._entityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The ownership and/or ownership conflict status of the entity represented by the Entity ID field.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "ownershipStatus")]
+        public byte OwnershipStatus_
+        {
+            get
+            {
+                return this._ownershipStatus;
+            }
+
+            set
+            {
+                this._ownershipStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityId.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._ownershipStatus);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityId.Unmarshal(dis);
+                    this._ownershipStatus = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<OwnershipStatus>");
+            try
+            {
+                sb.AppendLine("<entityId>");
+                this._entityId.Reflection(sb);
+                sb.AppendLine("</entityId>");
+                sb.AppendLine("<ownershipStatus type=\"byte\">" + this._ownershipStatus.ToString(CultureInfo.InvariantCulture) + "</ownershipStatus>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</OwnershipStatus>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as OwnershipStatus;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(OwnershipStatus obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._entityId.Equals(obj._entityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._ownershipStatus != obj._ownershipStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityId.GetHashCode();
+            result = GenerateHash(result) ^ this._ownershipStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Pdu.cs b/Libs/CSharpDis7/Pdu.cs
new file mode 100644
index 0000000..d6e238c
--- /dev/null
+++ b/Libs/CSharpDis7/Pdu.cs
@@ -0,0 +1,301 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Adds some fields to the the classic PDU
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Pdu : PduSuperclass, IEquatable<Pdu>
+    {
+        /// <summary>
+        /// PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
+        /// </summary>
+        private byte _pduStatus;
+
+        /// <summary>
+        /// zero-filled array of padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Pdu"/> class.
+        /// </summary>
+        public Pdu()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Pdu left, Pdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Pdu left, Pdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._pduStatus
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduStatus")]
+        public byte PduStatus
+        {
+            get
+            {
+                return this._pduStatus;
+            }
+
+            set
+            {
+                this._pduStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the zero-filled array of padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._pduStatus);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._pduStatus = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Pdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<pduStatus type=\"byte\">" + this._pduStatus.ToString(CultureInfo.InvariantCulture) + "</pduStatus>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</Pdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Pdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Pdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._pduStatus != obj._pduStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._pduStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/PduContainer.cs b/Libs/CSharpDis7/PduContainer.cs
new file mode 100644
index 0000000..75a0ccc
--- /dev/null
+++ b/Libs/CSharpDis7/PduContainer.cs
@@ -0,0 +1,348 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Used for XML compatability. A container that holds PDUs
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(Pdu))]
+    public partial class PduContainer
+    {
+        /// <summary>
+        /// Number of PDUs in the container list
+        /// </summary>
+        private int _numberOfPdus;
+
+        /// <summary>
+        /// record sets
+        /// </summary>
+        private List<Pdu> _pdus = new List<Pdu>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PduContainer"/> class.
+        /// </summary>
+        public PduContainer()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PduContainer left, PduContainer right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PduContainer left, PduContainer right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._numberOfPdus
+            for (int idx = 0; idx < this._pdus.Count; idx++)
+            {
+                Pdu listElement = (Pdu)this._pdus[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPdus method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(int), ElementName = "numberOfPdus")]
+        public int NumberOfPdus
+        {
+            get
+            {
+                return this._numberOfPdus;
+            }
+
+            set
+            {
+                this._numberOfPdus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the record sets
+        /// </summary>
+        [XmlElement(ElementName = "pdusList", Type = typeof(List<Pdu>))]
+        public List<Pdu> Pdus
+        {
+            get
+            {
+                return this._pdus;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteInt((int)this._pdus.Count);
+
+                    for (int idx = 0; idx < this._pdus.Count; idx++)
+                    {
+                        Pdu aPdu = (Pdu)this._pdus[idx];
+                        aPdu.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfPdus = dis.ReadInt();
+                    for (int idx = 0; idx < this.NumberOfPdus; idx++)
+                    {
+                        Pdu anX = new Pdu();
+                        anX.Unmarshal(dis);
+                        this._pdus.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PduContainer>");
+            try
+            {
+                sb.AppendLine("<pdus type=\"int\">" + this._pdus.Count.ToString(CultureInfo.InvariantCulture) + "</pdus>");
+                for (int idx = 0; idx < this._pdus.Count; idx++)
+                {
+                    sb.AppendLine("<pdus" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Pdu\">");
+                    Pdu aPdu = (Pdu)this._pdus[idx];
+                    aPdu.Reflection(sb);
+                    sb.AppendLine("</pdus" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</PduContainer>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PduContainer;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PduContainer obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._numberOfPdus != obj._numberOfPdus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pdus.Count != obj._pdus.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._pdus.Count; idx++)
+                {
+                    if (!this._pdus[idx].Equals(obj._pdus[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfPdus.GetHashCode();
+
+            if (this._pdus.Count > 0)
+            {
+                for (int idx = 0; idx < this._pdus.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._pdus[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/PduHeader.cs b/Libs/CSharpDis7/PduHeader.cs
new file mode 100644
index 0000000..11ee605
--- /dev/null
+++ b/Libs/CSharpDis7/PduHeader.cs
@@ -0,0 +1,501 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Not used. The PDU Header Record is directly incoroporated into the PDU class. Here for completness only. Section 6.2.66
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class PduHeader
+    {
+        /// <summary>
+        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
+        /// </summary>
+        private byte _protocolVersion = 7;
+
+        /// <summary>
+        /// Exercise ID
+        /// </summary>
+        private byte _exerciseID;
+
+        /// <summary>
+        /// Type of pdu, unique for each PDU class
+        /// </summary>
+        private byte _pduType;
+
+        /// <summary>
+        /// value that refers to the protocol family, eg SimulationManagement, etc
+        /// </summary>
+        private byte _protocolFamily;
+
+        /// <summary>
+        /// Timestamp value
+        /// </summary>
+        private uint _timestamp;
+
+        /// <summary>
+        /// Length, in bytes, of the PDU. Changed name from length to avoid use of Hibernate QL reserved word.
+        /// </summary>
+        private byte _pduLength;
+
+        /// <summary>
+        /// PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
+        /// </summary>
+        private ushort _pduStatus;
+
+        /// <summary>
+        /// zero filled array of padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PduHeader"/> class.
+        /// </summary>
+        public PduHeader()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PduHeader left, PduHeader right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PduHeader left, PduHeader right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._protocolVersion
+            marshalSize += 1;  // this._exerciseID
+            marshalSize += 1;  // this._pduType
+            marshalSize += 1;  // this._protocolFamily
+            marshalSize += 4;  // this._timestamp
+            marshalSize += 1;  // this._pduLength
+            marshalSize += 2;  // this._pduStatus
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
+        public byte ProtocolVersion
+        {
+            get
+            {
+                return this._protocolVersion;
+            }
+
+            set
+            {
+                this._protocolVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Exercise ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
+        public byte ExerciseID
+        {
+            get
+            {
+                return this._exerciseID;
+            }
+
+            set
+            {
+                this._exerciseID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of pdu, unique for each PDU class
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
+        public byte PduType
+        {
+            get
+            {
+                return this._pduType;
+            }
+
+            set
+            {
+                this._pduType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, etc
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
+        public byte ProtocolFamily
+        {
+            get
+            {
+                return this._protocolFamily;
+            }
+
+            set
+            {
+                this._protocolFamily = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Timestamp value
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
+        public uint Timestamp
+        {
+            get
+            {
+                return this._timestamp;
+            }
+
+            set
+            {
+                this._timestamp = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length, in bytes, of the PDU. Changed name from length to avoid use of Hibernate QL reserved word.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduLength")]
+        public byte PduLength
+        {
+            get
+            {
+                return this._pduLength;
+            }
+
+            set
+            {
+                this._pduLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pduStatus")]
+        public ushort PduStatus
+        {
+            get
+            {
+                return this._pduStatus;
+            }
+
+            set
+            {
+                this._pduStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the zero filled array of padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._protocolVersion);
+                    dos.WriteUnsignedByte((byte)this._exerciseID);
+                    dos.WriteUnsignedByte((byte)this._pduType);
+                    dos.WriteUnsignedByte((byte)this._protocolFamily);
+                    dos.WriteUnsignedInt((uint)this._timestamp);
+                    dos.WriteUnsignedByte((byte)this._pduLength);
+                    dos.WriteUnsignedShort((ushort)this._pduStatus);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._protocolVersion = dis.ReadUnsignedByte();
+                    this._exerciseID = dis.ReadUnsignedByte();
+                    this._pduType = dis.ReadUnsignedByte();
+                    this._protocolFamily = dis.ReadUnsignedByte();
+                    this._timestamp = dis.ReadUnsignedInt();
+                    this._pduLength = dis.ReadUnsignedByte();
+                    this._pduStatus = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PduHeader>");
+            try
+            {
+                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
+                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
+                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
+                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
+                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
+                sb.AppendLine("<pduLength type=\"byte\">" + this._pduLength.ToString(CultureInfo.InvariantCulture) + "</pduLength>");
+                sb.AppendLine("<pduStatus type=\"ushort\">" + this._pduStatus.ToString(CultureInfo.InvariantCulture) + "</pduStatus>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</PduHeader>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PduHeader;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PduHeader obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._protocolVersion != obj._protocolVersion)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._exerciseID != obj._exerciseID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduType != obj._pduType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._protocolFamily != obj._protocolFamily)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timestamp != obj._timestamp)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduLength != obj._pduLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduStatus != obj._pduStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
+            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
+            result = GenerateHash(result) ^ this._pduType.GetHashCode();
+            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
+            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
+            result = GenerateHash(result) ^ this._pduLength.GetHashCode();
+            result = GenerateHash(result) ^ this._pduStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/PduStatus.cs b/Libs/CSharpDis7/PduStatus.cs
new file mode 100644
index 0000000..f028bca
--- /dev/null
+++ b/Libs/CSharpDis7/PduStatus.cs
@@ -0,0 +1,277 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// PDU Status. These are a series of bit fields. Represented here as just a byte. Section 6.2.67
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class PduStatus
+    {
+        /// <summary>
+        /// Bit fields
+        /// </summary>
+        private byte _pduStatus;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PduStatus"/> class.
+        /// </summary>
+        public PduStatus()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PduStatus left, PduStatus right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PduStatus left, PduStatus right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._pduStatus
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Bit fields
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduStatus")]
+        public byte PduStatus_
+        {
+            get
+            {
+                return this._pduStatus;
+            }
+
+            set
+            {
+                this._pduStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._pduStatus);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._pduStatus = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PduStatus>");
+            try
+            {
+                sb.AppendLine("<pduStatus type=\"byte\">" + this._pduStatus.ToString(CultureInfo.InvariantCulture) + "</pduStatus>");
+                sb.AppendLine("</PduStatus>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PduStatus;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PduStatus obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._pduStatus != obj._pduStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._pduStatus.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/PduSuperclass.cs b/Libs/CSharpDis7/PduSuperclass.cs
new file mode 100644
index 0000000..ba223c8
--- /dev/null
+++ b/Libs/CSharpDis7/PduSuperclass.cs
@@ -0,0 +1,437 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The superclass for all PDUs, including classic and Live Entity (LE) PDUs. This incorporates the PduHeader record, section 7.2.2
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class PduSuperclass
+    {
+        /// <summary>
+        /// The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
+        /// </summary>
+        private byte _protocolVersion = 7;
+
+        /// <summary>
+        /// Exercise ID
+        /// </summary>
+        private byte _exerciseID;
+
+        /// <summary>
+        /// Type of pdu, unique for each PDU class
+        /// </summary>
+        private byte _pduType;
+
+        /// <summary>
+        /// value that refers to the protocol family, eg SimulationManagement, et
+        /// </summary>
+        private byte _protocolFamily;
+
+        /// <summary>
+        /// Timestamp value
+        /// </summary>
+        private uint _timestamp;
+
+        /// <summary>
+        /// Length, in bytes, of the PDU
+        /// </summary>
+        private ushort _length;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PduSuperclass"/> class.
+        /// </summary>
+        public PduSuperclass()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PduSuperclass left, PduSuperclass right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PduSuperclass left, PduSuperclass right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._protocolVersion
+            marshalSize += 1;  // this._exerciseID
+            marshalSize += 1;  // this._pduType
+            marshalSize += 1;  // this._protocolFamily
+            marshalSize += 4;  // this._timestamp
+            marshalSize += 2;  // this._length
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2009.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolVersion")]
+        public byte ProtocolVersion
+        {
+            get
+            {
+                return this._protocolVersion;
+            }
+
+            set
+            {
+                this._protocolVersion = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Exercise ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "exerciseID")]
+        public byte ExerciseID
+        {
+            get
+            {
+                return this._exerciseID;
+            }
+
+            set
+            {
+                this._exerciseID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of pdu, unique for each PDU class
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pduType")]
+        public byte PduType
+        {
+            get
+            {
+                return this._pduType;
+            }
+
+            set
+            {
+                this._pduType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that refers to the protocol family, eg SimulationManagement, et
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "protocolFamily")]
+        public byte ProtocolFamily
+        {
+            get
+            {
+                return this._protocolFamily;
+            }
+
+            set
+            {
+                this._protocolFamily = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Timestamp value
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "timestamp")]
+        public uint Timestamp
+        {
+            get
+            {
+                return this._timestamp;
+            }
+
+            set
+            {
+                this._timestamp = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length, in bytes, of the PDU
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "length")]
+        public ushort Length
+        {
+            get
+            {
+                return this._length;
+            }
+
+            set
+            {
+                this._length = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._protocolVersion);
+                    dos.WriteUnsignedByte((byte)this._exerciseID);
+                    dos.WriteUnsignedByte((byte)this._pduType);
+                    dos.WriteUnsignedByte((byte)this._protocolFamily);
+                    dos.WriteUnsignedInt((uint)this._timestamp);
+                    dos.WriteUnsignedShort((ushort)this._length);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._protocolVersion = dis.ReadUnsignedByte();
+                    this._exerciseID = dis.ReadUnsignedByte();
+                    this._pduType = dis.ReadUnsignedByte();
+                    this._protocolFamily = dis.ReadUnsignedByte();
+                    this._timestamp = dis.ReadUnsignedInt();
+                    this._length = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PduSuperclass>");
+            try
+            {
+                sb.AppendLine("<protocolVersion type=\"byte\">" + this._protocolVersion.ToString(CultureInfo.InvariantCulture) + "</protocolVersion>");
+                sb.AppendLine("<exerciseID type=\"byte\">" + this._exerciseID.ToString(CultureInfo.InvariantCulture) + "</exerciseID>");
+                sb.AppendLine("<pduType type=\"byte\">" + this._pduType.ToString(CultureInfo.InvariantCulture) + "</pduType>");
+                sb.AppendLine("<protocolFamily type=\"byte\">" + this._protocolFamily.ToString(CultureInfo.InvariantCulture) + "</protocolFamily>");
+                sb.AppendLine("<timestamp type=\"uint\">" + this._timestamp.ToString(CultureInfo.InvariantCulture) + "</timestamp>");
+                sb.AppendLine("<length type=\"ushort\">" + this._length.ToString(CultureInfo.InvariantCulture) + "</length>");
+                sb.AppendLine("</PduSuperclass>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PduSuperclass;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PduSuperclass obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._protocolVersion != obj._protocolVersion)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._exerciseID != obj._exerciseID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pduType != obj._pduType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._protocolFamily != obj._protocolFamily)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._timestamp != obj._timestamp)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._length != obj._length)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._protocolVersion.GetHashCode();
+            result = GenerateHash(result) ^ this._exerciseID.GetHashCode();
+            result = GenerateHash(result) ^ this._pduType.GetHashCode();
+            result = GenerateHash(result) ^ this._protocolFamily.GetHashCode();
+            result = GenerateHash(result) ^ this._timestamp.GetHashCode();
+            result = GenerateHash(result) ^ this._length.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/PointObjectStatePdu.cs b/Libs/CSharpDis7/PointObjectStatePdu.cs
new file mode 100644
index 0000000..963ea88
--- /dev/null
+++ b/Libs/CSharpDis7/PointObjectStatePdu.cs
@@ -0,0 +1,652 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// : Inormation abut the addition or modification of a synthecic enviroment object that is anchored to the terrain with a single point. Section 7.10.4 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(ObjectType))]
+    [XmlInclude(typeof(Vector3Double))]
+    [XmlInclude(typeof(EulerAngles))]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class PointObjectStatePdu : SyntheticEnvironmentFamilyPdu, IEquatable<PointObjectStatePdu>
+    {
+        /// <summary>
+        /// Object in synthetic environment
+        /// </summary>
+        private EntityID _objectID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _referencedObjectID = new EntityID();
+
+        /// <summary>
+        /// unique update number of each state transition of an object
+        /// </summary>
+        private ushort _updateNumber;
+
+        /// <summary>
+        /// force ID
+        /// </summary>
+        private byte _forceID;
+
+        /// <summary>
+        /// modifications
+        /// </summary>
+        private byte _modifications;
+
+        /// <summary>
+        /// Object type
+        /// </summary>
+        private ObjectType _objectType = new ObjectType();
+
+        /// <summary>
+        /// Object location
+        /// </summary>
+        private Vector3Double _objectLocation = new Vector3Double();
+
+        /// <summary>
+        /// Object orientation
+        /// </summary>
+        private EulerAngles _objectOrientation = new EulerAngles();
+
+        /// <summary>
+        /// Object apperance
+        /// </summary>
+        private double _objectAppearance;
+
+        /// <summary>
+        /// requesterID
+        /// </summary>
+        private SimulationAddress _requesterID = new SimulationAddress();
+
+        /// <summary>
+        /// receiver ID
+        /// </summary>
+        private SimulationAddress _receivingID = new SimulationAddress();
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _pad2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PointObjectStatePdu"/> class.
+        /// </summary>
+        public PointObjectStatePdu()
+        {
+            PduType = (byte)43;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PointObjectStatePdu left, PointObjectStatePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PointObjectStatePdu left, PointObjectStatePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._objectID.GetMarshalledSize();  // this._objectID
+            marshalSize += this._referencedObjectID.GetMarshalledSize();  // this._referencedObjectID
+            marshalSize += 2;  // this._updateNumber
+            marshalSize += 1;  // this._forceID
+            marshalSize += 1;  // this._modifications
+            marshalSize += this._objectType.GetMarshalledSize();  // this._objectType
+            marshalSize += this._objectLocation.GetMarshalledSize();  // this._objectLocation
+            marshalSize += this._objectOrientation.GetMarshalledSize();  // this._objectOrientation
+            marshalSize += 8;  // this._objectAppearance
+            marshalSize += this._requesterID.GetMarshalledSize();  // this._requesterID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += 4;  // this._pad2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object in synthetic environment
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "objectID")]
+        public EntityID ObjectID
+        {
+            get
+            {
+                return this._objectID;
+            }
+
+            set
+            {
+                this._objectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "referencedObjectID")]
+        public EntityID ReferencedObjectID
+        {
+            get
+            {
+                return this._referencedObjectID;
+            }
+
+            set
+            {
+                this._referencedObjectID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the unique update number of each state transition of an object
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "updateNumber")]
+        public ushort UpdateNumber
+        {
+            get
+            {
+                return this._updateNumber;
+            }
+
+            set
+            {
+                this._updateNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the force ID
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "forceID")]
+        public byte ForceID
+        {
+            get
+            {
+                return this._forceID;
+            }
+
+            set
+            {
+                this._forceID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the modifications
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "modifications")]
+        public byte Modifications
+        {
+            get
+            {
+                return this._modifications;
+            }
+
+            set
+            {
+                this._modifications = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object type
+        /// </summary>
+        [XmlElement(Type = typeof(ObjectType), ElementName = "objectType")]
+        public ObjectType ObjectType
+        {
+            get
+            {
+                return this._objectType;
+            }
+
+            set
+            {
+                this._objectType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object location
+        /// </summary>
+        [XmlElement(Type = typeof(Vector3Double), ElementName = "objectLocation")]
+        public Vector3Double ObjectLocation
+        {
+            get
+            {
+                return this._objectLocation;
+            }
+
+            set
+            {
+                this._objectLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object orientation
+        /// </summary>
+        [XmlElement(Type = typeof(EulerAngles), ElementName = "objectOrientation")]
+        public EulerAngles ObjectOrientation
+        {
+            get
+            {
+                return this._objectOrientation;
+            }
+
+            set
+            {
+                this._objectOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object apperance
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "objectAppearance")]
+        public double ObjectAppearance
+        {
+            get
+            {
+                return this._objectAppearance;
+            }
+
+            set
+            {
+                this._objectAppearance = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the requesterID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "requesterID")]
+        public SimulationAddress RequesterID
+        {
+            get
+            {
+                return this._requesterID;
+            }
+
+            set
+            {
+                this._requesterID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receiver ID
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "receivingID")]
+        public SimulationAddress ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "pad2")]
+        public uint Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._objectID.Marshal(dos);
+                    this._referencedObjectID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._updateNumber);
+                    dos.WriteUnsignedByte((byte)this._forceID);
+                    dos.WriteUnsignedByte((byte)this._modifications);
+                    this._objectType.Marshal(dos);
+                    this._objectLocation.Marshal(dos);
+                    this._objectOrientation.Marshal(dos);
+                    dos.WriteDouble((double)this._objectAppearance);
+                    this._requesterID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._pad2);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._objectID.Unmarshal(dis);
+                    this._referencedObjectID.Unmarshal(dis);
+                    this._updateNumber = dis.ReadUnsignedShort();
+                    this._forceID = dis.ReadUnsignedByte();
+                    this._modifications = dis.ReadUnsignedByte();
+                    this._objectType.Unmarshal(dis);
+                    this._objectLocation.Unmarshal(dis);
+                    this._objectOrientation.Unmarshal(dis);
+                    this._objectAppearance = dis.ReadDouble();
+                    this._requesterID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._pad2 = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PointObjectStatePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<objectID>");
+                this._objectID.Reflection(sb);
+                sb.AppendLine("</objectID>");
+                sb.AppendLine("<referencedObjectID>");
+                this._referencedObjectID.Reflection(sb);
+                sb.AppendLine("</referencedObjectID>");
+                sb.AppendLine("<updateNumber type=\"ushort\">" + this._updateNumber.ToString(CultureInfo.InvariantCulture) + "</updateNumber>");
+                sb.AppendLine("<forceID type=\"byte\">" + this._forceID.ToString(CultureInfo.InvariantCulture) + "</forceID>");
+                sb.AppendLine("<modifications type=\"byte\">" + this._modifications.ToString(CultureInfo.InvariantCulture) + "</modifications>");
+                sb.AppendLine("<objectType>");
+                this._objectType.Reflection(sb);
+                sb.AppendLine("</objectType>");
+                sb.AppendLine("<objectLocation>");
+                this._objectLocation.Reflection(sb);
+                sb.AppendLine("</objectLocation>");
+                sb.AppendLine("<objectOrientation>");
+                this._objectOrientation.Reflection(sb);
+                sb.AppendLine("</objectOrientation>");
+                sb.AppendLine("<objectAppearance type=\"double\">" + this._objectAppearance.ToString(CultureInfo.InvariantCulture) + "</objectAppearance>");
+                sb.AppendLine("<requesterID>");
+                this._requesterID.Reflection(sb);
+                sb.AppendLine("</requesterID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<pad2 type=\"uint\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("</PointObjectStatePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PointObjectStatePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PointObjectStatePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._objectID.Equals(obj._objectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._referencedObjectID.Equals(obj._referencedObjectID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._updateNumber != obj._updateNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._forceID != obj._forceID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._modifications != obj._modifications)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectType.Equals(obj._objectType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectLocation.Equals(obj._objectLocation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._objectOrientation.Equals(obj._objectOrientation))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._objectAppearance != obj._objectAppearance)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._requesterID.Equals(obj._requesterID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._objectID.GetHashCode();
+            result = GenerateHash(result) ^ this._referencedObjectID.GetHashCode();
+            result = GenerateHash(result) ^ this._updateNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._forceID.GetHashCode();
+            result = GenerateHash(result) ^ this._modifications.GetHashCode();
+            result = GenerateHash(result) ^ this._objectType.GetHashCode();
+            result = GenerateHash(result) ^ this._objectLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._objectOrientation.GetHashCode();
+            result = GenerateHash(result) ^ this._objectAppearance.GetHashCode();
+            result = GenerateHash(result) ^ this._requesterID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/PropulsionSystemData.cs b/Libs/CSharpDis7/PropulsionSystemData.cs
new file mode 100644
index 0000000..b7360e5
--- /dev/null
+++ b/Libs/CSharpDis7/PropulsionSystemData.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// contains information describing the propulsion systems of the entity. This information shall be provided for each active propulsion system defined. Section 6.2.68
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class PropulsionSystemData
+    {
+        /// <summary>
+        /// powerSetting
+        /// </summary>
+        private float _powerSetting;
+
+        /// <summary>
+        /// engine RPMs
+        /// </summary>
+        private float _engineRpm;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PropulsionSystemData"/> class.
+        /// </summary>
+        public PropulsionSystemData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(PropulsionSystemData left, PropulsionSystemData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(PropulsionSystemData left, PropulsionSystemData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._powerSetting
+            marshalSize += 4;  // this._engineRpm
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the powerSetting
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "powerSetting")]
+        public float PowerSetting
+        {
+            get
+            {
+                return this._powerSetting;
+            }
+
+            set
+            {
+                this._powerSetting = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the engine RPMs
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "engineRpm")]
+        public float EngineRpm
+        {
+            get
+            {
+                return this._engineRpm;
+            }
+
+            set
+            {
+                this._engineRpm = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._powerSetting);
+                    dos.WriteFloat((float)this._engineRpm);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._powerSetting = dis.ReadFloat();
+                    this._engineRpm = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<PropulsionSystemData>");
+            try
+            {
+                sb.AppendLine("<powerSetting type=\"float\">" + this._powerSetting.ToString(CultureInfo.InvariantCulture) + "</powerSetting>");
+                sb.AppendLine("<engineRpm type=\"float\">" + this._engineRpm.ToString(CultureInfo.InvariantCulture) + "</engineRpm>");
+                sb.AppendLine("</PropulsionSystemData>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as PropulsionSystemData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(PropulsionSystemData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._powerSetting != obj._powerSetting)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._engineRpm != obj._engineRpm)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._powerSetting.GetHashCode();
+            result = GenerateHash(result) ^ this._engineRpm.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs b/Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
new file mode 100644
index 0000000..ed02477
--- /dev/null
+++ b/Libs/CSharpDis7/RadioCommunicationsFamilyPdu.cs
@@ -0,0 +1,316 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Abstract superclass for radio communications PDUs. Section 7.7
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RadioCommunicationsFamilyPdu : Pdu, IEquatable<RadioCommunicationsFamilyPdu>
+    {
+        /// <summary>
+        /// ID of the entitythat is the source of the communication
+        /// </summary>
+        private EntityID _entityId = new EntityID();
+
+        /// <summary>
+        /// particular radio within an entity
+        /// </summary>
+        private ushort _radioId;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioCommunicationsFamilyPdu"/> class.
+        /// </summary>
+        public RadioCommunicationsFamilyPdu()
+        {
+            ProtocolFamily = (byte)4;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioCommunicationsFamilyPdu left, RadioCommunicationsFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._entityId.GetMarshalledSize();  // this._entityId
+            marshalSize += 2;  // this._radioId
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entitythat is the source of the communication
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityId")]
+        public EntityID EntityId
+        {
+            get
+            {
+                return this._entityId;
+            }
+
+            set
+            {
+                this._entityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the particular radio within an entity
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "radioId")]
+        public ushort RadioId
+        {
+            get
+            {
+                return this._radioId;
+            }
+
+            set
+            {
+                this._radioId = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityId.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._radioId);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityId.Unmarshal(dis);
+                    this._radioId = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RadioCommunicationsFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<entityId>");
+                this._entityId.Reflection(sb);
+                sb.AppendLine("</entityId>");
+                sb.AppendLine("<radioId type=\"ushort\">" + this._radioId.ToString(CultureInfo.InvariantCulture) + "</radioId>");
+                sb.AppendLine("</RadioCommunicationsFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RadioCommunicationsFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioCommunicationsFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._entityId.Equals(obj._entityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._radioId != obj._radioId)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._entityId.GetHashCode();
+            result = GenerateHash(result) ^ this._radioId.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RadioIdentifier.cs b/Libs/CSharpDis7/RadioIdentifier.cs
new file mode 100644
index 0000000..1b543c9
--- /dev/null
+++ b/Libs/CSharpDis7/RadioIdentifier.cs
@@ -0,0 +1,373 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of an attached or unattached radio in an event or exercise Section 6.2.69
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RadioIdentifier
+    {
+        /// <summary>
+        ///  site
+        /// </summary>
+        private ushort _siteNumber;
+
+        /// <summary>
+        /// application number
+        /// </summary>
+        private ushort _applicationNumber;
+
+        /// <summary>
+        ///  reference number
+        /// </summary>
+        private ushort _referenceNumber;
+
+        /// <summary>
+        ///  Radio number
+        /// </summary>
+        private ushort _radioNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioIdentifier"/> class.
+        /// </summary>
+        public RadioIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioIdentifier left, RadioIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioIdentifier left, RadioIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._siteNumber
+            marshalSize += 2;  // this._applicationNumber
+            marshalSize += 2;  // this._referenceNumber
+            marshalSize += 2;  // this._radioNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the  site
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "siteNumber")]
+        public ushort SiteNumber
+        {
+            get
+            {
+                return this._siteNumber;
+            }
+
+            set
+            {
+                this._siteNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the application number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "applicationNumber")]
+        public ushort ApplicationNumber
+        {
+            get
+            {
+                return this._applicationNumber;
+            }
+
+            set
+            {
+                this._applicationNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  reference number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
+        public ushort ReferenceNumber
+        {
+            get
+            {
+                return this._referenceNumber;
+            }
+
+            set
+            {
+                this._referenceNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  Radio number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "radioNumber")]
+        public ushort RadioNumber
+        {
+            get
+            {
+                return this._radioNumber;
+            }
+
+            set
+            {
+                this._radioNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._siteNumber);
+                    dos.WriteUnsignedShort((ushort)this._applicationNumber);
+                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
+                    dos.WriteUnsignedShort((ushort)this._radioNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._siteNumber = dis.ReadUnsignedShort();
+                    this._applicationNumber = dis.ReadUnsignedShort();
+                    this._referenceNumber = dis.ReadUnsignedShort();
+                    this._radioNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RadioIdentifier>");
+            try
+            {
+                sb.AppendLine("<siteNumber type=\"ushort\">" + this._siteNumber.ToString(CultureInfo.InvariantCulture) + "</siteNumber>");
+                sb.AppendLine("<applicationNumber type=\"ushort\">" + this._applicationNumber.ToString(CultureInfo.InvariantCulture) + "</applicationNumber>");
+                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
+                sb.AppendLine("<radioNumber type=\"ushort\">" + this._radioNumber.ToString(CultureInfo.InvariantCulture) + "</radioNumber>");
+                sb.AppendLine("</RadioIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RadioIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._siteNumber != obj._siteNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._applicationNumber != obj._applicationNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._referenceNumber != obj._referenceNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._radioNumber != obj._radioNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._siteNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._applicationNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._radioNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RadioType.cs b/Libs/CSharpDis7/RadioType.cs
new file mode 100644
index 0000000..77f87f1
--- /dev/null
+++ b/Libs/CSharpDis7/RadioType.cs
@@ -0,0 +1,457 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Identifies the type of radio. Section 6.2.70
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RadioType
+    {
+        /// <summary>
+        /// Kind of entity
+        /// </summary>
+        private byte _entityKind;
+
+        /// <summary>
+        /// Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        private byte _domain;
+
+        /// <summary>
+        /// country to which the design of the entity is attributed
+        /// </summary>
+        private ushort _country;
+
+        /// <summary>
+        /// category of entity
+        /// </summary>
+        private byte _category;
+
+        /// <summary>
+        /// specific info based on subcategory field
+        /// </summary>
+        private byte _subcategory;
+
+        private byte _specific;
+
+        private byte _extra;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RadioType"/> class.
+        /// </summary>
+        public RadioType()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RadioType left, RadioType right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RadioType left, RadioType right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._entityKind
+            marshalSize += 1;  // this._domain
+            marshalSize += 2;  // this._country
+            marshalSize += 1;  // this._category
+            marshalSize += 1;  // this._subcategory
+            marshalSize += 1;  // this._specific
+            marshalSize += 1;  // this._extra
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Kind of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "entityKind")]
+        public byte EntityKind
+        {
+            get
+            {
+                return this._entityKind;
+            }
+
+            set
+            {
+                this._entityKind = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Domain of entity (air, surface, subsurface, space, etc)
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "domain")]
+        public byte Domain
+        {
+            get
+            {
+                return this._domain;
+            }
+
+            set
+            {
+                this._domain = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the country to which the design of the entity is attributed
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "country")]
+        public ushort Country
+        {
+            get
+            {
+                return this._country;
+            }
+
+            set
+            {
+                this._country = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the category of entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "category")]
+        public byte Category
+        {
+            get
+            {
+                return this._category;
+            }
+
+            set
+            {
+                this._category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific info based on subcategory field
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "subcategory")]
+        public byte Subcategory
+        {
+            get
+            {
+                return this._subcategory;
+            }
+
+            set
+            {
+                this._subcategory = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "specific")]
+        public byte Specific
+        {
+            get
+            {
+                return this._specific;
+            }
+
+            set
+            {
+                this._specific = value;
+            }
+        }
+
+        [XmlElement(Type = typeof(byte), ElementName = "extra")]
+        public byte Extra
+        {
+            get
+            {
+                return this._extra;
+            }
+
+            set
+            {
+                this._extra = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._entityKind);
+                    dos.WriteUnsignedByte((byte)this._domain);
+                    dos.WriteUnsignedShort((ushort)this._country);
+                    dos.WriteUnsignedByte((byte)this._category);
+                    dos.WriteUnsignedByte((byte)this._subcategory);
+                    dos.WriteUnsignedByte((byte)this._specific);
+                    dos.WriteUnsignedByte((byte)this._extra);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityKind = dis.ReadUnsignedByte();
+                    this._domain = dis.ReadUnsignedByte();
+                    this._country = dis.ReadUnsignedShort();
+                    this._category = dis.ReadUnsignedByte();
+                    this._subcategory = dis.ReadUnsignedByte();
+                    this._specific = dis.ReadUnsignedByte();
+                    this._extra = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RadioType>");
+            try
+            {
+                sb.AppendLine("<entityKind type=\"byte\">" + this._entityKind.ToString(CultureInfo.InvariantCulture) + "</entityKind>");
+                sb.AppendLine("<domain type=\"byte\">" + this._domain.ToString(CultureInfo.InvariantCulture) + "</domain>");
+                sb.AppendLine("<country type=\"ushort\">" + this._country.ToString(CultureInfo.InvariantCulture) + "</country>");
+                sb.AppendLine("<category type=\"byte\">" + this._category.ToString(CultureInfo.InvariantCulture) + "</category>");
+                sb.AppendLine("<subcategory type=\"byte\">" + this._subcategory.ToString(CultureInfo.InvariantCulture) + "</subcategory>");
+                sb.AppendLine("<specific type=\"byte\">" + this._specific.ToString(CultureInfo.InvariantCulture) + "</specific>");
+                sb.AppendLine("<extra type=\"byte\">" + this._extra.ToString(CultureInfo.InvariantCulture) + "</extra>");
+                sb.AppendLine("</RadioType>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RadioType;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RadioType obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._entityKind != obj._entityKind)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._domain != obj._domain)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._country != obj._country)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._category != obj._category)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._subcategory != obj._subcategory)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._specific != obj._specific)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._extra != obj._extra)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityKind.GetHashCode();
+            result = GenerateHash(result) ^ this._domain.GetHashCode();
+            result = GenerateHash(result) ^ this._country.GetHashCode();
+            result = GenerateHash(result) ^ this._category.GetHashCode();
+            result = GenerateHash(result) ^ this._subcategory.GetHashCode();
+            result = GenerateHash(result) ^ this._specific.GetHashCode();
+            result = GenerateHash(result) ^ this._extra.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ReceiverPdu.cs b/Libs/CSharpDis7/ReceiverPdu.cs
new file mode 100644
index 0000000..169879d
--- /dev/null
+++ b/Libs/CSharpDis7/ReceiverPdu.cs
@@ -0,0 +1,412 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Communication of a receiver state. Section 7.7.4 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class ReceiverPdu : RadioCommunicationsFamilyPdu, IEquatable<ReceiverPdu>
+    {
+        /// <summary>
+        /// encoding scheme used, and enumeration
+        /// </summary>
+        private ushort _receiverState;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding1;
+
+        /// <summary>
+        /// received power
+        /// </summary>
+        private float _receivedPoser;
+
+        /// <summary>
+        /// ID of transmitter
+        /// </summary>
+        private EntityID _transmitterEntityId = new EntityID();
+
+        /// <summary>
+        /// ID of transmitting radio
+        /// </summary>
+        private ushort _transmitterRadioId;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReceiverPdu"/> class.
+        /// </summary>
+        public ReceiverPdu()
+        {
+            PduType = (byte)27;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ReceiverPdu left, ReceiverPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ReceiverPdu left, ReceiverPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 2;  // this._receiverState
+            marshalSize += 2;  // this._padding1
+            marshalSize += 4;  // this._receivedPoser
+            marshalSize += this._transmitterEntityId.GetMarshalledSize();  // this._transmitterEntityId
+            marshalSize += 2;  // this._transmitterRadioId
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding scheme used, and enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "receiverState")]
+        public ushort ReceiverState
+        {
+            get
+            {
+                return this._receiverState;
+            }
+
+            set
+            {
+                this._receiverState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding1")]
+        public ushort Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the received power
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "receivedPoser")]
+        public float ReceivedPoser
+        {
+            get
+            {
+                return this._receivedPoser;
+            }
+
+            set
+            {
+                this._receivedPoser = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of transmitter
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "transmitterEntityId")]
+        public EntityID TransmitterEntityId
+        {
+            get
+            {
+                return this._transmitterEntityId;
+            }
+
+            set
+            {
+                this._transmitterEntityId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of transmitting radio
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "transmitterRadioId")]
+        public ushort TransmitterRadioId
+        {
+            get
+            {
+                return this._transmitterRadioId;
+            }
+
+            set
+            {
+                this._transmitterRadioId = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._receiverState);
+                    dos.WriteUnsignedShort((ushort)this._padding1);
+                    dos.WriteFloat((float)this._receivedPoser);
+                    this._transmitterEntityId.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._transmitterRadioId);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receiverState = dis.ReadUnsignedShort();
+                    this._padding1 = dis.ReadUnsignedShort();
+                    this._receivedPoser = dis.ReadFloat();
+                    this._transmitterEntityId.Unmarshal(dis);
+                    this._transmitterRadioId = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ReceiverPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receiverState type=\"ushort\">" + this._receiverState.ToString(CultureInfo.InvariantCulture) + "</receiverState>");
+                sb.AppendLine("<padding1 type=\"ushort\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<receivedPoser type=\"float\">" + this._receivedPoser.ToString(CultureInfo.InvariantCulture) + "</receivedPoser>");
+                sb.AppendLine("<transmitterEntityId>");
+                this._transmitterEntityId.Reflection(sb);
+                sb.AppendLine("</transmitterEntityId>");
+                sb.AppendLine("<transmitterRadioId type=\"ushort\">" + this._transmitterRadioId.ToString(CultureInfo.InvariantCulture) + "</transmitterRadioId>");
+                sb.AppendLine("</ReceiverPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ReceiverPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ReceiverPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._receiverState != obj._receiverState)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._receivedPoser != obj._receivedPoser)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._transmitterEntityId.Equals(obj._transmitterEntityId))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._transmitterRadioId != obj._transmitterRadioId)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receiverState.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._receivedPoser.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitterEntityId.GetHashCode();
+            result = GenerateHash(result) ^ this._transmitterRadioId.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RecordQueryReliablePdu.cs b/Libs/CSharpDis7/RecordQueryReliablePdu.cs
new file mode 100644
index 0000000..2406e53
--- /dev/null
+++ b/Libs/CSharpDis7/RecordQueryReliablePdu.cs
@@ -0,0 +1,544 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.13: A request for one or more records of data from an entity. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FourByteChunk))]
+    public partial class RecordQueryReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RecordQueryReliablePdu>
+    {
+        /// <summary>
+        /// request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding. The spec is unclear and contradictory here.
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// event type
+        /// </summary>
+        private ushort _eventType;
+
+        /// <summary>
+        /// time
+        /// </summary>
+        private uint _time;
+
+        /// <summary>
+        /// numberOfRecords
+        /// </summary>
+        private uint _numberOfRecords;
+
+        /// <summary>
+        /// record IDs
+        /// </summary>
+        private List<FourByteChunk> _recordIDs = new List<FourByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RecordQueryReliablePdu"/> class.
+        /// </summary>
+        public RecordQueryReliablePdu()
+        {
+            PduType = (byte)63;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RecordQueryReliablePdu left, RecordQueryReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 2;  // this._eventType
+            marshalSize += 4;  // this._time
+            marshalSize += 4;  // this._numberOfRecords
+            for (int idx = 0; idx < this._recordIDs.Count; idx++)
+            {
+                FourByteChunk listElement = (FourByteChunk)this._recordIDs[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding. The spec is unclear and contradictory here.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the event type
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "eventType")]
+        public ushort EventType
+        {
+            get
+            {
+                return this._eventType;
+            }
+
+            set
+            {
+                this._eventType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "time")]
+        public uint Time
+        {
+            get
+            {
+                return this._time;
+            }
+
+            set
+            {
+                this._time = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecords")]
+        public uint NumberOfRecords
+        {
+            get
+            {
+                return this._numberOfRecords;
+            }
+
+            set
+            {
+                this._numberOfRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the record IDs
+        /// </summary>
+        [XmlElement(ElementName = "recordIDsList", Type = typeof(List<FourByteChunk>))]
+        public List<FourByteChunk> RecordIDs
+        {
+            get
+            {
+                return this._recordIDs;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedShort((ushort)this._eventType);
+                    dos.WriteUnsignedInt((uint)this._time);
+                    dos.WriteUnsignedInt((uint)this._recordIDs.Count);
+
+                    for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                    {
+                        FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
+                        aFourByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._eventType = dis.ReadUnsignedShort();
+                    this._time = dis.ReadUnsignedInt();
+                    this._numberOfRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfRecords; idx++)
+                    {
+                        FourByteChunk anX = new FourByteChunk();
+                        anX.Unmarshal(dis);
+                        this._recordIDs.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RecordQueryReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<eventType type=\"ushort\">" + this._eventType.ToString(CultureInfo.InvariantCulture) + "</eventType>");
+                sb.AppendLine("<time type=\"uint\">" + this._time.ToString(CultureInfo.InvariantCulture) + "</time>");
+                sb.AppendLine("<recordIDs type=\"uint\">" + this._recordIDs.Count.ToString(CultureInfo.InvariantCulture) + "</recordIDs>");
+                for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                {
+                    sb.AppendLine("<recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
+                    FourByteChunk aFourByteChunk = (FourByteChunk)this._recordIDs[idx];
+                    aFourByteChunk.Reflection(sb);
+                    sb.AppendLine("</recordIDs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</RecordQueryReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RecordQueryReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RecordQueryReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._eventType != obj._eventType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._time != obj._time)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfRecords != obj._numberOfRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordIDs.Count != obj._recordIDs.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                {
+                    if (!this._recordIDs[idx].Equals(obj._recordIDs[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._eventType.GetHashCode();
+            result = GenerateHash(result) ^ this._time.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfRecords.GetHashCode();
+
+            if (this._recordIDs.Count > 0)
+            {
+                for (int idx = 0; idx < this._recordIDs.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._recordIDs[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RecordQuerySpecification.cs b/Libs/CSharpDis7/RecordQuerySpecification.cs
new file mode 100644
index 0000000..095e8b5
--- /dev/null
+++ b/Libs/CSharpDis7/RecordQuerySpecification.cs
@@ -0,0 +1,345 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The identification of the records being queried 6.2.71
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FourByteChunk))]
+    public partial class RecordQuerySpecification
+    {
+        private uint _numberOfRecords;
+
+        /// <summary>
+        /// variable length list of 32 bit records
+        /// </summary>
+        private List<FourByteChunk> _records = new List<FourByteChunk>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RecordQuerySpecification"/> class.
+        /// </summary>
+        public RecordQuerySpecification()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RecordQuerySpecification left, RecordQuerySpecification right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RecordQuerySpecification left, RecordQuerySpecification right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._numberOfRecords
+            for (int idx = 0; idx < this._records.Count; idx++)
+            {
+                FourByteChunk listElement = (FourByteChunk)this._records[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecords")]
+        public uint NumberOfRecords
+        {
+            get
+            {
+                return this._numberOfRecords;
+            }
+
+            set
+            {
+                this._numberOfRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of 32 bit records
+        /// </summary>
+        [XmlElement(ElementName = "recordsList", Type = typeof(List<FourByteChunk>))]
+        public List<FourByteChunk> Records
+        {
+            get
+            {
+                return this._records;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._records.Count);
+
+                    for (int idx = 0; idx < this._records.Count; idx++)
+                    {
+                        FourByteChunk aFourByteChunk = (FourByteChunk)this._records[idx];
+                        aFourByteChunk.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfRecords; idx++)
+                    {
+                        FourByteChunk anX = new FourByteChunk();
+                        anX.Unmarshal(dis);
+                        this._records.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RecordQuerySpecification>");
+            try
+            {
+                sb.AppendLine("<records type=\"uint\">" + this._records.Count.ToString(CultureInfo.InvariantCulture) + "</records>");
+                for (int idx = 0; idx < this._records.Count; idx++)
+                {
+                    sb.AppendLine("<records" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FourByteChunk\">");
+                    FourByteChunk aFourByteChunk = (FourByteChunk)this._records[idx];
+                    aFourByteChunk.Reflection(sb);
+                    sb.AppendLine("</records" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</RecordQuerySpecification>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RecordQuerySpecification;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RecordQuerySpecification obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._numberOfRecords != obj._numberOfRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._records.Count != obj._records.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._records.Count; idx++)
+                {
+                    if (!this._records[idx].Equals(obj._records[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfRecords.GetHashCode();
+
+            if (this._records.Count > 0)
+            {
+                for (int idx = 0; idx < this._records.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._records[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RecordSpecification.cs b/Libs/CSharpDis7/RecordSpecification.cs
new file mode 100644
index 0000000..b8404bc
--- /dev/null
+++ b/Libs/CSharpDis7/RecordSpecification.cs
@@ -0,0 +1,348 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// This record shall specify the number of record sets contained in the Record Specification record and the record details. Section 6.2.72.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(RecordSpecificationElement))]
+    public partial class RecordSpecification
+    {
+        /// <summary>
+        /// The number of record sets
+        /// </summary>
+        private uint _numberOfRecordSets;
+
+        /// <summary>
+        /// variable length list record specifications.
+        /// </summary>
+        private List<RecordSpecificationElement> _recordSets = new List<RecordSpecificationElement>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RecordSpecification"/> class.
+        /// </summary>
+        public RecordSpecification()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RecordSpecification left, RecordSpecification right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RecordSpecification left, RecordSpecification right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._numberOfRecordSets
+            for (int idx = 0; idx < this._recordSets.Count; idx++)
+            {
+                RecordSpecificationElement listElement = (RecordSpecificationElement)this._recordSets[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfRecordSets method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfRecordSets")]
+        public uint NumberOfRecordSets
+        {
+            get
+            {
+                return this._numberOfRecordSets;
+            }
+
+            set
+            {
+                this._numberOfRecordSets = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list record specifications.
+        /// </summary>
+        [XmlElement(ElementName = "recordSetsList", Type = typeof(List<RecordSpecificationElement>))]
+        public List<RecordSpecificationElement> RecordSets
+        {
+            get
+            {
+                return this._recordSets;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordSets.Count);
+
+                    for (int idx = 0; idx < this._recordSets.Count; idx++)
+                    {
+                        RecordSpecificationElement aRecordSpecificationElement = (RecordSpecificationElement)this._recordSets[idx];
+                        aRecordSpecificationElement.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfRecordSets = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfRecordSets; idx++)
+                    {
+                        RecordSpecificationElement anX = new RecordSpecificationElement();
+                        anX.Unmarshal(dis);
+                        this._recordSets.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RecordSpecification>");
+            try
+            {
+                sb.AppendLine("<recordSets type=\"uint\">" + this._recordSets.Count.ToString(CultureInfo.InvariantCulture) + "</recordSets>");
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    sb.AppendLine("<recordSets" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"RecordSpecificationElement\">");
+                    RecordSpecificationElement aRecordSpecificationElement = (RecordSpecificationElement)this._recordSets[idx];
+                    aRecordSpecificationElement.Reflection(sb);
+                    sb.AppendLine("</recordSets" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</RecordSpecification>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RecordSpecification;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RecordSpecification obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._numberOfRecordSets != obj._numberOfRecordSets)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSets.Count != obj._recordSets.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    if (!this._recordSets[idx].Equals(obj._recordSets[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfRecordSets.GetHashCode();
+
+            if (this._recordSets.Count > 0)
+            {
+                for (int idx = 0; idx < this._recordSets.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._recordSets[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RecordSpecificationElement.cs b/Libs/CSharpDis7/RecordSpecificationElement.cs
new file mode 100644
index 0000000..67f348d
--- /dev/null
+++ b/Libs/CSharpDis7/RecordSpecificationElement.cs
@@ -0,0 +1,437 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Synthetic record, made up from section 6.2.72. This is used to acheive a repeating variable list element.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RecordSpecificationElement
+    {
+        /// <summary>
+        /// the data structure used to convey the parameter values of the record for each record. 32 bit enumeration.
+        /// </summary>
+        private uint _recordID;
+
+        /// <summary>
+        /// the serial number of the first record in the block of records
+        /// </summary>
+        private uint _recordSetSerialNumber;
+
+        /// <summary>
+        ///  the length, in bits, of the record. Note, bits, not bytes.
+        /// </summary>
+        private ushort _recordLength;
+
+        /// <summary>
+        ///  the number of records included in the record set 
+        /// </summary>
+        private ushort _recordCount;
+
+        /// <summary>
+        /// the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. ^^^This is wrong--variable sized data records, bit values. THis MUST be patched after generation.
+        /// </summary>
+        private ushort _recordValues;
+
+        /// <summary>
+        /// Padding of 0 to 31 unused bits as required for 32-bit alignment of the Record Set field. ^^^This is wrong--variable sized padding. MUST be patched post-code generation
+        /// </summary>
+        private byte _pad4;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RecordSpecificationElement"/> class.
+        /// </summary>
+        public RecordSpecificationElement()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RecordSpecificationElement left, RecordSpecificationElement right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RecordSpecificationElement left, RecordSpecificationElement right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordID
+            marshalSize += 4;  // this._recordSetSerialNumber
+            marshalSize += 2;  // this._recordLength
+            marshalSize += 2;  // this._recordCount
+            marshalSize += 2;  // this._recordValues
+            marshalSize += 1;  // this._pad4
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the data structure used to convey the parameter values of the record for each record. 32 bit enumeration.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordID")]
+        public uint RecordID
+        {
+            get
+            {
+                return this._recordID;
+            }
+
+            set
+            {
+                this._recordID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the serial number of the first record in the block of records
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordSetSerialNumber")]
+        public uint RecordSetSerialNumber
+        {
+            get
+            {
+                return this._recordSetSerialNumber;
+            }
+
+            set
+            {
+                this._recordSetSerialNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  the length, in bits, of the record. Note, bits, not bytes.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordLength")]
+        public ushort RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  the number of records included in the record set 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordCount")]
+        public ushort RecordCount
+        {
+            get
+            {
+                return this._recordCount;
+            }
+
+            set
+            {
+                this._recordCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. ^^^This is wrong--variable sized data records, bit values. THis MUST be patched after generation.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "recordValues")]
+        public ushort RecordValues
+        {
+            get
+            {
+                return this._recordValues;
+            }
+
+            set
+            {
+                this._recordValues = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Padding of 0 to 31 unused bits as required for 32-bit alignment of the Record Set field. ^^^This is wrong--variable sized padding. MUST be patched post-code generation
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad4")]
+        public byte Pad4
+        {
+            get
+            {
+                return this._pad4;
+            }
+
+            set
+            {
+                this._pad4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordID);
+                    dos.WriteUnsignedInt((uint)this._recordSetSerialNumber);
+                    dos.WriteUnsignedShort((ushort)this._recordLength);
+                    dos.WriteUnsignedShort((ushort)this._recordCount);
+                    dos.WriteUnsignedShort((ushort)this._recordValues);
+                    dos.WriteUnsignedByte((byte)this._pad4);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordID = dis.ReadUnsignedInt();
+                    this._recordSetSerialNumber = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedShort();
+                    this._recordCount = dis.ReadUnsignedShort();
+                    this._recordValues = dis.ReadUnsignedShort();
+                    this._pad4 = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RecordSpecificationElement>");
+            try
+            {
+                sb.AppendLine("<recordID type=\"uint\">" + this._recordID.ToString(CultureInfo.InvariantCulture) + "</recordID>");
+                sb.AppendLine("<recordSetSerialNumber type=\"uint\">" + this._recordSetSerialNumber.ToString(CultureInfo.InvariantCulture) + "</recordSetSerialNumber>");
+                sb.AppendLine("<recordLength type=\"ushort\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("<recordCount type=\"ushort\">" + this._recordCount.ToString(CultureInfo.InvariantCulture) + "</recordCount>");
+                sb.AppendLine("<recordValues type=\"ushort\">" + this._recordValues.ToString(CultureInfo.InvariantCulture) + "</recordValues>");
+                sb.AppendLine("<pad4 type=\"byte\">" + this._pad4.ToString(CultureInfo.InvariantCulture) + "</pad4>");
+                sb.AppendLine("</RecordSpecificationElement>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RecordSpecificationElement;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RecordSpecificationElement obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordID != obj._recordID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordSetSerialNumber != obj._recordSetSerialNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordCount != obj._recordCount)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordValues != obj._recordValues)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad4 != obj._pad4)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordID.GetHashCode();
+            result = GenerateHash(result) ^ this._recordSetSerialNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+            result = GenerateHash(result) ^ this._recordCount.GetHashCode();
+            result = GenerateHash(result) ^ this._recordValues.GetHashCode();
+            result = GenerateHash(result) ^ this._pad4.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Relationship.cs b/Libs/CSharpDis7/Relationship.cs
new file mode 100644
index 0000000..025cc14
--- /dev/null
+++ b/Libs/CSharpDis7/Relationship.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The relationship of the part entity to its host entity. Section 6.2.73.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Relationship
+    {
+        /// <summary>
+        /// the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration
+        /// </summary>
+        private ushort _nature;
+
+        /// <summary>
+        /// the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration
+        /// </summary>
+        private ushort _position;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Relationship"/> class.
+        /// </summary>
+        public Relationship()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Relationship left, Relationship right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Relationship left, Relationship right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._nature
+            marshalSize += 2;  // this._position
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "nature")]
+        public ushort Nature
+        {
+            get
+            {
+                return this._nature;
+            }
+
+            set
+            {
+                this._nature = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "position")]
+        public ushort Position
+        {
+            get
+            {
+                return this._position;
+            }
+
+            set
+            {
+                this._position = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._nature);
+                    dos.WriteUnsignedShort((ushort)this._position);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._nature = dis.ReadUnsignedShort();
+                    this._position = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Relationship>");
+            try
+            {
+                sb.AppendLine("<nature type=\"ushort\">" + this._nature.ToString(CultureInfo.InvariantCulture) + "</nature>");
+                sb.AppendLine("<position type=\"ushort\">" + this._position.ToString(CultureInfo.InvariantCulture) + "</position>");
+                sb.AppendLine("</Relationship>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Relationship;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Relationship obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._nature != obj._nature)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._position != obj._position)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._nature.GetHashCode();
+            result = GenerateHash(result) ^ this._position.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RemoveEntityPdu.cs b/Libs/CSharpDis7/RemoveEntityPdu.cs
new file mode 100644
index 0000000..fa02d58
--- /dev/null
+++ b/Libs/CSharpDis7/RemoveEntityPdu.cs
@@ -0,0 +1,350 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.3 The removal of an entity from an exercise shall be communicated with a Remove Entity PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RemoveEntityPdu : SimulationManagementFamilyPdu, IEquatable<RemoveEntityPdu>
+    {
+        /// <summary>
+        /// Identifier for originating entity(or simulation)
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the receiving entity(or simulation)
+        /// </summary>
+        private EntityID _receivingID = new EntityID();
+
+        /// <summary>
+        /// This field shall identify the specific and unique start/resume request being made by the SM
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveEntityPdu"/> class.
+        /// </summary>
+        public RemoveEntityPdu()
+        {
+            PduType = (byte)12;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RemoveEntityPdu left, RemoveEntityPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RemoveEntityPdu left, RemoveEntityPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for originating entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the receiving entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
+        public EntityID ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall identify the specific and unique start/resume request being made by the SM
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RemoveEntityPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</RemoveEntityPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RemoveEntityPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RemoveEntityPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RemoveEntityReliablePdu.cs b/Libs/CSharpDis7/RemoveEntityReliablePdu.cs
new file mode 100644
index 0000000..836e9ff
--- /dev/null
+++ b/Libs/CSharpDis7/RemoveEntityReliablePdu.cs
@@ -0,0 +1,377 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.2: Removal of an entity , reliable. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class RemoveEntityReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<RemoveEntityReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveEntityReliablePdu"/> class.
+        /// </summary>
+        public RemoveEntityReliablePdu()
+        {
+            PduType = (byte)52;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RemoveEntityReliablePdu left, RemoveEntityReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RemoveEntityReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</RemoveEntityReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RemoveEntityReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RemoveEntityReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RepairCompletePdu.cs b/Libs/CSharpDis7/RepairCompletePdu.cs
new file mode 100644
index 0000000..59999d3
--- /dev/null
+++ b/Libs/CSharpDis7/RepairCompletePdu.cs
@@ -0,0 +1,382 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.4.6. Service Request PDU is received and repair is complete. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RepairCompletePdu : LogisticsFamilyPdu, IEquatable<RepairCompletePdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service.  See 6.2.28
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying.  See 6.2.28
+        /// </summary>
+        private EntityID _repairingEntityID = new EntityID();
+
+        /// <summary>
+        /// Enumeration for type of repair.  See 6.2.74
+        /// </summary>
+        private ushort _repair;
+
+        /// <summary>
+        /// padding, number prevents conflict with superclass ivar name
+        /// </summary>
+        private short _padding4;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RepairCompletePdu"/> class.
+        /// </summary>
+        public RepairCompletePdu()
+        {
+            PduType = (byte)9;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RepairCompletePdu left, RepairCompletePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RepairCompletePdu left, RepairCompletePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
+            marshalSize += 2;  // this._repair
+            marshalSize += 2;  // this._padding4
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service.  See 6.2.28
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying.  See 6.2.28
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
+        public EntityID RepairingEntityID
+        {
+            get
+            {
+                return this._repairingEntityID;
+            }
+
+            set
+            {
+                this._repairingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Enumeration for type of repair.  See 6.2.74
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "repair")]
+        public ushort Repair
+        {
+            get
+            {
+                return this._repair;
+            }
+
+            set
+            {
+                this._repair = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding, number prevents conflict with superclass ivar name
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding4")]
+        public short Padding4
+        {
+            get
+            {
+                return this._padding4;
+            }
+
+            set
+            {
+                this._padding4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._repairingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._repair);
+                    dos.WriteShort((short)this._padding4);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._repairingEntityID.Unmarshal(dis);
+                    this._repair = dis.ReadUnsignedShort();
+                    this._padding4 = dis.ReadShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RepairCompletePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<repairingEntityID>");
+                this._repairingEntityID.Reflection(sb);
+                sb.AppendLine("</repairingEntityID>");
+                sb.AppendLine("<repair type=\"ushort\">" + this._repair.ToString(CultureInfo.InvariantCulture) + "</repair>");
+                sb.AppendLine("<padding4 type=\"short\">" + this._padding4.ToString(CultureInfo.InvariantCulture) + "</padding4>");
+                sb.AppendLine("</RepairCompletePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RepairCompletePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RepairCompletePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._repair != obj._repair)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding4 != obj._padding4)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repair.GetHashCode();
+            result = GenerateHash(result) ^ this._padding4.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/RepairResponsePdu.cs b/Libs/CSharpDis7/RepairResponsePdu.cs
new file mode 100644
index 0000000..3976fa1
--- /dev/null
+++ b/Libs/CSharpDis7/RepairResponsePdu.cs
@@ -0,0 +1,414 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.4.7. Sent after repair complete PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class RepairResponsePdu : LogisticsFamilyPdu, IEquatable<RepairResponsePdu>
+    {
+        /// <summary>
+        /// Entity that requested repairs.  See 6.2.28
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is repairing.  See 6.2.28
+        /// </summary>
+        private EntityID _repairingEntityID = new EntityID();
+
+        /// <summary>
+        /// Result of repair operation
+        /// </summary>
+        private byte _repairResult;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RepairResponsePdu"/> class.
+        /// </summary>
+        public RepairResponsePdu()
+        {
+            PduType = (byte)10;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(RepairResponsePdu left, RepairResponsePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(RepairResponsePdu left, RepairResponsePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._repairingEntityID.GetMarshalledSize();  // this._repairingEntityID
+            marshalSize += 1;  // this._repairResult
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that requested repairs.  See 6.2.28
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is repairing.  See 6.2.28
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "repairingEntityID")]
+        public EntityID RepairingEntityID
+        {
+            get
+            {
+                return this._repairingEntityID;
+            }
+
+            set
+            {
+                this._repairingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Result of repair operation
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "repairResult")]
+        public byte RepairResult
+        {
+            get
+            {
+                return this._repairResult;
+            }
+
+            set
+            {
+                this._repairResult = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._repairingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._repairResult);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._repairingEntityID.Unmarshal(dis);
+                    this._repairResult = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<RepairResponsePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<repairingEntityID>");
+                this._repairingEntityID.Reflection(sb);
+                sb.AppendLine("</repairingEntityID>");
+                sb.AppendLine("<repairResult type=\"byte\">" + this._repairResult.ToString(CultureInfo.InvariantCulture) + "</repairResult>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("</RepairResponsePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as RepairResponsePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RepairResponsePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._repairingEntityID.Equals(obj._repairingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._repairResult != obj._repairResult)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._repairResult.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ResupplyOfferPdu.cs b/Libs/CSharpDis7/ResupplyOfferPdu.cs
new file mode 100644
index 0000000..52bc92d
--- /dev/null
+++ b/Libs/CSharpDis7/ResupplyOfferPdu.cs
@@ -0,0 +1,485 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information used to communicate the offer of supplies by a supplying entity to a receiving entity. Section 7.4.3 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ResupplyOfferPdu : LogisticsFamilyPdu, IEquatable<ResupplyOfferPdu>
+    {
+        /// <summary>
+        /// Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Identifies the Entity and respective Entity ID Record that is supplying  (see 6.2.28), Section 7.4.3
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// How many supplies types are being offered, Section 7.4.3
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding2;
+
+        /// <summary>
+        /// A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3
+        /// </summary>
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyOfferPdu"/> class.
+        /// </summary>
+        public ResupplyOfferPdu()
+        {
+            PduType = (byte)6;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyOfferPdu left, ResupplyOfferPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyOfferPdu left, ResupplyOfferPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 1;  // this._padding1
+            marshalSize += 2;  // this._padding2
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifies the Entity and respective Entity ID Record that is supplying  (see 6.2.28), Section 7.4.3
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding2")]
+        public short Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteByte((byte)this._padding1);
+                    dos.WriteShort((short)this._padding2);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadByte();
+                    this._padding2 = dis.ReadShort();
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyOfferPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"short\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ResupplyOfferPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyOfferPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyOfferPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ResupplyReceivedPdu.cs b/Libs/CSharpDis7/ResupplyReceivedPdu.cs
new file mode 100644
index 0000000..db6d460
--- /dev/null
+++ b/Libs/CSharpDis7/ResupplyReceivedPdu.cs
@@ -0,0 +1,485 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.4.4. Receipt of supplies is communicated by issuing Resupply Received PDU. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ResupplyReceivedPdu : LogisticsFamilyPdu, IEquatable<ResupplyReceivedPdu>
+    {
+        /// <summary>
+        /// Entity that is receiving service.  Shall be represented by Entity Identifier record (see 6.2.28)
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is supplying.  Shall be represented by Entity Identifier record (see 6.2.28)
+        /// </summary>
+        private EntityID _supplyingEntityID = new EntityID();
+
+        /// <summary>
+        /// How many supplies are taken by receiving entity
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding2;
+
+        /// <summary>
+        /// Type and amount of supplies for each specified supply type.  See 6.2.85 for supply quantity record.
+        /// </summary>
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResupplyReceivedPdu"/> class.
+        /// </summary>
+        public ResupplyReceivedPdu()
+        {
+            PduType = (byte)7;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ResupplyReceivedPdu left, ResupplyReceivedPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            marshalSize += this._supplyingEntityID.GetMarshalledSize();  // this._supplyingEntityID
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._padding1
+            marshalSize += 1;  // this._padding2
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is receiving service.  Shall be represented by Entity Identifier record (see 6.2.28)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is supplying.  Shall be represented by Entity Identifier record (see 6.2.28)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "supplyingEntityID")]
+        public EntityID SupplyingEntityID
+        {
+            get
+            {
+                return this._supplyingEntityID;
+            }
+
+            set
+            {
+                this._supplyingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding2")]
+        public byte Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type and amount of supplies for each specified supply type.  See 6.2.85 for supply quantity record.
+        /// </summary>
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Marshal(dos);
+                    this._supplyingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteByte((byte)this._padding2);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._receivingEntityID.Unmarshal(dis);
+                    this._supplyingEntityID.Unmarshal(dis);
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._padding2 = dis.ReadByte();
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ResupplyReceivedPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("<supplyingEntityID>");
+                this._supplyingEntityID.Reflection(sb);
+                sb.AppendLine("</supplyingEntityID>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<padding2 type=\"byte\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ResupplyReceivedPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ResupplyReceivedPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ResupplyReceivedPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._supplyingEntityID.Equals(obj._supplyingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._supplyingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SecondaryOperationalData.cs b/Libs/CSharpDis7/SecondaryOperationalData.cs
new file mode 100644
index 0000000..8c65209
--- /dev/null
+++ b/Libs/CSharpDis7/SecondaryOperationalData.cs
@@ -0,0 +1,341 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Additional operational data for an IFF emitting system and the number of IFF Fundamental Parameter Data records Section 6.2.76.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SecondaryOperationalData
+    {
+        /// <summary>
+        /// additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
+        /// </summary>
+        private byte _operationalData1;
+
+        /// <summary>
+        /// additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
+        /// </summary>
+        private byte _operationalData2;
+
+        /// <summary>
+        /// the number of IFF Fundamental Parameter Data records that follow
+        /// </summary>
+        private ushort _numberOfIFFFundamentalParameterRecords;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SecondaryOperationalData"/> class.
+        /// </summary>
+        public SecondaryOperationalData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SecondaryOperationalData left, SecondaryOperationalData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SecondaryOperationalData left, SecondaryOperationalData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._operationalData1
+            marshalSize += 1;  // this._operationalData2
+            marshalSize += 2;  // this._numberOfIFFFundamentalParameterRecords
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "operationalData1")]
+        public byte OperationalData1
+        {
+            get
+            {
+                return this._operationalData1;
+            }
+
+            set
+            {
+                this._operationalData1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "operationalData2")]
+        public byte OperationalData2
+        {
+            get
+            {
+                return this._operationalData2;
+            }
+
+            set
+            {
+                this._operationalData2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the number of IFF Fundamental Parameter Data records that follow
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfIFFFundamentalParameterRecords")]
+        public ushort NumberOfIFFFundamentalParameterRecords
+        {
+            get
+            {
+                return this._numberOfIFFFundamentalParameterRecords;
+            }
+
+            set
+            {
+                this._numberOfIFFFundamentalParameterRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._operationalData1);
+                    dos.WriteUnsignedByte((byte)this._operationalData2);
+                    dos.WriteUnsignedShort((ushort)this._numberOfIFFFundamentalParameterRecords);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._operationalData1 = dis.ReadUnsignedByte();
+                    this._operationalData2 = dis.ReadUnsignedByte();
+                    this._numberOfIFFFundamentalParameterRecords = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SecondaryOperationalData>");
+            try
+            {
+                sb.AppendLine("<operationalData1 type=\"byte\">" + this._operationalData1.ToString(CultureInfo.InvariantCulture) + "</operationalData1>");
+                sb.AppendLine("<operationalData2 type=\"byte\">" + this._operationalData2.ToString(CultureInfo.InvariantCulture) + "</operationalData2>");
+                sb.AppendLine("<numberOfIFFFundamentalParameterRecords type=\"ushort\">" + this._numberOfIFFFundamentalParameterRecords.ToString(CultureInfo.InvariantCulture) + "</numberOfIFFFundamentalParameterRecords>");
+                sb.AppendLine("</SecondaryOperationalData>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SecondaryOperationalData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SecondaryOperationalData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._operationalData1 != obj._operationalData1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._operationalData2 != obj._operationalData2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfIFFFundamentalParameterRecords != obj._numberOfIFFFundamentalParameterRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._operationalData1.GetHashCode();
+            result = GenerateHash(result) ^ this._operationalData2.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfIFFFundamentalParameterRecords.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SeesPdu.cs b/Libs/CSharpDis7/SeesPdu.cs
new file mode 100644
index 0000000..75bc0ff
--- /dev/null
+++ b/Libs/CSharpDis7/SeesPdu.cs
@@ -0,0 +1,586 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  SEES PDU, supplemental emissions entity state information. Section 7.6.6 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(PropulsionSystemData))]
+    [XmlInclude(typeof(VectoringNozzleSystem))]
+    public partial class SeesPdu : DistributedEmissionsFamilyPdu, IEquatable<SeesPdu>
+    {
+        /// <summary>
+        /// Originating entity ID
+        /// </summary>
+        private EntityID _orginatingEntityID = new EntityID();
+
+        /// <summary>
+        /// IR Signature representation index
+        /// </summary>
+        private ushort _infraredSignatureRepresentationIndex;
+
+        /// <summary>
+        /// acoustic Signature representation index
+        /// </summary>
+        private ushort _acousticSignatureRepresentationIndex;
+
+        /// <summary>
+        /// radar cross section representation index
+        /// </summary>
+        private ushort _radarCrossSectionSignatureRepresentationIndex;
+
+        /// <summary>
+        /// how many propulsion systems
+        /// </summary>
+        private ushort _numberOfPropulsionSystems;
+
+        /// <summary>
+        /// how many vectoring nozzle systems
+        /// </summary>
+        private ushort _numberOfVectoringNozzleSystems;
+
+        /// <summary>
+        /// variable length list of propulsion system data
+        /// </summary>
+        private List<PropulsionSystemData> _propulsionSystemData = new List<PropulsionSystemData>();
+
+        /// <summary>
+        /// variable length list of vectoring system data
+        /// </summary>
+        private List<VectoringNozzleSystem> _vectoringSystemData = new List<VectoringNozzleSystem>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeesPdu"/> class.
+        /// </summary>
+        public SeesPdu()
+        {
+            PduType = (byte)30;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SeesPdu left, SeesPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SeesPdu left, SeesPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._orginatingEntityID.GetMarshalledSize();  // this._orginatingEntityID
+            marshalSize += 2;  // this._infraredSignatureRepresentationIndex
+            marshalSize += 2;  // this._acousticSignatureRepresentationIndex
+            marshalSize += 2;  // this._radarCrossSectionSignatureRepresentationIndex
+            marshalSize += 2;  // this._numberOfPropulsionSystems
+            marshalSize += 2;  // this._numberOfVectoringNozzleSystems
+            for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+            {
+                PropulsionSystemData listElement = (PropulsionSystemData)this._propulsionSystemData[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+            {
+                VectoringNozzleSystem listElement = (VectoringNozzleSystem)this._vectoringSystemData[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Originating entity ID
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "orginatingEntityID")]
+        public EntityID OrginatingEntityID
+        {
+            get
+            {
+                return this._orginatingEntityID;
+            }
+
+            set
+            {
+                this._orginatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the IR Signature representation index
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "infraredSignatureRepresentationIndex")]
+        public ushort InfraredSignatureRepresentationIndex
+        {
+            get
+            {
+                return this._infraredSignatureRepresentationIndex;
+            }
+
+            set
+            {
+                this._infraredSignatureRepresentationIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the acoustic Signature representation index
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "acousticSignatureRepresentationIndex")]
+        public ushort AcousticSignatureRepresentationIndex
+        {
+            get
+            {
+                return this._acousticSignatureRepresentationIndex;
+            }
+
+            set
+            {
+                this._acousticSignatureRepresentationIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the radar cross section representation index
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "radarCrossSectionSignatureRepresentationIndex")]
+        public ushort RadarCrossSectionSignatureRepresentationIndex
+        {
+            get
+            {
+                return this._radarCrossSectionSignatureRepresentationIndex;
+            }
+
+            set
+            {
+                this._radarCrossSectionSignatureRepresentationIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfPropulsionSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfPropulsionSystems")]
+        public ushort NumberOfPropulsionSystems
+        {
+            get
+            {
+                return this._numberOfPropulsionSystems;
+            }
+
+            set
+            {
+                this._numberOfPropulsionSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVectoringNozzleSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfVectoringNozzleSystems")]
+        public ushort NumberOfVectoringNozzleSystems
+        {
+            get
+            {
+                return this._numberOfVectoringNozzleSystems;
+            }
+
+            set
+            {
+                this._numberOfVectoringNozzleSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of propulsion system data
+        /// </summary>
+        [XmlElement(ElementName = "propulsionSystemDataList", Type = typeof(List<PropulsionSystemData>))]
+        public List<PropulsionSystemData> PropulsionSystemData
+        {
+            get
+            {
+                return this._propulsionSystemData;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of vectoring system data
+        /// </summary>
+        [XmlElement(ElementName = "vectoringSystemDataList", Type = typeof(List<VectoringNozzleSystem>))]
+        public List<VectoringNozzleSystem> VectoringSystemData
+        {
+            get
+            {
+                return this._vectoringSystemData;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._infraredSignatureRepresentationIndex);
+                    dos.WriteUnsignedShort((ushort)this._acousticSignatureRepresentationIndex);
+                    dos.WriteUnsignedShort((ushort)this._radarCrossSectionSignatureRepresentationIndex);
+                    dos.WriteUnsignedShort((ushort)this._propulsionSystemData.Count);
+                    dos.WriteUnsignedShort((ushort)this._vectoringSystemData.Count);
+
+                    for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                    {
+                        PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
+                        aPropulsionSystemData.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                    {
+                        VectoringNozzleSystem aVectoringNozzleSystem = (VectoringNozzleSystem)this._vectoringSystemData[idx];
+                        aVectoringNozzleSystem.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._orginatingEntityID.Unmarshal(dis);
+                    this._infraredSignatureRepresentationIndex = dis.ReadUnsignedShort();
+                    this._acousticSignatureRepresentationIndex = dis.ReadUnsignedShort();
+                    this._radarCrossSectionSignatureRepresentationIndex = dis.ReadUnsignedShort();
+                    this._numberOfPropulsionSystems = dis.ReadUnsignedShort();
+                    this._numberOfVectoringNozzleSystems = dis.ReadUnsignedShort();
+                    for (int idx = 0; idx < this.NumberOfPropulsionSystems; idx++)
+                    {
+                        PropulsionSystemData anX = new PropulsionSystemData();
+                        anX.Unmarshal(dis);
+                        this._propulsionSystemData.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVectoringNozzleSystems; idx++)
+                    {
+                        VectoringNozzleSystem anX = new VectoringNozzleSystem();
+                        anX.Unmarshal(dis);
+                        this._vectoringSystemData.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SeesPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<orginatingEntityID>");
+                this._orginatingEntityID.Reflection(sb);
+                sb.AppendLine("</orginatingEntityID>");
+                sb.AppendLine("<infraredSignatureRepresentationIndex type=\"ushort\">" + this._infraredSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</infraredSignatureRepresentationIndex>");
+                sb.AppendLine("<acousticSignatureRepresentationIndex type=\"ushort\">" + this._acousticSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</acousticSignatureRepresentationIndex>");
+                sb.AppendLine("<radarCrossSectionSignatureRepresentationIndex type=\"ushort\">" + this._radarCrossSectionSignatureRepresentationIndex.ToString(CultureInfo.InvariantCulture) + "</radarCrossSectionSignatureRepresentationIndex>");
+                sb.AppendLine("<propulsionSystemData type=\"ushort\">" + this._propulsionSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</propulsionSystemData>");
+                sb.AppendLine("<vectoringSystemData type=\"ushort\">" + this._vectoringSystemData.Count.ToString(CultureInfo.InvariantCulture) + "</vectoringSystemData>");
+                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                {
+                    sb.AppendLine("<propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"PropulsionSystemData\">");
+                    PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)this._propulsionSystemData[idx];
+                    aPropulsionSystemData.Reflection(sb);
+                    sb.AppendLine("</propulsionSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                {
+                    sb.AppendLine("<vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VectoringNozzleSystem\">");
+                    VectoringNozzleSystem aVectoringNozzleSystem = (VectoringNozzleSystem)this._vectoringSystemData[idx];
+                    aVectoringNozzleSystem.Reflection(sb);
+                    sb.AppendLine("</vectoringSystemData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SeesPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SeesPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SeesPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._orginatingEntityID.Equals(obj._orginatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._infraredSignatureRepresentationIndex != obj._infraredSignatureRepresentationIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._acousticSignatureRepresentationIndex != obj._acousticSignatureRepresentationIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._radarCrossSectionSignatureRepresentationIndex != obj._radarCrossSectionSignatureRepresentationIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfPropulsionSystems != obj._numberOfPropulsionSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVectoringNozzleSystems != obj._numberOfVectoringNozzleSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._propulsionSystemData.Count != obj._propulsionSystemData.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                {
+                    if (!this._propulsionSystemData[idx].Equals(obj._propulsionSystemData[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._vectoringSystemData.Count != obj._vectoringSystemData.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                {
+                    if (!this._vectoringSystemData[idx].Equals(obj._vectoringSystemData[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._orginatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._infraredSignatureRepresentationIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._acousticSignatureRepresentationIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._radarCrossSectionSignatureRepresentationIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfPropulsionSystems.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVectoringNozzleSystems.GetHashCode();
+
+            if (this._propulsionSystemData.Count > 0)
+            {
+                for (int idx = 0; idx < this._propulsionSystemData.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._propulsionSystemData[idx].GetHashCode();
+                }
+            }
+
+            if (this._vectoringSystemData.Count > 0)
+            {
+                for (int idx = 0; idx < this._vectoringSystemData.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._vectoringSystemData[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Sensor.cs b/Libs/CSharpDis7/Sensor.cs
new file mode 100644
index 0000000..e6efef8
--- /dev/null
+++ b/Libs/CSharpDis7/Sensor.cs
@@ -0,0 +1,437 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// An entity's sensor information.  Section 6.2.77.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Sensor
+    {
+        /// <summary>
+        ///  the source of the Sensor Type field 
+        /// </summary>
+        private byte _sensorTypeSource;
+
+        /// <summary>
+        /// the on/off status of the sensor
+        /// </summary>
+        private byte _sensorOnOffStatus;
+
+        /// <summary>
+        /// the sensor type and shall be represented by a 16-bit enumeration. 
+        /// </summary>
+        private ushort _sensorType;
+
+        /// <summary>
+        ///  the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part
+        /// </summary>
+        private uint _station;
+
+        /// <summary>
+        /// quantity of the sensor 
+        /// </summary>
+        private ushort _quantity;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Sensor"/> class.
+        /// </summary>
+        public Sensor()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Sensor left, Sensor right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Sensor left, Sensor right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._sensorTypeSource
+            marshalSize += 1;  // this._sensorOnOffStatus
+            marshalSize += 2;  // this._sensorType
+            marshalSize += 4;  // this._station
+            marshalSize += 2;  // this._quantity
+            marshalSize += 2;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the  the source of the Sensor Type field 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "sensorTypeSource")]
+        public byte SensorTypeSource
+        {
+            get
+            {
+                return this._sensorTypeSource;
+            }
+
+            set
+            {
+                this._sensorTypeSource = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the on/off status of the sensor
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "sensorOnOffStatus")]
+        public byte SensorOnOffStatus
+        {
+            get
+            {
+                return this._sensorOnOffStatus;
+            }
+
+            set
+            {
+                this._sensorOnOffStatus = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the sensor type and shall be represented by a 16-bit enumeration. 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "sensorType")]
+        public ushort SensorType
+        {
+            get
+            {
+                return this._sensorType;
+            }
+
+            set
+            {
+                this._sensorType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the  the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "station")]
+        public uint Station
+        {
+            get
+            {
+                return this._station;
+            }
+
+            set
+            {
+                this._station = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the quantity of the sensor 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "quantity")]
+        public ushort Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._sensorTypeSource);
+                    dos.WriteUnsignedByte((byte)this._sensorOnOffStatus);
+                    dos.WriteUnsignedShort((ushort)this._sensorType);
+                    dos.WriteUnsignedInt((uint)this._station);
+                    dos.WriteUnsignedShort((ushort)this._quantity);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._sensorTypeSource = dis.ReadUnsignedByte();
+                    this._sensorOnOffStatus = dis.ReadUnsignedByte();
+                    this._sensorType = dis.ReadUnsignedShort();
+                    this._station = dis.ReadUnsignedInt();
+                    this._quantity = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Sensor>");
+            try
+            {
+                sb.AppendLine("<sensorTypeSource type=\"byte\">" + this._sensorTypeSource.ToString(CultureInfo.InvariantCulture) + "</sensorTypeSource>");
+                sb.AppendLine("<sensorOnOffStatus type=\"byte\">" + this._sensorOnOffStatus.ToString(CultureInfo.InvariantCulture) + "</sensorOnOffStatus>");
+                sb.AppendLine("<sensorType type=\"ushort\">" + this._sensorType.ToString(CultureInfo.InvariantCulture) + "</sensorType>");
+                sb.AppendLine("<station type=\"uint\">" + this._station.ToString(CultureInfo.InvariantCulture) + "</station>");
+                sb.AppendLine("<quantity type=\"ushort\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</Sensor>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Sensor;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Sensor obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._sensorTypeSource != obj._sensorTypeSource)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sensorOnOffStatus != obj._sensorOnOffStatus)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._sensorType != obj._sensorType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._station != obj._station)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._sensorTypeSource.GetHashCode();
+            result = GenerateHash(result) ^ this._sensorOnOffStatus.GetHashCode();
+            result = GenerateHash(result) ^ this._sensorType.GetHashCode();
+            result = GenerateHash(result) ^ this._station.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SeparationVP.cs b/Libs/CSharpDis7/SeparationVP.cs
new file mode 100644
index 0000000..00a6a2f
--- /dev/null
+++ b/Libs/CSharpDis7/SeparationVP.cs
@@ -0,0 +1,472 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Physical separation of an entity from another entity.  Section 6.2.93.6
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SeparationVP
+    {
+        /// <summary>
+        /// the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        private byte _recordType = 4;
+
+        /// <summary>
+        /// Reason for separation. EBV
+        /// </summary>
+        private byte _reasonForSeparation;
+
+        /// <summary>
+        /// Whether the entity existed prior to separation EBV
+        /// </summary>
+        private byte _preEntityIndicator;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding1;
+
+        /// <summary>
+        /// ID of parent
+        /// </summary>
+        private EntityID _parentEntityID = new EntityID();
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding2;
+
+        /// <summary>
+        /// Station separated from
+        /// </summary>
+        private uint _stationLocation;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeparationVP"/> class.
+        /// </summary>
+        public SeparationVP()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SeparationVP left, SeparationVP right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SeparationVP left, SeparationVP right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._recordType
+            marshalSize += 1;  // this._reasonForSeparation
+            marshalSize += 1;  // this._preEntityIndicator
+            marshalSize += 1;  // this._padding1
+            marshalSize += this._parentEntityID.GetMarshalledSize();  // this._parentEntityID
+            marshalSize += 2;  // this._padding2
+            marshalSize += 4;  // this._stationLocation
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
+        public byte RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Reason for separation. EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "reasonForSeparation")]
+        public byte ReasonForSeparation
+        {
+            get
+            {
+                return this._reasonForSeparation;
+            }
+
+            set
+            {
+                this._reasonForSeparation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Whether the entity existed prior to separation EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "preEntityIndicator")]
+        public byte PreEntityIndicator
+        {
+            get
+            {
+                return this._preEntityIndicator;
+            }
+
+            set
+            {
+                this._preEntityIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding1")]
+        public byte Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of parent
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "parentEntityID")]
+        public EntityID ParentEntityID
+        {
+            get
+            {
+                return this._parentEntityID;
+            }
+
+            set
+            {
+                this._parentEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding2")]
+        public ushort Padding2
+        {
+            get
+            {
+                return this._padding2;
+            }
+
+            set
+            {
+                this._padding2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Station separated from
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "stationLocation")]
+        public uint StationLocation
+        {
+            get
+            {
+                return this._stationLocation;
+            }
+
+            set
+            {
+                this._stationLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._recordType);
+                    dos.WriteUnsignedByte((byte)this._reasonForSeparation);
+                    dos.WriteUnsignedByte((byte)this._preEntityIndicator);
+                    dos.WriteUnsignedByte((byte)this._padding1);
+                    this._parentEntityID.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._padding2);
+                    dos.WriteUnsignedInt((uint)this._stationLocation);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedByte();
+                    this._reasonForSeparation = dis.ReadUnsignedByte();
+                    this._preEntityIndicator = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadUnsignedByte();
+                    this._parentEntityID.Unmarshal(dis);
+                    this._padding2 = dis.ReadUnsignedShort();
+                    this._stationLocation = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SeparationVP>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<reasonForSeparation type=\"byte\">" + this._reasonForSeparation.ToString(CultureInfo.InvariantCulture) + "</reasonForSeparation>");
+                sb.AppendLine("<preEntityIndicator type=\"byte\">" + this._preEntityIndicator.ToString(CultureInfo.InvariantCulture) + "</preEntityIndicator>");
+                sb.AppendLine("<padding1 type=\"byte\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<parentEntityID>");
+                this._parentEntityID.Reflection(sb);
+                sb.AppendLine("</parentEntityID>");
+                sb.AppendLine("<padding2 type=\"ushort\">" + this._padding2.ToString(CultureInfo.InvariantCulture) + "</padding2>");
+                sb.AppendLine("<stationLocation type=\"uint\">" + this._stationLocation.ToString(CultureInfo.InvariantCulture) + "</stationLocation>");
+                sb.AppendLine("</SeparationVP>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SeparationVP;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SeparationVP obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._reasonForSeparation != obj._reasonForSeparation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._preEntityIndicator != obj._preEntityIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._parentEntityID.Equals(obj._parentEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding2 != obj._padding2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stationLocation != obj._stationLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._reasonForSeparation.GetHashCode();
+            result = GenerateHash(result) ^ this._preEntityIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._parentEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding2.GetHashCode();
+            result = GenerateHash(result) ^ this._stationLocation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/ServiceRequestPdu.cs b/Libs/CSharpDis7/ServiceRequestPdu.cs
new file mode 100644
index 0000000..3740c90
--- /dev/null
+++ b/Libs/CSharpDis7/ServiceRequestPdu.cs
@@ -0,0 +1,479 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Service Request PDU shall be used to communicate information associated with                            one entity requesting a service from another). Section 7.4.2 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(SupplyQuantity))]
+    public partial class ServiceRequestPdu : LogisticsFamilyPdu, IEquatable<ServiceRequestPdu>
+    {
+        /// <summary>
+        /// Entity that is requesting service (see 6.2.28), Section 7.4.2
+        /// </summary>
+        private EntityID _requestingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is providing the service (see 6.2.28), Section 7.4.2
+        /// </summary>
+        private EntityID _servicingEntityID = new EntityID();
+
+        /// <summary>
+        /// Type of service requested, Section 7.4.2
+        /// </summary>
+        private byte _serviceTypeRequested;
+
+        /// <summary>
+        /// How many requested, Section 7.4.2
+        /// </summary>
+        private byte _numberOfSupplyTypes;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _serviceRequestPadding;
+
+        private List<SupplyQuantity> _supplies = new List<SupplyQuantity>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServiceRequestPdu"/> class.
+        /// </summary>
+        public ServiceRequestPdu()
+        {
+            PduType = (byte)5;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(ServiceRequestPdu left, ServiceRequestPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(ServiceRequestPdu left, ServiceRequestPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._requestingEntityID.GetMarshalledSize();  // this._requestingEntityID
+            marshalSize += this._servicingEntityID.GetMarshalledSize();  // this._servicingEntityID
+            marshalSize += 1;  // this._serviceTypeRequested
+            marshalSize += 1;  // this._numberOfSupplyTypes
+            marshalSize += 2;  // this._serviceRequestPadding
+            for (int idx = 0; idx < this._supplies.Count; idx++)
+            {
+                SupplyQuantity listElement = (SupplyQuantity)this._supplies[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is requesting service (see 6.2.28), Section 7.4.2
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "requestingEntityID")]
+        public EntityID RequestingEntityID
+        {
+            get
+            {
+                return this._requestingEntityID;
+            }
+
+            set
+            {
+                this._requestingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is providing the service (see 6.2.28), Section 7.4.2
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "servicingEntityID")]
+        public EntityID ServicingEntityID
+        {
+            get
+            {
+                return this._servicingEntityID;
+            }
+
+            set
+            {
+                this._servicingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of service requested, Section 7.4.2
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "serviceTypeRequested")]
+        public byte ServiceTypeRequested
+        {
+            get
+            {
+                return this._serviceTypeRequested;
+            }
+
+            set
+            {
+                this._serviceTypeRequested = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfSupplyTypes method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfSupplyTypes")]
+        public byte NumberOfSupplyTypes
+        {
+            get
+            {
+                return this._numberOfSupplyTypes;
+            }
+
+            set
+            {
+                this._numberOfSupplyTypes = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "serviceRequestPadding")]
+        public short ServiceRequestPadding
+        {
+            get
+            {
+                return this._serviceRequestPadding;
+            }
+
+            set
+            {
+                this._serviceRequestPadding = value;
+            }
+        }
+
+        [XmlElement(ElementName = "suppliesList", Type = typeof(List<SupplyQuantity>))]
+        public List<SupplyQuantity> Supplies
+        {
+            get
+            {
+                return this._supplies;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._requestingEntityID.Marshal(dos);
+                    this._servicingEntityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._serviceTypeRequested);
+                    dos.WriteUnsignedByte((byte)this._supplies.Count);
+                    dos.WriteShort((short)this._serviceRequestPadding);
+
+                    for (int idx = 0; idx < this._supplies.Count; idx++)
+                    {
+                        SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                        aSupplyQuantity.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestingEntityID.Unmarshal(dis);
+                    this._servicingEntityID.Unmarshal(dis);
+                    this._serviceTypeRequested = dis.ReadUnsignedByte();
+                    this._numberOfSupplyTypes = dis.ReadUnsignedByte();
+                    this._serviceRequestPadding = dis.ReadShort();
+                    for (int idx = 0; idx < this.NumberOfSupplyTypes; idx++)
+                    {
+                        SupplyQuantity anX = new SupplyQuantity();
+                        anX.Unmarshal(dis);
+                        this._supplies.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<ServiceRequestPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestingEntityID>");
+                this._requestingEntityID.Reflection(sb);
+                sb.AppendLine("</requestingEntityID>");
+                sb.AppendLine("<servicingEntityID>");
+                this._servicingEntityID.Reflection(sb);
+                sb.AppendLine("</servicingEntityID>");
+                sb.AppendLine("<serviceTypeRequested type=\"byte\">" + this._serviceTypeRequested.ToString(CultureInfo.InvariantCulture) + "</serviceTypeRequested>");
+                sb.AppendLine("<supplies type=\"byte\">" + this._supplies.Count.ToString(CultureInfo.InvariantCulture) + "</supplies>");
+                sb.AppendLine("<serviceRequestPadding type=\"short\">" + this._serviceRequestPadding.ToString(CultureInfo.InvariantCulture) + "</serviceRequestPadding>");
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    sb.AppendLine("<supplies" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SupplyQuantity\">");
+                    SupplyQuantity aSupplyQuantity = (SupplyQuantity)this._supplies[idx];
+                    aSupplyQuantity.Reflection(sb);
+                    sb.AppendLine("</supplies" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</ServiceRequestPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as ServiceRequestPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(ServiceRequestPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._requestingEntityID.Equals(obj._requestingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._servicingEntityID.Equals(obj._servicingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._serviceTypeRequested != obj._serviceTypeRequested)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfSupplyTypes != obj._numberOfSupplyTypes)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._serviceRequestPadding != obj._serviceRequestPadding)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._supplies.Count != obj._supplies.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    if (!this._supplies[idx].Equals(obj._supplies[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._servicingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._serviceTypeRequested.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfSupplyTypes.GetHashCode();
+            result = GenerateHash(result) ^ this._serviceRequestPadding.GetHashCode();
+
+            if (this._supplies.Count > 0)
+            {
+                for (int idx = 0; idx < this._supplies.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._supplies[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SetDataPdu.cs b/Libs/CSharpDis7/SetDataPdu.cs
new file mode 100644
index 0000000..906bc69
--- /dev/null
+++ b/Libs/CSharpDis7/SetDataPdu.cs
@@ -0,0 +1,519 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.10. Change state information with the data contained in this. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class SetDataPdu : SimulationManagementFamilyPdu, IEquatable<SetDataPdu>
+    {
+        /// <summary>
+        /// ID of request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private uint _padding1;
+
+        /// <summary>
+        /// Number of fixed datum records
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// Number of variable datum records
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// variable length list of fixed datums
+        /// </summary>
+        private List<FixedDatum> _fixedDatums = new List<FixedDatum>();
+
+        /// <summary>
+        /// variable length list of variable length datums
+        /// </summary>
+        private List<VariableDatum> _variableDatums = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetDataPdu"/> class.
+        /// </summary>
+        public SetDataPdu()
+        {
+            PduType = (byte)19;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SetDataPdu left, SetDataPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SetDataPdu left, SetDataPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._padding1
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatums.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatums[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding1")]
+        public uint Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of fixed datums
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatums
+        {
+            get
+            {
+                return this._fixedDatums;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of variable length datums
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatums
+        {
+            get
+            {
+                return this._variableDatums;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._fixedDatums.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatums.Count);
+
+                    for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._padding1 = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatums.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatums.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SetDataPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<padding1 type=\"uint\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<fixedDatums type=\"uint\">" + this._fixedDatums.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatums>");
+                sb.AppendLine("<variableDatums type=\"uint\">" + this._variableDatums.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatums>");
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatums[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatums[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatums" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SetDataPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SetDataPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SetDataPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatums.Count != obj._fixedDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    if (!this._fixedDatums[idx].Equals(obj._fixedDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatums.Count != obj._variableDatums.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    if (!this._variableDatums[idx].Equals(obj._variableDatums[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatums[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatums.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatums.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatums[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SetDataReliablePdu.cs b/Libs/CSharpDis7/SetDataReliablePdu.cs
new file mode 100644
index 0000000..af94644
--- /dev/null
+++ b/Libs/CSharpDis7/SetDataReliablePdu.cs
@@ -0,0 +1,583 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.9: initializing or chaning internal state information, reliable. Needs manual intervention to fix     padding on variable datums. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(FixedDatum))]
+    [XmlInclude(typeof(VariableDatum))]
+    public partial class SetDataReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<SetDataReliablePdu>
+    {
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Fixed datum record count
+        /// </summary>
+        private uint _numberOfFixedDatumRecords;
+
+        /// <summary>
+        /// variable datum record count
+        /// </summary>
+        private uint _numberOfVariableDatumRecords;
+
+        /// <summary>
+        /// Fixed datum records
+        /// </summary>
+        private List<FixedDatum> _fixedDatumRecords = new List<FixedDatum>();
+
+        /// <summary>
+        /// Variable datum records
+        /// </summary>
+        private List<VariableDatum> _variableDatumRecords = new List<VariableDatum>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetDataReliablePdu"/> class.
+        /// </summary>
+        public SetDataReliablePdu()
+        {
+            PduType = (byte)59;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SetDataReliablePdu left, SetDataReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SetDataReliablePdu left, SetDataReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            marshalSize += 4;  // this._numberOfFixedDatumRecords
+            marshalSize += 4;  // this._numberOfVariableDatumRecords
+            for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+            {
+                FixedDatum listElement = (FixedDatum)this._fixedDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+            {
+                VariableDatum listElement = (VariableDatum)this._variableDatumRecords[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfFixedDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfFixedDatumRecords")]
+        public uint NumberOfFixedDatumRecords
+        {
+            get
+            {
+                return this._numberOfFixedDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfFixedDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfVariableDatumRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "numberOfVariableDatumRecords")]
+        public uint NumberOfVariableDatumRecords
+        {
+            get
+            {
+                return this._numberOfVariableDatumRecords;
+            }
+
+            set
+            {
+                this._numberOfVariableDatumRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fixed datum records
+        /// </summary>
+        [XmlElement(ElementName = "fixedDatumRecordsList", Type = typeof(List<FixedDatum>))]
+        public List<FixedDatum> FixedDatumRecords
+        {
+            get
+            {
+                return this._fixedDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum records
+        /// </summary>
+        [XmlElement(ElementName = "variableDatumRecordsList", Type = typeof(List<VariableDatum>))]
+        public List<VariableDatum> VariableDatumRecords
+        {
+            get
+            {
+                return this._variableDatumRecords;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                    dos.WriteUnsignedInt((uint)this._fixedDatumRecords.Count);
+                    dos.WriteUnsignedInt((uint)this._variableDatumRecords.Count);
+
+                    for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                    {
+                        FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                        aFixedDatum.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                    {
+                        VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                        aVariableDatum.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                    this._numberOfFixedDatumRecords = dis.ReadUnsignedInt();
+                    this._numberOfVariableDatumRecords = dis.ReadUnsignedInt();
+                    for (int idx = 0; idx < this.NumberOfFixedDatumRecords; idx++)
+                    {
+                        FixedDatum anX = new FixedDatum();
+                        anX.Unmarshal(dis);
+                        this._fixedDatumRecords.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfVariableDatumRecords; idx++)
+                    {
+                        VariableDatum anX = new VariableDatum();
+                        anX.Unmarshal(dis);
+                        this._variableDatumRecords.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SetDataReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("<fixedDatumRecords type=\"uint\">" + this._fixedDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</fixedDatumRecords>");
+                sb.AppendLine("<variableDatumRecords type=\"uint\">" + this._variableDatumRecords.Count.ToString(CultureInfo.InvariantCulture) + "</variableDatumRecords>");
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"FixedDatum\">");
+                    FixedDatum aFixedDatum = (FixedDatum)this._fixedDatumRecords[idx];
+                    aFixedDatum.Reflection(sb);
+                    sb.AppendLine("</fixedDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    sb.AppendLine("<variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"VariableDatum\">");
+                    VariableDatum aVariableDatum = (VariableDatum)this._variableDatumRecords[idx];
+                    aVariableDatum.Reflection(sb);
+                    sb.AppendLine("</variableDatumRecords" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</SetDataReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SetDataReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SetDataReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfFixedDatumRecords != obj._numberOfFixedDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfVariableDatumRecords != obj._numberOfVariableDatumRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fixedDatumRecords.Count != obj._fixedDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    if (!this._fixedDatumRecords[idx].Equals(obj._fixedDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._variableDatumRecords.Count != obj._variableDatumRecords.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    if (!this._variableDatumRecords[idx].Equals(obj._variableDatumRecords[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfFixedDatumRecords.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfVariableDatumRecords.GetHashCode();
+
+            if (this._fixedDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._fixedDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._fixedDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            if (this._variableDatumRecords.Count > 0)
+            {
+                for (int idx = 0; idx < this._variableDatumRecords.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._variableDatumRecords[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SimulationAddress.cs b/Libs/CSharpDis7/SimulationAddress.cs
new file mode 100644
index 0000000..d63c7e4
--- /dev/null
+++ b/Libs/CSharpDis7/SimulationAddress.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// A Simulation Address record shall consist of the Site Identification number and the Application Identification number. Section 6.2.79 
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SimulationAddress
+    {
+        /// <summary>
+        /// A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event. 
+        /// </summary>
+        private ushort _site;
+
+        /// <summary>
+        /// An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data.
+        /// </summary>
+        private ushort _application;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationAddress"/> class.
+        /// </summary>
+        public SimulationAddress()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationAddress left, SimulationAddress right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationAddress left, SimulationAddress right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._site
+            marshalSize += 2;  // this._application
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event. 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "site")]
+        public ushort Site
+        {
+            get
+            {
+                return this._site;
+            }
+
+            set
+            {
+                this._site = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "application")]
+        public ushort Application
+        {
+            get
+            {
+                return this._application;
+            }
+
+            set
+            {
+                this._application = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._site);
+                    dos.WriteUnsignedShort((ushort)this._application);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._site = dis.ReadUnsignedShort();
+                    this._application = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationAddress>");
+            try
+            {
+                sb.AppendLine("<site type=\"ushort\">" + this._site.ToString(CultureInfo.InvariantCulture) + "</site>");
+                sb.AppendLine("<application type=\"ushort\">" + this._application.ToString(CultureInfo.InvariantCulture) + "</application>");
+                sb.AppendLine("</SimulationAddress>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationAddress;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationAddress obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._site != obj._site)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._application != obj._application)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._site.GetHashCode();
+            result = GenerateHash(result) ^ this._application.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SimulationIdentifier.cs b/Libs/CSharpDis7/SimulationIdentifier.cs
new file mode 100644
index 0000000..c43cb1a
--- /dev/null
+++ b/Libs/CSharpDis7/SimulationIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of a simulation when using the 48-bit identifier format shall be specified by the Sim- ulation Identifier record. The reason that the 48-bit format is required in addition to the 32-bit simulation address format that actually identifies a specific simulation is because some 48-bit identifier fields in PDUs may contain either an Object Identifier, such as an Entity ID, or a Simulation Identifier. Section 6.2.80
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class SimulationIdentifier
+    {
+        /// <summary>
+        /// Simulation address 
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// This field shall be set to zero as there is no reference number associated with a Simulation Identifier.
+        /// </summary>
+        private ushort _referenceNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationIdentifier"/> class.
+        /// </summary>
+        public SimulationIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationIdentifier left, SimulationIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationIdentifier left, SimulationIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._referenceNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Simulation address 
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall be set to zero as there is no reference number associated with a Simulation Identifier.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
+        public ushort ReferenceNumber
+        {
+            get
+            {
+                return this._referenceNumber;
+            }
+
+            set
+            {
+                this._referenceNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._referenceNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
+                sb.AppendLine("</SimulationIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._referenceNumber != obj._referenceNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SimulationManagementFamilyPdu.cs b/Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
new file mode 100644
index 0000000..81b653d
--- /dev/null
+++ b/Libs/CSharpDis7/SimulationManagementFamilyPdu.cs
@@ -0,0 +1,318 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5 Abstract superclass for PDUs relating to the simulation itself. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SimulationManagementFamilyPdu : Pdu, IEquatable<SimulationManagementFamilyPdu>
+    {
+        /// <summary>
+        /// Entity that is sending message
+        /// </summary>
+        private EntityID _originatingEntityID = new EntityID();
+
+        /// <summary>
+        /// Entity that is intended to receive message
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationManagementFamilyPdu"/> class.
+        /// </summary>
+        public SimulationManagementFamilyPdu()
+        {
+            ProtocolFamily = (byte)5;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationManagementFamilyPdu left, SimulationManagementFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is sending message
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
+        public EntityID OriginatingEntityID
+        {
+            get
+            {
+                return this._originatingEntityID;
+            }
+
+            set
+            {
+                this._originatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Entity that is intended to receive message
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Marshal(dos);
+                    this._receivingEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Unmarshal(dis);
+                    this._receivingEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationManagementFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingEntityID>");
+                this._originatingEntityID.Reflection(sb);
+                sb.AppendLine("</originatingEntityID>");
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("</SimulationManagementFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationManagementFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationManagementFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SimulationManagementPduHeader.cs b/Libs/CSharpDis7/SimulationManagementPduHeader.cs
new file mode 100644
index 0000000..863e4f3
--- /dev/null
+++ b/Libs/CSharpDis7/SimulationManagementPduHeader.cs
@@ -0,0 +1,349 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// First part of a simulation management (SIMAN) PDU and SIMAN-Reliability (SIMAN-R) PDU. Sectionn 6.2.81
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(PduHeader))]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SimulationManagementPduHeader
+    {
+        /// <summary>
+        /// Conventional PDU header
+        /// </summary>
+        private PduHeader _pduHeader = new PduHeader();
+
+        /// <summary>
+        /// IDs the simulation or entity, etiehr a simulation or an entity. Either 6.2.80 or 6.2.28
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4
+        /// </summary>
+        private EntityID _recevingID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationManagementPduHeader"/> class.
+        /// </summary>
+        public SimulationManagementPduHeader()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationManagementPduHeader left, SimulationManagementPduHeader right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationManagementPduHeader left, SimulationManagementPduHeader right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._pduHeader.GetMarshalledSize();  // this._pduHeader
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._recevingID.GetMarshalledSize();  // this._recevingID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Conventional PDU header
+        /// </summary>
+        [XmlElement(Type = typeof(PduHeader), ElementName = "pduHeader")]
+        public PduHeader PduHeader
+        {
+            get
+            {
+                return this._pduHeader;
+            }
+
+            set
+            {
+                this._pduHeader = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the IDs the simulation or entity, etiehr a simulation or an entity. Either 6.2.80 or 6.2.28
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "recevingID")]
+        public EntityID RecevingID
+        {
+            get
+            {
+                return this._recevingID;
+            }
+
+            set
+            {
+                this._recevingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._pduHeader.Marshal(dos);
+                    this._originatingID.Marshal(dos);
+                    this._recevingID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._pduHeader.Unmarshal(dis);
+                    this._originatingID.Unmarshal(dis);
+                    this._recevingID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationManagementPduHeader>");
+            try
+            {
+                sb.AppendLine("<pduHeader>");
+                this._pduHeader.Reflection(sb);
+                sb.AppendLine("</pduHeader>");
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<recevingID>");
+                this._recevingID.Reflection(sb);
+                sb.AppendLine("</recevingID>");
+                sb.AppendLine("</SimulationManagementPduHeader>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationManagementPduHeader;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationManagementPduHeader obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._pduHeader.Equals(obj._pduHeader))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._recevingID.Equals(obj._recevingID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._pduHeader.GetHashCode();
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._recevingID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs b/Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
new file mode 100644
index 0000000..f21b6d3
--- /dev/null
+++ b/Libs/CSharpDis7/SimulationManagementWithReliabilityFamilyPdu.cs
@@ -0,0 +1,318 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12: Abstract superclass for reliable simulation management PDUs
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class SimulationManagementWithReliabilityFamilyPdu : Pdu, IEquatable<SimulationManagementWithReliabilityFamilyPdu>
+    {
+        /// <summary>
+        /// Object originatig the request
+        /// </summary>
+        private EntityID _originatingEntityID = new EntityID();
+
+        /// <summary>
+        /// Object with which this point object is associated
+        /// </summary>
+        private EntityID _receivingEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimulationManagementWithReliabilityFamilyPdu"/> class.
+        /// </summary>
+        public SimulationManagementWithReliabilityFamilyPdu()
+        {
+            ProtocolFamily = (byte)10;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SimulationManagementWithReliabilityFamilyPdu left, SimulationManagementWithReliabilityFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingEntityID.GetMarshalledSize();  // this._originatingEntityID
+            marshalSize += this._receivingEntityID.GetMarshalledSize();  // this._receivingEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Object originatig the request
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingEntityID")]
+        public EntityID OriginatingEntityID
+        {
+            get
+            {
+                return this._originatingEntityID;
+            }
+
+            set
+            {
+                this._originatingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Object with which this point object is associated
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingEntityID")]
+        public EntityID ReceivingEntityID
+        {
+            get
+            {
+                return this._receivingEntityID;
+            }
+
+            set
+            {
+                this._receivingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Marshal(dos);
+                    this._receivingEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingEntityID.Unmarshal(dis);
+                    this._receivingEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SimulationManagementWithReliabilityFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingEntityID>");
+                this._originatingEntityID.Reflection(sb);
+                sb.AppendLine("</originatingEntityID>");
+                sb.AppendLine("<receivingEntityID>");
+                this._receivingEntityID.Reflection(sb);
+                sb.AppendLine("</receivingEntityID>");
+                sb.AppendLine("</SimulationManagementWithReliabilityFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SimulationManagementWithReliabilityFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SimulationManagementWithReliabilityFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingEntityID.Equals(obj._originatingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingEntityID.Equals(obj._receivingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/StandardVariableSpecification.cs b/Libs/CSharpDis7/StandardVariableSpecification.cs
new file mode 100644
index 0000000..831a909
--- /dev/null
+++ b/Libs/CSharpDis7/StandardVariableSpecification.cs
@@ -0,0 +1,348 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Does not work, and causes failure in anything it is embedded in. Section 6.2.82
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationManagementPduHeader))]
+    public partial class StandardVariableSpecification
+    {
+        /// <summary>
+        /// Number of static variable records
+        /// </summary>
+        private ushort _numberOfStandardVariableRecords;
+
+        /// <summary>
+        /// variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded.
+        /// </summary>
+        private List<SimulationManagementPduHeader> _standardVariables = new List<SimulationManagementPduHeader>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StandardVariableSpecification"/> class.
+        /// </summary>
+        public StandardVariableSpecification()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StandardVariableSpecification left, StandardVariableSpecification right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StandardVariableSpecification left, StandardVariableSpecification right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._numberOfStandardVariableRecords
+            for (int idx = 0; idx < this._standardVariables.Count; idx++)
+            {
+                SimulationManagementPduHeader listElement = (SimulationManagementPduHeader)this._standardVariables[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfStandardVariableRecords method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "numberOfStandardVariableRecords")]
+        public ushort NumberOfStandardVariableRecords
+        {
+            get
+            {
+                return this._numberOfStandardVariableRecords;
+            }
+
+            set
+            {
+                this._numberOfStandardVariableRecords = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded.
+        /// </summary>
+        [XmlElement(ElementName = "standardVariablesList", Type = typeof(List<SimulationManagementPduHeader>))]
+        public List<SimulationManagementPduHeader> StandardVariables
+        {
+            get
+            {
+                return this._standardVariables;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._standardVariables.Count);
+
+                    for (int idx = 0; idx < this._standardVariables.Count; idx++)
+                    {
+                        SimulationManagementPduHeader aSimulationManagementPduHeader = (SimulationManagementPduHeader)this._standardVariables[idx];
+                        aSimulationManagementPduHeader.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._numberOfStandardVariableRecords = dis.ReadUnsignedShort();
+                    for (int idx = 0; idx < this.NumberOfStandardVariableRecords; idx++)
+                    {
+                        SimulationManagementPduHeader anX = new SimulationManagementPduHeader();
+                        anX.Unmarshal(dis);
+                        this._standardVariables.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StandardVariableSpecification>");
+            try
+            {
+                sb.AppendLine("<standardVariables type=\"ushort\">" + this._standardVariables.Count.ToString(CultureInfo.InvariantCulture) + "</standardVariables>");
+                for (int idx = 0; idx < this._standardVariables.Count; idx++)
+                {
+                    sb.AppendLine("<standardVariables" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"SimulationManagementPduHeader\">");
+                    SimulationManagementPduHeader aSimulationManagementPduHeader = (SimulationManagementPduHeader)this._standardVariables[idx];
+                    aSimulationManagementPduHeader.Reflection(sb);
+                    sb.AppendLine("</standardVariables" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</StandardVariableSpecification>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StandardVariableSpecification;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StandardVariableSpecification obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._numberOfStandardVariableRecords != obj._numberOfStandardVariableRecords)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._standardVariables.Count != obj._standardVariables.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._standardVariables.Count; idx++)
+                {
+                    if (!this._standardVariables[idx].Equals(obj._standardVariables[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._numberOfStandardVariableRecords.GetHashCode();
+
+            if (this._standardVariables.Count > 0)
+            {
+                for (int idx = 0; idx < this._standardVariables.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._standardVariables[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/StartResumePdu.cs b/Libs/CSharpDis7/StartResumePdu.cs
new file mode 100644
index 0000000..988dd1e
--- /dev/null
+++ b/Libs/CSharpDis7/StartResumePdu.cs
@@ -0,0 +1,419 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.4. Start or resume an exercise. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StartResumePdu : SimulationManagementFamilyPdu, IEquatable<StartResumePdu>
+    {
+        /// <summary>
+        /// Identifier for originating entity(or simulation)
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the receiving entity(or simulation)
+        /// </summary>
+        private EntityID _receivingID = new EntityID();
+
+        /// <summary>
+        /// This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16).
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16)
+        /// </summary>
+        private ClockTime _simulationTime = new ClockTime();
+
+        /// <summary>
+        /// Identifier for the specific and unique start/resume request
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartResumePdu"/> class.
+        /// </summary>
+        public StartResumePdu()
+        {
+            PduType = (byte)13;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StartResumePdu left, StartResumePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StartResumePdu left, StartResumePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for originating entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the receiving entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
+        public EntityID ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16).
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16)
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
+        public ClockTime SimulationTime
+        {
+            get
+            {
+                return this._simulationTime;
+            }
+
+            set
+            {
+                this._simulationTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the specific and unique start/resume request
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    this._realWorldTime.Marshal(dos);
+                    this._simulationTime.Marshal(dos);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._realWorldTime.Unmarshal(dis);
+                    this._simulationTime.Unmarshal(dis);
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StartResumePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<simulationTime>");
+                this._simulationTime.Reflection(sb);
+                sb.AppendLine("</simulationTime>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StartResumePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StartResumePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StartResumePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._simulationTime.Equals(obj._simulationTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/StartResumeReliablePdu.cs b/Libs/CSharpDis7/StartResumeReliablePdu.cs
new file mode 100644
index 0000000..9f1cdb3
--- /dev/null
+++ b/Libs/CSharpDis7/StartResumeReliablePdu.cs
@@ -0,0 +1,446 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.3: Start resume simulation, relaible. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StartResumeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StartResumeReliablePdu>
+    {
+        /// <summary>
+        /// time in real world for this operation to happen
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// time in simulation for the simulation to resume
+        /// </summary>
+        private ClockTime _simulationTime = new ClockTime();
+
+        /// <summary>
+        /// level of reliability service used for this transaction
+        /// </summary>
+        private byte _requiredReliabilityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _pad1;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad2;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartResumeReliablePdu"/> class.
+        /// </summary>
+        public StartResumeReliablePdu()
+        {
+            PduType = (byte)53;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StartResumeReliablePdu left, StartResumeReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StartResumeReliablePdu left, StartResumeReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += this._simulationTime.GetMarshalledSize();  // this._simulationTime
+            marshalSize += 1;  // this._requiredReliabilityService
+            marshalSize += 2;  // this._pad1
+            marshalSize += 1;  // this._pad2
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the time in real world for this operation to happen
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time in simulation for the simulation to resume
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "simulationTime")]
+        public ClockTime SimulationTime
+        {
+            get
+            {
+                return this._simulationTime;
+            }
+
+            set
+            {
+                this._simulationTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the level of reliability service used for this transaction
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliabilityService")]
+        public byte RequiredReliabilityService
+        {
+            get
+            {
+                return this._requiredReliabilityService;
+            }
+
+            set
+            {
+                this._requiredReliabilityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "pad1")]
+        public ushort Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad2")]
+        public byte Pad2
+        {
+            get
+            {
+                return this._pad2;
+            }
+
+            set
+            {
+                this._pad2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    this._simulationTime.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._requiredReliabilityService);
+                    dos.WriteUnsignedShort((ushort)this._pad1);
+                    dos.WriteUnsignedByte((byte)this._pad2);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._simulationTime.Unmarshal(dis);
+                    this._requiredReliabilityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedShort();
+                    this._pad2 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StartResumeReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<simulationTime>");
+                this._simulationTime.Reflection(sb);
+                sb.AppendLine("</simulationTime>");
+                sb.AppendLine("<requiredReliabilityService type=\"byte\">" + this._requiredReliabilityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliabilityService>");
+                sb.AppendLine("<pad1 type=\"ushort\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<pad2 type=\"byte\">" + this._pad2.ToString(CultureInfo.InvariantCulture) + "</pad2>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StartResumeReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StartResumeReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StartResumeReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._simulationTime.Equals(obj._simulationTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliabilityService != obj._requiredReliabilityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad2 != obj._pad2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._simulationTime.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliabilityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._pad2.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/StopFreezePdu.cs b/Libs/CSharpDis7/StopFreezePdu.cs
new file mode 100644
index 0000000..c779db0
--- /dev/null
+++ b/Libs/CSharpDis7/StopFreezePdu.cs
@@ -0,0 +1,481 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 7.5.5. Stop or freeze an enity (or exercise). COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StopFreezePdu : SimulationManagementFamilyPdu, IEquatable<StopFreezePdu>
+    {
+        /// <summary>
+        /// Identifier for originating entity(or simulation)
+        /// </summary>
+        private EntityID _originatingID = new EntityID();
+
+        /// <summary>
+        /// Identifier for the receiving entity(or simulation)
+        /// </summary>
+        private EntityID _receivingID = new EntityID();
+
+        /// <summary>
+        /// real-world(UTC) time at which the entity shall stop or freeze in the exercise
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration
+        /// </summary>
+        private byte _reason;
+
+        /// <summary>
+        /// Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants
+        /// </summary>
+        private byte _frozenBehavior;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private short _padding1;
+
+        /// <summary>
+        /// Request ID that is unique
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StopFreezePdu"/> class.
+        /// </summary>
+        public StopFreezePdu()
+        {
+            PduType = (byte)14;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StopFreezePdu left, StopFreezePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StopFreezePdu left, StopFreezePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._originatingID.GetMarshalledSize();  // this._originatingID
+            marshalSize += this._receivingID.GetMarshalledSize();  // this._receivingID
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += 1;  // this._reason
+            marshalSize += 1;  // this._frozenBehavior
+            marshalSize += 2;  // this._padding1
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for originating entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "originatingID")]
+        public EntityID OriginatingID
+        {
+            get
+            {
+                return this._originatingID;
+            }
+
+            set
+            {
+                this._originatingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Identifier for the receiving entity(or simulation)
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "receivingID")]
+        public EntityID ReceivingID
+        {
+            get
+            {
+                return this._receivingID;
+            }
+
+            set
+            {
+                this._receivingID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the real-world(UTC) time at which the entity shall stop or freeze in the exercise
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "reason")]
+        public byte Reason
+        {
+            get
+            {
+                return this._reason;
+            }
+
+            set
+            {
+                this._reason = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
+        public byte FrozenBehavior
+        {
+            get
+            {
+                return this._frozenBehavior;
+            }
+
+            set
+            {
+                this._frozenBehavior = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(short), ElementName = "padding1")]
+        public short Padding1
+        {
+            get
+            {
+                return this._padding1;
+            }
+
+            set
+            {
+                this._padding1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID that is unique
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._originatingID.Marshal(dos);
+                    this._receivingID.Marshal(dos);
+                    this._realWorldTime.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._reason);
+                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
+                    dos.WriteShort((short)this._padding1);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._originatingID.Unmarshal(dis);
+                    this._receivingID.Unmarshal(dis);
+                    this._realWorldTime.Unmarshal(dis);
+                    this._reason = dis.ReadUnsignedByte();
+                    this._frozenBehavior = dis.ReadUnsignedByte();
+                    this._padding1 = dis.ReadShort();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StopFreezePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<originatingID>");
+                this._originatingID.Reflection(sb);
+                sb.AppendLine("</originatingID>");
+                sb.AppendLine("<receivingID>");
+                this._receivingID.Reflection(sb);
+                sb.AppendLine("</receivingID>");
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
+                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
+                sb.AppendLine("<padding1 type=\"short\">" + this._padding1.ToString(CultureInfo.InvariantCulture) + "</padding1>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StopFreezePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StopFreezePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StopFreezePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._originatingID.Equals(obj._originatingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._receivingID.Equals(obj._receivingID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._reason != obj._reason)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frozenBehavior != obj._frozenBehavior)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding1 != obj._padding1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._originatingID.GetHashCode();
+            result = GenerateHash(result) ^ this._receivingID.GetHashCode();
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._reason.GetHashCode();
+            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
+            result = GenerateHash(result) ^ this._padding1.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/StopFreezeReliablePdu.cs b/Libs/CSharpDis7/StopFreezeReliablePdu.cs
new file mode 100644
index 0000000..c3b7535
--- /dev/null
+++ b/Libs/CSharpDis7/StopFreezeReliablePdu.cs
@@ -0,0 +1,444 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.12.4: Stop freeze simulation, relaible. COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ClockTime))]
+    public partial class StopFreezeReliablePdu : SimulationManagementWithReliabilityFamilyPdu, IEquatable<StopFreezeReliablePdu>
+    {
+        /// <summary>
+        /// time in real world for this operation to happen
+        /// </summary>
+        private ClockTime _realWorldTime = new ClockTime();
+
+        /// <summary>
+        /// Reason for stopping/freezing simulation
+        /// </summary>
+        private byte _reason;
+
+        /// <summary>
+        /// internal behvior of the simulation while frozen
+        /// </summary>
+        private byte _frozenBehavior;
+
+        /// <summary>
+        /// reliablity level
+        /// </summary>
+        private byte _requiredReliablityService;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad1;
+
+        /// <summary>
+        /// Request ID
+        /// </summary>
+        private uint _requestID;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StopFreezeReliablePdu"/> class.
+        /// </summary>
+        public StopFreezeReliablePdu()
+        {
+            PduType = (byte)54;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StopFreezeReliablePdu left, StopFreezeReliablePdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._realWorldTime.GetMarshalledSize();  // this._realWorldTime
+            marshalSize += 1;  // this._reason
+            marshalSize += 1;  // this._frozenBehavior
+            marshalSize += 1;  // this._requiredReliablityService
+            marshalSize += 1;  // this._pad1
+            marshalSize += 4;  // this._requestID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the time in real world for this operation to happen
+        /// </summary>
+        [XmlElement(Type = typeof(ClockTime), ElementName = "realWorldTime")]
+        public ClockTime RealWorldTime
+        {
+            get
+            {
+                return this._realWorldTime;
+            }
+
+            set
+            {
+                this._realWorldTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Reason for stopping/freezing simulation
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "reason")]
+        public byte Reason
+        {
+            get
+            {
+                return this._reason;
+            }
+
+            set
+            {
+                this._reason = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the internal behvior of the simulation while frozen
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "frozenBehavior")]
+        public byte FrozenBehavior
+        {
+            get
+            {
+                return this._frozenBehavior;
+            }
+
+            set
+            {
+                this._frozenBehavior = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the reliablity level
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "requiredReliablityService")]
+        public byte RequiredReliablityService
+        {
+            get
+            {
+                return this._requiredReliablityService;
+            }
+
+            set
+            {
+                this._requiredReliablityService = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad1")]
+        public byte Pad1
+        {
+            get
+            {
+                return this._pad1;
+            }
+
+            set
+            {
+                this._pad1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Request ID
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "requestID")]
+        public uint RequestID
+        {
+            get
+            {
+                return this._requestID;
+            }
+
+            set
+            {
+                this._requestID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._realWorldTime.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._reason);
+                    dos.WriteUnsignedByte((byte)this._frozenBehavior);
+                    dos.WriteUnsignedByte((byte)this._requiredReliablityService);
+                    dos.WriteUnsignedByte((byte)this._pad1);
+                    dos.WriteUnsignedInt((uint)this._requestID);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._realWorldTime.Unmarshal(dis);
+                    this._reason = dis.ReadUnsignedByte();
+                    this._frozenBehavior = dis.ReadUnsignedByte();
+                    this._requiredReliablityService = dis.ReadUnsignedByte();
+                    this._pad1 = dis.ReadUnsignedByte();
+                    this._requestID = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StopFreezeReliablePdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<realWorldTime>");
+                this._realWorldTime.Reflection(sb);
+                sb.AppendLine("</realWorldTime>");
+                sb.AppendLine("<reason type=\"byte\">" + this._reason.ToString(CultureInfo.InvariantCulture) + "</reason>");
+                sb.AppendLine("<frozenBehavior type=\"byte\">" + this._frozenBehavior.ToString(CultureInfo.InvariantCulture) + "</frozenBehavior>");
+                sb.AppendLine("<requiredReliablityService type=\"byte\">" + this._requiredReliablityService.ToString(CultureInfo.InvariantCulture) + "</requiredReliablityService>");
+                sb.AppendLine("<pad1 type=\"byte\">" + this._pad1.ToString(CultureInfo.InvariantCulture) + "</pad1>");
+                sb.AppendLine("<requestID type=\"uint\">" + this._requestID.ToString(CultureInfo.InvariantCulture) + "</requestID>");
+                sb.AppendLine("</StopFreezeReliablePdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StopFreezeReliablePdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StopFreezeReliablePdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._realWorldTime.Equals(obj._realWorldTime))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._reason != obj._reason)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._frozenBehavior != obj._frozenBehavior)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requiredReliablityService != obj._requiredReliablityService)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad1 != obj._pad1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._requestID != obj._requestID)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._realWorldTime.GetHashCode();
+            result = GenerateHash(result) ^ this._reason.GetHashCode();
+            result = GenerateHash(result) ^ this._frozenBehavior.GetHashCode();
+            result = GenerateHash(result) ^ this._requiredReliablityService.GetHashCode();
+            result = GenerateHash(result) ^ this._pad1.GetHashCode();
+            result = GenerateHash(result) ^ this._requestID.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/StorageFuel.cs b/Libs/CSharpDis7/StorageFuel.cs
new file mode 100644
index 0000000..2f24cd2
--- /dev/null
+++ b/Libs/CSharpDis7/StorageFuel.cs
@@ -0,0 +1,405 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Information about an entity's engine fuel. Section 6.2.83.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class StorageFuel
+    {
+        /// <summary>
+        /// Fuel quantity, units specified by next field
+        /// </summary>
+        private uint _fuelQuantity;
+
+        /// <summary>
+        /// Units in which the fuel is measured
+        /// </summary>
+        private byte _fuelMeasurementUnits;
+
+        /// <summary>
+        /// Type of fuel
+        /// </summary>
+        private byte _fuelType;
+
+        /// <summary>
+        /// Location of fuel as related to entity. See section 14 of EBV document
+        /// </summary>
+        private byte _fuelLocation;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageFuel"/> class.
+        /// </summary>
+        public StorageFuel()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StorageFuel left, StorageFuel right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StorageFuel left, StorageFuel right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._fuelQuantity
+            marshalSize += 1;  // this._fuelMeasurementUnits
+            marshalSize += 1;  // this._fuelType
+            marshalSize += 1;  // this._fuelLocation
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Fuel quantity, units specified by next field
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "fuelQuantity")]
+        public uint FuelQuantity
+        {
+            get
+            {
+                return this._fuelQuantity;
+            }
+
+            set
+            {
+                this._fuelQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Units in which the fuel is measured
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurementUnits")]
+        public byte FuelMeasurementUnits
+        {
+            get
+            {
+                return this._fuelMeasurementUnits;
+            }
+
+            set
+            {
+                this._fuelMeasurementUnits = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of fuel
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelType")]
+        public byte FuelType
+        {
+            get
+            {
+                return this._fuelType;
+            }
+
+            set
+            {
+                this._fuelType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of fuel as related to entity. See section 14 of EBV document
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
+        public byte FuelLocation
+        {
+            get
+            {
+                return this._fuelLocation;
+            }
+
+            set
+            {
+                this._fuelLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._fuelQuantity);
+                    dos.WriteUnsignedByte((byte)this._fuelMeasurementUnits);
+                    dos.WriteUnsignedByte((byte)this._fuelType);
+                    dos.WriteUnsignedByte((byte)this._fuelLocation);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._fuelQuantity = dis.ReadUnsignedInt();
+                    this._fuelMeasurementUnits = dis.ReadUnsignedByte();
+                    this._fuelType = dis.ReadUnsignedByte();
+                    this._fuelLocation = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StorageFuel>");
+            try
+            {
+                sb.AppendLine("<fuelQuantity type=\"uint\">" + this._fuelQuantity.ToString(CultureInfo.InvariantCulture) + "</fuelQuantity>");
+                sb.AppendLine("<fuelMeasurementUnits type=\"byte\">" + this._fuelMeasurementUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurementUnits>");
+                sb.AppendLine("<fuelType type=\"byte\">" + this._fuelType.ToString(CultureInfo.InvariantCulture) + "</fuelType>");
+                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</StorageFuel>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StorageFuel;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StorageFuel obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._fuelQuantity != obj._fuelQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelMeasurementUnits != obj._fuelMeasurementUnits)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelType != obj._fuelType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelLocation != obj._fuelLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._fuelQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelMeasurementUnits.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelType.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/StorageFuelReload.cs b/Libs/CSharpDis7/StorageFuelReload.cs
new file mode 100644
index 0000000..1f94c9f
--- /dev/null
+++ b/Libs/CSharpDis7/StorageFuelReload.cs
@@ -0,0 +1,501 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// For each type or location of Storage Fuel, this record shall specify the type, location, fuel measure- ment units, reload quantity and maximum quantity for storage fuel either for the whole entity or a specific storage fuel location (tank). Section 6.2.84.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class StorageFuelReload
+    {
+        /// <summary>
+        ///  the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity.
+        /// </summary>
+        private uint _standardQuantity;
+
+        /// <summary>
+        /// the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type.
+        /// </summary>
+        private uint _maximumQuantity;
+
+        /// <summary>
+        /// the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity.
+        /// </summary>
+        private byte _standardQuantityReloadTime;
+
+        /// <summary>
+        /// the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity.
+        /// </summary>
+        private byte _maximumQuantityReloadTime;
+
+        /// <summary>
+        /// the fuel measurement units. Enumeration
+        /// </summary>
+        private byte _fuelMeasurementUnits;
+
+        /// <summary>
+        /// Fuel type. Enumeration
+        /// </summary>
+        private byte _fuelType;
+
+        /// <summary>
+        /// Location of fuel as related to entity. See section 14 of EBV document
+        /// </summary>
+        private byte _fuelLocation;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageFuelReload"/> class.
+        /// </summary>
+        public StorageFuelReload()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(StorageFuelReload left, StorageFuelReload right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(StorageFuelReload left, StorageFuelReload right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._standardQuantity
+            marshalSize += 4;  // this._maximumQuantity
+            marshalSize += 1;  // this._standardQuantityReloadTime
+            marshalSize += 1;  // this._maximumQuantityReloadTime
+            marshalSize += 1;  // this._fuelMeasurementUnits
+            marshalSize += 1;  // this._fuelType
+            marshalSize += 1;  // this._fuelLocation
+            marshalSize += 1;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the  the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "standardQuantity")]
+        public uint StandardQuantity
+        {
+            get
+            {
+                return this._standardQuantity;
+            }
+
+            set
+            {
+                this._standardQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "maximumQuantity")]
+        public uint MaximumQuantity
+        {
+            get
+            {
+                return this._maximumQuantity;
+            }
+
+            set
+            {
+                this._maximumQuantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "standardQuantityReloadTime")]
+        public byte StandardQuantityReloadTime
+        {
+            get
+            {
+                return this._standardQuantityReloadTime;
+            }
+
+            set
+            {
+                this._standardQuantityReloadTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "maximumQuantityReloadTime")]
+        public byte MaximumQuantityReloadTime
+        {
+            get
+            {
+                return this._maximumQuantityReloadTime;
+            }
+
+            set
+            {
+                this._maximumQuantityReloadTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the fuel measurement units. Enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelMeasurementUnits")]
+        public byte FuelMeasurementUnits
+        {
+            get
+            {
+                return this._fuelMeasurementUnits;
+            }
+
+            set
+            {
+                this._fuelMeasurementUnits = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Fuel type. Enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelType")]
+        public byte FuelType
+        {
+            get
+            {
+                return this._fuelType;
+            }
+
+            set
+            {
+                this._fuelType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Location of fuel as related to entity. See section 14 of EBV document
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "fuelLocation")]
+        public byte FuelLocation
+        {
+            get
+            {
+                return this._fuelLocation;
+            }
+
+            set
+            {
+                this._fuelLocation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "padding")]
+        public byte Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._standardQuantity);
+                    dos.WriteUnsignedInt((uint)this._maximumQuantity);
+                    dos.WriteUnsignedByte((byte)this._standardQuantityReloadTime);
+                    dos.WriteUnsignedByte((byte)this._maximumQuantityReloadTime);
+                    dos.WriteUnsignedByte((byte)this._fuelMeasurementUnits);
+                    dos.WriteUnsignedByte((byte)this._fuelType);
+                    dos.WriteUnsignedByte((byte)this._fuelLocation);
+                    dos.WriteUnsignedByte((byte)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._standardQuantity = dis.ReadUnsignedInt();
+                    this._maximumQuantity = dis.ReadUnsignedInt();
+                    this._standardQuantityReloadTime = dis.ReadUnsignedByte();
+                    this._maximumQuantityReloadTime = dis.ReadUnsignedByte();
+                    this._fuelMeasurementUnits = dis.ReadUnsignedByte();
+                    this._fuelType = dis.ReadUnsignedByte();
+                    this._fuelLocation = dis.ReadUnsignedByte();
+                    this._padding = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<StorageFuelReload>");
+            try
+            {
+                sb.AppendLine("<standardQuantity type=\"uint\">" + this._standardQuantity.ToString(CultureInfo.InvariantCulture) + "</standardQuantity>");
+                sb.AppendLine("<maximumQuantity type=\"uint\">" + this._maximumQuantity.ToString(CultureInfo.InvariantCulture) + "</maximumQuantity>");
+                sb.AppendLine("<standardQuantityReloadTime type=\"byte\">" + this._standardQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</standardQuantityReloadTime>");
+                sb.AppendLine("<maximumQuantityReloadTime type=\"byte\">" + this._maximumQuantityReloadTime.ToString(CultureInfo.InvariantCulture) + "</maximumQuantityReloadTime>");
+                sb.AppendLine("<fuelMeasurementUnits type=\"byte\">" + this._fuelMeasurementUnits.ToString(CultureInfo.InvariantCulture) + "</fuelMeasurementUnits>");
+                sb.AppendLine("<fuelType type=\"byte\">" + this._fuelType.ToString(CultureInfo.InvariantCulture) + "</fuelType>");
+                sb.AppendLine("<fuelLocation type=\"byte\">" + this._fuelLocation.ToString(CultureInfo.InvariantCulture) + "</fuelLocation>");
+                sb.AppendLine("<padding type=\"byte\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</StorageFuelReload>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as StorageFuelReload;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(StorageFuelReload obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._standardQuantity != obj._standardQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumQuantity != obj._maximumQuantity)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._standardQuantityReloadTime != obj._standardQuantityReloadTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._maximumQuantityReloadTime != obj._maximumQuantityReloadTime)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelMeasurementUnits != obj._fuelMeasurementUnits)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelType != obj._fuelType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._fuelLocation != obj._fuelLocation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._standardQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumQuantity.GetHashCode();
+            result = GenerateHash(result) ^ this._standardQuantityReloadTime.GetHashCode();
+            result = GenerateHash(result) ^ this._maximumQuantityReloadTime.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelMeasurementUnits.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelType.GetHashCode();
+            result = GenerateHash(result) ^ this._fuelLocation.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SupplyQuantity.cs b/Libs/CSharpDis7/SupplyQuantity.cs
new file mode 100644
index 0000000..5d564b5
--- /dev/null
+++ b/Libs/CSharpDis7/SupplyQuantity.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  A supply, and the amount of that supply. Section 6.2.85
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityType))]
+    public partial class SupplyQuantity
+    {
+        /// <summary>
+        /// Type of supply
+        /// </summary>
+        private EntityType _supplyType = new EntityType();
+
+        /// <summary>
+        /// the number of units of a supply type. 
+        /// </summary>
+        private float _quantity;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SupplyQuantity"/> class.
+        /// </summary>
+        public SupplyQuantity()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SupplyQuantity left, SupplyQuantity right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SupplyQuantity left, SupplyQuantity right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._supplyType.GetMarshalledSize();  // this._supplyType
+            marshalSize += 4;  // this._quantity
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of supply
+        /// </summary>
+        [XmlElement(Type = typeof(EntityType), ElementName = "supplyType")]
+        public EntityType SupplyType
+        {
+            get
+            {
+                return this._supplyType;
+            }
+
+            set
+            {
+                this._supplyType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the the number of units of a supply type. 
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "quantity")]
+        public float Quantity
+        {
+            get
+            {
+                return this._quantity;
+            }
+
+            set
+            {
+                this._quantity = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._supplyType.Marshal(dos);
+                    dos.WriteFloat((float)this._quantity);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._supplyType.Unmarshal(dis);
+                    this._quantity = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SupplyQuantity>");
+            try
+            {
+                sb.AppendLine("<supplyType>");
+                this._supplyType.Reflection(sb);
+                sb.AppendLine("</supplyType>");
+                sb.AppendLine("<quantity type=\"float\">" + this._quantity.ToString(CultureInfo.InvariantCulture) + "</quantity>");
+                sb.AppendLine("</SupplyQuantity>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SupplyQuantity;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SupplyQuantity obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._supplyType.Equals(obj._supplyType))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._quantity != obj._quantity)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._supplyType.GetHashCode();
+            result = GenerateHash(result) ^ this._quantity.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs b/Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
new file mode 100644
index 0000000..b9c288d
--- /dev/null
+++ b/Libs/CSharpDis7/SyntheticEnvironmentFamilyPdu.cs
@@ -0,0 +1,248 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Section 5.3.11: Abstract superclass for synthetic environment PDUs
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class SyntheticEnvironmentFamilyPdu : Pdu, IEquatable<SyntheticEnvironmentFamilyPdu>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SyntheticEnvironmentFamilyPdu"/> class.
+        /// </summary>
+        public SyntheticEnvironmentFamilyPdu()
+        {
+            ProtocolFamily = (byte)9;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SyntheticEnvironmentFamilyPdu left, SyntheticEnvironmentFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SyntheticEnvironmentFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("</SyntheticEnvironmentFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SyntheticEnvironmentFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SyntheticEnvironmentFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/SystemIdentifier.cs b/Libs/CSharpDis7/SystemIdentifier.cs
new file mode 100644
index 0000000..db1c2a6
--- /dev/null
+++ b/Libs/CSharpDis7/SystemIdentifier.cs
@@ -0,0 +1,376 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The ID of the IFF emitting system. NOT COMPLETE. Section 6.2.86
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(ChangeOptions))]
+    public partial class SystemIdentifier
+    {
+        /// <summary>
+        /// general type of emitting system, an enumeration
+        /// </summary>
+        private ushort _systemType;
+
+        /// <summary>
+        /// named type of system, an enumeration
+        /// </summary>
+        private ushort _systemName;
+
+        /// <summary>
+        /// mode of operation for the system, an enumeration
+        /// </summary>
+        private ushort _systemMode;
+
+        /// <summary>
+        /// status of this PDU, see section 6.2.15
+        /// </summary>
+        private ChangeOptions _changeOptions = new ChangeOptions();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SystemIdentifier"/> class.
+        /// </summary>
+        public SystemIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(SystemIdentifier left, SystemIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(SystemIdentifier left, SystemIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._systemType
+            marshalSize += 2;  // this._systemName
+            marshalSize += 2;  // this._systemMode
+            marshalSize += this._changeOptions.GetMarshalledSize();  // this._changeOptions
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the general type of emitting system, an enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "systemType")]
+        public ushort SystemType
+        {
+            get
+            {
+                return this._systemType;
+            }
+
+            set
+            {
+                this._systemType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the named type of system, an enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "systemName")]
+        public ushort SystemName
+        {
+            get
+            {
+                return this._systemName;
+            }
+
+            set
+            {
+                this._systemName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mode of operation for the system, an enumeration
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "systemMode")]
+        public ushort SystemMode
+        {
+            get
+            {
+                return this._systemMode;
+            }
+
+            set
+            {
+                this._systemMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the status of this PDU, see section 6.2.15
+        /// </summary>
+        [XmlElement(Type = typeof(ChangeOptions), ElementName = "changeOptions")]
+        public ChangeOptions ChangeOptions
+        {
+            get
+            {
+                return this._changeOptions;
+            }
+
+            set
+            {
+                this._changeOptions = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._systemType);
+                    dos.WriteUnsignedShort((ushort)this._systemName);
+                    dos.WriteUnsignedShort((ushort)this._systemMode);
+                    this._changeOptions.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._systemType = dis.ReadUnsignedShort();
+                    this._systemName = dis.ReadUnsignedShort();
+                    this._systemMode = dis.ReadUnsignedShort();
+                    this._changeOptions.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<SystemIdentifier>");
+            try
+            {
+                sb.AppendLine("<systemType type=\"ushort\">" + this._systemType.ToString(CultureInfo.InvariantCulture) + "</systemType>");
+                sb.AppendLine("<systemName type=\"ushort\">" + this._systemName.ToString(CultureInfo.InvariantCulture) + "</systemName>");
+                sb.AppendLine("<systemMode type=\"ushort\">" + this._systemMode.ToString(CultureInfo.InvariantCulture) + "</systemMode>");
+                sb.AppendLine("<changeOptions>");
+                this._changeOptions.Reflection(sb);
+                sb.AppendLine("</changeOptions>");
+                sb.AppendLine("</SystemIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as SystemIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(SystemIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._systemType != obj._systemType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systemName != obj._systemName)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._systemMode != obj._systemMode)
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._changeOptions.Equals(obj._changeOptions))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._systemType.GetHashCode();
+            result = GenerateHash(result) ^ this._systemName.GetHashCode();
+            result = GenerateHash(result) ^ this._systemMode.GetHashCode();
+            result = GenerateHash(result) ^ this._changeOptions.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/TotalRecordSets.cs b/Libs/CSharpDis7/TotalRecordSets.cs
new file mode 100644
index 0000000..a7d9d4f
--- /dev/null
+++ b/Libs/CSharpDis7/TotalRecordSets.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Total number of record sets contained in a logical set of one or more PDUs. Used to transfer ownership, etc Section 6.2.88
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class TotalRecordSets
+    {
+        /// <summary>
+        /// Total number of record sets
+        /// </summary>
+        private ushort _totalRecordSets;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private ushort _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TotalRecordSets"/> class.
+        /// </summary>
+        public TotalRecordSets()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TotalRecordSets left, TotalRecordSets right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TotalRecordSets left, TotalRecordSets right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._totalRecordSets
+            marshalSize += 2;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Total number of record sets
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "totalRecordSets")]
+        public ushort TotalRecordSets_
+        {
+            get
+            {
+                return this._totalRecordSets;
+            }
+
+            set
+            {
+                this._totalRecordSets = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "padding")]
+        public ushort Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._totalRecordSets);
+                    dos.WriteUnsignedShort((ushort)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._totalRecordSets = dis.ReadUnsignedShort();
+                    this._padding = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TotalRecordSets>");
+            try
+            {
+                sb.AppendLine("<totalRecordSets type=\"ushort\">" + this._totalRecordSets.ToString(CultureInfo.InvariantCulture) + "</totalRecordSets>");
+                sb.AppendLine("<padding type=\"ushort\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</TotalRecordSets>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TotalRecordSets;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TotalRecordSets obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._totalRecordSets != obj._totalRecordSets)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._totalRecordSets.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/TrackJamData.cs b/Libs/CSharpDis7/TrackJamData.cs
new file mode 100644
index 0000000..da7cf75
--- /dev/null
+++ b/Libs/CSharpDis7/TrackJamData.cs
@@ -0,0 +1,344 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Track-Jam data Section 6.2.89
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class TrackJamData
+    {
+        /// <summary>
+        /// the entity tracked or illumated, or an emitter beam targeted with jamming
+        /// </summary>
+        private EntityID _entityID = new EntityID();
+
+        /// <summary>
+        /// Emitter system associated with the entity
+        /// </summary>
+        private byte _emitterNumber;
+
+        /// <summary>
+        /// Beam associated with the entity
+        /// </summary>
+        private byte _beamNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TrackJamData"/> class.
+        /// </summary>
+        public TrackJamData()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TrackJamData left, TrackJamData right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TrackJamData left, TrackJamData right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._entityID.GetMarshalledSize();  // this._entityID
+            marshalSize += 1;  // this._emitterNumber
+            marshalSize += 1;  // this._beamNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the entity tracked or illumated, or an emitter beam targeted with jamming
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "entityID")]
+        public EntityID EntityID
+        {
+            get
+            {
+                return this._entityID;
+            }
+
+            set
+            {
+                this._entityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Emitter system associated with the entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "emitterNumber")]
+        public byte EmitterNumber
+        {
+            get
+            {
+                return this._emitterNumber;
+            }
+
+            set
+            {
+                this._emitterNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Beam associated with the entity
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "beamNumber")]
+        public byte BeamNumber
+        {
+            get
+            {
+                return this._beamNumber;
+            }
+
+            set
+            {
+                this._beamNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._entityID.Marshal(dos);
+                    dos.WriteUnsignedByte((byte)this._emitterNumber);
+                    dos.WriteUnsignedByte((byte)this._beamNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._entityID.Unmarshal(dis);
+                    this._emitterNumber = dis.ReadUnsignedByte();
+                    this._beamNumber = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TrackJamData>");
+            try
+            {
+                sb.AppendLine("<entityID>");
+                this._entityID.Reflection(sb);
+                sb.AppendLine("</entityID>");
+                sb.AppendLine("<emitterNumber type=\"byte\">" + this._emitterNumber.ToString(CultureInfo.InvariantCulture) + "</emitterNumber>");
+                sb.AppendLine("<beamNumber type=\"byte\">" + this._beamNumber.ToString(CultureInfo.InvariantCulture) + "</beamNumber>");
+                sb.AppendLine("</TrackJamData>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TrackJamData;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TrackJamData obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._entityID.Equals(obj._entityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._emitterNumber != obj._emitterNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamNumber != obj._beamNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._entityID.GetHashCode();
+            result = GenerateHash(result) ^ this._emitterNumber.GetHashCode();
+            result = GenerateHash(result) ^ this._beamNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/TwoByteChunk.cs b/Libs/CSharpDis7/TwoByteChunk.cs
new file mode 100644
index 0000000..a92f68a
--- /dev/null
+++ b/Libs/CSharpDis7/TwoByteChunk.cs
@@ -0,0 +1,303 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// 16 bit piece of data
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class TwoByteChunk
+    {
+        /// <summary>
+        /// two bytes of arbitrary data
+        /// </summary>
+        private byte[] _otherParameters = new byte[2];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TwoByteChunk"/> class.
+        /// </summary>
+        public TwoByteChunk()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(TwoByteChunk left, TwoByteChunk right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(TwoByteChunk left, TwoByteChunk right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2 * 1;  // _otherParameters
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the two bytes of arbitrary data
+        /// </summary>
+        [XmlArray(ElementName = "otherParameters")]
+        public byte[] OtherParameters
+        {
+            get
+            {
+                return this._otherParameters;
+            }
+
+            set
+            {
+                this._otherParameters = value;
+            }
+}
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        dos.WriteByte(this._otherParameters[idx]);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                    {
+                        this._otherParameters[idx] = dis.ReadByte();
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<TwoByteChunk>");
+            try
+            {
+                for (int idx = 0; idx < this._otherParameters.Length; idx++)
+                {
+                    sb.AppendLine("<otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"byte\">" + this._otherParameters[idx] + "</otherParameters" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+            }
+
+                sb.AppendLine("</TwoByteChunk>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as TwoByteChunk;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(TwoByteChunk obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (obj._otherParameters.Length != 2) 
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < 2; idx++)
+                {
+                    if (this._otherParameters[idx] != obj._otherParameters[idx])
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+
+            for (int idx = 0; idx < 2; idx++)
+            {
+                result = GenerateHash(result) ^ this._otherParameters[idx].GetHashCode();
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/UAFundamentalParameter.cs b/Libs/CSharpDis7/UAFundamentalParameter.cs
new file mode 100644
index 0000000..f70d8c4
--- /dev/null
+++ b/Libs/CSharpDis7/UAFundamentalParameter.cs
@@ -0,0 +1,437 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Regeneration parameters for active emission systems that are variable throughout a scenario. Section 6.2.90
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class UAFundamentalParameter
+    {
+        /// <summary>
+        /// Which database record shall be used. An enumeration from EBV document
+        /// </summary>
+        private ushort _activeEmissionParameterIndex;
+
+        /// <summary>
+        /// The type of scan pattern, If not used, zero. An enumeration from EBV document
+        /// </summary>
+        private ushort _scanPattern;
+
+        /// <summary>
+        /// center azimuth bearing of th emain beam. In radians.
+        /// </summary>
+        private float _beamCenterAzimuthHorizontal;
+
+        /// <summary>
+        /// Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians.
+        /// </summary>
+        private float _azimuthalBeamwidthHorizontal;
+
+        /// <summary>
+        /// center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians.
+        /// </summary>
+        private float _beamCenterDepressionElevation;
+
+        /// <summary>
+        /// vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians.
+        /// </summary>
+        private float _beamwidthDownElevation;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UAFundamentalParameter"/> class.
+        /// </summary>
+        public UAFundamentalParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(UAFundamentalParameter left, UAFundamentalParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(UAFundamentalParameter left, UAFundamentalParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 2;  // this._activeEmissionParameterIndex
+            marshalSize += 2;  // this._scanPattern
+            marshalSize += 4;  // this._beamCenterAzimuthHorizontal
+            marshalSize += 4;  // this._azimuthalBeamwidthHorizontal
+            marshalSize += 4;  // this._beamCenterDepressionElevation
+            marshalSize += 4;  // this._beamwidthDownElevation
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Which database record shall be used. An enumeration from EBV document
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "activeEmissionParameterIndex")]
+        public ushort ActiveEmissionParameterIndex
+        {
+            get
+            {
+                return this._activeEmissionParameterIndex;
+            }
+
+            set
+            {
+                this._activeEmissionParameterIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the The type of scan pattern, If not used, zero. An enumeration from EBV document
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "scanPattern")]
+        public ushort ScanPattern
+        {
+            get
+            {
+                return this._scanPattern;
+            }
+
+            set
+            {
+                this._scanPattern = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the center azimuth bearing of th emain beam. In radians.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamCenterAzimuthHorizontal")]
+        public float BeamCenterAzimuthHorizontal
+        {
+            get
+            {
+                return this._beamCenterAzimuthHorizontal;
+            }
+
+            set
+            {
+                this._beamCenterAzimuthHorizontal = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "azimuthalBeamwidthHorizontal")]
+        public float AzimuthalBeamwidthHorizontal
+        {
+            get
+            {
+                return this._azimuthalBeamwidthHorizontal;
+            }
+
+            set
+            {
+                this._azimuthalBeamwidthHorizontal = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamCenterDepressionElevation")]
+        public float BeamCenterDepressionElevation
+        {
+            get
+            {
+                return this._beamCenterDepressionElevation;
+            }
+
+            set
+            {
+                this._beamCenterDepressionElevation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians.
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "beamwidthDownElevation")]
+        public float BeamwidthDownElevation
+        {
+            get
+            {
+                return this._beamwidthDownElevation;
+            }
+
+            set
+            {
+                this._beamwidthDownElevation = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedShort((ushort)this._activeEmissionParameterIndex);
+                    dos.WriteUnsignedShort((ushort)this._scanPattern);
+                    dos.WriteFloat((float)this._beamCenterAzimuthHorizontal);
+                    dos.WriteFloat((float)this._azimuthalBeamwidthHorizontal);
+                    dos.WriteFloat((float)this._beamCenterDepressionElevation);
+                    dos.WriteFloat((float)this._beamwidthDownElevation);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._activeEmissionParameterIndex = dis.ReadUnsignedShort();
+                    this._scanPattern = dis.ReadUnsignedShort();
+                    this._beamCenterAzimuthHorizontal = dis.ReadFloat();
+                    this._azimuthalBeamwidthHorizontal = dis.ReadFloat();
+                    this._beamCenterDepressionElevation = dis.ReadFloat();
+                    this._beamwidthDownElevation = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<UAFundamentalParameter>");
+            try
+            {
+                sb.AppendLine("<activeEmissionParameterIndex type=\"ushort\">" + this._activeEmissionParameterIndex.ToString(CultureInfo.InvariantCulture) + "</activeEmissionParameterIndex>");
+                sb.AppendLine("<scanPattern type=\"ushort\">" + this._scanPattern.ToString(CultureInfo.InvariantCulture) + "</scanPattern>");
+                sb.AppendLine("<beamCenterAzimuthHorizontal type=\"float\">" + this._beamCenterAzimuthHorizontal.ToString(CultureInfo.InvariantCulture) + "</beamCenterAzimuthHorizontal>");
+                sb.AppendLine("<azimuthalBeamwidthHorizontal type=\"float\">" + this._azimuthalBeamwidthHorizontal.ToString(CultureInfo.InvariantCulture) + "</azimuthalBeamwidthHorizontal>");
+                sb.AppendLine("<beamCenterDepressionElevation type=\"float\">" + this._beamCenterDepressionElevation.ToString(CultureInfo.InvariantCulture) + "</beamCenterDepressionElevation>");
+                sb.AppendLine("<beamwidthDownElevation type=\"float\">" + this._beamwidthDownElevation.ToString(CultureInfo.InvariantCulture) + "</beamwidthDownElevation>");
+                sb.AppendLine("</UAFundamentalParameter>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as UAFundamentalParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(UAFundamentalParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._activeEmissionParameterIndex != obj._activeEmissionParameterIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._scanPattern != obj._scanPattern)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamCenterAzimuthHorizontal != obj._beamCenterAzimuthHorizontal)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._azimuthalBeamwidthHorizontal != obj._azimuthalBeamwidthHorizontal)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamCenterDepressionElevation != obj._beamCenterDepressionElevation)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._beamwidthDownElevation != obj._beamwidthDownElevation)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._activeEmissionParameterIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._scanPattern.GetHashCode();
+            result = GenerateHash(result) ^ this._beamCenterAzimuthHorizontal.GetHashCode();
+            result = GenerateHash(result) ^ this._azimuthalBeamwidthHorizontal.GetHashCode();
+            result = GenerateHash(result) ^ this._beamCenterDepressionElevation.GetHashCode();
+            result = GenerateHash(result) ^ this._beamwidthDownElevation.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/UaPdu.cs b/Libs/CSharpDis7/UaPdu.cs
new file mode 100644
index 0000000..95784b1
--- /dev/null
+++ b/Libs/CSharpDis7/UaPdu.cs
@@ -0,0 +1,756 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    ///  Information about underwater acoustic emmissions. This requires manual cleanup.  The beam data records should ALL be a the finish, rather than attached to each emitter system. Section 7.6.4. UNFINISHED
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    [XmlInclude(typeof(EventIdentifier))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Float))]
+    [XmlInclude(typeof(Vector3Float))]
+    public partial class UaPdu : DistributedEmissionsFamilyPdu, IEquatable<UaPdu>
+    {
+        /// <summary>
+        /// ID of the entity that is the source of the emission
+        /// </summary>
+        private EntityID _emittingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of event
+        /// </summary>
+        private EventIdentifier _eventID = new EventIdentifier();
+
+        /// <summary>
+        /// This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
+        /// </summary>
+        private byte _stateChangeIndicator;
+
+        /// <summary>
+        /// padding
+        /// </summary>
+        private byte _pad;
+
+        /// <summary>
+        /// This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
+        /// </summary>
+        private ushort _passiveParameterIndex;
+
+        /// <summary>
+        /// This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
+        /// </summary>
+        private byte _propulsionPlantConfiguration;
+
+        /// <summary>
+        ///  This field shall represent the number of shafts on a platform
+        /// </summary>
+        private byte _numberOfShafts;
+
+        /// <summary>
+        /// This field shall indicate the number of APAs described in the current UA PDU
+        /// </summary>
+        private byte _numberOfAPAs;
+
+        /// <summary>
+        /// This field shall specify the number of UA emitter systems being described in the current UA PDU
+        /// </summary>
+        private byte _numberOfUAEmitterSystems;
+
+        /// <summary>
+        /// shaft RPM values. THIS IS WRONG. It has the wrong class in the list.
+        /// </summary>
+        private List<Vector3Float> _shaftRPMs = new List<Vector3Float>();
+
+        /// <summary>
+        /// apaData. THIS IS WRONG. It has the worng class in the list.
+        /// </summary>
+        private List<Vector3Float> _apaData = new List<Vector3Float>();
+
+        /// <summary>
+        /// THIS IS WRONG. It has the wrong class in the list.
+        /// </summary>
+        private List<Vector3Float> _emitterSystems = new List<Vector3Float>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UaPdu"/> class.
+        /// </summary>
+        public UaPdu()
+        {
+            PduType = (byte)29;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(UaPdu left, UaPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(UaPdu left, UaPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._emittingEntityID.GetMarshalledSize();  // this._emittingEntityID
+            marshalSize += this._eventID.GetMarshalledSize();  // this._eventID
+            marshalSize += 1;  // this._stateChangeIndicator
+            marshalSize += 1;  // this._pad
+            marshalSize += 2;  // this._passiveParameterIndex
+            marshalSize += 1;  // this._propulsionPlantConfiguration
+            marshalSize += 1;  // this._numberOfShafts
+            marshalSize += 1;  // this._numberOfAPAs
+            marshalSize += 1;  // this._numberOfUAEmitterSystems
+            for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._shaftRPMs[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._apaData.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._apaData[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+            {
+                Vector3Float listElement = (Vector3Float)this._emitterSystems[idx];
+                marshalSize += listElement.GetMarshalledSize();
+            }
+
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that is the source of the emission
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "emittingEntityID")]
+        public EntityID EmittingEntityID
+        {
+            get
+            {
+                return this._emittingEntityID;
+            }
+
+            set
+            {
+                this._emittingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of event
+        /// </summary>
+        [XmlElement(Type = typeof(EventIdentifier), ElementName = "eventID")]
+        public EventIdentifier EventID
+        {
+            get
+            {
+                return this._eventID;
+            }
+
+            set
+            {
+                this._eventID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "stateChangeIndicator")]
+        public byte StateChangeIndicator
+        {
+            get
+            {
+                return this._stateChangeIndicator;
+            }
+
+            set
+            {
+                this._stateChangeIndicator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "pad")]
+        public byte Pad
+        {
+            get
+            {
+                return this._pad;
+            }
+
+            set
+            {
+                this._pad = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or  file) shall define all noise generated as a function of propulsion plant configurations and associated  auxiliaries.
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "passiveParameterIndex")]
+        public ushort PassiveParameterIndex
+        {
+            get
+            {
+                return this._passiveParameterIndex;
+            }
+
+            set
+            {
+                this._passiveParameterIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "propulsionPlantConfiguration")]
+        public byte PropulsionPlantConfiguration
+        {
+            get
+            {
+                return this._propulsionPlantConfiguration;
+            }
+
+            set
+            {
+                this._propulsionPlantConfiguration = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfShafts method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfShafts")]
+        public byte NumberOfShafts
+        {
+            get
+            {
+                return this._numberOfShafts;
+            }
+
+            set
+            {
+                this._numberOfShafts = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfAPAs method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfAPAs")]
+        public byte NumberOfAPAs
+        {
+            get
+            {
+                return this._numberOfAPAs;
+            }
+
+            set
+            {
+                this._numberOfAPAs = value;
+            }
+        }
+
+        /// <summary>
+        /// Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+        /// The getnumberOfUAEmitterSystems method will also be based on the actual list length rather than this value. 
+        /// The method is simply here for completeness and should not be used for any computations.
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "numberOfUAEmitterSystems")]
+        public byte NumberOfUAEmitterSystems
+        {
+            get
+            {
+                return this._numberOfUAEmitterSystems;
+            }
+
+            set
+            {
+                this._numberOfUAEmitterSystems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the shaft RPM values. THIS IS WRONG. It has the wrong class in the list.
+        /// </summary>
+        [XmlElement(ElementName = "shaftRPMsList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> ShaftRPMs
+        {
+            get
+            {
+                return this._shaftRPMs;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the apaData. THIS IS WRONG. It has the worng class in the list.
+        /// </summary>
+        [XmlElement(ElementName = "apaDataList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> ApaData
+        {
+            get
+            {
+                return this._apaData;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the THIS IS WRONG. It has the wrong class in the list.
+        /// </summary>
+        [XmlElement(ElementName = "emitterSystemsList", Type = typeof(List<Vector3Float>))]
+        public List<Vector3Float> EmitterSystems
+        {
+            get
+            {
+                return this._emitterSystems;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public override void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Marshal(dos);
+                    this._eventID.Marshal(dos);
+                    dos.WriteByte((byte)this._stateChangeIndicator);
+                    dos.WriteByte((byte)this._pad);
+                    dos.WriteUnsignedShort((ushort)this._passiveParameterIndex);
+                    dos.WriteUnsignedByte((byte)this._propulsionPlantConfiguration);
+                    dos.WriteUnsignedByte((byte)this._shaftRPMs.Count);
+                    dos.WriteUnsignedByte((byte)this._apaData.Count);
+                    dos.WriteUnsignedByte((byte)this._emitterSystems.Count);
+
+                    for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._shaftRPMs[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._apaData.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._apaData[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+
+                    for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                    {
+                        Vector3Float aVector3Float = (Vector3Float)this._emitterSystems[idx];
+                        aVector3Float.Marshal(dos);
+                    }
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._emittingEntityID.Unmarshal(dis);
+                    this._eventID.Unmarshal(dis);
+                    this._stateChangeIndicator = dis.ReadByte();
+                    this._pad = dis.ReadByte();
+                    this._passiveParameterIndex = dis.ReadUnsignedShort();
+                    this._propulsionPlantConfiguration = dis.ReadUnsignedByte();
+                    this._numberOfShafts = dis.ReadUnsignedByte();
+                    this._numberOfAPAs = dis.ReadUnsignedByte();
+                    this._numberOfUAEmitterSystems = dis.ReadUnsignedByte();
+                    for (int idx = 0; idx < this.NumberOfShafts; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._shaftRPMs.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfAPAs; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._apaData.Add(anX);
+                    };
+
+                    for (int idx = 0; idx < this.NumberOfUAEmitterSystems; idx++)
+                    {
+                        Vector3Float anX = new Vector3Float();
+                        anX.Unmarshal(dis);
+                        this._emitterSystems.Add(anX);
+                    };
+
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<UaPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<emittingEntityID>");
+                this._emittingEntityID.Reflection(sb);
+                sb.AppendLine("</emittingEntityID>");
+                sb.AppendLine("<eventID>");
+                this._eventID.Reflection(sb);
+                sb.AppendLine("</eventID>");
+                sb.AppendLine("<stateChangeIndicator type=\"byte\">" + this._stateChangeIndicator.ToString(CultureInfo.InvariantCulture) + "</stateChangeIndicator>");
+                sb.AppendLine("<pad type=\"byte\">" + this._pad.ToString(CultureInfo.InvariantCulture) + "</pad>");
+                sb.AppendLine("<passiveParameterIndex type=\"ushort\">" + this._passiveParameterIndex.ToString(CultureInfo.InvariantCulture) + "</passiveParameterIndex>");
+                sb.AppendLine("<propulsionPlantConfiguration type=\"byte\">" + this._propulsionPlantConfiguration.ToString(CultureInfo.InvariantCulture) + "</propulsionPlantConfiguration>");
+                sb.AppendLine("<shaftRPMs type=\"byte\">" + this._shaftRPMs.Count.ToString(CultureInfo.InvariantCulture) + "</shaftRPMs>");
+                sb.AppendLine("<apaData type=\"byte\">" + this._apaData.Count.ToString(CultureInfo.InvariantCulture) + "</apaData>");
+                sb.AppendLine("<emitterSystems type=\"byte\">" + this._emitterSystems.Count.ToString(CultureInfo.InvariantCulture) + "</emitterSystems>");
+                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                {
+                    sb.AppendLine("<shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._shaftRPMs[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</shaftRPMs" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._apaData.Count; idx++)
+                {
+                    sb.AppendLine("<apaData" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._apaData[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</apaData" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                {
+                    sb.AppendLine("<emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + " type=\"Vector3Float\">");
+                    Vector3Float aVector3Float = (Vector3Float)this._emitterSystems[idx];
+                    aVector3Float.Reflection(sb);
+                    sb.AppendLine("</emitterSystems" + idx.ToString(CultureInfo.InvariantCulture) + ">");
+                }
+
+                sb.AppendLine("</UaPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as UaPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(UaPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._emittingEntityID.Equals(obj._emittingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._eventID.Equals(obj._eventID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._stateChangeIndicator != obj._stateChangeIndicator)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._pad != obj._pad)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._passiveParameterIndex != obj._passiveParameterIndex)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._propulsionPlantConfiguration != obj._propulsionPlantConfiguration)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfShafts != obj._numberOfShafts)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfAPAs != obj._numberOfAPAs)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._numberOfUAEmitterSystems != obj._numberOfUAEmitterSystems)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._shaftRPMs.Count != obj._shaftRPMs.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                {
+                    if (!this._shaftRPMs[idx].Equals(obj._shaftRPMs[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._apaData.Count != obj._apaData.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._apaData.Count; idx++)
+                {
+                    if (!this._apaData[idx].Equals(obj._apaData[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            if (this._emitterSystems.Count != obj._emitterSystems.Count)
+            {
+                ivarsEqual = false;
+            }
+
+            if (ivarsEqual)
+            {
+                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                {
+                    if (!this._emitterSystems[idx].Equals(obj._emitterSystems[idx]))
+                    {
+                        ivarsEqual = false;
+                    }
+                }
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._emittingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._eventID.GetHashCode();
+            result = GenerateHash(result) ^ this._stateChangeIndicator.GetHashCode();
+            result = GenerateHash(result) ^ this._pad.GetHashCode();
+            result = GenerateHash(result) ^ this._passiveParameterIndex.GetHashCode();
+            result = GenerateHash(result) ^ this._propulsionPlantConfiguration.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfShafts.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfAPAs.GetHashCode();
+            result = GenerateHash(result) ^ this._numberOfUAEmitterSystems.GetHashCode();
+
+            if (this._shaftRPMs.Count > 0)
+            {
+                for (int idx = 0; idx < this._shaftRPMs.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._shaftRPMs[idx].GetHashCode();
+                }
+            }
+
+            if (this._apaData.Count > 0)
+            {
+                for (int idx = 0; idx < this._apaData.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._apaData[idx].GetHashCode();
+                }
+            }
+
+            if (this._emitterSystems.Count > 0)
+            {
+                for (int idx = 0; idx < this._emitterSystems.Count; idx++)
+                {
+                    result = GenerateHash(result) ^ this._emitterSystems[idx].GetHashCode();
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/UnattachedIdentifier.cs b/Libs/CSharpDis7/UnattachedIdentifier.cs
new file mode 100644
index 0000000..7c6c000
--- /dev/null
+++ b/Libs/CSharpDis7/UnattachedIdentifier.cs
@@ -0,0 +1,312 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// The unique designation of one or more unattached radios in an event or exercise Section 6.2.91
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(SimulationAddress))]
+    public partial class UnattachedIdentifier
+    {
+        /// <summary>
+        /// See 6.2.79
+        /// </summary>
+        private SimulationAddress _simulationAddress = new SimulationAddress();
+
+        /// <summary>
+        /// Reference number
+        /// </summary>
+        private ushort _referenceNumber;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattachedIdentifier"/> class.
+        /// </summary>
+        public UnattachedIdentifier()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(UnattachedIdentifier left, UnattachedIdentifier right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(UnattachedIdentifier left, UnattachedIdentifier right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += this._simulationAddress.GetMarshalledSize();  // this._simulationAddress
+            marshalSize += 2;  // this._referenceNumber
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the See 6.2.79
+        /// </summary>
+        [XmlElement(Type = typeof(SimulationAddress), ElementName = "simulationAddress")]
+        public SimulationAddress SimulationAddress
+        {
+            get
+            {
+                return this._simulationAddress;
+            }
+
+            set
+            {
+                this._simulationAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Reference number
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "referenceNumber")]
+        public ushort ReferenceNumber
+        {
+            get
+            {
+                return this._referenceNumber;
+            }
+
+            set
+            {
+                this._referenceNumber = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    this._simulationAddress.Marshal(dos);
+                    dos.WriteUnsignedShort((ushort)this._referenceNumber);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._simulationAddress.Unmarshal(dis);
+                    this._referenceNumber = dis.ReadUnsignedShort();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<UnattachedIdentifier>");
+            try
+            {
+                sb.AppendLine("<simulationAddress>");
+                this._simulationAddress.Reflection(sb);
+                sb.AppendLine("</simulationAddress>");
+                sb.AppendLine("<referenceNumber type=\"ushort\">" + this._referenceNumber.ToString(CultureInfo.InvariantCulture) + "</referenceNumber>");
+                sb.AppendLine("</UnattachedIdentifier>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as UnattachedIdentifier;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(UnattachedIdentifier obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (!this._simulationAddress.Equals(obj._simulationAddress))
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._referenceNumber != obj._referenceNumber)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._simulationAddress.GetHashCode();
+            result = GenerateHash(result) ^ this._referenceNumber.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/UnsignedDISInteger.cs b/Libs/CSharpDis7/UnsignedDISInteger.cs
new file mode 100644
index 0000000..a09f68f
--- /dev/null
+++ b/Libs/CSharpDis7/UnsignedDISInteger.cs
@@ -0,0 +1,277 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// container class not in specification
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class UnsignedDISInteger
+    {
+        /// <summary>
+        /// unsigned integer
+        /// </summary>
+        private uint _val;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnsignedDISInteger"/> class.
+        /// </summary>
+        public UnsignedDISInteger()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(UnsignedDISInteger left, UnsignedDISInteger right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(UnsignedDISInteger left, UnsignedDISInteger right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._val
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the unsigned integer
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "val")]
+        public uint Val
+        {
+            get
+            {
+                return this._val;
+            }
+
+            set
+            {
+                this._val = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._val);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._val = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<UnsignedDISInteger>");
+            try
+            {
+                sb.AppendLine("<val type=\"uint\">" + this._val.ToString(CultureInfo.InvariantCulture) + "</val>");
+                sb.AppendLine("</UnsignedDISInteger>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as UnsignedDISInteger;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(UnsignedDISInteger obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._val != obj._val)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._val.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/VariableDatum.cs b/Libs/CSharpDis7/VariableDatum.cs
new file mode 100644
index 0000000..0b26932
--- /dev/null
+++ b/Libs/CSharpDis7/VariableDatum.cs
@@ -0,0 +1,373 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// the variable datum type, the datum length, and the value for that variable datum type. NOT COMPLETE. Section 6.2.92
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class VariableDatum
+    {
+        /// <summary>
+        /// Type of variable datum to be transmitted. 32 bit enumeration defined in EBV
+        /// </summary>
+        private uint _variableDatumID;
+
+        /// <summary>
+        /// Length, in bits, of the variable datum.
+        /// </summary>
+        private uint _variableDatumLength;
+
+        /// <summary>
+        /// Variable datum. This can be any number of bits long, depending on the datum.
+        /// </summary>
+        private uint _variableDatumBits;
+
+        /// <summary>
+        /// padding to put the record on a 64 bit boundary
+        /// </summary>
+        private uint _padding;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VariableDatum"/> class.
+        /// </summary>
+        public VariableDatum()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(VariableDatum left, VariableDatum right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(VariableDatum left, VariableDatum right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._variableDatumID
+            marshalSize += 4;  // this._variableDatumLength
+            marshalSize += 4;  // this._variableDatumBits
+            marshalSize += 4;  // this._padding
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of variable datum to be transmitted. 32 bit enumeration defined in EBV
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumID")]
+        public uint VariableDatumID
+        {
+            get
+            {
+                return this._variableDatumID;
+            }
+
+            set
+            {
+                this._variableDatumID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length, in bits, of the variable datum.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumLength")]
+        public uint VariableDatumLength
+        {
+            get
+            {
+                return this._variableDatumLength;
+            }
+
+            set
+            {
+                this._variableDatumLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable datum. This can be any number of bits long, depending on the datum.
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "variableDatumBits")]
+        public uint VariableDatumBits
+        {
+            get
+            {
+                return this._variableDatumBits;
+            }
+
+            set
+            {
+                this._variableDatumBits = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding to put the record on a 64 bit boundary
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "padding")]
+        public uint Padding
+        {
+            get
+            {
+                return this._padding;
+            }
+
+            set
+            {
+                this._padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._variableDatumID);
+                    dos.WriteUnsignedInt((uint)this._variableDatumLength);
+                    dos.WriteUnsignedInt((uint)this._variableDatumBits);
+                    dos.WriteUnsignedInt((uint)this._padding);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._variableDatumID = dis.ReadUnsignedInt();
+                    this._variableDatumLength = dis.ReadUnsignedInt();
+                    this._variableDatumBits = dis.ReadUnsignedInt();
+                    this._padding = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<VariableDatum>");
+            try
+            {
+                sb.AppendLine("<variableDatumID type=\"uint\">" + this._variableDatumID.ToString(CultureInfo.InvariantCulture) + "</variableDatumID>");
+                sb.AppendLine("<variableDatumLength type=\"uint\">" + this._variableDatumLength.ToString(CultureInfo.InvariantCulture) + "</variableDatumLength>");
+                sb.AppendLine("<variableDatumBits type=\"uint\">" + this._variableDatumBits.ToString(CultureInfo.InvariantCulture) + "</variableDatumBits>");
+                sb.AppendLine("<padding type=\"uint\">" + this._padding.ToString(CultureInfo.InvariantCulture) + "</padding>");
+                sb.AppendLine("</VariableDatum>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as VariableDatum;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(VariableDatum obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._variableDatumID != obj._variableDatumID)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumLength != obj._variableDatumLength)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableDatumBits != obj._variableDatumBits)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._padding != obj._padding)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._variableDatumID.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumLength.GetHashCode();
+            result = GenerateHash(result) ^ this._variableDatumBits.GetHashCode();
+            result = GenerateHash(result) ^ this._padding.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/VariableParameter.cs b/Libs/CSharpDis7/VariableParameter.cs
new file mode 100644
index 0000000..b589e23
--- /dev/null
+++ b/Libs/CSharpDis7/VariableParameter.cs
@@ -0,0 +1,405 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// specification of additional information associated with an entity or detonation, not otherwise accounted for in a PDU 6.2.93.1
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class VariableParameter
+    {
+        /// <summary>
+        /// the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        private byte _recordType;
+
+        /// <summary>
+        /// Variable parameter data fields. Two doubles minus one byte
+        /// </summary>
+        private double _variableParameterFields1;
+
+        /// <summary>
+        /// Variable parameter data fields. 
+        /// </summary>
+        private uint _variableParameterFields2;
+
+        /// <summary>
+        /// Variable parameter data fields. 
+        /// </summary>
+        private ushort _variableParameterFields3;
+
+        /// <summary>
+        /// Variable parameter data fields. 
+        /// </summary>
+        private byte _variableParameterFields4;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VariableParameter"/> class.
+        /// </summary>
+        public VariableParameter()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(VariableParameter left, VariableParameter right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(VariableParameter left, VariableParameter right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 1;  // this._recordType
+            marshalSize += 8;  // this._variableParameterFields1
+            marshalSize += 4;  // this._variableParameterFields2
+            marshalSize += 2;  // this._variableParameterFields3
+            marshalSize += 1;  // this._variableParameterFields4
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the the identification of the Variable Parameter record. Enumeration from EBV
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "recordType")]
+        public byte RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable parameter data fields. Two doubles minus one byte
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "variableParameterFields1")]
+        public double VariableParameterFields1
+        {
+            get
+            {
+                return this._variableParameterFields1;
+            }
+
+            set
+            {
+                this._variableParameterFields1 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable parameter data fields. 
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "variableParameterFields2")]
+        public uint VariableParameterFields2
+        {
+            get
+            {
+                return this._variableParameterFields2;
+            }
+
+            set
+            {
+                this._variableParameterFields2 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable parameter data fields. 
+        /// </summary>
+        [XmlElement(Type = typeof(ushort), ElementName = "variableParameterFields3")]
+        public ushort VariableParameterFields3
+        {
+            get
+            {
+                return this._variableParameterFields3;
+            }
+
+            set
+            {
+                this._variableParameterFields3 = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Variable parameter data fields. 
+        /// </summary>
+        [XmlElement(Type = typeof(byte), ElementName = "variableParameterFields4")]
+        public byte VariableParameterFields4
+        {
+            get
+            {
+                return this._variableParameterFields4;
+            }
+
+            set
+            {
+                this._variableParameterFields4 = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedByte((byte)this._recordType);
+                    dos.WriteDouble((double)this._variableParameterFields1);
+                    dos.WriteUnsignedInt((uint)this._variableParameterFields2);
+                    dos.WriteUnsignedShort((ushort)this._variableParameterFields3);
+                    dos.WriteUnsignedByte((byte)this._variableParameterFields4);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedByte();
+                    this._variableParameterFields1 = dis.ReadDouble();
+                    this._variableParameterFields2 = dis.ReadUnsignedInt();
+                    this._variableParameterFields3 = dis.ReadUnsignedShort();
+                    this._variableParameterFields4 = dis.ReadUnsignedByte();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<VariableParameter>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"byte\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<variableParameterFields1 type=\"double\">" + this._variableParameterFields1.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields1>");
+                sb.AppendLine("<variableParameterFields2 type=\"uint\">" + this._variableParameterFields2.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields2>");
+                sb.AppendLine("<variableParameterFields3 type=\"ushort\">" + this._variableParameterFields3.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields3>");
+                sb.AppendLine("<variableParameterFields4 type=\"byte\">" + this._variableParameterFields4.ToString(CultureInfo.InvariantCulture) + "</variableParameterFields4>");
+                sb.AppendLine("</VariableParameter>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as VariableParameter;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(VariableParameter obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameterFields1 != obj._variableParameterFields1)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameterFields2 != obj._variableParameterFields2)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameterFields3 != obj._variableParameterFields3)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._variableParameterFields4 != obj._variableParameterFields4)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._variableParameterFields1.GetHashCode();
+            result = GenerateHash(result) ^ this._variableParameterFields2.GetHashCode();
+            result = GenerateHash(result) ^ this._variableParameterFields3.GetHashCode();
+            result = GenerateHash(result) ^ this._variableParameterFields4.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/VariableTransmitterParameters.cs b/Libs/CSharpDis7/VariableTransmitterParameters.cs
new file mode 100644
index 0000000..26f8411
--- /dev/null
+++ b/Libs/CSharpDis7/VariableTransmitterParameters.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Relates to radios. NOT COMPLETE. Section 6.2.94
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class VariableTransmitterParameters
+    {
+        /// <summary>
+        /// Type of VTP. Enumeration from EBV
+        /// </summary>
+        private uint _recordType = 4;
+
+        /// <summary>
+        /// Length, in bytes
+        /// </summary>
+        private uint _recordLength = 4;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VariableTransmitterParameters"/> class.
+        /// </summary>
+        public VariableTransmitterParameters()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(VariableTransmitterParameters left, VariableTransmitterParameters right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(VariableTransmitterParameters left, VariableTransmitterParameters right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._recordType
+            marshalSize += 4;  // this._recordLength
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the Type of VTP. Enumeration from EBV
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordType")]
+        public uint RecordType
+        {
+            get
+            {
+                return this._recordType;
+            }
+
+            set
+            {
+                this._recordType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Length, in bytes
+        /// </summary>
+        [XmlElement(Type = typeof(uint), ElementName = "recordLength")]
+        public uint RecordLength
+        {
+            get
+            {
+                return this._recordLength;
+            }
+
+            set
+            {
+                this._recordLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteUnsignedInt((uint)this._recordType);
+                    dos.WriteUnsignedInt((uint)this._recordLength);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._recordType = dis.ReadUnsignedInt();
+                    this._recordLength = dis.ReadUnsignedInt();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<VariableTransmitterParameters>");
+            try
+            {
+                sb.AppendLine("<recordType type=\"uint\">" + this._recordType.ToString(CultureInfo.InvariantCulture) + "</recordType>");
+                sb.AppendLine("<recordLength type=\"uint\">" + this._recordLength.ToString(CultureInfo.InvariantCulture) + "</recordLength>");
+                sb.AppendLine("</VariableTransmitterParameters>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as VariableTransmitterParameters;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(VariableTransmitterParameters obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._recordType != obj._recordType)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._recordLength != obj._recordLength)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._recordType.GetHashCode();
+            result = GenerateHash(result) ^ this._recordLength.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Vector2Float.cs b/Libs/CSharpDis7/Vector2Float.cs
new file mode 100644
index 0000000..2184d38
--- /dev/null
+++ b/Libs/CSharpDis7/Vector2Float.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Two floating point values, x, y
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Vector2Float
+    {
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Vector2Float"/> class.
+        /// </summary>
+        public Vector2Float()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Vector2Float left, Vector2Float right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Vector2Float left, Vector2Float right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Vector2Float>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("</Vector2Float>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Vector2Float;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Vector2Float obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Vector3Double.cs b/Libs/CSharpDis7/Vector3Double.cs
new file mode 100644
index 0000000..8784efa
--- /dev/null
+++ b/Libs/CSharpDis7/Vector3Double.cs
@@ -0,0 +1,341 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Three double precision floating point values, x, y, and z. Used for world coordinates Section 6.2.97.
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Vector3Double
+    {
+        /// <summary>
+        /// X value
+        /// </summary>
+        private double _x;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private double _y;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private double _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Vector3Double"/> class.
+        /// </summary>
+        public Vector3Double()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Vector3Double left, Vector3Double right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Vector3Double left, Vector3Double right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 8;  // this._x
+            marshalSize += 8;  // this._y
+            marshalSize += 8;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "x")]
+        public double X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "y")]
+        public double Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(double), ElementName = "z")]
+        public double Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteDouble((double)this._x);
+                    dos.WriteDouble((double)this._y);
+                    dos.WriteDouble((double)this._z);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadDouble();
+                    this._y = dis.ReadDouble();
+                    this._z = dis.ReadDouble();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Vector3Double>");
+            try
+            {
+                sb.AppendLine("<x type=\"double\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"double\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"double\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</Vector3Double>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Vector3Double;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Vector3Double obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/Vector3Float.cs b/Libs/CSharpDis7/Vector3Float.cs
new file mode 100644
index 0000000..82689bc
--- /dev/null
+++ b/Libs/CSharpDis7/Vector3Float.cs
@@ -0,0 +1,341 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Three floating point values, x, y, and z. Section 6.2.95
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class Vector3Float
+    {
+        /// <summary>
+        /// X value
+        /// </summary>
+        private float _x;
+
+        /// <summary>
+        /// y Value
+        /// </summary>
+        private float _y;
+
+        /// <summary>
+        /// Z value
+        /// </summary>
+        private float _z;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Vector3Float"/> class.
+        /// </summary>
+        public Vector3Float()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(Vector3Float left, Vector3Float right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(Vector3Float left, Vector3Float right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._x
+            marshalSize += 4;  // this._y
+            marshalSize += 4;  // this._z
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the X value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "x")]
+        public float X
+        {
+            get
+            {
+                return this._x;
+            }
+
+            set
+            {
+                this._x = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the y Value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "y")]
+        public float Y
+        {
+            get
+            {
+                return this._y;
+            }
+
+            set
+            {
+                this._y = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z value
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "z")]
+        public float Z
+        {
+            get
+            {
+                return this._z;
+            }
+
+            set
+            {
+                this._z = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._x);
+                    dos.WriteFloat((float)this._y);
+                    dos.WriteFloat((float)this._z);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._x = dis.ReadFloat();
+                    this._y = dis.ReadFloat();
+                    this._z = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<Vector3Float>");
+            try
+            {
+                sb.AppendLine("<x type=\"float\">" + this._x.ToString(CultureInfo.InvariantCulture) + "</x>");
+                sb.AppendLine("<y type=\"float\">" + this._y.ToString(CultureInfo.InvariantCulture) + "</y>");
+                sb.AppendLine("<z type=\"float\">" + this._z.ToString(CultureInfo.InvariantCulture) + "</z>");
+                sb.AppendLine("</Vector3Float>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as Vector3Float;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(Vector3Float obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._x != obj._x)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._y != obj._y)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._z != obj._z)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._x.GetHashCode();
+            result = GenerateHash(result) ^ this._y.GetHashCode();
+            result = GenerateHash(result) ^ this._z.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/VectoringNozzleSystem.cs b/Libs/CSharpDis7/VectoringNozzleSystem.cs
new file mode 100644
index 0000000..5bd7e4d
--- /dev/null
+++ b/Libs/CSharpDis7/VectoringNozzleSystem.cs
@@ -0,0 +1,309 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// Operational data for describing the vectoring nozzle systems Section 6.2.96
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    public partial class VectoringNozzleSystem
+    {
+        /// <summary>
+        /// In degrees
+        /// </summary>
+        private float _horizontalDeflectionAngle;
+
+        /// <summary>
+        /// In degrees
+        /// </summary>
+        private float _verticalDeflectionAngle;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VectoringNozzleSystem"/> class.
+        /// </summary>
+        public VectoringNozzleSystem()
+        {
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(VectoringNozzleSystem left, VectoringNozzleSystem right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(VectoringNozzleSystem left, VectoringNozzleSystem right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public virtual int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize += 4;  // this._horizontalDeflectionAngle
+            marshalSize += 4;  // this._verticalDeflectionAngle
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the In degrees
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "horizontalDeflectionAngle")]
+        public float HorizontalDeflectionAngle
+        {
+            get
+            {
+                return this._horizontalDeflectionAngle;
+            }
+
+            set
+            {
+                this._horizontalDeflectionAngle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the In degrees
+        /// </summary>
+        [XmlElement(Type = typeof(float), ElementName = "verticalDeflectionAngle")]
+        public float VerticalDeflectionAngle
+        {
+            get
+            {
+                return this._verticalDeflectionAngle;
+            }
+
+            set
+            {
+                this._verticalDeflectionAngle = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when exception when processing PDU is caught.
+        /// </summary>
+        public event Action<Exception> Exception;
+
+        /// <summary>
+        /// Called when exception occurs (raises the <see cref="Exception"/> event).
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        protected void OnException(Exception e)
+        {
+            if (this.Exception != null)
+            {
+                this.Exception(e);
+            }
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Marshal(DataOutputStream dos)
+        {
+            if (dos != null)
+            {
+                try
+                {
+                    dos.WriteFloat((float)this._horizontalDeflectionAngle);
+                    dos.WriteFloat((float)this._verticalDeflectionAngle);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Unmarshal(DataInputStream dis)
+        {
+            if (dis != null)
+            {
+                try
+                {
+                    this._horizontalDeflectionAngle = dis.ReadFloat();
+                    this._verticalDeflectionAngle = dis.ReadFloat();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public virtual void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<VectoringNozzleSystem>");
+            try
+            {
+                sb.AppendLine("<horizontalDeflectionAngle type=\"float\">" + this._horizontalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</horizontalDeflectionAngle>");
+                sb.AppendLine("<verticalDeflectionAngle type=\"float\">" + this._verticalDeflectionAngle.ToString(CultureInfo.InvariantCulture) + "</verticalDeflectionAngle>");
+                sb.AppendLine("</VectoringNozzleSystem>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as VectoringNozzleSystem;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(VectoringNozzleSystem obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            if (this._horizontalDeflectionAngle != obj._horizontalDeflectionAngle)
+            {
+                ivarsEqual = false;
+            }
+
+            if (this._verticalDeflectionAngle != obj._verticalDeflectionAngle)
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ this._horizontalDeflectionAngle.GetHashCode();
+            result = GenerateHash(result) ^ this._verticalDeflectionAngle.GetHashCode();
+
+            return result;
+        }
+    }
+}
diff --git a/Libs/CSharpDis7/WarfareFamilyPdu.cs b/Libs/CSharpDis7/WarfareFamilyPdu.cs
new file mode 100644
index 0000000..86a8974
--- /dev/null
+++ b/Libs/CSharpDis7/WarfareFamilyPdu.cs
@@ -0,0 +1,318 @@
+// Copyright (c) 1995-2009 held by the author(s).  All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+//   notice, this list of conditions and the following disclaimer
+//   in the documentation and/or other materials provided with the
+//   distribution.
+// * Neither the names of the Naval Postgraduate School (NPS)
+//   Modeling Virtual Environments and Simulation (MOVES) Institute
+//   (http://www.nps.edu and http://www.MovesInstitute.org)
+//   nor the names of its contributors may be used to endorse or
+//   promote products derived from this software without specific
+//   prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Copyright (c) 2008, MOVES Institute, Naval Postgraduate School. All 
+// rights reserved. This work is licensed under the BSD open source license,
+// available at https://www.movesinstitute.org/licenses/bsd.html
+//
+// Author: DMcG
+// Modified for use with C#:
+//  - Peter Smith (Naval Air Warfare Center - Training Systems Division)
+//  - Zvonko Bostjancic (Blubit d.o.o. - zvonko.bostjancic@blubit.si)
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Diagnostics;
+using System.Xml.Serialization;
+using DISnet.DataStreamUtilities;
+
+namespace DISnet
+{
+    /// <summary>
+    /// abstract superclass for fire and detonation pdus that have shared information. Section 7.3 COMPLETE
+    /// </summary>
+    [Serializable]
+    [XmlRoot]
+    [XmlInclude(typeof(EntityID))]
+    public partial class WarfareFamilyPdu : Pdu, IEquatable<WarfareFamilyPdu>
+    {
+        /// <summary>
+        /// ID of the entity that shot
+        /// </summary>
+        private EntityID _firingEntityID = new EntityID();
+
+        /// <summary>
+        /// ID of the entity that is being shot at
+        /// </summary>
+        private EntityID _targetEntityID = new EntityID();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WarfareFamilyPdu"/> class.
+        /// </summary>
+        public WarfareFamilyPdu()
+        {
+            ProtocolFamily = (byte)2;
+        }
+
+        /// <summary>
+        /// Implements the operator !=.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if operands are not equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator !=(WarfareFamilyPdu left, WarfareFamilyPdu right)
+        {
+            return !(left == right);
+        }
+
+        /// <summary>
+        /// Implements the operator ==.
+        /// </summary>
+        /// <param name="left">The left operand.</param>
+        /// <param name="right">The right operand.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool operator ==(WarfareFamilyPdu left, WarfareFamilyPdu right)
+        {
+            if (object.ReferenceEquals(left, right))
+            {
+                return true;
+            }
+
+            if (((object)left == null) || ((object)right == null))
+            {
+                return false;
+            }
+
+            return left.Equals(right);
+        }
+
+        public override int GetMarshalledSize()
+        {
+            int marshalSize = 0; 
+
+            marshalSize = base.GetMarshalledSize();
+            marshalSize += this._firingEntityID.GetMarshalledSize();  // this._firingEntityID
+            marshalSize += this._targetEntityID.GetMarshalledSize();  // this._targetEntityID
+            return marshalSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that shot
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "firingEntityID")]
+        public EntityID FiringEntityID
+        {
+            get
+            {
+                return this._firingEntityID;
+            }
+
+            set
+            {
+                this._firingEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ID of the entity that is being shot at
+        /// </summary>
+        [XmlElement(Type = typeof(EntityID), ElementName = "targetEntityID")]
+        public EntityID TargetEntityID
+        {
+            get
+            {
+                return this._targetEntityID;
+            }
+
+            set
+            {
+                this._targetEntityID = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the length of the marshalled data, then calls the marshal method.
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        public virtual void MarshalAutoLengthSet(DataOutputStream dos)
+        {
+            // Set the length prior to marshalling data
+            this.Length = (ushort)this.GetMarshalledSize();
+            this.Marshal(dos);
+        }
+
+        /// <summary>
+        /// Marshal the data to the DataOutputStream.  Note: Length needs to be set before calling this method
+        /// </summary>
+        /// <param name="dos">The DataOutputStream instance to which the PDU is marshaled.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Marshal(DataOutputStream dos)
+        {
+            base.Marshal(dos);
+            if (dos != null)
+            {
+                try
+                {
+                    this._firingEntityID.Marshal(dos);
+                    this._targetEntityID.Marshal(dos);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Unmarshal(DataInputStream dis)
+        {
+            base.Unmarshal(dis);
+
+            if (dis != null)
+            {
+                try
+                {
+                    this._firingEntityID.Unmarshal(dis);
+                    this._targetEntityID.Unmarshal(dis);
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This allows for a quick display of PDU data.  The current format is unacceptable and only used for debugging.
+        /// This will be modified in the future to provide a better display.  Usage: 
+        /// pdu.GetType().InvokeMember("Reflection", System.Reflection.BindingFlags.InvokeMethod, null, pdu, new object[] { sb });
+        /// where pdu is an object representing a single pdu and sb is a StringBuilder.
+        /// Note: The supplied Utilities folder contains a method called 'DecodePDU' in the PDUProcessor Class that provides this functionality
+        /// </summary>
+        /// <param name="sb">The StringBuilder instance to which the PDU is written to.</param>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Due to ignoring errors.")]
+        public override void Reflection(StringBuilder sb)
+        {
+            sb.AppendLine("<WarfareFamilyPdu>");
+            base.Reflection(sb);
+            try
+            {
+                sb.AppendLine("<firingEntityID>");
+                this._firingEntityID.Reflection(sb);
+                sb.AppendLine("</firingEntityID>");
+                sb.AppendLine("<targetEntityID>");
+                this._targetEntityID.Reflection(sb);
+                sb.AppendLine("</targetEntityID>");
+                sb.AppendLine("</WarfareFamilyPdu>");
+            }
+            catch (Exception e)
+            {
+#if DEBUG
+                    Trace.WriteLine(e);
+                    Trace.Flush();
+#endif
+                    this.OnException(e);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object obj)
+        {
+            return this == obj as WarfareFamilyPdu;
+        }
+
+        /// <summary>
+        /// Compares for reference AND value equality.
+        /// </summary>
+        /// <param name="obj">The object to compare with this instance.</param>
+        /// <returns>
+        /// 	<c>true</c> if both operands are equal; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(WarfareFamilyPdu obj)
+        {
+            bool ivarsEqual = true;
+
+            if (obj.GetType() != this.GetType())
+            {
+                return false;
+            }
+
+            ivarsEqual = base.Equals(obj);
+
+            if (!this._firingEntityID.Equals(obj._firingEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            if (!this._targetEntityID.Equals(obj._targetEntityID))
+            {
+                ivarsEqual = false;
+            }
+
+            return ivarsEqual;
+        }
+
+        /// <summary>
+        /// HashCode Helper
+        /// </summary>
+        /// <param name="hash">The hash value.</param>
+        /// <returns>The new hash value.</returns>
+        private static int GenerateHash(int hash)
+        {
+            hash = hash << (5 + hash);
+            return hash;
+        }
+
+        /// <summary>
+        /// Gets the hash code.
+        /// </summary>
+        /// <returns>The hash code.</returns>
+        public override int GetHashCode()
+        {
+            int result = 0;
+
+            result = GenerateHash(result) ^ base.GetHashCode();
+
+            result = GenerateHash(result) ^ this._firingEntityID.GetHashCode();
+            result = GenerateHash(result) ^ this._targetEntityID.GetHashCode();
+
+            return result;
+        }
+    }
+}

From 15549601c9fe33af4b22be436f82aaa72ed1859d Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Sun, 10 Oct 2021 21:17:52 +0200
Subject: [PATCH 16/25] [QLTY] Clean directories

---
 .gitignore                               |   1 +
 .vs/OpenDis/DesignTimeBuild/.dtbcache.v2 | Bin 84205 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 .vs/OpenDis/DesignTimeBuild/.dtbcache.v2

diff --git a/.gitignore b/.gitignore
index aab5d79..4b8325c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ v16/
 Release/
 *.cache
 *.i.cs
+.vs/
diff --git a/.vs/OpenDis/DesignTimeBuild/.dtbcache.v2 b/.vs/OpenDis/DesignTimeBuild/.dtbcache.v2
deleted file mode 100644
index 67a8723c82645f90697b0d236a68e4f4a091bd8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 84205
zcmd6Q349!7{r)WXePg)_C8b<#bEi#;71A7S=oPX_%dt=<yOU(;UhL5}90DRDA|fCn
zA|fIpA|fIpA|fIpA|fIpA|fIpBJ!>yA|mpC-fL&xnRk<PJCol(pU;zbci(5;_xpX1
z?|aO9ynh?RFm~#;hD)R8Y-(R{jxlpdDVa)inej2JE1M~r$xNZ&%omeps@p7@#<sm?
zs$dy=_2;u^Sn*<SGBaxBbNOVZXdJho%^d0ISkPoP$J;wv;;pR<hFcdbuv!<kx5TXx
zYq+hkxx*T18#bGp+ZML9w6|MUd)vr@1qrjM#cCfhjTtoVq6m6*shBGjm*%sjoDuC_
z6caxeV*OUWkd0+?R%U)8S(qO$jG6gdY(;Xo5L=BOyYXA0n22SE&xkR-Vi~L0R^RCM
ztWTs;#x})#$*L*n;bdmwpm%o(!s6N*3K%=Pel@mXzjp_rn9;e#X=99cu@oN7o9S7-
z$&^)?btH<zQL&ZDcs^UmjudCDNft_GYF4yZN+h$f=EkOuSXVZkE@hI%@z}~JD>kvN
zQa*2Gim@d~p~|E6l$Xua3(qykza+jE&HSiUEEog9M{OK3N#w>3mFQ=8Wm72><)PeQ
z7De3Z8nfc-`!Xnd-Buwvni)){Eo1h8Rmi3`Se=D}l^#xw51>3l(YRG`kxun05=&%@
zD15P;8DC#;rN^qC!LDrHs_)F@>Jd^5r4!{dk58hgx}=ZN(#^`swj-?SMZKQ$W{DJC
z%)+T}oHwhhlq#0;*5Zs+D(219yjlIF;Z!od+!`OuuD3FahZ|c)+C~<RG&LpK8qF5d
z*!AoIb0f|7Rc6{c*BA{!6JCCnn1y5<1p?aBI(V9+jMv{$s|l%7zn~_)hC^0_>Tr@)
z2aotrp@wV;BOlf#GcC>a{rO}%Sxj!Q3M?N^b#(ChJBrj^yoLhHhIApG&8L#XOzP$G
zn<HZ@tx8i$>xB!=ws_lurjC|YtFgVqI5998QHcvhGm|j$2`1($*AI@Q&Gk)FlQbS*
zINa1SG7?WTClZOaCgZfgB#n+2idLH1A==hkn~F@{LEq1g)U}s^Q-YRyNofQ|n3vxZ
zgvjEz8szn*@)<$PE7}<}eFYf6Oq@5BEX7Y3;_E3jXyY^R>%!EATEQW|3PH%73{&nt
zbYF_*aEiA@>--wjR~SL)5^9NBmCY=*GFBd~E6omFiE=1GXtO@doQdYFIEEa_vn*~x
zO-<goI6>%>30|LcE}KDbcx5(WrRqB~nQYN4vg%KBC{a<V8Z8K|@*!(Q2ZdhE#`Kzb
zsE&41ZnImOhDTc3+ZLFKmIbX=OPdi~_f9V|&8HK!UXJv&w}@fqP0t1tK6JRPL}y_<
z!|g(qyzx+j&@LTv$@BDJ<JxR;^>c&JDHpO%gX1|m>$1Vh7p*+A<0E>t6k-sXnZaw8
z8A*<o^338fRn}Hiarrp1PuU9i`Zj_0ERh8m?ekuN>{*K69C>T6_rZ-cDk&<4)2m!R
zIFe31WxZpfz<Z6f4Up48?p~wocSr8pQ#kOR7L$+ui(18=O+_n1XR!FtL-w@v6i1ud
zb0P5Z!bGLXFUt%4AqYtW@2z(y&CyJ@P)x?zm<f|v@gh%l*<05#99?QJLsrlh(Jd*P
zm}XY-6j5b;zCq{^czdNtS;?Ddwv>-^b1B=aiHJ35<{O=7!^|Bz5h~_X`!XY0mQR)@
zpFF%8^zyZ3!Oi$-<i%?O%vg&Vzv})$=n=dHu9UVyeYA)P^+DJIUgjzmSW5{)n~h<X
zwn5Cht<5LV<6|nVNMcS719?{J(wbbV!Vf~vP;K5|Hk;yQPiOO(ZxA{JJ}==mWh{qW
z=1$H_RN(}nPpB4w>VsFftgM}?D{I_82tA@f*CE=0>Ekjx^3~qU3VamNoi{hiw3VX>
z@mnqOdSBU%1f8BzUeCZfCX0no$MJTwsJ)jJ4_u4!jG4wH=s+n`#G6}IvQLsKsD44n
ze|pgJ_h$2H6MfvyLZ*oczeWh}_NYN}Uk@s9JGnHK9i~&Ze8k^nrY!mjj9YwZC#!I3
z(8t$v3Va4bm6ci>IfJ421R;AW=u)IeSnnCJ4vP|1jTD4NfsX|HR?~TdTps;bx_D$s
zK3hyBSp|_JK`o;eUA(g(fzL8~B&9`5&N8cBK}a9?Jgh2WJskvz0!0;(^RQJ}j!w0=
z)q#&LJkp+=%u%&i@sgtpJ;l*x>TRI6e60z(_Cr*f6)Qxx^sTN%N^gH7aQg}=J!MDQ
zSH&j?*#mFu6bb9Q^H@kznJJKMT@_9c`UKuysIod;JXVfmdr^%PghpYs7p~H^)+}N{
zD<4z4+6zA;2wej2nIqx*@InHM6BE&5HgAq{%Orc|e(xZ(7z@EFt+dkF{P;>Um$MQy
z?Rn?$w2Gao_Ys27Bo=}u{mGn=e!!8Q{TPJAVbt%TOxnz#=p=X=M~ivOOnd9MmK20W
zfxp98k<6UQq?hk7=np|inh3hIFiCqh$*wCe^Cyc^<Mj+egTPyACM0$Nm{=&CVu>zW
zYQ-lA*#qxuGYL;9S^4qGLND3ZR=t9d{^X#`4zH^$$@@i#;Xl<Nt#1ZkZP3!LviJhh
zl|oc}cjTOUZ{OSV4BUQGIhPfSd|AD;-||OC;;HxOy%Gmr1Ep~F#}_d8b<ag8J~hbh
zD;0s;KPjQ|Vnf<LuV)Y%gi>Bsnn`Z@+~tM-7=*-u_ZVri(ybh9+e(QpI%I`L_89%%
zHE7|RfeU<8&cw8e8?$+A$QfZ1qf!$&D%Vqj&?b~p)GuEMxJwcJF$jqRZ#!w?dd7mX
z?Nq&jkUsF4bSmP2b!N#bh$SO(Cf)7v|E=Uv3mXKmwT{(Wx8%|z2+2dS^-(LoAsM&&
zv)B~Mq<7nTw`UC+_*$#LSE$j#5zWTeV-F7#UhZpf{a%CIK3f?|4`Hn}+?7gV(Jzx+
z_R*>26`vYp_oaE@vuQ%YWtN$+^3EO@riGkMtHP;4A75UCVtJ6_SZ=e)Uw@@X4U+qE
zBJf!=k;<|HxJr|pHPbR`(8ZSvp|oB|Y^jU;EsLr|5Yh+VTPUUJW*%;YD!m2qqa*Ru
zM^)ap4#C@gDe)TYrp}5NzZKi>@pLq(eUufr?O#1i&otoMb!c&sw%_%85ON1TyN5mG
zbO$@_8{_nY9G&ZSY>%A1uSN<&qri8hx`d?}A$O!YKL;Uo;A>AD@#=f9yPCCMa_x!7
zF9`VqU)}4GvA%Bw+fwLk;gG9)Cn5%+S>UUCy#lXDj*b;KTJ%55CHV$>0$vb$1>Rn}
z<yE&O$o5*x2tt>@*Co0nU1=4~1l=k^E5BTqsPPX%k1+GZGkDhIiNgp&m%!J0xYC?%
zIrA(el50JxvVzbl@O}!N6QlbT3YZ<B0}fWmWIx608H5HQ<cgyK|Fn|5+T*G?xl)A{
zgiaym3SSFfC0Dp-5E>MMe)}O;oYG}#c(<JwQyqo+p-jOX;jiqI;?2k;+#vKTPMd!G
z<en~;V`ogJpdbgKVc;vaWv<XxN3PfwzXc(0;IsTvUXNLpv;2PVAhZa+*DO|QFT;^J
za!E*~*R1*lA%EbrS2CIVaDq-go2yiNT8iZCRTWMU`g|~~dhXRn=-_=5Q}opM$sY?s
z>(J^F#K&odIHZivym;%9<6VOmzWKYr=e%S&Tam5wY~&jo)vE^SeKU5!_W?w0UnM7t
zXcemT%sie!Xb^ngUkC{!z>cqRhR&6~zmDPPQu};fXzjhK3*UwUOULVnx4o}Mb~LPg
zzAx|-dSsPQg{~~IkSFw1rv;(aH07H!(A4(R)Fg1oL1-BK_(xZV>Q7Ab1sav{Pc>E$
zItAVflCO2^yHaK{%`2De1$q2}kU#KJ=g62J&lR&cNH#Y%Uf-D-&EhTgm{3Ssi^<4A
zXc%~@(+k~I;LFHlsjJEgLZ`q_jM7WnlZj^&a;1tqF=}FJ5ZX;snRJYsVhQ#7IpiQT
zJS*tFx?boL+ZsE%aE4TJBpJu10d7okqMtssM}p8c@OPpW(P_U>z7v%{IucL459M9A
z8ThC|3P+bwW#Y-4$(txSs_=U|TGZZ83cOca5tDteuysHh2idFDGJ?=0@G%BDI&^gs
zf60sG0n7%-F^1RE(O}ADD*Q7Fg^=#UT;v!}^{PR7-xx3O*%EqsNqwb(>B7;N{n(Vk
zO_ZE1slsvesl9FlzV1qul^Q0w?n?0qLiWJd4JZ;;+a+F&6of{B+gnB00$ujT>bJDF
ze(xHz@Xg``ckaJvqM4YLVQAF*YY;MrQ?CcC(NfCHdpA2N_1e#=K_8!;3ce(bVSgO!
z1b2;@nT#clE~=CypLY#fOhZYkh)FF|r6kE;YmnKO@`3LY9hB15uf{>BDYjXZ)nd6%
zR7VIxli=-ZMUz3Zu)a`Fk69c^Wj8Wy<hm?J8<iA<MuE>#c!i~<O3qSv{DP1_@EJdk
zjNUd+&iGZQ)u5HHmWN)>l&zZ8%9$k9ppnl81l~(`WdN%~N-y2(8H5HQS}`teKTf}^
zV#ORn5SoNp=W(DGUt^-F^VBa0`2$~#k2CJD0D~=$<--iQo5t<oNIvC}-mrH?b?|)<
zx8y6banJ05TmE|H?PxLO5t7e31-_PdjhQN0gQc7}Pe-ohb$)iFrfJ_YmD_uKQU|`5
zSq>fKUS@n(<(%3rL*5ytz-uR!lkR06Dkf8MyO^w<9zRF^+Dk{^Yi@AeR3f{PS4_F)
zM*QZ;JM}v0P4B?Vg?!5-%LTsIBB$4O1U^?v<zxpOxaUgck3mQrc$-g!<0~>XD*(No
zjs{aM%f4Pq;HTYEAu$E#dGjw%yY=}xI!wKMd&^DW^I25N6T7o<EWz;XBUF4G*=tY#
zz-=LuFr8AQm$uO37lizwlpn|`i;(DRxyz5@8-xyl&t0)}?l+5Ltg|a;94fyCA#>n6
z4=U1mO1|8Apz#kvkKoQk5)CH3>xU)#D%TH=q*JyszIPb%`cu4fpgZKS-rsloX|r*d
z?jluwi?8dF)Wg`36dN$>A777&|85Ic_9k$XYErpM^#Bo8FYcqY==l#$l*Yc!U6rnj
zRE@1WF&8mMY*@0QrCctHTXYhG?3UR|IGw4aSul3ZSVi0;X<=>&moOT;)+3-<^itAU
z?5o?iN%h57$G2I1mVI^mD$nA+NA=lecgW54`06~1PO#gTeRcaPA-5pp?cfVbjC*aV
zD)f^~!p@AD8b1r`wOpA{b<JoYv7X&V+uGO^izd96*4E>vn7Fn#R$m{(rUM?d>uy{6
zMu$aNNaD&4etYdIt5}hOmCvf@=?5IYFX9=ZT*=ax-Iz&Xsbs;JDLlH+>fxL#;V&+M
zC>S_<mR%Ao3U7k1@n@_1oRaBEU|Gs5<xb05yhY0ajBQ!dYaH&8E!w?Y8{2-W?heP$
zUV+T+;&!PtYtjp~CuZal!^W%$Z_cKSgGCA>fgJ%|QtT;qSGa!Ku_2R<XX%|%#tsc7
zw%205v10?yd&DUYiTTDX_-{1xnMF+t8=L0gUo-tDJ~cNswi`P&jFeI-?3*1c;4{5%
zCV?wv=NfxASowSwH(FCuvM86w#*U(~eFF=u&G>7iAz_UqGuEQPfzGa;W4e2m3@tqd
z)sLcWT_bh6RuA-a_V<fl)~y~`w-i4N_6)c@o7Oc}^Jvn0G*^3~d0o{fn)N}oR12y_
z3Ch@$Ck1SE3iA+jtFiIE1{`UJh9GYxaBaJp8C^7zpWi!R?A|bjeU-ExWpm>j%(=!H
z4U9*x%U)EsMMZwHJF@GHV#slMZ>gr{tj@?zW2`K~u+>EW!FNe?oiQAWn(`87o|IN7
zaiDc{U&&l&tPdp`@upV2Pr1$*3o|m;HOO_w#xP?N?FZ_<_X6WOBQ;$Sv*N#Dx?-!`
z|H}*Kv?Z@|RWFZt({w59x>T3Pe0I1oSG)U`M}FQkMowSOdTz1}%diVGLAx@p3xZk6
zo=%NDm%j2OKWiG3+*w@9<34v9<5q4^<<V!tjox+ZDUUDIW}(Zu!?ex_r%|mGV}AQ+
z$c+H4pRTJzLvHI>Z1kV+!q1RXlSLeUBj>)b3`GTFUU9Kzoskc-8o1-FT!L9=gj(~J
zI4gGqMk|+A)*0tam&)|ed(X|1VU1Zt?Q|>eS~47V^{FJY_qN75<HM2ZN^QE1vdYbh
z(^$+a_a4?6p?2fkIgO<Oam!u8!x=DY${3AV><*|iP7gDunUM^&4V5?Iv6u>B>LO$E
z_K0$!Myg(i$2%qIFk^JzVaKBjwMM8HoGCZb)fu7o_SBeJ`56y0Vb%E5^FZp1P>0L7
zeTEKX^1h4NLLNPN;$>+Z>fpr_q3iA-7I&y~1D?2D_mkBb@h}S(B4*l!T3Zl_H#I}G
z3u=7I?Ok<7sP$Bh*=y~?uBWa<c3p^7XN20cL1oS5Rdq%w<YMc)N{SccWXRE0E`|!f
zBxx^e;#!6};FrtF>WnkPOiUJyXDd<2%{GftE{x|X8P2O6(Q#(+DVGz~8KYsQsdJxD
zoskGLBD{H@hWbWhkr(-dTr?_C$$fbtmwp+a`_`N~BUI}}qm<X&gxo05sQmZSgghz1
zBGq0eGYttVZ+;26S4?&Eb}K?1($NUrx2)6|p+{FaY=HGlLv4eoc5+j_yw4=$d2SY^
za{<XTm^Ew@a4vcXd6J51hxl|?eN02iLClx~<(G1VJS-N9%G)R02^?yd!V@p6BH^|g
zuEYAmZWCoxt{Wyou8pp%A9#Nz)ZrnPyj8u(A>=hHuBcg=33cYt6`8y!A>?;J-Wa`C
z8-)B0$Q!-q{(+Efkvn$fmVl7oJ-Om_pXfh*+Io9Jq0SGwwDq5rAF^ent7g4t+SeH&
ztLsF`Ke-N}pEh-!tzvb?`Juj8l&64-1<1PN-Rq1C{%=HZoxmRQYD1X{tc?hD-cZKm
zeVGw%!z9iOb)7{Xa)(%|={+`^CGe%wQk=X|3z0kreTO_F;7SMA`P(6nmSv>QaoJ%T
zE>XVRCtQc!9BPljWyNcHtd-o($j`!7&yTJ%LS0`f^H&wYnZf(NNPy|>lV~%a?q>|Y
zlV6#paZWT2yMc6~tbPb_$lW5n2;!9BIwREez52K-hb>M+o!3j?E%FzK+N|ki(4C1J
z^0aS75SH+vc9tqpA*r2nW<zdSDv`1eu47?CZbZd|ta5~F$Q=ba2b|C1-Y|ApNyyzo
z<)lh1uyGxe8uE;=8Z#@pq0V`!@p*guq1GBD>dI-Mbs=q76z_alq)rzk)P*iAF8_g>
zyzvh=X)8w`x{uEcJ83JCvSJ(R3KQoLI`x#wke7Wp(W<9KPD6jr8#PPgP`mHm7`?_J
zT)R{$OgyF4Wg(%yb#&=nIsGu?1ykNA<#B~|MyT^Gu4v`if+4>K#QJpQG{BIjHI(Qo
zNBD*OF2^}qkDG;1SNhOH=9no6wV=>gJjdLHJku$T(3yr5tPICPeNRhcnWmL{G%D{&
zZXs{Dp;4-{JgiKHx@?)osT`FSvaw|GsmGg5L#iTHnXvpovXDD*OiOuySjaCZowz*t
z7|!}x*Qs3GtZa`HWQI$lb8%)0`>==}G-D2@EMvEZ5o{GSQ_0cHqPC`H97~hU6_e@Y
zS=M}GPD8d-Tr}x%JoD)KPAwC^$5!Lqt?p!DKF+$KvOofUu+t)(e3Lix<HoM+oEw}d
zMvuUmZ|vMqDvq=xxLm2o#KjeW>0~BZC??}`jXfIZ0WdhOy@1mp7IonGsWlDqbSQo{
z&&2Y|W4jV7qx9UNL{B1F%;vE%6{q^tTkH!D#`tK&8*tSlWu|bLl$5a$8>Z35cqB1-
zfYl0XgOys>wyxV6F-xhUB1xU`F-Mf@=h{p`hyYI1sxvP9KM)3Mjg)h}>Wm#R*IOtw
z)yE6Q?p@iu73;E!>{PnS4=8hk=;~3%-i*<cNhHk-ePdprKkg-dETxxOsT?d0e#7Bh
z2&yMjO0UWmd$XlXqGwawLVd_)sP`VsyAM(I6|FS=1qWK;0rp-iV->rzX)~E&2a^?X
zb<uFC$fDnclll`S`Un>nU!=G^Qv6Vfi=CIynICn@3GZI)oX+OQX&8G$xu%YeHi%lp
zS-gGSOcwcLrHscq<LhxGRmw_?S|av2Iug}SEUgr@!>iK@I7*@*gF9No%do3C)>t^d
z39|7OR8+phbljqq$(XdeD$`gOA}$z<<GK$@p@XBe1(QHSJi;I163a|?;(la=3eyfA
z%Q#KcOG^1d5r=!l^GVzy$bviAA6yrdSTBpwp&Eaj)|RBENTk~#I!c<Ja4HBINxE=6
zVA0|^DOd;jgQ45?g|9{q>dTh*3(8zg0Jvpj04J4YGuSn&Bx9Y9TtI_hB4I>;T23(w
zilh8IO*k;yydos9{;EJzsvts~?PvGkIIrT8@uJl=R?4iWIjqs6hb~;pLyLG%8bP{3
z)W}E|eW4JD88HMnQxmJJ4jon1J2R5ar`_7><Yys8i^xu)q^3OZjHYIYDyYe6R{N_~
zY34h?4vG_TXoBcX<|mM#H@V45pv07z37hX%xfg~HwJcMl=M#$h#*T}Cz?#ChB0I`j
z=LvEaQ|O`sOT}mTqg|a((m16h*w4=p8f!|$0Itx<V#Q3lgo43>kkV*s93!jwpb-a^
z#Y&>5AtKd<W2Lhj)S9a?oX9LQi7rMO2h&#yMpYgbSh)?XmRG=;qp9&O6X)EegmfCa
zj*u8{^$5<+6SO1!X)0+#-GpFjA{Or^)Rsb1!f}#`%UWryYLwa*DY-79WLlJ#&O{<l
z--DpwX{<}M!s9E#Tz0nAuV^$kh9k3ax4|+qpQiT1-%e=iG-`7m=g=0gB3Pu1#>_;E
z*<5elvd)qmT|g`|PAHkoNKlP5BsPn~ZC3Tz)|fc?8-4dm71l_^o86Y~YzagfnWo+f
zPA?87EmpBbYt8(KiBoqFz`im?A(*QxQmLiB7-z@_yzz+MOS`W3(jJ?r_aZ8O71Dr(
zGk2k`NI6j@RC2aN#}TxbAPrg@7qc2oXA5a^2y>u&Of))_C3-Uxu$-o;zPcbvGbRPs
z>PL;IT0w<<S4D8qJgFwCqmHf^CattQSkCi=D-5g>?&xUV8bxEt8#|polCjdvucwE7
zAW3xsN}9Xr6_r98p=^Y7*)vJ^RSA!GG~L}-(HJYNoGG(Rm|w*gy}uM+{O^`tC)p(3
zV0WncZm{V5c!^RvO_8qNOLhmM^pZ6?((@cyPpt=oHdH@RL4`?DLXu2D5v_|#ardXi
z5I{rlls}DfnvS<<WR&1s-E&Wvn#`tYSzSHq>+YtD?xs7s3dIwbMt(~5urvm;d$NAN
z61%1E_p2OFzrWdUxbTaw-`{Jdlc{l$IHK)yhwJbCH~0f~_x|~K!fnen>iZv%9mA%n
zgwD+~O=)U-G&V&s&6K05WW1}%t(;CLJ^*n>7)nZM3@s1O>GLRjUCR2#C7OcA17$X7
zD3|aJVU(O=;YlN^vFtsW4M_~q*v%eD5>2ggG0+p_t6fCV(9|mbkVp|{gOx!SjZSHb
zAav!xA$jVI#)S03Ou5pdx?ui+mRm4&prt81m}1H+<6TW-t?Piu^4RDv!qw<~BO|nQ
zYD&k_d@|9wDOtb(Ae&E6lBPndBqTPv<w$il(rT>X88&mbnejAFpg@9+Xr<}Z<UjQ9
zEXG%v8#<GT!U}WT$~RRnEPiscAZrQ>$gV_}S)=JzvT4G2HtiXv$`Ljj<><mkFC)($
zqbHqvhE49`Cc{^TSDHq)udp<qE#+2^2%R()xUYbLe{muPOG3W8mS&5_px_;#W#;`|
z8%^eLYSbEKBRH8LG+a%3RHhpgv!}5du1=$-Z@CiUjU=rUoe7cUMiX0wro^V{gjR^|
z23}L2D?AJ;*+_pCE+`Q>F;TGY-l3)z`)61*_J*E>kZ^ZbHT^4|VbZv3iqGndrPwS@
z@zKxZxXY?gSQ9*a@H(c5iF7{6dw}1@^|KxFC>@%<CiC+bI!*aRtCK6G=metL$ZPrq
zn%O0#IA}U&)#sSp$>5n|(o_v@m06kcv|D0g#S<J%IObny)zPFaLf~^_W62z)=;Zd#
zX=$480T;_7mZl6(Gy|rJPiM+xy{KL%z^FO{riNE_224lu%z$YuO4PDs?@^=XMDt_r
z_|*9^jm;4RPr_=7Fo?W-c&M79feUg*iUa*CSu3OS*UZT&LRaS6Tyt`o23$8Mr__~B
ze|^?Hvo={A<65!nCY2yGB|Dnjq!=YJ|EFj$<@rD5Dc}5`rjo)o%Sl2{PH2p<Z?aG`
z)^|9b@HCb`>YG^9Wy^S`IA&q&?do_dX{s5vaI>hqiEyV3J%Dxn@n(9EU3^8&iDsz6
zCNwesOiemEFY45kMj8JEs3x-qH)fU0)-(}AvPsuuK(+Z(w{pJOOpO@cc}<P_oPwFF
zRoS!7N?B?{qv@20`Bo)o#KdcR3<l9Z@!B5qi7F;uD?XJ8-dXg`ww32i0DWVQONkc5
zx-ixo6)%<#)H8U4QdiB>CDkF-IP#78!CC?zY|%0_Q}4g2m}evK!?fOP&X|_%B7Z+V
zA#0G%5!0yj$-yqB7)iz{W41Q7XlWR)m?~+e38tx0N!2<2U|fs=ENEf!XcC{&swO`7
zoH+40M<)IOdO_IRZ%xk8hw~NjG&u*tggHn3WzK0zkMyoYp~*LJyt&(;)xyn^@Ac8Q
zquF@Wqz_aiIC@fQ6t$U`pDA!LKrXQscPd=$sA4nR6Q)9?^fqcG?US{6bzXj&M7KVc
zL#y-5sc`j0w$Gi&G-ay@;ih@=qRJDp)~(LVPZd!X=oNL<LOkSD$;xy3dMSga((9F!
zj7mTnD}YkzijszPq*h87sS?}_m5EhG!fJIW9_S`{r%>xL)qurDm6Zr=49<$zaZ`Gf
z@uhmMaH#yvQwo7MV01&=<~~D*p7fd4&4`B%d3p8O9O>lHb!urs*-f1(x>AVFdCIwm
zRx0bFDap!0pqr0It<`L)7|W5isXvS4OkyU2S>Yv9e+&yNc~kCMrNO4vwlEAf&DJ}0
zIVx$^M9W1JUH;}|TrJ@=({P%%Je(F9PRo{u(@Mi>-STkSXgFP49?k+9PE-wN>V>^|
ziwk?Rudq+O#5D&{YPDgoQoCx(rMB5qYT4XrK8v@}*}PMFYYC5+-r&OHr8v0ocxetU
zJYK5x;Z42vJNcn2-BUNjEn84FTLLJX+AucLqPBR-rdrddo~BMXTV_$6aJI~%I^k@Y
zMRmg2GK=bj!^)he<(hh#Yu$n}*BU^X(}uyy+`=i_!&axv(VkB&57r!GORX`oPFgLZ
zw$&Qrg3ap|wrxSlXbYfZXv1LnH1!s{%_$iJ154!OJWYq_q@`;pld$p|(XY;T#`(%S
zY)L3$Q7u+Yu*Kk&u=~K=L<2pora%+exr4zz?Fl2?4Hk<9yAS-~Pi{UnLW@Nnc+Csx
z`JBRvTI3Yc`K78UDV-Ns{n!*$#1tzwF_rk3fF|YSd8|=28aJ`YqOx=1gj&?39Vo2f
zrz0Z1lmxj;S7q~U7M(Q(IbOh)8##!aw9dymllgcaZ#;T3qj-_npWVoZSCft-WBk5%
zDl2VvX)>zw51L`Q=NT#FF_Y;T6Kj*w<|sA~(ftf;vjQ7Fwom@Bs6ur8le=I}I>3&}
z%IAJ+(z%Bic1b1U*c)i&J!v|HN3pM?+sYJBA=yiV)p@)&ph-KqmaHgg3Q^0X=`(0%
z)_WvXi;bAMbkBoS-p$8wvo;nl&=vMn&dqp`t|q|sH%O+<e6Tl_#8ID_0<R>heiMq?
zTPlc&Lp3=kd}syTZ|Ov*memQLTq#Pc^RPPhocLjEZcG+(bO(=#-M&&=wXZc{2y}`C
zYxtdKH$&-uEGj5Q<6{<|irNgN`^Ux$YP4#ppHO7j>0&mXP0?Yyztm6oC{_`eu58*2
zU3mi0xhai3nJ~^M+EG`Ws`>LjDc%57*7(ZlH`NY_=bSZ*u}-;Yn;+CDnpJgfe}bo$
zCo^oVnzo|oqLK5SGzZj4=m}zB=7&C^O$BW<&P+6Y?gNUQ^2a1rVll@`aDO>*PoJMm
zJ@GucWkqM&qJEM{(f`2Ou2q;^<y$)@OAgNO&%%I<Y?@3g{sff>56A{_GO^gZU%V@p
zCFuPcHF$<N)|oc+==~JwoVfEVO*vf!^*!AMdxRcSN_|w9X}(8YFVelwFP@6vE6hw{
z3nX8W9I<H4Q6-;}(krn?j^>N{=#-S^Rz-AFYI#0~>tgj<cTFYH@IIwb!j`0Jf#{kd
zU(Q7*3PD%Vc?e=TVXQNs9v7eKram*nwq!4@D!%5q?&Jox9|9Z0a|PMs6jiHla{^k1
zo)tSgU<g@?;?Ptmc9|Q@6n_nV{1yg<t`Wu+JS<&fSv6fM$&=u%&t@emEgo4u$l9z(
z#dEaV&YHZ<igb-NmW=b)y4B5&%*pQLXtLNfW^KS4cdx4IdmnDl)pX*&iRakCd9YUV
zs%90nhHfiIZJRo>b4SA1U47BDmPr?vqDV+XQE<JBq+!gRI7S|*Y-Ow46&9gl3qA2v
z&j$YJCY%qFpi44f$=xkqbtCF|&anyZ$8}vwo)5mqnLXKzXR*^W6Ccy0FiqA;;$4cv
zOw3G`XXj6xCGHl3Mx`!m@Rb5-<|(yl;*cfPod}bJE{!-1UDvR?(weWHb*-3bo>&^j
zUzNpL@Hk9?=%Y+h0)5Y{;YY+!@g^yON}J|Rfl1Vgy4x}ukFHbXN(NR=N9cX&?zGeO
zy_AQP)@};w3@xuxx+Y16A)U>j@l}-&Eg{BYbf>nJpdG%-9A4GZ=6wQN(+hlgQ`OQI
z>ns*c4B1!=%&u20J(!1a9dXf_!lE`TB4rZ|RkKo#Ud)_1Oc$CadD~H49A3>}SL0S+
z)d2|0z!=hmpH)IFj%?-m@ZOuI&UPuf(FU7YVwlY<6w&(9?=%;@!ztYpSo@u%s~Gqy
z4f>SV8u_21^A+lL9x5$;*4rU;o^>s+r!5oPB-)ut(6LA+!M@Sw)frM(6H%``@7@2}
zJ%n*G)<eYE*rAv1(4e7tb5Ji$7iK^C%uDt3a>w4YY0Siq@Mt=_p6TqhGWuASTG*T5
z?ewqo7&ZN){!KAe^j$Z#;IgA#IA5i67>QL7eHfe}l}wol3ppY?aJ}?k6-*Mjhj89X
zs+YGiBS!PU+Z~(a5wuqp?dIsFUaJ)co;kAHF|{J(+wxH*NvBpM29m?W*~}7DJH9H@
z+t<=7O=laslg0QLQXN${ZoxEW%(Xa&g(lpps+lRaKEe!D!maFwq!p3&;Felw3(*bd
zOZ{nh%eN>zW}TeCygk;6Ah_R?okH#wjy}tmWU1w+vMDRpS=xl+mmfz}#D)WL_6eW(
zQtPnu2)h^^qyHq1F5qXSaK1Vj<nWz6z1XzqexO<ey(KHfjiSm|`@l{FqJpbrwfH#X
zWu;UKRuC<F+FFuLAe-DGsjaT-sqsV}N4+KET&@Dj4PIK6=!*x|%BkI7=Q*~}f)0QS
zbccki*r?G~OFB9lpc@9TS5|#M9e_CT$rpZf&rJ&Nn0U@qW2;+WWJ{thes#j;9TioM
z8A{Q{l6M)%!K#OtQ{^k=X`N8lFUvVsS2yr*B>>i8tY@i-y_INg)99D8mPReu8lH2+
zkd#eT(Dw-2`XIS#lkDN5mq6_Xot>dA1*@qp(bR5<=UHB(Wi)CJ!$V~=ZFt*MiGwDf
zTE6)cl88nXXBE1SRg>|kRnGrZ7Y>)q(|3UxD@9|Ol+P|yae6QVnp|^B)oo#`AWpbL
zr$L+<1dG{;vzC&@5^DoH>2htym&%~di}+=pI7~Gx^?mYG!}80ttQI}H%skG_%J+}q
zZBBG7Il}h+sg33oB|;$^76mT={ra)5(v#*jNi~#7^K5nJFU>)9r0mzRFN4!VqwJ<a
zN>@8Be){o6YzmK#V^mKMmOG2pKUVkX!;|GOd$>|0(aRcS2bR)iJefvAi1cKgfXQ;W
zYB;#{B#S8$CnTMPstACZy3#x&n^&_@ZRGtaz<%Ky$9pnybinymgvnyURg@N;4RH-Q
zbcV+*TogwKm<jqerkLj^&`tUT-CehOWF-y)GkKp(X9wMJ40f-O_DO9B{ff)SD%q_r
zPpJL?Orn#-++N8z)h?qyh#|atl?_y1!oq19a=3%*+J<>|S>1HN!id4bvlHnmvZ^Lq
zw~f+$1ZZ!{9Q9Y8Do@cSh!1epIrRzXPFLZ~lJY)E?aOFGz%aCwmapho{c}2~YLlUT
zoE;D%lV6>O(eiuq*|V(75^K!dkmMusV-@?WeTZ&eM28-yXwq}W*tS&B-=V3hR+TCN
z@E!j$Bh*T%eZ;*H)GY8>adoSS*fNO84|yyP@2XLm4pNkoOe`2+21)HPNnf~QsG#)m
z15ik@$$(CZ#5xNFD?OYVr^_X%-@YzCS10SBp`w^ZiLpaGF&4rRil{5BQ#-@u%RK1r
zdm37u+e1!c@MqZxpG+BtLnke`i7&#Kuo<42s_$xcesr|r?TVQ`?0D?&JlEen1f}S`
zOQJ|*htEK=;@s>Q*5|a<H^%B$^$gO(eDUUMo=|%626)uV)WKvGKkk&NJI@yY*7Rkt
zf`}c4EuWDox{v!D?753p4K*!jY%`7<?r3dlY&V-47ml>FTW#^-1szsvdq-<~OH*50
zN5{gBmiETsh3#z}t*r}3nwwi%7g&kbMC-!#c)ZbSZ(3*^I^ika>`d+>8>VoAH)9TX
z55=ygVm%*2VQO&FleUkn8iqHCR&_6mA&bsH+fj)1qfljID4?172_$K}FlOd+u@%YT
zLaYnB-Sasl^nw_AHEJG;EMVFkR5fOLQh9aXTw>TbsA|a6cjvysa%-HILSy${bgfeS
z3q5e&*aHV-U|pJ-q8l@*)iZYDyQrD(4!syrvQOI&WV6NYWZu{TONy)v2AIZ<mAh$-
zoneSzDmPe^u_OK=S+I}S*afB&ryC289e4{<95-grnIU%iFHgcsH2ZlxoS^ph_|RAR
zhL`S=XpkP3)>%LUmoT<R|7QcH<BXj#s$s`0qp}-2N4u9-B-)9tUE&J_j9q)_0D5CK
zzn<z!l_+FW8>|FOb=ufo)HY*B9Bsd{n=$sNbUr8r!5Vw^p!LM07tBpIM_YpePdNI~
z*kKtK|L|1BEyhW_a582{i_R0jA^^=jC!U>PEV9_aO;z7bT=Xf$*`6;Tu#DYh+a-PW
z?kn`sQ3%e!PK~ovq)F0=mZJc%wqc>|DpH6R^I`$%gr!j_bDa6@)s@YS59J24Fjrz0
z&Dcd28?FXw0%rOwV^1zVo!_HJ$<P9}kMfh0X$Sedu{BPPFnXp~n_NaqIn6&_$e|$Z
zXz;&1;OxAOVeA6z3hV~#4(tK!3G4;z4eSH#3%n1Q0qh6t4;(;UgmEC;gMgX9!N4H^
z4R023C{PE?1`Y$}0EYud07n8x0Y?LK0UG{1U_MX}Gysi26A(c>&BASgyEVSk=jk()
zN58j<?`?3m!}kSnsT>Od%54WIcPsdHz+D8;aF2mY|NcGOFo^LX5+PfWt;sh3-ivH|
zW#kI7T_@R|>_E07I|4hAoyjg_SF)RpFT0aH$ev^`viFsdPm+DEjQsaAWZxw=d7o{Q
z8Dw9Z>}Oa0@Rj|M{RQCwvcF2$Ul0xygoDU|D&asum?;PclbI@ErXU<52(!o`D&Y`8
zI8+eo$e}9XP(he22#1l`Dq*%D%n^jc$sCn1M-Yw>gd@ojD&Yu0I7$$XCP%4+qXc2D
zAj~6kRl;0Bm@f$RWWGw6F9;2S&`26oLW3YQ2|_bzQVC6h&>{$}q(vpP2tu16EFf(v
zp-m7L3PL+ss1g<mLWdwMA{{EBLlBM;g!hwURKhWWuvid2Ko+Zn#e#6GARI@IRSCxm
zLZ=`sA)P9rQxLiYp__E6gf2no5rkgSqY`=qVW}W2BTH4nQbFhwgyTt{O6U`W<$|z+
zELRE31!1KitRgE_!b(9{EeQQ&wMtkm2qy@_069S=oFE8MK^P=al@Jw#AwgI}hE&3k
zAgmRH6UkbYuvQRG5`>e<Nh;waK{!PaV&oK+aEc(DDhQ{MQ&qyLg0M~yPABVB!a6}P
z1!0(&D!~+lxF94*TqVQ>!4iZKVyOg65Jm-IjEt&;Q9(!w!Wkr~5|V<jUJz1by-HXw
z2x&pckhDrj3qn>9awMw~vVw4?AmquJD&b5)C<sE46jVY%5K4lufs|B2Nf0&)!X~m&
zC2SOgaX~nXjH`rkK{#6w&LL;3gtG<VTtWCCIaei|D+uQa!ujMpm2jRQTp$P^A{VHH
z3k2apLHIDaP$gU_2p0*$N61Ag;UYn}SP(u+E>;N_3&JIW@G)|UO1MN2E)|52lS@^?
zrGjvoAbf&crV=g_gv$ltljL%haJe8{AqZEJD^$W2f^d}}e2QG960Q=2s|DfH<Z6|0
zwIEz02%jO>sDx_-;aWlXEV))CTq_9I3Bu>dbt>UHLAYKJK2NS!3D*n44TA6ma)U~^
zK@e^fgfEgCRl<#eaFZZ>iQJ?TZW4r>1>wu&W|eTWAlxDdUm>@sgj)pRRzdhGxm6|H
zDhRg;!q>=cD&aOkxLpvwPHtBTw+q4@g76J;hf26Z5bhL&Z<0Gz!kvO}mmqwL+@%uk
z5`?=2;oIbHm2kHp+#?9zA@`_+dj#QLLHI7YS0&sl2=@uX_sD%J;XXmQUl6`e?pF!-
z3&I0}@B{LIN_apJ9u$Nhk_T17gM#poApD3tq!Jzygog#;$K+v^@US2}A_zYrkEn!4
z1mRIZ_$hf*B|It!j|sxh$YUzuF+q4-5PnV`R|$^`!V`k<3-W|YctQ}K6og-rCso3e
zg7B0e{E9rK5}p!-rv>5H<Y|@gv>-eq2)`lEsDx((;aNfWEqPWYJSzy#3BvElb1LCE
zL3myeeovlP3C|0{3xe<m@`6fuK@eUPgg=rORl<vc@RA_>iM*r|UJ`_t1>w)+WtH%<
zAiN?7e<81^gjWRNRYCYGc~vF6DhRI$!r#biD&aLjcwG?wPF`0DuM5H(f<VX{D&Y-5
zC=0?rNLeM61;G}Ce-c|IaDSV;DG2`}Z>oehMF?*R!oSH|D&Z|bcv}$uL*7;iZwtaZ
zg79DRj!Jk(5Z)Dp|B-i9!n=a-9w(HI2zgIsyvG^kNJLP!ir}-tq2JkGd2319CW6l@
z3Ew$sTS?k3Qr^}>!go&EUXpf*l(+Yg@ST%(l%$;^<sCgFeCMQ{C25yPd1ns^-#KYl
zN!l$^-ql0GcTU<}lJ<y{clVI+os;&Iq`e~LJv}6R=cK(QX`e`WZx0FIIcZ->dS9fx
zuZM*1oHRp{_KTEfcu4rpN&8FE0g>|l9umHD(t(n6P^5gIhlKB(G*glej+AG5Nchf4
zhe*<_Ncj*C3Ew&CP)Vwbln?cg@ST%pOVVMH@@x+Y-#KZHBpn_p&+(A(os*7`q$4Bc
zBRnL0=cJ<~>F7xLC=UtWIccsW&5M-hdPw-rN%JMCK2o0VA>lhGHAqrpq}<>k;X5Za
zNm6s9+~gtQJ14bBQfs8#;vwNXC$&k^f=Ic|L&A4XS|~~Fk@7+h3Ew%XLy{In${ijO
zzH`zslJx#a`4|rg-#KZqBz+)KUhE;^J0~40NykOX$9hQk&Pkn;v?NmQ^pNnKle#3S
zJ5uiQkno+8dL*egQtt7P@ST&EMlfMmUdI0SvH!>8{}tusk*@NJNO>i`e5SlA(p_F1
zDfh!UAyOWI6OEJy;S5E}Yv8Pnluv|nQlxw`oKqs@7@Sih<<s!=mF0Dj9vlD2_T|&*
zr_<>tlSMVm{>Sm3PFMEYbfR*9IQ!e=KsX25WG0-MHaP^&AvQS_&Y?D$4QIAZ=D?X_
zlOy09VUwfa9A%TaaOT=%KAibBX@JvUlO{M#Hfe#=Vv{yFZ8lj5XQ53x;B?sJ7&yn+
zWHFq@HaQl~u{P<1(`l0~I9)dBfzxA?rEr$oqz_J?O_sx1Zj+U8R@!7WoYgit0nQ0F
ziNcB6WC+fXP1eF$Ym<}UoMe+z;GANUQ{kLylXY;`*~Eln+9VDqZW9ZRWs^}jqc%yx
zN!nyRob@(I!%5pD3ny!nGvS<RlLDNAO-gV|HrWVgqfN%)jN9aFIA`1BTsY_2<UBa%
z+2jH^7ue)NI2YRFA~+Y><YG7%+vE~Bm)PV|IG5VwGB}sn<Z?Kd+vEy3SJ>n#I9J)^
zYB*Qh<Qh2F*yLI`*V^PdIM><adN|kH<OVo5*yKhyH`?STI5*kkW;i$7<Q6!$*yL6?
zx7y@3IJep4b~v}&<PJD@*yK()ciQAGICt6PZa8<_<Q_Qp*yLU~_uAw>IQQA)emM8r
z<N-Jj*yKSt58C7*I1kz6VK@)l<PkWJ*yK?-kJ{uhIFH%naX63L<Ow)W*yKq#Puk=u
zI8WK+X*f^Y<QX{6*yLF_&)VcUIM3PSc{tD8<OMh{*yKexFWTfKI4{}cWjHU}<P|ut
z*yL3>uiE4_IIr2{bvUov<PA7)*rW`nY!e%fjgA(aH*NA3oVRT9Hk`L@@(!GLZ1OIg
zcWv?>ocC<>S9<9`8+{af*cu<Ur60D%hwbSHbTH7Lzz1|9&}YC0bQI7pzz1{&(Dvg4
z8ho_x_<%+oZ8$!l;YK@+4``gx7UKgNV6?aRfJPQ=Dn6hgMZ1X)Xe`k-;sY8)w14=3
zMh|TqKA>SkJBANvywFzR0~#o_NBDq72yG5NprJv#f)8j+(01Sh8Vs}#_<%+MZ2&&N
z@WamI1B^RtIX=LE!(QV9j5KUAKEM#e?&1TCEo>`3z@Wl@;scB(Y$QIwFv1Sv1B_oe
z0i#2$+)^9=$`*bZp>}DMS)?)cKZ*aJB0DUz?eZBB`hPw9pJM;hjFQ3scdy#2oQ)h;
z&H-lvd7uCkffBF**a&O_#(}edvw?GfbAb;6=K<#f7XTjuE(AUdTm*asxES~-a0&1+
z;8Nh@z-7QEfXjhT0#^W60#^Z_0<H!=4O|0!2DldZEN~t0IpBKW^S}+j7l0dqF9J6K
zUjl9hz6{&~d<D1__$qK4@HOCe;OoF0z&C(9fo}qL0p9}d2EGm41AGU#7x*r4AMick
ze&GAS1Hcb}2Z0{~4*@>{9tM64JOca#cog_4@EGtj;BnyRz!ShPfG2@p0#5<I0-gqb
z4Lk$<26z_uE$|%hJK%ZX_rMFlAAlEuKLRfSe*#_x{tUbV`~`Rw_$%-l@HgOf;P1d2
z00GLtKL8u}C-5flFW@cU-@x0ze}H#@{{rs<{{!9wjIE9<M}Vz>t$}TTZGr88?SUPD
z9f6&Ioq=6|U4h+z-GM!TJ%PP|y@7pzeS!A@Gl2bo{ec631A&8pnZUuoA;2u)P@oQ&
z4IBo{0S*U_0FDHX0*(ge0`q|RKt0d^Gy+XPGtdIG0&TzoU?I>BbO4KhV}SPqi-8XS
z#{$Ozoxl>H3+M)VfL>rJungz}jt7<lD}a^2DquCx51arD08wBN7y{M+Yk?DilYo<f
zQ-Bz7DsURG4mce!fngvHBmfH-0Y-r_APJlStOrs+8pr@yAP1ZY<beWE1WLdLU?Z>z
z7zfS*&IZl_&ILXQoCll_TmXCsxDfa-a1rnk;9}sTz$L)PfJ=do1D64x04@hU30whO
z30wty3b-2hG;j^@8Q@yrv%q!0=YZ>h&jU9AUjS|dz6jg|d<nQ2_%d({@D<=z;H$uG
zz}JA=fv*F10N()a1ilH}1$+y*8~8SG5AYq}Uf{dHeZcpC`+@HR4*)*^9t3^}JOum*
zco_IG@Cfh|;8EbGz+=GAfX9KK15W_I0G<SX2|NY-3V0g$HSi4Z8{k>sx4?72?||ol
z-vciIe*j(t{s_DT{0Vp&_%rYd@E71!;IF`Iz~6w^fxiQ900bxl{{U>@pTL{Izks)Z
ze*<p={{h|s{tLVd{112!Ft$eh2etyX2DSmV1-1jW2X+8<1a<;;26h2<1$F~=2lfE=
z1oi^<2KE8=1>OhD0QLj+2Mz!Z1P%gb0tW+!0JDHYfjVF|a2PNLI2<?vI1)GtI2xD>
z%md~F^*{sA2s8oBKnu_cv;hl%g+M#d0W1QJ0p1TR20j2B3mgY@0!x4{pd07`dV!_D
zGN2DQ9#{^n09FF4fYm@hZ~`y@M1etI2v`HG1x^G`0!{`_0b;<Zz-hob;B>$QhJiSc
z04!hx7zM_FBya|>9!LRcAOmE99B?L(2MRzDC;=OQjld>g95@R&8#o6z7x*A>9&kQz
z0q`N<Lg2%|MZiaZi-C^<mjE9FE(JagTn2msxE%N-a0PHBa24<=;A-I0z%{^UfNO!z
z0@neb1Fi=?58MEJ0k{$PB5)J%CE#Y@%fKzbSAbiAuL8FLUjuFjz7E_0d;_=>_$F`{
z@GanO;M>4Gz;}Rqf$swM0pA1e2fhzH0Q>-W5cnbR5bz`5Vc^HWBfw99M}eOLj{!de
z9tVC7JOTUycoO&}@D%VX;A!C3z%#&afM<c<0?z@z1D*$d54-^U0eBJkBk&UNC*Wn^
z&%i6dUw~JEzXGoTe*<0z{tmnW5TFeF1F(UA0&fEU0^S1t4ZIEf2Y3hgFYqq#Kj1yU
O*ar1~o8!(u|NjBA<!xI4


From 1f1dea3224dcf793a40c938f1eec837fc26f7b4e Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <mastertnt@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:03:02 +0100
Subject: [PATCH 17/25] Create first pipeline with Github action

First try of actions
---
 .github/workflows/dotnet.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/dotnet.yml

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
new file mode 100644
index 0000000..a73cc8b
--- /dev/null
+++ b/.github/workflows/dotnet.yml
@@ -0,0 +1,25 @@
+name: .NET
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

From d5f21234d3b4ed30cff30f67d0375ec49dcfd7ca Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <mastertnt@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:05:54 +0100
Subject: [PATCH 18/25] Update dotnet.yml

Change script
---
 .github/workflows/dotnet.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index a73cc8b..b85356b 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -17,9 +17,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.x
-    - name: Restore dependencies
-      run: dotnet restore
     - name: Build
-      run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: build.sh
+   

From 5e6eed999fba853074680fc947598713cefba0f6 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <mastertnt@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:34:29 +0100
Subject: [PATCH 19/25] Update dotnet.yml

Update dotnet.yml
---
 .github/workflows/dotnet.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index b85356b..4e73acb 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -18,5 +18,6 @@ jobs:
       with:
         dotnet-version: 5.0.x
     - name: Build
-      run: build.sh
+      shell: bash
+      run: ./build.sh --target release --verbosity verbose
    

From a791ad9bc020e83c1509636ff049f62678052107 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <mastertnt@users.noreply.github.com>
Date: Wed, 24 Nov 2021 11:39:07 +0100
Subject: [PATCH 20/25] Update dotnet.yml

---
 .github/workflows/dotnet.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 4e73acb..1ba2bd2 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -17,7 +17,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.x
-    - name: Build
+    - name: Restore dependencies
       shell: bash
-      run: ./build.sh --target release --verbosity verbose
+      run: ./build.sh --target Restore --verbosity verbose
+    - name: Build with Nuke
+      shell: bash
+      run: ./build.sh --target Compile --configuration release --verbosity verbose
    

From cab0d37a78baf7312a62978874c9215ea1fa0069 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Wed, 24 Nov 2021 22:51:46 +0100
Subject: [PATCH 21/25] [BLD] Unshallow mode

---
 .github/workflows/dotnet.yml | 4 ++++
 .gitignore                   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 1ba2bd2..179433a 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ master ]
 
+
+variables:
+    fetch-depth: '1'
+
 jobs:
   build:
 
diff --git a/.gitignore b/.gitignore
index 4b8325c..1a44dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ Release/
 *.cache
 *.i.cs
 .vs/
+
+.nuke/temp/build-attempt.log

From dfc391ea4b99833067d686d0d0a10c89bc2dfe82 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Wed, 24 Nov 2021 22:53:14 +0100
Subject: [PATCH 22/25] [BLD] Unshallow mode

---
 .github/workflows/dotnet.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 179433a..50c56a5 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -7,8 +7,7 @@ on:
     branches: [ master ]
 
 
-variables:
-    fetch-depth: '1'
+
 
 jobs:
   build:
@@ -22,9 +21,13 @@ jobs:
       with:
         dotnet-version: 5.0.x
     - name: Restore dependencies
+      variables:
+        fetch-depth: '1'
       shell: bash
       run: ./build.sh --target Restore --verbosity verbose
     - name: Build with Nuke
+      variables:
+        fetch-depth: '1'  
       shell: bash
       run: ./build.sh --target Compile --configuration release --verbosity verbose
    

From fdab4eed719a99a7322ef6191d75360592e857c8 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Wed, 24 Nov 2021 22:54:58 +0100
Subject: [PATCH 23/25] [BLD] Unshallow mode

---
 .github/workflows/dotnet.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 50c56a5..5c21762 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -16,18 +16,16 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    with:
+        fetch-depth: 1  
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.x
     - name: Restore dependencies
-      variables:
-        fetch-depth: '1'
       shell: bash
       run: ./build.sh --target Restore --verbosity verbose
     - name: Build with Nuke
-      variables:
-        fetch-depth: '1'  
       shell: bash
       run: ./build.sh --target Compile --configuration release --verbosity verbose
    

From 28361dc450eb608e20342cef478ccadc25239d8d Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <nby.comptes@outlook.com>
Date: Wed, 24 Nov 2021 22:56:24 +0100
Subject: [PATCH 24/25] [BLD] Unshallow mode

---
 .github/workflows/dotnet.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 5c21762..b4ff374 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -16,8 +16,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    with:
-        fetch-depth: 1  
+      with:
+        fetch-depth: 0
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:

From 3c28c018a10cb53f6b5f9cabf45d14768bf26605 Mon Sep 17 00:00:00 2001
From: Nicolas Baudrey <mastertnt@users.noreply.github.com>
Date: Wed, 24 Nov 2021 23:02:05 +0100
Subject: [PATCH 25/25] Update dotnet.yml

---
 .github/workflows/dotnet.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index b4ff374..70ef4a4 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -6,8 +6,8 @@ on:
   pull_request:
     branches: [ master ]
 
-
-
+env:
+  MY_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   build: